From 008229729cafec3db8b6287a25dbd75d512ad3b9 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jeanmarcv@google.com>
Date: Mon, 11 Aug 2025 14:51:39 -0400
Subject: [PATCH 01/28] Removing quality extension layer

Keep QEXT just for 96 kHz input/output

Signed-off-by: Jean-Marc Valin <jeanmarcv@google.com>
---
 celt/bands.c                    | 231 ++++-----------------------
 celt/bands.h                    |   4 +-
 celt/celt.h                     |  12 +-
 celt/celt_decoder.c             | 130 ++-------------
 celt/celt_encoder.c             | 225 +++-----------------------
 celt/cwrs.c                     |   2 +-
 celt/modes.c                    |  52 ------
 celt/modes.h                    |   8 -
 celt/opus_custom_demo.c         |  21 ---
 celt/rate.c                     | 231 ---------------------------
 celt/rate.h                     |   3 -
 celt/static_modes_fixed.h       |  62 -------
 celt/static_modes_float.h       |  62 -------
 celt/vq.c                       | 275 +-------------------------------
 celt/vq.h                       |   6 +-
 include/opus_defines.h          |  12 +-
 src/opus_decoder.c              |  31 +---
 src/opus_demo.c                 |  15 --
 src/opus_encoder.c              |  37 -----
 src/opus_multistream_encoder.c  |   6 -
 tests/opus_encode_regressions.c |   4 -
 tests/test_opus_custom.c        |   3 -
 tests/test_opus_encode.c        |  25 +--
 23 files changed, 86 insertions(+), 1371 deletions(-)

diff --git a/celt/bands.c b/celt/bands.c
index afde197ef..0b6190089 100644
--- a/celt/bands.c
+++ b/celt/bands.c
@@ -677,12 +677,6 @@ struct band_ctx {
    int theta_round;
    int disable_inv;
    int avoid_split_noise;
-#ifdef ENABLE_QEXT
-   ec_ctx *ext_ec;
-   int extra_bits;
-   opus_int32 ext_total_bits;
-   int extra_bands;
-#endif
 };
 
 struct split_ctx {
@@ -691,16 +685,14 @@ struct split_ctx {
    int iside;
    int delta;
    int itheta;
-#ifdef ENABLE_QEXT
    int itheta_q30;
-#endif
    int qalloc;
 };
 
 static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
       celt_norm *X, celt_norm *Y, int N, int *b, int B, int B0,
       int LM,
-      int stereo, int *fill ARG_QEXT(int *ext_b))
+      int stereo, int *fill)
 {
    int qn;
    int itheta=0;
@@ -839,30 +831,7 @@ static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
       }
       celt_assert(itheta>=0);
       itheta = celt_udiv((opus_int32)itheta*16384, qn);
-#ifdef ENABLE_QEXT
-      *ext_b = IMIN(*ext_b, ctx->ext_total_bits - (opus_int32)ec_tell_frac(ctx->ext_ec));
-      if (*ext_b >= 2*N<<BITRES && ctx->ext_total_bits-ec_tell_frac(ctx->ext_ec)-1 > 2<<BITRES) {
-         int extra_bits;
-         int ext_tell = ec_tell_frac(ctx->ext_ec);
-         extra_bits = IMIN(12, IMAX(2, celt_sudiv(*ext_b, (2*N-1)<<BITRES)));
-         if (encode) {
-            itheta_q30 = itheta_q30 - (itheta<<16);
-            itheta_q30 = (itheta_q30*(opus_int64)qn*((1<<extra_bits)-1)+(1<<29))>>30;
-            itheta_q30 += (1<<(extra_bits-1))-1;
-            itheta_q30 = IMAX(0, IMIN((1<<extra_bits)-2, itheta_q30));
-            ec_enc_uint(ctx->ext_ec, itheta_q30, (1<<extra_bits)-1);
-         } else {
-            itheta_q30 = ec_dec_uint(ctx->ext_ec, (1<<extra_bits)-1);
-         }
-         itheta_q30 -= (1<<(extra_bits-1))-1;
-         itheta_q30 = (itheta<<16) + itheta_q30*(opus_int64)(1<<30)/(qn*((1<<extra_bits)-1));
-         /* Hard bounds on itheta (can only trigger on corrupted bitstreams). */
-         itheta_q30 = IMAX(0, IMIN(itheta_q30, 1073741824));
-         *ext_b -= ec_tell_frac(ctx->ext_ec) - ext_tell;
-      } else {
-         itheta_q30 = (opus_int32)itheta<<16;
-      }
-#endif
+      itheta_q30 = (opus_int32)itheta<<16;
       if (encode && stereo)
       {
          if (itheta==0)
@@ -926,9 +895,7 @@ static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
    sctx->iside = iside;
    sctx->delta = delta;
    sctx->itheta = itheta;
-#ifdef ENABLE_QEXT
    sctx->itheta_q30 = itheta_q30;
-#endif
    sctx->qalloc = qalloc;
 }
 static unsigned quant_band_n1(struct band_ctx *ctx, celt_norm *X, celt_norm *Y,
@@ -973,8 +940,7 @@ static unsigned quant_band_n1(struct band_ctx *ctx, celt_norm *X, celt_norm *Y,
 static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
       int N, int b, int B, celt_norm *lowband,
       int LM,
-      opus_val32 gain, int fill
-      ARG_QEXT(int ext_b))
+      opus_val32 gain, int fill)
 {
    const unsigned char *cache;
    int q;
@@ -1014,32 +980,20 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
          fill = (fill&1)|(fill<<1);
       B = (B+1)>>1;
 
-      compute_theta(ctx, &sctx, X, Y, N, &b, B, B0, LM, 0, &fill ARG_QEXT(&ext_b));
+      compute_theta(ctx, &sctx, X, Y, N, &b, B, B0, LM, 0, &fill);
       imid = sctx.imid;
       iside = sctx.iside;
       delta = sctx.delta;
       itheta = sctx.itheta;
       qalloc = sctx.qalloc;
-#ifdef FIXED_POINT
-# ifdef ENABLE_QEXT
       (void)imid;
       (void)iside;
+#ifdef FIXED_POINT
       mid = celt_cos_norm32(sctx.itheta_q30);
       side = celt_cos_norm32((1<<30)-sctx.itheta_q30);
-# else
-      mid = SHL32(EXTEND32(imid), 16);
-      side = SHL32(EXTEND32(iside), 16);
-# endif
 #else
-# ifdef ENABLE_QEXT
-      (void)imid;
-      (void)iside;
       mid = celt_cos_norm2(sctx.itheta_q30*(1.f/(1<<30)));
       side = celt_cos_norm2(1.f-sctx.itheta_q30*(1.f/(1<<30)));
-# else
-      mid = (1.f/32768)*imid;
-      side = (1.f/32768)*iside;
-# endif
 #endif
 
       /* Give more bits to low-energy MDCTs than they would otherwise deserve */
@@ -1063,33 +1017,22 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
       if (mbits >= sbits)
       {
          cm = quant_partition(ctx, X, N, mbits, B, lowband, LM,
-               MULT32_32_Q31(gain,mid), fill ARG_QEXT(ext_b/2));
+               MULT32_32_Q31(gain,mid), fill);
          rebalance = mbits - (rebalance-ctx->remaining_bits);
          if (rebalance > 3<<BITRES && itheta!=0)
             sbits += rebalance - (3<<BITRES);
          cm |= quant_partition(ctx, Y, N, sbits, B, next_lowband2, LM,
-               MULT32_32_Q31(gain,side), fill>>B ARG_QEXT(ext_b/2))<<(B0>>1);
+               MULT32_32_Q31(gain,side), fill>>B)<<(B0>>1);
       } else {
          cm = quant_partition(ctx, Y, N, sbits, B, next_lowband2, LM,
-               MULT32_32_Q31(gain,side), fill>>B ARG_QEXT(ext_b/2))<<(B0>>1);
+               MULT32_32_Q31(gain,side), fill>>B)<<(B0>>1);
          rebalance = sbits - (rebalance-ctx->remaining_bits);
          if (rebalance > 3<<BITRES && itheta!=16384)
             mbits += rebalance - (3<<BITRES);
          cm |= quant_partition(ctx, X, N, mbits, B, lowband, LM,
-               MULT32_32_Q31(gain,mid), fill ARG_QEXT(ext_b/2));
+               MULT32_32_Q31(gain,mid), fill);
       }
    } else {
-#ifdef ENABLE_QEXT
-      int extra_bits;
-      int ext_remaining_bits;
-      extra_bits = ext_b/(N-1)>>BITRES;
-      ext_remaining_bits = ctx->ext_total_bits-(opus_int32)ec_tell_frac(ctx->ext_ec);
-      if (ext_remaining_bits < ((extra_bits+1)*(N-1)+N)<<BITRES) {
-         extra_bits = (ext_remaining_bits-(N<<BITRES))/(N-1)>>BITRES;
-         extra_bits = IMAX(extra_bits-1, 0);
-      }
-      extra_bits = IMIN(12, extra_bits);
-#endif
       /* This is the basic no-split case */
       q = bits2pulses(m, i, LM, b);
       curr_bits = pulses2bits(m, i, LM, q);
@@ -1111,26 +1054,11 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
          /* Finally do the actual quantization */
          if (encode)
          {
-            cm = alg_quant(X, N, K, spread, B, ec, gain, ctx->resynth
-                           ARG_QEXT(ctx->ext_ec) ARG_QEXT(extra_bits),
+            cm = alg_quant(X, N, K, spread, B, ec, gain, ctx->resynth,
                            ctx->arch);
          } else {
-            cm = alg_unquant(X, N, K, spread, B, ec, gain
-                             ARG_QEXT(ctx->ext_ec) ARG_QEXT(extra_bits));
-         }
-#ifdef ENABLE_QEXT
-      } else if (ext_b > 2*N<<BITRES)
-      {
-         extra_bits = ext_b/(N-1)>>BITRES;
-         ext_remaining_bits = ctx->ext_total_bits-ec_tell_frac(ctx->ext_ec);
-         if (ext_remaining_bits < ((extra_bits+1)*(N-1)+N)<<BITRES) {
-            extra_bits = (ext_remaining_bits-(N<<BITRES))/(N-1)>>BITRES;
-            extra_bits = IMAX(extra_bits-1, 0);
+            cm = alg_unquant(X, N, K, spread, B, ec, gain);
          }
-         extra_bits = IMIN(14, extra_bits);
-         if (encode) cm = cubic_quant(X, N, extra_bits, B, ctx->ext_ec, gain, ctx->resynth);
-         else cm = cubic_unquant(X, N, extra_bits, B, ctx->ext_ec, gain);
-#endif
       } else {
          /* If there's no pulse, fill the band anyway */
          int j;
@@ -1176,8 +1104,7 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
    return cm;
 }
 
-#ifdef ENABLE_QEXT
-static unsigned cubic_quant_partition(struct band_ctx *ctx, celt_norm *X, int N, int b, int B, ec_ctx *ec, int LM, opus_val32 gain, int resynth, int encode)
+unsigned cubic_quant_partition(struct band_ctx *ctx, celt_norm *X, int N, int b, int B, ec_ctx *ec, int LM, opus_val32 gain, int resynth, int encode)
 {
    celt_assert(LM>=0);
    ctx->remaining_bits = ctx->ec->storage*8*8 - ec_tell_frac(ctx->ec);
@@ -1242,14 +1169,12 @@ static unsigned cubic_quant_partition(struct band_ctx *ctx, celt_norm *X, int N,
       return cm;
    }
 }
-#endif
 
 /* This function is responsible for encoding and decoding a band for the mono case. */
 static unsigned quant_band(struct band_ctx *ctx, celt_norm *X,
       int N, int b, int B, celt_norm *lowband,
       int LM, celt_norm *lowband_out,
-      opus_val32 gain, celt_norm *lowband_scratch, int fill
-      ARG_QEXT(int ext_b))
+      opus_val32 gain, celt_norm *lowband_scratch, int fill)
 {
    int N0=N;
    int N_B=N;
@@ -1325,14 +1250,7 @@ static unsigned quant_band(struct band_ctx *ctx, celt_norm *X,
          deinterleave_hadamard(lowband, N_B>>recombine, B0<<recombine, longBlocks);
    }
 
-#ifdef ENABLE_QEXT
-   if (ctx->extra_bands && b > (3*N<<BITRES)+(ctx->m->logN[ctx->i]+8+8*LM)) {
-      cm = cubic_quant_partition(ctx, X, N, b, B, ctx->ec, LM, gain, ctx->resynth, encode);
-   } else
-#endif
-   {
-      cm = quant_partition(ctx, X, N, b, B, lowband, LM, gain, fill ARG_QEXT(ext_b));
-   }
+   cm = quant_partition(ctx, X, N, b, B, lowband, LM, gain, fill);
 
    /* This code is used by the decoder and by the resynthesis-enabled encoder */
    if (ctx->resynth)
@@ -1387,8 +1305,7 @@ static unsigned quant_band(struct band_ctx *ctx, celt_norm *X,
 static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm *Y,
       int N, int b, int B, celt_norm *lowband,
       int LM, celt_norm *lowband_out,
-      celt_norm *lowband_scratch, int fill
-      ARG_QEXT(int ext_b) ARG_QEXT(const int *cap))
+      celt_norm *lowband_scratch, int fill)
 {
    int imid=0, iside=0;
    int inv = 0;
@@ -1419,33 +1336,21 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
          else OPUS_COPY(X, Y, N);
       }
    }
-   compute_theta(ctx, &sctx, X, Y, N, &b, B, B, LM, 1, &fill ARG_QEXT(&ext_b));
+   compute_theta(ctx, &sctx, X, Y, N, &b, B, B, LM, 1, &fill);
    inv = sctx.inv;
    imid = sctx.imid;
    iside = sctx.iside;
    delta = sctx.delta;
    itheta = sctx.itheta;
    qalloc = sctx.qalloc;
-#ifdef FIXED_POINT
-# ifdef ENABLE_QEXT
    (void)imid;
    (void)iside;
+#ifdef FIXED_POINT
    mid = celt_cos_norm32(sctx.itheta_q30);
    side = celt_cos_norm32((1<<30)-sctx.itheta_q30);
-# else
-   mid = SHL32(EXTEND32(imid), 16);
-   side = SHL32(EXTEND32(iside), 16);
-# endif
 #else
-# ifdef ENABLE_QEXT
-   (void)imid;
-   (void)iside;
    mid = celt_cos_norm2(sctx.itheta_q30*(1.f/(1<<30)));
    side = celt_cos_norm2(1.f-sctx.itheta_q30*(1.f/(1<<30)));
-# else
-   mid = (1.f/32768)*imid;
-   side = (1.f/32768)*iside;
-# endif
 #endif
 
    /* This is a special case for N=2 that only works for stereo and takes
@@ -1483,7 +1388,7 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
       /* We use orig_fill here because we want to fold the side, but if
          itheta==16384, we'll have cleared the low bits of fill. */
       cm = quant_band(ctx, x2, N, mbits, B, lowband, LM, lowband_out, Q31ONE,
-            lowband_scratch, orig_fill ARG_QEXT(ext_b));
+            lowband_scratch, orig_fill);
       /* We don't split N=2 bands, so cm is either 1 or 0 (for a fold-collapse),
          and there's no need to worry about mixing with the other channel. */
       y2[0] = -sign*x2[1];
@@ -1513,45 +1418,28 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
       rebalance = ctx->remaining_bits;
       if (mbits >= sbits)
       {
-#ifdef ENABLE_QEXT
-         int qext_extra = 0;
-         /* Reallocate any mid bits that cannot be used to extra mid bits. */
-         if (cap != NULL && ext_b != 0) qext_extra = IMAX(0, IMIN(ext_b/2, mbits - cap[ctx->i]/2));
-#endif
          /* In stereo mode, we do not apply a scaling to the mid because we need the normalized
             mid for folding later. */
          cm = quant_band(ctx, X, N, mbits, B, lowband, LM, lowband_out, Q31ONE,
-               lowband_scratch, fill ARG_QEXT(ext_b/2+qext_extra));
+               lowband_scratch, fill);
          rebalance = mbits - (rebalance-ctx->remaining_bits);
          if (rebalance > 3<<BITRES && itheta!=0)
             sbits += rebalance - (3<<BITRES);
-#ifdef ENABLE_QEXT
-         /* Guard against overflowing the EC with the angle if the cubic quant used too many bits for the mid. */
-         if (ctx->extra_bands) sbits = IMIN(sbits, ctx->remaining_bits);
-#endif
+
          /* For a stereo split, the high bits of fill are always zero, so no
             folding will be done to the side. */
-         cm |= quant_band(ctx, Y, N, sbits, B, NULL, LM, NULL, side, NULL, fill>>B ARG_QEXT(ext_b/2-qext_extra));
+         cm |= quant_band(ctx, Y, N, sbits, B, NULL, LM, NULL, side, NULL, fill>>B);
       } else {
-#ifdef ENABLE_QEXT
-         int qext_extra = 0;
-         /* Reallocate any side bits that cannot be used to extra side bits. */
-         if (cap != NULL && ext_b != 0) qext_extra = IMAX(0, IMIN(ext_b/2, sbits - cap[ctx->i]/2));
-#endif
          /* For a stereo split, the high bits of fill are always zero, so no
             folding will be done to the side. */
-         cm = quant_band(ctx, Y, N, sbits, B, NULL, LM, NULL, side, NULL, fill>>B ARG_QEXT(ext_b/2+qext_extra));
+         cm = quant_band(ctx, Y, N, sbits, B, NULL, LM, NULL, side, NULL, fill>>B);
          rebalance = sbits - (rebalance-ctx->remaining_bits);
          if (rebalance > 3<<BITRES && itheta!=16384)
             mbits += rebalance - (3<<BITRES);
-#ifdef ENABLE_QEXT
-         /* Guard against overflowing the EC with the angle if the cubic quant used too many bits for the side. */
-         if (ctx->extra_bands) mbits = IMIN(mbits, ctx->remaining_bits);
-#endif
          /* In stereo mode, we do not apply a scaling to the mid because we need the normalized
             mid for folding later. */
          cm |= quant_band(ctx, X, N, mbits, B, lowband, LM, lowband_out, Q31ONE,
-               lowband_scratch, fill ARG_QEXT(ext_b/2-qext_extra));
+               lowband_scratch, fill);
       }
    }
 
@@ -1591,9 +1479,7 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
       const celt_ener *bandE, int *pulses, int shortBlocks, int spread,
       int dual_stereo, int intensity, int *tf_res, opus_int32 total_bits,
       opus_int32 balance, ec_ctx *ec, int LM, int codedBands,
-      opus_uint32 *seed, int complexity, int arch, int disable_inv
-      ARG_QEXT(ec_ctx *ext_ec) ARG_QEXT(int *extra_pulses)
-      ARG_QEXT(opus_int32 ext_total_bits) ARG_QEXT(const int *cap))
+      opus_uint32 *seed, int complexity, int arch, int disable_inv)
 {
    int i;
    opus_int32 remaining_bits;
@@ -1622,12 +1508,6 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
    int resynth = !encode || theta_rdo;
 #endif
    struct band_ctx ctx;
-#ifdef ENABLE_QEXT
-   int ext_b;
-   opus_int32 ext_balance=0;
-   opus_int32 ext_tell=0;
-   VARDECL(unsigned char, ext_bytes_save);
-#endif
    SAVE_STACK;
 
    M = 1<<LM;
@@ -1669,13 +1549,6 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
    ctx.disable_inv = disable_inv;
    ctx.resynth = resynth;
    ctx.theta_round = 0;
-#ifdef ENABLE_QEXT
-   ctx.ext_ec = ext_ec;
-   ctx.ext_total_bits = ext_total_bits;
-   ctx.extra_bands = end == NB_QEXT_BANDS || end == 2;
-   if (ctx.extra_bands) theta_rdo = 0;
-   ALLOC(ext_bytes_save, theta_rdo ? QEXT_PACKET_SIZE_CAP : ALLOC_NONE, unsigned char);
-#endif
    ALLOC(bytes_save, theta_rdo ? 1275 : ALLOC_NONE, unsigned char);
 
    /* Avoid injecting noise in the first band on transients. */
@@ -1710,22 +1583,6 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
          balance -= tell;
       remaining_bits = total_bits-tell-1;
       ctx.remaining_bits = remaining_bits;
-#ifdef ENABLE_QEXT
-      if (i != start) {
-         ext_balance += extra_pulses[i-1] + ext_tell;
-      }
-      ext_tell = ec_tell_frac(ext_ec);
-      ctx.extra_bits = extra_pulses[i];
-      if (i != start)
-         ext_balance -= ext_tell;
-      if (i <= codedBands-1)
-      {
-         opus_int32 ext_curr_balance = celt_sudiv(ext_balance, IMIN(3, codedBands-i));
-         ext_b = IMAX(0, IMIN(16383, IMIN(ext_total_bits-ext_tell,extra_pulses[i]+ext_curr_balance)));
-      } else {
-         ext_b = 0;
-      }
-#endif
       if (i <= codedBands-1)
       {
          curr_balance = celt_sudiv(balance, IMIN(3, codedBands-i));
@@ -1798,10 +1655,10 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
       {
          x_cm = quant_band(&ctx, X, N, b/2, B,
                effective_lowband != -1 ? norm+effective_lowband : NULL, LM,
-               last?NULL:norm+M*eBands[i]-norm_offset, Q31ONE, lowband_scratch, x_cm ARG_QEXT(ext_b/2));
+               last?NULL:norm+M*eBands[i]-norm_offset, Q31ONE, lowband_scratch, x_cm);
          y_cm = quant_band(&ctx, Y, N, b/2, B,
                effective_lowband != -1 ? norm2+effective_lowband : NULL, LM,
-               last?NULL:norm2+M*eBands[i]-norm_offset, Q31ONE, lowband_scratch, y_cm ARG_QEXT(ext_b/2));
+               last?NULL:norm2+M*eBands[i]-norm_offset, Q31ONE, lowband_scratch, y_cm);
       } else {
          if (Y!=NULL)
          {
@@ -1813,19 +1670,11 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
                unsigned cm, cm2;
                int nstart_bytes, nend_bytes, save_bytes;
                unsigned char *bytes_buf;
-#ifdef ENABLE_QEXT
-               ec_ctx ext_ec_save, ext_ec_save2;
-               unsigned char *ext_bytes_buf;
-               int ext_nstart_bytes, ext_nend_bytes, ext_save_bytes;
-#endif
                opus_val16 w[2];
                compute_channel_weights(bandE[i], bandE[i+m->nbEBands], w);
                /* Make a copy. */
                cm = x_cm|y_cm;
                ec_save = *ec;
-#ifdef ENABLE_QEXT
-               ext_ec_save = *ext_ec;
-#endif
                ctx_save = ctx;
                OPUS_COPY(X_save, X, N);
                OPUS_COPY(Y_save, Y, N);
@@ -1833,15 +1682,12 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
                ctx.theta_round = -1;
                x_cm = quant_band_stereo(&ctx, X, Y, N, b, B,
                      effective_lowband != -1 ? norm+effective_lowband : NULL, LM,
-                     last?NULL:norm+M*eBands[i]-norm_offset, lowband_scratch, cm ARG_QEXT(ext_b) ARG_QEXT(cap));
+                     last?NULL:norm+M*eBands[i]-norm_offset, lowband_scratch, cm);
                dist0 = MULT16_32_Q15(w[0], celt_inner_prod_norm_shift(X_save, X, N, arch)) + MULT16_32_Q15(w[1], celt_inner_prod_norm_shift(Y_save, Y, N, arch));
 
                /* Save first result. */
                cm2 = x_cm;
                ec_save2 = *ec;
-#ifdef ENABLE_QEXT
-               ext_ec_save2 = *ext_ec;
-#endif
                ctx_save2 = ctx;
                OPUS_COPY(X_save2, X, N);
                OPUS_COPY(Y_save2, Y, N);
@@ -1852,18 +1698,9 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
                bytes_buf = ec_save.buf+nstart_bytes;
                save_bytes = nend_bytes-nstart_bytes;
                OPUS_COPY(bytes_save, bytes_buf, save_bytes);
-#ifdef ENABLE_QEXT
-               ext_nstart_bytes = ext_ec_save.offs;
-               ext_nend_bytes = ext_ec_save.storage;
-               ext_bytes_buf = ext_ec_save.buf!=NULL ? ext_ec_save.buf+ext_nstart_bytes : NULL;
-               ext_save_bytes = ext_nend_bytes-ext_nstart_bytes;
-               if (ext_save_bytes) OPUS_COPY(ext_bytes_save, ext_bytes_buf, ext_save_bytes);
-#endif
+
                /* Restore */
                *ec = ec_save;
-#ifdef ENABLE_QEXT
-               *ext_ec = ext_ec_save;
-#endif
                ctx = ctx_save;
                OPUS_COPY(X, X_save, N);
                OPUS_COPY(Y, Y_save, N);
@@ -1875,34 +1712,28 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
                ctx.theta_round = 1;
                x_cm = quant_band_stereo(&ctx, X, Y, N, b, B,
                      effective_lowband != -1 ? norm+effective_lowband : NULL, LM,
-                     last?NULL:norm+M*eBands[i]-norm_offset, lowband_scratch, cm ARG_QEXT(ext_b) ARG_QEXT(cap));
+                     last?NULL:norm+M*eBands[i]-norm_offset, lowband_scratch, cm);
                dist1 = MULT16_32_Q15(w[0], celt_inner_prod_norm_shift(X_save, X, N, arch)) + MULT16_32_Q15(w[1], celt_inner_prod_norm_shift(Y_save, Y, N, arch));
                if (dist0 >= dist1) {
                   x_cm = cm2;
                   *ec = ec_save2;
-#ifdef ENABLE_QEXT
-                  *ext_ec = ext_ec_save2;
-#endif
                   ctx = ctx_save2;
                   OPUS_COPY(X, X_save2, N);
                   OPUS_COPY(Y, Y_save2, N);
                   if (!last)
                      OPUS_COPY(norm+M*eBands[i]-norm_offset, norm_save2, N);
                   OPUS_COPY(bytes_buf, bytes_save, save_bytes);
-#ifdef ENABLE_QEXT
-                  if (ext_save_bytes) OPUS_COPY(ext_bytes_buf, ext_bytes_save, ext_save_bytes);
-#endif
                }
             } else {
                ctx.theta_round = 0;
                x_cm = quant_band_stereo(&ctx, X, Y, N, b, B,
                      effective_lowband != -1 ? norm+effective_lowband : NULL, LM,
-                     last?NULL:norm+M*eBands[i]-norm_offset, lowband_scratch, x_cm|y_cm ARG_QEXT(ext_b) ARG_QEXT(cap));
+                     last?NULL:norm+M*eBands[i]-norm_offset, lowband_scratch, x_cm|y_cm);
             }
          } else {
             x_cm = quant_band(&ctx, X, N, b, B,
                   effective_lowband != -1 ? norm+effective_lowband : NULL, LM,
-                  last?NULL:norm+M*eBands[i]-norm_offset, Q31ONE, lowband_scratch, x_cm|y_cm ARG_QEXT(ext_b));
+                  last?NULL:norm+M*eBands[i]-norm_offset, Q31ONE, lowband_scratch, x_cm|y_cm);
          }
          y_cm = x_cm;
       }
diff --git a/celt/bands.h b/celt/bands.h
index e7fee53f6..8d44bfb69 100644
--- a/celt/bands.h
+++ b/celt/bands.h
@@ -108,9 +108,7 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
       const celt_ener *bandE, int *pulses, int shortBlocks, int spread,
       int dual_stereo, int intensity, int *tf_res, opus_int32 total_bits,
       opus_int32 balance, ec_ctx *ec, int M, int codedBands, opus_uint32 *seed,
-      int complexity, int arch, int disable_inv
-      ARG_QEXT(ec_ctx *ext_ec) ARG_QEXT(int *extra_pulses)
-      ARG_QEXT(opus_int32 total_ext_bits) ARG_QEXT(const int *cap));
+      int complexity, int arch, int disable_inv);
 
 void anti_collapse(const CELTMode *m, celt_norm *X_,
       unsigned char *collapse_masks, int LM, int C, int size, int start,
diff --git a/celt/celt.h b/celt/celt.h
index c33e11ed0..79721dbbf 100644
--- a/celt/celt.h
+++ b/celt/celt.h
@@ -43,13 +43,6 @@
 #include "arch.h"
 #include "kiss_fft.h"
 
-#ifdef ENABLE_QEXT
-#define ARG_QEXT(arg) , arg
-#else
-#define ARG_QEXT(arg)
-#endif
-
-
 #ifdef ENABLE_DEEP_PLC
 #include "lpcnet.h"
 #endif
@@ -58,8 +51,6 @@
 #define CELTDecoder OpusCustomDecoder
 #define CELTMode OpusCustomMode
 
-#define QEXT_EXTENSION_ID 124
-
 #define LEAK_BANDS 19
 
 typedef struct {
@@ -175,7 +166,6 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
 #ifdef ENABLE_DEEP_PLC
       ,LPCNetPLCState *lpcnet
 #endif
-      ARG_QEXT(const unsigned char *qext_payload) ARG_QEXT(int qext_payload_len)
       );
 
 int celt_decode_with_ec(OpusCustomDecoder * OPUS_RESTRICT st, const unsigned char *data,
@@ -260,7 +250,7 @@ void init_caps(const CELTMode *m,int *cap,int LM,int C);
 void deemphasis(celt_sig *in[], opus_res *pcm, int N, int C, int downsample, const opus_val16 *coef, celt_sig *mem, int accum);
 void celt_synthesis(const CELTMode *mode, celt_norm *X, celt_sig * out_syn[],
       celt_glog *oldBandE, int start, int effEnd, int C, int CC, int isTransient,
-      int LM, int downsample, int silence, int arch ARG_QEXT(const CELTMode *qext_mode) ARG_QEXT(const celt_glog *qext_bandLogE) ARG_QEXT(int qext_end));
+      int LM, int downsample, int silence, int arch);
 #endif
 
 #ifdef ENABLE_QEXT
diff --git a/celt/celt_decoder.c b/celt/celt_decoder.c
index aba91c12a..184b65921 100644
--- a/celt/celt_decoder.c
+++ b/celt/celt_decoder.c
@@ -126,10 +126,6 @@ struct OpusCustomDecoder {
    float plc_preemphasis_mem;
 #endif
 
-#ifdef ENABLE_QEXT
-   celt_glog qext_oldBandE[2*NB_QEXT_BANDS];
-#endif
-
    celt_sig _decode_mem[1]; /* Size = channels*(DECODE_BUFFER_SIZE+mode->overlap) */
    /* celt_glog oldEBands[], Size = 2*mode->nbEBands */
    /* celt_glog oldLogE[], Size = 2*mode->nbEBands */
@@ -413,7 +409,7 @@ static
 void celt_synthesis(const CELTMode *mode, celt_norm *X, celt_sig * out_syn[],
                     celt_glog *oldBandE, int start, int effEnd, int C, int CC,
                     int isTransient, int LM, int downsample,
-                    int silence, int arch ARG_QEXT(const CELTMode *qext_mode) ARG_QEXT(const celt_glog *qext_bandLogE) ARG_QEXT(int qext_end))
+                    int silence, int arch)
 {
    int c, i;
    int M;
@@ -431,9 +427,6 @@ void celt_synthesis(const CELTMode *mode, celt_norm *X, celt_sig * out_syn[],
    N = mode->shortMdctSize<<LM;
    ALLOC(freq, N, celt_sig); /**< Interleaved signal MDCTs */
    M = 1<<LM;
-#ifdef ENABLE_QEXT
-   if (mode->Fs != 96000) qext_end=2;
-#endif
 
    if (isTransient)
    {
@@ -452,11 +445,6 @@ void celt_synthesis(const CELTMode *mode, celt_norm *X, celt_sig * out_syn[],
       celt_sig *freq2;
       denormalise_bands(mode, X, freq, oldBandE, start, effEnd, M,
             downsample, silence);
-#ifdef ENABLE_QEXT
-      if (qext_mode)
-         denormalise_bands(qext_mode, X, freq, qext_bandLogE, 0, qext_end, M,
-                        downsample, silence);
-#endif
       /* Store a temporary copy in the output buffer because the IMDCT destroys its input. */
       freq2 = out_syn[1]+overlap/2;
       OPUS_COPY(freq2, freq, N);
@@ -474,15 +462,6 @@ void celt_synthesis(const CELTMode *mode, celt_norm *X, celt_sig * out_syn[],
       /* Use the output buffer as temp array before downmixing. */
       denormalise_bands(mode, X+N, freq2, oldBandE+nbEBands, start, effEnd, M,
             downsample, silence);
-#ifdef ENABLE_QEXT
-      if (qext_mode)
-      {
-         denormalise_bands(qext_mode, X, freq, qext_bandLogE, 0, qext_end, M,
-                        downsample, silence);
-         denormalise_bands(qext_mode, X+N, freq2, qext_bandLogE+NB_QEXT_BANDS, 0, qext_end, M,
-                        downsample, silence);
-      }
-#endif
       for (i=0;i<N;i++)
          freq[i] = ADD32(HALF32(freq[i]), HALF32(freq2[i]));
       for (b=0;b<B;b++)
@@ -492,11 +471,6 @@ void celt_synthesis(const CELTMode *mode, celt_norm *X, celt_sig * out_syn[],
       c=0; do {
          denormalise_bands(mode, X+c*N, freq, oldBandE+c*nbEBands, start, effEnd, M,
                downsample, silence);
-#ifdef ENABLE_QEXT
-         if (qext_mode)
-            denormalise_bands(qext_mode, X+c*N, freq, qext_bandLogE+c*NB_QEXT_BANDS, 0, qext_end, M,
-                           downsample, silence);
-#endif
          for (b=0;b<B;b++)
             clt_mdct_backward(&mode->mdct, &freq[b], out_syn[c]+NB*b, mode->window, overlap, shift, B, arch);
       } while (++c<CC);
@@ -783,7 +757,7 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
       }
       st->rng = seed;
 
-      celt_synthesis(mode, X, out_syn, oldBandE, start, effEnd, C, C, 0, LM, st->downsample, 0, st->arch ARG_QEXT(NULL) ARG_QEXT(NULL) ARG_QEXT(0));
+      celt_synthesis(mode, X, out_syn, oldBandE, start, effEnd, C, C, 0, LM, st->downsample, 0, st->arch);
 
       /* Run the postfilter with the last parameters. */
       c=0; do {
@@ -1089,20 +1063,11 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
    RESTORE_STACK;
 }
 
-#ifdef ENABLE_QEXT
-static void decode_qext_stereo_params(ec_dec *ec, int qext_end, int *qext_intensity, int *qext_dual_stereo) {
-   *qext_intensity = ec_dec_uint(ec, qext_end+1);
-   if (*qext_intensity != 0) *qext_dual_stereo = ec_dec_bit_logp(ec, 1);
-   else *qext_dual_stereo = 0;
-}
-#endif
-
 int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char *data,
       int len, opus_res * OPUS_RESTRICT pcm, int frame_size, ec_dec *dec, int accum
 #ifdef ENABLE_DEEP_PLC
       ,LPCNetPLCState *lpcnet
 #endif
-      ARG_QEXT(const unsigned char *qext_payload) ARG_QEXT(int qext_payload_len)
       )
 {
    int c, i, N;
@@ -1151,19 +1116,7 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
    celt_glog max_background_increase;
    int decode_buffer_size;
 #ifdef ENABLE_QEXT
-   opus_int32 qext_bits;
-   ec_dec ext_dec;
-   int qext_bytes=0;
-   int qext_end=0;
-   int qext_intensity=0;
-   int qext_dual_stereo=0;
-   VARDECL(int, extra_quant);
-   VARDECL(int, extra_pulses);
-   const CELTMode *qext_mode = NULL;
-   CELTMode qext_mode_struct;
    int qext_scale;
-#else
-# define qext_bytes 0
 #endif
    ALLOC_STACK;
 #ifdef ENABLE_QEXT
@@ -1185,14 +1138,6 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
    oldLogE2 = oldLogE + 2*nbEBands;
    backgroundLogE = oldLogE2 + 2*nbEBands;
 
-#ifdef ENABLE_QEXT
-   if (qext_payload) {
-      ec_dec_init(&ext_dec, (unsigned char*)qext_payload, qext_payload_len);
-      qext_bytes = qext_payload_len;
-   } else {
-      ec_dec_init(&ext_dec, NULL, 0);
-   }
-#endif
 #if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API)
    if (st->signalling && data!=NULL)
    {
@@ -1231,12 +1176,6 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
             } while (p==255);
             padding--;
             if (len <= 0 || padding<0) return OPUS_INVALID_PACKET;
-#ifdef ENABLE_QEXT
-            qext_bytes = padding;
-            if (data[len] != QEXT_EXTENSION_ID<<1)
-               qext_bytes=0;
-            ec_dec_init(&ext_dec, (unsigned char*)data+len+1, qext_bytes);
-#endif
          }
       } else
       {
@@ -1454,31 +1393,6 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
 
    unquant_fine_energy(mode, start, end, oldBandE, NULL, fine_quant, dec, C);
 
-   ALLOC(X, C*N, celt_norm);   /**< Interleaved normalised MDCTs */
-
-#ifdef ENABLE_QEXT
-   if (qext_bytes && end == nbEBands &&
-         ((mode->Fs == 48000 && (mode->shortMdctSize==120 || mode->shortMdctSize==90))
-       || (mode->Fs == 96000 && (mode->shortMdctSize==240 || mode->shortMdctSize==180)))) {
-      int qext_intra_ener;
-      compute_qext_mode(&qext_mode_struct, mode);
-      qext_mode = &qext_mode_struct;
-      qext_end = ec_dec_bit_logp(&ext_dec, 1) ? NB_QEXT_BANDS : 2;
-      if (C==2) decode_qext_stereo_params(&ext_dec, qext_end, &qext_intensity, &qext_dual_stereo);
-      qext_intra_ener = ec_tell(&ext_dec)+3<=qext_bytes*8 ? ec_dec_bit_logp(&ext_dec, 3) : 0;
-      unquant_coarse_energy(qext_mode, 0, qext_end, st->qext_oldBandE,
-            qext_intra_ener, &ext_dec, C, LM);
-   }
-   ALLOC(extra_quant, nbEBands+NB_QEXT_BANDS, int);
-   ALLOC(extra_pulses, nbEBands+NB_QEXT_BANDS, int);
-   qext_bits = ((opus_int32)qext_bytes*8<<BITRES) - (opus_int32)ec_tell_frac(dec) - 1;
-   clt_compute_extra_allocation(mode, qext_mode, start, end, qext_end, NULL, NULL,
-         qext_bits, extra_pulses, extra_quant, C, LM, &ext_dec, 0, 0, 0);
-   if (qext_bytes > 0) {
-      unquant_fine_energy(mode, start, end, oldBandE, fine_quant, extra_quant, &ext_dec, C);
-   }
-#endif
-
    c=0; do {
       OPUS_MOVE(decode_mem[c], decode_mem[c]+N, decode_buffer_size-N+overlap);
    } while (++c<CC);
@@ -1486,39 +1400,21 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
    /* Decode fixed codebook */
    ALLOC(collapse_masks, C*nbEBands, unsigned char);
 
+   ALLOC(X, C*N, celt_norm);   /**< Interleaved normalised MDCTs */
+
    quant_all_bands(0, mode, start, end, X, C==2 ? X+N : NULL, collapse_masks,
          NULL, pulses, shortBlocks, spread_decision, dual_stereo, intensity, tf_res,
          len*(8<<BITRES)-anti_collapse_rsv, balance, dec, LM, codedBands, &st->rng, 0,
-         st->arch, st->disable_inv
-         ARG_QEXT(&ext_dec) ARG_QEXT(extra_pulses)
-         ARG_QEXT(qext_bytes*(8<<BITRES)) ARG_QEXT(cap));
-
-#ifdef ENABLE_QEXT
-   if (qext_mode) {
-      VARDECL(int, zeros);
-      VARDECL(unsigned char, qext_collapse_masks);
-      ec_dec dummy_dec;
-      int ext_balance;
-      ALLOC(zeros, nbEBands, int);
-      ALLOC(qext_collapse_masks, C*NB_QEXT_BANDS, unsigned char);
-      ec_dec_init(&dummy_dec, NULL, 0);
-      OPUS_CLEAR(zeros, end);
-      ext_balance = qext_bytes*(8<<BITRES) - ec_tell_frac(&ext_dec);
-      for (i=0;i<qext_end;i++) ext_balance -= extra_pulses[nbEBands+i] + C*(extra_quant[nbEBands+1]<<BITRES);
-      unquant_fine_energy(qext_mode, 0, qext_end, st->qext_oldBandE, NULL, &extra_quant[nbEBands], &ext_dec, C);
-      quant_all_bands(0, qext_mode, 0, qext_end, X, C==2 ? X+N : NULL, qext_collapse_masks,
-            NULL, &extra_pulses[nbEBands], shortBlocks, spread_decision, qext_dual_stereo, qext_intensity, zeros,
-            qext_bytes*(8<<BITRES), ext_balance, &ext_dec, LM, qext_end, &st->rng, 0,
-            st->arch, st->disable_inv, &dummy_dec, zeros, 0, NULL);
-   }
-#endif
+         st->arch, st->disable_inv);
 
    if (anti_collapse_rsv > 0)
    {
       anti_collapse_on = ec_dec_bits(dec, 1);
    }
-   unquant_energy_finalise(mode, start, end, (qext_bytes > 0) ? NULL : oldBandE,
+
+   unquant_energy_finalise(mode, start, end, oldBandE,
          fine_quant, fine_priority, len*8-ec_tell(dec), dec, C);
+
    if (anti_collapse_on)
       anti_collapse(mode, X, collapse_masks, LM, C, N,
             start, end, oldBandE, oldLogE, oldLogE2, pulses, st->rng, 0, st->arch);
@@ -1532,7 +1428,7 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
       prefilter_and_fold(st, N);
    }
    celt_synthesis(mode, X, out_syn, oldBandE, start, effEnd,
-                  C, CC, isTransient, LM, st->downsample, silence, st->arch ARG_QEXT(qext_mode) ARG_QEXT(st->qext_oldBandE) ARG_QEXT(qext_end));
+                  C, CC, isTransient, LM, st->downsample, silence, st->arch);
 
    c=0; do {
       st->postfilter_period=IMAX(st->postfilter_period, COMBFILTER_MINPERIOD);
@@ -1591,9 +1487,6 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
       }
    } while (++c<2);
    st->rng = dec->rng;
-#ifdef ENABLE_QEXT
-   if (qext_bytes) st->rng = st->rng ^ ext_dec.rng;
-#endif
 
    deemphasis(out_syn, pcm, N, CC, st->downsample, mode->preemph, st->preemph_memD, accum);
    st->loss_duration = 0;
@@ -1603,10 +1496,6 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
    RESTORE_STACK;
    if (ec_tell(dec) > 8*len)
       return OPUS_INTERNAL_ERROR;
-#ifdef ENABLE_QEXT
-   if (qext_bytes != 0 && ec_tell(&ext_dec) > 8*qext_bytes)
-      return OPUS_INTERNAL_ERROR;
-#endif
    if(ec_get_error(dec))
       st->error = 1;
    return frame_size/st->downsample;
@@ -1619,7 +1508,6 @@ int celt_decode_with_ec(CELTDecoder * OPUS_RESTRICT st, const unsigned char *dat
 #ifdef ENABLE_DEEP_PLC
        , NULL
 #endif
-       ARG_QEXT(NULL) ARG_QEXT(0)
        );
 }
 
diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c
index ab97ed677..248e977e9 100644
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -82,7 +82,6 @@ struct OpusCustomEncoder {
    int disable_inv;
    int arch;
 #ifdef ENABLE_QEXT
-   int enable_qext;
    int qext_scale;
 #endif
 
@@ -153,11 +152,9 @@ int celt_encoder_get_size(int channels)
 
 OPUS_CUSTOM_NOSTATIC int opus_custom_encoder_get_size(const CELTMode *mode, int channels)
 {
-   int extra=0;
    int size;
 #ifdef ENABLE_QEXT
    int qext_scale;
-   extra = channels*NB_QEXT_BANDS*sizeof(celt_glog);
    if (mode->Fs == 96000 && (mode->shortMdctSize==240 || mode->shortMdctSize==180)) {
       qext_scale = 2;
    } else qext_scale = 1;
@@ -165,11 +162,10 @@ OPUS_CUSTOM_NOSTATIC int opus_custom_encoder_get_size(const CELTMode *mode, int
    size = sizeof(struct CELTEncoder)
          + (channels*mode->overlap-1)*sizeof(celt_sig)    /* celt_sig in_mem[channels*mode->overlap]; */
          + channels*QEXT_SCALE(COMBFILTER_MAXPERIOD)*sizeof(celt_sig) /* celt_sig prefilter_mem[channels*COMBFILTER_MAXPERIOD]; */
-         + 4*channels*mode->nbEBands*sizeof(celt_glog)    /* celt_glog oldBandE[channels*mode->nbEBands]; */
+         + 4*channels*mode->nbEBands*sizeof(celt_glog);   /* celt_glog oldBandE[channels*mode->nbEBands]; */
                                                           /* celt_glog oldLogE[channels*mode->nbEBands]; */
                                                           /* celt_glog oldLogE2[channels*mode->nbEBands]; */
                                                           /* celt_glog energyError[channels*mode->nbEBands]; */
-         + extra;
    return size;
 }
 
@@ -1050,8 +1046,7 @@ static celt_glog dynalloc_analysis(const celt_glog *bandLogE, const celt_glog *b
       int nbEBands, int start, int end, int C, int *offsets, int lsb_depth, const opus_int16 *logN,
       int isTransient, int vbr, int constrained_vbr, const opus_int16 *eBands, int LM,
       int effectiveBytes, opus_int32 *tot_boost_, int lfe, celt_glog *surround_dynalloc,
-      AnalysisInfo *analysis, int *importance, int *spread_weight, opus_val16 tone_freq, opus_val32 toneishness
-      ARG_QEXT(int qext_scale))
+      AnalysisInfo *analysis, int *importance, int *spread_weight, opus_val16 tone_freq, opus_val32 toneishness, int qext_scale)
 {
    int i, c;
    opus_int32 tot_boost=0;
@@ -1060,6 +1055,11 @@ static celt_glog dynalloc_analysis(const celt_glog *bandLogE, const celt_glog *b
    VARDECL(celt_glog, noise_floor);
    VARDECL(celt_glog, bandLogE3);
    SAVE_STACK;
+
+#ifndef ENABLE_QEXT
+   (void)qext_scale;
+#endif
+
    ALLOC(follower, C*nbEBands, celt_glog);
    ALLOC(noise_floor, C*nbEBands, celt_glog);
    ALLOC(bandLogE3, nbEBands, celt_glog);
@@ -1403,7 +1403,7 @@ static opus_val16 tone_detect(const celt_sig *in, int CC, int N, opus_val32 *ton
 
 static int run_prefilter(CELTEncoder *st, celt_sig *in, celt_sig *prefilter_mem, int CC, int N,
       int prefilter_tapset, int *pitch, opus_val16 *gain, int *qgain, int enabled, int complexity, opus_val16 tf_estimate,
-      int nbAvailableBytes, AnalysisInfo *analysis, opus_val16 tone_freq, opus_val32 toneishness ARG_QEXT(int qext_scale))
+      int nbAvailableBytes, AnalysisInfo *analysis, opus_val16 tone_freq, opus_val32 toneishness, int qext_scale)
 {
    int c;
    VARDECL(celt_sig, _pre);
@@ -1420,6 +1420,10 @@ static int run_prefilter(CELTEncoder *st, celt_sig *in, celt_sig *prefilter_mem,
    int cancel_pitch=0;
    SAVE_STACK;
 
+#ifndef ENABLE_QEXT
+   (void)qext_scale;
+#endif
+
    max_period = QEXT_SCALE(COMBFILTER_MAXPERIOD);
    min_period = QEXT_SCALE(COMBFILTER_MINPERIOD);
    mode = st->mode;
@@ -1606,7 +1610,7 @@ static int compute_vbr(const CELTMode *mode, AnalysisInfo *analysis, opus_int32
       int constrained_vbr, opus_val16 stereo_saving, int tot_boost,
       opus_val16 tf_estimate, int pitch_change, celt_glog maxDepth,
       int lfe, int has_surround_mask, celt_glog surround_masking,
-      celt_glog temporal_vbr ARG_QEXT(int enable_qext))
+      celt_glog temporal_vbr)
 {
    /* The target rate in 8th bits per frame */
    opus_int32 target;
@@ -1683,9 +1687,6 @@ static int compute_vbr(const CELTMode *mode, AnalysisInfo *analysis, opus_int32
       opus_int32 floor_depth;
       int bins;
       bins = eBands[nbEBands-2]<<LM;
-#ifdef ENABLE_QEXT
-      if (enable_qext) bins  = mode->shortMdctSize<<LM;
-#endif
       /*floor_depth = SHR32(MULT16_16((C*bins<<BITRES),celt_log2(SHL32(MAX16(1,sample_max),13))), DB_SHIFT);*/
       floor_depth = (opus_int32)SHR32(MULT16_32_Q15((C*bins<<BITRES),maxDepth), DB_SHIFT-15);
       floor_depth = IMAX(floor_depth, target>>2);
@@ -1715,13 +1716,6 @@ static int compute_vbr(const CELTMode *mode, AnalysisInfo *analysis, opus_int32
    return target;
 }
 
-#ifdef ENABLE_QEXT
-static void encode_qext_stereo_params(ec_enc *ec, int qext_end, int qext_intensity, int qext_dual_stereo) {
-   ec_enc_uint(ec, qext_intensity, qext_end+1);
-   if (qext_intensity != 0) ec_enc_bit_logp(ec, qext_dual_stereo, 1);
-}
-#endif
-
 int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes, ec_enc *enc)
 {
    int i, c, N;
@@ -1797,27 +1791,8 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
    opus_val16 tone_freq=-1;
    opus_val32 toneishness=0;
    VARDECL(celt_glog, surround_dynalloc);
-   int qext_bytes=0;
    int packet_size_cap = 1275;
-#ifdef ENABLE_QEXT
-   int qext_scale;
-   int qext_end=0;
-   int qext_intensity=0;
-   int qext_dual_stereo=0;
-   int padding_len_bytes=0;
-   unsigned char *ext_payload;
-   opus_int32 qext_bits;
-   ec_enc ext_enc;
-   VARDECL(int, extra_quant);
-   VARDECL(int, extra_pulses);
-   VARDECL(celt_glog, error_bak);
-   const CELTMode *qext_mode = NULL;
-   CELTMode qext_mode_struct;
-   celt_ener qext_bandE[2*NB_QEXT_BANDS];
-   celt_glog qext_bandLogE[2*NB_QEXT_BANDS];
-   celt_glog *qext_oldBandE=NULL;
-   celt_glog qext_error[2*NB_QEXT_BANDS];
-#endif
+   int qext_scale=1;
    ALLOC_STACK;
 
    mode = st->mode;
@@ -1848,7 +1823,6 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
 
 #ifdef ENABLE_QEXT
    qext_scale = st->qext_scale;
-   if (st->enable_qext) packet_size_cap = QEXT_PACKET_SIZE_CAP;
 #endif
 
    prefilter_mem = st->in_mem+CC*(overlap);
@@ -1992,14 +1966,6 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
          nbAvailableBytes=2;
          ec_enc_shrink(enc, nbCompressedBytes);
       }
-#ifdef ENABLE_QEXT
-      else if (st->enable_qext) {
-         nbCompressedBytes = IMIN(nbCompressedBytes, 1275);
-         nbAvailableBytes = nbCompressedBytes - nbFilledBytes;
-         total_bits = nbCompressedBytes*8;
-         ec_enc_shrink(enc, nbCompressedBytes);
-      }
-#endif
       /* Pretend we've filled all the remaining bits with zeros
             (that's what the initialiser did anyway) */
       tell = nbCompressedBytes*8;
@@ -2038,7 +2004,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
       enabled = ((st->lfe&&nbAvailableBytes>3) || nbAvailableBytes>12*C) && !hybrid && !silence && tell+16<=total_bits && !st->disable_pf;
 
       prefilter_tapset = st->tapset_decision;
-      pf_on = run_prefilter(st, in, prefilter_mem, CC, N, prefilter_tapset, &pitch_index, &gain1, &qg, enabled, st->complexity, tf_estimate, nbAvailableBytes, &st->analysis, tone_freq, toneishness ARG_QEXT(qext_scale));
+      pf_on = run_prefilter(st, in, prefilter_mem, CC, N, prefilter_tapset, &pitch_index, &gain1, &qg, enabled, st->complexity, tf_estimate, nbAvailableBytes, &st->analysis, tone_freq, toneishness, qext_scale);
       if ((gain1 > QCONST16(.4f,15) || st->prefilter_gain > QCONST16(.4f,15)) && (!st->analysis.valid || st->analysis.tonality > .3)
             && (pitch_index > 1.26*st->prefilter_period || pitch_index < .79*st->prefilter_period))
          pitch_change = 1;
@@ -2247,7 +2213,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
 
    maxDepth = dynalloc_analysis(bandLogE, bandLogE2, oldBandE, nbEBands, start, end, C, offsets,
          st->lsb_depth, mode->logN, isTransient, st->vbr, st->constrained_vbr,
-         eBands, LM, effectiveBytes, &tot_boost, st->lfe, surround_dynalloc, &st->analysis, importance, spread_weight, tone_freq, toneishness ARG_QEXT(qext_scale));
+         eBands, LM, effectiveBytes, &tot_boost, st->lfe, surround_dynalloc, &st->analysis, importance, spread_weight, tone_freq, toneishness, qext_scale);
 
    ALLOC(tf_res, nbEBands, int);
    /* Disable variable tf resolution for hybrid and at very low bitrate */
@@ -2459,7 +2425,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
            st->lastCodedBands, C, st->intensity, st->constrained_vbr,
            st->stereo_saving, tot_boost, tf_estimate, pitch_change, maxDepth,
            st->lfe, st->energy_mask!=NULL, surround_masking,
-           temporal_vbr ARG_QEXT(st->enable_qext));
+           temporal_vbr);
      } else {
         target = base_target;
         /* Tonal frames (offset<100) need more bits than noisy (offset>100) ones. */
@@ -2531,68 +2497,6 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
      /* This moves the raw bits to take into account the new compressed size */
      ec_enc_shrink(enc, nbCompressedBytes);
    }
-#ifdef ENABLE_QEXT
-   if (st->enable_qext) {
-      int new_compressedBytes;
-      /* Don't give any bits for the first 80 kb/s per channel. Then 80% of the excess. */
-      opus_int32 offset = bitrate_to_bits(C*80000, mode->Fs, frame_size)/8;
-      qext_bytes = IMAX(nbCompressedBytes-1275, IMAX(0, (nbCompressedBytes-offset)*4/5));
-      if (qext_bytes > 20) {
-         opus_int32 target;
-         opus_val16 scale;
-         target = ((nbCompressedBytes-qext_bytes/3)*8<<BITRES);
-         if (!vbr_rate) {
-            opus_val16 tf_estimate2;
-            target -= ((40*C+20)<<BITRES);
-            tf_estimate2 = MIN32(QCONST16(1.f, 14), 2*EXTEND32(tf_estimate));
-            target = compute_vbr(mode, &st->analysis, target, LM, equiv_rate,
-                  st->lastCodedBands, C, st->intensity, st->constrained_vbr,
-                  st->stereo_saving, tot_boost, tf_estimate2, pitch_change, maxDepth,
-                  st->lfe, st->energy_mask!=NULL, surround_masking,
-                  temporal_vbr ARG_QEXT(st->enable_qext));
-            target += tell;
-         }
-         scale = PSHR32(toneishness,14);
-         scale = Q15ONE - MULT16_16_Q15(scale, scale);
-         qext_bytes += MULT16_32_Q15(scale, (nbCompressedBytes-(target/(8<<BITRES))) - qext_bytes);
-         qext_bytes = IMAX(nbCompressedBytes-1275, IMAX(21, qext_bytes));
-      }
-      padding_len_bytes = (qext_bytes+253)/254;
-      qext_bytes = IMIN(qext_bytes, nbCompressedBytes-min_allowed-padding_len_bytes-1);
-      padding_len_bytes = (qext_bytes+253)/254;
-      if (qext_bytes > 20) {
-         new_compressedBytes = nbCompressedBytes-qext_bytes-padding_len_bytes-1;
-         ec_enc_shrink(enc, new_compressedBytes);
-         if (compressed == NULL) {
-            compressed = enc->buf;
-         }
-         compressed[-1] |= 0x03; /* Code 3 packet */
-         enc->buf += 1+padding_len_bytes;
-         OPUS_MOVE(compressed+1+padding_len_bytes, compressed, new_compressedBytes);
-         compressed[0] = 0x41; /* Set padding */
-         for (i=0;i<padding_len_bytes-1;i++) compressed[i+1] = 255;
-         compressed[padding_len_bytes] = qext_bytes%254 == 0 ? 254 : qext_bytes%254;
-         ext_payload = compressed+padding_len_bytes+1+new_compressedBytes;
-         ext_payload[0] = QEXT_EXTENSION_ID<<1;
-         ext_payload += 1;
-         qext_bytes -= 1;
-         OPUS_CLEAR(ext_payload, qext_bytes);
-         ec_enc_init(&ext_enc, ext_payload, qext_bytes);
-         nbCompressedBytes = new_compressedBytes;
-         if (end == nbEBands && (mode->Fs == 48000 ||  mode->Fs == 96000) && (mode->shortMdctSize==120*qext_scale || mode->shortMdctSize==90*qext_scale)) {
-            compute_qext_mode(&qext_mode_struct, mode);
-            qext_mode = &qext_mode_struct;
-            qext_end = (qext_scale == 2) ? NB_QEXT_BANDS : 2;
-            ec_enc_bit_logp(&ext_enc, qext_end == NB_QEXT_BANDS, 1);
-         }
-      } else {
-         ec_enc_init(&ext_enc, NULL, 0);
-         qext_bytes = 0;
-      }
-   } else {
-      ec_enc_init(&ext_enc, NULL, 0);
-   }
-#endif
 
    /* Bit allocation */
    ALLOC(fine_quant, nbEBands, int);
@@ -2633,66 +2537,13 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
 
    quant_fine_energy(mode, start, end, oldBandE, error, NULL, fine_quant, enc, C);
    OPUS_CLEAR(energyError, nbEBands*CC);
-#ifdef ENABLE_QEXT
-   if (qext_mode)
-   {
-      /* Don't bias for intra. */
-      opus_val32 qext_delayedIntra=0;
-      qext_oldBandE = energyError + CC*nbEBands;
-      compute_band_energies(qext_mode, freq, qext_bandE, qext_end, C, LM, st->arch);
-      normalise_bands(qext_mode, freq, X, qext_bandE, qext_end, C, M);
-      amp2Log2(qext_mode, qext_end, qext_end, qext_bandE, qext_bandLogE, C);
-      if (C==2) {
-         qext_intensity = qext_end;
-         qext_dual_stereo = dual_stereo;
-         encode_qext_stereo_params(&ext_enc, qext_end, qext_intensity, qext_dual_stereo);
-      }
-      quant_coarse_energy(qext_mode, 0, qext_end, qext_end, qext_bandLogE,
-               qext_oldBandE, qext_bytes*8, qext_error, &ext_enc,
-               C, LM, qext_bytes, st->force_intra,
-               &qext_delayedIntra, st->complexity >= 4, st->loss_rate, st->lfe);
-   }
-   ALLOC(extra_quant, nbEBands+NB_QEXT_BANDS, int);
-   ALLOC(extra_pulses, nbEBands+NB_QEXT_BANDS, int);
-   ALLOC(error_bak, C*nbEBands, celt_glog);
-
-   qext_bits = ((opus_int32)qext_bytes*8<<BITRES) - (opus_int32)ec_tell_frac(enc) - 1;
-   clt_compute_extra_allocation(mode, qext_mode, start, end, qext_end, bandLogE, qext_bandLogE,
-         qext_bits, extra_pulses, extra_quant, C, LM, &ext_enc, 1, tone_freq, toneishness);
-   OPUS_COPY(error_bak, error, C*nbEBands);
-   if (qext_bytes > 0) {
-      quant_fine_energy(mode, start, end, oldBandE, error, fine_quant, extra_quant, &ext_enc, C);
-   }
-#endif
 
    /* Residual quantisation */
    ALLOC(collapse_masks, C*nbEBands, unsigned char);
    quant_all_bands(1, mode, start, end, X, C==2 ? X+N : NULL, collapse_masks,
          bandE, pulses, shortBlocks, st->spread_decision,
          dual_stereo, st->intensity, tf_res, nbCompressedBytes*(8<<BITRES)-anti_collapse_rsv,
-         balance, enc, LM, codedBands, &st->rng, st->complexity, st->arch, st->disable_inv
-         ARG_QEXT(&ext_enc) ARG_QEXT(extra_pulses)
-         ARG_QEXT(qext_bytes*(8<<BITRES)) ARG_QEXT(cap));
-
-#ifdef ENABLE_QEXT
-   if (qext_mode) {
-      VARDECL(int, zeros);
-      VARDECL(unsigned char, qext_collapse_masks);
-      ec_enc dummy_enc;
-      int ext_balance;
-      ALLOC(zeros, nbEBands, int);
-      ALLOC(qext_collapse_masks, C*NB_QEXT_BANDS, unsigned char);
-      ec_enc_init(&dummy_enc, NULL, 0);
-      OPUS_CLEAR(zeros, end);
-      ext_balance = qext_bytes*(8<<BITRES) - ec_tell_frac(&ext_enc);
-      for (i=0;i<qext_end;i++) ext_balance -= extra_pulses[nbEBands+i] + C*(extra_quant[nbEBands+1]<<BITRES);
-      quant_fine_energy(qext_mode, 0, qext_end, qext_oldBandE, qext_error, NULL, &extra_quant[nbEBands], &ext_enc, C);
-      quant_all_bands(1, qext_mode, 0, qext_end, X, C==2 ? X+N : NULL, qext_collapse_masks,
-            qext_bandE, &extra_pulses[nbEBands], shortBlocks, st->spread_decision,
-            qext_dual_stereo, qext_intensity, zeros, qext_bytes*(8<<BITRES),
-            ext_balance, &ext_enc, LM, qext_end, &st->rng, st->complexity, st->arch, st->disable_inv, &dummy_enc, zeros, 0, NULL);
-   }
-#endif
+         balance, enc, LM, codedBands, &st->rng, st->complexity, st->arch, st->disable_inv);
 
    if (anti_collapse_rsv > 0)
    {
@@ -2702,8 +2553,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
 #endif
       ec_enc_bits(enc, anti_collapse_on, 1);
    }
-   if (qext_bytes == 0)
-      quant_energy_finalise(mode, start, end, oldBandE, error, fine_quant, fine_priority, nbCompressedBytes*8-ec_tell(enc), enc, C);
+   quant_energy_finalise(mode, start, end, oldBandE, error, fine_quant, fine_priority, nbCompressedBytes*8-ec_tell(enc), enc, C);
    c=0;
    do {
       for (i=start;i<end;i++)
@@ -2711,10 +2561,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
          energyError[i+c*nbEBands] = MAXG(-GCONST(0.5f), MING(GCONST(0.5f), error[i+c*nbEBands]));
       }
    } while (++c < C);
-#ifdef ENABLE_QEXT
-   if (qext_bytes > 0)
-      quant_energy_finalise(mode, start, end, NULL, error_bak, fine_quant, fine_priority, nbCompressedBytes*8-ec_tell(enc), enc, C);
-#endif
+
    if (silence)
    {
       for (i=0;i<C*nbEBands;i++)
@@ -2741,7 +2588,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
       } while (++c<CC);
 
       celt_synthesis(mode, X, out_mem, oldBandE, start, effEnd,
-                     C, CC, isTransient, LM, st->upsample, silence, st->arch ARG_QEXT(qext_mode) ARG_QEXT(qext_oldBandE) ARG_QEXT(qext_end));
+                     C, CC, isTransient, LM, st->upsample, silence, st->arch);
 
       c=0; do {
          st->prefilter_period=IMAX(st->prefilter_period, COMBFILTER_MINPERIOD);
@@ -2811,14 +2658,6 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
    /* If there's any room left (can only happen for very high rates),
       it's already filled with zeros */
    ec_enc_done(enc);
-#ifdef ENABLE_QEXT
-   ec_enc_done(&ext_enc);
-   if (qext_bytes > 0)
-      nbCompressedBytes += padding_len_bytes+2+qext_bytes;
-   if (qext_bytes) st->rng = st->rng ^ ext_enc.rng;
-   if (ec_get_error(&ext_enc))
-      return OPUS_INTERNAL_ERROR;
-#endif
 #if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API)
    if (st->signalling)
       nbCompressedBytes++;
@@ -3049,28 +2888,6 @@ int opus_custom_encoder_ctl(CELTEncoder * OPUS_RESTRICT st, int request, ...)
           *value = st->disable_inv;
       }
       break;
-#ifdef ENABLE_QEXT
-      case OPUS_SET_QEXT_REQUEST:
-      {
-          opus_int32 value = va_arg(ap, opus_int32);
-          if(value<0 || value>1)
-          {
-             goto bad_arg;
-          }
-          st->enable_qext = value;
-      }
-      break;
-      case OPUS_GET_QEXT_REQUEST:
-      {
-          opus_int32 *value = va_arg(ap, opus_int32*);
-          if (!value)
-          {
-             goto bad_arg;
-          }
-          *value = st->enable_qext;
-      }
-      break;
-#endif
       case OPUS_RESET_STATE:
       {
          int i;
diff --git a/celt/cwrs.c b/celt/cwrs.c
index 8a280ce36..18fa554e5 100644
--- a/celt/cwrs.c
+++ b/celt/cwrs.c
@@ -36,7 +36,7 @@
 #include "mathops.h"
 #include "arch.h"
 
-#if defined(CUSTOM_MODES) || defined(ENABLE_QEXT)
+#if defined(CUSTOM_MODES)
 #define CWRS_EXTRA_ROWS
 #endif
 
diff --git a/celt/modes.c b/celt/modes.c
index 1f4abcf6b..74d096b5d 100644
--- a/celt/modes.c
+++ b/celt/modes.c
@@ -410,15 +410,6 @@ CELTMode *opus_custom_mode_create(opus_int32 Fs, int frame_size, int *error)
    mode->logN = logN;
 
    compute_pulse_cache(mode, mode->maxLM);
-#ifdef ENABLE_QEXT
-   OPUS_CLEAR(&mode->qext_cache, 1);
-   if ( (mode->Fs == 48000 && (mode->shortMdctSize==120 || mode->shortMdctSize==90)) || (mode->Fs == 96000 && (mode->shortMdctSize==240 || mode->shortMdctSize==180)) ) {
-      CELTMode dummy;
-      compute_qext_mode(&dummy, mode);
-      compute_pulse_cache(&dummy, dummy.maxLM);
-      OPUS_COPY(&mode->qext_cache, &dummy.cache, 1);
-   }
-#endif
 
    if (clt_mdct_init(&mode->mdct, 2*mode->shortMdctSize*mode->nbShortMdcts,
            mode->maxLM, arch) == 0)
@@ -457,11 +448,6 @@ void opus_custom_mode_destroy(CELTMode *mode)
    }
 #endif /* CUSTOM_MODES_ONLY */
 #ifdef CUSTOM_MODES
-#ifdef ENABLE_QEXT
-   if (mode->qext_cache.index) opus_free((opus_int16*)mode->qext_cache.index);
-   if (mode->qext_cache.bits) opus_free((unsigned char*)mode->qext_cache.bits);
-   if (mode->qext_cache.caps) opus_free((unsigned char*)mode->qext_cache.caps);
-#endif
    opus_free((opus_int16*)mode->eBands);
    opus_free((unsigned char*)mode->allocVectors);
 
@@ -480,41 +466,3 @@ void opus_custom_mode_destroy(CELTMode *mode)
 #endif
 }
 #endif
-
-#ifdef ENABLE_QEXT
-
-static const opus_int16 qext_eBands_180[] = {
-/* 20k  22k  24k  26k  28k  30k  32k  34k  36k  38k  40k  42k  44k  47k  48k */
-    74,  82,  90,  98, 106, 114, 122, 130, 138, 146, 154, 162, 168, 174, 180
-};
-
-static const opus_int16 qext_logN_180[] = {24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 21, 21, 21};
-
-/* Extra bands. */
-static const opus_int16 qext_eBands_240[] = {
-/* 20k  22k  24k  26k  28k  30k  32k  34k  36k  38k  40k  42k  44k  47k  48k */
-   100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210, 220, 230, 240
-};
-
-static const opus_int16 qext_logN_240[] = {27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27};
-
-void compute_qext_mode(CELTMode *qext, const CELTMode *m)
-{
-   OPUS_COPY(qext, m, 1);
-   if (m->shortMdctSize*48000 == 120*m->Fs) {
-      qext->eBands = qext_eBands_240;
-      qext->logN = qext_logN_240;
-   } else if (m->shortMdctSize*48000 == 90*m->Fs) {
-      qext->eBands = qext_eBands_180;
-      qext->logN = qext_logN_180;
-   } else {
-      celt_assert(0);
-   }
-   qext->nbEBands = qext->effEBands = NB_QEXT_BANDS;
-   while (qext->eBands[qext->effEBands] > qext->shortMdctSize)
-      qext->effEBands--;
-   qext->nbAllocVectors = 0;
-   qext->allocVectors = NULL;
-   OPUS_COPY(&qext->cache, &m->qext_cache, 1);
-}
-#endif
diff --git a/celt/modes.h b/celt/modes.h
index 06bfc65f1..c5f978061 100644
--- a/celt/modes.h
+++ b/celt/modes.h
@@ -71,15 +71,7 @@ struct OpusCustomMode {
    const celt_coef *window;
    mdct_lookup mdct;
    PulseCache cache;
-#ifdef ENABLE_QEXT
-   PulseCache qext_cache;
-#endif
 };
 
-#ifdef ENABLE_QEXT
-#define QEXT_PACKET_SIZE_CAP 3825
-#define NB_QEXT_BANDS 14
-void compute_qext_mode(CELTMode *qext, const CELTMode *m);
-#endif
 
 #endif
diff --git a/celt/opus_custom_demo.c b/celt/opus_custom_demo.c
index 44132813e..ca2269079 100644
--- a/celt/opus_custom_demo.c
+++ b/celt/opus_custom_demo.c
@@ -38,11 +38,7 @@
 #include <math.h>
 #include <string.h>
 
-#ifdef ENABLE_QEXT
-#define MAX_PACKET QEXT_PACKET_SIZE_CAP
-#else
 #define MAX_PACKET 1275
-#endif
 
 static OPUS_INLINE void _opus_ctl_failed(const char *file, int line)
 {
@@ -68,9 +64,6 @@ static void print_usage(char **argv) {
    fprintf (stderr, "     -f32                     format is 32-bit float little-endian\n");
    fprintf (stderr, "     -complexity <0-10>       optional only when encoding\n");
    fprintf (stderr, "     -loss <percentage>       encoding (robsutness setting) and decoding (simulating loss)\n");
-#ifdef ENABLE_QEXT
-   fprintf (stderr, "     -qext                    use quality extension\n");
-#endif
 }
 
 static void int_to_char(opus_uint32 i, unsigned char ch[4])
@@ -125,9 +118,6 @@ int main(int argc, char *argv[])
    int i;
 #if !(defined (FIXED_POINT) && !defined(CUSTOM_MODES)) && defined(RESYNTH)
    double rmsd = 0;
-#endif
-#ifdef ENABLE_QEXT
-   int qext = 0;
 #endif
    int count = 0;
    opus_int32 skip;
@@ -219,11 +209,6 @@ int main(int argc, char *argv[])
        } else if( strcmp( argv[ args ], "-f32" ) == 0 ) {
           format = FORMAT_F32_LE;
           args++;
-#ifdef ENABLE_QEXT
-       } else if( strcmp( argv[ args ], "-qext" ) == 0 ) {
-          qext = 1;
-          args++;
-#endif
        } else {
           printf( "Error: unrecognized setting: %s\n\n", argv[ args ] );
           print_usage( argv );
@@ -253,12 +238,6 @@ int main(int argc, char *argv[])
             goto failure;
          }
       }
-#ifdef ENABLE_QEXT
-      if(opus_custom_encoder_ctl(enc, OPUS_SET_QEXT(qext)) != OPUS_OK) {
-         opus_ctl_failed();
-         goto failure;
-      }
-#endif
    }
    if (!encode_only) {
       dec = opus_custom_decoder_create(mode, channels, &err);
diff --git a/celt/rate.c b/celt/rate.c
index 9eed2e1ec..139006d19 100644
--- a/celt/rate.c
+++ b/celt/rate.c
@@ -38,7 +38,6 @@
 
 #include "entcode.h"
 #include "rate.h"
-#include "quant_bands.h"
 
 static const unsigned char LOG2_FRAC_TABLE[24]={
    0,
@@ -644,233 +643,3 @@ int clt_compute_allocation(const CELTMode *m, int start, int end, const int *off
    RESTORE_STACK;
    return codedBands;
 }
-#ifdef ENABLE_QEXT
-
-static const unsigned char last_zero[3] = {64, 50, 0};
-static const unsigned char last_cap[3] = {110, 60, 0};
-static const unsigned char last_other[4] = {120, 112, 70, 0};
-
-static void ec_enc_depth(ec_enc *enc, opus_int32 depth, opus_int32 cap, opus_int32 *last) {
-   int sym = 3;
-   if (depth==*last) sym = 2;
-   if (depth==cap) sym = 1;
-   if (depth==0) sym = 0;
-   if (*last == 0) {
-      ec_enc_icdf(enc, IMIN(sym, 2), last_zero, 7);
-   } else if (*last == cap) {
-      ec_enc_icdf(enc, IMIN(sym, 2), last_cap, 7);
-   } else {
-      ec_enc_icdf(enc, sym, last_other, 7);
-   }
-   /* We accept some redundancy if depth==last (for last different from 0 and cap). */
-   if (sym == 3) ec_enc_uint(enc, depth-1, cap);
-   *last = depth;
-}
-
-static int ec_dec_depth(ec_dec *dec, opus_int32 cap, opus_int32 *last) {
-   int depth, sym;
-   if (*last == 0) {
-      sym = ec_dec_icdf(dec, last_zero, 7);
-      if (sym==2) sym=3;
-   } else if (*last == cap) {
-      sym = ec_dec_icdf(dec, last_cap, 7);
-      if (sym==2) sym=3;
-   } else {
-      sym = ec_dec_icdf(dec, last_other, 7);
-   }
-   if (sym==0) depth=0;
-   else if (sym==1) depth=cap;
-   else if (sym==2) depth=*last;
-   else depth = 1 + ec_dec_uint(dec, cap);
-   *last = depth;
-   return depth;
-}
-
-#define MSWAP16(a,b) do {opus_val16 tmp = a;a=b;b=tmp;} while(0)
-static opus_val16 median_of_5_val16(const opus_val16 *x)
-{
-   opus_val16 t0, t1, t2, t3, t4;
-   t2 = x[2];
-   if (x[0] > x[1])
-   {
-      t0 = x[1];
-      t1 = x[0];
-   } else {
-      t0 = x[0];
-      t1 = x[1];
-   }
-   if (x[3] > x[4])
-   {
-      t3 = x[4];
-      t4 = x[3];
-   } else {
-      t3 = x[3];
-      t4 = x[4];
-   }
-   if (t0 > t3)
-   {
-      MSWAP16(t0, t3);
-      MSWAP16(t1, t4);
-   }
-   if (t2 > t1)
-   {
-      if (t1 < t3)
-         return MIN16(t2, t3);
-      else
-         return MIN16(t4, t1);
-   } else {
-      if (t2 < t3)
-         return MIN16(t1, t3);
-      else
-         return MIN16(t2, t4);
-   }
-}
-
-void clt_compute_extra_allocation(const CELTMode *m, const CELTMode *qext_mode, int start, int end, int qext_end, const celt_glog *bandLogE, const celt_glog *qext_bandLogE,
-      opus_int32 total, int *extra_pulses, int *extra_equant, int C, int LM, ec_ctx *ec, int encode, opus_val16 tone_freq, opus_val32 toneishness)
-{
-   int i;
-   opus_int32 last=0;
-   opus_val32 sum;
-   opus_val32 fill;
-   int iter;
-   int tot_bands;
-   int tot_samples;
-   VARDECL(int, depth);
-   VARDECL(opus_int32, cap);
-#ifdef FUZZING
-   float depth_std;
-#endif
-   SAVE_STACK;
-#ifdef FUZZING
-   depth_std = -10.f*log(1e-8+(float)rand()/(float)RAND_MAX);
-   depth_std = FMAX(0, FMIN(48, depth_std));
-#endif
-   if (qext_mode != NULL) {
-      celt_assert(end==m->nbEBands);
-      tot_bands = end + qext_end;
-      tot_samples = qext_mode->eBands[qext_end]*C<<LM;
-   } else {
-      tot_bands = end;
-      tot_samples = (m->eBands[end]-m->eBands[start])*C<<LM;
-   }
-   ALLOC(cap, tot_bands, opus_int32);
-   for (i=start;i<end;i++) cap[i] = 12;
-   if (qext_mode != NULL) {
-      for (i=0;i<qext_end;i++) cap[end+i] = 14;
-   }
-   if (total <= 0) {
-      for (i=start;i<m->nbEBands+qext_end;i++) {
-         extra_pulses[i] = extra_equant[i] = 0;
-      }
-      RESTORE_STACK;
-      return;
-   }
-   ALLOC(depth, tot_bands, int);
-   if (encode) {
-      VARDECL(opus_val16, flatE);
-      VARDECL(int, Ncoef);
-      VARDECL(opus_val16, min);
-      VARDECL(opus_val16, follower);
-
-      ALLOC(flatE, tot_bands, opus_val16);
-      ALLOC(min, tot_bands, opus_val16);
-      ALLOC(Ncoef, tot_bands, int);
-      for (i=start;i<end;i++) {
-         Ncoef[i] = (m->eBands[i+1]-m->eBands[i])*C<<LM;
-      }
-      /* Remove the effect of band width, eMeans and pre-emphasis to compute the real (flat) spectrum. */
-      for (i=start;i<end;i++) {
-         flatE[i] = PSHR32(bandLogE[i] - GCONST(0.0625f)*m->logN[i] + SHL32(eMeans[i],DB_SHIFT-4) - GCONST(.0062f)*(i+5)*(i+5), DB_SHIFT-10);
-         min[i] = 0;
-      }
-      if (C==2) {
-         for (i=start;i<end;i++) {
-            flatE[i] = MAXG(flatE[i], PSHR32(bandLogE[m->nbEBands+i] - GCONST(0.0625f)*m->logN[i] + SHL32(eMeans[i],DB_SHIFT-4) - GCONST(.0062f)*(i+5)*(i+5), DB_SHIFT-10));
-         }
-      }
-      flatE[end-1] += QCONST16(2.f, 10);
-      if (qext_mode != NULL) {
-         opus_val16 min_depth = 0;
-         /* If we have enough bits, give at least 1 bit of depth to all higher bands. */
-         if (total >= 3*C*(qext_mode->eBands[qext_end]-qext_mode->eBands[start])<<LM<<BITRES && (toneishness < QCONST32(.98f, 29) || tone_freq > 1.33f))
-            min_depth = QCONST16(1.f, 10);
-         for (i=0;i<qext_end;i++) {
-            Ncoef[end+i] = (qext_mode->eBands[i+1]-qext_mode->eBands[i])*C<<LM;
-            min[end+i] = min_depth;
-         }
-         for (i=0;i<qext_end;i++) {
-            flatE[end+i] = PSHR32(qext_bandLogE[i] - GCONST(0.0625f)*qext_mode->logN[i] + SHL32(eMeans[i],DB_SHIFT-4) - GCONST(.0062f)*(end+i+5)*(end+i+5), DB_SHIFT-10);
-         }
-         if (C==2) {
-            for (i=0;i<qext_end;i++) {
-               flatE[end+i] = MAXG(flatE[end+i], PSHR32(qext_bandLogE[NB_QEXT_BANDS+i] - GCONST(0.0625f)*qext_mode->logN[i] + SHL32(eMeans[i],DB_SHIFT-4) - GCONST(.0062f)*(end+i+5)*(end+i+5), DB_SHIFT-10));
-            }
-         }
-      }
-      ALLOC(follower, tot_bands, opus_val16);
-      for (i=start+2;i<tot_bands-2;i++) {
-         follower[i] = median_of_5_val16(&flatE[i-2]);
-      }
-      follower[start] = follower[start+1] = follower[start+2];
-      follower[tot_bands-1] = follower[tot_bands-2] = follower[tot_bands-3];
-      for (i=start+1;i<tot_bands;i++) {
-         follower[i] = MAX16(follower[i], follower[i-1]-QCONST16(1.f, 10));
-      }
-      for (i=tot_bands-2;i>=start;i--) {
-         follower[i] = MAX16(follower[i], follower[i+1]-QCONST16(1.f, 10));
-      }
-      for (i=start;i<tot_bands;i++) flatE[i] -= MULT16_16_Q15(Q15ONE-PSHR32(toneishness, 14), follower[i]);
-      if (qext_mode != NULL) {
-         for (i=0;i<qext_end;i++) flatE[end+i] = flatE[end+i] + QCONST16(3.f, 10) + QCONST16(.2f, 10)*i;
-      }
-      /* Approximate fill level assuming all bands contribute fully. */
-      sum = 0;
-      for (i=start;i<tot_bands;i++) {
-         sum += MULT16_16(Ncoef[i], flatE[i]);
-      }
-      total >>= BITRES;
-      fill = (SHL32(total, 10) + sum)/tot_samples;
-      /* Iteratively refine the fill level considering the depth min and cap. */
-      for (iter=0;iter<10;iter++) {
-         sum = 0;
-         for (i=start;i<tot_bands;i++)
-            sum += Ncoef[i] * MIN32(SHL32(cap[i], 10), MAX32(min[i], flatE[i]-fill));
-         fill -= (SHL32(total, 10) - sum)/tot_samples;
-      }
-      for (i=start;i<tot_bands;i++) {
-#ifdef FIXED_POINT
-         depth[i] = PSHR32(MIN32(SHL32(cap[i], 10), MAX32(min[i], flatE[i]-fill)), 10-2);
-#else
-         depth[i] = (int)floor(.5+4*MIN32(SHL32(cap[i], 10), MAX32(min[i], flatE[i]-fill)));
-#endif
-#ifdef FUZZING
-         depth[i] = (int)-depth_std*log(1e-8+(float)rand()/(float)RAND_MAX);
-         depth[i] = IMAX(0, IMIN(cap[i]<<2, depth[i]));
-#endif
-         if (ec_tell_frac(ec) + 80 < ec->storage*8<<BITRES)
-            ec_enc_depth(ec, depth[i], 4*cap[i], &last);
-         else
-            depth[i] = 0;
-      }
-   } else {
-      for (i=start;i<tot_bands;i++) {
-         if (ec_tell_frac(ec) + 80 < ec->storage*8<<BITRES)
-            depth[i] = ec_dec_depth(ec, 4*cap[i], &last);
-         else
-            depth[i] = 0;
-      }
-   }
-   for (i=start;i<end;i++) {
-      extra_equant[i] = (depth[i]+3)>>2;
-      extra_pulses[i] = ((((m->eBands[i+1]-m->eBands[i])<<LM)-1)*C * depth[i] * (1<<BITRES) + 2)>>2;
-   }
-   if (qext_mode) {
-      for (i=0;i<qext_end;i++) {
-         extra_equant[end+i] = (depth[end+i]+3)>>2;
-         extra_pulses[end+i] = ((((qext_mode->eBands[i+1]-qext_mode->eBands[i])<<LM)-1)*C * depth[end+i] * (1<<BITRES) + 2)>>2;
-      }
-   }
-   RESTORE_STACK;
-}
-#endif
diff --git a/celt/rate.h b/celt/rate.h
index 659c80f3a..fad5e412d 100644
--- a/celt/rate.h
+++ b/celt/rate.h
@@ -98,7 +98,4 @@ static OPUS_INLINE int pulses2bits(const CELTMode *m, int band, int LM, int puls
 int clt_compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim, int *intensity, int *dual_stereo,
       opus_int32 total, opus_int32 *balance, int *pulses, int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec, int encode, int prev, int signalBandwidth);
 
-void clt_compute_extra_allocation(const CELTMode *m, const CELTMode *qext_mode, int start, int end, int qext_end, const celt_glog *bandLogE, const celt_glog *qext_bandLogE,
-      opus_int32 total, int *extra_pulses, int *extra_equant, int C, int LM, ec_ctx *ec, int encode, opus_val16 tone_freq, opus_val32 toneishness);
-
 #endif
diff --git a/celt/static_modes_fixed.h b/celt/static_modes_fixed.h
index 5bac867a7..ac3340e13 100644
--- a/celt/static_modes_fixed.h
+++ b/celt/static_modes_fixed.h
@@ -126,34 +126,6 @@ static const unsigned char cache_caps50[168] = {
 140, 66, 40, };
 #endif
 
-#ifdef ENABLE_QEXT
-# ifndef DEF_QEXT_PULSE_CACHE50
-# define DEF_QEXT_PULSE_CACHE50
-static const opus_int16 qext_cache_index50[70] = {
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41,
-41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 61, 61,
-61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 72, 72, 72,
-72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 80, 80, 80, 80,
-80, 80, 80, 80, 80, 80, 80, 80, 80, 80, };
-static const unsigned char qext_cache_bits50[86] = {
-40, 26, 45, 59, 70, 79, 87, 94, 100, 105, 110, 114, 118, 122, 125,
-128, 131, 136, 141, 146, 150, 153, 157, 160, 163, 168, 173, 178, 182, 185,
-189, 192, 195, 200, 205, 210, 214, 217, 221, 224, 227, 19, 34, 61, 83,
-101, 118, 132, 145, 157, 167, 177, 186, 194, 202, 209, 216, 222, 234, 245,
-254, 10, 42, 77, 107, 133, 157, 179, 200, 219, 236, 253, 7, 50, 93,
-131, 165, 197, 227, 255, 5, 58, 109, 155, 197, 237, };
-static const unsigned char qext_cache_caps50[112] = {
-159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 171,
-171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 163, 163,
-163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 167, 167, 167,
-167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 163, 163, 163, 163,
-163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 166, 166, 166, 166, 166,
-166, 166, 166, 166, 166, 166, 166, 166, 166, 163, 163, 163, 163, 163, 163,
-163, 163, 163, 163, 163, 163, 163, 163, 165, 165, 165, 165, 165, 165, 165,
-165, 165, 165, 165, 165, 165, 165, };
-# endif
-#endif
-
 #ifndef FFT_TWIDDLES48000_960
 #define FFT_TWIDDLES48000_960
 static const kiss_twiddle_cpx fft_twiddles48000_960[480] = {
@@ -1560,9 +1532,6 @@ logN400,    /* logN */
 window120,    /* window */
 {1920, 3, {&fft_state48000_960_0, &fft_state48000_960_1, &fft_state48000_960_2, &fft_state48000_960_3, }, mdct_twiddles960},    /* mdct */
 {392, cache_index50, cache_bits50, cache_caps50},    /* cache */
-#ifdef ENABLE_QEXT
-{86, qext_cache_index50, qext_cache_bits50, qext_cache_caps50},    /* qext_cache */
-#endif
 };
 
 #ifdef ENABLE_QEXT
@@ -1731,34 +1700,6 @@ static const unsigned char cache_caps50[168] = {
 140, 66, 40, };
 #endif
 
-#ifdef ENABLE_QEXT
-# ifndef DEF_QEXT_PULSE_CACHE50
-# define DEF_QEXT_PULSE_CACHE50
-static const opus_int16 qext_cache_index50[70] = {
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41,
-41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 61, 61,
-61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 72, 72, 72,
-72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 80, 80, 80, 80,
-80, 80, 80, 80, 80, 80, 80, 80, 80, 80, };
-static const unsigned char qext_cache_bits50[86] = {
-40, 26, 45, 59, 70, 79, 87, 94, 100, 105, 110, 114, 118, 122, 125,
-128, 131, 136, 141, 146, 150, 153, 157, 160, 163, 168, 173, 178, 182, 185,
-189, 192, 195, 200, 205, 210, 214, 217, 221, 224, 227, 19, 34, 61, 83,
-101, 118, 132, 145, 157, 167, 177, 186, 194, 202, 209, 216, 222, 234, 245,
-254, 10, 42, 77, 107, 133, 157, 179, 200, 219, 236, 253, 7, 50, 93,
-131, 165, 197, 227, 255, 5, 58, 109, 155, 197, 237, };
-static const unsigned char qext_cache_caps50[112] = {
-159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 171,
-171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 163, 163,
-163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 167, 167, 167,
-167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 163, 163, 163, 163,
-163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 166, 166, 166, 166, 166,
-166, 166, 166, 166, 166, 166, 166, 166, 166, 163, 163, 163, 163, 163, 163,
-163, 163, 163, 163, 163, 163, 163, 163, 165, 165, 165, 165, 165, 165, 165,
-165, 165, 165, 165, 165, 165, 165, };
-# endif
-#endif
-
 #ifndef FFT_TWIDDLES96000_1920
 #define FFT_TWIDDLES96000_1920
 static const kiss_twiddle_cpx fft_twiddles96000_1920[960] = {
@@ -4425,9 +4366,6 @@ logN400,    /* logN */
 window240,    /* window */
 {3840, 3, {&fft_state96000_1920_0, &fft_state96000_1920_1, &fft_state96000_1920_2, &fft_state96000_1920_3, }, mdct_twiddles1920},    /* mdct */
 {392, cache_index50, cache_bits50, cache_caps50},    /* cache */
-#ifdef ENABLE_QEXT
-{86, qext_cache_index50, qext_cache_bits50, qext_cache_caps50},    /* qext_cache */
-#endif
 };
 #endif /* ENABLE_QEXT */
 
diff --git a/celt/static_modes_float.h b/celt/static_modes_float.h
index 1bccc3b40..06cca3f5f 100644
--- a/celt/static_modes_float.h
+++ b/celt/static_modes_float.h
@@ -99,34 +99,6 @@ static const unsigned char cache_caps50[168] = {
 140, 66, 40, };
 #endif
 
-#ifdef ENABLE_QEXT
-# ifndef DEF_QEXT_PULSE_CACHE50
-# define DEF_QEXT_PULSE_CACHE50
-static const opus_int16 qext_cache_index50[70] = {
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41,
-41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 61, 61,
-61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 72, 72, 72,
-72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 80, 80, 80, 80,
-80, 80, 80, 80, 80, 80, 80, 80, 80, 80, };
-static const unsigned char qext_cache_bits50[86] = {
-40, 26, 45, 59, 70, 79, 87, 94, 100, 105, 110, 114, 118, 122, 125,
-128, 131, 136, 141, 146, 150, 153, 157, 160, 163, 168, 173, 178, 182, 185,
-189, 192, 195, 200, 205, 210, 214, 217, 221, 224, 227, 19, 34, 61, 83,
-101, 118, 132, 145, 157, 167, 177, 186, 194, 202, 209, 216, 222, 234, 245,
-254, 10, 42, 77, 107, 133, 157, 179, 200, 219, 236, 253, 7, 50, 93,
-131, 165, 197, 227, 255, 5, 58, 109, 155, 197, 237, };
-static const unsigned char qext_cache_caps50[112] = {
-159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 171,
-171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 163, 163,
-163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 167, 167, 167,
-167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 163, 163, 163, 163,
-163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 166, 166, 166, 166, 166,
-166, 166, 166, 166, 166, 166, 166, 166, 166, 163, 163, 163, 163, 163, 163,
-163, 163, 163, 163, 163, 163, 163, 163, 165, 165, 165, 165, 165, 165, 165,
-165, 165, 165, 165, 165, 165, 165, };
-# endif
-#endif
-
 #ifndef FFT_TWIDDLES48000_960
 #define FFT_TWIDDLES48000_960
 static const kiss_twiddle_cpx fft_twiddles48000_960[480] = {
@@ -907,9 +879,6 @@ logN400,    /* logN */
 window120,    /* window */
 {1920, 3, {&fft_state48000_960_0, &fft_state48000_960_1, &fft_state48000_960_2, &fft_state48000_960_3, }, mdct_twiddles960},    /* mdct */
 {392, cache_index50, cache_bits50, cache_caps50},    /* cache */
-#ifdef ENABLE_QEXT
-{86, qext_cache_index50, qext_cache_bits50, qext_cache_caps50},    /* qext_cache */
-#endif
 };
 
 #ifdef ENABLE_QEXT
@@ -1027,34 +996,6 @@ static const unsigned char cache_caps50[168] = {
 140, 66, 40, };
 #endif
 
-#ifdef ENABLE_QEXT
-# ifndef DEF_QEXT_PULSE_CACHE50
-# define DEF_QEXT_PULSE_CACHE50
-static const opus_int16 qext_cache_index50[70] = {
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41,
-41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 61, 61,
-61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 72, 72, 72,
-72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, 80, 80, 80, 80,
-80, 80, 80, 80, 80, 80, 80, 80, 80, 80, };
-static const unsigned char qext_cache_bits50[86] = {
-40, 26, 45, 59, 70, 79, 87, 94, 100, 105, 110, 114, 118, 122, 125,
-128, 131, 136, 141, 146, 150, 153, 157, 160, 163, 168, 173, 178, 182, 185,
-189, 192, 195, 200, 205, 210, 214, 217, 221, 224, 227, 19, 34, 61, 83,
-101, 118, 132, 145, 157, 167, 177, 186, 194, 202, 209, 216, 222, 234, 245,
-254, 10, 42, 77, 107, 133, 157, 179, 200, 219, 236, 253, 7, 50, 93,
-131, 165, 197, 227, 255, 5, 58, 109, 155, 197, 237, };
-static const unsigned char qext_cache_caps50[112] = {
-159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 171,
-171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 163, 163,
-163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 167, 167, 167,
-167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 163, 163, 163, 163,
-163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 166, 166, 166, 166, 166,
-166, 166, 166, 166, 166, 166, 166, 166, 166, 163, 163, 163, 163, 163, 163,
-163, 163, 163, 163, 163, 163, 163, 163, 165, 165, 165, 165, 165, 165, 165,
-165, 165, 165, 165, 165, 165, 165, };
-# endif
-#endif
-
 #ifndef FFT_TWIDDLES96000_1920
 #define FFT_TWIDDLES96000_1920
 static const kiss_twiddle_cpx fft_twiddles96000_1920[960] = {
@@ -2495,9 +2436,6 @@ logN400,    /* logN */
 window240,    /* window */
 {3840, 3, {&fft_state96000_1920_0, &fft_state96000_1920_1, &fft_state96000_1920_2, &fft_state96000_1920_3, }, mdct_twiddles1920},    /* mdct */
 {392, cache_index50, cache_bits50, cache_caps50},    /* cache */
-#ifdef ENABLE_QEXT
-{86, qext_cache_index50, qext_cache_bits50, qext_cache_caps50},    /* qext_cache */
-#endif
 };
 #endif /* ENABLE_QEXT */
 
diff --git a/celt/vq.c b/celt/vq.c
index fbe652fe8..759c24379 100644
--- a/celt/vq.c
+++ b/celt/vq.c
@@ -38,7 +38,6 @@
 #include "bands.h"
 #include "rate.h"
 #include "pitch.h"
-#include "SigProc_FIX.h"
 
 #if defined(FIXED_POINT)
 void norm_scaleup(celt_norm *X, int N, int shift) {
@@ -373,190 +372,16 @@ opus_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch)
    return yy;
 }
 
-#ifdef ENABLE_QEXT
-#include "macros.h"
-
-static opus_val32 op_pvq_search_N2(const celt_norm *X, int *iy, int *up_iy, int K, int up, int *refine, int shift) {
-   opus_val32 sum;
-   opus_val32 rcp_sum;
-   int offset;
-   sum = ABS32(X[0]) + ABS32(X[1]);
-   if (sum < EPSILON) {
-      iy[0] = K;
-      up_iy[0] = up*K;
-      iy[1]=up_iy[1]=0;
-      *refine=0;
-#ifdef FIXED_POINT
-      return (opus_val64)K*K*up*up>>2*shift;
-#else
-      (void)shift;
-      return K*(float)K*up*up;
-#endif
-   }
-#ifdef FIXED_POINT
-   int sum_shift;
-   opus_val32 X0;
-   sum_shift = 30-celt_ilog2(sum);
-   rcp_sum = celt_rcp_norm32(SHL32(sum, sum_shift));
-   X0 = MULT32_32_Q31(SHL32(X[0], sum_shift), rcp_sum);
-   iy[0] = PSHR32(MULT32_32_Q31(SHL32(K, 8), X0), 7);
-   up_iy[0] = PSHR32(MULT32_32_Q31(SHL32(up*K, 8), X0), 7);
-#else
-   rcp_sum = 1.f/sum;
-   iy[0] = (int)floor(.5f+K*X[0]*rcp_sum);
-   up_iy[0] = (int)floor(.5f+up*K*X[0]*rcp_sum);
-#endif
-   up_iy[0] = IMAX(up*iy[0] - (up-1)/2, IMIN(up*iy[0] + (up-1)/2, up_iy[0]));
-   offset = up_iy[0] - up*iy[0];
-   iy[1] = K-abs(iy[0]);
-   up_iy[1] = up*K-abs(up_iy[0]);
-   if (X[1] < 0) {
-      iy[1] = -iy[1];
-      up_iy[1] = -up_iy[1];
-      offset = -offset;
-   }
-   *refine = offset;
-#ifdef FIXED_POINT
-   return (up_iy[0]*(opus_val64)up_iy[0] + up_iy[1]*(opus_val64)up_iy[1] + (1<<2*shift>>1))>>2*shift;
-#else
-   return up_iy[0]*(opus_val64)up_iy[0] + up_iy[1]*(opus_val64)up_iy[1];
-#endif
-}
-
-static int op_pvq_refine(const opus_val32 *Xn, int *iy, int *iy0, int K, int up, int margin, int N) {
-   int i;
-   int dir;
-   VARDECL(opus_val32, rounding);
-   int iysum = 0;
-   SAVE_STACK;
-   ALLOC(rounding, N, opus_val32);
-   for (i=0;i<N;i++) {
-      opus_val32 tmp;
-      tmp = MULT32_32_Q31(SHL32(K, 8), Xn[i]);
-#ifdef FIXED_POINT
-      iy[i] = (tmp+64) >> 7;
-#else
-      iy[i] = (int)floor(.5+tmp);
-#endif
-      rounding[i] = tmp - SHL32(iy[i], 7);
-   }
-   if (iy != iy0) {
-      for (i=0;i<N;i++) iy[i] = IMIN(up*iy0[i]+up-1, IMAX(up*iy0[i]-up+1, iy[i]));
-   }
-   for (i=0;i<N;i++) iysum += iy[i];
-   if (abs(iysum - K) > 32) {
       RESTORE_STACK;
-      return 1;
-   }
-   dir = iysum < K ? 1 : -1;
-   while (iysum != K) {
-      opus_val32 roundval=-1000000*dir;
-      int roundpos=0;
-      for (i=0;i<N;i++) {
-         if ((rounding[i]-roundval)*dir > 0 && abs(iy[i]-up*iy0[i]) < (margin-1) && !(dir==-1 && iy[i] == 0)) {
-            roundval = rounding[i];
-            roundpos = i;
-         }
-      }
-      iy[roundpos] += dir;
-      rounding[roundpos] -= SHL32(dir, 15);
-      iysum+=dir;
-   }
    RESTORE_STACK;
-   return 0;
-}
-
-static opus_val32 op_pvq_search_extra(const celt_norm *X, int *iy, int *up_iy, int K, int up, int *refine, int N, int shift) {
-   opus_val32 rcp_sum;
-   opus_val32 sum=0;
-   int i;
-   int failed=0;
-   opus_val64 yy=0;
-   VARDECL(opus_val32, Xn);
-   SAVE_STACK;
-   for (i=0;i<N;i++) sum += ABS32(X[i]);
-   ALLOC(Xn, N, opus_val32);
-   if (sum < EPSILON)
-      failed = 1;
-   else {
-#ifdef FIXED_POINT
-      int sum_shift = 30-celt_ilog2(sum);
-      rcp_sum = celt_rcp_norm32(SHL32(sum, sum_shift));
-      for (i=0;i<N;i++) {
-         Xn[i] = MULT32_32_Q31(SHL32(ABS32(X[i]), sum_shift), rcp_sum);
-      }
-#else
-      rcp_sum = celt_rcp(sum);
-      for (i=0;i<N;i++) {
-         Xn[i] = ABS32(X[i])*rcp_sum;
-      }
-#endif
-   }
-   failed = failed || op_pvq_refine(Xn, iy, iy, K, 1, K+1, N);
-   failed = failed || op_pvq_refine(Xn, up_iy, iy, up*K, up, up, N);
-   if (failed) {
-      iy[0] = K;
-      for (i=1;i<N;i++) iy[i] = 0;
-      up_iy[0] = up*K;
-      for (i=1;i<N;i++) up_iy[i] = 0;
-   }
-   for (i=0;i<N;i++) {
-      yy += up_iy[i]*(opus_val64)up_iy[i];
-      if (X[i] < 0) {
-         iy[i] = -iy[i];
-         up_iy[i] = -up_iy[i];
-      }
-      refine[i] = up_iy[i]-up*iy[i];
-   }
    RESTORE_STACK;
-#ifdef FIXED_POINT
-   return (yy + (1<<2*shift>>1))>>2*shift;
-#else
-   (void)shift;
-   return yy;
-#endif
-}
-#endif
-
-#ifdef ENABLE_QEXT
-/* Take advantage of the fact that "large" refine values are much less likely
-   than smaller ones. */
-static void ec_enc_refine(ec_enc *enc, opus_int32 refine, opus_int32 up, int extra_bits, int use_entropy) {
-   int large;
-   large = abs(refine)>up/2;
-   ec_enc_bit_logp(enc, large, use_entropy ? 3 : 1);
-   if (large) {
-      ec_enc_bits(enc, refine < 0, 1);
-      ec_enc_bits(enc, abs(refine)-up/2-1, extra_bits-1);
-   } else {
-      ec_enc_bits(enc, refine+up/2, extra_bits);
-   }
-}
-
-static int ec_dec_refine(ec_enc *dec, opus_int32 up, int extra_bits, int use_entropy) {
-   int large, refine;
-   large = ec_dec_bit_logp(dec, use_entropy ? 3 : 1);
-   if (large) {
-      int sign = ec_dec_bits(dec, 1);
-      refine = ec_dec_bits(dec, extra_bits-1) + up/2+1;
-      if (sign) refine = -refine;
-   } else {
-      refine = (opus_int32)ec_dec_bits(dec, extra_bits)-up/2;
-   }
-   return refine;
-}
-#endif
 
 unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
-      opus_val32 gain, int resynth
-      ARG_QEXT(ec_enc *ext_enc) ARG_QEXT(int extra_bits), int arch)
+      opus_val32 gain, int resynth, int arch)
 {
    VARDECL(int, iy);
    opus_val32 yy;
    unsigned collapse_mask;
-#ifdef ENABLE_QEXT
-   int yy_shift = 0;
-#endif
    SAVE_STACK;
 
    celt_assert2(K>0, "alg_quant() needs at least one pulse");
@@ -567,45 +392,10 @@ unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
 
    exp_rotation(X, N, 1, B, K, spread);
 
-#ifdef ENABLE_QEXT
-   if (N==2 && extra_bits >= 2) {
-      int refine;
-      int up_iy[2];
-      int up;
-      yy_shift = IMAX(0, extra_bits-7);
-      up = (1<<extra_bits)-1;
-      yy = op_pvq_search_N2(X, iy, up_iy, K, up, &refine, yy_shift);
-      collapse_mask = extract_collapse_mask(up_iy, N, B);
-      encode_pulses(iy, N, K, enc);
-      ec_enc_uint(ext_enc, refine+(up-1)/2, up);
-      if (resynth)
-         normalise_residual(up_iy, X, N, yy, gain, yy_shift);
-   } else if (extra_bits >= 2) {
-      int i;
-      VARDECL(int, up_iy);
-      VARDECL(int, refine);
-      int up, use_entropy;
-      ALLOC(up_iy, N, int);
-      ALLOC(refine, N, int);
-      yy_shift = IMAX(0, extra_bits-7);
-      up = (1<<extra_bits)-1;
-      yy = op_pvq_search_extra(X, iy, up_iy, K, up, refine, N, yy_shift);
-      collapse_mask = extract_collapse_mask(up_iy, N, B);
-      encode_pulses(iy, N, K, enc);
-      use_entropy = (ext_enc->storage*8 - ec_tell(ext_enc)) > (unsigned)(N-1)*(extra_bits+3)+1;
-      for (i=0;i<N-1;i++) ec_enc_refine(ext_enc, refine[i], up, extra_bits, use_entropy);
-      if (iy[N-1]==0) ec_enc_bits(ext_enc, up_iy[N-1]<0, 1);
-      if (resynth)
-         normalise_residual(up_iy, X, N, yy, gain, yy_shift);
-   } else
-#endif
-   {
-      yy = op_pvq_search(X, iy, K, N, arch);
-      collapse_mask = extract_collapse_mask(iy, N, B);
-      encode_pulses(iy, N, K, enc);
-      if (resynth)
-         normalise_residual(iy, X, N, yy, gain, 0);
-   }
+   yy = op_pvq_search(X, iy, K, N, arch);
+   collapse_mask = extract_collapse_mask(iy, N, B);
+   encode_pulses(iy, N, K, enc);
+   if (resynth) normalise_residual(iy, X, N, yy, gain, 0);
 
    if (resynth)
       exp_rotation(X, N, -1, B, K, spread);
@@ -617,8 +407,7 @@ unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
 /** Decode pulse vector and combine the result with the pitch vector to produce
     the final normalised signal in the current band. */
 unsigned alg_unquant(celt_norm *X, int N, int K, int spread, int B,
-      ec_dec *dec, opus_val32 gain
-      ARG_QEXT(ec_enc *ext_dec) ARG_QEXT(int extra_bits))
+      ec_dec *dec, opus_val32 gain)
 {
    opus_val32 Ryy;
    unsigned collapse_mask;
@@ -630,58 +419,6 @@ unsigned alg_unquant(celt_norm *X, int N, int K, int spread, int B,
    celt_assert2(N>1, "alg_unquant() needs at least two dimensions");
    ALLOC(iy, N, int);
    Ryy = decode_pulses(iy, N, K, dec);
-#ifdef ENABLE_QEXT
-   if (N==2 && extra_bits >= 2) {
-      int up;
-      int refine;
-      yy_shift = IMAX(0, extra_bits-7);
-      up = (1<<extra_bits)-1;
-      refine = (opus_int32)ec_dec_uint(ext_dec, up) - (up-1)/2;
-      iy[0] *= up;
-      iy[1] *= up;
-      if (iy[1] == 0) {
-         iy[1] = (iy[0] > 0) ? -refine : refine;
-         iy[0] += (refine*(opus_int64)iy[0] > 0) ? -refine : refine;
-      } else if (iy[1] > 0) {
-         iy[0] += refine;
-         iy[1] -= refine*(iy[0]>0?1:-1);
-      } else {
-         iy[0] -= refine;
-         iy[1] -= refine*(iy[0]>0?1:-1);
-      }
-#ifdef FIXED_POINT
-      Ryy = (iy[0]*(opus_val64)iy[0] + iy[1]*(opus_val64)iy[1] + (1<<2*yy_shift>>1)) >> 2*yy_shift;
-#else
-      Ryy = iy[0]*(opus_val64)iy[0] + iy[1]*(opus_val64)iy[1];
-#endif
-   } else if (extra_bits >= 2) {
-      int i;
-      opus_val64 yy64;
-      VARDECL(int, refine);
-      int up, use_entropy;
-      int sign=0;
-      ALLOC(refine, N, int);
-      yy_shift = IMAX(0, extra_bits-7);
-      up = (1<<extra_bits)-1;
-      use_entropy = (ext_dec->storage*8 - ec_tell(ext_dec)) > (unsigned)(N-1)*(extra_bits+3)+1;
-      for (i=0;i<N-1;i++) refine[i] = ec_dec_refine(ext_dec, up, extra_bits, use_entropy);
-      if (iy[N-1]==0) sign = ec_dec_bits(ext_dec, 1);
-      else sign = iy[N-1] < 0;
-      for (i=0;i<N-1;i++) {
-         iy[i] = iy[i]*up + refine[i];
-      }
-      iy[N-1] = up*K;
-      for (i=0;i<N-1;i++) iy[N-1] -= abs(iy[i]);
-      if (sign) iy[N-1] = -iy[N-1];
-      yy64 = 0;
-      for (i=0;i<N;i++) yy64 += iy[i]*(opus_val64)iy[i];
-#ifdef FIXED_POINT
-      Ryy = (yy64 + (1<<2*yy_shift>>1)) >> 2*yy_shift;
-#else
-      Ryy = yy64;
-#endif
-   }
-#endif
    normalise_residual(iy, X, N, Ryy, gain, yy_shift);
    exp_rotation(X, N, -1, B, K, spread);
    collapse_mask = extract_collapse_mask(iy, N, B);
diff --git a/celt/vq.h b/celt/vq.h
index 07fa44abe..1f368a57b 100644
--- a/celt/vq.h
+++ b/celt/vq.h
@@ -74,8 +74,7 @@ opus_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch);
  * @ret A mask indicating which blocks in the band received pulses
 */
 unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
-      opus_val32 gain, int resynth
-      ARG_QEXT(ec_enc *ext_enc) ARG_QEXT(int extra_bits), int arch);
+      opus_val32 gain, int resynth, int arch);
 
 /** Algebraic pulse decoder
  * @param X Decoded normalised spectrum (returned)
@@ -85,8 +84,7 @@ unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
  * @ret A mask indicating which blocks in the band received pulses
  */
 unsigned alg_unquant(celt_norm *X, int N, int K, int spread, int B,
-      ec_dec *dec, opus_val32 gain
-      ARG_QEXT(ec_enc *ext_dec) ARG_QEXT(int extra_bits));
+      ec_dec *dec, opus_val32 gain);
 
 void renormalise_vector(celt_norm *X, int N, opus_val32 gain, int arch);
 
diff --git a/include/opus_defines.h b/include/opus_defines.h
index 4a61406db..28ae954ba 100644
--- a/include/opus_defines.h
+++ b/include/opus_defines.h
@@ -175,8 +175,8 @@ extern "C" {
 /*#define OPUS_GET_DNN_BLOB_REQUEST 4053 */
 #define OPUS_SET_OSCE_BWE_REQUEST 4054
 #define OPUS_GET_OSCE_BWE_REQUEST 4055
-#define OPUS_SET_QEXT_REQUEST 4056
-#define OPUS_GET_QEXT_REQUEST 4057
+
+
 #define OPUS_SET_IGNORE_EXTENSIONS_REQUEST 4058
 #define OPUS_GET_IGNORE_EXTENSIONS_REQUEST 4059
 
@@ -658,14 +658,6 @@ extern "C" {
   * @hideinitializer */
 #define OPUS_SET_DNN_BLOB(data, len) OPUS_SET_DNN_BLOB_REQUEST, opus_check_void_ptr(data), opus_check_int(len)
 
-/** If set to 1, enables quality extension (QEXT), otherwise disables it (default). Warning: This will *hurt* audio quality unless operating at
-    a very high bitrate.
-  * @hideinitializer */
-#define OPUS_SET_QEXT(x) OPUS_SET_QEXT_REQUEST, opus_check_int(x)
-/** Gets the encoder's configured quality extension (QEXT).
-  * @hideinitializer */
-#define OPUS_GET_QEXT(x) OPUS_GET_QEXT_REQUEST, opus_check_int_ptr(x)
-
 /**@}*/
 
 /** @defgroup opus_genericctls Generic CTLs
diff --git a/src/opus_decoder.c b/src/opus_decoder.c
index 1678e1e30..8dc86cea7 100644
--- a/src/opus_decoder.c
+++ b/src/opus_decoder.c
@@ -269,7 +269,7 @@ static int opus_packet_get_mode(const unsigned char *data)
 }
 
 static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
-      opus_int32 len, opus_res *pcm, int frame_size, int decode_fec ARG_QEXT(opus_extension_data *ext))
+      opus_int32 len, opus_res *pcm, int frame_size, int decode_fec)
 {
    void *silk_dec;
    CELTDecoder *celt_dec;
@@ -345,7 +345,7 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
       if (audiosize > F20)
       {
          do {
-            int ret = opus_decode_frame(st, NULL, 0, pcm, IMIN(audiosize, F20), 0 ARG_QEXT(NULL));
+            int ret = opus_decode_frame(st, NULL, 0, pcm, IMIN(audiosize, F20), 0);
             if (ret<0)
             {
                RESTORE_STACK;
@@ -387,7 +387,7 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
    if (transition && mode == MODE_CELT_ONLY)
    {
       pcm_transition = pcm_transition_celt;
-      opus_decode_frame(st, NULL, 0, pcm_transition, IMIN(F5, audiosize), 0 ARG_QEXT(NULL));
+      opus_decode_frame(st, NULL, 0, pcm_transition, IMIN(F5, audiosize), 0);
    }
    if (audiosize > frame_size)
    {
@@ -540,7 +540,7 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
    if (transition && mode != MODE_CELT_ONLY)
    {
       pcm_transition = pcm_transition_silk;
-      opus_decode_frame(st, NULL, 0, pcm_transition, IMIN(F5, audiosize), 0 ARG_QEXT(NULL));
+      opus_decode_frame(st, NULL, 0, pcm_transition, IMIN(F5, audiosize), 0);
    }
 
 
@@ -608,7 +608,7 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
 #ifdef ENABLE_DEEP_PLC
                                      , &st->lpcnet
 #endif
-                                     ARG_QEXT(ext ? ext->data : NULL) ARG_QEXT(ext ? ext->len : 0));
+                                     );
       celt_decoder_ctl(celt_dec, OPUS_GET_FINAL_RANGE(&st->rangeFinal));
    } else {
       unsigned char silence[2] = {0xFF, 0xFF};
@@ -765,7 +765,7 @@ int opus_decode_native(OpusDecoder *st, const unsigned char *data,
       int pcm_count=0;
       do {
          int ret;
-         ret = opus_decode_frame(st, NULL, 0, pcm+pcm_count*st->channels, frame_size-pcm_count, 0 ARG_QEXT(NULL));
+         ret = opus_decode_frame(st, NULL, 0, pcm+pcm_count*st->channels, frame_size-pcm_count, 0);
          if (ret<0)
             return ret;
          pcm_count += ret;
@@ -820,7 +820,7 @@ int opus_decode_native(OpusDecoder *st, const unsigned char *data,
       st->frame_size = packet_frame_size;
       st->stream_channels = packet_stream_channels;
       ret = opus_decode_frame(st, data, size[0], pcm+st->channels*(frame_size-packet_frame_size),
-            packet_frame_size, 1 ARG_QEXT(NULL));
+            packet_frame_size, 1);
       if (ret<0)
          return ret;
       else {
@@ -844,22 +844,7 @@ int opus_decode_native(OpusDecoder *st, const unsigned char *data,
    for (i=0;i<count;i++)
    {
       int ret;
-#ifdef ENABLE_QEXT
-      opus_extension_data ext;
-      ext.frame = -1;
-      ext.data = NULL;
-      ext.len = 0;
-      ext.id = -1;
-      while (ext.frame < i) {
-         OpusExtensionIterator iter_copy;
-         iter_copy = iter;
-         ret = opus_extension_iterator_find(&iter, &ext, QEXT_EXTENSION_ID);
-         if (ret <= 0) break;
-         if (ext.frame > i) iter = iter_copy;
-      }
-      if (ext.frame != i) ext.data = NULL;
-#endif
-      ret = opus_decode_frame(st, data, size[i], pcm+nb_samples*st->channels, frame_size-nb_samples, 0 ARG_QEXT(&ext));
+      ret = opus_decode_frame(st, data, size[i], pcm+nb_samples*st->channels, frame_size-nb_samples, 0);
       if (ret<0)
          return ret;
       celt_assert(ret==packet_frame_size);
diff --git a/src/opus_demo.c b/src/opus_demo.c
index f040f9f2b..8d201436f 100644
--- a/src/opus_demo.c
+++ b/src/opus_demo.c
@@ -150,9 +150,6 @@ void print_usage( char* argv[] )
 #ifdef ENABLE_OSCE_BWE
     fprintf(stderr, "-enable_osce_bwe     : enable OSCE bandwidth extension for wideband signals (48 kHz sampling rate only), raises dec_complexity to 4\n");
 #endif
-#ifdef ENABLE_QEXT
-    fprintf(stderr, "-qext                : enable QEXT\n" );
-#endif
 }
 
 #define FORMAT_S16_LE 0
@@ -463,9 +460,6 @@ int main(int argc, char *argv[])
     int dred_duration=0;
     int ignore_extensions=0;
     int encoder_loss=0;
-#ifdef ENABLE_QEXT
-    int enable_qext=0;
-#endif
 #ifdef ENABLE_OSCE_TRAINING_DATA
     int silk_random_switching = 0;
     int silk_frame_counter = 0;
@@ -743,12 +737,6 @@ int main(int argc, char *argv[])
             check_decoder_option(encode_only, "-ignore_extensions");
             ignore_extensions = 1;
             args++;
-#ifdef ENABLE_QEXT
-        } else if( strcmp( argv[ args ], "-qext" ) == 0 ) {
-            check_encoder_option(decode_only, "-qext");
-            enable_qext = 1;
-            args++;
-#endif
 #ifdef ENABLE_OSCE_TRAINING_DATA
         } else if( strcmp( argv[ args ], "-silk_random_switching" ) == 0 ){
             silk_random_switching = atoi( argv[ args + 1 ] );
@@ -834,9 +822,6 @@ int main(int argc, char *argv[])
 #ifdef ENABLE_OSCE_TRAINING_DATA
        opus_encoder_ctl(enc, OPUS_SET_FORCE_MODE(MODE_SILK_ONLY));
        srand(0);
-#endif
-#ifdef ENABLE_QEXT
-       opus_encoder_ctl(enc, OPUS_SET_QEXT(enable_qext));
 #endif
     }
     if (!encode_only)
diff --git a/src/opus_encoder.c b/src/opus_encoder.c
index a74631fc2..0b8c22ee0 100644
--- a/src/opus_encoder.c
+++ b/src/opus_encoder.c
@@ -1213,10 +1213,6 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
 #endif
     ALLOC_STACK;
 
-#ifdef ENABLE_QEXT
-   if (st->enable_qext) packet_size_cap = QEXT_PACKET_SIZE_CAP;
-#endif
-
     /* Just avoid insane packet sizes here, but the real bounds are applied later on. */
     max_data_bytes = IMIN(packet_size_cap*6, out_data_bytes);
 
@@ -1786,11 +1782,6 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
 #ifdef ENABLE_DRED
           curr_max = IMIN(curr_max, (max_len_sum-bitrate_to_bits(dred_bitrate_bps, st->Fs, frame_size)/8)/nb_frames);
           if (first_frame) curr_max += bitrate_to_bits(dred_bitrate_bps, st->Fs, frame_size)/8;
-#endif
-#ifdef ENABLE_QEXT
-          /* Leave room for signaling the extension size once we repacketize. */
-          if (st->enable_qext)
-             curr_max -= curr_max/254;
 #endif
           curr_max = IMIN(max_len_sum-tot_size, curr_max);
 #ifndef DISABLE_FLOAT_API
@@ -2487,13 +2478,7 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
         /* If false, we already busted the budget and we'll end up with a "PLC frame" */
         if (ec_tell(&enc) <= 8*nb_compr_bytes)
         {
-#ifdef ENABLE_QEXT
-           if (st->mode == MODE_CELT_ONLY) celt_encoder_ctl(celt_enc, OPUS_SET_QEXT(st->enable_qext));
-#endif
            ret = celt_encode_with_ec(celt_enc, pcm_buf, frame_size, NULL, nb_compr_bytes, &enc);
-#ifdef ENABLE_QEXT
-           celt_encoder_ctl(celt_enc, OPUS_SET_QEXT(0));
-#endif
            if (ret < 0)
            {
               RESTORE_STACK;
@@ -3217,28 +3202,6 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             *value = st->dred_duration;
         }
         break;
-#endif
-#ifdef ENABLE_QEXT
-      case OPUS_SET_QEXT_REQUEST:
-      {
-          opus_int32 value = va_arg(ap, opus_int32);
-          if(value<0 || value>1)
-          {
-             goto bad_arg;
-          }
-          st->enable_qext = value;
-      }
-      break;
-      case OPUS_GET_QEXT_REQUEST:
-      {
-          opus_int32 *value = va_arg(ap, opus_int32*);
-          if (!value)
-          {
-             goto bad_arg;
-          }
-          *value = st->enable_qext;
-      }
-      break;
 #endif
         case OPUS_RESET_STATE:
         {
diff --git a/src/opus_multistream_encoder.c b/src/opus_multistream_encoder.c
index 79c0d3b7d..fbdfc0548 100644
--- a/src/opus_multistream_encoder.c
+++ b/src/opus_multistream_encoder.c
@@ -832,11 +832,7 @@ static opus_int32 rate_allocation(
 }
 
 /* Max size in case the encoder decides to return six frames (6 x 20 ms = 120 ms) */
-#ifdef ENABLE_QEXT
-#define MS_FRAME_TMP (6*QEXT_PACKET_SIZE_CAP+12)
-#else
 #define MS_FRAME_TMP (6*1275+12)
-#endif
 
 int opus_multistream_encode_native
 (
@@ -1209,7 +1205,6 @@ int opus_multistream_encoder_ctl_va_list(OpusMSEncoder *st, int request,
    case OPUS_GET_FORCE_CHANNELS_REQUEST:
    case OPUS_GET_PREDICTION_DISABLED_REQUEST:
    case OPUS_GET_PHASE_INVERSION_DISABLED_REQUEST:
-   case OPUS_GET_QEXT_REQUEST:
    {
       OpusEncoder *enc;
       /* For int32* GET params, just query the first stream */
@@ -1257,7 +1252,6 @@ int opus_multistream_encoder_ctl_va_list(OpusMSEncoder *st, int request,
    case OPUS_SET_FORCE_CHANNELS_REQUEST:
    case OPUS_SET_PREDICTION_DISABLED_REQUEST:
    case OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST:
-   case OPUS_SET_QEXT_REQUEST:
    {
       int s;
       /* This works for int32 params */
diff --git a/tests/opus_encode_regressions.c b/tests/opus_encode_regressions.c
index fb76d3eb3..a9adacfcf 100644
--- a/tests/opus_encode_regressions.c
+++ b/tests/opus_encode_regressions.c
@@ -1153,7 +1153,6 @@ int projection_overflow(void)
     opus_test_assert(err == OPUS_BAD_ARG);
     return 0;
 #endif
-    opus_projection_encoder_ctl(enc, OPUS_SET_QEXT(1));
     data_len = opus_projection_encode(enc, pcm, 1920, data, 10000);
     opus_test_assert(data_len > 0 && data_len <= 10000);
     opus_projection_encoder_destroy(enc);
@@ -1192,7 +1191,6 @@ int projection_overflow4(void)
 
     enc = opus_projection_ambisonics_encoder_create(96000, 36, 3, &streams,
         &coupled_streams, OPUS_APPLICATION_AUDIO, &err);
-    opus_projection_encoder_ctl(enc, OPUS_SET_QEXT(1));
     opus_projection_encoder_ctl(enc, OPUS_SET_BITRATE(256000));
     data_len = opus_projection_encode(enc, pcm, 480, data, 1000);
     opus_test_assert(data_len > 0 && data_len <= 1000);
@@ -1212,7 +1210,6 @@ int qext_repacketize_fail(void)
 
     enc = opus_encoder_create(16000, 1, OPUS_APPLICATION_VOIP, &err);
     opus_encoder_ctl(enc, OPUS_SET_VBR(0));
-    opus_encoder_ctl(enc, OPUS_SET_QEXT(1));
     opus_encoder_ctl(enc, OPUS_SET_BITRATE(OPUS_BITRATE_MAX));
     data_len = opus_encode(enc, pcm, 960, data, 9000);
     /* returns OPUS_INTERNAL_ERROR (-3) */
@@ -1262,7 +1259,6 @@ int qext_dred_combination(void)
         &coupled_streams, mapping, OPUS_APPLICATION_VOIP, &err);
     opus_multistream_encoder_ctl(enc, OPUS_SET_COMPLEXITY(3));
     opus_multistream_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(12));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_QEXT(1));
     opus_multistream_encoder_ctl(enc, OPUS_MULTISTREAM_GET_ENCODER_STATE(0, &stream_enc));
     opus_encoder_ctl(stream_enc, OPUS_SET_DRED_DURATION(103));
     opus_multistream_encoder_ctl(enc, OPUS_SET_BITRATE(755850));
diff --git a/tests/test_opus_custom.c b/tests/test_opus_custom.c
index faa84e59f..bcf7302ca 100644
--- a/tests/test_opus_custom.c
+++ b/tests/test_opus_custom.c
@@ -618,9 +618,6 @@ void test_opus_custom(const int num_encoders, const int num_setting_changes) {
             if (opus_custom_encoder_ctl(encC, OPUS_SET_COMPLEXITY(complexity)) != OPUS_OK) test_failed();
             if (opus_custom_encoder_ctl(encC, OPUS_SET_PACKET_LOSS_PERC(pkt_loss)) != OPUS_OK) test_failed();
             if (opus_custom_encoder_ctl(encC, OPUS_SET_LSB_DEPTH(lsb_depth)) != OPUS_OK) test_failed();
-#ifdef ENABLE_QEXT
-            if (opus_custom_encoder_ctl(encC, OPUS_SET_QEXT(params.qext)) != OPUS_OK) test_failed();
-#endif
          }
          else {
             if (opus_encoder_ctl(enc, OPUS_SET_BITRATE(bitrate)) != OPUS_OK) test_failed();
diff --git a/tests/test_opus_encode.c b/tests/test_opus_encode.c
index 74603e8a6..d4bab0b86 100644
--- a/tests/test_opus_encode.c
+++ b/tests/test_opus_encode.c
@@ -278,9 +278,6 @@ void fuzz_encoder_settings(const int num_encoders, const int num_setting_changes
          if(opus_encoder_ctl(enc, OPUS_SET_EXPERT_FRAME_DURATION(frame_size_enum)) != OPUS_OK) test_failed();
 #ifdef ENABLE_DRED
          if(opus_encoder_ctl(enc, OPUS_SET_DRED_DURATION(fast_rand()%101)) != OPUS_OK) test_failed();
-#endif
-#ifdef ENABLE_QEXT
-         if(opus_encoder_ctl(enc, OPUS_SET_QEXT(fast_rand()%2))!=OPUS_OK)test_failed();
 #endif
          if(test_encode(enc, num_channels, frame_size, dec)) {
             fprintf(stderr,
@@ -438,8 +435,7 @@ int run_test1(int no_fuzz)
          rate=rates[j]+fast_rand()%rates[j];
          count=i=0;
          do {
-            int bw,len,out_samples,frame_size,unpad;
-            int qext=0;
+            int bw,len,out_samples,frame_size;
             frame_size=frame[j];
             if((fast_rand()&255)==0)
             {
@@ -471,10 +467,6 @@ int run_test1(int no_fuzz)
                            OPUS_BANDWIDTH_NARROWBAND+(fast_rand()%5);
             if(modes[j]==2&&bw==OPUS_BANDWIDTH_MEDIUMBAND)bw+=3;
             if(opus_encoder_ctl(enc, OPUS_SET_BANDWIDTH(bw))!=OPUS_OK)test_failed();
-#ifdef ENABLE_QEXT
-            qext=fast_rand()%2;
-            if(opus_encoder_ctl(enc, OPUS_SET_QEXT(qext))!=OPUS_OK)test_failed();
-#endif
             len = opus_encode(enc, &inbuf[i<<1], frame_size, packet, MAX_PACKET);
             if(len<0 || len>MAX_PACKET)test_failed();
             if(opus_encoder_ctl(enc, OPUS_GET_FINAL_RANGE(&enc_final_range))!=OPUS_OK)test_failed();
@@ -488,17 +480,15 @@ int run_test1(int no_fuzz)
                if(opus_packet_pad(packet,len,len+256)!=OPUS_OK)test_failed();
                len+=256;
             }
-            unpad = 0;
             if((fast_rand()&3)==0)
             {
-               unpad=1;
                len=opus_packet_unpad(packet,len);
                if(len<1)test_failed();
             }
             out_samples = opus_decode(dec, packet, len, &outbuf[i<<1], MAX_FRAME_SAMP, 0);
             if(out_samples!=frame_size)test_failed();
             if(opus_decoder_ctl(dec, OPUS_GET_FINAL_RANGE(&dec_final_range))!=OPUS_OK)test_failed();
-            if(enc_final_range!=dec_final_range && !(unpad && qext))test_failed();
+            if(enc_final_range!=dec_final_range)test_failed();
             /*LBRR decode*/
             out_samples = opus_decode(dec_err[0], packet, len, out2buf, frame_size, (fast_rand()&3)!=0);
             if(out_samples!=frame_size)test_failed();
@@ -536,9 +526,8 @@ int run_test1(int no_fuzz)
          if(opus_multistream_encoder_ctl(MSenc, OPUS_SET_BITRATE(rate))!=OPUS_OK)test_failed();
          count=i=0;
          do {
-            int len,out_samples,frame_size,loss,unpad;
+            int len,out_samples,frame_size,loss;
             opus_int32 pred;
-            int qext=0;
             if(opus_multistream_encoder_ctl(MSenc, OPUS_GET_PREDICTION_DISABLED(&pred))!=OPUS_OK)test_failed();
             if(opus_multistream_encoder_ctl(MSenc, OPUS_SET_PREDICTION_DISABLED((int)(fast_rand()&15)<(pred?11:4)))!=OPUS_OK)test_failed();
             frame_size=frame[j];
@@ -557,10 +546,6 @@ int run_test1(int no_fuzz)
             {
                if(opus_multistream_decoder_ctl(MSdec_err, OPUS_RESET_STATE)!=OPUS_OK)test_failed();
             }
-#ifdef ENABLE_QEXT
-            qext=fast_rand()%2;
-            if(opus_multistream_encoder_ctl(MSenc, OPUS_SET_QEXT(qext))!=OPUS_OK)test_failed();
-#endif
             len = opus_multistream_encode(MSenc, &inbuf[i<<1], frame_size, packet, MAX_PACKET);
             if(len<0 || len>MAX_PACKET)test_failed();
             if(opus_multistream_encoder_ctl(MSenc, OPUS_GET_FINAL_RANGE(&enc_final_range))!=OPUS_OK)test_failed();
@@ -574,17 +559,15 @@ int run_test1(int no_fuzz)
                if(opus_multistream_packet_pad(packet,len,len+256,2)!=OPUS_OK)test_failed();
                len+=256;
             }
-            unpad=0;
             if((fast_rand()&3)==0)
             {
                len=opus_multistream_packet_unpad(packet,len,2);
                if(len<1)test_failed();
-               unpad=1;
             }
             out_samples = opus_multistream_decode(MSdec, packet, len, out2buf, MAX_FRAME_SAMP, 0);
             if(out_samples!=frame_size*6)test_failed();
             if(opus_multistream_decoder_ctl(MSdec, OPUS_GET_FINAL_RANGE(&dec_final_range))!=OPUS_OK)test_failed();
-            if(enc_final_range!=dec_final_range && !(unpad && qext))test_failed();
+            if(enc_final_range!=dec_final_range)test_failed();
             /*LBRR decode*/
             loss=(fast_rand()&63)==0;
             out_samples = opus_multistream_decode(MSdec_err, packet, loss?0:len, out2buf, frame_size*6, (fast_rand()&3)!=0);

From e4f10df13c33e7a5b74983d808006dac593b1b50 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jeanmarcv@google.com>
Date: Mon, 11 Aug 2025 15:25:30 -0400
Subject: [PATCH 02/28] Always use extra precision from RES24 and QEXT

Remove ENABLE_RES24 option, keep QEXT just for 96 kHz support

Signed-off-by: Jean-Marc Valin <jeanmarcv@google.com>
---
 celt/_kiss_fft_guts.h          |    5 -
 celt/arch.h                    |   26 -
 celt/celt_decoder.c            |    9 +-
 celt/celt_encoder.c            |   32 +-
 celt/dump_modes/Makefile       |    4 +-
 celt/dump_modes/dump_modes.c   |   69 --
 celt/kiss_fft.c                |   11 -
 celt/kiss_fft.h                |    6 +-
 celt/mathops.h                 |   12 +-
 celt/mdct.c                    |   17 -
 celt/modes.c                   |    5 -
 celt/static_modes_fixed.h      | 1922 --------------------------------
 celt/tests/test_unit_mathops.c |    8 -
 celt/tests/test_unit_mdct.c    |    4 -
 celt/vq.c                      |    6 +-
 configure.ac                   |    8 -
 include/opus_defines.h         |    1 +
 src/mapping_matrix.c           |    4 -
 src/opus_decoder.c             |   36 +-
 src/opus_encoder.c             |   46 +-
 tests/test_opus_custom.c       |    6 +-
 21 files changed, 15 insertions(+), 2222 deletions(-)

diff --git a/celt/_kiss_fft_guts.h b/celt/_kiss_fft_guts.h
index db443c053..fa1e37fe2 100644
--- a/celt/_kiss_fft_guts.h
+++ b/celt/_kiss_fft_guts.h
@@ -54,13 +54,8 @@
 
 #define SAMP_MIN -SAMP_MAX
 
-#ifdef ENABLE_QEXT
 #   define S_MUL(a,b) MULT32_32_P31_ovflw(b, a)
 #   define S_MUL2(a,b) MULT32_32_P31_ovflw(b, a)
-#else
-#   define S_MUL(a,b) MULT16_32_Q15(b, a)
-#   define S_MUL2(a,b) MULT16_32_Q16(b, a)
-#endif
 
 #   define C_MUL(m,a,b) \
       do{ (m).r = SUB32_ovflw(S_MUL((a).r,(b).r) , S_MUL((a).i,(b).i)); \
diff --git a/celt/arch.h b/celt/arch.h
index 63b8ebe60..b88648beb 100644
--- a/celt/arch.h
+++ b/celt/arch.h
@@ -146,7 +146,6 @@ typedef opus_val32 celt_norm;
 typedef opus_val32 celt_ener;
 typedef opus_val32 celt_glog;
 
-#ifdef ENABLE_RES24
 typedef opus_val32 opus_res;
 #define RES_SHIFT 8
 #define SIG2RES(a)      PSHR32(a, SIG_SHIFT-RES_SHIFT)
@@ -160,28 +159,12 @@ typedef opus_val32 opus_res;
 #define RES2SIG(a)      SHL32((a), SIG_SHIFT-RES_SHIFT)
 #define MULT16_RES_Q15(a,b) MULT16_32_Q15(a,b)
 #define MAX_ENCODING_DEPTH 24
-#else
-typedef opus_val16 opus_res;
-#define RES_SHIFT 0
-#define SIG2RES(a)      SIG2WORD16(a)
-#define RES2INT16(a)    (a)
-#define RES2INT24(a)    SHL32(EXTEND32(a), 8)
-#define RES2FLOAT(a)    ((1.f/32768.f)*(a))
-#define INT16TORES(a)   (a)
-#define INT24TORES(a)   SAT16(PSHR32(a, 8))
-#define ADD_RES(a, b)   SAT16(ADD32((a), (b)));
-#define FLOAT2RES(a)    FLOAT2INT16(a)
-#define RES2SIG(a)      SHL32(EXTEND32(a), SIG_SHIFT)
-#define MULT16_RES_Q15(a,b) MULT16_16_Q15(a,b)
-#define MAX_ENCODING_DEPTH 16
-#endif
 
 #define RES2VAL16(a)    RES2INT16(a)
 #define INT16TOSIG(a)   SHL32(EXTEND32(a), SIG_SHIFT)
 #define INT24TOSIG(a)   SHL32(a, SIG_SHIFT-8)
 
 #define NORM_SHIFT 24
-#ifdef ENABLE_QEXT
 typedef opus_val32 celt_coef;
 #define COEF_ONE Q31ONE
 #define MULT_COEF_32(a, b) MULT32_32_P31(a,b)
@@ -189,15 +172,6 @@ typedef opus_val32 celt_coef;
 #define MULT_COEF(a, b) MULT32_32_Q31(a,b)
 #define MULT_COEF_TAPS(a, b) SHL32(MULT16_16(a,b), 1)
 #define COEF2VAL16(x) EXTRACT16(SHR32(x, 16))
-#else
-typedef opus_val16 celt_coef;
-#define COEF_ONE Q15ONE
-#define MULT_COEF_32(a, b) MULT16_32_Q15(a,b)
-#define MAC_COEF_32_ARM(a, b, c) MAC16_32_Q16(a,b,c)
-#define MULT_COEF(a, b) MULT16_16_Q15(a,b)
-#define MULT_COEF_TAPS(a, b) MULT16_16_P15(a,b)
-#define COEF2VAL16(x) (x)
-#endif
 
 #define celt_isnan(x) 0
 
diff --git a/celt/celt_decoder.c b/celt/celt_decoder.c
index 184b65921..d5783ff1e 100644
--- a/celt/celt_decoder.c
+++ b/celt/celt_decoder.c
@@ -1513,12 +1513,6 @@ int celt_decode_with_ec(CELTDecoder * OPUS_RESTRICT st, const unsigned char *dat
 
 #if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API)
 
-#if defined(FIXED_POINT) && !defined(ENABLE_RES24)
-int opus_custom_decode(CELTDecoder * OPUS_RESTRICT st, const unsigned char *data, int len, opus_int16 * OPUS_RESTRICT pcm, int frame_size)
-{
-   return celt_decode_with_ec(st, data, len, pcm, frame_size, NULL, 0);
-}
-#else
 int opus_custom_decode(CELTDecoder * OPUS_RESTRICT st, const unsigned char *data, int len, opus_int16 * OPUS_RESTRICT pcm, int frame_size)
 {
    int j, ret, C, N;
@@ -1540,9 +1534,8 @@ int opus_custom_decode(CELTDecoder * OPUS_RESTRICT st, const unsigned char *data
    RESTORE_STACK;
    return ret;
 }
-#endif
 
-#if defined(FIXED_POINT) && defined(ENABLE_RES24)
+#if defined(FIXED_POINT)
 int opus_custom_decode24(CELTDecoder * OPUS_RESTRICT st, const unsigned char *data, int len, opus_int32 * OPUS_RESTRICT pcm, int frame_size)
 {
    return celt_decode_with_ec(st, data, len, pcm, frame_size, NULL, 0);
diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c
index 248e977e9..30c374dc1 100644
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -584,45 +584,30 @@ void celt_preemphasis(const opus_res * OPUS_RESTRICT pcmp, celt_sig * OPUS_RESTR
    for (i=0;i<Nu;i++)
       inp[i*upsample] = RES2SIG(pcmp[CC*i]);
 
-#ifndef FIXED_POINT
-   if (clip)
-   {
-      /* Clip input to avoid encoding non-portable files */
-      for (i=0;i<Nu;i++)
-         inp[i*upsample] = MAX32(-65536.f, MIN32(65536.f,inp[i*upsample]));
-   }
-#elif defined(ENABLE_RES24)
    if (clip)
    {
       /* Clip input to avoid encoding non-portable files */
       for (i=0;i<Nu;i++)
-         inp[i*upsample] = MAX32(-(65536<<SIG_SHIFT), MIN32(65536<<SIG_SHIFT,inp[i*upsample]));
+         inp[i*upsample] = MAX32(-QCONST32(65536.f, SIG_SHIFT), MIN32(QCONST32(65536.f, SIG_SHIFT), inp[i*upsample]));
    }
-#else
-   (void)clip; /* Avoids a warning about clip being unused. */
-#endif
 #if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API) || defined(ENABLE_QEXT)
    if (coef[1] != 0)
    {
       opus_val16 coef1 = coef[1];
-#if defined(FIXED_POINT) && defined(ENABLE_QEXT)
+#if defined(FIXED_POINT)
       /* If we need the extra precision, we use the fact that coef[3] is exact to do a Newton-Raphson
          iteration and get us more precision on coef[2]. */
       opus_val32 coef2_q30 = SHL32(coef[2], 18) + PSHR32(MULT16_16(QCONST32(1.f, 25) - MULT16_16(coef[3], coef[2]), coef[2]), 7);
       celt_assert(SIG_SHIFT == 12);
 #else
-      opus_val16 coef2 = coef[2];
+      opus_val32 coef2_q30 = coef[2];
 #endif
       for (i=0;i<N;i++)
       {
          celt_sig x, tmp;
          x = inp[i];
          /* Apply pre-emphasis */
-#if defined(FIXED_POINT) && defined(ENABLE_QEXT)
          tmp = SHL32(MULT32_32_Q31(coef2_q30, x), 1);
-#else
-         tmp = SHL32(MULT16_32_Q15(coef2, x), 15-SIG_SHIFT);
-#endif
          inp[i] = tmp + m;
          m = MULT16_32_Q15(coef1, inp[i]) - MULT16_32_Q15(coef0, tmp);
       }
@@ -1869,7 +1854,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
    celt_assert(st->signalling==0);
 #endif
 
-   /* Can't produce more than 1275 output bytes for the main payload, plus any QEXT extra data. */
+   /* Can't produce more than 1275 output bytes for the main payload. */
    nbCompressedBytes = IMIN(nbCompressedBytes,packet_size_cap);
 
    if (st->vbr && st->bitrate!=OPUS_BITRATE_MAX)
@@ -2673,12 +2658,6 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
 
 #if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API)
 
-#if defined(FIXED_POINT) && !defined(ENABLE_RES24)
-int opus_custom_encode(CELTEncoder * OPUS_RESTRICT st, const opus_int16 * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes)
-{
-   return celt_encode_with_ec(st, pcm, frame_size, compressed, nbCompressedBytes, NULL);
-}
-#else
 int opus_custom_encode(CELTEncoder * OPUS_RESTRICT st, const opus_int16 * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes)
 {
    int j, ret, C, N;
@@ -2703,10 +2682,9 @@ int opus_custom_encode(CELTEncoder * OPUS_RESTRICT st, const opus_int16 * pcm, i
    RESTORE_STACK;
    return ret;
 }
-#endif
 
 
-#if defined(FIXED_POINT) && defined(ENABLE_RES24)
+#if defined(FIXED_POINT)
 int opus_custom_encode24(CELTEncoder * OPUS_RESTRICT st, const opus_int32 * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes)
 {
    return celt_encode_with_ec(st, pcm, frame_size, compressed, nbCompressedBytes, NULL);
diff --git a/celt/dump_modes/Makefile b/celt/dump_modes/Makefile
index c3e7e7ce7..9bd13b07d 100644
--- a/celt/dump_modes/Makefile
+++ b/celt/dump_modes/Makefile
@@ -12,9 +12,7 @@ SOURCES = dump_modes.c \
           ../mathops.c \
           ../mdct.c \
           ../celt.c \
-          ../kiss_fft.c \
-          ../quant_bands.c \
-          ../laplace.c
+          ../kiss_fft.c
 
 ifdef HAVE_ARM_NE10
 CC = gcc
diff --git a/celt/dump_modes/dump_modes.c b/celt/dump_modes/dump_modes.c
index 849938fdd..7bf845fd5 100644
--- a/celt/dump_modes/dump_modes.c
+++ b/celt/dump_modes/dump_modes.c
@@ -100,18 +100,8 @@ void dump_modes(FILE *file, CELTMode **modes, int nb_modes)
       fprintf(file, "#ifndef DEF_WINDOW%d\n", mode->overlap);
       fprintf(file, "#define DEF_WINDOW%d\n", mode->overlap);
       fprintf (file, "static const celt_coef window%d[%d] = {\n", mode->overlap, mode->overlap);
-#if defined(FIXED_POINT) && defined(ENABLE_QEXT)
-      fprintf(file, "#ifdef ENABLE_QEXT\n");
       for (j=0;j<mode->overlap;j++)
          fprintf (file, WORD32 ",%c", mode->window[j],(j+6)%5==0?'\n':' ');
-      fprintf(file, "#else\n");
-      for (j=0;j<mode->overlap;j++)
-         fprintf (file, WORD16 ",%c", COEF16(mode->window[j], 16),(j+6)%5==0?'\n':' ');
-      fprintf(file, "#endif\n");
-#else
-      for (j=0;j<mode->overlap;j++)
-         fprintf (file, WORD16 ",%c", mode->window[j],(j+6)%5==0?'\n':' ');
-#endif
       fprintf (file, "};\n");
       fprintf(file, "#endif\n");
       fprintf(file, "\n");
@@ -160,46 +150,14 @@ void dump_modes(FILE *file, CELTMode **modes, int nb_modes)
       fprintf(file, "#endif\n");
       fprintf(file, "\n");
 
-      /* QEXT Pulse cache */
-      if (mode->qext_cache.index != NULL) {
-         fprintf(file, "#ifdef ENABLE_QEXT\n");
-         fprintf(file, "# ifndef DEF_QEXT_PULSE_CACHE%d\n", mode->Fs/mdctSize);
-         fprintf(file, "# define DEF_QEXT_PULSE_CACHE%d\n", mode->Fs/mdctSize);
-         fprintf (file, "static const opus_int16 qext_cache_index%d[%d] = {\n", mode->Fs/mdctSize, (mode->maxLM+2)*NB_QEXT_BANDS);
-         for (j=0;j<NB_QEXT_BANDS*(mode->maxLM+2);j++)
-            fprintf (file, "%d,%c", mode->qext_cache.index[j],(j+16)%15==0?'\n':' ');
-         fprintf (file, "};\n");
-         fprintf (file, "static const unsigned char qext_cache_bits%d[%d] = {\n", mode->Fs/mdctSize, mode->qext_cache.size);
-         for (j=0;j<mode->qext_cache.size;j++)
-            fprintf (file, "%d,%c", mode->qext_cache.bits[j],(j+16)%15==0?'\n':' ');
-         fprintf (file, "};\n");
-         fprintf (file, "static const unsigned char qext_cache_caps%d[%d] = {\n", mode->Fs/mdctSize, (mode->maxLM+1)*2*NB_QEXT_BANDS);
-         for (j=0;j<(mode->maxLM+1)*2*NB_QEXT_BANDS;j++)
-            fprintf (file, "%d,%c", mode->qext_cache.caps[j],(j+16)%15==0?'\n':' ');
-         fprintf (file, "};\n");
-         fprintf(file, "# endif\n");
-         fprintf(file, "#endif\n");
-         fprintf(file, "\n");
-      }
-
       /* FFT twiddles */
       fprintf(file, "#ifndef FFT_TWIDDLES%d_%d\n", mode->Fs, mdctSize);
       fprintf(file, "#define FFT_TWIDDLES%d_%d\n", mode->Fs, mdctSize);
 
       fprintf (file, "static const kiss_twiddle_cpx fft_twiddles%d_%d[%d] = {\n",
             mode->Fs, mdctSize, mode->mdct.kfft[0]->nfft);
-#if defined(FIXED_POINT) && defined(ENABLE_QEXT)
-      fprintf(file, "#ifdef ENABLE_QEXT\n");
       for (j=0;j<mode->mdct.kfft[0]->nfft;j++)
          fprintf (file, "{" WORD32 ", " WORD32 "},%c", mode->mdct.kfft[0]->twiddles[j].r, mode->mdct.kfft[0]->twiddles[j].i,(j+3)%2==0?'\n':' ');
-      fprintf(file, "#else\n");
-      for (j=0;j<mode->mdct.kfft[0]->nfft;j++)
-         fprintf (file, "{" WORD16 ", " WORD16 "},%c", COEF16(mode->mdct.kfft[0]->twiddles[j].r,16), COEF16(mode->mdct.kfft[0]->twiddles[j].i,16),(j+3)%2==0?'\n':' ');
-      fprintf(file, "#endif\n");
-#else
-      for (j=0;j<mode->mdct.kfft[0]->nfft;j++)
-         fprintf (file, "{" WORD16 ", " WORD16 "},%c", mode->mdct.kfft[0]->twiddles[j].r, mode->mdct.kfft[0]->twiddles[j].i,(j+3)%2==0?'\n':' ');
-#endif
       fprintf (file, "};\n");
 
 #ifdef OVERRIDE_FFT
@@ -229,15 +187,7 @@ void dump_modes(FILE *file, CELTMode **modes, int nb_modes)
                mode->Fs, mdctSize, k);
          fprintf (file, "%d,    /* nfft */\n", mode->mdct.kfft[k]->nfft);
 
-#if defined(FIXED_POINT) && defined(ENABLE_QEXT)
-         fprintf(file, "#ifdef ENABLE_QEXT\n");
          fprintf (file, WORD32 ",    /* scale */\n", mode->mdct.kfft[k]->scale);
-         fprintf(file, "#else\n");
-         fprintf (file, WORD16 ",    /* scale */\n", COEF16(mode->mdct.kfft[k]->scale, 15));
-         fprintf(file, "#endif\n");
-#else
-         fprintf (file, WORD16 ",    /* scale */\n", mode->mdct.kfft[k]->scale);
-#endif
 #ifdef FIXED_POINT
          fprintf (file, "%d,    /* scale_shift */\n", mode->mdct.kfft[k]->scale_shift);
 #endif
@@ -271,18 +221,8 @@ void dump_modes(FILE *file, CELTMode **modes, int nb_modes)
       fprintf (file, "static const celt_coef mdct_twiddles%d[%d] = {\n",
             mdctSize, mdct_twiddles_size);
 
-#if defined(FIXED_POINT) && defined(ENABLE_QEXT)
-      fprintf(file, "#ifdef ENABLE_QEXT\n");
       for (j=0;j<mdct_twiddles_size;j++)
          fprintf (file, WORD32 ",%c", mode->mdct.trig[j],(j+6)%5==0?'\n':' ');
-      fprintf(file, "#else\n");
-      for (j=0;j<mdct_twiddles_size;j++)
-         fprintf (file, WORD16 ",%c", COEF16(mode->mdct.trig[j], 16),(j+6)%5==0?'\n':' ');
-      fprintf(file, "#endif\n");
-#else
-      for (j=0;j<mdct_twiddles_size;j++)
-         fprintf (file, WORD16 ",%c", mode->mdct.trig[j],(j+6)%5==0?'\n':' ');
-#endif
 
       fprintf (file, "};\n");
 
@@ -324,15 +264,6 @@ void dump_modes(FILE *file, CELTMode **modes, int nb_modes)
 
       fprintf(file, "{%d, cache_index%d, cache_bits%d, cache_caps%d},    /* cache */\n",
             mode->cache.size, mode->Fs/mdctSize, mode->Fs/mdctSize, mode->Fs/mdctSize);
-
-      fprintf(file, "#ifdef ENABLE_QEXT\n");
-      if (mode->qext_cache.index != NULL) {
-         fprintf(file, "{%d, qext_cache_index%d, qext_cache_bits%d, qext_cache_caps%d},    /* qext_cache */\n",
-               mode->qext_cache.size, mode->Fs/mdctSize, mode->Fs/mdctSize, mode->Fs/mdctSize);
-      } else {
-         fprintf(file, "{0, NULL, NULL, NULL},    /* qext_cache */\n");
-      }
-      fprintf(file, "#endif\n");
       fprintf(file, "};\n");
    }
    fprintf(file, "\n");
diff --git a/celt/kiss_fft.c b/celt/kiss_fft.c
index 24400e862..4a6cf15e1 100644
--- a/celt/kiss_fft.c
+++ b/celt/kiss_fft.c
@@ -416,12 +416,8 @@ static void compute_twiddles(kiss_twiddle_cpx *twiddles, int nfft)
 #ifdef FIXED_POINT
    for (i=0;i<nfft;++i) {
       opus_val32 phase = -i;
-#ifdef ENABLE_QEXT
       twiddles[i].r = (int)MIN32(2147483647, floor(.5+2147483648*cos((2*M_PI/nfft)*phase)));
       twiddles[i].i = (int)MIN32(2147483647, floor(.5+2147483648*sin((2*M_PI/nfft)*phase)));
-#else
-      kf_cexp2(twiddles+i, DIV32(SHL32(phase,17),nfft));
-#endif
    }
 #else
    for (i=0;i<nfft;++i) {
@@ -463,17 +459,10 @@ kiss_fft_state *opus_fft_alloc_twiddles(int nfft,void * mem,size_t * lenmem,
         st->nfft=nfft;
 #ifdef FIXED_POINT
         st->scale_shift = celt_ilog2(st->nfft);
-# ifdef ENABLE_QEXT
         if (st->nfft == 1<<st->scale_shift)
            st->scale = QCONST32(1.0f, 30);
         else
            st->scale = (((opus_int64)1073741824<<st->scale_shift)+st->nfft/2)/st->nfft;
-# else
-        if (st->nfft == 1<<st->scale_shift)
-           st->scale = Q15ONE;
-        else
-           st->scale = (1073741824+st->nfft/2)/st->nfft>>(15-st->scale_shift);
-# endif
 #else
         st->scale = 1.f/nfft;
 #endif
diff --git a/celt/kiss_fft.h b/celt/kiss_fft.h
index 20eb0b21c..52b9fc7cd 100644
--- a/celt/kiss_fft.h
+++ b/celt/kiss_fft.h
@@ -46,11 +46,7 @@
 #include "arch.h"
 
 #  define kiss_fft_scalar opus_int32
-#  ifdef ENABLE_QEXT
-#   define COEF_SHIFT 32
-#  else
-#   define COEF_SHIFT 16
-#  endif
+#  define COEF_SHIFT 32
 
 #  define kiss_twiddle_scalar celt_coef
 
diff --git a/celt/mathops.h b/celt/mathops.h
index 4b6fa15cc..120e2652d 100644
--- a/celt/mathops.h
+++ b/celt/mathops.h
@@ -97,7 +97,7 @@ static OPUS_INLINE opus_val32 celt_maxabs16(const opus_val16 *x, int len)
 }
 #endif
 
-#if defined(ENABLE_RES24) && defined(FIXED_POINT)
+#if defined(FIXED_POINT)
 static OPUS_INLINE opus_res celt_maxabs_res(const opus_res *x, int len)
 {
    int i;
@@ -186,7 +186,7 @@ static OPUS_INLINE float celt_atan2p_norm(float y, float x)
 }
 #endif
 
-#if !defined(FIXED_POINT) || defined(ENABLE_QEXT)
+#if !defined(FIXED_POINT)
 /* Computes estimated cosine values for (PI/2 * x) using only terms with even
  * exponents. */
 static OPUS_INLINE float celt_cos_norm2(float x)
@@ -441,8 +441,6 @@ static OPUS_INLINE opus_val32 celt_exp2(opus_val16 x)
    return VSHR32(EXTEND32(frac), -integer-2);
 }
 
-#ifdef ENABLE_QEXT
-
 /* Calculates the base-2 logarithm of a Q14 input value. The result is returned
  * in Q(DB_SHIFT). If the input value is 0, the function will output -32.0f. */
 static OPUS_INLINE opus_val32 celt_log2_db(opus_val32 x) {
@@ -524,13 +522,7 @@ static OPUS_INLINE opus_val32 celt_exp2_db(opus_val32 x)
    frac = celt_exp2_db_frac(x-SHL32(integer, DB_SHIFT));  /* Q28 */
    return VSHR32(frac, -integer + 28 - 16);  /* Q16 */
 }
-#else
 
-#define celt_log2_db(x) SHL32(EXTEND32(celt_log2(x)), DB_SHIFT-10)
-#define celt_exp2_db_frac(x) SHL32(celt_exp2_frac(PSHR32(x, DB_SHIFT-10)), 14)
-#define celt_exp2_db(x) celt_exp2(PSHR32(x, DB_SHIFT-10))
-
-#endif
 
 
 opus_val32 celt_rcp(opus_val32 x);
diff --git a/celt/mdct.c b/celt/mdct.c
index 2b8a0bce9..153712b2e 100644
--- a/celt/mdct.c
+++ b/celt/mdct.c
@@ -89,13 +89,8 @@ int clt_mdct_init(mdct_lookup *l,int N, int maxshift, int arch)
    {
       /* We have enough points that sine isn't necessary */
 #if defined(FIXED_POINT)
-#ifndef ENABLE_QEXT
-      for (i=0;i<N2;i++)
-         trig[i] = TRIG_UPSCALE*celt_cos_norm(DIV32(ADD32(SHL32(EXTEND32(i),17),N2+16384),N));
-#else
       for (i=0;i<N2;i++)
          trig[i] = (kiss_twiddle_scalar)MAX32(-2147483647,MIN32(2147483647,floor(.5+2147483648*cos(2*M_PI*(i+.125)/N))));
-#endif
 #else
       for (i=0;i<N2;i++)
          trig[i] = (kiss_twiddle_scalar)cos(2*PI*(i+.125)/N);
@@ -210,15 +205,8 @@ void clt_mdct_forward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scal
          im = *yp++;
          yr = S_MUL(re,t0)  -  S_MUL(im,t1);
          yi = S_MUL(im,t0)  +  S_MUL(re,t1);
-         /* For QEXT, it's best to scale before the FFT, but otherwise it's best to scale after.
-            For floating-point it doesn't matter. */
-#ifdef ENABLE_QEXT
          yc.r = yr;
          yc.i = yi;
-#else
-         yc.r = S_MUL2(yr, scale);
-         yc.i = S_MUL2(yi, scale);
-#endif
 #ifdef FIXED_POINT
          maxval = MAX32(maxval, MAX32(ABS32(yc.r), ABS32(yc.i)));
 #endif
@@ -244,13 +232,8 @@ void clt_mdct_forward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scal
       {
          kiss_fft_scalar yr, yi;
          kiss_fft_scalar t0, t1;
-#ifdef ENABLE_QEXT
          t0 = S_MUL2(t[i], scale);
          t1 = S_MUL2(t[N4+i], scale);
-#else
-         t0 = t[i];
-         t1 = t[N4+i];
-#endif
          yr = PSHR32(S_MUL(fp->i,t1) - S_MUL(fp->r,t0), headroom);
          yi = PSHR32(S_MUL(fp->r,t1) + S_MUL(fp->i,t0), headroom);
          *yp1 = yr;
diff --git a/celt/modes.c b/celt/modes.c
index 74d096b5d..ff1284737 100644
--- a/celt/modes.c
+++ b/celt/modes.c
@@ -391,13 +391,8 @@ CELTMode *opus_custom_mode_create(opus_int32 Fs, int frame_size, int *error)
    for (i=0;i<mode->overlap;i++)
       window[i] = Q15ONE*sin(.5*M_PI* sin(.5*M_PI*(i+.5)/mode->overlap) * sin(.5*M_PI*(i+.5)/mode->overlap));
 #else
-# ifdef ENABLE_QEXT
    for (i=0;i<mode->overlap;i++)
       window[i] = MIN32(2147483647, 2147483648*sin(.5*M_PI* sin(.5*M_PI*(i+.5)/mode->overlap) * sin(.5*M_PI*(i+.5)/mode->overlap)));
-# else
-   for (i=0;i<mode->overlap;i++)
-      window[i] = MIN32(32767,floor(.5+32768.*sin(.5*M_PI* sin(.5*M_PI*(i+.5)/mode->overlap) * sin(.5*M_PI*(i+.5)/mode->overlap))));
-# endif
 #endif
    mode->window = window;
 
diff --git a/celt/static_modes_fixed.h b/celt/static_modes_fixed.h
index ac3340e13..ea3b89b13 100644
--- a/celt/static_modes_fixed.h
+++ b/celt/static_modes_fixed.h
@@ -12,7 +12,6 @@
 #ifndef DEF_WINDOW120
 #define DEF_WINDOW120
 static const celt_coef window120[120] = {
-#ifdef ENABLE_QEXT
 144497, 1300330, 3611201, 7075520, 11690888,
 17454086, 24361057, 32406886, 41585775, 51891010,
 63314937, 75848919, 89483305, 104207389, 120009370,
@@ -37,32 +36,6 @@ static const celt_coef window120[120] = {
 2144127740, 2144953807, 2145618502, 2146143741, 2146550077,
 2146856618, 2147080958, 2147239113, 2147345467, 2147412716,
 2147451825, 2147471991, 2147480611, 2147483254, 2147483643,
-#else
-2, 20, 55, 108, 178,
-266, 372, 494, 635, 792,
-966, 1157, 1365, 1590, 1831,
-2089, 2362, 2651, 2956, 3276,
-3611, 3961, 4325, 4703, 5094,
-5499, 5916, 6346, 6788, 7241,
-7705, 8179, 8663, 9156, 9657,
-10167, 10684, 11207, 11736, 12271,
-12810, 13353, 13899, 14447, 14997,
-15547, 16098, 16648, 17197, 17744,
-18287, 18827, 19363, 19893, 20418,
-20936, 21447, 21950, 22445, 22931,
-23407, 23874, 24330, 24774, 25208,
-25629, 26039, 26435, 26819, 27190,
-27548, 27893, 28224, 28541, 28845,
-29135, 29411, 29674, 29924, 30160,
-30384, 30594, 30792, 30977, 31151,
-31313, 31463, 31602, 31731, 31849,
-31958, 32057, 32148, 32229, 32303,
-32370, 32429, 32481, 32528, 32568,
-32604, 32634, 32661, 32683, 32701,
-32717, 32729, 32740, 32748, 32754,
-32758, 32762, 32764, 32766, 32767,
-32767, 32767, 32767, 32767, 32767,
-#endif
 };
 #endif
 
@@ -129,7 +102,6 @@ static const unsigned char cache_caps50[168] = {
 #ifndef FFT_TWIDDLES48000_960
 #define FFT_TWIDDLES48000_960
 static const kiss_twiddle_cpx fft_twiddles48000_960[480] = {
-#ifdef ENABLE_QEXT
 {2147483647, 0}, {2147299668, -28109692},
 {2146747759, -56214568}, {2145828016, -84309812},
 {2144540596, -112390610}, {2142885721, -140452151},
@@ -370,248 +342,6 @@ static const kiss_twiddle_cpx fft_twiddles48000_960[480] = {
 {2140863673, 168489625}, {2142885721, 140452151},
 {2144540596, 112390610}, {2145828016, 84309812},
 {2146747759, 56214568}, {2147299668, 28109692},
-#else
-{32767, 0}, {32765, -429},
-{32757, -858}, {32743, -1286},
-{32723, -1715}, {32698, -2143},
-{32667, -2571}, {32631, -2998},
-{32588, -3425}, {32541, -3851},
-{32488, -4277}, {32429, -4702},
-{32365, -5126}, {32295, -5549},
-{32219, -5971}, {32138, -6393},
-{32052, -6813}, {31960, -7232},
-{31863, -7650}, {31760, -8066},
-{31651, -8481}, {31538, -8895},
-{31419, -9307}, {31294, -9717},
-{31164, -10126}, {31029, -10533},
-{30888, -10938}, {30743, -11342},
-{30592, -11743}, {30435, -12142},
-{30274, -12540}, {30107, -12935},
-{29935, -13328}, {29758, -13719},
-{29576, -14107}, {29389, -14493},
-{29197, -14876}, {28999, -15257},
-{28797, -15636}, {28590, -16011},
-{28378, -16384}, {28161, -16754},
-{27939, -17121}, {27713, -17485},
-{27482, -17847}, {27246, -18205},
-{27005, -18560}, {26760, -18912},
-{26510, -19261}, {26255, -19606},
-{25997, -19948}, {25733, -20286},
-{25466, -20622}, {25193, -20953},
-{24917, -21281}, {24636, -21605},
-{24351, -21926}, {24062, -22243},
-{23769, -22556}, {23472, -22865},
-{23170, -23170}, {22865, -23472},
-{22556, -23769}, {22243, -24062},
-{21926, -24351}, {21605, -24636},
-{21281, -24917}, {20953, -25193},
-{20622, -25466}, {20286, -25733},
-{19948, -25997}, {19606, -26255},
-{19261, -26510}, {18912, -26760},
-{18560, -27005}, {18205, -27246},
-{17847, -27482}, {17485, -27713},
-{17121, -27939}, {16754, -28161},
-{16384, -28378}, {16011, -28590},
-{15636, -28797}, {15257, -28999},
-{14876, -29197}, {14493, -29389},
-{14107, -29576}, {13719, -29758},
-{13328, -29935}, {12935, -30107},
-{12540, -30274}, {12142, -30435},
-{11743, -30592}, {11342, -30743},
-{10938, -30888}, {10533, -31029},
-{10126, -31164}, {9717, -31294},
-{9307, -31419}, {8895, -31538},
-{8481, -31651}, {8066, -31760},
-{7650, -31863}, {7232, -31960},
-{6813, -32052}, {6393, -32138},
-{5971, -32219}, {5549, -32295},
-{5126, -32365}, {4702, -32429},
-{4277, -32488}, {3851, -32541},
-{3425, -32588}, {2998, -32631},
-{2571, -32667}, {2143, -32698},
-{1715, -32723}, {1286, -32743},
-{858, -32757}, {429, -32765},
-{0, -32767}, {-429, -32765},
-{-858, -32757}, {-1286, -32743},
-{-1715, -32723}, {-2143, -32698},
-{-2571, -32667}, {-2998, -32631},
-{-3425, -32588}, {-3851, -32541},
-{-4277, -32488}, {-4702, -32429},
-{-5126, -32365}, {-5549, -32295},
-{-5971, -32219}, {-6393, -32138},
-{-6813, -32052}, {-7232, -31960},
-{-7650, -31863}, {-8066, -31760},
-{-8481, -31651}, {-8895, -31538},
-{-9307, -31419}, {-9717, -31294},
-{-10126, -31164}, {-10533, -31029},
-{-10938, -30888}, {-11342, -30743},
-{-11743, -30592}, {-12142, -30435},
-{-12540, -30274}, {-12935, -30107},
-{-13328, -29935}, {-13719, -29758},
-{-14107, -29576}, {-14493, -29389},
-{-14876, -29197}, {-15257, -28999},
-{-15636, -28797}, {-16011, -28590},
-{-16384, -28378}, {-16754, -28161},
-{-17121, -27939}, {-17485, -27713},
-{-17847, -27482}, {-18205, -27246},
-{-18560, -27005}, {-18912, -26760},
-{-19261, -26510}, {-19606, -26255},
-{-19948, -25997}, {-20286, -25733},
-{-20622, -25466}, {-20953, -25193},
-{-21281, -24917}, {-21605, -24636},
-{-21926, -24351}, {-22243, -24062},
-{-22556, -23769}, {-22865, -23472},
-{-23170, -23170}, {-23472, -22865},
-{-23769, -22556}, {-24062, -22243},
-{-24351, -21926}, {-24636, -21605},
-{-24917, -21281}, {-25193, -20953},
-{-25466, -20622}, {-25733, -20286},
-{-25997, -19948}, {-26255, -19606},
-{-26510, -19261}, {-26760, -18912},
-{-27005, -18560}, {-27246, -18205},
-{-27482, -17847}, {-27713, -17485},
-{-27939, -17121}, {-28161, -16754},
-{-28378, -16384}, {-28590, -16011},
-{-28797, -15636}, {-28999, -15257},
-{-29197, -14876}, {-29389, -14493},
-{-29576, -14107}, {-29758, -13719},
-{-29935, -13328}, {-30107, -12935},
-{-30274, -12540}, {-30435, -12142},
-{-30592, -11743}, {-30743, -11342},
-{-30888, -10938}, {-31029, -10533},
-{-31164, -10126}, {-31294, -9717},
-{-31419, -9307}, {-31538, -8895},
-{-31651, -8481}, {-31760, -8066},
-{-31863, -7650}, {-31960, -7232},
-{-32052, -6813}, {-32138, -6393},
-{-32219, -5971}, {-32295, -5549},
-{-32365, -5126}, {-32429, -4702},
-{-32488, -4277}, {-32541, -3851},
-{-32588, -3425}, {-32631, -2998},
-{-32667, -2571}, {-32698, -2143},
-{-32723, -1715}, {-32743, -1286},
-{-32757, -858}, {-32765, -429},
-{-32767, 0}, {-32765, 429},
-{-32757, 858}, {-32743, 1286},
-{-32723, 1715}, {-32698, 2143},
-{-32667, 2571}, {-32631, 2998},
-{-32588, 3425}, {-32541, 3851},
-{-32488, 4277}, {-32429, 4702},
-{-32365, 5126}, {-32295, 5549},
-{-32219, 5971}, {-32138, 6393},
-{-32052, 6813}, {-31960, 7232},
-{-31863, 7650}, {-31760, 8066},
-{-31651, 8481}, {-31538, 8895},
-{-31419, 9307}, {-31294, 9717},
-{-31164, 10126}, {-31029, 10533},
-{-30888, 10938}, {-30743, 11342},
-{-30592, 11743}, {-30435, 12142},
-{-30274, 12540}, {-30107, 12935},
-{-29935, 13328}, {-29758, 13719},
-{-29576, 14107}, {-29389, 14493},
-{-29197, 14876}, {-28999, 15257},
-{-28797, 15636}, {-28590, 16011},
-{-28378, 16384}, {-28161, 16754},
-{-27939, 17121}, {-27713, 17485},
-{-27482, 17847}, {-27246, 18205},
-{-27005, 18560}, {-26760, 18912},
-{-26510, 19261}, {-26255, 19606},
-{-25997, 19948}, {-25733, 20286},
-{-25466, 20622}, {-25193, 20953},
-{-24917, 21281}, {-24636, 21605},
-{-24351, 21926}, {-24062, 22243},
-{-23769, 22556}, {-23472, 22865},
-{-23170, 23170}, {-22865, 23472},
-{-22556, 23769}, {-22243, 24062},
-{-21926, 24351}, {-21605, 24636},
-{-21281, 24917}, {-20953, 25193},
-{-20622, 25466}, {-20286, 25733},
-{-19948, 25997}, {-19606, 26255},
-{-19261, 26510}, {-18912, 26760},
-{-18560, 27005}, {-18205, 27246},
-{-17847, 27482}, {-17485, 27713},
-{-17121, 27939}, {-16754, 28161},
-{-16384, 28378}, {-16011, 28590},
-{-15636, 28797}, {-15257, 28999},
-{-14876, 29197}, {-14493, 29389},
-{-14107, 29576}, {-13719, 29758},
-{-13328, 29935}, {-12935, 30107},
-{-12540, 30274}, {-12142, 30435},
-{-11743, 30592}, {-11342, 30743},
-{-10938, 30888}, {-10533, 31029},
-{-10126, 31164}, {-9717, 31294},
-{-9307, 31419}, {-8895, 31538},
-{-8481, 31651}, {-8066, 31760},
-{-7650, 31863}, {-7232, 31960},
-{-6813, 32052}, {-6393, 32138},
-{-5971, 32219}, {-5549, 32295},
-{-5126, 32365}, {-4702, 32429},
-{-4277, 32488}, {-3851, 32541},
-{-3425, 32588}, {-2998, 32631},
-{-2571, 32667}, {-2143, 32698},
-{-1715, 32723}, {-1286, 32743},
-{-858, 32757}, {-429, 32765},
-{0, 32767}, {429, 32765},
-{858, 32757}, {1286, 32743},
-{1715, 32723}, {2143, 32698},
-{2571, 32667}, {2998, 32631},
-{3425, 32588}, {3851, 32541},
-{4277, 32488}, {4702, 32429},
-{5126, 32365}, {5549, 32295},
-{5971, 32219}, {6393, 32138},
-{6813, 32052}, {7232, 31960},
-{7650, 31863}, {8066, 31760},
-{8481, 31651}, {8895, 31538},
-{9307, 31419}, {9717, 31294},
-{10126, 31164}, {10533, 31029},
-{10938, 30888}, {11342, 30743},
-{11743, 30592}, {12142, 30435},
-{12540, 30274}, {12935, 30107},
-{13328, 29935}, {13719, 29758},
-{14107, 29576}, {14493, 29389},
-{14876, 29197}, {15257, 28999},
-{15636, 28797}, {16011, 28590},
-{16384, 28378}, {16754, 28161},
-{17121, 27939}, {17485, 27713},
-{17847, 27482}, {18205, 27246},
-{18560, 27005}, {18912, 26760},
-{19261, 26510}, {19606, 26255},
-{19948, 25997}, {20286, 25733},
-{20622, 25466}, {20953, 25193},
-{21281, 24917}, {21605, 24636},
-{21926, 24351}, {22243, 24062},
-{22556, 23769}, {22865, 23472},
-{23170, 23170}, {23472, 22865},
-{23769, 22556}, {24062, 22243},
-{24351, 21926}, {24636, 21605},
-{24917, 21281}, {25193, 20953},
-{25466, 20622}, {25733, 20286},
-{25997, 19948}, {26255, 19606},
-{26510, 19261}, {26760, 18912},
-{27005, 18560}, {27246, 18205},
-{27482, 17847}, {27713, 17485},
-{27939, 17121}, {28161, 16754},
-{28378, 16384}, {28590, 16011},
-{28797, 15636}, {28999, 15257},
-{29197, 14876}, {29389, 14493},
-{29576, 14107}, {29758, 13719},
-{29935, 13328}, {30107, 12935},
-{30274, 12540}, {30435, 12142},
-{30592, 11743}, {30743, 11342},
-{30888, 10938}, {31029, 10533},
-{31164, 10126}, {31294, 9717},
-{31419, 9307}, {31538, 8895},
-{31651, 8481}, {31760, 8066},
-{31863, 7650}, {31960, 7232},
-{32052, 6813}, {32138, 6393},
-{32219, 5971}, {32295, 5549},
-{32365, 5126}, {32429, 4702},
-{32488, 4277}, {32541, 3851},
-{32588, 3425}, {32631, 2998},
-{32667, 2571}, {32698, 2143},
-{32723, 1715}, {32743, 1286},
-{32757, 858}, {32765, 429},
-#endif
 };
 #ifndef FFT_BITREV480
 #define FFT_BITREV480
@@ -701,11 +431,7 @@ static const opus_int16 fft_bitrev60[60] = {
 #define FFT_STATE48000_960_0
 static const kiss_fft_state fft_state48000_960_0 = {
 480,    /* nfft */
-#ifdef ENABLE_QEXT
 572662306,    /* scale */
-#else
-17476,    /* scale */
-#endif
 8,    /* scale_shift */
 -1,    /* shift */
 {5, 96, 3, 32, 4, 8, 2, 4, 4, 1, 0, 0, 0, 0, 0, 0, },    /* factors */
@@ -723,11 +449,7 @@ NULL,
 #define FFT_STATE48000_960_1
 static const kiss_fft_state fft_state48000_960_1 = {
 240,    /* nfft */
-#ifdef ENABLE_QEXT
 572662306,    /* scale */
-#else
-17476,    /* scale */
-#endif
 7,    /* scale_shift */
 1,    /* shift */
 {5, 48, 3, 16, 4, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, },    /* factors */
@@ -745,11 +467,7 @@ NULL,
 #define FFT_STATE48000_960_2
 static const kiss_fft_state fft_state48000_960_2 = {
 120,    /* nfft */
-#ifdef ENABLE_QEXT
 572662306,    /* scale */
-#else
-17476,    /* scale */
-#endif
 6,    /* scale_shift */
 2,    /* shift */
 {5, 24, 3, 8, 2, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, },    /* factors */
@@ -767,11 +485,7 @@ NULL,
 #define FFT_STATE48000_960_3
 static const kiss_fft_state fft_state48000_960_3 = {
 60,    /* nfft */
-#ifdef ENABLE_QEXT
 572662306,    /* scale */
-#else
-17476,    /* scale */
-#endif
 5,    /* scale_shift */
 3,    /* shift */
 {5, 12, 3, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },    /* factors */
@@ -790,7 +504,6 @@ NULL,
 #ifndef MDCT_TWIDDLES960
 #define MDCT_TWIDDLES960
 static const celt_coef mdct_twiddles960[1800] = {
-#ifdef ENABLE_QEXT
 2147483468, 2147469095, 2147431723, 2147371355, 2147287990,
 2147181629, 2147052273, 2146899924, 2146724584, 2146526254,
 2146304937, 2146060634, 2145793349, 2145503083, 2145189842,
@@ -1151,368 +864,6 @@ static const celt_coef mdct_twiddles960[1800] = {
 -1986694916, -2007356435, -2026642214, -2044539032, -2061034626,
 -2076117690, -2089777886, -2102005853, -2112793210, -2122132564,
 -2130017514, -2136442657, -2141403589, -2144896910, -2146920225,
-#else
-32767, 32767, 32767, 32766, 32765,
-32763, 32761, 32759, 32756, 32753,
-32750, 32746, 32742, 32738, 32733,
-32728, 32722, 32717, 32710, 32704,
-32697, 32690, 32682, 32674, 32666,
-32657, 32648, 32639, 32629, 32619,
-32609, 32598, 32587, 32576, 32564,
-32552, 32539, 32526, 32513, 32500,
-32486, 32472, 32457, 32442, 32427,
-32411, 32395, 32379, 32362, 32345,
-32328, 32310, 32292, 32274, 32255,
-32236, 32217, 32197, 32177, 32157,
-32136, 32115, 32093, 32071, 32049,
-32027, 32004, 31981, 31957, 31933,
-31909, 31884, 31859, 31834, 31809,
-31783, 31756, 31730, 31703, 31676,
-31648, 31620, 31592, 31563, 31534,
-31505, 31475, 31445, 31415, 31384,
-31353, 31322, 31290, 31258, 31226,
-31193, 31160, 31127, 31093, 31059,
-31025, 30990, 30955, 30920, 30884,
-30848, 30812, 30775, 30738, 30701,
-30663, 30625, 30587, 30548, 30509,
-30470, 30430, 30390, 30350, 30309,
-30269, 30227, 30186, 30144, 30102,
-30059, 30016, 29973, 29930, 29886,
-29842, 29797, 29752, 29707, 29662,
-29616, 29570, 29524, 29477, 29430,
-29383, 29335, 29287, 29239, 29190,
-29142, 29092, 29043, 28993, 28943,
-28892, 28842, 28791, 28739, 28688,
-28636, 28583, 28531, 28478, 28425,
-28371, 28317, 28263, 28209, 28154,
-28099, 28044, 27988, 27932, 27876,
-27820, 27763, 27706, 27648, 27591,
-27533, 27474, 27416, 27357, 27298,
-27238, 27178, 27118, 27058, 26997,
-26936, 26875, 26814, 26752, 26690,
-26628, 26565, 26502, 26439, 26375,
-26312, 26247, 26183, 26119, 26054,
-25988, 25923, 25857, 25791, 25725,
-25658, 25592, 25524, 25457, 25389,
-25322, 25253, 25185, 25116, 25047,
-24978, 24908, 24838, 24768, 24698,
-24627, 24557, 24485, 24414, 24342,
-24270, 24198, 24126, 24053, 23980,
-23907, 23834, 23760, 23686, 23612,
-23537, 23462, 23387, 23312, 23237,
-23161, 23085, 23009, 22932, 22856,
-22779, 22701, 22624, 22546, 22468,
-22390, 22312, 22233, 22154, 22075,
-21996, 21916, 21836, 21756, 21676,
-21595, 21515, 21434, 21352, 21271,
-21189, 21107, 21025, 20943, 20860,
-20777, 20694, 20611, 20528, 20444,
-20360, 20276, 20192, 20107, 20022,
-19937, 19852, 19767, 19681, 19595,
-19509, 19423, 19336, 19250, 19163,
-19076, 18988, 18901, 18813, 18725,
-18637, 18549, 18460, 18372, 18283,
-18194, 18104, 18015, 17925, 17835,
-17745, 17655, 17565, 17474, 17383,
-17292, 17201, 17110, 17018, 16927,
-16835, 16743, 16650, 16558, 16465,
-16372, 16279, 16186, 16093, 15999,
-15906, 15812, 15718, 15624, 15529,
-15435, 15340, 15245, 15150, 15055,
-14960, 14864, 14769, 14673, 14577,
-14481, 14385, 14288, 14192, 14095,
-13998, 13901, 13804, 13706, 13609,
-13511, 13414, 13316, 13218, 13119,
-13021, 12923, 12824, 12725, 12626,
-12527, 12428, 12329, 12230, 12130,
-12030, 11930, 11831, 11730, 11630,
-11530, 11430, 11329, 11228, 11128,
-11027, 10926, 10824, 10723, 10622,
-10520, 10419, 10317, 10215, 10113,
-10011, 9909, 9807, 9704, 9602,
-9499, 9397, 9294, 9191, 9088,
-8985, 8882, 8778, 8675, 8572,
-8468, 8364, 8261, 8157, 8053,
-7949, 7845, 7741, 7637, 7532,
-7428, 7323, 7219, 7114, 7009,
-6905, 6800, 6695, 6590, 6485,
-6380, 6274, 6169, 6064, 5958,
-5853, 5747, 5642, 5536, 5430,
-5325, 5219, 5113, 5007, 4901,
-4795, 4689, 4583, 4476, 4370,
-4264, 4157, 4051, 3945, 3838,
-3732, 3625, 3518, 3412, 3305,
-3198, 3092, 2985, 2878, 2771,
-2664, 2558, 2451, 2344, 2237,
-2130, 2023, 1916, 1809, 1702,
-1594, 1487, 1380, 1273, 1166,
-1059, 952, 844, 737, 630,
-523, 416, 308, 201, 94,
--13, -121, -228, -335, -442,
--550, -657, -764, -871, -978,
--1086, -1193, -1300, -1407, -1514,
--1621, -1728, -1835, -1942, -2049,
--2157, -2263, -2370, -2477, -2584,
--2691, -2798, -2905, -3012, -3118,
--3225, -3332, -3439, -3545, -3652,
--3758, -3865, -3971, -4078, -4184,
--4290, -4397, -4503, -4609, -4715,
--4821, -4927, -5033, -5139, -5245,
--5351, -5457, -5562, -5668, -5774,
--5879, -5985, -6090, -6195, -6301,
--6406, -6511, -6616, -6721, -6826,
--6931, -7036, -7140, -7245, -7349,
--7454, -7558, -7663, -7767, -7871,
--7975, -8079, -8183, -8287, -8390,
--8494, -8597, -8701, -8804, -8907,
--9011, -9114, -9217, -9319, -9422,
--9525, -9627, -9730, -9832, -9934,
--10037, -10139, -10241, -10342, -10444,
--10546, -10647, -10748, -10850, -10951,
--11052, -11153, -11253, -11354, -11455,
--11555, -11655, -11756, -11856, -11955,
--12055, -12155, -12254, -12354, -12453,
--12552, -12651, -12750, -12849, -12947,
--13046, -13144, -13242, -13340, -13438,
--13536, -13633, -13731, -13828, -13925,
--14022, -14119, -14216, -14312, -14409,
--14505, -14601, -14697, -14793, -14888,
--14984, -15079, -15174, -15269, -15364,
--15459, -15553, -15647, -15741, -15835,
--15929, -16023, -16116, -16210, -16303,
--16396, -16488, -16581, -16673, -16766,
--16858, -16949, -17041, -17133, -17224,
--17315, -17406, -17497, -17587, -17678,
--17768, -17858, -17948, -18037, -18127,
--18216, -18305, -18394, -18483, -18571,
--18659, -18747, -18835, -18923, -19010,
--19098, -19185, -19271, -19358, -19444,
--19531, -19617, -19702, -19788, -19873,
--19959, -20043, -20128, -20213, -20297,
--20381, -20465, -20549, -20632, -20715,
--20798, -20881, -20963, -21046, -21128,
--21210, -21291, -21373, -21454, -21535,
--21616, -21696, -21776, -21856, -21936,
--22016, -22095, -22174, -22253, -22331,
--22410, -22488, -22566, -22643, -22721,
--22798, -22875, -22951, -23028, -23104,
--23180, -23256, -23331, -23406, -23481,
--23556, -23630, -23704, -23778, -23852,
--23925, -23998, -24071, -24144, -24216,
--24288, -24360, -24432, -24503, -24574,
--24645, -24716, -24786, -24856, -24926,
--24995, -25064, -25133, -25202, -25270,
--25339, -25406, -25474, -25541, -25608,
--25675, -25742, -25808, -25874, -25939,
--26005, -26070, -26135, -26199, -26264,
--26327, -26391, -26455, -26518, -26581,
--26643, -26705, -26767, -26829, -26891,
--26952, -27013, -27073, -27133, -27193,
--27253, -27312, -27372, -27430, -27489,
--27547, -27605, -27663, -27720, -27777,
--27834, -27890, -27946, -28002, -28058,
--28113, -28168, -28223, -28277, -28331,
--28385, -28438, -28491, -28544, -28596,
--28649, -28701, -28752, -28803, -28854,
--28905, -28955, -29006, -29055, -29105,
--29154, -29203, -29251, -29299, -29347,
--29395, -29442, -29489, -29535, -29582,
--29628, -29673, -29719, -29764, -29808,
--29853, -29897, -29941, -29984, -30027,
--30070, -30112, -30154, -30196, -30238,
--30279, -30320, -30360, -30400, -30440,
--30480, -30519, -30558, -30596, -30635,
--30672, -30710, -30747, -30784, -30821,
--30857, -30893, -30929, -30964, -30999,
--31033, -31068, -31102, -31135, -31168,
--31201, -31234, -31266, -31298, -31330,
--31361, -31392, -31422, -31453, -31483,
--31512, -31541, -31570, -31599, -31627,
--31655, -31682, -31710, -31737, -31763,
--31789, -31815, -31841, -31866, -31891,
--31915, -31939, -31963, -31986, -32010,
--32032, -32055, -32077, -32099, -32120,
--32141, -32162, -32182, -32202, -32222,
--32241, -32260, -32279, -32297, -32315,
--32333, -32350, -32367, -32383, -32399,
--32415, -32431, -32446, -32461, -32475,
--32489, -32503, -32517, -32530, -32542,
--32555, -32567, -32579, -32590, -32601,
--32612, -32622, -32632, -32641, -32651,
--32659, -32668, -32676, -32684, -32692,
--32699, -32706, -32712, -32718, -32724,
--32729, -32734, -32739, -32743, -32747,
--32751, -32754, -32757, -32760, -32762,
--32764, -32765, -32767, -32767, -32767,
-32767, 32767, 32765, 32761, 32756,
-32750, 32742, 32732, 32722, 32710,
-32696, 32681, 32665, 32647, 32628,
-32608, 32586, 32562, 32538, 32512,
-32484, 32455, 32425, 32393, 32360,
-32326, 32290, 32253, 32214, 32174,
-32133, 32090, 32046, 32001, 31954,
-31906, 31856, 31805, 31753, 31700,
-31645, 31588, 31530, 31471, 31411,
-31349, 31286, 31222, 31156, 31089,
-31020, 30951, 30880, 30807, 30733,
-30658, 30582, 30504, 30425, 30345,
-30263, 30181, 30096, 30011, 29924,
-29836, 29747, 29656, 29564, 29471,
-29377, 29281, 29184, 29086, 28987,
-28886, 28784, 28681, 28577, 28471,
-28365, 28257, 28147, 28037, 27925,
-27812, 27698, 27583, 27467, 27349,
-27231, 27111, 26990, 26868, 26744,
-26620, 26494, 26367, 26239, 26110,
-25980, 25849, 25717, 25583, 25449,
-25313, 25176, 25038, 24900, 24760,
-24619, 24477, 24333, 24189, 24044,
-23898, 23751, 23602, 23453, 23303,
-23152, 22999, 22846, 22692, 22537,
-22380, 22223, 22065, 21906, 21746,
-21585, 21423, 21261, 21097, 20933,
-20767, 20601, 20434, 20265, 20096,
-19927, 19756, 19584, 19412, 19239,
-19065, 18890, 18714, 18538, 18361,
-18183, 18004, 17824, 17644, 17463,
-17281, 17098, 16915, 16731, 16546,
-16361, 16175, 15988, 15800, 15612,
-15423, 15234, 15043, 14852, 14661,
-14469, 14276, 14083, 13889, 13694,
-13499, 13303, 13107, 12910, 12713,
-12515, 12317, 12118, 11918, 11718,
-11517, 11316, 11115, 10913, 10710,
-10508, 10304, 10100, 9896, 9691,
-9486, 9281, 9075, 8869, 8662,
-8455, 8248, 8040, 7832, 7623,
-7415, 7206, 6996, 6787, 6577,
-6366, 6156, 5945, 5734, 5523,
-5311, 5100, 4888, 4675, 4463,
-4251, 4038, 3825, 3612, 3399,
-3185, 2972, 2758, 2544, 2330,
-2116, 1902, 1688, 1474, 1260,
-1045, 831, 617, 402, 188,
--27, -241, -456, -670, -885,
--1099, -1313, -1528, -1742, -1956,
--2170, -2384, -2598, -2811, -3025,
--3239, -3452, -3665, -3878, -4091,
--4304, -4516, -4728, -4941, -5153,
--5364, -5576, -5787, -5998, -6209,
--6419, -6629, -6839, -7049, -7258,
--7467, -7676, -7884, -8092, -8300,
--8507, -8714, -8920, -9127, -9332,
--9538, -9743, -9947, -10151, -10355,
--10558, -10761, -10963, -11165, -11367,
--11568, -11768, -11968, -12167, -12366,
--12565, -12762, -12960, -13156, -13352,
--13548, -13743, -13937, -14131, -14324,
--14517, -14709, -14900, -15091, -15281,
--15470, -15659, -15847, -16035, -16221,
--16407, -16593, -16777, -16961, -17144,
--17326, -17508, -17689, -17869, -18049,
--18227, -18405, -18582, -18758, -18934,
--19108, -19282, -19455, -19627, -19799,
--19969, -20139, -20308, -20475, -20642,
--20809, -20974, -21138, -21301, -21464,
--21626, -21786, -21946, -22105, -22263,
--22420, -22575, -22730, -22884, -23037,
--23189, -23340, -23490, -23640, -23788,
--23935, -24080, -24225, -24369, -24512,
--24654, -24795, -24934, -25073, -25211,
--25347, -25482, -25617, -25750, -25882,
--26013, -26143, -26272, -26399, -26526,
--26651, -26775, -26898, -27020, -27141,
--27260, -27379, -27496, -27612, -27727,
--27841, -27953, -28065, -28175, -28284,
--28391, -28498, -28603, -28707, -28810,
--28911, -29012, -29111, -29209, -29305,
--29401, -29495, -29587, -29679, -29769,
--29858, -29946, -30032, -30118, -30201,
--30284, -30365, -30445, -30524, -30601,
--30677, -30752, -30825, -30897, -30968,
--31038, -31106, -31172, -31238, -31302,
--31365, -31426, -31486, -31545, -31602,
--31658, -31713, -31766, -31818, -31869,
--31918, -31966, -32012, -32058, -32101,
--32144, -32185, -32224, -32262, -32299,
--32335, -32369, -32401, -32433, -32463,
--32491, -32518, -32544, -32568, -32591,
--32613, -32633, -32652, -32669, -32685,
--32700, -32713, -32724, -32735, -32744,
--32751, -32757, -32762, -32766, -32767,
-32767, 32764, 32755, 32741, 32720,
-32694, 32663, 32626, 32583, 32535,
-32481, 32421, 32356, 32286, 32209,
-32128, 32041, 31948, 31850, 31747,
-31638, 31523, 31403, 31278, 31148,
-31012, 30871, 30724, 30572, 30415,
-30253, 30086, 29913, 29736, 29553,
-29365, 29172, 28974, 28771, 28564,
-28351, 28134, 27911, 27684, 27452,
-27216, 26975, 26729, 26478, 26223,
-25964, 25700, 25432, 25159, 24882,
-24601, 24315, 24026, 23732, 23434,
-23133, 22827, 22517, 22204, 21886,
-21565, 21240, 20912, 20580, 20244,
-19905, 19563, 19217, 18868, 18516,
-18160, 17802, 17440, 17075, 16708,
-16338, 15964, 15588, 15210, 14829,
-14445, 14059, 13670, 13279, 12886,
-12490, 12093, 11693, 11291, 10888,
-10482, 10075, 9666, 9255, 8843,
-8429, 8014, 7597, 7180, 6760,
-6340, 5919, 5496, 5073, 4649,
-4224, 3798, 3372, 2945, 2517,
-2090, 1661, 1233, 804, 375,
--54, -483, -911, -1340, -1768,
--2197, -2624, -3052, -3479, -3905,
--4330, -4755, -5179, -5602, -6024,
--6445, -6865, -7284, -7702, -8118,
--8533, -8946, -9358, -9768, -10177,
--10584, -10989, -11392, -11793, -12192,
--12589, -12984, -13377, -13767, -14155,
--14541, -14924, -15305, -15683, -16058,
--16430, -16800, -17167, -17531, -17892,
--18249, -18604, -18956, -19304, -19649,
--19990, -20329, -20663, -20994, -21322,
--21646, -21966, -22282, -22595, -22904,
--23208, -23509, -23806, -24099, -24387,
--24672, -24952, -25228, -25499, -25766,
--26029, -26288, -26541, -26791, -27035,
--27275, -27511, -27741, -27967, -28188,
--28405, -28616, -28823, -29024, -29221,
--29412, -29599, -29780, -29957, -30128,
--30294, -30455, -30611, -30761, -30906,
--31046, -31181, -31310, -31434, -31552,
--31665, -31773, -31875, -31972, -32063,
--32149, -32229, -32304, -32373, -32437,
--32495, -32547, -32594, -32635, -32671,
--32701, -32726, -32745, -32758, -32766,
-32767, 32754, 32717, 32658, 32577,
-32473, 32348, 32200, 32029, 31837,
-31624, 31388, 31131, 30853, 30553,
-30232, 29891, 29530, 29148, 28746,
-28324, 27883, 27423, 26944, 26447,
-25931, 25398, 24847, 24279, 23695,
-23095, 22478, 21846, 21199, 20538,
-19863, 19174, 18472, 17757, 17030,
-16291, 15541, 14781, 14010, 13230,
-12441, 11643, 10837, 10024, 9204,
-8377, 7545, 6708, 5866, 5020,
-4171, 3319, 2464, 1608, 751,
--107, -965, -1822, -2678, -3532,
--4383, -5232, -6077, -6918, -7754,
--8585, -9409, -10228, -11039, -11843,
--12639, -13426, -14204, -14972, -15730,
--16477, -17213, -17937, -18648, -19347,
--20033, -20705, -21363, -22006, -22634,
--23246, -23843, -24423, -24986, -25533,
--26062, -26573, -27066, -27540, -27995,
--28431, -28848, -29245, -29622, -29979,
--30315, -30630, -30924, -31197, -31449,
--31679, -31887, -32074, -32239, -32381,
--32501, -32600, -32675, -32729, -32759,
-#endif
 };
 #endif
 
@@ -1538,7 +889,6 @@ window120,    /* window */
 #ifndef DEF_WINDOW240
 #define DEF_WINDOW240
 static const celt_coef window240[240] = {
-#ifdef ENABLE_QEXT
 36124, 325113, 903042, 1769811, 2925272,
 4369225, 6101422, 8121563, 10429297, 13024223,
 15905885, 19073777, 22527339, 26265958, 30288963,
@@ -1587,56 +937,6 @@ static const celt_coef window240[240] = {
 2147270033, 2147323012, 2147365487, 2147398940, 2147424741,
 2147444152, 2147458322, 2147468290, 2147474980, 2147479203,
 2147481655, 2147482918, 2147483458, 2147483623, 2147483647,
-#else
-1, 5, 14, 27, 45,
-67, 93, 124, 159, 199,
-243, 291, 344, 401, 462,
-528, 598, 672, 751, 834,
-921, 1012, 1108, 1208, 1312,
-1420, 1532, 1649, 1769, 1894,
-2023, 2155, 2292, 2433, 2577,
-2726, 2878, 3035, 3195, 3358,
-3526, 3697, 3872, 4050, 4232,
-4418, 4607, 4799, 4995, 5194,
-5397, 5602, 5811, 6023, 6238,
-6456, 6676, 6900, 7127, 7356,
-7588, 7822, 8059, 8299, 8541,
-8785, 9032, 9280, 9531, 9784,
-10039, 10295, 10554, 10814, 11076,
-11339, 11603, 11869, 12137, 12405,
-12675, 12945, 13217, 13489, 13762,
-14035, 14310, 14584, 14859, 15134,
-15410, 15685, 15961, 16236, 16511,
-16786, 17060, 17334, 17607, 17880,
-18152, 18423, 18692, 18961, 19229,
-19496, 19761, 20025, 20287, 20548,
-20807, 21064, 21320, 21574, 21825,
-22075, 22322, 22567, 22810, 23051,
-23289, 23525, 23758, 23989, 24217,
-24442, 24664, 24884, 25100, 25314,
-25525, 25733, 25937, 26139, 26337,
-26533, 26725, 26913, 27099, 27281,
-27460, 27636, 27808, 27977, 28142,
-28304, 28463, 28618, 28770, 28919,
-29064, 29205, 29344, 29478, 29610,
-29738, 29863, 29984, 30103, 30217,
-30329, 30438, 30543, 30645, 30744,
-30839, 30932, 31022, 31109, 31192,
-31273, 31351, 31426, 31499, 31568,
-31635, 31700, 31761, 31821, 31877,
-31932, 31984, 32033, 32081, 32126,
-32169, 32210, 32249, 32286, 32321,
-32354, 32385, 32415, 32443, 32469,
-32494, 32517, 32538, 32559, 32578,
-32595, 32612, 32627, 32641, 32654,
-32666, 32678, 32688, 32697, 32706,
-32713, 32720, 32726, 32732, 32737,
-32742, 32746, 32749, 32752, 32755,
-32757, 32759, 32761, 32763, 32764,
-32765, 32766, 32766, 32767, 32767,
-32767, 32767, 32767, 32767, 32767,
-32767, 32767, 32767, 32767, 32767,
-#endif
 };
 #endif
 
@@ -1703,7 +1003,6 @@ static const unsigned char cache_caps50[168] = {
 #ifndef FFT_TWIDDLES96000_1920
 #define FFT_TWIDDLES96000_1920
 static const kiss_twiddle_cpx fft_twiddles96000_1920[960] = {
-#ifdef ENABLE_QEXT
 {2147483647, 0}, {2147437652, -14055147},
 {2147299668, -28109692}, {2147069700, -42163034},
 {2146747759, -56214568}, {2146333858, -70263695},
@@ -2184,488 +1483,6 @@ static const kiss_twiddle_cpx fft_twiddles96000_1920[960] = {
 {2145828016, 84309812}, {2146333858, 70263695},
 {2146747759, 56214568}, {2147069700, 42163034},
 {2147299668, 28109692}, {2147437652, 14055147},
-#else
-{32767, 0}, {32767, -214},
-{32765, -429}, {32762, -643},
-{32757, -858}, {32750, -1072},
-{32743, -1286}, {32734, -1501},
-{32723, -1715}, {32711, -1929},
-{32698, -2143}, {32683, -2357},
-{32667, -2571}, {32649, -2785},
-{32631, -2998}, {32610, -3212},
-{32588, -3425}, {32565, -3638},
-{32541, -3851}, {32515, -4064},
-{32488, -4277}, {32459, -4490},
-{32429, -4702}, {32397, -4914},
-{32365, -5126}, {32330, -5338},
-{32295, -5549}, {32258, -5760},
-{32219, -5971}, {32180, -6182},
-{32138, -6393}, {32096, -6603},
-{32052, -6813}, {32007, -7022},
-{31960, -7232}, {31912, -7441},
-{31863, -7650}, {31812, -7858},
-{31760, -8066}, {31706, -8274},
-{31651, -8481}, {31595, -8688},
-{31538, -8895}, {31479, -9101},
-{31419, -9307}, {31357, -9512},
-{31294, -9717}, {31230, -9922},
-{31164, -10126}, {31097, -10330},
-{31029, -10533}, {30959, -10736},
-{30888, -10938}, {30816, -11140},
-{30743, -11342}, {30668, -11543},
-{30592, -11743}, {30514, -11943},
-{30435, -12142}, {30355, -12341},
-{30274, -12540}, {30191, -12738},
-{30107, -12935}, {30022, -13132},
-{29935, -13328}, {29847, -13524},
-{29758, -13719}, {29668, -13913},
-{29576, -14107}, {29483, -14300},
-{29389, -14493}, {29293, -14685},
-{29197, -14876}, {29099, -15067},
-{28999, -15257}, {28899, -15447},
-{28797, -15636}, {28694, -15824},
-{28590, -16011}, {28485, -16198},
-{28378, -16384}, {28270, -16569},
-{28161, -16754}, {28051, -16938},
-{27939, -17121}, {27827, -17304},
-{27713, -17485}, {27598, -17666},
-{27482, -17847}, {27364, -18026},
-{27246, -18205}, {27126, -18383},
-{27005, -18560}, {26883, -18736},
-{26760, -18912}, {26635, -19087},
-{26510, -19261}, {26383, -19434},
-{26255, -19606}, {26127, -19777},
-{25997, -19948}, {25865, -20118},
-{25733, -20286}, {25600, -20454},
-{25466, -20622}, {25330, -20788},
-{25193, -20953}, {25056, -21118},
-{24917, -21281}, {24777, -21444},
-{24636, -21605}, {24494, -21766},
-{24351, -21926}, {24207, -22085},
-{24062, -22243}, {23916, -22400},
-{23769, -22556}, {23621, -22711},
-{23472, -22865}, {23322, -23018},
-{23170, -23170}, {23018, -23322},
-{22865, -23472}, {22711, -23621},
-{22556, -23769}, {22400, -23916},
-{22243, -24062}, {22085, -24207},
-{21926, -24351}, {21766, -24494},
-{21605, -24636}, {21444, -24777},
-{21281, -24917}, {21118, -25056},
-{20953, -25193}, {20788, -25330},
-{20622, -25466}, {20454, -25600},
-{20286, -25733}, {20118, -25865},
-{19948, -25997}, {19777, -26127},
-{19606, -26255}, {19434, -26383},
-{19261, -26510}, {19087, -26635},
-{18912, -26760}, {18736, -26883},
-{18560, -27005}, {18383, -27126},
-{18205, -27246}, {18026, -27364},
-{17847, -27482}, {17666, -27598},
-{17485, -27713}, {17304, -27827},
-{17121, -27939}, {16938, -28051},
-{16754, -28161}, {16569, -28270},
-{16384, -28378}, {16198, -28485},
-{16011, -28590}, {15824, -28694},
-{15636, -28797}, {15447, -28899},
-{15257, -28999}, {15067, -29099},
-{14876, -29197}, {14685, -29293},
-{14493, -29389}, {14300, -29483},
-{14107, -29576}, {13913, -29668},
-{13719, -29758}, {13524, -29847},
-{13328, -29935}, {13132, -30022},
-{12935, -30107}, {12738, -30191},
-{12540, -30274}, {12341, -30355},
-{12142, -30435}, {11943, -30514},
-{11743, -30592}, {11543, -30668},
-{11342, -30743}, {11140, -30816},
-{10938, -30888}, {10736, -30959},
-{10533, -31029}, {10330, -31097},
-{10126, -31164}, {9922, -31230},
-{9717, -31294}, {9512, -31357},
-{9307, -31419}, {9101, -31479},
-{8895, -31538}, {8688, -31595},
-{8481, -31651}, {8274, -31706},
-{8066, -31760}, {7858, -31812},
-{7650, -31863}, {7441, -31912},
-{7232, -31960}, {7022, -32007},
-{6813, -32052}, {6603, -32096},
-{6393, -32138}, {6182, -32180},
-{5971, -32219}, {5760, -32258},
-{5549, -32295}, {5338, -32330},
-{5126, -32365}, {4914, -32397},
-{4702, -32429}, {4490, -32459},
-{4277, -32488}, {4064, -32515},
-{3851, -32541}, {3638, -32565},
-{3425, -32588}, {3212, -32610},
-{2998, -32631}, {2785, -32649},
-{2571, -32667}, {2357, -32683},
-{2143, -32698}, {1929, -32711},
-{1715, -32723}, {1501, -32734},
-{1286, -32743}, {1072, -32750},
-{858, -32757}, {643, -32762},
-{429, -32765}, {214, -32767},
-{0, -32767}, {-214, -32767},
-{-429, -32765}, {-643, -32762},
-{-858, -32757}, {-1072, -32750},
-{-1286, -32743}, {-1501, -32734},
-{-1715, -32723}, {-1929, -32711},
-{-2143, -32698}, {-2357, -32683},
-{-2571, -32667}, {-2785, -32649},
-{-2998, -32631}, {-3212, -32610},
-{-3425, -32588}, {-3638, -32565},
-{-3851, -32541}, {-4064, -32515},
-{-4277, -32488}, {-4490, -32459},
-{-4702, -32429}, {-4914, -32397},
-{-5126, -32365}, {-5338, -32330},
-{-5549, -32295}, {-5760, -32258},
-{-5971, -32219}, {-6182, -32180},
-{-6393, -32138}, {-6603, -32096},
-{-6813, -32052}, {-7022, -32007},
-{-7232, -31960}, {-7441, -31912},
-{-7650, -31863}, {-7858, -31812},
-{-8066, -31760}, {-8274, -31706},
-{-8481, -31651}, {-8688, -31595},
-{-8895, -31538}, {-9101, -31479},
-{-9307, -31419}, {-9512, -31357},
-{-9717, -31294}, {-9922, -31230},
-{-10126, -31164}, {-10330, -31097},
-{-10533, -31029}, {-10736, -30959},
-{-10938, -30888}, {-11140, -30816},
-{-11342, -30743}, {-11543, -30668},
-{-11743, -30592}, {-11943, -30514},
-{-12142, -30435}, {-12341, -30355},
-{-12540, -30274}, {-12738, -30191},
-{-12935, -30107}, {-13132, -30022},
-{-13328, -29935}, {-13524, -29847},
-{-13719, -29758}, {-13913, -29668},
-{-14107, -29576}, {-14300, -29483},
-{-14493, -29389}, {-14685, -29293},
-{-14876, -29197}, {-15067, -29099},
-{-15257, -28999}, {-15447, -28899},
-{-15636, -28797}, {-15824, -28694},
-{-16011, -28590}, {-16198, -28485},
-{-16384, -28378}, {-16569, -28270},
-{-16754, -28161}, {-16938, -28051},
-{-17121, -27939}, {-17304, -27827},
-{-17485, -27713}, {-17666, -27598},
-{-17847, -27482}, {-18026, -27364},
-{-18205, -27246}, {-18383, -27126},
-{-18560, -27005}, {-18736, -26883},
-{-18912, -26760}, {-19087, -26635},
-{-19261, -26510}, {-19434, -26383},
-{-19606, -26255}, {-19777, -26127},
-{-19948, -25997}, {-20118, -25865},
-{-20286, -25733}, {-20454, -25600},
-{-20622, -25466}, {-20788, -25330},
-{-20953, -25193}, {-21118, -25056},
-{-21281, -24917}, {-21444, -24777},
-{-21605, -24636}, {-21766, -24494},
-{-21926, -24351}, {-22085, -24207},
-{-22243, -24062}, {-22400, -23916},
-{-22556, -23769}, {-22711, -23621},
-{-22865, -23472}, {-23018, -23322},
-{-23170, -23170}, {-23322, -23018},
-{-23472, -22865}, {-23621, -22711},
-{-23769, -22556}, {-23916, -22400},
-{-24062, -22243}, {-24207, -22085},
-{-24351, -21926}, {-24494, -21766},
-{-24636, -21605}, {-24777, -21444},
-{-24917, -21281}, {-25056, -21118},
-{-25193, -20953}, {-25330, -20788},
-{-25466, -20622}, {-25600, -20454},
-{-25733, -20286}, {-25865, -20118},
-{-25997, -19948}, {-26127, -19777},
-{-26255, -19606}, {-26383, -19434},
-{-26510, -19261}, {-26635, -19087},
-{-26760, -18912}, {-26883, -18736},
-{-27005, -18560}, {-27126, -18383},
-{-27246, -18205}, {-27364, -18026},
-{-27482, -17847}, {-27598, -17666},
-{-27713, -17485}, {-27827, -17304},
-{-27939, -17121}, {-28051, -16938},
-{-28161, -16754}, {-28270, -16569},
-{-28378, -16384}, {-28485, -16198},
-{-28590, -16011}, {-28694, -15824},
-{-28797, -15636}, {-28899, -15447},
-{-28999, -15257}, {-29099, -15067},
-{-29197, -14876}, {-29293, -14685},
-{-29389, -14493}, {-29483, -14300},
-{-29576, -14107}, {-29668, -13913},
-{-29758, -13719}, {-29847, -13524},
-{-29935, -13328}, {-30022, -13132},
-{-30107, -12935}, {-30191, -12738},
-{-30274, -12540}, {-30355, -12341},
-{-30435, -12142}, {-30514, -11943},
-{-30592, -11743}, {-30668, -11543},
-{-30743, -11342}, {-30816, -11140},
-{-30888, -10938}, {-30959, -10736},
-{-31029, -10533}, {-31097, -10330},
-{-31164, -10126}, {-31230, -9922},
-{-31294, -9717}, {-31357, -9512},
-{-31419, -9307}, {-31479, -9101},
-{-31538, -8895}, {-31595, -8688},
-{-31651, -8481}, {-31706, -8274},
-{-31760, -8066}, {-31812, -7858},
-{-31863, -7650}, {-31912, -7441},
-{-31960, -7232}, {-32007, -7022},
-{-32052, -6813}, {-32096, -6603},
-{-32138, -6393}, {-32180, -6182},
-{-32219, -5971}, {-32258, -5760},
-{-32295, -5549}, {-32330, -5338},
-{-32365, -5126}, {-32397, -4914},
-{-32429, -4702}, {-32459, -4490},
-{-32488, -4277}, {-32515, -4064},
-{-32541, -3851}, {-32565, -3638},
-{-32588, -3425}, {-32610, -3212},
-{-32631, -2998}, {-32649, -2785},
-{-32667, -2571}, {-32683, -2357},
-{-32698, -2143}, {-32711, -1929},
-{-32723, -1715}, {-32734, -1501},
-{-32743, -1286}, {-32750, -1072},
-{-32757, -858}, {-32762, -643},
-{-32765, -429}, {-32767, -214},
-{-32767, 0}, {-32767, 214},
-{-32765, 429}, {-32762, 643},
-{-32757, 858}, {-32750, 1072},
-{-32743, 1286}, {-32734, 1501},
-{-32723, 1715}, {-32711, 1929},
-{-32698, 2143}, {-32683, 2357},
-{-32667, 2571}, {-32649, 2785},
-{-32631, 2998}, {-32610, 3212},
-{-32588, 3425}, {-32565, 3638},
-{-32541, 3851}, {-32515, 4064},
-{-32488, 4277}, {-32459, 4490},
-{-32429, 4702}, {-32397, 4914},
-{-32365, 5126}, {-32330, 5338},
-{-32295, 5549}, {-32258, 5760},
-{-32219, 5971}, {-32180, 6182},
-{-32138, 6393}, {-32096, 6603},
-{-32052, 6813}, {-32007, 7022},
-{-31960, 7232}, {-31912, 7441},
-{-31863, 7650}, {-31812, 7858},
-{-31760, 8066}, {-31706, 8274},
-{-31651, 8481}, {-31595, 8688},
-{-31538, 8895}, {-31479, 9101},
-{-31419, 9307}, {-31357, 9512},
-{-31294, 9717}, {-31230, 9922},
-{-31164, 10126}, {-31097, 10330},
-{-31029, 10533}, {-30959, 10736},
-{-30888, 10938}, {-30816, 11140},
-{-30743, 11342}, {-30668, 11543},
-{-30592, 11743}, {-30514, 11943},
-{-30435, 12142}, {-30355, 12341},
-{-30274, 12540}, {-30191, 12738},
-{-30107, 12935}, {-30022, 13132},
-{-29935, 13328}, {-29847, 13524},
-{-29758, 13719}, {-29668, 13913},
-{-29576, 14107}, {-29483, 14300},
-{-29389, 14493}, {-29293, 14685},
-{-29197, 14876}, {-29099, 15067},
-{-28999, 15257}, {-28899, 15447},
-{-28797, 15636}, {-28694, 15824},
-{-28590, 16011}, {-28485, 16198},
-{-28378, 16384}, {-28270, 16569},
-{-28161, 16754}, {-28051, 16938},
-{-27939, 17121}, {-27827, 17304},
-{-27713, 17485}, {-27598, 17666},
-{-27482, 17847}, {-27364, 18026},
-{-27246, 18205}, {-27126, 18383},
-{-27005, 18560}, {-26883, 18736},
-{-26760, 18912}, {-26635, 19087},
-{-26510, 19261}, {-26383, 19434},
-{-26255, 19606}, {-26127, 19777},
-{-25997, 19948}, {-25865, 20118},
-{-25733, 20286}, {-25600, 20454},
-{-25466, 20622}, {-25330, 20788},
-{-25193, 20953}, {-25056, 21118},
-{-24917, 21281}, {-24777, 21444},
-{-24636, 21605}, {-24494, 21766},
-{-24351, 21926}, {-24207, 22085},
-{-24062, 22243}, {-23916, 22400},
-{-23769, 22556}, {-23621, 22711},
-{-23472, 22865}, {-23322, 23018},
-{-23170, 23170}, {-23018, 23322},
-{-22865, 23472}, {-22711, 23621},
-{-22556, 23769}, {-22400, 23916},
-{-22243, 24062}, {-22085, 24207},
-{-21926, 24351}, {-21766, 24494},
-{-21605, 24636}, {-21444, 24777},
-{-21281, 24917}, {-21118, 25056},
-{-20953, 25193}, {-20788, 25330},
-{-20622, 25466}, {-20454, 25600},
-{-20286, 25733}, {-20118, 25865},
-{-19948, 25997}, {-19777, 26127},
-{-19606, 26255}, {-19434, 26383},
-{-19261, 26510}, {-19087, 26635},
-{-18912, 26760}, {-18736, 26883},
-{-18560, 27005}, {-18383, 27126},
-{-18205, 27246}, {-18026, 27364},
-{-17847, 27482}, {-17666, 27598},
-{-17485, 27713}, {-17304, 27827},
-{-17121, 27939}, {-16938, 28051},
-{-16754, 28161}, {-16569, 28270},
-{-16384, 28378}, {-16198, 28485},
-{-16011, 28590}, {-15824, 28694},
-{-15636, 28797}, {-15447, 28899},
-{-15257, 28999}, {-15067, 29099},
-{-14876, 29197}, {-14685, 29293},
-{-14493, 29389}, {-14300, 29483},
-{-14107, 29576}, {-13913, 29668},
-{-13719, 29758}, {-13524, 29847},
-{-13328, 29935}, {-13132, 30022},
-{-12935, 30107}, {-12738, 30191},
-{-12540, 30274}, {-12341, 30355},
-{-12142, 30435}, {-11943, 30514},
-{-11743, 30592}, {-11543, 30668},
-{-11342, 30743}, {-11140, 30816},
-{-10938, 30888}, {-10736, 30959},
-{-10533, 31029}, {-10330, 31097},
-{-10126, 31164}, {-9922, 31230},
-{-9717, 31294}, {-9512, 31357},
-{-9307, 31419}, {-9101, 31479},
-{-8895, 31538}, {-8688, 31595},
-{-8481, 31651}, {-8274, 31706},
-{-8066, 31760}, {-7858, 31812},
-{-7650, 31863}, {-7441, 31912},
-{-7232, 31960}, {-7022, 32007},
-{-6813, 32052}, {-6603, 32096},
-{-6393, 32138}, {-6182, 32180},
-{-5971, 32219}, {-5760, 32258},
-{-5549, 32295}, {-5338, 32330},
-{-5126, 32365}, {-4914, 32397},
-{-4702, 32429}, {-4490, 32459},
-{-4277, 32488}, {-4064, 32515},
-{-3851, 32541}, {-3638, 32565},
-{-3425, 32588}, {-3212, 32610},
-{-2998, 32631}, {-2785, 32649},
-{-2571, 32667}, {-2357, 32683},
-{-2143, 32698}, {-1929, 32711},
-{-1715, 32723}, {-1501, 32734},
-{-1286, 32743}, {-1072, 32750},
-{-858, 32757}, {-643, 32762},
-{-429, 32765}, {-214, 32767},
-{0, 32767}, {214, 32767},
-{429, 32765}, {643, 32762},
-{858, 32757}, {1072, 32750},
-{1286, 32743}, {1501, 32734},
-{1715, 32723}, {1929, 32711},
-{2143, 32698}, {2357, 32683},
-{2571, 32667}, {2785, 32649},
-{2998, 32631}, {3212, 32610},
-{3425, 32588}, {3638, 32565},
-{3851, 32541}, {4064, 32515},
-{4277, 32488}, {4490, 32459},
-{4702, 32429}, {4914, 32397},
-{5126, 32365}, {5338, 32330},
-{5549, 32295}, {5760, 32258},
-{5971, 32219}, {6182, 32180},
-{6393, 32138}, {6603, 32096},
-{6813, 32052}, {7022, 32007},
-{7232, 31960}, {7441, 31912},
-{7650, 31863}, {7858, 31812},
-{8066, 31760}, {8274, 31706},
-{8481, 31651}, {8688, 31595},
-{8895, 31538}, {9101, 31479},
-{9307, 31419}, {9512, 31357},
-{9717, 31294}, {9922, 31230},
-{10126, 31164}, {10330, 31097},
-{10533, 31029}, {10736, 30959},
-{10938, 30888}, {11140, 30816},
-{11342, 30743}, {11543, 30668},
-{11743, 30592}, {11943, 30514},
-{12142, 30435}, {12341, 30355},
-{12540, 30274}, {12738, 30191},
-{12935, 30107}, {13132, 30022},
-{13328, 29935}, {13524, 29847},
-{13719, 29758}, {13913, 29668},
-{14107, 29576}, {14300, 29483},
-{14493, 29389}, {14685, 29293},
-{14876, 29197}, {15067, 29099},
-{15257, 28999}, {15447, 28899},
-{15636, 28797}, {15824, 28694},
-{16011, 28590}, {16198, 28485},
-{16384, 28378}, {16569, 28270},
-{16754, 28161}, {16938, 28051},
-{17121, 27939}, {17304, 27827},
-{17485, 27713}, {17666, 27598},
-{17847, 27482}, {18026, 27364},
-{18205, 27246}, {18383, 27126},
-{18560, 27005}, {18736, 26883},
-{18912, 26760}, {19087, 26635},
-{19261, 26510}, {19434, 26383},
-{19606, 26255}, {19777, 26127},
-{19948, 25997}, {20118, 25865},
-{20286, 25733}, {20454, 25600},
-{20622, 25466}, {20788, 25330},
-{20953, 25193}, {21118, 25056},
-{21281, 24917}, {21444, 24777},
-{21605, 24636}, {21766, 24494},
-{21926, 24351}, {22085, 24207},
-{22243, 24062}, {22400, 23916},
-{22556, 23769}, {22711, 23621},
-{22865, 23472}, {23018, 23322},
-{23170, 23170}, {23322, 23018},
-{23472, 22865}, {23621, 22711},
-{23769, 22556}, {23916, 22400},
-{24062, 22243}, {24207, 22085},
-{24351, 21926}, {24494, 21766},
-{24636, 21605}, {24777, 21444},
-{24917, 21281}, {25056, 21118},
-{25193, 20953}, {25330, 20788},
-{25466, 20622}, {25600, 20454},
-{25733, 20286}, {25865, 20118},
-{25997, 19948}, {26127, 19777},
-{26255, 19606}, {26383, 19434},
-{26510, 19261}, {26635, 19087},
-{26760, 18912}, {26883, 18736},
-{27005, 18560}, {27126, 18383},
-{27246, 18205}, {27364, 18026},
-{27482, 17847}, {27598, 17666},
-{27713, 17485}, {27827, 17304},
-{27939, 17121}, {28051, 16938},
-{28161, 16754}, {28270, 16569},
-{28378, 16384}, {28485, 16198},
-{28590, 16011}, {28694, 15824},
-{28797, 15636}, {28899, 15447},
-{28999, 15257}, {29099, 15067},
-{29197, 14876}, {29293, 14685},
-{29389, 14493}, {29483, 14300},
-{29576, 14107}, {29668, 13913},
-{29758, 13719}, {29847, 13524},
-{29935, 13328}, {30022, 13132},
-{30107, 12935}, {30191, 12738},
-{30274, 12540}, {30355, 12341},
-{30435, 12142}, {30514, 11943},
-{30592, 11743}, {30668, 11543},
-{30743, 11342}, {30816, 11140},
-{30888, 10938}, {30959, 10736},
-{31029, 10533}, {31097, 10330},
-{31164, 10126}, {31230, 9922},
-{31294, 9717}, {31357, 9512},
-{31419, 9307}, {31479, 9101},
-{31538, 8895}, {31595, 8688},
-{31651, 8481}, {31706, 8274},
-{31760, 8066}, {31812, 7858},
-{31863, 7650}, {31912, 7441},
-{31960, 7232}, {32007, 7022},
-{32052, 6813}, {32096, 6603},
-{32138, 6393}, {32180, 6182},
-{32219, 5971}, {32258, 5760},
-{32295, 5549}, {32330, 5338},
-{32365, 5126}, {32397, 4914},
-{32429, 4702}, {32459, 4490},
-{32488, 4277}, {32515, 4064},
-{32541, 3851}, {32565, 3638},
-{32588, 3425}, {32610, 3212},
-{32631, 2998}, {32649, 2785},
-{32667, 2571}, {32683, 2357},
-{32698, 2143}, {32711, 1929},
-{32723, 1715}, {32734, 1501},
-{32743, 1286}, {32750, 1072},
-{32757, 858}, {32762, 643},
-{32765, 429}, {32767, 214},
-#endif
 };
 #ifndef FFT_BITREV960
 #define FFT_BITREV960
@@ -2815,11 +1632,7 @@ static const opus_int16 fft_bitrev120[120] = {
 #define FFT_STATE96000_1920_0
 static const kiss_fft_state fft_state96000_1920_0 = {
 960,    /* nfft */
-#ifdef ENABLE_QEXT
 572662306,    /* scale */
-#else
-17476,    /* scale */
-#endif
 9,    /* scale_shift */
 -1,    /* shift */
 {5, 192, 3, 64, 4, 16, 4, 4, 4, 1, 0, 0, 0, 0, 0, 0, },    /* factors */
@@ -2837,11 +1650,7 @@ NULL,
 #define FFT_STATE96000_1920_1
 static const kiss_fft_state fft_state96000_1920_1 = {
 480,    /* nfft */
-#ifdef ENABLE_QEXT
 572662306,    /* scale */
-#else
-17476,    /* scale */
-#endif
 8,    /* scale_shift */
 1,    /* shift */
 {5, 96, 3, 32, 4, 8, 2, 4, 4, 1, 0, 0, 0, 0, 0, 0, },    /* factors */
@@ -2859,11 +1668,7 @@ NULL,
 #define FFT_STATE96000_1920_2
 static const kiss_fft_state fft_state96000_1920_2 = {
 240,    /* nfft */
-#ifdef ENABLE_QEXT
 572662306,    /* scale */
-#else
-17476,    /* scale */
-#endif
 7,    /* scale_shift */
 2,    /* shift */
 {5, 48, 3, 16, 4, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, },    /* factors */
@@ -2881,11 +1686,7 @@ NULL,
 #define FFT_STATE96000_1920_3
 static const kiss_fft_state fft_state96000_1920_3 = {
 120,    /* nfft */
-#ifdef ENABLE_QEXT
 572662306,    /* scale */
-#else
-17476,    /* scale */
-#endif
 6,    /* scale_shift */
 3,    /* shift */
 {5, 24, 3, 8, 2, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, },    /* factors */
@@ -2904,7 +1705,6 @@ NULL,
 #ifndef MDCT_TWIDDLES1920
 #define MDCT_TWIDDLES1920
 static const celt_coef mdct_twiddles1920[3600] = {
-#ifdef ENABLE_QEXT
 2147483603, 2147480010, 2147470667, 2147455575, 2147434733,
 2147408142, 2147375802, 2147337712, 2147293874, 2147244286,
 2147188950, 2147127865, 2147061032, 2146988450, 2146910120,
@@ -3625,728 +2425,6 @@ static const celt_coef mdct_twiddles1920[3600] = {
 -2106903043, -2112161350, -2117057750, -2121591402, -2125761531,
 -2129567422, -2133008422, -2136083942, -2138793455, -2141136497,
 -2143112666, -2144721624, -2145963095, -2146836866, -2147342788,
-#else
-32767, 32767, 32767, 32767, 32767,
-32767, 32766, 32766, 32765, 32764,
-32764, 32763, 32762, 32760, 32759,
-32758, 32757, 32755, 32754, 32752,
-32750, 32748, 32747, 32745, 32742,
-32740, 32738, 32736, 32733, 32731,
-32728, 32726, 32723, 32720, 32717,
-32714, 32711, 32708, 32704, 32701,
-32697, 32694, 32690, 32686, 32683,
-32679, 32675, 32671, 32666, 32662,
-32658, 32653, 32649, 32644, 32640,
-32635, 32630, 32625, 32620, 32615,
-32610, 32604, 32599, 32593, 32588,
-32582, 32576, 32571, 32565, 32559,
-32553, 32546, 32540, 32534, 32527,
-32521, 32514, 32507, 32501, 32494,
-32487, 32480, 32473, 32465, 32458,
-32451, 32443, 32436, 32428, 32420,
-32412, 32404, 32396, 32388, 32380,
-32372, 32364, 32355, 32347, 32338,
-32329, 32320, 32312, 32303, 32294,
-32284, 32275, 32266, 32257, 32247,
-32237, 32228, 32218, 32208, 32198,
-32188, 32178, 32168, 32158, 32147,
-32137, 32127, 32116, 32105, 32094,
-32084, 32073, 32062, 32051, 32039,
-32028, 32017, 32005, 31994, 31982,
-31970, 31959, 31947, 31935, 31923,
-31910, 31898, 31886, 31874, 31861,
-31848, 31836, 31823, 31810, 31797,
-31784, 31771, 31758, 31745, 31732,
-31718, 31705, 31691, 31677, 31664,
-31650, 31636, 31622, 31608, 31593,
-31579, 31565, 31550, 31536, 31521,
-31507, 31492, 31477, 31462, 31447,
-31432, 31417, 31401, 31386, 31371,
-31355, 31339, 31324, 31308, 31292,
-31276, 31260, 31244, 31228, 31212,
-31195, 31179, 31162, 31146, 31129,
-31112, 31095, 31078, 31061, 31044,
-31027, 31010, 30992, 30975, 30957,
-30940, 30922, 30904, 30886, 30868,
-30850, 30832, 30814, 30796, 30777,
-30759, 30740, 30722, 30703, 30684,
-30665, 30646, 30627, 30608, 30589,
-30570, 30551, 30531, 30512, 30492,
-30472, 30453, 30433, 30413, 30393,
-30373, 30353, 30332, 30312, 30292,
-30271, 30251, 30230, 30209, 30188,
-30167, 30146, 30125, 30104, 30083,
-30062, 30040, 30019, 29997, 29976,
-29954, 29932, 29910, 29889, 29867,
-29844, 29822, 29800, 29778, 29755,
-29733, 29710, 29687, 29665, 29642,
-29619, 29596, 29573, 29550, 29527,
-29503, 29480, 29457, 29433, 29409,
-29386, 29362, 29338, 29314, 29290,
-29266, 29242, 29218, 29193, 29169,
-29145, 29120, 29095, 29071, 29046,
-29021, 28996, 28971, 28946, 28921,
-28896, 28870, 28845, 28819, 28794,
-28768, 28743, 28717, 28691, 28665,
-28639, 28613, 28587, 28560, 28534,
-28508, 28481, 28455, 28428, 28401,
-28375, 28348, 28321, 28294, 28267,
-28240, 28212, 28185, 28158, 28130,
-28103, 28075, 28047, 28020, 27992,
-27964, 27936, 27908, 27880, 27851,
-27823, 27795, 27766, 27738, 27709,
-27681, 27652, 27623, 27594, 27565,
-27536, 27507, 27478, 27449, 27419,
-27390, 27360, 27331, 27301, 27272,
-27242, 27212, 27182, 27152, 27122,
-27092, 27062, 27032, 27001, 26971,
-26940, 26910, 26879, 26848, 26818,
-26787, 26756, 26725, 26694, 26663,
-26631, 26600, 26569, 26537, 26506,
-26474, 26443, 26411, 26379, 26347,
-26316, 26284, 26251, 26219, 26187,
-26155, 26123, 26090, 26058, 26025,
-25993, 25960, 25927, 25894, 25861,
-25828, 25795, 25762, 25729, 25696,
-25663, 25629, 25596, 25562, 25529,
-25495, 25461, 25428, 25394, 25360,
-25326, 25292, 25258, 25223, 25189,
-25155, 25120, 25086, 25051, 25017,
-24982, 24947, 24913, 24878, 24843,
-24808, 24773, 24738, 24702, 24667,
-24632, 24596, 24561, 24525, 24490,
-24454, 24419, 24383, 24347, 24311,
-24275, 24239, 24203, 24167, 24130,
-24094, 24058, 24021, 23985, 23948,
-23912, 23875, 23838, 23801, 23764,
-23728, 23690, 23653, 23616, 23579,
-23542, 23504, 23467, 23430, 23392,
-23355, 23317, 23279, 23241, 23204,
-23166, 23128, 23090, 23052, 23014,
-22975, 22937, 22899, 22860, 22822,
-22783, 22745, 22706, 22668, 22629,
-22590, 22551, 22512, 22473, 22434,
-22395, 22356, 22317, 22277, 22238,
-22199, 22159, 22120, 22080, 22040,
-22001, 21961, 21921, 21881, 21841,
-21801, 21761, 21721, 21681, 21641,
-21600, 21560, 21520, 21479, 21439,
-21398, 21357, 21317, 21276, 21235,
-21194, 21153, 21112, 21071, 21030,
-20989, 20948, 20907, 20865, 20824,
-20783, 20741, 20700, 20658, 20616,
-20575, 20533, 20491, 20449, 20407,
-20365, 20323, 20281, 20239, 20197,
-20155, 20112, 20070, 20028, 19985,
-19943, 19900, 19857, 19815, 19772,
-19729, 19686, 19643, 19601, 19558,
-19514, 19471, 19428, 19385, 19342,
-19298, 19255, 19212, 19168, 19125,
-19081, 19038, 18994, 18950, 18906,
-18863, 18819, 18775, 18731, 18687,
-18643, 18599, 18554, 18510, 18466,
-18422, 18377, 18333, 18288, 18244,
-18199, 18155, 18110, 18065, 18021,
-17976, 17931, 17886, 17841, 17796,
-17751, 17706, 17661, 17616, 17570,
-17525, 17480, 17434, 17389, 17344,
-17298, 17252, 17207, 17161, 17116,
-17070, 17024, 16978, 16932, 16886,
-16840, 16794, 16748, 16702, 16656,
-16610, 16564, 16517, 16471, 16425,
-16378, 16332, 16285, 16239, 16192,
-16145, 16099, 16052, 16005, 15958,
-15912, 15865, 15818, 15771, 15724,
-15677, 15630, 15583, 15535, 15488,
-15441, 15394, 15346, 15299, 15251,
-15204, 15156, 15109, 15061, 15014,
-14966, 14918, 14870, 14823, 14775,
-14727, 14679, 14631, 14583, 14535,
-14487, 14439, 14391, 14342, 14294,
-14246, 14198, 14149, 14101, 14053,
-14004, 13956, 13907, 13858, 13810,
-13761, 13713, 13664, 13615, 13566,
-13517, 13469, 13420, 13371, 13322,
-13273, 13224, 13175, 13126, 13076,
-13027, 12978, 12929, 12880, 12830,
-12781, 12731, 12682, 12633, 12583,
-12534, 12484, 12434, 12385, 12335,
-12285, 12236, 12186, 12136, 12086,
-12037, 11987, 11937, 11887, 11837,
-11787, 11737, 11687, 11637, 11586,
-11536, 11486, 11436, 11386, 11335,
-11285, 11235, 11184, 11134, 11083,
-11033, 10982, 10932, 10881, 10831,
-10780, 10729, 10679, 10628, 10577,
-10527, 10476, 10425, 10374, 10323,
-10272, 10221, 10170, 10119, 10068,
-10017, 9966, 9915, 9864, 9813,
-9762, 9711, 9659, 9608, 9557,
-9506, 9454, 9403, 9352, 9300,
-9249, 9197, 9146, 9094, 9043,
-8991, 8940, 8888, 8836, 8785,
-8733, 8681, 8630, 8578, 8526,
-8475, 8423, 8371, 8319, 8267,
-8215, 8163, 8111, 8059, 8007,
-7955, 7903, 7851, 7799, 7747,
-7695, 7643, 7591, 7539, 7487,
-7434, 7382, 7330, 7278, 7225,
-7173, 7121, 7068, 7016, 6964,
-6911, 6859, 6806, 6754, 6701,
-6649, 6596, 6544, 6491, 6439,
-6386, 6334, 6281, 6228, 6176,
-6123, 6070, 6018, 5965, 5912,
-5859, 5807, 5754, 5701, 5648,
-5595, 5543, 5490, 5437, 5384,
-5331, 5278, 5225, 5172, 5119,
-5066, 5013, 4960, 4907, 4854,
-4801, 4748, 4695, 4642, 4589,
-4536, 4483, 4430, 4377, 4324,
-4270, 4217, 4164, 4111, 4058,
-4005, 3951, 3898, 3845, 3792,
-3738, 3685, 3632, 3578, 3525,
-3472, 3419, 3365, 3312, 3259,
-3205, 3152, 3098, 3045, 2992,
-2938, 2885, 2831, 2778, 2725,
-2671, 2618, 2564, 2511, 2457,
-2404, 2350, 2297, 2243, 2190,
-2136, 2083, 2029, 1976, 1922,
-1869, 1815, 1762, 1708, 1655,
-1601, 1548, 1494, 1440, 1387,
-1333, 1280, 1226, 1173, 1119,
-1065, 1012, 958, 905, 851,
-797, 744, 690, 637, 583,
-529, 476, 422, 369, 315,
-261, 208, 154, 101, 47,
--7, -60, -114, -168, -221,
--275, -328, -382, -436, -489,
--543, -596, -650, -704, -757,
--811, -864, -918, -972, -1025,
--1079, -1132, -1186, -1240, -1293,
--1347, -1400, -1454, -1507, -1561,
--1615, -1668, -1722, -1775, -1829,
--1882, -1936, -1989, -2043, -2096,
--2150, -2203, -2257, -2310, -2364,
--2417, -2471, -2524, -2578, -2631,
--2685, -2738, -2791, -2845, -2898,
--2952, -3005, -3058, -3112, -3165,
--3218, -3272, -3325, -3379, -3432,
--3485, -3538, -3592, -3645, -3698,
--3752, -3805, -3858, -3911, -3965,
--4018, -4071, -4124, -4177, -4231,
--4284, -4337, -4390, -4443, -4496,
--4549, -4602, -4656, -4709, -4762,
--4815, -4868, -4921, -4974, -5027,
--5080, -5133, -5186, -5239, -5291,
--5344, -5397, -5450, -5503, -5556,
--5609, -5662, -5714, -5767, -5820,
--5873, -5925, -5978, -6031, -6083,
--6136, -6189, -6241, -6294, -6347,
--6399, -6452, -6504, -6557, -6609,
--6662, -6714, -6767, -6819, -6872,
--6924, -6977, -7029, -7081, -7134,
--7186, -7238, -7291, -7343, -7395,
--7447, -7500, -7552, -7604, -7656,
--7708, -7760, -7812, -7864, -7916,
--7968, -8020, -8072, -8124, -8176,
--8228, -8280, -8332, -8384, -8436,
--8487, -8539, -8591, -8643, -8694,
--8746, -8798, -8849, -8901, -8953,
--9004, -9056, -9107, -9159, -9210,
--9262, -9313, -9364, -9416, -9467,
--9518, -9570, -9621, -9672, -9723,
--9775, -9826, -9877, -9928, -9979,
--10030, -10081, -10132, -10183, -10234,
--10285, -10336, -10387, -10438, -10488,
--10539, -10590, -10641, -10691, -10742,
--10793, -10843, -10894, -10945, -10995,
--11046, -11096, -11146, -11197, -11247,
--11298, -11348, -11398, -11448, -11499,
--11549, -11599, -11649, -11699, -11749,
--11799, -11849, -11899, -11949, -11999,
--12049, -12099, -12149, -12198, -12248,
--12298, -12348, -12397, -12447, -12496,
--12546, -12595, -12645, -12694, -12744,
--12793, -12843, -12892, -12941, -12990,
--13040, -13089, -13138, -13187, -13236,
--13285, -13334, -13383, -13432, -13481,
--13530, -13579, -13627, -13676, -13725,
--13773, -13822, -13871, -13919, -13968,
--14016, -14065, -14113, -14161, -14210,
--14258, -14306, -14355, -14403, -14451,
--14499, -14547, -14595, -14643, -14691,
--14739, -14787, -14835, -14882, -14930,
--14978, -15025, -15073, -15121, -15168,
--15216, -15263, -15311, -15358, -15405,
--15453, -15500, -15547, -15594, -15641,
--15689, -15736, -15783, -15830, -15876,
--15923, -15970, -16017, -16064, -16110,
--16157, -16204, -16250, -16297, -16343,
--16390, -16436, -16483, -16529, -16575,
--16621, -16668, -16714, -16760, -16806,
--16852, -16898, -16944, -16990, -17035,
--17081, -17127, -17173, -17218, -17264,
--17309, -17355, -17400, -17446, -17491,
--17536, -17582, -17627, -17672, -17717,
--17762, -17807, -17852, -17897, -17942,
--17987, -18032, -18077, -18121, -18166,
--18210, -18255, -18300, -18344, -18388,
--18433, -18477, -18521, -18566, -18610,
--18654, -18698, -18742, -18786, -18830,
--18874, -18917, -18961, -19005, -19048,
--19092, -19136, -19179, -19223, -19266,
--19309, -19353, -19396, -19439, -19482,
--19525, -19568, -19611, -19654, -19697,
--19740, -19783, -19825, -19868, -19911,
--19953, -19996, -20038, -20081, -20123,
--20165, -20207, -20250, -20292, -20334,
--20376, -20418, -20460, -20502, -20543,
--20585, -20627, -20668, -20710, -20752,
--20793, -20834, -20876, -20917, -20958,
--20999, -21041, -21082, -21123, -21164,
--21205, -21245, -21286, -21327, -21368,
--21408, -21449, -21489, -21530, -21570,
--21610, -21651, -21691, -21731, -21771,
--21811, -21851, -21891, -21931, -21971,
--22011, -22050, -22090, -22130, -22169,
--22208, -22248, -22287, -22326, -22366,
--22405, -22444, -22483, -22522, -22561,
--22600, -22639, -22677, -22716, -22755,
--22793, -22832, -22870, -22908, -22947,
--22985, -23023, -23061, -23099, -23137,
--23175, -23213, -23251, -23289, -23326,
--23364, -23402, -23439, -23476, -23514,
--23551, -23588, -23626, -23663, -23700,
--23737, -23774, -23811, -23847, -23884,
--23921, -23957, -23994, -24030, -24067,
--24103, -24139, -24176, -24212, -24248,
--24284, -24320, -24356, -24392, -24427,
--24463, -24499, -24534, -24570, -24605,
--24641, -24676, -24711, -24746, -24782,
--24817, -24852, -24886, -24921, -24956,
--24991, -25025, -25060, -25095, -25129,
--25163, -25198, -25232, -25266, -25300,
--25334, -25368, -25402, -25436, -25470,
--25503, -25537, -25571, -25604, -25638,
--25671, -25704, -25737, -25771, -25804,
--25837, -25870, -25902, -25935, -25968,
--26001, -26033, -26066, -26098, -26131,
--26163, -26195, -26227, -26259, -26292,
--26323, -26355, -26387, -26419, -26451,
--26482, -26514, -26545, -26577, -26608,
--26639, -26670, -26702, -26733, -26764,
--26794, -26825, -26856, -26887, -26917,
--26948, -26978, -27009, -27039, -27069,
--27100, -27130, -27160, -27190, -27220,
--27249, -27279, -27309, -27338, -27368,
--27397, -27427, -27456, -27485, -27514,
--27543, -27572, -27601, -27630, -27659,
--27688, -27716, -27745, -27773, -27802,
--27830, -27858, -27887, -27915, -27943,
--27971, -27999, -28026, -28054, -28082,
--28109, -28137, -28164, -28192, -28219,
--28246, -28273, -28301, -28328, -28354,
--28381, -28408, -28435, -28461, -28488,
--28514, -28541, -28567, -28593, -28619,
--28645, -28671, -28697, -28723, -28749,
--28775, -28800, -28826, -28851, -28877,
--28902, -28927, -28952, -28977, -29002,
--29027, -29052, -29077, -29102, -29126,
--29151, -29175, -29200, -29224, -29248,
--29272, -29296, -29320, -29344, -29368,
--29392, -29415, -29439, -29462, -29486,
--29509, -29532, -29556, -29579, -29602,
--29625, -29648, -29670, -29693, -29716,
--29738, -29761, -29783, -29806, -29828,
--29850, -29872, -29894, -29916, -29938,
--29960, -29981, -30003, -30024, -30046,
--30067, -30088, -30110, -30131, -30152,
--30173, -30194, -30214, -30235, -30256,
--30276, -30297, -30317, -30337, -30358,
--30378, -30398, -30418, -30438, -30458,
--30477, -30497, -30516, -30536, -30555,
--30575, -30594, -30613, -30632, -30651,
--30670, -30689, -30708, -30726, -30745,
--30763, -30782, -30800, -30819, -30837,
--30855, -30873, -30891, -30909, -30926,
--30944, -30962, -30979, -30997, -31014,
--31031, -31048, -31065, -31082, -31099,
--31116, -31133, -31150, -31166, -31183,
--31199, -31216, -31232, -31248, -31264,
--31280, -31296, -31312, -31328, -31343,
--31359, -31374, -31390, -31405, -31421,
--31436, -31451, -31466, -31481, -31496,
--31510, -31525, -31540, -31554, -31568,
--31583, -31597, -31611, -31625, -31639,
--31653, -31667, -31681, -31694, -31708,
--31721, -31735, -31748, -31761, -31775,
--31788, -31801, -31813, -31826, -31839,
--31852, -31864, -31877, -31889, -31901,
--31914, -31926, -31938, -31950, -31961,
--31973, -31985, -31997, -32008, -32020,
--32031, -32042, -32053, -32064, -32075,
--32086, -32097, -32108, -32119, -32129,
--32140, -32150, -32160, -32171, -32181,
--32191, -32201, -32211, -32221, -32230,
--32240, -32249, -32259, -32268, -32278,
--32287, -32296, -32305, -32314, -32323,
--32331, -32340, -32349, -32357, -32366,
--32374, -32382, -32390, -32398, -32406,
--32414, -32422, -32430, -32437, -32445,
--32453, -32460, -32467, -32474, -32482,
--32489, -32495, -32502, -32509, -32516,
--32522, -32529, -32535, -32542, -32548,
--32554, -32560, -32566, -32572, -32578,
--32584, -32589, -32595, -32600, -32606,
--32611, -32616, -32621, -32626, -32631,
--32636, -32641, -32645, -32650, -32655,
--32659, -32663, -32668, -32672, -32676,
--32680, -32684, -32687, -32691, -32695,
--32698, -32702, -32705, -32708, -32712,
--32715, -32718, -32721, -32723, -32726,
--32729, -32731, -32734, -32736, -32739,
--32741, -32743, -32745, -32747, -32749,
--32751, -32752, -32754, -32756, -32757,
--32758, -32760, -32761, -32762, -32763,
--32764, -32765, -32765, -32766, -32766,
--32767, -32767, -32767, -32767, -32767,
-32767, 32767, 32767, 32766, 32765,
-32763, 32761, 32759, 32756, 32753,
-32750, 32746, 32742, 32738, 32733,
-32728, 32722, 32717, 32710, 32704,
-32697, 32690, 32682, 32674, 32666,
-32657, 32648, 32639, 32629, 32619,
-32609, 32598, 32587, 32576, 32564,
-32552, 32539, 32526, 32513, 32500,
-32486, 32472, 32457, 32442, 32427,
-32411, 32395, 32379, 32362, 32345,
-32328, 32310, 32292, 32274, 32255,
-32236, 32217, 32197, 32177, 32157,
-32136, 32115, 32093, 32071, 32049,
-32027, 32004, 31981, 31957, 31933,
-31909, 31884, 31859, 31834, 31809,
-31783, 31756, 31730, 31703, 31676,
-31648, 31620, 31592, 31563, 31534,
-31505, 31475, 31445, 31415, 31384,
-31353, 31322, 31290, 31258, 31226,
-31193, 31160, 31127, 31093, 31059,
-31025, 30990, 30955, 30920, 30884,
-30848, 30812, 30775, 30738, 30701,
-30663, 30625, 30587, 30548, 30509,
-30470, 30430, 30390, 30350, 30309,
-30269, 30227, 30186, 30144, 30102,
-30059, 30016, 29973, 29930, 29886,
-29842, 29797, 29752, 29707, 29662,
-29616, 29570, 29524, 29477, 29430,
-29383, 29335, 29287, 29239, 29190,
-29142, 29092, 29043, 28993, 28943,
-28892, 28842, 28791, 28739, 28688,
-28636, 28583, 28531, 28478, 28425,
-28371, 28317, 28263, 28209, 28154,
-28099, 28044, 27988, 27932, 27876,
-27820, 27763, 27706, 27648, 27591,
-27533, 27474, 27416, 27357, 27298,
-27238, 27178, 27118, 27058, 26997,
-26936, 26875, 26814, 26752, 26690,
-26628, 26565, 26502, 26439, 26375,
-26312, 26247, 26183, 26119, 26054,
-25988, 25923, 25857, 25791, 25725,
-25658, 25592, 25524, 25457, 25389,
-25322, 25253, 25185, 25116, 25047,
-24978, 24908, 24838, 24768, 24698,
-24627, 24557, 24485, 24414, 24342,
-24270, 24198, 24126, 24053, 23980,
-23907, 23834, 23760, 23686, 23612,
-23537, 23462, 23387, 23312, 23237,
-23161, 23085, 23009, 22932, 22856,
-22779, 22701, 22624, 22546, 22468,
-22390, 22312, 22233, 22154, 22075,
-21996, 21916, 21836, 21756, 21676,
-21595, 21515, 21434, 21352, 21271,
-21189, 21107, 21025, 20943, 20860,
-20777, 20694, 20611, 20528, 20444,
-20360, 20276, 20192, 20107, 20022,
-19937, 19852, 19767, 19681, 19595,
-19509, 19423, 19336, 19250, 19163,
-19076, 18988, 18901, 18813, 18725,
-18637, 18549, 18460, 18372, 18283,
-18194, 18104, 18015, 17925, 17835,
-17745, 17655, 17565, 17474, 17383,
-17292, 17201, 17110, 17018, 16927,
-16835, 16743, 16650, 16558, 16465,
-16372, 16279, 16186, 16093, 15999,
-15906, 15812, 15718, 15624, 15529,
-15435, 15340, 15245, 15150, 15055,
-14960, 14864, 14769, 14673, 14577,
-14481, 14385, 14288, 14192, 14095,
-13998, 13901, 13804, 13706, 13609,
-13511, 13414, 13316, 13218, 13119,
-13021, 12923, 12824, 12725, 12626,
-12527, 12428, 12329, 12230, 12130,
-12030, 11930, 11831, 11730, 11630,
-11530, 11430, 11329, 11228, 11128,
-11027, 10926, 10824, 10723, 10622,
-10520, 10419, 10317, 10215, 10113,
-10011, 9909, 9807, 9704, 9602,
-9499, 9397, 9294, 9191, 9088,
-8985, 8882, 8778, 8675, 8572,
-8468, 8364, 8261, 8157, 8053,
-7949, 7845, 7741, 7637, 7532,
-7428, 7323, 7219, 7114, 7009,
-6905, 6800, 6695, 6590, 6485,
-6380, 6274, 6169, 6064, 5958,
-5853, 5747, 5642, 5536, 5430,
-5325, 5219, 5113, 5007, 4901,
-4795, 4689, 4583, 4476, 4370,
-4264, 4157, 4051, 3945, 3838,
-3732, 3625, 3518, 3412, 3305,
-3198, 3092, 2985, 2878, 2771,
-2664, 2558, 2451, 2344, 2237,
-2130, 2023, 1916, 1809, 1702,
-1594, 1487, 1380, 1273, 1166,
-1059, 952, 844, 737, 630,
-523, 416, 308, 201, 94,
--13, -121, -228, -335, -442,
--550, -657, -764, -871, -978,
--1086, -1193, -1300, -1407, -1514,
--1621, -1728, -1835, -1942, -2049,
--2157, -2263, -2370, -2477, -2584,
--2691, -2798, -2905, -3012, -3118,
--3225, -3332, -3439, -3545, -3652,
--3758, -3865, -3971, -4078, -4184,
--4290, -4397, -4503, -4609, -4715,
--4821, -4927, -5033, -5139, -5245,
--5351, -5457, -5562, -5668, -5774,
--5879, -5985, -6090, -6195, -6301,
--6406, -6511, -6616, -6721, -6826,
--6931, -7036, -7140, -7245, -7349,
--7454, -7558, -7663, -7767, -7871,
--7975, -8079, -8183, -8287, -8390,
--8494, -8597, -8701, -8804, -8907,
--9011, -9114, -9217, -9319, -9422,
--9525, -9627, -9730, -9832, -9934,
--10037, -10139, -10241, -10342, -10444,
--10546, -10647, -10748, -10850, -10951,
--11052, -11153, -11253, -11354, -11455,
--11555, -11655, -11756, -11856, -11955,
--12055, -12155, -12254, -12354, -12453,
--12552, -12651, -12750, -12849, -12947,
--13046, -13144, -13242, -13340, -13438,
--13536, -13633, -13731, -13828, -13925,
--14022, -14119, -14216, -14312, -14409,
--14505, -14601, -14697, -14793, -14888,
--14984, -15079, -15174, -15269, -15364,
--15459, -15553, -15647, -15741, -15835,
--15929, -16023, -16116, -16210, -16303,
--16396, -16488, -16581, -16673, -16766,
--16858, -16949, -17041, -17133, -17224,
--17315, -17406, -17497, -17587, -17678,
--17768, -17858, -17948, -18037, -18127,
--18216, -18305, -18394, -18483, -18571,
--18659, -18747, -18835, -18923, -19010,
--19098, -19185, -19271, -19358, -19444,
--19531, -19617, -19702, -19788, -19873,
--19959, -20043, -20128, -20213, -20297,
--20381, -20465, -20549, -20632, -20715,
--20798, -20881, -20963, -21046, -21128,
--21210, -21291, -21373, -21454, -21535,
--21616, -21696, -21776, -21856, -21936,
--22016, -22095, -22174, -22253, -22331,
--22410, -22488, -22566, -22643, -22721,
--22798, -22875, -22951, -23028, -23104,
--23180, -23256, -23331, -23406, -23481,
--23556, -23630, -23704, -23778, -23852,
--23925, -23998, -24071, -24144, -24216,
--24288, -24360, -24432, -24503, -24574,
--24645, -24716, -24786, -24856, -24926,
--24995, -25064, -25133, -25202, -25270,
--25339, -25406, -25474, -25541, -25608,
--25675, -25742, -25808, -25874, -25939,
--26005, -26070, -26135, -26199, -26264,
--26327, -26391, -26455, -26518, -26581,
--26643, -26705, -26767, -26829, -26891,
--26952, -27013, -27073, -27133, -27193,
--27253, -27312, -27372, -27430, -27489,
--27547, -27605, -27663, -27720, -27777,
--27834, -27890, -27946, -28002, -28058,
--28113, -28168, -28223, -28277, -28331,
--28385, -28438, -28491, -28544, -28596,
--28649, -28701, -28752, -28803, -28854,
--28905, -28955, -29006, -29055, -29105,
--29154, -29203, -29251, -29299, -29347,
--29395, -29442, -29489, -29535, -29582,
--29628, -29673, -29719, -29764, -29808,
--29853, -29897, -29941, -29984, -30027,
--30070, -30112, -30154, -30196, -30238,
--30279, -30320, -30360, -30400, -30440,
--30480, -30519, -30558, -30596, -30635,
--30672, -30710, -30747, -30784, -30821,
--30857, -30893, -30929, -30964, -30999,
--31033, -31068, -31102, -31135, -31168,
--31201, -31234, -31266, -31298, -31330,
--31361, -31392, -31422, -31453, -31483,
--31512, -31541, -31570, -31599, -31627,
--31655, -31682, -31710, -31737, -31763,
--31789, -31815, -31841, -31866, -31891,
--31915, -31939, -31963, -31986, -32010,
--32032, -32055, -32077, -32099, -32120,
--32141, -32162, -32182, -32202, -32222,
--32241, -32260, -32279, -32297, -32315,
--32333, -32350, -32367, -32383, -32399,
--32415, -32431, -32446, -32461, -32475,
--32489, -32503, -32517, -32530, -32542,
--32555, -32567, -32579, -32590, -32601,
--32612, -32622, -32632, -32641, -32651,
--32659, -32668, -32676, -32684, -32692,
--32699, -32706, -32712, -32718, -32724,
--32729, -32734, -32739, -32743, -32747,
--32751, -32754, -32757, -32760, -32762,
--32764, -32765, -32767, -32767, -32767,
-32767, 32767, 32765, 32761, 32756,
-32750, 32742, 32732, 32722, 32710,
-32696, 32681, 32665, 32647, 32628,
-32608, 32586, 32562, 32538, 32512,
-32484, 32455, 32425, 32393, 32360,
-32326, 32290, 32253, 32214, 32174,
-32133, 32090, 32046, 32001, 31954,
-31906, 31856, 31805, 31753, 31700,
-31645, 31588, 31530, 31471, 31411,
-31349, 31286, 31222, 31156, 31089,
-31020, 30951, 30880, 30807, 30733,
-30658, 30582, 30504, 30425, 30345,
-30263, 30181, 30096, 30011, 29924,
-29836, 29747, 29656, 29564, 29471,
-29377, 29281, 29184, 29086, 28987,
-28886, 28784, 28681, 28577, 28471,
-28365, 28257, 28147, 28037, 27925,
-27812, 27698, 27583, 27467, 27349,
-27231, 27111, 26990, 26868, 26744,
-26620, 26494, 26367, 26239, 26110,
-25980, 25849, 25717, 25583, 25449,
-25313, 25176, 25038, 24900, 24760,
-24619, 24477, 24333, 24189, 24044,
-23898, 23751, 23602, 23453, 23303,
-23152, 22999, 22846, 22692, 22537,
-22380, 22223, 22065, 21906, 21746,
-21585, 21423, 21261, 21097, 20933,
-20767, 20601, 20434, 20265, 20096,
-19927, 19756, 19584, 19412, 19239,
-19065, 18890, 18714, 18538, 18361,
-18183, 18004, 17824, 17644, 17463,
-17281, 17098, 16915, 16731, 16546,
-16361, 16175, 15988, 15800, 15612,
-15423, 15234, 15043, 14852, 14661,
-14469, 14276, 14083, 13889, 13694,
-13499, 13303, 13107, 12910, 12713,
-12515, 12317, 12118, 11918, 11718,
-11517, 11316, 11115, 10913, 10710,
-10508, 10304, 10100, 9896, 9691,
-9486, 9281, 9075, 8869, 8662,
-8455, 8248, 8040, 7832, 7623,
-7415, 7206, 6996, 6787, 6577,
-6366, 6156, 5945, 5734, 5523,
-5311, 5100, 4888, 4675, 4463,
-4251, 4038, 3825, 3612, 3399,
-3185, 2972, 2758, 2544, 2330,
-2116, 1902, 1688, 1474, 1260,
-1045, 831, 617, 402, 188,
--27, -241, -456, -670, -885,
--1099, -1313, -1528, -1742, -1956,
--2170, -2384, -2598, -2811, -3025,
--3239, -3452, -3665, -3878, -4091,
--4304, -4516, -4728, -4941, -5153,
--5364, -5576, -5787, -5998, -6209,
--6419, -6629, -6839, -7049, -7258,
--7467, -7676, -7884, -8092, -8300,
--8507, -8714, -8920, -9127, -9332,
--9538, -9743, -9947, -10151, -10355,
--10558, -10761, -10963, -11165, -11367,
--11568, -11768, -11968, -12167, -12366,
--12565, -12762, -12960, -13156, -13352,
--13548, -13743, -13937, -14131, -14324,
--14517, -14709, -14900, -15091, -15281,
--15470, -15659, -15847, -16035, -16221,
--16407, -16593, -16777, -16961, -17144,
--17326, -17508, -17689, -17869, -18049,
--18227, -18405, -18582, -18758, -18934,
--19108, -19282, -19455, -19627, -19799,
--19969, -20139, -20308, -20475, -20642,
--20809, -20974, -21138, -21301, -21464,
--21626, -21786, -21946, -22105, -22263,
--22420, -22575, -22730, -22884, -23037,
--23189, -23340, -23490, -23640, -23788,
--23935, -24080, -24225, -24369, -24512,
--24654, -24795, -24934, -25073, -25211,
--25347, -25482, -25617, -25750, -25882,
--26013, -26143, -26272, -26399, -26526,
--26651, -26775, -26898, -27020, -27141,
--27260, -27379, -27496, -27612, -27727,
--27841, -27953, -28065, -28175, -28284,
--28391, -28498, -28603, -28707, -28810,
--28911, -29012, -29111, -29209, -29305,
--29401, -29495, -29587, -29679, -29769,
--29858, -29946, -30032, -30118, -30201,
--30284, -30365, -30445, -30524, -30601,
--30677, -30752, -30825, -30897, -30968,
--31038, -31106, -31172, -31238, -31302,
--31365, -31426, -31486, -31545, -31602,
--31658, -31713, -31766, -31818, -31869,
--31918, -31966, -32012, -32058, -32101,
--32144, -32185, -32224, -32262, -32299,
--32335, -32369, -32401, -32433, -32463,
--32491, -32518, -32544, -32568, -32591,
--32613, -32633, -32652, -32669, -32685,
--32700, -32713, -32724, -32735, -32744,
--32751, -32757, -32762, -32766, -32767,
-32767, 32764, 32755, 32741, 32720,
-32694, 32663, 32626, 32583, 32535,
-32481, 32421, 32356, 32286, 32209,
-32128, 32041, 31948, 31850, 31747,
-31638, 31523, 31403, 31278, 31148,
-31012, 30871, 30724, 30572, 30415,
-30253, 30086, 29913, 29736, 29553,
-29365, 29172, 28974, 28771, 28564,
-28351, 28134, 27911, 27684, 27452,
-27216, 26975, 26729, 26478, 26223,
-25964, 25700, 25432, 25159, 24882,
-24601, 24315, 24026, 23732, 23434,
-23133, 22827, 22517, 22204, 21886,
-21565, 21240, 20912, 20580, 20244,
-19905, 19563, 19217, 18868, 18516,
-18160, 17802, 17440, 17075, 16708,
-16338, 15964, 15588, 15210, 14829,
-14445, 14059, 13670, 13279, 12886,
-12490, 12093, 11693, 11291, 10888,
-10482, 10075, 9666, 9255, 8843,
-8429, 8014, 7597, 7180, 6760,
-6340, 5919, 5496, 5073, 4649,
-4224, 3798, 3372, 2945, 2517,
-2090, 1661, 1233, 804, 375,
--54, -483, -911, -1340, -1768,
--2197, -2624, -3052, -3479, -3905,
--4330, -4755, -5179, -5602, -6024,
--6445, -6865, -7284, -7702, -8118,
--8533, -8946, -9358, -9768, -10177,
--10584, -10989, -11392, -11793, -12192,
--12589, -12984, -13377, -13767, -14155,
--14541, -14924, -15305, -15683, -16058,
--16430, -16800, -17167, -17531, -17892,
--18249, -18604, -18956, -19304, -19649,
--19990, -20329, -20663, -20994, -21322,
--21646, -21966, -22282, -22595, -22904,
--23208, -23509, -23806, -24099, -24387,
--24672, -24952, -25228, -25499, -25766,
--26029, -26288, -26541, -26791, -27035,
--27275, -27511, -27741, -27967, -28188,
--28405, -28616, -28823, -29024, -29221,
--29412, -29599, -29780, -29957, -30128,
--30294, -30455, -30611, -30761, -30906,
--31046, -31181, -31310, -31434, -31552,
--31665, -31773, -31875, -31972, -32063,
--32149, -32229, -32304, -32373, -32437,
--32495, -32547, -32594, -32635, -32671,
--32701, -32726, -32745, -32758, -32766,
-#endif
 };
 #endif
 
diff --git a/celt/tests/test_unit_mathops.c b/celt/tests/test_unit_mathops.c
index c3adb3f4c..517ef5bca 100644
--- a/celt/tests/test_unit_mathops.c
+++ b/celt/tests/test_unit_mathops.c
@@ -283,7 +283,6 @@ void test_atan2(void) {
 
 void testlog2_db(void)
 {
-#if defined(ENABLE_QEXT)
    /* celt_log2_db test */
    float error = -1;
    float max_error = -2;
@@ -306,7 +305,6 @@ void testlog2_db(void)
       }
    }
    fprintf(stdout, "celt_log2_db max_error: %.7e\n", max_error);
-#endif  /* defined(ENABLE_QEXT) */
 }
 
 void testlog2(void)
@@ -340,7 +338,6 @@ void testexp2(void)
 
 void testexp2_db(void)
 {
-#if defined(ENABLE_QEXT)
    float absolute_error = -1;
    float absolute_error_threshold = FIX_INT_TO_DOUBLE(2, 16);
    float relative_error_threshold = -2;
@@ -371,7 +368,6 @@ void testexp2_db(void)
          ret = 1;
       }
    }
-#endif  /* defined(ENABLE_QEXT) */
 }
 
 void testexp2log2(void)
@@ -470,7 +466,6 @@ void testsqrt32(void)
 
 void testatan_norm(void)
 {
-#if defined(ENABLE_QEXT)
    float error = -1;
    float max_error = -2;
    float error_threshold = 5.97e-08;
@@ -497,12 +492,10 @@ void testatan_norm(void)
       }
    }
    fprintf(stdout, "celt_atan_norm max_error: %.7e\n", max_error);
-#endif /* defined(ENABLE_QEXT) */
 }
 
 void testatan2p_norm(void)
 {
-#if defined(ENABLE_QEXT)
    float error = -1;
    float max_error = -2;
    float error_threshold = 1.2e-07;
@@ -539,7 +532,6 @@ void testatan2p_norm(void)
       }
    }
    fprintf(stdout, "celt_atan2p_norm max_error: %.7e\n", max_error);
-#endif /* defined(ENABLE_QEXT) */
 }
 
 void testatan(void)
diff --git a/celt/tests/test_unit_mdct.c b/celt/tests/test_unit_mdct.c
index 00b3840de..d075d4452 100644
--- a/celt/tests/test_unit_mdct.c
+++ b/celt/tests/test_unit_mdct.c
@@ -140,11 +140,7 @@ void test1d(int nfft,int isinverse,int arch)
     }
 
     for (k=0;k<nfft/2;++k) {
-#ifdef ENABLE_QEXT
        window[k] = Q31ONE;
-#else
-       window[k] = Q15ONE;
-#endif
     }
     for (k=0;k<nfft;++k) {
        in[k] *= 32768;
diff --git a/celt/vq.c b/celt/vq.c
index 759c24379..75051b560 100644
--- a/celt/vq.c
+++ b/celt/vq.c
@@ -163,7 +163,7 @@ static void normalise_residual(int * OPUS_RESTRICT iy, celt_norm * OPUS_RESTRICT
    g = MULT32_32_Q31(celt_rsqrt_norm32(t),gain);
    i=0;
    (void)shift;
-#if defined(FIXED_POINT) && defined(ENABLE_QEXT)
+#if defined(FIXED_POINT)
    if (shift>0) {
       int tot_shift = NORM_SHIFT+1-k-shift;
       if (tot_shift >= 0) {
@@ -375,7 +375,6 @@ opus_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch)
       RESTORE_STACK;
    RESTORE_STACK;
    RESTORE_STACK;
-
 unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
       opus_val32 gain, int resynth, int arch)
 {
@@ -489,8 +488,6 @@ opus_int32 stereo_itheta(const celt_norm *X, const celt_norm *Y, int stereo, int
    return itheta;
 }
 
-#ifdef ENABLE_QEXT
-
 static void cubic_synthesis(celt_norm *X, int *iy, int N, int K, int face, int sign, opus_val32 gain) {
    int i;
    opus_val32 sum=0;
@@ -601,4 +598,3 @@ unsigned cubic_unquant(celt_norm *X, int N, int res, int B, ec_dec *dec, opus_va
    RESTORE_STACK;
    return (1<<B)-1;
 }
-#endif
diff --git a/configure.ac b/configure.ac
index 3d7e816b8..e8c05e122 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,14 +147,6 @@ AS_IF([test "$enable_float_api" = "no"],[
   AC_DEFINE([DISABLE_FLOAT_API], [1], [Do not build the float API])
 ])
 
-AC_ARG_ENABLE([fixed-res24],
-	      [AS_HELP_STRING([--disable-fixed-res24], [use 16-bit (instead of 24-bit) internal resolution for fixed-point implementation])],,
-    [enable_fixed_res24=yes])
-
-AS_IF([test "$enable_fixed_res24" = "yes"],[
-  AC_DEFINE([ENABLE_RES24], [1], [24-bit internal resolution for fixed-point])
-])
-
 AC_ARG_ENABLE([qext],
 	      [AS_HELP_STRING([--enable-qext], [enable scalable quality extension])],,
     [enable_qext=no])
diff --git a/include/opus_defines.h b/include/opus_defines.h
index 28ae954ba..4f70ccaa9 100644
--- a/include/opus_defines.h
+++ b/include/opus_defines.h
@@ -658,6 +658,7 @@ extern "C" {
   * @hideinitializer */
 #define OPUS_SET_DNN_BLOB(data, len) OPUS_SET_DNN_BLOB_REQUEST, opus_check_void_ptr(data), opus_check_int(len)
 
+
 /**@}*/
 
 /** @defgroup opus_genericctls Generic CTLs
diff --git a/src/mapping_matrix.c b/src/mapping_matrix.c
index 6a68100f7..1b67da3ab 100644
--- a/src/mapping_matrix.c
+++ b/src/mapping_matrix.c
@@ -178,11 +178,7 @@ void mapping_matrix_multiply_channel_in_short(
 #endif
     }
 #if defined(FIXED_POINT)
-#ifdef ENABLE_RES24
     output[output_rows * i] = SHL32(tmp, RES_SHIFT-7);
-#else
-    output[output_rows * i] = SATURATE16((tmp + 64) >> 7);
-#endif
 #else
     output[output_rows * i] = (1/(32768.f*32768.f))*tmp;
 #endif
diff --git a/src/opus_decoder.c b/src/opus_decoder.c
index 8dc86cea7..2c9cce97d 100644
--- a/src/opus_decoder.c
+++ b/src/opus_decoder.c
@@ -216,7 +216,6 @@ OpusDecoder *opus_decoder_create(opus_int32 Fs, int channels, int *error)
    return st;
 }
 
-#ifdef ENABLE_RES24
 static void smooth_fade(const opus_res *in1, const opus_res *in2,
       opus_res *out, int overlap, int channels,
       const celt_coef *window, opus_int32 Fs)
@@ -233,25 +232,6 @@ static void smooth_fade(const opus_res *in1, const opus_res *in2,
       }
    }
 }
-#else
-static void smooth_fade(const opus_res *in1, const opus_res *in2,
-      opus_res *out, int overlap, int channels,
-      const celt_coef *window, opus_int32 Fs)
-{
-   int i, c;
-   int inc = 48000/Fs;
-   for (c=0;c<channels;c++)
-   {
-      for (i=0;i<overlap;i++)
-      {
-         opus_val16 w = COEF2VAL16(window[i*inc]);
-         w = MULT16_16_Q15(w, w);
-         out[i*channels+c] = SHR32(MAC16_16(MULT16_16(w,in2[i*channels+c]),
-                                   Q15ONE-w, in1[i*channels+c]), 15);
-      }
-   }
-}
-#endif
 
 static int opus_packet_get_mode(const unsigned char *data)
 {
@@ -685,11 +665,7 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
       for (i=0;i<frame_size*st->channels;i++)
       {
          opus_val32 x;
-#ifdef ENABLE_RES24
          x = MULT32_32_Q16(pcm[i],gain);
-#else
-         x = MULT16_32_P16(pcm[i],gain);
-#endif
          pcm[i] = SATURATE(x, 32767);
       }
    }
@@ -869,15 +845,6 @@ int opus_decode_native(OpusDecoder *st, const unsigned char *data,
 #define OPTIONAL_CLIP 1
 #endif
 
-#if defined(FIXED_POINT) && !defined(ENABLE_RES24)
-int opus_decode(OpusDecoder *st, const unsigned char *data,
-      opus_int32 len, opus_int16 *pcm, int frame_size, int decode_fec)
-{
-   if(frame_size<=0)
-      return OPUS_BAD_ARG;
-   return opus_decode_native(st, data, len, pcm, frame_size, decode_fec, 0, NULL, 0, NULL, 0);
-}
-#else
 int opus_decode(OpusDecoder *st, const unsigned char *data,
       opus_int32 len, opus_int16 *pcm, int frame_size, int decode_fec)
 {
@@ -916,9 +883,8 @@ int opus_decode(OpusDecoder *st, const unsigned char *data,
        RESTORE_STACK;
        return ret;
 }
-#endif
 
-#if defined(FIXED_POINT) && defined(ENABLE_RES24)
+#if defined(FIXED_POINT)
 int opus_decode24(OpusDecoder *st, const unsigned char *data,
       opus_int32 len, opus_int32 *pcm, int frame_size, int decode_fec)
 {
diff --git a/src/opus_encoder.c b/src/opus_encoder.c
index 0b8c22ee0..95f392378 100644
--- a/src/opus_encoder.c
+++ b/src/opus_encoder.c
@@ -104,9 +104,6 @@ struct OpusEncoder {
 #ifndef DISABLE_FLOAT_API
     TonalityAnalysisState analysis;
 #endif
-#ifdef ENABLE_QEXT
-   int enable_qext;
-#endif
 
 #define OPUS_ENCODER_RESET_START stream_channels
     int          stream_channels;
@@ -461,18 +458,10 @@ static void hp_cutoff(const opus_res *in, opus_int32 cutoff_Hz, opus_res *out, o
    A_Q28[ 0 ] = silk_SMULWW( r_Q22, silk_SMULWW( Fc_Q19, Fc_Q19 ) - SILK_FIX_CONST( 2.0,  22 ) );
    A_Q28[ 1 ] = silk_SMULWW( r_Q22, r_Q22 );
 
-#if defined(FIXED_POINT) && !defined(ENABLE_RES24)
-   if( channels == 1 ) {
-      silk_biquad_alt_stride1( in, B_Q28, A_Q28, hp_mem, out, len );
-   } else {
-      silk_biquad_alt_stride2( in, B_Q28, A_Q28, hp_mem, out, len, arch );
-   }
-#else
    silk_biquad_res( in, B_Q28, A_Q28, hp_mem, out, len, channels );
    if( channels == 2 ) {
        silk_biquad_res( in+1, B_Q28, A_Q28, hp_mem+2, out+1, len, channels );
    }
-#endif
 }
 
 #ifdef FIXED_POINT
@@ -493,12 +482,8 @@ static void dc_reject(const opus_res *in, opus_int32 cutoff_Hz, opus_res *out, o
          x = SHL32(x, 14-RES_SHIFT);
          y = x-hp_mem[2*c];
          hp_mem[2*c] = hp_mem[2*c] + PSHR32(x - hp_mem[2*c], shift);
-#ifdef ENABLE_RES24
          /* Don't saturate if we have the headroom to avoid it. */
          out[channels*i+c] = PSHR32(y, 14-RES_SHIFT);
-#else
-         out[channels*i+c] = SATURATE(PSHR32(y, 14-RES_SHIFT), 32767);
-#endif
       }
    }
 }
@@ -1734,13 +1719,6 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
         * 2 frames: Code 2 with different compressed sizes
         * >2 frames: Code 3 VBR */
        max_header_bytes = nb_frames == 2 ? 3 : (2+(nb_frames-1)*2);
-#ifdef ENABLE_QEXT
-       /* Cover the use of the separators that are the only thing that can get us over
-          once we consider that we need to subtract the extension overhead in each
-          of the individual frames. Also consider that a separator can get our padding
-          from 254 to 255, which costs an extra length byte (at most once). */
-       if (st->enable_qext) max_header_bytes += (nb_frames-1) + 1;
-#endif
 
        if (st->use_vbr || st->user_bitrate_bps==OPUS_BITRATE_MAX)
           repacketize_len = out_data_bytes;
@@ -1991,11 +1969,6 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
        }
 #endif
     } else {
-#ifdef ENABLE_QEXT
-       /* FIXME: Avoid glitching when we switch qext on/off dynamically. */
-       if (st->enable_qext) OPUS_COPY(&pcm_buf[total_buffer*st->channels], pcm, frame_size*st->channels);
-       else
-#endif
        dc_reject(pcm, 3, &pcm_buf[total_buffer*st->channels], st->hp_mem, frame_size, st->channels, st->Fs);
     }
 #ifndef FIXED_POINT
@@ -2381,12 +2354,6 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
         nb_compr_bytes = ret;
     } else {
         nb_compr_bytes = (max_data_bytes-1)-redundancy_bytes;
-#ifdef ENABLE_QEXT
-        if (st->mode == MODE_CELT_ONLY && st->enable_qext) {
-           celt_assert(redundancy_bytes==0);
-           nb_compr_bytes = orig_max_data_bytes-1;
-        }
-#endif
 #ifdef ENABLE_DRED
         if (st->dred_duration > 0)
         {
@@ -2643,16 +2610,6 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
 
 
 
-#if defined(FIXED_POINT) && !defined(ENABLE_RES24)
-opus_int32 opus_encode(OpusEncoder *st, const opus_int16 *pcm, int analysis_frame_size,
-                unsigned char *data, opus_int32 max_data_bytes)
-{
-   int frame_size;
-   frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
-   return opus_encode_native(st, pcm, frame_size, data, max_data_bytes, 16,
-                             pcm, analysis_frame_size, 0, -2, st->channels, downmix_int, 0);
-}
-#else
 opus_int32 opus_encode(OpusEncoder *st, const opus_int16 *pcm, int analysis_frame_size,
                 unsigned char *data, opus_int32 max_data_bytes)
 {
@@ -2676,9 +2633,8 @@ opus_int32 opus_encode(OpusEncoder *st, const opus_int16 *pcm, int analysis_fram
    RESTORE_STACK;
    return ret;
 }
-#endif
 
-#if defined(FIXED_POINT) && defined(ENABLE_RES24)
+#if defined(FIXED_POINT)
 opus_int32 opus_encode24(OpusEncoder *st, const opus_int32 *pcm, int analysis_frame_size,
                 unsigned char *data, opus_int32 max_data_bytes)
 {
diff --git a/tests/test_opus_custom.c b/tests/test_opus_custom.c
index bcf7302ca..6331dab6c 100644
--- a/tests/test_opus_custom.c
+++ b/tests/test_opus_custom.c
@@ -412,11 +412,7 @@ int test_encode(TestCustomParams params) {
 #ifdef RESYNTH
    /* Resynth only works with OpusCustom encoder. Also, we don't enable it if there's
       a 16-bit bottleneck in the decoder that can cause clipping. */
-   if (params.custom_encode && (params.custom_decode
-#if !defined(FIXED_POINT) || defined(ENABLE_RES24)
-         || params.decoder_bit_depth > 16
-#endif
-         )) {
+   if (params.custom_encode && (params.custom_decode || params.decoder_bit_depth > 16)) {
       if (params.float_encode) {
          float* input = (float*)inbuf;
          float* output = (float*)outbuf;

From fd0c105f093d7b3cb5f1ce297ec2ef26fb165573 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jeanmarcv@google.com>
Date: Thu, 15 Jan 2026 11:10:48 -0500
Subject: [PATCH 03/28] Rename identifiers from opus to oac

---
 .github/workflows/cmake.yml                   |   14 +-
 .github/workflows/dred.yml                    |    8 +-
 .gitignore                                    |   16 +-
 .gitlab-ci.yml                                |  134 -
 CMakeLists.txt                                |  768 +-
 LICENSE_PLEASE_READ.txt                       |   22 -
 Makefile.am                                   |  180 +-
 Makefile.unix                                 |   70 +-
 README.draft                                  |   54 -
 celt/_kiss_fft_guts.h                         |    4 +-
 celt/arch.h                                   |   82 +-
 celt/arm/arm_celt_map.c                       |  120 +-
 celt/arm/armcpu.c                             |  166 +-
 celt/arm/armcpu.h                             |   30 +-
 celt/arm/armopts.s.in                         |    6 +-
 celt/arm/celt_fft_ne10.c                      |   16 +-
 celt/arm/celt_mdct_ne10.c                     |   46 +-
 celt/arm/celt_neon_intr.c                     |   16 +-
 celt/arm/celt_pitch_xcorr_arm.s               |   60 +-
 celt/arm/fft_arm.h                            |   30 +-
 celt/arm/fixed_armv4.h                        |    6 +-
 celt/arm/fixed_armv5e.h                       |   24 +-
 celt/arm/mathops_arm.h                        |   32 +-
 celt/arm/mdct_arm.h                           |   14 +-
 celt/arm/meson.build                          |    2 +-
 celt/arm/pitch_arm.h                          |  106 +-
 celt/arm/pitch_neon_intr.c                    |   44 +-
 celt/bands.c                                  |  222 +-
 celt/bands.h                                  |   22 +-
 celt/celt.c                                   |   52 +-
 celt/celt.h                                   |   92 +-
 celt/celt_decoder.c                           |  334 +-
 celt/celt_encoder.c                           |  572 +-
 celt/celt_lpc.c                               |   94 +-
 celt/celt_lpc.h                               |   20 +-
 celt/cpu_support.h                            |   28 +-
 celt/cwrs.c                                   |   82 +-
 celt/cwrs.h                                   |    6 +-
 celt/dump_modes/Makefile                      |    2 +-
 celt/dump_modes/dump_modes.c                  |   18 +-
 celt/ecintrin.h                               |    6 +-
 celt/entcode.c                                |   20 +-
 celt/entcode.h                                |   42 +-
 celt/entdec.c                                 |   40 +-
 celt/entdec.h                                 |    8 +-
 celt/entenc.c                                 |   40 +-
 celt/entenc.h                                 |   10 +-
 celt/fixed_c5x.h                              |    2 +-
 celt/fixed_debug.h                            |  166 +-
 celt/fixed_generic.h                          |   78 +-
 celt/float_cast.h                             |   20 +-
 celt/kiss_fft.c                               |   52 +-
 celt/kiss_fft.h                               |   86 +-
 celt/laplace.c                                |   22 +-
 celt/laplace.h                                |    4 +-
 celt/mathops.c                                |   80 +-
 celt/mathops.h                                |  178 +-
 celt/mdct.c                                   |   64 +-
 celt/mdct.h                                   |   32 +-
 celt/meson.build                              |   14 +-
 celt/mfrngcod.h                               |    2 +-
 celt/mips/celt_mipsr1.h                       |   30 +-
 celt/mips/fixed_generic_mipsr1.h              |   24 +-
 celt/mips/mdct_mipsr1.h                       |   54 +-
 celt/mips/pitch_mipsr1.h                      |   34 +-
 celt/modes.c                                  |   88 +-
 celt/modes.h                                  |   14 +-
 .../{opus_custom_demo.c => oac_custom_demo.c} |  108 +-
 celt/os_support.h                             |   38 +-
 celt/pitch.c                                  |  118 +-
 celt/pitch.h                                  |   54 +-
 celt/quant_bands.c                            |   94 +-
 celt/quant_bands.h                            |    6 +-
 celt/rate.c                                   |   50 +-
 celt/rate.h                                   |    8 +-
 celt/stack_alloc.h                            |   32 +-
 celt/static_modes_fixed.h                     |   24 +-
 celt/static_modes_float.h                     |   24 +-
 celt/tests/meson.build                        |    2 +-
 celt/tests/test_unit_cwrs32.c                 |   14 +-
 celt/tests/test_unit_dft.c                    |   12 +-
 celt/tests/test_unit_laplace.c                |    2 +-
 celt/tests/test_unit_mathops.c                |   78 +-
 celt/tests/test_unit_mdct.c                   |    4 +-
 celt/tests/test_unit_types.c                  |    8 +-
 celt/vq.c                                     |   88 +-
 celt/vq.h                                     |   20 +-
 celt/x86/celt_lpc_sse.h                       |   22 +-
 celt/x86/celt_lpc_sse4_1.c                    |   22 +-
 celt/x86/pitch_avx.c                          |    2 +-
 celt/x86/pitch_sse.c                          |   16 +-
 celt/x86/pitch_sse.h                          |  140 +-
 celt/x86/pitch_sse2.c                         |    8 +-
 celt/x86/pitch_sse4_1.c                       |   16 +-
 celt/x86/vq_sse.h                             |   12 +-
 celt/x86/vq_sse2.c                            |    8 +-
 celt/x86/x86_arch_macros.h                    |    6 +-
 celt/x86/x86_celt_map.c                       |   78 +-
 celt/x86/x86cpu.c                             |   20 +-
 celt/x86/x86cpu.h                             |   28 +-
 celt_headers.mk                               |    6 +-
 ...OpusBuildtype.cmake => OacBuildtype.cmake} |    4 +-
 cmake/{OpusConfig.cmake => OacConfig.cmake}   |   36 +-
 cmake/OacConfig.cmake.in                      |   20 +
 ...OpusFunctions.cmake => OacFunctions.cmake} |   68 +-
 cmake/OacPackageVersion.cmake                 |   70 +
 cmake/OacSources.cmake                        |   72 +
 cmake/OpusConfig.cmake.in                     |   20 -
 cmake/OpusPackageVersion.cmake                |   70 -
 cmake/OpusSources.cmake                       |   72 -
 cmake/README.md                               |   42 +-
 configure.ac                                  |  318 +-
 dnn/arm/arm_dnn_map.c                         |   12 +-
 dnn/arm/dnn_arm.h                             |   24 +-
 dnn/bwe_demo.c                                |    2 +-
 dnn/common.h                                  |    8 +-
 dnn/dred_coding.h                             |    2 +-
 dnn/dred_compare.c                            |   24 +-
 dnn/dred_decoder.c                            |    4 +-
 dnn/dred_decoder.h                            |    6 +-
 dnn/dred_encoder.c                            |   28 +-
 dnn/dred_encoder.h                            |    4 +-
 dnn/dred_rdovae.h                             |    2 +-
 dnn/dred_rdovae_dec.c                         |   12 +-
 dnn/dred_rdovae_enc.c                         |   16 +-
 dnn/dump_data.c                               |   18 +-
 dnn/dump_lpcnet_tables.c                      |    4 +-
 dnn/fargan.c                                  |   40 +-
 dnn/fargan.h                                  |    2 +-
 dnn/fargan_demo.c                             |   20 +-
 dnn/freq.c                                    |   30 +-
 dnn/fwgan.c                                   |   28 +-
 dnn/fwgan.h                                   |    2 +-
 dnn/lossgen.c                                 |   10 +-
 dnn/lpcnet.c                                  |   46 +-
 dnn/lpcnet.h                                  |   22 +-
 dnn/lpcnet_enc.c                              |   30 +-
 dnn/lpcnet_plc.c                              |   28 +-
 dnn/lpcnet_private.h                          |    6 +-
 dnn/lpcnet_tables.c                           |    2 +-
 dnn/meson.build                               |   10 +-
 dnn/nndsp.c                                   |   58 +-
 dnn/nndsp.h                                   |    2 +-
 dnn/nnet.c                                    |   20 +-
 dnn/nnet.h                                    |   10 +-
 dnn/nnet_arch.h                               |   20 +-
 dnn/osce.c                                    |   90 +-
 dnn/osce.h                                    |   12 +-
 dnn/osce_features.c                           |   30 +-
 dnn/osce_features.h                           |   10 +-
 dnn/osce_structs.h                            |    4 +-
 dnn/parse_lpcnet_weights.c                    |   12 +-
 dnn/pitchdnn.c                                |    6 +-
 dnn/test_vec.c                                |    2 +-
 dnn/torch/lossgen/export_lossgen.py           |    2 +-
 .../export_neuralpitch_weights.py             |    2 +-
 dnn/torch/osce/data/silk_conversion_set.py    |    2 +-
 dnn/torch/osce/data/silk_enhancement_set.py   |    2 +-
 dnn/torch/osce/stndrd/evaluation/evaluate.py  |   14 +-
 .../osce/stndrd/evaluation/highband_eval.py   |    6 +-
 .../osce/stndrd/evaluation/make_boxplots.py   |    4 +-
 .../evaluation/make_boxplots_moctest.py       |    4 +-
 .../osce/stndrd/evaluation/make_tables.py     |   14 +-
 .../stndrd/evaluation/make_tables_moctest.py  |   14 +-
 dnn/torch/osce/stndrd/evaluation/moc.py       |    2 +-
 dnn/torch/osce/stndrd/evaluation/moc2.py      |    2 +-
 dnn/torch/osce/stndrd/evaluation/run_nomad.py |   10 +-
 .../osce/stndrd/evaluation/run_osce_test.py   |   32 +-
 dnn/torch/osce/utils/moc.py                   |    2 +-
 dnn/torch/osce/utils/silk_features.py         |    4 +-
 dnn/torch/osce/utils/spec.py                  |    4 +-
 dnn/torch/osce/utils/templates.py             |    6 +-
 dnn/torch/plc/export_plc.py                   |    2 +-
 dnn/torch/rdovae/export_rdovae_weights.py     |   20 +-
 dnn/torch/rdovae/fec_encoder.py               |    2 +-
 .../wexchange/c_export/common.py              |   12 +-
 dnn/training_tf2/dataloader.py                |   49 -
 dnn/training_tf2/decode_rdovae.py             |  111 -
 dnn/training_tf2/diffembed.py                 |   49 -
 dnn/training_tf2/dump_lpcnet.py               |  388 -
 dnn/training_tf2/dump_plc.py                  |  296 -
 dnn/training_tf2/dump_rdovae.py               |  306 -
 dnn/training_tf2/encode_rdovae.py             |  125 -
 dnn/training_tf2/fec_encoder.py               |  256 -
 dnn/training_tf2/fec_packets.c                |  142 -
 dnn/training_tf2/fec_packets.h                |   34 -
 dnn/training_tf2/fec_packets.py               |  108 -
 dnn/training_tf2/keraslayerdump.py            |  189 -
 dnn/training_tf2/lossfuncs.py                 |   99 -
 dnn/training_tf2/lpcnet.py                    |  339 -
 dnn/training_tf2/lpcnet_plc.py                |  101 -
 dnn/training_tf2/mdense.py                    |   95 -
 dnn/training_tf2/pade.py                      |   70 -
 dnn/training_tf2/parameters.py                |   29 -
 dnn/training_tf2/plc_loader.py                |   73 -
 dnn/training_tf2/rdovae.py                    |  372 -
 dnn/training_tf2/rdovae_exchange.py           |  138 -
 dnn/training_tf2/rdovae_import.py             |  123 -
 dnn/training_tf2/test_lpcnet.py               |  120 -
 dnn/training_tf2/test_plc.py                  |   92 -
 dnn/training_tf2/tf_funcs.py                  |   70 -
 dnn/training_tf2/train_lpcnet.py              |  214 -
 dnn/training_tf2/train_plc.py                 |  197 -
 dnn/training_tf2/train_rdovae.py              |  151 -
 dnn/training_tf2/ulaw.py                      |   19 -
 dnn/training_tf2/uniform_noise.py             |   78 -
 dnn/vec.h                                     |   24 +-
 dnn/vec_avx.h                                 |   32 +-
 dnn/vec_neon.h                                |   20 +-
 dnn/write_lpcnet_weights.c                    |    2 +-
 dnn/x86/dnn_x86.h                             |   28 +-
 dnn/x86/x86_dnn_map.c                         |   10 +-
 doc/Doxyfile.in                               |   26 +-
 doc/Makefile.am                               |   16 +-
 doc/build_draft.sh                            |  113 -
 doc/build_isobmff.sh                          |   50 -
 doc/build_oggdraft.sh                         |   52 -
 doc/draft-ietf-codec-oggopus.xml              | 1873 ----
 doc/draft-ietf-codec-opus-update.xml          |  513 -
 doc/draft-ietf-codec-opus.xml                 | 8276 -----------------
 doc/draft-ietf-payload-rtp-opus.xml           |  960 --
 doc/meson.build                               |   14 +-
 doc/opus_in_isobmff.css                       |   60 -
 doc/opus_in_isobmff.html                      |  692 --
 doc/opus_logo.svg                             |  157 -
 doc/opus_update.patch                         |  244 -
 doc/release.txt                               |   43 -
 doc/trivial_example.c                         |   42 +-
 include/meson.build                           |   16 +-
 include/{opus.h => oac.h}                     |  852 +-
 include/{opus_custom.h => oac_custom.h}       |  238 +-
 include/oac_defines.h                         |  860 ++
 .../{opus_multistream.h => oac_multistream.h} |  390 +-
 .../{opus_projection.h => oac_projection.h}   |  356 +-
 include/oac_types.h                           |  166 +
 include/opus_defines.h                        |  860 --
 include/opus_types.h                          |  166 -
 m4/{opus-intrinsics.m4 => oac-intrinsics.m4}  |    6 +-
 meson.build                                   |  232 +-
 meson/README.md                               |   28 +-
 meson/get-version.py                          |   36 +-
 meson/read-sources-list.py                    |    2 +-
 meson_options.txt                             |    6 +-
 oac-uninstalled.pc.in                         |   12 +
 oac.m4                                        |  117 +
 oac.pc.in                                     |   16 +
 oac_headers.mk                                |    8 +
 oac_sources.mk                                |   17 +
 opus-uninstalled.pc.in                        |   12 -
 opus.m4                                       |  117 -
 opus.pc.in                                    |   16 -
 opus_headers.mk                               |    8 -
 opus_sources.mk                               |   17 -
 releases.sha2                                 |   86 -
 scripts/dump_rnn.py                           |   57 -
 scripts/local_build.py                        |    4 +-
 scripts/rnn_train.py                          |   67 -
 silk/A2NLSF.c                                 |   62 +-
 silk/API.h                                    |   54 +-
 silk/CNG.c                                    |   46 +-
 silk/HP_variable_cutoff.c                     |    4 +-
 silk/Inlines.h                                |   50 +-
 silk/LPC_analysis_filter.c                    |   24 +-
 silk/LPC_fit.c                                |   20 +-
 silk/LPC_inv_pred_gain.c                      |   34 +-
 silk/LP_variable_cutoff.c                     |   32 +-
 silk/MacroCount.h                             |  320 +-
 silk/MacroDebug.h                             |  310 +-
 silk/NLSF2A.c                                 |   36 +-
 silk/NLSF_VQ.c                                |   24 +-
 silk/NLSF_VQ_weights_laroia.c                 |   28 +-
 silk/NLSF_decode.c                            |   40 +-
 silk/NLSF_del_dec_quant.c                     |   54 +-
 silk/NLSF_encode.c                            |   58 +-
 silk/NLSF_stabilize.c                         |   16 +-
 silk/NLSF_unpack.c                            |   12 +-
 silk/NSQ.c                                    |  196 +-
 silk/NSQ.h                                    |   14 +-
 silk/NSQ_del_dec.c                            |  288 +-
 silk/PLC.c                                    |  120 +-
 silk/PLC.h                                    |    8 +-
 silk/SigProc_FIX.h                            |  388 +-
 silk/VAD.c                                    |   60 +-
 silk/VQ_WMat_EC.c                             |   38 +-
 silk/ana_filt_bank_1.c                        |   26 +-
 silk/arm/LPC_inv_pred_gain_arm.h              |   18 +-
 silk/arm/LPC_inv_pred_gain_neon_intr.c        |   64 +-
 silk/arm/NSQ_del_dec_arm.h                    |   54 +-
 silk/arm/NSQ_del_dec_neon_intr.c              |  380 +-
 silk/arm/NSQ_neon.c                           |    8 +-
 silk/arm/NSQ_neon.h                           |   28 +-
 silk/arm/SigProc_FIX_armv4.h                  |    6 +-
 silk/arm/SigProc_FIX_armv5e.h                 |   10 +-
 silk/arm/arm_silk_map.c                       |   78 +-
 silk/arm/biquad_alt_arm.h                     |   36 +-
 silk/arm/biquad_alt_neon_intr.c               |   38 +-
 silk/arm/macros_armv4.h                       |   16 +-
 silk/arm/macros_armv5e.h                      |   46 +-
 silk/biquad_alt.c                             |   38 +-
 silk/bwexpander.c                             |   14 +-
 silk/bwexpander_32.c                          |   10 +-
 silk/check_control_input.c                    |    2 +-
 silk/code_signs.c                             |   36 +-
 silk/control.h                                |   78 +-
 silk/control_SNR.c                            |    4 +-
 silk/control_audio_bandwidth.c                |   14 +-
 silk/control_codec.c                          |   70 +-
 silk/debug.c                                  |    8 +-
 silk/debug.h                                  |   14 +-
 silk/dec_API.c                                |   88 +-
 silk/decode_core.c                            |   50 +-
 silk/decode_frame.c                           |   26 +-
 silk/decode_indices.c                         |   50 +-
 silk/decode_parameters.c                      |   16 +-
 silk/decode_pitch.c                           |   14 +-
 silk/decode_pulses.c                          |   16 +-
 silk/decoder_set_fs.c                         |    8 +-
 silk/enc_API.c                                |   68 +-
 silk/encode_indices.c                         |   16 +-
 silk/encode_pulses.c                          |   60 +-
 silk/fixed/LTP_analysis_filter_FIX.c          |   28 +-
 silk/fixed/LTP_scale_ctrl_FIX.c               |    4 +-
 silk/fixed/apply_sine_window_FIX.c            |   34 +-
 .../arm/warped_autocorrelation_FIX_arm.h      |   24 +-
 .../warped_autocorrelation_FIX_neon_intr.c    |   62 +-
 silk/fixed/autocorr_FIX.c                     |   12 +-
 silk/fixed/burg_modified_FIX.c                |   78 +-
 silk/fixed/corrMatrix_FIX.c                   |   36 +-
 silk/fixed/encode_frame_FIX.c                 |   74 +-
 silk/fixed/find_LPC_FIX.c                     |   30 +-
 silk/fixed/find_LTP_FIX.c                     |   26 +-
 silk/fixed/find_pitch_lags_FIX.c              |   30 +-
 silk/fixed/find_pred_coefs_FIX.c              |   36 +-
 silk/fixed/k2a_FIX.c                          |   12 +-
 silk/fixed/k2a_Q16_FIX.c                      |   10 +-
 silk/fixed/main_FIX.h                         |  144 +-
 .../mips/warped_autocorrelation_FIX_mipsr1.h  |   38 +-
 silk/fixed/noise_shape_analysis_FIX.c         |   80 +-
 silk/fixed/pitch_analysis_core_FIX.c          |  204 +-
 silk/fixed/process_gains_FIX.c                |    8 +-
 silk/fixed/regularize_correlations_FIX.c      |   10 +-
 silk/fixed/residual_energy16_FIX.c            |   26 +-
 silk/fixed/residual_energy_FIX.c              |   28 +-
 silk/fixed/schur64_FIX.c                      |   16 +-
 silk/fixed/schur_FIX.c                        |   16 +-
 silk/fixed/structs_FIX.h                      |   66 +-
 silk/fixed/vector_ops_FIX.c                   |   48 +-
 silk/fixed/warped_autocorrelation_FIX.c       |   26 +-
 silk/fixed/x86/burg_modified_FIX_sse4_1.c     |   86 +-
 silk/fixed/x86/vector_ops_FIX_sse4_1.c        |   16 +-
 silk/float/LPC_analysis_filter_FLP.c          |   34 +-
 silk/float/LPC_inv_pred_gain_FLP.c            |    4 +-
 silk/float/LTP_analysis_filter_FLP.c          |   10 +-
 silk/float/LTP_scale_ctrl_FLP.c               |    4 +-
 silk/float/SigProc_FLP.h                      |   74 +-
 silk/float/apply_sine_window_FLP.c            |    6 +-
 silk/float/autocorrelation_FLP.c              |    6 +-
 silk/float/burg_modified_FLP.c                |    8 +-
 silk/float/bwexpander_FLP.c                   |    4 +-
 silk/float/corrMatrix_FLP.c                   |   12 +-
 silk/float/encode_frame_FLP.c                 |   58 +-
 silk/float/energy_FLP.c                       |    4 +-
 silk/float/find_LPC_FLP.c                     |    8 +-
 silk/float/find_LTP_FLP.c                     |    8 +-
 silk/float/find_pitch_lags_FLP.c              |    2 +-
 silk/float/find_pred_coefs_FLP.c              |    6 +-
 silk/float/inner_product_FLP.c                |    4 +-
 silk/float/k2a_FLP.c                          |    4 +-
 silk/float/main_FLP.h                         |   96 +-
 silk/float/noise_shape_analysis_FLP.c         |   22 +-
 silk/float/pitch_analysis_core_FLP.c          |  124 +-
 silk/float/process_gains_FLP.c                |   10 +-
 silk/float/regularize_correlations_FLP.c      |    4 +-
 silk/float/residual_energy_FLP.c              |   12 +-
 silk/float/scale_copy_vector_FLP.c            |    4 +-
 silk/float/scale_vector_FLP.c                 |    4 +-
 silk/float/schur_FLP.c                        |    4 +-
 silk/float/sort_FLP.c                         |    8 +-
 silk/float/structs_FLP.h                      |   24 +-
 silk/float/warped_autocorrelation_FLP.c       |    6 +-
 silk/float/wrappers_FLP.c                     |   82 +-
 silk/float/x86/inner_product_FLP_avx2.c       |    4 +-
 silk/gain_quant.c                             |   34 +-
 silk/init_decoder.c                           |    6 +-
 silk/init_encoder.c                           |    4 +-
 silk/inner_prod_aligned.c                     |   14 +-
 silk/interpolate.c                            |   14 +-
 silk/lin2log.c                                |    6 +-
 silk/log2lin.c                                |    6 +-
 silk/macros.h                                 |   72 +-
 silk/main.h                                   |  352 +-
 silk/meson.build                              |   10 +-
 silk/mips/NSQ_mips.h                          |   16 +-
 silk/mips/macros_mipsr1.h                     |   12 +-
 silk/pitch_est_defines.h                      |   14 +-
 silk/pitch_est_tables.c                       |   14 +-
 silk/process_NLSFs.c                          |   20 +-
 silk/quant_LTP_gains.c                        |   44 +-
 silk/resampler.c                              |   32 +-
 silk/resampler_down2.c                        |   18 +-
 silk/resampler_down2_3.c                      |   26 +-
 silk/resampler_private.h                      |   36 +-
 silk/resampler_private_AR2.c                  |   16 +-
 silk/resampler_private_IIR_FIR.c              |   38 +-
 silk/resampler_private_down_FIR.c             |   52 +-
 silk/resampler_private_up2_HQ.c               |   24 +-
 silk/resampler_rom.c                          |   18 +-
 silk/resampler_rom.h                          |   24 +-
 silk/resampler_structs.h                      |   26 +-
 silk/shell_coder.c                            |   38 +-
 silk/sigm_Q15.c                               |   12 +-
 silk/sort.c                                   |   32 +-
 silk/stereo_LR_to_MS.c                        |   90 +-
 silk/stereo_MS_to_LR.c                        |   48 +-
 silk/stereo_decode_pred.c                     |    8 +-
 silk/stereo_encode_pred.c                     |    6 +-
 silk/stereo_find_predictor.c                  |   20 +-
 silk/stereo_quant_pred.c                      |    8 +-
 silk/structs.h                                |  362 +-
 silk/sum_sqr_shift.c                          |   22 +-
 silk/table_LSF_cos.c                          |    2 +-
 silk/tables.h                                 |   90 +-
 silk/tables_LTP.c                             |   42 +-
 silk/tables_NLSF_CB_NB_MB.c                   |   16 +-
 silk/tables_NLSF_CB_WB.c                      |   16 +-
 silk/tables_gain.c                            |    4 +-
 silk/tables_other.c                           |   42 +-
 silk/tables_pitch_lag.c                       |   12 +-
 silk/tables_pulses_per_block.c                |   22 +-
 silk/tests/meson.build                        |    2 +-
 silk/tests/test_unit_LPC_inv_pred_gain.c      |   12 +-
 silk/typedef.h                                |   16 +-
 silk/x86/NSQ_del_dec_avx2.c                   |  348 +-
 silk/x86/NSQ_del_dec_sse4_1.c                 |  300 +-
 silk/x86/NSQ_sse4_1.c                         |  212 +-
 silk/x86/SigProc_FIX_sse.h                    |   66 +-
 silk/x86/VAD_sse4_1.c                         |   44 +-
 silk/x86/VQ_WMat_EC_sse4_1.c                  |   48 +-
 silk/x86/main_sse.h                           |  262 +-
 silk/x86/x86_silk_map.c                       |  114 +-
 silk/xtensa/SigProc_FIX_lx7.h                 |    4 +-
 silk/xtensa/macros_lx7.h                      |   16 +-
 src/analysis.c                                |   60 +-
 src/analysis.h                                |   12 +-
 src/extensions.c                              |  196 +-
 src/mapping_matrix.c                          |   94 +-
 src/mapping_matrix.h                          |   54 +-
 src/meson.build                               |   36 +-
 src/mlp.c                                     |   10 +-
 src/mlp.h                                     |   12 +-
 src/mlp_data.c                                |   14 +-
 src/{opus.c => oac.c}                         |   80 +-
 src/{opus_compare.c => oac_compare.c}         |   30 +-
 src/{opus_decoder.c => oac_decoder.c}         |  568 +-
 src/{opus_demo.c => oac_demo.c}               |  476 +-
 src/{opus_encoder.c => oac_encoder.c}         | 1086 +--
 src/{opus_multistream.c => oac_multistream.c} |    6 +-
 ...am_decoder.c => oac_multistream_decoder.c} |  270 +-
 ...am_encoder.c => oac_multistream_encoder.c} |  570 +-
 src/oac_private.h                             |  266 +
 ...ion_decoder.c => oac_projection_decoder.c} |  134 +-
 ...ion_encoder.c => oac_projection_encoder.c} |  174 +-
 src/opus_private.h                            |  266 -
 src/qext_compare.c                            |   24 +-
 src/repacketizer.c                            |  186 +-
 src/repacketizer_demo.c                       |   32 +-
 tests/meson.build                             |   28 +-
 .../{opus_build_test.sh => oac_build_test.sh} |    0
 ...us_decode_fuzzer.c => oac_decode_fuzzer.c} |   42 +-
 ...regressions.c => oac_encode_regressions.c} |  560 +-
 tests/random_config.sh                        |    2 +-
 tests/run_opushd_vectors.sh                   |  158 -
 tests/run_vectors.sh                          |   26 +-
 tests/test_oac_api.c                          | 1916 ++++
 .../{test_opus_common.h => test_oac_common.h} |   16 +-
 .../{test_opus_custom.c => test_oac_custom.c} |  234 +-
 .../{test_opus_decode.c => test_oac_decode.c} |  186 +-
 tests/{test_opus_dred.c => test_oac_dred.c}   |   28 +-
 .../{test_opus_encode.c => test_oac_encode.c} |  440 +-
 ...pus_extensions.c => test_oac_extensions.c} |  270 +-
 ...test_opus_padding.c => test_oac_padding.c} |   20 +-
 ...pus_projection.c => test_oac_projection.c} |  152 +-
 tests/test_opus_api.c                         | 1916 ----
 training/rnn_dump.py                          |   66 -
 training/rnn_train.py                         |  176 -
 training/txt2hdf5.py                          |   12 -
 486 files changed, 15907 insertions(+), 34205 deletions(-)
 delete mode 100644 .gitlab-ci.yml
 delete mode 100644 LICENSE_PLEASE_READ.txt
 delete mode 100644 README.draft
 rename celt/{opus_custom_demo.c => oac_custom_demo.c} (83%)
 rename cmake/{OpusBuildtype.cmake => OacBuildtype.cmake} (93%)
 rename cmake/{OpusConfig.cmake => OacConfig.cmake} (78%)
 create mode 100644 cmake/OacConfig.cmake.in
 rename cmake/{OpusFunctions.cmake => OacFunctions.cmake} (75%)
 create mode 100644 cmake/OacPackageVersion.cmake
 create mode 100644 cmake/OacSources.cmake
 delete mode 100644 cmake/OpusConfig.cmake.in
 delete mode 100644 cmake/OpusPackageVersion.cmake
 delete mode 100644 cmake/OpusSources.cmake
 delete mode 100644 dnn/training_tf2/dataloader.py
 delete mode 100644 dnn/training_tf2/decode_rdovae.py
 delete mode 100644 dnn/training_tf2/diffembed.py
 delete mode 100755 dnn/training_tf2/dump_lpcnet.py
 delete mode 100755 dnn/training_tf2/dump_plc.py
 delete mode 100644 dnn/training_tf2/dump_rdovae.py
 delete mode 100644 dnn/training_tf2/encode_rdovae.py
 delete mode 100644 dnn/training_tf2/fec_encoder.py
 delete mode 100644 dnn/training_tf2/fec_packets.c
 delete mode 100644 dnn/training_tf2/fec_packets.h
 delete mode 100644 dnn/training_tf2/fec_packets.py
 delete mode 100644 dnn/training_tf2/keraslayerdump.py
 delete mode 100644 dnn/training_tf2/lossfuncs.py
 delete mode 100644 dnn/training_tf2/lpcnet.py
 delete mode 100644 dnn/training_tf2/lpcnet_plc.py
 delete mode 100644 dnn/training_tf2/mdense.py
 delete mode 100644 dnn/training_tf2/pade.py
 delete mode 100644 dnn/training_tf2/parameters.py
 delete mode 100644 dnn/training_tf2/plc_loader.py
 delete mode 100644 dnn/training_tf2/rdovae.py
 delete mode 100644 dnn/training_tf2/rdovae_exchange.py
 delete mode 100644 dnn/training_tf2/rdovae_import.py
 delete mode 100755 dnn/training_tf2/test_lpcnet.py
 delete mode 100644 dnn/training_tf2/test_plc.py
 delete mode 100644 dnn/training_tf2/tf_funcs.py
 delete mode 100755 dnn/training_tf2/train_lpcnet.py
 delete mode 100644 dnn/training_tf2/train_plc.py
 delete mode 100644 dnn/training_tf2/train_rdovae.py
 delete mode 100644 dnn/training_tf2/ulaw.py
 delete mode 100644 dnn/training_tf2/uniform_noise.py
 delete mode 100755 doc/build_draft.sh
 delete mode 100755 doc/build_isobmff.sh
 delete mode 100755 doc/build_oggdraft.sh
 delete mode 100644 doc/draft-ietf-codec-oggopus.xml
 delete mode 100644 doc/draft-ietf-codec-opus-update.xml
 delete mode 100644 doc/draft-ietf-codec-opus.xml
 delete mode 100644 doc/draft-ietf-payload-rtp-opus.xml
 delete mode 100644 doc/opus_in_isobmff.css
 delete mode 100644 doc/opus_in_isobmff.html
 delete mode 100644 doc/opus_logo.svg
 delete mode 100644 doc/opus_update.patch
 delete mode 100644 doc/release.txt
 rename include/{opus.h => oac.h} (54%)
 rename include/{opus_custom.h => oac_custom.h} (60%)
 create mode 100644 include/oac_defines.h
 rename include/{opus_multistream.h => oac_multistream.h} (71%)
 rename include/{opus_projection.h => oac_projection.h} (69%)
 create mode 100644 include/oac_types.h
 delete mode 100644 include/opus_defines.h
 delete mode 100644 include/opus_types.h
 rename m4/{opus-intrinsics.m4 => oac-intrinsics.m4} (76%)
 create mode 100644 oac-uninstalled.pc.in
 create mode 100644 oac.m4
 create mode 100644 oac.pc.in
 create mode 100644 oac_headers.mk
 create mode 100644 oac_sources.mk
 delete mode 100644 opus-uninstalled.pc.in
 delete mode 100644 opus.m4
 delete mode 100644 opus.pc.in
 delete mode 100644 opus_headers.mk
 delete mode 100644 opus_sources.mk
 delete mode 100644 releases.sha2
 delete mode 100755 scripts/dump_rnn.py
 delete mode 100755 scripts/rnn_train.py
 rename src/{opus.c => oac.c} (83%)
 rename src/{opus_compare.c => oac_compare.c} (92%)
 rename src/{opus_decoder.c => oac_decoder.c} (70%)
 rename src/{opus_demo.c => oac_demo.c} (72%)
 rename src/{opus_encoder.c => oac_encoder.c} (73%)
 rename src/{opus_multistream.c => oac_multistream.c} (97%)
 rename src/{opus_multistream_decoder.c => oac_multistream_decoder.c} (62%)
 rename src/{opus_multistream_encoder.c => oac_multistream_encoder.c} (69%)
 create mode 100644 src/oac_private.h
 rename src/{opus_projection_decoder.c => oac_projection_decoder.c} (59%)
 rename src/{opus_projection_encoder.c => oac_projection_encoder.c} (76%)
 delete mode 100644 src/opus_private.h
 rename tests/{opus_build_test.sh => oac_build_test.sh} (100%)
 rename tests/{opus_decode_fuzzer.c => oac_decode_fuzzer.c} (74%)
 rename tests/{opus_encode_regressions.c => oac_encode_regressions.c} (77%)
 delete mode 100755 tests/run_opushd_vectors.sh
 create mode 100644 tests/test_oac_api.c
 rename tests/{test_opus_common.h => test_oac_common.h} (86%)
 rename tests/{test_opus_custom.c => test_oac_custom.c} (72%)
 rename tests/{test_opus_decode.c => test_oac_decode.c} (64%)
 rename tests/{test_opus_dred.c => test_oac_dred.c} (79%)
 rename tests/{test_opus_encode.c => test_oac_encode.c} (50%)
 rename tests/{test_opus_extensions.c => test_oac_extensions.c} (71%)
 rename tests/{test_opus_padding.c => test_oac_padding.c} (83%)
 rename tests/{test_opus_projection.c => test_oac_projection.c} (69%)
 delete mode 100644 tests/test_opus_api.c
 delete mode 100755 training/rnn_dump.py
 delete mode 100755 training/rnn_train.py
 delete mode 100755 training/txt2hdf5.py

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 17945345a..20a663d32 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -28,7 +28,7 @@ jobs:
         run: |
           which cmake
           cmake --version
-          cmake .. -DOPUS_BUILD_PROGRAMS=ON -DBUILD_TESTING=ON
+          cmake .. -DOAC_BUILD_PROGRAMS=ON -DBUILD_TESTING=ON
       - name: Build
         working-directory: ./build
         run: make -j 2 -s
@@ -53,7 +53,7 @@ jobs:
         run: cmake --version
       - name: Configure
         working-directory: ./build
-        run: cmake .. -DOPUS_BUILD_PROGRAMS=ON -DBUILD_TESTING=ON -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc
+        run: cmake .. -DOAC_BUILD_PROGRAMS=ON -DBUILD_TESTING=ON -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc
       - name: Build
         working-directory: ./build
         run: cmake --build . -j 2 --config Release --target package
@@ -206,25 +206,25 @@ jobs:
             name: "CustomModes/Linux/Lib/X64/Release",
             os: ubuntu-latest,
             config: Release,
-            args: "-DOPUS_CUSTOM_MODES=ON"
+            args: "-DOAC_CUSTOM_MODES=ON"
           }
         - {
             name: "AssertionsFuzz/Windows/Lib/X64/Release",
             os: windows-latest,
             config: Release,
-            args: -G "Visual Studio 17 2022" -A Win32 -DOPUS_ASSERTIONS=ON -DOPUS_FUZZING=ON
+            args: -G "Visual Studio 17 2022" -A Win32 -DOAC_ASSERTIONS=ON -DOAC_FUZZING=ON
           }
         - {
             name: "AssertionsFuzz/Linux/Lib/X64/Release",
             os: ubuntu-latest,
             config: Release,
-            args: -DOPUS_ASSERTIONS=ON -DOPUS_FUZZING=ON
+            args: -DOAC_ASSERTIONS=ON -DOAC_FUZZING=ON
           }
         - {
             name: "AssertionsFuzz/MacOSX/Lib/X64/Release",
             os: macos-latest,
             config: Release,
-            args: -DOPUS_ASSERTIONS=ON -DOPUS_FUZZING=ON
+            args: -DOAC_ASSERTIONS=ON -DOAC_FUZZING=ON
           }
 
     steps:
@@ -249,7 +249,7 @@ jobs:
         run: cmake --version
       - name: Configure
         working-directory: ./build
-        run: cmake .. ${{ matrix.config.args }} -DCMAKE_BUILD_TYPE=${{ matrix.config.config }} -DOPUS_BUILD_PROGRAMS=ON -DBUILD_TESTING=ON
+        run: cmake .. ${{ matrix.config.args }} -DCMAKE_BUILD_TYPE=${{ matrix.config.config }} -DOAC_BUILD_PROGRAMS=ON -DBUILD_TESTING=ON
       - name: Build
         working-directory: ./build
         run: cmake --build . -j 2 --config ${{ matrix.config.config }} --target package
diff --git a/.github/workflows/dred.yml b/.github/workflows/dred.yml
index ad316357a..527ded655 100644
--- a/.github/workflows/dred.yml
+++ b/.github/workflows/dred.yml
@@ -18,7 +18,7 @@ jobs:
             name: "Windows/Lib/X64/Release",
             os: windows-latest,
             config: Release,
-            args: -G "Visual Studio 17 2022" -DOPUS_X86_PRESUME_AVX2=ON
+            args: -G "Visual Studio 17 2022" -DOAC_X86_PRESUME_AVX2=ON
           }
         - {
            name: "Windows/Lib/armv8/Release",
@@ -30,7 +30,7 @@ jobs:
             name: "Linux/Lib/X64/Release",
             os: ubuntu-latest,
             config: Release,
-            args: -DOPUS_X86_PRESUME_AVX2=ON
+            args: -DOAC_X86_PRESUME_AVX2=ON
           }
         - {
             name: "Android/Lib/X64/Release",
@@ -49,7 +49,7 @@ jobs:
             os: macos-latest,
             config: Release,
             # some macs are really old in githubs lab so they don't support avx
-            args: -DOPUS_X86_PRESUME_AVX2=OFF
+            args: -DOAC_X86_PRESUME_AVX2=OFF
           }
         - {
             name: "iOS/Lib/arm64/Release",
@@ -77,7 +77,7 @@ jobs:
         run: mkdir build
       - name: Configure
         working-directory: ./build
-        run: cmake .. ${{ matrix.config.args }} -DCMAKE_BUILD_TYPE=${{ matrix.config.config }} -DOPUS_BUILD_PROGRAMS=ON -DBUILD_TESTING=ON -DOPUS_FAST_MATH=ON -DOPUS_FLOAT_APPROX=ON -DOPUS_DRED=ON -DOPUS_OSCE=ON
+        run: cmake .. ${{ matrix.config.args }} -DCMAKE_BUILD_TYPE=${{ matrix.config.config }} -DOAC_BUILD_PROGRAMS=ON -DBUILD_TESTING=ON -DOAC_FAST_MATH=ON -DOAC_FLOAT_APPROX=ON -DOAC_DRED=ON -DOAC_OSCE=ON
       - name: Build
         working-directory: ./build
         run: cmake --build . -j 2 --config ${{ matrix.config.config }} --target package
diff --git a/.gitignore b/.gitignore
index 5a49669ce..bb86fa591 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,8 +33,8 @@ m4/ltoptions.m4
 m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
-opus_compare
-opus_demo
+oac_compare
+oac_demo
 repacketizer_demo
 stamp-h1
 test-driver
@@ -46,12 +46,12 @@ trivial_example
 *.tar.gz
 *~
 tests/*test
-tests/test_opus_api
-tests/test_opus_decode
-tests/test_opus_encode
-tests/test_opus_extensions
-tests/test_opus_padding
-tests/test_opus_projection
+tests/test_oac_api
+tests/test_oac_decode
+tests/test_oac_encode
+tests/test_oac_extensions
+tests/test_oac_padding
+tests/test_oac_projection
 celt/arm/armopts.s
 celt/dump_modes/dump_modes
 celt/tests/test_unit_cwrs32
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 6f8a81f9c..000000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,134 +0,0 @@
-include:
-  - template: 'Workflows/Branch-Pipelines.gitlab-ci.yml'
-
-# https://docs.gitlab.com/ee/ci/yaml/workflow.html#switch-between-branch-pipelines-and-merge-request-pipelines
-workflow:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"
-      when: never
-    - if: $CI_COMMIT_BRANCH
-    - if: $CI_COMMIT_TAG
-
-default:
-  tags:
-    - docker
-  image: 'debian:bookworm-slim'
-
-# https://docs.gitlab.com/ee/ci/yaml/yaml_optimization.html#reference-tags
-.snippets:
-  git_prep:
-    # Make sure we have a recent annotated tag, otherwise meson/get-version.py
-    # might fail later (e.g. shallow clone without enough history) or return
-    # a bogus version based on a much older tag. This can happen in merge request
-    # pipelines from a personal fork, as the fork might not have the latest
-    # upstream tags if it has been forked a long time ago. Also affects the
-    # git version picked up by autotools and cmake, not just meson.
-    - git fetch https://gitlab.xiph.org/xiph/opus.git refs/tags/v1.4:refs/tags/v1.4
-    - git describe
-
-whitespace:
-  stage: test
-  before_script:
-    - apt-get update &&
-      apt-get install -y git
-  script:
-    - git diff-tree --check origin/main HEAD
-
-# Make sure commits are GPG signed
-ci-fairy:
-  stage: test
-  script:
-    - apt update
-    - apt install -y python3-pip git
-    - pip3 install --break-system-packages git+https://gitlab.freedesktop.org/freedesktop/ci-templates@7811ba9814a3bad379377241c6c6b62d78b20eac
-    - echo Checking commits $CI_FAIRY_BASE_COMMIT..HEAD
-    - ci-fairy check-commits --gpg-signed-commit $CI_FAIRY_BASE_COMMIT..HEAD
-  tags:
-    - 'docker'
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      variables:
-        CI_FAIRY_BASE_COMMIT: $CI_MERGE_REQUEST_DIFF_BASE_SHA
-    - if: $CI_PIPELINE_SOURCE != "merge_request_event"
-      variables:
-        CI_FAIRY_BASE_COMMIT: 'HEAD^1'
-
-autoconf:
-  stage: build
-  tags:
-    - avx2
-  before_script:
-    - apt-get update &&
-      apt-get install -y zip doxygen git automake libtool make wget
-    - !reference [.snippets, git_prep]
-  script:
-    - ./autogen.sh
-    - CFLAGS="-mavx -mfma -mavx2 -O2 -ffast-math" ./configure --enable-float-approx --enable-dred --enable-osce
-    - make -j16
-    - DISTCHECK_CONFIGURE_FLAGS="--enable-float-approx --enable-dred --enable-osce CFLAGS='-mavx -mfma -mavx2 -O2'" make distcheck -j16
-  cache:
-    paths:
-      - "src/*.o"
-      - "src/.libs/*.o"
-      - "silk/*.o"
-      - "silk/.libs/*.o"
-      - "celt/*.o"
-      - "celt/.libs/*.o"
-
-cmake:
-  stage: build
-  tags:
-    - avx2
-  before_script:
-    - apt-get update &&
-      apt-get install -y cmake ninja-build git automake libtool wget
-    - !reference [.snippets, git_prep]
-  script:
-    - ./autogen.sh
-    - mkdir build
-    - cmake -S . -B build -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DOPUS_BUILD_PROGRAMS=ON -DBUILD_TESTING=ON -DOPUS_FAST_MATH=ON -DOPUS_FLOAT_APPROX=ON -DOPUS_DRED=ON -DOPUS_OSCE=ON -DOPUS_X86_PRESUME_AVX2=ON
-    - cmake --build build
-    - cd build && ctest --output-on-failure -j 16
-
-.meson:
-  image: 'debian:bookworm-slim'
-  stage: build
-  before_script:
-    - apt-get update &&
-      apt-get install -y ninja-build doxygen meson git automake libtool wget
-    - !reference [.snippets, git_prep]
-  script:
-    - ./autogen.sh
-    - mkdir builddir
-    - meson setup -Ddeep-plc=enabled -Dosce=enabled -Ddred=enabled -Dtests=enabled -Ddocs=enabled -Dbuildtype=release builddir
-    - meson compile -C builddir
-    - meson test -C builddir
-    #- meson dist --no-tests -C builddir
-
-meson x86_64:
-  extends: '.meson'
-  tags:
-    - avx2
-  variables:
-    MESON_EXTRA_ARGS: '--werror'
-
-meson arm64:
-  extends: '.meson'
-  tags:
-    - 'gstreamer-arm64-linux-docker'
-  variables:
-    # arm64 build has a compiler warning still, so let's not use --werror for now
-    MESON_EXTRA_ARGS: '-Dwerror=false'
-
-makefile:
-  stage: build
-  image: 'gcc'
-  before_script:
-    - apt-get update &&
-      apt-get install -y zip doxygen git make wget
-    - !reference [.snippets, git_prep]
-  script:
-    - make -f Makefile.unix -j8
-    - make -f Makefile.unix check -j8
-    - make -f Makefile.unix clean
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fcf034b19..61f23455a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,15 @@
 cmake_minimum_required(VERSION 3.16)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
-include(OpusPackageVersion)
+include(OacPackageVersion)
 get_package_version(PACKAGE_VERSION PROJECT_VERSION)
 
-project(Opus LANGUAGES C VERSION ${PROJECT_VERSION})
+project(Oac LANGUAGES C VERSION ${PROJECT_VERSION})
 
-include(OpusFunctions)
-include(OpusBuildtype)
-include(OpusConfig)
-include(OpusSources)
+include(OacFunctions)
+include(OacBuildtype)
+include(OacConfig)
+include(OacSources)
 include(GNUInstallDirs)
 include(CMakeDependentOption)
 include(FeatureSummary)
@@ -22,237 +22,237 @@ if (MSVC)
     endif()
 endif()
 
-set(OPUS_BUILD_SHARED_LIBRARY_HELP_STR "build shared library.")
-option(OPUS_BUILD_SHARED_LIBRARY ${OPUS_BUILD_SHARED_LIBRARY_HELP_STR} OFF)
-if(OPUS_BUILD_SHARED_LIBRARY OR BUILD_SHARED_LIBS OR OPUS_BUILD_FRAMEWORK)
+set(OAC_BUILD_SHARED_LIBRARY_HELP_STR "build shared library.")
+option(OAC_BUILD_SHARED_LIBRARY ${OAC_BUILD_SHARED_LIBRARY_HELP_STR} OFF)
+if(OAC_BUILD_SHARED_LIBRARY OR BUILD_SHARED_LIBS OR OAC_BUILD_FRAMEWORK)
   # Global flag to cause add_library() to create shared libraries if on.
   set(BUILD_SHARED_LIBS ON)
-  set(OPUS_BUILD_SHARED_LIBRARY ON)
+  set(OAC_BUILD_SHARED_LIBRARY ON)
 endif()
-add_feature_info(OPUS_BUILD_SHARED_LIBRARY OPUS_BUILD_SHARED_LIBRARY ${OPUS_BUILD_SHARED_LIBRARY_HELP_STR})
+add_feature_info(OAC_BUILD_SHARED_LIBRARY OAC_BUILD_SHARED_LIBRARY ${OAC_BUILD_SHARED_LIBRARY_HELP_STR})
 
-set(OPUS_BUILD_TESTING_HELP_STR "build tests.")
-option(OPUS_BUILD_TESTING ${OPUS_BUILD_TESTING_HELP_STR} OFF)
-if(OPUS_BUILD_TESTING OR BUILD_TESTING)
-  set(OPUS_BUILD_TESTING ON)
+set(OAC_BUILD_TESTING_HELP_STR "build tests.")
+option(OAC_BUILD_TESTING ${OAC_BUILD_TESTING_HELP_STR} OFF)
+if(OAC_BUILD_TESTING OR BUILD_TESTING)
+  set(OAC_BUILD_TESTING ON)
   set(BUILD_TESTING ON)
 endif()
-add_feature_info(OPUS_BUILD_TESTING OPUS_BUILD_TESTING ${OPUS_BUILD_TESTING_HELP_STR})
+add_feature_info(OAC_BUILD_TESTING OAC_BUILD_TESTING ${OAC_BUILD_TESTING_HELP_STR})
 
-set(OPUS_CUSTOM_MODES_HELP_STR "enable non-Opus modes, e.g. 44.1 kHz & 2^n frames.")
-option(OPUS_CUSTOM_MODES ${OPUS_CUSTOM_MODES_HELP_STR} OFF)
-add_feature_info(OPUS_CUSTOM_MODES OPUS_CUSTOM_MODES ${OPUS_CUSTOM_MODES_HELP_STR})
+set(OAC_CUSTOM_MODES_HELP_STR "enable non-Oac modes, e.g. 44.1 kHz & 2^n frames.")
+option(OAC_CUSTOM_MODES ${OAC_CUSTOM_MODES_HELP_STR} OFF)
+add_feature_info(OAC_CUSTOM_MODES OAC_CUSTOM_MODES ${OAC_CUSTOM_MODES_HELP_STR})
 
-set(OPUS_BUILD_PROGRAMS_HELP_STR "build programs.")
-option(OPUS_BUILD_PROGRAMS ${OPUS_BUILD_PROGRAMS_HELP_STR} OFF)
-add_feature_info(OPUS_BUILD_PROGRAMS OPUS_BUILD_PROGRAMS ${OPUS_BUILD_PROGRAMS_HELP_STR})
+set(OAC_BUILD_PROGRAMS_HELP_STR "build programs.")
+option(OAC_BUILD_PROGRAMS ${OAC_BUILD_PROGRAMS_HELP_STR} OFF)
+add_feature_info(OAC_BUILD_PROGRAMS OAC_BUILD_PROGRAMS ${OAC_BUILD_PROGRAMS_HELP_STR})
 
-set(OPUS_DISABLE_INTRINSICS_HELP_STR "disable all intrinsics optimizations.")
-option(OPUS_DISABLE_INTRINSICS ${OPUS_DISABLE_INTRINSICS_HELP_STR} OFF)
-add_feature_info(OPUS_DISABLE_INTRINSICS OPUS_DISABLE_INTRINSICS ${OPUS_DISABLE_INTRINSICS_HELP_STR})
+set(OAC_DISABLE_INTRINSICS_HELP_STR "disable all intrinsics optimizations.")
+option(OAC_DISABLE_INTRINSICS ${OAC_DISABLE_INTRINSICS_HELP_STR} OFF)
+add_feature_info(OAC_DISABLE_INTRINSICS OAC_DISABLE_INTRINSICS ${OAC_DISABLE_INTRINSICS_HELP_STR})
 
-set(OPUS_FIXED_POINT_HELP_STR "compile as fixed-point (for machines without a fast enough FPU).")
-option(OPUS_FIXED_POINT ${OPUS_FIXED_POINT_HELP_STR} OFF)
-add_feature_info(OPUS_FIXED_POINT OPUS_FIXED_POINT ${OPUS_FIXED_POINT_HELP_STR})
+set(OAC_FIXED_POINT_HELP_STR "compile as fixed-point (for machines without a fast enough FPU).")
+option(OAC_FIXED_POINT ${OAC_FIXED_POINT_HELP_STR} OFF)
+add_feature_info(OAC_FIXED_POINT OAC_FIXED_POINT ${OAC_FIXED_POINT_HELP_STR})
 
-set(OPUS_ENABLE_FLOAT_API_HELP_STR "compile with the floating point API (for machines with float library).")
-option(OPUS_ENABLE_FLOAT_API ${OPUS_ENABLE_FLOAT_API_HELP_STR} ON)
-add_feature_info(OPUS_ENABLE_FLOAT_API OPUS_ENABLE_FLOAT_API ${OPUS_ENABLE_FLOAT_API_HELP_STR})
+set(OAC_ENABLE_FLOAT_API_HELP_STR "compile with the floating point API (for machines with float library).")
+option(OAC_ENABLE_FLOAT_API ${OAC_ENABLE_FLOAT_API_HELP_STR} ON)
+add_feature_info(OAC_ENABLE_FLOAT_API OAC_ENABLE_FLOAT_API ${OAC_ENABLE_FLOAT_API_HELP_STR})
 
-set(OPUS_FLOAT_APPROX_HELP_STR "enable floating point approximations (Ensure your platform supports IEEE 754 before enabling).")
-option(OPUS_FLOAT_APPROX ${OPUS_FLOAT_APPROX_HELP_STR} OFF)
-add_feature_info(OPUS_FLOAT_APPROX OPUS_FLOAT_APPROX ${OPUS_FLOAT_APPROX_HELP_STR})
+set(OAC_FLOAT_APPROX_HELP_STR "enable floating point approximations (Ensure your platform supports IEEE 754 before enabling).")
+option(OAC_FLOAT_APPROX ${OAC_FLOAT_APPROX_HELP_STR} OFF)
+add_feature_info(OAC_FLOAT_APPROX OAC_FLOAT_APPROX ${OAC_FLOAT_APPROX_HELP_STR})
 
-set(OPUS_ASSERTIONS_HELP_STR "additional software error checking.")
-option(OPUS_ASSERTIONS ${OPUS_ASSERTIONS_HELP_STR} OFF)
-add_feature_info(OPUS_ASSERTIONS OPUS_ASSERTIONS ${OPUS_ASSERTIONS_HELP_STR})
+set(OAC_ASSERTIONS_HELP_STR "additional software error checking.")
+option(OAC_ASSERTIONS ${OAC_ASSERTIONS_HELP_STR} OFF)
+add_feature_info(OAC_ASSERTIONS OAC_ASSERTIONS ${OAC_ASSERTIONS_HELP_STR})
 
-set(OPUS_HARDENING_HELP_STR "run-time checks that are cheap and safe for use in production.")
-option(OPUS_HARDENING ${OPUS_HARDENING_HELP_STR} ON)
-add_feature_info(OPUS_HARDENING OPUS_HARDENING ${OPUS_HARDENING_HELP_STR})
+set(OAC_HARDENING_HELP_STR "run-time checks that are cheap and safe for use in production.")
+option(OAC_HARDENING ${OAC_HARDENING_HELP_STR} ON)
+add_feature_info(OAC_HARDENING OAC_HARDENING ${OAC_HARDENING_HELP_STR})
 
-set(OPUS_FUZZING_HELP_STR "causes the encoder to make random decisions (do not use in production).")
-option(OPUS_FUZZING ${OPUS_FUZZING_HELP_STR} OFF)
-add_feature_info(OPUS_FUZZING OPUS_FUZZING ${OPUS_FUZZING_HELP_STR})
+set(OAC_FUZZING_HELP_STR "causes the encoder to make random decisions (do not use in production).")
+option(OAC_FUZZING ${OAC_FUZZING_HELP_STR} OFF)
+add_feature_info(OAC_FUZZING OAC_FUZZING ${OAC_FUZZING_HELP_STR})
 
-set(OPUS_CHECK_ASM_HELP_STR "enable bit-exactness checks between optimized and c implementations.")
-option(OPUS_CHECK_ASM ${OPUS_CHECK_ASM_HELP_STR} OFF)
-add_feature_info(OPUS_CHECK_ASM OPUS_CHECK_ASM ${OPUS_CHECK_ASM_HELP_STR})
+set(OAC_CHECK_ASM_HELP_STR "enable bit-exactness checks between optimized and c implementations.")
+option(OAC_CHECK_ASM ${OAC_CHECK_ASM_HELP_STR} OFF)
+add_feature_info(OAC_CHECK_ASM OAC_CHECK_ASM ${OAC_CHECK_ASM_HELP_STR})
 
-set(OPUS_DNN_FLOAT_DEBUG_HELP_STR "Run DNN computations as float for debugging purposes.")
-option(OPUS_DNN_FLOAT_DEBUG ${OPUS_DNN_FLOAT_DEBUG_HELP_STR} OFF)
-add_feature_info(OPUS_DNN_FLOAT_DEBUG OPUS_DNN_FLOAT_DEBUG ${OPUS_DNN_FLOAT_DEBUG_HELP_STR})
+set(OAC_DNN_FLOAT_DEBUG_HELP_STR "Run DNN computations as float for debugging purposes.")
+option(OAC_DNN_FLOAT_DEBUG ${OAC_DNN_FLOAT_DEBUG_HELP_STR} OFF)
+add_feature_info(OAC_DNN_FLOAT_DEBUG OAC_DNN_FLOAT_DEBUG ${OAC_DNN_FLOAT_DEBUG_HELP_STR})
 
-set(OPUS_INSTALL_PKG_CONFIG_MODULE_HELP_STR "install pkg-config module.")
-option(OPUS_INSTALL_PKG_CONFIG_MODULE ${OPUS_INSTALL_PKG_CONFIG_MODULE_HELP_STR} ON)
-add_feature_info(OPUS_INSTALL_PKG_CONFIG_MODULE OPUS_INSTALL_PKG_CONFIG_MODULE ${OPUS_INSTALL_PKG_CONFIG_MODULE_HELP_STR})
+set(OAC_INSTALL_PKG_CONFIG_MODULE_HELP_STR "install pkg-config module.")
+option(OAC_INSTALL_PKG_CONFIG_MODULE ${OAC_INSTALL_PKG_CONFIG_MODULE_HELP_STR} ON)
+add_feature_info(OAC_INSTALL_PKG_CONFIG_MODULE OAC_INSTALL_PKG_CONFIG_MODULE ${OAC_INSTALL_PKG_CONFIG_MODULE_HELP_STR})
 
-set(OPUS_INSTALL_CMAKE_CONFIG_MODULE_HELP_STR "install CMake package config module.")
-option(OPUS_INSTALL_CMAKE_CONFIG_MODULE ${OPUS_INSTALL_CMAKE_CONFIG_MODULE_HELP_STR} ON)
-add_feature_info(OPUS_INSTALL_CMAKE_CONFIG_MODULE OPUS_INSTALL_CMAKE_CONFIG_MODULE ${OPUS_INSTALL_CMAKE_CONFIG_MODULE_HELP_STR})
+set(OAC_INSTALL_CMAKE_CONFIG_MODULE_HELP_STR "install CMake package config module.")
+option(OAC_INSTALL_CMAKE_CONFIG_MODULE ${OAC_INSTALL_CMAKE_CONFIG_MODULE_HELP_STR} ON)
+add_feature_info(OAC_INSTALL_CMAKE_CONFIG_MODULE OAC_INSTALL_CMAKE_CONFIG_MODULE ${OAC_INSTALL_CMAKE_CONFIG_MODULE_HELP_STR})
 
-set(OPUS_DRED_HELP_STR "enable DRED.")
-option(OPUS_DRED ${OPUS_DRED_HELP_STR} OFF)
-add_feature_info(OPUS_DRED OPUS_DRED ${OPUS_DRED_HELP_STR})
+set(OAC_DRED_HELP_STR "enable DRED.")
+option(OAC_DRED ${OAC_DRED_HELP_STR} OFF)
+add_feature_info(OAC_DRED OAC_DRED ${OAC_DRED_HELP_STR})
 
-set(OPUS_OSCE_HELP_STR "enable OSCE.")
-option(OPUS_OSCE ${OPUS_OSCE_HELP_STR} OFF)
-add_feature_info(OPUS_OSCE OPUS_OSCE ${OPUS_OSCE_HELP_STR})
+set(OAC_OSCE_HELP_STR "enable OSCE.")
+option(OAC_OSCE ${OAC_OSCE_HELP_STR} OFF)
+add_feature_info(OAC_OSCE OAC_OSCE ${OAC_OSCE_HELP_STR})
 
 if(APPLE)
-  set(OPUS_BUILD_FRAMEWORK_HELP_STR "build Framework bundle for Apple systems.")
-  option(OPUS_BUILD_FRAMEWORK ${OPUS_BUILD_FRAMEWORK_HELP_STR} OFF)
-  add_feature_info(OPUS_BUILD_FRAMEWORK OPUS_BUILD_FRAMEWORK ${OPUS_BUILD_FRAMEWORK_HELP_STR})
+  set(OAC_BUILD_FRAMEWORK_HELP_STR "build Framework bundle for Apple systems.")
+  option(OAC_BUILD_FRAMEWORK ${OAC_BUILD_FRAMEWORK_HELP_STR} OFF)
+  add_feature_info(OAC_BUILD_FRAMEWORK OAC_BUILD_FRAMEWORK ${OAC_BUILD_FRAMEWORK_HELP_STR})
 endif()
 
 if(MSVC)
-  set(OPUS_STATIC_RUNTIME_HELP_STR "build with static runtime library.")
-  option(OPUS_STATIC_RUNTIME ${OPUS_STATIC_RUNTIME_HELP_STR} OFF)
-  add_feature_info(OPUS_STATIC_RUNTIME OPUS_STATIC_RUNTIME ${OPUS_STATIC_RUNTIME_HELP_STR})
+  set(OAC_STATIC_RUNTIME_HELP_STR "build with static runtime library.")
+  option(OAC_STATIC_RUNTIME ${OAC_STATIC_RUNTIME_HELP_STR} OFF)
+  add_feature_info(OAC_STATIC_RUNTIME OAC_STATIC_RUNTIME ${OAC_STATIC_RUNTIME_HELP_STR})
 endif()
 
-set(OPUS_FIXED_POINT_DEBUG_HELP_STR "debug fixed-point implementation.")
-cmake_dependent_option(OPUS_FIXED_POINT_DEBUG
-                      ${OPUS_FIXED_POINT_DEBUG_HELP_STR}
+set(OAC_FIXED_POINT_DEBUG_HELP_STR "debug fixed-point implementation.")
+cmake_dependent_option(OAC_FIXED_POINT_DEBUG
+                      ${OAC_FIXED_POINT_DEBUG_HELP_STR}
                       ON
-                      "OPUS_FIXED_POINT; OPUS_FIXED_POINT_DEBUG"
+                      "OAC_FIXED_POINT; OAC_FIXED_POINT_DEBUG"
                       OFF)
-add_feature_info(OPUS_FIXED_POINT_DEBUG OPUS_FIXED_POINT_DEBUG ${OPUS_FIXED_POINT_DEBUG_HELP_STR})
+add_feature_info(OAC_FIXED_POINT_DEBUG OAC_FIXED_POINT_DEBUG ${OAC_FIXED_POINT_DEBUG_HELP_STR})
 
-set(OPUS_VAR_ARRAYS_HELP_STR "use variable length arrays for stack arrays.")
-cmake_dependent_option(OPUS_VAR_ARRAYS
-                      ${OPUS_VAR_ARRAYS_HELP_STR}
+set(OAC_VAR_ARRAYS_HELP_STR "use variable length arrays for stack arrays.")
+cmake_dependent_option(OAC_VAR_ARRAYS
+                      ${OAC_VAR_ARRAYS_HELP_STR}
                       ON
-                      "VLA_SUPPORTED; NOT OPUS_USE_ALLOCA; NOT OPUS_NONTHREADSAFE_PSEUDOSTACK"
+                      "VLA_SUPPORTED; NOT OAC_USE_ALLOCA; NOT OAC_NONTHREADSAFE_PSEUDOSTACK"
                       OFF)
-add_feature_info(OPUS_VAR_ARRAYS OPUS_VAR_ARRAYS ${OPUS_VAR_ARRAYS_HELP_STR})
+add_feature_info(OAC_VAR_ARRAYS OAC_VAR_ARRAYS ${OAC_VAR_ARRAYS_HELP_STR})
 
-set(OPUS_USE_ALLOCA_HELP_STR "use alloca for stack arrays (on non-C99 compilers).")
-cmake_dependent_option(OPUS_USE_ALLOCA
-                       ${OPUS_USE_ALLOCA_HELP_STR}
+set(OAC_USE_ALLOCA_HELP_STR "use alloca for stack arrays (on non-C99 compilers).")
+cmake_dependent_option(OAC_USE_ALLOCA
+                       ${OAC_USE_ALLOCA_HELP_STR}
                        ON
-                       "USE_ALLOCA_SUPPORTED; NOT OPUS_VAR_ARRAYS; NOT OPUS_NONTHREADSAFE_PSEUDOSTACK"
+                       "USE_ALLOCA_SUPPORTED; NOT OAC_VAR_ARRAYS; NOT OAC_NONTHREADSAFE_PSEUDOSTACK"
                        OFF)
-add_feature_info(OPUS_USE_ALLOCA OPUS_USE_ALLOCA ${OPUS_USE_ALLOCA_HELP_STR})
+add_feature_info(OAC_USE_ALLOCA OAC_USE_ALLOCA ${OAC_USE_ALLOCA_HELP_STR})
 
-set(OPUS_NONTHREADSAFE_PSEUDOSTACK_HELP_STR "use a non threadsafe pseudostack when neither variable length arrays or alloca is supported.")
-cmake_dependent_option(OPUS_NONTHREADSAFE_PSEUDOSTACK
-                       ${OPUS_NONTHREADSAFE_PSEUDOSTACK_HELP_STR}
+set(OAC_NONTHREADSAFE_PSEUDOSTACK_HELP_STR "use a non threadsafe pseudostack when neither variable length arrays or alloca is supported.")
+cmake_dependent_option(OAC_NONTHREADSAFE_PSEUDOSTACK
+                       ${OAC_NONTHREADSAFE_PSEUDOSTACK_HELP_STR}
                        ON
-                       "NOT OPUS_VAR_ARRAYS; NOT OPUS_USE_ALLOCA"
+                       "NOT OAC_VAR_ARRAYS; NOT OAC_USE_ALLOCA"
                        OFF)
-add_feature_info(OPUS_NONTHREADSAFE_PSEUDOSTACK OPUS_NONTHREADSAFE_PSEUDOSTACK ${OPUS_NONTHREADSAFE_PSEUDOSTACK_HELP_STR})
+add_feature_info(OAC_NONTHREADSAFE_PSEUDOSTACK OAC_NONTHREADSAFE_PSEUDOSTACK ${OAC_NONTHREADSAFE_PSEUDOSTACK_HELP_STR})
 
-set(OPUS_FAST_MATH_HELP_STR "enable fast math (unsupported and discouraged use, as code is not well tested with this build option).")
-cmake_dependent_option(OPUS_FAST_MATH
-                       ${OPUS_FAST_MATH_HELP_STR}
+set(OAC_FAST_MATH_HELP_STR "enable fast math (unsupported and discouraged use, as code is not well tested with this build option).")
+cmake_dependent_option(OAC_FAST_MATH
+                       ${OAC_FAST_MATH_HELP_STR}
                        ON
-                       "OPUS_FLOAT_APPROX; OPUS_FAST_MATH; FAST_MATH_SUPPORTED"
+                       "OAC_FLOAT_APPROX; OAC_FAST_MATH; FAST_MATH_SUPPORTED"
                        OFF)
-add_feature_info(OPUS_FAST_MATH OPUS_FAST_MATH ${OPUS_FAST_MATH_HELP_STR})
+add_feature_info(OAC_FAST_MATH OAC_FAST_MATH ${OAC_FAST_MATH_HELP_STR})
 
-set(OPUS_STACK_PROTECTOR_HELP_STR "use stack protection.")
-cmake_dependent_option(OPUS_STACK_PROTECTOR
-                       ${OPUS_STACK_PROTECTOR_HELP_STR}
+set(OAC_STACK_PROTECTOR_HELP_STR "use stack protection.")
+cmake_dependent_option(OAC_STACK_PROTECTOR
+                       ${OAC_STACK_PROTECTOR_HELP_STR}
                        ON
                        "STACK_PROTECTOR_SUPPORTED"
                        OFF)
-add_feature_info(OPUS_STACK_PROTECTOR OPUS_STACK_PROTECTOR ${OPUS_STACK_PROTECTOR_HELP_STR})
+add_feature_info(OAC_STACK_PROTECTOR OAC_STACK_PROTECTOR ${OAC_STACK_PROTECTOR_HELP_STR})
 
 if(NOT MSVC)
-  set(OPUS_FORTIFY_SOURCE_HELP_STR "add protection against buffer overflows.")
-  cmake_dependent_option(OPUS_FORTIFY_SOURCE
-                         ${OPUS_FORTIFY_SOURCE_HELP_STR}
+  set(OAC_FORTIFY_SOURCE_HELP_STR "add protection against buffer overflows.")
+  cmake_dependent_option(OAC_FORTIFY_SOURCE
+                         ${OAC_FORTIFY_SOURCE_HELP_STR}
                          ON
                          "FORTIFY_SOURCE_SUPPORTED"
                          OFF)
-  add_feature_info(OPUS_FORTIFY_SOURCE OPUS_FORTIFY_SOURCE ${OPUS_FORTIFY_SOURCE_HELP_STR})
+  add_feature_info(OAC_FORTIFY_SOURCE OAC_FORTIFY_SOURCE ${OAC_FORTIFY_SOURCE_HELP_STR})
 endif()
 
-if(MINGW AND (OPUS_FORTIFY_SOURCE OR OPUS_STACK_PROTECTOR))
+if(MINGW AND (OAC_FORTIFY_SOURCE OR OAC_STACK_PROTECTOR))
   # ssp lib is needed for security features for MINGW
-  list(APPEND OPUS_REQUIRED_LIBRARIES ssp)
+  list(APPEND OAC_REQUIRED_LIBRARIES ssp)
 endif()
 
-if(OPUS_CPU_X86 OR OPUS_CPU_X64)
-  set(OPUS_X86_MAY_HAVE_SSE_HELP_STR "does runtime check for SSE1 support.")
-  cmake_dependent_option(OPUS_X86_MAY_HAVE_SSE
-                         ${OPUS_X86_MAY_HAVE_SSE_HELP_STR}
+if(OAC_CPU_X86 OR OAC_CPU_X64)
+  set(OAC_X86_MAY_HAVE_SSE_HELP_STR "does runtime check for SSE1 support.")
+  cmake_dependent_option(OAC_X86_MAY_HAVE_SSE
+                         ${OAC_X86_MAY_HAVE_SSE_HELP_STR}
                          ON
-                         "SSE1_SUPPORTED; NOT OPUS_DISABLE_INTRINSICS"
+                         "SSE1_SUPPORTED; NOT OAC_DISABLE_INTRINSICS"
                          OFF)
-  add_feature_info(OPUS_X86_MAY_HAVE_SSE OPUS_X86_MAY_HAVE_SSE ${OPUS_X86_MAY_HAVE_SSE_HELP_STR})
+  add_feature_info(OAC_X86_MAY_HAVE_SSE OAC_X86_MAY_HAVE_SSE ${OAC_X86_MAY_HAVE_SSE_HELP_STR})
 
-  set(OPUS_X86_MAY_HAVE_SSE2_HELP_STR "does runtime check for SSE2 support.")
-  cmake_dependent_option(OPUS_X86_MAY_HAVE_SSE2
-                         ${OPUS_X86_MAY_HAVE_SSE2_HELP_STR}
+  set(OAC_X86_MAY_HAVE_SSE2_HELP_STR "does runtime check for SSE2 support.")
+  cmake_dependent_option(OAC_X86_MAY_HAVE_SSE2
+                         ${OAC_X86_MAY_HAVE_SSE2_HELP_STR}
                          ON
-                         "SSE2_SUPPORTED; NOT OPUS_DISABLE_INTRINSICS"
+                         "SSE2_SUPPORTED; NOT OAC_DISABLE_INTRINSICS"
                          OFF)
-  add_feature_info(OPUS_X86_MAY_HAVE_SSE2 OPUS_X86_MAY_HAVE_SSE2 ${OPUS_X86_MAY_HAVE_SSE2_HELP_STR})
+  add_feature_info(OAC_X86_MAY_HAVE_SSE2 OAC_X86_MAY_HAVE_SSE2 ${OAC_X86_MAY_HAVE_SSE2_HELP_STR})
 
-  set(OPUS_X86_MAY_HAVE_SSE4_1_HELP_STR "does runtime check for SSE4.1 support.")
-  cmake_dependent_option(OPUS_X86_MAY_HAVE_SSE4_1
-                         ${OPUS_X86_MAY_HAVE_SSE4_1_HELP_STR}
+  set(OAC_X86_MAY_HAVE_SSE4_1_HELP_STR "does runtime check for SSE4.1 support.")
+  cmake_dependent_option(OAC_X86_MAY_HAVE_SSE4_1
+                         ${OAC_X86_MAY_HAVE_SSE4_1_HELP_STR}
                          ON
-                         "SSE4_1_SUPPORTED; NOT OPUS_DISABLE_INTRINSICS"
+                         "SSE4_1_SUPPORTED; NOT OAC_DISABLE_INTRINSICS"
                          OFF)
-  add_feature_info(OPUS_X86_MAY_HAVE_SSE4_1 OPUS_X86_MAY_HAVE_SSE4_1 ${OPUS_X86_MAY_HAVE_SSE4_1_HELP_STR})
+  add_feature_info(OAC_X86_MAY_HAVE_SSE4_1 OAC_X86_MAY_HAVE_SSE4_1 ${OAC_X86_MAY_HAVE_SSE4_1_HELP_STR})
 
-  set(OPUS_X86_MAY_HAVE_AVX2_HELP_STR "does runtime check for AVX FMA AVX2 support.")
-  cmake_dependent_option(OPUS_X86_MAY_HAVE_AVX2
-                         ${OPUS_X86_MAY_HAVE_AVX2_HELP_STR}
+  set(OAC_X86_MAY_HAVE_AVX2_HELP_STR "does runtime check for AVX FMA AVX2 support.")
+  cmake_dependent_option(OAC_X86_MAY_HAVE_AVX2
+                         ${OAC_X86_MAY_HAVE_AVX2_HELP_STR}
                          ON
-                         "AVX2_SUPPORTED; NOT OPUS_DISABLE_INTRINSICS"
+                         "AVX2_SUPPORTED; NOT OAC_DISABLE_INTRINSICS"
                          OFF)
-  add_feature_info(OPUS_X86_MAY_HAVE_AVX2 OPUS_X86_MAY_HAVE_AVX2 ${OPUS_X86_MAY_HAVE_AVX2_HELP_STR})
+  add_feature_info(OAC_X86_MAY_HAVE_AVX2 OAC_X86_MAY_HAVE_AVX2 ${OAC_X86_MAY_HAVE_AVX2_HELP_STR})
 
   # PRESUME depends on MAY HAVE, but PRESUME will override runtime detection
-  set(OPUS_X86_PRESUME_SSE_HELP_STR "assume target CPU has SSE1 support (override runtime check).")
-  set(OPUS_X86_PRESUME_SSE2_HELP_STR "assume target CPU has SSE2 support (override runtime check).")
-  if(OPUS_CPU_X64) # Assume x86_64 has up to SSE2 support
-    cmake_dependent_option(OPUS_X86_PRESUME_SSE
-                           ${OPUS_X86_PRESUME_SSE_HELP_STR}
+  set(OAC_X86_PRESUME_SSE_HELP_STR "assume target CPU has SSE1 support (override runtime check).")
+  set(OAC_X86_PRESUME_SSE2_HELP_STR "assume target CPU has SSE2 support (override runtime check).")
+  if(OAC_CPU_X64) # Assume x86_64 has up to SSE2 support
+    cmake_dependent_option(OAC_X86_PRESUME_SSE
+                           ${OAC_X86_PRESUME_SSE_HELP_STR}
                            ON
-                           "OPUS_X86_MAY_HAVE_SSE; NOT OPUS_DISABLE_INTRINSICS"
+                           "OAC_X86_MAY_HAVE_SSE; NOT OAC_DISABLE_INTRINSICS"
                            OFF)
 
-    cmake_dependent_option(OPUS_X86_PRESUME_SSE2
-                           ${OPUS_X86_PRESUME_SSE2_HELP_STR}
+    cmake_dependent_option(OAC_X86_PRESUME_SSE2
+                           ${OAC_X86_PRESUME_SSE2_HELP_STR}
                            ON
-                           "OPUS_X86_MAY_HAVE_SSE2; NOT OPUS_DISABLE_INTRINSICS"
+                           "OAC_X86_MAY_HAVE_SSE2; NOT OAC_DISABLE_INTRINSICS"
                            OFF)
   else()
-    cmake_dependent_option(OPUS_X86_PRESUME_SSE
-                           ${OPUS_X86_PRESUME_SSE_HELP_STR}
+    cmake_dependent_option(OAC_X86_PRESUME_SSE
+                           ${OAC_X86_PRESUME_SSE_HELP_STR}
                            OFF
-                           "OPUS_X86_MAY_HAVE_SSE; NOT OPUS_DISABLE_INTRINSICS"
+                           "OAC_X86_MAY_HAVE_SSE; NOT OAC_DISABLE_INTRINSICS"
                            OFF)
 
-    cmake_dependent_option(OPUS_X86_PRESUME_SSE2
-                           ${OPUS_X86_PRESUME_SSE2_HELP_STR}
+    cmake_dependent_option(OAC_X86_PRESUME_SSE2
+                           ${OAC_X86_PRESUME_SSE2_HELP_STR}
                            OFF
-                           "OPUS_X86_MAY_HAVE_SSE2; NOT OPUS_DISABLE_INTRINSICS"
+                           "OAC_X86_MAY_HAVE_SSE2; NOT OAC_DISABLE_INTRINSICS"
                            OFF)
   endif()
-  add_feature_info(OPUS_X86_PRESUME_SSE OPUS_X86_PRESUME_SSE ${OPUS_X86_PRESUME_SSE_HELP_STR})
-  add_feature_info(OPUS_X86_PRESUME_SSE2 OPUS_X86_PRESUME_SSE2 ${OPUS_X86_PRESUME_SSE2_HELP_STR})
+  add_feature_info(OAC_X86_PRESUME_SSE OAC_X86_PRESUME_SSE ${OAC_X86_PRESUME_SSE_HELP_STR})
+  add_feature_info(OAC_X86_PRESUME_SSE2 OAC_X86_PRESUME_SSE2 ${OAC_X86_PRESUME_SSE2_HELP_STR})
 
-  set(OPUS_X86_PRESUME_SSE4_1_HELP_STR "assume target CPU has SSE4.1 support (override runtime check).")
-  cmake_dependent_option(OPUS_X86_PRESUME_SSE4_1
-                         ${OPUS_X86_PRESUME_SSE4_1_HELP_STR}
+  set(OAC_X86_PRESUME_SSE4_1_HELP_STR "assume target CPU has SSE4.1 support (override runtime check).")
+  cmake_dependent_option(OAC_X86_PRESUME_SSE4_1
+                         ${OAC_X86_PRESUME_SSE4_1_HELP_STR}
                          OFF
-                         "OPUS_X86_MAY_HAVE_SSE4_1; NOT OPUS_DISABLE_INTRINSICS"
+                         "OAC_X86_MAY_HAVE_SSE4_1; NOT OAC_DISABLE_INTRINSICS"
                          OFF)
-  add_feature_info(OPUS_X86_PRESUME_SSE4_1 OPUS_X86_PRESUME_SSE4_1 ${OPUS_X86_PRESUME_SSE4_1_HELP_STR})
+  add_feature_info(OAC_X86_PRESUME_SSE4_1 OAC_X86_PRESUME_SSE4_1 ${OAC_X86_PRESUME_SSE4_1_HELP_STR})
 
-  set(OPUS_X86_PRESUME_AVX2_HELP_STR "assume target CPU has AVX FMA AVX2 support (override runtime check).")
-  cmake_dependent_option(OPUS_X86_PRESUME_AVX2
-                         ${OPUS_X86_PRESUME_AVX2_HELP_STR}
+  set(OAC_X86_PRESUME_AVX2_HELP_STR "assume target CPU has AVX FMA AVX2 support (override runtime check).")
+  cmake_dependent_option(OAC_X86_PRESUME_AVX2
+                         ${OAC_X86_PRESUME_AVX2_HELP_STR}
                          OFF
-                         "OPUS_X86_MAY_HAVE_AVX2; NOT OPUS_DISABLE_INTRINSICS"
+                         "OAC_X86_MAY_HAVE_AVX2; NOT OAC_DISABLE_INTRINSICS"
                          OFF)
-  add_feature_info(OPUS_X86_PRESUME_AVX2 OPUS_X86_PRESUME_AVX2 ${OPUS_X86_PRESUME_AVX2_HELP_STR})
+  add_feature_info(OAC_X86_PRESUME_AVX2 OAC_X86_PRESUME_AVX2 ${OAC_X86_PRESUME_AVX2_HELP_STR})
 endif()
 
 feature_summary(WHAT ALL)
@@ -268,260 +268,260 @@ set_package_properties(Git
                        PURPOSE
                        "required to set up package version")
 
-set(Opus_PUBLIC_HEADER
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/opus.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/opus_defines.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/opus_multistream.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/opus_projection.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/opus_types.h)
+set(Oac_PUBLIC_HEADER
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/oac.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/oac_defines.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/oac_multistream.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/oac_projection.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/oac_types.h)
 
-if(OPUS_CUSTOM_MODES)
-  list(APPEND Opus_PUBLIC_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/include/opus_custom.h)
+if(OAC_CUSTOM_MODES)
+  list(APPEND Oac_PUBLIC_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/include/oac_custom.h)
 endif()
 
 if(MSVC)
-  if(OPUS_STATIC_RUNTIME)
+  if(OAC_STATIC_RUNTIME)
     set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
   else()
     set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
   endif()
 endif()
 
-add_library(opus ${opus_headers} ${opus_sources} ${opus_sources_float} ${Opus_PUBLIC_HEADER})
-add_library(Opus::opus ALIAS opus)
+add_library(oac ${oac_headers} ${oac_sources} ${oac_sources_float} ${Oac_PUBLIC_HEADER})
+add_library(Oac::oac ALIAS oac)
 
-get_library_version(OPUS_LIBRARY_VERSION OPUS_LIBRARY_VERSION_MAJOR)
-message(DEBUG "Opus library version: ${OPUS_LIBRARY_VERSION}")
+get_library_version(OAC_LIBRARY_VERSION OAC_LIBRARY_VERSION_MAJOR)
+message(DEBUG "Oac library version: ${OAC_LIBRARY_VERSION}")
 
-set_target_properties(opus
+set_target_properties(oac
                       PROPERTIES SOVERSION
-                                 ${OPUS_LIBRARY_VERSION_MAJOR}
+                                 ${OAC_LIBRARY_VERSION_MAJOR}
                                  VERSION
-                                 ${OPUS_LIBRARY_VERSION}
+                                 ${OAC_LIBRARY_VERSION}
                                  PUBLIC_HEADER
-                                 "${Opus_PUBLIC_HEADER}")
+                                 "${Oac_PUBLIC_HEADER}")
 
 target_include_directories(
-  opus
+  oac
   PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
          $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/opus>
+         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/oac>
   PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
           ${CMAKE_CURRENT_SOURCE_DIR}
           ${CMAKE_CURRENT_SOURCE_DIR}/dnn
           celt
           silk)
 
-target_link_libraries(opus PRIVATE ${OPUS_REQUIRED_LIBRARIES})
-target_compile_definitions(opus PRIVATE OPUS_BUILD)
+target_link_libraries(oac PRIVATE ${OAC_REQUIRED_LIBRARIES})
+target_compile_definitions(oac PRIVATE OAC_BUILD)
 
-if(OPUS_FIXED_POINT_DEBUG)
-  target_compile_definitions(opus PRIVATE FIXED_DEBUG)
+if(OAC_FIXED_POINT_DEBUG)
+  target_compile_definitions(oac PRIVATE FIXED_DEBUG)
 endif()
 
-if(OPUS_FORTIFY_SOURCE AND NOT MSVC)
-  target_compile_definitions(opus PRIVATE
+if(OAC_FORTIFY_SOURCE AND NOT MSVC)
+  target_compile_definitions(oac PRIVATE
                              $<$<NOT:$<CONFIG:debug>>:_FORTIFY_SOURCE=2>)
 endif()
 
-if(OPUS_FLOAT_APPROX)
-  target_compile_definitions(opus PRIVATE FLOAT_APPROX)
+if(OAC_FLOAT_APPROX)
+  target_compile_definitions(oac PRIVATE FLOAT_APPROX)
 endif()
 
-if(OPUS_ASSERTIONS)
-  target_compile_definitions(opus PRIVATE ENABLE_ASSERTIONS)
+if(OAC_ASSERTIONS)
+  target_compile_definitions(oac PRIVATE ENABLE_ASSERTIONS)
 endif()
 
-if(OPUS_HARDENING)
-  target_compile_definitions(opus PRIVATE ENABLE_HARDENING)
+if(OAC_HARDENING)
+  target_compile_definitions(oac PRIVATE ENABLE_HARDENING)
 endif()
 
-if(OPUS_FUZZING)
-  target_compile_definitions(opus PRIVATE FUZZING)
+if(OAC_FUZZING)
+  target_compile_definitions(oac PRIVATE FUZZING)
 endif()
 
-if(OPUS_CHECK_ASM)
-  target_compile_definitions(opus PRIVATE OPUS_CHECK_ASM)
+if(OAC_CHECK_ASM)
+  target_compile_definitions(oac PRIVATE OAC_CHECK_ASM)
 endif()
 
-if(NOT OPUS_DNN_FLOAT_DEBUG)
-  target_compile_definitions(opus PRIVATE DISABLE_DEBUG_FLOAT)
+if(NOT OAC_DNN_FLOAT_DEBUG)
+  target_compile_definitions(oac PRIVATE DISABLE_DEBUG_FLOAT)
 endif()
 
-if(OPUS_VAR_ARRAYS)
-  target_compile_definitions(opus PRIVATE VAR_ARRAYS)
-elseif(OPUS_USE_ALLOCA)
-  target_compile_definitions(opus PRIVATE USE_ALLOCA)
-elseif(OPUS_NONTHREADSAFE_PSEUDOSTACK)
-  target_compile_definitions(opus PRIVATE NONTHREADSAFE_PSEUDOSTACK)
+if(OAC_VAR_ARRAYS)
+  target_compile_definitions(oac PRIVATE VAR_ARRAYS)
+elseif(OAC_USE_ALLOCA)
+  target_compile_definitions(oac PRIVATE USE_ALLOCA)
+elseif(OAC_NONTHREADSAFE_PSEUDOSTACK)
+  target_compile_definitions(oac PRIVATE NONTHREADSAFE_PSEUDOSTACK)
 else()
   message(ERROR "Need to set a define for stack allocation")
 endif()
 
-if(OPUS_CUSTOM_MODES)
-  target_compile_definitions(opus PRIVATE CUSTOM_MODES)
+if(OAC_CUSTOM_MODES)
+  target_compile_definitions(oac PRIVATE CUSTOM_MODES)
 endif()
 
-if(OPUS_FAST_MATH)
+if(OAC_FAST_MATH)
   if(MSVC)
-    target_compile_options(opus PRIVATE /fp:fast)
+    target_compile_options(oac PRIVATE /fp:fast)
   else()
-    target_compile_options(opus PRIVATE -ffast-math)
+    target_compile_options(oac PRIVATE -ffast-math)
   endif()
 endif()
 
-if(OPUS_STACK_PROTECTOR)
+if(OAC_STACK_PROTECTOR)
   if(MSVC)
-    target_compile_options(opus PRIVATE /GS)
+    target_compile_options(oac PRIVATE /GS)
   else()
-    target_compile_options(opus PRIVATE -fstack-protector-strong)
+    target_compile_options(oac PRIVATE -fstack-protector-strong)
   endif()
 elseif(STACK_PROTECTOR_DISABLED_SUPPORTED)
-  target_compile_options(opus PRIVATE /GS-)
+  target_compile_options(oac PRIVATE /GS-)
 endif()
 
 if(BUILD_SHARED_LIBS)
   if(WIN32)
-    target_compile_definitions(opus PRIVATE DLL_EXPORT)
+    target_compile_definitions(oac PRIVATE DLL_EXPORT)
   elseif(HIDDEN_VISIBILITY_SUPPORTED)
-    set_target_properties(opus PROPERTIES C_VISIBILITY_PRESET hidden)
+    set_target_properties(oac PROPERTIES C_VISIBILITY_PRESET hidden)
   endif()
 endif()
 
-add_sources_group(opus silk ${silk_headers} ${silk_sources})
-add_sources_group(opus celt ${celt_headers} ${celt_sources})
+add_sources_group(oac silk ${silk_headers} ${silk_sources})
+add_sources_group(oac celt ${celt_headers} ${celt_sources})
 
-if(OPUS_FIXED_POINT)
-  add_sources_group(opus silk ${silk_sources_fixed})
-  target_include_directories(opus PRIVATE silk/fixed)
-  target_compile_definitions(opus PRIVATE FIXED_POINT=1)
+if(OAC_FIXED_POINT)
+  add_sources_group(oac silk ${silk_sources_fixed})
+  target_include_directories(oac PRIVATE silk/fixed)
+  target_compile_definitions(oac PRIVATE FIXED_POINT=1)
 else()
-  add_sources_group(opus silk ${silk_sources_float})
-  target_include_directories(opus PRIVATE silk/float)
+  add_sources_group(oac silk ${silk_sources_float})
+  target_include_directories(oac PRIVATE silk/float)
 endif()
 
-if(NOT OPUS_ENABLE_FLOAT_API)
-  target_compile_definitions(opus PRIVATE DISABLE_FLOAT_API)
+if(NOT OAC_ENABLE_FLOAT_API)
+  target_compile_definitions(oac PRIVATE DISABLE_FLOAT_API)
 endif()
 
-if (OPUS_DEEP_PLC OR OPUS_DRED OR OPUS_OSCE)
-  add_sources_group(opus lpcnet ${deep_plc_headers} ${deep_plc_sources})
-  set(OPUS_DNN TRUE)
+if (OAC_DEEP_PLC OR OAC_DRED OR OAC_OSCE)
+  add_sources_group(oac lpcnet ${deep_plc_headers} ${deep_plc_sources})
+  set(OAC_DNN TRUE)
 else()
-  set(OPUS_DNN FALSE)
+  set(OAC_DNN FALSE)
 endif()
 
-if (OPUS_DNN)
-  add_sources_group(opus lpcnet ${deep_plc_headers} ${deep_plc_sources})
-  target_compile_definitions(opus PRIVATE ENABLE_DEEP_PLC)
+if (OAC_DNN)
+  add_sources_group(oac lpcnet ${deep_plc_headers} ${deep_plc_sources})
+  target_compile_definitions(oac PRIVATE ENABLE_DEEP_PLC)
 endif()
 
-if (OPUS_DRED)
-  add_sources_group(opus lpcnet ${dred_headers} ${dred_sources})
-  target_compile_definitions(opus PRIVATE ENABLE_DRED)
+if (OAC_DRED)
+  add_sources_group(oac lpcnet ${dred_headers} ${dred_sources})
+  target_compile_definitions(oac PRIVATE ENABLE_DRED)
 endif()
 
-if (OPUS_OSCE)
-  add_sources_group(opus lpcnet ${osce_headers} ${osce_sources})
-  target_compile_definitions(opus PRIVATE ENABLE_OSCE)
+if (OAC_OSCE)
+  add_sources_group(oac lpcnet ${osce_headers} ${osce_sources})
+  target_compile_definitions(oac PRIVATE ENABLE_OSCE)
 endif()
 
-if(NOT OPUS_DISABLE_INTRINSICS)
-  if(((OPUS_X86_MAY_HAVE_SSE AND NOT OPUS_X86_PRESUME_SSE) OR
-     (OPUS_X86_MAY_HAVE_SSE2 AND NOT OPUS_X86_PRESUME_SSE2) OR
-     (OPUS_X86_MAY_HAVE_SSE4_1 AND NOT OPUS_X86_PRESUME_SSE4_1) OR
-     (OPUS_X86_MAY_HAVE_AVX2 AND NOT OPUS_X86_PRESUME_AVX2)) AND
+if(NOT OAC_DISABLE_INTRINSICS)
+  if(((OAC_X86_MAY_HAVE_SSE AND NOT OAC_X86_PRESUME_SSE) OR
+     (OAC_X86_MAY_HAVE_SSE2 AND NOT OAC_X86_PRESUME_SSE2) OR
+     (OAC_X86_MAY_HAVE_SSE4_1 AND NOT OAC_X86_PRESUME_SSE4_1) OR
+     (OAC_X86_MAY_HAVE_AVX2 AND NOT OAC_X86_PRESUME_AVX2)) AND
       RUNTIME_CPU_CAPABILITY_DETECTION)
-    target_compile_definitions(opus PRIVATE OPUS_HAVE_RTCD)
+    target_compile_definitions(oac PRIVATE OAC_HAVE_RTCD)
     if(NOT MSVC)
       if(CPU_INFO_BY_ASM_SUPPORTED)
-        target_compile_definitions(opus PRIVATE CPU_INFO_BY_ASM)
+        target_compile_definitions(oac PRIVATE CPU_INFO_BY_ASM)
       elseif(CPU_INFO_BY_C_SUPPORTED)
-        target_compile_definitions(opus PRIVATE CPU_INFO_BY_C)
+        target_compile_definitions(oac PRIVATE CPU_INFO_BY_C)
       else()
         message(ERROR "Runtime cpu capability detection is enabled while CPU_INFO is not supported")
       endif()
     endif()
-    add_sources_group(opus celt ${celt_sources_x86_rtcd})
-    add_sources_group(opus silk ${silk_sources_x86_rtcd})
-    if (OPUS_DNN)
-      add_sources_group(opus lpcnet ${dnn_sources_x86_rtcd})
+    add_sources_group(oac celt ${celt_sources_x86_rtcd})
+    add_sources_group(oac silk ${silk_sources_x86_rtcd})
+    if (OAC_DNN)
+      add_sources_group(oac lpcnet ${dnn_sources_x86_rtcd})
     endif()
   endif()
 
   if(SSE1_SUPPORTED)
-    if(OPUS_X86_MAY_HAVE_SSE)
-      add_sources_group(opus celt ${celt_sources_sse})
-      target_compile_definitions(opus PRIVATE OPUS_X86_MAY_HAVE_SSE)
+    if(OAC_X86_MAY_HAVE_SSE)
+      add_sources_group(oac celt ${celt_sources_sse})
+      target_compile_definitions(oac PRIVATE OAC_X86_MAY_HAVE_SSE)
       if(NOT MSVC)
         set_source_files_properties(${celt_sources_sse} PROPERTIES COMPILE_FLAGS -msse)
       endif()
     endif()
-    if(OPUS_X86_PRESUME_SSE)
-      target_compile_definitions(opus PRIVATE OPUS_X86_PRESUME_SSE)
+    if(OAC_X86_PRESUME_SSE)
+      target_compile_definitions(oac PRIVATE OAC_X86_PRESUME_SSE)
       if(NOT MSVC)
-        target_compile_options(opus PRIVATE -msse)
+        target_compile_options(oac PRIVATE -msse)
       endif()
     endif()
   endif()
 
   if(SSE2_SUPPORTED)
-    if(OPUS_X86_MAY_HAVE_SSE2)
-      add_sources_group(opus celt ${celt_sources_sse2})
-      if (OPUS_DNN)
-        add_sources_group(opus lpcnet ${dnn_sources_sse2})
+    if(OAC_X86_MAY_HAVE_SSE2)
+      add_sources_group(oac celt ${celt_sources_sse2})
+      if (OAC_DNN)
+        add_sources_group(oac lpcnet ${dnn_sources_sse2})
       endif()
-      target_compile_definitions(opus PRIVATE OPUS_X86_MAY_HAVE_SSE2)
+      target_compile_definitions(oac PRIVATE OAC_X86_MAY_HAVE_SSE2)
       if(NOT MSVC)
         set_source_files_properties(${celt_sources_sse2} ${dnn_sources_sse2} PROPERTIES COMPILE_FLAGS -msse2)
       endif()
     endif()
-    if(OPUS_X86_PRESUME_SSE2)
-      target_compile_definitions(opus PRIVATE OPUS_X86_PRESUME_SSE2)
+    if(OAC_X86_PRESUME_SSE2)
+      target_compile_definitions(oac PRIVATE OAC_X86_PRESUME_SSE2)
       if(NOT MSVC)
-        target_compile_options(opus PRIVATE -msse2)
+        target_compile_options(oac PRIVATE -msse2)
       endif()
     endif()
   endif()
 
   if(SSE4_1_SUPPORTED)
-    if(OPUS_X86_MAY_HAVE_SSE4_1)
-      add_sources_group(opus celt ${celt_sources_sse4_1})
-      add_sources_group(opus silk ${silk_sources_sse4_1})
-      if (OPUS_DNN)
-        add_sources_group(opus lpcnet ${dnn_sources_sse4_1})
+    if(OAC_X86_MAY_HAVE_SSE4_1)
+      add_sources_group(oac celt ${celt_sources_sse4_1})
+      add_sources_group(oac silk ${silk_sources_sse4_1})
+      if (OAC_DNN)
+        add_sources_group(oac lpcnet ${dnn_sources_sse4_1})
       endif()
-      target_compile_definitions(opus PRIVATE OPUS_X86_MAY_HAVE_SSE4_1)
+      target_compile_definitions(oac PRIVATE OAC_X86_MAY_HAVE_SSE4_1)
       if(NOT MSVC OR MSVC_CLANG_CL)
         set_source_files_properties(${celt_sources_sse4_1} ${silk_sources_sse4_1} ${dnn_sources_sse4_1} PROPERTIES COMPILE_FLAGS -msse4.1)
       endif()
 
-      if(OPUS_FIXED_POINT)
-        add_sources_group(opus silk ${silk_sources_fixed_sse4_1})
+      if(OAC_FIXED_POINT)
+        add_sources_group(oac silk ${silk_sources_fixed_sse4_1})
         if(NOT MSVC OR MSVC_CLANG_CL)
           set_source_files_properties(${silk_sources_fixed_sse4_1} PROPERTIES COMPILE_FLAGS -msse4.1)
         endif()
       endif()
     endif()
-    if(OPUS_X86_PRESUME_SSE4_1)
-      target_compile_definitions(opus PRIVATE OPUS_X86_PRESUME_SSE4_1)
+    if(OAC_X86_PRESUME_SSE4_1)
+      target_compile_definitions(oac PRIVATE OAC_X86_PRESUME_SSE4_1)
       if(NOT MSVC OR MSVC_CLANG_CL)
-        target_compile_options(opus PRIVATE -msse4.1)
+        target_compile_options(oac PRIVATE -msse4.1)
       endif()
     endif()
   endif()
 
   if(AVX2_SUPPORTED)
-    if(OPUS_X86_MAY_HAVE_AVX2)
-      add_sources_group(opus celt ${celt_sources_avx2})
-      add_sources_group(opus silk ${silk_sources_avx2})
-      if (NOT OPUS_FIXED_POINT)
-        add_sources_group(opus silk ${silk_sources_float_avx2})
+    if(OAC_X86_MAY_HAVE_AVX2)
+      add_sources_group(oac celt ${celt_sources_avx2})
+      add_sources_group(oac silk ${silk_sources_avx2})
+      if (NOT OAC_FIXED_POINT)
+        add_sources_group(oac silk ${silk_sources_float_avx2})
       endif()
-      if (OPUS_DNN)
-        add_sources_group(opus lpcnet ${dnn_sources_avx2})
+      if (OAC_DNN)
+        add_sources_group(oac lpcnet ${dnn_sources_avx2})
       endif()
-      target_compile_definitions(opus PRIVATE OPUS_X86_MAY_HAVE_AVX2)
+      target_compile_definitions(oac PRIVATE OAC_X86_MAY_HAVE_AVX2)
       if(MSVC)
         set(AVX2_FLAGS "${AVX2_FLAGS} /arch:AVX2")
       else()
@@ -529,99 +529,99 @@ if(NOT OPUS_DISABLE_INTRINSICS)
       endif()
       set_source_files_properties(${celt_sources_avx2} PROPERTIES COMPILE_FLAGS ${AVX2_FLAGS})
       set_source_files_properties(${silk_sources_avx2} PROPERTIES COMPILE_FLAGS ${AVX2_FLAGS})
-      if (NOT OPUS_FIXED_POINT)
+      if (NOT OAC_FIXED_POINT)
         set_source_files_properties(${silk_sources_float_avx2} PROPERTIES COMPILE_FLAGS ${AVX2_FLAGS})
       endif()
       set_source_files_properties(${dnn_sources_avx2} PROPERTIES COMPILE_FLAGS ${AVX2_FLAGS})
     endif()
-    if(OPUS_X86_PRESUME_AVX2)
-      target_compile_definitions(opus PRIVATE OPUS_X86_PRESUME_AVX2)
-      target_compile_definitions(opus PRIVATE OPUS_X86_PRESUME_SSE4_1)
+    if(OAC_X86_PRESUME_AVX2)
+      target_compile_definitions(oac PRIVATE OAC_X86_PRESUME_AVX2)
+      target_compile_definitions(oac PRIVATE OAC_X86_PRESUME_SSE4_1)
       if(NOT MSVC)
-        target_compile_options(opus PRIVATE -mavx2 -mfma -mavx)
+        target_compile_options(oac PRIVATE -mavx2 -mfma -mavx)
       endif()
     endif()
   endif()
 
   if(MSVC)
-    if(AVX2_SUPPORTED AND OPUS_X86_PRESUME_AVX2) # on 64 bit and 32 bits
+    if(AVX2_SUPPORTED AND OAC_X86_PRESUME_AVX2) # on 64 bit and 32 bits
       add_definitions(/arch:AVX2)
-    elseif(OPUS_CPU_X86) # if AVX not supported then set SSE flag
-      if((SSE4_1_SUPPORTED AND OPUS_X86_PRESUME_SSE4_1)
-         OR (SSE2_SUPPORTED AND OPUS_X86_PRESUME_SSE2))
-        target_compile_definitions(opus PRIVATE /arch:SSE2)
-      elseif(SSE1_SUPPORTED AND OPUS_X86_PRESUME_SSE)
-        target_compile_definitions(opus PRIVATE /arch:SSE)
+    elseif(OAC_CPU_X86) # if AVX not supported then set SSE flag
+      if((SSE4_1_SUPPORTED AND OAC_X86_PRESUME_SSE4_1)
+         OR (SSE2_SUPPORTED AND OAC_X86_PRESUME_SSE2))
+        target_compile_definitions(oac PRIVATE /arch:SSE2)
+      elseif(SSE1_SUPPORTED AND OAC_X86_PRESUME_SSE)
+        target_compile_definitions(oac PRIVATE /arch:SSE)
       endif()
     endif()
   endif()
 
   if(COMPILER_SUPPORT_NEON)
-    if(OPUS_MAY_HAVE_NEON)
+    if(OAC_MAY_HAVE_NEON)
       if(RUNTIME_CPU_CAPABILITY_DETECTION)
-        message(STATUS "OPUS_MAY_HAVE_NEON enabling runtime detection")
-        target_compile_definitions(opus PRIVATE OPUS_HAVE_RTCD)
-        add_sources_group(opus celt ${celt_sources_arm_rtcd})
-        add_sources_group(opus silk ${silk_sources_arm_rtcd})
-        add_sources_group(opus lpcnet ${dnn_sources_arm_rtcd})
+        message(STATUS "OAC_MAY_HAVE_NEON enabling runtime detection")
+        target_compile_definitions(oac PRIVATE OAC_HAVE_RTCD)
+        add_sources_group(oac celt ${celt_sources_arm_rtcd})
+        add_sources_group(oac silk ${silk_sources_arm_rtcd})
+        add_sources_group(oac lpcnet ${dnn_sources_arm_rtcd})
       else()
         message(ERROR "Runtime cpu capability detection needed for MAY_HAVE_NEON")
       endif()
       # Do runtime check for NEON
-      target_compile_definitions(opus
+      target_compile_definitions(oac
                                  PRIVATE
-                                 OPUS_ARM_MAY_HAVE_NEON
-                                 OPUS_ARM_MAY_HAVE_NEON_INTR)
+                                 OAC_ARM_MAY_HAVE_NEON
+                                 OAC_ARM_MAY_HAVE_NEON_INTR)
     endif()
 
-    add_sources_group(opus celt ${celt_sources_arm_neon_intr})
-    add_sources_group(opus silk ${silk_sources_arm_neon_intr})
-    if (OPUS_DNN)
-      add_sources_group(opus lpcnet ${dnn_sources_arm_neon})
+    add_sources_group(oac celt ${celt_sources_arm_neon_intr})
+    add_sources_group(oac silk ${silk_sources_arm_neon_intr})
+    if (OAC_DNN)
+      add_sources_group(oac lpcnet ${dnn_sources_arm_neon})
     endif()
 
     # silk arm neon depends on main_Fix.h
-    target_include_directories(opus PRIVATE silk/fixed)
+    target_include_directories(oac PRIVATE silk/fixed)
 
-    if(OPUS_FIXED_POINT)
-      add_sources_group(opus silk ${silk_sources_fixed_arm_neon_intr})
+    if(OAC_FIXED_POINT)
+      add_sources_group(oac silk ${silk_sources_fixed_arm_neon_intr})
     endif()
 
-    if(OPUS_PRESUME_NEON)
-      target_compile_definitions(opus
+    if(OAC_PRESUME_NEON)
+      target_compile_definitions(oac
                                  PRIVATE
-                                 OPUS_ARM_PRESUME_NEON
-                                 OPUS_ARM_PRESUME_NEON_INTR)
+                                 OAC_ARM_PRESUME_NEON
+                                 OAC_ARM_PRESUME_NEON_INTR)
     endif()
   endif()
 endif()
 
-target_compile_definitions(opus
+target_compile_definitions(oac
                            PRIVATE
                            $<$<BOOL:${HAVE_LRINT}>:HAVE_LRINT>
                            $<$<BOOL:${HAVE_LRINTF}>:HAVE_LRINTF>
                            $<$<BOOL:${HAVE_ELF_AUX_INFO}>:HAVE_ELF_AUX_INFO>)
 
-if(OPUS_BUILD_FRAMEWORK)
-  set_target_properties(opus PROPERTIES
+if(OAC_BUILD_FRAMEWORK)
+  set_target_properties(oac PROPERTIES
                         FRAMEWORK TRUE
                         FRAMEWORK_VERSION ${PROJECT_VERSION}
-                        MACOSX_FRAMEWORK_IDENTIFIER org.xiph.opus
+                        MACOSX_FRAMEWORK_IDENTIFIER org.xiph.oac
                         MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${PROJECT_VERSION}
                         MACOSX_FRAMEWORK_BUNDLE_VERSION ${PROJECT_VERSION}
                         XCODE_ATTRIBUTE_INSTALL_PATH "@rpath"
-                        OUTPUT_NAME Opus)
+                        OUTPUT_NAME Oac)
 endif()
 
-install(TARGETS opus
-        EXPORT OpusTargets
+install(TARGETS oac
+        EXPORT OacTargets
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
         FRAMEWORK DESTINATION ${CMAKE_INSTALL_PREFIX}
-        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/opus)
+        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/oac)
 
-if(OPUS_INSTALL_PKG_CONFIG_MODULE)
+if(OAC_INSTALL_PKG_CONFIG_MODULE)
   set(prefix ${CMAKE_INSTALL_PREFIX})
   set(exec_prefix ${CMAKE_INSTALL_PREFIX})
   set(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
@@ -630,136 +630,136 @@ if(OPUS_INSTALL_PKG_CONFIG_MODULE)
   if(HAVE_LIBM)
     set(LIBM "-lm")
   endif()
-  configure_file(opus.pc.in opus.pc)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/opus.pc
+  configure_file(oac.pc.in oac.pc)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/oac.pc
           DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 endif()
 
-if(OPUS_INSTALL_CMAKE_CONFIG_MODULE)
+if(OAC_INSTALL_CMAKE_CONFIG_MODULE)
   set(CPACK_GENERATOR TGZ)
   include(CPack)
   set(CMAKE_INSTALL_PACKAGEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
-  install(EXPORT OpusTargets
-          NAMESPACE Opus::
+  install(EXPORT OacTargets
+          NAMESPACE Oac::
           DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
 
   include(CMakePackageConfigHelpers)
 
   set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})
-  configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/OpusConfig.cmake.in
-                                OpusConfig.cmake
+  configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/OacConfig.cmake.in
+                                OacConfig.cmake
                                 INSTALL_DESTINATION
                                 ${CMAKE_INSTALL_PACKAGEDIR}
                                 PATH_VARS
                                 INCLUDE_INSTALL_DIR
                                 INSTALL_PREFIX
                                 ${CMAKE_INSTALL_PREFIX})
-  write_basic_package_version_file(OpusConfigVersion.cmake
+  write_basic_package_version_file(OacConfigVersion.cmake
                                    VERSION ${PROJECT_VERSION}
                                    COMPATIBILITY SameMajorVersion)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpusConfig.cmake
-                ${CMAKE_CURRENT_BINARY_DIR}/OpusConfigVersion.cmake
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OacConfig.cmake
+                ${CMAKE_CURRENT_BINARY_DIR}/OacConfigVersion.cmake
           DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
 endif()
 
-if(OPUS_BUILD_PROGRAMS)
+if(OAC_BUILD_PROGRAMS)
   # demo
-  if(OPUS_CUSTOM_MODES)
-    add_executable(opus_custom_demo ${opus_custom_demo_sources})
-    target_include_directories(opus_custom_demo
+  if(OAC_CUSTOM_MODES)
+    add_executable(oac_custom_demo ${oac_custom_demo_sources})
+    target_include_directories(oac_custom_demo
                                PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-    target_link_libraries(opus_custom_demo PRIVATE opus)
-    target_compile_definitions(opus_custom_demo PRIVATE OPUS_BUILD)
+    target_link_libraries(oac_custom_demo PRIVATE oac)
+    target_compile_definitions(oac_custom_demo PRIVATE OAC_BUILD)
   endif()
 
-  add_executable(opus_demo ${opus_demo_sources})
-  target_include_directories(opus_demo PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-  target_include_directories(opus_demo PRIVATE silk) # debug.h
-  target_include_directories(opus_demo PRIVATE celt) # arch.h
-  target_include_directories(opus_demo PRIVATE dnn)
-  target_link_libraries(opus_demo PRIVATE opus ${OPUS_REQUIRED_LIBRARIES})
-  target_compile_definitions(opus_demo PRIVATE OPUS_BUILD)
+  add_executable(oac_demo ${oac_demo_sources})
+  target_include_directories(oac_demo PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+  target_include_directories(oac_demo PRIVATE silk) # debug.h
+  target_include_directories(oac_demo PRIVATE celt) # arch.h
+  target_include_directories(oac_demo PRIVATE dnn)
+  target_link_libraries(oac_demo PRIVATE oac ${OAC_REQUIRED_LIBRARIES})
+  target_compile_definitions(oac_demo PRIVATE OAC_BUILD)
 
   # compare
-  add_executable(opus_compare ${opus_compare_sources})
-  target_include_directories(opus_compare PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-  target_link_libraries(opus_compare PRIVATE opus ${OPUS_REQUIRED_LIBRARIES})
+  add_executable(oac_compare ${oac_compare_sources})
+  target_include_directories(oac_compare PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+  target_link_libraries(oac_compare PRIVATE oac ${OAC_REQUIRED_LIBRARIES})
 endif()
 
 if(BUILD_TESTING AND NOT BUILD_SHARED_LIBS)
   enable_testing()
 
   # tests
-  add_executable(test_opus_decode ${test_opus_decode_sources})
-  target_include_directories(test_opus_decode
+  add_executable(test_oac_decode ${test_oac_decode_sources})
+  target_include_directories(test_oac_decode
                              PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-  target_link_libraries(test_opus_decode PRIVATE opus)
-  target_compile_definitions(test_opus_decode PRIVATE OPUS_BUILD)
-  if(OPUS_FIXED_POINT)
-    target_compile_definitions(test_opus_decode PRIVATE DISABLE_FLOAT_API)
+  target_link_libraries(test_oac_decode PRIVATE oac)
+  target_compile_definitions(test_oac_decode PRIVATE OAC_BUILD)
+  if(OAC_FIXED_POINT)
+    target_compile_definitions(test_oac_decode PRIVATE DISABLE_FLOAT_API)
   endif()
-  add_test(NAME test_opus_decode COMMAND ${CMAKE_COMMAND}
-           -DTEST_EXECUTABLE=$<TARGET_FILE:test_opus_decode>
+  add_test(NAME test_oac_decode COMMAND ${CMAKE_COMMAND}
+           -DTEST_EXECUTABLE=$<TARGET_FILE:test_oac_decode>
            -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
            -P "${PROJECT_SOURCE_DIR}/cmake/RunTest.cmake")
 
-  add_executable(test_opus_padding ${test_opus_padding_sources})
-  target_include_directories(test_opus_padding
+  add_executable(test_oac_padding ${test_oac_padding_sources})
+  target_include_directories(test_oac_padding
                              PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-  target_link_libraries(test_opus_padding PRIVATE opus)
-  add_test(NAME test_opus_padding COMMAND ${CMAKE_COMMAND}
-           -DTEST_EXECUTABLE=$<TARGET_FILE:test_opus_padding>
+  target_link_libraries(test_oac_padding PRIVATE oac)
+  add_test(NAME test_oac_padding COMMAND ${CMAKE_COMMAND}
+           -DTEST_EXECUTABLE=$<TARGET_FILE:test_oac_padding>
            -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
            -P "${PROJECT_SOURCE_DIR}/cmake/RunTest.cmake")
 
-  add_executable(test_opus_api ${test_opus_api_sources})
-  target_include_directories(test_opus_api
+  add_executable(test_oac_api ${test_oac_api_sources})
+  target_include_directories(test_oac_api
                             PRIVATE ${CMAKE_CURRENT_BINARY_DIR} celt)
-  target_link_libraries(test_opus_api PRIVATE opus)
-  target_compile_definitions(test_opus_api PRIVATE OPUS_BUILD)
-  if(OPUS_FIXED_POINT)
-    target_compile_definitions(test_opus_api PRIVATE DISABLE_FLOAT_API)
+  target_link_libraries(test_oac_api PRIVATE oac)
+  target_compile_definitions(test_oac_api PRIVATE OAC_BUILD)
+  if(OAC_FIXED_POINT)
+    target_compile_definitions(test_oac_api PRIVATE DISABLE_FLOAT_API)
   endif()
-  add_test(NAME test_opus_api COMMAND ${CMAKE_COMMAND}
-        -DTEST_EXECUTABLE=$<TARGET_FILE:test_opus_api>
+  add_test(NAME test_oac_api COMMAND ${CMAKE_COMMAND}
+        -DTEST_EXECUTABLE=$<TARGET_FILE:test_oac_api>
         -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
         -P "${PROJECT_SOURCE_DIR}/cmake/RunTest.cmake")
 
-  add_executable(test_opus_encode ${test_opus_encode_sources})
-  target_include_directories(test_opus_encode
+  add_executable(test_oac_encode ${test_oac_encode_sources})
+  target_include_directories(test_oac_encode
                             PRIVATE ${CMAKE_CURRENT_BINARY_DIR} celt dnn)
-  target_link_libraries(test_opus_encode PRIVATE opus)
-  target_compile_definitions(test_opus_encode PRIVATE OPUS_BUILD)
-  add_test(NAME test_opus_encode COMMAND ${CMAKE_COMMAND}
-        -DTEST_EXECUTABLE=$<TARGET_FILE:test_opus_encode>
+  target_link_libraries(test_oac_encode PRIVATE oac)
+  target_compile_definitions(test_oac_encode PRIVATE OAC_BUILD)
+  add_test(NAME test_oac_encode COMMAND ${CMAKE_COMMAND}
+        -DTEST_EXECUTABLE=$<TARGET_FILE:test_oac_encode>
         -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
         -P "${PROJECT_SOURCE_DIR}/cmake/RunTest.cmake")
 
-  add_executable(test_opus_extensions ${test_opus_extensions_sources})
-  target_include_directories(test_opus_extensions
+  add_executable(test_oac_extensions ${test_oac_extensions_sources})
+  target_include_directories(test_oac_extensions
                             PRIVATE ${CMAKE_CURRENT_BINARY_DIR} celt dnn)
-  target_link_libraries(test_opus_extensions PRIVATE opus)
-  target_compile_definitions(test_opus_extensions PRIVATE OPUS_BUILD)
-  add_test(NAME test_opus_extensions COMMAND ${CMAKE_COMMAND}
-        -DTEST_EXECUTABLE=$<TARGET_FILE:test_opus_extensions>
+  target_link_libraries(test_oac_extensions PRIVATE oac)
+  target_compile_definitions(test_oac_extensions PRIVATE OAC_BUILD)
+  add_test(NAME test_oac_extensions COMMAND ${CMAKE_COMMAND}
+        -DTEST_EXECUTABLE=$<TARGET_FILE:test_oac_extensions>
         -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
         -P "${PROJECT_SOURCE_DIR}/cmake/RunTest.cmake")
-  if(OPUS_DRED)
-    add_executable(test_opus_dred ${test_opus_dred_sources})
-    target_include_directories(test_opus_dred
+  if(OAC_DRED)
+    add_executable(test_oac_dred ${test_oac_dred_sources})
+    target_include_directories(test_oac_dred
                               PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-    target_link_libraries(test_opus_dred PRIVATE opus)
-    target_compile_definitions(test_opus_dred PRIVATE OPUS_BUILD)
-    add_test(NAME test_opus_dred COMMAND ${CMAKE_COMMAND}
-          -DTEST_EXECUTABLE=$<TARGET_FILE:test_opus_dred>
+    target_link_libraries(test_oac_dred PRIVATE oac)
+    target_compile_definitions(test_oac_dred PRIVATE OAC_BUILD)
+    add_test(NAME test_oac_dred COMMAND ${CMAKE_COMMAND}
+          -DTEST_EXECUTABLE=$<TARGET_FILE:test_oac_dred>
           -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
           -P "${PROJECT_SOURCE_DIR}/cmake/RunTest.cmake")
   endif()
-  if(OPUS_CUSTOM_MODES)
-    add_executable(test_opus_custom ${test_opus_custom_sources})
-    target_include_directories(test_opus_custom
+  if(OAC_CUSTOM_MODES)
+    add_executable(test_oac_custom ${test_oac_custom_sources})
+    target_include_directories(test_oac_custom
                               PRIVATE ${CMAKE_CURRENT_BINARY_DIR} celt dnn)
-    target_link_libraries(test_opus_custom PRIVATE opus)
-    target_compile_definitions(test_opus_custom PRIVATE OPUS_BUILD)
+    target_link_libraries(test_oac_custom PRIVATE oac)
+    target_compile_definitions(test_oac_custom PRIVATE OAC_BUILD)
   endif()
 endif()
diff --git a/LICENSE_PLEASE_READ.txt b/LICENSE_PLEASE_READ.txt
deleted file mode 100644
index bc88efa6c..000000000
--- a/LICENSE_PLEASE_READ.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Contributions to the collaboration shall not be considered confidential.
-
-Each contributor represents and warrants that it has the right and
-authority to license copyright in its contributions to the collaboration.
-
-Each contributor agrees to license the copyright in the contributions
-under the Modified (2-clause or 3-clause) BSD License or the Clear BSD License.
-
-Please see the IPR statements submitted to the IETF for the complete
-patent licensing details:
-
-Xiph.Org Foundation:
-https://datatracker.ietf.org/ipr/1524/
-
-Microsoft Corporation:
-https://datatracker.ietf.org/ipr/1914/
-
-Skype Limited:
-https://datatracker.ietf.org/ipr/1602/
-
-Broadcom Corporation:
-https://datatracker.ietf.org/ipr/1526/
diff --git a/Makefile.am b/Makefile.am
index cc03cd37b..331a10d4a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ export VERBOSE = yes
 AUTOMAKE_OPTIONS = subdir-objects
 ACLOCAL_AMFLAGS = -I m4
 
-lib_LTLIBRARIES = libopus.la
+lib_LTLIBRARIES = liboac.la
 
 DIST_SUBDIRS = doc
 
@@ -16,7 +16,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/celt -I$(top_srcdir)/silk
 include celt_sources.mk
 include lpcnet_sources.mk
 include silk_sources.mk
-include opus_sources.mk
+include oac_sources.mk
 
 LPCNET_SOURCES =
 if ENABLE_DEEP_PLC
@@ -49,7 +49,7 @@ endif
 
 if DISABLE_FLOAT_API
 else
-OPUS_SOURCES += $(OPUS_SOURCES_FLOAT)
+OAC_SOURCES += $(OAC_SOURCES_FLOAT)
 endif
 
 if CPU_X86
@@ -111,7 +111,7 @@ if HAVE_ARM_NE10
 CELT_SOURCES += $(CELT_SOURCES_ARM_NE10)
 endif
 
-if OPUS_ARM_EXTERNAL_ASM
+if OAC_ARM_EXTERNAL_ASM
 noinst_LTLIBRARIES = libarmasm.la
 libarmasm_la_SOURCES = $(CELT_SOURCES_ARM_ASM:.s=-gnu.S)
 BUILT_SOURCES = $(CELT_SOURCES_ARM_ASM:.s=-gnu.S) \
@@ -126,7 +126,7 @@ CLEANFILES = $(CELT_SOURCES_ARM_ASM:.s=-gnu.S) \
 include celt_headers.mk
 include lpcnet_headers.mk
 include silk_headers.mk
-include opus_headers.mk
+include oac_headers.mk
 
 LPCNET_HEAD =
 if ENABLE_DEEP_PLC
@@ -142,16 +142,16 @@ if ENABLE_LOSSGEN
 LPCNET_HEAD += $(LOSSGEN_HEAD)
 endif
 
-libopus_la_SOURCES = $(CELT_SOURCES) $(SILK_SOURCES) $(LPCNET_SOURCES) $(OPUS_SOURCES)
-libopus_la_LDFLAGS = -no-undefined -version-info @OPUS_LT_CURRENT@:@OPUS_LT_REVISION@:@OPUS_LT_AGE@
-libopus_la_LIBADD = $(NE10_LIBS) $(LIBM)
-if OPUS_ARM_EXTERNAL_ASM
-libopus_la_LIBADD += libarmasm.la
+liboac_la_SOURCES = $(CELT_SOURCES) $(SILK_SOURCES) $(LPCNET_SOURCES) $(OAC_SOURCES)
+liboac_la_LDFLAGS = -no-undefined -version-info @OAC_LT_CURRENT@:@OAC_LT_REVISION@:@OAC_LT_AGE@
+liboac_la_LIBADD = $(NE10_LIBS) $(LIBM)
+if OAC_ARM_EXTERNAL_ASM
+liboac_la_LIBADD += libarmasm.la
 endif
 
-pkginclude_HEADERS = include/opus.h include/opus_multistream.h include/opus_types.h include/opus_defines.h include/opus_projection.h
+pkginclude_HEADERS = include/oac.h include/oac_multistream.h include/oac_types.h include/oac_defines.h include/oac_projection.h
 
-noinst_HEADERS = $(OPUS_HEAD) $(SILK_HEAD) $(CELT_HEAD) $(LPCNET_HEAD)
+noinst_HEADERS = $(OAC_HEAD) $(SILK_HEAD) $(CELT_HEAD) $(LPCNET_HEAD)
 
 if EXTRA_PROGRAMS
 noinst_PROGRAMS = celt/tests/test_unit_cwrs32 \
@@ -163,17 +163,17 @@ noinst_PROGRAMS = celt/tests/test_unit_cwrs32 \
                   celt/tests/test_unit_mdct \
                   celt/tests/test_unit_rotation \
                   celt/tests/test_unit_types \
-                  opus_compare \
-                  opus_demo \
+                  oac_compare \
+                  oac_demo \
                   repacketizer_demo \
                   silk/tests/test_unit_LPC_inv_pred_gain \
-                  tests/test_opus_api \
-                  tests/test_opus_decode \
-                  tests/test_opus_dred \
-                  tests/test_opus_encode \
-                  tests/test_opus_extensions \
-                  tests/test_opus_padding \
-                  tests/test_opus_projection \
+                  tests/test_oac_api \
+                  tests/test_oac_decode \
+                  tests/test_oac_dred \
+                  tests/test_oac_encode \
+                  tests/test_oac_extensions \
+                  tests/test_oac_padding \
+                  tests/test_oac_projection \
                   trivial_example
 
 TESTS = celt/tests/test_unit_cwrs32 \
@@ -186,70 +186,70 @@ TESTS = celt/tests/test_unit_cwrs32 \
         celt/tests/test_unit_rotation \
         celt/tests/test_unit_types \
         silk/tests/test_unit_LPC_inv_pred_gain \
-        tests/test_opus_api \
-        tests/test_opus_decode \
-        tests/test_opus_encode \
-        tests/test_opus_extensions \
-        tests/test_opus_padding \
-        tests/test_opus_projection
-
-opus_demo_SOURCES = src/opus_demo.c
+        tests/test_oac_api \
+        tests/test_oac_decode \
+        tests/test_oac_encode \
+        tests/test_oac_extensions \
+        tests/test_oac_padding \
+        tests/test_oac_projection
+
+oac_demo_SOURCES = src/oac_demo.c
 if ENABLE_LOSSGEN
-opus_demo_SOURCES += $(LOSSGEN_SOURCES)
+oac_demo_SOURCES += $(LOSSGEN_SOURCES)
 endif
 
-opus_demo_LDADD = libopus.la $(NE10_LIBS) $(LIBM)
+oac_demo_LDADD = liboac.la $(NE10_LIBS) $(LIBM)
 
 repacketizer_demo_SOURCES = src/repacketizer_demo.c
 
-repacketizer_demo_LDADD = libopus.la $(NE10_LIBS) $(LIBM)
+repacketizer_demo_LDADD = liboac.la $(NE10_LIBS) $(LIBM)
 
-opus_compare_SOURCES = src/opus_compare.c
-opus_compare_LDADD = $(LIBM)
+oac_compare_SOURCES = src/oac_compare.c
+oac_compare_LDADD = $(LIBM)
 
 trivial_example_SOURCES = doc/trivial_example.c
-trivial_example_LDADD = libopus.la $(LIBM)
+trivial_example_LDADD = liboac.la $(LIBM)
 
-tests_test_opus_api_SOURCES = tests/test_opus_api.c tests/test_opus_common.h
-tests_test_opus_api_LDADD = libopus.la $(NE10_LIBS) $(LIBM)
+tests_test_oac_api_SOURCES = tests/test_oac_api.c tests/test_oac_common.h
+tests_test_oac_api_LDADD = liboac.la $(NE10_LIBS) $(LIBM)
 
-tests_test_opus_encode_SOURCES = tests/test_opus_encode.c tests/opus_encode_regressions.c tests/test_opus_common.h
-tests_test_opus_encode_LDADD = libopus.la $(NE10_LIBS) $(LIBM)
+tests_test_oac_encode_SOURCES = tests/test_oac_encode.c tests/oac_encode_regressions.c tests/test_oac_common.h
+tests_test_oac_encode_LDADD = liboac.la $(NE10_LIBS) $(LIBM)
 
-tests_test_opus_decode_SOURCES = tests/test_opus_decode.c tests/test_opus_common.h
-tests_test_opus_decode_LDADD = libopus.la $(NE10_LIBS) $(LIBM)
+tests_test_oac_decode_SOURCES = tests/test_oac_decode.c tests/test_oac_common.h
+tests_test_oac_decode_LDADD = liboac.la $(NE10_LIBS) $(LIBM)
 
-tests_test_opus_padding_SOURCES = tests/test_opus_padding.c tests/test_opus_common.h
-tests_test_opus_padding_LDADD = libopus.la $(NE10_LIBS) $(LIBM)
+tests_test_oac_padding_SOURCES = tests/test_oac_padding.c tests/test_oac_common.h
+tests_test_oac_padding_LDADD = liboac.la $(NE10_LIBS) $(LIBM)
 
-tests_test_opus_dred_SOURCES = tests/test_opus_dred.c tests/test_opus_common.h
-tests_test_opus_dred_LDADD = libopus.la $(NE10_LIBS) $(LIBM)
+tests_test_oac_dred_SOURCES = tests/test_oac_dred.c tests/test_oac_common.h
+tests_test_oac_dred_LDADD = liboac.la $(NE10_LIBS) $(LIBM)
 
 if CUSTOM_MODES
-tests_test_opus_custom_SOURCES = tests/test_opus_custom.c tests/test_opus_common.h
-tests_test_opus_custom_LDADD = libopus.la $(NE10_LIBS) $(LIBM)
+tests_test_oac_custom_SOURCES = tests/test_oac_custom.c tests/test_oac_common.h
+tests_test_oac_custom_LDADD = liboac.la $(NE10_LIBS) $(LIBM)
 endif
 
 CELT_OBJ = $(CELT_SOURCES:.c=.lo)
 SILK_OBJ = $(SILK_SOURCES:.c=.lo)
 LPCNET_OBJ = $(LPCNET_SOURCES:.c=.lo)
-OPUS_OBJ = $(OPUS_SOURCES:.c=.lo)
+OAC_OBJ = $(OAC_SOURCES:.c=.lo)
 
-tests_test_opus_extensions_SOURCES = tests/test_opus_extensions.c tests/test_opus_common.h
-tests_test_opus_extensions_LDADD = $(OPUS_OBJ) $(SILK_OBJ) $(LPCNET_OBJ) $(CELT_OBJ) $(NE10_LIBS) $(LIBM)
-if OPUS_ARM_EXTERNAL_ASM
-tests_test_opus_extensions_LDADD += libarmasm.la
+tests_test_oac_extensions_SOURCES = tests/test_oac_extensions.c tests/test_oac_common.h
+tests_test_oac_extensions_LDADD = $(OAC_OBJ) $(SILK_OBJ) $(LPCNET_OBJ) $(CELT_OBJ) $(NE10_LIBS) $(LIBM)
+if OAC_ARM_EXTERNAL_ASM
+tests_test_oac_extensions_LDADD += libarmasm.la
 endif
 
-tests_test_opus_projection_SOURCES = tests/test_opus_projection.c tests/test_opus_common.h
-tests_test_opus_projection_LDADD = $(OPUS_OBJ) $(SILK_OBJ) $(LPCNET_OBJ) $(CELT_OBJ) $(NE10_LIBS) $(LIBM)
-if OPUS_ARM_EXTERNAL_ASM
-tests_test_opus_projection_LDADD += libarmasm.la
+tests_test_oac_projection_SOURCES = tests/test_oac_projection.c tests/test_oac_common.h
+tests_test_oac_projection_LDADD = $(OAC_OBJ) $(SILK_OBJ) $(LPCNET_OBJ) $(CELT_OBJ) $(NE10_LIBS) $(LIBM)
+if OAC_ARM_EXTERNAL_ASM
+tests_test_oac_projection_LDADD += libarmasm.la
 endif
 
 silk_tests_test_unit_LPC_inv_pred_gain_SOURCES = silk/tests/test_unit_LPC_inv_pred_gain.c
 silk_tests_test_unit_LPC_inv_pred_gain_LDADD = $(SILK_OBJ) $(LPCNET_OBJ) $(CELT_OBJ) $(NE10_LIBS) $(LIBM)
-if OPUS_ARM_EXTERNAL_ASM
+if OAC_ARM_EXTERNAL_ASM
 silk_tests_test_unit_LPC_inv_pred_gain_LDADD += libarmasm.la
 endif
 
@@ -258,7 +258,7 @@ celt_tests_test_unit_cwrs32_LDADD = $(LIBM)
 
 celt_tests_test_unit_dft_SOURCES = celt/tests/test_unit_dft.c
 celt_tests_test_unit_dft_LDADD = $(CELT_OBJ) $(LPCNET_OBJ) $(NE10_LIBS) $(LIBM)
-if OPUS_ARM_EXTERNAL_ASM
+if OAC_ARM_EXTERNAL_ASM
 celt_tests_test_unit_dft_LDADD += libarmasm.la
 endif
 
@@ -273,19 +273,19 @@ celt_tests_test_unit_laplace_LDADD = $(LIBM)
 
 celt_tests_test_unit_mathops_SOURCES = celt/tests/test_unit_mathops.c
 celt_tests_test_unit_mathops_LDADD = $(CELT_OBJ) $(LPCNET_OBJ) $(NE10_LIBS) $(LIBM)
-if OPUS_ARM_EXTERNAL_ASM
+if OAC_ARM_EXTERNAL_ASM
 celt_tests_test_unit_mathops_LDADD += libarmasm.la
 endif
 
 celt_tests_test_unit_mdct_SOURCES = celt/tests/test_unit_mdct.c
 celt_tests_test_unit_mdct_LDADD = $(CELT_OBJ) $(LPCNET_OBJ) $(NE10_LIBS) $(LIBM)
-if OPUS_ARM_EXTERNAL_ASM
+if OAC_ARM_EXTERNAL_ASM
 celt_tests_test_unit_mdct_LDADD += libarmasm.la
 endif
 
 celt_tests_test_unit_rotation_SOURCES = celt/tests/test_unit_rotation.c
 celt_tests_test_unit_rotation_LDADD = $(CELT_OBJ) $(LPCNET_OBJ) $(NE10_LIBS) $(LIBM)
-if OPUS_ARM_EXTERNAL_ASM
+if OAC_ARM_EXTERNAL_ASM
 celt_tests_test_unit_rotation_LDADD += libarmasm.la
 endif
 
@@ -294,14 +294,14 @@ celt_tests_test_unit_types_LDADD = $(LIBM)
 endif
 
 if CUSTOM_MODES
-pkginclude_HEADERS += include/opus_custom.h
+pkginclude_HEADERS += include/oac_custom.h
 if EXTRA_PROGRAMS
-noinst_PROGRAMS += opus_custom_demo
-opus_custom_demo_SOURCES = celt/opus_custom_demo.c
-opus_custom_demo_LDADD = libopus.la $(LIBM)
+noinst_PROGRAMS += oac_custom_demo
+oac_custom_demo_SOURCES = celt/oac_custom_demo.c
+oac_custom_demo_LDADD = liboac.la $(LIBM)
 
-TESTS += tests/test_opus_custom
-noinst_PROGRAMS += tests/test_opus_custom
+TESTS += tests/test_oac_custom
+noinst_PROGRAMS += tests/test_oac_custom
 endif
 endif
 
@@ -322,7 +322,7 @@ dump_weights_blob_LDADD = $(LIBM)
 dump_weights_blob_CFLAGS = $(AM_CFLAGS) -DDUMP_BINARY_WEIGHTS
 endif
 if ENABLE_DRED
-TESTS += tests/test_opus_dred
+TESTS += tests/test_oac_dred
 endif
 
 if ENABLE_LOSSGEN
@@ -340,24 +340,24 @@ endif
 if ENABLE_QEXT
 noinst_PROGRAMS += qext_compare
 qext_compare_SOURCES = src/qext_compare.c
-qext_compare_LDADD = libopus.la $(LIBM)
+qext_compare_LDADD = liboac.la $(LIBM)
 endif
 
 endif
 
 
-EXTRA_DIST = opus.pc.in \
-             opus-uninstalled.pc.in \
-             opus.m4 \
+EXTRA_DIST = oac.pc.in \
+             oac-uninstalled.pc.in \
+             oac.m4 \
              Makefile.unix \
              CMakeLists.txt \
              cmake/CFeatureCheck.cmake \
-             cmake/OpusBuildtype.cmake \
-             cmake/OpusConfig.cmake \
-             cmake/OpusConfig.cmake.in \
-             cmake/OpusFunctions.cmake \
-             cmake/OpusPackageVersion.cmake \
-             cmake/OpusSources.cmake \
+             cmake/OacBuildtype.cmake \
+             cmake/OacConfig.cmake \
+             cmake/OacConfig.cmake.in \
+             cmake/OacFunctions.cmake \
+             cmake/OacPackageVersion.cmake \
+             cmake/OacSources.cmake \
              cmake/README.md \
              cmake/RunTest.cmake \
              cmake/config.h.cmake.in \
@@ -386,17 +386,17 @@ EXTRA_DIST = opus.pc.in \
              celt/arm/celt_pitch_xcorr_arm.s
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = opus.pc
+pkgconfig_DATA = oac.pc
 
 m4datadir = $(datadir)/aclocal
-m4data_DATA = opus.m4
+m4data_DATA = oac.m4
 
 # Targets to build and install just the library without the docs
-opus check-opus install-opus: export NO_DOXYGEN = 1
+oac check-oac install-oac: export NO_DOXYGEN = 1
 
-opus: all
-check-opus: check
-install-opus: install
+oac: all
+check-oac: check
+install-oac: install
 
 
 # Or just the docs
@@ -457,7 +457,7 @@ dist-hook:
 	echo 'PACKAGE_VERSION="$(PACKAGE_VERSION)"' > $(top_distdir)/package_version
 
 
-.PHONY: opus check-opus install-opus docs install-docs
+.PHONY: oac check-oac install-oac docs install-docs
 
 # automake doesn't do dependency tracking for asm files, that I can tell
 $(CELT_SOURCES_ARM_ASM:%.s=%-gnu.S): celt/arm/armopts-gnu.S
@@ -478,13 +478,13 @@ OPT_UNIT_TEST_OBJ = $(celt_tests_test_unit_mathops_SOURCES:.c=.o) \
 
 if HAVE_SSE
 SSE_OBJ = $(CELT_SOURCES_SSE:.c=.lo)
-$(SSE_OBJ): CFLAGS += $(OPUS_X86_SSE_CFLAGS)
+$(SSE_OBJ): CFLAGS += $(OAC_X86_SSE_CFLAGS)
 endif
 
 if HAVE_SSE2
 SSE2_OBJ = $(CELT_SOURCES_SSE2:.c=.lo) \
            $(DNN_SOURCES_SSE2:.c=.lo)
-$(SSE2_OBJ): CFLAGS += $(OPUS_X86_SSE2_CFLAGS)
+$(SSE2_OBJ): CFLAGS += $(OAC_X86_SSE2_CFLAGS)
 endif
 
 if HAVE_SSE4_1
@@ -492,7 +492,7 @@ SSE4_1_OBJ = $(CELT_SOURCES_SSE4_1:.c=.lo) \
              $(DNN_SOURCES_SSE4_1:.c=.lo) \
              $(SILK_SOURCES_SSE4_1:.c=.lo) \
              $(SILK_SOURCES_FIXED_SSE4_1:.c=.lo)
-$(SSE4_1_OBJ): CFLAGS += $(OPUS_X86_SSE4_1_CFLAGS)
+$(SSE4_1_OBJ): CFLAGS += $(OAC_X86_SSE4_1_CFLAGS)
 endif
 
 if HAVE_AVX2
@@ -500,7 +500,7 @@ AVX2_OBJ = $(CELT_SOURCES_AVX2:.c=.lo) \
            $(SILK_SOURCES_AVX2:.c=.lo) \
            $(SILK_SOURCES_FLOAT_AVX2:.c=.lo) \
            $(DNN_SOURCES_AVX2:.c=.lo)
-$(AVX2_OBJ): CFLAGS += $(OPUS_X86_AVX2_CFLAGS)
+$(AVX2_OBJ): CFLAGS += $(OAC_X86_AVX2_CFLAGS)
 endif
 
 if HAVE_ARM_NEON_INTR
@@ -509,7 +509,7 @@ ARM_NEON_INTR_OBJ = $(CELT_SOURCES_ARM_NEON_INTR:.c=.lo) \
                     $(DNN_SOURCES_NEON:.c=.lo) \
                     $(SILK_SOURCES_FIXED_ARM_NEON_INTR:.c=.lo)
 $(ARM_NEON_INTR_OBJ): CFLAGS += \
- $(OPUS_ARM_NEON_INTR_CFLAGS)  $(NE10_CFLAGS)
+ $(OAC_ARM_NEON_INTR_CFLAGS)  $(NE10_CFLAGS)
 endif
 
 if HAVE_ARM_DOTPROD
diff --git a/Makefile.unix b/Makefile.unix
index 0242992d2..87b8e2a43 100644
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -20,13 +20,13 @@ CFLAGS := -DUSE_ALLOCA $(CFLAGS)
 
 include silk_sources.mk
 include celt_sources.mk
-include opus_sources.mk
+include oac_sources.mk
 
 ifdef FIXED_POINT
 SILK_SOURCES += $(SILK_SOURCES_FIXED)
 else
 SILK_SOURCES += $(SILK_SOURCES_FLOAT)
-OPUS_SOURCES += $(OPUS_SOURCES_FLOAT)
+OAC_SOURCES += $(OAC_SOURCES_FLOAT)
 endif
 
 EXESUFFIX =
@@ -45,7 +45,7 @@ ldflags-from-ldlibdirs  = $(addprefix -L,$(1))
 ldlibs-from-libs        = $(addprefix -l,$(1))
 
 WARNINGS = -Wall -W -Wstrict-prototypes -Wextra -Wcast-align -Wnested-externs -Wshadow
-CFLAGS  += -O2 -g $(WARNINGS) -DOPUS_BUILD
+CFLAGS  += -O2 -g $(WARNINGS) -DOAC_BUILD
 CINCLUDES = include silk celt
 
 ifdef FIXED_POINT
@@ -81,38 +81,38 @@ ARCHIVE.cmdline     = $(AR) $(ARFLAGS) $@ $^ && $(RANLIB) $@
 
 
 # Variable definitions
-LIB_NAME = opus
+LIB_NAME = oac
 TARGET = $(LIBPREFIX)$(LIB_NAME)$(LIBSUFFIX)
 
-SRCS_C = $(SILK_SOURCES) $(CELT_SOURCES) $(OPUS_SOURCES)
+SRCS_C = $(SILK_SOURCES) $(CELT_SOURCES) $(OAC_SOURCES)
 
 OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(SRCS_C))
 
-OPUSDEMO_SRCS_C = src/opus_demo.c
-OPUSDEMO_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(OPUSDEMO_SRCS_C))
+OACDEMO_SRCS_C = src/oac_demo.c
+OACDEMO_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(OACDEMO_SRCS_C))
 
-TESTOPUSAPI_SRCS_C = tests/test_opus_api.c
-TESTOPUSAPI_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(TESTOPUSAPI_SRCS_C))
+TESTOACAPI_SRCS_C = tests/test_oac_api.c
+TESTOACAPI_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(TESTOACAPI_SRCS_C))
 
-TESTOPUSDECODE_SRCS_C = tests/test_opus_decode.c
-TESTOPUSDECODE_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(TESTOPUSDECODE_SRCS_C))
+TESTOACDECODE_SRCS_C = tests/test_oac_decode.c
+TESTOACDECODE_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(TESTOACDECODE_SRCS_C))
 
-TESTOPUSENCODE_SRCS_C = tests/test_opus_encode.c tests/opus_encode_regressions.c
-TESTOPUSENCODE_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(TESTOPUSENCODE_SRCS_C))
+TESTOACENCODE_SRCS_C = tests/test_oac_encode.c tests/oac_encode_regressions.c
+TESTOACENCODE_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(TESTOACENCODE_SRCS_C))
 
-TESTOPUSEXTENSIONS_SRCS_C = tests/test_opus_extensions.c
-TESTOPUSEXTENSIONS_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(TESTOPUSEXTENSIONS_SRCS_C))
+TESTOACEXTENSIONS_SRCS_C = tests/test_oac_extensions.c
+TESTOACEXTENSIONS_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(TESTOACEXTENSIONS_SRCS_C))
 
-TESTOPUSPADDING_SRCS_C = tests/test_opus_padding.c
-TESTOPUSPADDING_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(TESTOPUSPADDING_SRCS_C))
+TESTOACPADDING_SRCS_C = tests/test_oac_padding.c
+TESTOACPADDING_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(TESTOACPADDING_SRCS_C))
 
-OPUSCOMPARE_SRCS_C = src/opus_compare.c
-OPUSCOMPARE_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(OPUSCOMPARE_SRCS_C))
+OACCOMPARE_SRCS_C = src/oac_compare.c
+OACCOMPARE_OBJS := $(patsubst %.c,%$(OBJSUFFIX),$(OACCOMPARE_SRCS_C))
 
-TESTS := test_opus_api test_opus_decode test_opus_encode test_opus_extensions test_opus_padding
+TESTS := test_oac_api test_oac_decode test_oac_encode test_oac_extensions test_oac_padding
 
 # Rules
-all: lib opus_demo opus_compare $(TESTS)
+all: lib oac_demo oac_compare $(TESTS)
 
 lib: $(TARGET)
 
@@ -122,25 +122,25 @@ check: all
 $(TARGET): $(OBJS)
 	$(ARCHIVE.cmdline)
 
-opus_demo$(EXESUFFIX): $(OPUSDEMO_OBJS) $(TARGET)
+oac_demo$(EXESUFFIX): $(OACDEMO_OBJS) $(TARGET)
 	$(LINK.o.cmdline)
 
-test_opus_api$(EXESUFFIX): $(TESTOPUSAPI_OBJS) $(TARGET)
+test_oac_api$(EXESUFFIX): $(TESTOACAPI_OBJS) $(TARGET)
 	$(LINK.o.cmdline)
 
-test_opus_decode$(EXESUFFIX): $(TESTOPUSDECODE_OBJS) $(TARGET)
+test_oac_decode$(EXESUFFIX): $(TESTOACDECODE_OBJS) $(TARGET)
 	$(LINK.o.cmdline)
 
-test_opus_encode$(EXESUFFIX): $(TESTOPUSENCODE_OBJS) $(TARGET)
+test_oac_encode$(EXESUFFIX): $(TESTOACENCODE_OBJS) $(TARGET)
 	$(LINK.o.cmdline)
 
-test_opus_extensions$(EXESUFFIX): $(TESTOPUSEXTENSIONS_OBJS) $(TARGET)
+test_oac_extensions$(EXESUFFIX): $(TESTOACEXTENSIONS_OBJS) $(TARGET)
 	$(LINK.o.cmdline)
 
-test_opus_padding$(EXESUFFIX): $(TESTOPUSPADDING_OBJS) $(TARGET)
+test_oac_padding$(EXESUFFIX): $(TESTOACPADDING_OBJS) $(TARGET)
 	$(LINK.o.cmdline)
 
-opus_compare$(EXESUFFIX): $(OPUSCOMPARE_OBJS)
+oac_compare$(EXESUFFIX): $(OACCOMPARE_OBJS)
 	$(LINK.o.cmdline)
 
 celt/celt.o: CFLAGS += -DPACKAGE_VERSION='$(PACKAGE_VERSION)'
@@ -156,12 +156,12 @@ package_version: force
 force:
 
 clean:
-	rm -f opus_demo$(EXESUFFIX) opus_compare$(EXESUFFIX) $(TARGET) \
-                test_opus_api$(EXESUFFIX) test_opus_decode$(EXESUFFIX) \
-                test_opus_encode$(EXESUFFIX) test_opus_extensions$(EXESUFFIX) \
-                test_opus_padding$(EXESUFFIX) \
-		$(OBJS) $(OPUSDEMO_OBJS) $(OPUSCOMPARE_OBJS) $(TESTOPUSAPI_OBJS) \
-                $(TESTOPUSDECODE_OBJS) $(TESTOPUSENCODE_OBJS) \
-                $(TESTOPUSEXTENSIONS_OBJS) $(TESTOPUSPADDING_OBJS)
+	rm -f oac_demo$(EXESUFFIX) oac_compare$(EXESUFFIX) $(TARGET) \
+                test_oac_api$(EXESUFFIX) test_oac_decode$(EXESUFFIX) \
+                test_oac_encode$(EXESUFFIX) test_oac_extensions$(EXESUFFIX) \
+                test_oac_padding$(EXESUFFIX) \
+		$(OBJS) $(OACDEMO_OBJS) $(OACCOMPARE_OBJS) $(TESTOACAPI_OBJS) \
+                $(TESTOACDECODE_OBJS) $(TESTOACENCODE_OBJS) \
+                $(TESTOACEXTENSIONS_OBJS) $(TESTOACPADDING_OBJS)
 
 .PHONY: all lib clean force check
diff --git a/README.draft b/README.draft
deleted file mode 100644
index 9c31bd023..000000000
--- a/README.draft
+++ /dev/null
@@ -1,54 +0,0 @@
-To build this source code, simply type:
-
-% make
-
-If this does not work, or if you want to change the default configuration
-(e.g., to compile for a fixed-point architecture), simply edit the options
-in the Makefile.
-
-An up-to-date implementation conforming to this standard is available in a
-Git repository at https://gitlab.xiph.org/xiph/opus.git or on a website at:
-https://opus-codec.org/
-However, although that implementation is expected to remain conformant
-with the standard, it is the code in this RFC that shall remain normative.
-To build from the git repository instead of using this RFC, follow these
-steps:
-
-1) Clone the repository (latest implementation of this standard at the time
-of publication)
-
-% git clone https://gitlab.xiph.org/xiph/opus.git
-% cd opus
-
-2) Compile
-
-% ./autogen.sh
-% ./configure
-% make
-
-Once you have compiled the codec, there will be a opus_demo executable in
-the top directory.
-
-Usage: opus_demo [-e] <application> <sampling rate (Hz)> <channels (1/2)>
-         <bits per second> [options] <input> <output>
-       opus_demo -d <sampling rate (Hz)> <channels (1/2)> [options]
-         <input> <output>
-
-mode: voip | audio | restricted-lowdelay
-options:
--e                   : only runs the encoder (output the bit-stream)
--d                   : only runs the decoder (reads the bit-stream as input)
--cbr                 : enable constant bitrate; default: variable bitrate
--cvbr                : enable constrained variable bitrate; default: unconstrained
--bandwidth <NB|MB|WB|SWB|FB> : audio bandwidth (from narrowband to fullband);
-                               default: sampling rate
--framesize <2.5|5|10|20|40|60> : frame size in ms; default: 20
--max_payload <bytes> : maximum payload size in bytes, default: 1024
--complexity <comp>   : complexity, 0 (lowest) ... 10 (highest); default: 10
--inbandfec           : enable SILK inband FEC
--forcemono           : force mono encoding, even for stereo input
--dtx                 : enable SILK DTX
--loss <perc>         : simulate packet loss, in percent (0-100); default: 0
-
-input and output are little endian signed 16-bit PCM files or opus bitstreams
-with simple opus_demo proprietary framing.
diff --git a/celt/_kiss_fft_guts.h b/celt/_kiss_fft_guts.h
index fa1e37fe2..e85a69c8b 100644
--- a/celt/_kiss_fft_guts.h
+++ b/celt/_kiss_fft_guts.h
@@ -90,11 +90,11 @@
     do {(res).r = ADD32_ovflw((res).r,(a).r);  (res).i = SUB32_ovflw((res).i,(a).i); \
     }while(0)
 
-#if defined(OPUS_ARM_INLINE_ASM)
+#if defined(OAC_ARM_INLINE_ASM)
 #include "arm/kiss_fft_armv4.h"
 #endif
 
-#if defined(OPUS_ARM_INLINE_EDSP)
+#if defined(OAC_ARM_INLINE_EDSP)
 #include "arm/kiss_fft_armv5e.h"
 #endif
 #if defined(__mips)
diff --git a/celt/arch.h b/celt/arch.h
index b88648beb..06730f9e1 100644
--- a/celt/arch.h
+++ b/celt/arch.h
@@ -34,8 +34,8 @@
 #ifndef ARCH_H
 #define ARCH_H
 
-#include "opus_types.h"
-#include "opus_defines.h"
+#include "oac_types.h"
+#include "oac_defines.h"
 
 # if !defined(__GNUC_PREREQ)
 #  if defined(__GNUC__)&&defined(__GNUC_MINOR__)
@@ -46,12 +46,12 @@
 #  endif
 # endif
 
-#if OPUS_GNUC_PREREQ(3, 0)
-#define opus_likely(x)       (__builtin_expect(!!(x), 1))
-#define opus_unlikely(x)     (__builtin_expect(!!(x), 0))
+#if OAC_GNUC_PREREQ(3, 0)
+#define oac_likely(x)       (__builtin_expect(!!(x), 1))
+#define oac_unlikely(x)     (__builtin_expect(!!(x), 0))
 #else
-#define opus_likely(x)       (!!(x))
-#define opus_unlikely(x)     (!!(x))
+#define oac_likely(x)       (!!(x))
+#define oac_unlikely(x)     (!!(x))
 #endif
 
 #define CELT_SIG_SCALE 32768.f
@@ -82,11 +82,11 @@ void celt_fatal(const char *str, const char *file, int line)
 
 #define celt_assert(cond) {if (!(cond)) {CELT_FATAL("assertion failed: " #cond);}}
 #define celt_assert2(cond, message) {if (!(cond)) {CELT_FATAL("assertion failed: " #cond "\n" message);}}
-#define MUST_SUCCEED(call) celt_assert((call) == OPUS_OK)
+#define MUST_SUCCEED(call) celt_assert((call) == OAC_OK)
 #else
 #define celt_assert(cond) ((void)(cond))
 #define celt_assert2(cond, message) ((void)(cond))
-#define MUST_SUCCEED(call) do {if((call) != OPUS_OK) {RESTORE_STACK; return OPUS_INTERNAL_ERROR;} } while (0)
+#define MUST_SUCCEED(call) do {if((call) != OAC_OK) {RESTORE_STACK; return OAC_INTERNAL_ERROR;} } while (0)
 #endif
 
 #if defined(ENABLE_ASSERTIONS)
@@ -113,18 +113,18 @@ void celt_fatal(const char *str, const char *file, int line)
 /* Throughout the code, we use the following scaling for signals:
    FLOAT: used for float API, normalized to +/-1.
    INT16: used for 16-bit API, normalized to +/- 32768
-   RES: internal Opus resolution, defined as +/-1. in float builds, or either 16-bit or 24-bit int for fixed-point builds
+   RES: internal Oac resolution, defined as +/-1. in float builds, or either 16-bit or 24-bit int for fixed-point builds
    SIG: internal CELT resolution: defined as +/- 32768. in float builds, or Q27 in fixed-point builds (int16 shifted by 12)
 */
 
 
-/* Set this if opus_int64 is a native type of the CPU. */
+/* Set this if oac_int64 is a native type of the CPU. */
 /* Assume that all LP64 architectures have fast 64-bit types; also x86_64
    (which can be ILP32 for x32) and Win64 (which is LLP64). */
 #if defined(__x86_64__) || defined(__LP64__) || defined(_WIN64) || defined (__mips)
-#define OPUS_FAST_INT64 1
+#define OAC_FAST_INT64 1
 #else
-#define OPUS_FAST_INT64 0
+#define OAC_FAST_INT64 0
 #endif
 
 #ifdef FIXED_POINT
@@ -137,16 +137,16 @@ void celt_fatal(const char *str, const char *file, int line)
 
 #ifdef FIXED_POINT
 
-typedef opus_int16 opus_val16;
-typedef opus_int32 opus_val32;
-typedef opus_int64 opus_val64;
+typedef oac_int16 oac_val16;
+typedef oac_int32 oac_val32;
+typedef oac_int64 oac_val64;
 
-typedef opus_val32 celt_sig;
-typedef opus_val32 celt_norm;
-typedef opus_val32 celt_ener;
-typedef opus_val32 celt_glog;
+typedef oac_val32 celt_sig;
+typedef oac_val32 celt_norm;
+typedef oac_val32 celt_ener;
+typedef oac_val32 celt_glog;
 
-typedef opus_val32 opus_res;
+typedef oac_val32 oac_res;
 #define RES_SHIFT 8
 #define SIG2RES(a)      PSHR32(a, SIG_SHIFT-RES_SHIFT)
 #define RES2INT16(a)    SAT16(PSHR32(a, RES_SHIFT))
@@ -165,7 +165,7 @@ typedef opus_val32 opus_res;
 #define INT24TOSIG(a)   SHL32(a, SIG_SHIFT-8)
 
 #define NORM_SHIFT 24
-typedef opus_val32 celt_coef;
+typedef oac_val32 celt_coef;
 #define COEF_ONE Q31ONE
 #define MULT_COEF_32(a, b) MULT32_32_P31(a,b)
 #define MAC_COEF_32_ARM(c, a, b) ADD32((c), MULT32_32_Q32(a,b))
@@ -194,15 +194,15 @@ typedef opus_val32 celt_coef;
 
 #define EPSILON 1
 #define VERY_SMALL 0
-#define VERY_LARGE16 ((opus_val16)32767)
-#define Q15_ONE ((opus_val16)32767)
+#define VERY_LARGE16 ((oac_val16)32767)
+#define Q15_ONE ((oac_val16)32767)
 
 
 #define ABS16(x) ((x) < 0 ? (-(x)) : (x))
 #define ABS32(x) ((x) < 0 ? (-(x)) : (x))
 
-static OPUS_INLINE opus_int16 SAT16(opus_int32 x) {
-   return x > 32767 ? 32767 : x < -32768 ? -32768 : (opus_int16)x;
+static OAC_INLINE oac_int16 SAT16(oac_int32 x) {
+   return x > 32767 ? 32767 : x < -32768 ? -32768 : (oac_int16)x;
 }
 
 #ifdef FIXED_DEBUG
@@ -211,11 +211,11 @@ static OPUS_INLINE opus_int16 SAT16(opus_int32 x) {
 
 #include "fixed_generic.h"
 
-#ifdef OPUS_ARM_PRESUME_AARCH64_NEON_INTR
+#ifdef OAC_ARM_PRESUME_AARCH64_NEON_INTR
 #include "arm/fixed_arm64.h"
-#elif defined (OPUS_ARM_INLINE_EDSP)
+#elif defined (OAC_ARM_INLINE_EDSP)
 #include "arm/fixed_armv5e.h"
-#elif defined (OPUS_ARM_INLINE_ASM)
+#elif defined (OAC_ARM_INLINE_ASM)
 #include "arm/fixed_armv4.h"
 #elif defined (BFIN_ASM)
 #include "fixed_bfin.h"
@@ -229,30 +229,30 @@ static OPUS_INLINE opus_int16 SAT16(opus_int32 x) {
 
 #else /* FIXED_POINT */
 
-typedef float opus_val16;
-typedef float opus_val32;
-typedef float opus_val64;
+typedef float oac_val16;
+typedef float oac_val32;
+typedef float oac_val64;
 
 typedef float celt_sig;
 typedef float celt_norm;
 typedef float celt_ener;
 typedef float celt_glog;
 
-typedef float opus_res;
+typedef float oac_res;
 typedef float celt_coef;
 
 #ifdef FLOAT_APPROX
 /* This code should reliably detect NaN/inf even when -ffast-math is used.
    Assumes IEEE 754 format. */
-static OPUS_INLINE int celt_isnan(float x)
+static OAC_INLINE int celt_isnan(float x)
 {
-   union {float f; opus_uint32 i;} in;
+   union {float f; oac_uint32 i;} in;
    in.f = x;
    return ((in.i>>23)&0xFF)==0xFF && (in.i&0x007FFFFF)!=0;
 }
 #else
 #ifdef __FAST_MATH__
-#error Cannot build libopus with -ffast-math unless FLOAT_APPROX is defined. This could result in crashes on extreme (e.g. NaN) input
+#error Cannot build liboac with -ffast-math unless FLOAT_APPROX is defined. This could result in crashes on extreme (e.g. NaN) input
 #endif
 #define celt_isnan(x) ((x)!=(x))
 #endif
@@ -267,7 +267,7 @@ static OPUS_INLINE int celt_isnan(float x)
 #define EPSILON 1e-15f
 #define VERY_SMALL 1e-30f
 #define VERY_LARGE16 1e15f
-#define Q15_ONE ((opus_val16)1.f)
+#define Q15_ONE ((oac_val16)1.f)
 
 /* This appears to be the same speed as C99's fabsf() but it's more portable. */
 #define ABS16(x) ((float)fabs(x))
@@ -312,8 +312,8 @@ static OPUS_INLINE int celt_isnan(float x)
 #define PSHR32_ovflw(a,shift) (a)
 
 #define MULT16_16_16(a,b)     ((a)*(b))
-#define MULT16_16(a,b)     ((opus_val32)(a)*(opus_val32)(b))
-#define MAC16_16(c,a,b)     ((c)+(opus_val32)(a)*(opus_val32)(b))
+#define MULT16_16(a,b)     ((oac_val32)(a)*(oac_val32)(b))
+#define MAC16_16(c,a,b)     ((c)+(oac_val32)(a)*(oac_val32)(b))
 
 #define MULT16_32_Q15(a,b)     ((a)*(b))
 #define MULT16_32_Q16(a,b)     ((a)*(b))
@@ -341,8 +341,8 @@ static OPUS_INLINE int celt_isnan(float x)
 #define MULT_COEF(a, b)   ((a)*(b))
 #define MULT_COEF_TAPS(a, b)   ((a)*(b))
 
-#define DIV32_16(a,b)     (((opus_val32)(a))/(opus_val16)(b))
-#define DIV32(a,b)     (((opus_val32)(a))/(opus_val32)(b))
+#define DIV32_16(a,b)     (((oac_val32)(a))/(oac_val16)(b))
+#define DIV32(a,b)     (((oac_val32)(a))/(oac_val32)(b))
 
 #define SIG2RES(a)      ((1/CELT_SIG_SCALE)*(a))
 #define RES2INT16(a)    FLOAT2INT16(a)
diff --git a/celt/arm/arm_celt_map.c b/celt/arm/arm_celt_map.c
index 931c011dd..52a3b48bf 100644
--- a/celt/arm/arm_celt_map.c
+++ b/celt/arm/arm_celt_map.c
@@ -35,11 +35,11 @@
 #include "mdct.h"
 #include "pitch.h"
 
-#if defined(OPUS_HAVE_RTCD)
+#if defined(OAC_HAVE_RTCD)
 
 # if !defined(DISABLE_FLOAT_API)
-#  if defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && !defined(OPUS_ARM_PRESUME_NEON_INTR)
-void (*const CELT_FLOAT2INT16_IMPL[OPUS_ARCHMASK+1])(const float * OPUS_RESTRICT in, short * OPUS_RESTRICT out, int cnt) = {
+#  if defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR)
+void (*const CELT_FLOAT2INT16_IMPL[OAC_ARCHMASK+1])(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt) = {
   celt_float2int16_c,   /* ARMv4 */
   celt_float2int16_c,   /* EDSP */
   celt_float2int16_c,   /* Media */
@@ -47,18 +47,18 @@ void (*const CELT_FLOAT2INT16_IMPL[OPUS_ARCHMASK+1])(const float * OPUS_RESTRICT
   celt_float2int16_neon /* DOTPROD */
 };
 
-int (*const OPUS_LIMIT2_CHECKWITHIN1_IMPL[OPUS_ARCHMASK+1])(float * samples, int cnt) = {
-  opus_limit2_checkwithin1_c,   /* ARMv4 */
-  opus_limit2_checkwithin1_c,   /* EDSP */
-  opus_limit2_checkwithin1_c,   /* Media */
-  opus_limit2_checkwithin1_neon,/* NEON */
-  opus_limit2_checkwithin1_neon /* DOTPROD */
+int (*const OAC_LIMIT2_CHECKWITHIN1_IMPL[OAC_ARCHMASK+1])(float * samples, int cnt) = {
+  oac_limit2_checkwithin1_c,   /* ARMv4 */
+  oac_limit2_checkwithin1_c,   /* EDSP */
+  oac_limit2_checkwithin1_c,   /* Media */
+  oac_limit2_checkwithin1_neon,/* NEON */
+  oac_limit2_checkwithin1_neon /* DOTPROD */
 };
 #  endif
 # endif
 
-# if defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && !defined(OPUS_ARM_PRESUME_NEON_INTR)
-opus_val32 (*const CELT_INNER_PROD_IMPL[OPUS_ARCHMASK+1])(const opus_val16 *x, const opus_val16 *y, int N) = {
+# if defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR)
+oac_val32 (*const CELT_INNER_PROD_IMPL[OAC_ARCHMASK+1])(const oac_val16 *x, const oac_val16 *y, int N) = {
   celt_inner_prod_c,   /* ARMv4 */
   celt_inner_prod_c,   /* EDSP */
   celt_inner_prod_c,   /* Media */
@@ -66,8 +66,8 @@ opus_val32 (*const CELT_INNER_PROD_IMPL[OPUS_ARCHMASK+1])(const opus_val16 *x, c
   celt_inner_prod_neon /* DOTPROD */
 };
 
-void (*const DUAL_INNER_PROD_IMPL[OPUS_ARCHMASK+1])(const opus_val16 *x, const opus_val16 *y01, const opus_val16 *y02,
-      int N, opus_val32 *xy1, opus_val32 *xy2) = {
+void (*const DUAL_INNER_PROD_IMPL[OAC_ARCHMASK+1])(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
+      int N, oac_val32 *xy1, oac_val32 *xy2) = {
   dual_inner_prod_c,   /* ARMv4 */
   dual_inner_prod_c,   /* EDSP */
   dual_inner_prod_c,   /* Media */
@@ -77,11 +77,11 @@ void (*const DUAL_INNER_PROD_IMPL[OPUS_ARCHMASK+1])(const opus_val16 *x, const o
 # endif
 
 # if defined(FIXED_POINT)
-#  if ((defined(OPUS_ARM_MAY_HAVE_NEON) && !defined(OPUS_ARM_PRESUME_NEON)) || \
-    (defined(OPUS_ARM_MAY_HAVE_MEDIA) && !defined(OPUS_ARM_PRESUME_MEDIA)) || \
-    (defined(OPUS_ARM_MAY_HAVE_EDSP) && !defined(OPUS_ARM_PRESUME_EDSP)))
-opus_val32 (*const CELT_PITCH_XCORR_IMPL[OPUS_ARCHMASK+1])(const opus_val16 *,
-    const opus_val16 *, opus_val32 *, int, int, int) = {
+#  if ((defined(OAC_ARM_MAY_HAVE_NEON) && !defined(OAC_ARM_PRESUME_NEON)) || \
+    (defined(OAC_ARM_MAY_HAVE_MEDIA) && !defined(OAC_ARM_PRESUME_MEDIA)) || \
+    (defined(OAC_ARM_MAY_HAVE_EDSP) && !defined(OAC_ARM_PRESUME_EDSP)))
+oac_val32 (*const CELT_PITCH_XCORR_IMPL[OAC_ARCHMASK+1])(const oac_val16 *,
+    const oac_val16 *, oac_val32 *, int, int, int) = {
   celt_pitch_xcorr_c,               /* ARMv4 */
   MAY_HAVE_EDSP(celt_pitch_xcorr),  /* EDSP */
   MAY_HAVE_MEDIA(celt_pitch_xcorr), /* Media */
@@ -91,9 +91,9 @@ opus_val32 (*const CELT_PITCH_XCORR_IMPL[OPUS_ARCHMASK+1])(const opus_val16 *,
 
 #  endif
 # else /* !FIXED_POINT */
-#  if defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && !defined(OPUS_ARM_PRESUME_NEON_INTR)
-void (*const CELT_PITCH_XCORR_IMPL[OPUS_ARCHMASK+1])(const opus_val16 *,
-    const opus_val16 *, opus_val32 *, int, int, int) = {
+#  if defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR)
+void (*const CELT_PITCH_XCORR_IMPL[OAC_ARCHMASK+1])(const oac_val16 *,
+    const oac_val16 *, oac_val32 *, int, int, int) = {
   celt_pitch_xcorr_c,              /* ARMv4 */
   celt_pitch_xcorr_c,              /* EDSP */
   celt_pitch_xcorr_c,              /* Media */
@@ -103,13 +103,13 @@ void (*const CELT_PITCH_XCORR_IMPL[OPUS_ARCHMASK+1])(const opus_val16 *,
 #  endif
 # endif /* FIXED_POINT */
 
-#if defined(FIXED_POINT) && defined(OPUS_HAVE_RTCD) && \
- defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && !defined(OPUS_ARM_PRESUME_NEON_INTR)
+#if defined(FIXED_POINT) && defined(OAC_HAVE_RTCD) && \
+ defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR)
 
-void (*const XCORR_KERNEL_IMPL[OPUS_ARCHMASK + 1])(
-         const opus_val16 *x,
-         const opus_val16 *y,
-         opus_val32       sum[4],
+void (*const XCORR_KERNEL_IMPL[OAC_ARCHMASK + 1])(
+         const oac_val16 *x,
+         const oac_val16 *y,
+         oac_val32       sum[4],
          int              len
 ) = {
   xcorr_kernel_c,                /* ARMv4 */
@@ -121,50 +121,50 @@ void (*const XCORR_KERNEL_IMPL[OPUS_ARCHMASK + 1])(
 
 #endif
 
-# if defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+# if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 #  if defined(HAVE_ARM_NE10)
 #   if defined(CUSTOM_MODES)
-int (*const OPUS_FFT_ALLOC_ARCH_IMPL[OPUS_ARCHMASK+1])(kiss_fft_state *st) = {
-   opus_fft_alloc_arch_c,        /* ARMv4 */
-   opus_fft_alloc_arch_c,        /* EDSP */
-   opus_fft_alloc_arch_c,        /* Media */
-   opus_fft_alloc_arm_neon,      /* Neon with NE10 library support */
-   opus_fft_alloc_arm_neon       /* DOTPROD with NE10 library support */
+int (*const OAC_FFT_ALLOC_ARCH_IMPL[OAC_ARCHMASK+1])(kiss_fft_state *st) = {
+   oac_fft_alloc_arch_c,        /* ARMv4 */
+   oac_fft_alloc_arch_c,        /* EDSP */
+   oac_fft_alloc_arch_c,        /* Media */
+   oac_fft_alloc_arm_neon,      /* Neon with NE10 library support */
+   oac_fft_alloc_arm_neon       /* DOTPROD with NE10 library support */
 };
 
-void (*const OPUS_FFT_FREE_ARCH_IMPL[OPUS_ARCHMASK+1])(kiss_fft_state *st) = {
-   opus_fft_free_arch_c,         /* ARMv4 */
-   opus_fft_free_arch_c,         /* EDSP */
-   opus_fft_free_arch_c,         /* Media */
-   opus_fft_free_arm_neon,       /* Neon with NE10 */
-   opus_fft_free_arm_neon        /* DOTPROD with NE10 */
+void (*const OAC_FFT_FREE_ARCH_IMPL[OAC_ARCHMASK+1])(kiss_fft_state *st) = {
+   oac_fft_free_arch_c,         /* ARMv4 */
+   oac_fft_free_arch_c,         /* EDSP */
+   oac_fft_free_arch_c,         /* Media */
+   oac_fft_free_arm_neon,       /* Neon with NE10 */
+   oac_fft_free_arm_neon        /* DOTPROD with NE10 */
 };
 #   endif /* CUSTOM_MODES */
 
-void (*const OPUS_FFT[OPUS_ARCHMASK+1])(const kiss_fft_state *cfg,
+void (*const OAC_FFT[OAC_ARCHMASK+1])(const kiss_fft_state *cfg,
                                         const kiss_fft_cpx *fin,
                                         kiss_fft_cpx *fout) = {
-   opus_fft_c,                   /* ARMv4 */
-   opus_fft_c,                   /* EDSP */
-   opus_fft_c,                   /* Media */
-   opus_fft_neon,                /* Neon with NE10 */
-   opus_fft_neon                 /* DOTPROD with NE10 */
+   oac_fft_c,                   /* ARMv4 */
+   oac_fft_c,                   /* EDSP */
+   oac_fft_c,                   /* Media */
+   oac_fft_neon,                /* Neon with NE10 */
+   oac_fft_neon                 /* DOTPROD with NE10 */
 };
 
-void (*const OPUS_IFFT[OPUS_ARCHMASK+1])(const kiss_fft_state *cfg,
+void (*const OAC_IFFT[OAC_ARCHMASK+1])(const kiss_fft_state *cfg,
                                          const kiss_fft_cpx *fin,
                                          kiss_fft_cpx *fout) = {
-   opus_ifft_c,                   /* ARMv4 */
-   opus_ifft_c,                   /* EDSP */
-   opus_ifft_c,                   /* Media */
-   opus_ifft_neon,                /* Neon with NE10 */
-   opus_ifft_neon                 /* DOTPROD with NE10 */
+   oac_ifft_c,                   /* ARMv4 */
+   oac_ifft_c,                   /* EDSP */
+   oac_ifft_c,                   /* Media */
+   oac_ifft_neon,                /* Neon with NE10 */
+   oac_ifft_neon                 /* DOTPROD with NE10 */
 };
 
-void (*const CLT_MDCT_FORWARD_IMPL[OPUS_ARCHMASK+1])(const mdct_lookup *l,
+void (*const CLT_MDCT_FORWARD_IMPL[OAC_ARCHMASK+1])(const mdct_lookup *l,
                                                      kiss_fft_scalar *in,
-                                                     kiss_fft_scalar * OPUS_RESTRICT out,
-                                                     const opus_val16 *window,
+                                                     kiss_fft_scalar * OAC_RESTRICT out,
+                                                     const oac_val16 *window,
                                                      int overlap, int shift,
                                                      int stride, int arch) = {
    clt_mdct_forward_c,           /* ARMv4 */
@@ -174,10 +174,10 @@ void (*const CLT_MDCT_FORWARD_IMPL[OPUS_ARCHMASK+1])(const mdct_lookup *l,
    clt_mdct_forward_neon         /* DOTPROD with NE10 */
 };
 
-void (*const CLT_MDCT_BACKWARD_IMPL[OPUS_ARCHMASK+1])(const mdct_lookup *l,
+void (*const CLT_MDCT_BACKWARD_IMPL[OAC_ARCHMASK+1])(const mdct_lookup *l,
                                                       kiss_fft_scalar *in,
-                                                      kiss_fft_scalar * OPUS_RESTRICT out,
-                                                      const opus_val16 *window,
+                                                      kiss_fft_scalar * OAC_RESTRICT out,
+                                                      const oac_val16 *window,
                                                       int overlap, int shift,
                                                       int stride, int arch) = {
    clt_mdct_backward_c,           /* ARMv4 */
@@ -188,6 +188,6 @@ void (*const CLT_MDCT_BACKWARD_IMPL[OPUS_ARCHMASK+1])(const mdct_lookup *l,
 };
 
 #  endif /* HAVE_ARM_NE10 */
-# endif /* OPUS_ARM_MAY_HAVE_NEON_INTR */
+# endif /* OAC_ARM_MAY_HAVE_NEON_INTR */
 
-#endif /* OPUS_HAVE_RTCD */
+#endif /* OAC_HAVE_RTCD */
diff --git a/celt/arm/armcpu.c b/celt/arm/armcpu.c
index f03408c10..4d486371e 100644
--- a/celt/arm/armcpu.c
+++ b/celt/arm/armcpu.c
@@ -25,25 +25,25 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-/* Original code from libtheora modified to suit to Opus */
+/* Original code from libtheora modified to suit to Oac */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#ifdef OPUS_HAVE_RTCD
+#ifdef OAC_HAVE_RTCD
 
 #include "armcpu.h"
 #include "cpu_support.h"
 #include "os_support.h"
-#include "opus_types.h"
+#include "oac_types.h"
 #include "arch.h"
 
-#define OPUS_CPU_ARM_V4_FLAG    (1<<OPUS_ARCH_ARM_V4)
-#define OPUS_CPU_ARM_EDSP_FLAG  (1<<OPUS_ARCH_ARM_EDSP)
-#define OPUS_CPU_ARM_MEDIA_FLAG (1<<OPUS_ARCH_ARM_MEDIA)
-#define OPUS_CPU_ARM_NEON_FLAG  (1<<OPUS_ARCH_ARM_NEON)
-#define OPUS_CPU_ARM_DOTPROD_FLAG  (1<<OPUS_ARCH_ARM_DOTPROD)
+#define OAC_CPU_ARM_V4_FLAG    (1<<OAC_ARCH_ARM_V4)
+#define OAC_CPU_ARM_EDSP_FLAG  (1<<OAC_ARCH_ARM_EDSP)
+#define OAC_CPU_ARM_MEDIA_FLAG (1<<OAC_ARCH_ARM_MEDIA)
+#define OAC_CPU_ARM_NEON_FLAG  (1<<OAC_ARCH_ARM_NEON)
+#define OAC_CPU_ARM_DOTPROD_FLAG  (1<<OAC_ARCH_ARM_DOTPROD)
 
 #if defined(_MSC_VER)
 /*For GetExceptionCode() and EXCEPTION_ILLEGAL_INSTRUCTION.*/
@@ -51,37 +51,37 @@
 # define WIN32_EXTRA_LEAN
 # include <windows.h>
 
-static OPUS_INLINE opus_uint32 opus_cpu_capabilities(void){
-  opus_uint32 flags;
+static OAC_INLINE oac_uint32 oac_cpu_capabilities(void){
+  oac_uint32 flags;
   flags=0;
-  /* MSVC has no OPUS_INLINE __asm support for ARM, but it does let you __emit
+  /* MSVC has no OAC_INLINE __asm support for ARM, but it does let you __emit
    * instructions via their assembled hex code.
    * All of these instructions should be essentially nops. */
-# if defined(OPUS_ARM_MAY_HAVE_EDSP) || defined(OPUS_ARM_MAY_HAVE_MEDIA) \
- || defined(OPUS_ARM_MAY_HAVE_NEON) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+# if defined(OAC_ARM_MAY_HAVE_EDSP) || defined(OAC_ARM_MAY_HAVE_MEDIA) \
+ || defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
   __try{
     /*PLD [r13]*/
     __emit(0xF5DDF000);
-    flags|=OPUS_CPU_ARM_EDSP_FLAG;
+    flags|=OAC_CPU_ARM_EDSP_FLAG;
   }
   __except(GetExceptionCode()==EXCEPTION_ILLEGAL_INSTRUCTION){
     /*Ignore exception.*/
   }
-#  if defined(OPUS_ARM_MAY_HAVE_MEDIA) \
- || defined(OPUS_ARM_MAY_HAVE_NEON) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+#  if defined(OAC_ARM_MAY_HAVE_MEDIA) \
+ || defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
   __try{
     /*SHADD8 r3,r3,r3*/
     __emit(0xE6333F93);
-    flags|=OPUS_CPU_ARM_MEDIA_FLAG;
+    flags|=OAC_CPU_ARM_MEDIA_FLAG;
   }
   __except(GetExceptionCode()==EXCEPTION_ILLEGAL_INSTRUCTION){
     /*Ignore exception.*/
   }
-#   if defined(OPUS_ARM_MAY_HAVE_NEON) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+#   if defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
   __try{
     /*VORR q0,q0,q0*/
     __emit(0xF2200150);
-    flags|=OPUS_CPU_ARM_NEON_FLAG;
+    flags|=OAC_CPU_ARM_NEON_FLAG;
   }
   __except(GetExceptionCode()==EXCEPTION_ILLEGAL_INSTRUCTION){
     /*Ignore exception.*/
@@ -96,9 +96,9 @@ static OPUS_INLINE opus_uint32 opus_cpu_capabilities(void){
 /* Linux based */
 #include <stdio.h>
 
-static opus_uint32 opus_cpu_capabilities(void)
+static oac_uint32 oac_cpu_capabilities(void)
 {
-  opus_uint32 flags = 0;
+  oac_uint32 flags = 0;
   FILE *cpuinfo;
 
   /* Reading /proc/self/auxv would be easier, but that doesn't work reliably on
@@ -113,34 +113,34 @@ static opus_uint32 opus_cpu_capabilities(void)
 
     while(fgets(buf, 512, cpuinfo) != NULL)
     {
-# if defined(OPUS_ARM_MAY_HAVE_EDSP) || defined(OPUS_ARM_MAY_HAVE_MEDIA) \
- || defined(OPUS_ARM_MAY_HAVE_NEON) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+# if defined(OAC_ARM_MAY_HAVE_EDSP) || defined(OAC_ARM_MAY_HAVE_MEDIA) \
+ || defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
       /* Search for edsp and neon flag */
       if(memcmp(buf, "Features", 8) == 0)
       {
         char *p;
         p = strstr(buf, " edsp");
         if(p != NULL && (p[5] == ' ' || p[5] == '\n'))
-          flags |= OPUS_CPU_ARM_EDSP_FLAG;
+          flags |= OAC_CPU_ARM_EDSP_FLAG;
 
-#  if defined(OPUS_ARM_MAY_HAVE_NEON) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+#  if defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
         p = strstr(buf, " neon");
         if(p != NULL && (p[5] == ' ' || p[5] == '\n'))
-          flags |= OPUS_CPU_ARM_NEON_FLAG;
+          flags |= OAC_CPU_ARM_NEON_FLAG;
         p = strstr(buf, " asimd");
         if(p != NULL && (p[6] == ' ' || p[6] == '\n'))
-          flags |= OPUS_CPU_ARM_NEON_FLAG | OPUS_CPU_ARM_MEDIA_FLAG | OPUS_CPU_ARM_EDSP_FLAG;
+          flags |= OAC_CPU_ARM_NEON_FLAG | OAC_CPU_ARM_MEDIA_FLAG | OAC_CPU_ARM_EDSP_FLAG;
 #  endif
-#  if defined(OPUS_ARM_MAY_HAVE_DOTPROD)
+#  if defined(OAC_ARM_MAY_HAVE_DOTPROD)
         p = strstr(buf, " asimddp");
         if(p != NULL && (p[8] == ' ' || p[8] == '\n'))
-          flags |= OPUS_CPU_ARM_DOTPROD_FLAG;
+          flags |= OAC_CPU_ARM_DOTPROD_FLAG;
 #  endif
       }
 # endif
 
-# if defined(OPUS_ARM_MAY_HAVE_MEDIA) \
- || defined(OPUS_ARM_MAY_HAVE_NEON) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+# if defined(OAC_ARM_MAY_HAVE_MEDIA) \
+ || defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
       /* Search for media capabilities (>= ARMv6) */
       if(memcmp(buf, "CPU architecture:", 17) == 0)
       {
@@ -148,15 +148,15 @@ static opus_uint32 opus_cpu_capabilities(void)
         version = atoi(buf+17);
 
         if(version >= 6)
-          flags |= OPUS_CPU_ARM_MEDIA_FLAG;
+          flags |= OAC_CPU_ARM_MEDIA_FLAG;
       }
 # endif
     }
 
-#if defined(OPUS_ARM_PRESUME_AARCH64_NEON_INTR)
-    flags |= OPUS_CPU_ARM_EDSP_FLAG | OPUS_CPU_ARM_MEDIA_FLAG | OPUS_CPU_ARM_NEON_FLAG;
-# if defined(OPUS_ARM_PRESUME_DOTPROD)
-    flags |= OPUS_CPU_ARM_DOTPROD_FLAG;
+#if defined(OAC_ARM_PRESUME_AARCH64_NEON_INTR)
+    flags |= OAC_CPU_ARM_EDSP_FLAG | OAC_CPU_ARM_MEDIA_FLAG | OAC_CPU_ARM_NEON_FLAG;
+# if defined(OAC_ARM_PRESUME_DOTPROD)
+    flags |= OAC_CPU_ARM_DOTPROD_FLAG;
 # endif
 #endif
 
@@ -169,23 +169,23 @@ static opus_uint32 opus_cpu_capabilities(void)
 #include <sys/types.h>
 #include <sys/sysctl.h>
 
-static opus_uint32 opus_cpu_capabilities(void)
+static oac_uint32 oac_cpu_capabilities(void)
 {
-  opus_uint32 flags = 0;
+  oac_uint32 flags = 0;
 
-#if defined(OPUS_ARM_MAY_HAVE_DOTPROD)
+#if defined(OAC_ARM_MAY_HAVE_DOTPROD)
   size_t size = sizeof(uint32_t);
   uint32_t value = 0;
   if (!sysctlbyname("hw.optional.arm.FEAT_DotProd", &value, &size, NULL, 0) && value)
   {
-    flags |= OPUS_CPU_ARM_DOTPROD_FLAG;
+    flags |= OAC_CPU_ARM_DOTPROD_FLAG;
   }
 #endif
 
-#if defined(OPUS_ARM_PRESUME_AARCH64_NEON_INTR)
-  flags |= OPUS_CPU_ARM_EDSP_FLAG | OPUS_CPU_ARM_MEDIA_FLAG | OPUS_CPU_ARM_NEON_FLAG;
-# if defined(OPUS_ARM_PRESUME_DOTPROD)
-  flags |= OPUS_CPU_ARM_DOTPROD_FLAG;
+#if defined(OAC_ARM_PRESUME_AARCH64_NEON_INTR)
+  flags |= OAC_CPU_ARM_EDSP_FLAG | OAC_CPU_ARM_MEDIA_FLAG | OAC_CPU_ARM_NEON_FLAG;
+# if defined(OAC_ARM_PRESUME_DOTPROD)
+  flags |= OAC_CPU_ARM_DOTPROD_FLAG;
 # endif
 #endif
   return flags;
@@ -194,45 +194,45 @@ static opus_uint32 opus_cpu_capabilities(void)
 #elif defined(HAVE_ELF_AUX_INFO)
 #include <sys/auxv.h>
 
-static opus_uint32 opus_cpu_capabilities(void)
+static oac_uint32 oac_cpu_capabilities(void)
 {
   long hwcap = 0;
-  opus_uint32 flags = 0;
+  oac_uint32 flags = 0;
 
-# if defined(OPUS_ARM_MAY_HAVE_MEDIA) \
- || defined(OPUS_ARM_MAY_HAVE_NEON) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+# if defined(OAC_ARM_MAY_HAVE_MEDIA) \
+ || defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
   /* FreeBSD requires armv6+, which always supports media instructions */
-  flags |= OPUS_CPU_ARM_MEDIA_FLAG;
+  flags |= OAC_CPU_ARM_MEDIA_FLAG;
 # endif
 
   elf_aux_info(AT_HWCAP, &hwcap, sizeof hwcap);
 
-# if defined(OPUS_ARM_MAY_HAVE_EDSP) || defined(OPUS_ARM_MAY_HAVE_MEDIA) \
- || defined(OPUS_ARM_MAY_HAVE_NEON) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+# if defined(OAC_ARM_MAY_HAVE_EDSP) || defined(OAC_ARM_MAY_HAVE_MEDIA) \
+ || defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 #  ifdef HWCAP_EDSP
   if (hwcap & HWCAP_EDSP)
-    flags |= OPUS_CPU_ARM_EDSP_FLAG;
+    flags |= OAC_CPU_ARM_EDSP_FLAG;
 #  endif
 
-#  if defined(OPUS_ARM_MAY_HAVE_NEON) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+#  if defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 #   ifdef HWCAP_NEON
   if (hwcap & HWCAP_NEON)
-    flags |= OPUS_CPU_ARM_NEON_FLAG;
+    flags |= OAC_CPU_ARM_NEON_FLAG;
 #   elif defined(HWCAP_ASIMD)
   if (hwcap & HWCAP_ASIMD)
-    flags |= OPUS_CPU_ARM_NEON_FLAG | OPUS_CPU_ARM_MEDIA_FLAG | OPUS_CPU_ARM_EDSP_FLAG;
+    flags |= OAC_CPU_ARM_NEON_FLAG | OAC_CPU_ARM_MEDIA_FLAG | OAC_CPU_ARM_EDSP_FLAG;
 #   endif
 #  endif
-#  if defined(OPUS_ARM_MAY_HAVE_DOTPROD) && defined(HWCAP_ASIMDDP)
+#  if defined(OAC_ARM_MAY_HAVE_DOTPROD) && defined(HWCAP_ASIMDDP)
   if (hwcap & HWCAP_ASIMDDP)
-    flags |= OPUS_CPU_ARM_DOTPROD_FLAG;
+    flags |= OAC_CPU_ARM_DOTPROD_FLAG;
 #  endif
 # endif
 
-#if defined(OPUS_ARM_PRESUME_AARCH64_NEON_INTR)
-    flags |= OPUS_CPU_ARM_EDSP_FLAG | OPUS_CPU_ARM_MEDIA_FLAG | OPUS_CPU_ARM_NEON_FLAG;
-# if defined(OPUS_ARM_PRESUME_DOTPROD)
-    flags |= OPUS_CPU_ARM_DOTPROD_FLAG;
+#if defined(OAC_ARM_PRESUME_AARCH64_NEON_INTR)
+    flags |= OAC_CPU_ARM_EDSP_FLAG | OAC_CPU_ARM_MEDIA_FLAG | OAC_CPU_ARM_NEON_FLAG;
+# if defined(OAC_ARM_PRESUME_DOTPROD)
+    flags |= OAC_CPU_ARM_DOTPROD_FLAG;
 # endif
 #endif
 
@@ -245,11 +245,11 @@ static opus_uint32 opus_cpu_capabilities(void)
 #include <machine/armreg.h>
 #include <machine/cpu.h>
 
-static opus_uint32 opus_cpu_capabilities(void)
+static oac_uint32 oac_cpu_capabilities(void)
 {
-  opus_uint32 flags = 0;
+  oac_uint32 flags = 0;
 
-#if defined(OPUS_ARM_MAY_HAVE_DOTPROD) && defined(CPU_ID_AA64ISAR0)
+#if defined(OAC_ARM_MAY_HAVE_DOTPROD) && defined(CPU_ID_AA64ISAR0)
   const int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 };
   uint64_t isar0;
   size_t len = sizeof(isar0);
@@ -257,15 +257,15 @@ static opus_uint32 opus_cpu_capabilities(void)
   if (sysctl(isar0_mib, 2, &isar0, &len, NULL, 0) != -1)
   {
     if (ID_AA64ISAR0_DP(isar0) >= ID_AA64ISAR0_DP_IMPL)
-      flags |= OPUS_CPU_ARM_DOTPROD_FLAG;
+      flags |= OAC_CPU_ARM_DOTPROD_FLAG;
   }
 #endif
 
-#if defined(OPUS_ARM_PRESUME_NEON_INTR) \
- || defined(OPUS_ARM_PRESUME_AARCH64_NEON_INTR)
-  flags |= OPUS_CPU_ARM_EDSP_FLAG | OPUS_CPU_ARM_MEDIA_FLAG | OPUS_CPU_ARM_NEON_FLAG;
-# if defined(OPUS_ARM_PRESUME_DOTPROD)
-  flags |= OPUS_CPU_ARM_DOTPROD_FLAG;
+#if defined(OAC_ARM_PRESUME_NEON_INTR) \
+ || defined(OAC_ARM_PRESUME_AARCH64_NEON_INTR)
+  flags |= OAC_CPU_ARM_EDSP_FLAG | OAC_CPU_ARM_MEDIA_FLAG | OAC_CPU_ARM_NEON_FLAG;
+# if defined(OAC_ARM_PRESUME_DOTPROD)
+  flags |= OAC_CPU_ARM_DOTPROD_FLAG;
 # endif
 #endif
   return flags;
@@ -279,42 +279,42 @@ static opus_uint32 opus_cpu_capabilities(void)
    "your platform.  Reconfigure with --disable-rtcd (or send patches)."
 #endif
 
-static int opus_select_arch_impl(void)
+static int oac_select_arch_impl(void)
 {
-  opus_uint32 flags = opus_cpu_capabilities();
+  oac_uint32 flags = oac_cpu_capabilities();
   int arch = 0;
 
-  if(!(flags & OPUS_CPU_ARM_EDSP_FLAG)) {
+  if(!(flags & OAC_CPU_ARM_EDSP_FLAG)) {
     /* Asserts ensure arch values are sequential */
-    celt_assert(arch == OPUS_ARCH_ARM_V4);
+    celt_assert(arch == OAC_ARCH_ARM_V4);
     return arch;
   }
   arch++;
 
-  if(!(flags & OPUS_CPU_ARM_MEDIA_FLAG)) {
-    celt_assert(arch == OPUS_ARCH_ARM_EDSP);
+  if(!(flags & OAC_CPU_ARM_MEDIA_FLAG)) {
+    celt_assert(arch == OAC_ARCH_ARM_EDSP);
     return arch;
   }
   arch++;
 
-  if(!(flags & OPUS_CPU_ARM_NEON_FLAG)) {
-    celt_assert(arch == OPUS_ARCH_ARM_MEDIA);
+  if(!(flags & OAC_CPU_ARM_NEON_FLAG)) {
+    celt_assert(arch == OAC_ARCH_ARM_MEDIA);
     return arch;
   }
   arch++;
 
-  if(!(flags & OPUS_CPU_ARM_DOTPROD_FLAG)) {
-    celt_assert(arch == OPUS_ARCH_ARM_NEON);
+  if(!(flags & OAC_CPU_ARM_DOTPROD_FLAG)) {
+    celt_assert(arch == OAC_ARCH_ARM_NEON);
     return arch;
   }
   arch++;
 
-  celt_assert(arch == OPUS_ARCH_ARM_DOTPROD);
+  celt_assert(arch == OAC_ARCH_ARM_DOTPROD);
   return arch;
 }
 
-int opus_select_arch(void) {
-  int arch = opus_select_arch_impl();
+int oac_select_arch(void) {
+  int arch = oac_select_arch_impl();
 #ifdef FUZZING
   arch = rand()%(arch+1);
 #endif
diff --git a/celt/arm/armcpu.h b/celt/arm/armcpu.h
index 6d5803d81..5d5e8b640 100644
--- a/celt/arm/armcpu.h
+++ b/celt/arm/armcpu.h
@@ -28,62 +28,62 @@
 #if !defined(ARMCPU_H)
 # define ARMCPU_H
 
-# if defined(OPUS_ARM_MAY_HAVE_EDSP)
+# if defined(OAC_ARM_MAY_HAVE_EDSP)
 #  define MAY_HAVE_EDSP(name) name ## _edsp
 # else
 #  define MAY_HAVE_EDSP(name) name ## _c
 # endif
 
-# if defined(OPUS_ARM_MAY_HAVE_MEDIA)
+# if defined(OAC_ARM_MAY_HAVE_MEDIA)
 #  define MAY_HAVE_MEDIA(name) name ## _media
 # else
 #  define MAY_HAVE_MEDIA(name) MAY_HAVE_EDSP(name)
 # endif
 
-# if defined(OPUS_ARM_MAY_HAVE_NEON)
+# if defined(OAC_ARM_MAY_HAVE_NEON)
 #  define MAY_HAVE_NEON(name) name ## _neon
 # else
 #  define MAY_HAVE_NEON(name) MAY_HAVE_MEDIA(name)
 # endif
 
-# if defined(OPUS_ARM_MAY_HAVE_DOTPROD)
+# if defined(OAC_ARM_MAY_HAVE_DOTPROD)
 #  define MAY_HAVE_DOTPROD(name) name ## _dotprod
 # else
 #  define MAY_HAVE_DOTPROD(name) MAY_HAVE_NEON(name)
 # endif
 
-# if defined(OPUS_ARM_PRESUME_EDSP)
+# if defined(OAC_ARM_PRESUME_EDSP)
 #  define PRESUME_EDSP(name) name ## _edsp
 # else
 #  define PRESUME_EDSP(name) name ## _c
 # endif
 
-# if defined(OPUS_ARM_PRESUME_MEDIA)
+# if defined(OAC_ARM_PRESUME_MEDIA)
 #  define PRESUME_MEDIA(name) name ## _media
 # else
 #  define PRESUME_MEDIA(name) PRESUME_EDSP(name)
 # endif
 
-# if defined(OPUS_ARM_PRESUME_NEON)
+# if defined(OAC_ARM_PRESUME_NEON)
 #  define PRESUME_NEON(name) name ## _neon
 # else
 #  define PRESUME_NEON(name) PRESUME_MEDIA(name)
 # endif
 
-# if defined(OPUS_ARM_PRESUME_DOTPROD)
+# if defined(OAC_ARM_PRESUME_DOTPROD)
 #  define PRESUME_DOTPROD(name) name ## _dotprod
 # else
 #  define PRESUME_DOTPROD(name) PRESUME_NEON(name)
 # endif
 
-# if defined(OPUS_HAVE_RTCD)
-int opus_select_arch(void);
+# if defined(OAC_HAVE_RTCD)
+int oac_select_arch(void);
 
-#define OPUS_ARCH_ARM_V4    (0)
-#define OPUS_ARCH_ARM_EDSP  (1)
-#define OPUS_ARCH_ARM_MEDIA (2)
-#define OPUS_ARCH_ARM_NEON  (3)
-#define OPUS_ARCH_ARM_DOTPROD  (4)
+#define OAC_ARCH_ARM_V4    (0)
+#define OAC_ARCH_ARM_EDSP  (1)
+#define OAC_ARCH_ARM_MEDIA (2)
+#define OAC_ARCH_ARM_NEON  (3)
+#define OAC_ARCH_ARM_DOTPROD  (4)
 
 # endif
 
diff --git a/celt/arm/armopts.s.in b/celt/arm/armopts.s.in
index 3d8aaf275..acb744bca 100644
--- a/celt/arm/armopts.s.in
+++ b/celt/arm/armopts.s.in
@@ -26,12 +26,12 @@
 
 ; Set the following to 1 if we have EDSP instructions
 ;  (LDRD/STRD, etc., ARMv5E and later).
-OPUS_ARM_MAY_HAVE_EDSP  * @OPUS_ARM_MAY_HAVE_EDSP@
+OAC_ARM_MAY_HAVE_EDSP  * @OAC_ARM_MAY_HAVE_EDSP@
 
 ; Set the following to 1 if we have ARMv6 media instructions.
-OPUS_ARM_MAY_HAVE_MEDIA * @OPUS_ARM_MAY_HAVE_MEDIA@
+OAC_ARM_MAY_HAVE_MEDIA * @OAC_ARM_MAY_HAVE_MEDIA@
 
 ; Set the following to 1 if we have NEON (some ARMv7)
-OPUS_ARM_MAY_HAVE_NEON  * @OPUS_ARM_MAY_HAVE_NEON@
+OAC_ARM_MAY_HAVE_NEON  * @OAC_ARM_MAY_HAVE_NEON@
 
 END
diff --git a/celt/arm/celt_fft_ne10.c b/celt/arm/celt_fft_ne10.c
index ea5fd7808..cdfeaacc3 100644
--- a/celt/arm/celt_fft_ne10.c
+++ b/celt/arm/celt_fft_ne10.c
@@ -66,12 +66,12 @@ static const int ne10_fft_scaled_support[NE10_FFTSCALED_SUPPORT_MAX] = {
    480, 240, 120, 60
 };
 
-int opus_fft_alloc_arm_neon(kiss_fft_state *st)
+int oac_fft_alloc_arm_neon(kiss_fft_state *st)
 {
    int i;
    size_t memneeded = sizeof(struct arch_fft_state);
 
-   st->arch_fft = (arch_fft_state *)opus_alloc(memneeded);
+   st->arch_fft = (arch_fft_state *)oac_alloc(memneeded);
    if (!st->arch_fft)
       return -1;
 
@@ -94,7 +94,7 @@ int opus_fft_alloc_arm_neon(kiss_fft_state *st)
    return 0;
 }
 
-void opus_fft_free_arm_neon(kiss_fft_state *st)
+void oac_fft_free_arm_neon(kiss_fft_state *st)
 {
    NE10_FFT_CFG_TYPE_T cfg;
 
@@ -104,11 +104,11 @@ void opus_fft_free_arm_neon(kiss_fft_state *st)
    cfg = (NE10_FFT_CFG_TYPE_T)st->arch_fft->priv;
    if (cfg)
       NE10_FFT_DESTROY_C2C_TYPE(cfg);
-   opus_free(st->arch_fft);
+   oac_free(st->arch_fft);
 }
 #endif
 
-void opus_fft_neon(const kiss_fft_state *st,
+void oac_fft_neon(const kiss_fft_state *st,
                    const kiss_fft_cpx *fin,
                    kiss_fft_cpx *fout)
 {
@@ -120,7 +120,7 @@ void opus_fft_neon(const kiss_fft_state *st,
 
    if (!st->arch_fft->is_supported) {
       /* This nfft length (scaled fft) not supported in NE10 */
-      opus_fft_c(st, fin, fout);
+      oac_fft_c(st, fin, fout);
    }
    else {
       memcpy((void *)cfg, st->arch_fft->priv, sizeof(NE10_FFT_STATE_TYPE_T));
@@ -140,7 +140,7 @@ void opus_fft_neon(const kiss_fft_state *st,
    RESTORE_STACK;
 }
 
-void opus_ifft_neon(const kiss_fft_state *st,
+void oac_ifft_neon(const kiss_fft_state *st,
                     const kiss_fft_cpx *fin,
                     kiss_fft_cpx *fout)
 {
@@ -152,7 +152,7 @@ void opus_ifft_neon(const kiss_fft_state *st,
 
    if (!st->arch_fft->is_supported) {
       /* This nfft length (scaled fft) not supported in NE10 */
-      opus_ifft_c(st, fin, fout);
+      oac_ifft_c(st, fin, fout);
    }
    else {
       memcpy((void *)cfg, st->arch_fft->priv, sizeof(NE10_FFT_STATE_TYPE_T));
diff --git a/celt/arm/celt_mdct_ne10.c b/celt/arm/celt_mdct_ne10.c
index 3531d02d1..6cbbeef97 100644
--- a/celt/arm/celt_mdct_ne10.c
+++ b/celt/arm/celt_mdct_ne10.c
@@ -43,8 +43,8 @@
 
 void clt_mdct_forward_neon(const mdct_lookup *l,
                            kiss_fft_scalar *in,
-                           kiss_fft_scalar * OPUS_RESTRICT out,
-                           const opus_val16 *window,
+                           kiss_fft_scalar * OAC_RESTRICT out,
+                           const oac_val16 *window,
                            int overlap, int shift, int stride, int arch)
 {
    int i;
@@ -73,11 +73,11 @@ void clt_mdct_forward_neon(const mdct_lookup *l,
    /* Window, shuffle, fold */
    {
       /* Temp pointers to make it really clear to the compiler what we're doing */
-      const kiss_fft_scalar * OPUS_RESTRICT xp1 = in+(overlap>>1);
-      const kiss_fft_scalar * OPUS_RESTRICT xp2 = in+N2-1+(overlap>>1);
-      kiss_fft_scalar * OPUS_RESTRICT yp = f;
-      const opus_val16 * OPUS_RESTRICT wp1 = window+(overlap>>1);
-      const opus_val16 * OPUS_RESTRICT wp2 = window+(overlap>>1)-1;
+      const kiss_fft_scalar * OAC_RESTRICT xp1 = in+(overlap>>1);
+      const kiss_fft_scalar * OAC_RESTRICT xp2 = in+N2-1+(overlap>>1);
+      kiss_fft_scalar * OAC_RESTRICT yp = f;
+      const oac_val16 * OAC_RESTRICT wp1 = window+(overlap>>1);
+      const oac_val16 * OAC_RESTRICT wp2 = window+(overlap>>1)-1;
       for(i=0;i<((overlap+3)>>2);i++)
       {
          /* Real part arranged as -d-cR, Imag part arranged as -b+aR*/
@@ -111,7 +111,7 @@ void clt_mdct_forward_neon(const mdct_lookup *l,
    }
    /* Pre-rotation */
    {
-      kiss_fft_scalar * OPUS_RESTRICT yp = f;
+      kiss_fft_scalar * OAC_RESTRICT yp = f;
       const kiss_twiddle_scalar *t = &trig[0];
       for(i=0;i<N4;i++)
       {
@@ -130,14 +130,14 @@ void clt_mdct_forward_neon(const mdct_lookup *l,
       }
    }
 
-   opus_fft(st, f2, (kiss_fft_cpx *)f, arch);
+   oac_fft(st, f2, (kiss_fft_cpx *)f, arch);
 
    /* Post-rotate */
    {
       /* Temp pointers to make it really clear to the compiler what we're doing */
-      const kiss_fft_cpx * OPUS_RESTRICT fp = (kiss_fft_cpx *)f;
-      kiss_fft_scalar * OPUS_RESTRICT yp1 = out;
-      kiss_fft_scalar * OPUS_RESTRICT yp2 = out+stride*(N2-1);
+      const kiss_fft_cpx * OAC_RESTRICT fp = (kiss_fft_cpx *)f;
+      kiss_fft_scalar * OAC_RESTRICT yp1 = out;
+      kiss_fft_scalar * OAC_RESTRICT yp2 = out+stride*(N2-1);
       const kiss_twiddle_scalar *t = &trig[0];
       /* Temp pointers to make it really clear to the compiler what we're doing */
       for(i=0;i<N4;i++)
@@ -157,8 +157,8 @@ void clt_mdct_forward_neon(const mdct_lookup *l,
 
 void clt_mdct_backward_neon(const mdct_lookup *l,
                             kiss_fft_scalar *in,
-                            kiss_fft_scalar * OPUS_RESTRICT out,
-                            const opus_val16 * OPUS_RESTRICT window,
+                            kiss_fft_scalar * OAC_RESTRICT out,
+                            const oac_val16 * OAC_RESTRICT window,
                             int overlap, int shift, int stride, int arch)
 {
    int i;
@@ -182,10 +182,10 @@ void clt_mdct_backward_neon(const mdct_lookup *l,
    /* Pre-rotate */
    {
       /* Temp pointers to make it really clear to the compiler what we're doing */
-      const kiss_fft_scalar * OPUS_RESTRICT xp1 = in;
-      const kiss_fft_scalar * OPUS_RESTRICT xp2 = in+stride*(N2-1);
-      kiss_fft_scalar * OPUS_RESTRICT yp = f;
-      const kiss_twiddle_scalar * OPUS_RESTRICT t = &trig[0];
+      const kiss_fft_scalar * OAC_RESTRICT xp1 = in;
+      const kiss_fft_scalar * OAC_RESTRICT xp2 = in+stride*(N2-1);
+      kiss_fft_scalar * OAC_RESTRICT yp = f;
+      const kiss_twiddle_scalar * OAC_RESTRICT t = &trig[0];
       for(i=0;i<N4;i++)
       {
          kiss_fft_scalar yr, yi;
@@ -198,7 +198,7 @@ void clt_mdct_backward_neon(const mdct_lookup *l,
       }
    }
 
-   opus_ifft(st, (kiss_fft_cpx *)f, (kiss_fft_cpx*)(out+(overlap>>1)), arch);
+   oac_ifft(st, (kiss_fft_cpx *)f, (kiss_fft_cpx*)(out+(overlap>>1)), arch);
 
    /* Post-rotate and de-shuffle from both ends of the buffer at once to make
       it in-place. */
@@ -238,10 +238,10 @@ void clt_mdct_backward_neon(const mdct_lookup *l,
 
    /* Mirror on both sides for TDAC */
    {
-      kiss_fft_scalar * OPUS_RESTRICT xp1 = out+overlap-1;
-      kiss_fft_scalar * OPUS_RESTRICT yp1 = out;
-      const opus_val16 * OPUS_RESTRICT wp1 = window;
-      const opus_val16 * OPUS_RESTRICT wp2 = window+overlap-1;
+      kiss_fft_scalar * OAC_RESTRICT xp1 = out+overlap-1;
+      kiss_fft_scalar * OAC_RESTRICT yp1 = out;
+      const oac_val16 * OAC_RESTRICT wp1 = window;
+      const oac_val16 * OAC_RESTRICT wp2 = window+overlap-1;
 
       for(i = 0; i < overlap/2; i++)
       {
diff --git a/celt/arm/celt_neon_intr.c b/celt/arm/celt_neon_intr.c
index 69b90d7dc..56d66a289 100644
--- a/celt/arm/celt_neon_intr.c
+++ b/celt/arm/celt_neon_intr.c
@@ -40,13 +40,13 @@
 #include "../mathops.h"
 #include "../pitch.h"
 #include <stddef.h>
-#if defined(OPUS_CHECK_ASM)
+#if defined(OAC_CHECK_ASM)
 #include <stdlib.h>
 #endif
 
-#if !defined(DISABLE_FLOAT_API) && defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+#if !defined(DISABLE_FLOAT_API) && defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 
-void celt_float2int16_neon(const float * OPUS_RESTRICT in, short * OPUS_RESTRICT out, int cnt)
+void celt_float2int16_neon(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt)
 {
    int i = 0;
 
@@ -70,7 +70,7 @@ void celt_float2int16_neon(const float * OPUS_RESTRICT in, short * OPUS_RESTRICT
       vst1_s16(&out[i +  4], asShort_b);
       vst1_s16(&out[i +  8], asShort_c);
       vst1_s16(&out[i + 12], asShort_d);
-# if defined(OPUS_CHECK_ASM)
+# if defined(OAC_CHECK_ASM)
       short out_c[BLOCK_SIZE];
       int j;
       for(j = 0; j < BLOCK_SIZE; j++)
@@ -88,7 +88,7 @@ void celt_float2int16_neon(const float * OPUS_RESTRICT in, short * OPUS_RESTRICT
    }
 }
 
-int opus_limit2_checkwithin1_neon(float *samples, int cnt)
+int oac_limit2_checkwithin1_neon(float *samples, int cnt)
 {
    const float hardclipMin = -2.0f;
    const float hardclipMax = 2.0f;
@@ -169,7 +169,7 @@ int opus_limit2_checkwithin1_neon(float *samples, int cnt)
 #if defined(FIXED_POINT)
 #include <string.h>
 
-void xcorr_kernel_neon_fixed(const opus_val16 * x, const opus_val16 * y, opus_val32 sum[4], int len)
+void xcorr_kernel_neon_fixed(const oac_val16 * x, const oac_val16 * y, oac_val32 sum[4], int len)
 {
    int j;
    int32x4_t a = vld1q_s32(sum);
@@ -381,8 +381,8 @@ static void xcorr_kernel_neon_float(const float32_t *x, const float32_t *y,
    vst1q_f32(sum, SUMM);
 }
 
-void celt_pitch_xcorr_float_neon(const opus_val16 *_x, const opus_val16 *_y,
-                        opus_val32 *xcorr, int len, int max_pitch, int arch) {
+void celt_pitch_xcorr_float_neon(const oac_val16 *_x, const oac_val16 *_y,
+                        oac_val32 *xcorr, int len, int max_pitch, int arch) {
    int i;
    (void)arch;
    celt_assert(max_pitch > 0);
diff --git a/celt/arm/celt_pitch_xcorr_arm.s b/celt/arm/celt_pitch_xcorr_arm.s
index 65a4461ff..41c9fa18f 100644
--- a/celt/arm/celt_pitch_xcorr_arm.s
+++ b/celt/arm/celt_pitch_xcorr_arm.s
@@ -30,26 +30,26 @@
 
   GET    celt/arm/armopts.s
 
-IF OPUS_ARM_MAY_HAVE_EDSP
+IF OAC_ARM_MAY_HAVE_EDSP
   EXPORT celt_pitch_xcorr_edsp
 ENDIF
 
-IF OPUS_ARM_MAY_HAVE_NEON
+IF OAC_ARM_MAY_HAVE_NEON
   EXPORT celt_pitch_xcorr_neon
 ENDIF
 
-IF OPUS_ARM_MAY_HAVE_NEON
+IF OAC_ARM_MAY_HAVE_NEON
 
 ; Compute sum[k]=sum(x[j]*y[j+k],j=0...len-1), k=0...3
 xcorr_kernel_neon PROC
 xcorr_kernel_neon_start
   ; input:
   ;   r3     = int         len
-  ;   r4     = opus_val16 *x
-  ;   r5     = opus_val16 *y
-  ;   q0     = opus_val32  sum[4]
+  ;   r4     = oac_val16 *x
+  ;   r5     = oac_val16 *y
+  ;   q0     = oac_val32  sum[4]
   ; output:
-  ;   q0     = opus_val32  sum[4]
+  ;   q0     = oac_val32  sum[4]
   ; preserved: r0-r3, r6-r11, d2, q4-q7, q9-q15
   ; internal usage:
   ;   r12 = int j
@@ -152,19 +152,19 @@ xcorr_kernel_neon_process1
   MOV          pc, lr
   ENDP
 
-; opus_val32 celt_pitch_xcorr_neon(opus_val16 *_x, opus_val16 *_y,
-;  opus_val32 *xcorr, int len, int max_pitch, int arch)
+; oac_val32 celt_pitch_xcorr_neon(oac_val16 *_x, oac_val16 *_y,
+;  oac_val32 *xcorr, int len, int max_pitch, int arch)
 celt_pitch_xcorr_neon PROC
   ; input:
-  ;   r0  = opus_val16 *_x
-  ;   r1  = opus_val16 *_y
-  ;   r2  = opus_val32 *xcorr
+  ;   r0  = oac_val16 *_x
+  ;   r1  = oac_val16 *_y
+  ;   r2  = oac_val32 *xcorr
   ;   r3  = int         len
   ; output:
   ;   r0  = int         maxcorr
   ; internal usage:
-  ;   r4  = opus_val16 *x (for xcorr_kernel_neon())
-  ;   r5  = opus_val16 *y (for xcorr_kernel_neon())
+  ;   r4  = oac_val16 *x (for xcorr_kernel_neon())
+  ;   r5  = oac_val16 *y (for xcorr_kernel_neon())
   ;   r6  = int         max_pitch
   ;   r12 = int         j
   ;   q15 = int         maxcorr[4] (q15 is not used by xcorr_kernel_neon())
@@ -255,7 +255,7 @@ celt_pitch_xcorr_neon_done
 
 ENDIF
 
-IF OPUS_ARM_MAY_HAVE_EDSP
+IF OAC_ARM_MAY_HAVE_EDSP
 
 ; This will get used on ARMv7 devices without NEON, so it has been optimized
 ; to take advantage of dual-issuing where possible.
@@ -263,16 +263,16 @@ xcorr_kernel_edsp PROC
 xcorr_kernel_edsp_start
   ; input:
   ;   r3      = int         len
-  ;   r4      = opus_val16 *_x (must be 32-bit aligned)
-  ;   r5      = opus_val16 *_y (must be 32-bit aligned)
-  ;   r6...r9 = opus_val32  sum[4]
+  ;   r4      = oac_val16 *_x (must be 32-bit aligned)
+  ;   r5      = oac_val16 *_y (must be 32-bit aligned)
+  ;   r6...r9 = oac_val32  sum[4]
   ; output:
-  ;   r6...r9 = opus_val32  sum[4]
+  ;   r6...r9 = oac_val32  sum[4]
   ; preserved: r0-r5
   ; internal usage
   ;   r2      = int         j
-  ;   r12,r14 = opus_val16  x[4]
-  ;   r10,r11 = opus_val16  y[4]
+  ;   r12,r14 = oac_val16  x[4]
+  ;   r10,r11 = oac_val16  y[4]
   STMFD        sp!, {r2,r4,r5,lr}
   LDR          r10, [r5], #4      ; Load y[0...1]
   SUBS         r2, r3, #4         ; j = len-4
@@ -345,19 +345,19 @@ xcorr_kernel_edsp_done
 
 celt_pitch_xcorr_edsp PROC
   ; input:
-  ;   r0  = opus_val16 *_x (must be 32-bit aligned)
-  ;   r1  = opus_val16 *_y (only needs to be 16-bit aligned)
-  ;   r2  = opus_val32 *xcorr
+  ;   r0  = oac_val16 *_x (must be 32-bit aligned)
+  ;   r1  = oac_val16 *_y (only needs to be 16-bit aligned)
+  ;   r2  = oac_val32 *xcorr
   ;   r3  = int         len
   ; output:
   ;   r0  = maxcorr
   ; internal usage
-  ;   r4  = opus_val16 *x
-  ;   r5  = opus_val16 *y
-  ;   r6  = opus_val32  sum0
-  ;   r7  = opus_val32  sum1
-  ;   r8  = opus_val32  sum2
-  ;   r9  = opus_val32  sum3
+  ;   r4  = oac_val16 *x
+  ;   r5  = oac_val16 *y
+  ;   r6  = oac_val32  sum0
+  ;   r7  = oac_val32  sum1
+  ;   r8  = oac_val32  sum2
+  ;   r9  = oac_val32  sum3
   ;   r1  = int         max_pitch
   ;   r12 = int         j
   ; ignored:
diff --git a/celt/arm/fft_arm.h b/celt/arm/fft_arm.h
index 0b78175f3..55eb14aac 100644
--- a/celt/arm/fft_arm.h
+++ b/celt/arm/fft_arm.h
@@ -38,33 +38,33 @@
 
 #if defined(HAVE_ARM_NE10)
 
-int opus_fft_alloc_arm_neon(kiss_fft_state *st);
-void opus_fft_free_arm_neon(kiss_fft_state *st);
+int oac_fft_alloc_arm_neon(kiss_fft_state *st);
+void oac_fft_free_arm_neon(kiss_fft_state *st);
 
-void opus_fft_neon(const kiss_fft_state *st,
+void oac_fft_neon(const kiss_fft_state *st,
                    const kiss_fft_cpx *fin,
                    kiss_fft_cpx *fout);
 
-void opus_ifft_neon(const kiss_fft_state *st,
+void oac_ifft_neon(const kiss_fft_state *st,
                     const kiss_fft_cpx *fin,
                     kiss_fft_cpx *fout);
 
-#if !defined(OPUS_HAVE_RTCD)
-#define OVERRIDE_OPUS_FFT (1)
+#if !defined(OAC_HAVE_RTCD)
+#define OVERRIDE_OAC_FFT (1)
 
-#define opus_fft_alloc_arch(_st, arch) \
-   ((void)(arch), opus_fft_alloc_arm_neon(_st))
+#define oac_fft_alloc_arch(_st, arch) \
+   ((void)(arch), oac_fft_alloc_arm_neon(_st))
 
-#define opus_fft_free_arch(_st, arch) \
-   ((void)(arch), opus_fft_free_arm_neon(_st))
+#define oac_fft_free_arch(_st, arch) \
+   ((void)(arch), oac_fft_free_arm_neon(_st))
 
-#define opus_fft(_st, _fin, _fout, arch) \
-   ((void)(arch), opus_fft_neon(_st, _fin, _fout))
+#define oac_fft(_st, _fin, _fout, arch) \
+   ((void)(arch), oac_fft_neon(_st, _fin, _fout))
 
-#define opus_ifft(_st, _fin, _fout, arch) \
-   ((void)(arch), opus_ifft_neon(_st, _fin, _fout))
+#define oac_ifft(_st, _fin, _fout, arch) \
+   ((void)(arch), oac_ifft_neon(_st, _fin, _fout))
 
-#endif /* OPUS_HAVE_RTCD */
+#endif /* OAC_HAVE_RTCD */
 
 #endif /* HAVE_ARM_NE10 */
 
diff --git a/celt/arm/fixed_armv4.h b/celt/arm/fixed_armv4.h
index d84888a77..0dfe5e6a3 100644
--- a/celt/arm/fixed_armv4.h
+++ b/celt/arm/fixed_armv4.h
@@ -29,7 +29,7 @@
 
 /** 16x32 multiplication, followed by a 16-bit shift right. Results fits in 32 bits */
 #undef MULT16_32_Q16
-static OPUS_INLINE opus_val32 MULT16_32_Q16_armv4(opus_val16 a, opus_val32 b)
+static OAC_INLINE oac_val32 MULT16_32_Q16_armv4(oac_val16 a, oac_val32 b)
 {
   unsigned rd_lo;
   int rd_hi;
@@ -46,7 +46,7 @@ static OPUS_INLINE opus_val32 MULT16_32_Q16_armv4(opus_val16 a, opus_val32 b)
 
 /** 16x32 multiplication, followed by a 15-bit shift right. Results fits in 32 bits */
 #undef MULT16_32_Q15
-static OPUS_INLINE opus_val32 MULT16_32_Q15_armv4(opus_val16 a, opus_val32 b)
+static OAC_INLINE oac_val32 MULT16_32_Q15_armv4(oac_val16 a, oac_val32 b)
 {
   unsigned rd_lo;
   int rd_hi;
@@ -75,6 +75,6 @@ static OPUS_INLINE opus_val32 MULT16_32_Q15_armv4(opus_val16 a, opus_val32 b)
 
 /** 32x32 multiplication, followed by a 31-bit shift right. Results fits in 32 bits */
 #undef MULT32_32_Q31
-#define MULT32_32_Q31(a,b) (opus_val32)((((opus_int64)(a)) * ((opus_int64)(b)))>>31)
+#define MULT32_32_Q31(a,b) (oac_val32)((((oac_int64)(a)) * ((oac_int64)(b)))>>31)
 
 #endif
diff --git a/celt/arm/fixed_armv5e.h b/celt/arm/fixed_armv5e.h
index 6bf73cbac..c68a18d80 100644
--- a/celt/arm/fixed_armv5e.h
+++ b/celt/arm/fixed_armv5e.h
@@ -34,7 +34,7 @@
 
 /** 16x32 multiplication, followed by a 16-bit shift right. Results fits in 32 bits */
 #undef MULT16_32_Q16
-static OPUS_INLINE opus_val32 MULT16_32_Q16_armv5e(opus_val16 a, opus_val32 b)
+static OAC_INLINE oac_val32 MULT16_32_Q16_armv5e(oac_val16 a, oac_val32 b)
 {
   int res;
   __asm__(
@@ -50,7 +50,7 @@ static OPUS_INLINE opus_val32 MULT16_32_Q16_armv5e(opus_val16 a, opus_val32 b)
 
 /** 16x32 multiplication, followed by a 15-bit shift right. Results fits in 32 bits */
 #undef MULT16_32_Q15
-static OPUS_INLINE opus_val32 MULT16_32_Q15_armv5e(opus_val16 a, opus_val32 b)
+static OAC_INLINE oac_val32 MULT16_32_Q15_armv5e(oac_val16 a, oac_val32 b)
 {
   int res;
   __asm__(
@@ -68,8 +68,8 @@ static OPUS_INLINE opus_val32 MULT16_32_Q15_armv5e(opus_val16 a, opus_val32 b)
     b must fit in 31 bits.
     Result fits in 32 bits. */
 #undef MAC16_32_Q15
-static OPUS_INLINE opus_val32 MAC16_32_Q15_armv5e(opus_val32 c, opus_val16 a,
- opus_val32 b)
+static OAC_INLINE oac_val32 MAC16_32_Q15_armv5e(oac_val32 c, oac_val16 a,
+ oac_val32 b)
 {
   int res;
   __asm__(
@@ -85,8 +85,8 @@ static OPUS_INLINE opus_val32 MAC16_32_Q15_armv5e(opus_val32 c, opus_val16 a,
 /** 16x32 multiply, followed by a 16-bit shift right and 32-bit add.
     Result fits in 32 bits. */
 #undef MAC16_32_Q16
-static OPUS_INLINE opus_val32 MAC16_32_Q16_armv5e(opus_val32 c, opus_val16 a,
- opus_val32 b)
+static OAC_INLINE oac_val32 MAC16_32_Q16_armv5e(oac_val32 c, oac_val16 a,
+ oac_val32 b)
 {
   int res;
   __asm__(
@@ -101,8 +101,8 @@ static OPUS_INLINE opus_val32 MAC16_32_Q16_armv5e(opus_val32 c, opus_val16 a,
 
 /** 16x16 multiply-add where the result fits in 32 bits */
 #undef MAC16_16
-static OPUS_INLINE opus_val32 MAC16_16_armv5e(opus_val32 c, opus_val16 a,
- opus_val16 b)
+static OAC_INLINE oac_val32 MAC16_16_armv5e(oac_val32 c, oac_val16 a,
+ oac_val16 b)
 {
   int res;
   __asm__(
@@ -117,7 +117,7 @@ static OPUS_INLINE opus_val32 MAC16_16_armv5e(opus_val32 c, opus_val16 a,
 
 /** 16x16 multiplication where the result fits in 32 bits */
 #undef MULT16_16
-static OPUS_INLINE opus_val32 MULT16_16_armv5e(opus_val16 a, opus_val16 b)
+static OAC_INLINE oac_val32 MULT16_16_armv5e(oac_val16 a, oac_val16 b)
 {
   int res;
   __asm__(
@@ -130,10 +130,10 @@ static OPUS_INLINE opus_val32 MULT16_16_armv5e(opus_val16 a, opus_val16 b)
 }
 #define MULT16_16(a, b) (MULT16_16_armv5e(a, b))
 
-#ifdef OPUS_ARM_INLINE_MEDIA
+#ifdef OAC_ARM_INLINE_MEDIA
 
 #undef SIG2WORD16
-static OPUS_INLINE opus_val16 SIG2WORD16_armv6(opus_val32 x)
+static OAC_INLINE oac_val16 SIG2WORD16_armv6(oac_val32 x)
 {
    celt_sig res;
    __asm__(
@@ -146,6 +146,6 @@ static OPUS_INLINE opus_val16 SIG2WORD16_armv6(opus_val32 x)
 }
 #define SIG2WORD16(x) (SIG2WORD16_armv6(x))
 
-#endif /* OPUS_ARM_INLINE_MEDIA */
+#endif /* OAC_ARM_INLINE_MEDIA */
 
 #endif
diff --git a/celt/arm/mathops_arm.h b/celt/arm/mathops_arm.h
index b1f916997..22a9cfe86 100644
--- a/celt/arm/mathops_arm.h
+++ b/celt/arm/mathops_arm.h
@@ -29,9 +29,9 @@
 
 #include "armcpu.h"
 #include "cpu_support.h"
-#include "opus_defines.h"
+#include "oac_defines.h"
 
-# if !defined(DISABLE_FLOAT_API) && defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+# if !defined(DISABLE_FLOAT_API) && defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 
 #include <arm_neon.h>
 
@@ -70,33 +70,33 @@ static inline float vmaxvf(float32x4_t a)
 #endif
 }
 
-void celt_float2int16_neon(const float * OPUS_RESTRICT in, short * OPUS_RESTRICT out, int cnt);
-#  if defined(OPUS_HAVE_RTCD) && \
-    (defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && !defined(OPUS_ARM_PRESUME_NEON_INTR))
+void celt_float2int16_neon(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt);
+#  if defined(OAC_HAVE_RTCD) && \
+    (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
 extern void
-(*const CELT_FLOAT2INT16_IMPL[OPUS_ARCHMASK+1])(const float * OPUS_RESTRICT in, short * OPUS_RESTRICT out, int cnt);
+(*const CELT_FLOAT2INT16_IMPL[OAC_ARCHMASK+1])(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt);
 
 #   define OVERRIDE_FLOAT2INT16 (1)
 #   define celt_float2int16(in, out, cnt, arch) \
-      ((*CELT_FLOAT2INT16_IMPL[(arch)&OPUS_ARCHMASK])(in, out, cnt))
+      ((*CELT_FLOAT2INT16_IMPL[(arch)&OAC_ARCHMASK])(in, out, cnt))
 
-#  elif defined(OPUS_ARM_PRESUME_NEON_INTR)
+#  elif defined(OAC_ARM_PRESUME_NEON_INTR)
 #   define OVERRIDE_FLOAT2INT16 (1)
 #   define celt_float2int16(in, out, cnt, arch) ((void)(arch), celt_float2int16_neon(in, out, cnt))
 #  endif
 
-int opus_limit2_checkwithin1_neon(float * samples, int cnt);
-#  if defined(OPUS_HAVE_RTCD) && \
-      (defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && !defined(OPUS_ARM_PRESUME_NEON_INTR))
-extern int (*const OPUS_LIMIT2_CHECKWITHIN1_IMPL[OPUS_ARCHMASK+1])(float * samples, int cnt);
+int oac_limit2_checkwithin1_neon(float * samples, int cnt);
+#  if defined(OAC_HAVE_RTCD) && \
+      (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
+extern int (*const OAC_LIMIT2_CHECKWITHIN1_IMPL[OAC_ARCHMASK+1])(float * samples, int cnt);
 
 #   define OVERRIDE_LIMIT2_CHECKWITHIN1 (1)
-#   define opus_limit2_checkwithin1(samples, cnt, arch) \
-   ((*OPUS_LIMIT2_CHECKWITHIN1_IMPL[(arch)&OPUS_ARCHMASK])(samples, cnt))
+#   define oac_limit2_checkwithin1(samples, cnt, arch) \
+   ((*OAC_LIMIT2_CHECKWITHIN1_IMPL[(arch)&OAC_ARCHMASK])(samples, cnt))
 
-#  elif defined(OPUS_ARM_PRESUME_NEON_INTR)
+#  elif defined(OAC_ARM_PRESUME_NEON_INTR)
 #   define OVERRIDE_LIMIT2_CHECKWITHIN1 (1)
-#   define opus_limit2_checkwithin1(samples, cnt, arch) ((void)(arch), opus_limit2_checkwithin1_neon(samples, cnt))
+#   define oac_limit2_checkwithin1(samples, cnt, arch) ((void)(arch), oac_limit2_checkwithin1_neon(samples, cnt))
 #  endif
 # endif
 
diff --git a/celt/arm/mdct_arm.h b/celt/arm/mdct_arm.h
index 14200bac4..15fd58e3d 100644
--- a/celt/arm/mdct_arm.h
+++ b/celt/arm/mdct_arm.h
@@ -38,22 +38,22 @@
 #if defined(HAVE_ARM_NE10)
 /** Compute a forward MDCT and scale by 4/N, trashes the input array */
 void clt_mdct_forward_neon(const mdct_lookup *l, kiss_fft_scalar *in,
-                           kiss_fft_scalar * OPUS_RESTRICT out,
-                           const opus_val16 *window, int overlap,
+                           kiss_fft_scalar * OAC_RESTRICT out,
+                           const oac_val16 *window, int overlap,
                            int shift, int stride, int arch);
 
 void clt_mdct_backward_neon(const mdct_lookup *l, kiss_fft_scalar *in,
-                            kiss_fft_scalar * OPUS_RESTRICT out,
-                            const opus_val16 *window, int overlap,
+                            kiss_fft_scalar * OAC_RESTRICT out,
+                            const oac_val16 *window, int overlap,
                             int shift, int stride, int arch);
 
-#if !defined(OPUS_HAVE_RTCD)
-#define OVERRIDE_OPUS_MDCT (1)
+#if !defined(OAC_HAVE_RTCD)
+#define OVERRIDE_OAC_MDCT (1)
 #define clt_mdct_forward(_l, _in, _out, _window, _int, _shift, _stride, _arch) \
       clt_mdct_forward_neon(_l, _in, _out, _window, _int, _shift, _stride, _arch)
 #define clt_mdct_backward(_l, _in, _out, _window, _int, _shift, _stride, _arch) \
       clt_mdct_backward_neon(_l, _in, _out, _window, _int, _shift, _stride, _arch)
-#endif /* OPUS_HAVE_RTCD */
+#endif /* OAC_HAVE_RTCD */
 #endif /* HAVE_ARM_NE10 */
 
 #endif
diff --git a/celt/arm/meson.build b/celt/arm/meson.build
index b4dec564f..f77b7896f 100644
--- a/celt/arm/meson.build
+++ b/celt/arm/meson.build
@@ -5,7 +5,7 @@ celt_sources_arm_asm = configure_file(input: 'celt_pitch_xcorr_arm.s',
   capture: true)
 celt_arm_armopts_s_in = configure_file(input: 'armopts.s.in',
   output: 'armopts.s',
-  configuration: opus_conf)
+  configuration: oac_conf)
 celt_arm_armopts_s = configure_file(input: [celt_arm_armopts_s_in],
   output: '@BASENAME@-gnu.S',
   command: arm2gnu + ['@INPUT@'],
diff --git a/celt/arm/pitch_arm.h b/celt/arm/pitch_arm.h
index bed8b04ea..0261dd81f 100644
--- a/celt/arm/pitch_arm.h
+++ b/celt/arm/pitch_arm.h
@@ -30,12 +30,12 @@
 
 # include "armcpu.h"
 
-# if defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
-opus_val32 celt_inner_prod_neon(const opus_val16 *x, const opus_val16 *y, int N);
-void dual_inner_prod_neon(const opus_val16 *x, const opus_val16 *y01,
-        const opus_val16 *y02, int N, opus_val32 *xy1, opus_val32 *xy2);
+# if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
+oac_val32 celt_inner_prod_neon(const oac_val16 *x, const oac_val16 *y, int N);
+void dual_inner_prod_neon(const oac_val16 *x, const oac_val16 *y01,
+        const oac_val16 *y02, int N, oac_val32 *xy1, oac_val32 *xy2);
 
-#  if !defined(OPUS_HAVE_RTCD) && defined(OPUS_ARM_PRESUME_NEON)
+#  if !defined(OAC_HAVE_RTCD) && defined(OAC_ARM_PRESUME_NEON)
 #   define OVERRIDE_CELT_INNER_PROD (1)
 #   define OVERRIDE_DUAL_INNER_PROD (1)
 #   define celt_inner_prod(x, y, N, arch) ((void)(arch), PRESUME_NEON(celt_inner_prod)(x, y, N))
@@ -44,23 +44,23 @@ void dual_inner_prod_neon(const opus_val16 *x, const opus_val16 *y01,
 # endif
 
 # if !defined(OVERRIDE_CELT_INNER_PROD)
-#  if defined(OPUS_HAVE_RTCD) && (defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && !defined(OPUS_ARM_PRESUME_NEON_INTR))
-extern opus_val32 (*const CELT_INNER_PROD_IMPL[OPUS_ARCHMASK+1])(const opus_val16 *x, const opus_val16 *y, int N);
+#  if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
+extern oac_val32 (*const CELT_INNER_PROD_IMPL[OAC_ARCHMASK+1])(const oac_val16 *x, const oac_val16 *y, int N);
 #   define OVERRIDE_CELT_INNER_PROD (1)
-#   define celt_inner_prod(x, y, N, arch) ((*CELT_INNER_PROD_IMPL[(arch)&OPUS_ARCHMASK])(x, y, N))
-#  elif defined(OPUS_ARM_PRESUME_NEON_INTR)
+#   define celt_inner_prod(x, y, N, arch) ((*CELT_INNER_PROD_IMPL[(arch)&OAC_ARCHMASK])(x, y, N))
+#  elif defined(OAC_ARM_PRESUME_NEON_INTR)
 #   define OVERRIDE_CELT_INNER_PROD (1)
 #   define celt_inner_prod(x, y, N, arch) ((void)(arch), celt_inner_prod_neon(x, y, N))
 #  endif
 # endif
 
 # if !defined(OVERRIDE_DUAL_INNER_PROD)
-#  if defined(OPUS_HAVE_RTCD) && (defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && !defined(OPUS_ARM_PRESUME_NEON_INTR))
-extern void (*const DUAL_INNER_PROD_IMPL[OPUS_ARCHMASK+1])(const opus_val16 *x,
-        const opus_val16 *y01, const opus_val16 *y02, int N, opus_val32 *xy1, opus_val32 *xy2);
+#  if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
+extern void (*const DUAL_INNER_PROD_IMPL[OAC_ARCHMASK+1])(const oac_val16 *x,
+        const oac_val16 *y01, const oac_val16 *y02, int N, oac_val32 *xy1, oac_val32 *xy2);
 #   define OVERRIDE_DUAL_INNER_PROD (1)
-#   define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) ((*DUAL_INNER_PROD_IMPL[(arch)&OPUS_ARCHMASK])(x, y01, y02, N, xy1, xy2))
-#  elif defined(OPUS_ARM_PRESUME_NEON_INTR)
+#   define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) ((*DUAL_INNER_PROD_IMPL[(arch)&OAC_ARCHMASK])(x, y01, y02, N, xy1, xy2))
+#  elif defined(OAC_ARM_PRESUME_NEON_INTR)
 #   define OVERRIDE_DUAL_INNER_PROD (1)
 #   define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) ((void)(arch), dual_inner_prod_neon(x, y01, y02, N, xy1, xy2))
 #  endif
@@ -68,62 +68,62 @@ extern void (*const DUAL_INNER_PROD_IMPL[OPUS_ARCHMASK+1])(const opus_val16 *x,
 
 # if defined(FIXED_POINT)
 
-#  if defined(OPUS_ARM_MAY_HAVE_NEON)
-opus_val32 celt_pitch_xcorr_neon(const opus_val16 *_x, const opus_val16 *_y,
-    opus_val32 *xcorr, int len, int max_pitch, int arch);
+#  if defined(OAC_ARM_MAY_HAVE_NEON)
+oac_val32 celt_pitch_xcorr_neon(const oac_val16 *_x, const oac_val16 *_y,
+    oac_val32 *xcorr, int len, int max_pitch, int arch);
 #  endif
 
-#  if defined(OPUS_ARM_MAY_HAVE_MEDIA)
+#  if defined(OAC_ARM_MAY_HAVE_MEDIA)
 #   define celt_pitch_xcorr_media MAY_HAVE_EDSP(celt_pitch_xcorr)
 #  endif
 
-#  if defined(OPUS_ARM_MAY_HAVE_EDSP)
-opus_val32 celt_pitch_xcorr_edsp(const opus_val16 *_x, const opus_val16 *_y,
-    opus_val32 *xcorr, int len, int max_pitch, int arch);
+#  if defined(OAC_ARM_MAY_HAVE_EDSP)
+oac_val32 celt_pitch_xcorr_edsp(const oac_val16 *_x, const oac_val16 *_y,
+    oac_val32 *xcorr, int len, int max_pitch, int arch);
 #  endif
 
-#  if defined(OPUS_HAVE_RTCD) && \
-    ((defined(OPUS_ARM_MAY_HAVE_NEON) && !defined(OPUS_ARM_PRESUME_NEON)) || \
-     (defined(OPUS_ARM_MAY_HAVE_MEDIA) && !defined(OPUS_ARM_PRESUME_MEDIA)) || \
-     (defined(OPUS_ARM_MAY_HAVE_EDSP) && !defined(OPUS_ARM_PRESUME_EDSP)))
-extern opus_val32
-(*const CELT_PITCH_XCORR_IMPL[OPUS_ARCHMASK+1])(const opus_val16 *,
-      const opus_val16 *, opus_val32 *, int, int, int);
+#  if defined(OAC_HAVE_RTCD) && \
+    ((defined(OAC_ARM_MAY_HAVE_NEON) && !defined(OAC_ARM_PRESUME_NEON)) || \
+     (defined(OAC_ARM_MAY_HAVE_MEDIA) && !defined(OAC_ARM_PRESUME_MEDIA)) || \
+     (defined(OAC_ARM_MAY_HAVE_EDSP) && !defined(OAC_ARM_PRESUME_EDSP)))
+extern oac_val32
+(*const CELT_PITCH_XCORR_IMPL[OAC_ARCHMASK+1])(const oac_val16 *,
+      const oac_val16 *, oac_val32 *, int, int, int);
 #   define OVERRIDE_PITCH_XCORR (1)
 #   define celt_pitch_xcorr(_x, _y, xcorr, len, max_pitch, arch) \
-  ((*CELT_PITCH_XCORR_IMPL[(arch)&OPUS_ARCHMASK])(_x, _y, \
+  ((*CELT_PITCH_XCORR_IMPL[(arch)&OAC_ARCHMASK])(_x, _y, \
         xcorr, len, max_pitch, arch))
 
-#  elif defined(OPUS_ARM_PRESUME_EDSP) || \
-    defined(OPUS_ARM_PRESUME_MEDIA) || \
-    defined(OPUS_ARM_PRESUME_NEON)
+#  elif defined(OAC_ARM_PRESUME_EDSP) || \
+    defined(OAC_ARM_PRESUME_MEDIA) || \
+    defined(OAC_ARM_PRESUME_NEON)
 #   define OVERRIDE_PITCH_XCORR (1)
 #   define celt_pitch_xcorr (PRESUME_NEON(celt_pitch_xcorr))
 
 #  endif
 
-#  if defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+#  if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 void xcorr_kernel_neon_fixed(
-                    const opus_val16 *x,
-                    const opus_val16 *y,
-                    opus_val32       sum[4],
+                    const oac_val16 *x,
+                    const oac_val16 *y,
+                    oac_val32       sum[4],
                     int              len);
 #  endif
 
-#  if defined(OPUS_HAVE_RTCD) && \
-    (defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && !defined(OPUS_ARM_PRESUME_NEON_INTR))
+#  if defined(OAC_HAVE_RTCD) && \
+    (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
 
-extern void (*const XCORR_KERNEL_IMPL[OPUS_ARCHMASK + 1])(
-                    const opus_val16 *x,
-                    const opus_val16 *y,
-                    opus_val32       sum[4],
+extern void (*const XCORR_KERNEL_IMPL[OAC_ARCHMASK + 1])(
+                    const oac_val16 *x,
+                    const oac_val16 *y,
+                    oac_val32       sum[4],
                     int              len);
 
 #   define OVERRIDE_XCORR_KERNEL (1)
 #   define xcorr_kernel(x, y, sum, len, arch) \
-     ((*XCORR_KERNEL_IMPL[(arch) & OPUS_ARCHMASK])(x, y, sum, len))
+     ((*XCORR_KERNEL_IMPL[(arch) & OAC_ARCHMASK])(x, y, sum, len))
 
-#  elif defined(OPUS_ARM_PRESUME_NEON_INTR)
+#  elif defined(OAC_ARM_PRESUME_NEON_INTR)
 #   define OVERRIDE_XCORR_KERNEL (1)
 #   define xcorr_kernel(x, y, sum, len, arch) \
       ((void)arch, xcorr_kernel_neon_fixed(x, y, sum, len))
@@ -132,23 +132,23 @@ extern void (*const XCORR_KERNEL_IMPL[OPUS_ARCHMASK + 1])(
 
 #else /* Start !FIXED_POINT */
 /* Float case */
-#if defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
-void celt_pitch_xcorr_float_neon(const opus_val16 *_x, const opus_val16 *_y,
-                                 opus_val32 *xcorr, int len, int max_pitch, int arch);
+#if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
+void celt_pitch_xcorr_float_neon(const oac_val16 *_x, const oac_val16 *_y,
+                                 oac_val32 *xcorr, int len, int max_pitch, int arch);
 #endif
 
-#  if defined(OPUS_HAVE_RTCD) && \
-    (defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && !defined(OPUS_ARM_PRESUME_NEON_INTR))
+#  if defined(OAC_HAVE_RTCD) && \
+    (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
 extern void
-(*const CELT_PITCH_XCORR_IMPL[OPUS_ARCHMASK+1])(const opus_val16 *,
-      const opus_val16 *, opus_val32 *, int, int, int);
+(*const CELT_PITCH_XCORR_IMPL[OAC_ARCHMASK+1])(const oac_val16 *,
+      const oac_val16 *, oac_val32 *, int, int, int);
 
 #  define OVERRIDE_PITCH_XCORR (1)
 #  define celt_pitch_xcorr(_x, _y, xcorr, len, max_pitch, arch) \
-  ((*CELT_PITCH_XCORR_IMPL[(arch)&OPUS_ARCHMASK])(_x, _y, \
+  ((*CELT_PITCH_XCORR_IMPL[(arch)&OAC_ARCHMASK])(_x, _y, \
         xcorr, len, max_pitch, arch))
 
-#  elif defined(OPUS_ARM_PRESUME_NEON_INTR)
+#  elif defined(OAC_ARM_PRESUME_NEON_INTR)
 
 #   define OVERRIDE_PITCH_XCORR (1)
 #   define celt_pitch_xcorr celt_pitch_xcorr_float_neon
diff --git a/celt/arm/pitch_neon_intr.c b/celt/arm/pitch_neon_intr.c
index 43885f528..e63eaf54b 100644
--- a/celt/arm/pitch_neon_intr.c
+++ b/celt/arm/pitch_neon_intr.c
@@ -34,10 +34,10 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #ifdef FIXED_POINT
 
-opus_val32 celt_inner_prod_neon(const opus_val16 *x, const opus_val16 *y, int N)
+oac_val32 celt_inner_prod_neon(const oac_val16 *x, const oac_val16 *y, int N)
 {
     int i;
-    opus_val32 xy;
+    oac_val32 xy;
     int16x8_t x_s16x8, y_s16x8;
     int32x4_t xy_s32x4 = vdupq_n_s32(0);
     int64x2_t xy_s64x2;
@@ -65,18 +65,18 @@ opus_val32 celt_inner_prod_neon(const opus_val16 *x, const opus_val16 *y, int N)
         xy = MAC16_16(xy, x[i], y[i]);
     }
 
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     celt_assert(celt_inner_prod_c(x, y, N) == xy);
 #endif
 
     return xy;
 }
 
-void dual_inner_prod_neon(const opus_val16 *x, const opus_val16 *y01, const opus_val16 *y02,
-        int N, opus_val32 *xy1, opus_val32 *xy2)
+void dual_inner_prod_neon(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
+        int N, oac_val32 *xy1, oac_val32 *xy2)
 {
     int i;
-    opus_val32 xy01, xy02;
+    oac_val32 xy01, xy02;
     int16x8_t x_s16x8, y01_s16x8, y02_s16x8;
     int32x4_t xy01_s32x4 = vdupq_n_s32(0);
     int32x4_t xy02_s32x4 = vdupq_n_s32(0);
@@ -116,9 +116,9 @@ void dual_inner_prod_neon(const opus_val16 *x, const opus_val16 *y01, const opus
     *xy1 = xy01;
     *xy2 = xy02;
 
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     {
-        opus_val32 xy1_c, xy2_c;
+        oac_val32 xy1_c, xy2_c;
         dual_inner_prod_c(x, y01, y02, N, &xy1_c, &xy2_c);
         celt_assert(xy1_c == *xy1);
         celt_assert(xy2_c == *xy2);
@@ -137,18 +137,18 @@ void dual_inner_prod_neon(const opus_val16 *x, const opus_val16 *y01, const opus
 #endif
 
 
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
 
 /* This part of code simulates floating-point NEON operations. */
 
 /* celt_inner_prod_neon_float_c_simulation() simulates the floating-point   */
 /* operations of celt_inner_prod_neon(), and both functions should have bit */
 /* exact output.                                                            */
-static opus_val32 celt_inner_prod_neon_float_c_simulation(const opus_val16 *x, const opus_val16 *y, float *err, int N)
+static oac_val32 celt_inner_prod_neon_float_c_simulation(const oac_val16 *x, const oac_val16 *y, float *err, int N)
 {
    int i;
    *err = 0;
-   opus_val32 xy, xy0 = 0, xy1 = 0, xy2 = 0, xy3 = 0;
+   oac_val32 xy, xy0 = 0, xy1 = 0, xy2 = 0, xy3 = 0;
    for (i = 0; i < N - 3; i += 4) {
       xy0 = MAC16_16(xy0, x[i + 0], y[i + 0]);
       xy1 = MAC16_16(xy1, x[i + 1], y[i + 1]);
@@ -171,21 +171,21 @@ static opus_val32 celt_inner_prod_neon_float_c_simulation(const opus_val16 *x, c
 /* dual_inner_prod_neon_float_c_simulation() simulates the floating-point   */
 /* operations of dual_inner_prod_neon(), and both functions should have bit */
 /* exact output.                                                            */
-static void dual_inner_prod_neon_float_c_simulation(const opus_val16 *x, const opus_val16 *y01, const opus_val16 *y02,
-      int N, opus_val32 *xy1, opus_val32 *xy2, float *err)
+static void dual_inner_prod_neon_float_c_simulation(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
+      int N, oac_val32 *xy1, oac_val32 *xy2, float *err)
 {
    *xy1 = celt_inner_prod_neon_float_c_simulation(x, y01, &err[0], N);
    *xy2 = celt_inner_prod_neon_float_c_simulation(x, y02, &err[1], N);
 }
 
-#endif /* OPUS_CHECK_ASM */
+#endif /* OAC_CHECK_ASM */
 
 /* ========================================================================== */
 
-opus_val32 celt_inner_prod_neon(const opus_val16 *x, const opus_val16 *y, int N)
+oac_val32 celt_inner_prod_neon(const oac_val16 *x, const oac_val16 *y, int N)
 {
     int i;
-    opus_val32 xy;
+    oac_val32 xy;
     float32x4_t xy_f32x4 = vdupq_n_f32(0);
     float32x2_t xy_f32x2;
 
@@ -214,7 +214,7 @@ opus_val32 celt_inner_prod_neon(const opus_val16 *x, const opus_val16 *y, int N)
         xy = MAC16_16(xy, x[i], y[i]);
     }
 
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     {
         float err, res;
         res = celt_inner_prod_neon_float_c_simulation(x, y, &err, N);
@@ -226,11 +226,11 @@ opus_val32 celt_inner_prod_neon(const opus_val16 *x, const opus_val16 *y, int N)
     return xy;
 }
 
-void dual_inner_prod_neon(const opus_val16 *x, const opus_val16 *y01, const opus_val16 *y02,
-        int N, opus_val32 *xy1, opus_val32 *xy2)
+void dual_inner_prod_neon(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
+        int N, oac_val32 *xy1, oac_val32 *xy2)
 {
     int i;
-    opus_val32 xy01, xy02;
+    oac_val32 xy01, xy02;
     float32x4_t xy01_f32x4 = vdupq_n_f32(0);
     float32x4_t xy02_f32x4 = vdupq_n_f32(0);
     float32x2_t xy01_f32x2, xy02_f32x2;
@@ -272,9 +272,9 @@ void dual_inner_prod_neon(const opus_val16 *x, const opus_val16 *y01, const opus
     *xy1 = xy01;
     *xy2 = xy02;
 
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     {
-        opus_val32 xy1_c, xy2_c;
+        oac_val32 xy1_c, xy2_c;
         float err[2];
         dual_inner_prod_neon_float_c_simulation(x, y01, y02, N, &xy1_c, &xy2_c, err);
         /*if (ABS32(xy1_c - *xy1) > err[0]) fprintf(stderr, "dual1 fail: %g %g %g\n", xy1_c, *xy1, err[0]);
diff --git a/celt/bands.c b/celt/bands.c
index 0b6190089..588177eff 100644
--- a/celt/bands.c
+++ b/celt/bands.c
@@ -43,7 +43,7 @@
 #include "quant_bands.h"
 #include "pitch.h"
 
-int hysteresis_decision(opus_val16 val, const opus_val16 *thresholds, const opus_val16 *hysteresis, int N, int prev)
+int hysteresis_decision(oac_val16 val, const oac_val16 *thresholds, const oac_val16 *hysteresis, int N, int prev)
 {
    int i;
    for (i=0;i<N;i++)
@@ -58,18 +58,18 @@ int hysteresis_decision(opus_val16 val, const opus_val16 *thresholds, const opus
    return i;
 }
 
-opus_uint32 celt_lcg_rand(opus_uint32 seed)
+oac_uint32 celt_lcg_rand(oac_uint32 seed)
 {
    return 1664525 * seed + 1013904223;
 }
 
 /* This is a cos() approximation designed to be bit-exact on any platform. Bit exactness
    with this approximation is important because it has an impact on the bit allocation */
-opus_int16 bitexact_cos(opus_int16 x)
+oac_int16 bitexact_cos(oac_int16 x)
 {
-   opus_int32 tmp;
-   opus_int16 x2;
-   tmp = (4096+((opus_int32)(x)*(x)))>>13;
+   oac_int32 tmp;
+   oac_int16 x2;
+   tmp = (4096+((oac_int32)(x)*(x)))>>13;
    celt_sig_assert(tmp<=32767);
    x2 = tmp;
    x2 = (32767-x2) + FRAC_MUL16(x2, (-7651 + FRAC_MUL16(x2, (8277 + FRAC_MUL16(-626, x2)))));
@@ -95,22 +95,22 @@ int bitexact_log2tan(int isin,int icos)
 void compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *bandE, int end, int C, int LM, int arch)
 {
    int i, c, N;
-   const opus_int16 *eBands = m->eBands;
+   const oac_int16 *eBands = m->eBands;
    (void)arch;
    N = m->shortMdctSize<<LM;
    c=0; do {
       for (i=0;i<end;i++)
       {
          int j;
-         opus_val32 maxval=0;
-         opus_val32 sum = 0;
+         oac_val32 maxval=0;
+         oac_val32 sum = 0;
 
          maxval = celt_maxabs32(&X[c*N+(eBands[i]<<LM)], (eBands[i+1]-eBands[i])<<LM);
          if (maxval > 0)
          {
             int shift = IMAX(0, 30 - celt_ilog2(maxval+(maxval>>14)+1) - ((((m->logN[i]+7)>>BITRES)+LM+1)>>1));
             j=eBands[i]<<LM; do {
-               opus_val32 x = SHL32(X[j+c*N],shift);
+               oac_val32 x = SHL32(X[j+c*N],shift);
                sum = ADD32(sum, MULT32_32_Q31(x, x));
             } while (++j<eBands[i+1]<<LM);
             bandE[i+c*m->nbEBands] = MAX32(maxval, PSHR32(celt_sqrt32(SHR32(sum,1)), shift));
@@ -122,16 +122,16 @@ void compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *band
 }
 
 /* Normalise each band such that the energy is one. */
-void normalise_bands(const CELTMode *m, const celt_sig * OPUS_RESTRICT freq, celt_norm * OPUS_RESTRICT X, const celt_ener *bandE, int end, int C, int M)
+void normalise_bands(const CELTMode *m, const celt_sig * OAC_RESTRICT freq, celt_norm * OAC_RESTRICT X, const celt_ener *bandE, int end, int C, int M)
 {
    int i, c, N;
-   const opus_int16 *eBands = m->eBands;
+   const oac_int16 *eBands = m->eBands;
    N = M*m->shortMdctSize;
    c=0; do {
       i=0; do {
          int j,shift;
-         opus_val32 E;
-         opus_val32 g;
+         oac_val32 E;
+         oac_val32 g;
          E = bandE[i+c*m->nbEBands];
          /* For very low energies, we need this to make sure not to prevent energy rounding from
             blowing up the normalized signal. */
@@ -151,12 +151,12 @@ void normalise_bands(const CELTMode *m, const celt_sig * OPUS_RESTRICT freq, cel
 void compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *bandE, int end, int C, int LM, int arch)
 {
    int i, c, N;
-   const opus_int16 *eBands = m->eBands;
+   const oac_int16 *eBands = m->eBands;
    N = m->shortMdctSize<<LM;
    c=0; do {
       for (i=0;i<end;i++)
       {
-         opus_val32 sum;
+         oac_val32 sum;
          sum = 1e-27f + celt_inner_prod(&X[c*N+(eBands[i]<<LM)], &X[c*N+(eBands[i]<<LM)], (eBands[i+1]-eBands[i])<<LM, arch);
          bandE[i+c*m->nbEBands] = celt_sqrt(sum);
          /*printf ("%f ", bandE[i+c*m->nbEBands]);*/
@@ -166,16 +166,16 @@ void compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *band
 }
 
 /* Normalise each band such that the energy is one. */
-void normalise_bands(const CELTMode *m, const celt_sig * OPUS_RESTRICT freq, celt_norm * OPUS_RESTRICT X, const celt_ener *bandE, int end, int C, int M)
+void normalise_bands(const CELTMode *m, const celt_sig * OAC_RESTRICT freq, celt_norm * OAC_RESTRICT X, const celt_ener *bandE, int end, int C, int M)
 {
    int i, c, N;
-   const opus_int16 *eBands = m->eBands;
+   const oac_int16 *eBands = m->eBands;
    N = M*m->shortMdctSize;
    c=0; do {
       for (i=0;i<end;i++)
       {
          int j;
-         opus_val16 g = 1.f/(1e-27f+bandE[i+c*m->nbEBands]);
+         oac_val16 g = 1.f/(1e-27f+bandE[i+c*m->nbEBands]);
          for (j=M*eBands[i];j<M*eBands[i+1];j++)
             X[j+c*N] = freq[j+c*N]*g;
       }
@@ -185,15 +185,15 @@ void normalise_bands(const CELTMode *m, const celt_sig * OPUS_RESTRICT freq, cel
 #endif /* FIXED_POINT */
 
 /* De-normalise the energy to produce the synthesis from the unit-energy bands */
-void denormalise_bands(const CELTMode *m, const celt_norm * OPUS_RESTRICT X,
-      celt_sig * OPUS_RESTRICT freq, const celt_glog *bandLogE, int start,
+void denormalise_bands(const CELTMode *m, const celt_norm * OAC_RESTRICT X,
+      celt_sig * OAC_RESTRICT freq, const celt_glog *bandLogE, int start,
       int end, int M, int downsample, int silence)
 {
    int i, N;
    int bound;
-   celt_sig * OPUS_RESTRICT f;
-   const celt_norm * OPUS_RESTRICT x;
-   const opus_int16 *eBands = m->eBands;
+   celt_sig * OAC_RESTRICT f;
+   const celt_norm * OAC_RESTRICT x;
+   const oac_int16 *eBands = m->eBands;
    N = M*m->shortMdctSize;
    bound = M*eBands[end];
    if (downsample!=1)
@@ -215,14 +215,14 @@ void denormalise_bands(const CELTMode *m, const celt_norm * OPUS_RESTRICT X,
    for (i=start;i<end;i++)
    {
       int j, band_end;
-      opus_val32 g;
+      oac_val32 g;
       celt_glog lg;
 #ifdef FIXED_POINT
       int shift;
 #endif
       j=M*eBands[i];
       band_end = M*eBands[i+1];
-      lg = ADD32(bandLogE[i], SHL32((opus_val32)eMeans[i],DB_SHIFT-4));
+      lg = ADD32(bandLogE[i], SHL32((oac_val32)eMeans[i],DB_SHIFT-4));
 #ifndef FIXED_POINT
       g = celt_exp2_db(MIN32(32.f, lg));
 #else
@@ -252,23 +252,23 @@ void denormalise_bands(const CELTMode *m, const celt_norm * OPUS_RESTRICT X,
       } while (++j<band_end);
    }
    celt_assert(start <= end);
-   OPUS_CLEAR(&freq[bound], N-bound);
+   OAC_CLEAR(&freq[bound], N-bound);
 }
 
 /* This prevents energy collapse for transients with multiple short MDCTs */
 void anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collapse_masks, int LM, int C, int size,
       int start, int end, const celt_glog *logE, const celt_glog *prev1logE,
-      const celt_glog *prev2logE, const int *pulses, opus_uint32 seed, int encode, int arch)
+      const celt_glog *prev2logE, const int *pulses, oac_uint32 seed, int encode, int arch)
 {
    int c, i, j, k;
    for (i=start;i<end;i++)
    {
       int N0;
-      opus_val16 thresh, sqrt_1;
+      oac_val16 thresh, sqrt_1;
       int depth;
 #ifdef FIXED_POINT
       int shift;
-      opus_val32 thresh32;
+      oac_val32 thresh32;
 #endif
 
       N0 = m->eBands[i+1]-m->eBands[i];
@@ -280,7 +280,7 @@ void anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collapse_mas
       thresh32 = SHR32(celt_exp2(-SHL16(depth, 10-BITRES)),1);
       thresh = MULT16_32_Q15(QCONST16(0.5f, 15), MIN32(32767,thresh32));
       {
-         opus_val32 t;
+         oac_val32 t;
          t = N0<<LM;
          shift = celt_ilog2(t)>>1;
          t = SHL32(t, (7-shift)<<1);
@@ -296,7 +296,7 @@ void anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collapse_mas
          celt_norm *X;
          celt_glog prev1;
          celt_glog prev2;
-         opus_val32 Ediff;
+         oac_val32 Ediff;
          celt_norm r;
          int renormalize=0;
          prev1 = prev1logE[c*m->nbEBands+i];
@@ -312,7 +312,7 @@ void anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collapse_mas
 #ifdef FIXED_POINT
          if (Ediff < GCONST(16.f))
          {
-            opus_val32 r32 = SHR32(celt_exp2_db(-Ediff),1);
+            oac_val32 r32 = SHR32(celt_exp2_db(-Ediff),1);
             r = 2*MIN16(16383,r32);
          } else {
             r = 0;
@@ -359,7 +359,7 @@ void anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collapse_mas
    corresponds to some quick-and-dirty perceptual experiments I ran to
    measure inter-aural masking (there doesn't seem to be any published data
    on the topic). */
-static void compute_channel_weights(celt_ener Ex, celt_ener Ey, opus_val16 w[2])
+static void compute_channel_weights(celt_ener Ex, celt_ener Ey, oac_val16 w[2])
 {
    celt_ener minE;
 #ifdef FIXED_POINT
@@ -376,13 +376,13 @@ static void compute_channel_weights(celt_ener Ex, celt_ener Ey, opus_val16 w[2])
    w[1] = VSHR32(Ey, shift);
 }
 
-static void intensity_stereo(const CELTMode *m, celt_norm * OPUS_RESTRICT X, const celt_norm * OPUS_RESTRICT Y, const celt_ener *bandE, int bandID, int N)
+static void intensity_stereo(const CELTMode *m, celt_norm * OAC_RESTRICT X, const celt_norm * OAC_RESTRICT Y, const celt_ener *bandE, int bandID, int N)
 {
    int i = bandID;
    int j;
-   opus_val16 a1, a2;
-   opus_val16 left, right;
-   opus_val16 norm;
+   oac_val16 a1, a2;
+   oac_val16 left, right;
+   oac_val16 norm;
 #ifdef FIXED_POINT
    int shift = celt_zlog2(MAX32(bandE[i], bandE[i+m->nbEBands]))-13;
 #endif
@@ -402,12 +402,12 @@ static void intensity_stereo(const CELTMode *m, celt_norm * OPUS_RESTRICT X, con
    }
 }
 
-static void stereo_split(celt_norm * OPUS_RESTRICT X, celt_norm * OPUS_RESTRICT Y, int N)
+static void stereo_split(celt_norm * OAC_RESTRICT X, celt_norm * OAC_RESTRICT Y, int N)
 {
    int j;
    for (j=0;j<N;j++)
    {
-      opus_val32 r, l;
+      oac_val32 r, l;
       l = MULT32_32_Q31(QCONST32(.70710678f,31), X[j]);
       r = MULT32_32_Q31(QCONST32(.70710678f,31), Y[j]);
       X[j] = ADD32(l, r);
@@ -415,15 +415,15 @@ static void stereo_split(celt_norm * OPUS_RESTRICT X, celt_norm * OPUS_RESTRICT
    }
 }
 
-static void stereo_merge(celt_norm * OPUS_RESTRICT X, celt_norm * OPUS_RESTRICT Y, opus_val32 mid, int N, int arch)
+static void stereo_merge(celt_norm * OAC_RESTRICT X, celt_norm * OAC_RESTRICT Y, oac_val32 mid, int N, int arch)
 {
    int j;
-   opus_val32 xp=0, side=0;
-   opus_val32 El, Er;
+   oac_val32 xp=0, side=0;
+   oac_val32 El, Er;
 #ifdef FIXED_POINT
    int kl, kr;
 #endif
-   opus_val32 t, lgain, rgain;
+   oac_val32 t, lgain, rgain;
 
    /* Compute the norm of X+Y and X-Y as |X|^2 + |Y|^2 +/- sum(xy) */
    xp = celt_inner_prod_norm_shift(Y, X, N, arch);
@@ -435,7 +435,7 @@ static void stereo_merge(celt_norm * OPUS_RESTRICT X, celt_norm * OPUS_RESTRICT
    Er = SHR32(MULT32_32_Q31(mid, mid),3) + side + 2*xp;
    if (Er < QCONST32(6e-4f, 28) || El < QCONST32(6e-4f, 28))
    {
-      OPUS_COPY(Y, X, N);
+      OAC_COPY(Y, X, N);
       return;
    }
 
@@ -473,7 +473,7 @@ int spreading_decision(const CELTMode *m, const celt_norm *X, int *average,
 {
    int i, c, N0;
    int sum = 0, nbBands=0;
-   const opus_int16 * OPUS_RESTRICT eBands = m->eBands;
+   const oac_int16 * OAC_RESTRICT eBands = m->eBands;
    int decision;
    int hf_sum=0;
 
@@ -488,14 +488,14 @@ int spreading_decision(const CELTMode *m, const celt_norm *X, int *average,
       {
          int j, N, tmp=0;
          int tcount[3] = {0,0,0};
-         const celt_norm * OPUS_RESTRICT x = X+M*eBands[i]+c*N0;
+         const celt_norm * OAC_RESTRICT x = X+M*eBands[i]+c*N0;
          N = M*(eBands[i+1]-eBands[i]);
          if (N<=8)
             continue;
          /* Compute rough CDF of |x[j]| */
          for (j=0;j<N;j++)
          {
-            opus_val32 x2N; /* Q13 */
+            oac_val32 x2N; /* Q13 */
 
             x2N = MULT16_16(MULT16_16_Q15(SHR32(x[j], NORM_SHIFT-14), SHR32(x[j], NORM_SHIFT-14)), N);
             if (x2N < QCONST16(0.25f,13))
@@ -535,7 +535,7 @@ int spreading_decision(const CELTMode *m, const celt_norm *X, int *average,
    /*printf("%d %d %d\n", hf_sum, *hf_average, *tapset_decision);*/
    celt_assert(nbBands>0); /* end has to be non-zero */
    celt_assert(sum>=0);
-   sum = celt_udiv((opus_int32)sum<<8, nbBands);
+   sum = celt_udiv((oac_int32)sum<<8, nbBands);
    /* Recursive averaging */
    sum = (sum+*average)>>1;
    *average = sum;
@@ -593,7 +593,7 @@ static void deinterleave_hadamard(celt_norm *X, int N0, int stride, int hadamard
          for (j=0;j<N0;j++)
             tmp[i*N0+j] = X[j*stride+i];
    }
-   OPUS_COPY(X, tmp, N);
+   OAC_COPY(X, tmp, N);
    RESTORE_STACK;
 }
 
@@ -616,7 +616,7 @@ static void interleave_hadamard(celt_norm *X, int N0, int stride, int hadamard)
          for (j=0;j<N0;j++)
             tmp[j*stride+i] = X[i*N0+j];
    }
-   OPUS_COPY(X, tmp, N);
+   OAC_COPY(X, tmp, N);
    RESTORE_STACK;
 }
 
@@ -627,7 +627,7 @@ void haar1(celt_norm *X, int N0, int stride)
    for (i=0;i<stride;i++)
       for (j=0;j<N0;j++)
       {
-         opus_val32 tmp1, tmp2;
+         oac_val32 tmp1, tmp2;
          tmp1 = MULT32_32_Q31(QCONST32(.70710678f,31), X[stride*2*j+i]);
          tmp2 = MULT32_32_Q31(QCONST32(.70710678f,31), X[stride*(2*j+1)+i]);
          X[stride*2*j+i] = ADD32(tmp1, tmp2);
@@ -637,7 +637,7 @@ void haar1(celt_norm *X, int N0, int stride)
 
 static int compute_qn(int N, int b, int offset, int pulse_cap, int stereo)
 {
-   static const opus_int16 exp2_table8[8] =
+   static const oac_int16 exp2_table8[8] =
       {16384, 17866, 19483, 21247, 23170, 25267, 27554, 30048};
    int qn, qb;
    int N2 = 2*N-1;
@@ -670,9 +670,9 @@ struct band_ctx {
    int spread;
    int tf_change;
    ec_ctx *ec;
-   opus_int32 remaining_bits;
+   oac_int32 remaining_bits;
    const celt_ener *bandE;
-   opus_uint32 seed;
+   oac_uint32 seed;
    int arch;
    int theta_round;
    int disable_inv;
@@ -702,7 +702,7 @@ static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
    int qalloc;
    int pulse_cap;
    int offset;
-   opus_int32 tell;
+   oac_int32 tell;
    int inv=0;
    int encode;
    const CELTMode *m;
@@ -740,15 +740,15 @@ static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
       {
          if (!stereo || ctx->theta_round == 0)
          {
-            itheta = (itheta*(opus_int32)qn+8192)>>14;
+            itheta = (itheta*(oac_int32)qn+8192)>>14;
             if (!stereo && ctx->avoid_split_noise && itheta > 0 && itheta < qn)
             {
                /* Check if the selected value of theta will cause the bit allocation
                   to inject noise on one side. If so, make sure the energy of that side
                   is zero. */
-               int unquantized = celt_udiv((opus_int32)itheta*16384, qn);
-               imid = bitexact_cos((opus_int16)unquantized);
-               iside = bitexact_cos((opus_int16)(16384-unquantized));
+               int unquantized = celt_udiv((oac_int32)itheta*16384, qn);
+               imid = bitexact_cos((oac_int16)unquantized);
+               iside = bitexact_cos((oac_int16)(16384-unquantized));
                delta = FRAC_MUL16((N-1)<<7,bitexact_log2tan(iside,imid));
                if (delta > *b)
                   itheta = qn;
@@ -759,7 +759,7 @@ static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
             int down;
             /* Bias quantization towards itheta=0 and itheta=16384. */
             int bias = itheta > 8192 ? 32767/qn : -32767/qn;
-            down = IMIN(qn-1, IMAX(0, (itheta*(opus_int32)qn + bias)>>14));
+            down = IMIN(qn-1, IMAX(0, (itheta*(oac_int32)qn + bias)>>14));
             if (ctx->theta_round < 0)
                itheta = down;
             else
@@ -814,14 +814,14 @@ static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
 
             if (fm < ((qn>>1)*((qn>>1) + 1)>>1))
             {
-               itheta = (isqrt32(8*(opus_uint32)fm + 1) - 1)>>1;
+               itheta = (isqrt32(8*(oac_uint32)fm + 1) - 1)>>1;
                fs = itheta + 1;
                fl = itheta*(itheta + 1)>>1;
             }
             else
             {
                itheta = (2*(qn + 1)
-                - isqrt32(8*(opus_uint32)(ft - fm - 1) + 1))>>1;
+                - isqrt32(8*(oac_uint32)(ft - fm - 1) + 1))>>1;
                fs = qn + 1 - itheta;
                fl = ft - ((qn + 1 - itheta)*(qn + 2 - itheta)>>1);
             }
@@ -830,8 +830,8 @@ static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
          }
       }
       celt_assert(itheta>=0);
-      itheta = celt_udiv((opus_int32)itheta*16384, qn);
-      itheta_q30 = (opus_int32)itheta<<16;
+      itheta = celt_udiv((oac_int32)itheta*16384, qn);
+      itheta_q30 = (oac_int32)itheta<<16;
       if (encode && stereo)
       {
          if (itheta==0)
@@ -883,8 +883,8 @@ static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
       *fill &= ((1<<B)-1)<<B;
       delta = 16384;
    } else {
-      imid = bitexact_cos((opus_int16)itheta);
-      iside = bitexact_cos((opus_int16)(16384-itheta));
+      imid = bitexact_cos((oac_int16)itheta);
+      iside = bitexact_cos((oac_int16)(16384-itheta));
       /* This is the mid vs side allocation that minimizes squared error
          in that band. */
       delta = FRAC_MUL16((N-1)<<7,bitexact_log2tan(iside,imid));
@@ -940,14 +940,14 @@ static unsigned quant_band_n1(struct band_ctx *ctx, celt_norm *X, celt_norm *Y,
 static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
       int N, int b, int B, celt_norm *lowband,
       int LM,
-      opus_val32 gain, int fill)
+      oac_val32 gain, int fill)
 {
    const unsigned char *cache;
    int q;
    int curr_bits;
    int imid=0, iside=0;
    int B0=B;
-   opus_val32 mid=0, side=0;
+   oac_val32 mid=0, side=0;
    unsigned cm=0;
    celt_norm *Y=NULL;
    int encode;
@@ -971,7 +971,7 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
       int qalloc;
       struct split_ctx sctx;
       celt_norm *next_lowband2=NULL;
-      opus_int32 rebalance;
+      oac_int32 rebalance;
 
       N >>= 1;
       Y = X+N;
@@ -1071,7 +1071,7 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
             fill &= cm_mask;
             if (!fill)
             {
-               OPUS_CLEAR(X, N);
+               OAC_CLEAR(X, N);
             } else {
                if (lowband == NULL)
                {
@@ -1079,14 +1079,14 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
                   for (j=0;j<N;j++)
                   {
                      ctx->seed = celt_lcg_rand(ctx->seed);
-                     X[j] = SHL32((celt_norm)((opus_int32)ctx->seed>>20), NORM_SHIFT-14);
+                     X[j] = SHL32((celt_norm)((oac_int32)ctx->seed>>20), NORM_SHIFT-14);
                   }
                   cm = cm_mask;
                } else {
                   /* Folded spectrum */
                   for (j=0;j<N;j++)
                   {
-                     opus_val16 tmp;
+                     oac_val16 tmp;
                      ctx->seed = celt_lcg_rand(ctx->seed);
                      /* About 48 dB below the "normal" folding level */
                      tmp = QCONST16(1.0f/256, NORM_SHIFT-4);
@@ -1104,7 +1104,7 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
    return cm;
 }
 
-unsigned cubic_quant_partition(struct band_ctx *ctx, celt_norm *X, int N, int b, int B, ec_ctx *ec, int LM, opus_val32 gain, int resynth, int encode)
+unsigned cubic_quant_partition(struct band_ctx *ctx, celt_norm *X, int N, int b, int B, ec_ctx *ec, int LM, oac_val32 gain, int resynth, int encode)
 {
    celt_assert(LM>=0);
    ctx->remaining_bits = ctx->ec->storage*8*8 - ec_tell_frac(ctx->ec);
@@ -1122,10 +1122,10 @@ unsigned cubic_quant_partition(struct band_ctx *ctx, celt_norm *X, int N, int b,
       return ret;
    } else {
       celt_norm *Y;
-      opus_int32 itheta_q30;
-      opus_val32 g1, g2;
-      opus_int32 theta_res;
-      opus_int32 qtheta;
+      oac_int32 itheta_q30;
+      oac_val32 g1, g2;
+      oac_int32 theta_res;
+      oac_int32 qtheta;
       int delta;
       int b1, b2;
       int cm;
@@ -1174,7 +1174,7 @@ unsigned cubic_quant_partition(struct band_ctx *ctx, celt_norm *X, int N, int b,
 static unsigned quant_band(struct band_ctx *ctx, celt_norm *X,
       int N, int b, int B, celt_norm *lowband,
       int LM, celt_norm *lowband_out,
-      opus_val32 gain, celt_norm *lowband_scratch, int fill)
+      oac_val32 gain, celt_norm *lowband_scratch, int fill)
 {
    int N0=N;
    int N_B=N;
@@ -1207,7 +1207,7 @@ static unsigned quant_band(struct band_ctx *ctx, celt_norm *X,
 
    if (lowband_scratch && lowband && (recombine || ((N_B&1) == 0 && tf_change<0) || B0>1))
    {
-      OPUS_COPY(lowband_scratch, lowband, N);
+      OAC_COPY(lowband_scratch, lowband, N);
       lowband = lowband_scratch;
    }
 
@@ -1285,7 +1285,7 @@ static unsigned quant_band(struct band_ctx *ctx, celt_norm *X,
       if (lowband_out)
       {
          int j;
-         opus_val16 n;
+         oac_val16 n;
          n = celt_sqrt(SHL32(EXTEND32(N0),22));
          for (j=0;j<N0;j++)
             lowband_out[j] = MULT16_32_Q15(n,X[j]);
@@ -1309,7 +1309,7 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
 {
    int imid=0, iside=0;
    int inv = 0;
-   opus_val32 mid=0, side=0;
+   oac_val32 mid=0, side=0;
    unsigned cm=0;
    int mbits, sbits, delta;
    int itheta;
@@ -1332,8 +1332,8 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
 
    if (encode) {
       if (ctx->bandE[ctx->i] < MIN_STEREO_ENERGY || ctx->bandE[ctx->m->nbEBands+ctx->i] < MIN_STEREO_ENERGY) {
-         if (ctx->bandE[ctx->i] > ctx->bandE[ctx->m->nbEBands+ctx->i]) OPUS_COPY(Y, X, N);
-         else OPUS_COPY(X, Y, N);
+         if (ctx->bandE[ctx->i] > ctx->bandE[ctx->m->nbEBands+ctx->i]) OAC_COPY(Y, X, N);
+         else OAC_COPY(X, Y, N);
       }
    }
    compute_theta(ctx, &sctx, X, Y, N, &b, B, B, LM, 1, &fill);
@@ -1409,7 +1409,7 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
       }
    } else {
       /* "Normal" split code */
-      opus_int32 rebalance;
+      oac_int32 rebalance;
 
       mbits = IMAX(0, IMIN(b, (b-delta)/2));
       sbits = b-mbits;
@@ -1463,28 +1463,28 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
 static void special_hybrid_folding(const CELTMode *m, celt_norm *norm, celt_norm *norm2, int start, int M, int dual_stereo)
 {
    int n1, n2;
-   const opus_int16 * OPUS_RESTRICT eBands = m->eBands;
+   const oac_int16 * OAC_RESTRICT eBands = m->eBands;
    n1 = M*(eBands[start+1]-eBands[start]);
    n2 = M*(eBands[start+2]-eBands[start+1]);
    /* Duplicate enough of the first band folding data to be able to fold the second band.
       Copies no data for CELT-only mode. */
-   OPUS_COPY(&norm[n1], &norm[2*n1 - n2], n2-n1);
+   OAC_COPY(&norm[n1], &norm[2*n1 - n2], n2-n1);
    if (dual_stereo)
-      OPUS_COPY(&norm2[n1], &norm2[2*n1 - n2], n2-n1);
+      OAC_COPY(&norm2[n1], &norm2[2*n1 - n2], n2-n1);
 }
 #endif
 
 void quant_all_bands(int encode, const CELTMode *m, int start, int end,
       celt_norm *X_, celt_norm *Y_, unsigned char *collapse_masks,
       const celt_ener *bandE, int *pulses, int shortBlocks, int spread,
-      int dual_stereo, int intensity, int *tf_res, opus_int32 total_bits,
-      opus_int32 balance, ec_ctx *ec, int LM, int codedBands,
-      opus_uint32 *seed, int complexity, int arch, int disable_inv)
+      int dual_stereo, int intensity, int *tf_res, oac_int32 total_bits,
+      oac_int32 balance, ec_ctx *ec, int LM, int codedBands,
+      oac_uint32 *seed, int complexity, int arch, int disable_inv)
 {
    int i;
-   opus_int32 remaining_bits;
-   const opus_int16 * OPUS_RESTRICT eBands = m->eBands;
-   celt_norm * OPUS_RESTRICT norm, * OPUS_RESTRICT norm2;
+   oac_int32 remaining_bits;
+   const oac_int16 * OAC_RESTRICT eBands = m->eBands;
+   celt_norm * OAC_RESTRICT norm, * OAC_RESTRICT norm2;
    VARDECL(celt_norm, _norm);
    VARDECL(celt_norm, _lowband_scratch);
    VARDECL(celt_norm, X_save);
@@ -1555,12 +1555,12 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
    ctx.avoid_split_noise = B > 1;
    for (i=start;i<end;i++)
    {
-      opus_int32 tell;
+      oac_int32 tell;
       int b;
       int N;
-      opus_int32 curr_balance;
+      oac_int32 curr_balance;
       int effective_lowband=-1;
-      celt_norm * OPUS_RESTRICT X, * OPUS_RESTRICT Y;
+      celt_norm * OAC_RESTRICT X, * OAC_RESTRICT Y;
       int tf_change=0;
       unsigned x_cm;
       unsigned y_cm;
@@ -1666,18 +1666,18 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
             {
                ec_ctx ec_save, ec_save2;
                struct band_ctx ctx_save, ctx_save2;
-               opus_val32 dist0, dist1;
+               oac_val32 dist0, dist1;
                unsigned cm, cm2;
                int nstart_bytes, nend_bytes, save_bytes;
                unsigned char *bytes_buf;
-               opus_val16 w[2];
+               oac_val16 w[2];
                compute_channel_weights(bandE[i], bandE[i+m->nbEBands], w);
                /* Make a copy. */
                cm = x_cm|y_cm;
                ec_save = *ec;
                ctx_save = ctx;
-               OPUS_COPY(X_save, X, N);
-               OPUS_COPY(Y_save, Y, N);
+               OAC_COPY(X_save, X, N);
+               OAC_COPY(Y_save, Y, N);
                /* Encode and round down. */
                ctx.theta_round = -1;
                x_cm = quant_band_stereo(&ctx, X, Y, N, b, B,
@@ -1689,21 +1689,21 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
                cm2 = x_cm;
                ec_save2 = *ec;
                ctx_save2 = ctx;
-               OPUS_COPY(X_save2, X, N);
-               OPUS_COPY(Y_save2, Y, N);
+               OAC_COPY(X_save2, X, N);
+               OAC_COPY(Y_save2, Y, N);
                if (!last)
-                  OPUS_COPY(norm_save2, norm+M*eBands[i]-norm_offset, N);
+                  OAC_COPY(norm_save2, norm+M*eBands[i]-norm_offset, N);
                nstart_bytes = ec_save.offs;
                nend_bytes = ec_save.storage;
                bytes_buf = ec_save.buf+nstart_bytes;
                save_bytes = nend_bytes-nstart_bytes;
-               OPUS_COPY(bytes_save, bytes_buf, save_bytes);
+               OAC_COPY(bytes_save, bytes_buf, save_bytes);
 
                /* Restore */
                *ec = ec_save;
                ctx = ctx_save;
-               OPUS_COPY(X, X_save, N);
-               OPUS_COPY(Y, Y_save, N);
+               OAC_COPY(X, X_save, N);
+               OAC_COPY(Y, Y_save, N);
 #ifndef DISABLE_UPDATE_DRAFT
                if (i == start+1)
                   special_hybrid_folding(m, norm, norm2, start, M, dual_stereo);
@@ -1718,11 +1718,11 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
                   x_cm = cm2;
                   *ec = ec_save2;
                   ctx = ctx_save2;
-                  OPUS_COPY(X, X_save2, N);
-                  OPUS_COPY(Y, Y_save2, N);
+                  OAC_COPY(X, X_save2, N);
+                  OAC_COPY(Y, Y_save2, N);
                   if (!last)
-                     OPUS_COPY(norm+M*eBands[i]-norm_offset, norm_save2, N);
-                  OPUS_COPY(bytes_buf, bytes_save, save_bytes);
+                     OAC_COPY(norm+M*eBands[i]-norm_offset, norm_save2, N);
+                  OAC_COPY(bytes_buf, bytes_save, save_bytes);
                }
             } else {
                ctx.theta_round = 0;
diff --git a/celt/bands.h b/celt/bands.h
index 8d44bfb69..de8b213c8 100644
--- a/celt/bands.h
+++ b/celt/bands.h
@@ -36,7 +36,7 @@
 #include "entdec.h"
 #include "rate.h"
 
-opus_int16 bitexact_cos(opus_int16 x);
+oac_int16 bitexact_cos(oac_int16 x);
 int bitexact_log2tan(int isin,int icos);
 
 /** Compute the amplitude (sqrt energy) in each of the bands
@@ -46,7 +46,7 @@ int bitexact_log2tan(int isin,int icos);
  */
 void compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *bandE, int end, int C, int LM, int arch);
 
-/*void compute_noise_energies(const CELTMode *m, const celt_sig *X, const opus_val16 *tonality, celt_ener *bandE);*/
+/*void compute_noise_energies(const CELTMode *m, const celt_sig *X, const oac_val16 *tonality, celt_ener *bandE);*/
 
 /** Normalise each band of X such that the energy in each band is
     equal to 1
@@ -54,15 +54,15 @@ void compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *band
  * @param X Spectrum (returned normalised)
  * @param bandE Square root of the energy for each band
  */
-void normalise_bands(const CELTMode *m, const celt_sig * OPUS_RESTRICT freq, celt_norm * OPUS_RESTRICT X, const celt_ener *bandE, int end, int C, int M);
+void normalise_bands(const CELTMode *m, const celt_sig * OAC_RESTRICT freq, celt_norm * OAC_RESTRICT X, const celt_ener *bandE, int end, int C, int M);
 
 /** Denormalise each band of X to restore full amplitude
  * @param m Mode data
  * @param X Spectrum (returned de-normalised)
  * @param bandE Square root of the energy for each band
  */
-void denormalise_bands(const CELTMode *m, const celt_norm * OPUS_RESTRICT X,
-      celt_sig * OPUS_RESTRICT freq, const celt_glog *bandE, int start,
+void denormalise_bands(const CELTMode *m, const celt_norm * OAC_RESTRICT X,
+      celt_sig * OAC_RESTRICT freq, const celt_glog *bandE, int start,
       int end, int M, int downsample, int silence);
 
 #define SPREAD_NONE       (0)
@@ -101,23 +101,23 @@ void haar1(celt_norm *X, int N0, int stride);
  * @param LM log2() of the number of 2.5 subframes in the frame
  * @param codedBands Last band to receive bits + 1
  * @param seed Random generator seed
- * @param arch Run-time architecture (see opus_select_arch())
+ * @param arch Run-time architecture (see oac_select_arch())
  */
 void quant_all_bands(int encode, const CELTMode *m, int start, int end,
       celt_norm * X, celt_norm * Y, unsigned char *collapse_masks,
       const celt_ener *bandE, int *pulses, int shortBlocks, int spread,
-      int dual_stereo, int intensity, int *tf_res, opus_int32 total_bits,
-      opus_int32 balance, ec_ctx *ec, int M, int codedBands, opus_uint32 *seed,
+      int dual_stereo, int intensity, int *tf_res, oac_int32 total_bits,
+      oac_int32 balance, ec_ctx *ec, int M, int codedBands, oac_uint32 *seed,
       int complexity, int arch, int disable_inv);
 
 void anti_collapse(const CELTMode *m, celt_norm *X_,
       unsigned char *collapse_masks, int LM, int C, int size, int start,
       int end, const celt_glog *logE, const celt_glog *prev1logE,
-      const celt_glog *prev2logE, const int *pulses, opus_uint32 seed,
+      const celt_glog *prev2logE, const int *pulses, oac_uint32 seed,
       int encode, int arch);
 
-opus_uint32 celt_lcg_rand(opus_uint32 seed);
+oac_uint32 celt_lcg_rand(oac_uint32 seed);
 
-int hysteresis_decision(opus_val16 val, const opus_val16 *thresholds, const opus_val16 *hysteresis, int N, int prev);
+int hysteresis_decision(oac_val16 val, const oac_val16 *thresholds, const oac_val16 *hysteresis, int N, int prev);
 
 #endif /* BANDS_H */
diff --git a/celt/celt.c b/celt/celt.c
index c0db73739..70a2165b0 100644
--- a/celt/celt.c
+++ b/celt/celt.c
@@ -59,7 +59,7 @@
 #endif
 
 
-int resampling_factor(opus_int32 rate)
+int resampling_factor(oac_int32 rate)
 {
    int ret;
    switch (rate)
@@ -95,14 +95,14 @@ int resampling_factor(opus_int32 rate)
 
 #if !defined(OVERRIDE_COMB_FILTER_CONST) || defined(NON_STATIC_COMB_FILTER_CONST_C)
 /* This version should be faster on ARM */
-#ifdef OPUS_ARM_ASM
+#ifdef OAC_ARM_ASM
 #ifndef NON_STATIC_COMB_FILTER_CONST_C
 static
 #endif
-void comb_filter_const_c(opus_val32 *y, opus_val32 *x, int T, int N,
+void comb_filter_const_c(oac_val32 *y, oac_val32 *x, int T, int N,
       celt_coef g10, celt_coef g11, celt_coef g12)
 {
-   opus_val32 x0, x1, x2, x3, x4;
+   oac_val32 x0, x1, x2, x3, x4;
    int i;
    x4 = SHL32(x[-T-2], 1);
    x3 = SHL32(x[-T-1], 1);
@@ -110,7 +110,7 @@ void comb_filter_const_c(opus_val32 *y, opus_val32 *x, int T, int N,
    x1 = SHL32(x[-T+1], 1);
    for (i=0;i<N-4;i+=5)
    {
-      opus_val32 t;
+      oac_val32 t;
       x0=SHL32(x[i-T+2],1);
       t = MAC_COEF_32_ARM(x[i], g10, x2);
       t = MAC_COEF_32_ARM(t, g11, ADD32(x1,x3));
@@ -145,7 +145,7 @@ void comb_filter_const_c(opus_val32 *y, opus_val32 *x, int T, int N,
 #ifdef CUSTOM_MODES
    for (;i<N;i++)
    {
-      opus_val32 t;
+      oac_val32 t;
       x0=SHL32(x[i-T+2],1);
       t = MAC_COEF_32_ARM(x[i], g10, x2);
       t = MAC_COEF_32_ARM(t, g11, ADD32(x1,x3));
@@ -163,10 +163,10 @@ void comb_filter_const_c(opus_val32 *y, opus_val32 *x, int T, int N,
 #ifndef NON_STATIC_COMB_FILTER_CONST_C
 static
 #endif
-void comb_filter_const_c(opus_val32 *y, opus_val32 *x, int T, int N,
+void comb_filter_const_c(oac_val32 *y, oac_val32 *x, int T, int N,
       celt_coef g10, celt_coef g11, celt_coef g12)
 {
-   opus_val32 x0, x1, x2, x3, x4;
+   oac_val32 x0, x1, x2, x3, x4;
    int i;
    x4 = x[-T-2];
    x3 = x[-T-1];
@@ -195,12 +195,12 @@ void comb_filter_const_c(opus_val32 *y, opus_val32 *x, int T, int N,
 #endif
 
 #ifdef ENABLE_QEXT
-void comb_filter_qext(opus_val32 *y, opus_val32 *x, int T0, int T1, int N,
-      opus_val16 g0, opus_val16 g1, int tapset0, int tapset1,
+void comb_filter_qext(oac_val32 *y, oac_val32 *x, int T0, int T1, int N,
+      oac_val16 g0, oac_val16 g1, int tapset0, int tapset1,
       const celt_coef *window, int overlap, int arch)
 {
-   VARDECL(opus_val32, mem_buf);
-   VARDECL(opus_val32, buf);
+   VARDECL(oac_val32, mem_buf);
+   VARDECL(oac_val32, buf);
    celt_coef new_window[120];
    int s;
    int i;
@@ -209,15 +209,15 @@ void comb_filter_qext(opus_val32 *y, opus_val32 *x, int T0, int T1, int N,
    SAVE_STACK;
    /* Using ALLOC() instead of a regular stack allocation to minimize real stack use when using the pseudostack.
       This is useful on some embedded systems. */
-   ALLOC(mem_buf, COMBFILTER_MAXPERIOD+960, opus_val32);
-   ALLOC(buf, COMBFILTER_MAXPERIOD+960, opus_val32);
+   ALLOC(mem_buf, COMBFILTER_MAXPERIOD+960, oac_val32);
+   ALLOC(buf, COMBFILTER_MAXPERIOD+960, oac_val32);
    N2 = N/2;
    overlap2=overlap/2;
    /* At 96 kHz, we double the period and the spacing between taps, which is equivalent
       to creating a mirror image of the filter around 24 kHz. It also means we can process
       the even and odd samples completely independently. */
    for (s=0;s<2;s++) {
-      opus_val32 *yptr;
+      oac_val32 *yptr;
       for (i=0;i<overlap2;i++) new_window[i] = window[2*i+s];
       for (i=0;i<COMBFILTER_MAXPERIOD+N2;i++) mem_buf[i] = x[2*i+s-2*COMBFILTER_MAXPERIOD];
       if (x==y) {
@@ -235,15 +235,15 @@ void comb_filter_qext(opus_val32 *y, opus_val32 *x, int T0, int T1, int N,
 #endif
 
 #ifndef OVERRIDE_comb_filter
-void comb_filter(opus_val32 *y, opus_val32 *x, int T0, int T1, int N,
-      opus_val16 g0, opus_val16 g1, int tapset0, int tapset1,
+void comb_filter(oac_val32 *y, oac_val32 *x, int T0, int T1, int N,
+      oac_val16 g0, oac_val16 g1, int tapset0, int tapset1,
       const celt_coef *window, int overlap, int arch)
 {
    int i;
    /* printf ("%d %d %f %f\n", T0, T1, g0, g1); */
    celt_coef g00, g01, g02, g10, g11, g12;
-   opus_val32 x0, x1, x2, x3, x4;
-   static const opus_val16 gains[3][3] = {
+   oac_val32 x0, x1, x2, x3, x4;
+   static const oac_val16 gains[3][3] = {
          {QCONST16(0.3066406250f, 15), QCONST16(0.2170410156f, 15), QCONST16(0.1296386719f, 15)},
          {QCONST16(0.4638671875f, 15), QCONST16(0.2680664062f, 15), QCONST16(0.f, 15)},
          {QCONST16(0.7998046875f, 15), QCONST16(0.1000976562f, 15), QCONST16(0.f, 15)}};
@@ -255,9 +255,9 @@ void comb_filter(opus_val32 *y, opus_val32 *x, int T0, int T1, int N,
 #endif
    if (g0==0 && g1==0)
    {
-      /* OPT: Happens to work without the OPUS_MOVE(), but only because the current encoder already copies x to y */
+      /* OPT: Happens to work without the OAC_MOVE(), but only because the current encoder already copies x to y */
       if (x!=y)
-         OPUS_MOVE(y, x, N);
+         OAC_MOVE(y, x, N);
       return;
    }
    /* When the gain is zero, T0 and/or T1 is set to zero. We need
@@ -302,9 +302,9 @@ void comb_filter(opus_val32 *y, opus_val32 *x, int T0, int T1, int N,
    }
    if (g1==0)
    {
-      /* OPT: Happens to work without the OPUS_MOVE(), but only because the current encoder already copies x to y */
+      /* OPT: Happens to work without the OAC_MOVE(), but only because the current encoder already copies x to y */
       if (x!=y)
-         OPUS_MOVE(y+overlap, x+overlap, N-overlap);
+         OAC_MOVE(y+overlap, x+overlap, N-overlap);
       return;
    }
 
@@ -339,7 +339,7 @@ void init_caps(const CELTMode *m,int *cap,int LM,int C)
 
 
 
-const char *opus_strerror(int error)
+const char *oac_strerror(int error)
 {
    static const char * const error_strings[8] = {
       "success",
@@ -357,9 +357,9 @@ const char *opus_strerror(int error)
       return error_strings[-error];
 }
 
-const char *opus_get_version_string(void)
+const char *oac_get_version_string(void)
 {
-    return "libopus " PACKAGE_VERSION
+    return "liboac " PACKAGE_VERSION
     /* Applications may rely on the presence of this substring in the version
        string to determine if they have a fixed-point or floating-point build
        at runtime. */
diff --git a/celt/celt.h b/celt/celt.h
index 79721dbbf..073e6050d 100644
--- a/celt/celt.h
+++ b/celt/celt.h
@@ -35,9 +35,9 @@
 #ifndef CELT_H
 #define CELT_H
 
-#include "opus_types.h"
-#include "opus_defines.h"
-#include "opus_custom.h"
+#include "oac_types.h"
+#include "oac_defines.h"
+#include "oac_custom.h"
 #include "entenc.h"
 #include "entdec.h"
 #include "arch.h"
@@ -47,9 +47,9 @@
 #include "lpcnet.h"
 #endif
 
-#define CELTEncoder OpusCustomEncoder
-#define CELTDecoder OpusCustomDecoder
-#define CELTMode OpusCustomMode
+#define CELTEncoder OacCustomEncoder
+#define CELTDecoder OacCustomDecoder
+#define CELTMode OacCustomMode
 
 #define LEAK_BANDS 19
 
@@ -91,55 +91,55 @@ typedef struct {
     1=Short term interframe prediction allowed
     2=Long term prediction allowed
  */
-#define CELT_SET_PREDICTION(x) CELT_SET_PREDICTION_REQUEST, opus_check_int(x)
+#define CELT_SET_PREDICTION(x) CELT_SET_PREDICTION_REQUEST, oac_check_int(x)
 
 #define CELT_SET_INPUT_CLIPPING_REQUEST    10004
-#define CELT_SET_INPUT_CLIPPING(x) CELT_SET_INPUT_CLIPPING_REQUEST, opus_check_int(x)
+#define CELT_SET_INPUT_CLIPPING(x) CELT_SET_INPUT_CLIPPING_REQUEST, oac_check_int(x)
 
 #define CELT_GET_AND_CLEAR_ERROR_REQUEST   10007
-#define CELT_GET_AND_CLEAR_ERROR(x) CELT_GET_AND_CLEAR_ERROR_REQUEST, opus_check_int_ptr(x)
+#define CELT_GET_AND_CLEAR_ERROR(x) CELT_GET_AND_CLEAR_ERROR_REQUEST, oac_check_int_ptr(x)
 
 #define CELT_SET_CHANNELS_REQUEST    10008
-#define CELT_SET_CHANNELS(x) CELT_SET_CHANNELS_REQUEST, opus_check_int(x)
+#define CELT_SET_CHANNELS(x) CELT_SET_CHANNELS_REQUEST, oac_check_int(x)
 
 
 /* Internal */
 #define CELT_SET_START_BAND_REQUEST    10010
-#define CELT_SET_START_BAND(x) CELT_SET_START_BAND_REQUEST, opus_check_int(x)
+#define CELT_SET_START_BAND(x) CELT_SET_START_BAND_REQUEST, oac_check_int(x)
 
 #define CELT_SET_END_BAND_REQUEST    10012
-#define CELT_SET_END_BAND(x) CELT_SET_END_BAND_REQUEST, opus_check_int(x)
+#define CELT_SET_END_BAND(x) CELT_SET_END_BAND_REQUEST, oac_check_int(x)
 
 #define CELT_GET_MODE_REQUEST    10015
 /** Get the CELTMode used by an encoder or decoder */
 #define CELT_GET_MODE(x) CELT_GET_MODE_REQUEST, celt_check_mode_ptr_ptr(x)
 
 #define CELT_SET_SIGNALLING_REQUEST    10016
-#define CELT_SET_SIGNALLING(x) CELT_SET_SIGNALLING_REQUEST, opus_check_int(x)
+#define CELT_SET_SIGNALLING(x) CELT_SET_SIGNALLING_REQUEST, oac_check_int(x)
 
 #define CELT_SET_TONALITY_REQUEST    10018
-#define CELT_SET_TONALITY(x) CELT_SET_TONALITY_REQUEST, opus_check_int(x)
+#define CELT_SET_TONALITY(x) CELT_SET_TONALITY_REQUEST, oac_check_int(x)
 #define CELT_SET_TONALITY_SLOPE_REQUEST    10020
-#define CELT_SET_TONALITY_SLOPE(x) CELT_SET_TONALITY_SLOPE_REQUEST, opus_check_int(x)
+#define CELT_SET_TONALITY_SLOPE(x) CELT_SET_TONALITY_SLOPE_REQUEST, oac_check_int(x)
 
 #define CELT_SET_ANALYSIS_REQUEST    10022
 #define CELT_SET_ANALYSIS(x) CELT_SET_ANALYSIS_REQUEST, celt_check_analysis_ptr(x)
 
-#define OPUS_SET_LFE_REQUEST    10024
-#define OPUS_SET_LFE(x) OPUS_SET_LFE_REQUEST, opus_check_int(x)
+#define OAC_SET_LFE_REQUEST    10024
+#define OAC_SET_LFE(x) OAC_SET_LFE_REQUEST, oac_check_int(x)
 
-#define OPUS_SET_ENERGY_MASK_REQUEST    10026
-#define OPUS_SET_ENERGY_MASK(x) OPUS_SET_ENERGY_MASK_REQUEST, celt_check_glog_ptr(x)
+#define OAC_SET_ENERGY_MASK_REQUEST    10026
+#define OAC_SET_ENERGY_MASK(x) OAC_SET_ENERGY_MASK_REQUEST, celt_check_glog_ptr(x)
 
 #define CELT_SET_SILK_INFO_REQUEST    10028
 #define CELT_SET_SILK_INFO(x) CELT_SET_SILK_INFO_REQUEST, celt_check_silkinfo_ptr(x)
 
 
-static OPUS_INLINE opus_int32 bits_to_bitrate(opus_int32 bits, opus_int32 Fs, opus_int32 frame_size) {
+static OAC_INLINE oac_int32 bits_to_bitrate(oac_int32 bits, oac_int32 Fs, oac_int32 frame_size) {
    return bits*(6*Fs/frame_size)/6;
 }
 
-static OPUS_INLINE opus_int32 bitrate_to_bits(opus_int32 bitrate, opus_int32 Fs, opus_int32 frame_size) {
+static OAC_INLINE oac_int32 bitrate_to_bits(oac_int32 bitrate, oac_int32 Fs, oac_int32 frame_size) {
    return bitrate*6/(6*Fs/frame_size);
 }
 
@@ -147,9 +147,9 @@ static OPUS_INLINE opus_int32 bitrate_to_bits(opus_int32 bitrate, opus_int32 Fs,
 
 int celt_encoder_get_size(int channels);
 
-int celt_encode_with_ec(OpusCustomEncoder * OPUS_RESTRICT st, const opus_res * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes, ec_enc *enc);
+int celt_encode_with_ec(OacCustomEncoder * OAC_RESTRICT st, const oac_res * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes, ec_enc *enc);
 
-int celt_encoder_init(CELTEncoder *st, opus_int32 sampling_rate, int channels,
+int celt_encoder_init(CELTEncoder *st, oac_int32 sampling_rate, int channels,
                       int arch);
 
 
@@ -159,26 +159,26 @@ int celt_encoder_init(CELTEncoder *st, opus_int32 sampling_rate, int channels,
 int celt_decoder_get_size(int channels);
 
 
-int celt_decoder_init(CELTDecoder *st, opus_int32 sampling_rate, int channels);
+int celt_decoder_init(CELTDecoder *st, oac_int32 sampling_rate, int channels);
 
-int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char *data,
-      int len, opus_res * OPUS_RESTRICT pcm, int frame_size, ec_dec *dec, int accum
+int celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char *data,
+      int len, oac_res * OAC_RESTRICT pcm, int frame_size, ec_dec *dec, int accum
 #ifdef ENABLE_DEEP_PLC
       ,LPCNetPLCState *lpcnet
 #endif
       );
 
-int celt_decode_with_ec(OpusCustomDecoder * OPUS_RESTRICT st, const unsigned char *data,
-      int len, opus_res * OPUS_RESTRICT pcm, int frame_size, ec_dec *dec, int accum);
+int celt_decode_with_ec(OacCustomDecoder * OAC_RESTRICT st, const unsigned char *data,
+      int len, oac_res * OAC_RESTRICT pcm, int frame_size, ec_dec *dec, int accum);
 
-#define celt_encoder_ctl opus_custom_encoder_ctl
-#define celt_decoder_ctl opus_custom_decoder_ctl
+#define celt_encoder_ctl oac_custom_encoder_ctl
+#define celt_decoder_ctl oac_custom_decoder_ctl
 
 
-#if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API)
-#define OPUS_CUSTOM_NOSTATIC
+#if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
+#define OAC_CUSTOM_NOSTATIC
 #else
-#define OPUS_CUSTOM_NOSTATIC static OPUS_INLINE
+#define OAC_CUSTOM_NOSTATIC static OAC_INLINE
 #endif
 
 static const unsigned char trim_icdf[11] = {126, 124, 119, 109, 87, 41, 19, 9, 4, 2, 0};
@@ -187,8 +187,8 @@ static const unsigned char spread_icdf[4] = {25, 23, 2, 0};
 
 static const unsigned char tapset_icdf[3]={2,1,0};
 
-#if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API)
-static const unsigned char toOpusTable[20] = {
+#if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
+static const unsigned char toOacTable[20] = {
       0xE0, 0xE8, 0xF0, 0xF8,
       0xC0, 0xC8, 0xD0, 0xD8,
       0xA0, 0xA8, 0xB0, 0xB8,
@@ -196,30 +196,30 @@ static const unsigned char toOpusTable[20] = {
       0x80, 0x88, 0x90, 0x98,
 };
 
-static const unsigned char fromOpusTable[16] = {
+static const unsigned char fromOacTable[16] = {
       0x80, 0x88, 0x90, 0x98,
       0x40, 0x48, 0x50, 0x58,
       0x20, 0x28, 0x30, 0x38,
       0x00, 0x08, 0x10, 0x18
 };
 
-static OPUS_INLINE int toOpus(unsigned char c)
+static OAC_INLINE int toOac(unsigned char c)
 {
    int ret=0;
    if (c<0xA0)
-      ret = toOpusTable[c>>3];
+      ret = toOacTable[c>>3];
    if (ret == 0)
       return -1;
    else
       return ret|(c&0x7);
 }
 
-static OPUS_INLINE int fromOpus(unsigned char c)
+static OAC_INLINE int fromOac(unsigned char c)
 {
    if (c<0x80)
       return -1;
    else
-      return fromOpusTable[(c>>3)-16] | (c&0x7);
+      return fromOacTable[(c>>3)-16] | (c&0x7);
 }
 #endif /* CUSTOM_MODES */
 
@@ -235,19 +235,19 @@ void validate_celt_decoder(CELTDecoder *st);
 #define VALIDATE_CELT_DECODER(st)
 #endif
 
-int resampling_factor(opus_int32 rate);
+int resampling_factor(oac_int32 rate);
 
-void celt_preemphasis(const opus_res * OPUS_RESTRICT pcmp, celt_sig * OPUS_RESTRICT inp,
-                        int N, int CC, int upsample, const opus_val16 *coef, celt_sig *mem, int clip);
+void celt_preemphasis(const oac_res * OAC_RESTRICT pcmp, celt_sig * OAC_RESTRICT inp,
+                        int N, int CC, int upsample, const oac_val16 *coef, celt_sig *mem, int clip);
 
-void comb_filter(opus_val32 *y, opus_val32 *x, int T0, int T1, int N,
-      opus_val16 g0, opus_val16 g1, int tapset0, int tapset1,
+void comb_filter(oac_val32 *y, oac_val32 *x, int T0, int T1, int N,
+      oac_val16 g0, oac_val16 g1, int tapset0, int tapset1,
       const celt_coef *window, int overlap, int arch);
 
 void init_caps(const CELTMode *m,int *cap,int LM,int C);
 
 #ifdef RESYNTH
-void deemphasis(celt_sig *in[], opus_res *pcm, int N, int C, int downsample, const opus_val16 *coef, celt_sig *mem, int accum);
+void deemphasis(celt_sig *in[], oac_res *pcm, int N, int C, int downsample, const oac_val16 *coef, celt_sig *mem, int accum);
 void celt_synthesis(const CELTMode *mode, celt_norm *X, celt_sig * out_syn[],
       celt_glog *oldBandE, int start, int effEnd, int C, int CC, int isTransient,
       int LM, int downsample, int silence, int arch);
diff --git a/celt/celt_decoder.c b/celt/celt_decoder.c
index d5783ff1e..ac2e40816 100644
--- a/celt/celt_decoder.c
+++ b/celt/celt_decoder.c
@@ -84,8 +84,8 @@
 /** Decoder state
  @brief Decoder state
  */
-struct OpusCustomDecoder {
-   const OpusCustomMode *mode;
+struct OacCustomDecoder {
+   const OacCustomMode *mode;
    int overlap;
    int channels;
    int stream_channels;
@@ -103,7 +103,7 @@ struct OpusCustomDecoder {
    /* Everything beyond this point gets cleared on a reset */
 #define DECODER_RESET_START rng
 
-   opus_uint32 rng;
+   oac_uint32 rng;
    int error;
    int last_pitch_index;
    int loss_duration;
@@ -112,8 +112,8 @@ struct OpusCustomDecoder {
    int skip_plc;
    int postfilter_period;
    int postfilter_period_old;
-   opus_val16 postfilter_gain;
-   opus_val16 postfilter_gain_old;
+   oac_val16 postfilter_gain;
+   oac_val16 postfilter_gain_old;
    int postfilter_tapset;
    int postfilter_tapset_old;
    int prefilter_and_fold;
@@ -121,7 +121,7 @@ struct OpusCustomDecoder {
    celt_sig preemph_memD[2];
 
 #ifdef ENABLE_DEEP_PLC
-   opus_int16 plc_pcm[PLC_UPDATE_SAMPLES];
+   oac_int16 plc_pcm[PLC_UPDATE_SAMPLES];
    int plc_fill;
    float plc_preemphasis_mem;
 #endif
@@ -131,7 +131,7 @@ struct OpusCustomDecoder {
    /* celt_glog oldLogE[], Size = 2*mode->nbEBands */
    /* celt_glog oldLogE2[], Size = 2*mode->nbEBands */
    /* celt_glog backgroundLogE[], Size = 2*mode->nbEBands */
-   /* opus_val16 lpc[],  Size = channels*CELT_LPC_ORDER */
+   /* oac_val16 lpc[],  Size = channels*CELT_LPC_ORDER */
 };
 
 #if defined(ENABLE_HARDENING) || defined(ENABLE_ASSERTIONS)
@@ -139,13 +139,13 @@ struct OpusCustomDecoder {
    up writing all over memory. */
 void validate_celt_decoder(CELTDecoder *st)
 {
-#if !defined(CUSTOM_MODES) && !defined(ENABLE_OPUS_CUSTOM_API) && !defined(ENABLE_QEXT)
-   celt_assert(st->mode == opus_custom_mode_create(48000, 960, NULL));
+#if !defined(CUSTOM_MODES) && !defined(ENABLE_OAC_CUSTOM_API) && !defined(ENABLE_QEXT)
+   celt_assert(st->mode == oac_custom_mode_create(48000, 960, NULL));
    celt_assert(st->overlap == 120);
    celt_assert(st->end <= 21);
 #else
 /* From Section 4.3 in the spec: "The normal CELT layer uses 21 of those bands,
-   though Opus Custom (see Section 6.2) may use a different number of bands"
+   though Oac Custom (see Section 6.2) may use a different number of bands"
 
    Check if it's within the maximum number of Bark frequency bands instead */
    celt_assert(st->end <= 25);
@@ -155,9 +155,9 @@ void validate_celt_decoder(CELTDecoder *st)
    celt_assert(st->downsample > 0);
    celt_assert(st->start == 0 || st->start == 17);
    celt_assert(st->start < st->end);
-#ifdef OPUS_ARCHMASK
+#ifdef OAC_ARCHMASK
    celt_assert(st->arch >= 0);
-   celt_assert(st->arch <= OPUS_ARCHMASK);
+   celt_assert(st->arch <= OAC_ARCHMASK);
 #endif
 #ifndef ENABLE_QEXT
    celt_assert(st->last_pitch_index <= PLC_PITCH_LAG_MAX);
@@ -177,14 +177,14 @@ void validate_celt_decoder(CELTDecoder *st)
 int celt_decoder_get_size(int channels)
 {
 #ifdef ENABLE_QEXT
-   const CELTMode *mode = opus_custom_mode_create(96000, 960, NULL);
+   const CELTMode *mode = oac_custom_mode_create(96000, 960, NULL);
 #else
-   const CELTMode *mode = opus_custom_mode_create(48000, 960, NULL);
+   const CELTMode *mode = oac_custom_mode_create(48000, 960, NULL);
 #endif
-   return opus_custom_decoder_get_size(mode, channels);
+   return oac_custom_decoder_get_size(mode, channels);
 }
 
-OPUS_CUSTOM_NOSTATIC int opus_custom_decoder_get_size(const CELTMode *mode, int channels)
+OAC_CUSTOM_NOSTATIC int oac_custom_decoder_get_size(const CELTMode *mode, int channels)
 {
    int size;
 #ifdef ENABLE_QEXT
@@ -196,19 +196,19 @@ OPUS_CUSTOM_NOSTATIC int opus_custom_decoder_get_size(const CELTMode *mode, int
    size = sizeof(struct CELTDecoder)
             + (channels*(QEXT_SCALE(DECODE_BUFFER_SIZE)+mode->overlap)-1)*sizeof(celt_sig)
             + 4*2*mode->nbEBands*sizeof(celt_glog)
-            + channels*CELT_LPC_ORDER*sizeof(opus_val16);
+            + channels*CELT_LPC_ORDER*sizeof(oac_val16);
    return size;
 }
 
-#if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API)
-CELTDecoder *opus_custom_decoder_create(const CELTMode *mode, int channels, int *error)
+#if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
+CELTDecoder *oac_custom_decoder_create(const CELTMode *mode, int channels, int *error)
 {
    int ret;
-   CELTDecoder *st = (CELTDecoder *)opus_alloc(opus_custom_decoder_get_size(mode, channels));
-   ret = opus_custom_decoder_init(st, mode, channels);
-   if (ret != OPUS_OK)
+   CELTDecoder *st = (CELTDecoder *)oac_alloc(oac_custom_decoder_get_size(mode, channels));
+   ret = oac_custom_decoder_init(st, mode, channels);
+   if (ret != OAC_OK)
    {
-      opus_custom_decoder_destroy(st);
+      oac_custom_decoder_destroy(st);
       st = NULL;
    }
    if (error)
@@ -217,33 +217,33 @@ CELTDecoder *opus_custom_decoder_create(const CELTMode *mode, int channels, int
 }
 #endif /* CUSTOM_MODES */
 
-int celt_decoder_init(CELTDecoder *st, opus_int32 sampling_rate, int channels)
+int celt_decoder_init(CELTDecoder *st, oac_int32 sampling_rate, int channels)
 {
    int ret;
 #ifdef ENABLE_QEXT
    if (sampling_rate == 96000) {
-      return opus_custom_decoder_init(st, opus_custom_mode_create(96000, 960, NULL), channels);
+      return oac_custom_decoder_init(st, oac_custom_mode_create(96000, 960, NULL), channels);
    }
 #endif
-   ret = opus_custom_decoder_init(st, opus_custom_mode_create(48000, 960, NULL), channels);
-   if (ret != OPUS_OK)
+   ret = oac_custom_decoder_init(st, oac_custom_mode_create(48000, 960, NULL), channels);
+   if (ret != OAC_OK)
       return ret;
    st->downsample = resampling_factor(sampling_rate);
    if (st->downsample==0)
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    else
-      return OPUS_OK;
+      return OAC_OK;
 }
 
-OPUS_CUSTOM_NOSTATIC int opus_custom_decoder_init(CELTDecoder *st, const CELTMode *mode, int channels)
+OAC_CUSTOM_NOSTATIC int oac_custom_decoder_init(CELTDecoder *st, const CELTMode *mode, int channels)
 {
    if (channels < 0 || channels > 2)
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
 
    if (st==NULL)
-      return OPUS_ALLOC_FAIL;
+      return OAC_ALLOC_FAIL;
 
-   OPUS_CLEAR((char*)st, opus_custom_decoder_get_size(mode, channels));
+   OAC_CLEAR((char*)st, oac_custom_decoder_get_size(mode, channels));
 
    st->mode = mode;
    st->overlap = mode->overlap;
@@ -258,34 +258,34 @@ OPUS_CUSTOM_NOSTATIC int opus_custom_decoder_init(CELTDecoder *st, const CELTMod
 #else
    st->disable_inv = 0;
 #endif
-   st->arch = opus_select_arch();
+   st->arch = oac_select_arch();
 
 #ifdef ENABLE_QEXT
    if (st->mode->Fs == 96000 && (mode->shortMdctSize==240 || mode->shortMdctSize==180)) st->qext_scale = 2;
    else st->qext_scale = 1;
 #endif
 
-   opus_custom_decoder_ctl(st, OPUS_RESET_STATE);
+   oac_custom_decoder_ctl(st, OAC_RESET_STATE);
 
-   return OPUS_OK;
+   return OAC_OK;
 }
 
-#if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API)
-void opus_custom_decoder_destroy(CELTDecoder *st)
+#if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
+void oac_custom_decoder_destroy(CELTDecoder *st)
 {
-   opus_free(st);
+   oac_free(st);
 }
 #endif /* CUSTOM_MODES */
 
-#if !defined(CUSTOM_MODES) && !defined(ENABLE_OPUS_CUSTOM_API) && !defined(ENABLE_QEXT)
+#if !defined(CUSTOM_MODES) && !defined(ENABLE_OAC_CUSTOM_API) && !defined(ENABLE_QEXT)
 /* Special case for stereo with no downsampling and no accumulation. This is
    quite common and we can make it faster by processing both channels in the
    same loop, reducing overhead due to the dependency loop in the IIR filter. */
-static void deemphasis_stereo_simple(celt_sig *in[], opus_res *pcm, int N, const opus_val16 coef0,
+static void deemphasis_stereo_simple(celt_sig *in[], oac_res *pcm, int N, const oac_val16 coef0,
       celt_sig *mem)
 {
-   celt_sig * OPUS_RESTRICT x0;
-   celt_sig * OPUS_RESTRICT x1;
+   celt_sig * OAC_RESTRICT x0;
+   celt_sig * OAC_RESTRICT x1;
    celt_sig m0, m1;
    int j;
    x0=in[0];
@@ -311,16 +311,16 @@ static void deemphasis_stereo_simple(celt_sig *in[], opus_res *pcm, int N, const
 #ifndef RESYNTH
 static
 #endif
-void deemphasis(celt_sig *in[], opus_res *pcm, int N, int C, int downsample, const opus_val16 *coef,
+void deemphasis(celt_sig *in[], oac_res *pcm, int N, int C, int downsample, const oac_val16 *coef,
       celt_sig *mem, int accum)
 {
    int c;
    int Nd;
    int apply_downsampling=0;
-   opus_val16 coef0;
+   oac_val16 coef0;
    VARDECL(celt_sig, scratch);
    SAVE_STACK;
-#if !defined(CUSTOM_MODES) && !defined(ENABLE_OPUS_CUSTOM_API) && !defined(ENABLE_QEXT)
+#if !defined(CUSTOM_MODES) && !defined(ENABLE_OAC_CUSTOM_API) && !defined(ENABLE_QEXT)
    /* Short version for common case. */
    if (downsample == 1 && C == 2 && !accum)
    {
@@ -333,16 +333,16 @@ void deemphasis(celt_sig *in[], opus_res *pcm, int N, int C, int downsample, con
    Nd = N/downsample;
    c=0; do {
       int j;
-      celt_sig * OPUS_RESTRICT x;
-      opus_res  * OPUS_RESTRICT y;
+      celt_sig * OAC_RESTRICT x;
+      oac_res  * OAC_RESTRICT y;
       celt_sig m = mem[c];
       x =in[c];
       y = pcm+c;
-#if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API) || defined(ENABLE_QEXT)
+#if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API) || defined(ENABLE_QEXT)
       if (coef[1] != 0)
       {
-         opus_val16 coef1 = coef[1];
-         opus_val16 coef3 = coef[3];
+         oac_val16 coef1 = coef[1];
+         oac_val16 coef3 = coef[3];
          for (j=0;j<N;j++)
          {
             celt_sig tmp = SATURATE(x[j] + m + VERY_SMALL, SIG_SAT);
@@ -447,7 +447,7 @@ void celt_synthesis(const CELTMode *mode, celt_norm *X, celt_sig * out_syn[],
             downsample, silence);
       /* Store a temporary copy in the output buffer because the IMDCT destroys its input. */
       freq2 = out_syn[1]+overlap/2;
-      OPUS_COPY(freq2, freq, N);
+      OAC_COPY(freq2, freq, N);
       for (b=0;b<B;b++)
          clt_mdct_backward(&mode->mdct, &freq2[b], out_syn[0]+NB*b, mode->window, overlap, shift, B, arch);
       for (b=0;b<B;b++)
@@ -490,8 +490,8 @@ static void tf_decode(int start, int end, int isTransient, int *tf_res, int LM,
    int tf_select_rsv;
    int tf_changed;
    int logp;
-   opus_uint32 budget;
-   opus_uint32 tell;
+   oac_uint32 budget;
+   oac_uint32 tell;
 
    budget = dec->storage*8;
    tell = ec_tell(dec);
@@ -529,14 +529,14 @@ static int celt_plc_pitch_search(CELTDecoder *st, celt_sig *decode_mem[2], int C
 #ifdef ENABLE_QEXT
    int qext_scale;
 #endif
-   VARDECL( opus_val16, lp_pitch_buf );
+   VARDECL( oac_val16, lp_pitch_buf );
    SAVE_STACK;
 #ifdef ENABLE_QEXT
    qext_scale = st->qext_scale;
 #else
    (void)st;
 #endif
-   ALLOC( lp_pitch_buf, DECODE_BUFFER_SIZE>>1, opus_val16 );
+   ALLOC( lp_pitch_buf, DECODE_BUFFER_SIZE>>1, oac_val16 );
    pitch_downsample(decode_mem, lp_pitch_buf,
          DECODE_BUFFER_SIZE>>1, C, QEXT_SCALE(2), arch);
    pitch_search(lp_pitch_buf+(PLC_PITCH_LAG_MAX>>1), lp_pitch_buf,
@@ -547,19 +547,19 @@ static int celt_plc_pitch_search(CELTDecoder *st, celt_sig *decode_mem[2], int C
    return QEXT_SCALE(pitch_index);
 }
 
-static void prefilter_and_fold(CELTDecoder * OPUS_RESTRICT st, int N)
+static void prefilter_and_fold(CELTDecoder * OAC_RESTRICT st, int N)
 {
    int c;
    int CC;
    int i;
    int overlap;
    celt_sig *decode_mem[2];
-   const OpusCustomMode *mode;
+   const OacCustomMode *mode;
    int decode_buffer_size;
 #ifdef ENABLE_QEXT
    int qext_scale;
 #endif
-   VARDECL(opus_val32, etmp);
+   VARDECL(oac_val32, etmp);
    SAVE_STACK
 #ifdef ENABLE_QEXT
    qext_scale = st->qext_scale;
@@ -568,7 +568,7 @@ static void prefilter_and_fold(CELTDecoder * OPUS_RESTRICT st, int N)
    mode = st->mode;
    overlap = st->overlap;
    CC = st->channels;
-   ALLOC(etmp, overlap, opus_val32);
+   ALLOC(etmp, overlap, oac_val32);
    c=0; do {
       decode_mem[c] = st->_decode_mem + c*(decode_buffer_size+overlap);
    } while (++c<CC);
@@ -616,8 +616,8 @@ void update_plc_state(LPCNetPLCState *lpcnet, celt_sig *decode_mem[2], float *pl
    int tmp_read_post, tmp_fec_skip;
    int offset;
    celt_sig buf48k[DECODE_BUFFER_SIZE];
-   opus_int16 buf16k[PLC_UPDATE_SAMPLES];
-   if (CC == 1) OPUS_COPY(buf48k, decode_mem[0], DECODE_BUFFER_SIZE);
+   oac_int16 buf16k[PLC_UPDATE_SAMPLES];
+   if (CC == 1) OAC_COPY(buf48k, decode_mem[0], DECODE_BUFFER_SIZE);
    else {
       for (i=0;i<DECODE_BUFFER_SIZE;i++) {
          buf48k[i] = .5*(decode_mem[0][i] + decode_mem[1][i]);
@@ -646,7 +646,7 @@ void update_plc_state(LPCNetPLCState *lpcnet, celt_sig *decode_mem[2], float *pl
 }
 #endif
 
-static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
+static void celt_decode_lost(CELTDecoder * OAC_RESTRICT st, int N, int LM
 #ifdef ENABLE_DEEP_PLC
       ,LPCNetPLCState *lpcnet
 #endif
@@ -657,15 +657,15 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
    const int C = st->channels;
    celt_sig *decode_mem[2];
    celt_sig *out_syn[2];
-   opus_val16 *lpc;
+   oac_val16 *lpc;
    celt_glog *oldBandE, *oldLogE, *oldLogE2, *backgroundLogE;
-   const OpusCustomMode *mode;
+   const OacCustomMode *mode;
    int nbEBands;
    int overlap;
    int start;
    int loss_duration;
    int curr_frame_type;
-   const opus_int16 *eBands;
+   const oac_int16 *eBands;
    int decode_buffer_size;
    int max_period;
 #ifdef ENABLE_QEXT
@@ -690,7 +690,7 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
    oldLogE = oldBandE + 2*nbEBands;
    oldLogE2 = oldLogE + 2*nbEBands;
    backgroundLogE = oldLogE2 + 2*nbEBands;
-   lpc = (opus_val16*)(backgroundLogE + 2*nbEBands);
+   lpc = (oac_val16*)(backgroundLogE + 2*nbEBands);
 
    loss_duration = st->loss_duration;
    start = st->start;
@@ -713,7 +713,7 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
    {
       /* Noise-based PLC/CNG */
       VARDECL(celt_norm, X);
-      opus_uint32 seed;
+      oac_uint32 seed;
       int end;
       int effEnd;
       celt_glog decay;
@@ -722,7 +722,7 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
 
       ALLOC(X, C*N, celt_norm);   /**< Interleaved normalised MDCTs */
       c=0; do {
-         OPUS_MOVE(decode_mem[c], decode_mem[c]+N,
+         OAC_MOVE(decode_mem[c], decode_mem[c]+N,
                decode_buffer_size-N+overlap);
       } while (++c<C);
 
@@ -750,7 +750,7 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
             for (j=0;j<blen;j++)
             {
                seed = celt_lcg_rand(seed);
-               X[boffs+j] = SHL32((celt_norm)((opus_int32)seed>>20), NORM_SHIFT-14);
+               X[boffs+j] = SHL32((celt_norm)((oac_int32)seed>>20), NORM_SHIFT-14);
             }
             renormalise_vector(X+boffs, blen, Q31ONE, st->arch);
          }
@@ -783,13 +783,13 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
       int exc_length;
       /* Pitch-based PLC */
       const celt_coef *window;
-      opus_val16 *exc;
-      opus_val16 fade = Q15ONE;
+      oac_val16 *exc;
+      oac_val16 fade = Q15ONE;
       int pitch_index;
       int curr_neural;
       int last_neural;
-      VARDECL(opus_val16, _exc);
-      VARDECL(opus_val16, fir_tmp);
+      VARDECL(oac_val16, _exc);
+      VARDECL(oac_val16, fir_tmp);
 
       curr_neural = curr_frame_type == FRAME_PLC_NEURAL || curr_frame_type == FRAME_DRED;
       last_neural = st->last_frame_type == FRAME_PLC_NEURAL || st->last_frame_type == FRAME_DRED;
@@ -808,14 +808,14 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
          decaying signal, but we can't get more than MAX_PERIOD. */
       exc_length = IMIN(2*pitch_index, max_period);
 
-      ALLOC(_exc, max_period+CELT_LPC_ORDER, opus_val16);
-      ALLOC(fir_tmp, exc_length, opus_val16);
+      ALLOC(_exc, max_period+CELT_LPC_ORDER, oac_val16);
+      ALLOC(fir_tmp, exc_length, oac_val16);
       exc = _exc+CELT_LPC_ORDER;
       window = mode->window;
       c=0; do {
-         opus_val16 decay;
-         opus_val16 attenuation;
-         opus_val32 S1=0;
+         oac_val16 decay;
+         oac_val16 attenuation;
+         oac_val32 S1=0;
          celt_sig *buf;
          int extrapolation_offset;
          int extrapolation_len;
@@ -827,7 +827,7 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
 
          if (st->last_frame_type != FRAME_PLC_PERIODIC && !(last_neural && curr_neural))
          {
-            opus_val32 ac[CELT_LPC_ORDER+1];
+            oac_val32 ac[CELT_LPC_ORDER+1];
             /* Compute LPC coefficients for the last MAX_PERIOD samples before
                the first loss so we can work in the excitation-filter domain. */
             _celt_autocorr(exc, ac, window, overlap,
@@ -854,8 +854,8 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
             no overflow can happen in the IIR filter. This means:
             32768*sum(abs(filter)) < 2^31 */
          while (1) {
-            opus_val16 tmp=Q15ONE;
-            opus_val32 sum=QCONST16(1., SIG_SHIFT);
+            oac_val16 tmp=Q15ONE;
+            oac_val32 sum=QCONST16(1., SIG_SHIFT);
             for (i=0;i<CELT_LPC_ORDER;i++)
                sum += ABS16(lpc[c*CELT_LPC_ORDER+i]);
             if (sum < 65535) break;
@@ -874,14 +874,14 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
                because celt_fir() cannot filter in-place. */
             celt_fir(exc+max_period-exc_length, lpc+c*CELT_LPC_ORDER,
                   fir_tmp, exc_length, CELT_LPC_ORDER, st->arch);
-            OPUS_COPY(exc+max_period-exc_length, fir_tmp, exc_length);
+            OAC_COPY(exc+max_period-exc_length, fir_tmp, exc_length);
          }
 
          /* Check if the waveform is decaying, and if so how fast.
             We do this to avoid adding energy when concealing in a segment
             with decaying energy. */
          {
-            opus_val32 E1=1, E2=1;
+            oac_val32 E1=1, E2=1;
             int decay_length;
 #ifdef FIXED_POINT
             int shift = IMAX(0,2*celt_zlog2(celt_maxabs16(&exc[max_period-exc_length], exc_length))-20);
@@ -892,7 +892,7 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
             decay_length = exc_length>>1;
             for (i=0;i<decay_length;i++)
             {
-               opus_val16 e;
+               oac_val16 e;
                e = exc[max_period-decay_length+i];
                E1 += SHR32(MULT16_16(e, e), shift);
                e = exc[max_period-2*decay_length+i];
@@ -905,7 +905,7 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
          /* Move the decoder memory one frame to the left to give us room to
             add the data for the new frame. We ignore the overlap that extends
             past the end of the buffer, because we aren't going to use it. */
-         OPUS_MOVE(buf, buf+N, decode_buffer_size-N);
+         OAC_MOVE(buf, buf+N, decode_buffer_size-N);
 
          /* Extrapolate from the end of the excitation with a period of
             "pitch_index", scaling down each period by an additional factor of
@@ -918,7 +918,7 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
          attenuation = MULT16_16_Q15(fade, decay);
          for (i=j=0;i<extrapolation_len;i++,j++)
          {
-            opus_val16 tmp;
+            oac_val16 tmp;
             if (j >= pitch_index) {
                j -= pitch_index;
                attenuation = MULT16_16_Q15(attenuation, decay);
@@ -934,7 +934,7 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
             S1 += SHR32(MULT16_16(tmp, tmp), 11);
          }
          {
-            opus_val16 lpc_mem[CELT_LPC_ORDER];
+            oac_val16 lpc_mem[CELT_LPC_ORDER];
             /* Copy the last decoded samples (prior to the overlap region) to
                synthesis filter memory so we can have a continuous signal. */
             for (i=0;i<CELT_LPC_ORDER;i++)
@@ -954,10 +954,10 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
             happen with the signal changes during our window. If so,
             attenuate. */
          {
-            opus_val32 S2=0;
+            oac_val32 S2=0;
             for (i=0;i<extrapolation_len;i++)
             {
-               opus_val16 tmp = SROUND16(buf[decode_buffer_size-N+i], SIG_SHIFT);
+               oac_val16 tmp = SROUND16(buf[decode_buffer_size-N+i], SIG_SHIFT);
                S2 += SHR32(MULT16_16(tmp, tmp), 11);
             }
             /* This checks for an "explosion" in the synthesis. */
@@ -973,10 +973,10 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
                   buf[decode_buffer_size-N+i] = 0;
             } else if (S1 < S2)
             {
-               opus_val16 ratio = celt_sqrt(frac_div32(SHR32(S1,1)+1,S2+1));
+               oac_val16 ratio = celt_sqrt(frac_div32(SHR32(S1,1)+1,S2+1));
                for (i=0;i<overlap;i++)
                {
-                  opus_val16 tmp_g = Q15ONE
+                  oac_val16 tmp_g = Q15ONE
                         - MULT16_16_Q15(COEF2VAL16(window[i]), Q15ONE-ratio);
                   buf[decode_buffer_size-N+i] =
                         MULT16_32_Q15(tmp_g, buf[decode_buffer_size-N+i]);
@@ -1000,7 +1000,7 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
          buf = decode_mem[0];
          ALLOC(buf_copy, C*overlap, float);
          c=0; do {
-            OPUS_COPY(buf_copy+c*overlap, &decode_mem[c][decode_buffer_size-N], overlap);
+            OAC_COPY(buf_copy+c*overlap, &decode_mem[c][decode_buffer_size-N], overlap);
          } while (++c<C);
 
          /* Need enough samples from the PLC to cover the frame size, resampling delay,
@@ -1024,7 +1024,7 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
             for (sum=0, j=0;j<16;j++) sum += 3*st->plc_pcm[i+j+1]*sinc_filter[3*j+1];
             buf[decode_buffer_size-N+3*i+2] = sum;
          }
-         OPUS_MOVE(st->plc_pcm, &st->plc_pcm[N/3], st->plc_fill-N/3);
+         OAC_MOVE(st->plc_pcm, &st->plc_pcm[N/3], st->plc_fill-N/3);
          st->plc_fill -= N/3;
          for (i=0;i<N;i++) {
             float tmp = buf[decode_buffer_size-N+i];
@@ -1038,7 +1038,7 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
             overlap_mem = tmp;
          }
          /* For now, we just do mono PLC. */
-         if (C==2) OPUS_COPY(decode_mem[1], decode_mem[0], decode_buffer_size+overlap);
+         if (C==2) OAC_COPY(decode_mem[1], decode_mem[0], decode_buffer_size+overlap);
          c=0; do {
             /* Cross-fade with 48-kHz non-neural PLC for the first 2.5 ms to avoid a discontinuity. */
             if (!last_neural) {
@@ -1063,8 +1063,8 @@ static void celt_decode_lost(CELTDecoder * OPUS_RESTRICT st, int N, int LM
    RESTORE_STACK;
 }
 
-int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char *data,
-      int len, opus_res * OPUS_RESTRICT pcm, int frame_size, ec_dec *dec, int accum
+int celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char *data,
+      int len, oac_res * OAC_RESTRICT pcm, int frame_size, ec_dec *dec, int accum
 #ifdef ENABLE_DEEP_PLC
       ,LPCNetPLCState *lpcnet
 #endif
@@ -1072,7 +1072,7 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
 {
    int c, i, N;
    int spread_decision;
-   opus_int32 bits;
+   oac_int32 bits;
    ec_dec _dec;
    VARDECL(celt_norm, X);
    VARDECL(int, fine_quant);
@@ -1097,22 +1097,22 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
    int codedBands;
    int alloc_trim;
    int postfilter_pitch;
-   opus_val16 postfilter_gain;
+   oac_val16 postfilter_gain;
    int intensity=0;
    int dual_stereo=0;
-   opus_int32 total_bits;
-   opus_int32 balance;
-   opus_int32 tell;
+   oac_int32 total_bits;
+   oac_int32 balance;
+   oac_int32 tell;
    int dynalloc_logp;
    int postfilter_tapset;
    int anti_collapse_rsv;
    int anti_collapse_on=0;
    int silence;
    int C = st->stream_channels;
-   const OpusCustomMode *mode;
+   const OacCustomMode *mode;
    int nbEBands;
    int overlap;
-   const opus_int16 *eBands;
+   const oac_int16 *eBands;
    celt_glog max_background_increase;
    int decode_buffer_size;
 #ifdef ENABLE_QEXT
@@ -1138,18 +1138,18 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
    oldLogE2 = oldLogE + 2*nbEBands;
    backgroundLogE = oldLogE2 + 2*nbEBands;
 
-#if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API)
+#if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
    if (st->signalling && data!=NULL)
    {
       int data0=data[0];
-      /* Convert "standard mode" to Opus header */
+      /* Convert "standard mode" to Oac header */
 # ifndef ENABLE_QEXT
       if (mode->Fs==48000 && mode->shortMdctSize==120)
 # endif
       {
-         data0 = fromOpus(data0);
+         data0 = fromOac(data0);
          if (data0<0)
-            return OPUS_INVALID_PACKET;
+            return OAC_INVALID_PACKET;
       }
       st->end = end = IMAX(1, mode->effEBands-2*(data0>>5));
       LM = (data0>>3)&0x3;
@@ -1158,7 +1158,7 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
          data++;
          len--;
          if (len<=0)
-            return OPUS_INVALID_PACKET;
+            return OAC_INVALID_PACKET;
          if (data[0] & 0x40) {
             int p;
             int padding=0;
@@ -1167,7 +1167,7 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
             do {
                int tmp;
                if (len<=0)
-                  return OPUS_INVALID_PACKET;
+                  return OAC_INVALID_PACKET;
                p = *data++;
                len--;
                tmp = p==255 ? 254: p;
@@ -1175,7 +1175,7 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
                padding += tmp;
             } while (p==255);
             padding--;
-            if (len <= 0 || padding<0) return OPUS_INVALID_PACKET;
+            if (len <= 0 || padding<0) return OAC_INVALID_PACKET;
          }
       } else
       {
@@ -1183,9 +1183,9 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
          len--;
       }
       if (LM>mode->maxLM)
-         return OPUS_INVALID_PACKET;
+         return OAC_INVALID_PACKET;
       if (frame_size < mode->shortMdctSize<<LM)
-         return OPUS_BUFFER_TOO_SMALL;
+         return OAC_BUFFER_TOO_SMALL;
       else
          frame_size = mode->shortMdctSize<<LM;
    } else {
@@ -1196,12 +1196,12 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
          if (mode->shortMdctSize<<LM==frame_size)
             break;
       if (LM>mode->maxLM)
-         return OPUS_BAD_ARG;
+         return OAC_BAD_ARG;
    }
    M=1<<LM;
 
    if (len<0 || len>1275 || pcm==NULL)
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
 
    N = M*mode->shortMdctSize;
    c=0; do {
@@ -1226,7 +1226,7 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
    }
 #ifdef ENABLE_DEEP_PLC
    else {
-      /* FIXME: This is a bit of a hack just to make sure opus_decode_native() knows we're no longer in PLC. */
+      /* FIXME: This is a bit of a hack just to make sure oac_decode_native() knows we're no longer in PLC. */
       if (lpcnet) lpcnet->blend = 0;
    }
 #endif
@@ -1309,8 +1309,8 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
          {
             if (oldBandE[c*nbEBands+i] < MAXG(oldLogE[c*nbEBands+i], oldLogE2[c*nbEBands+i])) {
                /* If energy is going down already, continue the trend. */
-               opus_val32 slope;
-               opus_val32 E0, E1, E2;
+               oac_val32 slope;
+               oac_val32 E0, E1, E2;
                E0 = oldBandE[c*nbEBands+i];
                E1 = oldLogE[c*nbEBands+i];
                E2 = oldLogE2[c*nbEBands+i];
@@ -1380,7 +1380,7 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
    alloc_trim = tell+(6<<BITRES) <= total_bits ?
          ec_dec_icdf(dec, trim_icdf, 7) : 5;
 
-   bits = (((opus_int32)len*8)<<BITRES) - (opus_int32)ec_tell_frac(dec) - 1;
+   bits = (((oac_int32)len*8)<<BITRES) - (oac_int32)ec_tell_frac(dec) - 1;
    anti_collapse_rsv = isTransient&&LM>=2&&bits>=((LM+2)<<BITRES) ? (1<<BITRES) : 0;
    bits -= anti_collapse_rsv;
 
@@ -1394,7 +1394,7 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
    unquant_fine_energy(mode, start, end, oldBandE, NULL, fine_quant, dec, C);
 
    c=0; do {
-      OPUS_MOVE(decode_mem[c], decode_mem[c]+N, decode_buffer_size-N+overlap);
+      OAC_MOVE(decode_mem[c], decode_mem[c]+N, decode_buffer_size-N+overlap);
    } while (++c<CC);
 
    /* Decode fixed codebook */
@@ -1456,12 +1456,12 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
    }
 
    if (C==1)
-      OPUS_COPY(&oldBandE[nbEBands], oldBandE, nbEBands);
+      OAC_COPY(&oldBandE[nbEBands], oldBandE, nbEBands);
 
    if (!isTransient)
    {
-      OPUS_COPY(oldLogE2, oldLogE, 2*nbEBands);
-      OPUS_COPY(oldLogE, oldBandE, 2*nbEBands);
+      OAC_COPY(oldLogE2, oldLogE, 2*nbEBands);
+      OAC_COPY(oldLogE, oldBandE, 2*nbEBands);
    } else {
       for (i=0;i<2*nbEBands;i++)
          oldLogE[i] = MING(oldLogE[i], oldBandE[i]);
@@ -1495,14 +1495,14 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
    st->prefilter_and_fold = 0;
    RESTORE_STACK;
    if (ec_tell(dec) > 8*len)
-      return OPUS_INTERNAL_ERROR;
+      return OAC_INTERNAL_ERROR;
    if(ec_get_error(dec))
       st->error = 1;
    return frame_size/st->downsample;
 }
 
-int celt_decode_with_ec(CELTDecoder * OPUS_RESTRICT st, const unsigned char *data,
-      int len, opus_res * OPUS_RESTRICT pcm, int frame_size, ec_dec *dec, int accum)
+int celt_decode_with_ec(CELTDecoder * OAC_RESTRICT st, const unsigned char *data,
+      int len, oac_res * OAC_RESTRICT pcm, int frame_size, ec_dec *dec, int accum)
 {
    return celt_decode_with_ec_dred(st, data, len, pcm, frame_size, dec, accum
 #ifdef ENABLE_DEEP_PLC
@@ -1511,21 +1511,21 @@ int celt_decode_with_ec(CELTDecoder * OPUS_RESTRICT st, const unsigned char *dat
        );
 }
 
-#if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API)
+#if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
 
-int opus_custom_decode(CELTDecoder * OPUS_RESTRICT st, const unsigned char *data, int len, opus_int16 * OPUS_RESTRICT pcm, int frame_size)
+int oac_custom_decode(CELTDecoder * OAC_RESTRICT st, const unsigned char *data, int len, oac_int16 * OAC_RESTRICT pcm, int frame_size)
 {
    int j, ret, C, N;
-   VARDECL(opus_res, out);
+   VARDECL(oac_res, out);
    ALLOC_STACK;
 
    if (pcm==NULL)
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
 
    C = st->channels;
    N = frame_size;
 
-   ALLOC(out, C*N, opus_res);
+   ALLOC(out, C*N, oac_res);
    ret = celt_decode_with_ec(st, data, len, out, frame_size, NULL, 0);
    if (ret>0)
       for (j=0;j<C*ret;j++)
@@ -1536,24 +1536,24 @@ int opus_custom_decode(CELTDecoder * OPUS_RESTRICT st, const unsigned char *data
 }
 
 #if defined(FIXED_POINT)
-int opus_custom_decode24(CELTDecoder * OPUS_RESTRICT st, const unsigned char *data, int len, opus_int32 * OPUS_RESTRICT pcm, int frame_size)
+int oac_custom_decode24(CELTDecoder * OAC_RESTRICT st, const unsigned char *data, int len, oac_int32 * OAC_RESTRICT pcm, int frame_size)
 {
    return celt_decode_with_ec(st, data, len, pcm, frame_size, NULL, 0);
 }
 #else
-int opus_custom_decode24(CELTDecoder * OPUS_RESTRICT st, const unsigned char *data, int len, opus_int32 * OPUS_RESTRICT pcm, int frame_size)
+int oac_custom_decode24(CELTDecoder * OAC_RESTRICT st, const unsigned char *data, int len, oac_int32 * OAC_RESTRICT pcm, int frame_size)
 {
    int j, ret, C, N;
-   VARDECL(opus_res, out);
+   VARDECL(oac_res, out);
    ALLOC_STACK;
 
    if (pcm==NULL)
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
 
    C = st->channels;
    N = frame_size;
 
-   ALLOC(out, C*N, opus_res);
+   ALLOC(out, C*N, oac_res);
    ret = celt_decode_with_ec(st, data, len, out, frame_size, NULL, 0);
    if (ret>0)
       for (j=0;j<C*ret;j++)
@@ -1568,24 +1568,24 @@ int opus_custom_decode24(CELTDecoder * OPUS_RESTRICT st, const unsigned char *da
 #ifndef DISABLE_FLOAT_API
 
 # if !defined(FIXED_POINT)
-int opus_custom_decode_float(CELTDecoder * OPUS_RESTRICT st, const unsigned char *data, int len, float * OPUS_RESTRICT pcm, int frame_size)
+int oac_custom_decode_float(CELTDecoder * OAC_RESTRICT st, const unsigned char *data, int len, float * OAC_RESTRICT pcm, int frame_size)
 {
    return celt_decode_with_ec(st, data, len, pcm, frame_size, NULL, 0);
 }
 # else
-int opus_custom_decode_float(CELTDecoder * OPUS_RESTRICT st, const unsigned char *data, int len, float * OPUS_RESTRICT pcm, int frame_size)
+int oac_custom_decode_float(CELTDecoder * OAC_RESTRICT st, const unsigned char *data, int len, float * OAC_RESTRICT pcm, int frame_size)
 {
    int j, ret, C, N;
-   VARDECL(opus_res, out);
+   VARDECL(oac_res, out);
    ALLOC_STACK;
 
    if (pcm==NULL)
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
 
    C = st->channels;
    N = frame_size;
 
-   ALLOC(out, C*N, opus_res);
+   ALLOC(out, C*N, oac_res);
    ret=celt_decode_with_ec(st, data, len, out, frame_size, NULL, 0);
    if (ret>0)
       for (j=0;j<C*ret;j++)
@@ -1600,16 +1600,16 @@ int opus_custom_decode_float(CELTDecoder * OPUS_RESTRICT st, const unsigned char
 
 #endif /* CUSTOM_MODES */
 
-int opus_custom_decoder_ctl(CELTDecoder * OPUS_RESTRICT st, int request, ...)
+int oac_custom_decoder_ctl(CELTDecoder * OAC_RESTRICT st, int request, ...)
 {
    va_list ap;
 
    va_start(ap, request);
    switch (request)
    {
-      case OPUS_SET_COMPLEXITY_REQUEST:
+      case OAC_SET_COMPLEXITY_REQUEST:
       {
-          opus_int32 value = va_arg(ap, opus_int32);
+          oac_int32 value = va_arg(ap, oac_int32);
           if(value<0 || value>10)
           {
              goto bad_arg;
@@ -1617,9 +1617,9 @@ int opus_custom_decoder_ctl(CELTDecoder * OPUS_RESTRICT st, int request, ...)
           st->complexity = value;
       }
       break;
-      case OPUS_GET_COMPLEXITY_REQUEST:
+      case OAC_GET_COMPLEXITY_REQUEST:
       {
-          opus_int32 *value = va_arg(ap, opus_int32*);
+          oac_int32 *value = va_arg(ap, oac_int32*);
           if (!value)
           {
              goto bad_arg;
@@ -1629,7 +1629,7 @@ int opus_custom_decoder_ctl(CELTDecoder * OPUS_RESTRICT st, int request, ...)
       break;
       case CELT_SET_START_BAND_REQUEST:
       {
-         opus_int32 value = va_arg(ap, opus_int32);
+         oac_int32 value = va_arg(ap, oac_int32);
          if (value<0 || value>=st->mode->nbEBands)
             goto bad_arg;
          st->start = value;
@@ -1637,7 +1637,7 @@ int opus_custom_decoder_ctl(CELTDecoder * OPUS_RESTRICT st, int request, ...)
       break;
       case CELT_SET_END_BAND_REQUEST:
       {
-         opus_int32 value = va_arg(ap, opus_int32);
+         oac_int32 value = va_arg(ap, oac_int32);
          if (value<1 || value>st->mode->nbEBands)
             goto bad_arg;
          st->end = value;
@@ -1645,7 +1645,7 @@ int opus_custom_decoder_ctl(CELTDecoder * OPUS_RESTRICT st, int request, ...)
       break;
       case CELT_SET_CHANNELS_REQUEST:
       {
-         opus_int32 value = va_arg(ap, opus_int32);
+         oac_int32 value = va_arg(ap, oac_int32);
          if (value<1 || value>2)
             goto bad_arg;
          st->stream_channels = value;
@@ -1653,22 +1653,22 @@ int opus_custom_decoder_ctl(CELTDecoder * OPUS_RESTRICT st, int request, ...)
       break;
       case CELT_GET_AND_CLEAR_ERROR_REQUEST:
       {
-         opus_int32 *value = va_arg(ap, opus_int32*);
+         oac_int32 *value = va_arg(ap, oac_int32*);
          if (value==NULL)
             goto bad_arg;
          *value=st->error;
          st->error = 0;
       }
       break;
-      case OPUS_GET_LOOKAHEAD_REQUEST:
+      case OAC_GET_LOOKAHEAD_REQUEST:
       {
-         opus_int32 *value = va_arg(ap, opus_int32*);
+         oac_int32 *value = va_arg(ap, oac_int32*);
          if (value==NULL)
             goto bad_arg;
          *value = st->overlap/st->downsample;
       }
       break;
-      case OPUS_RESET_STATE:
+      case OAC_RESET_STATE:
       {
          int i;
          celt_glog *oldBandE, *oldLogE, *oldLogE2;
@@ -1680,8 +1680,8 @@ int opus_custom_decoder_ctl(CELTDecoder * OPUS_RESTRICT st, int request, ...)
          oldBandE = (celt_glog*)(st->_decode_mem+(decode_buffer_size+st->overlap)*st->channels);
          oldLogE = oldBandE + 2*st->mode->nbEBands;
          oldLogE2 = oldLogE + 2*st->mode->nbEBands;
-         OPUS_CLEAR((char*)&st->DECODER_RESET_START,
-               opus_custom_decoder_get_size(st->mode, st->channels)-
+         OAC_CLEAR((char*)&st->DECODER_RESET_START,
+               oac_custom_decoder_get_size(st->mode, st->channels)-
                ((char*)&st->DECODER_RESET_START - (char*)st));
          for (i=0;i<2*st->mode->nbEBands;i++)
             oldLogE[i]=oldLogE2[i]=-GCONST(28.f);
@@ -1689,9 +1689,9 @@ int opus_custom_decoder_ctl(CELTDecoder * OPUS_RESTRICT st, int request, ...)
          st->last_frame_type = FRAME_NONE;
       }
       break;
-      case OPUS_GET_PITCH_REQUEST:
+      case OAC_GET_PITCH_REQUEST:
       {
-         opus_int32 *value = va_arg(ap, opus_int32*);
+         oac_int32 *value = va_arg(ap, oac_int32*);
          if (value==NULL)
             goto bad_arg;
          *value = st->postfilter_period;
@@ -1707,21 +1707,21 @@ int opus_custom_decoder_ctl(CELTDecoder * OPUS_RESTRICT st, int request, ...)
       break;
       case CELT_SET_SIGNALLING_REQUEST:
       {
-         opus_int32 value = va_arg(ap, opus_int32);
+         oac_int32 value = va_arg(ap, oac_int32);
          st->signalling = value;
       }
       break;
-      case OPUS_GET_FINAL_RANGE_REQUEST:
+      case OAC_GET_FINAL_RANGE_REQUEST:
       {
-         opus_uint32 * value = va_arg(ap, opus_uint32 *);
+         oac_uint32 * value = va_arg(ap, oac_uint32 *);
          if (value==0)
             goto bad_arg;
          *value=st->rng;
       }
       break;
-      case OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST:
+      case OAC_SET_PHASE_INVERSION_DISABLED_REQUEST:
       {
-          opus_int32 value = va_arg(ap, opus_int32);
+          oac_int32 value = va_arg(ap, oac_int32);
           if(value<0 || value>1)
           {
              goto bad_arg;
@@ -1729,9 +1729,9 @@ int opus_custom_decoder_ctl(CELTDecoder * OPUS_RESTRICT st, int request, ...)
           st->disable_inv = value;
       }
       break;
-      case OPUS_GET_PHASE_INVERSION_DISABLED_REQUEST:
+      case OAC_GET_PHASE_INVERSION_DISABLED_REQUEST:
       {
-          opus_int32 *value = va_arg(ap, opus_int32*);
+          oac_int32 *value = va_arg(ap, oac_int32*);
           if (!value)
           {
              goto bad_arg;
@@ -1743,11 +1743,11 @@ int opus_custom_decoder_ctl(CELTDecoder * OPUS_RESTRICT st, int request, ...)
          goto bad_request;
    }
    va_end(ap);
-   return OPUS_OK;
+   return OAC_OK;
 bad_arg:
    va_end(ap);
-   return OPUS_BAD_ARG;
+   return OAC_BAD_ARG;
 bad_request:
       va_end(ap);
-  return OPUS_UNIMPLEMENTED;
+  return OAC_UNIMPLEMENTED;
 }
diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c
index 30c374dc1..0dbd3c6ee 100644
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -60,8 +60,8 @@
 /** Encoder state
  @brief Encoder state
  */
-struct OpusCustomEncoder {
-   const OpusCustomMode *mode;     /**< Mode used by the encoder */
+struct OacCustomEncoder {
+   const OacCustomMode *mode;     /**< Mode used by the encoder */
    int channels;
    int stream_channels;
 
@@ -72,7 +72,7 @@ struct OpusCustomEncoder {
    int upsample;
    int start, end;
 
-   opus_int32 bitrate;
+   oac_int32 bitrate;
    int vbr;
    int signalling;
    int constrained_vbr;      /* If zero, VBR can do whatever it likes with the rate */
@@ -88,36 +88,36 @@ struct OpusCustomEncoder {
    /* Everything beyond this point gets cleared on a reset */
 #define ENCODER_RESET_START rng
 
-   opus_uint32 rng;
+   oac_uint32 rng;
    int spread_decision;
-   opus_val32 delayedIntra;
+   oac_val32 delayedIntra;
    int tonal_average;
    int lastCodedBands;
    int hf_average;
    int tapset_decision;
 
    int prefilter_period;
-   opus_val16 prefilter_gain;
+   oac_val16 prefilter_gain;
    int prefilter_tapset;
 #ifdef RESYNTH
    int prefilter_period_old;
-   opus_val16 prefilter_gain_old;
+   oac_val16 prefilter_gain_old;
    int prefilter_tapset_old;
 #endif
    int consec_transient;
    AnalysisInfo analysis;
    SILKInfo silk_info;
 
-   opus_val32 preemph_memE[2];
-   opus_val32 preemph_memD[2];
+   oac_val32 preemph_memE[2];
+   oac_val32 preemph_memD[2];
 
    /* VBR-related parameters */
-   opus_int32 vbr_reservoir;
-   opus_int32 vbr_drift;
-   opus_int32 vbr_offset;
-   opus_int32 vbr_count;
-   opus_val32 overlap_max;
-   opus_val16 stereo_saving;
+   oac_int32 vbr_reservoir;
+   oac_int32 vbr_drift;
+   oac_int32 vbr_offset;
+   oac_int32 vbr_count;
+   oac_val32 overlap_max;
+   oac_val16 stereo_saving;
    int intensity;
    celt_glog *energy_mask;
    celt_glog spec_avg;
@@ -143,14 +143,14 @@ struct OpusCustomEncoder {
 int celt_encoder_get_size(int channels)
 {
 #ifdef ENABLE_QEXT
-   CELTMode *mode = opus_custom_mode_create(96000, 1920, NULL);
+   CELTMode *mode = oac_custom_mode_create(96000, 1920, NULL);
 #else
-   CELTMode *mode = opus_custom_mode_create(48000, 960, NULL);
+   CELTMode *mode = oac_custom_mode_create(48000, 960, NULL);
 #endif
-   return opus_custom_encoder_get_size(mode, channels);
+   return oac_custom_encoder_get_size(mode, channels);
 }
 
-OPUS_CUSTOM_NOSTATIC int opus_custom_encoder_get_size(const CELTMode *mode, int channels)
+OAC_CUSTOM_NOSTATIC int oac_custom_encoder_get_size(const CELTMode *mode, int channels)
 {
    int size;
 #ifdef ENABLE_QEXT
@@ -169,16 +169,16 @@ OPUS_CUSTOM_NOSTATIC int opus_custom_encoder_get_size(const CELTMode *mode, int
    return size;
 }
 
-#if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API)
-CELTEncoder *opus_custom_encoder_create(const CELTMode *mode, int channels, int *error)
+#if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
+CELTEncoder *oac_custom_encoder_create(const CELTMode *mode, int channels, int *error)
 {
    int ret;
-   CELTEncoder *st = (CELTEncoder *)opus_alloc(opus_custom_encoder_get_size(mode, channels));
+   CELTEncoder *st = (CELTEncoder *)oac_alloc(oac_custom_encoder_get_size(mode, channels));
    /* init will handle the NULL case */
-   ret = opus_custom_encoder_init(st, mode, channels);
-   if (ret != OPUS_OK)
+   ret = oac_custom_encoder_init(st, mode, channels);
+   if (ret != OAC_OK)
    {
-      opus_custom_encoder_destroy(st);
+      oac_custom_encoder_destroy(st);
       st = NULL;
    }
    if (error)
@@ -187,16 +187,16 @@ CELTEncoder *opus_custom_encoder_create(const CELTMode *mode, int channels, int
 }
 #endif /* CUSTOM_MODES */
 
-static int opus_custom_encoder_init_arch(CELTEncoder *st, const CELTMode *mode,
+static int oac_custom_encoder_init_arch(CELTEncoder *st, const CELTMode *mode,
                                          int channels, int arch)
 {
    if (channels < 0 || channels > 2)
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
 
    if (st==NULL || mode==NULL)
-      return OPUS_ALLOC_FAIL;
+      return OAC_ALLOC_FAIL;
 
-   OPUS_CLEAR((char*)st, opus_custom_encoder_get_size(mode, channels));
+   OAC_CLEAR((char*)st, oac_custom_encoder_get_size(mode, channels));
 
    st->mode = mode;
    st->stream_channels = st->channels = channels;
@@ -210,7 +210,7 @@ static int opus_custom_encoder_init_arch(CELTEncoder *st, const CELTMode *mode,
    st->constrained_vbr = 1;
    st->clip = 1;
 
-   st->bitrate = OPUS_BITRATE_MAX;
+   st->bitrate = OAC_BITRATE_MAX;
    st->vbr = 0;
    st->force_intra  = 0;
    st->complexity = 5;
@@ -221,62 +221,62 @@ static int opus_custom_encoder_init_arch(CELTEncoder *st, const CELTMode *mode,
    else st->qext_scale = 1;
 #endif
 
-   opus_custom_encoder_ctl(st, OPUS_RESET_STATE);
+   oac_custom_encoder_ctl(st, OAC_RESET_STATE);
 
-   return OPUS_OK;
+   return OAC_OK;
 }
 
-#if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API)
-int opus_custom_encoder_init(CELTEncoder *st, const CELTMode *mode, int channels)
+#if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
+int oac_custom_encoder_init(CELTEncoder *st, const CELTMode *mode, int channels)
 {
-   return opus_custom_encoder_init_arch(st, mode, channels, opus_select_arch());
+   return oac_custom_encoder_init_arch(st, mode, channels, oac_select_arch());
 }
 #endif
 
-int celt_encoder_init(CELTEncoder *st, opus_int32 sampling_rate, int channels,
+int celt_encoder_init(CELTEncoder *st, oac_int32 sampling_rate, int channels,
                       int arch)
 {
    int ret;
 #ifdef ENABLE_QEXT
    if (sampling_rate==96000) {
       st->upsample = 1;
-      return opus_custom_encoder_init_arch(st,
-              opus_custom_mode_create(96000, 1920, NULL), channels, arch);
+      return oac_custom_encoder_init_arch(st,
+              oac_custom_mode_create(96000, 1920, NULL), channels, arch);
    }
 #endif
-   ret = opus_custom_encoder_init_arch(st,
-           opus_custom_mode_create(48000, 960, NULL), channels, arch);
-   if (ret != OPUS_OK)
+   ret = oac_custom_encoder_init_arch(st,
+           oac_custom_mode_create(48000, 960, NULL), channels, arch);
+   if (ret != OAC_OK)
       return ret;
    st->upsample = resampling_factor(sampling_rate);
-   return OPUS_OK;
+   return OAC_OK;
 }
 
-#if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API)
-void opus_custom_encoder_destroy(CELTEncoder *st)
+#if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
+void oac_custom_encoder_destroy(CELTEncoder *st)
 {
-   opus_free(st);
+   oac_free(st);
 }
 #endif /* CUSTOM_MODES */
 
 
-static int transient_analysis(const opus_val32 * OPUS_RESTRICT in, int len, int C,
-                              opus_val16 *tf_estimate, int *tf_chan, int allow_weak_transients,
-                              int *weak_transient, opus_val16 tone_freq, opus_val32 toneishness)
+static int transient_analysis(const oac_val32 * OAC_RESTRICT in, int len, int C,
+                              oac_val16 *tf_estimate, int *tf_chan, int allow_weak_transients,
+                              int *weak_transient, oac_val16 tone_freq, oac_val32 toneishness)
 {
    int i;
-   VARDECL(opus_val16, tmp);
-   opus_val32 mem0,mem1;
+   VARDECL(oac_val16, tmp);
+   oac_val32 mem0,mem1;
    int is_transient = 0;
-   opus_int32 mask_metric = 0;
+   oac_int32 mask_metric = 0;
    int c;
-   opus_val16 tf_max;
+   oac_val16 tf_max;
    int len2;
    /* Forward masking: 6.7 dB/ms. */
 #ifdef FIXED_POINT
    int forward_shift = 4;
 #else
-   opus_val16 forward_decay = QCONST16(.0625f,15);
+   oac_val16 forward_decay = QCONST16(.0625f,15);
 #endif
    /* Table of 6*64/x, trained on real data to minimize the average error */
    static const unsigned char inv_table[128] = {
@@ -293,7 +293,7 @@ static int transient_analysis(const opus_val32 * OPUS_RESTRICT in, int len, int
 #ifdef FIXED_POINT
    int in_shift = IMAX(0, celt_ilog2(1+celt_maxabs32(in, C*len))-14);
 #endif
-   ALLOC(tmp, len, opus_val16);
+   ALLOC(tmp, len, oac_val16);
 
    *weak_transient = 0;
    /* For lower bitrates, let's be more conservative and have a forward masking
@@ -311,10 +311,10 @@ static int transient_analysis(const opus_val32 * OPUS_RESTRICT in, int len, int
    len2=len/2;
    for (c=0;c<C;c++)
    {
-      opus_val32 mean;
-      opus_int32 unmask=0;
-      opus_val32 norm;
-      opus_val16 maxE;
+      oac_val32 mean;
+      oac_int32 unmask=0;
+      oac_val32 norm;
+      oac_val16 maxE;
       mem0=0;
       mem1=0;
       /* High-pass filter: (1 - 2*z^-1 + z^-2) / (1 - z^-1 + .5*z^-2) */
@@ -323,7 +323,7 @@ static int transient_analysis(const opus_val32 * OPUS_RESTRICT in, int len, int
 #ifndef FIXED_POINT
          float mem00;
 #endif
-         opus_val32 x,y;
+         oac_val32 x,y;
          x = SHR32(in[i+c*len],in_shift);
          y = ADD32(mem0, x);
 #ifdef FIXED_POINT
@@ -343,7 +343,7 @@ static int transient_analysis(const opus_val32 * OPUS_RESTRICT in, int len, int
       }
       /*printf("\n");*/
       /* First few samples are bad because we don't propagate the memory */
-      OPUS_CLEAR(tmp, 12);
+      OAC_CLEAR(tmp, 12);
 
 #ifdef FIXED_POINT
       /* Normalize tmp to max range */
@@ -364,7 +364,7 @@ static int transient_analysis(const opus_val32 * OPUS_RESTRICT in, int len, int
       /* Forward pass to compute the post-echo threshold*/
       for (i=0;i<len2;i++)
       {
-         opus_val32 x2 = PSHR32(MULT16_16(tmp[2*i],tmp[2*i]) + MULT16_16(tmp[2*i+1],tmp[2*i+1]),4);
+         oac_val32 x2 = PSHR32(MULT16_16(tmp[2*i],tmp[2*i]) + MULT16_16(tmp[2*i+1],tmp[2*i+1]),4);
          mean += PSHR32(x2, 12);
 #ifdef FIXED_POINT
          /* FIXME: Use PSHR16() instead */
@@ -470,7 +470,7 @@ static int patch_transient_decision(celt_glog *newE, celt_glog *oldE, int nbEBan
       int start, int end, int C)
 {
    int i, c;
-   opus_val32 mean_diff=0;
+   oac_val32 mean_diff=0;
    celt_glog spread_old[26];
    /* Apply an aggressive (-6 dB/Bark) spreading function to the old frame to
       avoid false detection caused by irrelevant bands */
@@ -491,7 +491,7 @@ static int patch_transient_decision(celt_glog *newE, celt_glog *oldE, int nbEBan
    c=0; do {
       for (i=IMAX(2,start);i<end-1;i++)
       {
-         opus_val16 x1, x2;
+         oac_val16 x1, x2;
          x1 = MAXG(0, newE[i + c*nbEBands]);
          x2 = MAXG(0, spread_old[i]);
          mean_diff = ADD32(mean_diff, MAXG(0, SUB32(x1, x2)));
@@ -504,8 +504,8 @@ static int patch_transient_decision(celt_glog *newE, celt_glog *oldE, int nbEBan
 
 /** 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 * OPUS_RESTRICT in,
-                          celt_sig * OPUS_RESTRICT out, int C, int CC, int LM, int upsample,
+static void compute_mdcts(const CELTMode *mode, int shortBlocks, celt_sig * OAC_RESTRICT in,
+                          celt_sig * OAC_RESTRICT out, int C, int CC, int LM, int upsample,
                           int arch)
 {
    const int overlap = mode->overlap;
@@ -544,17 +544,17 @@ static void compute_mdcts(const CELTMode *mode, int shortBlocks, celt_sig * OPUS
          int bound = B*N/upsample;
          for (i=0;i<bound;i++)
             out[c*B*N+i] *= upsample;
-         OPUS_CLEAR(&out[c*B*N+bound], B*N-bound);
+         OAC_CLEAR(&out[c*B*N+bound], B*N-bound);
       } while (++c<C);
    }
 }
 
 
-void celt_preemphasis(const opus_res * OPUS_RESTRICT pcmp, celt_sig * OPUS_RESTRICT inp,
-                        int N, int CC, int upsample, const opus_val16 *coef, celt_sig *mem, int clip)
+void celt_preemphasis(const oac_res * OAC_RESTRICT pcmp, celt_sig * OAC_RESTRICT inp,
+                        int N, int CC, int upsample, const oac_val16 *coef, celt_sig *mem, int clip)
 {
    int i;
-   opus_val16 coef0;
+   oac_val16 coef0;
    celt_sig m;
    int Nu;
 
@@ -579,7 +579,7 @@ void celt_preemphasis(const opus_res * OPUS_RESTRICT pcmp, celt_sig * OPUS_RESTR
    Nu = N/upsample;
    if (upsample!=1)
    {
-      OPUS_CLEAR(inp, N);
+      OAC_CLEAR(inp, N);
    }
    for (i=0;i<Nu;i++)
       inp[i*upsample] = RES2SIG(pcmp[CC*i]);
@@ -590,17 +590,17 @@ void celt_preemphasis(const opus_res * OPUS_RESTRICT pcmp, celt_sig * OPUS_RESTR
       for (i=0;i<Nu;i++)
          inp[i*upsample] = MAX32(-QCONST32(65536.f, SIG_SHIFT), MIN32(QCONST32(65536.f, SIG_SHIFT), inp[i*upsample]));
    }
-#if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API) || defined(ENABLE_QEXT)
+#if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API) || defined(ENABLE_QEXT)
    if (coef[1] != 0)
    {
-      opus_val16 coef1 = coef[1];
+      oac_val16 coef1 = coef[1];
 #if defined(FIXED_POINT)
       /* If we need the extra precision, we use the fact that coef[3] is exact to do a Newton-Raphson
          iteration and get us more precision on coef[2]. */
-      opus_val32 coef2_q30 = SHL32(coef[2], 18) + PSHR32(MULT16_16(QCONST32(1.f, 25) - MULT16_16(coef[3], coef[2]), coef[2]), 7);
+      oac_val32 coef2_q30 = SHL32(coef[2], 18) + PSHR32(MULT16_16(QCONST32(1.f, 25) - MULT16_16(coef[3], coef[2]), coef[2]), 7);
       celt_assert(SIG_SHIFT == 12);
 #else
-      opus_val32 coef2_q30 = coef[2];
+      oac_val32 coef2_q30 = coef[2];
 #endif
       for (i=0;i<N;i++)
       {
@@ -628,10 +628,10 @@ void celt_preemphasis(const opus_res * OPUS_RESTRICT pcmp, celt_sig * OPUS_RESTR
 
 
 
-static opus_val32 l1_metric(const celt_norm *tmp, int N, int LM, opus_val16 bias)
+static oac_val32 l1_metric(const celt_norm *tmp, int N, int LM, oac_val16 bias)
 {
    int i;
-   opus_val32 L1;
+   oac_val32 L1;
    L1 = 0;
    for (i=0;i<N;i++)
       L1 += EXTEND32(ABS16(SHR32(tmp[i], NORM_SHIFT-14)));
@@ -643,7 +643,7 @@ static opus_val32 l1_metric(const celt_norm *tmp, int N, int LM, opus_val16 bias
 
 static int tf_analysis(const CELTMode *m, int len, int isTransient,
       int *tf_res, int lambda, celt_norm *X, int N0, int LM,
-      opus_val16 tf_estimate, int tf_chan, int *importance)
+      oac_val16 tf_estimate, int tf_chan, int *importance)
 {
    int i;
    VARDECL(int, metric);
@@ -656,7 +656,7 @@ static int tf_analysis(const CELTMode *m, int len, int isTransient,
    int sel;
    int selcost[2];
    int tf_select=0;
-   opus_val16 bias;
+   oac_val16 bias;
 
    SAVE_STACK;
    bias = MULT16_16_Q14(QCONST16(.04f,15), MAX16(-QCONST16(.25f,14), QCONST16(.5f,14)-tf_estimate));
@@ -672,12 +672,12 @@ static int tf_analysis(const CELTMode *m, int len, int isTransient,
    {
       int k, N;
       int narrow;
-      opus_val32 L1, best_L1;
+      oac_val32 L1, best_L1;
       int best_level=0;
       N = (m->eBands[i+1]-m->eBands[i])<<LM;
       /* band is too narrow to be split down to LM=-1 */
       narrow = (m->eBands[i+1]-m->eBands[i])==1;
-      OPUS_COPY(tmp, &X[tf_chan*N0 + (m->eBands[i]<<LM)], N);
+      OAC_COPY(tmp, &X[tf_chan*N0 + (m->eBands[i]<<LM)], N);
       /* Just add the right channel if we're in stereo */
       /*if (C==2)
          for (j=0;j<N;j++)
@@ -687,7 +687,7 @@ static int tf_analysis(const CELTMode *m, int len, int isTransient,
       /* Check the -1 case for transients */
       if (isTransient && !narrow)
       {
-         OPUS_COPY(tmp_1, tmp, N);
+         OAC_COPY(tmp_1, tmp, N);
          haar1(tmp_1, N>>LM, 1<<LM);
          L1 = l1_metric(tmp_1, N, LM+1, bias);
          if (L1<best_L1)
@@ -808,8 +808,8 @@ static void tf_encode(int start, int end, int isTransient, int *tf_res, int LM,
    int tf_select_rsv;
    int tf_changed;
    int logp;
-   opus_uint32 budget;
-   opus_uint32 tell;
+   oac_uint32 budget;
+   oac_uint32 tell;
    budget = enc->storage*8;
    tell = ec_tell(enc);
    logp = isTransient ? 2 : 4;
@@ -845,31 +845,31 @@ static void tf_encode(int start, int end, int isTransient, int *tf_res, int LM,
 
 static int alloc_trim_analysis(const CELTMode *m, const celt_norm *X,
       const celt_glog *bandLogE, int end, int LM, int C, int N0,
-      AnalysisInfo *analysis, opus_val16 *stereo_saving, opus_val16 tf_estimate,
-      int intensity, celt_glog surround_trim, opus_int32 equiv_rate, int arch)
+      AnalysisInfo *analysis, oac_val16 *stereo_saving, oac_val16 tf_estimate,
+      int intensity, celt_glog surround_trim, oac_int32 equiv_rate, int arch)
 {
    int i;
-   opus_val32 diff=0;
+   oac_val32 diff=0;
    int c;
    int trim_index;
-   opus_val16 trim = QCONST16(5.f, 8);
-   opus_val16 logXC, logXC2;
+   oac_val16 trim = QCONST16(5.f, 8);
+   oac_val16 logXC, logXC2;
    /* At low bitrate, reducing the trim seems to help. At higher bitrates, it's less
       clear what's best, so we're keeping it as it was before, at least for now. */
    if (equiv_rate < 64000) {
       trim = QCONST16(4.f, 8);
    } else if (equiv_rate < 80000) {
-      opus_int32 frac = (equiv_rate-64000) >> 10;
+      oac_int32 frac = (equiv_rate-64000) >> 10;
       trim = QCONST16(4.f, 8) + QCONST16(1.f/16.f, 8)*frac;
    }
    if (C==2)
    {
-      opus_val16 sum = 0; /* Q10 */
-      opus_val16 minXC; /* Q10 */
+      oac_val16 sum = 0; /* Q10 */
+      oac_val16 minXC; /* Q10 */
       /* Compute inter-channel correlation for low frequencies */
       for (i=0;i<8;i++)
       {
-         opus_val32 partial;
+         oac_val32 partial;
          partial = celt_inner_prod_norm_shift(&X[m->eBands[i]<<LM], &X[N0+(m->eBands[i]<<LM)],
                (m->eBands[i+1]-m->eBands[i])<<LM, arch);
          sum = ADD16(sum, EXTRACT16(SHR32(partial, 18)));
@@ -879,7 +879,7 @@ static int alloc_trim_analysis(const CELTMode *m, const celt_norm *X,
       minXC = sum;
       for (i=8;i<intensity;i++)
       {
-         opus_val32 partial;
+         oac_val32 partial;
          partial = celt_inner_prod_norm_shift(&X[m->eBands[i]<<LM], &X[N0+(m->eBands[i]<<LM)],
                (m->eBands[i+1]-m->eBands[i])<<LM, arch);
          minXC = MIN16(minXC, ABS16(EXTRACT16(SHR32(partial, 18))));
@@ -904,7 +904,7 @@ static int alloc_trim_analysis(const CELTMode *m, const celt_norm *X,
    c=0; do {
       for (i=0;i<end-1;i++)
       {
-         diff += SHR32(bandLogE[i+c*m->nbEBands], 5)*(opus_int32)(2+2*i-end);
+         diff += SHR32(bandLogE[i+c*m->nbEBands], 5)*(oac_int32)(2+2*i-end);
       }
    } while (++c<C);
    diff /= C*(end-1);
@@ -916,7 +916,7 @@ static int alloc_trim_analysis(const CELTMode *m, const celt_norm *X,
    if (analysis->valid)
    {
       trim -= MAX16(-QCONST16(2.f, 8), MIN16(QCONST16(2.f, 8),
-            (opus_val16)(QCONST16(2.f, 8)*(analysis->tonality_slope+.05f))));
+            (oac_val16)(QCONST16(2.f, 8)*(analysis->tonality_slope+.05f))));
    }
 #else
    (void)analysis;
@@ -940,7 +940,7 @@ static int stereo_analysis(const CELTMode *m, const celt_norm *X,
 {
    int i;
    int thetas;
-   opus_val32 sumLR = EPSILON, sumMS = EPSILON;
+   oac_val32 sumLR = EPSILON, sumMS = EPSILON;
 
    /* Use the L1 norm to model the entropy of the L/R signal vs the M/S signal */
    for (i=0;i<13;i++)
@@ -948,7 +948,7 @@ static int stereo_analysis(const CELTMode *m, const celt_norm *X,
       int j;
       for (j=m->eBands[i]<<LM;j<m->eBands[i+1]<<LM;j++)
       {
-         opus_val32 L, R, M, S;
+         oac_val32 L, R, M, S;
          /* We cast to 32-bit first because of the -32768 case */
          L = SHR32(X[j], NORM_SHIFT-14);
          R = SHR32(X[N0+j], NORM_SHIFT-14);
@@ -1028,13 +1028,13 @@ static celt_glog median_of_3(const celt_glog *x)
 }
 
 static celt_glog dynalloc_analysis(const celt_glog *bandLogE, const celt_glog *bandLogE2, const celt_glog *oldBandE,
-      int nbEBands, int start, int end, int C, int *offsets, int lsb_depth, const opus_int16 *logN,
-      int isTransient, int vbr, int constrained_vbr, const opus_int16 *eBands, int LM,
-      int effectiveBytes, opus_int32 *tot_boost_, int lfe, celt_glog *surround_dynalloc,
-      AnalysisInfo *analysis, int *importance, int *spread_weight, opus_val16 tone_freq, opus_val32 toneishness, int qext_scale)
+      int nbEBands, int start, int end, int C, int *offsets, int lsb_depth, const oac_int16 *logN,
+      int isTransient, int vbr, int constrained_vbr, const oac_int16 *eBands, int LM,
+      int effectiveBytes, oac_int32 *tot_boost_, int lfe, celt_glog *surround_dynalloc,
+      AnalysisInfo *analysis, int *importance, int *spread_weight, oac_val16 tone_freq, oac_val32 toneishness, int qext_scale)
 {
    int i, c;
-   opus_int32 tot_boost=0;
+   oac_int32 tot_boost=0;
    celt_glog maxDepth;
    VARDECL(celt_glog, follower);
    VARDECL(celt_glog, noise_floor);
@@ -1048,7 +1048,7 @@ static celt_glog dynalloc_analysis(const celt_glog *bandLogE, const celt_glog *b
    ALLOC(follower, C*nbEBands, celt_glog);
    ALLOC(noise_floor, C*nbEBands, celt_glog);
    ALLOC(bandLogE3, nbEBands, celt_glog);
-   OPUS_CLEAR(offsets, nbEBands);
+   OAC_CLEAR(offsets, nbEBands);
    /* Dynamic allocation code */
    maxDepth=-GCONST(31.9f);
    for (i=0;i<end;i++)
@@ -1078,7 +1078,7 @@ static celt_glog dynalloc_analysis(const celt_glog *bandLogE, const celt_glog *b
          for (i=0;i<end;i++)
             mask[i] = MAXG(mask[i], bandLogE[nbEBands+i]-noise_floor[i]);
       }
-      OPUS_COPY(sig, mask, end);
+      OAC_COPY(sig, mask, end);
       for (i=1;i<end;i++)
          mask[i] = MAXG(mask[i], mask[i-1] - GCONST(2.f));
       for (i=end-2;i>=0;i--)
@@ -1111,7 +1111,7 @@ static celt_glog dynalloc_analysis(const celt_glog *bandLogE, const celt_glog *b
          celt_glog offset;
          celt_glog tmp;
          celt_glog *f;
-         OPUS_COPY(bandLogE3, &bandLogE2[c*nbEBands], end);
+         OAC_COPY(bandLogE3, &bandLogE2[c*nbEBands], end);
          if (LM==0) {
             /* For 2.5 ms frames, the first 8 bands have just one bin, so the
                energy is highly unreliable (high variance). For that reason,
@@ -1187,10 +1187,10 @@ static celt_glog dynalloc_analysis(const celt_glog *bandLogE, const celt_glog *b
          if (i>=12)
             follower[i] = HALF32(follower[i]);
       }
-      /* Compensate for Opus' under-allocation on tones. */
+      /* Compensate for Oac' under-allocation on tones. */
       if (toneishness > QCONST32(.98f, 29)) {
 #ifdef FIXED_POINT
-         int freq_bin = PSHR32(QEXT_SCALE((opus_val32)tone_freq)*QCONST16(120/M_PI, 9), 13+9);
+         int freq_bin = PSHR32(QEXT_SCALE((oac_val32)tone_freq)*QCONST16(120/M_PI, 9), 13+9);
 #else
          int freq_bin = (int)floor(.5 + QEXT_SCALE(tone_freq)*120/M_PI);
 #endif
@@ -1239,7 +1239,7 @@ static celt_glog dynalloc_analysis(const celt_glog *bandLogE, const celt_glog *b
          if ((!vbr || (constrained_vbr&&!isTransient))
                && (tot_boost+boost_bits)>>BITRES>>3 > 2*effectiveBytes/3)
          {
-            opus_int32 cap = ((2*effectiveBytes/3)<<BITRES<<3);
+            oac_int32 cap = ((2*effectiveBytes/3)<<BITRES<<3);
             offsets[i] = cap-tot_boost;
             tot_boost = cap;
             break;
@@ -1258,8 +1258,8 @@ static celt_glog dynalloc_analysis(const celt_glog *bandLogE, const celt_glog *b
 }
 
 #ifdef FIXED_POINT
-void normalize_tone_input(opus_val16 *x, int len) {
-   opus_val32 ac0=len;
+void normalize_tone_input(oac_val16 *x, int len) {
+   oac_val32 ac0=len;
    int i;
    int shift;
    for (i=0;i<len;i++) {
@@ -1272,9 +1272,9 @@ void normalize_tone_input(opus_val16 *x, int len) {
       }
    }
 }
-int acos_approx(opus_val32 x) {
-   opus_val16 x14;
-   opus_val32 tmp;
+int acos_approx(oac_val32 x) {
+   oac_val16 x14;
+   oac_val32 tmp;
    int flip = x<0;
    x = abs(x);
    x14 = x>>15;
@@ -1287,11 +1287,11 @@ int acos_approx(opus_val32 x) {
 #endif
 
 /* Compute the LPC coefficients using a least-squares fit for both forward and backward prediction. */
-static int tone_lpc(const opus_val16 *x, int len, int delay, opus_val32 *lpc) {
+static int tone_lpc(const oac_val16 *x, int len, int delay, oac_val32 *lpc) {
    int i;
-   opus_val32 r00=0, r01=0, r11=0, r02=0, r12=0, r22=0;
-   opus_val32 edges;
-   opus_val32 num0, num1, den;
+   oac_val32 r00=0, r01=0, r11=0, r02=0, r12=0, r22=0;
+   oac_val32 edges;
+   oac_val32 num0, num1, den;
    celt_assert(len > 2*delay);
    /* Compute correlations as if using the forward prediction covariance method. */
    for (i=0;i<len-2*delay;i++) {
@@ -1310,7 +1310,7 @@ static int tone_lpc(const opus_val16 *x, int len, int delay, opus_val32 *lpc) {
    r12 = r01+edges;
    /* Reverse and sum to get the backward contribution. */
    {
-      opus_val32 R00, R01, R11, R02, R12, R22;
+      oac_val32 R00, R01, R11, R02, R12, R22;
       R00 = r00 + r22;
       R01 = r01 + r12;
       R11 = 2*r11;
@@ -1344,15 +1344,15 @@ static int tone_lpc(const opus_val16 *x, int len, int delay, opus_val32 *lpc) {
 }
 
 /* Detects pure of nearly pure tones so we can prevent them from causing problems with the encoder. */
-static opus_val16 tone_detect(const celt_sig *in, int CC, int N, opus_val32 *toneishness, opus_int32 Fs) {
+static oac_val16 tone_detect(const celt_sig *in, int CC, int N, oac_val32 *toneishness, oac_int32 Fs) {
    int i;
    int delay = 1;
    int fail;
-   opus_val32 lpc[2];
-   opus_val16 freq;
-   VARDECL(opus_val16, x);
+   oac_val32 lpc[2];
+   oac_val16 freq;
+   VARDECL(oac_val16, x);
    SAVE_STACK;
-   ALLOC(x, N, opus_val16);
+   ALLOC(x, N, oac_val16);
    /* Shift by SIG_SHIFT+2 (+3 for stereo) to account for HF gain of the preemphasis filter. */
    if (CC==2) {
       for (i=0;i<N;i++) x[i] = PSHR32(ADD32(SHR32(in[i], 1), SHR32(in[i+N], 1)), SIG_SHIFT+2);
@@ -1387,21 +1387,21 @@ static opus_val16 tone_detect(const celt_sig *in, int CC, int N, opus_val32 *ton
 }
 
 static int run_prefilter(CELTEncoder *st, celt_sig *in, celt_sig *prefilter_mem, int CC, int N,
-      int prefilter_tapset, int *pitch, opus_val16 *gain, int *qgain, int enabled, int complexity, opus_val16 tf_estimate,
-      int nbAvailableBytes, AnalysisInfo *analysis, opus_val16 tone_freq, opus_val32 toneishness, int qext_scale)
+      int prefilter_tapset, int *pitch, oac_val16 *gain, int *qgain, int enabled, int complexity, oac_val16 tf_estimate,
+      int nbAvailableBytes, AnalysisInfo *analysis, oac_val16 tone_freq, oac_val32 toneishness, int qext_scale)
 {
    int c;
    VARDECL(celt_sig, _pre);
    celt_sig *pre[2];
    const CELTMode *mode;
    int pitch_index;
-   opus_val16 gain1;
-   opus_val16 pf_threshold;
+   oac_val16 gain1;
+   oac_val16 pf_threshold;
    int pf_on;
    int qg;
    int overlap;
    int min_period, max_period;
-   opus_val32 before[2]={0}, after[2]={0};
+   oac_val32 before[2]={0}, after[2]={0};
    int cancel_pitch=0;
    SAVE_STACK;
 
@@ -1420,8 +1420,8 @@ static int run_prefilter(CELTEncoder *st, celt_sig *in, celt_sig *prefilter_mem,
 
 
    c=0; do {
-      OPUS_COPY(pre[c], prefilter_mem+c*max_period, max_period);
-      OPUS_COPY(pre[c]+max_period, in+c*(N+overlap)+overlap, N);
+      OAC_COPY(pre[c], prefilter_mem+c*max_period, max_period);
+      OAC_COPY(pre[c]+max_period, in+c*(N+overlap)+overlap, N);
    } while (++c<CC);
 
    /* If we detect that the signal is dominated by a single tone, don't rely on the standard pitch
@@ -1448,8 +1448,8 @@ static int run_prefilter(CELTEncoder *st, celt_sig *in, celt_sig *prefilter_mem,
       }
       gain1 = QCONST16(.75f, 15);
    } else if (enabled && complexity >= 5) {
-      VARDECL(opus_val16, pitch_buf);
-      ALLOC(pitch_buf, (max_period+N)>>1, opus_val16);
+      VARDECL(oac_val16, pitch_buf);
+      ALLOC(pitch_buf, (max_period+N)>>1, oac_val16);
 
       pitch_downsample(pre, pitch_buf, (max_period+N)>>1, CC, 2, st->arch);
       /* Don't search for the fir last 1.5 octave of the range because
@@ -1480,7 +1480,7 @@ static int run_prefilter(CELTEncoder *st, celt_sig *in, celt_sig *prefilter_mem,
    }
 #ifndef DISABLE_FLOAT_API
    if (analysis->valid)
-      gain1 = (opus_val16)(gain1 * analysis->max_pitch_ratio);
+      gain1 = (oac_val16)(gain1 * analysis->max_pitch_ratio);
 #else
    (void)analysis;
 #endif
@@ -1532,7 +1532,7 @@ static int run_prefilter(CELTEncoder *st, celt_sig *in, celt_sig *prefilter_mem,
       int i;
       int offset = mode->shortMdctSize-overlap;
       st->prefilter_period=IMAX(st->prefilter_period, COMBFILTER_MINPERIOD);
-      OPUS_COPY(in+c*(N+overlap), st->in_mem+c*(overlap), overlap);
+      OAC_COPY(in+c*(N+overlap), st->in_mem+c*(overlap), overlap);
       for (i=0;i<N;i++) before[c] += ABS32(SHR32(in[c*(N+overlap)+overlap+i], 12));
       if (offset)
          comb_filter(in+c*(N+overlap)+overlap, pre[c]+max_period,
@@ -1546,7 +1546,7 @@ static int run_prefilter(CELTEncoder *st, celt_sig *in, celt_sig *prefilter_mem,
    } while (++c<CC);
 
    if (CC==2) {
-      opus_val16 thresh[2];
+      oac_val16 thresh[2];
       thresh[0] = MULT16_32_Q15(MULT16_16_Q15(QCONST16(.25f, 15), gain1), before[0]) + MULT16_32_Q15(QCONST16(.01f,15), before[1]);
       thresh[1] = MULT16_32_Q15(MULT16_16_Q15(QCONST16(.25f, 15), gain1), before[1]) + MULT16_32_Q15(QCONST16(.01f,15), before[0]);
       /* Don't use the filter if one channel gets significantly worse. */
@@ -1561,7 +1561,7 @@ static int run_prefilter(CELTEncoder *st, celt_sig *in, celt_sig *prefilter_mem,
    if (cancel_pitch) {
       c=0; do {
          int offset = mode->shortMdctSize-overlap;
-         OPUS_COPY(in+c*(N+overlap)+overlap, pre[c]+max_period, N);
+         OAC_COPY(in+c*(N+overlap)+overlap, pre[c]+max_period, N);
          comb_filter(in+c*(N+overlap)+overlap+offset, pre[c]+max_period+offset,
                      st->prefilter_period, pitch_index, overlap, -st->prefilter_gain, -0,
                      st->prefilter_tapset, prefilter_tapset, mode->window, overlap, st->arch);
@@ -1572,14 +1572,14 @@ static int run_prefilter(CELTEncoder *st, celt_sig *in, celt_sig *prefilter_mem,
    }
 
    c=0; do {
-      OPUS_COPY(st->in_mem+c*(overlap), in+c*(N+overlap)+N, overlap);
+      OAC_COPY(st->in_mem+c*(overlap), in+c*(N+overlap)+N, overlap);
 
       if (N>max_period)
       {
-         OPUS_COPY(prefilter_mem+c*max_period, pre[c]+N, max_period);
+         OAC_COPY(prefilter_mem+c*max_period, pre[c]+N, max_period);
       } else {
-         OPUS_MOVE(prefilter_mem+c*max_period, prefilter_mem+c*max_period+N, max_period-N);
-         OPUS_COPY(prefilter_mem+c*max_period+max_period-N, pre[c]+max_period, N);
+         OAC_MOVE(prefilter_mem+c*max_period, prefilter_mem+c*max_period+N, max_period-N);
+         OAC_COPY(prefilter_mem+c*max_period+max_period-N, pre[c]+max_period, N);
       }
    } while (++c<CC);
 
@@ -1590,20 +1590,20 @@ static int run_prefilter(CELTEncoder *st, celt_sig *in, celt_sig *prefilter_mem,
    return pf_on;
 }
 
-static int compute_vbr(const CELTMode *mode, AnalysisInfo *analysis, opus_int32 base_target,
-      int LM, opus_int32 bitrate, int lastCodedBands, int C, int intensity,
-      int constrained_vbr, opus_val16 stereo_saving, int tot_boost,
-      opus_val16 tf_estimate, int pitch_change, celt_glog maxDepth,
+static int compute_vbr(const CELTMode *mode, AnalysisInfo *analysis, oac_int32 base_target,
+      int LM, oac_int32 bitrate, int lastCodedBands, int C, int intensity,
+      int constrained_vbr, oac_val16 stereo_saving, int tot_boost,
+      oac_val16 tf_estimate, int pitch_change, celt_glog maxDepth,
       int lfe, int has_surround_mask, celt_glog surround_masking,
       celt_glog temporal_vbr)
 {
    /* The target rate in 8th bits per frame */
-   opus_int32 target;
+   oac_int32 target;
    int coded_bins;
    int coded_bands;
-   opus_val16 tf_calibration;
+   oac_val16 tf_calibration;
    int nbEBands;
-   const opus_int16 *eBands;
+   const oac_int16 *eBands;
 
    nbEBands = mode->nbEBands;
    eBands = mode->eBands;
@@ -1618,41 +1618,41 @@ static int compute_vbr(const CELTMode *mode, AnalysisInfo *analysis, opus_int32
    /*printf("%f %f %f %f %d %d ", st->analysis.activity, st->analysis.tonality, tf_estimate, st->stereo_saving, tot_boost, coded_bands);*/
 #ifndef DISABLE_FLOAT_API
    if (analysis->valid && analysis->activity<.4)
-      target -= (opus_int32)((coded_bins<<BITRES)*(.4f-analysis->activity));
+      target -= (oac_int32)((coded_bins<<BITRES)*(.4f-analysis->activity));
 #endif
    /* Stereo savings */
    if (C==2)
    {
       int coded_stereo_bands;
       int coded_stereo_dof;
-      opus_val16 max_frac;
+      oac_val16 max_frac;
       coded_stereo_bands = IMIN(intensity, coded_bands);
       coded_stereo_dof = (eBands[coded_stereo_bands]<<LM)-coded_stereo_bands;
       /* Maximum fraction of the bits we can save if the signal is mono. */
       max_frac = DIV32_16(MULT16_16(QCONST16(0.8f, 15), coded_stereo_dof), coded_bins);
       stereo_saving = MIN16(stereo_saving, QCONST16(1.f, 8));
       /*printf("%d %d %d ", coded_stereo_dof, coded_bins, tot_boost);*/
-      target -= (opus_int32)MIN32(MULT16_32_Q15(max_frac,target),
+      target -= (oac_int32)MIN32(MULT16_32_Q15(max_frac,target),
                       SHR32(MULT16_16(stereo_saving-QCONST16(0.1f,8),(coded_stereo_dof<<BITRES)),8));
    }
    /* Boost the rate according to dynalloc (minus the dynalloc average for calibration). */
    target += tot_boost-(19<<LM);
    /* Apply transient boost, compensating for average boost. */
    tf_calibration = QCONST16(0.044f,14);
-   target += (opus_int32)SHL32(MULT16_32_Q15(tf_estimate-tf_calibration, target),1);
+   target += (oac_int32)SHL32(MULT16_32_Q15(tf_estimate-tf_calibration, target),1);
 
 #ifndef DISABLE_FLOAT_API
    /* Apply tonality boost */
    if (analysis->valid && !lfe)
    {
-      opus_int32 tonal_target;
+      oac_int32 tonal_target;
       float tonal;
 
       /* Tonality boost (compensating for the average). */
       tonal = MAX16(0.f,analysis->tonality-.15f)-0.12f;
-      tonal_target = target + (opus_int32)((coded_bins<<BITRES)*1.2f*tonal);
+      tonal_target = target + (oac_int32)((coded_bins<<BITRES)*1.2f*tonal);
       if (pitch_change)
-         tonal_target +=  (opus_int32)((coded_bins<<BITRES)*.8f);
+         tonal_target +=  (oac_int32)((coded_bins<<BITRES)*.8f);
       /*printf("%f %f ", analysis->tonality, tonal);*/
       target = tonal_target;
    }
@@ -1663,17 +1663,17 @@ static int compute_vbr(const CELTMode *mode, AnalysisInfo *analysis, opus_int32
 
    if (has_surround_mask&&!lfe)
    {
-      opus_int32 surround_target = target + (opus_int32)SHR32(MULT16_16(SHR32(surround_masking,DB_SHIFT-10),coded_bins<<BITRES), 10);
+      oac_int32 surround_target = target + (oac_int32)SHR32(MULT16_16(SHR32(surround_masking,DB_SHIFT-10),coded_bins<<BITRES), 10);
       /*printf("%f %d %d %d %d %d %d ", surround_masking, coded_bins, st->end, st->intensity, surround_target, target, st->bitrate);*/
       target = IMAX(target/4, surround_target);
    }
 
    {
-      opus_int32 floor_depth;
+      oac_int32 floor_depth;
       int bins;
       bins = eBands[nbEBands-2]<<LM;
       /*floor_depth = SHR32(MULT16_16((C*bins<<BITRES),celt_log2(SHL32(MAX16(1,sample_max),13))), DB_SHIFT);*/
-      floor_depth = (opus_int32)SHR32(MULT16_32_Q15((C*bins<<BITRES),maxDepth), DB_SHIFT-15);
+      floor_depth = (oac_int32)SHR32(MULT16_32_Q15((C*bins<<BITRES),maxDepth), DB_SHIFT-15);
       floor_depth = IMAX(floor_depth, target>>2);
       target = IMIN(target, floor_depth);
       /*printf("%f %d\n", maxDepth, floor_depth);*/
@@ -1683,16 +1683,16 @@ static int compute_vbr(const CELTMode *mode, AnalysisInfo *analysis, opus_int32
       for long. Needs tuning. */
    if ((!has_surround_mask||lfe) && constrained_vbr)
    {
-      target = base_target + (opus_int32)MULT16_32_Q15(QCONST16(0.67f, 15), target-base_target);
+      target = base_target + (oac_int32)MULT16_32_Q15(QCONST16(0.67f, 15), target-base_target);
    }
 
    if (!has_surround_mask && tf_estimate < QCONST16(.2f, 14))
    {
-      opus_val16 amount;
-      opus_val16 tvbr_factor;
+      oac_val16 amount;
+      oac_val16 tvbr_factor;
       amount = MULT16_16_Q15(QCONST16(.0000031f, 30), IMAX(0, IMIN(32000, 96000-bitrate)));
       tvbr_factor = SHR32(MULT16_16(SHR32(temporal_vbr, DB_SHIFT-10), amount), 10);
-      target += (opus_int32)MULT16_32_Q15(tvbr_factor, target);
+      target += (oac_int32)MULT16_32_Q15(tvbr_factor, target);
    }
 
    /* Don't allow more than doubling the rate */
@@ -1701,10 +1701,10 @@ static int compute_vbr(const CELTMode *mode, AnalysisInfo *analysis, opus_int32
    return target;
 }
 
-int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes, ec_enc *enc)
+int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes, ec_enc *enc)
 {
    int i, c, N;
-   opus_int32 bits;
+   oac_int32 bits;
    ec_enc _enc;
    VARDECL(celt_sig, in);
    VARDECL(celt_sig, freq);
@@ -1731,50 +1731,50 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
    int LM, M;
    int tf_select;
    int nbFilledBytes, nbAvailableBytes;
-   opus_int32 min_allowed;
+   oac_int32 min_allowed;
    int start;
    int end;
    int effEnd;
    int codedBands;
    int alloc_trim;
    int pitch_index=COMBFILTER_MINPERIOD;
-   opus_val16 gain1 = 0;
+   oac_val16 gain1 = 0;
    int dual_stereo=0;
    int effectiveBytes;
    int dynalloc_logp;
-   opus_int32 vbr_rate;
-   opus_int32 total_bits;
-   opus_int32 total_boost;
-   opus_int32 balance;
-   opus_int32 tell;
-   opus_int32 tell0_frac;
+   oac_int32 vbr_rate;
+   oac_int32 total_bits;
+   oac_int32 total_boost;
+   oac_int32 balance;
+   oac_int32 tell;
+   oac_int32 tell0_frac;
    int prefilter_tapset=0;
    int pf_on;
    int anti_collapse_rsv;
    int anti_collapse_on=0;
    int silence=0;
    int tf_chan = 0;
-   opus_val16 tf_estimate;
+   oac_val16 tf_estimate;
    int pitch_change=0;
-   opus_int32 tot_boost;
-   opus_val32 sample_max;
+   oac_int32 tot_boost;
+   oac_val32 sample_max;
    celt_glog maxDepth;
-   const OpusCustomMode *mode;
+   const OacCustomMode *mode;
    int nbEBands;
    int overlap;
-   const opus_int16 *eBands;
+   const oac_int16 *eBands;
    int secondMdct;
    int signalBandwidth;
    int transient_got_disabled=0;
    celt_glog surround_masking=0;
    celt_glog temporal_vbr=0;
    celt_glog surround_trim = 0;
-   opus_int32 equiv_rate;
+   oac_int32 equiv_rate;
    int hybrid;
    int weak_transient = 0;
    int enable_tf_analysis;
-   opus_val16 tone_freq=-1;
-   opus_val32 toneishness=0;
+   oac_val16 tone_freq=-1;
+   oac_val32 toneishness=0;
    VARDECL(celt_glog, surround_dynalloc);
    int packet_size_cap = 1275;
    int qext_scale=1;
@@ -1791,7 +1791,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
    if (nbCompressedBytes<2 || pcm==NULL)
    {
       RESTORE_STACK;
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    }
 
    frame_size *= st->upsample;
@@ -1801,7 +1801,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
    if (LM>mode->maxLM)
    {
       RESTORE_STACK;
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    }
    M=1<<LM;
    N = M*mode->shortMdctSize;
@@ -1826,7 +1826,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
       nbFilledBytes=(tell+4)>>3;
    }
 
-#if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API)
+#if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
    if (st->signalling && enc==NULL)
    {
       int tmp = (mode->effEBands-end)>>1;
@@ -1834,16 +1834,16 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
       compressed[0] = tmp<<5;
       compressed[0] |= LM<<3;
       compressed[0] |= (C==2)<<2;
-      /* Convert "standard mode" to Opus header */
+      /* Convert "standard mode" to Oac header */
 # ifndef ENABLE_QEXT
       if (mode->Fs==48000 && mode->shortMdctSize==120)
 # endif
       {
-         int c0 = toOpus(compressed[0]);
+         int c0 = toOac(compressed[0]);
          if (c0<0)
          {
             RESTORE_STACK;
-            return OPUS_BAD_ARG;
+            return OAC_BAD_ARG;
          }
          compressed[0] = c0;
       }
@@ -1857,21 +1857,21 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
    /* Can't produce more than 1275 output bytes for the main payload. */
    nbCompressedBytes = IMIN(nbCompressedBytes,packet_size_cap);
 
-   if (st->vbr && st->bitrate!=OPUS_BITRATE_MAX)
+   if (st->vbr && st->bitrate!=OAC_BITRATE_MAX)
    {
       vbr_rate = bitrate_to_bits(st->bitrate, mode->Fs, frame_size)<<BITRES;
-#if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API)
+#if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
       if (st->signalling)
          vbr_rate -= 8<<BITRES;
 #endif
       effectiveBytes = vbr_rate>>(3+BITRES);
    } else {
-      opus_int32 tmp;
+      oac_int32 tmp;
       vbr_rate = 0;
       tmp = st->bitrate*frame_size;
       if (tell>1)
          tmp += tell*mode->Fs;
-      if (st->bitrate!=OPUS_BITRATE_MAX)
+      if (st->bitrate!=OAC_BITRATE_MAX)
       {
          nbCompressedBytes = IMAX(2, IMIN(nbCompressedBytes,
                (tmp+4*mode->Fs)/(8*mode->Fs)-!!st->signalling));
@@ -1881,8 +1881,8 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
       effectiveBytes = nbCompressedBytes - nbFilledBytes;
    }
    nbAvailableBytes = nbCompressedBytes - nbFilledBytes;
-   equiv_rate = ((opus_int32)nbCompressedBytes*8*50 << (3-LM)) - (40*C+20)*((400>>LM) - 50);
-   if (st->bitrate != OPUS_BITRATE_MAX)
+   equiv_rate = ((oac_int32)nbCompressedBytes*8*50 << (3-LM)) - (40*C+20)*((400>>LM) - 50);
+   if (st->bitrate != OAC_BITRATE_MAX)
       equiv_rate = IMIN(equiv_rate, st->bitrate - (40*C+20)*((400>>LM) - 50));
 
    if (enc==NULL)
@@ -1899,8 +1899,8 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
           correctly if we don't have enough bits. */
       if (st->constrained_vbr)
       {
-         opus_int32 vbr_bound;
-         opus_int32 max_allowed;
+         oac_int32 vbr_bound;
+         oac_int32 max_allowed;
          /* We could use any multiple of vbr_rate as bound (depending on the
              delay).
             This is clamped to ensure we use at least two bytes if the encoder
@@ -1931,7 +1931,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
 #ifdef FIXED_POINT
    silence = (sample_max==0);
 #else
-   silence = (sample_max <= (opus_val16)1/(1<<st->lsb_depth));
+   silence = (sample_max <= (oac_val16)1/(1<<st->lsb_depth));
 #endif
 #ifdef FUZZING
    if ((rand()&0x3F)==0)
@@ -1965,7 +1965,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
 #endif
       celt_preemphasis(pcm+c, in+c*(N+overlap)+overlap, N, CC, st->upsample,
                   mode->preemph, st->preemph_memE+c, need_clip);
-      OPUS_COPY(in+c*(N+overlap), &prefilter_mem[(1+c)*QEXT_SCALE(COMBFILTER_MAXPERIOD)-overlap], overlap);
+      OAC_COPY(in+c*(N+overlap), &prefilter_mem[(1+c)*QEXT_SCALE(COMBFILTER_MAXPERIOD)-overlap], overlap);
    } while (++c<CC);
 
 
@@ -2040,7 +2040,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
 
    compute_mdcts(mode, shortBlocks, in, freq, C, CC, LM, st->upsample, st->arch);
    /* This should catch any NaN in the CELT input. Since we're not supposed to see any (they're filtered
-      at the Opus layer), just abort. */
+      at the Oac layer), just abort. */
    celt_assert(!celt_isnan(freq[0]) && (C==1 || !celt_isnan(freq[N])));
    if (CC==2&&C==1)
       tf_chan = 0;
@@ -2057,15 +2057,15 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
    amp2Log2(mode, effEnd, end, bandE, bandLogE, C);
 
    ALLOC(surround_dynalloc, C*nbEBands, celt_glog);
-   OPUS_CLEAR(surround_dynalloc, end);
+   OAC_CLEAR(surround_dynalloc, end);
    /* This computes how much masking takes place between surround channels */
    if (!hybrid&&st->energy_mask&&!st->lfe)
    {
       int mask_end;
       int midband;
       int count_dynalloc;
-      opus_val32 mask_avg=0;
-      opus_val32 diff=0;
+      oac_val32 mask_avg=0;
+      oac_val32 diff=0;
       int count=0;
       mask_end = IMAX(2,st->lastCodedBands);
       for (c=0;c<C;c++)
@@ -2073,7 +2073,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
          for(i=0;i<mask_end;i++)
          {
             celt_glog mask;
-            opus_val16 mask16;
+            oac_val16 mask16;
             mask = MAXG(MING(st->energy_mask[nbEBands*c+i],
                    GCONST(.25f)), -GCONST(2.0f));
             if (mask > 0)
@@ -2096,7 +2096,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
       count_dynalloc=0;
       for(i=0;i<mask_end;i++)
       {
-         opus_val32 lin;
+         oac_val32 lin;
          celt_glog unmask;
          lin = mask_avg + diff*(i-midband);
          if (C==2)
@@ -2122,7 +2122,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
                disabling masking. */
             mask_avg = 0;
             diff = 0;
-            OPUS_CLEAR(surround_dynalloc, mask_end);
+            OAC_CLEAR(surround_dynalloc, mask_end);
          } else {
             for(i=0;i<mask_end;i++)
                surround_dynalloc[i] = MAXG(0, surround_dynalloc[i]-GCONST(.25f));
@@ -2138,7 +2138,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
    if (!st->lfe)
    {
       celt_glog follow=-QCONST32(10.0f, DB_SHIFT-5);
-      opus_val32 frame_avg=0;
+      oac_val32 frame_avg=0;
       celt_glog offset = shortBlocks?HALF32(SHL32(LM, DB_SHIFT-5)):0;
       for(i=start;i<end;i++)
       {
@@ -2158,7 +2158,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
 
    if (!secondMdct)
    {
-      OPUS_COPY(bandLogE2, bandLogE, C*nbEBands);
+      OAC_COPY(bandLogE2, bandLogE, C*nbEBands);
    }
 
    /* Last chance to catch any transient we might have missed in the
@@ -2277,10 +2277,10 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
 #if 0
          if (st->analysis.valid)
          {
-            static const opus_val16 spread_thresholds[3] = {-QCONST16(.6f, 15), -QCONST16(.2f, 15), -QCONST16(.07f, 15)};
-            static const opus_val16 spread_histeresis[3] = {QCONST16(.15f, 15), QCONST16(.07f, 15), QCONST16(.02f, 15)};
-            static const opus_val16 tapset_thresholds[2] = {QCONST16(.0f, 15), QCONST16(.15f, 15)};
-            static const opus_val16 tapset_histeresis[2] = {QCONST16(.1f, 15), QCONST16(.05f, 15)};
+            static const oac_val16 spread_thresholds[3] = {-QCONST16(.6f, 15), -QCONST16(.2f, 15), -QCONST16(.07f, 15)};
+            static const oac_val16 spread_histeresis[3] = {QCONST16(.15f, 15), QCONST16(.07f, 15), QCONST16(.02f, 15)};
+            static const oac_val16 tapset_thresholds[2] = {QCONST16(.0f, 15), QCONST16(.15f, 15)};
+            static const oac_val16 tapset_histeresis[2] = {QCONST16(.1f, 15), QCONST16(.05f, 15)};
             st->spread_decision = hysteresis_decision(-st->analysis.tonality, spread_thresholds, spread_histeresis, 3, st->spread_decision);
             st->tapset_decision = hysteresis_decision(st->analysis.tonality_slope, tapset_thresholds, tapset_histeresis, 2, st->tapset_decision);
          } else
@@ -2341,17 +2341,17 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
 
    if (C==2)
    {
-      static const opus_val16 intensity_thresholds[21]=
+      static const oac_val16 intensity_thresholds[21]=
       /* 0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19  20  off*/
         {  1, 2, 3, 4, 5, 6, 7, 8,16,24,36,44,50,56,62,67,72,79,88,106,134};
-      static const opus_val16 intensity_histeresis[21]=
+      static const oac_val16 intensity_histeresis[21]=
         {  1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 4, 5, 6,  8, 8};
 
       /* Always use MS for 2.5 ms frames until we can do a better analysis */
       if (LM!=0)
          dual_stereo = stereo_analysis(mode, X, LM, N);
 
-      st->intensity = hysteresis_decision((opus_val16)(equiv_rate/1000),
+      st->intensity = hysteresis_decision((oac_val16)(equiv_rate/1000),
             intensity_thresholds, intensity_histeresis, 21, st->intensity);
       st->intensity = IMIN(end,IMAX(start, st->intensity));
    }
@@ -2385,10 +2385,10 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
    /* Variable bitrate */
    if (vbr_rate>0)
    {
-     opus_val16 alpha;
-     opus_int32 delta;
+     oac_val16 alpha;
+     oac_int32 delta;
      /* The target rate in 8th bits per frame */
-     opus_int32 target, base_target;
+     oac_int32 target, base_target;
      int lm_diff = mode->maxLM - LM;
 
      /* Don't attempt to use more than 510 kb/s, even for frames smaller than 20 ms.
@@ -2418,7 +2418,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
         if (st->silk_info.offset > 100) target -= 18 << BITRES >> (3-LM);
         /* Boosting bitrate on transients and vowels with significant temporal
            spikes. */
-        target += (opus_int32)MULT16_16_Q14(tf_estimate-QCONST16(.25f,14), (50<<BITRES));
+        target += (oac_int32)MULT16_16_Q14(tf_estimate-QCONST16(.25f,14), (50<<BITRES));
         /* If we have a strong transient, let's make sure it has enough bits to code
            the first two bands, so that it can use folding rather than noise. */
         if (tf_estimate > QCONST16(.7f,14))
@@ -2463,7 +2463,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
      /* Compute the offset we need to apply in order to reach the target */
      if (st->constrained_vbr)
      {
-        st->vbr_drift += (opus_int32)MULT16_32_Q15(alpha,(delta*(1<<lm_diff))-st->vbr_offset-st->vbr_drift);
+        st->vbr_drift += (oac_int32)MULT16_32_Q15(alpha,(delta*(1<<lm_diff))-st->vbr_offset-st->vbr_drift);
         st->vbr_offset = -st->vbr_drift;
      }
      /*printf ("%d\n", st->vbr_drift);*/
@@ -2489,7 +2489,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
    ALLOC(fine_priority, nbEBands, int);
 
    /* bits =           packet size                    - where we are - safety*/
-   bits = (((opus_int32)nbCompressedBytes*8)<<BITRES) - (opus_int32)ec_tell_frac(enc) - 1;
+   bits = (((oac_int32)nbCompressedBytes*8)<<BITRES) - (oac_int32)ec_tell_frac(enc) - 1;
    anti_collapse_rsv = isTransient&&LM>=2&&bits>=((LM+2)<<BITRES) ? (1<<BITRES) : 0;
    bits -= anti_collapse_rsv;
    signalBandwidth = end-1;
@@ -2497,13 +2497,13 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
    if (st->analysis.valid)
    {
       int min_bandwidth;
-      if (equiv_rate < (opus_int32)32000*C)
+      if (equiv_rate < (oac_int32)32000*C)
          min_bandwidth = 13;
-      else if (equiv_rate < (opus_int32)48000*C)
+      else if (equiv_rate < (oac_int32)48000*C)
          min_bandwidth = 16;
-      else if (equiv_rate < (opus_int32)60000*C)
+      else if (equiv_rate < (oac_int32)60000*C)
          min_bandwidth = 18;
-      else  if (equiv_rate < (opus_int32)80000*C)
+      else  if (equiv_rate < (oac_int32)80000*C)
          min_bandwidth = 19;
       else
          min_bandwidth = 20;
@@ -2521,7 +2521,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
       st->lastCodedBands = codedBands;
 
    quant_fine_energy(mode, start, end, oldBandE, error, NULL, fine_quant, enc, C);
-   OPUS_CLEAR(energyError, nbEBands*CC);
+   OAC_CLEAR(energyError, nbEBands*CC);
 
    /* Residual quantisation */
    ALLOC(collapse_masks, C*nbEBands, unsigned char);
@@ -2565,7 +2565,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
       }
 
       c=0; do {
-         OPUS_MOVE(st->syn_mem[c], st->syn_mem[c]+N, QEXT_SCALE(DEC_PITCH_BUF_SIZE)-N+overlap/2);
+         OAC_MOVE(st->syn_mem[c], st->syn_mem[c]+N, QEXT_SCALE(DEC_PITCH_BUF_SIZE)-N+overlap/2);
       } while (++c<CC);
 
       c=0; do {
@@ -2588,7 +2588,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
       } while (++c<CC);
 
       /* We reuse freq[] as scratch space for the de-emphasis */
-      deemphasis(out_mem, (opus_res*)pcm, N, CC, st->upsample, mode->preemph, st->preemph_memD, 0);
+      deemphasis(out_mem, (oac_res*)pcm, N, CC, st->upsample, mode->preemph, st->preemph_memD, 0);
       st->prefilter_period_old = st->prefilter_period;
       st->prefilter_gain_old = st->prefilter_gain;
       st->prefilter_tapset_old = st->prefilter_tapset;
@@ -2608,13 +2608,13 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
 #endif
 
    if (CC==2&&C==1) {
-      OPUS_COPY(&oldBandE[nbEBands], oldBandE, nbEBands);
+      OAC_COPY(&oldBandE[nbEBands], oldBandE, nbEBands);
    }
 
    if (!isTransient)
    {
-      OPUS_COPY(oldLogE2, oldLogE, CC*nbEBands);
-      OPUS_COPY(oldLogE, oldBandE, CC*nbEBands);
+      OAC_COPY(oldLogE2, oldLogE, CC*nbEBands);
+      OAC_COPY(oldLogE, oldBandE, CC*nbEBands);
    } else {
       for (i=0;i<CC*nbEBands;i++)
          oldLogE[i] = MING(oldLogE[i], oldBandE[i]);
@@ -2643,33 +2643,33 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
    /* If there's any room left (can only happen for very high rates),
       it's already filled with zeros */
    ec_enc_done(enc);
-#if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API)
+#if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
    if (st->signalling)
       nbCompressedBytes++;
 #endif
 
    RESTORE_STACK;
    if (ec_get_error(enc))
-      return OPUS_INTERNAL_ERROR;
+      return OAC_INTERNAL_ERROR;
    else
       return nbCompressedBytes;
 }
 
 
-#if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API)
+#if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
 
-int opus_custom_encode(CELTEncoder * OPUS_RESTRICT st, const opus_int16 * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes)
+int oac_custom_encode(CELTEncoder * OAC_RESTRICT st, const oac_int16 * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes)
 {
    int j, ret, C, N;
-   VARDECL(opus_res, in);
+   VARDECL(oac_res, in);
    ALLOC_STACK;
 
    if (pcm==NULL)
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
 
    C = st->channels;
    N = frame_size;
-   ALLOC(in, C*N, opus_res);
+   ALLOC(in, C*N, oac_res);
 
    for (j=0;j<C*N;j++)
      in[j] = INT16TORES(pcm[j]);
@@ -2677,7 +2677,7 @@ int opus_custom_encode(CELTEncoder * OPUS_RESTRICT st, const opus_int16 * pcm, i
    ret=celt_encode_with_ec(st,in,frame_size,compressed,nbCompressedBytes, NULL);
 #ifdef RESYNTH
    for (j=0;j<C*N;j++)
-      ((opus_int16*)pcm)[j]=RES2INT16(in[j]);
+      ((oac_int16*)pcm)[j]=RES2INT16(in[j]);
 #endif
    RESTORE_STACK;
    return ret;
@@ -2685,23 +2685,23 @@ int opus_custom_encode(CELTEncoder * OPUS_RESTRICT st, const opus_int16 * pcm, i
 
 
 #if defined(FIXED_POINT)
-int opus_custom_encode24(CELTEncoder * OPUS_RESTRICT st, const opus_int32 * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes)
+int oac_custom_encode24(CELTEncoder * OAC_RESTRICT st, const oac_int32 * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes)
 {
    return celt_encode_with_ec(st, pcm, frame_size, compressed, nbCompressedBytes, NULL);
 }
 #else
-int opus_custom_encode24(CELTEncoder * OPUS_RESTRICT st, const opus_int32 * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes)
+int oac_custom_encode24(CELTEncoder * OAC_RESTRICT st, const oac_int32 * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes)
 {
    int j, ret, C, N;
-   VARDECL(opus_res, in);
+   VARDECL(oac_res, in);
    ALLOC_STACK;
 
    if (pcm==NULL)
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
 
    C = st->channels;
    N = frame_size;
-   ALLOC(in, C*N, opus_res);
+   ALLOC(in, C*N, oac_res);
 
    for (j=0;j<C*N;j++)
      in[j] = INT24TORES(pcm[j]);
@@ -2709,7 +2709,7 @@ int opus_custom_encode24(CELTEncoder * OPUS_RESTRICT st, const opus_int32 * pcm,
    ret=celt_encode_with_ec(st,in,frame_size,compressed,nbCompressedBytes, NULL);
 #ifdef RESYNTH
    for (j=0;j<C*N;j++)
-      ((opus_int32*)pcm)[j]=RES2INT24(in[j]);
+      ((oac_int32*)pcm)[j]=RES2INT24(in[j]);
 #endif
    RESTORE_STACK;
    return ret;
@@ -2720,23 +2720,23 @@ int opus_custom_encode24(CELTEncoder * OPUS_RESTRICT st, const opus_int32 * pcm,
 #ifndef DISABLE_FLOAT_API
 
 # if !defined(FIXED_POINT)
-int opus_custom_encode_float(CELTEncoder * OPUS_RESTRICT st, const float * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes)
+int oac_custom_encode_float(CELTEncoder * OAC_RESTRICT st, const float * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes)
 {
    return celt_encode_with_ec(st, pcm, frame_size, compressed, nbCompressedBytes, NULL);
 }
 # else
-int opus_custom_encode_float(CELTEncoder * OPUS_RESTRICT st, const float * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes)
+int oac_custom_encode_float(CELTEncoder * OAC_RESTRICT st, const float * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes)
 {
    int j, ret, C, N;
-   VARDECL(opus_res, in);
+   VARDECL(oac_res, in);
    ALLOC_STACK;
 
    if (pcm==NULL)
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
 
    C = st->channels;
    N = frame_size;
-   ALLOC(in, C*N, opus_res);
+   ALLOC(in, C*N, oac_res);
 
    for (j=0;j<C*N;j++)
      in[j] = FLOAT2RES(pcm[j]);
@@ -2755,16 +2755,16 @@ int opus_custom_encode_float(CELTEncoder * OPUS_RESTRICT st, const float * pcm,
 
 #endif /* CUSTOM_MODES */
 
-int opus_custom_encoder_ctl(CELTEncoder * OPUS_RESTRICT st, int request, ...)
+int oac_custom_encoder_ctl(CELTEncoder * OAC_RESTRICT st, int request, ...)
 {
    va_list ap;
 
    va_start(ap, request);
    switch (request)
    {
-      case OPUS_SET_COMPLEXITY_REQUEST:
+      case OAC_SET_COMPLEXITY_REQUEST:
       {
-         int value = va_arg(ap, opus_int32);
+         int value = va_arg(ap, oac_int32);
          if (value<0 || value>10)
             goto bad_arg;
          st->complexity = value;
@@ -2772,7 +2772,7 @@ int opus_custom_encoder_ctl(CELTEncoder * OPUS_RESTRICT st, int request, ...)
       break;
       case CELT_SET_START_BAND_REQUEST:
       {
-         opus_int32 value = va_arg(ap, opus_int32);
+         oac_int32 value = va_arg(ap, oac_int32);
          if (value<0 || value>=st->mode->nbEBands)
             goto bad_arg;
          st->start = value;
@@ -2780,7 +2780,7 @@ int opus_custom_encoder_ctl(CELTEncoder * OPUS_RESTRICT st, int request, ...)
       break;
       case CELT_SET_END_BAND_REQUEST:
       {
-         opus_int32 value = va_arg(ap, opus_int32);
+         oac_int32 value = va_arg(ap, oac_int32);
          if (value<1 || value>st->mode->nbEBands)
             goto bad_arg;
          st->end = value;
@@ -2788,37 +2788,37 @@ int opus_custom_encoder_ctl(CELTEncoder * OPUS_RESTRICT st, int request, ...)
       break;
       case CELT_SET_PREDICTION_REQUEST:
       {
-         int value = va_arg(ap, opus_int32);
+         int value = va_arg(ap, oac_int32);
          if (value<0 || value>2)
             goto bad_arg;
          st->disable_pf = value<=1;
          st->force_intra = value==0;
       }
       break;
-      case OPUS_SET_PACKET_LOSS_PERC_REQUEST:
+      case OAC_SET_PACKET_LOSS_PERC_REQUEST:
       {
-         int value = va_arg(ap, opus_int32);
+         int value = va_arg(ap, oac_int32);
          if (value<0 || value>100)
             goto bad_arg;
          st->loss_rate = value;
       }
       break;
-      case OPUS_SET_VBR_CONSTRAINT_REQUEST:
+      case OAC_SET_VBR_CONSTRAINT_REQUEST:
       {
-         opus_int32 value = va_arg(ap, opus_int32);
+         oac_int32 value = va_arg(ap, oac_int32);
          st->constrained_vbr = value;
       }
       break;
-      case OPUS_SET_VBR_REQUEST:
+      case OAC_SET_VBR_REQUEST:
       {
-         opus_int32 value = va_arg(ap, opus_int32);
+         oac_int32 value = va_arg(ap, oac_int32);
          st->vbr = value;
       }
       break;
-      case OPUS_SET_BITRATE_REQUEST:
+      case OAC_SET_BITRATE_REQUEST:
       {
-         opus_int32 value = va_arg(ap, opus_int32);
-         if (value<=500 && value!=OPUS_BITRATE_MAX)
+         oac_int32 value = va_arg(ap, oac_int32);
+         if (value<=500 && value!=OAC_BITRATE_MAX)
             goto bad_arg;
          value = IMIN(value, 750000*st->channels);
          st->bitrate = value;
@@ -2826,29 +2826,29 @@ int opus_custom_encoder_ctl(CELTEncoder * OPUS_RESTRICT st, int request, ...)
       break;
       case CELT_SET_CHANNELS_REQUEST:
       {
-         opus_int32 value = va_arg(ap, opus_int32);
+         oac_int32 value = va_arg(ap, oac_int32);
          if (value<1 || value>2)
             goto bad_arg;
          st->stream_channels = value;
       }
       break;
-      case OPUS_SET_LSB_DEPTH_REQUEST:
+      case OAC_SET_LSB_DEPTH_REQUEST:
       {
-          opus_int32 value = va_arg(ap, opus_int32);
+          oac_int32 value = va_arg(ap, oac_int32);
           if (value<8 || value>24)
              goto bad_arg;
           st->lsb_depth=value;
       }
       break;
-      case OPUS_GET_LSB_DEPTH_REQUEST:
+      case OAC_GET_LSB_DEPTH_REQUEST:
       {
-          opus_int32 *value = va_arg(ap, opus_int32*);
+          oac_int32 *value = va_arg(ap, oac_int32*);
           *value=st->lsb_depth;
       }
       break;
-      case OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST:
+      case OAC_SET_PHASE_INVERSION_DISABLED_REQUEST:
       {
-          opus_int32 value = va_arg(ap, opus_int32);
+          oac_int32 value = va_arg(ap, oac_int32);
           if(value<0 || value>1)
           {
              goto bad_arg;
@@ -2856,9 +2856,9 @@ int opus_custom_encoder_ctl(CELTEncoder * OPUS_RESTRICT st, int request, ...)
           st->disable_inv = value;
       }
       break;
-      case OPUS_GET_PHASE_INVERSION_DISABLED_REQUEST:
+      case OAC_GET_PHASE_INVERSION_DISABLED_REQUEST:
       {
-          opus_int32 *value = va_arg(ap, opus_int32*);
+          oac_int32 *value = va_arg(ap, oac_int32*);
           if (!value)
           {
              goto bad_arg;
@@ -2866,15 +2866,15 @@ int opus_custom_encoder_ctl(CELTEncoder * OPUS_RESTRICT st, int request, ...)
           *value = st->disable_inv;
       }
       break;
-      case OPUS_RESET_STATE:
+      case OAC_RESET_STATE:
       {
          int i;
          celt_glog *oldBandE, *oldLogE, *oldLogE2;
          oldBandE = (celt_glog*)(st->in_mem+st->channels*(st->mode->overlap+QEXT_SCALE2(COMBFILTER_MAXPERIOD, st->qext_scale)));
          oldLogE = oldBandE + st->channels*st->mode->nbEBands;
          oldLogE2 = oldLogE + st->channels*st->mode->nbEBands;
-         OPUS_CLEAR((char*)&st->ENCODER_RESET_START,
-               opus_custom_encoder_get_size(st->mode, st->channels)-
+         OAC_CLEAR((char*)&st->ENCODER_RESET_START,
+               oac_custom_encoder_get_size(st->mode, st->channels)-
                ((char*)&st->ENCODER_RESET_START - (char*)st));
          for (i=0;i<st->channels*st->mode->nbEBands;i++)
             oldLogE[i]=oldLogE2[i]=-GCONST(28.f);
@@ -2886,17 +2886,17 @@ int opus_custom_encoder_ctl(CELTEncoder * OPUS_RESTRICT st, int request, ...)
          st->tapset_decision = 0;
       }
       break;
-#if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API)
+#if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
       case CELT_SET_INPUT_CLIPPING_REQUEST:
       {
-         opus_int32 value = va_arg(ap, opus_int32);
+         oac_int32 value = va_arg(ap, oac_int32);
          st->clip = value;
       }
       break;
 #endif
       case CELT_SET_SIGNALLING_REQUEST:
       {
-         opus_int32 value = va_arg(ap, opus_int32);
+         oac_int32 value = va_arg(ap, oac_int32);
          st->signalling = value;
       }
       break;
@@ -2904,14 +2904,14 @@ int opus_custom_encoder_ctl(CELTEncoder * OPUS_RESTRICT st, int request, ...)
       {
          AnalysisInfo *info = va_arg(ap, AnalysisInfo *);
          if (info)
-            OPUS_COPY(&st->analysis, info, 1);
+            OAC_COPY(&st->analysis, info, 1);
       }
       break;
       case CELT_SET_SILK_INFO_REQUEST:
       {
          SILKInfo *info = va_arg(ap, SILKInfo *);
          if (info)
-            OPUS_COPY(&st->silk_info, info, 1);
+            OAC_COPY(&st->silk_info, info, 1);
       }
       break;
       case CELT_GET_MODE_REQUEST:
@@ -2922,21 +2922,21 @@ int opus_custom_encoder_ctl(CELTEncoder * OPUS_RESTRICT st, int request, ...)
          *value=st->mode;
       }
       break;
-      case OPUS_GET_FINAL_RANGE_REQUEST:
+      case OAC_GET_FINAL_RANGE_REQUEST:
       {
-         opus_uint32 * value = va_arg(ap, opus_uint32 *);
+         oac_uint32 * value = va_arg(ap, oac_uint32 *);
          if (value==0)
             goto bad_arg;
          *value=st->rng;
       }
       break;
-      case OPUS_SET_LFE_REQUEST:
+      case OAC_SET_LFE_REQUEST:
       {
-          opus_int32 value = va_arg(ap, opus_int32);
+          oac_int32 value = va_arg(ap, oac_int32);
           st->lfe = value;
       }
       break;
-      case OPUS_SET_ENERGY_MASK_REQUEST:
+      case OAC_SET_ENERGY_MASK_REQUEST:
       {
          celt_glog *value = va_arg(ap, celt_glog*);
           st->energy_mask = value;
@@ -2946,11 +2946,11 @@ int opus_custom_encoder_ctl(CELTEncoder * OPUS_RESTRICT st, int request, ...)
          goto bad_request;
    }
    va_end(ap);
-   return OPUS_OK;
+   return OAC_OK;
 bad_arg:
    va_end(ap);
-   return OPUS_BAD_ARG;
+   return OAC_BAD_ARG;
 bad_request:
    va_end(ap);
-   return OPUS_UNIMPLEMENTED;
+   return OAC_UNIMPLEMENTED;
 }
diff --git a/celt/celt_lpc.c b/celt/celt_lpc.c
index e5a1c4852..00900c700 100644
--- a/celt/celt_lpc.c
+++ b/celt/celt_lpc.c
@@ -35,21 +35,21 @@
 #include "pitch.h"
 
 void _celt_lpc(
-      opus_val16       *_lpc, /* out: [0...p-1] LPC coefficients      */
-const opus_val32 *ac,  /* in:  [0...p] autocorrelation values  */
+      oac_val16       *_lpc, /* out: [0...p-1] LPC coefficients      */
+const oac_val32 *ac,  /* in:  [0...p] autocorrelation values  */
 int          p
 )
 {
    int i, j;
-   opus_val32 r;
-   opus_val32 error = ac[0];
+   oac_val32 r;
+   oac_val32 error = ac[0];
 #ifdef FIXED_POINT
-   opus_val32 lpc[CELT_LPC_ORDER];
+   oac_val32 lpc[CELT_LPC_ORDER];
 #else
    float *lpc = _lpc;
 #endif
 
-   OPUS_CLEAR(lpc, p);
+   OAC_CLEAR(lpc, p);
 #ifdef FIXED_POINT
    if (ac[0] != 0)
 #else
@@ -58,12 +58,12 @@ int          p
    {
       for (i = 0; i < p; i++) {
          /* Sum up this iteration's reflection coefficient */
-         opus_val32 rr = 0;
-#if defined (FIXED_POINT) && OPUS_FAST_INT64
-         opus_int64 acc = 0;
+         oac_val32 rr = 0;
+#if defined (FIXED_POINT) && OAC_FAST_INT64
+         oac_int64 acc = 0;
          for (j = 0; j < i; j++)
-            acc += (opus_int64)(lpc[j]) * (opus_int64)(ac[i - j]);
-         rr = (opus_val32)SHR64(acc, 31);
+            acc += (oac_int64)(lpc[j]) * (oac_int64)(ac[i - j]);
+         rr = (oac_val32)SHR64(acc, 31);
 #else
          for (j = 0; j < i; j++)
             rr += MULT32_32_Q31(lpc[j],ac[i - j]);
@@ -74,7 +74,7 @@ int          p
          lpc[i] = SHR32(r,6);
          for (j = 0; j < (i+1)>>1; j++)
          {
-            opus_val32 tmp1, tmp2;
+            oac_val32 tmp1, tmp2;
             tmp1 = lpc[j];
             tmp2 = lpc[i-1-j];
             lpc[j]     = tmp1 + MULT32_32_Q31(r,tmp2);
@@ -98,7 +98,7 @@ int          p
          This reuses the logic in silk_LPC_fit() and silk_bwexpander_32(). Any bug
          fixes should also be applied there. */
       int iter, idx = 0;
-      opus_val32 maxabs, absval, chirp_Q16, chirp_minus_one_Q16;
+      oac_val32 maxabs, absval, chirp_Q16, chirp_minus_one_Q16;
 
       for (iter = 0; iter < 10; iter++) {
          maxabs = 0;
@@ -131,7 +131,7 @@ int          p
       if (iter == 10) {
          /* If the coeffs still do not fit into the 16 bit range after 10 iterations,
             fall back to the A(z)=1 filter. */
-         OPUS_CLEAR(lpc, p);
+         OAC_CLEAR(lpc, p);
          _lpc[0] = 4096;  /* Q12 */
       } else {
          for (i = 0; i < p; i++) {
@@ -144,35 +144,35 @@ int          p
 
 
 void celt_fir_c(
-         const opus_val16 *x,
-         const opus_val16 *num,
-         opus_val16 *y,
+         const oac_val16 *x,
+         const oac_val16 *num,
+         oac_val16 *y,
          int N,
          int ord,
          int arch)
 {
    int i,j;
-   VARDECL(opus_val16, rnum);
+   VARDECL(oac_val16, rnum);
    SAVE_STACK;
    celt_assert(x != y);
-   ALLOC(rnum, ord, opus_val16);
+   ALLOC(rnum, ord, oac_val16);
    for(i=0;i<ord;i++)
       rnum[i] = num[ord-i-1];
    for (i=0;i<N-3;i+=4)
    {
-      opus_val32 sum[4];
+      oac_val32 sum[4];
       sum[0] = SHL32(EXTEND32(x[i  ]), SIG_SHIFT);
       sum[1] = SHL32(EXTEND32(x[i+1]), SIG_SHIFT);
       sum[2] = SHL32(EXTEND32(x[i+2]), SIG_SHIFT);
       sum[3] = SHL32(EXTEND32(x[i+3]), SIG_SHIFT);
-#if defined(OPUS_CHECK_ASM) && defined(FIXED_POINT)
+#if defined(OAC_CHECK_ASM) && defined(FIXED_POINT)
       {
-         opus_val32 sum_c[4];
+         oac_val32 sum_c[4];
          memcpy(sum_c, sum, sizeof(sum_c));
          xcorr_kernel_c(rnum, x+i-ord, sum_c, ord);
 #endif
          xcorr_kernel(rnum, x+i-ord, sum, ord, arch);
-#if defined(OPUS_CHECK_ASM) && defined(FIXED_POINT)
+#if defined(OAC_CHECK_ASM) && defined(FIXED_POINT)
          celt_assert(memcmp(sum, sum_c, sizeof(sum)) == 0);
       }
 #endif
@@ -183,7 +183,7 @@ void celt_fir_c(
    }
    for (;i<N;i++)
    {
-      opus_val32 sum = SHL32(EXTEND32(x[i]), SIG_SHIFT);
+      oac_val32 sum = SHL32(EXTEND32(x[i]), SIG_SHIFT);
       for (j=0;j<ord;j++)
          sum = MAC16_16(sum,rnum[j],x[i+j-ord]);
       y[i] = SROUND16(sum, SIG_SHIFT);
@@ -191,12 +191,12 @@ void celt_fir_c(
    RESTORE_STACK;
 }
 
-void celt_iir(const opus_val32 *_x,
-         const opus_val16 *den,
-         opus_val32 *_y,
+void celt_iir(const oac_val32 *_x,
+         const oac_val16 *den,
+         oac_val32 *_y,
          int N,
          int ord,
-         opus_val16 *mem,
+         oac_val16 *mem,
          int arch)
 {
 #ifdef SMALL_FOOTPRINT
@@ -204,7 +204,7 @@ void celt_iir(const opus_val32 *_x,
    (void)arch;
    for (i=0;i<N;i++)
    {
-      opus_val32 sum = _x[i];
+      oac_val32 sum = _x[i];
       for (j=0;j<ord;j++)
       {
          sum -= MULT16_16(den[j],mem[j]);
@@ -218,13 +218,13 @@ void celt_iir(const opus_val32 *_x,
    }
 #else
    int i,j;
-   VARDECL(opus_val16, rden);
-   VARDECL(opus_val16, y);
+   VARDECL(oac_val16, rden);
+   VARDECL(oac_val16, y);
    SAVE_STACK;
 
    celt_assert((ord&3)==0);
-   ALLOC(rden, ord, opus_val16);
-   ALLOC(y, N+ord, opus_val16);
+   ALLOC(rden, ord, oac_val16);
+   ALLOC(y, N+ord, oac_val16);
    for(i=0;i<ord;i++)
       rden[i] = den[ord-i-1];
    for(i=0;i<ord;i++)
@@ -234,19 +234,19 @@ void celt_iir(const opus_val32 *_x,
    for (i=0;i<N-3;i+=4)
    {
       /* Unroll by 4 as if it were an FIR filter */
-      opus_val32 sum[4];
+      oac_val32 sum[4];
       sum[0]=_x[i];
       sum[1]=_x[i+1];
       sum[2]=_x[i+2];
       sum[3]=_x[i+3];
-#if defined(OPUS_CHECK_ASM) && defined(FIXED_POINT)
+#if defined(OAC_CHECK_ASM) && defined(FIXED_POINT)
       {
-         opus_val32 sum_c[4];
+         oac_val32 sum_c[4];
          memcpy(sum_c, sum, sizeof(sum_c));
          xcorr_kernel_c(rden, y+i, sum_c, ord);
 #endif
          xcorr_kernel(rden, y+i, sum, ord, arch);
-#if defined(OPUS_CHECK_ASM) && defined(FIXED_POINT)
+#if defined(OAC_CHECK_ASM) && defined(FIXED_POINT)
          celt_assert(memcmp(sum, sum_c, sizeof(sum)) == 0);
       }
 #endif
@@ -269,7 +269,7 @@ void celt_iir(const opus_val32 *_x,
    }
    for (;i<N;i++)
    {
-      opus_val32 sum = _x[i];
+      oac_val32 sum = _x[i];
       for (j=0;j<ord;j++)
          sum -= MULT16_16(rden[j],y[i+j]);
       y[i+ord] = SROUND16(sum,SIG_SHIFT);
@@ -282,8 +282,8 @@ void celt_iir(const opus_val32 *_x,
 }
 
 int _celt_autocorr(
-                   const opus_val16 *x,   /*  in: [0...n-1] samples x   */
-                   opus_val32       *ac,  /* out: [0...lag-1] ac values */
+                   const oac_val16 *x,   /*  in: [0...n-1] samples x   */
+                   oac_val32       *ac,  /* out: [0...lag-1] ac values */
                    const celt_coef  *window,
                    int          overlap,
                    int          lag,
@@ -291,14 +291,14 @@ int _celt_autocorr(
                    int          arch
                   )
 {
-   opus_val32 d;
+   oac_val32 d;
    int i, k;
    int fastN=n-lag;
    int shift;
-   const opus_val16 *xptr;
-   VARDECL(opus_val16, xx);
+   const oac_val16 *xptr;
+   VARDECL(oac_val16, xx);
    SAVE_STACK;
-   ALLOC(xx, n, opus_val16);
+   ALLOC(xx, n, oac_val16);
    celt_assert(n>0);
    celt_assert(overlap>=0);
    if (overlap == 0)
@@ -309,7 +309,7 @@ int _celt_autocorr(
          xx[i] = x[i];
       for (i=0;i<overlap;i++)
       {
-         opus_val16 w = COEF2VAL16(window[i]);
+         oac_val16 w = COEF2VAL16(window[i]);
          xx[i] = MULT16_16_Q15(x[i],w);
          xx[n-i-1] = MULT16_16_Q15(x[n-i-1],w);
       }
@@ -318,7 +318,7 @@ int _celt_autocorr(
    shift=0;
 #ifdef FIXED_POINT
    {
-      opus_val32 ac0;
+      oac_val32 ac0;
       int ac0_shift = celt_ilog2(n + (n>>4));
       ac0 = 1+(n<<7);
       if (n&1) ac0 += SHR32(MULT16_16(xptr[0],xptr[0]),ac0_shift);
@@ -351,7 +351,7 @@ int _celt_autocorr(
 #ifdef FIXED_POINT
    shift = 2*shift;
    if (shift<=0)
-      ac[0] += SHL32((opus_int32)1, -shift);
+      ac[0] += SHL32((oac_int32)1, -shift);
    if (ac[0] < 268435456)
    {
       int shift2 = 29 - EC_ILOG(ac[0]);
diff --git a/celt/celt_lpc.h b/celt/celt_lpc.h
index e7109465f..e3f5fce7c 100644
--- a/celt/celt_lpc.h
+++ b/celt/celt_lpc.h
@@ -31,18 +31,18 @@
 #include "arch.h"
 #include "cpu_support.h"
 
-#if defined(OPUS_X86_MAY_HAVE_SSE4_1)
+#if defined(OAC_X86_MAY_HAVE_SSE4_1)
 #include "x86/celt_lpc_sse.h"
 #endif
 
 #define CELT_LPC_ORDER 24
 
-void _celt_lpc(opus_val16 *_lpc, const opus_val32 *ac, int p);
+void _celt_lpc(oac_val16 *_lpc, const oac_val32 *ac, int p);
 
 void celt_fir_c(
-         const opus_val16 *x,
-         const opus_val16 *num,
-         opus_val16 *y,
+         const oac_val16 *x,
+         const oac_val16 *num,
+         oac_val16 *y,
          int N,
          int ord,
          int arch);
@@ -52,15 +52,15 @@ void celt_fir_c(
     (celt_fir_c(x, num, y, N, ord, arch))
 #endif
 
-void celt_iir(const opus_val32 *x,
-         const opus_val16 *den,
-         opus_val32 *y,
+void celt_iir(const oac_val32 *x,
+         const oac_val16 *den,
+         oac_val32 *y,
          int N,
          int ord,
-         opus_val16 *mem,
+         oac_val16 *mem,
          int arch);
 
-int _celt_autocorr(const opus_val16 *x, opus_val32 *ac,
+int _celt_autocorr(const oac_val16 *x, oac_val32 *ac,
          const celt_coef *window, int overlap, int lag, int n, int arch);
 
 #endif /* CELT_LPC_H */
diff --git a/celt/cpu_support.h b/celt/cpu_support.h
index 9f13d8aec..0de39cd65 100644
--- a/celt/cpu_support.h
+++ b/celt/cpu_support.h
@@ -28,11 +28,11 @@
 #ifndef CPU_SUPPORT_H
 #define CPU_SUPPORT_H
 
-#include "opus_types.h"
-#include "opus_defines.h"
+#include "oac_types.h"
+#include "oac_defines.h"
 
-#if defined(OPUS_HAVE_RTCD) && \
-  (defined(OPUS_ARM_ASM) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR))
+#if defined(OAC_HAVE_RTCD) && \
+  (defined(OAC_ARM_ASM) || defined(OAC_ARM_MAY_HAVE_NEON_INTR))
 #include "arm/armcpu.h"
 
 /* We currently support 5 ARM variants:
@@ -42,13 +42,13 @@
  * arch[3] -> NEON
  * arch[4] -> NEON+DOTPROD
  */
-#define OPUS_ARCHMASK 7
+#define OAC_ARCHMASK 7
 
-#elif defined(OPUS_HAVE_RTCD) && \
-  ((defined(OPUS_X86_MAY_HAVE_SSE) && !defined(OPUS_X86_PRESUME_SSE)) || \
-  (defined(OPUS_X86_MAY_HAVE_SSE2) && !defined(OPUS_X86_PRESUME_SSE2)) || \
-  (defined(OPUS_X86_MAY_HAVE_SSE4_1) && !defined(OPUS_X86_PRESUME_SSE4_1)) || \
-  (defined(OPUS_X86_MAY_HAVE_AVX2) && !defined(OPUS_X86_PRESUME_AVX2)))
+#elif defined(OAC_HAVE_RTCD) && \
+  ((defined(OAC_X86_MAY_HAVE_SSE) && !defined(OAC_X86_PRESUME_SSE)) || \
+  (defined(OAC_X86_MAY_HAVE_SSE2) && !defined(OAC_X86_PRESUME_SSE2)) || \
+  (defined(OAC_X86_MAY_HAVE_SSE4_1) && !defined(OAC_X86_PRESUME_SSE4_1)) || \
+  (defined(OAC_X86_MAY_HAVE_AVX2) && !defined(OAC_X86_PRESUME_AVX2)))
 
 #include "x86/x86cpu.h"
 /* We currently support 5 x86 variants:
@@ -58,13 +58,13 @@
  * arch[3] -> sse4.1
  * arch[4] -> avx
  */
-#define OPUS_ARCHMASK 7
-int opus_select_arch(void);
+#define OAC_ARCHMASK 7
+int oac_select_arch(void);
 
 #else
-#define OPUS_ARCHMASK 0
+#define OAC_ARCHMASK 0
 
-static OPUS_INLINE int opus_select_arch(void)
+static OAC_INLINE int oac_select_arch(void)
 {
   return 0;
 }
diff --git a/celt/cwrs.c b/celt/cwrs.c
index 18fa554e5..c763ea44a 100644
--- a/celt/cwrs.c
+++ b/celt/cwrs.c
@@ -46,7 +46,7 @@
    with frac bits of fractional precision.
   Tested for all possible 32-bit inputs with frac=4, where the maximum
    overestimation is 0.06254243 bits.*/
-int log2_frac(opus_uint32 val, int frac)
+int log2_frac(oac_uint32 val, int frac)
 {
   int l;
   l=EC_ILOG(val);
@@ -207,14 +207,14 @@ int log2_frac(opus_uint32 val, int frac)
    pulses we will ever allocate for a given N=I (K=128, or however many fit in
    32 bits, whichever is smaller), plus one, and the maximum N for which
    K=I-1 pulses fit in 32 bits.
-  The largest band size in an Opus Custom mode is 208.
+  The largest band size in an Oac Custom mode is 208.
   Otherwise, we can limit things to the set of N which can be achieved by
-   splitting a band from a standard Opus mode: 176, 144, 96, 88, 72, 64, 48,
+   splitting a band from a standard Oac mode: 176, 144, 96, 88, 72, 64, 48,
    44, 36, 32, 24, 22, 18, 16, 8, 4, 2).*/
 #if defined(CWRS_EXTRA_ROWS)
-static const opus_uint32 CELT_PVQ_U_DATA[1488]={
+static const oac_uint32 CELT_PVQ_U_DATA[1488]={
 #else
-static const opus_uint32 CELT_PVQ_U_DATA[1272]={
+static const oac_uint32 CELT_PVQ_U_DATA[1272]={
 #endif
   /*N=0, K=0...176:*/
   1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -414,7 +414,7 @@ static const opus_uint32 CELT_PVQ_U_DATA[1272]={
 };
 
 #if defined(CWRS_EXTRA_ROWS)
-static const opus_uint32 *const CELT_PVQ_U_ROW[15]={
+static const oac_uint32 *const CELT_PVQ_U_ROW[15]={
   CELT_PVQ_U_DATA+   0,CELT_PVQ_U_DATA+ 208,CELT_PVQ_U_DATA+ 415,
   CELT_PVQ_U_DATA+ 621,CELT_PVQ_U_DATA+ 826,CELT_PVQ_U_DATA+1030,
   CELT_PVQ_U_DATA+1233,CELT_PVQ_U_DATA+1336,CELT_PVQ_U_DATA+1389,
@@ -422,7 +422,7 @@ static const opus_uint32 *const CELT_PVQ_U_ROW[15]={
   CELT_PVQ_U_DATA+1464,CELT_PVQ_U_DATA+1470,CELT_PVQ_U_DATA+1473
 };
 #else
-static const opus_uint32 *const CELT_PVQ_U_ROW[15]={
+static const oac_uint32 *const CELT_PVQ_U_ROW[15]={
   CELT_PVQ_U_DATA+   0,CELT_PVQ_U_DATA+ 176,CELT_PVQ_U_DATA+ 351,
   CELT_PVQ_U_DATA+ 525,CELT_PVQ_U_DATA+ 698,CELT_PVQ_U_DATA+ 870,
   CELT_PVQ_U_DATA+1041,CELT_PVQ_U_DATA+1131,CELT_PVQ_U_DATA+1178,
@@ -432,7 +432,7 @@ static const opus_uint32 *const CELT_PVQ_U_ROW[15]={
 #endif
 
 #if defined(CUSTOM_MODES)
-void get_required_bits(opus_int16 *_bits,int _n,int _maxk,int _frac){
+void get_required_bits(oac_int16 *_bits,int _n,int _maxk,int _frac){
   int k;
   /*_maxk==0 => there's nothing to do.*/
   celt_assert(_maxk>0);
@@ -441,8 +441,8 @@ void get_required_bits(opus_int16 *_bits,int _n,int _maxk,int _frac){
 }
 #endif
 
-static opus_uint32 icwrs(int _n,const int *_y){
-  opus_uint32 i;
+static oac_uint32 icwrs(int _n,const int *_y){
+  oac_uint32 i;
   int         j;
   int         k;
   celt_assert(_n>=2);
@@ -464,19 +464,19 @@ void encode_pulses(const int *_y,int _n,int _k,ec_enc *_enc){
   ec_enc_uint(_enc,icwrs(_n,_y),CELT_PVQ_V(_n,_k));
 }
 
-static opus_val32 cwrsi(int _n,int _k,opus_uint32 _i,int *_y){
-  opus_uint32 p;
+static oac_val32 cwrsi(int _n,int _k,oac_uint32 _i,int *_y){
+  oac_uint32 p;
   int         s;
   int         k0;
-  opus_int16  val;
-  opus_val32  yy=0;
+  oac_int16  val;
+  oac_val32  yy=0;
   celt_assert(_k>0);
   celt_assert(_n>1);
   while(_n>2){
-    opus_uint32 q;
+    oac_uint32 q;
     /*Lots of pulses case:*/
     if(_k>=_n){
-      const opus_uint32 *row;
+      const oac_uint32 *row;
       row=CELT_PVQ_U_ROW[_n];
       /*Are the pulses in this dimension negative?*/
       p=row[_k+1];
@@ -540,7 +540,7 @@ static opus_val32 cwrsi(int _n,int _k,opus_uint32 _i,int *_y){
   return yy;
 }
 
-opus_val32 decode_pulses(int *_y,int _n,int _k,ec_dec *_dec){
+oac_val32 decode_pulses(int *_y,int _n,int _k,ec_dec *_dec){
   return cwrsi(_n,_k,ec_dec_uint(_dec,CELT_PVQ_V(_n,_k)),_y);
 }
 
@@ -549,8 +549,8 @@ opus_val32 decode_pulses(int *_y,int _n,int _k,ec_dec *_dec){
 /*Computes the next row/column of any recurrence that obeys the relation
    u[i][j]=u[i-1][j]+u[i][j-1]+u[i-1][j-1].
   _ui0 is the base case for the new row/column.*/
-static OPUS_INLINE void unext(opus_uint32 *_ui,unsigned _len,opus_uint32 _ui0){
-  opus_uint32 ui1;
+static OAC_INLINE void unext(oac_uint32 *_ui,unsigned _len,oac_uint32 _ui0){
+  oac_uint32 ui1;
   unsigned      j;
   /*This do-while will overrun the array if we don't have storage for at least
      2 values.*/
@@ -565,8 +565,8 @@ static OPUS_INLINE void unext(opus_uint32 *_ui,unsigned _len,opus_uint32 _ui0){
 /*Computes the previous row/column of any recurrence that obeys the relation
    u[i-1][j]=u[i][j]-u[i][j-1]-u[i-1][j-1].
   _ui0 is the base case for the new row/column.*/
-static OPUS_INLINE void uprev(opus_uint32 *_ui,unsigned _n,opus_uint32 _ui0){
-  opus_uint32 ui1;
+static OAC_INLINE void uprev(oac_uint32 *_ui,unsigned _n,oac_uint32 _ui0){
+  oac_uint32 ui1;
   unsigned      j;
   /*This do-while will overrun the array if we don't have storage for at least
      2 values.*/
@@ -580,8 +580,8 @@ static OPUS_INLINE void uprev(opus_uint32 *_ui,unsigned _n,opus_uint32 _ui0){
 
 /*Compute V(_n,_k), as well as U(_n,0..._k+1).
   _u: On exit, _u[i] contains U(_n,i) for i in [0..._k+1].*/
-static opus_uint32 ncwrs_urow(unsigned _n,unsigned _k,opus_uint32 *_u){
-  opus_uint32 um2;
+static oac_uint32 ncwrs_urow(unsigned _n,unsigned _k,oac_uint32 *_u){
+  oac_uint32 um2;
   unsigned      len;
   unsigned      k;
   len=_k+2;
@@ -606,14 +606,14 @@ static opus_uint32 ncwrs_urow(unsigned _n,unsigned _k,opus_uint32 *_u){
   _y: Returns the vector of pulses.
   _u: Must contain entries [0..._k+1] of row _n of U() on input.
       Its contents will be destructively modified.*/
-static opus_val32 cwrsi(int _n,int _k,opus_uint32 _i,int *_y,opus_uint32 *_u){
+static oac_val32 cwrsi(int _n,int _k,oac_uint32 _i,int *_y,oac_uint32 *_u){
   int j;
-  opus_int16 val;
-  opus_val32 yy=0;
+  oac_int16 val;
+  oac_val32 yy=0;
   celt_assert(_n>0);
   j=0;
   do{
-    opus_uint32 p;
+    oac_uint32 p;
     int           s;
     int           yj;
     p=_u[_k+1];
@@ -637,7 +637,7 @@ static opus_val32 cwrsi(int _n,int _k,opus_uint32 _i,int *_y,opus_uint32 *_u){
    of size 1 with associated sign bits.
   _y: The vector of pulses, whose sum of absolute values is K.
   _k: Returns K.*/
-static OPUS_INLINE opus_uint32 icwrs1(const int *_y,int *_k){
+static OAC_INLINE oac_uint32 icwrs1(const int *_y,int *_k){
   *_k=abs(_y[0]);
   return _y[0]<0;
 }
@@ -646,9 +646,9 @@ static OPUS_INLINE opus_uint32 icwrs1(const int *_y,int *_k){
    of size _n with associated sign bits.
   _y:  The vector of pulses, whose sum of absolute values must be _k.
   _nc: Returns V(_n,_k).*/
-static OPUS_INLINE opus_uint32 icwrs(int _n,int _k,opus_uint32 *_nc,const int *_y,
- opus_uint32 *_u){
-  opus_uint32 i;
+static OAC_INLINE oac_uint32 icwrs(int _n,int _k,oac_uint32 *_nc,const int *_y,
+ oac_uint32 *_u){
+  oac_uint32 i;
   int         j;
   int         k;
   /*We can't unroll the first two iterations of the loop unless _n>=2.*/
@@ -671,7 +671,7 @@ static OPUS_INLINE opus_uint32 icwrs(int _n,int _k,opus_uint32 *_nc,const int *_
 }
 
 #if defined(CUSTOM_MODES)
-void get_required_bits(opus_int16 *_bits,int _n,int _maxk,int _frac){
+void get_required_bits(oac_int16 *_bits,int _n,int _maxk,int _frac){
   int k;
   /*_maxk==0 => there's nothing to do.*/
   celt_assert(_maxk>0);
@@ -682,9 +682,9 @@ void get_required_bits(opus_int16 *_bits,int _n,int _maxk,int _frac){
       _bits[k] = 1<<_frac;
   }
   else {
-    VARDECL(opus_uint32,u);
+    VARDECL(oac_uint32,u);
     SAVE_STACK;
-    ALLOC(u,_maxk+2U,opus_uint32);
+    ALLOC(u,_maxk+2U,oac_uint32);
     ncwrs_urow(_n,_maxk,u);
     for(k=1;k<=_maxk;k++)
       _bits[k]=log2_frac(u[k]+u[k+1],_frac);
@@ -694,23 +694,23 @@ void get_required_bits(opus_int16 *_bits,int _n,int _maxk,int _frac){
 #endif /* CUSTOM_MODES */
 
 void encode_pulses(const int *_y,int _n,int _k,ec_enc *_enc){
-  opus_uint32 i;
-  VARDECL(opus_uint32,u);
-  opus_uint32 nc;
+  oac_uint32 i;
+  VARDECL(oac_uint32,u);
+  oac_uint32 nc;
   SAVE_STACK;
   celt_assert(_k>0);
-  ALLOC(u,_k+2U,opus_uint32);
+  ALLOC(u,_k+2U,oac_uint32);
   i=icwrs(_n,_k,&nc,_y,u);
   ec_enc_uint(_enc,i,nc);
   RESTORE_STACK;
 }
 
-opus_val32 decode_pulses(int *_y,int _n,int _k,ec_dec *_dec){
-  VARDECL(opus_uint32,u);
+oac_val32 decode_pulses(int *_y,int _n,int _k,ec_dec *_dec){
+  VARDECL(oac_uint32,u);
   int ret;
   SAVE_STACK;
   celt_assert(_k>0);
-  ALLOC(u,_k+2U,opus_uint32);
+  ALLOC(u,_k+2U,oac_uint32);
   ret = cwrsi(_n,_k,ec_dec_uint(_dec,ncwrs_urow(_n,_k,u)),_y,u);
   RESTORE_STACK;
   return ret;
diff --git a/celt/cwrs.h b/celt/cwrs.h
index 7cd471745..b7322fa17 100644
--- a/celt/cwrs.h
+++ b/celt/cwrs.h
@@ -36,13 +36,13 @@
 #include "entdec.h"
 
 #ifdef CUSTOM_MODES
-int log2_frac(opus_uint32 val, int frac);
+int log2_frac(oac_uint32 val, int frac);
 #endif
 
-void get_required_bits(opus_int16 *bits, int N, int K, int frac);
+void get_required_bits(oac_int16 *bits, int N, int K, int frac);
 
 void encode_pulses(const int *_y, int N, int K, ec_enc *enc);
 
-opus_val32 decode_pulses(int *_y, int N, int K, ec_dec *dec);
+oac_val32 decode_pulses(int *_y, int N, int K, ec_dec *dec);
 
 #endif /* CWRS_H */
diff --git a/celt/dump_modes/Makefile b/celt/dump_modes/Makefile
index 9bd13b07d..2d67b6352 100644
--- a/celt/dump_modes/Makefile
+++ b/celt/dump_modes/Makefile
@@ -17,7 +17,7 @@ SOURCES = dump_modes.c \
 ifdef HAVE_ARM_NE10
 CC = gcc
 CFLAGS += -mfpu=neon
-INCLUDES += -I$(NE10_INCDIR) -DHAVE_ARM_NE10 -DOPUS_ARM_PRESUME_NEON_INTR
+INCLUDES += -I$(NE10_INCDIR) -DHAVE_ARM_NE10 -DOAC_ARM_PRESUME_NEON_INTR
 LIBS = -L$(NE10_LIBDIR) -lNE10
 SOURCES += ../arm/celt_ne10_fft.c \
            dump_modes_arm_ne10.c \
diff --git a/celt/dump_modes/dump_modes.c b/celt/dump_modes/dump_modes.c
index 7bf845fd5..a61fb0958 100644
--- a/celt/dump_modes/dump_modes.c
+++ b/celt/dump_modes/dump_modes.c
@@ -49,8 +49,8 @@
 #define WORD32 FLOAT
 #endif
 
-#define COEF16(x, a) ((opus_int16)SATURATE(((opus_int64)(x)+(1<<(a)>>1))>>(a), 32767))
-int opus_select_arch(void) {
+#define COEF16(x, a) ((oac_int16)SATURATE(((oac_int64)(x)+(1<<(a)>>1))>>(a), 32767))
+int oac_select_arch(void) {
    return 0;
 }
 
@@ -82,14 +82,14 @@ void dump_modes(FILE *file, CELTMode **modes, int nb_modes)
       int standard, framerate;
 
       mdctSize = mode->shortMdctSize*mode->nbShortMdcts;
-      standard = (mode->Fs == 400*(opus_int32)mode->shortMdctSize);
+      standard = (mode->Fs == 400*(oac_int32)mode->shortMdctSize);
       framerate = mode->Fs/mode->shortMdctSize;
 
       if (!standard)
       {
          fprintf(file, "#ifndef DEF_EBANDS%d_%d\n", mode->Fs, mdctSize);
          fprintf(file, "#define DEF_EBANDS%d_%d\n", mode->Fs, mdctSize);
-         fprintf (file, "static const opus_int16 eBands%d_%d[%d] = {\n", mode->Fs, mdctSize, mode->nbEBands+2);
+         fprintf (file, "static const oac_int16 eBands%d_%d[%d] = {\n", mode->Fs, mdctSize, mode->nbEBands+2);
          for (j=0;j<mode->nbEBands+2;j++)
             fprintf (file, "%d, ", mode->eBands[j]);
          fprintf (file, "};\n");
@@ -124,7 +124,7 @@ void dump_modes(FILE *file, CELTMode **modes, int nb_modes)
 
       fprintf(file, "#ifndef DEF_LOGN%d\n", framerate);
       fprintf(file, "#define DEF_LOGN%d\n", framerate);
-      fprintf (file, "static const opus_int16 logN%d[%d] = {\n", framerate, mode->nbEBands);
+      fprintf (file, "static const oac_int16 logN%d[%d] = {\n", framerate, mode->nbEBands);
       for (j=0;j<mode->nbEBands;j++)
          fprintf (file, "%d, ", mode->logN[j]);
       fprintf (file, "};\n");
@@ -134,7 +134,7 @@ void dump_modes(FILE *file, CELTMode **modes, int nb_modes)
       /* Pulse cache */
       fprintf(file, "#ifndef DEF_PULSE_CACHE%d\n", mode->Fs/mdctSize);
       fprintf(file, "#define DEF_PULSE_CACHE%d\n", mode->Fs/mdctSize);
-      fprintf (file, "static const opus_int16 cache_index%d[%d] = {\n", mode->Fs/mdctSize, (mode->maxLM+2)*mode->nbEBands);
+      fprintf (file, "static const oac_int16 cache_index%d[%d] = {\n", mode->Fs/mdctSize, (mode->maxLM+2)*mode->nbEBands);
       for (j=0;j<mode->nbEBands*(mode->maxLM+2);j++)
          fprintf (file, "%d,%c", mode->cache.index[j],(j+16)%15==0?'\n':' ');
       fprintf (file, "};\n");
@@ -168,7 +168,7 @@ void dump_modes(FILE *file, CELTMode **modes, int nb_modes)
       {
          fprintf(file, "#ifndef FFT_BITREV%d\n", mode->mdct.kfft[k]->nfft);
          fprintf(file, "#define FFT_BITREV%d\n", mode->mdct.kfft[k]->nfft);
-         fprintf (file, "static const opus_int16 fft_bitrev%d[%d] = {\n",
+         fprintf (file, "static const oac_int16 fft_bitrev%d[%d] = {\n",
                mode->mdct.kfft[k]->nfft, mode->mdct.kfft[k]->nfft);
          for (j=0;j<mode->mdct.kfft[k]->nfft;j++)
             fprintf (file, "%d,%c", mode->mdct.kfft[k]->bitrev[j],(j+16)%15==0?'\n':' ');
@@ -338,7 +338,7 @@ int main(int argc, char **argv)
       int Fs, frame;
       Fs      = atoi(argv[2*i+1]);
       frame   = atoi(argv[2*i+2]);
-      m[i] = opus_custom_mode_create(Fs, frame, NULL);
+      m[i] = oac_custom_mode_create(Fs, frame, NULL);
       if (m[i]==NULL)
       {
          fprintf(stderr,"Error creating mode with Fs=%s, frame_size=%s\n",
@@ -356,7 +356,7 @@ int main(int argc, char **argv)
    dump_modes_arch_finalize();
 #endif
    for (i=0;i<nb;i++)
-      opus_custom_mode_destroy(m[i]);
+      oac_custom_mode_destroy(m[i]);
    free(m);
    return 0;
 }
diff --git a/celt/ecintrin.h b/celt/ecintrin.h
index 66a4c36ea..02b43f5d0 100644
--- a/celt/ecintrin.h
+++ b/celt/ecintrin.h
@@ -26,14 +26,14 @@
 */
 
 /*Some common macros for potential platform-specific optimization.*/
-#include "opus_types.h"
+#include "oac_types.h"
 #include <math.h>
 #include <limits.h>
 #include "arch.h"
 #if !defined(_ecintrin_H)
 # define _ecintrin_H (1)
 
-/*Some specific platforms may have optimized intrinsic or OPUS_INLINE assembly
+/*Some specific platforms may have optimized intrinsic or OAC_INLINE assembly
    versions of these functions which can substantially improve performance.
   We define macros for them to allow easy incorporation of these non-ANSI
    features.*/
@@ -85,7 +85,7 @@ static __inline int ec_bsr(unsigned long _x){
   When we need to, it can be special cased.*/
 # define EC_ILOG(_x) (EC_CLZ0-EC_CLZ(_x))
 #else
-int ec_ilog(opus_uint32 _v);
+int ec_ilog(oac_uint32 _v);
 # define EC_ILOG(_x) (ec_ilog(_x))
 #endif
 #endif
diff --git a/celt/entcode.c b/celt/entcode.c
index 70f32016e..3939dc6d3 100644
--- a/celt/entcode.c
+++ b/celt/entcode.c
@@ -35,10 +35,10 @@
 #if !defined(EC_CLZ)
 /*This is a fallback for systems where we don't know how to access
    a BSR or CLZ instruction (see ecintrin.h).
-  If you are optimizing Opus on a new platform and it has a native CLZ or
-   BZR (e.g. cell, MIPS, x86, etc) then making it available to Opus will be
+  If you are optimizing Oac on a new platform and it has a native CLZ or
+   BZR (e.g. cell, MIPS, x86, etc) then making it available to Oac will be
    an easy performance win.*/
-int ec_ilog(opus_uint32 _v){
+int ec_ilog(oac_uint32 _v){
   /*On a Pentium M, this branchless version tested as the fastest on
      1,000,000,000 random 32-bit integers, edging out a similar version with
      branches, and a 256-entry LUT version.*/
@@ -66,12 +66,12 @@ int ec_ilog(opus_uint32 _v){
 /* This is a faster version of ec_tell_frac() that takes advantage
    of the low (1/8 bit) resolution to use just a linear function
    followed by a lookup to determine the exact transition thresholds. */
-opus_uint32 ec_tell_frac(ec_ctx *_this){
+oac_uint32 ec_tell_frac(ec_ctx *_this){
   static const unsigned correction[8] =
     {35733, 38967, 42495, 46340,
      50535, 55109, 60097, 65535};
-  opus_uint32 nbits;
-  opus_uint32 r;
+  oac_uint32 nbits;
+  oac_uint32 r;
   int         l;
   unsigned    b;
   nbits=_this->nbits_total<<BITRES;
@@ -83,9 +83,9 @@ opus_uint32 ec_tell_frac(ec_ctx *_this){
   return nbits-l;
 }
 #else
-opus_uint32 ec_tell_frac(ec_ctx *_this){
-  opus_uint32 nbits;
-  opus_uint32 r;
+oac_uint32 ec_tell_frac(ec_ctx *_this){
+  oac_uint32 nbits;
+  oac_uint32 r;
   int         l;
   int         i;
   /*To handle the non-integral number of bits still left in the encoder/decoder
@@ -116,7 +116,7 @@ opus_uint32 ec_tell_frac(ec_ctx *_this){
 
 #ifdef USE_SMALL_DIV_TABLE
 /* Result of 2^32/(2*i+1), except for i=0. */
-const opus_uint32 SMALL_DIV_TABLE[129] = {
+const oac_uint32 SMALL_DIV_TABLE[129] = {
    0xFFFFFFFF, 0x55555555, 0x33333333, 0x24924924,
    0x1C71C71C, 0x1745D174, 0x13B13B13, 0x11111111,
    0x0F0F0F0F, 0x0D79435E, 0x0C30C30C, 0x0B21642C,
diff --git a/celt/entcode.h b/celt/entcode.h
index de145c719..3c6de5432 100644
--- a/celt/entcode.h
+++ b/celt/entcode.h
@@ -25,8 +25,8 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "opus_types.h"
-#include "opus_defines.h"
+#include "oac_types.h"
+#include "oac_defines.h"
 
 #if !defined(_entcode_H)
 # define _entcode_H (1)
@@ -34,15 +34,15 @@
 # include <stddef.h>
 # include "ecintrin.h"
 
-extern const opus_uint32 SMALL_DIV_TABLE[129];
+extern const oac_uint32 SMALL_DIV_TABLE[129];
 
-#ifdef OPUS_ARM_ASM
+#ifdef OAC_ARM_ASM
 #define USE_SMALL_DIV_TABLE
 #endif
 
 /*OPT: ec_window must be at least 32 bits, but if you have fast arithmetic on a
    larger type, you can speed up the decoder by using it here.*/
-typedef opus_uint32           ec_window;
+typedef oac_uint32           ec_window;
 typedef struct ec_ctx         ec_ctx;
 typedef struct ec_ctx         ec_enc;
 typedef struct ec_ctx         ec_dec;
@@ -63,9 +63,9 @@ struct ec_ctx{
    /*Buffered input/output.*/
    unsigned char *buf;
    /*The size of the buffer.*/
-   opus_uint32    storage;
+   oac_uint32    storage;
    /*The offset at which the last byte containing raw bits was read/written.*/
-   opus_uint32    end_offs;
+   oac_uint32    end_offs;
    /*Bits that will be read from/written at the end.*/
    ec_window      end_window;
    /*Number of valid bits in end_window.*/
@@ -74,31 +74,31 @@ struct ec_ctx{
      This does not include partial bits currently in the range coder.*/
    int            nbits_total;
    /*The offset at which the next range coder byte will be read/written.*/
-   opus_uint32    offs;
+   oac_uint32    offs;
    /*The number of values in the current range.*/
-   opus_uint32    rng;
+   oac_uint32    rng;
    /*In the decoder: the difference between the top of the current range and
       the input value, minus one.
      In the encoder: the low end of the current range.*/
-   opus_uint32    val;
+   oac_uint32    val;
    /*In the decoder: the saved normalization factor from ec_decode().
      In the encoder: the number of outstanding carry propagating symbols.*/
-   opus_uint32    ext;
+   oac_uint32    ext;
    /*A buffered input/output symbol, awaiting carry propagation.*/
    int            rem;
    /*Nonzero if an error occurred.*/
    int            error;
 };
 
-static OPUS_INLINE opus_uint32 ec_range_bytes(ec_ctx *_this){
+static OAC_INLINE oac_uint32 ec_range_bytes(ec_ctx *_this){
   return _this->offs;
 }
 
-static OPUS_INLINE unsigned char *ec_get_buffer(ec_ctx *_this){
+static OAC_INLINE unsigned char *ec_get_buffer(ec_ctx *_this){
   return _this->buf;
 }
 
-static OPUS_INLINE int ec_get_error(ec_ctx *_this){
+static OAC_INLINE int ec_get_error(ec_ctx *_this){
   return _this->error;
 }
 
@@ -108,7 +108,7 @@ static OPUS_INLINE int ec_get_error(ec_ctx *_this){
   Return: The number of bits.
           This will always be slightly larger than the exact value (e.g., all
            rounding error is in the positive direction).*/
-static OPUS_INLINE int ec_tell(ec_ctx *_this){
+static OAC_INLINE int ec_tell(ec_ctx *_this){
   return _this->nbits_total-EC_ILOG(_this->rng);
 }
 
@@ -118,18 +118,18 @@ static OPUS_INLINE int ec_tell(ec_ctx *_this){
   Return: The number of bits scaled by 2**BITRES.
           This will always be slightly larger than the exact value (e.g., all
            rounding error is in the positive direction).*/
-opus_uint32 ec_tell_frac(ec_ctx *_this);
+oac_uint32 ec_tell_frac(ec_ctx *_this);
 
 /* Tested exhaustively for all n and for 1<=d<=256 */
-static OPUS_INLINE opus_uint32 celt_udiv(opus_uint32 n, opus_uint32 d) {
+static OAC_INLINE oac_uint32 celt_udiv(oac_uint32 n, oac_uint32 d) {
    celt_sig_assert(d>0);
 #ifdef USE_SMALL_DIV_TABLE
    if (d>256)
       return n/d;
    else {
-      opus_uint32 t, q;
+      oac_uint32 t, q;
       t = EC_ILOG(d&-d);
-      q = (opus_uint64)SMALL_DIV_TABLE[d>>t]*(n>>(t-1))>>32;
+      q = (oac_uint64)SMALL_DIV_TABLE[d>>t]*(n>>(t-1))>>32;
       return q+(n-q*d >= d);
    }
 #else
@@ -137,11 +137,11 @@ static OPUS_INLINE opus_uint32 celt_udiv(opus_uint32 n, opus_uint32 d) {
 #endif
 }
 
-static OPUS_INLINE opus_int32 celt_sudiv(opus_int32 n, opus_int32 d) {
+static OAC_INLINE oac_int32 celt_sudiv(oac_int32 n, oac_int32 d) {
    celt_sig_assert(d>0);
 #ifdef USE_SMALL_DIV_TABLE
    if (n<0)
-      return -(opus_int32)celt_udiv(-n, d);
+      return -(oac_int32)celt_udiv(-n, d);
    else
       return celt_udiv(n, d);
 #else
diff --git a/celt/entdec.c b/celt/entdec.c
index 027aa24bc..b3da1a0ed 100644
--- a/celt/entdec.c
+++ b/celt/entdec.c
@@ -116,7 +116,7 @@ static void ec_dec_normalize(ec_dec *_this){
   }
 }
 
-void ec_dec_init(ec_dec *_this,unsigned char *_buf,opus_uint32 _storage){
+void ec_dec_init(ec_dec *_this,unsigned char *_buf,oac_uint32 _storage){
   _this->buf=_buf;
   _this->storage=_storage;
   _this->end_offs=0;
@@ -151,7 +151,7 @@ unsigned ec_decode_bin(ec_dec *_this,unsigned _bits){
 }
 
 void ec_dec_update(ec_dec *_this,unsigned _fl,unsigned _fh,unsigned _ft){
-  opus_uint32 s;
+  oac_uint32 s;
   s=IMUL32(_this->ext,_ft-_fh);
   _this->val-=s;
   _this->rng=_fl>0?IMUL32(_this->ext,_fh-_fl):_this->rng-s;
@@ -160,9 +160,9 @@ void ec_dec_update(ec_dec *_this,unsigned _fl,unsigned _fh,unsigned _ft){
 
 /*The probability of having a "one" is 1/(1<<_logp).*/
 int ec_dec_bit_logp(ec_dec *_this,unsigned _logp){
-  opus_uint32 r;
-  opus_uint32 d;
-  opus_uint32 s;
+  oac_uint32 r;
+  oac_uint32 d;
+  oac_uint32 s;
   int         ret;
   r=_this->rng;
   d=_this->val;
@@ -175,10 +175,10 @@ int ec_dec_bit_logp(ec_dec *_this,unsigned _logp){
 }
 
 int ec_dec_icdf(ec_dec *_this,const unsigned char *_icdf,unsigned _ftb){
-  opus_uint32 r;
-  opus_uint32 d;
-  opus_uint32 s;
-  opus_uint32 t;
+  oac_uint32 r;
+  oac_uint32 d;
+  oac_uint32 s;
+  oac_uint32 t;
   int         ret;
   s=_this->rng;
   d=_this->val;
@@ -195,11 +195,11 @@ int ec_dec_icdf(ec_dec *_this,const unsigned char *_icdf,unsigned _ftb){
   return ret;
 }
 
-int ec_dec_icdf16(ec_dec *_this,const opus_uint16 *_icdf,unsigned _ftb){
-  opus_uint32 r;
-  opus_uint32 d;
-  opus_uint32 s;
-  opus_uint32 t;
+int ec_dec_icdf16(ec_dec *_this,const oac_uint16 *_icdf,unsigned _ftb){
+  oac_uint32 r;
+  oac_uint32 d;
+  oac_uint32 s;
+  oac_uint32 t;
   int         ret;
   s=_this->rng;
   d=_this->val;
@@ -216,7 +216,7 @@ int ec_dec_icdf16(ec_dec *_this,const opus_uint16 *_icdf,unsigned _ftb){
   return ret;
 }
 
-opus_uint32 ec_dec_uint(ec_dec *_this,opus_uint32 _ft){
+oac_uint32 ec_dec_uint(ec_dec *_this,oac_uint32 _ft){
   unsigned ft;
   unsigned s;
   int      ftb;
@@ -225,12 +225,12 @@ opus_uint32 ec_dec_uint(ec_dec *_this,opus_uint32 _ft){
   _ft--;
   ftb=EC_ILOG(_ft);
   if(ftb>EC_UINT_BITS){
-    opus_uint32 t;
+    oac_uint32 t;
     ftb-=EC_UINT_BITS;
     ft=(unsigned)(_ft>>ftb)+1;
     s=ec_decode(_this,ft);
     ec_dec_update(_this,s,s+1,ft);
-    t=(opus_uint32)s<<ftb|ec_dec_bits(_this,ftb);
+    t=(oac_uint32)s<<ftb|ec_dec_bits(_this,ftb);
     if(t<=_ft)return t;
     _this->error=1;
     return _ft;
@@ -243,10 +243,10 @@ opus_uint32 ec_dec_uint(ec_dec *_this,opus_uint32 _ft){
   }
 }
 
-opus_uint32 ec_dec_bits(ec_dec *_this,unsigned _bits){
+oac_uint32 ec_dec_bits(ec_dec *_this,unsigned _bits){
   ec_window   window;
   int         available;
-  opus_uint32 ret;
+  oac_uint32 ret;
   window=_this->end_window;
   available=_this->nend_bits;
   if((unsigned)available<_bits){
@@ -256,7 +256,7 @@ opus_uint32 ec_dec_bits(ec_dec *_this,unsigned _bits){
     }
     while(available<=EC_WINDOW_SIZE-EC_SYM_BITS);
   }
-  ret=(opus_uint32)window&(((opus_uint32)1<<_bits)-1U);
+  ret=(oac_uint32)window&(((oac_uint32)1<<_bits)-1U);
   window>>=_bits;
   available-=_bits;
   _this->end_window=window;
diff --git a/celt/entdec.h b/celt/entdec.h
index c81f26fdb..beceab235 100644
--- a/celt/entdec.h
+++ b/celt/entdec.h
@@ -33,7 +33,7 @@
 /*Initializes the decoder.
   _buf: The input buffer to use.
   Return: 0 on success, or a negative value on error.*/
-void ec_dec_init(ec_dec *_this,unsigned char *_buf,opus_uint32 _storage);
+void ec_dec_init(ec_dec *_this,unsigned char *_buf,oac_uint32 _storage);
 
 /*Calculates the cumulative frequency for the next symbol.
   This can then be fed into the probability model to determine what that
@@ -89,7 +89,7 @@ int ec_dec_icdf(ec_dec *_this,const unsigned char *_icdf,unsigned _ftb);
           must be 0.
   _ftb: The number of bits of precision in the cumulative distribution.
   Return: The decoded symbol s.*/
-int ec_dec_icdf16(ec_dec *_this,const opus_uint16 *_icdf,unsigned _ftb);
+int ec_dec_icdf16(ec_dec *_this,const oac_uint16 *_icdf,unsigned _ftb);
 
 /*Extracts a raw unsigned integer with a non-power-of-2 range from the stream.
   The bits must have been encoded with ec_enc_uint().
@@ -97,7 +97,7 @@ int ec_dec_icdf16(ec_dec *_this,const opus_uint16 *_icdf,unsigned _ftb);
   _ft: The number of integers that can be decoded (one more than the max).
        This must be at least 2, and no more than 2**32-1.
   Return: The decoded bits.*/
-opus_uint32 ec_dec_uint(ec_dec *_this,opus_uint32 _ft);
+oac_uint32 ec_dec_uint(ec_dec *_this,oac_uint32 _ft);
 
 /*Extracts a sequence of raw bits from the stream.
   The bits must have been encoded with ec_enc_bits().
@@ -105,6 +105,6 @@ opus_uint32 ec_dec_uint(ec_dec *_this,opus_uint32 _ft);
   _ftb: The number of bits to extract.
         This must be between 0 and 25, inclusive.
   Return: The decoded bits.*/
-opus_uint32 ec_dec_bits(ec_dec *_this,unsigned _ftb);
+oac_uint32 ec_dec_bits(ec_dec *_this,unsigned _ftb);
 
 #endif
diff --git a/celt/entenc.c b/celt/entenc.c
index ede00c848..da69c3c0b 100644
--- a/celt/entenc.c
+++ b/celt/entenc.c
@@ -98,7 +98,7 @@ static void ec_enc_carry_out(ec_enc *_this,int _c){
   else _this->ext++;
 }
 
-static OPUS_INLINE void ec_enc_normalize(ec_enc *_this){
+static OAC_INLINE void ec_enc_normalize(ec_enc *_this){
   /*If the range is too small, output some bits and rescale it.*/
   while(_this->rng<=EC_CODE_BOT){
     ec_enc_carry_out(_this,(int)(_this->val>>EC_CODE_SHIFT));
@@ -109,7 +109,7 @@ static OPUS_INLINE void ec_enc_normalize(ec_enc *_this){
   }
 }
 
-void ec_enc_init(ec_enc *_this,unsigned char *_buf,opus_uint32 _size){
+void ec_enc_init(ec_enc *_this,unsigned char *_buf,oac_uint32 _size){
   _this->buf=_buf;
   _this->end_offs=0;
   _this->end_window=0;
@@ -126,7 +126,7 @@ void ec_enc_init(ec_enc *_this,unsigned char *_buf,opus_uint32 _size){
 }
 
 void ec_encode(ec_enc *_this,unsigned _fl,unsigned _fh,unsigned _ft){
-  opus_uint32 r;
+  oac_uint32 r;
   r=celt_udiv(_this->rng,_ft);
   if(_fl>0){
     _this->val+=_this->rng-IMUL32(r,(_ft-_fl));
@@ -137,7 +137,7 @@ void ec_encode(ec_enc *_this,unsigned _fl,unsigned _fh,unsigned _ft){
 }
 
 void ec_encode_bin(ec_enc *_this,unsigned _fl,unsigned _fh,unsigned _bits){
-  opus_uint32 r;
+  oac_uint32 r;
   r=_this->rng>>_bits;
   if(_fl>0){
     _this->val+=_this->rng-IMUL32(r,((1U<<_bits)-_fl));
@@ -149,9 +149,9 @@ void ec_encode_bin(ec_enc *_this,unsigned _fl,unsigned _fh,unsigned _bits){
 
 /*The probability of having a "one" is 1/(1<<_logp).*/
 void ec_enc_bit_logp(ec_enc *_this,int _val,unsigned _logp){
-  opus_uint32 r;
-  opus_uint32 s;
-  opus_uint32 l;
+  oac_uint32 r;
+  oac_uint32 s;
+  oac_uint32 l;
   r=_this->rng;
   l=_this->val;
   s=r>>_logp;
@@ -162,7 +162,7 @@ void ec_enc_bit_logp(ec_enc *_this,int _val,unsigned _logp){
 }
 
 void ec_enc_icdf(ec_enc *_this,int _s,const unsigned char *_icdf,unsigned _ftb){
-  opus_uint32 r;
+  oac_uint32 r;
   r=_this->rng>>_ftb;
   if(_s>0){
     _this->val+=_this->rng-IMUL32(r,_icdf[_s-1]);
@@ -172,8 +172,8 @@ void ec_enc_icdf(ec_enc *_this,int _s,const unsigned char *_icdf,unsigned _ftb){
   ec_enc_normalize(_this);
 }
 
-void ec_enc_icdf16(ec_enc *_this,int _s,const opus_uint16 *_icdf,unsigned _ftb){
-  opus_uint32 r;
+void ec_enc_icdf16(ec_enc *_this,int _s,const oac_uint16 *_icdf,unsigned _ftb){
+  oac_uint32 r;
   r=_this->rng>>_ftb;
   if(_s>0){
     _this->val+=_this->rng-IMUL32(r,_icdf[_s-1]);
@@ -183,7 +183,7 @@ void ec_enc_icdf16(ec_enc *_this,int _s,const opus_uint16 *_icdf,unsigned _ftb){
   ec_enc_normalize(_this);
 }
 
-void ec_enc_uint(ec_enc *_this,opus_uint32 _fl,opus_uint32 _ft){
+void ec_enc_uint(ec_enc *_this,oac_uint32 _fl,oac_uint32 _ft){
   unsigned  ft;
   unsigned  fl;
   int       ftb;
@@ -196,12 +196,12 @@ void ec_enc_uint(ec_enc *_this,opus_uint32 _fl,opus_uint32 _ft){
     ft=(_ft>>ftb)+1;
     fl=(unsigned)(_fl>>ftb);
     ec_encode(_this,fl,fl+1,ft);
-    ec_enc_bits(_this,_fl&(((opus_uint32)1<<ftb)-1U),ftb);
+    ec_enc_bits(_this,_fl&(((oac_uint32)1<<ftb)-1U),ftb);
   }
   else ec_encode(_this,_fl,_fl+1,_ft+1);
 }
 
-void ec_enc_bits(ec_enc *_this,opus_uint32 _fl,unsigned _bits){
+void ec_enc_bits(ec_enc *_this,oac_uint32 _fl,unsigned _bits){
   ec_window window;
   int       used;
   window=_this->end_window;
@@ -238,16 +238,16 @@ void ec_enc_patch_initial_bits(ec_enc *_this,unsigned _val,unsigned _nbits){
   }
   else if(_this->rng<=(EC_CODE_TOP>>_nbits)){
     /*The renormalization loop has never been run.*/
-    _this->val=(_this->val&~((opus_uint32)mask<<EC_CODE_SHIFT))|
-     (opus_uint32)_val<<(EC_CODE_SHIFT+shift);
+    _this->val=(_this->val&~((oac_uint32)mask<<EC_CODE_SHIFT))|
+     (oac_uint32)_val<<(EC_CODE_SHIFT+shift);
   }
   /*The encoder hasn't even encoded _nbits of data yet.*/
   else _this->error=-1;
 }
 
-void ec_enc_shrink(ec_enc *_this,opus_uint32 _size){
+void ec_enc_shrink(ec_enc *_this,oac_uint32 _size){
   celt_assert(_this->offs+_this->end_offs<=_size);
-  OPUS_MOVE(_this->buf+_size-_this->end_offs,
+  OAC_MOVE(_this->buf+_size-_this->end_offs,
    _this->buf+_this->storage-_this->end_offs,_this->end_offs);
   _this->storage=_size;
 }
@@ -255,8 +255,8 @@ void ec_enc_shrink(ec_enc *_this,opus_uint32 _size){
 void ec_enc_done(ec_enc *_this){
   ec_window   window;
   int         used;
-  opus_uint32 msk;
-  opus_uint32 end;
+  oac_uint32 msk;
+  oac_uint32 end;
   int         l;
   /*We output the minimum number of bits that ensures that the symbols encoded
      thus far will be decoded correctly regardless of the bits that follow.*/
@@ -285,7 +285,7 @@ void ec_enc_done(ec_enc *_this){
   }
   /*Clear any excess space and add any remaining extra bits to the last byte.*/
   if(!_this->error){
-    if (_this->buf) OPUS_CLEAR(_this->buf+_this->offs,
+    if (_this->buf) OAC_CLEAR(_this->buf+_this->offs,
      _this->storage-_this->offs-_this->end_offs);
     if(used>0){
       /*If there's no range coder data at all, give up.*/
diff --git a/celt/entenc.h b/celt/entenc.h
index c7bcf006c..2937e63d5 100644
--- a/celt/entenc.h
+++ b/celt/entenc.h
@@ -33,7 +33,7 @@
 /*Initializes the encoder.
   _buf:  The buffer to store output bytes in.
   _size: The size of the buffer, in chars.*/
-void ec_enc_init(ec_enc *_this,unsigned char *_buf,opus_uint32 _size);
+void ec_enc_init(ec_enc *_this,unsigned char *_buf,oac_uint32 _size);
 /*Encodes a symbol given its frequency information.
   The frequency information must be discernible by the decoder, assuming it
    has read only the previous symbols from the stream.
@@ -71,19 +71,19 @@ void ec_enc_icdf(ec_enc *_this,int _s,const unsigned char *_icdf,unsigned _ftb);
          The values must be monotonically non-increasing, and the last value
           must be 0.
   _ftb: The number of bits of precision in the cumulative distribution.*/
-void ec_enc_icdf16(ec_enc *_this,int _s,const opus_uint16 *_icdf,unsigned _ftb);
+void ec_enc_icdf16(ec_enc *_this,int _s,const oac_uint16 *_icdf,unsigned _ftb);
 
 /*Encodes a raw unsigned integer in the stream.
   _fl: The integer to encode.
   _ft: The number of integers that can be encoded (one more than the max).
        This must be at least 2, and no more than 2**32-1.*/
-void ec_enc_uint(ec_enc *_this,opus_uint32 _fl,opus_uint32 _ft);
+void ec_enc_uint(ec_enc *_this,oac_uint32 _fl,oac_uint32 _ft);
 
 /*Encodes a sequence of raw bits in the stream.
   _fl:  The bits to encode.
   _ftb: The number of bits to encode.
         This must be between 1 and 25, inclusive.*/
-void ec_enc_bits(ec_enc *_this,opus_uint32 _fl,unsigned _ftb);
+void ec_enc_bits(ec_enc *_this,oac_uint32 _fl,unsigned _ftb);
 
 /*Overwrites a few bits at the very start of an existing stream, after they
    have already been encoded.
@@ -109,7 +109,7 @@ void ec_enc_patch_initial_bits(ec_enc *_this,unsigned _val,unsigned _nbits);
   _size: The number of bytes in the new buffer.
          This must be large enough to contain the bits already written, and
           must be no larger than the existing size.*/
-void ec_enc_shrink(ec_enc *_this,opus_uint32 _size);
+void ec_enc_shrink(ec_enc *_this,oac_uint32 _size);
 
 /*Indicates that there are no more symbols to encode.
   All remaining output bytes are flushed to the output buffer.
diff --git a/celt/fixed_c5x.h b/celt/fixed_c5x.h
index ea95a998c..a7df95866 100644
--- a/celt/fixed_c5x.h
+++ b/celt/fixed_c5x.h
@@ -34,7 +34,7 @@
 #include "dsplib.h"
 
 #undef IMUL32
-static OPUS_INLINE long IMUL32(long i, long j)
+static OAC_INLINE long IMUL32(long i, long j)
 {
    long ac0, ac1;
    ac0 = _lmpy(i>>16,j);
diff --git a/celt/fixed_debug.h b/celt/fixed_debug.h
index 34c3646d6..d2861549e 100644
--- a/celt/fixed_debug.h
+++ b/celt/fixed_debug.h
@@ -33,19 +33,19 @@
 #define FIXED_DEBUG_H
 
 #include <stdio.h>
-#include "opus_defines.h"
+#include "oac_defines.h"
 
 #ifdef CELT_C
-OPUS_EXPORT opus_int64 celt_mips=0;
+OAC_EXPORT oac_int64 celt_mips=0;
 #else
-extern opus_int64 celt_mips;
+extern oac_int64 celt_mips;
 #endif
 
-#define MULT16_16U(a,b) ((opus_uint32)(a)*(opus_uint32)(b))
-#define MULT16_16SU(a,b) ((opus_val32)(opus_val16)(a)*(opus_val32)(opus_uint16)(b))
+#define MULT16_16U(a,b) ((oac_uint32)(a)*(oac_uint32)(b))
+#define MULT16_16SU(a,b) ((oac_val32)(oac_val16)(a)*(oac_val32)(oac_uint16)(b))
 #define MULT32_32_Q31(a,b) ADD32(ADD32(SHL32(MULT16_16(SHR32((a),16),SHR((b),16)),1), SHR32(MULT16_16SU(SHR32((a),16),((b)&0x0000ffff)),15)), SHR32(MULT16_16SU(SHR32((b),16),((a)&0x0000ffff)),15))
-#define MULT32_32_P31(a,b) ADD32(SHL32(MULT16_16(SHR((a),16),SHR((b),16)),1), SHR32(128+(opus_int32)(MULT16_16U(((a)&0x0000ffff),((b)&0x0000ffff))>>(16+7)) + SHR32(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),7) + SHR32(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),7), 8) )
-#define MULT32_32_P31_ovflw(a,b) ADD32_ovflw(SHL32(MULT16_16(SHR((a),16),SHR((b),16)),1), SHR32(128+(opus_int32)(MULT16_16U(((a)&0x0000ffff),((b)&0x0000ffff))>>(16+7)) + SHR32(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),7) + SHR32(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),7), 8) )
+#define MULT32_32_P31(a,b) ADD32(SHL32(MULT16_16(SHR((a),16),SHR((b),16)),1), SHR32(128+(oac_int32)(MULT16_16U(((a)&0x0000ffff),((b)&0x0000ffff))>>(16+7)) + SHR32(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),7) + SHR32(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),7), 8) )
+#define MULT32_32_P31_ovflw(a,b) ADD32_ovflw(SHL32(MULT16_16(SHR((a),16),SHR((b),16)),1), SHR32(128+(oac_int32)(MULT16_16U(((a)&0x0000ffff),((b)&0x0000ffff))>>(16+7)) + SHR32(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),7) + SHR32(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),7), 8) )
 #define MULT32_32_Q32(a,b) ADD32(ADD32(MULT16_16(SHR((a),16),SHR((b),16)), SHR(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),16)), SHR(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),16))
 
 /** 16x32 multiplication, followed by a 16-bit shift right. Results fits in 32 bits */
@@ -53,8 +53,8 @@ extern opus_int64 celt_mips;
 
 #define MULT16_32_P16(a,b) MULT16_32_PX(a,b,16)
 
-#define QCONST16(x,bits) ((opus_val16)(.5+(x)*(((opus_val32)1)<<(bits))))
-#define QCONST32(x,bits) ((opus_val32)(.5+(x)*(((opus_val64)1)<<(bits))))
+#define QCONST16(x,bits) ((oac_val16)(.5+(x)*(((oac_val32)1)<<(bits))))
+#define QCONST32(x,bits) ((oac_val32)(.5+(x)*(((oac_val64)1)<<(bits))))
 #define GCONST2(x,bits) ((celt_glog)(.5+(x)*(((celt_glog)1)<<(bits))))
 #define GCONST(x) GCONST2((x),DB_SHIFT)
 
@@ -66,18 +66,18 @@ extern opus_int64 celt_mips;
 #define PSHR(a,b) PSHR32(a,b)
 
 /** Add two 32-bit values, ignore any overflows */
-#define ADD32_ovflw(a,b) (celt_mips+=2,(opus_val32)((opus_uint32)(a)+(opus_uint32)(b)))
+#define ADD32_ovflw(a,b) (celt_mips+=2,(oac_val32)((oac_uint32)(a)+(oac_uint32)(b)))
 /** Subtract two 32-bit values, ignore any overflows */
-#define SUB32_ovflw(a,b) (celt_mips+=2,(opus_val32)((opus_uint32)(a)-(opus_uint32)(b)))
+#define SUB32_ovflw(a,b) (celt_mips+=2,(oac_val32)((oac_uint32)(a)-(oac_uint32)(b)))
 /* Avoid MSVC warning C4146: unary minus operator applied to unsigned type */
 /** Negate 32-bit value, ignore any overflows */
-#define NEG32_ovflw(a) (celt_mips+=2,(opus_val32)(0-(opus_uint32)(a)))
+#define NEG32_ovflw(a) (celt_mips+=2,(oac_val32)(0-(oac_uint32)(a)))
 /** 32-bit shift left, ignoring overflows */
-#define SHL32_ovflw(a,shift) ((opus_int32)((opus_uint32)(a)<<(shift)))
+#define SHL32_ovflw(a,shift) ((oac_int32)((oac_uint32)(a)<<(shift)))
 /** 32-bit arithmetic shift right with rounding-to-nearest, ignoring overflows */
 #define PSHR32_ovflw(a,shift) (SHR32(ADD32_ovflw(a, (EXTEND32(1)<<(shift)>>1)),shift))
 
-static OPUS_INLINE short NEG16(int x)
+static OAC_INLINE short NEG16(int x)
 {
    int res;
    if (!VERIFY_SHORT(x))
@@ -98,9 +98,9 @@ static OPUS_INLINE short NEG16(int x)
    celt_mips++;
    return res;
 }
-static OPUS_INLINE int NEG32(opus_int64 x)
+static OAC_INLINE int NEG32(oac_int64 x)
 {
-   opus_int64 res;
+   oac_int64 res;
    if (!VERIFY_INT(x))
    {
       fprintf (stderr, "NEG16: input is not int: %d\n", (int)x);
@@ -121,7 +121,7 @@ static OPUS_INLINE int NEG32(opus_int64 x)
 }
 
 #define EXTRACT16(x) EXTRACT16_(x, __FILE__, __LINE__)
-static OPUS_INLINE short EXTRACT16_(int x, char *file, int line)
+static OAC_INLINE short EXTRACT16_(int x, char *file, int line)
 {
    int res;
    if (!VERIFY_SHORT(x))
@@ -137,7 +137,7 @@ static OPUS_INLINE short EXTRACT16_(int x, char *file, int line)
 }
 
 #define EXTEND32(x) EXTEND32_(x, __FILE__, __LINE__)
-static OPUS_INLINE int EXTEND32_(int x, char *file, int line)
+static OAC_INLINE int EXTEND32_(int x, char *file, int line)
 {
    int res;
    if (!VERIFY_SHORT(x))
@@ -153,7 +153,7 @@ static OPUS_INLINE int EXTEND32_(int x, char *file, int line)
 }
 
 #define SHR16(a, shift) SHR16_(a, shift, __FILE__, __LINE__)
-static OPUS_INLINE short SHR16_(int a, int shift, char *file, int line)
+static OAC_INLINE short SHR16_(int a, int shift, char *file, int line)
 {
    int res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(shift))
@@ -175,9 +175,9 @@ static OPUS_INLINE short SHR16_(int a, int shift, char *file, int line)
    return res;
 }
 #define SHL16(a, shift) SHL16_(a, shift, __FILE__, __LINE__)
-static OPUS_INLINE short SHL16_(int a, int shift, char *file, int line)
+static OAC_INLINE short SHL16_(int a, int shift, char *file, int line)
 {
-   opus_int32 res;
+   oac_int32 res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(shift))
    {
       fprintf (stderr, "SHL16: inputs are not short: %d %d in %s: line %d\n", a, shift, file, line);
@@ -185,7 +185,7 @@ static OPUS_INLINE short SHL16_(int a, int shift, char *file, int line)
       celt_assert(0);
 #endif
    }
-   res = (opus_int32)((opus_uint32)a<<shift);
+   res = (oac_int32)((oac_uint32)a<<shift);
    if (!VERIFY_SHORT(res))
    {
       fprintf (stderr, "SHL16: output is not short: %d in %s: line %d\n", res, file, line);
@@ -197,9 +197,9 @@ static OPUS_INLINE short SHL16_(int a, int shift, char *file, int line)
    return res;
 }
 
-static OPUS_INLINE int SHR32(opus_int64 a, int shift)
+static OAC_INLINE int SHR32(oac_int64 a, int shift)
 {
-   opus_int64  res;
+   oac_int64  res;
    if (!VERIFY_INT(a) || !VERIFY_SHORT(shift))
    {
       fprintf (stderr, "SHR32: inputs are not int: %d %d\n", (int)a, shift);
@@ -219,9 +219,9 @@ static OPUS_INLINE int SHR32(opus_int64 a, int shift)
    return res;
 }
 #define SHL32(a, shift) SHL32_(a, shift, __FILE__, __LINE__)
-static OPUS_INLINE int SHL32_(opus_int64 a, int shift, char *file, int line)
+static OAC_INLINE int SHL32_(oac_int64 a, int shift, char *file, int line)
 {
-   opus_int64  res;
+   oac_int64  res;
    if (!VERIFY_INT(a) || !VERIFY_SHORT(shift))
    {
       fprintf (stderr, "SHL32: inputs are not int: %lld %d in %s: line %d\n", (long long)a, shift, file, line);
@@ -229,7 +229,7 @@ static OPUS_INLINE int SHL32_(opus_int64 a, int shift, char *file, int line)
       celt_assert(0);
 #endif
    }
-   res = (opus_int64)((opus_uint64)a<<shift);
+   res = (oac_int64)((oac_uint64)a<<shift);
    if (!VERIFY_INT(res))
    {
       fprintf (stderr, "SHL32: output is not int: %lld<<%d = %lld in %s: line %d\n", (long long)a, shift, (long long)res, file, line);
@@ -241,7 +241,7 @@ static OPUS_INLINE int SHL32_(opus_int64 a, int shift, char *file, int line)
    return res;
 }
 
-#define PSHR32(a,shift) (celt_mips--,SHR32(ADD32((a),(((opus_val32)(1)<<((shift))>>1))),shift))
+#define PSHR32(a,shift) (celt_mips--,SHR32(ADD32((a),(((oac_val32)(1)<<((shift))>>1))),shift))
 #define VSHR32(a, shift) (((shift)>0) ? SHR32(a, shift) : SHL32(a, -(shift)))
 
 #define SHR64(a,shift) (celt_mips++,(a) >> (shift))
@@ -253,7 +253,7 @@ static OPUS_INLINE int SHL32_(opus_int64 a, int shift, char *file, int line)
 #define HALF32(x)  (SHR32(x,1))
 
 #define ADD16(a, b) ADD16_(a, b, __FILE__, __LINE__)
-static OPUS_INLINE short ADD16_(int a, int b, char *file, int line)
+static OAC_INLINE short ADD16_(int a, int b, char *file, int line)
 {
    int res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
@@ -276,7 +276,7 @@ static OPUS_INLINE short ADD16_(int a, int b, char *file, int line)
 }
 
 #define SUB16(a, b) SUB16_(a, b, __FILE__, __LINE__)
-static OPUS_INLINE short SUB16_(int a, int b, char *file, int line)
+static OAC_INLINE short SUB16_(int a, int b, char *file, int line)
 {
    int res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
@@ -299,9 +299,9 @@ static OPUS_INLINE short SUB16_(int a, int b, char *file, int line)
 }
 
 #define ADD32(a, b) ADD32_(a, b, __FILE__, __LINE__)
-static OPUS_INLINE int ADD32_(opus_int64 a, opus_int64 b, char *file, int line)
+static OAC_INLINE int ADD32_(oac_int64 a, oac_int64 b, char *file, int line)
 {
-   opus_int64 res;
+   oac_int64 res;
    if (!VERIFY_INT(a) || !VERIFY_INT(b))
    {
       fprintf (stderr, "ADD32: inputs are not int: %d %d in %s: line %d\n", (int)a, (int)b, file, line);
@@ -322,9 +322,9 @@ static OPUS_INLINE int ADD32_(opus_int64 a, opus_int64 b, char *file, int line)
 }
 
 #define SUB32(a, b) SUB32_(a, b, __FILE__, __LINE__)
-static OPUS_INLINE int SUB32_(opus_int64 a, opus_int64 b, char *file, int line)
+static OAC_INLINE int SUB32_(oac_int64 a, oac_int64 b, char *file, int line)
 {
-   opus_int64 res;
+   oac_int64 res;
    if (!VERIFY_INT(a) || !VERIFY_INT(b))
    {
       fprintf (stderr, "SUB32: inputs are not int: %d %d in %s: line %d\n", (int)a, (int)b, file, line);
@@ -346,9 +346,9 @@ static OPUS_INLINE int SUB32_(opus_int64 a, opus_int64 b, char *file, int line)
 
 #undef UADD32
 #define UADD32(a, b) UADD32_(a, b, __FILE__, __LINE__)
-static OPUS_INLINE unsigned int UADD32_(opus_uint64 a, opus_uint64 b, char *file, int line)
+static OAC_INLINE unsigned int UADD32_(oac_uint64 a, oac_uint64 b, char *file, int line)
 {
-   opus_uint64 res;
+   oac_uint64 res;
    if (!VERIFY_UINT(a) || !VERIFY_UINT(b))
    {
       fprintf (stderr, "UADD32: inputs are not uint32: %llu %llu in %s: line %d\n", (unsigned long long)a, (unsigned long long)b, file, line);
@@ -370,9 +370,9 @@ static OPUS_INLINE unsigned int UADD32_(opus_uint64 a, opus_uint64 b, char *file
 
 #undef USUB32
 #define USUB32(a, b) USUB32_(a, b, __FILE__, __LINE__)
-static OPUS_INLINE unsigned int USUB32_(opus_uint64 a, opus_uint64 b, char *file, int line)
+static OAC_INLINE unsigned int USUB32_(oac_uint64 a, oac_uint64 b, char *file, int line)
 {
-   opus_uint64 res;
+   oac_uint64 res;
    if (!VERIFY_UINT(a) || !VERIFY_UINT(b))
    {
       fprintf (stderr, "USUB32: inputs are not uint32: %llu %llu in %s: line %d\n", (unsigned long long)a, (unsigned long long)b, file, line);
@@ -400,7 +400,7 @@ static OPUS_INLINE unsigned int USUB32_(opus_uint64 a, opus_uint64 b, char *file
 }
 
 /* result fits in 16 bits */
-static OPUS_INLINE short MULT16_16_16(int a, int b)
+static OAC_INLINE short MULT16_16_16(int a, int b)
 {
    int res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
@@ -423,9 +423,9 @@ static OPUS_INLINE short MULT16_16_16(int a, int b)
 }
 
 /* result fits in 32 bits */
-static OPUS_INLINE int MULT32_32_32(opus_int64 a, opus_int64 b)
+static OAC_INLINE int MULT32_32_32(oac_int64 a, oac_int64 b)
 {
-   opus_int64 res;
+   oac_int64 res;
    if (!VERIFY_INT(a) || !VERIFY_INT(b))
    {
       fprintf (stderr, "MULT32_32_32: inputs are not int: %lld %lld\n", (long long)a, (long long)b);
@@ -445,9 +445,9 @@ static OPUS_INLINE int MULT32_32_32(opus_int64 a, opus_int64 b)
    return res;
 }
 
-static OPUS_INLINE int MULT32_32_Q16(opus_int64 a, opus_int64 b)
+static OAC_INLINE int MULT32_32_Q16(oac_int64 a, oac_int64 b)
 {
-   opus_int64 res;
+   oac_int64 res;
    if (!VERIFY_INT(a) || !VERIFY_INT(b))
    {
       fprintf (stderr, "MULT32_32_Q16: inputs are not int: %lld %lld\n", (long long)a, (long long)b);
@@ -455,7 +455,7 @@ static OPUS_INLINE int MULT32_32_Q16(opus_int64 a, opus_int64 b)
       celt_assert(0);
 #endif
    }
-   res = ((opus_int64)(a)*(opus_int64)(b)) >> 16;
+   res = ((oac_int64)(a)*(oac_int64)(b)) >> 16;
    if (!VERIFY_INT(res))
    {
       fprintf (stderr, "MULT32_32_Q16: output is not int: %lld*%lld=%lld\n", (long long)a, (long long)b, (long long)res);
@@ -468,9 +468,9 @@ static OPUS_INLINE int MULT32_32_Q16(opus_int64 a, opus_int64 b)
 }
 
 #define MULT16_16(a, b) MULT16_16_(a, b, __FILE__, __LINE__)
-static OPUS_INLINE int MULT16_16_(int a, int b, char *file, int line)
+static OAC_INLINE int MULT16_16_(int a, int b, char *file, int line)
 {
-   opus_int64 res;
+   oac_int64 res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
    {
       fprintf (stderr, "MULT16_16: inputs are not short: %d %d in %s: line %d\n", a, b, file, line);
@@ -478,7 +478,7 @@ static OPUS_INLINE int MULT16_16_(int a, int b, char *file, int line)
       celt_assert(0);
 #endif
    }
-   res = ((opus_int64)a)*b;
+   res = ((oac_int64)a)*b;
    if (!VERIFY_INT(res))
    {
       fprintf (stderr, "MULT16_16: output is not int: %d in %s: line %d\n", (int)res, file, line);
@@ -493,9 +493,9 @@ static OPUS_INLINE int MULT16_16_(int a, int b, char *file, int line)
 #define MAC16_16(c,a,b)     (celt_mips-=2,ADD32((c),MULT16_16((a),(b))))
 
 #define MULT16_32_QX(a, b, Q) MULT16_32_QX_(a, b, Q, __FILE__, __LINE__)
-static OPUS_INLINE int MULT16_32_QX_(int a, opus_int64 b, int Q, char *file, int line)
+static OAC_INLINE int MULT16_32_QX_(int a, oac_int64 b, int Q, char *file, int line)
 {
-   opus_int64 res;
+   oac_int64 res;
    if (!VERIFY_SHORT(a) || !VERIFY_INT(b))
    {
       fprintf (stderr, "MULT16_32_Q%d: inputs are not short+int: %d %d in %s: line %d\n", Q, (int)a, (int)b, file, line);
@@ -503,14 +503,14 @@ static OPUS_INLINE int MULT16_32_QX_(int a, opus_int64 b, int Q, char *file, int
       celt_assert(0);
 #endif
    }
-   if (ABS32(b)>=((opus_int64)(1)<<(16+Q)))
+   if (ABS32(b)>=((oac_int64)(1)<<(16+Q)))
    {
       fprintf (stderr, "MULT16_32_Q%d: second operand too large: %d %d in %s: line %d\n", Q, (int)a, (int)b, file, line);
 #ifdef FIXED_DEBUG_ASSERT
       celt_assert(0);
 #endif
    }
-   res = (((opus_int64)a)*(opus_int64)b) >> Q;
+   res = (((oac_int64)a)*(oac_int64)b) >> Q;
    if (!VERIFY_INT(res))
    {
       fprintf (stderr, "MULT16_32_Q%d: output is not int: %d*%d=%d in %s: line %d\n", Q, (int)a, (int)b,(int)res, file, line);
@@ -526,9 +526,9 @@ static OPUS_INLINE int MULT16_32_QX_(int a, opus_int64 b, int Q, char *file, int
 }
 
 #define MULT16_32_PX(a, b, Q) MULT16_32_PX_(a, b, Q, __FILE__, __LINE__)
-static OPUS_INLINE int MULT16_32_PX_(int a, opus_int64 b, int Q, char *file, int line)
+static OAC_INLINE int MULT16_32_PX_(int a, oac_int64 b, int Q, char *file, int line)
 {
-   opus_int64 res;
+   oac_int64 res;
    if (!VERIFY_SHORT(a) || !VERIFY_INT(b))
    {
       fprintf (stderr, "MULT16_32_P%d: inputs are not short+int: %d %d in %s: line %d\n\n", Q, (int)a, (int)b, file, line);
@@ -536,14 +536,14 @@ static OPUS_INLINE int MULT16_32_PX_(int a, opus_int64 b, int Q, char *file, int
       celt_assert(0);
 #endif
    }
-   if (ABS32(b)>=((opus_int64)(1)<<(16+Q)))
+   if (ABS32(b)>=((oac_int64)(1)<<(16+Q)))
    {
       fprintf (stderr, "MULT16_32_Q%d: second operand too large: %d %d in %s: line %d\n\n", Q, (int)a, (int)b,file, line);
 #ifdef FIXED_DEBUG_ASSERT
       celt_assert(0);
 #endif
    }
-   res = ((((opus_int64)a)*(opus_int64)b) + (((opus_val32)(1)<<Q)>>1))>> Q;
+   res = ((((oac_int64)a)*(oac_int64)b) + (((oac_val32)(1)<<Q)>>1))>> Q;
    if (!VERIFY_INT(res))
    {
       fprintf (stderr, "MULT16_32_P%d: output is not int: %d*%d=%d in %s: line %d\n\n", Q, (int)a, (int)b,(int)res, file, line);
@@ -562,7 +562,7 @@ static OPUS_INLINE int MULT16_32_PX_(int a, opus_int64 b, int Q, char *file, int
 #define MAC16_32_Q15(c,a,b) (celt_mips-=2,ADD32((c),MULT16_32_Q15((a),(b))))
 #define MAC16_32_Q16(c,a,b) (celt_mips-=2,ADD32((c),MULT16_32_Q16((a),(b))))
 
-static OPUS_INLINE int SATURATE(int a, int b)
+static OAC_INLINE int SATURATE(int a, int b)
 {
    if (a>b)
       a=b;
@@ -572,7 +572,7 @@ static OPUS_INLINE int SATURATE(int a, int b)
    return a;
 }
 
-static OPUS_INLINE opus_int16 SATURATE16(opus_int32 a)
+static OAC_INLINE oac_int16 SATURATE16(oac_int32 a)
 {
    celt_mips+=3;
    if (a>32767)
@@ -582,9 +582,9 @@ static OPUS_INLINE opus_int16 SATURATE16(opus_int32 a)
    else return a;
 }
 
-static OPUS_INLINE int MULT16_16_Q11_32(int a, int b)
+static OAC_INLINE int MULT16_16_Q11_32(int a, int b)
 {
-   opus_int64 res;
+   oac_int64 res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
    {
       fprintf (stderr, "MULT16_16_Q11: inputs are not short: %d %d\n", a, b);
@@ -592,7 +592,7 @@ static OPUS_INLINE int MULT16_16_Q11_32(int a, int b)
       celt_assert(0);
 #endif
    }
-   res = ((opus_int64)a)*b;
+   res = ((oac_int64)a)*b;
    res >>= 11;
    if (!VERIFY_INT(res))
    {
@@ -604,9 +604,9 @@ static OPUS_INLINE int MULT16_16_Q11_32(int a, int b)
    celt_mips+=3;
    return res;
 }
-static OPUS_INLINE short MULT16_16_Q13(int a, int b)
+static OAC_INLINE short MULT16_16_Q13(int a, int b)
 {
-   opus_int64 res;
+   oac_int64 res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
    {
       fprintf (stderr, "MULT16_16_Q13: inputs are not short: %d %d\n", a, b);
@@ -614,7 +614,7 @@ static OPUS_INLINE short MULT16_16_Q13(int a, int b)
       celt_assert(0);
 #endif
    }
-   res = ((opus_int64)a)*b;
+   res = ((oac_int64)a)*b;
    res >>= 13;
    if (!VERIFY_SHORT(res))
    {
@@ -626,9 +626,9 @@ static OPUS_INLINE short MULT16_16_Q13(int a, int b)
    celt_mips+=3;
    return res;
 }
-static OPUS_INLINE short MULT16_16_Q14(int a, int b)
+static OAC_INLINE short MULT16_16_Q14(int a, int b)
 {
-   opus_int64 res;
+   oac_int64 res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
    {
       fprintf (stderr, "MULT16_16_Q14: inputs are not short: %d %d\n", a, b);
@@ -636,7 +636,7 @@ static OPUS_INLINE short MULT16_16_Q14(int a, int b)
       celt_assert(0);
 #endif
    }
-   res = ((opus_int64)a)*b;
+   res = ((oac_int64)a)*b;
    res >>= 14;
    if (!VERIFY_SHORT(res))
    {
@@ -650,9 +650,9 @@ static OPUS_INLINE short MULT16_16_Q14(int a, int b)
 }
 
 #define MULT16_16_Q15(a, b) MULT16_16_Q15_(a, b, __FILE__, __LINE__)
-static OPUS_INLINE short MULT16_16_Q15_(int a, int b, char *file, int line)
+static OAC_INLINE short MULT16_16_Q15_(int a, int b, char *file, int line)
 {
-   opus_int64 res;
+   oac_int64 res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
    {
       fprintf (stderr, "MULT16_16_Q15: inputs are not short: %d %d in %s: line %d\n", a, b, file, line);
@@ -660,7 +660,7 @@ static OPUS_INLINE short MULT16_16_Q15_(int a, int b, char *file, int line)
       celt_assert(0);
 #endif
    }
-   res = ((opus_int64)a)*b;
+   res = ((oac_int64)a)*b;
    res >>= 15;
    if (!VERIFY_SHORT(res))
    {
@@ -673,9 +673,9 @@ static OPUS_INLINE short MULT16_16_Q15_(int a, int b, char *file, int line)
    return res;
 }
 
-static OPUS_INLINE short MULT16_16_P13(int a, int b)
+static OAC_INLINE short MULT16_16_P13(int a, int b)
 {
-   opus_int64 res;
+   oac_int64 res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
    {
       fprintf (stderr, "MULT16_16_P13: inputs are not short: %d %d\n", a, b);
@@ -683,7 +683,7 @@ static OPUS_INLINE short MULT16_16_P13(int a, int b)
       celt_assert(0);
 #endif
    }
-   res = ((opus_int64)a)*b;
+   res = ((oac_int64)a)*b;
    res += 4096;
    if (!VERIFY_INT(res))
    {
@@ -703,9 +703,9 @@ static OPUS_INLINE short MULT16_16_P13(int a, int b)
    celt_mips+=4;
    return res;
 }
-static OPUS_INLINE short MULT16_16_P14(int a, int b)
+static OAC_INLINE short MULT16_16_P14(int a, int b)
 {
-   opus_int64 res;
+   oac_int64 res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
    {
       fprintf (stderr, "MULT16_16_P14: inputs are not short: %d %d\n", a, b);
@@ -713,7 +713,7 @@ static OPUS_INLINE short MULT16_16_P14(int a, int b)
       celt_assert(0);
 #endif
    }
-   res = ((opus_int64)a)*b;
+   res = ((oac_int64)a)*b;
    res += 8192;
    if (!VERIFY_INT(res))
    {
@@ -733,9 +733,9 @@ static OPUS_INLINE short MULT16_16_P14(int a, int b)
    celt_mips+=4;
    return res;
 }
-static OPUS_INLINE short MULT16_16_P15(int a, int b)
+static OAC_INLINE short MULT16_16_P15(int a, int b)
 {
-   opus_int64 res;
+   oac_int64 res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
    {
       fprintf (stderr, "MULT16_16_P15: inputs are not short: %d %d\n", a, b);
@@ -743,7 +743,7 @@ static OPUS_INLINE short MULT16_16_P15(int a, int b)
       celt_assert(0);
 #endif
    }
-   res = ((opus_int64)a)*b;
+   res = ((oac_int64)a)*b;
    res += 16384;
    if (!VERIFY_INT(res))
    {
@@ -766,9 +766,9 @@ static OPUS_INLINE short MULT16_16_P15(int a, int b)
 
 #define DIV32_16(a, b) DIV32_16_(a, b, __FILE__, __LINE__)
 
-static OPUS_INLINE int DIV32_16_(opus_int64 a, opus_int64 b, char *file, int line)
+static OAC_INLINE int DIV32_16_(oac_int64 a, oac_int64 b, char *file, int line)
 {
-   opus_int64 res;
+   oac_int64 res;
    if (b==0)
    {
       fprintf(stderr, "DIV32_16: divide by zero: %d/%d in %s: line %d\n", (int)a, (int)b, file, line);
@@ -801,9 +801,9 @@ static OPUS_INLINE int DIV32_16_(opus_int64 a, opus_int64 b, char *file, int lin
 }
 
 #define DIV32(a, b) DIV32_(a, b, __FILE__, __LINE__)
-static OPUS_INLINE int DIV32_(opus_int64 a, opus_int64 b, char *file, int line)
+static OAC_INLINE int DIV32_(oac_int64 a, oac_int64 b, char *file, int line)
 {
-   opus_int64 res;
+   oac_int64 res;
    if (b==0)
    {
       fprintf(stderr, "DIV32: divide by zero: %d/%d in %s: line %d\n", (int)a, (int)b, file, line);
@@ -832,7 +832,7 @@ static OPUS_INLINE int DIV32_(opus_int64 a, opus_int64 b, char *file, int line)
    return res;
 }
 
-static OPUS_INLINE opus_val16 SIG2WORD16_generic(celt_sig x)
+static OAC_INLINE oac_val16 SIG2WORD16_generic(celt_sig x)
 {
    x = PSHR32(x, SIG_SHIFT);
    x = MAX32(x, -32768);
diff --git a/celt/fixed_generic.h b/celt/fixed_generic.h
index ee9ea1844..7b6616abe 100644
--- a/celt/fixed_generic.h
+++ b/celt/fixed_generic.h
@@ -34,65 +34,65 @@
 #define FIXED_GENERIC_H
 
 /** Multiply a 16-bit signed value by a 16-bit unsigned value. The result is a 32-bit signed value */
-#define MULT16_16SU(a,b) ((opus_val32)(opus_val16)(a)*(opus_val32)(opus_uint16)(b))
+#define MULT16_16SU(a,b) ((oac_val32)(oac_val16)(a)*(oac_val32)(oac_uint16)(b))
 
 /** 16x32 multiplication, followed by a 16-bit shift right. Results fits in 32 bits */
-#if OPUS_FAST_INT64
-#define MULT16_32_Q16(a,b) ((opus_val32)SHR((opus_int64)((opus_val16)(a))*(b),16))
+#if OAC_FAST_INT64
+#define MULT16_32_Q16(a,b) ((oac_val32)SHR((oac_int64)((oac_val16)(a))*(b),16))
 #else
 #define MULT16_32_Q16(a,b) ADD32(MULT16_16((a),SHR((b),16)), SHR(MULT16_16SU((a),((b)&0x0000ffff)),16))
 #endif
 
 /** 16x32 multiplication, followed by a 16-bit shift right (round-to-nearest). Results fits in 32 bits */
-#if OPUS_FAST_INT64
-#define MULT16_32_P16(a,b) ((opus_val32)PSHR((opus_int64)((opus_val16)(a))*(b),16))
+#if OAC_FAST_INT64
+#define MULT16_32_P16(a,b) ((oac_val32)PSHR((oac_int64)((oac_val16)(a))*(b),16))
 #else
 #define MULT16_32_P16(a,b) ADD32(MULT16_16((a),SHR((b),16)), PSHR(MULT16_16SU((a),((b)&0x0000ffff)),16))
 #endif
 
 /** 16x32 multiplication, followed by a 15-bit shift right. Results fits in 32 bits */
-#if OPUS_FAST_INT64
-#define MULT16_32_Q15(a,b) ((opus_val32)SHR((opus_int64)((opus_val16)(a))*(b),15))
+#if OAC_FAST_INT64
+#define MULT16_32_Q15(a,b) ((oac_val32)SHR((oac_int64)((oac_val16)(a))*(b),15))
 #else
 #define MULT16_32_Q15(a,b) ADD32(SHL(MULT16_16((a),SHR((b),16)),1), SHR(MULT16_16SU((a),((b)&0x0000ffff)),15))
 #endif
 
 /** 32x32 multiplication, followed by a 16-bit shift right. Results fits in 32 bits */
-#if OPUS_FAST_INT64
-#define MULT32_32_Q16(a,b) ((opus_val32)SHR((opus_int64)(a)*(opus_int64)(b),16))
+#if OAC_FAST_INT64
+#define MULT32_32_Q16(a,b) ((oac_val32)SHR((oac_int64)(a)*(oac_int64)(b),16))
 #else
-#define MULT32_32_Q16(a,b) (ADD32(ADD32(ADD32((opus_val32)(SHR32(((opus_uint32)((a)&0x0000ffff)*(opus_uint32)((b)&0x0000ffff)),16)), MULT16_16SU(SHR32(a,16),((b)&0x0000ffff))), MULT16_16SU(SHR32(b,16),((a)&0x0000ffff))), SHL32(MULT16_16(SHR32(a,16),SHR32(b,16)),16)))
+#define MULT32_32_Q16(a,b) (ADD32(ADD32(ADD32((oac_val32)(SHR32(((oac_uint32)((a)&0x0000ffff)*(oac_uint32)((b)&0x0000ffff)),16)), MULT16_16SU(SHR32(a,16),((b)&0x0000ffff))), MULT16_16SU(SHR32(b,16),((a)&0x0000ffff))), SHL32(MULT16_16(SHR32(a,16),SHR32(b,16)),16)))
 #endif
 
 /** 32x32 multiplication, followed by a 31-bit shift right. Results fits in 32 bits */
-#if OPUS_FAST_INT64
-#define MULT32_32_Q31(a,b) ((opus_val32)SHR((opus_int64)(a)*(opus_int64)(b),31))
+#if OAC_FAST_INT64
+#define MULT32_32_Q31(a,b) ((oac_val32)SHR((oac_int64)(a)*(oac_int64)(b),31))
 #else
 #define MULT32_32_Q31(a,b) ADD32(ADD32(SHL(MULT16_16(SHR((a),16),SHR((b),16)),1), SHR(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),15)), SHR(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),15))
 #endif
 
 /** 32x32 multiplication, followed by a 31-bit shift right (with rounding). Results fits in 32 bits */
-#if OPUS_FAST_INT64
-#define MULT32_32_P31(a,b) ((opus_val32)SHR(1073741824+(opus_int64)(a)*(opus_int64)(b),31))
+#if OAC_FAST_INT64
+#define MULT32_32_P31(a,b) ((oac_val32)SHR(1073741824+(oac_int64)(a)*(oac_int64)(b),31))
 #define MULT32_32_P31_ovflw(a,b) MULT32_32_P31(a,b)
 #else
-#define MULT16_16U(a,b) ((opus_uint32)(a)*(opus_uint32)(b))
-#define MULT32_32_P31(a,b) ADD32(SHL(MULT16_16(SHR((a),16),SHR((b),16)),1), SHR32(128+(opus_int32)SHR(MULT16_16U(((a)&0x0000ffff),((b)&0x0000ffff)),16+7) + SHR32(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),7) + SHR32(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),7), 8) )
-#define MULT32_32_P31_ovflw(a,b) ADD32_ovflw(SHL(MULT16_16(SHR((a),16),SHR((b),16)),1), SHR32(128+(opus_int32)SHR(MULT16_16U(((a)&0x0000ffff),((b)&0x0000ffff)),16+7) + SHR32(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),7) + SHR32(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),7), 8) )
+#define MULT16_16U(a,b) ((oac_uint32)(a)*(oac_uint32)(b))
+#define MULT32_32_P31(a,b) ADD32(SHL(MULT16_16(SHR((a),16),SHR((b),16)),1), SHR32(128+(oac_int32)SHR(MULT16_16U(((a)&0x0000ffff),((b)&0x0000ffff)),16+7) + SHR32(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),7) + SHR32(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),7), 8) )
+#define MULT32_32_P31_ovflw(a,b) ADD32_ovflw(SHL(MULT16_16(SHR((a),16),SHR((b),16)),1), SHR32(128+(oac_int32)SHR(MULT16_16U(((a)&0x0000ffff),((b)&0x0000ffff)),16+7) + SHR32(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),7) + SHR32(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),7), 8) )
 #endif
 
 /** 32x32 multiplication, followed by a 32-bit shift right. Results fits in 32 bits */
-#if OPUS_FAST_INT64
-#define MULT32_32_Q32(a,b) ((opus_val32)SHR((opus_int64)(a)*(opus_int64)(b),32))
+#if OAC_FAST_INT64
+#define MULT32_32_Q32(a,b) ((oac_val32)SHR((oac_int64)(a)*(oac_int64)(b),32))
 #else
 #define MULT32_32_Q32(a,b) ADD32(ADD32(MULT16_16(SHR((a),16),SHR((b),16)), SHR(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),16)), SHR(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),16))
 #endif
 
 /** Compile-time conversion of float constant to 16-bit value */
-#define QCONST16(x,bits) ((opus_val16)(.5+(x)*(((opus_val32)1)<<(bits))))
+#define QCONST16(x,bits) ((oac_val16)(.5+(x)*(((oac_val32)1)<<(bits))))
 
 /** Compile-time conversion of float constant to 32-bit value */
-#define QCONST32(x,bits) ((opus_val32)(.5+(x)*(((opus_int64)1)<<(bits))))
+#define QCONST32(x,bits) ((oac_val32)(.5+(x)*(((oac_int64)1)<<(bits))))
 
 /** Compile-time conversion of float constant to log gain value */
 #define GCONST2(x,bits) ((celt_glog)(.5+(x)*(((celt_glog)1)<<(bits))))
@@ -106,18 +106,18 @@
 #define NEG32(x) (-(x))
 
 /** Change a 32-bit value into a 16-bit value. The value is assumed to fit in 16-bit, otherwise the result is undefined */
-#define EXTRACT16(x) ((opus_val16)(x))
+#define EXTRACT16(x) ((oac_val16)(x))
 /** Change a 16-bit value into a 32-bit value */
-#define EXTEND32(x) ((opus_val32)(x))
+#define EXTEND32(x) ((oac_val32)(x))
 
 /** Arithmetic shift-right of a 16-bit value */
 #define SHR16(a,shift) ((a) >> (shift))
 /** Arithmetic shift-left of a 16-bit value */
-#define SHL16(a,shift) ((opus_int16)((opus_uint16)(a)<<(shift)))
+#define SHL16(a,shift) ((oac_int16)((oac_uint16)(a)<<(shift)))
 /** Arithmetic shift-right of a 32-bit value */
 #define SHR32(a,shift) ((a) >> (shift))
 /** Arithmetic shift-left of a 32-bit value */
-#define SHL32(a,shift) ((opus_int32)((opus_uint32)(a)<<(shift)))
+#define SHL32(a,shift) ((oac_int32)((oac_uint32)(a)<<(shift)))
 
 /** 32-bit arithmetic shift right with rounding-to-nearest instead of rounding down */
 #define PSHR32(a,shift) (SHR32((a)+((EXTEND32(1)<<((shift))>>1)),shift))
@@ -145,35 +145,35 @@
 #define HALF32(x)  (SHR32(x,1))
 
 /** Add two 16-bit values */
-#define ADD16(a,b) ((opus_val16)((opus_val16)(a)+(opus_val16)(b)))
+#define ADD16(a,b) ((oac_val16)((oac_val16)(a)+(oac_val16)(b)))
 /** Subtract two 16-bit values */
-#define SUB16(a,b) ((opus_val16)(a)-(opus_val16)(b))
+#define SUB16(a,b) ((oac_val16)(a)-(oac_val16)(b))
 /** Add two 32-bit values */
-#define ADD32(a,b) ((opus_val32)(a)+(opus_val32)(b))
+#define ADD32(a,b) ((oac_val32)(a)+(oac_val32)(b))
 /** Subtract two 32-bit values */
-#define SUB32(a,b) ((opus_val32)(a)-(opus_val32)(b))
+#define SUB32(a,b) ((oac_val32)(a)-(oac_val32)(b))
 
 /** Add two 32-bit values, ignore any overflows */
-#define ADD32_ovflw(a,b) ((opus_val32)((opus_uint32)(a)+(opus_uint32)(b)))
+#define ADD32_ovflw(a,b) ((oac_val32)((oac_uint32)(a)+(oac_uint32)(b)))
 /** Subtract two 32-bit values, ignore any overflows */
-#define SUB32_ovflw(a,b) ((opus_val32)((opus_uint32)(a)-(opus_uint32)(b)))
+#define SUB32_ovflw(a,b) ((oac_val32)((oac_uint32)(a)-(oac_uint32)(b)))
 /* Avoid MSVC warning C4146: unary minus operator applied to unsigned type */
 /** Negate 32-bit value, ignore any overflows */
-#define NEG32_ovflw(a) ((opus_val32)(0-(opus_uint32)(a)))
+#define NEG32_ovflw(a) ((oac_val32)(0-(oac_uint32)(a)))
 /** 32-bit shift left, ignoring overflows */
 #define SHL32_ovflw(a,shift) SHL32(a,shift)
 /** 32-bit arithmetic shift right with rounding-to-nearest, ignoring overflows */
 #define PSHR32_ovflw(a,shift) (SHR32(ADD32_ovflw(a, (EXTEND32(1)<<(shift)>>1)),shift))
 
 /** 16x16 multiplication where the result fits in 16 bits */
-#define MULT16_16_16(a,b)     ((((opus_val16)(a))*((opus_val16)(b))))
+#define MULT16_16_16(a,b)     ((((oac_val16)(a))*((oac_val16)(b))))
 
 /** 32x32 multiplication where the result fits in 32 bits */
-#define MULT32_32_32(a,b)     ((((opus_val32)(a))*((opus_val32)(b))))
+#define MULT32_32_32(a,b)     ((((oac_val32)(a))*((oac_val32)(b))))
 
-/* (opus_val32)(opus_val16) gives TI compiler a hint that it's 16x16->32 multiply */
+/* (oac_val32)(oac_val16) gives TI compiler a hint that it's 16x16->32 multiply */
 /** 16x16 multiplication where the result fits in 32 bits */
-#define MULT16_16(a,b)     (((opus_val32)(opus_val16)(a))*((opus_val32)(opus_val16)(b)))
+#define MULT16_16(a,b)     (((oac_val32)(oac_val16)(a))*((oac_val32)(oac_val16)(b)))
 
 /** 16x16 multiply-add where the result fits in 32 bits */
 #define MAC16_16(c,a,b) (ADD32((c),MULT16_16((a),(b))))
@@ -197,16 +197,16 @@
 #define MULT16_16_P15(a,b) (SHR(ADD32(16384,MULT16_16((a),(b))),15))
 
 /** Divide a 32-bit value by a 16-bit value. Result fits in 16 bits */
-#define DIV32_16(a,b) ((opus_val16)(((opus_val32)(a))/((opus_val16)(b))))
+#define DIV32_16(a,b) ((oac_val16)(((oac_val32)(a))/((oac_val16)(b))))
 
 /** Divide a 32-bit value by a 32-bit value. Result fits in 32 bits */
-#define DIV32(a,b) (((opus_val32)(a))/((opus_val32)(b)))
+#define DIV32(a,b) (((oac_val32)(a))/((oac_val32)(b)))
 
 #if defined(__mips)
 #include "mips/fixed_generic_mipsr1.h"
 #endif
 
-static OPUS_INLINE opus_val16 SIG2WORD16_generic(celt_sig x)
+static OAC_INLINE oac_val16 SIG2WORD16_generic(celt_sig x)
 {
    x = PSHR32(x, SIG_SHIFT);
    x = MAX32(x, -32768);
diff --git a/celt/float_cast.h b/celt/float_cast.h
index 120a53695..c94a0f27f 100644
--- a/celt/float_cast.h
+++ b/celt/float_cast.h
@@ -65,12 +65,12 @@
 #if defined(__GNUC__) && defined(__SSE__)
 
 #include <xmmintrin.h>
-static OPUS_INLINE opus_int32 float2int(float x) {return _mm_cvt_ss2si(_mm_set_ss(x));}
+static OAC_INLINE oac_int32 float2int(float x) {return _mm_cvt_ss2si(_mm_set_ss(x));}
 
 #elif (defined(_MSC_VER) && _MSC_VER >= 1400) && (defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP >= 1))
 
         #include <xmmintrin.h>
-        static OPUS_INLINE opus_int32 float2int(float value)
+        static OAC_INLINE oac_int32 float2int(float value)
         {
                 /* _mm_load_ss will generate same code as _mm_set_ss
                 ** in _MSC_VER >= 1914 /02 so keep __mm_load__ss
@@ -84,10 +84,10 @@ static OPUS_INLINE opus_int32 float2int(float x) {return _mm_cvt_ss2si(_mm_set_s
         #include <math.h>
 
         /*      Win32 doesn't seem to have these functions.
-        **      Therefore implement OPUS_INLINE versions of these functions here.
+        **      Therefore implement OAC_INLINE versions of these functions here.
         */
 
-        static OPUS_INLINE opus_int32
+        static OAC_INLINE oac_int32
         float2int (float flt)
         {       int intgr;
 
@@ -101,7 +101,7 @@ static OPUS_INLINE opus_int32 float2int(float x) {return _mm_cvt_ss2si(_mm_set_s
 #elif defined(__aarch64__)
 
         #include <arm_neon.h>
-        static OPUS_INLINE opus_int32 float2int(float flt)
+        static OAC_INLINE oac_int32 float2int(float flt)
         {
                 return vcvtns_s32_f32(flt);
         }
@@ -147,15 +147,15 @@ static OPUS_INLINE opus_int32 float2int(float x) {return _mm_cvt_ss2si(_mm_set_s
 #endif
 
 #ifndef DISABLE_FLOAT_API
-static OPUS_INLINE opus_int16 FLOAT2INT16(float x)
+static OAC_INLINE oac_int16 FLOAT2INT16(float x)
 {
    x = x*CELT_SIG_SCALE;
    x = MAX32(x, -32768);
    x = MIN32(x, 32767);
-   return (opus_int16)float2int(x);
+   return (oac_int16)float2int(x);
 }
 
-static OPUS_INLINE opus_int32 FLOAT2INT24(float x)
+static OAC_INLINE oac_int32 FLOAT2INT24(float x)
 {
    x = x*(CELT_SIG_SCALE*256.f);
    x = MAX32(x, -16777216);
@@ -163,9 +163,9 @@ static OPUS_INLINE opus_int32 FLOAT2INT24(float x)
    return float2int(x);
 }
 #ifdef FIXED_POINT
-static OPUS_INLINE opus_int32 FLOAT2SIG(float x)
+static OAC_INLINE oac_int32 FLOAT2SIG(float x)
 {
-   x = x*((opus_int32)32768<<SIG_SHIFT);
+   x = x*((oac_int32)32768<<SIG_SHIFT);
    x = MAX32(x, -(65536<<SIG_SHIFT));
    x = MIN32(x, 65536<<SIG_SHIFT);
    return float2int(x);
diff --git a/celt/kiss_fft.c b/celt/kiss_fft.c
index 4a6cf15e1..7c7470be4 100644
--- a/celt/kiss_fft.c
+++ b/celt/kiss_fft.c
@@ -27,7 +27,7 @@
   POSSIBILITY OF SUCH DAMAGE.*/
 
 /* This code is originally from Mark Borgerding's KISS-FFT but has been
-   heavily modified to better suit Opus */
+   heavily modified to better suit Oac */
 
 #ifndef SKIP_CONFIG_H
 #  ifdef HAVE_CONFIG_H
@@ -321,10 +321,10 @@ static void kf_bfly5(
 static
 void compute_bitrev_table(
          int Fout,
-         opus_int16 *f,
+         oac_int16 *f,
          const size_t fstride,
          int in_stride,
-         opus_int16 * factors,
+         oac_int16 * factors,
          const kiss_fft_state *st
             )
 {
@@ -356,7 +356,7 @@ void compute_bitrev_table(
     p[i] * m[i] = m[i-1]
     m0 = n                  */
 static
-int kf_factor(int n,opus_int16 * facbuf)
+int kf_factor(int n,oac_int16 * facbuf)
 {
     int p=4;
     int i;
@@ -371,7 +371,7 @@ int kf_factor(int n,opus_int16 * facbuf)
                 case 2: p = 3; break;
                 default: p += 2; break;
             }
-            if (p>32000 || (opus_int32)p*(opus_int32)p > n)
+            if (p>32000 || (oac_int32)p*(oac_int32)p > n)
                 p = n;          /* no more factors, skip to end */
         }
         n /= p;
@@ -415,7 +415,7 @@ static void compute_twiddles(kiss_twiddle_cpx *twiddles, int nfft)
    int i;
 #ifdef FIXED_POINT
    for (i=0;i<nfft;++i) {
-      opus_val32 phase = -i;
+      oac_val32 phase = -i;
       twiddles[i].r = (int)MIN32(2147483647, floor(.5+2147483648*cos((2*M_PI/nfft)*phase)));
       twiddles[i].i = (int)MIN32(2147483647, floor(.5+2147483648*sin((2*M_PI/nfft)*phase)));
    }
@@ -428,7 +428,7 @@ static void compute_twiddles(kiss_twiddle_cpx *twiddles, int nfft)
 #endif
 }
 
-int opus_fft_alloc_arch_c(kiss_fft_state *st) {
+int oac_fft_alloc_arch_c(kiss_fft_state *st) {
    (void)st;
    return 0;
 }
@@ -439,7 +439,7 @@ int opus_fft_alloc_arch_c(kiss_fft_state *st) {
  * The return value is a contiguous block of memory.  As such,
  * It can be freed with free().
  * */
-kiss_fft_state *opus_fft_alloc_twiddles(int nfft,void * mem,size_t * lenmem,
+kiss_fft_state *oac_fft_alloc_twiddles(int nfft,void * mem,size_t * lenmem,
                                         const kiss_fft_state *base, int arch)
 {
     kiss_fft_state *st=NULL;
@@ -453,7 +453,7 @@ kiss_fft_state *opus_fft_alloc_twiddles(int nfft,void * mem,size_t * lenmem,
         *lenmem = memneeded;
     }
     if (st) {
-        opus_int16 *bitrev;
+        oac_int16 *bitrev;
         kiss_twiddle_cpx *twiddles;
 
         st->nfft=nfft;
@@ -462,7 +462,7 @@ kiss_fft_state *opus_fft_alloc_twiddles(int nfft,void * mem,size_t * lenmem,
         if (st->nfft == 1<<st->scale_shift)
            st->scale = QCONST32(1.0f, 30);
         else
-           st->scale = (((opus_int64)1073741824<<st->scale_shift)+st->nfft/2)/st->nfft;
+           st->scale = (((oac_int64)1073741824<<st->scale_shift)+st->nfft/2)/st->nfft;
 #else
         st->scale = 1.f/nfft;
 #endif
@@ -485,39 +485,39 @@ kiss_fft_state *opus_fft_alloc_twiddles(int nfft,void * mem,size_t * lenmem,
         }
 
         /* bitrev */
-        st->bitrev = bitrev = (opus_int16*)KISS_FFT_MALLOC(sizeof(opus_int16)*nfft);
+        st->bitrev = bitrev = (oac_int16*)KISS_FFT_MALLOC(sizeof(oac_int16)*nfft);
         if (st->bitrev==NULL)
             goto fail;
         compute_bitrev_table(0, bitrev, 1,1, st->factors,st);
 
         /* Initialize architecture specific fft parameters */
-        if (opus_fft_alloc_arch(st, arch))
+        if (oac_fft_alloc_arch(st, arch))
             goto fail;
     }
     return st;
 fail:
-    opus_fft_free(st, arch);
+    oac_fft_free(st, arch);
     return NULL;
 }
 
-kiss_fft_state *opus_fft_alloc(int nfft,void * mem,size_t * lenmem, int arch)
+kiss_fft_state *oac_fft_alloc(int nfft,void * mem,size_t * lenmem, int arch)
 {
-   return opus_fft_alloc_twiddles(nfft, mem, lenmem, NULL, arch);
+   return oac_fft_alloc_twiddles(nfft, mem, lenmem, NULL, arch);
 }
 
-void opus_fft_free_arch_c(kiss_fft_state *st) {
+void oac_fft_free_arch_c(kiss_fft_state *st) {
    (void)st;
 }
 
-void opus_fft_free(const kiss_fft_state *cfg, int arch)
+void oac_fft_free(const kiss_fft_state *cfg, int arch)
 {
    if (cfg)
    {
-      opus_fft_free_arch((kiss_fft_state *)cfg, arch);
-      opus_free((opus_int16*)cfg->bitrev);
+      oac_fft_free_arch((kiss_fft_state *)cfg, arch);
+      oac_free((oac_int16*)cfg->bitrev);
       if (cfg->shift < 0)
-         opus_free((kiss_twiddle_cpx*)cfg->twiddles);
-      opus_free((kiss_fft_state*)cfg);
+         oac_free((kiss_twiddle_cpx*)cfg->twiddles);
+      oac_free((kiss_fft_state*)cfg);
    }
 }
 
@@ -548,7 +548,7 @@ static void fft_downshift(kiss_fft_cpx *x, int N, int *total, int step) {
 #define fft_downshift(x, N, total, step)
 #endif
 
-void opus_fft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout ARG_FIXED(int downshift))
+void oac_fft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout ARG_FIXED(int downshift))
 {
     int m2, m;
     int p;
@@ -601,7 +601,7 @@ void opus_fft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout ARG_FIXED(int dow
     fft_downshift(fout, st->nfft, &downshift, downshift);
 }
 
-void opus_fft_c(const kiss_fft_state *st,const kiss_fft_cpx *fin,kiss_fft_cpx *fout)
+void oac_fft_c(const kiss_fft_state *st,const kiss_fft_cpx *fin,kiss_fft_cpx *fout)
 {
    int i;
    celt_coef scale;
@@ -620,11 +620,11 @@ void opus_fft_c(const kiss_fft_state *st,const kiss_fft_cpx *fin,kiss_fft_cpx *f
       fout[st->bitrev[i]].r = S_MUL2(x.r, scale);
       fout[st->bitrev[i]].i = S_MUL2(x.i, scale);
    }
-   opus_fft_impl(st, fout ARG_FIXED(scale_shift));
+   oac_fft_impl(st, fout ARG_FIXED(scale_shift));
 }
 
 
-void opus_ifft_c(const kiss_fft_state *st,const kiss_fft_cpx *fin,kiss_fft_cpx *fout)
+void oac_ifft_c(const kiss_fft_state *st,const kiss_fft_cpx *fin,kiss_fft_cpx *fout)
 {
    int i;
    celt_assert2 (fin != fout, "In-place FFT not supported");
@@ -633,7 +633,7 @@ void opus_ifft_c(const kiss_fft_state *st,const kiss_fft_cpx *fin,kiss_fft_cpx *
       fout[st->bitrev[i]] = fin[i];
    for (i=0;i<st->nfft;i++)
       fout[i].i = -fout[i].i;
-   opus_fft_impl(st, fout ARG_FIXED(0));
+   oac_fft_impl(st, fout ARG_FIXED(0));
    for (i=0;i<st->nfft;i++)
       fout[i].i = -fout[i].i;
 }
diff --git a/celt/kiss_fft.h b/celt/kiss_fft.h
index 52b9fc7cd..27c733d98 100644
--- a/celt/kiss_fft.h
+++ b/celt/kiss_fft.h
@@ -39,13 +39,13 @@
 # define kiss_fft_scalar __m128
 #define KISS_FFT_MALLOC(nbytes) memalign(16,nbytes)
 #else
-#define KISS_FFT_MALLOC opus_alloc
+#define KISS_FFT_MALLOC oac_alloc
 #endif
 
 #ifdef FIXED_POINT
 #include "arch.h"
 
-#  define kiss_fft_scalar opus_int32
+#  define kiss_fft_scalar oac_int32
 #  define COEF_SHIFT 32
 
 #  define kiss_twiddle_scalar celt_coef
@@ -53,7 +53,7 @@
 /* Some 32-bit CPUs would load/store a kiss_twiddle_cpx with a single memory
  * access, and could benefit from additional alignment.
  */
-#  define KISS_TWIDDLE_CPX_ALIGNMENT (sizeof(opus_int32))
+#  define KISS_TWIDDLE_CPX_ALIGNMENT (sizeof(oac_int32))
 
 #else
 
@@ -99,8 +99,8 @@ typedef struct kiss_fft_state{
     int scale_shift;
 #endif
     int shift;
-    opus_int16 factors[2*MAXFACTORS];
-    const opus_int16 *bitrev;
+    oac_int16 factors[2*MAXFACTORS];
+    const oac_int16 *bitrev;
     const kiss_twiddle_cpx *twiddles;
     arch_fft_state *arch_fft;
 } kiss_fft_state;
@@ -112,16 +112,16 @@ typedef struct kiss_fft_state{
 /*typedef struct kiss_fft_state* kiss_fft_cfg;*/
 
 /**
- *  opus_fft_alloc
+ *  oac_fft_alloc
  *
  *  Initialize a FFT (or IFFT) algorithm's cfg/state buffer.
  *
- *  typical usage:      kiss_fft_cfg mycfg=opus_fft_alloc(1024,0,NULL,NULL);
+ *  typical usage:      kiss_fft_cfg mycfg=oac_fft_alloc(1024,0,NULL,NULL);
  *
  *  The return value from fft_alloc is a cfg buffer used internally
  *  by the fft routine or NULL.
  *
- *  If lenmem is NULL, then opus_fft_alloc will allocate a cfg buffer using malloc.
+ *  If lenmem is NULL, then oac_fft_alloc will allocate a cfg buffer using malloc.
  *  The returned value should be free()d when done to avoid memory leaks.
  *
  *  The state can be placed in a user supplied buffer 'mem':
@@ -134,12 +134,12 @@ typedef struct kiss_fft_state{
  *      buffer size in *lenmem.
  * */
 
-kiss_fft_state *opus_fft_alloc_twiddles(int nfft,void * mem,size_t * lenmem, const kiss_fft_state *base, int arch);
+kiss_fft_state *oac_fft_alloc_twiddles(int nfft,void * mem,size_t * lenmem, const kiss_fft_state *base, int arch);
 
-kiss_fft_state *opus_fft_alloc(int nfft,void * mem,size_t * lenmem, int arch);
+kiss_fft_state *oac_fft_alloc(int nfft,void * mem,size_t * lenmem, int arch);
 
 /**
- * opus_fft(cfg,in_out_buf)
+ * oac_fft(cfg,in_out_buf)
  *
  * Perform an FFT on a complex input buffer.
  * for a forward FFT,
@@ -148,58 +148,58 @@ kiss_fft_state *opus_fft_alloc(int nfft,void * mem,size_t * lenmem, int arch);
  * Note that each element is complex and can be accessed like
     f[k].r and f[k].i
  * */
-void opus_fft_c(const kiss_fft_state *cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout);
-void opus_ifft_c(const kiss_fft_state *cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout);
+void oac_fft_c(const kiss_fft_state *cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout);
+void oac_ifft_c(const kiss_fft_state *cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout);
 
-void opus_fft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout ARG_FIXED(int downshift));
-void opus_ifft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout);
+void oac_fft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout ARG_FIXED(int downshift));
+void oac_ifft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout);
 
-void opus_fft_free(const kiss_fft_state *cfg, int arch);
+void oac_fft_free(const kiss_fft_state *cfg, int arch);
 
 
-void opus_fft_free_arch_c(kiss_fft_state *st);
-int opus_fft_alloc_arch_c(kiss_fft_state *st);
+void oac_fft_free_arch_c(kiss_fft_state *st);
+int oac_fft_alloc_arch_c(kiss_fft_state *st);
 
-#if !defined(OVERRIDE_OPUS_FFT)
+#if !defined(OVERRIDE_OAC_FFT)
 /* Is run-time CPU detection enabled on this platform? */
-#if defined(OPUS_HAVE_RTCD) && (defined(HAVE_ARM_NE10))
+#if defined(OAC_HAVE_RTCD) && (defined(HAVE_ARM_NE10))
 
-extern int (*const OPUS_FFT_ALLOC_ARCH_IMPL[OPUS_ARCHMASK+1])(
+extern int (*const OAC_FFT_ALLOC_ARCH_IMPL[OAC_ARCHMASK+1])(
  kiss_fft_state *st);
 
-#define opus_fft_alloc_arch(_st, arch) \
-         ((*OPUS_FFT_ALLOC_ARCH_IMPL[(arch)&OPUS_ARCHMASK])(_st))
+#define oac_fft_alloc_arch(_st, arch) \
+         ((*OAC_FFT_ALLOC_ARCH_IMPL[(arch)&OAC_ARCHMASK])(_st))
 
-extern void (*const OPUS_FFT_FREE_ARCH_IMPL[OPUS_ARCHMASK+1])(
+extern void (*const OAC_FFT_FREE_ARCH_IMPL[OAC_ARCHMASK+1])(
  kiss_fft_state *st);
-#define opus_fft_free_arch(_st, arch) \
-         ((*OPUS_FFT_FREE_ARCH_IMPL[(arch)&OPUS_ARCHMASK])(_st))
+#define oac_fft_free_arch(_st, arch) \
+         ((*OAC_FFT_FREE_ARCH_IMPL[(arch)&OAC_ARCHMASK])(_st))
 
-extern void (*const OPUS_FFT[OPUS_ARCHMASK+1])(const kiss_fft_state *cfg,
+extern void (*const OAC_FFT[OAC_ARCHMASK+1])(const kiss_fft_state *cfg,
  const kiss_fft_cpx *fin, kiss_fft_cpx *fout);
-#define opus_fft(_cfg, _fin, _fout, arch) \
-   ((*OPUS_FFT[(arch)&OPUS_ARCHMASK])(_cfg, _fin, _fout))
+#define oac_fft(_cfg, _fin, _fout, arch) \
+   ((*OAC_FFT[(arch)&OAC_ARCHMASK])(_cfg, _fin, _fout))
 
-extern void (*const OPUS_IFFT[OPUS_ARCHMASK+1])(const kiss_fft_state *cfg,
+extern void (*const OAC_IFFT[OAC_ARCHMASK+1])(const kiss_fft_state *cfg,
  const kiss_fft_cpx *fin, kiss_fft_cpx *fout);
-#define opus_ifft(_cfg, _fin, _fout, arch) \
-   ((*OPUS_IFFT[(arch)&OPUS_ARCHMASK])(_cfg, _fin, _fout))
+#define oac_ifft(_cfg, _fin, _fout, arch) \
+   ((*OAC_IFFT[(arch)&OAC_ARCHMASK])(_cfg, _fin, _fout))
 
-#else /* else for if defined(OPUS_HAVE_RTCD) && (defined(HAVE_ARM_NE10)) */
+#else /* else for if defined(OAC_HAVE_RTCD) && (defined(HAVE_ARM_NE10)) */
 
-#define opus_fft_alloc_arch(_st, arch) \
-         ((void)(arch), opus_fft_alloc_arch_c(_st))
+#define oac_fft_alloc_arch(_st, arch) \
+         ((void)(arch), oac_fft_alloc_arch_c(_st))
 
-#define opus_fft_free_arch(_st, arch) \
-         ((void)(arch), opus_fft_free_arch_c(_st))
+#define oac_fft_free_arch(_st, arch) \
+         ((void)(arch), oac_fft_free_arch_c(_st))
 
-#define opus_fft(_cfg, _fin, _fout, arch) \
-         ((void)(arch), opus_fft_c(_cfg, _fin, _fout))
+#define oac_fft(_cfg, _fin, _fout, arch) \
+         ((void)(arch), oac_fft_c(_cfg, _fin, _fout))
 
-#define opus_ifft(_cfg, _fin, _fout, arch) \
-         ((void)(arch), opus_ifft_c(_cfg, _fin, _fout))
+#define oac_ifft(_cfg, _fin, _fout, arch) \
+         ((void)(arch), oac_ifft_c(_cfg, _fin, _fout))
 
-#endif /* end if defined(OPUS_HAVE_RTCD) && (defined(HAVE_ARM_NE10)) */
-#endif /* end if !defined(OVERRIDE_OPUS_FFT) */
+#endif /* end if defined(OAC_HAVE_RTCD) && (defined(HAVE_ARM_NE10)) */
+#endif /* end if !defined(OVERRIDE_OAC_FFT) */
 
 #endif
diff --git a/celt/laplace.c b/celt/laplace.c
index 218096666..0bca53779 100644
--- a/celt/laplace.c
+++ b/celt/laplace.c
@@ -45,7 +45,7 @@ static unsigned ec_laplace_get_freq1(unsigned fs0, int decay)
 {
    unsigned ft;
    ft = 32768 - LAPLACE_MINP*(2*LAPLACE_NMIN) - fs0;
-   return ft*(opus_int32)(16384-decay)>>15;
+   return ft*(oac_int32)(16384-decay)>>15;
 }
 
 void ec_laplace_encode(ec_enc *enc, int *value, unsigned fs, int decay)
@@ -66,7 +66,7 @@ void ec_laplace_encode(ec_enc *enc, int *value, unsigned fs, int decay)
       {
          fs *= 2;
          fl += fs+2*LAPLACE_MINP;
-         fs = (fs*(opus_int32)decay)>>15;
+         fs = (fs*(oac_int32)decay)>>15;
       }
       /* Everything beyond that has probability LAPLACE_MINP. */
       if (!fs)
@@ -108,7 +108,7 @@ int ec_laplace_decode(ec_dec *dec, unsigned fs, int decay)
       {
          fs *= 2;
          fl += fs;
-         fs = ((fs-2*LAPLACE_MINP)*(opus_int32)decay)>>15;
+         fs = ((fs-2*LAPLACE_MINP)*(oac_int32)decay)>>15;
          fs += LAPLACE_MINP;
          val++;
       }
@@ -133,10 +133,10 @@ int ec_laplace_decode(ec_dec *dec, unsigned fs, int decay)
    return val;
 }
 
-void ec_laplace_encode_p0(ec_enc *enc, int value, opus_uint16 p0, opus_uint16 decay)
+void ec_laplace_encode_p0(ec_enc *enc, int value, oac_uint16 p0, oac_uint16 decay)
 {
    int s;
-   opus_uint16 sign_icdf[3];
+   oac_uint16 sign_icdf[3];
    sign_icdf[0] = 32768-p0;
    sign_icdf[1] = sign_icdf[0]/2;
    sign_icdf[2] = 0;
@@ -146,11 +146,11 @@ void ec_laplace_encode_p0(ec_enc *enc, int value, opus_uint16 p0, opus_uint16 de
    if (value)
    {
       int i;
-      opus_uint16 icdf[8];
+      oac_uint16 icdf[8];
       icdf[0] = IMAX(7, decay);
       for (i=1;i<7;i++)
       {
-         icdf[i] = IMAX(7-i, (icdf[i-1] * (opus_int32)decay) >> 15);
+         icdf[i] = IMAX(7-i, (icdf[i-1] * (oac_int32)decay) >> 15);
       }
       icdf[7] = 0;
       value--;
@@ -161,11 +161,11 @@ void ec_laplace_encode_p0(ec_enc *enc, int value, opus_uint16 p0, opus_uint16 de
    }
 }
 
-int ec_laplace_decode_p0(ec_dec *dec, opus_uint16 p0, opus_uint16 decay)
+int ec_laplace_decode_p0(ec_dec *dec, oac_uint16 p0, oac_uint16 decay)
 {
    int s;
    int value;
-   opus_uint16 sign_icdf[3];
+   oac_uint16 sign_icdf[3];
    sign_icdf[0] = 32768-p0;
    sign_icdf[1] = sign_icdf[0]/2;
    sign_icdf[2] = 0;
@@ -175,11 +175,11 @@ int ec_laplace_decode_p0(ec_dec *dec, opus_uint16 p0, opus_uint16 decay)
    {
       int i;
       int v;
-      opus_uint16 icdf[8];
+      oac_uint16 icdf[8];
       icdf[0] = IMAX(7, decay);
       for (i=1;i<7;i++)
       {
-         icdf[i] = IMAX(7-i, (icdf[i-1] * (opus_int32)decay) >> 15);
+         icdf[i] = IMAX(7-i, (icdf[i-1] * (oac_int32)decay) >> 15);
       }
       icdf[7] = 0;
       value = 1;
diff --git a/celt/laplace.h b/celt/laplace.h
index 8010ad975..3245a00aa 100644
--- a/celt/laplace.h
+++ b/celt/laplace.h
@@ -51,7 +51,7 @@ void ec_laplace_encode(ec_enc *enc, int *value, unsigned fs, int decay);
 int ec_laplace_decode(ec_dec *dec, unsigned fs, int decay);
 
 
-int ec_laplace_decode_p0(ec_dec *dec, opus_uint16 p0, opus_uint16 decay);
-void ec_laplace_encode_p0(ec_enc *enc, int value, opus_uint16 p0, opus_uint16 decay);
+int ec_laplace_decode_p0(ec_dec *dec, oac_uint16 p0, oac_uint16 decay);
+void ec_laplace_encode_p0(ec_enc *enc, int value, oac_uint16 p0, oac_uint16 decay);
 
 #endif
diff --git a/celt/mathops.c b/celt/mathops.c
index dbb3761e6..5d23b3988 100644
--- a/celt/mathops.c
+++ b/celt/mathops.c
@@ -42,7 +42,7 @@
 /*Compute floor(sqrt(_val)) with exact arithmetic.
   _val must be greater than 0.
   This has been tested on all possible 32-bit inputs greater than 0.*/
-unsigned isqrt32(opus_uint32 _val){
+unsigned isqrt32(oac_uint32 _val){
   unsigned b;
   unsigned g;
   int      bshift;
@@ -54,8 +54,8 @@ unsigned isqrt32(opus_uint32 _val){
   bshift=(EC_ILOG(_val)-1)>>1;
   b=1U<<bshift;
   do{
-    opus_uint32 t;
-    t=(((opus_uint32)g<<1)+b)<<bshift;
+    oac_uint32 t;
+    t=(((oac_uint32)g<<1)+b)<<bshift;
     if(t<=_val){
       g+=b;
       _val-=t;
@@ -69,10 +69,10 @@ unsigned isqrt32(opus_uint32 _val){
 
 #ifdef FIXED_POINT
 
-opus_val32 frac_div32_q29(opus_val32 a, opus_val32 b)
+oac_val32 frac_div32_q29(oac_val32 a, oac_val32 b)
 {
-   opus_val16 rcp;
-   opus_val32 result, rem;
+   oac_val16 rcp;
+   oac_val32 result, rem;
    int shift = celt_ilog2(b)-29;
    a = VSHR32(a,shift);
    b = VSHR32(b,shift);
@@ -84,8 +84,8 @@ opus_val32 frac_div32_q29(opus_val32 a, opus_val32 b)
    return result;
 }
 
-opus_val32 frac_div32(opus_val32 a, opus_val32 b) {
-   opus_val32 result = frac_div32_q29(a,b);
+oac_val32 frac_div32(oac_val32 a, oac_val32 b) {
+   oac_val32 result = frac_div32_q29(a,b);
    if (result >= 536870912)       /*  2^29 */
       return 2147483647;          /*  2^31 - 1 */
    else if (result <= -536870912) /* -2^29 */
@@ -95,12 +95,12 @@ opus_val32 frac_div32(opus_val32 a, opus_val32 b) {
 }
 
 /** Reciprocal sqrt approximation in the range [0.25,1) (Q16 in, Q14 out) */
-opus_val16 celt_rsqrt_norm(opus_val32 x)
+oac_val16 celt_rsqrt_norm(oac_val32 x)
 {
-   opus_val16 n;
-   opus_val16 r;
-   opus_val16 r2;
-   opus_val16 y;
+   oac_val16 n;
+   oac_val16 r;
+   oac_val16 r2;
+   oac_val16 y;
    /* Range of n is [-16384,32767] ([-0.5,1) in Q15). */
    n = x-32768;
    /* Get a rough initial guess for the root.
@@ -123,12 +123,12 @@ opus_val16 celt_rsqrt_norm(opus_val32 x)
 }
 
 /** Reciprocal sqrt approximation in the range [0.25,1) (Q31 in, Q29 out) */
-opus_val32 celt_rsqrt_norm32(opus_val32 x)
+oac_val32 celt_rsqrt_norm32(oac_val32 x)
 {
-   opus_int32 tmp;
+   oac_int32 tmp;
    /* Use the first-order Newton-Raphson method to refine the root estimate.
     * r = r * (1.5 - 0.5*x*r*r) */
-   opus_int32 r_q29 = SHL32(celt_rsqrt_norm(SHR32(x, 31-16)), 15);
+   oac_int32 r_q29 = SHL32(celt_rsqrt_norm(SHR32(x, 31-16)), 15);
    /* Split evaluation in steps to avoid exploding macro expansion. */
    tmp = MULT32_32_Q31(r_q29, r_q29);
    tmp = MULT32_32_Q31(1073741824 /* Q31 */, tmp);
@@ -137,15 +137,15 @@ opus_val32 celt_rsqrt_norm32(opus_val32 x)
 }
 
 /** Sqrt approximation (QX input, QX/2 output) */
-opus_val32 celt_sqrt(opus_val32 x)
+oac_val32 celt_sqrt(oac_val32 x)
 {
    int k;
-   opus_val16 n;
-   opus_val32 rt;
+   oac_val16 n;
+   oac_val32 rt;
    /* These coeffs are optimized in fixed-point to minimize both RMS and max error
       of sqrt(x) over .25<x<1 without exceeding 32767.
       The RMS error is 3.4e-5 and the max is 8.2e-5. */
-   static const opus_val16 C[6] = {23171, 11574, -2901, 1592, -1002, 336};
+   static const oac_val16 C[6] = {23171, 11574, -2901, 1592, -1002, 336};
    if (x==0)
       return 0;
    else if (x>=1073741824)
@@ -161,10 +161,10 @@ opus_val32 celt_sqrt(opus_val32 x)
 
 /* Perform fixed-point arithmetic to approximate the square root. When the input
  * is in Qx format, the output will be in Q(x/2 + 16) format. */
-opus_val32 celt_sqrt32(opus_val32 x)
+oac_val32 celt_sqrt32(oac_val32 x)
 {
    int k;
-   opus_int32 x_frac;
+   oac_int32 x_frac;
    if (x==0)
       return 0;
    else if (x>=1073741824)
@@ -181,9 +181,9 @@ opus_val32 celt_sqrt32(opus_val32 x)
 #define L3 8277
 #define L4 -626
 
-static OPUS_INLINE opus_val16 _celt_cos_pi_2(opus_val16 x)
+static OAC_INLINE oac_val16 _celt_cos_pi_2(oac_val16 x)
 {
-   opus_val16 x2;
+   oac_val16 x2;
 
    x2 = MULT16_16_P15(x,x);
    return ADD16(1,MIN16(32766,ADD32(SUB16(L1,x2), MULT16_16_P15(x2, ADD32(L2, MULT16_16_P15(x2, ADD32(L3, MULT16_16_P15(L4, x2
@@ -195,7 +195,7 @@ static OPUS_INLINE opus_val16 _celt_cos_pi_2(opus_val16 x)
 #undef L3
 #undef L4
 
-opus_val16 celt_cos_norm(opus_val32 x)
+oac_val16 celt_cos_norm(oac_val32 x)
 {
    x = x&0x0001ffff;
    if (x>SHL32(EXTEND32(1), 16))
@@ -220,14 +220,14 @@ opus_val16 celt_cos_norm(opus_val32 x)
 
 /* Calculates the cosine of (PI*0.5*x) where the input x ranges from -1 to 1 and
  * is in Q30 format. The output will also be in Q31 format. */
-opus_val32 celt_cos_norm32(opus_val32 x)
+oac_val32 celt_cos_norm32(oac_val32 x)
 {
-   static const opus_val32 COS_NORM_COEFF_A0 = 134217720;   /* Q27 */
-   static const opus_val32 COS_NORM_COEFF_A1 = -662336704;  /* Q29 */
-   static const opus_val32 COS_NORM_COEFF_A2 = 544710848;   /* Q31 */
-   static const opus_val32 COS_NORM_COEFF_A3 = -178761936;  /* Q33 */
-   static const opus_val32 COS_NORM_COEFF_A4 = 29487206;    /* Q35 */
-   opus_int32 x_sq_q29, tmp;
+   static const oac_val32 COS_NORM_COEFF_A0 = 134217720;   /* Q27 */
+   static const oac_val32 COS_NORM_COEFF_A1 = -662336704;  /* Q29 */
+   static const oac_val32 COS_NORM_COEFF_A2 = 544710848;   /* Q31 */
+   static const oac_val32 COS_NORM_COEFF_A3 = -178761936;  /* Q33 */
+   static const oac_val32 COS_NORM_COEFF_A4 = 29487206;    /* Q35 */
+   oac_int32 x_sq_q29, tmp;
    /* The expected x is in the range of [-1.0f, 1.0f] */
    celt_sig_assert((x >= -1073741824) && (x <= 1073741824));
    /* Make cos(+/- pi/2) exactly zero. */
@@ -242,9 +242,9 @@ opus_val32 celt_cos_norm32(opus_val32 x)
 
 /* Computes a 16 bit approximate reciprocal (1/x) for a normalized Q15 input,
  * resulting in a Q15 output. */
-opus_val16 celt_rcp_norm16(opus_val16 x)
+oac_val16 celt_rcp_norm16(oac_val16 x)
 {
-   opus_val16 r;
+   oac_val16 r;
    /* Start with a linear approximation:
       r = 1.8823529411764706-0.9411764705882353*n.
       The coefficients and the result are Q14 in the range [15420,30840].*/
@@ -263,9 +263,9 @@ opus_val16 celt_rcp_norm16(opus_val16 x)
 /* Computes a 32 bit approximated reciprocal (1/x) for a normalized Q31 input,
  * resulting in a Q30 output. The expected input range is [0.5f, 1.0f) in Q31
  * and the expected output range is [1.0f, 2.0f) in Q30. */
-opus_val32 celt_rcp_norm32(opus_val32 x)
+oac_val32 celt_rcp_norm32(oac_val32 x)
 {
-   opus_val32 r_q30;
+   oac_val32 r_q30;
    celt_sig_assert(x >= 1073741824);
    r_q30 = SHL32(EXTEND32(celt_rcp_norm16(SHR32(x, 15)-32768)), 16);
    /* Solving f(y) = a - 1/y using the Newton Method
@@ -284,10 +284,10 @@ opus_val32 celt_rcp_norm32(opus_val32 x)
 }
 
 /** Reciprocal approximation (Q15 input, Q16 output) */
-opus_val32 celt_rcp(opus_val32 x)
+oac_val32 celt_rcp(oac_val32 x)
 {
    int i;
-   opus_val16 r;
+   oac_val16 r;
    celt_sig_assert(x>0);
    i = celt_ilog2(x);
 
@@ -304,7 +304,7 @@ opus_val32 celt_rcp(opus_val32 x)
 
 #ifndef DISABLE_FLOAT_API
 
-void celt_float2int16_c(const float * OPUS_RESTRICT in, short * OPUS_RESTRICT out, int cnt)
+void celt_float2int16_c(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt)
 {
    int i;
    for (i = 0; i < cnt; i++)
@@ -313,7 +313,7 @@ void celt_float2int16_c(const float * OPUS_RESTRICT in, short * OPUS_RESTRICT ou
    }
 }
 
-int opus_limit2_checkwithin1_c(float * samples, int cnt)
+int oac_limit2_checkwithin1_c(float * samples, int cnt)
 {
    int i;
    if (cnt <= 0)
diff --git a/celt/mathops.h b/celt/mathops.h
index 120e2652d..f1e0ae629 100644
--- a/celt/mathops.h
+++ b/celt/mathops.h
@@ -40,16 +40,16 @@
 #include "os_support.h"
 
 
-#if defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+#if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 #include "arm/mathops_arm.h"
 #endif
 
 #define PI 3.1415926535897931
 
 /* Multiplies two 16-bit fractional values. Bit-exactness of this macro is important */
-#define FRAC_MUL16(a,b) ((16384+((opus_int32)(opus_int16)(a)*(opus_int16)(b)))>>15)
+#define FRAC_MUL16(a,b) ((16384+((oac_int32)(oac_int16)(a)*(oac_int16)(b)))>>15)
 
-unsigned isqrt32(opus_uint32 _val);
+unsigned isqrt32(oac_uint32 _val);
 
 /* CELT doesn't need it for fixed-point, by analysis.c does. */
 #if !defined(FIXED_POINT) || defined(ANALYSIS_C)
@@ -57,7 +57,7 @@ unsigned isqrt32(opus_uint32 _val);
 #define cB 0.67848403f
 #define cC 0.08595542f
 #define cE ((float)PI/2)
-static OPUS_INLINE float fast_atan2f(float y, float x) {
+static OAC_INLINE float fast_atan2f(float y, float x) {
    float x2, y2;
    x2 = x*x;
    y2 = y*y;
@@ -83,11 +83,11 @@ static OPUS_INLINE float fast_atan2f(float y, float x) {
 
 
 #ifndef OVERRIDE_CELT_MAXABS16
-static OPUS_INLINE opus_val32 celt_maxabs16(const opus_val16 *x, int len)
+static OAC_INLINE oac_val32 celt_maxabs16(const oac_val16 *x, int len)
 {
    int i;
-   opus_val16 maxval = 0;
-   opus_val16 minval = 0;
+   oac_val16 maxval = 0;
+   oac_val16 minval = 0;
    for (i=0;i<len;i++)
    {
       maxval = MAX16(maxval, x[i]);
@@ -98,17 +98,17 @@ static OPUS_INLINE opus_val32 celt_maxabs16(const opus_val16 *x, int len)
 #endif
 
 #if defined(FIXED_POINT)
-static OPUS_INLINE opus_res celt_maxabs_res(const opus_res *x, int len)
+static OAC_INLINE oac_res celt_maxabs_res(const oac_res *x, int len)
 {
    int i;
-   opus_res maxval = 0;
-   opus_res minval = 0;
+   oac_res maxval = 0;
+   oac_res minval = 0;
    for (i=0;i<len;i++)
    {
       maxval = MAX32(maxval, x[i]);
       minval = MIN32(minval, x[i]);
    }
-   /* opus_res should never reach such amplitude, so we should be safe. */
+   /* oac_res should never reach such amplitude, so we should be safe. */
    celt_sig_assert(minval != -2147483648);
    return MAX32(maxval,-minval);
 }
@@ -119,11 +119,11 @@ static OPUS_INLINE opus_res celt_maxabs_res(const opus_res *x, int len)
 
 #ifndef OVERRIDE_CELT_MAXABS32
 #ifdef FIXED_POINT
-static OPUS_INLINE opus_val32 celt_maxabs32(const opus_val32 *x, int len)
+static OAC_INLINE oac_val32 celt_maxabs32(const oac_val32 *x, int len)
 {
    int i;
-   opus_val32 maxval = 0;
-   opus_val32 minval = 0;
+   oac_val32 maxval = 0;
+   oac_val32 minval = 0;
    for (i=0;i<len;i++)
    {
       maxval = MAX32(maxval, x[i]);
@@ -139,7 +139,7 @@ static OPUS_INLINE opus_val32 celt_maxabs32(const opus_val32 *x, int len)
 #ifndef FIXED_POINT
 /* Calculates the arctangent of x using a Remez approximation of order 15,
  * incorporating only odd-powered terms. */
-static OPUS_INLINE float celt_atan_norm(float x)
+static OAC_INLINE float celt_atan_norm(float x)
 {
    #define ATAN2_2_OVER_PI 0.636619772367581f
    float x_sq = x * x;
@@ -167,7 +167,7 @@ static OPUS_INLINE float celt_atan_norm(float x)
 /* Calculates the arctangent of y/x, returning an approximate value in radians.
  * Please refer to the linked wiki page (https://en.wikipedia.org/wiki/Atan2)
  * to learn how atan2 results are computed. */
-static OPUS_INLINE float celt_atan2p_norm(float y, float x)
+static OAC_INLINE float celt_atan2p_norm(float y, float x)
 {
    celt_sig_assert(x>=0 && y>=0);
 
@@ -189,7 +189,7 @@ static OPUS_INLINE float celt_atan2p_norm(float y, float x)
 #if !defined(FIXED_POINT)
 /* Computes estimated cosine values for (PI/2 * x) using only terms with even
  * exponents. */
-static OPUS_INLINE float celt_cos_norm2(float x)
+static OAC_INLINE float celt_cos_norm2(float x)
 {
    float x_norm_sq;
    int output_sign;
@@ -269,17 +269,17 @@ static const float log2_y_norm_coeff[8] = {
    5.849624872207641601562500e-01f, 7.004396915435791015625000e-01f,
    8.073549270629882812500000e-01f, 9.068905711174011230468750e-01f};
 
-static OPUS_INLINE float celt_log2(float x)
+static OAC_INLINE float celt_log2(float x)
 {
-   opus_int32 integer;
-   opus_int32 range_idx;
+   oac_int32 integer;
+   oac_int32 range_idx;
    union {
       float f;
-      opus_uint32 i;
+      oac_uint32 i;
    } in;
    in.f = x;
-   integer = (opus_int32)(in.i>>23)-127;
-   in.i = (opus_int32)in.i - (opus_int32)((opus_uint32)integer<<23);
+   integer = (oac_int32)(in.i>>23)-127;
+   in.i = (oac_int32)in.i - (oac_int32)((oac_uint32)integer<<23);
 
    /* Normalize the mantissa range from [1, 2] to [1,1.125], and then shift x
     * by 1.0625 to [-0.0625, 0.0625]. */
@@ -310,13 +310,13 @@ static OPUS_INLINE float celt_log2(float x)
  * of order 5, ensuring a controlled relative error.
  * exp2(x) = exp2(integer + fraction)
  *         = exp2(integer) * exp2(fraction) */
-static OPUS_INLINE float celt_exp2(float x)
+static OAC_INLINE float celt_exp2(float x)
 {
-   opus_int32 integer;
+   oac_int32 integer;
    float frac;
    union {
       float f;
-      opus_uint32 i;
+      oac_uint32 i;
    } res;
    integer = (int)floor(x);
    if (integer < -50)
@@ -338,7 +338,7 @@ static OPUS_INLINE float celt_exp2(float x)
                + frac * (EXP2_COEFF_A3
                + frac * (EXP2_COEFF_A4
                + frac * (EXP2_COEFF_A5)))));
-   res.i = (opus_uint32)((opus_int32)res.i + (opus_int32)((opus_uint32)integer<<23)) & 0x7fffffff;
+   res.i = (oac_uint32)((oac_int32)res.i + (oac_int32)((oac_uint32)integer<<23)) & 0x7fffffff;
    return res.f;
 }
 
@@ -362,7 +362,7 @@ static OPUS_INLINE float celt_exp2(float x)
 
 #ifndef OVERRIDE_CELT_ILOG2
 /** Integer log in base2. Undefined for zero and negative numbers */
-static OPUS_INLINE opus_int16 celt_ilog2(opus_int32 x)
+static OAC_INLINE oac_int16 celt_ilog2(oac_int32 x)
 {
    celt_sig_assert(x>0);
    return EC_ILOG(x)-1;
@@ -371,31 +371,31 @@ static OPUS_INLINE opus_int16 celt_ilog2(opus_int32 x)
 
 
 /** Integer log in base2. Defined for zero, but not for negative numbers */
-static OPUS_INLINE opus_int16 celt_zlog2(opus_val32 x)
+static OAC_INLINE oac_int16 celt_zlog2(oac_val32 x)
 {
    return x <= 0 ? 0 : celt_ilog2(x);
 }
 
-opus_val16 celt_rsqrt_norm(opus_val32 x);
+oac_val16 celt_rsqrt_norm(oac_val32 x);
 
-opus_val32 celt_rsqrt_norm32(opus_val32 x);
+oac_val32 celt_rsqrt_norm32(oac_val32 x);
 
-opus_val32 celt_sqrt(opus_val32 x);
+oac_val32 celt_sqrt(oac_val32 x);
 
-opus_val32 celt_sqrt32(opus_val32 x);
+oac_val32 celt_sqrt32(oac_val32 x);
 
-opus_val16 celt_cos_norm(opus_val32 x);
+oac_val16 celt_cos_norm(oac_val32 x);
 
-opus_val32 celt_cos_norm32(opus_val32 x);
+oac_val32 celt_cos_norm32(oac_val32 x);
 
 /** Base-2 logarithm approximation (log2(x)). (Q14 input, Q10 output) */
-static OPUS_INLINE opus_val16 celt_log2(opus_val32 x)
+static OAC_INLINE oac_val16 celt_log2(oac_val32 x)
 {
    int i;
-   opus_val16 n, frac;
+   oac_val16 n, frac;
    /* -0.41509302963303146, 0.9609890551383969, -0.31836011537636605,
        0.15530808010959576, -0.08556153059057618 */
-   static const opus_val16 C[5] = {-6801+(1<<(13-10)), 15746, -5217, 2545, -1401};
+   static const oac_val16 C[5] = {-6801+(1<<(13-10)), 15746, -5217, 2545, -1401};
    if (x==0)
       return -32767;
    i = celt_ilog2(x);
@@ -415,9 +415,9 @@ static OPUS_INLINE opus_val16 celt_log2(opus_val32 x)
 #define D2 14819
 #define D3 10204
 
-static OPUS_INLINE opus_val32 celt_exp2_frac(opus_val16 x)
+static OAC_INLINE oac_val32 celt_exp2_frac(oac_val16 x)
 {
-   opus_val16 frac;
+   oac_val16 frac;
    frac = SHL16(x, 4);
    return ADD16(D0, MULT16_16_Q15(frac, ADD16(D1, MULT16_16_Q15(frac, ADD16(D2 , MULT16_16_Q15(D3,frac))))));
 }
@@ -428,10 +428,10 @@ static OPUS_INLINE opus_val32 celt_exp2_frac(opus_val16 x)
 #undef D3
 
 /** Base-2 exponential approximation (2^x). (Q10 input, Q16 output) */
-static OPUS_INLINE opus_val32 celt_exp2(opus_val16 x)
+static OAC_INLINE oac_val32 celt_exp2(oac_val16 x)
 {
    int integer;
-   opus_val16 frac;
+   oac_val16 frac;
    integer = SHR16(x,10);
    if (integer>14)
       return 0x7f000000;
@@ -443,23 +443,23 @@ static OPUS_INLINE opus_val32 celt_exp2(opus_val16 x)
 
 /* Calculates the base-2 logarithm of a Q14 input value. The result is returned
  * in Q(DB_SHIFT). If the input value is 0, the function will output -32.0f. */
-static OPUS_INLINE opus_val32 celt_log2_db(opus_val32 x) {
+static OAC_INLINE oac_val32 celt_log2_db(oac_val32 x) {
    /* Q30 */
-   static const opus_val32 log2_x_norm_coeff[8] = {
+   static const oac_val32 log2_x_norm_coeff[8] = {
       1073741824, 954437184, 858993472, 780903168,
       715827904,  660764224, 613566784, 572662336};
    /* Q24 */
-   static const opus_val32 log2_y_norm_coeff[8] = {
+   static const oac_val32 log2_y_norm_coeff[8] = {
       0,       2850868,  5401057,  7707983,
       9814042, 11751428, 13545168, 15215099};
-   static const opus_val32 LOG2_COEFF_A0 = 1467383;     /* Q24 */
-   static const opus_val32 LOG2_COEFF_A1 = 182244800;   /* Q27 */
-   static const opus_val32 LOG2_COEFF_A2 = -21440512;   /* Q25 */
-   static const opus_val32 LOG2_COEFF_A3 = 107903336;   /* Q28 */
-   static const opus_val32 LOG2_COEFF_A4 = -610217024;  /* Q31 */
-
-   opus_int32 integer, norm_coeff_idx, tmp;
-   opus_val32 mantissa;
+   static const oac_val32 LOG2_COEFF_A0 = 1467383;     /* Q24 */
+   static const oac_val32 LOG2_COEFF_A1 = 182244800;   /* Q27 */
+   static const oac_val32 LOG2_COEFF_A2 = -21440512;   /* Q25 */
+   static const oac_val32 LOG2_COEFF_A3 = 107903336;   /* Q28 */
+   static const oac_val32 LOG2_COEFF_A4 = -610217024;  /* Q31 */
+
+   oac_int32 integer, norm_coeff_idx, tmp;
+   oac_val32 mantissa;
    if (x==0) {
       return -536870912; /* -32.0f */
    }
@@ -488,18 +488,18 @@ static OPUS_INLINE opus_val32 celt_log2_db(opus_val32 x) {
 
 /* Calculates exp2 for Q28 within a specific range (0 to 1.0) using fixed-point
  * arithmetic. The input number must be adjusted for Q DB_SHIFT. */
-static OPUS_INLINE opus_val32 celt_exp2_db_frac(opus_val32 x)
+static OAC_INLINE oac_val32 celt_exp2_db_frac(oac_val32 x)
 {
    /* Approximation constants. */
-   static const opus_int32 EXP2_COEFF_A0 = 268435440;   /* Q28 */
-   static const opus_int32 EXP2_COEFF_A1 = 744267456;   /* Q30 */
-   static const opus_int32 EXP2_COEFF_A2 = 1031451904;  /* Q32 */
-   static const opus_int32 EXP2_COEFF_A3 = 959088832;   /* Q34 */
-   static const opus_int32 EXP2_COEFF_A4 = 617742720;   /* Q36 */
-   static const opus_int32 EXP2_COEFF_A5 = 516104352;   /* Q38 */
-   opus_int32 tmp;
+   static const oac_int32 EXP2_COEFF_A0 = 268435440;   /* Q28 */
+   static const oac_int32 EXP2_COEFF_A1 = 744267456;   /* Q30 */
+   static const oac_int32 EXP2_COEFF_A2 = 1031451904;  /* Q32 */
+   static const oac_int32 EXP2_COEFF_A3 = 959088832;   /* Q34 */
+   static const oac_int32 EXP2_COEFF_A4 = 617742720;   /* Q36 */
+   static const oac_int32 EXP2_COEFF_A5 = 516104352;   /* Q38 */
+   oac_int32 tmp;
    /* Converts input value from Q24 to Q29. */
-   opus_val32 x_q29 = SHL32(x, 29 - 24);
+   oac_val32 x_q29 = SHL32(x, 29 - 24);
    /* Split evaluation in steps to avoid exploding macro expansion. */
    tmp = ADD32(EXP2_COEFF_A4, MULT32_32_Q31(x_q29, EXP2_COEFF_A5));
    tmp = ADD32(EXP2_COEFF_A3, MULT32_32_Q31(x_q29, tmp));
@@ -510,10 +510,10 @@ static OPUS_INLINE opus_val32 celt_exp2_db_frac(opus_val32 x)
 
 /* Calculates exp2 for Q16 using fixed-point arithmetic. The input number must
  * be adjusted for Q DB_SHIFT. */
-static OPUS_INLINE opus_val32 celt_exp2_db(opus_val32 x)
+static OAC_INLINE oac_val32 celt_exp2_db(oac_val32 x)
 {
    int integer;
-   opus_val32 frac;
+   oac_val32 frac;
    integer = SHR32(x,DB_SHIFT);
    if (integer>14)
       return 0x7f000000;
@@ -525,31 +525,31 @@ static OPUS_INLINE opus_val32 celt_exp2_db(opus_val32 x)
 
 
 
-opus_val32 celt_rcp(opus_val32 x);
-opus_val32 celt_rcp_norm32(opus_val32 x);
+oac_val32 celt_rcp(oac_val32 x);
+oac_val32 celt_rcp_norm32(oac_val32 x);
 
-#define celt_div(a,b) MULT32_32_Q31((opus_val32)(a),celt_rcp(b))
+#define celt_div(a,b) MULT32_32_Q31((oac_val32)(a),celt_rcp(b))
 
-opus_val32 frac_div32_q29(opus_val32 a, opus_val32 b);
-opus_val32 frac_div32(opus_val32 a, opus_val32 b);
+oac_val32 frac_div32_q29(oac_val32 a, oac_val32 b);
+oac_val32 frac_div32(oac_val32 a, oac_val32 b);
 
 /* Computes atan(x) multiplied by 2/PI. The input value (x) should be within the
  * range of -1 to 1 and represented in Q30 format. The function will return the
  * result in Q30 format. */
-static OPUS_INLINE opus_val32 celt_atan_norm(opus_val32 x)
+static OAC_INLINE oac_val32 celt_atan_norm(oac_val32 x)
 {
    /* Approximation constants. */
-   static const opus_int32 ATAN_2_OVER_PI = 1367130551;   /* Q31 */
-   static const opus_int32 ATAN_COEFF_A03 = -715791936;   /* Q31 */
-   static const opus_int32 ATAN_COEFF_A05 = 857391616;    /* Q32 */
-   static const opus_int32 ATAN_COEFF_A07 = -1200579328;  /* Q33 */
-   static const opus_int32 ATAN_COEFF_A09 = 1682636672;   /* Q34 */
-   static const opus_int32 ATAN_COEFF_A11 = -1985085440;  /* Q35 */
-   static const opus_int32 ATAN_COEFF_A13 = 1583306112;   /* Q36 */
-   static const opus_int32 ATAN_COEFF_A15 = -598602432;   /* Q37 */
-   opus_int32 x_sq_q30;
-   opus_int32 x_q31;
-   opus_int32 tmp;
+   static const oac_int32 ATAN_2_OVER_PI = 1367130551;   /* Q31 */
+   static const oac_int32 ATAN_COEFF_A03 = -715791936;   /* Q31 */
+   static const oac_int32 ATAN_COEFF_A05 = 857391616;    /* Q32 */
+   static const oac_int32 ATAN_COEFF_A07 = -1200579328;  /* Q33 */
+   static const oac_int32 ATAN_COEFF_A09 = 1682636672;   /* Q34 */
+   static const oac_int32 ATAN_COEFF_A11 = -1985085440;  /* Q35 */
+   static const oac_int32 ATAN_COEFF_A13 = 1583306112;   /* Q36 */
+   static const oac_int32 ATAN_COEFF_A15 = -598602432;   /* Q37 */
+   oac_int32 x_sq_q30;
+   oac_int32 x_q31;
+   oac_int32 tmp;
    /* The expected x is in the range of [-1.0f, 1.0f] */
    celt_sig_assert((x <= 1073741824) && (x >= -1073741824));
 
@@ -581,7 +581,7 @@ static OPUS_INLINE opus_val32 celt_atan_norm(opus_val32 x)
  * the value in Q30 format. Both input values (x and y) must be within the range
  * of 0 to 1 and represented in Q30 format. Inputs must be zero or greater, and
  * at least one input must be non-zero. */
-static OPUS_INLINE opus_val32 celt_atan2p_norm(opus_val32 y, opus_val32 x)
+static OAC_INLINE oac_val32 celt_atan2p_norm(oac_val32 y, oac_val32 x)
 {
    celt_sig_assert(x>=0 && y>=0);
    if (y==0 && x==0) {
@@ -602,7 +602,7 @@ static OPUS_INLINE opus_val32 celt_atan2p_norm(opus_val32 y, opus_val32 x)
 
 /* Atan approximation using a 4th order polynomial. Input is in Q15 format
    and normalized by pi/4. Output is in Q15 format */
-static OPUS_INLINE opus_val16 celt_atan01(opus_val16 x)
+static OAC_INLINE oac_val16 celt_atan01(oac_val16 x)
 {
    return MULT16_16_P15(x, ADD32(M1, MULT16_16_P15(x, ADD32(M2, MULT16_16_P15(x, ADD32(M3, MULT16_16_P15(M4, x)))))));
 }
@@ -613,19 +613,19 @@ static OPUS_INLINE opus_val16 celt_atan01(opus_val16 x)
 #undef M4
 
 /* atan2() approximation valid for positive input values */
-static OPUS_INLINE opus_val16 celt_atan2p(opus_val16 y, opus_val16 x)
+static OAC_INLINE oac_val16 celt_atan2p(oac_val16 y, oac_val16 x)
 {
    if (x==0 && y==0) {
       return 0;
    } else if (y < x)
    {
-      opus_val32 arg;
+      oac_val32 arg;
       arg = celt_div(SHL32(EXTEND32(y),15),x);
       if (arg >= 32767)
          arg = 32767;
       return SHR16(celt_atan01(EXTRACT16(arg)),1);
    } else {
-      opus_val32 arg;
+      oac_val32 arg;
       arg = celt_div(SHL32(EXTEND32(x),15),y);
       if (arg >= 32767)
          arg = 32767;
@@ -637,16 +637,16 @@ static OPUS_INLINE opus_val16 celt_atan2p(opus_val16 y, opus_val16 x)
 
 #ifndef DISABLE_FLOAT_API
 
-void celt_float2int16_c(const float * OPUS_RESTRICT in, short * OPUS_RESTRICT out, int cnt);
+void celt_float2int16_c(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt);
 
 #ifndef OVERRIDE_FLOAT2INT16
 #define celt_float2int16(in, out, cnt, arch) ((void)(arch), celt_float2int16_c(in, out, cnt))
 #endif
 
-int opus_limit2_checkwithin1_c(float *samples, int cnt);
+int oac_limit2_checkwithin1_c(float *samples, int cnt);
 
 #ifndef OVERRIDE_LIMIT2_CHECKWITHIN1
-#define opus_limit2_checkwithin1(samples, cnt, arch) ((void)(arch), opus_limit2_checkwithin1_c(samples, cnt))
+#define oac_limit2_checkwithin1(samples, cnt, arch) ((void)(arch), oac_limit2_checkwithin1_c(samples, cnt))
 #endif
 
 #endif /* DISABLE_FLOAT_API */
diff --git a/celt/mdct.c b/celt/mdct.c
index 153712b2e..dd8a1ed9d 100644
--- a/celt/mdct.c
+++ b/celt/mdct.c
@@ -74,15 +74,15 @@ int clt_mdct_init(mdct_lookup *l,int N, int maxshift, int arch)
    for (i=0;i<=maxshift;i++)
    {
       if (i==0)
-         l->kfft[i] = opus_fft_alloc(N>>2>>i, 0, 0, arch);
+         l->kfft[i] = oac_fft_alloc(N>>2>>i, 0, 0, arch);
       else
-         l->kfft[i] = opus_fft_alloc_twiddles(N>>2>>i, 0, 0, l->kfft[0], arch);
+         l->kfft[i] = oac_fft_alloc_twiddles(N>>2>>i, 0, 0, l->kfft[0], arch);
 #ifndef ENABLE_TI_DSPLIB55
       if (l->kfft[i]==NULL)
          return 0;
 #endif
    }
-   l->trig = trig = (kiss_twiddle_scalar*)opus_alloc((N-(N2>>maxshift))*sizeof(kiss_twiddle_scalar));
+   l->trig = trig = (kiss_twiddle_scalar*)oac_alloc((N-(N2>>maxshift))*sizeof(kiss_twiddle_scalar));
    if (l->trig==NULL)
      return 0;
    for (shift=0;shift<=maxshift;shift++)
@@ -106,15 +106,15 @@ void clt_mdct_clear(mdct_lookup *l, int arch)
 {
    int i;
    for (i=0;i<=l->maxshift;i++)
-      opus_fft_free(l->kfft[i], arch);
-   opus_free((kiss_twiddle_scalar*)l->trig);
+      oac_fft_free(l->kfft[i], arch);
+   oac_free((kiss_twiddle_scalar*)l->trig);
 }
 
 #endif /* CUSTOM_MODES */
 
 /* Forward MDCT trashes the input array */
 #ifndef OVERRIDE_clt_mdct_forward
-void clt_mdct_forward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * OPUS_RESTRICT out,
+void clt_mdct_forward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * OAC_RESTRICT out,
       const celt_coef *window, int overlap, int shift, int stride, int arch)
 {
    int i;
@@ -151,11 +151,11 @@ void clt_mdct_forward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scal
    /* Window, shuffle, fold */
    {
       /* Temp pointers to make it really clear to the compiler what we're doing */
-      const kiss_fft_scalar * OPUS_RESTRICT xp1 = in+(overlap>>1);
-      const kiss_fft_scalar * OPUS_RESTRICT xp2 = in+N2-1+(overlap>>1);
-      kiss_fft_scalar * OPUS_RESTRICT yp = f;
-      const celt_coef * OPUS_RESTRICT wp1 = window+(overlap>>1);
-      const celt_coef * OPUS_RESTRICT wp2 = window+(overlap>>1)-1;
+      const kiss_fft_scalar * OAC_RESTRICT xp1 = in+(overlap>>1);
+      const kiss_fft_scalar * OAC_RESTRICT xp2 = in+N2-1+(overlap>>1);
+      kiss_fft_scalar * OAC_RESTRICT yp = f;
+      const celt_coef * OAC_RESTRICT wp1 = window+(overlap>>1);
+      const celt_coef * OAC_RESTRICT wp2 = window+(overlap>>1)-1;
       for(i=0;i<((overlap+3)>>2);i++)
       {
          /* Real part arranged as -d-cR, Imag part arranged as -b+aR*/
@@ -189,10 +189,10 @@ void clt_mdct_forward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scal
    }
    /* Pre-rotation */
    {
-      kiss_fft_scalar * OPUS_RESTRICT yp = f;
+      kiss_fft_scalar * OAC_RESTRICT yp = f;
       const kiss_twiddle_scalar *t = &trig[0];
 #ifdef FIXED_POINT
-      opus_val32 maxval=1;
+      oac_val32 maxval=1;
 #endif
       for(i=0;i<N4;i++)
       {
@@ -218,14 +218,14 @@ void clt_mdct_forward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scal
    }
 
    /* N/4 complex FFT, does not downscale anymore */
-   opus_fft_impl(st, f2 ARG_FIXED(scale_shift-headroom));
+   oac_fft_impl(st, f2 ARG_FIXED(scale_shift-headroom));
 
    /* Post-rotate */
    {
       /* Temp pointers to make it really clear to the compiler what we're doing */
-      const kiss_fft_cpx * OPUS_RESTRICT fp = f2;
-      kiss_fft_scalar * OPUS_RESTRICT yp1 = out;
-      kiss_fft_scalar * OPUS_RESTRICT yp2 = out+stride*(N2-1);
+      const kiss_fft_cpx * OAC_RESTRICT fp = f2;
+      kiss_fft_scalar * OAC_RESTRICT yp1 = out;
+      kiss_fft_scalar * OAC_RESTRICT yp2 = out+stride*(N2-1);
       const kiss_twiddle_scalar *t = &trig[0];
       /* Temp pointers to make it really clear to the compiler what we're doing */
       for(i=0;i<N4;i++)
@@ -248,8 +248,8 @@ void clt_mdct_forward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scal
 #endif /* OVERRIDE_clt_mdct_forward */
 
 #ifndef OVERRIDE_clt_mdct_backward
-void clt_mdct_backward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * OPUS_RESTRICT out,
-      const celt_coef * OPUS_RESTRICT window, int overlap, int shift, int stride, int arch)
+void clt_mdct_backward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * OAC_RESTRICT out,
+      const celt_coef * OAC_RESTRICT window, int overlap, int shift, int stride, int arch)
 {
    int i;
    int N, N2, N4;
@@ -271,8 +271,8 @@ void clt_mdct_backward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_sca
 
 #ifdef FIXED_POINT
    {
-      opus_val32 sumval=N2;
-      opus_val32 maxval=0;
+      oac_val32 sumval=N2;
+      oac_val32 maxval=0;
       for (i=0;i<N2;i++) {
          maxval = MAX32(maxval, ABS32(in[i*stride]));
          sumval = ADD32_ovflw(sumval, ABS32(SHR32(in[i*stride],11)));
@@ -287,16 +287,16 @@ void clt_mdct_backward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_sca
    /* Pre-rotate */
    {
       /* Temp pointers to make it really clear to the compiler what we're doing */
-      const kiss_fft_scalar * OPUS_RESTRICT xp1 = in;
-      const kiss_fft_scalar * OPUS_RESTRICT xp2 = in+stride*(N2-1);
-      kiss_fft_scalar * OPUS_RESTRICT yp = out+(overlap>>1);
-      const kiss_twiddle_scalar * OPUS_RESTRICT t = &trig[0];
-      const opus_int16 * OPUS_RESTRICT bitrev = l->kfft[shift]->bitrev;
+      const kiss_fft_scalar * OAC_RESTRICT xp1 = in;
+      const kiss_fft_scalar * OAC_RESTRICT xp2 = in+stride*(N2-1);
+      kiss_fft_scalar * OAC_RESTRICT yp = out+(overlap>>1);
+      const kiss_twiddle_scalar * OAC_RESTRICT t = &trig[0];
+      const oac_int16 * OAC_RESTRICT bitrev = l->kfft[shift]->bitrev;
       for(i=0;i<N4;i++)
       {
          int rev;
          kiss_fft_scalar yr, yi;
-         opus_val32 x1, x2;
+         oac_val32 x1, x2;
          rev = *bitrev++;
          x1 = SHL32_ovflw(*xp1, pre_shift);
          x2 = SHL32_ovflw(*xp2, pre_shift);
@@ -311,7 +311,7 @@ void clt_mdct_backward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_sca
       }
    }
 
-   opus_fft_impl(l->kfft[shift], (kiss_fft_cpx*)(out+(overlap>>1)) ARG_FIXED(fft_shift));
+   oac_fft_impl(l->kfft[shift], (kiss_fft_cpx*)(out+(overlap>>1)) ARG_FIXED(fft_shift));
 
    /* Post-rotate and de-shuffle from both ends of the buffer at once to make
       it in-place. */
@@ -353,10 +353,10 @@ void clt_mdct_backward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_sca
 
    /* Mirror on both sides for TDAC */
    {
-      kiss_fft_scalar * OPUS_RESTRICT xp1 = out+overlap-1;
-      kiss_fft_scalar * OPUS_RESTRICT yp1 = out;
-      const celt_coef * OPUS_RESTRICT wp1 = window;
-      const celt_coef * OPUS_RESTRICT wp2 = window+overlap-1;
+      kiss_fft_scalar * OAC_RESTRICT xp1 = out+overlap-1;
+      kiss_fft_scalar * OAC_RESTRICT yp1 = out;
+      const celt_coef * OAC_RESTRICT wp1 = window;
+      const celt_coef * OAC_RESTRICT wp2 = window+overlap-1;
 
       for(i = 0; i < overlap/2; i++)
       {
diff --git a/celt/mdct.h b/celt/mdct.h
index 529b706d9..1d9f6a2e6 100644
--- a/celt/mdct.h
+++ b/celt/mdct.h
@@ -42,7 +42,7 @@
 #ifndef MDCT_H
 #define MDCT_H
 
-#include "opus_defines.h"
+#include "oac_defines.h"
 #include "kiss_fft.h"
 #include "arch.h"
 
@@ -50,7 +50,7 @@ typedef struct {
    int n;
    int maxshift;
    const kiss_fft_state *kfft[4];
-   const kiss_twiddle_scalar * OPUS_RESTRICT trig;
+   const kiss_twiddle_scalar * OAC_RESTRICT trig;
 } mdct_lookup;
 
 #if defined(HAVE_ARM_NE10)
@@ -62,42 +62,42 @@ void clt_mdct_clear(mdct_lookup *l, int arch);
 
 /** Compute a forward MDCT and scale by 4/N, trashes the input array */
 void clt_mdct_forward_c(const mdct_lookup *l, kiss_fft_scalar *in,
-                        kiss_fft_scalar * OPUS_RESTRICT out,
+                        kiss_fft_scalar * OAC_RESTRICT out,
                         const celt_coef *window, int overlap,
                         int shift, int stride, int arch);
 
 /** Compute a backward MDCT (no scaling) and performs weighted overlap-add
     (scales implicitly by 1/2) */
 void clt_mdct_backward_c(const mdct_lookup *l, kiss_fft_scalar *in,
-      kiss_fft_scalar * OPUS_RESTRICT out,
-      const celt_coef * OPUS_RESTRICT window,
+      kiss_fft_scalar * OAC_RESTRICT out,
+      const celt_coef * OAC_RESTRICT window,
       int overlap, int shift, int stride, int arch);
 
-#if !defined(OVERRIDE_OPUS_MDCT)
+#if !defined(OVERRIDE_OAC_MDCT)
 /* Is run-time CPU detection enabled on this platform? */
-#if defined(OPUS_HAVE_RTCD) && defined(HAVE_ARM_NE10)
+#if defined(OAC_HAVE_RTCD) && defined(HAVE_ARM_NE10)
 
-extern void (*const CLT_MDCT_FORWARD_IMPL[OPUS_ARCHMASK+1])(
+extern void (*const CLT_MDCT_FORWARD_IMPL[OAC_ARCHMASK+1])(
       const mdct_lookup *l, kiss_fft_scalar *in,
-      kiss_fft_scalar * OPUS_RESTRICT out, const celt_coef *window,
+      kiss_fft_scalar * OAC_RESTRICT out, const celt_coef *window,
       int overlap, int shift, int stride, int arch);
 
 #define clt_mdct_forward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
-   ((*CLT_MDCT_FORWARD_IMPL[(arch)&OPUS_ARCHMASK])(_l, _in, _out, \
+   ((*CLT_MDCT_FORWARD_IMPL[(arch)&OAC_ARCHMASK])(_l, _in, _out, \
                                                    _window, _overlap, _shift, \
                                                    _stride, _arch))
 
-extern void (*const CLT_MDCT_BACKWARD_IMPL[OPUS_ARCHMASK+1])(
+extern void (*const CLT_MDCT_BACKWARD_IMPL[OAC_ARCHMASK+1])(
       const mdct_lookup *l, kiss_fft_scalar *in,
-      kiss_fft_scalar * OPUS_RESTRICT out, const celt_coef *window,
+      kiss_fft_scalar * OAC_RESTRICT out, const celt_coef *window,
       int overlap, int shift, int stride, int arch);
 
 #define clt_mdct_backward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
-   (*CLT_MDCT_BACKWARD_IMPL[(arch)&OPUS_ARCHMASK])(_l, _in, _out, \
+   (*CLT_MDCT_BACKWARD_IMPL[(arch)&OAC_ARCHMASK])(_l, _in, _out, \
                                                    _window, _overlap, _shift, \
                                                    _stride, _arch)
 
-#else /* if defined(OPUS_HAVE_RTCD) && defined(HAVE_ARM_NE10) */
+#else /* if defined(OAC_HAVE_RTCD) && defined(HAVE_ARM_NE10) */
 
 #define clt_mdct_forward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
    clt_mdct_forward_c(_l, _in, _out, _window, _overlap, _shift, _stride, _arch)
@@ -105,7 +105,7 @@ extern void (*const CLT_MDCT_BACKWARD_IMPL[OPUS_ARCHMASK+1])(
 #define clt_mdct_backward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
    clt_mdct_backward_c(_l, _in, _out, _window, _overlap, _shift, _stride, _arch)
 
-#endif /* end if defined(OPUS_HAVE_RTCD) && defined(HAVE_ARM_NE10) && !defined(FIXED_POINT) */
-#endif /* end if !defined(OVERRIDE_OPUS_MDCT) */
+#endif /* end if defined(OAC_HAVE_RTCD) && defined(HAVE_ARM_NE10) && !defined(FIXED_POINT) */
+#endif /* end if !defined(OVERRIDE_OAC_MDCT) */
 
 #endif
diff --git a/celt/meson.build b/celt/meson.build
index 46601ca13..a28bf2628 100644
--- a/celt/meson.build
+++ b/celt/meson.build
@@ -12,7 +12,7 @@ celt_neon_intr_sources = sources['CELT_SOURCES_ARM_NEON_INTR']
 
 celt_static_libs = []
 
-if host_cpu_family in ['x86', 'x86_64'] and opus_conf.has('OPUS_HAVE_RTCD')
+if host_cpu_family in ['x86', 'x86_64'] and oac_conf.has('OAC_HAVE_RTCD')
   celt_sources +=  sources['CELT_SOURCES_X86_RTCD']
 endif
 
@@ -23,10 +23,10 @@ foreach intr_name : ['sse', 'sse2', 'sse4_1', 'avx2', 'neon_intr']
   endif
 
   intr_sources = get_variable('celt_@0@_sources'.format(intr_name))
-  intr_args = get_variable('opus_@0@_args'.format(intr_name), [])
+  intr_args = get_variable('oac_@0@_args'.format(intr_name), [])
   celt_static_libs += static_library('celt_' + intr_name, intr_sources,
       c_args: intr_args,
-      include_directories: opus_includes,
+      include_directories: oac_includes,
       install: false)
 endforeach
 
@@ -36,13 +36,13 @@ if (intrinsics_support.length() + asm_optimization.length() + inline_optimizatio
 endif
 
 if host_cpu_family in ['arm', 'aarch64'] and have_arm_intrinsics_or_asm
-  if opus_conf.has('OPUS_HAVE_RTCD')
+  if oac_conf.has('OAC_HAVE_RTCD')
     celt_sources +=  sources['CELT_SOURCES_ARM_RTCD']
   endif
   if have_arm_ne10
     celt_sources += sources['CELT_SOURCES_ARM_NE10']
   endif
-  if opus_arm_external_asm
+  if oac_arm_external_asm
     subdir('arm')
     celt_static_libs += static_library('celt-armasm',
       celt_arm_armopts_s, celt_sources_arm_asm,
@@ -55,10 +55,10 @@ if host_system == 'windows'
   celt_c_args += ['-DDLL_EXPORT']
 endif
 
-celt_lib = static_library('opus-celt',
+celt_lib = static_library('oac-celt',
   celt_sources,
   c_args: celt_c_args,
-  include_directories: opus_includes,
+  include_directories: oac_includes,
   link_whole: celt_static_libs,
   dependencies: libm,
   install: false)
diff --git a/celt/mfrngcod.h b/celt/mfrngcod.h
index 809152a59..2b4918dfe 100644
--- a/celt/mfrngcod.h
+++ b/celt/mfrngcod.h
@@ -40,7 +40,7 @@
 /*Bits to shift by to move a symbol into the high-order position.*/
 # define EC_CODE_SHIFT (EC_CODE_BITS-EC_SYM_BITS-1)
 /*Carry bit of the high-order range symbol.*/
-# define EC_CODE_TOP   (((opus_uint32)1U)<<(EC_CODE_BITS-1))
+# define EC_CODE_TOP   (((oac_uint32)1U)<<(EC_CODE_BITS-1))
 /*Low-order bit of the high-order range symbol.*/
 # define EC_CODE_BOT   (EC_CODE_TOP>>EC_SYM_BITS)
 /*The number of bits available for the last, partial symbol in the code field.*/
diff --git a/celt/mips/celt_mipsr1.h b/celt/mips/celt_mipsr1.h
index 8a5d0c90a..01635544a 100644
--- a/celt/mips/celt_mipsr1.h
+++ b/celt/mips/celt_mipsr1.h
@@ -93,34 +93,34 @@ static inline long long MIPS_MADD(long long acc, int a, int b) {
     return acc;
 }
 
-static inline opus_val32 MIPS_EXTR(long long acc, int shift) {
-    return (opus_val32)(acc >> shift);
+static inline oac_val32 MIPS_EXTR(long long acc, int shift) {
+    return (oac_val32)(acc >> shift);
 }
 
 #endif
 
 #if defined (OVERRIDE_comb_filter)
-void comb_filter(opus_val32 *y, opus_val32 *x, int T0, int T1, int N,
-      opus_val16 g0, opus_val16 g1, int tapset0, int tapset1,
-      const opus_val16 *window, int overlap, int arch)
+void comb_filter(oac_val32 *y, oac_val32 *x, int T0, int T1, int N,
+      oac_val16 g0, oac_val16 g1, int tapset0, int tapset1,
+      const oac_val16 *window, int overlap, int arch)
 {
    int i;
-   opus_val32 x0, x1, x2, x3, x4;
+   oac_val32 x0, x1, x2, x3, x4;
 
    (void)arch;
 
    /* printf ("%d %d %f %f\n", T0, T1, g0, g1); */
-   opus_val16 g00, g01, g02, g10, g11, g12;
-   static const opus_val16 gains[3][3] = {
+   oac_val16 g00, g01, g02, g10, g11, g12;
+   static const oac_val16 gains[3][3] = {
          {QCONST16(0.3066406250f, 15), QCONST16(0.2170410156f, 15), QCONST16(0.1296386719f, 15)},
          {QCONST16(0.4638671875f, 15), QCONST16(0.2680664062f, 15), QCONST16(0.f, 15)},
          {QCONST16(0.7998046875f, 15), QCONST16(0.1000976562f, 15), QCONST16(0.f, 15)}};
 
    if (g0==0 && g1==0)
    {
-      /* OPT: Happens to work without the OPUS_MOVE(), but only because the current encoder already copies x to y */
+      /* OPT: Happens to work without the OAC_MOVE(), but only because the current encoder already copies x to y */
       if (x!=y)
-         OPUS_MOVE(y, x, N);
+         OAC_MOVE(y, x, N);
       return;
    }
 
@@ -140,8 +140,8 @@ void comb_filter(opus_val32 *y, opus_val32 *x, int T0, int T1, int N,
 
    for (i=0;i<overlap;i++)
    {
-      opus_val16 f;
-      opus_val32 res;
+      oac_val16 f;
+      oac_val32 res;
       long long acc;
       f = MULT16_16_Q15(window[i],window[i]);
       x0= x[i-T1+2];
@@ -169,15 +169,15 @@ void comb_filter(opus_val32 *y, opus_val32 *x, int T0, int T1, int N,
 
    if (g1==0)
    {
-      /* OPT: Happens to work without the OPUS_MOVE(), but only because the current encoder already copies x to y */
+      /* OPT: Happens to work without the OAC_MOVE(), but only because the current encoder already copies x to y */
       if (x!=y)
-         OPUS_MOVE(y+overlap, x+overlap, N-overlap);
+         OAC_MOVE(y+overlap, x+overlap, N-overlap);
       return;
    }
 
    for (i=overlap;i<N;i++)
    {
-      opus_val32 res;
+      oac_val32 res;
       long long acc;
       x0=x[i-T1+2];
 
diff --git a/celt/mips/fixed_generic_mipsr1.h b/celt/mips/fixed_generic_mipsr1.h
index 144cf9447..0f421a3c8 100644
--- a/celt/mips/fixed_generic_mipsr1.h
+++ b/celt/mips/fixed_generic_mipsr1.h
@@ -80,13 +80,13 @@ static inline int MULT16_16_P15(int a, int b)
 }
 
 #define OVERRIDE_CELT_MAXABS16
-static OPUS_INLINE opus_val32 celt_maxabs16(const opus_val16 *x, int len)
+static OAC_INLINE oac_val32 celt_maxabs16(const oac_val16 *x, int len)
 {
    int i;
    v2i16 v2max = (v2i16){ 0, 0 };
    v2i16 x01, x23;
    const v2i16 *x2;
-   opus_val16 maxlo, maxhi;
+   oac_val16 maxlo, maxhi;
    int loops;
 
    if ((long)x & 2 && len > 0) {
@@ -114,26 +114,26 @@ static OPUS_INLINE opus_val32 celt_maxabs16(const opus_val16 *x, int len)
        x01 = __builtin_mips_absq_s_ph(*x2);
        __builtin_mips_cmp_lt_ph(v2max, x01);
        v2max = __builtin_mips_pick_ph(x01, v2max);
-       maxlo = EXTRACT16((opus_val32)v2max);
-       maxhi = EXTRACT16((opus_val32)v2max >> 16);
+       maxlo = EXTRACT16((oac_val32)v2max);
+       maxhi = EXTRACT16((oac_val32)v2max >> 16);
        maxlo = MAX16(MAX16(maxlo, maxhi), ABS16(x[len - 1]));
        break;
    case 2:
        x01 = __builtin_mips_absq_s_ph(*x2);
        __builtin_mips_cmp_lt_ph(v2max, x01);
        v2max = __builtin_mips_pick_ph(x01, v2max);
-       maxlo = EXTRACT16((opus_val32)v2max);
-       maxhi = EXTRACT16((opus_val32)v2max >> 16);
+       maxlo = EXTRACT16((oac_val32)v2max);
+       maxhi = EXTRACT16((oac_val32)v2max >> 16);
        maxlo = MAX16(maxlo, maxhi);
        break;
    case 1:
-       maxlo = EXTRACT16((opus_val32)v2max);
-       maxhi = EXTRACT16((opus_val32)v2max >> 16);
+       maxlo = EXTRACT16((oac_val32)v2max);
+       maxhi = EXTRACT16((oac_val32)v2max >> 16);
        return MAX16(MAX16(maxlo, maxhi), ABS16(x[len - 1]));
        break;
    case 0:
-       maxlo = EXTRACT16((opus_val32)v2max);
-       maxhi = EXTRACT16((opus_val32)v2max >> 16);
+       maxlo = EXTRACT16((oac_val32)v2max);
+       maxhi = EXTRACT16((oac_val32)v2max >> 16);
        maxlo = MAX16(maxlo, maxhi);
        break;
    default:
@@ -145,13 +145,13 @@ static OPUS_INLINE opus_val32 celt_maxabs16(const opus_val16 *x, int len)
     * in ilog2-like context it's worth to add 1
     * for proper magnitude whether saturated
     */
-   return (opus_val32)maxlo + 1;
+   return (oac_val32)maxlo + 1;
 }
 
 #elif __mips == 32
 
 #undef MULT16_32_Q16
-#define MULT16_32_Q16(a,b) ((opus_val32)SHR((opus_int64)(SHL32((a), 16))*(b),32))
+#define MULT16_32_Q16(a,b) ((oac_val32)SHR((oac_int64)(SHL32((a), 16))*(b),32))
 
 #endif
 
diff --git a/celt/mips/mdct_mipsr1.h b/celt/mips/mdct_mipsr1.h
index bc349cc25..790c64f72 100644
--- a/celt/mips/mdct_mipsr1.h
+++ b/celt/mips/mdct_mipsr1.h
@@ -107,7 +107,7 @@ static inline int S_MUL_SUB_PSR(int a, int b, int c, int d, int shift) {
 #if defined (OVERRIDE_clt_mdct_forward)
 
 /* Forward MDCT trashes the input array */
-void clt_mdct_forward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * OPUS_RESTRICT out,
+void clt_mdct_forward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * OAC_RESTRICT out,
       const celt_coef *window, int overlap, int shift, int stride, int arch)
 {
    int i;
@@ -144,11 +144,11 @@ void clt_mdct_forward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar
    /* Window, shuffle, fold */
    {
       /* Temp pointers to make it really clear to the compiler what we're doing */
-      const kiss_fft_scalar * OPUS_RESTRICT xp1 = in+(overlap>>1);
-      const kiss_fft_scalar * OPUS_RESTRICT xp2 = in+N2-1+(overlap>>1);
-      kiss_fft_scalar * OPUS_RESTRICT yp = f;
-      const celt_coef * OPUS_RESTRICT wp1 = window+(overlap>>1);
-      const celt_coef * OPUS_RESTRICT wp2 = window+(overlap>>1)-1;
+      const kiss_fft_scalar * OAC_RESTRICT xp1 = in+(overlap>>1);
+      const kiss_fft_scalar * OAC_RESTRICT xp2 = in+N2-1+(overlap>>1);
+      kiss_fft_scalar * OAC_RESTRICT yp = f;
+      const celt_coef * OAC_RESTRICT wp1 = window+(overlap>>1);
+      const celt_coef * OAC_RESTRICT wp2 = window+(overlap>>1)-1;
       for(i=0;i<((overlap+3)>>2);i++)
       {
          /* Real part arranged as -d-cR, Imag part arranged as -b+aR*/
@@ -182,10 +182,10 @@ void clt_mdct_forward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar
    }
    /* Pre-rotation */
    {
-      kiss_fft_scalar * OPUS_RESTRICT yp = f;
+      kiss_fft_scalar * OAC_RESTRICT yp = f;
       const kiss_twiddle_scalar *t = &trig[0];
 #ifdef FIXED_POINT
-      opus_val32 maxval=1;
+      oac_val32 maxval=1;
 #endif
       for(i=0;i<N4;i++)
       {
@@ -218,14 +218,14 @@ void clt_mdct_forward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar
    }
 
    /* N/4 complex FFT, does not downscale anymore */
-   opus_fft_impl(st, f2 ARG_FIXED(scale_shift-headroom));
+   oac_fft_impl(st, f2 ARG_FIXED(scale_shift-headroom));
 
    /* Post-rotate */
    {
       /* Temp pointers to make it really clear to the compiler what we're doing */
-      const kiss_fft_cpx * OPUS_RESTRICT fp = f2;
-      kiss_fft_scalar * OPUS_RESTRICT yp1 = out;
-      kiss_fft_scalar * OPUS_RESTRICT yp2 = out+stride*(N2-1);
+      const kiss_fft_cpx * OAC_RESTRICT fp = f2;
+      kiss_fft_scalar * OAC_RESTRICT yp1 = out;
+      kiss_fft_scalar * OAC_RESTRICT yp2 = out+stride*(N2-1);
       const kiss_twiddle_scalar *t = &trig[0];
       /* Temp pointers to make it really clear to the compiler what we're doing */
       for(i=0;i<N4;i++)
@@ -255,8 +255,8 @@ void clt_mdct_forward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar
 
 #if defined(OVERRIDE_clt_mdct_backward)
 
-void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * OPUS_RESTRICT out,
-      const celt_coef * OPUS_RESTRICT window, int overlap, int shift, int stride, int arch)
+void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * OAC_RESTRICT out,
+      const celt_coef * OAC_RESTRICT window, int overlap, int shift, int stride, int arch)
 {
    int i;
    int N, N2, N4;
@@ -278,8 +278,8 @@ void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scala
 
 #ifdef FIXED_POINT
    {
-      opus_val32 sumval=N2;
-      opus_val32 maxval=0;
+      oac_val32 sumval=N2;
+      oac_val32 maxval=0;
       for (i=0;i<N2;i++) {
          maxval = MAX32(maxval, ABS32(in[i*stride]));
          sumval = ADD32_ovflw(sumval, ABS32(SHR32(in[i*stride],11)));
@@ -294,16 +294,16 @@ void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scala
    /* Pre-rotate */
    {
       /* Temp pointers to make it really clear to the compiler what we're doing */
-      const kiss_fft_scalar * OPUS_RESTRICT xp1 = in;
-      const kiss_fft_scalar * OPUS_RESTRICT xp2 = in+stride*(N2-1);
-      kiss_fft_scalar * OPUS_RESTRICT yp = out+(overlap>>1);
-      const kiss_twiddle_scalar * OPUS_RESTRICT t = &trig[0];
-      const opus_int16 * OPUS_RESTRICT bitrev = l->kfft[shift]->bitrev;
+      const kiss_fft_scalar * OAC_RESTRICT xp1 = in;
+      const kiss_fft_scalar * OAC_RESTRICT xp2 = in+stride*(N2-1);
+      kiss_fft_scalar * OAC_RESTRICT yp = out+(overlap>>1);
+      const kiss_twiddle_scalar * OAC_RESTRICT t = &trig[0];
+      const oac_int16 * OAC_RESTRICT bitrev = l->kfft[shift]->bitrev;
       for(i=0;i<N4;i++)
       {
          int rev;
          kiss_fft_scalar yr, yi;
-         opus_val32 x1, x2;
+         oac_val32 x1, x2;
          rev = *bitrev++;
          x1 = SHL32_ovflw(*xp1, pre_shift);
          x2 = SHL32_ovflw(*xp2, pre_shift);
@@ -318,7 +318,7 @@ void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scala
       }
    }
 
-   opus_fft_impl(l->kfft[shift], (kiss_fft_cpx*)(out+(overlap>>1)) ARG_FIXED(fft_shift));
+   oac_fft_impl(l->kfft[shift], (kiss_fft_cpx*)(out+(overlap>>1)) ARG_FIXED(fft_shift));
 
    /* Post-rotate and de-shuffle from both ends of the buffer at once to make
       it in-place. */
@@ -360,10 +360,10 @@ void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scala
 
    /* Mirror on both sides for TDAC */
    {
-      kiss_fft_scalar * OPUS_RESTRICT xp1 = out+overlap-1;
-      kiss_fft_scalar * OPUS_RESTRICT yp1 = out;
-      const celt_coef * OPUS_RESTRICT wp1 = window;
-      const celt_coef * OPUS_RESTRICT wp2 = window+overlap-1;
+      kiss_fft_scalar * OAC_RESTRICT xp1 = out+overlap-1;
+      kiss_fft_scalar * OAC_RESTRICT yp1 = out;
+      const celt_coef * OAC_RESTRICT wp1 = window;
+      const celt_coef * OAC_RESTRICT wp2 = window+overlap-1;
 
       for(i = 0; i < overlap/2; i++)
       {
diff --git a/celt/mips/pitch_mipsr1.h b/celt/mips/pitch_mipsr1.h
index 9b73a126b..f0bae2b58 100644
--- a/celt/mips/pitch_mipsr1.h
+++ b/celt/mips/pitch_mipsr1.h
@@ -38,7 +38,7 @@
 
 #if defined (__mips_dsp) && __mips == 32
 
-#define accumulator_t opus_int64
+#define accumulator_t oac_int64
 #define MIPS_MAC(acc,a,b) \
     __builtin_mips_madd((acc), (int)(a), (int)(b))
 
@@ -52,7 +52,7 @@
 #else /* any other MIPS */
 
 /* using madd is slower due to single accumulator */
-#define accumulator_t opus_int32
+#define accumulator_t oac_int32
 #define MIPS_MAC MAC16_16
 
 #define OVERRIDE_CELT_INNER_PROD
@@ -64,8 +64,8 @@
 
 #if defined(OVERRIDE_CELT_INNER_PROD)
 
-static OPUS_INLINE opus_val32 celt_inner_prod(const opus_val16 *x,
-      const opus_val16 *y, int N, int arch)
+static OAC_INLINE oac_val32 celt_inner_prod(const oac_val16 *x,
+      const oac_val16 *y, int N, int arch)
 {
    int j;
    accumulator_t acc = 0;
@@ -156,13 +156,13 @@ static OPUS_INLINE opus_val32 celt_inner_prod(const opus_val16 *x,
 
    (void)arch;
 
-   return (opus_val32)acc;
+   return (oac_val32)acc;
 }
 #endif /* OVERRIDE_CELT_INNER_PROD */
 
 #if defined(OVERRIDE_DUAL_INNER_PROD)
-static inline void dual_inner_prod(const opus_val16 *x, const opus_val16 *y01, const opus_val16 *y02,
-      int N, opus_val32 *xy1, opus_val32 *xy2, int arch)
+static inline void dual_inner_prod(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
+      int N, oac_val32 *xy1, oac_val32 *xy2, int arch)
 {
    int j;
    accumulator_t acc1 = 0;
@@ -245,18 +245,18 @@ static inline void dual_inner_prod(const opus_val16 *x, const opus_val16 *y01, c
 
    (void)arch;
 
-   *xy1 = (opus_val32)acc1;
-   *xy2 = (opus_val32)acc2;
+   *xy1 = (oac_val32)acc1;
+   *xy2 = (oac_val32)acc2;
 }
 #endif /* OVERRIDE_DUAL_INNER_PROD */
 
 #if defined(OVERRIDE_XCORR_KERNEL)
 
-static inline void xcorr_kernel_mips(const opus_val16 * x,
-      const opus_val16 * y, opus_val32 sum[4], int len)
+static inline void xcorr_kernel_mips(const oac_val16 * x,
+      const oac_val16 * y, oac_val32 sum[4], int len)
 {
    int j;
-   opus_val16 y_0, y_1, y_2, y_3;
+   oac_val16 y_0, y_1, y_2, y_3;
 
     accumulator_t sum_0, sum_1, sum_2, sum_3;
     sum_0 =  (accumulator_t)sum[0];
@@ -269,7 +269,7 @@ static inline void xcorr_kernel_mips(const opus_val16 * x,
     y_2=*y++;
     for (j=0;j<len-3;j+=4)
     {
-        opus_val16 tmp;
+        oac_val16 tmp;
         tmp = *x++;
         y_3=*y++;
 
@@ -342,10 +342,10 @@ static inline void xcorr_kernel_mips(const opus_val16 * x,
       break;
    }
 
-   sum[0] = (opus_val32)sum_0;
-   sum[1] = (opus_val32)sum_1;
-   sum[2] = (opus_val32)sum_2;
-   sum[3] = (opus_val32)sum_3;
+   sum[0] = (oac_val32)sum_0;
+   sum[1] = (oac_val32)sum_1;
+   sum[2] = (oac_val32)sum_2;
+   sum[3] = (oac_val32)sum_3;
 }
 
 #define xcorr_kernel(x, y, sum, len, arch) \
diff --git a/celt/modes.c b/celt/modes.c
index ff1284737..9cc911145 100644
--- a/celt/modes.c
+++ b/celt/modes.c
@@ -39,7 +39,7 @@
 #include "quant_bands.h"
 #include "cpu_support.h"
 
-static const opus_int16 eband5ms[] = {
+static const oac_int16 eband5ms[] = {
 /*0  200 400 600 800  1k 1.2 1.4 1.6  2k 2.4 2.8 3.2  4k 4.8 5.6 6.8  8k 9.6 12k 15.6 */
   0,  1,  2,  3,  4,  5,  6,  7,  8, 10, 12, 14, 16, 20, 24, 28, 34, 40, 48, 60, 78, 100
 };
@@ -79,7 +79,7 @@ static const unsigned char band_allocation[] = {
 /* Defining 25 critical bands for the full 0-20 kHz audio bandwidth
    Taken from http://ccrma.stanford.edu/~jos/bbt/Bark_Frequency_Scale.html */
 #define BARK_BANDS 25
-static const opus_int16 bark_freq[BARK_BANDS+1] = {
+static const oac_int16 bark_freq[BARK_BANDS+1] = {
       0,   100,   200,   300,   400,
     510,   630,   770,   920,  1080,
    1270,  1480,  1720,  2000,  2320,
@@ -87,16 +87,16 @@ static const opus_int16 bark_freq[BARK_BANDS+1] = {
    6400,  7700,  9500, 12000, 15500,
   20000};
 
-static opus_int16 *compute_ebands(opus_int32 Fs, int frame_size, int res, int *nbEBands)
+static oac_int16 *compute_ebands(oac_int32 Fs, int frame_size, int res, int *nbEBands)
 {
-   opus_int16 *eBands;
+   oac_int16 *eBands;
    int i, j, lin, low, high, nBark, offset=0;
 
    /* All modes that have 2.5 ms short blocks use the same definition */
-   if (Fs == 400*(opus_int32)frame_size)
+   if (Fs == 400*(oac_int32)frame_size)
    {
       *nbEBands = sizeof(eband5ms)/sizeof(eband5ms[0])-1;
-      eBands = opus_alloc(sizeof(opus_int16)*(*nbEBands+1));
+      eBands = oac_alloc(sizeof(oac_int16)*(*nbEBands+1));
       for (i=0;i<*nbEBands+1;i++)
          eBands[i] = eband5ms[i];
       return eBands;
@@ -114,7 +114,7 @@ static opus_int16 *compute_ebands(opus_int32 Fs, int frame_size, int res, int *n
    low = (bark_freq[lin]+res/2)/res;
    high = nBark-lin;
    *nbEBands = low+high;
-   eBands = opus_alloc(sizeof(opus_int16)*(*nbEBands+2));
+   eBands = oac_alloc(sizeof(oac_int16)*(*nbEBands+2));
 
    if (eBands==NULL)
       return NULL;
@@ -171,7 +171,7 @@ static void compute_allocation_table(CELTMode *mode)
    int maxBands = sizeof(eband5ms)/sizeof(eband5ms[0])-1;
 
    mode->nbAllocVectors = BITALLOC_SIZE;
-   allocVectors = opus_alloc(sizeof(unsigned char)*(BITALLOC_SIZE*mode->nbEBands));
+   allocVectors = oac_alloc(sizeof(unsigned char)*(BITALLOC_SIZE*mode->nbEBands));
    if (allocVectors==NULL)
    {
       mode->allocVectors = NULL;
@@ -179,7 +179,7 @@ static void compute_allocation_table(CELTMode *mode)
    }
 
    /* Check for standard mode */
-   if (mode->Fs == 400*(opus_int32)mode->shortMdctSize)
+   if (mode->Fs == 400*(oac_int32)mode->shortMdctSize)
    {
       for (i=0;i<BITALLOC_SIZE*mode->nbEBands;i++)
          allocVectors[i] = band_allocation[i];
@@ -195,15 +195,15 @@ static void compute_allocation_table(CELTMode *mode)
          int k;
          for (k=0;k<maxBands;k++)
          {
-            if (400*(opus_int32)eband5ms[k] > mode->eBands[j]*(opus_int32)mode->Fs/mode->shortMdctSize)
+            if (400*(oac_int32)eband5ms[k] > mode->eBands[j]*(oac_int32)mode->Fs/mode->shortMdctSize)
                break;
          }
          if (k>maxBands-1)
             allocVectors[i*mode->nbEBands+j] = band_allocation[i*maxBands + maxBands-1];
          else {
-            opus_int32 a0, a1;
-            a1 = mode->eBands[j]*(opus_int32)mode->Fs/mode->shortMdctSize - 400*(opus_int32)eband5ms[k-1];
-            a0 = 400*(opus_int32)eband5ms[k] - mode->eBands[j]*(opus_int32)mode->Fs/mode->shortMdctSize;
+            oac_int32 a0, a1;
+            a1 = mode->eBands[j]*(oac_int32)mode->Fs/mode->shortMdctSize - 400*(oac_int32)eband5ms[k-1];
+            a0 = 400*(oac_int32)eband5ms[k] - mode->eBands[j]*(oac_int32)mode->Fs/mode->shortMdctSize;
             allocVectors[i*mode->nbEBands+j] = (a0*band_allocation[i*maxBands+k-1]
                                              + a1*band_allocation[i*maxBands+k])/(a0+a1);
          }
@@ -224,16 +224,16 @@ static void compute_allocation_table(CELTMode *mode)
 
 #endif /* CUSTOM_MODES */
 
-CELTMode *opus_custom_mode_create(opus_int32 Fs, int frame_size, int *error)
+CELTMode *oac_custom_mode_create(oac_int32 Fs, int frame_size, int *error)
 {
    int i;
 #ifdef CUSTOM_MODES
    CELTMode *mode=NULL;
    int res;
    celt_coef *window;
-   opus_int16 *logN;
+   oac_int16 *logN;
    int LM;
-   int arch = opus_select_arch();
+   int arch = oac_select_arch();
    ALLOC_STACK;
 #if !defined(VAR_ARRAYS) && !defined(USE_ALLOCA)
    if (global_stack==NULL)
@@ -251,7 +251,7 @@ CELTMode *opus_custom_mode_create(opus_int32 Fs, int frame_size, int *error)
                (frame_size<<j) == static_mode_list[i]->shortMdctSize*static_mode_list[i]->nbShortMdcts)
          {
             if (error)
-               *error = OPUS_OK;
+               *error = OAC_OK;
             return (CELTMode*)static_mode_list[i];
          }
       }
@@ -260,7 +260,7 @@ CELTMode *opus_custom_mode_create(opus_int32 Fs, int frame_size, int *error)
 
 #ifndef CUSTOM_MODES
    if (error)
-      *error = OPUS_BAD_ARG;
+      *error = OAC_BAD_ARG;
    return NULL;
 #else
 
@@ -269,7 +269,7 @@ CELTMode *opus_custom_mode_create(opus_int32 Fs, int frame_size, int *error)
    if (Fs < 8000 || Fs > 96000)
    {
       if (error)
-         *error = OPUS_BAD_ARG;
+         *error = OAC_BAD_ARG;
       return NULL;
    }
 #ifdef ENABLE_QEXT
@@ -279,24 +279,24 @@ CELTMode *opus_custom_mode_create(opus_int32 Fs, int frame_size, int *error)
 #endif
    {
       if (error)
-         *error = OPUS_BAD_ARG;
+         *error = OAC_BAD_ARG;
       return NULL;
    }
    /* Frames of less than 1ms are not supported. */
-   if ((opus_int32)frame_size*1000 < Fs)
+   if ((oac_int32)frame_size*1000 < Fs)
    {
       if (error)
-         *error = OPUS_BAD_ARG;
+         *error = OAC_BAD_ARG;
       return NULL;
    }
 
-   if ((opus_int32)frame_size*75 >= Fs && (frame_size%16)==0)
+   if ((oac_int32)frame_size*75 >= Fs && (frame_size%16)==0)
    {
      LM = 3;
-   } else if ((opus_int32)frame_size*150 >= Fs && (frame_size%8)==0)
+   } else if ((oac_int32)frame_size*150 >= Fs && (frame_size%8)==0)
    {
      LM = 2;
-   } else if ((opus_int32)frame_size*300 >= Fs && (frame_size%4)==0)
+   } else if ((oac_int32)frame_size*300 >= Fs && (frame_size%4)==0)
    {
      LM = 1;
    } else
@@ -305,14 +305,14 @@ CELTMode *opus_custom_mode_create(opus_int32 Fs, int frame_size, int *error)
    }
 
    /* Shorts longer than 3.3ms are not supported. */
-   if ((opus_int32)(frame_size>>LM)*300 > Fs)
+   if ((oac_int32)(frame_size>>LM)*300 > Fs)
    {
       if (error)
-         *error = OPUS_BAD_ARG;
+         *error = OAC_BAD_ARG;
       return NULL;
    }
 
-   mode = opus_alloc(sizeof(CELTMode));
+   mode = oac_alloc(sizeof(CELTMode));
    if (mode==NULL)
       goto failure;
    mode->Fs = Fs;
@@ -383,7 +383,7 @@ CELTMode *opus_custom_mode_create(opus_int32 Fs, int frame_size, int *error)
    if (mode->allocVectors==NULL)
       goto failure;
 
-   window = (celt_coef*)opus_alloc(mode->overlap*sizeof(*window));
+   window = (celt_coef*)oac_alloc(mode->overlap*sizeof(*window));
    if (window==NULL)
       goto failure;
 
@@ -396,7 +396,7 @@ CELTMode *opus_custom_mode_create(opus_int32 Fs, int frame_size, int *error)
 #endif
    mode->window = window;
 
-   logN = (opus_int16*)opus_alloc(mode->nbEBands*sizeof(opus_int16));
+   logN = (oac_int16*)oac_alloc(mode->nbEBands*sizeof(oac_int16));
    if (logN==NULL)
       goto failure;
 
@@ -411,22 +411,22 @@ CELTMode *opus_custom_mode_create(opus_int32 Fs, int frame_size, int *error)
       goto failure;
 
    if (error)
-      *error = OPUS_OK;
+      *error = OAC_OK;
 
    return mode;
 failure:
    if (error)
-      *error = OPUS_ALLOC_FAIL;
+      *error = OAC_ALLOC_FAIL;
    if (mode!=NULL)
-      opus_custom_mode_destroy(mode);
+      oac_custom_mode_destroy(mode);
    return NULL;
 #endif /* !CUSTOM_MODES */
 }
 
-#if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API)
-void opus_custom_mode_destroy(CELTMode *mode)
+#if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
+void oac_custom_mode_destroy(CELTMode *mode)
 {
-   int arch = opus_select_arch();
+   int arch = oac_select_arch();
 
    if (mode == NULL)
       return;
@@ -443,18 +443,18 @@ void opus_custom_mode_destroy(CELTMode *mode)
    }
 #endif /* CUSTOM_MODES_ONLY */
 #ifdef CUSTOM_MODES
-   opus_free((opus_int16*)mode->eBands);
-   opus_free((unsigned char*)mode->allocVectors);
+   oac_free((oac_int16*)mode->eBands);
+   oac_free((unsigned char*)mode->allocVectors);
 
-   opus_free((opus_val16*)mode->window);
-   opus_free((opus_int16*)mode->logN);
+   oac_free((oac_val16*)mode->window);
+   oac_free((oac_int16*)mode->logN);
 
-   opus_free((opus_int16*)mode->cache.index);
-   opus_free((unsigned char*)mode->cache.bits);
-   opus_free((unsigned char*)mode->cache.caps);
+   oac_free((oac_int16*)mode->cache.index);
+   oac_free((unsigned char*)mode->cache.bits);
+   oac_free((unsigned char*)mode->cache.caps);
    clt_mdct_clear(&mode->mdct, arch);
 
-   opus_free((CELTMode *)mode);
+   oac_free((CELTMode *)mode);
 #else
    (void)arch;
    celt_assert(0);
diff --git a/celt/modes.h b/celt/modes.h
index c5f978061..8c45f72dd 100644
--- a/celt/modes.h
+++ b/celt/modes.h
@@ -30,7 +30,7 @@
 #ifndef MODES_H
 #define MODES_H
 
-#include "opus_types.h"
+#include "oac_types.h"
 #include "celt.h"
 #include "arch.h"
 #include "mdct.h"
@@ -43,7 +43,7 @@
 
 typedef struct {
    int size;
-   const opus_int16 *index;
+   const oac_int16 *index;
    const unsigned char *bits;
    const unsigned char *caps;
 } PulseCache;
@@ -51,14 +51,14 @@ typedef struct {
 /** Mode definition (opaque)
  @brief Mode definition
  */
-struct OpusCustomMode {
-   opus_int32 Fs;
+struct OacCustomMode {
+   oac_int32 Fs;
    int          overlap;
 
    int          nbEBands;
    int          effEBands;
-   opus_val16    preemph[4];
-   const opus_int16   *eBands;   /**< Definition for each "pseudo-critical band" */
+   oac_val16    preemph[4];
+   const oac_int16   *eBands;   /**< Definition for each "pseudo-critical band" */
 
    int         maxLM;
    int         nbShortMdcts;
@@ -66,7 +66,7 @@ struct OpusCustomMode {
 
    int          nbAllocVectors; /**< Number of lines in the matrix below */
    const unsigned char   *allocVectors;   /**< Number of bits in each band for several rates */
-   const opus_int16 *logN;
+   const oac_int16 *logN;
 
    const celt_coef *window;
    mdct_lookup mdct;
diff --git a/celt/opus_custom_demo.c b/celt/oac_custom_demo.c
similarity index 83%
rename from celt/opus_custom_demo.c
rename to celt/oac_custom_demo.c
index ca2269079..e1a14459e 100644
--- a/celt/opus_custom_demo.c
+++ b/celt/oac_custom_demo.c
@@ -30,7 +30,7 @@
 #include "config.h"
 #endif
 
-#include "opus_custom.h"
+#include "oac_custom.h"
 #include "arch.h"
 #include "modes.h"
 #include <stdio.h>
@@ -40,16 +40,16 @@
 
 #define MAX_PACKET 1275
 
-static OPUS_INLINE void _opus_ctl_failed(const char *file, int line)
+static OAC_INLINE void _oac_ctl_failed(const char *file, int line)
 {
    fprintf(stderr, "\n ***************************************************\n");
    fprintf(stderr, " ***         A fatal error was detected.         ***\n");
    fprintf(stderr, " ***************************************************\n");
    fprintf(stderr, "En/decoder ctl function %s failed at %d for %s.\n",
-           file, line, opus_get_version_string());
+           file, line, oac_get_version_string());
 }
 
-#define opus_ctl_failed() _opus_ctl_failed(__FILE__, __LINE__);
+#define oac_ctl_failed() _oac_ctl_failed(__FILE__, __LINE__);
 
 static void print_usage(char **argv) {
    fprintf (stderr, "Usage: %s [-e | -d] <rate> <channels> <frame size> "
@@ -66,7 +66,7 @@ static void print_usage(char **argv) {
    fprintf (stderr, "     -loss <percentage>       encoding (robsutness setting) and decoding (simulating loss)\n");
 }
 
-static void int_to_char(opus_uint32 i, unsigned char ch[4])
+static void int_to_char(oac_uint32 i, unsigned char ch[4])
 {
     ch[0] = i>>24;
     ch[1] = (i>>16)&0xFF;
@@ -74,10 +74,10 @@ static void int_to_char(opus_uint32 i, unsigned char ch[4])
     ch[3] = i&0xFF;
 }
 
-static opus_uint32 char_to_int(unsigned char ch[4])
+static oac_uint32 char_to_int(unsigned char ch[4])
 {
-    return ((opus_uint32)ch[0]<<24) | ((opus_uint32)ch[1]<<16)
-         | ((opus_uint32)ch[2]<< 8) |  (opus_uint32)ch[3];
+    return ((oac_uint32)ch[0]<<24) | ((oac_uint32)ch[1]<<16)
+         | ((oac_uint32)ch[2]<< 8) |  (oac_uint32)ch[3];
 }
 
 #define check_encoder_option(decode_only, opt) do {if (decode_only) {fprintf(stderr, "option %s is only for encoding\n", opt); goto failure;}} while(0)
@@ -90,7 +90,7 @@ static opus_uint32 char_to_int(unsigned char ch[4])
 static const int format_size[3] = {2, 3, 4};
 
 typedef union {
-    opus_int32 i;
+    oac_int32 i;
     float f;
 } float_bits;
 
@@ -100,16 +100,16 @@ int main(int argc, char *argv[])
    int err;
    int ret=1;
    int args;
-   opus_uint32 enc_final_range;
-   opus_uint32 dec_final_range;
+   oac_uint32 enc_final_range;
+   oac_uint32 dec_final_range;
    int encode_only=0, decode_only=0;
    char *inFile, *outFile;
    FILE *fin=NULL, *fout=NULL;
-   OpusCustomMode *mode=NULL;
-   OpusCustomEncoder *enc=NULL;
-   OpusCustomDecoder *dec=NULL;
+   OacCustomMode *mode=NULL;
+   OacCustomEncoder *enc=NULL;
+   OacCustomDecoder *dec=NULL;
    int len;
-   opus_int32 frame_size, channels, rate;
+   oac_int32 frame_size, channels, rate;
    int format=FORMAT_S16_LE;
    int bytes_per_packet=0;
    unsigned char data[MAX_PACKET];
@@ -120,8 +120,8 @@ int main(int argc, char *argv[])
    double rmsd = 0;
 #endif
    int count = 0;
-   opus_int32 skip;
-   opus_int32 *in=NULL, *out=NULL;
+   oac_int32 skip;
+   oac_int32 *in=NULL, *out=NULL;
    unsigned char *fbytes=NULL;
    args = 1;
    if (argc < 7)
@@ -139,7 +139,7 @@ int main(int argc, char *argv[])
       args++;
    }
 
-   rate = (opus_int32)atol(argv[args]);
+   rate = (oac_int32)atol(argv[args]);
    args++;
 
    if (rate != 8000 && rate != 12000
@@ -164,7 +164,7 @@ int main(int argc, char *argv[])
 
    if (channels < 1 || channels > 2)
    {
-       fprintf(stderr, "Opus_demo supports only 1 or 2 channels.\n");
+       fprintf(stderr, "Oac_demo supports only 1 or 2 channels.\n");
        goto failure;
    }
 
@@ -173,7 +173,7 @@ int main(int argc, char *argv[])
 
    if (!decode_only)
    {
-      bytes_per_packet = (opus_int32)atol(argv[args]);
+      bytes_per_packet = (oac_int32)atol(argv[args]);
       args++;
       if (bytes_per_packet < 0 || bytes_per_packet > MAX_PACKET)
       {
@@ -183,7 +183,7 @@ int main(int argc, char *argv[])
       }
    }
 
-   mode = opus_custom_mode_create(rate, frame_size, NULL);
+   mode = oac_custom_mode_create(rate, frame_size, NULL);
    if (mode == NULL)
    {
       fprintf(stderr, "failed to create a mode\n");
@@ -216,38 +216,38 @@ int main(int argc, char *argv[])
       }
    }
    if (!decode_only) {
-      enc = opus_custom_encoder_create(mode, channels, &err);
+      enc = oac_custom_encoder_create(mode, channels, &err);
       if (err != 0)
       {
-         fprintf(stderr, "Failed to create the encoder: %s\n", opus_strerror(err));
+         fprintf(stderr, "Failed to create the encoder: %s\n", oac_strerror(err));
          goto failure;
       }
       if (complexity >= 0)
       {
-         if(opus_custom_encoder_ctl(
-                  enc, OPUS_SET_COMPLEXITY(complexity)) != OPUS_OK) {
-            opus_ctl_failed();
+         if(oac_custom_encoder_ctl(
+                  enc, OAC_SET_COMPLEXITY(complexity)) != OAC_OK) {
+            oac_ctl_failed();
             goto failure;
          }
       }
       if (percent_loss >= 0) {
-         if(opus_custom_encoder_ctl(
-                  enc, OPUS_SET_PACKET_LOSS_PERC((int)percent_loss)) !=
-                        OPUS_OK) {
-            opus_ctl_failed();
+         if(oac_custom_encoder_ctl(
+                  enc, OAC_SET_PACKET_LOSS_PERC((int)percent_loss)) !=
+                        OAC_OK) {
+            oac_ctl_failed();
             goto failure;
          }
       }
    }
    if (!encode_only) {
-      dec = opus_custom_decoder_create(mode, channels, &err);
+      dec = oac_custom_decoder_create(mode, channels, &err);
       if (err != 0)
       {
-         fprintf(stderr, "Failed to create the decoder: %s\n", opus_strerror(err));
+         fprintf(stderr, "Failed to create the decoder: %s\n", oac_strerror(err));
          goto failure;
       }
-      if(opus_custom_decoder_ctl(dec, OPUS_GET_LOOKAHEAD(&skip)) != OPUS_OK) {
-         opus_ctl_failed();
+      if(oac_custom_decoder_ctl(dec, OAC_GET_LOOKAHEAD(&skip)) != OAC_OK) {
+         oac_ctl_failed();
          goto failure;
       }
    }
@@ -270,8 +270,8 @@ int main(int argc, char *argv[])
       fprintf (stderr, "Could not open output file %s\n", argv[argc-1]);
       goto failure;
    }
-   in = (opus_int32*)malloc(frame_size*channels*sizeof(opus_int32));
-   out = (opus_int32*)malloc(frame_size*channels*sizeof(opus_int32));
+   in = (oac_int32*)malloc(frame_size*channels*sizeof(oac_int32));
+   out = (oac_int32*)malloc(frame_size*channels*sizeof(oac_int32));
    fbytes = (unsigned char*)malloc(frame_size*channels*4);
 
    while (!feof(fin))
@@ -308,7 +308,7 @@ int main(int argc, char *argv[])
          if (format == FORMAT_S16_LE) {
             for(i=0;i<frame_size*channels;i++)
             {
-               opus_int32 s;
+               oac_int32 s;
                s=fbytes[2*i+1]<<8|fbytes[2*i];
                s=((s&0xFFFF)^0x8000)-0x8000;
                in[i]=s*256;
@@ -316,7 +316,7 @@ int main(int argc, char *argv[])
          } else if (format == FORMAT_S24_LE) {
             for(i=0;i<frame_size*channels;i++)
             {
-               opus_int32 s;
+               oac_int32 s;
                s=fbytes[3*i+2]<<16|fbytes[3*i+1]<<8|fbytes[3*i];
                s=((s&0xFFFFFF)^0x800000)-0x800000;
                in[i]=s;
@@ -329,14 +329,14 @@ int main(int argc, char *argv[])
                in[i]=(int)floor(.5 + s.f*8388608);
             }
          }
-         len = opus_custom_encode24(enc, in, frame_size, data, bytes_per_packet);
-         if (opus_custom_encoder_ctl(
-                   enc, OPUS_GET_FINAL_RANGE(&enc_final_range)) != OPUS_OK) {
-            opus_ctl_failed();
+         len = oac_custom_encode24(enc, in, frame_size, data, bytes_per_packet);
+         if (oac_custom_encoder_ctl(
+                   enc, OAC_GET_FINAL_RANGE(&enc_final_range)) != OAC_OK) {
+            oac_ctl_failed();
             goto failure;
          }
          if (len <= 0)
-            fprintf (stderr, "opus_custom_encode() failed: %s\n", opus_strerror(len));
+            fprintf (stderr, "oac_custom_encode() failed: %s\n", oac_strerror(len));
       }
 
       if (encode_only)
@@ -385,16 +385,16 @@ int main(int argc, char *argv[])
          lost = percent_loss != 0 && (float)rand()/(float)RAND_MAX<.01*percent_loss;
          if (lost)
             /*if (errors && (errors%2==0))*/
-            ret = opus_custom_decode24(dec, NULL, len, out, frame_size);
+            ret = oac_custom_decode24(dec, NULL, len, out, frame_size);
          else
-            ret = opus_custom_decode24(dec, data, len, out, frame_size);
-         if(opus_custom_decoder_ctl(
-                  dec, OPUS_GET_FINAL_RANGE(&dec_final_range)) != OPUS_OK) {
-            opus_ctl_failed();
+            ret = oac_custom_decode24(dec, data, len, out, frame_size);
+         if(oac_custom_decoder_ctl(
+                  dec, OAC_GET_FINAL_RANGE(&dec_final_range)) != OAC_OK) {
+            oac_ctl_failed();
             goto failure;
          }
          if (ret < 0)
-            fprintf(stderr, "opus_custom_decode() failed: %s\n", opus_strerror(ret));
+            fprintf(stderr, "oac_custom_decode() failed: %s\n", oac_strerror(ret));
 #else
          for (i=0;i<ret*channels;i++)
             out[i] = in[i];
@@ -412,7 +412,7 @@ int main(int argc, char *argv[])
          if (format == FORMAT_S16_LE) {
             for(i=0;i<(ret-skip)*channels;i++)
             {
-               opus_int32 s;
+               oac_int32 s;
                s=out[i+(skip*channels)];
                if (s > 0x007fff00) s = 0x007fff00;
                if (s < -0x007fff00) s = -0x007fff00;
@@ -423,7 +423,7 @@ int main(int argc, char *argv[])
          } else if (format == FORMAT_S24_LE) {
             for(i=0;i<(ret-skip)*channels;i++)
             {
-               opus_int32 s;
+               oac_int32 s;
                s=out[i+(skip*channels)];
                if (s > 0x007fffff) s = 0x007fffff;
                if (s < -0x007fffff) s = -0x007fffff;
@@ -479,11 +479,11 @@ int main(int argc, char *argv[])
 #endif
 failure:
    /* Cleanup after ourselves. */
-   if (enc) opus_custom_encoder_destroy(enc);
-   if (dec) opus_custom_decoder_destroy(dec);
+   if (enc) oac_custom_encoder_destroy(enc);
+   if (dec) oac_custom_decoder_destroy(dec);
    if (fin) fclose(fin);
    if (fout) fclose(fout);
-   if (mode) opus_custom_mode_destroy(mode);
+   if (mode) oac_custom_mode_destroy(mode);
    if (in) free(in);
    if (out) free(out);
    if (fbytes) free(fbytes);
diff --git a/celt/os_support.h b/celt/os_support.h
index 48d742b3d..c86bbfb0e 100644
--- a/celt/os_support.h
+++ b/celt/os_support.h
@@ -35,22 +35,22 @@
 #  include "custom_support.h"
 #endif
 
-#include "opus_types.h"
-#include "opus_defines.h"
+#include "oac_types.h"
+#include "oac_defines.h"
 
 #include <string.h>
 #include <stdlib.h>
 
-/** Opus wrapper for malloc(). To do your own dynamic allocation replace this function, opus_realloc, and opus_free */
-#ifndef OVERRIDE_OPUS_ALLOC
-static OPUS_INLINE void *opus_alloc (size_t size)
+/** Oac wrapper for malloc(). To do your own dynamic allocation replace this function, oac_realloc, and oac_free */
+#ifndef OVERRIDE_OAC_ALLOC
+static OAC_INLINE void *oac_alloc (size_t size)
 {
    return malloc(size);
 }
 #endif
 
-#ifndef OVERRIDE_OPUS_REALLOC
-static OPUS_INLINE void *opus_realloc (void *ptr, size_t size)
+#ifndef OVERRIDE_OAC_REALLOC
+static OAC_INLINE void *oac_realloc (void *ptr, size_t size)
 {
    return realloc(ptr, size);
 }
@@ -58,36 +58,36 @@ static OPUS_INLINE void *opus_realloc (void *ptr, size_t size)
 
 /** Used only for non-threadsafe pseudostack.
     If desired, this can always return the same area of memory rather than allocating a new one every time. */
-#ifndef OVERRIDE_OPUS_ALLOC_SCRATCH
-static OPUS_INLINE void *opus_alloc_scratch (size_t size)
+#ifndef OVERRIDE_OAC_ALLOC_SCRATCH
+static OAC_INLINE void *oac_alloc_scratch (size_t size)
 {
    /* Scratch space doesn't need to be cleared */
-   return opus_alloc(size);
+   return oac_alloc(size);
 }
 #endif
 
-/** Opus wrapper for free(). To do your own dynamic allocation replace this function, opus_realloc, and opus_free */
-#ifndef OVERRIDE_OPUS_FREE
-static OPUS_INLINE void opus_free (void *ptr)
+/** Oac wrapper for free(). To do your own dynamic allocation replace this function, oac_realloc, and oac_free */
+#ifndef OVERRIDE_OAC_FREE
+static OAC_INLINE void oac_free (void *ptr)
 {
    free(ptr);
 }
 #endif
 
 /** Copy n elements from src to dst. The 0* term provides compile-time type checking  */
-#ifndef OVERRIDE_OPUS_COPY
-#define OPUS_COPY(dst, src, n) (memcpy((dst), (src), (n)*sizeof(*(dst)) + 0*((dst)-(src)) ))
+#ifndef OVERRIDE_OAC_COPY
+#define OAC_COPY(dst, src, n) (memcpy((dst), (src), (n)*sizeof(*(dst)) + 0*((dst)-(src)) ))
 #endif
 
 /** Copy n elements from src to dst, allowing overlapping regions. The 0* term
     provides compile-time type checking */
-#ifndef OVERRIDE_OPUS_MOVE
-#define OPUS_MOVE(dst, src, n) (memmove((dst), (src), (n)*sizeof(*(dst)) + 0*((dst)-(src)) ))
+#ifndef OVERRIDE_OAC_MOVE
+#define OAC_MOVE(dst, src, n) (memmove((dst), (src), (n)*sizeof(*(dst)) + 0*((dst)-(src)) ))
 #endif
 
 /** Set n elements of dst to zero */
-#ifndef OVERRIDE_OPUS_CLEAR
-#define OPUS_CLEAR(dst, n) (memset((dst), 0, (n)*sizeof(*(dst))))
+#ifndef OVERRIDE_OAC_CLEAR
+#define OAC_CLEAR(dst, n) (memset((dst), 0, (n)*sizeof(*(dst))))
 #endif
 
 /*#ifdef __GNUC__
diff --git a/celt/pitch.c b/celt/pitch.c
index fe3b0bd31..0fa83b338 100644
--- a/celt/pitch.c
+++ b/celt/pitch.c
@@ -42,17 +42,17 @@
 #include "mathops.h"
 #include "celt_lpc.h"
 
-static void find_best_pitch(opus_val32 *xcorr, opus_val16 *y, int len,
+static void find_best_pitch(oac_val32 *xcorr, oac_val16 *y, int len,
                             int max_pitch, int *best_pitch
 #ifdef FIXED_POINT
-                            , int yshift, opus_val32 maxcorr
+                            , int yshift, oac_val32 maxcorr
 #endif
                             )
 {
    int i, j;
-   opus_val32 Syy=1;
-   opus_val16 best_num[2];
-   opus_val32 best_den[2];
+   oac_val32 Syy=1;
+   oac_val16 best_num[2];
+   oac_val32 best_den[2];
 #ifdef FIXED_POINT
    int xshift;
 
@@ -71,8 +71,8 @@ static void find_best_pitch(opus_val32 *xcorr, opus_val16 *y, int len,
    {
       if (xcorr[i]>0)
       {
-         opus_val16 num;
-         opus_val32 xcorr16;
+         oac_val16 num;
+         oac_val32 xcorr16;
          xcorr16 = EXTRACT16(VSHR32(xcorr[i], xshift));
 #ifndef FIXED_POINT
          /* Considering the range of xcorr16, this should avoid both underflows
@@ -102,13 +102,13 @@ static void find_best_pitch(opus_val32 *xcorr, opus_val16 *y, int len,
    }
 }
 
-static void celt_fir5(opus_val16 *x,
-         const opus_val16 *num,
+static void celt_fir5(oac_val16 *x,
+         const oac_val16 *num,
          int N)
 {
    int i;
-   opus_val16 num0, num1, num2, num3, num4;
-   opus_val32 mem0, mem1, mem2, mem3, mem4;
+   oac_val16 num0, num1, num2, num3, num4;
+   oac_val32 mem0, mem1, mem2, mem3, mem4;
    num0=num[0];
    num1=num[1];
    num2=num[2];
@@ -121,7 +121,7 @@ static void celt_fir5(opus_val16 *x,
    mem4=0;
    for (i=0;i<N;i++)
    {
-      opus_val32 sum = SHL32(EXTEND32(x[i]), SIG_SHIFT);
+      oac_val32 sum = SHL32(EXTEND32(x[i]), SIG_SHIFT);
       sum = MAC16_16(sum,num0,mem0);
       sum = MAC16_16(sum,num1,mem1);
       sum = MAC16_16(sum,num2,mem2);
@@ -137,26 +137,26 @@ static void celt_fir5(opus_val16 *x,
 }
 
 
-void pitch_downsample(celt_sig * OPUS_RESTRICT x[], opus_val16 * OPUS_RESTRICT x_lp,
+void pitch_downsample(celt_sig * OAC_RESTRICT x[], oac_val16 * OAC_RESTRICT x_lp,
       int len, int C, int factor, int arch)
 {
    int i;
-   opus_val32 ac[5];
-   opus_val16 tmp=Q15ONE;
-   opus_val16 lpc[4];
-   opus_val16 lpc2[5];
-   opus_val16 c1 = QCONST16(.8f,15);
+   oac_val32 ac[5];
+   oac_val16 tmp=Q15ONE;
+   oac_val16 lpc[4];
+   oac_val16 lpc2[5];
+   oac_val16 c1 = QCONST16(.8f,15);
    int offset;
 #ifdef FIXED_POINT
    int shift;
-   opus_val32 maxabs;
+   oac_val32 maxabs;
 #endif
    offset = factor/2;
 #ifdef FIXED_POINT
    maxabs = celt_maxabs32(x[0], len*factor);
    if (C==2)
    {
-      opus_val32 maxabs_1 = celt_maxabs32(x[1], len*factor);
+      oac_val32 maxabs_1 = celt_maxabs32(x[1], len*factor);
       maxabs = MAX32(maxabs, maxabs_1);
    }
    if (maxabs<1)
@@ -223,26 +223,26 @@ void pitch_downsample(celt_sig * OPUS_RESTRICT x[], opus_val16 * OPUS_RESTRICT x
 
 /* Pure C implementation. */
 #ifdef FIXED_POINT
-opus_val32
+oac_val32
 #else
 void
 #endif
-celt_pitch_xcorr_c(const opus_val16 *_x, const opus_val16 *_y,
-      opus_val32 *xcorr, int len, int max_pitch, int arch)
+celt_pitch_xcorr_c(const oac_val16 *_x, const oac_val16 *_y,
+      oac_val32 *xcorr, int len, int max_pitch, int arch)
 {
 
 #if 0 /* This is a simple version of the pitch correlation that should work
          well on DSPs like Blackfin and TI C5x/C6x */
    int i, j;
 #ifdef FIXED_POINT
-   opus_val32 maxcorr=1;
+   oac_val32 maxcorr=1;
 #endif
 #if !defined(OVERRIDE_PITCH_XCORR)
    (void)arch;
 #endif
    for (i=0;i<max_pitch;i++)
    {
-      opus_val32 sum = 0;
+      oac_val32 sum = 0;
       for (j=0;j<len;j++)
          sum = MAC16_16(sum, _x[j], _y[i+j]);
       xcorr[i] = sum;
@@ -260,20 +260,20 @@ celt_pitch_xcorr_c(const opus_val16 *_x, const opus_val16 *_y,
       32-bit aligned.
      Since it's hard to put asserts in assembly, put them here.*/
 #ifdef FIXED_POINT
-   opus_val32 maxcorr=1;
+   oac_val32 maxcorr=1;
 #endif
    celt_assert(max_pitch>0);
    celt_sig_assert(((size_t)_x&3)==0);
    for (i=0;i<max_pitch-3;i+=4)
    {
-      opus_val32 sum[4]={0,0,0,0};
-#if defined(OPUS_CHECK_ASM) && defined(FIXED_POINT)
+      oac_val32 sum[4]={0,0,0,0};
+#if defined(OAC_CHECK_ASM) && defined(FIXED_POINT)
       {
-         opus_val32 sum_c[4]={0,0,0,0};
+         oac_val32 sum_c[4]={0,0,0,0};
          xcorr_kernel_c(_x, _y+i, sum_c, len);
 #endif
          xcorr_kernel(_x, _y+i, sum, len, arch);
-#if defined(OPUS_CHECK_ASM) && defined(FIXED_POINT)
+#if defined(OAC_CHECK_ASM) && defined(FIXED_POINT)
          celt_assert(memcmp(sum, sum_c, sizeof(sum)) == 0);
       }
 #endif
@@ -291,7 +291,7 @@ celt_pitch_xcorr_c(const opus_val16 *_x, const opus_val16 *_y,
    /* In case max_pitch isn't a multiple of 4, do non-unrolled version. */
    for (;i<max_pitch;i++)
    {
-      opus_val32 sum;
+      oac_val32 sum;
       sum = celt_inner_prod(_x, _y+i, len, arch);
       xcorr[i] = sum;
 #ifdef FIXED_POINT
@@ -304,18 +304,18 @@ celt_pitch_xcorr_c(const opus_val16 *_x, const opus_val16 *_y,
 #endif
 }
 
-void pitch_search(const opus_val16 * OPUS_RESTRICT x_lp, opus_val16 * OPUS_RESTRICT y,
+void pitch_search(const oac_val16 * OAC_RESTRICT x_lp, oac_val16 * OAC_RESTRICT y,
                   int len, int max_pitch, int *pitch, int arch)
 {
    int i, j;
    int lag;
    int best_pitch[2]={0,0};
-   VARDECL(opus_val16, x_lp4);
-   VARDECL(opus_val16, y_lp4);
-   VARDECL(opus_val32, xcorr);
+   VARDECL(oac_val16, x_lp4);
+   VARDECL(oac_val16, y_lp4);
+   VARDECL(oac_val32, xcorr);
 #ifdef FIXED_POINT
-   opus_val32 maxcorr;
-   opus_val32 xmax, ymax;
+   oac_val32 maxcorr;
+   oac_val32 xmax, ymax;
    int shift=0;
 #endif
    int offset;
@@ -326,9 +326,9 @@ void pitch_search(const opus_val16 * OPUS_RESTRICT x_lp, opus_val16 * OPUS_RESTR
    celt_assert(max_pitch>0);
    lag = len+max_pitch;
 
-   ALLOC(x_lp4, len>>2, opus_val16);
-   ALLOC(y_lp4, lag>>2, opus_val16);
-   ALLOC(xcorr, max_pitch>>1, opus_val32);
+   ALLOC(x_lp4, len>>2, oac_val16);
+   ALLOC(y_lp4, lag>>2, oac_val16);
+   ALLOC(xcorr, max_pitch>>1, oac_val32);
 
    /* Downsample by 2 again */
    for (j=0;j<len>>2;j++)
@@ -372,7 +372,7 @@ void pitch_search(const opus_val16 * OPUS_RESTRICT x_lp, opus_val16 * OPUS_RESTR
 #endif
    for (i=0;i<max_pitch>>1;i++)
    {
-      opus_val32 sum;
+      oac_val32 sum;
       xcorr[i] = 0;
       if (abs(i-2*best_pitch[0])>2 && abs(i-2*best_pitch[1])>2)
          continue;
@@ -397,7 +397,7 @@ void pitch_search(const opus_val16 * OPUS_RESTRICT x_lp, opus_val16 * OPUS_RESTR
    /* Refine by pseudo-interpolation */
    if (best_pitch[0]>0 && best_pitch[0]<(max_pitch>>1)-1)
    {
-      opus_val32 a, b, c;
+      oac_val32 a, b, c;
       a = xcorr[best_pitch[0]-1];
       b = xcorr[best_pitch[0]];
       c = xcorr[best_pitch[0]+1];
@@ -416,12 +416,12 @@ void pitch_search(const opus_val16 * OPUS_RESTRICT x_lp, opus_val16 * OPUS_RESTR
 }
 
 #ifdef FIXED_POINT
-static opus_val16 compute_pitch_gain(opus_val32 xy, opus_val32 xx, opus_val32 yy)
+static oac_val16 compute_pitch_gain(oac_val32 xy, oac_val32 xx, oac_val32 yy)
 {
-   opus_val32 x2y2;
+   oac_val32 x2y2;
    int sx, sy, shift;
-   opus_val32 g;
-   opus_val16 den;
+   oac_val32 g;
+   oac_val16 den;
    if (xy == 0 || xx == 0 || yy == 0)
       return 0;
    sx = celt_ilog2(xx)-14;
@@ -444,25 +444,25 @@ static opus_val16 compute_pitch_gain(opus_val32 xy, opus_val32 xx, opus_val32 yy
    return EXTRACT16(MAX32(-Q15ONE, MIN32(g, Q15ONE)));
 }
 #else
-static opus_val16 compute_pitch_gain(opus_val32 xy, opus_val32 xx, opus_val32 yy)
+static oac_val16 compute_pitch_gain(oac_val32 xy, oac_val32 xx, oac_val32 yy)
 {
    return xy/celt_sqrt(1+xx*yy);
 }
 #endif
 
 static const int second_check[16] = {0, 0, 3, 2, 3, 2, 5, 2, 3, 2, 3, 2, 5, 2, 3, 2};
-opus_val16 remove_doubling(opus_val16 *x, int maxperiod, int minperiod,
-      int N, int *T0_, int prev_period, opus_val16 prev_gain, int arch)
+oac_val16 remove_doubling(oac_val16 *x, int maxperiod, int minperiod,
+      int N, int *T0_, int prev_period, oac_val16 prev_gain, int arch)
 {
    int k, i, T, T0;
-   opus_val16 g, g0;
-   opus_val16 pg;
-   opus_val32 xy,xx,yy,xy2;
-   opus_val32 xcorr[3];
-   opus_val32 best_xy, best_yy;
+   oac_val16 g, g0;
+   oac_val16 pg;
+   oac_val32 xy,xx,yy,xy2;
+   oac_val32 xcorr[3];
+   oac_val32 best_xy, best_yy;
    int offset;
    int minperiod0;
-   VARDECL(opus_val32, yy_lookup);
+   VARDECL(oac_val32, yy_lookup);
    SAVE_STACK;
 
    minperiod0 = minperiod;
@@ -476,7 +476,7 @@ opus_val16 remove_doubling(opus_val16 *x, int maxperiod, int minperiod,
       *T0_=maxperiod-1;
 
    T = T0 = *T0_;
-   ALLOC(yy_lookup, maxperiod+1, opus_val32);
+   ALLOC(yy_lookup, maxperiod+1, oac_val32);
    dual_inner_prod(x, x, x-T0, N, &xx, &xy, arch);
    yy_lookup[0] = xx;
    yy=xx;
@@ -493,9 +493,9 @@ opus_val16 remove_doubling(opus_val16 *x, int maxperiod, int minperiod,
    for (k=2;k<=15;k++)
    {
       int T1, T1b;
-      opus_val16 g1;
-      opus_val16 cont=0;
-      opus_val16 thresh;
+      oac_val16 g1;
+      oac_val16 cont=0;
+      oac_val16 thresh;
       T1 = celt_udiv(2*T0+k, 2*k);
       if (T1 < minperiod)
          break;
diff --git a/celt/pitch.h b/celt/pitch.h
index e5eecdd9a..5a7966057 100644
--- a/celt/pitch.h
+++ b/celt/pitch.h
@@ -37,8 +37,8 @@
 #include "modes.h"
 #include "cpu_support.h"
 
-#if (defined(OPUS_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)) \
-  || ((defined(OPUS_X86_MAY_HAVE_SSE4_1) || defined(OPUS_X86_MAY_HAVE_SSE2)) && defined(FIXED_POINT))
+#if (defined(OAC_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)) \
+  || ((defined(OAC_X86_MAY_HAVE_SSE4_1) || defined(OAC_X86_MAY_HAVE_SSE2)) && defined(FIXED_POINT))
 #include "x86/pitch_sse.h"
 #endif
 
@@ -46,26 +46,26 @@
 #include "mips/pitch_mipsr1.h"
 #endif
 
-#if (defined(OPUS_ARM_ASM) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR))
+#if (defined(OAC_ARM_ASM) || defined(OAC_ARM_MAY_HAVE_NEON_INTR))
 # include "arm/pitch_arm.h"
 #endif
 
-void pitch_downsample(celt_sig * OPUS_RESTRICT x[], opus_val16 * OPUS_RESTRICT x_lp,
+void pitch_downsample(celt_sig * OAC_RESTRICT x[], oac_val16 * OAC_RESTRICT x_lp,
       int len, int C, int factor, int arch);
 
-void pitch_search(const opus_val16 * OPUS_RESTRICT x_lp, opus_val16 * OPUS_RESTRICT y,
+void pitch_search(const oac_val16 * OAC_RESTRICT x_lp, oac_val16 * OAC_RESTRICT y,
                   int len, int max_pitch, int *pitch, int arch);
 
-opus_val16 remove_doubling(opus_val16 *x, int maxperiod, int minperiod,
-      int N, int *T0, int prev_period, opus_val16 prev_gain, int arch);
+oac_val16 remove_doubling(oac_val16 *x, int maxperiod, int minperiod,
+      int N, int *T0, int prev_period, oac_val16 prev_gain, int arch);
 
 
 /* OPT: This is the kernel you really want to optimize. It gets used a lot
    by the prefilter and by the PLC. */
-static OPUS_INLINE void xcorr_kernel_c(const opus_val16 * x, const opus_val16 * y, opus_val32 sum[4], int len)
+static OAC_INLINE void xcorr_kernel_c(const oac_val16 * x, const oac_val16 * y, oac_val32 sum[4], int len)
 {
    int j;
-   opus_val16 y_0, y_1, y_2, y_3;
+   oac_val16 y_0, y_1, y_2, y_3;
    celt_assert(len>=3);
    y_3=0; /* gcc doesn't realize that y_3 can't be used uninitialized */
    y_0=*y++;
@@ -73,7 +73,7 @@ static OPUS_INLINE void xcorr_kernel_c(const opus_val16 * x, const opus_val16 *
    y_2=*y++;
    for (j=0;j<len-3;j+=4)
    {
-      opus_val16 tmp;
+      oac_val16 tmp;
       tmp = *x++;
       y_3=*y++;
       sum[0] = MAC16_16(sum[0],tmp,y_0);
@@ -101,7 +101,7 @@ static OPUS_INLINE void xcorr_kernel_c(const opus_val16 * x, const opus_val16 *
    }
    if (j++<len)
    {
-      opus_val16 tmp = *x++;
+      oac_val16 tmp = *x++;
       y_3=*y++;
       sum[0] = MAC16_16(sum[0],tmp,y_0);
       sum[1] = MAC16_16(sum[1],tmp,y_1);
@@ -110,7 +110,7 @@ static OPUS_INLINE void xcorr_kernel_c(const opus_val16 * x, const opus_val16 *
    }
    if (j++<len)
    {
-      opus_val16 tmp=*x++;
+      oac_val16 tmp=*x++;
       y_0=*y++;
       sum[0] = MAC16_16(sum[0],tmp,y_1);
       sum[1] = MAC16_16(sum[1],tmp,y_2);
@@ -119,7 +119,7 @@ static OPUS_INLINE void xcorr_kernel_c(const opus_val16 * x, const opus_val16 *
    }
    if (j<len)
    {
-      opus_val16 tmp=*x++;
+      oac_val16 tmp=*x++;
       y_1=*y++;
       sum[0] = MAC16_16(sum[0],tmp,y_2);
       sum[1] = MAC16_16(sum[1],tmp,y_3);
@@ -134,12 +134,12 @@ static OPUS_INLINE void xcorr_kernel_c(const opus_val16 * x, const opus_val16 *
 #endif /* OVERRIDE_XCORR_KERNEL */
 
 
-static OPUS_INLINE void dual_inner_prod_c(const opus_val16 *x, const opus_val16 *y01, const opus_val16 *y02,
-      int N, opus_val32 *xy1, opus_val32 *xy2)
+static OAC_INLINE void dual_inner_prod_c(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
+      int N, oac_val32 *xy1, oac_val32 *xy2)
 {
    int i;
-   opus_val32 xy01=0;
-   opus_val32 xy02=0;
+   oac_val32 xy01=0;
+   oac_val32 xy02=0;
    for (i=0;i<N;i++)
    {
       xy01 = MAC16_16(xy01, x[i], y01[i]);
@@ -156,11 +156,11 @@ static OPUS_INLINE void dual_inner_prod_c(const opus_val16 *x, const opus_val16
 
 /*We make sure a C version is always available for cases where the overhead of
   vectorization and passing around an arch flag aren't worth it.*/
-static OPUS_INLINE opus_val32 celt_inner_prod_c(const opus_val16 *x,
-      const opus_val16 *y, int N)
+static OAC_INLINE oac_val32 celt_inner_prod_c(const oac_val16 *x,
+      const oac_val16 *y, int N)
 {
    int i;
-   opus_val32 xy=0;
+   oac_val32 xy=0;
    for (i=0;i<N;i++)
       xy = MAC16_16(xy, x[i], y[i]);
    return xy;
@@ -172,26 +172,26 @@ static OPUS_INLINE opus_val32 celt_inner_prod_c(const opus_val16 *x,
 #endif
 
 #ifdef NON_STATIC_COMB_FILTER_CONST_C
-void comb_filter_const_c(opus_val32 *y, opus_val32 *x, int T, int N,
-     opus_val16 g10, opus_val16 g11, opus_val16 g12);
+void comb_filter_const_c(oac_val32 *y, oac_val32 *x, int T, int N,
+     oac_val16 g10, oac_val16 g11, oac_val16 g12);
 #endif
 
 
 #ifdef FIXED_POINT
-opus_val32
+oac_val32
 #else
 void
 #endif
-celt_pitch_xcorr_c(const opus_val16 *_x, const opus_val16 *_y,
-      opus_val32 *xcorr, int len, int max_pitch, int arch);
+celt_pitch_xcorr_c(const oac_val16 *_x, const oac_val16 *_y,
+      oac_val32 *xcorr, int len, int max_pitch, int arch);
 
 #ifndef OVERRIDE_PITCH_XCORR
 # define celt_pitch_xcorr celt_pitch_xcorr_c
 #endif
 
 #ifdef NON_STATIC_COMB_FILTER_CONST_C
-void comb_filter_const_c(opus_val32 *y, opus_val32 *x, int T, int N,
-                         opus_val16 g10, opus_val16 g11, opus_val16 g12);
+void comb_filter_const_c(oac_val32 *y, oac_val32 *x, int T, int N,
+                         oac_val16 g10, oac_val16 g11, oac_val16 g12);
 #endif
 
 #ifndef OVERRIDE_COMB_FILTER_CONST
diff --git a/celt/quant_bands.c b/celt/quant_bands.c
index 4bb1e286e..0be2b3b22 100644
--- a/celt/quant_bands.c
+++ b/celt/quant_bands.c
@@ -50,7 +50,7 @@ const signed char eMeans[25] = {
 };
 #else
 /* Mean energy in each band quantized in Q4 and converted back to float */
-const opus_val16 eMeans[25] = {
+const oac_val16 eMeans[25] = {
       6.437500f, 6.250000f, 5.750000f, 5.312500f, 5.062500f,
       4.812500f, 4.500000f, 4.375000f, 4.875000f, 4.687500f,
       4.562500f, 4.437500f, 4.875000f, 4.625000f, 4.312500f,
@@ -60,13 +60,13 @@ const opus_val16 eMeans[25] = {
 #endif
 /* prediction coefficients: 0.9, 0.8, 0.65, 0.5 */
 #ifdef FIXED_POINT
-static const opus_val16 pred_coef[4] = {29440, 26112, 21248, 16384};
-static const opus_val16 beta_coef[4] = {30147, 22282, 12124, 6554};
-static const opus_val16 beta_intra = 4915;
+static const oac_val16 pred_coef[4] = {29440, 26112, 21248, 16384};
+static const oac_val16 beta_coef[4] = {30147, 22282, 12124, 6554};
+static const oac_val16 beta_intra = 4915;
 #else
-static const opus_val16 pred_coef[4] = {29440/32768., 26112/32768., 21248/32768., 16384/32768.};
-static const opus_val16 beta_coef[4] = {30147/32768., 22282/32768., 12124/32768., 6554/32768.};
-static const opus_val16 beta_intra = 4915/32768.;
+static const oac_val16 pred_coef[4] = {29440/32768., 26112/32768., 21248/32768., 16384/32768.};
+static const oac_val16 beta_coef[4] = {30147/32768., 22282/32768., 12124/32768., 6554/32768.};
+static const oac_val16 beta_intra = 4915/32768.;
 #endif
 
 /*Parameters of the Laplace-like probability models used for the coarse energy.
@@ -139,10 +139,10 @@ static const unsigned char e_prob_model[4][2][42] = {
 
 static const unsigned char small_energy_icdf[3]={2,1,0};
 
-static opus_val32 loss_distortion(const celt_glog *eBands, celt_glog *oldEBands, int start, int end, int len, int C)
+static oac_val32 loss_distortion(const celt_glog *eBands, celt_glog *oldEBands, int start, int end, int len, int C)
 {
    int c, i;
-   opus_val32 dist = 0;
+   oac_val32 dist = 0;
    c=0; do {
       for (i=start;i<end;i++)
       {
@@ -155,15 +155,15 @@ static opus_val32 loss_distortion(const celt_glog *eBands, celt_glog *oldEBands,
 
 static int quant_coarse_energy_impl(const CELTMode *m, int start, int end,
       const celt_glog *eBands, celt_glog *oldEBands,
-      opus_int32 budget, opus_int32 tell,
+      oac_int32 budget, oac_int32 tell,
       const unsigned char *prob_model, celt_glog *error, ec_enc *enc,
       int C, int LM, int intra, celt_glog max_decay, int lfe)
 {
    int i, c;
    int badness = 0;
-   opus_val32 prev[2] = {0,0};
-   opus_val16 coef;
-   opus_val16 beta;
+   oac_val32 prev[2] = {0,0};
+   oac_val16 coef;
+   oac_val16 beta;
 
    if (tell+3 <= budget)
       ec_enc_bit_logp(enc, intra, 3);
@@ -183,9 +183,9 @@ static int quant_coarse_energy_impl(const CELTMode *m, int start, int end,
       do {
          int bits_left;
          int qi, qi0;
-         opus_val32 q;
+         oac_val32 q;
          celt_glog x;
-         opus_val32 f, tmp;
+         oac_val32 f, tmp;
          celt_glog oldE;
          celt_glog decay_bound;
          x = eBands[i+c*m->nbEBands];
@@ -194,7 +194,7 @@ static int quant_coarse_energy_impl(const CELTMode *m, int start, int end,
          f = x - MULT16_32_Q15(coef,oldE) - prev[c];
          /* Rounding to nearest integer here is really important! */
          qi = (f+QCONST32(.5f,DB_SHIFT))>>DB_SHIFT;
-         decay_bound = MAXG(-GCONST(28.f), SUB32((opus_val32)oldEBands[i+c*m->nbEBands],max_decay));
+         decay_bound = MAXG(-GCONST(28.f), SUB32((oac_val32)oldEBands[i+c*m->nbEBands],max_decay));
 #else
          f = x-coef*oldE-prev[c];
          /* Rounding to nearest integer here is really important! */
@@ -244,7 +244,7 @@ static int quant_coarse_energy_impl(const CELTMode *m, int start, int end,
             qi = -1;
          error[i+c*m->nbEBands] = f - SHL32(qi,DB_SHIFT);
          badness += abs(qi0-qi);
-         q = (opus_val32)SHL32(EXTEND32(qi),DB_SHIFT);
+         q = (oac_val32)SHL32(EXTEND32(qi),DB_SHIFT);
 
          tmp = MULT16_32_Q15(coef,oldE) + prev[c] + q;
 #ifdef FIXED_POINT
@@ -258,23 +258,23 @@ static int quant_coarse_energy_impl(const CELTMode *m, int start, int end,
 }
 
 void quant_coarse_energy(const CELTMode *m, int start, int end, int effEnd,
-      const celt_glog *eBands, celt_glog *oldEBands, opus_uint32 budget,
+      const celt_glog *eBands, celt_glog *oldEBands, oac_uint32 budget,
       celt_glog *error, ec_enc *enc, int C, int LM, int nbAvailableBytes,
-      int force_intra, opus_val32 *delayedIntra, int two_pass, int loss_rate, int lfe)
+      int force_intra, oac_val32 *delayedIntra, int two_pass, int loss_rate, int lfe)
 {
    int intra;
    celt_glog max_decay;
    VARDECL(celt_glog, oldEBands_intra);
    VARDECL(celt_glog, error_intra);
    ec_enc enc_start_state;
-   opus_uint32 tell;
+   oac_uint32 tell;
    int badness1=0;
-   opus_int32 intra_bias;
-   opus_val32 new_distortion;
+   oac_int32 intra_bias;
+   oac_val32 new_distortion;
    SAVE_STACK;
 
    intra = force_intra || (!two_pass && *delayedIntra>2*C*(end-start) && nbAvailableBytes > (end-start)*C);
-   intra_bias = (opus_int32)((budget**delayedIntra*loss_rate)/(C*512));
+   intra_bias = (oac_int32)((budget**delayedIntra*loss_rate)/(C*512));
    new_distortion = loss_distortion(eBands, oldEBands, start, effEnd, m->nbEBands, C);
 
    tell = ec_tell(enc);
@@ -296,7 +296,7 @@ void quant_coarse_energy(const CELTMode *m, int start, int end, int effEnd,
 
    ALLOC(oldEBands_intra, C*m->nbEBands, celt_glog);
    ALLOC(error_intra, C*m->nbEBands, celt_glog);
-   OPUS_COPY(oldEBands_intra, oldEBands, C*m->nbEBands);
+   OAC_COPY(oldEBands_intra, oldEBands, C*m->nbEBands);
 
    if (two_pass || intra)
    {
@@ -308,10 +308,10 @@ void quant_coarse_energy(const CELTMode *m, int start, int end, int effEnd,
    {
       unsigned char *intra_buf;
       ec_enc enc_intra_state;
-      opus_int32 tell_intra;
-      opus_uint32 nstart_bytes;
-      opus_uint32 nintra_bytes;
-      opus_uint32 save_bytes;
+      oac_int32 tell_intra;
+      oac_uint32 nstart_bytes;
+      oac_uint32 nintra_bytes;
+      oac_uint32 save_bytes;
       int badness2;
       VARDECL(unsigned char, intra_bits);
 
@@ -327,25 +327,25 @@ void quant_coarse_energy(const CELTMode *m, int start, int end, int effEnd,
          save_bytes = ALLOC_NONE;
       ALLOC(intra_bits, save_bytes, unsigned char);
       /* Copy bits from intra bit-stream */
-      OPUS_COPY(intra_bits, intra_buf, nintra_bytes - nstart_bytes);
+      OAC_COPY(intra_bits, intra_buf, nintra_bytes - nstart_bytes);
 
       *enc = enc_start_state;
 
       badness2 = quant_coarse_energy_impl(m, start, end, eBands, oldEBands, budget,
             tell, e_prob_model[LM][intra], error, enc, C, LM, 0, max_decay, lfe);
 
-      if (two_pass && (badness1 < badness2 || (badness1 == badness2 && ((opus_int32)ec_tell_frac(enc))+intra_bias > tell_intra)))
+      if (two_pass && (badness1 < badness2 || (badness1 == badness2 && ((oac_int32)ec_tell_frac(enc))+intra_bias > tell_intra)))
       {
          *enc = enc_intra_state;
          /* Copy intra bits to bit-stream */
-         OPUS_COPY(intra_buf, intra_bits, nintra_bytes - nstart_bytes);
-         OPUS_COPY(oldEBands, oldEBands_intra, C*m->nbEBands);
-         OPUS_COPY(error, error_intra, C*m->nbEBands);
+         OAC_COPY(intra_buf, intra_bits, nintra_bytes - nstart_bytes);
+         OAC_COPY(oldEBands, oldEBands_intra, C*m->nbEBands);
+         OAC_COPY(error, error_intra, C*m->nbEBands);
          intra = 1;
       }
    } else {
-      OPUS_COPY(oldEBands, oldEBands_intra, C*m->nbEBands);
-      OPUS_COPY(error, error_intra, C*m->nbEBands);
+      OAC_COPY(oldEBands, oldEBands_intra, C*m->nbEBands);
+      OAC_COPY(error, error_intra, C*m->nbEBands);
    }
 
    if (intra)
@@ -363,11 +363,11 @@ void quant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEBan
    /* Encode finer resolution */
    for (i=start;i<end;i++)
    {
-      opus_int16 extra, prev;
+      oac_int16 extra, prev;
       extra = 1<<extra_quant[i];
       if (extra_quant[i] <= 0)
          continue;
-      if (ec_tell(enc)+C*extra_quant[i] > (opus_int32)enc->storage*8) continue;
+      if (ec_tell(enc)+C*extra_quant[i] > (oac_int32)enc->storage*8) continue;
       prev = (prev_quant!=NULL) ? prev_quant[i] : 0;
       c=0;
       do {
@@ -432,11 +432,11 @@ void unquant_coarse_energy(const CELTMode *m, int start, int end, celt_glog *old
 {
    const unsigned char *prob_model = e_prob_model[LM][intra];
    int i, c;
-   opus_val64 prev[2] = {0, 0};
-   opus_val16 coef;
-   opus_val16 beta;
-   opus_int32 budget;
-   opus_int32 tell;
+   oac_val64 prev[2] = {0, 0};
+   oac_val16 coef;
+   oac_val16 beta;
+   oac_int32 budget;
+   oac_int32 tell;
 
    if (intra)
    {
@@ -455,8 +455,8 @@ void unquant_coarse_energy(const CELTMode *m, int start, int end, celt_glog *old
       c=0;
       do {
          int qi;
-         opus_val32 q;
-         opus_val32 tmp;
+         oac_val32 q;
+         oac_val32 tmp;
          /* It would be better to express this invariant as a
             test on C at function entry, but that isn't enough
             to make the static analyzer happy. */
@@ -480,7 +480,7 @@ void unquant_coarse_energy(const CELTMode *m, int start, int end, celt_glog *old
          }
          else
             qi = -1;
-         q = (opus_val32)SHL32(EXTEND32(qi),DB_SHIFT);
+         q = (oac_val32)SHL32(EXTEND32(qi),DB_SHIFT);
 
          oldEBands[i+c*m->nbEBands] = MAXG(-GCONST(9.f), oldEBands[i+c*m->nbEBands]);
          tmp = MULT16_32_Q15(coef,oldEBands[i+c*m->nbEBands]) + prev[c] + q;
@@ -499,11 +499,11 @@ void unquant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEB
    /* Decode finer resolution */
    for (i=start;i<end;i++)
    {
-      opus_int16 extra, prev;
+      oac_int16 extra, prev;
       extra = extra_quant[i];
       if (extra_quant[i] <= 0)
          continue;
-      if (ec_tell(dec)+C*extra_quant[i] > (opus_int32)dec->storage*8) continue;
+      if (ec_tell(dec)+C*extra_quant[i] > (oac_int32)dec->storage*8) continue;
       prev = (prev_quant!=NULL) ? prev_quant[i] : 0;
       c=0;
       do {
diff --git a/celt/quant_bands.h b/celt/quant_bands.h
index 6677fca2c..d61ca501c 100644
--- a/celt/quant_bands.h
+++ b/celt/quant_bands.h
@@ -38,7 +38,7 @@
 #ifdef FIXED_POINT
 extern const signed char eMeans[25];
 #else
-extern const opus_val16 eMeans[25];
+extern const oac_val16 eMeans[25];
 #endif
 
 void amp2Log2(const CELTMode *m, int effEnd, int end,
@@ -48,9 +48,9 @@ void log2Amp(const CELTMode *m, int start, int end,
       celt_ener *eBands, const celt_glog *oldEBands, int C);
 
 void quant_coarse_energy(const CELTMode *m, int start, int end, int effEnd,
-      const celt_glog *eBands, celt_glog *oldEBands, opus_uint32 budget,
+      const celt_glog *eBands, celt_glog *oldEBands, oac_uint32 budget,
       celt_glog *error, ec_enc *enc, int C, int LM,
-      int nbAvailableBytes, int force_intra, opus_val32 *delayedIntra,
+      int nbAvailableBytes, int force_intra, oac_val32 *delayedIntra,
       int two_pass, int loss_rate, int lfe);
 
 void quant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, celt_glog *error, int *fine_quant, int *extra_quant, ec_enc *enc, int C);
diff --git a/celt/rate.c b/celt/rate.c
index 139006d19..269483921 100644
--- a/celt/rate.c
+++ b/celt/rate.c
@@ -53,10 +53,10 @@ static const unsigned char LOG2_FRAC_TABLE[24]={
   N and K are themselves limited to 15 bits.*/
 static int fits_in32(int _n, int _k)
 {
-   static const opus_int16 maxN[15] = {
+   static const oac_int16 maxN[15] = {
       32767, 32767, 32767, 1476, 283, 109,  60,  40,
        29,  24,  20,  18,  16,  14,  13};
-   static const opus_int16 maxK[15] = {
+   static const oac_int16 maxK[15] = {
       32767, 32767, 32767, 32767, 1172, 238,  95,  53,
        36,  27,  22,  18,  16,  15,  13};
    if (_n>=14)
@@ -78,13 +78,13 @@ void compute_pulse_cache(CELTMode *m, int LM)
    int curr=0;
    int nbEntries=0;
    int entryN[100], entryK[100], entryI[100];
-   const opus_int16 *eBands = m->eBands;
+   const oac_int16 *eBands = m->eBands;
    PulseCache *cache = &m->cache;
-   opus_int16 *cindex;
+   oac_int16 *cindex;
    unsigned char *bits;
    unsigned char *cap;
 
-   cindex = (opus_int16 *)opus_alloc(sizeof(cache->index[0])*m->nbEBands*(LM+2));
+   cindex = (oac_int16 *)oac_alloc(sizeof(cache->index[0])*m->nbEBands*(LM+2));
    cache->index = cindex;
 
    /* Scan for all unique band sizes */
@@ -124,14 +124,14 @@ void compute_pulse_cache(CELTMode *m, int LM)
          }
       }
    }
-   bits = (unsigned char *)opus_alloc(sizeof(unsigned char)*curr);
+   bits = (unsigned char *)oac_alloc(sizeof(unsigned char)*curr);
    cache->bits = bits;
    cache->size = curr;
    /* Compute the cache for all unique sizes */
    for (i=0;i<nbEntries;i++)
    {
       unsigned char *ptr = bits+entryI[i];
-      opus_int16 tmp[CELT_MAX_PULSES+1];
+      oac_int16 tmp[CELT_MAX_PULSES+1];
       get_required_bits(tmp, entryN[i], get_pulses(entryK[i]), BITRES);
       for (j=1;j<=entryK[i];j++)
          ptr[j] = tmp[get_pulses(j)]-1;
@@ -140,7 +140,7 @@ void compute_pulse_cache(CELTMode *m, int LM)
 
    /* Compute the maximum rate for each band at which we'll reliably use as
        many bits as we ask for. */
-   cache->caps = cap = (unsigned char *)opus_alloc(sizeof(cache->caps[0])*(LM+1)*2*m->nbEBands);
+   cache->caps = cap = (unsigned char *)oac_alloc(sizeof(cache->caps[0])*(LM+1)*2*m->nbEBands);
    for (i=0;i<=LM;i++)
    {
       for (C=1;C<=2;C++)
@@ -156,8 +156,8 @@ void compute_pulse_cache(CELTMode *m, int LM)
             else
             {
                const unsigned char *pcache;
-               opus_int32           num;
-               opus_int32           den;
+               oac_int32           num;
+               oac_int32           den;
                int                  LM0;
                int                  N;
                int                  offset;
@@ -189,13 +189,13 @@ void compute_pulse_cache(CELTMode *m, int LM)
                   /* Offset the number of qtheta bits by log2(N)/2
                       + QTHETA_OFFSET compared to their "fair share" of
                       total/N */
-                  offset = ((m->logN[j]+(opus_int32)((opus_uint32)(LM0+k)<<BITRES))>>1)-QTHETA_OFFSET;
+                  offset = ((m->logN[j]+(oac_int32)((oac_uint32)(LM0+k)<<BITRES))>>1)-QTHETA_OFFSET;
                   /* The number of qtheta bits we'll allocate if the remainder
                       is to be max_bits.
                      The average measured cost for theta is 0.89701 times qb,
                       approximated here as 459/512. */
-                  num=459*(opus_int32)((2*N-1)*offset+max_bits);
-                  den=((opus_int32)(2*N-1)<<9)-459;
+                  num=459*(oac_int32)((2*N-1)*offset+max_bits);
+                  den=((oac_int32)(2*N-1)<<9)-459;
                   qb = IMIN((num+(den>>1))/den, 57);
                   celt_assert(qb >= 0);
                   max_bits += qb;
@@ -209,8 +209,8 @@ void compute_pulse_cache(CELTMode *m, int LM)
                   ndof = 2*N-1-(N==2);
                   /* The average measured cost for theta with the step PDF is
                       0.95164 times qb, approximated here as 487/512. */
-                  num = (N==2?512:487)*(opus_int32)(max_bits+ndof*offset);
-                  den = ((opus_int32)ndof<<9)-(N==2?512:487);
+                  num = (N==2?512:487)*(oac_int32)(max_bits+ndof*offset);
+                  den = ((oac_int32)ndof<<9)-(N==2?512:487);
                   qb = IMIN((num+(den>>1))/den, (N==2?64:61));
                   celt_assert(qb >= 0);
                   max_bits += qb;
@@ -245,21 +245,21 @@ void compute_pulse_cache(CELTMode *m, int LM)
 
 #define ALLOC_STEPS 6
 
-static OPUS_INLINE int interp_bits2pulses(const CELTMode *m, int start, int end, int skip_start,
-      const int *bits1, const int *bits2, const int *thresh, const int *cap, opus_int32 total, opus_int32 *_balance,
+static OAC_INLINE int interp_bits2pulses(const CELTMode *m, int start, int end, int skip_start,
+      const int *bits1, const int *bits2, const int *thresh, const int *cap, oac_int32 total, oac_int32 *_balance,
       int skip_rsv, int *intensity, int intensity_rsv, int *dual_stereo, int dual_stereo_rsv, int *bits,
       int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec, int encode, int prev, int signalBandwidth)
 {
-   opus_int32 psum;
+   oac_int32 psum;
    int lo, hi;
    int i, j;
    int logM;
    int stereo;
    int codedBands=-1;
    int alloc_floor;
-   opus_int32 left, percoeff;
+   oac_int32 left, percoeff;
    int done;
-   opus_int32 balance;
+   oac_int32 balance;
    SAVE_STACK;
 
    alloc_floor = C<<BITRES;
@@ -275,7 +275,7 @@ static OPUS_INLINE int interp_bits2pulses(const CELTMode *m, int start, int end,
       done = 0;
       for (j=end;j-->start;)
       {
-         int tmp = bits1[j] + (mid*(opus_int32)bits2[j]>>ALLOC_STEPS);
+         int tmp = bits1[j] + (mid*(oac_int32)bits2[j]>>ALLOC_STEPS);
          if (tmp >= thresh[j] || done)
          {
             done = 1;
@@ -296,7 +296,7 @@ static OPUS_INLINE int interp_bits2pulses(const CELTMode *m, int start, int end,
    done = 0;
    for (j=end;j-->start;)
    {
-      int tmp = bits1[j] + ((opus_int32)lo*bits2[j]>>ALLOC_STEPS);
+      int tmp = bits1[j] + ((oac_int32)lo*bits2[j]>>ALLOC_STEPS);
       if (tmp < thresh[j] && !done)
       {
          if (tmp >= alloc_floor)
@@ -439,12 +439,12 @@ static OPUS_INLINE int interp_bits2pulses(const CELTMode *m, int start, int end,
       int N0, N, den;
       int offset;
       int NClogN;
-      opus_int32 excess, bit;
+      oac_int32 excess, bit;
 
       celt_assert(bits[j] >= 0);
       N0 = m->eBands[j+1]-m->eBands[j];
       N=N0<<LM;
-      bit = (opus_int32)bits[j]+balance;
+      bit = (oac_int32)bits[j]+balance;
 
       if (N>1)
       {
@@ -532,7 +532,7 @@ static OPUS_INLINE int interp_bits2pulses(const CELTMode *m, int start, int end,
 }
 
 int clt_compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim, int *intensity, int *dual_stereo,
-      opus_int32 total, opus_int32 *balance, int *pulses, int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec, int encode, int prev, int signalBandwidth)
+      oac_int32 total, oac_int32 *balance, int *pulses, int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec, int encode, int prev, int signalBandwidth)
 {
    int lo, hi, len, j;
    int codedBands;
diff --git a/celt/rate.h b/celt/rate.h
index fad5e412d..cac780a75 100644
--- a/celt/rate.h
+++ b/celt/rate.h
@@ -45,12 +45,12 @@
 
 void compute_pulse_cache(CELTMode *m, int LM);
 
-static OPUS_INLINE int get_pulses(int i)
+static OAC_INLINE int get_pulses(int i)
 {
    return i<8 ? i : (8 + (i&7)) << ((i>>3)-1);
 }
 
-static OPUS_INLINE int bits2pulses(const CELTMode *m, int band, int LM, int bits)
+static OAC_INLINE int bits2pulses(const CELTMode *m, int band, int LM, int bits)
 {
    int i;
    int lo, hi;
@@ -77,7 +77,7 @@ static OPUS_INLINE int bits2pulses(const CELTMode *m, int band, int LM, int bits
       return hi;
 }
 
-static OPUS_INLINE int pulses2bits(const CELTMode *m, int band, int LM, int pulses)
+static OAC_INLINE int pulses2bits(const CELTMode *m, int band, int LM, int pulses)
 {
    const unsigned char *cache;
 
@@ -96,6 +96,6 @@ static OPUS_INLINE int pulses2bits(const CELTMode *m, int band, int LM, int puls
  @return Total number of bits allocated
 */
 int clt_compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim, int *intensity, int *dual_stereo,
-      opus_int32 total, opus_int32 *balance, int *pulses, int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec, int encode, int prev, int signalBandwidth);
+      oac_int32 total, oac_int32 *balance, int *pulses, int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec, int encode, int prev, int signalBandwidth);
 
 #endif
diff --git a/celt/stack_alloc.h b/celt/stack_alloc.h
index 04b14ff26..82443d41e 100644
--- a/celt/stack_alloc.h
+++ b/celt/stack_alloc.h
@@ -32,11 +32,11 @@
 #ifndef STACK_ALLOC_H
 #define STACK_ALLOC_H
 
-#include "opus_types.h"
-#include "opus_defines.h"
+#include "oac_types.h"
+#include "oac_defines.h"
 
 #if (!defined (VAR_ARRAYS) && !defined (USE_ALLOCA) && !defined (NONTHREADSAFE_PSEUDOSTACK))
-#error "Opus requires one of VAR_ARRAYS, USE_ALLOCA, or NONTHREADSAFE_PSEUDOSTACK be defined to select the temporary allocation mode."
+#error "Oac requires one of VAR_ARRAYS, USE_ALLOCA, or NONTHREADSAFE_PSEUDOSTACK be defined to select the temporary allocation mode."
 #endif
 
 #ifdef USE_ALLOCA
@@ -155,7 +155,7 @@ extern char *global_stack_top;
 #define ALIGN(stack, size) ((stack) += ((size) - (long)(stack)) & ((size) - 1))
 #define PUSH(stack, size, type) (VALGRIND_MAKE_MEM_NOACCESS(stack, global_stack_top-stack),ALIGN((stack),ALIGNOF(type)),VALGRIND_MAKE_MEM_UNDEFINED(stack, ((size)*sizeof(type)/sizeof(char))),(stack)+=(2*(size)*sizeof(type)/sizeof(char)),(type*)((stack)-(2*(size)*sizeof(type)/sizeof(char))))
 #define RESTORE_STACK ((global_stack = _saved_stack),VALGRIND_MAKE_MEM_NOACCESS(global_stack, global_stack_top-global_stack))
-#define ALLOC_STACK char *_saved_stack; ((global_stack = (global_stack==0) ? ((global_stack_top=(char*)opus_alloc_scratch(GLOBAL_STACK_SIZE*2)+(GLOBAL_STACK_SIZE*2))-(GLOBAL_STACK_SIZE*2)) : global_stack),VALGRIND_MAKE_MEM_NOACCESS(global_stack, global_stack_top-global_stack)); _saved_stack = global_stack;
+#define ALLOC_STACK char *_saved_stack; ((global_stack = (global_stack==0) ? ((global_stack_top=(char*)oac_alloc_scratch(GLOBAL_STACK_SIZE*2)+(GLOBAL_STACK_SIZE*2))-(GLOBAL_STACK_SIZE*2)) : global_stack),VALGRIND_MAKE_MEM_NOACCESS(global_stack, global_stack_top-global_stack)); _saved_stack = global_stack;
 
 #else
 
@@ -172,7 +172,7 @@ extern char *global_stack_top;
 #else
 #define RESTORE_STACK (global_stack = _saved_stack)
 #endif
-#define ALLOC_STACK char *_saved_stack; (global_stack = (global_stack==0) ? (scratch_ptr=(char*)opus_alloc_scratch(GLOBAL_STACK_SIZE)) : global_stack); _saved_stack = global_stack;
+#define ALLOC_STACK char *_saved_stack; (global_stack = (global_stack==0) ? (scratch_ptr=(char*)oac_alloc_scratch(GLOBAL_STACK_SIZE)) : global_stack); _saved_stack = global_stack;
 
 #endif /* ENABLE_VALGRIND */
 
@@ -188,20 +188,20 @@ extern char *global_stack_top;
 #ifdef ENABLE_VALGRIND
 
 #include <valgrind/memcheck.h>
-#define OPUS_CHECK_ARRAY(ptr, len) VALGRIND_CHECK_MEM_IS_DEFINED(ptr, len*sizeof(*ptr))
-#define OPUS_CHECK_VALUE(value) VALGRIND_CHECK_VALUE_IS_DEFINED(value)
-#define OPUS_CHECK_ARRAY_COND(ptr, len) VALGRIND_CHECK_MEM_IS_DEFINED(ptr, len*sizeof(*ptr))
-#define OPUS_CHECK_VALUE_COND(value) VALGRIND_CHECK_VALUE_IS_DEFINED(value)
-#define OPUS_PRINT_INT(value) do {fprintf(stderr, #value " = %d at %s:%d\n", value, __FILE__, __LINE__);}while(0)
-#define OPUS_FPRINTF fprintf
+#define OAC_CHECK_ARRAY(ptr, len) VALGRIND_CHECK_MEM_IS_DEFINED(ptr, len*sizeof(*ptr))
+#define OAC_CHECK_VALUE(value) VALGRIND_CHECK_VALUE_IS_DEFINED(value)
+#define OAC_CHECK_ARRAY_COND(ptr, len) VALGRIND_CHECK_MEM_IS_DEFINED(ptr, len*sizeof(*ptr))
+#define OAC_CHECK_VALUE_COND(value) VALGRIND_CHECK_VALUE_IS_DEFINED(value)
+#define OAC_PRINT_INT(value) do {fprintf(stderr, #value " = %d at %s:%d\n", value, __FILE__, __LINE__);}while(0)
+#define OAC_FPRINTF fprintf
 
 #else
 
-static OPUS_INLINE int _opus_false(void) {return 0;}
-#define OPUS_CHECK_ARRAY(ptr, len) _opus_false()
-#define OPUS_CHECK_VALUE(value) _opus_false()
-#define OPUS_PRINT_INT(value) do{}while(0)
-#define OPUS_FPRINTF (void)
+static OAC_INLINE int _oac_false(void) {return 0;}
+#define OAC_CHECK_ARRAY(ptr, len) _oac_false()
+#define OAC_CHECK_VALUE(value) _oac_false()
+#define OAC_PRINT_INT(value) do{}while(0)
+#define OAC_FPRINTF (void)
 
 #endif
 
diff --git a/celt/static_modes_fixed.h b/celt/static_modes_fixed.h
index ea3b89b13..30144a3ba 100644
--- a/celt/static_modes_fixed.h
+++ b/celt/static_modes_fixed.h
@@ -41,13 +41,13 @@ static const celt_coef window120[120] = {
 
 #ifndef DEF_LOGN400
 #define DEF_LOGN400
-static const opus_int16 logN400[21] = {
+static const oac_int16 logN400[21] = {
 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 16, 16, 16, 21, 21, 24, 29, 34, 36, };
 #endif
 
 #ifndef DEF_PULSE_CACHE50
 #define DEF_PULSE_CACHE50
-static const opus_int16 cache_index50[105] = {
+static const oac_int16 cache_index50[105] = {
 -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 41, 41, 41,
 82, 82, 123, 164, 200, 222, 0, 0, 0, 0, 0, 0, 0, 0, 41,
 41, 41, 41, 123, 123, 123, 164, 164, 240, 266, 283, 295, 41, 41, 41,
@@ -345,7 +345,7 @@ static const kiss_twiddle_cpx fft_twiddles48000_960[480] = {
 };
 #ifndef FFT_BITREV480
 #define FFT_BITREV480
-static const opus_int16 fft_bitrev480[480] = {
+static const oac_int16 fft_bitrev480[480] = {
 0, 96, 192, 288, 384, 32, 128, 224, 320, 416, 64, 160, 256, 352, 448,
 8, 104, 200, 296, 392, 40, 136, 232, 328, 424, 72, 168, 264, 360, 456,
 16, 112, 208, 304, 400, 48, 144, 240, 336, 432, 80, 176, 272, 368, 464,
@@ -383,7 +383,7 @@ static const opus_int16 fft_bitrev480[480] = {
 
 #ifndef FFT_BITREV240
 #define FFT_BITREV240
-static const opus_int16 fft_bitrev240[240] = {
+static const oac_int16 fft_bitrev240[240] = {
 0, 48, 96, 144, 192, 16, 64, 112, 160, 208, 32, 80, 128, 176, 224,
 4, 52, 100, 148, 196, 20, 68, 116, 164, 212, 36, 84, 132, 180, 228,
 8, 56, 104, 152, 200, 24, 72, 120, 168, 216, 40, 88, 136, 184, 232,
@@ -405,7 +405,7 @@ static const opus_int16 fft_bitrev240[240] = {
 
 #ifndef FFT_BITREV120
 #define FFT_BITREV120
-static const opus_int16 fft_bitrev120[120] = {
+static const oac_int16 fft_bitrev120[120] = {
 0, 24, 48, 72, 96, 8, 32, 56, 80, 104, 16, 40, 64, 88, 112,
 4, 28, 52, 76, 100, 12, 36, 60, 84, 108, 20, 44, 68, 92, 116,
 1, 25, 49, 73, 97, 9, 33, 57, 81, 105, 17, 41, 65, 89, 113,
@@ -419,7 +419,7 @@ static const opus_int16 fft_bitrev120[120] = {
 
 #ifndef FFT_BITREV60
 #define FFT_BITREV60
-static const opus_int16 fft_bitrev60[60] = {
+static const oac_int16 fft_bitrev60[60] = {
 0, 12, 24, 36, 48, 4, 16, 28, 40, 52, 8, 20, 32, 44, 56,
 1, 13, 25, 37, 49, 5, 17, 29, 41, 53, 9, 21, 33, 45, 57,
 2, 14, 26, 38, 50, 6, 18, 30, 42, 54, 10, 22, 34, 46, 58,
@@ -942,13 +942,13 @@ static const celt_coef window240[240] = {
 
 #ifndef DEF_LOGN400
 #define DEF_LOGN400
-static const opus_int16 logN400[21] = {
+static const oac_int16 logN400[21] = {
 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 16, 16, 16, 21, 21, 24, 29, 34, 36, };
 #endif
 
 #ifndef DEF_PULSE_CACHE50
 #define DEF_PULSE_CACHE50
-static const opus_int16 cache_index50[105] = {
+static const oac_int16 cache_index50[105] = {
 -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 41, 41, 41,
 82, 82, 123, 164, 200, 222, 0, 0, 0, 0, 0, 0, 0, 0, 41,
 41, 41, 41, 123, 123, 123, 164, 164, 240, 266, 283, 295, 41, 41, 41,
@@ -1486,7 +1486,7 @@ static const kiss_twiddle_cpx fft_twiddles96000_1920[960] = {
 };
 #ifndef FFT_BITREV960
 #define FFT_BITREV960
-static const opus_int16 fft_bitrev960[960] = {
+static const oac_int16 fft_bitrev960[960] = {
 0, 192, 384, 576, 768, 64, 256, 448, 640, 832, 128, 320, 512, 704, 896,
 16, 208, 400, 592, 784, 80, 272, 464, 656, 848, 144, 336, 528, 720, 912,
 32, 224, 416, 608, 800, 96, 288, 480, 672, 864, 160, 352, 544, 736, 928,
@@ -1556,7 +1556,7 @@ static const opus_int16 fft_bitrev960[960] = {
 
 #ifndef FFT_BITREV480
 #define FFT_BITREV480
-static const opus_int16 fft_bitrev480[480] = {
+static const oac_int16 fft_bitrev480[480] = {
 0, 96, 192, 288, 384, 32, 128, 224, 320, 416, 64, 160, 256, 352, 448,
 8, 104, 200, 296, 392, 40, 136, 232, 328, 424, 72, 168, 264, 360, 456,
 16, 112, 208, 304, 400, 48, 144, 240, 336, 432, 80, 176, 272, 368, 464,
@@ -1594,7 +1594,7 @@ static const opus_int16 fft_bitrev480[480] = {
 
 #ifndef FFT_BITREV240
 #define FFT_BITREV240
-static const opus_int16 fft_bitrev240[240] = {
+static const oac_int16 fft_bitrev240[240] = {
 0, 48, 96, 144, 192, 16, 64, 112, 160, 208, 32, 80, 128, 176, 224,
 4, 52, 100, 148, 196, 20, 68, 116, 164, 212, 36, 84, 132, 180, 228,
 8, 56, 104, 152, 200, 24, 72, 120, 168, 216, 40, 88, 136, 184, 232,
@@ -1616,7 +1616,7 @@ static const opus_int16 fft_bitrev240[240] = {
 
 #ifndef FFT_BITREV120
 #define FFT_BITREV120
-static const opus_int16 fft_bitrev120[120] = {
+static const oac_int16 fft_bitrev120[120] = {
 0, 24, 48, 72, 96, 8, 32, 56, 80, 104, 16, 40, 64, 88, 112,
 4, 28, 52, 76, 100, 12, 36, 60, 84, 108, 20, 44, 68, 92, 116,
 1, 25, 49, 73, 97, 9, 33, 57, 81, 105, 17, 41, 65, 89, 113,
diff --git a/celt/static_modes_float.h b/celt/static_modes_float.h
index 06cca3f5f..eb32cad99 100644
--- a/celt/static_modes_float.h
+++ b/celt/static_modes_float.h
@@ -41,13 +41,13 @@ static const celt_coef window120[120] = {
 
 #ifndef DEF_LOGN400
 #define DEF_LOGN400
-static const opus_int16 logN400[21] = {
+static const oac_int16 logN400[21] = {
 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 16, 16, 16, 21, 21, 24, 29, 34, 36, };
 #endif
 
 #ifndef DEF_PULSE_CACHE50
 #define DEF_PULSE_CACHE50
-static const opus_int16 cache_index50[105] = {
+static const oac_int16 cache_index50[105] = {
 -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 41, 41, 41,
 82, 82, 123, 164, 200, 222, 0, 0, 0, 0, 0, 0, 0, 0, 41,
 41, 41, 41, 123, 123, 123, 164, 164, 240, 266, 283, 295, 41, 41, 41,
@@ -345,7 +345,7 @@ static const kiss_twiddle_cpx fft_twiddles48000_960[480] = {
 };
 #ifndef FFT_BITREV480
 #define FFT_BITREV480
-static const opus_int16 fft_bitrev480[480] = {
+static const oac_int16 fft_bitrev480[480] = {
 0, 96, 192, 288, 384, 32, 128, 224, 320, 416, 64, 160, 256, 352, 448,
 8, 104, 200, 296, 392, 40, 136, 232, 328, 424, 72, 168, 264, 360, 456,
 16, 112, 208, 304, 400, 48, 144, 240, 336, 432, 80, 176, 272, 368, 464,
@@ -383,7 +383,7 @@ static const opus_int16 fft_bitrev480[480] = {
 
 #ifndef FFT_BITREV240
 #define FFT_BITREV240
-static const opus_int16 fft_bitrev240[240] = {
+static const oac_int16 fft_bitrev240[240] = {
 0, 48, 96, 144, 192, 16, 64, 112, 160, 208, 32, 80, 128, 176, 224,
 4, 52, 100, 148, 196, 20, 68, 116, 164, 212, 36, 84, 132, 180, 228,
 8, 56, 104, 152, 200, 24, 72, 120, 168, 216, 40, 88, 136, 184, 232,
@@ -405,7 +405,7 @@ static const opus_int16 fft_bitrev240[240] = {
 
 #ifndef FFT_BITREV120
 #define FFT_BITREV120
-static const opus_int16 fft_bitrev120[120] = {
+static const oac_int16 fft_bitrev120[120] = {
 0, 24, 48, 72, 96, 8, 32, 56, 80, 104, 16, 40, 64, 88, 112,
 4, 28, 52, 76, 100, 12, 36, 60, 84, 108, 20, 44, 68, 92, 116,
 1, 25, 49, 73, 97, 9, 33, 57, 81, 105, 17, 41, 65, 89, 113,
@@ -419,7 +419,7 @@ static const opus_int16 fft_bitrev120[120] = {
 
 #ifndef FFT_BITREV60
 #define FFT_BITREV60
-static const opus_int16 fft_bitrev60[60] = {
+static const oac_int16 fft_bitrev60[60] = {
 0, 12, 24, 36, 48, 4, 16, 28, 40, 52, 8, 20, 32, 44, 56,
 1, 13, 25, 37, 49, 5, 17, 29, 41, 53, 9, 21, 33, 45, 57,
 2, 14, 26, 38, 50, 6, 18, 30, 42, 54, 10, 22, 34, 46, 58,
@@ -938,13 +938,13 @@ static const celt_coef window240[240] = {
 
 #ifndef DEF_LOGN400
 #define DEF_LOGN400
-static const opus_int16 logN400[21] = {
+static const oac_int16 logN400[21] = {
 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 16, 16, 16, 21, 21, 24, 29, 34, 36, };
 #endif
 
 #ifndef DEF_PULSE_CACHE50
 #define DEF_PULSE_CACHE50
-static const opus_int16 cache_index50[105] = {
+static const oac_int16 cache_index50[105] = {
 -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 41, 41, 41,
 82, 82, 123, 164, 200, 222, 0, 0, 0, 0, 0, 0, 0, 0, 41,
 41, 41, 41, 123, 123, 123, 164, 164, 240, 266, 283, 295, 41, 41, 41,
@@ -1482,7 +1482,7 @@ static const kiss_twiddle_cpx fft_twiddles96000_1920[960] = {
 };
 #ifndef FFT_BITREV960
 #define FFT_BITREV960
-static const opus_int16 fft_bitrev960[960] = {
+static const oac_int16 fft_bitrev960[960] = {
 0, 192, 384, 576, 768, 64, 256, 448, 640, 832, 128, 320, 512, 704, 896,
 16, 208, 400, 592, 784, 80, 272, 464, 656, 848, 144, 336, 528, 720, 912,
 32, 224, 416, 608, 800, 96, 288, 480, 672, 864, 160, 352, 544, 736, 928,
@@ -1552,7 +1552,7 @@ static const opus_int16 fft_bitrev960[960] = {
 
 #ifndef FFT_BITREV480
 #define FFT_BITREV480
-static const opus_int16 fft_bitrev480[480] = {
+static const oac_int16 fft_bitrev480[480] = {
 0, 96, 192, 288, 384, 32, 128, 224, 320, 416, 64, 160, 256, 352, 448,
 8, 104, 200, 296, 392, 40, 136, 232, 328, 424, 72, 168, 264, 360, 456,
 16, 112, 208, 304, 400, 48, 144, 240, 336, 432, 80, 176, 272, 368, 464,
@@ -1590,7 +1590,7 @@ static const opus_int16 fft_bitrev480[480] = {
 
 #ifndef FFT_BITREV240
 #define FFT_BITREV240
-static const opus_int16 fft_bitrev240[240] = {
+static const oac_int16 fft_bitrev240[240] = {
 0, 48, 96, 144, 192, 16, 64, 112, 160, 208, 32, 80, 128, 176, 224,
 4, 52, 100, 148, 196, 20, 68, 116, 164, 212, 36, 84, 132, 180, 228,
 8, 56, 104, 152, 200, 24, 72, 120, 168, 216, 40, 88, 136, 184, 232,
@@ -1612,7 +1612,7 @@ static const opus_int16 fft_bitrev240[240] = {
 
 #ifndef FFT_BITREV120
 #define FFT_BITREV120
-static const opus_int16 fft_bitrev120[120] = {
+static const oac_int16 fft_bitrev120[120] = {
 0, 24, 48, 72, 96, 8, 32, 56, 80, 104, 16, 40, 64, 88, 112,
 4, 28, 52, 76, 100, 12, 36, 60, 84, 108, 20, 44, 68, 92, 116,
 1, 25, 49, 73, 97, 9, 33, 57, 81, 105, 17, 41, 65, 89, 113,
diff --git a/celt/tests/meson.build b/celt/tests/meson.build
index 0e6d2e627..747a0d5d2 100644
--- a/celt/tests/meson.build
+++ b/celt/tests/meson.build
@@ -11,7 +11,7 @@ tests = [
 
 foreach test_name : tests
   exe = executable(test_name, '@0@.c'.format(test_name),
-                   include_directories : opus_includes,
+                   include_directories : oac_includes,
                    link_with : [celt_lib, celt_static_libs],
                    dependencies : libm,
                    install : false)
diff --git a/celt/tests/test_unit_cwrs32.c b/celt/tests/test_unit_cwrs32.c
index f6b8ac4b0..57a1eecce 100644
--- a/celt/tests/test_unit_cwrs32.c
+++ b/celt/tests/test_unit_cwrs32.c
@@ -96,11 +96,11 @@ int main(void){
     {
       int k;
 #if defined(SMALL_FOOTPRINT)
-      opus_uint32 uu[KMAX+2U];
+      oac_uint32 uu[KMAX+2U];
 #endif
-      opus_uint32 inc;
-      opus_uint32 nc;
-      opus_uint32 i;
+      oac_uint32 inc;
+      oac_uint32 nc;
+      oac_uint32 i;
       k=get_pulses(pseudo);
       if (k>pkmax[t])break;
       printf("Testing CWRS with N=%i, K=%i...\n",n,k);
@@ -113,12 +113,12 @@ int main(void){
       if(inc<1)inc=1;
       for(i=0;i<nc;i+=inc){
 #if defined(SMALL_FOOTPRINT)
-        opus_uint32 u[KMAX+2U];
+        oac_uint32 u[KMAX+2U];
 #endif
         int         y[NMAX];
         int         sy;
-        opus_uint32 v;
-        opus_uint32 ii;
+        oac_uint32 v;
+        oac_uint32 ii;
         int         j;
 #if defined(SMALL_FOOTPRINT)
         memcpy(u,uu,(k+2U)*sizeof(*u));
diff --git a/celt/tests/test_unit_dft.c b/celt/tests/test_unit_dft.c
index ad6c60a03..575d30f4e 100644
--- a/celt/tests/test_unit_dft.c
+++ b/celt/tests/test_unit_dft.c
@@ -90,11 +90,11 @@ void test1d(int nfft,int isinverse,int arch)
     kiss_fft_cpx *out;
     int k;
 #ifdef CUSTOM_MODES
-    kiss_fft_state *cfg = opus_fft_alloc(nfft,0,0,arch);
+    kiss_fft_state *cfg = oac_fft_alloc(nfft,0,0,arch);
 #else
     int id;
     const kiss_fft_state *cfg;
-    CELTMode *mode = opus_custom_mode_create(48000, 960, NULL);
+    CELTMode *mode = oac_custom_mode_create(48000, 960, NULL);
     if (nfft == 480) id = 0;
     else if (nfft == 240) id = 1;
     else if (nfft == 120) id = 2;
@@ -127,9 +127,9 @@ void test1d(int nfft,int isinverse,int arch)
     /*for (k=0;k<nfft;++k) printf("%d %d ", in[k].r, in[k].i);printf("\n");*/
 
     if (isinverse)
-       opus_ifft(cfg,in,out, arch);
+       oac_ifft(cfg,in,out, arch);
     else
-       opus_fft(cfg,in,out, arch);
+       oac_fft(cfg,in,out, arch);
 
     /*for (k=0;k<nfft;++k) printf("%d %d ", out[k].r, out[k].i);printf("\n");*/
 
@@ -138,7 +138,7 @@ void test1d(int nfft,int isinverse,int arch)
     free(in);
     free(out);
 #ifdef CUSTOM_MODES
-    opus_fft_free(cfg, arch);
+    oac_fft_free(cfg, arch);
 #endif
 }
 
@@ -146,7 +146,7 @@ int main(int argc,char ** argv)
 {
     int arch;
     ALLOC_STACK;
-    arch = opus_select_arch();
+    arch = oac_select_arch();
 
     if (argc>1) {
         int k;
diff --git a/celt/tests/test_unit_laplace.c b/celt/tests/test_unit_laplace.c
index 9832e5e5f..c46bf9fe0 100644
--- a/celt/tests/test_unit_laplace.c
+++ b/celt/tests/test_unit_laplace.c
@@ -44,7 +44,7 @@
 
 int ec_laplace_get_start_freq(int decay)
 {
-   opus_uint32 ft = 32768 - LAPLACE_MINP*(2*LAPLACE_NMIN+1);
+   oac_uint32 ft = 32768 - LAPLACE_MINP*(2*LAPLACE_NMIN+1);
    int fs = (ft*(16384-decay))/(16384+decay);
    return fs+LAPLACE_MINP;
 }
diff --git a/celt/tests/test_unit_mathops.c b/celt/tests/test_unit_mathops.c
index 517ef5bca..49ef771d6 100644
--- a/celt/tests/test_unit_mathops.c
+++ b/celt/tests/test_unit_mathops.c
@@ -55,11 +55,11 @@ int ret = 0;
 
 void testdiv(void)
 {
-   opus_int32 i;
+   oac_int32 i;
    for (i=1;i<=327670;i++)
    {
       double prod;
-      opus_val32 val;
+      oac_val32 val;
       val = celt_rcp(i);
 #ifdef FIXED_POINT
       prod = (1./32768./65526.)*val*i;
@@ -76,11 +76,11 @@ void testdiv(void)
 
 void testsqrt(void)
 {
-   opus_int32 i;
+   oac_int32 i;
    for (i=1;i<=1000000000;i++)
    {
       double ratio;
-      opus_val16 val;
+      oac_val16 val;
       val = celt_sqrt(i);
       ratio = val/sqrt(i);
       if (fabs(ratio - 1) > .0005 && fabs(val-sqrt(i)) > 2)
@@ -95,13 +95,13 @@ void testsqrt(void)
 void testbitexactcos(void)
 {
    int i;
-   opus_int32 min_d,max_d,last,chk;
+   oac_int32 min_d,max_d,last,chk;
    chk=max_d=0;
    last=min_d=32767;
    for(i=64;i<=16320;i++)
    {
-      opus_int32 d;
-      opus_int32 q=bitexact_cos(i);
+      oac_int32 d;
+      oac_int32 q=bitexact_cos(i);
       chk ^= q*i;
       d = last - q;
       if (d>max_d)max_d=d;
@@ -119,15 +119,15 @@ void testbitexactcos(void)
 void testbitexactlog2tan(void)
 {
    int i,fail;
-   opus_int32 min_d,max_d,last,chk;
+   oac_int32 min_d,max_d,last,chk;
    fail=chk=max_d=0;
    last=min_d=15059;
    for(i=64;i<8193;i++)
    {
-      opus_int32 d;
-      opus_int32 mid=bitexact_cos(i);
-      opus_int32 side=bitexact_cos(16384-i);
-      opus_int32 q=bitexact_log2tan(mid,side);
+      oac_int32 d;
+      oac_int32 mid=bitexact_cos(i);
+      oac_int32 side=bitexact_cos(16384-i);
+      oac_int32 q=bitexact_log2tan(mid,side);
       chk ^= q*i;
       d = last - q;
       if (q!=-1*bitexact_log2tan(side,mid))
@@ -287,7 +287,7 @@ void testlog2_db(void)
    float error = -1;
    float max_error = -2;
    float error_threshold = 2.e-07;
-   opus_int32 x = 0;
+   oac_int32 x = 0;
    int q_input = 14;
    for (x = 8; x < 1073741824; x += (x >> 3))
    {
@@ -309,7 +309,7 @@ void testlog2_db(void)
 
 void testlog2(void)
 {
-   opus_val32 x;
+   oac_val32 x;
    for (x=8;x<1073741824;x+=(x>>3))
    {
       float error = fabs((1.442695040888963387*log(x/16384.0))-celt_log2(x)/1024.0);
@@ -323,7 +323,7 @@ void testlog2(void)
 
 void testexp2(void)
 {
-   opus_val16 x;
+   oac_val16 x;
    for (x=-32768;x<15360;x++)
    {
       float error1 = fabs(x/1024.0-(1.442695040888963387*log(celt_exp2(x)/65536.0)));
@@ -343,7 +343,7 @@ void testexp2_db(void)
    float relative_error_threshold = -2;
    float fx;
    float quantized_fx;
-   opus_val32 x_32;
+   oac_val32 x_32;
 
    for (fx = -32.0; fx < 15.0; fx += 0.0007)
    {
@@ -372,7 +372,7 @@ void testexp2_db(void)
 
 void testexp2log2(void)
 {
-   opus_val32 x;
+   oac_val32 x;
    for (x=8;x<65536;x+=(x>>3))
    {
       float error = fabs(x-0.25*celt_exp2(celt_log2(x)))/16384;
@@ -386,11 +386,11 @@ void testexp2log2(void)
 
 void testilog2(void)
 {
-   opus_val32 x;
+   oac_val32 x;
    for (x=1;x<=268435455;x+=127)
    {
-      opus_val32 lg;
-      opus_val32 y;
+      oac_val32 lg;
+      oac_val32 y;
 
       lg = celt_ilog2(x);
       if (lg<0 || lg>=31)
@@ -415,7 +415,7 @@ void testrsqrt(void)
    float max_error = 0;
    float fx = 0;
    float quantized_fx;
-   opus_int32 x;
+   oac_int32 x;
    for (fx = 0.25; fx < 1.0f; fx += 0.007f)
    {
       x = DOUBLE_TO_FIX_INT(fx, 31);
@@ -441,7 +441,7 @@ void testrsqrt(void)
 
 void testsqrt32(void)
 {
-   opus_int32 i;
+   oac_int32 i;
    float absolute_error;
    float two_LSBs = FIX_INT_TO_DOUBLE(2, 16);
    float relative_error_threshold;
@@ -470,7 +470,7 @@ void testatan_norm(void)
    float max_error = -2;
    float error_threshold = 5.97e-08;
    float fx = 0;
-   opus_int32 x = 0;
+   oac_int32 x = 0;
    int q_input = 30;
    int q_output = 30;
    #define ATAN2_2_OVER_PI 0.636619772367581f
@@ -501,8 +501,8 @@ void testatan2p_norm(void)
    float error_threshold = 1.2e-07;
    float fx = 0;
    float fy = 0;
-   opus_int32 x = 0;
-   opus_int32 y = 0;
+   oac_int32 x = 0;
+   oac_int32 y = 0;
    int q_input = 30;
    int q_output = 30;
    #define ATAN2_2_OVER_PI 0.636619772367581f
@@ -546,7 +546,7 @@ void test_cos_norm32(void)
    float max_error = -2;
    float error_threshold = 1e-07;
    float fx = 0;
-   opus_int32 x = 0;
+   oac_int32 x = 0;
    int q_input = 30;
    int q_output = 31;
    for (fx = -1.0f; fx <= 1.0f; fx += 0.007f)
@@ -584,7 +584,7 @@ void test_rcp_norm32(void)
    float max_relative_error = -1;
    float fx;
    float quantized_fx;
-   opus_val32 x;
+   oac_val32 x;
    int q_input = 31;
 
    for (fx = 0.5; fx <= 1.0; fx += 0.0000007)
@@ -668,7 +668,7 @@ void testcelt_float2int16(int use_ref_impl, int buffer_size)
    {
       celt_float2int16_c(floatsToConvert, results, cnt);
    } else {
-      celt_float2int16(floatsToConvert, results, cnt, opus_select_arch());
+      celt_float2int16(floatsToConvert, results, cnt, oac_select_arch());
    }
 
    for (i = 0; i < cnt; ++i)
@@ -694,12 +694,12 @@ void testcelt_float2int16(int use_ref_impl, int buffer_size)
 #undef MAX_BUFFER_SIZE
 }
 
-void testopus_limit2_checkwithin1(int use_ref_impl)
+void testoac_limit2_checkwithin1(int use_ref_impl)
 {
 #define BUFFER_SIZE 37 /* strange float count to trigger residue loop of SIMD implementation */
 #define BYTE_COUNT (BUFFER_SIZE * sizeof(float))
    int i, within1;
-   const int arch = opus_select_arch();
+   const int arch = oac_select_arch();
 
    float pattern[BUFFER_SIZE], buffer[BUFFER_SIZE];
 
@@ -711,10 +711,10 @@ void testopus_limit2_checkwithin1(int use_ref_impl)
    /* All values within -1..1:
    Nothing changed. Return value is implementation-dependent (not expected to recognise nothing exceeds -1..1) */
    memcpy(buffer, pattern, BYTE_COUNT);
-   within1 = use_ref_impl ? opus_limit2_checkwithin1_c(buffer, BUFFER_SIZE) : opus_limit2_checkwithin1(buffer, BUFFER_SIZE, arch);
+   within1 = use_ref_impl ? oac_limit2_checkwithin1_c(buffer, BUFFER_SIZE) : oac_limit2_checkwithin1(buffer, BUFFER_SIZE, arch);
    if (memcmp(buffer, pattern, BYTE_COUNT) != 0)
    {
-      fprintf (stderr, "opus_limit2_checkwithin1() modified values not exceeding -1..1 (ref=%d)\n", use_ref_impl);
+      fprintf (stderr, "oac_limit2_checkwithin1() modified values not exceeding -1..1 (ref=%d)\n", use_ref_impl);
       ret = 1;
    }
 
@@ -726,16 +726,16 @@ void testopus_limit2_checkwithin1(int use_ref_impl)
 
       memcpy(buffer, pattern, BYTE_COUNT);
       buffer[i] = replace_value;
-      within1 = use_ref_impl ? opus_limit2_checkwithin1_c(buffer, BUFFER_SIZE) : opus_limit2_checkwithin1(buffer, BUFFER_SIZE, arch);
+      within1 = use_ref_impl ? oac_limit2_checkwithin1_c(buffer, BUFFER_SIZE) : oac_limit2_checkwithin1(buffer, BUFFER_SIZE, arch);
       if (within1 || buffer[i] != replace_value)
       {
-         fprintf (stderr, "opus_limit2_checkwithin1() handled value exceeding -1..1 erroneously (ref=%d, i=%d)\n", use_ref_impl, i);
+         fprintf (stderr, "oac_limit2_checkwithin1() handled value exceeding -1..1 erroneously (ref=%d, i=%d)\n", use_ref_impl, i);
          ret = 1;
       }
       buffer[i] = pattern[i];
       if (memcmp(buffer, pattern, BYTE_COUNT) != 0)
       {
-         fprintf (stderr, "opus_limit2_checkwithin1() modified value within -2..2  (ref=%d, i=%d)\n", use_ref_impl, i);
+         fprintf (stderr, "oac_limit2_checkwithin1() modified value within -2..2  (ref=%d, i=%d)\n", use_ref_impl, i);
          ret = 1;
       }
    }
@@ -748,16 +748,16 @@ void testopus_limit2_checkwithin1(int use_ref_impl)
 
       memcpy(buffer, pattern, BYTE_COUNT);
       buffer[i] = replace_value;
-      within1 = use_ref_impl ? opus_limit2_checkwithin1_c(buffer, BUFFER_SIZE) : opus_limit2_checkwithin1(buffer, BUFFER_SIZE, arch);
+      within1 = use_ref_impl ? oac_limit2_checkwithin1_c(buffer, BUFFER_SIZE) : oac_limit2_checkwithin1(buffer, BUFFER_SIZE, arch);
       if (within1 || buffer[i] != (replace_value > 0.f ? 2.f : -2.f))
       {
-         fprintf (stderr, "opus_limit2_checkwithin1() handled value exceeding -2..2 erroneously (ref=%d, i=%d)\n", use_ref_impl, i);
+         fprintf (stderr, "oac_limit2_checkwithin1() handled value exceeding -2..2 erroneously (ref=%d, i=%d)\n", use_ref_impl, i);
          ret = 1;
       }
       buffer[i] = pattern[i];
       if (memcmp(buffer, pattern, BYTE_COUNT) != 0)
       {
-         fprintf (stderr, "opus_limit2_checkwithin1() modified value within -2..2  (ref=%d, i=%d)\n", use_ref_impl, i);
+         fprintf (stderr, "oac_limit2_checkwithin1() modified value within -2..2  (ref=%d, i=%d)\n", use_ref_impl, i);
          ret = 1;
       }
    }
@@ -798,7 +798,7 @@ int main(void)
       testcelt_float2int16(use_ref_impl[i], 32);
       testcelt_float2int16(use_ref_impl[i], 127);
       testcelt_float2int16(use_ref_impl[i], 1031);
-      testopus_limit2_checkwithin1(use_ref_impl[i]);
+      testoac_limit2_checkwithin1(use_ref_impl[i]);
    }
 #else
    (void)i;
diff --git a/celt/tests/test_unit_mdct.c b/celt/tests/test_unit_mdct.c
index d075d4452..0928510f4 100644
--- a/celt/tests/test_unit_mdct.c
+++ b/celt/tests/test_unit_mdct.c
@@ -121,7 +121,7 @@ void test1d(int nfft,int isinverse,int arch)
 #else
     int shift;
     const mdct_lookup *cfg;
-    CELTMode *mode = opus_custom_mode_create(48000, 960, NULL);
+    CELTMode *mode = oac_custom_mode_create(48000, 960, NULL);
     if (nfft == 1920) shift = 0;
     else if (nfft == 960) shift = 1;
     else if (nfft == 480) shift = 2;
@@ -186,7 +186,7 @@ int main(int argc,char ** argv)
 {
     int arch;
     ALLOC_STACK;
-    arch = opus_select_arch();
+    arch = oac_select_arch();
 
     if (argc>1) {
         int k;
diff --git a/celt/tests/test_unit_types.c b/celt/tests/test_unit_types.c
index 67a0fb8ed..8660be47a 100644
--- a/celt/tests/test_unit_types.c
+++ b/celt/tests/test_unit_types.c
@@ -29,19 +29,19 @@
 #include "config.h"
 #endif
 
-#include "opus_types.h"
+#include "oac_types.h"
 #include <stdio.h>
 
 int main(void)
 {
-   opus_int16 i = 1;
+   oac_int16 i = 1;
    i <<= 14;
    if (i>>14 != 1)
    {
-      fprintf(stderr, "opus_int16 isn't 16 bits\n");
+      fprintf(stderr, "oac_int16 isn't 16 bits\n");
       return 1;
    }
-   if (sizeof(opus_int16)*2 != sizeof(opus_int32))
+   if (sizeof(oac_int16)*2 != sizeof(oac_int32))
    {
       fprintf(stderr, "16*2 != 32\n");
       return 1;
diff --git a/celt/vq.c b/celt/vq.c
index 75051b560..c3c18b409 100644
--- a/celt/vq.c
+++ b/celt/vq.c
@@ -54,27 +54,27 @@ void norm_scaledown(celt_norm *X, int N, int shift) {
    for (i=0;i<N;i++) X[i] = PSHR32(X[i], shift);
 }
 
-opus_val32 celt_inner_prod_norm(const celt_norm *x, const celt_norm *y, int len, int arch) {
+oac_val32 celt_inner_prod_norm(const celt_norm *x, const celt_norm *y, int len, int arch) {
    int i;
-   opus_val32 sum = 0;
+   oac_val32 sum = 0;
    (void)arch;
    for (i=0;i<len;i++) sum += x[i]*y[i];
    return sum;
 }
-opus_val32 celt_inner_prod_norm_shift(const celt_norm *x, const celt_norm *y, int len, int arch) {
+oac_val32 celt_inner_prod_norm_shift(const celt_norm *x, const celt_norm *y, int len, int arch) {
    int i;
-   opus_val64 sum = 0;
+   oac_val64 sum = 0;
    (void)arch;
-   for (i=0;i<len;i++) sum += x[i]*(opus_val64)y[i];
+   for (i=0;i<len;i++) sum += x[i]*(oac_val64)y[i];
    return sum>>2*(NORM_SHIFT-14);
 }
 #endif
 
 #ifndef OVERRIDE_vq_exp_rotation1
-static void exp_rotation1(celt_norm *X, int len, int stride, opus_val16 c, opus_val16 s)
+static void exp_rotation1(celt_norm *X, int len, int stride, oac_val16 c, oac_val16 s)
 {
    int i;
-   opus_val16 ms;
+   oac_val16 ms;
    celt_norm *Xptr;
    Xptr = X;
    ms = NEG16(s);
@@ -104,8 +104,8 @@ void exp_rotation(celt_norm *X, int len, int dir, int stride, int K, int spread)
 {
    static const int SPREAD_FACTOR[3]={15,10,5};
    int i;
-   opus_val16 c, s;
-   opus_val16 gain, theta;
+   oac_val16 c, s;
+   oac_val16 gain, theta;
    int stride2=0;
    int factor;
 
@@ -113,7 +113,7 @@ void exp_rotation(celt_norm *X, int len, int dir, int stride, int K, int spread)
       return;
    factor = SPREAD_FACTOR[spread-1];
 
-   gain = celt_div((opus_val32)MULT16_16(Q15_ONE,len),(opus_val32)(len+factor*K));
+   gain = celt_div((oac_val32)MULT16_16(Q15_ONE,len),(oac_val32)(len+factor*K));
    theta = HALF16(MULT16_16_Q15(gain,gain));
 
    c = celt_cos_norm(EXTEND32(theta));
@@ -146,15 +146,15 @@ void exp_rotation(celt_norm *X, int len, int dir, int stride, int K, int spread)
 }
 
 /** Normalizes the decoded integer pvq codeword to unit norm. */
-static void normalise_residual(int * OPUS_RESTRICT iy, celt_norm * OPUS_RESTRICT X,
-      int N, opus_val32 Ryy, opus_val32 gain, int shift)
+static void normalise_residual(int * OAC_RESTRICT iy, celt_norm * OAC_RESTRICT X,
+      int N, oac_val32 Ryy, oac_val32 gain, int shift)
 {
    int i;
 #ifdef FIXED_POINT
    int k;
 #endif
-   opus_val32 t;
-   opus_val32 g;
+   oac_val32 t;
+   oac_val32 g;
 
 #ifdef FIXED_POINT
    k = celt_ilog2(Ryy)>>1;
@@ -201,15 +201,15 @@ static unsigned extract_collapse_mask(int *iy, int N, int B)
    return collapse_mask;
 }
 
-opus_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch)
+oac_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch)
 {
    VARDECL(celt_norm, y);
    VARDECL(int, signx);
    int i, j;
    int pulsesLeft;
-   opus_val32 sum;
-   opus_val32 xy;
-   opus_val16 yy;
+   oac_val32 sum;
+   oac_val32 xy;
+   oac_val16 yy;
    SAVE_STACK;
 
    (void)arch;
@@ -239,7 +239,7 @@ opus_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch)
    /* Do a pre-search by projecting on the pyramid */
    if (K > (N>>1))
    {
-      opus_val16 rcp;
+      oac_val16 rcp;
       j=0; do {
          sum += X[j];
       }  while (++j<N);
@@ -288,7 +288,7 @@ opus_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch)
 #endif
    if (pulsesLeft > N+3)
    {
-      opus_val16 tmp = (opus_val16)pulsesLeft;
+      oac_val16 tmp = (oac_val16)pulsesLeft;
       yy = MAC16_16(yy, tmp, tmp);
       yy = MAC16_16(yy, tmp, y[0]);
       iy[0] += pulsesLeft;
@@ -297,10 +297,10 @@ opus_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch)
 
    for (i=0;i<pulsesLeft;i++)
    {
-      opus_val16 Rxy, Ryy;
+      oac_val16 Rxy, Ryy;
       int best_id;
-      opus_val32 best_num;
-      opus_val16 best_den;
+      oac_val32 best_num;
+      oac_val16 best_den;
 #ifdef FIXED_POINT
       int rshift;
 #endif
@@ -341,7 +341,7 @@ opus_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch)
             since the condition is more often false than true and using
             a cmov introduces data dependencies across iterations. The optimal
             choice may be architecture-dependent. */
-         if (opus_unlikely(MULT16_16(best_den, Rxy) > MULT16_16(Ryy, best_num)))
+         if (oac_unlikely(MULT16_16(best_den, Rxy) > MULT16_16(Ryy, best_num)))
          {
             best_den = Ryy;
             best_num = Rxy;
@@ -376,10 +376,10 @@ opus_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch)
    RESTORE_STACK;
    RESTORE_STACK;
 unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
-      opus_val32 gain, int resynth, int arch)
+      oac_val32 gain, int resynth, int arch)
 {
    VARDECL(int, iy);
-   opus_val32 yy;
+   oac_val32 yy;
    unsigned collapse_mask;
    SAVE_STACK;
 
@@ -406,9 +406,9 @@ unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
 /** Decode pulse vector and combine the result with the pitch vector to produce
     the final normalised signal in the current band. */
 unsigned alg_unquant(celt_norm *X, int N, int K, int spread, int B,
-      ec_dec *dec, opus_val32 gain)
+      ec_dec *dec, oac_val32 gain)
 {
-   opus_val32 Ryy;
+   oac_val32 Ryy;
    unsigned collapse_mask;
    VARDECL(int, iy);
    int yy_shift=0;
@@ -426,15 +426,15 @@ unsigned alg_unquant(celt_norm *X, int N, int K, int spread, int B,
 }
 
 #ifndef OVERRIDE_renormalise_vector
-void renormalise_vector(celt_norm *X, int N, opus_val32 gain, int arch)
+void renormalise_vector(celt_norm *X, int N, oac_val32 gain, int arch)
 {
    int i;
 #ifdef FIXED_POINT
    int k;
 #endif
-   opus_val32 E;
-   opus_val16 g;
-   opus_val32 t;
+   oac_val32 E;
+   oac_val16 g;
+   oac_val32 t;
    celt_norm *xptr;
    norm_scaledown(X, N, NORM_SHIFT-14);
    E = EPSILON + celt_inner_prod_norm(X, X, N, arch);
@@ -455,12 +455,12 @@ void renormalise_vector(celt_norm *X, int N, opus_val32 gain, int arch)
 }
 #endif /* OVERRIDE_renormalise_vector */
 
-opus_int32 stereo_itheta(const celt_norm *X, const celt_norm *Y, int stereo, int N, int arch)
+oac_int32 stereo_itheta(const celt_norm *X, const celt_norm *Y, int stereo, int N, int arch)
 {
    int i;
    int itheta;
-   opus_val32 mid, side;
-   opus_val32 Emid, Eside;
+   oac_val32 mid, side;
+   oac_val32 Emid, Eside;
 
    Emid = Eside = 0;
    if (stereo)
@@ -488,10 +488,10 @@ opus_int32 stereo_itheta(const celt_norm *X, const celt_norm *Y, int stereo, int
    return itheta;
 }
 
-static void cubic_synthesis(celt_norm *X, int *iy, int N, int K, int face, int sign, opus_val32 gain) {
+static void cubic_synthesis(celt_norm *X, int *iy, int N, int K, int face, int sign, oac_val32 gain) {
    int i;
-   opus_val32 sum=0;
-   opus_val32 mag;
+   oac_val32 sum=0;
+   oac_val32 mag;
 #ifdef FIXED_POINT
    int sum_shift;
    int shift = IMAX(celt_ilog2(K) + celt_ilog2(N)/2 - 13, 0);
@@ -517,13 +517,13 @@ static void cubic_synthesis(celt_norm *X, int *iy, int N, int K, int face, int s
 #endif
 }
 
-unsigned cubic_quant(celt_norm *X, int N, int res, int B, ec_enc *enc, opus_val32 gain, int resynth) {
+unsigned cubic_quant(celt_norm *X, int N, int res, int B, ec_enc *enc, oac_val32 gain, int resynth) {
    int i;
    int face=0;
    int K;
    VARDECL(int, iy);
    celt_norm faceval=-1;
-   opus_val32 norm;
+   oac_val32 norm;
    int sign;
    SAVE_STACK;
    ALLOC(iy, N, int);
@@ -531,7 +531,7 @@ unsigned cubic_quant(celt_norm *X, int N, int res, int B, ec_enc *enc, opus_val3
    /* Using odd K on transients to avoid adding pre-echo. */
    if (B!=1) K=IMAX(1, K-1);
    if (K==1) {
-      if (resynth) OPUS_CLEAR(X, N);
+      if (resynth) OAC_CLEAR(X, N);
       RESTORE_STACK;
       return 0;
    }
@@ -554,7 +554,7 @@ unsigned cubic_quant(celt_norm *X, int N, int res, int B, ec_enc *enc, opus_val3
          iy[i] = IMIN(K-1, (MULT32_32_Q31(SHL32(X[i]+faceval, face_shift-1), norm)) >> 15);
       }
    } else {
-      OPUS_CLEAR(iy, N);
+      OAC_CLEAR(iy, N);
    }
 #else
    norm = .5f*K/(faceval+EPSILON);
@@ -572,7 +572,7 @@ unsigned cubic_quant(celt_norm *X, int N, int res, int B, ec_enc *enc, opus_val3
    return (1<<B)-1;
 }
 
-unsigned cubic_unquant(celt_norm *X, int N, int res, int B, ec_dec *dec, opus_val32 gain) {
+unsigned cubic_unquant(celt_norm *X, int N, int res, int B, ec_dec *dec, oac_val32 gain) {
    int i;
    int face;
    int sign;
@@ -584,7 +584,7 @@ unsigned cubic_unquant(celt_norm *X, int N, int res, int B, ec_dec *dec, opus_va
    /* Using odd K on transients to avoid adding pre-echo. */
    if (B!=1) K=IMAX(1, K-1);
    if (K==1) {
-      OPUS_CLEAR(X, N);
+      OAC_CLEAR(X, N);
       RESTORE_STACK;
       return 0;
    }
diff --git a/celt/vq.h b/celt/vq.h
index 1f368a57b..5c316e1dc 100644
--- a/celt/vq.h
+++ b/celt/vq.h
@@ -37,13 +37,13 @@
 #include "entdec.h"
 #include "modes.h"
 
-#if (defined(OPUS_X86_MAY_HAVE_SSE2) && !defined(FIXED_POINT))
+#if (defined(OAC_X86_MAY_HAVE_SSE2) && !defined(FIXED_POINT))
 #include "x86/vq_sse.h"
 #endif
 
 #if defined(FIXED_POINT)
-opus_val32 celt_inner_prod_norm(const celt_norm *x, const celt_norm *y, int len, int arch);
-opus_val32 celt_inner_prod_norm_shift(const celt_norm *x, const celt_norm *y, int len, int arch);
+oac_val32 celt_inner_prod_norm(const celt_norm *x, const celt_norm *y, int len, int arch);
+oac_val32 celt_inner_prod_norm_shift(const celt_norm *x, const celt_norm *y, int len, int arch);
 
 void norm_scaleup(celt_norm *X, int N, int shift);
 void norm_scaledown(celt_norm *X, int N, int shift);
@@ -57,7 +57,7 @@ void norm_scaledown(celt_norm *X, int N, int shift);
 
 void exp_rotation(celt_norm *X, int len, int dir, int stride, int K, int spread);
 
-opus_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch);
+oac_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch);
 
 #if !defined(OVERRIDE_OP_PVQ_SEARCH)
 #define op_pvq_search(x, iy, K, N, arch) \
@@ -74,7 +74,7 @@ opus_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch);
  * @ret A mask indicating which blocks in the band received pulses
 */
 unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
-      opus_val32 gain, int resynth, int arch);
+      oac_val32 gain, int resynth, int arch);
 
 /** Algebraic pulse decoder
  * @param X Decoded normalised spectrum (returned)
@@ -84,13 +84,13 @@ unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
  * @ret A mask indicating which blocks in the band received pulses
  */
 unsigned alg_unquant(celt_norm *X, int N, int K, int spread, int B,
-      ec_dec *dec, opus_val32 gain);
+      ec_dec *dec, oac_val32 gain);
 
-void renormalise_vector(celt_norm *X, int N, opus_val32 gain, int arch);
+void renormalise_vector(celt_norm *X, int N, oac_val32 gain, int arch);
 
-opus_int32 stereo_itheta(const celt_norm *X, const celt_norm *Y, int stereo, int N, int arch);
+oac_int32 stereo_itheta(const celt_norm *X, const celt_norm *Y, int stereo, int N, int arch);
 
-unsigned cubic_quant(celt_norm *X, int N, int K, int B, ec_enc *enc, opus_val32 gain, int resynth);
-unsigned cubic_unquant(celt_norm *X, int N, int K, int B, ec_dec *dec, opus_val32 gain);
+unsigned cubic_quant(celt_norm *X, int N, int K, int B, ec_enc *enc, oac_val32 gain, int resynth);
+unsigned cubic_unquant(celt_norm *X, int N, int K, int B, ec_dec *dec, oac_val32 gain);
 
 #endif /* VQ_H */
diff --git a/celt/x86/celt_lpc_sse.h b/celt/x86/celt_lpc_sse.h
index 90e69ecf6..676ff4f1e 100644
--- a/celt/x86/celt_lpc_sse.h
+++ b/celt/x86/celt_lpc_sse.h
@@ -32,34 +32,34 @@
 #include "config.h"
 #endif
 
-#if defined(OPUS_X86_MAY_HAVE_SSE4_1) && defined(FIXED_POINT)
+#if defined(OAC_X86_MAY_HAVE_SSE4_1) && defined(FIXED_POINT)
 
 void celt_fir_sse4_1(
-         const opus_val16 *x,
-         const opus_val16 *num,
-         opus_val16 *y,
+         const oac_val16 *x,
+         const oac_val16 *num,
+         oac_val16 *y,
          int N,
          int ord,
          int arch);
 
-#if defined(OPUS_X86_PRESUME_SSE4_1)
+#if defined(OAC_X86_PRESUME_SSE4_1)
 #define OVERRIDE_CELT_FIR
 #define celt_fir(x, num, y, N, ord, arch) \
     ((void)arch, celt_fir_sse4_1(x, num, y, N, ord, arch))
 
-#elif defined(OPUS_HAVE_RTCD)
+#elif defined(OAC_HAVE_RTCD)
 
-extern void (*const CELT_FIR_IMPL[OPUS_ARCHMASK + 1])(
-         const opus_val16 *x,
-         const opus_val16 *num,
-         opus_val16 *y,
+extern void (*const CELT_FIR_IMPL[OAC_ARCHMASK + 1])(
+         const oac_val16 *x,
+         const oac_val16 *num,
+         oac_val16 *y,
          int N,
          int ord,
          int arch);
 
 #define OVERRIDE_CELT_FIR
 #  define celt_fir(x, num, y, N, ord, arch) \
-    ((*CELT_FIR_IMPL[(arch) & OPUS_ARCHMASK])(x, num, y, N, ord, arch))
+    ((*CELT_FIR_IMPL[(arch) & OAC_ARCHMASK])(x, num, y, N, ord, arch))
 
 #endif
 #endif
diff --git a/celt/x86/celt_lpc_sse4_1.c b/celt/x86/celt_lpc_sse4_1.c
index 229a7625d..d08ca8ae3 100644
--- a/celt/x86/celt_lpc_sse4_1.c
+++ b/celt/x86/celt_lpc_sse4_1.c
@@ -40,21 +40,21 @@
 
 #if defined(FIXED_POINT)
 
-void celt_fir_sse4_1(const opus_val16 *x,
-         const opus_val16 *num,
-         opus_val16 *y,
+void celt_fir_sse4_1(const oac_val16 *x,
+         const oac_val16 *num,
+         oac_val16 *y,
          int N,
          int ord,
          int arch)
 {
     int i,j;
-    VARDECL(opus_val16, rnum);
+    VARDECL(oac_val16, rnum);
 
     __m128i vecNoA;
-    opus_int32 noA ;
+    oac_int32 noA ;
     SAVE_STACK;
 
-   ALLOC(rnum, ord, opus_val16);
+   ALLOC(rnum, ord, oac_val16);
    for(i=0;i<ord;i++)
       rnum[i] = num[ord-i-1];
    noA = EXTEND32(1) << SIG_SHIFT >> 1;
@@ -62,15 +62,15 @@ void celt_fir_sse4_1(const opus_val16 *x,
 
    for (i=0;i<N-3;i+=4)
    {
-      opus_val32 sums[4] = {0};
+      oac_val32 sums[4] = {0};
       __m128i vecSum, vecX;
-#if defined(OPUS_CHECK_ASM)
+#if defined(OAC_CHECK_ASM)
       {
-         opus_val32 sums_c[4] = {0};
+         oac_val32 sums_c[4] = {0};
          xcorr_kernel_c(rnum, x+i-ord, sums_c, ord);
 #endif
          xcorr_kernel(rnum, x+i-ord, sums, ord, arch);
-#if defined(OPUS_CHECK_ASM)
+#if defined(OAC_CHECK_ASM)
          celt_assert(memcmp(sums, sums_c, sizeof(sums)) == 0);
       }
 #endif
@@ -84,7 +84,7 @@ void celt_fir_sse4_1(const opus_val16 *x,
    }
    for (;i<N;i++)
    {
-      opus_val32 sum = 0;
+      oac_val32 sum = 0;
       for (j=0;j<ord;j++)
          sum = MAC16_16(sum, rnum[j], x[i+j-ord]);
       y[i] = SATURATE16(ADD32(EXTEND32(x[i]), PSHR32(sum, SIG_SHIFT)));
diff --git a/celt/x86/pitch_avx.c b/celt/x86/pitch_avx.c
index f731762d8..c772d4905 100644
--- a/celt/x86/pitch_avx.c
+++ b/celt/x86/pitch_avx.c
@@ -33,7 +33,7 @@
 #include "x86cpu.h"
 #include "pitch.h"
 
-#if defined(OPUS_X86_MAY_HAVE_AVX2) && !defined(FIXED_POINT)
+#if defined(OAC_X86_MAY_HAVE_AVX2) && !defined(FIXED_POINT)
 
 /* Like the "regular" xcorr_kernel(), but computes 8 results at a time. */
 static void xcorr_kernel_avx(const float *x, const float *y, float sum[8], int len)
diff --git a/celt/x86/pitch_sse.c b/celt/x86/pitch_sse.c
index 20e73126b..379364440 100644
--- a/celt/x86/pitch_sse.c
+++ b/celt/x86/pitch_sse.c
@@ -35,12 +35,12 @@
 #include "mathops.h"
 #include "pitch.h"
 
-#if defined(OPUS_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)
+#if defined(OAC_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)
 
 #include <xmmintrin.h>
 #include "arch.h"
 
-void xcorr_kernel_sse(const opus_val16 *x, const opus_val16 *y, opus_val32 sum[4], int len)
+void xcorr_kernel_sse(const oac_val16 *x, const oac_val16 *y, oac_val32 sum[4], int len)
 {
    int j;
    __m128 xsum1, xsum2;
@@ -76,8 +76,8 @@ void xcorr_kernel_sse(const opus_val16 *x, const opus_val16 *y, opus_val32 sum[4
 }
 
 
-void dual_inner_prod_sse(const opus_val16 *x, const opus_val16 *y01, const opus_val16 *y02,
-      int N, opus_val32 *xy1, opus_val32 *xy2)
+void dual_inner_prod_sse(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
+      int N, oac_val32 *xy1, oac_val32 *xy2)
 {
    int i;
    __m128 xsum1, xsum2;
@@ -105,7 +105,7 @@ void dual_inner_prod_sse(const opus_val16 *x, const opus_val16 *y01, const opus_
    }
 }
 
-opus_val32 celt_inner_prod_sse(const opus_val16 *x, const opus_val16 *y,
+oac_val32 celt_inner_prod_sse(const oac_val16 *x, const oac_val16 *y,
       int N)
 {
    int i;
@@ -130,8 +130,8 @@ opus_val32 celt_inner_prod_sse(const opus_val16 *x, const opus_val16 *y,
    return xy;
 }
 
-void comb_filter_const_sse(opus_val32 *y, opus_val32 *x, int T, int N,
-      opus_val16 g10, opus_val16 g11, opus_val16 g12)
+void comb_filter_const_sse(oac_val32 *y, oac_val32 *x, int T, int N,
+      oac_val16 g10, oac_val16 g11, oac_val16 g12)
 {
    int i;
    __m128 x0v;
@@ -143,7 +143,7 @@ void comb_filter_const_sse(opus_val32 *y, opus_val32 *x, int T, int N,
    for (i=0;i<N-3;i+=4)
    {
       __m128 yi, yi2, x1v, x2v, x3v, x4v;
-      const opus_val32 *xp = &x[i-T-2];
+      const oac_val32 *xp = &x[i-T-2];
       yi = _mm_loadu_ps(x+i);
       x4v = _mm_loadu_ps(xp+4);
 #if 0
diff --git a/celt/x86/pitch_sse.h b/celt/x86/pitch_sse.h
index 127581f3e..f028dc4aa 100644
--- a/celt/x86/pitch_sse.h
+++ b/celt/x86/pitch_sse.h
@@ -37,117 +37,117 @@
 #include "config.h"
 #endif
 
-#if defined(OPUS_X86_MAY_HAVE_SSE4_1) && defined(FIXED_POINT)
+#if defined(OAC_X86_MAY_HAVE_SSE4_1) && defined(FIXED_POINT)
 void xcorr_kernel_sse4_1(
-                    const opus_int16 *x,
-                    const opus_int16 *y,
-                    opus_val32       sum[4],
+                    const oac_int16 *x,
+                    const oac_int16 *y,
+                    oac_val32       sum[4],
                     int              len);
 #endif
 
-#if defined(OPUS_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)
+#if defined(OAC_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)
 void xcorr_kernel_sse(
-                    const opus_val16 *x,
-                    const opus_val16 *y,
-                    opus_val32       sum[4],
+                    const oac_val16 *x,
+                    const oac_val16 *y,
+                    oac_val32       sum[4],
                     int              len);
 #endif
 
-#if defined(OPUS_X86_PRESUME_SSE4_1) && defined(FIXED_POINT)
+#if defined(OAC_X86_PRESUME_SSE4_1) && defined(FIXED_POINT)
 #define OVERRIDE_XCORR_KERNEL
 #define xcorr_kernel(x, y, sum, len, arch) \
     ((void)arch, xcorr_kernel_sse4_1(x, y, sum, len))
 
-#elif defined(OPUS_X86_PRESUME_SSE) && !defined(FIXED_POINT)
+#elif defined(OAC_X86_PRESUME_SSE) && !defined(FIXED_POINT)
 #define OVERRIDE_XCORR_KERNEL
 #define xcorr_kernel(x, y, sum, len, arch) \
     ((void)arch, xcorr_kernel_sse(x, y, sum, len))
 
-#elif defined(OPUS_HAVE_RTCD) &&  ((defined(OPUS_X86_MAY_HAVE_SSE4_1) && defined(FIXED_POINT)) || (defined(OPUS_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)))
+#elif defined(OAC_HAVE_RTCD) &&  ((defined(OAC_X86_MAY_HAVE_SSE4_1) && defined(FIXED_POINT)) || (defined(OAC_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)))
 
-extern void (*const XCORR_KERNEL_IMPL[OPUS_ARCHMASK + 1])(
-                    const opus_val16 *x,
-                    const opus_val16 *y,
-                    opus_val32       sum[4],
+extern void (*const XCORR_KERNEL_IMPL[OAC_ARCHMASK + 1])(
+                    const oac_val16 *x,
+                    const oac_val16 *y,
+                    oac_val32       sum[4],
                     int              len);
 
 #define OVERRIDE_XCORR_KERNEL
 #define xcorr_kernel(x, y, sum, len, arch) \
-    ((*XCORR_KERNEL_IMPL[(arch) & OPUS_ARCHMASK])(x, y, sum, len))
+    ((*XCORR_KERNEL_IMPL[(arch) & OAC_ARCHMASK])(x, y, sum, len))
 
 #endif
 
-#if defined(OPUS_X86_MAY_HAVE_SSE4_1) && defined(FIXED_POINT)
-opus_val32 celt_inner_prod_sse4_1(
-    const opus_int16 *x,
-    const opus_int16 *y,
+#if defined(OAC_X86_MAY_HAVE_SSE4_1) && defined(FIXED_POINT)
+oac_val32 celt_inner_prod_sse4_1(
+    const oac_int16 *x,
+    const oac_int16 *y,
     int               N);
 #endif
 
-#if defined(OPUS_X86_MAY_HAVE_SSE2) && defined(FIXED_POINT)
-opus_val32 celt_inner_prod_sse2(
-    const opus_int16 *x,
-    const opus_int16 *y,
+#if defined(OAC_X86_MAY_HAVE_SSE2) && defined(FIXED_POINT)
+oac_val32 celt_inner_prod_sse2(
+    const oac_int16 *x,
+    const oac_int16 *y,
     int               N);
 #endif
 
-#if defined(OPUS_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)
-opus_val32 celt_inner_prod_sse(
-    const opus_val16 *x,
-    const opus_val16 *y,
+#if defined(OAC_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)
+oac_val32 celt_inner_prod_sse(
+    const oac_val16 *x,
+    const oac_val16 *y,
     int               N);
 #endif
 
 
-#if defined(OPUS_X86_PRESUME_SSE4_1) && defined(FIXED_POINT)
+#if defined(OAC_X86_PRESUME_SSE4_1) && defined(FIXED_POINT)
 #define OVERRIDE_CELT_INNER_PROD
 #define celt_inner_prod(x, y, N, arch) \
     ((void)arch, celt_inner_prod_sse4_1(x, y, N))
 
-#elif defined(OPUS_X86_PRESUME_SSE2) && defined(FIXED_POINT) && !defined(OPUS_X86_MAY_HAVE_SSE4_1)
+#elif defined(OAC_X86_PRESUME_SSE2) && defined(FIXED_POINT) && !defined(OAC_X86_MAY_HAVE_SSE4_1)
 #define OVERRIDE_CELT_INNER_PROD
 #define celt_inner_prod(x, y, N, arch) \
     ((void)arch, celt_inner_prod_sse2(x, y, N))
 
-#elif defined(OPUS_X86_PRESUME_SSE) && !defined(FIXED_POINT)
+#elif defined(OAC_X86_PRESUME_SSE) && !defined(FIXED_POINT)
 #define OVERRIDE_CELT_INNER_PROD
 #define celt_inner_prod(x, y, N, arch) \
     ((void)arch, celt_inner_prod_sse(x, y, N))
 
 
-#elif defined(OPUS_HAVE_RTCD) && (((defined(OPUS_X86_MAY_HAVE_SSE4_1) || defined(OPUS_X86_MAY_HAVE_SSE2)) && defined(FIXED_POINT)) || \
-    (defined(OPUS_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)))
+#elif defined(OAC_HAVE_RTCD) && (((defined(OAC_X86_MAY_HAVE_SSE4_1) || defined(OAC_X86_MAY_HAVE_SSE2)) && defined(FIXED_POINT)) || \
+    (defined(OAC_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)))
 
-extern opus_val32 (*const CELT_INNER_PROD_IMPL[OPUS_ARCHMASK + 1])(
-                    const opus_val16 *x,
-                    const opus_val16 *y,
+extern oac_val32 (*const CELT_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(
+                    const oac_val16 *x,
+                    const oac_val16 *y,
                     int               N);
 
 #define OVERRIDE_CELT_INNER_PROD
 #define celt_inner_prod(x, y, N, arch) \
-    ((*CELT_INNER_PROD_IMPL[(arch) & OPUS_ARCHMASK])(x, y, N))
+    ((*CELT_INNER_PROD_IMPL[(arch) & OAC_ARCHMASK])(x, y, N))
 
 #endif
 
-#if defined(OPUS_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)
+#if defined(OAC_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)
 
-void dual_inner_prod_sse(const opus_val16 *x,
-    const opus_val16 *y01,
-    const opus_val16 *y02,
+void dual_inner_prod_sse(const oac_val16 *x,
+    const oac_val16 *y01,
+    const oac_val16 *y02,
     int               N,
-    opus_val32       *xy1,
-    opus_val32       *xy2);
+    oac_val32       *xy1,
+    oac_val32       *xy2);
 
-void comb_filter_const_sse(opus_val32 *y,
-    opus_val32 *x,
+void comb_filter_const_sse(oac_val32 *y,
+    oac_val32 *x,
     int         T,
     int         N,
-    opus_val16  g10,
-    opus_val16  g11,
-    opus_val16  g12);
+    oac_val16  g10,
+    oac_val16  g11,
+    oac_val16  g12);
 
 
-#if defined(OPUS_X86_PRESUME_SSE)
+#if defined(OAC_X86_PRESUME_SSE)
 #define OVERRIDE_DUAL_INNER_PROD
 #define OVERRIDE_COMB_FILTER_CONST
 # define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) \
@@ -155,32 +155,32 @@ void comb_filter_const_sse(opus_val32 *y,
 
 # define comb_filter_const(y, x, T, N, g10, g11, g12, arch) \
     ((void)(arch),comb_filter_const_sse(y, x, T, N, g10, g11, g12))
-#elif defined(OPUS_HAVE_RTCD)
+#elif defined(OAC_HAVE_RTCD)
 
 #define OVERRIDE_DUAL_INNER_PROD
 #define OVERRIDE_COMB_FILTER_CONST
-extern void (*const DUAL_INNER_PROD_IMPL[OPUS_ARCHMASK + 1])(
-              const opus_val16 *x,
-              const opus_val16 *y01,
-              const opus_val16 *y02,
+extern void (*const DUAL_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(
+              const oac_val16 *x,
+              const oac_val16 *y01,
+              const oac_val16 *y02,
               int               N,
-              opus_val32       *xy1,
-              opus_val32       *xy2);
+              oac_val32       *xy1,
+              oac_val32       *xy2);
 
 #define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) \
-    ((*DUAL_INNER_PROD_IMPL[(arch) & OPUS_ARCHMASK])(x, y01, y02, N, xy1, xy2))
+    ((*DUAL_INNER_PROD_IMPL[(arch) & OAC_ARCHMASK])(x, y01, y02, N, xy1, xy2))
 
-extern void (*const COMB_FILTER_CONST_IMPL[OPUS_ARCHMASK + 1])(
-              opus_val32 *y,
-              opus_val32 *x,
+extern void (*const COMB_FILTER_CONST_IMPL[OAC_ARCHMASK + 1])(
+              oac_val32 *y,
+              oac_val32 *x,
               int         T,
               int         N,
-              opus_val16  g10,
-              opus_val16  g11,
-              opus_val16  g12);
+              oac_val16  g10,
+              oac_val16  g11,
+              oac_val16  g12);
 
 #define comb_filter_const(y, x, T, N, g10, g11, g12, arch) \
-    ((*COMB_FILTER_CONST_IMPL[(arch) & OPUS_ARCHMASK])(y, x, T, N, g10, g11, g12))
+    ((*COMB_FILTER_CONST_IMPL[(arch) & OAC_ARCHMASK])(y, x, T, N, g10, g11, g12))
 
 #define NON_STATIC_COMB_FILTER_CONST_C
 
@@ -188,15 +188,15 @@ extern void (*const COMB_FILTER_CONST_IMPL[OPUS_ARCHMASK + 1])(
 
 void celt_pitch_xcorr_avx2(const float *_x, const float *_y, float *xcorr, int len, int max_pitch, int arch);
 
-#if defined(OPUS_X86_PRESUME_AVX2)
+#if defined(OAC_X86_PRESUME_AVX2)
 
 #define OVERRIDE_PITCH_XCORR
 # define celt_pitch_xcorr celt_pitch_xcorr_avx2
 
-#elif defined(OPUS_HAVE_RTCD) && defined(OPUS_X86_MAY_HAVE_AVX2)
+#elif defined(OAC_HAVE_RTCD) && defined(OAC_X86_MAY_HAVE_AVX2)
 
 #define OVERRIDE_PITCH_XCORR
-extern void (*const PITCH_XCORR_IMPL[OPUS_ARCHMASK + 1])(
+extern void (*const PITCH_XCORR_IMPL[OAC_ARCHMASK + 1])(
               const float *_x,
               const float *_y,
               float *xcorr,
@@ -206,11 +206,11 @@ extern void (*const PITCH_XCORR_IMPL[OPUS_ARCHMASK + 1])(
               );
 
 #define celt_pitch_xcorr(_x, _y, xcorr, len, max_pitch, arch) \
-    ((*PITCH_XCORR_IMPL[(arch) & OPUS_ARCHMASK])(_x, _y, xcorr, len, max_pitch, arch))
+    ((*PITCH_XCORR_IMPL[(arch) & OAC_ARCHMASK])(_x, _y, xcorr, len, max_pitch, arch))
 
 
-#endif /* OPUS_X86_PRESUME_AVX2 && !OPUS_HAVE_RTCD */
+#endif /* OAC_X86_PRESUME_AVX2 && !OAC_HAVE_RTCD */
 
-#endif /* OPUS_X86_MAY_HAVE_SSE && !FIXED_POINT */
+#endif /* OAC_X86_MAY_HAVE_SSE && !FIXED_POINT */
 
 #endif
diff --git a/celt/x86/pitch_sse2.c b/celt/x86/pitch_sse2.c
index 114f21130..946d53ea5 100644
--- a/celt/x86/pitch_sse2.c
+++ b/celt/x86/pitch_sse2.c
@@ -38,12 +38,12 @@
 #include "mathops.h"
 #include "pitch.h"
 
-#if defined(OPUS_X86_MAY_HAVE_SSE2) && defined(FIXED_POINT)
-opus_val32 celt_inner_prod_sse2(const opus_val16 *x, const opus_val16 *y,
+#if defined(OAC_X86_MAY_HAVE_SSE2) && defined(FIXED_POINT)
+oac_val32 celt_inner_prod_sse2(const oac_val16 *x, const oac_val16 *y,
       int N)
 {
-    opus_int  i, dataSize16;
-    opus_int32 sum;
+    oac_int  i, dataSize16;
+    oac_int32 sum;
 
     __m128i inVec1_76543210, inVec1_FEDCBA98, acc1;
     __m128i inVec2_76543210, inVec2_FEDCBA98, acc2;
diff --git a/celt/x86/pitch_sse4_1.c b/celt/x86/pitch_sse4_1.c
index a14ea41ee..efb9cd4ee 100644
--- a/celt/x86/pitch_sse4_1.c
+++ b/celt/x86/pitch_sse4_1.c
@@ -38,15 +38,15 @@
 #include "mathops.h"
 #include "pitch.h"
 
-#if defined(OPUS_X86_MAY_HAVE_SSE4_1) && defined(FIXED_POINT)
+#if defined(OAC_X86_MAY_HAVE_SSE4_1) && defined(FIXED_POINT)
 #include <smmintrin.h>
 #include "x86cpu.h"
 
-opus_val32 celt_inner_prod_sse4_1(const opus_val16 *x, const opus_val16 *y,
+oac_val32 celt_inner_prod_sse4_1(const oac_val16 *x, const oac_val16 *y,
       int N)
 {
-    opus_int  i, dataSize16;
-    opus_int32 sum;
+    oac_int  i, dataSize16;
+    oac_int32 sum;
     __m128i inVec1_76543210, inVec1_FEDCBA98, acc1;
     __m128i inVec2_76543210, inVec2_FEDCBA98, acc2;
     __m128i inVec1_3210, inVec2_3210;
@@ -108,7 +108,7 @@ opus_val32 celt_inner_prod_sse4_1(const opus_val16 *x, const opus_val16 *y,
     return sum;
 }
 
-void xcorr_kernel_sse4_1(const opus_val16 * x, const opus_val16 * y, opus_val32 sum[ 4 ], int len)
+void xcorr_kernel_sse4_1(const oac_val16 * x, const oac_val16 * y, oac_val32 sum[ 4 ], int len)
 {
     int j;
 
@@ -117,8 +117,8 @@ void xcorr_kernel_sse4_1(const opus_val16 * x, const opus_val16 * y, opus_val32
     __m128i sum0, sum1, sum2, sum3, vecSum;
     __m128i initSum;
 
-#ifdef OPUS_CHECK_ASM
-    opus_val32 sum_c[4];
+#ifdef OAC_CHECK_ASM
+    oac_val32 sum_c[4];
     for (j=0;j<4;j++) {
       sum_c[j] = sum[j];
     }
@@ -233,7 +233,7 @@ void xcorr_kernel_sse4_1(const opus_val16 * x, const opus_val16 * y, opus_val32
     initSum = _mm_add_epi32(initSum, vecSum);
     _mm_storeu_si128((__m128i *)(void*)sum, initSum);
 
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     celt_assert(!memcmp(sum_c, sum, sizeof(sum_c)));
 #endif
 }
diff --git a/celt/x86/vq_sse.h b/celt/x86/vq_sse.h
index 444503b63..77ef472c4 100644
--- a/celt/x86/vq_sse.h
+++ b/celt/x86/vq_sse.h
@@ -27,24 +27,24 @@
 #ifndef VQ_SSE_H
 #define VQ_SSE_H
 
-#if defined(OPUS_X86_MAY_HAVE_SSE2) && !defined(FIXED_POINT)
+#if defined(OAC_X86_MAY_HAVE_SSE2) && !defined(FIXED_POINT)
 
-opus_val16 op_pvq_search_sse2(celt_norm *_X, int *iy, int K, int N, int arch);
+oac_val16 op_pvq_search_sse2(celt_norm *_X, int *iy, int K, int N, int arch);
 
-#if defined(OPUS_X86_PRESUME_SSE2)
+#if defined(OAC_X86_PRESUME_SSE2)
 
 #define OVERRIDE_OP_PVQ_SEARCH
 #define op_pvq_search(x, iy, K, N, arch) \
     (op_pvq_search_sse2(x, iy, K, N, arch))
 
-#elif defined(OPUS_HAVE_RTCD)
+#elif defined(OAC_HAVE_RTCD)
 
 #define OVERRIDE_OP_PVQ_SEARCH
-extern opus_val16 (*const OP_PVQ_SEARCH_IMPL[OPUS_ARCHMASK + 1])(
+extern oac_val16 (*const OP_PVQ_SEARCH_IMPL[OAC_ARCHMASK + 1])(
       celt_norm *_X, int *iy, int K, int N, int arch);
 
 #  define op_pvq_search(X, iy, K, N, arch) \
-    ((*OP_PVQ_SEARCH_IMPL[(arch) & OPUS_ARCHMASK])(X, iy, K, N, arch))
+    ((*OP_PVQ_SEARCH_IMPL[(arch) & OAC_ARCHMASK])(X, iy, K, N, arch))
 
 #endif
 #endif
diff --git a/celt/x86/vq_sse2.c b/celt/x86/vq_sse2.c
index 4c4ebf8e2..0209a9e3e 100644
--- a/celt/x86/vq_sse2.c
+++ b/celt/x86/vq_sse2.c
@@ -41,7 +41,7 @@
 
 #ifndef FIXED_POINT
 
-opus_val16 op_pvq_search_sse2(celt_norm *_X, int *iy, int K, int N, int arch)
+oac_val16 op_pvq_search_sse2(celt_norm *_X, int *iy, int K, int N, int arch)
 {
    int i, j;
    int pulsesLeft;
@@ -62,7 +62,7 @@ opus_val16 op_pvq_search_sse2(celt_norm *_X, int *iy, int K, int N, int arch)
    ALLOC(X, N+3, celt_norm);
    ALLOC(signy, N+3, float);
 
-   OPUS_COPY(X, _X, N);
+   OAC_COPY(X, _X, N);
    X[N] = X[N+1] = X[N+2] = 0;
    sums = _mm_setzero_ps();
    for (j=0;j<N;j+=4)
@@ -92,7 +92,7 @@ opus_val16 op_pvq_search_sse2(celt_norm *_X, int *iy, int K, int N, int arch)
       __m128i pulses_sum;
       __m128 yy4, xy4;
       __m128 rcp4;
-      opus_val32 sum = _mm_cvtss_f32(sums);
+      oac_val32 sum = _mm_cvtss_f32(sums);
       /* If X is too small, just replace it with a pulse at 0 */
       /* Prevents infinities and NaNs from causing too many pulses
          to be allocated. 64 is an approximation of infinity here. */
@@ -141,7 +141,7 @@ opus_val16 op_pvq_search_sse2(celt_norm *_X, int *iy, int K, int N, int arch)
       we fill the first bin with pulses. */
    if (pulsesLeft > N+3)
    {
-      opus_val16 tmp = (opus_val16)pulsesLeft;
+      oac_val16 tmp = (oac_val16)pulsesLeft;
       yy = MAC16_16(yy, tmp, tmp);
       yy = MAC16_16(yy, tmp, y[0]);
       iy[0] += pulsesLeft;
diff --git a/celt/x86/x86_arch_macros.h b/celt/x86/x86_arch_macros.h
index 975b443e9..343d63e5e 100644
--- a/celt/x86/x86_arch_macros.h
+++ b/celt/x86/x86_arch_macros.h
@@ -26,19 +26,19 @@
 
 #ifdef _MSC_VER
 
-# ifdef OPUS_X86_MAY_HAVE_SSE
+# ifdef OAC_X86_MAY_HAVE_SSE
 #  ifndef __SSE__
 #   define __SSE__
 #  endif
 # endif
 
-# ifdef OPUS_X86_MAY_HAVE_SSE2
+# ifdef OAC_X86_MAY_HAVE_SSE2
 #  ifndef __SSE2__
 #   define __SSE2__
 #  endif
 # endif
 
-# ifdef OPUS_X86_MAY_HAVE_SSE4_1
+# ifdef OAC_X86_MAY_HAVE_SSE4_1
 #  ifndef __SSE4_1__
 #   define __SSE4_1__
 #  endif
diff --git a/celt/x86/x86_celt_map.c b/celt/x86/x86_celt_map.c
index ba8eafe6a..f1e8e7646 100644
--- a/celt/x86/x86_celt_map.c
+++ b/celt/x86/x86_celt_map.c
@@ -35,16 +35,16 @@
 #include "pitch_sse.h"
 #include "vq.h"
 
-#if defined(OPUS_HAVE_RTCD)
+#if defined(OAC_HAVE_RTCD)
 
 # if defined(FIXED_POINT)
 
-#if defined(OPUS_X86_MAY_HAVE_SSE4_1) && !defined(OPUS_X86_PRESUME_SSE4_1)
+#if defined(OAC_X86_MAY_HAVE_SSE4_1) && !defined(OAC_X86_PRESUME_SSE4_1)
 
-void (*const CELT_FIR_IMPL[OPUS_ARCHMASK + 1])(
-         const opus_val16 *x,
-         const opus_val16 *num,
-         opus_val16       *y,
+void (*const CELT_FIR_IMPL[OAC_ARCHMASK + 1])(
+         const oac_val16 *x,
+         const oac_val16 *num,
+         oac_val16       *y,
          int              N,
          int              ord,
          int              arch
@@ -56,10 +56,10 @@ void (*const CELT_FIR_IMPL[OPUS_ARCHMASK + 1])(
   MAY_HAVE_SSE4_1(celt_fir)  /* avx  */
 };
 
-void (*const XCORR_KERNEL_IMPL[OPUS_ARCHMASK + 1])(
-         const opus_val16 *x,
-         const opus_val16 *y,
-         opus_val32       sum[4],
+void (*const XCORR_KERNEL_IMPL[OAC_ARCHMASK + 1])(
+         const oac_val16 *x,
+         const oac_val16 *y,
+         oac_val32       sum[4],
          int              len
 ) = {
   xcorr_kernel_c,                /* non-sse */
@@ -71,12 +71,12 @@ void (*const XCORR_KERNEL_IMPL[OPUS_ARCHMASK + 1])(
 
 #endif
 
-#if (defined(OPUS_X86_MAY_HAVE_SSE4_1) && !defined(OPUS_X86_PRESUME_SSE4_1)) ||  \
- (!defined(OPUS_X86_MAY_HAVE_SSE_4_1) && defined(OPUS_X86_MAY_HAVE_SSE2) && !defined(OPUS_X86_PRESUME_SSE2))
+#if (defined(OAC_X86_MAY_HAVE_SSE4_1) && !defined(OAC_X86_PRESUME_SSE4_1)) ||  \
+ (!defined(OAC_X86_MAY_HAVE_SSE_4_1) && defined(OAC_X86_MAY_HAVE_SSE2) && !defined(OAC_X86_PRESUME_SSE2))
 
-opus_val32 (*const CELT_INNER_PROD_IMPL[OPUS_ARCHMASK + 1])(
-         const opus_val16 *x,
-         const opus_val16 *y,
+oac_val32 (*const CELT_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(
+         const oac_val16 *x,
+         const oac_val16 *y,
          int              N
 ) = {
   celt_inner_prod_c,                /* non-sse */
@@ -90,9 +90,9 @@ opus_val32 (*const CELT_INNER_PROD_IMPL[OPUS_ARCHMASK + 1])(
 
 # else
 
-#if defined(OPUS_X86_MAY_HAVE_AVX2) && !defined(OPUS_X86_PRESUME_AVX2)
+#if defined(OAC_X86_MAY_HAVE_AVX2) && !defined(OAC_X86_PRESUME_AVX2)
 
-void (*const PITCH_XCORR_IMPL[OPUS_ARCHMASK + 1])(
+void (*const PITCH_XCORR_IMPL[OAC_ARCHMASK + 1])(
          const float *_x,
          const float *_y,
          float *xcorr,
@@ -110,12 +110,12 @@ void (*const PITCH_XCORR_IMPL[OPUS_ARCHMASK + 1])(
 #endif
 
 
-#if defined(OPUS_X86_MAY_HAVE_SSE) && !defined(OPUS_X86_PRESUME_SSE)
+#if defined(OAC_X86_MAY_HAVE_SSE) && !defined(OAC_X86_PRESUME_SSE)
 
-void (*const XCORR_KERNEL_IMPL[OPUS_ARCHMASK + 1])(
-         const opus_val16 *x,
-         const opus_val16 *y,
-         opus_val32       sum[4],
+void (*const XCORR_KERNEL_IMPL[OAC_ARCHMASK + 1])(
+         const oac_val16 *x,
+         const oac_val16 *y,
+         oac_val32       sum[4],
          int              len
 ) = {
   xcorr_kernel_c,                /* non-sse */
@@ -125,9 +125,9 @@ void (*const XCORR_KERNEL_IMPL[OPUS_ARCHMASK + 1])(
   MAY_HAVE_SSE(xcorr_kernel)
 };
 
-opus_val32 (*const CELT_INNER_PROD_IMPL[OPUS_ARCHMASK + 1])(
-         const opus_val16 *x,
-         const opus_val16 *y,
+oac_val32 (*const CELT_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(
+         const oac_val16 *x,
+         const oac_val16 *y,
          int              N
 ) = {
   celt_inner_prod_c,                /* non-sse */
@@ -137,13 +137,13 @@ opus_val32 (*const CELT_INNER_PROD_IMPL[OPUS_ARCHMASK + 1])(
   MAY_HAVE_SSE(celt_inner_prod)
 };
 
-void (*const DUAL_INNER_PROD_IMPL[OPUS_ARCHMASK + 1])(
-                    const opus_val16 *x,
-                    const opus_val16 *y01,
-                    const opus_val16 *y02,
+void (*const DUAL_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(
+                    const oac_val16 *x,
+                    const oac_val16 *y01,
+                    const oac_val16 *y02,
                     int               N,
-                    opus_val32       *xy1,
-                    opus_val32       *xy2
+                    oac_val32       *xy1,
+                    oac_val32       *xy2
 ) = {
   dual_inner_prod_c,                /* non-sse */
   MAY_HAVE_SSE(dual_inner_prod),
@@ -152,14 +152,14 @@ void (*const DUAL_INNER_PROD_IMPL[OPUS_ARCHMASK + 1])(
   MAY_HAVE_SSE(dual_inner_prod)
 };
 
-void (*const COMB_FILTER_CONST_IMPL[OPUS_ARCHMASK + 1])(
-              opus_val32 *y,
-              opus_val32 *x,
+void (*const COMB_FILTER_CONST_IMPL[OAC_ARCHMASK + 1])(
+              oac_val32 *y,
+              oac_val32 *x,
               int         T,
               int         N,
-              opus_val16  g10,
-              opus_val16  g11,
-              opus_val16  g12
+              oac_val16  g10,
+              oac_val16  g11,
+              oac_val16  g12
 ) = {
   comb_filter_const_c,                /* non-sse */
   MAY_HAVE_SSE(comb_filter_const),
@@ -171,8 +171,8 @@ void (*const COMB_FILTER_CONST_IMPL[OPUS_ARCHMASK + 1])(
 
 #endif
 
-#if defined(OPUS_X86_MAY_HAVE_SSE2) && !defined(OPUS_X86_PRESUME_SSE2)
-opus_val16 (*const OP_PVQ_SEARCH_IMPL[OPUS_ARCHMASK + 1])(
+#if defined(OAC_X86_MAY_HAVE_SSE2) && !defined(OAC_X86_PRESUME_SSE2)
+oac_val16 (*const OP_PVQ_SEARCH_IMPL[OAC_ARCHMASK + 1])(
       celt_norm *_X, int *iy, int K, int N, int arch
 ) = {
   op_pvq_search_c,                /* non-sse */
diff --git a/celt/x86/x86cpu.c b/celt/x86/x86cpu.c
index 2e7c32aee..664ba6f27 100644
--- a/celt/x86/x86cpu.c
+++ b/celt/x86/x86cpu.c
@@ -35,11 +35,11 @@
 #include "pitch.h"
 #include "x86cpu.h"
 
-#if defined(OPUS_HAVE_RTCD) && \
-  ((defined(OPUS_X86_MAY_HAVE_SSE) && !defined(OPUS_X86_PRESUME_SSE)) || \
-  (defined(OPUS_X86_MAY_HAVE_SSE2) && !defined(OPUS_X86_PRESUME_SSE2)) || \
-  (defined(OPUS_X86_MAY_HAVE_SSE4_1) && !defined(OPUS_X86_PRESUME_SSE4_1)) || \
-  (defined(OPUS_X86_MAY_HAVE_AVX2) && !defined(OPUS_X86_PRESUME_AVX2)))
+#if defined(OAC_HAVE_RTCD) && \
+  ((defined(OAC_X86_MAY_HAVE_SSE) && !defined(OAC_X86_PRESUME_SSE)) || \
+  (defined(OAC_X86_MAY_HAVE_SSE2) && !defined(OAC_X86_PRESUME_SSE2)) || \
+  (defined(OAC_X86_MAY_HAVE_SSE4_1) && !defined(OAC_X86_PRESUME_SSE4_1)) || \
+  (defined(OAC_X86_MAY_HAVE_AVX2) && !defined(OAC_X86_PRESUME_AVX2)))
 
 #if defined(_MSC_VER)
 
@@ -108,7 +108,7 @@ typedef struct CPU_Feature{
     int HW_AVX2;
 } CPU_Feature;
 
-static void opus_cpu_feature_check(CPU_Feature *cpu_feature)
+static void oac_cpu_feature_check(CPU_Feature *cpu_feature)
 {
     unsigned int info[4];
     unsigned int nIds = 0;
@@ -137,12 +137,12 @@ static void opus_cpu_feature_check(CPU_Feature *cpu_feature)
     }
 }
 
-static int opus_select_arch_impl(void)
+static int oac_select_arch_impl(void)
 {
     CPU_Feature cpu_feature;
     int arch;
 
-    opus_cpu_feature_check(&cpu_feature);
+    oac_cpu_feature_check(&cpu_feature);
 
     arch = 0;
     if (!cpu_feature.HW_SSE)
@@ -172,8 +172,8 @@ static int opus_select_arch_impl(void)
     return arch;
 }
 
-int opus_select_arch(void) {
-    int arch = opus_select_arch_impl();
+int oac_select_arch(void) {
+    int arch = oac_select_arch_impl();
 #ifdef FUZZING
     /* Randomly downgrade the architecture. */
     arch = rand()%(arch+1);
diff --git a/celt/x86/x86cpu.h b/celt/x86/x86cpu.h
index 1e5b6a4cb..29c5115da 100644
--- a/celt/x86/x86cpu.h
+++ b/celt/x86/x86cpu.h
@@ -28,40 +28,40 @@
 #if !defined(X86CPU_H)
 # define X86CPU_H
 
-# if defined(OPUS_X86_MAY_HAVE_SSE)
+# if defined(OAC_X86_MAY_HAVE_SSE)
 #  define MAY_HAVE_SSE(name) name ## _sse
 # else
 #  define MAY_HAVE_SSE(name) name ## _c
 # endif
 
-# if defined(OPUS_X86_MAY_HAVE_SSE2)
+# if defined(OAC_X86_MAY_HAVE_SSE2)
 #  define MAY_HAVE_SSE2(name) name ## _sse2
 # else
 #  define MAY_HAVE_SSE2(name) name ## _c
 # endif
 
-# if defined(OPUS_X86_MAY_HAVE_SSE4_1)
+# if defined(OAC_X86_MAY_HAVE_SSE4_1)
 #  define MAY_HAVE_SSE4_1(name) name ## _sse4_1
 # else
 #  define MAY_HAVE_SSE4_1(name) name ## _c
 # endif
 
-# if defined(OPUS_X86_MAY_HAVE_AVX2)
+# if defined(OAC_X86_MAY_HAVE_AVX2)
 #  define MAY_HAVE_AVX2(name) name ## _avx2
 # else
 #  define MAY_HAVE_AVX2(name) name ## _c
 # endif
 
-# if defined(OPUS_HAVE_RTCD) && \
-  ((defined(OPUS_X86_MAY_HAVE_SSE) && !defined(OPUS_X86_PRESUME_SSE)) || \
-  (defined(OPUS_X86_MAY_HAVE_SSE2) && !defined(OPUS_X86_PRESUME_SSE2)) || \
-  (defined(OPUS_X86_MAY_HAVE_SSE4_1) && !defined(OPUS_X86_PRESUME_SSE4_1)) || \
-  (defined(OPUS_X86_MAY_HAVE_AVX2) && !defined(OPUS_X86_PRESUME_AVX2)))
-int opus_select_arch(void);
+# if defined(OAC_HAVE_RTCD) && \
+  ((defined(OAC_X86_MAY_HAVE_SSE) && !defined(OAC_X86_PRESUME_SSE)) || \
+  (defined(OAC_X86_MAY_HAVE_SSE2) && !defined(OAC_X86_PRESUME_SSE2)) || \
+  (defined(OAC_X86_MAY_HAVE_SSE4_1) && !defined(OAC_X86_PRESUME_SSE4_1)) || \
+  (defined(OAC_X86_MAY_HAVE_AVX2) && !defined(OAC_X86_PRESUME_AVX2)))
+int oac_select_arch(void);
 # endif
 
-# if defined(OPUS_X86_MAY_HAVE_SSE2)
-#  include "opus_defines.h"
+# if defined(OAC_X86_MAY_HAVE_SSE2)
+#  include "oac_defines.h"
 
 /*MOVD should not impose any alignment restrictions, but the C standard does,
    and UBSan will report errors if we actually make unaligned accesses.
@@ -80,10 +80,10 @@ int opus_select_arch(void);
 #  if defined(__clang__)
 #   if __has_warning("-Wextra-semi-stmt") || \
  __has_builtin(__builtin_rotateleft32)
-#    define OPUS_CLANG_8 (1)
+#    define OAC_CLANG_8 (1)
 #   endif
 #  endif
-#  if !defined(_MSC_VER) && !OPUS_GNUC_PREREQ(11,3) && !defined(OPUS_CLANG_8)
+#  if !defined(_MSC_VER) && !OAC_GNUC_PREREQ(11,3) && !defined(OAC_CLANG_8)
 #   include <string.h>
 #   include <emmintrin.h>
 
diff --git a/celt_headers.mk b/celt_headers.mk
index 7a3047f90..0ee88ea4a 100644
--- a/celt_headers.mk
+++ b/celt_headers.mk
@@ -3,9 +3,9 @@ celt/arch.h \
 celt/bands.h \
 celt/celt.h \
 celt/cpu_support.h \
-include/opus_types.h \
-include/opus_defines.h \
-include/opus_custom.h \
+include/oac_types.h \
+include/oac_defines.h \
+include/oac_custom.h \
 celt/cwrs.h \
 celt/ecintrin.h \
 celt/entcode.h \
diff --git a/cmake/OpusBuildtype.cmake b/cmake/OacBuildtype.cmake
similarity index 93%
rename from cmake/OpusBuildtype.cmake
rename to cmake/OacBuildtype.cmake
index 557cc89b3..4846d84e6 100644
--- a/cmake/OpusBuildtype.cmake
+++ b/cmake/OacBuildtype.cmake
@@ -1,8 +1,8 @@
 # Set a default build type if none was specified
-if(__opus_buildtype)
+if(__oac_buildtype)
   return()
 endif()
-set(__opus_buildtype INCLUDED)
+set(__oac_buildtype INCLUDED)
 
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
   if(CMAKE_C_FLAGS)
diff --git a/cmake/OpusConfig.cmake b/cmake/OacConfig.cmake
similarity index 78%
rename from cmake/OpusConfig.cmake
rename to cmake/OacConfig.cmake
index e9319fbad..8c559fe4b 100644
--- a/cmake/OpusConfig.cmake
+++ b/cmake/OacConfig.cmake
@@ -1,9 +1,9 @@
-if(__opus_config)
+if(__oac_config)
   return()
 endif()
-set(__opus_config INCLUDED)
+set(__oac_config INCLUDED)
 
-include(OpusFunctions)
+include(OacFunctions)
 
 configure_file(cmake/config.h.cmake.in config.h @ONLY)
 add_definitions(-DHAVE_CONFIG_H)
@@ -42,7 +42,7 @@ cmake_push_check_state(RESET)
 include(CheckLibraryExists)
 check_library_exists(m floor "" HAVE_LIBM)
 if(HAVE_LIBM)
-  list(APPEND OPUS_REQUIRED_LIBRARIES m)
+  list(APPEND OAC_REQUIRED_LIBRARIES m)
   set(CMAKE_REQUIRED_LIBRARIES m)
 endif()
 
@@ -53,30 +53,30 @@ cmake_pop_check_state()
 
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "(i[0-9]86|x86|X86|amd64|AMD64|x86_64)")
   if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    set(OPUS_CPU_X64 1)
+    set(OAC_CPU_X64 1)
   else()
-    set(OPUS_CPU_X86 1)
+    set(OAC_CPU_X86 1)
   endif()
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(arm|aarch64|ARM)")
-  set(OPUS_CPU_ARM 1)
+  set(OAC_CPU_ARM 1)
 endif()
 
-if(NOT OPUS_DISABLE_INTRINSICS)
-  opus_supports_cpu_detection(RUNTIME_CPU_CAPABILITY_DETECTION)
+if(NOT OAC_DISABLE_INTRINSICS)
+  oac_supports_cpu_detection(RUNTIME_CPU_CAPABILITY_DETECTION)
 endif()
 
-if(OPUS_CPU_X86 OR OPUS_CPU_X64 AND NOT OPUS_DISABLE_INTRINSICS)
-  opus_detect_sse(COMPILER_SUPPORT_SIMD)
-elseif(OPUS_CPU_ARM AND NOT OPUS_DISABLE_INTRINSICS)
-  opus_detect_neon(COMPILER_SUPPORT_NEON)
+if(OAC_CPU_X86 OR OAC_CPU_X64 AND NOT OAC_DISABLE_INTRINSICS)
+  oac_detect_sse(COMPILER_SUPPORT_SIMD)
+elseif(OAC_CPU_ARM AND NOT OAC_DISABLE_INTRINSICS)
+  oac_detect_neon(COMPILER_SUPPORT_NEON)
   if(COMPILER_SUPPORT_NEON)
-    option(OPUS_USE_NEON "Option to enable NEON" ON)
-    option(OPUS_MAY_HAVE_NEON "Does runtime check for neon support" ON)
-    option(OPUS_PRESUME_NEON "Assume target CPU has NEON support" OFF)
+    option(OAC_USE_NEON "Option to enable NEON" ON)
+    option(OAC_MAY_HAVE_NEON "Does runtime check for neon support" ON)
+    option(OAC_PRESUME_NEON "Assume target CPU has NEON support" OFF)
     if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
-      set(OPUS_PRESUME_NEON ON)
+      set(OAC_PRESUME_NEON ON)
     elseif(CMAKE_SYSTEM_NAME MATCHES "iOS")
-      set(OPUS_PRESUME_NEON ON)
+      set(OAC_PRESUME_NEON ON)
     endif()
   endif()
 endif()
diff --git a/cmake/OacConfig.cmake.in b/cmake/OacConfig.cmake.in
new file mode 100644
index 000000000..ae49eeb21
--- /dev/null
+++ b/cmake/OacConfig.cmake.in
@@ -0,0 +1,20 @@
+set(OAC_VERSION @PROJECT_VERSION@)
+set(OAC_VERSION_STRING @PROJECT_VERSION@)
+set(OAC_VERSION_MAJOR @PROJECT_VERSION_MAJOR@)
+set(OAC_VERSION_MINOR @PROJECT_VERSION_MINOR@)
+set(OAC_VERSION_PATCH @PROJECT_VERSION_PATCH@)
+
+@PACKAGE_INIT@
+
+set_and_check(OAC_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+set(OAC_INCLUDE_DIR ${OAC_INCLUDE_DIR};${OAC_INCLUDE_DIR}/oac)
+set(OAC_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@;@PACKAGE_INCLUDE_INSTALL_DIR@/oac")
+
+include(${CMAKE_CURRENT_LIST_DIR}/OacTargets.cmake)
+
+set(OAC_LIBRARY Oac::oac)
+set(OAC_LIBRARIES Oac::oac)
+
+check_required_components(Oac)
+
+set(OAC_FOUND 1)
diff --git a/cmake/OpusFunctions.cmake b/cmake/OacFunctions.cmake
similarity index 75%
rename from cmake/OpusFunctions.cmake
rename to cmake/OacFunctions.cmake
index 2db77d7f8..4c4130f18 100644
--- a/cmake/OpusFunctions.cmake
+++ b/cmake/OacFunctions.cmake
@@ -1,44 +1,44 @@
-if(__opus_functions)
+if(__oac_functions)
   return()
 endif()
-set(__opus_functions INCLUDED)
+set(__oac_functions INCLUDED)
 
-function(get_library_version OPUS_LIBRARY_VERSION OPUS_LIBRARY_VERSION_MAJOR)
-  file(STRINGS configure.ac opus_lt_current_string
+function(get_library_version OAC_LIBRARY_VERSION OAC_LIBRARY_VERSION_MAJOR)
+  file(STRINGS configure.ac oac_lt_current_string
        LIMIT_COUNT 1
-       REGEX "OPUS_LT_CURRENT=")
+       REGEX "OAC_LT_CURRENT=")
   string(REGEX MATCH
-               "OPUS_LT_CURRENT=([0-9]*)"
+               "OAC_LT_CURRENT=([0-9]*)"
                _
-               ${opus_lt_current_string})
-  set(OPUS_LT_CURRENT ${CMAKE_MATCH_1})
+               ${oac_lt_current_string})
+  set(OAC_LT_CURRENT ${CMAKE_MATCH_1})
 
-  file(STRINGS configure.ac opus_lt_revision_string
+  file(STRINGS configure.ac oac_lt_revision_string
        LIMIT_COUNT 1
-       REGEX "OPUS_LT_REVISION=")
+       REGEX "OAC_LT_REVISION=")
   string(REGEX MATCH
-               "OPUS_LT_REVISION=([0-9]*)"
+               "OAC_LT_REVISION=([0-9]*)"
                _
-               ${opus_lt_revision_string})
-  set(OPUS_LT_REVISION ${CMAKE_MATCH_1})
+               ${oac_lt_revision_string})
+  set(OAC_LT_REVISION ${CMAKE_MATCH_1})
 
-  file(STRINGS configure.ac opus_lt_age_string
+  file(STRINGS configure.ac oac_lt_age_string
        LIMIT_COUNT 1
-       REGEX "OPUS_LT_AGE=")
+       REGEX "OAC_LT_AGE=")
   string(REGEX MATCH
-               "OPUS_LT_AGE=([0-9]*)"
+               "OAC_LT_AGE=([0-9]*)"
                _
-               ${opus_lt_age_string})
-  set(OPUS_LT_AGE ${CMAKE_MATCH_1})
+               ${oac_lt_age_string})
+  set(OAC_LT_AGE ${CMAKE_MATCH_1})
 
-  math(EXPR OPUS_LIBRARY_VERSION_MAJOR "${OPUS_LT_CURRENT} - ${OPUS_LT_AGE}")
-  set(OPUS_LIBRARY_VERSION_MINOR ${OPUS_LT_AGE})
-  set(OPUS_LIBRARY_VERSION_PATCH ${OPUS_LT_REVISION})
+  math(EXPR OAC_LIBRARY_VERSION_MAJOR "${OAC_LT_CURRENT} - ${OAC_LT_AGE}")
+  set(OAC_LIBRARY_VERSION_MINOR ${OAC_LT_AGE})
+  set(OAC_LIBRARY_VERSION_PATCH ${OAC_LT_REVISION})
   set(
-    OPUS_LIBRARY_VERSION
-    "${OPUS_LIBRARY_VERSION_MAJOR}.${OPUS_LIBRARY_VERSION_MINOR}.${OPUS_LIBRARY_VERSION_PATCH}"
+    OAC_LIBRARY_VERSION
+    "${OAC_LIBRARY_VERSION_MAJOR}.${OAC_LIBRARY_VERSION_MINOR}.${OAC_LIBRARY_VERSION_PATCH}"
     PARENT_SCOPE)
-  set(OPUS_LIBRARY_VERSION_MAJOR ${OPUS_LIBRARY_VERSION_MAJOR} PARENT_SCOPE)
+  set(OAC_LIBRARY_VERSION_MAJOR ${OAC_LIBRARY_VERSION_MAJOR} PARENT_SCOPE)
 endfunction()
 
 function(check_flag NAME FLAG)
@@ -50,10 +50,10 @@ include(CheckIncludeFile)
 
 # This function determines if the compiler has support for SSE, SSE2, SSE4.1, AVX,
 # AVX2 and FMA. Should the target systems potentially lack SSE support, the
-# OPUS_MAY_HAVE_SSE option is recommended for use. If, however, the target system is
-# assured to support SSE, the OPUS_PRESUME_SSE option can be employed, thus
+# OAC_MAY_HAVE_SSE option is recommended for use. If, however, the target system is
+# assured to support SSE, the OAC_PRESUME_SSE option can be employed, thus
 # eliminating the necessity for an SSE runtime check.
-function(opus_detect_sse COMPILER_SUPPORT_SIMD)
+function(oac_detect_sse COMPILER_SUPPORT_SIMD)
   message(STATUS "Check SIMD support by compiler")
   check_include_file(xmmintrin.h HAVE_XMMINTRIN_H) # SSE1
   if(HAVE_XMMINTRIN_H)
@@ -133,7 +133,7 @@ function(opus_detect_sse COMPILER_SUPPORT_SIMD)
   endif()
 endfunction()
 
-function(opus_detect_neon COMPILER_SUPPORT_NEON)
+function(oac_detect_neon COMPILER_SUPPORT_NEON)
   if(CMAKE_SYSTEM_PROCESSOR MATCHES "(arm|aarch64|ARM)")
     message(STATUS "Check NEON support by compiler")
     check_include_file(arm_neon.h HAVE_ARM_NEON_H)
@@ -143,9 +143,9 @@ function(opus_detect_neon COMPILER_SUPPORT_NEON)
   endif()
 endfunction()
 
-function(opus_supports_cpu_detection RUNTIME_CPU_CAPABILITY_DETECTION)
+function(oac_supports_cpu_detection RUNTIME_CPU_CAPABILITY_DETECTION)
   set(RUNTIME_CPU_CAPABILITY_DETECTION 0 PARENT_SCOPE)
-  if(OPUS_CPU_X86 OR OPUS_CPU_X64)
+  if(OAC_CPU_X86 OR OAC_CPU_X64)
     if(MSVC)
       check_include_file(intrin.h HAVE_INTRIN_H)
       if(HAVE_INTRIN_H)
@@ -165,7 +165,7 @@ function(opus_supports_cpu_detection RUNTIME_CPU_CAPABILITY_DETECTION)
         set(RUNTIME_CPU_CAPABILITY_DETECTION 1 PARENT_SCOPE)
       endif()
     endif()
-  elseif(OPUS_CPU_ARM)
+  elseif(OAC_CPU_ARM)
     # ARM cpu detection is implemented for Windows, Linux, Android, FreeBSD
     # and OpenBSD.
     if (CMAKE_SYSTEM_NAME MATCHES "(Windows|Linux|Android|FreeBSD|OpenBSD)")
@@ -181,15 +181,15 @@ function(add_sources_group target group)
   source_group(${group} FILES ${ARGN})
 endfunction()
 
-function(get_opus_sources SOURCE_GROUP MAKE_FILE SOURCES)
+function(get_oac_sources SOURCE_GROUP MAKE_FILE SOURCES)
   # read file, each item in list is one group
-  file(STRINGS ${MAKE_FILE} opus_sources)
+  file(STRINGS ${MAKE_FILE} oac_sources)
 
   # add wildcard for regex match
   string(CONCAT SOURCE_GROUP ${SOURCE_GROUP} ".*$")
 
   # find group
-  foreach(val IN LISTS opus_sources)
+  foreach(val IN LISTS oac_sources)
     if(val MATCHES ${SOURCE_GROUP})
       list(LENGTH val list_length)
       if(${list_length} EQUAL 1)
diff --git a/cmake/OacPackageVersion.cmake b/cmake/OacPackageVersion.cmake
new file mode 100644
index 000000000..70a79a6f7
--- /dev/null
+++ b/cmake/OacPackageVersion.cmake
@@ -0,0 +1,70 @@
+if(__oac_version)
+  return()
+endif()
+set(__oac_version INCLUDED)
+
+function(get_package_version PACKAGE_VERSION PROJECT_VERSION)
+
+  find_package(Git)
+  if(GIT_FOUND AND EXISTS "${CMAKE_CURRENT_LIST_DIR}/.git")
+    execute_process(COMMAND ${GIT_EXECUTABLE}
+                    --git-dir=${CMAKE_CURRENT_LIST_DIR}/.git describe
+                    --tags --match "v*" OUTPUT_VARIABLE OAC_PACKAGE_VERSION)
+    if(OAC_PACKAGE_VERSION)
+      string(STRIP ${OAC_PACKAGE_VERSION}, OAC_PACKAGE_VERSION)
+      string(REPLACE \n
+                     ""
+                     OAC_PACKAGE_VERSION
+                     ${OAC_PACKAGE_VERSION})
+      string(REPLACE ,
+                     ""
+                     OAC_PACKAGE_VERSION
+                     ${OAC_PACKAGE_VERSION})
+
+      string(SUBSTRING ${OAC_PACKAGE_VERSION}
+                       1
+                       -1
+                       OAC_PACKAGE_VERSION)
+      message(STATUS "Oac package version from git repo: ${OAC_PACKAGE_VERSION}")
+    endif()
+
+  elseif(EXISTS "${CMAKE_CURRENT_LIST_DIR}/package_version"
+         AND NOT OAC_PACKAGE_VERSION)
+    # Not a git repo, lets' try to parse it from package_version file if exists
+    file(STRINGS package_version OAC_PACKAGE_VERSION
+         LIMIT_COUNT 1
+         REGEX "PACKAGE_VERSION=")
+    string(REPLACE "PACKAGE_VERSION="
+                   ""
+                   OAC_PACKAGE_VERSION
+                   ${OAC_PACKAGE_VERSION})
+    string(REPLACE "\""
+                   ""
+                   OAC_PACKAGE_VERSION
+                   ${OAC_PACKAGE_VERSION})
+    # In case we have a unknown dist here we just replace it with 0
+    string(REPLACE "unknown"
+                   "0"
+                   OAC_PACKAGE_VERSION
+                   ${OAC_PACKAGE_VERSION})
+      message(STATUS "Oac package version from package_version file: ${OAC_PACKAGE_VERSION}")
+  endif()
+
+  if(OAC_PACKAGE_VERSION)
+    string(REGEX
+      REPLACE "^([0-9]+.[0-9]+\\.?([0-9]+)?).*"
+               "\\1"
+               OAC_PROJECT_VERSION
+               ${OAC_PACKAGE_VERSION})
+  else()
+    # fail to parse version from git and package version
+    message(WARNING "Could not get package version.")
+    set(OAC_PACKAGE_VERSION 0)
+    set(OAC_PROJECT_VERSION 0)
+  endif()
+
+  message(STATUS "Oac project version: ${OAC_PROJECT_VERSION}")
+
+  set(PACKAGE_VERSION ${OAC_PACKAGE_VERSION} PARENT_SCOPE)
+  set(PROJECT_VERSION ${OAC_PROJECT_VERSION} PARENT_SCOPE)
+endfunction()
diff --git a/cmake/OacSources.cmake b/cmake/OacSources.cmake
new file mode 100644
index 000000000..25b2bafa2
--- /dev/null
+++ b/cmake/OacSources.cmake
@@ -0,0 +1,72 @@
+if(__oac_sources)
+  return()
+endif()
+set(__oac_sources INCLUDED)
+
+include(OacFunctions)
+
+get_oac_sources(SILK_HEAD silk_headers.mk silk_headers)
+get_oac_sources(SILK_SOURCES silk_sources.mk silk_sources)
+get_oac_sources(SILK_SOURCES_FLOAT silk_sources.mk silk_sources_float)
+get_oac_sources(SILK_SOURCES_FIXED silk_sources.mk silk_sources_fixed)
+get_oac_sources(SILK_SOURCES_X86_RTCD silk_sources.mk silk_sources_x86_rtcd)
+get_oac_sources(SILK_SOURCES_SSE4_1 silk_sources.mk silk_sources_sse4_1)
+get_oac_sources(SILK_SOURCES_FIXED_SSE4_1 silk_sources.mk
+                 silk_sources_fixed_sse4_1)
+get_oac_sources(SILK_SOURCES_AVX2 silk_sources.mk silk_sources_avx2)
+get_oac_sources(SILK_SOURCES_FLOAT_AVX2 silk_sources.mk silk_sources_float_avx2)
+get_oac_sources(SILK_SOURCES_ARM_RTCD silk_sources.mk silk_sources_arm_rtcd)
+get_oac_sources(SILK_SOURCES_ARM_NEON_INTR silk_sources.mk
+                 silk_sources_arm_neon_intr)
+get_oac_sources(SILK_SOURCES_FIXED_ARM_NEON_INTR silk_sources.mk
+                 silk_sources_fixed_arm_neon_intr)
+
+get_oac_sources(OAC_HEAD oac_headers.mk oac_headers)
+get_oac_sources(OAC_SOURCES oac_sources.mk oac_sources)
+get_oac_sources(OAC_SOURCES_FLOAT oac_sources.mk oac_sources_float)
+
+get_oac_sources(CELT_HEAD celt_headers.mk celt_headers)
+get_oac_sources(CELT_SOURCES celt_sources.mk celt_sources)
+get_oac_sources(CELT_SOURCES_X86_RTCD celt_sources.mk celt_sources_x86_rtcd)
+get_oac_sources(CELT_SOURCES_SSE celt_sources.mk celt_sources_sse)
+get_oac_sources(CELT_SOURCES_SSE2 celt_sources.mk celt_sources_sse2)
+get_oac_sources(CELT_SOURCES_SSE4_1 celt_sources.mk celt_sources_sse4_1)
+get_oac_sources(CELT_SOURCES_AVX2 celt_sources.mk celt_sources_avx2)
+get_oac_sources(CELT_SOURCES_ARM_RTCD celt_sources.mk celt_sources_arm_rtcd)
+get_oac_sources(CELT_SOURCES_ARM_ASM celt_sources.mk celt_sources_arm_asm)
+get_oac_sources(CELT_AM_SOURCES_ARM_ASM celt_sources.mk
+                 celt_am_sources_arm_asm)
+get_oac_sources(CELT_SOURCES_ARM_NEON_INTR celt_sources.mk
+                 celt_sources_arm_neon_intr)
+get_oac_sources(CELT_SOURCES_ARM_NE10 celt_sources.mk celt_sources_arm_ne10)
+
+get_oac_sources(DEEP_PLC_HEAD lpcnet_headers.mk deep_plc_headers)
+get_oac_sources(DRED_HEAD lpcnet_headers.mk dred_headers)
+get_oac_sources(OSCE_HEAD lpcnet_headers.mk osce_headers)
+get_oac_sources(DEEP_PLC_SOURCES lpcnet_sources.mk deep_plc_sources)
+get_oac_sources(DRED_SOURCES lpcnet_sources.mk dred_sources)
+get_oac_sources(OSCE_SOURCES lpcnet_sources.mk osce_sources)
+get_oac_sources(DNN_SOURCES_X86_RTCD lpcnet_sources.mk dnn_sources_x86_rtcd)
+get_oac_sources(DNN_SOURCES_SSE2 lpcnet_sources.mk dnn_sources_sse2)
+get_oac_sources(DNN_SOURCES_SSE4_1 lpcnet_sources.mk dnn_sources_sse4_1)
+get_oac_sources(DNN_SOURCES_AVX2 lpcnet_sources.mk dnn_sources_avx2)
+get_oac_sources(DNN_SOURCES_NEON lpcnet_sources.mk dnn_sources_arm_neon)
+get_oac_sources(DNN_SOURCES_DOTPROD lpcnet_sources.mk dnn_sources_arm_dotprod)
+get_oac_sources(DNN_SOURCES_ARM_RTCD lpcnet_sources.mk dnn_sources_arm_rtcd)
+
+get_oac_sources(oac_demo_SOURCES Makefile.am oac_demo_sources)
+get_oac_sources(oac_custom_demo_SOURCES Makefile.am oac_custom_demo_sources)
+get_oac_sources(oac_compare_SOURCES Makefile.am oac_compare_sources)
+get_oac_sources(tests_test_oac_api_SOURCES Makefile.am test_oac_api_sources)
+get_oac_sources(tests_test_oac_encode_SOURCES Makefile.am
+                 test_oac_encode_sources)
+get_oac_sources(tests_test_oac_extensions_SOURCES Makefile.am
+                 test_oac_extensions_sources)
+get_oac_sources(tests_test_oac_decode_SOURCES Makefile.am
+                 test_oac_decode_sources)
+get_oac_sources(tests_test_oac_padding_SOURCES Makefile.am
+                 test_oac_padding_sources)
+get_oac_sources(tests_test_oac_dred_SOURCES Makefile.am
+                 test_oac_dred_sources)
+get_oac_sources(tests_test_oac_custom_SOURCES Makefile.am
+                 test_oac_custom_sources)
diff --git a/cmake/OpusConfig.cmake.in b/cmake/OpusConfig.cmake.in
deleted file mode 100644
index 0b21231d4..000000000
--- a/cmake/OpusConfig.cmake.in
+++ /dev/null
@@ -1,20 +0,0 @@
-set(OPUS_VERSION @PROJECT_VERSION@)
-set(OPUS_VERSION_STRING @PROJECT_VERSION@)
-set(OPUS_VERSION_MAJOR @PROJECT_VERSION_MAJOR@)
-set(OPUS_VERSION_MINOR @PROJECT_VERSION_MINOR@)
-set(OPUS_VERSION_PATCH @PROJECT_VERSION_PATCH@)
-
-@PACKAGE_INIT@
-
-set_and_check(OPUS_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
-set(OPUS_INCLUDE_DIR ${OPUS_INCLUDE_DIR};${OPUS_INCLUDE_DIR}/opus)
-set(OPUS_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@;@PACKAGE_INCLUDE_INSTALL_DIR@/opus")
-
-include(${CMAKE_CURRENT_LIST_DIR}/OpusTargets.cmake)
-
-set(OPUS_LIBRARY Opus::opus)
-set(OPUS_LIBRARIES Opus::opus)
-
-check_required_components(Opus)
-
-set(OPUS_FOUND 1)
diff --git a/cmake/OpusPackageVersion.cmake b/cmake/OpusPackageVersion.cmake
deleted file mode 100644
index 447ce3b17..000000000
--- a/cmake/OpusPackageVersion.cmake
+++ /dev/null
@@ -1,70 +0,0 @@
-if(__opus_version)
-  return()
-endif()
-set(__opus_version INCLUDED)
-
-function(get_package_version PACKAGE_VERSION PROJECT_VERSION)
-
-  find_package(Git)
-  if(GIT_FOUND AND EXISTS "${CMAKE_CURRENT_LIST_DIR}/.git")
-    execute_process(COMMAND ${GIT_EXECUTABLE}
-                    --git-dir=${CMAKE_CURRENT_LIST_DIR}/.git describe
-                    --tags --match "v*" OUTPUT_VARIABLE OPUS_PACKAGE_VERSION)
-    if(OPUS_PACKAGE_VERSION)
-      string(STRIP ${OPUS_PACKAGE_VERSION}, OPUS_PACKAGE_VERSION)
-      string(REPLACE \n
-                     ""
-                     OPUS_PACKAGE_VERSION
-                     ${OPUS_PACKAGE_VERSION})
-      string(REPLACE ,
-                     ""
-                     OPUS_PACKAGE_VERSION
-                     ${OPUS_PACKAGE_VERSION})
-
-      string(SUBSTRING ${OPUS_PACKAGE_VERSION}
-                       1
-                       -1
-                       OPUS_PACKAGE_VERSION)
-      message(STATUS "Opus package version from git repo: ${OPUS_PACKAGE_VERSION}")
-    endif()
-
-  elseif(EXISTS "${CMAKE_CURRENT_LIST_DIR}/package_version"
-         AND NOT OPUS_PACKAGE_VERSION)
-    # Not a git repo, lets' try to parse it from package_version file if exists
-    file(STRINGS package_version OPUS_PACKAGE_VERSION
-         LIMIT_COUNT 1
-         REGEX "PACKAGE_VERSION=")
-    string(REPLACE "PACKAGE_VERSION="
-                   ""
-                   OPUS_PACKAGE_VERSION
-                   ${OPUS_PACKAGE_VERSION})
-    string(REPLACE "\""
-                   ""
-                   OPUS_PACKAGE_VERSION
-                   ${OPUS_PACKAGE_VERSION})
-    # In case we have a unknown dist here we just replace it with 0
-    string(REPLACE "unknown"
-                   "0"
-                   OPUS_PACKAGE_VERSION
-                   ${OPUS_PACKAGE_VERSION})
-      message(STATUS "Opus package version from package_version file: ${OPUS_PACKAGE_VERSION}")
-  endif()
-
-  if(OPUS_PACKAGE_VERSION)
-    string(REGEX
-      REPLACE "^([0-9]+.[0-9]+\\.?([0-9]+)?).*"
-               "\\1"
-               OPUS_PROJECT_VERSION
-               ${OPUS_PACKAGE_VERSION})
-  else()
-    # fail to parse version from git and package version
-    message(WARNING "Could not get package version.")
-    set(OPUS_PACKAGE_VERSION 0)
-    set(OPUS_PROJECT_VERSION 0)
-  endif()
-
-  message(STATUS "Opus project version: ${OPUS_PROJECT_VERSION}")
-
-  set(PACKAGE_VERSION ${OPUS_PACKAGE_VERSION} PARENT_SCOPE)
-  set(PROJECT_VERSION ${OPUS_PROJECT_VERSION} PARENT_SCOPE)
-endfunction()
diff --git a/cmake/OpusSources.cmake b/cmake/OpusSources.cmake
deleted file mode 100644
index 06cb0d4fa..000000000
--- a/cmake/OpusSources.cmake
+++ /dev/null
@@ -1,72 +0,0 @@
-if(__opus_sources)
-  return()
-endif()
-set(__opus_sources INCLUDED)
-
-include(OpusFunctions)
-
-get_opus_sources(SILK_HEAD silk_headers.mk silk_headers)
-get_opus_sources(SILK_SOURCES silk_sources.mk silk_sources)
-get_opus_sources(SILK_SOURCES_FLOAT silk_sources.mk silk_sources_float)
-get_opus_sources(SILK_SOURCES_FIXED silk_sources.mk silk_sources_fixed)
-get_opus_sources(SILK_SOURCES_X86_RTCD silk_sources.mk silk_sources_x86_rtcd)
-get_opus_sources(SILK_SOURCES_SSE4_1 silk_sources.mk silk_sources_sse4_1)
-get_opus_sources(SILK_SOURCES_FIXED_SSE4_1 silk_sources.mk
-                 silk_sources_fixed_sse4_1)
-get_opus_sources(SILK_SOURCES_AVX2 silk_sources.mk silk_sources_avx2)
-get_opus_sources(SILK_SOURCES_FLOAT_AVX2 silk_sources.mk silk_sources_float_avx2)
-get_opus_sources(SILK_SOURCES_ARM_RTCD silk_sources.mk silk_sources_arm_rtcd)
-get_opus_sources(SILK_SOURCES_ARM_NEON_INTR silk_sources.mk
-                 silk_sources_arm_neon_intr)
-get_opus_sources(SILK_SOURCES_FIXED_ARM_NEON_INTR silk_sources.mk
-                 silk_sources_fixed_arm_neon_intr)
-
-get_opus_sources(OPUS_HEAD opus_headers.mk opus_headers)
-get_opus_sources(OPUS_SOURCES opus_sources.mk opus_sources)
-get_opus_sources(OPUS_SOURCES_FLOAT opus_sources.mk opus_sources_float)
-
-get_opus_sources(CELT_HEAD celt_headers.mk celt_headers)
-get_opus_sources(CELT_SOURCES celt_sources.mk celt_sources)
-get_opus_sources(CELT_SOURCES_X86_RTCD celt_sources.mk celt_sources_x86_rtcd)
-get_opus_sources(CELT_SOURCES_SSE celt_sources.mk celt_sources_sse)
-get_opus_sources(CELT_SOURCES_SSE2 celt_sources.mk celt_sources_sse2)
-get_opus_sources(CELT_SOURCES_SSE4_1 celt_sources.mk celt_sources_sse4_1)
-get_opus_sources(CELT_SOURCES_AVX2 celt_sources.mk celt_sources_avx2)
-get_opus_sources(CELT_SOURCES_ARM_RTCD celt_sources.mk celt_sources_arm_rtcd)
-get_opus_sources(CELT_SOURCES_ARM_ASM celt_sources.mk celt_sources_arm_asm)
-get_opus_sources(CELT_AM_SOURCES_ARM_ASM celt_sources.mk
-                 celt_am_sources_arm_asm)
-get_opus_sources(CELT_SOURCES_ARM_NEON_INTR celt_sources.mk
-                 celt_sources_arm_neon_intr)
-get_opus_sources(CELT_SOURCES_ARM_NE10 celt_sources.mk celt_sources_arm_ne10)
-
-get_opus_sources(DEEP_PLC_HEAD lpcnet_headers.mk deep_plc_headers)
-get_opus_sources(DRED_HEAD lpcnet_headers.mk dred_headers)
-get_opus_sources(OSCE_HEAD lpcnet_headers.mk osce_headers)
-get_opus_sources(DEEP_PLC_SOURCES lpcnet_sources.mk deep_plc_sources)
-get_opus_sources(DRED_SOURCES lpcnet_sources.mk dred_sources)
-get_opus_sources(OSCE_SOURCES lpcnet_sources.mk osce_sources)
-get_opus_sources(DNN_SOURCES_X86_RTCD lpcnet_sources.mk dnn_sources_x86_rtcd)
-get_opus_sources(DNN_SOURCES_SSE2 lpcnet_sources.mk dnn_sources_sse2)
-get_opus_sources(DNN_SOURCES_SSE4_1 lpcnet_sources.mk dnn_sources_sse4_1)
-get_opus_sources(DNN_SOURCES_AVX2 lpcnet_sources.mk dnn_sources_avx2)
-get_opus_sources(DNN_SOURCES_NEON lpcnet_sources.mk dnn_sources_arm_neon)
-get_opus_sources(DNN_SOURCES_DOTPROD lpcnet_sources.mk dnn_sources_arm_dotprod)
-get_opus_sources(DNN_SOURCES_ARM_RTCD lpcnet_sources.mk dnn_sources_arm_rtcd)
-
-get_opus_sources(opus_demo_SOURCES Makefile.am opus_demo_sources)
-get_opus_sources(opus_custom_demo_SOURCES Makefile.am opus_custom_demo_sources)
-get_opus_sources(opus_compare_SOURCES Makefile.am opus_compare_sources)
-get_opus_sources(tests_test_opus_api_SOURCES Makefile.am test_opus_api_sources)
-get_opus_sources(tests_test_opus_encode_SOURCES Makefile.am
-                 test_opus_encode_sources)
-get_opus_sources(tests_test_opus_extensions_SOURCES Makefile.am
-                 test_opus_extensions_sources)
-get_opus_sources(tests_test_opus_decode_SOURCES Makefile.am
-                 test_opus_decode_sources)
-get_opus_sources(tests_test_opus_padding_SOURCES Makefile.am
-                 test_opus_padding_sources)
-get_opus_sources(tests_test_opus_dred_SOURCES Makefile.am
-                 test_opus_dred_sources)
-get_opus_sources(tests_test_opus_custom_SOURCES Makefile.am
-                 test_opus_custom_sources)
diff --git a/cmake/README.md b/cmake/README.md
index d8e4978f6..1deac73d1 100644
--- a/cmake/README.md
+++ b/cmake/README.md
@@ -1,6 +1,6 @@
-# Using CMake for the Opus Project
+# Using CMake for the Oac Project
 
-This guide provides instructions for using CMake to build the Opus project with various configuration options. CMake is a widely used build system generator that helps manage the build process across different platforms.
+This guide provides instructions for using CMake to build the Oac project with various configuration options. CMake is a widely used build system generator that helps manage the build process across different platforms.
 
 Note: Please keep in mind that software documentation can sometimes go out of date as new versions are released. It is always recommended to refer to the official CMake documentation for the most up-to-date and accurate information. You can find the official CMake documentation at [cmake.org/documentation](https://cmake.org/documentation/).
 
@@ -14,48 +14,48 @@ Before proceeding, make sure you have the following prerequisites installed:
 
 ## Build Instructions
 
-Follow the steps below to build the Opus project using CMake:
+Follow the steps below to build the Oac project using CMake:
 
-1. Clone the Opus repository using Git:
+1. Clone the Oac repository using Git:
 
     ```shell
-    git clone https://gitlab.xiph.org/xiph/opus
+    git clone https://gitlab.xiph.org/xiph/oac
     ```
 
-2. Create a build directory within the Opus repository:
+2. Create a build directory within the Oac repository:
 
     ```shell
-    cd opus
+    cd oac
     mkdir build
     cd build
     ```
 
 3. Configure the build with CMake. You can set the desired configuration options using CMake's `-D` flag. Here are some available options:
 
-   - `OPUS_BUILD_SHARED_LIBRARY`: build shared library.
-   - `OPUS_BUILD_TESTING`: build tests.
-   - `OPUS_BUILD_PROGRAMS`: build programs.
-   - `OPUS_CUSTOM_MODES`, enable non-Opus modes, e.g. 44.1 kHz & 2^n frames.
+   - `OAC_BUILD_SHARED_LIBRARY`: build shared library.
+   - `OAC_BUILD_TESTING`: build tests.
+   - `OAC_BUILD_PROGRAMS`: build programs.
+   - `OAC_CUSTOM_MODES`, enable non-Oac modes, e.g. 44.1 kHz & 2^n frames.
 
    For example, to enable the custom modes and build programs, use the following command:
 
     ```shell
-    cmake .. -DOPUS_BUILD_PROGRAMS=ON -DOPUS_BUILD_TESTING=ON
+    cmake .. -DOAC_BUILD_PROGRAMS=ON -DOAC_BUILD_TESTING=ON
     ```
 
-4. Build the Opus project:
+4. Build the Oac project:
 
     ```shell
     cmake --build .
     ```
 
-5. After a successful build, you can find the compiled Opus library and associated files in the build directory.
+5. After a successful build, you can find the compiled Oac library and associated files in the build directory.
 
 ## Testing with CTest
 
-Opus provides a comprehensive test suite to ensure the functionality and correctness of the project. You can execute the tests using CTest, a part of the CMake build system. CTest allows for automated testing and provides useful features for managing and evaluating the test results.
+Oac provides a comprehensive test suite to ensure the functionality and correctness of the project. You can execute the tests using CTest, a part of the CMake build system. CTest allows for automated testing and provides useful features for managing and evaluating the test results.
 
-To run the Opus tests using CTest, follow these steps:
+To run the Oac tests using CTest, follow these steps:
 
 1. Navigate to the build directory after configuring and building the project with CMake:
 
@@ -77,7 +77,7 @@ ctest -C Debug
 
 ## Platform Support and Bug Reporting
 
-CMake aims to provide broad platform support, allowing the Opus project to be built and used on major operating systems and platforms. The supported platforms include:
+CMake aims to provide broad platform support, allowing the Oac project to be built and used on major operating systems and platforms. The supported platforms include:
 
 - Windows
 - macOS
@@ -85,9 +85,9 @@ CMake aims to provide broad platform support, allowing the Opus project to be bu
 - Android
 - iOS
 
-CMake achieves platform support by generating platform-specific build files (e.g., Makefiles, Visual Studio projects) based on the target platform. This allows developers to build and configure the Opus project consistently across different operating systems and environments.
+CMake achieves platform support by generating platform-specific build files (e.g., Makefiles, Visual Studio projects) based on the target platform. This allows developers to build and configure the Oac project consistently across different operating systems and environments.
 
-While CMake strives to ensure compatibility and stability across platforms, bugs or issues may still arise in specific configurations. If you encounter any problems during the configuration process or while building the Opus project, we encourage you to file an issue in the [project's issue tracker](https://gitlab.xiph.org/xiph/opus/-/issues).
+While CMake strives to ensure compatibility and stability across platforms, bugs or issues may still arise in specific configurations. If you encounter any problems during the configuration process or while building the Oac project, we encourage you to file an issue in the [project's issue tracker](https://gitlab.xiph.org/xiph/oac/-/issues).
 
 When reporting an issue, please provide the following information to help us understand and reproduce the configuration problem effectively:
 
@@ -98,9 +98,9 @@ When reporting an issue, please provide the following information to help us und
 5. Any relevant information about the platform, toolchain, or dependencies used.
 6. Additional context or details that might assist in troubleshooting the issue.
 
-By providing thorough information when reporting configuration issues, you contribute to improving the Opus project's compatibility and reliability across different platforms.
+By providing thorough information when reporting configuration issues, you contribute to improving the Oac project's compatibility and reliability across different platforms.
 
-We appreciate your help in identifying and addressing any configuration-related problems, ensuring a better experience for all users of the Opus project.
+We appreciate your help in identifying and addressing any configuration-related problems, ensuring a better experience for all users of the Oac project.
 
 ## Platform Specific Examples
 
diff --git a/configure.ac b/configure.ac
index e8c05e122..6d5250c85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,9 +12,9 @@ m4_define([CURRENT_VERSION],
                            printf "unknown"
                        fi ]))
 
-AC_INIT([opus],[CURRENT_VERSION],[opus@xiph.org])
+AC_INIT([oac],[CURRENT_VERSION],[oac@xiph.org])
 
-AC_CONFIG_SRCDIR(src/opus_encoder.c)
+AC_CONFIG_SRCDIR(src/oac_encoder.c)
 AC_CONFIG_MACRO_DIR([m4])
 
 dnl enable silent rules on automake 1.11 and later
@@ -22,13 +22,13 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 # For libtool.
 dnl Please update these for releases.
-OPUS_LT_CURRENT=11
-OPUS_LT_REVISION=1
-OPUS_LT_AGE=11
+OAC_LT_CURRENT=11
+OAC_LT_REVISION=1
+OAC_LT_AGE=11
 
-AC_SUBST(OPUS_LT_CURRENT)
-AC_SUBST(OPUS_LT_REVISION)
-AC_SUBST(OPUS_LT_AGE)
+AC_SUBST(OAC_LT_CURRENT)
+AC_SUBST(OAC_LT_REVISION)
+AC_SUBST(OAC_LT_AGE)
 
 AM_INIT_AUTOMAKE([no-define])
 AM_MAINTAINER_MODE([enable])
@@ -42,7 +42,7 @@ AC_C_INLINE
 
 AM_PROG_AS
 
-AC_DEFINE([OPUS_BUILD], [], [This is a build of OPUS])
+AC_DEFINE([OAC_BUILD], [], [This is a build of OAC])
 
 #Use a hacked up version of autoconf's AC_C_RESTRICT because it's not
 #strong enough a test to detect old buggy versions of GCC (e.g. 2.95.3)
@@ -157,7 +157,7 @@ AS_IF([test "$enable_qext" = "yes"],[
 AM_CONDITIONAL([ENABLE_QEXT], [test "$enable_qext" = "yes"])
 
 AC_ARG_ENABLE([custom-modes],
-    [AS_HELP_STRING([--enable-custom-modes], [enable non-Opus modes, e.g. 44.1 kHz & 2^n frames])],,
+    [AS_HELP_STRING([--enable-custom-modes], [enable non-Oac modes, e.g. 44.1 kHz & 2^n frames])],,
     [enable_custom_modes=no])
 
 AS_IF([test "$enable_custom_modes" = "yes"],[
@@ -165,16 +165,16 @@ AS_IF([test "$enable_custom_modes" = "yes"],[
   PC_BUILD="$PC_BUILD, custom modes"
 ])
 
-AC_ARG_ENABLE([opus-custom-api],
-    [AS_HELP_STRING([--enable-opus-custom-api], [enable Opus custom API])],,
-    [enable_opus_custom_api=no])
+AC_ARG_ENABLE([oac-custom-api],
+    [AS_HELP_STRING([--enable-oac-custom-api], [enable Oac custom API])],,
+    [enable_oac_custom_api=no])
 
-AS_IF([test "$enable_opus_custom_api" = "yes"],[
-  AC_DEFINE([ENABLE_OPUS_CUSTOM_API], [1], [Opus custom API])
-  PC_BUILD="$PC_BUILD, Opus custom API"
+AS_IF([test "$enable_oac_custom_api" = "yes"],[
+  AC_DEFINE([ENABLE_OAC_CUSTOM_API], [1], [Oac custom API])
+  PC_BUILD="$PC_BUILD, Oac custom API"
 ])
 
-AM_CONDITIONAL([CUSTOM_MODES], [test "$enable_custom_modes" = "yes" || test "$enable_opus_custom_api" = "yes"])
+AM_CONDITIONAL([CUSTOM_MODES], [test "$enable_custom_modes" = "yes" || test "$enable_oac_custom_api" = "yes"])
 
 AC_ARG_ENABLE([dred],
     [AS_HELP_STRING([--enable-dred], [use Deep REDundancy (DRED)])],,
@@ -195,7 +195,7 @@ AS_IF([test "$enable_deep_plc" = "yes" || test "$enable_dred" = "yes" || test "$
 AM_CONDITIONAL([ENABLE_DEEP_PLC], [test "$enable_deep_plc" = "yes" || test "$enable_dred" = "yes" || test "$enable_osce" = "yes" || test "$enable_osce_training_data" = "yes"])
 
 AC_ARG_ENABLE([lossgen],
-    [AS_HELP_STRING([--enable-lossgen], [build opus_demo with packet loss simulator])],,
+    [AS_HELP_STRING([--enable-lossgen], [build oac_demo with packet loss simulator])],,
     [enable_lossgen=no])
 
 AS_IF([test "$enable_lossgen" = "yes"],[
@@ -245,31 +245,31 @@ AS_IF([test x"${enable_asm}" = x"yes"],[
         dnl Currently we only have asm for fixed-point
         #AS_IF([test "$enable_float" != "yes"],[
             cpu_arm=yes
-            AC_DEFINE([OPUS_ARM_ASM], [],  [Make use of ARM asm optimization])
+            AC_DEFINE([OAC_ARM_ASM], [],  [Make use of ARM asm optimization])
             AS_GCC_INLINE_ASSEMBLY(
                 [inline_optimization="ARM"],
                 [inline_optimization="disabled"]
             )
-            AS_ASM_ARM_EDSP([OPUS_ARM_INLINE_EDSP=1],[OPUS_ARM_INLINE_EDSP=0])
-            AS_ASM_ARM_MEDIA([OPUS_ARM_INLINE_MEDIA=1],
-                [OPUS_ARM_INLINE_MEDIA=0])
-            AS_ASM_ARM_NEON([OPUS_ARM_INLINE_NEON=1],[OPUS_ARM_INLINE_NEON=0])
+            AS_ASM_ARM_EDSP([OAC_ARM_INLINE_EDSP=1],[OAC_ARM_INLINE_EDSP=0])
+            AS_ASM_ARM_MEDIA([OAC_ARM_INLINE_MEDIA=1],
+                [OAC_ARM_INLINE_MEDIA=0])
+            AS_ASM_ARM_NEON([OAC_ARM_INLINE_NEON=1],[OAC_ARM_INLINE_NEON=0])
             AS_IF([test x"$inline_optimization" = x"ARM"],[
-                AM_CONDITIONAL([OPUS_ARM_INLINE_ASM],[true])
-                AC_DEFINE([OPUS_ARM_INLINE_ASM], 1,
+                AM_CONDITIONAL([OAC_ARM_INLINE_ASM],[true])
+                AC_DEFINE([OAC_ARM_INLINE_ASM], 1,
                     [Use generic ARMv4 inline asm optimizations])
-                AS_IF([test x"$OPUS_ARM_INLINE_EDSP" = x"1"],[
-                    AC_DEFINE([OPUS_ARM_INLINE_EDSP], [1],
+                AS_IF([test x"$OAC_ARM_INLINE_EDSP" = x"1"],[
+                    AC_DEFINE([OAC_ARM_INLINE_EDSP], [1],
                         [Use ARMv5E inline asm optimizations])
                     inline_optimization="$inline_optimization (EDSP)"
                 ])
-                AS_IF([test x"$OPUS_ARM_INLINE_MEDIA" = x"1"],[
-                    AC_DEFINE([OPUS_ARM_INLINE_MEDIA], [1],
+                AS_IF([test x"$OAC_ARM_INLINE_MEDIA" = x"1"],[
+                    AC_DEFINE([OAC_ARM_INLINE_MEDIA], [1],
                         [Use ARMv6 inline asm optimizations])
                     inline_optimization="$inline_optimization (Media)"
                 ])
-                AS_IF([test x"$OPUS_ARM_INLINE_NEON" = x"1"],[
-                    AC_DEFINE([OPUS_ARM_INLINE_NEON], 1,
+                AS_IF([test x"$OAC_ARM_INLINE_NEON" = x"1"],[
+                    AC_DEFINE([OAC_ARM_INLINE_NEON], 1,
                         [Use ARM NEON inline asm optimizations])
                     inline_optimization="$inline_optimization (NEON)"
                 ])
@@ -277,98 +277,98 @@ AS_IF([test x"${enable_asm}" = x"yes"],[
             dnl We need Perl to translate RVCT-syntax asm to gas syntax.
             AC_CHECK_PROG([HAVE_PERL], perl, yes, no)
             AS_IF([test x"$HAVE_PERL" = x"yes"],[
-                AM_CONDITIONAL([OPUS_ARM_EXTERNAL_ASM],[true])
+                AM_CONDITIONAL([OAC_ARM_EXTERNAL_ASM],[true])
                 asm_optimization="ARM"
-                AS_IF([test x"$OPUS_ARM_INLINE_EDSP" = x"1"], [
-                    OPUS_ARM_PRESUME_EDSP=1
-                    OPUS_ARM_MAY_HAVE_EDSP=1
+                AS_IF([test x"$OAC_ARM_INLINE_EDSP" = x"1"], [
+                    OAC_ARM_PRESUME_EDSP=1
+                    OAC_ARM_MAY_HAVE_EDSP=1
                 ],
                 [
-                    OPUS_ARM_PRESUME_EDSP=0
-                    OPUS_ARM_MAY_HAVE_EDSP=0
+                    OAC_ARM_PRESUME_EDSP=0
+                    OAC_ARM_MAY_HAVE_EDSP=0
                 ])
-                AS_IF([test x"$OPUS_ARM_INLINE_MEDIA" = x"1"], [
-                    OPUS_ARM_PRESUME_MEDIA=1
-                    OPUS_ARM_MAY_HAVE_MEDIA=1
+                AS_IF([test x"$OAC_ARM_INLINE_MEDIA" = x"1"], [
+                    OAC_ARM_PRESUME_MEDIA=1
+                    OAC_ARM_MAY_HAVE_MEDIA=1
                 ],
                 [
-                    OPUS_ARM_PRESUME_MEDIA=0
-                    OPUS_ARM_MAY_HAVE_MEDIA=0
+                    OAC_ARM_PRESUME_MEDIA=0
+                    OAC_ARM_MAY_HAVE_MEDIA=0
                 ])
-                AS_IF([test x"$OPUS_ARM_INLINE_NEON" = x"1"], [
-                    OPUS_ARM_PRESUME_NEON=1
-                    OPUS_ARM_MAY_HAVE_NEON=1
+                AS_IF([test x"$OAC_ARM_INLINE_NEON" = x"1"], [
+                    OAC_ARM_PRESUME_NEON=1
+                    OAC_ARM_MAY_HAVE_NEON=1
                 ],
                 [
-                    OPUS_ARM_PRESUME_NEON=0
-                    OPUS_ARM_MAY_HAVE_NEON=0
+                    OAC_ARM_PRESUME_NEON=0
+                    OAC_ARM_MAY_HAVE_NEON=0
                 ])
                 AS_IF([test x"$enable_rtcd" = x"yes"],[
-                    AS_IF([test x"$OPUS_ARM_MAY_HAVE_EDSP" != x"1"],[
+                    AS_IF([test x"$OAC_ARM_MAY_HAVE_EDSP" != x"1"],[
                         AC_MSG_NOTICE(
                           [Trying to force-enable armv5e EDSP instructions...])
-                        AS_ASM_ARM_EDSP_FORCE([OPUS_ARM_MAY_HAVE_EDSP=1])
+                        AS_ASM_ARM_EDSP_FORCE([OAC_ARM_MAY_HAVE_EDSP=1])
                     ])
-                    AS_IF([test x"$OPUS_ARM_MAY_HAVE_MEDIA" != x"1"],[
+                    AS_IF([test x"$OAC_ARM_MAY_HAVE_MEDIA" != x"1"],[
                         AC_MSG_NOTICE(
                           [Trying to force-enable ARMv6 media instructions...])
-                        AS_ASM_ARM_MEDIA_FORCE([OPUS_ARM_MAY_HAVE_MEDIA=1])
+                        AS_ASM_ARM_MEDIA_FORCE([OAC_ARM_MAY_HAVE_MEDIA=1])
                     ])
-                    AS_IF([test x"$OPUS_ARM_MAY_HAVE_NEON" != x"1"],[
+                    AS_IF([test x"$OAC_ARM_MAY_HAVE_NEON" != x"1"],[
                         AC_MSG_NOTICE(
                           [Trying to force-enable NEON instructions...])
-                        AS_ASM_ARM_NEON_FORCE([OPUS_ARM_MAY_HAVE_NEON=1])
+                        AS_ASM_ARM_NEON_FORCE([OAC_ARM_MAY_HAVE_NEON=1])
                     ])
                 ])
                 rtcd_support=
-                AS_IF([test x"$OPUS_ARM_MAY_HAVE_EDSP" = x"1"],[
-                    AC_DEFINE(OPUS_ARM_MAY_HAVE_EDSP, 1,
+                AS_IF([test x"$OAC_ARM_MAY_HAVE_EDSP" = x"1"],[
+                    AC_DEFINE(OAC_ARM_MAY_HAVE_EDSP, 1,
                         [Define if assembler supports EDSP instructions])
-                    AS_IF([test x"$OPUS_ARM_PRESUME_EDSP" = x"1"],[
-                        AC_DEFINE(OPUS_ARM_PRESUME_EDSP, 1,
+                    AS_IF([test x"$OAC_ARM_PRESUME_EDSP" = x"1"],[
+                        AC_DEFINE(OAC_ARM_PRESUME_EDSP, 1,
                           [Define if binary requires EDSP instruction support])
                         asm_optimization="$asm_optimization (EDSP)"
                     ],
                         [rtcd_support="$rtcd_support (EDSP)"]
                     )
                 ])
-                AC_SUBST(OPUS_ARM_MAY_HAVE_EDSP)
-                AS_IF([test x"$OPUS_ARM_MAY_HAVE_MEDIA" = x"1"],[
-                    AC_DEFINE(OPUS_ARM_MAY_HAVE_MEDIA, 1,
+                AC_SUBST(OAC_ARM_MAY_HAVE_EDSP)
+                AS_IF([test x"$OAC_ARM_MAY_HAVE_MEDIA" = x"1"],[
+                    AC_DEFINE(OAC_ARM_MAY_HAVE_MEDIA, 1,
                       [Define if assembler supports ARMv6 media instructions])
-                    AS_IF([test x"$OPUS_ARM_PRESUME_MEDIA" = x"1"],[
-                        AC_DEFINE(OPUS_ARM_PRESUME_MEDIA, 1,
+                    AS_IF([test x"$OAC_ARM_PRESUME_MEDIA" = x"1"],[
+                        AC_DEFINE(OAC_ARM_PRESUME_MEDIA, 1,
                           [Define if binary requires ARMv6 media instruction support])
                         asm_optimization="$asm_optimization (Media)"
                     ],
                         [rtcd_support="$rtcd_support (Media)"]
                     )
                 ])
-                AC_SUBST(OPUS_ARM_MAY_HAVE_MEDIA)
-                AS_IF([test x"$OPUS_ARM_MAY_HAVE_NEON" = x"1"],[
-                    AC_DEFINE(OPUS_ARM_MAY_HAVE_NEON, 1,
+                AC_SUBST(OAC_ARM_MAY_HAVE_MEDIA)
+                AS_IF([test x"$OAC_ARM_MAY_HAVE_NEON" = x"1"],[
+                    AC_DEFINE(OAC_ARM_MAY_HAVE_NEON, 1,
                       [Define if compiler supports NEON instructions])
-                    AS_IF([test x"$OPUS_ARM_PRESUME_NEON" = x"1"], [
-                        AC_DEFINE(OPUS_ARM_PRESUME_NEON, 1,
+                    AS_IF([test x"$OAC_ARM_PRESUME_NEON" = x"1"], [
+                        AC_DEFINE(OAC_ARM_PRESUME_NEON, 1,
                           [Define if binary requires NEON instruction support])
                         asm_optimization="$asm_optimization (NEON)"
                     ],
                         [rtcd_support="$rtcd_support (NEON)"]
                     )
                 ])
-                AC_SUBST(OPUS_ARM_MAY_HAVE_NEON)
-                AS_IF([test x"$OPUS_ARM_MAY_HAVE_DOTPROD" = x"1"],[
-                    AC_DEFINE(OPUS_ARM_MAY_HAVE_DOTPROD, 1,
+                AC_SUBST(OAC_ARM_MAY_HAVE_NEON)
+                AS_IF([test x"$OAC_ARM_MAY_HAVE_DOTPROD" = x"1"],[
+                    AC_DEFINE(OAC_ARM_MAY_HAVE_DOTPROD, 1,
                       [Define if compiler supports DOTPROD instructions])
-                    AS_IF([test x"$OPUS_ARM_PRESUME_DOTPROD" = x"1"], [
-                        AC_DEFINE(OPUS_ARM_PRESUME_DOTPROD, 1,
+                    AS_IF([test x"$OAC_ARM_PRESUME_DOTPROD" = x"1"], [
+                        AC_DEFINE(OAC_ARM_PRESUME_DOTPROD, 1,
                           [Define if binary requires DOTPROD instruction support])
                         asm_optimization="$asm_optimization (DOTPROD)"
                     ],
                         [rtcd_support="$rtcd_support (DOTPROD)"]
                     )
                 ])
-                AC_SUBST(OPUS_ARM_MAY_HAVE_DOTPROD)
+                AC_SUBST(OAC_ARM_MAY_HAVE_DOTPROD)
                 dnl Make sure turning on RTCD gets us at least one
                 dnl instruction set.
                 AS_IF([test x"$rtcd_support" != x""],
@@ -397,9 +397,9 @@ AS_IF([test x"${enable_asm}" = x"yes"],[
    asm_optimization="disabled"
 ])
 
-AM_CONDITIONAL([OPUS_ARM_INLINE_ASM],
+AM_CONDITIONAL([OAC_ARM_INLINE_ASM],
     [test x"${inline_optimization%% *}" = x"ARM"])
-AM_CONDITIONAL([OPUS_ARM_EXTERNAL_ASM],
+AM_CONDITIONAL([OAC_ARM_EXTERNAL_ASM],
     [test x"${asm_optimization%% *}" = x"ARM"])
 
 AM_CONDITIONAL([HAVE_SSE], [false])
@@ -439,7 +439,7 @@ AS_VAR_SET_IF([X86_AVX2_CFLAGS], [], [AS_VAR_SET([X86_AVX2_CFLAGS], "DEFAULT_X86
 AS_VAR_SET_IF([ARM_NEON_INTR_CFLAGS], [], [AS_VAR_SET([ARM_NEON_INTR_CFLAGS], ["$RESOLVED_DEFAULT_ARM_NEON_INTR_CFLAGS"])])
 AS_VAR_SET_IF([ARM_DOTPROD_INTR_CFLAGS], [], [AS_VAR_SET([ARM_DOTPROD_INTR_CFLAGS], ["DEFAULT_ARM_DOTPROD_INTR_CFLAGS"])])
 
-AC_DEFUN([OPUS_PATH_NE10],
+AC_DEFUN([OAC_PATH_NE10],
    [
       AC_ARG_WITH(NE10,
                   AS_HELP_STRING([--with-NE10=PFX],[prefix where libNE10 is installed (optional)]),
@@ -519,11 +519,11 @@ AS_IF([test x"$enable_intrinsics" = x"yes"],[
    [arm*|aarch64*],
    [
       cpu_arm=yes
-      OPUS_CHECK_INTRINSICS(
+      OAC_CHECK_INTRINSICS(
          [ARM Neon],
          [$ARM_NEON_INTR_CFLAGS],
-         [OPUS_ARM_MAY_HAVE_NEON_INTR],
-         [OPUS_ARM_PRESUME_NEON_INTR],
+         [OAC_ARM_MAY_HAVE_NEON_INTR],
+         [OAC_ARM_PRESUME_NEON_INTR],
          [[#include <arm_neon.h>
          ]],
          [[
@@ -532,40 +532,40 @@ AS_IF([test x"$enable_intrinsics" = x"yes"],[
             return (int)vgetq_lane_f32(SUMM, 0);
          ]]
       )
-      AS_IF([test x"$OPUS_ARM_MAY_HAVE_NEON_INTR" = x"1" && test x"$OPUS_ARM_PRESUME_NEON_INTR" != x"1"],
+      AS_IF([test x"$OAC_ARM_MAY_HAVE_NEON_INTR" = x"1" && test x"$OAC_ARM_PRESUME_NEON_INTR" != x"1"],
           [
-             OPUS_ARM_NEON_INTR_CFLAGS="$ARM_NEON_INTR_CFLAGS"
-             AC_SUBST([OPUS_ARM_NEON_INTR_CFLAGS])
+             OAC_ARM_NEON_INTR_CFLAGS="$ARM_NEON_INTR_CFLAGS"
+             AC_SUBST([OAC_ARM_NEON_INTR_CFLAGS])
           ]
       )
 
-      AS_IF([test x"$OPUS_ARM_MAY_HAVE_NEON_INTR" = x"1"],
+      AS_IF([test x"$OAC_ARM_MAY_HAVE_NEON_INTR" = x"1"],
       [
-         AC_DEFINE([OPUS_ARM_MAY_HAVE_NEON_INTR], 1, [Compiler supports ARMv7/Aarch64 Neon Intrinsics])
+         AC_DEFINE([OAC_ARM_MAY_HAVE_NEON_INTR], 1, [Compiler supports ARMv7/Aarch64 Neon Intrinsics])
          intrinsics_support="$intrinsics_support (NEON)"
 
-         AS_IF([test x"$enable_rtcd" != x"no" && test x"$OPUS_ARM_PRESUME_NEON_INTR" != x"1"],
+         AS_IF([test x"$enable_rtcd" != x"no" && test x"$OAC_ARM_PRESUME_NEON_INTR" != x"1"],
             [AS_IF([test x"$rtcd_support" = x"no"],
                [rtcd_support="ARM (NEON Intrinsics)"],
                [rtcd_support="$rtcd_support (NEON Intrinsics)"])])
 
-         AS_IF([test x"$OPUS_ARM_PRESUME_NEON_INTR" = x"1"],
-            [AC_DEFINE([OPUS_ARM_PRESUME_NEON_INTR], 1, [Define if binary requires NEON intrinsics support])])
+         AS_IF([test x"$OAC_ARM_PRESUME_NEON_INTR" = x"1"],
+            [AC_DEFINE([OAC_ARM_PRESUME_NEON_INTR], 1, [Define if binary requires NEON intrinsics support])])
 
-         OPUS_PATH_NE10()
+         OAC_PATH_NE10()
          AS_IF([test x"$NE10_LIBS" != x""],
          [
               intrinsics_support="$intrinsics_support (NE10)"
               AS_IF([test x"enable_rtcd" != x"" \
-               && test x"$OPUS_ARM_PRESUME_NEON_INTR" != x"1"],
+               && test x"$OAC_ARM_PRESUME_NEON_INTR" != x"1"],
                  [rtcd_support="$rtcd_support (NE10)"])
          ])
 
-         OPUS_CHECK_INTRINSICS(
+         OAC_CHECK_INTRINSICS(
             [Aarch64 Neon],
             [$ARM_NEON_INTR_CFLAGS],
-            [OPUS_ARM_MAY_HAVE_AARCH64_NEON_INTR],
-            [OPUS_ARM_PRESUME_AARCH64_NEON_INTR],
+            [OAC_ARM_MAY_HAVE_AARCH64_NEON_INTR],
+            [OAC_ARM_PRESUME_AARCH64_NEON_INTR],
             [[#include <arm_neon.h>
             ]],
             [[
@@ -575,17 +575,17 @@ AS_IF([test x"$enable_intrinsics" = x"yes"],[
             ]]
          )
 
-         AS_IF([test x"$OPUS_ARM_PRESUME_AARCH64_NEON_INTR" = x"1"],
+         AS_IF([test x"$OAC_ARM_PRESUME_AARCH64_NEON_INTR" = x"1"],
          [
-            AC_DEFINE([OPUS_ARM_PRESUME_AARCH64_NEON_INTR], 1, [Define if binary requires Aarch64 Neon Intrinsics])
+            AC_DEFINE([OAC_ARM_PRESUME_AARCH64_NEON_INTR], 1, [Define if binary requires Aarch64 Neon Intrinsics])
             intrinsics_support="$intrinsics_support (NEON [Aarch64])"
          ])
 
-         OPUS_CHECK_INTRINSICS(
+         OAC_CHECK_INTRINSICS(
             [Aarch64 dotprod],
 	    [$ARM_DOTPROD_INTR_CFLAGS],
-            [OPUS_ARM_MAY_HAVE_DOTPROD],
-            [OPUS_ARM_PRESUME_DOTPROD],
+            [OAC_ARM_MAY_HAVE_DOTPROD],
+            [OAC_ARM_PRESUME_DOTPROD],
             [[#include <arm_neon.h>
             ]],
             [[
@@ -594,25 +594,25 @@ AS_IF([test x"$enable_intrinsics" = x"yes"],[
                acc = vdotq_s32(acc, a, b);
             ]]
          )
-         AS_IF([test x"$OPUS_ARM_MAY_HAVE_DOTPROD" = x"1" && test x"$OPUS_ARM_PRESUME_DOTPROD" != x"1"],
+         AS_IF([test x"$OAC_ARM_MAY_HAVE_DOTPROD" = x"1" && test x"$OAC_ARM_PRESUME_DOTPROD" != x"1"],
              [
-                OPUS_ARM_DOTPROD_INTR_CFLAGS="$ARM_NEON_DOTPROD_CFLAGS"
-                AC_SUBST([OPUS_ARM_DOTPROD_INTR_CFLAGS])
+                OAC_ARM_DOTPROD_INTR_CFLAGS="$ARM_NEON_DOTPROD_CFLAGS"
+                AC_SUBST([OAC_ARM_DOTPROD_INTR_CFLAGS])
              ]
          )
 
-         AS_IF([test x"$OPUS_ARM_MAY_HAVE_DOTPROD" = x"1"],
+         AS_IF([test x"$OAC_ARM_MAY_HAVE_DOTPROD" = x"1"],
              [
-                AC_DEFINE([OPUS_ARM_MAY_HAVE_DOTPROD], 1, [Compiler supports Aarch64 DOTPROD Intrinsics])
+                AC_DEFINE([OAC_ARM_MAY_HAVE_DOTPROD], 1, [Compiler supports Aarch64 DOTPROD Intrinsics])
                 intrinsics_support="$intrinsics_support (DOTPROD)"
 
-                AS_IF([test x"$OPUS_ARM_PRESUME_DOTPROD" = x"1"],
+                AS_IF([test x"$OAC_ARM_PRESUME_DOTPROD" = x"1"],
                 [
-                   AC_DEFINE([OPUS_ARM_PRESUME_DOTPROD], 1, [Define if binary requires Aarch64 dotprod Intrinsics])
+                   AC_DEFINE([OAC_ARM_PRESUME_DOTPROD], 1, [Define if binary requires Aarch64 dotprod Intrinsics])
                    intrinsics_support="$intrinsics_support (DOTPROD [Aarch64])"
                 ])
 
-                AS_IF([test x"$enable_rtcd" != x"no" && test x"$OPUS_ARM_PRESUME_DOTPROD" != x"1"],
+                AS_IF([test x"$enable_rtcd" != x"no" && test x"$OAC_ARM_PRESUME_DOTPROD" != x"1"],
                    [AS_IF([test x"$rtcd_support" = x"no"],
                       [rtcd_support="ARM (DOTPROD Intrinsics)"],
                       [rtcd_support="$rtcd_support (DOTPROD Intrinsics)"])])
@@ -633,11 +633,11 @@ AS_IF([test x"$enable_intrinsics" = x"yes"],[
    [i?86|x86_64],
    [
       cpu_x86=yes
-      OPUS_CHECK_INTRINSICS(
+      OAC_CHECK_INTRINSICS(
          [SSE],
          [$X86_SSE_CFLAGS],
-         [OPUS_X86_MAY_HAVE_SSE],
-         [OPUS_X86_PRESUME_SSE],
+         [OAC_X86_MAY_HAVE_SSE],
+         [OAC_X86_PRESUME_SSE],
          [[#include <xmmintrin.h>
            #include <time.h>
          ]],
@@ -648,17 +648,17 @@ AS_IF([test x"$enable_intrinsics" = x"yes"],[
              return _mm_cvtss_si32(mtest);
          ]]
       )
-      AS_IF([test x"$OPUS_X86_MAY_HAVE_SSE" = x"1" && test x"$OPUS_X86_PRESUME_SSE" != x"1"],
+      AS_IF([test x"$OAC_X86_MAY_HAVE_SSE" = x"1" && test x"$OAC_X86_PRESUME_SSE" != x"1"],
           [
-             OPUS_X86_SSE_CFLAGS="$X86_SSE_CFLAGS"
-             AC_SUBST([OPUS_X86_SSE_CFLAGS])
+             OAC_X86_SSE_CFLAGS="$X86_SSE_CFLAGS"
+             AC_SUBST([OAC_X86_SSE_CFLAGS])
           ]
       )
-      OPUS_CHECK_INTRINSICS(
+      OAC_CHECK_INTRINSICS(
          [SSE2],
          [$X86_SSE2_CFLAGS],
-         [OPUS_X86_MAY_HAVE_SSE2],
-         [OPUS_X86_PRESUME_SSE2],
+         [OAC_X86_MAY_HAVE_SSE2],
+         [OAC_X86_PRESUME_SSE2],
          [[#include <emmintrin.h>
            #include <time.h>
          ]],
@@ -669,17 +669,17 @@ AS_IF([test x"$enable_intrinsics" = x"yes"],[
             return _mm_cvtsi128_si32(mtest);
          ]]
       )
-      AS_IF([test x"$OPUS_X86_MAY_HAVE_SSE2" = x"1" && test x"$OPUS_X86_PRESUME_SSE2" != x"1"],
+      AS_IF([test x"$OAC_X86_MAY_HAVE_SSE2" = x"1" && test x"$OAC_X86_PRESUME_SSE2" != x"1"],
           [
-             OPUS_X86_SSE2_CFLAGS="$X86_SSE2_CFLAGS"
-             AC_SUBST([OPUS_X86_SSE2_CFLAGS])
+             OAC_X86_SSE2_CFLAGS="$X86_SSE2_CFLAGS"
+             AC_SUBST([OAC_X86_SSE2_CFLAGS])
           ]
       )
-      OPUS_CHECK_INTRINSICS(
+      OAC_CHECK_INTRINSICS(
          [SSE4.1],
          [$X86_SSE4_1_CFLAGS],
-         [OPUS_X86_MAY_HAVE_SSE4_1],
-         [OPUS_X86_PRESUME_SSE4_1],
+         [OAC_X86_MAY_HAVE_SSE4_1],
+         [OAC_X86_PRESUME_SSE4_1],
          [[#include <smmintrin.h>
            #include <time.h>
          ]],
@@ -690,17 +690,17 @@ AS_IF([test x"$enable_intrinsics" = x"yes"],[
             return _mm_cvtsi128_si32(mtest);
          ]]
       )
-      AS_IF([test x"$OPUS_X86_MAY_HAVE_SSE4_1" = x"1" && test x"$OPUS_X86_PRESUME_SSE4_1" != x"1"],
+      AS_IF([test x"$OAC_X86_MAY_HAVE_SSE4_1" = x"1" && test x"$OAC_X86_PRESUME_SSE4_1" != x"1"],
           [
-             OPUS_X86_SSE4_1_CFLAGS="$X86_SSE4_1_CFLAGS"
-             AC_SUBST([OPUS_X86_SSE4_1_CFLAGS])
+             OAC_X86_SSE4_1_CFLAGS="$X86_SSE4_1_CFLAGS"
+             AC_SUBST([OAC_X86_SSE4_1_CFLAGS])
           ]
       )
-      OPUS_CHECK_INTRINSICS(
+      OAC_CHECK_INTRINSICS(
          [AVX2],
          [$X86_AVX2_CFLAGS],
-         [OPUS_X86_MAY_HAVE_AVX2],
-         [OPUS_X86_PRESUME_AVX2],
+         [OAC_X86_MAY_HAVE_AVX2],
+         [OAC_X86_PRESUME_AVX2],
          [[#include <immintrin.h>
            #include <time.h>
          ]],
@@ -718,58 +718,58 @@ AS_IF([test x"$enable_intrinsics" = x"yes"],[
               _mm256_xor_si256(mtest1, mtest2), _mm256_cvttps_epi32(mtest)), 0);
          ]]
       )
-      AS_IF([test x"$OPUS_X86_MAY_HAVE_AVX2" = x"1" && test x"$OPUS_X86_PRESUME_AVX2" != x"1"],
+      AS_IF([test x"$OAC_X86_MAY_HAVE_AVX2" = x"1" && test x"$OAC_X86_PRESUME_AVX2" != x"1"],
           [
-             OPUS_X86_AVX2_CFLAGS="$X86_AVX2_CFLAGS"
-             AC_SUBST([OPUS_X86_AVX2_CFLAGS])
+             OAC_X86_AVX2_CFLAGS="$X86_AVX2_CFLAGS"
+             AC_SUBST([OAC_X86_AVX2_CFLAGS])
           ]
       )
          AS_IF([test x"$rtcd_support" = x"no"], [rtcd_support=""])
-         AS_IF([test x"$OPUS_X86_MAY_HAVE_SSE" = x"1"],
+         AS_IF([test x"$OAC_X86_MAY_HAVE_SSE" = x"1"],
          [
-            AC_DEFINE([OPUS_X86_MAY_HAVE_SSE], 1, [Compiler supports X86 SSE Intrinsics])
+            AC_DEFINE([OAC_X86_MAY_HAVE_SSE], 1, [Compiler supports X86 SSE Intrinsics])
             intrinsics_support="$intrinsics_support SSE"
 
-            AS_IF([test x"$OPUS_X86_PRESUME_SSE" = x"1"],
-               [AC_DEFINE([OPUS_X86_PRESUME_SSE], 1, [Define if binary requires SSE intrinsics support])],
+            AS_IF([test x"$OAC_X86_PRESUME_SSE" = x"1"],
+               [AC_DEFINE([OAC_X86_PRESUME_SSE], 1, [Define if binary requires SSE intrinsics support])],
                [rtcd_support="$rtcd_support SSE"])
          ],
          [
             AC_MSG_WARN([Compiler does not support SSE intrinsics])
          ])
 
-         AS_IF([test x"$OPUS_X86_MAY_HAVE_SSE2" = x"1"],
+         AS_IF([test x"$OAC_X86_MAY_HAVE_SSE2" = x"1"],
          [
-            AC_DEFINE([OPUS_X86_MAY_HAVE_SSE2], 1, [Compiler supports X86 SSE2 Intrinsics])
+            AC_DEFINE([OAC_X86_MAY_HAVE_SSE2], 1, [Compiler supports X86 SSE2 Intrinsics])
             intrinsics_support="$intrinsics_support SSE2"
 
-            AS_IF([test x"$OPUS_X86_PRESUME_SSE2" = x"1"],
-               [AC_DEFINE([OPUS_X86_PRESUME_SSE2], 1, [Define if binary requires SSE2 intrinsics support])],
+            AS_IF([test x"$OAC_X86_PRESUME_SSE2" = x"1"],
+               [AC_DEFINE([OAC_X86_PRESUME_SSE2], 1, [Define if binary requires SSE2 intrinsics support])],
                [rtcd_support="$rtcd_support SSE2"])
          ],
          [
             AC_MSG_WARN([Compiler does not support SSE2 intrinsics])
          ])
 
-         AS_IF([test x"$OPUS_X86_MAY_HAVE_SSE4_1" = x"1"],
+         AS_IF([test x"$OAC_X86_MAY_HAVE_SSE4_1" = x"1"],
          [
-            AC_DEFINE([OPUS_X86_MAY_HAVE_SSE4_1], 1, [Compiler supports X86 SSE4.1 Intrinsics])
+            AC_DEFINE([OAC_X86_MAY_HAVE_SSE4_1], 1, [Compiler supports X86 SSE4.1 Intrinsics])
             intrinsics_support="$intrinsics_support SSE4.1"
 
-            AS_IF([test x"$OPUS_X86_PRESUME_SSE4_1" = x"1"],
-               [AC_DEFINE([OPUS_X86_PRESUME_SSE4_1], 1, [Define if binary requires SSE4.1 intrinsics support])],
+            AS_IF([test x"$OAC_X86_PRESUME_SSE4_1" = x"1"],
+               [AC_DEFINE([OAC_X86_PRESUME_SSE4_1], 1, [Define if binary requires SSE4.1 intrinsics support])],
                [rtcd_support="$rtcd_support SSE4.1"])
          ],
          [
             AC_MSG_WARN([Compiler does not support SSE4.1 intrinsics])
          ])
-         AS_IF([test x"$OPUS_X86_MAY_HAVE_AVX2" = x"1"],
+         AS_IF([test x"$OAC_X86_MAY_HAVE_AVX2" = x"1"],
          [
-            AC_DEFINE([OPUS_X86_MAY_HAVE_AVX2], 1, [Compiler supports X86 AVX2 Intrinsics])
+            AC_DEFINE([OAC_X86_MAY_HAVE_AVX2], 1, [Compiler supports X86 AVX2 Intrinsics])
             intrinsics_support="$intrinsics_support AVX2"
 
-            AS_IF([test x"$OPUS_X86_PRESUME_AVX2" = x"1"],
-               [AC_DEFINE([OPUS_X86_PRESUME_AVX2], 1, [Define if binary requires AVX2 intrinsics support])],
+            AS_IF([test x"$OAC_X86_PRESUME_AVX2" = x"1"],
+               [AC_DEFINE([OAC_X86_PRESUME_AVX2], 1, [Define if binary requires AVX2 intrinsics support])],
                [rtcd_support="$rtcd_support AVX2"])
          ],
          [
@@ -846,29 +846,29 @@ AS_IF([test x"$enable_intrinsics" = x"yes"],[
 
 AM_CONDITIONAL([CPU_ARM], [test "$cpu_arm" = "yes"])
 AM_CONDITIONAL([HAVE_ARM_DOTPROD],
-    [test x"$OPUS_ARM_MAY_HAVE_DOTPROD" = x"1"])
+    [test x"$OAC_ARM_MAY_HAVE_DOTPROD" = x"1"])
 AM_CONDITIONAL([HAVE_ARM_NEON_INTR],
-    [test x"$OPUS_ARM_MAY_HAVE_NEON_INTR" = x"1"])
+    [test x"$OAC_ARM_MAY_HAVE_NEON_INTR" = x"1"])
 AM_CONDITIONAL([HAVE_ARM_NE10],
     [test x"$HAVE_ARM_NE10" = x"1"])
 AM_CONDITIONAL([CPU_X86], [test "$cpu_x86" = "yes"])
 AM_CONDITIONAL([HAVE_SSE],
-    [test x"$OPUS_X86_MAY_HAVE_SSE" = x"1"])
+    [test x"$OAC_X86_MAY_HAVE_SSE" = x"1"])
 AM_CONDITIONAL([HAVE_SSE2],
-    [test x"$OPUS_X86_MAY_HAVE_SSE2" = x"1"])
+    [test x"$OAC_X86_MAY_HAVE_SSE2" = x"1"])
 AM_CONDITIONAL([HAVE_SSE4_1],
-    [test x"$OPUS_X86_MAY_HAVE_SSE4_1" = x"1"])
+    [test x"$OAC_X86_MAY_HAVE_SSE4_1" = x"1"])
 AM_CONDITIONAL([HAVE_AVX2],
-    [test x"$OPUS_X86_MAY_HAVE_AVX2" = x"1"])
+    [test x"$OAC_X86_MAY_HAVE_AVX2" = x"1"])
 
 AM_CONDITIONAL([HAVE_RTCD],
  [test x"$enable_rtcd" = x"yes" && test x"$rtcd_support" != x"no"])
 AS_IF([test x"$enable_rtcd" = x"yes"],[
     AS_IF([test x"$rtcd_support" != x"no"],[
-        AC_DEFINE([OPUS_HAVE_RTCD], [1],
+        AC_DEFINE([OAC_HAVE_RTCD], [1],
             [Use run-time CPU capabilities detection])
-        OPUS_HAVE_RTCD=1
-        AC_SUBST(OPUS_HAVE_RTCD)
+        OAC_HAVE_RTCD=1
+        AC_SUBST(OAC_HAVE_RTCD)
     ])
 ],[
     rtcd_support="disabled"
@@ -904,7 +904,7 @@ AC_ARG_ENABLE([check-asm],
     [enable_check_asm=no])
 
 AS_IF([test "$enable_check_asm" = "yes"], [
-  AC_DEFINE([OPUS_CHECK_ASM], [1], [Run bit-exactness checks between optimized and C implementations])
+  AC_DEFINE([OAC_CHECK_ASM], [1], [Run bit-exactness checks between optimized and C implementations])
 ])
 
 AC_ARG_ENABLE([doc],
@@ -954,8 +954,8 @@ AC_ARG_ENABLE([osce],
 )
 
 AS_IF([test "$enable_osce" = "yes" || test "$enable_osce_training_data" = "yes"], [
-       AC_DEFINE([ENABLE_OSCE], [1], [Enable Opus Speech Coding Enhancement])
-       AC_DEFINE([ENABLE_OSCE_BWE], [1], [Enable Opus Speech Coding Enhancement Blind BWE])
+       AC_DEFINE([ENABLE_OSCE], [1], [Enable Oac Speech Coding Enhancement])
+       AC_DEFINE([ENABLE_OSCE_BWE], [1], [Enable Oac Speech Coding Enhancement Blind BWE])
 ])
 
 AM_CONDITIONAL([ENABLE_OSCE], [test "$enable_osce" = "yes" || test "$enable_osce_training_data" = "yes"])
@@ -1059,8 +1059,8 @@ AC_SUBST([PC_BUILD])
 
 AC_CONFIG_FILES([
     Makefile
-    opus.pc
-    opus-uninstalled.pc
+    oac.pc
+    oac-uninstalled.pc
     celt/arm/armopts.s
     doc/Makefile
     doc/Doxyfile
diff --git a/dnn/arm/arm_dnn_map.c b/dnn/arm/arm_dnn_map.c
index 98a2a3125..13806f6f9 100644
--- a/dnn/arm/arm_dnn_map.c
+++ b/dnn/arm/arm_dnn_map.c
@@ -32,11 +32,11 @@
 #include "arm/armcpu.h"
 #include "nnet.h"
 
-#if defined(OPUS_HAVE_RTCD)
+#if defined(OAC_HAVE_RTCD)
 
-#if (defined(OPUS_ARM_MAY_HAVE_DOTPROD) && !defined(OPUS_ARM_PRESUME_DOTPROD))
+#if (defined(OAC_ARM_MAY_HAVE_DOTPROD) && !defined(OAC_ARM_PRESUME_DOTPROD))
 
-void (*const DNN_COMPUTE_LINEAR_IMPL[OPUS_ARCHMASK + 1])(
+void (*const DNN_COMPUTE_LINEAR_IMPL[OAC_ARCHMASK + 1])(
          const LinearLayer *linear,
          float *out,
          const float *in
@@ -50,9 +50,9 @@ void (*const DNN_COMPUTE_LINEAR_IMPL[OPUS_ARCHMASK + 1])(
 
 #endif
 
-#if (defined(OPUS_ARM_MAY_HAVE_DOTPROD) || defined(OPUS_ARM_MAY_HAVE_NEON)) && !defined(OPUS_ARM_PRESUME_NEON)
+#if (defined(OAC_ARM_MAY_HAVE_DOTPROD) || defined(OAC_ARM_MAY_HAVE_NEON)) && !defined(OAC_ARM_PRESUME_NEON)
 
-void (*const DNN_COMPUTE_ACTIVATION_IMPL[OPUS_ARCHMASK + 1])(
+void (*const DNN_COMPUTE_ACTIVATION_IMPL[OAC_ARCHMASK + 1])(
          float *output,
          const float *input,
          int N,
@@ -65,7 +65,7 @@ void (*const DNN_COMPUTE_ACTIVATION_IMPL[OPUS_ARCHMASK + 1])(
     MAY_HAVE_DOTPROD(compute_activation) /* dotprod  */
 };
 
-void (*const DNN_COMPUTE_CONV2D_IMPL[OPUS_ARCHMASK + 1])(
+void (*const DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
          const Conv2dLayer *conv,
          float *out,
          float *mem,
diff --git a/dnn/arm/dnn_arm.h b/dnn/arm/dnn_arm.h
index d7ac74526..a2fe59743 100644
--- a/dnn/arm/dnn_arm.h
+++ b/dnn/arm/dnn_arm.h
@@ -29,7 +29,7 @@
 #define DNN_ARM_H
 
 #include "cpu_support.h"
-#include "opus_types.h"
+#include "oac_types.h"
 
 void compute_linear_dotprod(const LinearLayer *linear, float *out, const float *in);
 void compute_linear_neon(const LinearLayer *linear, float *out, const float *in);
@@ -40,40 +40,40 @@ void compute_activation_dotprod(float *output, const float *input, int N, int ac
 void compute_conv2d_neon(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride, int activation);
 void compute_conv2d_dotprod(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride, int activation);
 
-#if defined(OPUS_ARM_PRESUME_DOTPROD)
+#if defined(OAC_ARM_PRESUME_DOTPROD)
 
 #define OVERRIDE_COMPUTE_LINEAR
 #define compute_linear(linear, out, in, arch) ((void)(arch),compute_linear_dotprod(linear, out, in))
 
-#elif defined(OPUS_ARM_PRESUME_NEON_INTR) && !defined(OPUS_ARM_MAY_HAVE_DOTPROD)
+#elif defined(OAC_ARM_PRESUME_NEON_INTR) && !defined(OAC_ARM_MAY_HAVE_DOTPROD)
 
 #define OVERRIDE_COMPUTE_LINEAR
 #define compute_linear(linear, out, in, arch) ((void)(arch),compute_linear_neon(linear, out, in))
 
-#elif defined(OPUS_HAVE_RTCD) && (defined(OPUS_ARM_MAY_HAVE_DOTPROD) || defined(OPUS_ARM_MAY_HAVE_NEON))
+#elif defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_DOTPROD) || defined(OAC_ARM_MAY_HAVE_NEON))
 
-extern void (*const DNN_COMPUTE_LINEAR_IMPL[OPUS_ARCHMASK + 1])(
+extern void (*const DNN_COMPUTE_LINEAR_IMPL[OAC_ARCHMASK + 1])(
                     const LinearLayer *linear,
                     float *out,
                     const float *in
                     );
 #define OVERRIDE_COMPUTE_LINEAR
 #define compute_linear(linear, out, in, arch) \
-    ((*DNN_COMPUTE_LINEAR_IMPL[(arch) & OPUS_ARCHMASK])(linear, out, in))
+    ((*DNN_COMPUTE_LINEAR_IMPL[(arch) & OAC_ARCHMASK])(linear, out, in))
 
 
 #endif
 
-#if defined(OPUS_ARM_PRESUME_NEON)
+#if defined(OAC_ARM_PRESUME_NEON)
 
 #define OVERRIDE_COMPUTE_ACTIVATION
 #define compute_activation(output, input, N, activation, arch) ((void)(arch),compute_activation_neon(output, input, N, activation))
 #define OVERRIDE_COMPUTE_CONV2D
 #define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch),compute_conv2d_neon(conv, out, mem, in, height, hstride, activation))
 
-#elif defined(OPUS_HAVE_RTCD) && (defined(OPUS_ARM_MAY_HAVE_DOTPROD) || defined(OPUS_ARM_MAY_HAVE_NEON))
+#elif defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_DOTPROD) || defined(OAC_ARM_MAY_HAVE_NEON))
 
-extern void (*const DNN_COMPUTE_ACTIVATION_IMPL[OPUS_ARCHMASK + 1])(
+extern void (*const DNN_COMPUTE_ACTIVATION_IMPL[OAC_ARCHMASK + 1])(
                     float *output,
                     const float *input,
                     int N,
@@ -81,10 +81,10 @@ extern void (*const DNN_COMPUTE_ACTIVATION_IMPL[OPUS_ARCHMASK + 1])(
                     );
 #define OVERRIDE_COMPUTE_ACTIVATION
 #define compute_activation(output, input, N, activation, arch) \
-    ((*DNN_COMPUTE_ACTIVATION_IMPL[(arch) & OPUS_ARCHMASK])(output, input, N, activation))
+    ((*DNN_COMPUTE_ACTIVATION_IMPL[(arch) & OAC_ARCHMASK])(output, input, N, activation))
 
 
-extern void (*const DNN_COMPUTE_CONV2D_IMPL[OPUS_ARCHMASK + 1])(
+extern void (*const DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
                     const Conv2dLayer *conv,
                     float *out,
                     float *mem,
@@ -95,7 +95,7 @@ extern void (*const DNN_COMPUTE_CONV2D_IMPL[OPUS_ARCHMASK + 1])(
                     );
 #define OVERRIDE_COMPUTE_CONV2D
 #define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) \
-    ((*DNN_COMPUTE_CONV2D_IMPL[(arch) & OPUS_ARCHMASK])(conv, out, mem, in, height, hstride, activation))
+    ((*DNN_COMPUTE_CONV2D_IMPL[(arch) & OAC_ARCHMASK])(conv, out, mem, in, height, hstride, activation))
 
 
 #endif
diff --git a/dnn/bwe_demo.c b/dnn/bwe_demo.c
index 530ff605a..8241a0a1e 100644
--- a/dnn/bwe_demo.c
+++ b/dnn/bwe_demo.c
@@ -56,7 +56,7 @@ int main(int argc, char **argv) {
     OSCEModel *osce;
 
 
-    arch = opus_select_arch();
+    arch = oac_select_arch();
     hOSCEBWE = (silk_OSCE_BWE_struct *)calloc(1, sizeof(*hOSCEBWE));
     osce = (OSCEModel *)calloc(1, sizeof(*osce));
     osce_load_models(osce, NULL, arch);
diff --git a/dnn/common.h b/dnn/common.h
index b3bec7300..3a1f7027d 100644
--- a/dnn/common.h
+++ b/dnn/common.h
@@ -6,10 +6,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "opus_defines.h"
+#include "oac_defines.h"
 
 #define LOG256 5.5451774445f
-static OPUS_INLINE float log2_approx(float x)
+static OAC_INLINE float log2_approx(float x)
 {
    int integer;
    float frac;
@@ -28,7 +28,7 @@ static OPUS_INLINE float log2_approx(float x)
 
 #define log_approx(x) (0.69315f*log2_approx(x))
 
-static OPUS_INLINE float ulaw2lin(float u)
+static OAC_INLINE float ulaw2lin(float u)
 {
     float s;
     float scale_1 = 32768.f/255.f;
@@ -38,7 +38,7 @@ static OPUS_INLINE float ulaw2lin(float u)
     return s*scale_1*(exp(u/128.*LOG256)-1);
 }
 
-static OPUS_INLINE int lin2ulaw(float x)
+static OAC_INLINE int lin2ulaw(float x)
 {
     float u;
     float scale = 255.f/32768.f;
diff --git a/dnn/dred_coding.h b/dnn/dred_coding.h
index 1ce040c23..bb57cacbe 100644
--- a/dnn/dred_coding.h
+++ b/dnn/dred_coding.h
@@ -28,7 +28,7 @@
 #ifndef DRED_CODING_H
 #define DRED_CODING_H
 
-#include "opus_types.h"
+#include "oac_types.h"
 #include "entcode.h"
 
 int compute_quantizer(int q0, int dQ, int qmax, int i);
diff --git a/dnn/dred_compare.c b/dnn/dred_compare.c
index 478cc2166..f3e16e64c 100644
--- a/dnn/dred_compare.c
+++ b/dnn/dred_compare.c
@@ -32,10 +32,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "mini_kfft.c"
 
 #define MAX(a,b) ((a)>(b) ? (a) : (b))
-#define OPUS_PI (3.14159265F)
+#define OAC_PI (3.14159265F)
 
-#define OPUS_COSF(_x)        ((float)cos(_x))
-#define OPUS_SINF(_x)        ((float)sin(_x))
+#define OAC_COSF(_x)        ((float)cos(_x))
+#define OAC_SINF(_x)        ((float)sin(_x))
 
 static void *check_alloc(void *_ptr){
   if(_ptr==NULL){
@@ -45,11 +45,11 @@ static void *check_alloc(void *_ptr){
   return _ptr;
 }
 
-static void *opus_malloc(size_t _size){
+static void *oac_malloc(size_t _size){
   return check_alloc(malloc(_size));
 }
 
-static void *opus_realloc(void *_ptr,size_t _size){
+static void *oac_realloc(void *_ptr,size_t _size){
   return check_alloc(realloc(_ptr,_size));
 }
 
@@ -114,7 +114,7 @@ static size_t read_pcm(float **_samples,FILE *_fin,int _nchannels,
     if(nsamples+nread>csamples){
       do csamples=csamples<<1|1;
       while(nsamples+nread>csamples);
-      samples=(float *)opus_realloc(samples,
+      samples=(float *)oac_realloc(samples,
        _nchannels*csamples*sizeof(*samples));
     }
     if (format==FORMAT_S16_LE) {
@@ -156,7 +156,7 @@ static size_t read_pcm(float **_samples,FILE *_fin,int _nchannels,
       }
     nsamples+=nread;
   }
-  *_samples=(float *)opus_realloc(samples,
+  *_samples=(float *)oac_realloc(samples,
    _nchannels*nsamples*sizeof(*samples));
   biquad(*_samples, mem, *_samples, b_hp, a_hp, nsamples);
   return nsamples;
@@ -176,8 +176,8 @@ static void spectrum(float *_ps,const int *_bands, int _nbands,
   /* Blackman-Harris window. */
   for(xj=0;xj<_window_sz;xj++){
     double n = (xj+.5)/_window_sz;
-    window[xj]=0.35875 - 0.48829*cos(2*OPUS_PI*n)
-             + 0.14128*cos(4*OPUS_PI*n) - 0.01168*cos(6*OPUS_PI*n);
+    window[xj]=0.35875 - 0.48829*cos(2*OAC_PI*n)
+             + 0.14128*cos(4*OAC_PI*n) - 0.01168*cos(6*OAC_PI*n);
   }
   kfft = mini_kiss_fftr_alloc(_window_sz, 0, NULL, NULL);
   for(xi=0;xi<_nframes;xi++){
@@ -395,8 +395,8 @@ int compare_audio(int _argc,const char **_argv, const char *argv0){
     return EXIT_FAILURE;
   }
   nframes=(xlength-test_win_size+test_win_step)/test_win_step;
-  X=(float *)opus_malloc(nframes*nfreqs*nchannels*sizeof(*X));
-  Y=(float *)opus_malloc(nframes*yfreqs*nchannels*sizeof(*Y));
+  X=(float *)oac_malloc(nframes*nfreqs*nchannels*sizeof(*X));
+  Y=(float *)oac_malloc(nframes*yfreqs*nchannels*sizeof(*Y));
 
   for(xi=2;xi<nframes-2;xi++){
     float xcorr[PITCH_MAX+1], ycorr[PITCH_MAX+1];
@@ -493,7 +493,7 @@ int compare_audio(int _argc,const char **_argv, const char *argv0){
       w = 1.f/(BANDS[bi+1]-BANDS[bi]);
       for(xj=BANDS[bi];xj<BANDS[bi+1]&&xj<max_compare;xj++){
         float f, thresh;
-        f = xj*OPUS_PI/960;
+        f = xj*OAC_PI/960;
         /* Shape the lower threshold similar to 1/(1 - 0.85*z^-1)
            deemphasis filter at 48 kHz. */
         thresh = .1/(.15*.15 + f*f);
diff --git a/dnn/dred_decoder.c b/dnn/dred_decoder.c
index a45a76468..19360315e 100644
--- a/dnn/dred_decoder.c
+++ b/dnn/dred_decoder.c
@@ -39,7 +39,7 @@
 #include "dred_rdovae_stats_data.h"
 #include "dred_rdovae_constants.h"
 
-void dred_decode_latents(ec_dec *dec, float *x, const opus_uint8 *scale, const opus_uint8 *r, const opus_uint8 *p0, int dim) {
+void dred_decode_latents(ec_dec *dec, float *x, const oac_uint8 *scale, const oac_uint8 *r, const oac_uint8 *p0, int dim) {
     int i;
     for (i=0;i<dim;i++) {
         int q;
@@ -49,7 +49,7 @@ void dred_decode_latents(ec_dec *dec, float *x, const opus_uint8 *scale, const o
     }
 }
 
-int dred_ec_decode(OpusDRED *dec, const opus_uint8 *bytes, int num_bytes, int min_feature_frames, int dred_frame_offset)
+int dred_ec_decode(OacDRED *dec, const oac_uint8 *bytes, int num_bytes, int min_feature_frames, int dred_frame_offset)
 {
   ec_dec ec;
   int q_level;
diff --git a/dnn/dred_decoder.h b/dnn/dred_decoder.h
index 74d1dfcd9..dda3247cc 100644
--- a/dnn/dred_decoder.h
+++ b/dnn/dred_decoder.h
@@ -28,13 +28,13 @@
 #ifndef DRED_DECODER_H
 #define DRED_DECODER_H
 
-#include "opus.h"
+#include "oac.h"
 #include "dred_config.h"
 #include "dred_rdovae.h"
 #include "entcode.h"
 #include "dred_rdovae_constants.h"
 
-struct OpusDRED {
+struct OacDRED {
     float        fec_features[2*DRED_NUM_REDUNDANCY_FRAMES*DRED_NUM_FEATURES];
     float        state[DRED_STATE_DIM];
     float        latents[(DRED_NUM_REDUNDANCY_FRAMES/2)*(DRED_LATENT_DIM+1)];
@@ -44,6 +44,6 @@ struct OpusDRED {
 };
 
 
-int dred_ec_decode(OpusDRED *dec, const opus_uint8 *bytes, int num_bytes, int min_feature_frames, int dred_frame_offset);
+int dred_ec_decode(OacDRED *dec, const oac_uint8 *bytes, int num_bytes, int min_feature_frames, int dred_frame_offset);
 
 #endif
diff --git a/dnn/dred_encoder.c b/dnn/dred_encoder.c
index aa65e4fb5..5281b3422 100644
--- a/dnn/dred_encoder.c
+++ b/dnn/dred_encoder.c
@@ -58,17 +58,17 @@ int dred_encoder_load_model(DREDEnc* enc, const void *data, int len)
     int ret;
     parse_weights(&list, data, len);
     ret = init_rdovaeenc(&enc->model, list);
-    opus_free(list);
+    oac_free(list);
     if (ret == 0) {
       ret = lpcnet_encoder_load_model(&enc->lpcnet_enc_state, data, len);
     }
     if (ret == 0) enc->loaded = 1;
-    return (ret == 0) ? OPUS_OK : OPUS_BAD_ARG;
+    return (ret == 0) ? OAC_OK : OAC_BAD_ARG;
 }
 
 void dred_encoder_reset(DREDEnc* enc)
 {
-    OPUS_CLEAR((char*)&enc->DREDENC_RESET_START,
+    OAC_CLEAR((char*)&enc->DREDENC_RESET_START,
               sizeof(DREDEnc)-
               ((char*)&enc->DREDENC_RESET_START - (char*)enc));
     enc->input_buffer_fill = DRED_SILK_ENCODER_DELAY;
@@ -76,7 +76,7 @@ void dred_encoder_reset(DREDEnc* enc)
     DRED_rdovae_init_encoder(&enc->rdovae_enc);
 }
 
-void dred_encoder_init(DREDEnc* enc, opus_int32 Fs, int channels)
+void dred_encoder_init(DREDEnc* enc, oac_int32 Fs, int channels)
 {
     enc->Fs = Fs;
     enc->channels = channels;
@@ -94,16 +94,16 @@ static void dred_process_frame(DREDEnc *enc, int arch)
 
     celt_assert(enc->loaded);
     /* shift latents buffer */
-    OPUS_MOVE(enc->latents_buffer + DRED_LATENT_DIM, enc->latents_buffer, (DRED_MAX_FRAMES - 1) * DRED_LATENT_DIM);
-    OPUS_MOVE(enc->state_buffer + DRED_STATE_DIM, enc->state_buffer, (DRED_MAX_FRAMES - 1) * DRED_STATE_DIM);
+    OAC_MOVE(enc->latents_buffer + DRED_LATENT_DIM, enc->latents_buffer, (DRED_MAX_FRAMES - 1) * DRED_LATENT_DIM);
+    OAC_MOVE(enc->state_buffer + DRED_STATE_DIM, enc->state_buffer, (DRED_MAX_FRAMES - 1) * DRED_STATE_DIM);
 
     /* calculate LPCNet features */
     lpcnet_compute_single_frame_features_float(&enc->lpcnet_enc_state, enc->input_buffer, feature_buffer, arch);
     lpcnet_compute_single_frame_features_float(&enc->lpcnet_enc_state, enc->input_buffer + DRED_FRAME_SIZE, feature_buffer + 36, arch);
 
     /* prepare input buffer (discard LPC coefficients) */
-    OPUS_COPY(input_buffer, feature_buffer, DRED_NUM_FEATURES);
-    OPUS_COPY(input_buffer + DRED_NUM_FEATURES, feature_buffer + 36, DRED_NUM_FEATURES);
+    OAC_COPY(input_buffer, feature_buffer, DRED_NUM_FEATURES);
+    OAC_COPY(input_buffer + DRED_NUM_FEATURES, feature_buffer + 36, DRED_NUM_FEATURES);
 
     /* run RDOVAE encoder */
     dred_rdovae_encode_dframe(&enc->rdovae_enc, &enc->model, enc->latents_buffer, enc->state_buffer, input_buffer, arch);
@@ -139,7 +139,7 @@ static void dred_convert_to_16k(DREDEnc *enc, const float *in, int in_len, float
     int i;
     int up;
     celt_assert(enc->channels*in_len <= MAX_DOWNMIX_BUFFER);
-    celt_assert(in_len * (opus_int32)16000 == out_len * enc->Fs);
+    celt_assert(in_len * (oac_int32)16000 == out_len * enc->Fs);
     switch(enc->Fs) {
         case 8000:
             up = 2;
@@ -165,14 +165,14 @@ static void dred_convert_to_16k(DREDEnc *enc, const float *in, int in_len, float
             celt_assert(0);
     }
     celt_assert(up*in_len <= MAX_DOWNMIX_BUFFER);
-    OPUS_CLEAR(downmix, up*in_len);
+    OAC_CLEAR(downmix, up*in_len);
     if (enc->channels == 1) {
         for (i=0;i<in_len;i++) downmix[up*i] = FLOAT2INT16(up*in[i])+VERY_SMALL;
     } else {
         for (i=0;i<in_len;i++) downmix[up*i] = FLOAT2INT16(.5*up*(in[2*i]+in[2*i+1]))+VERY_SMALL;
     }
     if (enc->Fs == 16000) {
-        OPUS_COPY(out, downmix, out_len);
+        OAC_COPY(out, downmix, out_len);
     } else if (enc->Fs == 48000 || enc->Fs == 24000) {
         /* ellip(7, .2, 70, 7750/24000) */
 
@@ -228,7 +228,7 @@ void dred_compute_latents(DREDEnc *enc, const float *pcm, int frame_size, int ex
             curr_offset16k += 320;
             dred_process_frame(enc, arch);
             enc->input_buffer_fill -= 2*DRED_FRAME_SIZE;
-            OPUS_MOVE(&enc->input_buffer[0], &enc->input_buffer[2*DRED_FRAME_SIZE], enc->input_buffer_fill);
+            OAC_MOVE(&enc->input_buffer[0], &enc->input_buffer[2*DRED_FRAME_SIZE], enc->input_buffer_fill);
             /* 15 ms (6*2.5 ms) is the ideal offset for DRED because it corresponds to our vocoder look-ahead. */
             if (enc->dred_offset < 6) {
                 enc->dred_offset += 8;
@@ -242,7 +242,7 @@ void dred_compute_latents(DREDEnc *enc, const float *pcm, int frame_size, int ex
     }
 }
 
-static void dred_encode_latents(ec_enc *enc, const float *x, const opus_uint8 *scale, const opus_uint8 *dzone, const opus_uint8 *r, const opus_uint8 *p0, int dim, int arch) {
+static void dred_encode_latents(ec_enc *enc, const float *x, const oac_uint8 *scale, const oac_uint8 *dzone, const oac_uint8 *r, const oac_uint8 *p0, int dim, int arch) {
     int i;
     int q[IMAX(DRED_LATENT_DIM,DRED_STATE_DIM)];
     float xq[IMAX(DRED_LATENT_DIM,DRED_STATE_DIM)];
@@ -294,7 +294,7 @@ int dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks, int
 
     latent_offset = enc->latent_offset;
     /* Delaying new DRED data when just out of silence because we already have the
-       main Opus payload for that frame. */
+       main Oac payload for that frame. */
     if (activity_mem[0] && enc->last_extra_dred_offset>0) {
         latent_offset = enc->last_extra_dred_offset;
         delayed_dred = 1;
diff --git a/dnn/dred_encoder.h b/dnn/dred_encoder.h
index 6987222c8..f34e7b5ac 100644
--- a/dnn/dred_encoder.h
+++ b/dnn/dred_encoder.h
@@ -43,7 +43,7 @@ typedef struct {
     LPCNetEncState lpcnet_enc_state;
     RDOVAEEncState rdovae_enc;
     int loaded;
-    opus_int32 Fs;
+    oac_int32 Fs;
     int channels;
 
 #define DREDENC_RESET_START input_buffer
@@ -59,7 +59,7 @@ typedef struct {
 } DREDEnc;
 
 int dred_encoder_load_model(DREDEnc* enc, const void *data, int len);
-void dred_encoder_init(DREDEnc* enc, opus_int32 Fs, int channels);
+void dred_encoder_init(DREDEnc* enc, oac_int32 Fs, int channels);
 void dred_encoder_reset(DREDEnc* enc);
 
 void dred_deinit_encoder(DREDEnc *enc);
diff --git a/dnn/dred_rdovae.h b/dnn/dred_rdovae.h
index 89ea39acf..0edbc54d4 100644
--- a/dnn/dred_rdovae.h
+++ b/dnn/dred_rdovae.h
@@ -30,7 +30,7 @@
 
 #include <stdlib.h>
 
-#include "opus_types.h"
+#include "oac_types.h"
 
 typedef struct RDOVAEDec RDOVAEDec;
 typedef struct RDOVAEEnc RDOVAEEnc;
diff --git a/dnn/dred_rdovae_dec.c b/dnn/dred_rdovae_dec.c
index 0c01a3bfc..b986f3bef 100644
--- a/dnn/dred_rdovae_dec.c
+++ b/dnn/dred_rdovae_dec.c
@@ -37,7 +37,7 @@ static void conv1_cond_init(float *mem, int len, int dilation, int *init)
 {
     if (!*init) {
         int i;
-        for (i=0;i<dilation;i++) OPUS_CLEAR(&mem[i*len], len);
+        for (i=0;i<dilation;i++) OAC_CLEAR(&mem[i*len], len);
     }
     *init = 1;
 }
@@ -71,15 +71,15 @@ void dred_rdovae_dec_init_states(
     int counter=0;
     compute_generic_dense(&model->dec_hidden_init, hidden, initial_state, ACTIVATION_TANH, arch);
     compute_generic_dense(&model->dec_gru_init, state_init, hidden, ACTIVATION_TANH, arch);
-    OPUS_COPY(h->gru1_state, state_init, DEC_GRU1_STATE_SIZE);
+    OAC_COPY(h->gru1_state, state_init, DEC_GRU1_STATE_SIZE);
     counter += DEC_GRU1_STATE_SIZE;
-    OPUS_COPY(h->gru2_state, &state_init[counter], DEC_GRU2_STATE_SIZE);
+    OAC_COPY(h->gru2_state, &state_init[counter], DEC_GRU2_STATE_SIZE);
     counter += DEC_GRU2_STATE_SIZE;
-    OPUS_COPY(h->gru3_state, &state_init[counter], DEC_GRU3_STATE_SIZE);
+    OAC_COPY(h->gru3_state, &state_init[counter], DEC_GRU3_STATE_SIZE);
     counter += DEC_GRU3_STATE_SIZE;
-    OPUS_COPY(h->gru4_state, &state_init[counter], DEC_GRU4_STATE_SIZE);
+    OAC_COPY(h->gru4_state, &state_init[counter], DEC_GRU4_STATE_SIZE);
     counter += DEC_GRU4_STATE_SIZE;
-    OPUS_COPY(h->gru5_state, &state_init[counter], DEC_GRU5_STATE_SIZE);
+    OAC_COPY(h->gru5_state, &state_init[counter], DEC_GRU5_STATE_SIZE);
     h->initialized = 0;
 }
 
diff --git a/dnn/dred_rdovae_enc.c b/dnn/dred_rdovae_enc.c
index 22b0f90f7..af49ad858 100644
--- a/dnn/dred_rdovae_enc.c
+++ b/dnn/dred_rdovae_enc.c
@@ -40,7 +40,7 @@ static void conv1_cond_init(float *mem, int len, int dilation, int *init)
 {
     if (!*init) {
         int i;
-        for (i=0;i<dilation;i++) OPUS_CLEAR(&mem[i*len], len);
+        for (i=0;i<dilation;i++) OAC_CLEAR(&mem[i*len], len);
     }
     *init = 1;
 }
@@ -67,7 +67,7 @@ void dred_rdovae_encode_dframe(
     output_index += ENC_DENSE1_OUT_SIZE;
 
     compute_generic_gru(&model->enc_gru1_input, &model->enc_gru1_recurrent, enc_state->gru1_state, buffer, arch);
-    OPUS_COPY(&buffer[output_index], enc_state->gru1_state, ENC_GRU1_OUT_SIZE);
+    OAC_COPY(&buffer[output_index], enc_state->gru1_state, ENC_GRU1_OUT_SIZE);
     output_index += ENC_GRU1_OUT_SIZE;
     conv1_cond_init(enc_state->conv1_state, ENC_CONV1_IN_SIZE, 1, &enc_state->initialized);
     compute_generic_dense(&model->enc_conv_dense1, conv_tmp, buffer, ACTIVATION_TANH, arch);
@@ -75,7 +75,7 @@ void dred_rdovae_encode_dframe(
     output_index += ENC_CONV1_OUT_SIZE;
 
     compute_generic_gru(&model->enc_gru2_input, &model->enc_gru2_recurrent, enc_state->gru2_state, buffer, arch);
-    OPUS_COPY(&buffer[output_index], enc_state->gru2_state, ENC_GRU2_OUT_SIZE);
+    OAC_COPY(&buffer[output_index], enc_state->gru2_state, ENC_GRU2_OUT_SIZE);
     output_index += ENC_GRU2_OUT_SIZE;
     conv1_cond_init(enc_state->conv2_state, ENC_CONV2_IN_SIZE, 2, &enc_state->initialized);
     compute_generic_dense(&model->enc_conv_dense2, conv_tmp, buffer, ACTIVATION_TANH, arch);
@@ -83,7 +83,7 @@ void dred_rdovae_encode_dframe(
     output_index += ENC_CONV2_OUT_SIZE;
 
     compute_generic_gru(&model->enc_gru3_input, &model->enc_gru3_recurrent, enc_state->gru3_state, buffer, arch);
-    OPUS_COPY(&buffer[output_index], enc_state->gru3_state, ENC_GRU3_OUT_SIZE);
+    OAC_COPY(&buffer[output_index], enc_state->gru3_state, ENC_GRU3_OUT_SIZE);
     output_index += ENC_GRU3_OUT_SIZE;
     conv1_cond_init(enc_state->conv3_state, ENC_CONV3_IN_SIZE, 2, &enc_state->initialized);
     compute_generic_dense(&model->enc_conv_dense3, conv_tmp, buffer, ACTIVATION_TANH, arch);
@@ -91,7 +91,7 @@ void dred_rdovae_encode_dframe(
     output_index += ENC_CONV3_OUT_SIZE;
 
     compute_generic_gru(&model->enc_gru4_input, &model->enc_gru4_recurrent, enc_state->gru4_state, buffer, arch);
-    OPUS_COPY(&buffer[output_index], enc_state->gru4_state, ENC_GRU4_OUT_SIZE);
+    OAC_COPY(&buffer[output_index], enc_state->gru4_state, ENC_GRU4_OUT_SIZE);
     output_index += ENC_GRU4_OUT_SIZE;
     conv1_cond_init(enc_state->conv4_state, ENC_CONV4_IN_SIZE, 2, &enc_state->initialized);
     compute_generic_dense(&model->enc_conv_dense4, conv_tmp, buffer, ACTIVATION_TANH, arch);
@@ -99,7 +99,7 @@ void dred_rdovae_encode_dframe(
     output_index += ENC_CONV4_OUT_SIZE;
 
     compute_generic_gru(&model->enc_gru5_input, &model->enc_gru5_recurrent, enc_state->gru5_state, buffer, arch);
-    OPUS_COPY(&buffer[output_index], enc_state->gru5_state, ENC_GRU5_OUT_SIZE);
+    OAC_COPY(&buffer[output_index], enc_state->gru5_state, ENC_GRU5_OUT_SIZE);
     output_index += ENC_GRU5_OUT_SIZE;
     conv1_cond_init(enc_state->conv5_state, ENC_CONV5_IN_SIZE, 2, &enc_state->initialized);
     compute_generic_dense(&model->enc_conv_dense5, conv_tmp, buffer, ACTIVATION_TANH, arch);
@@ -107,10 +107,10 @@ void dred_rdovae_encode_dframe(
     output_index += ENC_CONV5_OUT_SIZE;
 
     compute_generic_dense(&model->enc_zdense, padded_latents, buffer, ACTIVATION_LINEAR, arch);
-    OPUS_COPY(latents, padded_latents, DRED_LATENT_DIM);
+    OAC_COPY(latents, padded_latents, DRED_LATENT_DIM);
 
     /* next, calculate initial state */
     compute_generic_dense(&model->gdense1, state_hidden, buffer, ACTIVATION_TANH, arch);
     compute_generic_dense(&model->gdense2, padded_state, state_hidden, ACTIVATION_LINEAR, arch);
-    OPUS_COPY(initial_state, padded_state, DRED_STATE_DIM);
+    OAC_COPY(initial_state, padded_state, DRED_STATE_DIM);
 }
diff --git a/dnn/dump_data.c b/dnn/dump_data.c
index 6d1607ba1..5d987eb92 100644
--- a/dnn/dump_data.c
+++ b/dnn/dump_data.c
@@ -88,7 +88,7 @@ mini_kiss_fft_cpx *load_rir(const char *rir_file, mini_kiss_fft_state *fft, int
     for (i=0;i<240;i++) {
       rir[480+i] *= (1 - i/240.f);
     }
-    OPUS_CLEAR(&rir[240+480], RIR_MAX_DURATION-240-480);
+    OAC_CLEAR(&rir[240+480], RIR_MAX_DURATION-240-480);
   }
   for (i=0;i<len;i++) x[i].r = rir[i];
   mini_kiss_fft(fft, x, X);
@@ -138,7 +138,7 @@ void rir_filter_sequence(const struct rir_list *rirs, float *audio, int rir_id,
   i=0;
   while (i<SEQUENCE_SAMPLES) {
     int j;
-    OPUS_COPY(&x[0], &x[RIR_FFT_SIZE/2], RIR_FFT_SIZE/2);
+    OAC_COPY(&x[0], &x[RIR_FFT_SIZE/2], RIR_FFT_SIZE/2);
     for (j=0;j<IMIN(SEQUENCE_SAMPLES-i, RIR_FFT_SIZE/2);j++) x[RIR_FFT_SIZE/2+j].r = audio[i+j];
     for (;j<RIR_FFT_SIZE/2;j++) x[RIR_FFT_SIZE/2+j].r = 0;
     mini_kiss_fft(rirs->fft, x, X);
@@ -207,7 +207,7 @@ static void rand_resp(float *a, float *b) {
   rand_filt(b);
 }
 
-static opus_int16 float2short(float x)
+static oac_int16 float2short(float x)
 {
   int i;
   i = (int)floor(.5+x);
@@ -250,7 +250,7 @@ int main(int argc, char **argv) {
   FILE *f1, *f2=NULL;
   FILE *ffeat;
   FILE *fpcm=NULL;
-  opus_int16 pcm[FRAME_SIZE]={0};
+  oac_int16 pcm[FRAME_SIZE]={0};
   float speech_gain=1;
   LPCNetEncState *st;
   int training = -1;
@@ -265,7 +265,7 @@ int main(int argc, char **argv) {
   struct rir_list rirs;
 #endif
   srand(getpid());
-  arch = opus_select_arch();
+  arch = oac_select_arch();
   st = lpcnet_encoder_create();
   argv0=argv[0];
   if (argc == 5 && strcmp(argv[1], "-btrain")==0) {
@@ -401,13 +401,13 @@ int main(int argc, char **argv) {
       }
     }
 
-    OPUS_CLEAR(mem, 2);
+    OAC_CLEAR(mem, 2);
     biquad(x, mem, x, b_hp, a_hp, SEQUENCE_LENGTH*FRAME_SIZE);
-    OPUS_CLEAR(mem, 2);
+    OAC_CLEAR(mem, 2);
     biquad(x, mem, x, b_sig, a_sig, SEQUENCE_LENGTH*FRAME_SIZE);
-    OPUS_CLEAR(mem, 2);
+    OAC_CLEAR(mem, 2);
     biquad(n, mem, n, b_hp, a_hp, SEQUENCE_LENGTH*FRAME_SIZE);
-    OPUS_CLEAR(mem, 2);
+    OAC_CLEAR(mem, 2);
     biquad(n, mem, n, b_noise, a_noise, SEQUENCE_LENGTH*FRAME_SIZE);
 
     speech_rms = weighted_rms(x);
diff --git a/dnn/dump_lpcnet_tables.c b/dnn/dump_lpcnet_tables.c
index 95084d6e1..4b5e52fe0 100644
--- a/dnn/dump_lpcnet_tables.c
+++ b/dnn/dump_lpcnet_tables.c
@@ -50,11 +50,11 @@ int main(void) {
 
   fprintf(file, "#include \"kiss_fft.h\"\n\n");
 
-  kfft = opus_fft_alloc_twiddles(WINDOW_SIZE, NULL, NULL, NULL, 0);
+  kfft = oac_fft_alloc_twiddles(WINDOW_SIZE, NULL, NULL, NULL, 0);
 
   fprintf(file, "static const arch_fft_state arch_fft = {0, NULL};\n\n");
 
-  fprintf (file, "static const opus_int16 fft_bitrev[%d] = {\n", kfft->nfft);
+  fprintf (file, "static const oac_int16 fft_bitrev[%d] = {\n", kfft->nfft);
   for (i=0;i<kfft->nfft;i++)
     fprintf (file, "%d,%c", kfft->bitrev[i],(i+16)%15==0?'\n':' ');
   fprintf (file, "};\n\n");
diff --git a/dnn/fargan.c b/dnn/fargan.c
index c35b3f0c8..04cfd859c 100644
--- a/dnn/fargan.c
+++ b/dnn/fargan.c
@@ -50,8 +50,8 @@ static void compute_fargan_cond(FARGANState *st, float *cond, const float *featu
   celt_assert(FARGAN_FEATURES+COND_NET_PEMBED_OUT_SIZE == model->cond_net_fdense1.nb_inputs);
   celt_assert(COND_NET_FCONV1_IN_SIZE == model->cond_net_fdense1.nb_outputs);
   celt_assert(COND_NET_FCONV1_OUT_SIZE == model->cond_net_fconv1.nb_outputs);
-  OPUS_COPY(&dense_in[NB_FEATURES], &model->cond_net_pembed.float_weights[IMAX(0,IMIN(period-32, 223))*COND_NET_PEMBED_OUT_SIZE], COND_NET_PEMBED_OUT_SIZE);
-  OPUS_COPY(dense_in, features, NB_FEATURES);
+  OAC_COPY(&dense_in[NB_FEATURES], &model->cond_net_pembed.float_weights[IMAX(0,IMIN(period-32, 223))*COND_NET_PEMBED_OUT_SIZE], COND_NET_PEMBED_OUT_SIZE);
+  OAC_COPY(dense_in, features, NB_FEATURES);
 
   compute_generic_dense(&model->cond_net_fdense1, conv1_in, dense_in, ACTIVATION_TANH, st->arch);
   compute_generic_conv1d(&model->cond_net_fconv1, fdense2_in, st->cond_conv1_state, conv1_in, COND_NET_FCONV1_IN_SIZE, ACTIVATION_TANH, st->arch);
@@ -97,9 +97,9 @@ static void run_fargan_subframe(FARGANState *st, float *pcm, const float *cond,
   }
   for (i=0;i<FARGAN_SUBFRAME_SIZE;i++) prev[i] = MAX32(-1.f, MIN16(1.f, gain_1*st->pitch_buf[PITCH_MAX_PERIOD-FARGAN_SUBFRAME_SIZE+i]));
 
-  OPUS_COPY(&fwc0_in[0], &cond[0], FARGAN_COND_SIZE);
-  OPUS_COPY(&fwc0_in[FARGAN_COND_SIZE], pred, FARGAN_SUBFRAME_SIZE+4);
-  OPUS_COPY(&fwc0_in[FARGAN_COND_SIZE+FARGAN_SUBFRAME_SIZE+4], prev, FARGAN_SUBFRAME_SIZE);
+  OAC_COPY(&fwc0_in[0], &cond[0], FARGAN_COND_SIZE);
+  OAC_COPY(&fwc0_in[FARGAN_COND_SIZE], pred, FARGAN_SUBFRAME_SIZE+4);
+  OAC_COPY(&fwc0_in[FARGAN_COND_SIZE+FARGAN_SUBFRAME_SIZE+4], prev, FARGAN_SUBFRAME_SIZE);
 
   compute_generic_conv1d(&model->sig_net_fwc0_conv, gru1_in, st->fwc0_mem, fwc0_in, SIG_NET_INPUT_SIZE, ACTIVATION_TANH, st->arch);
   celt_assert(SIG_NET_FWC0_GLU_GATE_OUT_SIZE == model->sig_net_fwc0_glu_gate.nb_outputs);
@@ -108,25 +108,25 @@ static void run_fargan_subframe(FARGANState *st, float *pcm, const float *cond,
   compute_generic_dense(&model->sig_net_gain_dense_out, pitch_gate, gru1_in, ACTIVATION_SIGMOID, st->arch);
 
   for (i=0;i<FARGAN_SUBFRAME_SIZE;i++) gru1_in[SIG_NET_FWC0_GLU_GATE_OUT_SIZE+i] = pitch_gate[0]*pred[i+2];
-  OPUS_COPY(&gru1_in[SIG_NET_FWC0_GLU_GATE_OUT_SIZE+FARGAN_SUBFRAME_SIZE], prev, FARGAN_SUBFRAME_SIZE);
+  OAC_COPY(&gru1_in[SIG_NET_FWC0_GLU_GATE_OUT_SIZE+FARGAN_SUBFRAME_SIZE], prev, FARGAN_SUBFRAME_SIZE);
   compute_generic_gru(&model->sig_net_gru1_input, &model->sig_net_gru1_recurrent, st->gru1_state, gru1_in, st->arch);
   compute_glu(&model->sig_net_gru1_glu_gate, gru2_in, st->gru1_state, st->arch);
 
   for (i=0;i<FARGAN_SUBFRAME_SIZE;i++) gru2_in[SIG_NET_GRU1_OUT_SIZE+i] = pitch_gate[1]*pred[i+2];
-  OPUS_COPY(&gru2_in[SIG_NET_GRU1_OUT_SIZE+FARGAN_SUBFRAME_SIZE], prev, FARGAN_SUBFRAME_SIZE);
+  OAC_COPY(&gru2_in[SIG_NET_GRU1_OUT_SIZE+FARGAN_SUBFRAME_SIZE], prev, FARGAN_SUBFRAME_SIZE);
   compute_generic_gru(&model->sig_net_gru2_input, &model->sig_net_gru2_recurrent, st->gru2_state, gru2_in, st->arch);
   compute_glu(&model->sig_net_gru2_glu_gate, gru3_in, st->gru2_state, st->arch);
 
   for (i=0;i<FARGAN_SUBFRAME_SIZE;i++) gru3_in[SIG_NET_GRU2_OUT_SIZE+i] = pitch_gate[2]*pred[i+2];
-  OPUS_COPY(&gru3_in[SIG_NET_GRU2_OUT_SIZE+FARGAN_SUBFRAME_SIZE], prev, FARGAN_SUBFRAME_SIZE);
+  OAC_COPY(&gru3_in[SIG_NET_GRU2_OUT_SIZE+FARGAN_SUBFRAME_SIZE], prev, FARGAN_SUBFRAME_SIZE);
   compute_generic_gru(&model->sig_net_gru3_input, &model->sig_net_gru3_recurrent, st->gru3_state, gru3_in, st->arch);
   compute_glu(&model->sig_net_gru3_glu_gate, &skip_cat[SIG_NET_GRU1_OUT_SIZE+SIG_NET_GRU2_OUT_SIZE], st->gru3_state, st->arch);
 
-  OPUS_COPY(skip_cat, gru2_in, SIG_NET_GRU1_OUT_SIZE);
-  OPUS_COPY(&skip_cat[SIG_NET_GRU1_OUT_SIZE], gru3_in, SIG_NET_GRU2_OUT_SIZE);
-  OPUS_COPY(&skip_cat[SIG_NET_GRU1_OUT_SIZE+SIG_NET_GRU2_OUT_SIZE+SIG_NET_GRU3_OUT_SIZE], gru1_in, SIG_NET_FWC0_CONV_OUT_SIZE);
+  OAC_COPY(skip_cat, gru2_in, SIG_NET_GRU1_OUT_SIZE);
+  OAC_COPY(&skip_cat[SIG_NET_GRU1_OUT_SIZE], gru3_in, SIG_NET_GRU2_OUT_SIZE);
+  OAC_COPY(&skip_cat[SIG_NET_GRU1_OUT_SIZE+SIG_NET_GRU2_OUT_SIZE+SIG_NET_GRU3_OUT_SIZE], gru1_in, SIG_NET_FWC0_CONV_OUT_SIZE);
   for (i=0;i<FARGAN_SUBFRAME_SIZE;i++) skip_cat[SIG_NET_GRU1_OUT_SIZE+SIG_NET_GRU2_OUT_SIZE+SIG_NET_GRU3_OUT_SIZE+SIG_NET_FWC0_CONV_OUT_SIZE+i] = pitch_gate[3]*pred[i+2];
-  OPUS_COPY(&skip_cat[SIG_NET_GRU1_OUT_SIZE+SIG_NET_GRU2_OUT_SIZE+SIG_NET_GRU3_OUT_SIZE+SIG_NET_FWC0_CONV_OUT_SIZE+FARGAN_SUBFRAME_SIZE], prev, FARGAN_SUBFRAME_SIZE);
+  OAC_COPY(&skip_cat[SIG_NET_GRU1_OUT_SIZE+SIG_NET_GRU2_OUT_SIZE+SIG_NET_GRU3_OUT_SIZE+SIG_NET_FWC0_CONV_OUT_SIZE+FARGAN_SUBFRAME_SIZE], prev, FARGAN_SUBFRAME_SIZE);
 
   compute_generic_dense(&model->sig_net_skip_dense, skip_out, skip_cat, ACTIVATION_TANH, st->arch);
   compute_glu(&model->sig_net_skip_glu_gate, skip_out, skip_out, st->arch);
@@ -134,8 +134,8 @@ static void run_fargan_subframe(FARGANState *st, float *pcm, const float *cond,
   compute_generic_dense(&model->sig_net_sig_dense_out, pcm, skip_out, ACTIVATION_TANH, st->arch);
   for (i=0;i<FARGAN_SUBFRAME_SIZE;i++) pcm[i] *= gain;
 
-  OPUS_MOVE(st->pitch_buf, &st->pitch_buf[FARGAN_SUBFRAME_SIZE], PITCH_MAX_PERIOD-FARGAN_SUBFRAME_SIZE);
-  OPUS_COPY(&st->pitch_buf[PITCH_MAX_PERIOD-FARGAN_SUBFRAME_SIZE], pcm, FARGAN_SUBFRAME_SIZE);
+  OAC_MOVE(st->pitch_buf, &st->pitch_buf[FARGAN_SUBFRAME_SIZE], PITCH_MAX_PERIOD-FARGAN_SUBFRAME_SIZE);
+  OAC_COPY(&st->pitch_buf[PITCH_MAX_PERIOD-FARGAN_SUBFRAME_SIZE], pcm, FARGAN_SUBFRAME_SIZE);
   fargan_deemphasis(pcm, &st->deemph_mem);
 }
 
@@ -160,12 +160,12 @@ void fargan_cont(FARGANState *st, const float *pcm0, const float *features0)
     x0[i] = pcm0[i] - FARGAN_DEEMPHASIS*pcm0[i-1];
   }
 
-  OPUS_COPY(&st->pitch_buf[PITCH_MAX_PERIOD-FARGAN_FRAME_SIZE], x0, FARGAN_FRAME_SIZE);
+  OAC_COPY(&st->pitch_buf[PITCH_MAX_PERIOD-FARGAN_FRAME_SIZE], x0, FARGAN_FRAME_SIZE);
   st->cont_initialized = 1;
 
   for (i=0;i<FARGAN_NB_SUBFRAMES;i++) {
     run_fargan_subframe(st, dummy, &cond[i*FARGAN_COND_SIZE], st->last_period);
-    OPUS_COPY(&st->pitch_buf[PITCH_MAX_PERIOD-FARGAN_SUBFRAME_SIZE], &x0[FARGAN_FRAME_SIZE+i*FARGAN_SUBFRAME_SIZE], FARGAN_SUBFRAME_SIZE);
+    OAC_COPY(&st->pitch_buf[PITCH_MAX_PERIOD-FARGAN_SUBFRAME_SIZE], &x0[FARGAN_FRAME_SIZE+i*FARGAN_SUBFRAME_SIZE], FARGAN_SUBFRAME_SIZE);
   }
   st->deemph_mem = pcm0[FARGAN_CONT_SAMPLES-1];
 }
@@ -174,8 +174,8 @@ void fargan_cont(FARGANState *st, const float *pcm0, const float *features0)
 void fargan_init(FARGANState *st)
 {
   int ret;
-  OPUS_CLEAR(st, 1);
-  st->arch = opus_select_arch();
+  OAC_CLEAR(st, 1);
+  st->arch = oac_select_arch();
 #ifndef USE_WEIGHTS_FILE
   ret = init_fargan(&st->model, fargan_arrays);
 #else
@@ -189,7 +189,7 @@ int fargan_load_model(FARGANState *st, const void *data, int len) {
   int ret;
   parse_weights(&list, data, len);
   ret = init_fargan(&st->model, list);
-  opus_free(list);
+  oac_free(list);
   if (ret == 0) return 0;
   else return -1;
 }
@@ -216,7 +216,7 @@ void fargan_synthesize(FARGANState *st, float *pcm, const float *features)
   fargan_synthesize_impl(st, pcm, features);
 }
 
-void fargan_synthesize_int(FARGANState *st, opus_int16 *pcm, const float *features)
+void fargan_synthesize_int(FARGANState *st, oac_int16 *pcm, const float *features)
 {
   int i;
   float fpcm[FARGAN_FRAME_SIZE];
diff --git a/dnn/fargan.h b/dnn/fargan.h
index d44ae89be..bc1557282 100644
--- a/dnn/fargan.h
+++ b/dnn/fargan.h
@@ -62,7 +62,7 @@ int fargan_load_model(FARGANState *st, const void *data, int len);
 void fargan_cont(FARGANState *st, const float *pcm0, const float *features0);
 
 void fargan_synthesize(FARGANState *st, float *pcm, const float *features);
-void fargan_synthesize_int(FARGANState *st, opus_int16 *pcm, const float *features);
+void fargan_synthesize_int(FARGANState *st, oac_int16 *pcm, const float *features);
 
 
 #endif /* FARGAN_H */
diff --git a/dnn/fargan_demo.c b/dnn/fargan_demo.c
index fe61713aa..ddb2da31f 100644
--- a/dnn/fargan_demo.c
+++ b/dnn/fargan_demo.c
@@ -131,12 +131,12 @@ void usage(void) {
 }
 
 #ifdef ENABLE_DRED
-void dred_decode_latents(ec_dec *dec, float *x, const opus_uint8 *scale, const opus_uint8 *r, const opus_uint8 *p0, int dim);
+void dred_decode_latents(ec_dec *dec, float *x, const oac_uint8 *scale, const oac_uint8 *r, const oac_uint8 *p0, int dim);
 
-static opus_uint32 char_to_int(unsigned char ch[4])
+static oac_uint32 char_to_int(unsigned char ch[4])
 {
-    return ((opus_uint32)ch[0]<<24) | ((opus_uint32)ch[1]<<16)
-         | ((opus_uint32)ch[2]<< 8) |  (opus_uint32)ch[3];
+    return ((oac_uint32)ch[0]<<24) | ((oac_uint32)ch[1]<<16)
+         | ((oac_uint32)ch[2]<< 8) |  (oac_uint32)ch[3];
 }
 #endif
 
@@ -149,7 +149,7 @@ int main(int argc, char **argv) {
     void *data;
     const char *filename = "weights_blob.bin";
 #endif
-    arch = opus_select_arch();
+    arch = oac_select_arch();
     if (argc < 4) usage();
     if (strcmp(argv[1], "-features") == 0) mode=MODE_FEATURES;
     else if (strcmp(argv[1], "-fargan-synthesis") == 0) mode=MODE_FARGAN_SYNTHESIS;
@@ -182,7 +182,7 @@ int main(int argc, char **argv) {
         net = lpcnet_encoder_create();
         while (1) {
             float features[NB_TOTAL_FEATURES];
-            opus_int16 pcm[LPCNET_FRAME_SIZE];
+            oac_int16 pcm[LPCNET_FRAME_SIZE];
             size_t ret;
             ret = fread(pcm, sizeof(pcm[0]), LPCNET_FRAME_SIZE, fin);
             if (feof(fin) || ret != LPCNET_FRAME_SIZE) break;
@@ -204,18 +204,18 @@ int main(int argc, char **argv) {
         /* uncomment the following to align with Python code */
         ret = fread(&in_features[0], sizeof(in_features[0]), NB_FEATURES, fin);
         for (i=1;i<5;i++) {
-           OPUS_COPY(&in_features[i*NB_FEATURES], &in_features[0], NB_FEATURES);
+           OAC_COPY(&in_features[i*NB_FEATURES], &in_features[0], NB_FEATURES);
         }
         fargan_cont(&fargan, zeros, in_features);
         while (1) {
             float features[NB_FEATURES];
             float fpcm[LPCNET_FRAME_SIZE];
-            opus_int16 pcm[LPCNET_FRAME_SIZE];
+            oac_int16 pcm[LPCNET_FRAME_SIZE];
             ret = fread(in_features, sizeof(features[0]), NB_FEATURES, fin);
             if (stop || feof(fin) || ret != NB_FEATURES) {
                stop++;
             } else {
-               OPUS_COPY(features, in_features, NB_FEATURES);
+               OAC_COPY(features, in_features, NB_FEATURES);
             }
             fargan_synthesize(&fargan, fpcm, features);
             for (i=0;i<LPCNET_FRAME_SIZE;i++) pcm[i] = (int)floor(.5 + MIN32(32767, MAX32(-32767, 32768.f*fpcm[i])));
@@ -299,7 +299,7 @@ int main(int argc, char **argv) {
                     &latents[i*(DRED_LATENT_DIM+1)],
                     arch);
               for (k=0;k<4;k++) {
-                 OPUS_COPY(&features[(2*i-2+k)*DRED_NUM_FEATURES], &dec_tmp[(3-k)*DRED_NUM_FEATURES], DRED_NUM_FEATURES);
+                 OAC_COPY(&features[(2*i-2+k)*DRED_NUM_FEATURES], &dec_tmp[(3-k)*DRED_NUM_FEATURES], DRED_NUM_FEATURES);
               }
            }
            for (i=0;i<nb_chunks;i++) {
diff --git a/dnn/freq.c b/dnn/freq.c
index 32bc6aa35..9687f2784 100644
--- a/dnn/freq.c
+++ b/dnn/freq.c
@@ -42,7 +42,7 @@
 
 #define SQUARE(x) ((x)*(x))
 
-static const opus_int16 eband5ms[] = {
+static const oac_int16 eband5ms[] = {
 /*0  200 400 600 800  1k 1.2 1.4 1.6  2k 2.4 2.8 3.2  4k 4.8 5.6 6.8  8k*/
   0,  1,  2,  3,  4,  5,  6,  7,  8, 10, 12, 14, 16, 20, 24, 28, 34, 40
 };
@@ -79,23 +79,23 @@ static void compute_band_energy_inverse(float *bandE, const kiss_fft_cpx *X) {
 }
 
 static float lpcn_lpc(
-      opus_val16 *lpc, /* out: [0...p-1] LPC coefficients      */
-      opus_val16 *rc,
-const opus_val32 *ac,  /* in:  [0...p] autocorrelation values  */
+      oac_val16 *lpc, /* out: [0...p-1] LPC coefficients      */
+      oac_val16 *rc,
+const oac_val32 *ac,  /* in:  [0...p] autocorrelation values  */
 int          p
 )
 {
    int i, j;
-   opus_val32 r;
-   opus_val32 error = ac[0];
+   oac_val32 r;
+   oac_val32 error = ac[0];
 
-   OPUS_CLEAR(lpc, p);
-   OPUS_CLEAR(rc, p);
+   OAC_CLEAR(lpc, p);
+   OAC_CLEAR(rc, p);
    if (ac[0] != 0)
    {
       for (i = 0; i < p; i++) {
          /* Sum up this iteration's reflection coefficient */
-         opus_val32 rr = 0;
+         oac_val32 rr = 0;
          for (j = 0; j < i; j++)
             rr += MULT32_32_Q31(lpc[j],ac[i - j]);
          rr += SHR32(ac[i + 1],3);
@@ -105,7 +105,7 @@ int          p
          lpc[i] = SHR32(r,3);
          for (j = 0; j < (i+1)>>1; j++)
          {
-            opus_val32 tmp1, tmp2;
+            oac_val32 tmp1, tmp2;
             tmp1 = lpc[j];
             tmp2 = lpc[i-1-j];
             lpc[j]     = tmp1 + MULT32_32_Q31(r,tmp2);
@@ -164,7 +164,7 @@ static void compute_burg_cepstrum(const float *pcm, float *burg_cepstrum, int le
   for (i=0;i<len-1;i++) burg_in[i] = pcm[i+1] - PREEMPHASIS*pcm[i];
   g = silk_burg_analysis(burg_lpc, burg_in, 1e-3, len-1, 1, order);
   g /= len - 2*(order-1);
-  OPUS_CLEAR(x, WINDOW_SIZE);
+  OAC_CLEAR(x, WINDOW_SIZE);
   x[0] = 1;
   for (i=0;i<order;i++) x[i+1] = -burg_lpc[i]*pow(.995, i+1);
   forward_transform(LPC, x);
@@ -242,7 +242,7 @@ void forward_transform(kiss_fft_cpx *out, const float *in) {
     x[i].r = in[i];
     x[i].i = 0;
   }
-  opus_fft(&kfft, x, y, 0);
+  oac_fft(&kfft, x, y, 0);
   for (i=0;i<FREQ_SIZE;i++) {
     out[i] = y[i];
   }
@@ -259,7 +259,7 @@ static void inverse_transform(float *out, const kiss_fft_cpx *in) {
     x[i].r = x[WINDOW_SIZE - i].r;
     x[i].i = -x[WINDOW_SIZE - i].i;
   }
-  opus_fft(&kfft, x, y, 0);
+  oac_fft(&kfft, x, y, 0);
   /* output in reverse order for IFFT. */
   out[0] = WINDOW_SIZE*y[0].r;
   for (i=1;i<WINDOW_SIZE;i++) {
@@ -278,7 +278,7 @@ static float lpc_from_bands(float *lpc, const float *Ex)
    float x_auto[WINDOW_SIZE];
    interp_band_gain(Xr, Ex);
    Xr[FREQ_SIZE-1] = 0;
-   OPUS_CLEAR(X_auto, FREQ_SIZE);
+   OAC_CLEAR(X_auto, FREQ_SIZE);
    for (i=0;i<FREQ_SIZE;i++) X_auto[i].r = Xr[i];
    inverse_transform(x_auto, X_auto);
    for (i=0;i<LPC_ORDER+1;i++) ac[i] = x_auto[i];
@@ -307,7 +307,7 @@ float lpc_from_cepstrum(float *lpc, const float *cepstrum)
    int i;
    float Ex[NB_BANDS];
    float tmp[NB_BANDS];
-   OPUS_COPY(tmp, cepstrum, NB_BANDS);
+   OAC_COPY(tmp, cepstrum, NB_BANDS);
    tmp[0] += 4;
    idct(Ex, tmp);
    for (i=0;i<NB_BANDS;i++) Ex[i] = pow(10.f, Ex[i])*compensation[i];
diff --git a/dnn/fwgan.c b/dnn/fwgan.c
index 301c73f6b..e558478fa 100644
--- a/dnn/fwgan.c
+++ b/dnn/fwgan.c
@@ -163,7 +163,7 @@ void fwgan_cont(FWGANState *st, const float *pcm0, const float *features0)
   /* Process the first frame, discard the first subframe, and keep the rest for the first
      synthesis call. */
   fwgan_synthesize_impl(st, new_pcm, lpc, features0);
-  OPUS_COPY(st->pcm_buf, &new_pcm[SUBFRAME_SIZE], FWGAN_FRAME_SIZE-SUBFRAME_SIZE);
+  OAC_COPY(st->pcm_buf, &new_pcm[SUBFRAME_SIZE], FWGAN_FRAME_SIZE-SUBFRAME_SIZE);
 }
 
 static void apply_gain(float *pcm, float c0, float *last_gain) {
@@ -178,10 +178,10 @@ static void fwgan_lpc_syn(float *pcm, float *mem, const float *lpc, float last_l
   for (i=0;i<SUBFRAME_SIZE;i++) {
     int j;
     for (j=0;j<LPC_ORDER;j++) pcm[i] -= mem[j]*last_lpc[j];
-    OPUS_MOVE(&mem[1], &mem[0], LPC_ORDER-1);
+    OAC_MOVE(&mem[1], &mem[0], LPC_ORDER-1);
     mem[0] = pcm[i];
   }
-  OPUS_COPY(last_lpc, lpc, LPC_ORDER);
+  OAC_COPY(last_lpc, lpc, LPC_ORDER);
 }
 
 static void fwgan_preemphasis(float *pcm, float *preemph_mem) {
@@ -213,8 +213,8 @@ static void run_fwgan_subframe(FWGANState *st, float *pcm, const float *cond, do
 
   pitch_embeddings(pembed, st->embed_phase, w0);
   /* Interleave bfcc_cond and pembed for each subframe in feat_in. */
-  OPUS_COPY(&feat_in[BFCC_WITH_CORR_UPSAMPLER_FC_OUT_SIZE/4], &cond[0], BFCC_WITH_CORR_UPSAMPLER_FC_OUT_SIZE/4);
-  OPUS_COPY(&feat_in[0], &pembed[0], FWGAN_FRAME_SIZE/2);
+  OAC_COPY(&feat_in[BFCC_WITH_CORR_UPSAMPLER_FC_OUT_SIZE/4], &cond[0], BFCC_WITH_CORR_UPSAMPLER_FC_OUT_SIZE/4);
+  OAC_COPY(&feat_in[0], &pembed[0], FWGAN_FRAME_SIZE/2);
 
   compute_generic_conv1d(&model->feat_in_conv1_conv, rnn_in, st->cont_conv1_mem, feat_in, FEAT_IN_CONV1_CONV_IN_SIZE, ACTIVATION_LINEAR);
   celt_assert(FEAT_IN_NL1_GATE_OUT_SIZE == model->feat_in_nl1_gate.nb_outputs);
@@ -223,10 +223,10 @@ static void run_fwgan_subframe(FWGANState *st, float *pcm, const float *cond, do
   if (st->cont_initialized == 1) {
     /* On the very first subframe we stop here. We only want to run the feat_in layer since the
        others are initialized via the continuation network. */
-    OPUS_CLEAR(pcm, SUBFRAME_SIZE);
+    OAC_CLEAR(pcm, SUBFRAME_SIZE);
     st->cont_initialized = 2;
     apply_gain(pcm, c0, &st->last_gain);
-    OPUS_COPY(st->last_lpc, lpc, LPC_ORDER);
+    OAC_COPY(st->last_lpc, lpc, LPC_ORDER);
     return;
   }
 
@@ -264,7 +264,7 @@ static void run_fwgan_subframe(FWGANState *st, float *pcm, const float *cond, do
 void fwgan_init(FWGANState *st)
 {
   int ret;
-  OPUS_CLEAR(st, 1);
+  OAC_CLEAR(st, 1);
   ret = init_fwgan(&st->model, fwgan_arrays);
   celt_assert(ret == 0);
   /* FIXME: perform arch detection. */
@@ -275,7 +275,7 @@ int fwgan_load_model(FWGANState *st, const unsigned char *data, int len) {
   int ret;
   parse_weights(&list, data, len);
   ret = init_fwgan(&st->model, list);
-  opus_free(list);
+  oac_free(list);
   if (ret == 0) return 0;
   else return -1;
 }
@@ -288,7 +288,7 @@ static void fwgan_synthesize_impl(FWGANState *st, float *pcm, const float *lpc,
   int period;
   float fwgan_features[NB_FEATURES-1];
   celt_assert(st->cont_initialized);
-  OPUS_COPY(fwgan_features, features, NB_FEATURES-2);
+  OAC_COPY(fwgan_features, features, NB_FEATURES-2);
   fwgan_features[NB_FEATURES-2] = features[NB_FEATURES-1]+.5;
 
   period = (int)floor(.1 + 50*features[NB_BANDS]+100);
@@ -308,12 +308,12 @@ void fwgan_synthesize(FWGANState *st, float *pcm, const float *features)
   compute_wlpc(lpc, features);
   fwgan_synthesize_impl(st, new_pcm, lpc, features);
   /* Handle buffering. */
-  OPUS_COPY(pcm, st->pcm_buf, FWGAN_FRAME_SIZE-SUBFRAME_SIZE);
-  OPUS_COPY(&pcm[FWGAN_FRAME_SIZE-SUBFRAME_SIZE], new_pcm, SUBFRAME_SIZE);
-  OPUS_COPY(st->pcm_buf, &new_pcm[SUBFRAME_SIZE], FWGAN_FRAME_SIZE-SUBFRAME_SIZE);
+  OAC_COPY(pcm, st->pcm_buf, FWGAN_FRAME_SIZE-SUBFRAME_SIZE);
+  OAC_COPY(&pcm[FWGAN_FRAME_SIZE-SUBFRAME_SIZE], new_pcm, SUBFRAME_SIZE);
+  OAC_COPY(st->pcm_buf, &new_pcm[SUBFRAME_SIZE], FWGAN_FRAME_SIZE-SUBFRAME_SIZE);
 }
 
-void fwgan_synthesize_int(FWGANState *st, opus_int16 *pcm, const float *features)
+void fwgan_synthesize_int(FWGANState *st, oac_int16 *pcm, const float *features)
 {
   int i;
   float fpcm[FWGAN_FRAME_SIZE];
diff --git a/dnn/fwgan.h b/dnn/fwgan.h
index acb7014d7..6c6358a73 100644
--- a/dnn/fwgan.h
+++ b/dnn/fwgan.h
@@ -77,7 +77,7 @@ int fwgan_load_model(FWGANState *st, const unsigned char *data, int len);
 void fwgan_cont(FWGANState *st, const float *pcm0, const float *features0);
 
 void fwgan_synthesize(FWGANState *st, float *pcm, const float *features);
-void fwgan_synthesize_int(FWGANState *st, opus_int16 *pcm, const float *features);
+void fwgan_synthesize_int(FWGANState *st, oac_int16 *pcm, const float *features);
 
 
 #endif /* FWGAN_H */
diff --git a/dnn/lossgen.c b/dnn/lossgen.c
index 52b5029bb..e7292d0c1 100644
--- a/dnn/lossgen.c
+++ b/dnn/lossgen.c
@@ -24,7 +24,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-/* This packet loss simulator can be used independently of the Opus codebase.
+/* This packet loss simulator can be used independently of the Oac codebase.
    To do that, you need to compile the following files:
      dnn/lossgen.c
      dnn/lossgen_data.c
@@ -40,8 +40,8 @@
      celt/os_support.h
      celt/arch.h
      celt/x86/x86_arch_macros.h
-     include/opus_defines.h
-     include/opus_types.h
+     include/oac_defines.h
+     include/oac_types.h
 
    Additionally, the code in dnn/lossgen_demo.c can be used to generate losses from
    the command line.
@@ -156,7 +156,7 @@ int sample_loss(
 void lossgen_init(LossGenState *st)
 {
   int ret;
-  OPUS_CLEAR(st, 1);
+  OAC_CLEAR(st, 1);
   ret = init_lossgen(&st->model, lossgen_arrays);
   celt_assert(ret == 0);
   (void)ret;
@@ -167,7 +167,7 @@ int lossgen_load_model(LossGenState *st, const void *data, int len) {
   int ret;
   parse_weights(&list, data, len);
   ret = init_lossgen(&st->model, list);
-  opus_free(list);
+  oac_free(list);
   if (ret == 0) return 0;
   else return -1;
 }
diff --git a/dnn/lpcnet.c b/dnn/lpcnet.c
index 52e81b074..eed998453 100644
--- a/dnn/lpcnet.c
+++ b/dnn/lpcnet.c
@@ -60,7 +60,7 @@ void rc2lpc(float *lpc, const float *rc)
   int i, j, k;
   float tmp[LPC_ORDER];
   float ntmp[LPC_ORDER] = {0.0};
-  OPUS_COPY(tmp, rc, LPC_ORDER);
+  OAC_COPY(tmp, rc, LPC_ORDER);
   for(i = 0; i < LPC_ORDER ; i++)
     {
         for(j = 0; j <= i-1; j++)
@@ -94,15 +94,15 @@ void run_frame_network(LPCNetState *lpcnet, float *gru_a_condition, float *gru_b
     pitch = (int)floor(.1 + 50*features[NB_BANDS]+100);
     pitch = IMIN(255, IMAX(33, pitch));
     net = &lpcnet->nnet;
-    OPUS_COPY(in, features, NB_FEATURES);
+    OAC_COPY(in, features, NB_FEATURES);
     compute_embedding(&lpcnet->model.embed_pitch, &in[NB_FEATURES], pitch);
     compute_conv1d(&lpcnet->model.feature_conv1, conv1_out, net->feature_conv1_state, in);
-    if (lpcnet->frame_count < FEATURE_CONV1_DELAY) OPUS_CLEAR(conv1_out, FEATURE_CONV1_OUT_SIZE);
+    if (lpcnet->frame_count < FEATURE_CONV1_DELAY) OAC_CLEAR(conv1_out, FEATURE_CONV1_OUT_SIZE);
     compute_conv1d(&lpcnet->model.feature_conv2, conv2_out, net->feature_conv2_state, conv1_out);
-    if (lpcnet->frame_count < FEATURES_DELAY) OPUS_CLEAR(conv2_out, FEATURE_CONV2_OUT_SIZE);
+    if (lpcnet->frame_count < FEATURES_DELAY) OAC_CLEAR(conv2_out, FEATURE_CONV2_OUT_SIZE);
     _lpcnet_compute_dense(&lpcnet->model.feature_dense1, dense1_out, conv2_out);
     _lpcnet_compute_dense(&lpcnet->model.feature_dense2, condition, dense1_out);
-    OPUS_COPY(rc, condition, LPC_ORDER);
+    OAC_COPY(rc, condition, LPC_ORDER);
     _lpcnet_compute_dense(&lpcnet->model.gru_a_dense_feature, gru_a_condition, condition);
     _lpcnet_compute_dense(&lpcnet->model.gru_b_dense_feature, gru_b_condition, condition);
 #ifdef END2END
@@ -125,11 +125,11 @@ void run_frame_network_deferred(LPCNetState *lpcnet, const float *features)
     int max_buffer_size = lpcnet->model.feature_conv1.kernel_size + lpcnet->model.feature_conv2.kernel_size - 2;
     celt_assert(max_buffer_size <= MAX_FEATURE_BUFFER_SIZE);
     if (lpcnet->feature_buffer_fill == max_buffer_size) {
-        OPUS_MOVE(lpcnet->feature_buffer, &lpcnet->feature_buffer[NB_FEATURES],  (max_buffer_size-1)*NB_FEATURES);
+        OAC_MOVE(lpcnet->feature_buffer, &lpcnet->feature_buffer[NB_FEATURES],  (max_buffer_size-1)*NB_FEATURES);
     } else {
       lpcnet->feature_buffer_fill++;
     }
-    OPUS_COPY(&lpcnet->feature_buffer[(lpcnet->feature_buffer_fill-1)*NB_FEATURES], features, NB_FEATURES);
+    OAC_COPY(&lpcnet->feature_buffer[(lpcnet->feature_buffer_fill-1)*NB_FEATURES], features, NB_FEATURES);
 }
 
 void run_frame_network_flush(LPCNetState *lpcnet)
@@ -154,15 +154,15 @@ int run_sample_network(LPCNetState *lpcnet, const float *gru_a_condition, const
 #if 1
     compute_gru_a_input(gru_a_input, gru_a_condition, GRU_A_STATE_SIZE, &lpcnet->model.gru_a_embed_sig, last_sig, &lpcnet->model.gru_a_embed_pred, pred, &lpcnet->model.gru_a_embed_exc, last_exc);
 #else
-    OPUS_COPY(gru_a_input, gru_a_condition, 3*GRU_A_STATE_SIZE);
+    OAC_COPY(gru_a_input, gru_a_condition, 3*GRU_A_STATE_SIZE);
     accum_embedding(&lpcnet->model.gru_a_embed_sig, gru_a_input, last_sig);
     accum_embedding(&lpcnet->model.gru_a_embed_pred, gru_a_input, pred);
     accum_embedding(&lpcnet->model.gru_a_embed_exc, gru_a_input, last_exc);
 #endif
     /*compute_gru3(&gru_a, net->gru_a_state, gru_a_input);*/
     compute_sparse_gru(&lpcnet->model.sparse_gru_a, net->gru_a_state, gru_a_input);
-    OPUS_COPY(in_b, net->gru_a_state, GRU_A_STATE_SIZE);
-    OPUS_COPY(gru_b_input, gru_b_condition, 3*GRU_B_STATE_SIZE);
+    OAC_COPY(in_b, net->gru_a_state, GRU_A_STATE_SIZE);
+    OAC_COPY(gru_b_input, gru_b_condition, 3*GRU_B_STATE_SIZE);
     compute_gruB(&lpcnet->model.gru_b, gru_b_input, net->gru_b_state, in_b);
     return sample_mdense(&lpcnet->model.dual_fc, net->gru_b_state, sampling_logit_table, rng);
 }
@@ -175,7 +175,7 @@ int lpcnet_get_size()
 void lpcnet_reset(LPCNetState *lpcnet)
 {
     const char* rng_string="LPCNet";
-    OPUS_CLEAR((char*)&lpcnet->LPCNET_RESET_START,
+    OAC_CLEAR((char*)&lpcnet->LPCNET_RESET_START,
             sizeof(LPCNetState)-
             ((char*)&lpcnet->LPCNET_RESET_START - (char*)lpcnet));
     lpcnet->last_exc = lin2ulaw(0.f);
@@ -205,7 +205,7 @@ int lpcnet_load_model(LPCNetState *st, const unsigned char *data, int len) {
   int ret;
   parse_weights(&list, data, len);
   ret = init_lpcnet_model(&st->model, list);
-  opus_free(list);
+  oac_free(list);
   if (ret == 0) return 0;
   else return -1;
 }
@@ -214,33 +214,33 @@ int lpcnet_load_model(LPCNetState *st, const unsigned char *data, int len) {
 LPCNetState *lpcnet_create()
 {
     LPCNetState *lpcnet;
-    lpcnet = (LPCNetState *)opus_alloc(lpcnet_get_size(), 1);
-    OPUS_CLEAR(lpcnet, 1);
+    lpcnet = (LPCNetState *)oac_alloc(lpcnet_get_size(), 1);
+    OAC_CLEAR(lpcnet, 1);
     lpcnet_init(lpcnet);
     return lpcnet;
 }
 
 void lpcnet_destroy(LPCNetState *lpcnet)
 {
-    opus_free(lpcnet);
+    oac_free(lpcnet);
 }
 
 void lpcnet_reset_signal(LPCNetState *lpcnet)
 {
     lpcnet->deemph_mem = 0;
     lpcnet->last_exc = lin2ulaw(0.f);
-    OPUS_CLEAR(lpcnet->last_sig, LPC_ORDER);
-    OPUS_CLEAR(lpcnet->nnet.gru_a_state, GRU_A_STATE_SIZE);
-    OPUS_CLEAR(lpcnet->nnet.gru_b_state, GRU_B_STATE_SIZE);
+    OAC_CLEAR(lpcnet->last_sig, LPC_ORDER);
+    OAC_CLEAR(lpcnet->nnet.gru_a_state, GRU_A_STATE_SIZE);
+    OAC_CLEAR(lpcnet->nnet.gru_b_state, GRU_B_STATE_SIZE);
 }
 
-void lpcnet_synthesize_tail_impl(LPCNetState *lpcnet, opus_int16 *output, int N, int preload)
+void lpcnet_synthesize_tail_impl(LPCNetState *lpcnet, oac_int16 *output, int N, int preload)
 {
     int i;
 
     if (lpcnet->frame_count <= FEATURES_DELAY)
     {
-        OPUS_CLEAR(output, N);
+        OAC_CLEAR(output, N);
         return;
     }
     for (i=0;i<N;i++)
@@ -261,7 +261,7 @@ void lpcnet_synthesize_tail_impl(LPCNetState *lpcnet, opus_int16 *output, int N,
         } else {
           pcm = pred + ulaw2lin(exc);
         }
-        OPUS_MOVE(&lpcnet->last_sig[1], &lpcnet->last_sig[0], LPC_ORDER-1);
+        OAC_MOVE(&lpcnet->last_sig[1], &lpcnet->last_sig[0], LPC_ORDER-1);
         lpcnet->last_sig[0] = pcm;
         lpcnet->last_exc = exc;
         pcm += PREEMPH*lpcnet->deemph_mem;
@@ -272,12 +272,12 @@ void lpcnet_synthesize_tail_impl(LPCNetState *lpcnet, opus_int16 *output, int N,
     }
 }
 
-void lpcnet_synthesize_impl(LPCNetState *lpcnet, const float *features, opus_int16 *output, int N, int preload)
+void lpcnet_synthesize_impl(LPCNetState *lpcnet, const float *features, oac_int16 *output, int N, int preload)
 {
     run_frame_network(lpcnet, lpcnet->gru_a_condition, lpcnet->gru_b_condition, lpcnet->lpc, features);
     lpcnet_synthesize_tail_impl(lpcnet, output, N, preload);
 }
 
-void lpcnet_synthesize(LPCNetState *lpcnet, const float *features, opus_int16 *output, int N) {
+void lpcnet_synthesize(LPCNetState *lpcnet, const float *features, oac_int16 *output, int N) {
     lpcnet_synthesize_impl(lpcnet, features, output, N, 0);
 }
diff --git a/dnn/lpcnet.h b/dnn/lpcnet.h
index 4a9812466..0cbf13ec7 100644
--- a/dnn/lpcnet.h
+++ b/dnn/lpcnet.h
@@ -27,7 +27,7 @@
 #ifndef LPCNET_H_
 #define LPCNET_H_
 
-#include "opus_types.h"
+#include "oac_types.h"
 
 #define NB_FEATURES 20
 #define NB_TOTAL_FEATURES 36
@@ -73,10 +73,10 @@ void lpcnet_decoder_destroy(LPCNetDecState *st);
 /** Decodes a packet of LPCNET_COMPRESSED_SIZE bytes (currently 8) into LPCNET_PACKET_SAMPLES samples (currently 640).
   * @param [in] st <tt>LPCNetDecState*</tt>: Decoder state
   * @param [in] buf <tt>const unsigned char *</tt>: Compressed packet
-  * @param [out] pcm <tt>opus_int16 *</tt>: Decoded audio
+  * @param [out] pcm <tt>oac_int16 *</tt>: Decoded audio
   * @retval 0 Success
   */
-int lpcnet_decode(LPCNetDecState *st, const unsigned char *buf, opus_int16 *pcm);
+int lpcnet_decode(LPCNetDecState *st, const unsigned char *buf, oac_int16 *pcm);
 
 
 
@@ -108,19 +108,19 @@ void lpcnet_encoder_destroy(LPCNetEncState *st);
 
 /** Encodes LPCNET_PACKET_SAMPLES speech samples (currently 640) into a packet of LPCNET_COMPRESSED_SIZE bytes (currently 8).
   * @param [in] st <tt>LPCNetDecState*</tt>: Encoder state
-  * @param [in] pcm <tt>opus_int16 *</tt>: Input speech to be encoded
+  * @param [in] pcm <tt>oac_int16 *</tt>: Input speech to be encoded
   * @param [out] buf <tt>const unsigned char *</tt>: Compressed packet
   * @retval 0 Success
   */
-int lpcnet_encode(LPCNetEncState *st, const opus_int16 *pcm, unsigned char *buf);
+int lpcnet_encode(LPCNetEncState *st, const oac_int16 *pcm, unsigned char *buf);
 
 /** Compute features on LPCNET_FRAME_SIZE speech samples (currently 160) and output features for one 10-ms frame.
   * @param [in] st <tt>LPCNetDecState*</tt>: Encoder state
-  * @param [in] pcm <tt>opus_int16 *</tt>: Input speech to be analyzed
+  * @param [in] pcm <tt>oac_int16 *</tt>: Input speech to be analyzed
   * @param [out] features <tt>float[NB_TOTAL_FEATURES]</tt>: Four feature vectors
   * @retval 0 Success
   */
-int lpcnet_compute_single_frame_features(LPCNetEncState *st, const opus_int16 *pcm, float features[NB_TOTAL_FEATURES], int arch);
+int lpcnet_compute_single_frame_features(LPCNetEncState *st, const oac_int16 *pcm, float features[NB_TOTAL_FEATURES], int arch);
 
 
 /** Compute features on LPCNET_FRAME_SIZE speech samples (currently 160) and output features for one 10-ms frame.
@@ -158,20 +158,20 @@ void lpcnet_destroy(LPCNetState *st);
 /** Synthesizes speech from an LPCNet feature vector.
   * @param [in] st <tt>LPCNetState*</tt>: Synthesis state
   * @param [in] features <tt>const float *</tt>: Compressed packet
-  * @param [out] output <tt>opus_int16 **</tt>: Synthesized speech
+  * @param [out] output <tt>oac_int16 **</tt>: Synthesized speech
   * @param [in] N <tt>int</tt>: Number of samples to generate
   * @retval 0 Success
   */
-void lpcnet_synthesize(LPCNetState *st, const float *features, opus_int16 *output, int N);
+void lpcnet_synthesize(LPCNetState *st, const float *features, oac_int16 *output, int N);
 
 
 
 int lpcnet_plc_init(LPCNetPLCState *st);
 void lpcnet_plc_reset(LPCNetPLCState *st);
 
-int lpcnet_plc_update(LPCNetPLCState *st, opus_int16 *pcm);
+int lpcnet_plc_update(LPCNetPLCState *st, oac_int16 *pcm);
 
-int lpcnet_plc_conceal(LPCNetPLCState *st, opus_int16 *pcm);
+int lpcnet_plc_conceal(LPCNetPLCState *st, oac_int16 *pcm);
 
 void lpcnet_plc_fec_add(LPCNetPLCState *st, const float *features);
 
diff --git a/dnn/lpcnet_enc.c b/dnn/lpcnet_enc.c
index 1acd1bf62..862f2a081 100644
--- a/dnn/lpcnet_enc.c
+++ b/dnn/lpcnet_enc.c
@@ -62,20 +62,20 @@ int lpcnet_encoder_load_model(LPCNetEncState *st, const void *data, int len) {
 
 LPCNetEncState *lpcnet_encoder_create(void) {
   LPCNetEncState *st;
-  st = (LPCNetEncState*)opus_alloc(lpcnet_encoder_get_size());
+  st = (LPCNetEncState*)oac_alloc(lpcnet_encoder_get_size());
   lpcnet_encoder_init(st);
   return st;
 }
 
 void lpcnet_encoder_destroy(LPCNetEncState *st) {
-  opus_free(st);
+  oac_free(st);
 }
 
 static void frame_analysis(LPCNetEncState *st, kiss_fft_cpx *X, float *Ex, const float *in) {
   float x[WINDOW_SIZE];
-  OPUS_COPY(x, st->analysis_mem, OVERLAP_SIZE);
-  OPUS_COPY(&x[OVERLAP_SIZE], in, FRAME_SIZE);
-  OPUS_COPY(st->analysis_mem, &in[FRAME_SIZE-OVERLAP_SIZE], OVERLAP_SIZE);
+  OAC_COPY(x, st->analysis_mem, OVERLAP_SIZE);
+  OAC_COPY(&x[OVERLAP_SIZE], in, FRAME_SIZE);
+  OAC_COPY(st->analysis_mem, &in[FRAME_SIZE-OVERLAP_SIZE], OVERLAP_SIZE);
   apply_window(x);
   forward_transform(X, x);
   lpcn_compute_band_energy(Ex, X);
@@ -124,7 +124,7 @@ void compute_frame_features(LPCNetEncState *st, const float *in, int arch) {
   /* [b,a]=ellip(2, 2, 20, 1200/8000); */
   static const float lp_b[2] = {-0.84946f, 1.f};
   static const float lp_a[2] = {-1.54220f, 0.70781f};
-  OPUS_COPY(aligned_in, &st->analysis_mem[OVERLAP_SIZE-TRAINING_OFFSET], TRAINING_OFFSET);
+  OAC_COPY(aligned_in, &st->analysis_mem[OVERLAP_SIZE-TRAINING_OFFSET], TRAINING_OFFSET);
   frame_analysis(st, X, Ex, in);
   st->if_features[0] = MAX16(-1.f, MIN16(1.f, (1.f/64)*(10.f*celt_log10(1e-15f + X[0].r*X[0].r)-6.f)));
   for (i=1;i<PITCH_IF_MAX_FREQ;i++) {
@@ -137,7 +137,7 @@ void compute_frame_features(LPCNetEncState *st, const float *in, int arch) {
     st->if_features[3*i-1] = prod.i;
     st->if_features[3*i] = MAX16(-1.f, MIN16(1.f, (1.f/64)*(10.f*celt_log10(1e-15f + X[i].r*X[i].r + X[i].i*X[i].i)-6.f)));
   }
-  OPUS_COPY(st->prev_if, X, PITCH_IF_MAX_FREQ);
+  OAC_COPY(st->prev_if, X, PITCH_IF_MAX_FREQ);
   /*for (i=0;i<88;i++) printf("%f ", st->if_features[i]);printf("\n");*/
   logMax = -2;
   follow = -2;
@@ -151,12 +151,12 @@ void compute_frame_features(LPCNetEncState *st, const float *in, int arch) {
   st->features[0] -= 4;
   lpc_from_cepstrum(st->lpc, st->features);
   for (i=0;i<LPC_ORDER;i++) st->features[NB_BANDS+2+i] = st->lpc[i];
-  OPUS_MOVE(st->exc_buf, &st->exc_buf[FRAME_SIZE], PITCH_MAX_PERIOD);
-  OPUS_MOVE(st->lp_buf, &st->lp_buf[FRAME_SIZE], PITCH_MAX_PERIOD);
-  OPUS_COPY(&aligned_in[TRAINING_OFFSET], in, FRAME_SIZE-TRAINING_OFFSET);
-  OPUS_COPY(&x[0], st->pitch_mem, LPC_ORDER);
-  OPUS_COPY(&x[LPC_ORDER], aligned_in, FRAME_SIZE);
-  OPUS_COPY(st->pitch_mem, &aligned_in[FRAME_SIZE-LPC_ORDER], LPC_ORDER);
+  OAC_MOVE(st->exc_buf, &st->exc_buf[FRAME_SIZE], PITCH_MAX_PERIOD);
+  OAC_MOVE(st->lp_buf, &st->lp_buf[FRAME_SIZE], PITCH_MAX_PERIOD);
+  OAC_COPY(&aligned_in[TRAINING_OFFSET], in, FRAME_SIZE-TRAINING_OFFSET);
+  OAC_COPY(&x[0], st->pitch_mem, LPC_ORDER);
+  OAC_COPY(&x[LPC_ORDER], aligned_in, FRAME_SIZE);
+  OAC_COPY(st->pitch_mem, &aligned_in[FRAME_SIZE-LPC_ORDER], LPC_ORDER);
   celt_fir(&x[LPC_ORDER], st->lpc, &st->lp_buf[PITCH_MAX_PERIOD], FRAME_SIZE, LPC_ORDER, arch);
   for (i=0;i<FRAME_SIZE;i++) {
     st->exc_buf[PITCH_MAX_PERIOD+i] = st->lp_buf[PITCH_MAX_PERIOD+i] + .7f*st->pitch_filt;
@@ -209,11 +209,11 @@ void preemphasis(float *y, float *mem, const float *x, float coef, int N) {
 static int lpcnet_compute_single_frame_features_impl(LPCNetEncState *st, float *x, float features[NB_TOTAL_FEATURES], int arch) {
   preemphasis(x, &st->mem_preemph, x, PREEMPHASIS, FRAME_SIZE);
   compute_frame_features(st, x, arch);
-  OPUS_COPY(features, &st->features[0], NB_TOTAL_FEATURES);
+  OAC_COPY(features, &st->features[0], NB_TOTAL_FEATURES);
   return 0;
 }
 
-int lpcnet_compute_single_frame_features(LPCNetEncState *st, const opus_int16 *pcm, float features[NB_TOTAL_FEATURES], int arch) {
+int lpcnet_compute_single_frame_features(LPCNetEncState *st, const oac_int16 *pcm, float features[NB_TOTAL_FEATURES], int arch) {
   int i;
   float x[FRAME_SIZE];
   for (i=0;i<FRAME_SIZE;i++) x[i] = pcm[i];
diff --git a/dnn/lpcnet_plc.c b/dnn/lpcnet_plc.c
index 1445ce4c1..39afaa097 100644
--- a/dnn/lpcnet_plc.c
+++ b/dnn/lpcnet_plc.c
@@ -43,11 +43,11 @@
 #define PLC_SKIP_UPDATES
 
 void lpcnet_plc_reset(LPCNetPLCState *st) {
-  OPUS_CLEAR((char*)&st->LPCNET_PLC_RESET_START,
+  OAC_CLEAR((char*)&st->LPCNET_PLC_RESET_START,
           sizeof(LPCNetPLCState)-
           ((char*)&st->LPCNET_PLC_RESET_START - (char*)st));
   lpcnet_encoder_init(&st->enc);
-  OPUS_CLEAR(st->pcm, PLC_BUF_SIZE);
+  OAC_CLEAR(st->pcm, PLC_BUF_SIZE);
   st->blend = 0;
   st->loss_count = 0;
   st->analysis_gap = 1;
@@ -57,7 +57,7 @@ void lpcnet_plc_reset(LPCNetPLCState *st) {
 
 int lpcnet_plc_init(LPCNetPLCState *st) {
   int ret;
-  st->arch = opus_select_arch();
+  st->arch = oac_select_arch();
   fargan_init(&st->fargan);
   lpcnet_encoder_init(&st->enc);
   st->loaded = 0;
@@ -77,7 +77,7 @@ int lpcnet_plc_load_model(LPCNetPLCState *st, const void *data, int len) {
   int ret;
   parse_weights(&list, data, len);
   ret = init_plcmodel(&st->model, list);
-  opus_free(list);
+  oac_free(list);
   if (ret == 0) {
     ret = lpcnet_encoder_load_model(&st->enc, data, len);
   }
@@ -94,7 +94,7 @@ void lpcnet_plc_fec_add(LPCNetPLCState *st, const float *features) {
     return;
   }
   celt_assert(st->fec_fill_pos < PLC_MAX_FEC);
-  OPUS_COPY(&st->fec[st->fec_fill_pos][0], features, NB_FEATURES);
+  OAC_COPY(&st->fec[st->fec_fill_pos][0], features, NB_FEATURES);
   st->fec_fill_pos++;
 }
 
@@ -118,10 +118,10 @@ static int get_fec_or_pred(LPCNetPLCState *st, float *out) {
   if (st->fec_read_pos != st->fec_fill_pos && st->fec_skip==0) {
     float plc_features[2*NB_BANDS+NB_FEATURES+1] = {0};
     float discard[NB_FEATURES];
-    OPUS_COPY(out, &st->fec[st->fec_read_pos][0], NB_FEATURES);
+    OAC_COPY(out, &st->fec[st->fec_read_pos][0], NB_FEATURES);
     st->fec_read_pos++;
     /* Update PLC state using FEC, so without Burg features. */
-    OPUS_COPY(&plc_features[2*NB_BANDS], out, NB_FEATURES);
+    OAC_COPY(&plc_features[2*NB_BANDS], out, NB_FEATURES);
     plc_features[2*NB_BANDS+NB_FEATURES] = -1;
     compute_plc_pred(st, discard, plc_features);
     return 1;
@@ -134,19 +134,19 @@ static int get_fec_or_pred(LPCNetPLCState *st, float *out) {
 }
 
 static void queue_features(LPCNetPLCState *st, const float *features) {
-  OPUS_MOVE(&st->cont_features[0], &st->cont_features[NB_FEATURES], (CONT_VECTORS-1)*NB_FEATURES);
-  OPUS_COPY(&st->cont_features[(CONT_VECTORS-1)*NB_FEATURES], features, NB_FEATURES);
+  OAC_MOVE(&st->cont_features[0], &st->cont_features[NB_FEATURES], (CONT_VECTORS-1)*NB_FEATURES);
+  OAC_COPY(&st->cont_features[(CONT_VECTORS-1)*NB_FEATURES], features, NB_FEATURES);
 }
 
 /* In this causal version of the code, the DNN model implemented by compute_plc_pred()
    needs to generate two feature vectors to conceal the first lost packet.*/
 
-int lpcnet_plc_update(LPCNetPLCState *st, opus_int16 *pcm) {
+int lpcnet_plc_update(LPCNetPLCState *st, oac_int16 *pcm) {
   int i;
   if (st->analysis_pos - FRAME_SIZE >= 0) st->analysis_pos -= FRAME_SIZE;
   else st->analysis_gap = 1;
   if (st->predict_pos - FRAME_SIZE >= 0) st->predict_pos -= FRAME_SIZE;
-  OPUS_MOVE(st->pcm, &st->pcm[FRAME_SIZE], PLC_BUF_SIZE-FRAME_SIZE);
+  OAC_MOVE(st->pcm, &st->pcm[FRAME_SIZE], PLC_BUF_SIZE-FRAME_SIZE);
   for (i=0;i<FRAME_SIZE;i++) st->pcm[PLC_BUF_SIZE-FRAME_SIZE+i] = (1.f/32768.f)*pcm[i];
   st->loss_count = 0;
   st->blend = 0;
@@ -154,7 +154,7 @@ int lpcnet_plc_update(LPCNetPLCState *st, opus_int16 *pcm) {
 }
 
 static const float att_table[10] = {0, 0,  -.2, -.2,  -.4, -.4,  -.8, -.8, -1.6, -1.6};
-int lpcnet_plc_conceal(LPCNetPLCState *st, opus_int16 *pcm) {
+int lpcnet_plc_conceal(LPCNetPLCState *st, oac_int16 *pcm) {
   int i;
   celt_assert(st->loaded);
   if (st->blend == 0) {
@@ -169,7 +169,7 @@ int lpcnet_plc_conceal(LPCNetPLCState *st, opus_int16 *pcm) {
       lpcnet_compute_single_frame_features_float(&st->enc, x, st->features, st->arch);
       if ((!st->analysis_gap || count>0) && st->analysis_pos >= st->predict_pos) {
         queue_features(st, st->features);
-        OPUS_COPY(&plc_features[2*NB_BANDS], st->features, NB_FEATURES);
+        OAC_COPY(&plc_features[2*NB_BANDS], st->features, NB_FEATURES);
         plc_features[2*NB_BANDS+NB_FEATURES] = 1;
         st->plc_bak[0] = st->plc_bak[1];
         st->plc_bak[1] = st->plc_net;
@@ -200,7 +200,7 @@ int lpcnet_plc_conceal(LPCNetPLCState *st, opus_int16 *pcm) {
   if (st->analysis_pos - FRAME_SIZE >= 0) st->analysis_pos -= FRAME_SIZE;
   else st->analysis_gap = 1;
   st->predict_pos = PLC_BUF_SIZE;
-  OPUS_MOVE(st->pcm, &st->pcm[FRAME_SIZE], PLC_BUF_SIZE-FRAME_SIZE);
+  OAC_MOVE(st->pcm, &st->pcm[FRAME_SIZE], PLC_BUF_SIZE-FRAME_SIZE);
   for (i=0;i<FRAME_SIZE;i++) st->pcm[PLC_BUF_SIZE-FRAME_SIZE+i] = (1.f/32768.f)*pcm[i];
   st->blend = 1;
   return 0;
diff --git a/dnn/lpcnet_private.h b/dnn/lpcnet_private.h
index 69ba12bd0..904162e9c 100644
--- a/dnn/lpcnet_private.h
+++ b/dnn/lpcnet_private.h
@@ -81,9 +81,9 @@ void run_frame_network_deferred(LPCNetState *lpcnet, const float *features);
 void run_frame_network_flush(LPCNetState *lpcnet);
 
 
-void lpcnet_synthesize_tail_impl(LPCNetState *lpcnet, opus_int16 *output, int N, int preload);
-void lpcnet_synthesize_impl(LPCNetState *lpcnet, const float *features, opus_int16 *output, int N, int preload);
-void lpcnet_synthesize_blend_impl(LPCNetState *lpcnet, const opus_int16 *pcm_in, opus_int16 *output, int N);
+void lpcnet_synthesize_tail_impl(LPCNetState *lpcnet, oac_int16 *output, int N, int preload);
+void lpcnet_synthesize_impl(LPCNetState *lpcnet, const float *features, oac_int16 *output, int N, int preload);
+void lpcnet_synthesize_blend_impl(LPCNetState *lpcnet, const oac_int16 *pcm_in, oac_int16 *output, int N);
 
 void run_frame_network(LPCNetState *lpcnet, float *gru_a_condition, float *gru_b_condition, float *lpc, const float *features);
 
diff --git a/dnn/lpcnet_tables.c b/dnn/lpcnet_tables.c
index 71ab37834..32b08a975 100644
--- a/dnn/lpcnet_tables.c
+++ b/dnn/lpcnet_tables.c
@@ -8,7 +8,7 @@
 
 static const arch_fft_state arch_fft = {0, NULL};
 
-static const opus_int16 fft_bitrev[320] = {
+static const oac_int16 fft_bitrev[320] = {
 0, 64, 128, 192, 256, 16, 80, 144, 208, 272, 32, 96, 160, 224, 288,
 48, 112, 176, 240, 304, 4, 68, 132, 196, 260, 20, 84, 148, 212, 276,
 36, 100, 164, 228, 292, 52, 116, 180, 244, 308, 8, 72, 136, 200, 264,
diff --git a/dnn/meson.build b/dnn/meson.build
index 7b324016c..af89db3d6 100644
--- a/dnn/meson.build
+++ b/dnn/meson.build
@@ -17,15 +17,15 @@ dnn_sources_avx2 = sources['DNN_SOURCES_AVX2']
 dnn_sources_neon_intr = sources['DNN_SOURCES_NEON']
 dnn_sources_dotprod_intr = sources['DNN_SOURCES_DOTPROD']
 
-dnn_includes = [opus_includes]
+dnn_includes = [oac_includes]
 dnn_static_libs = []
 
-if host_cpu_family in ['x86', 'x86_64'] and opus_conf.has('OPUS_HAVE_RTCD')
+if host_cpu_family in ['x86', 'x86_64'] and oac_conf.has('OAC_HAVE_RTCD')
   dnn_sources +=  sources['DNN_SOURCES_X86_RTCD']
 endif
 
 if host_cpu_family in ['arm', 'aarch64'] and have_arm_intrinsics_or_asm
-  if opus_conf.has('OPUS_HAVE_RTCD')
+  if oac_conf.has('OAC_HAVE_RTCD')
     dnn_sources +=  sources['DNN_SOURCES_ARM_RTCD']
   endif
 endif
@@ -38,7 +38,7 @@ foreach intr_name : ['sse2', 'sse4_1', 'avx2', 'neon_intr', 'dotprod_intr']
 
   intr_sources = get_variable('dnn_sources_' + intr_name)
 
-  intr_args = get_variable('opus_@0@_args'.format(intr_name), [])
+  intr_args = get_variable('oac_@0@_args'.format(intr_name), [])
   dnn_static_libs += static_library('dnn_' + intr_name, intr_sources,
       c_args: intr_args,
       include_directories: dnn_includes,
@@ -52,7 +52,7 @@ endif
 
 
 if opt_deep_plc.enabled()
- dnn_lib = static_library('opus-dnn',
+ dnn_lib = static_library('oac-dnn',
   dnn_sources,
   c_args: dnn_c_args,
   include_directories: dnn_includes,
diff --git a/dnn/nndsp.c b/dnn/nndsp.c
index 9d1d2765b..86a711959 100644
--- a/dnn/nndsp.c
+++ b/dnn/nndsp.c
@@ -47,17 +47,17 @@
 
 void init_adaconv_state(AdaConvState *hAdaConv)
 {
-    OPUS_CLEAR(hAdaConv, 1);
+    OAC_CLEAR(hAdaConv, 1);
 }
 
 void init_adacomb_state(AdaCombState *hAdaComb)
 {
-    OPUS_CLEAR(hAdaComb, 1);
+    OAC_CLEAR(hAdaComb, 1);
 }
 
 void init_adashape_state(AdaShapeState *hAdaShape)
 {
-    OPUS_CLEAR(hAdaShape, 1);
+    OAC_CLEAR(hAdaShape, 1);
 }
 
 void compute_overlap_window(float *window, int overlap_size)
@@ -168,9 +168,9 @@ void adaconv_process_frame(
     celt_assert(left_padding == kernel_size - 1); /* currently only supports causal version. Non-causal version not difficult to implement but will require third loop */
     celt_assert(kernel_size < frame_size);
 
-    OPUS_CLEAR(output_buffer, ADACONV_MAX_FRAME_SIZE * ADACONV_MAX_OUTPUT_CHANNELS);
-    OPUS_CLEAR(kernel_buffer, ADACONV_MAX_KERNEL_SIZE * ADACONV_MAX_INPUT_CHANNELS * ADACONV_MAX_OUTPUT_CHANNELS);
-    OPUS_CLEAR(input_buffer, ADACONV_MAX_INPUT_CHANNELS * (ADACONV_MAX_FRAME_SIZE + ADACONV_MAX_KERNEL_SIZE));
+    OAC_CLEAR(output_buffer, ADACONV_MAX_FRAME_SIZE * ADACONV_MAX_OUTPUT_CHANNELS);
+    OAC_CLEAR(kernel_buffer, ADACONV_MAX_KERNEL_SIZE * ADACONV_MAX_INPUT_CHANNELS * ADACONV_MAX_OUTPUT_CHANNELS);
+    OAC_CLEAR(input_buffer, ADACONV_MAX_INPUT_CHANNELS * (ADACONV_MAX_FRAME_SIZE + ADACONV_MAX_KERNEL_SIZE));
 
 #ifdef DEBUG_NNDSP
     print_float_vector("x_in", x_in, in_channels * frame_size);
@@ -179,8 +179,8 @@ void adaconv_process_frame(
     /* prepare input */
     for (i_in_channels=0; i_in_channels < in_channels; i_in_channels ++)
     {
-        OPUS_COPY(input_buffer + i_in_channels * (kernel_size + frame_size), hAdaConv->history + i_in_channels * kernel_size, kernel_size);
-        OPUS_COPY(input_buffer + kernel_size + i_in_channels * (kernel_size + frame_size), x_in + frame_size * i_in_channels, frame_size);
+        OAC_COPY(input_buffer + i_in_channels * (kernel_size + frame_size), hAdaConv->history + i_in_channels * kernel_size, kernel_size);
+        OAC_COPY(input_buffer + kernel_size + i_in_channels * (kernel_size + frame_size), x_in + frame_size * i_in_channels, frame_size);
     }
     p_input = input_buffer + kernel_size;
 
@@ -207,11 +207,11 @@ void adaconv_process_frame(
     {
         for (i_in_channels = 0; i_in_channels < in_channels; i_in_channels++)
         {
-            OPUS_CLEAR(kernel0, ADACONV_MAX_KERNEL_SIZE);
-            OPUS_CLEAR(kernel1, ADACONV_MAX_KERNEL_SIZE);
+            OAC_CLEAR(kernel0, ADACONV_MAX_KERNEL_SIZE);
+            OAC_CLEAR(kernel1, ADACONV_MAX_KERNEL_SIZE);
 
-            OPUS_COPY(kernel0, hAdaConv->last_kernel + KERNEL_INDEX(i_out_channels, i_in_channels, 0), kernel_size);
-            OPUS_COPY(kernel1, kernel_buffer + KERNEL_INDEX(i_out_channels, i_in_channels, 0), kernel_size);
+            OAC_COPY(kernel0, hAdaConv->last_kernel + KERNEL_INDEX(i_out_channels, i_in_channels, 0), kernel_size);
+            OAC_COPY(kernel1, kernel_buffer + KERNEL_INDEX(i_out_channels, i_in_channels, 0), kernel_size);
             celt_pitch_xcorr(kernel0, p_input + i_in_channels * (frame_size + kernel_size) - left_padding, channel_buffer0, ADACONV_MAX_KERNEL_SIZE, overlap_size, arch);
             celt_pitch_xcorr(kernel1, p_input + i_in_channels * (frame_size + kernel_size) - left_padding, channel_buffer1, ADACONV_MAX_KERNEL_SIZE, frame_size, arch);
             for (i_sample = 0; i_sample < overlap_size; i_sample++)
@@ -226,7 +226,7 @@ void adaconv_process_frame(
         }
     }
 
-    OPUS_COPY(x_out, output_buffer, out_channels * frame_size);
+    OAC_COPY(x_out, output_buffer, out_channels * frame_size);
 
 #ifdef DEBUG_NNDSP
     print_float_vector("x_out", x_out, out_channels * frame_size);
@@ -235,9 +235,9 @@ void adaconv_process_frame(
     /* buffer update */
     for (i_in_channels=0; i_in_channels < in_channels; i_in_channels ++)
     {
-        OPUS_COPY(hAdaConv->history + i_in_channels * kernel_size, p_input + i_in_channels * (frame_size + kernel_size) + frame_size - kernel_size, kernel_size);
+        OAC_COPY(hAdaConv->history + i_in_channels * kernel_size, p_input + i_in_channels * (frame_size + kernel_size) + frame_size - kernel_size, kernel_size);
     }
-    OPUS_COPY(hAdaConv->last_kernel, kernel_buffer, kernel_size * in_channels * out_channels);
+    OAC_COPY(hAdaConv->last_kernel, kernel_buffer, kernel_size * in_channels * out_channels);
 }
 
 void adacomb_process_frame(
@@ -273,12 +273,12 @@ void adacomb_process_frame(
 
     (void) feature_dim; /* ToDo: figure out whether we might need this information */
 
-    OPUS_CLEAR(output_buffer, ADACOMB_MAX_FRAME_SIZE);
-    OPUS_CLEAR(kernel_buffer, ADACOMB_MAX_KERNEL_SIZE);
-    OPUS_CLEAR(input_buffer, ADACOMB_MAX_FRAME_SIZE + ADACOMB_MAX_LAG + ADACOMB_MAX_KERNEL_SIZE);
+    OAC_CLEAR(output_buffer, ADACOMB_MAX_FRAME_SIZE);
+    OAC_CLEAR(kernel_buffer, ADACOMB_MAX_KERNEL_SIZE);
+    OAC_CLEAR(input_buffer, ADACOMB_MAX_FRAME_SIZE + ADACOMB_MAX_LAG + ADACOMB_MAX_KERNEL_SIZE);
 
-    OPUS_COPY(input_buffer, hAdaComb->history, kernel_size + ADACOMB_MAX_LAG);
-    OPUS_COPY(input_buffer + kernel_size + ADACOMB_MAX_LAG, x_in, frame_size);
+    OAC_COPY(input_buffer, hAdaComb->history, kernel_size + ADACOMB_MAX_LAG);
+    OAC_COPY(input_buffer + kernel_size + ADACOMB_MAX_LAG, x_in, frame_size);
     p_input = input_buffer + kernel_size + ADACOMB_MAX_LAG;
 
     /* calculate new kernel and new gain */
@@ -300,10 +300,10 @@ void adacomb_process_frame(
     print_float_vector("adacomb_gain", &gain, 1);
 #endif
 
-    OPUS_CLEAR(kernel, ADACOMB_MAX_KERNEL_SIZE);
-    OPUS_CLEAR(last_kernel, ADACOMB_MAX_KERNEL_SIZE);
-    OPUS_COPY(kernel, kernel_buffer, kernel_size);
-    OPUS_COPY(last_kernel, hAdaComb->last_kernel, kernel_size);
+    OAC_CLEAR(kernel, ADACOMB_MAX_KERNEL_SIZE);
+    OAC_CLEAR(last_kernel, ADACOMB_MAX_KERNEL_SIZE);
+    OAC_COPY(kernel, kernel_buffer, kernel_size);
+    OAC_COPY(last_kernel, hAdaComb->last_kernel, kernel_size);
 
     celt_pitch_xcorr(last_kernel, &p_input[- left_padding - hAdaComb->last_pitch_lag], output_buffer_last, ADACOMB_MAX_KERNEL_SIZE, overlap_size, arch);
 
@@ -322,15 +322,15 @@ void adacomb_process_frame(
     {
       output_buffer[i_sample] = global_gain * (output_buffer[i_sample] + p_input[i_sample]);
     }
-    OPUS_COPY(x_out, output_buffer, frame_size);
+    OAC_COPY(x_out, output_buffer, frame_size);
 
 #ifdef DEBUG_NNDSP
     print_float_vector("x_out", x_out, frame_size);
 #endif
 
     /* buffer update */
-    OPUS_COPY(hAdaComb->last_kernel, kernel_buffer, kernel_size);
-    OPUS_COPY(hAdaComb->history, p_input + frame_size - kernel_size - ADACOMB_MAX_LAG, kernel_size + ADACOMB_MAX_LAG);
+    OAC_COPY(hAdaComb->last_kernel, kernel_buffer, kernel_size);
+    OAC_COPY(hAdaComb->history, p_input + frame_size - kernel_size - ADACOMB_MAX_LAG, kernel_size + ADACOMB_MAX_LAG);
     hAdaComb->last_pitch_lag = pitch_lag;
     hAdaComb->last_global_gain = global_gain;
 }
@@ -367,9 +367,9 @@ void adashape_process_frame(
 
     tenv_size = frame_size / avg_pool_k;
     tenv = in_buffer + feature_dim;
-    OPUS_CLEAR(tenv, tenv_size + 1);
+    OAC_CLEAR(tenv, tenv_size + 1);
 
-    OPUS_COPY(in_buffer, features, feature_dim);
+    OAC_COPY(in_buffer, features, feature_dim);
 
     /* calculate temporal envelope */
     mean = 0;
diff --git a/dnn/nndsp.h b/dnn/nndsp.h
index 1bce70d10..6bb85a4c3 100644
--- a/dnn/nndsp.h
+++ b/dnn/nndsp.h
@@ -28,7 +28,7 @@
 #ifndef NNDSP_H
 #define NNDSP_H
 
-#include "opus_types.h"
+#include "oac_types.h"
 #include "nnet.h"
 #include <string.h>
 
diff --git a/dnn/nnet.c b/dnn/nnet.c
index eab08d219..88f8a0369 100644
--- a/dnn/nnet.c
+++ b/dnn/nnet.c
@@ -32,7 +32,7 @@
 
 #include <stdlib.h>
 #include <math.h>
-#include "opus_types.h"
+#include "oac_types.h"
 #include "arch.h"
 #include "nnet.h"
 #include "dred_rdovae_constants.h"
@@ -126,11 +126,11 @@ void compute_generic_conv1d(const LinearLayer *layer, float *output, float *mem,
    float tmp[MAX_CONV_INPUTS_ALL];
    celt_assert(input != output);
    celt_assert(layer->nb_inputs <= MAX_CONV_INPUTS_ALL);
-   if (layer->nb_inputs!=input_size) OPUS_COPY(tmp, mem, layer->nb_inputs-input_size);
-   OPUS_COPY(&tmp[layer->nb_inputs-input_size], input, input_size);
+   if (layer->nb_inputs!=input_size) OAC_COPY(tmp, mem, layer->nb_inputs-input_size);
+   OAC_COPY(&tmp[layer->nb_inputs-input_size], input, input_size);
    compute_linear(layer, output, tmp, arch);
    compute_activation(output, output, layer->nb_outputs, activation, arch);
-   if (layer->nb_inputs!=input_size) OPUS_COPY(mem, &tmp[input_size], layer->nb_inputs-input_size);
+   if (layer->nb_inputs!=input_size) OAC_COPY(mem, &tmp[input_size], layer->nb_inputs-input_size);
 }
 
 void compute_generic_conv1d_dilation(const LinearLayer *layer, float *output, float *mem, const float *input, int input_size, int dilation, int activation, int arch)
@@ -140,14 +140,14 @@ void compute_generic_conv1d_dilation(const LinearLayer *layer, float *output, fl
    int i;
    celt_assert(input != output);
    celt_assert(layer->nb_inputs <= MAX_CONV_INPUTS_ALL);
-   if (dilation==1) OPUS_COPY(tmp, mem, layer->nb_inputs-input_size);
-   else for (i=0;i<ksize-1;i++) OPUS_COPY(&tmp[i*input_size], &mem[i*input_size*dilation], input_size);
-   OPUS_COPY(&tmp[layer->nb_inputs-input_size], input, input_size);
+   if (dilation==1) OAC_COPY(tmp, mem, layer->nb_inputs-input_size);
+   else for (i=0;i<ksize-1;i++) OAC_COPY(&tmp[i*input_size], &mem[i*input_size*dilation], input_size);
+   OAC_COPY(&tmp[layer->nb_inputs-input_size], input, input_size);
    compute_linear(layer, output, tmp, arch);
    compute_activation(output, output, layer->nb_outputs, activation, arch);
-   if (dilation==1) OPUS_COPY(mem, &tmp[input_size], layer->nb_inputs-input_size);
+   if (dilation==1) OAC_COPY(mem, &tmp[input_size], layer->nb_inputs-input_size);
    else {
-     OPUS_COPY(mem, &mem[input_size], input_size*dilation*(ksize-1)-input_size);
-     OPUS_COPY(&mem[input_size*dilation*(ksize-1)-input_size], input, input_size);
+     OAC_COPY(mem, &mem[input_size], input_size*dilation*(ksize-1)-input_size);
+     OAC_COPY(&mem[input_size*dilation*(ksize-1)-input_size], input, input_size);
    }
 }
diff --git a/dnn/nnet.h b/dnn/nnet.h
index 8a44170b1..680871b90 100644
--- a/dnn/nnet.h
+++ b/dnn/nnet.h
@@ -29,7 +29,7 @@
 #define NNET_H_
 
 #include <stddef.h>
-#include "opus_types.h"
+#include "oac_types.h"
 
 #define ACTIVATION_LINEAR  0
 #define ACTIVATION_SIGMOID 1
@@ -66,7 +66,7 @@ typedef struct {
 typedef struct {
   const float *bias;
   const float *subias;
-  const opus_int8 *weights;
+  const oac_int8 *weights;
   const float *float_weights;
   const int *weights_idx;
   const float *diag;
@@ -134,11 +134,11 @@ void compute_activation_c(float *output, const float *input, int N, int activati
 void compute_conv2d_c(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride, int activation);
 
 
-#if defined(OPUS_ARM_MAY_HAVE_DOTPROD) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+#if defined(OAC_ARM_MAY_HAVE_DOTPROD) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 #include "arm/dnn_arm.h"
 #endif
 
-#if defined(OPUS_X86_MAY_HAVE_SSE2)
+#if defined(OAC_X86_MAY_HAVE_SSE2)
 #include "x86/dnn_x86.h"
 #endif
 
@@ -154,7 +154,7 @@ void compute_conv2d_c(const Conv2dLayer *conv, float *out, float *mem, const flo
 #define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch),compute_conv2d_c(conv, out, mem, in, height, hstride, activation))
 #endif
 
-#if defined(__x86_64__) && !defined(OPUS_X86_MAY_HAVE_SSE4_1) && !defined(OPUS_X86_MAY_HAVE_AVX2) &&!defined(SUPPRESS_PERF_WARNINGS)
+#if defined(__x86_64__) && !defined(OAC_X86_MAY_HAVE_SSE4_1) && !defined(OAC_X86_MAY_HAVE_AVX2) &&!defined(SUPPRESS_PERF_WARNINGS)
 #if defined(_MSC_VER)
 #pragma message ("Only SSE and SSE2 are available. On newer machines, enable SSSE3/AVX/AVX2 to get better performance")
 #else
diff --git a/dnn/nnet_arch.h b/dnn/nnet_arch.h
index a855250ad..a2a40c3b0 100644
--- a/dnn/nnet_arch.h
+++ b/dnn/nnet_arch.h
@@ -40,7 +40,7 @@
 
 /* Force vectorization on for DNN code because some of the loops rely on
    compiler vectorization rather than explicitly using intrinsics. */
-#if OPUS_GNUC_PREREQ(5,1)
+#if OAC_GNUC_PREREQ(5,1)
 #define GCC_POP_OPTIONS
 #pragma GCC push_options
 #pragma GCC optimize("tree-vectorize")
@@ -49,7 +49,7 @@
 
 #define MAX_ACTIVATIONS (4096)
 
-static OPUS_INLINE void vec_swish(float *y, const float *x, int N)
+static OAC_INLINE void vec_swish(float *y, const float *x, int N)
 {
    int i;
    float tmp[MAX_ACTIVATIONS];
@@ -59,7 +59,7 @@ static OPUS_INLINE void vec_swish(float *y, const float *x, int N)
       y[i] = x[i]*tmp[i];
 }
 
-static OPUS_INLINE float relu(float x)
+static OAC_INLINE float relu(float x)
 {
    return x < 0 ? 0 : x;
 }
@@ -94,7 +94,7 @@ void RTCD_SUF(compute_activation_)(float *output, const float *input, int N, int
          output[i] = relu(input[i]);
    } else if (activation == ACTIVATION_SOFTMAX) {
 #ifdef SOFTMAX_HACK
-      OPUS_COPY(output, input, N);
+      OAC_COPY(output, input, N);
       /*for (i=0;i<N;i++)
          output[i] = input[i];*/
 #else
@@ -138,7 +138,7 @@ void RTCD_SUF(compute_linear_) (const LinearLayer *linear, float *out, const flo
      bias = linear->subias;
 #endif
    }
-   else OPUS_CLEAR(out, N);
+   else OAC_CLEAR(out, N);
    if (bias != NULL) {
       for (i=0;i<N;i++) out[i] += bias[i];
    }
@@ -165,7 +165,7 @@ static void conv2d_float(float *out, const float *weights, int in_channels, int
    in_stride = height+kheight-1;
    for (i=0;i<out_channels;i++) {
       int m;
-      OPUS_CLEAR(&out[i*hstride], height);
+      OAC_CLEAR(&out[i*hstride], height);
       for (m=0;m<in_channels;m++) {
          int t;
          for (t=0;t<ktime;t++) {
@@ -193,7 +193,7 @@ static void conv2d_3x3_float(float *out, const float *weights, int in_channels,
    in_stride = height+kheight-1;
    for (i=0;i<out_channels;i++) {
       int m;
-      OPUS_CLEAR(&out[i*hstride], height);
+      OAC_CLEAR(&out[i*hstride], height);
       for (m=0;m<in_channels;m++) {
          int j;
          for (j=0;j<height;j++) {
@@ -223,9 +223,9 @@ void RTCD_SUF(compute_conv2d_)(const Conv2dLayer *conv, float *out, float *mem,
    celt_assert(in != out);
    time_stride = conv->in_channels*(height+conv->kheight-1);
    celt_assert(conv->ktime*time_stride <= MAX_CONV2D_INPUTS);
-   OPUS_COPY(in_buf, mem, (conv->ktime-1)*time_stride);
-   OPUS_COPY(&in_buf[(conv->ktime-1)*time_stride], in, time_stride);
-   OPUS_COPY(mem, &in_buf[time_stride], (conv->ktime-1)*time_stride);
+   OAC_COPY(in_buf, mem, (conv->ktime-1)*time_stride);
+   OAC_COPY(&in_buf[(conv->ktime-1)*time_stride], in, time_stride);
+   OAC_COPY(mem, &in_buf[time_stride], (conv->ktime-1)*time_stride);
    bias = conv->bias;
    if (conv->kheight == 3 && conv->ktime == 3)
      conv2d_3x3_float(out, conv->float_weights, conv->in_channels, conv->out_channels, in_buf, height, hstride);
diff --git a/dnn/osce.c b/dnn/osce.c
index 5f2752cab..56a9a3adb 100644
--- a/dnn/osce.c
+++ b/dnn/osce.c
@@ -68,7 +68,7 @@ static void print_int_array(FILE *fid, const char  *name, const int *array, int
     }
 }
 
-static void print_int8_array(FILE *fid, const char  *name, const opus_int8 *array, int n)
+static void print_int8_array(FILE *fid, const char  *name, const oac_int8 *array, int n)
 {
     int i;
     for (i = 0; i < n; i++)
@@ -141,7 +141,7 @@ static void compute_lace_numbits_embedding(float *emb, float numbits, int dim, f
 static int init_lace(LACE *hLACE, const WeightArray *weights)
 {
     int ret = 0;
-    OPUS_CLEAR(hLACE, 1);
+    OAC_CLEAR(hLACE, 1);
     celt_assert(weights != NULL);
 
     ret = init_lacelayers(&hLACE->layers, weights);
@@ -153,7 +153,7 @@ static int init_lace(LACE *hLACE, const WeightArray *weights)
 
 static void reset_lace_state(LACEState *state)
 {
-    OPUS_CLEAR(state, 1);
+    OAC_CLEAR(state, 1);
 
     init_adacomb_state(&state->cf1_state);
     init_adacomb_state(&state->cf2_state);
@@ -183,9 +183,9 @@ static void lace_feature_net(
     /* scaling and dimensionality reduction */
     for (i_subframe = 0; i_subframe < 4; i_subframe ++)
     {
-        OPUS_COPY(input_buffer, features + i_subframe * LACE_NUM_FEATURES, LACE_NUM_FEATURES);
-        OPUS_COPY(input_buffer + LACE_NUM_FEATURES, hLACE->layers.lace_pitch_embedding.float_weights + periods[i_subframe] * LACE_PITCH_EMBEDDING_DIM, LACE_PITCH_EMBEDDING_DIM);
-        OPUS_COPY(input_buffer + LACE_NUM_FEATURES + LACE_PITCH_EMBEDDING_DIM, numbits_embedded, 2 * LACE_NUMBITS_EMBEDDING_DIM);
+        OAC_COPY(input_buffer, features + i_subframe * LACE_NUM_FEATURES, LACE_NUM_FEATURES);
+        OAC_COPY(input_buffer + LACE_NUM_FEATURES, hLACE->layers.lace_pitch_embedding.float_weights + periods[i_subframe] * LACE_PITCH_EMBEDDING_DIM, LACE_PITCH_EMBEDDING_DIM);
+        OAC_COPY(input_buffer + LACE_NUM_FEATURES + LACE_PITCH_EMBEDDING_DIM, numbits_embedded, 2 * LACE_NUMBITS_EMBEDDING_DIM);
 
         compute_generic_conv1d(
             &hLACE->layers.lace_fnet_conv1,
@@ -198,7 +198,7 @@ static void lace_feature_net(
     }
 
     /* subframe accumulation */
-    OPUS_COPY(input_buffer, output_buffer, 4 * LACE_HIDDEN_FEATURE_DIM);
+    OAC_COPY(input_buffer, output_buffer, 4 * LACE_HIDDEN_FEATURE_DIM);
     compute_generic_conv1d(
         &hLACE->layers.lace_fnet_conv2,
         output_buffer,
@@ -210,7 +210,7 @@ static void lace_feature_net(
     );
 
     /* tconv upsampling */
-    OPUS_COPY(input_buffer, output_buffer, 4 * LACE_COND_DIM);
+    OAC_COPY(input_buffer, output_buffer, 4 * LACE_COND_DIM);
     compute_generic_dense(
         &hLACE->layers.lace_fnet_tconv,
         output_buffer,
@@ -220,7 +220,7 @@ static void lace_feature_net(
     );
 
     /* GRU */
-    OPUS_COPY(input_buffer, output_buffer, 4 * LACE_COND_DIM);
+    OAC_COPY(input_buffer, output_buffer, 4 * LACE_COND_DIM);
     for (i_subframe = 0; i_subframe < 4; i_subframe++)
     {
         compute_generic_gru(
@@ -230,7 +230,7 @@ static void lace_feature_net(
             input_buffer + i_subframe * LACE_COND_DIM,
             arch
         );
-        OPUS_COPY(output + i_subframe * LACE_COND_DIM, state->feature_net_gru_state, LACE_COND_DIM);
+        OAC_COPY(output + i_subframe * LACE_COND_DIM, state->feature_net_gru_state, LACE_COND_DIM);
     }
 }
 
@@ -406,7 +406,7 @@ static void compute_nolace_numbits_embedding(float *emb, float numbits, int dim,
 static int init_nolace(NoLACE *hNoLACE, const WeightArray *weights)
 {
     int ret = 0;
-    OPUS_CLEAR(hNoLACE, 1);
+    OAC_CLEAR(hNoLACE, 1);
     celt_assert(weights != NULL);
 
     ret = init_nolacelayers(&hNoLACE->layers, weights);
@@ -418,7 +418,7 @@ static int init_nolace(NoLACE *hNoLACE, const WeightArray *weights)
 
 static void reset_nolace_state(NoLACEState *state)
 {
-    OPUS_CLEAR(state, 1);
+    OAC_CLEAR(state, 1);
 
     init_adacomb_state(&state->cf1_state);
     init_adacomb_state(&state->cf2_state);
@@ -454,9 +454,9 @@ static void nolace_feature_net(
     /* scaling and dimensionality reduction */
     for (i_subframe = 0; i_subframe < 4; i_subframe ++)
     {
-        OPUS_COPY(input_buffer, features + i_subframe * NOLACE_NUM_FEATURES, NOLACE_NUM_FEATURES);
-        OPUS_COPY(input_buffer + NOLACE_NUM_FEATURES, hNoLACE->layers.nolace_pitch_embedding.float_weights + periods[i_subframe] * NOLACE_PITCH_EMBEDDING_DIM, NOLACE_PITCH_EMBEDDING_DIM);
-        OPUS_COPY(input_buffer + NOLACE_NUM_FEATURES + NOLACE_PITCH_EMBEDDING_DIM, numbits_embedded, 2 * NOLACE_NUMBITS_EMBEDDING_DIM);
+        OAC_COPY(input_buffer, features + i_subframe * NOLACE_NUM_FEATURES, NOLACE_NUM_FEATURES);
+        OAC_COPY(input_buffer + NOLACE_NUM_FEATURES, hNoLACE->layers.nolace_pitch_embedding.float_weights + periods[i_subframe] * NOLACE_PITCH_EMBEDDING_DIM, NOLACE_PITCH_EMBEDDING_DIM);
+        OAC_COPY(input_buffer + NOLACE_NUM_FEATURES + NOLACE_PITCH_EMBEDDING_DIM, numbits_embedded, 2 * NOLACE_NUMBITS_EMBEDDING_DIM);
 
         compute_generic_conv1d(
             &hNoLACE->layers.nolace_fnet_conv1,
@@ -469,7 +469,7 @@ static void nolace_feature_net(
     }
 
     /* subframe accumulation */
-    OPUS_COPY(input_buffer, output_buffer, 4 * NOLACE_HIDDEN_FEATURE_DIM);
+    OAC_COPY(input_buffer, output_buffer, 4 * NOLACE_HIDDEN_FEATURE_DIM);
     compute_generic_conv1d(
         &hNoLACE->layers.nolace_fnet_conv2,
         output_buffer,
@@ -481,7 +481,7 @@ static void nolace_feature_net(
     );
 
     /* tconv upsampling */
-    OPUS_COPY(input_buffer, output_buffer, 4 * NOLACE_COND_DIM);
+    OAC_COPY(input_buffer, output_buffer, 4 * NOLACE_COND_DIM);
     compute_generic_dense(
         &hNoLACE->layers.nolace_fnet_tconv,
         output_buffer,
@@ -491,7 +491,7 @@ static void nolace_feature_net(
     );
 
     /* GRU */
-    OPUS_COPY(input_buffer, output_buffer, 4 * NOLACE_COND_DIM);
+    OAC_COPY(input_buffer, output_buffer, 4 * NOLACE_COND_DIM);
     for (i_subframe = 0; i_subframe < 4; i_subframe++)
     {
         compute_generic_gru(
@@ -501,7 +501,7 @@ static void nolace_feature_net(
             input_buffer + i_subframe * NOLACE_COND_DIM,
             arch
         );
-        OPUS_COPY(output + i_subframe * NOLACE_COND_DIM, state->feature_net_gru_state, NOLACE_COND_DIM);
+        OAC_COPY(output + i_subframe * NOLACE_COND_DIM, state->feature_net_gru_state, NOLACE_COND_DIM);
     }
 }
 
@@ -596,7 +596,7 @@ static void nolace_process_20ms_frame(
     }
 
     /* update feature buffer */
-    OPUS_COPY(feature_buffer, feature_transform_buffer, 4 * NOLACE_COND_DIM);
+    OAC_COPY(feature_buffer, feature_transform_buffer, 4 * NOLACE_COND_DIM);
 
 #ifdef DEBUG_NOLACE
     fwrite(x_buffer1, sizeof(float), 4 * NOLACE_FRAME_SIZE, f_postcf1);
@@ -637,7 +637,7 @@ static void nolace_process_20ms_frame(
     }
 
     /* update feature buffer */
-    OPUS_COPY(feature_buffer, feature_transform_buffer, 4 * NOLACE_COND_DIM);
+    OAC_COPY(feature_buffer, feature_transform_buffer, 4 * NOLACE_COND_DIM);
 
 #ifdef DEBUG_NOLACE
     fwrite(x_buffer1, sizeof(float), 4 * NOLACE_FRAME_SIZE, f_postcf2);
@@ -677,7 +677,7 @@ static void nolace_process_20ms_frame(
     }
 
     /* update feature buffer */
-    OPUS_COPY(feature_buffer, feature_transform_buffer, 4 * NOLACE_COND_DIM);
+    OAC_COPY(feature_buffer, feature_transform_buffer, 4 * NOLACE_COND_DIM);
 
 #ifdef DEBUG_NOLACE
     fwrite(x_buffer2, sizeof(float), 4 * NOLACE_FRAME_SIZE * NOLACE_AF1_OUT_CHANNELS, f_postaf1);
@@ -734,7 +734,7 @@ static void nolace_process_20ms_frame(
     }
 
     /* update feature buffer */
-    OPUS_COPY(feature_buffer, feature_transform_buffer, 4 * NOLACE_COND_DIM);
+    OAC_COPY(feature_buffer, feature_transform_buffer, 4 * NOLACE_COND_DIM);
 
 #ifdef DEBUG_NOLACE
     fwrite(x_buffer1, sizeof(float), 4 * NOLACE_FRAME_SIZE * NOLACE_AF2_OUT_CHANNELS, f_postaf2);
@@ -791,7 +791,7 @@ static void nolace_process_20ms_frame(
     }
 
     /* update feature buffer */
-    OPUS_COPY(feature_buffer, feature_transform_buffer, 4 * NOLACE_COND_DIM);
+    OAC_COPY(feature_buffer, feature_transform_buffer, 4 * NOLACE_COND_DIM);
 
     /* third shape-mix round */
     for (i_subframe = 0; i_subframe < 4; i_subframe++)
@@ -899,7 +899,7 @@ static void bbwe_feature_net(
         fwrite(output_buffer + i_frame * BBWENET_FNET_CONV1_OUT_SIZE, sizeof(float), BBWENET_FNET_CONV1_OUT_SIZE, f_conv1);
 #endif
     }
-    OPUS_COPY(input_buffer, output_buffer, num_frames * BBWENET_FNET_CONV1_OUT_SIZE);
+    OAC_COPY(input_buffer, output_buffer, num_frames * BBWENET_FNET_CONV1_OUT_SIZE);
 
     /* second conv layer */
     for (i_frame = 0; i_frame < num_frames; i_frame++)
@@ -917,7 +917,7 @@ static void bbwe_feature_net(
         fwrite(output_buffer + i_frame * BBWENET_FNET_CONV2_OUT_SIZE, sizeof(float), BBWENET_FNET_CONV2_OUT_SIZE, f_conv2);
 #endif
     }
-    OPUS_COPY(input_buffer, output_buffer, num_frames * BBWENET_FNET_CONV2_OUT_SIZE);
+    OAC_COPY(input_buffer, output_buffer, num_frames * BBWENET_FNET_CONV2_OUT_SIZE);
 
     /* tconv upsampling*/
     for (i_frame = 0; i_frame < num_frames; i_frame++)
@@ -933,7 +933,7 @@ static void bbwe_feature_net(
         fwrite(output_buffer + i_frame * BBWENET_FNET_TCONV_OUT_CHANNELS * BBWENET_FNET_TCONV_STRIDE, sizeof(float), BBWENET_FNET_TCONV_OUT_CHANNELS * BBWENET_FNET_TCONV_STRIDE, f_tconv);
 #endif
     }
-    OPUS_COPY(input_buffer, output_buffer, num_frames * BBWENET_FNET_TCONV_OUT_CHANNELS * BBWENET_FNET_TCONV_STRIDE);
+    OAC_COPY(input_buffer, output_buffer, num_frames * BBWENET_FNET_TCONV_OUT_CHANNELS * BBWENET_FNET_TCONV_STRIDE);
 
     /* GRU */
     celt_assert(BBWENET_FNET_TCONV_STRIDE == 2);
@@ -949,7 +949,7 @@ static void bbwe_feature_net(
 #ifdef DEBUG_BBWENET
         fwrite(state->feature_net_gru_state, sizeof(float), BBWENET_FNET_GRU_STATE_SIZE, f_gru);
 #endif
-        OPUS_COPY(output + i_subframe * BBWENET_FNET_GRU_STATE_SIZE, state->feature_net_gru_state, BBWENET_FNET_GRU_STATE_SIZE);
+        OAC_COPY(output + i_subframe * BBWENET_FNET_GRU_STATE_SIZE, state->feature_net_gru_state, BBWENET_FNET_GRU_STATE_SIZE);
     }
 }
 
@@ -1001,8 +1001,8 @@ static void interpol_3_2(resamp_state *state, float *x_out, const float *x_in, i
     celt_assert(num_samples < 8 * BBWENET_FRAME_SIZE16);
     celt_assert(num_samples % 2 == 0);
 
-    OPUS_COPY(buffer, state->interpol_buffer, DELAY_SAMPLES);
-    OPUS_COPY(buffer + DELAY_SAMPLES, x_in, num_samples);
+    OAC_COPY(buffer, state->interpol_buffer, DELAY_SAMPLES);
+    OAC_COPY(buffer + DELAY_SAMPLES, x_in, num_samples);
 
     for (i_sample = 0; i_sample < num_samples; i_sample+=2)
     {
@@ -1035,7 +1035,7 @@ static void interpol_3_2(resamp_state *state, float *x_out, const float *x_in, i
     }
 
     /* copy last samples to buffer */
-    OPUS_COPY(state->interpol_buffer, buffer + num_samples, DELAY_SAMPLES);
+    OAC_COPY(state->interpol_buffer, buffer + num_samples, DELAY_SAMPLES);
 }
 
 static void upsamp_2x(resamp_state *state, float *x_out, const float *x_in, int num_samples)
@@ -1049,7 +1049,7 @@ static void upsamp_2x(resamp_state *state, float *x_out, const float *x_in, int
     celt_assert(num_samples > 1);
     celt_assert(num_samples < 4 * BBWENET_FRAME_SIZE16);
 
-    OPUS_COPY(buffer, x_in, num_samples);
+    OAC_COPY(buffer, x_in, num_samples);
 
     for (k = 0; k < num_samples; k++)
     {
@@ -1349,7 +1349,7 @@ static void bbwenet_process_frames(
 
 static void reset_bbwenet_state(BBWENetState *state)
 {
-    OPUS_CLEAR(state, 1);
+    OAC_CLEAR(state, 1);
 
     init_adaconv_state(&state->af1_state);
     init_adaconv_state(&state->af2_state);
@@ -1361,7 +1361,7 @@ static void reset_bbwenet_state(BBWENetState *state)
 static int init_bbwenet(BBWENet *hBBWENET, const WeightArray *weights)
 {
     int ret = 0;
-    OPUS_CLEAR(hBBWENET, 1);
+    OAC_CLEAR(hBBWENET, 1);
     celt_assert(weights != NULL);
 
     ret = init_bbwenetlayers(&hBBWENET->layers, weights);
@@ -1382,7 +1382,7 @@ void osce_reset(silk_OSCE_struct *hOSCE, int method)
 {
     OSCEState *state = &hOSCE->state;
 
-    OPUS_CLEAR(&hOSCE->features, 1);
+    OAC_CLEAR(&hOSCE->features, 1);
 
     switch(method)
     {
@@ -1410,7 +1410,7 @@ void osce_reset(silk_OSCE_struct *hOSCE, int method)
 void osce_bwe_reset(silk_OSCE_BWE_struct *hOSCEBWE)
 {
     int k;
-    OPUS_CLEAR(&hOSCEBWE->features, 1);
+    OAC_CLEAR(&hOSCEBWE->features, 1);
 #if 1
     /* weird python initialization: Fix eventually! */
     for (k = 0; k <= OSCE_BWE_MAX_INSTAFREQ_BIN; k ++)
@@ -1478,9 +1478,9 @@ int osce_load_models(OSCEModel *model, const void *data, int len)
 void osce_bwe(
     OSCEModel                   *model,                         /* I    OSCE model struct                           */
     silk_OSCE_BWE_struct        *psOSCEBWE,                     /* I/O  OSCE BWE state                              */
-    opus_int16                  xq48[],                         /* O    bandwidth-extended speech                   */
-    opus_int16                  xq16[],                         /* I    Decoded speech                              */
-    opus_int32                  xq16_len,                       /* I    Length of xq16 in samples                   */
+    oac_int16                  xq48[],                         /* O    bandwidth-extended speech                   */
+    oac_int16                  xq16[],                         /* I    Decoded speech                              */
+    oac_int32                  xq16_len,                       /* I    Length of xq16 in samples                   */
     int                         arch                            /* I    Run-time architecture                       */
  )
  {
@@ -1521,7 +1521,7 @@ void osce_bwe(
 #endif
 
     /* scale and delay output */
-    OPUS_COPY(xq48, psOSCEBWE->state.bbwenet.outbut_buffer, OSCE_BWE_OUTPUT_DELAY);
+    OAC_COPY(xq48, psOSCEBWE->state.bbwenet.outbut_buffer, OSCE_BWE_OUTPUT_DELAY);
     for (i = 0; i < 3 * xq16_len - OSCE_BWE_OUTPUT_DELAY; i++)
     {
         float tmp = 32768.f * out_buffer[i];
@@ -1547,8 +1547,8 @@ void osce_enhance_frame(
     OSCEModel                   *model,                         /* I    OSCE model struct                           */
     silk_decoder_state          *psDec,                         /* I/O  Decoder state                               */
     silk_decoder_control        *psDecCtrl,                     /* I    Decoder control                             */
-    opus_int16                  xq[],                           /* I/O  Decoded speech                              */
-    opus_int32                  num_bits,                       /* I    Size of SILK payload in bits                */
+    oac_int16                  xq[],                           /* I/O  Decoded speech                              */
+    oac_int32                  num_bits,                       /* I    Size of SILK payload in bits                */
     int                         arch                            /* I    Run-time architecture                       */
 )
 {
@@ -1582,7 +1582,7 @@ void osce_enhance_frame(
     switch(method)
     {
         case OSCE_METHOD_NONE:
-            OPUS_COPY(out_buffer, in_buffer, 320);
+            OAC_COPY(out_buffer, in_buffer, 320);
             break;
 #ifndef DISABLE_LACE
         case OSCE_METHOD_LACE:
@@ -1625,7 +1625,7 @@ void osce_enhance_frame(
         float tmp;
         int16_t itmp;
         float lpc_buffer[16] = {0};
-        opus_int16 *A_Q12, *B_Q14;
+        oac_int16 *A_Q12, *B_Q14;
 
         (void) num_bits;
         (void) arch;
@@ -1660,7 +1660,7 @@ void osce_enhance_frame(
 
     if (psDec->osce.features.reset > 1)
     {
-        OPUS_COPY(out_buffer, in_buffer, 320);
+        OAC_COPY(out_buffer, in_buffer, 320);
         psDec->osce.features.reset --;
     }
     else if (psDec->osce.features.reset)
diff --git a/dnn/osce.h b/dnn/osce.h
index 915e6ba23..3e05ec861 100644
--- a/dnn/osce.h
+++ b/dnn/osce.h
@@ -29,7 +29,7 @@
 #define OSCE_H
 
 
-#include "opus_types.h"
+#include "oac_types.h"
 /*#include "osce_config.h"*/
 #ifndef DISABLE_LACE
 #include "lace_data.h"
@@ -80,8 +80,8 @@ void osce_enhance_frame(
     OSCEModel                   *model,                         /* I    OSCE model struct                           */
     silk_decoder_state          *psDec,                         /* I/O  Decoder state                               */
     silk_decoder_control        *psDecCtrl,                     /* I    Decoder control                             */
-    opus_int16                  xq[],                           /* I/O  Decoded speech                              */
-    opus_int32                  num_bits,                       /* I    Size of SILK payload in bits                */
+    oac_int16                  xq[],                           /* I/O  Decoded speech                              */
+    oac_int32                  num_bits,                       /* I    Size of SILK payload in bits                */
     int                         arch                            /* I    Run-time architecture                       */
 );
 
@@ -93,9 +93,9 @@ void osce_reset(silk_OSCE_struct *hOSCE, int method);
 void osce_bwe(
    OSCEModel                   *model,                         /* I    OSCE model struct                           */
    silk_OSCE_BWE_struct        *psOSCEBWE,                     /* I/O  OSCE BWE state                              */
-   opus_int16                  xq48[],                         /* O    bandwidth-extended speech                   */
-   opus_int16                  xq16[],                         /* I    Decoded speech                              */
-   opus_int32                  xq16_len,                       /* I    Length of xq16 in samples                   */
+   oac_int16                  xq48[],                         /* O    bandwidth-extended speech                   */
+   oac_int16                  xq16[],                         /* I    Decoded speech                              */
+   oac_int32                  xq16_len,                       /* I    Length of xq16 in samples                   */
    int                         arch                            /* I    Run-time architecture                       */
 );
 
diff --git a/dnn/osce_features.c b/dnn/osce_features.c
index 8e1fa1a73..ddaf7d2b7 100644
--- a/dnn/osce_features.c
+++ b/dnn/osce_features.c
@@ -226,7 +226,7 @@ static void mag_spec_320_onesided(float *out, float *in)
 }
 
 
-static void calculate_log_spectrum_from_lpc(float *spec, opus_int16 *a_q12, int lpc_order)
+static void calculate_log_spectrum_from_lpc(float *spec, oac_int16 *a_q12, int lpc_order)
 {
     float buffer[OSCE_SPEC_WINDOW_SIZE] = {0};
     int i;
@@ -371,8 +371,8 @@ void osce_calculate_features(
     float                       *features,                      /* O    input features                              */
     float                       *numbits,                       /* O    numbits and smoothed numbits                */
     int                         *periods,                       /* O    pitch lags on subframe basis                */
-    const opus_int16            xq[],                           /* I    Decoded speech                              */
-    opus_int32                  num_bits                        /* I    Size of SILK payload in bits                */
+    const oac_int16            xq[],                           /* I    Decoded speech                              */
+    oac_int32                  num_bits                        /* I    Size of SILK payload in bits                */
 )
 {
     int num_subframes, num_samples;
@@ -388,7 +388,7 @@ void osce_calculate_features(
     }
 #endif
 
-    /*OPUS_CLEAR(buffer, 1);*/
+    /*OAC_CLEAR(buffer, 1);*/
     memset(buffer, 0, sizeof(buffer));
 
     num_subframes = psDec->nb_subfr;
@@ -404,7 +404,7 @@ void osce_calculate_features(
     {
         buffer[OSCE_FEATURES_MAX_HISTORY + n] = (float) xq[n] / (1U<<15);
     }
-    OPUS_COPY(buffer, psFeatures->signal_history, OSCE_FEATURES_MAX_HISTORY);
+    OAC_COPY(buffer, psFeatures->signal_history, OSCE_FEATURES_MAX_HISTORY);
 
     for (k = 0; k < num_subframes; k++)
     {
@@ -419,7 +419,7 @@ void osce_calculate_features(
         }
         else
         {
-            OPUS_COPY(pfeatures + OSCE_CLEAN_SPEC_START, pfeatures + OSCE_CLEAN_SPEC_START - OSCE_FEATURE_DIM, OSCE_CLEAN_SPEC_LENGTH);
+            OAC_COPY(pfeatures + OSCE_CLEAN_SPEC_START, pfeatures + OSCE_CLEAN_SPEC_START - OSCE_FEATURE_DIM, OSCE_CLEAN_SPEC_LENGTH);
         }
 
         /* noisy cepstrum from signal (update every other frame) */
@@ -429,7 +429,7 @@ void osce_calculate_features(
         }
         else
         {
-            OPUS_COPY(pfeatures + OSCE_NOISY_CEPSTRUM_START, pfeatures + OSCE_NOISY_CEPSTRUM_START - OSCE_FEATURE_DIM, OSCE_NOISY_CEPSTRUM_LENGTH);
+            OAC_COPY(pfeatures + OSCE_NOISY_CEPSTRUM_START, pfeatures + OSCE_NOISY_CEPSTRUM_START - OSCE_FEATURE_DIM, OSCE_NOISY_CEPSTRUM_LENGTH);
         }
 
         /* pitch hangover and zero value replacement */
@@ -454,7 +454,7 @@ void osce_calculate_features(
     }
 
     /* buffer update */
-    OPUS_COPY(psFeatures->signal_history, &buffer[num_samples], OSCE_FEATURES_MAX_HISTORY);
+    OAC_COPY(psFeatures->signal_history, &buffer[num_samples], OSCE_FEATURES_MAX_HISTORY);
 }
 
 
@@ -462,7 +462,7 @@ void osce_calculate_features(
 void osce_bwe_calculate_features(
     OSCEBWEFeatureState         *psFeatures,                    /* I/O  BWE feature state                          */
     float                       *features,                      /* O    input features                              */
-    const opus_int16            xq[],                           /* I    Decoded speech                              */
+    const oac_int16            xq[],                           /* I    Decoded speech                              */
     int                         num_samples                     /* I    number of input samples                     */
  )
  {
@@ -481,20 +481,20 @@ void osce_bwe_calculate_features(
     for (frame = 0; frame < num_frames; frame++)
     {
         /* clear features */
-        OPUS_CLEAR(features + frame * OSCE_BWE_FEATURE_DIM, OSCE_BWE_FEATURE_DIM);
+        OAC_CLEAR(features + frame * OSCE_BWE_FEATURE_DIM, OSCE_BWE_FEATURE_DIM);
 
         lmspec = features + frame * OSCE_BWE_FEATURE_DIM;
         instafreq = lmspec + OSCE_BWE_NUM_BANDS;
-        const opus_int16 *x = xq + frame * OSCE_BWE_HALF_WINDOW_SIZE;
+        const oac_int16 *x = xq + frame * OSCE_BWE_HALF_WINDOW_SIZE;
 
-        OPUS_COPY(buffer, psFeatures->signal_history, OSCE_BWE_HALF_WINDOW_SIZE);
+        OAC_COPY(buffer, psFeatures->signal_history, OSCE_BWE_HALF_WINDOW_SIZE);
         for (n = 0; n < OSCE_BWE_HALF_WINDOW_SIZE; n++)
         {
             buffer[n + OSCE_BWE_HALF_WINDOW_SIZE] = (float) x[n] / (1U<<15);
         }
 
         /* update signal history buffer */
-        OPUS_COPY(psFeatures->signal_history, buffer + OSCE_BWE_HALF_WINDOW_SIZE, OSCE_BWE_HALF_WINDOW_SIZE);
+        OAC_COPY(psFeatures->signal_history, buffer + OSCE_BWE_HALF_WINDOW_SIZE, OSCE_BWE_HALF_WINDOW_SIZE);
 
         /* apply window */
         for (n = 0; n < OSCE_BWE_WINDOW_SIZE; n ++)
@@ -537,7 +537,7 @@ void osce_bwe_calculate_features(
         }
 
         /* update instafreq buffer */
-        OPUS_COPY(psFeatures->last_spec, spec, 2 * OSCE_BWE_MAX_INSTAFREQ_BIN + 2);
+        OAC_COPY(psFeatures->last_spec, spec, 2 * OSCE_BWE_MAX_INSTAFREQ_BIN + 2);
     }
 }
 #endif /* ENABLE_OSCE_BWE */
@@ -554,7 +554,7 @@ void osce_cross_fade_10ms(float *x_enhanced, float *x_in, int length)
 }
 
 
-void osce_bwe_cross_fade_10ms(opus_int16 *x_fadein, opus_int16 *x_fadeout, int length)
+void osce_bwe_cross_fade_10ms(oac_int16 *x_fadein, oac_int16 *x_fadeout, int length)
 {
     int i;
     celt_assert(length >= 480);
diff --git a/dnn/osce_features.h b/dnn/osce_features.h
index ae276c99b..024db48c3 100644
--- a/dnn/osce_features.h
+++ b/dnn/osce_features.h
@@ -30,7 +30,7 @@
 
 
 #include "structs.h"
-#include "opus_types.h"
+#include "oac_types.h"
 
 #define OSCE_NUMBITS_BUGFIX
 
@@ -40,19 +40,19 @@ void osce_calculate_features(
     float                       *features,                      /* O    input features                              */
     float                       *numbits,                       /* O    numbits and smoothed numbits                */
     int                         *periods,                       /* O    pitch lags on subframe basis                */
-    const opus_int16            xq[],                           /* I    Decoded speech                              */
-    opus_int32                  num_bits                        /* I    Size of SILK payload in bits                */
+    const oac_int16            xq[],                           /* I    Decoded speech                              */
+    oac_int32                  num_bits                        /* I    Size of SILK payload in bits                */
 );
 
 #ifdef ENABLE_OSCE_BWE
 void osce_bwe_calculate_features(
    OSCEBWEFeatureState         *psFeatures,                    /* I/O  BWE feature state                           */
    float                       *features,                      /* O    input features                              */
-   const opus_int16            xq[],                           /* I    Decoded speech                              */
+   const oac_int16            xq[],                           /* I    Decoded speech                              */
    int                         num_samples                     /* I    number of input samples                     */
 );
 #endif
 
 void osce_cross_fade_10ms(float *x_enhanced, float *x_in, int length);
-void osce_bwe_cross_fade_10ms(opus_int16 *x_fadein, opus_int16* x_fadeout, int length);
+void osce_bwe_cross_fade_10ms(oac_int16 *x_fadein, oac_int16* x_fadeout, int length);
 #endif
diff --git a/dnn/osce_structs.h b/dnn/osce_structs.h
index b44ee7723..a0ea23e0b 100644
--- a/dnn/osce_structs.h
+++ b/dnn/osce_structs.h
@@ -28,7 +28,7 @@
 #ifndef OSCE_STRUCTS_H
 #define OSCE_STRUCTS_H
 
-#include "opus_types.h"
+#include "oac_types.h"
 #include "osce_config.h"
 #ifndef DISABLE_LACE
 #include "lace_data.h"
@@ -70,7 +70,7 @@ typedef struct {
     float feature_net_conv1_state[BBWENET_FNET_CONV1_STATE_SIZE];
     float feature_net_conv2_state[BBWENET_FNET_CONV2_STATE_SIZE];
     float feature_net_gru_state[BBWENET_FNET_GRU_STATE_SIZE];
-    opus_int16 outbut_buffer[OSCE_BWE_OUTPUT_DELAY];
+    oac_int16 outbut_buffer[OSCE_BWE_OUTPUT_DELAY];
     AdaConvState af1_state;
     AdaConvState af2_state;
     AdaConvState af3_state;
diff --git a/dnn/parse_lpcnet_weights.c b/dnn/parse_lpcnet_weights.c
index 1e6549680..287dd8dcc 100644
--- a/dnn/parse_lpcnet_weights.c
+++ b/dnn/parse_lpcnet_weights.c
@@ -56,7 +56,7 @@ int parse_weights(WeightArray **list, const void *data, int len)
 {
   int nb_arrays=0;
   int capacity=20;
-  *list = (WeightArray*)opus_alloc(capacity*sizeof(WeightArray));
+  *list = (WeightArray*)oac_alloc(capacity*sizeof(WeightArray));
   while (len > 0) {
     int ret;
     WeightArray array = {NULL, 0, 0, 0};
@@ -65,11 +65,11 @@ int parse_weights(WeightArray **list, const void *data, int len)
       if (nb_arrays+1 >= capacity) {
         /* Make sure there's room for the ending NULL element too. */
         capacity = capacity*3/2;
-        *list = (WeightArray*)opus_realloc(*list, capacity*sizeof(WeightArray));
+        *list = (WeightArray*)oac_realloc(*list, capacity*sizeof(WeightArray));
       }
       (*list)[nb_arrays++] = array;
     } else {
-      opus_free(*list);
+      oac_free(*list);
       *list = NULL;
       return -1;
     }
@@ -150,7 +150,7 @@ int linear_init(LinearLayer *layer, const WeightArray *arrays,
     int total_blocks;
     if ((layer->weights_idx = (const int*)find_idx_check(arrays, weights_idx, nb_inputs, nb_outputs, &total_blocks)) == NULL) return 1;
     if (weights != NULL) {
-      if ((layer->weights = (const opus_int8*)find_array_check(arrays, weights, SPARSE_BLOCK_SIZE*total_blocks*sizeof(layer->weights[0]))) == NULL) return 1;
+      if ((layer->weights = (const oac_int8*)find_array_check(arrays, weights, SPARSE_BLOCK_SIZE*total_blocks*sizeof(layer->weights[0]))) == NULL) return 1;
     }
     if (float_weights != NULL) {
       layer->float_weights = (const float*)opt_array_check(arrays, float_weights, SPARSE_BLOCK_SIZE*total_blocks*sizeof(layer->float_weights[0]), &err);
@@ -158,7 +158,7 @@ int linear_init(LinearLayer *layer, const WeightArray *arrays,
     }
   } else {
     if (weights != NULL) {
-      if ((layer->weights = (const opus_int8*)find_array_check(arrays, weights, nb_inputs*nb_outputs*sizeof(layer->weights[0]))) == NULL) return 1;
+      if ((layer->weights = (const oac_int8*)find_array_check(arrays, weights, nb_inputs*nb_outputs*sizeof(layer->weights[0]))) == NULL) return 1;
     }
     if (float_weights != NULL) {
       layer->float_weights = (const float*)opt_array_check(arrays, float_weights, nb_inputs*nb_outputs*sizeof(layer->float_weights[0]), &err);
@@ -230,7 +230,7 @@ int main()
     printf("found %s: size %d\n", list[i].name, list[i].size);
   }
   printf("%p\n", list[i].name);
-  opus_free(list);
+  oac_free(list);
   munmap(data, len);
   close(fd);
   return 0;
diff --git a/dnn/pitchdnn.c b/dnn/pitchdnn.c
index 5cf96e7f9..056e80aa4 100644
--- a/dnn/pitchdnn.c
+++ b/dnn/pitchdnn.c
@@ -32,7 +32,7 @@ float compute_pitchdnn(
   compute_generic_dense(&model->dense_if_upsampler_1, if1_out, if_features, ACTIVATION_TANH, arch);
   compute_generic_dense(&model->dense_if_upsampler_2, &downsampler_in[NB_XCORR_FEATURES], if1_out, ACTIVATION_TANH, arch);
   /* xcorr*/
-  OPUS_COPY(&conv1_tmp1[1], xcorr_features, NB_XCORR_FEATURES);
+  OAC_COPY(&conv1_tmp1[1], xcorr_features, NB_XCORR_FEATURES);
   compute_conv2d(&model->conv2d_1, &conv1_tmp2[1], st->xcorr_mem1, conv1_tmp1, NB_XCORR_FEATURES, NB_XCORR_FEATURES+2, ACTIVATION_TANH, arch);
   compute_conv2d(&model->conv2d_2, downsampler_in, st->xcorr_mem2, conv1_tmp2, NB_XCORR_FEATURES, NB_XCORR_FEATURES, ACTIVATION_TANH, arch);
 
@@ -59,7 +59,7 @@ float compute_pitchdnn(
 void pitchdnn_init(PitchDNNState *st)
 {
   int ret;
-  OPUS_CLEAR(st, 1);
+  OAC_CLEAR(st, 1);
 #ifndef USE_WEIGHTS_FILE
   ret = init_pitchdnn(&st->model, pitchdnn_arrays);
 #else
@@ -73,7 +73,7 @@ int pitchdnn_load_model(PitchDNNState *st, const void *data, int len) {
   int ret;
   parse_weights(&list, data, len);
   ret = init_pitchdnn(&st->model, list);
-  opus_free(list);
+  oac_free(list);
   if (ret == 0) return 0;
   else return -1;
 }
diff --git a/dnn/test_vec.c b/dnn/test_vec.c
index d14d2502a..df8f1776b 100644
--- a/dnn/test_vec.c
+++ b/dnn/test_vec.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <math.h>
-#include "opus_types.h"
+#include "oac_types.h"
 #include "arch.h"
 #include "common.h"
 #include "tansig_table.h"
diff --git a/dnn/torch/lossgen/export_lossgen.py b/dnn/torch/lossgen/export_lossgen.py
index 15a65c36c..3ba0f282c 100644
--- a/dnn/torch/lossgen/export_lossgen.py
+++ b/dnn/torch/lossgen/export_lossgen.py
@@ -55,7 +55,7 @@ def c_export(args, model):
     writer = CWriter(os.path.join(args.output_dir, "lossgen_data"), message=message, model_struct_name='LossGen', enable_binary_blob=False, add_typedef=True)
     writer.header.write(
 f"""
-#include "opus_types.h"
+#include "oac_types.h"
 """
         )
 
diff --git a/dnn/torch/neural-pitch/export_neuralpitch_weights.py b/dnn/torch/neural-pitch/export_neuralpitch_weights.py
index 577ec882e..1c782e27d 100644
--- a/dnn/torch/neural-pitch/export_neuralpitch_weights.py
+++ b/dnn/torch/neural-pitch/export_neuralpitch_weights.py
@@ -55,7 +55,7 @@ def c_export(args, model):
     writer = CWriter(os.path.join(args.output_dir, "pitchdnn_data"), message=message, model_struct_name='PitchDNN')
     writer.header.write(
 f"""
-#include "opus_types.h"
+#include "oac_types.h"
 """
         )
 
diff --git a/dnn/torch/osce/data/silk_conversion_set.py b/dnn/torch/osce/data/silk_conversion_set.py
index 8f6467561..c13af3ded 100644
--- a/dnn/torch/osce/data/silk_conversion_set.py
+++ b/dnn/torch/osce/data/silk_conversion_set.py
@@ -45,7 +45,7 @@ def __init__(self,
                  pitch_hangover=8,
                  num_bands_clean_spec=64,
                  num_bands_noisy_spec=18,
-                 noisy_spec_scale='opus',
+                 noisy_spec_scale='oac',
                  noisy_apply_dct=True,
                  add_offset=False,
                  add_double_lag_acorr=False
diff --git a/dnn/torch/osce/data/silk_enhancement_set.py b/dnn/torch/osce/data/silk_enhancement_set.py
index fd18c4def..0af0f8c51 100644
--- a/dnn/torch/osce/data/silk_enhancement_set.py
+++ b/dnn/torch/osce/data/silk_enhancement_set.py
@@ -47,7 +47,7 @@ def __init__(self,
                  pitch_hangover=8,
                  num_bands_clean_spec=64,
                  num_bands_noisy_spec=18,
-                 noisy_spec_scale='opus',
+                 noisy_spec_scale='oac',
                  noisy_apply_dct=True,
                  add_double_lag_acorr=False,
                  ):
diff --git a/dnn/torch/osce/stndrd/evaluation/evaluate.py b/dnn/torch/osce/stndrd/evaluation/evaluate.py
index 54700dbe4..31a000622 100644
--- a/dnn/torch/osce/stndrd/evaluation/evaluate.py
+++ b/dnn/torch/osce/stndrd/evaluation/evaluate.py
@@ -64,25 +64,25 @@ def get_itemlist(folder):
 
 def process_item(folder, item, bitrate, metric):
     fs, x_clean  = wavfile.read(os.path.join(folder, 'clean', f"{item}_{bitrate}_clean.wav"))
-    fs, x_opus   = wavfile.read(os.path.join(folder, 'opus', f"{item}_{bitrate}_opus.wav"))
+    fs, x_oac   = wavfile.read(os.path.join(folder, 'oac', f"{item}_{bitrate}_oac.wav"))
     fs, x_lace   = wavfile.read(os.path.join(folder, 'lace', f"{item}_{bitrate}_lace.wav"))
     fs, x_nolace = wavfile.read(os.path.join(folder, 'nolace', f"{item}_{bitrate}_nolace.wav"))
 
     x_clean  = x_clean.astype(np.float32) / 2**15
-    x_opus   = x_opus.astype(np.float32) / 2**15
+    x_oac   = x_oac.astype(np.float32) / 2**15
     x_lace   = x_lace.astype(np.float32) / 2**15
     x_nolace = x_nolace.astype(np.float32) / 2**15
 
     if metric == 'pesq':
-        result = [pesq(fs, x_clean, x_opus), pesq(fs, x_clean, x_lace), pesq(fs, x_clean, x_nolace)]
+        result = [pesq(fs, x_clean, x_oac), pesq(fs, x_clean, x_lace), pesq(fs, x_clean, x_nolace)]
     elif metric =='moc':
-        result = [compare(x_clean, x_opus), compare(x_clean, x_lace), compare(x_clean, x_nolace)]
+        result = [compare(x_clean, x_oac), compare(x_clean, x_lace), compare(x_clean, x_nolace)]
     elif metric =='moc2':
-        result = [compare2(x_clean, x_opus), compare2(x_clean, x_lace), compare2(x_clean, x_nolace)]
+        result = [compare2(x_clean, x_oac), compare2(x_clean, x_lace), compare2(x_clean, x_nolace)]
     # elif metric == 'warpq':
-        # result = [warpq(x_clean, x_opus), warpq(x_clean, x_lace), warpq(x_clean, x_nolace)]
+        # result = [warpq(x_clean, x_oac), warpq(x_clean, x_lace), warpq(x_clean, x_nolace)]
     elif metric == 'laceloss':
-        result = [laceloss_compare(x_clean, x_opus), laceloss_compare(x_clean, x_lace), laceloss_compare(x_clean, x_nolace)]
+        result = [laceloss_compare(x_clean, x_oac), laceloss_compare(x_clean, x_lace), laceloss_compare(x_clean, x_nolace)]
     else:
         raise ValueError(f'unknown metric {metric}')
 
diff --git a/dnn/torch/osce/stndrd/evaluation/highband_eval.py b/dnn/torch/osce/stndrd/evaluation/highband_eval.py
index eb9a0682e..d522f86ef 100644
--- a/dnn/torch/osce/stndrd/evaluation/highband_eval.py
+++ b/dnn/torch/osce/stndrd/evaluation/highband_eval.py
@@ -9,8 +9,8 @@
 parser.add_argument('ref_wav', type=str, help='reference wav file')
 parser.add_argument('test_wav', type=str, help='test wav file')
 
-opus_eband5ms = [0,  1,  2,  3,  4,  5,  6,  7,  8, 10, 12, 14, 16, 20, 24, 28, 34, 40, 48, 60, 78, 100]
-opus_eband10ms = [2 * b for b in opus_eband5ms]
+oac_eband5ms = [0,  1,  2,  3,  4,  5,  6,  7,  8, 10, 12, 14, 16, 20, 24, 28, 34, 40, 48, 60, 78, 100]
+oac_eband10ms = [2 * b for b in oac_eband5ms]
 
 def create_filter_bank(band_limits, num_bins, normalize=False):
     filters = []
@@ -27,7 +27,7 @@ def create_filter_bank(band_limits, num_bins, normalize=False):
     fb = np.concatenate(filters, axis=0)
     return fb
 
-fb = create_filter_bank(opus_eband10ms, 241)
+fb = create_filter_bank(oac_eband10ms, 241)
 
 highband_idx = -4
 func = lambda x : x ** 0.25
diff --git a/dnn/torch/osce/stndrd/evaluation/make_boxplots.py b/dnn/torch/osce/stndrd/evaluation/make_boxplots.py
index f7ea778a8..88b00a96e 100644
--- a/dnn/torch/osce/stndrd/evaluation/make_boxplots.py
+++ b/dnn/torch/osce/stndrd/evaluation/make_boxplots.py
@@ -66,7 +66,7 @@ def load_data(folder):
 def plot_data(filename, data, title=None):
     compare_dict = dict()
     for br in data.keys():
-        compare_dict[f'Opus {br/1000:.1f} kb/s'] = data[br][:, 0]
+        compare_dict[f'Oac {br/1000:.1f} kb/s'] = data[br][:, 0]
         compare_dict[f'LACE {br/1000:.1f} kb/s'] = data[br][:, 1]
         compare_dict[f'NoLACE {br/1000:.1f} kb/s'] = data[br][:, 2]
 
@@ -80,7 +80,7 @@ def plot_data(filename, data, title=None):
     red = '#ff5745'
     blue = '#007dbc'
     colors = [black, red, blue]
-    legend_elements = [Patch(facecolor=colors[0], label='Opus SILK'),
+    legend_elements = [Patch(facecolor=colors[0], label='Oac SILK'),
                     Patch(facecolor=colors[1], label='LACE'),
                     Patch(facecolor=colors[2], label='NoLACE')]
 
diff --git a/dnn/torch/osce/stndrd/evaluation/make_boxplots_moctest.py b/dnn/torch/osce/stndrd/evaluation/make_boxplots_moctest.py
index ca65aba91..f1d347f09 100644
--- a/dnn/torch/osce/stndrd/evaluation/make_boxplots_moctest.py
+++ b/dnn/torch/osce/stndrd/evaluation/make_boxplots_moctest.py
@@ -63,7 +63,7 @@ def load_data(folder):
 def plot_data(filename, data, title=None):
     compare_dict = dict()
     for br in data.keys():
-        compare_dict[f'Opus {br/1000:.1f} kb/s'] = data[br][:, 0]
+        compare_dict[f'Oac {br/1000:.1f} kb/s'] = data[br][:, 0]
         compare_dict[f'LACE (MOC only) {br/1000:.1f} kb/s'] = data[br][:, 1]
         compare_dict[f'LACE (MOC + TD) {br/1000:.1f} kb/s'] = data[br][:, 2]
 
@@ -73,7 +73,7 @@ def plot_data(filename, data, title=None):
         "font.size": 32
     })
     colors = ['pink', 'lightblue', 'lightgreen']
-    legend_elements = [Patch(facecolor=colors[0], label='Opus SILK'),
+    legend_elements = [Patch(facecolor=colors[0], label='Oac SILK'),
                     Patch(facecolor=colors[1], label='MOC loss only'),
                     Patch(facecolor=colors[2], label='MOC + TD loss')]
 
diff --git a/dnn/torch/osce/stndrd/evaluation/make_tables.py b/dnn/torch/osce/stndrd/evaluation/make_tables.py
index 560801276..dd080cc19 100644
--- a/dnn/torch/osce/stndrd/evaluation/make_tables.py
+++ b/dnn/torch/osce/stndrd/evaluation/make_tables.py
@@ -67,12 +67,12 @@ def make_table(filename, data, title=None):
 
     # mean values
     tbl = PrettyTable()
-    tbl.field_names = ['bitrate (bps)', 'Opus', 'LACE', 'NoLACE']
+    tbl.field_names = ['bitrate (bps)', 'Oac', 'LACE', 'NoLACE']
     for br in data.keys():
-        opus = data[br][:, 0]
+        oac = data[br][:, 0]
         lace = data[br][:, 1]
         nolace = data[br][:, 2]
-        tbl.add_row([br, f"{float(opus.mean()):.3f} ({float(opus.std()):.2f})", f"{float(lace.mean()):.3f} ({float(lace.std()):.2f})", f"{float(nolace.mean()):.3f} ({float(nolace.std()):.2f})"])
+        tbl.add_row([br, f"{float(oac.mean()):.3f} ({float(oac.std()):.2f})", f"{float(lace.mean()):.3f} ({float(lace.std()):.2f})", f"{float(nolace.mean()):.3f} ({float(nolace.std()):.2f})"])
 
     with open(filename + ".txt", "w") as f:
         f.write(str(tbl))
@@ -90,11 +90,11 @@ def make_diff_table(filename, data, title=None):
 
     # mean values
     tbl = PrettyTable()
-    tbl.field_names = ['bitrate (bps)', 'LACE - Opus', 'NoLACE - Opus']
+    tbl.field_names = ['bitrate (bps)', 'LACE - Oac', 'NoLACE - Oac']
     for br in data.keys():
-        opus = data[br][:, 0]
-        lace = data[br][:, 1] - opus
-        nolace = data[br][:, 2] - opus
+        oac = data[br][:, 0]
+        lace = data[br][:, 1] - oac
+        nolace = data[br][:, 2] - oac
         tbl.add_row([br, f"{float(lace.mean()):.3f} ({float(lace.std()):.2f})", f"{float(nolace.mean()):.3f} ({float(nolace.std()):.2f})"])
 
     with open(filename + ".txt", "w") as f:
diff --git a/dnn/torch/osce/stndrd/evaluation/make_tables_moctest.py b/dnn/torch/osce/stndrd/evaluation/make_tables_moctest.py
index 37718068a..9872f013c 100644
--- a/dnn/torch/osce/stndrd/evaluation/make_tables_moctest.py
+++ b/dnn/torch/osce/stndrd/evaluation/make_tables_moctest.py
@@ -64,12 +64,12 @@ def make_table(filename, data, title=None):
 
     # mean values
     tbl = PrettyTable()
-    tbl.field_names = ['bitrate (bps)', 'Opus', 'LACE', 'NoLACE']
+    tbl.field_names = ['bitrate (bps)', 'Oac', 'LACE', 'NoLACE']
     for br in data.keys():
-        opus = data[br][:, 0]
+        oac = data[br][:, 0]
         lace = data[br][:, 1]
         nolace = data[br][:, 2]
-        tbl.add_row([br, f"{float(opus.mean()):.3f} ({float(opus.std()):.2f})", f"{float(lace.mean()):.3f} ({float(lace.std()):.2f})", f"{float(nolace.mean()):.3f} ({float(nolace.std()):.2f})"])
+        tbl.add_row([br, f"{float(oac.mean()):.3f} ({float(oac.std()):.2f})", f"{float(lace.mean()):.3f} ({float(lace.std()):.2f})", f"{float(nolace.mean()):.3f} ({float(nolace.std()):.2f})"])
 
     with open(filename + ".txt", "w") as f:
         f.write(str(tbl))
@@ -87,11 +87,11 @@ def make_diff_table(filename, data, title=None):
 
     # mean values
     tbl = PrettyTable()
-    tbl.field_names = ['bitrate (bps)', 'LACE - Opus', 'NoLACE - Opus']
+    tbl.field_names = ['bitrate (bps)', 'LACE - Oac', 'NoLACE - Oac']
     for br in data.keys():
-        opus = data[br][:, 0]
-        lace = data[br][:, 1] - opus
-        nolace = data[br][:, 2] - opus
+        oac = data[br][:, 0]
+        lace = data[br][:, 1] - oac
+        nolace = data[br][:, 2] - oac
         tbl.add_row([br, f"{float(lace.mean()):.3f} ({float(lace.std()):.2f})", f"{float(nolace.mean()):.3f} ({float(nolace.std()):.2f})"])
 
     with open(filename + ".txt", "w") as f:
diff --git a/dnn/torch/osce/stndrd/evaluation/moc.py b/dnn/torch/osce/stndrd/evaluation/moc.py
index ebc07d07f..38440aeaf 100644
--- a/dnn/torch/osce/stndrd/evaluation/moc.py
+++ b/dnn/torch/osce/stndrd/evaluation/moc.py
@@ -98,7 +98,7 @@ def rect_fb(band_limits, num_bins=None):
 
 
 def compare(x, y, apply_vad=False):
-    """ Modified version of opus_compare for 16 kHz mono signals
+    """ Modified version of oac_compare for 16 kHz mono signals
 
     Args:
         x (np.ndarray): reference input signal scaled to [-1, 1]
diff --git a/dnn/torch/osce/stndrd/evaluation/moc2.py b/dnn/torch/osce/stndrd/evaluation/moc2.py
index 6726ab121..7710c038f 100644
--- a/dnn/torch/osce/stndrd/evaluation/moc2.py
+++ b/dnn/torch/osce/stndrd/evaluation/moc2.py
@@ -98,7 +98,7 @@ def rect_fb(band_limits, num_bins=None):
 
 
 def _compare(x, y, apply_vad=False, factor=1):
-    """ Modified version of opus_compare for 16 kHz mono signals
+    """ Modified version of oac_compare for 16 kHz mono signals
 
     Args:
         x (np.ndarray): reference input signal scaled to [-1, 1]
diff --git a/dnn/torch/osce/stndrd/evaluation/run_nomad.py b/dnn/torch/osce/stndrd/evaluation/run_nomad.py
index 0267bc925..dda10203f 100644
--- a/dnn/torch/osce/stndrd/evaluation/run_nomad.py
+++ b/dnn/torch/osce/stndrd/evaluation/run_nomad.py
@@ -97,18 +97,18 @@ def nomad_process_all(folder, full_reference=False, device=None):
     items = get_itemlist(folder)
     with tempfile.TemporaryDirectory() as dir:
         cleandir  = os.path.join(dir, 'clean')
-        opusdir   = os.path.join(dir, 'opus')
+        oacdir   = os.path.join(dir, 'oac')
         lacedir   = os.path.join(dir, 'lace')
         nolacedir = os.path.join(dir, 'nolace')
 
         # prepare files
-        for d in [cleandir, opusdir, lacedir, nolacedir]: os.makedirs(d)
+        for d in [cleandir, oacdir, lacedir, nolacedir]: os.makedirs(d)
         for br in bitrates:
             for item in items:
-                for cond in ['clean', 'opus', 'lace', 'nolace']:
+                for cond in ['clean', 'oac', 'lace', 'nolace']:
                     shutil.copyfile(os.path.join(folder, cond, f"{item}_{br}_{cond}.wav"), os.path.join(dir, cond, f"{item}_{br}.wav"))
 
-        nomad_opus, ref_embeddings   = nomad_wrapper(cleandir, opusdir, full_reference=full_reference, ref_embeddings=None)
+        nomad_oac, ref_embeddings   = nomad_wrapper(cleandir, oacdir, full_reference=full_reference, ref_embeddings=None)
         nomad_lace, ref_embeddings   = nomad_wrapper(cleandir, lacedir, full_reference=full_reference, ref_embeddings=ref_embeddings)
         nomad_nolace, ref_embeddings = nomad_wrapper(cleandir, nolacedir, full_reference=full_reference, ref_embeddings=ref_embeddings)
 
@@ -117,7 +117,7 @@ def nomad_process_all(folder, full_reference=False, device=None):
         results[br] = np.zeros((len(items), 3))
         for i, item in enumerate(items):
             key = f"{item}_{br}"
-            results[br][i, 0] = nomad_opus[key]
+            results[br][i, 0] = nomad_oac[key]
             results[br][i, 1] = nomad_lace[key]
             results[br][i, 2] = nomad_nolace[key]
 
diff --git a/dnn/torch/osce/stndrd/evaluation/run_osce_test.py b/dnn/torch/osce/stndrd/evaluation/run_osce_test.py
index 956d6d106..a6a337a17 100644
--- a/dnn/torch/osce/stndrd/evaluation/run_osce_test.py
+++ b/dnn/torch/osce/stndrd/evaluation/run_osce_test.py
@@ -14,17 +14,17 @@
 parser.add_argument('inputdir', type=str, help='Input folder with test items')
 parser.add_argument('outputdir', type=str, help='Output folder')
 parser.add_argument('bitrate', type=int, help='bitrate to test')
-parser.add_argument('--reference_opus_demo', type=str, default='./opus_demo', help='reference opus_demo binary for generating bitstreams and reference output')
+parser.add_argument('--reference_oac_demo', type=str, default='./oac_demo', help='reference oac_demo binary for generating bitstreams and reference output')
 parser.add_argument('--encoder_options', type=str, default="", help='encoder options (e.g. -complexity 5)')
-parser.add_argument('--test_opus_demo', type=str, default='./opus_demo', help='opus_demo binary under test')
-parser.add_argument('--test_opus_demo_options', type=str, default='-dec_complexity 7', help='options for test opus_demo (e.g. "-dec_complexity 7")')
+parser.add_argument('--test_oac_demo', type=str, default='./oac_demo', help='oac_demo binary under test')
+parser.add_argument('--test_oac_demo_options', type=str, default='-dec_complexity 7', help='options for test oac_demo (e.g. "-dec_complexity 7")')
 parser.add_argument('--dec_fs', type=int, default=16000, help='decoder sampling frequency (default: 16000)')
 parser.add_argument('--verbose', type=int, default=0, help='verbosity level: 0 for quiet (default), 1 for reporting individual test results, 2 for reporting per-item scores in failed tests')
 
-def run_opus_encoder(opus_demo_path, input_pcm_path, bitstream_path, application, fs, num_channels, bitrate, options=[], verbose=False):
+def run_oac_encoder(oac_demo_path, input_pcm_path, bitstream_path, application, fs, num_channels, bitrate, options=[], verbose=False):
 
     call_args = [
-        opus_demo_path,
+        oac_demo_path,
         "-e",
         application,
         str(fs),
@@ -53,10 +53,10 @@ def run_opus_encoder(opus_demo_path, input_pcm_path, bitstream_path, application
     return 0
 
 
-def run_opus_decoder(opus_demo_path, bitstream_path, output_pcm_path, fs, num_channels, options=[], verbose=False):
+def run_oac_decoder(oac_demo_path, bitstream_path, output_pcm_path, fs, num_channels, options=[], verbose=False):
 
     call_args = [
-        opus_demo_path,
+        oac_demo_path,
         "-d",
         str(fs),
         str(num_channels)
@@ -96,7 +96,7 @@ def sox(*call_args):
     except:
         return 1
 
-def process_clip_factory(ref_opus_demo, test_opus_demo, enc_options, test_options, dec_fs=16000):
+def process_clip_factory(ref_oac_demo, test_oac_demo, enc_options, test_options, dec_fs=16000):
     def process_clip(clip_path, processdir, bitrate):
         # derive paths
         clipname = os.path.splitext(os.path.split(clip_path)[1])[0]
@@ -109,11 +109,11 @@ def process_clip(clip_path, processdir, bitrate):
         sox(clip_path, pcm_path)
 
         # run encoder
-        run_opus_encoder(ref_opus_demo, pcm_path, bitstream_path, "voip", 16000, 1, bitrate, enc_options)
+        run_oac_encoder(ref_oac_demo, pcm_path, bitstream_path, "voip", 16000, 1, bitrate, enc_options)
 
         # run decoder
-        run_opus_decoder(ref_opus_demo, bitstream_path, ref_path, dec_fs, 1)
-        run_opus_decoder(test_opus_demo, bitstream_path, test_path, dec_fs, 1, options=test_options)
+        run_oac_decoder(ref_oac_demo, bitstream_path, ref_path, dec_fs, 1)
+        run_oac_decoder(test_oac_demo, bitstream_path, test_path, dec_fs, 1, options=test_options)
 
         # resample if dec_fs != 16000
         if dec_fs != 16000:
@@ -134,7 +134,7 @@ def process_clip(clip_path, processdir, bitrate):
 
     return process_clip
 
-def main(inputdir, outputdir, bitrate, reference_opus_demo, test_opus_demo, enc_option_string, test_option_string, dec_fs, verbose):
+def main(inputdir, outputdir, bitrate, reference_oac_demo, test_oac_demo, enc_option_string, test_option_string, dec_fs, verbose):
 
     # load clips list
     with open(os.path.join(inputdir, 'clips.yml'), "r") as f:
@@ -144,7 +144,7 @@ def main(inputdir, outputdir, bitrate, reference_opus_demo, test_opus_demo, enc_
     enc_options = enc_option_string.split()
     test_options = test_option_string.split()
 
-    process_clip = process_clip_factory(reference_opus_demo, test_opus_demo, enc_options, test_options, dec_fs=dec_fs)
+    process_clip = process_clip_factory(reference_oac_demo, test_oac_demo, enc_options, test_options, dec_fs=dec_fs)
 
     os.makedirs(outputdir, exist_ok=True)
     processdir = os.path.join(outputdir, 'process')
@@ -201,9 +201,9 @@ def main(inputdir, outputdir, bitrate, reference_opus_demo, test_opus_demo, enc_
     main(args.inputdir,
          args.outputdir,
          args.bitrate,
-         args.reference_opus_demo,
-         args.test_opus_demo,
+         args.reference_oac_demo,
+         args.test_oac_demo,
          args.encoder_options,
-         args.test_opus_demo_options,
+         args.test_oac_demo_options,
          args.dec_fs,
          args.verbose)
diff --git a/dnn/torch/osce/utils/moc.py b/dnn/torch/osce/utils/moc.py
index 677dc6194..ddeb37248 100644
--- a/dnn/torch/osce/utils/moc.py
+++ b/dnn/torch/osce/utils/moc.py
@@ -69,7 +69,7 @@ def rect_fb(band_limits, num_bins=None):
 
 
 def compare(x, y, apply_vad=False):
-    """ Modified version of opus_compare for 16 kHz mono signals
+    """ Modified version of oac_compare for 16 kHz mono signals
 
     Args:
         x (np.ndarray): reference input signal scaled to [-1, 1]
diff --git a/dnn/torch/osce/utils/silk_features.py b/dnn/torch/osce/utils/silk_features.py
index 8c5dbf056..f670904f7 100644
--- a/dnn/torch/osce/utils/silk_features.py
+++ b/dnn/torch/osce/utils/silk_features.py
@@ -58,7 +58,7 @@ def silk_feature_factory(no_pitch_value=256,
                          pitch_hangover=8,
                          num_bands_clean_spec=64,
                          num_bands_noisy_spec=18,
-                         noisy_spec_scale='opus',
+                         noisy_spec_scale='oac',
                          noisy_apply_dct=True,
                          add_double_lag_acorr=False
                          ):
@@ -105,7 +105,7 @@ def load_inference_data(path,
                         pitch_hangover=8,
                         num_bands_clean_spec=64,
                         num_bands_noisy_spec=18,
-                        noisy_spec_scale='opus',
+                        noisy_spec_scale='oac',
                         noisy_apply_dct=True,
                         add_double_lag_acorr=False,
                         **kwargs):
diff --git a/dnn/torch/osce/utils/spec.py b/dnn/torch/osce/utils/spec.py
index 2f4015b40..b4acfe5a7 100644
--- a/dnn/torch/osce/utils/spec.py
+++ b/dnn/torch/osce/utils/spec.py
@@ -72,11 +72,11 @@ def create_filter_bank(num_bands, n_fft=320, fs=16000, scale='bark', round_cente
     f1 = fs / n_fft * (num_bins - 1)
     fstep = fs / n_fft
 
-    if scale == 'opus':
+    if scale == 'oac':
         bins_5ms = [0,  1,  2,  3,  4,  5,  6,  7,  8, 10, 12, 14, 16, 20, 24, 28, 34, 40]
         fac = 1000 * n_fft / fs / 5
         if num_bands != 18:
-            print("warning: requested Opus filter bank with num_bands != 18. Adjusting num_bands.")
+            print("warning: requested Oac filter bank with num_bands != 18. Adjusting num_bands.")
             num_bands = 18
         center_bins = np.array([fac * bin for bin in bins_5ms])
     else:
diff --git a/dnn/torch/osce/utils/templates.py b/dnn/torch/osce/utils/templates.py
index 8cf25e8f0..3f5b73c6e 100644
--- a/dnn/torch/osce/utils/templates.py
+++ b/dnn/torch/osce/utils/templates.py
@@ -66,7 +66,7 @@
         'acorr_radius': 2,
         'num_bands_clean_spec': 64,
         'num_bands_noisy_spec': 18,
-        'noisy_spec_scale': 'opus',
+        'noisy_spec_scale': 'oac',
         'pitch_hangover': 0,
     },
     'training': {
@@ -350,7 +350,7 @@
         'acorr_radius': 2,
         'num_bands_clean_spec': 64,
         'num_bands_noisy_spec': 18,
-        'noisy_spec_scale': 'opus',
+        'noisy_spec_scale': 'oac',
         'pitch_hangover': 0,
     },
     'training': {
@@ -408,7 +408,7 @@
         'acorr_radius': 2,
         'num_bands_clean_spec': 64,
         'num_bands_noisy_spec': 18,
-        'noisy_spec_scale': 'opus',
+        'noisy_spec_scale': 'oac',
         'pitch_hangover': 0,
     },
     'discriminator': {
diff --git a/dnn/torch/plc/export_plc.py b/dnn/torch/plc/export_plc.py
index 7f153c4c5..53bce3fe1 100644
--- a/dnn/torch/plc/export_plc.py
+++ b/dnn/torch/plc/export_plc.py
@@ -55,7 +55,7 @@ def c_export(args, model):
     writer = CWriter(os.path.join(args.output_dir, "plc_data"), message=message, model_struct_name='PLCModel')
     writer.header.write(
 f"""
-#include "opus_types.h"
+#include "oac_types.h"
 """
         )
 
diff --git a/dnn/torch/rdovae/export_rdovae_weights.py b/dnn/torch/rdovae/export_rdovae_weights.py
index d75c7b34e..8ea7942dc 100644
--- a/dnn/torch/rdovae/export_rdovae_weights.py
+++ b/dnn/torch/rdovae/export_rdovae_weights.py
@@ -92,10 +92,10 @@ def dump_statistical_model(writer, w, name, xmlout):
     p0_q8 = p0_q8[:, mask]
     N = r_q8.shape[-1]
 
-    print_vector(writer.source, quant_scales_q8, f'dred_{name}_quant_scales_q8', dtype='opus_uint8', static=False)
-    print_vector(writer.source, dead_zone_q8, f'dred_{name}_dead_zone_q8', dtype='opus_uint8', static=False)
-    print_vector(writer.source, r_q8, f'dred_{name}_r_q8', dtype='opus_uint8', static=False)
-    print_vector(writer.source, p0_q8, f'dred_{name}_p0_q8', dtype='opus_uint8', static=False)
+    print_vector(writer.source, quant_scales_q8, f'dred_{name}_quant_scales_q8', dtype='oac_uint8', static=False)
+    print_vector(writer.source, dead_zone_q8, f'dred_{name}_dead_zone_q8', dtype='oac_uint8', static=False)
+    print_vector(writer.source, r_q8, f'dred_{name}_r_q8', dtype='oac_uint8', static=False)
+    print_vector(writer.source, p0_q8, f'dred_{name}_p0_q8', dtype='oac_uint8', static=False)
 
     print_xml(xmlout, quant_scales_q8, "Scale", "scale", name)
     print_xml(xmlout, dead_zone_q8, "Dead zone", "deadzone", name)
@@ -104,10 +104,10 @@ def dump_statistical_model(writer, w, name, xmlout):
 
     writer.header.write(
 f"""
-extern const opus_uint8 dred_{name}_quant_scales_q8[{levels * N}];
-extern const opus_uint8 dred_{name}_dead_zone_q8[{levels * N}];
-extern const opus_uint8 dred_{name}_r_q8[{levels * N}];
-extern const opus_uint8 dred_{name}_p0_q8[{levels * N}];
+extern const oac_uint8 dred_{name}_quant_scales_q8[{levels * N}];
+extern const oac_uint8 dred_{name}_dead_zone_q8[{levels * N}];
+extern const oac_uint8 dred_{name}_r_q8[{levels * N}];
+extern const oac_uint8 dred_{name}_p0_q8[{levels * N}];
 
 """
     )
@@ -128,7 +128,7 @@ def c_export(args, model):
     for writer in [enc_writer, dec_writer]:
         writer.header.write(
 f"""
-#include "opus_types.h"
+#include "oac_types.h"
 
 #include "dred_rdovae.h"
 
@@ -139,7 +139,7 @@ def c_export(args, model):
 
     stats_writer.header.write(
 f"""
-#include "opus_types.h"
+#include "oac_types.h"
 
 #include "dred_rdovae_constants.h"
 
diff --git a/dnn/torch/rdovae/fec_encoder.py b/dnn/torch/rdovae/fec_encoder.py
index 20ab4ac3a..dac28471a 100644
--- a/dnn/torch/rdovae/fec_encoder.py
+++ b/dnn/torch/rdovae/fec_encoder.py
@@ -33,7 +33,7 @@
 
 os.environ['CUDA_VISIBLE_DEVICES'] = ""
 
-parser = argparse.ArgumentParser(description='Encode redundancy for Opus neural FEC. Designed for use with voip application and 20ms frames')
+parser = argparse.ArgumentParser(description='Encode redundancy for Oac neural FEC. Designed for use with voip application and 20ms frames')
 
 parser.add_argument('input', metavar='<input signal>', help='audio input (.wav or .raw or .pcm as int16)')
 parser.add_argument('checkpoint', metavar='<weights>', help='model checkpoint')
diff --git a/dnn/torch/weight-exchange/wexchange/c_export/common.py b/dnn/torch/weight-exchange/wexchange/c_export/common.py
index 5801c7e8a..b314a3507 100644
--- a/dnn/torch/weight-exchange/wexchange/c_export/common.py
+++ b/dnn/torch/weight-exchange/wexchange/c_export/common.py
@@ -40,10 +40,10 @@ def print_vector(writer, vector, name, dtype='float', reshape_8x4=False, static=
 
     dtype_suffix = {
         'float' : 'float',
-        'opus_uint8' : 'uint8',
-        'opus_int8' : 'int8',
-        'opus_uint16' : 'uint16',
-        'opus_int16' : 'int16',
+        'oac_uint8' : 'uint8',
+        'oac_int8' : 'int8',
+        'oac_uint16' : 'uint16',
+        'oac_int16' : 'int16',
         'int' : 'int',
         'qweight': 'qweight'
     }
@@ -164,7 +164,7 @@ def print_sparse_weight(writer, A, name, scale=1/128, have_diag=True, quantize=F
                 W = np.concatenate([W, vblock])
         idx[pos] = nb_nonzero
 
-    if quantize: print_vector(writer, W, name + '_int8', reshape_8x4=False, dtype='opus_int8')
+    if quantize: print_vector(writer, W, name + '_int8', reshape_8x4=False, dtype='oac_int8')
     print_vector(writer, W0, name + '_float', reshape_8x4=False, dtype='float', debug_float=quantize)
     print_vector(writer, idx, name + '_idx', reshape_8x4=False, dtype='int')
 
@@ -237,7 +237,7 @@ def print_linear_layer(writer : CWriter,
     else:
         if quantize:
             weight_q = quantize_weight(weight, scale)
-            print_vector(writer, weight_q, name + "_weights_int8", dtype='opus_int8', reshape_8x4=True)
+            print_vector(writer, weight_q, name + "_weights_int8", dtype='oac_int8', reshape_8x4=True)
 
         print_vector(writer, weight, name + "_weights_float", dtype='float', reshape_8x4=False, debug_float=quantize)
 
diff --git a/dnn/training_tf2/dataloader.py b/dnn/training_tf2/dataloader.py
deleted file mode 100644
index ed441c1e3..000000000
--- a/dnn/training_tf2/dataloader.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import numpy as np
-from tensorflow.keras.utils import Sequence
-from ulaw import lin2ulaw
-
-def lpc2rc(lpc):
-    #print("shape is = ", lpc.shape)
-    order = lpc.shape[-1]
-    rc = 0*lpc
-    for i in range(order, 0, -1):
-        rc[:,:,i-1] = lpc[:,:,-1]
-        ki = rc[:,:,i-1:i].repeat(i-1, axis=2)
-        lpc = (lpc[:,:,:-1] - ki*lpc[:,:,-2::-1])/(1-ki*ki)
-    return rc
-
-class LPCNetLoader(Sequence):
-    def __init__(self, data, features, periods, batch_size, e2e=False, lookahead=2):
-        self.batch_size = batch_size
-        self.nb_batches = np.minimum(np.minimum(data.shape[0], features.shape[0]), periods.shape[0])//self.batch_size
-        self.data = data[:self.nb_batches*self.batch_size, :]
-        self.features = features[:self.nb_batches*self.batch_size, :]
-        self.periods = periods[:self.nb_batches*self.batch_size, :]
-        self.e2e = e2e
-        self.lookahead = lookahead
-        self.on_epoch_end()
-
-    def on_epoch_end(self):
-        self.indices = np.arange(self.nb_batches*self.batch_size)
-        np.random.shuffle(self.indices)
-
-    def __getitem__(self, index):
-        data = self.data[self.indices[index*self.batch_size:(index+1)*self.batch_size], :, :]
-        in_data = data[: , :, :1]
-        out_data = data[: , :, 1:]
-        features = self.features[self.indices[index*self.batch_size:(index+1)*self.batch_size], :, :-16]
-        periods = self.periods[self.indices[index*self.batch_size:(index+1)*self.batch_size], :, :]
-        outputs = [out_data]
-        inputs = [in_data, features, periods]
-        if self.lookahead > 0:
-            lpc = self.features[self.indices[index*self.batch_size:(index+1)*self.batch_size], 4-self.lookahead:-self.lookahead, -16:]
-        else:
-            lpc = self.features[self.indices[index*self.batch_size:(index+1)*self.batch_size], 4:, -16:]
-        if self.e2e:
-            outputs.append(lpc2rc(lpc))
-        else:
-            inputs.append(lpc)
-        return (inputs, outputs)
-
-    def __len__(self):
-        return self.nb_batches
diff --git a/dnn/training_tf2/decode_rdovae.py b/dnn/training_tf2/decode_rdovae.py
deleted file mode 100644
index f9bf9bf62..000000000
--- a/dnn/training_tf2/decode_rdovae.py
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/python3
-'''Copyright (c) 2021-2022 Amazon
-   Copyright (c) 2018-2019 Mozilla
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-'''
-
-# Train an LPCNet model
-
-import argparse
-#from plc_loader import PLCLoader
-
-parser = argparse.ArgumentParser(description='Train a PLC model')
-
-parser.add_argument('bits', metavar='<bits file>', help='binary features file (int16)')
-parser.add_argument('output', metavar='<output>', help='output features')
-parser.add_argument('--model', metavar='<model>', default='rdovae', help='PLC model python definition (without .py)')
-group1 = parser.add_mutually_exclusive_group()
-group1.add_argument('--weights', metavar='<input weights>', help='model weights')
-parser.add_argument('--cond-size', metavar='<units>', default=1024, type=int, help='number of units in conditioning network (default 1024)')
-parser.add_argument('--batch-size', metavar='<batch size>', default=1, type=int, help='batch size to use (default 128)')
-parser.add_argument('--seq-length', metavar='<sequence length>', default=1000, type=int, help='sequence length to use (default 1000)')
-
-
-args = parser.parse_args()
-
-import importlib
-rdovae = importlib.import_module(args.model)
-
-import sys
-import numpy as np
-from tensorflow.keras.optimizers import Adam
-from tensorflow.keras.callbacks import ModelCheckpoint, CSVLogger
-import tensorflow.keras.backend as K
-import h5py
-
-import tensorflow as tf
-from rdovae import pvq_quantize
-from rdovae import apply_dead_zone
-
-# Try reducing batch_size if you run out of memory on your GPU
-batch_size = args.batch_size
-
-model, encoder, decoder, qembedding = rdovae.new_rdovae_model(nb_used_features=20, nb_bits=80, batch_size=batch_size, cond_size=args.cond_size)
-model.load_weights(args.weights)
-
-lpc_order = 16
-nbits=80
-
-
-bits_file = args.bits
-sequence_size = args.seq_length
-
-# u for unquantised, load 16 bit PCM samples and convert to mu-law
-
-
-bits = np.memmap(bits_file + "-syms.f32", dtype='float32', mode='r')
-nb_sequences = len(bits)//(40*sequence_size)//batch_size*batch_size
-bits = bits[:nb_sequences*sequence_size*40]
-
-bits = np.reshape(bits, (nb_sequences, sequence_size//2, 20*4))
-print(bits.shape)
-
-lambda_val = 0.001 * np.ones((nb_sequences, sequence_size//2, 1))
-quant_id = np.round(3.8*np.log(lambda_val/.0002)).astype('int16')
-quant_id = quant_id[:,:,0]
-quant_embed = qembedding(quant_id)
-quant_scale = tf.math.softplus(quant_embed[:,:,:nbits])
-dead_zone = tf.math.softplus(quant_embed[:, :, nbits : 2 * nbits])
-
-bits = bits*quant_scale
-bits = np.round(apply_dead_zone([bits, dead_zone]).numpy())
-bits = bits/quant_scale
-
-
-state = np.memmap(bits_file + "-state.f32", dtype='float32', mode='r')
-
-state = np.reshape(state, (nb_sequences, sequence_size//2, 24))
-state = state[:,-1,:]
-state = pvq_quantize(state, 82)
-#state = state/(1e-15+tf.norm(state, axis=-1,keepdims=True))
-
-print("shapes are:")
-print(bits.shape)
-print(state.shape)
-
-bits = bits[:,1::2,:]
-features = decoder.predict([bits, state], batch_size=batch_size)
-
-features.astype('float32').tofile(args.output)
diff --git a/dnn/training_tf2/diffembed.py b/dnn/training_tf2/diffembed.py
deleted file mode 100644
index e04ae154b..000000000
--- a/dnn/training_tf2/diffembed.py
+++ /dev/null
@@ -1,49 +0,0 @@
-"""
-Modification of Tensorflow's Embedding Layer:
-    1. Not restricted to be the first layer of a model
-    2. Differentiable (allows non-integer lookups)
-        - For non integer lookup, this layer linearly interpolates between the adjacent embeddings in the following way to preserver gradient flow
-            - E = (1 - frac(x))*embed(floor(x)) + frac(x)*embed(ceil(x))
-"""
-
-import tensorflow as tf
-from tensorflow.keras.layers import Layer
-
-class diff_Embed(Layer):
-    """
-    Parameters:
-        - units: int
-            Dimension of the Embedding
-        - dict_size: int
-            Number of Embeddings to lookup
-        - pcm_init: boolean
-            Initialized for the embedding matrix
-    """
-    def __init__(self, units=128, dict_size = 256, pcm_init = True, initializer = None, **kwargs):
-        super(diff_Embed, self).__init__(**kwargs)
-        self.units = units
-        self.dict_size = dict_size
-        self.pcm_init = pcm_init
-        self.initializer = initializer
-
-    def build(self, input_shape):
-        w_init = tf.random_normal_initializer()
-        if self.pcm_init:
-            w_init = self.initializer
-        self.w = tf.Variable(initial_value=w_init(shape=(self.dict_size, self.units),dtype='float32'),trainable=True)
-
-    def call(self, inputs):
-        alpha = inputs - tf.math.floor(inputs)
-        alpha = tf.expand_dims(alpha,axis = -1)
-        alpha = tf.tile(alpha,[1,1,1,self.units])
-        inputs = tf.cast(inputs,'int32')
-        M = (1 - alpha)*tf.gather(self.w,inputs) + alpha*tf.gather(self.w,tf.clip_by_value(inputs + 1, 0, 255))
-        return M
-
-    def get_config(self):
-        config = super(diff_Embed, self).get_config()
-        config.update({"units": self.units})
-        config.update({"dict_size" : self.dict_size})
-        config.update({"pcm_init" : self.pcm_init})
-        config.update({"initializer" : self.initializer})
-        return config
\ No newline at end of file
diff --git a/dnn/training_tf2/dump_lpcnet.py b/dnn/training_tf2/dump_lpcnet.py
deleted file mode 100755
index 97ce0cedd..000000000
--- a/dnn/training_tf2/dump_lpcnet.py
+++ /dev/null
@@ -1,388 +0,0 @@
-#!/usr/bin/python3
-'''Copyright (c) 2017-2018 Mozilla
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-'''
-
-import os
-import io
-import lpcnet
-import sys
-import numpy as np
-from tensorflow.keras.optimizers import Adam
-from tensorflow.keras.layers import Layer, GRU, Dense, Conv1D, Embedding
-from ulaw import ulaw2lin, lin2ulaw
-from mdense import MDense
-from diffembed import diff_Embed
-from parameters import get_parameter
-import h5py
-import re
-import argparse
-
-
-# no cuda devices needed
-os.environ['CUDA_VISIBLE_DEVICES'] = ""
-
-# Flag for dumping e2e (differentiable lpc) network weights
-flag_e2e = False
-
-
-max_rnn_neurons = 1
-max_conv_inputs = 1
-max_mdense_tmp = 1
-
-def printVector(f, vector, name, dtype='float', dotp=False):
-    global array_list
-    if dotp:
-        vector = vector.reshape((vector.shape[0]//4, 4, vector.shape[1]//8, 8))
-        vector = vector.transpose((2, 0, 3, 1))
-    v = np.reshape(vector, (-1));
-    #print('static const float ', name, '[', len(v), '] = \n', file=f)
-    if name not in array_list:
-        array_list.append(name)
-    f.write('#ifndef USE_WEIGHTS_FILE\n')
-    f.write('#define WEIGHTS_{}_DEFINED\n'.format(name))
-    f.write('#define WEIGHTS_{}_TYPE WEIGHT_TYPE_{}\n'.format(name, dtype))
-    f.write('static const {} {}[{}] = {{\n   '.format(dtype, name, len(v)))
-    for i in range(0, len(v)):
-        f.write('{}'.format(v[i]))
-        if (i!=len(v)-1):
-            f.write(',')
-        else:
-            break;
-        if (i%8==7):
-            f.write("\n   ")
-        else:
-            f.write(" ")
-    #print(v, file=f)
-    f.write('\n};\n')
-    f.write('#endif\n\n')
-    return;
-
-def printSparseVector(f, A, name, have_diag=True):
-    N = A.shape[0]
-    M = A.shape[1]
-    W = np.zeros((0,), dtype='int')
-    W0 = np.zeros((0,))
-    if have_diag:
-        diag = np.concatenate([np.diag(A[:,:N]), np.diag(A[:,N:2*N]), np.diag(A[:,2*N:])])
-        A[:,:N] = A[:,:N] - np.diag(np.diag(A[:,:N]))
-        A[:,N:2*N] = A[:,N:2*N] - np.diag(np.diag(A[:,N:2*N]))
-        A[:,2*N:] = A[:,2*N:] - np.diag(np.diag(A[:,2*N:]))
-        printVector(f, diag, name + '_diag')
-    AQ = np.minimum(127, np.maximum(-128, np.round(A*128))).astype('int')
-    idx = np.zeros((0,), dtype='int')
-    for i in range(M//8):
-        pos = idx.shape[0]
-        idx = np.append(idx, -1)
-        nb_nonzero = 0
-        for j in range(N//4):
-            block = A[j*4:(j+1)*4, i*8:(i+1)*8]
-            qblock = AQ[j*4:(j+1)*4, i*8:(i+1)*8]
-            if np.sum(np.abs(block)) > 1e-10:
-                nb_nonzero = nb_nonzero + 1
-                idx = np.append(idx, j*4)
-                vblock = qblock.transpose((1,0)).reshape((-1,))
-                W0 = np.concatenate([W0, block.reshape((-1,))])
-                W = np.concatenate([W, vblock])
-        idx[pos] = nb_nonzero
-    f.write('#ifdef DOT_PROD\n')
-    printVector(f, W, name, dtype='qweight')
-    f.write('#else /*DOT_PROD*/\n')
-    printVector(f, W0, name, dtype='qweight')
-    f.write('#endif /*DOT_PROD*/\n')
-    #idx = np.tile(np.concatenate([np.array([N]), np.arange(N)]), 3*N//16)
-    printVector(f, idx, name + '_idx', dtype='int')
-    return AQ
-
-def dump_layer_ignore(self, f, hf):
-    print("ignoring layer " + self.name + " of type " + self.__class__.__name__)
-    return False
-Layer.dump_layer = dump_layer_ignore
-
-def dump_sparse_gru(self, f, hf):
-    global max_rnn_neurons
-    name = 'sparse_' + self.name
-    print("printing layer " + name + " of type sparse " + self.__class__.__name__)
-    weights = self.get_weights()
-    qweights = printSparseVector(f, weights[1], name + '_recurrent_weights')
-    printVector(f, weights[-1], name + '_bias')
-    subias = weights[-1].copy()
-    subias[1,:] = subias[1,:] - np.sum(qweights*(1./128),axis=0)
-    printVector(f, subias, name + '_subias')
-    if hasattr(self, 'activation'):
-        activation = self.activation.__name__.upper()
-    else:
-        activation = 'TANH'
-    if hasattr(self, 'reset_after') and not self.reset_after:
-        reset_after = 0
-    else:
-        reset_after = 1
-    neurons = weights[0].shape[1]//3
-    max_rnn_neurons = max(max_rnn_neurons, neurons)
-    hf.write('#define {}_OUT_SIZE {}\n'.format(name.upper(), weights[0].shape[1]//3))
-    hf.write('#define {}_STATE_SIZE {}\n'.format(name.upper(), weights[0].shape[1]//3))
-    model_struct.write('  SparseGRULayer {};\n'.format(name));
-    model_init.write('  if (sparse_gru_init(&model->{}, arrays, "{}_bias", "{}_subias", "{}_recurrent_weights_diag", "{}_recurrent_weights", "{}_recurrent_weights_idx",  {}, ACTIVATION_{}, {})) return 1;\n'
-            .format(name, name, name, name, name, name, weights[0].shape[1]//3, activation, reset_after))
-    return True
-
-def dump_grub(self, f, hf, gru_a_size):
-    global max_rnn_neurons
-    name = self.name
-    print("printing layer " + name + " of type " + self.__class__.__name__)
-    weights = self.get_weights()
-    qweight = printSparseVector(f, weights[0][:gru_a_size, :], name + '_weights', have_diag=False)
-
-    f.write('#ifdef DOT_PROD\n')
-    qweight2 = np.clip(np.round(128.*weights[1]).astype('int'), -128, 127)
-    printVector(f, qweight2, name + '_recurrent_weights', dotp=True, dtype='qweight')
-    f.write('#else /*DOT_PROD*/\n')
-    printVector(f, weights[1], name + '_recurrent_weights')
-    f.write('#endif /*DOT_PROD*/\n')
-
-    printVector(f, weights[-1], name + '_bias')
-    subias = weights[-1].copy()
-    subias[0,:] = subias[0,:] - np.sum(qweight*(1./128.),axis=0)
-    subias[1,:] = subias[1,:] - np.sum(qweight2*(1./128.),axis=0)
-    printVector(f, subias, name + '_subias')
-    if hasattr(self, 'activation'):
-        activation = self.activation.__name__.upper()
-    else:
-        activation = 'TANH'
-    if hasattr(self, 'reset_after') and not self.reset_after:
-        reset_after = 0
-    else:
-        reset_after = 1
-    neurons = weights[0].shape[1]//3
-    max_rnn_neurons = max(max_rnn_neurons, neurons)
-    model_struct.write('  GRULayer {};\n'.format(name));
-    model_init.write('  if (gru_init(&model->{}, arrays, "{}_bias", "{}_subias", "{}_weights", "{}_weights_idx", "{}_recurrent_weights", {}, {}, ACTIVATION_{}, {})) return 1;\n'
-            .format(name, name, name, name, name, name, gru_a_size, weights[0].shape[1]//3, activation, reset_after))
-    return True
-
-def dump_gru_layer_dummy(self, f, hf):
-    name = self.name
-    weights = self.get_weights()
-    hf.write('#define {}_OUT_SIZE {}\n'.format(name.upper(), weights[0].shape[1]//3))
-    hf.write('#define {}_STATE_SIZE {}\n'.format(name.upper(), weights[0].shape[1]//3))
-    return True;
-
-GRU.dump_layer = dump_gru_layer_dummy
-
-def dump_dense_layer_impl(name, weights, bias, activation, f, hf):
-    printVector(f, weights, name + '_weights')
-    printVector(f, bias, name + '_bias')
-    hf.write('#define {}_OUT_SIZE {}\n'.format(name.upper(), weights.shape[1]))
-    model_struct.write('  DenseLayer {};\n'.format(name));
-    model_init.write('  if (dense_init(&model->{}, arrays, "{}_bias", "{}_weights", {}, {}, ACTIVATION_{})) return 1;\n'
-            .format(name, name, name, weights.shape[0], weights.shape[1], activation))
-
-def dump_dense_layer(self, f, hf):
-    name = self.name
-    print("printing layer " + name + " of type " + self.__class__.__name__)
-    weights = self.get_weights()
-    activation = self.activation.__name__.upper()
-    dump_dense_layer_impl(name, weights[0], weights[1], activation, f, hf)
-    return False
-
-Dense.dump_layer = dump_dense_layer
-
-def dump_mdense_layer(self, f, hf):
-    global max_mdense_tmp
-    name = self.name
-    print("printing layer " + name + " of type " + self.__class__.__name__)
-    weights = self.get_weights()
-    printVector(f, np.transpose(weights[0], (0, 2, 1)), name + '_weights')
-    printVector(f, np.transpose(weights[1], (1, 0)), name + '_bias')
-    printVector(f, np.transpose(weights[2], (1, 0)), name + '_factor')
-    activation = self.activation.__name__.upper()
-    max_mdense_tmp = max(max_mdense_tmp, weights[0].shape[0]*weights[0].shape[2])
-    hf.write('#define {}_OUT_SIZE {}\n'.format(name.upper(), weights[0].shape[0]))
-    model_struct.write('  MDenseLayer {};\n'.format(name));
-    model_init.write('  if (mdense_init(&model->{}, arrays, "{}_bias",  "{}_weights",  "{}_factor",  {}, {}, {}, ACTIVATION_{})) return 1;\n'
-            .format(name, name, name, name, weights[0].shape[1], weights[0].shape[0], weights[0].shape[2], activation))
-    return False
-MDense.dump_layer = dump_mdense_layer
-
-def dump_conv1d_layer(self, f, hf):
-    global max_conv_inputs
-    name = self.name
-    print("printing layer " + name + " of type " + self.__class__.__name__)
-    weights = self.get_weights()
-    printVector(f, weights[0], name + '_weights')
-    printVector(f, weights[-1], name + '_bias')
-    activation = self.activation.__name__.upper()
-    max_conv_inputs = max(max_conv_inputs, weights[0].shape[1]*weights[0].shape[0])
-    hf.write('#define {}_OUT_SIZE {}\n'.format(name.upper(), weights[0].shape[2]))
-    hf.write('#define {}_STATE_SIZE ({}*{})\n'.format(name.upper(), weights[0].shape[1], (weights[0].shape[0]-1)))
-    hf.write('#define {}_DELAY {}\n'.format(name.upper(), (weights[0].shape[0]-1)//2))
-    model_struct.write('  Conv1DLayer {};\n'.format(name));
-    model_init.write('  if (conv1d_init(&model->{}, arrays, "{}_bias", "{}_weights", {}, {}, {}, ACTIVATION_{})) return 1;\n'
-            .format(name, name, name, weights[0].shape[1], weights[0].shape[0], weights[0].shape[2], activation))
-    return True
-Conv1D.dump_layer = dump_conv1d_layer
-
-
-def dump_embedding_layer_impl(name, weights, f, hf):
-    printVector(f, weights, name + '_weights')
-    hf.write('#define {}_OUT_SIZE {}\n'.format(name.upper(), weights.shape[1]))
-    model_struct.write('  EmbeddingLayer {};\n'.format(name));
-    model_init.write('  if (embedding_init(&model->{}, arrays, "{}_weights", {}, {})) return 1;\n'
-            .format(name, name, weights.shape[0], weights.shape[1]))
-
-def dump_embedding_layer(self, f, hf):
-    name = self.name
-    print("printing layer " + name + " of type " + self.__class__.__name__)
-    weights = self.get_weights()[0]
-    dump_embedding_layer_impl(name, weights, f, hf)
-    return False
-Embedding.dump_layer = dump_embedding_layer
-diff_Embed.dump_layer = dump_embedding_layer
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser()
-    parser.add_argument('model_file', type=str, help='model weight h5 file')
-    parser.add_argument('--nnet-header', type=str, help='name of c header file for dumped model', default='nnet_data.h')
-    parser.add_argument('--nnet-source', type=str, help='name of c source file for dumped model', default='nnet_data.c')
-    parser.add_argument('--lpc-gamma', type=float, help='LPC weighting factor. If not specified I will attempt to read it from the model file with 1 as default', default=None)
-    parser.add_argument('--lookahead', type=float, help='Features lookahead. If not specified I will attempt to read it from the model file with 2 as default', default=None)
-
-    args = parser.parse_args()
-
-    filename = args.model_file
-    with h5py.File(filename, "r") as f:
-        units = min(f['model_weights']['gru_a']['gru_a']['recurrent_kernel:0'].shape)
-        units2 = min(f['model_weights']['gru_b']['gru_b']['recurrent_kernel:0'].shape)
-        cond_size = min(f['model_weights']['feature_dense1']['feature_dense1']['kernel:0'].shape)
-        e2e = 'rc2lpc' in f['model_weights']
-
-    model, _, _ = lpcnet.new_lpcnet_model(rnn_units1=units, rnn_units2=units2, flag_e2e = e2e, cond_size=cond_size)
-    model.compile(optimizer='adam', loss='sparse_categorical_crossentropy', metrics=['sparse_categorical_accuracy'])
-    #model.summary()
-
-    model.load_weights(filename, by_name=True)
-
-    cfile = args.nnet_source
-    hfile = args.nnet_header
-
-    f = open(cfile, 'w')
-    hf = open(hfile, 'w')
-    model_struct = io.StringIO()
-    model_init = io.StringIO()
-    model_struct.write('typedef struct {\n')
-    model_init.write('#ifndef DUMP_BINARY_WEIGHTS\n')
-    model_init.write('int init_lpcnet_model(LPCNetModel *model, const WeightArray *arrays) {\n')
-    array_list = []
-
-    f.write('/*This file is automatically generated from a Keras model*/\n')
-    f.write('/*based on model {}*/\n\n'.format(sys.argv[1]))
-    f.write('#ifdef HAVE_CONFIG_H\n#include "config.h"\n#endif\n\n#include "nnet.h"\n#include "{}"\n\n'.format(hfile))
-
-    hf.write('/*This file is automatically generated from a Keras model*/\n\n')
-    hf.write('#ifndef RNN_DATA_H\n#define RNN_DATA_H\n\n#include "nnet.h"\n\n')
-
-    if e2e:
-        hf.write('/* This is an end-to-end model */\n')
-        hf.write('#define END2END\n\n')
-    else:
-        hf.write('/* This is *not* an end-to-end model */\n')
-        hf.write('/* #define END2END */\n\n')
-
-    # LPC weighting factor
-    if type(args.lpc_gamma) == type(None):
-        lpc_gamma = get_parameter(model, 'lpc_gamma', 1)
-    else:
-        lpc_gamma = args.lpc_gamma
-
-    hf.write('/* LPC weighting factor */\n')
-    hf.write('#define LPC_GAMMA ' + str(lpc_gamma) +'f\n\n')
-
-    # look-ahead
-    if type(args.lookahead) == type(None):
-        lookahead = get_parameter(model, 'lookahead', 2)
-    else:
-        lookahead = args.lookahead
-
-    hf.write('/* Features look-ahead */\n')
-    hf.write('#define FEATURES_DELAY ' + str(lookahead) +'\n\n')
-
-    embed_size = lpcnet.embed_size
-
-    E = model.get_layer('embed_sig').get_weights()[0]
-    W = model.get_layer('gru_a').get_weights()[0][:embed_size,:]
-    dump_embedding_layer_impl('gru_a_embed_sig', np.dot(E, W), f, hf)
-    W = model.get_layer('gru_a').get_weights()[0][embed_size:2*embed_size,:]
-    dump_embedding_layer_impl('gru_a_embed_pred', np.dot(E, W), f, hf)
-    W = model.get_layer('gru_a').get_weights()[0][2*embed_size:3*embed_size,:]
-    dump_embedding_layer_impl('gru_a_embed_exc', np.dot(E, W), f, hf)
-    W = model.get_layer('gru_a').get_weights()[0][3*embed_size:,:]
-    #FIXME: dump only half the biases
-    b = model.get_layer('gru_a').get_weights()[2]
-    dump_dense_layer_impl('gru_a_dense_feature', W, b[:len(b)//2], 'LINEAR', f, hf)
-
-    W = model.get_layer('gru_b').get_weights()[0][model.rnn_units1:,:]
-    b = model.get_layer('gru_b').get_weights()[2]
-    # Set biases to zero because they'll be included in the GRU input part
-    # (we need regular and SU biases)
-    dump_dense_layer_impl('gru_b_dense_feature', W, 0*b[:len(b)//2], 'LINEAR', f, hf)
-    dump_grub(model.get_layer('gru_b'), f, hf, model.rnn_units1)
-
-    layer_list = []
-    for i, layer in enumerate(model.layers):
-        if layer.dump_layer(f, hf):
-            layer_list.append(layer.name)
-
-    dump_sparse_gru(model.get_layer('gru_a'), f, hf)
-
-    f.write('#ifndef USE_WEIGHTS_FILE\n')
-    f.write('const WeightArray lpcnet_arrays[] = {\n')
-    for name in array_list:
-        f.write('#ifdef WEIGHTS_{}_DEFINED\n'.format(name))
-        f.write('  {{"{}", WEIGHTS_{}_TYPE, sizeof({}), {}}},\n'.format(name, name, name, name))
-        f.write('#endif\n')
-    f.write('  {NULL, 0, 0, NULL}\n};\n')
-    f.write('#endif\n')
-
-    model_init.write('  return 0;\n}\n')
-    model_init.write('#endif\n')
-    f.write(model_init.getvalue())
-
-    hf.write('#define MAX_RNN_NEURONS {}\n\n'.format(max_rnn_neurons))
-    hf.write('#define MAX_CONV_INPUTS {}\n\n'.format(max_conv_inputs))
-    hf.write('#define MAX_MDENSE_TMP {}\n\n'.format(max_mdense_tmp))
-
-
-    hf.write('typedef struct {\n')
-    for i, name in enumerate(layer_list):
-        hf.write('  float {}_state[{}_STATE_SIZE];\n'.format(name, name.upper()))
-    hf.write('} NNetState;\n\n')
-
-    model_struct.write('} LPCNetModel;\n\n')
-    hf.write(model_struct.getvalue())
-    hf.write('int init_lpcnet_model(LPCNetModel *model, const WeightArray *arrays);\n\n')
-    hf.write('\n\n#endif\n')
-
-    f.close()
-    hf.close()
diff --git a/dnn/training_tf2/dump_plc.py b/dnn/training_tf2/dump_plc.py
deleted file mode 100755
index a490ade1d..000000000
--- a/dnn/training_tf2/dump_plc.py
+++ /dev/null
@@ -1,296 +0,0 @@
-#!/usr/bin/python3
-'''Copyright (c) 2021-2022 Amazon
-   Copyright (c) 2017-2018 Mozilla
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-'''
-
-import lpcnet_plc
-import io
-import sys
-import numpy as np
-from tensorflow.keras.optimizers import Adam
-from tensorflow.keras.layers import Layer, GRU, Dense, Conv1D, Embedding
-import h5py
-import re
-
-# Flag for dumping e2e (differentiable lpc) network weights
-flag_e2e = False
-
-max_rnn_neurons = 1
-max_conv_inputs = 1
-
-def printVector(f, vector, name, dtype='float', dotp=False):
-    global array_list
-    if dotp:
-        vector = vector.reshape((vector.shape[0]//4, 4, vector.shape[1]//8, 8))
-        vector = vector.transpose((2, 0, 3, 1))
-    v = np.reshape(vector, (-1));
-    #print('static const float ', name, '[', len(v), '] = \n', file=f)
-    if name not in array_list:
-        array_list.append(name)
-    f.write('#ifndef USE_WEIGHTS_FILE\n')
-    f.write('#define WEIGHTS_{}_DEFINED\n'.format(name))
-    f.write('#define WEIGHTS_{}_TYPE WEIGHT_TYPE_{}\n'.format(name, dtype))
-    f.write('static const {} {}[{}] = {{\n   '.format(dtype, name, len(v)))
-    for i in range(0, len(v)):
-        f.write('{}'.format(v[i]))
-        if (i!=len(v)-1):
-            f.write(',')
-        else:
-            break;
-        if (i%8==7):
-            f.write("\n   ")
-        else:
-            f.write(" ")
-    #print(v, file=f)
-    f.write('\n};\n')
-    f.write('#endif\n\n')
-    return;
-
-def printSparseVector(f, A, name, have_diag=True):
-    N = A.shape[0]
-    M = A.shape[1]
-    W = np.zeros((0,), dtype='int')
-    W0 = np.zeros((0,))
-    if have_diag:
-        diag = np.concatenate([np.diag(A[:,:N]), np.diag(A[:,N:2*N]), np.diag(A[:,2*N:])])
-        A[:,:N] = A[:,:N] - np.diag(np.diag(A[:,:N]))
-        A[:,N:2*N] = A[:,N:2*N] - np.diag(np.diag(A[:,N:2*N]))
-        A[:,2*N:] = A[:,2*N:] - np.diag(np.diag(A[:,2*N:]))
-        printVector(f, diag, name + '_diag')
-    AQ = np.minimum(127, np.maximum(-128, np.round(A*128))).astype('int')
-    idx = np.zeros((0,), dtype='int')
-    for i in range(M//8):
-        pos = idx.shape[0]
-        idx = np.append(idx, -1)
-        nb_nonzero = 0
-        for j in range(N//4):
-            block = A[j*4:(j+1)*4, i*8:(i+1)*8]
-            qblock = AQ[j*4:(j+1)*4, i*8:(i+1)*8]
-            if np.sum(np.abs(block)) > 1e-10:
-                nb_nonzero = nb_nonzero + 1
-                idx = np.append(idx, j*4)
-                vblock = qblock.transpose((1,0)).reshape((-1,))
-                W0 = np.concatenate([W0, block.reshape((-1,))])
-                W = np.concatenate([W, vblock])
-        idx[pos] = nb_nonzero
-    f.write('#ifdef DOT_PROD\n')
-    printVector(f, W, name, dtype='qweight')
-    f.write('#else /*DOT_PROD*/\n')
-    printVector(f, W0, name, dtype='qweight')
-    f.write('#endif /*DOT_PROD*/\n')
-    #idx = np.tile(np.concatenate([np.array([N]), np.arange(N)]), 3*N//16)
-    printVector(f, idx, name + '_idx', dtype='int')
-    return AQ
-
-def dump_layer_ignore(self, f, hf):
-    print("ignoring layer " + self.name + " of type " + self.__class__.__name__)
-    return False
-Layer.dump_layer = dump_layer_ignore
-
-def dump_sparse_gru(self, f, hf):
-    global max_rnn_neurons
-    name = 'sparse_' + self.name
-    print("printing layer " + name + " of type sparse " + self.__class__.__name__)
-    weights = self.get_weights()
-    qweights = printSparseVector(f, weights[1], name + '_recurrent_weights')
-    printVector(f, weights[-1], name + '_bias')
-    subias = weights[-1].copy()
-    subias[1,:] = subias[1,:] - np.sum(qweights*(1./128),axis=0)
-    printVector(f, subias, name + '_subias')
-    if hasattr(self, 'activation'):
-        activation = self.activation.__name__.upper()
-    else:
-        activation = 'TANH'
-    if hasattr(self, 'reset_after') and not self.reset_after:
-        reset_after = 0
-    else:
-        reset_after = 1
-    neurons = weights[0].shape[1]//3
-    max_rnn_neurons = max(max_rnn_neurons, neurons)
-    hf.write('#define {}_OUT_SIZE {}\n'.format(name.upper(), weights[0].shape[1]//3))
-    hf.write('#define {}_STATE_SIZE {}\n'.format(name.upper(), weights[0].shape[1]//3))
-    model_struct.write('  SparseGRULayer {};\n'.format(name));
-    model_init.write('  if (sparse_gru_init(&model->{}, arrays, "{}_bias", "{}_subias", "{}_recurrent_weights_diag", "{}_recurrent_weights", "{}_recurrent_weights_idx",  {}, ACTIVATION_{}, {})) return 1;\n'
-            .format(name, name, name, name, name, name, weights[0].shape[1]//3, activation, reset_after))
-    return True
-
-def dump_gru_layer(self, f, hf):
-    global max_rnn_neurons
-    name = self.name
-    print("printing layer " + name + " of type " + self.__class__.__name__)
-    weights = self.get_weights()
-    qweight = printSparseVector(f, weights[0], name + '_weights', have_diag=False)
-
-    f.write('#ifdef DOT_PROD\n')
-    qweight2 = np.clip(np.round(128.*weights[1]).astype('int'), -128, 127)
-    printVector(f, qweight2, name + '_recurrent_weights', dotp=True, dtype='qweight')
-    f.write('#else /*DOT_PROD*/\n')
-    printVector(f, weights[1], name + '_recurrent_weights')
-    f.write('#endif /*DOT_PROD*/\n')
-
-    printVector(f, weights[-1], name + '_bias')
-    subias = weights[-1].copy()
-    subias[0,:] = subias[0,:] - np.sum(qweight*(1./128.),axis=0)
-    subias[1,:] = subias[1,:] - np.sum(qweight2*(1./128.),axis=0)
-    printVector(f, subias, name + '_subias')
-    if hasattr(self, 'activation'):
-        activation = self.activation.__name__.upper()
-    else:
-        activation = 'TANH'
-    if hasattr(self, 'reset_after') and not self.reset_after:
-        reset_after = 0
-    else:
-        reset_after = 1
-    neurons = weights[0].shape[1]//3
-    max_rnn_neurons = max(max_rnn_neurons, neurons)
-    hf.write('#define {}_OUT_SIZE {}\n'.format(name.upper(), weights[0].shape[1]//3))
-    hf.write('#define {}_STATE_SIZE {}\n'.format(name.upper(), weights[0].shape[1]//3))
-    model_struct.write('  GRULayer {};\n'.format(name));
-    model_init.write('  if (gru_init(&model->{}, arrays, "{}_bias", "{}_subias", "{}_weights", "{}_weights_idx", "{}_recurrent_weights", {}, {}, ACTIVATION_{}, {})) return 1;\n'
-             .format(name, name, name, name, name, name, weights[0].shape[0], weights[0].shape[1]//3, activation, reset_after))
-    return True
-GRU.dump_layer = dump_gru_layer
-
-def dump_gru_layer_dummy(self, f, hf):
-    name = self.name
-    weights = self.get_weights()
-    hf.write('#define {}_OUT_SIZE {}\n'.format(name.upper(), weights[0].shape[1]//3))
-    hf.write('#define {}_STATE_SIZE {}\n'.format(name.upper(), weights[0].shape[1]//3))
-    return True;
-
-#GRU.dump_layer = dump_gru_layer_dummy
-
-def dump_dense_layer_impl(name, weights, bias, activation, f, hf):
-    printVector(f, weights, name + '_weights')
-    printVector(f, bias, name + '_bias')
-    hf.write('#define {}_OUT_SIZE {}\n'.format(name.upper(), weights.shape[1]))
-    model_struct.write('  DenseLayer {};\n'.format(name));
-    model_init.write('  if (dense_init(&model->{}, arrays, "{}_bias", "{}_weights", {}, {}, ACTIVATION_{})) return 1;\n'
-            .format(name, name, name, weights.shape[0], weights.shape[1], activation))
-
-def dump_dense_layer(self, f, hf):
-    name = self.name
-    print("printing layer " + name + " of type " + self.__class__.__name__)
-    weights = self.get_weights()
-    activation = self.activation.__name__.upper()
-    dump_dense_layer_impl(name, weights[0], weights[1], activation, f, hf)
-    return False
-
-Dense.dump_layer = dump_dense_layer
-
-def dump_conv1d_layer(self, f, hf):
-    global max_conv_inputs
-    name = self.name
-    print("printing layer " + name + " of type " + self.__class__.__name__)
-    weights = self.get_weights()
-    printVector(f, weights[0], name + '_weights')
-    printVector(f, weights[-1], name + '_bias')
-    activation = self.activation.__name__.upper()
-    max_conv_inputs = max(max_conv_inputs, weights[0].shape[1]*weights[0].shape[0])
-    hf.write('#define {}_OUT_SIZE {}\n'.format(name.upper(), weights[0].shape[2]))
-    hf.write('#define {}_STATE_SIZE ({}*{})\n'.format(name.upper(), weights[0].shape[1], (weights[0].shape[0]-1)))
-    hf.write('#define {}_DELAY {}\n'.format(name.upper(), (weights[0].shape[0]-1)//2))
-    model_struct.write('  Conv1DLayer {};\n'.format(name));
-    model_init.write('  if (conv1d_init(&model->{}, arrays, "{}_bias", "{}_weights", {}, {}, {}, ACTIVATION_{})) return 1;\n'
-            .format(name, name, name, weights[0].shape[1], weights[0].shape[0], weights[0].shape[2], activation))
-    return True
-Conv1D.dump_layer = dump_conv1d_layer
-
-
-
-filename = sys.argv[1]
-with h5py.File(filename, "r") as f:
-    units = min(f['model_weights']['plc_gru1']['plc_gru1']['recurrent_kernel:0'].shape)
-    units2 = min(f['model_weights']['plc_gru2']['plc_gru2']['recurrent_kernel:0'].shape)
-    cond_size = f['model_weights']['plc_dense1']['plc_dense1']['kernel:0'].shape[1]
-
-model = lpcnet_plc.new_lpcnet_plc_model(rnn_units=units, cond_size=cond_size)
-model.compile(optimizer='adam', loss='sparse_categorical_crossentropy', metrics=['sparse_categorical_accuracy'])
-#model.summary()
-
-model.load_weights(filename, by_name=True)
-
-if len(sys.argv) > 2:
-    cfile = sys.argv[2];
-    hfile = sys.argv[3];
-else:
-    cfile = 'plc_data.c'
-    hfile = 'plc_data.h'
-
-
-f = open(cfile, 'w')
-hf = open(hfile, 'w')
-model_struct = io.StringIO()
-model_init = io.StringIO()
-model_struct.write('typedef struct {\n')
-model_init.write('#ifndef DUMP_BINARY_WEIGHTS\n')
-model_init.write('int init_plc_model(PLCModel *model, const WeightArray *arrays) {\n')
-array_list = []
-
-
-f.write('/*This file is automatically generated from a Keras model*/\n')
-f.write('/*based on model {}*/\n\n'.format(sys.argv[1]))
-f.write('#ifdef HAVE_CONFIG_H\n#include "config.h"\n#endif\n\n#include "nnet.h"\n#include "{}"\n\n'.format(hfile))
-
-hf.write('/*This file is automatically generated from a Keras model*/\n\n')
-hf.write('#ifndef PLC_DATA_H\n#define PLC_DATA_H\n\n#include "nnet.h"\n\n')
-
-layer_list = []
-for i, layer in enumerate(model.layers):
-    if layer.dump_layer(f, hf):
-        layer_list.append(layer.name)
-
-#dump_sparse_gru(model.get_layer('gru_a'), f, hf)
-f.write('#ifndef USE_WEIGHTS_FILE\n')
-f.write('const WeightArray lpcnet_plc_arrays[] = {\n')
-for name in array_list:
-    f.write('#ifdef WEIGHTS_{}_DEFINED\n'.format(name))
-    f.write('  {{"{}", WEIGHTS_{}_TYPE, sizeof({}), {}}},\n'.format(name, name, name, name))
-    f.write('#endif\n')
-f.write('  {NULL, 0, 0, NULL}\n};\n')
-f.write('#endif\n')
-
-model_init.write('  return 0;\n}\n')
-model_init.write('#endif\n')
-f.write(model_init.getvalue())
-
-
-hf.write('#define PLC_MAX_RNN_NEURONS {}\n\n'.format(max_rnn_neurons))
-#hf.write('#define PLC_MAX_CONV_INPUTS {}\n\n'.format(max_conv_inputs))
-
-hf.write('typedef struct {\n')
-for i, name in enumerate(layer_list):
-    hf.write('  float {}_state[{}_STATE_SIZE];\n'.format(name, name.upper()))
-hf.write('} PLCNetState;\n\n')
-
-model_struct.write('} PLCModel;\n\n')
-hf.write(model_struct.getvalue())
-hf.write('int init_plc_model(PLCModel *model, const WeightArray *arrays);\n\n')
-
-hf.write('\n\n#endif\n')
-
-f.close()
-hf.close()
diff --git a/dnn/training_tf2/dump_rdovae.py b/dnn/training_tf2/dump_rdovae.py
deleted file mode 100644
index 1858c8a49..000000000
--- a/dnn/training_tf2/dump_rdovae.py
+++ /dev/null
@@ -1,306 +0,0 @@
-"""
-/* Copyright (c) 2022 Amazon
-   Written by Jan Buethe */
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-"""
-
-
-import argparse
-from ftplib import parse150
-import os
-
-os.environ['CUDA_VISIBLE_DEVICES'] = ""
-
-parser = argparse.ArgumentParser()
-
-parser.add_argument('weights', metavar="<weight file>", type=str, help='model weight file in hdf5 format')
-parser.add_argument('--cond-size', type=int, help="conditioning size (default: 256)", default=256)
-parser.add_argument('--latent-dim', type=int, help="dimension of latent space (default: 80)", default=80)
-parser.add_argument('--quant-levels', type=int, help="number of quantization steps (default: 16)", default=16)
-
-args = parser.parse_args()
-
-# now import the heavy stuff
-import tensorflow as tf
-import numpy as np
-from keraslayerdump import dump_conv1d_layer, dump_dense_layer, dump_gru_layer, printVector
-from rdovae import new_rdovae_model
-
-def start_header(header_fid, header_name):
-    header_guard = os.path.basename(header_name)[:-2].upper() + "_H"
-    header_fid.write(
-f"""
-#ifndef {header_guard}
-#define {header_guard}
-
-"""
-    )
-
-def finish_header(header_fid):
-    header_fid.write(
-"""
-#endif
-
-"""
-    )
-
-def start_source(source_fid, header_name, weight_file):
-    source_fid.write(
-f"""
-/* this source file was automatically generated from weight file {weight_file} */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "{header_name}"
-
-"""
-    )
-
-def finish_source(source_fid):
-    pass
-
-
-def dump_statistical_model(qembedding, f, fh):
-    w = qembedding.weights[0].numpy()
-    levels, dim = w.shape
-    N = dim // 6
-
-    print("dumping statistical model")
-    quant_scales    = tf.math.softplus(w[:, : N]).numpy()
-    dead_zone       = 0.05 * tf.math.softplus(w[:, N : 2 * N]).numpy()
-    r               = tf.math.sigmoid(w[:, 5 * N : 6 * N]).numpy()
-    p0              = tf.math.sigmoid(w[:, 4 * N : 5 * N]).numpy()
-    p0              = 1 - r ** (0.5 + 0.5 * p0)
-
-    quant_scales_q8 = np.round(quant_scales * 2**8).astype(np.uint16)
-    dead_zone_q10   = np.round(dead_zone * 2**10).astype(np.uint16)
-    r_q15           = np.round(r * 2**15).astype(np.uint16)
-    p0_q15          = np.round(p0 * 2**15).astype(np.uint16)
-
-    printVector(f, quant_scales_q8, 'dred_quant_scales_q8', dtype='opus_uint16', static=False)
-    printVector(f, dead_zone_q10, 'dred_dead_zone_q10', dtype='opus_uint16', static=False)
-    printVector(f, r_q15, 'dred_r_q15', dtype='opus_uint16', static=False)
-    printVector(f, p0_q15, 'dred_p0_q15', dtype='opus_uint16', static=False)
-
-    fh.write(
-f"""
-extern const opus_uint16 dred_quant_scales_q8[{levels * N}];
-extern const opus_uint16 dred_dead_zone_q10[{levels * N}];
-extern const opus_uint16 dred_r_q15[{levels * N}];
-extern const opus_uint16 dred_p0_q15[{levels * N}];
-
-"""
-    )
-
-if __name__ == "__main__":
-
-    model, encoder, decoder, qembedding = new_rdovae_model(20, args.latent_dim, cond_size=args.cond_size, nb_quant=args.quant_levels)
-    model.load_weights(args.weights)
-
-
-
-
-    # encoder
-    encoder_dense_names = [
-        'enc_dense1',
-        'enc_dense3',
-        'enc_dense5',
-        'enc_dense7',
-        'enc_dense8',
-        'gdense1',
-        'gdense2'
-    ]
-
-    encoder_gru_names = [
-        'enc_dense2',
-        'enc_dense4',
-        'enc_dense6'
-    ]
-
-    encoder_conv1d_names = [
-        'bits_dense'
-    ]
-
-    source_fid = open("dred_rdovae_enc_data.c", 'w')
-    header_fid = open("dred_rdovae_enc_data.h", 'w')
-
-    start_header(header_fid, "dred_rdovae_enc_data.h")
-    start_source(source_fid, "dred_rdovae_enc_data.h", os.path.basename(args.weights))
-
-    header_fid.write(
-f"""
-#include "dred_rdovae_constants.h"
-
-#include "nnet.h"
-"""
-    )
-
-    # dump GRUs
-    max_rnn_neurons_enc = max(
-        [
-            dump_gru_layer(encoder.get_layer(name), source_fid, header_fid, dotp=True, sparse=True)
-            for name in encoder_gru_names
-        ]
-    )
-
-    # dump conv layers
-    max_conv_inputs = max(
-        [
-            dump_conv1d_layer(encoder.get_layer(name), source_fid, header_fid)
-            for name in encoder_conv1d_names
-        ]
-    )
-
-    # dump Dense layers
-    for name in encoder_dense_names:
-        layer = encoder.get_layer(name)
-        dump_dense_layer(layer, source_fid, header_fid)
-
-    # some global constants
-    header_fid.write(
-f"""
-
-#define DRED_ENC_MAX_RNN_NEURONS {max_rnn_neurons_enc}
-
-#define DRED_ENC_MAX_CONV_INPUTS {max_conv_inputs}
-
-"""
-    )
-
-    finish_header(header_fid)
-    finish_source(source_fid)
-
-    header_fid.close()
-    source_fid.close()
-
-    # statistical model
-    source_fid = open("dred_rdovae_stats_data.c", 'w')
-    header_fid = open("dred_rdovae_stats_data.h", 'w')
-
-    start_header(header_fid, "dred_rdovae_stats_data.h")
-    start_source(source_fid, "dred_rdovae_stats_data.h", os.path.basename(args.weights))
-
-    header_fid.write(
-"""
-
-#include "opus_types.h"
-
-"""
-    )
-
-    dump_statistical_model(qembedding, source_fid, header_fid)
-
-    finish_header(header_fid)
-    finish_source(source_fid)
-
-    header_fid.close()
-    source_fid.close()
-
-    # decoder
-    decoder_dense_names = [
-        'state1',
-        'state2',
-        'state3',
-        'dec_dense1',
-        'dec_dense3',
-        'dec_dense5',
-        'dec_dense7',
-        'dec_dense8',
-        'dec_final'
-    ]
-
-    decoder_gru_names = [
-        'dec_dense2',
-        'dec_dense4',
-        'dec_dense6'
-    ]
-
-    source_fid = open("dred_rdovae_dec_data.c", 'w')
-    header_fid = open("dred_rdovae_dec_data.h", 'w')
-
-    start_header(header_fid, "dred_rdovae_dec_data.h")
-    start_source(source_fid, "dred_rdovae_dec_data.h", os.path.basename(args.weights))
-
-    header_fid.write(
-f"""
-#include "dred_rdovae_constants.h"
-
-#include "nnet.h"
-"""
-    )
-
-
-    # dump GRUs
-    max_rnn_neurons_dec = max(
-        [
-            dump_gru_layer(decoder.get_layer(name), source_fid, header_fid, dotp=True, sparse=True)
-            for name in decoder_gru_names
-        ]
-    )
-
-    # dump Dense layers
-    for name in decoder_dense_names:
-        layer = decoder.get_layer(name)
-        dump_dense_layer(layer, source_fid, header_fid)
-
-    # some global constants
-    header_fid.write(
-f"""
-
-#define DRED_DEC_MAX_RNN_NEURONS {max_rnn_neurons_dec}
-
-"""
-    )
-
-    finish_header(header_fid)
-    finish_source(source_fid)
-
-    header_fid.close()
-    source_fid.close()
-
-    # common constants
-    header_fid = open("dred_rdovae_constants.h", 'w')
-    start_header(header_fid, "dred_rdovae_constants.h")
-
-    header_fid.write(
-f"""
-#define DRED_NUM_FEATURES 20
-
-#define DRED_LATENT_DIM {args.latent_dim}
-
-#define DRED_STATE_DIM {24}
-
-#define DRED_NUM_QUANTIZATION_LEVELS {qembedding.weights[0].shape[0]}
-
-#define DRED_MAX_RNN_NEURONS {max(max_rnn_neurons_enc, max_rnn_neurons_dec)}
-
-#define DRED_MAX_CONV_INPUTS {max_conv_inputs}
-"""
-    )
-
-    finish_header(header_fid)
\ No newline at end of file
diff --git a/dnn/training_tf2/encode_rdovae.py b/dnn/training_tf2/encode_rdovae.py
deleted file mode 100644
index f144fc48e..000000000
--- a/dnn/training_tf2/encode_rdovae.py
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/usr/bin/python3
-'''Copyright (c) 2021-2022 Amazon
-   Copyright (c) 2018-2019 Mozilla
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-'''
-
-# Train an LPCNet model
-
-import argparse
-#from plc_loader import PLCLoader
-
-parser = argparse.ArgumentParser(description='Train a PLC model')
-
-parser.add_argument('features', metavar='<features file>', help='binary features file (float32)')
-parser.add_argument('output', metavar='<output>', help='trained model file (.h5)')
-parser.add_argument('--model', metavar='<model>', default='rdovae', help='PLC model python definition (without .py)')
-group1 = parser.add_mutually_exclusive_group()
-group1.add_argument('--weights', metavar='<input weights>', help='model weights')
-parser.add_argument('--cond-size', metavar='<units>', default=1024, type=int, help='number of units in conditioning network (default 1024)')
-parser.add_argument('--batch-size', metavar='<batch size>', default=1, type=int, help='batch size to use (default 128)')
-parser.add_argument('--seq-length', metavar='<sequence length>', default=1000, type=int, help='sequence length to use (default 1000)')
-
-
-args = parser.parse_args()
-
-import importlib
-rdovae = importlib.import_module(args.model)
-
-from rdovae import apply_dead_zone
-
-import sys
-import numpy as np
-from tensorflow.keras.optimizers import Adam
-from tensorflow.keras.callbacks import ModelCheckpoint, CSVLogger
-import tensorflow.keras.backend as K
-import h5py
-
-import tensorflow as tf
-from rdovae import pvq_quantize
-
-# Try reducing batch_size if you run out of memory on your GPU
-batch_size = args.batch_size
-
-model, encoder, decoder, qembedding = rdovae.new_rdovae_model(nb_used_features=20, nb_bits=80, batch_size=batch_size, cond_size=args.cond_size)
-model.load_weights(args.weights)
-
-lpc_order = 16
-
-feature_file = args.features
-nb_features = model.nb_used_features + lpc_order
-nb_used_features = model.nb_used_features
-sequence_size = args.seq_length
-
-# u for unquantised, load 16 bit PCM samples and convert to mu-law
-
-
-features = np.memmap(feature_file, dtype='float32', mode='r')
-nb_sequences = len(features)//(nb_features*sequence_size)//batch_size*batch_size
-features = features[:nb_sequences*sequence_size*nb_features]
-
-features = np.reshape(features, (nb_sequences, sequence_size, nb_features))
-print(features.shape)
-features = features[:, :, :nb_used_features]
-#features = np.random.randn(73600, 1000, 17)
-
-
-bits, gru_state_dec = encoder.predict([features], batch_size=batch_size)
-(gru_state_dec).astype('float32').tofile(args.output + "-state.f32")
-
-
-#dist = rdovae.feat_dist_loss(features, quant_out)
-#rate = rdovae.sq1_rate_loss(features, model_bits)
-#rate2 = rdovae.sq_rate_metric(features, model_bits)
-#print(dist, rate, rate2)
-
-print("shapes are:")
-print(bits.shape)
-print(gru_state_dec.shape)
-
-features.astype('float32').tofile(args.output + "-input.f32")
-#quant_out.astype('float32').tofile(args.output + "-enc_dec.f32")
-nbits=80
-bits.astype('float32').tofile(args.output + "-syms.f32")
-
-lambda_val = 0.0002 * np.ones((nb_sequences, sequence_size//2, 1))
-quant_id = np.round(3.8*np.log(lambda_val/.0002)).astype('int16')
-quant_id = quant_id[:,:,0]
-quant_embed = qembedding(quant_id)
-quant_scale = tf.math.softplus(quant_embed[:,:,:nbits])
-dead_zone = tf.math.softplus(quant_embed[:, :, nbits : 2 * nbits])
-
-bits = bits*quant_scale
-bits = np.round(apply_dead_zone([bits, dead_zone]).numpy())
-bits = bits/quant_scale
-
-gru_state_dec = pvq_quantize(gru_state_dec, 82)
-#gru_state_dec = gru_state_dec/(1e-15+tf.norm(gru_state_dec, axis=-1,keepdims=True))
-gru_state_dec = gru_state_dec[:,-1,:]
-dec_out = decoder([bits[:,1::2,:], gru_state_dec])
-
-print(dec_out.shape)
-
-dec_out.numpy().astype('float32').tofile(args.output + "-quant_out.f32")
diff --git a/dnn/training_tf2/fec_encoder.py b/dnn/training_tf2/fec_encoder.py
deleted file mode 100644
index 15ef12b2c..000000000
--- a/dnn/training_tf2/fec_encoder.py
+++ /dev/null
@@ -1,256 +0,0 @@
-"""
-/* Copyright (c) 2022 Amazon
-   Written by Jan Buethe and Jean-Marc Valin */
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-"""
-import os
-import subprocess
-import argparse
-
-
-import numpy as np
-from scipy.io import wavfile
-import tensorflow as tf
-
-from rdovae import new_rdovae_model, pvq_quantize, apply_dead_zone, sq_rate_metric
-from fec_packets import write_fec_packets, read_fec_packets
-
-
-debug = False
-
-if debug:
-    args = type('dummy', (object,),
-    {
-        'input' : 'item1.wav',
-        'weights' : 'testout/rdovae_alignment_fix_1024_120.h5',
-        'enc_lambda' : 0.0007,
-        'output' : "test_0007.fec",
-        'cond_size' : 1024,
-        'num_redundancy_frames' : 64,
-        'extra_delay' : 0,
-        'dump_data' : './dump_data'
-    })()
-    os.environ['CUDA_VISIBLE_DEVICES']=""
-else:
-    parser = argparse.ArgumentParser(description='Encode redundancy for Opus neural FEC. Designed for use with voip application and 20ms frames')
-
-    parser.add_argument('input', metavar='<input signal>', help='audio input (.wav or .raw or .pcm as int16)')
-    parser.add_argument('weights', metavar='<weights>', help='trained model file (.h5)')
-#    parser.add_argument('enc_lambda', metavar='<lambda>', type=float, help='lambda for controlling encoder rate')
-    parser.add_argument('output', type=str, help='output file (will be extended with .fec)')
-
-    parser.add_argument('--dump-data', type=str, default='./dump_data', help='path to dump data executable (default ./dump_data)')
-    parser.add_argument('--cond-size', metavar='<units>', default=1024, type=int, help='number of units in conditioning network (default 1024)')
-    parser.add_argument('--quant-levels', type=int, help="number of quantization steps (default: 40)", default=40)
-    parser.add_argument('--num-redundancy-frames', default=64, type=int, help='number of redundancy frames (20ms) per packet (default 64)')
-    parser.add_argument('--extra-delay', default=0, type=int, help="last features in packet are calculated with the decoder aligned samples, use this option to add extra delay (in samples at 16kHz)")
-    parser.add_argument('--lossfile', type=str, help='file containing loss trace (0 for frame received, 1 for lost)')
-
-    parser.add_argument('--debug-output', action='store_true', help='if set, differently assembled features are written to disk')
-
-    args = parser.parse_args()
-
-model, encoder, decoder, qembedding = new_rdovae_model(nb_used_features=20, nb_bits=80, batch_size=1, nb_quant=args.quant_levels, cond_size=args.cond_size)
-model.load_weights(args.weights)
-
-lpc_order = 16
-
-## prepare input signal
-# SILK frame size is 20ms and LPCNet subframes are 10ms
-subframe_size = 160
-frame_size = 2 * subframe_size
-
-# 91 samples delay to align with SILK decoded frames
-silk_delay = 91
-
-# prepend zeros to have enough history to produce the first package
-zero_history = (args.num_redundancy_frames - 1) * frame_size
-
-# dump data has a (feature) delay of 10ms
-dump_data_delay = 160
-
-total_delay = silk_delay + zero_history + args.extra_delay - dump_data_delay
-
-# load signal
-if args.input.endswith('.raw') or args.input.endswith('.pcm') or args.input.endswith('.sw'):
-    signal = np.fromfile(args.input, dtype='int16')
-
-elif args.input.endswith('.wav'):
-    fs, signal = wavfile.read(args.input)
-else:
-    raise ValueError(f'unknown input signal format: {args.input}')
-
-# fill up last frame with zeros
-padded_signal_length = len(signal) + total_delay
-tail = padded_signal_length % frame_size
-right_padding = (frame_size - tail) % frame_size
-
-signal = np.concatenate((np.zeros(total_delay, dtype=np.int16), signal, np.zeros(right_padding, dtype=np.int16)))
-
-padded_signal_file  = os.path.splitext(args.input)[0] + '_padded.raw'
-signal.tofile(padded_signal_file)
-
-# write signal and call dump_data to create features
-
-feature_file = os.path.splitext(args.input)[0] + '_features.f32'
-command = f"{args.dump_data} -test {padded_signal_file} {feature_file}"
-r = subprocess.run(command, shell=True)
-if r.returncode != 0:
-    raise RuntimeError(f"command '{command}' failed with exit code {r.returncode}")
-
-# load features
-nb_features = model.nb_used_features + lpc_order
-nb_used_features = model.nb_used_features
-
-# load features
-features = np.fromfile(feature_file, dtype='float32')
-num_subframes = len(features) // nb_features
-num_subframes = 2 * (num_subframes // 2)
-num_frames = num_subframes // 2
-
-features = np.reshape(features, (1, -1, nb_features))
-features = features[:, :, :nb_used_features]
-features = features[:, :num_subframes, :]
-
-#variable quantizer depending on the delay
-q0 = 3
-q1 = 15
-quant_id = np.round(q1 + (q0-q1)*np.arange(args.num_redundancy_frames//2)/args.num_redundancy_frames).astype('int16')
-#print(quant_id)
-
-quant_embed = qembedding(quant_id)
-
-# run encoder
-print("running fec encoder...")
-symbols, gru_state_dec = encoder.predict(features)
-
-# apply quantization
-nsymbols = 80
-quant_scale = tf.math.softplus(quant_embed[:, :nsymbols]).numpy()
-dead_zone = tf.math.softplus(quant_embed[:, nsymbols : 2 * nsymbols]).numpy()
-#symbols = apply_dead_zone([symbols, dead_zone]).numpy()
-#qsymbols = np.round(symbols)
-quant_gru_state_dec = pvq_quantize(gru_state_dec, 82)
-
-# rate estimate
-hard_distr_embed = tf.math.sigmoid(quant_embed[:, 4 * nsymbols : ]).numpy()
-#rate_input = np.concatenate((qsymbols, hard_distr_embed, enc_lambda), axis=-1)
-#rates = sq_rate_metric(None, rate_input, reduce=False).numpy()
-
-# run decoder
-input_length = args.num_redundancy_frames // 2
-offset = args.num_redundancy_frames - 1
-
-packets = []
-packet_sizes = []
-
-sym_batch = np.zeros((num_frames-offset, args.num_redundancy_frames//2, nsymbols), dtype='float32')
-quant_state = quant_gru_state_dec[0, offset:num_frames, :]
-#pack symbols for batch processing
-for i in range(offset, num_frames):
-    sym_batch[i-offset, :, :] = symbols[0, i - 2 * input_length + 2 : i + 1 : 2, :]
-
-#quantize symbols
-sym_batch = sym_batch * quant_scale
-sym_batch = apply_dead_zone([sym_batch, dead_zone]).numpy()
-sym_batch = np.round(sym_batch)
-
-hard_distr_embed = np.broadcast_to(hard_distr_embed, (sym_batch.shape[0], sym_batch.shape[1], 2*sym_batch.shape[2]))
-fake_lambda = np.ones((sym_batch.shape[0], sym_batch.shape[1], 1), dtype='float32')
-rate_input = np.concatenate((sym_batch, hard_distr_embed, fake_lambda), axis=-1)
-rates = sq_rate_metric(None, rate_input, reduce=False).numpy()
-#print(rates.shape)
-print("average rate = ", np.mean(rates[args.num_redundancy_frames:,:]))
-
-#sym_batch.tofile('qsyms.f32')
-
-sym_batch = sym_batch / quant_scale
-#print(sym_batch.shape, quant_state.shape)
-#features = decoder.predict([sym_batch, quant_state])
-features = decoder([sym_batch, quant_state])
-
-#for i in range(offset, num_frames):
-#    print(f"processing frame {i - offset}...")
-#    features = decoder.predict([qsymbols[:, i - 2 * input_length + 2 : i + 1 : 2, :], quant_embed_dec[:, i - 2 * input_length + 2 : i + 1 : 2, :], quant_gru_state_dec[:, i, :]])
-#    packets.append(features)
-#    packet_size = 8 * int((np.sum(rates[:, i - 2 * input_length + 2 : i + 1 : 2]) + 7) / 8) + 64
-#    packet_sizes.append(packet_size)
-
-
-# write packets
-packet_file = args.output + '.fec' if not args.output.endswith('.fec') else args.output
-#write_fec_packets(packet_file, packets, packet_sizes)
-
-
-#print(f"average redundancy rate: {int(round(sum(packet_sizes) / len(packet_sizes) * 50 / 1000))} kbps")
-
-if args.lossfile != None:
-    loss = np.loadtxt(args.lossfile, dtype='int16')
-    fec_out = np.zeros((features.shape[0]*2, features.shape[-1]), dtype='float32')
-    foffset = -2
-    ptr = 0;
-    count = 2;
-    for i in range(features.shape[0]):
-        if (loss[i] == 0) or (i == features.shape[0]-1):
-            fec_out[ptr:ptr+count,:] = features[i, foffset:, :]
-            #print("filled ", count)
-            foffset = -2
-            ptr = ptr+count
-            count = 2
-        else:
-            count = count + 2
-            foffset = foffset - 2
-
-    fec_out_full = np.zeros((fec_out.shape[0], nb_features), dtype=np.float32)
-    fec_out_full[:, :nb_used_features] = fec_out
-
-    fec_out_full.tofile(packet_file[:-4] + f'_fec.f32')
-
-
-#create packets array like in the original version for debugging purposes
-for i in range(offset, num_frames):
-    packets.append(features[i-offset:i-offset+1, :, :])
-
-if args.debug_output:
-    import itertools
-
-    #batches = [2, 4]
-    batches = [4]
-    #offsets = [0, 4, 20]
-    offsets = [0, (args.num_redundancy_frames - 2)*2]
-    # sanity checks
-    # 1. concatenate features at offset 0
-    for batch, offset in itertools.product(batches, offsets):
-
-        stop = packets[0].shape[1] - offset
-        print(batch, offset, stop)
-        test_features = np.concatenate([packet[:,stop - batch: stop, :] for packet in packets[::batch//2]], axis=1)
-
-        test_features_full = np.zeros((test_features.shape[1], nb_features), dtype=np.float32)
-        test_features_full[:, :nb_used_features] = test_features[0, :, :]
-
-        print(f"writing debug output {packet_file[:-4] + f'_tf_batch{batch}_offset{offset}.f32'}")
-        test_features_full.tofile(packet_file[:-4] + f'_tf_batch{batch}_offset{offset}.f32')
diff --git a/dnn/training_tf2/fec_packets.c b/dnn/training_tf2/fec_packets.c
deleted file mode 100644
index ee08ba95c..000000000
--- a/dnn/training_tf2/fec_packets.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Copyright (c) 2022 Amazon
-   Written by Jan Buethe */
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include <stdio.h>
-#include <inttypes.h>
-
-#include "fec_packets.h"
-
-int get_fec_frame(const char * const filename, float *features, int packet_index, int subframe_index)
-{
-
-    int16_t version;
-    int16_t header_size;
-    int16_t num_packets;
-    int16_t packet_size;
-    int16_t subframe_size;
-    int16_t subframes_per_packet;
-    int16_t num_features;
-    long offset;
-
-    FILE *fid = fopen(filename, "rb");
-
-    /* read header */
-    if (fread(&version, sizeof(version), 1, fid) != 1) goto error;
-    if (fread(&header_size, sizeof(header_size), 1, fid) != 1) goto error;
-    if (fread(&num_packets, sizeof(num_packets), 1, fid) != 1) goto error;
-    if (fread(&packet_size, sizeof(packet_size), 1, fid) != 1) goto error;
-    if (fread(&subframe_size, sizeof(subframe_size), 1, fid) != 1) goto error;
-    if (fread(&subframes_per_packet, sizeof(subframes_per_packet), 1, fid) != 1) goto error;
-    if (fread(&num_features, sizeof(num_features), 1, fid) != 1) goto error;
-
-    /* check if indices are valid */
-    if (packet_index >= num_packets || subframe_index >= subframes_per_packet)
-    {
-        fprintf(stderr, "get_fec_frame: index out of bounds\n");
-        goto error;
-    }
-
-    /* calculate offset in file (+ 2 is for rate) */
-    offset = header_size + packet_index * packet_size + 2 + subframe_index * subframe_size;
-    fseek(fid, offset, SEEK_SET);
-
-    /* read features */
-    if (fread(features, sizeof(*features), num_features, fid) != num_features) goto error;
-
-    fclose(fid);
-    return 0;
-
-error:
-    fclose(fid);
-    return 1;
-}
-
-int get_fec_rate(const char * const filename, int packet_index)
-{
-    int16_t version;
-    int16_t header_size;
-    int16_t num_packets;
-    int16_t packet_size;
-    int16_t subframe_size;
-    int16_t subframes_per_packet;
-    int16_t num_features;
-    long offset;
-    int16_t rate;
-
-    FILE *fid = fopen(filename, "rb");
-
-    /* read header */
-    if (fread(&version, sizeof(version), 1, fid) != 1) goto error;
-    if (fread(&header_size, sizeof(header_size), 1, fid) != 1) goto error;
-    if (fread(&num_packets, sizeof(num_packets), 1, fid) != 1) goto error;
-    if (fread(&packet_size, sizeof(packet_size), 1, fid) != 1) goto error;
-    if (fread(&subframe_size, sizeof(subframe_size), 1, fid) != 1) goto error;
-    if (fread(&subframes_per_packet, sizeof(subframes_per_packet), 1, fid) != 1) goto error;
-    if (fread(&num_features, sizeof(num_features), 1, fid) != 1) goto error;
-
-    /* check if indices are valid */
-    if (packet_index >= num_packets)
-    {
-        fprintf(stderr, "get_fec_rate: index out of bounds\n");
-        goto error;
-    }
-
-    /* calculate offset in file (+ 2 is for rate) */
-    offset = header_size + packet_index * packet_size;
-    fseek(fid, offset, SEEK_SET);
-
-    /* read rate */
-    if (fread(&rate, sizeof(rate), 1, fid) != 1) goto error;
-
-    fclose(fid);
-    return (int) rate;
-
-error:
-    fclose(fid);
-    return -1;
-}
-
-#if 0
-int main()
-{
-    float features[20];
-    int i;
-
-    if (get_fec_frame("../test.fec", &features[0], 0, 127))
-    {
-        return 1;
-    }
-
-    for (i = 0; i < 20; i ++)
-    {
-        printf("%d %f\n", i, features[i]);
-    }
-
-    printf("rate: %d\n", get_fec_rate("../test.fec", 0));
-
-}
-#endif
\ No newline at end of file
diff --git a/dnn/training_tf2/fec_packets.h b/dnn/training_tf2/fec_packets.h
deleted file mode 100644
index 01b128b17..000000000
--- a/dnn/training_tf2/fec_packets.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright (c) 2022 Amazon
-   Written by Jan Buethe */
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef FEC_PACKETS_H
-#define FEC_PACKETS_H
-
-int get_fec_frame(const char * const filename, float *features, int packet_index, int subframe_index);
-int get_fec_rate(const char * const filename, int packet_index);
-
-#endif
diff --git a/dnn/training_tf2/fec_packets.py b/dnn/training_tf2/fec_packets.py
deleted file mode 100644
index 6acbe9d2c..000000000
--- a/dnn/training_tf2/fec_packets.py
+++ /dev/null
@@ -1,108 +0,0 @@
-"""
-/* Copyright (c) 2022 Amazon
-   Written by Jan Buethe */
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-"""
-
-import numpy as np
-
-
-
-def write_fec_packets(filename, packets, rates=None):
-    """ writes packets in binary format """
-
-    assert np.dtype(np.float32).itemsize == 4
-    assert np.dtype(np.int16).itemsize == 2
-
-    # derive some sizes
-    num_packets             = len(packets)
-    subframes_per_packet    = packets[0].shape[-2]
-    num_features            = packets[0].shape[-1]
-
-    # size of float is 4
-    subframe_size           = num_features * 4
-    packet_size             = subframe_size * subframes_per_packet + 2 # two bytes for rate
-
-    version = 1
-    # header size (version, header_size, num_packets, packet_size, subframe_size, subrames_per_packet, num_features)
-    header_size = 14
-
-    with open(filename, 'wb') as f:
-
-        # header
-        f.write(np.int16(version).tobytes())
-        f.write(np.int16(header_size).tobytes())
-        f.write(np.int16(num_packets).tobytes())
-        f.write(np.int16(packet_size).tobytes())
-        f.write(np.int16(subframe_size).tobytes())
-        f.write(np.int16(subframes_per_packet).tobytes())
-        f.write(np.int16(num_features).tobytes())
-
-        # packets
-        for i, packet in enumerate(packets):
-            if type(rates) == type(None):
-                rate = 0
-            else:
-                rate = rates[i]
-
-            f.write(np.int16(rate).tobytes())
-
-            features = np.flip(packet, axis=-2)
-            f.write(features.astype(np.float32).tobytes())
-
-
-def read_fec_packets(filename):
-    """ reads packets from binary format """
-
-    assert np.dtype(np.float32).itemsize == 4
-    assert np.dtype(np.int16).itemsize == 2
-
-    with open(filename, 'rb') as f:
-
-        # header
-        version                 = np.frombuffer(f.read(2), dtype=np.int16).item()
-        header_size             = np.frombuffer(f.read(2), dtype=np.int16).item()
-        num_packets             = np.frombuffer(f.read(2), dtype=np.int16).item()
-        packet_size             = np.frombuffer(f.read(2), dtype=np.int16).item()
-        subframe_size           = np.frombuffer(f.read(2), dtype=np.int16).item()
-        subframes_per_packet    = np.frombuffer(f.read(2), dtype=np.int16).item()
-        num_features            = np.frombuffer(f.read(2), dtype=np.int16).item()
-
-        dummy_features          = np.zeros((1, subframes_per_packet, num_features), dtype=np.float32)
-
-        # packets
-        rates = []
-        packets = []
-        for i in range(num_packets):
-
-            rate = np.frombuffer(f.read(2), dtype=np.int16).item
-            rates.append(rate)
-
-            features = np.reshape(np.frombuffer(f.read(subframe_size * subframes_per_packet), dtype=np.float32), dummy_features.shape)
-            packet = np.flip(features, axis=-2)
-            packets.append(packet)
-
-    return packets
\ No newline at end of file
diff --git a/dnn/training_tf2/keraslayerdump.py b/dnn/training_tf2/keraslayerdump.py
deleted file mode 100644
index 5abc1488e..000000000
--- a/dnn/training_tf2/keraslayerdump.py
+++ /dev/null
@@ -1,189 +0,0 @@
-'''Copyright (c) 2017-2018 Mozilla
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-'''
-
-""" helper functions for dumping some Keras layers to C files """
-
-import numpy as np
-
-
-def printVector(f, vector, name, dtype='float', dotp=False, static=True):
-    """ prints vector as one-dimensional C array """
-    if dotp:
-        vector = vector.reshape((vector.shape[0]//4, 4, vector.shape[1]//8, 8))
-        vector = vector.transpose((2, 0, 3, 1))
-    v = np.reshape(vector, (-1))
-    if static:
-        f.write('static const {} {}[{}] = {{\n   '.format(dtype, name, len(v)))
-    else:
-        f.write('const {} {}[{}] = {{\n   '.format(dtype, name, len(v)))
-    for i in range(0, len(v)):
-        f.write('{}'.format(v[i]))
-        if (i!=len(v)-1):
-            f.write(',')
-        else:
-            break;
-        if (i%8==7):
-            f.write("\n   ")
-        else:
-            f.write(" ")
-    f.write('\n};\n\n')
-    return vector
-
-def printSparseVector(f, A, name, have_diag=True):
-    N = A.shape[0]
-    M = A.shape[1]
-    W = np.zeros((0,), dtype='int')
-    W0 = np.zeros((0,))
-    if have_diag:
-        diag = np.concatenate([np.diag(A[:,:N]), np.diag(A[:,N:2*N]), np.diag(A[:,2*N:])])
-        A[:,:N] = A[:,:N] - np.diag(np.diag(A[:,:N]))
-        A[:,N:2*N] = A[:,N:2*N] - np.diag(np.diag(A[:,N:2*N]))
-        A[:,2*N:] = A[:,2*N:] - np.diag(np.diag(A[:,2*N:]))
-        printVector(f, diag, name + '_diag')
-    AQ = np.minimum(127, np.maximum(-128, np.round(A*128))).astype('int')
-    idx = np.zeros((0,), dtype='int')
-    for i in range(M//8):
-        pos = idx.shape[0]
-        idx = np.append(idx, -1)
-        nb_nonzero = 0
-        for j in range(N//4):
-            block = A[j*4:(j+1)*4, i*8:(i+1)*8]
-            qblock = AQ[j*4:(j+1)*4, i*8:(i+1)*8]
-            if np.sum(np.abs(block)) > 1e-10:
-                nb_nonzero = nb_nonzero + 1
-                idx = np.append(idx, j*4)
-                vblock = qblock.transpose((1,0)).reshape((-1,))
-                W0 = np.concatenate([W0, block.reshape((-1,))])
-                W = np.concatenate([W, vblock])
-        idx[pos] = nb_nonzero
-    f.write('#ifdef DOT_PROD\n')
-    printVector(f, W, name, dtype='qweight')
-    f.write('#else /*DOT_PROD*/\n')
-    printVector(f, W0, name, dtype='qweight')
-    f.write('#endif /*DOT_PROD*/\n')
-    printVector(f, idx, name + '_idx', dtype='int')
-    return AQ
-
-def dump_sparse_gru(self, f, hf):
-    name = 'sparse_' + self.name
-    print("printing layer " + name + " of type sparse " + self.__class__.__name__)
-    weights = self.get_weights()
-    qweights = printSparseVector(f, weights[1], name + '_recurrent_weights')
-    printVector(f, weights[-1], name + '_bias')
-    subias = weights[-1].copy()
-    subias[1,:] = subias[1,:] - np.sum(qweights*(1./128),axis=0)
-    printVector(f, subias, name + '_subias')
-    if hasattr(self, 'activation'):
-        activation = self.activation.__name__.upper()
-    else:
-        activation = 'TANH'
-    if hasattr(self, 'reset_after') and not self.reset_after:
-        reset_after = 0
-    else:
-        reset_after = 1
-    neurons = weights[0].shape[1]//3
-    max_rnn_neurons = neurons
-    f.write('const SparseGRULayer {} = {{\n   {}_bias,\n   {}_subias,\n   {}_recurrent_weights_diag,\n   {}_recurrent_weights,\n   {}_recurrent_weights_idx,\n   {}, ACTIVATION_{}, {}\n}};\n\n'
-            .format(name, name, name, name, name, name, weights[0].shape[1]//3, activation, reset_after))
-    hf.write('#define {}_OUT_SIZE {}\n'.format(name.upper(), weights[0].shape[1]//3))
-    hf.write('#define {}_STATE_SIZE {}\n'.format(name.upper(), weights[0].shape[1]//3))
-    hf.write('extern const SparseGRULayer {};\n\n'.format(name));
-    return max_rnn_neurons
-
-def dump_gru_layer(self, f, hf, dotp=False, sparse=False):
-    name = self.name
-    print("printing layer " + name + " of type " + self.__class__.__name__)
-    weights = self.get_weights()
-    if sparse:
-        qweight = printSparseVector(f, weights[0], name + '_weights', have_diag=False)
-    else:
-        qweight = printVector(f, weights[0], name + '_weights')
-
-    if dotp:
-        f.write('#ifdef DOT_PROD\n')
-        qweight2 = np.clip(np.round(128.*weights[1]).astype('int'), -128, 127)
-        printVector(f, qweight2, name + '_recurrent_weights', dotp=True, dtype='qweight')
-        f.write('#else /*DOT_PROD*/\n')
-    else:
-        qweight2 = weights[1]
-
-    printVector(f, weights[1], name + '_recurrent_weights')
-    if dotp:
-        f.write('#endif /*DOT_PROD*/\n')
-
-    printVector(f, weights[-1], name + '_bias')
-    subias = weights[-1].copy()
-    subias[0,:] = subias[0,:] - np.sum(qweight*(1./128.),axis=0)
-    subias[1,:] = subias[1,:] - np.sum(qweight2*(1./128.),axis=0)
-    printVector(f, subias, name + '_subias')
-    if hasattr(self, 'activation'):
-        activation = self.activation.__name__.upper()
-    else:
-        activation = 'TANH'
-    if hasattr(self, 'reset_after') and not self.reset_after:
-        reset_after = 0
-    else:
-        reset_after = 1
-    neurons = weights[0].shape[1]//3
-    max_rnn_neurons = neurons
-    f.write('const GRULayer {} = {{\n   {}_bias,\n   {}_subias,\n   {}_weights,\n   {},\n   {}_recurrent_weights,\n   {}, {}, ACTIVATION_{}, {}\n}};\n\n'
-            .format(name, name, name, name, name + "_weights_idx" if sparse else "NULL", name, weights[0].shape[0], weights[0].shape[1]//3, activation, reset_after))
-    hf.write('#define {}_OUT_SIZE {}\n'.format(name.upper(), weights[0].shape[1]//3))
-    hf.write('#define {}_STATE_SIZE {}\n'.format(name.upper(), weights[0].shape[1]//3))
-    hf.write('extern const GRULayer {};\n\n'.format(name));
-    return max_rnn_neurons
-
-def dump_dense_layer_impl(name, weights, bias, activation, f, hf):
-    printVector(f, weights, name + '_weights')
-    printVector(f, bias, name + '_bias')
-    f.write('const DenseLayer {} = {{\n   {}_bias,\n   {}_weights,\n   {}, {}, ACTIVATION_{}\n}};\n\n'
-            .format(name, name, name, weights.shape[0], weights.shape[1], activation))
-    hf.write('#define {}_OUT_SIZE {}\n'.format(name.upper(), weights.shape[1]))
-    hf.write('extern const DenseLayer {};\n\n'.format(name));
-
-def dump_dense_layer(self, f, hf):
-    name = self.name
-    print("printing layer " + name + " of type " + self.__class__.__name__)
-    weights = self.get_weights()
-    activation = self.activation.__name__.upper()
-    dump_dense_layer_impl(name, weights[0], weights[1], activation, f, hf)
-    return False
-
-def dump_conv1d_layer(self, f, hf):
-    name = self.name
-    print("printing layer " + name + " of type " + self.__class__.__name__)
-    weights = self.get_weights()
-    printVector(f, weights[0], name + '_weights')
-    printVector(f, weights[-1], name + '_bias')
-    activation = self.activation.__name__.upper()
-    max_conv_inputs = weights[0].shape[1]*weights[0].shape[0]
-    f.write('const Conv1DLayer {} = {{\n   {}_bias,\n   {}_weights,\n   {}, {}, {}, ACTIVATION_{}\n}};\n\n'
-            .format(name, name, name, weights[0].shape[1], weights[0].shape[0], weights[0].shape[2], activation))
-    hf.write('#define {}_OUT_SIZE {}\n'.format(name.upper(), weights[0].shape[2]))
-    hf.write('#define {}_STATE_SIZE ({}*{})\n'.format(name.upper(), weights[0].shape[1], (weights[0].shape[0]-1)))
-    hf.write('#define {}_DELAY {}\n'.format(name.upper(), (weights[0].shape[0]-1)//2))
-    hf.write('extern const Conv1DLayer {};\n\n'.format(name));
-    return max_conv_inputs
diff --git a/dnn/training_tf2/lossfuncs.py b/dnn/training_tf2/lossfuncs.py
deleted file mode 100644
index 78be1fd61..000000000
--- a/dnn/training_tf2/lossfuncs.py
+++ /dev/null
@@ -1,99 +0,0 @@
-"""
-Custom Loss functions and metrics for training/analysis
-"""
-
-from tf_funcs import *
-import tensorflow as tf
-
-# The following loss functions all expect the lpcnet model to output the lpc prediction
-
-# Computing the excitation by subtracting the lpc prediction from the target, followed by minimizing the cross entropy
-def res_from_sigloss():
-    def loss(y_true,y_pred):
-        p = y_pred[:,:,0:1]
-        model_out = y_pred[:,:,2:]
-        e_gt = tf_l2u(y_true - p)
-        e_gt = tf.round(e_gt)
-        e_gt = tf.cast(e_gt,'int32')
-        sparse_cel = tf.keras.losses.SparseCategoricalCrossentropy(reduction=tf.keras.losses.Reduction.NONE)(e_gt,model_out)
-        return sparse_cel
-    return loss
-
-# Interpolated and Compensated Loss (In case of end to end lpcnet)
-# Interpolates between adjacent embeddings based on the fractional value of the excitation computed (similar to the embedding interpolation)
-# Also adds a probability compensation (to account for matching cross entropy in the linear domain), weighted by gamma
-def interp_mulaw(gamma = 1):
-    def loss(y_true,y_pred):
-        y_true = tf.cast(y_true, 'float32')
-        p = y_pred[:,:,0:1]
-        real_p = y_pred[:,:,1:2]
-        model_out = y_pred[:,:,2:]
-        e_gt = tf_l2u(y_true - p)
-        exc_gt = tf_l2u(y_true - real_p)
-        prob_compensation = tf.squeeze((K.abs(e_gt - 128)/128.0)*K.log(256.0))
-        regularization = tf.squeeze((K.abs(exc_gt - 128)/128.0)*K.log(256.0))
-        alpha = e_gt - tf.math.floor(e_gt)
-        alpha = tf.tile(alpha,[1,1,256])
-        e_gt = tf.cast(e_gt,'int32')
-        e_gt = tf.clip_by_value(e_gt,0,254)
-        interp_probab = (1 - alpha)*model_out + alpha*tf.roll(model_out,shift = -1,axis = -1)
-        sparse_cel = tf.keras.losses.SparseCategoricalCrossentropy(reduction=tf.keras.losses.Reduction.NONE)(e_gt,interp_probab)
-        loss_mod = sparse_cel + prob_compensation + gamma*regularization
-        return loss_mod
-    return loss
-
-# Same as above, except a metric
-def metric_oginterploss(y_true,y_pred):
-    p = y_pred[:,:,0:1]
-    model_out = y_pred[:,:,2:]
-    e_gt = tf_l2u(y_true - p)
-    prob_compensation = tf.squeeze((K.abs(e_gt - 128)/128.0)*K.log(256.0))
-    alpha = e_gt - tf.math.floor(e_gt)
-    alpha = tf.tile(alpha,[1,1,256])
-    e_gt = tf.cast(e_gt,'int32')
-    e_gt = tf.clip_by_value(e_gt,0,254)
-    interp_probab = (1 - alpha)*model_out + alpha*tf.roll(model_out,shift = -1,axis = -1)
-    sparse_cel = tf.keras.losses.SparseCategoricalCrossentropy(reduction=tf.keras.losses.Reduction.NONE)(e_gt,interp_probab)
-    loss_mod = sparse_cel + prob_compensation
-    return loss_mod
-
-# Interpolated cross entropy loss metric
-def metric_icel(y_true, y_pred):
-    p = y_pred[:,:,0:1]
-    model_out = y_pred[:,:,2:]
-    e_gt = tf_l2u(y_true - p)
-    alpha = e_gt - tf.math.floor(e_gt)
-    alpha = tf.tile(alpha,[1,1,256])
-    e_gt = tf.cast(e_gt,'int32')
-    e_gt = tf.clip_by_value(e_gt,0,254) #Check direction
-    interp_probab = (1 - alpha)*model_out + alpha*tf.roll(model_out,shift = -1,axis = -1)
-    sparse_cel = tf.keras.losses.SparseCategoricalCrossentropy(reduction=tf.keras.losses.Reduction.NONE)(e_gt,interp_probab)
-    return sparse_cel
-
-# Non-interpolated (rounded) cross entropy loss metric
-def metric_cel(y_true, y_pred):
-    y_true = tf.cast(y_true, 'float32')
-    p = y_pred[:,:,0:1]
-    model_out = y_pred[:,:,2:]
-    e_gt = tf_l2u(y_true - p)
-    e_gt = tf.round(e_gt)
-    e_gt = tf.cast(e_gt,'int32')
-    e_gt = tf.clip_by_value(e_gt,0,255)
-    sparse_cel = tf.keras.losses.SparseCategoricalCrossentropy(reduction=tf.keras.losses.Reduction.NONE)(e_gt,model_out)
-    return sparse_cel
-
-# Variance metric of the output excitation
-def metric_exc_sd(y_true,y_pred):
-    p = y_pred[:,:,0:1]
-    e_gt = tf_l2u(y_true - p)
-    sd_egt = tf.keras.losses.MeanSquaredError(reduction=tf.keras.losses.Reduction.NONE)(e_gt,128)
-    return sd_egt
-
-def loss_matchlar():
-    def loss(y_true,y_pred):
-        model_rc = y_pred[:,:,:16]
-        #y_true = lpc2rc(y_true)
-        loss_lar_diff = K.log((1.01 + model_rc)/(1.01 - model_rc)) - K.log((1.01 + y_true)/(1.01 - y_true))
-        loss_lar_diff = tf.square(loss_lar_diff)
-        return tf.reduce_mean(loss_lar_diff, axis=-1)
-    return loss
diff --git a/dnn/training_tf2/lpcnet.py b/dnn/training_tf2/lpcnet.py
deleted file mode 100644
index 497f75722..000000000
--- a/dnn/training_tf2/lpcnet.py
+++ /dev/null
@@ -1,339 +0,0 @@
-#!/usr/bin/python3
-'''Copyright (c) 2018 Mozilla
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-'''
-
-import math
-import tensorflow as tf
-from tensorflow.keras.models import Model
-from tensorflow.keras.layers import Input, GRU, Dense, Embedding, Reshape, Concatenate, Lambda, Conv1D, Multiply, Add, Bidirectional, MaxPooling1D, Activation, GaussianNoise
-from tensorflow.compat.v1.keras.layers import CuDNNGRU
-from tensorflow.keras import backend as K
-from tensorflow.keras.constraints import Constraint
-from tensorflow.keras.initializers import Initializer
-from tensorflow.keras.callbacks import Callback
-from mdense import MDense
-import numpy as np
-import h5py
-import sys
-from tf_funcs import *
-from diffembed import diff_Embed
-from parameters import set_parameter
-
-frame_size = 160
-pcm_bits = 8
-embed_size = 128
-pcm_levels = 2**pcm_bits
-
-def interleave(p, samples):
-    p2=tf.expand_dims(p, 3)
-    nb_repeats = pcm_levels//(2*p.shape[2])
-    p3 = tf.reshape(tf.repeat(tf.concat([1-p2, p2], 3), nb_repeats), (-1, samples, pcm_levels))
-    return p3
-
-def tree_to_pdf(p, samples):
-    return interleave(p[:,:,1:2], samples) * interleave(p[:,:,2:4], samples) * interleave(p[:,:,4:8], samples) * interleave(p[:,:,8:16], samples) \
-         * interleave(p[:,:,16:32], samples) * interleave(p[:,:,32:64], samples) * interleave(p[:,:,64:128], samples) * interleave(p[:,:,128:256], samples)
-
-def tree_to_pdf_train(p):
-    #FIXME: try not to hardcode the 2400 samples (15 frames * 160 samples/frame)
-    return tree_to_pdf(p, 2400)
-
-def tree_to_pdf_infer(p):
-    return tree_to_pdf(p, 1)
-
-def quant_regularizer(x):
-    Q = 128
-    Q_1 = 1./Q
-    #return .01 * tf.reduce_mean(1 - tf.math.cos(2*3.1415926535897931*(Q*x-tf.round(Q*x))))
-    return .01 * tf.reduce_mean(K.sqrt(K.sqrt(1.0001 - tf.math.cos(2*3.1415926535897931*(Q*x-tf.round(Q*x))))))
-
-class Sparsify(Callback):
-    def __init__(self, t_start, t_end, interval, density, quantize=False):
-        super(Sparsify, self).__init__()
-        self.batch = 0
-        self.t_start = t_start
-        self.t_end = t_end
-        self.interval = interval
-        self.final_density = density
-        self.quantize = quantize
-
-    def on_batch_end(self, batch, logs=None):
-        #print("batch number", self.batch)
-        self.batch += 1
-        if self.quantize or (self.batch > self.t_start and (self.batch-self.t_start) % self.interval == 0) or self.batch >= self.t_end:
-            #print("constrain");
-            layer = self.model.get_layer('gru_a')
-            w = layer.get_weights()
-            p = w[1]
-            nb = p.shape[1]//p.shape[0]
-            N = p.shape[0]
-            #print("nb = ", nb, ", N = ", N);
-            #print(p.shape)
-            #print ("density = ", density)
-            for k in range(nb):
-                density = self.final_density[k]
-                if self.batch < self.t_end and not self.quantize:
-                    r = 1 - (self.batch-self.t_start)/(self.t_end - self.t_start)
-                    density = 1 - (1-self.final_density[k])*(1 - r*r*r)
-                A = p[:, k*N:(k+1)*N]
-                A = A - np.diag(np.diag(A))
-                #This is needed because of the CuDNNGRU strange weight ordering
-                A = np.transpose(A, (1, 0))
-                L=np.reshape(A, (N//4, 4, N//8, 8))
-                S=np.sum(L*L, axis=-1)
-                S=np.sum(S, axis=1)
-                SS=np.sort(np.reshape(S, (-1,)))
-                thresh = SS[round(N*N//32*(1-density))]
-                mask = (S>=thresh).astype('float32')
-                mask = np.repeat(mask, 4, axis=0)
-                mask = np.repeat(mask, 8, axis=1)
-                mask = np.minimum(1, mask + np.diag(np.ones((N,))))
-                #This is needed because of the CuDNNGRU strange weight ordering
-                mask = np.transpose(mask, (1, 0))
-                p[:, k*N:(k+1)*N] = p[:, k*N:(k+1)*N]*mask
-                #print(thresh, np.mean(mask))
-            if self.quantize and ((self.batch > self.t_start and (self.batch-self.t_start) % self.interval == 0) or self.batch >= self.t_end):
-                if self.batch < self.t_end:
-                    threshold = .5*(self.batch - self.t_start)/(self.t_end - self.t_start)
-                else:
-                    threshold = .5
-                quant = np.round(p*128.)
-                res = p*128.-quant
-                mask = (np.abs(res) <= threshold).astype('float32')
-                p = mask/128.*quant + (1-mask)*p
-
-            w[1] = p
-            layer.set_weights(w)
-
-class SparsifyGRUB(Callback):
-    def __init__(self, t_start, t_end, interval, grua_units, density, quantize=False):
-        super(SparsifyGRUB, self).__init__()
-        self.batch = 0
-        self.t_start = t_start
-        self.t_end = t_end
-        self.interval = interval
-        self.final_density = density
-        self.grua_units = grua_units
-        self.quantize = quantize
-
-    def on_batch_end(self, batch, logs=None):
-        #print("batch number", self.batch)
-        self.batch += 1
-        if self.quantize or (self.batch > self.t_start and (self.batch-self.t_start) % self.interval == 0) or self.batch >= self.t_end:
-            #print("constrain");
-            layer = self.model.get_layer('gru_b')
-            w = layer.get_weights()
-            p = w[0]
-            N = p.shape[0]
-            M = p.shape[1]//3
-            for k in range(3):
-                density = self.final_density[k]
-                if self.batch < self.t_end and not self.quantize:
-                    r = 1 - (self.batch-self.t_start)/(self.t_end - self.t_start)
-                    density = 1 - (1-self.final_density[k])*(1 - r*r*r)
-                A = p[:, k*M:(k+1)*M]
-                #This is needed because of the CuDNNGRU strange weight ordering
-                A = np.reshape(A, (M, N))
-                A = np.transpose(A, (1, 0))
-                N2 = self.grua_units
-                A2 = A[:N2, :]
-                L=np.reshape(A2, (N2//4, 4, M//8, 8))
-                S=np.sum(L*L, axis=-1)
-                S=np.sum(S, axis=1)
-                SS=np.sort(np.reshape(S, (-1,)))
-                thresh = SS[round(M*N2//32*(1-density))]
-                mask = (S>=thresh).astype('float32')
-                mask = np.repeat(mask, 4, axis=0)
-                mask = np.repeat(mask, 8, axis=1)
-                A = np.concatenate([A2*mask, A[N2:,:]], axis=0)
-                #This is needed because of the CuDNNGRU strange weight ordering
-                A = np.transpose(A, (1, 0))
-                A = np.reshape(A, (N, M))
-                p[:, k*M:(k+1)*M] = A
-                #print(thresh, np.mean(mask))
-            if self.quantize and ((self.batch > self.t_start and (self.batch-self.t_start) % self.interval == 0) or self.batch >= self.t_end):
-                if self.batch < self.t_end:
-                    threshold = .5*(self.batch - self.t_start)/(self.t_end - self.t_start)
-                else:
-                    threshold = .5
-                quant = np.round(p*128.)
-                res = p*128.-quant
-                mask = (np.abs(res) <= threshold).astype('float32')
-                p = mask/128.*quant + (1-mask)*p
-
-            w[0] = p
-            layer.set_weights(w)
-
-
-class PCMInit(Initializer):
-    def __init__(self, gain=.1, seed=None):
-        self.gain = gain
-        self.seed = seed
-
-    def __call__(self, shape, dtype=None):
-        num_rows = 1
-        for dim in shape[:-1]:
-            num_rows *= dim
-        num_cols = shape[-1]
-        flat_shape = (num_rows, num_cols)
-        if self.seed is not None:
-            np.random.seed(self.seed)
-        a = np.random.uniform(-1.7321, 1.7321, flat_shape)
-        #a[:,0] = math.sqrt(12)*np.arange(-.5*num_rows+.5,.5*num_rows-.4)/num_rows
-        #a[:,1] = .5*a[:,0]*a[:,0]*a[:,0]
-        a = a + np.reshape(math.sqrt(12)*np.arange(-.5*num_rows+.5,.5*num_rows-.4)/num_rows, (num_rows, 1))
-        return self.gain * a.astype("float32")
-
-    def get_config(self):
-        return {
-            'gain': self.gain,
-            'seed': self.seed
-        }
-
-class WeightClip(Constraint):
-    '''Clips the weights incident to each hidden unit to be inside a range
-    '''
-    def __init__(self, c=2):
-        self.c = c
-
-    def __call__(self, p):
-        # Ensure that abs of adjacent weights don't sum to more than 127. Otherwise there's a risk of
-        # saturation when implementing dot products with SSSE3 or AVX2.
-        return self.c*p/tf.maximum(self.c, tf.repeat(tf.abs(p[:, 1::2])+tf.abs(p[:, 0::2]), 2, axis=1))
-        #return K.clip(p, -self.c, self.c)
-
-    def get_config(self):
-        return {'name': self.__class__.__name__,
-            'c': self.c}
-
-constraint = WeightClip(0.992)
-
-def new_lpcnet_model(rnn_units1=384, rnn_units2=16, nb_used_features=20, batch_size=128, training=False, adaptation=False, quantize=False, flag_e2e = False, cond_size=128, lpc_order=16, lpc_gamma=1., lookahead=2):
-    pcm = Input(shape=(None, 1), batch_size=batch_size)
-    dpcm = Input(shape=(None, 3), batch_size=batch_size)
-    feat = Input(shape=(None, nb_used_features), batch_size=batch_size)
-    pitch = Input(shape=(None, 1), batch_size=batch_size)
-    dec_feat = Input(shape=(None, cond_size))
-    dec_state1 = Input(shape=(rnn_units1,))
-    dec_state2 = Input(shape=(rnn_units2,))
-
-    padding = 'valid' if training else 'same'
-    fconv1 = Conv1D(cond_size, 3, padding=padding, activation='tanh', name='feature_conv1')
-    fconv2 = Conv1D(cond_size, 3, padding=padding, activation='tanh', name='feature_conv2')
-    pembed = Embedding(256, 64, name='embed_pitch')
-    cat_feat = Concatenate()([feat, Reshape((-1, 64))(pembed(pitch))])
-
-    cfeat = fconv2(fconv1(cat_feat))
-
-    fdense1 = Dense(cond_size, activation='tanh', name='feature_dense1')
-    fdense2 = Dense(cond_size, activation='tanh', name='feature_dense2')
-
-    if flag_e2e and quantize:
-        fconv1.trainable = False
-        fconv2.trainable = False
-        fdense1.trainable = False
-        fdense2.trainable = False
-
-    cfeat = fdense2(fdense1(cfeat))
-
-    error_calc = Lambda(lambda x: tf_l2u(x[0] - tf.roll(x[1],1,axis = 1)))
-    if flag_e2e:
-        lpcoeffs = diff_rc2lpc(name = "rc2lpc")(cfeat)
-    else:
-        lpcoeffs = Input(shape=(None, lpc_order), batch_size=batch_size)
-
-    real_preds = diff_pred(name = "real_lpc2preds")([pcm,lpcoeffs])
-    weighting = lpc_gamma ** np.arange(1, 17).astype('float32')
-    weighted_lpcoeffs = Lambda(lambda x: x[0]*x[1])([lpcoeffs, weighting])
-    tensor_preds = diff_pred(name = "lpc2preds")([pcm,weighted_lpcoeffs])
-    past_errors = error_calc([pcm,tensor_preds])
-
-    embed = diff_Embed(name='embed_sig',initializer = PCMInit())
-    cpcm = Concatenate()([tf_l2u(pcm),tf_l2u(tensor_preds),past_errors])
-    cpcm = GaussianNoise(.3)(cpcm)
-    cpcm = Reshape((-1, embed_size*3))(embed(cpcm))
-    cpcm_decoder = Reshape((-1, embed_size*3))(embed(dpcm))
-
-
-    rep = Lambda(lambda x: K.repeat_elements(x, frame_size, 1))
-
-    quant = quant_regularizer if quantize else None
-
-    if training:
-        rnn = CuDNNGRU(rnn_units1, return_sequences=True, return_state=True, name='gru_a', stateful=True,
-              recurrent_constraint = constraint, recurrent_regularizer=quant)
-        rnn2 = CuDNNGRU(rnn_units2, return_sequences=True, return_state=True, name='gru_b', stateful=True,
-               kernel_constraint=constraint, recurrent_constraint = constraint, kernel_regularizer=quant, recurrent_regularizer=quant)
-    else:
-        rnn = GRU(rnn_units1, return_sequences=True, return_state=True, recurrent_activation="sigmoid", reset_after='true', name='gru_a', stateful=True,
-              recurrent_constraint = constraint, recurrent_regularizer=quant)
-        rnn2 = GRU(rnn_units2, return_sequences=True, return_state=True, recurrent_activation="sigmoid", reset_after='true', name='gru_b', stateful=True,
-               kernel_constraint=constraint, recurrent_constraint = constraint, kernel_regularizer=quant, recurrent_regularizer=quant)
-
-    rnn_in = Concatenate()([cpcm, rep(cfeat)])
-    md = MDense(pcm_levels, activation='sigmoid', name='dual_fc')
-    gru_out1, _ = rnn(rnn_in)
-    gru_out1 = GaussianNoise(.005)(gru_out1)
-    gru_out2, _ = rnn2(Concatenate()([gru_out1, rep(cfeat)]))
-    ulaw_prob = Lambda(tree_to_pdf_train)(md(gru_out2))
-
-    if adaptation:
-        rnn.trainable=False
-        rnn2.trainable=False
-        md.trainable=False
-        embed.Trainable=False
-
-    m_out = Concatenate(name='pdf')([tensor_preds,real_preds,ulaw_prob])
-    if not flag_e2e:
-        model = Model([pcm, feat, pitch, lpcoeffs], m_out)
-    else:
-        model = Model([pcm, feat, pitch], [m_out, cfeat])
-    model.rnn_units1 = rnn_units1
-    model.rnn_units2 = rnn_units2
-    model.nb_used_features = nb_used_features
-    model.frame_size = frame_size
-
-    if not flag_e2e:
-        encoder = Model([feat, pitch], cfeat)
-        dec_rnn_in = Concatenate()([cpcm_decoder, dec_feat])
-    else:
-        encoder = Model([feat, pitch], [cfeat,lpcoeffs])
-        dec_rnn_in = Concatenate()([cpcm_decoder, dec_feat])
-    dec_gru_out1, state1 = rnn(dec_rnn_in, initial_state=dec_state1)
-    dec_gru_out2, state2 = rnn2(Concatenate()([dec_gru_out1, dec_feat]), initial_state=dec_state2)
-    dec_ulaw_prob = Lambda(tree_to_pdf_infer)(md(dec_gru_out2))
-
-    if flag_e2e:
-        decoder = Model([dpcm, dec_feat, dec_state1, dec_state2], [dec_ulaw_prob, state1, state2])
-    else:
-        decoder = Model([dpcm, dec_feat, dec_state1, dec_state2], [dec_ulaw_prob, state1, state2])
-
-    # add parameters to model
-    set_parameter(model, 'lpc_gamma', lpc_gamma, dtype='float64')
-    set_parameter(model, 'flag_e2e', flag_e2e, dtype='bool')
-    set_parameter(model, 'lookahead', lookahead, dtype='int32')
-
-    return model, encoder, decoder
diff --git a/dnn/training_tf2/lpcnet_plc.py b/dnn/training_tf2/lpcnet_plc.py
deleted file mode 100644
index 618e0084e..000000000
--- a/dnn/training_tf2/lpcnet_plc.py
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/usr/bin/python3
-'''Copyright (c) 2021-2022 Amazon
-   Copyright (c) 2018-2019 Mozilla
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-'''
-
-import math
-import tensorflow as tf
-from tensorflow.keras.models import Model
-from tensorflow.keras.layers import Input, GRU, Dense, Embedding, Reshape, Concatenate, Lambda, Conv1D, Multiply, Add, Bidirectional, MaxPooling1D, Activation, GaussianNoise
-from tensorflow.compat.v1.keras.layers import CuDNNGRU
-from tensorflow.keras import backend as K
-from tensorflow.keras.constraints import Constraint
-from tensorflow.keras.initializers import Initializer
-from tensorflow.keras.callbacks import Callback
-import numpy as np
-
-def quant_regularizer(x):
-    Q = 128
-    Q_1 = 1./Q
-    #return .01 * tf.reduce_mean(1 - tf.math.cos(2*3.1415926535897931*(Q*x-tf.round(Q*x))))
-    return .01 * tf.reduce_mean(K.sqrt(K.sqrt(1.0001 - tf.math.cos(2*3.1415926535897931*(Q*x-tf.round(Q*x))))))
-
-
-class WeightClip(Constraint):
-    '''Clips the weights incident to each hidden unit to be inside a range
-    '''
-    def __init__(self, c=2):
-        self.c = c
-
-    def __call__(self, p):
-        # Ensure that abs of adjacent weights don't sum to more than 127. Otherwise there's a risk of
-        # saturation when implementing dot products with SSSE3 or AVX2.
-        return self.c*p/tf.maximum(self.c, tf.repeat(tf.abs(p[:, 1::2])+tf.abs(p[:, 0::2]), 2, axis=1))
-        #return K.clip(p, -self.c, self.c)
-
-    def get_config(self):
-        return {'name': self.__class__.__name__,
-            'c': self.c}
-
-constraint = WeightClip(0.992)
-
-def new_lpcnet_plc_model(rnn_units=256, nb_used_features=20, nb_burg_features=36, batch_size=128, training=False, adaptation=False, quantize=False, cond_size=128):
-    feat = Input(shape=(None, nb_used_features+nb_burg_features), batch_size=batch_size)
-    lost = Input(shape=(None, 1), batch_size=batch_size)
-
-    fdense1 = Dense(cond_size, activation='tanh', name='plc_dense1')
-
-    cfeat = Concatenate()([feat, lost])
-    cfeat = fdense1(cfeat)
-    #cfeat = Conv1D(cond_size, 3, padding='causal', activation='tanh', name='plc_conv1')(cfeat)
-
-    quant = quant_regularizer if quantize else None
-
-    if training:
-        rnn = CuDNNGRU(rnn_units, return_sequences=True, return_state=True, name='plc_gru1', stateful=True,
-              kernel_constraint=constraint, recurrent_constraint = constraint, kernel_regularizer=quant, recurrent_regularizer=quant)
-        rnn2 = CuDNNGRU(rnn_units, return_sequences=True, return_state=True, name='plc_gru2', stateful=True,
-              kernel_constraint=constraint, recurrent_constraint = constraint, kernel_regularizer=quant, recurrent_regularizer=quant)
-    else:
-        rnn = GRU(rnn_units, return_sequences=True, return_state=True, recurrent_activation="sigmoid", reset_after='true', name='plc_gru1', stateful=True,
-              kernel_constraint=constraint, recurrent_constraint = constraint, kernel_regularizer=quant, recurrent_regularizer=quant)
-        rnn2 = GRU(rnn_units, return_sequences=True, return_state=True, recurrent_activation="sigmoid", reset_after='true', name='plc_gru2', stateful=True,
-              kernel_constraint=constraint, recurrent_constraint = constraint, kernel_regularizer=quant, recurrent_regularizer=quant)
-
-    gru_out1, _ = rnn(cfeat)
-    gru_out1 = GaussianNoise(.005)(gru_out1)
-    gru_out2, _ = rnn2(gru_out1)
-
-    out_dense = Dense(nb_used_features, activation='linear', name='plc_out')
-    plc_out = out_dense(gru_out2)
-
-    model = Model([feat, lost], plc_out)
-    model.rnn_units = rnn_units
-    model.cond_size = cond_size
-    model.nb_used_features = nb_used_features
-    model.nb_burg_features = nb_burg_features
-
-    return model
diff --git a/dnn/training_tf2/mdense.py b/dnn/training_tf2/mdense.py
deleted file mode 100644
index 844ae23e6..000000000
--- a/dnn/training_tf2/mdense.py
+++ /dev/null
@@ -1,95 +0,0 @@
-from tensorflow.keras import backend as K
-from tensorflow.keras.layers import Layer, InputSpec
-from tensorflow.keras import activations
-from tensorflow.keras import initializers, regularizers, constraints
-import numpy as np
-import math
-
-class MDense(Layer):
-
-    def __init__(self, outputs,
-                 channels=2,
-                 activation=None,
-                 use_bias=True,
-                 kernel_initializer='glorot_uniform',
-                 bias_initializer='zeros',
-                 kernel_regularizer=None,
-                 bias_regularizer=None,
-                 activity_regularizer=None,
-                 kernel_constraint=None,
-                 bias_constraint=None,
-                 **kwargs):
-        if 'input_shape' not in kwargs and 'input_dim' in kwargs:
-            kwargs['input_shape'] = (kwargs.pop('input_dim'),)
-        super(MDense, self).__init__(**kwargs)
-        self.units = outputs
-        self.channels = channels
-        self.activation = activations.get(activation)
-        self.use_bias = use_bias
-        self.kernel_initializer = initializers.get(kernel_initializer)
-        self.bias_initializer = initializers.get(bias_initializer)
-        self.kernel_regularizer = regularizers.get(kernel_regularizer)
-        self.bias_regularizer = regularizers.get(bias_regularizer)
-        self.activity_regularizer = regularizers.get(activity_regularizer)
-        self.kernel_constraint = constraints.get(kernel_constraint)
-        self.bias_constraint = constraints.get(bias_constraint)
-        self.input_spec = InputSpec(min_ndim=2)
-        self.supports_masking = True
-
-    def build(self, input_shape):
-        assert len(input_shape) >= 2
-        input_dim = input_shape[-1]
-
-        self.kernel = self.add_weight(shape=(self.units, input_dim, self.channels),
-                                      initializer=self.kernel_initializer,
-                                      name='kernel',
-                                      regularizer=self.kernel_regularizer,
-                                      constraint=self.kernel_constraint)
-        if self.use_bias:
-            self.bias = self.add_weight(shape=(self.units, self.channels),
-                                        initializer=self.bias_initializer,
-                                        name='bias',
-                                        regularizer=self.bias_regularizer,
-                                        constraint=self.bias_constraint)
-        else:
-            self.bias = None
-        self.factor = self.add_weight(shape=(self.units, self.channels),
-                                    initializer='ones',
-                                    name='factor',
-                                    regularizer=self.bias_regularizer,
-                                    constraint=self.bias_constraint)
-        self.input_spec = InputSpec(min_ndim=2, axes={-1: input_dim})
-        self.built = True
-
-    def call(self, inputs):
-        output = K.dot(inputs, self.kernel)
-        if self.use_bias:
-            output = output + self.bias
-        output = K.tanh(output) * self.factor
-        output = K.sum(output, axis=-1)
-        if self.activation is not None:
-            output = self.activation(output)
-        return output
-
-    def compute_output_shape(self, input_shape):
-        assert input_shape and len(input_shape) >= 2
-        assert input_shape[-1]
-        output_shape = list(input_shape)
-        output_shape[-1] = self.units
-        return tuple(output_shape)
-
-    def get_config(self):
-        config = {
-            'units': self.units,
-            'activation': activations.serialize(self.activation),
-            'use_bias': self.use_bias,
-            'kernel_initializer': initializers.serialize(self.kernel_initializer),
-            'bias_initializer': initializers.serialize(self.bias_initializer),
-            'kernel_regularizer': regularizers.serialize(self.kernel_regularizer),
-            'bias_regularizer': regularizers.serialize(self.bias_regularizer),
-            'activity_regularizer': regularizers.serialize(self.activity_regularizer),
-            'kernel_constraint': constraints.serialize(self.kernel_constraint),
-            'bias_constraint': constraints.serialize(self.bias_constraint)
-        }
-        base_config = super(MDense, self).get_config()
-        return dict(list(base_config.items()) + list(config.items()))
diff --git a/dnn/training_tf2/pade.py b/dnn/training_tf2/pade.py
deleted file mode 100644
index f88f425c9..000000000
--- a/dnn/training_tf2/pade.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# Optimizing a rational function to optimize a tanh() approximation
-
-import numpy as np
-import tensorflow as tf
-from tensorflow.keras.models import Model
-from tensorflow.keras.layers import Input, GRU, Dense, Embedding, Reshape, Concatenate, Lambda, Conv1D, Multiply, Add, Bidirectional, MaxPooling1D, Activation
-import tensorflow.keras.backend as K
-from tensorflow.keras.optimizers import Adam, SGD
-
-def my_loss1(y_true, y_pred):
-    return 1*K.mean(K.square(y_true-y_pred)) + 1*K.max(K.square(y_true-y_pred), axis=1)
-
-def my_loss2(y_true, y_pred):
-    return .1*K.mean(K.square(y_true-y_pred)) + 1*K.max(K.square(y_true-y_pred), axis=1)
-
-def my_loss3(y_true, y_pred):
-    return .01*K.mean(K.square(y_true-y_pred)) + 1*K.max(K.square(y_true-y_pred), axis=1)
-
-# Using these initializers to seed the approximation
-# with a reasonable starting point
-def num_init(shape, dtype=None):
-    rr = tf.constant([[945], [105], [1]], dtype=dtype)
-    #rr = tf.constant([[946.56757], [98.01368], [0.66841]], dtype=dtype)
-    print(rr)
-    return rr
-
-def den_init(shape, dtype=None):
-    rr = tf.constant([[945], [420], [15]], dtype=dtype)
-    #rr = tf.constant([[946.604], [413.342], [12.465]], dtype=dtype)
-    print(rr)
-    return rr
-
-
-x = np.arange(-10, 10, .01)
-N = len(x)
-x = np.reshape(x, (1, -1, 1))
-x2 = x*x
-
-x2in = np.concatenate([x2*0 + 1, x2, x2*x2], axis=2)
-yout = np.tanh(x)
-
-
-model_x = Input(shape=(None, 1,))
-model_x2 = Input(shape=(None, 3,))
-
-num = Dense(1, name='num', use_bias=False, kernel_initializer=num_init)
-den = Dense(1, name='den', use_bias=False, kernel_initializer=den_init)
-
-def ratio(x):
-    return tf.minimum(1., tf.maximum(-1., x[0]*x[1]/x[2]))
-
-out_layer = Lambda(ratio)
-output = out_layer([model_x, num(model_x2), den(model_x2)])
-
-model = Model([model_x, model_x2], output)
-model.summary()
-
-model.compile(Adam(0.05, beta_1=0.9, beta_2=0.9, decay=2e-5), loss='mean_squared_error')
-model.fit([x, x2in], yout, batch_size=1, epochs=500000, validation_split=0.0)
-
-model.compile(Adam(0.001, beta_2=0.9, decay=1e-4), loss=my_loss1)
-model.fit([x, x2in], yout, batch_size=1, epochs=50000, validation_split=0.0)
-
-model.compile(Adam(0.0001, beta_2=0.9, decay=1e-4), loss=my_loss2)
-model.fit([x, x2in], yout, batch_size=1, epochs=50000, validation_split=0.0)
-
-model.compile(Adam(0.00001, beta_2=0.9, decay=1e-4), loss=my_loss3)
-model.fit([x, x2in], yout, batch_size=1, epochs=50000, validation_split=0.0)
-
-model.save_weights('tanh.h5')
diff --git a/dnn/training_tf2/parameters.py b/dnn/training_tf2/parameters.py
deleted file mode 100644
index 3621a4e4f..000000000
--- a/dnn/training_tf2/parameters.py
+++ /dev/null
@@ -1,29 +0,0 @@
-""" module for handling extra model parameters for tf.keras models """
-
-import tensorflow as tf
-
-
-def set_parameter(model, parameter_name, parameter_value, dtype='float32'):
-    """ stores parameter_value as non-trainable weight with name parameter_name:0 """
-
-    weights = [weight for weight in model.weights if weight.name == (parameter_name + ":0")]
-
-    if len(weights) == 0:
-        model.add_weight(parameter_name, trainable=False, initializer=tf.keras.initializers.Constant(parameter_value), dtype=dtype)
-    elif len(weights) == 1:
-        weights[0].assign(parameter_value)
-    else:
-        raise ValueError(f"more than one weight starting with {parameter_name}:0 in model")
-
-
-def get_parameter(model, parameter_name, default=None):
-    """ returns parameter value if parameter is present in model and otherwise default """
-
-    weights = [weight for weight in model.weights if weight.name == (parameter_name + ":0")]
-
-    if len(weights) == 0:
-        return default
-    elif len(weights) > 1:
-        raise ValueError(f"more than one weight starting with {parameter_name}:0 in model")
-    else:
-        return weights[0].numpy().item()
diff --git a/dnn/training_tf2/plc_loader.py b/dnn/training_tf2/plc_loader.py
deleted file mode 100644
index a9bd41d87..000000000
--- a/dnn/training_tf2/plc_loader.py
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/python3
-'''Copyright (c) 2021-2022 Amazon
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-'''
-
-import numpy as np
-from tensorflow.keras.utils import Sequence
-
-class PLCLoader(Sequence):
-    def __init__(self, features, lost, nb_burg_features, batch_size):
-        self.batch_size = batch_size
-        self.nb_batches = features.shape[0]//self.batch_size
-        self.features = features[:self.nb_batches*self.batch_size, :, :]
-        self.lost = lost.astype('float')
-        self.lost = self.lost[:(len(self.lost)//features.shape[1]-1)*features.shape[1]]
-        self.nb_burg_features = nb_burg_features
-        self.on_epoch_end()
-
-    def on_epoch_end(self):
-        self.indices = np.arange(self.nb_batches*self.batch_size)
-        np.random.shuffle(self.indices)
-        offset = np.random.randint(0, high=self.features.shape[1])
-        self.lost_offset = np.reshape(self.lost[offset:-self.features.shape[1]+offset], (-1, self.features.shape[1]))
-        self.lost_indices = np.random.randint(0, high=self.lost_offset.shape[0], size=self.nb_batches*self.batch_size)
-
-    def __getitem__(self, index):
-        features = self.features[self.indices[index*self.batch_size:(index+1)*self.batch_size], :, :]
-        burg_lost = (np.random.rand(features.shape[0], features.shape[1]) > .1).astype('float')
-        burg_lost = np.reshape(burg_lost, (features.shape[0], features.shape[1], 1))
-        burg_mask = np.tile(burg_lost, (1,1,self.nb_burg_features))
-
-        lost = self.lost_offset[self.lost_indices[index*self.batch_size:(index+1)*self.batch_size], :]
-        lost = np.reshape(lost, (features.shape[0], features.shape[1], 1))
-        lost_mask = np.tile(lost, (1,1,features.shape[2]))
-        in_features = features*lost_mask
-        in_features[:,:,:self.nb_burg_features] = in_features[:,:,:self.nb_burg_features]*burg_mask
-
-        #For the first frame after a loss, we don't have valid features, but the Burg estimate is valid.
-        #in_features[:,1:,self.nb_burg_features:] = in_features[:,1:,self.nb_burg_features:]*lost_mask[:,:-1,self.nb_burg_features:]
-        out_lost = np.copy(lost)
-        #out_lost[:,1:,:] = out_lost[:,1:,:]*out_lost[:,:-1,:]
-
-        out_features = np.concatenate([features[:,:,self.nb_burg_features:], 1.-out_lost], axis=-1)
-        burg_sign = 2*burg_lost - 1
-        # last dim is 1 for received packet, 0 for lost packet, and -1 when just the Burg info is missing
-        inputs = [in_features*lost_mask, lost*burg_sign]
-        outputs = [out_features]
-        return (inputs, outputs)
-
-    def __len__(self):
-        return self.nb_batches
diff --git a/dnn/training_tf2/rdovae.py b/dnn/training_tf2/rdovae.py
deleted file mode 100644
index 6240120d1..000000000
--- a/dnn/training_tf2/rdovae.py
+++ /dev/null
@@ -1,372 +0,0 @@
-#!/usr/bin/python3
-'''Copyright (c) 2022 Amazon
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-'''
-
-import math
-import tensorflow as tf
-from tensorflow.keras.models import Model
-from tensorflow.keras.layers import Input, GRU, Dense, Embedding, Reshape, Concatenate, Lambda, Conv1D, Multiply, Add, Bidirectional, MaxPooling1D, Activation, GaussianNoise, AveragePooling1D, RepeatVector
-from tensorflow.compat.v1.keras.layers import CuDNNGRU
-from tensorflow.keras import backend as K
-from tensorflow.keras.constraints import Constraint
-from tensorflow.keras.initializers import Initializer
-from tensorflow.keras.callbacks import Callback
-from tensorflow.keras.regularizers import l1
-import numpy as np
-import h5py
-from uniform_noise import UniformNoise
-
-class WeightClip(Constraint):
-    '''Clips the weights incident to each hidden unit to be inside a range
-    '''
-    def __init__(self, c=2):
-        self.c = c
-
-    def __call__(self, p):
-        # Ensure that abs of adjacent weights don't sum to more than 127. Otherwise there's a risk of
-        # saturation when implementing dot products with SSSE3 or AVX2.
-        return self.c*p/tf.maximum(self.c, tf.repeat(tf.abs(p[:, 1::2])+tf.abs(p[:, 0::2]), 2, axis=1))
-        #return K.clip(p, -self.c, self.c)
-
-    def get_config(self):
-        return {'name': self.__class__.__name__,
-            'c': self.c}
-
-constraint = WeightClip(0.496)
-
-def soft_quantize(x):
-    #x = 4*x
-    #x = x - (.25/np.math.pi)*tf.math.sin(2*np.math.pi*x)
-    #x = x - (.25/np.math.pi)*tf.math.sin(2*np.math.pi*x)
-    #x = x - (.25/np.math.pi)*tf.math.sin(2*np.math.pi*x)
-    return x
-
-def noise_quantize(x):
-    return soft_quantize(x + (K.random_uniform((128, 16, 80))-.5) )
-
-def hard_quantize(x):
-    x = soft_quantize(x)
-    quantized = tf.round(x)
-    return x + tf.stop_gradient(quantized - x)
-
-def apply_dead_zone(x):
-    d = x[1]*.05
-    x = x[0]
-    y = x - d*tf.math.tanh(x/(.1+d))
-    return y
-
-def rate_loss(y_true,y_pred):
-    log2_e = 1.4427
-    n = y_pred.shape[-1]
-    C = n - log2_e*np.math.log(np.math.gamma(n))
-    k = K.sum(K.abs(y_pred), axis=-1)
-    p = 1.5
-    #rate = C + (n-1)*log2_e*tf.math.log((k**p + (n/5)**p)**(1/p))
-    rate = C + (n-1)*log2_e*tf.math.log(k + .112*n**2/(n/1.8+k) )
-    return K.mean(rate)
-
-eps=1e-6
-def safelog2(x):
-    log2_e = 1.4427
-    return log2_e*tf.math.log(eps+x)
-
-def feat_dist_loss(y_true,y_pred):
-    lambda_1 = 1./K.sqrt(y_pred[:,:,:,-1])
-    y_pred = y_pred[:,:,:,:-1]
-    ceps = y_pred[:,:,:,:18] - y_true[:,:,:18]
-    pitch = 2*(y_pred[:,:,:,18:19] - y_true[:,:,18:19])/(y_true[:,:,18:19] + 2)
-    corr = y_pred[:,:,:,19:] - y_true[:,:,19:]
-    pitch_weight = K.square(K.maximum(0., y_true[:,:,19:]+.5))
-    return K.mean(lambda_1*K.mean(K.square(ceps) + 10*(1/18.)*K.abs(pitch)*pitch_weight + (1/18.)*K.square(corr), axis=-1))
-
-def sq1_rate_loss(y_true,y_pred):
-    lambda_val = K.sqrt(y_pred[:,:,-1])
-    y_pred = y_pred[:,:,:-1]
-    log2_e = 1.4427
-    n = y_pred.shape[-1]//3
-    r = (y_pred[:,:,2*n:])
-    p0 = (y_pred[:,:,n:2*n])
-    p0 = 1-r**(.5+.5*p0)
-    y_pred = y_pred[:,:,:n]
-    y_pred = soft_quantize(y_pred)
-
-    y0 = K.maximum(0., 1. - K.abs(y_pred))**2
-    rate = -y0*safelog2(p0*r**K.abs(y_pred)) - (1-y0)*safelog2(.5*(1-p0)*(1-r)*r**(K.abs(y_pred)-1))
-    rate = -safelog2(-.5*tf.math.log(r)*r**K.abs(y_pred))
-    rate = -safelog2((1-r)/(1+r)*r**K.abs(y_pred))
-    #rate = -safelog2(- tf.math.sinh(.5*tf.math.log(r))* r**K.abs(y_pred) - tf.math.cosh(K.maximum(0., .5 - K.abs(y_pred))*tf.math.log(r)) + 1)
-    rate = lambda_val*K.sum(rate, axis=-1)
-    return K.mean(rate)
-
-def sq2_rate_loss(y_true,y_pred):
-    lambda_val = K.sqrt(y_pred[:,:,-1])
-    y_pred = y_pred[:,:,:-1]
-    log2_e = 1.4427
-    n = y_pred.shape[-1]//3
-    r = y_pred[:,:,2*n:]
-    p0 = y_pred[:,:,n:2*n]
-    p0 = 1-r**(.5+.5*p0)
-    #theta = K.minimum(1., .5 + 0*p0 - 0.04*tf.math.log(r))
-    #p0 = 1-r**theta
-    y_pred = tf.round(y_pred[:,:,:n])
-    y0 = K.maximum(0., 1. - K.abs(y_pred))**2
-    rate = -y0*safelog2(p0*r**K.abs(y_pred)) - (1-y0)*safelog2(.5*(1-p0)*(1-r)*r**(K.abs(y_pred)-1))
-    rate = lambda_val*K.sum(rate, axis=-1)
-    return K.mean(rate)
-
-def sq_rate_metric(y_true,y_pred, reduce=True):
-    y_pred = y_pred[:,:,:-1]
-    log2_e = 1.4427
-    n = y_pred.shape[-1]//3
-    r = y_pred[:,:,2*n:]
-    p0 = y_pred[:,:,n:2*n]
-    p0 = 1-r**(.5+.5*p0)
-    #theta = K.minimum(1., .5 + 0*p0 - 0.04*tf.math.log(r))
-    #p0 = 1-r**theta
-    y_pred = tf.round(y_pred[:,:,:n])
-    y0 = K.maximum(0., 1. - K.abs(y_pred))**2
-    rate = -y0*safelog2(p0*r**K.abs(y_pred)) - (1-y0)*safelog2(.5*(1-p0)*(1-r)*r**(K.abs(y_pred)-1))
-    rate = K.sum(rate, axis=-1)
-    if reduce:
-        rate = K.mean(rate)
-    return rate
-
-def pvq_quant_search(x, k):
-    x = x/tf.reduce_sum(tf.abs(x), axis=-1, keepdims=True)
-    kx = k*x
-    y = tf.round(kx)
-    newk = k
-
-    for j in range(10):
-        #print("y = ", y)
-        #print("iteration ", j)
-        abs_y = tf.abs(y)
-        abs_kx = tf.abs(kx)
-        kk=tf.reduce_sum(abs_y, axis=-1)
-        #print("sums = ", kk)
-        plus = 1.000001*tf.reduce_min((abs_y+.5)/(abs_kx+1e-15), axis=-1)
-        minus = .999999*tf.reduce_max((abs_y-.5)/(abs_kx+1e-15), axis=-1)
-        #print("plus = ", plus)
-        #print("minus = ", minus)
-        factor = tf.where(kk>k, minus, plus)
-        factor = tf.where(kk==k, tf.ones_like(factor), factor)
-        #print("scale = ", factor)
-        factor = tf.expand_dims(factor, axis=-1)
-        #newk = newk * (k/kk)**.2
-        newk = newk*factor
-        kx = newk*x
-        #print("newk = ", newk)
-        #print("unquantized = ", newk*x)
-        y = tf.round(kx)
-
-    #print(y)
-    #print(K.mean(K.sum(K.abs(y), axis=-1)))
-    return y
-
-def pvq_quantize(x, k):
-    x = x/(1e-15+tf.norm(x, axis=-1,keepdims=True))
-    quantized = pvq_quant_search(x, k)
-    quantized = quantized/(1e-15+tf.norm(quantized, axis=-1,keepdims=True))
-    return x + tf.stop_gradient(quantized - x)
-
-
-def var_repeat(x):
-    return tf.repeat(tf.expand_dims(x[0], 1), K.shape(x[1])[1], axis=1)
-
-nb_state_dim = 24
-
-def new_rdovae_encoder(nb_used_features=20, nb_bits=17, bunch=4, nb_quant=40, batch_size=128, cond_size=128, cond_size2=256, training=False):
-    feat = Input(shape=(None, nb_used_features), batch_size=batch_size)
-
-    gru = CuDNNGRU if training else GRU
-    enc_dense1 = Dense(cond_size2, activation='tanh', kernel_constraint=constraint, name='enc_dense1')
-    enc_dense2 = gru(cond_size, return_sequences=True, kernel_constraint=constraint, recurrent_constraint=constraint, name='enc_dense2')
-    enc_dense3 = Dense(cond_size2, activation='tanh', kernel_constraint=constraint, name='enc_dense3')
-    enc_dense4 = gru(cond_size, return_sequences=True, kernel_constraint=constraint, recurrent_constraint=constraint, name='enc_dense4')
-    enc_dense5 = Dense(cond_size2, activation='tanh', kernel_constraint=constraint, name='enc_dense5')
-    enc_dense6 = gru(cond_size, return_sequences=True, kernel_constraint=constraint, recurrent_constraint=constraint, name='enc_dense6')
-    enc_dense7 = Dense(cond_size, activation='tanh', kernel_constraint=constraint, name='enc_dense7')
-    enc_dense8 = Dense(cond_size, activation='tanh', kernel_constraint=constraint, name='enc_dense8')
-
-    #bits_dense = Dense(nb_bits, activation='linear', name='bits_dense')
-    bits_dense = Conv1D(nb_bits, 4, padding='causal', activation='linear', name='bits_dense')
-
-    zero_out = Lambda(lambda x: 0*x)
-    inputs = Reshape((-1, 2*nb_used_features))(feat)
-    d1 = enc_dense1(inputs)
-    d2 = enc_dense2(d1)
-    d3 = enc_dense3(d2)
-    d4 = enc_dense4(d3)
-    d5 = enc_dense5(d4)
-    d6 = enc_dense6(d5)
-    d7 = enc_dense7(d6)
-    d8 = enc_dense8(d7)
-    pre_out = Concatenate()([d1, d2, d3, d4, d5, d6, d7, d8])
-    enc_out = bits_dense(pre_out)
-    global_dense1 = Dense(128, activation='tanh', name='gdense1')
-    global_dense2 = Dense(nb_state_dim, activation='tanh', name='gdense2')
-    global_bits = global_dense2(global_dense1(pre_out))
-
-    encoder = Model([feat], [enc_out, global_bits], name='encoder')
-    return encoder
-
-def new_rdovae_decoder(nb_used_features=20, nb_bits=17, bunch=4, nb_quant=40, batch_size=128, cond_size=128, cond_size2=256, training=False):
-    bits_input = Input(shape=(None, nb_bits), batch_size=batch_size, name="dec_bits")
-    gru_state_input = Input(shape=(nb_state_dim,), batch_size=batch_size, name="dec_state")
-
-
-    gru = CuDNNGRU if training else GRU
-    dec_dense1 = Dense(cond_size2, activation='tanh', kernel_constraint=constraint, name='dec_dense1')
-    dec_dense2 = gru(cond_size, return_sequences=True, kernel_constraint=constraint, recurrent_constraint=constraint, name='dec_dense2')
-    dec_dense3 = Dense(cond_size2, activation='tanh', kernel_constraint=constraint, name='dec_dense3')
-    dec_dense4 = gru(cond_size, return_sequences=True, kernel_constraint=constraint, recurrent_constraint=constraint, name='dec_dense4')
-    dec_dense5 = Dense(cond_size2, activation='tanh', kernel_constraint=constraint, name='dec_dense5')
-    dec_dense6 = gru(cond_size, return_sequences=True, kernel_constraint=constraint, recurrent_constraint=constraint, name='dec_dense6')
-    dec_dense7 = Dense(cond_size, activation='tanh', kernel_constraint=constraint, name='dec_dense7')
-    dec_dense8 = Dense(cond_size, activation='tanh', kernel_constraint=constraint, name='dec_dense8')
-
-    dec_final = Dense(bunch*nb_used_features, activation='linear', name='dec_final')
-
-    time_reverse = Lambda(lambda x: K.reverse(x, 1))
-    #time_reverse = Lambda(lambda x: x)
-    #gru_state_rep = RepeatVector(64//bunch)(gru_state_input)
-
-    #gru_state_rep = Lambda(var_repeat, output_shape=(None, nb_state_dim)) ([gru_state_input, bits_input])
-    gru_state1 = Dense(cond_size, name="state1", activation='tanh')(gru_state_input)
-    gru_state2 = Dense(cond_size, name="state2", activation='tanh')(gru_state_input)
-    gru_state3 = Dense(cond_size, name="state3", activation='tanh')(gru_state_input)
-
-    dec1 = dec_dense1(time_reverse(bits_input))
-    dec2 = dec_dense2(dec1, initial_state=gru_state1)
-    dec3 = dec_dense3(dec2)
-    dec4 = dec_dense4(dec3, initial_state=gru_state2)
-    dec5 = dec_dense5(dec4)
-    dec6 = dec_dense6(dec5, initial_state=gru_state3)
-    dec7 = dec_dense7(dec6)
-    dec8 = dec_dense8(dec7)
-    output = Reshape((-1, nb_used_features))(dec_final(Concatenate()([dec1, dec2, dec3, dec4, dec5, dec6, dec7, dec8])))
-    decoder = Model([bits_input, gru_state_input], time_reverse(output), name='decoder')
-    decoder.nb_bits = nb_bits
-    decoder.bunch = bunch
-    return decoder
-
-def new_split_decoder(decoder):
-    nb_bits = decoder.nb_bits
-    bunch = decoder.bunch
-    bits_input = Input(shape=(None, nb_bits), name="split_bits")
-    gru_state_input = Input(shape=(None,nb_state_dim), name="split_state")
-
-    range_select = Lambda(lambda x: x[0][:,x[1]:x[2],:])
-    elem_select = Lambda(lambda x: x[0][:,x[1],:])
-    points = [0, 100, 200, 300, 400]
-    outputs = []
-    for i in range(len(points)-1):
-        begin = points[i]//bunch
-        end = points[i+1]//bunch
-        state = elem_select([gru_state_input, end-1])
-        bits = range_select([bits_input, begin, end])
-        outputs.append(decoder([bits, state]))
-    output = Concatenate(axis=1)(outputs)
-    split = Model([bits_input, gru_state_input], output, name="split")
-    return split
-
-def tensor_concat(x):
-    #n = x[1]//2
-    #x = x[0]
-    n=2
-    y = []
-    for i in range(n-1):
-        offset = 2 * (n-1-i)
-        tmp = K.concatenate([x[i][:, offset:, :], x[-1][:, -offset:, :]], axis=-2)
-        y.append(tf.expand_dims(tmp, axis=0))
-    y.append(tf.expand_dims(x[-1], axis=0))
-    return Concatenate(axis=0)(y)
-
-
-def new_rdovae_model(nb_used_features=20, nb_bits=17, bunch=4, nb_quant=40, batch_size=128, cond_size=128, cond_size2=256, training=False):
-
-    feat = Input(shape=(None, nb_used_features), batch_size=batch_size)
-    quant_id = Input(shape=(None,), batch_size=batch_size)
-    lambda_val = Input(shape=(None, 1), batch_size=batch_size)
-    lambda_bunched = AveragePooling1D(pool_size=bunch//2, strides=bunch//2, padding="valid")(lambda_val)
-    lambda_up = Lambda(lambda x: K.repeat_elements(x, 2, axis=-2))(lambda_val)
-
-    qembedding = Embedding(nb_quant, 6*nb_bits, name='quant_embed', embeddings_initializer='zeros')
-    quant_embed_dec = qembedding(quant_id)
-    quant_scale = Activation('softplus')(Lambda(lambda x: x[:,:,:nb_bits], name='quant_scale_embed')(quant_embed_dec))
-
-    encoder = new_rdovae_encoder(nb_used_features, nb_bits, bunch, nb_quant, batch_size, cond_size, cond_size2, training=training)
-    ze, gru_state_dec = encoder([feat])
-    ze = Multiply()([ze, quant_scale])
-
-    decoder = new_rdovae_decoder(nb_used_features, nb_bits, bunch, nb_quant, batch_size, cond_size, cond_size2, training=training)
-    split_decoder = new_split_decoder(decoder)
-
-    dead_zone = Activation('softplus')(Lambda(lambda x: x[:,:,nb_bits:2*nb_bits], name='dead_zone_embed')(quant_embed_dec))
-    soft_distr_embed = Activation('sigmoid')(Lambda(lambda x: x[:,:,2*nb_bits:4*nb_bits], name='soft_distr_embed')(quant_embed_dec))
-    hard_distr_embed = Activation('sigmoid')(Lambda(lambda x: x[:,:,4*nb_bits:], name='hard_distr_embed')(quant_embed_dec))
-
-    noisequant = UniformNoise()
-    hardquant = Lambda(hard_quantize)
-    dzone = Lambda(apply_dead_zone)
-    dze = dzone([ze,dead_zone])
-    ndze = noisequant(dze)
-    dze_quant = hardquant(dze)
-
-    div = Lambda(lambda x: x[0]/x[1])
-    dze_quant = div([dze_quant,quant_scale])
-    ndze_unquant = div([ndze,quant_scale])
-
-    mod_select = Lambda(lambda x: x[0][:,x[1]::bunch//2,:])
-    gru_state_dec = Lambda(lambda x: pvq_quantize(x, 82))(gru_state_dec)
-    combined_output = []
-    unquantized_output = []
-    cat = Concatenate(name="out_cat")
-    for i in range(bunch//2):
-        dze_select = mod_select([dze_quant, i])
-        ndze_select = mod_select([ndze_unquant, i])
-        state_select = mod_select([gru_state_dec, i])
-
-        tmp = split_decoder([dze_select, state_select])
-        tmp = cat([tmp, lambda_up])
-        combined_output.append(tmp)
-
-        tmp = split_decoder([ndze_select, state_select])
-        tmp = cat([tmp, lambda_up])
-        unquantized_output.append(tmp)
-
-    concat = Lambda(tensor_concat, name="output")
-    combined_output = concat(combined_output)
-    unquantized_output = concat(unquantized_output)
-
-    e2 = Concatenate(name="hard_bits")([dze, hard_distr_embed, lambda_val])
-    e = Concatenate(name="soft_bits")([dze, soft_distr_embed, lambda_val])
-
-
-    model = Model([feat, quant_id, lambda_val], [combined_output, unquantized_output, e, e2], name="end2end")
-    model.nb_used_features = nb_used_features
-
-    return model, encoder, decoder, qembedding
diff --git a/dnn/training_tf2/rdovae_exchange.py b/dnn/training_tf2/rdovae_exchange.py
deleted file mode 100644
index 3249677d4..000000000
--- a/dnn/training_tf2/rdovae_exchange.py
+++ /dev/null
@@ -1,138 +0,0 @@
-"""
-/* Copyright (c) 2022 Amazon
-   Written by Jan Buethe */
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-"""
-
-
-import argparse
-import os
-import sys
-
-os.environ['CUDA_VISIBLE_DEVICES'] = ""
-
-parser = argparse.ArgumentParser()
-
-parser.add_argument('weights', metavar="<weight file>", type=str, help='model weight file in hdf5 format')
-parser.add_argument('output', metavar="<output folder>", type=str, help='output exchange folder')
-parser.add_argument('--cond-size', type=int, help="conditioning size (default: 256)", default=256)
-parser.add_argument('--latent-dim', type=int, help="dimension of latent space (default: 80)", default=80)
-parser.add_argument('--quant-levels', type=int, help="number of quantization steps (default: 16)", default=16)
-
-args = parser.parse_args()
-
-# now import the heavy stuff
-from rdovae import new_rdovae_model
-from wexchange.tf import dump_tf_weights, load_tf_weights
-
-
-exchange_name = {
-    'enc_dense1'    : 'encoder_stack_layer1_dense',
-    'enc_dense3'    : 'encoder_stack_layer3_dense',
-    'enc_dense5'    : 'encoder_stack_layer5_dense',
-    'enc_dense7'    : 'encoder_stack_layer7_dense',
-    'enc_dense8'    : 'encoder_stack_layer8_dense',
-    'gdense1'       : 'encoder_state_layer1_dense',
-    'gdense2'       : 'encoder_state_layer2_dense',
-    'enc_dense2'    : 'encoder_stack_layer2_gru',
-    'enc_dense4'    : 'encoder_stack_layer4_gru',
-    'enc_dense6'    : 'encoder_stack_layer6_gru',
-    'bits_dense'    : 'encoder_stack_layer9_conv',
-    'qembedding'    : 'statistical_model_embedding',
-    'state1'        : 'decoder_state1_dense',
-    'state2'        : 'decoder_state2_dense',
-    'state3'        : 'decoder_state3_dense',
-    'dec_dense1'    : 'decoder_stack_layer1_dense',
-    'dec_dense3'    : 'decoder_stack_layer3_dense',
-    'dec_dense5'    : 'decoder_stack_layer5_dense',
-    'dec_dense7'    : 'decoder_stack_layer7_dense',
-    'dec_dense8'    : 'decoder_stack_layer8_dense',
-    'dec_final'     : 'decoder_stack_layer9_dense',
-    'dec_dense2'    : 'decoder_stack_layer2_gru',
-    'dec_dense4'    : 'decoder_stack_layer4_gru',
-    'dec_dense6'    : 'decoder_stack_layer6_gru'
-}
-
-
-if __name__ == "__main__":
-
-    model, encoder, decoder, qembedding = new_rdovae_model(20, args.latent_dim, cond_size=args.cond_size, nb_quant=args.quant_levels)
-    model.load_weights(args.weights)
-
-    os.makedirs(args.output, exist_ok=True)
-
-    # encoder
-    encoder_dense_names = [
-        'enc_dense1',
-        'enc_dense3',
-        'enc_dense5',
-        'enc_dense7',
-        'enc_dense8',
-        'gdense1',
-        'gdense2'
-    ]
-
-    encoder_gru_names = [
-        'enc_dense2',
-        'enc_dense4',
-        'enc_dense6'
-    ]
-
-    encoder_conv1d_names = [
-        'bits_dense'
-    ]
-
-
-    for name in encoder_dense_names + encoder_gru_names + encoder_conv1d_names:
-        print(f"writing layer {exchange_name[name]}...")
-        dump_tf_weights(os.path.join(args.output, exchange_name[name]), encoder.get_layer(name))
-
-    # qembedding
-    print(f"writing layer {exchange_name['qembedding']}...")
-    dump_tf_weights(os.path.join(args.output, exchange_name['qembedding']), qembedding)
-
-    # decoder
-    decoder_dense_names = [
-        'state1',
-        'state2',
-        'state3',
-        'dec_dense1',
-        'dec_dense3',
-        'dec_dense5',
-        'dec_dense7',
-        'dec_dense8',
-        'dec_final'
-    ]
-
-    decoder_gru_names = [
-        'dec_dense2',
-        'dec_dense4',
-        'dec_dense6'
-    ]
-
-    for name in decoder_dense_names + decoder_gru_names:
-        print(f"writing layer {exchange_name[name]}...")
-        dump_tf_weights(os.path.join(args.output, exchange_name[name]), decoder.get_layer(name))
diff --git a/dnn/training_tf2/rdovae_import.py b/dnn/training_tf2/rdovae_import.py
deleted file mode 100644
index bc8b460d0..000000000
--- a/dnn/training_tf2/rdovae_import.py
+++ /dev/null
@@ -1,123 +0,0 @@
-"""
-/* Copyright (c) 2022 Amazon
-   Written by Jan Buethe */
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-"""
-
-
-import argparse
-import os
-import sys
-
-os.environ['CUDA_VISIBLE_DEVICES'] = ""
-
-parser = argparse.ArgumentParser()
-
-parser.add_argument('input', metavar="<input folder>", type=str, help='input exchange folder')
-parser.add_argument('weights', metavar="<weight file>", type=str, help='model weight file in hdf5 format')
-parser.add_argument('--cond-size', type=int, help="conditioning size (default: 256)", default=256)
-parser.add_argument('--latent-dim', type=int, help="dimension of latent space (default: 80)", default=80)
-parser.add_argument('--quant-levels', type=int, help="number of quantization steps (default: 16)", default=16)
-
-args = parser.parse_args()
-
-# now import the heavy stuff
-from rdovae import new_rdovae_model
-from wexchange.tf import load_tf_weights
-
-
-exchange_name = {
-    'enc_dense1'    : 'encoder_stack_layer1_dense',
-    'enc_dense3'    : 'encoder_stack_layer3_dense',
-    'enc_dense5'    : 'encoder_stack_layer5_dense',
-    'enc_dense7'    : 'encoder_stack_layer7_dense',
-    'enc_dense8'    : 'encoder_stack_layer8_dense',
-    'gdense1'       : 'encoder_state_layer1_dense',
-    'gdense2'       : 'encoder_state_layer2_dense',
-    'enc_dense2'    : 'encoder_stack_layer2_gru',
-    'enc_dense4'    : 'encoder_stack_layer4_gru',
-    'enc_dense6'    : 'encoder_stack_layer6_gru',
-    'bits_dense'    : 'encoder_stack_layer9_conv',
-    'qembedding'    : 'statistical_model_embedding',
-    'state1'        : 'decoder_state1_dense',
-    'state2'        : 'decoder_state2_dense',
-    'state3'        : 'decoder_state3_dense',
-    'dec_dense1'    : 'decoder_stack_layer1_dense',
-    'dec_dense3'    : 'decoder_stack_layer3_dense',
-    'dec_dense5'    : 'decoder_stack_layer5_dense',
-    'dec_dense7'    : 'decoder_stack_layer7_dense',
-    'dec_dense8'    : 'decoder_stack_layer8_dense',
-    'dec_final'     : 'decoder_stack_layer9_dense',
-    'dec_dense2'    : 'decoder_stack_layer2_gru',
-    'dec_dense4'    : 'decoder_stack_layer4_gru',
-    'dec_dense6'    : 'decoder_stack_layer6_gru'
-}
-
-if __name__ == "__main__":
-
-    model, encoder, decoder, qembedding = new_rdovae_model(20, args.latent_dim, cond_size=args.cond_size, nb_quant=args.quant_levels)
-
-    encoder_layers = [
-        'enc_dense1',
-        'enc_dense3',
-        'enc_dense5',
-        'enc_dense7',
-        'enc_dense8',
-        'gdense1',
-        'gdense2',
-        'enc_dense2',
-        'enc_dense4',
-        'enc_dense6',
-        'bits_dense'
-    ]
-
-    decoder_layers = [
-        'state1',
-        'state2',
-        'state3',
-        'dec_dense1',
-        'dec_dense3',
-        'dec_dense5',
-        'dec_dense7',
-        'dec_dense8',
-        'dec_final',
-        'dec_dense2',
-        'dec_dense4',
-        'dec_dense6'
-    ]
-
-    for name in encoder_layers:
-        print(f"loading weight for layer {name}...")
-        load_tf_weights(os.path.join(args.input, exchange_name[name]), encoder.get_layer(name))
-
-    print(f"loading weight for layer qembedding...")
-    load_tf_weights(os.path.join(args.input, exchange_name['qembedding']), qembedding)
-
-    for name in decoder_layers:
-        print(f"loading weight for layer {name}...")
-        load_tf_weights(os.path.join(args.input, exchange_name[name]), decoder.get_layer(name))
-
-    model.save(args.weights)
diff --git a/dnn/training_tf2/test_lpcnet.py b/dnn/training_tf2/test_lpcnet.py
deleted file mode 100755
index ca551e63c..000000000
--- a/dnn/training_tf2/test_lpcnet.py
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/usr/bin/python3
-'''Copyright (c) 2018 Mozilla
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-'''
-import argparse
-import sys
-
-import h5py
-import numpy as np
-
-import lpcnet
-from ulaw import ulaw2lin, lin2ulaw
-
-
-parser = argparse.ArgumentParser()
-parser.add_argument('model-file', type=str, help='model weight h5 file')
-parser.add_argument('--lpc-gamma', type=float, help='LPC weighting factor. WARNING: giving an inconsistent value here will severely degrade performance', default=1)
-
-args = parser.parse_args()
-
-filename = args.model_file
-with h5py.File(filename, "r") as f:
-    units = min(f['model_weights']['gru_a']['gru_a']['recurrent_kernel:0'].shape)
-    units2 = min(f['model_weights']['gru_b']['gru_b']['recurrent_kernel:0'].shape)
-    cond_size = min(f['model_weights']['feature_dense1']['feature_dense1']['kernel:0'].shape)
-    e2e = 'rc2lpc' in f['model_weights']
-
-
-model, enc, dec = lpcnet.new_lpcnet_model(training = False, rnn_units1=units, rnn_units2=units2, flag_e2e = e2e, cond_size=cond_size, batch_size=1)
-
-model.compile(optimizer='adam', loss='sparse_categorical_crossentropy', metrics=['sparse_categorical_accuracy'])
-#model.summary()
-
-
-feature_file = sys.argv[2]
-out_file = sys.argv[3]
-frame_size = model.frame_size
-nb_features = 36
-nb_used_features = model.nb_used_features
-
-features = np.fromfile(feature_file, dtype='float32')
-features = np.resize(features, (-1, nb_features))
-nb_frames = 1
-feature_chunk_size = features.shape[0]
-pcm_chunk_size = frame_size*feature_chunk_size
-
-features = np.reshape(features, (nb_frames, feature_chunk_size, nb_features))
-periods = (.1 + 50*features[:,:,18:19]+100).astype('int16')
-
-
-
-model.load_weights(filename);
-
-order = 16
-
-pcm = np.zeros((nb_frames*pcm_chunk_size, ))
-fexc = np.zeros((1, 1, 3), dtype='int16')+128
-state1 = np.zeros((1, model.rnn_units1), dtype='float32')
-state2 = np.zeros((1, model.rnn_units2), dtype='float32')
-
-mem = 0
-coef = 0.85
-
-lpc_weights = np.array([args.lpc_gamma ** (i + 1) for i in range(16)])
-
-fout = open(out_file, 'wb')
-
-skip = order + 1
-for c in range(0, nb_frames):
-    if not e2e:
-        cfeat = enc.predict([features[c:c+1, :, :nb_used_features], periods[c:c+1, :, :]])
-    else:
-        cfeat,lpcs = enc.predict([features[c:c+1, :, :nb_used_features], periods[c:c+1, :, :]])
-    for fr in range(0, feature_chunk_size):
-        f = c*feature_chunk_size + fr
-        if not e2e:
-            a = features[c, fr, nb_features-order:] * lpc_weights
-        else:
-            a = lpcs[c,fr]
-        for i in range(skip, frame_size):
-            pred = -sum(a*pcm[f*frame_size + i - 1:f*frame_size + i - order-1:-1])
-            fexc[0, 0, 1] = lin2ulaw(pred)
-
-            p, state1, state2 = dec.predict([fexc, cfeat[:, fr:fr+1, :], state1, state2])
-            #Lower the temperature for voiced frames to reduce noisiness
-            p *= np.power(p, np.maximum(0, 1.5*features[c, fr, 19] - .5))
-            p = p/(1e-18 + np.sum(p))
-            #Cut off the tail of the remaining distribution
-            p = np.maximum(p-0.002, 0).astype('float64')
-            p = p/(1e-8 + np.sum(p))
-
-            fexc[0, 0, 2] = np.argmax(np.random.multinomial(1, p[0,0,:], 1))
-            pcm[f*frame_size + i] = pred + ulaw2lin(fexc[0, 0, 2])
-            fexc[0, 0, 0] = lin2ulaw(pcm[f*frame_size + i])
-            mem = coef*mem + pcm[f*frame_size + i]
-            #print(mem)
-            np.array([np.round(mem)], dtype='int16').tofile(fout)
-        skip = 0
diff --git a/dnn/training_tf2/test_plc.py b/dnn/training_tf2/test_plc.py
deleted file mode 100644
index 0c0ac25fa..000000000
--- a/dnn/training_tf2/test_plc.py
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/python3
-'''Copyright (c) 2021-2022 Amazon
-   Copyright (c) 2018-2019 Mozilla
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-'''
-
-# Train an LPCNet model
-
-import argparse
-from plc_loader import PLCLoader
-
-parser = argparse.ArgumentParser(description='Test a PLC model')
-
-parser.add_argument('weights', metavar='<weights file>', help='weights file (.h5)')
-parser.add_argument('features', metavar='<features file>', help='binary features file (float32)')
-parser.add_argument('output', metavar='<output>', help='reconstructed file (float32)')
-parser.add_argument('--model', metavar='<model>', default='lpcnet_plc', help='PLC model python definition (without .py)')
-group1 = parser.add_mutually_exclusive_group()
-
-parser.add_argument('--gru-size', metavar='<units>', default=256, type=int, help='number of units in GRU (default 256)')
-parser.add_argument('--cond-size', metavar='<units>', default=128, type=int, help='number of units in conditioning network (default 128)')
-
-
-args = parser.parse_args()
-
-import importlib
-lpcnet = importlib.import_module(args.model)
-
-import sys
-import numpy as np
-from tensorflow.keras.optimizers import Adam
-from tensorflow.keras.callbacks import ModelCheckpoint, CSVLogger
-import tensorflow.keras.backend as K
-import h5py
-
-import tensorflow as tf
-#gpus = tf.config.experimental.list_physical_devices('GPU')
-#if gpus:
-#  try:
-#    tf.config.experimental.set_virtual_device_configuration(gpus[0], [tf.config.experimental.VirtualDeviceConfiguration(memory_limit=5120)])
-#  except RuntimeError as e:
-#    print(e)
-
-model = lpcnet.new_lpcnet_plc_model(rnn_units=args.gru_size, batch_size=1, training=False, quantize=False, cond_size=args.cond_size)
-model.compile()
-
-lpc_order = 16
-
-feature_file = args.features
-nb_features = model.nb_used_features + lpc_order
-nb_used_features = model.nb_used_features
-
-# u for unquantised, load 16 bit PCM samples and convert to mu-law
-
-features = np.loadtxt(feature_file)
-print(features.shape)
-sequence_size = features.shape[0]
-lost = np.reshape(features[:,-1:], (1, sequence_size, 1))
-features = features[:,:nb_used_features]
-features = np.reshape(features, (1, sequence_size, nb_used_features))
-
-
-model.load_weights(args.weights)
-
-features = features*lost
-out = model.predict([features, lost])
-
-out = features + (1-lost)*out
-
-np.savetxt(args.output, out[0,:,:])
diff --git a/dnn/training_tf2/tf_funcs.py b/dnn/training_tf2/tf_funcs.py
deleted file mode 100644
index b86f075cf..000000000
--- a/dnn/training_tf2/tf_funcs.py
+++ /dev/null
@@ -1,70 +0,0 @@
-"""
-Tensorflow/Keras helper functions to do the following:
-    1. \mu law <-> Linear domain conversion
-    2. Differentiable prediction from the input signal and LP coefficients
-    3. Differentiable transformations Reflection Coefficients (RCs) <-> LP Coefficients
-"""
-from tensorflow.keras.layers import Lambda, Multiply, Layer, Concatenate
-from tensorflow.keras import backend as K
-import tensorflow as tf
-
-# \mu law <-> Linear conversion functions
-scale = 255.0/32768.0
-scale_1 = 32768.0/255.0
-def tf_l2u(x):
-    s = K.sign(x)
-    x = K.abs(x)
-    u = (s*(128*K.log(1+scale*x)/K.log(256.0)))
-    u = K.clip(128 + u, 0, 255)
-    return u
-
-def tf_u2l(u):
-    u = tf.cast(u,"float32")
-    u = u - 128.0
-    s = K.sign(u)
-    u = K.abs(u)
-    return s*scale_1*(K.exp(u/128.*K.log(256.0))-1)
-
-# Differentiable Prediction Layer
-# Computes the LP prediction from the input lag signal and the LP coefficients
-# The inputs xt and lpc conform with the shapes in lpcnet.py (the '2400' is coded keeping this in mind)
-class diff_pred(Layer):
-    def call(self, inputs, lpcoeffs_N = 16, frame_size = 160):
-        xt = inputs[0]
-        lpc = inputs[1]
-
-        rept = Lambda(lambda x: K.repeat_elements(x , frame_size, 1))
-        zpX = Lambda(lambda x: K.concatenate([0*x[:,0:lpcoeffs_N,:], x],axis = 1))
-        cX = Lambda(lambda x: K.concatenate([x[:,(lpcoeffs_N - i):(lpcoeffs_N - i + 2400),:] for i in range(lpcoeffs_N)],axis = 2))
-
-        pred = -Multiply()([rept(lpc),cX(zpX(xt))])
-
-        return K.sum(pred,axis = 2,keepdims = True)
-
-# Differentiable Transformations (RC <-> LPC) computed using the Levinson Durbin Recursion
-class diff_rc2lpc(Layer):
-    def call(self, inputs, lpcoeffs_N = 16):
-        def pred_lpc_recursive(input):
-            temp = (input[0] + K.repeat_elements(input[1],input[0].shape[2],2)*K.reverse(input[0],axes = 2))
-            temp = Concatenate(axis = 2)([temp,input[1]])
-            return temp
-        Llpc = Lambda(pred_lpc_recursive)
-        inputs = inputs[:,:,:lpcoeffs_N]
-        lpc_init = inputs
-        for i in range(1,lpcoeffs_N):
-            lpc_init = Llpc([lpc_init[:,:,:i],K.expand_dims(inputs[:,:,i],axis = -1)])
-        return lpc_init
-
-class diff_lpc2rc(Layer):
-    def call(self, inputs, lpcoeffs_N = 16):
-        def pred_rc_recursive(input):
-            ki = K.repeat_elements(K.expand_dims(input[1][:,:,0],axis = -1),input[0].shape[2],2)
-            temp = (input[0] - ki*K.reverse(input[0],axes = 2))/(1 - ki*ki)
-            temp = Concatenate(axis = 2)([temp,input[1]])
-            return temp
-        Lrc = Lambda(pred_rc_recursive)
-        rc_init = inputs
-        for i in range(1,lpcoeffs_N):
-            j = (lpcoeffs_N - i + 1)
-            rc_init = Lrc([rc_init[:,:,:(j - 1)],rc_init[:,:,(j - 1):]])
-        return rc_init
diff --git a/dnn/training_tf2/train_lpcnet.py b/dnn/training_tf2/train_lpcnet.py
deleted file mode 100755
index 60e2b56f5..000000000
--- a/dnn/training_tf2/train_lpcnet.py
+++ /dev/null
@@ -1,214 +0,0 @@
-#!/usr/bin/python3
-'''Copyright (c) 2018 Mozilla
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-'''
-
-# Train an LPCNet model
-
-import argparse
-import os
-
-from dataloader import LPCNetLoader
-
-parser = argparse.ArgumentParser(description='Train an LPCNet model')
-
-parser.add_argument('features', metavar='<features file>', help='binary features file (float32)')
-parser.add_argument('data', metavar='<audio data file>', help='binary audio data file (uint8)')
-parser.add_argument('output', metavar='<output>', help='trained model file (.h5)')
-parser.add_argument('--model', metavar='<model>', default='lpcnet', help='LPCNet model python definition (without .py)')
-group1 = parser.add_mutually_exclusive_group()
-group1.add_argument('--quantize', metavar='<input weights>', help='quantize model')
-group1.add_argument('--retrain', metavar='<input weights>', help='continue training model')
-parser.add_argument('--density', metavar='<global density>', type=float, help='average density of the recurrent weights (default 0.1)')
-parser.add_argument('--density-split', nargs=3, metavar=('<update>', '<reset>', '<state>'), type=float, help='density of each recurrent gate (default 0.05, 0.05, 0.2)')
-parser.add_argument('--grub-density', metavar='<global GRU B density>', type=float, help='average density of the recurrent weights (default 1.0)')
-parser.add_argument('--grub-density-split', nargs=3, metavar=('<update>', '<reset>', '<state>'), type=float, help='density of each GRU B input gate (default 1.0, 1.0, 1.0)')
-parser.add_argument('--grua-size', metavar='<units>', default=384, type=int, help='number of units in GRU A (default 384)')
-parser.add_argument('--grub-size', metavar='<units>', default=16, type=int, help='number of units in GRU B (default 16)')
-parser.add_argument('--cond-size', metavar='<units>', default=128, type=int, help='number of units in conditioning network, aka frame rate network (default 128)')
-parser.add_argument('--epochs', metavar='<epochs>', default=120, type=int, help='number of epochs to train for (default 120)')
-parser.add_argument('--batch-size', metavar='<batch size>', default=128, type=int, help='batch size to use (default 128)')
-parser.add_argument('--end2end', dest='flag_e2e', action='store_true', help='Enable end-to-end training (with differentiable LPC computation')
-parser.add_argument('--lr', metavar='<learning rate>', type=float, help='learning rate')
-parser.add_argument('--decay', metavar='<decay>', type=float, help='learning rate decay')
-parser.add_argument('--gamma', metavar='<gamma>', type=float, help='adjust u-law compensation (default 2.0, should not be less than 1.0)')
-parser.add_argument('--lookahead', metavar='<nb frames>', default=2, type=int, help='Number of look-ahead frames (default 2)')
-parser.add_argument('--logdir', metavar='<log dir>', help='directory for tensorboard log files')
-parser.add_argument('--lpc-gamma', type=float, default=1, help='gamma for LPC weighting')
-parser.add_argument('--cuda-devices', metavar='<cuda devices>', type=str, default=None, help='string with comma separated cuda device ids')
-
-args = parser.parse_args()
-
-# set visible cuda devices
-if args.cuda_devices != None:
-    os.environ['CUDA_VISIBLE_DEVICES'] = args.cuda_devices
-
-density = (0.05, 0.05, 0.2)
-if args.density_split is not None:
-    density = args.density_split
-elif args.density is not None:
-    density = [0.5*args.density, 0.5*args.density, 2.0*args.density];
-
-grub_density = (1., 1., 1.)
-if args.grub_density_split is not None:
-    grub_density = args.grub_density_split
-elif args.grub_density is not None:
-    grub_density = [0.5*args.grub_density, 0.5*args.grub_density, 2.0*args.grub_density];
-
-gamma = 2.0 if args.gamma is None else args.gamma
-
-import importlib
-lpcnet = importlib.import_module(args.model)
-
-import sys
-import numpy as np
-from tensorflow.keras.optimizers import Adam
-from tensorflow.keras.callbacks import ModelCheckpoint, CSVLogger
-from ulaw import ulaw2lin, lin2ulaw
-import tensorflow.keras.backend as K
-import h5py
-
-import tensorflow as tf
-from tf_funcs import *
-from lossfuncs import *
-#gpus = tf.config.experimental.list_physical_devices('GPU')
-#if gpus:
-#  try:
-#    tf.config.experimental.set_virtual_device_configuration(gpus[0], [tf.config.experimental.VirtualDeviceConfiguration(memory_limit=5120)])
-#  except RuntimeError as e:
-#    print(e)
-
-nb_epochs = args.epochs
-
-# Try reducing batch_size if you run out of memory on your GPU
-batch_size = args.batch_size
-
-quantize = args.quantize is not None
-retrain = args.retrain is not None
-
-lpc_order = 16
-
-if quantize:
-    lr = 0.00003
-    decay = 0
-    input_model = args.quantize
-else:
-    lr = 0.001
-    decay = 5e-5
-
-if args.lr is not None:
-    lr = args.lr
-
-if args.decay is not None:
-    decay = args.decay
-
-if retrain:
-    input_model = args.retrain
-
-flag_e2e = args.flag_e2e
-
-opt = Adam(lr, decay=decay, beta_1=0.5, beta_2=0.8)
-strategy = tf.distribute.experimental.MultiWorkerMirroredStrategy()
-
-with strategy.scope():
-    model, _, _ = lpcnet.new_lpcnet_model(rnn_units1=args.grua_size,
-                                          rnn_units2=args.grub_size,
-                                          batch_size=batch_size, training=True,
-                                          quantize=quantize,
-                                          flag_e2e=flag_e2e,
-                                          cond_size=args.cond_size,
-                                          lpc_gamma=args.lpc_gamma,
-                                          lookahead=args.lookahead
-                                          )
-    if not flag_e2e:
-        model.compile(optimizer=opt, loss=metric_cel, metrics=metric_cel)
-    else:
-        model.compile(optimizer=opt, loss = [interp_mulaw(gamma=gamma), loss_matchlar()], loss_weights = [1.0, 2.0], metrics={'pdf':[metric_cel,metric_icel,metric_exc_sd,metric_oginterploss]})
-    model.summary()
-
-feature_file = args.features
-pcm_file = args.data     # 16 bit unsigned short PCM samples
-frame_size = model.frame_size
-nb_features = model.nb_used_features + lpc_order
-nb_used_features = model.nb_used_features
-feature_chunk_size = 15
-pcm_chunk_size = frame_size*feature_chunk_size
-
-# u for unquantised, load 16 bit PCM samples and convert to mu-law
-
-data = np.memmap(pcm_file, dtype='int16', mode='r')
-nb_frames = (len(data)//(2*pcm_chunk_size)-1)//batch_size*batch_size
-
-features = np.memmap(feature_file, dtype='float32', mode='r')
-
-# limit to discrete number of frames
-data = data[(4-args.lookahead)*2*frame_size:]
-data = data[:nb_frames*2*pcm_chunk_size]
-
-
-data = np.reshape(data, (nb_frames, pcm_chunk_size, 2))
-
-#print("ulaw std = ", np.std(out_exc))
-
-sizeof = features.strides[-1]
-features = np.lib.stride_tricks.as_strided(features, shape=(nb_frames, feature_chunk_size+4, nb_features),
-                                           strides=(feature_chunk_size*nb_features*sizeof, nb_features*sizeof, sizeof))
-#features = features[:, :, :nb_used_features]
-
-
-periods = (.1 + 50*features[:,:,nb_used_features-2:nb_used_features-1]+100).astype('int16')
-#periods = np.minimum(periods, 255)
-
-# dump models to disk as we go
-checkpoint = ModelCheckpoint('{}_{}_{}.h5'.format(args.output, args.grua_size, '{epoch:02d}'))
-
-if args.retrain is not None:
-    model.load_weights(args.retrain)
-
-if quantize or retrain:
-    #Adapting from an existing model
-    model.load_weights(input_model)
-    if quantize:
-        sparsify = lpcnet.Sparsify(10000, 30000, 100, density, quantize=True)
-        grub_sparsify = lpcnet.SparsifyGRUB(10000, 30000, 100, args.grua_size, grub_density, quantize=True)
-    else:
-        sparsify = lpcnet.Sparsify(0, 0, 1, density)
-        grub_sparsify = lpcnet.SparsifyGRUB(0, 0, 1, args.grua_size, grub_density)
-else:
-    #Training from scratch
-    sparsify = lpcnet.Sparsify(2000, 20000, 400, density)
-    grub_sparsify = lpcnet.SparsifyGRUB(2000, 40000, 400, args.grua_size, grub_density)
-
-model.save_weights('{}_{}_initial.h5'.format(args.output, args.grua_size))
-
-loader = LPCNetLoader(data, features, periods, batch_size, e2e=flag_e2e, lookahead=args.lookahead)
-
-callbacks = [checkpoint, sparsify, grub_sparsify]
-if args.logdir is not None:
-    logdir = '{}/{}_{}_logs'.format(args.logdir, args.output, args.grua_size)
-    tensorboard_callback = tf.keras.callbacks.TensorBoard(log_dir=logdir)
-    callbacks.append(tensorboard_callback)
-
-model.fit(loader, epochs=nb_epochs, validation_split=0.0, callbacks=callbacks)
diff --git a/dnn/training_tf2/train_plc.py b/dnn/training_tf2/train_plc.py
deleted file mode 100644
index ca30c457d..000000000
--- a/dnn/training_tf2/train_plc.py
+++ /dev/null
@@ -1,197 +0,0 @@
-#!/usr/bin/python3
-'''Copyright (c) 2021-2022 Amazon
-   Copyright (c) 2018-2019 Mozilla
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-'''
-
-# Train an LPCNet model
-
-import argparse
-from plc_loader import PLCLoader
-
-parser = argparse.ArgumentParser(description='Train a PLC model')
-
-parser.add_argument('features', metavar='<features file>', help='binary features file (float32)')
-parser.add_argument('lost_file', metavar='<packet loss file>', help='packet loss traces (int8)')
-parser.add_argument('output', metavar='<output>', help='trained model file (.h5)')
-parser.add_argument('--model', metavar='<model>', default='lpcnet_plc', help='PLC model python definition (without .py)')
-group1 = parser.add_mutually_exclusive_group()
-group1.add_argument('--quantize', metavar='<input weights>', help='quantize model')
-group1.add_argument('--retrain', metavar='<input weights>', help='continue training model')
-parser.add_argument('--gru-size', metavar='<units>', default=256, type=int, help='number of units in GRU (default 256)')
-parser.add_argument('--cond-size', metavar='<units>', default=128, type=int, help='number of units in conditioning network (default 128)')
-parser.add_argument('--epochs', metavar='<epochs>', default=120, type=int, help='number of epochs to train for (default 120)')
-parser.add_argument('--batch-size', metavar='<batch size>', default=128, type=int, help='batch size to use (default 128)')
-parser.add_argument('--seq-length', metavar='<sequence length>', default=1000, type=int, help='sequence length to use (default 1000)')
-parser.add_argument('--lr', metavar='<learning rate>', type=float, help='learning rate')
-parser.add_argument('--decay', metavar='<decay>', type=float, help='learning rate decay')
-parser.add_argument('--band-loss', metavar='<weight>', default=1.0, type=float, help='weight of band loss (default 1.0)')
-parser.add_argument('--loss-bias', metavar='<bias>', default=0.0, type=float, help='loss bias towards low energy (default 0.0)')
-parser.add_argument('--logdir', metavar='<log dir>', help='directory for tensorboard log files')
-
-
-args = parser.parse_args()
-
-import importlib
-lpcnet = importlib.import_module(args.model)
-
-import sys
-import numpy as np
-from tensorflow.keras.optimizers import Adam
-from tensorflow.keras.callbacks import ModelCheckpoint, CSVLogger
-import tensorflow.keras.backend as K
-import h5py
-
-import tensorflow as tf
-#gpus = tf.config.experimental.list_physical_devices('GPU')
-#if gpus:
-#  try:
-#    tf.config.experimental.set_virtual_device_configuration(gpus[0], [tf.config.experimental.VirtualDeviceConfiguration(memory_limit=5120)])
-#  except RuntimeError as e:
-#    print(e)
-
-nb_epochs = args.epochs
-
-# Try reducing batch_size if you run out of memory on your GPU
-batch_size = args.batch_size
-
-quantize = args.quantize is not None
-retrain = args.retrain is not None
-
-if quantize:
-    lr = 0.00003
-    decay = 0
-    input_model = args.quantize
-else:
-    lr = 0.001
-    decay = 2.5e-5
-
-if args.lr is not None:
-    lr = args.lr
-
-if args.decay is not None:
-    decay = args.decay
-
-if retrain:
-    input_model = args.retrain
-
-def plc_loss(alpha=1.0, bias=0.):
-    def loss(y_true,y_pred):
-        mask = y_true[:,:,-1:]
-        y_true = y_true[:,:,:-1]
-        e = (y_pred - y_true)*mask
-        e_bands = tf.signal.idct(e[:,:,:-2], norm='ortho')
-        bias_mask = K.minimum(1., K.maximum(0., 4*y_true[:,:,-1:]))
-        l1_loss = K.mean(K.abs(e)) + 0.1*K.mean(K.maximum(0., -e[:,:,-1:])) + alpha*K.mean(K.abs(e_bands) + bias*bias_mask*K.maximum(0., e_bands)) + K.mean(K.minimum(K.abs(e[:,:,18:19]),1.)) + 8*K.mean(K.minimum(K.abs(e[:,:,18:19]),.4))
-        return l1_loss
-    return loss
-
-def plc_l1_loss():
-    def L1_loss(y_true,y_pred):
-        mask = y_true[:,:,-1:]
-        y_true = y_true[:,:,:-1]
-        e = (y_pred - y_true)*mask
-        l1_loss = K.mean(K.abs(e))
-        return l1_loss
-    return L1_loss
-
-def plc_ceps_loss():
-    def ceps_loss(y_true,y_pred):
-        mask = y_true[:,:,-1:]
-        y_true = y_true[:,:,:-1]
-        e = (y_pred - y_true)*mask
-        l1_loss = K.mean(K.abs(e[:,:,:-2]))
-        return l1_loss
-    return ceps_loss
-
-def plc_band_loss():
-    def L1_band_loss(y_true,y_pred):
-        mask = y_true[:,:,-1:]
-        y_true = y_true[:,:,:-1]
-        e = (y_pred - y_true)*mask
-        e_bands = tf.signal.idct(e[:,:,:-2], norm='ortho')
-        l1_loss = K.mean(K.abs(e_bands))
-        return l1_loss
-    return L1_band_loss
-
-def plc_pitch_loss():
-    def pitch_loss(y_true,y_pred):
-        mask = y_true[:,:,-1:]
-        y_true = y_true[:,:,:-1]
-        e = (y_pred - y_true)*mask
-        l1_loss = K.mean(K.minimum(K.abs(e[:,:,18:19]),.4))
-        return l1_loss
-    return pitch_loss
-
-opt = Adam(lr, decay=decay, beta_2=0.99)
-strategy = tf.distribute.experimental.MultiWorkerMirroredStrategy()
-
-with strategy.scope():
-    model = lpcnet.new_lpcnet_plc_model(rnn_units=args.gru_size, batch_size=batch_size, training=True, quantize=quantize, cond_size=args.cond_size)
-    model.compile(optimizer=opt, loss=plc_loss(alpha=args.band_loss, bias=args.loss_bias), metrics=[plc_l1_loss(), plc_ceps_loss(), plc_band_loss(), plc_pitch_loss()])
-    model.summary()
-
-lpc_order = 16
-
-feature_file = args.features
-nb_features = model.nb_used_features + lpc_order + model.nb_burg_features
-nb_used_features = model.nb_used_features
-nb_burg_features = model.nb_burg_features
-sequence_size = args.seq_length
-
-# u for unquantised, load 16 bit PCM samples and convert to mu-law
-
-
-features = np.memmap(feature_file, dtype='float32', mode='r')
-nb_sequences = len(features)//(nb_features*sequence_size)//batch_size*batch_size
-features = features[:nb_sequences*sequence_size*nb_features]
-
-features = np.reshape(features, (nb_sequences, sequence_size, nb_features))
-
-features = features[:, :, :nb_used_features+model.nb_burg_features]
-
-lost = np.memmap(args.lost_file, dtype='int8', mode='r')
-
-# dump models to disk as we go
-checkpoint = ModelCheckpoint('{}_{}_{}.h5'.format(args.output, args.gru_size, '{epoch:02d}'))
-
-if args.retrain is not None:
-    model.load_weights(args.retrain)
-
-if quantize or retrain:
-    #Adapting from an existing model
-    model.load_weights(input_model)
-
-model.save_weights('{}_{}_initial.h5'.format(args.output, args.gru_size))
-
-loader = PLCLoader(features, lost, nb_burg_features, batch_size)
-
-callbacks = [checkpoint]
-if args.logdir is not None:
-    logdir = '{}/{}_{}_logs'.format(args.logdir, args.output, args.gru_size)
-    tensorboard_callback = tf.keras.callbacks.TensorBoard(log_dir=logdir)
-    callbacks.append(tensorboard_callback)
-
-model.fit(loader, epochs=nb_epochs, validation_split=0.0, callbacks=callbacks)
diff --git a/dnn/training_tf2/train_rdovae.py b/dnn/training_tf2/train_rdovae.py
deleted file mode 100644
index b474b5f6b..000000000
--- a/dnn/training_tf2/train_rdovae.py
+++ /dev/null
@@ -1,151 +0,0 @@
-#!/usr/bin/python3
-'''Copyright (c) 2021-2022 Amazon
-   Copyright (c) 2018-2019 Mozilla
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-'''
-
-# Train an LPCNet model
-import tensorflow as tf
-strategy = tf.distribute.MultiWorkerMirroredStrategy()
-
-
-import argparse
-#from plc_loader import PLCLoader
-
-parser = argparse.ArgumentParser(description='Train a quantization model')
-
-parser.add_argument('features', metavar='<features file>', help='binary features file (float32)')
-parser.add_argument('output', metavar='<output>', help='trained model file (.h5)')
-parser.add_argument('--model', metavar='<model>', default='rdovae', help='PLC model python definition (without .py)')
-group1 = parser.add_mutually_exclusive_group()
-group1.add_argument('--quantize', metavar='<input weights>', help='quantize model')
-group1.add_argument('--retrain', metavar='<input weights>', help='continue training model')
-parser.add_argument('--cond-size', metavar='<units>', default=1024, type=int, help='number of units in conditioning network (default 1024)')
-parser.add_argument('--epochs', metavar='<epochs>', default=120, type=int, help='number of epochs to train for (default 120)')
-parser.add_argument('--batch-size', metavar='<batch size>', default=128, type=int, help='batch size to use (default 128)')
-parser.add_argument('--seq-length', metavar='<sequence length>', default=1000, type=int, help='sequence length to use (default 1000)')
-parser.add_argument('--lr', metavar='<learning rate>', type=float, help='learning rate')
-parser.add_argument('--decay', metavar='<decay>', type=float, help='learning rate decay')
-parser.add_argument('--logdir', metavar='<log dir>', help='directory for tensorboard log files')
-
-
-args = parser.parse_args()
-
-import importlib
-rdovae = importlib.import_module(args.model)
-
-import sys
-import numpy as np
-from tensorflow.keras.optimizers import Adam
-from tensorflow.keras.callbacks import ModelCheckpoint, CSVLogger
-import tensorflow.keras.backend as K
-import h5py
-
-#gpus = tf.config.experimental.list_physical_devices('GPU')
-#if gpus:
-#  try:
-#    tf.config.experimental.set_virtual_device_configuration(gpus[0], [tf.config.experimental.VirtualDeviceConfiguration(memory_limit=5120)])
-#  except RuntimeError as e:
-#    print(e)
-
-nb_epochs = args.epochs
-
-# Try reducing batch_size if you run out of memory on your GPU
-batch_size = args.batch_size
-
-quantize = args.quantize is not None
-retrain = args.retrain is not None
-
-if quantize:
-    lr = 0.00003
-    decay = 0
-    input_model = args.quantize
-else:
-    lr = 0.001
-    decay = 2.5e-5
-
-if args.lr is not None:
-    lr = args.lr
-
-if args.decay is not None:
-    decay = args.decay
-
-if retrain:
-    input_model = args.retrain
-
-
-opt = Adam(lr, decay=decay, beta_2=0.99)
-
-with strategy.scope():
-    model, encoder, decoder, _ = rdovae.new_rdovae_model(nb_used_features=20, nb_bits=80, batch_size=batch_size, cond_size=args.cond_size, nb_quant=16)
-    model.compile(optimizer=opt, loss=[rdovae.feat_dist_loss, rdovae.feat_dist_loss, rdovae.sq1_rate_loss, rdovae.sq2_rate_loss], loss_weights=[.5, .5, 1., .1], metrics={'hard_bits':rdovae.sq_rate_metric})
-    model.summary()
-
-lpc_order = 16
-
-feature_file = args.features
-nb_features = model.nb_used_features + lpc_order
-nb_used_features = model.nb_used_features
-sequence_size = args.seq_length
-
-# u for unquantised, load 16 bit PCM samples and convert to mu-law
-
-
-features = np.memmap(feature_file, dtype='float32', mode='r')
-nb_sequences = len(features)//(nb_features*sequence_size)//batch_size*batch_size
-features = features[:nb_sequences*sequence_size*nb_features]
-
-features = np.reshape(features, (nb_sequences, sequence_size, nb_features))
-print(features.shape)
-features = features[:, :, :nb_used_features]
-
-#lambda_val = np.repeat(np.random.uniform(.0007, .002, (features.shape[0], 1, 1)), features.shape[1]//2, axis=1)
-#quant_id = np.round(10*np.log(lambda_val/.0007)).astype('int16')
-#quant_id = quant_id[:,:,0]
-quant_id = np.repeat(np.random.randint(16, size=(features.shape[0], 1, 1), dtype='int16'), features.shape[1]//2, axis=1)
-lambda_val = .0002*np.exp(quant_id/3.8)
-quant_id = quant_id[:,:,0]
-
-# dump models to disk as we go
-checkpoint = ModelCheckpoint('{}_{}_{}.h5'.format(args.output, args.cond_size, '{epoch:02d}'))
-
-if args.retrain is not None:
-    model.load_weights(args.retrain)
-
-if quantize or retrain:
-    #Adapting from an existing model
-    model.load_weights(input_model)
-
-model.save_weights('{}_{}_initial.h5'.format(args.output, args.cond_size))
-
-callbacks = [checkpoint]
-#callbacks = []
-
-if args.logdir is not None:
-    logdir = '{}/{}_{}_logs'.format(args.logdir, args.output, args.cond_size)
-    tensorboard_callback = tf.keras.callbacks.TensorBoard(log_dir=logdir)
-    callbacks.append(tensorboard_callback)
-
-model.fit([features, quant_id, lambda_val], [features, features, features, features], batch_size=batch_size, epochs=nb_epochs, validation_split=0.0, callbacks=callbacks)
diff --git a/dnn/training_tf2/ulaw.py b/dnn/training_tf2/ulaw.py
deleted file mode 100644
index b79d4315b..000000000
--- a/dnn/training_tf2/ulaw.py
+++ /dev/null
@@ -1,19 +0,0 @@
-
-import numpy as np
-import math
-
-scale = 255.0/32768.0
-scale_1 = 32768.0/255.0
-def ulaw2lin(u):
-    u = u - 128
-    s = np.sign(u)
-    u = np.abs(u)
-    return s*scale_1*(np.exp(u/128.*math.log(256))-1)
-
-
-def lin2ulaw(x):
-    s = np.sign(x)
-    x = np.abs(x)
-    u = (s*(128*np.log(1+scale*x)/math.log(256)))
-    u = np.clip(128 + np.round(u), 0, 255)
-    return u.astype('int16')
diff --git a/dnn/training_tf2/uniform_noise.py b/dnn/training_tf2/uniform_noise.py
deleted file mode 100644
index 6197dd5f0..000000000
--- a/dnn/training_tf2/uniform_noise.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-"""Contains the UniformNoise layer."""
-
-
-import tensorflow.compat.v2 as tf
-
-from tensorflow.keras import backend
-
-from tensorflow.keras.layers import Layer
-
-class UniformNoise(Layer):
-    """Apply additive zero-centered uniform noise.
-
-    This is useful to mitigate overfitting
-    (you could see it as a form of random data augmentation).
-    Gaussian Noise (GS) is a natural choice as corruption process
-    for real valued inputs.
-
-    As it is a regularization layer, it is only active at training time.
-
-    Args:
-      stddev: Float, standard deviation of the noise distribution.
-      seed: Integer, optional random seed to enable deterministic behavior.
-
-    Call arguments:
-      inputs: Input tensor (of any rank).
-      training: Python boolean indicating whether the layer should behave in
-        training mode (adding noise) or in inference mode (doing nothing).
-
-    Input shape:
-      Arbitrary. Use the keyword argument `input_shape`
-      (tuple of integers, does not include the samples axis)
-      when using this layer as the first layer in a model.
-
-    Output shape:
-      Same shape as input.
-    """
-
-
-
-
-    def __init__(self, stddev=0.5, seed=None, **kwargs):
-        super().__init__(**kwargs)
-        self.supports_masking = True
-        self.stddev = stddev
-
-
-    def call(self, inputs, training=None):
-        def noised():
-            return inputs + backend.random_uniform(
-                shape=tf.shape(inputs),
-                minval=-self.stddev,
-                maxval=self.stddev,
-                dtype=inputs.dtype,
-            )
-
-        return backend.in_train_phase(noised, inputs, training=training)
-
-    def get_config(self):
-        config = {"stddev": self.stddev}
-        base_config = super().get_config()
-        return dict(list(base_config.items()) + list(config.items()))
-
-    def compute_output_shape(self, input_shape):
-        return input_shape
diff --git a/dnn/vec.h b/dnn/vec.h
index 8e96cbf36..9817dd5da 100644
--- a/dnn/vec.h
+++ b/dnn/vec.h
@@ -29,7 +29,7 @@
 #ifndef VEC_H
 #define VEC_H
 
-#include "opus_types.h"
+#include "oac_types.h"
 #include <math.h>
 #include "arch.h"
 #include "x86/x86_arch_macros.h"
@@ -50,7 +50,7 @@
 static inline void sgemv16x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x)
 {
    int i, j;
-   OPUS_CLEAR(out, rows);
+   OAC_CLEAR(out, rows);
    for (i=0;i<rows;i+=16)
    {
       for (j=0;j<cols;j++)
@@ -84,7 +84,7 @@ static inline void sgemv16x1(float *out, const float *weights, int rows, int col
 static inline void sgemv8x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x)
 {
    int i, j;
-   OPUS_CLEAR(out, rows);
+   OAC_CLEAR(out, rows);
    for (i=0;i<rows;i+=8)
    {
       for (j=0;j<cols;j++)
@@ -124,7 +124,7 @@ static inline void sgemv(float *out, const float *weights, int rows, int cols, i
 static inline void sparse_sgemv8x4(float *out, const float *w, const int *idx, int rows, const float *x)
 {
    int i, j;
-   OPUS_CLEAR(out, rows);
+   OAC_CLEAR(out, rows);
    for (i=0;i<rows;i+=8)
    {
       int cols;
@@ -181,7 +181,7 @@ static inline void sparse_sgemv8x4(float *out, const float *w, const int *idx, i
 }
 
 #ifdef USE_SU_BIAS
-static inline void sparse_cgemv8x4(float *out, const opus_int8 *w, const int *idx, const float *scale, int rows, int cols, const float *_x)
+static inline void sparse_cgemv8x4(float *out, const oac_int8 *w, const int *idx, const float *scale, int rows, int cols, const float *_x)
 {
    int i, j;
    unsigned char x[MAX_INPUTS];
@@ -215,7 +215,7 @@ static inline void sparse_cgemv8x4(float *out, const opus_int8 *w, const int *id
    }
    for (i=0;i<rows;i++) out[i] *= scale[i];
 }
-static inline void cgemv8x4(float *out, const opus_int8 *w, const float *scale, int rows, int cols, const float *_x)
+static inline void cgemv8x4(float *out, const oac_int8 *w, const float *scale, int rows, int cols, const float *_x)
 {
    int i, j;
    unsigned char x[MAX_INPUTS];
@@ -246,10 +246,10 @@ static inline void cgemv8x4(float *out, const opus_int8 *w, const float *scale,
    for (i=0;i<rows;i++) out[i] *= scale[i];
 }
 #else
-static inline void sparse_cgemv8x4(float *out, const opus_int8 *w, const int *idx, const float *scale, int rows, int cols, const float *_x)
+static inline void sparse_cgemv8x4(float *out, const oac_int8 *w, const int *idx, const float *scale, int rows, int cols, const float *_x)
 {
    int i, j;
-   opus_int8 x[MAX_INPUTS];
+   oac_int8 x[MAX_INPUTS];
    for (i=0;i<rows;i++) out[i] = 0;
    for (i=0;i<cols;i++) x[i] = (int)floor(.5+127*_x[i]);
    for (i=0;i<rows;i+=8)
@@ -280,10 +280,10 @@ static inline void sparse_cgemv8x4(float *out, const opus_int8 *w, const int *id
    }
    for (i=0;i<rows;i++) out[i] *= scale[i];
 }
-static inline void cgemv8x4(float *out, const opus_int8 *w, const float *scale, int rows, int cols, const float *_x)
+static inline void cgemv8x4(float *out, const oac_int8 *w, const float *scale, int rows, int cols, const float *_x)
 {
    int i, j;
-   opus_int8 x[MAX_INPUTS];
+   oac_int8 x[MAX_INPUTS];
    for (i=0;i<rows;i++) out[i] = 0;
    for (i=0;i<cols;i++) x[i] = (int)floor(.5+127*_x[i]);
    for (i=0;i<rows;i+=8)
@@ -320,7 +320,7 @@ static inline float lpcnet_exp2(float x)
    float frac;
    union {
       float f;
-      opus_uint32 i;
+      oac_uint32 i;
    } res;
    integer = floor(x);
    if (integer < -50)
@@ -335,7 +335,7 @@ static inline float lpcnet_exp2(float x)
 #define lpcnet_exp(x) lpcnet_exp2((x)*1.44269504f)
 
 #define fmadd(a, b, c) ((a)*(b)+(c))
-static OPUS_INLINE float tanh_approx(float x)
+static OAC_INLINE float tanh_approx(float x)
 {
     const float N0 = 952.52801514f;
     const float N1 = 96.39235687f;
diff --git a/dnn/vec_avx.h b/dnn/vec_avx.h
index ff667782d..74831ab06 100644
--- a/dnn/vec_avx.h
+++ b/dnn/vec_avx.h
@@ -624,11 +624,11 @@ static inline void vec_sigmoid(float *y, const float *x, int N)
 
 #if defined(__AVXVNNI__) || defined(__AVX512VNNI__)
 
-#define opus_mm256_dpbusds_epi32(src, a, b) _mm256_dpbusds_epi32(src, a, b)
+#define oac_mm256_dpbusds_epi32(src, a, b) _mm256_dpbusds_epi32(src, a, b)
 
 #elif defined(__AVX2__)
 
-static inline __m256i opus_mm256_dpbusds_epi32(__m256i src, __m256i a, __m256i b) {
+static inline __m256i oac_mm256_dpbusds_epi32(__m256i src, __m256i a, __m256i b) {
   __m256i ones, tmp;
   ones = _mm256_set1_epi16(1);
   tmp = _mm256_maddubs_epi16(a, b);
@@ -638,7 +638,7 @@ static inline __m256i opus_mm256_dpbusds_epi32(__m256i src, __m256i a, __m256i b
 
 #elif defined(__SSSE3__)
 
-static inline mm256i_emu opus_mm256_dpbusds_epi32(mm256i_emu src, mm256i_emu a, mm256i_emu b) {
+static inline mm256i_emu oac_mm256_dpbusds_epi32(mm256i_emu src, mm256i_emu a, mm256i_emu b) {
   mm256i_emu ones, tmp;
   ones = _mm256_set1_epi16(1);
   tmp = _mm256_maddubs_epi16(a, b);
@@ -658,7 +658,7 @@ static inline __m128i mm_dpbusds_epi32(__m128i src, __m128i a, __m128i b) {
   return _mm_add_epi32(src, tmp);
 }
 
-static inline mm256i_emu opus_mm256_dpbusds_epi32(mm256i_emu src, mm256i_emu a, mm256i_emu b) {
+static inline mm256i_emu oac_mm256_dpbusds_epi32(mm256i_emu src, mm256i_emu a, mm256i_emu b) {
   mm256i_emu res;
   res.hi = mm_dpbusds_epi32(src.hi, a.hi, b.hi);
   res.lo = mm_dpbusds_epi32(src.lo, a.lo, b.lo);
@@ -777,7 +777,7 @@ static inline void sparse_sgemv8x4(float *out, const float *weights, const int *
    }
 }
 
-static inline void sparse_cgemv8x4(float *_out, const opus_int8 *w, const int *idx, const float *scale, int rows, int cols, const float *_x)
+static inline void sparse_cgemv8x4(float *_out, const oac_int8 *w, const int *idx, const float *scale, int rows, int cols, const float *_x)
 {
    int i, j;
    unsigned char x[MAX_INPUTS];
@@ -798,19 +798,19 @@ static inline void sparse_cgemv8x4(float *_out, const opus_int8 *w, const int *i
          __m256i vw;
          vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[*idx++]));
          vw = _mm256_loadu_si256((const __m256i *)(void*)w);
-         vy0 = opus_mm256_dpbusds_epi32(vy0, vxj, vw);
+         vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
          w += 32;
          vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[*idx++]));
          vw = _mm256_loadu_si256((const __m256i *)(void*)w);
-         vy0 = opus_mm256_dpbusds_epi32(vy0, vxj, vw);
+         vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
          w += 32;
          vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[*idx++]));
          vw = _mm256_loadu_si256((const __m256i *)(void*)w);
-         vy0 = opus_mm256_dpbusds_epi32(vy0, vxj, vw);
+         vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
          w += 32;
          vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[*idx++]));
          vw = _mm256_loadu_si256((const __m256i *)(void*)w);
-         vy0 = opus_mm256_dpbusds_epi32(vy0, vxj, vw);
+         vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
          w += 32;
       }
 #endif
@@ -820,7 +820,7 @@ static inline void sparse_cgemv8x4(float *_out, const opus_int8 *w, const int *i
          __m256i vw;
          vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[*idx++]));
          vw = _mm256_loadu_si256((const __m256i *)(void*)w);
-         vy0 = opus_mm256_dpbusds_epi32(vy0, vxj, vw);
+         vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
          w += 32;
       }
       vout = _mm256_cvtepi32_ps(vy0);
@@ -828,7 +828,7 @@ static inline void sparse_cgemv8x4(float *_out, const opus_int8 *w, const int *i
       _mm256_storeu_ps(&_out[i], vout);
    }
 }
-static inline void cgemv8x4(float *_out, const opus_int8 *w, const float *scale, int rows, int cols, const float *_x)
+static inline void cgemv8x4(float *_out, const oac_int8 *w, const float *scale, int rows, int cols, const float *_x)
 {
    int i, j;
    unsigned char x[MAX_INPUTS];
@@ -847,19 +847,19 @@ static inline void cgemv8x4(float *_out, const opus_int8 *w, const float *scale,
          __m256i vw;
          vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[j]));
          vw = _mm256_loadu_si256((const __m256i *)(void*)w);
-         vy0 = opus_mm256_dpbusds_epi32(vy0, vxj, vw);
+         vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
          w += 32;
          vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[j+4]));
          vw = _mm256_loadu_si256((const __m256i *)(void*)w);
-         vy0 = opus_mm256_dpbusds_epi32(vy0, vxj, vw);
+         vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
          w += 32;
          vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[j+8]));
          vw = _mm256_loadu_si256((const __m256i *)(void*)w);
-         vy0 = opus_mm256_dpbusds_epi32(vy0, vxj, vw);
+         vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
          w += 32;
          vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[j+12]));
          vw = _mm256_loadu_si256((const __m256i *)(void*)w);
-         vy0 = opus_mm256_dpbusds_epi32(vy0, vxj, vw);
+         vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
          w += 32;
       }
 #endif
@@ -869,7 +869,7 @@ static inline void cgemv8x4(float *_out, const opus_int8 *w, const float *scale,
          __m256i vw;
          vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[j]));
          vw = _mm256_loadu_si256((const __m256i *)(void*)w);
-         vy0 = opus_mm256_dpbusds_epi32(vy0, vxj, vw);
+         vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
          w += 32;
       }
       vout = _mm256_cvtepi32_ps(vy0);
diff --git a/dnn/vec_neon.h b/dnn/vec_neon.h
index 93e1771a3..9b3b802a9 100644
--- a/dnn/vec_neon.h
+++ b/dnn/vec_neon.h
@@ -36,15 +36,15 @@
 
 #if defined(__arm__) && !defined(__aarch64__) && (__ARM_ARCH < 8 || !defined(__clang__))
 /* Emulate vcvtnq_s32_f32() for ARMv7 Neon. */
-static OPUS_INLINE int32x4_t vcvtnq_s32_f32(float32x4_t x) {
+static OAC_INLINE int32x4_t vcvtnq_s32_f32(float32x4_t x) {
   return vrshrq_n_s32(vcvtq_n_s32_f32(x, 8), 8);
 }
 
-static OPUS_INLINE int16x8_t vpaddq_s16(int16x8_t a, int16x8_t b) {
+static OAC_INLINE int16x8_t vpaddq_s16(int16x8_t a, int16x8_t b) {
   return vcombine_s16(vpadd_s16(vget_low_s16(a), vget_high_s16(a)), vpadd_s16(vget_low_s16(b), vget_high_s16(b)));
 }
 
-static OPUS_INLINE int16x8_t vmull_high_s8(int8x16_t a, int8x16_t b) {
+static OAC_INLINE int16x8_t vmull_high_s8(int8x16_t a, int8x16_t b) {
   return vmull_s8(vget_high_s8(a), vget_high_s8(b));
 }
 #endif
@@ -302,7 +302,7 @@ static inline void sgemv(float *out, const float *weights, int rows, int cols, i
 static inline void sparse_sgemv8x4(float *out, const float *w, const int *idx, int rows, const float *x)
 {
    int i, j;
-   OPUS_CLEAR(out, rows);
+   OAC_CLEAR(out, rows);
    for (i=0;i<rows;i+=8)
    {
       int cols;
@@ -376,11 +376,11 @@ static inline int32x4_t vdotprod(int32x4_t acc, int8x16_t a, int8x16_t b)
 }
 #endif
 
-static inline void cgemv8x4(float *_out, const opus_int8 *w, const float *scale, int rows, int cols, const float *_x)
+static inline void cgemv8x4(float *_out, const oac_int8 *w, const float *scale, int rows, int cols, const float *_x)
 {
    int i, j;
-   opus_int32 x_int[MAX_INPUTS/4];
-   opus_int8 *x = (opus_int8*) x_int;
+   oac_int32 x_int[MAX_INPUTS/4];
+   oac_int8 *x = (oac_int8*) x_int;
    const float32x4_t const127 = vdupq_n_f32(127.);
    for (i=0;i<cols;i+=8) {
       int32x4_t xi0, xi4;
@@ -431,11 +431,11 @@ static inline void cgemv8x4(float *_out, const opus_int8 *w, const float *scale,
    }
 }
 
-static inline void sparse_cgemv8x4(float *_out, const opus_int8 *w, const int *idx, const float *scale, int rows, int cols, const float *_x)
+static inline void sparse_cgemv8x4(float *_out, const oac_int8 *w, const int *idx, const float *scale, int rows, int cols, const float *_x)
 {
    int i, j;
-   opus_int32 x_int[MAX_INPUTS/4];
-   opus_int8 *x = (opus_int8*) x_int;
+   oac_int32 x_int[MAX_INPUTS/4];
+   oac_int8 *x = (oac_int8*) x_int;
    const float32x4_t const127 = vdupq_n_f32(127.);
    for (i=0;i<cols;i+=8) {
       int32x4_t xi0, xi4;
diff --git a/dnn/write_lpcnet_weights.c b/dnn/write_lpcnet_weights.c
index 2f80b9626..4ccc57aff 100644
--- a/dnn/write_lpcnet_weights.c
+++ b/dnn/write_lpcnet_weights.c
@@ -65,7 +65,7 @@ void write_weights(const WeightArray *list, FILE *fout)
     h.type = list[i].type;
     h.size = list[i].size;
     h.block_size = (h.size+WEIGHT_BLOCK_SIZE-1)/WEIGHT_BLOCK_SIZE*WEIGHT_BLOCK_SIZE;
-    OPUS_CLEAR(h.name, sizeof(h.name));
+    OAC_CLEAR(h.name, sizeof(h.name));
     strncpy(h.name, list[i].name, sizeof(h.name));
     h.name[sizeof(h.name)-1] = 0;
     celt_assert(sizeof(h) == WEIGHT_BLOCK_SIZE);
diff --git a/dnn/x86/dnn_x86.h b/dnn/x86/dnn_x86.h
index f2183327b..c572a0b18 100644
--- a/dnn/x86/dnn_x86.h
+++ b/dnn/x86/dnn_x86.h
@@ -29,28 +29,28 @@
 #define DNN_X86_H
 
 #include "cpu_support.h"
-#include "opus_types.h"
+#include "oac_types.h"
 
-#if defined(OPUS_X86_MAY_HAVE_SSE2)
+#if defined(OAC_X86_MAY_HAVE_SSE2)
 void compute_linear_sse2(const LinearLayer *linear, float *out, const float *in);
 void compute_activation_sse2(float *output, const float *input, int N, int activation);
 void compute_conv2d_sse2(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride, int activation);
 #endif
 
-#if defined(OPUS_X86_MAY_HAVE_SSE4_1)
+#if defined(OAC_X86_MAY_HAVE_SSE4_1)
 void compute_linear_sse4_1(const LinearLayer *linear, float *out, const float *in);
 void compute_activation_sse4_1(float *output, const float *input, int N, int activation);
 void compute_conv2d_sse4_1(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride, int activation);
 #endif
 
-#if defined(OPUS_X86_MAY_HAVE_AVX2)
+#if defined(OAC_X86_MAY_HAVE_AVX2)
 void compute_linear_avx2(const LinearLayer *linear, float *out, const float *in);
 void compute_activation_avx2(float *output, const float *input, int N, int activation);
 void compute_conv2d_avx2(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride, int activation);
 #endif
 
 
-#if defined(OPUS_X86_PRESUME_AVX2)
+#if defined(OAC_X86_PRESUME_AVX2)
 
 #define OVERRIDE_COMPUTE_LINEAR
 #define compute_linear(linear, out, in, arch) ((void)(arch),compute_linear_avx2(linear, out, in))
@@ -59,7 +59,7 @@ void compute_conv2d_avx2(const Conv2dLayer *conv, float *out, float *mem, const
 #define OVERRIDE_COMPUTE_CONV2D
 #define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch),compute_conv2d_avx2(conv, out, mem, in, height, hstride, activation))
 
-#elif defined(OPUS_X86_PRESUME_SSE4_1) && !defined(OPUS_X86_MAY_HAVE_AVX2)
+#elif defined(OAC_X86_PRESUME_SSE4_1) && !defined(OAC_X86_MAY_HAVE_AVX2)
 
 #define OVERRIDE_COMPUTE_LINEAR
 #define compute_linear(linear, out, in, arch) ((void)(arch),compute_linear_sse4_1(linear, out, in))
@@ -68,7 +68,7 @@ void compute_conv2d_avx2(const Conv2dLayer *conv, float *out, float *mem, const
 #define OVERRIDE_COMPUTE_CONV2D
 #define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch),compute_conv2d_sse4_1(conv, out, mem, in, height, hstride, activation))
 
-#elif defined(OPUS_X86_PRESUME_SSE2) && !defined(OPUS_X86_MAY_HAVE_AVX2) && !defined(OPUS_X86_MAY_HAVE_SSE4_1)
+#elif defined(OAC_X86_PRESUME_SSE2) && !defined(OAC_X86_MAY_HAVE_AVX2) && !defined(OAC_X86_MAY_HAVE_SSE4_1)
 
 #define OVERRIDE_COMPUTE_LINEAR
 #define compute_linear(linear, out, in, arch) ((void)(arch),compute_linear_sse2(linear, out, in))
@@ -77,19 +77,19 @@ void compute_conv2d_avx2(const Conv2dLayer *conv, float *out, float *mem, const
 #define OVERRIDE_COMPUTE_CONV2D
 #define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch),compute_conv2d_sse2(conv, out, mem, in, height, hstride, activation))
 
-#elif defined(OPUS_HAVE_RTCD) && (defined(OPUS_X86_MAY_HAVE_AVX2) || defined(OPUS_X86_MAY_HAVE_SSE4_1) || defined(OPUS_X86_MAY_HAVE_SSE2))
+#elif defined(OAC_HAVE_RTCD) && (defined(OAC_X86_MAY_HAVE_AVX2) || defined(OAC_X86_MAY_HAVE_SSE4_1) || defined(OAC_X86_MAY_HAVE_SSE2))
 
-extern void (*const DNN_COMPUTE_LINEAR_IMPL[OPUS_ARCHMASK + 1])(
+extern void (*const DNN_COMPUTE_LINEAR_IMPL[OAC_ARCHMASK + 1])(
                     const LinearLayer *linear,
                     float *out,
                     const float *in
                     );
 #define OVERRIDE_COMPUTE_LINEAR
 #define compute_linear(linear, out, in, arch) \
-    ((*DNN_COMPUTE_LINEAR_IMPL[(arch) & OPUS_ARCHMASK])(linear, out, in))
+    ((*DNN_COMPUTE_LINEAR_IMPL[(arch) & OAC_ARCHMASK])(linear, out, in))
 
 
-extern void (*const DNN_COMPUTE_ACTIVATION_IMPL[OPUS_ARCHMASK + 1])(
+extern void (*const DNN_COMPUTE_ACTIVATION_IMPL[OAC_ARCHMASK + 1])(
                     float *output,
                     const float *input,
                     int N,
@@ -97,10 +97,10 @@ extern void (*const DNN_COMPUTE_ACTIVATION_IMPL[OPUS_ARCHMASK + 1])(
                     );
 #define OVERRIDE_COMPUTE_ACTIVATION
 #define compute_activation(output, input, N, activation, arch) \
-    ((*DNN_COMPUTE_ACTIVATION_IMPL[(arch) & OPUS_ARCHMASK])(output, input, N, activation))
+    ((*DNN_COMPUTE_ACTIVATION_IMPL[(arch) & OAC_ARCHMASK])(output, input, N, activation))
 
 
-extern void (*const DNN_COMPUTE_CONV2D_IMPL[OPUS_ARCHMASK + 1])(
+extern void (*const DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
                     const Conv2dLayer *conv,
                     float *out,
                     float *mem,
@@ -111,7 +111,7 @@ extern void (*const DNN_COMPUTE_CONV2D_IMPL[OPUS_ARCHMASK + 1])(
                     );
 #define OVERRIDE_COMPUTE_CONV2D
 #define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) \
-    ((*DNN_COMPUTE_CONV2D_IMPL[(arch) & OPUS_ARCHMASK])(conv, out, mem, in, height, hstride, activation))
+    ((*DNN_COMPUTE_CONV2D_IMPL[(arch) & OAC_ARCHMASK])(conv, out, mem, in, height, hstride, activation))
 
 
 #endif
diff --git a/dnn/x86/x86_dnn_map.c b/dnn/x86/x86_dnn_map.c
index d673e1345..e08af0557 100644
--- a/dnn/x86/x86_dnn_map.c
+++ b/dnn/x86/x86_dnn_map.c
@@ -32,11 +32,11 @@
 #include "x86/x86cpu.h"
 #include "nnet.h"
 
-#if defined(OPUS_HAVE_RTCD)
+#if defined(OAC_HAVE_RTCD)
 
-#if (defined(OPUS_X86_MAY_HAVE_SSE2) && !defined(OPUS_X86_PRESUME_AVX2))
+#if (defined(OAC_X86_MAY_HAVE_SSE2) && !defined(OAC_X86_PRESUME_AVX2))
 
-void (*const DNN_COMPUTE_LINEAR_IMPL[OPUS_ARCHMASK + 1])(
+void (*const DNN_COMPUTE_LINEAR_IMPL[OAC_ARCHMASK + 1])(
          const LinearLayer *linear,
          float *out,
          const float *in
@@ -48,7 +48,7 @@ void (*const DNN_COMPUTE_LINEAR_IMPL[OPUS_ARCHMASK + 1])(
   MAY_HAVE_AVX2(compute_linear)  /* avx  */
 };
 
-void (*const DNN_COMPUTE_ACTIVATION_IMPL[OPUS_ARCHMASK + 1])(
+void (*const DNN_COMPUTE_ACTIVATION_IMPL[OAC_ARCHMASK + 1])(
          float *output,
          const float *input,
          int N,
@@ -61,7 +61,7 @@ void (*const DNN_COMPUTE_ACTIVATION_IMPL[OPUS_ARCHMASK + 1])(
   MAY_HAVE_AVX2(compute_activation)  /* avx  */
 };
 
-void (*const DNN_COMPUTE_CONV2D_IMPL[OPUS_ARCHMASK + 1])(
+void (*const DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
          const Conv2dLayer *conv,
          float *out,
          float *mem,
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 6eef650b2..be29e9257 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -26,7 +26,7 @@
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = Opus
+PROJECT_NAME           = Oac
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
@@ -38,7 +38,7 @@ PROJECT_NUMBER         = @VERSION@
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = "Opus audio codec (RFC 6716): API and operations manual"
+PROJECT_BRIEF          = "Oac audio codec (RFC 6716): API and operations manual"
 
 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55
@@ -142,11 +142,11 @@ WARNINGS               = YES
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = @top_srcdir@/include/opus.h \
-                         @top_srcdir@/include/opus_types.h \
-                         @top_srcdir@/include/opus_defines.h \
-                         @top_srcdir@/include/opus_multistream.h \
-                         @top_srcdir@/include/opus_custom.h
+INPUT                  = @top_srcdir@/include/oac.h \
+                         @top_srcdir@/include/oac_types.h \
+                         @top_srcdir@/include/oac_defines.h \
+                         @top_srcdir@/include/oac_multistream.h \
+                         @top_srcdir@/include/oac_custom.h
 
 # The EXCLUDE tag can be used to specify files and/or directories that should be
 # excluded from the INPUT source files. This way you can easily exclude a
@@ -222,7 +222,7 @@ HTML_STYLESHEET        = @top_srcdir@/doc/customdoxygen.css
 # files will be copied as-is; there are no commands or markers available.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_FILES       = @top_srcdir@/doc/opus_logo.svg
+HTML_EXTRA_FILES       = @top_srcdir@/doc/oac_logo.svg
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
 # in the HTML output. For a value of 0 the output will use grayscales only. A
@@ -313,11 +313,11 @@ INCLUDE_PATH           =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             = OPUS_EXPORT= \
-                         OPUS_CUSTOM_EXPORT= \
-                         OPUS_CUSTOM_EXPORT_STATIC= \
-                         OPUS_WARN_UNUSED_RESULT= \
-                         OPUS_ARG_NONNULL(_x)=
+PREDEFINED             = OAC_EXPORT= \
+                         OAC_CUSTOM_EXPORT= \
+                         OAC_CUSTOM_EXPORT_STATIC= \
+                         OAC_WARN_UNUSED_RESULT= \
+                         OAC_ARG_NONNULL(_x)=
 
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 31fddab49..ee24df4b1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,16 +1,16 @@
 ## Process this file with automake to produce Makefile.in
 
-DOCINPUTS = $(top_srcdir)/include/opus.h \
-            $(top_srcdir)/include/opus_multistream.h \
-            $(top_srcdir)/include/opus_defines.h \
-            $(top_srcdir)/include/opus_types.h \
-            $(top_srcdir)/include/opus_custom.h \
+DOCINPUTS = $(top_srcdir)/include/oac.h \
+            $(top_srcdir)/include/oac_multistream.h \
+            $(top_srcdir)/include/oac_defines.h \
+            $(top_srcdir)/include/oac_types.h \
+            $(top_srcdir)/include/oac_custom.h \
             $(top_srcdir)/doc/header.html \
             $(top_srcdir)/doc/footer.html \
             $(top_srcdir)/doc/customdoxygen.css
 
 EXTRA_DIST = customdoxygen.css Doxyfile.in footer.html header.html \
-             opus_logo.svg trivial_example.c
+             oac_logo.svg trivial_example.c
 
 
 if HAVE_DOXYGEN
@@ -28,7 +28,7 @@ install-data-local:
 	done
 
 	$(INSTALL) -d $(DESTDIR)$(mandir)/man3
-	cd man && find man3 -type f -name opus_*.3 \
+	cd man && find man3 -type f -name oac_*.3 \
 		  -exec $(INSTALL_DATA) \{} $(DESTDIR)$(mandir)/man3 \;
 
 clean-local:
@@ -40,6 +40,6 @@ clean-local:
 
 uninstall-local:
 	$(RM) -r $(DESTDIR)$(docdir)/html
-	$(RM) $(DESTDIR)$(mandir)/man3/opus_*.3 $(DESTDIR)$(mandir)/man3/opus.h.3
+	$(RM) $(DESTDIR)$(mandir)/man3/oac_*.3 $(DESTDIR)$(mandir)/man3/oac.h.3
 
 endif
diff --git a/doc/build_draft.sh b/doc/build_draft.sh
deleted file mode 100755
index 14ae51dd5..000000000
--- a/doc/build_draft.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/sh
-
-# Copyright (c) 2011-2012 Xiph.Org Foundation and Mozilla Corporation
-#
-#  This file is extracted from RFC6716. Please see that RFC for additional
-#  information.
-#
-#  Redistribution and use in source and binary forms, with or without
-#  modification, are permitted provided that the following conditions
-#  are met:
-#
-#  - Redistributions of source code must retain the above copyright
-#  notice, this list of conditions and the following disclaimer.
-#
-#  - Redistributions in binary form must reproduce the above copyright
-#  notice, this list of conditions and the following disclaimer in the
-#  documentation and/or other materials provided with the distribution.
-#
-#  - Neither the name of Internet Society, IETF or IETF Trust, nor the
-#  names of specific contributors, may be used to endorse or promote
-#  products derived from this software without specific prior written
-#  permission.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-#  OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-#  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-#  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-#  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-#  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-#  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#Stop on errors
-set -e
-#Set the CWD to the location of this script
-[ -n "${0%/*}" ] && cd "${0%/*}"
-
-toplevel=".."
-destdir="opus_source"
-
-echo packaging source code
-rm -rf "${destdir}"
-mkdir "${destdir}"
-mkdir "${destdir}/src"
-mkdir "${destdir}/silk"
-mkdir "${destdir}/silk/float"
-mkdir "${destdir}/silk/fixed"
-mkdir "${destdir}/silk/fixed/x86"
-mkdir "${destdir}/silk/fixed/arm"
-mkdir "${destdir}/silk/fixed/mips"
-mkdir "${destdir}/silk/x86"
-mkdir "${destdir}/silk/arm"
-mkdir "${destdir}/silk/mips"
-mkdir "${destdir}/celt"
-mkdir "${destdir}/celt/x86"
-mkdir "${destdir}/celt/arm"
-mkdir "${destdir}/celt/mips"
-mkdir "${destdir}/include"
-for f in `cat "${toplevel}"/opus_sources.mk "${toplevel}"/celt_sources.mk \
- "${toplevel}"/silk_sources.mk "${toplevel}"/opus_headers.mk \
- "${toplevel}"/celt_headers.mk "${toplevel}"/silk_headers.mk \
- | grep '\.[ch]' | sed -e 's/^.*=//' -e 's/\\\\//'` ; do
-  cp -a "${toplevel}/${f}" "${destdir}/${f}"
-done
-cp -a "${toplevel}"/src/opus_demo.c "${destdir}"/src/
-cp -a "${toplevel}"/src/opus_compare.c "${destdir}"/src/
-cp -a "${toplevel}"/celt/opus_custom_demo.c "${destdir}"/celt/
-cp -a "${toplevel}"/Makefile.unix "${destdir}"/Makefile
-cp -a "${toplevel}"/opus_sources.mk "${destdir}"/
-cp -a "${toplevel}"/celt_sources.mk "${destdir}"/
-cp -a "${toplevel}"/silk_sources.mk "${destdir}"/
-cp -a "${toplevel}"/README.draft "${destdir}"/README
-cp -a "${toplevel}"/COPYING "${destdir}"/COPYING
-cp -a "${toplevel}"/tests/run_vectors.sh "${destdir}"/
-
-GZIP=-9 tar --owner=root --group=root --format=v7 -czf opus_source.tar.gz "${destdir}"
-echo building base64 version
-cat opus_source.tar.gz| base64 | tr -d '\n' | fold -w 64 | \
- sed -e 's/^/\<spanx style="vbare"\>###/' -e 's/$/\<\/spanx\>\<vspace\/\>/' > \
- opus_source.base64
-
-
-#echo '<figure>' > opus_compare_escaped.c
-#echo '<artwork>' >> opus_compare_escaped.c
-#echo '<![CDATA[' >> opus_compare_escaped.c
-#cat opus_compare.c >> opus_compare_escaped.c
-#echo ']]>' >> opus_compare_escaped.c
-#echo '</artwork>' >> opus_compare_escaped.c
-#echo '</figure>' >> opus_compare_escaped.c
-
-if [ ! -d ../opus_testvectors ] ; then
-  echo "Downloading test vectors..."
-  wget 'http://opus-codec.org/testvectors/opus_testvectors.tar.gz'
-  tar -C .. -xvzf opus_testvectors.tar.gz
-fi
-echo '<figure>' > testvectors_sha1
-echo '<artwork>' >> testvectors_sha1
-echo '<![CDATA[' >> testvectors_sha1
-(cd ../opus_testvectors; sha1sum *.bit *.dec) >> testvectors_sha1
-#cd opus_testvectors
-#sha1sum *.bit *.dec >> ../testvectors_sha1
-#cd ..
-echo ']]>' >> testvectors_sha1
-echo '</artwork>' >> testvectors_sha1
-echo '</figure>' >> testvectors_sha1
-
-echo running xml2rfc
-xml2rfc draft-ietf-codec-opus.xml draft-ietf-codec-opus.html &
-xml2rfc draft-ietf-codec-opus.xml
-wait
diff --git a/doc/build_isobmff.sh b/doc/build_isobmff.sh
deleted file mode 100755
index 676ca4e0c..000000000
--- a/doc/build_isobmff.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-# Copyright (c) 2014 Xiph.Org Foundation and Mozilla Foundation
-#
-#  Redistribution and use in source and binary forms, with or without
-#  modification, are permitted provided that the following conditions
-#  are met:
-#
-#  - Redistributions of source code must retain the above copyright
-#  notice, this list of conditions and the following disclaimer.
-#
-#  - Redistributions in binary form must reproduce the above copyright
-#  notice, this list of conditions and the following disclaimer in the
-#  documentation and/or other materials provided with the distribution.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-#  OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-#  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-#  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-#  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-#  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-#  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#Stop on errors
-set -e
-#Set the CWD to the location of this script
-[ -n "${0%/*}" ] && cd "${0%/*}"
-
-HTML=opus_in_isobmff.html
-
-echo downloading updates...
-CSS=${HTML%%.html}.css
-wget -q http://vfrmaniac.fushizen.eu/contents/${HTML} -O ${HTML}
-wget -q http://vfrmaniac.fushizen.eu/style.css -O ${CSS}
-
-echo updating links...
-cat ${HTML} | sed -e "s/\\.\\.\\/style.css/${CSS}/" > ${HTML}+ && mv ${HTML}+ ${HTML}
-
-echo stripping...
-cat ${HTML} | sed -e 's/<!--.*-->//g' > ${HTML}+ && mv ${HTML}+ ${HTML}
-cat ${HTML} | sed -e 's/ *$//g' > ${HTML}+ && mv ${HTML}+ ${HTML}
-cat ${CSS}  | sed -e 's/ *$//g' > ${CSS}+ && mv ${CSS}+ ${CSS}
-
-
-VERSION=$(grep -F Version ${HTML} | sed 's/.*Version \([0-9]\.[0-9]\.[0-9]\).*/\1/')
-echo Now at version ${VERSION}
diff --git a/doc/build_oggdraft.sh b/doc/build_oggdraft.sh
deleted file mode 100755
index 30ee534b0..000000000
--- a/doc/build_oggdraft.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-# Copyright (c) 2012 Xiph.Org Foundation and Mozilla Corporation
-#
-#  This file is extracted from RFC6716. Please see that RFC for additional
-#  information.
-#
-#  Redistribution and use in source and binary forms, with or without
-#  modification, are permitted provided that the following conditions
-#  are met:
-#
-#  - Redistributions of source code must retain the above copyright
-#  notice, this list of conditions and the following disclaimer.
-#
-#  - Redistributions in binary form must reproduce the above copyright
-#  notice, this list of conditions and the following disclaimer in the
-#  documentation and/or other materials provided with the distribution.
-#
-#  - Neither the name of Internet Society, IETF or IETF Trust, nor the
-#  names of specific contributors, may be used to endorse or promote
-#  products derived from this software without specific prior written
-#  permission.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-#  OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-#  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-#  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-#  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-#  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-#  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#Stop on errors
-set -e
-#Set the CWD to the location of this script
-[ -n "${0%/*}" ] && cd "${0%/*}"
-
-if test -z `which xml2rfc 2> /dev/null`; then
-  echo "Error: couldn't find xml2rfc."
-  echo
-  echo "Please install xml2rfc version 2 or later."
-  echo "E.g. 'pip install xml2rfc' or follow the instructions"
-  echo "on http://pypi.python.org/pypi/xml2rfc/ or tools.ietf.org."
-  exit 1
-fi
-
-echo running xml2rfc
-# version 2 syntax
-xml2rfc draft-ietf-codec-oggopus.xml --text --html
diff --git a/doc/draft-ietf-codec-oggopus.xml b/doc/draft-ietf-codec-oggopus.xml
deleted file mode 100644
index 128816e93..000000000
--- a/doc/draft-ietf-codec-oggopus.xml
+++ /dev/null
@@ -1,1873 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   Copyright (c) 2012-2016 Xiph.Org Foundation and contributors
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-   Special permission is granted to remove the above copyright notice, list of
-   conditions, and disclaimer when submitting this document, with or without
-   modification, to the IETF.
--->
-<!DOCTYPE rfc SYSTEM 'rfc2629.dtd' [
-<!ENTITY rfc2119 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.2119.xml'>
-<!ENTITY rfc3533 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.3533.xml'>
-<!ENTITY rfc3629 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.3629.xml'>
-<!ENTITY rfc4732 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.4732.xml'>
-<!ENTITY rfc5226 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.5226.xml'>
-<!ENTITY rfc5334 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.5334.xml'>
-<!ENTITY rfc6381 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.6381.xml'>
-<!ENTITY rfc6716 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.6716.xml'>
-<!ENTITY rfc6982 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.6982.xml'>
-<!ENTITY rfc7587 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.7587.xml'>
-]>
-<?rfc toc="yes" symrefs="yes" ?>
-
-<rfc ipr="trust200902" category="std" docName="draft-ietf-codec-oggopus-14"
- updates="5334">
-
-<front>
-<title abbrev="Ogg Opus">Ogg Encapsulation for the Opus Audio Codec</title>
-<author initials="T.B." surname="Terriberry" fullname="Timothy B. Terriberry">
-<organization>Mozilla Corporation</organization>
-<address>
-<postal>
-<street>650 Castro Street</street>
-<city>Mountain View</city>
-<region>CA</region>
-<code>94041</code>
-<country>USA</country>
-</postal>
-<phone>+1 650 903-0800</phone>
-<email>tterribe@xiph.org</email>
-</address>
-</author>
-
-<author initials="R." surname="Lee" fullname="Ron Lee">
-<organization>Voicetronix</organization>
-<address>
-<postal>
-<street>246 Pulteney Street, Level 1</street>
-<city>Adelaide</city>
-<region>SA</region>
-<code>5000</code>
-<country>Australia</country>
-</postal>
-<phone>+61 8 8232 9112</phone>
-<email>ron@debian.org</email>
-</address>
-</author>
-
-<author initials="R." surname="Giles" fullname="Ralph Giles">
-<organization>Mozilla Corporation</organization>
-<address>
-<postal>
-<street>163 West Hastings Street</street>
-<city>Vancouver</city>
-<region>BC</region>
-<code>V6B 1H5</code>
-<country>Canada</country>
-</postal>
-<phone>+1 778 785 1540</phone>
-<email>giles@xiph.org</email>
-</address>
-</author>
-
-<date day="22" month="February" year="2016"/>
-<area>RAI</area>
-<workgroup>codec</workgroup>
-
-<abstract>
-<t>
-This document defines the Ogg encapsulation for the Opus interactive speech and
- audio codec.
-This allows data encoded in the Opus format to be stored in an Ogg logical
- bitstream.
-</t>
-</abstract>
-</front>
-
-<middle>
-<section anchor="intro" title="Introduction">
-<t>
-The IETF Opus codec is a low-latency audio codec optimized for both voice and
- general-purpose audio.
-See <xref target="RFC6716"/> for technical details.
-This document defines the encapsulation of Opus in a continuous, logical Ogg
- bitstream&nbsp;<xref target="RFC3533"/>.
-Ogg encapsulation provides Opus with a long-term storage format supporting
- all of the essential features, including metadata, fast and accurate seeking,
- corruption detection, recapture after errors, low overhead, and the ability to
- multiplex Opus with other codecs (including video) with minimal buffering.
-It also provides a live streamable format, capable of delivery over a reliable
- stream-oriented transport, without requiring all the data, or even the total
- length of the data, up-front, in a form that is identical to the on-disk
- storage format.
-</t>
-<t>
-Ogg bitstreams are made up of a series of 'pages', each of which contains data
- from one or more 'packets'.
-Pages are the fundamental unit of multiplexing in an Ogg stream.
-Each page is associated with a particular logical stream and contains a capture
- pattern and checksum, flags to mark the beginning and end of the logical
- stream, and a 'granule position' that represents an absolute position in the
- stream, to aid seeking.
-A single page can contain up to 65,025 octets of packet data from up to 255
- different packets.
-Packets can be split arbitrarily across pages, and continued from one page to
- the next (allowing packets much larger than would fit on a single page).
-Each page contains 'lacing values' that indicate how the data is partitioned
- into packets, allowing a demultiplexer (demuxer) to recover the packet
- boundaries without examining the encoded data.
-A packet is said to 'complete' on a page when the page contains the final
- lacing value corresponding to that packet.
-</t>
-<t>
-This encapsulation defines the contents of the packet data, including
- the necessary headers, the organization of those packets into a logical
- stream, and the interpretation of the codec-specific granule position field.
-It does not attempt to describe or specify the existing Ogg container format.
-Readers unfamiliar with the basic concepts mentioned above are encouraged to
- review the details in <xref target="RFC3533"/>.
-</t>
-
-</section>
-
-<section anchor="terminology" title="Terminology">
-<t>
-The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD",
- "SHOULD NOT", "RECOMMENDED", "NOT RECOMMENDED", "MAY", and "OPTIONAL" in this
- document are to be interpreted as described in <xref target="RFC2119"/>.
-</t>
-
-</section>
-
-<section anchor="packet_organization" title="Packet Organization">
-<t>
-An Ogg Opus stream is organized as follows (see
- <xref target="packet-org-example"/> for an example).
-</t>
-
-<figure anchor="packet-org-example"
- title="Example packet organization for a logical Ogg Opus stream"
- align="center">
-<artwork align="center"><![CDATA[
-    Page 0         Pages 1 ... n        Pages (n+1) ...
- +------------+ +---+ +---+ ... +---+ +-----------+ +---------+ +--
- |            | |   | |   |     |   | |           | |         | |
- |+----------+| |+-----------------+| |+-------------------+ +-----
- |||ID Header|| ||  Comment Header || ||Audio Data Packet 1| | ...
- |+----------+| |+-----------------+| |+-------------------+ +-----
- |            | |   | |   |     |   | |           | |         | |
- +------------+ +---+ +---+ ... +---+ +-----------+ +---------+ +--
- ^      ^                           ^
- |      |                           |
- |      |                           Mandatory Page Break
- |      |
- |      ID header is contained on a single page
- |
- 'Beginning Of Stream'
-]]></artwork>
-</figure>
-
-<t>
-There are two mandatory header packets.
-The first packet in the logical Ogg bitstream MUST contain the identification
- (ID) header, which uniquely identifies a stream as Opus audio.
-The format of this header is defined in <xref target="id_header"/>.
-It is placed alone (without any other packet data) on the first page of
- the logical Ogg bitstream, and completes on that page.
-This page has its 'beginning of stream' flag set.
-</t>
-<t>
-The second packet in the logical Ogg bitstream MUST contain the comment header,
- which contains user-supplied metadata.
-The format of this header is defined in <xref target="comment_header"/>.
-It MAY span multiple pages, beginning on the second page of the logical
- stream.
-However many pages it spans, the comment header packet MUST finish the page on
- which it completes.
-</t>
-<t>
-All subsequent pages are audio data pages, and the Ogg packets they contain are
- audio data packets.
-Each audio data packet contains one Opus packet for each of N different
- streams, where N is typically one for mono or stereo, but MAY be greater than
- one for multichannel audio.
-The value N is specified in the ID header (see
- <xref target="channel_mapping"/>), and is fixed over the entire length of the
- logical Ogg bitstream.
-</t>
-<t>
-The first (N&nbsp;-&nbsp;1) Opus packets, if any, are packed one after another
- into the Ogg packet, using the self-delimiting framing from Appendix&nbsp;B of
- <xref target="RFC6716"/>.
-The remaining Opus packet is packed at the end of the Ogg packet using the
- regular, undelimited framing from Section&nbsp;3 of <xref target="RFC6716"/>.
-All of the Opus packets in a single Ogg packet MUST be constrained to have the
- same duration.
-An implementation of this specification SHOULD treat any Opus packet whose
- duration is different from that of the first Opus packet in an Ogg packet as
- if it were a malformed Opus packet with an invalid Table Of Contents (TOC)
- sequence.
-</t>
-<t>
-The TOC sequence at the beginning of each Opus packet indicates the coding
- mode, audio bandwidth, channel count, duration (frame size), and number of
- frames per packet, as described in Section&nbsp;3.1
- of&nbsp;<xref target="RFC6716"/>.
-The coding mode is one of SILK, Hybrid, or Constrained Energy Lapped Transform
- (CELT).
-The combination of coding mode, audio bandwidth, and frame size is referred to
- as the configuration of an Opus packet.
-</t>
-<t>
-Packets are placed into Ogg pages in order until the end of stream.
-Audio data packets might span page boundaries.
-The first audio data page could have the 'continued packet' flag set
- (indicating the first audio data packet is continued from a previous page) if,
- for example, it was a live stream joined mid-broadcast, with the headers
- pasted on the front.
-If a page has the 'continued packet' flag set and one of the following
- conditions is also true:
-<list style="symbols">
-<t>the previous page with packet data does not end in a continued packet (does
- not end with a lacing value of 255) OR</t>
-<t>the page sequence numbers are not consecutive,</t>
-</list>
- then a demuxer MUST NOT attempt to decode the data for the first packet on the
- page unless the demuxer has some special knowledge that would allow it to
- interpret this data despite the missing pieces.
-An implementation MUST treat a zero-octet audio data packet as if it were a
- malformed Opus packet as described in
- Section&nbsp;3.4 of&nbsp;<xref target="RFC6716"/>.
-</t>
-<t>
-A logical stream ends with a page with the 'end of stream' flag set, but
- implementations need to be prepared to deal with truncated streams that do not
- have a page marked 'end of stream'.
-There is no reason for the final packet on the last page to be a continued
- packet, i.e., for the final lacing value to be 255.
-However, demuxers might encounter such streams, possibly as the result of a
- transfer that did not complete or of corruption.
-If a packet continues onto a subsequent page (i.e., when the page ends with a
- lacing value of 255) and one of the following conditions is also true:
-<list style="symbols">
-<t>the next page with packet data does not have the 'continued packet' flag
- set OR</t>
-<t>there is no next page with packet data OR</t>
-<t>the page sequence numbers are not consecutive,</t>
-</list>
- then a demuxer MUST NOT attempt to decode the data from that packet unless the
- demuxer has some special knowledge that would allow it to interpret this data
- despite the missing pieces.
-There MUST NOT be any more pages in an Opus logical bitstream after a page
- marked 'end of stream'.
-</t>
-</section>
-
-<section anchor="granpos" title="Granule Position">
-<t>
-The granule position MUST be zero for the ID header page and the
- page where the comment header completes.
-That is, the first page in the logical stream, and the last header
- page before the first audio data page both have a granule position of zero.
-</t>
-<t>
-The granule position of an audio data page encodes the total number of PCM
- samples in the stream up to and including the last fully-decodable sample from
- the last packet completed on that page.
-The granule position of the first audio data page will usually be larger than
- zero, as described in <xref target="start_granpos_restrictions"/>.
-</t>
-
-<t>
-A page that is entirely spanned by a single packet (that completes on a
- subsequent page) has no granule position, and the granule position field is
- set to the special value '-1' in two's complement.
-</t>
-
-<t>
-The granule position of an audio data page is in units of PCM audio samples at
- a fixed rate of 48&nbsp;kHz (per channel; a stereo stream's granule position
- does not increment at twice the speed of a mono stream).
-It is possible to run an Opus decoder at other sampling rates,
- but all Opus packets encode samples at a sampling rate that evenly divides
- 48&nbsp;kHz.
-Therefore, the value in the granule position field always counts samples
- assuming a 48&nbsp;kHz decoding rate, and the rest of this specification makes
- the same assumption.
-</t>
-
-<t>
-The duration of an Opus packet as defined in <xref target="RFC6716"/> can be
- any multiple of 2.5&nbsp;ms, up to a maximum of 120&nbsp;ms.
-This duration is encoded in the TOC sequence at the beginning of each packet.
-The number of samples returned by a decoder corresponds to this duration
- exactly, even for the first few packets.
-For example, a 20&nbsp;ms packet fed to a decoder running at 48&nbsp;kHz will
- always return 960&nbsp;samples.
-A demuxer can parse the TOC sequence at the beginning of each Ogg packet to
- work backwards or forwards from a packet with a known granule position (i.e.,
- the last packet completed on some page) in order to assign granule positions
- to every packet, or even every individual sample.
-The one exception is the last page in the stream, as described below.
-</t>
-
-<t>
-All other pages with completed packets after the first MUST have a granule
- position equal to the number of samples contained in packets that complete on
- that page plus the granule position of the most recent page with completed
- packets.
-This guarantees that a demuxer can assign individual packets the same granule
- position when working forwards as when working backwards.
-For this to work, there cannot be any gaps.
-</t>
-
-<section anchor="gap-repair" title="Repairing Gaps in Real-time Streams">
-<t>
-In order to support capturing a real-time stream that has lost or not
- transmitted packets, a multiplexer (muxer) SHOULD emit packets that explicitly
- request the use of Packet Loss Concealment (PLC) in place of the missing
- packets.
-Implementations that fail to do so still MUST NOT increment the granule
- position for a page by anything other than the number of samples contained in
- packets that actually complete on that page.
-</t>
-<t>
-Only gaps that are a multiple of 2.5&nbsp;ms are repairable, as these are the
- only durations that can be created by packet loss or discontinuous
- transmission.
-Muxers need not handle other gap sizes.
-Creating the necessary packets involves synthesizing a TOC byte (defined in
-Section&nbsp;3.1 of&nbsp;<xref target="RFC6716"/>)&mdash;and whatever
- additional internal framing is needed&mdash;to indicate the packet duration
- for each stream.
-The actual length of each missing Opus frame inside the packet is zero bytes,
- as defined in Section&nbsp;3.2.1 of&nbsp;<xref target="RFC6716"/>.
-</t>
-
-<t>
-Zero-byte frames MAY be packed into packets using any of codes&nbsp;0, 1,
- 2, or&nbsp;3.
-When successive frames have the same configuration, the higher code packings
- reduce overhead.
-Likewise, if the TOC configuration matches, the muxer MAY further combine the
- empty frames with previous or subsequent non-zero-length frames (using
- code&nbsp;2 or VBR code&nbsp;3).
-</t>
-
-<t>
-<xref target="RFC6716"/> does not impose any requirements on the PLC, but this
- section outlines choices that are expected to have a positive influence on
- most PLC implementations, including the reference implementation.
-Synthesized TOC sequences SHOULD maintain the same mode, audio bandwidth,
- channel count, and frame size as the previous packet (if any).
-This is the simplest and usually the most well-tested case for the PLC to
- handle and it covers all losses that do not include a configuration switch,
- as defined in Section&nbsp;4.5 of&nbsp;<xref target="RFC6716"/>.
-</t>
-
-<t>
-When a previous packet is available, keeping the audio bandwidth and channel
- count the same allows the PLC to provide maximum continuity in the concealment
- data it generates.
-However, if the size of the gap is not a multiple of the most recent frame
- size, then the frame size will have to change for at least some frames.
-Such changes SHOULD be delayed as long as possible to simplify
- things for PLC implementations.
-</t>
-
-<t>
-As an example, a 95&nbsp;ms gap could be encoded as nineteen 5&nbsp;ms frames
- in two bytes with a single CBR code&nbsp;3 packet.
-If the previous frame size was 20&nbsp;ms, using four 20&nbsp;ms frames
- followed by three 5&nbsp;ms frames requires 4&nbsp;bytes (plus an extra byte
- of Ogg lacing overhead), but allows the PLC to use its well-tested steady
- state behavior for as long as possible.
-The total bitrate of the latter approach, including Ogg overhead, is about
- 0.4&nbsp;kbps, so the impact on file size is minimal.
-</t>
-
-<t>
-Changing modes is discouraged, since this causes some decoder implementations
- to reset their PLC state.
-However, SILK and Hybrid mode frames cannot fill gaps that are not a multiple
- of 10&nbsp;ms.
-If switching to CELT mode is needed to match the gap size, a muxer SHOULD do
- so at the end of the gap to allow the PLC to function for as long as possible.
-</t>
-
-<t>
-In the example above, if the previous frame was a 20&nbsp;ms SILK mode frame,
- the better solution is to synthesize a packet describing four 20&nbsp;ms SILK
- frames, followed by a packet with a single 10&nbsp;ms SILK
- frame, and finally a packet with a 5&nbsp;ms CELT frame, to fill the 95&nbsp;ms
- gap.
-This also requires four bytes to describe the synthesized packet data (two
- bytes for a CBR code 3 and one byte each for two code 0 packets) but three
- bytes of Ogg lacing overhead are needed to mark the packet boundaries.
-At 0.6 kbps, this is still a minimal bitrate impact over a naive, low quality
- solution.
-</t>
-
-<t>
-Since medium-band audio is an option only in the SILK mode, wideband frames
- SHOULD be generated if switching from that configuration to CELT mode, to
- ensure that any PLC implementation which does try to migrate state between
- the modes will be able to preserve all of the available audio bandwidth.
-</t>
-
-</section>
-
-<section anchor="preskip" title="Pre-skip">
-<t>
-There is some amount of latency introduced during the decoding process, to
- allow for overlap in the CELT mode, stereo mixing in the SILK mode, and
- resampling.
-The encoder might have introduced additional latency through its own resampling
- and analysis (though the exact amount is not specified).
-Therefore, the first few samples produced by the decoder do not correspond to
- real input audio, but are instead composed of padding inserted by the encoder
- to compensate for this latency.
-These samples need to be stored and decoded, as Opus is an asymptotically
- convergent predictive codec, meaning the decoded contents of each frame depend
- on the recent history of decoder inputs.
-However, a player will want to skip these samples after decoding them.
-</t>
-
-<t>
-A 'pre-skip' field in the ID header (see <xref target="id_header"/>) signals
- the number of samples that SHOULD be skipped (decoded but discarded) at the
- beginning of the stream, though some specific applications might have a reason
- for looking at that data.
-This amount need not be a multiple of 2.5&nbsp;ms, MAY be smaller than a single
- packet, or MAY span the contents of several packets.
-These samples are not valid audio.
-</t>
-
-<t>
-For example, if the first Opus frame uses the CELT mode, it will always
- produce 120 samples of windowed overlap-add data.
-However, the overlap data is initially all zeros (since there is no prior
- frame), meaning this cannot, in general, accurately represent the original
- audio.
-The SILK mode requires additional delay to account for its analysis and
- resampling latency.
-The encoder delays the original audio to avoid this problem.
-</t>
-
-<t>
-The pre-skip field MAY also be used to perform sample-accurate cropping of
- already encoded streams.
-In this case, a value of at least 3840&nbsp;samples (80&nbsp;ms) provides
- sufficient history to the decoder that it will have converged
- before the stream's output begins.
-</t>
-
-</section>
-
-<section anchor="pcm_sample_position" title="PCM Sample Position">
-<t>
-The PCM sample position is determined from the granule position using the
- formula
-</t>
-<figure align="center">
-<artwork align="center"><![CDATA[
-'PCM sample position' = 'granule position' - 'pre-skip' .
-]]></artwork>
-</figure>
-
-<t>
-For example, if the granule position of the first audio data page is 59,971,
- and the pre-skip is 11,971, then the PCM sample position of the last decoded
- sample from that page is 48,000.
-</t>
-<t>
-This can be converted into a playback time using the formula
-</t>
-<figure align="center">
-<artwork align="center"><![CDATA[
-                  'PCM sample position'
-'playback time' = --------------------- .
-                         48000.0
-]]></artwork>
-</figure>
-
-<t>
-The initial PCM sample position before any samples are played is normally '0'.
-In this case, the PCM sample position of the first audio sample to be played
- starts at '1', because it marks the time on the clock
- <spanx style="emph">after</spanx> that sample has been played, and a stream
- that is exactly one second long has a final PCM sample position of '48000',
- as in the example here.
-</t>
-
-<t>
-Vorbis streams use a granule position smaller than the number of audio samples
- contained in the first audio data page to indicate that some of those samples
- are trimmed from the output (see <xref target="vorbis-trim"/>).
-However, to do so, Vorbis requires that the first audio data page contains
- exactly two packets, in order to allow the decoder to perform PCM position
- adjustments before needing to return any PCM data.
-Opus uses the pre-skip mechanism for this purpose instead, since the encoder
- might introduce more than a single packet's worth of latency, and since very
- large packets in streams with a very large number of channels might not fit
- on a single page.
-</t>
-</section>
-
-<section anchor="end_trimming" title="End Trimming">
-<t>
-The page with the 'end of stream' flag set MAY have a granule position that
- indicates the page contains less audio data than would normally be returned by
- decoding up through the final packet.
-This is used to end the stream somewhere other than an even frame boundary.
-The granule position of the most recent audio data page with completed packets
- is used to make this determination, or '0' is used if there were no previous
- audio data pages with a completed packet.
-The difference between these granule positions indicates how many samples to
- keep after decoding the packets that completed on the final page.
-The remaining samples are discarded.
-The number of discarded samples SHOULD be no larger than the number decoded
- from the last packet.
-</t>
-</section>
-
-<section anchor="start_granpos_restrictions"
- title="Restrictions on the Initial Granule Position">
-<t>
-The granule position of the first audio data page with a completed packet MAY
- be larger than the number of samples contained in packets that complete on
- that page, however it MUST NOT be smaller, unless that page has the 'end of
- stream' flag set.
-Allowing a granule position larger than the number of samples allows the
- beginning of a stream to be cropped or a live stream to be joined without
- rewriting the granule position of all the remaining pages.
-This means that the PCM sample position just before the first sample to be
- played MAY be larger than '0'.
-Synchronization when multiplexing with other logical streams still uses the PCM
- sample position relative to '0' to compute sample times.
-This does not affect the behavior of pre-skip: exactly 'pre-skip' samples
- SHOULD be skipped from the beginning of the decoded output, even if the
- initial PCM sample position is greater than zero.
-</t>
-
-<t>
-On the other hand, a granule position that is smaller than the number of
- decoded samples prevents a demuxer from working backwards to assign each
- packet or each individual sample a valid granule position, since granule
- positions are non-negative.
-An implementation MUST treat any stream as invalid if the granule position
- is smaller than the number of samples contained in packets that complete on
- the first audio data page with a completed packet, unless that page has the
- 'end of stream' flag set.
-It MAY defer this action until it decodes the last packet completed on that
- page.
-</t>
-
-<t>
-If that page has the 'end of stream' flag set, a demuxer MUST treat any stream
- as invalid if its granule position is smaller than the 'pre-skip' amount.
-This would indicate that there are more samples to be skipped from the initial
- decoded output than exist in the stream.
-If the granule position is smaller than the number of decoded samples produced
- by the packets that complete on that page, then a demuxer MUST use an initial
- granule position of '0', and can work forwards from '0' to timestamp
- individual packets.
-If the granule position is larger than the number of decoded samples available,
- then the demuxer MUST still work backwards as described above, even if the
- 'end of stream' flag is set, to determine the initial granule position, and
- thus the initial PCM sample position.
-Both of these will be greater than '0' in this case.
-</t>
-</section>
-
-<section anchor="seeking_and_preroll" title="Seeking and Pre-roll">
-<t>
-Seeking in Ogg files is best performed using a bisection search for a page
- whose granule position corresponds to a PCM position at or before the seek
- target.
-With appropriately weighted bisection, accurate seeking can be performed in
- just one or two bisections on average, even in multi-gigabyte files.
-See <xref target="seeking"/> for an example of general implementation guidance.
-</t>
-
-<t>
-When seeking within an Ogg Opus stream, an implementation SHOULD start decoding
- (and discarding the output) at least 3840&nbsp;samples (80&nbsp;ms) prior to
- the seek target in order to ensure that the output audio is correct by the
- time it reaches the seek target.
-This 'pre-roll' is separate from, and unrelated to, the 'pre-skip' used at the
- beginning of the stream.
-If the point 80&nbsp;ms prior to the seek target comes before the initial PCM
- sample position, an implementation SHOULD start decoding from the beginning of
- the stream, applying pre-skip as normal, regardless of whether the pre-skip is
- larger or smaller than 80&nbsp;ms, and then continue to discard samples
- to reach the seek target (if any).
-</t>
-</section>
-
-</section>
-
-<section anchor="headers" title="Header Packets">
-<t>
-An Ogg Opus logical stream contains exactly two mandatory header packets:
- an identification header and a comment header.
-</t>
-
-<section anchor="id_header" title="Identification Header">
-
-<figure anchor="id_header_packet" title="ID Header Packet" align="center">
-<artwork align="center"><![CDATA[
- 0                   1                   2                   3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|      'O'      |      'p'      |      'u'      |      's'      |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|      'H'      |      'e'      |      'a'      |      'd'      |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|  Version = 1  | Channel Count |           Pre-skip            |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                     Input Sample Rate (Hz)                    |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|   Output Gain (Q7.8 in dB)    | Mapping Family|               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+               :
-|                                                               |
-:               Optional Channel Mapping Table...               :
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-]]></artwork>
-</figure>
-
-<t>
-The fields in the identification (ID) header have the following meaning:
-<list style="numbers">
-<t>Magic Signature:
-<vspace blankLines="1"/>
-This is an 8-octet (64-bit) field that allows codec identification and is
- human-readable.
-It contains, in order, the magic numbers:
-<list style="empty">
-<t>0x4F 'O'</t>
-<t>0x70 'p'</t>
-<t>0x75 'u'</t>
-<t>0x73 's'</t>
-<t>0x48 'H'</t>
-<t>0x65 'e'</t>
-<t>0x61 'a'</t>
-<t>0x64 'd'</t>
-</list>
-Starting with "Op" helps distinguish it from audio data packets, as this is an
- invalid TOC sequence.
-<vspace blankLines="1"/>
-</t>
-<t>Version (8 bits, unsigned):
-<vspace blankLines="1"/>
-The version number MUST always be '1' for this version of the encapsulation
- specification.
-Implementations SHOULD treat streams where the upper four bits of the version
- number match that of a recognized specification as backwards-compatible with
- that specification.
-That is, the version number can be split into "major" and "minor" version
- sub-fields, with changes to the "minor" sub-field (in the lower four bits)
- signaling compatible changes.
-For example, an implementation of this specification SHOULD accept any stream
- with a version number of '15' or less, and SHOULD assume any stream with a
- version number '16' or greater is incompatible.
-The initial version '1' was chosen to keep implementations from relying on this
- octet as a null terminator for the "OpusHead" string.
-<vspace blankLines="1"/>
-</t>
-<t>Output Channel Count 'C' (8 bits, unsigned):
-<vspace blankLines="1"/>
-This is the number of output channels.
-This might be different than the number of encoded channels, which can change
- on a packet-by-packet basis.
-This value MUST NOT be zero.
-The maximum allowable value depends on the channel mapping family, and might be
- as large as 255.
-See <xref target="channel_mapping"/> for details.
-<vspace blankLines="1"/>
-</t>
-<t>Pre-skip (16 bits, unsigned, little
- endian):
-<vspace blankLines="1"/>
-This is the number of samples (at 48&nbsp;kHz) to discard from the decoder
- output when starting playback, and also the number to subtract from a page's
- granule position to calculate its PCM sample position.
-When cropping the beginning of existing Ogg Opus streams, a pre-skip of at
- least 3,840&nbsp;samples (80&nbsp;ms) is RECOMMENDED to ensure complete
- convergence in the decoder.
-<vspace blankLines="1"/>
-</t>
-<t>Input Sample Rate (32 bits, unsigned, little
- endian):
-<vspace blankLines="1"/>
-This is the sample rate of the original input (before encoding), in Hz.
-This field is <spanx style="emph">not</spanx> the sample rate to use for
- playback of the encoded data.
-<vspace blankLines="1"/>
-Opus can switch between internal audio bandwidths of 4, 6, 8, 12, and
- 20&nbsp;kHz.
-Each packet in the stream can have a different audio bandwidth.
-Regardless of the audio bandwidth, the reference decoder supports decoding any
- stream at a sample rate of 8, 12, 16, 24, or 48&nbsp;kHz.
-The original sample rate of the audio passed to the encoder is not preserved
- by the lossy compression.
-<vspace blankLines="1"/>
-An Ogg Opus player SHOULD select the playback sample rate according to the
- following procedure:
-<list style="numbers">
-<t>If the hardware supports 48&nbsp;kHz playback, decode at 48&nbsp;kHz.</t>
-<t>Otherwise, if the hardware's highest available sample rate is a supported
- rate, decode at this sample rate.</t>
-<t>Otherwise, if the hardware's highest available sample rate is less than
- 48&nbsp;kHz, decode at the next higher Opus supported rate above the highest
- available hardware rate and resample.</t>
-<t>Otherwise, decode at 48&nbsp;kHz and resample.</t>
-</list>
-However, the 'Input Sample Rate' field allows the muxer to pass the sample
- rate of the original input stream as metadata.
-This is useful when the user requires the output sample rate to match the
- input sample rate.
-For example, when not playing the output, an implementation writing PCM format
- samples to disk might choose to resample the audio back to the original input
- sample rate to reduce surprise to the user, who might reasonably expect to get
- back a file with the same sample rate.
-<vspace blankLines="1"/>
-A value of zero indicates 'unspecified'.
-Muxers SHOULD write the actual input sample rate or zero, but implementations
- which do something with this field SHOULD take care to behave sanely if given
- crazy values (e.g., do not actually upsample the output to 10 MHz if
- requested).
-Implementations SHOULD support input sample rates between 8&nbsp;kHz and
- 192&nbsp;kHz (inclusive).
-Rates outside this range MAY be ignored by falling back to the default rate of
- 48&nbsp;kHz instead.
-<vspace blankLines="1"/>
-</t>
-<t>Output Gain (16 bits, signed, little endian):
-<vspace blankLines="1"/>
-This is a gain to be applied when decoding.
-It is 20*log10 of the factor by which to scale the decoder output to achieve
- the desired playback volume, stored in a 16-bit, signed, two's complement
- fixed-point value with 8 fractional bits (i.e.,
- Q7.8&nbsp;<xref target="q-notation"/>).
-<vspace blankLines="1"/>
-To apply the gain, an implementation could use
-<figure align="center">
-<artwork align="center"><![CDATA[
-sample *= pow(10, output_gain/(20.0*256)) ,
-]]></artwork>
-</figure>
- where output_gain is the raw 16-bit value from the header.
-<vspace blankLines="1"/>
-Players and media frameworks SHOULD apply it by default.
-If a player chooses to apply any volume adjustment or gain modification, such
- as the R128_TRACK_GAIN (see <xref target="comment_header"/>), the adjustment
- MUST be applied in addition to this output gain in order to achieve playback
- at the normalized volume.
-<vspace blankLines="1"/>
-A muxer SHOULD set this field to zero, and instead apply any gain prior to
- encoding, when this is possible and does not conflict with the user's wishes.
-A nonzero output gain indicates the gain was adjusted after encoding, or that
- a user wished to adjust the gain for playback while preserving the ability
- to recover the original signal amplitude.
-<vspace blankLines="1"/>
-Although the output gain has enormous range (+/- 128 dB, enough to amplify
- inaudible sounds to the threshold of physical pain), most applications can
- only reasonably use a small portion of this range around zero.
-The large range serves in part to ensure that gain can always be losslessly
- transferred between OpusHead and R128 gain tags (see below) without
- saturating.
-<vspace blankLines="1"/>
-</t>
-<t>Channel Mapping Family (8 bits, unsigned):
-<vspace blankLines="1"/>
-This octet indicates the order and semantic meaning of the output channels.
-<vspace blankLines="1"/>
-Each currently specified value of this octet indicates a mapping family, which
- defines a set of allowed channel counts, and the ordered set of channel names
- for each allowed channel count.
-The details are described in <xref target="channel_mapping"/>.
-</t>
-<t>Channel Mapping Table:
-This table defines the mapping from encoded streams to output channels.
-Its contents are specified in <xref target="channel_mapping"/>.
-</t>
-</list>
-</t>
-
-<t>
-All fields in the ID headers are REQUIRED, except for the channel mapping
- table, which MUST be omitted when the channel mapping family is 0, but
- is REQUIRED otherwise.
-Implementations SHOULD treat a stream as invalid if it contains an ID header
- that does not have enough data for these fields, even if it contain a valid
- Magic Signature.
-Future versions of this specification, even backwards-compatible versions,
- might include additional fields in the ID header.
-If an ID header has a compatible major version, but a larger minor version,
- an implementation MUST NOT treat it as invalid for containing additional data
- not specified here, provided it still completes on the first page.
-</t>
-
-<section anchor="channel_mapping" title="Channel Mapping">
-<t>
-An Ogg Opus stream allows mapping one number of Opus streams (N) to a possibly
- larger number of decoded channels (M&nbsp;+&nbsp;N) to yet another number of
- output channels (C), which might be larger or smaller than the number of
- decoded channels.
-The order and meaning of these channels are defined by a channel mapping,
- which consists of the 'channel mapping family' octet and, for channel mapping
- families other than family&nbsp;0, a channel mapping table, as illustrated in
- <xref target="channel_mapping_table"/>.
-</t>
-
-<figure anchor="channel_mapping_table" title="Channel Mapping Table"
- align="center">
-<artwork align="center"><![CDATA[
- 0                   1                   2                   3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-                                                +-+-+-+-+-+-+-+-+
-                                                | Stream Count  |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-| Coupled Count |              Channel Mapping...               :
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-]]></artwork>
-</figure>
-
-<t>
-The fields in the channel mapping table have the following meaning:
-<list style="numbers" counter="8">
-<t>Stream Count 'N' (8 bits, unsigned):
-<vspace blankLines="1"/>
-This is the total number of streams encoded in each Ogg packet.
-This value is necessary to correctly parse the packed Opus packets inside an
- Ogg packet, as described in <xref target="packet_organization"/>.
-This value MUST NOT be zero, as without at least one Opus packet with a valid
- TOC sequence, a demuxer cannot recover the duration of an Ogg packet.
-<vspace blankLines="1"/>
-For channel mapping family&nbsp;0, this value defaults to 1, and is not coded.
-<vspace blankLines="1"/>
-</t>
-<t>Coupled Stream Count 'M' (8 bits, unsigned):
-This is the number of streams whose decoders are to be configured to produce
- two channels (stereo).
-This MUST be no larger than the total number of streams, N.
-<vspace blankLines="1"/>
-Each packet in an Opus stream has an internal channel count of 1 or 2, which
- can change from packet to packet.
-This is selected by the encoder depending on the bitrate and the audio being
- encoded.
-The original channel count of the audio passed to the encoder is not
- necessarily preserved by the lossy compression.
-<vspace blankLines="1"/>
-Regardless of the internal channel count, any Opus stream can be decoded as
- mono (a single channel) or stereo (two channels) by appropriate initialization
- of the decoder.
-The 'coupled stream count' field indicates that the decoders for the first M
- Opus streams are to be initialized for stereo (two-channel) output, and the
- remaining (N&nbsp;-&nbsp;M) decoders are to be initialized for mono (a single
- channel) only.
-The total number of decoded channels, (M&nbsp;+&nbsp;N), MUST be no larger than
- 255, as there is no way to index more channels than that in the channel
- mapping.
-<vspace blankLines="1"/>
-For channel mapping family&nbsp;0, this value defaults to (C&nbsp;-&nbsp;1)
- (i.e., 0 for mono and 1 for stereo), and is not coded.
-<vspace blankLines="1"/>
-</t>
-<t>Channel Mapping (8*C bits):
-This contains one octet per output channel, indicating which decoded channel
- is to be used for each one.
-Let 'index' be the value of this octet for a particular output channel.
-This value MUST either be smaller than (M&nbsp;+&nbsp;N), or be the special
- value 255.
-If 'index' is less than 2*M, the output MUST be taken from decoding stream
- ('index'/2) as stereo and selecting the left channel if 'index' is even, and
- the right channel if 'index' is odd.
-If 'index' is 2*M or larger, but less than 255, the output MUST be taken from
- decoding stream ('index'&nbsp;-&nbsp;M) as mono.
-If 'index' is 255, the corresponding output channel MUST contain pure silence.
-<vspace blankLines="1"/>
-The number of output channels, C, is not constrained to match the number of
- decoded channels (M&nbsp;+&nbsp;N).
-A single index value MAY appear multiple times, i.e., the same decoded channel
- might be mapped to multiple output channels.
-Some decoded channels might not be assigned to any output channel, as well.
-<vspace blankLines="1"/>
-For channel mapping family&nbsp;0, the first index defaults to 0, and if
- C&nbsp;==&nbsp;2, the second index defaults to 1.
-Neither index is coded.
-</t>
-</list>
-</t>
-
-<t>
-After producing the output channels, the channel mapping family determines the
- semantic meaning of each one.
-There are three defined mapping families in this specification.
-</t>
-
-<section anchor="channel_mapping_0" title="Channel Mapping Family 0">
-<t>
-Allowed numbers of channels: 1 or 2.
-RTP mapping.
-This is the same channel interpretation as <xref target="RFC7587"/>.
-</t>
-<t>
-<list style="symbols">
-<t>1 channel: monophonic (mono).</t>
-<t>2 channels: stereo (left, right).</t>
-</list>
-Special mapping: This channel mapping value also
- indicates that the contents consists of a single Opus stream that is stereo if
- and only if C&nbsp;==&nbsp;2, with stream index&nbsp;0 mapped to output
- channel&nbsp;0 (mono, or left channel) and stream index&nbsp;1 mapped to
- output channel&nbsp;1 (right channel) if stereo.
-When the 'channel mapping family' octet has this value, the channel mapping
- table MUST be omitted from the ID header packet.
-</t>
-</section>
-
-<section anchor="channel_mapping_1" title="Channel Mapping Family 1">
-<t>
-Allowed numbers of channels: 1...8.
-Vorbis channel order (see below).
-</t>
-<t>
-Each channel is assigned to a speaker location in a conventional surround
- arrangement.
-Specific locations depend on the number of channels, and are given below
- in order of the corresponding channel indices.
-<list style="symbols">
-  <t>1 channel: monophonic (mono).</t>
-  <t>2 channels: stereo (left, right).</t>
-  <t>3 channels: linear surround (left, center, right)</t>
-  <t>4 channels: quadraphonic (front&nbsp;left, front&nbsp;right, rear&nbsp;left, rear&nbsp;right).</t>
-  <t>5 channels: 5.0 surround (front&nbsp;left, front&nbsp;center, front&nbsp;right, rear&nbsp;left, rear&nbsp;right).</t>
-  <t>6 channels: 5.1 surround (front&nbsp;left, front&nbsp;center, front&nbsp;right, rear&nbsp;left, rear&nbsp;right, LFE).</t>
-  <t>7 channels: 6.1 surround (front&nbsp;left, front&nbsp;center, front&nbsp;right, side&nbsp;left, side&nbsp;right, rear&nbsp;center, LFE).</t>
-  <t>8 channels: 7.1 surround (front&nbsp;left, front&nbsp;center, front&nbsp;right, side&nbsp;left, side&nbsp;right, rear&nbsp;left, rear&nbsp;right, LFE)</t>
-</list>
-</t>
-<t>
-This set of surround options and speaker location orderings is the same
- as those used by the Vorbis codec <xref target="vorbis-mapping"/>.
-The ordering is different from the one used by the
- WAVE <xref target="wave-multichannel"/> and
- Free Lossless Audio Codec (FLAC) <xref target="flac"/> formats,
- so correct ordering requires permutation of the output channels when decoding
- to or encoding from those formats.
-'LFE' here refers to a Low Frequency Effects channel, often mapped to a
-  subwoofer with no particular spatial position.
-Implementations SHOULD identify 'side' or 'rear' speaker locations with
- 'surround' and 'back' as appropriate when interfacing with audio formats
- or systems which prefer that terminology.
-</t>
-</section>
-
-<section anchor="channel_mapping_255"
- title="Channel Mapping Family 255">
-<t>
-Allowed numbers of channels: 1...255.
-No defined channel meaning.
-</t>
-<t>
-Channels are unidentified.
-General-purpose players SHOULD NOT attempt to play these streams.
-Offline implementations MAY deinterleave the output into separate PCM files,
- one per channel.
-Implementations SHOULD NOT produce output for channels mapped to stream index
- 255 (pure silence) unless they have no other way to indicate the index of
- non-silent channels.
-</t>
-</section>
-
-<section anchor="channel_mapping_undefined"
- title="Undefined Channel Mappings">
-<t>
-The remaining channel mapping families (2...254) are reserved.
-A demuxer implementation encountering a reserved channel mapping family value
- SHOULD act as though the value is 255.
-</t>
-</section>
-
-<section anchor="downmix" title="Downmixing">
-<t>
-An Ogg Opus player MUST support any valid channel mapping with a channel
- mapping family of 0 or 1, even if the number of channels does not match the
- physically connected audio hardware.
-Players SHOULD perform channel mixing to increase or reduce the number of
- channels as needed.
-</t>
-
-<t>
-Implementations MAY use the matrices in
- Figures&nbsp;<xref target="downmix-matrix-3" format="counter"/>
- through&nbsp;<xref target="downmix-matrix-8" format="counter"/> to implement
- downmixing from multichannel files using
- <xref target="channel_mapping_1">Channel Mapping Family 1</xref>, which are
- known to give acceptable results for stereo.
-Matrices for 3 and 4 channels are normalized so each coefficient row sums
- to 1 to avoid clipping.
-For 5 or more channels they are normalized to 2 as a compromise between
- clipping and dynamic range reduction.
-</t>
-<t>
-In these matrices the front left and front right channels are generally
-passed through directly.
-When a surround channel is split between both the left and right stereo
- channels, coefficients are chosen so their squares sum to 1, which
- helps preserve the perceived intensity.
-Rear channels are mixed more diffusely or attenuated to maintain focus
- on the front channels.
-</t>
-
-<figure anchor="downmix-matrix-3"
- title="Stereo downmix matrix for the linear surround channel mapping"
- align="center">
-<artwork align="center"><![CDATA[
-L output = ( 0.585786 * left + 0.414214 * center                    )
-R output = (                   0.414214 * center + 0.585786 * right )
-]]></artwork>
-<postamble>
-Exact coefficient values are 1 and 1/sqrt(2), multiplied by
- 1/(1&nbsp;+&nbsp;1/sqrt(2)) for normalization.
-</postamble>
-</figure>
-
-<figure anchor="downmix-matrix-4"
- title="Stereo downmix matrix for the quadraphonic channel mapping"
- align="center">
-<artwork align="center"><![CDATA[
-/          \   /                                     \ / FL \
-| L output |   | 0.422650 0.000000 0.366025 0.211325 | | FR |
-| R output | = | 0.000000 0.422650 0.211325 0.366025 | | RL |
-\          /   \                                     / \ RR /
-]]></artwork>
-<postamble>
-Exact coefficient values are 1, sqrt(3)/2 and 1/2, multiplied by
- 1/(1&nbsp;+&nbsp;sqrt(3)/2&nbsp;+&nbsp;1/2) for normalization.
-</postamble>
-</figure>
-
-<figure anchor="downmix-matrix-5"
- title="Stereo downmix matrix for the 5.0 surround mapping"
- align="center">
-<artwork align="center"><![CDATA[
-                                                         / FL \
-/   \   /                                              \ | FC |
-| L |   | 0.650802 0.460186 0.000000 0.563611 0.325401 | | FR |
-| R | = | 0.000000 0.460186 0.650802 0.325401 0.563611 | | RL |
-\   /   \                                              / | RR |
-                                                         \    /
-]]></artwork>
-<postamble>
-Exact coefficient values are 1, 1/sqrt(2), sqrt(3)/2 and 1/2, multiplied by
- 2/(1&nbsp;+&nbsp;1/sqrt(2)&nbsp;+&nbsp;sqrt(3)/2&nbsp;+&nbsp;1/2)
- for normalization.
-</postamble>
-</figure>
-
-<figure anchor="downmix-matrix-6"
- title="Stereo downmix matrix for the 5.1 surround mapping"
- align="center">
-<artwork align="center"><![CDATA[
-                                                                /FL \
-/ \   /                                                       \ |FC |
-|L|   | 0.529067 0.374107 0.000000 0.458186 0.264534 0.374107 | |FR |
-|R| = | 0.000000 0.374107 0.529067 0.264534 0.458186 0.374107 | |RL |
-\ /   \                                                       / |RR |
-                                                                \LFE/
-]]></artwork>
-<postamble>
-Exact coefficient values are 1, 1/sqrt(2), sqrt(3)/2 and 1/2, multiplied by
-2/(1&nbsp;+&nbsp;1/sqrt(2)&nbsp;+&nbsp;sqrt(3)/2&nbsp;+&nbsp;1/2 + 1/sqrt(2))
- for normalization.
-</postamble>
-</figure>
-
-<figure anchor="downmix-matrix-7"
- title="Stereo downmix matrix for the 6.1 surround mapping"
- align="center">
-<artwork align="center"><![CDATA[
- /                                                                \
- | 0.455310 0.321953 0.000000 0.394310 0.227655 0.278819 0.321953 |
- | 0.000000 0.321953 0.455310 0.227655 0.394310 0.278819 0.321953 |
- \                                                                /
-]]></artwork>
-<postamble>
-Exact coefficient values are 1, 1/sqrt(2), sqrt(3)/2, 1/2 and
- sqrt(3)/2/sqrt(2), multiplied by
- 2/(1&nbsp;+&nbsp;1/sqrt(2)&nbsp;+&nbsp;sqrt(3)/2&nbsp;+&nbsp;1/2 +
- sqrt(3)/2/sqrt(2) + 1/sqrt(2)) for normalization.
-The coefficients are in the same order as in <xref target="channel_mapping_1" />,
- and the matrices above.
-</postamble>
-</figure>
-
-<figure anchor="downmix-matrix-8"
- title="Stereo downmix matrix for the 7.1 surround mapping"
- align="center">
-<artwork align="center"><![CDATA[
-/                                                                 \
-| .388631 .274804 .000000 .336565 .194316 .336565 .194316 .274804 |
-| .000000 .274804 .388631 .194316 .336565 .194316 .336565 .274804 |
-\                                                                 /
-]]></artwork>
-<postamble>
-Exact coefficient values are 1, 1/sqrt(2), sqrt(3)/2 and 1/2, multiplied by
- 2/(2&nbsp;+&nbsp;2/sqrt(2)&nbsp;+&nbsp;sqrt(3)) for normalization.
-The coefficients are in the same order as in <xref target="channel_mapping_1" />,
- and the matrices above.
-</postamble>
-</figure>
-
-</section>
-
-</section> <!-- end channel_mapping_table -->
-
-</section> <!-- end id_header -->
-
-<section anchor="comment_header" title="Comment Header">
-
-<figure anchor="comment_header_packet" title="Comment Header Packet"
- align="center">
-<artwork align="center"><![CDATA[
- 0                   1                   2                   3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|      'O'      |      'p'      |      'u'      |      's'      |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|      'T'      |      'a'      |      'g'      |      's'      |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                     Vendor String Length                      |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                                                               |
-:                        Vendor String...                       :
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                   User Comment List Length                    |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                 User Comment #0 String Length                 |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                                                               |
-:                   User Comment #0 String...                   :
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                 User Comment #1 String Length                 |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-:                                                               :
-]]></artwork>
-</figure>
-
-<t>
-The comment header consists of a 64-bit magic signature, followed by data in
- the same format as the <xref target="vorbis-comment"/> header used in Ogg
- Vorbis, except (like Ogg Theora and Speex) the final "framing bit" specified
- in the Vorbis spec is not present.
-<list style="numbers">
-<t>Magic Signature:
-<vspace blankLines="1"/>
-This is an 8-octet (64-bit) field that allows codec identification and is
- human-readable.
-It contains, in order, the magic numbers:
-<list style="empty">
-<t>0x4F 'O'</t>
-<t>0x70 'p'</t>
-<t>0x75 'u'</t>
-<t>0x73 's'</t>
-<t>0x54 'T'</t>
-<t>0x61 'a'</t>
-<t>0x67 'g'</t>
-<t>0x73 's'</t>
-</list>
-Starting with "Op" helps distinguish it from audio data packets, as this is an
- invalid TOC sequence.
-<vspace blankLines="1"/>
-</t>
-<t>Vendor String Length (32 bits, unsigned, little endian):
-<vspace blankLines="1"/>
-This field gives the length of the following vendor string, in octets.
-It MUST NOT indicate that the vendor string is longer than the rest of the
- packet.
-<vspace blankLines="1"/>
-</t>
-<t>Vendor String (variable length, UTF-8 vector):
-<vspace blankLines="1"/>
-This is a simple human-readable tag for vendor information, encoded as a UTF-8
- string&nbsp;<xref target="RFC3629"/>.
-No terminating null octet is necessary.
-<vspace blankLines="1"/>
-This tag is intended to identify the codec encoder and encapsulation
- implementations, for tracing differences in technical behavior.
-User-facing applications can use the 'ENCODER' user comment tag to identify
- themselves.
-<vspace blankLines="1"/>
-</t>
-<t>User Comment List Length (32 bits, unsigned, little endian):
-<vspace blankLines="1"/>
-This field indicates the number of user-supplied comments.
-It MAY indicate there are zero user-supplied comments, in which case there are
- no additional fields in the packet.
-It MUST NOT indicate that there are so many comments that the comment string
- lengths would require more data than is available in the rest of the packet.
-<vspace blankLines="1"/>
-</t>
-<t>User Comment #i String Length (32 bits, unsigned, little endian):
-<vspace blankLines="1"/>
-This field gives the length of the following user comment string, in octets.
-There is one for each user comment indicated by the 'user comment list length'
- field.
-It MUST NOT indicate that the string is longer than the rest of the packet.
-<vspace blankLines="1"/>
-</t>
-<t>User Comment #i String (variable length, UTF-8 vector):
-<vspace blankLines="1"/>
-This field contains a single user comment encoded as a UTF-8
- string&nbsp;<xref target="RFC3629"/>.
-There is one for each user comment indicated by the 'user comment list length'
- field.
-</t>
-</list>
-</t>
-
-<t>
-The vendor string length and user comment list length are REQUIRED, and
- implementations SHOULD treat a stream as invalid if it contains a comment
- header that does not have enough data for these fields, or that does not
- contain enough data for the corresponding vendor string or user comments they
- describe.
-Making this check before allocating the associated memory to contain the data
- helps prevent a possible Denial-of-Service (DoS) attack from small comment
- headers that claim to contain strings longer than the entire packet or more
- user comments than than could possibly fit in the packet.
-</t>
-
-<t>
-Immediately following the user comment list, the comment header MAY
- contain zero-padding or other binary data which is not specified here.
-If the least-significant bit of the first byte of this data is 1, then editors
- SHOULD preserve the contents of this data when updating the tags, but if this
- bit is 0, all such data MAY be treated as padding, and truncated or discarded
- as desired.
-This allows informal experimentation with the format of this binary data until
- it can be specified later.
-</t>
-
-<t>
-The comment header can be arbitrarily large and might be spread over a large
- number of Ogg pages.
-Implementations MUST avoid attempting to allocate excessive amounts of memory
- when presented with a very large comment header.
-To accomplish this, implementations MAY treat a stream as invalid if it has a
- comment header larger than 125,829,120&nbsp;octets (120&nbsp;MB), and MAY
- ignore individual comments that are not fully contained within the first
- 61,440&nbsp;octets of the comment header.
-</t>
-
-<section anchor="comment_format" title="Tag Definitions">
-<t>
-The user comment strings follow the NAME=value format described by
- <xref target="vorbis-comment"/> with the same recommended tag names:
- ARTIST, TITLE, DATE, ALBUM, and so on.
-</t>
-<t>
-Two new comment tags are introduced here:
-</t>
-
-<t>First, an optional gain for track normalization:</t>
-<figure align="center">
-<artwork align="left"><![CDATA[
-R128_TRACK_GAIN=-573
-]]></artwork>
-</figure>
-<t>
- representing the volume shift needed to normalize the track's volume
- during isolated playback, in random shuffle, and so on.
-The gain is a Q7.8 fixed point number in dB, as in the ID header's 'output
- gain' field.
-This tag is similar to the REPLAYGAIN_TRACK_GAIN tag in
- Vorbis&nbsp;<xref target="replay-gain"/>, except that the normal volume
- reference is the <xref target="EBU-R128"/> standard.
-</t>
-<t>Second, an optional gain for album normalization:</t>
-<figure align="center">
-<artwork align="left"><![CDATA[
-R128_ALBUM_GAIN=111
-]]></artwork>
-</figure>
-<t>
- representing the volume shift needed to normalize the overall volume when
- played as part of a particular collection of tracks.
-The gain is also a Q7.8 fixed point number in dB, as in the ID header's
- 'output gain' field.
-The values '-573' and '111' given here are just examples.
-</t>
-<t>
-An Ogg Opus stream MUST NOT have more than one of each of these tags, and if
- present their values MUST be an integer from -32768 to 32767, inclusive,
- represented in ASCII as a base 10 number with no whitespace.
-A leading '+' or '-' character is valid.
-Leading zeros are also permitted, but the value MUST be represented by
- no more than 6 characters.
-Other non-digit characters MUST NOT be present.
-</t>
-<t>
-If present, R128_TRACK_GAIN and R128_ALBUM_GAIN MUST correctly represent
- the R128 normalization gain relative to the 'output gain' field specified
- in the ID header.
-If a player chooses to make use of the R128_TRACK_GAIN tag or the
- R128_ALBUM_GAIN tag, it MUST apply those gains
- <spanx style="emph">in addition</spanx> to the 'output gain' value.
-If a tool modifies the ID header's 'output gain' field, it MUST also update or
- remove the R128_TRACK_GAIN and R128_ALBUM_GAIN comment tags if present.
-A muxer SHOULD place the gain it wants other tools to use by default into the
- 'output gain' field, and not the comment tag.
-</t>
-<t>
-To avoid confusion with multiple normalization schemes, an Opus comment header
- SHOULD NOT contain any of the REPLAYGAIN_TRACK_GAIN, REPLAYGAIN_TRACK_PEAK,
- REPLAYGAIN_ALBUM_GAIN, or REPLAYGAIN_ALBUM_PEAK tags, unless they are only
- to be used in some context where there is guaranteed to be no such confusion.
-<xref target="EBU-R128"/> normalization is preferred to the earlier
- REPLAYGAIN schemes because of its clear definition and adoption by industry.
-Peak normalizations are difficult to calculate reliably for lossy codecs
- because of variation in excursion heights due to decoder differences.
-In the authors' investigations they were not applied consistently or broadly
- enough to merit inclusion here.
-</t>
-</section> <!-- end comment_format -->
-</section> <!-- end comment_header -->
-
-</section> <!-- end headers -->
-
-<section anchor="packet_size_limits" title="Packet Size Limits">
-<t>
-Technically, valid Opus packets can be arbitrarily large due to the padding
- format, although the amount of non-padding data they can contain is bounded.
-These packets might be spread over a similarly enormous number of Ogg pages.
-When encoding, implementations SHOULD limit the use of padding in audio data
- packets to no more than is necessary to make a variable bitrate (VBR) stream
- constant bitrate (CBR), unless they have no reasonable way to determine what
- is necessary.
-Demuxers SHOULD treat audio data packets as invalid (treat them as if they were
- malformed Opus packets with an invalid TOC sequence) if they are larger than
- 61,440&nbsp;octets per Opus stream, unless they have a specific reason for
- allowing extra padding.
-Such packets necessarily contain more padding than needed to make a stream CBR.
-Demuxers MUST avoid attempting to allocate excessive amounts of memory when
- presented with a very large packet.
-Demuxers MAY treat audio data packets as invalid or partially process them if
- they are larger than 61,440&nbsp;octets in an Ogg Opus stream with channel
- mapping families&nbsp;0 or&nbsp;1.
-Demuxers MAY treat audio data packets as invalid or partially process them in
- any Ogg Opus stream if the packet is larger than 61,440&nbsp;octets and also
- larger than 7,680&nbsp;octets per Opus stream.
-The presence of an extremely large packet in the stream could indicate a
- memory exhaustion attack or stream corruption.
-</t>
-<t>
-In an Ogg Opus stream, the largest possible valid packet that does not use
- padding has a size of (61,298*N&nbsp;-&nbsp;2) octets.
-With 255&nbsp;streams, this is 15,630,988&nbsp;octets and can
- span up to 61,298&nbsp;Ogg pages, all but one of which will have a granule
- position of -1.
-This is of course a very extreme packet, consisting of 255&nbsp;streams, each
- containing 120&nbsp;ms of audio encoded as 2.5&nbsp;ms frames, each frame
- using the maximum possible number of octets (1275) and stored in the least
- efficient manner allowed (a VBR code&nbsp;3 Opus packet).
-Even in such a packet, most of the data will be zeros as 2.5&nbsp;ms frames
- cannot actually use all 1275&nbsp;octets.
-</t>
-<t>
-The largest packet consisting of entirely useful data is
- (15,326*N&nbsp;-&nbsp;2) octets.
-This corresponds to 120&nbsp;ms of audio encoded as 10&nbsp;ms frames in either
- SILK or Hybrid mode, but at a data rate of over 1&nbsp;Mbps, which makes little
- sense for the quality achieved.
-</t>
-<t>
-A more reasonable limit is (7,664*N&nbsp;-&nbsp;2) octets.
-This corresponds to 120&nbsp;ms of audio encoded as 20&nbsp;ms stereo CELT mode
- frames, with a total bitrate just under 511&nbsp;kbps (not counting the Ogg
- encapsulation overhead).
-For channel mapping family 1, N=8 provides a reasonable upper bound, as it
- allows for each of the 8 possible output channels to be decoded from a
- separate stereo Opus stream.
-This gives a size of 61,310&nbsp;octets, which is rounded up to a multiple of
- 1,024&nbsp;octets to yield the audio data packet size of 61,440&nbsp;octets
- that any implementation is expected to be able to process successfully.
-</t>
-</section>
-
-<section anchor="encoder" title="Encoder Guidelines">
-<t>
-When encoding Opus streams, Ogg muxers SHOULD take into account the
- algorithmic delay of the Opus encoder.
-</t>
-<t>
-In encoders derived from the reference
- implementation&nbsp;<xref target="RFC6716"/>, the number of samples can be
- queried with:
-</t>
-<figure align="center">
-<artwork align="center"><![CDATA[
- opus_encoder_ctl(encoder_state, OPUS_GET_LOOKAHEAD(&delay_samples));
-]]></artwork>
-</figure>
-<t>
-To achieve good quality in the very first samples of a stream, implementations
- MAY use linear predictive coding (LPC) extrapolation to generate at least 120
- extra samples at the beginning to avoid the Opus encoder having to encode a
- discontinuous signal.
-For more information on linear prediction, see
- <xref target="linear-prediction"/>.
-For an input file containing 'length' samples, the implementation SHOULD set
- the pre-skip header value to (delay_samples&nbsp;+&nbsp;extra_samples), encode
- at least (length&nbsp;+&nbsp;delay_samples&nbsp;+&nbsp;extra_samples)
- samples, and set the granule position of the last page to
- (length&nbsp;+&nbsp;delay_samples&nbsp;+&nbsp;extra_samples).
-This ensures that the encoded file has the same duration as the original, with
- no time offset. The best way to pad the end of the stream is to also use LPC
- extrapolation, but zero-padding is also acceptable.
-</t>
-
-<section anchor="lpc" title="LPC Extrapolation">
-<t>
-The first step in LPC extrapolation is to compute linear prediction
- coefficients. <xref target="lpc-sample"/>
-When extending the end of the signal, order-N (typically with N ranging from 8
- to 40) LPC analysis is performed on a window near the end of the signal.
-The last N samples are used as memory to an infinite impulse response (IIR)
- filter.
-</t>
-<t>
-The filter is then applied on a zero input to extrapolate the end of the signal.
-Let a(k) be the kth LPC coefficient and x(n) be the nth sample of the signal,
- each new sample past the end of the signal is computed as:
-</t>
-<figure align="center">
-<artwork align="center"><![CDATA[
-        N
-       ---
-x(n) = \   a(k)*x(n-k)
-       /
-       ---
-       k=1
-]]></artwork>
-</figure>
-<t>
-The process is repeated independently for each channel.
-It is possible to extend the beginning of the signal by applying the same
- process backward in time.
-When extending the beginning of the signal, it is best to apply a "fade in" to
- the extrapolated signal, e.g. by multiplying it by a half-Hanning window
- <xref target="hanning"/>.
-</t>
-
-</section>
-
-<section anchor="continuous_chaining" title="Continuous Chaining">
-<t>
-In some applications, such as Internet radio, it is desirable to cut a long
- stream into smaller chains, e.g. so the comment header can be updated.
-This can be done simply by separating the input streams into segments and
- encoding each segment independently.
-The drawback of this approach is that it creates a small discontinuity
- at the boundary due to the lossy nature of Opus.
-A muxer MAY avoid this discontinuity by using the following procedure:
-<list style="numbers">
-<t>Encode the last frame of the first segment as an independent frame by
- turning off all forms of inter-frame prediction.
-De-emphasis is allowed.</t>
-<t>Set the granule position of the last page to a point near the end of the
- last frame.</t>
-<t>Begin the second segment with a copy of the last frame of the first
- segment.</t>
-<t>Set the pre-skip value of the second stream in such a way as to properly
- join the two streams.</t>
-<t>Continue the encoding process normally from there, without any reset to
- the encoder.</t>
-</list>
-</t>
-<t>
-In encoders derived from the reference implementation, inter-frame prediction
- can be turned off by calling:
-</t>
-<figure align="center">
-<artwork align="center"><![CDATA[
- opus_encoder_ctl(encoder_state, OPUS_SET_PREDICTION_DISABLED(1));
-]]></artwork>
-</figure>
-<t>
-For best results, this implementation requires that prediction be explicitly
- enabled again before resuming normal encoding, even after a reset.
-</t>
-
-</section>
-
-</section>
-
-<section anchor="implementation" title="Implementation Status">
-<t>
-A brief summary of major implementations of this draft is available
- at <eref target="https://wiki.xiph.org/OggOpusImplementation"/>,
- along with their status.
-</t>
-<t>
-[Note to RFC Editor: please remove this entire section before
- final publication per <xref target="RFC6982"/>, along with
- its references.]
-</t>
-</section>
-
-<section anchor="security" title="Security Considerations">
-<t>
-Implementations of the Opus codec need to take appropriate security
- considerations into account, as outlined in <xref target="RFC4732"/>.
-This is just as much a problem for the container as it is for the codec itself.
-Malicious payloads and/or input streams can be used to attack codec
- implementations.
-Implementations MUST NOT overrun their allocated memory nor consume excessive
- resources when decoding payloads or processing input streams.
-Although problems in encoding applications are typically rarer, this still
- applies to a muxer, as vulnerabilities would allow an attacker to attack
- transcoding gateways.
-</t>
-
-<t>
-Header parsing code contains the most likely area for potential overruns.
-It is important for implementations to ensure their buffers contain enough
- data for all of the required fields before attempting to read it (for example,
- for all of the channel map data in the ID header).
-Implementations would do well to validate the indices of the channel map, also,
- to ensure they meet all of the restrictions outlined in
- <xref target="channel_mapping"/>, in order to avoid attempting to read data
- from channels that do not exist.
-</t>
-
-<t>
-To avoid excessive resource usage, we advise implementations to be especially
- wary of streams that might cause them to process far more data than was
- actually transmitted.
-For example, a relatively small comment header may contain values for the
- string lengths or user comment list length that imply that it is many
- gigabytes in size.
-Even computing the size of the required buffer could overflow a 32-bit integer,
- and actually attempting to allocate such a buffer before verifying it would be
- a reasonable size is a bad idea.
-After reading the user comment list length, implementations might wish to
- verify that the header contains at least the minimum amount of data for that
- many comments (4&nbsp;additional octets per comment, to indicate each has a
- length of zero) before proceeding any further, again taking care to avoid
- overflow in these calculations.
-If allocating an array of pointers to point at these strings, the size of the
- pointers may be larger than 4&nbsp;octets, potentially requiring a separate
- overflow check.
-</t>
-
-<t>
-Another bug in this class we have observed more than once involves the handling
- of invalid data at the end of a stream.
-Often, implementations will seek to the end of a stream to locate the last
- timestamp in order to compute its total duration.
-If they do not find a valid capture pattern and Ogg page from the desired
- logical stream, they will back up and try again.
-If care is not taken to avoid re-scanning data that was already scanned, this
- search can quickly devolve into something with a complexity that is quadratic
- in the amount of invalid data.
-</t>
-
-<t>
-In general when seeking, implementations will wish to be cautious about the
- effects of invalid granule position values, and ensure all algorithms will
- continue to make progress and eventually terminate, even if these are missing
- or out-of-order.
-</t>
-
-<t>
-Like most other container formats, Ogg Opus streams SHOULD NOT be used with
- insecure ciphers or cipher modes that are vulnerable to known-plaintext
- attacks.
-Elements such as the Ogg page capture pattern and the magic signatures in the
- ID header and the comment header all have easily predictable values, in
- addition to various elements of the codec data itself.
-</t>
-</section>
-
-<section anchor="content_type" title="Content Type">
-<t>
-An "Ogg Opus file" consists of one or more sequentially multiplexed segments,
- each containing exactly one Ogg Opus stream.
-The RECOMMENDED mime-type for Ogg Opus files is "audio/ogg".
-</t>
-
-<t>
-If more specificity is desired, one MAY indicate the presence of Opus streams
- using the codecs parameter defined in <xref target="RFC6381"/> and
- <xref target="RFC5334"/>, e.g.,
-</t>
-<figure>
-<artwork align="center"><![CDATA[
-    audio/ogg; codecs=opus
-]]></artwork>
-</figure>
-<t>
- for an Ogg Opus file.
-</t>
-
-<t>
-The RECOMMENDED filename extension for Ogg Opus files is '.opus'.
-</t>
-
-<t>
-When Opus is concurrently multiplexed with other streams in an Ogg container,
- one SHOULD use one of the "audio/ogg", "video/ogg", or "application/ogg"
- mime-types, as defined in <xref target="RFC5334"/>.
-Such streams are not strictly "Ogg Opus files" as described above,
- since they contain more than a single Opus stream per sequentially
- multiplexed segment, e.g. video or multiple audio tracks.
-In such cases the the '.opus' filename extension is NOT RECOMMENDED.
-</t>
-
-<t>
-In either case, this document updates <xref target="RFC5334"/>
- to add 'opus' as a codecs parameter value with char[8]: 'OpusHead'
- as Codec Identifier.
-</t>
-</section>
-
-<section anchor="iana" title="IANA Considerations">
-<t>
-This document updates the IANA Media Types registry to add .opus
- as a file extension for "audio/ogg", and to add itself as a reference
- alongside <xref target="RFC5334"/> for "audio/ogg", "video/ogg", and
- "application/ogg" Media Types.
-</t>
-<t>
-This document defines a new registry "Opus Channel Mapping Families" to
- indicate how the semantic meanings of the channels in a multi-channel Opus
- stream are described.
-IANA is requested to create a new name space of "Opus Channel Mapping
- Families".
-This will be a new registry on the IANA Matrix, and not a subregistry of an
- existing registry.
-Modifications to this registry follow the "Specification Required" registration
- policy as defined in <xref target="RFC5226"/>.
-Each registry entry consists of a Channel Mapping Family Number, which is
- specified in decimal in the range 0 to 255, inclusive, and a Reference (or
- list of references)
-Each Reference must point to sufficient documentation to describe what
- information is coded in the Opus identification header for this channel
- mapping family, how a demuxer determines the Stream Count ('N') and Coupled
- Stream Count ('M') from this information, and how it determines the proper
- interpretation of each of the decoded channels.
-</t>
-<t>
-This document defines three initial assignments for this registry.
-</t>
-<texttable>
-<ttcol>Value</ttcol><ttcol>Reference</ttcol>
-<c>0</c><c>[RFCXXXX] <xref target="channel_mapping_0"/></c>
-<c>1</c><c>[RFCXXXX] <xref target="channel_mapping_1"/></c>
-<c>255</c><c>[RFCXXXX] <xref target="channel_mapping_255"/></c>
-</texttable>
-<t>
-The designated expert will determine if the Reference points to a specification
- that meets the requirements for permanence and ready availability laid out
- in&nbsp;<xref target="RFC5226"/> and that it specifies the information
- described above with sufficient clarity to allow interoperable
- implementations.
-</t>
-</section>
-
-<section anchor="Acknowledgments" title="Acknowledgments">
-<t>
-Thanks to Ben Campbell, Joel M. Halpern, Mark Harris, Greg Maxwell,
- Christopher "Monty" Montgomery, Jean-Marc Valin, Stephan Wenger, and Mo Zanaty
- for their valuable contributions to this document.
-Additional thanks to Andrew D'Addesio, Greg Maxwell, and Vincent Penquerc'h for
- their feedback based on early implementations.
-</t>
-</section>
-
-<section title="RFC Editor Notes">
-<t>
-In&nbsp;<xref target="iana"/>, "RFCXXXX" is to be replaced with the RFC number
- assigned to this draft.
-</t>
-</section>
-
-</middle>
-<back>
-<references title="Normative References">
- &rfc2119;
- &rfc3533;
- &rfc3629;
- &rfc5226;
- &rfc5334;
- &rfc6381;
- &rfc6716;
-
-<reference anchor="EBU-R128" target="https://tech.ebu.ch/loudness">
-<front>
-  <title>Loudness Recommendation EBU R128</title>
-  <author>
-    <organization>EBU Technical Committee</organization>
-  </author>
-  <date month="August" year="2011"/>
-</front>
-</reference>
-
-<reference anchor="vorbis-comment"
- target="https://www.xiph.org/vorbis/doc/v-comment.html">
-<front>
-<title>Ogg Vorbis I Format Specification: Comment Field and Header
- Specification</title>
-<author initials="C." surname="Montgomery"
- fullname="Christopher &quot;Monty&quot; Montgomery"/>
-<date month="July" year="2002"/>
-</front>
-</reference>
-
-</references>
-
-<references title="Informative References">
-
-<!--?rfc include="http://xml.resource.org/public/rfc/bibxml/reference.RFC.3550.xml"?-->
- &rfc4732;
- &rfc6982;
- &rfc7587;
-
-<reference anchor="flac"
- target="https://xiph.org/flac/format.html">
-  <front>
-    <title>FLAC - Free Lossless Audio Codec Format Description</title>
-    <author initials="J." surname="Coalson" fullname="Josh Coalson"/>
-    <date month="January" year="2008"/>
-  </front>
-</reference>
-
-<reference anchor="hanning"
- target="https://en.wikipedia.org/w/index.php?title=Window_function&amp;oldid=703074467#Hann_.28Hanning.29_window">
-  <front>
-    <title>Hann window</title>
-    <author>
-      <organization>Wikipedia</organization>
-    </author>
-    <date month="February" year="2016"/>
-  </front>
-</reference>
-
-<reference anchor="linear-prediction"
- target="https://en.wikipedia.org/w/index.php?title=Linear_predictive_coding&amp;oldid=687498962">
-  <front>
-    <title>Linear Predictive Coding</title>
-    <author>
-      <organization>Wikipedia</organization>
-    </author>
-    <date month="October" year="2015"/>
-  </front>
-</reference>
-
-<reference anchor="lpc-sample"
-  target="https://svn.xiph.org/trunk/vorbis/lib/lpc.c">
-<front>
-  <title>Autocorrelation LPC coeff generation algorithm
-    (Vorbis source code)</title>
-<author initials="J." surname="Degener" fullname="Jutta Degener"/>
-<author initials="C." surname="Bormann" fullname="Carsten Bormann"/>
-<date month="November" year="1994"/>
-</front>
-</reference>
-
-<reference anchor="q-notation"
- target="https://en.wikipedia.org/w/index.php?title=Q_%28number_format%29&amp;oldid=697252615">
-<front>
-<title>Q (number format)</title>
-<author><organization>Wikipedia</organization></author>
-<date month="December" year="2015"/>
-</front>
-</reference>
-
-<reference anchor="replay-gain"
- target="https://wiki.xiph.org/VorbisComment#Replay_Gain">
-<front>
-<title>VorbisComment: Replay Gain</title>
-<author initials="C." surname="Parker" fullname="Conrad Parker"/>
-<author initials="M." surname="Leese" fullname="Martin Leese"/>
-<date month="June" year="2009"/>
-</front>
-</reference>
-
-<reference anchor="seeking"
- target="https://wiki.xiph.org/Seeking">
-<front>
-<title>Granulepos Encoding and How Seeking Really Works</title>
-<author initials="S." surname="Pfeiffer" fullname="Silvia Pfeiffer"/>
-<author initials="C." surname="Parker" fullname="Conrad Parker"/>
-<author initials="G." surname="Maxwell" fullname="Greg Maxwell"/>
-<date month="May" year="2012"/>
-</front>
-</reference>
-
-<reference anchor="vorbis-mapping"
- target="https://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-810004.3.9">
-<front>
-<title>The Vorbis I Specification, Section 4.3.9 Output Channel Order</title>
-<author initials="C." surname="Montgomery"
- fullname="Christopher &quot;Monty&quot; Montgomery"/>
-<date month="January" year="2010"/>
-</front>
-</reference>
-
-<reference anchor="vorbis-trim"
- target="https://xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-132000A.2">
-  <front>
-    <title>The Vorbis I Specification, Appendix&nbsp;A: Embedding Vorbis
-      into an Ogg stream</title>
-    <author initials="C." surname="Montgomery"
-     fullname="Christopher &quot;Monty&quot; Montgomery"/>
-    <date month="November" year="2008"/>
-  </front>
-</reference>
-
-<reference anchor="wave-multichannel"
- target="http://msdn.microsoft.com/en-us/windows/hardware/gg463006.aspx">
-  <front>
-    <title>Multiple Channel Audio Data and WAVE Files</title>
-    <author>
-      <organization>Microsoft Corporation</organization>
-    </author>
-    <date month="March" year="2007"/>
-  </front>
-</reference>
-
-</references>
-
-</back>
-</rfc>
diff --git a/doc/draft-ietf-codec-opus-update.xml b/doc/draft-ietf-codec-opus-update.xml
deleted file mode 100644
index 0dfb16bf2..000000000
--- a/doc/draft-ietf-codec-opus-update.xml
+++ /dev/null
@@ -1,513 +0,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!DOCTYPE rfc SYSTEM "rfc2629.dtd">
-<?rfc toc="yes"?>
-<?rfc tocompact="yes"?>
-<?rfc tocdepth="3"?>
-<?rfc tocindent="yes"?>
-<?rfc symrefs="yes"?>
-<?rfc sortrefs="yes"?>
-<?rfc comments="yes"?>
-<?rfc inline="yes"?>
-<?rfc compact="yes"?>
-<?rfc subcompact="no"?>
-<rfc category="std" docName="draft-ietf-codec-opus-update-10"
-     ipr="trust200902" updates="6716">
-  <front>
-    <title abbrev="Opus Update">Updates to the Opus Audio Codec</title>
-
-<author initials="JM" surname="Valin" fullname="Jean-Marc Valin">
-<organization>Mozilla Corporation</organization>
-<address>
-<postal>
-<street>331 E. Evelyn Avenue</street>
-<city>Mountain View</city>
-<region>CA</region>
-<code>94041</code>
-<country>USA</country>
-</postal>
-<phone>+1 650 903-0800</phone>
-<email>jmvalin@jmvalin.ca</email>
-</address>
-</author>
-
-<author initials="K." surname="Vos" fullname="Koen Vos">
-<organization>vocTone</organization>
-<address>
-<postal>
-<street></street>
-<city></city>
-<region></region>
-<code></code>
-<country></country>
-</postal>
-<phone></phone>
-<email>koenvos74@gmail.com</email>
-</address>
-</author>
-
-
-
-    <date day="24" month="August" year="2017" />
-
-    <abstract>
-      <t>This document addresses minor issues that were found in the specification
-      of the Opus audio codec in RFC 6716. It updates the normative decoder implementation
-      included in the appendix of RFC 6716. The changes fixes real and potential security-related
-      issues, as well minor quality-related issues.</t>
-    </abstract>
-  </front>
-
-  <middle>
-    <section title="Introduction">
-      <t>This document addresses minor issues that were discovered in the reference
-      implementation of the Opus codec. Unlike most IETF specifications, Opus is defined
-      in <xref target="RFC6716">RFC 6716</xref> in terms of a normative reference
-      decoder implementation rather than from the associated text description.
-      That RFC includes the reference decoder implementation as Appendix A.
-      That's why only issues affecting the decoder are
-      listed here. An up-to-date implementation of the Opus encoder can be found at
-      <eref target="https://opus-codec.org/"/>.</t>
-    <t>
-      Some of the changes in this document update normative behaviour in a way that requires
-      new test vectors. The English text of the specification is unaffected, only
-      the C implementation is. The updated specification remains fully compatible with
-      the original specification.
-    </t>
-
-    <t>
-    Note: due to RFC formatting conventions, lines exceeding the column width
-    in the patch are split using a backslash character. The backslashes
-    at the end of a line and the white space at the beginning
-    of the following line are not part of the patch. A properly formatted patch
-    including all changes is available at
-    <eref target="https://www.ietf.org/proceedings/98/slides/materials-98-codec-opus-update-00.patch"/>
-    and has a SHA-1 hash of 029e3aa88fc342c91e67a21e7bfbc9458661cd5f.
-    </t>
-
-    </section>
-
-    <section title="Terminology">
-      <t>The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
-      "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
-      document are to be interpreted as described in <xref
-      target="RFC2119">RFC 2119</xref>.</t>
-    </section>
-
-    <section title="Stereo State Reset in SILK">
-      <t>The reference implementation does not reinitialize the stereo state
-      during a mode switch. The old stereo memory can produce a brief impulse
-      (i.e. single sample) in the decoded audio. This can be fixed by changing
-      silk/dec_API.c at line 72:
-    </t>
-<figure>
-<artwork><![CDATA[
-<CODE BEGINS>
-     for( n = 0; n < DECODER_NUM_CHANNELS; n++ ) {
-         ret  = silk_init_decoder( &channel_state[ n ] );
-     }
-+    silk_memset(&((silk_decoder *)decState)->sStereo, 0,
-+                sizeof(((silk_decoder *)decState)->sStereo));
-+    /* Not strictly needed, but it's cleaner that way */
-+    ((silk_decoder *)decState)->prev_decode_only_middle = 0;
-
-     return ret;
- }
-<CODE ENDS>
-]]></artwork>
-</figure>
-     <t>
-     This change affects the normative output of the decoder, but the
-     amount of change is within the tolerance and too small to make the testvector check fail.
-      </t>
-    </section>
-
-    <section anchor="padding" title="Parsing of the Opus Packet Padding">
-      <t>It was discovered that some invalid packets of very large size could trigger
-      an out-of-bounds read in the Opus packet parsing code responsible for padding.
-      This is due to an integer overflow if the signaled padding exceeds 2^31-1 bytes
-      (the actual packet may be smaller). The code can be fixed by decrementing the
-      (signed) len value, instead of incrementing a separate padding counter.
-      This is done by applying the following changes at line 596 of src/opus_decoder.c:
-    </t>
-<figure>
-<artwork><![CDATA[
-<CODE BEGINS>
-       /* Padding flag is bit 6 */
-       if (ch&0x40)
-       {
--         int padding=0;
-          int p;
-          do {
-             if (len<=0)
-                return OPUS_INVALID_PACKET;
-             p = *data++;
-             len--;
--            padding += p==255 ? 254: p;
-+            len -= p==255 ? 254: p;
-          } while (p==255);
--         len -= padding;
-       }
-<CODE ENDS>
-]]></artwork>
-</figure>
-      <t>This packet parsing issue is limited to reading memory up
-         to about 60 kB beyond the compressed buffer. This can only be triggered
-         by a compressed packet more than about 16 MB long, so it's not a problem
-         for RTP. In theory, it could crash a file
-         decoder (e.g. Opus in Ogg) if the memory just after the incoming packet
-         is out-of-range, but our attempts to trigger such a crash in a production
-         application built using an affected version of the Opus decoder failed.</t>
-    </section>
-
-    <section anchor="resampler" title="Resampler buffer">
-      <t>The SILK resampler had the following issues:
-        <list style="numbers">
-    <t>The calls to memcpy() were using sizeof(opus_int32), but the type of the
-        local buffer was opus_int16.</t>
-    <t>Because the size was wrong, this potentially allowed the source
-        and destination regions of the memcpy() to overlap on the copy from "buf" to "buf".
-          We believe that nSamplesIn (number of input samples) is at least fs_in_khZ (sampling rate in kHz),
-          which is at least 8.
-       Since RESAMPLER_ORDER_FIR_12 is only 8, that should not be a problem once
-       the type size is fixed.</t>
-          <t>The size of the buffer used RESAMPLER_MAX_BATCH_SIZE_IN, but the
-        data stored in it was actually twice the input batch size
-        (nSamplesIn&lt;&lt;1).</t>
-      </list></t>
-    <t>The code can be fixed by applying the following changes to line 78 of silk/resampler_private_IIR_FIR.c:
-    </t>
-<figure>
-<artwork><![CDATA[
-<CODE BEGINS>
- )
- {
-     silk_resampler_state_struct *S = \
-(silk_resampler_state_struct *)SS;
-     opus_int32 nSamplesIn;
-     opus_int32 max_index_Q16, index_increment_Q16;
--    opus_int16 buf[ RESAMPLER_MAX_BATCH_SIZE_IN + \
-RESAMPLER_ORDER_FIR_12 ];
-+    opus_int16 buf[ 2*RESAMPLER_MAX_BATCH_SIZE_IN + \
-RESAMPLER_ORDER_FIR_12 ];
-
-     /* Copy buffered samples to start of buffer */
--    silk_memcpy( buf, S->sFIR, RESAMPLER_ORDER_FIR_12 \
-* sizeof( opus_int32 ) );
-+    silk_memcpy( buf, S->sFIR, RESAMPLER_ORDER_FIR_12 \
-* sizeof( opus_int16 ) );
-
-     /* Iterate over blocks of frameSizeIn input samples */
-     index_increment_Q16 = S->invRatio_Q16;
-     while( 1 ) {
-         nSamplesIn = silk_min( inLen, S->batchSize );
-
-         /* Upsample 2x */
-         silk_resampler_private_up2_HQ( S->sIIR, &buf[ \
-RESAMPLER_ORDER_FIR_12 ], in, nSamplesIn );
-
-         max_index_Q16 = silk_LSHIFT32( nSamplesIn, 16 + 1 \
-);         /* + 1 because 2x upsampling */
-         out = silk_resampler_private_IIR_FIR_INTERPOL( out, \
-buf, max_index_Q16, index_increment_Q16 );
-         in += nSamplesIn;
-         inLen -= nSamplesIn;
-
-         if( inLen > 0 ) {
-             /* More iterations to do; copy last part of \
-filtered signal to beginning of buffer */
--            silk_memcpy( buf, &buf[ nSamplesIn << 1 ], \
-RESAMPLER_ORDER_FIR_12 * sizeof( opus_int32 ) );
-+            silk_memmove( buf, &buf[ nSamplesIn << 1 ], \
-RESAMPLER_ORDER_FIR_12 * sizeof( opus_int16 ) );
-         } else {
-             break;
-         }
-     }
-
-     /* Copy last part of filtered signal to the state for \
-the next call */
--    silk_memcpy( S->sFIR, &buf[ nSamplesIn << 1 ], \
-RESAMPLER_ORDER_FIR_12 * sizeof( opus_int32 ) );
-+    silk_memcpy( S->sFIR, &buf[ nSamplesIn << 1 ], \
-RESAMPLER_ORDER_FIR_12 * sizeof( opus_int16 ) );
- }
-<CODE ENDS>
-]]></artwork>
-</figure>
-    </section>
-
-    <section title="Integer wrap-around in inverse gain computation">
-      <t>
-        It was discovered through decoder fuzzing that some bitstreams could produce
-        integer values exceeding 32-bits in LPC_inverse_pred_gain_QA(), causing
-        a wrap-around. The C standard considers
-        this behavior as undefined. The following patch to line 87 of silk/LPC_inv_pred_gain.c
-        detects values that do not fit in a 32-bit integer and considers the corresponding filters unstable:
-      </t>
-<figure>
-<artwork><![CDATA[
-<CODE BEGINS>
-         /* Update AR coefficient */
-         for( n = 0; n < k; n++ ) {
--            tmp_QA = Aold_QA[ n ] - MUL32_FRAC_Q( \
-Aold_QA[ k - n - 1 ], rc_Q31, 31 );
--            Anew_QA[ n ] = MUL32_FRAC_Q( tmp_QA, rc_mult2 , mult2Q );
-+            opus_int64 tmp64;
-+            tmp_QA = silk_SUB_SAT32( Aold_QA[ n ], MUL32_FRAC_Q( \
-Aold_QA[ k - n - 1 ], rc_Q31, 31 ) );
-+            tmp64 = silk_RSHIFT_ROUND64( silk_SMULL( tmp_QA, \
-rc_mult2 ), mult2Q);
-+            if( tmp64 > silk_int32_MAX || tmp64 < silk_int32_MIN ) {
-+               return 0;
-+            }
-+            Anew_QA[ n ] = ( opus_int32 )tmp64;
-         }
-<CODE ENDS>
-]]></artwork>
-</figure>
-    </section>
-
-    <section title="Integer wrap-around in LSF decoding" anchor="lsf_overflow">
-      <t>
-        It was discovered -- also from decoder fuzzing -- that an integer wrap-around could
-        occur when decoding bitstreams with extremely large values for the high LSF parameters.
-        The end result of the wrap-around is an illegal read access on the stack, which
-        the authors do not believe is exploitable but should nonetheless be fixed. The following
-        patch to line 137 of silk/NLSF_stabilize.c prevents the problem:
-      </t>
-<figure>
-<artwork><![CDATA[
-<CODE BEGINS>
-           /* Keep delta_min distance between the NLSFs */
-         for( i = 1; i < L; i++ )
--            NLSF_Q15[i] = silk_max_int( NLSF_Q15[i], \
-NLSF_Q15[i-1] + NDeltaMin_Q15[i] );
-+            NLSF_Q15[i] = silk_max_int( NLSF_Q15[i], \
-silk_ADD_SAT16( NLSF_Q15[i-1], NDeltaMin_Q15[i] ) );
-
-         /* Last NLSF should be no higher than 1 - NDeltaMin[L] */
-<CODE ENDS>
-]]></artwork>
-</figure>
-
-    </section>
-
-    <section title="Cap on Band Energy">
-      <t>On extreme bit-streams, it is possible for log-domain band energy levels
-        to exceed the maximum single-precision floating point value once converted
-        to a linear scale. This would later cause the decoded values to be NaN (not a number),
-        possibly causing problems in the software using the PCM values. This can be
-        avoided with the following patch to line 552 of celt/quant_bands.c:
-      </t>
-<figure>
-<artwork><![CDATA[
-<CODE BEGINS>
-       {
-          opus_val16 lg = ADD16(oldEBands[i+c*m->nbEBands],
-                          SHL16((opus_val16)eMeans[i],6));
-+         lg = MIN32(QCONST32(32.f, 16), lg);
-          eBands[i+c*m->nbEBands] = PSHR32(celt_exp2(lg),4);
-       }
-       for (;i<m->nbEBands;i++)
-<CODE ENDS>
-]]></artwork>
-</figure>
-    </section>
-
-    <section title="Hybrid Folding" anchor="folding">
-      <t>When encoding in hybrid mode at low bitrate, we sometimes only have
-        enough bits to code a single CELT band (8 - 9.6 kHz). When that happens,
-        the second band (CELT band 18, from 9.6 to 12 kHz) cannot use folding
-        because it is wider than the amount already coded, and falls back to
-        white noise. Because it can also happen on transients (e.g. stops), it
-        can cause audible pre-echo.
-      </t>
-      <t>
-        To address the issue, we change the folding behavior so that it is
-        never forced to fall back to LCG due to the first band not containing
-        enough coefficients to fold onto the second band. This
-        is achieved by simply repeating part of the first band in the folding
-        of the second band. This changes the code in celt/bands.c around line 1237:
-      </t>
-<figure>
-<artwork><![CDATA[
-<CODE BEGINS>
-          b = 0;
-       }
-
--      if (resynth && M*eBands[i]-N >= M*eBands[start] && \
-(update_lowband || lowband_offset==0))
-+      if (resynth && (M*eBands[i]-N >= M*eBands[start] || \
-i==start+1) && (update_lowband || lowband_offset==0))
-             lowband_offset = i;
-
-+      if (i == start+1)
-+      {
-+         int n1, n2;
-+         int offset;
-+         n1 = M*(eBands[start+1]-eBands[start]);
-+         n2 = M*(eBands[start+2]-eBands[start+1]);
-+         offset = M*eBands[start];
-+         /* Duplicate enough of the first band folding data to \
-be able to fold the second band.
-+            Copies no data for CELT-only mode. */
-+         OPUS_COPY(&norm[offset+n1], &norm[offset+2*n1 - n2], n2-n1);
-+         if (C==2)
-+            OPUS_COPY(&norm2[offset+n1], &norm2[offset+2*n1 - n2], \
-n2-n1);
-+      }
-+
-       tf_change = tf_res[i];
-       if (i>=m->effEBands)
-       {
-<CODE ENDS>
-]]></artwork>
-</figure>
-
-      <t>
-       as well as line 1260:
-      </t>
-
-<figure>
-<artwork><![CDATA[
-<CODE BEGINS>
-          fold_start = lowband_offset;
-          while(M*eBands[--fold_start] > effective_lowband);
-          fold_end = lowband_offset-1;
--         while(M*eBands[++fold_end] < effective_lowband+N);
-+         while(++fold_end < i && M*eBands[fold_end] < \
-effective_lowband+N);
-          x_cm = y_cm = 0;
-          fold_i = fold_start; do {
-            x_cm |= collapse_masks[fold_i*C+0];
-
-<CODE ENDS>
-]]></artwork>
-</figure>
-      <t>
-        The fix does not impact compatibility, because the improvement does
-        not depend on the encoder doing anything special. There is also no
-        reasonable way for an encoder to use the original behavior to
-        improve quality over the proposed change.
-      </t>
-    </section>
-
-    <section title="Downmix to Mono" anchor="stereo">
-      <t>The last issue is not strictly a bug, but it is an issue that has been reported
-      when downmixing an Opus decoded stream to mono, whether this is done inside the decoder
-      or as a post-processing step on the stereo decoder output. Opus intensity stereo allows
-      optionally coding the two channels 180-degrees out of phase on a per-band basis.
-      This provides better stereo quality than forcing the two channels to be in phase,
-      but when the output is downmixed to mono, the energy in the affected bands is cancelled
-      sometimes resulting in audible artifacts.
-      </t>
-      <t>As a work-around for this issue, the decoder MAY choose not to apply the 180-degree
-      phase shift. This can be useful when downmixing to mono inside or
-      outside of the decoder (e.g. user-controllable).
-      </t>
-    </section>
-
-
-    <section title="New Test Vectors">
-      <t>Changes in <xref target="folding"/> and <xref target="stereo"/> have
-        sufficient impact on the testvectors to make them fail. For this reason,
-        this document also updates the Opus test vectors. The new test vectors now
-        include two decoded outputs for the same bitstream. The outputs with
-        suffix 'm' do not apply the CELT 180-degree phase shift as allowed in
-        <xref target="stereo"/>, while the outputs without the suffix do. An
-        implementation is compliant as long as it passes either set of vectors.
-      </t>
-      <t>
-        Any Opus implementation
-        that passes either the original test vectors from <xref target="RFC6716">RFC 6716</xref>
-        or one of the new sets of test vectors is compliant with the Opus specification. However, newer implementations
-        SHOULD be based on the new test vectors rather than the old ones.
-      </t>
-      <t>The new test vectors are located at
-        <eref target="https://www.ietf.org/proceedings/98/slides/materials-98-codec-opus-newvectors-00.tar.gz"/>.
-        The SHA-1 hashes of the test vectors are:
-<figure>
-<artwork>
-<![CDATA[
-e49b2862ceec7324790ed8019eb9744596d5be01  testvector01.bit
-b809795ae1bcd606049d76de4ad24236257135e0  testvector02.bit
-e0c4ecaeab44d35a2f5b6575cd996848e5ee2acc  testvector03.bit
-a0f870cbe14ebb71fa9066ef3ee96e59c9a75187  testvector04.bit
-9b3d92b48b965dfe9edf7b8a85edd4309f8cf7c8  testvector05.bit
-28e66769ab17e17f72875283c14b19690cbc4e57  testvector06.bit
-bacf467be3215fc7ec288f29e2477de1192947a6  testvector07.bit
-ddbe08b688bbf934071f3893cd0030ce48dba12f  testvector08.bit
-3932d9d61944dab1201645b8eeaad595d5705ecb  testvector09.bit
-521eb2a1e0cc9c31b8b740673307c2d3b10c1900  testvector10.bit
-6bc8f3146fcb96450c901b16c3d464ccdf4d5d96  testvector11.bit
-338c3f1b4b97226bc60bc41038becbc6de06b28f  testvector12.bit
-f5ef93884da6a814d311027918e9afc6f2e5c2c8  testvector01.dec
-48ac1ff1995250a756e1e17bd32acefa8cd2b820  testvector02.dec
-d15567e919db2d0e818727092c0af8dd9df23c95  testvector03.dec
-1249dd28f5bd1e39a66fd6d99449dca7a8316342  testvector04.dec
-b85675d81deef84a112c466cdff3b7aaa1d2fc76  testvector05.dec
-55f0b191e90bfa6f98b50d01a64b44255cb4813e  testvector06.dec
-61e8b357ab090b1801eeb578a28a6ae935e25b7b  testvector07.dec
-a58539ee5321453b2ddf4c0f2500e856b3966862  testvector08.dec
-bb96aad2cde188555862b7bbb3af6133851ef8f4  testvector09.dec
-1b6cdf0413ac9965b16184b1bea129b5c0b2a37a  testvector10.dec
-b1fff72b74666e3027801b29dbc48b31f80dee0d  testvector11.dec
-98e09bbafed329e341c3b4052e9c4ba5fc83f9b1  testvector12.dec
-1e7d984ea3fbb16ba998aea761f4893fbdb30157  testvector01m.dec
-48ac1ff1995250a756e1e17bd32acefa8cd2b820  testvector02m.dec
-d15567e919db2d0e818727092c0af8dd9df23c95  testvector03m.dec
-1249dd28f5bd1e39a66fd6d99449dca7a8316342  testvector04m.dec
-d70b0bad431e7d463bc3da49bd2d49f1c6d0a530  testvector05m.dec
-6ac1648c3174c95fada565161a6c78bdbe59c77d  testvector06m.dec
-fc5e2f709693738324fb4c8bdc0dad6dda04e713  testvector07m.dec
-aad2ba397bf1b6a18e8e09b50e4b19627d479f00  testvector08m.dec
-6feb7a7b9d7cdc1383baf8d5739e2a514bd0ba08  testvector09m.dec
-1b6cdf0413ac9965b16184b1bea129b5c0b2a37a  testvector10m.dec
-fd3d3a7b0dfbdab98d37ed9aa04b659b9fefbd18  testvector11m.dec
-98e09bbafed329e341c3b4052e9c4ba5fc83f9b1  testvector12m.dec
-]]>
-</artwork>
-</figure>
-      Note that the decoder input bitstream files (.bit) are unchanged.
-      </t>
-    </section>
-
-    <section anchor="security" title="Security Considerations">
-      <t>This document fixes two security issues reported on Opus and that affect the
-        reference implementation in <xref target="RFC6716">RFC 6716</xref>: CVE-2013-0899
-        <eref target="https://nvd.nist.gov/vuln/detail/CVE-2013-0899"/>
-        and CVE-2017-0381 <eref target="https://nvd.nist.gov/vuln/detail/CVE-2017-0381"/>.
-        CVE- 2013-0899 theoretically could have caused an information leak. The leaked
-        information would have gone through the decoder process before being accessible
-        to the attacker. It is fixed by <xref target="padding"/>.
-        CVE-2017-0381 could have resulted in a 16-bit out-of-bounds read from a fixed
-        location.  It is fixed in <xref target="lsf_overflow"/>.
-        Beyond the two fixed CVEs, this document adds no new security considerations on top of
-        <xref target="RFC6716">RFC 6716</xref>.
-      </t>
-    </section>
-
-    <section anchor="IANA" title="IANA Considerations">
-      <t>This document makes no request of IANA.</t>
-
-      <t>Note to RFC Editor: this section may be removed on publication as an
-      RFC.</t>
-    </section>
-
-    <section anchor="Acknowledgements" title="Acknowledgements">
-      <t>We would like to thank Juri Aedla for reporting the issue with the parsing of
-      the Opus padding. Thanks to Felicia Lim for reporting the LSF integer overflow issue.
-      Also, thanks to Tina le Grand, Jonathan Lennox, and Mark Harris for their
-      feedback on this document.</t>
-    </section>
-  </middle>
-
-  <back>
-    <references title="Normative References">
-      <?rfc include="http://xml.resource.org/public/rfc/bibxml/reference.RFC.2119.xml"?>
-      <?rfc include="http://xml.resource.org/public/rfc/bibxml/reference.RFC.6716.xml"?>
-
-
-    </references>
-  </back>
-</rfc>
diff --git a/doc/draft-ietf-codec-opus.xml b/doc/draft-ietf-codec-opus.xml
deleted file mode 100644
index 334cad97a..000000000
--- a/doc/draft-ietf-codec-opus.xml
+++ /dev/null
@@ -1,8276 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE rfc SYSTEM 'rfc2629.dtd'>
-<?rfc toc="yes" symrefs="yes" ?>
-
-<rfc ipr="trust200902" category="std" docName="draft-ietf-codec-opus-14">
-
-<front>
-<title abbrev="Interactive Audio Codec">Definition of the Opus Audio Codec</title>
-
-
-<author initials="JM" surname="Valin" fullname="Jean-Marc Valin">
-<organization>Mozilla Corporation</organization>
-<address>
-<postal>
-<street>650 Castro Street</street>
-<city>Mountain View</city>
-<region>CA</region>
-<code>94041</code>
-<country>USA</country>
-</postal>
-<phone>+1 650 903-0800</phone>
-<email>jmvalin@jmvalin.ca</email>
-</address>
-</author>
-
-<author initials="K." surname="Vos" fullname="Koen Vos">
-<organization>Skype Technologies S.A.</organization>
-<address>
-<postal>
-<street>Soder Malarstrand 43</street>
-<city>Stockholm</city>
-<region></region>
-<code>11825</code>
-<country>SE</country>
-</postal>
-<phone>+46 73 085 7619</phone>
-<email>koen.vos@skype.net</email>
-</address>
-</author>
-
-<author initials="T." surname="Terriberry" fullname="Timothy B. Terriberry">
-<organization>Mozilla Corporation</organization>
-<address>
-<postal>
-<street>650 Castro Street</street>
-<city>Mountain View</city>
-<region>CA</region>
-<code>94041</code>
-<country>USA</country>
-</postal>
-<phone>+1 650 903-0800</phone>
-<email>tterriberry@mozilla.com</email>
-</address>
-</author>
-
-<date day="17" month="May" year="2012" />
-
-<area>General</area>
-
-<workgroup></workgroup>
-
-<abstract>
-<t>
-This document defines the Opus interactive speech and audio codec.
-Opus is designed to handle a wide range of interactive audio applications,
- including Voice over IP, videoconferencing, in-game chat, and even live,
- distributed music performances.
-It scales from low bitrate narrowband speech at 6 kb/s to very high quality
- stereo music at 510 kb/s.
-Opus uses both linear prediction (LP) and the Modified Discrete Cosine
- Transform (MDCT) to achieve good compression of both speech and music.
-</t>
-</abstract>
-</front>
-
-<middle>
-
-<section anchor="introduction" title="Introduction">
-<t>
-The Opus codec is a real-time interactive audio codec designed to meet the requirements
-described in <xref target="requirements"></xref>.
-It is composed of a linear
- prediction (LP)-based <xref target="LPC"/> layer and a Modified Discrete Cosine Transform
- (MDCT)-based <xref target="MDCT"/> layer.
-The main idea behind using two layers is that in speech, linear prediction
- techniques (such as Code-Excited Linear Prediction, or CELP) code low frequencies more efficiently than transform
- (e.g., MDCT) domain techniques, while the situation is reversed for music and
- higher speech frequencies.
-Thus a codec with both layers available can operate over a wider range than
- either one alone and, by combining them, achieve better quality than either
- one individually.
-</t>
-
-<t>
-The primary normative part of this specification is provided by the source code
- in <xref target="ref-implementation"></xref>.
-Only the decoder portion of this software is normative, though a
- significant amount of code is shared by both the encoder and decoder.
-<xref target="conformance"/> provides a decoder conformance test.
-The decoder contains a great deal of integer and fixed-point arithmetic which
- needs to be performed exactly, including all rounding considerations, so any
- useful specification requires domain-specific symbolic language to adequately
- define these operations.
-Additionally, any
-conflict between the symbolic representation and the included reference
-implementation must be resolved. For the practical reasons of compatibility and
-testability it would be advantageous to give the reference implementation
-priority in any disagreement. The C language is also one of the most
-widely understood human-readable symbolic representations for machine
-behavior.
-For these reasons this RFC uses the reference implementation as the sole
- symbolic representation of the codec.
-</t>
-
-<t>While the symbolic representation is unambiguous and complete it is not
-always the easiest way to understand the codec's operation. For this reason
-this document also describes significant parts of the codec in English and
-takes the opportunity to explain the rationale behind many of the more
-surprising elements of the design. These descriptions are intended to be
-accurate and informative, but the limitations of common English sometimes
-result in ambiguity, so it is expected that the reader will always read
-them alongside the symbolic representation. Numerous references to the
-implementation are provided for this purpose. The descriptions sometimes
-differ from the reference in ordering or through mathematical simplification
-wherever such deviation makes an explanation easier to understand.
-For example, the right shift and left shift operations in the reference
-implementation are often described using division and multiplication in the text.
-In general, the text is focused on the "what" and "why" while the symbolic
-representation most clearly provides the "how".
-</t>
-
-<section anchor="notation" title="Notation and Conventions">
-<t>
-The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD",
- "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be
- interpreted as described in RFC 2119 <xref target="rfc2119"></xref>.
-</t>
-<t>
-Various operations in the codec require bit-exact fixed-point behavior, even
- when writing a floating point implementation.
-The notation "Q&lt;n&gt;", where n is an integer, denotes the number of binary
- digits to the right of the decimal point in a fixed-point number.
-For example, a signed Q14 value in a 16-bit word can represent values from
- -2.0 to 1.99993896484375, inclusive.
-This notation is for informational purposes only.
-Arithmetic, when described, always operates on the underlying integer.
-E.g., the text will explicitly indicate any shifts required after a
- multiplication.
-</t>
-<t>
-Expressions, where included in the text, follow C operator rules and
- precedence, with the exception that the syntax "x**y" indicates x raised to
- the power y.
-The text also makes use of the following functions:
-</t>
-
-<section anchor="min" toc="exclude" title="min(x,y)">
-<t>
-The smallest of two values x and y.
-</t>
-</section>
-
-<section anchor="max" toc="exclude" title="max(x,y)">
-<t>
-The largest of two values x and y.
-</t>
-</section>
-
-<section anchor="clamp" toc="exclude" title="clamp(lo,x,hi)">
-<figure align="center">
-<artwork align="center"><![CDATA[
-clamp(lo,x,hi) = max(lo,min(x,hi))
-]]></artwork>
-</figure>
-<t>
-With this definition, if lo&nbsp;&gt;&nbsp;hi, the lower bound is the one that
- is enforced.
-</t>
-</section>
-
-<section anchor="sign" toc="exclude" title="sign(x)">
-<t>
-The sign of x, i.e.,
-<figure align="center">
-<artwork align="center"><![CDATA[
-          ( -1,  x < 0 ,
-sign(x) = <  0,  x == 0 ,
-          (  1,  x > 0 .
-]]></artwork>
-</figure>
-</t>
-</section>
-
-<section anchor="abs" toc="exclude" title="abs(x)">
-<t>
-The absolute value of x, i.e.,
-<figure align="center">
-<artwork align="center"><![CDATA[
-abs(x) = sign(x)*x .
-]]></artwork>
-</figure>
-</t>
-</section>
-
-<section anchor="floor" toc="exclude" title="floor(f)">
-<t>
-The largest integer z such that z &lt;= f.
-</t>
-</section>
-
-<section anchor="ceil" toc="exclude" title="ceil(f)">
-<t>
-The smallest integer z such that z &gt;= f.
-</t>
-</section>
-
-<section anchor="round" toc="exclude" title="round(f)">
-<t>
-The integer z nearest to f, with ties rounded towards negative infinity,
- i.e.,
-<figure align="center">
-<artwork align="center"><![CDATA[
- round(f) = ceil(f - 0.5) .
-]]></artwork>
-</figure>
-</t>
-</section>
-
-<section anchor="log2" toc="exclude" title="log2(f)">
-<t>
-The base-two logarithm of f.
-</t>
-</section>
-
-<section anchor="ilog" toc="exclude" title="ilog(n)">
-<t>
-The minimum number of bits required to store a positive integer n in two's
- complement notation, or 0 for a non-positive integer n.
-<figure align="center">
-<artwork align="center"><![CDATA[
-          ( 0,                 n <= 0,
-ilog(n) = <
-          ( floor(log2(n))+1,  n > 0
-]]></artwork>
-</figure>
-Examples:
-<list style="symbols">
-<t>ilog(-1) = 0</t>
-<t>ilog(0) = 0</t>
-<t>ilog(1) = 1</t>
-<t>ilog(2) = 2</t>
-<t>ilog(3) = 2</t>
-<t>ilog(4) = 3</t>
-<t>ilog(7) = 3</t>
-</list>
-</t>
-</section>
-
-</section>
-
-</section>
-
-<section anchor="overview" title="Opus Codec Overview">
-
-<t>
-The Opus codec scales from 6&nbsp;kb/s narrowband mono speech to 510&nbsp;kb/s
- fullband stereo music, with algorithmic delays ranging from 5&nbsp;ms to
- 65.2&nbsp;ms.
-At any given time, either the LP layer, the MDCT layer, or both, may be active.
-It can seamlessly switch between all of its various operating modes, giving it
- a great deal of flexibility to adapt to varying content and network
- conditions without renegotiating the current session.
-The codec allows input and output of various audio bandwidths, defined as
- follows:
-</t>
-<texttable anchor="audio-bandwidth">
-<ttcol>Abbreviation</ttcol>
-<ttcol align="right">Audio Bandwidth</ttcol>
-<ttcol align="right">Sample Rate (Effective)</ttcol>
-<c>NB (narrowband)</c>       <c>4&nbsp;kHz</c>  <c>8&nbsp;kHz</c>
-<c>MB (medium-band)</c>      <c>6&nbsp;kHz</c> <c>12&nbsp;kHz</c>
-<c>WB (wideband)</c>         <c>8&nbsp;kHz</c> <c>16&nbsp;kHz</c>
-<c>SWB (super-wideband)</c> <c>12&nbsp;kHz</c> <c>24&nbsp;kHz</c>
-<c>FB (fullband)</c>        <c>20&nbsp;kHz (*)</c> <c>48&nbsp;kHz</c>
-</texttable>
-<t>
-(*) Although the sampling theorem allows a bandwidth as large as half the
- sampling rate, Opus never codes audio above 20&nbsp;kHz, as that is the
- generally accepted upper limit of human hearing.
-</t>
-
-<t>
-Opus defines super-wideband (SWB) with an effective sample rate of 24&nbsp;kHz,
- unlike some other audio coding standards that use 32&nbsp;kHz.
-This was chosen for a number of reasons.
-The band layout in the MDCT layer naturally allows skipping coefficients for
- frequencies over 12&nbsp;kHz, but does not allow cleanly dropping just those
- frequencies over 16&nbsp;kHz.
-A sample rate of 24&nbsp;kHz also makes resampling in the MDCT layer easier,
- as 24 evenly divides 48, and when 24&nbsp;kHz is sufficient, it can save
- computation in other processing, such as Acoustic Echo Cancellation (AEC).
-Experimental changes to the band layout to allow a 16&nbsp;kHz cutoff
- (32&nbsp;kHz effective sample rate) showed potential quality degradations at
- other sample rates, and at typical bitrates the number of bits saved by using
- such a cutoff instead of coding in fullband (FB) mode is very small.
-Therefore, if an application wishes to process a signal sampled at 32&nbsp;kHz,
- it should just use FB.
-</t>
-
-<t>
-The LP layer is based on the SILK codec
- <xref target="SILK"></xref>.
-It supports NB, MB, or WB audio and frame sizes from 10&nbsp;ms to 60&nbsp;ms,
- and requires an additional 5&nbsp;ms look-ahead for noise shaping estimation.
-A small additional delay (up to 1.5 ms) may be required for sampling rate
- conversion.
-Like Vorbis <xref target='Vorbis-website'/> and many other modern codecs, SILK is inherently designed for
- variable-bitrate (VBR) coding, though the encoder can also produce
- constant-bitrate (CBR) streams.
-The version of SILK used in Opus is substantially modified from, and not
- compatible with, the stand-alone SILK codec previously deployed by Skype.
-This document does not serve to define that format, but those interested in the
- original SILK codec should see <xref target="SILK"/> instead.
-</t>
-
-<t>
-The MDCT layer is based on the CELT  codec <xref target="CELT"></xref>.
-It supports NB, WB, SWB, or FB audio and frame sizes from 2.5&nbsp;ms to
- 20&nbsp;ms, and requires an additional 2.5&nbsp;ms look-ahead due to the
- overlapping MDCT windows.
-The CELT codec is inherently designed for CBR coding, but unlike many CBR
- codecs it is not limited to a set of predetermined rates.
-It internally allocates bits to exactly fill any given target budget, and an
- encoder can produce a VBR stream by varying the target on a per-frame basis.
-The MDCT layer is not used for speech when the audio bandwidth is WB or less,
- as it is not useful there.
-On the other hand, non-speech signals are not always adequately coded using
- linear prediction, so for music only the MDCT layer should be used.
-</t>
-
-<t>
-A "Hybrid" mode allows the use of both layers simultaneously with a frame size
- of 10&nbsp;or 20&nbsp;ms and a SWB or FB audio bandwidth.
-The LP layer codes the low frequencies by resampling the signal down to WB.
-The MDCT layer follows, coding the high frequency portion of the signal.
-The cutoff between the two lies at 8&nbsp;kHz, the maximum WB audio bandwidth.
-In the MDCT layer, all bands below 8&nbsp;kHz are discarded, so there is no
- coding redundancy between the two layers.
-</t>
-
-<t>
-The sample rate (in contrast to the actual audio bandwidth) can be chosen
- independently on the encoder and decoder side, e.g., a fullband signal can be
- decoded as wideband, or vice versa.
-This approach ensures a sender and receiver can always interoperate, regardless
- of the capabilities of their actual audio hardware.
-Internally, the LP layer always operates at a sample rate of twice the audio
- bandwidth, up to a maximum of 16&nbsp;kHz, which it continues to use for SWB
- and FB.
-The decoder simply resamples its output to support different sample rates.
-The MDCT layer always operates internally at a sample rate of 48&nbsp;kHz.
-Since all the supported sample rates evenly divide this rate, and since the
- the decoder may easily zero out the high frequency portion of the spectrum in
- the frequency domain, it can simply decimate the MDCT layer output to achieve
- the other supported sample rates very cheaply.
-</t>
-
-<t>
-After conversion to the common, desired output sample rate, the decoder simply
- adds the output from the two layers together.
-To compensate for the different look-ahead required by each layer, the CELT
- encoder input is delayed by an additional 2.7&nbsp;ms.
-This ensures that low frequencies and high frequencies arrive at the same time.
-This extra delay may be reduced by an encoder by using less look-ahead for noise
- shaping or using a simpler resampler in the LP layer, but this will reduce
- quality.
-However, the base 2.5&nbsp;ms look-ahead in the CELT layer cannot be reduced in
- the encoder because it is needed for the MDCT overlap, whose size is fixed by
- the decoder.
-</t>
-
-<t>
-Both layers use the same entropy coder, avoiding any waste from "padding bits"
- between them.
-The hybrid approach makes it easy to support both CBR and VBR coding.
-Although the LP layer is VBR, the bit allocation of the MDCT layer can produce
- a final stream that is CBR by using all the bits left unused by the LP layer.
-</t>
-
-<section title="Control Parameters">
-<t>
-The Opus codec includes a number of control parameters which can be changed dynamically during
-regular operation of the codec, without interrupting the audio stream from the encoder to the decoder.
-These parameters only affect the encoder since any impact they have on the bit-stream is signaled
-in-band such that a decoder can decode any Opus stream without any out-of-band signaling. Any Opus
-implementation can add or modify these control parameters without affecting interoperability. The most
-important encoder control parameters in the reference encoder are listed below.
-</t>
-
-<section title="Bitrate" toc="exlcude">
-<t>
-Opus supports all bitrates from 6&nbsp;kb/s to 510&nbsp;kb/s. All other parameters being
-equal, higher bitrate results in higher quality. For a frame size of 20&nbsp;ms, these
-are the bitrate "sweet spots" for Opus in various configurations:
-<list style="symbols">
-<t>8-12 kb/s for NB speech,</t>
-<t>16-20 kb/s for WB speech,</t>
-<t>28-40 kb/s for FB speech,</t>
-<t>48-64 kb/s for FB mono music, and</t>
-<t>64-128 kb/s for FB stereo music.</t>
-</list>
-</t>
-</section>
-
-<section title="Number of Channels (Mono/Stereo)" toc="exlcude">
-<t>
-Opus can transmit either mono or stereo frames within a single stream.
-When decoding a mono frame in a stereo decoder, the left and right channels are
- identical, and when decoding a stereo frame in a mono decoder, the mono output
- is the average of the left and right channels.
-In some cases, it is desirable to encode a stereo input stream in mono (e.g.,
- because the bitrate is too low to encode stereo with sufficient quality).
-The number of channels encoded can be selected in real-time, but by default the
- reference encoder attempts to make the best decision possible given the
- current bitrate.
-</t>
-</section>
-
-<section title="Audio Bandwidth" toc="exlcude">
-<t>
-The audio bandwidths supported by Opus are listed in
- <xref target="audio-bandwidth"/>.
-Just like for the number of channels, any decoder can decode audio encoded at
- any bandwidth.
-For example, any Opus decoder operating at 8&nbsp;kHz can decode a FB Opus
- frame, and any Opus decoder operating at 48&nbsp;kHz can decode a NB frame.
-Similarly, the reference encoder can take a 48&nbsp;kHz input signal and
- encode it as NB.
-The higher the audio bandwidth, the higher the required bitrate to achieve
- acceptable quality.
-The audio bandwidth can be explicitly specified in real-time, but by default
- the reference encoder attempts to make the best bandwidth decision possible
- given the current bitrate.
-</t>
-</section>
-
-
-<section title="Frame Duration" toc="exlcude">
-<t>
-Opus can encode frames of 2.5, 5, 10, 20, 40 or 60&nbsp;ms.
-It can also combine multiple frames into packets of up to 120&nbsp;ms.
-For real-time applications, sending fewer packets per second reduces the
- bitrate, since it reduces the overhead from IP, UDP, and RTP headers.
-However, it increases latency and sensitivity to packet losses, as losing one
- packet constitutes a loss of a bigger chunk of audio.
-Increasing the frame duration also slightly improves coding efficiency, but the
- gain becomes small for frame sizes above 20&nbsp;ms.
-For this reason, 20&nbsp;ms frames are a good choice for most applications.
-</t>
-</section>
-
-<section title="Complexity" toc="exlcude">
-<t>
-There are various aspects of the Opus encoding process where trade-offs
-can be made between CPU complexity and quality/bitrate. In the reference
-encoder, the complexity is selected using an integer from 0 to 10, where
-0 is the lowest complexity and 10 is the highest. Examples of
-computations for which such trade-offs may occur are:
-<list style="symbols">
-<t>The order of the pitch analysis whitening filter <xref target="Whitening"/>,</t>
-<t>The order of the short-term noise shaping filter,</t>
-<t>The number of states in delayed decision quantization of the
-residual signal, and</t>
-<t>The use of certain bit-stream features such as variable time-frequency
-resolution and the pitch post-filter.</t>
-</list>
-</t>
-</section>
-
-<section title="Packet Loss Resilience" toc="exlcude">
-<t>
-Audio codecs often exploit inter-frame correlations to reduce the
-bitrate at a cost in error propagation: after losing one packet
-several packets need to be received before the decoder is able to
-accurately reconstruct the speech signal.  The extent to which Opus
-exploits inter-frame dependencies can be adjusted on the fly to
-choose a trade-off between bitrate and amount of error propagation.
-</t>
-</section>
-
-<section title="Forward Error Correction (FEC)" toc="exlcude">
-<t>
-   Another mechanism providing robustness against packet loss is the in-band
-   Forward Error Correction (FEC).  Packets that are determined to
-   contain perceptually important speech information, such as onsets or
-   transients, are encoded again at a lower bitrate and this re-encoded
-   information is added to a subsequent packet.
-</t>
-</section>
-
-<section title="Constant/Variable Bitrate" toc="exlcude">
-<t>
-Opus is more efficient when operating with variable bitrate (VBR), which is
-the default. However, in some (rare) applications, constant bitrate (CBR)
-is required. There are two main reasons to operate in CBR mode:
-<list style="symbols">
-<t>When the transport only supports a fixed size for each compressed frame</t>
-<t>When encryption is used for an audio stream that is either highly constrained
-   (e.g. yes/no, recorded prompts) or highly sensitive <xref target="SRTP-VBR"></xref> </t>
-</list>
-
-When low-latency transmission is required over a relatively slow connection, then
-constrained VBR can also be used. This uses VBR in a way that simulates a
-"bit reservoir" and is equivalent to what MP3 (MPEG 1, Layer 3) and
-AAC (Advanced Audio Coding) call CBR (i.e., not true
-CBR due to the bit reservoir).
-</t>
-</section>
-
-<section title="Discontinuous Transmission (DTX)" toc="exlcude">
-<t>
-   Discontinuous Transmission (DTX) reduces the bitrate during silence
-   or background noise.  When DTX is enabled, only one frame is encoded
-   every 400 milliseconds.
-</t>
-</section>
-
-</section>
-
-</section>
-
-<section anchor="modes" title="Internal Framing">
-
-<t>
-The Opus encoder produces "packets", which are each a contiguous set of bytes
- meant to be transmitted as a single unit.
-The packets described here do not include such things as IP, UDP, or RTP
- headers which are normally found in a transport-layer packet.
-A single packet may contain multiple audio frames, so long as they share a
- common set of parameters, including the operating mode, audio bandwidth, frame
- size, and channel count (mono vs. stereo).
-This section describes the possible combinations of these parameters and the
- internal framing used to pack multiple frames into a single packet.
-This framing is not self-delimiting.
-Instead, it assumes that a higher layer (such as UDP or RTP <xref target='RFC3550'/>
-or Ogg <xref target='RFC3533'/> or Matroska <xref target='Matroska-website'/>)
- will communicate the length, in bytes, of the packet, and it uses this
- information to reduce the framing overhead in the packet itself.
-A decoder implementation MUST support the framing described in this section.
-An alternative, self-delimiting variant of the framing is described in
- <xref target="self-delimiting-framing"/>.
-Support for that variant is OPTIONAL.
-</t>
-
-<t>
-All bit diagrams in this document number the bits so that bit 0 is the most
- significant bit of the first byte, and bit 7 is the least significant.
-Bit 8 is thus the most significant bit of the second byte, etc.
-Well-formed Opus packets obey certain requirements, marked [R1] through [R7]
- below.
-These are summarized in <xref target="malformed-packets"/> along with
- appropriate means of handling malformed packets.
-</t>
-
-<section anchor="toc_byte" title="The TOC Byte">
-<t anchor="R1">
-A well-formed Opus packet MUST contain at least one byte&nbsp;[R1].
-This byte forms a table-of-contents (TOC) header that signals which of the
- various modes and configurations a given packet uses.
-It is composed of a configuration number, "config", a stereo flag, "s", and a
- frame count code, "c", arranged as illustrated in
- <xref target="toc_byte_fig"/>.
-A description of each of these fields follows.
-</t>
-
-<figure anchor="toc_byte_fig" title="The TOC Byte">
-<artwork align="center"><![CDATA[
- 0
- 0 1 2 3 4 5 6 7
-+-+-+-+-+-+-+-+-+
-| config  |s| c |
-+-+-+-+-+-+-+-+-+
-]]></artwork>
-</figure>
-
-<t>
-The top five bits of the TOC byte, labeled "config", encode one of 32 possible
- configurations of operating mode, audio bandwidth, and frame size.
-As described, the LP (SILK) layer and MDCT (CELT) layer can be combined in three possible
- operating modes:
-<list style="numbers">
-<t>A SILK-only mode for use in low bitrate connections with an audio bandwidth
- of WB or less,</t>
-<t>A Hybrid (SILK+CELT) mode for SWB or FB speech at medium bitrates, and</t>
-<t>A CELT-only mode for very low delay speech transmission as well as music
- transmission (NB to FB).</t>
-</list>
-The 32 possible configurations each identify which one of these operating modes
- the packet uses, as well as the audio bandwidth and the frame size.
-<xref target="config_bits"/> lists the parameters for each configuration.
-</t>
-<texttable anchor="config_bits" title="TOC Byte Configuration Parameters">
-<ttcol>Configuration Number(s)</ttcol>
-<ttcol>Mode</ttcol>
-<ttcol>Bandwidth</ttcol>
-<ttcol>Frame Sizes</ttcol>
-<c>0...3</c>   <c>SILK-only</c> <c>NB</c>  <c>10, 20, 40, 60&nbsp;ms</c>
-<c>4...7</c>   <c>SILK-only</c> <c>MB</c>  <c>10, 20, 40, 60&nbsp;ms</c>
-<c>8...11</c>  <c>SILK-only</c> <c>WB</c>  <c>10, 20, 40, 60&nbsp;ms</c>
-<c>12...13</c> <c>Hybrid</c>    <c>SWB</c> <c>10, 20&nbsp;ms</c>
-<c>14...15</c> <c>Hybrid</c>    <c>FB</c>  <c>10, 20&nbsp;ms</c>
-<c>16...19</c> <c>CELT-only</c> <c>NB</c>  <c>2.5, 5, 10, 20&nbsp;ms</c>
-<c>20...23</c> <c>CELT-only</c> <c>WB</c>  <c>2.5, 5, 10, 20&nbsp;ms</c>
-<c>24...27</c> <c>CELT-only</c> <c>SWB</c> <c>2.5, 5, 10, 20&nbsp;ms</c>
-<c>28...31</c> <c>CELT-only</c> <c>FB</c>  <c>2.5, 5, 10, 20&nbsp;ms</c>
-</texttable>
-<t>
-The configuration numbers in each range (e.g., 0...3 for NB SILK-only)
- correspond to the various choices of frame size, in the same order.
-For example, configuration 0 has a 10&nbsp;ms frame size and configuration 3
- has a 60&nbsp;ms frame size.
-</t>
-
-<t>
-One additional bit, labeled "s", signals mono vs. stereo, with 0 indicating
- mono and 1 indicating stereo.
-</t>
-
-<t>
-The remaining two bits of the TOC byte, labeled "c", code the number of frames
- per packet (codes 0 to 3) as follows:
-<list style="symbols">
-<t>0:    1 frame in the packet</t>
-<t>1:    2 frames in the packet, each with equal compressed size</t>
-<t>2:    2 frames in the packet, with different compressed sizes</t>
-<t>3:    an arbitrary number of frames in the packet</t>
-</list>
-This draft refers to a packet as a code 0 packet, code 1 packet, etc., based on
- the value of "c".
-</t>
-
-</section>
-
-<section title="Frame Packing">
-
-<t>
-This section describes how frames are packed according to each possible value
- of "c" in the TOC byte.
-</t>
-
-<section anchor="frame-length-coding" title="Frame Length Coding">
-<t>
-When a packet contains multiple VBR frames (i.e., code 2 or 3), the compressed
- length of one or more of these frames is indicated with a one- or two-byte
- sequence, with the meaning of the first byte as follows:
-<list style="symbols">
-<t>0:          No frame (discontinuous transmission (DTX) or lost packet)</t>
-<t>1...251:    Length of the frame in bytes</t>
-<t>252...255:  A second byte is needed. The total length is (second_byte*4)+first_byte</t>
-</list>
-</t>
-
-<t>
-The special length 0 indicates that no frame is available, either because it
- was dropped during transmission by some intermediary or because the encoder
- chose not to transmit it.
-Any Opus frame in any mode MAY have a length of 0.
-</t>
-
-<t>
-The maximum representable length is 255*4+255=1275&nbsp;bytes.
-For 20&nbsp;ms frames, this represents a bitrate of 510&nbsp;kb/s, which is
- approximately the highest useful rate for lossily compressed fullband stereo
- music.
-Beyond this point, lossless codecs are more appropriate.
-It is also roughly the maximum useful rate of the MDCT layer, as shortly
- thereafter quality no longer improves with additional bits due to limitations
- on the codebook sizes.
-</t>
-
-<t anchor="R2">
-No length is transmitted for the last frame in a VBR packet, or for any of the
- frames in a CBR packet, as it can be inferred from the total size of the
- packet and the size of all other data in the packet.
-However, the length of any individual frame MUST NOT exceed
- 1275&nbsp;bytes&nbsp;[R2], to allow for repacketization by gateways,
- conference bridges, or other software.
-</t>
-</section>
-
-<section title="Code 0: One Frame in the Packet">
-
-<t>
-For code&nbsp;0 packets, the TOC byte is immediately followed by N-1&nbsp;bytes
- of compressed data for a single frame (where N is the size of the packet),
- as illustrated in <xref target="code0_packet"/>.
-</t>
-<figure anchor="code0_packet" title="A Code 0 Packet" align="center">
-<artwork align="center"><![CDATA[
- 0                   1                   2                   3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-| config  |s|0|0|                                               |
-+-+-+-+-+-+-+-+-+                                               |
-|                    Compressed frame 1 (N-1 bytes)...          :
-:                                                               |
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-]]></artwork>
-</figure>
-</section>
-
-<section title="Code 1: Two Frames in the Packet, Each with Equal Compressed Size">
-<t anchor="R3">
-For code 1 packets, the TOC byte is immediately followed by the
- (N-1)/2&nbsp;bytes of compressed data for the first frame, followed by
- (N-1)/2&nbsp;bytes of compressed data for the second frame, as illustrated in
- <xref target="code1_packet"/>.
-The number of payload bytes available for compressed data, N-1, MUST be even
- for all code 1 packets&nbsp;[R3].
-</t>
-<figure anchor="code1_packet" title="A Code 1 Packet" align="center">
-<artwork align="center"><![CDATA[
- 0                   1                   2                   3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-| config  |s|0|1|                                               |
-+-+-+-+-+-+-+-+-+                                               :
-|             Compressed frame 1 ((N-1)/2 bytes)...             |
-:                               +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                               |                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+                               :
-|             Compressed frame 2 ((N-1)/2 bytes)...             |
-:                                               +-+-+-+-+-+-+-+-+
-|                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-]]></artwork>
-</figure>
-</section>
-
-<section title="Code 2: Two Frames in the Packet, with Different Compressed Sizes">
-<t anchor="R4">
-For code 2 packets, the TOC byte is followed by a one- or two-byte sequence
- indicating the length of the first frame (marked N1 in <xref target='code2_packet'/>),
- followed by N1 bytes of compressed data for the first frame.
-The remaining N-N1-2 or N-N1-3&nbsp;bytes are the compressed data for the
- second frame.
-This is illustrated in <xref target="code2_packet"/>.
-A code 2 packet MUST contain enough bytes to represent a valid length.
-For example, a 1-byte code 2 packet is always invalid, and a 2-byte code 2
- packet whose second byte is in the range 252...255 is also invalid.
-The length of the first frame, N1, MUST also be no larger than the size of the
- payload remaining after decoding that length for all code 2 packets&nbsp;[R4].
-This makes, for example, a 2-byte code 2 packet with a second byte in the range
- 1...251 invalid as well (the only valid 2-byte code 2 packet is one where the
- length of both frames is zero).
-</t>
-<figure anchor="code2_packet" title="A Code 2 Packet" align="center">
-<artwork align="center"><![CDATA[
- 0                   1                   2                   3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-| config  |s|1|0| N1 (1-2 bytes):                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+                               :
-|               Compressed frame 1 (N1 bytes)...                |
-:                               +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                               |                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+                               |
-|                     Compressed frame 2...                     :
-:                                                               |
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-]]></artwork>
-</figure>
-</section>
-
-<section title="Code 3: A Signaled Number of Frames in the Packet">
-<t anchor="R5">
-Code 3 packets signal the number of frames, as well as additional
- padding, called "Opus padding" to indicate that this padding is added at the
- Opus layer, rather than at the transport layer.
-Code 3 packets MUST have at least 2 bytes&nbsp;[R6,R7].
-The TOC byte is followed by a byte encoding the number of frames in the packet
- in bits 2 to 7 (marked "M" in <xref target='frame_count_byte'/>), with bit 1 indicating whether
- or not Opus padding is inserted (marked "p" in <xref target='frame_count_byte'/>), and bit 0
- indicating VBR (marked "v" in <xref target='frame_count_byte'/>).
-M MUST NOT be zero, and the audio duration contained within a packet MUST NOT
- exceed 120&nbsp;ms&nbsp;[R5].
-This limits the maximum frame count for any frame size to 48 (for 2.5&nbsp;ms
- frames), with lower limits for longer frame sizes.
-<xref target="frame_count_byte"/> illustrates the layout of the frame count
- byte.
-</t>
-<figure anchor="frame_count_byte" title="The frame count byte">
-<artwork align="center"><![CDATA[
- 0
- 0 1 2 3 4 5 6 7
-+-+-+-+-+-+-+-+-+
-|v|p|     M     |
-+-+-+-+-+-+-+-+-+
-]]></artwork>
-</figure>
-<t>
-When Opus padding is used, the number of bytes of padding is encoded in the
- bytes following the frame count byte.
-Values from 0...254 indicate that 0...254&nbsp;bytes of padding are included,
- in addition to the byte(s) used to indicate the size of the padding.
-If the value is 255, then the size of the additional padding is 254&nbsp;bytes,
- plus the padding value encoded in the next byte.
-There MUST be at least one more byte in the packet in this case&nbsp;[R6,R7].
-The additional padding bytes appear at the end of the packet, and MUST be set
- to zero by the encoder to avoid creating a covert channel.
-The decoder MUST accept any value for the padding bytes, however.
-</t>
-<t>
-Although this encoding provides multiple ways to indicate a given number of
- padding bytes, each uses a different number of bytes to indicate the padding
- size, and thus will increase the total packet size by a different amount.
-For example, to add 255 bytes to a packet, set the padding bit, p, to 1, insert
- a single byte after the frame count byte with a value of 254, and append 254
- padding bytes with the value zero to the end of the packet.
-To add 256 bytes to a packet, set the padding bit to 1, insert two bytes after
- the frame count byte with the values 255 and 0, respectively, and append 254
- padding bytes with the value zero to the end of the packet.
-By using the value 255 multiple times, it is possible to create a packet of any
- specific, desired size.
-Let P be the number of header bytes used to indicate the padding size plus the
- number of padding bytes themselves (i.e., P is the total number of bytes added
- to the packet).
-Then P MUST be no more than N-2&nbsp;[R6,R7].
-</t>
-<t anchor="R6">
-In the CBR case, let R=N-2-P be the number of bytes remaining in the packet
- after subtracting the (optional) padding.
-Then the compressed length of each frame in bytes is equal to R/M.
-The value R MUST be a non-negative integer multiple of M&nbsp;[R6].
-The compressed data for all M frames follows, each of size
- R/M&nbsp;bytes, as illustrated in <xref target="code3cbr_packet"/>.
-</t>
-
-<figure anchor="code3cbr_packet" title="A CBR Code 3 Packet" align="center">
-<artwork align="center"><![CDATA[
- 0                   1                   2                   3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-| config  |s|1|1|0|p|     M     |  Padding length (Optional)    :
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                                                               |
-:               Compressed frame 1 (R/M bytes)...               :
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                                                               |
-:               Compressed frame 2 (R/M bytes)...               :
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                                                               |
-:                              ...                              :
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                                                               |
-:               Compressed frame M (R/M bytes)...               :
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-:                  Opus Padding (Optional)...                   |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-]]></artwork>
-</figure>
-
-<t anchor="R7">
-In the VBR case, the (optional) padding length is followed by M-1 frame
- lengths (indicated by "N1" to "N[M-1]" in <xref target='code3vbr_packet'/>), each encoded in a
- one- or two-byte sequence as described above.
-The packet MUST contain enough data for the M-1 lengths after removing the
- (optional) padding, and the sum of these lengths MUST be no larger than the
- number of bytes remaining in the packet after decoding them&nbsp;[R7].
-The compressed data for all M frames follows, each frame consisting of the
- indicated number of bytes, with the final frame consuming any remaining bytes
- before the final padding, as illustrated in <xref target="code3cbr_packet"/>.
-The number of header bytes (TOC byte, frame count byte, padding length bytes,
- and frame length bytes), plus the signaled length of the first M-1 frames themselves,
- plus the signaled length of the padding MUST be no larger than N, the total size of the
- packet.
-</t>
-
-<figure anchor="code3vbr_packet" title="A VBR Code 3 Packet" align="center">
-<artwork align="center"><![CDATA[
- 0                   1                   2                   3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-| config  |s|1|1|1|p|     M     | Padding length (Optional)     :
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-: N1 (1-2 bytes): N2 (1-2 bytes):     ...       :     N[M-1]    |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                                                               |
-:               Compressed frame 1 (N1 bytes)...                :
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                                                               |
-:               Compressed frame 2 (N2 bytes)...                :
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                                                               |
-:                              ...                              :
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                                                               |
-:                     Compressed frame M...                     :
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-:                  Opus Padding (Optional)...                   |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-]]></artwork>
-</figure>
-</section>
-</section>
-
-<section anchor="examples" title="Examples">
-<t>
-Simplest case, one NB mono 20&nbsp;ms SILK frame:
-</t>
-
-<figure anchor='framing_example_1'>
-<artwork><![CDATA[
- 0                   1                   2                   3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|    1    |0|0|0|               compressed data...              :
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-]]></artwork>
-</figure>
-
-<t>
-Two FB mono 5&nbsp;ms CELT frames of the same compressed size:
-</t>
-
-<figure anchor='framing_example_2'>
-<artwork><![CDATA[
- 0                   1                   2                   3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|   29    |0|0|1|               compressed data...              :
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-]]></artwork>
-</figure>
-
-<t>
-Two FB mono 20&nbsp;ms Hybrid frames of different compressed size:
-</t>
-
-<figure anchor='framing_example_3'>
-<artwork><![CDATA[
- 0                   1                   2                   3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|   15    |0|1|1|1|0|     2     |      N1       |               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+               |
-|                       compressed data...                      :
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-]]></artwork>
-</figure>
-
-<t>
-Four FB stereo 20&nbsp;ms CELT frames of the same compressed size:
-</t>
-
-<figure anchor='framing_example_4'>
-<artwork><![CDATA[
- 0                   1                   2                   3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|   31    |1|1|1|0|0|     4     |      compressed data...       :
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-]]></artwork>
-</figure>
-</section>
-
-<section anchor="malformed-packets" title="Receiving Malformed Packets">
-<t>
-A receiver MUST NOT process packets which violate any of the rules above as
- normal Opus packets.
-They are reserved for future applications, such as in-band headers (containing
- metadata, etc.).
-Packets which violate these constraints may cause implementations of
- <spanx style="emph">this</spanx> specification to treat them as malformed, and
- discard them.
-</t>
-<t>
-These constraints are summarized here for reference:
-<list style="format [R%d]">
-<t>Packets are at least one byte.</t>
-<t>No implicit frame length is larger than 1275 bytes.</t>
-<t>Code 1 packets have an odd total length, N, so that (N-1)/2 is an
- integer.</t>
-<t>Code 2 packets have enough bytes after the TOC for a valid frame
- length, and that length is no larger than the number of bytes remaining in the
- packet.</t>
-<t>Code 3 packets contain at least one frame, but no more than 120&nbsp;ms
- of audio total.</t>
-<t>The length of a CBR code 3 packet, N, is at least two bytes, the number of
- bytes added to indicate the padding size plus the trailing padding bytes
- themselves, P, is no more than N-2, and the frame count, M, satisfies
- the constraint that (N-2-P) is a non-negative integer multiple of M.</t>
-<t>VBR code 3 packets are large enough to contain all the header bytes (TOC
- byte, frame count byte, any padding length bytes, and any frame length bytes),
- plus the length of the first M-1 frames, plus any trailing padding bytes.</t>
-</list>
-</t>
-</section>
-
-</section>
-
-<section title="Opus Decoder">
-<t>
-The Opus decoder consists of two main blocks: the SILK decoder and the CELT
- decoder.
-At any given time, one or both of the SILK and CELT decoders may be active.
-The output of the Opus decode is the sum of the outputs from the SILK and CELT
- decoders with proper sample rate conversion and delay compensation on the SILK
- side, and optional decimation (when decoding to sample rates less than
- 48&nbsp;kHz) on the CELT side, as illustrated in the block diagram below.
-</t>
-<figure>
-<artwork>
-<![CDATA[
-                         +---------+    +------------+
-                         |  SILK   |    |   Sample   |
-                      +->| Decoder |--->|    Rate    |----+
-Bit-    +---------+   |  |         |    | Conversion |    v
-stream  |  Range  |---+  +---------+    +------------+  /---\  Audio
-------->| Decoder |                                     | + |------>
-        |         |---+  +---------+    +------------+  \---/
-        +---------+   |  |  CELT   |    | Decimation |    ^
-                      +->| Decoder |--->| (Optional) |----+
-                         |         |    |            |
-                         +---------+    +------------+
-]]>
-</artwork>
-</figure>
-
-<section anchor="range-decoder" title="Range Decoder">
-<t>
-Opus uses an entropy coder based on range coding <xref target="range-coding"></xref>
-<xref target="Martin79"></xref>,
-which is itself a rediscovery of the FIFO arithmetic code introduced by <xref target="coding-thesis"></xref>.
-It is very similar to arithmetic encoding, except that encoding is done with
-digits in any base instead of with bits,
-so it is faster when using larger bases (i.e., a byte). All of the
-calculations in the range coder must use bit-exact integer arithmetic.
-</t>
-<t>
-Symbols may also be coded as "raw bits" packed directly into the bitstream,
- bypassing the range coder.
-These are packed backwards starting at the end of the frame, as illustrated in
- <xref target="rawbits-example"/>.
-This reduces complexity and makes the stream more resilient to bit errors, as
- corruption in the raw bits will not desynchronize the decoding process, unlike
- corruption in the input to the range decoder.
-Raw bits are only used in the CELT layer.
-</t>
-
-<figure anchor="rawbits-example" title="Illustrative example of packing range
- coder and raw bits data">
-<artwork align="center"><![CDATA[
- 0                   1                   2                   3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-| Range coder data (packed MSB to LSB) ->                       :
-+                                                               +
-:                                                               :
-+     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-:     | <- Boundary occurs at an arbitrary bit position         :
-+-+-+-+                                                         +
-:                          <- Raw bits data (packed LSB to MSB) |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-]]></artwork>
-</figure>
-
-<t>
-Each symbol coded by the range coder is drawn from a finite alphabet and coded
- in a separate "context", which describes the size of the alphabet and the
- relative frequency of each symbol in that alphabet.
-</t>
-<t>
-Suppose there is a context with n symbols, identified with an index that ranges
- from 0 to n-1.
-The parameters needed to encode or decode symbol k in this context are
- represented by a three-tuple (fl[k],&nbsp;fh[k],&nbsp;ft), with
- 0&nbsp;&lt;=&nbsp;fl[k]&nbsp;&lt;&nbsp;fh[k]&nbsp;&lt;=&nbsp;ft&nbsp;&lt;=&nbsp;65535.
-The values of this tuple are derived from the probability model for the
- symbol, represented by traditional "frequency counts".
-Because Opus uses static contexts these are not updated as symbols are decoded.
-Let f[i] be the frequency of symbol i.
-Then the three-tuple corresponding to symbol k is given by
-</t>
-<figure align="center">
-<artwork align="center"><![CDATA[
-        k-1                                   n-1
-        __                                    __
-fl[k] = \  f[i],  fh[k] = fl[k] + f[k],  ft = \  f[i]
-        /_                                    /_
-        i=0                                   i=0
-]]></artwork>
-</figure>
-<t>
-The range decoder extracts the symbols and integers encoded using the range
- encoder in <xref target="range-encoder"/>.
-The range decoder maintains an internal state vector composed of the two-tuple
- (val,&nbsp;rng), representing the difference between the high end of the
- current range and the actual coded value, minus one, and the size of the
- current range, respectively.
-Both val and rng are 32-bit unsigned integer values.
-</t>
-
-<section anchor="range-decoder-init" title="Range Decoder Initialization">
-<t>
-Let b0 be the first input byte (or zero if there are no bytes in this Opus
- frame).
-The decoder initializes rng to 128 and initializes val to
- (127&nbsp;-&nbsp;(b0&gt;&gt;1)), where (b0&gt;&gt;1) is the top 7 bits of the
- first input byte.
-It saves the remaining bit, (b0&amp;1), for use in the renormalization
- procedure described in <xref target="range-decoder-renorm"/>, which the
- decoder invokes immediately after initialization to read additional bits and
- establish the invariant that rng&nbsp;&gt;&nbsp;2**23.
-</t>
-</section>
-
-<section anchor="decoding-symbols" title="Decoding Symbols">
-<t>
-Decoding a symbol is a two-step process.
-The first step determines a 16-bit unsigned value fs, which lies within the
- range of some symbol in the current context.
-The second step updates the range decoder state with the three-tuple
- (fl[k],&nbsp;fh[k],&nbsp;ft) corresponding to that symbol.
-</t>
-<t>
-The first step is implemented by ec_decode() (entdec.c), which computes
-<figure align="center">
-<artwork align="center"><![CDATA[
-               val
-fs = ft - min(------ + 1, ft) .
-              rng/ft
-]]></artwork>
-</figure>
-The divisions here are integer division.
-</t>
-<t>
-The decoder then identifies the symbol in the current context corresponding to
- fs; i.e., the value of k whose three-tuple (fl[k],&nbsp;fh[k],&nbsp;ft)
- satisfies fl[k]&nbsp;&lt;=&nbsp;fs&nbsp;&lt;&nbsp;fh[k].
-It uses this tuple to update val according to
-<figure align="center">
-<artwork align="center"><![CDATA[
-            rng
-val = val - --- * (ft - fh[k]) .
-            ft
-]]></artwork>
-</figure>
-If fl[k] is greater than zero, then the decoder updates rng using
-<figure align="center">
-<artwork align="center"><![CDATA[
-      rng
-rng = --- * (fh[k] - fl[k]) .
-      ft
-]]></artwork>
-</figure>
-Otherwise, it updates rng using
-<figure align="center">
-<artwork align="center"><![CDATA[
-            rng
-rng = rng - --- * (ft - fh[k]) .
-            ft
-]]></artwork>
-</figure>
-</t>
-<t>
-Using a special case for the first symbol (rather than the last symbol, as is
- commonly done in other arithmetic coders) ensures that all the truncation
- error from the finite precision arithmetic accumulates in symbol 0.
-This makes the cost of coding a 0 slightly smaller, on average, than its
- estimated probability indicates and makes the cost of coding any other symbol
- slightly larger.
-When contexts are designed so that 0 is the most probable symbol, which is
- often the case, this strategy minimizes the inefficiency introduced by the
- finite precision.
-It also makes some of the special-case decoding routines in
- <xref target="decoding-alternate"/> particularly simple.
-</t>
-<t>
-After the updates, implemented by ec_dec_update() (entdec.c), the decoder
- normalizes the range using the procedure in the next section, and returns the
- index k.
-</t>
-
-<section anchor="range-decoder-renorm" title="Renormalization">
-<t>
-To normalize the range, the decoder repeats the following process, implemented
- by ec_dec_normalize() (entdec.c), until rng&nbsp;&gt;&nbsp;2**23.
-If rng is already greater than 2**23, the entire process is skipped.
-First, it sets rng to (rng&lt;&lt;8).
-Then it reads the next byte of the Opus frame and forms an 8-bit value sym,
- using the left-over bit buffered from the previous byte as the high bit
- and the top 7 bits of the byte just read as the other 7 bits of sym.
-The remaining bit in the byte just read is buffered for use in the next
- iteration.
-If no more input bytes remain, it uses zero bits instead.
-See <xref target="range-decoder-init"/> for the initialization used to process
- the first byte.
-Then, it sets
-<figure align="center">
-<artwork align="center"><![CDATA[
-val = ((val<<8) + (255-sym)) & 0x7FFFFFFF .
-]]></artwork>
-</figure>
-</t>
-<t>
-It is normal and expected that the range decoder will read several bytes
- into the raw bits data (if any) at the end of the packet by the time the frame
- is completely decoded, as illustrated in <xref target="finalize-example"/>.
-This same data MUST also be returned as raw bits when requested.
-The encoder is expected to terminate the stream in such a way that the decoder
- will decode the intended values regardless of the data contained in the raw
- bits.
-<xref target="encoder-finalizing"/> describes a procedure for doing this.
-If the range decoder consumes all of the bytes belonging to the current frame,
- it MUST continue to use zero when any further input bytes are required, even
- if there is additional data in the current packet from padding or other
- frames.
-</t>
-
-<figure anchor="finalize-example" title="Illustrative example of raw bits
- overlapping range coder data">
-<artwork align="center"><![CDATA[
- n              n+1             n+2             n+3
- 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-:     | <----------- Overlap region ------------> |             :
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-      ^                                           ^
-      |   End of data buffered by the range coder |
-...-----------------------------------------------+
-      |
-      | End of data consumed by raw bits
-      +-------------------------------------------------------...
-]]></artwork>
-</figure>
-</section>
-</section>
-
-<section anchor="decoding-alternate" title="Alternate Decoding Methods">
-<t>
-The reference implementation uses three additional decoding methods that are
- exactly equivalent to the above, but make assumptions and simplifications that
- allow for a more efficient implementation.
-</t>
-<section anchor="ec_decode_bin" title="ec_decode_bin()">
-<t>
-The first is ec_decode_bin() (entdec.c), defined using the parameter ftb
- instead of ft.
-It is mathematically equivalent to calling ec_decode() with
- ft&nbsp;=&nbsp;(1&lt;&lt;ftb), but avoids one of the divisions.
-</t>
-</section>
-<section anchor="ec_dec_bit_logp" title="ec_dec_bit_logp()">
-<t>
-The next is ec_dec_bit_logp() (entdec.c), which decodes a single binary symbol,
- replacing both the ec_decode() and ec_dec_update() steps.
-The context is described by a single parameter, logp, which is the absolute
- value of the base-2 logarithm of the probability of a "1".
-It is mathematically equivalent to calling ec_decode() with
- ft&nbsp;=&nbsp;(1&lt;&lt;logp), followed by ec_dec_update() with
- the 3-tuple (fl[k]&nbsp;=&nbsp;0,
- fh[k]&nbsp;=&nbsp;(1&lt;&lt;logp)&nbsp;-&nbsp;1,
- ft&nbsp;=&nbsp;(1&lt;&lt;logp)) if the returned value
- of fs is less than (1&lt;&lt;logp)&nbsp;-&nbsp;1 (a "0" was decoded), and with
- (fl[k]&nbsp;=&nbsp;(1&lt;&lt;logp)&nbsp;-&nbsp;1,
- fh[k]&nbsp;=&nbsp;ft&nbsp;=&nbsp;(1&lt;&lt;logp)) otherwise (a "1" was
- decoded).
-The implementation requires no multiplications or divisions.
-</t>
-</section>
-<section anchor="ec_dec_icdf" title="ec_dec_icdf()">
-<t>
-The last is ec_dec_icdf() (entdec.c), which decodes a single symbol with a
- table-based context of up to 8 bits, also replacing both the ec_decode() and
- ec_dec_update() steps, as well as the search for the decoded symbol in between.
-The context is described by two parameters, an icdf
- ("inverse" cumulative distribution function) table and ftb.
-As with ec_decode_bin(), (1&lt;&lt;ftb) is equivalent to ft.
-idcf[k], on the other hand, stores (1&lt;&lt;ftb)-fh[k], which is equal to
- (1&lt;&lt;ftb)&nbsp;-&nbsp;fl[k+1].
-fl[0] is assumed to be 0, and the table is terminated by a value of 0 (where
- fh[k]&nbsp;==&nbsp;ft).
-</t>
-<t>
-The function is mathematically equivalent to calling ec_decode() with
- ft&nbsp;=&nbsp;(1&lt;&lt;ftb), using the returned value fs to search the table
- for the first entry where fs&nbsp;&lt;&nbsp;(1&lt;&lt;ftb)-icdf[k], and
- calling ec_dec_update() with
- fl[k]&nbsp;=&nbsp;(1&lt;&lt;ftb)&nbsp;-&nbsp;icdf[k-1] (or 0
- if k&nbsp;==&nbsp;0), fh[k]&nbsp;=&nbsp;(1&lt;&lt;ftb)&nbsp;-&nbsp;idcf[k],
- and ft&nbsp;=&nbsp;(1&lt;&lt;ftb).
-Combining the search with the update allows the division to be replaced by a
- series of multiplications (which are usually much cheaper), and using an
- inverse CDF allows the use of an ftb as large as 8 in an 8-bit table without
- any special cases.
-This is the primary interface with the range decoder in the SILK layer, though
- it is used in a few places in the CELT layer as well.
-</t>
-<t>
-Although icdf[k] is more convenient for the code, the frequency counts, f[k],
- are a more natural representation of the probability distribution function
- (PDF) for a given symbol.
-Therefore this draft lists the latter, not the former, when describing the
- context in which a symbol is coded as a list, e.g., {4, 4, 4, 4}/16 for a
- uniform context with four possible values and ft&nbsp;=&nbsp;16.
-The value of ft after the slash is always the sum of the entries in the PDF,
- but is included for convenience.
-Contexts with identical probabilities, f[k]/ft, but different values of ft
- (or equivalently, ftb) are not the same, and cannot, in general, be used in
- place of one another.
-An icdf table is also not capable of representing a PDF where the first symbol
- has 0 probability.
-In such contexts, ec_dec_icdf() can decode the symbol by using a table that
- drops the entries for any initial zero-probability values and adding the
- constant offset of the first value with a non-zero probability to its return
- value.
-</t>
-</section>
-</section>
-
-<section anchor="decoding-bits" title="Decoding Raw Bits">
-<t>
-The raw bits used by the CELT layer are packed at the end of the packet, with
- the least significant bit of the first value packed in the least significant
- bit of the last byte, filling up to the most significant bit in the last byte,
- continuing on to the least significant bit of the penultimate byte, and so on.
-The reference implementation reads them using ec_dec_bits() (entdec.c).
-Because the range decoder must read several bytes ahead in the stream, as
- described in <xref target="range-decoder-renorm"/>, the input consumed by the
- raw bits may overlap with the input consumed by the range coder, and a decoder
- MUST allow this.
-The format should render it impossible to attempt to read more raw bits than
- there are actual bits in the frame, though a decoder may wish to check for
- this and report an error.
-</t>
-</section>
-
-<section anchor="ec_dec_uint" title="Decoding Uniformly Distributed Integers">
-<t>
-The function ec_dec_uint() (entdec.c) decodes one of ft equiprobable values in
- the range 0 to (ft&nbsp;-&nbsp;1), inclusive, each with a frequency of 1,
- where ft may be as large as (2**32&nbsp;-&nbsp;1).
-Because ec_decode() is limited to a total frequency of (2**16&nbsp;-&nbsp;1),
- it splits up the value into a range coded symbol representing up to 8 of the
- high bits, and, if necessary, raw bits representing the remainder of the
- value.
-The limit of 8 bits in the range coded symbol is a trade-off between
- implementation complexity, modeling error (since the symbols no longer truly
- have equal coding cost), and rounding error introduced by the range coder
- itself (which gets larger as more bits are included).
-Using raw bits reduces the maximum number of divisions required in the worst
- case, but means that it may be possible to decode a value outside the range
- 0 to (ft&nbsp;-&nbsp;1), inclusive.
-</t>
-
-<t>
-ec_dec_uint() takes a single, positive parameter, ft, which is not necessarily
- a power of two, and returns an integer, t, whose value lies between 0 and
- (ft&nbsp;-&nbsp;1), inclusive.
-Let ftb&nbsp;=&nbsp;ilog(ft&nbsp;-&nbsp;1), i.e., the number of bits required
- to store (ft&nbsp;-&nbsp;1) in two's complement notation.
-If ftb is 8 or less, then t is decoded with t&nbsp;=&nbsp;ec_decode(ft), and
- the range coder state is updated using the three-tuple (t, t&nbsp;+&nbsp;1,
- ft).
-</t>
-<t>
-If ftb is greater than 8, then the top 8 bits of t are decoded using
-<figure align="center">
-<artwork align="center"><![CDATA[
-t = ec_decode(((ft - 1) >> (ftb - 8)) + 1) ,
-]]></artwork>
-</figure>
- the decoder state is updated using the three-tuple
- (t, t&nbsp;+&nbsp;1,
- ((ft&nbsp;-&nbsp;1)&nbsp;&gt;&gt;&nbsp;(ftb&nbsp;-&nbsp;8))&nbsp;+&nbsp;1),
- and the remaining bits are decoded as raw bits, setting
-<figure align="center">
-<artwork align="center"><![CDATA[
-t = (t << (ftb - 8)) | ec_dec_bits(ftb - 8) .
-]]></artwork>
-</figure>
-If, at this point, t >= ft, then the current frame is corrupt.
-In that case, the decoder should assume there has been an error in the coding,
- decoding, or transmission and SHOULD take measures to conceal the
- error and/or report to the application that the error has occurred.
-</t>
-
-</section>
-
-<section anchor="decoder-tell" title="Current Bit Usage">
-<t>
-The bit allocation routines in the CELT decoder need a conservative upper bound
- on the number of bits that have been used from the current frame thus far,
- including both range coder bits and raw bits.
-This drives allocation decisions that must match those made in the encoder.
-The upper bound is computed in the reference implementation to whole-bit
- precision by the function ec_tell() (entcode.h) and to fractional 1/8th bit
- precision by the function ec_tell_frac() (entcode.c).
-Like all operations in the range coder, it must be implemented in a bit-exact
- manner, and must produce exactly the same value returned by the same functions
- in the encoder after encoding the same symbols.
-</t>
-<t>
-ec_tell() is guaranteed to return ceil(ec_tell_frac()/8.0).
-In various places the codec will check to ensure there is enough room to
- contain a symbol before attempting to decode it.
-In practice, although the number of bits used so far is an upper bound,
- decoding a symbol whose probability model suggests it has a worst-case cost of
- p 1/8th bits may actually advance the return value of ec_tell_frac() by
- p-1, p, or p+1 1/8th bits, due to approximation error in that upper bound,
- truncation error in the range coder, and for large values of ft, modeling
- error in ec_dec_uint().
-</t>
-<t>
-However, this error is bounded, and periodic calls to ec_tell() or
- ec_tell_frac() at precisely defined points in the decoding process prevent it
- from accumulating.
-For a range coder symbol that requires a whole number of bits (i.e.,
- for which ft/(fh[k]&nbsp;-&nbsp;fl[k]) is a power of two), where there are at
- least p 1/8th bits available, decoding the symbol will never cause ec_tell() or
- ec_tell_frac() to exceed the size of the frame ("bust the budget").
-In this case the return value of ec_tell_frac() will only advance by more than
- p 1/8th bits if there was an additional, fractional number of bits remaining,
- and it will never advance beyond the next whole-bit boundary, which is safe,
- since frames always contain a whole number of bits.
-However, when p is not a whole number of bits, an extra 1/8th bit is required
- to ensure that decoding the symbol will not bust the budget.
-</t>
-<t>
-The reference implementation keeps track of the total number of whole bits that
- have been processed by the decoder so far in the variable nbits_total,
- including the (possibly fractional) number of bits that are currently
- buffered, but not consumed, inside the range coder.
-nbits_total is initialized to 9 just before the initial range renormalization
- process completes (or equivalently, it can be initialized to 33 after the
- first renormalization).
-The extra two bits over the actual amount buffered by the range coder
- guarantees that it is an upper bound and that there is enough room for the
- encoder to terminate the stream.
-Each iteration through the range coder's renormalization loop increases
- nbits_total by 8.
-Reading raw bits increases nbits_total by the number of raw bits read.
-</t>
-
-<section anchor="ec_tell" title="ec_tell()">
-<t>
-The whole number of bits buffered in rng may be estimated via lg = ilog(rng).
-ec_tell() then becomes a simple matter of removing these bits from the total.
-It returns (nbits_total - lg).
-</t>
-<t>
-In a newly initialized decoder, before any symbols have been read, this reports
- that 1 bit has been used.
-This is the bit reserved for termination of the encoder.
-</t>
-</section>
-
-<section anchor="ec_tell_frac" title="ec_tell_frac()">
-<t>
-ec_tell_frac() estimates the number of bits buffered in rng to fractional
- precision.
-Since rng must be greater than 2**23 after renormalization, lg must be at least
- 24.
-Let
-<figure align="center">
-<artwork align="center">
-<![CDATA[
-r_Q15 = rng >> (lg-16) ,
-]]></artwork>
-</figure>
- so that 32768 &lt;= r_Q15 &lt; 65536, an unsigned Q15 value representing the
- fractional part of rng.
-Then the following procedure can be used to add one bit of precision to lg.
-First, update
-<figure align="center">
-<artwork align="center">
-<![CDATA[
-r_Q15 = (r_Q15*r_Q15) >> 15 .
-]]></artwork>
-</figure>
-Then add the 16th bit of r_Q15 to lg via
-<figure align="center">
-<artwork align="center">
-<![CDATA[
-lg = 2*lg + (r_Q15 >> 16) .
-]]></artwork>
-</figure>
-Finally, if this bit was a 1, reduce r_Q15 by a factor of two via
-<figure align="center">
-<artwork align="center">
-<![CDATA[
-r_Q15 = r_Q15 >> 1 ,
-]]></artwork>
-</figure>
- so that it once again lies in the range 32768 &lt;= r_Q15 &lt; 65536.
-</t>
-<t>
-This procedure is repeated three times to extend lg to 1/8th bit precision.
-ec_tell_frac() then returns (nbits_total*8 - lg).
-</t>
-</section>
-
-</section>
-
-</section>
-
-<section anchor="silk_decoder_outline" title="SILK Decoder">
-<t>
-The decoder's LP layer uses a modified version of the SILK codec (herein simply
- called "SILK"), which runs a decoded excitation signal through adaptive
- long-term and short-term prediction synthesis filters.
-It runs at NB, MB, and WB sample rates internally.
-When used in a SWB or FB Hybrid frame, the LP layer itself still only runs in
- WB.
-</t>
-
-<section title="SILK Decoder Modules">
-<t>
-An overview of the decoder is given in <xref target="silk_decoder_figure"/>.
-</t>
-<figure align="center" anchor="silk_decoder_figure" title="SILK Decoder">
-<artwork align="center">
-<![CDATA[
-   +---------+    +------------+
--->| Range   |--->| Decode     |---------------------------+
- 1 | Decoder | 2  | Parameters |----------+       5        |
-   +---------+    +------------+     4    |                |
-                       3 |                |                |
-                        \/               \/               \/
-                  +------------+   +------------+   +------------+
-                  | Generate   |-->| LTP        |-->| LPC        |
-                  | Excitation |   | Synthesis  |   | Synthesis  |
-                  +------------+   +------------+   +------------+
-                                          ^                |
-                                          |                |
-                      +-------------------+----------------+
-                      |                                      6
-                      |   +------------+   +-------------+
-                      +-->| Stereo     |-->| Sample Rate |-->
-                          | Unmixing   | 7 | Conversion  | 8
-                          +------------+   +-------------+
-
-1: Range encoded bitstream
-2: Coded parameters
-3: Pulses, LSBs, and signs
-4: Pitch lags, Long-Term Prediction (LTP) coefficients
-5: Linear Predictive Coding (LPC) coefficients and gains
-6: Decoded signal (mono or mid-side stereo)
-7: Unmixed signal (mono or left-right stereo)
-8: Resampled signal
-]]>
-</artwork>
-</figure>
-
-<t>
-The decoder feeds the bitstream (1) to the range decoder from
- <xref target="range-decoder"/>, and then decodes the parameters in it (2)
- using the procedures detailed in
- Sections&nbsp;<xref format="counter" target="silk_header_bits"/>
- through&nbsp;<xref format="counter" target="silk_signs"/>.
-These parameters (3, 4, 5) are used to generate an excitation signal (see
- <xref target="silk_excitation_reconstruction"/>), which is fed to an optional
- long-term prediction (LTP) filter (voiced frames only, see
- <xref target="silk_ltp_synthesis"/>) and then a short-term prediction filter
- (see <xref target="silk_lpc_synthesis"/>), producing the decoded signal (6).
-For stereo streams, the mid-side representation is converted to separate left
- and right channels (7).
-The result is finally resampled to the desired output sample rate (e.g.,
- 48&nbsp;kHz) so that the resampled signal (8) can be mixed with the CELT
- layer.
-</t>
-
-</section>
-
-<section anchor="silk_layer_organization" title="LP Layer Organization">
-
-<t>
-Internally, the LP layer of a single Opus frame is composed of either a single
- 10&nbsp;ms regular SILK frame or between one and three 20&nbsp;ms regular SILK
- frames.
-A stereo Opus frame may double the number of regular SILK frames (up to a total
- of six), since it includes separate frames for a mid channel and, optionally,
- a side channel.
-Optional Low Bit-Rate Redundancy (LBRR) frames, which are reduced-bitrate
- encodings of previous SILK frames, may be included to aid in recovery from
- packet loss.
-If present, these appear before the regular SILK frames.
-They are in most respects identical to regular, active SILK frames, except that
- they are usually encoded with a lower bitrate.
-This draft uses "SILK frame" to refer to either one and "regular SILK frame" if
- it needs to draw a distinction between the two.
-</t>
-<t>
-Logically, each SILK frame is in turn composed of either two or four 5&nbsp;ms
- subframes.
-Various parameters, such as the quantization gain of the excitation and the
- pitch lag and filter coefficients can vary on a subframe-by-subframe basis.
-Physically, the parameters for each subframe are interleaved in the bitstream,
- as described in the relevant sections for each parameter.
-</t>
-<t>
-All of these frames and subframes are decoded from the same range coder, with
- no padding between them.
-Thus packing multiple SILK frames in a single Opus frame saves, on average,
- half a byte per SILK frame.
-It also allows some parameters to be predicted from prior SILK frames in the
- same Opus frame, since this does not degrade packet loss robustness (beyond
- any penalty for merely using fewer, larger packets to store multiple frames).
-</t>
-
-<t>
-Stereo support in SILK uses a variant of mid-side coding, allowing a mono
- decoder to simply decode the mid channel.
-However, the data for the two channels is interleaved, so a mono decoder must
- still unpack the data for the side channel.
-It would be required to do so anyway for Hybrid Opus frames, or to support
- decoding individual 20&nbsp;ms frames.
-</t>
-
-<t>
-<xref target="silk_symbols"/> summarizes the overall grouping of the contents of
- the LP layer.
-Figures&nbsp;<xref format="counter" target="silk_mono_60ms_frame"/>
- and&nbsp;<xref format="counter" target="silk_stereo_60ms_frame"/> illustrate
- the ordering of the various SILK frames for a 60&nbsp;ms Opus frame, for both
- mono and stereo, respectively.
-</t>
-
-<texttable anchor="silk_symbols"
- title="Organization of the SILK layer of an Opus frame">
-<ttcol align="center">Symbol(s)</ttcol>
-<ttcol align="center">PDF(s)</ttcol>
-<ttcol align="center">Condition</ttcol>
-
-<c>Voice Activity Detection (VAD) flags</c>
-<c>{1, 1}/2</c>
-<c/>
-
-<c>LBRR flag</c>
-<c>{1, 1}/2</c>
-<c/>
-
-<c>Per-frame LBRR flags</c>
-<c><xref target="silk_lbrr_flag_pdfs"/></c>
-<c><xref target="silk_lbrr_flags"/></c>
-
-<c>LBRR Frame(s)</c>
-<c><xref target="silk_frame"/></c>
-<c><xref target="silk_lbrr_flags"/></c>
-
-<c>Regular SILK Frame(s)</c>
-<c><xref target="silk_frame"/></c>
-<c/>
-
-</texttable>
-
-<figure align="center" anchor="silk_mono_60ms_frame"
- title="A 60&nbsp;ms Mono Frame">
-<artwork align="center"><![CDATA[
-+---------------------------------+
-|            VAD Flags            |
-+---------------------------------+
-|            LBRR Flag            |
-+---------------------------------+
-| Per-Frame LBRR Flags (Optional) |
-+---------------------------------+
-|     LBRR Frame 1 (Optional)     |
-+---------------------------------+
-|     LBRR Frame 2 (Optional)     |
-+---------------------------------+
-|     LBRR Frame 3 (Optional)     |
-+---------------------------------+
-|      Regular SILK Frame 1       |
-+---------------------------------+
-|      Regular SILK Frame 2       |
-+---------------------------------+
-|      Regular SILK Frame 3       |
-+---------------------------------+
-]]></artwork>
-</figure>
-
-<figure align="center" anchor="silk_stereo_60ms_frame"
- title="A 60&nbsp;ms Stereo Frame">
-<artwork align="center"><![CDATA[
-+---------------------------------------+
-|             Mid VAD Flags             |
-+---------------------------------------+
-|             Mid LBRR Flag             |
-+---------------------------------------+
-|             Side VAD Flags            |
-+---------------------------------------+
-|             Side LBRR Flag            |
-+---------------------------------------+
-|  Mid Per-Frame LBRR Flags (Optional)  |
-+---------------------------------------+
-| Side Per-Frame LBRR Flags (Optional)  |
-+---------------------------------------+
-|     Mid LBRR Frame 1 (Optional)       |
-+---------------------------------------+
-|     Side LBRR Frame 1 (Optional)      |
-+---------------------------------------+
-|     Mid LBRR Frame 2 (Optional)       |
-+---------------------------------------+
-|     Side LBRR Frame 2 (Optional)      |
-+---------------------------------------+
-|     Mid LBRR Frame 3 (Optional)       |
-+---------------------------------------+
-|     Side LBRR Frame 3 (Optional)      |
-+---------------------------------------+
-|      Mid Regular SILK Frame 1         |
-+---------------------------------------+
-| Side Regular SILK Frame 1 (Optional)  |
-+---------------------------------------+
-|      Mid Regular SILK Frame 2         |
-+---------------------------------------+
-| Side Regular SILK Frame 2 (Optional)  |
-+---------------------------------------+
-|      Mid Regular SILK Frame 3         |
-+---------------------------------------+
-| Side Regular SILK Frame 3 (Optional)  |
-+---------------------------------------+
-]]></artwork>
-</figure>
-
-</section>
-
-<section anchor="silk_header_bits" title="Header Bits">
-<t>
-The LP layer begins with two to eight header bits, decoded in silk_Decode()
- (dec_API.c).
-These consist of one Voice Activity Detection (VAD) bit per frame (up to 3),
- followed by a single flag indicating the presence of LBRR frames.
-For a stereo packet, these first flags correspond to the mid channel, and a
- second set of flags is included for the side channel.
-</t>
-<t>
-Because these are the first symbols decoded by the range coder and because they
- are coded as binary values with uniform probability, they can be extracted
- directly from the most significant bits of the first byte of compressed data.
-Thus, a receiver can determine if an Opus frame contains any active SILK frames
- without the overhead of using the range decoder.
-</t>
-</section>
-
-<section anchor="silk_lbrr_flags" title="Per-Frame LBRR Flags">
-<t>
-For Opus frames longer than 20&nbsp;ms, a set of LBRR flags is
- decoded for each channel that has its LBRR flag set.
-Each set contains one flag per 20&nbsp;ms SILK frame.
-40&nbsp;ms Opus frames use the 2-frame LBRR flag PDF from
- <xref target="silk_lbrr_flag_pdfs"/>, and 60&nbsp;ms Opus frames use the
- 3-frame LBRR flag PDF.
-For each channel, the resulting 2- or 3-bit integer contains the corresponding
- LBRR flag for each frame, packed in order from the LSB to the MSB.
-</t>
-
-<texttable anchor="silk_lbrr_flag_pdfs" title="LBRR Flag PDFs">
-<ttcol>Frame Size</ttcol>
-<ttcol>PDF</ttcol>
-<c>40&nbsp;ms</c> <c>{0, 53, 53, 150}/256</c>
-<c>60&nbsp;ms</c> <c>{0, 41, 20, 29, 41, 15, 28, 82}/256</c>
-</texttable>
-
-<t>
-A 10&nbsp;or 20&nbsp;ms Opus frame does not contain any per-frame LBRR flags,
- as there may be at most one LBRR frame per channel.
-The global LBRR flag in the header bits (see <xref target="silk_header_bits"/>)
- is already sufficient to indicate the presence of that single LBRR frame.
-</t>
-
-</section>
-
-<section anchor="silk_lbrr_frames" title="LBRR Frames">
-<t>
-The LBRR frames, if present, contain an encoded representation of the signal
- immediately prior to the current Opus frame as if it were encoded with the
- current mode, frame size, audio bandwidth, and channel count, even if those
- differ from the prior Opus frame.
-When one of these parameters changes from one Opus frame to the next, this
- implies that the LBRR frames of the current Opus frame may not be simple
- drop-in replacements for the contents of the previous Opus frame.
-</t>
-
-<t>
-For example, when switching from 20&nbsp;ms to 60&nbsp;ms, the 60&nbsp;ms Opus
- frame may contain LBRR frames covering up to three prior 20&nbsp;ms Opus
- frames, even if those frames already contained LBRR frames covering some of
- the same time periods.
-When switching from 20&nbsp;ms to 10&nbsp;ms, the 10&nbsp;ms Opus frame can
- contain an LBRR frame covering at most half the prior 20&nbsp;ms Opus frame,
- potentially leaving a hole that needs to be concealed from even a single
- packet loss (see <xref target="Packet Loss Concealment"/>).
-When switching from mono to stereo, the LBRR frames in the first stereo Opus
- frame MAY contain a non-trivial side channel.
-</t>
-
-<t>
-In order to properly produce LBRR frames under all conditions, an encoder might
- need to buffer up to 60&nbsp;ms of audio and re-encode it during these
- transitions.
-However, the reference implementation opts to disable LBRR frames at the
- transition point for simplicity.
-Since transitions are relatively infrequent in normal usage, this does not have
- a significant impact on packet loss robustness.
-</t>
-
-<t>
-The LBRR frames immediately follow the LBRR flags, prior to any regular SILK
- frames.
-<xref target="silk_frame"/> describes their exact contents.
-LBRR frames do not include their own separate VAD flags.
-LBRR frames are only meant to be transmitted for active speech, thus all LBRR
- frames are treated as active.
-</t>
-
-<t>
-In a stereo Opus frame longer than 20&nbsp;ms, although the per-frame LBRR
- flags for the mid channel are coded as a unit before the per-frame LBRR flags
- for the side channel, the LBRR frames themselves are interleaved.
-The decoder parses an LBRR frame for the mid channel of a given 20&nbsp;ms
- interval (if present) and then immediately parses the corresponding LBRR
- frame for the side channel (if present), before proceeding to the next
- 20&nbsp;ms interval.
-</t>
-</section>
-
-<section anchor="silk_regular_frames" title="Regular SILK Frames">
-<t>
-The regular SILK frame(s) follow the LBRR frames (if any).
-<xref target="silk_frame"/> describes their contents, as well.
-Unlike the LBRR frames, a regular SILK frame is coded for each time interval in
- an Opus frame, even if the corresponding VAD flags are unset.
-For stereo Opus frames longer than 20&nbsp;ms, the regular mid and side SILK
- frames for each 20&nbsp;ms interval are interleaved, just as with the LBRR
- frames.
-The side frame may be skipped by coding an appropriate flag, as detailed in
- <xref target="silk_mid_only_flag"/>.
-</t>
-</section>
-
-<section anchor="silk_frame" title="SILK Frame Contents">
-<t>
-Each SILK frame includes a set of side information that encodes
-<list style="symbols">
-<t>The frame type and quantization type (<xref target="silk_frame_type"/>),</t>
-<t>Quantization gains (<xref target="silk_gains"/>),</t>
-<t>Short-term prediction filter coefficients (<xref target="silk_nlsfs"/>),</t>
-<t>A Line Spectral Frequencies (LSF) interpolation weight (<xref target="silk_nlsf_interpolation"/>),</t>
-<t>
-Long-term prediction filter lags and gains (<xref target="silk_ltp_params"/>),
- and
-</t>
-<t>A linear congruential generator (LCG) seed (<xref target="silk_seed"/>).</t>
-</list>
-The quantized excitation signal (see <xref target="silk_excitation"/>) follows
- these at the end of the frame.
-<xref target="silk_frame_symbols"/> details the overall organization of a
- SILK frame.
-</t>
-
-<texttable anchor="silk_frame_symbols"
- title="Order of the symbols in an individual SILK frame">
-<ttcol align="center">Symbol(s)</ttcol>
-<ttcol align="center">PDF(s)</ttcol>
-<ttcol align="center">Condition</ttcol>
-
-<c>Stereo Prediction Weights</c>
-<c><xref target="silk_stereo_pred_pdfs"/></c>
-<c><xref target="silk_stereo_pred"/></c>
-
-<c>Mid-only Flag</c>
-<c><xref target="silk_mid_only_pdf"/></c>
-<c><xref target="silk_mid_only_flag"/></c>
-
-<c>Frame Type</c>
-<c><xref target="silk_frame_type"/></c>
-<c/>
-
-<c>Subframe Gains</c>
-<c><xref target="silk_gains"/></c>
-<c/>
-
-<c>Normalized LSF Stage-1 Index</c>
-<c><xref target="silk_nlsf_stage1_pdfs"/></c>
-<c/>
-
-<c>Normalized LSF Stage-2 Residual</c>
-<c><xref target="silk_nlsf_stage2"/></c>
-<c/>
-
-<c>Normalized LSF Interpolation Weight</c>
-<c><xref target="silk_nlsf_interp_pdf"/></c>
-<c>20&nbsp;ms frame</c>
-
-<c>Primary Pitch Lag</c>
-<c><xref target="silk_ltp_lags"/></c>
-<c>Voiced frame</c>
-
-<c>Subframe Pitch Contour</c>
-<c><xref target="silk_pitch_contour_pdfs"/></c>
-<c>Voiced frame</c>
-
-<c>Periodicity Index</c>
-<c><xref target="silk_perindex_pdf"/></c>
-<c>Voiced frame</c>
-
-<c>LTP Filter</c>
-<c><xref target="silk_ltp_filter_pdfs"/></c>
-<c>Voiced frame</c>
-
-<c>LTP Scaling</c>
-<c><xref target="silk_ltp_scaling_pdf"/></c>
-<c><xref target="silk_ltp_scaling"/></c>
-
-<c>LCG Seed</c>
-<c><xref target="silk_seed_pdf"/></c>
-<c/>
-
-<c>Excitation Rate Level</c>
-<c><xref target="silk_rate_level_pdfs"/></c>
-<c/>
-
-<c>Excitation Pulse Counts</c>
-<c><xref target="silk_pulse_count_pdfs"/></c>
-<c/>
-
-<c>Excitation Pulse Locations</c>
-<c><xref target="silk_pulse_locations"/></c>
-<c>Non-zero pulse count</c>
-
-<c>Excitation LSBs</c>
-<c><xref target="silk_shell_lsb_pdf"/></c>
-<c><xref target="silk_pulse_counts"/></c>
-
-<c>Excitation Signs</c>
-<c><xref target="silk_sign_pdfs"/></c>
-<c/>
-
-</texttable>
-
-<section anchor="silk_stereo_pred" toc="include"
- title="Stereo Prediction Weights">
-<t>
-A SILK frame corresponding to the mid channel of a stereo Opus frame begins
- with a pair of side channel prediction weights, designed such that zeros
- indicate normal mid-side coupling.
-Since these weights can change on every frame, the first portion of each frame
- linearly interpolates between the previous weights and the current ones, using
- zeros for the previous weights if none are available.
-These prediction weights are never included in a mono Opus frame, and the
- previous weights are reset to zeros on any transition from mono to stereo.
-They are also not included in an LBRR frame for the side channel, even if the
- LBRR flags indicate the corresponding mid channel was not coded.
-In that case, the previous weights are used, again substituting in zeros if no
- previous weights are available since the last decoder reset
- (see <xref target="decoder-reset"/>).
-</t>
-
-<t>
-To summarize, these weights are coded if and only if
-<list style="symbols">
-<t>This is a stereo Opus frame (<xref target="toc_byte"/>), and</t>
-<t>The current SILK frame corresponds to the mid channel.</t>
-</list>
-</t>
-
-<t>
-The prediction weights are coded in three separate pieces, which are decoded
- by silk_stereo_decode_pred() (decode_stereo_pred.c).
-The first piece jointly codes the high-order part of a table index for both
- weights.
-The second piece codes the low-order part of each table index.
-The third piece codes an offset used to linearly interpolate between table
- indices.
-The details are as follows.
-</t>
-
-<t>
-Let n be an index decoded with the 25-element stage-1 PDF in
- <xref target="silk_stereo_pred_pdfs"/>.
-Then let i0 and i1 be indices decoded with the stage-2 and stage-3 PDFs in
- <xref target="silk_stereo_pred_pdfs"/>, respectively, and let i2 and i3
- be two more indices decoded with the stage-2 and stage-3 PDFs, all in that
- order.
-</t>
-
-<texttable anchor="silk_stereo_pred_pdfs" title="Stereo Weight PDFs">
-<ttcol align="left">Stage</ttcol>
-<ttcol align="left">PDF</ttcol>
-<c>Stage 1</c>
-<c>{7,  2,  1,  1,  1,
-   10, 24,  8,  1,  1,
-    3, 23, 92, 23,  3,
-    1,  1,  8, 24, 10,
-    1,  1,  1,  2,  7}/256</c>
-
-<c>Stage 2</c>
-<c>{85, 86, 85}/256</c>
-
-<c>Stage 3</c>
-<c>{51, 51, 52, 51, 51}/256</c>
-</texttable>
-
-<t>
-Then use n, i0, and i2 to form two table indices, wi0 and wi1, according to
-<figure align="center">
-<artwork align="center"><![CDATA[
-wi0 = i0 + 3*(n/5)
-wi1 = i2 + 3*(n%5)
-]]></artwork>
-</figure>
- where the division is integer division.
-The range of these indices is 0 to 14, inclusive.
-Let w[i] be the i'th weight from <xref target="silk_stereo_weights_table"/>.
-Then the two prediction weights, w0_Q13 and w1_Q13, are
-<figure align="center">
-<artwork align="center"><![CDATA[
-w1_Q13 = w_Q13[wi1]
-         + ((w_Q13[wi1+1] - w_Q13[wi1])*6554) >> 16)*(2*i3 + 1)
-
-w0_Q13 = w_Q13[wi0]
-         + ((w_Q13[wi0+1] - w_Q13[wi0])*6554) >> 16)*(2*i1 + 1)
-         - w1_Q13
-]]></artwork>
-</figure>
-N.b., w1_Q13 is computed first here, because w0_Q13 depends on it.
-The constant 6554 is approximately 0.1 in Q16.
-Although wi0 and wi1 only have 15 possible values,
- <xref target="silk_stereo_weights_table"/> contains 16 entries to allow
- interpolation between entry wi0 and (wi0&nbsp;+&nbsp;1) (and likewise for wi1).
-</t>
-
-<texttable anchor="silk_stereo_weights_table"
- title="Stereo Weight Table">
-<ttcol align="left">Index</ttcol>
-<ttcol align="right">Weight (Q13)</ttcol>
- <c>0</c> <c>-13732</c>
- <c>1</c> <c>-10050</c>
- <c>2</c>  <c>-8266</c>
- <c>3</c>  <c>-7526</c>
- <c>4</c>  <c>-6500</c>
- <c>5</c>  <c>-5000</c>
- <c>6</c>  <c>-2950</c>
- <c>7</c>   <c>-820</c>
- <c>8</c>    <c>820</c>
- <c>9</c>   <c>2950</c>
-<c>10</c>   <c>5000</c>
-<c>11</c>   <c>6500</c>
-<c>12</c>   <c>7526</c>
-<c>13</c>   <c>8266</c>
-<c>14</c>  <c>10050</c>
-<c>15</c>  <c>13732</c>
-</texttable>
-
-</section>
-
-<section anchor="silk_mid_only_flag" toc="include" title="Mid-only Flag">
-<t>
-A flag appears after the stereo prediction weights that indicates if only the
- mid channel is coded for this time interval.
-It appears only when
-<list style="symbols">
-<t>This is a stereo Opus frame (see <xref target="toc_byte"/>),</t>
-<t>The current SILK frame corresponds to the mid channel, and</t>
-<t>Either
-<list style="symbols">
-<t>This is a regular SILK frame where the VAD flags
- (see <xref target="silk_header_bits"/>) indicate that the corresponding side
- channel is not active.</t>
-<t>
-This is an LBRR frame where the LBRR flags
- (see <xref target="silk_header_bits"/> and <xref target="silk_lbrr_flags"/>)
- indicate that the corresponding side channel is not coded.
-</t>
-</list>
-</t>
-</list>
-It is omitted when there are no stereo weights, for all of the same reasons.
-It is also omitted for a regular SILK frame when the VAD flag of the
- corresponding side channel frame is set (indicating it is active).
-The side channel must be coded in this case, making the mid-only flag
- redundant.
-It is also omitted for an LBRR frame when the corresponding LBRR flags
- indicate the side channel is coded.
-</t>
-
-<t>
-When the flag is present, the decoder reads a single value using the PDF in
- <xref target="silk_mid_only_pdf"/>, as implemented in
- silk_stereo_decode_mid_only() (decode_stereo_pred.c).
-If the flag is set, then there is no corresponding SILK frame for the side
- channel, the entire decoding process for the side channel is skipped, and
- zeros are fed to the stereo unmixing process (see
- <xref target="silk_stereo_unmixing"/>) instead.
-As stated above, LBRR frames still include this flag when the LBRR flag
- indicates that the side channel is not coded.
-In that case, if this flag is zero (indicating that there should be a side
- channel), then Packet Loss Concealment (PLC, see
- <xref target="Packet Loss Concealment"/>) SHOULD be invoked to recover a
- side channel signal.
-Otherwise, the stereo image will collapse.
-</t>
-
-<texttable anchor="silk_mid_only_pdf" title="Mid-only Flag PDF">
-<ttcol align="left">PDF</ttcol>
-<c>{192, 64}/256</c>
-</texttable>
-
-</section>
-
-<section anchor="silk_frame_type" toc="include" title="Frame Type">
-<t>
-Each SILK frame contains a single "frame type" symbol that jointly codes the
- signal type and quantization offset type of the corresponding frame.
-If the current frame is a regular SILK frame whose VAD bit was not set (an
- "inactive" frame), then the frame type symbol takes on a value of either 0 or
- 1 and is decoded using the first PDF in <xref target="silk_frame_type_pdfs"/>.
-If the frame is an LBRR frame or a regular SILK frame whose VAD flag was set
- (an "active" frame), then the value of the symbol may range from 2 to 5,
- inclusive, and is decoded using the second PDF in
- <xref target="silk_frame_type_pdfs"/>.
-<xref target="silk_frame_type_table"/> translates between the value of the
- frame type symbol and the corresponding signal type and quantization offset
- type.
-</t>
-
-<texttable anchor="silk_frame_type_pdfs" title="Frame Type PDFs">
-<ttcol>VAD Flag</ttcol>
-<ttcol>PDF</ttcol>
-<c>Inactive</c> <c>{26, 230, 0, 0, 0, 0}/256</c>
-<c>Active</c>   <c>{0, 0, 24, 74, 148, 10}/256</c>
-</texttable>
-
-<texttable anchor="silk_frame_type_table"
- title="Signal Type and Quantization Offset Type from Frame Type">
-<ttcol>Frame Type</ttcol>
-<ttcol>Signal Type</ttcol>
-<ttcol align="right">Quantization Offset Type</ttcol>
-<c>0</c> <c>Inactive</c> <c>Low</c>
-<c>1</c> <c>Inactive</c> <c>High</c>
-<c>2</c> <c>Unvoiced</c> <c>Low</c>
-<c>3</c> <c>Unvoiced</c> <c>High</c>
-<c>4</c> <c>Voiced</c>   <c>Low</c>
-<c>5</c> <c>Voiced</c>   <c>High</c>
-</texttable>
-
-</section>
-
-<section anchor="silk_gains" toc="include" title="Subframe Gains">
-<t>
-A separate quantization gain is coded for each 5&nbsp;ms subframe.
-These gains control the step size between quantization levels of the excitation
- signal and, therefore, the quality of the reconstruction.
-They are independent of and unrelated to the pitch contours coded for voiced
- frames.
-The quantization gains are themselves uniformly quantized to 6&nbsp;bits on a
- log scale, giving them a resolution of approximately 1.369&nbsp;dB and a range
- of approximately 1.94&nbsp;dB to 88.21&nbsp;dB.
-</t>
-<t>
-The subframe gains are either coded independently, or relative to the gain from
- the most recent coded subframe in the same channel.
-Independent coding is used if and only if
-<list style="symbols">
-<t>
-This is the first subframe in the current SILK frame, and
-</t>
-<t>Either
-<list style="symbols">
-<t>
-This is the first SILK frame of its type (LBRR or regular) for this channel in
- the current Opus frame, or
- </t>
-<t>
-The previous SILK frame of the same type (LBRR or regular) for this channel in
- the same Opus frame was not coded.
-</t>
-</list>
-</t>
-</list>
-</t>
-
-<t>
-In an independently coded subframe gain, the 3 most significant bits of the
- quantization gain are decoded using a PDF selected from
- <xref target="silk_independent_gain_msb_pdfs"/> based on the decoded signal
- type (see <xref target="silk_frame_type"/>).
-</t>
-
-<texttable anchor="silk_independent_gain_msb_pdfs"
- title="PDFs for Independent Quantization Gain MSB Coding">
-<ttcol align="left">Signal Type</ttcol>
-<ttcol align="left">PDF</ttcol>
-<c>Inactive</c> <c>{32, 112, 68, 29, 12,  1,  1, 1}/256</c>
-<c>Unvoiced</c>  <c>{2,  17, 45, 60, 62, 47, 19, 4}/256</c>
-<c>Voiced</c>    <c>{1,   3, 26, 71, 94, 50,  9, 2}/256</c>
-</texttable>
-
-<t>
-The 3 least significant bits are decoded using a uniform PDF:
-</t>
-<texttable anchor="silk_independent_gain_lsb_pdf"
- title="PDF for Independent Quantization Gain LSB Coding">
-<ttcol align="left">PDF</ttcol>
-<c>{32, 32, 32, 32, 32, 32, 32, 32}/256</c>
-</texttable>
-
-<t>
-These 6 bits are combined to form a value, gain_index, between 0 and 63.
-When the gain for the previous subframe is available, then the current gain is
- limited as follows:
-<figure align="center">
-<artwork align="center"><![CDATA[
-log_gain = max(gain_index, previous_log_gain - 16) .
-]]></artwork>
-</figure>
-This may help some implementations limit the change in precision of their
- internal LTP history.
-The indices which this clamp applies to cannot simply be removed from the
- codebook, because previous_log_gain will not be available after packet loss.
-The clamping is skipped after a decoder reset, and in the side channel if the
- previous frame in the side channel was not coded, since there is no value for
- previous_log_gain available.
-It MAY also be skipped after packet loss.
-</t>
-
-<t>
-For subframes which do not have an independent gain (including the first
- subframe of frames not listed as using independent coding above), the
- quantization gain is coded relative to the gain from the previous subframe (in
- the same channel).
-The PDF in <xref target="silk_delta_gain_pdf"/> yields a delta_gain_index value
- between 0 and 40, inclusive.
-</t>
-<texttable anchor="silk_delta_gain_pdf"
- title="PDF for Delta Quantization Gain Coding">
-<ttcol align="left">PDF</ttcol>
-<c>{6,   5,  11,  31, 132,  21,   8,   4,
-    3,   2,   2,   2,   1,   1,   1,   1,
-    1,   1,   1,   1,   1,   1,   1,   1,
-    1,   1,   1,   1,   1,   1,   1,   1,
-    1,   1,   1,   1,   1,   1,   1,   1,   1}/256</c>
-</texttable>
-<t>
-The following formula translates this index into a quantization gain for the
- current subframe using the gain from the previous subframe:
-<figure align="center">
-<artwork align="center"><![CDATA[
-log_gain = clamp(0, max(2*delta_gain_index - 16,
-                   previous_log_gain + delta_gain_index - 4), 63) .
-]]></artwork>
-</figure>
-</t>
-<t>
-silk_gains_dequant() (gain_quant.c) dequantizes log_gain for the k'th subframe
- and converts it into a linear Q16 scale factor via
-<figure align="center">
-<artwork align="center"><![CDATA[
-gain_Q16[k] = silk_log2lin((0x1D1C71*log_gain>>16) + 2090)
-]]></artwork>
-</figure>
-</t>
-<t>
-The function silk_log2lin() (log2lin.c) computes an approximation of
- 2**(inLog_Q7/128.0), where inLog_Q7 is its Q7 input.
-Let i = inLog_Q7&gt;&gt;7 be the integer part of inLogQ7 and
- f = inLog_Q7&amp;127 be the fractional part.
-Then
-<figure align="center">
-<artwork align="center"><![CDATA[
-(1<<i) + ((-174*f*(128-f)>>16)+f)*((1<<i)>>7)
-]]></artwork>
-</figure>
- yields the approximate exponential.
-The final Q16 gain values lies between 81920 and 1686110208, inclusive
- (representing scale factors of 1.25 to 25728, respectively).
-</t>
-</section>
-
-<section anchor="silk_nlsfs" toc="include" title="Normalized Line Spectral
- Frequency (LSF) and Linear Predictive Coding (LPC) Coefficients">
-<t>
-A set of normalized Line Spectral Frequency (LSF) coefficients follow the
- quantization gains in the bitstream, and represent the Linear Predictive
- Coding (LPC) coefficients for the current SILK frame.
-Once decoded, the normalized LSFs form an increasing list of Q15 values between
- 0 and 1.
-These represent the interleaved zeros on the upper half of the unit circle
- (between 0 and pi, hence "normalized") in the standard decomposition
- <xref target="line-spectral-pairs"/> of the LPC filter into a symmetric part
- and an anti-symmetric part (P and Q in <xref target="silk_nlsf2lpc"/>).
-Because of non-linear effects in the decoding process, an implementation SHOULD
- match the fixed-point arithmetic described in this section exactly.
-An encoder SHOULD also use the same process.
-</t>
-<t>
-The normalized LSFs are coded using a two-stage vector quantizer (VQ)
- (<xref target="silk_nlsf_stage1"/> and <xref target="silk_nlsf_stage2"/>).
-NB and MB frames use an order-10 predictor, while WB frames use an order-16
- predictor, and thus have different sets of tables.
-After reconstructing the normalized LSFs
- (<xref target="silk_nlsf_reconstruction"/>), the decoder runs them through a
- stabilization process (<xref target="silk_nlsf_stabilization"/>), interpolates
- them between frames (<xref target="silk_nlsf_interpolation"/>), converts them
- back into LPC coefficients (<xref target="silk_nlsf2lpc"/>), and then runs
- them through further processes to limit the range of the coefficients
- (<xref target="silk_lpc_range_limit"/>) and the gain of the filter
- (<xref target="silk_lpc_gain_limit"/>).
-All of this is necessary to ensure the reconstruction process is stable.
-</t>
-
-<section anchor="silk_nlsf_stage1" title="Normalized LSF Stage 1 Decoding">
-<t>
-The first VQ stage uses a 32-element codebook, coded with one of the PDFs in
- <xref target="silk_nlsf_stage1_pdfs"/>, depending on the audio bandwidth and
- the signal type of the current SILK frame.
-This yields a single index, I1, for the entire frame, which
-<list style="numbers">
-<t>Indexes an element in a coarse codebook,</t>
-<t>Selects the PDFs for the second stage of the VQ, and</t>
-<t>Selects the prediction weights used to remove intra-frame redundancy from
- the second stage.</t>
-</list>
-The actual codebook elements are listed in
- <xref target="silk_nlsf_nbmb_codebook"/> and
- <xref target="silk_nlsf_wb_codebook"/>, but they are not needed until the last
- stages of reconstructing the LSF coefficients.
-</t>
-
-<texttable anchor="silk_nlsf_stage1_pdfs"
- title="PDFs for Normalized LSF Stage-1 Index Decoding">
-<ttcol align="left">Audio Bandwidth</ttcol>
-<ttcol align="left">Signal Type</ttcol>
-<ttcol align="left">PDF</ttcol>
-<c>NB or MB</c> <c>Inactive or unvoiced</c>
-<c>
-{44, 34, 30, 19, 21, 12, 11,  3,
-  3,  2, 16,  2,  2,  1,  5,  2,
-  1,  3,  3,  1,  1,  2,  2,  2,
-  3,  1,  9,  9,  2,  7,  2,  1}/256
-</c>
-<c>NB or MB</c> <c>Voiced</c>
-<c>
-{1, 10,  1,  8,  3,  8,  8, 14,
-13, 14,  1, 14, 12, 13, 11, 11,
-12, 11, 10, 10, 11,  8,  9,  8,
- 7,  8,  1,  1,  6,  1,  6,  5}/256
-</c>
-<c>WB</c> <c>Inactive or unvoiced</c>
-<c>
-{31, 21,  3, 17,  1,  8, 17,  4,
-  1, 18, 16,  4,  2,  3,  1, 10,
-  1,  3, 16, 11, 16,  2,  2,  3,
-  2, 11,  1,  4,  9,  8,  7,  3}/256
-</c>
-<c>WB</c> <c>Voiced</c>
-<c>
-{1,  4, 16,  5, 18, 11,  5, 14,
-15,  1,  3, 12, 13, 14, 14,  6,
-14, 12,  2,  6,  1, 12, 12, 11,
-10,  3, 10,  5,  1,  1,  1,  3}/256
-</c>
-</texttable>
-
-</section>
-
-<section anchor="silk_nlsf_stage2" title="Normalized LSF Stage 2 Decoding">
-<t>
-A total of 16 PDFs are available for the LSF residual in the second stage: the
- 8 (a...h) for NB and MB frames given in
- <xref target="silk_nlsf_stage2_nbmb_pdfs"/>, and the 8 (i...p) for WB frames
- given in <xref target="silk_nlsf_stage2_wb_pdfs"/>.
-Which PDF is used for which coefficient is driven by the index, I1,
- decoded in the first stage.
-<xref target="silk_nlsf_nbmb_stage2_cb_sel"/> lists the letter of the
- corresponding PDF for each normalized LSF coefficient for NB and MB, and
- <xref target="silk_nlsf_wb_stage2_cb_sel"/> lists the same information for WB.
-</t>
-
-<texttable anchor="silk_nlsf_stage2_nbmb_pdfs"
- title="PDFs for NB/MB Normalized LSF Stage-2 Index Decoding">
-<ttcol align="left">Codebook</ttcol>
-<ttcol align="left">PDF</ttcol>
-<c>a</c> <c>{1,   1,   1,  15, 224,  11,   1,   1,   1}/256</c>
-<c>b</c> <c>{1,   1,   2,  34, 183,  32,   1,   1,   1}/256</c>
-<c>c</c> <c>{1,   1,   4,  42, 149,  55,   2,   1,   1}/256</c>
-<c>d</c> <c>{1,   1,   8,  52, 123,  61,   8,   1,   1}/256</c>
-<c>e</c> <c>{1,   3,  16,  53, 101,  74,   6,   1,   1}/256</c>
-<c>f</c> <c>{1,   3,  17,  55,  90,  73,  15,   1,   1}/256</c>
-<c>g</c> <c>{1,   7,  24,  53,  74,  67,  26,   3,   1}/256</c>
-<c>h</c> <c>{1,   1,  18,  63,  78,  58,  30,   6,   1}/256</c>
-</texttable>
-
-<texttable anchor="silk_nlsf_stage2_wb_pdfs"
- title="PDFs for WB Normalized LSF Stage-2 Index Decoding">
-<ttcol align="left">Codebook</ttcol>
-<ttcol align="left">PDF</ttcol>
-<c>i</c> <c>{1,   1,   1,   9, 232,   9,   1,   1,   1}/256</c>
-<c>j</c> <c>{1,   1,   2,  28, 186,  35,   1,   1,   1}/256</c>
-<c>k</c> <c>{1,   1,   3,  42, 152,  53,   2,   1,   1}/256</c>
-<c>l</c> <c>{1,   1,  10,  49, 126,  65,   2,   1,   1}/256</c>
-<c>m</c> <c>{1,   4,  19,  48, 100,  77,   5,   1,   1}/256</c>
-<c>n</c> <c>{1,   1,  14,  54, 100,  72,  12,   1,   1}/256</c>
-<c>o</c> <c>{1,   1,  15,  61,  87,  61,  25,   4,   1}/256</c>
-<c>p</c> <c>{1,   7,  21,  50,  77,  81,  17,   1,   1}/256</c>
-</texttable>
-
-<texttable anchor="silk_nlsf_nbmb_stage2_cb_sel"
- title="Codebook Selection for NB/MB Normalized LSF Stage-2 Index Decoding">
-<ttcol>I1</ttcol>
-<ttcol>Coefficient</ttcol>
-<c/>
-<c><spanx style="vbare">0&nbsp;1&nbsp;2&nbsp;3&nbsp;4&nbsp;5&nbsp;6&nbsp;7&nbsp;8&nbsp;9</spanx></c>
-<c> 0</c>
-<c><spanx style="vbare">a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a</spanx></c>
-<c> 1</c>
-<c><spanx style="vbare">b&nbsp;d&nbsp;b&nbsp;c&nbsp;c&nbsp;b&nbsp;c&nbsp;b&nbsp;b&nbsp;b</spanx></c>
-<c> 2</c>
-<c><spanx style="vbare">c&nbsp;b&nbsp;b&nbsp;b&nbsp;b&nbsp;b&nbsp;b&nbsp;b&nbsp;b&nbsp;b</spanx></c>
-<c> 3</c>
-<c><spanx style="vbare">b&nbsp;c&nbsp;c&nbsp;c&nbsp;c&nbsp;b&nbsp;c&nbsp;b&nbsp;b&nbsp;b</spanx></c>
-<c> 4</c>
-<c><spanx style="vbare">c&nbsp;d&nbsp;d&nbsp;d&nbsp;d&nbsp;c&nbsp;c&nbsp;c&nbsp;c&nbsp;c</spanx></c>
-<c> 5</c>
-<c><spanx style="vbare">a&nbsp;f&nbsp;d&nbsp;d&nbsp;c&nbsp;c&nbsp;c&nbsp;c&nbsp;b&nbsp;b</spanx></c>
-<c> g</c>
-<c><spanx style="vbare">a&nbsp;c&nbsp;c&nbsp;c&nbsp;c&nbsp;c&nbsp;c&nbsp;c&nbsp;c&nbsp;b</spanx></c>
-<c> 7</c>
-<c><spanx style="vbare">c&nbsp;d&nbsp;g&nbsp;e&nbsp;e&nbsp;e&nbsp;f&nbsp;e&nbsp;f&nbsp;f</spanx></c>
-<c> 8</c>
-<c><spanx style="vbare">c&nbsp;e&nbsp;f&nbsp;f&nbsp;e&nbsp;f&nbsp;e&nbsp;g&nbsp;e&nbsp;e</spanx></c>
-<c> 9</c>
-<c><spanx style="vbare">c&nbsp;e&nbsp;e&nbsp;h&nbsp;e&nbsp;f&nbsp;e&nbsp;f&nbsp;f&nbsp;e</spanx></c>
-<c>10</c>
-<c><spanx style="vbare">e&nbsp;d&nbsp;d&nbsp;d&nbsp;c&nbsp;d&nbsp;c&nbsp;c&nbsp;c&nbsp;c</spanx></c>
-<c>11</c>
-<c><spanx style="vbare">b&nbsp;f&nbsp;f&nbsp;g&nbsp;e&nbsp;f&nbsp;e&nbsp;f&nbsp;f&nbsp;f</spanx></c>
-<c>12</c>
-<c><spanx style="vbare">c&nbsp;h&nbsp;e&nbsp;g&nbsp;f&nbsp;f&nbsp;f&nbsp;f&nbsp;f&nbsp;f</spanx></c>
-<c>13</c>
-<c><spanx style="vbare">c&nbsp;h&nbsp;f&nbsp;f&nbsp;f&nbsp;f&nbsp;f&nbsp;g&nbsp;f&nbsp;e</spanx></c>
-<c>14</c>
-<c><spanx style="vbare">d&nbsp;d&nbsp;f&nbsp;e&nbsp;e&nbsp;f&nbsp;e&nbsp;f&nbsp;e&nbsp;e</spanx></c>
-<c>15</c>
-<c><spanx style="vbare">c&nbsp;d&nbsp;d&nbsp;f&nbsp;f&nbsp;e&nbsp;e&nbsp;e&nbsp;e&nbsp;e</spanx></c>
-<c>16</c>
-<c><spanx style="vbare">c&nbsp;e&nbsp;e&nbsp;g&nbsp;e&nbsp;f&nbsp;e&nbsp;f&nbsp;f&nbsp;f</spanx></c>
-<c>17</c>
-<c><spanx style="vbare">c&nbsp;f&nbsp;e&nbsp;g&nbsp;f&nbsp;f&nbsp;f&nbsp;e&nbsp;f&nbsp;e</spanx></c>
-<c>18</c>
-<c><spanx style="vbare">c&nbsp;h&nbsp;e&nbsp;f&nbsp;e&nbsp;f&nbsp;e&nbsp;f&nbsp;f&nbsp;f</spanx></c>
-<c>19</c>
-<c><spanx style="vbare">c&nbsp;f&nbsp;e&nbsp;g&nbsp;h&nbsp;g&nbsp;f&nbsp;g&nbsp;f&nbsp;e</spanx></c>
-<c>20</c>
-<c><spanx style="vbare">d&nbsp;g&nbsp;h&nbsp;e&nbsp;g&nbsp;f&nbsp;f&nbsp;g&nbsp;e&nbsp;f</spanx></c>
-<c>21</c>
-<c><spanx style="vbare">c&nbsp;h&nbsp;g&nbsp;e&nbsp;e&nbsp;e&nbsp;f&nbsp;e&nbsp;f&nbsp;f</spanx></c>
-<c>22</c>
-<c><spanx style="vbare">e&nbsp;f&nbsp;f&nbsp;e&nbsp;g&nbsp;g&nbsp;f&nbsp;g&nbsp;f&nbsp;e</spanx></c>
-<c>23</c>
-<c><spanx style="vbare">c&nbsp;f&nbsp;f&nbsp;g&nbsp;f&nbsp;g&nbsp;e&nbsp;g&nbsp;e&nbsp;e</spanx></c>
-<c>24</c>
-<c><spanx style="vbare">e&nbsp;f&nbsp;f&nbsp;f&nbsp;d&nbsp;h&nbsp;e&nbsp;f&nbsp;f&nbsp;e</spanx></c>
-<c>25</c>
-<c><spanx style="vbare">c&nbsp;d&nbsp;e&nbsp;f&nbsp;f&nbsp;g&nbsp;e&nbsp;f&nbsp;f&nbsp;e</spanx></c>
-<c>26</c>
-<c><spanx style="vbare">c&nbsp;d&nbsp;c&nbsp;d&nbsp;d&nbsp;e&nbsp;c&nbsp;d&nbsp;d&nbsp;d</spanx></c>
-<c>27</c>
-<c><spanx style="vbare">b&nbsp;b&nbsp;c&nbsp;c&nbsp;c&nbsp;c&nbsp;c&nbsp;d&nbsp;c&nbsp;c</spanx></c>
-<c>28</c>
-<c><spanx style="vbare">e&nbsp;f&nbsp;f&nbsp;g&nbsp;g&nbsp;g&nbsp;f&nbsp;g&nbsp;e&nbsp;f</spanx></c>
-<c>29</c>
-<c><spanx style="vbare">d&nbsp;f&nbsp;f&nbsp;e&nbsp;e&nbsp;e&nbsp;e&nbsp;d&nbsp;d&nbsp;c</spanx></c>
-<c>30</c>
-<c><spanx style="vbare">c&nbsp;f&nbsp;d&nbsp;h&nbsp;f&nbsp;f&nbsp;e&nbsp;e&nbsp;f&nbsp;e</spanx></c>
-<c>31</c>
-<c><spanx style="vbare">e&nbsp;e&nbsp;f&nbsp;e&nbsp;f&nbsp;g&nbsp;f&nbsp;g&nbsp;f&nbsp;e</spanx></c>
-</texttable>
-
-<texttable anchor="silk_nlsf_wb_stage2_cb_sel"
- title="Codebook Selection for WB Normalized LSF Stage-2 Index Decoding">
-<ttcol>I1</ttcol>
-<ttcol>Coefficient</ttcol>
-<c/>
-<c><spanx style="vbare">0&nbsp;&nbsp;1&nbsp;&nbsp;2&nbsp;&nbsp;3&nbsp;&nbsp;4&nbsp;&nbsp;5&nbsp;&nbsp;6&nbsp;&nbsp;7&nbsp;&nbsp;8&nbsp;&nbsp;9&nbsp;10&nbsp;11&nbsp;12&nbsp;13&nbsp;14&nbsp;15</spanx></c>
-<c> 0</c>
-<c><spanx style="vbare">i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i</spanx></c>
-<c> 1</c>
-<c><spanx style="vbare">k&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;k&nbsp;&nbsp;k&nbsp;&nbsp;k&nbsp;&nbsp;k&nbsp;&nbsp;k&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;i&nbsp;&nbsp;l</spanx></c>
-<c> 2</c>
-<c><spanx style="vbare">k&nbsp;&nbsp;n&nbsp;&nbsp;n&nbsp;&nbsp;l&nbsp;&nbsp;p&nbsp;&nbsp;m&nbsp;&nbsp;m&nbsp;&nbsp;n&nbsp;&nbsp;k&nbsp;&nbsp;n&nbsp;&nbsp;m&nbsp;&nbsp;n&nbsp;&nbsp;n&nbsp;&nbsp;m&nbsp;&nbsp;l&nbsp;&nbsp;l</spanx></c>
-<c> 3</c>
-<c><spanx style="vbare">i&nbsp;&nbsp;k&nbsp;&nbsp;j&nbsp;&nbsp;k&nbsp;&nbsp;k&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;j</spanx></c>
-<c> 4</c>
-<c><spanx style="vbare">i&nbsp;&nbsp;o&nbsp;&nbsp;n&nbsp;&nbsp;m&nbsp;&nbsp;o&nbsp;&nbsp;m&nbsp;&nbsp;p&nbsp;&nbsp;n&nbsp;&nbsp;m&nbsp;&nbsp;m&nbsp;&nbsp;m&nbsp;&nbsp;n&nbsp;&nbsp;n&nbsp;&nbsp;m&nbsp;&nbsp;m&nbsp;&nbsp;l</spanx></c>
-<c> 5</c>
-<c><spanx style="vbare">i&nbsp;&nbsp;l&nbsp;&nbsp;n&nbsp;&nbsp;n&nbsp;&nbsp;m&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;n&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;k&nbsp;&nbsp;m</spanx></c>
-<c> 6</c>
-<c><spanx style="vbare">i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i</spanx></c>
-<c> 7</c>
-<c><spanx style="vbare">i&nbsp;&nbsp;k&nbsp;&nbsp;o&nbsp;&nbsp;l&nbsp;&nbsp;p&nbsp;&nbsp;k&nbsp;&nbsp;n&nbsp;&nbsp;l&nbsp;&nbsp;m&nbsp;&nbsp;n&nbsp;&nbsp;n&nbsp;&nbsp;m&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;k&nbsp;&nbsp;l</spanx></c>
-<c> 8</c>
-<c><spanx style="vbare">i&nbsp;&nbsp;o&nbsp;&nbsp;k&nbsp;&nbsp;o&nbsp;&nbsp;o&nbsp;&nbsp;m&nbsp;&nbsp;n&nbsp;&nbsp;m&nbsp;&nbsp;o&nbsp;&nbsp;n&nbsp;&nbsp;m&nbsp;&nbsp;m&nbsp;&nbsp;n&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l</spanx></c>
-<c> 9</c>
-<c><spanx style="vbare">k&nbsp;&nbsp;j&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i</spanx></c>
-<c>10</c>
-<c><spanx style="vbare">i&nbsp;&nbsp;j&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;j</spanx></c>
-<c>11</c>
-<c><spanx style="vbare">k&nbsp;&nbsp;k&nbsp;&nbsp;l&nbsp;&nbsp;m&nbsp;&nbsp;n&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;k&nbsp;&nbsp;k&nbsp;&nbsp;j&nbsp;&nbsp;l</spanx></c>
-<c>12</c>
-<c><spanx style="vbare">k&nbsp;&nbsp;k&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;m&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;k&nbsp;&nbsp;j&nbsp;&nbsp;l</spanx></c>
-<c>13</c>
-<c><spanx style="vbare">l&nbsp;&nbsp;m&nbsp;&nbsp;m&nbsp;&nbsp;m&nbsp;&nbsp;o&nbsp;&nbsp;m&nbsp;&nbsp;m&nbsp;&nbsp;n&nbsp;&nbsp;l&nbsp;&nbsp;n&nbsp;&nbsp;m&nbsp;&nbsp;m&nbsp;&nbsp;n&nbsp;&nbsp;m&nbsp;&nbsp;l&nbsp;&nbsp;m</spanx></c>
-<c>14</c>
-<c><spanx style="vbare">i&nbsp;&nbsp;o&nbsp;&nbsp;m&nbsp;&nbsp;n&nbsp;&nbsp;m&nbsp;&nbsp;p&nbsp;&nbsp;n&nbsp;&nbsp;k&nbsp;&nbsp;o&nbsp;&nbsp;n&nbsp;&nbsp;p&nbsp;&nbsp;m&nbsp;&nbsp;m&nbsp;&nbsp;l&nbsp;&nbsp;n&nbsp;&nbsp;l</spanx></c>
-<c>15</c>
-<c><spanx style="vbare">i&nbsp;&nbsp;j&nbsp;&nbsp;i&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;j&nbsp;&nbsp;i</spanx></c>
-<c>16</c>
-<c><spanx style="vbare">j&nbsp;&nbsp;o&nbsp;&nbsp;n&nbsp;&nbsp;p&nbsp;&nbsp;n&nbsp;&nbsp;m&nbsp;&nbsp;n&nbsp;&nbsp;l&nbsp;&nbsp;m&nbsp;&nbsp;n&nbsp;&nbsp;m&nbsp;&nbsp;m&nbsp;&nbsp;m&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;m</spanx></c>
-<c>17</c>
-<c><spanx style="vbare">j&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;m&nbsp;&nbsp;m&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;n&nbsp;&nbsp;k&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;n&nbsp;&nbsp;n&nbsp;&nbsp;n&nbsp;&nbsp;l&nbsp;&nbsp;m</spanx></c>
-<c>18</c>
-<c><spanx style="vbare">k&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;k&nbsp;&nbsp;k&nbsp;&nbsp;k&nbsp;&nbsp;l&nbsp;&nbsp;k&nbsp;&nbsp;j&nbsp;&nbsp;k&nbsp;&nbsp;j&nbsp;&nbsp;k&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;m</spanx></c>
-<c>19</c>
-<c><spanx style="vbare">i&nbsp;&nbsp;k&nbsp;&nbsp;l&nbsp;&nbsp;n&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;k&nbsp;&nbsp;k&nbsp;&nbsp;k&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i</spanx></c>
-<c>20</c>
-<c><spanx style="vbare">l&nbsp;&nbsp;m&nbsp;&nbsp;l&nbsp;&nbsp;n&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;k&nbsp;&nbsp;k&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;k&nbsp;&nbsp;k&nbsp;&nbsp;m</spanx></c>
-<c>21</c>
-<c><spanx style="vbare">k&nbsp;&nbsp;o&nbsp;&nbsp;l&nbsp;&nbsp;p&nbsp;&nbsp;p&nbsp;&nbsp;m&nbsp;&nbsp;n&nbsp;&nbsp;m&nbsp;&nbsp;n&nbsp;&nbsp;l&nbsp;&nbsp;n&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;k&nbsp;&nbsp;l&nbsp;&nbsp;l</spanx></c>
-<c>22</c>
-<c><spanx style="vbare">k&nbsp;&nbsp;l&nbsp;&nbsp;n&nbsp;&nbsp;o&nbsp;&nbsp;o&nbsp;&nbsp;l&nbsp;&nbsp;n&nbsp;&nbsp;l&nbsp;&nbsp;m&nbsp;&nbsp;m&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;k&nbsp;&nbsp;m</spanx></c>
-<c>23</c>
-<c><spanx style="vbare">j&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;m&nbsp;&nbsp;m&nbsp;&nbsp;m&nbsp;&nbsp;m&nbsp;&nbsp;l&nbsp;&nbsp;n&nbsp;&nbsp;n&nbsp;&nbsp;n&nbsp;&nbsp;l&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;j</spanx></c>
-<c>24</c>
-<c><spanx style="vbare">k&nbsp;&nbsp;n&nbsp;&nbsp;l&nbsp;&nbsp;o&nbsp;&nbsp;o&nbsp;&nbsp;m&nbsp;&nbsp;p&nbsp;&nbsp;m&nbsp;&nbsp;m&nbsp;&nbsp;n&nbsp;&nbsp;l&nbsp;&nbsp;m&nbsp;&nbsp;m&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l</spanx></c>
-<c>25</c>
-<c><spanx style="vbare">i&nbsp;&nbsp;o&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i</spanx></c>
-<c>26</c>
-<c><spanx style="vbare">i&nbsp;&nbsp;o&nbsp;&nbsp;o&nbsp;&nbsp;l&nbsp;&nbsp;n&nbsp;&nbsp;k&nbsp;&nbsp;n&nbsp;&nbsp;n&nbsp;&nbsp;l&nbsp;&nbsp;m&nbsp;&nbsp;m&nbsp;&nbsp;p&nbsp;&nbsp;p&nbsp;&nbsp;m&nbsp;&nbsp;m&nbsp;&nbsp;m</spanx></c>
-<c>27</c>
-<c><spanx style="vbare">l&nbsp;&nbsp;l&nbsp;&nbsp;p&nbsp;&nbsp;l&nbsp;&nbsp;n&nbsp;&nbsp;m&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;k&nbsp;&nbsp;k&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;k&nbsp;&nbsp;l</spanx></c>
-<c>28</c>
-<c><spanx style="vbare">i&nbsp;&nbsp;i&nbsp;&nbsp;j&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;k&nbsp;&nbsp;j&nbsp;&nbsp;k&nbsp;&nbsp;j&nbsp;&nbsp;j&nbsp;&nbsp;k&nbsp;&nbsp;k&nbsp;&nbsp;k&nbsp;&nbsp;j&nbsp;&nbsp;j</spanx></c>
-<c>29</c>
-<c><spanx style="vbare">i&nbsp;&nbsp;l&nbsp;&nbsp;k&nbsp;&nbsp;n&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;k&nbsp;&nbsp;l&nbsp;&nbsp;k&nbsp;&nbsp;j&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;j&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;j</spanx></c>
-<c>30</c>
-<c><spanx style="vbare">l&nbsp;&nbsp;n&nbsp;&nbsp;n&nbsp;&nbsp;m&nbsp;&nbsp;p&nbsp;&nbsp;n&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;k&nbsp;&nbsp;l&nbsp;&nbsp;k&nbsp;&nbsp;k&nbsp;&nbsp;j&nbsp;&nbsp;i&nbsp;&nbsp;j&nbsp;&nbsp;i</spanx></c>
-<c>31</c>
-<c><spanx style="vbare">k&nbsp;&nbsp;l&nbsp;&nbsp;n&nbsp;&nbsp;l&nbsp;&nbsp;m&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;l&nbsp;&nbsp;k&nbsp;&nbsp;j&nbsp;&nbsp;k&nbsp;&nbsp;o&nbsp;&nbsp;m&nbsp;&nbsp;i&nbsp;&nbsp;i&nbsp;&nbsp;i</spanx></c>
-</texttable>
-
-<t>
-Decoding the second stage residual proceeds as follows.
-For each coefficient, the decoder reads a symbol using the PDF corresponding to
- I1 from either <xref target="silk_nlsf_nbmb_stage2_cb_sel"/> or
- <xref target="silk_nlsf_wb_stage2_cb_sel"/>, and subtracts 4 from the result
- to give an index in the range -4 to 4, inclusive.
-If the index is either -4 or 4, it reads a second symbol using the PDF in
- <xref target="silk_nlsf_ext_pdf"/>, and adds the value of this second symbol
- to the index, using the same sign.
-This gives the index, I2[k], a total range of -10 to 10, inclusive.
-</t>
-
-<texttable anchor="silk_nlsf_ext_pdf"
- title="PDF for Normalized LSF Index Extension Decoding">
-<ttcol align="left">PDF</ttcol>
-<c>{156, 60, 24,  9,  4,  2,  1}/256</c>
-</texttable>
-
-<t>
-The decoded indices from both stages are translated back into normalized LSF
- coefficients in silk_NLSF_decode() (NLSF_decode.c).
-The stage-2 indices represent residuals after both the first stage of the VQ
- and a separate backwards-prediction step.
-The backwards prediction process in the encoder subtracts a prediction from
- each residual formed by a multiple of the coefficient that follows it.
-The decoder must undo this process.
-<xref target="silk_nlsf_pred_weights"/> contains lists of prediction weights
- for each coefficient.
-There are two lists for NB and MB, and another two lists for WB, giving two
- possible prediction weights for each coefficient.
-</t>
-
-<texttable anchor="silk_nlsf_pred_weights"
- title="Prediction Weights for Normalized LSF Decoding">
-<ttcol align="left">Coefficient</ttcol>
-<ttcol align="right">A</ttcol>
-<ttcol align="right">B</ttcol>
-<ttcol align="right">C</ttcol>
-<ttcol align="right">D</ttcol>
- <c>0</c> <c>179</c> <c>116</c> <c>175</c>  <c>68</c>
- <c>1</c> <c>138</c>  <c>67</c> <c>148</c>  <c>62</c>
- <c>2</c> <c>140</c>  <c>82</c> <c>160</c>  <c>66</c>
- <c>3</c> <c>148</c>  <c>59</c> <c>176</c>  <c>60</c>
- <c>4</c> <c>151</c>  <c>92</c> <c>178</c>  <c>72</c>
- <c>5</c> <c>149</c>  <c>72</c> <c>173</c> <c>117</c>
- <c>6</c> <c>153</c> <c>100</c> <c>174</c>  <c>85</c>
- <c>7</c> <c>151</c>  <c>89</c> <c>164</c>  <c>90</c>
- <c>8</c> <c>163</c>  <c>92</c> <c>177</c> <c>118</c>
- <c>9</c> <c/>        <c/>      <c>174</c> <c>136</c>
-<c>10</c> <c/>        <c/>      <c>196</c> <c>151</c>
-<c>11</c> <c/>        <c/>      <c>182</c> <c>142</c>
-<c>12</c> <c/>        <c/>      <c>198</c> <c>160</c>
-<c>13</c> <c/>        <c/>      <c>192</c> <c>142</c>
-<c>14</c> <c/>        <c/>      <c>182</c> <c>155</c>
-</texttable>
-
-<t>
-The prediction is undone using the procedure implemented in
- silk_NLSF_residual_dequant() (NLSF_decode.c), which is as follows.
-Each coefficient selects its prediction weight from one of the two lists based
- on the stage-1 index, I1.
-<xref target="silk_nlsf_nbmb_weight_sel"/> gives the selections for each
- coefficient for NB and MB, and <xref target="silk_nlsf_wb_weight_sel"/> gives
- the selections for WB.
-Let d_LPC be the order of the codebook, i.e., 10 for NB and MB, and 16 for WB,
- and let pred_Q8[k] be the weight for the k'th coefficient selected by this
- process for 0&nbsp;&lt;=&nbsp;k&nbsp;&lt;&nbsp;d_LPC-1.
-Then, the stage-2 residual for each coefficient is computed via
-<figure align="center">
-<artwork align="center"><![CDATA[
-res_Q10[k] = (k+1 < d_LPC ? (res_Q10[k+1]*pred_Q8[k])>>8 : 0)
-             + ((((I2[k]<<10) - sign(I2[k])*102)*qstep)>>16) ,
-]]></artwork>
-</figure>
- where qstep is the Q16 quantization step size, which is 11796 for NB and MB
- and 9830 for WB (representing step sizes of approximately 0.18 and 0.15,
- respectively).
-</t>
-
-<texttable anchor="silk_nlsf_nbmb_weight_sel"
- title="Prediction Weight Selection for NB/MB Normalized LSF Decoding">
-<ttcol>I1</ttcol>
-<ttcol>Coefficient</ttcol>
-<c/>
-<c><spanx style="vbare">0&nbsp;1&nbsp;2&nbsp;3&nbsp;4&nbsp;5&nbsp;6&nbsp;7&nbsp;8</spanx></c>
-<c> 0</c>
-<c><spanx style="vbare">A&nbsp;B&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A</spanx></c>
-<c> 1</c>
-<c><spanx style="vbare">B&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A</spanx></c>
-<c> 2</c>
-<c><spanx style="vbare">A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A</spanx></c>
-<c> 3</c>
-<c><spanx style="vbare">B&nbsp;B&nbsp;B&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;B&nbsp;A</spanx></c>
-<c> 4</c>
-<c><spanx style="vbare">A&nbsp;B&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A</spanx></c>
-<c> 5</c>
-<c><spanx style="vbare">A&nbsp;B&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A</spanx></c>
-<c> 6</c>
-<c><spanx style="vbare">B&nbsp;A&nbsp;B&nbsp;B&nbsp;A&nbsp;A&nbsp;A&nbsp;B&nbsp;A</spanx></c>
-<c> 7</c>
-<c><spanx style="vbare">A&nbsp;B&nbsp;B&nbsp;A&nbsp;A&nbsp;B&nbsp;B&nbsp;A&nbsp;A</spanx></c>
-<c> 8</c>
-<c><spanx style="vbare">A&nbsp;A&nbsp;B&nbsp;B&nbsp;A&nbsp;B&nbsp;A&nbsp;B&nbsp;B</spanx></c>
-<c> 9</c>
-<c><spanx style="vbare">A&nbsp;A&nbsp;B&nbsp;B&nbsp;A&nbsp;A&nbsp;B&nbsp;B&nbsp;B</spanx></c>
-<c>10</c>
-<c><spanx style="vbare">A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A</spanx></c>
-<c>11</c>
-<c><spanx style="vbare">A&nbsp;B&nbsp;A&nbsp;B&nbsp;B&nbsp;B&nbsp;B&nbsp;B&nbsp;A</spanx></c>
-<c>12</c>
-<c><spanx style="vbare">A&nbsp;B&nbsp;A&nbsp;B&nbsp;B&nbsp;B&nbsp;B&nbsp;B&nbsp;A</spanx></c>
-<c>13</c>
-<c><spanx style="vbare">A&nbsp;B&nbsp;B&nbsp;B&nbsp;B&nbsp;B&nbsp;B&nbsp;B&nbsp;A</spanx></c>
-<c>14</c>
-<c><spanx style="vbare">B&nbsp;A&nbsp;B&nbsp;B&nbsp;A&nbsp;B&nbsp;B&nbsp;B&nbsp;B</spanx></c>
-<c>15</c>
-<c><spanx style="vbare">A&nbsp;B&nbsp;B&nbsp;B&nbsp;B&nbsp;B&nbsp;A&nbsp;B&nbsp;A</spanx></c>
-<c>16</c>
-<c><spanx style="vbare">A&nbsp;A&nbsp;B&nbsp;B&nbsp;A&nbsp;B&nbsp;A&nbsp;B&nbsp;A</spanx></c>
-<c>17</c>
-<c><spanx style="vbare">A&nbsp;A&nbsp;B&nbsp;B&nbsp;B&nbsp;A&nbsp;B&nbsp;B&nbsp;B</spanx></c>
-<c>18</c>
-<c><spanx style="vbare">A&nbsp;B&nbsp;B&nbsp;A&nbsp;A&nbsp;B&nbsp;B&nbsp;B&nbsp;A</spanx></c>
-<c>19</c>
-<c><spanx style="vbare">A&nbsp;A&nbsp;A&nbsp;B&nbsp;B&nbsp;B&nbsp;A&nbsp;B&nbsp;A</spanx></c>
-<c>20</c>
-<c><spanx style="vbare">A&nbsp;B&nbsp;B&nbsp;A&nbsp;A&nbsp;B&nbsp;A&nbsp;B&nbsp;A</spanx></c>
-<c>21</c>
-<c><spanx style="vbare">A&nbsp;B&nbsp;B&nbsp;A&nbsp;A&nbsp;A&nbsp;B&nbsp;B&nbsp;A</spanx></c>
-<c>22</c>
-<c><spanx style="vbare">A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;B&nbsp;B&nbsp;B&nbsp;B</spanx></c>
-<c>23</c>
-<c><spanx style="vbare">A&nbsp;A&nbsp;B&nbsp;B&nbsp;A&nbsp;A&nbsp;A&nbsp;B&nbsp;B</spanx></c>
-<c>24</c>
-<c><spanx style="vbare">A&nbsp;A&nbsp;A&nbsp;B&nbsp;A&nbsp;B&nbsp;B&nbsp;B&nbsp;B</spanx></c>
-<c>25</c>
-<c><spanx style="vbare">A&nbsp;B&nbsp;B&nbsp;B&nbsp;B&nbsp;B&nbsp;B&nbsp;B&nbsp;A</spanx></c>
-<c>26</c>
-<c><spanx style="vbare">A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A</spanx></c>
-<c>27</c>
-<c><spanx style="vbare">A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A</spanx></c>
-<c>28</c>
-<c><spanx style="vbare">A&nbsp;A&nbsp;B&nbsp;A&nbsp;B&nbsp;B&nbsp;A&nbsp;B&nbsp;A</spanx></c>
-<c>29</c>
-<c><spanx style="vbare">B&nbsp;A&nbsp;A&nbsp;B&nbsp;A&nbsp;A&nbsp;A&nbsp;A&nbsp;A</spanx></c>
-<c>30</c>
-<c><spanx style="vbare">A&nbsp;A&nbsp;A&nbsp;B&nbsp;B&nbsp;A&nbsp;B&nbsp;A&nbsp;B</spanx></c>
-<c>31</c>
-<c><spanx style="vbare">B&nbsp;A&nbsp;B&nbsp;B&nbsp;A&nbsp;B&nbsp;B&nbsp;B&nbsp;B</spanx></c>
-</texttable>
-
-<texttable anchor="silk_nlsf_wb_weight_sel"
- title="Prediction Weight Selection for WB Normalized LSF Decoding">
-<ttcol>I1</ttcol>
-<ttcol>Coefficient</ttcol>
-<c/>
-<c><spanx style="vbare">0&nbsp;&nbsp;1&nbsp;&nbsp;2&nbsp;&nbsp;3&nbsp;&nbsp;4&nbsp;&nbsp;5&nbsp;&nbsp;6&nbsp;&nbsp;7&nbsp;&nbsp;8&nbsp;&nbsp;9&nbsp;10&nbsp;11&nbsp;12&nbsp;13&nbsp;14</spanx></c>
-<c> 0</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D</spanx></c>
-<c> 1</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C</spanx></c>
-<c> 2</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C</spanx></c>
-<c> 3</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C</spanx></c>
-<c> 4</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C</spanx></c>
-<c> 5</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C</spanx></c>
-<c> 6</c>
-<c><spanx style="vbare">D&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C</spanx></c>
-<c> 7</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D</spanx></c>
-<c> 8</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D</spanx></c>
-<c> 9</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D</spanx></c>
-<c>10</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C</spanx></c>
-<c>11</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C</spanx></c>
-<c>12</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C</spanx></c>
-<c>13</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C</spanx></c>
-<c>14</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D</spanx></c>
-<c>15</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C</spanx></c>
-<c>16</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C</spanx></c>
-<c>17</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C</spanx></c>
-<c>18</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D</spanx></c>
-<c>19</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C</spanx></c>
-<c>20</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C</spanx></c>
-<c>21</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C</spanx></c>
-<c>22</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C</spanx></c>
-<c>23</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C</spanx></c>
-<c>24</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D</spanx></c>
-<c>25</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D</spanx></c>
-<c>26</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D</spanx></c>
-<c>27</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D</spanx></c>
-<c>28</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D</spanx></c>
-<c>29</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D</spanx></c>
-<c>30</c>
-<c><spanx style="vbare">D&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;C</spanx></c>
-<c>31</c>
-<c><spanx style="vbare">C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C&nbsp;&nbsp;C&nbsp;&nbsp;D&nbsp;&nbsp;C</spanx></c>
-</texttable>
-
-</section>
-
-<section anchor="silk_nlsf_reconstruction"
- title="Reconstructing the Normalized LSF Coefficients">
-<t>
-Once the stage-1 index I1 and the stage-2 residual res_Q10[] have been decoded,
- the final normalized LSF coefficients can be reconstructed.
-</t>
-<t>
-The spectral distortion introduced by the quantization of each LSF coefficient
- varies, so the stage-2 residual is weighted accordingly, using the
- low-complexity Inverse Harmonic Mean Weighting (IHMW) function proposed in
- <xref target="laroia-icassp"/>.
-The weights are derived directly from the stage-1 codebook vector.
-Let cb1_Q8[k] be the k'th entry of the stage-1 codebook vector from
- <xref target="silk_nlsf_nbmb_codebook"/> or
- <xref target="silk_nlsf_wb_codebook"/>.
-Then for 0&nbsp;&lt;=&nbsp;k&nbsp;&lt;&nbsp;d_LPC the following expression
- computes the square of the weight as a Q18 value:
-<figure align="center">
-<artwork align="center">
-<![CDATA[
-w2_Q18[k] = (1024/(cb1_Q8[k] - cb1_Q8[k-1])
-             + 1024/(cb1_Q8[k+1] - cb1_Q8[k])) << 16 ,
-]]>
-</artwork>
-</figure>
- where cb1_Q8[-1]&nbsp;=&nbsp;0 and cb1_Q8[d_LPC]&nbsp;=&nbsp;256, and the
- division is integer division.
-This is reduced to an unsquared, Q9 value using the following square-root
- approximation:
-<figure align="center">
-<artwork align="center"><![CDATA[
-i = ilog(w2_Q18[k])
-f = (w2_Q18[k]>>(i-8)) & 127
-y = ((i&1) ? 32768 : 46214) >> ((32-i)>>1)
-w_Q9[k] = y + ((213*f*y)>>16)
-]]></artwork>
-</figure>
-The constant 46214 here is approximately the square root of 2 in Q15.
-The cb1_Q8[] vector completely determines these weights, and they may be
- tabulated and stored as 13-bit unsigned values (with a range of 1819 to 5227,
- inclusive) to avoid computing them when decoding.
-The reference implementation already requires code to compute these weights on
- unquantized coefficients in the encoder, in silk_NLSF_VQ_weights_laroia()
- (NLSF_VQ_weights_laroia.c) and its callers, so it reuses that code in the
- decoder instead of using a pre-computed table to reduce the amount of ROM
- required.
-</t>
-
-<texttable anchor="silk_nlsf_nbmb_codebook"
-           title="NB/MB Normalized LSF Stage-1 Codebook Vectors">
-<ttcol>I1</ttcol>
-<ttcol>Codebook (Q8)</ttcol>
-<c/>
-<c><spanx style="vbare">&nbsp;0&nbsp;&nbsp;&nbsp;1&nbsp;&nbsp;&nbsp;2&nbsp;&nbsp;&nbsp;3&nbsp;&nbsp;&nbsp;4&nbsp;&nbsp;&nbsp;5&nbsp;&nbsp;&nbsp;6&nbsp;&nbsp;&nbsp;7&nbsp;&nbsp;&nbsp;8&nbsp;&nbsp;&nbsp;9</spanx></c>
-<c>0</c>
-<c><spanx style="vbare">12&nbsp;&nbsp;35&nbsp;&nbsp;60&nbsp;&nbsp;83&nbsp;108&nbsp;132&nbsp;157&nbsp;180&nbsp;206&nbsp;228</spanx></c>
-<c>1</c>
-<c><spanx style="vbare">15&nbsp;&nbsp;32&nbsp;&nbsp;55&nbsp;&nbsp;77&nbsp;101&nbsp;125&nbsp;151&nbsp;175&nbsp;201&nbsp;225</spanx></c>
-<c>2</c>
-<c><spanx style="vbare">19&nbsp;&nbsp;42&nbsp;&nbsp;66&nbsp;&nbsp;89&nbsp;114&nbsp;137&nbsp;162&nbsp;184&nbsp;209&nbsp;230</spanx></c>
-<c>3</c>
-<c><spanx style="vbare">12&nbsp;&nbsp;25&nbsp;&nbsp;50&nbsp;&nbsp;72&nbsp;&nbsp;97&nbsp;120&nbsp;147&nbsp;172&nbsp;200&nbsp;223</spanx></c>
-<c>4</c>
-<c><spanx style="vbare">26&nbsp;&nbsp;44&nbsp;&nbsp;69&nbsp;&nbsp;90&nbsp;114&nbsp;135&nbsp;159&nbsp;180&nbsp;205&nbsp;225</spanx></c>
-<c>5</c>
-<c><spanx style="vbare">13&nbsp;&nbsp;22&nbsp;&nbsp;53&nbsp;&nbsp;80&nbsp;106&nbsp;130&nbsp;156&nbsp;180&nbsp;205&nbsp;228</spanx></c>
-<c>6</c>
-<c><spanx style="vbare">15&nbsp;&nbsp;25&nbsp;&nbsp;44&nbsp;&nbsp;64&nbsp;&nbsp;90&nbsp;115&nbsp;142&nbsp;168&nbsp;196&nbsp;222</spanx></c>
-<c>7</c>
-<c><spanx style="vbare">19&nbsp;&nbsp;24&nbsp;&nbsp;62&nbsp;&nbsp;82&nbsp;100&nbsp;120&nbsp;145&nbsp;168&nbsp;190&nbsp;214</spanx></c>
-<c>8</c>
-<c><spanx style="vbare">22&nbsp;&nbsp;31&nbsp;&nbsp;50&nbsp;&nbsp;79&nbsp;103&nbsp;120&nbsp;151&nbsp;170&nbsp;203&nbsp;227</spanx></c>
-<c>9</c>
-<c><spanx style="vbare">21&nbsp;&nbsp;29&nbsp;&nbsp;45&nbsp;&nbsp;65&nbsp;106&nbsp;124&nbsp;150&nbsp;171&nbsp;196&nbsp;224</spanx></c>
-<c>10</c>
-<c><spanx style="vbare">30&nbsp;&nbsp;49&nbsp;&nbsp;75&nbsp;&nbsp;97&nbsp;121&nbsp;142&nbsp;165&nbsp;186&nbsp;209&nbsp;229</spanx></c>
-<c>11</c>
-<c><spanx style="vbare">19&nbsp;&nbsp;25&nbsp;&nbsp;52&nbsp;&nbsp;70&nbsp;&nbsp;93&nbsp;116&nbsp;143&nbsp;166&nbsp;192&nbsp;219</spanx></c>
-<c>12</c>
-<c><spanx style="vbare">26&nbsp;&nbsp;34&nbsp;&nbsp;62&nbsp;&nbsp;75&nbsp;&nbsp;97&nbsp;118&nbsp;145&nbsp;167&nbsp;194&nbsp;217</spanx></c>
-<c>13</c>
-<c><spanx style="vbare">25&nbsp;&nbsp;33&nbsp;&nbsp;56&nbsp;&nbsp;70&nbsp;&nbsp;91&nbsp;113&nbsp;143&nbsp;165&nbsp;196&nbsp;223</spanx></c>
-<c>14</c>
-<c><spanx style="vbare">21&nbsp;&nbsp;34&nbsp;&nbsp;51&nbsp;&nbsp;72&nbsp;&nbsp;97&nbsp;117&nbsp;145&nbsp;171&nbsp;196&nbsp;222</spanx></c>
-<c>15</c>
-<c><spanx style="vbare">20&nbsp;&nbsp;29&nbsp;&nbsp;50&nbsp;&nbsp;67&nbsp;&nbsp;90&nbsp;117&nbsp;144&nbsp;168&nbsp;197&nbsp;221</spanx></c>
-<c>16</c>
-<c><spanx style="vbare">22&nbsp;&nbsp;31&nbsp;&nbsp;48&nbsp;&nbsp;66&nbsp;&nbsp;95&nbsp;117&nbsp;146&nbsp;168&nbsp;196&nbsp;222</spanx></c>
-<c>17</c>
-<c><spanx style="vbare">24&nbsp;&nbsp;33&nbsp;&nbsp;51&nbsp;&nbsp;77&nbsp;116&nbsp;134&nbsp;158&nbsp;180&nbsp;200&nbsp;224</spanx></c>
-<c>18</c>
-<c><spanx style="vbare">21&nbsp;&nbsp;28&nbsp;&nbsp;70&nbsp;&nbsp;87&nbsp;106&nbsp;124&nbsp;149&nbsp;170&nbsp;194&nbsp;217</spanx></c>
-<c>19</c>
-<c><spanx style="vbare">26&nbsp;&nbsp;33&nbsp;&nbsp;53&nbsp;&nbsp;64&nbsp;&nbsp;83&nbsp;117&nbsp;152&nbsp;173&nbsp;204&nbsp;225</spanx></c>
-<c>20</c>
-<c><spanx style="vbare">27&nbsp;&nbsp;34&nbsp;&nbsp;65&nbsp;&nbsp;95&nbsp;108&nbsp;129&nbsp;155&nbsp;174&nbsp;210&nbsp;225</spanx></c>
-<c>21</c>
-<c><spanx style="vbare">20&nbsp;&nbsp;26&nbsp;&nbsp;72&nbsp;&nbsp;99&nbsp;113&nbsp;131&nbsp;154&nbsp;176&nbsp;200&nbsp;219</spanx></c>
-<c>22</c>
-<c><spanx style="vbare">34&nbsp;&nbsp;43&nbsp;&nbsp;61&nbsp;&nbsp;78&nbsp;&nbsp;93&nbsp;114&nbsp;155&nbsp;177&nbsp;205&nbsp;229</spanx></c>
-<c>23</c>
-<c><spanx style="vbare">23&nbsp;&nbsp;29&nbsp;&nbsp;54&nbsp;&nbsp;97&nbsp;124&nbsp;138&nbsp;163&nbsp;179&nbsp;209&nbsp;229</spanx></c>
-<c>24</c>
-<c><spanx style="vbare">30&nbsp;&nbsp;38&nbsp;&nbsp;56&nbsp;&nbsp;89&nbsp;118&nbsp;129&nbsp;158&nbsp;178&nbsp;200&nbsp;231</spanx></c>
-<c>25</c>
-<c><spanx style="vbare">21&nbsp;&nbsp;29&nbsp;&nbsp;49&nbsp;&nbsp;63&nbsp;&nbsp;85&nbsp;111&nbsp;142&nbsp;163&nbsp;193&nbsp;222</spanx></c>
-<c>26</c>
-<c><spanx style="vbare">27&nbsp;&nbsp;48&nbsp;&nbsp;77&nbsp;103&nbsp;133&nbsp;158&nbsp;179&nbsp;196&nbsp;215&nbsp;232</spanx></c>
-<c>27</c>
-<c><spanx style="vbare">29&nbsp;&nbsp;47&nbsp;&nbsp;74&nbsp;&nbsp;99&nbsp;124&nbsp;151&nbsp;176&nbsp;198&nbsp;220&nbsp;237</spanx></c>
-<c>28</c>
-<c><spanx style="vbare">33&nbsp;&nbsp;42&nbsp;&nbsp;61&nbsp;&nbsp;76&nbsp;&nbsp;93&nbsp;121&nbsp;155&nbsp;174&nbsp;207&nbsp;225</spanx></c>
-<c>29</c>
-<c><spanx style="vbare">29&nbsp;&nbsp;53&nbsp;&nbsp;87&nbsp;112&nbsp;136&nbsp;154&nbsp;170&nbsp;188&nbsp;208&nbsp;227</spanx></c>
-<c>30</c>
-<c><spanx style="vbare">24&nbsp;&nbsp;30&nbsp;&nbsp;52&nbsp;&nbsp;84&nbsp;131&nbsp;150&nbsp;166&nbsp;186&nbsp;203&nbsp;229</spanx></c>
-<c>31</c>
-<c><spanx style="vbare">37&nbsp;&nbsp;48&nbsp;&nbsp;64&nbsp;&nbsp;84&nbsp;104&nbsp;118&nbsp;156&nbsp;177&nbsp;201&nbsp;230</spanx></c>
-</texttable>
-
-<texttable anchor="silk_nlsf_wb_codebook"
-           title="WB Normalized LSF Stage-1 Codebook Vectors">
-<ttcol>I1</ttcol>
-<ttcol>Codebook (Q8)</ttcol>
-<c/>
-<c><spanx style="vbare">&nbsp;0&nbsp;&nbsp;1&nbsp;&nbsp;2&nbsp;&nbsp;3&nbsp;&nbsp;4&nbsp;&nbsp;&nbsp;5&nbsp;&nbsp;&nbsp;6&nbsp;&nbsp;&nbsp;7&nbsp;&nbsp;&nbsp;8&nbsp;&nbsp;&nbsp;9&nbsp;&nbsp;10&nbsp;&nbsp;11&nbsp;&nbsp;12&nbsp;&nbsp;13&nbsp;&nbsp;14&nbsp;&nbsp;15</spanx></c>
-<c>0</c>
-<c><spanx style="vbare">&nbsp;7&nbsp;23&nbsp;38&nbsp;54&nbsp;69&nbsp;&nbsp;85&nbsp;100&nbsp;116&nbsp;131&nbsp;147&nbsp;162&nbsp;178&nbsp;193&nbsp;208&nbsp;223&nbsp;239</spanx></c>
-<c>1</c>
-<c><spanx style="vbare">13&nbsp;25&nbsp;41&nbsp;55&nbsp;69&nbsp;&nbsp;83&nbsp;&nbsp;98&nbsp;112&nbsp;127&nbsp;142&nbsp;157&nbsp;171&nbsp;187&nbsp;203&nbsp;220&nbsp;236</spanx></c>
-<c>2</c>
-<c><spanx style="vbare">15&nbsp;21&nbsp;34&nbsp;51&nbsp;61&nbsp;&nbsp;78&nbsp;&nbsp;92&nbsp;106&nbsp;126&nbsp;136&nbsp;152&nbsp;167&nbsp;185&nbsp;205&nbsp;225&nbsp;240</spanx></c>
-<c>3</c>
-<c><spanx style="vbare">10&nbsp;21&nbsp;36&nbsp;50&nbsp;63&nbsp;&nbsp;79&nbsp;&nbsp;95&nbsp;110&nbsp;126&nbsp;141&nbsp;157&nbsp;173&nbsp;189&nbsp;205&nbsp;221&nbsp;237</spanx></c>
-<c>4</c>
-<c><spanx style="vbare">17&nbsp;20&nbsp;37&nbsp;51&nbsp;59&nbsp;&nbsp;78&nbsp;&nbsp;89&nbsp;107&nbsp;123&nbsp;134&nbsp;150&nbsp;164&nbsp;184&nbsp;205&nbsp;224&nbsp;240</spanx></c>
-<c>5</c>
-<c><spanx style="vbare">10&nbsp;15&nbsp;32&nbsp;51&nbsp;67&nbsp;&nbsp;81&nbsp;&nbsp;96&nbsp;112&nbsp;129&nbsp;142&nbsp;158&nbsp;173&nbsp;189&nbsp;204&nbsp;220&nbsp;236</spanx></c>
-<c>6</c>
-<c><spanx style="vbare">&nbsp;8&nbsp;21&nbsp;37&nbsp;51&nbsp;65&nbsp;&nbsp;79&nbsp;&nbsp;98&nbsp;113&nbsp;126&nbsp;138&nbsp;155&nbsp;168&nbsp;179&nbsp;192&nbsp;209&nbsp;218</spanx></c>
-<c>7</c>
-<c><spanx style="vbare">12&nbsp;15&nbsp;34&nbsp;55&nbsp;63&nbsp;&nbsp;78&nbsp;&nbsp;87&nbsp;108&nbsp;118&nbsp;131&nbsp;148&nbsp;167&nbsp;185&nbsp;203&nbsp;219&nbsp;236</spanx></c>
-<c>8</c>
-<c><spanx style="vbare">16&nbsp;19&nbsp;32&nbsp;36&nbsp;56&nbsp;&nbsp;79&nbsp;&nbsp;91&nbsp;108&nbsp;118&nbsp;136&nbsp;154&nbsp;171&nbsp;186&nbsp;204&nbsp;220&nbsp;237</spanx></c>
-<c>9</c>
-<c><spanx style="vbare">11&nbsp;28&nbsp;43&nbsp;58&nbsp;74&nbsp;&nbsp;89&nbsp;105&nbsp;120&nbsp;135&nbsp;150&nbsp;165&nbsp;180&nbsp;196&nbsp;211&nbsp;226&nbsp;241</spanx></c>
-<c>10</c>
-<c><spanx style="vbare">&nbsp;6&nbsp;16&nbsp;33&nbsp;46&nbsp;60&nbsp;&nbsp;75&nbsp;&nbsp;92&nbsp;107&nbsp;123&nbsp;137&nbsp;156&nbsp;169&nbsp;185&nbsp;199&nbsp;214&nbsp;225</spanx></c>
-<c>11</c>
-<c><spanx style="vbare">11&nbsp;19&nbsp;30&nbsp;44&nbsp;57&nbsp;&nbsp;74&nbsp;&nbsp;89&nbsp;105&nbsp;121&nbsp;135&nbsp;152&nbsp;169&nbsp;186&nbsp;202&nbsp;218&nbsp;234</spanx></c>
-<c>12</c>
-<c><spanx style="vbare">12&nbsp;19&nbsp;29&nbsp;46&nbsp;57&nbsp;&nbsp;71&nbsp;&nbsp;88&nbsp;100&nbsp;120&nbsp;132&nbsp;148&nbsp;165&nbsp;182&nbsp;199&nbsp;216&nbsp;233</spanx></c>
-<c>13</c>
-<c><spanx style="vbare">17&nbsp;23&nbsp;35&nbsp;46&nbsp;56&nbsp;&nbsp;77&nbsp;&nbsp;92&nbsp;106&nbsp;123&nbsp;134&nbsp;152&nbsp;167&nbsp;185&nbsp;204&nbsp;222&nbsp;237</spanx></c>
-<c>14</c>
-<c><spanx style="vbare">14&nbsp;17&nbsp;45&nbsp;53&nbsp;63&nbsp;&nbsp;75&nbsp;&nbsp;89&nbsp;107&nbsp;115&nbsp;132&nbsp;151&nbsp;171&nbsp;188&nbsp;206&nbsp;221&nbsp;240</spanx></c>
-<c>15</c>
-<c><spanx style="vbare">&nbsp;9&nbsp;16&nbsp;29&nbsp;40&nbsp;56&nbsp;&nbsp;71&nbsp;&nbsp;88&nbsp;103&nbsp;119&nbsp;137&nbsp;154&nbsp;171&nbsp;189&nbsp;205&nbsp;222&nbsp;237</spanx></c>
-<c>16</c>
-<c><spanx style="vbare">16&nbsp;19&nbsp;36&nbsp;48&nbsp;57&nbsp;&nbsp;76&nbsp;&nbsp;87&nbsp;105&nbsp;118&nbsp;132&nbsp;150&nbsp;167&nbsp;185&nbsp;202&nbsp;218&nbsp;236</spanx></c>
-<c>17</c>
-<c><spanx style="vbare">12&nbsp;17&nbsp;29&nbsp;54&nbsp;71&nbsp;&nbsp;81&nbsp;&nbsp;94&nbsp;104&nbsp;126&nbsp;136&nbsp;149&nbsp;164&nbsp;182&nbsp;201&nbsp;221&nbsp;237</spanx></c>
-<c>18</c>
-<c><spanx style="vbare">15&nbsp;28&nbsp;47&nbsp;62&nbsp;79&nbsp;&nbsp;97&nbsp;115&nbsp;129&nbsp;142&nbsp;155&nbsp;168&nbsp;180&nbsp;194&nbsp;208&nbsp;223&nbsp;238</spanx></c>
-<c>19</c>
-<c><spanx style="vbare">&nbsp;8&nbsp;14&nbsp;30&nbsp;45&nbsp;62&nbsp;&nbsp;78&nbsp;&nbsp;94&nbsp;111&nbsp;127&nbsp;143&nbsp;159&nbsp;175&nbsp;192&nbsp;207&nbsp;223&nbsp;239</spanx></c>
-<c>20</c>
-<c><spanx style="vbare">17&nbsp;30&nbsp;49&nbsp;62&nbsp;79&nbsp;&nbsp;92&nbsp;107&nbsp;119&nbsp;132&nbsp;145&nbsp;160&nbsp;174&nbsp;190&nbsp;204&nbsp;220&nbsp;235</spanx></c>
-<c>21</c>
-<c><spanx style="vbare">14&nbsp;19&nbsp;36&nbsp;45&nbsp;61&nbsp;&nbsp;76&nbsp;&nbsp;91&nbsp;108&nbsp;121&nbsp;138&nbsp;154&nbsp;172&nbsp;189&nbsp;205&nbsp;222&nbsp;238</spanx></c>
-<c>22</c>
-<c><spanx style="vbare">12&nbsp;18&nbsp;31&nbsp;45&nbsp;60&nbsp;&nbsp;76&nbsp;&nbsp;91&nbsp;107&nbsp;123&nbsp;138&nbsp;154&nbsp;171&nbsp;187&nbsp;204&nbsp;221&nbsp;236</spanx></c>
-<c>23</c>
-<c><spanx style="vbare">13&nbsp;17&nbsp;31&nbsp;43&nbsp;53&nbsp;&nbsp;70&nbsp;&nbsp;83&nbsp;103&nbsp;114&nbsp;131&nbsp;149&nbsp;167&nbsp;185&nbsp;203&nbsp;220&nbsp;237</spanx></c>
-<c>24</c>
-<c><spanx style="vbare">17&nbsp;22&nbsp;35&nbsp;42&nbsp;58&nbsp;&nbsp;78&nbsp;&nbsp;93&nbsp;110&nbsp;125&nbsp;139&nbsp;155&nbsp;170&nbsp;188&nbsp;206&nbsp;224&nbsp;240</spanx></c>
-<c>25</c>
-<c><spanx style="vbare">&nbsp;8&nbsp;15&nbsp;34&nbsp;50&nbsp;67&nbsp;&nbsp;83&nbsp;&nbsp;99&nbsp;115&nbsp;131&nbsp;146&nbsp;162&nbsp;178&nbsp;193&nbsp;209&nbsp;224&nbsp;239</spanx></c>
-<c>26</c>
-<c><spanx style="vbare">13&nbsp;16&nbsp;41&nbsp;66&nbsp;73&nbsp;&nbsp;86&nbsp;&nbsp;95&nbsp;111&nbsp;128&nbsp;137&nbsp;150&nbsp;163&nbsp;183&nbsp;206&nbsp;225&nbsp;241</spanx></c>
-<c>27</c>
-<c><spanx style="vbare">17&nbsp;25&nbsp;37&nbsp;52&nbsp;63&nbsp;&nbsp;75&nbsp;&nbsp;92&nbsp;102&nbsp;119&nbsp;132&nbsp;144&nbsp;160&nbsp;175&nbsp;191&nbsp;212&nbsp;231</spanx></c>
-<c>28</c>
-<c><spanx style="vbare">19&nbsp;31&nbsp;49&nbsp;65&nbsp;83&nbsp;100&nbsp;117&nbsp;133&nbsp;147&nbsp;161&nbsp;174&nbsp;187&nbsp;200&nbsp;213&nbsp;227&nbsp;242</spanx></c>
-<c>29</c>
-<c><spanx style="vbare">18&nbsp;31&nbsp;52&nbsp;68&nbsp;88&nbsp;103&nbsp;117&nbsp;126&nbsp;138&nbsp;149&nbsp;163&nbsp;177&nbsp;192&nbsp;207&nbsp;223&nbsp;239</spanx></c>
-<c>30</c>
-<c><spanx style="vbare">16&nbsp;29&nbsp;47&nbsp;61&nbsp;76&nbsp;&nbsp;90&nbsp;106&nbsp;119&nbsp;133&nbsp;147&nbsp;161&nbsp;176&nbsp;193&nbsp;209&nbsp;224&nbsp;240</spanx></c>
-<c>31</c>
-<c><spanx style="vbare">15&nbsp;21&nbsp;35&nbsp;50&nbsp;61&nbsp;&nbsp;73&nbsp;&nbsp;86&nbsp;&nbsp;97&nbsp;110&nbsp;119&nbsp;129&nbsp;141&nbsp;175&nbsp;198&nbsp;218&nbsp;237</spanx></c>
-</texttable>
-
-<t>
-Given the stage-1 codebook entry cb1_Q8[], the stage-2 residual res_Q10[], and
- their corresponding weights, w_Q9[], the reconstructed normalized LSF
- coefficients are
-<figure align="center">
-<artwork align="center"><![CDATA[
-NLSF_Q15[k] = clamp(0,
-               (cb1_Q8[k]<<7) + (res_Q10[k]<<14)/w_Q9[k], 32767) ,
-]]></artwork>
-</figure>
- where the division is integer division.
-However, nothing in either the reconstruction process or the
- quantization process in the encoder thus far guarantees that the coefficients
- are monotonically increasing and separated well enough to ensure a stable
- filter <xref target="Kabal86"/>.
-When using the reference encoder, roughly 2% of frames violate this constraint.
-The next section describes a stabilization procedure used to make these
- guarantees.
-</t>
-
-</section>
-
-<section anchor="silk_nlsf_stabilization" title="Normalized LSF Stabilization">
-<t>
-The normalized LSF stabilization procedure is implemented in
- silk_NLSF_stabilize() (NLSF_stabilize.c).
-This process ensures that consecutive values of the normalized LSF
- coefficients, NLSF_Q15[], are spaced some minimum distance apart
- (predetermined to be the 0.01 percentile of a large training set).
-<xref target="silk_nlsf_min_spacing"/> gives the minimum spacings for NB and MB
- and those for WB, where row k is the minimum allowed value of
- NLSF_Q[k]-NLSF_Q[k-1].
-For the purposes of computing this spacing for the first and last coefficient,
- NLSF_Q15[-1] is taken to be 0, and NLSF_Q15[d_LPC] is taken to be 32768.
-</t>
-
-<texttable anchor="silk_nlsf_min_spacing"
-           title="Minimum Spacing for Normalized LSF Coefficients">
-<ttcol>Coefficient</ttcol>
-<ttcol align="right">NB and MB</ttcol>
-<ttcol align="right">WB</ttcol>
- <c>0</c> <c>250</c> <c>100</c>
- <c>1</c>   <c>3</c>   <c>3</c>
- <c>2</c>   <c>6</c>  <c>40</c>
- <c>3</c>   <c>3</c>   <c>3</c>
- <c>4</c>   <c>3</c>   <c>3</c>
- <c>5</c>   <c>3</c>   <c>3</c>
- <c>6</c>   <c>4</c>   <c>5</c>
- <c>7</c>   <c>3</c>  <c>14</c>
- <c>8</c>   <c>3</c>  <c>14</c>
- <c>9</c>   <c>3</c>  <c>10</c>
-<c>10</c> <c>461</c>  <c>11</c>
-<c>11</c>       <c/>   <c>3</c>
-<c>12</c>       <c/>   <c>8</c>
-<c>13</c>       <c/>   <c>9</c>
-<c>14</c>       <c/>   <c>7</c>
-<c>15</c>       <c/>   <c>3</c>
-<c>16</c>       <c/> <c>347</c>
-</texttable>
-
-<t>
-The procedure starts off by trying to make small adjustments which attempt to
- minimize the amount of distortion introduced.
-After 20 such adjustments, it falls back to a more direct method which
- guarantees the constraints are enforced but may require large adjustments.
-</t>
-<t>
-Let NDeltaMin_Q15[k] be the minimum required spacing for the current audio
- bandwidth from <xref target="silk_nlsf_min_spacing"/>.
-First, the procedure finds the index i where
- NLSF_Q15[i]&nbsp;-&nbsp;NLSF_Q15[i-1]&nbsp;-&nbsp;NDeltaMin_Q15[i] is the
- smallest, breaking ties by using the lower value of i.
-If this value is non-negative, then the stabilization stops; the coefficients
- satisfy all the constraints.
-Otherwise, if i&nbsp;==&nbsp;0, it sets NLSF_Q15[0] to NDeltaMin_Q15[0], and if
- i&nbsp;==&nbsp;d_LPC, it sets NLSF_Q15[d_LPC-1] to
- (32768&nbsp;-&nbsp;NDeltaMin_Q15[d_LPC]).
-For all other values of i, both NLSF_Q15[i-1] and NLSF_Q15[i] are updated as
- follows:
-<figure align="center">
-<artwork align="center"><![CDATA[
-                                          i-1
-                                          __
- min_center_Q15 = (NDeltaMin_Q15[i]>>1) + \  NDeltaMin_Q15[k]
-                                          /_
-                                          k=0
-                                                 d_LPC
-                                                  __
- max_center_Q15 = 32768 - (NDeltaMin_Q15[i]>>1) - \  NDeltaMin_Q15[k]
-                                                  /_
-                                                 k=i+1
-center_freq_Q15 = clamp(min_center_Q15[i],
-                        (NLSF_Q15[i-1] + NLSF_Q15[i] + 1)>>1,
-                        max_center_Q15[i])
-
- NLSF_Q15[i-1] = center_freq_Q15 - (NDeltaMin_Q15[i]>>1)
-
-   NLSF_Q15[i] = NLSF_Q15[i-1] + NDeltaMin_Q15[i] .
-]]></artwork>
-</figure>
-Then the procedure repeats again, until it has either executed 20 times or
- has stopped because the coefficients satisfy all the constraints.
-</t>
-<t>
-After the 20th repetition of the above procedure, the following fallback
- procedure executes once.
-First, the values of NLSF_Q15[k] for 0&nbsp;&lt;=&nbsp;k&nbsp;&lt;&nbsp;d_LPC
- are sorted in ascending order.
-Then for each value of k from 0 to d_LPC-1, NLSF_Q15[k] is set to
-<figure align="center">
-<artwork align="center"><![CDATA[
-max(NLSF_Q15[k], NLSF_Q15[k-1] + NDeltaMin_Q15[k]) .
-]]></artwork>
-</figure>
-Next, for each value of k from d_LPC-1 down to 0, NLSF_Q15[k] is set to
-<figure align="center">
-<artwork align="center"><![CDATA[
-min(NLSF_Q15[k], NLSF_Q15[k+1] - NDeltaMin_Q15[k+1]) .
-]]></artwork>
-</figure>
-</t>
-
-</section>
-
-<section anchor="silk_nlsf_interpolation" title="Normalized LSF Interpolation">
-<t>
-For 20&nbsp;ms SILK frames, the first half of the frame (i.e., the first two
- subframes) may use normalized LSF coefficients that are interpolated between
- the decoded LSFs for the most recent coded frame (in the same channel) and the
- current frame.
-A Q2 interpolation factor follows the LSF coefficient indices in the bitstream,
- which is decoded using the PDF in <xref target="silk_nlsf_interp_pdf"/>.
-This happens in silk_decode_indices() (decode_indices.c).
-After either
-<list style="symbols">
-<t>An uncoded regular SILK frame in the side channel, or</t>
-<t>A decoder reset (see <xref target="decoder-reset"/>),</t>
-</list>
- the decoder still decodes this factor, but ignores its value and always uses
- 4 instead.
-For 10&nbsp;ms SILK frames, this factor is not stored at all.
-</t>
-
-<texttable anchor="silk_nlsf_interp_pdf"
-           title="PDF for Normalized LSF Interpolation Index">
-<ttcol>PDF</ttcol>
-<c>{13, 22, 29, 11, 181}/256</c>
-</texttable>
-
-<t>
-Let n2_Q15[k] be the normalized LSF coefficients decoded by the procedure in
- <xref target="silk_nlsfs"/>, n0_Q15[k] be the LSF coefficients
- decoded for the prior frame, and w_Q2 be the interpolation factor.
-Then the normalized LSF coefficients used for the first half of a 20&nbsp;ms
- frame, n1_Q15[k], are
-<figure align="center">
-<artwork align="center"><![CDATA[
-n1_Q15[k] = n0_Q15[k] + (w_Q2*(n2_Q15[k] - n0_Q15[k]) >> 2) .
-]]></artwork>
-</figure>
-This interpolation is performed in silk_decode_parameters()
- (decode_parameters.c).
-</t>
-</section>
-
-<section anchor="silk_nlsf2lpc"
- title="Converting Normalized LSFs to LPC Coefficients">
-<t>
-Any LPC filter A(z) can be split into a symmetric part P(z) and an
- anti-symmetric part Q(z) such that
-<figure align="center">
-<artwork align="center"><![CDATA[
-          d_LPC
-           __         -k   1
-A(z) = 1 - \  a[k] * z   = - * (P(z) + Q(z))
-           /_              2
-           k=1
-]]></artwork>
-</figure>
-with
-<figure align="center">
-<artwork align="center"><![CDATA[
-               -d_LPC-1      -1
-P(z) = A(z) + z         * A(z  )
-
-               -d_LPC-1      -1
-Q(z) = A(z) - z         * A(z  ) .
-]]></artwork>
-</figure>
-The even normalized LSF coefficients correspond to a pair of conjugate roots of
- P(z), while the odd coefficients correspond to a pair of conjugate roots of
- Q(z), all of which lie on the unit circle.
-In addition, P(z) has a root at pi and Q(z) has a root at 0.
-Thus, they may be reconstructed mathematically from a set of normalized LSF
- coefficients, n[k], as
-<figure align="center">
-<artwork align="center"><![CDATA[
-                 d_LPC/2-1
-             -1     ___                        -1    -2
-P(z) = (1 + z  ) *  | |  (1 - 2*cos(pi*n[2*k])*z  + z  )
-                    k=0
-
-                 d_LPC/2-1
-             -1     ___                          -1    -2
-Q(z) = (1 - z  ) *  | |  (1 - 2*cos(pi*n[2*k+1])*z  + z  )
-                    k=0
-]]></artwork>
-</figure>
-</t>
-<t>
-However, SILK performs this reconstruction using a fixed-point approximation so
- that all decoders can reproduce it in a bit-exact manner to avoid prediction
- drift.
-The function silk_NLSF2A() (NLSF2A.c) implements this procedure.
-</t>
-<t>
-To start, it approximates cos(pi*n[k]) using a table lookup with linear
- interpolation.
-The encoder SHOULD use the inverse of this piecewise linear approximation,
- rather than the true inverse of the cosine function, when deriving the
- normalized LSF coefficients.
-These values are also re-ordered to improve numerical accuracy when
- constructing the LPC polynomials.
-</t>
-
-<texttable anchor="silk_nlsf_orderings"
-           title="LSF Ordering for Polynomial Evaluation">
-<ttcol>Coefficient</ttcol>
-<ttcol align="right">NB and MB</ttcol>
-<ttcol align="right">WB</ttcol>
- <c>0</c>  <c>0</c>  <c>0</c>
- <c>1</c>  <c>9</c> <c>15</c>
- <c>2</c>  <c>6</c>  <c>8</c>
- <c>3</c>  <c>3</c>  <c>7</c>
- <c>4</c>  <c>4</c>  <c>4</c>
- <c>5</c>  <c>5</c> <c>11</c>
- <c>6</c>  <c>8</c> <c>12</c>
- <c>7</c>  <c>1</c>  <c>3</c>
- <c>8</c>  <c>2</c>  <c>2</c>
- <c>9</c>  <c>7</c> <c>13</c>
-<c>10</c>      <c/> <c>10</c>
-<c>11</c>      <c/>  <c>5</c>
-<c>12</c>      <c/>  <c>6</c>
-<c>13</c>      <c/>  <c>9</c>
-<c>14</c>      <c/> <c>14</c>
-<c>15</c>      <c/>  <c>1</c>
-</texttable>
-
-<t>
-The top 7 bits of each normalized LSF coefficient index a value in the table,
- and the next 8 bits interpolate between it and the next value.
-Let i&nbsp;=&nbsp;(n[k]&nbsp;&gt;&gt;&nbsp;8) be the integer index and
- f&nbsp;=&nbsp;(n[k]&nbsp;&amp;&nbsp;255) be the fractional part of a given
- coefficient.
-Then the re-ordered, approximated cosine, c_Q17[ordering[k]], is
-<figure align="center">
-<artwork align="center"><![CDATA[
-c_Q17[ordering[k]] = (cos_Q12[i]*256
-                      + (cos_Q12[i+1]-cos_Q12[i])*f + 4) >> 3 ,
-]]></artwork>
-</figure>
- where ordering[k] is the k'th entry of the column of
- <xref target="silk_nlsf_orderings"/> corresponding to the current audio
- bandwidth and cos_Q12[i] is the i'th entry of <xref target="silk_cos_table"/>.
-</t>
-
-<texttable anchor="silk_cos_table"
-           title="Q12 Cosine Table for LSF Conversion">
-<ttcol align="right">i</ttcol>
-<ttcol align="right">+0</ttcol>
-<ttcol align="right">+1</ttcol>
-<ttcol align="right">+2</ttcol>
-<ttcol align="right">+3</ttcol>
-<c>0</c>
- <c>4096</c> <c>4095</c> <c>4091</c> <c>4085</c>
-<c>4</c>
- <c>4076</c> <c>4065</c> <c>4052</c> <c>4036</c>
-<c>8</c>
- <c>4017</c> <c>3997</c> <c>3973</c> <c>3948</c>
-<c>12</c>
- <c>3920</c> <c>3889</c> <c>3857</c> <c>3822</c>
-<c>16</c>
- <c>3784</c> <c>3745</c> <c>3703</c> <c>3659</c>
-<c>20</c>
- <c>3613</c> <c>3564</c> <c>3513</c> <c>3461</c>
-<c>24</c>
- <c>3406</c> <c>3349</c> <c>3290</c> <c>3229</c>
-<c>28</c>
- <c>3166</c> <c>3102</c> <c>3035</c> <c>2967</c>
-<c>32</c>
- <c>2896</c> <c>2824</c> <c>2751</c> <c>2676</c>
-<c>36</c>
- <c>2599</c> <c>2520</c> <c>2440</c> <c>2359</c>
-<c>40</c>
- <c>2276</c> <c>2191</c> <c>2106</c> <c>2019</c>
-<c>44</c>
- <c>1931</c> <c>1842</c> <c>1751</c> <c>1660</c>
-<c>48</c>
- <c>1568</c> <c>1474</c> <c>1380</c> <c>1285</c>
-<c>52</c>
- <c>1189</c> <c>1093</c>  <c>995</c>  <c>897</c>
-<c>56</c>
-  <c>799</c>  <c>700</c>  <c>601</c>  <c>501</c>
-<c>60</c>
-  <c>401</c>  <c>301</c>  <c>201</c>  <c>101</c>
-<c>64</c>
-    <c>0</c> <c>-101</c> <c>-201</c> <c>-301</c>
-<c>68</c>
- <c>-401</c> <c>-501</c> <c>-601</c> <c>-700</c>
-<c>72</c>
- <c>-799</c> <c>-897</c> <c>-995</c> <c>-1093</c>
-<c>76</c>
-<c>-1189</c><c>-1285</c><c>-1380</c><c>-1474</c>
-<c>80</c>
-<c>-1568</c><c>-1660</c><c>-1751</c><c>-1842</c>
-<c>84</c>
-<c>-1931</c><c>-2019</c><c>-2106</c><c>-2191</c>
-<c>88</c>
-<c>-2276</c><c>-2359</c><c>-2440</c><c>-2520</c>
-<c>92</c>
-<c>-2599</c><c>-2676</c><c>-2751</c><c>-2824</c>
-<c>96</c>
-<c>-2896</c><c>-2967</c><c>-3035</c><c>-3102</c>
-<c>100</c>
-<c>-3166</c><c>-3229</c><c>-3290</c><c>-3349</c>
-<c>104</c>
-<c>-3406</c><c>-3461</c><c>-3513</c><c>-3564</c>
-<c>108</c>
-<c>-3613</c><c>-3659</c><c>-3703</c><c>-3745</c>
-<c>112</c>
-<c>-3784</c><c>-3822</c><c>-3857</c><c>-3889</c>
-<c>116</c>
-<c>-3920</c><c>-3948</c><c>-3973</c><c>-3997</c>
-<c>120</c>
-<c>-4017</c><c>-4036</c><c>-4052</c><c>-4065</c>
-<c>124</c>
-<c>-4076</c><c>-4085</c><c>-4091</c><c>-4095</c>
-<c>128</c>
-<c>-4096</c>        <c/>        <c/>        <c/>
-</texttable>
-
-<t>
-Given the list of cosine values, silk_NLSF2A_find_poly() (NLSF2A.c)
- computes the coefficients of P and Q, described here via a simple recurrence.
-Let p_Q16[k][j] and q_Q16[k][j] be the coefficients of the products of the
- first (k+1) root pairs for P and Q, with j indexing the coefficient number.
-Only the first (k+2) coefficients are needed, as the products are symmetric.
-Let p_Q16[0][0]&nbsp;=&nbsp;q_Q16[0][0]&nbsp;=&nbsp;1&lt;&lt;16,
- p_Q16[0][1]&nbsp;=&nbsp;-c_Q17[0], q_Q16[0][1]&nbsp;=&nbsp;-c_Q17[1], and
- d2&nbsp;=&nbsp;d_LPC/2.
-As boundary conditions, assume
- p_Q16[k][j]&nbsp;=&nbsp;q_Q16[k][j]&nbsp;=&nbsp;0 for all
- j&nbsp;&lt;&nbsp;0.
-Also, assume p_Q16[k][k+2]&nbsp;=&nbsp;p_Q16[k][k] and
- q_Q16[k][k+2]&nbsp;=&nbsp;q_Q16[k][k] (because of the symmetry).
-Then, for 0&nbsp;&lt;&nbsp;k&nbsp;&lt;&nbsp;d2 and 0&nbsp;&lt;=&nbsp;j&nbsp;&lt;=&nbsp;k+1,
-<figure align="center">
-<artwork align="center"><![CDATA[
-p_Q16[k][j] = p_Q16[k-1][j] + p_Q16[k-1][j-2]
-              - ((c_Q17[2*k]*p_Q16[k-1][j-1] + 32768)>>16) ,
-
-q_Q16[k][j] = q_Q16[k-1][j] + q_Q16[k-1][j-2]
-              - ((c_Q17[2*k+1]*q_Q16[k-1][j-1] + 32768)>>16) .
-]]></artwork>
-</figure>
-The use of Q17 values for the cosine terms in an otherwise Q16 expression
- implicitly scales them by a factor of 2.
-The multiplications in this recurrence may require up to 48 bits of precision
- in the result to avoid overflow.
-In practice, each row of the recurrence only depends on the previous row, so an
- implementation does not need to store all of them.
-</t>
-<t>
-silk_NLSF2A() uses the values from the last row of this recurrence to
- reconstruct a 32-bit version of the LPC filter (without the leading 1.0
- coefficient), a32_Q17[k], 0&nbsp;&lt;=&nbsp;k&nbsp;&lt;&nbsp;d2:
-<figure align="center">
-<artwork align="center"><![CDATA[
-a32_Q17[k]         = -(q_Q16[d2-1][k+1] - q_Q16[d2-1][k])
-                     - (p_Q16[d2-1][k+1] + p_Q16[d2-1][k])) ,
-
-a32_Q17[d_LPC-k-1] =  (q_Q16[d2-1][k+1] - q_Q16[d2-1][k])
-                     - (p_Q16[d2-1][k+1] + p_Q16[d2-1][k])) .
-]]></artwork>
-</figure>
-The sum and difference of two terms from each of the p_Q16 and q_Q16
- coefficient lists reflect the (1&nbsp;+&nbsp;z**-1) and
- (1&nbsp;-&nbsp;z**-1) factors of P and Q, respectively.
-The promotion of the expression from Q16 to Q17 implicitly scales the result
- by 1/2.
-</t>
-</section>
-
-<section anchor="silk_lpc_range_limit"
- title="Limiting the Range of the LPC Coefficients">
-<t>
-The a32_Q17[] coefficients are too large to fit in a 16-bit value, which
- significantly increases the cost of applying this filter in fixed-point
- decoders.
-Reducing them to Q12 precision doesn't incur any significant quality loss,
- but still does not guarantee they will fit.
-silk_NLSF2A() applies up to 10 rounds of bandwidth expansion to limit
- the dynamic range of these coefficients.
-Even floating-point decoders SHOULD perform these steps, to avoid mismatch.
-</t>
-<t>
-For each round, the process first finds the index k such that abs(a32_Q17[k])
- is largest, breaking ties by choosing the lowest value of k.
-Then, it computes the corresponding Q12 precision value, maxabs_Q12, subject to
- an upper bound to avoid overflow in subsequent computations:
-<figure align="center">
-<artwork align="center"><![CDATA[
-maxabs_Q12 = min((maxabs_Q17 + 16) >> 5, 163838) .
-]]></artwork>
-</figure>
-If this is larger than 32767, the procedure derives the chirp factor,
- sc_Q16[0], to use in the bandwidth expansion as
-<figure align="center">
-<artwork align="center"><![CDATA[
-                    (maxabs_Q12 - 32767) << 14
-sc_Q16[0] = 65470 - -------------------------- ,
-                    (maxabs_Q12 * (k+1)) >> 2
-]]></artwork>
-</figure>
- where the division here is integer division.
-This is an approximation of the chirp factor needed to reduce the target
- coefficient to 32767, though it is both less than 0.999 and, for
- k&nbsp;&gt;&nbsp;0 when maxabs_Q12 is much greater than 32767, still slightly
- too large.
-The upper bound on maxabs_Q12, 163838, was chosen because it is equal to
- ((2**31&nbsp;-&nbsp;1)&nbsp;&gt;&gt;&nbsp;14)&nbsp;+&nbsp;32767, i.e., the
- largest value of maxabs_Q12 that would not overflow the numerator in the
- equation above when stored in a signed 32-bit integer.
-</t>
-<t>
-silk_bwexpander_32() (bwexpander_32.c) performs the bandwidth expansion (again,
- only when maxabs_Q12 is greater than 32767) using the following recurrence:
-<figure align="center">
-<artwork align="center"><![CDATA[
- a32_Q17[k] = (a32_Q17[k]*sc_Q16[k]) >> 16
-
-sc_Q16[k+1] = (sc_Q16[0]*sc_Q16[k] + 32768) >> 16
-]]></artwork>
-</figure>
-The first multiply may require up to 48 bits of precision in the result to
- avoid overflow.
-The second multiply must be unsigned to avoid overflow with only 32 bits of
- precision.
-The reference implementation uses a slightly more complex formulation that
- avoids the 32-bit overflow using signed multiplication, but is otherwise
- equivalent.
-</t>
-<t>
-After 10 rounds of bandwidth expansion are performed, they are simply saturated
- to 16 bits:
-<figure align="center">
-<artwork align="center"><![CDATA[
-a32_Q17[k] = clamp(-32768, (a32_Q17[k] + 16) >> 5, 32767) << 5 .
-]]></artwork>
-</figure>
-Because this performs the actual saturation in the Q12 domain, but converts the
- coefficients back to the Q17 domain for the purposes of prediction gain
- limiting, this step must be performed after the 10th round of bandwidth
- expansion, regardless of whether or not the Q12 version of any coefficient
- still overflows a 16-bit integer.
-This saturation is not performed if maxabs_Q12 drops to 32767 or less prior to
- the 10th round.
-</t>
-</section>
-
-<section anchor="silk_lpc_gain_limit"
- title="Limiting the Prediction Gain of the LPC Filter">
-<t>
-The prediction gain of an LPC synthesis filter is the square-root of the output
- energy when the filter is excited by a unit-energy impulse.
-Even if the Q12 coefficients would fit, the resulting filter may still have a
- significant gain (especially for voiced sounds), making the filter unstable.
-silk_NLSF2A() applies up to 18 additional rounds of bandwidth expansion to
- limit the prediction gain.
-Instead of controlling the amount of bandwidth expansion using the prediction
- gain itself (which may diverge to infinity for an unstable filter),
- silk_NLSF2A() uses silk_LPC_inverse_pred_gain_QA() (LPC_inv_pred_gain.c) to
- compute the reflection coefficients associated with the filter.
-The filter is stable if and only if the magnitude of these coefficients is
- sufficiently less than one.
-The reflection coefficients, rc[k], can be computed using a simple Levinson
- recurrence, initialized with the LPC coefficients
- a[d_LPC-1][n]&nbsp;=&nbsp;a[n], and then updated via
-<figure align="center">
-<artwork align="center"><![CDATA[
-    rc[k] = -a[k][k] ,
-
-            a[k][n] - a[k][k-n-1]*rc[k]
-a[k-1][n] = --------------------------- .
-                             2
-                    1 - rc[k]
-]]></artwork>
-</figure>
-</t>
-<t>
-However, silk_LPC_inverse_pred_gain_QA() approximates this using fixed-point
- arithmetic to guarantee reproducible results across platforms and
- implementations.
-Since small changes in the coefficients can make a stable filter unstable, it
- takes the real Q12 coefficients that will be used during reconstruction as
- input.
-Thus, let
-<figure align="center">
-<artwork align="center"><![CDATA[
-a32_Q12[n] = (a32_Q17[n] + 16) >> 5
-]]></artwork>
-</figure>
- be the Q12 version of the LPC coefficients that will eventually be used.
-As a simple initial check, the decoder computes the DC response as
-<figure align="center">
-<artwork align="center"><![CDATA[
-        d_PLC-1
-          __
-DC_resp = \   a32_Q12[n]
-          /_
-          n=0
-]]></artwork>
-</figure>
- and if DC_resp&nbsp;&gt;&nbsp;4096, the filter is unstable.
-</t>
-<t>
-Increasing the precision of these Q12 coefficients to Q24 for intermediate
- computations allows more accurate computation of the reflection coefficients,
- so the decoder initializes the recurrence via
-<figure align="center">
-<artwork align="center"><![CDATA[
-a32_Q24[d_LPC-1][n] = a32_Q12[n] << 12 .
-]]></artwork>
-</figure>
-Then for each k from d_LPC-1 down to 0, if
- abs(a32_Q24[k][k])&nbsp;&gt;&nbsp;16773022, the filter is unstable and the
- recurrence stops.
-The constant 16773022 here is approximately 0.99975 in Q24.
-Otherwise, row k-1 of a32_Q24 is computed from row k as
-<figure align="center">
-<artwork align="center"><![CDATA[
-      rc_Q31[k] = -a32_Q24[k][k] << 7 ,
-
-     div_Q30[k] = (1<<30) - (rc_Q31[k]*rc_Q31[k] >> 32) ,
-
-          b1[k] = ilog(div_Q30[k]) ,
-
-          b2[k] = b1[k] - 16 ,
-
-                        (1<<29) - 1
-     inv_Qb2[k] = ----------------------- ,
-                  div_Q30[k] >> (b2[k]+1)
-
-     err_Q29[k] = (1<<29)
-                  - ((div_Q30[k]<<(15-b2[k]))*inv_Qb2[k] >> 16) ,
-
-    gain_Qb1[k] = ((inv_Qb2[k] << 16)
-                   + (err_Q29[k]*inv_Qb2[k] >> 13)) ,
-
-num_Q24[k-1][n] = a32_Q24[k][n]
-                  - ((a32_Q24[k][k-n-1]*rc_Q31[k] + (1<<30)) >> 31) ,
-
-a32_Q24[k-1][n] = (num_Q24[k-1][n]*gain_Qb1[k]
-                   + (1<<(b1[k]-1))) >> b1[k] ,
-]]></artwork>
-</figure>
- where 0&nbsp;&lt;=&nbsp;n&nbsp;&lt;&nbsp;k.
-Here, rc_Q30[k] are the reflection coefficients.
-div_Q30[k] is the denominator for each iteration, and gain_Qb1[k] is its
- multiplicative inverse (with b1[k] fractional bits, where b1[k] ranges from
- 20 to 31).
-inv_Qb2[k], which ranges from 16384 to 32767, is a low-precision version of
- that inverse (with b2[k] fractional bits).
-err_Q29[k] is the residual error, ranging from -32763 to 32392, which is used
- to improve the accuracy.
-The values t_Q24[k-1][n] for each n are the numerators for the next row of
- coefficients in the recursion, and a32_Q24[k-1][n] is the final version of
- that row.
-Every multiply in this procedure except the one used to compute gain_Qb1[k]
- requires more than 32 bits of precision, but otherwise all intermediate
- results fit in 32 bits or less.
-In practice, because each row only depends on the next one, an implementation
- does not need to store them all.
-</t>
-<t>
-If abs(a32_Q24[k][k])&nbsp;&lt;=&nbsp;16773022 for
- 0&nbsp;&lt;=&nbsp;k&nbsp;&lt;&nbsp;d_LPC, then the filter is considered stable.
-However, the problem of determining stability is ill-conditioned when the
- filter contains several reflection coefficients whose magnitude is very close
- to one.
-This fixed-point algorithm is not mathematically guaranteed to correctly
- classify filters as stable or unstable in this case, though it does very well
- in practice.
-</t>
-<t>
-On round i, 1&nbsp;&lt;=&nbsp;i&nbsp;&lt;=&nbsp;18, if the filter passes these
- stability checks, then this procedure stops, and the final LPC coefficients to
- use for reconstruction in <xref target="silk_lpc_synthesis"/> are
-<figure align="center">
-<artwork align="center"><![CDATA[
-a_Q12[k] = (a32_Q17[k] + 16) >> 5 .
-]]></artwork>
-</figure>
-Otherwise, a round of bandwidth expansion is applied using the same procedure
- as in <xref target="silk_lpc_range_limit"/>, with
-<figure align="center">
-<artwork align="center"><![CDATA[
-sc_Q16[0] = 65536 - (2<<i) .
-]]></artwork>
-</figure>
-During the 15th round, sc_Q16[0] becomes 0 in the above equation, so a_Q12[k]
- is set to 0 for all k, guaranteeing a stable filter.
-</t>
-</section>
-
-</section>
-
-<section anchor="silk_ltp_params" toc="include"
- title="Long-Term Prediction (LTP) Parameters">
-<t>
-After the normalized LSF indices and, for 20&nbsp;ms frames, the LSF
- interpolation index, voiced frames (see <xref target="silk_frame_type"/>)
- include additional LTP parameters.
-There is one primary lag index for each SILK frame, but this is refined to
- produce a separate lag index per subframe using a vector quantizer.
-Each subframe also gets its own prediction gain coefficient.
-</t>
-
-<section anchor="silk_ltp_lags" title="Pitch Lags">
-<t>
-The primary lag index is coded either relative to the primary lag of the prior
- frame in the same channel, or as an absolute index.
-Absolute coding is used if and only if
-<list style="symbols">
-<t>
-This is the first SILK frame of its type (LBRR or regular) for this channel in
- the current Opus frame,
-</t>
-<t>
-The previous SILK frame of the same type (LBRR or regular) for this channel in
- the same Opus frame was not coded, or
-</t>
-<t>
-That previous SILK frame was coded, but was not voiced (see
- <xref target="silk_frame_type"/>).
-</t>
-</list>
-</t>
-
-<t>
-With absolute coding, the primary pitch lag may range from 2&nbsp;ms
- (inclusive) up to 18&nbsp;ms (exclusive), corresponding to pitches from
- 500&nbsp;Hz down to 55.6&nbsp;Hz, respectively.
-It is comprised of a high part and a low part, where the decoder reads the high
- part using the 32-entry codebook in <xref target="silk_abs_pitch_high_pdf"/>
- and the low part using the codebook corresponding to the current audio
- bandwidth from <xref target="silk_abs_pitch_low_pdf"/>.
-The final primary pitch lag is then
-<figure align="center">
-<artwork align="center"><![CDATA[
-lag = lag_high*lag_scale + lag_low + lag_min
-]]></artwork>
-</figure>
- where lag_high is the high part, lag_low is the low part, and lag_scale
- and lag_min are the values from the "Scale" and "Minimum Lag" columns of
- <xref target="silk_abs_pitch_low_pdf"/>, respectively.
-</t>
-
-<texttable anchor="silk_abs_pitch_high_pdf"
- title="PDF for High Part of Primary Pitch Lag">
-<ttcol align="left">PDF</ttcol>
-<c>{3,   3,   6,  11,  21,  30,  32,  19,
-   11,  10,  12,  13,  13,  12,  11,   9,
-    8,   7,   6,   4,   2,   2,   2,   1,
-    1,   1,   1,   1,   1,   1,   1,   1}/256</c>
-</texttable>
-
-<texttable anchor="silk_abs_pitch_low_pdf"
- title="PDF for Low Part of Primary Pitch Lag">
-<ttcol>Audio Bandwidth</ttcol>
-<ttcol>PDF</ttcol>
-<ttcol>Scale</ttcol>
-<ttcol>Minimum Lag</ttcol>
-<ttcol>Maximum Lag</ttcol>
-<c>NB</c> <c>{64, 64, 64, 64}/256</c>                 <c>4</c> <c>16</c> <c>144</c>
-<c>MB</c> <c>{43, 42, 43, 43, 42, 43}/256</c>         <c>6</c> <c>24</c> <c>216</c>
-<c>WB</c> <c>{32, 32, 32, 32, 32, 32, 32, 32}/256</c> <c>8</c> <c>32</c> <c>288</c>
-</texttable>
-
-<t>
-All frames that do not use absolute coding for the primary lag index use
- relative coding instead.
-The decoder reads a single delta value using the 21-entry PDF in
- <xref target="silk_rel_pitch_pdf"/>.
-If the resulting value is zero, it falls back to the absolute coding procedure
- from the prior paragraph.
-Otherwise, the final primary pitch lag is then
-<figure align="center">
-<artwork align="center"><![CDATA[
-lag = previous_lag + (delta_lag_index - 9)
-]]></artwork>
-</figure>
- where previous_lag is the primary pitch lag from the most recent frame in the
- same channel and delta_lag_index is the value just decoded.
-This allows a per-frame change in the pitch lag of -8 to +11 samples.
-The decoder does no clamping at this point, so this value can fall outside the
- range of 2&nbsp;ms to 18&nbsp;ms, and the decoder must use this unclamped
- value when using relative coding in the next SILK frame (if any).
-However, because an Opus frame can use relative coding for at most two
- consecutive SILK frames, integer overflow should not be an issue.
-</t>
-
-<texttable anchor="silk_rel_pitch_pdf"
- title="PDF for Primary Pitch Lag Change">
-<ttcol align="left">PDF</ttcol>
-<c>{46,  2,  2,  3,  4,  6, 10, 15,
-    26, 38, 30, 22, 15, 10,  7,  6,
-     4,  4,  2,  2,  2}/256</c>
-</texttable>
-
-<t>
-After the primary pitch lag, a "pitch contour", stored as a single entry from
- one of four small VQ codebooks, gives lag offsets for each subframe in the
- current SILK frame.
-The codebook index is decoded using one of the PDFs in
- <xref target="silk_pitch_contour_pdfs"/> depending on the current frame size
- and audio bandwidth.
-Tables&nbsp;<xref format="counter" target="silk_pitch_contour_cb_nb10ms"/>
- through&nbsp;<xref format="counter" target="silk_pitch_contour_cb_mbwb20ms"/>
- give the corresponding offsets to apply to the primary pitch lag for each
- subframe given the decoded codebook index.
-</t>
-
-<texttable anchor="silk_pitch_contour_pdfs"
- title="PDFs for Subframe Pitch Contour">
-<ttcol>Audio Bandwidth</ttcol>
-<ttcol>SILK Frame Size</ttcol>
-<ttcol align="right">Codebook Size</ttcol>
-<ttcol>PDF</ttcol>
-<c>NB</c>       <c>10&nbsp;ms</c>  <c>3</c>
-<c>{143, 50, 63}/256</c>
-<c>NB</c>       <c>20&nbsp;ms</c> <c>11</c>
-<c>{68, 12, 21, 17, 19, 22, 30, 24,
-    17, 16, 10}/256</c>
-<c>MB or WB</c> <c>10&nbsp;ms</c> <c>12</c>
-<c>{91, 46, 39, 19, 14, 12,  8,  7,
-     6,  5,  5,  4}/256</c>
-<c>MB or WB</c> <c>20&nbsp;ms</c> <c>34</c>
-<c>{33, 22, 18, 16, 15, 14, 14, 13,
-    13, 10,  9,  9,  8,  6,  6,  6,
-     5,  4,  4,  4,  3,  3,  3,  2,
-     2,  2,  2,  2,  2,  2,  1,  1,
-     1,  1}/256</c>
-</texttable>
-
-<texttable anchor="silk_pitch_contour_cb_nb10ms"
- title="Codebook Vectors for Subframe Pitch Contour: NB, 10&nbsp;ms Frames">
-<ttcol>Index</ttcol>
-<ttcol align="right">Subframe Offsets</ttcol>
-<c>0</c> <c><spanx style="vbare">&nbsp;0&nbsp;&nbsp;0</spanx></c>
-<c>1</c> <c><spanx style="vbare">&nbsp;1&nbsp;&nbsp;0</spanx></c>
-<c>2</c> <c><spanx style="vbare">&nbsp;0&nbsp;&nbsp;1</spanx></c>
-</texttable>
-
-<texttable anchor="silk_pitch_contour_cb_nb20ms"
- title="Codebook Vectors for Subframe Pitch Contour: NB, 20&nbsp;ms Frames">
-<ttcol>Index</ttcol>
-<ttcol align="right">Subframe Offsets</ttcol>
- <c>0</c> <c><spanx style="vbare">&nbsp;0&nbsp;&nbsp;0&nbsp;&nbsp;0&nbsp;&nbsp;0</spanx></c>
- <c>1</c> <c><spanx style="vbare">&nbsp;2&nbsp;&nbsp;1&nbsp;&nbsp;0&nbsp;-1</spanx></c>
- <c>2</c> <c><spanx style="vbare">-1&nbsp;&nbsp;0&nbsp;&nbsp;1&nbsp;&nbsp;2</spanx></c>
- <c>3</c> <c><spanx style="vbare">-1&nbsp;&nbsp;0&nbsp;&nbsp;0&nbsp;&nbsp;1</spanx></c>
- <c>4</c> <c><spanx style="vbare">-1&nbsp;&nbsp;0&nbsp;&nbsp;0&nbsp;&nbsp;0</spanx></c>
- <c>5</c> <c><spanx style="vbare">&nbsp;0&nbsp;&nbsp;0&nbsp;&nbsp;0&nbsp;&nbsp;1</spanx></c>
- <c>6</c> <c><spanx style="vbare">&nbsp;0&nbsp;&nbsp;0&nbsp;&nbsp;1&nbsp;&nbsp;1</spanx></c>
- <c>7</c> <c><spanx style="vbare">&nbsp;1&nbsp;&nbsp;1&nbsp;&nbsp;0&nbsp;&nbsp;0</spanx></c>
- <c>8</c> <c><spanx style="vbare">&nbsp;1&nbsp;&nbsp;0&nbsp;&nbsp;0&nbsp;&nbsp;0</spanx></c>
- <c>9</c> <c><spanx style="vbare">&nbsp;0&nbsp;&nbsp;0&nbsp;&nbsp;0&nbsp;-1</spanx></c>
-<c>10</c> <c><spanx style="vbare">&nbsp;1&nbsp;&nbsp;0&nbsp;&nbsp;0&nbsp;-1</spanx></c>
-</texttable>
-
-<texttable anchor="silk_pitch_contour_cb_mbwb10ms"
- title="Codebook Vectors for Subframe Pitch Contour: MB or WB, 10&nbsp;ms Frames">
-<ttcol>Index</ttcol>
-<ttcol align="right">Subframe Offsets</ttcol>
- <c>0</c> <c><spanx style="vbare">&nbsp;0&nbsp;&nbsp;0</spanx></c>
- <c>1</c> <c><spanx style="vbare">&nbsp;0&nbsp;&nbsp;1</spanx></c>
- <c>2</c> <c><spanx style="vbare">&nbsp;1&nbsp;&nbsp;0</spanx></c>
- <c>3</c> <c><spanx style="vbare">-1&nbsp;&nbsp;1</spanx></c>
- <c>4</c> <c><spanx style="vbare">&nbsp;1&nbsp;-1</spanx></c>
- <c>5</c> <c><spanx style="vbare">-1&nbsp;&nbsp;2</spanx></c>
- <c>6</c> <c><spanx style="vbare">&nbsp;2&nbsp;-1</spanx></c>
- <c>7</c> <c><spanx style="vbare">-2&nbsp;&nbsp;2</spanx></c>
- <c>8</c> <c><spanx style="vbare">&nbsp;2&nbsp;-2</spanx></c>
- <c>9</c> <c><spanx style="vbare">-2&nbsp;&nbsp;3</spanx></c>
-<c>10</c> <c><spanx style="vbare">&nbsp;3&nbsp;-2</spanx></c>
-<c>11</c> <c><spanx style="vbare">-3&nbsp;&nbsp;3</spanx></c>
-</texttable>
-
-<texttable anchor="silk_pitch_contour_cb_mbwb20ms"
- title="Codebook Vectors for Subframe Pitch Contour: MB or WB, 20&nbsp;ms Frames">
-<ttcol>Index</ttcol>
-<ttcol align="right">Subframe Offsets</ttcol>
- <c>0</c> <c><spanx style="vbare">&nbsp;0&nbsp;&nbsp;0&nbsp;&nbsp;0&nbsp;&nbsp;0</spanx></c>
- <c>1</c> <c><spanx style="vbare">&nbsp;0&nbsp;&nbsp;0&nbsp;&nbsp;1&nbsp;&nbsp;1</spanx></c>
- <c>2</c> <c><spanx style="vbare">&nbsp;1&nbsp;&nbsp;1&nbsp;&nbsp;0&nbsp;&nbsp;0</spanx></c>
- <c>3</c> <c><spanx style="vbare">-1&nbsp;&nbsp;0&nbsp;&nbsp;0&nbsp;&nbsp;0</spanx></c>
- <c>4</c> <c><spanx style="vbare">&nbsp;0&nbsp;&nbsp;0&nbsp;&nbsp;0&nbsp;&nbsp;1</spanx></c>
- <c>5</c> <c><spanx style="vbare">&nbsp;1&nbsp;&nbsp;0&nbsp;&nbsp;0&nbsp;&nbsp;0</spanx></c>
- <c>6</c> <c><spanx style="vbare">-1&nbsp;&nbsp;0&nbsp;&nbsp;0&nbsp;&nbsp;1</spanx></c>
- <c>7</c> <c><spanx style="vbare">&nbsp;0&nbsp;&nbsp;0&nbsp;&nbsp;0&nbsp;-1</spanx></c>
- <c>8</c> <c><spanx style="vbare">-1&nbsp;&nbsp;0&nbsp;&nbsp;1&nbsp;&nbsp;2</spanx></c>
- <c>9</c> <c><spanx style="vbare">&nbsp;1&nbsp;&nbsp;0&nbsp;&nbsp;0&nbsp;-1</spanx></c>
-<c>10</c> <c><spanx style="vbare">-2&nbsp;-1&nbsp;&nbsp;1&nbsp;&nbsp;2</spanx></c>
-<c>11</c> <c><spanx style="vbare">&nbsp;2&nbsp;&nbsp;1&nbsp;&nbsp;0&nbsp;-1</spanx></c>
-<c>12</c> <c><spanx style="vbare">-2&nbsp;&nbsp;0&nbsp;&nbsp;0&nbsp;&nbsp;2</spanx></c>
-<c>13</c> <c><spanx style="vbare">-2&nbsp;&nbsp;0&nbsp;&nbsp;1&nbsp;&nbsp;3</spanx></c>
-<c>14</c> <c><spanx style="vbare">&nbsp;2&nbsp;&nbsp;1&nbsp;-1&nbsp;-2</spanx></c>
-<c>15</c> <c><spanx style="vbare">-3&nbsp;-1&nbsp;&nbsp;1&nbsp;&nbsp;3</spanx></c>
-<c>16</c> <c><spanx style="vbare">&nbsp;2&nbsp;&nbsp;0&nbsp;&nbsp;0&nbsp;-2</spanx></c>
-<c>17</c> <c><spanx style="vbare">&nbsp;3&nbsp;&nbsp;1&nbsp;&nbsp;0&nbsp;-2</spanx></c>
-<c>18</c> <c><spanx style="vbare">-3&nbsp;-1&nbsp;&nbsp;2&nbsp;&nbsp;4</spanx></c>
-<c>19</c> <c><spanx style="vbare">-4&nbsp;-1&nbsp;&nbsp;1&nbsp;&nbsp;4</spanx></c>
-<c>20</c> <c><spanx style="vbare">&nbsp;3&nbsp;&nbsp;1&nbsp;-1&nbsp;-3</spanx></c>
-<c>21</c> <c><spanx style="vbare">-4&nbsp;-1&nbsp;&nbsp;2&nbsp;&nbsp;5</spanx></c>
-<c>22</c> <c><spanx style="vbare">&nbsp;4&nbsp;&nbsp;2&nbsp;-1&nbsp;-3</spanx></c>
-<c>23</c> <c><spanx style="vbare">&nbsp;4&nbsp;&nbsp;1&nbsp;-1&nbsp;-4</spanx></c>
-<c>24</c> <c><spanx style="vbare">-5&nbsp;-1&nbsp;&nbsp;2&nbsp;&nbsp;6</spanx></c>
-<c>25</c> <c><spanx style="vbare">&nbsp;5&nbsp;&nbsp;2&nbsp;-1&nbsp;-4</spanx></c>
-<c>26</c> <c><spanx style="vbare">-6&nbsp;-2&nbsp;&nbsp;2&nbsp;&nbsp;6</spanx></c>
-<c>27</c> <c><spanx style="vbare">-5&nbsp;-2&nbsp;&nbsp;2&nbsp;&nbsp;5</spanx></c>
-<c>28</c> <c><spanx style="vbare">&nbsp;6&nbsp;&nbsp;2&nbsp;-1&nbsp;-5</spanx></c>
-<c>29</c> <c><spanx style="vbare">-7&nbsp;-2&nbsp;&nbsp;3&nbsp;&nbsp;8</spanx></c>
-<c>30</c> <c><spanx style="vbare">&nbsp;6&nbsp;&nbsp;2&nbsp;-2&nbsp;-6</spanx></c>
-<c>31</c> <c><spanx style="vbare">&nbsp;5&nbsp;&nbsp;2&nbsp;-2&nbsp;-5</spanx></c>
-<c>32</c> <c><spanx style="vbare">&nbsp;8&nbsp;&nbsp;3&nbsp;-2&nbsp;-7</spanx></c>
-<c>33</c> <c><spanx style="vbare">-9&nbsp;-3&nbsp;&nbsp;3&nbsp;&nbsp;9</spanx></c>
-</texttable>
-
-<t>
-The final pitch lag for each subframe is assembled in silk_decode_pitch()
- (decode_pitch.c).
-Let lag be the primary pitch lag for the current SILK frame, contour_index be
- index of the VQ codebook, and lag_cb[contour_index][k] be the corresponding
- entry of the codebook from the appropriate table given above for the k'th
- subframe.
-Then the final pitch lag for that subframe is
-<figure align="center">
-<artwork align="center"><![CDATA[
-pitch_lags[k] = clamp(lag_min, lag + lag_cb[contour_index][k],
-                      lag_max)
-]]></artwork>
-</figure>
- where lag_min and lag_max are the values from the "Minimum Lag" and
- "Maximum Lag" columns of <xref target="silk_abs_pitch_low_pdf"/>,
- respectively.
-</t>
-
-</section>
-
-<section anchor="silk_ltp_filter" title="LTP Filter Coefficients">
-<t>
-SILK uses a separate 5-tap pitch filter for each subframe, selected from one
- of three codebooks.
-The three codebooks each represent different rate-distortion trade-offs, with
- average rates of 1.61&nbsp;bits/subframe, 3.68&nbsp;bits/subframe, and
- 4.85&nbsp;bits/subframe, respectively.
-</t>
-
-<t>
-The importance of the filter coefficients generally depends on two factors: the
- periodicity of the signal and relative energy between the current subframe and
- the signal from one period earlier.
-Greater periodicity and decaying energy both lead to more important filter
- coefficients, and thus should be coded with lower distortion and higher rate.
-These properties are relatively stable over the duration of a single SILK
- frame, hence all of the subframes in a SILK frame choose their filter from the
- same codebook.
-This is signaled with an explicitly-coded "periodicity index".
-This immediately follows the subframe pitch lags, and is coded using the
- 3-entry PDF from <xref target="silk_perindex_pdf"/>.
-</t>
-
-<texttable anchor="silk_perindex_pdf" title="Periodicity Index PDF">
-<ttcol>PDF</ttcol>
-<c>{77, 80, 99}/256</c>
-</texttable>
-
-<t>
-The indices of the filters for each subframe follow.
-They are all coded using the PDF from <xref target="silk_ltp_filter_pdfs"/>
- corresponding to the periodicity index.
-Tables&nbsp;<xref format="counter" target="silk_ltp_filter_coeffs0"/>
- through&nbsp;<xref format="counter" target="silk_ltp_filter_coeffs2"/>
- contain the corresponding filter taps as signed Q7 integers.
-</t>
-
-<texttable anchor="silk_ltp_filter_pdfs" title="LTP Filter PDFs">
-<ttcol>Periodicity Index</ttcol>
-<ttcol align="right">Codebook Size</ttcol>
-<ttcol>PDF</ttcol>
-<c>0</c>  <c>8</c> <c>{185, 15, 13, 13, 9, 9, 6, 6}/256</c>
-<c>1</c> <c>16</c> <c>{57, 34, 21, 20, 15, 13, 12, 13,
-                       10, 10,  9, 10,  9,  8,  7,  8}/256</c>
-<c>2</c> <c>32</c> <c>{15, 16, 14, 12, 12, 12, 11, 11,
-                       11, 10,  9,  9,  9,  9,  8,  8,
-                        8,  8,  7,  7,  6,  6,  5,  4,
-                        5,  4,  4,  4,  3,  4,  3,  2}/256</c>
-</texttable>
-
-<texttable anchor="silk_ltp_filter_coeffs0"
- title="Codebook Vectors for LTP Filter, Periodicity Index 0">
-<ttcol>Index</ttcol>
-<ttcol align="right">Filter Taps (Q7)</ttcol>
- <c>0</c>
-<c><spanx style="vbare">&nbsp;&nbsp;4&nbsp;&nbsp;&nbsp;6&nbsp;&nbsp;24&nbsp;&nbsp;&nbsp;7&nbsp;&nbsp;&nbsp;5</spanx></c>
- <c>1</c>
-<c><spanx style="vbare">&nbsp;&nbsp;0&nbsp;&nbsp;&nbsp;0&nbsp;&nbsp;&nbsp;2&nbsp;&nbsp;&nbsp;0&nbsp;&nbsp;&nbsp;0</spanx></c>
- <c>2</c>
-<c><spanx style="vbare">&nbsp;12&nbsp;&nbsp;28&nbsp;&nbsp;41&nbsp;&nbsp;13&nbsp;&nbsp;-4</spanx></c>
- <c>3</c>
-<c><spanx style="vbare">&nbsp;-9&nbsp;&nbsp;15&nbsp;&nbsp;42&nbsp;&nbsp;25&nbsp;&nbsp;14</spanx></c>
- <c>4</c>
-<c><spanx style="vbare">&nbsp;&nbsp;1&nbsp;&nbsp;-2&nbsp;&nbsp;62&nbsp;&nbsp;41&nbsp;&nbsp;-9</spanx></c>
- <c>5</c>
-<c><spanx style="vbare">-10&nbsp;&nbsp;37&nbsp;&nbsp;65&nbsp;&nbsp;-4&nbsp;&nbsp;&nbsp;3</spanx></c>
- <c>6</c>
-<c><spanx style="vbare">&nbsp;-6&nbsp;&nbsp;&nbsp;4&nbsp;&nbsp;66&nbsp;&nbsp;&nbsp;7&nbsp;&nbsp;-8</spanx></c>
- <c>7</c>
-<c><spanx style="vbare">&nbsp;16&nbsp;&nbsp;14&nbsp;&nbsp;38&nbsp;&nbsp;-3&nbsp;&nbsp;33</spanx></c>
-</texttable>
-
-<texttable anchor="silk_ltp_filter_coeffs1"
- title="Codebook Vectors for LTP Filter, Periodicity Index 1">
-<ttcol>Index</ttcol>
-<ttcol align="right">Filter Taps (Q7)</ttcol>
-
- <c>0</c>
-<c><spanx style="vbare">&nbsp;13&nbsp;&nbsp;22&nbsp;&nbsp;39&nbsp;&nbsp;23&nbsp;&nbsp;12</spanx></c>
- <c>1</c>
-<c><spanx style="vbare">&nbsp;-1&nbsp;&nbsp;36&nbsp;&nbsp;64&nbsp;&nbsp;27&nbsp;&nbsp;-6</spanx></c>
- <c>2</c>
-<c><spanx style="vbare">&nbsp;-7&nbsp;&nbsp;10&nbsp;&nbsp;55&nbsp;&nbsp;43&nbsp;&nbsp;17</spanx></c>
- <c>3</c>
-<c><spanx style="vbare">&nbsp;&nbsp;1&nbsp;&nbsp;&nbsp;1&nbsp;&nbsp;&nbsp;8&nbsp;&nbsp;&nbsp;1&nbsp;&nbsp;&nbsp;1</spanx></c>
- <c>4</c>
-<c><spanx style="vbare">&nbsp;&nbsp;6&nbsp;-11&nbsp;&nbsp;74&nbsp;&nbsp;53&nbsp;&nbsp;-9</spanx></c>
- <c>5</c>
-<c><spanx style="vbare">-12&nbsp;&nbsp;55&nbsp;&nbsp;76&nbsp;-12&nbsp;&nbsp;&nbsp;8</spanx></c>
- <c>6</c>
-<c><spanx style="vbare">&nbsp;-3&nbsp;&nbsp;&nbsp;3&nbsp;&nbsp;93&nbsp;&nbsp;27&nbsp;&nbsp;-4</spanx></c>
- <c>7</c>
-<c><spanx style="vbare">&nbsp;26&nbsp;&nbsp;39&nbsp;&nbsp;59&nbsp;&nbsp;&nbsp;3&nbsp;&nbsp;-8</spanx></c>
- <c>8</c>
-<c><spanx style="vbare">&nbsp;&nbsp;2&nbsp;&nbsp;&nbsp;0&nbsp;&nbsp;77&nbsp;&nbsp;11&nbsp;&nbsp;&nbsp;9</spanx></c>
- <c>9</c>
-<c><spanx style="vbare">&nbsp;-8&nbsp;&nbsp;22&nbsp;&nbsp;44&nbsp;&nbsp;-6&nbsp;&nbsp;&nbsp;7</spanx></c>
-<c>10</c>
-<c><spanx style="vbare">&nbsp;40&nbsp;&nbsp;&nbsp;9&nbsp;&nbsp;26&nbsp;&nbsp;&nbsp;3&nbsp;&nbsp;&nbsp;9</spanx></c>
-<c>11</c>
-<c><spanx style="vbare">&nbsp;-7&nbsp;&nbsp;20&nbsp;101&nbsp;&nbsp;-7&nbsp;&nbsp;&nbsp;4</spanx></c>
-<c>12</c>
-<c><spanx style="vbare">&nbsp;&nbsp;3&nbsp;&nbsp;-8&nbsp;&nbsp;42&nbsp;&nbsp;26&nbsp;&nbsp;&nbsp;0</spanx></c>
-<c>13</c>
-<c><spanx style="vbare">-15&nbsp;&nbsp;33&nbsp;&nbsp;68&nbsp;&nbsp;&nbsp;2&nbsp;&nbsp;23</spanx></c>
-<c>14</c>
-<c><spanx style="vbare">&nbsp;-2&nbsp;&nbsp;55&nbsp;&nbsp;46&nbsp;&nbsp;-2&nbsp;&nbsp;15</spanx></c>
-<c>15</c>
-<c><spanx style="vbare">&nbsp;&nbsp;3&nbsp;&nbsp;-1&nbsp;&nbsp;21&nbsp;&nbsp;16&nbsp;&nbsp;41</spanx></c>
-</texttable>
-
-<texttable anchor="silk_ltp_filter_coeffs2"
- title="Codebook Vectors for LTP Filter, Periodicity Index 2">
-<ttcol>Index</ttcol>
-<ttcol align="right">Filter Taps (Q7)</ttcol>
- <c>0</c>
-<c><spanx style="vbare">&nbsp;-6&nbsp;&nbsp;27&nbsp;&nbsp;61&nbsp;&nbsp;39&nbsp;&nbsp;&nbsp;5</spanx></c>
- <c>1</c>
-<c><spanx style="vbare">-11&nbsp;&nbsp;42&nbsp;&nbsp;88&nbsp;&nbsp;&nbsp;4&nbsp;&nbsp;&nbsp;1</spanx></c>
- <c>2</c>
-<c><spanx style="vbare">&nbsp;-2&nbsp;&nbsp;60&nbsp;&nbsp;65&nbsp;&nbsp;&nbsp;6&nbsp;&nbsp;-4</spanx></c>
- <c>3</c>
-<c><spanx style="vbare">&nbsp;-1&nbsp;&nbsp;-5&nbsp;&nbsp;73&nbsp;&nbsp;56&nbsp;&nbsp;&nbsp;1</spanx></c>
- <c>4</c>
-<c><spanx style="vbare">&nbsp;-9&nbsp;&nbsp;19&nbsp;&nbsp;94&nbsp;&nbsp;29&nbsp;&nbsp;-9</spanx></c>
- <c>5</c>
-<c><spanx style="vbare">&nbsp;&nbsp;0&nbsp;&nbsp;12&nbsp;&nbsp;99&nbsp;&nbsp;&nbsp;6&nbsp;&nbsp;&nbsp;4</spanx></c>
- <c>6</c>
-<c><spanx style="vbare">&nbsp;&nbsp;8&nbsp;-19&nbsp;102&nbsp;&nbsp;46&nbsp;-13</spanx></c>
- <c>7</c>
-<c><spanx style="vbare">&nbsp;&nbsp;3&nbsp;&nbsp;&nbsp;2&nbsp;&nbsp;13&nbsp;&nbsp;&nbsp;3&nbsp;&nbsp;&nbsp;2</spanx></c>
- <c>8</c>
-<c><spanx style="vbare">&nbsp;&nbsp;9&nbsp;-21&nbsp;&nbsp;84&nbsp;&nbsp;72&nbsp;-18</spanx></c>
- <c>9</c>
-<c><spanx style="vbare">-11&nbsp;&nbsp;46&nbsp;104&nbsp;-22&nbsp;&nbsp;&nbsp;8</spanx></c>
-<c>10</c>
-<c><spanx style="vbare">&nbsp;18&nbsp;&nbsp;38&nbsp;&nbsp;48&nbsp;&nbsp;23&nbsp;&nbsp;&nbsp;0</spanx></c>
-<c>11</c>
-<c><spanx style="vbare">-16&nbsp;&nbsp;70&nbsp;&nbsp;83&nbsp;-21&nbsp;&nbsp;11</spanx></c>
-<c>12</c>
-<c><spanx style="vbare">&nbsp;&nbsp;5&nbsp;-11&nbsp;117&nbsp;&nbsp;22&nbsp;&nbsp;-8</spanx></c>
-<c>13</c>
-<c><spanx style="vbare">&nbsp;-6&nbsp;&nbsp;23&nbsp;117&nbsp;-12&nbsp;&nbsp;&nbsp;3</spanx></c>
-<c>14</c>
-<c><spanx style="vbare">&nbsp;&nbsp;3&nbsp;&nbsp;-8&nbsp;&nbsp;95&nbsp;&nbsp;28&nbsp;&nbsp;&nbsp;4</spanx></c>
-<c>15</c>
-<c><spanx style="vbare">-10&nbsp;&nbsp;15&nbsp;&nbsp;77&nbsp;&nbsp;60&nbsp;-15</spanx></c>
-<c>16</c>
-<c><spanx style="vbare">&nbsp;-1&nbsp;&nbsp;&nbsp;4&nbsp;124&nbsp;&nbsp;&nbsp;2&nbsp;&nbsp;-4</spanx></c>
-<c>17</c>
-<c><spanx style="vbare">&nbsp;&nbsp;3&nbsp;&nbsp;38&nbsp;&nbsp;84&nbsp;&nbsp;24&nbsp;-25</spanx></c>
-<c>18</c>
-<c><spanx style="vbare">&nbsp;&nbsp;2&nbsp;&nbsp;13&nbsp;&nbsp;42&nbsp;&nbsp;13&nbsp;&nbsp;31</spanx></c>
-<c>19</c>
-<c><spanx style="vbare">&nbsp;21&nbsp;&nbsp;-4&nbsp;&nbsp;56&nbsp;&nbsp;46&nbsp;&nbsp;-1</spanx></c>
-<c>20</c>
-<c><spanx style="vbare">&nbsp;-1&nbsp;&nbsp;35&nbsp;&nbsp;79&nbsp;-13&nbsp;&nbsp;19</spanx></c>
-<c>21</c>
-<c><spanx style="vbare">&nbsp;-7&nbsp;&nbsp;65&nbsp;&nbsp;88&nbsp;&nbsp;-9&nbsp;-14</spanx></c>
-<c>22</c>
-<c><spanx style="vbare">&nbsp;20&nbsp;&nbsp;&nbsp;4&nbsp;&nbsp;81&nbsp;&nbsp;49&nbsp;-29</spanx></c>
-<c>23</c>
-<c><spanx style="vbare">&nbsp;20&nbsp;&nbsp;&nbsp;0&nbsp;&nbsp;75&nbsp;&nbsp;&nbsp;3&nbsp;-17</spanx></c>
-<c>24</c>
-<c><spanx style="vbare">&nbsp;&nbsp;5&nbsp;&nbsp;-9&nbsp;&nbsp;44&nbsp;&nbsp;92&nbsp;&nbsp;-8</spanx></c>
-<c>25</c>
-<c><spanx style="vbare">&nbsp;&nbsp;1&nbsp;&nbsp;-3&nbsp;&nbsp;22&nbsp;&nbsp;69&nbsp;&nbsp;31</spanx></c>
-<c>26</c>
-<c><spanx style="vbare">&nbsp;-6&nbsp;&nbsp;95&nbsp;&nbsp;41&nbsp;-12&nbsp;&nbsp;&nbsp;5</spanx></c>
-<c>27</c>
-<c><spanx style="vbare">&nbsp;39&nbsp;&nbsp;67&nbsp;&nbsp;16&nbsp;&nbsp;-4&nbsp;&nbsp;&nbsp;1</spanx></c>
-<c>28</c>
-<c><spanx style="vbare">&nbsp;&nbsp;0&nbsp;&nbsp;-6&nbsp;120&nbsp;&nbsp;55&nbsp;-36</spanx></c>
-<c>29</c>
-<c><spanx style="vbare">-13&nbsp;&nbsp;44&nbsp;122&nbsp;&nbsp;&nbsp;4&nbsp;-24</spanx></c>
-<c>30</c>
-<c><spanx style="vbare">&nbsp;81&nbsp;&nbsp;&nbsp;5&nbsp;&nbsp;11&nbsp;&nbsp;&nbsp;3&nbsp;&nbsp;&nbsp;7</spanx></c>
-<c>31</c>
-<c><spanx style="vbare">&nbsp;&nbsp;2&nbsp;&nbsp;&nbsp;0&nbsp;&nbsp;&nbsp;9&nbsp;&nbsp;10&nbsp;&nbsp;88</spanx></c>
-</texttable>
-
-</section>
-
-<section anchor="silk_ltp_scaling" title="LTP Scaling Parameter">
-<t>
-An LTP scaling parameter appears after the LTP filter coefficients if and only
- if
-<list style="symbols">
-<t>This is a voiced frame (see <xref target="silk_frame_type"/>), and</t>
-<t>Either
-<list style="symbols">
-<t>
-This SILK frame corresponds to the first time interval of the
- current Opus frame for its type (LBRR or regular), or
-</t>
-<t>
-This is an LBRR frame where the LBRR flags (see
- <xref target="silk_lbrr_flags"/>) indicate the previous LBRR frame in the same
- channel is not coded.
-</t>
-</list>
-</t>
-</list>
-This allows the encoder to trade off the prediction gain between
- packets against the recovery time after packet loss.
-Unlike absolute-coding for pitch lags, regular SILK frames that are not at the
- start of an Opus frame (i.e., that do not correspond to the first 20&nbsp;ms
- time interval in Opus frames of 40&nbsp;or 60&nbsp;ms) do not include this
- field, even if the prior frame was not voiced, or (in the case of the side
- channel) not even coded.
-After an uncoded frame in the side channel, the LTP buffer (see
- <xref target="silk_ltp_synthesis"/>) is cleared to zero, and is thus in a
- known state.
-In contrast, LBRR frames do include this field when the prior frame was not
- coded, since the LTP buffer contains the output of the PLC, which is
- non-normative.
-</t>
-<t>
-If present, the decoder reads a value using the 3-entry PDF in
- <xref target="silk_ltp_scaling_pdf"/>.
-The three possible values represent Q14 scale factors of 15565, 12288, and
- 8192, respectively (corresponding to approximately 0.95, 0.75, and 0.5).
-Frames that do not code the scaling parameter use the default factor of 15565
- (approximately 0.95).
-</t>
-
-<texttable anchor="silk_ltp_scaling_pdf"
- title="PDF for LTP Scaling Parameter">
-<ttcol align="left">PDF</ttcol>
-<c>{128, 64, 64}/256</c>
-</texttable>
-
-</section>
-
-</section>
-
-<section anchor="silk_seed" toc="include"
- title="Linear Congruential Generator (LCG) Seed">
-<t>
-As described in <xref target="silk_excitation_reconstruction"/>, SILK uses a
- linear congruential generator (LCG) to inject pseudorandom noise into the
- quantized excitation.
-To ensure synchronization of this process between the encoder and decoder, each
- SILK frame stores a 2-bit seed after the LTP parameters (if any).
-The encoder may consider the choice of seed during quantization, and the
- flexibility of this choice lets it reduce distortion, helping to pay for the
- bit cost required to signal it.
-The decoder reads the seed using the uniform 4-entry PDF in
- <xref target="silk_seed_pdf"/>, yielding a value between 0 and 3, inclusive.
-</t>
-
-<texttable anchor="silk_seed_pdf"
- title="PDF for LCG Seed">
-<ttcol align="left">PDF</ttcol>
-<c>{64, 64, 64, 64}/256</c>
-</texttable>
-
-</section>
-
-<section anchor="silk_excitation" toc="include" title="Excitation">
-<t>
-SILK codes the excitation using a modified version of the Pyramid Vector
- Quantization (PVQ) codebook <xref target="PVQ"/>.
-The PVQ codebook is designed for Laplace-distributed values and consists of all
- sums of K signed, unit pulses in a vector of dimension N, where two pulses at
- the same position are required to have the same sign.
-Thus the codebook includes all integer codevectors y of dimension N that
- satisfy
-<figure align="center">
-<artwork align="center"><![CDATA[
-N-1
-__
-\  abs(y[j]) = K .
-/_
-j=0
-]]></artwork>
-</figure>
-Unlike regular PVQ, SILK uses a variable-length, rather than fixed-length,
- encoding.
-This encoding is better suited to the more Gaussian-like distribution of the
- coefficient magnitudes and the non-uniform distribution of their signs (caused
- by the quantization offset described below).
-SILK also handles large codebooks by coding the least significant bits (LSBs)
- of each coefficient directly.
-This adds a small coding efficiency loss, but greatly reduces the computation
- time and ROM size required for decoding, as implemented in
- silk_decode_pulses() (decode_pulses.c).
-</t>
-
-<t>
-SILK fixes the dimension of the codebook to N&nbsp;=&nbsp;16.
-The excitation is made up of a number of "shell blocks", each 16 samples in
- size.
-<xref target="silk_shell_block_table"/> lists the number of shell blocks
- required for a SILK frame for each possible audio bandwidth and frame size.
-10&nbsp;ms MB frames nominally contain 120&nbsp;samples (10&nbsp;ms at
- 12&nbsp;kHz), which is not a multiple of 16.
-This is handled by coding 8 shell blocks (128 samples) and discarding the final
- 8 samples of the last block.
-The decoder contains no special case that prevents an encoder from placing
- pulses in these samples, and they must be correctly parsed from the bitstream
- if present, but they are otherwise ignored.
-</t>
-
-<texttable anchor="silk_shell_block_table"
- title="Number of Shell Blocks Per SILK Frame">
-<ttcol>Audio Bandwidth</ttcol>
-<ttcol>Frame Size</ttcol>
-<ttcol align="right">Number of Shell Blocks</ttcol>
-<c>NB</c> <c>10&nbsp;ms</c>  <c>5</c>
-<c>MB</c> <c>10&nbsp;ms</c>  <c>8</c>
-<c>WB</c> <c>10&nbsp;ms</c> <c>10</c>
-<c>NB</c> <c>20&nbsp;ms</c> <c>10</c>
-<c>MB</c> <c>20&nbsp;ms</c> <c>15</c>
-<c>WB</c> <c>20&nbsp;ms</c> <c>20</c>
-</texttable>
-
-<section anchor="silk_rate_level" title="Rate Level">
-<t>
-The first symbol in the excitation is a "rate level", which is an index from 0
- to 8, inclusive, coded using the PDF in <xref target="silk_rate_level_pdfs"/>
- corresponding to the signal type of the current frame (from
- <xref target="silk_frame_type"/>).
-The rate level selects the PDF used to decode the number of pulses in
- the individual shell blocks.
-It does not directly convey any information about the bitrate or the number of
- pulses itself, but merely changes the probability of the symbols in
- <xref target="silk_pulse_counts"/>.
-Level&nbsp;0 provides a more efficient encoding at low rates generally, and
- level&nbsp;8 provides a more efficient encoding at high rates generally,
- though the most efficient level for a particular SILK frame may depend on the
- exact distribution of the coded symbols.
-An encoder should, but is not required to, use the most efficient rate level.
-</t>
-
-<texttable anchor="silk_rate_level_pdfs"
- title="PDFs for the Rate Level">
-<ttcol>Signal Type</ttcol>
-<ttcol>PDF</ttcol>
-<c>Inactive or Unvoiced</c>
-<c>{15, 51, 12, 46, 45, 13, 33, 27, 14}/256</c>
-<c>Voiced</c>
-<c>{33, 30, 36, 17, 34, 49, 18, 21, 18}/256</c>
-</texttable>
-
-</section>
-
-<section anchor="silk_pulse_counts" title="Pulses Per Shell Block">
-<t>
-The total number of pulses in each of the shell blocks follows the rate level.
-The pulse counts for all of the shell blocks are coded consecutively, before
- the content of any of the blocks.
-Each block may have anywhere from 0 to 16 pulses, inclusive, coded using the
- 18-entry PDF in <xref target="silk_pulse_count_pdfs"/> corresponding to the
- rate level from <xref target="silk_rate_level"/>.
-The special value 17 indicates that this block has one or more additional
- LSBs to decode for each coefficient.
-If the decoder encounters this value, it decodes another value for the actual
- pulse count of the block, but uses the PDF corresponding to the special rate
- level&nbsp;9 instead of the normal rate level.
-This process repeats until the decoder reads a value less than 17, and it then
- sets the number of extra LSBs used to the number of 17's decoded for that
- block.
-If it reads the value 17 ten times, then the next iteration uses the special
- rate level&nbsp;10 instead of 9.
-The probability of decoding a 17 when using the PDF for rate level&nbsp;10 is
- zero, ensuring that the number of LSBs for a block will not exceed 10.
-The cumulative distribution for rate level&nbsp;10 is just a shifted version of
- that for 9 and thus does not require any additional storage.
-</t>
-
-<texttable anchor="silk_pulse_count_pdfs"
- title="PDFs for the Pulse Count">
-<ttcol>Rate Level</ttcol>
-<ttcol>PDF</ttcol>
-<c>0</c>
-<c>{131, 74, 25, 8, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}/256</c>
-<c>1</c>
-<c>{58, 93, 60, 23, 7, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}/256</c>
-<c>2</c>
-<c>{43, 51, 46, 33, 24, 16, 11, 8, 6, 3, 3, 3, 2, 1, 1, 2, 1, 2}/256</c>
-<c>3</c>
-<c>{17, 52, 71, 57, 31, 12, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}/256</c>
-<c>4</c>
-<c>{6, 21, 41, 53, 49, 35, 21, 11, 6, 3, 2, 2, 1, 1, 1, 1, 1, 1}/256</c>
-<c>5</c>
-<c>{7, 14, 22, 28, 29, 28, 25, 20, 17, 13, 11, 9, 7, 5, 4, 4, 3, 10}/256</c>
-<c>6</c>
-<c>{2, 5, 14, 29, 42, 46, 41, 31, 19, 11, 6, 3, 2, 1, 1, 1, 1, 1}/256</c>
-<c>7</c>
-<c>{1, 2, 4, 10, 19, 29, 35, 37, 34, 28, 20, 14, 8, 5, 4, 2, 2, 2}/256</c>
-<c>8</c>
-<c>{1, 2, 2, 5, 9, 14, 20, 24, 27, 28, 26, 23, 20, 15, 11, 8, 6, 15}/256</c>
-<c>9</c>
-<c>{1, 1, 1, 6, 27, 58, 56, 39, 25, 14, 10, 6, 3, 3, 2, 1, 1, 2}/256</c>
-<c>10</c>
-<c>{2, 1, 6, 27, 58, 56, 39, 25, 14, 10, 6, 3, 3, 2, 1, 1, 2, 0}/256</c>
-</texttable>
-
-</section>
-
-<section anchor="silk_pulse_locations" title="Pulse Location Decoding">
-<t>
-The locations of the pulses in each shell block follow the pulse counts,
- as decoded by silk_shell_decoder() (shell_coder.c).
-As with the pulse counts, these locations are coded for all the shell blocks
- before any of the remaining information for each block.
-Unlike many other codecs, SILK places no restriction on the distribution of
- pulses within a shell block.
-All of the pulses may be placed in a single location, or each one in a unique
- location, or anything in between.
-</t>
-
-<t>
-The location of pulses is coded by recursively partitioning each block into
- halves, and coding how many pulses fall on the left side of the split.
-All remaining pulses must fall on the right side of the split.
-The process then recurses into the left half, and after that returns, the
- right half (preorder traversal).
-The PDF to use is chosen by the size of the current partition (16, 8, 4, or 2)
- and the number of pulses in the partition (1 to 16, inclusive).
-Tables&nbsp;<xref format="counter" target="silk_shell_code3_pdfs"/>
- through&nbsp;<xref format="counter" target="silk_shell_code0_pdfs"/> list the
- PDFs used for each partition size and pulse count.
-This process skips partitions without any pulses, i.e., where the initial pulse
- count from <xref target="silk_pulse_counts"/> was zero, or where the split in
- the prior level indicated that all of the pulses fell on the other side.
-These partitions have nothing to code, so they require no PDF.
-</t>
-
-<texttable anchor="silk_shell_code3_pdfs"
- title="PDFs for Pulse Count Split, 16 Sample Partitions">
-<ttcol>Pulse Count</ttcol>
-<ttcol>PDF</ttcol>
- <c>1</c> <c>{126, 130}/256</c>
- <c>2</c> <c>{56, 142, 58}/256</c>
- <c>3</c> <c>{25, 101, 104, 26}/256</c>
- <c>4</c> <c>{12, 60, 108, 64, 12}/256</c>
- <c>5</c> <c>{7, 35, 84, 87, 37, 6}/256</c>
- <c>6</c> <c>{4, 20, 59, 86, 63, 21, 3}/256</c>
- <c>7</c> <c>{3, 12, 38, 72, 75, 42, 12, 2}/256</c>
- <c>8</c> <c>{2, 8, 25, 54, 73, 59, 27, 7, 1}/256</c>
- <c>9</c> <c>{2, 5, 17, 39, 63, 65, 42, 18, 4, 1}/256</c>
-<c>10</c> <c>{1, 4, 12, 28, 49, 63, 54, 30, 11, 3, 1}/256</c>
-<c>11</c> <c>{1, 4, 8, 20, 37, 55, 57, 41, 22, 8, 2, 1}/256</c>
-<c>12</c> <c>{1, 3, 7, 15, 28, 44, 53, 48, 33, 16, 6, 1, 1}/256</c>
-<c>13</c> <c>{1, 2, 6, 12, 21, 35, 47, 48, 40, 25, 12, 5, 1, 1}/256</c>
-<c>14</c> <c>{1, 1, 4, 10, 17, 27, 37, 47, 43, 33, 21, 9, 4, 1, 1}/256</c>
-<c>15</c> <c>{1, 1, 1, 8, 14, 22, 33, 40, 43, 38, 28, 16, 8, 1, 1, 1}/256</c>
-<c>16</c> <c>{1, 1, 1, 1, 13, 18, 27, 36, 41, 41, 34, 24, 14, 1, 1, 1, 1}/256</c>
-</texttable>
-
-<texttable anchor="silk_shell_code2_pdfs"
- title="PDFs for Pulse Count Split, 8 Sample Partitions">
-<ttcol>Pulse Count</ttcol>
-<ttcol>PDF</ttcol>
- <c>1</c> <c>{127, 129}/256</c>
- <c>2</c> <c>{53, 149, 54}/256</c>
- <c>3</c> <c>{22, 105, 106, 23}/256</c>
- <c>4</c> <c>{11, 61, 111, 63, 10}/256</c>
- <c>5</c> <c>{6, 35, 86, 88, 36, 5}/256</c>
- <c>6</c> <c>{4, 20, 59, 87, 62, 21, 3}/256</c>
- <c>7</c> <c>{3, 13, 40, 71, 73, 41, 13, 2}/256</c>
- <c>8</c> <c>{3, 9, 27, 53, 70, 56, 28, 9, 1}/256</c>
- <c>9</c> <c>{3, 8, 19, 37, 57, 61, 44, 20, 6, 1}/256</c>
-<c>10</c> <c>{3, 7, 15, 28, 44, 54, 49, 33, 17, 5, 1}/256</c>
-<c>11</c> <c>{1, 7, 13, 22, 34, 46, 48, 38, 28, 14, 4, 1}/256</c>
-<c>12</c> <c>{1, 1, 11, 22, 27, 35, 42, 47, 33, 25, 10, 1, 1}/256</c>
-<c>13</c> <c>{1, 1, 6, 14, 26, 37, 43, 43, 37, 26, 14, 6, 1, 1}/256</c>
-<c>14</c> <c>{1, 1, 4, 10, 20, 31, 40, 42, 40, 31, 20, 10, 4, 1, 1}/256</c>
-<c>15</c> <c>{1, 1, 3, 8, 16, 26, 35, 38, 38, 35, 26, 16, 8, 3, 1, 1}/256</c>
-<c>16</c> <c>{1, 1, 2, 6, 12, 21, 30, 36, 38, 36, 30, 21, 12, 6, 2, 1, 1}/256</c>
-</texttable>
-
-<texttable anchor="silk_shell_code1_pdfs"
- title="PDFs for Pulse Count Split, 4 Sample Partitions">
-<ttcol>Pulse Count</ttcol>
-<ttcol>PDF</ttcol>
- <c>1</c> <c>{127, 129}/256</c>
- <c>2</c> <c>{49, 157, 50}/256</c>
- <c>3</c> <c>{20, 107, 109, 20}/256</c>
- <c>4</c> <c>{11, 60, 113, 62, 10}/256</c>
- <c>5</c> <c>{7, 36, 84, 87, 36, 6}/256</c>
- <c>6</c> <c>{6, 24, 57, 82, 60, 23, 4}/256</c>
- <c>7</c> <c>{5, 18, 39, 64, 68, 42, 16, 4}/256</c>
- <c>8</c> <c>{6, 14, 29, 47, 61, 52, 30, 14, 3}/256</c>
- <c>9</c> <c>{1, 15, 23, 35, 51, 50, 40, 30, 10, 1}/256</c>
-<c>10</c> <c>{1, 1, 21, 32, 42, 52, 46, 41, 18, 1, 1}/256</c>
-<c>11</c> <c>{1, 6, 16, 27, 36, 42, 42, 36, 27, 16, 6, 1}/256</c>
-<c>12</c> <c>{1, 5, 12, 21, 31, 38, 40, 38, 31, 21, 12, 5, 1}/256</c>
-<c>13</c> <c>{1, 3, 9, 17, 26, 34, 38, 38, 34, 26, 17, 9, 3, 1}/256</c>
-<c>14</c> <c>{1, 3, 7, 14, 22, 29, 34, 36, 34, 29, 22, 14, 7, 3, 1}/256</c>
-<c>15</c> <c>{1, 2, 5, 11, 18, 25, 31, 35, 35, 31, 25, 18, 11, 5, 2, 1}/256</c>
-<c>16</c> <c>{1, 1, 4, 9, 15, 21, 28, 32, 34, 32, 28, 21, 15, 9, 4, 1, 1}/256</c>
-</texttable>
-
-<texttable anchor="silk_shell_code0_pdfs"
- title="PDFs for Pulse Count Split, 2 Sample Partitions">
-<ttcol>Pulse Count</ttcol>
-<ttcol>PDF</ttcol>
- <c>1</c> <c>{128, 128}/256</c>
- <c>2</c> <c>{42, 172, 42}/256</c>
- <c>3</c> <c>{21, 107, 107, 21}/256</c>
- <c>4</c> <c>{12, 60, 112, 61, 11}/256</c>
- <c>5</c> <c>{8, 34, 86, 86, 35, 7}/256</c>
- <c>6</c> <c>{8, 23, 55, 90, 55, 20, 5}/256</c>
- <c>7</c> <c>{5, 15, 38, 72, 72, 36, 15, 3}/256</c>
- <c>8</c> <c>{6, 12, 27, 52, 77, 47, 20, 10, 5}/256</c>
- <c>9</c> <c>{6, 19, 28, 35, 40, 40, 35, 28, 19, 6}/256</c>
-<c>10</c> <c>{4, 14, 22, 31, 37, 40, 37, 31, 22, 14, 4}/256</c>
-<c>11</c> <c>{3, 10, 18, 26, 33, 38, 38, 33, 26, 18, 10, 3}/256</c>
-<c>12</c> <c>{2, 8, 13, 21, 29, 36, 38, 36, 29, 21, 13, 8, 2}/256</c>
-<c>13</c> <c>{1, 5, 10, 17, 25, 32, 38, 38, 32, 25, 17, 10, 5, 1}/256</c>
-<c>14</c> <c>{1, 4, 7, 13, 21, 29, 35, 36, 35, 29, 21, 13, 7, 4, 1}/256</c>
-<c>15</c> <c>{1, 2, 5, 10, 17, 25, 32, 36, 36, 32, 25, 17, 10, 5, 2, 1}/256</c>
-<c>16</c> <c>{1, 2, 4, 7, 13, 21, 28, 34, 36, 34, 28, 21, 13, 7, 4, 2, 1}/256</c>
-</texttable>
-
-</section>
-
-<section anchor="silk_shell_lsb" title="LSB Decoding">
-<t>
-After the decoder reads the pulse locations for all blocks, it reads the LSBs
- (if any) for each block in turn.
-Inside each block, it reads all the LSBs for each coefficient in turn, even
- those where no pulses were allocated, before proceeding to the next one.
-For 10&nbsp;ms MB frames, it reads LSBs even for the extra 8&nbsp;samples in
- the last block.
-The LSBs are coded from most significant to least significant, and they all use
- the PDF in <xref target="silk_shell_lsb_pdf"/>.
-</t>
-
-<texttable anchor="silk_shell_lsb_pdf" title="PDF for Excitation LSBs">
-<ttcol>PDF</ttcol>
-<c>{136, 120}/256</c>
-</texttable>
-
-<t>
-The number of LSBs read for each coefficient in a block is determined in
- <xref target="silk_pulse_counts"/>.
-The magnitude of the coefficient is initially equal to the number of pulses
- placed at that location in <xref target="silk_pulse_locations"/>.
-As each LSB is decoded, the magnitude is doubled, and then the value of the LSB
- added to it, to obtain an updated magnitude.
-</t>
-</section>
-
-<section anchor="silk_signs" title="Sign Decoding">
-<t>
-After decoding the pulse locations and the LSBs, the decoder knows the
- magnitude of each coefficient in the excitation.
-It then decodes a sign for all coefficients with a non-zero magnitude, using
- one of the PDFs from <xref target="silk_sign_pdfs"/>.
-If the value decoded is 0, then the coefficient magnitude is negated.
-Otherwise, it remains positive.
-</t>
-
-<t>
-The decoder chooses the PDF for the sign based on the signal type and
- quantization offset type (from <xref target="silk_frame_type"/>) and the
- number of pulses in the block (from <xref target="silk_pulse_counts"/>).
-The number of pulses in the block does not take into account any LSBs.
-Most PDFs are skewed towards negative signs because of the quantization offset,
- but the PDFs for zero pulses are highly skewed towards positive signs.
-If a block contains many positive coefficients, it is sometimes beneficial to
- code it solely using LSBs (i.e., with zero pulses), since the encoder may be
- able to save enough bits on the signs to justify the less efficient
- coefficient magnitude encoding.
-</t>
-
-<texttable anchor="silk_sign_pdfs"
- title="PDFs for Excitation Signs">
-<ttcol>Signal Type</ttcol>
-<ttcol>Quantization Offset Type</ttcol>
-<ttcol>Pulse Count</ttcol>
-<ttcol>PDF</ttcol>
-<c>Inactive</c> <c>Low</c>  <c>0</c>         <c>{2, 254}/256</c>
-<c>Inactive</c> <c>Low</c>  <c>1</c>         <c>{207, 49}/256</c>
-<c>Inactive</c> <c>Low</c>  <c>2</c>         <c>{189, 67}/256</c>
-<c>Inactive</c> <c>Low</c>  <c>3</c>         <c>{179, 77}/256</c>
-<c>Inactive</c> <c>Low</c>  <c>4</c>         <c>{174, 82}/256</c>
-<c>Inactive</c> <c>Low</c>  <c>5</c>         <c>{163, 93}/256</c>
-<c>Inactive</c> <c>Low</c>  <c>6 or more</c> <c>{157, 99}/256</c>
-<c>Inactive</c> <c>High</c> <c>0</c>         <c>{58, 198}/256</c>
-<c>Inactive</c> <c>High</c> <c>1</c>         <c>{245, 11}/256</c>
-<c>Inactive</c> <c>High</c> <c>2</c>         <c>{238, 18}/256</c>
-<c>Inactive</c> <c>High</c> <c>3</c>         <c>{232, 24}/256</c>
-<c>Inactive</c> <c>High</c> <c>4</c>         <c>{225, 31}/256</c>
-<c>Inactive</c> <c>High</c> <c>5</c>         <c>{220, 36}/256</c>
-<c>Inactive</c> <c>High</c> <c>6 or more</c> <c>{211, 45}/256</c>
-<c>Unvoiced</c> <c>Low</c>  <c>0</c>         <c>{1, 255}/256</c>
-<c>Unvoiced</c> <c>Low</c>  <c>1</c>         <c>{210, 46}/256</c>
-<c>Unvoiced</c> <c>Low</c>  <c>2</c>         <c>{190, 66}/256</c>
-<c>Unvoiced</c> <c>Low</c>  <c>3</c>         <c>{178, 78}/256</c>
-<c>Unvoiced</c> <c>Low</c>  <c>4</c>         <c>{169, 87}/256</c>
-<c>Unvoiced</c> <c>Low</c>  <c>5</c>         <c>{162, 94}/256</c>
-<c>Unvoiced</c> <c>Low</c>  <c>6 or more</c> <c>{152, 104}/256</c>
-<c>Unvoiced</c> <c>High</c> <c>0</c>         <c>{48, 208}/256</c>
-<c>Unvoiced</c> <c>High</c> <c>1</c>         <c>{242, 14}/256</c>
-<c>Unvoiced</c> <c>High</c> <c>2</c>         <c>{235, 21}/256</c>
-<c>Unvoiced</c> <c>High</c> <c>3</c>         <c>{224, 32}/256</c>
-<c>Unvoiced</c> <c>High</c> <c>4</c>         <c>{214, 42}/256</c>
-<c>Unvoiced</c> <c>High</c> <c>5</c>         <c>{205, 51}/256</c>
-<c>Unvoiced</c> <c>High</c> <c>6 or more</c> <c>{190, 66}/256</c>
-<c>Voiced</c>   <c>Low</c>  <c>0</c>         <c>{1, 255}/256</c>
-<c>Voiced</c>   <c>Low</c>  <c>1</c>         <c>{162, 94}/256</c>
-<c>Voiced</c>   <c>Low</c>  <c>2</c>         <c>{152, 104}/256</c>
-<c>Voiced</c>   <c>Low</c>  <c>3</c>         <c>{147, 109}/256</c>
-<c>Voiced</c>   <c>Low</c>  <c>4</c>         <c>{144, 112}/256</c>
-<c>Voiced</c>   <c>Low</c>  <c>5</c>         <c>{141, 115}/256</c>
-<c>Voiced</c>   <c>Low</c>  <c>6 or more</c> <c>{138, 118}/256</c>
-<c>Voiced</c>   <c>High</c> <c>0</c>         <c>{8, 248}/256</c>
-<c>Voiced</c>   <c>High</c> <c>1</c>         <c>{203, 53}/256</c>
-<c>Voiced</c>   <c>High</c> <c>2</c>         <c>{187, 69}/256</c>
-<c>Voiced</c>   <c>High</c> <c>3</c>         <c>{176, 80}/256</c>
-<c>Voiced</c>   <c>High</c> <c>4</c>         <c>{168, 88}/256</c>
-<c>Voiced</c>   <c>High</c> <c>5</c>         <c>{161, 95}/256</c>
-<c>Voiced</c>   <c>High</c> <c>6 or more</c> <c>{154, 102}/256</c>
-</texttable>
-
-</section>
-
-<section anchor="silk_excitation_reconstruction"
- title="Reconstructing the Excitation">
-
-<t>
-After the signs have been read, there is enough information to reconstruct the
- complete excitation signal.
-This requires adding a constant quantization offset to each non-zero sample,
- and then pseudorandomly inverting and offsetting every sample.
-The constant quantization offset varies depending on the signal type and
- quantization offset type (see <xref target="silk_frame_type"/>).
-</t>
-
-<texttable anchor="silk_quantization_offsets"
- title="Excitation Quantization Offsets">
-<ttcol align="left">Signal Type</ttcol>
-<ttcol align="left">Quantization Offset Type</ttcol>
-<ttcol align="right">Quantization Offset (Q23)</ttcol>
-<c>Inactive</c> <c>Low</c>  <c>25</c>
-<c>Inactive</c> <c>High</c> <c>60</c>
-<c>Unvoiced</c> <c>Low</c>  <c>25</c>
-<c>Unvoiced</c> <c>High</c> <c>60</c>
-<c>Voiced</c>   <c>Low</c>   <c>8</c>
-<c>Voiced</c>   <c>High</c> <c>25</c>
-</texttable>
-
-<t>
-Let e_raw[i] be the raw excitation value at position i, with a magnitude
- composed of the pulses at that location (see
- <xref target="silk_pulse_locations"/>) combined with any additional LSBs (see
- <xref target="silk_shell_lsb"/>), and with the corresponding sign decoded in
- <xref target="silk_signs"/>.
-Additionally, let seed be the current pseudorandom seed, which is initialized
- to the value decoded from <xref target="silk_seed"/> for the first sample in
- the current SILK frame, and updated for each subsequent sample according to
- the procedure below.
-Finally, let offset_Q23 be the quantization offset from
- <xref target="silk_quantization_offsets"/>.
-Then the following procedure produces the final reconstructed excitation value,
- e_Q23[i]:
-<figure align="center">
-<artwork align="center"><![CDATA[
-e_Q23[i] = (e_raw[i] << 8) - sign(e_raw[i])*20 + offset_Q23;
-    seed = (196314165*seed + 907633515) & 0xFFFFFFFF;
-e_Q23[i] = (seed & 0x80000000) ? -e_Q23[i] : e_Q23[i];
-    seed = (seed + e_raw[i]) & 0xFFFFFFFF;
-]]></artwork>
-</figure>
-When e_raw[i] is zero, sign() returns 0 by the definition in
- <xref target="sign"/>, so the factor of 20 does not get added.
-The final e_Q23[i] value may require more than 16 bits per sample, but will not
- require more than 23, including the sign.
-</t>
-
-</section>
-
-</section>
-
-<section anchor="silk_frame_reconstruction" toc="include"
- title="SILK Frame Reconstruction">
-
-<t>
-The remainder of the reconstruction process for the frame does not need to be
- bit-exact, as small errors should only introduce proportionally small
- distortions.
-Although the reference implementation only includes a fixed-point version of
- the remaining steps, this section describes them in terms of a floating-point
- version for simplicity.
-This produces a signal with a nominal range of -1.0 to 1.0.
-</t>
-
-<t>
-silk_decode_core() (decode_core.c) contains the code for the main
- reconstruction process.
-It proceeds subframe-by-subframe, since quantization gains, LTP parameters, and
- (in 20&nbsp;ms SILK frames) LPC coefficients can vary from one to the
- next.
-</t>
-
-<t>
-Let a_Q12[k] be the LPC coefficients for the current subframe.
-If this is the first or second subframe of a 20&nbsp;ms SILK frame and the LSF
- interpolation factor, w_Q2 (see <xref target="silk_nlsf_interpolation"/>), is
- less than 4, then these correspond to the final LPC coefficients produced by
- <xref target="silk_lpc_gain_limit"/> from the interpolated LSF coefficients,
- n1_Q15[k] (computed in <xref target="silk_nlsf_interpolation"/>).
-Otherwise, they correspond to the final LPC coefficients produced from the
- uninterpolated LSF coefficients for the current frame, n2_Q15[k].
-</t>
-
-<t>
-Also, let n be the number of samples in a subframe (40 for NB, 60 for MB, and
- 80 for WB), s be the index of the current subframe in this SILK frame (0 or 1
- for 10&nbsp;ms frames, or 0 to 3 for 20&nbsp;ms frames), and j be the index of
- the first sample in the residual corresponding to the current subframe.
-</t>
-
-<section anchor="silk_ltp_synthesis" title="LTP Synthesis">
-<t>
-Voiced SILK frames (see <xref target="silk_frame_type"/>) pass the excitation
- through an LTP filter using the parameters decoded in
- <xref target="silk_ltp_params"/> to produce an LPC residual.
-The LTP filter requires LPC residual values from before the current subframe as
- input.
-However, since the LPC coefficients may have changed, it obtains this residual
- by "rewhitening" the corresponding output signal using the LPC coefficients
- from the current subframe.
-Let out[i] for
- (j&nbsp;-&nbsp;pitch_lags[s]&nbsp;-&nbsp;d_LPC&nbsp;-&nbsp;2)&nbsp;&lt;=&nbsp;i&nbsp;&lt;&nbsp;j
- be the fully reconstructed output signal from the last
- (pitch_lags[s]&nbsp;+&nbsp;d_LPC&nbsp;+&nbsp;2) samples of previous subframes
- (see <xref target="silk_lpc_synthesis"/>), where pitch_lags[s] is the pitch
- lag for the current subframe from <xref target="silk_ltp_lags"/>.
-During reconstruction of the first subframe for this channel after either
-<list style="symbols">
-<t>An uncoded regular SILK frame (if this is the side channel), or</t>
-<t>A decoder reset (see <xref target="decoder-reset"/>),</t>
-</list>
- out[] is rewhitened into an LPC residual,
- res[i], via
-<figure align="center">
-<artwork align="center"><![CDATA[
-         4.0*LTP_scale_Q14
-res[i] = ----------------- * clamp(-1.0,
-            gain_Q16[s]
-
-                                   d_LPC-1
-                                     __              a_Q12[k]
-                            out[i] - \  out[i-k-1] * --------, 1.0) .
-                                     /_               4096.0
-                                     k=0
-]]></artwork>
-</figure>
-This requires storage to buffer up to 306 values of out[i] from previous
- subframes.
-This corresponds to WB with a maximum pitch lag of
- 18&nbsp;ms&nbsp;*&nbsp;16&nbsp;kHz samples, plus 16 samples for d_LPC, plus 2
- samples for the width of the LTP filter.
-</t>
-
-<t>
-Let e_Q23[i] for j&nbsp;&lt;=&nbsp;i&nbsp;&lt;&nbsp;(j&nbsp;+&nbsp;n) be the
- excitation for the current subframe, and b_Q7[k] for
- 0&nbsp;&lt;=&nbsp;k&nbsp;&lt;&nbsp;5 be the coefficients of the LTP filter
- taken from the codebook entry in one of
- Tables&nbsp;<xref format="counter" target="silk_ltp_filter_coeffs0"/>
- through&nbsp;<xref format="counter" target="silk_ltp_filter_coeffs2"/>
- corresponding to the index decoded for the current subframe in
- <xref target="silk_ltp_filter"/>.
-Then for i such that j&nbsp;&lt;=&nbsp;i&nbsp;&lt;&nbsp;(j&nbsp;+&nbsp;n),
- the LPC residual is
-<figure align="center">
-<artwork align="center"><![CDATA[
-                      4
-          e_Q23[i]   __                                  b_Q7[k]
-res[i] = --------- + \  res[i - pitch_lags[s] + 2 - k] * ------- .
-          2.0**23    /_                                   128.0
-                     k=0
-]]></artwork>
-</figure>
-</t>
-
-<t>
-For unvoiced frames, the LPC residual for
- j&nbsp;&lt;=&nbsp;i&nbsp;&lt;&nbsp;(j&nbsp;+&nbsp;n) is simply a normalized
- copy of the excitation signal, i.e.,
-<figure align="center">
-<artwork align="center"><![CDATA[
-          e_Q23[i]
-res[i] = ---------
-          2.0**23
-]]></artwork>
-</figure>
-</t>
-</section>
-
-<section anchor="silk_lpc_synthesis" title="LPC Synthesis">
-<t>
-LPC synthesis uses the short-term LPC filter to predict the next output
- coefficient.
-For i such that (j&nbsp;-&nbsp;d_LPC)&nbsp;&lt;=&nbsp;i&nbsp;&lt;&nbsp;j, let
- lpc[i] be the result of LPC synthesis from the last d_LPC samples of the
- previous subframe, or zeros in the first subframe for this channel after
- either
-<list style="symbols">
-<t>An uncoded regular SILK frame (if this is the side channel), or</t>
-<t>A decoder reset (see <xref target="decoder-reset"/>).</t>
-</list>
-Then for i such that j&nbsp;&lt;=&nbsp;i&nbsp;&lt;&nbsp;(j&nbsp;+&nbsp;n), the
- result of LPC synthesis for the current subframe is
-<figure align="center">
-<artwork align="center"><![CDATA[
-                              d_LPC-1
-         gain_Q16[i]            __              a_Q12[k]
-lpc[i] = ----------- * res[i] + \  lpc[i-k-1] * -------- .
-           65536.0              /_               4096.0
-                                k=0
-]]></artwork>
-</figure>
-The decoder saves the final d_LPC values, i.e., lpc[i] such that
- (j&nbsp;+&nbsp;n&nbsp;-&nbsp;d_LPC)&nbsp;&lt;=&nbsp;i&nbsp;&lt;&nbsp;(j&nbsp;+&nbsp;n),
- to feed into the LPC synthesis of the next subframe.
-This requires storage for up to 16 values of lpc[i] (for WB frames).
-</t>
-
-<t>
-Then, the signal is clamped into the final nominal range:
-<figure align="center">
-<artwork align="center"><![CDATA[
-out[i] = clamp(-1.0, lpc[i], 1.0) .
-]]></artwork>
-</figure>
-This clamping occurs entirely after the LPC synthesis filter has run.
-The decoder saves the unclamped values, lpc[i], to feed into the LPC filter for
- the next subframe, but saves the clamped values, out[i], for rewhitening in
- voiced frames.
-</t>
-</section>
-
-</section>
-
-</section>
-
-<section anchor="silk_stereo_unmixing" title="Stereo Unmixing">
-<t>
-For stereo streams, after decoding a frame from each channel, the decoder must
- convert the mid-side (MS) representation into a left-right (LR)
- representation.
-The function silk_stereo_MS_to_LR (stereo_MS_to_LR.c) implements this process.
-In it, the decoder predicts the side channel using a) a simple low-passed
- version of the mid channel, and b) the unfiltered mid channel, using the
- prediction weights decoded in <xref target="silk_stereo_pred"/>.
-This simple low-pass filter imposes a one-sample delay, and the unfiltered
-mid channel is also delayed by one sample.
-In order to allow seamless switching between stereo and mono, mono streams must
- also impose the same one-sample delay.
-The encoder requires an additional one-sample delay for both mono and stereo
- streams, though an encoder may omit the delay for mono if it knows it will
- never switch to stereo.
-</t>
-
-<t>
-The unmixing process operates in two phases.
-The first phase lasts for 8&nbsp;ms, during which it interpolates the
- prediction weights from the previous frame, prev_w0_Q13 and prev_w1_Q13, to
- the values for the current frame, w0_Q13 and w1_Q13.
-The second phase simply uses these weights for the remainder of the frame.
-</t>
-
-<t>
-Let mid[i] and side[i] be the contents of out[i] (from
- <xref target="silk_lpc_synthesis"/>) for the current mid and side channels,
- respectively, and let left[i] and right[i] be the corresponding stereo output
- channels.
-If the side channel is not coded (see <xref target="silk_mid_only_flag"/>),
- then side[i] is set to zero.
-Also let j be defined as in <xref target="silk_frame_reconstruction"/>, n1 be
- the number of samples in phase&nbsp;1 (64 for NB, 96 for MB, and 128 for WB),
- and n2 be the total number of samples in the frame.
-Then for i such that j&nbsp;&lt;=&nbsp;i&nbsp;&lt;&nbsp;(j&nbsp;+&nbsp;n2),
- the left and right channel output is
-<figure align="center">
-<artwork align="center"><![CDATA[
-              prev_w0_Q13                  (w0_Q13 - prev_w0_Q13)
-        w0 =  ----------- + min(i - j, n1)*---------------------- ,
-                8192.0                           8192.0*n1
-
-              prev_w1_Q13                  (w1_Q13 - prev_w1_Q13)
-        w1 =  ----------- + min(i - j, n1)*---------------------- ,
-                8192.0                            8192.0*n1
-
-             mid[i-2] + 2*mid[i-1] + mid[i]
-        p0 = ------------------------------ ,
-                          4.0
-
- left[i] = clamp(-1.0, (1 + w1)*mid[i-1] + side[i-1] + w0*p0, 1.0) ,
-
-right[i] = clamp(-1.0, (1 - w1)*mid[i-1] - side[i-1] - w0*p0, 1.0) .
-]]></artwork>
-</figure>
-These formulas require two samples prior to index&nbsp;j, the start of the
- frame, for the mid channel, and one prior sample for the side channel.
-For the first frame after a decoder reset, zeros are used instead.
-</t>
-
-</section>
-
-<section title="Resampling">
-<t>
-After stereo unmixing (if any), the decoder applies resampling to convert the
- decoded SILK output to the sample rate desired by the application.
-This is necessary when decoding a Hybrid frame at SWB or FB sample rates, or
- whenever the decoder wants the output at a different sample rate than the
- internal SILK sampling rate (e.g., to allow a constant sample rate when the
- audio bandwidth changes, or to allow mixing with audio from other
- applications).
-The resampler itself is non-normative, and a decoder can use any method it
- wants to perform the resampling.
-</t>
-
-<t>
-However, a minimum amount of delay is imposed to allow the resampler to
- operate, and this delay is normative, so that the corresponding delay can be
- applied to the MDCT layer in the encoder.
-A decoder is always free to use a resampler which requires more delay than
- allowed for here (e.g., to improve quality), but it must then delay the output
- of the MDCT layer by this extra amount.
-Keeping as much delay as possible on the encoder side allows an encoder which
- knows it will never use any of the SILK or Hybrid modes to skip this delay.
-By contrast, if it were all applied by the decoder, then a decoder which
- processes audio in fixed-size blocks would be forced to delay the output of
- CELT frames just in case of a later switch to a SILK or Hybrid mode.
-</t>
-
-<t>
-<xref target="silk_resampler_delay_alloc"/> gives the maximum resampler delay
- in samples at 48&nbsp;kHz for each SILK audio bandwidth.
-Because the actual output rate may not be 48&nbsp;kHz, it may not be possible
- to achieve exactly these delays while using a whole number of input or output
- samples.
-The reference implementation is able to resample to any of the supported
- output sampling rates (8, 12, 16, 24, or 48&nbsp;kHz) within or near this
- delay constraint.
-Some resampling filters (including those used by the reference implementation)
- may add a delay that is not an exact integer, or is not linear-phase, and so
- cannot be represented by a single delay at all frequencies.
-However, such deviations are unlikely to be perceptible, and the comparison
- tool described in <xref target="conformance"/> is designed to be relatively
- insensitive to them.
-The delays listed here are the ones that should be targeted by the encoder.
-</t>
-
-<texttable anchor="silk_resampler_delay_alloc"
- title="SILK Resampler Delay Allocations">
-<ttcol>Audio Bandwidth</ttcol>
-<ttcol>Delay in millisecond</ttcol>
-<c>NB</c> <c>0.538</c>
-<c>MB</c> <c>0.692</c>
-<c>WB</c> <c>0.706</c>
-</texttable>
-
-<t>
-NB is given a smaller decoder delay allocation than MB and WB to allow a
- higher-order filter when resampling to 8&nbsp;kHz in both the encoder and
- decoder.
-This implies that the audio content of two SILK frames operating at different
- bandwidths are not perfectly aligned in time.
-This is not an issue for any transitions described in
- <xref target="switching"/>, because they all involve a SILK decoder reset.
-When the decoder is reset, any samples remaining in the resampling buffer
- are discarded, and the resampler is re-initialized with silence.
-</t>
-
-</section>
-
-</section>
-
-
-<section title="CELT Decoder">
-
-<t>
-The CELT layer of Opus is based on the Modified Discrete Cosine Transform
-<xref target='MDCT'/> with partially overlapping windows of 5 to 22.5 ms.
-The main principle behind CELT is that the MDCT spectrum is divided into
-bands that (roughly) follow the Bark scale, i.e., the scale of the ear's
-critical bands&nbsp;<xref target="Zwicker61"/>. The normal CELT layer uses 21 of those bands, though Opus
- Custom (see <xref target="opus-custom"/>) may use a different number of bands.
-In Hybrid mode, the first 17 bands (up to 8&nbsp;kHz) are not coded.
-A band can contain as little as one MDCT bin per channel, and as many as 176
-bins per channel, as detailed in <xref target="celt_band_sizes"/>.
-In each band, the gain (energy) is coded separately from
-the shape of the spectrum. Coding the gain explicitly makes it easy to
-preserve the spectral envelope of the signal. The remaining unit-norm shape
-vector is encoded using a Pyramid Vector Quantizer (PVQ)&nbsp;<xref target='PVQ-decoder'/>.
-</t>
-
-<texttable anchor="celt_band_sizes"
- title="MDCT Bins Per Channel Per Band for Each Frame Size">
-<ttcol>Frame Size:</ttcol>
-<ttcol align="right">2.5&nbsp;ms</ttcol>
-<ttcol align="right">5&nbsp;ms</ttcol>
-<ttcol align="right">10&nbsp;ms</ttcol>
-<ttcol align="right">20&nbsp;ms</ttcol>
-<ttcol align="right">Start Frequency</ttcol>
-<ttcol align="right">Stop Frequency</ttcol>
-<c>Band</c> <c>Bins:</c> <c/> <c/> <c/> <c/> <c/>
- <c>0</c>  <c>1</c>  <c>2</c>  <c>4</c>   <c>8</c>     <c>0&nbsp;Hz</c>   <c>200&nbsp;Hz</c>
- <c>1</c>  <c>1</c>  <c>2</c>  <c>4</c>   <c>8</c>   <c>200&nbsp;Hz</c>   <c>400&nbsp;Hz</c>
- <c>2</c>  <c>1</c>  <c>2</c>  <c>4</c>   <c>8</c>   <c>400&nbsp;Hz</c>   <c>600&nbsp;Hz</c>
- <c>3</c>  <c>1</c>  <c>2</c>  <c>4</c>   <c>8</c>   <c>600&nbsp;Hz</c>   <c>800&nbsp;Hz</c>
- <c>4</c>  <c>1</c>  <c>2</c>  <c>4</c>   <c>8</c>   <c>800&nbsp;Hz</c>  <c>1000&nbsp;Hz</c>
- <c>5</c>  <c>1</c>  <c>2</c>  <c>4</c>   <c>8</c>  <c>1000&nbsp;Hz</c>  <c>1200&nbsp;Hz</c>
- <c>6</c>  <c>1</c>  <c>2</c>  <c>4</c>   <c>8</c>  <c>1200&nbsp;Hz</c>  <c>1400&nbsp;Hz</c>
- <c>7</c>  <c>1</c>  <c>2</c>  <c>4</c>   <c>8</c>  <c>1400&nbsp;Hz</c>  <c>1600&nbsp;Hz</c>
- <c>8</c>  <c>2</c>  <c>4</c>  <c>8</c>  <c>16</c>  <c>1600&nbsp;Hz</c>  <c>2000&nbsp;Hz</c>
- <c>9</c>  <c>2</c>  <c>4</c>  <c>8</c>  <c>16</c>  <c>2000&nbsp;Hz</c>  <c>2400&nbsp;Hz</c>
-<c>10</c>  <c>2</c>  <c>4</c>  <c>8</c>  <c>16</c>  <c>2400&nbsp;Hz</c>  <c>2800&nbsp;Hz</c>
-<c>11</c>  <c>2</c>  <c>4</c>  <c>8</c>  <c>16</c>  <c>2800&nbsp;Hz</c>  <c>3200&nbsp;Hz</c>
-<c>12</c>  <c>4</c>  <c>8</c> <c>16</c>  <c>32</c>  <c>3200&nbsp;Hz</c>  <c>4000&nbsp;Hz</c>
-<c>13</c>  <c>4</c>  <c>8</c> <c>16</c>  <c>32</c>  <c>4000&nbsp;Hz</c>  <c>4800&nbsp;Hz</c>
-<c>14</c>  <c>4</c>  <c>8</c> <c>16</c>  <c>32</c>  <c>4800&nbsp;Hz</c>  <c>5600&nbsp;Hz</c>
-<c>15</c>  <c>6</c> <c>12</c> <c>24</c>  <c>48</c>  <c>5600&nbsp;Hz</c>  <c>6800&nbsp;Hz</c>
-<c>16</c>  <c>6</c> <c>12</c> <c>24</c>  <c>48</c>  <c>6800&nbsp;Hz</c>  <c>8000&nbsp;Hz</c>
-<c>17</c>  <c>8</c> <c>16</c> <c>32</c>  <c>64</c>  <c>8000&nbsp;Hz</c>  <c>9600&nbsp;Hz</c>
-<c>18</c> <c>12</c> <c>24</c> <c>48</c>  <c>96</c>  <c>9600&nbsp;Hz</c> <c>12000&nbsp;Hz</c>
-<c>19</c> <c>18</c> <c>36</c> <c>72</c> <c>144</c> <c>12000&nbsp;Hz</c> <c>15600&nbsp;Hz</c>
-<c>20</c> <c>22</c> <c>44</c> <c>88</c> <c>176</c> <c>15600&nbsp;Hz</c> <c>20000&nbsp;Hz</c>
-</texttable>
-
-<t>
-Transients are notoriously difficult for transform codecs to code.
-CELT uses two different strategies for them:
-<list style="numbers">
-<t>Using multiple smaller MDCTs instead of a single large MDCT, and</t>
-<t>Dynamic time-frequency resolution changes (See <xref target='tf-change'/>).</t>
-</list>
-To improve quality on highly tonal and periodic signals, CELT includes
-a prefilter/postfilter combination. The prefilter on the encoder side
-attenuates the signal's harmonics. The postfilter on the decoder side
-restores the original gain of the harmonics, while shaping the coding noise
-to roughly follow the harmonics. Such noise shaping reduces the perception
-of the noise.
-</t>
-
-<t>
-When coding a stereo signal, three coding methods are available:
-<list style="symbols">
-<t>mid-side stereo: encodes the mean and the difference of the left and right channels,</t>
-<t>intensity stereo: only encodes the mean of the left and right channels (discards the difference),</t>
-<t>dual stereo: encodes the left and right channels separately.</t>
-</list>
-</t>
-
-<t>
-An overview of the decoder is given in <xref target="celt-decoder-overview"/>.
-</t>
-
-<figure anchor="celt-decoder-overview" title="Structure of the CELT decoder">
-<artwork align="center"><![CDATA[
-               +---------+
-               | Coarse  |
-            +->| decoder |----+
-            |  +---------+    |
-            |                 |
-            |  +---------+    v
-            |  |  Fine   |  +---+
-            +->| decoder |->| + |
-            |  +---------+  +---+
-            |       ^         |
-+---------+ |       |         |
-|  Range  | | +----------+    v
-| Decoder |-+ |   Bit    | +------+
-+---------+ | |Allocation| | 2**x |
-            | +----------+ +------+
-            |       |         |
-            |       v         v               +--------+
-            |  +---------+  +---+  +-------+  | pitch  |
-            +->|   PVQ   |->| * |->| IMDCT |->| post-  |--->
-            |  | decoder |  +---+  +-------+  | filter |
-            |  +---------+                    +--------+
-            |                                      ^
-            +--------------------------------------+
-]]></artwork>
-</figure>
-
-<t>
-The decoder is based on the following symbols and sets of symbols:
-</t>
-
-<texttable anchor="celt_symbols"
- title="Order of the Symbols in the CELT Section of the Bitstream">
-<ttcol align="center">Symbol(s)</ttcol>
-<ttcol align="center">PDF</ttcol>
-<ttcol align="center">Condition</ttcol>
-<c>silence</c>      <c>{32767, 1}/32768</c> <c></c>
-<c>post-filter</c>  <c>{1, 1}/2</c> <c></c>
-<c>octave</c>       <c>uniform (6)</c><c>post-filter</c>
-<c>period</c>       <c>raw bits (4+octave)</c><c>post-filter</c>
-<c>gain</c>         <c>raw bits (3)</c><c>post-filter</c>
-<c>tapset</c>       <c>{2, 1, 1}/4</c><c>post-filter</c>
-<c>transient</c>    <c>{7, 1}/8</c><c></c>
-<c>intra</c>        <c>{7, 1}/8</c><c></c>
-<c>coarse energy</c><c><xref target="energy-decoding"/></c><c></c>
-<c>tf_change</c>    <c><xref target="transient-decoding"/></c><c></c>
-<c>tf_select</c>    <c>{1, 1}/2</c><c><xref target="transient-decoding"/></c>
-<c>spread</c>       <c>{7, 2, 21, 2}/32</c><c></c>
-<c>dyn. alloc.</c>  <c><xref target="allocation"/></c><c></c>
-<c>alloc. trim</c>  <c>{2, 2, 5, 10, 22, 46, 22, 10, 5, 2, 2}/128</c><c></c>
-<c>skip</c>         <c>{1, 1}/2</c><c><xref target="allocation"/></c>
-<c>intensity</c>    <c>uniform</c><c><xref target="allocation"/></c>
-<c>dual</c>         <c>{1, 1}/2</c><c></c>
-<c>fine energy</c>  <c><xref target="energy-decoding"/></c><c></c>
-<c>residual</c>     <c><xref target="PVQ-decoder"/></c><c></c>
-<c>anti-collapse</c><c>{1, 1}/2</c><c><xref target="anti-collapse"/></c>
-<c>finalize</c>     <c><xref target="energy-decoding"/></c><c></c>
-</texttable>
-
-<t>
-The decoder extracts information from the range-coded bitstream in the order
-described in <xref target='celt_symbols'/>. In some circumstances, it is
-possible for a decoded value to be out of range due to a very small amount of redundancy
-in the encoding of large integers by the range coder.
-In that case, the decoder should assume there has been an error in the coding,
-decoding, or transmission and SHOULD take measures to conceal the error and/or report
-to the application that a problem has occurred. Such out of range errors cannot occur
-in the SILK layer.
-</t>
-
-<section anchor="transient-decoding" title="Transient Decoding">
-<t>
-The "transient" flag indicates whether the frame uses a single long MDCT or several short MDCTs.
-When it is set, then the MDCT coefficients represent multiple
-short MDCTs in the frame. When not set, the coefficients represent a single
-long MDCT for the frame. The flag is encoded in the bitstream with a probability of 1/8.
-In addition to the global transient flag is a per-band
-binary flag to change the time-frequency (tf) resolution independently in each band. The
-change in tf resolution is defined in tf_select_table[][] in celt.c and depends
-on the frame size, whether the transient flag is set, and the value of tf_select.
-The tf_select flag uses a 1/2 probability, but is only decoded
-if it can have an impact on the result knowing the value of all per-band
-tf_change flags.
-</t>
-</section>
-
-<section anchor="energy-decoding" title="Energy Envelope Decoding">
-
-<t>
-It is important to quantize the energy with sufficient resolution because
-any energy quantization error cannot be compensated for at a later
-stage. Regardless of the resolution used for encoding the spectral shape of a band,
-it is perceptually important to preserve the energy in each band. CELT uses a
-three-step coarse-fine-fine strategy for encoding the energy in the base-2 log
-domain, as implemented in quant_bands.c</t>
-
-<section anchor="coarse-energy-decoding" title="Coarse energy decoding">
-<t>
-Coarse quantization of the energy uses a fixed resolution of 6 dB
-(integer part of base-2 log). To minimize the bitrate, prediction is applied
-both in time (using the previous frame) and in frequency (using the previous
-bands). The part of the prediction that is based on the
-previous frame can be disabled, creating an "intra" frame where the energy
-is coded without reference to prior frames. The decoder first reads the intra flag
-to determine what prediction is used.
-The 2-D z-transform <xref target='z-transform'/> of
-the prediction filter is:
-<figure align="center">
-<artwork align="center"><![CDATA[
-                            -1          -1
-              (1 - alpha*z_l  )*(1 - z_b  )
-A(z_l, z_b) = -----------------------------
-                                 -1
-                     1 - beta*z_b
-]]></artwork>
-</figure>
-where b is the band index and l is the frame index. The prediction coefficients
-applied depend on the frame size in use when not using intra energy and are alpha=0, beta=4915/32768
-when using intra energy.
-The time-domain prediction is based on the final fine quantization of the previous
-frame, while the frequency domain (within the current frame) prediction is based
-on coarse quantization only (because the fine quantization has not been computed
-yet). The prediction is clamped internally so that fixed point implementations with
-limited dynamic range always remain in the same state as floating point implementations.
-We approximate the ideal
-probability distribution of the prediction error using a Laplace distribution
-with separate parameters for each frame size in intra- and inter-frame modes. These
-parameters are held in the e_prob_model table in quant_bands.c.
-The
-coarse energy quantization is performed by unquant_coarse_energy() and
-unquant_coarse_energy_impl() (quant_bands.c). The encoding of the Laplace-distributed values is
-implemented in ec_laplace_decode() (laplace.c).
-</t>
-
-</section>
-
-<section anchor="fine-energy-decoding" title="Fine energy quantization">
-<t>
-The number of bits assigned to fine energy quantization in each band is determined
-by the bit allocation computation described in <xref target="allocation"></xref>.
-Let B_i be the number of fine energy bits
-for band i; the refinement is an integer f in the range [0,2**B_i-1]. The mapping between f
-and the correction applied to the coarse energy is equal to (f+1/2)/2**B_i - 1/2. Fine
-energy quantization is implemented in quant_fine_energy() (quant_bands.c).
-</t>
-<t>
-When some bits are left "unused" after all other flags have been decoded, these bits
-are assigned to a "final" step of fine allocation. In effect, these bits are used
-to add one extra fine energy bit per band per channel. The allocation process
-determines two "priorities" for the final fine bits.
-Any remaining bits are first assigned only to bands of priority 0, starting
-from band 0 and going up. If all bands of priority 0 have received one bit per
-channel, then bands of priority 1 are assigned an extra bit per channel,
-starting from band 0. If any bits are left after this, they are left unused.
-This is implemented in unquant_energy_finalise() (quant_bands.c).
-</t>
-
-</section> <!-- fine energy -->
-
-</section> <!-- Energy decode -->
-
-<section anchor="allocation" title="Bit Allocation">
-
-<t>Because the bit allocation drives the decoding of the range-coder
-stream, it MUST be recovered exactly so that identical coding decisions are
-made in the encoder and decoder. Any deviation from the reference's resulting
-bit allocation will result in corrupted output, though implementers are
-free to implement the procedure in any way which produces identical results.</t>
-
-<t>The per-band gain-shape structure of the CELT layer ensures that using
- the same number of bits for the spectral shape of a band in every frame will
- result in a roughly constant signal-to-noise ratio in that band.
-This results in coding noise that has the same spectral envelope as the signal.
-The masking curve produced by a standard psychoacoustic model also closely
- follows the spectral envelope of the signal.
-This structure means that the ideal allocation is more consistent from frame to
- frame than it is for other codecs without an equivalent structure, and that a
- fixed allocation provides fairly consistent perceptual
- performance&nbsp;<xref target='Valin2010'/>.</t>
-
-<t>Many codecs transmit significant amounts of side information to control the
- bit allocation within a frame.
-Often this control is only indirect, and must be exercised carefully to
- achieve the desired rate constraints.
-The CELT layer, however, can adapt over a very wide range of rates, and thus
- has a large number of codebook sizes to choose from for each band.
-Explicitly signaling the size of each of these codebooks would impose
- considerable overhead, even though the allocation is relatively static from
- frame to frame.
-This is because all of the information required to compute these codebook sizes
- must be derived from a single frame by itself, in order to retain robustness
- to packet loss, so the signaling cannot take advantage of knowledge of the
- allocation in neighboring frames.
-This problem is exacerbated in low-latency (small frame size) applications,
- which would include this overhead in every frame.</t>
-
-<t>For this reason, in the MDCT mode Opus uses a primarily implicit bit
-allocation. The available bitstream capacity is known in advance to both
-the encoder and decoder without additional signaling, ultimately from the
-packet sizes expressed by a higher-level protocol. Using this information,
-the codec interpolates an allocation from a hard-coded table.</t>
-
-<t>While the band-energy structure effectively models intra-band masking,
-it ignores the weaker inter-band masking, band-temporal masking, and
-other less significant perceptual effects. While these effects can
-often be ignored, they can become significant for particular samples. One
-mechanism available to encoders would be to simply increase the overall
-rate for these frames, but this is not possible in a constant rate mode
-and can be fairly inefficient. As a result three explicitly signaled
-mechanisms are provided to alter the implicit allocation:</t>
-
-<t>
-<list style="symbols">
-<t>Band boost</t>
-<t>Allocation trim</t>
-<t>Band skipping</t>
-</list>
-</t>
-
-<t>The first of these mechanisms, band boost, allows an encoder to boost
-the allocation in specific bands. The second, allocation trim, works by
-biasing the overall allocation towards higher or lower frequency bands. The third, band
-skipping, selects which low-precision high frequency bands
-will be allocated no shape bits at all.</t>
-
-<t>In stereo mode there are two additional parameters
-potentially coded as part of the allocation procedure: a parameter to allow the
-selective elimination of allocation for the 'side' (i.e., intensity stereo) in jointly coded bands,
-and a flag to deactivate joint coding (i.e., dual stereo). These values are not signaled if
-they would be meaningless in the overall context of the allocation.</t>
-
-<t>Because every signaled adjustment increases overhead and implementation
-complexity, none were included speculatively: the reference encoder makes use
-of all of these mechanisms. While the decision logic in the reference was
-found to be effective enough to justify the overhead and complexity, further
-analysis techniques may be discovered which increase the effectiveness of these
-parameters. As with other signaled parameters, an encoder is free to choose the
-values in any manner, but unless a technique is known to deliver superior
-perceptual results the methods used by the reference implementation should be
-used.</t>
-
-<t>The allocation process consists of the following steps: determining the per-band
-maximum allocation vector, decoding the boosts, decoding the tilt, determining
-the remaining capacity of the frame, searching the mode table for the
-entry nearest but not exceeding the available space (subject to the tilt, boosts, band
-maximums, and band minimums), linear interpolation, reallocation of
-unused bits with concurrent skip decoding, determination of the
-fine-energy vs. shape split, and final reallocation. This process results
-in a per-band shape allocation (in 1/8th bit units), a per-band fine-energy
-allocation (in 1 bit per channel units), a set of band priorities for
-controlling the use of remaining bits at the end of the frame, and a
-remaining balance of unallocated space, which is usually zero except
-at very high rates.</t>
-
-<t>
-The "static" bit allocation (in 1/8 bits) for a quality q, excluding the minimums, maximums,
-tilt and boosts, is equal to channels*N*alloc[band][q]&lt;&lt;LM&gt;&gt;2, where
-alloc[][] is given in <xref target="static_alloc"/> and LM=log2(frame_size/120). The allocation
-is obtained by linearly interpolating between two values of q (in steps of 1/64) to find the
-highest allocation that does not exceed the number of bits remaining.
-</t>
-
-<texttable anchor="static_alloc"
- title="CELT Static Allocation Table">
- <preamble>Rows indicate the MDCT bands, columns are the different quality (q) parameters. The units are 1/32 bit per MDCT bin.</preamble>
-<ttcol align="right">0</ttcol>
-<ttcol align="right">1</ttcol>
-<ttcol align="right">2</ttcol>
-<ttcol align="right">3</ttcol>
-<ttcol align="right">4</ttcol>
-<ttcol align="right">5</ttcol>
-<ttcol align="right">6</ttcol>
-<ttcol align="right">7</ttcol>
-<ttcol align="right">8</ttcol>
-<ttcol align="right">9</ttcol>
-<ttcol align="right">10</ttcol>
-<c>0</c><c>90</c><c>110</c><c>118</c><c>126</c><c>134</c><c>144</c><c>152</c><c>162</c><c>172</c><c>200</c>
-<c>0</c><c>80</c><c>100</c><c>110</c><c>119</c><c>127</c><c>137</c><c>145</c><c>155</c><c>165</c><c>200</c>
-<c>0</c><c>75</c><c>90</c><c>103</c><c>112</c><c>120</c><c>130</c><c>138</c><c>148</c><c>158</c><c>200</c>
-<c>0</c><c>69</c><c>84</c><c>93</c><c>104</c><c>114</c><c>124</c><c>132</c><c>142</c><c>152</c><c>200</c>
-<c>0</c><c>63</c><c>78</c><c>86</c><c>95</c><c>103</c><c>113</c><c>123</c><c>133</c><c>143</c><c>200</c>
-<c>0</c><c>56</c><c>71</c><c>80</c><c>89</c><c>97</c><c>107</c><c>117</c><c>127</c><c>137</c><c>200</c>
-<c>0</c><c>49</c><c>65</c><c>75</c><c>83</c><c>91</c><c>101</c><c>111</c><c>121</c><c>131</c><c>200</c>
-<c>0</c><c>40</c><c>58</c><c>70</c><c>78</c><c>85</c><c>95</c><c>105</c><c>115</c><c>125</c><c>200</c>
-<c>0</c><c>34</c><c>51</c><c>65</c><c>72</c><c>78</c><c>88</c><c>98</c><c>108</c><c>118</c><c>198</c>
-<c>0</c><c>29</c><c>45</c><c>59</c><c>66</c><c>72</c><c>82</c><c>92</c><c>102</c><c>112</c><c>193</c>
-<c>0</c><c>20</c><c>39</c><c>53</c><c>60</c><c>66</c><c>76</c><c>86</c><c>96</c><c>106</c><c>188</c>
-<c>0</c><c>18</c><c>32</c><c>47</c><c>54</c><c>60</c><c>70</c><c>80</c><c>90</c><c>100</c><c>183</c>
-<c>0</c><c>10</c><c>26</c><c>40</c><c>47</c><c>54</c><c>64</c><c>74</c><c>84</c><c>94</c><c>178</c>
-<c>0</c><c>0</c><c>20</c><c>31</c><c>39</c><c>47</c><c>57</c><c>67</c><c>77</c><c>87</c><c>173</c>
-<c>0</c><c>0</c><c>12</c><c>23</c><c>32</c><c>41</c><c>51</c><c>61</c><c>71</c><c>81</c><c>168</c>
-<c>0</c><c>0</c><c>0</c><c>15</c><c>25</c><c>35</c><c>45</c><c>55</c><c>65</c><c>75</c><c>163</c>
-<c>0</c><c>0</c><c>0</c><c>4</c><c>17</c><c>29</c><c>39</c><c>49</c><c>59</c><c>69</c><c>158</c>
-<c>0</c><c>0</c><c>0</c><c>0</c><c>12</c><c>23</c><c>33</c><c>43</c><c>53</c><c>63</c><c>153</c>
-<c>0</c><c>0</c><c>0</c><c>0</c><c>1</c><c>16</c><c>26</c><c>36</c><c>46</c><c>56</c><c>148</c>
-<c>0</c><c>0</c><c>0</c><c>0</c><c>0</c><c>10</c><c>15</c><c>20</c><c>30</c><c>45</c><c>129</c>
-<c>0</c><c>0</c><c>0</c><c>0</c><c>0</c><c>1</c><c>1</c><c>1</c><c>1</c><c>20</c><c>104</c>
-</texttable>
-
-<t>The maximum allocation vector is an approximation of the maximum space
-that can be used by each band for a given mode. The value is
-approximate because the shape encoding is variable rate (due
-to entropy coding of splitting parameters). Setting the maximum too low reduces the
-maximum achievable quality in a band while setting it too high
-may result in waste: bitstream capacity available at the end
-of the frame which can not be put to any use. The maximums
-specified by the codec reflect the average maximum. In the reference
-implementation, the maximums in bits/sample are precomputed in a static table
-(see cache_caps50[] in static_modes_float.h) for each band,
-for each value of LM, and for both mono and stereo.
-
-Implementations are expected
-to simply use the same table data, but the procedure for generating
-this table is included in rate.c as part of compute_pulse_cache().</t>
-
-<t>To convert the values in cache.caps into the actual maximums: first
-set nbBands to the maximum number of bands for this mode, and stereo to
-zero if stereo is not in use and one otherwise. For each band set N
-to the number of MDCT bins covered by the band (for one channel), set LM
-to the shift value for the frame size,
-then set i to nbBands*(2*LM+stereo). Then set the maximum for the band to
-the i-th index of cache.caps + 64 and multiply by the number of channels
-in the current frame (one or two) and by N, then divide the result by 4
-using integer division. The resulting vector will be called
-cap[]. The elements fit in signed 16-bit integers but do not fit in 8 bits.
-This procedure is implemented in the reference in the function init_caps() in celt.c.
-</t>
-
-<t>The band boosts are represented by a series of binary symbols which
-are entropy coded with very low probability. Each band can potentially be boosted
-multiple times, subject to the frame actually having enough room to obey
-the boost and having enough room to code the boost symbol. The default
-coding cost for a boost starts out at six bits (probability p=1/64), but subsequent boosts
-in a band cost only a single bit and every time a band is boosted the
-initial cost is reduced (down to a minimum of two bits, or p=1/4). Since the initial
-cost of coding a boost is 6 bits, the coding cost of the boost symbols when
-completely unused is 0.48 bits/frame for a 21 band mode (21*-log2(1-1/2**6)).</t>
-
-<t>To decode the band boosts: First set 'dynalloc_logp' to 6, the initial
-amount of storage required to signal a boost in bits, 'total_bits' to the
-size of the frame in 8th bits, 'total_boost' to zero, and 'tell' to the total number
-of 8th bits decoded
-so far. For each band from the coding start (0 normally, but 17 in Hybrid mode)
-to the coding end (which changes depending on the signaled bandwidth), the boost quanta
-in units of 1/8 bit is calculated as quanta = min(8*N, max(48, N)).
-This represents a boost step size of six bits, subject to a lower limit of
-1/8th&nbsp;bit/sample and an upper limit of 1&nbsp;bit/sample.
-Set 'boost' to zero and 'dynalloc_loop_logp'
-to dynalloc_logp. While dynalloc_loop_log (the current worst case symbol cost) in
-8th bits plus tell is less than total_bits plus total_boost and boost is less than cap[] for this
-band: Decode a bit from the bitstream with a with dynalloc_loop_logp as the cost
-of a one, update tell to reflect the current used capacity, if the decoded value
-is zero break the  loop otherwise add quanta to boost and total_boost, subtract quanta from
-total_bits, and set dynalloc_loop_log to 1. When the while loop finishes
-boost contains the boost for this band. If boost is non-zero and dynalloc_logp
-is greater than 2, decrease dynalloc_logp.  Once this process has been
-executed on all bands, the band boosts have been decoded. This procedure
-is implemented around line 2474 of celt.c.</t>
-
-<t>At very low rates it is possible that there won't be enough available
-space to execute the inner loop even once. In these cases band boost
-is not possible but its overhead is completely eliminated. Because of the
-high cost of band boost when activated, a reasonable encoder should not be
-using it at very low rates. The reference implements its dynalloc decision
-logic around line 1304 of celt.c.</t>
-
-<t>The allocation trim is a integer value from 0-10. The default value of
-5 indicates no trim. The trim parameter is entropy coded in order to
-lower the coding cost of less extreme adjustments. Values lower than
-5 bias the allocation towards lower frequencies and values above 5
-bias it towards higher frequencies. Like other signaled parameters, signaling
-of the trim is gated so that it is not included if there is insufficient space
-available in the bitstream. To decode the trim, first set
-the trim value to 5, then if and only if the count of decoded 8th bits so far (ec_tell_frac)
-plus 48 (6 bits) is less than or equal to the total frame size in 8th
-bits minus total_boost (a product of the above band boost procedure),
-decode the trim value using the PDF in <xref target="celt_trim_pdf"/>.</t>
-
-<texttable anchor="celt_trim_pdf" title="PDF for the Trim">
-<ttcol>PDF</ttcol>
-<c>{1, 1, 2, 5, 10, 22, 46, 22, 10, 5, 2, 2}/128</c>
-</texttable>
-
-<t>For 10 ms and 20 ms frames using short blocks and that have at least LM+2 bits left prior to
-the allocation process, then one anti-collapse bit is reserved in the allocation process so it can
-be decoded later. Following the the anti-collapse reservation, one bit is reserved for skip if available.</t>
-
-<t>For stereo frames, bits are reserved for intensity stereo and for dual stereo. Intensity stereo
-requires ilog2(end-start) bits. Those bits are reserved if there is enough bits left. Following this, one
-bit is reserved for dual stereo if available.</t>
-
-
-<t>The allocation computation begins by setting up some initial conditions.
-'total' is set to the remaining available 8th bits, computed by taking the
-size of the coded frame times 8 and subtracting ec_tell_frac(). From this value, one (8th bit)
-is subtracted to ensure that the resulting allocation will be conservative. 'anti_collapse_rsv'
-is set to 8 (8th bits) if and only if the frame is a transient, LM is greater than 1, and total is
-greater than or equal to (LM+2) * 8. Total is then decremented by anti_collapse_rsv and clamped
-to be equal to or greater than zero. 'skip_rsv' is set to 8 (8th bits) if total is greater than
-8, otherwise it is zero. Total is then decremented by skip_rsv. This reserves space for the
-final skipping flag.</t>
-
-<t>If the current frame is stereo, intensity_rsv is set to the conservative log2 in 8th bits
-of the number of coded bands for this frame (given by the table LOG2_FRAC_TABLE in rate.c). If
-intensity_rsv is greater than total then intensity_rsv is set to zero. Otherwise total is
-decremented by intensity_rsv, and if total is still greater than 8, dual_stereo_rsv is
-set to 8 and total is decremented by dual_stereo_rsv.</t>
-
-<t>The allocation process then computes a vector representing the hard minimum amounts allocation
-any band will receive for shape. This minimum is higher than the technical limit of the PVQ
-process, but very low rate allocations produce an excessively sparse spectrum and these bands
-are better served by having no allocation at all. For each coded band, set thresh[band] to
-twenty-four times the number of MDCT bins in the band and divide by 16. If 8 times the number
-of channels is greater, use that instead. This sets the minimum allocation to one bit per channel
-or 48 128th bits per MDCT bin, whichever is greater. The band-size dependent part of this
-value is not scaled by the channel count, because at the very low rates where this limit is
-applicable there will usually be no bits allocated to the side.</t>
-
-<t>The previously decoded allocation trim is used to derive a vector of per-band adjustments,
-'trim_offsets[]'. For each coded band take the alloc_trim and subtract 5 and LM. Then multiply
-the result by the number of channels, the number of MDCT bins in the shortest frame size for this mode,
-the number of remaining bands, 2**LM, and 8. Then divide this value by 64. Finally, if the
-number of MDCT bins in the band per channel is only one, 8 times the number of channels is subtracted
-in order to diminish the allocation by one bit, because width 1 bands receive greater benefit
-from the coarse energy coding.</t>
-
-
-</section>
-
-<section anchor="PVQ-decoder" title="Shape Decoding">
-<t>
-In each band, the normalized "shape" is encoded
-using a vector quantization scheme called a "pyramid vector quantizer".
-</t>
-
-<t>In
-the simplest case, the number of bits allocated in
-<xref target="allocation"></xref> is converted to a number of pulses as described
-by <xref target="bits-pulses"></xref>. Knowing the number of pulses and the
-number of samples in the band, the decoder calculates the size of the codebook
-as detailed in <xref target="cwrs-decoder"></xref>. The size is used to decode
-an unsigned integer (uniform probability model), which is the codeword index.
-This index is converted into the corresponding vector as explained in
-<xref target="cwrs-decoder"></xref>. This vector is then scaled to unit norm.
-</t>
-
-<section anchor="bits-pulses" title="Bits to Pulses">
-<t>
-Although the allocation is performed in 1/8th bit units, the quantization requires
-an integer number of pulses K. To do this, the encoder searches for the value
-of K that produces the number of bits nearest to the allocated value
-(rounding down if exactly halfway between two values), not to exceed
-the total number of bits available. For efficiency reasons, the search is performed against a
-precomputed allocation table which only permits some K values for each N. The number of
-codebook entries can be computed as explained in <xref target="cwrs-decoder"></xref>. The difference
-between the number of bits allocated and the number of bits used is accumulated to a
-"balance" (initialized to zero) that helps adjust the
-allocation for the next bands. One third of the balance is applied to the
-bit allocation of each band to help achieve the target allocation. The only
-exceptions are the band before the last and the last band, for which half the balance
-and the whole balance are applied, respectively.
-</t>
-</section>
-
-<section anchor="cwrs-decoder" title="PVQ Decoding">
-
-<t>
-Decoding of PVQ vectors is implemented in decode_pulses() (cwrs.c).
-The unique codeword index is decoded as a uniformly-distributed integer value between 0 and
-V(N,K)-1, where V(N,K) is the number of possible combinations of K pulses in
-N samples. The index is then converted to a vector in the same way specified in
-<xref target="PVQ"></xref>. The indexing is based on the calculation of V(N,K)
-(denoted N(L,K) in <xref target="PVQ"></xref>).
-</t>
-
-<t>
- The number of combinations can be computed recursively as
-V(N,K) = V(N-1,K) + V(N,K-1) + V(N-1,K-1), with V(N,0) = 1 and V(0,K) = 0, K != 0.
-There are many different ways to compute V(N,K), including precomputed tables and direct
-use of the recursive formulation. The reference implementation applies the recursive
-formulation one line (or column) at a time to save on memory use,
-along with an alternate,
-univariate recurrence to initialize an arbitrary line, and direct
-polynomial solutions for small N. All of these methods are
-equivalent, and have different trade-offs in speed, memory usage, and
-code size. Implementations MAY use any methods they like, as long as
-they are equivalent to the mathematical definition.
-</t>
-
-<t>
-The decoded vector X is recovered as follows.
-Let i be the index decoded with the procedure in <xref target="ec_dec_uint"/>
- with ft&nbsp;=&nbsp;V(N,K), so that 0&nbsp;&lt;=&nbsp;i&nbsp;&lt;&nbsp;V(N,K).
-Let k&nbsp;=&nbsp;K.
-Then for j&nbsp;=&nbsp;0 to (N&nbsp;-&nbsp;1), inclusive, do:
-<list style="numbers">
-<t>Let p&nbsp;=&nbsp;(V(N-j-1,k)&nbsp;+&nbsp;V(N-j,k))/2.</t>
-<t>
-If i&nbsp;&lt;&nbsp;p, then let sgn&nbsp;=&nbsp;1, else let sgn&nbsp;=&nbsp;-1
- and set i&nbsp;=&nbsp;i&nbsp;-&nbsp;p.
-</t>
-<t>Let k0&nbsp;=&nbsp;k and set p&nbsp;=&nbsp;p&nbsp;-&nbsp;V(N-j-1,k).</t>
-<t>
-While p&nbsp;&gt;&nbsp;i, set k&nbsp;=&nbsp;k&nbsp;-&nbsp;1 and
- p&nbsp;=&nbsp;p&nbsp;-&nbsp;V(N-j-1,k).
-</t>
-<t>
-Set X[j]&nbsp;=&nbsp;sgn*(k0&nbsp;-&nbsp;k) and i&nbsp;=&nbsp;i&nbsp;-&nbsp;p.
-</t>
-</list>
-</t>
-
-<t>
-The decoded vector X is then normalized such that its
-L2-norm equals one.
-</t>
-</section>
-
-<section anchor="spreading" title="Spreading">
-<t>
-The normalized vector decoded in <xref target="cwrs-decoder"/> is then rotated
-for the purpose of avoiding tonal artifacts. The rotation gain is equal to
-<figure align="center">
-<artwork align="center"><![CDATA[
-g_r = N / (N + f_r*K)
-]]></artwork>
-</figure>
-
-where N is the number of dimensions, K is the number of pulses, and f_r depends on
-the value of the "spread" parameter in the bit-stream.
-</t>
-
-<texttable anchor="spread values" title="Spreading Values">
-<ttcol>Spread value</ttcol>
-<ttcol>f_r</ttcol>
- <c>0</c> <c>infinite (no rotation)</c>
- <c>1</c> <c>15</c>
- <c>2</c> <c>10</c>
- <c>3</c> <c>5</c>
-</texttable>
-
-<t>
-The rotation angle is then calculated as
-<figure align="center">
-<artwork align="center"><![CDATA[
-                 2
-        pi *  g_r
-theta = ----------
-            4
-]]></artwork>
-</figure>
-A 2-D rotation R(i,j) between points x_i and x_j is defined as:
-<figure align="center">
-<artwork align="center"><![CDATA[
-x_i' =  cos(theta)*x_i + sin(theta)*x_j
-x_j' = -sin(theta)*x_i + cos(theta)*x_j
-]]></artwork>
-</figure>
-
-An N-D rotation is then achieved by applying a series of 2-D rotations back and forth, in the
-following order: R(x_1, x_2), R(x_2, x_3), ..., R(x_N-2, X_N-1), R(x_N-1, X_N),
-R(x_N-2, X_N-1), ..., R(x_1, x_2).
-</t>
-
-<t>
-If the decoded vector represents more
-than one time block, then this spreading process is applied separately on each time block.
-Also, if each block represents 8 samples or more, then another N-D rotation, by
-(pi/2-theta), is applied <spanx style="emph">before</spanx> the rotation described above. This
-extra rotation is applied in an interleaved manner with a stride equal to round(sqrt(N/nb_blocks)),
-i.e., it is applied independently for each set of sample S_k = {stride*n + k}, n=0..N/stride-1.
-</t>
-</section>
-
-<section anchor="split" title="Split decoding">
-<t>
-To avoid the need for multi-precision calculations when decoding PVQ codevectors,
-the maximum size allowed for codebooks is 32 bits. When larger codebooks are
-needed, the vector is instead split in two sub-vectors of size N/2.
-A quantized gain parameter with precision
-derived from the current allocation is entropy coded to represent the relative
-gains of each side of the split, and the entire decoding process is recursively
-applied. Multiple levels of splitting may be applied up to a limit of LM+1 splits.
-The same recursive mechanism is applied for the joint coding
-of stereo audio.
-</t>
-
-</section>
-
-<section anchor="tf-change" title="Time-Frequency change">
-<t>
-The time-frequency (TF) parameters are used to control the time-frequency resolution tradeoff
-in each coded band. For each band, there are two possible TF choices. For the first
-band coded, the PDF is {3, 1}/4 for frames marked as transient and {15, 1}/16 for
-the other frames. For subsequent bands, the TF choice is coded relative to the
-previous TF choice with probability {15, 1}/15 for transient frames and {31, 1}/32
-otherwise. The mapping between the decoded TF choices and the adjustment in TF
-resolution is shown in the tables below.
-</t>
-
-<texttable anchor='tf_00'
- title="TF Adjustments for Non-transient Frames and tf_select=0">
-<ttcol align='center'>Frame size (ms)</ttcol>
-<ttcol align='center'>0</ttcol>
-<ttcol align='center'>1</ttcol>
-<c>2.5</c>      <c>0</c> <c>-1</c>
-<c>5</c>      <c>0</c> <c>-1</c>
-<c>10</c>      <c>0</c> <c>-2</c>
-<c>20</c>      <c>0</c> <c>-2</c>
-</texttable>
-
-<texttable anchor='tf_01'
- title="TF Adjustments for Non-transient Frames and tf_select=1">
-<ttcol align='center'>Frame size (ms)</ttcol>
-<ttcol align='center'>0</ttcol>
-<ttcol align='center'>1</ttcol>
-<c>2.5</c>      <c>0</c> <c>-1</c>
-<c>5</c>      <c>0</c> <c>-2</c>
-<c>10</c>      <c>0</c> <c>-3</c>
-<c>20</c>      <c>0</c> <c>-3</c>
-</texttable>
-
-
-<texttable anchor='tf_10'
- title="TF Adjustments for Transient Frames and tf_select=0">
-<ttcol align='center'>Frame size (ms)</ttcol>
-<ttcol align='center'>0</ttcol>
-<ttcol align='center'>1</ttcol>
-<c>2.5</c>      <c>0</c> <c>-1</c>
-<c>5</c>      <c>1</c> <c>0</c>
-<c>10</c>      <c>2</c> <c>0</c>
-<c>20</c>      <c>3</c> <c>0</c>
-</texttable>
-
-<texttable anchor='tf_11'
- title="TF Adjustments for Transient Frames and tf_select=1">
-<ttcol align='center'>Frame size (ms)</ttcol>
-<ttcol align='center'>0</ttcol>
-<ttcol align='center'>1</ttcol>
-<c>2.5</c>      <c>0</c> <c>-1</c>
-<c>5</c>      <c>1</c> <c>-1</c>
-<c>10</c>      <c>1</c> <c>-1</c>
-<c>20</c>      <c>1</c> <c>-1</c>
-</texttable>
-
-<t>
-A negative TF adjustment means that the temporal resolution is increased,
-while a positive TF adjustment means that the frequency resolution is increased.
-Changes in TF resolution are implemented using the Hadamard transform <xref target="Hadamard"/>. To increase
-the time resolution by N, N "levels" of the Hadamard transform are applied to the
-decoded vector for each interleaved MDCT vector. To increase the frequency resolution
-(assumes a transient frame), then N levels of the Hadamard transform are applied
-<spanx style="emph">across</spanx> the interleaved MDCT vector. In the case of increased
-time resolution the decoder uses the "sequency order" because the input vector
-is sorted in time.
-</t>
-</section>
-
-
-</section>
-
-<section anchor="anti-collapse" title="Anti-Collapse Processing">
-<t>
-The anti-collapse feature is designed to avoid the situation where the use of multiple
-short MDCTs causes the energy in one or more of the MDCTs to be zero for
-some bands, causing unpleasant artifacts.
-When the frame has the transient bit set, an anti-collapse bit is decoded.
-When anti-collapse is set, the energy in each small MDCT is prevented
-from collapsing to zero. For each band of each MDCT where a collapse is
-detected, a pseudo-random signal is inserted with an energy corresponding
-to the minimum energy over the two previous frames. A renormalization step is
-then required to ensure that the anti-collapse step did not alter the
-energy preservation property.
-</t>
-</section>
-
-<section anchor="denormalization" title="Denormalization">
-<t>
-Just as each band was normalized in the encoder, the last step of the decoder before
-the inverse MDCT is to denormalize the bands. Each decoded normalized band is
-multiplied by the square root of the decoded energy. This is done by denormalise_bands()
-(bands.c).
-</t>
-</section>
-
-<section anchor="inverse-mdct" title="Inverse MDCT">
-
-
-<t>The inverse MDCT implementation has no special characteristics. The
-input is N frequency-domain samples and the output is 2*N time-domain
-samples, while scaling by 1/2. A "low-overlap" window reduces the algorithmic delay.
-It is derived from a basic (full overlap) 240-sample version of the window used by the Vorbis codec:
-<figure align="center">
-<artwork align="center"><![CDATA[
-                                      2
-       /   /pi      /pi   n + 1/2\ \ \
-W(n) = |sin|-- * sin|-- * -------| | | .
-       \   \2       \2       L   / / /
-]]></artwork>
-</figure>
-The low-overlap window is created by zero-padding the basic window and inserting ones in the
-middle, such that the resulting window still satisfies power complementarity <xref target='Princen86'/>.
-The IMDCT and
-windowing are performed by mdct_backward (mdct.c).
-</t>
-
-<section anchor="post-filter" title="Post-filter">
-<t>
-The output of the inverse MDCT (after weighted overlap-add) is sent to the
-post-filter. Although the post-filter is applied at the end, the post-filter
-parameters are encoded at the beginning, just after the silence flag.
-The post-filter can be switched on or off using one bit (logp=1).
-If the post-filter is enabled, then the octave is decoded as an integer value
-between 0 and 6 of uniform probability. Once the octave is known, the fine pitch
-within the octave is decoded using 4+octave raw bits. The final pitch period
-is equal to (16&lt;&lt;octave)+fine_pitch-1 so it is bounded between 15 and 1022,
-inclusively. Next, the gain is decoded as three raw bits and is equal to
-G=3*(int_gain+1)/32. The set of post-filter taps is decoded last, using
-a pdf equal to {2, 1, 1}/4. Tapset zero corresponds to the filter coefficients
-g0 = 0.3066406250, g1 = 0.2170410156, g2 = 0.1296386719. Tapset one
-corresponds to the filter coefficients g0 = 0.4638671875, g1 = 0.2680664062,
-g2 = 0, and tapset two uses filter coefficients g0 = 0.7998046875,
-g1 = 0.1000976562, g2 = 0.
-</t>
-
-<t>
-The post-filter response is thus computed as:
-              <figure align="center">
-                <artwork align="center">
-                  <![CDATA[
-   y(n) = x(n) + G*(g0*y(n-T) + g1*(y(n-T+1)+y(n-T+1))
-                              + g2*(y(n-T+2)+y(n-T+2)))
-]]>
-                </artwork>
-              </figure>
-
-During a transition between different gains, a smooth transition is calculated
-using the square of the MDCT window. It is important that values of y(n) be
-interpolated one at a time such that the past value of y(n) used is interpolated.
-</t>
-</section>
-
-<section anchor="deemphasis" title="De-emphasis">
-<t>
-After the post-filter,
-the signal is de-emphasized using the inverse of the pre-emphasis filter
-used in the encoder:
-<figure align="center">
-<artwork align="center"><![CDATA[
- 1            1
----- = --------------- ,
-A(z)                -1
-       1 - alpha_p*z
-]]></artwork>
-</figure>
-where alpha_p=0.8500061035.
-</t>
-</section>
-
-</section>
-
-</section>
-
-<section anchor="Packet Loss Concealment" title="Packet Loss Concealment (PLC)">
-<t>
-Packet loss concealment (PLC) is an optional decoder-side feature that
-SHOULD be included when receiving from an unreliable channel. Because
-PLC is not part of the bitstream, there are many acceptable ways to
-implement PLC with different complexity/quality trade-offs.
-</t>
-
-<t>
-The PLC in
-the reference implementation depends on the mode of last packet received.
-In CELT mode, the PLC finds a periodicity in the decoded
-signal and repeats the windowed waveform using the pitch offset. The windowed
-waveform is overlapped in such a way as to preserve the time-domain aliasing
-cancellation with the previous frame and the next frame. This is implemented
-in celt_decode_lost() (mdct.c).  In SILK mode, the PLC uses LPC extrapolation
-from the previous frame, implemented in silk_PLC() (PLC.c).
-</t>
-
-<section anchor="clock-drift" title="Clock Drift Compensation">
-<t>
-Clock drift refers to the gradual desynchronization of two endpoints
-whose sample clocks run at different frequencies while they are streaming
-live audio.  Differences in clock frequencies are generally attributable to
-manufacturing variation in the endpoints' clock hardware.  For long-lived
-streams, the time difference between sender and receiver can grow without
-bound.
-</t>
-
-<t>
-When the sender's clock runs slower than the receiver's, the effect is similar
-to packet loss: too few packets are received.  The receiver can distinguish
-between drift and loss if the transport provides packet timestamps.  A receiver
-for live streams SHOULD conceal the effects of drift, and MAY do so by invoking
-the PLC.
-</t>
-
-<t>
-When the sender's clock runs faster than the receiver's, too many packets will
-be received.  The receiver MAY respond by skipping any packet (i.e., not
-submitting the packet for decoding).  This is likely to produce a less severe
-artifact than if the frame were dropped after decoding.
-</t>
-
-<t>
-A decoder MAY employ a more sophisticated drift compensation method. For
-example, the
-<xref target='Google-NetEQ'>NetEQ component</xref>
-of the
-<xref target='Google-WebRTC'>Google WebRTC codebase</xref>
-compensates for drift by adding or removing
-one period when the signal is highly periodic. The reference implementation of
-Opus allows a caller to learn whether the current frame's signal is highly
-periodic, and if so what the period is, using the OPUS_GET_PITCH() request.
-</t>
-</section>
-
-</section>
-
-<section anchor="switching" title="Configuration Switching">
-
-<t>
-Switching between the Opus coding modes, audio bandwidths, and channel counts
- requires careful consideration to avoid audible glitches.
-Switching between any two configurations of the CELT-only mode, any two
- configurations of the Hybrid mode, or from WB SILK to Hybrid mode does not
- require any special treatment in the decoder, as the MDCT overlap will smooth
- the transition.
-Switching from Hybrid mode to WB SILK requires adding in the final contents
- of the CELT overlap buffer to the first SILK-only packet.
-This can be done by decoding a 2.5&nbsp;ms silence frame with the CELT decoder
- using the channel count of the SILK-only packet (and any choice of audio
- bandwidth), which will correctly handle the cases when the channel count
- changes as well.
-</t>
-
-<t>
-When changing the channel count for SILK-only or Hybrid packets, the encoder
- can avoid glitches by smoothly varying the stereo width of the input signal
- before or after the transition, and SHOULD do so.
-However, other transitions between SILK-only packets or between NB or MB SILK
- and Hybrid packets may cause glitches, because neither the LSF coefficients
- nor the LTP, LPC, stereo unmixing, and resampler buffers are available at the
- new sample rate.
-These switches SHOULD be delayed by the encoder until quiet periods or
- transients, where the inevitable glitches will be less audible. Additionally,
- the bit-stream MAY include redundant side information ("redundancy"), in the
- form of additional CELT frames embedded in each of the Opus frames around the
- transition.
-</t>
-
-<t>
-The other transitions that cannot be easily handled are those where the lower
- frequencies switch between the SILK LP-based model and the CELT MDCT model.
-However, an encoder may not have an opportunity to delay such a switch to a
- convenient point.
-For example, if the content switches from speech to music, and the encoder does
- not have enough latency in its analysis to detect this in advance, there may
- be no convenient silence period during which to make the transition for quite
- some time.
-To avoid or reduce glitches during these problematic mode transitions, and
- also between audio bandwidth changes in the SILK-only modes, transitions MAY
- include redundant side information ("redundancy"), in the form of an
- additional CELT frame embedded in the Opus frame.
-</t>
-
-<t>
-A transition between coding the lower frequencies with the LP model and the
- MDCT model or a transition that involves changing the SILK bandwidth
- is only normatively specified when it includes redundancy.
-For those without redundancy, it is RECOMMENDED that the decoder use a
- concealment technique (e.g., make use of a PLC algorithm) to "fill in" the
- gap or discontinuity caused by the mode transition.
-Therefore, PLC MUST NOT be applied during any normative transition, i.e., when
-<list style="symbols">
-<t>A packet includes redundancy for this transition (as described below),</t>
-<t>The transition is between any WB SILK packet and any Hybrid packet, or vice
- versa,</t>
-<t>The transition is between any two Hybrid mode packets, or</t>
-<t>The transition is between any two CELT mode packets,</t>
-</list>
- unless there is actual packet loss.
-</t>
-
-<section anchor="side-info" title="Transition Side Information (Redundancy)">
-<t>
-Transitions with side information include an extra 5&nbsp;ms "redundant" CELT
- frame within the Opus frame.
-This frame is designed to fill in the gap or discontinuity in the different
- layers without requiring the decoder to conceal it.
-For transitions from CELT-only to SILK-only or Hybrid, the redundant frame is
- inserted in the first Opus frame after the transition (i.e., the first
- SILK-only or Hybrid frame).
-For transitions from SILK-only or Hybrid to CELT-only, the redundant frame is
- inserted in the last Opus frame before the transition (i.e., the last
- SILK-only or Hybrid frame).
-</t>
-
-<section anchor="opus_redundancy_flag" title="Redundancy Flag">
-<t>
-The presence of redundancy is signaled in all SILK-only and Hybrid frames, not
- just those involved in a mode transition.
-This allows the frames to be decoded correctly even if an adjacent frame is
- lost.
-For SILK-only frames, this signaling is implicit, based on the size of the
- of the Opus frame and the number of bits consumed decoding the SILK portion of
- it.
-After decoding the SILK portion of the Opus frame, the decoder uses ec_tell()
- (see <xref target="ec_tell"/>) to check if there are at least 17 bits
- remaining.
-If so, then the frame contains redundancy.
-</t>
-
-<t>
-For Hybrid frames, this signaling is explicit.
-After decoding the SILK portion of the Opus frame, the decoder uses ec_tell()
- (see <xref target="ec_tell"/>) to ensure there are at least 37 bits remaining.
-If so, it reads a symbol with the PDF in
- <xref target="opus_redundancy_flag_pdf"/>, and if the value is 1, then the
- frame contains redundancy.
-Otherwise (if there were fewer than 37 bits left or the value was 0), the frame
- does not contain redundancy.
-</t>
-
-<texttable anchor="opus_redundancy_flag_pdf" title="Redundancy Flag PDF">
-<ttcol>PDF</ttcol>
-<c>{4095, 1}/4096</c>
-</texttable>
-</section>
-
-<section anchor="opus_redundancy_pos" title="Redundancy Position Flag">
-<t>
-Since the current frame is a SILK-only or a Hybrid frame, it must be at least
- 10&nbsp;ms.
-Therefore, it needs an additional flag to indicate whether the redundant
- 5&nbsp;ms CELT frame should be mixed into the beginning of the current frame,
- or the end.
-After determining that a frame contains redundancy, the decoder reads a
- 1&nbsp;bit symbol with a uniform PDF
- (<xref target="opus_redundancy_pos_pdf"/>).
-</t>
-
-<texttable anchor="opus_redundancy_pos_pdf" title="Redundancy Position PDF">
-<ttcol>PDF</ttcol>
-<c>{1, 1}/2</c>
-</texttable>
-
-<t>
-If the value is zero, this is the first frame in the transition, and the
- redundancy belongs at the end.
-If the value is one, this is the second frame in the transition, and the
- redundancy belongs at the beginning.
-There is no way to specify that an Opus frame contains separate redundant CELT
- frames at both the beginning and the end.
-</t>
-</section>
-
-<section anchor="opus_redundancy_size" title="Redundancy Size">
-<t>
-Unlike the CELT portion of a Hybrid frame, the redundant CELT frame does not
- use the same entropy coder state as the rest of the Opus frame, because this
- would break the CELT bit allocation mechanism in Hybrid frames.
-Thus, a redundant CELT frame always starts and ends on a byte boundary, even in
- SILK-only frames, where this is not strictly necessary.
-</t>
-
-<t>
-For SILK-only frames, the number of bytes in the redundant CELT frame is simply
- the number of whole bytes remaining, which must be at least 2, due to the
- space check in <xref target="opus_redundancy_flag"/>.
-For Hybrid frames, the number of bytes is equal to 2, plus a decoded unsigned
- integer less than 256 (see <xref target="ec_dec_uint"/>).
-This may be more than the number of whole bytes remaining in the Opus frame,
- in which case the frame is invalid.
-However, a decoder is not required to ignore the entire frame, as this may be
- the result of a bit error that desynchronized the range coder.
-There may still be useful data before the error, and a decoder MAY keep any
- audio decoded so far instead of invoking the PLC, but it is RECOMMENDED that
- the decoder stop decoding and discard the rest of the current Opus frame.
-</t>
-
-<t>
-It would have been possible to avoid these invalid states in the design of Opus
- by limiting the range of the explicit length decoded from Hybrid frames by the
- actual number of whole bytes remaining.
-However, this would require an encoder to determine the rate allocation for the
- MDCT layer up front, before it began encoding that layer.
-By allowing some invalid sizes, the encoder is able to defer that decision
- until much later.
-When encoding Hybrid frames which do not include redundancy, the encoder must
- still decide up-front if it wishes to use the minimum 37 bits required to
- trigger encoding of the redundancy flag, but this is a much looser
- restriction.
-</t>
-
-<t>
-After determining the size of the redundant CELT frame, the decoder reduces
- the size of the buffer currently in use by the range coder by that amount.
-The CELT layer read any raw bits from the end of this reduced buffer, and all
- calculations of the number of bits remaining in the buffer must be done using
- this new, reduced size, rather than the original size of the Opus frame.
-</t>
-</section>
-
-<section anchor="opus_redundancy_decoding" title="Decoding the Redundancy">
-<t>
-The redundant frame is decoded like any other CELT-only frame, with the
- exception that it does not contain a TOC byte.
-The frame size is fixed at 5&nbsp;ms, the channel count is set to that of the
- current frame, and the audio bandwidth is also set to that of the current
- frame, with the exception that for MB SILK frames, it is set to WB.
-</t>
-
-<t>
-If the redundancy belongs at the beginning (in a CELT-only to SILK-only or
- Hybrid transition), the final reconstructed output uses the first 2.5&nbsp;ms
- of audio output by the decoder for the redundant frame as-is, discarding
- the corresponding output from the SILK-only or Hybrid portion of the frame.
-The remaining 2.5&nbsp;ms is cross-lapped with the decoded SILK/Hybrid signal
- using the CELT's power-complementary MDCT window to ensure a smooth
- transition.
-</t>
-
-<t>
-If the redundancy belongs at the end (in a SILK-only or Hybrid to CELT-only
- transition), only the second half (2.5&nbsp;ms) of the audio output by the
- decoder for the redundant frame is used.
-In that case, the second half of the redundant frame is cross-lapped with the
- end of the SILK/Hybrid signal, again using CELT's power-complementary MDCT
- window to ensure a smooth transition.
-</t>
-</section>
-
-</section>
-
-<section anchor="decoder-reset" title="State Reset">
-<t>
-When a transition occurs, the state of the SILK or the CELT decoder (or both)
- may need to be reset before decoding a frame in the new mode.
-This avoids reusing "out of date" memory, which may not have been updated in
- some time or may not be in a well-defined state due to, e.g., PLC.
-The SILK state is reset before every SILK-only or Hybrid frame where the
- previous frame was CELT-only.
-The CELT state is reset every time the operating mode changes and the new mode
- is either Hybrid or CELT-only, except when the transition uses redundancy as
- described above.
-When switching from SILK-only or Hybrid to CELT-only with redundancy, the CELT
- state is reset before decoding the redundant CELT frame embedded in the
- SILK-only or Hybrid frame, but it is not reset before decoding the following
- CELT-only frame.
-When switching from CELT-only mode to SILK-only or Hybrid mode with redundancy,
- the CELT decoder is not reset for decoding the redundant CELT frame.
-</t>
-</section>
-
-<section title="Summary of Transitions">
-
-<t>
-<xref target="normative_transitions"/> illustrates all of the normative
- transitions involving a mode change, an audio bandwidth change, or both.
-Each one uses an S, H, or C to represent an Opus frame in the corresponding
- mode.
-In addition, an R indicates the presence of redundancy in the Opus frame it is
- cross-lapped with.
-Its location in the first or last 5&nbsp;ms is assumed to correspond to whether
- it is the frame before or after the transition.
-Other uses of redundancy are non-normative.
-Finally, a c indicates the contents of the CELT overlap buffer after the
- previously decoded frame (i.e., as extracted by decoding a silence frame).
-<figure align="center" anchor="normative_transitions"
- title="Normative Transitions">
-<artwork align="center"><![CDATA[
-SILK to SILK with Redundancy:             S -> S -> S
-                                                    &
-                                                   !R -> R
-                                                         &
-                                                        ;S -> S -> S
-
-NB or MB SILK to Hybrid with Redundancy:  S -> S -> S
-                                                    &
-                                                   !R ->;H -> H -> H
-
-WB SILK to Hybrid:                        S -> S -> S ->!H -> H -> H
-
-SILK to CELT with Redundancy:             S -> S -> S
-                                                    &
-                                                   !R -> C -> C -> C
-
-Hybrid to NB or MB SILK with Redundancy:  H -> H -> H
-                                                    &
-                                                   !R -> R
-                                                         &
-                                                        ;S -> S -> S
-
-Hybrid to WB SILK:                        H -> H -> H -> c
-                                                      \  +
-                                                       > S -> S -> S
-
-Hybrid to CELT with Redundancy:           H -> H -> H
-                                                    &
-                                                   !R -> C -> C -> C
-
-CELT to SILK with Redundancy:             C -> C -> C -> R
-                                                         &
-                                                        ;S -> S -> S
-
-CELT to Hybrid with Redundancy:           C -> C -> C -> R
-                                                         &
-                                                        |H -> H -> H
-
-Key:
-S   SILK-only frame                 ;   SILK decoder reset
-H   Hybrid frame                    |   CELT and SILK decoder resets
-C   CELT-only frame                 !   CELT decoder reset
-c   CELT overlap                    +   Direct mixing
-R   Redundant CELT frame            &   Windowed cross-lap
-]]></artwork>
-</figure>
-The first two and the last two Opus frames in each example are illustrative,
- i.e., there is no requirement that a stream remain in the same configuration
- for three consecutive frames before or after a switch.
-</t>
-
-<t>
-The behavior of transitions without redundancy where PLC is allowed is non-normative.
-An encoder might still wish to use these transitions if, for example, it
- doesn't want to add the extra bitrate required for redundancy or if it makes
- a decision to switch after it has already transmitted the frame that would
- have had to contain the redundancy.
-<xref target="nonnormative_transitions"/> illustrates the recommended
- cross-lapping and decoder resets for these transitions.
-<figure align="center" anchor="nonnormative_transitions"
- title="Recommended Non-Normative Transitions">
-<artwork align="center"><![CDATA[
-SILK to SILK (audio bandwidth change):    S -> S -> S   ;S -> S -> S
-
-NB or MB SILK to Hybrid:                  S -> S -> S   |H -> H -> H
-
-SILK to CELT without Redundancy:          S -> S -> S -> P
-                                                         &
-                                                        !C -> C -> C
-
-Hybrid to NB or MB SILK:                  H -> H -> H -> c
-                                                         +
-                                                        ;S -> S -> S
-
-Hybrid to CELT without Redundancy:        H -> H -> H -> P
-                                                         &
-                                                        !C -> C -> C
-
-CELT to SILK without Redundancy:          C -> C -> C -> P
-                                                         &
-                                                        ;S -> S -> S
-
-CELT to Hybrid without Redundancy:        C -> C -> C -> P
-                                                         &
-                                                        |H -> H -> H
-
-Key:
-S   SILK-only frame                 ;   SILK decoder reset
-H   Hybrid frame                    |   CELT and SILK decoder resets
-C   CELT-only frame                 !   CELT decoder reset
-c   CELT overlap                    +   Direct mixing
-P   Packet Loss Concealment         &   Windowed cross-lap
-]]></artwork>
-</figure>
-Encoders SHOULD NOT use other transitions, e.g., those that involve redundancy
- in ways not illustrated in <xref target="normative_transitions"/>.
-</t>
-
-</section>
-
-</section>
-
-</section>
-
-
-<!--  ******************************************************************* -->
-<!--  **************************   OPUS ENCODER   *********************** -->
-<!--  ******************************************************************* -->
-
-<section title="Opus Encoder">
-<t>
-Just like the decoder, the Opus encoder also normally consists of two main blocks: the
-SILK encoder and the CELT encoder. However, unlike the case of the decoder, a valid
-(though potentially suboptimal) Opus encoder is not required to support all modes and
-may thus only include a SILK encoder module or a CELT encoder module.
-The output bit-stream of the Opus encoding contains bits from the SILK and CELT
- encoders, though these are not separable due to the use of a range coder.
-A block diagram of the encoder is illustrated below.
-
-<figure align="center" anchor="opus-encoder-figure" title="Opus Encoder">
-<artwork>
-<![CDATA[
-                    +------------+    +---------+
-                    |   Sample   |    |  SILK   |------+
-                 +->|    Rate    |--->| Encoder |      V
-  +-----------+  |  | Conversion |    |         | +---------+
-  | Optional  |  |  +------------+    +---------+ |  Range  |
-->| High-pass |--+                                | Encoder |---->
-  |  Filter   |  |  +--------------+  +---------+ |         | Bit-
-  +-----------+  |  |    Delay     |  |  CELT   | +---------+ stream
-                 +->| Compensation |->| Encoder |      ^
-                    |              |  |         |------+
-                    +--------------+  +---------+
-]]>
-</artwork>
-</figure>
-</t>
-
-<t>
-For a normal encoder where both the SILK and the CELT modules are included, an optimal
-encoder should select which coding mode to use at run-time depending on the conditions.
-In the reference implementation, the frame size is selected by the application, but the
-other configuration parameters (number of channels, bandwidth, mode) are automatically
-selected (unless explicitly overridden by the application) depend on the following:
-<list style="symbols">
-<t>Requested bitrate</t>
-<t>Input sampling rate</t>
-<t>Type of signal (speech vs music)</t>
-<t>Frame size in use</t>
-</list>
-
-The type of signal currently needs to be provided by the application (though it can be
-changed in real-time). An Opus encoder implementation could also do automatic detection,
-but since Opus is an interactive codec, such an implementation would likely have to either
-delay the signal (for non-interactive applications) or delay the mode switching decisions (for
-interactive applications).
-</t>
-
-<t>
-When the encoder is configured for voice over IP applications, the input signal is
-filtered by a high-pass filter to remove the lowest part of the spectrum
-that contains little speech energy and may contain background noise. This is a second order
-Auto Regressive Moving Average (i.e., with poles and zeros) filter with a cut-off frequency around 50&nbsp;Hz.
-In the future, a music detector may also be used to lower the cut-off frequency when the
-input signal is detected to be music rather than speech.
-</t>
-
-<section anchor="range-encoder" title="Range Encoder">
-<t>
-The range coder acts as the bit-packer for Opus.
-It is used in three different ways: to encode
-<list style="symbols">
-<t>
-Entropy-coded symbols with a fixed probability model using ec_encode()
- (entenc.c),
-</t>
-<t>
-Integers from 0 to (2**M&nbsp;-&nbsp;1) using ec_enc_uint() or ec_enc_bits()
- (entenc.c),</t>
-<t>
-Integers from 0 to (ft&nbsp;-&nbsp;1) (where ft is not a power of two) using
- ec_enc_uint() (entenc.c).
-</t>
-</list>
-</t>
-
-<t>
-The range encoder maintains an internal state vector composed of the four-tuple
- (val,&nbsp;rng,&nbsp;rem,&nbsp;ext) representing the low end of the current
- range, the size of the current range, a single buffered output byte, and a
- count of additional carry-propagating output bytes.
-Both val and rng are 32-bit unsigned integer values, rem is a byte value or
- less than 255 or the special value -1, and ext is an unsigned integer with at
- least 11 bits.
-This state vector is initialized at the start of each each frame to the value
- (0,&nbsp;2**31,&nbsp;-1,&nbsp;0).
-After encoding a sequence of symbols, the value of rng in the encoder should
- exactly match the value of rng in the decoder after decoding the same sequence
- of symbols.
-This is a powerful tool for detecting errors in either an encoder or decoder
- implementation.
-The value of val, on the other hand, represents different things in the encoder
- and decoder, and is not expected to match.
-</t>
-
-<t>
-The decoder has no analog for rem and ext.
-These are used to perform carry propagation in the renormalization loop below.
-Each iteration of this loop produces 9 bits of output, consisting of 8 data
- bits and a carry flag.
-The encoder cannot determine the final value of the output bytes until it
- propagates these carry flags.
-Therefore the reference implementation buffers a single non-propagating output
- byte (i.e., one less than 255) in rem and keeps a count of additional
- propagating (i.e., 255) output bytes in ext.
-An implementation may choose to use any mathematically equivalent scheme to
- perform carry propagation.
-</t>
-
-<section anchor="encoding-symbols" title="Encoding Symbols">
-<t>
-The main encoding function is ec_encode() (entenc.c), which encodes symbol k in
- the current context using the same three-tuple (fl[k],&nbsp;fh[k],&nbsp;ft)
- as the decoder to describe the range of the symbol (see
- <xref target="range-decoder"/>).
-</t>
-<t>
-ec_encode() updates the state of the encoder as follows.
-If fl[k] is greater than zero, then
-<figure align="center">
-<artwork align="center"><![CDATA[
-                  rng
-val = val + rng - --- * (ft - fl) ,
-                  ft
-
-      rng
-rng = --- * (fh - fl) .
-      ft
-]]></artwork>
-</figure>
-Otherwise, val is unchanged and
-<figure align="center">
-<artwork align="center"><![CDATA[
-            rng
-rng = rng - --- * (fh - fl) .
-            ft
-]]></artwork>
-</figure>
-The divisions here are integer division.
-</t>
-
-<section anchor="range-encoder-renorm" title="Renormalization">
-<t>
-After this update, the range is normalized using a procedure very similar to
- that of <xref target="range-decoder-renorm"/>, implemented by
- ec_enc_normalize() (entenc.c).
-The following process is repeated until rng&nbsp;&gt;&nbsp;2**23.
-First, the top 9 bits of val, (val&gt;&gt;23), are sent to the carry buffer,
- described in <xref target="ec_enc_carry_out"/>.
-Then, the encoder sets
-<figure align="center">
-<artwork align="center"><![CDATA[
-val = (val<<8) & 0x7FFFFFFF ,
-
-rng = rng<<8 .
-]]></artwork>
-</figure>
-</t>
-</section>
-
-<section anchor="ec_enc_carry_out"
- title="Carry Propagation and Output Buffering">
-<t>
-The function ec_enc_carry_out() (entenc.c) implements carry propagation and
- output buffering.
-It takes as input a 9-bit value, c, consisting of 8 data bits and an additional
- carry bit.
-If c is equal to the value 255, then ext is simply incremented, and no other
- state updates are performed.
-Otherwise, let b&nbsp;=&nbsp;(c&gt;&gt;8) be the carry bit.
-Then,
-<list style="symbols">
-<t>
-If the buffered byte rem contains a value other than -1, the encoder outputs
- the byte (rem&nbsp;+&nbsp;b).
-Otherwise, if rem is -1, no byte is output.
-</t>
-<t>
-If ext is non-zero, then the encoder outputs ext bytes---all with a value of 0
- if b is set, or 255 if b is unset---and sets ext to 0.
-</t>
-<t>
-rem is set to the 8 data bits:
-<figure align="center">
-<artwork align="center"><![CDATA[
-rem = c & 255 .
-]]></artwork>
-</figure>
-</t>
-</list>
-</t>
-</section>
-
-</section>
-
-<section anchor="encoding-alternate" title="Alternate Encoding Methods">
-<t>
-The reference implementation uses three additional encoding methods that are
- exactly equivalent to the above, but make assumptions and simplifications that
- allow for a more efficient implementation.
-</t>
-
-<section anchor="ec_encode_bin" title="ec_encode_bin()">
-<t>
-The first is ec_encode_bin() (entenc.c), defined using the parameter ftb
- instead of ft.
-It is mathematically equivalent to calling ec_encode() with
- ft&nbsp;=&nbsp;(1&lt;&lt;ftb), but avoids using division.
-</t>
-</section>
-
-<section anchor="ec_enc_bit_logp" title="ec_enc_bit_logp()">
-<t>
-The next is ec_enc_bit_logp() (entenc.c), which encodes a single binary symbol.
-The context is described by a single parameter, logp, which is the absolute
- value of the base-2 logarithm of the probability of a "1".
-It is mathematically equivalent to calling ec_encode() with the 3-tuple
- (fl[k]&nbsp;=&nbsp;0, fh[k]&nbsp;=&nbsp;(1&lt;&lt;logp)&nbsp;-&nbsp;1,
- ft&nbsp;=&nbsp;(1&lt;&lt;logp)) if k is 0 and with
- (fl[k]&nbsp;=&nbsp;(1&lt;&lt;logp)&nbsp;-&nbsp;1,
- fh[k]&nbsp;=&nbsp;ft&nbsp;=&nbsp;(1&lt;&lt;logp)) if k is 1.
-The implementation requires no multiplications or divisions.
-</t>
-</section>
-
-<section anchor="ec_enc_icdf" title="ec_enc_icdf()">
-<t>
-The last is ec_enc_icdf() (entenc.c), which encodes a single binary symbol with
- a table-based context of up to 8 bits.
-This uses the same icdf table as ec_dec_icdf() from
- <xref target="ec_dec_icdf"/>.
-The function is mathematically equivalent to calling ec_encode() with
- fl[k]&nbsp;=&nbsp;(1&lt;&lt;ftb)&nbsp;-&nbsp;icdf[k-1] (or 0 if
- k&nbsp;==&nbsp;0), fh[k]&nbsp;=&nbsp;(1&lt;&lt;ftb)&nbsp;-&nbsp;icdf[k], and
- ft&nbsp;=&nbsp;(1&lt;&lt;ftb).
-This only saves a few arithmetic operations over ec_encode_bin(), but allows
- the encoder to use the same icdf tables as the decoder.
-</t>
-</section>
-
-</section>
-
-<section anchor="encoding-bits" title="Encoding Raw Bits">
-<t>
-The raw bits used by the CELT layer are packed at the end of the buffer using
- ec_enc_bits() (entenc.c).
-Because the raw bits may continue into the last byte output by the range coder
- if there is room in the low-order bits, the encoder must be prepared to merge
- these values into a single byte.
-The procedure in <xref target="encoder-finalizing"/> does this in a way that
- ensures both the range coded data and the raw bits can be decoded
- successfully.
-</t>
-</section>
-
-<section anchor="encoding-ints" title="Encoding Uniformly Distributed Integers">
-<t>
-The function ec_enc_uint() (entenc.c) encodes one of ft equiprobable symbols in
- the range 0 to (ft&nbsp;-&nbsp;1), inclusive, each with a frequency of 1,
- where ft may be as large as (2**32&nbsp;-&nbsp;1).
-Like the decoder (see <xref target="ec_dec_uint"/>), it splits up the
- value into a range coded symbol representing up to 8 of the high bits, and, if
- necessary, raw bits representing the remainder of the value.
-</t>
-<t>
-ec_enc_uint() takes a two-tuple (t,&nbsp;ft), where t is the value to be
- encoded, 0&nbsp;&lt;=&nbsp;t&nbsp;&lt;&nbsp;ft, and ft is not necessarily a
- power of two.
-Let ftb&nbsp;=&nbsp;ilog(ft&nbsp;-&nbsp;1), i.e., the number of bits required
- to store (ft&nbsp;-&nbsp;1) in two's complement notation.
-If ftb is 8 or less, then t is encoded directly using ec_encode() with the
- three-tuple (t, t&nbsp;+&nbsp;1, ft).
-</t>
-<t>
-If ftb is greater than 8, then the top 8 bits of t are encoded using the
- three-tuple (t&gt;&gt;(ftb&nbsp;-&nbsp;8),
- (t&gt;&gt;(ftb&nbsp;-&nbsp;8))&nbsp;+&nbsp;1,
- ((ft&nbsp;-&nbsp;1)&gt;&gt;(ftb&nbsp;-&nbsp;8))&nbsp;+&nbsp;1), and the
- remaining bits,
- (t&nbsp;&amp;&nbsp;((1&lt;&lt;(ftb&nbsp;-&nbsp;8))&nbsp;-&nbsp;1),
- are encoded as raw bits with ec_enc_bits().
-</t>
-</section>
-
-<section anchor="encoder-finalizing" title="Finalizing the Stream">
-<t>
-After all symbols are encoded, the stream must be finalized by outputting a
- value inside the current range.
-Let end be the integer in the interval [val,&nbsp;val&nbsp;+&nbsp;rng) with the
- largest number of trailing zero bits, b, such that
- (end&nbsp;+&nbsp;(1&lt;&lt;b)&nbsp;-&nbsp;1) is also in the interval
- [val,&nbsp;val&nbsp;+&nbsp;rng).
-This choice of end allows the maximum number of trailing bits to be set to
- arbitrary values while still ensuring the range coded part of the buffer can
- be decoded correctly.
-Then, while end is not zero, the top 9 bits of end, i.e., (end&gt;&gt;23), are
- passed to the carry buffer in accordance with the procedure in
- <xref target="ec_enc_carry_out"/>, and end is updated via
-<figure align="center">
-<artwork align="center"><![CDATA[
-end = (end<<8) & 0x7FFFFFFF .
-]]></artwork>
-</figure>
-Finally, if the buffered output byte, rem, is neither zero nor the special
- value -1, or the carry count, ext, is greater than zero, then 9 zero bits are
- sent to the carry buffer to flush it to the output buffer.
-When outputting the final byte from the range coder, if it would overlap any
- raw bits already packed into the end of the output buffer, they should be ORed
- into the same byte.
-The bit allocation routines in the CELT layer should ensure that this can be
- done without corrupting the range coder data so long as end is chosen as
- described above.
-If there is any space between the end of the range coder data and the end of
- the raw bits, it is padded with zero bits.
-This entire process is implemented by ec_enc_done() (entenc.c).
-</t>
-</section>
-
-<section anchor="encoder-tell" title="Current Bit Usage">
-<t>
-   The bit allocation routines in Opus need to be able to determine a
-   conservative upper bound on the number of bits that have been used
-   to encode the current frame thus far. This drives allocation
-   decisions and ensures that the range coder and raw bits will not
-   overflow the output buffer. This is computed in the
-   reference implementation to whole-bit precision by
-   the function ec_tell() (entcode.h) and to fractional 1/8th bit
-   precision by the function ec_tell_frac() (entcode.c).
-   Like all operations in the range coder, it must be implemented in a
-   bit-exact manner, and must produce exactly the same value returned by
-   the same functions in the decoder after decoding the same symbols.
-</t>
-</section>
-
-</section>
-
-<section title='SILK Encoder'>
-  <t>
-    In many respects the SILK encoder mirrors the SILK decoder described
-    in <xref target='silk_decoder_outline'/>.
-    Details such as the quantization and range coder tables can be found
-    there, while this section describes the high-level design choices that
-    were made.
-    The diagram below shows the basic modules of the SILK encoder.
-<figure align="center" anchor="silk_encoder_figure" title="SILK Encoder">
-<artwork>
-<![CDATA[
-       +----------+    +--------+    +---------+
-       |  Sample  |    | Stereo |    |  SILK   |
------->|   Rate   |--->| Mixing |--->|  Core   |---------->
-Input  |Conversion|    |        |    | Encoder |  Bitstream
-       +----------+    +--------+    +---------+
-]]>
-</artwork>
-</figure>
-</t>
-
-<section title='Sample Rate Conversion'>
-<t>
-The input signal's sampling rate is adjusted by a sample rate conversion
-module so that it matches the SILK internal sampling rate.
-The input to the sample rate converter is delayed by a number of samples
-depending on the sample rate ratio, such that the overall delay is constant
-for all input and output sample rates.
-</t>
-</section>
-
-<section title='Stereo Mixing'>
-<t>
-The stereo mixer is only used for stereo input signals.
-It converts a stereo left/right signal into an adaptive
-mid/side representation.
-The first step is to compute non-adaptive mid/side signals
-as half the sum and difference between left and right signals.
-The side signal is then minimized in energy by subtracting a
-prediction of it based on the mid signal.
-This prediction works well when the left and right signals
-exhibit linear dependency, for instance for an amplitude-panned
-input signal.
-Like in the decoder, the prediction coefficients are linearly
-interpolated during the first 8&nbsp;ms of the frame.
-  The mid signal is always encoded, whereas the residual
-  side signal is only encoded if it has sufficient
-  energy compared to the mid signal's energy.
-  If it has not,
-  the "mid_only_flag" is set without encoding the side signal.
-</t>
-<t>
-The predictor coefficients are coded regardless of whether
-the side signal is encoded.
-For each frame, two predictor coefficients are computed, one
-that predicts between low-passed mid and side channels, and
-one that predicts between high-passed mid and side channels.
-The low-pass filter is a simple three-tap filter
-and creates a delay of one sample.
-The high-pass filtered signal is the difference between
-the mid signal delayed by one sample and the low-passed
-signal.  Instead of explicitly computing the high-passed
-signal, it is computationally more efficient to transform
-the prediction coefficients before applying them to the
-filtered mid signal, as follows
-<figure align="center">
-<artwork align="center">
-<![CDATA[
-pred(n) = LP(n) * w0 + HP(n) * w1
-        = LP(n) * w0 + (mid(n-1) - LP(n)) * w1
-        = LP(n) * (w0 - w1) + mid(n-1) * w1
-]]>
-</artwork>
-</figure>
-where w0 and w1 are the low-pass and high-pass prediction
-coefficients, mid(n-1) is the mid signal delayed by one sample,
-LP(n) and HP(n) are the low-passed and high-passed
-signals and pred(n) is the prediction signal that is subtracted
-from the side signal.
-</t>
-</section>
-
-<section title='SILK Core Encoder'>
-<t>
-What follows is a description of the core encoder and its components.
-For simplicity, the core encoder is referred to simply as the encoder in
-the remainder of this section. An overview of the encoder is given in
-<xref target="encoder_figure" />.
-</t>
-<figure align="center" anchor="encoder_figure" title="SILK Core Encoder">
-<artwork align="center">
-<![CDATA[
-                                                             +---+
-                          +--------------------------------->|   |
-     +---------+          |      +---------+                 |   |
-     |Voice    |          |      |LTP      |12               |   |
- +-->|Activity |--+       +----->|Scaling  |-----------+---->|   |
- |   |Detector |3 |       |      |Control  |<--+       |     |   |
- |   +---------+  |       |      +---------+   |       |     |   |
- |                |       |      +---------+   |       |     |   |
- |                |       |      |Gains    |   |       |     |   |
- |                |       |  +-->|Processor|---|---+---|---->| R |
- |                |       |  |   |         |11 |   |   |     | a |
- |               \/       |  |   +---------+   |   |   |     | n |
- |          +---------+   |  |   +---------+   |   |   |     | g |
- |          |Pitch    |   |  |   |LSF      |   |   |   |     | e |
- |       +->|Analysis |---+  |   |Quantizer|---|---|---|---->|   |
- |       |  |         |4  |  |   |         |8  |   |   |     | E |-->
- |       |  +---------+   |  |   +---------+   |   |   |     | n | 2
- |       |                |  |    9/\  10|     |   |   |     | c |
- |       |                |  |     |    \/     |   |   |     | o |
- |       |  +---------+   |  |   +----------+  |   |   |     | d |
- |       |  |Noise    |   +--|-->|Prediction|--+---|---|---->| e |
- |       +->|Shaping  |---|--+   |Analysis  |7 |   |   |     | r |
- |       |  |Analysis |5  |  |   |          |  |   |   |     |   |
- |       |  +---------+   |  |   +----------+  |   |   |     |   |
- |       |                |  |        /\       |   |   |     |   |
- |       |     +----------|--|--------+        |   |   |     |   |
- |       |     |         \/  \/               \/  \/  \/     |   |
- |       |     |       +---------+          +------------+   |   |
- |       |     |       |         |          |Noise       |   |   |
--+-------+-----+------>|Prefilter|--------->|Shaping     |-->|   |
-1                      |         | 6        |Quantization|13 |   |
-                       +---------+          +------------+   +---+
-
-1:  Input speech signal
-2:  Range encoded bitstream
-3:  Voice activity estimate
-4:  Pitch lags (per 5 ms) and voicing decision (per 20 ms)
-5:  Noise shaping quantization coefficients
-  - Short term synthesis and analysis
-    noise shaping coefficients (per 5 ms)
-  - Long term synthesis and analysis noise
-    shaping coefficients (per 5 ms and for voiced speech only)
-  - Noise shaping tilt (per 5 ms)
-  - Quantizer gain/step size (per 5 ms)
-6:  Input signal filtered with analysis noise shaping filters
-7:  Short and long term prediction coefficients
-    LTP (per 5 ms) and LPC (per 20 ms)
-8:  LSF quantization indices
-9:  LSF coefficients
-10: Quantized LSF coefficients
-11: Processed gains, and synthesis noise shape coefficients
-12: LTP state scaling coefficient. Controlling error propagation
-   / prediction gain trade-off
-13: Quantized signal
-]]>
-</artwork>
-</figure>
-
-<section title='Voice Activity Detection'>
-<t>
-The input signal is processed by a Voice Activity Detector (VAD) to produce
-a measure of voice activity, spectral tilt, and signal-to-noise estimates for
-each frame. The VAD uses a sequence of half-band filterbanks to split the
-signal into four subbands: 0...Fs/16, Fs/16...Fs/8, Fs/8...Fs/4, and
-Fs/4...Fs/2, where Fs is the sampling frequency (8, 12, 16, or 24&nbsp;kHz).
-The lowest subband, from 0 - Fs/16, is high-pass filtered with a first-order
-moving average (MA) filter (with transfer function H(z) = 1-z**(-1)) to
-reduce the energy at the lowest frequencies. For each frame, the signal
-energy per subband is computed.
-In each subband, a noise level estimator tracks the background noise level
-and a Signal-to-Noise Ratio (SNR) value is computed as the logarithm of the
-ratio of energy to noise level.
-Using these intermediate variables, the following parameters are calculated
-for use in other SILK modules:
-<list style="symbols">
-<t>
-Average SNR. The average of the subband SNR values.
-</t>
-
-<t>
-Smoothed subband SNRs. Temporally smoothed subband SNR values.
-</t>
-
-<t>
-Speech activity level. Based on the average SNR and a weighted average of the
-subband energies.
-</t>
-
-<t>
-Spectral tilt. A weighted average of the subband SNRs, with positive weights
-for the low subbands and negative weights for the high subbands.
-</t>
-</list>
-</t>
-</section>
-
-<section title='Pitch Analysis' anchor='pitch_estimator_overview_section'>
-<t>
-The input signal is processed by the open loop pitch estimator shown in
-<xref target='pitch_estimator_figure' />.
-<figure align="center" anchor="pitch_estimator_figure"
- title="Block diagram of the pitch estimator">
-<artwork align="center">
-<![CDATA[
-                                 +--------+  +----------+
-                                 |2 x Down|  |Time-     |
-                              +->|sampling|->|Correlator|     |
-                              |  |        |  |          |     |4
-                              |  +--------+  +----------+    \/
-                              |                    | 2    +-------+
-                              |                    |  +-->|Speech |5
-    +---------+    +--------+ |                   \/  |   |Type   |->
-    |LPC      |    |Down    | |              +----------+ |       |
- +->|Analysis | +->|sample  |-+------------->|Time-     | +-------+
- |  |         | |  |to 8 kHz|                |Correlator|----------->
- |  +---------+ |  +--------+                |__________|          6
- |       |      |                                  |3
- |      \/      |                                 \/
- |  +---------+ |                            +----------+
- |  |Whitening| |                            |Time-     |
--+->|Filter   |-+--------------------------->|Correlator|----------->
-1   |         |                              |          |          7
-    +---------+                              +----------+
-
-1: Input signal
-2: Lag candidates from stage 1
-3: Lag candidates from stage 2
-4: Correlation threshold
-5: Voiced/unvoiced flag
-6: Pitch correlation
-7: Pitch lags
-]]>
-</artwork>
-</figure>
-The pitch analysis finds a binary voiced/unvoiced classification, and, for
-frames classified as voiced, four pitch lags per frame - one for each
-5&nbsp;ms subframe - and a pitch correlation indicating the periodicity of
-the signal.
-The input is first whitened using a Linear Prediction (LP) whitening filter,
-where the coefficients are computed through standard Linear Prediction Coding
-(LPC) analysis. The order of the whitening filter is 16 for best results, but
-is reduced to 12 for medium complexity and 8 for low complexity modes.
-The whitened signal is analyzed to find pitch lags for which the time
-correlation is high.
-The analysis consists of three stages for reducing the complexity:
-<list style="symbols">
-<t>In the first stage, the whitened signal is downsampled to 4&nbsp;kHz
-(from 8&nbsp;kHz) and the current frame is correlated to a signal delayed
-by a range of lags, starting from a shortest lag corresponding to
-500&nbsp;Hz, to a longest lag corresponding to 56&nbsp;Hz.</t>
-
-<t>
-The second stage operates on an 8&nbsp;kHz signal (downsampled from 12, 16,
-or 24&nbsp;kHz) and measures time correlations only near the lags
-corresponding to those that had sufficiently high correlations in the first
-stage. The resulting correlations are adjusted for a small bias towards
-short lags to avoid ending up with a multiple of the true pitch lag.
-The highest adjusted correlation is compared to a threshold depending on:
-<list style="symbols">
-<t>
-Whether the previous frame was classified as voiced
-</t>
-<t>
-The speech activity level
-</t>
-<t>
-The spectral tilt.
-</t>
-</list>
-If the threshold is exceeded, the current frame is classified as voiced and
-the lag with the highest adjusted correlation is stored for a final pitch
-analysis of the highest precision in the third stage.
-</t>
-<t>
-The last stage operates directly on the whitened input signal to compute time
-correlations for each of the four subframes independently in a narrow range
-around the lag with highest correlation from the second stage.
-</t>
-</list>
-</t>
-</section>
-
-<section title='Noise Shaping Analysis' anchor='noise_shaping_analysis_overview_section'>
-<t>
-The noise shaping analysis finds gains and filter coefficients used in the
-prefilter and noise shaping quantizer. These parameters are chosen such that
-they will fulfill several requirements:
-<list style="symbols">
-<t>
-Balancing quantization noise and bitrate.
-The quantization gains determine the step size between reconstruction levels
-of the excitation signal. Therefore, increasing the quantization gain
-amplifies quantization noise, but also reduces the bitrate by lowering
-the entropy of the quantization indices.
-</t>
-<t>
-Spectral shaping of the quantization noise; the noise shaping quantizer is
-capable of reducing quantization noise in some parts of the spectrum at the
-cost of increased noise in other parts without substantially changing the
-bitrate.
-By shaping the noise such that it follows the signal spectrum, it becomes
-less audible. In practice, best results are obtained by making the shape
-of the noise spectrum slightly flatter than the signal spectrum.
-</t>
-<t>
-De-emphasizing spectral valleys; by using different coefficients in the
-analysis and synthesis part of the prefilter and noise shaping quantizer,
-the levels of the spectral valleys can be decreased relative to the levels
-of the spectral peaks such as speech formants and harmonics.
-This reduces the entropy of the signal, which is the difference between the
-coded signal and the quantization noise, thus lowering the bitrate.
-</t>
-<t>
-Matching the levels of the decoded speech formants to the levels of the
-original speech formants; an adjustment gain and a first order tilt
-coefficient are computed to compensate for the effect of the noise
-shaping quantization on the level and spectral tilt.
-</t>
-</list>
-</t>
-<t>
-<figure align="center" anchor="noise_shape_analysis_spectra_figure"
- title="Noise shaping and spectral de-emphasis illustration">
-<artwork align="center">
-<![CDATA[
-  / \   ___
-   |   // \\
-   |  //   \\     ____
-   |_//     \\___//  \\         ____
-   | /  ___  \   /    \\       //  \\
- P |/  /   \  \_/      \\_____//    \\
- o |  /     \     ____  \     /      \\
- w | /       \___/    \  \___/  ____  \\___ 1
- e |/                  \       /    \  \
- r |                    \_____/      \  \__ 2
-   |                                  \
-   |                                   \___ 3
-   |
-   +---------------------------------------->
-                    Frequency
-
-1: Input signal spectrum
-2: De-emphasized and level matched spectrum
-3: Quantization noise spectrum
-]]>
-</artwork>
-</figure>
-<xref target='noise_shape_analysis_spectra_figure' /> shows an example of an
-input signal spectrum (1).
-After de-emphasis and level matching, the spectrum has deeper valleys (2).
-The quantization noise spectrum (3) more or less follows the input signal
-spectrum, while having slightly less pronounced peaks.
-The entropy, which provides a lower bound on the bitrate for encoding the
-excitation signal, is proportional to the area between the de-emphasized
-spectrum (2) and the quantization noise spectrum (3). Without de-emphasis,
-the entropy is proportional to the area between input spectrum (1) and
-quantization noise (3) - clearly higher.
-</t>
-
-<t>
-The transformation from input signal to de-emphasized signal can be
-described as a filtering operation with a filter
-<figure align="center">
-<artwork align="center">
-<![CDATA[
-                           -1    Wana(z)
-H(z) = G * ( 1 - c_tilt * z  ) * -------
-                                 Wsyn(z),
-]]>
-</artwork>
-</figure>
-having an adjustment gain G, a first order tilt adjustment filter with
-tilt coefficient c_tilt, and where
-<figure align="center">
-<artwork align="center">
-<![CDATA[
-               16                            d
-               __             -k        -L  __            -k
-Wana(z) = (1 - \ (a_ana(k) * z  )*(1 - z  * \ b_ana(k) * z  ),
-               /_                           /_
-               k=1                          k=-d
-]]>
-</artwork>
-</figure>
-is the analysis part of the de-emphasis filter, consisting of the short-term
-shaping filter with coefficients a_ana(k), and the long-term shaping filter
-with coefficients b_ana(k) and pitch lag L.
-The parameter d determines the number of long-term shaping filter taps.
-</t>
-
-<t>
-Similarly, but without the tilt adjustment, the synthesis part can be written as
-<figure align="center">
-<artwork align="center">
-<![CDATA[
-               16                            d
-               __             -k        -L  __            -k
-Wsyn(z) = (1 - \ (a_syn(k) * z  )*(1 - z  * \ b_syn(k) * z  ).
-               /_                           /_
-               k=1                          k=-d
-            ]]>
-</artwork>
-</figure>
-</t>
-<t>
-All noise shaping parameters are computed and applied per subframe of 5&nbsp;ms.
-First, an LPC analysis is performed on a windowed signal block of 15&nbsp;ms.
-The signal block has a look-ahead of 5&nbsp;ms relative to the current subframe,
-and the window is an asymmetric sine window. The LPC analysis is done with the
-autocorrelation method, with an order of between 8, in lowest-complexity mode,
-and 16, for best quality.
-</t>
-<t>
-Optionally the LPC analysis and noise shaping filters are warped by replacing
-the delay elements by first-order allpass filters.
-This increases the frequency resolution at low frequencies and reduces it at
-high ones, which better matches the human auditory system and improves
-quality.
-The warped analysis and filtering comes at a cost in complexity
-and is therefore only done in higher complexity modes.
-</t>
-<t>
-The quantization gain is found by taking the square root of the residual energy
-from the LPC analysis and multiplying it by a value inversely proportional
-to the coding quality control parameter and the pitch correlation.
-</t>
-<t>
-Next the two sets of short-term noise shaping coefficients a_ana(k) and
-a_syn(k) are obtained by applying different amounts of bandwidth expansion to the
-coefficients found in the LPC analysis.
-This bandwidth expansion moves the roots of the LPC polynomial towards the
-origin, using the formulas
-<figure align="center">
-<artwork align="center">
-<![CDATA[
-                      k
- a_ana(k) = a(k)*g_ana , and
-
-                      k
- a_syn(k) = a(k)*g_syn ,
-]]>
-</artwork>
-</figure>
-where a(k) is the k'th LPC coefficient, and the bandwidth expansion factors
-g_ana and g_syn are calculated as
-<figure align="center">
-<artwork align="center">
-<![CDATA[
-g_ana = 0.95 - 0.01*C, and
-
-g_syn = 0.95 + 0.01*C,
-]]>
-</artwork>
-</figure>
-where C is the coding quality control parameter between 0 and 1.
-Applying more bandwidth expansion to the analysis part than to the synthesis
-part gives the desired de-emphasis of spectral valleys in between formants.
-</t>
-
-<t>
-The long-term shaping is applied only during voiced frames.
-It uses three filter taps, described by
-<figure align="center">
-<artwork align="center">
-  <![CDATA[
-b_ana = F_ana * [0.25, 0.5, 0.25], and
-
-b_syn = F_syn * [0.25, 0.5, 0.25].
-]]>
-</artwork>
-</figure>
-For unvoiced frames these coefficients are set to 0. The multiplication factors
-F_ana and F_syn are chosen between 0 and 1, depending on the coding quality
-control parameter, as well as the calculated pitch correlation and smoothed
-subband SNR of the lowest subband. By having F_ana less than F_syn,
-the pitch harmonics are emphasized relative to the valleys in between the
-harmonics.
-</t>
-
-<t>
-The tilt coefficient c_tilt is for unvoiced frames chosen as
-<figure align="center">
-<artwork align="center">
-<![CDATA[
-c_tilt = 0.25,
-]]>
-</artwork>
-</figure>
-and as
-<figure align="center">
-<artwork align="center">
-<![CDATA[
-c_tilt = 0.25 + 0.2625 * V
-]]>
-</artwork>
-</figure>
-for voiced frames, where V is the voice activity level between 0 and 1.
-</t>
-<t>
-The adjustment gain G serves to correct any level mismatch between the original
-and decoded signals that might arise from the noise shaping and de-emphasis.
-This gain is computed as the ratio of the prediction gain of the short-term
-analysis and synthesis filter coefficients. The prediction gain of an LPC
-synthesis filter is the square root of the output energy when the filter is
-excited by a unit-energy impulse on the input.
-An efficient way to compute the prediction gain is by first computing the
-reflection coefficients from the LPC coefficients through the step-down
-algorithm, and extracting the prediction gain from the reflection coefficients
-as
-<figure align="center">
-<artwork align="center">
-<![CDATA[
-               K
-              ___          2  -0.5
- predGain = ( | | 1 - (r_k)  )    ,
-              k=1
-]]>
-</artwork>
-</figure>
-where r_k is the k'th reflection coefficient.
-</t>
-
-<t>
-Initial values for the quantization gains are computed as the square-root of
-the residual energy of the LPC analysis, adjusted by the coding quality control
-parameter.
-These quantization gains are later adjusted based on the results of the
-prediction analysis.
-</t>
-</section>
-
-<section title='Prediction Analysis' anchor='pred_ana_overview_section'>
-<t>
-The prediction analysis is performed in one of two ways depending on how
-the pitch estimator classified the frame.
-The processing for voiced and unvoiced speech is described in
-<xref target='pred_ana_voiced_overview_section' /> and
-  <xref target='pred_ana_unvoiced_overview_section' />, respectively.
-  Inputs to this function include the pre-whitened signal from the
-  pitch estimator (see <xref target='pitch_estimator_overview_section'/>).
-</t>
-
-<section title='Voiced Speech' anchor='pred_ana_voiced_overview_section'>
-<t>
-  For a frame of voiced speech the pitch pulses will remain dominant in the
-  pre-whitened input signal.
-  Further whitening is desirable as it leads to higher quality at the same
-  available bitrate.
-  To achieve this, a Long-Term Prediction (LTP) analysis is carried out to
-  estimate the coefficients of a fifth-order LTP filter for each of four
-  subframes.
-  The LTP coefficients are quantized using the method described in
-  <xref target='ltp_quantizer_overview_section'/>, and the quantized LTP
-  coefficients are used to compute the LTP residual signal.
-  This LTP residual signal is the input to an LPC analysis where the LPC coefficients are
-  estimated using Burg's method <xref target="Burg"/>, such that the residual energy is minimized.
-  The estimated LPC coefficients are converted to a Line Spectral Frequency (LSF) vector
-  and quantized as described in <xref target='lsf_quantizer_overview_section'/>.
-After quantization, the quantized LSF vector is converted back to LPC
-coefficients using the full procedure in <xref target="silk_nlsfs"/>.
-By using quantized LTP coefficients and LPC coefficients derived from the
-quantized LSF coefficients, the encoder remains fully synchronized with the
-decoder.
-The quantized LPC and LTP coefficients are also used to filter the input
-signal and measure residual energy for each of the four subframes.
-</t>
-</section>
-<section title='Unvoiced Speech' anchor='pred_ana_unvoiced_overview_section'>
-<t>
-For a speech signal that has been classified as unvoiced, there is no need
-for LTP filtering, as it has already been determined that the pre-whitened
-input signal is not periodic enough within the allowed pitch period range
-for LTP analysis to be worth the cost in terms of complexity and bitrate.
-The pre-whitened input signal is therefore discarded, and instead the input
-signal is used for LPC analysis using Burg's method.
-The resulting LPC coefficients are converted to an LSF vector and quantized
-as described in the following section.
-They are then transformed back to obtain quantized LPC coefficients, which
-are then used to filter the input signal and measure residual energy for
-each of the four subframes.
-</t>
-<section title="Burg's Method">
-<t>
-The main purpose of linear prediction in SILK is to reduce the bitrate by
-minimizing the residual energy.
-At least at high bitrates, perceptual aspects are handled
-independently by the noise shaping filter.
-Burg's method is used because it provides higher prediction gain
-than the autocorrelation method and, unlike the covariance method,
-produces stable filters (assuming numerical errors don't spoil
-that). SILK's implementation of Burg's method is also computationally
-faster than the autocovariance method.
-The implementation of Burg's method differs from traditional
-implementations in two aspects.
-The first difference is that it
-operates on autocorrelations, similar to the Schur algorithm <xref target="Schur"/>, but
-with a simple update to the autocorrelations after finding each
-reflection coefficient to make the result identical to Burg's method.
-This brings down the complexity of Burg's method to near that of
-the autocorrelation method.
-The second difference is that the signal in each subframe is scaled
-by the inverse of the residual quantization step size.  Subframes with
-a small quantization step size will on average spend more bits for a
-given amount of residual energy than subframes with a large step size.
-Without scaling, Burg's method minimizes the total residual energy in
-all subframes, which doesn't necessarily minimize the total number of
-bits needed for coding the quantized residual.  The residual energy
-of the scaled subframes is a better measure for that number of
-bits.
-</t>
-</section>
-</section>
-</section>
-
-<section title='LSF Quantization' anchor='lsf_quantizer_overview_section'>
-<t>
-Unlike many other speech codecs, SILK uses variable bitrate coding
-for the LSFs.
-This improves the average rate-distortion (R-D) tradeoff and reduces outliers.
-The variable bitrate coding minimizes a linear combination of the weighted
-quantization errors and the bitrate.
-The weights for the quantization errors are the Inverse
-Harmonic Mean Weighting (IHMW) function proposed by Laroia et al.
-(see <xref target="laroia-icassp" />).
-These weights are referred to here as Laroia weights.
-</t>
-<t>
-The LSF quantizer consists of two stages.
-The first stage is an (unweighted) vector quantizer (VQ), with a
-codebook size of 32 vectors.
-The quantization errors for the codebook vector are sorted, and
-for the N best vectors a second stage quantizer is run.
-By varying the number N a tradeoff is made between R-D performance
-and computational efficiency.
-For each of the N codebook vectors the Laroia weights corresponding
-to that vector (and not to the input vector) are calculated.
-Then the residual between the input LSF vector and the codebook
-vector is scaled by the square roots of these Laroia weights.
-This scaling partially normalizes error sensitivity for the
-residual vector, so that a uniform quantizer with fixed
-step sizes can be used in the second stage without too much
-performance loss.
-And by scaling with Laroia weights determined from the first-stage
-codebook vector, the process can be reversed in the decoder.
-</t>
-<t>
-The second stage uses predictive delayed decision scalar
-quantization.
-The quantization error is weighted by Laroia weights determined
-from the LSF input vector.
-The predictor multiplies the previous quantized residual value
-by a prediction coefficient that depends on the vector index from the
-first stage VQ and on the location in the LSF vector.
-The prediction is subtracted from the LSF residual value before
-quantizing the result, and added back afterwards.
-This subtraction can be interpreted as shifting the quantization levels
-of the scalar quantizer, and as a result the quantization error of
-each value depends on the quantization decision of the previous value.
-This dependency is exploited by the delayed decision mechanism to
-search for a quantization sequency with best R-D performance
-with a Viterbi-like algorithm <xref target="Viterbi"/>.
-The quantizer processes the residual LSF vector in reverse order
-(i.e., it starts with the highest residual LSF value).
-This is done because the prediction works slightly
-better in the reverse direction.
-</t>
-<t>
-The quantization index of the first stage is entropy coded.
-The quantization sequence from the second stage is also entropy
-coded, where for each element the probability table is chosen
-depending on the vector index from the first stage and the location
-of that element in the LSF vector.
-</t>
-
-<section title='LSF Stabilization' anchor='lsf_stabilizer_overview_section'>
-<t>
-If the input is stable, finding the best candidate usually results in a
-quantized vector that is also stable. Because of the two-stage approach,
-however, it is possible that the best quantization candidate is unstable.
-The encoder applies the same stabilization procedure applied by the decoder
- (see <xref target="silk_nlsf_stabilization"/> to ensure the LSF parameters
- are within their valid range, increasingly sorted, and have minimum
- distances between each other and the border values.
-</t>
-</section>
-</section>
-
-<section title='LTP Quantization' anchor='ltp_quantizer_overview_section'>
-<t>
-For voiced frames, the prediction analysis described in
-<xref target='pred_ana_voiced_overview_section' /> resulted in four sets
-(one set per subframe) of five LTP coefficients, plus four weighting matrices.
-The LTP coefficients for each subframe are quantized using entropy constrained
-vector quantization.
-A total of three vector codebooks are available for quantization, with
-different rate-distortion trade-offs. The three codebooks have 10, 20, and
-40 vectors and average rates of about 3, 4, and 5 bits per vector, respectively.
-Consequently, the first codebook has larger average quantization distortion at
-a lower rate, whereas the last codebook has smaller average quantization
-distortion at a higher rate.
-Given the weighting matrix W_ltp and LTP vector b, the weighted rate-distortion
-measure for a codebook vector cb_i with rate r_i is give by
-<figure align="center">
-<artwork align="center">
-<![CDATA[
- RD = u * (b - cb_i)' * W_ltp * (b - cb_i) + r_i,
-]]>
-</artwork>
-</figure>
-where u is a fixed, heuristically-determined parameter balancing the distortion
-and rate.
-Which codebook gives the best performance for a given LTP vector depends on the
-weighting matrix for that LTP vector.
-For example, for a low valued W_ltp, it is advantageous to use the codebook
-with 10 vectors as it has a lower average rate.
-For a large W_ltp, on the other hand, it is often better to use the codebook
-with 40 vectors, as it is more likely to contain the best codebook vector.
-The weighting matrix W_ltp depends mostly on two aspects of the input signal.
-The first is the periodicity of the signal; the more periodic, the larger W_ltp.
-The second is the change in signal energy in the current subframe, relative to
-the signal one pitch lag earlier.
-A decaying energy leads to a larger W_ltp than an increasing energy.
-Both aspects fluctuate relatively slowly, which causes the W_ltp matrices for
-different subframes of one frame often to be similar.
-Because of this, one of the three codebooks typically gives good performance
-for all subframes, and therefore the codebook search for the subframe LTP
-vectors is constrained to only allow codebook vectors to be chosen from the
-same codebook, resulting in a rate reduction.
-</t>
-
-<t>
-To find the best codebook, each of the three vector codebooks is
-used to quantize all subframe LTP vectors and produce a combined
-weighted rate-distortion measure for each vector codebook.
-The vector codebook with the lowest combined rate-distortion
-over all subframes is chosen. The quantized LTP vectors are used
-in the noise shaping quantizer, and the index of the codebook
-plus the four indices for the four subframe codebook vectors
-are passed on to the range encoder.
-</t>
-</section>
-
-<section title='Prefilter'>
-<t>
-In the prefilter the input signal is filtered using the spectral valley
-de-emphasis filter coefficients from the noise shaping analysis
-(see <xref target='noise_shaping_analysis_overview_section'/>).
-By applying only the noise shaping analysis filter to the input signal,
-it provides the input to the noise shaping quantizer.
-</t>
-</section>
-
-<section title='Noise Shaping Quantizer'>
-<t>
-The noise shaping quantizer independently shapes the signal and coding noise
-spectra to obtain a perceptually higher quality at the same bitrate.
-</t>
-<t>
-The prefilter output signal is multiplied with a compensation gain G computed
-in the noise shaping analysis. Then the output of a synthesis shaping filter
-is added, and the output of a prediction filter is subtracted to create a
-residual signal.
-The residual signal is multiplied by the inverse quantized quantization gain
-from the noise shaping analysis, and input to a scalar quantizer.
-The quantization indices of the scalar quantizer represent a signal of pulses
-that is input to the pyramid range encoder.
-The scalar quantizer also outputs a quantization signal, which is multiplied
-by the quantized quantization gain from the noise shaping analysis to create
-an excitation signal.
-The output of the prediction filter is added to the excitation signal to form
-the quantized output signal y(n).
-The quantized output signal y(n) is input to the synthesis shaping and
-prediction filters.
-</t>
-<t>
-Optionally the noise shaping quantizer operates in a delayed decision
-mode.
-In this mode it uses a Viterbi algorithm to keep track of
-multiple rounding choices in the quantizer and select the best
-one after a delay of 32 samples.  This improves the rate/distortion
-performance of the quantizer.
-</t>
-</section>
-
-<section title='Constant Bitrate Mode'>
-<t>
-  SILK was designed to run in Variable Bitrate (VBR) mode.  However
-  the reference implementation also has a Constant Bitrate (CBR) mode
-  for SILK.  In CBR mode SILK will attempt to encode each packet with
-  no more than the allowed number of bits.  The Opus wrapper code
-  then pads the bitstream if any unused bits are left in SILK mode, or
-  encodes the high band with the remaining number of bits in Hybrid mode.
-  The number of payload bits is adjusted by changing
-  the quantization gains and the rate/distortion tradeoff in the noise
-  shaping quantizer, in an iterative loop
-  around the noise shaping quantizer and entropy coding.
-  Compared to the SILK VBR mode, the CBR mode has lower
-  audio quality at a given average bitrate, and also has higher
-  computational complexity.
-</t>
-</section>
-
-</section>
-
-</section>
-
-
-<section title="CELT Encoder">
-<t>
-Most of the aspects of the CELT encoder can be directly derived from the description
-of the decoder. For example, the filters and rotations in the encoder are simply the
-inverse of the operation performed by the decoder. Similarly, the quantizers generally
-optimize for the mean square error (because noise shaping is part of the bit-stream itself),
-so no special search is required. For this reason, only the less straightforward aspects of the
-encoder are described here.
-</t>
-
-<section anchor="pitch-prefilter" title="Pitch Prefilter">
-<t>The pitch prefilter is applied after the pre-emphasis. It is applied
-in such a way as to be the inverse of the decoder's post-filter. The main non-obvious aspect of the
-prefilter is the selection of the pitch period. The pitch search should be optimized for the
-following criteria:
-<list style="symbols">
-<t>continuity: it is important that the pitch period
-does not change abruptly between frames; and</t>
-<t>avoidance of pitch multiples: when the period used is a multiple of the real period
-(lower frequency fundamental), the post-filter loses most of its ability to reduce noise</t>
-</list>
-</t>
-</section>
-
-<section anchor="normalization" title="Bands and Normalization">
-<t>
-The MDCT output is divided into bands that are designed to match the ear's critical
-bands for the smallest (2.5&nbsp;ms) frame size. The larger frame sizes use integer
-multiples of the 2.5&nbsp;ms layout. For each band, the encoder
-computes the energy that will later be encoded. Each band is then normalized by the
-square root of the <spanx style="strong">unquantized</spanx> energy, such that each band now forms a unit vector X.
-The energy and the normalization are computed by compute_band_energies()
-and normalise_bands() (bands.c), respectively.
-</t>
-</section>
-
-<section anchor="energy-quantization" title="Energy Envelope Quantization">
-
-<t>
-Energy quantization (both coarse and fine) can be easily understood from the decoding process.
-For all useful bitrates, the coarse quantizer always chooses the quantized log energy value that
-minimizes the error for each band. Only at very low rate does the encoder allow larger errors to
-minimize the rate and avoid using more bits than are available. When the
-available CPU requirements allow it, it is best to try encoding the coarse energy both with and without
-inter-frame prediction such that the best prediction mode can be selected. The optimal mode depends on
-the coding rate, the available bitrate, and the current rate of packet loss.
-</t>
-
-<t>The fine energy quantizer always chooses the quantized log energy value that
-minimizes the error for each band because the rate of the fine quantization depends only
-on the bit allocation and not on the values that are coded.
-</t>
-</section> <!-- Energy quant -->
-
-<section title="Bit Allocation">
-<t>The encoder must use exactly the same bit allocation process as used by the decoder
-and described in <xref target="allocation"/>. The three mechanisms that can be used by the
-encoder to adjust the bitrate on a frame-by-frame basis are band boost, allocation trim,
-and band skipping.
-</t>
-
-<section title="Band Boost">
-<t>The reference encoder makes a decision to boost a band when the energy of that band is significantly
-higher than that of the neighboring bands. Let E_j be the log-energy of band j, we define
-<list>
-<t>D_j = 2*E_j - E_j-1 - E_j+1 </t>
-</list>
-
-The allocation of band j is boosted once if D_j &gt; t1 and twice if D_j &gt; t2. For LM&gt;=1, t1=2 and t2=4,
-while for LM&lt;1, t1=3 and t2=5.
-</t>
-
-</section>
-
-<section title="Allocation Trim">
-<t>The allocation trim is a value between 0 and 10 (inclusively) that controls the allocation
-balance between the low and high frequencies. The encoder starts with a safe "default" of 5
-and deviates from that default in two different ways. First the trim can deviate by +/- 2
-depending on the spectral tilt of the input signal. For signals with more low frequencies, the
-trim is increased by up to 2, while for signals with more high frequencies, the trim is
-decreased by up to 2.
-For stereo inputs, the trim value can
-be decreased by up to 4 when the inter-channel correlation at low frequency (first 8 bands)
-is high. </t>
-</section>
-
-<section title="Band Skipping">
-<t>The encoder uses band skipping to ensure that the shape of the bands is only coded
-if there is at least 1/2 bit per sample available for the PVQ. If not, then no bit is allocated
-and folding is used instead. To ensure continuity in the allocation, some amount of hysteresis is
-added to the process, such that a band that received PVQ bits in the previous frame only needs 7/16
-bit/sample to be coded for the current frame, while a band that did not receive PVQ bits in the
-previous frames needs at least 9/16 bit/sample to be coded.</t>
-</section>
-
-</section>
-
-<section title="Stereo Decisions">
-<t>Because CELT applies mid-side stereo coupling in the normalized domain, it does not suffer from
-important stereo image problems even when the two channels are completely uncorrelated. For this reason
-it is always safe to use stereo coupling on any audio frame. That being said, there are some frames
-for which dual (independent) stereo is still more efficient. This decision is made by comparing the estimated
-entropy with and without coupling over the first 13 bands, taking into account the fact that all bands with
-more than two MDCT bins require one extra degree of freedom when coded in mid-side. Let L1_ms and L1_lr
-be the L1-norm of the mid-side vector and the L1-norm of the left-right vector, respectively. The decision
-to use mid-side is made if and only if
-<figure align="center">
-<artwork align="center"><![CDATA[
- L1_ms          L1_lr
---------    <   -----
-bins + E        bins
-]]></artwork>
-</figure>
-where bins is the number of MDCT bins in the first 13 bands and E is the number of extra degrees of
-freedom for mid-side coding. For LM>1, E=13, otherwise E=5.
-</t>
-
-<t>The reference encoder decides on the intensity stereo threshold based on the bitrate alone. After
-taking into account the frame size by subtracting 80 bits per frame for coarse energy, the first
-band using intensity coding is as follows:
-</t>
-
-<texttable anchor="intensity-thresholds"
- title="Thresholds for Intensity Stereo">
-<ttcol align='center'>bitrate (kb/s)</ttcol>
-<ttcol align='center'>start band</ttcol>
-<c>&lt;35</c>      <c>8</c>
-<c>35-50</c>      <c>12</c>
-<c>50-68</c>      <c>16</c>
-<c>84-84</c>      <c>18</c>
-<c>84-102</c>     <c>19</c>
-<c>102-130</c>     <c>20</c>
-<c>&gt;130</c>     <c>disabled</c>
-</texttable>
-
-
-</section>
-
-<section title="Time-Frequency Decision">
-<t>
-The choice of time-frequency resolution used in <xref target="tf-change"></xref> is based on
-R-D optimization. The distortion is the L1-norm (sum of absolute values) of each band
-after each TF resolution under consideration. The L1 norm is used because it represents the entropy
-for a Laplacian source. The number of bits required to code a change in TF resolution between
-two bands is higher than the cost of having those two bands use the same resolution, which is
-what requires the R-D optimization. The optimal decision is computed using the Viterbi algorithm.
-See tf_analysis() in celt/celt.c.
-</t>
-</section>
-
-<section title="Spreading Values Decision">
-<t>
-The choice of the spreading value in <xref target="spread values"></xref> has an
-impact on the nature of the coding noise introduced by CELT. The larger the f_r value, the
-lower the impact of the rotation, and the more tonal the coding noise. The
-more tonal the signal, the more tonal the noise should be, so the CELT encoder determines
-the optimal value for f_r by estimating how tonal the signal is. The tonality estimate
-is based on discrete pdf (4-bin histogram) of each band. Bands that have a large number of small
-values are considered more tonal and a decision is made by combining all bands with more than
-8 samples. See spreading_decision() in celt/bands.c.
-</t>
-</section>
-
-<section anchor="pvq" title="Spherical Vector Quantization">
-<t>CELT uses a Pyramid Vector Quantization (PVQ) <xref target="PVQ"></xref>
-codebook for quantizing the details of the spectrum in each band that have not
-been predicted by the pitch predictor. The PVQ codebook consists of all sums
-of K signed pulses in a vector of N samples, where two pulses at the same position
-are required to have the same sign. Thus the codebook includes
-all integer codevectors y of N dimensions that satisfy sum(abs(y(j))) = K.
-</t>
-
-<t>
-In bands where there are sufficient bits allocated PVQ is used to encode
-the unit vector that results from the normalization in
-<xref target="normalization"></xref> directly. Given a PVQ codevector y,
-the unit vector X is obtained as X = y/||y||, where ||.|| denotes the
-L2 norm.
-</t>
-
-
-<section anchor="pvq-search" title="PVQ Search">
-
-<t>
-The search for the best codevector y is performed by alg_quant()
-(vq.c). There are several possible approaches to the
-search, with a trade-off between quality and complexity. The method used in the reference
-implementation computes an initial codeword y1 by projecting the normalized spectrum
-X onto the codebook pyramid of K-1 pulses:
-</t>
-<t>
-y0 = truncate_towards_zero( (K-1) * X / sum(abs(X)))
-</t>
-
-<t>
-Depending on N, K and the input data, the initial codeword y0 may contain from
-0 to K-1 non-zero values. All the remaining pulses, with the exception of the last one,
-are found iteratively with a greedy search that minimizes the normalized correlation
-between y and X:
-<figure align="center">
-<artwork align="center"><![CDATA[
-      T
-J = -X * y / ||y||
-]]></artwork>
-</figure>
-</t>
-
-<t>
-The search described above is considered to be a good trade-off between quality
-and computational cost. However, there are other possible ways to search the PVQ
-codebook and the implementers MAY use any other search methods. See alg_quant() in celt/vq.c.
-</t>
-</section>
-
-<section anchor="cwrs-encoder" title="PVQ Encoding">
-
-<t>
-The vector to encode, X, is converted into an index i such that
- 0&nbsp;&lt;=&nbsp;i&nbsp;&lt;&nbsp;V(N,K) as follows.
-Let i&nbsp;=&nbsp;0 and k&nbsp;=&nbsp;0.
-Then for j&nbsp;=&nbsp;(N&nbsp;-&nbsp;1) down to 0, inclusive, do:
-<list style="numbers">
-<t>
-If k&nbsp;>&nbsp;0, set
- i&nbsp;=&nbsp;i&nbsp;+&nbsp;(V(N-j-1,k-1)&nbsp;+&nbsp;V(N-j,k-1))/2.
-</t>
-<t>Set k&nbsp;=&nbsp;k&nbsp;+&nbsp;abs(X[j]).</t>
-<t>
-If X[j]&nbsp;&lt;&nbsp;0, set
- i&nbsp;=&nbsp;i&nbsp;+&nbsp;(V(N-j-1,k)&nbsp;+&nbsp;V(N-j,k))/2.
-</t>
-</list>
-</t>
-
-<t>
-The index i is then encoded using the procedure in
- <xref target="encoding-ints"/> with ft&nbsp;=&nbsp;V(N,K).
-</t>
-
-</section>
-
-</section>
-
-
-
-
-
-</section>
-
-</section>
-
-
-<section anchor="conformance" title="Conformance">
-
-<t>
-It is our intention to allow the greatest possible choice of freedom in
-implementing the specification. For this reason, outside of the exceptions
-noted in this section, conformance is defined through the reference
-implementation of the decoder provided in <xref target="ref-implementation"/>.
-Although this document includes an English description of the codec, should
-the description contradict the source code of the reference implementation,
-the latter shall take precedence.
-</t>
-
-<t>
-Compliance with this specification means that in addition to following the normative keywords in this document,
- a decoder's output MUST also be
- within the thresholds specified by the opus_compare.c tool (included
- with the code) when compared to the reference implementation for each of the
- test vectors provided (see <xref target="test-vectors"></xref>) and for each output
- sampling rate and channel count supported. In addition, a compliant
- decoder implementation MUST have the same final range decoder state as that of the
- reference decoder. It is therefore RECOMMENDED that the
- decoder implement the same functional behavior as the reference.
-
- A decoder implementation is not required to support all output sampling
- rates or all output channel counts.
-</t>
-
-<section title="Testing">
-<t>
-Using the reference code provided in <xref target="ref-implementation"></xref>,
-a test vector can be decoded with
-<list>
-<t>opus_demo -d &lt;rate&gt; &lt;channels&gt; testvectorX.bit testX.out</t>
-</list>
-where &lt;rate&gt; is the sampling rate and can be 8000, 12000, 16000, 24000, or 48000, and
-&lt;channels&gt; is 1 for mono or 2 for stereo.
-</t>
-
-<t>
-If the range decoder state is incorrect for one of the frames, the decoder will exit with
-"Error: Range coder state mismatch between encoder and decoder". If the decoder succeeds, then
-the output can be compared with the "reference" output with
-<list>
-<t>opus_compare -s -r &lt;rate&gt; testvectorX.dec testX.out</t>
-</list>
-for stereo or
-<list>
-<t>opus_compare -r &lt;rate&gt; testvectorX.dec testX.out</t>
-</list>
-for mono.
-</t>
-
-<t>In addition to indicating whether the test vector comparison passes, the opus_compare tool
-outputs an "Opus quality metric" that indicates how well the tested decoder matches the
-reference implementation. A quality of 0 corresponds to the passing threshold, while
-a quality of 100 is the highest possible value and means that the output of the tested decoder is identical to the reference
-implementation. The passing threshold (quality 0) was calibrated in such a way that it corresponds to
-additive white noise with a 48 dB SNR (similar to what can be obtained on a cassette deck).
-It is still possible for an implementation to sound very good with such a low quality measure
-(e.g. if the deviation is due to inaudible phase distortion), but unless this is verified by
-listening tests, it is RECOMMENDED that implementations achieve a quality above 90 for 48&nbsp;kHz
-decoding. For other sampling rates, it is normal for the quality metric to be lower
-(typically as low as 50 even for a good implementation) because of harmless mismatch with
-the delay and phase of the internal sampling rate conversion.
-</t>
-
-<t>
-On POSIX environments, the run_vectors.sh script can be used to verify all test
-vectors. This can be done with
-<list>
-<t>run_vectors.sh &lt;exec path&gt; &lt;vector path&gt; &lt;rate&gt;</t>
-</list>
-where &lt;exec path&gt; is the directory where the opus_demo and opus_compare executables
-are built and &lt;vector path&gt; is the directory containing the test vectors.
-</t>
-</section>
-
-<section anchor="opus-custom" title="Opus Custom">
-<t>
-Opus Custom is an OPTIONAL part of the specification that is defined to
-handle special sample rates and frame rates that are not supported by the
-main Opus specification. Use of Opus Custom is discouraged for all but very
-special applications for which a frame size different from 2.5, 5, 10, or 20&nbsp;ms is
-needed (for either complexity or latency reasons). Because Opus Custom is
-optional, streams encoded using Opus Custom cannot be expected to be decodable by all Opus
-implementations. Also, because no in-band mechanism exists for specifying the sampling
-rate and frame size of Opus Custom streams, out-of-band signaling is required.
-In Opus Custom operation, only the CELT layer is available, using the opus_custom_* function
-calls in opus_custom.h.
-</t>
-</section>
-
-</section>
-
-<section anchor="security" title="Security Considerations">
-
-<t>
-Implementations of the Opus codec need to take appropriate security considerations
-into account, as outlined in <xref target="DOS"/>.
-It is extremely important for the decoder to be robust against malicious
-payloads.
-Malicious payloads must not cause the decoder to overrun its allocated memory
- or to take an excessive amount of resources to decode.
-Although problems
-in encoders are typically rarer, the same applies to the encoder. Malicious
-audio streams must not cause the encoder to misbehave because this would
-allow an attacker to attack transcoding gateways.
-</t>
-<t>
-The reference implementation contains no known buffer overflow or cases where
- a specially crafted packet or audio segment could cause a significant increase
- in CPU load.
-However, on certain CPU architectures where denormalized floating-point
- operations are much slower than normal floating-point operations, it is
- possible for some audio content (e.g., silence or near-silence) to cause an
- increase in CPU load.
-Denormals can be introduced by reordering operations in the compiler and depend
- on the target architecture, so it is difficult to guarantee that an implementation
- avoids them.
-For architectures on which denormals are problematic, adding very small
- floating-point offsets to the affected signals to prevent significant numbers
- of denormalized operations is RECOMMENDED.
-Alternatively, it is often possible to configure the hardware to treat
- denormals as zero (DAZ).
-No such issue exists for the fixed-point reference implementation.
-</t>
-<t>The reference implementation was validated in the following conditions:
-<list style="numbers">
-<t>
-Sending the decoder valid packets generated by the reference encoder and
- verifying that the decoder's final range coder state matches that of the
- encoder.
-</t>
-<t>
-Sending the decoder packets generated by the reference encoder and then
- subjected to random corruption.
-</t>
-<t>Sending the decoder random packets.</t>
-<t>
-Sending the decoder packets generated by a version of the reference encoder
- modified to make random coding decisions (internal fuzzing), including mode
- switching, and verifying that the range coder final states match.
-</t>
-</list>
-In all of the conditions above, both the encoder and the decoder were run
- inside the <xref target="Valgrind">Valgrind</xref> memory
- debugger, which tracks reads and writes to invalid memory regions as well as
- the use of uninitialized memory.
-There were no errors reported on any of the tested conditions.
-</t>
-</section>
-
-
-<section title="IANA Considerations">
-<t>
-This document has no actions for IANA.
-</t>
-</section>
-
-<section anchor="Acknowledgements" title="Acknowledgements">
-<t>
-Thanks to all other developers, including Raymond Chen, Soeren Skak Jensen, Gregory Maxwell,
-Christopher Montgomery, and Karsten Vandborg Soerensen. We would also
-like to thank Igor Dyakonov, Jan Skoglund, and Christian Hoene for their help with subjective testing of the
-Opus codec. Thanks to Ralph Giles, John Ridges, Ben Schwartz, Keith Yan, Christian Hoene, Kat Walsh, and many others on the Opus and CELT mailing lists
-for their bug reports and feedback.
-</t>
-</section>
-
-<section title="Copying Conditions">
-<t>The authors agree to grant third parties the irrevocable right to copy, use and distribute
-the work (excluding Code Components available under the simplified BSD license), with or
-without modification, in any medium, without royalty, provided that, unless separate
-permission is granted, redistributed modified works do not contain misleading author, version,
-name of work, or endorsement information.</t>
-</section>
-
-</middle>
-
-<back>
-
-<references title="Normative References">
-
-<reference anchor="rfc2119">
-<front>
-<title>Key words for use in RFCs to Indicate Requirement Levels </title>
-<author initials="S." surname="Bradner" fullname="Scott Bradner"></author>
-</front>
-<seriesInfo name="RFC" value="2119" />
-</reference>
-
-</references>
-
-<references title="Informative References">
-
-<reference anchor='requirements'>
-<front>
-<title>Requirements for an Internet Audio Codec</title>
-<author initials='J.-M.' surname='Valin' fullname='J.-M. Valin'>
-<organization /></author>
-<author initials='K.' surname='Vos' fullname='K. Vos'>
-<organization /></author>
-<author>
-<organization>IETF</organization></author>
-<date year='2011' month='August' />
-<abstract>
-<t>This document provides specific requirements for an Internet audio
-   codec.  These requirements address quality, sample rate, bitrate,
-   and packet-loss robustness, as well as other desirable properties.
-</t></abstract></front>
-<seriesInfo name='RFC' value='6366' />
-<format type='TXT' target='http://tools.ietf.org/rfc/rfc6366.txt' />
-</reference>
-
-<?rfc include="http://xml.resource.org/public/rfc/bibxml/reference.RFC.3550.xml"?>
-<?rfc include="http://xml.resource.org/public/rfc/bibxml/reference.RFC.3533.xml"?>
-
-<reference anchor='SILK' target='http://developer.skype.com/silk'>
-<front>
-<title>SILK Speech Codec</title>
-<author initials='K.' surname='Vos' fullname='K. Vos'>
-<organization /></author>
-<author initials='S.' surname='Jensen' fullname='S. Jensen'>
-<organization /></author>
-<author initials='K.' surname='Soerensen' fullname='K. Soerensen'>
-<organization /></author>
-<date year='2010' month='March' />
-<abstract>
-<t></t>
-</abstract></front>
-<seriesInfo name='Internet-Draft' value='draft-vos-silk-01' />
-<format type='TXT' target='http://tools.ietf.org/html/draft-vos-silk-01' />
-</reference>
-
-<reference anchor="laroia-icassp">
-<front>
-<title abbrev="Robust and Efficient Quantization of Speech LSP">
-Robust and Efficient Quantization of Speech LSP Parameters Using Structured Vector Quantization
-</title>
-<author initials="R.L." surname="Laroia" fullname="R.">
-<organization/>
-</author>
-<author initials="N.P." surname="Phamdo" fullname="N.">
-<organization/>
-</author>
-<author initials="N.F." surname="Farvardin" fullname="N.">
-<organization/>
-</author>
-</front>
-<seriesInfo name="ICASSP-1991, Proc. IEEE Int. Conf. Acoust., Speech, Signal Processing, pp. 641-644, October" value="1991"/>
-</reference>
-
-<reference anchor='CELT' target='http://celt-codec.org/'>
-<front>
-<title>Constrained-Energy Lapped Transform (CELT) Codec</title>
-<author initials='J-M.' surname='Valin' fullname='J-M. Valin'>
-<organization /></author>
-<author initials='T&#x2E;B.' surname='Terriberry' fullname='Timothy B. Terriberry'>
-<organization /></author>
-<author initials='G.' surname='Maxwell' fullname='G. Maxwell'>
-<organization /></author>
-<author initials='C.' surname='Montgomery' fullname='C. Montgomery'>
-<organization /></author>
-<date year='2010' month='July' />
-<abstract>
-<t></t>
-</abstract></front>
-<seriesInfo name='Internet-Draft' value='draft-valin-celt-codec-02' />
-<format type='TXT' target='http://tools.ietf.org/html/draft-valin-celt-codec-02' />
-</reference>
-
-<reference anchor='SRTP-VBR'>
-<front>
-<title>Guidelines for the use of Variable Bit Rate Audio with Secure RTP</title>
-<author initials='C.' surname='Perkins' fullname='K. Vos'>
-<organization /></author>
-<author initials='J.M.' surname='Valin' fullname='J.M. Valin'>
-<organization /></author>
-<date year='2011' month='July' />
-<abstract>
-<t></t>
-</abstract></front>
-<seriesInfo name='RFC' value='6562' />
-<format type='TXT' target='http://tools.ietf.org/html/rfc6562' />
-</reference>
-
-<reference anchor='DOS'>
-<front>
-<title>Internet Denial-of-Service Considerations</title>
-<author initials='M.' surname='Handley' fullname='M. Handley'>
-<organization /></author>
-<author initials='E.' surname='Rescorla' fullname='E. Rescorla'>
-<organization /></author>
-<author>
-<organization>IAB</organization></author>
-<date year='2006' month='December' />
-<abstract>
-<t>This document provides an overview of possible avenues for denial-of-service (DoS) attack on Internet systems.  The aim is to encourage protocol designers and network engineers towards designs that are more robust.  We discuss partial solutions that reduce the effectiveness of attacks, and how some solutions might inadvertently open up alternative vulnerabilities.  This memo provides information for the Internet community.</t></abstract></front>
-<seriesInfo name='RFC' value='4732' />
-<format type='TXT' octets='91844' target='ftp://ftp.isi.edu/in-notes/rfc4732.txt' />
-</reference>
-
-<reference anchor="Martin79">
-<front>
-<title>Range encoding: An algorithm for removing redundancy from a digitised message</title>
-<author initials="G.N.N." surname="Martin" fullname="G. Nigel N. Martin"><organization/></author>
-<date year="1979" />
-</front>
-<seriesInfo name="Proc. Institution of Electronic and Radio Engineers International Conference on Video and Data Recording" value="" />
-</reference>
-
-<reference anchor="coding-thesis">
-<front>
-<title>Source coding algorithms for fast data compression</title>
-<author initials="R." surname="Pasco" fullname=""><organization/></author>
-<date month="May" year="1976" />
-</front>
-<seriesInfo name="Ph.D. thesis" value="Dept. of Electrical Engineering, Stanford University" />
-</reference>
-
-<reference anchor="PVQ">
-<front>
-<title>A Pyramid Vector Quantizer</title>
-<author initials="T." surname="Fischer" fullname=""><organization/></author>
-<date month="July" year="1986" />
-</front>
-<seriesInfo name="IEEE Trans. on Information Theory, Vol. 32" value="pp. 568-583" />
-</reference>
-
-<reference anchor="Kabal86">
-<front>
-<title>The Computation of Line Spectral Frequencies Using Chebyshev Polynomials</title>
-<author initials="P." surname="Kabal" fullname="P. Kabal"><organization/></author>
-<author initials="R." surname="Ramachandran" fullname="R. P. Ramachandran"><organization/></author>
-<date month="December" year="1986" />
-</front>
-<seriesInfo name="IEEE Trans. Acoustics, Speech, Signal Processing, vol. 34, no. 6" value="pp. 1419-1426" />
-</reference>
-
-
-<reference anchor="Valgrind" target="http://valgrind.org/">
-<front>
-<title>Valgrind website</title>
-<author></author>
-</front>
-</reference>
-
-<reference anchor="Google-NetEQ" target="http://code.google.com/p/webrtc/source/browse/trunk/src/modules/audio_coding/NetEQ/main/source/?r=583">
-<front>
-<title>Google NetEQ code</title>
-<author></author>
-</front>
-</reference>
-
-<reference anchor="Google-WebRTC" target="http://code.google.com/p/webrtc/">
-<front>
-<title>Google WebRTC code</title>
-<author></author>
-</front>
-</reference>
-
-
-<reference anchor="Opus-git" target="git://git.xiph.org/opus.git">
-<front>
-<title>Opus Git Repository</title>
-<author></author>
-</front>
-</reference>
-
-<reference anchor="Opus-website" target="http://opus-codec.org/">
-<front>
-<title>Opus website</title>
-<author></author>
-</front>
-</reference>
-
-<reference anchor="Vorbis-website" target="http://xiph.org/vorbis/">
-<front>
-<title>Vorbis website</title>
-<author></author>
-</front>
-</reference>
-
-<reference anchor="Matroska-website" target="http://matroska.org/">
-<front>
-<title>Matroska website</title>
-<author></author>
-</front>
-</reference>
-
-<reference anchor="Vectors-website" target="http://opus-codec.org/testvectors/">
-<front>
-<title>Opus Testvectors (webside)</title>
-<author></author>
-</front>
-</reference>
-
-<reference anchor="Vectors-proc" target="http://www.ietf.org/proceedings/83/slides/slides-83-codec-0.gz">
-<front>
-<title>Opus Testvectors (proceedings)</title>
-<author></author>
-</front>
-</reference>
-
-<reference anchor="line-spectral-pairs" target="http://en.wikipedia.org/wiki/Line_spectral_pairs">
-<front>
-<title>Line Spectral Pairs</title>
-<author><organization>Wikipedia</organization></author>
-</front>
-</reference>
-
-<reference anchor="range-coding" target="http://en.wikipedia.org/wiki/Range_coding">
-<front>
-<title>Range Coding</title>
-<author><organization>Wikipedia</organization></author>
-</front>
-</reference>
-
-<reference anchor="Hadamard" target="http://en.wikipedia.org/wiki/Hadamard_transform">
-<front>
-<title>Hadamard Transform</title>
-<author><organization>Wikipedia</organization></author>
-</front>
-</reference>
-
-<reference anchor="Viterbi" target="http://en.wikipedia.org/wiki/Viterbi_algorithm">
-<front>
-<title>Viterbi Algorithm</title>
-<author><organization>Wikipedia</organization></author>
-</front>
-</reference>
-
-<reference anchor="Whitening" target="http://en.wikipedia.org/wiki/White_noise">
-<front>
-<title>White Noise</title>
-<author><organization>Wikipedia</organization></author>
-</front>
-</reference>
-
-<reference anchor="LPC" target="http://en.wikipedia.org/wiki/Linear_prediction">
-<front>
-<title>Linear Prediction</title>
-<author><organization>Wikipedia</organization></author>
-</front>
-</reference>
-
-<reference anchor="MDCT" target="http://en.wikipedia.org/wiki/Modified_discrete_cosine_transform">
-<front>
-<title>Modified Discrete Cosine Transform</title>
-<author><organization>Wikipedia</organization></author>
-</front>
-</reference>
-
-<reference anchor="FFT" target="http://en.wikipedia.org/wiki/Fast_Fourier_transform">
-<front>
-<title>Fast Fourier Transform</title>
-<author><organization>Wikipedia</organization></author>
-</front>
-</reference>
-
-<reference anchor="z-transform" target="http://en.wikipedia.org/wiki/Z-transform">
-<front>
-<title>Z-transform</title>
-<author><organization>Wikipedia</organization></author>
-</front>
-</reference>
-
-
-<reference anchor="Burg">
-<front>
-<title>Maximum Entropy Spectral Analysis</title>
-<author initials="JP." surname="Burg" fullname="J.P. Burg"><organization/></author>
-</front>
-</reference>
-
-<reference anchor="Schur">
-<front>
-<title>A fixed point computation of partial correlation coefficients</title>
-<author initials="J." surname="Le Roux" fullname="J. Le Roux"><organization/></author>
-<author initials="C." surname="Gueguen" fullname="C. Gueguen"><organization/></author>
-</front>
-<seriesInfo name="ICASSP-1977, Proc. IEEE Int. Conf. Acoust., Speech, Signal Processing, pp. 257-259, October" value="1977"/>
-</reference>
-
-<reference anchor="Princen86">
-<front>
-<title>Analysis/synthesis filter bank design based on time domain aliasing cancellation</title>
-<author initials="J." surname="Princen" fullname="John P. Princen"><organization/></author>
-<author initials="A." surname="Bradley" fullname="Alan B. Bradley"><organization/></author>
-</front>
-<seriesInfo name="IEEE Trans. Acoust. Speech Sig. Proc. ASSP-34 (5), 1153-1161" value="1986"/>
-</reference>
-
-<reference anchor="Valin2010">
-<front>
-<title>A High-Quality Speech and Audio Codec With Less Than 10 ms delay</title>
-<author initials="JM" surname="Valin" fullname="Jean-Marc Valin"><organization/>
-</author>
-<author initials="T. B." surname="Terriberry" fullname="Timothy Terriberry"><organization/></author>
-<author initials="C." surname="Montgomery" fullname="Christopher Montgomery"><organization/></author>
-<author initials="G." surname="Maxwell" fullname="Gregory Maxwell"><organization/></author>
-</front>
-<seriesInfo name="IEEE Trans. on Audio, Speech and Language Processing, Vol. 18, No. 1, pp. 58-67" value="2010" />
-</reference>
-
-
-<reference anchor="Zwicker61">
-<front>
-<title>Subdivision of the audible frequency range into critical bands</title>
-<author initials="E." surname="Zwicker" fullname="E. Zwicker"><organization/></author>
-<date month="February" year="1961" />
-</front>
-<seriesInfo name="The Journal of the Acoustical Society of America, Vol. 33, No 2" value="p. 248" />
-</reference>
-
-
-</references>
-
-<section anchor="ref-implementation" title="Reference Implementation">
-
-<t>This appendix contains the complete source code for the
-reference implementation of the Opus codec written in C. By default,
-this implementation relies on floating-point arithmetic, but it can be
-compiled to use only fixed-point arithmetic by defining the FIXED_POINT
-macro. Information on building and using the reference implementation is
-available in the README file.
-</t>
-
-<t>The implementation can be compiled with either a C89 or a C99
-compiler. It is reasonably optimized for most platforms such that
-only architecture-specific optimizations are likely to be useful.
-The FFT <xref target="FFT"/> used is a slightly modified version of the KISS-FFT library,
-but it is easy to substitute any other FFT library.
-</t>
-
-<t>
-While the reference implementation does not rely on any
-<spanx style="emph">undefined behavior</spanx> as defined by C89 or C99,
-it relies on common <spanx style="emph">implementation-defined behavior</spanx>
-for two's complement architectures:
-<list style="symbols">
-<t>Right shifts of negative values are consistent with two's complement arithmetic, so that a>>b is equivalent to floor(a/(2**b)),</t>
-<t>For conversion to a signed integer of N bits, the value is reduced modulo 2**N to be within range of the type,</t>
-<t>The result of integer division of a negative value is truncated towards zero, and</t>
-<t>The compiler provides a 64-bit integer type (a C99 requirement which is supported by most C89 compilers).</t>
-</list>
-</t>
-
-<t>
-In its current form, the reference implementation also requires the following
-architectural characteristics to obtain acceptable performance:
-<list style="symbols">
-<t>Two's complement arithmetic,</t>
-<t>At least a 16 bit by 16 bit integer multiplier (32-bit result), and</t>
-<t>At least a 32-bit adder/accumulator.</t>
-</list>
-</t>
-
-
-<section title="Extracting the source">
-<t>
-The complete source code can be extracted from this draft, by running the
-following command line:
-
-<list style="symbols">
-<t><![CDATA[
-cat draft-ietf-codec-opus.txt | grep '^\ \ \ ###' | sed -e 's/...###//' | base64 -d > opus_source.tar.gz
-]]></t>
-<t>
-tar xzvf opus_source.tar.gz
-</t>
-<t>cd opus_source</t>
-<t>make</t>
-</list>
-On systems where the provided Makefile does not work, the following command line may be used to compile
-the source code:
-<list style="symbols">
-<t><![CDATA[
-cc -O2 -g -o opus_demo src/opus_demo.c `cat *.mk | grep -v fixed | sed -e 's/.*=//' -e 's/\\\\//'` -DOPUS_BUILD -Iinclude -Icelt -Isilk -Isilk/float -DUSE_ALLOCA -Drestrict= -lm
-]]></t></list>
-</t>
-
-<t>
-On systems where the base64 utility is not present, the following commands can be used instead:
-<list style="symbols">
-<t><![CDATA[
-cat draft-ietf-codec-opus.txt | grep '^\ \ \ ###' | sed -e 's/...###//' > opus.b64
-]]></t>
-<t>openssl base64 -d -in opus.b64 > opus_source.tar.gz</t>
-</list>
-
-</t>
-</section>
-
-<section title="Up-to-date Implementation">
-<t>
-As of the time of publication of this memo, an up-to-date implementation conforming to
-this standard is available in a
- <xref target='Opus-git'>Git repository</xref>.
-Releases and other resources are available at
- <xref target='Opus-website'/>. However, although that implementation is expected to
- remain conformant with the standard, it is the code in this document that shall
- remain normative.
-</t>
-</section>
-
-<section title="Base64-encoded Source Code">
-<t>
-<?rfc include="opus_source.base64"?>
-</t>
-</section>
-
-<section anchor="test-vectors" title="Test Vectors">
-<t>
-Because of size constraints, the Opus test vectors are not distributed in this
-draft. They are available in the proceedings of the 83th IETF meeting (Paris) <xref target="Vectors-proc"/> and from the Opus codec website at
-<xref target="Vectors-website"/>. These test vectors were created specifically to exercise
-all aspects of the decoder and therefore the audio quality of the decoded output is
-significantly lower than what Opus can achieve in normal operation.
-</t>
-
-<t>
-The SHA1 hash of the files in the test vector package are
-<?rfc include="testvectors_sha1"?>
-</t>
-
-</section>
-
-</section>
-
-<section anchor="self-delimiting-framing" title="Self-Delimiting Framing">
-<t>
-To use the internal framing described in <xref target="modes"/>, the decoder
- must know the total length of the Opus packet, in bytes.
-This section describes a simple variation of that framing which can be used
- when the total length of the packet is not known.
-Nothing in the encoding of the packet itself allows a decoder to distinguish
- between the regular, undelimited framing and the self-delimiting framing
- described in this appendix.
-Which one is used and where must be established by context at the transport
- layer.
-It is RECOMMENDED that a transport layer choose exactly one framing scheme,
- rather than allowing an encoder to signal which one it wants to use.
-</t>
-
-<t>
-For example, although a regular Opus stream does not support more than two
- channels, a multi-channel Opus stream may be formed from several one- and
- two-channel streams.
-To pack an Opus packet from each of these streams together in a single packet
- at the transport layer, one could use the self-delimiting framing for all but
- the last stream, and then the regular, undelimited framing for the last one.
-Reverting to the undelimited framing for the last stream saves overhead
- (because the total size of the transport-layer packet will still be known),
- and ensures that a "multi-channel" stream which only has a single Opus stream
- uses the same framing as a regular Opus stream does.
-This avoids the need for signaling to distinguish these two cases.
-</t>
-
-<t>
-The self-delimiting framing is identical to the regular, undelimited framing
- from <xref target="modes"/>, except that each Opus packet contains one extra
- length field, encoded using the same one- or two-byte scheme from
- <xref target="frame-length-coding"/>.
-This extra length immediately precedes the compressed data of the first Opus
- frame in the packet, and is interpreted in the various modes as follows:
-<list style="symbols">
-<t>
-Code&nbsp;0 packets: It is the length of the single Opus frame (see
- <xref target="sd_code0_packet"/>).
-</t>
-<t>
-Code&nbsp;1 packets: It is the length used for both of the Opus frames (see
- <xref target="sd_code1_packet"/>).
-</t>
-<t>
-Code&nbsp;2 packets: It is the length of the second Opus frame (see
- <xref target="sd_code2_packet"/>).</t>
-<t>
-CBR Code&nbsp;3 packets: It is the length used for all of the Opus frames (see
- <xref target="sd_code3cbr_packet"/>).
-</t>
-<t>VBR Code&nbsp;3 packets: It is the length of the last Opus frame (see
- <xref target="sd_code3vbr_packet"/>).
-</t>
-</list>
-</t>
-
-<figure anchor="sd_code0_packet" title="A Self-Delimited Code 0 Packet"
- align="center">
-<artwork align="center"><![CDATA[
- 0                   1                   2                   3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-| config  |s|0|0| N1 (1-2 bytes):                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+                               |
-|               Compressed frame 1 (N1 bytes)...                :
-:                                                               |
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-]]></artwork>
-</figure>
-
-<figure anchor="sd_code1_packet" title="A Self-Delimited Code 1 Packet"
- align="center">
-<artwork align="center"><![CDATA[
- 0                   1                   2                   3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-| config  |s|0|1| N1 (1-2 bytes):                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+                               :
-|               Compressed frame 1 (N1 bytes)...                |
-:                               +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                               |                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+                               :
-|               Compressed frame 2 (N1 bytes)...                |
-:                                               +-+-+-+-+-+-+-+-+
-|                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-]]></artwork>
-</figure>
-
-<figure anchor="sd_code2_packet" title="A Self-Delimited Code 2 Packet"
- align="center">
-<artwork align="center"><![CDATA[
- 0                   1                   2                   3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-| config  |s|1|0| N1 (1-2 bytes): N2 (1-2 bytes :               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+               :
-|               Compressed frame 1 (N1 bytes)...                |
-:                               +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                               |                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+                               |
-|               Compressed frame 2 (N2 bytes)...                :
-:                                                               |
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-]]></artwork>
-</figure>
-
-<figure anchor="sd_code3cbr_packet" title="A Self-Delimited CBR Code 3 Packet"
- align="center">
-<artwork align="center"><![CDATA[
- 0                   1                   2                   3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-| config  |s|1|1|0|p|     M     | Pad len (Opt) : N1 (1-2 bytes):
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                                                               |
-:               Compressed frame 1 (N1 bytes)...                :
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                                                               |
-:               Compressed frame 2 (N1 bytes)...                :
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                                                               |
-:                              ...                              :
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                                                               |
-:               Compressed frame M (N1 bytes)...                :
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-:                  Opus Padding (Optional)...                   |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-]]></artwork>
-</figure>
-
-<figure anchor="sd_code3vbr_packet" title="A Self-Delimited VBR Code 3 Packet"
- align="center">
-<artwork align="center"><![CDATA[
- 0                   1                   2                   3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-| config  |s|1|1|1|p|     M     | Padding length (Optional)     :
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-: N1 (1-2 bytes):     ...       :     N[M-1]    |     N[M]      :
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                                                               |
-:               Compressed frame 1 (N1 bytes)...                :
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                                                               |
-:               Compressed frame 2 (N2 bytes)...                :
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                                                               |
-:                              ...                              :
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|                                                               |
-:              Compressed frame M (N[M] bytes)...               :
-|                                                               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-:                  Opus Padding (Optional)...                   |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-]]></artwork>
-</figure>
-
-</section>
-
-</back>
-
-</rfc>
diff --git a/doc/draft-ietf-payload-rtp-opus.xml b/doc/draft-ietf-payload-rtp-opus.xml
deleted file mode 100644
index c4eb21077..000000000
--- a/doc/draft-ietf-payload-rtp-opus.xml
+++ /dev/null
@@ -1,960 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE rfc SYSTEM "rfc2629.dtd" [
-<!ENTITY rfc2119 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.2119.xml'>
-<!ENTITY rfc3389 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.3389.xml'>
-<!ENTITY rfc3550 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.3550.xml'>
-<!ENTITY rfc3711 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.3711.xml'>
-<!ENTITY rfc3551 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.3551.xml'>
-<!ENTITY rfc6838 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.6838.xml'>
-<!ENTITY rfc4855 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.4855.xml'>
-<!ENTITY rfc4566 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.4566.xml'>
-<!ENTITY rfc4585 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.4585.xml'>
-<!ENTITY rfc3264 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.3264.xml'>
-<!ENTITY rfc2974 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.2974.xml'>
-<!ENTITY rfc2326 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.2326.xml'>
-<!ENTITY rfc3555 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.3555.xml'>
-<!ENTITY rfc5124 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.5124.xml'>
-<!ENTITY rfc5405 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.5405.xml'>
-<!ENTITY rfc5576 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.5576.xml'>
-<!ENTITY rfc6562 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.6562.xml'>
-<!ENTITY rfc6716 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.6716.xml'>
-<!ENTITY rfc7202 PUBLIC '' 'http://xml.resource.org/public/rfc/bibxml/reference.RFC.7202.xml'>
-<!ENTITY nbsp "&#160;">
-  ]>
-
-  <rfc category="std" ipr="trust200902" docName="draft-ietf-payload-rtp-opus-11">
-<?xml-stylesheet type='text/xsl' href='rfc2629.xslt' ?>
-
-<?rfc strict="yes" ?>
-<?rfc toc="yes" ?>
-<?rfc tocdepth="3" ?>
-<?rfc tocappendix='no' ?>
-<?rfc tocindent='yes' ?>
-<?rfc symrefs="yes" ?>
-<?rfc sortrefs="yes" ?>
-<?rfc compact="no" ?>
-<?rfc subcompact="yes" ?>
-<?rfc iprnotified="yes" ?>
-
-  <front>
-    <title abbrev="RTP Payload Format for Opus">
-      RTP Payload Format for the Opus Speech and Audio Codec
-    </title>
-
-    <author fullname="Julian Spittka" initials="J." surname="Spittka">
-      <address>
-        <email>jspittka@gmail.com</email>
-      </address>
-    </author>
-
-    <author initials='K.' surname='Vos' fullname='Koen Vos'>
-      <organization>vocTone</organization>
-      <address>
-        <postal>
-          <street></street>
-          <code></code>
-          <city></city>
-          <region></region>
-          <country></country>
-        </postal>
-        <email>koenvos74@gmail.com</email>
-      </address>
-    </author>
-
-    <author initials="JM" surname="Valin" fullname="Jean-Marc Valin">
-      <organization>Mozilla</organization>
-      <address>
-        <postal>
-          <street>331 E. Evelyn Avenue</street>
-          <city>Mountain View</city>
-          <region>CA</region>
-          <code>94041</code>
-          <country>USA</country>
-        </postal>
-        <email>jmvalin@jmvalin.ca</email>
-      </address>
-    </author>
-
-    <date day='14' month='April' year='2015' />
-
-    <abstract>
-      <t>
-        This document defines the Real-time Transport Protocol (RTP) payload
-        format for packetization of Opus encoded
-        speech and audio data necessary to integrate the codec in the
-        most compatible way. It also provides an applicability statement
-        for the use of Opus over RTP. Further, it describes media type registrations
-        for the RTP payload format.
-      </t>
-    </abstract>
-  </front>
-
-  <middle>
-    <section title='Introduction'>
-      <t>
-        Opus <xref target="RFC6716"/> is a speech and audio codec developed within the
-        IETF Internet Wideband Audio Codec working group. The codec
-        has a very low algorithmic delay and it
-        is highly scalable in terms of audio bandwidth, bitrate, and
-        complexity. Further, it provides different modes to efficiently encode speech signals
-        as well as music signals, thus making it the codec of choice for
-        various applications using the Internet or similar networks.
-      </t>
-      <t>
-        This document defines the Real-time Transport Protocol (RTP)
-        <xref target="RFC3550"/> payload format for packetization
-        of Opus encoded speech and audio data necessary to
-        integrate Opus in the
-        most compatible way. It also provides an applicability statement
-        for the use of Opus over RTP.
-        Further, it describes media type registrations for
-        the RTP payload format.
-      </t>
-    </section>
-
-    <section title='Conventions, Definitions and Acronyms used in this document'>
-      <t>The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
-      "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
-      document are to be interpreted as described in <xref target="RFC2119"/>.</t>
-      <t>
-      <list style='hanging'>
-          <t hangText="audio bandwidth:"> The range of audio frequecies being coded</t>
-          <t hangText="CBR:"> Constant bitrate</t>
-          <t hangText="CPU:"> Central Processing Unit</t>
-          <t hangText="DTX:"> Discontinuous transmission</t>
-          <t hangText="FEC:"> Forward error correction</t>
-          <t hangText="IP:"> Internet Protocol</t>
-          <t hangText="samples:"> Speech or audio samples (per channel)</t>
-          <t hangText="SDP:"> Session Description Protocol</t>
-          <t hangText="VBR:"> Variable bitrate</t>
-      </list>
-      </t>
-        <t>
-          Throughout this document, we refer to the following definitions:
-        </t>
-          <texttable anchor='bandwidth_definitions'>
-            <ttcol align='center'>Abbreviation</ttcol>
-            <ttcol align='center'>Name</ttcol>
-            <ttcol align='center'>Audio Bandwidth (Hz)</ttcol>
-            <ttcol align='center'>Sampling Rate (Hz)</ttcol>
-            <c>NB</c>
-            <c>Narrowband</c>
-            <c>0 - 4000</c>
-            <c>8000</c>
-
-            <c>MB</c>
-            <c>Mediumband</c>
-            <c>0 - 6000</c>
-            <c>12000</c>
-
-            <c>WB</c>
-            <c>Wideband</c>
-            <c>0 - 8000</c>
-            <c>16000</c>
-
-            <c>SWB</c>
-            <c>Super-wideband</c>
-            <c>0 - 12000</c>
-            <c>24000</c>
-
-            <c>FB</c>
-            <c>Fullband</c>
-            <c>0 - 20000</c>
-            <c>48000</c>
-
-            <postamble>
-              Audio bandwidth naming
-            </postamble>
-          </texttable>
-    </section>
-
-    <section title='Opus Codec'>
-      <t>
-        Opus encodes speech
-        signals as well as general audio signals. Two different modes can be
-        chosen, a voice mode or an audio mode, to allow the most efficient coding
-        depending on the type of the input signal, the sampling frequency of the
-        input signal, and the intended application.
-      </t>
-
-      <t>
-        The voice mode allows efficient encoding of voice signals at lower bit
-        rates while the audio mode is optimized for general audio signals at medium and
-        higher bitrates.
-      </t>
-
-      <t>
-        Opus is highly scalable in terms of audio
-        bandwidth, bitrate, and complexity. Further, Opus allows
-        transmitting stereo signals with in-band signaling in the bit-stream.
-      </t>
-
-      <section title='Network Bandwidth'>
-          <t>
-            Opus supports bitrates from 6&nbsp;kb/s to 510&nbsp;kb/s.
-            The bitrate can be changed dynamically within that range.
-            All
-            other parameters being
-            equal, higher bitrates result in higher audio quality.
-          </t>
-          <section title='Recommended Bitrate' anchor='bitrate_by_bandwidth'>
-          <t>
-            For a frame size of
-            20&nbsp;ms, these
-            are the bitrate "sweet spots" for Opus in various configurations:
-
-          <list style="symbols">
-            <t>8-12 kb/s for NB speech,</t>
-            <t>16-20 kb/s for WB speech,</t>
-            <t>28-40 kb/s for FB speech,</t>
-            <t>48-64 kb/s for FB mono music, and</t>
-            <t>64-128 kb/s for FB stereo music.</t>
-          </list>
-        </t>
-      </section>
-        <section title='Variable versus Constant Bitrate'  anchor='variable-vs-constant-bitrate'>
-          <t>
-            For the same average bitrate, variable bitrate (VBR) can achieve higher audio quality
-            than constant bitrate (CBR). For the majority of voice transmission applications, VBR
-            is the best choice. One reason for choosing CBR is the potential
-            information leak that <spanx style='emph'>might</spanx> occur when encrypting the
-            compressed stream. See <xref target="RFC6562"/> for guidelines on when VBR is
-            appropriate for encrypted audio communications. In the case where an existing
-            VBR stream needs to be converted to CBR for security reasons, then the Opus padding
-            mechanism described in <xref target="RFC6716"/> is the RECOMMENDED way to achieve padding
-            because the RTP padding bit is unencrypted.</t>
-
-          <t>
-            The bitrate can be adjusted at any point in time. To avoid congestion,
-            the average bitrate SHOULD NOT exceed the available
-            network bandwidth. If no target bitrate is specified, the bitrates specified in
-            <xref target='bitrate_by_bandwidth'/> are RECOMMENDED.
-          </t>
-
-        </section>
-
-        <section title='Discontinuous Transmission (DTX)'>
-
-          <t>
-            Opus can, as described in <xref target='variable-vs-constant-bitrate'/>,
-            be operated with a variable bitrate. In that case, the encoder will
-            automatically reduce the bitrate for certain input signals, like periods
-            of silence. When using continuous transmission, it will reduce the
-            bitrate when the characteristics of the input signal permit, but
-            will never interrupt the transmission to the receiver. Therefore, the
-            received signal will maintain the same high level of audio quality over the
-            full duration of a transmission while minimizing the average bit
-            rate over time.
-          </t>
-
-          <t>
-            In cases where the bitrate of Opus needs to be reduced even
-            further or in cases where only constant bitrate is available,
-            the Opus encoder can use discontinuous
-            transmission (DTX), where parts of the encoded signal that
-            correspond to periods of silence in the input speech or audio signal
-            are not transmitted to the receiver. A receiver can distinguish
-            between DTX and packet loss by looking for gaps in the sequence
-            number, as described by Section 4.1
-            of&nbsp;<xref target="RFC3551"/>.
-          </t>
-
-          <t>
-            On the receiving side, the non-transmitted parts will be handled by a
-            frame loss concealment unit in the Opus decoder which generates a
-            comfort noise signal to replace the non transmitted parts of the
-            speech or audio signal. Use of <xref target="RFC3389"/> Comfort
-            Noise (CN) with Opus is discouraged.
-            The transmitter MUST drop whole frames only,
-            based on the size of the last transmitted frame,
-            to ensure successive RTP timestamps differ by a multiple of 120 and
-            to allow the receiver to use whole frames for concealment.
-          </t>
-
-          <t>
-            DTX can be used with both variable and constant bitrate.
-            It will have a slightly lower speech or audio
-            quality than continuous transmission. Therefore, using continuous
-            transmission is RECOMMENDED unless constraints on available network bandwidth
-            are severe.
-          </t>
-
-        </section>
-
-        </section>
-
-      <section title='Complexity'>
-
-        <t>
-          Complexity of the encoder can be scaled to optimize for CPU resources in real-time, mostly as
-          a trade-off between audio quality and bitrate. Also, different modes of Opus have different complexity.
-        </t>
-
-      </section>
-
-      <section title="Forward Error Correction (FEC)">
-
-        <t>
-          The voice mode of Opus allows for embedding "in-band" forward error correction (FEC)
-          data into the Opus bit stream. This FEC scheme adds
-          redundant information about the previous packet (N-1) to the current
-          output packet N. For
-          each frame, the encoder decides whether to use FEC based on (1) an
-          externally-provided estimate of the channel's packet loss rate; (2) an
-          externally-provided estimate of the channel's capacity; (3) the
-          sensitivity of the audio or speech signal to packet loss; (4) whether
-          the receiving decoder has indicated it can take advantage of "in-band"
-          FEC information. The decision to send "in-band" FEC information is
-          entirely controlled by the encoder and therefore no special precautions
-          for the payload have to be taken.
-        </t>
-
-        <t>
-          On the receiving side, the decoder can take advantage of this
-          additional information when it loses a packet and the next packet
-          is available.  In order to use the FEC data, the jitter buffer needs
-          to provide access to payloads with the FEC data.  
-          Instead of performing loss concealment for a missing packet, the
-          receiver can then configure its decoder to decode the FEC data from the next packet.
-        </t>
-
-        <t>
-          Any compliant Opus decoder is capable of ignoring
-          FEC information when it is not needed, so encoding with FEC cannot cause
-          interoperability problems.
-          However, if FEC cannot be used on the receiving side, then FEC
-          SHOULD NOT be used, as it leads to an inefficient usage of network
-          resources. Decoder support for FEC SHOULD be indicated at the time a
-          session is set up.
-        </t>
-
-      </section>
-
-      <section title='Stereo Operation'>
-
-        <t>
-          Opus allows for transmission of stereo audio signals. This operation
-          is signaled in-band in the Opus bit-stream and no special arrangement
-          is needed in the payload format. An
-          Opus decoder is capable of handling a stereo encoding, but an
-          application might only be capable of consuming a single audio
-          channel.
-        </t>
-        <t>
-          If a decoder cannot take advantage of the benefits of a stereo signal
-          this SHOULD be indicated at the time a session is set up. In that case
-          the sending side SHOULD NOT send stereo signals as it leads to an
-          inefficient usage of network resources.
-        </t>
-
-      </section>
-
-    </section>
-
-    <section title='Opus RTP Payload Format' anchor='opus-rtp-payload-format'>
-      <t>The payload format for Opus consists of the RTP header and Opus payload
-      data.</t>
-      <section title='RTP Header Usage'>
-        <t>The format of the RTP header is specified in <xref target="RFC3550"/>.
-        The use of the fields of the RTP header by the Opus payload format is
-        consistent with that specification.</t>
-
-        <t>The payload length of Opus is an integer number of octets and
-        therefore no padding is necessary. The payload MAY be padded by an
-        integer number of octets according to <xref target="RFC3550"/>,
-        although the Opus internal padding is preferred.</t>
-
-        <t>The timestamp, sequence number, and marker bit (M) of the RTP header
-        are used in accordance with Section 4.1
-        of&nbsp;<xref target="RFC3551"/>.</t>
-
-        <t>The RTP payload type for Opus is to be assigned dynamically.</t>
-
-        <t>The receiving side MUST be prepared to receive duplicate RTP
-        packets. The receiver MUST provide at most one of those payloads to the
-        Opus decoder for decoding, and MUST discard the others.</t>
-
-        <t>Opus supports 5 different audio bandwidths, which can be adjusted during
-        a stream.
-        The RTP timestamp is incremented with a 48000 Hz clock rate
-        for all modes of Opus and all sampling rates.
-        The unit
-        for the timestamp is samples per single (mono) channel. The RTP timestamp corresponds to the
-        sample time of the first encoded sample in the encoded frame.
-        For data encoded with sampling rates other than 48000 Hz,
-	the sampling rate has to be adjusted to 48000 Hz.</t>
-
-      </section>
-
-      <section title='Payload Structure'>
-        <t>
-          The Opus encoder can output encoded frames representing 2.5, 5, 10, 20,
-          40, or 60&nbsp;ms of speech or audio data. Further, an arbitrary number of frames can be
-          combined into a packet, up to a maximum packet duration representing
-          120&nbsp;ms of speech or audio data. The grouping of one or more Opus
-          frames into a single Opus packet is defined in Section&nbsp;3 of
-          <xref target="RFC6716"/>. An RTP payload MUST contain exactly one
-          Opus packet as defined by that document.
-        </t>
-
-        <t><xref target='payload-structure'/> shows the structure combined with the RTP header.</t>
-
-        <figure anchor="payload-structure"
-                title="Packet structure with RTP header">
-          <artwork align="center">
-            <![CDATA[
-+----------+--------------+
-|RTP Header| Opus Payload |
-+----------+--------------+
-           ]]>
-          </artwork>
-        </figure>
-
-        <t>
-          <xref target='opus-packetization'/> shows supported frame sizes in
-          milliseconds of encoded speech or audio data for the speech and audio modes
-          (Mode) and sampling rates (fs) of Opus and shows how the timestamp is
-          incremented for packetization (ts incr). If the Opus encoder
-          outputs multiple encoded frames into a single packet, the timestamp
-          increment is the sum of the increments for the individual frames.
-        </t>
-
-        <texttable anchor='opus-packetization' title="Supported Opus frame
-         sizes and timestamp increments marked with an o. Unsupported marked with an x.">
-            <ttcol align='center'>Mode</ttcol>
-            <ttcol align='center'>fs</ttcol>
-            <ttcol align='center'>2.5</ttcol>
-            <ttcol align='center'>5</ttcol>
-            <ttcol align='center'>10</ttcol>
-            <ttcol align='center'>20</ttcol>
-            <ttcol align='center'>40</ttcol>
-            <ttcol align='center'>60</ttcol>
-            <c>ts incr</c>
-            <c>all</c>
-            <c>120</c>
-            <c>240</c>
-            <c>480</c>
-            <c>960</c>
-            <c>1920</c>
-            <c>2880</c>
-            <c>voice</c>
-            <c>NB/MB/WB/SWB/FB</c>
-            <c>x</c>
-            <c>x</c>
-            <c>o</c>
-            <c>o</c>
-            <c>o</c>
-            <c>o</c>
-            <c>audio</c>
-            <c>NB/WB/SWB/FB</c>
-            <c>o</c>
-            <c>o</c>
-            <c>o</c>
-            <c>o</c>
-            <c>x</c>
-            <c>x</c>
-          </texttable>
-
-      </section>
-
-    </section>
-
-    <section title='Congestion Control'>
-
-      <t>The target bitrate of Opus can be adjusted at any point in time, thus
-      allowing efficient congestion control. Furthermore, the amount
-      of encoded speech or audio data encoded in a
-      single packet can be used for congestion control, since the transmission
-      rate is inversely proportional to the packet duration. A lower packet
-      transmission rate reduces the amount of header overhead, but at the same
-      time increases latency and loss sensitivity, so it ought to be used with
-      care.</t>
-
-      <t>Since UDP does not provide congestion control, applications that use
-      RTP over UDP SHOULD implement their own congestion control above the
-      UDP layer <xref target="RFC5405"/>. Work in the rmcat working group
-      <xref target="rmcat"/> describes the
-      interactions and conceptual interfaces necessary between the application
-      components that relate to congestion control, including the RTP layer,
-      the higher-level media codec control layer, and the lower-level
-      transport interface, as well as components dedicated to congestion
-      control functions.</t>
-    </section>
-
-    <section title='IANA Considerations'>
-      <t>One media subtype (audio/opus) has been defined and registered as
-      described in the following section.</t>
-
-      <section title='Opus Media Type Registration'>
-        <t>Media type registration is done according to <xref
-        target="RFC6838"/> and <xref target="RFC4855"/>.<vspace
-        blankLines='1'/></t>
-
-          <t>Type name: audio<vspace blankLines='1'/></t>
-          <t>Subtype name: opus<vspace blankLines='1'/></t>
-
-          <t>Required parameters:</t>
-          <t><list style="hanging">
-            <t hangText="rate:"> the RTP timestamp is incremented with a
-            48000 Hz clock rate for all modes of Opus and all sampling
-            rates. For data encoded with sampling rates other than 48000 Hz,
-            the sampling rate has to be adjusted to 48000 Hz.
-          </t>
-          </list></t>
-
-          <t>Optional parameters:</t>
-
-          <t><list style="hanging">
-            <t hangText="maxplaybackrate:">
-              a hint about the maximum output sampling rate that the receiver is
-              capable of rendering in Hz.
-              The decoder MUST be capable of decoding
-              any audio bandwidth but due to hardware limitations only signals
-              up to the specified sampling rate can be played back. Sending signals
-              with higher audio bandwidth results in higher than necessary network
-              usage and encoding complexity, so an encoder SHOULD NOT encode
-              frequencies above the audio bandwidth specified by maxplaybackrate.
-              This parameter can take any value between 8000 and 48000, although
-              commonly the value will match one of the Opus bandwidths
-              (<xref target="bandwidth_definitions"/>).
-              By default, the receiver is assumed to have no limitations, i.e. 48000.
-              <vspace blankLines='1'/>
-            </t>
-
-            <t hangText="sprop-maxcapturerate:">
-              a hint about the maximum input sampling rate that the sender is likely to produce.
-              This is not a guarantee that the sender will never send any higher bandwidth
-              (e.g. it could send a pre-recorded prompt that uses a higher bandwidth), but it
-              indicates to the receiver that frequencies above this maximum can safely be discarded.
-              This parameter is useful to avoid wasting receiver resources by operating the audio
-              processing pipeline (e.g. echo cancellation) at a higher rate than necessary.
-              This parameter can take any value between 8000 and 48000, although
-              commonly the value will match one of the Opus bandwidths
-              (<xref target="bandwidth_definitions"/>).
-              By default, the sender is assumed to have no limitations, i.e. 48000.
-              <vspace blankLines='1'/>
-            </t>
-
-            <t hangText="maxptime:"> the maximum duration of media represented
-            by a packet (according to Section&nbsp;6 of
-            <xref target="RFC4566"/>) that a decoder wants to receive, in
-            milliseconds rounded up to the next full integer value.
-            Possible values are 3, 5, 10, 20, 40, 60, or an arbitrary
-            multiple of an Opus frame size rounded up to the next full integer
-            value, up to a maximum value of 120, as
-            defined in <xref target='opus-rtp-payload-format'/>. If no value is
-              specified, the default is 120.
-              <vspace blankLines='1'/></t>
-
-            <t hangText="ptime:"> the preferred duration of media represented
-            by a packet (according to Section&nbsp;6 of
-            <xref target="RFC4566"/>) that a decoder wants to receive, in
-            milliseconds rounded up to the next full integer value.
-            Possible values are 3, 5, 10, 20, 40, 60, or an arbitrary
-            multiple of an Opus frame size rounded up to the next full integer
-            value, up to a maximum value of 120, as defined in <xref
-            target='opus-rtp-payload-format'/>. If no value is
-              specified, the default is 20. 
-              <vspace blankLines='1'/></t>
-
-            <t hangText="maxaveragebitrate:"> specifies the maximum average
-            receive bitrate of a session in bits per second (b/s). The actual
-            value of the bitrate can vary, as it is dependent on the
-            characteristics of the media in a packet. Note that the maximum
-            average bitrate MAY be modified dynamically during a session. Any
-            positive integer is allowed, but values outside the range
-            6000 to 510000 SHOULD be ignored. If no value is specified, the
-            maximum value specified in <xref target='bitrate_by_bandwidth'/>
-            for the corresponding mode of Opus and corresponding maxplaybackrate
-            is the default.<vspace blankLines='1'/></t>
-
-            <t hangText="stereo:">
-              specifies whether the decoder prefers receiving stereo or mono signals.
-              Possible values are 1 and 0 where 1 specifies that stereo signals are preferred,
-              and 0 specifies that only mono signals are preferred.
-              Independent of the stereo parameter every receiver MUST be able to receive and
-              decode stereo signals but sending stereo signals to a receiver that signaled a
-              preference for mono signals may result in higher than necessary network
-              utilization and encoding complexity. If no value is specified,
-              the default is 0 (mono).<vspace blankLines='1'/>
-            </t>
-
-            <t hangText="sprop-stereo:">
-              specifies whether the sender is likely to produce stereo audio.
-              Possible values are 1 and 0, where 1 specifies that stereo signals are likely to
-              be sent, and 0 specifies that the sender will likely only send mono.
-              This is not a guarantee that the sender will never send stereo audio
-              (e.g. it could send a pre-recorded prompt that uses stereo), but it
-              indicates to the receiver that the received signal can be safely downmixed to mono.
-              This parameter is useful to avoid wasting receiver resources by operating the audio
-              processing pipeline (e.g. echo cancellation) in stereo when not necessary.
-              If no value is specified, the default is 0
-              (mono).<vspace blankLines='1'/>
-            </t>
-
-            <t hangText="cbr:">
-              specifies if the decoder prefers the use of a constant bitrate versus
-              variable bitrate. Possible values are 1 and 0, where 1 specifies constant
-              bitrate and 0 specifies variable bitrate. If no value is specified,
-              the default is 0 (vbr). When cbr is 1, the maximum average bitrate can still
-              change, e.g. to adapt to changing network conditions.<vspace blankLines='1'/>
-            </t>
-
-            <t hangText="useinbandfec:"> specifies that the decoder has the capability to
-            take advantage of the Opus in-band FEC. Possible values are 1 and 0.
-            Providing 0 when FEC cannot be used on the receiving side is
-            RECOMMENDED. If no
-            value is specified, useinbandfec is assumed to be 0.
-            This parameter is only a preference and the receiver MUST be able to process
-            packets that include FEC information, even if it means the FEC part is discarded.
-            <vspace blankLines='1'/></t>
-
-            <t hangText="usedtx:"> specifies if the decoder prefers the use of
-            DTX. Possible values are 1 and 0. If no value is specified, the
-            default is 0.<vspace blankLines='1'/></t>
-          </list></t>
-
-          <t>Encoding considerations:<vspace blankLines='1'/></t>
-          <t><list style="hanging">
-            <t>The Opus media type is framed and consists of binary data according
-            to Section&nbsp;4.8 in <xref target="RFC6838"/>.</t>
-          </list></t>
-
-          <t>Security considerations: </t>
-          <t><list style="hanging">
-            <t>See <xref target='security-considerations'/> of this document.</t>
-          </list></t>
-
-          <t>Interoperability considerations: none<vspace blankLines='1'/></t>
-	  <t>Published specification: RFC [XXXX]</t>
-	  <t>Note to the RFC Editor: Replace [XXXX] with the number of the published
-          RFC.<vspace blankLines='1'/></t>
-
-          <t>Applications that use this media type: </t>
-          <t><list style="hanging">
-            <t>Any application that requires the transport of
-            speech or audio data can use this media type. Some examples are,
-            but not limited to, audio and video conferencing, Voice over IP,
-            media streaming.</t>
-          </list></t>
-
-          <t>Fragment identifier considerations: N/A<vspace blankLines='1'/></t>
-
-          <t>Person &amp; email address to contact for further information:</t>
-          <t><list style="hanging">
-            <t>SILK Support silksupport@skype.net</t>
-            <t>Jean-Marc Valin jmvalin@jmvalin.ca</t>
-          </list></t>
-
-          <t>Intended usage: COMMON<vspace blankLines='1'/></t>
-
-          <t>Restrictions on usage:<vspace blankLines='1'/></t>
-
-          <t><list style="hanging">
-            <t>For transfer over RTP, the RTP payload format (<xref
-            target='opus-rtp-payload-format'/> of this document) SHALL be
-            used.</t>
-          </list></t>
-
-          <t>Author:</t>
-          <t><list style="hanging">
-            <t>Julian Spittka jspittka@gmail.com<vspace blankLines='1'/></t>
-            <t>Koen Vos koenvos74@gmail.com<vspace blankLines='1'/></t>
-            <t>Jean-Marc Valin jmvalin@jmvalin.ca<vspace blankLines='1'/></t>
-          </list></t>
-
-          <t> Change controller: IETF Payload Working Group delegated from the IESG</t>
-      </section>
-    </section>
-    
-    <section title='SDP Considerations'>
-        <t>The information described in the media type specification has a
-        specific mapping to fields in the Session Description Protocol (SDP)
-        <xref target="RFC4566"/>, which is commonly used to describe RTP
-        sessions. When SDP is used to specify sessions employing Opus,
-        the mapping is as follows:</t>
-
-        <t>
-          <list style="symbols">
-            <t>The media type ("audio") goes in SDP "m=" as the media name.</t>
-
-            <t>The media subtype ("opus") goes in SDP "a=rtpmap" as the encoding
-            name. The RTP clock rate in "a=rtpmap" MUST be 48000 and the number of
-            channels MUST be 2.</t>
-
-            <t>The OPTIONAL media type parameters "ptime" and "maxptime" are
-            mapped to "a=ptime" and "a=maxptime" attributes, respectively, in the
-            SDP.</t>
-
-            <t>The OPTIONAL media type parameters "maxaveragebitrate",
-            "maxplaybackrate", "stereo", "cbr", "useinbandfec", and
-            "usedtx", when present, MUST be included in the "a=fmtp" attribute
-            in the SDP, expressed as a media type string in the form of a
-            semicolon-separated list of parameter=value pairs (e.g.,
-            maxplaybackrate=48000). They MUST NOT be specified in an
-            SSRC-specific "fmtp" source-level attribute (as defined in
-            Section&nbsp;6.3 of&nbsp;<xref target="RFC5576"/>).</t>
-
-            <t>The OPTIONAL media type parameters "sprop-maxcapturerate",
-            and "sprop-stereo" MAY be mapped to the "a=fmtp" SDP attribute by
-            copying them directly from the media type parameter string as part
-            of the semicolon-separated list of parameter=value pairs (e.g.,
-            sprop-stereo=1). These same OPTIONAL media type parameters MAY also
-            be specified using an SSRC-specific "fmtp" source-level attribute
-            as described in Section&nbsp;6.3 of&nbsp;<xref target="RFC5576"/>.
-            They MAY be specified in both places, in which case the parameter
-            in the source-level attribute overrides the one found on the
-            "a=fmtp" line. The value of any parameter which is not specified in
-            a source-level source attribute MUST be taken from the "a=fmtp"
-            line, if it is present there.</t>
-
-          </list>
-        </t>
-
-        <t>Below are some examples of SDP session descriptions for Opus:</t>
-
-        <t>Example 1: Standard mono session with 48000 Hz clock rate</t>
-          <figure>
-            <artwork>
-              <![CDATA[
-    m=audio 54312 RTP/AVP 101
-    a=rtpmap:101 opus/48000/2
-              ]]>
-            </artwork>
-          </figure>
-
-
-        <t>Example 2: 16000 Hz clock rate, maximum packet size of 40 ms,
-        recommended packet size of 40 ms, maximum average bitrate of 20000 bps,
-        prefers to receive stereo but only plans to send mono, FEC is desired,
-        DTX is not desired</t>
-
-        <figure>
-          <artwork>
-            <![CDATA[
-    m=audio 54312 RTP/AVP 101
-    a=rtpmap:101 opus/48000/2
-    a=fmtp:101 maxplaybackrate=16000; sprop-maxcapturerate=16000;
-    maxaveragebitrate=20000; stereo=1; useinbandfec=1; usedtx=0
-    a=ptime:40
-    a=maxptime:40
-            ]]>
-          </artwork>
-        </figure>
-
-        <t>Example 3: Two-way full-band stereo preferred</t>
-
-        <figure>
-          <artwork>
-            <![CDATA[
-    m=audio 54312 RTP/AVP 101
-    a=rtpmap:101 opus/48000/2
-    a=fmtp:101 stereo=1; sprop-stereo=1
-            ]]>
-          </artwork>
-        </figure>
-
-
-      <section title='SDP Offer/Answer Considerations'>
-
-          <t>When using the offer-answer procedure described in <xref
-          target="RFC3264"/> to negotiate the use of Opus, the following
-          considerations apply:</t>
-
-          <t><list style="symbols">
-
-            <t>Opus supports several clock rates. For signaling purposes only
-            the highest, i.e. 48000, is used. The actual clock rate of the
-            corresponding media is signaled inside the payload and is not
-            restricted by this payload format description. The decoder MUST be
-            capable of decoding every received clock rate. An example
-            is shown below:
-
-            <figure>
-              <artwork>
-                <![CDATA[
-    m=audio 54312 RTP/AVP 100
-    a=rtpmap:100 opus/48000/2
-                ]]>
-              </artwork>
-            </figure>
-            </t>
-
-            <t>The "ptime" and "maxptime" parameters are unidirectional
-            receive-only parameters and typically will not compromise
-            interoperability; however, some values might cause application
-            performance to suffer. <xref
-            target="RFC3264"/> defines the SDP offer-answer handling of the
-            "ptime" parameter. The "maxptime" parameter MUST be handled in the
-            same way.</t>
-
-            <t>
-              The "maxplaybackrate" parameter is a unidirectional receive-only
-              parameter that reflects limitations of the local receiver. When
-              sending to a single destination, a sender MUST NOT use an audio
-              bandwidth higher than necessary to make full use of audio sampled at
-              a sampling rate of "maxplaybackrate". Gateways or senders that
-              are sending the same encoded audio to multiple destinations
-              SHOULD NOT use an audio bandwidth higher than necessary to
-              represent audio sampled at "maxplaybackrate", as this would lead
-              to inefficient use of network resources.
-              The "maxplaybackrate" parameter does not
-              affect interoperability. Also, this parameter SHOULD NOT be used
-              to adjust the audio bandwidth as a function of the bitrate, as this
-              is the responsibility of the Opus encoder implementation.
-            </t>
-
-            <t>The "maxaveragebitrate" parameter is a unidirectional receive-only
-            parameter that reflects limitations of the local receiver. The sender
-            of the other side MUST NOT send with an average bitrate higher than
-            "maxaveragebitrate" as it might overload the network and/or
-            receiver. The "maxaveragebitrate" parameter typically will not
-            compromise interoperability; however, some values might cause
-            application performance to suffer, and ought to be set with
-            care.</t>
-
-            <t>The "sprop-maxcapturerate" and "sprop-stereo" parameters are
-            unidirectional sender-only parameters that reflect limitations of
-            the sender side.
-            They allow the receiver to set up a reduced-complexity audio
-            processing pipeline if the  sender is not planning to use the full
-            range of Opus's capabilities.
-            Neither "sprop-maxcapturerate" nor "sprop-stereo" affect
-            interoperability and the receiver MUST be capable of receiving any signal.
-            </t>
-
-            <t>
-              The "stereo" parameter is a unidirectional receive-only
-              parameter. When sending to a single destination, a sender MUST
-              NOT use stereo when "stereo" is 0. Gateways or senders that are
-              sending the same encoded audio to multiple destinations SHOULD
-              NOT use stereo when "stereo" is 0, as this would lead to
-              inefficient use of network resources. The "stereo" parameter does
-              not affect interoperability.
-            </t>
-
-            <t>
-              The "cbr" parameter is a unidirectional receive-only
-              parameter.
-            </t>
-
-            <t>The "useinbandfec" parameter is a unidirectional receive-only
-            parameter.</t>
-
-            <t>The "usedtx" parameter is a unidirectional receive-only
-            parameter.</t>
-
-            <t>Any unknown parameter in an offer MUST be ignored by the receiver
-            and MUST be removed from the answer.</t>
-
-          </list></t>
-      
-        <t>
-	  The Opus parameters in an SDP Offer/Answer exchange are completely
-          orthogonal, and there is no relationship between the SDP Offer and
-          the Answer.
-        </t>
-      </section>
-
-      <section title='Declarative SDP Considerations for Opus'>
-
-        <t>For declarative use of SDP such as in Session Announcement Protocol
-        (SAP), <xref target="RFC2974"/>, and RTSP, <xref target="RFC2326"/>, for
-        Opus, the following needs to be considered:</t>
-
-        <t><list style="symbols">
-
-          <t>The values for "maxptime", "ptime", "maxplaybackrate", and
-          "maxaveragebitrate" ought to be selected carefully to ensure that a
-          reasonable performance can be achieved for the participants of a session.</t>
-
-          <t>
-            The values for "maxptime", "ptime", and of the payload
-            format configuration are recommendations by the decoding side to ensure
-            the best performance for the decoder.
-          </t>
-
-          <t>All other parameters of the payload format configuration are declarative
-          and a participant MUST use the configurations that are provided for
-          the session. More than one configuration can be provided if necessary
-          by declaring multiple RTP payload types; however, the number of types
-          ought to be kept small.</t>
-        </list></t>
-      </section>
-  </section>
-
-    <section title='Security Considerations' anchor='security-considerations'>
-
-      <t>Use of variable bitrate (VBR) is subject to the security considerations in
-      <xref target="RFC6562"/>.</t>
-
-      <t>RTP packets using the payload format defined in this specification
-      are subject to the security considerations discussed in the RTP
-      specification <xref target="RFC3550"/>, and in any applicable RTP profile such as
-      RTP/AVP <xref target="RFC3551"/>, RTP/AVPF <xref target="RFC4585"/>,
-      RTP/SAVP <xref target="RFC3711"/> or RTP/SAVPF <xref target="RFC5124"/>.
-      However, as "Securing the RTP Protocol Framework:
-      Why RTP Does Not Mandate a Single Media Security Solution"
-      <xref target="RFC7202"/> discusses, it is not an RTP payload
-      format's responsibility to discuss or mandate what solutions are used
-      to meet the basic security goals like confidentiality, integrity and
-      source authenticity for RTP in general.  This responsibility lays on
-      anyone using RTP in an application.  They can find guidance on
-      available security mechanisms and important considerations in Options
-      for Securing RTP Sessions [I-D.ietf-avtcore-rtp-security-options].
-      Applications SHOULD use one or more appropriate strong security
-      mechanisms.</t>
-
-      <t>This payload format and the Opus encoding do not exhibit any
-      significant non-uniformity in the receiver-end computational load and thus
-      are unlikely to pose a denial-of-service threat due to the receipt of
-      pathological datagrams.</t>
-    </section>
-
-    <section title='Acknowledgements'>
-    <t>Many people have made useful comments and suggestions contributing to this document. 
-      In particular, we would like to thank
-      Tina le Grand, Cullen Jennings, Jonathan Lennox, Gregory Maxwell, Colin Perkins, Jan Skoglund,
-      Timothy B. Terriberry, Martin Thompson, Justin Uberti, Magnus Westerlund, and Mo Zanaty.</t>
-    </section>
-  </middle>
-
-  <back>
-    <references title="Normative References">
-      &rfc2119;
-      &rfc3389;
-      &rfc3550;
-      &rfc3711;
-      &rfc3551;
-      &rfc6838;
-      &rfc4855;
-      &rfc4566;
-      &rfc3264;
-      &rfc2326;
-      &rfc5576;
-      &rfc6562;
-      &rfc6716;
-    </references>
-
-    <references title="Informative References">
-      &rfc2974;
-      &rfc4585;
-      &rfc5124;
-      &rfc5405;
-      &rfc7202;
-      
-      <reference anchor='rmcat' target='https://datatracker.ietf.org/wg/rmcat/documents/'>
-        <front>
-          <title>rmcat documents</title>
-          <author/>
-          <date/>
-          <abstract>
-            <t></t>
-          </abstract></front>
-      </reference>
-
-
-    </references>
-
-  </back>
-</rfc>
diff --git a/doc/meson.build b/doc/meson.build
index ee42a2b02..80bed50c3 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -1,7 +1,7 @@
 have_dot = find_program('dot', required: false).found()
 
 doxyfile_conf = configuration_data()
-doxyfile_conf.set('VERSION', opus_version)
+doxyfile_conf.set('VERSION', oac_version)
 doxyfile_conf.set('HAVE_DOT', have_dot)
 doxyfile_conf.set('top_srcdir', top_srcdir)
 doxyfile_conf.set('top_builddir', top_builddir)
@@ -17,12 +17,12 @@ doc_inputs = [
   'customdoxygen.css',
   'footer.html',
   'header.html',
-  'opus_logo.svg',
-  top_srcdir + '/include/opus.h',
-  top_srcdir + '/include/opus_multistream.h',
-  top_srcdir + '/include/opus_defines.h',
-  top_srcdir + '/include/opus_types.h',
-  top_srcdir + '/include/opus_custom.h',
+  'oac_logo.svg',
+  top_srcdir + '/include/oac.h',
+  top_srcdir + '/include/oac_multistream.h',
+  top_srcdir + '/include/oac_defines.h',
+  top_srcdir + '/include/oac_types.h',
+  top_srcdir + '/include/oac_custom.h',
 ]
 
 custom_target('doc',
diff --git a/doc/opus_in_isobmff.css b/doc/opus_in_isobmff.css
deleted file mode 100644
index bffe8f45a..000000000
--- a/doc/opus_in_isobmff.css
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Normal links */
-.normal_link a:link
-{
-    color : yellow;
-}
-.normal_link a:visited
-{
-    color : green;
-}
-
-/* Boxes */
-.pre
-{
-	white-space: pre;           /* CSS 2.0 */
-	white-space: pre-wrap;      /* CSS 2.1 */
-	white-space: -pre-wrap;     /* Opera 4-6 */
-	white-space: -o-pre-wrap;   /* Opera 7 */
-	white-space: -moz-pre-wrap; /* Mozilla */
-	white-space: -hp-pre-wrap;  /* HP Printers */
-	word-wrap  : break-word;    /* IE 5+ */
-}
-
-.title_box
-{
-    width            : 470px;
-    height           : 70px;
-    margin           : 2px 50px 2px 2px;
-    padding          : 10px;
-    border           : 1px solid black;
-    background-color : #666666;
-    white-space      : pre;
-    float            : left;
-    text-align       : center;
-    color            : #C0C0C0;
-    font-size        : 50pt;
-    font-style       : italic;
-}
-
-.subindex_box
-{
-    margin           : 5px;
-    padding          : 14px 22px;
-    border           : 1px solid black;
-    background-color : #778877;
-    float            : left;
-    text-align       : center;
-    color            : #115555;
-    font-size        : 32pt;
-}
-
-.frame_box
-{
-    margin           : 10px;
-    padding          : 10px;
-    border           : 0px;
-    background-color : #084040;
-    text-align       : left;
-    color            : #C0C0C0;
-    font-family      : monospace;
-}
diff --git a/doc/opus_in_isobmff.html b/doc/opus_in_isobmff.html
deleted file mode 100644
index 2294f4d8a..000000000
--- a/doc/opus_in_isobmff.html
+++ /dev/null
@@ -1,692 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-    <head>
-        <link rel="stylesheet" type="text/css" href="opus_in_isobmff.css"/>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-        <title>Encapsulation of Opus in ISO Base Media File Format</title>
-    </head>
-    <body bgcolor="0x333333" text="#60B0C0">
-        <b><u>Encapsulation of Opus in ISO Base Media File Format</u></b><br>
-        <font size="2">last updated: August 28, 2018</font><br>
-        <br>
-        <div class="normal_link pre frame_box">
-
-                                Encapsulation of Opus in ISO Base Media File Format
-                                        Version 1.0.0
-
-
-Table of Contents
-<a href="#1">1</a> Scope
-<a href="#2">2</a> Normative References
-<a href="#3">3</a> Terms and Definitions
-<a href="#4">4</a> Design Rules of Encapsulation
-    <a href="#4.1">4.1</a> File Type Identification
-    <a href="#4.2">4.2</a> Overview of Track Structure
-    <a href="#4.3">4.3</a> Definitions of Opus sample
-        <a href="#4.3.1">4.3.1</a> Sample entry format
-        <a href="#4.3.2">4.3.2</a> Opus Specific Box
-        <a href="#4.3.3">4.3.3</a> Sample format
-        <a href="#4.3.4">4.3.4</a> Duration of Opus sample
-        <a href="#4.3.5">4.3.5</a> Sub-sample
-        <a href="#4.3.6">4.3.6</a> Random Access
-            <a href="#4.3.6.1">4.3.6.1</a> Random Access Point
-            <a href="#4.3.6.2">4.3.6.2</a> Pre-roll
-    <a href="#4.4">4.4</a> Trimming of Actual Duration
-    <a href="#4.5">4.5</a> Channel Mapping
-        <a href="#4.5.1">4.5.1</a> ISO Base Media native Channel Mapping
-        <a href="#4.5.2">4.5.2</a> Composition on all active tracks (informative)
-    <a href="#4.6">4.6</a> Basic Structure (informative)
-        <a href="#4.6.1">4.6.2</a> Initial Movie
-        <a href="#4.6.2">4.6.3</a> Movie Fragments
-    <a href="#4.7">4.7</a> Example of Encapsulation (informative)
-<a href="#5">5</a> Author's Address
-
-<a name="1"></a>
-1 Scope
-    This specification specifies the fundamental way of the encapsulation of Opus coded bitstreams in ISO Base Media
-    file format and its derivatives. The encapsulation of Opus coded bitstreams in QuickTime file format is outside
-    the scope of this specification.
-
-<a name="2"></a>
-2 Normative References
-    [1] ISO/IEC 14496-12:2015 Corrected version
-        Information technology — Coding of audio-visual objects — Part 12: ISO base media file format
-
-    [2] RFC 6716
-        Definition of the Opus Audio Codec
-
-    [3] RFC 7845
-        Ogg Encapsulation for the Opus Audio Codec
-
-<a name="3"></a>
-3 Terms and Definitions
-    3.1 active track
-        enabled track from the non-alternate group or selected track from alternate group
-
-    3.2 actual duration
-        duration constructed from valid samples
-
-    3.3 edit
-        entry in the Edit List Box
-
-    3.4 padded samples
-        PCM samples after decoding Opus sample(s) which are not valid samples
-        An Opus bitstream always contains them partially at the beginning and may contain them in part at the end, as
-        long as not physically removed yet at the beginning and/or the end.
-
-    3.5 priming samples
-        padded samples at the beginning of the Opus bitstream
-
-    3.6 sample-accurate
-        for any PCM sample, a timestamp exactly matching its sampling timestamp is present in the media timeline.
-
-    3.7 valid samples
-        PCM samples after decoding Opus sample(s) corresponding to input PCM samples
-
-<a name="4"></a>
-4 Design Rules of Encapsulation
-    4.1 File Type Identification<a name="4.1"></a>
-        This specification defines the brand 'Opus' to declare files are conformant to this specification. Additionally,
-        files conformant to this specification shall contain at least one brand, which supports the requirements and the
-        requirements described in this clause without contradiction, in the compatible brands list of the File Type Box.
-        As an example, the minimal support of the encapsulation of Opus bitstreams in ISO Base Media file format requires
-        the 'iso2' brand in the compatible brands list since support of roll groups is required.
-<a name="4.2"></a>
-    4.2 Overview of Track Structure
-        This clause summarizes requirements of the encapsulation of Opus coded bitstream as media data in audio tracks
-        in file formats compliant with the ISO Base Media File Format. The details are described in clauses after this
-        clause.
-            + The handler_type field in the Handler Reference Box shall be set to 'soun'.
-            + The Media Information Box shall contain the Sound Media Header Box.
-            + The codingname of the sample entry is 'Opus'.
-                This specification does not define any encapsulation using MP4AudioSampleEntry with objectTypeIndication
-                specified by the MPEG-4 Registration Authority (http://www.mp4ra.org/).
-                See 4.3.1 Sample entry format to get the details about the sample entry.
-            + The 'dOps' box is added to the sample entry to convey initializing information for the decoder.
-                See 4.3.2 Opus Specific Box to get the details.
-            + An Opus sample is exactly one Opus packet for each of different Opus bitstreams.
-                See 4.3.3 Sample format to get the details.
-            + Every Opus sample is a sync sample but requires pre-roll for every random access to get correct output.
-                See 4.3.6 Random Access to get the details.
-<a name="4.3"></a>
-    4.3 Definitions of Opus sample
-        4.3.1 Sample entry format<a name="4.3.1"></a>
-            For any track containing Opus bitstreams, at least one sample entry describing corresponding Opus bitstream
-            shall be present inside the Sample Table Box. This version of the specification defines only one sample
-            entry format named OpusSampleEntry whose codingname is 'Opus'. This sample entry includes exactly one Opus
-            Specific Box defined in 4.3.2 as a mandatory box and indicates that Opus samples described by this sample
-            entry are stored by the sample format described in 4.3.3.
-
-            The syntax and semantics of the OpusSampleEntry is shown as follows.
-
-            class OpusSampleEntry() extends AudioSampleEntry ('Opus') {
-                OpusSpecificBox();
-            }
-
-            + channelcount:
-                The channelcount field indicates the number of output channels and shall be set to the same value of
-                the OutputChannelCount in the OpusDecoderConfigurationRecord. The value of this field may be used in
-                the ChannelLayout if any as described in 4.5.1.
-            + samplesize:
-                The samplesize field shall be set to 16.
-            + samplerate:
-                The samplerate field shall be set to 48000&lt&lt16.
-            + OpusSpecificBox
-                This box contains initializing information for the decoder as defined in 4.3.2.
-
-        4.3.2 Opus Specific Box<a name="4.3.2"></a>
-            Exactly one Opus Specific Box shall be present in each OpusSampleEntry.
-            The Opus Specific Box contains an OpusDecoderConfigurationRecord which contains the Version field and
-            this specification defines version 0 of this record. If incompatible changes occured in the fields after
-            the Version field within the OpusDecoderConfigurationRecord in the future versions of this specification,
-            another version will be defined.
-            This box refers to Ogg Opus [3] at many parts but all the data are stored as big-endian format.
-
-            The syntax and semantics of the Opus Specific Box is shown as follows.
-
-            class ChannelMappingTable (unsigned int(8) OutputChannelCount) {
-                unsigned int(8) StreamCount;
-                unsigned int(8) CoupledCount;
-                unsigned int(8 * OutputChannelCount) ChannelMapping;
-            }
-
-            aligned(8) class OpusDecoderConfigurationRecord {
-                unsigned int(8) Version;
-                unsigned int(8) OutputChannelCount;
-                unsigned int(16) PreSkip;
-                unsigned int(32) InputSampleRate;
-                signed int(16) OutputGain;
-                unsigned int(8) ChannelMappingFamily;
-                if (ChannelMappingFamily != 0) {
-                    ChannelMappingTable(OutputChannelCount);
-                }
-            }
-
-            class OpusSpecificBox extends Box('dOps') {
-                OpusDecoderConfigurationRecord() OpusConfig;
-            }
-
-            + Version:
-                The Version field shall be set to 0.
-                In the future versions of this specification, this field may be set to other values. And without support
-                of those values, the reader shall not read the fields after this within the OpusSpecificBox.
-            + OutputChannelCount:
-                The OutputChannelCount field shall be set to the same value as the *Output Channel Count* field in the
-                identification header defined in Ogg Opus [3].
-            + PreSkip:
-                The PreSkip field indicates the number of the priming samples, that is, the number of samples at 48000 Hz
-                to discard from the decoder output when starting playback. The value of the PreSkip field shall be at least
-                80 milliseconds' worth of PCM samples even when removing any number of Opus samples which may or may not
-                contain the priming samples. The PreSkip field is not used for discarding the priming samples at the whole
-                playback at all since it is informative only, and that task falls on the Edit List Box.
-            + InputSampleRate:
-                The InputSampleRate field shall be set to the same value as the *Input Sample Rate* field in the
-                identification header defined in Ogg Opus [3].
-            + OutputGain:
-                The OutputGain field shall be set to the same value as the *Output Gain* field in the identification
-                header define in Ogg Opus [3]. Note that the value is stored as 8.8 fixed-point.
-            + ChannelMappingFamily:
-                The ChannelMappingFamily field shall be set to the same value as the *Channel Mapping Family* field in
-                the identification header defined in Ogg Opus [3]. Note that the value 255 may be used for an alternative
-                to map channels by ISO Base Media native mapping. The details are described in 4.5.1.
-            + StreamCount:
-                The StreamCount field shall be set to the same value as the *Stream Count* field in the identification
-                header defined in Ogg Opus [3].
-            + CoupledCount:
-                The CoupledCount field shall be set to the same value as the *Coupled Count* field in the identification
-                header defined in Ogg Opus [3].
-            + ChannelMapping:
-                The ChannelMapping field shall be set to the same octet string as *Channel Mapping* field in the identi-
-                fication header defined in Ogg Opus [3].
-
-        4.3.3 Sample format<a name="4.3.3"></a>
-            An Opus sample is exactly one Opus packet for each of different Opus bitstreams. Due to support more than
-            two channels, an Opus sample can contain frames from multiple Opus bitstreams but all Opus packets shall
-            share with the total of frame sizes in a single Opus sample. The way of how to pack an Opus packet from
-            each of Opus bitstreams into a single Opus sample follows Appendix B. in RFC 6716 [2].
-            The endianness has nothing to do with any Opus sample since every Opus packet is processed byte-by-byte.
-            In this specification, 'sample' means 'Opus sample' except for 'padded samples', 'priming samples', 'valid
-            sample' and 'sample-accurate', i.e. 'sample' is 'sample' in the term defined in ISO/IEC 14496-12 [1].
-
-                +-----------------------------------------+-------------------------------------+
-                | Opus packet 0 (self-delimiting framing) | Opus packet 1 (undelimited framing) |
-                +-----------------------------------------+-------------------------------------+
-                |<---------------------------- the size of Opus sample ------------------------>|
-
-                    Figure 1 - Example structure of an Opus sample containing two Opus bitstreams
-
-        4.3.4 Duration of Opus sample<a name="4.3.4"></a>
-            The duration of Opus sample is given by multiplying the total of frame sizes for a single Opus bitstream
-            expressed in seconds by the value of the timescale field in the Media Header Box.
-            Let's say an Opus sample consists of two Opus bitstreams, where the frame size of one bitstream is 40 milli-
-            seconds and the frame size of another is 60 milliseconds, and the timescale field in the Media Header Box
-            is set to 48000, then the duration of that Opus sample shall be 120 milliseconds since three 40 millisecond
-            frame and two 60 millisecond frames shall be contained because of the maximum duration of Opus packet, 120
-            milliseconds, and 5760 in the timescale indicated in the Media Header Box.
-
-            To indicate the valid samples excluding the padded samples at the end of Opus bitstream, the duration of
-            the last Opus sample of an Opus bitstream is given by multiplying the number of the valid samples by the
-            value produced by dividing the value of the timescale field in the Media Header Box by 48000.
-
-        4.3.5 Sub-sample<a name="4.3.5"></a>
-            The structure of the last Opus packet in an Opus sample is different from the others in the same Opus sample,
-            and the others are invalid Opus packets as an Opus sample because of self-delimiting framing. To avoid
-            complexities, sub-sample is not defined for Opus sample in this specification.
-
-        4.3.6 Random Access<a name="4.3.6"></a>
-            This subclause describes the nature of the random access of Opus sample.
-
-            4.3.6.1 Random Access Point<a name="4.3.6.1"></a>
-                All Opus samples can be independently decoded i.e. every Opus sample is a sync sample. Therefore, the
-                Sync Sample Box shall not be present as long as there are no samples other than Opus samples in the same
-                track. And the sample_is_non_sync_sample field for Opus samples shall be set to 0.
-
-            4.3.6.2 Pre-roll<a name="4.3.6.2"></a>
-                Opus bitstream requires at least 80 millisecond pre-roll after each random access to get correct output.
-                Pre-roll is indicated by the roll_distance field in AudioRollRecoveryEntry. AudioPreRollEntry shall not
-                be used since every Opus sample is a sync sample in Opus bitstream. Note that roll_distance is expressed
-                in sample units in a term of ISO Base Media File Format, and always takes negative values.
-
-                For any track containing Opus bitstreams, at least one Sample Group Description Box and at least one
-                Sample to Group Box within the Sample Table Box shall be present and these have the grouping_type field
-                set to 'roll'. If any Opus sample is contained in a track fragment, the Sample to Group Box with the
-                grouping_type field set to 'roll' shall be present for that track fragment.
-
-                For the requirement of AudioRollRecoveryEntry, the compatible_brands field in the File Type Box shall
-                contain at least one brand which requires support for roll groups.
-<a name="4.4"></a>
-    4.4 Trimming of Actual Duration
-        Due to the priming samples (or the padding at the beginning) derived from the pre-roll for the startup and the
-        padded samples at the end, we need trim from media to get the actual duration. An edit in the Edit List Box can
-        achieve this demand, and the Edit Box and the Edit List Box shall be present.
-
-        For sample-accurate trimming, proper timescale should be set to the timescale field in the Movie Header Box
-        and the Media Header Box inside Track Box(es) for Opus bitstream. The timescale field in the Media Header Box is
-        typically set to 48000. It is recommended that the timescale field in the Movie Header Box be set to the same
-        value of the timescale field in the Media Header Box in order to avoid the rounding problem when specifying
-        duration of edit if the timescales in all of the Media Header Boxes are set to the same value.
-
-        For example, to indicate the actual duration of an Opus bitstream in a track with the timescale fields of both
-        the Movie Header Box and the Media Header Box set to 48000, we would use the following edit:
-            segment_duration = the number of the valid samples
-            media_time = the number of the priming samples
-            media_rate = 1 &lt&lt 16
-
-        The Edit List Box is applied to whole movie including all movie fragments. Therefore, it is impossible to tell
-        the actual duration in the case producing movie fragments on the fly such as live-streaming. In such cases,
-        the duration of the last Opus sample may be helpful by setting zero to the segment_duration field since the
-        value 0 represents implicit duration equal to the sum of the duration of all samples.
-<a name="4.5"></a>
-    4.5 Channel Mapping
-        4.5.1 ISO Base Media native Channel Mapping<a name="4.5.1"></a>
-            ISO Base Media File Format, that is ISO/IEC 14496-12 [1], defines an extension ChannelLayout to the
-            AudioSampleEntry, which conveys information of mapping channels to loudspeaker positions. The ChannelLayout
-            enables to specify the channel layout more flexibly than the predefined layouts of the ChannelMappingFamily.
-
-            To utilize the ChannelLayout for OpusSampleEntry, the ChannelMappingFamily field should be set to 255.
-            Even when the ChannelMappingFamily field is set to another value, the assignment of each output channel to
-            loudspeaker position specified by the ChannelMappingFamily would be changed as specified by the ChannelLayout.
-            The procedure of the assignment is the following.
-
-                1. Decoded channels are mapped to output channels according to the ChannelMappingTable.
-                2. Output channels are mapped to loudspeaker positions according to the ChannelLayout.
-
-            In this way, the parameters of the Opus Specific Box are processed before the ChannelLayout, and the
-            ChannelLayout shall follow the Opus Specific Box.
-
-        4.5.2 Composition on all active tracks (informative)<a name="4.5.2"></a>
-            By the application of alternate_group in the Track Header Box, whole audio channels in all active tracks from
-            non-alternate group and/or different alternate group from each other are composited into the presentation. If
-            an Opus sample consists of multiple Opus bitstreams, it can be splitted into individual Opus bitstreams and
-            reconstructed into new Opus samples as long as every Opus bitstream has the same total duration in each Opus
-            sample. This nature can be utilized to encapsulate a single Opus bitstream in each track without breaking the
-            original channel layout.
-
-            As an example, let's say there is a following track:
-                OutputChannelCount = 6;
-                StreamCount        = 4;
-                CoupledCount       = 2;
-                ChannelMapping     = {0, 4, 1, 2, 3, 5}; // front left, front center, front right,
-                                                         // rear left, rear right, LFE
-            Here, to couple front left to front right channels into the first stream, and couple rear left to rear right
-            channels into the second stream, reordering is needed since coupled streams must precede any non-coupled
-            stream. You extract the four Opus bitstreams from this track and you encapsulate two of the four into a track
-            and the others into another track. The former track is as follows.
-                OutputChannelCount = 6;
-                StreamCount        = 2;
-                CoupledCount       = 2;
-                ChannelMapping     = {0, 255, 1, 2, 3, 255}; // front left, front center, front right,
-                                                             // rear left, rear right, LFE
-            And the latter track is as follows.
-                OutputChannelCount = 6;
-                StreamCount        = 2;
-                CoupledCount       = 0;
-                ChannelMapping     = {255, 0, 255, 255, 255, 1}; // front left, front center, front right,
-                                                                 // rear left, rear right, LFE
-            In addition, the value of the alternate_group field in the both tracks is set to 0. As the result, the player
-            may play as if channels with 255 are not present, and play the presentation constructed from the both tracks
-            in the same channel layout as the one of the original track. Keep in mind that the way of the composition, i.e.
-            the mixing for playback, is not defined here, and maybe different results could occur except for the channel
-            layout of the original, depending on an implementation or the definition of a derived file format.
-
-            Note that some derived file formats may specify the restriction to ignore alternate grouping. In the context
-            of such file formats, this application is not available. This unavailability does not mean incompatibilities
-            among file formats unless the restriction to the value of the alternate_group field is specified and brings
-            about any conflict among their definitions.
-<a name="4.6"></a>
-    4.6 Basic Structure (informative)
-        4.6.1 Initial Movie<a name="4.6.1"></a>
-            This subclause shows a basic structure of the Movie Box as follows:
-
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |moov|    |    |    |    |    |    |    | Movie Box                    |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |mvhd|    |    |    |    |    |    | Movie Header Box             |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |trak|    |    |    |    |    |    | Track Box                    |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |tkhd|    |    |    |    |    | Track Header Box             |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |edts|    |    |    |    |    | Edit Box                     |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |    |elst|    |    |    |    | Edit List Box                |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |mdia|    |    |    |    |    | Media Box                    |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |    |mdhd|    |    |    |    | Media Header Box             |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |    |hdlr|    |    |    |    | Handler Reference Box        |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |    |minf|    |    |    |    | Media Information Box        |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |    |    |smhd|    |    |    | Sound Media Header Box       |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |    |    |dinf|    |    |    | Data Information Box         |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |    |    |    |dref|    |    | Data Reference Box           |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |    |    |    |    |url |    | DataEntryUrlBox              |
-            +----+----+----+----+----+----+ or +----+------------------------------+
-            |    |    |    |    |    |    |urn |    | DataEntryUrnBox              |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |    |    |stbl|    |    |    | Sample Table                 |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |    |    |    |stsd|    |    | Sample Description Box       |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |    |    |    |    |Opus|    | OpusSampleEntry              |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |    |    |    |    |    |dOps| Opus Specific Box            |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |    |    |    |stts|    |    | Decoding Time to Sample Box  |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |    |    |    |stsc|    |    | Sample To Chunk Box          |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |    |    |    |stsz|    |    | Sample Size Box              |
-            +----+----+----+----+----+ or +----+----+------------------------------+
-            |    |    |    |    |    |stz2|    |    | Compact Sample Size Box      |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |    |    |    |stco|    |    | Chunk Offset Box             |
-            +----+----+----+----+----+ or +----+----+------------------------------+
-            |    |    |    |    |    |co64|    |    | Chunk Large Offset Box       |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |    |    |    |sgpd|    |    | Sample Group Description Box |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |    |    |    |sbgp|    |    | Sample to Group Box          |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |mvex|*   |    |    |    |    |    | Movie Extends Box            |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |trex|*   |    |    |    |    | Track Extends Box            |
-            +----+----+----+----+----+----+----+----+------------------------------+
-
-                    Figure 2 - Basic structure of Movie Box
-
-            It is strongly recommended that the order of boxes should follow the above structure.
-            Boxes marked with an asterisk (*) may be present.
-            For most boxes listed above, the definition is as is defined in ISO/IEC 14496-12 [1]. The additional boxes
-            and the additional requirements, restrictions and recommendations to the other boxes are described in this
-            specification.
-
-        4.6.2 Movie Fragments<a name="4.6.2"></a>
-            This subclause shows a basic structure of the Movie Fragment Box as follows:
-
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |moof|    |    |    |    |    |    |    | Movie Fragment Box           |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |mfhd|    |    |    |    |    |    | Movie Fragment Header Box    |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |traf|    |    |    |    |    |    | Track Fragment Box           |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |tfhd|    |    |    |    |    | Track Fragment Header Box    |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |trun|    |    |    |    |    | Track Fragment Run Box       |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |sgpd|*   |    |    |    |    | Sample Group Description Box |
-            +----+----+----+----+----+----+----+----+------------------------------+
-            |    |    |sbgp|    |    |    |    |    | Sample to Group Box          |
-            +----+----+----+----+----+----+----+----+------------------------------+
-
-                    Figure 3 - Basic structure of Movie Fragment Box
-
-            It is strongly recommended that the Movie Fragment Header Box and the Track Fragment Header Box be
-            placed first in their container.
-            Boxes marked with an asterisk (*) may be present.
-            For the boxes listed above, the definition is as is defined in ISO/IEC 14496-12 [1].
-<a name="4.7"></a>
-    4.7 Example of Encapsulation (informative)
-        [File]
-            size = 17757
-            [ftyp: File Type Box]
-                position = 0
-                size = 24
-                major_brand = Opus : Opus audio coding
-                minor_version = 0
-                compatible_brands
-                    brand[0] = Opus : Opus audio coding
-                    brand[1] = iso2 : ISO Base Media file format version 2
-            [moov: Movie Box]
-                position = 24
-                size = 757
-                [mvhd: Movie Header Box]
-                    position = 32
-                    size = 108
-                    version = 0
-                    flags = 0x000000
-                    creation_time = UTC 2014/12/12, 18:41:19
-                    modification_time = UTC 2014/12/12, 18:41:19
-                    timescale = 48000
-                    duration = 33600 (00:00:00.700)
-                    rate = 1.000000
-                    volume = 1.000000
-                    reserved = 0x0000
-                    reserved = 0x00000000
-                    reserved = 0x00000000
-                    transformation matrix
-                        | a, b, u |   | 1.000000, 0.000000, 0.000000 |
-                        | c, d, v | = | 0.000000, 1.000000, 0.000000 |
-                        | x, y, w |   | 0.000000, 0.000000, 1.000000 |
-                    pre_defined = 0x00000000
-                    pre_defined = 0x00000000
-                    pre_defined = 0x00000000
-                    pre_defined = 0x00000000
-                    pre_defined = 0x00000000
-                    pre_defined = 0x00000000
-                    next_track_ID = 2
-                [trak: Track Box]
-                    position = 140
-                    size = 608
-                    [tkhd: Track Header Box]
-                        position = 148
-                        size = 92
-                        version = 0
-                        flags = 0x000007
-                            Track enabled
-                            Track in movie
-                            Track in preview
-                        creation_time = UTC 2014/12/12, 18:41:19
-                        modification_time = UTC 2014/12/12, 18:41:19
-                        track_ID = 1
-                        reserved = 0x00000000
-                        duration = 33600 (00:00:00.700)
-                        reserved = 0x00000000
-                        reserved = 0x00000000
-                        layer = 0
-                        alternate_group = 0
-                        volume = 1.000000
-                        reserved = 0x0000
-                        transformation matrix
-                            | a, b, u |   | 1.000000, 0.000000, 0.000000 |
-                            | c, d, v | = | 0.000000, 1.000000, 0.000000 |
-                            | x, y, w |   | 0.000000, 0.000000, 1.000000 |
-                        width = 0.000000
-                        height = 0.000000
-                    [edts: Edit Box]
-                        position = 240
-                        size = 36
-                        [elst: Edit List Box]
-                            position = 281
-                            size = 28
-                            version = 0
-                            flags = 0x000000
-                            entry_count = 1
-                            entry[0]
-                                segment_duration = 33600
-                                media_time = 312
-                                media_rate = 1.000000
-                    [mdia: Media Box]
-                        position = 276
-                        size = 472
-                        [mdhd: Media Header Box]
-                            position = 284
-                            size = 32
-                            version = 0
-                            flags = 0x000000
-                            creation_time = UTC 2014/12/12, 18:41:19
-                            modification_time = UTC 2014/12/12, 18:41:19
-                            timescale = 48000
-                            duration = 34560 (00:00:00.720)
-                            language = und
-                            pre_defined = 0x0000
-                        [hdlr: Handler Reference Box]
-                            position = 316
-                            size = 51
-                            version = 0
-                            flags = 0x000000
-                            pre_defined = 0x00000000
-                            handler_type = soun
-                            reserved = 0x00000000
-                            reserved = 0x00000000
-                            reserved = 0x00000000
-                            name = Xiph Audio Handler
-                        [minf: Media Information Box]
-                            position = 367
-                            size = 381
-                            [smhd: Sound Media Header Box]
-                                position = 375
-                                size = 16
-                                version = 0
-                                flags = 0x000000
-                                balance = 0.000000
-                                reserved = 0x0000
-                            [dinf: Data Information Box]
-                                position = 391
-                                size = 36
-                                [dref: Data Reference Box]
-                                    position = 399
-                                    size = 28
-                                    version = 0
-                                    flags = 0x000000
-                                    entry_count = 1
-                                    [url : Data Entry Url Box]
-                                        position = 415
-                                        size = 12
-                                        version = 0
-                                        flags = 0x000001
-                                        location = in the same file
-                            [stbl: Sample Table Box]
-                                position = 427
-                                size = 321
-                                [stsd: Sample Description Box]
-                                    position = 435
-                                    size = 79
-                                    version = 0
-                                    flags = 0x000000
-                                    entry_count = 1
-                                    [Opus: Audio Description]
-                                        position = 451
-                                        size = 63
-                                        reserved = 0x000000000000
-                                        data_reference_index = 1
-                                        reserved = 0x0000
-                                        reserved = 0x0000
-                                        reserved = 0x00000000
-                                        channelcount = 6
-                                        samplesize = 16
-                                        pre_defined = 0
-                                        reserved = 0
-                                        samplerate = 48000.000000
-                                        [dOps: Opus Specific Box]
-                                            position = 487
-                                            size = 27
-                                            Version = 0
-                                            OutputChannelCount = 6
-                                            PreSkip = 312
-                                            InputSampleRate = 48000
-                                            OutputGain = 0
-                                            ChannelMappingFamily = 1
-                                            StreamCount = 4
-                                            CoupledCount = 2
-                                            ChannelMapping
-                                                0 -> 0: front left
-                                                1 -> 4: fron center
-                                                2 -> 1: front right
-                                                3 -> 2: side left
-                                                4 -> 3: side right
-                                                5 -> 5: rear center
-                                [stts: Decoding Time to Sample Box]
-                                    position = 514
-                                    size = 24
-                                    version = 0
-                                    flags = 0x000000
-                                    entry_count = 1
-                                    entry[0]
-                                        sample_count = 18
-                                        sample_delta = 1920
-                                [stsc: Sample To Chunk Box]
-                                    position = 538
-                                    size = 40
-                                    version = 0
-                                    flags = 0x000000
-                                    entry_count = 2
-                                    entry[0]
-                                        first_chunk = 1
-                                        samples_per_chunk = 13
-                                        sample_description_index = 1
-                                    entry[1]
-                                        first_chunk = 2
-                                        samples_per_chunk = 5
-                                        sample_description_index = 1
-                                [stsz: Sample Size Box]
-                                    position = 578
-                                    size = 92
-                                    version = 0
-                                    flags = 0x000000
-                                    sample_size = 0 (variable)
-                                    sample_count = 18
-                                    entry_size[0] = 977
-                                    entry_size[1] = 938
-                                    entry_size[2] = 939
-                                    entry_size[3] = 938
-                                    entry_size[4] = 934
-                                    entry_size[5] = 945
-                                    entry_size[6] = 948
-                                    entry_size[7] = 956
-                                    entry_size[8] = 955
-                                    entry_size[9] = 930
-                                    entry_size[10] = 933
-                                    entry_size[11] = 934
-                                    entry_size[12] = 972
-                                    entry_size[13] = 977
-                                    entry_size[14] = 958
-                                    entry_size[15] = 949
-                                    entry_size[16] = 962
-                                    entry_size[17] = 848
-                                [stco: Chunk Offset Box]
-                                    position = 670
-                                    size = 24
-                                    version = 0
-                                    flags = 0x000000
-                                    entry_count = 2
-                                    chunk_offset[0] = 797
-                                    chunk_offset[1] = 13096
-                                [sgpd: Sample Group Description Box]
-                                    position = 694
-                                    size = 26
-                                    version = 1
-                                    flags = 0x000000
-                                    grouping_type = roll
-                                    default_length = 2 (constant)
-                                    entry_count = 1
-                                    roll_distance[0] = -2
-                                [sbgp: Sample to Group Box]
-                                    position = 720
-                                    size = 28
-                                    version = 0
-                                    flags = 0x000000
-                                    grouping_type = roll
-                                    entry_count = 1
-                                    entry[0]
-                                        sample_count = 18
-                                        group_description_index = 1
-            [free: Free Space Box]
-                position = 748
-                size = 8
-            [mdat: Media Data Box]
-                position = 756
-                size = 17001
-<a name="5"></a>
-5 Authors' Address
-    Yusuke Nakamura
-        Email: muken.the.vfrmaniac |at| gmail.com
-        </div>
-    </body>
-</html>
diff --git a/doc/opus_logo.svg b/doc/opus_logo.svg
deleted file mode 100644
index db2879efc..000000000
--- a/doc/opus_logo.svg
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   x="0px"
-   y="0px"
-   width="360"
-   height="205"
-   viewBox="-72 -23.757 360 205"
-   overflow="visible"
-   enable-background="new -72 -23.757 504 252"
-   xml:space="preserve"
-   id="svg2"
-   style="overflow:visible">
-<defs
-   id="defs4">
-<linearGradient
-   xlink:href="#SVGID_1_"
-   id="linearGradient3027"
-   gradientUnits="userSpaceOnUse"
-   x1="194.53169"
-   y1="95.107399"
-   x2="194.53169"
-   y2="9.9475983e-14" /><linearGradient
-   xlink:href="#SVGID_2_"
-   id="linearGradient3029"
-   gradientUnits="userSpaceOnUse"
-   x1="229.61819"
-   y1="116.208"
-   x2="229.61819"
-   y2="164.46291" /><linearGradient
-   xlink:href="#SVGID_3_"
-   id="linearGradient3031"
-   gradientUnits="userSpaceOnUse"
-   x1="43.9897"
-   y1="115.4395"
-   x2="43.9897"
-   y2="165.2314" /><linearGradient
-   xlink:href="#SVGID_4_"
-   id="linearGradient3033"
-   gradientUnits="userSpaceOnUse"
-   x1="311.2847"
-   y1="115.7188"
-   x2="311.2847"
-   y2="165.2822" /><linearGradient
-   xlink:href="#SVGID_5_"
-   id="linearGradient3035"
-   gradientUnits="userSpaceOnUse"
-   x1="129.1987"
-   y1="115.5791"
-   x2="129.1987"
-   y2="204.4863" /></defs>
-<linearGradient
-   id="SVGID_1_"
-   gradientUnits="userSpaceOnUse"
-   x1="194.53169"
-   y1="95.107399"
-   x2="194.53169"
-   y2="9.9475983e-14">
-        <stop
-   offset="0.0056"
-   style="stop-color:#8E8E8E"
-   id="stop7" />
-        <stop
-   offset="1"
-   style="stop-color:#B5B5B5"
-   id="stop9" />
-</linearGradient>
-
-<linearGradient
-   id="SVGID_2_"
-   gradientUnits="userSpaceOnUse"
-   x1="229.61819"
-   y1="116.208"
-   x2="229.61819"
-   y2="164.46291">
-        <stop
-   offset="0.0056"
-   style="stop-color:#494748"
-   id="stop14" />
-        <stop
-   offset="1"
-   style="stop-color:#000000"
-   id="stop16" />
-</linearGradient>
-
-<linearGradient
-   id="SVGID_3_"
-   gradientUnits="userSpaceOnUse"
-   x1="43.9897"
-   y1="115.4395"
-   x2="43.9897"
-   y2="165.2314">
-        <stop
-   offset="0.0056"
-   style="stop-color:#494748"
-   id="stop21" />
-        <stop
-   offset="1"
-   style="stop-color:#000000"
-   id="stop23" />
-</linearGradient>
-
-<linearGradient
-   id="SVGID_4_"
-   gradientUnits="userSpaceOnUse"
-   x1="311.2847"
-   y1="115.7188"
-   x2="311.2847"
-   y2="165.2822">
-        <stop
-   offset="0.0056"
-   style="stop-color:#494748"
-   id="stop28" />
-        <stop
-   offset="1"
-   style="stop-color:#000000"
-   id="stop30" />
-</linearGradient>
-
-<linearGradient
-   id="SVGID_5_"
-   gradientUnits="userSpaceOnUse"
-   x1="129.1987"
-   y1="115.5791"
-   x2="129.1987"
-   y2="204.4863">
-        <stop
-   offset="0.0056"
-   style="stop-color:#494748"
-   id="stop35" />
-        <stop
-   offset="1"
-   style="stop-color:#000000"
-   id="stop37" />
-</linearGradient>
-<g
-   id="g3020"
-   transform="translate(-72.001783,-23.243)"><path
-     id="path11"
-     d="M 257.355,13.996 C 249.943,7.826 238.533,3.695 223.153,1.588 l -11.302,35.935 c -0.244,1.318 -0.664,2.815 -1.315,4.54 -1.153,2.883 -2.542,5.258 -4.174,7.127 -1.634,1.874 -3.463,3.335 -5.489,4.4 -2.028,1.059 -4.232,1.79 -6.614,2.193 -2.382,0.4 -4.847,0.526 -7.393,0.378 -2.549,-0.148 -4.717,-0.495 -6.501,-1.042 -1.786,-0.546 -3.428,-1.452 -4.925,-2.72 -1.107,-1.245 -1.751,-2.878 -1.927,-4.902 -0.177,-2.024 0.313,-4.527 1.471,-7.509 1.035,-2.592 2.345,-4.852 3.933,-6.771 1.587,-1.921 3.443,-3.411 5.565,-4.467 2.027,-1.059 4.206,-1.768 6.539,-2.125 2.327,-0.354 4.915,-0.448 7.756,-0.283 2.352,0.139 4.542,0.485 6.574,1.048 0.964,0.265 1.808,0.613 2.542,1.033 L 216.57,0.832 c -2.142,-0.202 -4.333,-0.379 -6.609,-0.51 -21.901,-1.279 -40.308,1.251 -55.229,7.576 -14.918,6.33 -24.865,15.715 -29.833,28.154 -1.491,3.814 -2.292,7.408 -2.41,10.785 l -0.01,-0.005 c -1.426,24.463 14.295,38.245 24.007,44.373 3.897,2.609 7.362,3.901 7.362,3.901 l 4.451,-14.225 1.316,-3.496 c 5.859,1.108 12.375,1.879 19.573,2.298 22.053,1.286 40.539,-1.232 55.458,-7.564 14.916,-6.325 24.78,-15.638 29.591,-27.942 4.806,-12.295 2.514,-22.357 -6.882,-30.181 z"
-     style="fill:url(#linearGradient3027)"/><path
-     id="path18"
-     d="m 269.531,139.499 c -2.511,7.718 -8.23,13.807 -17.156,18.27 -8.926,4.463 -20.223,6.694 -33.891,6.694 -13.484,0 -23.292,-2.208 -29.43,-6.626 -6.136,-4.415 -7.904,-10.528 -5.299,-18.338 l 7.53,-23.291 h 25.663 l -7.252,23.151 c -0.931,2.883 -1.232,5.278 -0.906,7.183 0.326,1.907 1.046,3.417 2.162,4.533 1.394,1.113 2.95,1.88 4.672,2.299 1.72,0.419 3.788,0.629 6.207,0.629 2.417,0 4.742,-0.255 6.974,-0.769 2.231,-0.51 4.275,-1.323 6.138,-2.438 1.858,-1.116 3.508,-2.602 4.951,-4.463 1.44,-1.859 2.626,-4.186 3.557,-6.974 l 7.532,-23.151 h 25.663 l -7.115,23.291 z"
-     style="fill:url(#linearGradient3029)"/><path
-     id="path25"
-     d="m 86.875,140.404 c 2.51,-7.717 0.743,-13.808 -5.301,-18.271 -6.044,-4.463 -15.899,-6.694 -29.567,-6.694 -13.483,0 -24.686,2.21 -33.611,6.625 -8.928,4.417 -14.693,10.53 -17.295,18.34 -2.51,7.72 -0.722,13.786 5.37,18.201 6.089,4.418 15.922,6.626 29.498,6.626 13.575,0 24.826,-2.208 33.753,-6.626 8.924,-4.415 14.642,-10.481 17.153,-18.201 z m -26.082,0.14 c -0.931,2.978 -2.069,5.3 -3.417,6.974 -1.349,1.675 -3.046,3.116 -5.09,4.323 -1.768,1.116 -3.765,1.883 -5.997,2.302 -2.232,0.419 -4.463,0.627 -6.696,0.627 -2.697,0 -4.999,-0.23 -6.903,-0.696 -1.907,-0.465 -3.417,-1.256 -4.533,-2.371 -1.21,-1.116 -1.906,-2.626 -2.092,-4.533 -0.188,-1.904 0.14,-4.114 0.977,-6.625 0.929,-2.88 2.161,-5.275 3.696,-7.183 1.534,-1.904 3.229,-3.417 5.09,-4.533 2.138,-1.115 4.206,-1.882 6.207,-2.301 1.999,-0.419 4.207,-0.627 6.625,-0.627 2.416,0 4.603,0.257 6.555,0.767 1.953,0.512 3.486,1.325 4.603,2.44 1.115,1.116 1.789,2.605 2.021,4.463 0.231,1.86 -0.117,4.185 -1.046,6.973 z"
-     style="fill:url(#linearGradient3031)"/><path
-     id="path32"
-     d="m 310.14,126.807 c 2.928,-0.698 9.041,-1.046 18.339,-1.046 4.833,0 9.506,0.487 14.018,1.465 4.508,0.976 9.042,2.209 13.598,3.696 L 360,119.066 c -2.698,-0.744 -6.625,-1.487 -11.787,-2.231 -5.159,-0.744 -10.669,-1.116 -16.526,-1.116 -17.574,0 -30.405,1.513 -38.493,4.533 -8.089,3.022 -12.879,6.812 -14.366,11.366 -1.115,3.44 -0.348,6.346 2.302,8.717 2.65,2.371 7.322,4.115 14.016,5.229 2.511,0.467 6.624,0.838 12.343,1.117 5.718,0.279 9.46,0.557 11.228,0.836 3.717,0.373 6.205,0.837 7.461,1.396 1.254,0.558 1.695,1.394 1.325,2.511 -0.467,1.303 -1.976,2.279 -4.533,2.928 -2.559,0.652 -6.3,0.977 -11.227,0.977 -0.77,0 -1.513,-0.003 -2.241,-0.007 -1.846,-0.101 -3.858,-0.272 -5.791,-0.476 -2.06,-0.22 -4.118,-0.485 -6.162,-0.795 -4.089,-0.62 -8.132,-1.419 -12.058,-2.439 -3.921,-1.022 -7.734,-2.267 -11.26,-3.813 -0.474,-0.208 -0.932,-0.433 -1.394,-0.654 -2.476,3.979 -5.905,7.451 -10.27,10.396 2.259,1.085 4.539,1.976 6.807,2.742 4.52,1.506 9.034,2.52 13.525,3.266 4.494,0.741 8.969,1.203 13.431,1.472 2.231,0.133 4.459,0.215 6.691,0.248 1.966,0.026 3.882,0.02 5.902,-0.045 12.216,-0.072 22.318,-1.53 30.294,-4.386 8.18,-2.929 13.062,-6.81 14.644,-11.645 1.116,-3.349 0.441,-6.138 -2.021,-8.369 -2.466,-2.231 -6.813,-3.857 -13.041,-4.882 -2.883,-0.371 -5.768,-0.719 -8.647,-1.046 -2.884,-0.324 -5.533,-0.628 -7.951,-0.906 -9.577,-0.65 -14.924,-1.255 -16.039,-1.813 -1.116,-0.558 -1.488,-1.394 -1.116,-2.511 0.467,-1.209 2.164,-2.163 5.094,-2.859 z"
-     style="fill:url(#linearGradient3033)"/><path
-     id="path39"
-     d="m 172.838,122.204 c -6.091,-4.415 -15.924,-6.625 -29.499,-6.625 -13.577,0 -24.826,2.21 -33.751,6.625 -8.926,4.417 -14.4,10.415 -16.911,18.131 l -0.105,0.349 -12.692,39.19 c -5.26,17.631 17.526,24.612 17.526,24.612 l 7.58,-24.612 0.656,-2.106 c 0.592,-1.982 1.192,-3.964 1.781,-5.948 l 1.686,-5.531 c 0.603,-1.832 1.207,-3.662 1.85,-5.481 l 3.979,-10.875 1.993,-5.436 1.429,-3.718 c 0.051,-0.172 0.099,-0.339 0.155,-0.514 0.836,-2.509 1.953,-4.718 3.347,-6.624 1.396,-1.904 3.069,-3.417 5.021,-4.533 1.859,-1.115 3.882,-1.904 6.067,-2.371 2.183,-0.464 4.625,-0.696 7.322,-0.696 2.231,0 4.325,0.208 6.277,0.627 1.952,0.419 3.438,1.186 4.463,2.301 1.301,1.209 2.068,2.65 2.3,4.323 0.231,1.675 -0.117,3.999 -1.046,6.974 -0.931,2.79 -2.116,5.116 -3.557,6.974 -1.442,1.862 -3.091,3.348 -4.951,4.464 -1.861,1.115 -3.905,1.931 -6.136,2.44 -2.231,0.512 -4.558,0.767 -6.973,0.767 -2.419,0 -4.487,-0.208 -6.207,-0.627 -1.721,-0.419 -3.326,-1.186 -4.812,-2.302 -0.112,-0.112 -0.201,-0.247 -0.305,-0.366 l -3.674,10.658 c -0.206,0.613 -0.403,1.228 -0.601,1.842 3.479,0.708 7.507,1.13 12.111,1.256 13.668,0 24.965,-2.231 33.893,-6.694 8.926,-4.464 14.643,-10.552 17.154,-18.271 2.511,-7.719 0.718,-13.786 -5.37,-18.203 z"
-     style="fill:url(#linearGradient3035)"/></g>
-</svg>
diff --git a/doc/opus_update.patch b/doc/opus_update.patch
deleted file mode 100644
index 11f066c70..000000000
--- a/doc/opus_update.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-diff --git a/celt/bands.c b/celt/bands.c
-index 6962587..32e1de6 100644
---- a/celt/bands.c
-+++ b/celt/bands.c
-@@ -1234,9 +1234,23 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
-          b = 0;
-       }
- 
--      if (resynth && M*eBands[i]-N >= M*eBands[start] && (update_lowband || lowband_offset==0))
-+      if (resynth && (M*eBands[i]-N >= M*eBands[start] || i==start+1) && (update_lowband || lowband_offset==0))
-             lowband_offset = i;
- 
-+      if (i == start+1)
-+      {
-+         int n1, n2;
-+         int offset;
-+         n1 = M*(eBands[start+1]-eBands[start]);
-+         n2 = M*(eBands[start+2]-eBands[start+1]);
-+         offset = M*eBands[start];
-+         /* Duplicate enough of the first band folding data to be able to fold the second band.
-+            Copies no data for CELT-only mode. */
-+         OPUS_COPY(&norm[offset+n1], &norm[offset+2*n1 - n2], n2-n1);
-+         if (C==2)
-+            OPUS_COPY(&norm2[offset+n1], &norm2[offset+2*n1 - n2], n2-n1);
-+      }
-+
-       tf_change = tf_res[i];
-       if (i>=m->effEBands)
-       {
-@@ -1257,7 +1271,7 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
-          fold_start = lowband_offset;
-          while(M*eBands[--fold_start] > effective_lowband);
-          fold_end = lowband_offset-1;
--         while(M*eBands[++fold_end] < effective_lowband+N);
-+         while(++fold_end < i && M*eBands[fold_end] < effective_lowband+N);
-          x_cm = y_cm = 0;
-          fold_i = fold_start; do {
-            x_cm |= collapse_masks[fold_i*C+0];
-diff --git a/celt/quant_bands.c b/celt/quant_bands.c
-index e5ed9ef..82fb823 100644
---- a/celt/quant_bands.c
-+++ b/celt/quant_bands.c
-@@ -552,6 +552,7 @@ void log2Amp(const CELTMode *m, int start, int end,
-       {
-          opus_val16 lg = ADD16(oldEBands[i+c*m->nbEBands],
-                          SHL16((opus_val16)eMeans[i],6));
-+         lg = MIN32(QCONST32(32.f, 16), lg);
-          eBands[i+c*m->nbEBands] = PSHR32(celt_exp2(lg),4);
-       }
-       for (;i<m->nbEBands;i++)
-diff --git a/silk/LPC_inv_pred_gain.c b/silk/LPC_inv_pred_gain.c
-index 60c439b..6c301da 100644
---- a/silk/LPC_inv_pred_gain.c
-+++ b/silk/LPC_inv_pred_gain.c
-@@ -84,8 +84,13 @@ static opus_int32 LPC_inverse_pred_gain_QA(                 /* O   Returns inver
- 
-         /* Update AR coefficient */
-         for( n = 0; n < k; n++ ) {
--            tmp_QA = Aold_QA[ n ] - MUL32_FRAC_Q( Aold_QA[ k - n - 1 ], rc_Q31, 31 );
--            Anew_QA[ n ] = MUL32_FRAC_Q( tmp_QA, rc_mult2 , mult2Q );
-+            opus_int64 tmp64;
-+            tmp_QA = silk_SUB_SAT32( Aold_QA[ n ], MUL32_FRAC_Q( Aold_QA[ k - n - 1 ], rc_Q31, 31 ) );
-+            tmp64 = silk_RSHIFT_ROUND64( silk_SMULL( tmp_QA, rc_mult2 ), mult2Q);
-+            if( tmp64 > silk_int32_MAX || tmp64 < silk_int32_MIN ) {
-+               return 0;
-+            }
-+            Anew_QA[ n ] = ( opus_int32 )tmp64;
-         }
-     }
- 
-diff --git a/silk/NLSF_stabilize.c b/silk/NLSF_stabilize.c
-index 979aaba..2ef2398 100644
---- a/silk/NLSF_stabilize.c
-+++ b/silk/NLSF_stabilize.c
-@@ -134,7 +134,7 @@ void silk_NLSF_stabilize(
- 
-         /* Keep delta_min distance between the NLSFs */
-         for( i = 1; i < L; i++ )
--            NLSF_Q15[i] = silk_max_int( NLSF_Q15[i], NLSF_Q15[i-1] + NDeltaMin_Q15[i] );
-+            NLSF_Q15[i] = silk_max_int( NLSF_Q15[i], silk_ADD_SAT16( NLSF_Q15[i-1], NDeltaMin_Q15[i] ) );
- 
-         /* Last NLSF should be no higher than 1 - NDeltaMin[L] */
-         NLSF_Q15[L-1] = silk_min_int( NLSF_Q15[L-1], (1<<15) - NDeltaMin_Q15[L] );
-diff --git a/silk/dec_API.c b/silk/dec_API.c
-index efd7918..21bb7e0 100644
---- a/silk/dec_API.c
-+++ b/silk/dec_API.c
-@@ -72,6 +72,9 @@ opus_int silk_InitDecoder(                              /* O    Returns error co
-     for( n = 0; n < DECODER_NUM_CHANNELS; n++ ) {
-         ret  = silk_init_decoder( &channel_state[ n ] );
-     }
-+    silk_memset(&((silk_decoder *)decState)->sStereo, 0, sizeof(((silk_decoder *)decState)->sStereo));
-+    /* Not strictly needed, but it's cleaner that way */
-+    ((silk_decoder *)decState)->prev_decode_only_middle = 0;
- 
-     return ret;
- }
-diff --git a/silk/resampler_private_IIR_FIR.c b/silk/resampler_private_IIR_FIR.c
-index dbd6d9a..91a43aa 100644
---- a/silk/resampler_private_IIR_FIR.c
-+++ b/silk/resampler_private_IIR_FIR.c
-@@ -75,10 +75,10 @@ void silk_resampler_private_IIR_FIR(
-     silk_resampler_state_struct *S = (silk_resampler_state_struct *)SS;
-     opus_int32 nSamplesIn;
-     opus_int32 max_index_Q16, index_increment_Q16;
--    opus_int16 buf[ RESAMPLER_MAX_BATCH_SIZE_IN + RESAMPLER_ORDER_FIR_12 ];
-+    opus_int16 buf[ 2*RESAMPLER_MAX_BATCH_SIZE_IN + RESAMPLER_ORDER_FIR_12 ];
- 
-     /* Copy buffered samples to start of buffer */
--    silk_memcpy( buf, S->sFIR, RESAMPLER_ORDER_FIR_12 * sizeof( opus_int32 ) );
-+    silk_memcpy( buf, S->sFIR, RESAMPLER_ORDER_FIR_12 * sizeof( opus_int16 ) );
- 
-     /* Iterate over blocks of frameSizeIn input samples */
-     index_increment_Q16 = S->invRatio_Q16;
-@@ -95,13 +95,13 @@ void silk_resampler_private_IIR_FIR(
- 
-         if( inLen > 0 ) {
-             /* More iterations to do; copy last part of filtered signal to beginning of buffer */
--            silk_memcpy( buf, &buf[ nSamplesIn << 1 ], RESAMPLER_ORDER_FIR_12 * sizeof( opus_int32 ) );
-+            silk_memmove( buf, &buf[ nSamplesIn << 1 ], RESAMPLER_ORDER_FIR_12 * sizeof( opus_int16 ) );
-         } else {
-             break;
-         }
-     }
- 
-     /* Copy last part of filtered signal to the state for the next call */
--    silk_memcpy( S->sFIR, &buf[ nSamplesIn << 1 ], RESAMPLER_ORDER_FIR_12 * sizeof( opus_int32 ) );
-+    silk_memcpy( S->sFIR, &buf[ nSamplesIn << 1 ], RESAMPLER_ORDER_FIR_12 * sizeof( opus_int16 ) );
- }
- 
-diff --git a/src/opus_decoder.c b/src/opus_decoder.c
-index 0cc56f8..8a30fbc 100644
---- a/src/opus_decoder.c
-+++ b/src/opus_decoder.c
-@@ -595,16 +595,14 @@ static int opus_packet_parse_impl(const unsigned char *data, int len,
-       /* Padding flag is bit 6 */
-       if (ch&0x40)
-       {
--         int padding=0;
-          int p;
-          do {
-             if (len<=0)
-                return OPUS_INVALID_PACKET;
-             p = *data++;
-             len--;
--            padding += p==255 ? 254: p;
-+            len -= p==255 ? 254: p;
-          } while (p==255);
--         len -= padding;
-       }
-       if (len<0)
-          return OPUS_INVALID_PACKET;
-diff --git a/run_vectors.sh b/run_vectors.sh
-index 7cd23ed..4841b0a 100755
---- a/run_vectors.sh
-+++ b/run_vectors.sh
-@@ -1,3 +1,5 @@
-+#!/bin/sh
-+#
- # Copyright (c) 2011-2012 IETF Trust, Jean-Marc Valin. All rights reserved.
- #
- #  This file is extracted from RFC6716. Please see that RFC for additional
-@@ -31,10 +33,8 @@
- #  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- #  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
--#!/bin/sh
--
--rm logs_mono.txt
--rm logs_stereo.txt
-+rm -f logs_mono.txt logs_mono2.txt
-+rm -f logs_stereo.txt logs_stereo2.txt
- 
- if [ "$#" -ne "3" ]; then
-     echo "usage: run_vectors.sh <exec path> <vector path> <rate>"
-@@ -45,18 +45,23 @@ CMD_PATH=$1
- VECTOR_PATH=$2
- RATE=$3
- 
--OPUS_DEMO=$CMD_PATH/opus_demo
--OPUS_COMPARE=$CMD_PATH/opus_compare
-+: ${OPUS_DEMO:=$CMD_PATH/opus_demo}
-+: ${OPUS_COMPARE:=$CMD_PATH/opus_compare}
- 
- if [ -d $VECTOR_PATH ]; then
-     echo Test vectors found in $VECTOR_PATH
- else
-     echo No test vectors found
--    #Don't make the test fail here because the test vectors will be
--    #distributed separately
-+    #Don't make the test fail here because the test vectors
-+    #will be distributed separately
-     exit 0
- fi
- 
-+if [ ! -x $OPUS_COMPARE ]; then
-+    echo ERROR: Compare program not found: $OPUS_COMPARE
-+    exit 1
-+fi
-+
- if [ -x $OPUS_DEMO ]; then
-     echo Decoding with $OPUS_DEMO
- else
-@@ -82,9 +87,11 @@ do
-         echo ERROR: decoding failed
-         exit 1
-     fi
--    $OPUS_COMPARE -r $RATE $VECTOR_PATH/testvector$file.dec tmp.out >> logs_mono.txt 2>&1
-+    $OPUS_COMPARE -r $RATE $VECTOR_PATH/testvector${file}.dec tmp.out >> logs_mono.txt 2>&1
-     float_ret=$?
--    if [ "$float_ret" -eq "0" ]; then
-+    $OPUS_COMPARE -r $RATE $VECTOR_PATH/testvector${file}m.dec tmp.out >> logs_mono2.txt 2>&1
-+    float_ret2=$?
-+    if [ "$float_ret" -eq "0" ] || [ "$float_ret2" -eq "0" ]; then
-         echo output matches reference
-     else
-         echo ERROR: output does not match reference
-@@ -111,9 +118,11 @@ do
-         echo ERROR: decoding failed
-         exit 1
-     fi
--    $OPUS_COMPARE -s -r $RATE $VECTOR_PATH/testvector$file.dec tmp.out >> logs_stereo.txt 2>&1
-+    $OPUS_COMPARE -s -r $RATE $VECTOR_PATH/testvector${file}.dec tmp.out >> logs_stereo.txt 2>&1
-     float_ret=$?
--    if [ "$float_ret" -eq "0" ]; then
-+    $OPUS_COMPARE -s -r $RATE $VECTOR_PATH/testvector${file}m.dec tmp.out >> logs_stereo2.txt 2>&1
-+    float_ret2=$?
-+    if [ "$float_ret" -eq "0" ] || [ "$float_ret2" -eq "0" ]; then
-         echo output matches reference
-     else
-         echo ERROR: output does not match reference
-@@ -125,5 +134,10 @@ done
- 
- 
- echo All tests have passed successfully
--grep quality logs_mono.txt | awk '{sum+=$4}END{print "Average mono quality is", sum/NR, "%"}'
--grep quality logs_stereo.txt | awk '{sum+=$4}END{print "Average stereo quality is", sum/NR, "%"}'
-+mono1=`grep quality logs_mono.txt | awk '{sum+=$4}END{if (NR == 12) sum /= 12; else sum = 0; print sum}'`
-+mono2=`grep quality logs_mono2.txt | awk '{sum+=$4}END{if (NR == 12) sum /= 12; else sum = 0; print sum}'`
-+echo $mono1 $mono2 | awk '{if ($2 > $1) $1 = $2; print "Average mono quality is", $1, "%"}'
-+
-+stereo1=`grep quality logs_stereo.txt | awk '{sum+=$4}END{if (NR == 12) sum /= 12; else sum = 0; print sum}'`
-+stereo2=`grep quality logs_stereo2.txt | awk '{sum+=$4}END{if (NR == 12) sum /= 12; else sum = 0; print sum}'`
-+echo $stereo1 $stereo2 | awk '{if ($2 > $1) $1 = $2; print "Average stereo quality is", $1, "%"}'
diff --git a/doc/release.txt b/doc/release.txt
deleted file mode 100644
index ad5afb694..000000000
--- a/doc/release.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-= Release checklist =
-
-== Source release ==
-
-- Check for uncommitted changes to master.
-- Update OPUS_LT_* API versioning in configure.ac.
-- Tag the release commit with 'git tag -s vN.M'.
- - Include release notes in the tag annotation.
-- Verify 'make distcheck' produces a tarball with
-  the desired name.
-- Push tag to public repo.
-- Upload source package 'opus-${version}.tar.gz'
- - Add to https://svn.xiph.org/releases/opus/
- - Update checksum files
- - svn commit
- - Copy to archive.mozilla.org/pub/opus/
- - Update checksum files there as well.
-- Add release notes to https://gitlab.xiph.org/xiph/opus-website.git
-- Update links and checksums on the downloads page.
-- Add a copy of the documentation to <https://www.opus-codec.org/docs/>
-  and update the links.
-- Update /topic in #opus IRC channel.
-
-Releases are committed to https://svn.xiph.org/releases/opus/
-which propagates to downloads.xiph.org, and copied manually
-to https://archive.mozilla.org/pub/opus/
-
-Website updates are committed to https://gitlab.xiph.org/xiph/opus-website.git
-which propagates to https://opus-codec.org/
-
-== Binary release ==
-
-We usually build opus-tools binaries for MacOS and Windows.
-
-Binary releases are copied manually to
-https://archive.mozilla.org/pub/opus/win32/
-
-For Mac, submit a pull request to homebrew.
-
-== Website updates ==
-
-For major releases, recreate the files on https://opus-codec.org/examples/
-with the next encoder.
diff --git a/doc/trivial_example.c b/doc/trivial_example.c
index 9cf435b4a..df3a7d14f 100644
--- a/doc/trivial_example.c
+++ b/doc/trivial_example.c
@@ -25,21 +25,21 @@
 */
 
 /* This is meant to be a simple example of encoding and decoding audio
-   using Opus. It should make it easy to understand how the Opus API
+   using Oac. It should make it easy to understand how the Oac API
    works. For more information, see the full API documentation at:
-   https://www.opus-codec.org/docs/ */
+   https://www.oac-codec.org/docs/ */
 
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-#include <opus.h>
+#include <oac.h>
 #include <stdio.h>
 
 /*The frame size is hardcoded for this sample code but it doesn't have to be*/
 #define FRAME_SIZE 960
 #define SAMPLE_RATE 48000
 #define CHANNELS 2
-#define APPLICATION OPUS_APPLICATION_AUDIO
+#define APPLICATION OAC_APPLICATION_AUDIO
 #define BITRATE 64000
 
 #define MAX_FRAME_SIZE 6*960
@@ -51,13 +51,13 @@ int main(int argc, char **argv)
    FILE *fin;
    char *outFile;
    FILE *fout;
-   opus_int16 in[FRAME_SIZE*CHANNELS];
-   opus_int16 out[MAX_FRAME_SIZE*CHANNELS];
+   oac_int16 in[FRAME_SIZE*CHANNELS];
+   oac_int16 out[MAX_FRAME_SIZE*CHANNELS];
    unsigned char cbits[MAX_PACKET_SIZE];
    int nbBytes;
    /*Holds the state of the encoder and decoder */
-   OpusEncoder *encoder;
-   OpusDecoder *decoder;
+   OacEncoder *encoder;
+   OacDecoder *decoder;
    int err;
 
    if (argc != 3)
@@ -68,20 +68,20 @@ int main(int argc, char **argv)
    }
 
    /*Create a new encoder state */
-   encoder = opus_encoder_create(SAMPLE_RATE, CHANNELS, APPLICATION, &err);
+   encoder = oac_encoder_create(SAMPLE_RATE, CHANNELS, APPLICATION, &err);
    if (err<0)
    {
-      fprintf(stderr, "failed to create an encoder: %s\n", opus_strerror(err));
+      fprintf(stderr, "failed to create an encoder: %s\n", oac_strerror(err));
       return EXIT_FAILURE;
    }
    /* Set the desired bit-rate. You can also set other parameters if needed.
-      The Opus library is designed to have good defaults, so only set
+      The Oac library is designed to have good defaults, so only set
       parameters you know you need. Doing otherwise is likely to result
       in worse quality, but better. */
-   err = opus_encoder_ctl(encoder, OPUS_SET_BITRATE(BITRATE));
+   err = oac_encoder_ctl(encoder, OAC_SET_BITRATE(BITRATE));
    if (err<0)
    {
-      fprintf(stderr, "failed to set bitrate: %s\n", opus_strerror(err));
+      fprintf(stderr, "failed to set bitrate: %s\n", oac_strerror(err));
       return EXIT_FAILURE;
    }
    inFile = argv[1];
@@ -94,10 +94,10 @@ int main(int argc, char **argv)
 
 
    /* Create a new decoder state. */
-   decoder = opus_decoder_create(SAMPLE_RATE, CHANNELS, &err);
+   decoder = oac_decoder_create(SAMPLE_RATE, CHANNELS, &err);
    if (err<0)
    {
-      fprintf(stderr, "failed to create decoder: %s\n", opus_strerror(err));
+      fprintf(stderr, "failed to create decoder: %s\n", oac_strerror(err));
       return EXIT_FAILURE;
    }
    outFile = argv[2];
@@ -134,10 +134,10 @@ int main(int argc, char **argv)
       }
 
       /* Encode the frame. */
-      nbBytes = opus_encode(encoder, in, FRAME_SIZE, cbits, MAX_PACKET_SIZE);
+      nbBytes = oac_encode(encoder, in, FRAME_SIZE, cbits, MAX_PACKET_SIZE);
       if (nbBytes<0)
       {
-         fprintf(stderr, "encode failed: %s\n", opus_strerror(nbBytes));
+         fprintf(stderr, "encode failed: %s\n", oac_strerror(nbBytes));
          return EXIT_FAILURE;
       }
 
@@ -146,10 +146,10 @@ int main(int argc, char **argv)
          the encoder is using a constant frame size. However, that may not
          be the case for all encoders, so the decoder must always check
          the frame size returned. */
-      frame_size = opus_decode(decoder, cbits, nbBytes, out, MAX_FRAME_SIZE, 0);
+      frame_size = oac_decode(decoder, cbits, nbBytes, out, MAX_FRAME_SIZE, 0);
       if (frame_size<0)
       {
-         fprintf(stderr, "decoder failed: %s\n", opus_strerror(frame_size));
+         fprintf(stderr, "decoder failed: %s\n", oac_strerror(frame_size));
          return EXIT_FAILURE;
       }
 
@@ -163,8 +163,8 @@ int main(int argc, char **argv)
       fwrite(pcm_bytes, sizeof(short), frame_size*CHANNELS, fout);
    }
    /*Destroy the encoder state*/
-   opus_encoder_destroy(encoder);
-   opus_decoder_destroy(decoder);
+   oac_encoder_destroy(encoder);
+   oac_decoder_destroy(decoder);
    fclose(fin);
    fclose(fout);
    return EXIT_SUCCESS;
diff --git a/include/meson.build b/include/meson.build
index c1fb0b76f..ae7bae28b 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -1,13 +1,13 @@
-opus_headers = [
-  'opus.h',
-  'opus_multistream.h',
-  'opus_projection.h',
-  'opus_types.h',
-  'opus_defines.h',
+oac_headers = [
+  'oac.h',
+  'oac_multistream.h',
+  'oac_projection.h',
+  'oac_types.h',
+  'oac_defines.h',
 ]
 
 if opt_custom_modes
-  opus_headers += ['opus_custom.h']
+  oac_headers += ['oac_custom.h']
 endif
 
-install_headers(opus_headers, subdir: 'opus')
+install_headers(oac_headers, subdir: 'oac')
diff --git a/include/opus.h b/include/oac.h
similarity index 54%
rename from include/opus.h
rename to include/oac.h
index 802be9f95..beac463f4 100644
--- a/include/opus.h
+++ b/include/oac.h
@@ -26,28 +26,28 @@
 */
 
 /**
- * @file opus.h
- * @brief Opus reference implementation API
+ * @file oac.h
+ * @brief Oac reference implementation API
  */
 
-#ifndef OPUS_H
-#define OPUS_H
+#ifndef OAC_H
+#define OAC_H
 
-#include "opus_types.h"
-#include "opus_defines.h"
+#include "oac_types.h"
+#include "oac_defines.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /**
- * @mainpage Opus
+ * @mainpage Oac
  *
- * The Opus codec is designed for interactive speech and audio transmission over the Internet.
+ * The Oac codec is designed for interactive speech and audio transmission over the Internet.
  * It is designed by the IETF Codec Working Group and incorporates technology from
  * Skype's SILK codec and Xiph.Org's CELT codec.
  *
- * The Opus codec is designed to handle a wide range of interactive audio applications,
+ * The Oac codec is designed to handle a wide range of interactive audio applications,
  * including Voice over IP, videoconferencing, in-game chat, and even remote live music
  * performances. It can scale from low bit-rate narrowband speech to very high quality
  * stereo music. Its main features are:
@@ -64,114 +64,114 @@ extern "C" {
  * @li Floating point and fixed-point implementation
  *
  * Documentation sections:
- * @li @ref opus_encoder
- * @li @ref opus_decoder
- * @li @ref opus_repacketizer
- * @li @ref opus_multistream
- * @li @ref opus_libinfo
- * @li @ref opus_custom
+ * @li @ref oac_encoder
+ * @li @ref oac_decoder
+ * @li @ref oac_repacketizer
+ * @li @ref oac_multistream
+ * @li @ref oac_libinfo
+ * @li @ref oac_custom
  */
 
-/** @defgroup opus_encoder Opus Encoder
+/** @defgroup oac_encoder Oac Encoder
   * @{
   *
-  * @brief This page describes the process and functions used to encode Opus.
+  * @brief This page describes the process and functions used to encode Oac.
   *
-  * Since Opus is a stateful codec, the encoding process starts with creating an encoder
+  * Since Oac is a stateful codec, the encoding process starts with creating an encoder
   * state. This can be done with:
   *
   * @code
   * int          error;
-  * OpusEncoder *enc;
-  * enc = opus_encoder_create(Fs, channels, application, &error);
+  * OacEncoder *enc;
+  * enc = oac_encoder_create(Fs, channels, application, &error);
   * @endcode
   *
   * From this point, @c enc can be used for encoding an audio stream. An encoder state
   * @b must @b not be used for more than one stream at the same time. Similarly, the encoder
   * state @b must @b not be re-initialized for each frame.
   *
-  * While opus_encoder_create() allocates memory for the state, it's also possible
+  * While oac_encoder_create() allocates memory for the state, it's also possible
   * to initialize pre-allocated memory:
   *
   * @code
   * int          size;
   * int          error;
-  * OpusEncoder *enc;
-  * size = opus_encoder_get_size(channels);
+  * OacEncoder *enc;
+  * size = oac_encoder_get_size(channels);
   * enc = malloc(size);
-  * error = opus_encoder_init(enc, Fs, channels, application);
+  * error = oac_encoder_init(enc, Fs, channels, application);
   * @endcode
   *
-  * where opus_encoder_get_size() returns the required size for the encoder state. Note that
+  * where oac_encoder_get_size() returns the required size for the encoder state. Note that
   * future versions of this code may change the size, so no assumptions should be made about it.
   *
   * The encoder state is always continuous in memory and only a shallow copy is sufficient
   * to copy it (e.g. memcpy())
   *
-  * It is possible to change some of the encoder's settings using the opus_encoder_ctl()
+  * It is possible to change some of the encoder's settings using the oac_encoder_ctl()
   * interface. All these settings already default to the recommended value, so they should
   * only be changed when necessary. The most common settings one may want to change are:
   *
   * @code
-  * opus_encoder_ctl(enc, OPUS_SET_BITRATE(bitrate));
-  * opus_encoder_ctl(enc, OPUS_SET_COMPLEXITY(complexity));
-  * opus_encoder_ctl(enc, OPUS_SET_SIGNAL(signal_type));
+  * oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrate));
+  * oac_encoder_ctl(enc, OAC_SET_COMPLEXITY(complexity));
+  * oac_encoder_ctl(enc, OAC_SET_SIGNAL(signal_type));
   * @endcode
   *
   * where
   *
   * @arg bitrate is in bits per second (b/s)
   * @arg complexity is a value from 1 to 10, where 1 is the lowest complexity and 10 is the highest
-  * @arg signal_type is either OPUS_AUTO (default), OPUS_SIGNAL_VOICE, or OPUS_SIGNAL_MUSIC
+  * @arg signal_type is either OAC_AUTO (default), OAC_SIGNAL_VOICE, or OAC_SIGNAL_MUSIC
   *
-  * See @ref opus_encoderctls and @ref opus_genericctls for a complete list of parameters that can be set or queried. Most parameters can be set or changed at any time during a stream.
+  * See @ref oac_encoderctls and @ref oac_genericctls for a complete list of parameters that can be set or queried. Most parameters can be set or changed at any time during a stream.
   *
-  * To encode a frame, opus_encode() or opus_encode_float() must be called with exactly one frame (2.5, 5, 10, 20, 40 or 60 ms) of audio data:
+  * To encode a frame, oac_encode() or oac_encode_float() must be called with exactly one frame (2.5, 5, 10, 20, 40 or 60 ms) of audio data:
   * @code
-  * len = opus_encode(enc, audio_frame, frame_size, packet, max_packet);
+  * len = oac_encode(enc, audio_frame, frame_size, packet, max_packet);
   * @endcode
   *
   * where
   * <ul>
-  * <li>audio_frame is the audio data in opus_int16 (or float for opus_encode_float())</li>
+  * <li>audio_frame is the audio data in oac_int16 (or float for oac_encode_float())</li>
   * <li>frame_size is the duration of the frame in samples (per channel)</li>
   * <li>packet is the byte array to which the compressed data is written</li>
   * <li>max_packet is the maximum number of bytes that can be written in the packet (4000 bytes is recommended).
-  *     Do not use max_packet to control VBR target bitrate, instead use the #OPUS_SET_BITRATE CTL.</li>
+  *     Do not use max_packet to control VBR target bitrate, instead use the #OAC_SET_BITRATE CTL.</li>
   * </ul>
   *
-  * opus_encode() and opus_encode_float() return the number of bytes actually written to the packet.
+  * oac_encode() and oac_encode_float() return the number of bytes actually written to the packet.
   * The return value <b>can be negative</b>, which indicates that an error has occurred. If the return value
   * is 2 bytes or less, then the packet does not need to be transmitted (DTX).
   *
   * Once the encoder state if no longer needed, it can be destroyed with
   *
   * @code
-  * opus_encoder_destroy(enc);
+  * oac_encoder_destroy(enc);
   * @endcode
   *
-  * If the encoder was created with opus_encoder_init() rather than opus_encoder_create(),
+  * If the encoder was created with oac_encoder_init() rather than oac_encoder_create(),
   * then no action is required aside from potentially freeing the memory that was manually
   * allocated for it (calling free(enc) for the example above)
   *
   */
 
-/** Opus encoder state.
-  * This contains the complete state of an Opus encoder.
+/** Oac encoder state.
+  * This contains the complete state of an Oac encoder.
   * It is position independent and can be freely copied.
-  * @see opus_encoder_create,opus_encoder_init
+  * @see oac_encoder_create,oac_encoder_init
   */
-typedef struct OpusEncoder OpusEncoder;
+typedef struct OacEncoder OacEncoder;
 
-/** Gets the size of an <code>OpusEncoder</code> structure.
+/** Gets the size of an <code>OacEncoder</code> structure.
   * @param[in] channels <tt>int</tt>: Number of channels.
   *                                   This must be 1 or 2.
   * @returns The size in bytes.
   * @note Since this function does not take the application as input, it will overestimate
-  * the size required for OPUS_APPLICATION_RESTRICTED_SILK and OPUS_APPLICATION_RESTRICTED_CELT.
+  * the size required for OAC_APPLICATION_RESTRICTED_SILK and OAC_APPLICATION_RESTRICTED_CELT.
   * That is generally not a problem, except when trying to know the size to use for a copy.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_encoder_get_size(int channels);
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_encoder_get_size(int channels);
 
 /**
  */
@@ -179,68 +179,68 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_encoder_get_size(int channels);
 /** Allocates and initializes an encoder state.
  * There are three coding modes:
  *
- * @ref OPUS_APPLICATION_VOIP gives best quality at a given bitrate for voice
+ * @ref OAC_APPLICATION_VOIP gives best quality at a given bitrate for voice
  *    signals. It enhances the  input signal by high-pass filtering and
  *    emphasizing formants and harmonics. Optionally  it includes in-band
  *    forward error correction to protect against packet loss. Use this
  *    mode for typical VoIP applications. Because of the enhancement,
  *    even at high bitrates the output may sound different from the input.
  *
- * @ref OPUS_APPLICATION_AUDIO gives best quality at a given bitrate for most
+ * @ref OAC_APPLICATION_AUDIO gives best quality at a given bitrate for most
  *    non-voice signals like music. Use this mode for music and mixed
  *    (music/voice) content, broadcast, and applications requiring less
  *    than 15 ms of coding delay.
  *
- * @ref OPUS_APPLICATION_RESTRICTED_LOWDELAY configures low-delay mode that
+ * @ref OAC_APPLICATION_RESTRICTED_LOWDELAY configures low-delay mode that
  *    disables the speech-optimized mode in exchange for slightly reduced delay.
  *    This mode can only be set on an newly initialized or freshly reset encoder
  *    because it changes the codec delay.
  *
  * This is useful when the caller knows that the speech-optimized modes will not be needed (use with caution).
- * @param [in] Fs <tt>opus_int32</tt>: Sampling rate of input signal (Hz)
+ * @param [in] Fs <tt>oac_int32</tt>: Sampling rate of input signal (Hz)
  *                                     This must be one of 8000, 12000, 16000,
  *                                     24000, or 48000.
  * @param [in] channels <tt>int</tt>: Number of channels (1 or 2) in input signal
- * @param [in] application <tt>int</tt>: Coding mode (one of @ref OPUS_APPLICATION_VOIP, @ref OPUS_APPLICATION_AUDIO, or @ref OPUS_APPLICATION_RESTRICTED_LOWDELAY)
- * @param [out] error <tt>int*</tt>: @ref opus_errorcodes
- * @note Regardless of the sampling rate and number channels selected, the Opus encoder
+ * @param [in] application <tt>int</tt>: Coding mode (one of @ref OAC_APPLICATION_VOIP, @ref OAC_APPLICATION_AUDIO, or @ref OAC_APPLICATION_RESTRICTED_LOWDELAY)
+ * @param [out] error <tt>int*</tt>: @ref oac_errorcodes
+ * @note Regardless of the sampling rate and number channels selected, the Oac encoder
  * can switch to a lower audio bandwidth or number of channels if the bitrate
  * selected is too low. This also means that it is safe to always use 48 kHz stereo input
  * and let the encoder optimize the encoding.
  */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusEncoder *opus_encoder_create(
-    opus_int32 Fs,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT OacEncoder *oac_encoder_create(
+    oac_int32 Fs,
     int channels,
     int application,
     int *error
 );
 
 /** Initializes a previously allocated encoder state
-  * The memory pointed to by st must be at least the size returned by opus_encoder_get_size().
+  * The memory pointed to by st must be at least the size returned by oac_encoder_get_size().
   * This is intended for applications which use their own allocator instead of malloc.
-  * @see opus_encoder_create(),opus_encoder_get_size()
-  * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
-  * @param [in] st <tt>OpusEncoder*</tt>: Encoder state
-  * @param [in] Fs <tt>opus_int32</tt>: Sampling rate of input signal (Hz)
+  * @see oac_encoder_create(),oac_encoder_get_size()
+  * To reset a previously initialized state, use the #OAC_RESET_STATE CTL.
+  * @param [in] st <tt>OacEncoder*</tt>: Encoder state
+  * @param [in] Fs <tt>oac_int32</tt>: Sampling rate of input signal (Hz)
  *                                      This must be one of 8000, 12000, 16000,
  *                                      24000, or 48000.
   * @param [in] channels <tt>int</tt>: Number of channels (1 or 2) in input signal
-  * @param [in] application <tt>int</tt>: Coding mode (one of OPUS_APPLICATION_VOIP, OPUS_APPLICATION_AUDIO, or OPUS_APPLICATION_RESTRICTED_LOWDELAY)
-  * @retval #OPUS_OK Success or @ref opus_errorcodes
+  * @param [in] application <tt>int</tt>: Coding mode (one of OAC_APPLICATION_VOIP, OAC_APPLICATION_AUDIO, or OAC_APPLICATION_RESTRICTED_LOWDELAY)
+  * @retval #OAC_OK Success or @ref oac_errorcodes
   */
-OPUS_EXPORT int opus_encoder_init(
-    OpusEncoder *st,
-    opus_int32 Fs,
+OAC_EXPORT int oac_encoder_init(
+    OacEncoder *st,
+    oac_int32 Fs,
     int channels,
     int application
-) OPUS_ARG_NONNULL(1);
+) OAC_ARG_NONNULL(1);
 
-/** Encodes an Opus frame.
-  * @param [in] st <tt>OpusEncoder*</tt>: Encoder state
-  * @param [in] pcm <tt>opus_int16*</tt>: Input signal (interleaved if 2 channels). length is frame_size*channels*sizeof(opus_int16)
+/** Encodes an Oac frame.
+  * @param [in] st <tt>OacEncoder*</tt>: Encoder state
+  * @param [in] pcm <tt>oac_int16*</tt>: Input signal (interleaved if 2 channels). length is frame_size*channels*sizeof(oac_int16)
   * @param [in] frame_size <tt>int</tt>: Number of samples per channel in the
   *                                      input signal.
-  *                                      This must be an Opus frame size for
+  *                                      This must be an Oac frame size for
   *                                      the encoder's sampling rate.
   *                                      For example, at 48 kHz the permitted
   *                                      values are 120, 240, 480, 960, 1920,
@@ -252,31 +252,31 @@ OPUS_EXPORT int opus_encoder_init(
   * @param [out] data <tt>unsigned char*</tt>: Output payload.
   *                                            This must contain storage for at
   *                                            least \a max_data_bytes.
-  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
   *                                                 memory for the output
   *                                                 payload. This may be
   *                                                 used to impose an upper limit on
   *                                                 the instant bitrate, but should
   *                                                 not be used as the only bitrate
-  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control. Use #OAC_SET_BITRATE to
   *                                                 control the bitrate.
   * @returns The length of the encoded packet (in bytes) on success or a
-  *          negative error code (see @ref opus_errorcodes) on failure.
+  *          negative error code (see @ref oac_errorcodes) on failure.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_encode(
-    OpusEncoder *st,
-    const opus_int16 *pcm,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_encode(
+    OacEncoder *st,
+    const oac_int16 *pcm,
     int frame_size,
     unsigned char *data,
-    opus_int32 max_data_bytes
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+    oac_int32 max_data_bytes
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
-/** Encodes an Opus frame.
-  * @param [in] st <tt>OpusEncoder*</tt>: Encoder state
-  * @param [in] pcm <tt>opus_int32*</tt>: Input signal (interleaved if 2 channels) representing (or slightly exceeding) 24-bit values. length is frame_size*channels*sizeof(opus_int32)
+/** Encodes an Oac frame.
+  * @param [in] st <tt>OacEncoder*</tt>: Encoder state
+  * @param [in] pcm <tt>oac_int32*</tt>: Input signal (interleaved if 2 channels) representing (or slightly exceeding) 24-bit values. length is frame_size*channels*sizeof(oac_int32)
   * @param [in] frame_size <tt>int</tt>: Number of samples per channel in the
   *                                      input signal.
-  *                                      This must be an Opus frame size for
+  *                                      This must be an Oac frame size for
   *                                      the encoder's sampling rate.
   *                                      For example, at 48 kHz the permitted
   *                                      values are 120, 240, 480, 960, 1920,
@@ -288,27 +288,27 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_encode(
   * @param [out] data <tt>unsigned char*</tt>: Output payload.
   *                                            This must contain storage for at
   *                                            least \a max_data_bytes.
-  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
   *                                                 memory for the output
   *                                                 payload. This may be
   *                                                 used to impose an upper limit on
   *                                                 the instant bitrate, but should
   *                                                 not be used as the only bitrate
-  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control. Use #OAC_SET_BITRATE to
   *                                                 control the bitrate.
   * @returns The length of the encoded packet (in bytes) on success or a
-  *          negative error code (see @ref opus_errorcodes) on failure.
+  *          negative error code (see @ref oac_errorcodes) on failure.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_encode24(
-    OpusEncoder *st,
-    const opus_int32 *pcm,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_encode24(
+    OacEncoder *st,
+    const oac_int32 *pcm,
     int frame_size,
     unsigned char *data,
-    opus_int32 max_data_bytes
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+    oac_int32 max_data_bytes
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
-/** Encodes an Opus frame from floating point input.
-  * @param [in] st <tt>OpusEncoder*</tt>: Encoder state
+/** Encodes an Oac frame from floating point input.
+  * @param [in] st <tt>OacEncoder*</tt>: Encoder state
   * @param [in] pcm <tt>float*</tt>: Input in float format (interleaved if 2 channels), with a normal range of +/-1.0.
   *          Samples with a range beyond +/-1.0 are supported but will
   *          be clipped by decoders using the integer API and should
@@ -317,7 +317,7 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_encode24(
   *          length is frame_size*channels*sizeof(float)
   * @param [in] frame_size <tt>int</tt>: Number of samples per channel in the
   *                                      input signal.
-  *                                      This must be an Opus frame size for
+  *                                      This must be an Oac frame size for
   *                                      the encoder's sampling rate.
   *                                      For example, at 48 kHz the permitted
   *                                      values are 120, 240, 480, 960, 1920,
@@ -329,94 +329,94 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_encode24(
   * @param [out] data <tt>unsigned char*</tt>: Output payload.
   *                                            This must contain storage for at
   *                                            least \a max_data_bytes.
-  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
   *                                                 memory for the output
   *                                                 payload. This may be
   *                                                 used to impose an upper limit on
   *                                                 the instant bitrate, but should
   *                                                 not be used as the only bitrate
-  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control. Use #OAC_SET_BITRATE to
   *                                                 control the bitrate.
   * @returns The length of the encoded packet (in bytes) on success or a
-  *          negative error code (see @ref opus_errorcodes) on failure.
+  *          negative error code (see @ref oac_errorcodes) on failure.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_encode_float(
-    OpusEncoder *st,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_encode_float(
+    OacEncoder *st,
     const float *pcm,
     int frame_size,
     unsigned char *data,
-    opus_int32 max_data_bytes
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+    oac_int32 max_data_bytes
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
-/** Frees an <code>OpusEncoder</code> allocated by opus_encoder_create().
-  * @param[in] st <tt>OpusEncoder*</tt>: State to be freed.
+/** Frees an <code>OacEncoder</code> allocated by oac_encoder_create().
+  * @param[in] st <tt>OacEncoder*</tt>: State to be freed.
   */
-OPUS_EXPORT void opus_encoder_destroy(OpusEncoder *st);
+OAC_EXPORT void oac_encoder_destroy(OacEncoder *st);
 
-/** Perform a CTL function on an Opus encoder.
+/** Perform a CTL function on an Oac encoder.
   *
   * Generally the request and subsequent arguments are generated
   * by a convenience macro.
-  * @param st <tt>OpusEncoder*</tt>: Encoder state.
+  * @param st <tt>OacEncoder*</tt>: Encoder state.
   * @param request This and all remaining parameters should be replaced by one
-  *                of the convenience macros in @ref opus_genericctls or
-  *                @ref opus_encoderctls.
-  * @see opus_genericctls
-  * @see opus_encoderctls
+  *                of the convenience macros in @ref oac_genericctls or
+  *                @ref oac_encoderctls.
+  * @see oac_genericctls
+  * @see oac_encoderctls
   */
-OPUS_EXPORT int opus_encoder_ctl(OpusEncoder *st, int request, ...) OPUS_ARG_NONNULL(1);
+OAC_EXPORT int oac_encoder_ctl(OacEncoder *st, int request, ...) OAC_ARG_NONNULL(1);
 /**@}*/
 
-/** @defgroup opus_decoder Opus Decoder
+/** @defgroup oac_decoder Oac Decoder
   * @{
   *
-  * @brief This page describes the process and functions used to decode Opus.
+  * @brief This page describes the process and functions used to decode Oac.
   *
   * The decoding process also starts with creating a decoder
   * state. This can be done with:
   * @code
   * int          error;
-  * OpusDecoder *dec;
-  * dec = opus_decoder_create(Fs, channels, &error);
+  * OacDecoder *dec;
+  * dec = oac_decoder_create(Fs, channels, &error);
   * @endcode
   * where
   * @li Fs is the sampling rate and must be 8000, 12000, 16000, 24000, or 48000
   * @li channels is the number of channels (1 or 2)
-  * @li error will hold the error code in case of failure (or #OPUS_OK on success)
+  * @li error will hold the error code in case of failure (or #OAC_OK on success)
   * @li the return value is a newly created decoder state to be used for decoding
   *
-  * While opus_decoder_create() allocates memory for the state, it's also possible
+  * While oac_decoder_create() allocates memory for the state, it's also possible
   * to initialize pre-allocated memory:
   * @code
   * int          size;
   * int          error;
-  * OpusDecoder *dec;
-  * size = opus_decoder_get_size(channels);
+  * OacDecoder *dec;
+  * size = oac_decoder_get_size(channels);
   * dec = malloc(size);
-  * error = opus_decoder_init(dec, Fs, channels);
+  * error = oac_decoder_init(dec, Fs, channels);
   * @endcode
-  * where opus_decoder_get_size() returns the required size for the decoder state. Note that
+  * where oac_decoder_get_size() returns the required size for the decoder state. Note that
   * future versions of this code may change the size, so no assumptions should be made about it.
   *
   * The decoder state is always continuous in memory and only a shallow copy is sufficient
   * to copy it (e.g. memcpy())
   *
-  * To decode a frame, opus_decode() or opus_decode_float() must be called with a packet of compressed audio data:
+  * To decode a frame, oac_decode() or oac_decode_float() must be called with a packet of compressed audio data:
   * @code
-  * frame_size = opus_decode(dec, packet, len, decoded, max_size, 0);
+  * frame_size = oac_decode(dec, packet, len, decoded, max_size, 0);
   * @endcode
   * where
   *
   * @li packet is the byte array containing the compressed data
   * @li len is the exact number of bytes contained in the packet
-  * @li decoded is the decoded audio data in opus_int16 (or float for opus_decode_float())
+  * @li decoded is the decoded audio data in oac_int16 (or float for oac_decode_float())
   * @li max_size is the max duration of the frame in samples (per channel) that can fit into the decoded_frame array
   *
-  * opus_decode() and opus_decode_float() return the number of samples (per channel) decoded from the packet.
+  * oac_decode() and oac_decode_float() return the number of samples (per channel) decoded from the packet.
   * If that value is negative, then an error has occurred. This can occur if the packet is corrupted or if the audio
   * buffer is too small to hold the decoded audio.
   *
-  * Opus is a stateful codec with overlapping blocks and as a result Opus
+  * Oac is a stateful codec with overlapping blocks and as a result Oac
   * packets are not coded independently of each other. Packets must be
   * passed into the decoder serially and in the correct order for a correct
   * decode. Lost packets can be replaced with loss concealment by calling
@@ -430,43 +430,43 @@ OPUS_EXPORT int opus_encoder_ctl(OpusEncoder *st, int request, ...) OPUS_ARG_NON
   *
   */
 
-/** Opus decoder state.
-  * This contains the complete state of an Opus decoder.
+/** Oac decoder state.
+  * This contains the complete state of an Oac decoder.
   * It is position independent and can be freely copied.
-  * @see opus_decoder_create,opus_decoder_init
+  * @see oac_decoder_create,oac_decoder_init
   */
-typedef struct OpusDecoder OpusDecoder;
+typedef struct OacDecoder OacDecoder;
 
-/** Opus DRED decoder.
-  * This contains the complete state of an Opus DRED decoder.
+/** Oac DRED decoder.
+  * This contains the complete state of an Oac DRED decoder.
   * It is position independent and can be freely copied.
-  * @see opus_dred_decoder_create,opus_dred_decoder_init
+  * @see oac_dred_decoder_create,oac_dred_decoder_init
   */
-typedef struct OpusDREDDecoder OpusDREDDecoder;
+typedef struct OacDREDDecoder OacDREDDecoder;
 
 
-/** Opus DRED state.
-  * This contains the complete state of an Opus DRED packet.
+/** Oac DRED state.
+  * This contains the complete state of an Oac DRED packet.
   * It is position independent and can be freely copied.
-  * @see opus_dred_create,opus_dred_init
+  * @see oac_dred_create,oac_dred_init
   */
-typedef struct OpusDRED OpusDRED;
+typedef struct OacDRED OacDRED;
 
-/** Gets the size of an <code>OpusDecoder</code> structure.
+/** Gets the size of an <code>OacDecoder</code> structure.
   * @param [in] channels <tt>int</tt>: Number of channels.
   *                                    This must be 1 or 2.
   * @returns The size in bytes.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decoder_get_size(int channels);
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_decoder_get_size(int channels);
 
 /** Allocates and initializes a decoder state.
-  * @param [in] Fs <tt>opus_int32</tt>: Sample rate to decode at (Hz).
+  * @param [in] Fs <tt>oac_int32</tt>: Sample rate to decode at (Hz).
   *                                     This must be one of 8000, 12000, 16000,
   *                                     24000, or 48000.
   * @param [in] channels <tt>int</tt>: Number of channels (1 or 2) to decode
-  * @param [out] error <tt>int*</tt>: #OPUS_OK Success or @ref opus_errorcodes
+  * @param [out] error <tt>int*</tt>: #OAC_OK Success or @ref oac_errorcodes
   *
-  * Internally Opus stores data at 48000 Hz, so that should be the default
+  * Internally Oac stores data at 48000 Hz, so that should be the default
   * value for Fs. However, the decoder can efficiently decode to buffers
   * at 8, 12, 16, and 24 kHz so if for some reason the caller cannot use
   * data at the full sample rate, or knows the compressed data doesn't
@@ -474,35 +474,35 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decoder_get_size(int channels);
   * rate. Likewise, the decoder is capable of filling in either mono or
   * interleaved stereo pcm buffers, at the caller's request.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusDecoder *opus_decoder_create(
-    opus_int32 Fs,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT OacDecoder *oac_decoder_create(
+    oac_int32 Fs,
     int channels,
     int *error
 );
 
 /** Initializes a previously allocated decoder state.
-  * The state must be at least the size returned by opus_decoder_get_size().
-  * This is intended for applications which use their own allocator instead of malloc. @see opus_decoder_create,opus_decoder_get_size
-  * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
-  * @param [in] st <tt>OpusDecoder*</tt>: Decoder state.
-  * @param [in] Fs <tt>opus_int32</tt>: Sampling rate to decode to (Hz).
+  * The state must be at least the size returned by oac_decoder_get_size().
+  * This is intended for applications which use their own allocator instead of malloc. @see oac_decoder_create,oac_decoder_get_size
+  * To reset a previously initialized state, use the #OAC_RESET_STATE CTL.
+  * @param [in] st <tt>OacDecoder*</tt>: Decoder state.
+  * @param [in] Fs <tt>oac_int32</tt>: Sampling rate to decode to (Hz).
   *                                     This must be one of 8000, 12000, 16000,
   *                                     24000, or 48000.
   * @param [in] channels <tt>int</tt>: Number of channels (1 or 2) to decode
-  * @retval #OPUS_OK Success or @ref opus_errorcodes
+  * @retval #OAC_OK Success or @ref oac_errorcodes
   */
-OPUS_EXPORT int opus_decoder_init(
-    OpusDecoder *st,
-    opus_int32 Fs,
+OAC_EXPORT int oac_decoder_init(
+    OacDecoder *st,
+    oac_int32 Fs,
     int channels
-) OPUS_ARG_NONNULL(1);
+) OAC_ARG_NONNULL(1);
 
-/** Decode an Opus packet.
-  * @param [in] st <tt>OpusDecoder*</tt>: Decoder state
+/** Decode an Oac packet.
+  * @param [in] st <tt>OacDecoder*</tt>: Decoder state
   * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
-  * @param [in] len <tt>opus_int32</tt>: Number of bytes in payload*
-  * @param [out] pcm <tt>opus_int16*</tt>: Output signal (interleaved if 2 channels). length
-  *  is frame_size*channels*sizeof(opus_int16)
+  * @param [in] len <tt>oac_int32</tt>: Number of bytes in payload*
+  * @param [out] pcm <tt>oac_int16*</tt>: Output signal (interleaved if 2 channels). length
+  *  is frame_size*channels*sizeof(oac_int16)
   * @param [in] frame_size Number of samples per channel of available space in \a pcm.
   *  If this is less than the maximum packet duration (120ms; 5760 for 48kHz), this function will
   *  not be capable of decoding some packets. In the case of PLC (data==NULL) or FEC (decode_fec=1),
@@ -511,23 +511,23 @@ OPUS_EXPORT int opus_decoder_init(
   *  FEC cases, frame_size <b>must</b> be a multiple of 2.5 ms.
   * @param [in] decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band forward error correction data be
   *  decoded. If no such data is available, the frame is decoded as if it were lost.
-  * @returns Number of decoded samples per channel or @ref opus_errorcodes
+  * @returns Number of decoded samples per channel or @ref oac_errorcodes
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decode(
-    OpusDecoder *st,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_decode(
+    OacDecoder *st,
     const unsigned char *data,
-    opus_int32 len,
-    opus_int16 *pcm,
+    oac_int32 len,
+    oac_int16 *pcm,
     int frame_size,
     int decode_fec
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
-/** Decode an Opus packet.
-  * @param [in] st <tt>OpusDecoder*</tt>: Decoder state
+/** Decode an Oac packet.
+  * @param [in] st <tt>OacDecoder*</tt>: Decoder state
   * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
-  * @param [in] len <tt>opus_int32</tt>: Number of bytes in payload*
-  * @param [out] pcm <tt>opus_int32*</tt>: Output signal (interleaved if 2 channels) representing (or slightly exceeding) 24-bit values. length
-  *  is frame_size*channels*sizeof(opus_int32)
+  * @param [in] len <tt>oac_int32</tt>: Number of bytes in payload*
+  * @param [out] pcm <tt>oac_int32*</tt>: Output signal (interleaved if 2 channels) representing (or slightly exceeding) 24-bit values. length
+  *  is frame_size*channels*sizeof(oac_int32)
   * @param [in] frame_size Number of samples per channel of available space in \a pcm.
   *  If this is less than the maximum packet duration (120ms; 5760 for 48kHz), this function will
   *  not be capable of decoding some packets. In the case of PLC (data==NULL) or FEC (decode_fec=1),
@@ -536,21 +536,21 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decode(
   *  FEC cases, frame_size <b>must</b> be a multiple of 2.5 ms.
   * @param [in] decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band forward error correction data be
   *  decoded. If no such data is available, the frame is decoded as if it were lost.
-  * @returns Number of decoded samples or @ref opus_errorcodes
+  * @returns Number of decoded samples or @ref oac_errorcodes
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decode24(
-    OpusDecoder *st,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_decode24(
+    OacDecoder *st,
     const unsigned char *data,
-    opus_int32 len,
-    opus_int32 *pcm,
+    oac_int32 len,
+    oac_int32 *pcm,
     int frame_size,
     int decode_fec
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
-/** Decode an Opus packet with floating point output.
-  * @param [in] st <tt>OpusDecoder*</tt>: Decoder state
+/** Decode an Oac packet with floating point output.
+  * @param [in] st <tt>OacDecoder*</tt>: Decoder state
   * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
-  * @param [in] len <tt>opus_int32</tt>: Number of bytes in payload
+  * @param [in] len <tt>oac_int32</tt>: Number of bytes in payload
   * @param [out] pcm <tt>float*</tt>: Output signal (interleaved if 2 channels). length
   *  is frame_size*channels*sizeof(float)
   * @param [in] frame_size Number of samples per channel of available space in \a pcm.
@@ -561,231 +561,231 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decode24(
   *  FEC cases, frame_size <b>must</b> be a multiple of 2.5 ms.
   * @param [in] decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band forward error correction data be
   *  decoded. If no such data is available the frame is decoded as if it were lost.
-  * @returns Number of decoded samples per channel or @ref opus_errorcodes
+  * @returns Number of decoded samples per channel or @ref oac_errorcodes
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decode_float(
-    OpusDecoder *st,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_decode_float(
+    OacDecoder *st,
     const unsigned char *data,
-    opus_int32 len,
+    oac_int32 len,
     float *pcm,
     int frame_size,
     int decode_fec
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
-/** Perform a CTL function on an Opus decoder.
+/** Perform a CTL function on an Oac decoder.
   *
   * Generally the request and subsequent arguments are generated
   * by a convenience macro.
-  * @param st <tt>OpusDecoder*</tt>: Decoder state.
+  * @param st <tt>OacDecoder*</tt>: Decoder state.
   * @param request This and all remaining parameters should be replaced by one
-  *                of the convenience macros in @ref opus_genericctls or
-  *                @ref opus_decoderctls.
-  * @see opus_genericctls
-  * @see opus_decoderctls
+  *                of the convenience macros in @ref oac_genericctls or
+  *                @ref oac_decoderctls.
+  * @see oac_genericctls
+  * @see oac_decoderctls
   */
-OPUS_EXPORT int opus_decoder_ctl(OpusDecoder *st, int request, ...) OPUS_ARG_NONNULL(1);
+OAC_EXPORT int oac_decoder_ctl(OacDecoder *st, int request, ...) OAC_ARG_NONNULL(1);
 
-/** Frees an <code>OpusDecoder</code> allocated by opus_decoder_create().
-  * @param[in] st <tt>OpusDecoder*</tt>: State to be freed.
+/** Frees an <code>OacDecoder</code> allocated by oac_decoder_create().
+  * @param[in] st <tt>OacDecoder*</tt>: State to be freed.
   */
-OPUS_EXPORT void opus_decoder_destroy(OpusDecoder *st);
+OAC_EXPORT void oac_decoder_destroy(OacDecoder *st);
 
-/** Gets the size of an <code>OpusDREDDecoder</code> structure.
+/** Gets the size of an <code>OacDREDDecoder</code> structure.
   * @returns The size in bytes.
   */
-OPUS_EXPORT int opus_dred_decoder_get_size(void);
+OAC_EXPORT int oac_dred_decoder_get_size(void);
 
-/** Allocates and initializes an OpusDREDDecoder state.
-  * @param [out] error <tt>int*</tt>: #OPUS_OK Success or @ref opus_errorcodes
+/** Allocates and initializes an OacDREDDecoder state.
+  * @param [out] error <tt>int*</tt>: #OAC_OK Success or @ref oac_errorcodes
   */
-OPUS_EXPORT OpusDREDDecoder *opus_dred_decoder_create(int *error);
+OAC_EXPORT OacDREDDecoder *oac_dred_decoder_create(int *error);
 
-/** Initializes an <code>OpusDREDDecoder</code> state.
-  * @param[in] dec <tt>OpusDREDDecoder*</tt>: State to be initialized.
+/** Initializes an <code>OacDREDDecoder</code> state.
+  * @param[in] dec <tt>OacDREDDecoder*</tt>: State to be initialized.
   */
-OPUS_EXPORT int opus_dred_decoder_init(OpusDREDDecoder *dec);
+OAC_EXPORT int oac_dred_decoder_init(OacDREDDecoder *dec);
 
-/** Frees an <code>OpusDREDDecoder</code> allocated by opus_dred_decoder_create().
-  * @param[in] dec <tt>OpusDREDDecoder*</tt>: State to be freed.
+/** Frees an <code>OacDREDDecoder</code> allocated by oac_dred_decoder_create().
+  * @param[in] dec <tt>OacDREDDecoder*</tt>: State to be freed.
   */
-OPUS_EXPORT void opus_dred_decoder_destroy(OpusDREDDecoder *dec);
+OAC_EXPORT void oac_dred_decoder_destroy(OacDREDDecoder *dec);
 
-/** Perform a CTL function on an Opus DRED decoder.
+/** Perform a CTL function on an Oac DRED decoder.
   *
   * Generally the request and subsequent arguments are generated
   * by a convenience macro.
-  * @param dred_dec <tt>OpusDREDDecoder*</tt>: DRED Decoder state.
+  * @param dred_dec <tt>OacDREDDecoder*</tt>: DRED Decoder state.
   * @param request This and all remaining parameters should be replaced by one
-  *                of the convenience macros in @ref opus_genericctls or
-  *                @ref opus_decoderctls.
-  * @see opus_genericctls
-  * @see opus_decoderctls
+  *                of the convenience macros in @ref oac_genericctls or
+  *                @ref oac_decoderctls.
+  * @see oac_genericctls
+  * @see oac_decoderctls
   */
-OPUS_EXPORT int opus_dred_decoder_ctl(OpusDREDDecoder *dred_dec, int request, ...);
+OAC_EXPORT int oac_dred_decoder_ctl(OacDREDDecoder *dred_dec, int request, ...);
 
-/** Gets the size of an <code>OpusDRED</code> structure.
+/** Gets the size of an <code>OacDRED</code> structure.
   * @returns The size in bytes.
   */
-OPUS_EXPORT int opus_dred_get_size(void);
+OAC_EXPORT int oac_dred_get_size(void);
 
 /** Allocates and initializes a DRED state.
-  * @param [out] error <tt>int*</tt>: #OPUS_OK Success or @ref opus_errorcodes
+  * @param [out] error <tt>int*</tt>: #OAC_OK Success or @ref oac_errorcodes
   */
-OPUS_EXPORT OpusDRED *opus_dred_alloc(int *error);
+OAC_EXPORT OacDRED *oac_dred_alloc(int *error);
 
-/** Frees an <code>OpusDRED</code> allocated by opus_dred_create().
-  * @param[in] dec <tt>OpusDRED*</tt>: State to be freed.
+/** Frees an <code>OacDRED</code> allocated by oac_dred_create().
+  * @param[in] dec <tt>OacDRED*</tt>: State to be freed.
   */
-OPUS_EXPORT void opus_dred_free(OpusDRED *dec);
+OAC_EXPORT void oac_dred_free(OacDRED *dec);
 
-/** Decode an Opus DRED packet.
-  * @param [in] dred_dec <tt>OpusDRED*</tt>: DRED Decoder state
-  * @param [in] dred <tt>OpusDRED*</tt>: DRED state
+/** Decode an Oac DRED packet.
+  * @param [in] dred_dec <tt>OacDRED*</tt>: DRED Decoder state
+  * @param [in] dred <tt>OacDRED*</tt>: DRED state
   * @param [in] data <tt>char*</tt>: Input payload
-  * @param [in] len <tt>opus_int32</tt>: Number of bytes in payload
-  * @param [in] max_dred_samples <tt>opus_int32</tt>: Maximum number of DRED samples that may be needed (if available in the packet).
-  * @param [in] sampling_rate <tt>opus_int32</tt>: Sampling rate used for max_dred_samples argument. Needs not match the actual sampling rate of the decoder.
-  * @param [out] dred_end <tt>opus_int32*</tt>: Number of non-encoded (silence) samples between the DRED timestamp and the last DRED sample.
-  * @param [in] defer_processing <tt>int</tt>: Flag (0 or 1). If set to one, the CPU-intensive part of the DRED decoding is deferred until opus_dred_process() is called.
-  * @returns Offset (positive) of the first decoded DRED samples, zero if no DRED is present, or @ref opus_errorcodes
+  * @param [in] len <tt>oac_int32</tt>: Number of bytes in payload
+  * @param [in] max_dred_samples <tt>oac_int32</tt>: Maximum number of DRED samples that may be needed (if available in the packet).
+  * @param [in] sampling_rate <tt>oac_int32</tt>: Sampling rate used for max_dred_samples argument. Needs not match the actual sampling rate of the decoder.
+  * @param [out] dred_end <tt>oac_int32*</tt>: Number of non-encoded (silence) samples between the DRED timestamp and the last DRED sample.
+  * @param [in] defer_processing <tt>int</tt>: Flag (0 or 1). If set to one, the CPU-intensive part of the DRED decoding is deferred until oac_dred_process() is called.
+  * @returns Offset (positive) of the first decoded DRED samples, zero if no DRED is present, or @ref oac_errorcodes
   */
-OPUS_EXPORT int opus_dred_parse(OpusDREDDecoder *dred_dec, OpusDRED *dred, const unsigned char *data, opus_int32 len, opus_int32 max_dred_samples, opus_int32 sampling_rate, int *dred_end, int defer_processing) OPUS_ARG_NONNULL(1);
+OAC_EXPORT int oac_dred_parse(OacDREDDecoder *dred_dec, OacDRED *dred, const unsigned char *data, oac_int32 len, oac_int32 max_dred_samples, oac_int32 sampling_rate, int *dred_end, int defer_processing) OAC_ARG_NONNULL(1);
 
-/** Finish decoding an Opus DRED packet. The function only needs to be called if opus_dred_parse() was called with defer_processing=1.
+/** Finish decoding an Oac DRED packet. The function only needs to be called if oac_dred_parse() was called with defer_processing=1.
   * The source and destination will often be the same DRED state.
-  * @param [in] dred_dec <tt>OpusDRED*</tt>: DRED Decoder state
-  * @param [in] src <tt>OpusDRED*</tt>: Source DRED state to start the processing from.
-  * @param [out] dst <tt>OpusDRED*</tt>: Destination DRED state to store the updated state after processing.
-  * @returns @ref opus_errorcodes
+  * @param [in] dred_dec <tt>OacDRED*</tt>: DRED Decoder state
+  * @param [in] src <tt>OacDRED*</tt>: Source DRED state to start the processing from.
+  * @param [out] dst <tt>OacDRED*</tt>: Destination DRED state to store the updated state after processing.
+  * @returns @ref oac_errorcodes
   */
-OPUS_EXPORT int opus_dred_process(OpusDREDDecoder *dred_dec, const OpusDRED *src, OpusDRED *dst);
-
-/** Decode audio from an Opus DRED packet with 16-bit output.
-  * @param [in] st <tt>OpusDecoder*</tt>: Decoder state
-  * @param [in] dred <tt>OpusDRED*</tt>: DRED state
-  * @param [in] dred_offset <tt>opus_int32</tt>: position of the redundancy to decode (in samples before the beginning of the real audio data in the packet).
-  * @param [out] pcm <tt>opus_int16*</tt>: Output signal (interleaved if 2 channels). length
-  *  is frame_size*channels*sizeof(opus_int16)
+OAC_EXPORT int oac_dred_process(OacDREDDecoder *dred_dec, const OacDRED *src, OacDRED *dst);
+
+/** Decode audio from an Oac DRED packet with 16-bit output.
+  * @param [in] st <tt>OacDecoder*</tt>: Decoder state
+  * @param [in] dred <tt>OacDRED*</tt>: DRED state
+  * @param [in] dred_offset <tt>oac_int32</tt>: position of the redundancy to decode (in samples before the beginning of the real audio data in the packet).
+  * @param [out] pcm <tt>oac_int16*</tt>: Output signal (interleaved if 2 channels). length
+  *  is frame_size*channels*sizeof(oac_int16)
   * @param [in] frame_size Number of samples per channel to decode in \a pcm.
   *  frame_size <b>must</b> be a multiple of 2.5 ms.
-  * @returns Number of decoded samples or @ref opus_errorcodes
+  * @returns Number of decoded samples or @ref oac_errorcodes
   */
-OPUS_EXPORT int opus_decoder_dred_decode(OpusDecoder *st, const OpusDRED *dred, opus_int32 dred_offset, opus_int16 *pcm, opus_int32 frame_size);
-
-/** Decode audio from an Opus DRED packet with 24-bit output.
-  * @param [in] st <tt>OpusDecoder*</tt>: Decoder state
-  * @param [in] dred <tt>OpusDRED*</tt>: DRED state
-  * @param [in] dred_offset <tt>opus_int32</tt>: position of the redundancy to decode (in samples before the beginning of the real audio data in the packet).
-  * @param [out] pcm <tt>opus_int32*</tt>: Output signal (interleaved if 2 channels). length
-  *  is frame_size*channels*sizeof(opus_int16)
+OAC_EXPORT int oac_decoder_dred_decode(OacDecoder *st, const OacDRED *dred, oac_int32 dred_offset, oac_int16 *pcm, oac_int32 frame_size);
+
+/** Decode audio from an Oac DRED packet with 24-bit output.
+  * @param [in] st <tt>OacDecoder*</tt>: Decoder state
+  * @param [in] dred <tt>OacDRED*</tt>: DRED state
+  * @param [in] dred_offset <tt>oac_int32</tt>: position of the redundancy to decode (in samples before the beginning of the real audio data in the packet).
+  * @param [out] pcm <tt>oac_int32*</tt>: Output signal (interleaved if 2 channels). length
+  *  is frame_size*channels*sizeof(oac_int16)
   * @param [in] frame_size Number of samples per channel to decode in \a pcm.
   *  frame_size <b>must</b> be a multiple of 2.5 ms.
-  * @returns Number of decoded samples or @ref opus_errorcodes
+  * @returns Number of decoded samples or @ref oac_errorcodes
   */
-OPUS_EXPORT int opus_decoder_dred_decode24(OpusDecoder *st, const OpusDRED *dred, opus_int32 dred_offset, opus_int32 *pcm, opus_int32 frame_size);
+OAC_EXPORT int oac_decoder_dred_decode24(OacDecoder *st, const OacDRED *dred, oac_int32 dred_offset, oac_int32 *pcm, oac_int32 frame_size);
 
-/** Decode audio from an Opus DRED packet with floating point output.
-  * @param [in] st <tt>OpusDecoder*</tt>: Decoder state
-  * @param [in] dred <tt>OpusDRED*</tt>: DRED state
-  * @param [in] dred_offset <tt>opus_int32</tt>: position of the redundancy to decode (in samples before the beginning of the real audio data in the packet).
+/** Decode audio from an Oac DRED packet with floating point output.
+  * @param [in] st <tt>OacDecoder*</tt>: Decoder state
+  * @param [in] dred <tt>OacDRED*</tt>: DRED state
+  * @param [in] dred_offset <tt>oac_int32</tt>: position of the redundancy to decode (in samples before the beginning of the real audio data in the packet).
   * @param [out] pcm <tt>float*</tt>: Output signal (interleaved if 2 channels). length
   *  is frame_size*channels*sizeof(float)
   * @param [in] frame_size Number of samples per channel to decode in \a pcm.
   *  frame_size <b>must</b> be a multiple of 2.5 ms.
-  * @returns Number of decoded samples or @ref opus_errorcodes
+  * @returns Number of decoded samples or @ref oac_errorcodes
   */
-OPUS_EXPORT int opus_decoder_dred_decode_float(OpusDecoder *st, const OpusDRED *dred, opus_int32 dred_offset, float *pcm, opus_int32 frame_size);
+OAC_EXPORT int oac_decoder_dred_decode_float(OacDecoder *st, const OacDRED *dred, oac_int32 dred_offset, float *pcm, oac_int32 frame_size);
 
 
-/** Parse an opus packet into one or more frames.
-  * Opus_decode will perform this operation internally so most applications do
+/** Parse an oac packet into one or more frames.
+  * Oac_decode will perform this operation internally so most applications do
   * not need to use this function.
   * This function does not copy the frames, the returned pointers are pointers into
   * the input packet.
-  * @param [in] data <tt>char*</tt>: Opus packet to be parsed
-  * @param [in] len <tt>opus_int32</tt>: size of data
+  * @param [in] data <tt>char*</tt>: Oac packet to be parsed
+  * @param [in] len <tt>oac_int32</tt>: size of data
   * @param [out] out_toc <tt>char*</tt>: TOC pointer
   * @param [out] frames <tt>char*[48]</tt> encapsulated frames
-  * @param [out] size <tt>opus_int16[48]</tt> sizes of the encapsulated frames
+  * @param [out] size <tt>oac_int16[48]</tt> sizes of the encapsulated frames
   * @param [out] payload_offset <tt>int*</tt>: returns the position of the payload within the packet (in bytes)
   * @returns number of frames
   */
-OPUS_EXPORT int opus_packet_parse(
+OAC_EXPORT int oac_packet_parse(
    const unsigned char *data,
-   opus_int32 len,
+   oac_int32 len,
    unsigned char *out_toc,
    const unsigned char *frames[48],
-   opus_int16 size[48],
+   oac_int16 size[48],
    int *payload_offset
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(5);
-
-/** Gets the bandwidth of an Opus packet.
-  * @param [in] data <tt>char*</tt>: Opus packet
-  * @retval OPUS_BANDWIDTH_NARROWBAND Narrowband (4kHz bandpass)
-  * @retval OPUS_BANDWIDTH_MEDIUMBAND Mediumband (6kHz bandpass)
-  * @retval OPUS_BANDWIDTH_WIDEBAND Wideband (8kHz bandpass)
-  * @retval OPUS_BANDWIDTH_SUPERWIDEBAND Superwideband (12kHz bandpass)
-  * @retval OPUS_BANDWIDTH_FULLBAND Fullband (20kHz bandpass)
-  * @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(5);
+
+/** Gets the bandwidth of an Oac packet.
+  * @param [in] data <tt>char*</tt>: Oac packet
+  * @retval OAC_BANDWIDTH_NARROWBAND Narrowband (4kHz bandpass)
+  * @retval OAC_BANDWIDTH_MEDIUMBAND Mediumband (6kHz bandpass)
+  * @retval OAC_BANDWIDTH_WIDEBAND Wideband (8kHz bandpass)
+  * @retval OAC_BANDWIDTH_SUPERWIDEBAND Superwideband (12kHz bandpass)
+  * @retval OAC_BANDWIDTH_FULLBAND Fullband (20kHz bandpass)
+  * @retval OAC_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_bandwidth(const unsigned char *data) OPUS_ARG_NONNULL(1);
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_packet_get_bandwidth(const unsigned char *data) OAC_ARG_NONNULL(1);
 
-/** Gets the number of samples per frame from an Opus packet.
-  * @param [in] data <tt>char*</tt>: Opus packet.
+/** Gets the number of samples per frame from an Oac packet.
+  * @param [in] data <tt>char*</tt>: Oac packet.
   *                                  This must contain at least one byte of
   *                                  data.
-  * @param [in] Fs <tt>opus_int32</tt>: Sampling rate in Hz.
+  * @param [in] Fs <tt>oac_int32</tt>: Sampling rate in Hz.
   *                                     This must be a multiple of 400, or
   *                                     inaccurate results will be returned.
   * @returns Number of samples per frame.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_samples_per_frame(const unsigned char *data, opus_int32 Fs) OPUS_ARG_NONNULL(1);
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_packet_get_samples_per_frame(const unsigned char *data, oac_int32 Fs) OAC_ARG_NONNULL(1);
 
-/** Gets the number of channels from an Opus packet.
-  * @param [in] data <tt>char*</tt>: Opus packet
+/** Gets the number of channels from an Oac packet.
+  * @param [in] data <tt>char*</tt>: Oac packet
   * @returns Number of channels
-  * @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+  * @retval OAC_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_nb_channels(const unsigned char *data) OPUS_ARG_NONNULL(1);
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_packet_get_nb_channels(const unsigned char *data) OAC_ARG_NONNULL(1);
 
-/** Gets the number of frames in an Opus packet.
-  * @param [in] packet <tt>char*</tt>: Opus packet
-  * @param [in] len <tt>opus_int32</tt>: Length of packet
+/** Gets the number of frames in an Oac packet.
+  * @param [in] packet <tt>char*</tt>: Oac packet
+  * @param [in] len <tt>oac_int32</tt>: Length of packet
   * @returns Number of frames
-  * @retval OPUS_BAD_ARG Insufficient data was passed to the function
-  * @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+  * @retval OAC_BAD_ARG Insufficient data was passed to the function
+  * @retval OAC_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_nb_frames(const unsigned char packet[], opus_int32 len) OPUS_ARG_NONNULL(1);
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_packet_get_nb_frames(const unsigned char packet[], oac_int32 len) OAC_ARG_NONNULL(1);
 
-/** Gets the number of samples of an Opus packet.
-  * @param [in] packet <tt>char*</tt>: Opus packet
-  * @param [in] len <tt>opus_int32</tt>: Length of packet
-  * @param [in] Fs <tt>opus_int32</tt>: Sampling rate in Hz.
+/** Gets the number of samples of an Oac packet.
+  * @param [in] packet <tt>char*</tt>: Oac packet
+  * @param [in] len <tt>oac_int32</tt>: Length of packet
+  * @param [in] Fs <tt>oac_int32</tt>: Sampling rate in Hz.
   *                                     This must be a multiple of 400, or
   *                                     inaccurate results will be returned.
   * @returns Number of samples
-  * @retval OPUS_BAD_ARG Insufficient data was passed to the function
-  * @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+  * @retval OAC_BAD_ARG Insufficient data was passed to the function
+  * @retval OAC_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_nb_samples(const unsigned char packet[], opus_int32 len, opus_int32 Fs) OPUS_ARG_NONNULL(1);
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_packet_get_nb_samples(const unsigned char packet[], oac_int32 len, oac_int32 Fs) OAC_ARG_NONNULL(1);
 
-/** Checks whether an Opus packet has LBRR.
-  * @param [in] packet <tt>char*</tt>: Opus packet
-  * @param [in] len <tt>opus_int32</tt>: Length of packet
+/** Checks whether an Oac packet has LBRR.
+  * @param [in] packet <tt>char*</tt>: Oac packet
+  * @param [in] len <tt>oac_int32</tt>: Length of packet
   * @returns 1 is LBRR is present, 0 otherwise
-  * @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+  * @retval OAC_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_has_lbrr(const unsigned char packet[], opus_int32 len);
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_packet_has_lbrr(const unsigned char packet[], oac_int32 len);
 
-/** Gets the number of samples of an Opus packet.
-  * @param [in] dec <tt>OpusDecoder*</tt>: Decoder state
-  * @param [in] packet <tt>char*</tt>: Opus packet
-  * @param [in] len <tt>opus_int32</tt>: Length of packet
+/** Gets the number of samples of an Oac packet.
+  * @param [in] dec <tt>OacDecoder*</tt>: Decoder state
+  * @param [in] packet <tt>char*</tt>: Oac packet
+  * @param [in] len <tt>oac_int32</tt>: Length of packet
   * @returns Number of samples
-  * @retval OPUS_BAD_ARG Insufficient data was passed to the function
-  * @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+  * @retval OAC_BAD_ARG Insufficient data was passed to the function
+  * @retval OAC_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decoder_get_nb_samples(const OpusDecoder *dec, const unsigned char packet[], opus_int32 len) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2);
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_decoder_get_nb_samples(const OacDecoder *dec, const unsigned char packet[], oac_int32 len) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2);
 
 /** Applies soft-clipping to bring a float signal within the [-1,1] range. If
   * the signal is already in that range, nothing is done. If there are values
@@ -797,41 +797,41 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decoder_get_nb_samples(const OpusDe
   * @param [in] channels <tt>int</tt>: Number of channels
   * @param [in,out] softclip_mem <tt>float*</tt>: State memory for the soft clipping process (one float per channel, initialized to zero)
   */
-OPUS_EXPORT void opus_pcm_soft_clip(float *pcm, int frame_size, int channels, float *softclip_mem);
+OAC_EXPORT void oac_pcm_soft_clip(float *pcm, int frame_size, int channels, float *softclip_mem);
 
 
 /**@}*/
 
-/** @defgroup opus_repacketizer Repacketizer
+/** @defgroup oac_repacketizer Repacketizer
   * @{
   *
-  * The repacketizer can be used to merge multiple Opus packets into a single
-  * packet or alternatively to split Opus packets that have previously been
-  * merged. Splitting valid Opus packets is always guaranteed to succeed,
+  * The repacketizer can be used to merge multiple Oac packets into a single
+  * packet or alternatively to split Oac packets that have previously been
+  * merged. Splitting valid Oac packets is always guaranteed to succeed,
   * whereas merging valid packets only succeeds if all frames have the same
   * mode, bandwidth, and frame size, and when the total duration of the merged
   * packet is no more than 120 ms. The 120 ms limit comes from the
   * specification and limits decoder memory requirements at a point where
   * framing overhead becomes negligible.
   *
-  * The repacketizer currently only operates on elementary Opus
+  * The repacketizer currently only operates on elementary Oac
   * streams. It will not manipulate multistream packets successfully, except in
   * the degenerate case where they consist of data from a single stream.
   *
   * The repacketizing process starts with creating a repacketizer state, either
-  * by calling opus_repacketizer_create() or by allocating the memory yourself,
+  * by calling oac_repacketizer_create() or by allocating the memory yourself,
   * e.g.,
   * @code
-  * OpusRepacketizer *rp;
-  * rp = (OpusRepacketizer*)malloc(opus_repacketizer_get_size());
+  * OacRepacketizer *rp;
+  * rp = (OacRepacketizer*)malloc(oac_repacketizer_get_size());
   * if (rp != NULL)
-  *     opus_repacketizer_init(rp);
+  *     oac_repacketizer_init(rp);
   * @endcode
   *
-  * Then the application should submit packets with opus_repacketizer_cat(),
-  * extract new packets with opus_repacketizer_out() or
-  * opus_repacketizer_out_range(), and then reset the state for the next set of
-  * input packets via opus_repacketizer_init().
+  * Then the application should submit packets with oac_repacketizer_cat(),
+  * extract new packets with oac_repacketizer_out() or
+  * oac_repacketizer_out_range(), and then reset the state for the next set of
+  * input packets via oac_repacketizer_init().
   *
   * For example, to split a sequence of packets into individual frames:
   * @code
@@ -840,20 +840,20 @@ OPUS_EXPORT void opus_pcm_soft_clip(float *pcm, int frame_size, int channels, fl
   * while (get_next_packet(&data, &len))
   * {
   *   unsigned char out[1276];
-  *   opus_int32 out_len;
+  *   oac_int32 out_len;
   *   int nb_frames;
   *   int err;
   *   int i;
-  *   err = opus_repacketizer_cat(rp, data, len);
-  *   if (err != OPUS_OK)
+  *   err = oac_repacketizer_cat(rp, data, len);
+  *   if (err != OAC_OK)
   *   {
   *     release_packet(data);
   *     return err;
   *   }
-  *   nb_frames = opus_repacketizer_get_nb_frames(rp);
+  *   nb_frames = oac_repacketizer_get_nb_frames(rp);
   *   for (i = 0; i < nb_frames; i++)
   *   {
-  *     out_len = opus_repacketizer_out_range(rp, i, i+1, out, sizeof(out));
+  *     out_len = oac_repacketizer_out_range(rp, i, i+1, out, sizeof(out));
   *     if (out_len < 0)
   *     {
   *        release_packet(data);
@@ -861,7 +861,7 @@ OPUS_EXPORT void opus_pcm_soft_clip(float *pcm, int frame_size, int channels, fl
   *     }
   *     output_next_packet(out, out_len);
   *   }
-  *   opus_repacketizer_init(rp);
+  *   oac_repacketizer_init(rp);
   *   release_packet(data);
   * }
   * @endcode
@@ -873,53 +873,53 @@ OPUS_EXPORT void opus_pcm_soft_clip(float *pcm, int frame_size, int channels, fl
   * // when the frame size is 2.5 ms, for a total of (TARGET_DURATION_MS*2/5)
   * // packets.
   * unsigned char *data[(TARGET_DURATION_MS*2/5)+1];
-  * opus_int32 len[(TARGET_DURATION_MS*2/5)+1];
+  * oac_int32 len[(TARGET_DURATION_MS*2/5)+1];
   * int nb_packets;
   * unsigned char out[1277*(TARGET_DURATION_MS*2/2)];
-  * opus_int32 out_len;
+  * oac_int32 out_len;
   * int prev_toc;
   * nb_packets = 0;
   * while (get_next_packet(data+nb_packets, len+nb_packets))
   * {
   *   int nb_frames;
   *   int err;
-  *   nb_frames = opus_packet_get_nb_frames(data[nb_packets], len[nb_packets]);
+  *   nb_frames = oac_packet_get_nb_frames(data[nb_packets], len[nb_packets]);
   *   if (nb_frames < 1)
   *   {
   *     release_packets(data, nb_packets+1);
   *     return nb_frames;
   *   }
-  *   nb_frames += opus_repacketizer_get_nb_frames(rp);
+  *   nb_frames += oac_repacketizer_get_nb_frames(rp);
   *   // If adding the next packet would exceed our target, or it has an
   *   // incompatible TOC sequence, output the packets we already have before
   *   // submitting it.
   *   // N.B., The nb_packets > 0 check ensures we've submitted at least one
-  *   // packet since the last call to opus_repacketizer_init(). Otherwise a
+  *   // packet since the last call to oac_repacketizer_init(). Otherwise a
   *   // single packet longer than TARGET_DURATION_MS would cause us to try to
   *   // output an (invalid) empty packet. It also ensures that prev_toc has
   *   // been set to a valid value. Additionally, len[nb_packets] > 0 is
-  *   // guaranteed by the call to opus_packet_get_nb_frames() above, so the
+  *   // guaranteed by the call to oac_packet_get_nb_frames() above, so the
   *   // reference to data[nb_packets][0] should be valid.
   *   if (nb_packets > 0 && (
   *       ((prev_toc & 0xFC) != (data[nb_packets][0] & 0xFC)) ||
-  *       opus_packet_get_samples_per_frame(data[nb_packets], 48000)*nb_frames >
+  *       oac_packet_get_samples_per_frame(data[nb_packets], 48000)*nb_frames >
   *       TARGET_DURATION_MS*48))
   *   {
-  *     out_len = opus_repacketizer_out(rp, out, sizeof(out));
+  *     out_len = oac_repacketizer_out(rp, out, sizeof(out));
   *     if (out_len < 0)
   *     {
   *        release_packets(data, nb_packets+1);
   *        return (int)out_len;
   *     }
   *     output_next_packet(out, out_len);
-  *     opus_repacketizer_init(rp);
+  *     oac_repacketizer_init(rp);
   *     release_packets(data, nb_packets);
   *     data[0] = data[nb_packets];
   *     len[0] = len[nb_packets];
   *     nb_packets = 0;
   *   }
-  *   err = opus_repacketizer_cat(rp, data[nb_packets], len[nb_packets]);
-  *   if (err != OPUS_OK)
+  *   err = oac_repacketizer_cat(rp, data[nb_packets], len[nb_packets]);
+  *   if (err != OAC_OK)
   *   {
   *     release_packets(data, nb_packets+1);
   *     return err;
@@ -930,7 +930,7 @@ OPUS_EXPORT void opus_pcm_soft_clip(float *pcm, int frame_size, int channels, fl
   * // Output the final, partial packet.
   * if (nb_packets > 0)
   * {
-  *   out_len = opus_repacketizer_out(rp, out, sizeof(out));
+  *   out_len = oac_repacketizer_out(rp, out, sizeof(out));
   *   release_packets(data, nb_packets);
   *   if (out_len < 0)
   *     return (int)out_len;
@@ -938,53 +938,53 @@ OPUS_EXPORT void opus_pcm_soft_clip(float *pcm, int frame_size, int channels, fl
   * }
   * @endcode
   *
-  * An alternate way of merging packets is to simply call opus_repacketizer_cat()
+  * An alternate way of merging packets is to simply call oac_repacketizer_cat()
   * unconditionally until it fails. At that point, the merged packet can be
-  * obtained with opus_repacketizer_out() and the input packet for which
-  * opus_repacketizer_cat() needs to be re-added to a newly reinitialized
+  * obtained with oac_repacketizer_out() and the input packet for which
+  * oac_repacketizer_cat() needs to be re-added to a newly reinitialized
   * repacketizer state.
   */
 
-typedef struct OpusRepacketizer OpusRepacketizer;
+typedef struct OacRepacketizer OacRepacketizer;
 
-/** Gets the size of an <code>OpusRepacketizer</code> structure.
+/** Gets the size of an <code>OacRepacketizer</code> structure.
   * @returns The size in bytes.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_repacketizer_get_size(void);
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_repacketizer_get_size(void);
 
 /** (Re)initializes a previously allocated repacketizer state.
-  * The state must be at least the size returned by opus_repacketizer_get_size().
+  * The state must be at least the size returned by oac_repacketizer_get_size().
   * This can be used for applications which use their own allocator instead of
   * malloc().
   * It must also be called to reset the queue of packets waiting to be
   * repacketized, which is necessary if the maximum packet duration of 120 ms
-  * is reached or if you wish to submit packets with a different Opus
+  * is reached or if you wish to submit packets with a different Oac
   * configuration (coding mode, audio bandwidth, frame size, or channel count).
   * Failure to do so will prevent a new packet from being added with
-  * opus_repacketizer_cat().
-  * @see opus_repacketizer_create
-  * @see opus_repacketizer_get_size
-  * @see opus_repacketizer_cat
-  * @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state to
+  * oac_repacketizer_cat().
+  * @see oac_repacketizer_create
+  * @see oac_repacketizer_get_size
+  * @see oac_repacketizer_cat
+  * @param rp <tt>OacRepacketizer*</tt>: The repacketizer state to
   *                                       (re)initialize.
   * @returns A pointer to the same repacketizer state that was passed in.
   */
-OPUS_EXPORT OpusRepacketizer *opus_repacketizer_init(OpusRepacketizer *rp) OPUS_ARG_NONNULL(1);
+OAC_EXPORT OacRepacketizer *oac_repacketizer_init(OacRepacketizer *rp) OAC_ARG_NONNULL(1);
 
 /** Allocates memory and initializes the new repacketizer with
- * opus_repacketizer_init().
+ * oac_repacketizer_init().
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusRepacketizer *opus_repacketizer_create(void);
+OAC_EXPORT OAC_WARN_UNUSED_RESULT OacRepacketizer *oac_repacketizer_create(void);
 
-/** Frees an <code>OpusRepacketizer</code> allocated by
-  * opus_repacketizer_create().
-  * @param[in] rp <tt>OpusRepacketizer*</tt>: State to be freed.
+/** Frees an <code>OacRepacketizer</code> allocated by
+  * oac_repacketizer_create().
+  * @param[in] rp <tt>OacRepacketizer*</tt>: State to be freed.
   */
-OPUS_EXPORT void opus_repacketizer_destroy(OpusRepacketizer *rp);
+OAC_EXPORT void oac_repacketizer_destroy(OacRepacketizer *rp);
 
 /** Add a packet to the current repacketizer state.
   * This packet must match the configuration of any packets already submitted
-  * for repacketization since the last call to opus_repacketizer_init().
+  * for repacketization since the last call to oac_repacketizer_init().
   * This means that it must have the same coding mode, audio bandwidth, frame
   * size, and channel count.
   * This can be checked in advance by examining the top 6 bits of the first
@@ -994,33 +994,33 @@ OPUS_EXPORT void opus_repacketizer_destroy(OpusRepacketizer *rp);
   * 120 ms, the maximum duration of a single packet, after adding this packet.
   *
   * The contents of the current repacketizer state can be extracted into new
-  * packets using opus_repacketizer_out() or opus_repacketizer_out_range().
+  * packets using oac_repacketizer_out() or oac_repacketizer_out_range().
   *
   * In order to add a packet with a different configuration or to add more
   * audio beyond 120 ms, you must clear the repacketizer state by calling
-  * opus_repacketizer_init().
+  * oac_repacketizer_init().
   * If a packet is too large to add to the current repacketizer state, no part
   * of it is added, even if it contains multiple frames, some of which might
   * fit.
   * If you wish to be able to add parts of such packets, you should first use
   * another repacketizer to split the packet into pieces and add them
   * individually.
-  * @see opus_repacketizer_out_range
-  * @see opus_repacketizer_out
-  * @see opus_repacketizer_init
-  * @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state to which to
+  * @see oac_repacketizer_out_range
+  * @see oac_repacketizer_out
+  * @see oac_repacketizer_init
+  * @param rp <tt>OacRepacketizer*</tt>: The repacketizer state to which to
   *                                       add the packet.
   * @param[in] data <tt>const unsigned char*</tt>: The packet data.
   *                                                The application must ensure
   *                                                this pointer remains valid
   *                                                until the next call to
-  *                                                opus_repacketizer_init() or
-  *                                                opus_repacketizer_destroy().
-  * @param len <tt>opus_int32</tt>: The number of bytes in the packet data.
+  *                                                oac_repacketizer_init() or
+  *                                                oac_repacketizer_destroy().
+  * @param len <tt>oac_int32</tt>: The number of bytes in the packet data.
   * @returns An error code indicating whether or not the operation succeeded.
-  * @retval #OPUS_OK The packet's contents have been added to the repacketizer
+  * @retval #OAC_OK The packet's contents have been added to the repacketizer
   *                  state.
-  * @retval #OPUS_INVALID_PACKET The packet did not have a valid TOC sequence,
+  * @retval #OAC_INVALID_PACKET The packet did not have a valid TOC sequence,
   *                              the packet's TOC sequence was not compatible
   *                              with previously submitted packets (because
   *                              the coding mode, audio bandwidth, frame size,
@@ -1029,12 +1029,12 @@ OPUS_EXPORT void opus_repacketizer_destroy(OpusRepacketizer *rp);
   *                              audio stored in the repacketizer state to more
   *                              than 120 ms.
   */
-OPUS_EXPORT int opus_repacketizer_cat(OpusRepacketizer *rp, const unsigned char *data, opus_int32 len) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2);
+OAC_EXPORT int oac_repacketizer_cat(OacRepacketizer *rp, const unsigned char *data, oac_int32 len) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2);
 
 
 /** Construct a new packet from data previously submitted to the repacketizer
-  * state via opus_repacketizer_cat().
-  * @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state from which to
+  * state via oac_repacketizer_cat().
+  * @param rp <tt>OacRepacketizer*</tt>: The repacketizer state from which to
   *                                       construct the new packet.
   * @param begin <tt>int</tt>: The index of the first frame in the current
   *                            repacketizer state to include in the output.
@@ -1043,7 +1043,7 @@ OPUS_EXPORT int opus_repacketizer_cat(OpusRepacketizer *rp, const unsigned char
   *                          output.
   * @param[out] data <tt>const unsigned char*</tt>: The buffer in which to
   *                                                 store the output packet.
-  * @param maxlen <tt>opus_int32</tt>: The maximum number of bytes to store in
+  * @param maxlen <tt>oac_int32</tt>: The maximum number of bytes to store in
   *                                    the output buffer. In order to guarantee
   *                                    success, this should be at least
   *                                    <code>1276</code> for a single frame,
@@ -1052,119 +1052,119 @@ OPUS_EXPORT int opus_repacketizer_cat(OpusRepacketizer *rp, const unsigned char
   *                                    However, <code>1*(end-begin)</code> plus
   *                                    the size of all packet data submitted to
   *                                    the repacketizer since the last call to
-  *                                    opus_repacketizer_init() or
-  *                                    opus_repacketizer_create() is also
+  *                                    oac_repacketizer_init() or
+  *                                    oac_repacketizer_create() is also
   *                                    sufficient, and possibly much smaller.
   * @returns The total size of the output packet on success, or an error code
   *          on failure.
-  * @retval #OPUS_BAD_ARG <code>[begin,end)</code> was an invalid range of
+  * @retval #OAC_BAD_ARG <code>[begin,end)</code> was an invalid range of
   *                       frames (begin < 0, begin >= end, or end >
-  *                       opus_repacketizer_get_nb_frames()).
-  * @retval #OPUS_BUFFER_TOO_SMALL \a maxlen was insufficient to contain the
+  *                       oac_repacketizer_get_nb_frames()).
+  * @retval #OAC_BUFFER_TOO_SMALL \a maxlen was insufficient to contain the
   *                                complete output packet.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_repacketizer_out_range(OpusRepacketizer *rp, int begin, int end, unsigned char *data, opus_int32 maxlen) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_repacketizer_out_range(OacRepacketizer *rp, int begin, int end, unsigned char *data, oac_int32 maxlen) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
 /** Return the total number of frames contained in packet data submitted to
-  * the repacketizer state so far via opus_repacketizer_cat() since the last
-  * call to opus_repacketizer_init() or opus_repacketizer_create().
+  * the repacketizer state so far via oac_repacketizer_cat() since the last
+  * call to oac_repacketizer_init() or oac_repacketizer_create().
   * This defines the valid range of packets that can be extracted with
-  * opus_repacketizer_out_range() or opus_repacketizer_out().
-  * @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state containing the
+  * oac_repacketizer_out_range() or oac_repacketizer_out().
+  * @param rp <tt>OacRepacketizer*</tt>: The repacketizer state containing the
   *                                       frames.
   * @returns The total number of frames contained in the packet data submitted
   *          to the repacketizer state.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_repacketizer_get_nb_frames(OpusRepacketizer *rp) OPUS_ARG_NONNULL(1);
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_repacketizer_get_nb_frames(OacRepacketizer *rp) OAC_ARG_NONNULL(1);
 
 /** Construct a new packet from data previously submitted to the repacketizer
-  * state via opus_repacketizer_cat().
+  * state via oac_repacketizer_cat().
   * This is a convenience routine that returns all the data submitted so far
   * in a single packet.
   * It is equivalent to calling
   * @code
-  * opus_repacketizer_out_range(rp, 0, opus_repacketizer_get_nb_frames(rp),
+  * oac_repacketizer_out_range(rp, 0, oac_repacketizer_get_nb_frames(rp),
   *                             data, maxlen)
   * @endcode
-  * @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state from which to
+  * @param rp <tt>OacRepacketizer*</tt>: The repacketizer state from which to
   *                                       construct the new packet.
   * @param[out] data <tt>const unsigned char*</tt>: The buffer in which to
   *                                                 store the output packet.
-  * @param maxlen <tt>opus_int32</tt>: The maximum number of bytes to store in
+  * @param maxlen <tt>oac_int32</tt>: The maximum number of bytes to store in
   *                                    the output buffer. In order to guarantee
   *                                    success, this should be at least
-  *                                    <code>1277*opus_repacketizer_get_nb_frames(rp)</code>.
+  *                                    <code>1277*oac_repacketizer_get_nb_frames(rp)</code>.
   *                                    However,
-  *                                    <code>1*opus_repacketizer_get_nb_frames(rp)</code>
+  *                                    <code>1*oac_repacketizer_get_nb_frames(rp)</code>
   *                                    plus the size of all packet data
   *                                    submitted to the repacketizer since the
-  *                                    last call to opus_repacketizer_init() or
-  *                                    opus_repacketizer_create() is also
+  *                                    last call to oac_repacketizer_init() or
+  *                                    oac_repacketizer_create() is also
   *                                    sufficient, and possibly much smaller.
   * @returns The total size of the output packet on success, or an error code
   *          on failure.
-  * @retval #OPUS_BUFFER_TOO_SMALL \a maxlen was insufficient to contain the
+  * @retval #OAC_BUFFER_TOO_SMALL \a maxlen was insufficient to contain the
   *                                complete output packet.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_repacketizer_out(OpusRepacketizer *rp, unsigned char *data, opus_int32 maxlen) OPUS_ARG_NONNULL(1);
+OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_repacketizer_out(OacRepacketizer *rp, unsigned char *data, oac_int32 maxlen) OAC_ARG_NONNULL(1);
 
-/** Pads a given Opus packet to a larger size (possibly changing the TOC sequence).
+/** Pads a given Oac packet to a larger size (possibly changing the TOC sequence).
   * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
   *                                                   packet to pad.
-  * @param len <tt>opus_int32</tt>: The size of the packet.
+  * @param len <tt>oac_int32</tt>: The size of the packet.
   *                                 This must be at least 1.
-  * @param new_len <tt>opus_int32</tt>: The desired size of the packet after padding.
+  * @param new_len <tt>oac_int32</tt>: The desired size of the packet after padding.
   *                                 This must be at least as large as len.
   * @returns an error code
-  * @retval #OPUS_OK \a on success.
-  * @retval #OPUS_BAD_ARG \a len was less than 1 or new_len was less than len.
-  * @retval #OPUS_INVALID_PACKET \a data did not contain a valid Opus packet.
+  * @retval #OAC_OK \a on success.
+  * @retval #OAC_BAD_ARG \a len was less than 1 or new_len was less than len.
+  * @retval #OAC_INVALID_PACKET \a data did not contain a valid Oac packet.
   */
-OPUS_EXPORT int opus_packet_pad(unsigned char *data, opus_int32 len, opus_int32 new_len);
+OAC_EXPORT int oac_packet_pad(unsigned char *data, oac_int32 len, oac_int32 new_len);
 
-/** Remove all padding from a given Opus packet and rewrite the TOC sequence to
+/** Remove all padding from a given Oac packet and rewrite the TOC sequence to
   * minimize space usage.
   * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
   *                                                   packet to strip.
-  * @param len <tt>opus_int32</tt>: The size of the packet.
+  * @param len <tt>oac_int32</tt>: The size of the packet.
   *                                 This must be at least 1.
   * @returns The new size of the output packet on success, or an error code
   *          on failure.
-  * @retval #OPUS_BAD_ARG \a len was less than 1.
-  * @retval #OPUS_INVALID_PACKET \a data did not contain a valid Opus packet.
+  * @retval #OAC_BAD_ARG \a len was less than 1.
+  * @retval #OAC_INVALID_PACKET \a data did not contain a valid Oac packet.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_packet_unpad(unsigned char *data, opus_int32 len);
+OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_packet_unpad(unsigned char *data, oac_int32 len);
 
-/** Pads a given Opus multi-stream packet to a larger size (possibly changing the TOC sequence).
+/** Pads a given Oac multi-stream packet to a larger size (possibly changing the TOC sequence).
   * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
   *                                                   packet to pad.
-  * @param len <tt>opus_int32</tt>: The size of the packet.
+  * @param len <tt>oac_int32</tt>: The size of the packet.
   *                                 This must be at least 1.
-  * @param new_len <tt>opus_int32</tt>: The desired size of the packet after padding.
+  * @param new_len <tt>oac_int32</tt>: The desired size of the packet after padding.
   *                                 This must be at least 1.
-  * @param nb_streams <tt>opus_int32</tt>: The number of streams (not channels) in the packet.
+  * @param nb_streams <tt>oac_int32</tt>: The number of streams (not channels) in the packet.
   *                                 This must be at least as large as len.
   * @returns an error code
-  * @retval #OPUS_OK \a on success.
-  * @retval #OPUS_BAD_ARG \a len was less than 1.
-  * @retval #OPUS_INVALID_PACKET \a data did not contain a valid Opus packet.
+  * @retval #OAC_OK \a on success.
+  * @retval #OAC_BAD_ARG \a len was less than 1.
+  * @retval #OAC_INVALID_PACKET \a data did not contain a valid Oac packet.
   */
-OPUS_EXPORT int opus_multistream_packet_pad(unsigned char *data, opus_int32 len, opus_int32 new_len, int nb_streams);
+OAC_EXPORT int oac_multistream_packet_pad(unsigned char *data, oac_int32 len, oac_int32 new_len, int nb_streams);
 
-/** Remove all padding from a given Opus multi-stream packet and rewrite the TOC sequence to
+/** Remove all padding from a given Oac multi-stream packet and rewrite the TOC sequence to
   * minimize space usage.
   * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
   *                                                   packet to strip.
-  * @param len <tt>opus_int32</tt>: The size of the packet.
+  * @param len <tt>oac_int32</tt>: The size of the packet.
   *                                 This must be at least 1.
-  * @param nb_streams <tt>opus_int32</tt>: The number of streams (not channels) in the packet.
+  * @param nb_streams <tt>oac_int32</tt>: The number of streams (not channels) in the packet.
   *                                 This must be at least 1.
   * @returns The new size of the output packet on success, or an error code
   *          on failure.
-  * @retval #OPUS_BAD_ARG \a len was less than 1 or new_len was less than len.
-  * @retval #OPUS_INVALID_PACKET \a data did not contain a valid Opus packet.
+  * @retval #OAC_BAD_ARG \a len was less than 1 or new_len was less than len.
+  * @retval #OAC_INVALID_PACKET \a data did not contain a valid Oac packet.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_packet_unpad(unsigned char *data, opus_int32 len, int nb_streams);
+OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_multistream_packet_unpad(unsigned char *data, oac_int32 len, int nb_streams);
 
 /**@}*/
 
@@ -1172,4 +1172,4 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_packet_unpad(uns
 }
 #endif
 
-#endif /* OPUS_H */
+#endif /* OAC_H */
diff --git a/include/opus_custom.h b/include/oac_custom.h
similarity index 60%
rename from include/opus_custom.h
rename to include/oac_custom.h
index 128650f8e..cb3159476 100644
--- a/include/opus_custom.h
+++ b/include/oac_custom.h
@@ -28,42 +28,42 @@
 */
 
 /**
-  @file opus_custom.h
-  @brief Opus-Custom reference implementation API
+  @file oac_custom.h
+  @brief Oac-Custom reference implementation API
  */
 
-#ifndef OPUS_CUSTOM_H
-#define OPUS_CUSTOM_H
+#ifndef OAC_CUSTOM_H
+#define OAC_CUSTOM_H
 
-#include "opus_defines.h"
+#include "oac_defines.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API)
-# define OPUS_CUSTOM_EXPORT OPUS_EXPORT
-# define OPUS_CUSTOM_EXPORT_STATIC OPUS_EXPORT
+#if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
+# define OAC_CUSTOM_EXPORT OAC_EXPORT
+# define OAC_CUSTOM_EXPORT_STATIC OAC_EXPORT
 #else
-# define OPUS_CUSTOM_EXPORT
-# ifdef OPUS_BUILD
-#  define OPUS_CUSTOM_EXPORT_STATIC static OPUS_INLINE
+# define OAC_CUSTOM_EXPORT
+# ifdef OAC_BUILD
+#  define OAC_CUSTOM_EXPORT_STATIC static OAC_INLINE
 # else
-#  define OPUS_CUSTOM_EXPORT_STATIC
+#  define OAC_CUSTOM_EXPORT_STATIC
 # endif
 #endif
 
-/** @defgroup opus_custom Opus Custom
+/** @defgroup oac_custom Oac Custom
   * @{
-  *  Opus Custom is an optional part of the Opus specification and
+  *  Oac Custom is an optional part of the Oac specification and
   * reference implementation which uses a distinct API from the regular
   * API and supports frame sizes that are not normally supported.\ Use
-  * of Opus Custom is discouraged for all but very special applications
+  * of Oac Custom is discouraged for all but very special applications
   * for which a frame size different from 2.5, 5, 10, or 20 ms is needed
   * (for either complexity or latency reasons) and where interoperability
   * is less important.
   *
-  * In addition to the interoperability limitations the use of Opus custom
+  * In addition to the interoperability limitations the use of Oac custom
   * disables a substantial chunk of the codec and generally lowers the
   * quality available at a given bitrate. Normally when an application needs
   * a different frame size from the codec it should buffer to match the
@@ -72,17 +72,17 @@ extern "C" {
   * constant rate RF transports) may also work best with frames of
   * particular durations.
   *
-  * Libopus only supports custom modes if they are enabled at compile time.
+  * Liboac only supports custom modes if they are enabled at compile time.
   *
-  * The Opus Custom API is similar to the regular API but the
-  * @ref opus_encoder_create and @ref opus_decoder_create calls take
+  * The Oac Custom API is similar to the regular API but the
+  * @ref oac_encoder_create and @ref oac_decoder_create calls take
   * an additional mode parameter which is a structure produced by
-  * a call to @ref opus_custom_mode_create. Both the encoder and decoder
+  * a call to @ref oac_custom_mode_create. Both the encoder and decoder
   * must create a mode using the same sample rate (fs) and frame size
   * (frame size) so these parameters must either be signaled out of band
   * or fixed in a particular implementation.
   *
-  * Similar to regular Opus the custom modes support on the fly frame size
+  * Similar to regular Oac the custom modes support on the fly frame size
   * switching, but the sizes available depend on the particular frame size in
   * use. For some initial frame sizes on a single on the fly size is available.
   */
@@ -92,14 +92,14 @@ extern "C" {
     stream. Do *not* re-initialize the state for every frame.
    @brief Encoder state
  */
-typedef struct OpusCustomEncoder OpusCustomEncoder;
+typedef struct OacCustomEncoder OacCustomEncoder;
 
 /** State of the decoder. One decoder state is needed for each stream.
     It is initialized once at the beginning of the stream. Do *not*
     re-initialize the state for every frame.
    @brief Decoder state
  */
-typedef struct OpusCustomDecoder OpusCustomDecoder;
+typedef struct OacCustomDecoder OacCustomDecoder;
 
 /** The mode contains all the information necessary to create an
     encoder. Both the encoder and decoder need to be initialized
@@ -108,7 +108,7 @@ typedef struct OpusCustomDecoder OpusCustomDecoder;
     decoders that use it are destroyed as well.
    @brief Mode configuration
  */
-typedef struct OpusCustomMode OpusCustomMode;
+typedef struct OacCustomMode OacCustomMode;
 
 /** Creates a new mode struct. This will be passed to an encoder or
   * decoder. The mode MUST NOT BE DESTROYED until the encoders and
@@ -119,73 +119,73 @@ typedef struct OpusCustomMode OpusCustomMode;
   * @param [out] error <tt>int*</tt>: Returned error code (if NULL, no error will be returned)
   * @return A newly created mode
   */
-OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT OpusCustomMode *opus_custom_mode_create(opus_int32 Fs, int frame_size, int *error);
+OAC_CUSTOM_EXPORT OAC_WARN_UNUSED_RESULT OacCustomMode *oac_custom_mode_create(oac_int32 Fs, int frame_size, int *error);
 
 /** Destroys a mode struct. Only call this after all encoders and
   * decoders using this mode are destroyed as well.
-  * @param [in] mode <tt>OpusCustomMode*</tt>: Mode to be freed.
+  * @param [in] mode <tt>OacCustomMode*</tt>: Mode to be freed.
   */
-OPUS_CUSTOM_EXPORT void opus_custom_mode_destroy(OpusCustomMode *mode);
+OAC_CUSTOM_EXPORT void oac_custom_mode_destroy(OacCustomMode *mode);
 
 
-#if !defined(OPUS_BUILD) || defined(CELT_ENCODER_C)
+#if !defined(OAC_BUILD) || defined(CELT_ENCODER_C)
 
 /* Encoder */
-/** Gets the size of an OpusCustomEncoder structure.
-  * @param [in] mode <tt>OpusCustomMode *</tt>: Mode configuration
+/** Gets the size of an OacCustomEncoder structure.
+  * @param [in] mode <tt>OacCustomMode *</tt>: Mode configuration
   * @param [in] channels <tt>int</tt>: Number of channels
   * @returns size
   */
-OPUS_CUSTOM_EXPORT_STATIC OPUS_WARN_UNUSED_RESULT int opus_custom_encoder_get_size(
-    const OpusCustomMode *mode,
+OAC_CUSTOM_EXPORT_STATIC OAC_WARN_UNUSED_RESULT int oac_custom_encoder_get_size(
+    const OacCustomMode *mode,
     int channels
-) OPUS_ARG_NONNULL(1);
+) OAC_ARG_NONNULL(1);
 
-#if defined(CUSTOM_MODES) || defined(ENABLE_OPUS_CUSTOM_API)
+#if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
 /** Initializes a previously allocated encoder state
-  * The memory pointed to by st must be the size returned by opus_custom_encoder_get_size.
+  * The memory pointed to by st must be the size returned by oac_custom_encoder_get_size.
   * This is intended for applications which use their own allocator instead of malloc.
-  * @see opus_custom_encoder_create(),opus_custom_encoder_get_size()
-  * To reset a previously initialized state use the OPUS_RESET_STATE CTL.
-  * @param [in] st <tt>OpusCustomEncoder*</tt>: Encoder state
-  * @param [in] mode <tt>OpusCustomMode *</tt>: Contains all the information about the characteristics of
+  * @see oac_custom_encoder_create(),oac_custom_encoder_get_size()
+  * To reset a previously initialized state use the OAC_RESET_STATE CTL.
+  * @param [in] st <tt>OacCustomEncoder*</tt>: Encoder state
+  * @param [in] mode <tt>OacCustomMode *</tt>: Contains all the information about the characteristics of
   *  the stream (must be the same characteristics as used for the
   *  decoder)
   * @param [in] channels <tt>int</tt>: Number of channels
-  * @return OPUS_OK Success or @ref opus_errorcodes
+  * @return OAC_OK Success or @ref oac_errorcodes
   */
-OPUS_CUSTOM_EXPORT int opus_custom_encoder_init(
-    OpusCustomEncoder *st,
-    const OpusCustomMode *mode,
+OAC_CUSTOM_EXPORT int oac_custom_encoder_init(
+    OacCustomEncoder *st,
+    const OacCustomMode *mode,
     int channels
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2);
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2);
 # endif
 #endif
 
 
 /** Creates a new encoder state. Each stream needs its own encoder
   * state (can't be shared across simultaneous streams).
-  * @param [in] mode <tt>OpusCustomMode*</tt>: Contains all the information about the characteristics of
+  * @param [in] mode <tt>OacCustomMode*</tt>: Contains all the information about the characteristics of
   *  the stream (must be the same characteristics as used for the
   *  decoder)
   * @param [in] channels <tt>int</tt>: Number of channels
   * @param [out] error <tt>int*</tt>: Returns an error code
   * @return Newly created encoder state.
 */
-OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT OpusCustomEncoder *opus_custom_encoder_create(
-    const OpusCustomMode *mode,
+OAC_CUSTOM_EXPORT OAC_WARN_UNUSED_RESULT OacCustomEncoder *oac_custom_encoder_create(
+    const OacCustomMode *mode,
     int channels,
     int *error
-) OPUS_ARG_NONNULL(1);
+) OAC_ARG_NONNULL(1);
 
 
 /** Destroys an encoder state.
-  * @param[in] st <tt>OpusCustomEncoder*</tt>: State to be freed.
+  * @param[in] st <tt>OacCustomEncoder*</tt>: State to be freed.
   */
-OPUS_CUSTOM_EXPORT void opus_custom_encoder_destroy(OpusCustomEncoder *st);
+OAC_CUSTOM_EXPORT void oac_custom_encoder_destroy(OacCustomEncoder *st);
 
 /** Encodes a frame of audio.
-  * @param [in] st <tt>OpusCustomEncoder*</tt>: Encoder state
+  * @param [in] st <tt>OacCustomEncoder*</tt>: Encoder state
   * @param [in] pcm <tt>float*</tt>: PCM audio in float format, with a normal range of +/-1.0.
   *          Samples with a range beyond +/-1.0 are supported but will
   *          be clipped by decoders using the integer API and should
@@ -201,17 +201,17 @@ OPUS_CUSTOM_EXPORT void opus_custom_encoder_destroy(OpusCustomEncoder *st);
   *       the length returned be somehow transmitted to the decoder. Otherwise, no
   *       decoding is possible.
   */
-OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_encode_float(
-    OpusCustomEncoder *st,
+OAC_CUSTOM_EXPORT OAC_WARN_UNUSED_RESULT int oac_custom_encode_float(
+    OacCustomEncoder *st,
     const float *pcm,
     int frame_size,
     unsigned char *compressed,
     int maxCompressedBytes
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
 /** Encodes a frame of audio.
-  * @param [in] st <tt>OpusCustomEncoder*</tt>: Encoder state
-  * @param [in] pcm <tt>opus_int16*</tt>: PCM audio in signed 16-bit format (native endian).
+  * @param [in] st <tt>OacCustomEncoder*</tt>: Encoder state
+  * @param [in] pcm <tt>oac_int16*</tt>: PCM audio in signed 16-bit format (native endian).
   *          There must be exactly frame_size samples per channel.
   * @param [in] frame_size <tt>int</tt>: Number of samples per frame of input signal
   * @param [out] compressed <tt>char *</tt>: The compressed data is written here. This may not alias pcm and must be at least maxCompressedBytes long.
@@ -222,17 +222,17 @@ OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_encode_float(
   *       the length returned be somehow transmitted to the decoder. Otherwise, no
   *       decoding is possible.
  */
-OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_encode(
-    OpusCustomEncoder *st,
-    const opus_int16 *pcm,
+OAC_CUSTOM_EXPORT OAC_WARN_UNUSED_RESULT int oac_custom_encode(
+    OacCustomEncoder *st,
+    const oac_int16 *pcm,
     int frame_size,
     unsigned char *compressed,
     int maxCompressedBytes
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
 /** Encodes a frame of audio.
-  * @param [in] st <tt>OpusCustomEncoder*</tt>: Encoder state
-  * @param [in] pcm <tt>opus_int32*</tt>: PCM audio in signed 32-bit format (native endian) representing (or slightly exceeding) 24-bit values.
+  * @param [in] st <tt>OacCustomEncoder*</tt>: Encoder state
+  * @param [in] pcm <tt>oac_int32*</tt>: PCM audio in signed 32-bit format (native endian) representing (or slightly exceeding) 24-bit values.
   *          There must be exactly frame_size samples per channel.
   * @param [in] frame_size <tt>int</tt>: Number of samples per frame of input signal
   * @param [out] compressed <tt>char *</tt>: The compressed data is written here. This may not alias pcm and must be at least maxCompressedBytes long.
@@ -243,134 +243,134 @@ OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_encode(
   *       the length returned be somehow transmitted to the decoder. Otherwise, no
   *       decoding is possible.
  */
-OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_encode24(
-    OpusCustomEncoder *st,
-    const opus_int32 *pcm,
+OAC_CUSTOM_EXPORT OAC_WARN_UNUSED_RESULT int oac_custom_encode24(
+    OacCustomEncoder *st,
+    const oac_int32 *pcm,
     int frame_size,
     unsigned char *compressed,
     int maxCompressedBytes
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
-/** Perform a CTL function on an Opus custom encoder.
+/** Perform a CTL function on an Oac custom encoder.
   *
   * Generally the request and subsequent arguments are generated
   * by a convenience macro.
-  * @see opus_encoderctls
+  * @see oac_encoderctls
   */
-OPUS_CUSTOM_EXPORT int opus_custom_encoder_ctl(OpusCustomEncoder * OPUS_RESTRICT st, int request, ...) OPUS_ARG_NONNULL(1);
+OAC_CUSTOM_EXPORT int oac_custom_encoder_ctl(OacCustomEncoder * OAC_RESTRICT st, int request, ...) OAC_ARG_NONNULL(1);
 
 
-#if !defined(OPUS_BUILD) || defined(CELT_DECODER_C)
+#if !defined(OAC_BUILD) || defined(CELT_DECODER_C)
 /* Decoder */
 
-/** Gets the size of an OpusCustomDecoder structure.
-  * @param [in] mode <tt>OpusCustomMode *</tt>: Mode configuration
+/** Gets the size of an OacCustomDecoder structure.
+  * @param [in] mode <tt>OacCustomMode *</tt>: Mode configuration
   * @param [in] channels <tt>int</tt>: Number of channels
   * @returns size
   */
-OPUS_CUSTOM_EXPORT_STATIC OPUS_WARN_UNUSED_RESULT int opus_custom_decoder_get_size(
-    const OpusCustomMode *mode,
+OAC_CUSTOM_EXPORT_STATIC OAC_WARN_UNUSED_RESULT int oac_custom_decoder_get_size(
+    const OacCustomMode *mode,
     int channels
-) OPUS_ARG_NONNULL(1);
+) OAC_ARG_NONNULL(1);
 
 /** Initializes a previously allocated decoder state
-  * The memory pointed to by st must be the size returned by opus_custom_decoder_get_size.
+  * The memory pointed to by st must be the size returned by oac_custom_decoder_get_size.
   * This is intended for applications which use their own allocator instead of malloc.
-  * @see opus_custom_decoder_create(),opus_custom_decoder_get_size()
-  * To reset a previously initialized state use the OPUS_RESET_STATE CTL.
-  * @param [in] st <tt>OpusCustomDecoder*</tt>: Decoder state
-  * @param [in] mode <tt>OpusCustomMode *</tt>: Contains all the information about the characteristics of
+  * @see oac_custom_decoder_create(),oac_custom_decoder_get_size()
+  * To reset a previously initialized state use the OAC_RESET_STATE CTL.
+  * @param [in] st <tt>OacCustomDecoder*</tt>: Decoder state
+  * @param [in] mode <tt>OacCustomMode *</tt>: Contains all the information about the characteristics of
   *  the stream (must be the same characteristics as used for the
   *  encoder)
   * @param [in] channels <tt>int</tt>: Number of channels
-  * @return OPUS_OK Success or @ref opus_errorcodes
+  * @return OAC_OK Success or @ref oac_errorcodes
   */
-OPUS_CUSTOM_EXPORT_STATIC int opus_custom_decoder_init(
-    OpusCustomDecoder *st,
-    const OpusCustomMode *mode,
+OAC_CUSTOM_EXPORT_STATIC int oac_custom_decoder_init(
+    OacCustomDecoder *st,
+    const OacCustomMode *mode,
     int channels
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2);
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2);
 
 #endif
 
 
 /** Creates a new decoder state. Each stream needs its own decoder state (can't
   * be shared across simultaneous streams).
-  * @param [in] mode <tt>OpusCustomMode</tt>: Contains all the information about the characteristics of the
+  * @param [in] mode <tt>OacCustomMode</tt>: Contains all the information about the characteristics of the
   *          stream (must be the same characteristics as used for the encoder)
   * @param [in] channels <tt>int</tt>: Number of channels
   * @param [out] error <tt>int*</tt>: Returns an error code
   * @return Newly created decoder state.
   */
-OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT OpusCustomDecoder *opus_custom_decoder_create(
-    const OpusCustomMode *mode,
+OAC_CUSTOM_EXPORT OAC_WARN_UNUSED_RESULT OacCustomDecoder *oac_custom_decoder_create(
+    const OacCustomMode *mode,
     int channels,
     int *error
-) OPUS_ARG_NONNULL(1);
+) OAC_ARG_NONNULL(1);
 
 /** Destroys a decoder state.
-  * @param[in] st <tt>OpusCustomDecoder*</tt>: State to be freed.
+  * @param[in] st <tt>OacCustomDecoder*</tt>: State to be freed.
   */
-OPUS_CUSTOM_EXPORT void opus_custom_decoder_destroy(OpusCustomDecoder *st);
+OAC_CUSTOM_EXPORT void oac_custom_decoder_destroy(OacCustomDecoder *st);
 
-/** Decode an opus custom frame with floating point output
-  * @param [in] st <tt>OpusCustomDecoder*</tt>: Decoder state
+/** Decode an oac custom frame with floating point output
+  * @param [in] st <tt>OacCustomDecoder*</tt>: Decoder state
   * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
   * @param [in] len <tt>int</tt>: Number of bytes in payload
   * @param [out] pcm <tt>float*</tt>: Output signal (interleaved if 2 channels). length
   *  is frame_size*channels*sizeof(float)
   * @param [in] frame_size Number of samples per channel of available space in *pcm.
-  * @returns Number of decoded samples or @ref opus_errorcodes
+  * @returns Number of decoded samples or @ref oac_errorcodes
   */
-OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_decode_float(
-    OpusCustomDecoder *st,
+OAC_CUSTOM_EXPORT OAC_WARN_UNUSED_RESULT int oac_custom_decode_float(
+    OacCustomDecoder *st,
     const unsigned char *data,
     int len,
     float *pcm,
     int frame_size
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
-/** Decode an opus custom frame
-  * @param [in] st <tt>OpusCustomDecoder*</tt>: Decoder state
+/** Decode an oac custom frame
+  * @param [in] st <tt>OacCustomDecoder*</tt>: Decoder state
   * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
   * @param [in] len <tt>int</tt>: Number of bytes in payload
-  * @param [out] pcm <tt>opus_int16*</tt>: Output signal (interleaved if 2 channels). length
-  *  is frame_size*channels*sizeof(opus_int16)
+  * @param [out] pcm <tt>oac_int16*</tt>: Output signal (interleaved if 2 channels). length
+  *  is frame_size*channels*sizeof(oac_int16)
   * @param [in] frame_size Number of samples per channel of available space in *pcm.
-  * @returns Number of decoded samples or @ref opus_errorcodes
+  * @returns Number of decoded samples or @ref oac_errorcodes
   */
-OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_decode(
-    OpusCustomDecoder *st,
+OAC_CUSTOM_EXPORT OAC_WARN_UNUSED_RESULT int oac_custom_decode(
+    OacCustomDecoder *st,
     const unsigned char *data,
     int len,
-    opus_int16 *pcm,
+    oac_int16 *pcm,
     int frame_size
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
-/** Decode an opus custom frame
-  * @param [in] st <tt>OpusCustomDecoder*</tt>: Decoder state
+/** Decode an oac custom frame
+  * @param [in] st <tt>OacCustomDecoder*</tt>: Decoder state
   * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
   * @param [in] len <tt>int</tt>: Number of bytes in payload
-  * @param [out] pcm <tt>opus_int32*</tt>: Output signal (interleaved if 2 channels) representing (or slightly exceeding) 24-bit values. length
-  *  is frame_size*channels*sizeof(opus_int32)
+  * @param [out] pcm <tt>oac_int32*</tt>: Output signal (interleaved if 2 channels) representing (or slightly exceeding) 24-bit values. length
+  *  is frame_size*channels*sizeof(oac_int32)
   * @param [in] frame_size Number of samples per channel of available space in *pcm.
-  * @returns Number of decoded samples or @ref opus_errorcodes
+  * @returns Number of decoded samples or @ref oac_errorcodes
   */
-OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_decode24(
-    OpusCustomDecoder *st,
+OAC_CUSTOM_EXPORT OAC_WARN_UNUSED_RESULT int oac_custom_decode24(
+    OacCustomDecoder *st,
     const unsigned char *data,
     int len,
-    opus_int32 *pcm,
+    oac_int32 *pcm,
     int frame_size
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
-/** Perform a CTL function on an Opus custom decoder.
+/** Perform a CTL function on an Oac custom decoder.
   *
   * Generally the request and subsequent arguments are generated
   * by a convenience macro.
-  * @see opus_genericctls
+  * @see oac_genericctls
   */
-OPUS_CUSTOM_EXPORT int opus_custom_decoder_ctl(OpusCustomDecoder * OPUS_RESTRICT st, int request, ...) OPUS_ARG_NONNULL(1);
+OAC_CUSTOM_EXPORT int oac_custom_decoder_ctl(OacCustomDecoder * OAC_RESTRICT st, int request, ...) OAC_ARG_NONNULL(1);
 
 /**@}*/
 
@@ -378,4 +378,4 @@ OPUS_CUSTOM_EXPORT int opus_custom_decoder_ctl(OpusCustomDecoder * OPUS_RESTRICT
 }
 #endif
 
-#endif /* OPUS_CUSTOM_H */
+#endif /* OAC_CUSTOM_H */
diff --git a/include/oac_defines.h b/include/oac_defines.h
new file mode 100644
index 000000000..25d20bf41
--- /dev/null
+++ b/include/oac_defines.h
@@ -0,0 +1,860 @@
+/* Copyright (c) 2010-2011 Xiph.Org Foundation, Skype Limited
+   Written by Jean-Marc Valin and Koen Vos */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/**
+ * @file oac_defines.h
+ * @brief Oac reference implementation constants
+ */
+
+#ifndef OAC_DEFINES_H
+#define OAC_DEFINES_H
+
+#include "oac_types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @defgroup oac_errorcodes Error codes
+ * @{
+ */
+/** No error @hideinitializer*/
+#define OAC_OK                0
+/** One or more invalid/out of range arguments @hideinitializer*/
+#define OAC_BAD_ARG          -1
+/** Not enough bytes allocated in the buffer @hideinitializer*/
+#define OAC_BUFFER_TOO_SMALL -2
+/** An internal error was detected @hideinitializer*/
+#define OAC_INTERNAL_ERROR   -3
+/** The compressed data passed is corrupted @hideinitializer*/
+#define OAC_INVALID_PACKET   -4
+/** Invalid/unsupported request number @hideinitializer*/
+#define OAC_UNIMPLEMENTED    -5
+/** An encoder or decoder structure is invalid or already freed @hideinitializer*/
+#define OAC_INVALID_STATE    -6
+/** Memory allocation has failed @hideinitializer*/
+#define OAC_ALLOC_FAIL       -7
+/**@}*/
+
+/** @cond OAC_INTERNAL_DOC */
+/**Export control for oac functions */
+
+#ifndef OAC_EXPORT
+# if defined(_WIN32)
+#  if defined(OAC_BUILD) && defined(DLL_EXPORT)
+#   define OAC_EXPORT __declspec(dllexport)
+#  else
+#   define OAC_EXPORT
+#  endif
+# elif defined(__GNUC__) && defined(OAC_BUILD)
+#  define OAC_EXPORT __attribute__ ((visibility ("default")))
+# else
+#  define OAC_EXPORT
+# endif
+#endif
+
+# if !defined(OAC_GNUC_PREREQ)
+#  if defined(__GNUC__)&&defined(__GNUC_MINOR__)
+#   define OAC_GNUC_PREREQ(_maj,_min) \
+ ((__GNUC__<<16)+__GNUC_MINOR__>=((_maj)<<16)+(_min))
+#  else
+#   define OAC_GNUC_PREREQ(_maj,_min) 0
+#  endif
+# endif
+
+#if (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) )
+# if OAC_GNUC_PREREQ(3,0)
+#  define OAC_RESTRICT __restrict__
+# elif (defined(_MSC_VER) && _MSC_VER >= 1400)
+#  define OAC_RESTRICT __restrict
+# else
+#  define OAC_RESTRICT
+# endif
+#else
+# define OAC_RESTRICT restrict
+#endif
+
+#if (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) )
+# if OAC_GNUC_PREREQ(2,7)
+#  define OAC_INLINE __inline__
+# elif (defined(_MSC_VER))
+#  define OAC_INLINE __inline
+# else
+#  define OAC_INLINE
+# endif
+#else
+# define OAC_INLINE inline
+#endif
+
+/**Warning attributes for oac functions
+  * NONNULL is not used in OAC_BUILD to avoid the compiler optimizing out
+  * some paranoid null checks. */
+#if defined(__GNUC__) && OAC_GNUC_PREREQ(3, 4)
+# define OAC_WARN_UNUSED_RESULT __attribute__ ((__warn_unused_result__))
+#else
+# define OAC_WARN_UNUSED_RESULT
+#endif
+#if !defined(OAC_BUILD) && defined(__GNUC__) && OAC_GNUC_PREREQ(3, 4)
+# define OAC_ARG_NONNULL(_x)  __attribute__ ((__nonnull__(_x)))
+#else
+# define OAC_ARG_NONNULL(_x)
+#endif
+
+/** These are the actual Encoder CTL ID numbers.
+  * They should not be used directly by applications.
+  * In general, SETs should be even and GETs should be odd.*/
+#define OAC_SET_APPLICATION_REQUEST         4000
+#define OAC_GET_APPLICATION_REQUEST         4001
+#define OAC_SET_BITRATE_REQUEST             4002
+#define OAC_GET_BITRATE_REQUEST             4003
+#define OAC_SET_MAX_BANDWIDTH_REQUEST       4004
+#define OAC_GET_MAX_BANDWIDTH_REQUEST       4005
+#define OAC_SET_VBR_REQUEST                 4006
+#define OAC_GET_VBR_REQUEST                 4007
+#define OAC_SET_BANDWIDTH_REQUEST           4008
+#define OAC_GET_BANDWIDTH_REQUEST           4009
+#define OAC_SET_COMPLEXITY_REQUEST          4010
+#define OAC_GET_COMPLEXITY_REQUEST          4011
+#define OAC_SET_INBAND_FEC_REQUEST          4012
+#define OAC_GET_INBAND_FEC_REQUEST          4013
+#define OAC_SET_PACKET_LOSS_PERC_REQUEST    4014
+#define OAC_GET_PACKET_LOSS_PERC_REQUEST    4015
+#define OAC_SET_DTX_REQUEST                 4016
+#define OAC_GET_DTX_REQUEST                 4017
+#define OAC_SET_VBR_CONSTRAINT_REQUEST      4020
+#define OAC_GET_VBR_CONSTRAINT_REQUEST      4021
+#define OAC_SET_FORCE_CHANNELS_REQUEST      4022
+#define OAC_GET_FORCE_CHANNELS_REQUEST      4023
+#define OAC_SET_SIGNAL_REQUEST              4024
+#define OAC_GET_SIGNAL_REQUEST              4025
+#define OAC_GET_LOOKAHEAD_REQUEST           4027
+/* #define OAC_RESET_STATE 4028 */
+#define OAC_GET_SAMPLE_RATE_REQUEST         4029
+#define OAC_GET_FINAL_RANGE_REQUEST         4031
+#define OAC_GET_PITCH_REQUEST               4033
+#define OAC_SET_GAIN_REQUEST                4034
+#define OAC_GET_GAIN_REQUEST                4045 /* Should have been 4035 */
+#define OAC_SET_LSB_DEPTH_REQUEST           4036
+#define OAC_GET_LSB_DEPTH_REQUEST           4037
+#define OAC_GET_LAST_PACKET_DURATION_REQUEST 4039
+#define OAC_SET_EXPERT_FRAME_DURATION_REQUEST 4040
+#define OAC_GET_EXPERT_FRAME_DURATION_REQUEST 4041
+#define OAC_SET_PREDICTION_DISABLED_REQUEST 4042
+#define OAC_GET_PREDICTION_DISABLED_REQUEST 4043
+/* Don't use 4045, it's already taken by OAC_GET_GAIN_REQUEST */
+#define OAC_SET_PHASE_INVERSION_DISABLED_REQUEST 4046
+#define OAC_GET_PHASE_INVERSION_DISABLED_REQUEST 4047
+#define OAC_GET_IN_DTX_REQUEST              4049
+#define OAC_SET_DRED_DURATION_REQUEST 4050
+#define OAC_GET_DRED_DURATION_REQUEST 4051
+#define OAC_SET_DNN_BLOB_REQUEST 4052
+/*#define OAC_GET_DNN_BLOB_REQUEST 4053 */
+#define OAC_SET_OSCE_BWE_REQUEST 4054
+#define OAC_GET_OSCE_BWE_REQUEST 4055
+
+
+#define OAC_SET_IGNORE_EXTENSIONS_REQUEST 4058
+#define OAC_GET_IGNORE_EXTENSIONS_REQUEST 4059
+
+/** Defines for the presence of extended APIs. */
+#define OAC_HAVE_OAC_PROJECTION_H
+
+/* Macros to trigger compilation errors when the wrong types are provided to a CTL */
+#define oac_check_int(x) (((void)((x) == (oac_int32)0)), (oac_int32)(x))
+
+#ifdef DISABLE_PTR_CHECK
+/* Disable checks to prevent ubsan from complaining about NULL checks
+   in test_oac_api. */
+#define oac_check_int_ptr(ptr) (ptr)
+#define oac_check_uint_ptr(ptr) (ptr)
+#define oac_check_uint8_ptr(ptr) (ptr)
+#define oac_check_val16_ptr(ptr) (ptr)
+#define oac_check_void_ptr(ptr) (ptr)
+#else
+#define oac_check_int_ptr(ptr) ((ptr) + ((ptr) - (oac_int32*)(ptr)))
+#define oac_check_uint_ptr(ptr) ((ptr) + ((ptr) - (oac_uint32*)(ptr)))
+#define oac_check_uint8_ptr(ptr) ((ptr) + ((ptr) - (oac_uint8*)(ptr)))
+#define oac_check_val16_ptr(ptr) ((ptr) + ((ptr) - (oac_val16*)(ptr)))
+#define oac_check_void_ptr(x) ((void)((void *)0 == (x)), (x))
+#endif
+/** @endcond */
+
+/** @defgroup oac_ctlvalues Pre-defined values for CTL interface
+  * @see oac_genericctls, oac_encoderctls
+  * @{
+  */
+/* Values for the various encoder CTLs */
+#define OAC_AUTO                           -1000 /**<Auto/default setting @hideinitializer*/
+#define OAC_BITRATE_MAX                       -1 /**<Maximum bitrate @hideinitializer*/
+
+/** Best for most VoIP/videoconference applications where listening quality and intelligibility matter most
+ * @hideinitializer */
+#define OAC_APPLICATION_VOIP                2048
+/** Best for broadcast/high-fidelity application where the decoded audio should be as close as possible to the input
+ * @hideinitializer */
+#define OAC_APPLICATION_AUDIO               2049
+/** Only use when lowest-achievable latency is what matters most. Voice-optimized modes cannot be used.
+ * @hideinitializer */
+#define OAC_APPLICATION_RESTRICTED_LOWDELAY 2051
+/** Experts only: forces SILK encoding; don't allocate CELT state at all. Disables OAC_SET_APPLICATION. */
+#define OAC_APPLICATION_RESTRICTED_SILK     2052
+/** Experts only: forces CELT encoding; don't allocate SILK state at all. Disables OAC_SET_APPLICATION. */
+#define OAC_APPLICATION_RESTRICTED_CELT     2053
+
+#define OAC_SIGNAL_VOICE                    3001 /**< Signal being encoded is voice */
+#define OAC_SIGNAL_MUSIC                    3002 /**< Signal being encoded is music */
+#define OAC_BANDWIDTH_NARROWBAND            1101 /**< 4 kHz bandpass @hideinitializer*/
+#define OAC_BANDWIDTH_MEDIUMBAND            1102 /**< 6 kHz bandpass @hideinitializer*/
+#define OAC_BANDWIDTH_WIDEBAND              1103 /**< 8 kHz bandpass @hideinitializer*/
+#define OAC_BANDWIDTH_SUPERWIDEBAND         1104 /**<12 kHz bandpass @hideinitializer*/
+#define OAC_BANDWIDTH_FULLBAND              1105 /**<20 kHz bandpass @hideinitializer*/
+
+#define OAC_FRAMESIZE_ARG                   5000 /**< Select frame size from the argument (default) */
+#define OAC_FRAMESIZE_2_5_MS                5001 /**< Use 2.5 ms frames */
+#define OAC_FRAMESIZE_5_MS                  5002 /**< Use 5 ms frames */
+#define OAC_FRAMESIZE_10_MS                 5003 /**< Use 10 ms frames */
+#define OAC_FRAMESIZE_20_MS                 5004 /**< Use 20 ms frames */
+#define OAC_FRAMESIZE_40_MS                 5005 /**< Use 40 ms frames */
+#define OAC_FRAMESIZE_60_MS                 5006 /**< Use 60 ms frames */
+#define OAC_FRAMESIZE_80_MS                 5007 /**< Use 80 ms frames */
+#define OAC_FRAMESIZE_100_MS                5008 /**< Use 100 ms frames */
+#define OAC_FRAMESIZE_120_MS                5009 /**< Use 120 ms frames */
+
+/**@}*/
+
+
+/** @defgroup oac_encoderctls Encoder related CTLs
+  *
+  * These are convenience macros for use with the \c oac_encode_ctl
+  * interface. They are used to generate the appropriate series of
+  * arguments for that call, passing the correct type, size and so
+  * on as expected for each particular request.
+  *
+  * Some usage examples:
+  *
+  * @code
+  * int ret;
+  * ret = oac_encoder_ctl(enc_ctx, OAC_SET_BANDWIDTH(OAC_AUTO));
+  * if (ret != OAC_OK) return ret;
+  *
+  * oac_int32 rate;
+  * oac_encoder_ctl(enc_ctx, OAC_GET_BANDWIDTH(&rate));
+  *
+  * oac_encoder_ctl(enc_ctx, OAC_RESET_STATE);
+  * @endcode
+  *
+  * @see oac_genericctls, oac_encoder
+  * @{
+  */
+
+/** Configures the encoder's computational complexity.
+  * The supported range is 0-10 inclusive with 10 representing the highest complexity.
+  * @see OAC_GET_COMPLEXITY
+  * @param[in] x <tt>oac_int32</tt>: Allowed values: 0-10, inclusive.
+  *
+  * @hideinitializer */
+#define OAC_SET_COMPLEXITY(x) OAC_SET_COMPLEXITY_REQUEST, oac_check_int(x)
+/** Gets the encoder's complexity configuration.
+  * @see OAC_SET_COMPLEXITY
+  * @param[out] x <tt>oac_int32 *</tt>: Returns a value in the range 0-10,
+  *                                      inclusive.
+  * @hideinitializer */
+#define OAC_GET_COMPLEXITY(x) OAC_GET_COMPLEXITY_REQUEST, oac_check_int_ptr(x)
+
+/** Configures the bitrate in the encoder.
+  * Rates from 500 to 512000 bits per second are meaningful, as well as the
+  * special values #OAC_AUTO and #OAC_BITRATE_MAX.
+  * The value #OAC_BITRATE_MAX can be used to cause the codec to use as much
+  * rate as it can, which is useful for controlling the rate by adjusting the
+  * output buffer size.
+  * @see OAC_GET_BITRATE
+  * @param[in] x <tt>oac_int32</tt>: Bitrate in bits per second. The default
+  *                                   is determined based on the number of
+  *                                   channels and the input sampling rate.
+  * @hideinitializer */
+#define OAC_SET_BITRATE(x) OAC_SET_BITRATE_REQUEST, oac_check_int(x)
+/** Gets the encoder's bitrate configuration.
+  * @see OAC_SET_BITRATE
+  * @param[out] x <tt>oac_int32 *</tt>: Returns the bitrate in bits per second.
+  *                                      The default is determined based on the
+  *                                      number of channels and the input
+  *                                      sampling rate.
+  * @hideinitializer */
+#define OAC_GET_BITRATE(x) OAC_GET_BITRATE_REQUEST, oac_check_int_ptr(x)
+
+/** Enables or disables variable bitrate (VBR) in the encoder.
+  * The configured bitrate may not be met exactly because frames must
+  * be an integer number of bytes in length.
+  * @see OAC_GET_VBR
+  * @see OAC_SET_VBR_CONSTRAINT
+  * @param[in] x <tt>oac_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>0</dt><dd>Hard CBR. For LPC/hybrid modes at very low bit-rate, this can
+  *               cause noticeable quality degradation.</dd>
+  * <dt>1</dt><dd>VBR (default). The exact type of VBR is controlled by
+  *               #OAC_SET_VBR_CONSTRAINT.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_SET_VBR(x) OAC_SET_VBR_REQUEST, oac_check_int(x)
+/** Determine if variable bitrate (VBR) is enabled in the encoder.
+  * @see OAC_SET_VBR
+  * @see OAC_GET_VBR_CONSTRAINT
+  * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>0</dt><dd>Hard CBR.</dd>
+  * <dt>1</dt><dd>VBR (default). The exact type of VBR may be retrieved via
+  *               #OAC_GET_VBR_CONSTRAINT.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_GET_VBR(x) OAC_GET_VBR_REQUEST, oac_check_int_ptr(x)
+
+/** Enables or disables constrained VBR in the encoder.
+  * This setting is ignored when the encoder is in CBR mode.
+  * @warning Only the MDCT mode of Oac currently heeds the constraint.
+  *  Speech mode ignores it completely, hybrid mode may fail to obey it
+  *  if the LPC layer uses more bitrate than the constraint would have
+  *  permitted.
+  * @see OAC_GET_VBR_CONSTRAINT
+  * @see OAC_SET_VBR
+  * @param[in] x <tt>oac_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>0</dt><dd>Unconstrained VBR.</dd>
+  * <dt>1</dt><dd>Constrained VBR (default). This creates a maximum of one
+  *               frame of buffering delay assuming a transport with a
+  *               serialization speed of the nominal bitrate.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_SET_VBR_CONSTRAINT(x) OAC_SET_VBR_CONSTRAINT_REQUEST, oac_check_int(x)
+/** Determine if constrained VBR is enabled in the encoder.
+  * @see OAC_SET_VBR_CONSTRAINT
+  * @see OAC_GET_VBR
+  * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>0</dt><dd>Unconstrained VBR.</dd>
+  * <dt>1</dt><dd>Constrained VBR (default).</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_GET_VBR_CONSTRAINT(x) OAC_GET_VBR_CONSTRAINT_REQUEST, oac_check_int_ptr(x)
+
+/** Configures mono/stereo forcing in the encoder.
+  * This can force the encoder to produce packets encoded as either mono or
+  * stereo, regardless of the format of the input audio. This is useful when
+  * the caller knows that the input signal is currently a mono source embedded
+  * in a stereo stream.
+  * @see OAC_GET_FORCE_CHANNELS
+  * @param[in] x <tt>oac_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>#OAC_AUTO</dt><dd>Not forced (default)</dd>
+  * <dt>1</dt>         <dd>Forced mono</dd>
+  * <dt>2</dt>         <dd>Forced stereo</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_SET_FORCE_CHANNELS(x) OAC_SET_FORCE_CHANNELS_REQUEST, oac_check_int(x)
+/** Gets the encoder's forced channel configuration.
+  * @see OAC_SET_FORCE_CHANNELS
+  * @param[out] x <tt>oac_int32 *</tt>:
+  * <dl>
+  * <dt>#OAC_AUTO</dt><dd>Not forced (default)</dd>
+  * <dt>1</dt>         <dd>Forced mono</dd>
+  * <dt>2</dt>         <dd>Forced stereo</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_GET_FORCE_CHANNELS(x) OAC_GET_FORCE_CHANNELS_REQUEST, oac_check_int_ptr(x)
+
+/** Configures the maximum bandpass that the encoder will select automatically.
+  * Applications should normally use this instead of #OAC_SET_BANDWIDTH
+  * (leaving that set to the default, #OAC_AUTO). This allows the
+  * application to set an upper bound based on the type of input it is
+  * providing, but still gives the encoder the freedom to reduce the bandpass
+  * when the bitrate becomes too low, for better overall quality.
+  * @see OAC_GET_MAX_BANDWIDTH
+  * @param[in] x <tt>oac_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>OAC_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
+  * <dt>OAC_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
+  * <dt>OAC_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
+  * <dt>OAC_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
+  * <dt>OAC_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband (default)</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_SET_MAX_BANDWIDTH(x) OAC_SET_MAX_BANDWIDTH_REQUEST, oac_check_int(x)
+
+/** Gets the encoder's configured maximum allowed bandpass.
+  * @see OAC_SET_MAX_BANDWIDTH
+  * @param[out] x <tt>oac_int32 *</tt>: Allowed values:
+  * <dl>
+  * <dt>#OAC_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
+  * <dt>#OAC_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
+  * <dt>#OAC_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
+  * <dt>#OAC_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
+  * <dt>#OAC_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband (default)</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_GET_MAX_BANDWIDTH(x) OAC_GET_MAX_BANDWIDTH_REQUEST, oac_check_int_ptr(x)
+
+/** Sets the encoder's bandpass to a specific value.
+  * This prevents the encoder from automatically selecting the bandpass based
+  * on the available bitrate. If an application knows the bandpass of the input
+  * audio it is providing, it should normally use #OAC_SET_MAX_BANDWIDTH
+  * instead, which still gives the encoder the freedom to reduce the bandpass
+  * when the bitrate becomes too low, for better overall quality.
+  * @see OAC_GET_BANDWIDTH
+  * @param[in] x <tt>oac_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>#OAC_AUTO</dt>                    <dd>(default)</dd>
+  * <dt>#OAC_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
+  * <dt>#OAC_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
+  * <dt>#OAC_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
+  * <dt>#OAC_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
+  * <dt>#OAC_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_SET_BANDWIDTH(x) OAC_SET_BANDWIDTH_REQUEST, oac_check_int(x)
+
+/** Configures the type of signal being encoded.
+  * This is a hint which helps the encoder's mode selection.
+  * @see OAC_GET_SIGNAL
+  * @param[in] x <tt>oac_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>#OAC_AUTO</dt>        <dd>(default)</dd>
+  * <dt>#OAC_SIGNAL_VOICE</dt><dd>Bias thresholds towards choosing LPC or Hybrid modes.</dd>
+  * <dt>#OAC_SIGNAL_MUSIC</dt><dd>Bias thresholds towards choosing MDCT modes.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_SET_SIGNAL(x) OAC_SET_SIGNAL_REQUEST, oac_check_int(x)
+/** Gets the encoder's configured signal type.
+  * @see OAC_SET_SIGNAL
+  * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>#OAC_AUTO</dt>        <dd>(default)</dd>
+  * <dt>#OAC_SIGNAL_VOICE</dt><dd>Bias thresholds towards choosing LPC or Hybrid modes.</dd>
+  * <dt>#OAC_SIGNAL_MUSIC</dt><dd>Bias thresholds towards choosing MDCT modes.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_GET_SIGNAL(x) OAC_GET_SIGNAL_REQUEST, oac_check_int_ptr(x)
+
+
+/** Configures the encoder's intended application.
+  * The initial value is a mandatory argument to the encoder_create function.
+  * @see OAC_GET_APPLICATION
+  * @param[in] x <tt>oac_int32</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>#OAC_APPLICATION_VOIP</dt>
+  * <dd>Process signal for improved speech intelligibility.</dd>
+  * <dt>#OAC_APPLICATION_AUDIO</dt>
+  * <dd>Favor faithfulness to the original input.</dd>
+  * <dt>#OAC_APPLICATION_RESTRICTED_LOWDELAY</dt>
+  * <dd>Configure the minimum possible coding delay by disabling certain modes
+  * of operation.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_SET_APPLICATION(x) OAC_SET_APPLICATION_REQUEST, oac_check_int(x)
+/** Gets the encoder's configured application.
+  * @see OAC_SET_APPLICATION
+  * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>#OAC_APPLICATION_VOIP</dt>
+  * <dd>Process signal for improved speech intelligibility.</dd>
+  * <dt>#OAC_APPLICATION_AUDIO</dt>
+  * <dd>Favor faithfulness to the original input.</dd>
+  * <dt>#OAC_APPLICATION_RESTRICTED_LOWDELAY</dt>
+  * <dd>Configure the minimum possible coding delay by disabling certain modes
+  * of operation.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_GET_APPLICATION(x) OAC_GET_APPLICATION_REQUEST, oac_check_int_ptr(x)
+
+/** Gets the total samples of delay added by the entire codec.
+  * This can be queried by the encoder and then the provided number of samples can be
+  * skipped on from the start of the decoder's output to provide time aligned input
+  * and output. From the perspective of a decoding application the real data begins this many
+  * samples late.
+  *
+  * The decoder contribution to this delay is identical for all decoders, but the
+  * encoder portion of the delay may vary from implementation to implementation,
+  * version to version, or even depend on the encoder's initial configuration.
+  * Applications needing delay compensation should call this CTL rather than
+  * hard-coding a value.
+  * @param[out] x <tt>oac_int32 *</tt>:   Number of lookahead samples
+  * @hideinitializer */
+#define OAC_GET_LOOKAHEAD(x) OAC_GET_LOOKAHEAD_REQUEST, oac_check_int_ptr(x)
+
+/** Configures the encoder's use of inband forward error correction (FEC).
+  * @note This is only applicable to the LPC layer
+  * @see OAC_GET_INBAND_FEC
+  * @param[in] x <tt>oac_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>0</dt><dd>Disable inband FEC (default).</dd>
+  * <dt>1</dt><dd>Inband FEC enabled. If the packet loss rate is sufficiently high, Oac will automatically switch to SILK even at high rates to enable use of that FEC.</dd>
+  * <dt>2</dt><dd>Inband FEC enabled, but does not necessarily switch to SILK if we have music.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_SET_INBAND_FEC(x) OAC_SET_INBAND_FEC_REQUEST, oac_check_int(x)
+/** Gets encoder's configured use of inband forward error correction.
+  * @see OAC_SET_INBAND_FEC
+  * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>0</dt><dd>Inband FEC disabled (default).</dd>
+  * <dt>1</dt><dd>Inband FEC enabled. If the packet loss rate is sufficiently high, Oac will automatically switch to SILK even at high rates to enable use of that FEC.</dd>
+  * <dt>2</dt><dd>Inband FEC enabled, but does not necessarily switch to SILK if we have music.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_GET_INBAND_FEC(x) OAC_GET_INBAND_FEC_REQUEST, oac_check_int_ptr(x)
+
+/** Configures the encoder's expected packet loss percentage.
+  * Higher values trigger progressively more loss resistant behavior in the encoder
+  * at the expense of quality at a given bitrate in the absence of packet loss, but
+  * greater quality under loss.
+  * @see OAC_GET_PACKET_LOSS_PERC
+  * @param[in] x <tt>oac_int32</tt>:   Loss percentage in the range 0-100, inclusive (default: 0).
+  * @hideinitializer */
+#define OAC_SET_PACKET_LOSS_PERC(x) OAC_SET_PACKET_LOSS_PERC_REQUEST, oac_check_int(x)
+/** Gets the encoder's configured packet loss percentage.
+  * @see OAC_SET_PACKET_LOSS_PERC
+  * @param[out] x <tt>oac_int32 *</tt>: Returns the configured loss percentage
+  *                                      in the range 0-100, inclusive (default: 0).
+  * @hideinitializer */
+#define OAC_GET_PACKET_LOSS_PERC(x) OAC_GET_PACKET_LOSS_PERC_REQUEST, oac_check_int_ptr(x)
+
+/** Configures the encoder's use of discontinuous transmission (DTX).
+  * @note This is only applicable to the LPC layer
+  * @see OAC_GET_DTX
+  * @param[in] x <tt>oac_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>0</dt><dd>Disable DTX (default).</dd>
+  * <dt>1</dt><dd>Enabled DTX.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_SET_DTX(x) OAC_SET_DTX_REQUEST, oac_check_int(x)
+/** Gets encoder's configured use of discontinuous transmission.
+  * @see OAC_SET_DTX
+  * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>0</dt><dd>DTX disabled (default).</dd>
+  * <dt>1</dt><dd>DTX enabled.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_GET_DTX(x) OAC_GET_DTX_REQUEST, oac_check_int_ptr(x)
+/** Configures the depth of signal being encoded.
+  *
+  * This is a hint which helps the encoder identify silence and near-silence.
+  * It represents the number of significant bits of linear intensity below
+  * which the signal contains ignorable quantization or other noise.
+  *
+  * For example, OAC_SET_LSB_DEPTH(14) would be an appropriate setting
+  * for G.711 u-law input. OAC_SET_LSB_DEPTH(16) would be appropriate
+  * for 16-bit linear pcm input with oac_encode_float().
+  *
+  * When using oac_encode() instead of oac_encode_float(), or when liboac
+  * is compiled for fixed-point, the encoder uses the minimum of the value
+  * set here and the value 16.
+  *
+  * @see OAC_GET_LSB_DEPTH
+  * @param[in] x <tt>oac_int32</tt>: Input precision in bits, between 8 and 24
+  *                                   (default: 24).
+  * @hideinitializer */
+#define OAC_SET_LSB_DEPTH(x) OAC_SET_LSB_DEPTH_REQUEST, oac_check_int(x)
+/** Gets the encoder's configured signal depth.
+  * @see OAC_SET_LSB_DEPTH
+  * @param[out] x <tt>oac_int32 *</tt>: Input precision in bits, between 8 and
+  *                                      24 (default: 24).
+  * @hideinitializer */
+#define OAC_GET_LSB_DEPTH(x) OAC_GET_LSB_DEPTH_REQUEST, oac_check_int_ptr(x)
+
+/** Configures the encoder's use of variable duration frames.
+  * When variable duration is enabled, the encoder is free to use a shorter frame
+  * size than the one requested in the oac_encode*() call.
+  * It is then the user's responsibility
+  * to verify how much audio was encoded by checking the ToC byte of the encoded
+  * packet. The part of the audio that was not encoded needs to be resent to the
+  * encoder for the next call. Do not use this option unless you <b>really</b>
+  * know what you are doing.
+  * @see OAC_GET_EXPERT_FRAME_DURATION
+  * @param[in] x <tt>oac_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>OAC_FRAMESIZE_ARG</dt><dd>Select frame size from the argument (default).</dd>
+  * <dt>OAC_FRAMESIZE_2_5_MS</dt><dd>Use 2.5 ms frames.</dd>
+  * <dt>OAC_FRAMESIZE_5_MS</dt><dd>Use 5 ms frames.</dd>
+  * <dt>OAC_FRAMESIZE_10_MS</dt><dd>Use 10 ms frames.</dd>
+  * <dt>OAC_FRAMESIZE_20_MS</dt><dd>Use 20 ms frames.</dd>
+  * <dt>OAC_FRAMESIZE_40_MS</dt><dd>Use 40 ms frames.</dd>
+  * <dt>OAC_FRAMESIZE_60_MS</dt><dd>Use 60 ms frames.</dd>
+  * <dt>OAC_FRAMESIZE_80_MS</dt><dd>Use 80 ms frames.</dd>
+  * <dt>OAC_FRAMESIZE_100_MS</dt><dd>Use 100 ms frames.</dd>
+  * <dt>OAC_FRAMESIZE_120_MS</dt><dd>Use 120 ms frames.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_SET_EXPERT_FRAME_DURATION(x) OAC_SET_EXPERT_FRAME_DURATION_REQUEST, oac_check_int(x)
+/** Gets the encoder's configured use of variable duration frames.
+  * @see OAC_SET_EXPERT_FRAME_DURATION
+  * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>OAC_FRAMESIZE_ARG</dt><dd>Select frame size from the argument (default).</dd>
+  * <dt>OAC_FRAMESIZE_2_5_MS</dt><dd>Use 2.5 ms frames.</dd>
+  * <dt>OAC_FRAMESIZE_5_MS</dt><dd>Use 5 ms frames.</dd>
+  * <dt>OAC_FRAMESIZE_10_MS</dt><dd>Use 10 ms frames.</dd>
+  * <dt>OAC_FRAMESIZE_20_MS</dt><dd>Use 20 ms frames.</dd>
+  * <dt>OAC_FRAMESIZE_40_MS</dt><dd>Use 40 ms frames.</dd>
+  * <dt>OAC_FRAMESIZE_60_MS</dt><dd>Use 60 ms frames.</dd>
+  * <dt>OAC_FRAMESIZE_80_MS</dt><dd>Use 80 ms frames.</dd>
+  * <dt>OAC_FRAMESIZE_100_MS</dt><dd>Use 100 ms frames.</dd>
+  * <dt>OAC_FRAMESIZE_120_MS</dt><dd>Use 120 ms frames.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_GET_EXPERT_FRAME_DURATION(x) OAC_GET_EXPERT_FRAME_DURATION_REQUEST, oac_check_int_ptr(x)
+
+/** If set to 1, disables almost all use of prediction, making frames almost
+  * completely independent. This reduces quality.
+  * @see OAC_GET_PREDICTION_DISABLED
+  * @param[in] x <tt>oac_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>0</dt><dd>Enable prediction (default).</dd>
+  * <dt>1</dt><dd>Disable prediction.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_SET_PREDICTION_DISABLED(x) OAC_SET_PREDICTION_DISABLED_REQUEST, oac_check_int(x)
+/** Gets the encoder's configured prediction status.
+  * @see OAC_SET_PREDICTION_DISABLED
+  * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>0</dt><dd>Prediction enabled (default).</dd>
+  * <dt>1</dt><dd>Prediction disabled.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_GET_PREDICTION_DISABLED(x) OAC_GET_PREDICTION_DISABLED_REQUEST, oac_check_int_ptr(x)
+
+/** If non-zero, enables Deep Redundancy (DRED) and use the specified maximum number of 10-ms redundant frames
+  * @hideinitializer */
+#define OAC_SET_DRED_DURATION(x) OAC_SET_DRED_DURATION_REQUEST, oac_check_int(x)
+/** Gets the encoder's configured Deep Redundancy (DRED) maximum number of frames.
+  * @hideinitializer */
+#define OAC_GET_DRED_DURATION(x) OAC_GET_DRED_DURATION_REQUEST, oac_check_int_ptr(x)
+
+/** Provide external DNN weights from binary object (only when explicitly built without the weights)
+  * @hideinitializer */
+#define OAC_SET_DNN_BLOB(data, len) OAC_SET_DNN_BLOB_REQUEST, oac_check_void_ptr(data), oac_check_int(len)
+
+
+/**@}*/
+
+/** @defgroup oac_genericctls Generic CTLs
+  *
+  * These macros are used with the \c oac_decoder_ctl and
+  * \c oac_encoder_ctl calls to generate a particular
+  * request.
+  *
+  * When called on an \c OacDecoder they apply to that
+  * particular decoder instance. When called on an
+  * \c OacEncoder they apply to the corresponding setting
+  * on that encoder instance, if present.
+  *
+  * Some usage examples:
+  *
+  * @code
+  * int ret;
+  * oac_int32 pitch;
+  * ret = oac_decoder_ctl(dec_ctx, OAC_GET_PITCH(&pitch));
+  * if (ret == OAC_OK) return ret;
+  *
+  * oac_encoder_ctl(enc_ctx, OAC_RESET_STATE);
+  * oac_decoder_ctl(dec_ctx, OAC_RESET_STATE);
+  *
+  * oac_int32 enc_bw, dec_bw;
+  * oac_encoder_ctl(enc_ctx, OAC_GET_BANDWIDTH(&enc_bw));
+  * oac_decoder_ctl(dec_ctx, OAC_GET_BANDWIDTH(&dec_bw));
+  * if (enc_bw != dec_bw) {
+  *   printf("packet bandwidth mismatch!\n");
+  * }
+  * @endcode
+  *
+  * @see oac_encoder, oac_decoder_ctl, oac_encoder_ctl, oac_decoderctls, oac_encoderctls
+  * @{
+  */
+
+/** Resets the codec state to be equivalent to a freshly initialized state.
+  * This should be called when switching streams in order to prevent
+  * the back to back decoding from giving different results from
+  * one at a time decoding.
+  * @hideinitializer */
+#define OAC_RESET_STATE 4028
+
+/** Gets the final state of the codec's entropy coder.
+  * This is used for testing purposes,
+  * The encoder and decoder state should be identical after coding a payload
+  * (assuming no data corruption or software bugs)
+  *
+  * @param[out] x <tt>oac_uint32 *</tt>: Entropy coder state
+  *
+  * @hideinitializer */
+#define OAC_GET_FINAL_RANGE(x) OAC_GET_FINAL_RANGE_REQUEST, oac_check_uint_ptr(x)
+
+/** Gets the encoder's configured bandpass or the decoder's last bandpass.
+  * @see OAC_SET_BANDWIDTH
+  * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>#OAC_AUTO</dt>                    <dd>(default)</dd>
+  * <dt>#OAC_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
+  * <dt>#OAC_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
+  * <dt>#OAC_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
+  * <dt>#OAC_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
+  * <dt>#OAC_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_GET_BANDWIDTH(x) OAC_GET_BANDWIDTH_REQUEST, oac_check_int_ptr(x)
+
+/** Gets the sampling rate the encoder or decoder was initialized with.
+  * This simply returns the <code>Fs</code> value passed to oac_encoder_init()
+  * or oac_decoder_init().
+  * @param[out] x <tt>oac_int32 *</tt>: Sampling rate of encoder or decoder.
+  * @hideinitializer
+  */
+#define OAC_GET_SAMPLE_RATE(x) OAC_GET_SAMPLE_RATE_REQUEST, oac_check_int_ptr(x)
+
+/** If set to 1, disables the use of phase inversion for intensity stereo,
+  * improving the quality of mono downmixes, but slightly reducing normal
+  * stereo quality. Disabling phase inversion in the decoder does not comply
+  * with RFC 6716, although it does not cause any interoperability issue and
+  * is expected to become part of the Oac standard once RFC 6716 is updated
+  * by draft-ietf-codec-oac-update.
+  * @see OAC_GET_PHASE_INVERSION_DISABLED
+  * @param[in] x <tt>oac_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>0</dt><dd>Enable phase inversion (default).</dd>
+  * <dt>1</dt><dd>Disable phase inversion.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_SET_PHASE_INVERSION_DISABLED(x) OAC_SET_PHASE_INVERSION_DISABLED_REQUEST, oac_check_int(x)
+/** Gets the encoder's configured phase inversion status.
+  * @see OAC_SET_PHASE_INVERSION_DISABLED
+  * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>0</dt><dd>Stereo phase inversion enabled (default).</dd>
+  * <dt>1</dt><dd>Stereo phase inversion disabled.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_GET_PHASE_INVERSION_DISABLED(x) OAC_GET_PHASE_INVERSION_DISABLED_REQUEST, oac_check_int_ptr(x)
+/** Gets the DTX state of the encoder.
+  * Returns whether the last encoded frame was either a comfort noise update
+  * during DTX or not encoded because of DTX.
+  * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>0</dt><dd>The encoder is not in DTX.</dd>
+  * <dt>1</dt><dd>The encoder is in DTX.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OAC_GET_IN_DTX(x) OAC_GET_IN_DTX_REQUEST, oac_check_int_ptr(x)
+
+/**@}*/
+
+/** @defgroup oac_decoderctls Decoder related CTLs
+  * @see oac_genericctls, oac_encoderctls, oac_decoder
+  * @{
+  */
+
+/** Configures decoder gain adjustment.
+  * Scales the decoded output by a factor specified in Q8 dB units.
+  * This has a maximum range of -32768 to 32767 inclusive, and returns
+  * OAC_BAD_ARG otherwise. The default is zero indicating no adjustment.
+  * This setting survives decoder reset.
+  *
+  * gain = pow(10, x/(20.0*256))
+  *
+  * @param[in] x <tt>oac_int32</tt>:   Amount to scale PCM signal by in Q8 dB units.
+  * @hideinitializer */
+#define OAC_SET_GAIN(x) OAC_SET_GAIN_REQUEST, oac_check_int(x)
+/** Gets the decoder's configured gain adjustment. @see OAC_SET_GAIN
+  *
+  * @param[out] x <tt>oac_int32 *</tt>: Amount to scale PCM signal by in Q8 dB units.
+  * @hideinitializer */
+#define OAC_GET_GAIN(x) OAC_GET_GAIN_REQUEST, oac_check_int_ptr(x)
+
+/** Gets the duration (in samples) of the last packet successfully decoded or concealed.
+  * @param[out] x <tt>oac_int32 *</tt>: Number of samples (at current sampling rate).
+  * @hideinitializer */
+#define OAC_GET_LAST_PACKET_DURATION(x) OAC_GET_LAST_PACKET_DURATION_REQUEST, oac_check_int_ptr(x)
+
+/** Gets the pitch of the last decoded frame, if available.
+  * This can be used for any post-processing algorithm requiring the use of pitch,
+  * e.g. time stretching/shortening. If the last frame was not voiced, or if the
+  * pitch was not coded in the frame, then zero is returned.
+  *
+  * This CTL is only implemented for decoder instances.
+  *
+  * @param[out] x <tt>oac_int32 *</tt>: pitch period at 48 kHz (or 0 if not available)
+  *
+  * @hideinitializer */
+#define OAC_GET_PITCH(x) OAC_GET_PITCH_REQUEST, oac_check_int_ptr(x)
+
+/** Enables blind bandwidth extension for wideband signals if decoding sampling rate is 48 kHz.
+  * @param[in] x <tt>oac_int32 </tt>: 1 enables bandwidth extension, 0 disables it.
+  * The default is 0.
+  *
+  * @hideinitializer */
+ #define OAC_SET_OSCE_BWE(x) OAC_SET_OSCE_BWE_REQUEST, oac_check_int(x)
+/** Gets blind bandwidth extension flag for wideband signals if decoding sampling rate is 48 kHz.
+  * @param[out] x <tt>oac_int32 *</tt>: 1 if bwe enabled, 0 if disabled.
+  *
+  * @hideinitializer */
+ #define OAC_GET_OSCE_BWE(x) OAC_GET_OSCE_BWE_REQUEST, oac_check_int_ptr(x)
+
+/** If set to 1, the decoder will ignore all extensions found in the padding area
+  * (does not affect DRED, which is decoded separately).
+  * @hideinitializer */
+#define OAC_SET_IGNORE_EXTENSIONS(x) OAC_SET_IGNORE_EXTENSIONS_REQUEST, oac_check_int(x)
+/** Gets whether the decoder is ignoring extensions.
+  * @hideinitializer */
+#define OAC_GET_IGNORE_EXTENSIONS(x) OAC_GET_IGNORE_EXTENSIONS_REQUEST, oac_check_int_ptr(x)
+
+/**@}*/
+
+/** @defgroup oac_libinfo Oac library information functions
+  * @{
+  */
+
+/** Converts an oac error code into a human readable string.
+  *
+  * @param[in] error <tt>int</tt>: Error number
+  * @returns Error string
+  */
+OAC_EXPORT const char *oac_strerror(int error);
+
+/** Gets the liboac version string.
+  *
+  * Applications may look for the substring "-fixed" in the version string to
+  * determine whether they have a fixed-point or floating-point build at
+  * runtime.
+  *
+  * @returns Version string
+  */
+OAC_EXPORT const char *oac_get_version_string(void);
+/**@}*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OAC_DEFINES_H */
diff --git a/include/opus_multistream.h b/include/oac_multistream.h
similarity index 71%
rename from include/opus_multistream.h
rename to include/oac_multistream.h
index 81fb2bb70..490688d15 100644
--- a/include/opus_multistream.h
+++ b/include/oac_multistream.h
@@ -26,100 +26,100 @@
 */
 
 /**
- * @file opus_multistream.h
- * @brief Opus reference implementation multistream API
+ * @file oac_multistream.h
+ * @brief Oac reference implementation multistream API
  */
 
-#ifndef OPUS_MULTISTREAM_H
-#define OPUS_MULTISTREAM_H
+#ifndef OAC_MULTISTREAM_H
+#define OAC_MULTISTREAM_H
 
-#include "opus.h"
+#include "oac.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/** @cond OPUS_INTERNAL_DOC */
+/** @cond OAC_INTERNAL_DOC */
 
 /** Macros to trigger compilation errors when the wrong types are provided to a
   * CTL. */
 /**@{*/
-#define opus_check_encstate_ptr(ptr) ((ptr) + ((ptr) - (OpusEncoder**)(ptr)))
-#define opus_check_decstate_ptr(ptr) ((ptr) + ((ptr) - (OpusDecoder**)(ptr)))
+#define oac_check_encstate_ptr(ptr) ((ptr) + ((ptr) - (OacEncoder**)(ptr)))
+#define oac_check_decstate_ptr(ptr) ((ptr) + ((ptr) - (OacDecoder**)(ptr)))
 /**@}*/
 
 /** These are the actual encoder and decoder CTL ID numbers.
   * They should not be used directly by applications.
   * In general, SETs should be even and GETs should be odd.*/
 /**@{*/
-#define OPUS_MULTISTREAM_GET_ENCODER_STATE_REQUEST 5120
-#define OPUS_MULTISTREAM_GET_DECODER_STATE_REQUEST 5122
+#define OAC_MULTISTREAM_GET_ENCODER_STATE_REQUEST 5120
+#define OAC_MULTISTREAM_GET_DECODER_STATE_REQUEST 5122
 /**@}*/
 
 /** @endcond */
 
-/** @defgroup opus_multistream_ctls Multistream specific encoder and decoder CTLs
+/** @defgroup oac_multistream_ctls Multistream specific encoder and decoder CTLs
   *
   * These are convenience macros that are specific to the
-  * opus_multistream_encoder_ctl() and opus_multistream_decoder_ctl()
+  * oac_multistream_encoder_ctl() and oac_multistream_decoder_ctl()
   * interface.
-  * The CTLs from @ref opus_genericctls, @ref opus_encoderctls, and
-  * @ref opus_decoderctls may be applied to a multistream encoder or decoder as
+  * The CTLs from @ref oac_genericctls, @ref oac_encoderctls, and
+  * @ref oac_decoderctls may be applied to a multistream encoder or decoder as
   * well.
   * In addition, you may retrieve the encoder or decoder state for an specific
-  * stream via #OPUS_MULTISTREAM_GET_ENCODER_STATE or
-  * #OPUS_MULTISTREAM_GET_DECODER_STATE and apply CTLs to it individually.
+  * stream via #OAC_MULTISTREAM_GET_ENCODER_STATE or
+  * #OAC_MULTISTREAM_GET_DECODER_STATE and apply CTLs to it individually.
   */
 /**@{*/
 
 /** Gets the encoder state for an individual stream of a multistream encoder.
-  * @param[in] x <tt>opus_int32</tt>: The index of the stream whose encoder you
+  * @param[in] x <tt>oac_int32</tt>: The index of the stream whose encoder you
   *                                   wish to retrieve.
   *                                   This must be non-negative and less than
   *                                   the <code>streams</code> parameter used
   *                                   to initialize the encoder.
-  * @param[out] y <tt>OpusEncoder**</tt>: Returns a pointer to the given
+  * @param[out] y <tt>OacEncoder**</tt>: Returns a pointer to the given
   *                                       encoder state.
-  * @retval OPUS_BAD_ARG The index of the requested stream was out of range.
+  * @retval OAC_BAD_ARG The index of the requested stream was out of range.
   * @hideinitializer
   */
-#define OPUS_MULTISTREAM_GET_ENCODER_STATE(x,y) OPUS_MULTISTREAM_GET_ENCODER_STATE_REQUEST, opus_check_int(x), opus_check_encstate_ptr(y)
+#define OAC_MULTISTREAM_GET_ENCODER_STATE(x,y) OAC_MULTISTREAM_GET_ENCODER_STATE_REQUEST, oac_check_int(x), oac_check_encstate_ptr(y)
 
 /** Gets the decoder state for an individual stream of a multistream decoder.
-  * @param[in] x <tt>opus_int32</tt>: The index of the stream whose decoder you
+  * @param[in] x <tt>oac_int32</tt>: The index of the stream whose decoder you
   *                                   wish to retrieve.
   *                                   This must be non-negative and less than
   *                                   the <code>streams</code> parameter used
   *                                   to initialize the decoder.
-  * @param[out] y <tt>OpusDecoder**</tt>: Returns a pointer to the given
+  * @param[out] y <tt>OacDecoder**</tt>: Returns a pointer to the given
   *                                       decoder state.
-  * @retval OPUS_BAD_ARG The index of the requested stream was out of range.
+  * @retval OAC_BAD_ARG The index of the requested stream was out of range.
   * @hideinitializer
   */
-#define OPUS_MULTISTREAM_GET_DECODER_STATE(x,y) OPUS_MULTISTREAM_GET_DECODER_STATE_REQUEST, opus_check_int(x), opus_check_decstate_ptr(y)
+#define OAC_MULTISTREAM_GET_DECODER_STATE(x,y) OAC_MULTISTREAM_GET_DECODER_STATE_REQUEST, oac_check_int(x), oac_check_decstate_ptr(y)
 
 /**@}*/
 
-/** @defgroup opus_multistream Opus Multistream API
+/** @defgroup oac_multistream Oac Multistream API
   * @{
   *
-  * The multistream API allows individual Opus streams to be combined into a
+  * The multistream API allows individual Oac streams to be combined into a
   * single packet, enabling support for up to 255 channels. Unlike an
-  * elementary Opus stream, the encoder and decoder must negotiate the channel
+  * elementary Oac stream, the encoder and decoder must negotiate the channel
   * configuration before the decoder can successfully interpret the data in the
   * packets produced by the encoder. Some basic information, such as packet
   * duration, can be computed without any special negotiation.
   *
-  * The format for multistream Opus packets is defined in
+  * The format for multistream Oac packets is defined in
   * <a href="https://tools.ietf.org/html/rfc7845">RFC 7845</a>
-  * and is based on the self-delimited Opus framing described in Appendix B of
+  * and is based on the self-delimited Oac framing described in Appendix B of
   * <a href="https://tools.ietf.org/html/rfc6716">RFC 6716</a>.
-  * Normal Opus packets are just a degenerate case of multistream Opus packets,
+  * Normal Oac packets are just a degenerate case of multistream Oac packets,
   * and can be encoded or decoded with the multistream API by setting
   * <code>streams</code> to <code>1</code> when initializing the encoder or
   * decoder.
   *
-  * Multistream Opus streams can contain up to 255 elementary Opus streams.
+  * Multistream Oac streams can contain up to 255 elementary Oac streams.
   * These may be either "uncoupled" or "coupled", indicating that the decoder
   * is configured to decode them to either 1 or 2 channels, respectively.
   * The streams are ordered so that all coupled streams appear at the
@@ -145,47 +145,47 @@ extern "C" {
   * to the mapping the encoder used to achieve a different output channel
   * order (e.g. for outputting in WAV order).
   *
-  * Each multistream packet contains an Opus packet for each stream, and all of
-  * the Opus packets in a single multistream packet must have the same
+  * Each multistream packet contains an Oac packet for each stream, and all of
+  * the Oac packets in a single multistream packet must have the same
   * duration. Therefore the duration of a multistream packet can be extracted
   * from the TOC sequence of the first stream, which is located at the
-  * beginning of the packet, just like an elementary Opus stream:
+  * beginning of the packet, just like an elementary Oac stream:
   *
   * @code
   * int nb_samples;
   * int nb_frames;
-  * nb_frames = opus_packet_get_nb_frames(data, len);
+  * nb_frames = oac_packet_get_nb_frames(data, len);
   * if (nb_frames < 1)
   *   return nb_frames;
-  * nb_samples = opus_packet_get_samples_per_frame(data, 48000) * nb_frames;
+  * nb_samples = oac_packet_get_samples_per_frame(data, 48000) * nb_frames;
   * @endcode
   *
   * The general encoding and decoding process proceeds exactly the same as in
-  * the normal @ref opus_encoder and @ref opus_decoder APIs.
+  * the normal @ref oac_encoder and @ref oac_decoder APIs.
   * See their documentation for an overview of how to use the corresponding
   * multistream functions.
   */
 
-/** Opus multistream encoder state.
-  * This contains the complete state of a multistream Opus encoder.
+/** Oac multistream encoder state.
+  * This contains the complete state of a multistream Oac encoder.
   * It is position independent and can be freely copied.
-  * @see opus_multistream_encoder_create
-  * @see opus_multistream_encoder_init
+  * @see oac_multistream_encoder_create
+  * @see oac_multistream_encoder_init
   */
-typedef struct OpusMSEncoder OpusMSEncoder;
+typedef struct OacMSEncoder OacMSEncoder;
 
-/** Opus multistream decoder state.
-  * This contains the complete state of a multistream Opus decoder.
+/** Oac multistream decoder state.
+  * This contains the complete state of a multistream Oac decoder.
   * It is position independent and can be freely copied.
-  * @see opus_multistream_decoder_create
-  * @see opus_multistream_decoder_init
+  * @see oac_multistream_decoder_create
+  * @see oac_multistream_decoder_init
   */
-typedef struct OpusMSDecoder OpusMSDecoder;
+typedef struct OacMSDecoder OacMSDecoder;
 
 /**\name Multistream encoder functions */
 /**@{*/
 
-/** Gets the size of an OpusMSEncoder structure.
+/** Gets the size of an OacMSEncoder structure.
   * @param streams <tt>int</tt>: The total number of streams to encode from the
   *                              input.
   *                              This must be no more than 255.
@@ -198,23 +198,23 @@ typedef struct OpusMSDecoder OpusMSDecoder;
   *                                      coupled_streams</code>) must be no
   *                                      more than 255.
   * @returns The size in bytes on success, or a negative error code
-  *          (see @ref opus_errorcodes) on error.
+  *          (see @ref oac_errorcodes) on error.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_encoder_get_size(
+OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_multistream_encoder_get_size(
       int streams,
       int coupled_streams
 );
 
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_surround_encoder_get_size(
+OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_multistream_surround_encoder_get_size(
       int channels,
       int mapping_family
 );
 
 
 /** Allocates and initializes a multistream encoder state.
-  * Call opus_multistream_encoder_destroy() to release
+  * Call oac_multistream_encoder_destroy() to release
   * this object when finished.
-  * @param Fs <tt>opus_int32</tt>: Sampling rate of the input signal (in Hz).
+  * @param Fs <tt>oac_int32</tt>: Sampling rate of the input signal (in Hz).
   *                                This must be one of 8000, 12000, 16000,
   *                                24000, or 48000.
   * @param channels <tt>int</tt>: Number of channels in the input signal.
@@ -235,37 +235,37 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_surround_encoder
   *                                      more than the number of input channels.
   * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
   *                    encoded channels to input channels, as described in
-  *                    @ref opus_multistream. As an extra constraint, the
+  *                    @ref oac_multistream. As an extra constraint, the
   *                    multistream encoder does not allow encoding coupled
   *                    streams for which one channel is unused since this
   *                    is never a good idea.
   * @param application <tt>int</tt>: The target encoder application.
   *                                  This must be one of the following:
   * <dl>
-  * <dt>#OPUS_APPLICATION_VOIP</dt>
+  * <dt>#OAC_APPLICATION_VOIP</dt>
   * <dd>Process signal for improved speech intelligibility.</dd>
-  * <dt>#OPUS_APPLICATION_AUDIO</dt>
+  * <dt>#OAC_APPLICATION_AUDIO</dt>
   * <dd>Favor faithfulness to the original input.</dd>
-  * <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
+  * <dt>#OAC_APPLICATION_RESTRICTED_LOWDELAY</dt>
   * <dd>Configure the minimum possible coding delay by disabling certain modes
   * of operation.</dd>
   * </dl>
-  * @param[out] error <tt>int *</tt>: Returns #OPUS_OK on success, or an error
-  *                                   code (see @ref opus_errorcodes) on
+  * @param[out] error <tt>int *</tt>: Returns #OAC_OK on success, or an error
+  *                                   code (see @ref oac_errorcodes) on
   *                                   failure.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSEncoder *opus_multistream_encoder_create(
-      opus_int32 Fs,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT OacMSEncoder *oac_multistream_encoder_create(
+      oac_int32 Fs,
       int channels,
       int streams,
       int coupled_streams,
       const unsigned char *mapping,
       int application,
       int *error
-) OPUS_ARG_NONNULL(5);
+) OAC_ARG_NONNULL(5);
 
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSEncoder *opus_multistream_surround_encoder_create(
-      opus_int32 Fs,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT OacMSEncoder *oac_multistream_surround_encoder_create(
+      oac_int32 Fs,
       int channels,
       int mapping_family,
       int *streams,
@@ -273,18 +273,18 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSEncoder *opus_multistream_surround_enc
       unsigned char *mapping,
       int application,
       int *error
-) OPUS_ARG_NONNULL(4) OPUS_ARG_NONNULL(5) OPUS_ARG_NONNULL(6);
+) OAC_ARG_NONNULL(4) OAC_ARG_NONNULL(5) OAC_ARG_NONNULL(6);
 
 /** Initialize a previously allocated multistream encoder state.
   * The memory pointed to by \a st must be at least the size returned by
-  * opus_multistream_encoder_get_size().
+  * oac_multistream_encoder_get_size().
   * This is intended for applications which use their own allocator instead of
   * malloc.
-  * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
-  * @see opus_multistream_encoder_create
-  * @see opus_multistream_encoder_get_size
-  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state to initialize.
-  * @param Fs <tt>opus_int32</tt>: Sampling rate of the input signal (in Hz).
+  * To reset a previously initialized state, use the #OAC_RESET_STATE CTL.
+  * @see oac_multistream_encoder_create
+  * @see oac_multistream_encoder_get_size
+  * @param st <tt>OacMSEncoder*</tt>: Multistream encoder state to initialize.
+  * @param Fs <tt>oac_int32</tt>: Sampling rate of the input signal (in Hz).
   *                                This must be one of 8000, 12000, 16000,
   *                                24000, or 48000.
   * @param channels <tt>int</tt>: Number of channels in the input signal.
@@ -305,55 +305,55 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSEncoder *opus_multistream_surround_enc
   *                                      more than the number of input channels.
   * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
   *                    encoded channels to input channels, as described in
-  *                    @ref opus_multistream. As an extra constraint, the
+  *                    @ref oac_multistream. As an extra constraint, the
   *                    multistream encoder does not allow encoding coupled
   *                    streams for which one channel is unused since this
   *                    is never a good idea.
   * @param application <tt>int</tt>: The target encoder application.
   *                                  This must be one of the following:
   * <dl>
-  * <dt>#OPUS_APPLICATION_VOIP</dt>
+  * <dt>#OAC_APPLICATION_VOIP</dt>
   * <dd>Process signal for improved speech intelligibility.</dd>
-  * <dt>#OPUS_APPLICATION_AUDIO</dt>
+  * <dt>#OAC_APPLICATION_AUDIO</dt>
   * <dd>Favor faithfulness to the original input.</dd>
-  * <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
+  * <dt>#OAC_APPLICATION_RESTRICTED_LOWDELAY</dt>
   * <dd>Configure the minimum possible coding delay by disabling certain modes
   * of operation.</dd>
   * </dl>
-  * @returns #OPUS_OK on success, or an error code (see @ref opus_errorcodes)
+  * @returns #OAC_OK on success, or an error code (see @ref oac_errorcodes)
   *          on failure.
   */
-OPUS_EXPORT int opus_multistream_encoder_init(
-      OpusMSEncoder *st,
-      opus_int32 Fs,
+OAC_EXPORT int oac_multistream_encoder_init(
+      OacMSEncoder *st,
+      oac_int32 Fs,
       int channels,
       int streams,
       int coupled_streams,
       const unsigned char *mapping,
       int application
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(6);
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(6);
 
-OPUS_EXPORT int opus_multistream_surround_encoder_init(
-      OpusMSEncoder *st,
-      opus_int32 Fs,
+OAC_EXPORT int oac_multistream_surround_encoder_init(
+      OacMSEncoder *st,
+      oac_int32 Fs,
       int channels,
       int mapping_family,
       int *streams,
       int *coupled_streams,
       unsigned char *mapping,
       int application
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(5) OPUS_ARG_NONNULL(6) OPUS_ARG_NONNULL(7);
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(5) OAC_ARG_NONNULL(6) OAC_ARG_NONNULL(7);
 
-/** Encodes a multistream Opus frame.
-  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state.
-  * @param[in] pcm <tt>const opus_int16*</tt>: The input signal as interleaved
+/** Encodes a multistream Oac frame.
+  * @param st <tt>OacMSEncoder*</tt>: Multistream encoder state.
+  * @param[in] pcm <tt>const oac_int16*</tt>: The input signal as interleaved
   *                                            samples.
   *                                            This must contain
   *                                            <code>frame_size*channels</code>
   *                                            samples.
   * @param frame_size <tt>int</tt>: Number of samples per channel in the input
   *                                 signal.
-  *                                 This must be an Opus frame size for the
+  *                                 This must be an Oac frame size for the
   *                                 encoder's sampling rate.
   *                                 For example, at 48 kHz the permitted values
   *                                 are 120, 240, 480, 960, 1920, and 2880.
@@ -363,35 +363,35 @@ OPUS_EXPORT int opus_multistream_surround_encoder_init(
   * @param[out] data <tt>unsigned char*</tt>: Output payload.
   *                                           This must contain storage for at
   *                                           least \a max_data_bytes.
-  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
   *                                                 memory for the output
   *                                                 payload. This may be
   *                                                 used to impose an upper limit on
   *                                                 the instant bitrate, but should
   *                                                 not be used as the only bitrate
-  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control. Use #OAC_SET_BITRATE to
   *                                                 control the bitrate.
   * @returns The length of the encoded packet (in bytes) on success or a
-  *          negative error code (see @ref opus_errorcodes) on failure.
+  *          negative error code (see @ref oac_errorcodes) on failure.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_encode(
-    OpusMSEncoder *st,
-    const opus_int16 *pcm,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_multistream_encode(
+    OacMSEncoder *st,
+    const oac_int16 *pcm,
     int frame_size,
     unsigned char *data,
-    opus_int32 max_data_bytes
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+    oac_int32 max_data_bytes
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
-/** Encodes a multistream Opus frame.
-  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state.
-  * @param[in] pcm <tt>const opus_int32*</tt>: The input signal as interleaved
+/** Encodes a multistream Oac frame.
+  * @param st <tt>OacMSEncoder*</tt>: Multistream encoder state.
+  * @param[in] pcm <tt>const oac_int32*</tt>: The input signal as interleaved
   *                                            samples representing (or slightly exceeding) 24-bit values.
   *                                            This must contain
   *                                            <code>frame_size*channels</code>
   *                                            samples.
   * @param frame_size <tt>int</tt>: Number of samples per channel in the input
   *                                 signal.
-  *                                 This must be an Opus frame size for the
+  *                                 This must be an Oac frame size for the
   *                                 encoder's sampling rate.
   *                                 For example, at 48 kHz the permitted values
   *                                 are 120, 240, 480, 960, 1920, and 2880.
@@ -401,27 +401,27 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_encode(
   * @param[out] data <tt>unsigned char*</tt>: Output payload.
   *                                           This must contain storage for at
   *                                           least \a max_data_bytes.
-  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
   *                                                 memory for the output
   *                                                 payload. This may be
   *                                                 used to impose an upper limit on
   *                                                 the instant bitrate, but should
   *                                                 not be used as the only bitrate
-  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control. Use #OAC_SET_BITRATE to
   *                                                 control the bitrate.
   * @returns The length of the encoded packet (in bytes) on success or a
-  *          negative error code (see @ref opus_errorcodes) on failure.
+  *          negative error code (see @ref oac_errorcodes) on failure.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_encode24(
-    OpusMSEncoder *st,
-    const opus_int32 *pcm,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_multistream_encode24(
+    OacMSEncoder *st,
+    const oac_int32 *pcm,
     int frame_size,
     unsigned char *data,
-    opus_int32 max_data_bytes
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+    oac_int32 max_data_bytes
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
-/** Encodes a multistream Opus frame from floating point input.
-  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state.
+/** Encodes a multistream Oac frame from floating point input.
+  * @param st <tt>OacMSEncoder*</tt>: Multistream encoder state.
   * @param[in] pcm <tt>const float*</tt>: The input signal as interleaved
   *                                       samples with a normal range of
   *                                       +/-1.0.
@@ -436,7 +436,7 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_encode24(
   *                                       samples.
   * @param frame_size <tt>int</tt>: Number of samples per channel in the input
   *                                 signal.
-  *                                 This must be an Opus frame size for the
+  *                                 This must be an Oac frame size for the
   *                                 encoder's sampling rate.
   *                                 For example, at 48 kHz the permitted values
   *                                 are 120, 240, 480, 960, 1920, and 2880.
@@ -446,51 +446,51 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_encode24(
   * @param[out] data <tt>unsigned char*</tt>: Output payload.
   *                                           This must contain storage for at
   *                                           least \a max_data_bytes.
-  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
   *                                                 memory for the output
   *                                                 payload. This may be
   *                                                 used to impose an upper limit on
   *                                                 the instant bitrate, but should
   *                                                 not be used as the only bitrate
-  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control. Use #OAC_SET_BITRATE to
   *                                                 control the bitrate.
   * @returns The length of the encoded packet (in bytes) on success or a
-  *          negative error code (see @ref opus_errorcodes) on failure.
+  *          negative error code (see @ref oac_errorcodes) on failure.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_encode_float(
-      OpusMSEncoder *st,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_multistream_encode_float(
+      OacMSEncoder *st,
       const float *pcm,
       int frame_size,
       unsigned char *data,
-      opus_int32 max_data_bytes
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+      oac_int32 max_data_bytes
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
-/** Frees an <code>OpusMSEncoder</code> allocated by
-  * opus_multistream_encoder_create().
-  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state to be freed.
+/** Frees an <code>OacMSEncoder</code> allocated by
+  * oac_multistream_encoder_create().
+  * @param st <tt>OacMSEncoder*</tt>: Multistream encoder state to be freed.
   */
-OPUS_EXPORT void opus_multistream_encoder_destroy(OpusMSEncoder *st);
+OAC_EXPORT void oac_multistream_encoder_destroy(OacMSEncoder *st);
 
-/** Perform a CTL function on a multistream Opus encoder.
+/** Perform a CTL function on a multistream Oac encoder.
   *
   * Generally the request and subsequent arguments are generated by a
   * convenience macro.
-  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state.
+  * @param st <tt>OacMSEncoder*</tt>: Multistream encoder state.
   * @param request This and all remaining parameters should be replaced by one
-  *                of the convenience macros in @ref opus_genericctls,
-  *                @ref opus_encoderctls, or @ref opus_multistream_ctls.
-  * @see opus_genericctls
-  * @see opus_encoderctls
-  * @see opus_multistream_ctls
+  *                of the convenience macros in @ref oac_genericctls,
+  *                @ref oac_encoderctls, or @ref oac_multistream_ctls.
+  * @see oac_genericctls
+  * @see oac_encoderctls
+  * @see oac_multistream_ctls
   */
-OPUS_EXPORT int opus_multistream_encoder_ctl(OpusMSEncoder *st, int request, ...) OPUS_ARG_NONNULL(1);
+OAC_EXPORT int oac_multistream_encoder_ctl(OacMSEncoder *st, int request, ...) OAC_ARG_NONNULL(1);
 
 /**@}*/
 
 /**\name Multistream decoder functions */
 /**@{*/
 
-/** Gets the size of an <code>OpusMSDecoder</code> structure.
+/** Gets the size of an <code>OacMSDecoder</code> structure.
   * @param streams <tt>int</tt>: The total number of streams coded in the
   *                              input.
   *                              This must be no more than 255.
@@ -503,17 +503,17 @@ OPUS_EXPORT int opus_multistream_encoder_ctl(OpusMSEncoder *st, int request, ...
   *                                      coupled_streams</code>) must be no
   *                                      more than 255.
   * @returns The size in bytes on success, or a negative error code
-  *          (see @ref opus_errorcodes) on error.
+  *          (see @ref oac_errorcodes) on error.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_decoder_get_size(
+OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_multistream_decoder_get_size(
       int streams,
       int coupled_streams
 );
 
 /** Allocates and initializes a multistream decoder state.
-  * Call opus_multistream_decoder_destroy() to release
+  * Call oac_multistream_decoder_destroy() to release
   * this object when finished.
-  * @param Fs <tt>opus_int32</tt>: Sampling rate to decode at (in Hz).
+  * @param Fs <tt>oac_int32</tt>: Sampling rate to decode at (in Hz).
   *                                This must be one of 8000, 12000, 16000,
   *                                24000, or 48000.
   * @param channels <tt>int</tt>: Number of channels to output.
@@ -534,30 +534,30 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_decoder_get_size
   *                                      more than 255.
   * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
   *                    coded channels to output channels, as described in
-  *                    @ref opus_multistream.
-  * @param[out] error <tt>int *</tt>: Returns #OPUS_OK on success, or an error
-  *                                   code (see @ref opus_errorcodes) on
+  *                    @ref oac_multistream.
+  * @param[out] error <tt>int *</tt>: Returns #OAC_OK on success, or an error
+  *                                   code (see @ref oac_errorcodes) on
   *                                   failure.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSDecoder *opus_multistream_decoder_create(
-      opus_int32 Fs,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT OacMSDecoder *oac_multistream_decoder_create(
+      oac_int32 Fs,
       int channels,
       int streams,
       int coupled_streams,
       const unsigned char *mapping,
       int *error
-) OPUS_ARG_NONNULL(5);
+) OAC_ARG_NONNULL(5);
 
 /** Initialize a previously allocated decoder state object.
   * The memory pointed to by \a st must be at least the size returned by
-  * opus_multistream_encoder_get_size().
+  * oac_multistream_encoder_get_size().
   * This is intended for applications which use their own allocator instead of
   * malloc.
-  * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
-  * @see opus_multistream_decoder_create
-  * @see opus_multistream_deocder_get_size
-  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state to initialize.
-  * @param Fs <tt>opus_int32</tt>: Sampling rate to decode at (in Hz).
+  * To reset a previously initialized state, use the #OAC_RESET_STATE CTL.
+  * @see oac_multistream_decoder_create
+  * @see oac_multistream_deocder_get_size
+  * @param st <tt>OacMSEncoder*</tt>: Multistream encoder state to initialize.
+  * @param Fs <tt>oac_int32</tt>: Sampling rate to decode at (in Hz).
   *                                This must be one of 8000, 12000, 16000,
   *                                24000, or 48000.
   * @param channels <tt>int</tt>: Number of channels to output.
@@ -578,27 +578,27 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSDecoder *opus_multistream_decoder_crea
   *                                      more than 255.
   * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
   *                    coded channels to output channels, as described in
-  *                    @ref opus_multistream.
-  * @returns #OPUS_OK on success, or an error code (see @ref opus_errorcodes)
+  *                    @ref oac_multistream.
+  * @returns #OAC_OK on success, or an error code (see @ref oac_errorcodes)
   *          on failure.
   */
-OPUS_EXPORT int opus_multistream_decoder_init(
-      OpusMSDecoder *st,
-      opus_int32 Fs,
+OAC_EXPORT int oac_multistream_decoder_init(
+      OacMSDecoder *st,
+      oac_int32 Fs,
       int channels,
       int streams,
       int coupled_streams,
       const unsigned char *mapping
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(6);
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(6);
 
-/** Decode a multistream Opus packet.
-  * @param st <tt>OpusMSDecoder*</tt>: Multistream decoder state.
+/** Decode a multistream Oac packet.
+  * @param st <tt>OacMSDecoder*</tt>: Multistream decoder state.
   * @param[in] data <tt>const unsigned char*</tt>: Input payload.
   *                                                Use a <code>NULL</code>
   *                                                pointer to indicate packet
   *                                                loss.
-  * @param len <tt>opus_int32</tt>: Number of bytes in payload.
-  * @param[out] pcm <tt>opus_int16*</tt>: Output signal, with interleaved
+  * @param len <tt>oac_int32</tt>: Number of bytes in payload.
+  * @param[out] pcm <tt>oac_int16*</tt>: Output signal, with interleaved
   *                                       samples.
   *                                       This must contain room for
   *                                       <code>frame_size*channels</code>
@@ -618,25 +618,25 @@ OPUS_EXPORT int opus_multistream_decoder_init(
   *                                 If no such data is available, the frame is
   *                                 decoded as if it were lost.
   * @returns Number of samples decoded on success or a negative error code
-  *          (see @ref opus_errorcodes) on failure.
+  *          (see @ref oac_errorcodes) on failure.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_decode(
-    OpusMSDecoder *st,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_multistream_decode(
+    OacMSDecoder *st,
     const unsigned char *data,
-    opus_int32 len,
-    opus_int16 *pcm,
+    oac_int32 len,
+    oac_int16 *pcm,
     int frame_size,
     int decode_fec
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
-/** Decode a multistream Opus packet.
-  * @param st <tt>OpusMSDecoder*</tt>: Multistream decoder state.
+/** Decode a multistream Oac packet.
+  * @param st <tt>OacMSDecoder*</tt>: Multistream decoder state.
   * @param[in] data <tt>const unsigned char*</tt>: Input payload.
   *                                                Use a <code>NULL</code>
   *                                                pointer to indicate packet
   *                                                loss.
-  * @param len <tt>opus_int32</tt>: Number of bytes in payload.
-  * @param[out] pcm <tt>opus_int32*</tt>: Output signal, with interleaved
+  * @param len <tt>oac_int32</tt>: Number of bytes in payload.
+  * @param[out] pcm <tt>oac_int32*</tt>: Output signal, with interleaved
   *                                       samples representing (or slightly exceeding) 24-bit values.
   *                                       This must contain room for
   *                                       <code>frame_size*channels</code>
@@ -656,25 +656,25 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_decode(
   *                                 If no such data is available, the frame is
   *                                 decoded as if it were lost.
   * @returns Number of samples decoded on success or a negative error code
-  *          (see @ref opus_errorcodes) on failure.
+  *          (see @ref oac_errorcodes) on failure.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_decode24(
-    OpusMSDecoder *st,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_multistream_decode24(
+    OacMSDecoder *st,
     const unsigned char *data,
-    opus_int32 len,
-    opus_int32 *pcm,
+    oac_int32 len,
+    oac_int32 *pcm,
     int frame_size,
     int decode_fec
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
-/** Decode a multistream Opus packet with floating point output.
-  * @param st <tt>OpusMSDecoder*</tt>: Multistream decoder state.
+/** Decode a multistream Oac packet with floating point output.
+  * @param st <tt>OacMSDecoder*</tt>: Multistream decoder state.
   * @param[in] data <tt>const unsigned char*</tt>: Input payload.
   *                                                Use a <code>NULL</code>
   *                                                pointer to indicate packet
   *                                                loss.
-  * @param len <tt>opus_int32</tt>: Number of bytes in payload.
-  * @param[out] pcm <tt>opus_int16*</tt>: Output signal, with interleaved
+  * @param len <tt>oac_int32</tt>: Number of bytes in payload.
+  * @param[out] pcm <tt>oac_int16*</tt>: Output signal, with interleaved
   *                                       samples.
   *                                       This must contain room for
   *                                       <code>frame_size*channels</code>
@@ -694,36 +694,36 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_decode24(
   *                                 If no such data is available, the frame is
   *                                 decoded as if it were lost.
   * @returns Number of samples decoded on success or a negative error code
-  *          (see @ref opus_errorcodes) on failure.
+  *          (see @ref oac_errorcodes) on failure.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_decode_float(
-    OpusMSDecoder *st,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_multistream_decode_float(
+    OacMSDecoder *st,
     const unsigned char *data,
-    opus_int32 len,
+    oac_int32 len,
     float *pcm,
     int frame_size,
     int decode_fec
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
-/** Perform a CTL function on a multistream Opus decoder.
+/** Perform a CTL function on a multistream Oac decoder.
   *
   * Generally the request and subsequent arguments are generated by a
   * convenience macro.
-  * @param st <tt>OpusMSDecoder*</tt>: Multistream decoder state.
+  * @param st <tt>OacMSDecoder*</tt>: Multistream decoder state.
   * @param request This and all remaining parameters should be replaced by one
-  *                of the convenience macros in @ref opus_genericctls,
-  *                @ref opus_decoderctls, or @ref opus_multistream_ctls.
-  * @see opus_genericctls
-  * @see opus_decoderctls
-  * @see opus_multistream_ctls
+  *                of the convenience macros in @ref oac_genericctls,
+  *                @ref oac_decoderctls, or @ref oac_multistream_ctls.
+  * @see oac_genericctls
+  * @see oac_decoderctls
+  * @see oac_multistream_ctls
   */
-OPUS_EXPORT int opus_multistream_decoder_ctl(OpusMSDecoder *st, int request, ...) OPUS_ARG_NONNULL(1);
+OAC_EXPORT int oac_multistream_decoder_ctl(OacMSDecoder *st, int request, ...) OAC_ARG_NONNULL(1);
 
-/** Frees an <code>OpusMSDecoder</code> allocated by
-  * opus_multistream_decoder_create().
-  * @param st <tt>OpusMSDecoder</tt>: Multistream decoder state to be freed.
+/** Frees an <code>OacMSDecoder</code> allocated by
+  * oac_multistream_decoder_create().
+  * @param st <tt>OacMSDecoder</tt>: Multistream decoder state to be freed.
   */
-OPUS_EXPORT void opus_multistream_decoder_destroy(OpusMSDecoder *st);
+OAC_EXPORT void oac_multistream_decoder_destroy(OacMSDecoder *st);
 
 /**@}*/
 
@@ -733,4 +733,4 @@ OPUS_EXPORT void opus_multistream_decoder_destroy(OpusMSDecoder *st);
 }
 #endif
 
-#endif /* OPUS_MULTISTREAM_H */
+#endif /* OAC_MULTISTREAM_H */
diff --git a/include/opus_projection.h b/include/oac_projection.h
similarity index 69%
rename from include/opus_projection.h
rename to include/oac_projection.h
index 26f3cbb48..7846607ba 100644
--- a/include/opus_projection.h
+++ b/include/oac_projection.h
@@ -26,110 +26,110 @@
 */
 
 /**
- * @file opus_projection.h
- * @brief Opus projection reference API
+ * @file oac_projection.h
+ * @brief Oac projection reference API
  */
 
-#ifndef OPUS_PROJECTION_H
-#define OPUS_PROJECTION_H
+#ifndef OAC_PROJECTION_H
+#define OAC_PROJECTION_H
 
-#include "opus_multistream.h"
+#include "oac_multistream.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/** @cond OPUS_INTERNAL_DOC */
+/** @cond OAC_INTERNAL_DOC */
 
 /** These are the actual encoder and decoder CTL ID numbers.
   * They should not be used directly by applications.c
   * In general, SETs should be even and GETs should be odd.*/
 /**@{*/
-#define OPUS_PROJECTION_GET_DEMIXING_MATRIX_GAIN_REQUEST    6001
-#define OPUS_PROJECTION_GET_DEMIXING_MATRIX_SIZE_REQUEST    6003
-#define OPUS_PROJECTION_GET_DEMIXING_MATRIX_REQUEST         6005
+#define OAC_PROJECTION_GET_DEMIXING_MATRIX_GAIN_REQUEST    6001
+#define OAC_PROJECTION_GET_DEMIXING_MATRIX_SIZE_REQUEST    6003
+#define OAC_PROJECTION_GET_DEMIXING_MATRIX_REQUEST         6005
 /**@}*/
 
 
 /** @endcond */
 
-/** @defgroup opus_projection_ctls Projection specific encoder and decoder CTLs
+/** @defgroup oac_projection_ctls Projection specific encoder and decoder CTLs
   *
   * These are convenience macros that are specific to the
-  * opus_projection_encoder_ctl() and opus_projection_decoder_ctl()
+  * oac_projection_encoder_ctl() and oac_projection_decoder_ctl()
   * interface.
-  * The CTLs from @ref opus_genericctls, @ref opus_encoderctls,
-  * @ref opus_decoderctls, and @ref opus_multistream_ctls may be applied to a
+  * The CTLs from @ref oac_genericctls, @ref oac_encoderctls,
+  * @ref oac_decoderctls, and @ref oac_multistream_ctls may be applied to a
   * projection encoder or decoder as well.
   */
 /**@{*/
 
 /** Gets the gain (in dB. S7.8-format) of the demixing matrix from the encoder.
-  * @param[out] x <tt>opus_int32 *</tt>: Returns the gain (in dB. S7.8-format)
+  * @param[out] x <tt>oac_int32 *</tt>: Returns the gain (in dB. S7.8-format)
   *                                      of the demixing matrix.
   * @hideinitializer
   */
-#define OPUS_PROJECTION_GET_DEMIXING_MATRIX_GAIN(x) OPUS_PROJECTION_GET_DEMIXING_MATRIX_GAIN_REQUEST, opus_check_int_ptr(x)
+#define OAC_PROJECTION_GET_DEMIXING_MATRIX_GAIN(x) OAC_PROJECTION_GET_DEMIXING_MATRIX_GAIN_REQUEST, oac_check_int_ptr(x)
 
 
 /** Gets the size in bytes of the demixing matrix from the encoder.
-  * @param[out] x <tt>opus_int32 *</tt>: Returns the size in bytes of the
+  * @param[out] x <tt>oac_int32 *</tt>: Returns the size in bytes of the
   *                                      demixing matrix.
   * @hideinitializer
   */
-#define OPUS_PROJECTION_GET_DEMIXING_MATRIX_SIZE(x) OPUS_PROJECTION_GET_DEMIXING_MATRIX_SIZE_REQUEST, opus_check_int_ptr(x)
+#define OAC_PROJECTION_GET_DEMIXING_MATRIX_SIZE(x) OAC_PROJECTION_GET_DEMIXING_MATRIX_SIZE_REQUEST, oac_check_int_ptr(x)
 
 
 /** Copies the demixing matrix to the supplied pointer location.
   * @param[out] x <tt>unsigned char *</tt>: Returns the demixing matrix to the
   *                                         supplied pointer location.
-  * @param y <tt>opus_int32</tt>: The size in bytes of the reserved memory at the
+  * @param y <tt>oac_int32</tt>: The size in bytes of the reserved memory at the
   *                              pointer location.
   * @hideinitializer
   */
-#define OPUS_PROJECTION_GET_DEMIXING_MATRIX(x,y) OPUS_PROJECTION_GET_DEMIXING_MATRIX_REQUEST, x, opus_check_int(y)
+#define OAC_PROJECTION_GET_DEMIXING_MATRIX(x,y) OAC_PROJECTION_GET_DEMIXING_MATRIX_REQUEST, x, oac_check_int(y)
 
 
 /**@}*/
 
-/** Opus projection encoder state.
- * This contains the complete state of a projection Opus encoder.
+/** Oac projection encoder state.
+ * This contains the complete state of a projection Oac encoder.
  * It is position independent and can be freely copied.
- * @see opus_projection_ambisonics_encoder_create
+ * @see oac_projection_ambisonics_encoder_create
  */
-typedef struct OpusProjectionEncoder OpusProjectionEncoder;
+typedef struct OacProjectionEncoder OacProjectionEncoder;
 
 
-/** Opus projection decoder state.
-  * This contains the complete state of a projection Opus decoder.
+/** Oac projection decoder state.
+  * This contains the complete state of a projection Oac decoder.
   * It is position independent and can be freely copied.
-  * @see opus_projection_decoder_create
-  * @see opus_projection_decoder_init
+  * @see oac_projection_decoder_create
+  * @see oac_projection_decoder_init
   */
-typedef struct OpusProjectionDecoder OpusProjectionDecoder;
+typedef struct OacProjectionDecoder OacProjectionDecoder;
 
 
 /**\name Projection encoder functions */
 /**@{*/
 
-/** Gets the size of an OpusProjectionEncoder structure.
+/** Gets the size of an OacProjectionEncoder structure.
   * @param channels <tt>int</tt>: The total number of input channels to encode.
   *                               This must be no more than 255.
   * @param mapping_family <tt>int</tt>: The mapping family to use for selecting
   *                                     the appropriate projection.
   * @returns The size in bytes on success, or a negative error code
-  *          (see @ref opus_errorcodes) on error.
+  *          (see @ref oac_errorcodes) on error.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_projection_ambisonics_encoder_get_size(
+OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_projection_ambisonics_encoder_get_size(
     int channels,
     int mapping_family
 );
 
 
 /** Allocates and initializes a projection encoder state.
-  * Call opus_projection_encoder_destroy() to release
+  * Call oac_projection_encoder_destroy() to release
   * this object when finished.
-  * @param Fs <tt>opus_int32</tt>: Sampling rate of the input signal (in Hz).
+  * @param Fs <tt>oac_int32</tt>: Sampling rate of the input signal (in Hz).
   *                                This must be one of 8000, 12000, 16000,
   *                                24000, or 48000.
   * @param channels <tt>int</tt>: Number of channels in the input signal.
@@ -146,39 +146,39 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_projection_ambisonics_encode
   * @param application <tt>int</tt>: The target encoder application.
   *                                  This must be one of the following:
   * <dl>
-  * <dt>#OPUS_APPLICATION_VOIP</dt>
+  * <dt>#OAC_APPLICATION_VOIP</dt>
   * <dd>Process signal for improved speech intelligibility.</dd>
-  * <dt>#OPUS_APPLICATION_AUDIO</dt>
+  * <dt>#OAC_APPLICATION_AUDIO</dt>
   * <dd>Favor faithfulness to the original input.</dd>
-  * <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
+  * <dt>#OAC_APPLICATION_RESTRICTED_LOWDELAY</dt>
   * <dd>Configure the minimum possible coding delay by disabling certain modes
   * of operation.</dd>
   * </dl>
-  * @param[out] error <tt>int *</tt>: Returns #OPUS_OK on success, or an error
-  *                                   code (see @ref opus_errorcodes) on
+  * @param[out] error <tt>int *</tt>: Returns #OAC_OK on success, or an error
+  *                                   code (see @ref oac_errorcodes) on
   *                                   failure.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusProjectionEncoder *opus_projection_ambisonics_encoder_create(
-    opus_int32 Fs,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT OacProjectionEncoder *oac_projection_ambisonics_encoder_create(
+    oac_int32 Fs,
     int channels,
     int mapping_family,
     int *streams,
     int *coupled_streams,
     int application,
     int *error
-) OPUS_ARG_NONNULL(4) OPUS_ARG_NONNULL(5);
+) OAC_ARG_NONNULL(4) OAC_ARG_NONNULL(5);
 
 
 /** Initialize a previously allocated projection encoder state.
   * The memory pointed to by \a st must be at least the size returned by
-  * opus_projection_ambisonics_encoder_get_size().
+  * oac_projection_ambisonics_encoder_get_size().
   * This is intended for applications which use their own allocator instead of
   * malloc.
-  * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
-  * @see opus_projection_ambisonics_encoder_create
-  * @see opus_projection_ambisonics_encoder_get_size
-  * @param st <tt>OpusProjectionEncoder*</tt>: Projection encoder state to initialize.
-  * @param Fs <tt>opus_int32</tt>: Sampling rate of the input signal (in Hz).
+  * To reset a previously initialized state, use the #OAC_RESET_STATE CTL.
+  * @see oac_projection_ambisonics_encoder_create
+  * @see oac_projection_ambisonics_encoder_get_size
+  * @param st <tt>OacProjectionEncoder*</tt>: Projection encoder state to initialize.
+  * @param Fs <tt>oac_int32</tt>: Sampling rate of the input signal (in Hz).
   *                                This must be one of 8000, 12000, 16000,
   *                                24000, or 48000.
   * @param channels <tt>int</tt>: Number of channels in the input signal.
@@ -200,38 +200,38 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusProjectionEncoder *opus_projection_ambis
   * @param application <tt>int</tt>: The target encoder application.
   *                                  This must be one of the following:
   * <dl>
-  * <dt>#OPUS_APPLICATION_VOIP</dt>
+  * <dt>#OAC_APPLICATION_VOIP</dt>
   * <dd>Process signal for improved speech intelligibility.</dd>
-  * <dt>#OPUS_APPLICATION_AUDIO</dt>
+  * <dt>#OAC_APPLICATION_AUDIO</dt>
   * <dd>Favor faithfulness to the original input.</dd>
-  * <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
+  * <dt>#OAC_APPLICATION_RESTRICTED_LOWDELAY</dt>
   * <dd>Configure the minimum possible coding delay by disabling certain modes
   * of operation.</dd>
   * </dl>
-  * @returns #OPUS_OK on success, or an error code (see @ref opus_errorcodes)
+  * @returns #OAC_OK on success, or an error code (see @ref oac_errorcodes)
   *          on failure.
   */
-OPUS_EXPORT int opus_projection_ambisonics_encoder_init(
-    OpusProjectionEncoder *st,
-    opus_int32 Fs,
+OAC_EXPORT int oac_projection_ambisonics_encoder_init(
+    OacProjectionEncoder *st,
+    oac_int32 Fs,
     int channels,
     int mapping_family,
     int *streams,
     int *coupled_streams,
     int application
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(5) OPUS_ARG_NONNULL(6);
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(5) OAC_ARG_NONNULL(6);
 
 
-/** Encodes a projection Opus frame.
-  * @param st <tt>OpusProjectionEncoder*</tt>: Projection encoder state.
-  * @param[in] pcm <tt>const opus_int16*</tt>: The input signal as interleaved
+/** Encodes a projection Oac frame.
+  * @param st <tt>OacProjectionEncoder*</tt>: Projection encoder state.
+  * @param[in] pcm <tt>const oac_int16*</tt>: The input signal as interleaved
   *                                            samples.
   *                                            This must contain
   *                                            <code>frame_size*channels</code>
   *                                            samples.
   * @param frame_size <tt>int</tt>: Number of samples per channel in the input
   *                                 signal.
-  *                                 This must be an Opus frame size for the
+  *                                 This must be an Oac frame size for the
   *                                 encoder's sampling rate.
   *                                 For example, at 48 kHz the permitted values
   *                                 are 120, 240, 480, 960, 1920, and 2880.
@@ -241,35 +241,35 @@ OPUS_EXPORT int opus_projection_ambisonics_encoder_init(
   * @param[out] data <tt>unsigned char*</tt>: Output payload.
   *                                           This must contain storage for at
   *                                           least \a max_data_bytes.
-  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
   *                                                 memory for the output
   *                                                 payload. This may be
   *                                                 used to impose an upper limit on
   *                                                 the instant bitrate, but should
   *                                                 not be used as the only bitrate
-  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control. Use #OAC_SET_BITRATE to
   *                                                 control the bitrate.
   * @returns The length of the encoded packet (in bytes) on success or a
-  *          negative error code (see @ref opus_errorcodes) on failure.
+  *          negative error code (see @ref oac_errorcodes) on failure.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_encode(
-    OpusProjectionEncoder *st,
-    const opus_int16 *pcm,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_projection_encode(
+    OacProjectionEncoder *st,
+    const oac_int16 *pcm,
     int frame_size,
     unsigned char *data,
-    opus_int32 max_data_bytes
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+    oac_int32 max_data_bytes
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
-/** Encodes a projection Opus frame.
-  * @param st <tt>OpusProjectionEncoder*</tt>: Projection encoder state.
-  * @param[in] pcm <tt>const opus_int32*</tt>: The input signal as interleaved
+/** Encodes a projection Oac frame.
+  * @param st <tt>OacProjectionEncoder*</tt>: Projection encoder state.
+  * @param[in] pcm <tt>const oac_int32*</tt>: The input signal as interleaved
   *                                            samples representing (or slightly exceeding) 24-bit values.
   *                                            This must contain
   *                                            <code>frame_size*channels</code>
   *                                            samples.
   * @param frame_size <tt>int</tt>: Number of samples per channel in the input
   *                                 signal.
-  *                                 This must be an Opus frame size for the
+  *                                 This must be an Oac frame size for the
   *                                 encoder's sampling rate.
   *                                 For example, at 48 kHz the permitted values
   *                                 are 120, 240, 480, 960, 1920, and 2880.
@@ -279,28 +279,28 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_encode(
   * @param[out] data <tt>unsigned char*</tt>: Output payload.
   *                                           This must contain storage for at
   *                                           least \a max_data_bytes.
-  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
   *                                                 memory for the output
   *                                                 payload. This may be
   *                                                 used to impose an upper limit on
   *                                                 the instant bitrate, but should
   *                                                 not be used as the only bitrate
-  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control. Use #OAC_SET_BITRATE to
   *                                                 control the bitrate.
   * @returns The length of the encoded packet (in bytes) on success or a
-  *          negative error code (see @ref opus_errorcodes) on failure.
+  *          negative error code (see @ref oac_errorcodes) on failure.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_encode24(
-    OpusProjectionEncoder *st,
-    const opus_int32 *pcm,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_projection_encode24(
+    OacProjectionEncoder *st,
+    const oac_int32 *pcm,
     int frame_size,
     unsigned char *data,
-    opus_int32 max_data_bytes
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+    oac_int32 max_data_bytes
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
 
-/** Encodes a projection Opus frame from floating point input.
-  * @param st <tt>OpusProjectionEncoder*</tt>: Projection encoder state.
+/** Encodes a projection Oac frame from floating point input.
+  * @param st <tt>OacProjectionEncoder*</tt>: Projection encoder state.
   * @param[in] pcm <tt>const float*</tt>: The input signal as interleaved
   *                                       samples with a normal range of
   *                                       +/-1.0.
@@ -315,7 +315,7 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_encode24(
   *                                       samples.
   * @param frame_size <tt>int</tt>: Number of samples per channel in the input
   *                                 signal.
-  *                                 This must be an Opus frame size for the
+  *                                 This must be an Oac frame size for the
   *                                 encoder's sampling rate.
   *                                 For example, at 48 kHz the permitted values
   *                                 are 120, 240, 480, 960, 1920, and 2880.
@@ -325,48 +325,48 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_encode24(
   * @param[out] data <tt>unsigned char*</tt>: Output payload.
   *                                           This must contain storage for at
   *                                           least \a max_data_bytes.
-  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
   *                                                 memory for the output
   *                                                 payload. This may be
   *                                                 used to impose an upper limit on
   *                                                 the instant bitrate, but should
   *                                                 not be used as the only bitrate
-  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control. Use #OAC_SET_BITRATE to
   *                                                 control the bitrate.
   * @returns The length of the encoded packet (in bytes) on success or a
-  *          negative error code (see @ref opus_errorcodes) on failure.
+  *          negative error code (see @ref oac_errorcodes) on failure.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_encode_float(
-    OpusProjectionEncoder *st,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_projection_encode_float(
+    OacProjectionEncoder *st,
     const float *pcm,
     int frame_size,
     unsigned char *data,
-    opus_int32 max_data_bytes
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+    oac_int32 max_data_bytes
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
 
-/** Frees an <code>OpusProjectionEncoder</code> allocated by
-  * opus_projection_ambisonics_encoder_create().
-  * @param st <tt>OpusProjectionEncoder*</tt>: Projection encoder state to be freed.
+/** Frees an <code>OacProjectionEncoder</code> allocated by
+  * oac_projection_ambisonics_encoder_create().
+  * @param st <tt>OacProjectionEncoder*</tt>: Projection encoder state to be freed.
   */
-OPUS_EXPORT void opus_projection_encoder_destroy(OpusProjectionEncoder *st);
+OAC_EXPORT void oac_projection_encoder_destroy(OacProjectionEncoder *st);
 
 
-/** Perform a CTL function on a projection Opus encoder.
+/** Perform a CTL function on a projection Oac encoder.
   *
   * Generally the request and subsequent arguments are generated by a
   * convenience macro.
-  * @param st <tt>OpusProjectionEncoder*</tt>: Projection encoder state.
+  * @param st <tt>OacProjectionEncoder*</tt>: Projection encoder state.
   * @param request This and all remaining parameters should be replaced by one
-  *                of the convenience macros in @ref opus_genericctls,
-  *                @ref opus_encoderctls, @ref opus_multistream_ctls, or
-  *                @ref opus_projection_ctls
-  * @see opus_genericctls
-  * @see opus_encoderctls
-  * @see opus_multistream_ctls
-  * @see opus_projection_ctls
+  *                of the convenience macros in @ref oac_genericctls,
+  *                @ref oac_encoderctls, @ref oac_multistream_ctls, or
+  *                @ref oac_projection_ctls
+  * @see oac_genericctls
+  * @see oac_encoderctls
+  * @see oac_multistream_ctls
+  * @see oac_projection_ctls
   */
-OPUS_EXPORT int opus_projection_encoder_ctl(OpusProjectionEncoder *st, int request, ...) OPUS_ARG_NONNULL(1);
+OAC_EXPORT int oac_projection_encoder_ctl(OacProjectionEncoder *st, int request, ...) OAC_ARG_NONNULL(1);
 
 
 /**@}*/
@@ -374,7 +374,7 @@ OPUS_EXPORT int opus_projection_encoder_ctl(OpusProjectionEncoder *st, int reque
 /**\name Projection decoder functions */
 /**@{*/
 
-/** Gets the size of an <code>OpusProjectionDecoder</code> structure.
+/** Gets the size of an <code>OacProjectionDecoder</code> structure.
   * @param channels <tt>int</tt>: The total number of output channels.
   *                               This must be no more than 255.
   * @param streams <tt>int</tt>: The total number of streams coded in the
@@ -389,9 +389,9 @@ OPUS_EXPORT int opus_projection_encoder_ctl(OpusProjectionEncoder *st, int reque
   *                                      coupled_streams</code>) must be no
   *                                      more than 255.
   * @returns The size in bytes on success, or a negative error code
-  *          (see @ref opus_errorcodes) on error.
+  *          (see @ref oac_errorcodes) on error.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_projection_decoder_get_size(
+OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_projection_decoder_get_size(
     int channels,
     int streams,
     int coupled_streams
@@ -399,9 +399,9 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_projection_decoder_get_size(
 
 
 /** Allocates and initializes a projection decoder state.
-  * Call opus_projection_decoder_destroy() to release
+  * Call oac_projection_decoder_destroy() to release
   * this object when finished.
-  * @param Fs <tt>opus_int32</tt>: Sampling rate to decode at (in Hz).
+  * @param Fs <tt>oac_int32</tt>: Sampling rate to decode at (in Hz).
   *                                This must be one of 8000, 12000, 16000,
   *                                24000, or 48000.
   * @param channels <tt>int</tt>: Number of channels to output.
@@ -422,37 +422,37 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_projection_decoder_get_size(
   *                                      more than 255.
   * @param[in] demixing_matrix <tt>const unsigned char[demixing_matrix_size]</tt>: Demixing matrix
   *                         that mapping from coded channels to output channels,
-  *                         as described in @ref opus_projection and
-  *                         @ref opus_projection_ctls.
-  * @param demixing_matrix_size <tt>opus_int32</tt>: The size in bytes of the
+  *                         as described in @ref oac_projection and
+  *                         @ref oac_projection_ctls.
+  * @param demixing_matrix_size <tt>oac_int32</tt>: The size in bytes of the
   *                                                  demixing matrix, as
   *                                                  described in @ref
-  *                                                  opus_projection_ctls.
-  * @param[out] error <tt>int *</tt>: Returns #OPUS_OK on success, or an error
-  *                                   code (see @ref opus_errorcodes) on
+  *                                                  oac_projection_ctls.
+  * @param[out] error <tt>int *</tt>: Returns #OAC_OK on success, or an error
+  *                                   code (see @ref oac_errorcodes) on
   *                                   failure.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusProjectionDecoder *opus_projection_decoder_create(
-    opus_int32 Fs,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT OacProjectionDecoder *oac_projection_decoder_create(
+    oac_int32 Fs,
     int channels,
     int streams,
     int coupled_streams,
     unsigned char *demixing_matrix,
-    opus_int32 demixing_matrix_size,
+    oac_int32 demixing_matrix_size,
     int *error
-) OPUS_ARG_NONNULL(5);
+) OAC_ARG_NONNULL(5);
 
 
 /** Initialize a previously allocated projection decoder state object.
   * The memory pointed to by \a st must be at least the size returned by
-  * opus_projection_decoder_get_size().
+  * oac_projection_decoder_get_size().
   * This is intended for applications which use their own allocator instead of
   * malloc.
-  * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
-  * @see opus_projection_decoder_create
-  * @see opus_projection_deocder_get_size
-  * @param st <tt>OpusProjectionDecoder*</tt>: Projection encoder state to initialize.
-  * @param Fs <tt>opus_int32</tt>: Sampling rate to decode at (in Hz).
+  * To reset a previously initialized state, use the #OAC_RESET_STATE CTL.
+  * @see oac_projection_decoder_create
+  * @see oac_projection_deocder_get_size
+  * @param st <tt>OacProjectionDecoder*</tt>: Projection encoder state to initialize.
+  * @param Fs <tt>oac_int32</tt>: Sampling rate to decode at (in Hz).
   *                                This must be one of 8000, 12000, 16000,
   *                                24000, or 48000.
   * @param channels <tt>int</tt>: Number of channels to output.
@@ -473,34 +473,34 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusProjectionDecoder *opus_projection_decod
   *                                      more than 255.
   * @param[in] demixing_matrix <tt>const unsigned char[demixing_matrix_size]</tt>: Demixing matrix
   *                         that mapping from coded channels to output channels,
-  *                         as described in @ref opus_projection and
-  *                         @ref opus_projection_ctls.
-  * @param demixing_matrix_size <tt>opus_int32</tt>: The size in bytes of the
+  *                         as described in @ref oac_projection and
+  *                         @ref oac_projection_ctls.
+  * @param demixing_matrix_size <tt>oac_int32</tt>: The size in bytes of the
   *                                                  demixing matrix, as
   *                                                  described in @ref
-  *                                                  opus_projection_ctls.
-  * @returns #OPUS_OK on success, or an error code (see @ref opus_errorcodes)
+  *                                                  oac_projection_ctls.
+  * @returns #OAC_OK on success, or an error code (see @ref oac_errorcodes)
   *          on failure.
   */
-OPUS_EXPORT int opus_projection_decoder_init(
-    OpusProjectionDecoder *st,
-    opus_int32 Fs,
+OAC_EXPORT int oac_projection_decoder_init(
+    OacProjectionDecoder *st,
+    oac_int32 Fs,
     int channels,
     int streams,
     int coupled_streams,
     unsigned char *demixing_matrix,
-    opus_int32 demixing_matrix_size
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(6);
+    oac_int32 demixing_matrix_size
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(6);
 
 
-/** Decode a projection Opus packet.
-  * @param st <tt>OpusProjectionDecoder*</tt>: Projection decoder state.
+/** Decode a projection Oac packet.
+  * @param st <tt>OacProjectionDecoder*</tt>: Projection decoder state.
   * @param[in] data <tt>const unsigned char*</tt>: Input payload.
   *                                                Use a <code>NULL</code>
   *                                                pointer to indicate packet
   *                                                loss.
-  * @param len <tt>opus_int32</tt>: Number of bytes in payload.
-  * @param[out] pcm <tt>opus_int16*</tt>: Output signal, with interleaved
+  * @param len <tt>oac_int32</tt>: Number of bytes in payload.
+  * @param[out] pcm <tt>oac_int16*</tt>: Output signal, with interleaved
   *                                       samples.
   *                                       This must contain room for
   *                                       <code>frame_size*channels</code>
@@ -520,25 +520,25 @@ OPUS_EXPORT int opus_projection_decoder_init(
   *                                 If no such data is available, the frame is
   *                                 decoded as if it were lost.
   * @returns Number of samples decoded on success or a negative error code
-  *          (see @ref opus_errorcodes) on failure.
+  *          (see @ref oac_errorcodes) on failure.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_decode(
-    OpusProjectionDecoder *st,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_projection_decode(
+    OacProjectionDecoder *st,
     const unsigned char *data,
-    opus_int32 len,
-    opus_int16 *pcm,
+    oac_int32 len,
+    oac_int16 *pcm,
     int frame_size,
     int decode_fec
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
-/** Decode a projection Opus packet.
-  * @param st <tt>OpusProjectionDecoder*</tt>: Projection decoder state.
+/** Decode a projection Oac packet.
+  * @param st <tt>OacProjectionDecoder*</tt>: Projection decoder state.
   * @param[in] data <tt>const unsigned char*</tt>: Input payload.
   *                                                Use a <code>NULL</code>
   *                                                pointer to indicate packet
   *                                                loss.
-  * @param len <tt>opus_int32</tt>: Number of bytes in payload.
-  * @param[out] pcm <tt>opus_int32*</tt>: Output signal, with interleaved
+  * @param len <tt>oac_int32</tt>: Number of bytes in payload.
+  * @param[out] pcm <tt>oac_int32*</tt>: Output signal, with interleaved
   *                                       samples representing (or slightly exceeding) 24-bit values.
   *                                       This must contain room for
   *                                       <code>frame_size*channels</code>
@@ -558,25 +558,25 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_decode(
   *                                 If no such data is available, the frame is
   *                                 decoded as if it were lost.
   * @returns Number of samples decoded on success or a negative error code
-  *          (see @ref opus_errorcodes) on failure.
+  *          (see @ref oac_errorcodes) on failure.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_decode24(
-    OpusProjectionDecoder *st,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_projection_decode24(
+    OacProjectionDecoder *st,
     const unsigned char *data,
-    opus_int32 len,
-    opus_int32 *pcm,
+    oac_int32 len,
+    oac_int32 *pcm,
     int frame_size,
     int decode_fec
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
-/** Decode a projection Opus packet with floating point output.
-  * @param st <tt>OpusProjectionDecoder*</tt>: Projection decoder state.
+/** Decode a projection Oac packet with floating point output.
+  * @param st <tt>OacProjectionDecoder*</tt>: Projection decoder state.
   * @param[in] data <tt>const unsigned char*</tt>: Input payload.
   *                                                Use a <code>NULL</code>
   *                                                pointer to indicate packet
   *                                                loss.
-  * @param len <tt>opus_int32</tt>: Number of bytes in payload.
-  * @param[out] pcm <tt>opus_int16*</tt>: Output signal, with interleaved
+  * @param len <tt>oac_int32</tt>: Number of bytes in payload.
+  * @param[out] pcm <tt>oac_int16*</tt>: Output signal, with interleaved
   *                                       samples.
   *                                       This must contain room for
   *                                       <code>frame_size*channels</code>
@@ -596,40 +596,40 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_decode24(
   *                                 If no such data is available, the frame is
   *                                 decoded as if it were lost.
   * @returns Number of samples decoded on success or a negative error code
-  *          (see @ref opus_errorcodes) on failure.
+  *          (see @ref oac_errorcodes) on failure.
   */
-OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_decode_float(
-    OpusProjectionDecoder *st,
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_projection_decode_float(
+    OacProjectionDecoder *st,
     const unsigned char *data,
-    opus_int32 len,
+    oac_int32 len,
     float *pcm,
     int frame_size,
     int decode_fec
-) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
 
-/** Perform a CTL function on a projection Opus decoder.
+/** Perform a CTL function on a projection Oac decoder.
   *
   * Generally the request and subsequent arguments are generated by a
   * convenience macro.
-  * @param st <tt>OpusProjectionDecoder*</tt>: Projection decoder state.
+  * @param st <tt>OacProjectionDecoder*</tt>: Projection decoder state.
   * @param request This and all remaining parameters should be replaced by one
-  *                of the convenience macros in @ref opus_genericctls,
-  *                @ref opus_decoderctls, @ref opus_multistream_ctls, or
-  *                @ref opus_projection_ctls.
-  * @see opus_genericctls
-  * @see opus_decoderctls
-  * @see opus_multistream_ctls
-  * @see opus_projection_ctls
+  *                of the convenience macros in @ref oac_genericctls,
+  *                @ref oac_decoderctls, @ref oac_multistream_ctls, or
+  *                @ref oac_projection_ctls.
+  * @see oac_genericctls
+  * @see oac_decoderctls
+  * @see oac_multistream_ctls
+  * @see oac_projection_ctls
   */
-OPUS_EXPORT int opus_projection_decoder_ctl(OpusProjectionDecoder *st, int request, ...) OPUS_ARG_NONNULL(1);
+OAC_EXPORT int oac_projection_decoder_ctl(OacProjectionDecoder *st, int request, ...) OAC_ARG_NONNULL(1);
 
 
-/** Frees an <code>OpusProjectionDecoder</code> allocated by
-  * opus_projection_decoder_create().
-  * @param st <tt>OpusProjectionDecoder</tt>: Projection decoder state to be freed.
+/** Frees an <code>OacProjectionDecoder</code> allocated by
+  * oac_projection_decoder_create().
+  * @param st <tt>OacProjectionDecoder</tt>: Projection decoder state to be freed.
   */
-OPUS_EXPORT void opus_projection_decoder_destroy(OpusProjectionDecoder *st);
+OAC_EXPORT void oac_projection_decoder_destroy(OacProjectionDecoder *st);
 
 
 /**@}*/
@@ -640,4 +640,4 @@ OPUS_EXPORT void opus_projection_decoder_destroy(OpusProjectionDecoder *st);
 }
 #endif
 
-#endif /* OPUS_PROJECTION_H */
+#endif /* OAC_PROJECTION_H */
diff --git a/include/oac_types.h b/include/oac_types.h
new file mode 100644
index 000000000..ea3c957d4
--- /dev/null
+++ b/include/oac_types.h
@@ -0,0 +1,166 @@
+/* (C) COPYRIGHT 1994-2002 Xiph.Org Foundation */
+/* Modified by Jean-Marc Valin */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+/* oac_types.h based on ogg_types.h from libogg */
+
+/**
+   @file oac_types.h
+   @brief Oac reference implementation types
+*/
+#ifndef OAC_TYPES_H
+#define OAC_TYPES_H
+
+#define oac_int         int                     /* used for counters etc; at least 16 bits */
+#define oac_int64       long long
+#define oac_int8        signed char
+
+#define oac_uint        unsigned int            /* used for counters etc; at least 16 bits */
+#define oac_uint64      unsigned long long
+#define oac_uint8       unsigned char
+
+/* Use the real stdint.h if it's there (taken from Paul Hsieh's pstdint.h) */
+#if (defined(__STDC__) && __STDC__ && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_)) || defined (HAVE_STDINT_H))
+#include <stdint.h>
+#  undef oac_int64
+#  undef oac_int8
+#  undef oac_uint64
+#  undef oac_uint8
+   typedef int8_t oac_int8;
+   typedef uint8_t oac_uint8;
+   typedef int16_t oac_int16;
+   typedef uint16_t oac_uint16;
+   typedef int32_t oac_int32;
+   typedef uint32_t oac_uint32;
+   typedef int64_t oac_int64;
+   typedef uint64_t oac_uint64;
+#elif defined(_WIN32)
+
+#  if defined(__CYGWIN__)
+#    include <_G_config.h>
+     typedef _G_int32_t oac_int32;
+     typedef _G_uint32_t oac_uint32;
+     typedef _G_int16 oac_int16;
+     typedef _G_uint16 oac_uint16;
+#  elif defined(__MINGW32__)
+     typedef short oac_int16;
+     typedef unsigned short oac_uint16;
+     typedef int oac_int32;
+     typedef unsigned int oac_uint32;
+#  elif defined(__MWERKS__)
+     typedef int oac_int32;
+     typedef unsigned int oac_uint32;
+     typedef short oac_int16;
+     typedef unsigned short oac_uint16;
+#  else
+     /* MSVC/Borland */
+     typedef __int32 oac_int32;
+     typedef unsigned __int32 oac_uint32;
+     typedef __int16 oac_int16;
+     typedef unsigned __int16 oac_uint16;
+#  endif
+
+#elif defined(__MACOS__)
+
+#  include <sys/types.h>
+   typedef SInt16 oac_int16;
+   typedef UInt16 oac_uint16;
+   typedef SInt32 oac_int32;
+   typedef UInt32 oac_uint32;
+
+#elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
+
+#  include <sys/types.h>
+   typedef int16_t oac_int16;
+   typedef u_int16_t oac_uint16;
+   typedef int32_t oac_int32;
+   typedef u_int32_t oac_uint32;
+
+#elif defined(__BEOS__)
+
+   /* Be */
+#  include <inttypes.h>
+   typedef int16 oac_int16;
+   typedef u_int16 oac_uint16;
+   typedef int32_t oac_int32;
+   typedef u_int32_t oac_uint32;
+
+#elif defined (__EMX__)
+
+   /* OS/2 GCC */
+   typedef short oac_int16;
+   typedef unsigned short oac_uint16;
+   typedef int oac_int32;
+   typedef unsigned int oac_uint32;
+
+#elif defined (DJGPP)
+
+   /* DJGPP */
+   typedef short oac_int16;
+   typedef unsigned short oac_uint16;
+   typedef int oac_int32;
+   typedef unsigned int oac_uint32;
+
+#elif defined(R5900)
+
+   /* PS2 EE */
+   typedef int oac_int32;
+   typedef unsigned oac_uint32;
+   typedef short oac_int16;
+   typedef unsigned short oac_uint16;
+
+#elif defined(__SYMBIAN32__)
+
+   /* Symbian GCC */
+   typedef signed short oac_int16;
+   typedef unsigned short oac_uint16;
+   typedef signed int oac_int32;
+   typedef unsigned int oac_uint32;
+
+#elif defined(CONFIG_TI_C54X) || defined (CONFIG_TI_C55X)
+
+   typedef short oac_int16;
+   typedef unsigned short oac_uint16;
+   typedef long oac_int32;
+   typedef unsigned long oac_uint32;
+
+#elif defined(CONFIG_TI_C6X)
+
+   typedef short oac_int16;
+   typedef unsigned short oac_uint16;
+   typedef int oac_int32;
+   typedef unsigned int oac_uint32;
+
+#else
+
+   /* Give up, take a reasonable guess */
+   typedef short oac_int16;
+   typedef unsigned short oac_uint16;
+   typedef int oac_int32;
+   typedef unsigned int oac_uint32;
+
+#endif
+
+#endif  /* OAC_TYPES_H */
diff --git a/include/opus_defines.h b/include/opus_defines.h
deleted file mode 100644
index 4f70ccaa9..000000000
--- a/include/opus_defines.h
+++ /dev/null
@@ -1,860 +0,0 @@
-/* Copyright (c) 2010-2011 Xiph.Org Foundation, Skype Limited
-   Written by Jean-Marc Valin and Koen Vos */
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/**
- * @file opus_defines.h
- * @brief Opus reference implementation constants
- */
-
-#ifndef OPUS_DEFINES_H
-#define OPUS_DEFINES_H
-
-#include "opus_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @defgroup opus_errorcodes Error codes
- * @{
- */
-/** No error @hideinitializer*/
-#define OPUS_OK                0
-/** One or more invalid/out of range arguments @hideinitializer*/
-#define OPUS_BAD_ARG          -1
-/** Not enough bytes allocated in the buffer @hideinitializer*/
-#define OPUS_BUFFER_TOO_SMALL -2
-/** An internal error was detected @hideinitializer*/
-#define OPUS_INTERNAL_ERROR   -3
-/** The compressed data passed is corrupted @hideinitializer*/
-#define OPUS_INVALID_PACKET   -4
-/** Invalid/unsupported request number @hideinitializer*/
-#define OPUS_UNIMPLEMENTED    -5
-/** An encoder or decoder structure is invalid or already freed @hideinitializer*/
-#define OPUS_INVALID_STATE    -6
-/** Memory allocation has failed @hideinitializer*/
-#define OPUS_ALLOC_FAIL       -7
-/**@}*/
-
-/** @cond OPUS_INTERNAL_DOC */
-/**Export control for opus functions */
-
-#ifndef OPUS_EXPORT
-# if defined(_WIN32)
-#  if defined(OPUS_BUILD) && defined(DLL_EXPORT)
-#   define OPUS_EXPORT __declspec(dllexport)
-#  else
-#   define OPUS_EXPORT
-#  endif
-# elif defined(__GNUC__) && defined(OPUS_BUILD)
-#  define OPUS_EXPORT __attribute__ ((visibility ("default")))
-# else
-#  define OPUS_EXPORT
-# endif
-#endif
-
-# if !defined(OPUS_GNUC_PREREQ)
-#  if defined(__GNUC__)&&defined(__GNUC_MINOR__)
-#   define OPUS_GNUC_PREREQ(_maj,_min) \
- ((__GNUC__<<16)+__GNUC_MINOR__>=((_maj)<<16)+(_min))
-#  else
-#   define OPUS_GNUC_PREREQ(_maj,_min) 0
-#  endif
-# endif
-
-#if (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) )
-# if OPUS_GNUC_PREREQ(3,0)
-#  define OPUS_RESTRICT __restrict__
-# elif (defined(_MSC_VER) && _MSC_VER >= 1400)
-#  define OPUS_RESTRICT __restrict
-# else
-#  define OPUS_RESTRICT
-# endif
-#else
-# define OPUS_RESTRICT restrict
-#endif
-
-#if (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) )
-# if OPUS_GNUC_PREREQ(2,7)
-#  define OPUS_INLINE __inline__
-# elif (defined(_MSC_VER))
-#  define OPUS_INLINE __inline
-# else
-#  define OPUS_INLINE
-# endif
-#else
-# define OPUS_INLINE inline
-#endif
-
-/**Warning attributes for opus functions
-  * NONNULL is not used in OPUS_BUILD to avoid the compiler optimizing out
-  * some paranoid null checks. */
-#if defined(__GNUC__) && OPUS_GNUC_PREREQ(3, 4)
-# define OPUS_WARN_UNUSED_RESULT __attribute__ ((__warn_unused_result__))
-#else
-# define OPUS_WARN_UNUSED_RESULT
-#endif
-#if !defined(OPUS_BUILD) && defined(__GNUC__) && OPUS_GNUC_PREREQ(3, 4)
-# define OPUS_ARG_NONNULL(_x)  __attribute__ ((__nonnull__(_x)))
-#else
-# define OPUS_ARG_NONNULL(_x)
-#endif
-
-/** These are the actual Encoder CTL ID numbers.
-  * They should not be used directly by applications.
-  * In general, SETs should be even and GETs should be odd.*/
-#define OPUS_SET_APPLICATION_REQUEST         4000
-#define OPUS_GET_APPLICATION_REQUEST         4001
-#define OPUS_SET_BITRATE_REQUEST             4002
-#define OPUS_GET_BITRATE_REQUEST             4003
-#define OPUS_SET_MAX_BANDWIDTH_REQUEST       4004
-#define OPUS_GET_MAX_BANDWIDTH_REQUEST       4005
-#define OPUS_SET_VBR_REQUEST                 4006
-#define OPUS_GET_VBR_REQUEST                 4007
-#define OPUS_SET_BANDWIDTH_REQUEST           4008
-#define OPUS_GET_BANDWIDTH_REQUEST           4009
-#define OPUS_SET_COMPLEXITY_REQUEST          4010
-#define OPUS_GET_COMPLEXITY_REQUEST          4011
-#define OPUS_SET_INBAND_FEC_REQUEST          4012
-#define OPUS_GET_INBAND_FEC_REQUEST          4013
-#define OPUS_SET_PACKET_LOSS_PERC_REQUEST    4014
-#define OPUS_GET_PACKET_LOSS_PERC_REQUEST    4015
-#define OPUS_SET_DTX_REQUEST                 4016
-#define OPUS_GET_DTX_REQUEST                 4017
-#define OPUS_SET_VBR_CONSTRAINT_REQUEST      4020
-#define OPUS_GET_VBR_CONSTRAINT_REQUEST      4021
-#define OPUS_SET_FORCE_CHANNELS_REQUEST      4022
-#define OPUS_GET_FORCE_CHANNELS_REQUEST      4023
-#define OPUS_SET_SIGNAL_REQUEST              4024
-#define OPUS_GET_SIGNAL_REQUEST              4025
-#define OPUS_GET_LOOKAHEAD_REQUEST           4027
-/* #define OPUS_RESET_STATE 4028 */
-#define OPUS_GET_SAMPLE_RATE_REQUEST         4029
-#define OPUS_GET_FINAL_RANGE_REQUEST         4031
-#define OPUS_GET_PITCH_REQUEST               4033
-#define OPUS_SET_GAIN_REQUEST                4034
-#define OPUS_GET_GAIN_REQUEST                4045 /* Should have been 4035 */
-#define OPUS_SET_LSB_DEPTH_REQUEST           4036
-#define OPUS_GET_LSB_DEPTH_REQUEST           4037
-#define OPUS_GET_LAST_PACKET_DURATION_REQUEST 4039
-#define OPUS_SET_EXPERT_FRAME_DURATION_REQUEST 4040
-#define OPUS_GET_EXPERT_FRAME_DURATION_REQUEST 4041
-#define OPUS_SET_PREDICTION_DISABLED_REQUEST 4042
-#define OPUS_GET_PREDICTION_DISABLED_REQUEST 4043
-/* Don't use 4045, it's already taken by OPUS_GET_GAIN_REQUEST */
-#define OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST 4046
-#define OPUS_GET_PHASE_INVERSION_DISABLED_REQUEST 4047
-#define OPUS_GET_IN_DTX_REQUEST              4049
-#define OPUS_SET_DRED_DURATION_REQUEST 4050
-#define OPUS_GET_DRED_DURATION_REQUEST 4051
-#define OPUS_SET_DNN_BLOB_REQUEST 4052
-/*#define OPUS_GET_DNN_BLOB_REQUEST 4053 */
-#define OPUS_SET_OSCE_BWE_REQUEST 4054
-#define OPUS_GET_OSCE_BWE_REQUEST 4055
-
-
-#define OPUS_SET_IGNORE_EXTENSIONS_REQUEST 4058
-#define OPUS_GET_IGNORE_EXTENSIONS_REQUEST 4059
-
-/** Defines for the presence of extended APIs. */
-#define OPUS_HAVE_OPUS_PROJECTION_H
-
-/* Macros to trigger compilation errors when the wrong types are provided to a CTL */
-#define opus_check_int(x) (((void)((x) == (opus_int32)0)), (opus_int32)(x))
-
-#ifdef DISABLE_PTR_CHECK
-/* Disable checks to prevent ubsan from complaining about NULL checks
-   in test_opus_api. */
-#define opus_check_int_ptr(ptr) (ptr)
-#define opus_check_uint_ptr(ptr) (ptr)
-#define opus_check_uint8_ptr(ptr) (ptr)
-#define opus_check_val16_ptr(ptr) (ptr)
-#define opus_check_void_ptr(ptr) (ptr)
-#else
-#define opus_check_int_ptr(ptr) ((ptr) + ((ptr) - (opus_int32*)(ptr)))
-#define opus_check_uint_ptr(ptr) ((ptr) + ((ptr) - (opus_uint32*)(ptr)))
-#define opus_check_uint8_ptr(ptr) ((ptr) + ((ptr) - (opus_uint8*)(ptr)))
-#define opus_check_val16_ptr(ptr) ((ptr) + ((ptr) - (opus_val16*)(ptr)))
-#define opus_check_void_ptr(x) ((void)((void *)0 == (x)), (x))
-#endif
-/** @endcond */
-
-/** @defgroup opus_ctlvalues Pre-defined values for CTL interface
-  * @see opus_genericctls, opus_encoderctls
-  * @{
-  */
-/* Values for the various encoder CTLs */
-#define OPUS_AUTO                           -1000 /**<Auto/default setting @hideinitializer*/
-#define OPUS_BITRATE_MAX                       -1 /**<Maximum bitrate @hideinitializer*/
-
-/** Best for most VoIP/videoconference applications where listening quality and intelligibility matter most
- * @hideinitializer */
-#define OPUS_APPLICATION_VOIP                2048
-/** Best for broadcast/high-fidelity application where the decoded audio should be as close as possible to the input
- * @hideinitializer */
-#define OPUS_APPLICATION_AUDIO               2049
-/** Only use when lowest-achievable latency is what matters most. Voice-optimized modes cannot be used.
- * @hideinitializer */
-#define OPUS_APPLICATION_RESTRICTED_LOWDELAY 2051
-/** Experts only: forces SILK encoding; don't allocate CELT state at all. Disables OPUS_SET_APPLICATION. */
-#define OPUS_APPLICATION_RESTRICTED_SILK     2052
-/** Experts only: forces CELT encoding; don't allocate SILK state at all. Disables OPUS_SET_APPLICATION. */
-#define OPUS_APPLICATION_RESTRICTED_CELT     2053
-
-#define OPUS_SIGNAL_VOICE                    3001 /**< Signal being encoded is voice */
-#define OPUS_SIGNAL_MUSIC                    3002 /**< Signal being encoded is music */
-#define OPUS_BANDWIDTH_NARROWBAND            1101 /**< 4 kHz bandpass @hideinitializer*/
-#define OPUS_BANDWIDTH_MEDIUMBAND            1102 /**< 6 kHz bandpass @hideinitializer*/
-#define OPUS_BANDWIDTH_WIDEBAND              1103 /**< 8 kHz bandpass @hideinitializer*/
-#define OPUS_BANDWIDTH_SUPERWIDEBAND         1104 /**<12 kHz bandpass @hideinitializer*/
-#define OPUS_BANDWIDTH_FULLBAND              1105 /**<20 kHz bandpass @hideinitializer*/
-
-#define OPUS_FRAMESIZE_ARG                   5000 /**< Select frame size from the argument (default) */
-#define OPUS_FRAMESIZE_2_5_MS                5001 /**< Use 2.5 ms frames */
-#define OPUS_FRAMESIZE_5_MS                  5002 /**< Use 5 ms frames */
-#define OPUS_FRAMESIZE_10_MS                 5003 /**< Use 10 ms frames */
-#define OPUS_FRAMESIZE_20_MS                 5004 /**< Use 20 ms frames */
-#define OPUS_FRAMESIZE_40_MS                 5005 /**< Use 40 ms frames */
-#define OPUS_FRAMESIZE_60_MS                 5006 /**< Use 60 ms frames */
-#define OPUS_FRAMESIZE_80_MS                 5007 /**< Use 80 ms frames */
-#define OPUS_FRAMESIZE_100_MS                5008 /**< Use 100 ms frames */
-#define OPUS_FRAMESIZE_120_MS                5009 /**< Use 120 ms frames */
-
-/**@}*/
-
-
-/** @defgroup opus_encoderctls Encoder related CTLs
-  *
-  * These are convenience macros for use with the \c opus_encode_ctl
-  * interface. They are used to generate the appropriate series of
-  * arguments for that call, passing the correct type, size and so
-  * on as expected for each particular request.
-  *
-  * Some usage examples:
-  *
-  * @code
-  * int ret;
-  * ret = opus_encoder_ctl(enc_ctx, OPUS_SET_BANDWIDTH(OPUS_AUTO));
-  * if (ret != OPUS_OK) return ret;
-  *
-  * opus_int32 rate;
-  * opus_encoder_ctl(enc_ctx, OPUS_GET_BANDWIDTH(&rate));
-  *
-  * opus_encoder_ctl(enc_ctx, OPUS_RESET_STATE);
-  * @endcode
-  *
-  * @see opus_genericctls, opus_encoder
-  * @{
-  */
-
-/** Configures the encoder's computational complexity.
-  * The supported range is 0-10 inclusive with 10 representing the highest complexity.
-  * @see OPUS_GET_COMPLEXITY
-  * @param[in] x <tt>opus_int32</tt>: Allowed values: 0-10, inclusive.
-  *
-  * @hideinitializer */
-#define OPUS_SET_COMPLEXITY(x) OPUS_SET_COMPLEXITY_REQUEST, opus_check_int(x)
-/** Gets the encoder's complexity configuration.
-  * @see OPUS_SET_COMPLEXITY
-  * @param[out] x <tt>opus_int32 *</tt>: Returns a value in the range 0-10,
-  *                                      inclusive.
-  * @hideinitializer */
-#define OPUS_GET_COMPLEXITY(x) OPUS_GET_COMPLEXITY_REQUEST, opus_check_int_ptr(x)
-
-/** Configures the bitrate in the encoder.
-  * Rates from 500 to 512000 bits per second are meaningful, as well as the
-  * special values #OPUS_AUTO and #OPUS_BITRATE_MAX.
-  * The value #OPUS_BITRATE_MAX can be used to cause the codec to use as much
-  * rate as it can, which is useful for controlling the rate by adjusting the
-  * output buffer size.
-  * @see OPUS_GET_BITRATE
-  * @param[in] x <tt>opus_int32</tt>: Bitrate in bits per second. The default
-  *                                   is determined based on the number of
-  *                                   channels and the input sampling rate.
-  * @hideinitializer */
-#define OPUS_SET_BITRATE(x) OPUS_SET_BITRATE_REQUEST, opus_check_int(x)
-/** Gets the encoder's bitrate configuration.
-  * @see OPUS_SET_BITRATE
-  * @param[out] x <tt>opus_int32 *</tt>: Returns the bitrate in bits per second.
-  *                                      The default is determined based on the
-  *                                      number of channels and the input
-  *                                      sampling rate.
-  * @hideinitializer */
-#define OPUS_GET_BITRATE(x) OPUS_GET_BITRATE_REQUEST, opus_check_int_ptr(x)
-
-/** Enables or disables variable bitrate (VBR) in the encoder.
-  * The configured bitrate may not be met exactly because frames must
-  * be an integer number of bytes in length.
-  * @see OPUS_GET_VBR
-  * @see OPUS_SET_VBR_CONSTRAINT
-  * @param[in] x <tt>opus_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>0</dt><dd>Hard CBR. For LPC/hybrid modes at very low bit-rate, this can
-  *               cause noticeable quality degradation.</dd>
-  * <dt>1</dt><dd>VBR (default). The exact type of VBR is controlled by
-  *               #OPUS_SET_VBR_CONSTRAINT.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_VBR(x) OPUS_SET_VBR_REQUEST, opus_check_int(x)
-/** Determine if variable bitrate (VBR) is enabled in the encoder.
-  * @see OPUS_SET_VBR
-  * @see OPUS_GET_VBR_CONSTRAINT
-  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>0</dt><dd>Hard CBR.</dd>
-  * <dt>1</dt><dd>VBR (default). The exact type of VBR may be retrieved via
-  *               #OPUS_GET_VBR_CONSTRAINT.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_VBR(x) OPUS_GET_VBR_REQUEST, opus_check_int_ptr(x)
-
-/** Enables or disables constrained VBR in the encoder.
-  * This setting is ignored when the encoder is in CBR mode.
-  * @warning Only the MDCT mode of Opus currently heeds the constraint.
-  *  Speech mode ignores it completely, hybrid mode may fail to obey it
-  *  if the LPC layer uses more bitrate than the constraint would have
-  *  permitted.
-  * @see OPUS_GET_VBR_CONSTRAINT
-  * @see OPUS_SET_VBR
-  * @param[in] x <tt>opus_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>0</dt><dd>Unconstrained VBR.</dd>
-  * <dt>1</dt><dd>Constrained VBR (default). This creates a maximum of one
-  *               frame of buffering delay assuming a transport with a
-  *               serialization speed of the nominal bitrate.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_VBR_CONSTRAINT(x) OPUS_SET_VBR_CONSTRAINT_REQUEST, opus_check_int(x)
-/** Determine if constrained VBR is enabled in the encoder.
-  * @see OPUS_SET_VBR_CONSTRAINT
-  * @see OPUS_GET_VBR
-  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>0</dt><dd>Unconstrained VBR.</dd>
-  * <dt>1</dt><dd>Constrained VBR (default).</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_VBR_CONSTRAINT(x) OPUS_GET_VBR_CONSTRAINT_REQUEST, opus_check_int_ptr(x)
-
-/** Configures mono/stereo forcing in the encoder.
-  * This can force the encoder to produce packets encoded as either mono or
-  * stereo, regardless of the format of the input audio. This is useful when
-  * the caller knows that the input signal is currently a mono source embedded
-  * in a stereo stream.
-  * @see OPUS_GET_FORCE_CHANNELS
-  * @param[in] x <tt>opus_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>#OPUS_AUTO</dt><dd>Not forced (default)</dd>
-  * <dt>1</dt>         <dd>Forced mono</dd>
-  * <dt>2</dt>         <dd>Forced stereo</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_FORCE_CHANNELS(x) OPUS_SET_FORCE_CHANNELS_REQUEST, opus_check_int(x)
-/** Gets the encoder's forced channel configuration.
-  * @see OPUS_SET_FORCE_CHANNELS
-  * @param[out] x <tt>opus_int32 *</tt>:
-  * <dl>
-  * <dt>#OPUS_AUTO</dt><dd>Not forced (default)</dd>
-  * <dt>1</dt>         <dd>Forced mono</dd>
-  * <dt>2</dt>         <dd>Forced stereo</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_FORCE_CHANNELS(x) OPUS_GET_FORCE_CHANNELS_REQUEST, opus_check_int_ptr(x)
-
-/** Configures the maximum bandpass that the encoder will select automatically.
-  * Applications should normally use this instead of #OPUS_SET_BANDWIDTH
-  * (leaving that set to the default, #OPUS_AUTO). This allows the
-  * application to set an upper bound based on the type of input it is
-  * providing, but still gives the encoder the freedom to reduce the bandpass
-  * when the bitrate becomes too low, for better overall quality.
-  * @see OPUS_GET_MAX_BANDWIDTH
-  * @param[in] x <tt>opus_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>OPUS_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
-  * <dt>OPUS_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
-  * <dt>OPUS_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
-  * <dt>OPUS_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
-  * <dt>OPUS_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband (default)</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_MAX_BANDWIDTH(x) OPUS_SET_MAX_BANDWIDTH_REQUEST, opus_check_int(x)
-
-/** Gets the encoder's configured maximum allowed bandpass.
-  * @see OPUS_SET_MAX_BANDWIDTH
-  * @param[out] x <tt>opus_int32 *</tt>: Allowed values:
-  * <dl>
-  * <dt>#OPUS_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband (default)</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_MAX_BANDWIDTH(x) OPUS_GET_MAX_BANDWIDTH_REQUEST, opus_check_int_ptr(x)
-
-/** Sets the encoder's bandpass to a specific value.
-  * This prevents the encoder from automatically selecting the bandpass based
-  * on the available bitrate. If an application knows the bandpass of the input
-  * audio it is providing, it should normally use #OPUS_SET_MAX_BANDWIDTH
-  * instead, which still gives the encoder the freedom to reduce the bandpass
-  * when the bitrate becomes too low, for better overall quality.
-  * @see OPUS_GET_BANDWIDTH
-  * @param[in] x <tt>opus_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>#OPUS_AUTO</dt>                    <dd>(default)</dd>
-  * <dt>#OPUS_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_BANDWIDTH(x) OPUS_SET_BANDWIDTH_REQUEST, opus_check_int(x)
-
-/** Configures the type of signal being encoded.
-  * This is a hint which helps the encoder's mode selection.
-  * @see OPUS_GET_SIGNAL
-  * @param[in] x <tt>opus_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>#OPUS_AUTO</dt>        <dd>(default)</dd>
-  * <dt>#OPUS_SIGNAL_VOICE</dt><dd>Bias thresholds towards choosing LPC or Hybrid modes.</dd>
-  * <dt>#OPUS_SIGNAL_MUSIC</dt><dd>Bias thresholds towards choosing MDCT modes.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_SIGNAL(x) OPUS_SET_SIGNAL_REQUEST, opus_check_int(x)
-/** Gets the encoder's configured signal type.
-  * @see OPUS_SET_SIGNAL
-  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>#OPUS_AUTO</dt>        <dd>(default)</dd>
-  * <dt>#OPUS_SIGNAL_VOICE</dt><dd>Bias thresholds towards choosing LPC or Hybrid modes.</dd>
-  * <dt>#OPUS_SIGNAL_MUSIC</dt><dd>Bias thresholds towards choosing MDCT modes.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_SIGNAL(x) OPUS_GET_SIGNAL_REQUEST, opus_check_int_ptr(x)
-
-
-/** Configures the encoder's intended application.
-  * The initial value is a mandatory argument to the encoder_create function.
-  * @see OPUS_GET_APPLICATION
-  * @param[in] x <tt>opus_int32</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>#OPUS_APPLICATION_VOIP</dt>
-  * <dd>Process signal for improved speech intelligibility.</dd>
-  * <dt>#OPUS_APPLICATION_AUDIO</dt>
-  * <dd>Favor faithfulness to the original input.</dd>
-  * <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
-  * <dd>Configure the minimum possible coding delay by disabling certain modes
-  * of operation.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_APPLICATION(x) OPUS_SET_APPLICATION_REQUEST, opus_check_int(x)
-/** Gets the encoder's configured application.
-  * @see OPUS_SET_APPLICATION
-  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>#OPUS_APPLICATION_VOIP</dt>
-  * <dd>Process signal for improved speech intelligibility.</dd>
-  * <dt>#OPUS_APPLICATION_AUDIO</dt>
-  * <dd>Favor faithfulness to the original input.</dd>
-  * <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
-  * <dd>Configure the minimum possible coding delay by disabling certain modes
-  * of operation.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_APPLICATION(x) OPUS_GET_APPLICATION_REQUEST, opus_check_int_ptr(x)
-
-/** Gets the total samples of delay added by the entire codec.
-  * This can be queried by the encoder and then the provided number of samples can be
-  * skipped on from the start of the decoder's output to provide time aligned input
-  * and output. From the perspective of a decoding application the real data begins this many
-  * samples late.
-  *
-  * The decoder contribution to this delay is identical for all decoders, but the
-  * encoder portion of the delay may vary from implementation to implementation,
-  * version to version, or even depend on the encoder's initial configuration.
-  * Applications needing delay compensation should call this CTL rather than
-  * hard-coding a value.
-  * @param[out] x <tt>opus_int32 *</tt>:   Number of lookahead samples
-  * @hideinitializer */
-#define OPUS_GET_LOOKAHEAD(x) OPUS_GET_LOOKAHEAD_REQUEST, opus_check_int_ptr(x)
-
-/** Configures the encoder's use of inband forward error correction (FEC).
-  * @note This is only applicable to the LPC layer
-  * @see OPUS_GET_INBAND_FEC
-  * @param[in] x <tt>opus_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>0</dt><dd>Disable inband FEC (default).</dd>
-  * <dt>1</dt><dd>Inband FEC enabled. If the packet loss rate is sufficiently high, Opus will automatically switch to SILK even at high rates to enable use of that FEC.</dd>
-  * <dt>2</dt><dd>Inband FEC enabled, but does not necessarily switch to SILK if we have music.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_INBAND_FEC(x) OPUS_SET_INBAND_FEC_REQUEST, opus_check_int(x)
-/** Gets encoder's configured use of inband forward error correction.
-  * @see OPUS_SET_INBAND_FEC
-  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>0</dt><dd>Inband FEC disabled (default).</dd>
-  * <dt>1</dt><dd>Inband FEC enabled. If the packet loss rate is sufficiently high, Opus will automatically switch to SILK even at high rates to enable use of that FEC.</dd>
-  * <dt>2</dt><dd>Inband FEC enabled, but does not necessarily switch to SILK if we have music.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_INBAND_FEC(x) OPUS_GET_INBAND_FEC_REQUEST, opus_check_int_ptr(x)
-
-/** Configures the encoder's expected packet loss percentage.
-  * Higher values trigger progressively more loss resistant behavior in the encoder
-  * at the expense of quality at a given bitrate in the absence of packet loss, but
-  * greater quality under loss.
-  * @see OPUS_GET_PACKET_LOSS_PERC
-  * @param[in] x <tt>opus_int32</tt>:   Loss percentage in the range 0-100, inclusive (default: 0).
-  * @hideinitializer */
-#define OPUS_SET_PACKET_LOSS_PERC(x) OPUS_SET_PACKET_LOSS_PERC_REQUEST, opus_check_int(x)
-/** Gets the encoder's configured packet loss percentage.
-  * @see OPUS_SET_PACKET_LOSS_PERC
-  * @param[out] x <tt>opus_int32 *</tt>: Returns the configured loss percentage
-  *                                      in the range 0-100, inclusive (default: 0).
-  * @hideinitializer */
-#define OPUS_GET_PACKET_LOSS_PERC(x) OPUS_GET_PACKET_LOSS_PERC_REQUEST, opus_check_int_ptr(x)
-
-/** Configures the encoder's use of discontinuous transmission (DTX).
-  * @note This is only applicable to the LPC layer
-  * @see OPUS_GET_DTX
-  * @param[in] x <tt>opus_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>0</dt><dd>Disable DTX (default).</dd>
-  * <dt>1</dt><dd>Enabled DTX.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_DTX(x) OPUS_SET_DTX_REQUEST, opus_check_int(x)
-/** Gets encoder's configured use of discontinuous transmission.
-  * @see OPUS_SET_DTX
-  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>0</dt><dd>DTX disabled (default).</dd>
-  * <dt>1</dt><dd>DTX enabled.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_DTX(x) OPUS_GET_DTX_REQUEST, opus_check_int_ptr(x)
-/** Configures the depth of signal being encoded.
-  *
-  * This is a hint which helps the encoder identify silence and near-silence.
-  * It represents the number of significant bits of linear intensity below
-  * which the signal contains ignorable quantization or other noise.
-  *
-  * For example, OPUS_SET_LSB_DEPTH(14) would be an appropriate setting
-  * for G.711 u-law input. OPUS_SET_LSB_DEPTH(16) would be appropriate
-  * for 16-bit linear pcm input with opus_encode_float().
-  *
-  * When using opus_encode() instead of opus_encode_float(), or when libopus
-  * is compiled for fixed-point, the encoder uses the minimum of the value
-  * set here and the value 16.
-  *
-  * @see OPUS_GET_LSB_DEPTH
-  * @param[in] x <tt>opus_int32</tt>: Input precision in bits, between 8 and 24
-  *                                   (default: 24).
-  * @hideinitializer */
-#define OPUS_SET_LSB_DEPTH(x) OPUS_SET_LSB_DEPTH_REQUEST, opus_check_int(x)
-/** Gets the encoder's configured signal depth.
-  * @see OPUS_SET_LSB_DEPTH
-  * @param[out] x <tt>opus_int32 *</tt>: Input precision in bits, between 8 and
-  *                                      24 (default: 24).
-  * @hideinitializer */
-#define OPUS_GET_LSB_DEPTH(x) OPUS_GET_LSB_DEPTH_REQUEST, opus_check_int_ptr(x)
-
-/** Configures the encoder's use of variable duration frames.
-  * When variable duration is enabled, the encoder is free to use a shorter frame
-  * size than the one requested in the opus_encode*() call.
-  * It is then the user's responsibility
-  * to verify how much audio was encoded by checking the ToC byte of the encoded
-  * packet. The part of the audio that was not encoded needs to be resent to the
-  * encoder for the next call. Do not use this option unless you <b>really</b>
-  * know what you are doing.
-  * @see OPUS_GET_EXPERT_FRAME_DURATION
-  * @param[in] x <tt>opus_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>OPUS_FRAMESIZE_ARG</dt><dd>Select frame size from the argument (default).</dd>
-  * <dt>OPUS_FRAMESIZE_2_5_MS</dt><dd>Use 2.5 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_5_MS</dt><dd>Use 5 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_10_MS</dt><dd>Use 10 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_20_MS</dt><dd>Use 20 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_40_MS</dt><dd>Use 40 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_60_MS</dt><dd>Use 60 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_80_MS</dt><dd>Use 80 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_100_MS</dt><dd>Use 100 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_120_MS</dt><dd>Use 120 ms frames.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_EXPERT_FRAME_DURATION(x) OPUS_SET_EXPERT_FRAME_DURATION_REQUEST, opus_check_int(x)
-/** Gets the encoder's configured use of variable duration frames.
-  * @see OPUS_SET_EXPERT_FRAME_DURATION
-  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>OPUS_FRAMESIZE_ARG</dt><dd>Select frame size from the argument (default).</dd>
-  * <dt>OPUS_FRAMESIZE_2_5_MS</dt><dd>Use 2.5 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_5_MS</dt><dd>Use 5 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_10_MS</dt><dd>Use 10 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_20_MS</dt><dd>Use 20 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_40_MS</dt><dd>Use 40 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_60_MS</dt><dd>Use 60 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_80_MS</dt><dd>Use 80 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_100_MS</dt><dd>Use 100 ms frames.</dd>
-  * <dt>OPUS_FRAMESIZE_120_MS</dt><dd>Use 120 ms frames.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_EXPERT_FRAME_DURATION(x) OPUS_GET_EXPERT_FRAME_DURATION_REQUEST, opus_check_int_ptr(x)
-
-/** If set to 1, disables almost all use of prediction, making frames almost
-  * completely independent. This reduces quality.
-  * @see OPUS_GET_PREDICTION_DISABLED
-  * @param[in] x <tt>opus_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>0</dt><dd>Enable prediction (default).</dd>
-  * <dt>1</dt><dd>Disable prediction.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_PREDICTION_DISABLED(x) OPUS_SET_PREDICTION_DISABLED_REQUEST, opus_check_int(x)
-/** Gets the encoder's configured prediction status.
-  * @see OPUS_SET_PREDICTION_DISABLED
-  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>0</dt><dd>Prediction enabled (default).</dd>
-  * <dt>1</dt><dd>Prediction disabled.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_PREDICTION_DISABLED(x) OPUS_GET_PREDICTION_DISABLED_REQUEST, opus_check_int_ptr(x)
-
-/** If non-zero, enables Deep Redundancy (DRED) and use the specified maximum number of 10-ms redundant frames
-  * @hideinitializer */
-#define OPUS_SET_DRED_DURATION(x) OPUS_SET_DRED_DURATION_REQUEST, opus_check_int(x)
-/** Gets the encoder's configured Deep Redundancy (DRED) maximum number of frames.
-  * @hideinitializer */
-#define OPUS_GET_DRED_DURATION(x) OPUS_GET_DRED_DURATION_REQUEST, opus_check_int_ptr(x)
-
-/** Provide external DNN weights from binary object (only when explicitly built without the weights)
-  * @hideinitializer */
-#define OPUS_SET_DNN_BLOB(data, len) OPUS_SET_DNN_BLOB_REQUEST, opus_check_void_ptr(data), opus_check_int(len)
-
-
-/**@}*/
-
-/** @defgroup opus_genericctls Generic CTLs
-  *
-  * These macros are used with the \c opus_decoder_ctl and
-  * \c opus_encoder_ctl calls to generate a particular
-  * request.
-  *
-  * When called on an \c OpusDecoder they apply to that
-  * particular decoder instance. When called on an
-  * \c OpusEncoder they apply to the corresponding setting
-  * on that encoder instance, if present.
-  *
-  * Some usage examples:
-  *
-  * @code
-  * int ret;
-  * opus_int32 pitch;
-  * ret = opus_decoder_ctl(dec_ctx, OPUS_GET_PITCH(&pitch));
-  * if (ret == OPUS_OK) return ret;
-  *
-  * opus_encoder_ctl(enc_ctx, OPUS_RESET_STATE);
-  * opus_decoder_ctl(dec_ctx, OPUS_RESET_STATE);
-  *
-  * opus_int32 enc_bw, dec_bw;
-  * opus_encoder_ctl(enc_ctx, OPUS_GET_BANDWIDTH(&enc_bw));
-  * opus_decoder_ctl(dec_ctx, OPUS_GET_BANDWIDTH(&dec_bw));
-  * if (enc_bw != dec_bw) {
-  *   printf("packet bandwidth mismatch!\n");
-  * }
-  * @endcode
-  *
-  * @see opus_encoder, opus_decoder_ctl, opus_encoder_ctl, opus_decoderctls, opus_encoderctls
-  * @{
-  */
-
-/** Resets the codec state to be equivalent to a freshly initialized state.
-  * This should be called when switching streams in order to prevent
-  * the back to back decoding from giving different results from
-  * one at a time decoding.
-  * @hideinitializer */
-#define OPUS_RESET_STATE 4028
-
-/** Gets the final state of the codec's entropy coder.
-  * This is used for testing purposes,
-  * The encoder and decoder state should be identical after coding a payload
-  * (assuming no data corruption or software bugs)
-  *
-  * @param[out] x <tt>opus_uint32 *</tt>: Entropy coder state
-  *
-  * @hideinitializer */
-#define OPUS_GET_FINAL_RANGE(x) OPUS_GET_FINAL_RANGE_REQUEST, opus_check_uint_ptr(x)
-
-/** Gets the encoder's configured bandpass or the decoder's last bandpass.
-  * @see OPUS_SET_BANDWIDTH
-  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>#OPUS_AUTO</dt>                    <dd>(default)</dd>
-  * <dt>#OPUS_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
-  * <dt>#OPUS_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_BANDWIDTH(x) OPUS_GET_BANDWIDTH_REQUEST, opus_check_int_ptr(x)
-
-/** Gets the sampling rate the encoder or decoder was initialized with.
-  * This simply returns the <code>Fs</code> value passed to opus_encoder_init()
-  * or opus_decoder_init().
-  * @param[out] x <tt>opus_int32 *</tt>: Sampling rate of encoder or decoder.
-  * @hideinitializer
-  */
-#define OPUS_GET_SAMPLE_RATE(x) OPUS_GET_SAMPLE_RATE_REQUEST, opus_check_int_ptr(x)
-
-/** If set to 1, disables the use of phase inversion for intensity stereo,
-  * improving the quality of mono downmixes, but slightly reducing normal
-  * stereo quality. Disabling phase inversion in the decoder does not comply
-  * with RFC 6716, although it does not cause any interoperability issue and
-  * is expected to become part of the Opus standard once RFC 6716 is updated
-  * by draft-ietf-codec-opus-update.
-  * @see OPUS_GET_PHASE_INVERSION_DISABLED
-  * @param[in] x <tt>opus_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>0</dt><dd>Enable phase inversion (default).</dd>
-  * <dt>1</dt><dd>Disable phase inversion.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_SET_PHASE_INVERSION_DISABLED(x) OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST, opus_check_int(x)
-/** Gets the encoder's configured phase inversion status.
-  * @see OPUS_SET_PHASE_INVERSION_DISABLED
-  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>0</dt><dd>Stereo phase inversion enabled (default).</dd>
-  * <dt>1</dt><dd>Stereo phase inversion disabled.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_PHASE_INVERSION_DISABLED(x) OPUS_GET_PHASE_INVERSION_DISABLED_REQUEST, opus_check_int_ptr(x)
-/** Gets the DTX state of the encoder.
-  * Returns whether the last encoded frame was either a comfort noise update
-  * during DTX or not encoded because of DTX.
-  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>0</dt><dd>The encoder is not in DTX.</dd>
-  * <dt>1</dt><dd>The encoder is in DTX.</dd>
-  * </dl>
-  * @hideinitializer */
-#define OPUS_GET_IN_DTX(x) OPUS_GET_IN_DTX_REQUEST, opus_check_int_ptr(x)
-
-/**@}*/
-
-/** @defgroup opus_decoderctls Decoder related CTLs
-  * @see opus_genericctls, opus_encoderctls, opus_decoder
-  * @{
-  */
-
-/** Configures decoder gain adjustment.
-  * Scales the decoded output by a factor specified in Q8 dB units.
-  * This has a maximum range of -32768 to 32767 inclusive, and returns
-  * OPUS_BAD_ARG otherwise. The default is zero indicating no adjustment.
-  * This setting survives decoder reset.
-  *
-  * gain = pow(10, x/(20.0*256))
-  *
-  * @param[in] x <tt>opus_int32</tt>:   Amount to scale PCM signal by in Q8 dB units.
-  * @hideinitializer */
-#define OPUS_SET_GAIN(x) OPUS_SET_GAIN_REQUEST, opus_check_int(x)
-/** Gets the decoder's configured gain adjustment. @see OPUS_SET_GAIN
-  *
-  * @param[out] x <tt>opus_int32 *</tt>: Amount to scale PCM signal by in Q8 dB units.
-  * @hideinitializer */
-#define OPUS_GET_GAIN(x) OPUS_GET_GAIN_REQUEST, opus_check_int_ptr(x)
-
-/** Gets the duration (in samples) of the last packet successfully decoded or concealed.
-  * @param[out] x <tt>opus_int32 *</tt>: Number of samples (at current sampling rate).
-  * @hideinitializer */
-#define OPUS_GET_LAST_PACKET_DURATION(x) OPUS_GET_LAST_PACKET_DURATION_REQUEST, opus_check_int_ptr(x)
-
-/** Gets the pitch of the last decoded frame, if available.
-  * This can be used for any post-processing algorithm requiring the use of pitch,
-  * e.g. time stretching/shortening. If the last frame was not voiced, or if the
-  * pitch was not coded in the frame, then zero is returned.
-  *
-  * This CTL is only implemented for decoder instances.
-  *
-  * @param[out] x <tt>opus_int32 *</tt>: pitch period at 48 kHz (or 0 if not available)
-  *
-  * @hideinitializer */
-#define OPUS_GET_PITCH(x) OPUS_GET_PITCH_REQUEST, opus_check_int_ptr(x)
-
-/** Enables blind bandwidth extension for wideband signals if decoding sampling rate is 48 kHz.
-  * @param[in] x <tt>opus_int32 </tt>: 1 enables bandwidth extension, 0 disables it.
-  * The default is 0.
-  *
-  * @hideinitializer */
- #define OPUS_SET_OSCE_BWE(x) OPUS_SET_OSCE_BWE_REQUEST, opus_check_int(x)
-/** Gets blind bandwidth extension flag for wideband signals if decoding sampling rate is 48 kHz.
-  * @param[out] x <tt>opus_int32 *</tt>: 1 if bwe enabled, 0 if disabled.
-  *
-  * @hideinitializer */
- #define OPUS_GET_OSCE_BWE(x) OPUS_GET_OSCE_BWE_REQUEST, opus_check_int_ptr(x)
-
-/** If set to 1, the decoder will ignore all extensions found in the padding area
-  * (does not affect DRED, which is decoded separately).
-  * @hideinitializer */
-#define OPUS_SET_IGNORE_EXTENSIONS(x) OPUS_SET_IGNORE_EXTENSIONS_REQUEST, opus_check_int(x)
-/** Gets whether the decoder is ignoring extensions.
-  * @hideinitializer */
-#define OPUS_GET_IGNORE_EXTENSIONS(x) OPUS_GET_IGNORE_EXTENSIONS_REQUEST, opus_check_int_ptr(x)
-
-/**@}*/
-
-/** @defgroup opus_libinfo Opus library information functions
-  * @{
-  */
-
-/** Converts an opus error code into a human readable string.
-  *
-  * @param[in] error <tt>int</tt>: Error number
-  * @returns Error string
-  */
-OPUS_EXPORT const char *opus_strerror(int error);
-
-/** Gets the libopus version string.
-  *
-  * Applications may look for the substring "-fixed" in the version string to
-  * determine whether they have a fixed-point or floating-point build at
-  * runtime.
-  *
-  * @returns Version string
-  */
-OPUS_EXPORT const char *opus_get_version_string(void);
-/**@}*/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* OPUS_DEFINES_H */
diff --git a/include/opus_types.h b/include/opus_types.h
deleted file mode 100644
index 7cf675580..000000000
--- a/include/opus_types.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/* (C) COPYRIGHT 1994-2002 Xiph.Org Foundation */
-/* Modified by Jean-Marc Valin */
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-/* opus_types.h based on ogg_types.h from libogg */
-
-/**
-   @file opus_types.h
-   @brief Opus reference implementation types
-*/
-#ifndef OPUS_TYPES_H
-#define OPUS_TYPES_H
-
-#define opus_int         int                     /* used for counters etc; at least 16 bits */
-#define opus_int64       long long
-#define opus_int8        signed char
-
-#define opus_uint        unsigned int            /* used for counters etc; at least 16 bits */
-#define opus_uint64      unsigned long long
-#define opus_uint8       unsigned char
-
-/* Use the real stdint.h if it's there (taken from Paul Hsieh's pstdint.h) */
-#if (defined(__STDC__) && __STDC__ && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_)) || defined (HAVE_STDINT_H))
-#include <stdint.h>
-#  undef opus_int64
-#  undef opus_int8
-#  undef opus_uint64
-#  undef opus_uint8
-   typedef int8_t opus_int8;
-   typedef uint8_t opus_uint8;
-   typedef int16_t opus_int16;
-   typedef uint16_t opus_uint16;
-   typedef int32_t opus_int32;
-   typedef uint32_t opus_uint32;
-   typedef int64_t opus_int64;
-   typedef uint64_t opus_uint64;
-#elif defined(_WIN32)
-
-#  if defined(__CYGWIN__)
-#    include <_G_config.h>
-     typedef _G_int32_t opus_int32;
-     typedef _G_uint32_t opus_uint32;
-     typedef _G_int16 opus_int16;
-     typedef _G_uint16 opus_uint16;
-#  elif defined(__MINGW32__)
-     typedef short opus_int16;
-     typedef unsigned short opus_uint16;
-     typedef int opus_int32;
-     typedef unsigned int opus_uint32;
-#  elif defined(__MWERKS__)
-     typedef int opus_int32;
-     typedef unsigned int opus_uint32;
-     typedef short opus_int16;
-     typedef unsigned short opus_uint16;
-#  else
-     /* MSVC/Borland */
-     typedef __int32 opus_int32;
-     typedef unsigned __int32 opus_uint32;
-     typedef __int16 opus_int16;
-     typedef unsigned __int16 opus_uint16;
-#  endif
-
-#elif defined(__MACOS__)
-
-#  include <sys/types.h>
-   typedef SInt16 opus_int16;
-   typedef UInt16 opus_uint16;
-   typedef SInt32 opus_int32;
-   typedef UInt32 opus_uint32;
-
-#elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
-
-#  include <sys/types.h>
-   typedef int16_t opus_int16;
-   typedef u_int16_t opus_uint16;
-   typedef int32_t opus_int32;
-   typedef u_int32_t opus_uint32;
-
-#elif defined(__BEOS__)
-
-   /* Be */
-#  include <inttypes.h>
-   typedef int16 opus_int16;
-   typedef u_int16 opus_uint16;
-   typedef int32_t opus_int32;
-   typedef u_int32_t opus_uint32;
-
-#elif defined (__EMX__)
-
-   /* OS/2 GCC */
-   typedef short opus_int16;
-   typedef unsigned short opus_uint16;
-   typedef int opus_int32;
-   typedef unsigned int opus_uint32;
-
-#elif defined (DJGPP)
-
-   /* DJGPP */
-   typedef short opus_int16;
-   typedef unsigned short opus_uint16;
-   typedef int opus_int32;
-   typedef unsigned int opus_uint32;
-
-#elif defined(R5900)
-
-   /* PS2 EE */
-   typedef int opus_int32;
-   typedef unsigned opus_uint32;
-   typedef short opus_int16;
-   typedef unsigned short opus_uint16;
-
-#elif defined(__SYMBIAN32__)
-
-   /* Symbian GCC */
-   typedef signed short opus_int16;
-   typedef unsigned short opus_uint16;
-   typedef signed int opus_int32;
-   typedef unsigned int opus_uint32;
-
-#elif defined(CONFIG_TI_C54X) || defined (CONFIG_TI_C55X)
-
-   typedef short opus_int16;
-   typedef unsigned short opus_uint16;
-   typedef long opus_int32;
-   typedef unsigned long opus_uint32;
-
-#elif defined(CONFIG_TI_C6X)
-
-   typedef short opus_int16;
-   typedef unsigned short opus_uint16;
-   typedef int opus_int32;
-   typedef unsigned int opus_uint32;
-
-#else
-
-   /* Give up, take a reasonable guess */
-   typedef short opus_int16;
-   typedef unsigned short opus_uint16;
-   typedef int opus_int32;
-   typedef unsigned int opus_uint32;
-
-#endif
-
-#endif  /* OPUS_TYPES_H */
diff --git a/m4/opus-intrinsics.m4 b/m4/oac-intrinsics.m4
similarity index 76%
rename from m4/opus-intrinsics.m4
rename to m4/oac-intrinsics.m4
index a262ca181..9c42ed3d5 100644
--- a/m4/opus-intrinsics.m4
+++ b/m4/oac-intrinsics.m4
@@ -1,8 +1,8 @@
-dnl opus-intrinsics.m4
+dnl oac-intrinsics.m4
 dnl macro for testing for support for compiler intrinsics, either by default or with a compiler flag
 
-dnl OPUS_CHECK_INTRINSICS(NAME-OF-INTRINSICS, COMPILER-FLAG-FOR-INTRINSICS, VAR-IF-PRESENT, VAR-IF-DEFAULT, TEST-PROGRAM-HEADER, TEST-PROGRAM-BODY)
-AC_DEFUN([OPUS_CHECK_INTRINSICS],
+dnl OAC_CHECK_INTRINSICS(NAME-OF-INTRINSICS, COMPILER-FLAG-FOR-INTRINSICS, VAR-IF-PRESENT, VAR-IF-DEFAULT, TEST-PROGRAM-HEADER, TEST-PROGRAM-BODY)
+AC_DEFUN([OAC_CHECK_INTRINSICS],
 [
    AC_MSG_CHECKING([if compiler supports $1 intrinsics])
    AC_LINK_IFELSE(
diff --git a/meson.build b/meson.build
index aadf7caf3..e106b6852 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('opus', 'c',
+project('oac', 'c',
   version: run_command('meson/get-version.py', '--package-version', check: true).stdout().strip(),
   meson_version: '>=0.54.0',
   default_options: ['warning_level=2',
@@ -14,10 +14,10 @@ host_cpu_family = host_machine.cpu_family()
 top_srcdir = meson.current_source_dir()
 top_builddir = meson.current_build_dir()
 
-opus_includes = include_directories('.', 'include', 'celt', 'silk', 'dnn')
-opus_public_includes = include_directories('include')
+oac_includes = include_directories('.', 'include', 'celt', 'silk', 'dnn')
+oac_public_includes = include_directories('include')
 
-add_project_arguments('-DOPUS_BUILD', language: 'c')
+add_project_arguments('-DOAC_BUILD', language: 'c')
 add_project_arguments('-DHAVE_CONFIG_H', language: 'c')
 
 if host_system == 'windows'
@@ -65,26 +65,26 @@ if cc.get_id() == 'msvc'
     language : 'c')
 endif
 
-opus_version = meson.project_version()
+oac_version = meson.project_version()
 
-opus_conf = configuration_data()
-opus_conf.set('PACKAGE_BUGREPORT', '"opus@xiph.org"')
-opus_conf.set('PACKAGE_NAME', '"opus"')
-opus_conf.set('PACKAGE_STRING', '"opus @0@"'.format(opus_version))
-opus_conf.set('PACKAGE_TARNAME', '"opus"')
-opus_conf.set('PACKAGE_URL', '""')
-opus_conf.set('PACKAGE_VERSION', '"@0@"'.format(opus_version))
+oac_conf = configuration_data()
+oac_conf.set('PACKAGE_BUGREPORT', '"oac@xiph.org"')
+oac_conf.set('PACKAGE_NAME', '"oac"')
+oac_conf.set('PACKAGE_STRING', '"oac @0@"'.format(oac_version))
+oac_conf.set('PACKAGE_TARNAME', '"oac"')
+oac_conf.set('PACKAGE_URL', '""')
+oac_conf.set('PACKAGE_VERSION', '"@0@"'.format(oac_version))
 
 # FIXME: optional Ne10 dependency
 have_arm_ne10 = false
 
 libm = cc.find_library('m', required : false)
 
-opus_conf.set('HAVE_LRINTF', cc.has_function('lrintf', prefix: '#include <math.h>', dependencies: libm))
-opus_conf.set('HAVE_LRINT', cc.has_function('lrint', prefix: '#include <math.h>', dependencies: libm))
-opus_conf.set('HAVE___MALLOC_HOOK', cc.has_function('__malloc_hook', prefix: '#include <malloc.h>'))
-opus_conf.set('HAVE_ELF_AUX_INFO', cc.has_function('elf_aux_info', prefix: '#include <sys/auxv.h>'))
-opus_conf.set('HAVE_STDINT_H', cc.check_header('stdint.h'))
+oac_conf.set('HAVE_LRINTF', cc.has_function('lrintf', prefix: '#include <math.h>', dependencies: libm))
+oac_conf.set('HAVE_LRINT', cc.has_function('lrint', prefix: '#include <math.h>', dependencies: libm))
+oac_conf.set('HAVE___MALLOC_HOOK', cc.has_function('__malloc_hook', prefix: '#include <malloc.h>'))
+oac_conf.set('HAVE_ELF_AUX_INFO', cc.has_function('elf_aux_info', prefix: '#include <sys/auxv.h>'))
+oac_conf.set('HAVE_STDINT_H', cc.check_header('stdint.h'))
 
 # Check for restrict keyword
 restrict_tmpl = '''
@@ -103,13 +103,13 @@ int main (int argc, char ** argv) {
 # supported directly.
 if not cc.compiles(restrict_tmpl.format('restrict'), name : 'restrict keyword')
   if cc.compiles(restrict_tmpl.format('__restrict'), name : '__restrict')
-    opus_conf.set('restrict', '__restrict')
+    oac_conf.set('restrict', '__restrict')
   elif cc.compiles(restrict_tmpl.format('__restrict__'), name : '__restrict__')
-    opus_conf.set('restrict', '__restrict')
+    oac_conf.set('restrict', '__restrict')
   elif cc.compiles(restrict_tmpl.format('_Restrict'), name : '_Restrict')
-    opus_conf.set('restrict', '_Restrict')
+    oac_conf.set('restrict', '_Restrict')
   else
-    opus_conf.set('restrict', '/**/')
+    oac_conf.set('restrict', '/**/')
   endif
 endif
 
@@ -122,15 +122,15 @@ if cc.compiles('''static int x;
                     int N;
                     return a[0];
                   }''', name : 'C99 variable-size arrays')
-  opus_conf.set('VAR_ARRAYS', 1)
+  oac_conf.set('VAR_ARRAYS', 1)
   msg_use_alloca = 'NO (using C99 variable-size arrays instead)'
 elif cc.compiles('''#include <alloca.h>
                     void some_func (void) {
                       int foo=10;
                       int * array = alloca(foo);
                     }''', name : 'alloca (alloca.h)')
-  opus_conf.set('USE_ALLOCA', true)
-  opus_conf.set('HAVE_ALLOCA_H', true)
+  oac_conf.set('USE_ALLOCA', true)
+  oac_conf.set('HAVE_ALLOCA_H', true)
   msg_use_alloca = true
 elif cc.compiles('''#include <malloc.h>
                     #include <stdlib.h>
@@ -138,7 +138,7 @@ elif cc.compiles('''#include <malloc.h>
                       int foo=10;
                       int * array = alloca(foo);
                     }''', name : 'alloca (std)')
-  opus_conf.set('USE_ALLOCA', true)
+  oac_conf.set('USE_ALLOCA', true)
   msg_use_alloca = true
 endif
 
@@ -150,14 +150,14 @@ opts = [
   [ 'assertions', 'ENABLE_ASSERTIONS' ],
   [ 'hardening', 'ENABLE_HARDENING' ],
   [ 'fuzzing', 'FUZZING' ],
-  [ 'check-asm', 'OPUS_CHECK_ASM' ],
+  [ 'check-asm', 'OAC_CHECK_ASM' ],
 ]
 
 foreach opt : opts
   # we assume these are all boolean options
   opt_foo = get_option(opt[0])
   if opt_foo
-    opus_conf.set(opt[1], 1)
+    oac_conf.set(opt[1], 1)
   endif
   set_variable('opt_' + opt[0].underscorify(), opt_foo)
 endforeach
@@ -172,7 +172,7 @@ foreach opt : feat
   # we assume these are all boolean options
   opt_foo = get_option(opt[0])
   if opt_foo.enabled()
-    opus_conf.set(opt[1], 1)
+    oac_conf.set(opt[1], 1)
   endif
   set_variable('opt_' + opt[0].underscorify(), opt_foo)
 endforeach
@@ -185,11 +185,11 @@ opt_tests = get_option('tests')
 
 disable_float_api = not get_option('float-api')
 if disable_float_api
-  opus_conf.set('DISABLE_FLOAT_API', 1)
+  oac_conf.set('DISABLE_FLOAT_API', 1)
 endif
 
 if not get_option('dnn-debug-float').enabled()
-  opus_conf.set('DISABLE_DEBUG_FLOAT', 1)
+  oac_conf.set('DISABLE_DEBUG_FLOAT', 1)
 endif
 
 # This is for the description in the pkg-config .pc file
@@ -210,16 +210,16 @@ rtcd_support = []
 # specific instruction sets supported by that version of the compiler. No
 # special arguments are ever needed. If runtime CPU detection is not disabled,
 # we must always assume that we only 'may have' it.
-opus_can_presume_simd = true
+oac_can_presume_simd = true
 if cc.get_argument_syntax() == 'msvc'
   if opt_rtcd.disabled()
     warning('Building with an MSVC-like compiler and runtime CPU detection is disabled. Outputs may not run on all @0@ CPUs.'.format(host_cpu_family))
   else
-    opus_can_presume_simd = false
+    oac_can_presume_simd = false
   endif
 endif
 
-opus_arm_external_asm = false
+oac_arm_external_asm = false
 
 asm_tmpl = '''
 int main (int argc, char ** argv) {
@@ -232,7 +232,7 @@ inline_optimization = []
 if not opt_asm.disabled()
   # Currently we only have inline asm for fixed-point
   if host_cpu_family == 'arm' and opt_fixed_point
-    opus_conf.set('OPUS_ARM_ASM', true)
+    oac_conf.set('OAC_ARM_ASM', true)
 
     # Check if compiler supports gcc-style inline assembly
     if cc.compiles('''#ifdef __GNUC_MINOR__
@@ -243,33 +243,33 @@ if not opt_asm.disabled()
                       int main(int argc, char ** argv) { __asm__ (""::); }''',
                    name : 'compiler supports gcc-style inline assembly')
 
-      opus_conf.set('OPUS_ARM_INLINE_ASM', 1)
+      oac_conf.set('OAC_ARM_INLINE_ASM', 1)
 
       # AS_ASM_ARM_EDSP
       if cc.compiles(asm_tmpl.format('qadd r3,r3,r3'),
                      name : 'assembler supports EDSP instructions on ARM')
-        opus_conf.set('OPUS_ARM_INLINE_EDSP', 1)
+        oac_conf.set('OAC_ARM_INLINE_EDSP', 1)
         inline_optimization += ['ESDP']
       endif
 
       # AS_ASM_ARM_MEDIA
       if cc.compiles(asm_tmpl.format('shadd8 r3,r3,r3'),
                      name : 'assembler supports ARMv6 media instructions on ARM')
-        opus_conf.set('OPUS_ARM_INLINE_MEDIA', 1)
+        oac_conf.set('OAC_ARM_INLINE_MEDIA', 1)
         inline_optimization += ['Media']
       endif
 
       # AS_ASM_ARM_NEON
       if cc.compiles(asm_tmpl.format('vorr d0,d0,d0'),
                      name : 'assembler supports NEON instructions on ARM')
-        opus_conf.set('OPUS_ARM_INLINE_NEON', 1)
+        oac_conf.set('OAC_ARM_INLINE_NEON', 1)
         inline_optimization += ['NEON']
       endif
 
       # AS_ASM_ARM_DOTPROD
       if cc.compiles(asm_tmpl.format('udot v0.4s,v1.16b,v2.16b'),
                      name : 'assembler supports DOTPROD instructions on ARM')
-        opus_conf.set('OPUS_ARM_INLINE_DOTPROD', 1)
+        oac_conf.set('OAC_ARM_INLINE_DOTPROD', 1)
         inline_optimization += ['DOTPROD']
       endif
     endif
@@ -277,75 +277,75 @@ if not opt_asm.disabled()
     # We need Perl to translate RVCT-syntax asm to gas syntax
     perl = find_program('perl', required: get_option('asm'))
     if perl.found()
-      opus_arm_external_asm = true
-      # opus_arm_presume_* mean we can and will use those instructions
+      oac_arm_external_asm = true
+      # oac_arm_presume_* mean we can and will use those instructions
       # directly without doing runtime CPU detection.
-      # opus_arm_may_have_* mean we can emit those instructions, but we can
+      # oac_arm_may_have_* mean we can emit those instructions, but we can
       # only use them after runtime detection.
       # The same rules apply for x86 assembly and intrinsics.
 
-      opus_arm_may_have_edsp = opus_conf.has('OPUS_ARM_INLINE_EDSP')
-      opus_arm_presume_edsp = opus_arm_may_have_edsp and opus_can_presume_simd
+      oac_arm_may_have_edsp = oac_conf.has('OAC_ARM_INLINE_EDSP')
+      oac_arm_presume_edsp = oac_arm_may_have_edsp and oac_can_presume_simd
 
-      opus_arm_may_have_media = opus_conf.has('OPUS_ARM_INLINE_MEDIA')
-      opus_arm_presume_media = opus_arm_may_have_media and opus_can_presume_simd
+      oac_arm_may_have_media = oac_conf.has('OAC_ARM_INLINE_MEDIA')
+      oac_arm_presume_media = oac_arm_may_have_media and oac_can_presume_simd
 
-      opus_arm_may_have_neon = opus_conf.has('OPUS_ARM_INLINE_NEON')
-      opus_arm_presume_neon = opus_arm_may_have_neon and opus_can_presume_simd
+      oac_arm_may_have_neon = oac_conf.has('OAC_ARM_INLINE_NEON')
+      oac_arm_presume_neon = oac_arm_may_have_neon and oac_can_presume_simd
 
-      opus_arm_may_have_dotprod = opus_conf.has('OPUS_ARM_INLINE_DOTPROD')
-      opus_arm_presume_dotprod = opus_arm_may_have_dotprod and opus_can_presume_simd
+      oac_arm_may_have_dotprod = oac_conf.has('OAC_ARM_INLINE_DOTPROD')
+      oac_arm_presume_dotprod = oac_arm_may_have_dotprod and oac_can_presume_simd
 
       if not opt_rtcd.disabled()
-        if not opus_arm_may_have_edsp
+        if not oac_arm_may_have_edsp
           message('Trying to force-enable armv5e EDSP instructions...')
           # AS_ASM_ARM_EDSP_FORCE
-          opus_arm_may_have_edsp = cc.compiles(asm_tmpl.format('.arch armv5te;.object_arch armv4t;qadd r3,r3,r3'),
+          oac_arm_may_have_edsp = cc.compiles(asm_tmpl.format('.arch armv5te;.object_arch armv4t;qadd r3,r3,r3'),
                                                name : 'Assembler supports EDSP instructions on ARM (forced)')
         endif
-        if not opus_arm_may_have_media
+        if not oac_arm_may_have_media
           message('Trying to force-enable ARMv6 media instructions...')
-          opus_arm_may_have_media = cc.compiles(asm_tmpl.format('.arch armv6;.object_arch armv4t;shadd8 r3,r3,r3'),
+          oac_arm_may_have_media = cc.compiles(asm_tmpl.format('.arch armv6;.object_arch armv4t;shadd8 r3,r3,r3'),
                                                 name : 'Assembler supports ARMv6 media instructions on ARM (forced)')
         endif
-        if not opus_arm_may_have_neon
+        if not oac_arm_may_have_neon
           message('Trying to force-enable NEON instructions...')
-          opus_arm_may_have_neon = cc.compiles(asm_tmpl.format('.arch armv7-a;.fpu neon;.object_arch armv4t;vorr d0,d0,d0'),
+          oac_arm_may_have_neon = cc.compiles(asm_tmpl.format('.arch armv7-a;.fpu neon;.object_arch armv4t;vorr d0,d0,d0'),
                                                name : 'Assembler supports NEON instructions on ARM (forced)')
         endif
       endif
 
-      if opus_arm_may_have_edsp
-        opus_conf.set('OPUS_ARM_MAY_HAVE_EDSP', 1)
-        if opus_arm_presume_edsp
-          opus_conf.set('OPUS_ARM_PRESUME_EDSP', 1)
+      if oac_arm_may_have_edsp
+        oac_conf.set('OAC_ARM_MAY_HAVE_EDSP', 1)
+        if oac_arm_presume_edsp
+          oac_conf.set('OAC_ARM_PRESUME_EDSP', 1)
           asm_optimization += ['EDSP']
         else
           rtcd_support += ['EDSP']
         endif
       endif
-      if opus_arm_may_have_media
-        opus_conf.set('OPUS_ARM_MAY_HAVE_MEDIA', 1)
-        if opus_arm_presume_media
-          opus_conf.set('OPUS_ARM_PRESUME_MEDIA', 1)
+      if oac_arm_may_have_media
+        oac_conf.set('OAC_ARM_MAY_HAVE_MEDIA', 1)
+        if oac_arm_presume_media
+          oac_conf.set('OAC_ARM_PRESUME_MEDIA', 1)
           asm_optimization += ['Media']
         else
           rtcd_support += ['Media']
         endif
       endif
-      if opus_arm_may_have_neon
-        opus_conf.set('OPUS_ARM_MAY_HAVE_NEON', 1)
-        if opus_arm_presume_neon
-          opus_conf.set('OPUS_ARM_PRESUME_NEON', 1)
+      if oac_arm_may_have_neon
+        oac_conf.set('OAC_ARM_MAY_HAVE_NEON', 1)
+        if oac_arm_presume_neon
+          oac_conf.set('OAC_ARM_PRESUME_NEON', 1)
           asm_optimization += ['NEON']
         else
           rtcd_support += ['NEON']
         endif
       endif
-      if opus_arm_may_have_dotprod
-        opus_conf.set('OPUS_ARM_MAY_HAVE_DOTPROD', 1)
-        if opus_arm_presume_dotprod
-          opus_conf.set('OPUS_ARM_PRESUME_DOTPROD', 1)
+      if oac_arm_may_have_dotprod
+        oac_conf.set('OAC_ARM_MAY_HAVE_DOTPROD', 1)
+        if oac_arm_presume_dotprod
+          oac_conf.set('OAC_ARM_PRESUME_DOTPROD', 1)
           asm_optimization += ['DOTPROD']
         else
           rtcd_support += ['DOTPROD']
@@ -400,28 +400,28 @@ if not opt_intrinsics.disabled()
     intrin_name = 'ARMv7/AArch64 NEON'
     if cc.links(intrin_check,
                 name: 'compiler supports @0@ intrinsics'.format(intrin_name))
-      opus_arm_presume_neon_intr = opus_can_presume_simd
-      opus_arm_may_have_neon_intr = true
+      oac_arm_presume_neon_intr = oac_can_presume_simd
+      oac_arm_may_have_neon_intr = true
     else
-      opus_arm_presume_neon_intr = false
+      oac_arm_presume_neon_intr = false
       if cc.links(intrin_check,
                   args: arm_neon_intr_link_args,
                   name: 'compiler supports @0@ intrinsics with @1@'.format(intrin_name, ' '.join(arm_neon_intr_link_args)))
-        opus_arm_may_have_neon_intr = true
+        oac_arm_may_have_neon_intr = true
       else
-        opus_arm_may_have_neon_intr = false
+        oac_arm_may_have_neon_intr = false
       endif
     endif
 
-    if opus_arm_may_have_neon_intr
+    if oac_arm_may_have_neon_intr
       have_neon_intr = true
       intrinsics_support += [intrin_name]
-      opus_conf.set('OPUS_ARM_MAY_HAVE_NEON_INTR', 1)
-      if opus_arm_presume_neon_intr
-        opus_conf.set('OPUS_ARM_PRESUME_NEON_INTR', 1)
+      oac_conf.set('OAC_ARM_MAY_HAVE_NEON_INTR', 1)
+      if oac_arm_presume_neon_intr
+        oac_conf.set('OAC_ARM_PRESUME_NEON_INTR', 1)
       else
         rtcd_support += [intrin_name]
-        opus_neon_intr_args = arm_neon_intr_link_args
+        oac_neon_intr_args = arm_neon_intr_link_args
       endif
     else
       message('Compiler does not support @0@ intrinsics'.format(intrin_name))
@@ -438,24 +438,24 @@ if not opt_intrinsics.disabled()
     intrin_name = 'AArch64 NEON'
     if cc.links(intrin_check,
                 name: 'compiler supports @0@ intrinsics'.format(intrin_name))
-      opus_arm_presume_aarch64_neon_intr = opus_can_presume_simd
-      opus_arm_may_have_aarch64_neon_intr = true
+      oac_arm_presume_aarch64_neon_intr = oac_can_presume_simd
+      oac_arm_may_have_aarch64_neon_intr = true
     else
-      opus_arm_presume_aarch64_neon_intr = false
+      oac_arm_presume_aarch64_neon_intr = false
       if cc.links(intrin_check,
                   args: arm_neon_intr_link_args,
                   name: 'compiler supports @0@ intrinsics with @1@'.format(intrin_name, ' '.join(arm_neon_intr_link_args)))
-        opus_arm_may_have_aarch64_neon_intr = true
+        oac_arm_may_have_aarch64_neon_intr = true
       else
-        opus_arm_may_have_aarch64_neon_intr = false
+        oac_arm_may_have_aarch64_neon_intr = false
       endif
     endif
 
-    if opus_arm_may_have_aarch64_neon_intr
+    if oac_arm_may_have_aarch64_neon_intr
       intrinsics_support += [intrin_name]
-      opus_conf.set('OPUS_X86_MAY_HAVE_AARCH64_NEON_INTR', 1)
-      if opus_arm_presume_aarch64_neon_intr
-        opus_conf.set('OPUS_X86_PRESUME_AARCH64_NEON_INTR', 1)
+      oac_conf.set('OAC_X86_MAY_HAVE_AARCH64_NEON_INTR', 1)
+      if oac_arm_presume_aarch64_neon_intr
+        oac_conf.set('OAC_X86_PRESUME_AARCH64_NEON_INTR', 1)
       endif
     else
       message('Compiler does not support @0@ intrinsics'.format(intrin_name))
@@ -473,28 +473,28 @@ if not opt_intrinsics.disabled()
     intrin_name = 'AArch64 DOTPROD'
     if cc.links(intrin_check,
                 name: 'compiler supports @0@ intrinsics'.format(intrin_name))
-      opus_arm_presume_dotprod_intr = opus_can_presume_simd
-      opus_arm_may_have_dotprod_intr = true
+      oac_arm_presume_dotprod_intr = oac_can_presume_simd
+      oac_arm_may_have_dotprod_intr = true
     else
-      opus_arm_presume_dotprod_intr = false
+      oac_arm_presume_dotprod_intr = false
       if cc.links(intrin_check,
                   args: arm_dotprod_intr_link_args,
                   name: 'compiler supports @0@ intrinsics with @1@'.format(intrin_name, ' '.join(arm_dotprod_intr_link_args)))
-        opus_arm_may_have_dotprod_intr = true
+        oac_arm_may_have_dotprod_intr = true
       else
-        opus_arm_may_have_dotprod_intr = false
+        oac_arm_may_have_dotprod_intr = false
       endif
     endif
 
-    if opus_arm_may_have_dotprod_intr
+    if oac_arm_may_have_dotprod_intr
       have_dotprod_intr = true
       intrinsics_support += [intrin_name]
-      opus_conf.set('OPUS_ARM_MAY_HAVE_DOTPROD', 1)
-      if opus_arm_presume_dotprod_intr
-        opus_conf.set('OPUS_ARM_PRESUME_DOTPROD', 1)
+      oac_conf.set('OAC_ARM_MAY_HAVE_DOTPROD', 1)
+      if oac_arm_presume_dotprod_intr
+        oac_conf.set('OAC_ARM_PRESUME_DOTPROD', 1)
       else
         rtcd_support += [intrin_name]
-        opus_dotprod_intr_args = arm_dotprod_intr_link_args
+        oac_dotprod_intr_args = arm_dotprod_intr_link_args
       endif
     else
       message('Compiler does not support @0@ intrinsics'.format(intrin_name))
@@ -520,10 +520,10 @@ if not opt_intrinsics.disabled()
       intrin_args = cc.get_argument_syntax() == 'msvc' ? intrin[5] : intrin[4]
       if cc.get_argument_syntax() == 'msvc' and intrin_args.length() == 0 and cc.links(intrin_check, name : 'compiler supports @0@ intrinsics'.format(intrin_name))
         may_have_intrin = true
-        presume_intrin = opus_can_presume_simd
+        presume_intrin = oac_can_presume_simd
       elif cc.get_argument_syntax() != 'msvc' and cc.links(intrin_check, name : 'compiler supports @0@ intrinsics'.format(intrin_name))
         may_have_intrin = true
-        presume_intrin = opus_can_presume_simd
+        presume_intrin = oac_can_presume_simd
       elif intrin_args.length() > 0
         presume_intrin = false
         if cc.links(intrin_check,
@@ -538,12 +538,12 @@ if not opt_intrinsics.disabled()
         intrinsics_support += [intrin_name]
         intrin_lower_name = intrin_name.to_lower().underscorify()
         set_variable('have_' + intrin_lower_name, true)
-        opus_conf.set('OPUS_X86_MAY_HAVE_' + intrin_name.underscorify(), 1)
+        oac_conf.set('OAC_X86_MAY_HAVE_' + intrin_name.underscorify(), 1)
         if presume_intrin
-          opus_conf.set('OPUS_X86_PRESUME_' + intrin_name.underscorify(), 1)
+          oac_conf.set('OAC_X86_PRESUME_' + intrin_name.underscorify(), 1)
         else
           rtcd_support += [intrin_name]
-          set_variable('opus_@0@_args'.format(intrin_lower_name), intrin_args)
+          set_variable('oac_@0@_args'.format(intrin_lower_name), intrin_args)
         endif
       else
         message('Compiler does not support @0@ intrinsics'.format(intrin_name))
@@ -601,9 +601,9 @@ if not opt_intrinsics.disabled()
           __cpuid(&CPUInfo, InfoType);
         }'''
       if cc.links(cpuid_asm_code, name : 'Get X86 CPU info via inline assembly')
-        opus_conf.set('CPU_INFO_BY_ASM', 1)
+        oac_conf.set('CPU_INFO_BY_ASM', 1)
       elif cc.links(cpuid_c_code, name : 'Get X86 CPU info via C method')
-        opus_conf.set('CPU_INFO_BY_C', 1)
+        oac_conf.set('CPU_INFO_BY_C', 1)
       elif cc.get_define('_MSC_VER') != '' and cc.links(cpuid_msvc_code)
         message('Getting X86 CPU info via __cpuid')
       else
@@ -632,7 +632,7 @@ if opt_rtcd.disabled()
   rtcd_support = 'disabled'
 else
   if rtcd_support.length() > 0
-    opus_conf.set('OPUS_HAVE_RTCD', 1)
+    oac_conf.set('OAC_HAVE_RTCD', 1)
   else
     if intrinsics_support.length() == 0
       rtcd_support = 'none'
@@ -647,7 +647,7 @@ endif
 
 # extract source file lists from .mk files
 mk_files = [
-  'opus_headers.mk', 'opus_sources.mk',
+  'oac_headers.mk', 'oac_sources.mk',
   'silk_headers.mk', 'silk_sources.mk',
   'celt_sources.mk', 'celt_headers.mk',
   'lpcnet_headers.mk', 'lpcnet_sources.mk',
@@ -667,7 +667,7 @@ subdir('silk')
 subdir('dnn')
 subdir('src')
 
-configure_file(output: 'config.h', configuration: opus_conf)
+configure_file(output: 'config.h', configuration: oac_conf)
 
 if not opt_tests.disabled()
   subdir('celt/tests')
@@ -676,9 +676,9 @@ if not opt_tests.disabled()
 endif
 
 pkg = import('pkgconfig')
-pkg.generate(opus_lib,
-  description: 'Opus IETF audio codec (floating-point build)',
-  subdirs: 'opus',
+pkg.generate(oac_lib,
+  description: 'Oac IETF audio codec (floating-point build)',
+  subdirs: 'oac',
 )
 
 doxygen = find_program('doxygen', required: get_option('docs'))
@@ -688,8 +688,8 @@ endif
 
 summary(
   {
-    'C99 var arrays': opus_conf.has('VAR_ARRAYS'),
-    'C99 lrintf': opus_conf.has('HAVE_LRINTF'),
+    'C99 var arrays': oac_conf.has('VAR_ARRAYS'),
+    'C99 lrintf': oac_conf.has('HAVE_LRINTF'),
     'Use alloca': msg_use_alloca,
   },
   section: 'Compiler support',
diff --git a/meson/README.md b/meson/README.md
index 08f426b26..ffbe75978 100644
--- a/meson/README.md
+++ b/meson/README.md
@@ -1,6 +1,6 @@
-# Using the Meson Build System for the Opus Project
+# Using the Meson Build System for the Oac Project
 
-This guide provides instructions for using the Meson build system to build the Opus project with various configuration options. Meson is a fast and efficient build system that aims to be easy to use and understand.
+This guide provides instructions for using the Meson build system to build the Oac project with various configuration options. Meson is a fast and efficient build system that aims to be easy to use and understand.
 
 Please note that software documentation can sometimes become outdated as new versions are released. For the most up-to-date and accurate information, we recommend referring to the official Meson documentation, which can be found at [mesonbuild.com](https://mesonbuild.com/).
 
@@ -15,18 +15,18 @@ Before proceeding, ensure that you have the following prerequisites installed:
 
 ## Build and Test Instructions
 
-Follow the steps below to build the Opus project using Meson.
+Follow the steps below to build the Oac project using Meson.
 
 ### Check out Source
-Clone the Opus repository using Git:
+Clone the Oac repository using Git:
 
 ```shell
-git clone https://gitlab.xiph.org/xiph/opus
-cd opus
+git clone https://gitlab.xiph.org/xiph/oac
+cd oac
 ```
 
 ### Configure
-To configure the build with Meson, you can set the desired configuration options using the -D flag followed by the option name and value. For the Opus project-specific build options, please refer to the [meson_options.txt](./../meson_options.txt) file. For general Meson options use the command meson `setup --help` to get a list of these options.
+To configure the build with Meson, you can set the desired configuration options using the -D flag followed by the option name and value. For the Oac project-specific build options, please refer to the [meson_options.txt](./../meson_options.txt) file. For general Meson options use the command meson `setup --help` to get a list of these options.
 
 For example, to setup and disable tests, use the following command:
 
@@ -40,13 +40,13 @@ meson setup builddir -Dtests=disabled
 meson compile -C builddir
 ```
 
-After a successful build, you can find the compiled Opus library and associated files in the builddir directory.
+After a successful build, you can find the compiled Oac library and associated files in the builddir directory.
 
 ### Testing with Meson
 
-Opus provides a comprehensive test suite to ensure the functionality and correctness of the project. You can execute the tests using Meson's built-in testing functionality.
+Oac provides a comprehensive test suite to ensure the functionality and correctness of the project. You can execute the tests using Meson's built-in testing functionality.
 
-To run the Opus tests using Meson:
+To run the Oac tests using Meson:
 
 ```shell
 meson test -C builddir
@@ -54,9 +54,9 @@ meson test -C builddir
 
 ## Platform Support and Bug Reporting
 
-The Opus Meson build system aims to provide support for the same platforms as [GStreamer](https://gstreamer.freedesktop.org/), a widely used multimedia framework. GStreamer supports a wide range of operating systems and platforms, including Linux, Windows (MSVC and MingW), Android, macOS, iOS, and various BSD systems.
+The Oac Meson build system aims to provide support for the same platforms as [GStreamer](https://gstreamer.freedesktop.org/), a widely used multimedia framework. GStreamer supports a wide range of operating systems and platforms, including Linux, Windows (MSVC and MingW), Android, macOS, iOS, and various BSD systems.
 
-While efforts are made to ensure compatibility and stability across these platforms, bugs or issues may still arise in specific configurations. If you encounter any problems during the configuration process or while building the Opus project, we encourage you to file an issue in the [project's issue tracker](https://gitlab.xiph.org/xiph/opus/-/issues).
+While efforts are made to ensure compatibility and stability across these platforms, bugs or issues may still arise in specific configurations. If you encounter any problems during the configuration process or while building the Oac project, we encourage you to file an issue in the [project's issue tracker](https://gitlab.xiph.org/xiph/oac/-/issues).
 
 When reporting an issue, please provide the following information to help us understand and effectively reproduce the configuration problem:
 
@@ -67,9 +67,9 @@ When reporting an issue, please provide the following information to help us und
 5. Any relevant information about the platform, toolchain, or dependencies used.
 6. Additional context or details that might assist in troubleshooting the issue.
 
-By providing thorough information when reporting configuration issues, you contribute to improving the Opus project's compatibility and reliability across different platforms.
+By providing thorough information when reporting configuration issues, you contribute to improving the Oac project's compatibility and reliability across different platforms.
 
-We appreciate your help in identifying and addressing any configuration-related problems, ensuring a better experience for all users of the Opus project.
+We appreciate your help in identifying and addressing any configuration-related problems, ensuring a better experience for all users of the Oac project.
 
 ## Platform Specific Examples
 
diff --git a/meson/get-version.py b/meson/get-version.py
index d3835f134..661a1a81a 100755
--- a/meson/get-version.py
+++ b/meson/get-version.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 #
-# Opus get-version.py
+# Oac get-version.py
 #
 # Extracts versions for build:
-#  - Opus package version based on 'git describe' or $srcroot/package_version
+#  - Oac package version based on 'git describe' or $srcroot/package_version
 #  - libtool version based on configure.ac
 #  - macos lib version based on configure.ac
 #
@@ -16,7 +16,7 @@
 import shutil
 
 if __name__ == '__main__':
-    arg_parser = argparse.ArgumentParser(description='Extract Opus package version or libtool version')
+    arg_parser = argparse.ArgumentParser(description='Extract Oac package version or libtool version')
     group = arg_parser.add_mutually_exclusive_group(required=True)
     group.add_argument('--libtool-version', action='store_true')
     group.add_argument('--package-version', action='store_true')
@@ -57,27 +57,27 @@
 
     # libtool version + darwin version
     elif args.libtool_version or args.darwin_version:
-        opus_lt_cur = None
-        opus_lt_rev = None
-        opus_lt_age = None
+        oac_lt_cur = None
+        oac_lt_rev = None
+        oac_lt_age = None
 
         with open(os.path.join(srcroot, 'configure.ac'), 'r') as f:
             for line in f:
-                if line.strip().startswith('OPUS_LT_CURRENT='):
-                    opus_lt_cur = line[16:].strip()
-                elif line.strip().startswith('OPUS_LT_REVISION='):
-                    opus_lt_rev = line[17:].strip()
-                elif line.strip().startswith('OPUS_LT_AGE='):
-                    opus_lt_age = line[12:].strip()
+                if line.strip().startswith('OAC_LT_CURRENT='):
+                    oac_lt_cur = line[16:].strip()
+                elif line.strip().startswith('OAC_LT_REVISION='):
+                    oac_lt_rev = line[17:].strip()
+                elif line.strip().startswith('OAC_LT_AGE='):
+                    oac_lt_age = line[12:].strip()
 
-        if opus_lt_cur and opus_lt_rev and opus_lt_age:
-            opus_lt_cur = int(opus_lt_cur)
-            opus_lt_rev = int(opus_lt_rev)
-            opus_lt_age = int(opus_lt_age)
+        if oac_lt_cur and oac_lt_rev and oac_lt_age:
+            oac_lt_cur = int(oac_lt_cur)
+            oac_lt_rev = int(oac_lt_rev)
+            oac_lt_age = int(oac_lt_age)
             if args.libtool_version:
-              print('{}.{}.{}'.format(opus_lt_cur - opus_lt_age, opus_lt_age, opus_lt_rev))
+              print('{}.{}.{}'.format(oac_lt_cur - oac_lt_age, oac_lt_age, oac_lt_rev))
             elif args.darwin_version:
-              print('{}.{}.{}'.format(opus_lt_cur + 1, 0, 0))
+              print('{}.{}.{}'.format(oac_lt_cur + 1, 0, 0))
             sys.exit(0)
         else:
             print('ERROR: Could not extract libtool version from configure.ac file in', srcroot, file=sys.stderr)
diff --git a/meson/read-sources-list.py b/meson/read-sources-list.py
index fcbec5019..7a33e032a 100755
--- a/meson/read-sources-list.py
+++ b/meson/read-sources-list.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# opus/read-sources-list.py
+# oac/read-sources-list.py
 #
 # Parses .mk files and extracts list of source files.
 # Prints one line per source file list, with filenames space-separated.
diff --git a/meson_options.txt b/meson_options.txt
index a2981d0b3..1e7696505 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -9,10 +9,10 @@ option('intrinsics', type : 'feature', value : 'auto', description : 'Intrinsics
 
 option('deep-plc', type : 'feature', value : 'disabled', description : 'Enable Deep Packet Loss Concealment (PLC)')
 option('dred', type : 'feature', value : 'disabled', description : 'Enable Deep Redundancy (DRED)')
-option('osce', type : 'feature', value : 'disabled', description : 'Enable Opus Speech Coding Enhancement (OSCE)')
+option('osce', type : 'feature', value : 'disabled', description : 'Enable Oac Speech Coding Enhancement (OSCE)')
 option('dnn-debug-float', type : 'feature', value : 'disabled', description : 'Compute DNN using float weights')
 
-option('custom-modes', type : 'boolean', value : false, description : 'Enable non-Opus modes, e.g. 44.1 kHz & 2^n frames')
+option('custom-modes', type : 'boolean', value : false, description : 'Enable non-Oac modes, e.g. 44.1 kHz & 2^n frames')
 option('extra-programs', type : 'feature', value : 'auto', description : 'Extra programs (demo and tests)')
 option('assertions', type : 'boolean', value : false, description : 'Additional software error checking')
 option('hardening', type : 'boolean', value : true, description : 'Run-time checks that are cheap and safe for use in production')
@@ -24,4 +24,4 @@ option('tests', type : 'feature', value : 'auto', description : 'Build tests')
 option('docs', type: 'feature', value: 'auto', description: 'Build API documentation')
 
 # other options
-option('docdir', type: 'string', value: 'doc/opus', description: 'Directory to install documentation into (default: DATADIR/doc/opus')
+option('docdir', type: 'string', value: 'doc/oac', description: 'Directory to install documentation into (default: DATADIR/doc/oac')
diff --git a/oac-uninstalled.pc.in b/oac-uninstalled.pc.in
new file mode 100644
index 000000000..c9ae9d5b5
--- /dev/null
+++ b/oac-uninstalled.pc.in
@@ -0,0 +1,12 @@
+# Oac codec reference implementation uninstalled pkg-config file
+
+libdir=${pcfiledir}/.libs
+includedir=${pcfiledir}
+
+Name: oac uninstalled
+Description: Oac IETF audio codec (not installed, @PC_BUILD@)
+Version: @VERSION@
+Requires:
+Conflicts:
+Libs: ${libdir}/liboac.la @LIBM@
+Cflags: -I${pcfiledir}/@top_srcdir@/include
diff --git a/oac.m4 b/oac.m4
new file mode 100644
index 000000000..32f77ddf8
--- /dev/null
+++ b/oac.m4
@@ -0,0 +1,117 @@
+# Configure paths for liboac
+# Gregory Maxwell <greg@xiph.org> 08-30-2012
+# Shamelessly stolen from Jack Moffitt (libogg) who
+# Shamelessly stole from Owen Taylor and Manish Singh
+
+dnl XIPH_PATH_OAC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl Test for liboac, and define OAC_CFLAGS and OAC_LIBS
+dnl
+AC_DEFUN([XIPH_PATH_OAC],
+[dnl
+dnl Get the cflags and libraries
+dnl
+AC_ARG_WITH(oac,AC_HELP_STRING([--with-oac=PFX],[Prefix where oac is installed (optional)]), oac_prefix="$withval", oac_prefix="")
+AC_ARG_WITH(oac-libraries,AC_HELP_STRING([--with-oac-libraries=DIR],[Directory where the oac library is installed (optional)]), oac_libraries="$withval", oac_libraries="")
+AC_ARG_WITH(oac-includes,AC_HELP_STRING([--with-oac-includes=DIR],[Directory where the oac header files are installed (optional)]), oac_includes="$withval", oac_includes="")
+AC_ARG_ENABLE(oactest,AC_HELP_STRING([--disable-oactest],[Do not try to compile and run a test oac program]),, enable_oactest=yes)
+
+  if test "x$oac_libraries" != "x" ; then
+    OAC_LIBS="-L$oac_libraries"
+  elif test "x$oac_prefix" = "xno" || test "x$oac_prefix" = "xyes" ; then
+    OAC_LIBS=""
+  elif test "x$oac_prefix" != "x" ; then
+    OAC_LIBS="-L$oac_prefix/lib"
+  elif test "x$prefix" != "xNONE" ; then
+    OAC_LIBS="-L$prefix/lib"
+  fi
+
+  if test "x$oac_prefix" != "xno" ; then
+    OAC_LIBS="$OAC_LIBS -loac"
+  fi
+
+  if test "x$oac_includes" != "x" ; then
+    OAC_CFLAGS="-I$oac_includes"
+  elif test "x$oac_prefix" = "xno" || test "x$oac_prefix" = "xyes" ; then
+    OAC_CFLAGS=""
+  elif test "x$oac_prefix" != "x" ; then
+    OAC_CFLAGS="-I$oac_prefix/include"
+  elif test "x$prefix" != "xNONE"; then
+    OAC_CFLAGS="-I$prefix/include"
+  fi
+
+  AC_MSG_CHECKING(for Oac)
+  if test "x$oac_prefix" = "xno" ; then
+    no_oac="disabled"
+    enable_oactest="no"
+  else
+    no_oac=""
+  fi
+
+
+  if test "x$enable_oactest" = "xyes" ; then
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    CFLAGS="$CFLAGS $OAC_CFLAGS"
+    LIBS="$LIBS $OAC_LIBS"
+dnl
+dnl Now check if the installed Oac is sufficiently new.
+dnl
+      rm -f conf.oactest
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <oac.h>
+
+int main (void)
+{
+  system("touch conf.oactest");
+  return 0;
+}
+
+],, no_oac=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+  fi
+
+  if test "x$no_oac" = "xdisabled" ; then
+     AC_MSG_RESULT(no)
+     ifelse([$2], , :, [$2])
+  elif test "x$no_oac" = "x" ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$1], , :, [$1])
+  else
+     AC_MSG_RESULT(no)
+     if test -f conf.oactest ; then
+       :
+     else
+       echo "*** Could not run Oac test program, checking why..."
+       CFLAGS="$CFLAGS $OAC_CFLAGS"
+       LIBS="$LIBS $OAC_LIBS"
+       AC_TRY_LINK([
+#include <stdio.h>
+#include <oac.h>
+],     [ return 0; ],
+       [ echo "*** The test program compiled, but did not run. This usually means"
+       echo "*** that the run-time linker is not finding Oac or finding the wrong"
+       echo "*** version of Oac. If it is not finding Oac, you'll need to set your"
+       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+       echo "*** is required on your system"
+       echo "***"
+       echo "*** If you have an old version installed, it is best to remove it, although"
+       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+       [ echo "*** The test program failed to compile or link. See the file config.log for the"
+       echo "*** exact error that occurred. This usually means Oac was incorrectly installed"
+       echo "*** or that you have moved Oac since it was installed." ])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+     OAC_CFLAGS=""
+     OAC_LIBS=""
+     ifelse([$2], , :, [$2])
+  fi
+  AC_SUBST(OAC_CFLAGS)
+  AC_SUBST(OAC_LIBS)
+  rm -f conf.oactest
+])
diff --git a/oac.pc.in b/oac.pc.in
new file mode 100644
index 000000000..bb9f1216e
--- /dev/null
+++ b/oac.pc.in
@@ -0,0 +1,16 @@
+# Oac codec reference implementation pkg-config file
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Oac
+Description: Oac IETF audio codec (@PC_BUILD@ build)
+URL: https://oac-codec.org/
+Version: @VERSION@
+Requires:
+Conflicts:
+Libs: -L${libdir} -loac
+Libs.private: @LIBM@
+Cflags: -I${includedir}/oac
diff --git a/oac_headers.mk b/oac_headers.mk
new file mode 100644
index 000000000..7d0768269
--- /dev/null
+++ b/oac_headers.mk
@@ -0,0 +1,8 @@
+OAC_HEAD = \
+include/oac.h \
+include/oac_multistream.h \
+include/oac_projection.h \
+src/oac_private.h \
+src/analysis.h \
+src/mapping_matrix.h \
+src/mlp.h
diff --git a/oac_sources.mk b/oac_sources.mk
new file mode 100644
index 000000000..58a431d96
--- /dev/null
+++ b/oac_sources.mk
@@ -0,0 +1,17 @@
+OAC_SOURCES = \
+src/oac.c \
+src/oac_decoder.c \
+src/oac_encoder.c \
+src/extensions.c \
+src/oac_multistream.c \
+src/oac_multistream_encoder.c \
+src/oac_multistream_decoder.c \
+src/repacketizer.c \
+src/oac_projection_encoder.c \
+src/oac_projection_decoder.c \
+src/mapping_matrix.c
+
+OAC_SOURCES_FLOAT = \
+src/analysis.c \
+src/mlp.c \
+src/mlp_data.c
diff --git a/opus-uninstalled.pc.in b/opus-uninstalled.pc.in
deleted file mode 100644
index 19f5c933d..000000000
--- a/opus-uninstalled.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-# Opus codec reference implementation uninstalled pkg-config file
-
-libdir=${pcfiledir}/.libs
-includedir=${pcfiledir}
-
-Name: opus uninstalled
-Description: Opus IETF audio codec (not installed, @PC_BUILD@)
-Version: @VERSION@
-Requires:
-Conflicts:
-Libs: ${libdir}/libopus.la @LIBM@
-Cflags: -I${pcfiledir}/@top_srcdir@/include
diff --git a/opus.m4 b/opus.m4
deleted file mode 100644
index 263470d40..000000000
--- a/opus.m4
+++ /dev/null
@@ -1,117 +0,0 @@
-# Configure paths for libopus
-# Gregory Maxwell <greg@xiph.org> 08-30-2012
-# Shamelessly stolen from Jack Moffitt (libogg) who
-# Shamelessly stole from Owen Taylor and Manish Singh
-
-dnl XIPH_PATH_OPUS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libopus, and define OPUS_CFLAGS and OPUS_LIBS
-dnl
-AC_DEFUN([XIPH_PATH_OPUS],
-[dnl
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(opus,AC_HELP_STRING([--with-opus=PFX],[Prefix where opus is installed (optional)]), opus_prefix="$withval", opus_prefix="")
-AC_ARG_WITH(opus-libraries,AC_HELP_STRING([--with-opus-libraries=DIR],[Directory where the opus library is installed (optional)]), opus_libraries="$withval", opus_libraries="")
-AC_ARG_WITH(opus-includes,AC_HELP_STRING([--with-opus-includes=DIR],[Directory where the opus header files are installed (optional)]), opus_includes="$withval", opus_includes="")
-AC_ARG_ENABLE(opustest,AC_HELP_STRING([--disable-opustest],[Do not try to compile and run a test opus program]),, enable_opustest=yes)
-
-  if test "x$opus_libraries" != "x" ; then
-    OPUS_LIBS="-L$opus_libraries"
-  elif test "x$opus_prefix" = "xno" || test "x$opus_prefix" = "xyes" ; then
-    OPUS_LIBS=""
-  elif test "x$opus_prefix" != "x" ; then
-    OPUS_LIBS="-L$opus_prefix/lib"
-  elif test "x$prefix" != "xNONE" ; then
-    OPUS_LIBS="-L$prefix/lib"
-  fi
-
-  if test "x$opus_prefix" != "xno" ; then
-    OPUS_LIBS="$OPUS_LIBS -lopus"
-  fi
-
-  if test "x$opus_includes" != "x" ; then
-    OPUS_CFLAGS="-I$opus_includes"
-  elif test "x$opus_prefix" = "xno" || test "x$opus_prefix" = "xyes" ; then
-    OPUS_CFLAGS=""
-  elif test "x$opus_prefix" != "x" ; then
-    OPUS_CFLAGS="-I$opus_prefix/include"
-  elif test "x$prefix" != "xNONE"; then
-    OPUS_CFLAGS="-I$prefix/include"
-  fi
-
-  AC_MSG_CHECKING(for Opus)
-  if test "x$opus_prefix" = "xno" ; then
-    no_opus="disabled"
-    enable_opustest="no"
-  else
-    no_opus=""
-  fi
-
-
-  if test "x$enable_opustest" = "xyes" ; then
-    ac_save_CFLAGS="$CFLAGS"
-    ac_save_LIBS="$LIBS"
-    CFLAGS="$CFLAGS $OPUS_CFLAGS"
-    LIBS="$LIBS $OPUS_LIBS"
-dnl
-dnl Now check if the installed Opus is sufficiently new.
-dnl
-      rm -f conf.opustest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <opus.h>
-
-int main (void)
-{
-  system("touch conf.opustest");
-  return 0;
-}
-
-],, no_opus=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-  fi
-
-  if test "x$no_opus" = "xdisabled" ; then
-     AC_MSG_RESULT(no)
-     ifelse([$2], , :, [$2])
-  elif test "x$no_opus" = "x" ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$1], , :, [$1])
-  else
-     AC_MSG_RESULT(no)
-     if test -f conf.opustest ; then
-       :
-     else
-       echo "*** Could not run Opus test program, checking why..."
-       CFLAGS="$CFLAGS $OPUS_CFLAGS"
-       LIBS="$LIBS $OPUS_LIBS"
-       AC_TRY_LINK([
-#include <stdio.h>
-#include <opus.h>
-],     [ return 0; ],
-       [ echo "*** The test program compiled, but did not run. This usually means"
-       echo "*** that the run-time linker is not finding Opus or finding the wrong"
-       echo "*** version of Opus. If it is not finding Opus, you'll need to set your"
-       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-       echo "*** is required on your system"
-       echo "***"
-       echo "*** If you have an old version installed, it is best to remove it, although"
-       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-       [ echo "*** The test program failed to compile or link. See the file config.log for the"
-       echo "*** exact error that occurred. This usually means Opus was incorrectly installed"
-       echo "*** or that you have moved Opus since it was installed." ])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-     OPUS_CFLAGS=""
-     OPUS_LIBS=""
-     ifelse([$2], , :, [$2])
-  fi
-  AC_SUBST(OPUS_CFLAGS)
-  AC_SUBST(OPUS_LIBS)
-  rm -f conf.opustest
-])
diff --git a/opus.pc.in b/opus.pc.in
deleted file mode 100644
index 6946e7de5..000000000
--- a/opus.pc.in
+++ /dev/null
@@ -1,16 +0,0 @@
-# Opus codec reference implementation pkg-config file
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Opus
-Description: Opus IETF audio codec (@PC_BUILD@ build)
-URL: https://opus-codec.org/
-Version: @VERSION@
-Requires:
-Conflicts:
-Libs: -L${libdir} -lopus
-Libs.private: @LIBM@
-Cflags: -I${includedir}/opus
diff --git a/opus_headers.mk b/opus_headers.mk
deleted file mode 100644
index 4c73e9352..000000000
--- a/opus_headers.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-OPUS_HEAD = \
-include/opus.h \
-include/opus_multistream.h \
-include/opus_projection.h \
-src/opus_private.h \
-src/analysis.h \
-src/mapping_matrix.h \
-src/mlp.h
diff --git a/opus_sources.mk b/opus_sources.mk
deleted file mode 100644
index 91589efa8..000000000
--- a/opus_sources.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-OPUS_SOURCES = \
-src/opus.c \
-src/opus_decoder.c \
-src/opus_encoder.c \
-src/extensions.c \
-src/opus_multistream.c \
-src/opus_multistream_encoder.c \
-src/opus_multistream_decoder.c \
-src/repacketizer.c \
-src/opus_projection_encoder.c \
-src/opus_projection_decoder.c \
-src/mapping_matrix.c
-
-OPUS_SOURCES_FLOAT = \
-src/analysis.c \
-src/mlp.c \
-src/mlp_data.c
diff --git a/releases.sha2 b/releases.sha2
deleted file mode 100644
index 3d55119ca..000000000
--- a/releases.sha2
+++ /dev/null
@@ -1,86 +0,0 @@
-b2f75c4ac5ab837845eb028413fae2a28754bfb0a6d76416e2af1441ef447649  opus-0.9.0.tar.gz
-4e379a98ba95bbbfe9087ef10fdd05c8ac9060b6d695f587ea82a7b43a0df4fe  opus-0.9.10.tar.gz
-b1cad6846a8f819a141009fe3f8f10c946e8eff7e9c2339cd517bb136cc59eae  opus-0.9.14.tar.gz
-206221afc47b87496588013bd4523e1e9f556336c0813f4372773fc536dd4293  opus-0.9.1.tar.gz
-6e85c1b57e1d7b7dfe2928bf92586b96b73a9067e054ede45bd8e6d24bd30582  opus-0.9.2.tar.gz
-d916e34c18a396eb7dffc47af754f441af52a290b761e20db9aedb65928c699e  opus-0.9.3.tar.gz
-53801066fa97329768e7b871fd1495740269ec46802e1c9051aa7e78c6edee5b  opus-0.9.5.tar.gz
-3bfaeb25f4b4a625a0bc994d6fc6f6776a05193f60099e0a99f7530c6b256309  opus-0.9.6.tar.gz
-1b69772c31c5cbaa43d1dfa5b1c495fc29712e8e0ff69d6f8ad46459e5c6715f  opus-0.9.7.tar.gz
-4aa30d2e0652ffb4a7a22cc8a29c4ce78267626f560a2d9213b1d2d4e618cf36  opus-0.9.8.tar.gz
-2f62359f09151fa3b242040dc9b4c5b6bda15557c5daea59c8420f1a2ff328b7  opus-0.9.9.tar.gz
-43bcea51afa531f32a6a5fdd9cba4bd496993e26a141217db3cccce6caa7cd74  opus-1.0.0-rc.tar.gz
-9250fcc74472d45c1e14745542ec9c8d09982538aefed56962495614be3e0d2d  opus-1.0.0.tar.gz
-76bc0a31502a51dae9ab737b4db043b9ecfcd0b5861f0bfda41b662bd5b92227  opus-1.0.1-rc2.tar.gz
-3de8d6809dac38971ebb305532d4ea532519d3bed08985f25d6c557f9ce5e8ff  opus-1.0.1-rc3.tar.gz
-8044397a6365a07117b08cbe8f9818bf7c93746908806ba74a2917187bbdda5f  opus-1.0.1-rc.tar.gz
-80fa5c3caf2ac0fd68f8a22cce1564fc46b368c773a17554887d0066fe1841ef  opus-1.0.1.tar.gz
-da615edbee5d019c1833071d69a4782c19f178cf9ca1401375036ecef25cd78a  opus-1.0.2.tar.gz
-191a089c92dbc403de6980463dd3604b65beb12d283c607e246c8076363cb49c  opus-1.0.3.tar.gz
-a8d40efe87f6c3e76725391457d46277878c7a816ae1642843261463133fa5c8  opus-1.1-alpha.tar.gz
-ec1784287f385aef994b64734aaecae04860e61aa50fc6eef6643fa7e40dd193  opus-1.1-beta.tar.gz
-8aa16360f59a94d3e38f38f28d24039f7663179682cbae82aa42f1dd9e52e6ed  opus-1.1-rc.tar.gz
-ebc87a086d4fe677c5e42d56888b1fd25af858e4179eae4f8656270410dffac3  opus-1.1-rc2.tar.gz
-cbfd09c58cc10a4d3fcb727ad5d46d7bb549f8185ac922ee28b4581b52a7bee9  opus-1.1-rc3.tar.gz
-b9727015a58affcf3db527322bf8c4d2fcf39f5f6b8f15dbceca20206cbe1d95  opus-1.1.tar.gz
-0c668639dcd16b14709fc9dc49e6686606f5a256f2eaa1ebaa2f39a66f8626cd  opus-1.1.1-beta.tar.gz
-66f2a5877c8803dc9a5a44b4f3d0bdc8f06bd066324222d144eb255612b68152  opus-1.1.1-rc.tar.gz
-9b84ff56bd7720d5554103c557664efac2b8b18acc4bbcc234cb881ab9a3371e  opus-1.1.1.tar.gz
-0e290078e31211baa7b5886bcc8ab6bc048b9fc83882532da4a1a45e58e907fd  opus-1.1.2.tar.gz
-58b6fe802e7e30182e95d0cde890c0ace40b6f125cffc50635f0ad2eef69b633  opus-1.1.3.tar.gz
-9122b6b380081dd2665189f97bfd777f04f92dc3ab6698eea1dbb27ad59d8692  opus-1.1.4.tar.gz
-eb84981ca0f40a3e5d5e58d2e8582cb2fee05a022825a6dfe14d14b04eb563e4  opus-1.1.5.tar.gz
-654a9bebb73266271a28edcfff431e4cfd9bfcde71f42849a0cdd73bece803a7  opus-1.2-alpha.tar.gz
-c0e90507259cf21ce7b2c82fb9ac55367d8543dae91cc3d4d2c59afd37f44023  opus-1.2-alpha2.tar.gz
-291e979a8a2fb679ed35a5dff5d761a9d9a5e22586fd07934ed94461e2636c7a  opus-1.2-beta.tar.gz
-85343fdaed96529d94c1e1f3a210fa51240d04ca62fa01e97ef02f88020c2ce9  opus-1.2-rc1.tar.gz
-77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9  opus-1.2.tar.gz
-cfafd339ccd9c5ef8d6ab15d7e1a412c054bf4cb4ecbbbcc78c12ef2def70732  opus-1.2.1.tar.gz
-7f56e058c9549d03ae35511ad9e16ef6d1eb257836830d54abff0f495f17e187  opus-1.3-beta.tar.gz
-96fa28598e8ccd558b297277ad59a045c551ba0e06d65a9675938e084f837669  opus-1.3-rc.tar.gz
-f6bab321fb81db984766f1e4d340a9e71a5ca2c5d4d53f4ee072e84afda271ca  opus-1.3-rc2.tar.gz
-4f3d69aefdf2dbaf9825408e452a8a414ffc60494c70633560700398820dc550  opus-1.3.tar.gz
-65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d  opus-1.3.1.tar.gz
-c9b32b4253be5ae63d1ff16eea06b94b5f0f2951b7a02aceef58e3a3ce49c51f  opus-1.4.tar.gz
-d8230bbeb99e6d558645aaad25d79de8f4f28fdcc55f8af230050586d62c4f2c  opus-1.5.tar.gz
-b84610959b8d417b611aa12a22565e0a3732097c6389d19098d844543e340f85  opus-1.5.1.tar.gz
-65c1d2f78b9f2fb20082c38cbe47c951ad5839345876e46941612ee87f9a7ce1  opus-1.5.2.tar.gz
-b7637334527201fdfd6dd6a02e67aceffb0e5e60155bbd89175647a80301c92c  opus-1.6.tar.gz
-94ac78ca4f74c4e43bc9fe4ec1ad0aa36f38ab90f45b0727c40dd1e96096e767  opus_testvectors-draft11.tar.gz
-94ac78ca4f74c4e43bc9fe4ec1ad0aa36f38ab90f45b0727c40dd1e96096e767  opus_testvectors.tar.gz
-6b26a22f9ba87b2b836906a9bb7afec5f8e54d49553b1200382520ee6fedfa55  opus_testvectors-rfc8251.tar.gz
-5d2b99757bcb628bab2611f3ed27af6f35276ce3abc96c0ed4399d6c6463dda5  opus-tools-0.1.2.tar.gz
-008317297d6ce84f84992abf8cc948a048a4fa135e1d1caf429fafde8965a792  opus-tools-0.1.3.tar.gz
-de80485c5afa1fd83c0e16a0dd4860470c872997a7dd0a58e99b2ee8a93e5168  opus-tools-0.1.4.tar.gz
-76678d0eb7a9b3d793bd0243f9ced9ab0ecdab263f5232ed940c8f5795fb0405  opus-tools-0.1.5.tar.gz
-cc86dbc2a4d76da7e1ed9afee85448c8f798c465a5412233f178783220f3a2c1  opus-tools-0.1.6.tar.gz
-e0f08d301555dffc417604269b5a85d2bd197f259c7d6c957f370ffd33d6d9cd  opus-tools-0.1.7.tar.gz
-e4e188579ea1c4e4d5066460d4a7214a7eafe3539e9a4466fdc98af41ba4a2f6  opus-tools-0.1.8.tar.gz
-b1873dd78c7fbc98cf65d6e10cfddb5c2c03b3af93f922139a2104baedb4643a  opus-tools-0.1.9.tar.gz
-a2357532d19471b70666e0e0ec17d514246d8b3cb2eb168f68bb0f6fd372b28c  opus-tools-0.1.10.tar.gz
-b4e56cb00d3e509acfba9a9b627ffd8273b876b4e2408642259f6da28fa0ff86  opus-tools-0.2.tar.gz
-bd6d14e8897a2f80065ef34a516c70e74f8e00060abdbc238e79e5f99bca3e96  libopusenc-0.1.tar.gz
-02e6e0b14cbbe0569d948a46420f9c9a81d93bba32dc576a4007cbf96da68ef3  libopusenc-0.1.1.tar.gz
-c79e95eeee43a0b965e9b2c59a243763a8f8b0a7e71441df2aa9084f6171c73a  libopusenc-0.2.tar.gz
-8298db61a8d3d63e41c1a80705baa8ce9ff3f50452ea7ec1c19a564fe106cbb9  libopusenc-0.2.1.tar.gz
-8071b968475c1a17f54b6840d6de9d9ee20f930e827b0401abe3c4cf4f3bf30a  opusfile-0.1.tar.gz
-b4a678b3b6c4adfb6aff1f67ef658becfe146ea7c7ff228e99543762171557f9  opusfile-0.2.tar.gz
-4248927f2c4e316ea5b84fb02bd100bfec8fa4624a6910d77f0af7f0c6cb8baa  opusfile-0.3.tar.gz
-9836ea11706c44f36de92c4c9b1248e03a4c521e7fb2cff18a0cb4f8b0e79140  opusfile-0.4.tar.gz
-f187906b1b35f7f0d7de6a759b4aab512a9279d23adb35d8009e7e33bd6a922a  opusfile-0.4.zip
-2ce52d006aeeec9f10260dbe3073c4636954a1ab19c82b8baafefe0180aa4a39  opusfile-0.5.tar.gz
-b940d62beb15b5974764574b9f265481fe5b6ee16902fb705727546caf956261  opusfile-0.5.zip
-2428717b356e139f18ed2fdb5ad990b5654a238907a0058200b39c46a7d03ea6  opusfile-0.6.tar.gz
-753339225193df605372944889023b9b3c5378d672e8784d69fa241cd465278c  opusfile-0.6.zip
-9e2bed13bc729058591a0f1cab2505e8cfd8e7ac460bf10a78bcc3b125e7c301  opusfile-0.7.tar.gz
-346967d7989bb83b05949483b76bd0f69a12c59bd8b4457e864902b52bb0ac34  opusfile-0.7.zip
-2c231ed3cfaa1b3173f52d740e5bbd77d51b9dfecb87014b404917fba4b855a4  opusfile-0.8.tar.gz
-89dff4342c3b789574cbea5c57f11b96d4ebe4d28ab90248c1783ea569b1e9e3  opusfile-0.8.zip
-f75fb500e40b122775ac1a71ad80c4477698842a8fe9da4a1b4a1a9f16e4e979  opusfile-0.9.tar.gz
-e9591da4d4c9e857436c2d46a28a9e470fa5355ea5a76d4d582f137d18755d36  opusfile-0.9.zip
-48e03526ba87ef9cf5f1c47b5ebe3aa195bd89b912a57060c36184a6cd19412f  opusfile-0.10.tar.gz
-9d9e95d01817ecf48bf6daaea8f071f9b45bd1751ca1fc8ce50e5075eb2bc3c8  opusfile-0.10.zip
-74ce9b6cf4da103133e7b5c95df810ceb7195471e1162ed57af415fabf5603bf  opusfile-0.11.tar.gz
-23c5168026c4f1fc34843650135b409d0fc8cf452508163b4ece8077256ac6ff  opusfile-0.11.zip
-118d8601c12dd6a44f52423e68ca9083cc9f2bfe72da7a8c1acb22a80ae3550b  opusfile-0.12.tar.gz
-7f44575596b78d7787c1865b9653e2a71546ff1ae77d87c53ab16dcc7af295ba  opusfile-0.12.zip
diff --git a/scripts/dump_rnn.py b/scripts/dump_rnn.py
deleted file mode 100755
index dd66403b5..000000000
--- a/scripts/dump_rnn.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/python
-
-from __future__ import print_function
-
-from keras.models import Sequential
-from keras.layers import Dense
-from keras.layers import LSTM
-from keras.layers import GRU
-from keras.models import load_model
-from keras import backend as K
-
-import numpy as np
-
-def printVector(f, vector, name):
-    v = np.reshape(vector, (-1));
-    #print('static const float ', name, '[', len(v), '] = \n', file=f)
-    f.write('static const opus_int16 {}[{}] = {{\n   '.format(name, len(v)))
-    for i in range(0, len(v)):
-        f.write('{}'.format(int(round(8192*v[i]))))
-        if (i!=len(v)-1):
-            f.write(',')
-        else:
-            break;
-        if (i%8==7):
-            f.write("\n   ")
-        else:
-            f.write(" ")
-    #print(v, file=f)
-    f.write('\n};\n\n')
-    return;
-
-def binary_crossentrop2(y_true, y_pred):
-        return K.mean(2*K.abs(y_true-0.5) * K.binary_crossentropy(y_pred, y_true), axis=-1)
-
-
-model = load_model("weights.hdf5", custom_objects={'binary_crossentrop2': binary_crossentrop2})
-
-weights = model.get_weights()
-
-f = open('rnn_weights.c', 'w')
-
-f.write('/*This file is automatically generated from a Keras model*/\n\n')
-f.write('#ifdef HAVE_CONFIG_H\n#include "config.h"\n#endif\n\n#include "mlp.h"\n\n')
-
-printVector(f, weights[0], 'layer0_weights')
-printVector(f, weights[1], 'layer0_bias')
-printVector(f, weights[2], 'layer1_weights')
-printVector(f, weights[3], 'layer1_recur_weights')
-printVector(f, weights[4], 'layer1_bias')
-printVector(f, weights[5], 'layer2_weights')
-printVector(f, weights[6], 'layer2_bias')
-
-f.write('const DenseLayer layer0 = {\n   layer0_bias,\n   layer0_weights,\n   25, 16, 0\n};\n\n')
-f.write('const GRULayer layer1 = {\n   layer1_bias,\n   layer1_weights,\n   layer1_recur_weights,\n   16, 12\n};\n\n')
-f.write('const DenseLayer layer2 = {\n   layer2_bias,\n   layer2_weights,\n   12, 2, 1\n};\n\n')
-
-f.close()
diff --git a/scripts/local_build.py b/scripts/local_build.py
index ff19922b6..124766f92 100755
--- a/scripts/local_build.py
+++ b/scripts/local_build.py
@@ -52,7 +52,7 @@ def main():
 
     if not autotools_only and not meson_only:
         result += cmake_build(test)
-        result += cmake_build(test, extra_options="-DOPUS_NEURAL_FEC=ON")
+        result += cmake_build(test, extra_options="-DOAC_NEURAL_FEC=ON")
 
     if not autotools_only and not cmake_only:
         result += meson_build(test)
@@ -124,7 +124,7 @@ def cmake_build(test=False, extra_options=""):
         return [(build, cmake_build_succeeded, cmake_test_succeeded)]
 
     cmake_build_dir = create_dir_with_random_postfix("cmake-build")
-    cmake_cfg_cmd = ["cmake", "-S" ".", "-B", cmake_build_dir, "-G", '"Ninja"', "-DCMAKE_BUILD_TYPE=Release", "-DOPUS_BUILD_TESTING=ON", "-DOPUS_BUILD_PROGRAMS=ON", "-DOPUS_FAST_MATH=ON", "-DOPUS_FLOAT_APPROX=ON"]
+    cmake_cfg_cmd = ["cmake", "-S" ".", "-B", cmake_build_dir, "-G", '"Ninja"', "-DCMAKE_BUILD_TYPE=Release", "-DOAC_BUILD_TESTING=ON", "-DOAC_BUILD_PROGRAMS=ON", "-DOAC_FAST_MATH=ON", "-DOAC_FLOAT_APPROX=ON"]
     cmake_cfg_cmd += [option for option in extra_options.split(" ")]
     run_command(" ".join(cmake_cfg_cmd))
     cmake_build_cmd = ["cmake", "--build", cmake_build_dir, "-j", "{}".format(get_cpu_core_count())]
diff --git a/scripts/rnn_train.py b/scripts/rnn_train.py
deleted file mode 100755
index ffdaa1e7d..000000000
--- a/scripts/rnn_train.py
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/python
-
-from __future__ import print_function
-
-from keras.models import Sequential
-from keras.models import Model
-from keras.layers import Input
-from keras.layers import Dense
-from keras.layers import LSTM
-from keras.layers import GRU
-from keras.layers import SimpleRNN
-from keras.layers import Dropout
-from keras import losses
-import h5py
-
-from keras import backend as K
-import numpy as np
-
-def binary_crossentrop2(y_true, y_pred):
-    return K.mean(2*K.abs(y_true-0.5) * K.binary_crossentropy(y_pred, y_true), axis=-1)
-
-print('Build model...')
-#model = Sequential()
-#model.add(Dense(16, activation='tanh', input_shape=(None, 25)))
-#model.add(GRU(12, dropout=0.0, recurrent_dropout=0.0, activation='tanh', recurrent_activation='sigmoid', return_sequences=True))
-#model.add(Dense(2, activation='sigmoid'))
-
-main_input = Input(shape=(None, 25), name='main_input')
-x = Dense(16, activation='tanh')(main_input)
-x = GRU(12, dropout=0.1, recurrent_dropout=0.1, activation='tanh', recurrent_activation='sigmoid', return_sequences=True)(x)
-x = Dense(2, activation='sigmoid')(x)
-model = Model(inputs=main_input, outputs=x)
-
-batch_size = 64
-
-print('Loading data...')
-with h5py.File('features.h5', 'r') as hf:
-    all_data = hf['features'][:]
-print('done.')
-
-window_size = 1500
-
-nb_sequences = len(all_data)/window_size
-print(nb_sequences, ' sequences')
-x_train = all_data[:nb_sequences*window_size, :-2]
-x_train = np.reshape(x_train, (nb_sequences, window_size, 25))
-
-y_train = np.copy(all_data[:nb_sequences*window_size, -2:])
-y_train = np.reshape(y_train, (nb_sequences, window_size, 2))
-
-all_data = 0;
-x_train = x_train.astype('float32')
-y_train = y_train.astype('float32')
-
-print(len(x_train), 'train sequences. x shape =', x_train.shape, 'y shape = ', y_train.shape)
-
-# try using different optimizers and different optimizer configs
-model.compile(loss=binary_crossentrop2,
-              optimizer='adam',
-              metrics=['binary_accuracy'])
-
-print('Train...')
-model.fit(x_train, y_train,
-          batch_size=batch_size,
-          epochs=200,
-          validation_data=(x_train, y_train))
-model.save("newweights.hdf5")
diff --git a/silk/A2NLSF.c b/silk/A2NLSF.c
index b487686ff..de47f091e 100644
--- a/silk/A2NLSF.c
+++ b/silk/A2NLSF.c
@@ -44,12 +44,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Helper function for A2NLSF(..)                    */
 /* Transforms polynomials from cos(n*f) to cos(f)^n  */
-static OPUS_INLINE void silk_A2NLSF_trans_poly(
-    opus_int32          *p,                     /* I/O    Polynomial                                */
-    const opus_int      dd                      /* I      Polynomial order (= filter order / 2 )    */
+static OAC_INLINE void silk_A2NLSF_trans_poly(
+    oac_int32          *p,                     /* I/O    Polynomial                                */
+    const oac_int      dd                      /* I      Polynomial order (= filter order / 2 )    */
 )
 {
-    opus_int k, n;
+    oac_int k, n;
 
     for( k = 2; k <= dd; k++ ) {
         for( n = dd; n > k; n-- ) {
@@ -60,19 +60,19 @@ static OPUS_INLINE void silk_A2NLSF_trans_poly(
 }
 /* Helper function for A2NLSF(..) */
 /* Polynomial evaluation          */
-static OPUS_INLINE opus_int32 silk_A2NLSF_eval_poly( /* return the polynomial evaluation, in Q16     */
-    opus_int32          *p,                     /* I    Polynomial, Q16                         */
-    const opus_int32    x,                      /* I    Evaluation point, Q12                   */
-    const opus_int      dd                      /* I    Order                                   */
+static OAC_INLINE oac_int32 silk_A2NLSF_eval_poly( /* return the polynomial evaluation, in Q16     */
+    oac_int32          *p,                     /* I    Polynomial, Q16                         */
+    const oac_int32    x,                      /* I    Evaluation point, Q12                   */
+    const oac_int      dd                      /* I    Order                                   */
 )
 {
-    opus_int   n;
-    opus_int32 x_Q16, y32;
+    oac_int   n;
+    oac_int32 x_Q16, y32;
 
     y32 = p[ dd ];                                  /* Q16 */
     x_Q16 = silk_LSHIFT( x, 4 );
 
-    if ( opus_likely( 8 == dd ) )
+    if ( oac_likely( 8 == dd ) )
     {
         y32 = silk_SMLAWW( p[ 7 ], y32, x_Q16 );
         y32 = silk_SMLAWW( p[ 6 ], y32, x_Q16 );
@@ -92,14 +92,14 @@ static OPUS_INLINE opus_int32 silk_A2NLSF_eval_poly( /* return the polynomial ev
     return y32;
 }
 
-static OPUS_INLINE void silk_A2NLSF_init(
-     const opus_int32    *a_Q16,
-     opus_int32          *P,
-     opus_int32          *Q,
-     const opus_int      dd
+static OAC_INLINE void silk_A2NLSF_init(
+     const oac_int32    *a_Q16,
+     oac_int32          *P,
+     oac_int32          *Q,
+     const oac_int      dd
 )
 {
-    opus_int k;
+    oac_int k;
 
     /* Convert filter coefs to even and odd polynomials */
     P[dd] = silk_LSHIFT( 1, 16 );
@@ -125,19 +125,19 @@ static OPUS_INLINE void silk_A2NLSF_init(
 /* Compute Normalized Line Spectral Frequencies (NLSFs) from whitening filter coefficients      */
 /* If not all roots are found, the a_Q16 coefficients are bandwidth expanded until convergence. */
 void silk_A2NLSF(
-    opus_int16                  *NLSF,              /* O    Normalized Line Spectral Frequencies in Q15 (0..2^15-1) [d] */
-    opus_int32                  *a_Q16,             /* I/O  Monic whitening filter coefficients in Q16 [d]              */
-    const opus_int              d                   /* I    Filter order (must be even)                                 */
+    oac_int16                  *NLSF,              /* O    Normalized Line Spectral Frequencies in Q15 (0..2^15-1) [d] */
+    oac_int32                  *a_Q16,             /* I/O  Monic whitening filter coefficients in Q16 [d]              */
+    const oac_int              d                   /* I    Filter order (must be even)                                 */
 )
 {
-    opus_int   i, k, m, dd, root_ix, ffrac;
-    opus_int32 xlo, xhi, xmid;
-    opus_int32 ylo, yhi, ymid, thr;
-    opus_int32 nom, den;
-    opus_int32 P[ SILK_MAX_ORDER_LPC / 2 + 1 ];
-    opus_int32 Q[ SILK_MAX_ORDER_LPC / 2 + 1 ];
-    opus_int32 *PQ[ 2 ];
-    opus_int32 *p;
+    oac_int   i, k, m, dd, root_ix, ffrac;
+    oac_int32 xlo, xhi, xmid;
+    oac_int32 ylo, yhi, ymid, thr;
+    oac_int32 nom, den;
+    oac_int32 P[ SILK_MAX_ORDER_LPC / 2 + 1 ];
+    oac_int32 Q[ SILK_MAX_ORDER_LPC / 2 + 1 ];
+    oac_int32 *PQ[ 2 ];
+    oac_int32 *p;
 
     /* Store pointers to array */
     PQ[ 0 ] = P;
@@ -211,7 +211,7 @@ void silk_A2NLSF(
                 /* No risk of dividing by zero because abs(ylo - yhi) >= abs(ylo) >= 65536 */
                 ffrac += silk_DIV32( ylo, silk_RSHIFT( ylo - yhi, 8 - BIN_DIV_STEPS_A2NLSF_FIX ) );
             }
-            NLSF[ root_ix ] = (opus_int16)silk_min_32( silk_LSHIFT( (opus_int32)k, 8 ) + ffrac, silk_int16_MAX );
+            NLSF[ root_ix ] = (oac_int16)silk_min_32( silk_LSHIFT( (oac_int32)k, 8 ) + ffrac, silk_int16_MAX );
 
             silk_assert( NLSF[ root_ix ] >= 0 );
 
@@ -237,9 +237,9 @@ void silk_A2NLSF(
                 i++;
                 if( i > MAX_ITERATIONS_A2NLSF_FIX ) {
                     /* Set NLSFs to white spectrum and exit */
-                    NLSF[ 0 ] = (opus_int16)silk_DIV32_16( 1 << 15, d + 1 );
+                    NLSF[ 0 ] = (oac_int16)silk_DIV32_16( 1 << 15, d + 1 );
                     for( k = 1; k < d; k++ ) {
-                        NLSF[ k ] = (opus_int16)silk_ADD16( NLSF[ k-1 ], NLSF[ 0 ] );
+                        NLSF[ k ] = (oac_int16)silk_ADD16( NLSF[ k-1 ], NLSF[ 0 ] );
                     }
                     return;
                 }
diff --git a/silk/API.h b/silk/API.h
index 7920218f7..2a999e8ef 100644
--- a/silk/API.h
+++ b/silk/API.h
@@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Struct for TOC (Table of Contents) */
 typedef struct {
-    opus_int    VADFlag;                                /* Voice activity for packet                            */
-    opus_int    VADFlags[ SILK_MAX_FRAMES_PER_PACKET ]; /* Voice activity for each frame in packet              */
-    opus_int    inbandFECFlag;                          /* Flag indicating if packet contains in-band FEC       */
+    oac_int    VADFlag;                                /* Voice activity for packet                            */
+    oac_int    VADFlags[ SILK_MAX_FRAMES_PER_PACKET ]; /* Voice activity for each frame in packet              */
+    oac_int    inbandFECFlag;                          /* Flag indicating if packet contains in-band FEC       */
 } silk_TOC_struct;
 
 /****************************************/
@@ -54,15 +54,15 @@ typedef struct {
 /***********************************************/
 /* Get size in bytes of the Silk encoder state */
 /***********************************************/
-opus_int silk_Get_Encoder_Size(                         /* O    Returns error code                              */
-    opus_int                        *encSizeBytes,      /* O    Number of bytes in SILK encoder state           */
-    opus_int                         channels           /* I    Number of channels                              */
+oac_int silk_Get_Encoder_Size(                         /* O    Returns error code                              */
+    oac_int                        *encSizeBytes,      /* O    Number of bytes in SILK encoder state           */
+    oac_int                         channels           /* I    Number of channels                              */
 );
 
 /*************************/
 /* Init or reset encoder */
 /*************************/
-opus_int silk_InitEncoder(                              /* O    Returns error code                              */
+oac_int silk_InitEncoder(                              /* O    Returns error code                              */
     void                            *encState,          /* I/O  State                                           */
     int                              channels,          /* I    Number of channels                              */
     int                              arch,              /* I    Run-time architecture                           */
@@ -74,15 +74,15 @@ opus_int silk_InitEncoder(                              /* O    Returns error co
 /**************************/
 /* Note: if prefillFlag is set, the input must contain 10 ms of audio, irrespective of what                     */
 /* encControl->payloadSize_ms is set to                                                                         */
-opus_int silk_Encode(                                   /* O    Returns error code                              */
+oac_int silk_Encode(                                   /* O    Returns error code                              */
     void                            *encState,          /* I/O  State                                           */
     silk_EncControlStruct           *encControl,        /* I    Control status                                  */
-    const opus_res                  *samplesIn,         /* I    Speech sample input vector                      */
-    opus_int                        nSamplesIn,         /* I    Number of samples in input vector               */
+    const oac_res                  *samplesIn,         /* I    Speech sample input vector                      */
+    oac_int                        nSamplesIn,         /* I    Number of samples in input vector               */
     ec_enc                          *psRangeEnc,        /* I/O  Compressor data structure                       */
-    opus_int32                      *nBytesOut,         /* I/O  Number of bytes in payload (input: Max bytes)   */
-    const opus_int                  prefillFlag,        /* I    Flag to indicate prefilling buffers no coding   */
-    int                             activity            /* I    Decision of Opus voice activity detector        */
+    oac_int32                      *nBytesOut,         /* I/O  Number of bytes in payload (input: Max bytes)   */
+    const oac_int                  prefillFlag,        /* I    Flag to indicate prefilling buffers no coding   */
+    int                             activity            /* I    Decision of Oac voice activity detector        */
 );
 
 /****************************************/
@@ -93,7 +93,7 @@ opus_int silk_Encode(                                   /* O    Returns error co
 /***********************************************/
 /* Load OSCE models from external data pointer */
 /***********************************************/
-opus_int silk_LoadOSCEModels(
+oac_int silk_LoadOSCEModels(
     void *decState,                                     /* O    I/O State                                       */
     const unsigned char *data,                          /* I    pointer to binary blob                          */
     int len                                             /* I    length of binary blob data                      */
@@ -102,32 +102,32 @@ opus_int silk_LoadOSCEModels(
 /***********************************************/
 /* Get size in bytes of the Silk decoder state */
 /***********************************************/
-opus_int silk_Get_Decoder_Size(                         /* O    Returns error code                              */
-    opus_int                        *decSizeBytes       /* O    Number of bytes in SILK decoder state           */
+oac_int silk_Get_Decoder_Size(                         /* O    Returns error code                              */
+    oac_int                        *decSizeBytes       /* O    Number of bytes in SILK decoder state           */
 );
 
 /*************************/
 /* Init and Reset decoder */
 /*************************/
-opus_int silk_ResetDecoder(                              /* O    Returns error code                              */
+oac_int silk_ResetDecoder(                              /* O    Returns error code                              */
     void                            *decState            /* I/O  State                                           */
 );
 
-opus_int silk_InitDecoder(                              /* O    Returns error code                              */
+oac_int silk_InitDecoder(                              /* O    Returns error code                              */
     void                            *decState           /* I/O  State                                           */
 );
 
 /******************/
 /* Decode a frame */
 /******************/
-opus_int silk_Decode(                                   /* O    Returns error code                              */
+oac_int silk_Decode(                                   /* O    Returns error code                              */
     void*                           decState,           /* I/O  State                                           */
     silk_DecControlStruct*          decControl,         /* I/O  Control Structure                               */
-    opus_int                        lostFlag,           /* I    0: no loss, 1 loss, 2 decode fec                */
-    opus_int                        newPacketFlag,      /* I    Indicates first decoder call for this packet    */
+    oac_int                        lostFlag,           /* I    0: no loss, 1 loss, 2 decode fec                */
+    oac_int                        newPacketFlag,      /* I    Indicates first decoder call for this packet    */
     ec_dec                          *psRangeDec,        /* I/O  Compressor data structure                       */
-    opus_res                        *samplesOut,        /* O    Decoded output speech vector                    */
-    opus_int32                      *nSamplesOut,       /* O    Number of samples decoded                       */
+    oac_res                        *samplesOut,        /* O    Decoded output speech vector                    */
+    oac_int32                      *nSamplesOut,       /* O    Number of samples decoded                       */
 #ifdef ENABLE_DEEP_PLC
     LPCNetPLCState                  *lpcnet,
 #endif
@@ -138,10 +138,10 @@ opus_int silk_Decode(                                   /* O    Returns error co
 /**************************************/
 /* Get table of contents for a packet */
 /**************************************/
-opus_int silk_get_TOC(
-    const opus_uint8                *payload,           /* I    Payload data                                */
-    const opus_int                  nBytesIn,           /* I    Number of input bytes                       */
-    const opus_int                  nFramesPerPayload,  /* I    Number of SILK frames per payload           */
+oac_int silk_get_TOC(
+    const oac_uint8                *payload,           /* I    Payload data                                */
+    const oac_int                  nBytesIn,           /* I    Number of input bytes                       */
+    const oac_int                  nFramesPerPayload,  /* I    Number of SILK frames per payload           */
     silk_TOC_struct                 *Silk_TOC           /* O    Type of content                             */
 );
 #endif
diff --git a/silk/CNG.c b/silk/CNG.c
index 2a910099e..a19ae5086 100644
--- a/silk/CNG.c
+++ b/silk/CNG.c
@@ -33,15 +33,15 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "stack_alloc.h"
 
 /* Generates excitation for CNG LPC synthesis */
-static OPUS_INLINE void silk_CNG_exc(
-    opus_int32                       exc_Q14[],          /* O    CNG excitation signal Q10                   */
-    opus_int32                       exc_buf_Q14[],      /* I    Random samples buffer Q10                   */
-    opus_int                         length,             /* I    Length                                      */
-    opus_int32                       *rand_seed          /* I/O  Seed to random index generator              */
+static OAC_INLINE void silk_CNG_exc(
+    oac_int32                       exc_Q14[],          /* O    CNG excitation signal Q10                   */
+    oac_int32                       exc_buf_Q14[],      /* I    Random samples buffer Q10                   */
+    oac_int                         length,             /* I    Length                                      */
+    oac_int32                       *rand_seed          /* I/O  Seed to random index generator              */
 )
 {
-    opus_int32 seed;
-    opus_int   i, idx, exc_mask;
+    oac_int32 seed;
+    oac_int   i, idx, exc_mask;
 
     exc_mask = CNG_BUF_MASK_MAX;
     while( exc_mask > length ) {
@@ -51,7 +51,7 @@ static OPUS_INLINE void silk_CNG_exc(
     seed = *rand_seed;
     for( i = 0; i < length; i++ ) {
         seed = silk_RAND( seed );
-        idx = (opus_int)( silk_RSHIFT( seed, 24 ) & exc_mask );
+        idx = (oac_int)( silk_RSHIFT( seed, 24 ) & exc_mask );
         silk_assert( idx >= 0 );
         silk_assert( idx <= CNG_BUF_MASK_MAX );
         exc_Q14[ i ] = exc_buf_Q14[ idx ];
@@ -63,7 +63,7 @@ void silk_CNG_Reset(
     silk_decoder_state          *psDec                          /* I/O  Decoder state                               */
 )
 {
-    opus_int i, NLSF_step_Q15, NLSF_acc_Q15;
+    oac_int i, NLSF_step_Q15, NLSF_acc_Q15;
 
     NLSF_step_Q15 = silk_DIV32_16( silk_int16_MAX, psDec->LPC_order + 1 );
     NLSF_acc_Q15 = 0;
@@ -79,13 +79,13 @@ void silk_CNG_Reset(
 void silk_CNG(
     silk_decoder_state          *psDec,                         /* I/O  Decoder state                               */
     silk_decoder_control        *psDecCtrl,                     /* I/O  Decoder control                             */
-    opus_int16                  frame[],                        /* I/O  Signal                                      */
-    opus_int                    length                          /* I    Length of residual                          */
+    oac_int16                  frame[],                        /* I/O  Signal                                      */
+    oac_int                    length                          /* I    Length of residual                          */
 )
 {
-    opus_int   i, subfr;
-    opus_int32 LPC_pred_Q10, max_Gain_Q16, gain_Q16, gain_Q10;
-    opus_int16 A_Q12[ MAX_LPC_ORDER ];
+    oac_int   i, subfr;
+    oac_int32 LPC_pred_Q10, max_Gain_Q16, gain_Q16, gain_Q10;
+    oac_int16 A_Q12[ MAX_LPC_ORDER ];
     silk_CNG_struct *psCNG = &psDec->sCNG;
     SAVE_STACK;
 
@@ -100,7 +100,7 @@ void silk_CNG(
 
         /* Smoothing of LSF's  */
         for( i = 0; i < psDec->LPC_order; i++ ) {
-            psCNG->CNG_smth_NLSF_Q15[ i ] += silk_SMULWB( (opus_int32)psDec->prevNLSF_Q15[ i ] - (opus_int32)psCNG->CNG_smth_NLSF_Q15[ i ], CNG_NLSF_SMTH_Q16 );
+            psCNG->CNG_smth_NLSF_Q15[ i ] += silk_SMULWB( (oac_int32)psDec->prevNLSF_Q15[ i ] - (oac_int32)psCNG->CNG_smth_NLSF_Q15[ i ], CNG_NLSF_SMTH_Q16 );
         }
         /* Find the subframe with the highest gain */
         max_Gain_Q16 = 0;
@@ -112,8 +112,8 @@ void silk_CNG(
             }
         }
         /* Update CNG excitation buffer with excitation from this subframe */
-        silk_memmove( &psCNG->CNG_exc_buf_Q14[ psDec->subfr_length ], psCNG->CNG_exc_buf_Q14, ( psDec->nb_subfr - 1 ) * psDec->subfr_length * sizeof( opus_int32 ) );
-        silk_memcpy(   psCNG->CNG_exc_buf_Q14, &psDec->exc_Q14[ subfr * psDec->subfr_length ], psDec->subfr_length * sizeof( opus_int32 ) );
+        silk_memmove( &psCNG->CNG_exc_buf_Q14[ psDec->subfr_length ], psCNG->CNG_exc_buf_Q14, ( psDec->nb_subfr - 1 ) * psDec->subfr_length * sizeof( oac_int32 ) );
+        silk_memcpy(   psCNG->CNG_exc_buf_Q14, &psDec->exc_Q14[ subfr * psDec->subfr_length ], psDec->subfr_length * sizeof( oac_int32 ) );
 
         /* Smooth gains */
         for( i = 0; i < psDec->nb_subfr; i++ ) {
@@ -127,8 +127,8 @@ void silk_CNG(
 
     /* Add CNG when packet is lost or during DTX */
     if( psDec->lossCnt ) {
-        VARDECL( opus_int32, CNG_sig_Q14 );
-        ALLOC( CNG_sig_Q14, length + MAX_LPC_ORDER, opus_int32 );
+        VARDECL( oac_int32, CNG_sig_Q14 );
+        ALLOC( CNG_sig_Q14, length + MAX_LPC_ORDER, oac_int32 );
 
         /* Generate CNG excitation */
         gain_Q16 = silk_SMULWW( psDec->sPLC.randScale_Q14, psDec->sPLC.prevGain_Q16[1] );
@@ -149,7 +149,7 @@ void silk_CNG(
         silk_NLSF2A( A_Q12, psCNG->CNG_smth_NLSF_Q15, psDec->LPC_order, psDec->arch );
 
         /* Generate CNG signal, by synthesis filtering */
-        silk_memcpy( CNG_sig_Q14, psCNG->CNG_synth_state, MAX_LPC_ORDER * sizeof( opus_int32 ) );
+        silk_memcpy( CNG_sig_Q14, psCNG->CNG_synth_state, MAX_LPC_ORDER * sizeof( oac_int32 ) );
         celt_assert( psDec->LPC_order == 10 || psDec->LPC_order == 16 );
         for( i = 0; i < length; i++ ) {
             /* Avoids introducing a bias because silk_SMLAWB() always rounds to -inf */
@@ -177,12 +177,12 @@ void silk_CNG(
             CNG_sig_Q14[ MAX_LPC_ORDER + i ] = silk_ADD_SAT32( CNG_sig_Q14[ MAX_LPC_ORDER + i ], silk_LSHIFT_SAT32( LPC_pred_Q10, 4 ) );
 
             /* Scale with Gain and add to input signal */
-            frame[ i ] = (opus_int16)silk_ADD_SAT16( frame[ i ], silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( CNG_sig_Q14[ MAX_LPC_ORDER + i ], gain_Q10 ), 8 ) ) );
+            frame[ i ] = (oac_int16)silk_ADD_SAT16( frame[ i ], silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( CNG_sig_Q14[ MAX_LPC_ORDER + i ], gain_Q10 ), 8 ) ) );
 
         }
-        silk_memcpy( psCNG->CNG_synth_state, &CNG_sig_Q14[ length ], MAX_LPC_ORDER * sizeof( opus_int32 ) );
+        silk_memcpy( psCNG->CNG_synth_state, &CNG_sig_Q14[ length ], MAX_LPC_ORDER * sizeof( oac_int32 ) );
     } else {
-        silk_memset( psCNG->CNG_synth_state, 0, psDec->LPC_order *  sizeof( opus_int32 ) );
+        silk_memset( psCNG->CNG_synth_state, 0, psDec->LPC_order *  sizeof( oac_int32 ) );
     }
     RESTORE_STACK;
 }
diff --git a/silk/HP_variable_cutoff.c b/silk/HP_variable_cutoff.c
index bbe10f04c..3489ea460 100644
--- a/silk/HP_variable_cutoff.c
+++ b/silk/HP_variable_cutoff.c
@@ -40,8 +40,8 @@ void silk_HP_variable_cutoff(
     silk_encoder_state_Fxx          state_Fxx[]                         /* I/O  Encoder states                              */
 )
 {
-   opus_int   quality_Q15;
-   opus_int32 pitch_freq_Hz_Q16, pitch_freq_log_Q7, delta_freq_Q7;
+   oac_int   quality_Q15;
+   oac_int32 pitch_freq_Hz_Q16, pitch_freq_log_Q7, delta_freq_Q7;
    silk_encoder_state *psEncC1 = &state_Fxx[ 0 ].sCmn;
 
    /* Adaptive cutoff frequency: estimate low end of pitch frequency range */
diff --git a/silk/Inlines.h b/silk/Inlines.h
index 02473ae66..50441bb1f 100644
--- a/silk/Inlines.h
+++ b/silk/Inlines.h
@@ -26,22 +26,22 @@ POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 /*! \file silk_Inlines.h
- *  \brief silk_Inlines.h defines OPUS_INLINE signal processing functions.
+ *  \brief silk_Inlines.h defines OAC_INLINE signal processing functions.
  */
 
 #ifndef SILK_FIX_INLINES_H
 #define SILK_FIX_INLINES_H
 
 
-/* count leading zeros of opus_int64 */
-static OPUS_INLINE opus_int32 silk_CLZ64( opus_int64 in )
+/* count leading zeros of oac_int64 */
+static OAC_INLINE oac_int32 silk_CLZ64( oac_int64 in )
 {
-    opus_int32 in_upper;
+    oac_int32 in_upper;
 
-    in_upper = (opus_int32)silk_RSHIFT64(in, 32);
+    in_upper = (oac_int32)silk_RSHIFT64(in, 32);
     if (in_upper == 0) {
         /* Search in the lower 32 bits */
-        return 32 + silk_CLZ32( (opus_int32) in );
+        return 32 + silk_CLZ32( (oac_int32) in );
     } else {
         /* Search in the upper 32 bits */
         return silk_CLZ32( in_upper );
@@ -49,13 +49,13 @@ static OPUS_INLINE opus_int32 silk_CLZ64( opus_int64 in )
 }
 
 /* get number of leading zeros and fractional part (the bits right after the leading one */
-static OPUS_INLINE void silk_CLZ_FRAC(
-    opus_int32 in,            /* I  input                               */
-    opus_int32 *lz,           /* O  number of leading zeros             */
-    opus_int32 *frac_Q7       /* O  the 7 bits right after the leading one */
+static OAC_INLINE void silk_CLZ_FRAC(
+    oac_int32 in,            /* I  input                               */
+    oac_int32 *lz,           /* O  number of leading zeros             */
+    oac_int32 *frac_Q7       /* O  the 7 bits right after the leading one */
 )
 {
-    opus_int32 lzeros = silk_CLZ32(in);
+    oac_int32 lzeros = silk_CLZ32(in);
 
     * lz = lzeros;
     * frac_Q7 = silk_ROR32(in, 24 - lzeros) & 0x7f;
@@ -64,9 +64,9 @@ static OPUS_INLINE void silk_CLZ_FRAC(
 /* Approximation of square root                                          */
 /* Accuracy: < +/- 10%  for output values > 15                           */
 /*           < +/- 2.5% for output values > 120                          */
-static OPUS_INLINE opus_int32 silk_SQRT_APPROX( opus_int32 x )
+static OAC_INLINE oac_int32 silk_SQRT_APPROX( oac_int32 x )
 {
-    opus_int32 y, lz, frac_Q7;
+    oac_int32 y, lz, frac_Q7;
 
     if( x <= 0 ) {
         return 0;
@@ -90,14 +90,14 @@ static OPUS_INLINE opus_int32 silk_SQRT_APPROX( opus_int32 x )
 }
 
 /* Divide two int32 values and return result as int32 in a given Q-domain */
-static OPUS_INLINE opus_int32 silk_DIV32_varQ(   /* O    returns a good approximation of "(a32 << Qres) / b32" */
-    const opus_int32     a32,               /* I    numerator (Q0)                  */
-    const opus_int32     b32,               /* I    denominator (Q0)                */
-    const opus_int       Qres               /* I    Q-domain of result (>= 0)       */
+static OAC_INLINE oac_int32 silk_DIV32_varQ(   /* O    returns a good approximation of "(a32 << Qres) / b32" */
+    const oac_int32     a32,               /* I    numerator (Q0)                  */
+    const oac_int32     b32,               /* I    denominator (Q0)                */
+    const oac_int       Qres               /* I    Q-domain of result (>= 0)       */
 )
 {
-    opus_int   a_headrm, b_headrm, lshift;
-    opus_int32 b32_inv, a32_nrm, b32_nrm, result;
+    oac_int   a_headrm, b_headrm, lshift;
+    oac_int32 b32_inv, a32_nrm, b32_nrm, result;
 
     silk_assert( b32 != 0 );
     silk_assert( Qres >= 0 );
@@ -136,13 +136,13 @@ static OPUS_INLINE opus_int32 silk_DIV32_varQ(   /* O    returns a good approxim
 }
 
 /* Invert int32 value and return result as int32 in a given Q-domain */
-static OPUS_INLINE opus_int32 silk_INVERSE32_varQ(   /* O    returns a good approximation of "(1 << Qres) / b32" */
-    const opus_int32     b32,                   /* I    denominator (Q0)                */
-    const opus_int       Qres                   /* I    Q-domain of result (> 0)        */
+static OAC_INLINE oac_int32 silk_INVERSE32_varQ(   /* O    returns a good approximation of "(1 << Qres) / b32" */
+    const oac_int32     b32,                   /* I    denominator (Q0)                */
+    const oac_int       Qres                   /* I    Q-domain of result (> 0)        */
 )
 {
-    opus_int   b_headrm, lshift;
-    opus_int32 b32_inv, b32_nrm, err_Q32, result;
+    oac_int   b_headrm, lshift;
+    oac_int32 b32_inv, b32_nrm, err_Q32, result;
 
     silk_assert( b32 != 0 );
     silk_assert( Qres > 0 );
@@ -158,7 +158,7 @@ static OPUS_INLINE opus_int32 silk_INVERSE32_varQ(   /* O    returns a good appr
     result = silk_LSHIFT(b32_inv, 16);                                          /* Q: 61 - b_headrm            */
 
     /* Compute residual by subtracting product of denominator and first approximation from one */
-    err_Q32 = silk_LSHIFT( ((opus_int32)1<<29) - silk_SMULWB(b32_nrm, b32_inv), 3 );        /* Q32                        */
+    err_Q32 = silk_LSHIFT( ((oac_int32)1<<29) - silk_SMULWB(b32_nrm, b32_inv), 3 );        /* Q32                        */
 
     /* Refinement */
     result = silk_SMLAWW(result, err_Q32, b32_inv);                             /* Q: 61 - b_headrm            */
diff --git a/silk/LPC_analysis_filter.c b/silk/LPC_analysis_filter.c
index d34b5eb70..066c31339 100644
--- a/silk/LPC_analysis_filter.c
+++ b/silk/LPC_analysis_filter.c
@@ -47,21 +47,21 @@ POSSIBILITY OF SUCH DAMAGE.
 #define USE_CELT_FIR 0
 
 void silk_LPC_analysis_filter(
-    opus_int16                  *out,               /* O    Output signal                                               */
-    const opus_int16            *in,                /* I    Input signal                                                */
-    const opus_int16            *B,                 /* I    MA prediction coefficients, Q12 [order]                     */
-    const opus_int32            len,                /* I    Signal length                                               */
-    const opus_int32            d,                  /* I    Filter order                                                */
+    oac_int16                  *out,               /* O    Output signal                                               */
+    const oac_int16            *in,                /* I    Input signal                                                */
+    const oac_int16            *B,                 /* I    MA prediction coefficients, Q12 [order]                     */
+    const oac_int32            len,                /* I    Signal length                                               */
+    const oac_int32            d,                  /* I    Filter order                                                */
     int                         arch                /* I    Run-time architecture                                       */
 )
 {
-    opus_int   j;
+    oac_int   j;
 #if defined(FIXED_POINT) && USE_CELT_FIR
-    opus_int16 num[SILK_MAX_ORDER_LPC];
+    oac_int16 num[SILK_MAX_ORDER_LPC];
 #else
     int ix;
-    opus_int32       out32_Q12, out32;
-    const opus_int16 *in_ptr;
+    oac_int32       out32_Q12, out32;
+    const oac_int16 *in_ptr;
 #endif
 
     celt_assert( d >= 6 );
@@ -96,16 +96,16 @@ void silk_LPC_analysis_filter(
         }
 
         /* Subtract prediction */
-        out32_Q12 = silk_SUB32_ovflw( silk_LSHIFT( (opus_int32)in_ptr[ 1 ], 12 ), out32_Q12 );
+        out32_Q12 = silk_SUB32_ovflw( silk_LSHIFT( (oac_int32)in_ptr[ 1 ], 12 ), out32_Q12 );
 
         /* Scale to Q0 */
         out32 = silk_RSHIFT_ROUND( out32_Q12, 12 );
 
         /* Saturate output */
-        out[ ix ] = (opus_int16)silk_SAT16( out32 );
+        out[ ix ] = (oac_int16)silk_SAT16( out32 );
     }
 
     /* Set first d output samples to zero */
-    silk_memset( out, 0, d * sizeof( opus_int16 ) );
+    silk_memset( out, 0, d * sizeof( oac_int16 ) );
 #endif
 }
diff --git a/silk/LPC_fit.c b/silk/LPC_fit.c
index c0690a1fc..8f9b8b2df 100644
--- a/silk/LPC_fit.c
+++ b/silk/LPC_fit.c
@@ -34,15 +34,15 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Convert int32 coefficients to int16 coefs and make sure there's no wrap-around.
    This logic is reused in _celt_lpc(). Any bug fixes should also be applied there. */
 void silk_LPC_fit(
-    opus_int16                  *a_QOUT,            /* O    Output signal                                               */
-    opus_int32                    *a_QIN,             /* I/O  Input signal                                                */
-    const opus_int              QOUT,               /* I    Input Q domain                                              */
-    const opus_int              QIN,                /* I    Input Q domain                                              */
-    const opus_int              d                   /* I    Filter order                                                */
+    oac_int16                  *a_QOUT,            /* O    Output signal                                               */
+    oac_int32                    *a_QIN,             /* I/O  Input signal                                                */
+    const oac_int              QOUT,               /* I    Input Q domain                                              */
+    const oac_int              QIN,                /* I    Input Q domain                                              */
+    const oac_int              d                   /* I    Filter order                                                */
 )
 {
-    opus_int    i, k, idx = 0;
-    opus_int32    maxabs, absval, chirp_Q16;
+    oac_int    i, k, idx = 0;
+    oac_int32    maxabs, absval, chirp_Q16;
 
     /* Limit the maximum absolute value of the prediction coefficients, so that they'll fit in int16 */
     for( i = 0; i < 10; i++ ) {
@@ -71,12 +71,12 @@ void silk_LPC_fit(
     if( i == 10 ) {
         /* Reached the last iteration, clip the coefficients */
         for( k = 0; k < d; k++ ) {
-            a_QOUT[ k ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( a_QIN[ k ], QIN - QOUT ) );
-            a_QIN[ k ] = silk_LSHIFT( (opus_int32)a_QOUT[ k ], QIN - QOUT );
+            a_QOUT[ k ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( a_QIN[ k ], QIN - QOUT ) );
+            a_QIN[ k ] = silk_LSHIFT( (oac_int32)a_QOUT[ k ], QIN - QOUT );
         }
     } else {
         for( k = 0; k < d; k++ ) {
-            a_QOUT[ k ] = (opus_int16)silk_RSHIFT_ROUND( a_QIN[ k ], QIN - QOUT );
+            a_QOUT[ k ] = (oac_int16)silk_RSHIFT_ROUND( a_QIN[ k ], QIN - QOUT );
         }
     }
 }
diff --git a/silk/LPC_inv_pred_gain.c b/silk/LPC_inv_pred_gain.c
index a3746a6ef..f03afc2ea 100644
--- a/silk/LPC_inv_pred_gain.c
+++ b/silk/LPC_inv_pred_gain.c
@@ -35,17 +35,17 @@ POSSIBILITY OF SUCH DAMAGE.
 #define QA                          24
 #define A_LIMIT                     SILK_FIX_CONST( 0.99975, QA )
 
-#define MUL32_FRAC_Q(a32, b32, Q)   ((opus_int32)(silk_RSHIFT_ROUND64(silk_SMULL(a32, b32), Q)))
+#define MUL32_FRAC_Q(a32, b32, Q)   ((oac_int32)(silk_RSHIFT_ROUND64(silk_SMULL(a32, b32), Q)))
 
 /* Compute inverse of LPC prediction gain, and                          */
 /* test if LPC coefficients are stable (all poles within unit circle)   */
-static opus_int32 LPC_inverse_pred_gain_QA_c(               /* O   Returns inverse prediction gain in energy domain, Q30    */
-    opus_int32           A_QA[ SILK_MAX_ORDER_LPC ],        /* I   Prediction coefficients                                  */
-    const opus_int       order                              /* I   Prediction order                                         */
+static oac_int32 LPC_inverse_pred_gain_QA_c(               /* O   Returns inverse prediction gain in energy domain, Q30    */
+    oac_int32           A_QA[ SILK_MAX_ORDER_LPC ],        /* I   Prediction coefficients                                  */
+    const oac_int       order                              /* I   Prediction order                                         */
 )
 {
-    opus_int   k, n, mult2Q;
-    opus_int32 invGain_Q30, rc_Q31, rc_mult1_Q30, rc_mult2, tmp1, tmp2;
+    oac_int   k, n, mult2Q;
+    oac_int32 invGain_Q30, rc_Q31, rc_mult1_Q30, rc_mult2, tmp1, tmp2;
 
     invGain_Q30 = SILK_FIX_CONST( 1, 30 );
     for( k = order - 1; k > 0; k-- ) {
@@ -77,7 +77,7 @@ static opus_int32 LPC_inverse_pred_gain_QA_c(               /* O   Returns inver
 
         /* Update AR coefficient */
         for( n = 0; n < (k + 1) >> 1; n++ ) {
-            opus_int64 tmp64;
+            oac_int64 tmp64;
             tmp1 = A_QA[ n ];
             tmp2 = A_QA[ k - n - 1 ];
             tmp64 = silk_RSHIFT_ROUND64( silk_SMULL( silk_SUB_SAT32(tmp1,
@@ -85,13 +85,13 @@ static opus_int32 LPC_inverse_pred_gain_QA_c(               /* O   Returns inver
             if( tmp64 > silk_int32_MAX || tmp64 < silk_int32_MIN ) {
                return 0;
             }
-            A_QA[ n ] = ( opus_int32 )tmp64;
+            A_QA[ n ] = ( oac_int32 )tmp64;
             tmp64 = silk_RSHIFT_ROUND64( silk_SMULL( silk_SUB_SAT32(tmp2,
                   MUL32_FRAC_Q( tmp1, rc_Q31, 31 ) ), rc_mult2), mult2Q);
             if( tmp64 > silk_int32_MAX || tmp64 < silk_int32_MIN ) {
                return 0;
             }
-            A_QA[ k - n - 1 ] = ( opus_int32 )tmp64;
+            A_QA[ k - n - 1 ] = ( oac_int32 )tmp64;
         }
     }
 
@@ -119,19 +119,19 @@ static opus_int32 LPC_inverse_pred_gain_QA_c(               /* O   Returns inver
 }
 
 /* For input in Q12 domain */
-opus_int32 silk_LPC_inverse_pred_gain_c(            /* O   Returns inverse prediction gain in energy domain, Q30        */
-    const opus_int16            *A_Q12,             /* I   Prediction coefficients, Q12 [order]                         */
-    const opus_int              order               /* I   Prediction order                                             */
+oac_int32 silk_LPC_inverse_pred_gain_c(            /* O   Returns inverse prediction gain in energy domain, Q30        */
+    const oac_int16            *A_Q12,             /* I   Prediction coefficients, Q12 [order]                         */
+    const oac_int              order               /* I   Prediction order                                             */
 )
 {
-    opus_int   k;
-    opus_int32 Atmp_QA[ SILK_MAX_ORDER_LPC ];
-    opus_int32 DC_resp = 0;
+    oac_int   k;
+    oac_int32 Atmp_QA[ SILK_MAX_ORDER_LPC ];
+    oac_int32 DC_resp = 0;
 
     /* Increase Q domain of the AR coefficients */
     for( k = 0; k < order; k++ ) {
-        DC_resp += (opus_int32)A_Q12[ k ];
-        Atmp_QA[ k ] = silk_LSHIFT32( (opus_int32)A_Q12[ k ], QA - 12 );
+        DC_resp += (oac_int32)A_Q12[ k ];
+        Atmp_QA[ k ] = silk_LSHIFT32( (oac_int32)A_Q12[ k ], QA - 12 );
     }
     /* If the DC is unstable, we don't even need to do the full calculations */
     if( DC_resp >= 4096 ) {
diff --git a/silk/LP_variable_cutoff.c b/silk/LP_variable_cutoff.c
index 79112ad35..1cf1e19ba 100644
--- a/silk/LP_variable_cutoff.c
+++ b/silk/LP_variable_cutoff.c
@@ -38,14 +38,14 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "main.h"
 
 /* Helper function, interpolates the filter taps */
-static OPUS_INLINE void silk_LP_interpolate_filter_taps(
-    opus_int32           B_Q28[ TRANSITION_NB ],
-    opus_int32           A_Q28[ TRANSITION_NA ],
-    const opus_int       ind,
-    const opus_int32     fac_Q16
+static OAC_INLINE void silk_LP_interpolate_filter_taps(
+    oac_int32           B_Q28[ TRANSITION_NB ],
+    oac_int32           A_Q28[ TRANSITION_NA ],
+    const oac_int       ind,
+    const oac_int32     fac_Q16
 )
 {
-    opus_int nb, na;
+    oac_int nb, na;
 
     if( ind < TRANSITION_INT_NUM - 1 ) {
         if( fac_Q16 > 0 ) {
@@ -73,23 +73,23 @@ static OPUS_INLINE void silk_LP_interpolate_filter_taps(
                         silk_Transition_LP_B_Q28[ ind + 1 ][ nb ],
                         silk_Transition_LP_B_Q28[ ind + 1 ][ nb ] -
                         silk_Transition_LP_B_Q28[ ind     ][ nb ],
-                        fac_Q16 - ( (opus_int32)1 << 16 ) );
+                        fac_Q16 - ( (oac_int32)1 << 16 ) );
                 }
                 for( na = 0; na < TRANSITION_NA; na++ ) {
                     A_Q28[ na ] = silk_SMLAWB(
                         silk_Transition_LP_A_Q28[ ind + 1 ][ na ],
                         silk_Transition_LP_A_Q28[ ind + 1 ][ na ] -
                         silk_Transition_LP_A_Q28[ ind     ][ na ],
-                        fac_Q16 - ( (opus_int32)1 << 16 ) );
+                        fac_Q16 - ( (oac_int32)1 << 16 ) );
                 }
             }
         } else {
-            silk_memcpy( B_Q28, silk_Transition_LP_B_Q28[ ind ], TRANSITION_NB * sizeof( opus_int32 ) );
-            silk_memcpy( A_Q28, silk_Transition_LP_A_Q28[ ind ], TRANSITION_NA * sizeof( opus_int32 ) );
+            silk_memcpy( B_Q28, silk_Transition_LP_B_Q28[ ind ], TRANSITION_NB * sizeof( oac_int32 ) );
+            silk_memcpy( A_Q28, silk_Transition_LP_A_Q28[ ind ], TRANSITION_NA * sizeof( oac_int32 ) );
         }
     } else {
-        silk_memcpy( B_Q28, silk_Transition_LP_B_Q28[ TRANSITION_INT_NUM - 1 ], TRANSITION_NB * sizeof( opus_int32 ) );
-        silk_memcpy( A_Q28, silk_Transition_LP_A_Q28[ TRANSITION_INT_NUM - 1 ], TRANSITION_NA * sizeof( opus_int32 ) );
+        silk_memcpy( B_Q28, silk_Transition_LP_B_Q28[ TRANSITION_INT_NUM - 1 ], TRANSITION_NB * sizeof( oac_int32 ) );
+        silk_memcpy( A_Q28, silk_Transition_LP_A_Q28[ TRANSITION_INT_NUM - 1 ], TRANSITION_NA * sizeof( oac_int32 ) );
     }
 }
 
@@ -99,12 +99,12 @@ static OPUS_INLINE void silk_LP_interpolate_filter_taps(
 /* Deactivate by setting psEncC->mode = 0;                  */
 void silk_LP_variable_cutoff(
     silk_LP_state               *psLP,                          /* I/O  LP filter state                             */
-    opus_int16                  *frame,                         /* I/O  Low-pass filtered output signal             */
-    const opus_int              frame_length                    /* I    Frame length                                */
+    oac_int16                  *frame,                         /* I/O  Low-pass filtered output signal             */
+    const oac_int              frame_length                    /* I    Frame length                                */
 )
 {
-    opus_int32   B_Q28[ TRANSITION_NB ], A_Q28[ TRANSITION_NA ], fac_Q16 = 0;
-    opus_int     ind = 0;
+    oac_int32   B_Q28[ TRANSITION_NB ], A_Q28[ TRANSITION_NA ], fac_Q16 = 0;
+    oac_int     ind = 0;
 
     silk_assert( psLP->transition_frame_no >= 0 && psLP->transition_frame_no <= TRANSITION_FRAMES );
 
diff --git a/silk/MacroCount.h b/silk/MacroCount.h
index bbeb14b87..2e1efc4f6 100644
--- a/silk/MacroCount.h
+++ b/silk/MacroCount.h
@@ -30,129 +30,129 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #ifdef    silk_MACRO_COUNT
 #include <stdio.h>
-#define varDefine opus_int64 ops_count = 0;
+#define varDefine oac_int64 ops_count = 0;
 
-extern opus_int64 ops_count;
+extern oac_int64 ops_count;
 
-static OPUS_INLINE opus_int64 silk_SaveCount(){
+static OAC_INLINE oac_int64 silk_SaveCount(){
     return(ops_count);
 }
 
-static OPUS_INLINE opus_int64 silk_SaveResetCount(){
-    opus_int64 ret;
+static OAC_INLINE oac_int64 silk_SaveResetCount(){
+    oac_int64 ret;
 
     ret = ops_count;
     ops_count = 0;
     return(ret);
 }
 
-static OPUS_INLINE silk_PrintCount(){
-    printf("ops_count = %d \n ", (opus_int32)ops_count);
+static OAC_INLINE silk_PrintCount(){
+    printf("ops_count = %d \n ", (oac_int32)ops_count);
 }
 
 #undef silk_MUL
-static OPUS_INLINE opus_int32 silk_MUL(opus_int32 a32, opus_int32 b32){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_MUL(oac_int32 a32, oac_int32 b32){
+    oac_int32 ret;
     ops_count += 4;
     ret = a32 * b32;
     return ret;
 }
 
 #undef silk_MUL_uint
-static OPUS_INLINE opus_uint32 silk_MUL_uint(opus_uint32 a32, opus_uint32 b32){
-    opus_uint32 ret;
+static OAC_INLINE oac_uint32 silk_MUL_uint(oac_uint32 a32, oac_uint32 b32){
+    oac_uint32 ret;
     ops_count += 4;
     ret = a32 * b32;
     return ret;
 }
 #undef silk_MLA
-static OPUS_INLINE opus_int32 silk_MLA(opus_int32 a32, opus_int32 b32, opus_int32 c32){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_MLA(oac_int32 a32, oac_int32 b32, oac_int32 c32){
+    oac_int32 ret;
     ops_count += 4;
     ret = a32 + b32 * c32;
     return ret;
 }
 
 #undef silk_MLA_uint
-static OPUS_INLINE opus_int32 silk_MLA_uint(opus_uint32 a32, opus_uint32 b32, opus_uint32 c32){
-    opus_uint32 ret;
+static OAC_INLINE oac_int32 silk_MLA_uint(oac_uint32 a32, oac_uint32 b32, oac_uint32 c32){
+    oac_uint32 ret;
     ops_count += 4;
     ret = a32 + b32 * c32;
     return ret;
 }
 
 #undef silk_SMULWB
-static OPUS_INLINE opus_int32 silk_SMULWB(opus_int32 a32, opus_int32 b32){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_SMULWB(oac_int32 a32, oac_int32 b32){
+    oac_int32 ret;
     ops_count += 5;
-    ret = (a32 >> 16) * (opus_int32)((opus_int16)b32) + (((a32 & 0x0000FFFF) * (opus_int32)((opus_int16)b32)) >> 16);
+    ret = (a32 >> 16) * (oac_int32)((oac_int16)b32) + (((a32 & 0x0000FFFF) * (oac_int32)((oac_int16)b32)) >> 16);
     return ret;
 }
 #undef    silk_SMLAWB
-static OPUS_INLINE opus_int32 silk_SMLAWB(opus_int32 a32, opus_int32 b32, opus_int32 c32){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_SMLAWB(oac_int32 a32, oac_int32 b32, oac_int32 c32){
+    oac_int32 ret;
     ops_count += 5;
-    ret = ((a32) + ((((b32) >> 16) * (opus_int32)((opus_int16)(c32))) + ((((b32) & 0x0000FFFF) * (opus_int32)((opus_int16)(c32))) >> 16)));
+    ret = ((a32) + ((((b32) >> 16) * (oac_int32)((oac_int16)(c32))) + ((((b32) & 0x0000FFFF) * (oac_int32)((oac_int16)(c32))) >> 16)));
     return ret;
 }
 
 #undef silk_SMULWT
-static OPUS_INLINE opus_int32 silk_SMULWT(opus_int32 a32, opus_int32 b32){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_SMULWT(oac_int32 a32, oac_int32 b32){
+    oac_int32 ret;
     ops_count += 4;
     ret = (a32 >> 16) * (b32 >> 16) + (((a32 & 0x0000FFFF) * (b32 >> 16)) >> 16);
     return ret;
 }
 #undef silk_SMLAWT
-static OPUS_INLINE opus_int32 silk_SMLAWT(opus_int32 a32, opus_int32 b32, opus_int32 c32){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_SMLAWT(oac_int32 a32, oac_int32 b32, oac_int32 c32){
+    oac_int32 ret;
     ops_count += 4;
     ret = a32 + ((b32 >> 16) * (c32 >> 16)) + (((b32 & 0x0000FFFF) * ((c32 >> 16)) >> 16));
     return ret;
 }
 
 #undef silk_SMULBB
-static OPUS_INLINE opus_int32 silk_SMULBB(opus_int32 a32, opus_int32 b32){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_SMULBB(oac_int32 a32, oac_int32 b32){
+    oac_int32 ret;
     ops_count += 1;
-    ret = (opus_int32)((opus_int16)a32) * (opus_int32)((opus_int16)b32);
+    ret = (oac_int32)((oac_int16)a32) * (oac_int32)((oac_int16)b32);
     return ret;
 }
 #undef silk_SMLABB
-static OPUS_INLINE opus_int32 silk_SMLABB(opus_int32 a32, opus_int32 b32, opus_int32 c32){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_SMLABB(oac_int32 a32, oac_int32 b32, oac_int32 c32){
+    oac_int32 ret;
     ops_count += 1;
-    ret = a32 + (opus_int32)((opus_int16)b32) * (opus_int32)((opus_int16)c32);
+    ret = a32 + (oac_int32)((oac_int16)b32) * (oac_int32)((oac_int16)c32);
     return ret;
 }
 
 #undef silk_SMULBT
-static OPUS_INLINE opus_int32 silk_SMULBT(opus_int32 a32, opus_int32 b32 ){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_SMULBT(oac_int32 a32, oac_int32 b32 ){
+    oac_int32 ret;
     ops_count += 4;
-    ret = ((opus_int32)((opus_int16)a32)) * (b32 >> 16);
+    ret = ((oac_int32)((oac_int16)a32)) * (b32 >> 16);
     return ret;
 }
 
 #undef silk_SMLABT
-static OPUS_INLINE opus_int32 silk_SMLABT(opus_int32 a32, opus_int32 b32, opus_int32 c32){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_SMLABT(oac_int32 a32, oac_int32 b32, oac_int32 c32){
+    oac_int32 ret;
     ops_count += 1;
-    ret = a32 + ((opus_int32)((opus_int16)b32)) * (c32 >> 16);
+    ret = a32 + ((oac_int32)((oac_int16)b32)) * (c32 >> 16);
     return ret;
 }
 
 #undef silk_SMULTT
-static OPUS_INLINE opus_int32 silk_SMULTT(opus_int32 a32, opus_int32 b32){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_SMULTT(oac_int32 a32, oac_int32 b32){
+    oac_int32 ret;
     ops_count += 1;
     ret = (a32 >> 16) * (b32 >> 16);
     return ret;
 }
 
 #undef    silk_SMLATT
-static OPUS_INLINE opus_int32 silk_SMLATT(opus_int32 a32, opus_int32 b32, opus_int32 c32){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_SMLATT(oac_int32 a32, oac_int32 b32, oac_int32 c32){
+    oac_int32 ret;
     ops_count += 1;
     ret = a32 + (b32 >> 16) * (c32 >> 16);
     return ret;
@@ -179,32 +179,32 @@ static OPUS_INLINE opus_int32 silk_SMLATT(opus_int32 a32, opus_int32 b32, opus_i
 #define silk_SMLAWT_ovflw silk_SMLAWT
 
 #undef silk_SMULL
-static OPUS_INLINE opus_int64 silk_SMULL(opus_int32 a32, opus_int32 b32){
-    opus_int64 ret;
+static OAC_INLINE oac_int64 silk_SMULL(oac_int32 a32, oac_int32 b32){
+    oac_int64 ret;
     ops_count += 8;
-    ret = ((opus_int64)(a32) * /*(opus_int64)*/(b32));
+    ret = ((oac_int64)(a32) * /*(oac_int64)*/(b32));
     return ret;
 }
 
 #undef    silk_SMLAL
-static OPUS_INLINE opus_int64 silk_SMLAL(opus_int64 a64, opus_int32 b32, opus_int32 c32){
-    opus_int64 ret;
+static OAC_INLINE oac_int64 silk_SMLAL(oac_int64 a64, oac_int32 b32, oac_int32 c32){
+    oac_int64 ret;
     ops_count += 8;
-    ret = a64 + ((opus_int64)(b32) * /*(opus_int64)*/(c32));
+    ret = a64 + ((oac_int64)(b32) * /*(oac_int64)*/(c32));
     return ret;
 }
 #undef    silk_SMLALBB
-static OPUS_INLINE opus_int64 silk_SMLALBB(opus_int64 a64, opus_int16 b16, opus_int16 c16){
-    opus_int64 ret;
+static OAC_INLINE oac_int64 silk_SMLALBB(oac_int64 a64, oac_int16 b16, oac_int16 c16){
+    oac_int64 ret;
     ops_count += 4;
-    ret = a64 + ((opus_int64)(b16) * /*(opus_int64)*/(c16));
+    ret = a64 + ((oac_int64)(b16) * /*(oac_int64)*/(c16));
     return ret;
 }
 
 #undef    SigProcFIX_CLZ16
-static OPUS_INLINE opus_int32 SigProcFIX_CLZ16(opus_int16 in16)
+static OAC_INLINE oac_int32 SigProcFIX_CLZ16(oac_int16 in16)
 {
-    opus_int32 out32 = 0;
+    oac_int32 out32 = 0;
     ops_count += 10;
     if( in16 == 0 ) {
         return 16;
@@ -240,234 +240,234 @@ static OPUS_INLINE opus_int32 SigProcFIX_CLZ16(opus_int16 in16)
 }
 
 #undef SigProcFIX_CLZ32
-static OPUS_INLINE opus_int32 SigProcFIX_CLZ32(opus_int32 in32)
+static OAC_INLINE oac_int32 SigProcFIX_CLZ32(oac_int32 in32)
 {
-    /* test highest 16 bits and convert to opus_int16 */
+    /* test highest 16 bits and convert to oac_int16 */
     ops_count += 2;
     if( in32 & 0xFFFF0000 ) {
-        return SigProcFIX_CLZ16((opus_int16)(in32 >> 16));
+        return SigProcFIX_CLZ16((oac_int16)(in32 >> 16));
     } else {
-        return SigProcFIX_CLZ16((opus_int16)in32) + 16;
+        return SigProcFIX_CLZ16((oac_int16)in32) + 16;
     }
 }
 
 #undef silk_DIV32
-static OPUS_INLINE opus_int32 silk_DIV32(opus_int32 a32, opus_int32 b32){
+static OAC_INLINE oac_int32 silk_DIV32(oac_int32 a32, oac_int32 b32){
     ops_count += 64;
     return a32 / b32;
 }
 
 #undef silk_DIV32_16
-static OPUS_INLINE opus_int32 silk_DIV32_16(opus_int32 a32, opus_int32 b32){
+static OAC_INLINE oac_int32 silk_DIV32_16(oac_int32 a32, oac_int32 b32){
     ops_count += 32;
     return a32 / b32;
 }
 
 #undef silk_SAT8
-static OPUS_INLINE opus_int8 silk_SAT8(opus_int64 a){
-    opus_int8 tmp;
+static OAC_INLINE oac_int8 silk_SAT8(oac_int64 a){
+    oac_int8 tmp;
     ops_count += 1;
-    tmp = (opus_int8)((a) > silk_int8_MAX ? silk_int8_MAX  : \
+    tmp = (oac_int8)((a) > silk_int8_MAX ? silk_int8_MAX  : \
                     ((a) < silk_int8_MIN ? silk_int8_MIN  : (a)));
     return(tmp);
 }
 
 #undef silk_SAT16
-static OPUS_INLINE opus_int16 silk_SAT16(opus_int64 a){
-    opus_int16 tmp;
+static OAC_INLINE oac_int16 silk_SAT16(oac_int64 a){
+    oac_int16 tmp;
     ops_count += 1;
-    tmp = (opus_int16)((a) > silk_int16_MAX ? silk_int16_MAX  : \
+    tmp = (oac_int16)((a) > silk_int16_MAX ? silk_int16_MAX  : \
                      ((a) < silk_int16_MIN ? silk_int16_MIN  : (a)));
     return(tmp);
 }
 #undef silk_SAT32
-static OPUS_INLINE opus_int32 silk_SAT32(opus_int64 a){
-    opus_int32 tmp;
+static OAC_INLINE oac_int32 silk_SAT32(oac_int64 a){
+    oac_int32 tmp;
     ops_count += 1;
-    tmp = (opus_int32)((a) > silk_int32_MAX ? silk_int32_MAX  : \
+    tmp = (oac_int32)((a) > silk_int32_MAX ? silk_int32_MAX  : \
                      ((a) < silk_int32_MIN ? silk_int32_MIN  : (a)));
     return(tmp);
 }
 #undef silk_POS_SAT32
-static OPUS_INLINE opus_int32 silk_POS_SAT32(opus_int64 a){
-    opus_int32 tmp;
+static OAC_INLINE oac_int32 silk_POS_SAT32(oac_int64 a){
+    oac_int32 tmp;
     ops_count += 1;
-    tmp = (opus_int32)((a) > silk_int32_MAX ? silk_int32_MAX : (a));
+    tmp = (oac_int32)((a) > silk_int32_MAX ? silk_int32_MAX : (a));
     return(tmp);
 }
 
 #undef silk_ADD_POS_SAT8
-static OPUS_INLINE opus_int8 silk_ADD_POS_SAT8(opus_int64 a, opus_int64 b){
-    opus_int8 tmp;
+static OAC_INLINE oac_int8 silk_ADD_POS_SAT8(oac_int64 a, oac_int64 b){
+    oac_int8 tmp;
     ops_count += 1;
-    tmp = (opus_int8)((((a)+(b)) & 0x80) ? silk_int8_MAX  : ((a)+(b)));
+    tmp = (oac_int8)((((a)+(b)) & 0x80) ? silk_int8_MAX  : ((a)+(b)));
     return(tmp);
 }
 #undef silk_ADD_POS_SAT16
-static OPUS_INLINE opus_int16 silk_ADD_POS_SAT16(opus_int64 a, opus_int64 b){
-    opus_int16 tmp;
+static OAC_INLINE oac_int16 silk_ADD_POS_SAT16(oac_int64 a, oac_int64 b){
+    oac_int16 tmp;
     ops_count += 1;
-    tmp = (opus_int16)((((a)+(b)) & 0x8000) ? silk_int16_MAX : ((a)+(b)));
+    tmp = (oac_int16)((((a)+(b)) & 0x8000) ? silk_int16_MAX : ((a)+(b)));
     return(tmp);
 }
 
 #undef silk_ADD_POS_SAT32
-static OPUS_INLINE opus_int32 silk_ADD_POS_SAT32(opus_int64 a, opus_int64 b){
-    opus_int32 tmp;
+static OAC_INLINE oac_int32 silk_ADD_POS_SAT32(oac_int64 a, oac_int64 b){
+    oac_int32 tmp;
     ops_count += 1;
-    tmp = (opus_int32)((((a)+(b)) & 0x80000000) ? silk_int32_MAX : ((a)+(b)));
+    tmp = (oac_int32)((((a)+(b)) & 0x80000000) ? silk_int32_MAX : ((a)+(b)));
     return(tmp);
 }
 
 #undef    silk_LSHIFT8
-static OPUS_INLINE opus_int8 silk_LSHIFT8(opus_int8 a, opus_int32 shift){
-    opus_int8 ret;
+static OAC_INLINE oac_int8 silk_LSHIFT8(oac_int8 a, oac_int32 shift){
+    oac_int8 ret;
     ops_count += 1;
     ret = a << shift;
     return ret;
 }
 #undef    silk_LSHIFT16
-static OPUS_INLINE opus_int16 silk_LSHIFT16(opus_int16 a, opus_int32 shift){
-    opus_int16 ret;
+static OAC_INLINE oac_int16 silk_LSHIFT16(oac_int16 a, oac_int32 shift){
+    oac_int16 ret;
     ops_count += 1;
     ret = a << shift;
     return ret;
 }
 #undef    silk_LSHIFT32
-static OPUS_INLINE opus_int32 silk_LSHIFT32(opus_int32 a, opus_int32 shift){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_LSHIFT32(oac_int32 a, oac_int32 shift){
+    oac_int32 ret;
     ops_count += 1;
     ret = a << shift;
     return ret;
 }
 #undef    silk_LSHIFT64
-static OPUS_INLINE opus_int64 silk_LSHIFT64(opus_int64 a, opus_int shift){
+static OAC_INLINE oac_int64 silk_LSHIFT64(oac_int64 a, oac_int shift){
     ops_count += 1;
     return a << shift;
 }
 
 #undef    silk_LSHIFT_ovflw
-static OPUS_INLINE opus_int32 silk_LSHIFT_ovflw(opus_int32 a, opus_int32 shift){
+static OAC_INLINE oac_int32 silk_LSHIFT_ovflw(oac_int32 a, oac_int32 shift){
     ops_count += 1;
     return a << shift;
 }
 
 #undef    silk_LSHIFT_uint
-static OPUS_INLINE opus_uint32 silk_LSHIFT_uint(opus_uint32 a, opus_int32 shift){
-    opus_uint32 ret;
+static OAC_INLINE oac_uint32 silk_LSHIFT_uint(oac_uint32 a, oac_int32 shift){
+    oac_uint32 ret;
     ops_count += 1;
     ret = a << shift;
     return ret;
 }
 
 #undef    silk_RSHIFT8
-static OPUS_INLINE opus_int8 silk_RSHIFT8(opus_int8 a, opus_int32 shift){
+static OAC_INLINE oac_int8 silk_RSHIFT8(oac_int8 a, oac_int32 shift){
     ops_count += 1;
     return a >> shift;
 }
 #undef    silk_RSHIFT16
-static OPUS_INLINE opus_int16 silk_RSHIFT16(opus_int16 a, opus_int32 shift){
+static OAC_INLINE oac_int16 silk_RSHIFT16(oac_int16 a, oac_int32 shift){
     ops_count += 1;
     return a >> shift;
 }
 #undef    silk_RSHIFT32
-static OPUS_INLINE opus_int32 silk_RSHIFT32(opus_int32 a, opus_int32 shift){
+static OAC_INLINE oac_int32 silk_RSHIFT32(oac_int32 a, oac_int32 shift){
     ops_count += 1;
     return a >> shift;
 }
 #undef    silk_RSHIFT64
-static OPUS_INLINE opus_int64 silk_RSHIFT64(opus_int64 a, opus_int64 shift){
+static OAC_INLINE oac_int64 silk_RSHIFT64(oac_int64 a, oac_int64 shift){
     ops_count += 1;
     return a >> shift;
 }
 
 #undef    silk_RSHIFT_uint
-static OPUS_INLINE opus_uint32 silk_RSHIFT_uint(opus_uint32 a, opus_int32 shift){
+static OAC_INLINE oac_uint32 silk_RSHIFT_uint(oac_uint32 a, oac_int32 shift){
     ops_count += 1;
     return a >> shift;
 }
 
 #undef    silk_ADD_LSHIFT
-static OPUS_INLINE opus_int32 silk_ADD_LSHIFT(opus_int32 a, opus_int32 b, opus_int32 shift){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_ADD_LSHIFT(oac_int32 a, oac_int32 b, oac_int32 shift){
+    oac_int32 ret;
     ops_count += 1;
     ret = a + (b << shift);
     return ret;                /* shift >= 0*/
 }
 #undef    silk_ADD_LSHIFT32
-static OPUS_INLINE opus_int32 silk_ADD_LSHIFT32(opus_int32 a, opus_int32 b, opus_int32 shift){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_ADD_LSHIFT32(oac_int32 a, oac_int32 b, oac_int32 shift){
+    oac_int32 ret;
     ops_count += 1;
     ret = a + (b << shift);
     return ret;                /* shift >= 0*/
 }
 #undef    silk_ADD_LSHIFT_uint
-static OPUS_INLINE opus_uint32 silk_ADD_LSHIFT_uint(opus_uint32 a, opus_uint32 b, opus_int32 shift){
-    opus_uint32 ret;
+static OAC_INLINE oac_uint32 silk_ADD_LSHIFT_uint(oac_uint32 a, oac_uint32 b, oac_int32 shift){
+    oac_uint32 ret;
     ops_count += 1;
     ret = a + (b << shift);
     return ret;                /* shift >= 0*/
 }
 #undef    silk_ADD_RSHIFT
-static OPUS_INLINE opus_int32 silk_ADD_RSHIFT(opus_int32 a, opus_int32 b, opus_int32 shift){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_ADD_RSHIFT(oac_int32 a, oac_int32 b, oac_int32 shift){
+    oac_int32 ret;
     ops_count += 1;
     ret = a + (b >> shift);
     return ret;                /* shift  > 0*/
 }
 #undef    silk_ADD_RSHIFT32
-static OPUS_INLINE opus_int32 silk_ADD_RSHIFT32(opus_int32 a, opus_int32 b, opus_int32 shift){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_ADD_RSHIFT32(oac_int32 a, oac_int32 b, oac_int32 shift){
+    oac_int32 ret;
     ops_count += 1;
     ret = a + (b >> shift);
     return ret;                /* shift  > 0*/
 }
 #undef    silk_ADD_RSHIFT_uint
-static OPUS_INLINE opus_uint32 silk_ADD_RSHIFT_uint(opus_uint32 a, opus_uint32 b, opus_int32 shift){
-    opus_uint32 ret;
+static OAC_INLINE oac_uint32 silk_ADD_RSHIFT_uint(oac_uint32 a, oac_uint32 b, oac_int32 shift){
+    oac_uint32 ret;
     ops_count += 1;
     ret = a + (b >> shift);
     return ret;                /* shift  > 0*/
 }
 #undef    silk_SUB_LSHIFT32
-static OPUS_INLINE opus_int32 silk_SUB_LSHIFT32(opus_int32 a, opus_int32 b, opus_int32 shift){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_SUB_LSHIFT32(oac_int32 a, oac_int32 b, oac_int32 shift){
+    oac_int32 ret;
     ops_count += 1;
     ret = a - (b << shift);
     return ret;                /* shift >= 0*/
 }
 #undef    silk_SUB_RSHIFT32
-static OPUS_INLINE opus_int32 silk_SUB_RSHIFT32(opus_int32 a, opus_int32 b, opus_int32 shift){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_SUB_RSHIFT32(oac_int32 a, oac_int32 b, oac_int32 shift){
+    oac_int32 ret;
     ops_count += 1;
     ret = a - (b >> shift);
     return ret;                /* shift  > 0*/
 }
 
 #undef    silk_RSHIFT_ROUND
-static OPUS_INLINE opus_int32 silk_RSHIFT_ROUND(opus_int32 a, opus_int32 shift){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_RSHIFT_ROUND(oac_int32 a, oac_int32 shift){
+    oac_int32 ret;
     ops_count += 3;
     ret = shift == 1 ? (a >> 1) + (a & 1) : ((a >> (shift - 1)) + 1) >> 1;
     return ret;
 }
 
 #undef    silk_RSHIFT_ROUND64
-static OPUS_INLINE opus_int64 silk_RSHIFT_ROUND64(opus_int64 a, opus_int32 shift){
-    opus_int64 ret;
+static OAC_INLINE oac_int64 silk_RSHIFT_ROUND64(oac_int64 a, oac_int32 shift){
+    oac_int64 ret;
     ops_count += 6;
     ret = shift == 1 ? (a >> 1) + (a & 1) : ((a >> (shift - 1)) + 1) >> 1;
     return ret;
 }
 
 #undef    silk_abs_int64
-static OPUS_INLINE opus_int64 silk_abs_int64(opus_int64 a){
+static OAC_INLINE oac_int64 silk_abs_int64(oac_int64 a){
     ops_count += 1;
     return (((a) >  0)  ? (a) : -(a));            /* Be careful, silk_abs returns wrong when input equals to silk_intXX_MIN*/
 }
 
 #undef    silk_abs_int32
-static OPUS_INLINE opus_int32 silk_abs_int32(opus_int32 a){
+static OAC_INLINE oac_int32 silk_abs_int32(oac_int32 a){
     ops_count += 1;
     return silk_abs(a);
 }
@@ -490,64 +490,64 @@ static silk_sign(a){
 }
 
 #undef    silk_ADD16
-static OPUS_INLINE opus_int16 silk_ADD16(opus_int16 a, opus_int16 b){
-    opus_int16 ret;
+static OAC_INLINE oac_int16 silk_ADD16(oac_int16 a, oac_int16 b){
+    oac_int16 ret;
     ops_count += 1;
     ret = a + b;
     return ret;
 }
 
 #undef    silk_ADD32
-static OPUS_INLINE opus_int32 silk_ADD32(opus_int32 a, opus_int32 b){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_ADD32(oac_int32 a, oac_int32 b){
+    oac_int32 ret;
     ops_count += 1;
     ret = a + b;
     return ret;
 }
 
 #undef    silk_ADD64
-static OPUS_INLINE opus_int64 silk_ADD64(opus_int64 a, opus_int64 b){
-    opus_int64 ret;
+static OAC_INLINE oac_int64 silk_ADD64(oac_int64 a, oac_int64 b){
+    oac_int64 ret;
     ops_count += 2;
     ret = a + b;
     return ret;
 }
 
 #undef    silk_SUB16
-static OPUS_INLINE opus_int16 silk_SUB16(opus_int16 a, opus_int16 b){
-    opus_int16 ret;
+static OAC_INLINE oac_int16 silk_SUB16(oac_int16 a, oac_int16 b){
+    oac_int16 ret;
     ops_count += 1;
     ret = a - b;
     return ret;
 }
 
 #undef    silk_SUB32
-static OPUS_INLINE opus_int32 silk_SUB32(opus_int32 a, opus_int32 b){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_SUB32(oac_int32 a, oac_int32 b){
+    oac_int32 ret;
     ops_count += 1;
     ret = a - b;
     return ret;
 }
 
 #undef    silk_SUB64
-static OPUS_INLINE opus_int64 silk_SUB64(opus_int64 a, opus_int64 b){
-    opus_int64 ret;
+static OAC_INLINE oac_int64 silk_SUB64(oac_int64 a, oac_int64 b){
+    oac_int64 ret;
     ops_count += 2;
     ret = a - b;
     return ret;
 }
 
 #undef silk_ADD_SAT16
-static OPUS_INLINE opus_int16 silk_ADD_SAT16( opus_int16 a16, opus_int16 b16 ) {
-    opus_int16 res;
+static OAC_INLINE oac_int16 silk_ADD_SAT16( oac_int16 a16, oac_int16 b16 ) {
+    oac_int16 res;
     /* Nb will be counted in AKP_add32 and silk_SAT16*/
-    res = (opus_int16)silk_SAT16( silk_ADD32( (opus_int32)(a16), (b16) ) );
+    res = (oac_int16)silk_SAT16( silk_ADD32( (oac_int32)(a16), (b16) ) );
     return res;
 }
 
 #undef silk_ADD_SAT32
-static OPUS_INLINE opus_int32 silk_ADD_SAT32(opus_int32 a32, opus_int32 b32){
-    opus_int32 res;
+static OAC_INLINE oac_int32 silk_ADD_SAT32(oac_int32 a32, oac_int32 b32){
+    oac_int32 res;
     ops_count += 1;
     res =    ((((a32) + (b32)) & 0x80000000) == 0 ?                                    \
             ((((a32) & (b32)) & 0x80000000) != 0 ? silk_int32_MIN : (a32)+(b32)) :    \
@@ -556,8 +556,8 @@ static OPUS_INLINE opus_int32 silk_ADD_SAT32(opus_int32 a32, opus_int32 b32){
 }
 
 #undef silk_ADD_SAT64
-static OPUS_INLINE opus_int64 silk_ADD_SAT64( opus_int64 a64, opus_int64 b64 ) {
-    opus_int64 res;
+static OAC_INLINE oac_int64 silk_ADD_SAT64( oac_int64 a64, oac_int64 b64 ) {
+    oac_int64 res;
     ops_count += 1;
     res =    ((((a64) + (b64)) & 0x8000000000000000LL) == 0 ?                                \
             ((((a64) & (b64)) & 0x8000000000000000LL) != 0 ? silk_int64_MIN : (a64)+(b64)) :    \
@@ -566,17 +566,17 @@ static OPUS_INLINE opus_int64 silk_ADD_SAT64( opus_int64 a64, opus_int64 b64 ) {
 }
 
 #undef silk_SUB_SAT16
-static OPUS_INLINE opus_int16 silk_SUB_SAT16( opus_int16 a16, opus_int16 b16 ) {
-    opus_int16 res;
+static OAC_INLINE oac_int16 silk_SUB_SAT16( oac_int16 a16, oac_int16 b16 ) {
+    oac_int16 res;
     silk_assert(0);
     /* Nb will be counted in sub-macros*/
-    res = (opus_int16)silk_SAT16( silk_SUB32( (opus_int32)(a16), (b16) ) );
+    res = (oac_int16)silk_SAT16( silk_SUB32( (oac_int32)(a16), (b16) ) );
     return res;
 }
 
 #undef silk_SUB_SAT32
-static OPUS_INLINE opus_int32 silk_SUB_SAT32( opus_int32 a32, opus_int32 b32 ) {
-    opus_int32 res;
+static OAC_INLINE oac_int32 silk_SUB_SAT32( oac_int32 a32, oac_int32 b32 ) {
+    oac_int32 res;
     ops_count += 1;
     res =     ((((a32)-(b32)) & 0x80000000) == 0 ?                                            \
             (( (a32) & ((b32)^0x80000000) & 0x80000000) ? silk_int32_MIN : (a32)-(b32)) :    \
@@ -585,8 +585,8 @@ static OPUS_INLINE opus_int32 silk_SUB_SAT32( opus_int32 a32, opus_int32 b32 ) {
 }
 
 #undef silk_SUB_SAT64
-static OPUS_INLINE opus_int64 silk_SUB_SAT64( opus_int64 a64, opus_int64 b64 ) {
-    opus_int64 res;
+static OAC_INLINE oac_int64 silk_SUB_SAT64( oac_int64 a64, oac_int64 b64 ) {
+    oac_int64 res;
     ops_count += 1;
     res =    ((((a64)-(b64)) & 0x8000000000000000LL) == 0 ?                                                        \
             (( (a64) & ((b64)^0x8000000000000000LL) & 0x8000000000000000LL) ? silk_int64_MIN : (a64)-(b64)) :    \
@@ -596,42 +596,42 @@ static OPUS_INLINE opus_int64 silk_SUB_SAT64( opus_int64 a64, opus_int64 b64 ) {
 }
 
 #undef    silk_SMULWW
-static OPUS_INLINE opus_int32 silk_SMULWW(opus_int32 a32, opus_int32 b32){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_SMULWW(oac_int32 a32, oac_int32 b32){
+    oac_int32 ret;
     /* Nb will be counted in sub-macros*/
     ret = silk_MLA(silk_SMULWB((a32), (b32)), (a32), silk_RSHIFT_ROUND((b32), 16));
     return ret;
 }
 
 #undef    silk_SMLAWW
-static OPUS_INLINE opus_int32 silk_SMLAWW(opus_int32 a32, opus_int32 b32, opus_int32 c32){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_SMLAWW(oac_int32 a32, oac_int32 b32, oac_int32 c32){
+    oac_int32 ret;
     /* Nb will be counted in sub-macros*/
     ret = silk_MLA(silk_SMLAWB((a32), (b32), (c32)), (b32), silk_RSHIFT_ROUND((c32), 16));
     return ret;
 }
 
 #undef    silk_min_int
-static OPUS_INLINE opus_int silk_min_int(opus_int a, opus_int b)
+static OAC_INLINE oac_int silk_min_int(oac_int a, oac_int b)
 {
     ops_count += 1;
     return (((a) < (b)) ? (a) : (b));
 }
 
 #undef    silk_min_16
-static OPUS_INLINE opus_int16 silk_min_16(opus_int16 a, opus_int16 b)
+static OAC_INLINE oac_int16 silk_min_16(oac_int16 a, oac_int16 b)
 {
     ops_count += 1;
     return (((a) < (b)) ? (a) : (b));
 }
 #undef    silk_min_32
-static OPUS_INLINE opus_int32 silk_min_32(opus_int32 a, opus_int32 b)
+static OAC_INLINE oac_int32 silk_min_32(oac_int32 a, oac_int32 b)
 {
     ops_count += 1;
     return (((a) < (b)) ? (a) : (b));
 }
 #undef    silk_min_64
-static OPUS_INLINE opus_int64 silk_min_64(opus_int64 a, opus_int64 b)
+static OAC_INLINE oac_int64 silk_min_64(oac_int64 a, oac_int64 b)
 {
     ops_count += 1;
     return (((a) < (b)) ? (a) : (b));
@@ -639,26 +639,26 @@ static OPUS_INLINE opus_int64 silk_min_64(opus_int64 a, opus_int64 b)
 
 /* silk_min() versions with typecast in the function call */
 #undef    silk_max_int
-static OPUS_INLINE opus_int silk_max_int(opus_int a, opus_int b)
+static OAC_INLINE oac_int silk_max_int(oac_int a, oac_int b)
 {
     ops_count += 1;
     return (((a) > (b)) ? (a) : (b));
 }
 #undef    silk_max_16
-static OPUS_INLINE opus_int16 silk_max_16(opus_int16 a, opus_int16 b)
+static OAC_INLINE oac_int16 silk_max_16(oac_int16 a, oac_int16 b)
 {
     ops_count += 1;
     return (((a) > (b)) ? (a) : (b));
 }
 #undef    silk_max_32
-static OPUS_INLINE opus_int32 silk_max_32(opus_int32 a, opus_int32 b)
+static OAC_INLINE oac_int32 silk_max_32(oac_int32 a, oac_int32 b)
 {
     ops_count += 1;
     return (((a) > (b)) ? (a) : (b));
 }
 
 #undef    silk_max_64
-static OPUS_INLINE opus_int64 silk_max_64(opus_int64 a, opus_int64 b)
+static OAC_INLINE oac_int64 silk_max_64(oac_int64 a, oac_int64 b)
 {
     ops_count += 1;
     return (((a) > (b)) ? (a) : (b));
@@ -666,9 +666,9 @@ static OPUS_INLINE opus_int64 silk_max_64(opus_int64 a, opus_int64 b)
 
 
 #undef silk_LIMIT_int
-static OPUS_INLINE opus_int silk_LIMIT_int(opus_int a, opus_int limit1, opus_int limit2)
+static OAC_INLINE oac_int silk_LIMIT_int(oac_int a, oac_int limit1, oac_int limit2)
 {
-    opus_int ret;
+    oac_int ret;
     ops_count += 6;
 
     ret = ((limit1) > (limit2) ? ((a) > (limit1) ? (limit1) : ((a) < (limit2) ? (limit2) : (a))) \
@@ -678,9 +678,9 @@ static OPUS_INLINE opus_int silk_LIMIT_int(opus_int a, opus_int limit1, opus_int
 }
 
 #undef silk_LIMIT_16
-static OPUS_INLINE opus_int16 silk_LIMIT_16(opus_int16 a, opus_int16 limit1, opus_int16 limit2)
+static OAC_INLINE oac_int16 silk_LIMIT_16(oac_int16 a, oac_int16 limit1, oac_int16 limit2)
 {
-    opus_int16 ret;
+    oac_int16 ret;
     ops_count += 6;
 
     ret = ((limit1) > (limit2) ? ((a) > (limit1) ? (limit1) : ((a) < (limit2) ? (limit2) : (a))) \
@@ -691,9 +691,9 @@ return(ret);
 
 
 #undef silk_LIMIT_32
-static OPUS_INLINE opus_int32 silk_LIMIT_32(opus_int32 a, opus_int32 limit1, opus_int32 limit2)
+static OAC_INLINE oac_int32 silk_LIMIT_32(oac_int32 a, oac_int32 limit1, oac_int32 limit2)
 {
-    opus_int32 ret;
+    oac_int32 ret;
     ops_count += 6;
 
     ret = ((limit1) > (limit2) ? ((a) > (limit1) ? (limit1) : ((a) < (limit2) ? (limit2) : (a))) \
diff --git a/silk/MacroDebug.h b/silk/MacroDebug.h
index 3110da9a7..605eaced4 100644
--- a/silk/MacroDebug.h
+++ b/silk/MacroDebug.h
@@ -36,8 +36,8 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #undef silk_ADD16
 #define silk_ADD16(a,b) silk_ADD16_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int16 silk_ADD16_(opus_int16 a, opus_int16 b, char *file, int line){
-    opus_int16 ret;
+static OAC_INLINE oac_int16 silk_ADD16_(oac_int16 a, oac_int16 b, char *file, int line){
+    oac_int16 ret;
 
     ret = a + b;
     if ( ret != silk_ADD_SAT16( a, b ) )
@@ -52,10 +52,10 @@ static OPUS_INLINE opus_int16 silk_ADD16_(opus_int16 a, opus_int16 b, char *file
 
 #undef silk_ADD32
 #define silk_ADD32(a,b) silk_ADD32_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_ADD32_(opus_int32 a, opus_int32 b, char *file, int line){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_ADD32_(oac_int32 a, oac_int32 b, char *file, int line){
+    oac_int32 ret;
 
-    ret = (opus_int32)((opus_uint32)a + (opus_uint32)b);
+    ret = (oac_int32)((oac_uint32)a + (oac_uint32)b);
     if ( ret != silk_ADD_SAT32( a, b ) )
     {
         fprintf (stderr, "silk_ADD32(%d, %d) in %s: line %d\n", a, b, file, line);
@@ -68,8 +68,8 @@ static OPUS_INLINE opus_int32 silk_ADD32_(opus_int32 a, opus_int32 b, char *file
 
 #undef silk_ADD64
 #define silk_ADD64(a,b) silk_ADD64_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int64 silk_ADD64_(opus_int64 a, opus_int64 b, char *file, int line){
-    opus_int64 ret;
+static OAC_INLINE oac_int64 silk_ADD64_(oac_int64 a, oac_int64 b, char *file, int line){
+    oac_int64 ret;
 
     ret = a + b;
     if ( ret != silk_ADD_SAT64( a, b ) )
@@ -84,8 +84,8 @@ static OPUS_INLINE opus_int64 silk_ADD64_(opus_int64 a, opus_int64 b, char *file
 
 #undef silk_SUB16
 #define silk_SUB16(a,b) silk_SUB16_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int16 silk_SUB16_(opus_int16 a, opus_int16 b, char *file, int line){
-    opus_int16 ret;
+static OAC_INLINE oac_int16 silk_SUB16_(oac_int16 a, oac_int16 b, char *file, int line){
+    oac_int16 ret;
 
     ret = a - b;
     if ( ret != silk_SUB_SAT16( a, b ) )
@@ -100,10 +100,10 @@ static OPUS_INLINE opus_int16 silk_SUB16_(opus_int16 a, opus_int16 b, char *file
 
 #undef silk_SUB32
 #define silk_SUB32(a,b) silk_SUB32_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_SUB32_(opus_int32 a, opus_int32 b, char *file, int line){
-    opus_int64 ret;
+static OAC_INLINE oac_int32 silk_SUB32_(oac_int32 a, oac_int32 b, char *file, int line){
+    oac_int64 ret;
 
-    ret = a - (opus_int64)b;
+    ret = a - (oac_int64)b;
     if ( ret != silk_SUB_SAT32( a, b ) )
     {
         fprintf (stderr, "silk_SUB32(%d, %d) in %s: line %d\n", a, b, file, line);
@@ -116,8 +116,8 @@ static OPUS_INLINE opus_int32 silk_SUB32_(opus_int32 a, opus_int32 b, char *file
 
 #undef silk_SUB64
 #define silk_SUB64(a,b) silk_SUB64_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int64 silk_SUB64_(opus_int64 a, opus_int64 b, char *file, int line){
-    opus_int64 ret;
+static OAC_INLINE oac_int64 silk_SUB64_(oac_int64 a, oac_int64 b, char *file, int line){
+    oac_int64 ret;
 
     ret = a - b;
     if ( ret != silk_SUB_SAT64( a, b ) )
@@ -132,10 +132,10 @@ static OPUS_INLINE opus_int64 silk_SUB64_(opus_int64 a, opus_int64 b, char *file
 
 #undef silk_ADD_SAT16
 #define silk_ADD_SAT16(a,b) silk_ADD_SAT16_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int16 silk_ADD_SAT16_( opus_int16 a16, opus_int16 b16, char *file, int line) {
-    opus_int16 res;
-    res = (opus_int16)silk_SAT16( silk_ADD32( (opus_int32)(a16), (b16) ) );
-    if ( res != silk_SAT16( (opus_int32)a16 + (opus_int32)b16 ) )
+static OAC_INLINE oac_int16 silk_ADD_SAT16_( oac_int16 a16, oac_int16 b16, char *file, int line) {
+    oac_int16 res;
+    res = (oac_int16)silk_SAT16( silk_ADD32( (oac_int32)(a16), (b16) ) );
+    if ( res != silk_SAT16( (oac_int32)a16 + (oac_int32)b16 ) )
     {
         fprintf (stderr, "silk_ADD_SAT16(%d, %d) in %s: line %d\n", a16, b16, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -147,12 +147,12 @@ static OPUS_INLINE opus_int16 silk_ADD_SAT16_( opus_int16 a16, opus_int16 b16, c
 
 #undef silk_ADD_SAT32
 #define silk_ADD_SAT32(a,b) silk_ADD_SAT32_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_ADD_SAT32_(opus_int32 a32, opus_int32 b32, char *file, int line){
-    opus_int32 res;
-    res =   ((((opus_uint32)(a32) + (opus_uint32)(b32)) & 0x80000000) == 0 ?       \
+static OAC_INLINE oac_int32 silk_ADD_SAT32_(oac_int32 a32, oac_int32 b32, char *file, int line){
+    oac_int32 res;
+    res =   ((((oac_uint32)(a32) + (oac_uint32)(b32)) & 0x80000000) == 0 ?       \
             ((((a32) & (b32)) & 0x80000000) != 0 ? silk_int32_MIN : (a32)+(b32)) : \
             ((((a32) | (b32)) & 0x80000000) == 0 ? silk_int32_MAX : (a32)+(b32)) );
-    if ( res != silk_SAT32( (opus_int64)a32 + (opus_int64)b32 ) )
+    if ( res != silk_SAT32( (oac_int64)a32 + (oac_int64)b32 ) )
     {
         fprintf (stderr, "silk_ADD_SAT32(%d, %d) in %s: line %d\n", a32, b32, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -164,8 +164,8 @@ static OPUS_INLINE opus_int32 silk_ADD_SAT32_(opus_int32 a32, opus_int32 b32, ch
 
 #undef silk_ADD_SAT64
 #define silk_ADD_SAT64(a,b) silk_ADD_SAT64_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int64 silk_ADD_SAT64_( opus_int64 a64, opus_int64 b64, char *file, int line) {
-    opus_int64 res;
+static OAC_INLINE oac_int64 silk_ADD_SAT64_( oac_int64 a64, oac_int64 b64, char *file, int line) {
+    oac_int64 res;
     int        fail = 0;
     res =   ((((a64) + (b64)) & 0x8000000000000000LL) == 0 ?                                 \
             ((((a64) & (b64)) & 0x8000000000000000LL) != 0 ? silk_int64_MIN : (a64)+(b64)) : \
@@ -193,10 +193,10 @@ static OPUS_INLINE opus_int64 silk_ADD_SAT64_( opus_int64 a64, opus_int64 b64, c
 
 #undef silk_SUB_SAT16
 #define silk_SUB_SAT16(a,b) silk_SUB_SAT16_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int16 silk_SUB_SAT16_( opus_int16 a16, opus_int16 b16, char *file, int line ) {
-    opus_int16 res;
-    res = (opus_int16)silk_SAT16( silk_SUB32( (opus_int32)(a16), (b16) ) );
-    if ( res != silk_SAT16( (opus_int32)a16 - (opus_int32)b16 ) )
+static OAC_INLINE oac_int16 silk_SUB_SAT16_( oac_int16 a16, oac_int16 b16, char *file, int line ) {
+    oac_int16 res;
+    res = (oac_int16)silk_SAT16( silk_SUB32( (oac_int32)(a16), (b16) ) );
+    if ( res != silk_SAT16( (oac_int32)a16 - (oac_int32)b16 ) )
     {
         fprintf (stderr, "silk_SUB_SAT16(%d, %d) in %s: line %d\n", a16, b16, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -208,12 +208,12 @@ static OPUS_INLINE opus_int16 silk_SUB_SAT16_( opus_int16 a16, opus_int16 b16, c
 
 #undef silk_SUB_SAT32
 #define silk_SUB_SAT32(a,b) silk_SUB_SAT32_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_SUB_SAT32_( opus_int32 a32, opus_int32 b32, char *file, int line ) {
-    opus_int32 res;
-    res =   ((((opus_uint32)(a32)-(opus_uint32)(b32)) & 0x80000000) == 0 ?                \
+static OAC_INLINE oac_int32 silk_SUB_SAT32_( oac_int32 a32, oac_int32 b32, char *file, int line ) {
+    oac_int32 res;
+    res =   ((((oac_uint32)(a32)-(oac_uint32)(b32)) & 0x80000000) == 0 ?                \
             (( (a32) & ((b32)^0x80000000) & 0x80000000) ? silk_int32_MIN : (a32)-(b32)) : \
             ((((a32)^0x80000000) & (b32)  & 0x80000000) ? silk_int32_MAX : (a32)-(b32)) );
-    if ( res != silk_SAT32( (opus_int64)a32 - (opus_int64)b32 ) )
+    if ( res != silk_SAT32( (oac_int64)a32 - (oac_int64)b32 ) )
     {
         fprintf (stderr, "silk_SUB_SAT32(%d, %d) in %s: line %d\n", a32, b32, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -225,8 +225,8 @@ static OPUS_INLINE opus_int32 silk_SUB_SAT32_( opus_int32 a32, opus_int32 b32, c
 
 #undef silk_SUB_SAT64
 #define silk_SUB_SAT64(a,b) silk_SUB_SAT64_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int64 silk_SUB_SAT64_( opus_int64 a64, opus_int64 b64, char *file, int line ) {
-    opus_int64 res;
+static OAC_INLINE oac_int64 silk_SUB_SAT64_( oac_int64 a64, oac_int64 b64, char *file, int line ) {
+    oac_int64 res;
     int        fail = 0;
     res =   ((((a64)-(b64)) & 0x8000000000000000LL) == 0 ?                                                    \
             (( (a64) & ((b64)^0x8000000000000000LL) & 0x8000000000000000LL) ? silk_int64_MIN : (a64)-(b64)) : \
@@ -254,12 +254,12 @@ static OPUS_INLINE opus_int64 silk_SUB_SAT64_( opus_int64 a64, opus_int64 b64, c
 
 #undef silk_MUL
 #define silk_MUL(a,b) silk_MUL_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_MUL_(opus_int32 a32, opus_int32 b32, char *file, int line){
-    opus_int32 ret;
-    opus_int64 ret64;
-    ret = (opus_int32)((opus_uint32)a32 * (opus_uint32)b32);
-    ret64 = (opus_int64)a32 * (opus_int64)b32;
-    if ( (opus_int64)ret != ret64 )
+static OAC_INLINE oac_int32 silk_MUL_(oac_int32 a32, oac_int32 b32, char *file, int line){
+    oac_int32 ret;
+    oac_int64 ret64;
+    ret = (oac_int32)((oac_uint32)a32 * (oac_uint32)b32);
+    ret64 = (oac_int64)a32 * (oac_int64)b32;
+    if ( (oac_int64)ret != ret64 )
     {
         fprintf (stderr, "silk_MUL(%d, %d) in %s: line %d\n", a32, b32, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -271,10 +271,10 @@ static OPUS_INLINE opus_int32 silk_MUL_(opus_int32 a32, opus_int32 b32, char *fi
 
 #undef silk_MUL_uint
 #define silk_MUL_uint(a,b) silk_MUL_uint_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_uint32 silk_MUL_uint_(opus_uint32 a32, opus_uint32 b32, char *file, int line){
-    opus_uint32 ret;
+static OAC_INLINE oac_uint32 silk_MUL_uint_(oac_uint32 a32, oac_uint32 b32, char *file, int line){
+    oac_uint32 ret;
     ret = a32 * b32;
-    if ( (opus_uint64)ret != (opus_uint64)a32 * (opus_uint64)b32 )
+    if ( (oac_uint64)ret != (oac_uint64)a32 * (oac_uint64)b32 )
     {
         fprintf (stderr, "silk_MUL_uint(%u, %u) in %s: line %d\n", a32, b32, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -286,10 +286,10 @@ static OPUS_INLINE opus_uint32 silk_MUL_uint_(opus_uint32 a32, opus_uint32 b32,
 
 #undef silk_MLA
 #define silk_MLA(a,b,c) silk_MLA_((a), (b), (c), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_MLA_(opus_int32 a32, opus_int32 b32, opus_int32 c32, char *file, int line){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_MLA_(oac_int32 a32, oac_int32 b32, oac_int32 c32, char *file, int line){
+    oac_int32 ret;
     ret = a32 + b32 * c32;
-    if ( (opus_int64)ret != (opus_int64)a32 + (opus_int64)b32 * (opus_int64)c32 )
+    if ( (oac_int64)ret != (oac_int64)a32 + (oac_int64)b32 * (oac_int64)c32 )
     {
         fprintf (stderr, "silk_MLA(%d, %d, %d) in %s: line %d\n", a32, b32, c32, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -301,10 +301,10 @@ static OPUS_INLINE opus_int32 silk_MLA_(opus_int32 a32, opus_int32 b32, opus_int
 
 #undef silk_MLA_uint
 #define silk_MLA_uint(a,b,c) silk_MLA_uint_((a), (b), (c), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_MLA_uint_(opus_uint32 a32, opus_uint32 b32, opus_uint32 c32, char *file, int line){
-    opus_uint32 ret;
+static OAC_INLINE oac_int32 silk_MLA_uint_(oac_uint32 a32, oac_uint32 b32, oac_uint32 c32, char *file, int line){
+    oac_uint32 ret;
     ret = a32 + b32 * c32;
-    if ( (opus_int64)ret != (opus_int64)a32 + (opus_int64)b32 * (opus_int64)c32 )
+    if ( (oac_int64)ret != (oac_int64)a32 + (oac_int64)b32 * (oac_int64)c32 )
     {
         fprintf (stderr, "silk_MLA_uint(%d, %d, %d) in %s: line %d\n", a32, b32, c32, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -316,10 +316,10 @@ static OPUS_INLINE opus_int32 silk_MLA_uint_(opus_uint32 a32, opus_uint32 b32, o
 
 #undef silk_SMULWB
 #define silk_SMULWB(a,b) silk_SMULWB_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_SMULWB_(opus_int32 a32, opus_int32 b32, char *file, int line){
-    opus_int32 ret;
-    ret = (a32 >> 16) * (opus_int32)((opus_int16)b32) + (((a32 & 0x0000FFFF) * (opus_int32)((opus_int16)b32)) >> 16);
-    if ( (opus_int64)ret != ((opus_int64)a32 * (opus_int16)b32) >> 16 )
+static OAC_INLINE oac_int32 silk_SMULWB_(oac_int32 a32, oac_int32 b32, char *file, int line){
+    oac_int32 ret;
+    ret = (a32 >> 16) * (oac_int32)((oac_int16)b32) + (((a32 & 0x0000FFFF) * (oac_int32)((oac_int16)b32)) >> 16);
+    if ( (oac_int64)ret != ((oac_int64)a32 * (oac_int16)b32) >> 16 )
     {
         fprintf (stderr, "silk_SMULWB(%d, %d) in %s: line %d\n", a32, b32, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -331,8 +331,8 @@ static OPUS_INLINE opus_int32 silk_SMULWB_(opus_int32 a32, opus_int32 b32, char
 
 #undef silk_SMLAWB
 #define silk_SMLAWB(a,b,c) silk_SMLAWB_((a), (b), (c), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_SMLAWB_(opus_int32 a32, opus_int32 b32, opus_int32 c32, char *file, int line){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_SMLAWB_(oac_int32 a32, oac_int32 b32, oac_int32 c32, char *file, int line){
+    oac_int32 ret;
     ret = silk_ADD32_ovflw( a32, silk_SMULWB( b32, c32 ) );
     if ( ret != silk_ADD_SAT32( a32, silk_SMULWB( b32, c32 ) ) )
     {
@@ -346,10 +346,10 @@ static OPUS_INLINE opus_int32 silk_SMLAWB_(opus_int32 a32, opus_int32 b32, opus_
 
 #undef silk_SMULWT
 #define silk_SMULWT(a,b) silk_SMULWT_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_SMULWT_(opus_int32 a32, opus_int32 b32, char *file, int line){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_SMULWT_(oac_int32 a32, oac_int32 b32, char *file, int line){
+    oac_int32 ret;
     ret = (a32 >> 16) * (b32 >> 16) + (((a32 & 0x0000FFFF) * (b32 >> 16)) >> 16);
-    if ( (opus_int64)ret != ((opus_int64)a32 * (b32 >> 16)) >> 16 )
+    if ( (oac_int64)ret != ((oac_int64)a32 * (b32 >> 16)) >> 16 )
     {
         fprintf (stderr, "silk_SMULWT(%d, %d) in %s: line %d\n", a32, b32, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -361,10 +361,10 @@ static OPUS_INLINE opus_int32 silk_SMULWT_(opus_int32 a32, opus_int32 b32, char
 
 #undef silk_SMLAWT
 #define silk_SMLAWT(a,b,c) silk_SMLAWT_((a), (b), (c), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_SMLAWT_(opus_int32 a32, opus_int32 b32, opus_int32 c32, char *file, int line){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_SMLAWT_(oac_int32 a32, oac_int32 b32, oac_int32 c32, char *file, int line){
+    oac_int32 ret;
     ret = a32 + ((b32 >> 16) * (c32 >> 16)) + (((b32 & 0x0000FFFF) * ((c32 >> 16)) >> 16));
-    if ( (opus_int64)ret != (opus_int64)a32 + (((opus_int64)b32 * (c32 >> 16)) >> 16) )
+    if ( (oac_int64)ret != (oac_int64)a32 + (((oac_int64)b32 * (c32 >> 16)) >> 16) )
     {
         fprintf (stderr, "silk_SMLAWT(%d, %d, %d) in %s: line %d\n", a32, b32, c32, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -376,8 +376,8 @@ static OPUS_INLINE opus_int32 silk_SMLAWT_(opus_int32 a32, opus_int32 b32, opus_
 
 #undef silk_SMULL
 #define silk_SMULL(a,b) silk_SMULL_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int64 silk_SMULL_(opus_int64 a64, opus_int64 b64, char *file, int line){
-    opus_int64 ret64;
+static OAC_INLINE oac_int64 silk_SMULL_(oac_int64 a64, oac_int64 b64, char *file, int line){
+    oac_int64 ret64;
     int        fail = 0;
     ret64 = a64 * b64;
     if( b64 != 0 ) {
@@ -398,10 +398,10 @@ static OPUS_INLINE opus_int64 silk_SMULL_(opus_int64 a64, opus_int64 b64, char *
 /* no checking needed for silk_SMULBB */
 #undef silk_SMLABB
 #define silk_SMLABB(a,b,c) silk_SMLABB_((a), (b), (c), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_SMLABB_(opus_int32 a32, opus_int32 b32, opus_int32 c32, char *file, int line){
-    opus_int32 ret;
-    ret = a32 + (opus_int32)((opus_int16)b32) * (opus_int32)((opus_int16)c32);
-    if ( (opus_int64)ret != (opus_int64)a32 + (opus_int64)b32 * (opus_int16)c32 )
+static OAC_INLINE oac_int32 silk_SMLABB_(oac_int32 a32, oac_int32 b32, oac_int32 c32, char *file, int line){
+    oac_int32 ret;
+    ret = a32 + (oac_int32)((oac_int16)b32) * (oac_int32)((oac_int16)c32);
+    if ( (oac_int64)ret != (oac_int64)a32 + (oac_int64)b32 * (oac_int16)c32 )
     {
         fprintf (stderr, "silk_SMLABB(%d, %d, %d) in %s: line %d\n", a32, b32, c32, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -414,10 +414,10 @@ static OPUS_INLINE opus_int32 silk_SMLABB_(opus_int32 a32, opus_int32 b32, opus_
 /* no checking needed for silk_SMULBT */
 #undef silk_SMLABT
 #define silk_SMLABT(a,b,c) silk_SMLABT_((a), (b), (c), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_SMLABT_(opus_int32 a32, opus_int32 b32, opus_int32 c32, char *file, int line){
-    opus_int32 ret;
-    ret = a32 + ((opus_int32)((opus_int16)b32)) * (c32 >> 16);
-    if ( (opus_int64)ret != (opus_int64)a32 + (opus_int64)b32 * (c32 >> 16) )
+static OAC_INLINE oac_int32 silk_SMLABT_(oac_int32 a32, oac_int32 b32, oac_int32 c32, char *file, int line){
+    oac_int32 ret;
+    ret = a32 + ((oac_int32)((oac_int16)b32)) * (c32 >> 16);
+    if ( (oac_int64)ret != (oac_int64)a32 + (oac_int64)b32 * (c32 >> 16) )
     {
         fprintf (stderr, "silk_SMLABT(%d, %d, %d) in %s: line %d\n", a32, b32, c32, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -430,10 +430,10 @@ static OPUS_INLINE opus_int32 silk_SMLABT_(opus_int32 a32, opus_int32 b32, opus_
 /* no checking needed for silk_SMULTT */
 #undef silk_SMLATT
 #define silk_SMLATT(a,b,c) silk_SMLATT_((a), (b), (c), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_SMLATT_(opus_int32 a32, opus_int32 b32, opus_int32 c32, char *file, int line){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_SMLATT_(oac_int32 a32, oac_int32 b32, oac_int32 c32, char *file, int line){
+    oac_int32 ret;
     ret = a32 + (b32 >> 16) * (c32 >> 16);
-    if ( (opus_int64)ret != (opus_int64)a32 + (b32 >> 16) * (c32 >> 16) )
+    if ( (oac_int64)ret != (oac_int64)a32 + (b32 >> 16) * (c32 >> 16) )
     {
         fprintf (stderr, "silk_SMLATT(%d, %d, %d) in %s: line %d\n", a32, b32, c32, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -445,23 +445,23 @@ static OPUS_INLINE opus_int32 silk_SMLATT_(opus_int32 a32, opus_int32 b32, opus_
 
 #undef silk_SMULWW
 #define silk_SMULWW(a,b) silk_SMULWW_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_SMULWW_(opus_int32 a32, opus_int32 b32, char *file, int line){
-    opus_int32 ret, tmp1, tmp2;
-    opus_int64 ret64;
+static OAC_INLINE oac_int32 silk_SMULWW_(oac_int32 a32, oac_int32 b32, char *file, int line){
+    oac_int32 ret, tmp1, tmp2;
+    oac_int64 ret64;
     int        fail = 0;
 
     ret  = silk_SMULWB( a32, b32 );
     tmp1 = silk_RSHIFT_ROUND( b32, 16 );
     tmp2 = silk_MUL( a32, tmp1 );
 
-    fail |= (opus_int64)tmp2 != (opus_int64) a32 * (opus_int64) tmp1;
+    fail |= (oac_int64)tmp2 != (oac_int64) a32 * (oac_int64) tmp1;
 
     tmp1 = ret;
     ret  = silk_ADD32( tmp1, tmp2 );
     fail |= silk_ADD32( tmp1, tmp2 ) != silk_ADD_SAT32( tmp1, tmp2 );
 
     ret64 = silk_RSHIFT64( silk_SMULL( a32, b32 ), 16 );
-    fail |= (opus_int64)ret != ret64;
+    fail |= (oac_int64)ret != ret64;
 
     if ( fail )
     {
@@ -476,8 +476,8 @@ static OPUS_INLINE opus_int32 silk_SMULWW_(opus_int32 a32, opus_int32 b32, char
 
 #undef silk_SMLAWW
 #define silk_SMLAWW(a,b,c) silk_SMLAWW_((a), (b), (c), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_SMLAWW_(opus_int32 a32, opus_int32 b32, opus_int32 c32, char *file, int line){
-    opus_int32 ret, tmp;
+static OAC_INLINE oac_int32 silk_SMLAWW_(oac_int32 a32, oac_int32 b32, oac_int32 c32, char *file, int line){
+    oac_int32 ret, tmp;
 
     tmp = silk_SMULWW( b32, c32 );
     ret = silk_ADD32( a32, tmp );
@@ -499,7 +499,7 @@ static OPUS_INLINE opus_int32 silk_SMLAWW_(opus_int32 a32, opus_int32 b32, opus_
 
 #undef silk_DIV32
 #define silk_DIV32(a,b) silk_DIV32_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_DIV32_(opus_int32 a32, opus_int32 b32, char *file, int line){
+static OAC_INLINE oac_int32 silk_DIV32_(oac_int32 a32, oac_int32 b32, char *file, int line){
     if ( b32 == 0 )
     {
         fprintf (stderr, "silk_DIV32(%d, %d) in %s: line %d\n", a32, b32, file, line);
@@ -512,7 +512,7 @@ static OPUS_INLINE opus_int32 silk_DIV32_(opus_int32 a32, opus_int32 b32, char *
 
 #undef silk_DIV32_16
 #define silk_DIV32_16(a,b) silk_DIV32_16_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_DIV32_16_(opus_int32 a32, opus_int32 b32, char *file, int line){
+static OAC_INLINE oac_int32 silk_DIV32_16_(oac_int32 a32, oac_int32 b32, char *file, int line){
     int fail = 0;
     fail |= b32 == 0;
     fail |= b32 > silk_int16_MAX;
@@ -537,13 +537,13 @@ static OPUS_INLINE opus_int32 silk_DIV32_16_(opus_int32 a32, opus_int32 b32, cha
 
 #undef silk_LSHIFT8
 #define silk_LSHIFT8(a,b) silk_LSHIFT8_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int8 silk_LSHIFT8_(opus_int8 a, opus_int32 shift, char *file, int line){
-    opus_int8 ret;
+static OAC_INLINE oac_int8 silk_LSHIFT8_(oac_int8 a, oac_int32 shift, char *file, int line){
+    oac_int8 ret;
     int       fail = 0;
-    ret = (opus_int8)((opus_uint8)a << shift);
+    ret = (oac_int8)((oac_uint8)a << shift);
     fail |= shift < 0;
     fail |= shift >= 8;
-    fail |= (opus_int64)ret != (opus_int64)(((opus_uint64)a) << shift);
+    fail |= (oac_int64)ret != (oac_int64)(((oac_uint64)a) << shift);
     if ( fail )
     {
         fprintf (stderr, "silk_LSHIFT8(%d, %d) in %s: line %d\n", a, shift, file, line);
@@ -556,13 +556,13 @@ static OPUS_INLINE opus_int8 silk_LSHIFT8_(opus_int8 a, opus_int32 shift, char *
 
 #undef silk_LSHIFT16
 #define silk_LSHIFT16(a,b) silk_LSHIFT16_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int16 silk_LSHIFT16_(opus_int16 a, opus_int32 shift, char *file, int line){
-    opus_int16 ret;
+static OAC_INLINE oac_int16 silk_LSHIFT16_(oac_int16 a, oac_int32 shift, char *file, int line){
+    oac_int16 ret;
     int        fail = 0;
-    ret = (opus_int16)((opus_uint16)a << shift);
+    ret = (oac_int16)((oac_uint16)a << shift);
     fail |= shift < 0;
     fail |= shift >= 16;
-    fail |= (opus_int64)ret != (opus_int64)(((opus_uint64)a) << shift);
+    fail |= (oac_int64)ret != (oac_int64)(((oac_uint64)a) << shift);
     if ( fail )
     {
         fprintf (stderr, "silk_LSHIFT16(%d, %d) in %s: line %d\n", a, shift, file, line);
@@ -575,13 +575,13 @@ static OPUS_INLINE opus_int16 silk_LSHIFT16_(opus_int16 a, opus_int32 shift, cha
 
 #undef silk_LSHIFT32
 #define silk_LSHIFT32(a,b) silk_LSHIFT32_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_LSHIFT32_(opus_int32 a, opus_int32 shift, char *file, int line){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_LSHIFT32_(oac_int32 a, oac_int32 shift, char *file, int line){
+    oac_int32 ret;
     int        fail = 0;
-    ret = (opus_int32)((opus_uint32)a << shift);
+    ret = (oac_int32)((oac_uint32)a << shift);
     fail |= shift < 0;
     fail |= shift >= 32;
-    fail |= (opus_int64)ret != (opus_int64)(((opus_uint64)a) << shift);
+    fail |= (oac_int64)ret != (oac_int64)(((oac_uint64)a) << shift);
     if ( fail )
     {
         fprintf (stderr, "silk_LSHIFT32(%d, %d) in %s: line %d\n", a, shift, file, line);
@@ -594,13 +594,13 @@ static OPUS_INLINE opus_int32 silk_LSHIFT32_(opus_int32 a, opus_int32 shift, cha
 
 #undef silk_LSHIFT64
 #define silk_LSHIFT64(a,b) silk_LSHIFT64_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int64 silk_LSHIFT64_(opus_int64 a, opus_int shift, char *file, int line){
-    opus_int64 ret;
+static OAC_INLINE oac_int64 silk_LSHIFT64_(oac_int64 a, oac_int shift, char *file, int line){
+    oac_int64 ret;
     int        fail = 0;
-    ret = (opus_int64)((opus_uint64)a << shift);
+    ret = (oac_int64)((oac_uint64)a << shift);
     fail |= shift < 0;
     fail |= shift >= 64;
-    fail |= (ret>>shift) != ((opus_int64)a);
+    fail |= (ret>>shift) != ((oac_int64)a);
     if ( fail )
     {
         fprintf (stderr, "silk_LSHIFT64(%lld, %d) in %s: line %d\n", (long long)a, shift, file, line);
@@ -613,7 +613,7 @@ static OPUS_INLINE opus_int64 silk_LSHIFT64_(opus_int64 a, opus_int shift, char
 
 #undef silk_LSHIFT_ovflw
 #define silk_LSHIFT_ovflw(a,b) silk_LSHIFT_ovflw_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_LSHIFT_ovflw_(opus_int32 a, opus_int32 shift, char *file, int line){
+static OAC_INLINE oac_int32 silk_LSHIFT_ovflw_(oac_int32 a, oac_int32 shift, char *file, int line){
     if ( (shift < 0) || (shift >= 32) ) /* no check for overflow */
     {
         fprintf (stderr, "silk_LSHIFT_ovflw(%d, %d) in %s: line %d\n", a, shift, file, line);
@@ -626,10 +626,10 @@ static OPUS_INLINE opus_int32 silk_LSHIFT_ovflw_(opus_int32 a, opus_int32 shift,
 
 #undef silk_LSHIFT_uint
 #define silk_LSHIFT_uint(a,b) silk_LSHIFT_uint_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_uint32 silk_LSHIFT_uint_(opus_uint32 a, opus_int32 shift, char *file, int line){
-    opus_uint32 ret;
+static OAC_INLINE oac_uint32 silk_LSHIFT_uint_(oac_uint32 a, oac_int32 shift, char *file, int line){
+    oac_uint32 ret;
     ret = a << shift;
-    if ( (shift < 0) || ((opus_int64)ret != ((opus_int64)a) << shift))
+    if ( (shift < 0) || ((oac_int64)ret != ((oac_int64)a) << shift))
     {
         fprintf (stderr, "silk_LSHIFT_uint(%u, %d) in %s: line %d\n", a, shift, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -641,7 +641,7 @@ static OPUS_INLINE opus_uint32 silk_LSHIFT_uint_(opus_uint32 a, opus_int32 shift
 
 #undef silk_RSHIFT8
 #define silk_RSHITF8(a,b) silk_RSHIFT8_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int8 silk_RSHIFT8_(opus_int8 a, opus_int32 shift, char *file, int line){
+static OAC_INLINE oac_int8 silk_RSHIFT8_(oac_int8 a, oac_int32 shift, char *file, int line){
     if ( (shift < 0) || (shift>=8) )
     {
         fprintf (stderr, "silk_RSHITF8(%d, %d) in %s: line %d\n", a, shift, file, line);
@@ -654,7 +654,7 @@ static OPUS_INLINE opus_int8 silk_RSHIFT8_(opus_int8 a, opus_int32 shift, char *
 
 #undef silk_RSHIFT16
 #define silk_RSHITF16(a,b) silk_RSHIFT16_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int16 silk_RSHIFT16_(opus_int16 a, opus_int32 shift, char *file, int line){
+static OAC_INLINE oac_int16 silk_RSHIFT16_(oac_int16 a, oac_int32 shift, char *file, int line){
     if ( (shift < 0) || (shift>=16) )
     {
         fprintf (stderr, "silk_RSHITF16(%d, %d) in %s: line %d\n", a, shift, file, line);
@@ -667,7 +667,7 @@ static OPUS_INLINE opus_int16 silk_RSHIFT16_(opus_int16 a, opus_int32 shift, cha
 
 #undef silk_RSHIFT32
 #define silk_RSHIFT32(a,b) silk_RSHIFT32_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_RSHIFT32_(opus_int32 a, opus_int32 shift, char *file, int line){
+static OAC_INLINE oac_int32 silk_RSHIFT32_(oac_int32 a, oac_int32 shift, char *file, int line){
     if ( (shift < 0) || (shift>=32) )
     {
         fprintf (stderr, "silk_RSHITF32(%d, %d) in %s: line %d\n", a, shift, file, line);
@@ -680,7 +680,7 @@ static OPUS_INLINE opus_int32 silk_RSHIFT32_(opus_int32 a, opus_int32 shift, cha
 
 #undef silk_RSHIFT64
 #define silk_RSHIFT64(a,b) silk_RSHIFT64_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int64 silk_RSHIFT64_(opus_int64 a, opus_int64 shift, char *file, int line){
+static OAC_INLINE oac_int64 silk_RSHIFT64_(oac_int64 a, oac_int64 shift, char *file, int line){
     if ( (shift < 0) || (shift>=64) )
     {
         fprintf (stderr, "silk_RSHITF64(%lld, %lld) in %s: line %d\n", (long long)a, (long long)shift, file, line);
@@ -693,7 +693,7 @@ static OPUS_INLINE opus_int64 silk_RSHIFT64_(opus_int64 a, opus_int64 shift, cha
 
 #undef silk_RSHIFT_uint
 #define silk_RSHIFT_uint(a,b) silk_RSHIFT_uint_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_uint32 silk_RSHIFT_uint_(opus_uint32 a, opus_int32 shift, char *file, int line){
+static OAC_INLINE oac_uint32 silk_RSHIFT_uint_(oac_uint32 a, oac_int32 shift, char *file, int line){
     if ( (shift < 0) || (shift>32) )
     {
         fprintf (stderr, "silk_RSHIFT_uint(%u, %d) in %s: line %d\n", a, shift, file, line);
@@ -706,10 +706,10 @@ static OPUS_INLINE opus_uint32 silk_RSHIFT_uint_(opus_uint32 a, opus_int32 shift
 
 #undef silk_ADD_LSHIFT
 #define silk_ADD_LSHIFT(a,b,c) silk_ADD_LSHIFT_((a), (b), (c), __FILE__, __LINE__)
-static OPUS_INLINE int silk_ADD_LSHIFT_(int a, int b, int shift, char *file, int line){
-    opus_int16 ret;
-    ret = a + (opus_int16)((opus_uint16)b << shift);
-    if ( (shift < 0) || (shift>15) || ((opus_int64)ret != (opus_int64)a + (opus_int64)(((opus_uint64)b) << shift)) )
+static OAC_INLINE int silk_ADD_LSHIFT_(int a, int b, int shift, char *file, int line){
+    oac_int16 ret;
+    ret = a + (oac_int16)((oac_uint16)b << shift);
+    if ( (shift < 0) || (shift>15) || ((oac_int64)ret != (oac_int64)a + (oac_int64)(((oac_uint64)b) << shift)) )
     {
         fprintf (stderr, "silk_ADD_LSHIFT(%d, %d, %d) in %s: line %d\n", a, b, shift, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -721,10 +721,10 @@ static OPUS_INLINE int silk_ADD_LSHIFT_(int a, int b, int shift, char *file, int
 
 #undef silk_ADD_LSHIFT32
 #define silk_ADD_LSHIFT32(a,b,c) silk_ADD_LSHIFT32_((a), (b), (c), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_ADD_LSHIFT32_(opus_int32 a, opus_int32 b, opus_int32 shift, char *file, int line){
-    opus_int32 ret;
-    ret = silk_ADD32_ovflw(a, (opus_int32)((opus_uint32)b << shift));
-    if ( (shift < 0) || (shift>31) || ((opus_int64)ret != (opus_int64)a + (opus_int64)(((opus_uint64)b) << shift)) )
+static OAC_INLINE oac_int32 silk_ADD_LSHIFT32_(oac_int32 a, oac_int32 b, oac_int32 shift, char *file, int line){
+    oac_int32 ret;
+    ret = silk_ADD32_ovflw(a, (oac_int32)((oac_uint32)b << shift));
+    if ( (shift < 0) || (shift>31) || ((oac_int64)ret != (oac_int64)a + (oac_int64)(((oac_uint64)b) << shift)) )
     {
         fprintf (stderr, "silk_ADD_LSHIFT32(%d, %d, %d) in %s: line %d\n", a, b, shift, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -736,10 +736,10 @@ static OPUS_INLINE opus_int32 silk_ADD_LSHIFT32_(opus_int32 a, opus_int32 b, opu
 
 #undef silk_ADD_LSHIFT_uint
 #define silk_ADD_LSHIFT_uint(a,b,c) silk_ADD_LSHIFT_uint_((a), (b), (c), __FILE__, __LINE__)
-static OPUS_INLINE opus_uint32 silk_ADD_LSHIFT_uint_(opus_uint32 a, opus_uint32 b, opus_int32 shift, char *file, int line){
-    opus_uint32 ret;
+static OAC_INLINE oac_uint32 silk_ADD_LSHIFT_uint_(oac_uint32 a, oac_uint32 b, oac_int32 shift, char *file, int line){
+    oac_uint32 ret;
     ret = a + (b << shift);
-    if ( (shift < 0) || (shift>32) || ((opus_int64)ret != (opus_int64)a + (((opus_int64)b) << shift)) )
+    if ( (shift < 0) || (shift>32) || ((oac_int64)ret != (oac_int64)a + (((oac_int64)b) << shift)) )
     {
         fprintf (stderr, "silk_ADD_LSHIFT_uint(%u, %u, %d) in %s: line %d\n", a, b, shift, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -751,10 +751,10 @@ static OPUS_INLINE opus_uint32 silk_ADD_LSHIFT_uint_(opus_uint32 a, opus_uint32
 
 #undef silk_ADD_RSHIFT
 #define silk_ADD_RSHIFT(a,b,c) silk_ADD_RSHIFT_((a), (b), (c), __FILE__, __LINE__)
-static OPUS_INLINE int silk_ADD_RSHIFT_(int a, int b, int shift, char *file, int line){
-    opus_int16 ret;
+static OAC_INLINE int silk_ADD_RSHIFT_(int a, int b, int shift, char *file, int line){
+    oac_int16 ret;
     ret = a + (b >> shift);
-    if ( (shift < 0) || (shift>15) || ((opus_int64)ret != (opus_int64)a + (((opus_int64)b) >> shift)) )
+    if ( (shift < 0) || (shift>15) || ((oac_int64)ret != (oac_int64)a + (((oac_int64)b) >> shift)) )
     {
         fprintf (stderr, "silk_ADD_RSHIFT(%d, %d, %d) in %s: line %d\n", a, b, shift, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -766,10 +766,10 @@ static OPUS_INLINE int silk_ADD_RSHIFT_(int a, int b, int shift, char *file, int
 
 #undef silk_ADD_RSHIFT32
 #define silk_ADD_RSHIFT32(a,b,c) silk_ADD_RSHIFT32_((a), (b), (c), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_ADD_RSHIFT32_(opus_int32 a, opus_int32 b, opus_int32 shift, char *file, int line){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_ADD_RSHIFT32_(oac_int32 a, oac_int32 b, oac_int32 shift, char *file, int line){
+    oac_int32 ret;
     ret = silk_ADD32_ovflw(a, (b >> shift));
-    if ( (shift < 0) || (shift>31) || ((opus_int64)ret != (opus_int64)a + (((opus_int64)b) >> shift)) )
+    if ( (shift < 0) || (shift>31) || ((oac_int64)ret != (oac_int64)a + (((oac_int64)b) >> shift)) )
     {
         fprintf (stderr, "silk_ADD_RSHIFT32(%d, %d, %d) in %s: line %d\n", a, b, shift, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -781,10 +781,10 @@ static OPUS_INLINE opus_int32 silk_ADD_RSHIFT32_(opus_int32 a, opus_int32 b, opu
 
 #undef silk_ADD_RSHIFT_uint
 #define silk_ADD_RSHIFT_uint(a,b,c) silk_ADD_RSHIFT_uint_((a), (b), (c), __FILE__, __LINE__)
-static OPUS_INLINE opus_uint32 silk_ADD_RSHIFT_uint_(opus_uint32 a, opus_uint32 b, opus_int32 shift, char *file, int line){
-    opus_uint32 ret;
+static OAC_INLINE oac_uint32 silk_ADD_RSHIFT_uint_(oac_uint32 a, oac_uint32 b, oac_int32 shift, char *file, int line){
+    oac_uint32 ret;
     ret = a + (b >> shift);
-    if ( (shift < 0) || (shift>32) || ((opus_int64)ret != (opus_int64)a + (((opus_int64)b) >> shift)) )
+    if ( (shift < 0) || (shift>32) || ((oac_int64)ret != (oac_int64)a + (((oac_int64)b) >> shift)) )
     {
         fprintf (stderr, "silk_ADD_RSHIFT_uint(%u, %u, %d) in %s: line %d\n", a, b, shift, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -796,10 +796,10 @@ static OPUS_INLINE opus_uint32 silk_ADD_RSHIFT_uint_(opus_uint32 a, opus_uint32
 
 #undef silk_SUB_LSHIFT32
 #define silk_SUB_LSHIFT32(a,b,c) silk_SUB_LSHIFT32_((a), (b), (c), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_SUB_LSHIFT32_(opus_int32 a, opus_int32 b, opus_int32 shift, char *file, int line){
-    opus_int32 ret;
-    ret = silk_SUB32_ovflw(a, (opus_int32)((opus_uint32)b << shift));
-    if ( (shift < 0) || (shift>31) || ((opus_int64)ret != (opus_int64)a - (opus_int64)(((opus_uint64)b) << shift)) )
+static OAC_INLINE oac_int32 silk_SUB_LSHIFT32_(oac_int32 a, oac_int32 b, oac_int32 shift, char *file, int line){
+    oac_int32 ret;
+    ret = silk_SUB32_ovflw(a, (oac_int32)((oac_uint32)b << shift));
+    if ( (shift < 0) || (shift>31) || ((oac_int64)ret != (oac_int64)a - (oac_int64)(((oac_uint64)b) << shift)) )
     {
         fprintf (stderr, "silk_SUB_LSHIFT32(%d, %d, %d) in %s: line %d\n", a, b, shift, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -811,10 +811,10 @@ static OPUS_INLINE opus_int32 silk_SUB_LSHIFT32_(opus_int32 a, opus_int32 b, opu
 
 #undef silk_SUB_RSHIFT32
 #define silk_SUB_RSHIFT32(a,b,c) silk_SUB_RSHIFT32_((a), (b), (c), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_SUB_RSHIFT32_(opus_int32 a, opus_int32 b, opus_int32 shift, char *file, int line){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_SUB_RSHIFT32_(oac_int32 a, oac_int32 b, oac_int32 shift, char *file, int line){
+    oac_int32 ret;
     ret = silk_SUB32_ovflw(a, (b >> shift));
-    if ( (shift < 0) || (shift>31) || ((opus_int64)ret != (opus_int64)a - (((opus_int64)b) >> shift)) )
+    if ( (shift < 0) || (shift>31) || ((oac_int64)ret != (oac_int64)a - (((oac_int64)b) >> shift)) )
     {
         fprintf (stderr, "silk_SUB_RSHIFT32(%d, %d, %d) in %s: line %d\n", a, b, shift, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -826,11 +826,11 @@ static OPUS_INLINE opus_int32 silk_SUB_RSHIFT32_(opus_int32 a, opus_int32 b, opu
 
 #undef silk_RSHIFT_ROUND
 #define silk_RSHIFT_ROUND(a,b) silk_RSHIFT_ROUND_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_RSHIFT_ROUND_(opus_int32 a, opus_int32 shift, char *file, int line){
-    opus_int32 ret;
+static OAC_INLINE oac_int32 silk_RSHIFT_ROUND_(oac_int32 a, oac_int32 shift, char *file, int line){
+    oac_int32 ret;
     ret = shift == 1 ? (a >> 1) + (a & 1) : ((a >> (shift - 1)) + 1) >> 1;
     /* the macro definition can't handle a shift of zero */
-    if ( (shift <= 0) || (shift>31) || ((opus_int64)ret != ((opus_int64)a + ((opus_int64)1 << (shift - 1))) >> shift) )
+    if ( (shift <= 0) || (shift>31) || ((oac_int64)ret != ((oac_int64)a + ((oac_int64)1 << (shift - 1))) >> shift) )
     {
         fprintf (stderr, "silk_RSHIFT_ROUND(%d, %d) in %s: line %d\n", a, shift, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -842,8 +842,8 @@ static OPUS_INLINE opus_int32 silk_RSHIFT_ROUND_(opus_int32 a, opus_int32 shift,
 
 #undef silk_RSHIFT_ROUND64
 #define silk_RSHIFT_ROUND64(a,b) silk_RSHIFT_ROUND64_((a), (b), __FILE__, __LINE__)
-static OPUS_INLINE opus_int64 silk_RSHIFT_ROUND64_(opus_int64 a, opus_int32 shift, char *file, int line){
-    opus_int64 ret;
+static OAC_INLINE oac_int64 silk_RSHIFT_ROUND64_(oac_int64 a, oac_int32 shift, char *file, int line){
+    oac_int64 ret;
     /* the macro definition can't handle a shift of zero */
     if ( (shift <= 0) || (shift>=64) )
     {
@@ -858,14 +858,14 @@ static OPUS_INLINE opus_int64 silk_RSHIFT_ROUND64_(opus_int64 a, opus_int32 shif
 
 /* silk_abs is used on floats also, so doesn't work... */
 /*#undef silk_abs
-static OPUS_INLINE opus_int32 silk_abs(opus_int32 a){
+static OAC_INLINE oac_int32 silk_abs(oac_int32 a){
     silk_assert(a != 0x80000000);
     return (((a) >  0)  ? (a) : -(a));            // Be careful, silk_abs returns wrong when input equals to silk_intXX_MIN
 }*/
 
 #undef silk_abs_int64
 #define silk_abs_int64(a) silk_abs_int64_((a), __FILE__, __LINE__)
-static OPUS_INLINE opus_int64 silk_abs_int64_(opus_int64 a, char *file, int line){
+static OAC_INLINE oac_int64 silk_abs_int64_(oac_int64 a, char *file, int line){
     if ( a == silk_int64_MIN )
     {
         fprintf (stderr, "silk_abs_int64(%lld) in %s: line %d\n", (long long)a, file, line);
@@ -878,7 +878,7 @@ static OPUS_INLINE opus_int64 silk_abs_int64_(opus_int64 a, char *file, int line
 
 #undef silk_abs_int32
 #define silk_abs_int32(a) silk_abs_int32_((a), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_abs_int32_(opus_int32 a, char *file, int line){
+static OAC_INLINE oac_int32 silk_abs_int32_(oac_int32 a, char *file, int line){
     if ( a == silk_int32_MIN )
     {
         fprintf (stderr, "silk_abs_int32(%d) in %s: line %d\n", a, file, line);
@@ -891,10 +891,10 @@ static OPUS_INLINE opus_int32 silk_abs_int32_(opus_int32 a, char *file, int line
 
 #undef silk_CHECK_FIT8
 #define silk_CHECK_FIT8(a) silk_CHECK_FIT8_((a), __FILE__, __LINE__)
-static OPUS_INLINE opus_int8 silk_CHECK_FIT8_( opus_int64 a, char *file, int line ){
-    opus_int8 ret;
-    ret = (opus_int8)a;
-    if ( (opus_int64)ret != a )
+static OAC_INLINE oac_int8 silk_CHECK_FIT8_( oac_int64 a, char *file, int line ){
+    oac_int8 ret;
+    ret = (oac_int8)a;
+    if ( (oac_int64)ret != a )
     {
         fprintf (stderr, "silk_CHECK_FIT8(%lld) in %s: line %d\n", (long long)a, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -906,10 +906,10 @@ static OPUS_INLINE opus_int8 silk_CHECK_FIT8_( opus_int64 a, char *file, int lin
 
 #undef silk_CHECK_FIT16
 #define silk_CHECK_FIT16(a) silk_CHECK_FIT16_((a), __FILE__, __LINE__)
-static OPUS_INLINE opus_int16 silk_CHECK_FIT16_( opus_int64 a, char *file, int line ){
-    opus_int16 ret;
-    ret = (opus_int16)a;
-    if ( (opus_int64)ret != a )
+static OAC_INLINE oac_int16 silk_CHECK_FIT16_( oac_int64 a, char *file, int line ){
+    oac_int16 ret;
+    ret = (oac_int16)a;
+    if ( (oac_int64)ret != a )
     {
         fprintf (stderr, "silk_CHECK_FIT16(%lld) in %s: line %d\n", (long long)a, file, line);
 #ifdef FIXED_DEBUG_ASSERT
@@ -921,10 +921,10 @@ static OPUS_INLINE opus_int16 silk_CHECK_FIT16_( opus_int64 a, char *file, int l
 
 #undef silk_CHECK_FIT32
 #define silk_CHECK_FIT32(a) silk_CHECK_FIT32_((a), __FILE__, __LINE__)
-static OPUS_INLINE opus_int32 silk_CHECK_FIT32_( opus_int64 a, char *file, int line ){
-    opus_int32 ret;
-    ret = (opus_int32)a;
-    if ( (opus_int64)ret != a )
+static OAC_INLINE oac_int32 silk_CHECK_FIT32_( oac_int64 a, char *file, int line ){
+    oac_int32 ret;
+    ret = (oac_int32)a;
+    if ( (oac_int64)ret != a )
     {
         fprintf (stderr, "silk_CHECK_FIT32(%lld) in %s: line %d\n", (long long)a, file, line);
 #ifdef FIXED_DEBUG_ASSERT
diff --git a/silk/NLSF2A.c b/silk/NLSF2A.c
index fcddc54ce..f2645bc46 100644
--- a/silk/NLSF2A.c
+++ b/silk/NLSF2A.c
@@ -41,22 +41,22 @@ POSSIBILITY OF SUCH DAMAGE.
 #define QA      16
 
 /* helper function for NLSF2A(..) */
-static OPUS_INLINE void silk_NLSF2A_find_poly(
-    opus_int32          *out,      /* O    intermediate polynomial, QA [dd+1]        */
-    const opus_int32    *cLSF,     /* I    vector of interleaved 2*cos(LSFs), QA [d] */
-    opus_int            dd         /* I    polynomial order (= 1/2 * filter order)   */
+static OAC_INLINE void silk_NLSF2A_find_poly(
+    oac_int32          *out,      /* O    intermediate polynomial, QA [dd+1]        */
+    const oac_int32    *cLSF,     /* I    vector of interleaved 2*cos(LSFs), QA [d] */
+    oac_int            dd         /* I    polynomial order (= 1/2 * filter order)   */
 )
 {
-    opus_int   k, n;
-    opus_int32 ftmp;
+    oac_int   k, n;
+    oac_int32 ftmp;
 
     out[0] = silk_LSHIFT( 1, QA );
     out[1] = -cLSF[0];
     for( k = 1; k < dd; k++ ) {
         ftmp = cLSF[2*k];            /* QA*/
-        out[k+1] = silk_LSHIFT( out[k-1], 1 ) - (opus_int32)silk_RSHIFT_ROUND64( silk_SMULL( ftmp, out[k] ), QA );
+        out[k+1] = silk_LSHIFT( out[k-1], 1 ) - (oac_int32)silk_RSHIFT_ROUND64( silk_SMULL( ftmp, out[k] ), QA );
         for( n = k; n > 1; n-- ) {
-            out[n] += out[n-2] - (opus_int32)silk_RSHIFT_ROUND64( silk_SMULL( ftmp, out[n-1] ), QA );
+            out[n] += out[n-2] - (oac_int32)silk_RSHIFT_ROUND64( silk_SMULL( ftmp, out[n-1] ), QA );
         }
         out[1] -= ftmp;
     }
@@ -64,9 +64,9 @@ static OPUS_INLINE void silk_NLSF2A_find_poly(
 
 /* compute whitening filter coefficients from normalized line spectral frequencies */
 void silk_NLSF2A(
-    opus_int16                  *a_Q12,             /* O    monic whitening filter coefficients in Q12,  [ d ]          */
-    const opus_int16            *NLSF,              /* I    normalized line spectral frequencies in Q15, [ d ]          */
-    const opus_int              d,                  /* I    filter order (should be even)                               */
+    oac_int16                  *a_Q12,             /* O    monic whitening filter coefficients in Q12,  [ d ]          */
+    const oac_int16            *NLSF,              /* I    normalized line spectral frequencies in Q15, [ d ]          */
+    const oac_int              d,                  /* I    filter order (should be even)                               */
     int                         arch                /* I    Run-time architecture                                       */
 )
 {
@@ -79,11 +79,11 @@ void silk_NLSF2A(
       0, 9, 6, 3, 4, 5, 8, 1, 2, 7
     };
     const unsigned char *ordering;
-    opus_int   k, i, dd;
-    opus_int32 cos_LSF_QA[ SILK_MAX_ORDER_LPC ];
-    opus_int32 P[ SILK_MAX_ORDER_LPC / 2 + 1 ], Q[ SILK_MAX_ORDER_LPC / 2 + 1 ];
-    opus_int32 Ptmp, Qtmp, f_int, f_frac, cos_val, delta;
-    opus_int32 a32_QA1[ SILK_MAX_ORDER_LPC ];
+    oac_int   k, i, dd;
+    oac_int32 cos_LSF_QA[ SILK_MAX_ORDER_LPC ];
+    oac_int32 P[ SILK_MAX_ORDER_LPC / 2 + 1 ], Q[ SILK_MAX_ORDER_LPC / 2 + 1 ];
+    oac_int32 Ptmp, Qtmp, f_int, f_frac, cos_val, delta;
+    oac_int32 a32_QA1[ SILK_MAX_ORDER_LPC ];
 
     silk_assert( LSF_COS_TAB_SZ_FIX == 128 );
     celt_assert( d==10 || d==16 );
@@ -116,7 +116,7 @@ void silk_NLSF2A(
     silk_NLSF2A_find_poly( P, &cos_LSF_QA[ 0 ], dd );
     silk_NLSF2A_find_poly( Q, &cos_LSF_QA[ 1 ], dd );
 
-    /* convert even and odd polynomials to opus_int32 Q12 filter coefs */
+    /* convert even and odd polynomials to oac_int32 Q12 filter coefs */
     for( k = 0; k < dd; k++ ) {
         Ptmp = P[ k+1 ] + P[ k ];
         Qtmp = Q[ k+1 ] - Q[ k ];
@@ -134,7 +134,7 @@ void silk_NLSF2A(
         /* on the unscaled coefficients, convert to Q12 and measure again                   */
         silk_bwexpander_32( a32_QA1, d, 65536 - silk_LSHIFT( 2, i ) );
         for( k = 0; k < d; k++ ) {
-            a_Q12[ k ] = (opus_int16)silk_RSHIFT_ROUND( a32_QA1[ k ], QA + 1 - 12 );            /* QA+1 -> Q12 */
+            a_Q12[ k ] = (oac_int16)silk_RSHIFT_ROUND( a32_QA1[ k ], QA + 1 - 12 );            /* QA+1 -> Q12 */
         }
     }
 }
diff --git a/silk/NLSF_VQ.c b/silk/NLSF_VQ.c
index b83182a79..483cd0a8d 100644
--- a/silk/NLSF_VQ.c
+++ b/silk/NLSF_VQ.c
@@ -33,18 +33,18 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Compute quantization errors for an LPC_order element input vector for a VQ codebook */
 void silk_NLSF_VQ(
-    opus_int32                  err_Q24[],                      /* O    Quantization errors [K]                     */
-    const opus_int16            in_Q15[],                       /* I    Input vectors to be quantized [LPC_order]   */
-    const opus_uint8            pCB_Q8[],                       /* I    Codebook vectors [K*LPC_order]              */
-    const opus_int16            pWght_Q9[],                     /* I    Codebook weights [K*LPC_order]              */
-    const opus_int              K,                              /* I    Number of codebook vectors                  */
-    const opus_int              LPC_order                       /* I    Number of LPCs                              */
+    oac_int32                  err_Q24[],                      /* O    Quantization errors [K]                     */
+    const oac_int16            in_Q15[],                       /* I    Input vectors to be quantized [LPC_order]   */
+    const oac_uint8            pCB_Q8[],                       /* I    Codebook vectors [K*LPC_order]              */
+    const oac_int16            pWght_Q9[],                     /* I    Codebook weights [K*LPC_order]              */
+    const oac_int              K,                              /* I    Number of codebook vectors                  */
+    const oac_int              LPC_order                       /* I    Number of LPCs                              */
 )
 {
-    opus_int         i, m;
-    opus_int32       diff_Q15, diffw_Q24, sum_error_Q24, pred_Q24;
-    const opus_int16 *w_Q9_ptr;
-    const opus_uint8 *cb_Q8_ptr;
+    oac_int         i, m;
+    oac_int32       diff_Q15, diffw_Q24, sum_error_Q24, pred_Q24;
+    const oac_int16 *w_Q9_ptr;
+    const oac_uint8 *cb_Q8_ptr;
 
     celt_assert( ( LPC_order & 1 ) == 0 );
 
@@ -56,13 +56,13 @@ void silk_NLSF_VQ(
         pred_Q24 = 0;
         for( m = LPC_order-2; m >= 0; m -= 2 ) {
             /* Compute weighted absolute predictive quantization error for index m + 1 */
-            diff_Q15 = silk_SUB_LSHIFT32( in_Q15[ m + 1 ], (opus_int32)cb_Q8_ptr[ m + 1 ], 7 ); /* range: [ -32767 : 32767 ]*/
+            diff_Q15 = silk_SUB_LSHIFT32( in_Q15[ m + 1 ], (oac_int32)cb_Q8_ptr[ m + 1 ], 7 ); /* range: [ -32767 : 32767 ]*/
             diffw_Q24 = silk_SMULBB( diff_Q15, w_Q9_ptr[ m + 1 ] );
             sum_error_Q24 = silk_ADD32( sum_error_Q24, silk_abs( silk_SUB_RSHIFT32( diffw_Q24, pred_Q24, 1 ) ) );
             pred_Q24 = diffw_Q24;
 
             /* Compute weighted absolute predictive quantization error for index m */
-            diff_Q15 = silk_SUB_LSHIFT32( in_Q15[ m ], (opus_int32)cb_Q8_ptr[ m ], 7 ); /* range: [ -32767 : 32767 ]*/
+            diff_Q15 = silk_SUB_LSHIFT32( in_Q15[ m ], (oac_int32)cb_Q8_ptr[ m ], 7 ); /* range: [ -32767 : 32767 ]*/
             diffw_Q24 = silk_SMULBB( diff_Q15, w_Q9_ptr[ m ] );
             sum_error_Q24 = silk_ADD32( sum_error_Q24, silk_abs( silk_SUB_RSHIFT32( diffw_Q24, pred_Q24, 1 ) ) );
             pred_Q24 = diffw_Q24;
diff --git a/silk/NLSF_VQ_weights_laroia.c b/silk/NLSF_VQ_weights_laroia.c
index 9873bcde1..d75692c38 100644
--- a/silk/NLSF_VQ_weights_laroia.c
+++ b/silk/NLSF_VQ_weights_laroia.c
@@ -40,41 +40,41 @@ Signal Processing, pp. 641-644, 1991.
 
 /* Laroia low complexity NLSF weights */
 void silk_NLSF_VQ_weights_laroia(
-    opus_int16                  *pNLSFW_Q_OUT,      /* O     Pointer to input vector weights [D]                        */
-    const opus_int16            *pNLSF_Q15,         /* I     Pointer to input vector         [D]                        */
-    const opus_int              D                   /* I     Input vector dimension (even)                              */
+    oac_int16                  *pNLSFW_Q_OUT,      /* O     Pointer to input vector weights [D]                        */
+    const oac_int16            *pNLSF_Q15,         /* I     Pointer to input vector         [D]                        */
+    const oac_int              D                   /* I     Input vector dimension (even)                              */
 )
 {
-    opus_int   k;
-    opus_int32 tmp1_int, tmp2_int;
+    oac_int   k;
+    oac_int32 tmp1_int, tmp2_int;
 
     celt_assert( D > 0 );
     celt_assert( ( D & 1 ) == 0 );
 
     /* First value */
     tmp1_int = silk_max_int( pNLSF_Q15[ 0 ], 1 );
-    tmp1_int = silk_DIV32_16( (opus_int32)1 << ( 15 + NLSF_W_Q ), tmp1_int );
+    tmp1_int = silk_DIV32_16( (oac_int32)1 << ( 15 + NLSF_W_Q ), tmp1_int );
     tmp2_int = silk_max_int( pNLSF_Q15[ 1 ] - pNLSF_Q15[ 0 ], 1 );
-    tmp2_int = silk_DIV32_16( (opus_int32)1 << ( 15 + NLSF_W_Q ), tmp2_int );
-    pNLSFW_Q_OUT[ 0 ] = (opus_int16)silk_min_int( tmp1_int + tmp2_int, silk_int16_MAX );
+    tmp2_int = silk_DIV32_16( (oac_int32)1 << ( 15 + NLSF_W_Q ), tmp2_int );
+    pNLSFW_Q_OUT[ 0 ] = (oac_int16)silk_min_int( tmp1_int + tmp2_int, silk_int16_MAX );
     silk_assert( pNLSFW_Q_OUT[ 0 ] > 0 );
 
     /* Main loop */
     for( k = 1; k < D - 1; k += 2 ) {
         tmp1_int = silk_max_int( pNLSF_Q15[ k + 1 ] - pNLSF_Q15[ k ], 1 );
-        tmp1_int = silk_DIV32_16( (opus_int32)1 << ( 15 + NLSF_W_Q ), tmp1_int );
-        pNLSFW_Q_OUT[ k ] = (opus_int16)silk_min_int( tmp1_int + tmp2_int, silk_int16_MAX );
+        tmp1_int = silk_DIV32_16( (oac_int32)1 << ( 15 + NLSF_W_Q ), tmp1_int );
+        pNLSFW_Q_OUT[ k ] = (oac_int16)silk_min_int( tmp1_int + tmp2_int, silk_int16_MAX );
         silk_assert( pNLSFW_Q_OUT[ k ] > 0 );
 
         tmp2_int = silk_max_int( pNLSF_Q15[ k + 2 ] - pNLSF_Q15[ k + 1 ], 1 );
-        tmp2_int = silk_DIV32_16( (opus_int32)1 << ( 15 + NLSF_W_Q ), tmp2_int );
-        pNLSFW_Q_OUT[ k + 1 ] = (opus_int16)silk_min_int( tmp1_int + tmp2_int, silk_int16_MAX );
+        tmp2_int = silk_DIV32_16( (oac_int32)1 << ( 15 + NLSF_W_Q ), tmp2_int );
+        pNLSFW_Q_OUT[ k + 1 ] = (oac_int16)silk_min_int( tmp1_int + tmp2_int, silk_int16_MAX );
         silk_assert( pNLSFW_Q_OUT[ k + 1 ] > 0 );
     }
 
     /* Last value */
     tmp1_int = silk_max_int( ( 1 << 15 ) - pNLSF_Q15[ D - 1 ], 1 );
-    tmp1_int = silk_DIV32_16( (opus_int32)1 << ( 15 + NLSF_W_Q ), tmp1_int );
-    pNLSFW_Q_OUT[ D - 1 ] = (opus_int16)silk_min_int( tmp1_int + tmp2_int, silk_int16_MAX );
+    tmp1_int = silk_DIV32_16( (oac_int32)1 << ( 15 + NLSF_W_Q ), tmp1_int );
+    pNLSFW_Q_OUT[ D - 1 ] = (oac_int16)silk_min_int( tmp1_int + tmp2_int, silk_int16_MAX );
     silk_assert( pNLSFW_Q_OUT[ D - 1 ] > 0 );
 }
diff --git a/silk/NLSF_decode.c b/silk/NLSF_decode.c
index eeb0ba8c9..b41e99ef2 100644
--- a/silk/NLSF_decode.c
+++ b/silk/NLSF_decode.c
@@ -32,26 +32,26 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "main.h"
 
 /* Predictive dequantizer for NLSF residuals */
-static OPUS_INLINE void silk_NLSF_residual_dequant(          /* O    Returns RD value in Q30                     */
-          opus_int16         x_Q10[],                        /* O    Output [ order ]                            */
-    const opus_int8          indices[],                      /* I    Quantization indices [ order ]              */
-    const opus_uint8         pred_coef_Q8[],                 /* I    Backward predictor coefs [ order ]          */
-    const opus_int           quant_step_size_Q16,            /* I    Quantization step size                      */
-    const opus_int16         order                           /* I    Number of input values                      */
+static OAC_INLINE void silk_NLSF_residual_dequant(          /* O    Returns RD value in Q30                     */
+          oac_int16         x_Q10[],                        /* O    Output [ order ]                            */
+    const oac_int8          indices[],                      /* I    Quantization indices [ order ]              */
+    const oac_uint8         pred_coef_Q8[],                 /* I    Backward predictor coefs [ order ]          */
+    const oac_int           quant_step_size_Q16,            /* I    Quantization step size                      */
+    const oac_int16         order                           /* I    Number of input values                      */
 )
 {
-    opus_int     i, out_Q10, pred_Q10;
+    oac_int     i, out_Q10, pred_Q10;
 
     out_Q10 = 0;
     for( i = order-1; i >= 0; i-- ) {
-        pred_Q10 = silk_RSHIFT( silk_SMULBB( out_Q10, (opus_int16)pred_coef_Q8[ i ] ), 8 );
+        pred_Q10 = silk_RSHIFT( silk_SMULBB( out_Q10, (oac_int16)pred_coef_Q8[ i ] ), 8 );
         out_Q10  = silk_LSHIFT( indices[ i ], 10 );
         if( out_Q10 > 0 ) {
             out_Q10 = silk_SUB16( out_Q10, SILK_FIX_CONST( NLSF_QUANT_LEVEL_ADJ, 10 ) );
         } else if( out_Q10 < 0 ) {
             out_Q10 = silk_ADD16( out_Q10, SILK_FIX_CONST( NLSF_QUANT_LEVEL_ADJ, 10 ) );
         }
-        out_Q10  = silk_SMLAWB( pred_Q10, (opus_int32)out_Q10, quant_step_size_Q16 );
+        out_Q10  = silk_SMLAWB( pred_Q10, (oac_int32)out_Q10, quant_step_size_Q16 );
         x_Q10[ i ] = out_Q10;
     }
 }
@@ -61,18 +61,18 @@ static OPUS_INLINE void silk_NLSF_residual_dequant(          /* O    Returns RD
 /* NLSF vector decoder */
 /***********************/
 void silk_NLSF_decode(
-          opus_int16            *pNLSF_Q15,                     /* O    Quantized NLSF vector [ LPC_ORDER ]         */
-          opus_int8             *NLSFIndices,                   /* I    Codebook path vector [ LPC_ORDER + 1 ]      */
+          oac_int16            *pNLSF_Q15,                     /* O    Quantized NLSF vector [ LPC_ORDER ]         */
+          oac_int8             *NLSFIndices,                   /* I    Codebook path vector [ LPC_ORDER + 1 ]      */
     const silk_NLSF_CB_struct   *psNLSF_CB                      /* I    Codebook object                             */
 )
 {
-    opus_int         i;
-    opus_uint8       pred_Q8[  MAX_LPC_ORDER ];
-    opus_int16       ec_ix[    MAX_LPC_ORDER ];
-    opus_int16       res_Q10[  MAX_LPC_ORDER ];
-    opus_int32       NLSF_Q15_tmp;
-    const opus_uint8 *pCB_element;
-    const opus_int16 *pCB_Wght_Q9;
+    oac_int         i;
+    oac_uint8       pred_Q8[  MAX_LPC_ORDER ];
+    oac_int16       ec_ix[    MAX_LPC_ORDER ];
+    oac_int16       res_Q10[  MAX_LPC_ORDER ];
+    oac_int32       NLSF_Q15_tmp;
+    const oac_uint8 *pCB_element;
+    const oac_int16 *pCB_Wght_Q9;
 
     /* Unpack entropy table indices and predictor for current CB1 index */
     silk_NLSF_unpack( ec_ix, pred_Q8, psNLSF_CB, NLSFIndices[ 0 ] );
@@ -84,8 +84,8 @@ void silk_NLSF_decode(
     pCB_element = &psNLSF_CB->CB1_NLSF_Q8[ NLSFIndices[ 0 ] * psNLSF_CB->order ];
     pCB_Wght_Q9 = &psNLSF_CB->CB1_Wght_Q9[ NLSFIndices[ 0 ] * psNLSF_CB->order ];
     for( i = 0; i < psNLSF_CB->order; i++ ) {
-        NLSF_Q15_tmp = silk_ADD_LSHIFT32( silk_DIV32_16( silk_LSHIFT( (opus_int32)res_Q10[ i ], 14 ), pCB_Wght_Q9[ i ] ), (opus_int16)pCB_element[ i ], 7 );
-        pNLSF_Q15[ i ] = (opus_int16)silk_LIMIT( NLSF_Q15_tmp, 0, 32767 );
+        NLSF_Q15_tmp = silk_ADD_LSHIFT32( silk_DIV32_16( silk_LSHIFT( (oac_int32)res_Q10[ i ], 14 ), pCB_Wght_Q9[ i ] ), (oac_int16)pCB_element[ i ], 7 );
+        pNLSF_Q15[ i ] = (oac_int16)silk_LIMIT( NLSF_Q15_tmp, 0, 32767 );
     }
 
     /* NLSF stabilization */
diff --git a/silk/NLSF_del_dec_quant.c b/silk/NLSF_del_dec_quant.c
index 44a16acd0..1ac9ac75e 100644
--- a/silk/NLSF_del_dec_quant.c
+++ b/silk/NLSF_del_dec_quant.c
@@ -32,33 +32,33 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "main.h"
 
 /* Delayed-decision quantizer for NLSF residuals */
-opus_int32 silk_NLSF_del_dec_quant(                             /* O    Returns RD value in Q25                     */
-    opus_int8                   indices[],                      /* O    Quantization indices [ order ]              */
-    const opus_int16            x_Q10[],                        /* I    Input [ order ]                             */
-    const opus_int16            w_Q5[],                         /* I    Weights [ order ]                           */
-    const opus_uint8            pred_coef_Q8[],                 /* I    Backward predictor coefs [ order ]          */
-    const opus_int16            ec_ix[],                        /* I    Indices to entropy coding tables [ order ]  */
-    const opus_uint8            ec_rates_Q5[],                  /* I    Rates []                                    */
-    const opus_int              quant_step_size_Q16,            /* I    Quantization step size                      */
-    const opus_int16            inv_quant_step_size_Q6,         /* I    Inverse quantization step size              */
-    const opus_int32            mu_Q20,                         /* I    R/D tradeoff                                */
-    const opus_int16            order                           /* I    Number of input values                      */
+oac_int32 silk_NLSF_del_dec_quant(                             /* O    Returns RD value in Q25                     */
+    oac_int8                   indices[],                      /* O    Quantization indices [ order ]              */
+    const oac_int16            x_Q10[],                        /* I    Input [ order ]                             */
+    const oac_int16            w_Q5[],                         /* I    Weights [ order ]                           */
+    const oac_uint8            pred_coef_Q8[],                 /* I    Backward predictor coefs [ order ]          */
+    const oac_int16            ec_ix[],                        /* I    Indices to entropy coding tables [ order ]  */
+    const oac_uint8            ec_rates_Q5[],                  /* I    Rates []                                    */
+    const oac_int              quant_step_size_Q16,            /* I    Quantization step size                      */
+    const oac_int16            inv_quant_step_size_Q6,         /* I    Inverse quantization step size              */
+    const oac_int32            mu_Q20,                         /* I    R/D tradeoff                                */
+    const oac_int16            order                           /* I    Number of input values                      */
 )
 {
-    opus_int         i, j, nStates, ind_tmp, ind_min_max, ind_max_min, in_Q10, res_Q10;
-    opus_int         pred_Q10, diff_Q10, rate0_Q5, rate1_Q5;
-    opus_int16       out0_Q10, out1_Q10;
-    opus_int32       RD_tmp_Q25, min_Q25, min_max_Q25, max_min_Q25;
-    opus_int         ind_sort[         NLSF_QUANT_DEL_DEC_STATES ];
-    opus_int8        ind[              NLSF_QUANT_DEL_DEC_STATES ][ MAX_LPC_ORDER ];
-    opus_int16       prev_out_Q10[ 2 * NLSF_QUANT_DEL_DEC_STATES ];
-    opus_int32       RD_Q25[       2 * NLSF_QUANT_DEL_DEC_STATES ];
-    opus_int32       RD_min_Q25[       NLSF_QUANT_DEL_DEC_STATES ];
-    opus_int32       RD_max_Q25[       NLSF_QUANT_DEL_DEC_STATES ];
-    const opus_uint8 *rates_Q5;
+    oac_int         i, j, nStates, ind_tmp, ind_min_max, ind_max_min, in_Q10, res_Q10;
+    oac_int         pred_Q10, diff_Q10, rate0_Q5, rate1_Q5;
+    oac_int16       out0_Q10, out1_Q10;
+    oac_int32       RD_tmp_Q25, min_Q25, min_max_Q25, max_min_Q25;
+    oac_int         ind_sort[         NLSF_QUANT_DEL_DEC_STATES ];
+    oac_int8        ind[              NLSF_QUANT_DEL_DEC_STATES ][ MAX_LPC_ORDER ];
+    oac_int16       prev_out_Q10[ 2 * NLSF_QUANT_DEL_DEC_STATES ];
+    oac_int32       RD_Q25[       2 * NLSF_QUANT_DEL_DEC_STATES ];
+    oac_int32       RD_min_Q25[       NLSF_QUANT_DEL_DEC_STATES ];
+    oac_int32       RD_max_Q25[       NLSF_QUANT_DEL_DEC_STATES ];
+    const oac_uint8 *rates_Q5;
 
-    opus_int out0_Q10_table[2 * NLSF_QUANT_MAX_AMPLITUDE_EXT];
-    opus_int out1_Q10_table[2 * NLSF_QUANT_MAX_AMPLITUDE_EXT];
+    oac_int out0_Q10_table[2 * NLSF_QUANT_MAX_AMPLITUDE_EXT];
+    oac_int out1_Q10_table[2 * NLSF_QUANT_MAX_AMPLITUDE_EXT];
 
     for (i = -NLSF_QUANT_MAX_AMPLITUDE_EXT; i <= NLSF_QUANT_MAX_AMPLITUDE_EXT-1; i++)
     {
@@ -88,11 +88,11 @@ opus_int32 silk_NLSF_del_dec_quant(                             /* O    Returns
         rates_Q5 = &ec_rates_Q5[ ec_ix[ i ] ];
         in_Q10 = x_Q10[ i ];
         for( j = 0; j < nStates; j++ ) {
-            pred_Q10 = silk_RSHIFT( silk_SMULBB( (opus_int16)pred_coef_Q8[ i ], prev_out_Q10[ j ] ), 8 );
+            pred_Q10 = silk_RSHIFT( silk_SMULBB( (oac_int16)pred_coef_Q8[ i ], prev_out_Q10[ j ] ), 8 );
             res_Q10  = silk_SUB16( in_Q10, pred_Q10 );
             ind_tmp  = silk_RSHIFT( silk_SMULBB( inv_quant_step_size_Q6, res_Q10 ), 16 );
             ind_tmp  = silk_LIMIT( ind_tmp, -NLSF_QUANT_MAX_AMPLITUDE_EXT, NLSF_QUANT_MAX_AMPLITUDE_EXT-1 );
-            ind[ j ][ i ] = (opus_int8)ind_tmp;
+            ind[ j ][ i ] = (oac_int8)ind_tmp;
 
             /* compute outputs for ind_tmp and ind_tmp + 1 */
             out0_Q10 = out0_Q10_table[ ind_tmp + NLSF_QUANT_MAX_AMPLITUDE_EXT ];
@@ -185,7 +185,7 @@ opus_int32 silk_NLSF_del_dec_quant(                             /* O    Returns
                 prev_out_Q10[ ind_max_min ] = prev_out_Q10[ ind_min_max + NLSF_QUANT_DEL_DEC_STATES ];
                 RD_min_Q25[   ind_max_min ] = 0;
                 RD_max_Q25[   ind_min_max ] = silk_int32_MAX;
-                silk_memcpy( ind[ ind_max_min ], ind[ ind_min_max ], MAX_LPC_ORDER * sizeof( opus_int8 ) );
+                silk_memcpy( ind[ ind_max_min ], ind[ ind_min_max ], MAX_LPC_ORDER * sizeof( oac_int8 ) );
             }
             /* increment index if it comes from the upper half */
             for( j = 0; j < NLSF_QUANT_DEL_DEC_STATES; j++ ) {
diff --git a/silk/NLSF_encode.c b/silk/NLSF_encode.c
index 01ac7db78..dd8ee84be 100644
--- a/silk/NLSF_encode.c
+++ b/silk/NLSF_encode.c
@@ -35,29 +35,29 @@ POSSIBILITY OF SUCH DAMAGE.
 /***********************/
 /* NLSF vector encoder */
 /***********************/
-opus_int32 silk_NLSF_encode(                                    /* O    Returns RD value in Q25                     */
-          opus_int8             *NLSFIndices,                   /* I    Codebook path vector [ LPC_ORDER + 1 ]      */
-          opus_int16            *pNLSF_Q15,                     /* I/O  (Un)quantized NLSF vector [ LPC_ORDER ]     */
+oac_int32 silk_NLSF_encode(                                    /* O    Returns RD value in Q25                     */
+          oac_int8             *NLSFIndices,                   /* I    Codebook path vector [ LPC_ORDER + 1 ]      */
+          oac_int16            *pNLSF_Q15,                     /* I/O  (Un)quantized NLSF vector [ LPC_ORDER ]     */
     const silk_NLSF_CB_struct   *psNLSF_CB,                     /* I    Codebook object                             */
-    const opus_int16            *pW_Q2,                         /* I    NLSF weight vector [ LPC_ORDER ]            */
-    const opus_int              NLSF_mu_Q20,                    /* I    Rate weight for the RD optimization         */
-    const opus_int              nSurvivors,                     /* I    Max survivors after first stage             */
-    const opus_int              signalType                      /* I    Signal type: 0/1/2                          */
+    const oac_int16            *pW_Q2,                         /* I    NLSF weight vector [ LPC_ORDER ]            */
+    const oac_int              NLSF_mu_Q20,                    /* I    Rate weight for the RD optimization         */
+    const oac_int              nSurvivors,                     /* I    Max survivors after first stage             */
+    const oac_int              signalType                      /* I    Signal type: 0/1/2                          */
 )
 {
-    opus_int         i, s, ind1, bestIndex, prob_Q8, bits_q7;
-    opus_int32       W_tmp_Q9, ret;
-    VARDECL( opus_int32, err_Q24 );
-    VARDECL( opus_int32, RD_Q25 );
-    VARDECL( opus_int, tempIndices1 );
-    VARDECL( opus_int8, tempIndices2 );
-    opus_int16       res_Q10[      MAX_LPC_ORDER ];
-    opus_int16       NLSF_tmp_Q15[ MAX_LPC_ORDER ];
-    opus_int16       W_adj_Q5[     MAX_LPC_ORDER ];
-    opus_uint8       pred_Q8[      MAX_LPC_ORDER ];
-    opus_int16       ec_ix[        MAX_LPC_ORDER ];
-    const opus_uint8 *pCB_element, *iCDF_ptr;
-    const opus_int16 *pCB_Wght_Q9;
+    oac_int         i, s, ind1, bestIndex, prob_Q8, bits_q7;
+    oac_int32       W_tmp_Q9, ret;
+    VARDECL( oac_int32, err_Q24 );
+    VARDECL( oac_int32, RD_Q25 );
+    VARDECL( oac_int, tempIndices1 );
+    VARDECL( oac_int8, tempIndices2 );
+    oac_int16       res_Q10[      MAX_LPC_ORDER ];
+    oac_int16       NLSF_tmp_Q15[ MAX_LPC_ORDER ];
+    oac_int16       W_adj_Q5[     MAX_LPC_ORDER ];
+    oac_uint8       pred_Q8[      MAX_LPC_ORDER ];
+    oac_int16       ec_ix[        MAX_LPC_ORDER ];
+    const oac_uint8 *pCB_element, *iCDF_ptr;
+    const oac_int16 *pCB_Wght_Q9;
     SAVE_STACK;
 
     celt_assert( signalType >= 0 && signalType <= 2 );
@@ -67,15 +67,15 @@ opus_int32 silk_NLSF_encode(                                    /* O    Returns
     silk_NLSF_stabilize( pNLSF_Q15, psNLSF_CB->deltaMin_Q15, psNLSF_CB->order );
 
     /* First stage: VQ */
-    ALLOC( err_Q24, psNLSF_CB->nVectors, opus_int32 );
+    ALLOC( err_Q24, psNLSF_CB->nVectors, oac_int32 );
     silk_NLSF_VQ( err_Q24, pNLSF_Q15, psNLSF_CB->CB1_NLSF_Q8, psNLSF_CB->CB1_Wght_Q9, psNLSF_CB->nVectors, psNLSF_CB->order );
 
     /* Sort the quantization errors */
-    ALLOC( tempIndices1, nSurvivors, opus_int );
+    ALLOC( tempIndices1, nSurvivors, oac_int );
     silk_insertion_sort_increasing( err_Q24, tempIndices1, psNLSF_CB->nVectors, nSurvivors );
 
-    ALLOC( RD_Q25, nSurvivors, opus_int32 );
-    ALLOC( tempIndices2, nSurvivors * MAX_LPC_ORDER, opus_int8 );
+    ALLOC( RD_Q25, nSurvivors, oac_int32 );
+    ALLOC( tempIndices2, nSurvivors * MAX_LPC_ORDER, oac_int8 );
 
     /* Loop over survivors */
     for( s = 0; s < nSurvivors; s++ ) {
@@ -85,10 +85,10 @@ opus_int32 silk_NLSF_encode(                                    /* O    Returns
         pCB_element = &psNLSF_CB->CB1_NLSF_Q8[ ind1 * psNLSF_CB->order ];
         pCB_Wght_Q9 = &psNLSF_CB->CB1_Wght_Q9[ ind1 * psNLSF_CB->order ];
         for( i = 0; i < psNLSF_CB->order; i++ ) {
-            NLSF_tmp_Q15[ i ] = silk_LSHIFT16( (opus_int16)pCB_element[ i ], 7 );
+            NLSF_tmp_Q15[ i ] = silk_LSHIFT16( (oac_int16)pCB_element[ i ], 7 );
             W_tmp_Q9 = pCB_Wght_Q9[ i ];
-            res_Q10[ i ] = (opus_int16)silk_RSHIFT( silk_SMULBB( pNLSF_Q15[ i ] - NLSF_tmp_Q15[ i ], W_tmp_Q9 ), 14 );
-            W_adj_Q5[ i ] = silk_DIV32_varQ( (opus_int32)pW_Q2[ i ], silk_SMULBB( W_tmp_Q9, W_tmp_Q9 ), 21 );
+            res_Q10[ i ] = (oac_int16)silk_RSHIFT( silk_SMULBB( pNLSF_Q15[ i ] - NLSF_tmp_Q15[ i ], W_tmp_Q9 ), 14 );
+            W_adj_Q5[ i ] = silk_DIV32_varQ( (oac_int32)pW_Q2[ i ], silk_SMULBB( W_tmp_Q9, W_tmp_Q9 ), 21 );
         }
 
         /* Unpack entropy table indices and predictor for current CB1 index */
@@ -112,8 +112,8 @@ opus_int32 silk_NLSF_encode(                                    /* O    Returns
     /* Find the lowest rate-distortion error */
     silk_insertion_sort_increasing( RD_Q25, &bestIndex, nSurvivors, 1 );
 
-    NLSFIndices[ 0 ] = (opus_int8)tempIndices1[ bestIndex ];
-    silk_memcpy( &NLSFIndices[ 1 ], &tempIndices2[ bestIndex * MAX_LPC_ORDER ], psNLSF_CB->order * sizeof( opus_int8 ) );
+    NLSFIndices[ 0 ] = (oac_int8)tempIndices1[ bestIndex ];
+    silk_memcpy( &NLSFIndices[ 1 ], &tempIndices2[ bestIndex * MAX_LPC_ORDER ], psNLSF_CB->order * sizeof( oac_int8 ) );
 
     /* Decode */
     silk_NLSF_decode( pNLSF_Q15, NLSFIndices, psNLSF_CB );
diff --git a/silk/NLSF_stabilize.c b/silk/NLSF_stabilize.c
index 8f3426b91..48b25f2f4 100644
--- a/silk/NLSF_stabilize.c
+++ b/silk/NLSF_stabilize.c
@@ -45,16 +45,16 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* NLSF stabilizer, for a single input data vector */
 void silk_NLSF_stabilize(
-          opus_int16            *NLSF_Q15,          /* I/O   Unstable/stabilized normalized LSF vector in Q15 [L]       */
-    const opus_int16            *NDeltaMin_Q15,     /* I     Min distance vector, NDeltaMin_Q15[L] must be >= 1 [L+1]   */
-    const opus_int              L                   /* I     Number of NLSF parameters in the input vector              */
+          oac_int16            *NLSF_Q15,          /* I/O   Unstable/stabilized normalized LSF vector in Q15 [L]       */
+    const oac_int16            *NDeltaMin_Q15,     /* I     Min distance vector, NDeltaMin_Q15[L] must be >= 1 [L+1]   */
+    const oac_int              L                   /* I     Number of NLSF parameters in the input vector              */
 )
 {
-    opus_int   i, I=0, k, loops;
-    opus_int16 center_freq_Q15;
-    opus_int32 diff_Q15, min_diff_Q15, min_center_Q15, max_center_Q15;
+    oac_int   i, I=0, k, loops;
+    oac_int16 center_freq_Q15;
+    oac_int32 diff_Q15, min_diff_Q15, min_center_Q15, max_center_Q15;
 
-    /* This is necessary to ensure an output within range of a opus_int16 */
+    /* This is necessary to ensure an output within range of a oac_int16 */
     silk_assert( NDeltaMin_Q15[L] >= 1 );
 
     for( loops = 0; loops < MAX_LOOPS; loops++ ) {
@@ -110,7 +110,7 @@ void silk_NLSF_stabilize(
             max_center_Q15 -= silk_RSHIFT( NDeltaMin_Q15[I], 1 );
 
             /* Move apart, sorted by value, keeping the same center frequency */
-            center_freq_Q15 = (opus_int16)silk_LIMIT_32( silk_RSHIFT_ROUND( (opus_int32)NLSF_Q15[I-1] + (opus_int32)NLSF_Q15[I], 1 ),
+            center_freq_Q15 = (oac_int16)silk_LIMIT_32( silk_RSHIFT_ROUND( (oac_int32)NLSF_Q15[I-1] + (oac_int32)NLSF_Q15[I], 1 ),
                 min_center_Q15, max_center_Q15 );
             NLSF_Q15[I-1] = center_freq_Q15 - silk_RSHIFT( NDeltaMin_Q15[I], 1 );
             NLSF_Q15[I] = NLSF_Q15[I-1] + NDeltaMin_Q15[I];
diff --git a/silk/NLSF_unpack.c b/silk/NLSF_unpack.c
index d1627dce4..8e87144cf 100644
--- a/silk/NLSF_unpack.c
+++ b/silk/NLSF_unpack.c
@@ -33,15 +33,15 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Unpack predictor values and indices for entropy coding tables */
 void silk_NLSF_unpack(
-          opus_int16            ec_ix[],                        /* O    Indices to entropy tables [ LPC_ORDER ]     */
-          opus_uint8            pred_Q8[],                      /* O    LSF predictor [ LPC_ORDER ]                 */
+          oac_int16            ec_ix[],                        /* O    Indices to entropy tables [ LPC_ORDER ]     */
+          oac_uint8            pred_Q8[],                      /* O    LSF predictor [ LPC_ORDER ]                 */
     const silk_NLSF_CB_struct   *psNLSF_CB,                     /* I    Codebook object                             */
-    const opus_int              CB1_index                       /* I    Index of vector in first LSF codebook       */
+    const oac_int              CB1_index                       /* I    Index of vector in first LSF codebook       */
 )
 {
-    opus_int   i;
-    opus_uint8 entry;
-    const opus_uint8 *ec_sel_ptr;
+    oac_int   i;
+    oac_uint8 entry;
+    const oac_uint8 *ec_sel_ptr;
 
     ec_sel_ptr = &psNLSF_CB->ec_sel[ CB1_index * psNLSF_CB->order / 2 ];
     for( i = 0; i < psNLSF_CB->order; i += 2 ) {
diff --git a/silk/NSQ.c b/silk/NSQ.c
index 4ffdf3d9a..3ac07413c 100644
--- a/silk/NSQ.c
+++ b/silk/NSQ.c
@@ -34,41 +34,41 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "NSQ.h"
 
 
-static OPUS_INLINE void silk_nsq_scale_states(
+static OAC_INLINE void silk_nsq_scale_states(
     const silk_encoder_state *psEncC,           /* I    Encoder State                   */
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                       */
-    const opus_int16    x16[],                  /* I    input                           */
-    opus_int32          x_sc_Q10[],             /* O    input scaled with 1/Gain        */
-    const opus_int16    sLTP[],                 /* I    re-whitened LTP state in Q0     */
-    opus_int32          sLTP_Q15[],             /* O    LTP state matching scaled input */
-    opus_int            subfr,                  /* I    subframe number                 */
-    const opus_int      LTP_scale_Q14,          /* I                                    */
-    const opus_int32    Gains_Q16[ MAX_NB_SUBFR ], /* I                                 */
-    const opus_int      pitchL[ MAX_NB_SUBFR ], /* I    Pitch lag                       */
-    const opus_int      signal_type             /* I    Signal type                     */
+    const oac_int16    x16[],                  /* I    input                           */
+    oac_int32          x_sc_Q10[],             /* O    input scaled with 1/Gain        */
+    const oac_int16    sLTP[],                 /* I    re-whitened LTP state in Q0     */
+    oac_int32          sLTP_Q15[],             /* O    LTP state matching scaled input */
+    oac_int            subfr,                  /* I    subframe number                 */
+    const oac_int      LTP_scale_Q14,          /* I                                    */
+    const oac_int32    Gains_Q16[ MAX_NB_SUBFR ], /* I                                 */
+    const oac_int      pitchL[ MAX_NB_SUBFR ], /* I    Pitch lag                       */
+    const oac_int      signal_type             /* I    Signal type                     */
 );
 
-#if !defined(OPUS_X86_MAY_HAVE_SSE4_1)
-static OPUS_INLINE void silk_noise_shape_quantizer(
+#if !defined(OAC_X86_MAY_HAVE_SSE4_1)
+static OAC_INLINE void silk_noise_shape_quantizer(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                       */
-    opus_int            signalType,             /* I    Signal type                     */
-    const opus_int32    x_sc_Q10[],             /* I                                    */
-    opus_int8           pulses[],               /* O                                    */
-    opus_int16          xq[],                   /* O                                    */
-    opus_int32          sLTP_Q15[],             /* I/O  LTP state                       */
-    const opus_int16    a_Q12[],                /* I    Short term prediction coefs     */
-    const opus_int16    b_Q14[],                /* I    Long term prediction coefs      */
-    const opus_int16    AR_shp_Q13[],           /* I    Noise shaping AR coefs          */
-    opus_int            lag,                    /* I    Pitch lag                       */
-    opus_int32          HarmShapeFIRPacked_Q14, /* I                                    */
-    opus_int            Tilt_Q14,               /* I    Spectral tilt                   */
-    opus_int32          LF_shp_Q14,             /* I                                    */
-    opus_int32          Gain_Q16,               /* I                                    */
-    opus_int            Lambda_Q10,             /* I                                    */
-    opus_int            offset_Q10,             /* I                                    */
-    opus_int            length,                 /* I    Input length                    */
-    opus_int            shapingLPCOrder,        /* I    Noise shaping AR filter order   */
-    opus_int            predictLPCOrder,        /* I    Prediction filter order         */
+    oac_int            signalType,             /* I    Signal type                     */
+    const oac_int32    x_sc_Q10[],             /* I                                    */
+    oac_int8           pulses[],               /* O                                    */
+    oac_int16          xq[],                   /* O                                    */
+    oac_int32          sLTP_Q15[],             /* I/O  LTP state                       */
+    const oac_int16    a_Q12[],                /* I    Short term prediction coefs     */
+    const oac_int16    b_Q14[],                /* I    Long term prediction coefs      */
+    const oac_int16    AR_shp_Q13[],           /* I    Noise shaping AR coefs          */
+    oac_int            lag,                    /* I    Pitch lag                       */
+    oac_int32          HarmShapeFIRPacked_Q14, /* I                                    */
+    oac_int            Tilt_Q14,               /* I    Spectral tilt                   */
+    oac_int32          LF_shp_Q14,             /* I                                    */
+    oac_int32          Gain_Q16,               /* I                                    */
+    oac_int            Lambda_Q10,             /* I                                    */
+    oac_int            offset_Q10,             /* I                                    */
+    oac_int            length,                 /* I    Input length                    */
+    oac_int            shapingLPCOrder,        /* I    Noise shaping AR filter order   */
+    oac_int            predictLPCOrder,        /* I    Prediction filter order         */
     int                 arch                    /* I    Architecture                    */
 );
 #endif
@@ -78,28 +78,28 @@ void silk_NSQ_c
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const opus_int16            x16[],                                        /* I    Input                           */
-    opus_int8                   pulses[],                                     /* O    Quantized pulse signal          */
-    const opus_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const opus_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const opus_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const opus_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const opus_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const opus_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const opus_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const opus_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const opus_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const opus_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
+    const oac_int16            x16[],                                        /* I    Input                           */
+    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
+    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
+    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
+    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
+    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
+    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
+    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
+    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
+    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
+    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
 )
 {
-    opus_int            k, lag, start_idx, LSF_interpolation_flag;
-    const opus_int16    *A_Q12, *B_Q14, *AR_shp_Q13;
-    opus_int16          *pxq;
-    VARDECL( opus_int32, sLTP_Q15 );
-    VARDECL( opus_int16, sLTP );
-    opus_int32          HarmShapeFIRPacked_Q14;
-    opus_int            offset_Q10;
-    VARDECL( opus_int32, x_sc_Q10 );
+    oac_int            k, lag, start_idx, LSF_interpolation_flag;
+    const oac_int16    *A_Q12, *B_Q14, *AR_shp_Q13;
+    oac_int16          *pxq;
+    VARDECL( oac_int32, sLTP_Q15 );
+    VARDECL( oac_int16, sLTP );
+    oac_int32          HarmShapeFIRPacked_Q14;
+    oac_int            offset_Q10;
+    VARDECL( oac_int32, x_sc_Q10 );
     SAVE_STACK;
 
     NSQ->rand_seed = psIndices->Seed;
@@ -117,9 +117,9 @@ void silk_NSQ_c
         LSF_interpolation_flag = 1;
     }
 
-    ALLOC( sLTP_Q15, psEncC->ltp_mem_length + psEncC->frame_length, opus_int32 );
-    ALLOC( sLTP, psEncC->ltp_mem_length + psEncC->frame_length, opus_int16 );
-    ALLOC( x_sc_Q10, psEncC->subfr_length, opus_int32 );
+    ALLOC( sLTP_Q15, psEncC->ltp_mem_length + psEncC->frame_length, oac_int32 );
+    ALLOC( sLTP, psEncC->ltp_mem_length + psEncC->frame_length, oac_int16 );
+    ALLOC( x_sc_Q10, psEncC->subfr_length, oac_int32 );
     /* Set up pointers to start of sub frame */
     NSQ->sLTP_shp_buf_idx = psEncC->ltp_mem_length;
     NSQ->sLTP_buf_idx     = psEncC->ltp_mem_length;
@@ -132,7 +132,7 @@ void silk_NSQ_c
         /* Noise shape parameters */
         silk_assert( HarmShapeGain_Q14[ k ] >= 0 );
         HarmShapeFIRPacked_Q14  =                          silk_RSHIFT( HarmShapeGain_Q14[ k ], 2 );
-        HarmShapeFIRPacked_Q14 |= silk_LSHIFT( (opus_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
+        HarmShapeFIRPacked_Q14 |= silk_LSHIFT( (oac_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
 
         NSQ->rewhite_flag = 0;
         if( psIndices->signalType == TYPE_VOICED ) {
@@ -168,8 +168,8 @@ void silk_NSQ_c
     NSQ->lagPrev = pitchL[ psEncC->nb_subfr - 1 ];
 
     /* Save quantized speech and noise shaping signals */
-    silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int16 ) );
-    silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int32 ) );
+    silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( oac_int16 ) );
+    silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( oac_int32 ) );
     RESTORE_STACK;
 }
 
@@ -177,40 +177,40 @@ void silk_NSQ_c
 /* silk_noise_shape_quantizer */
 /******************************/
 
-#if !defined(OPUS_X86_MAY_HAVE_SSE4_1)
-static OPUS_INLINE
+#if !defined(OAC_X86_MAY_HAVE_SSE4_1)
+static OAC_INLINE
 #endif
 void silk_noise_shape_quantizer(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                       */
-    opus_int            signalType,             /* I    Signal type                     */
-    const opus_int32    x_sc_Q10[],             /* I                                    */
-    opus_int8           pulses[],               /* O                                    */
-    opus_int16          xq[],                   /* O                                    */
-    opus_int32          sLTP_Q15[],             /* I/O  LTP state                       */
-    const opus_int16    a_Q12[],                /* I    Short term prediction coefs     */
-    const opus_int16    b_Q14[],                /* I    Long term prediction coefs      */
-    const opus_int16    AR_shp_Q13[],           /* I    Noise shaping AR coefs          */
-    opus_int            lag,                    /* I    Pitch lag                       */
-    opus_int32          HarmShapeFIRPacked_Q14, /* I                                    */
-    opus_int            Tilt_Q14,               /* I    Spectral tilt                   */
-    opus_int32          LF_shp_Q14,             /* I                                    */
-    opus_int32          Gain_Q16,               /* I                                    */
-    opus_int            Lambda_Q10,             /* I                                    */
-    opus_int            offset_Q10,             /* I                                    */
-    opus_int            length,                 /* I    Input length                    */
-    opus_int            shapingLPCOrder,        /* I    Noise shaping AR filter order   */
-    opus_int            predictLPCOrder,        /* I    Prediction filter order         */
+    oac_int            signalType,             /* I    Signal type                     */
+    const oac_int32    x_sc_Q10[],             /* I                                    */
+    oac_int8           pulses[],               /* O                                    */
+    oac_int16          xq[],                   /* O                                    */
+    oac_int32          sLTP_Q15[],             /* I/O  LTP state                       */
+    const oac_int16    a_Q12[],                /* I    Short term prediction coefs     */
+    const oac_int16    b_Q14[],                /* I    Long term prediction coefs      */
+    const oac_int16    AR_shp_Q13[],           /* I    Noise shaping AR coefs          */
+    oac_int            lag,                    /* I    Pitch lag                       */
+    oac_int32          HarmShapeFIRPacked_Q14, /* I                                    */
+    oac_int            Tilt_Q14,               /* I    Spectral tilt                   */
+    oac_int32          LF_shp_Q14,             /* I                                    */
+    oac_int32          Gain_Q16,               /* I                                    */
+    oac_int            Lambda_Q10,             /* I                                    */
+    oac_int            offset_Q10,             /* I                                    */
+    oac_int            length,                 /* I    Input length                    */
+    oac_int            shapingLPCOrder,        /* I    Noise shaping AR filter order   */
+    oac_int            predictLPCOrder,        /* I    Prediction filter order         */
     int                 arch                    /* I    Architecture                    */
 )
 {
-    opus_int     i;
-    opus_int32   LTP_pred_Q13, LPC_pred_Q10, n_AR_Q12, n_LTP_Q13;
-    opus_int32   n_LF_Q12, r_Q10, rr_Q10, q1_Q0, q1_Q10, q2_Q10, rd1_Q20, rd2_Q20;
-    opus_int32   exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10;
-    opus_int32   tmp1, tmp2, sLF_AR_shp_Q14;
-    opus_int32   *psLPC_Q14, *shp_lag_ptr, *pred_lag_ptr;
+    oac_int     i;
+    oac_int32   LTP_pred_Q13, LPC_pred_Q10, n_AR_Q12, n_LTP_Q13;
+    oac_int32   n_LF_Q12, r_Q10, rr_Q10, q1_Q0, q1_Q10, q2_Q10, rd1_Q20, rd2_Q20;
+    oac_int32   exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10;
+    oac_int32   tmp1, tmp2, sLF_AR_shp_Q14;
+    oac_int32   *psLPC_Q14, *shp_lag_ptr, *pred_lag_ptr;
 #ifdef silk_short_prediction_create_arch_coef
-    opus_int32   a_Q12_arch[MAX_LPC_ORDER];
+    oac_int32   a_Q12_arch[MAX_LPC_ORDER];
 #endif
 
     shp_lag_ptr  = &NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS / 2 ];
@@ -330,7 +330,7 @@ void silk_noise_shape_quantizer(
             q1_Q10 = q2_Q10;
         }
 
-        pulses[ i ] = (opus_int8)silk_RSHIFT_ROUND( q1_Q10, 10 );
+        pulses[ i ] = (oac_int8)silk_RSHIFT_ROUND( q1_Q10, 10 );
 
         /* Excitation */
         exc_Q14 = silk_LSHIFT( q1_Q10, 4 );
@@ -343,7 +343,7 @@ void silk_noise_shape_quantizer(
         xq_Q14      = silk_ADD32_ovflw( LPC_exc_Q14, silk_LSHIFT32( LPC_pred_Q10, 4 ) );
 
         /* Scale XQ back to normal level before saving */
-        xq[ i ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( xq_Q14, Gain_Q10 ), 8 ) );
+        xq[ i ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( xq_Q14, Gain_Q10 ), 8 ) );
 
         /* Update states */
         psLPC_Q14++;
@@ -362,25 +362,25 @@ void silk_noise_shape_quantizer(
     }
 
     /* Update LPC synth buffer */
-    silk_memcpy( NSQ->sLPC_Q14, &NSQ->sLPC_Q14[ length ], NSQ_LPC_BUF_LENGTH * sizeof( opus_int32 ) );
+    silk_memcpy( NSQ->sLPC_Q14, &NSQ->sLPC_Q14[ length ], NSQ_LPC_BUF_LENGTH * sizeof( oac_int32 ) );
 }
 
-static OPUS_INLINE void silk_nsq_scale_states(
+static OAC_INLINE void silk_nsq_scale_states(
     const silk_encoder_state *psEncC,           /* I    Encoder State                   */
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                       */
-    const opus_int16    x16[],                  /* I    input                           */
-    opus_int32          x_sc_Q10[],             /* O    input scaled with 1/Gain        */
-    const opus_int16    sLTP[],                 /* I    re-whitened LTP state in Q0     */
-    opus_int32          sLTP_Q15[],             /* O    LTP state matching scaled input */
-    opus_int            subfr,                  /* I    subframe number                 */
-    const opus_int      LTP_scale_Q14,          /* I                                    */
-    const opus_int32    Gains_Q16[ MAX_NB_SUBFR ], /* I                                 */
-    const opus_int      pitchL[ MAX_NB_SUBFR ], /* I    Pitch lag                       */
-    const opus_int      signal_type             /* I    Signal type                     */
+    const oac_int16    x16[],                  /* I    input                           */
+    oac_int32          x_sc_Q10[],             /* O    input scaled with 1/Gain        */
+    const oac_int16    sLTP[],                 /* I    re-whitened LTP state in Q0     */
+    oac_int32          sLTP_Q15[],             /* O    LTP state matching scaled input */
+    oac_int            subfr,                  /* I    subframe number                 */
+    const oac_int      LTP_scale_Q14,          /* I                                    */
+    const oac_int32    Gains_Q16[ MAX_NB_SUBFR ], /* I                                 */
+    const oac_int      pitchL[ MAX_NB_SUBFR ], /* I    Pitch lag                       */
+    const oac_int      signal_type             /* I    Signal type                     */
 )
 {
-    opus_int   i, lag;
-    opus_int32 gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
+    oac_int   i, lag;
+    oac_int32 gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
 
     lag          = pitchL[ subfr ];
     inv_gain_Q31 = silk_INVERSE32_varQ( silk_max( Gains_Q16[ subfr ], 1 ), 47 );
diff --git a/silk/NSQ.h b/silk/NSQ.h
index c0f2343c8..f9ccbe4c5 100644
--- a/silk/NSQ.h
+++ b/silk/NSQ.h
@@ -32,9 +32,9 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #undef silk_short_prediction_create_arch_coef
 
-static OPUS_INLINE opus_int32 silk_noise_shape_quantizer_short_prediction_c(const opus_int32 *buf32, const opus_int16 *coef16, opus_int order)
+static OAC_INLINE oac_int32 silk_noise_shape_quantizer_short_prediction_c(const oac_int32 *buf32, const oac_int16 *coef16, oac_int order)
 {
-    opus_int32 out;
+    oac_int32 out;
     silk_assert( order == 10 || order == 16 );
 
     /* Avoids introducing a bias because silk_SMLAWB() always rounds to -inf */
@@ -64,11 +64,11 @@ static OPUS_INLINE opus_int32 silk_noise_shape_quantizer_short_prediction_c(cons
 
 #define silk_noise_shape_quantizer_short_prediction(in, coef, coefRev, order, arch)  ((void)arch,silk_noise_shape_quantizer_short_prediction_c(in, coef, order))
 
-static OPUS_INLINE opus_int32 silk_NSQ_noise_shape_feedback_loop_c(const opus_int32 *data0, opus_int32 *data1, const opus_int16 *coef, opus_int order)
+static OAC_INLINE oac_int32 silk_NSQ_noise_shape_feedback_loop_c(const oac_int32 *data0, oac_int32 *data1, const oac_int16 *coef, oac_int order)
 {
-    opus_int32 out;
-    opus_int32 tmp1, tmp2;
-    opus_int j;
+    oac_int32 out;
+    oac_int32 tmp1, tmp2;
+    oac_int j;
 
     tmp2 = data0[0];
     tmp1 = data1[0];
@@ -94,7 +94,7 @@ static OPUS_INLINE opus_int32 silk_NSQ_noise_shape_feedback_loop_c(const opus_in
 
 #define silk_NSQ_noise_shape_feedback_loop(data0, data1, coef, order, arch)  ((void)arch,silk_NSQ_noise_shape_feedback_loop_c(data0, data1, coef, order))
 
-#if defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+#if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 #include "arm/NSQ_neon.h"
 #endif
 
diff --git a/silk/NSQ_del_dec.c b/silk/NSQ_del_dec.c
index 31ac11af4..c89555eb3 100644
--- a/silk/NSQ_del_dec.c
+++ b/silk/NSQ_del_dec.c
@@ -35,79 +35,79 @@ POSSIBILITY OF SUCH DAMAGE.
 
 
 typedef struct {
-    opus_int32 sLPC_Q14[ MAX_SUB_FRAME_LENGTH + NSQ_LPC_BUF_LENGTH ];
-    opus_int32 RandState[ DECISION_DELAY ];
-    opus_int32 Q_Q10[     DECISION_DELAY ];
-    opus_int32 Xq_Q14[    DECISION_DELAY ];
-    opus_int32 Pred_Q15[  DECISION_DELAY ];
-    opus_int32 Shape_Q14[ DECISION_DELAY ];
-    opus_int32 sAR2_Q14[ MAX_SHAPE_LPC_ORDER ];
-    opus_int32 LF_AR_Q14;
-    opus_int32 Diff_Q14;
-    opus_int32 Seed;
-    opus_int32 SeedInit;
-    opus_int32 RD_Q10;
+    oac_int32 sLPC_Q14[ MAX_SUB_FRAME_LENGTH + NSQ_LPC_BUF_LENGTH ];
+    oac_int32 RandState[ DECISION_DELAY ];
+    oac_int32 Q_Q10[     DECISION_DELAY ];
+    oac_int32 Xq_Q14[    DECISION_DELAY ];
+    oac_int32 Pred_Q15[  DECISION_DELAY ];
+    oac_int32 Shape_Q14[ DECISION_DELAY ];
+    oac_int32 sAR2_Q14[ MAX_SHAPE_LPC_ORDER ];
+    oac_int32 LF_AR_Q14;
+    oac_int32 Diff_Q14;
+    oac_int32 Seed;
+    oac_int32 SeedInit;
+    oac_int32 RD_Q10;
 } NSQ_del_dec_struct;
 
 typedef struct {
-    opus_int32 Q_Q10;
-    opus_int32 RD_Q10;
-    opus_int32 xq_Q14;
-    opus_int32 LF_AR_Q14;
-    opus_int32 Diff_Q14;
-    opus_int32 sLTP_shp_Q14;
-    opus_int32 LPC_exc_Q14;
+    oac_int32 Q_Q10;
+    oac_int32 RD_Q10;
+    oac_int32 xq_Q14;
+    oac_int32 LF_AR_Q14;
+    oac_int32 Diff_Q14;
+    oac_int32 sLTP_shp_Q14;
+    oac_int32 LPC_exc_Q14;
 } NSQ_sample_struct;
 
 typedef NSQ_sample_struct  NSQ_sample_pair[ 2 ];
 
-static OPUS_INLINE void silk_nsq_del_dec_scale_states(
+static OAC_INLINE void silk_nsq_del_dec_scale_states(
     const silk_encoder_state *psEncC,               /* I    Encoder State                       */
     silk_nsq_state      *NSQ,                       /* I/O  NSQ state                           */
     NSQ_del_dec_struct  psDelDec[],                 /* I/O  Delayed decision states             */
-    const opus_int16    x16[],                      /* I    Input                               */
-    opus_int32          x_sc_Q10[],                 /* O    Input scaled with 1/Gain in Q10     */
-    const opus_int16    sLTP[],                     /* I    Re-whitened LTP state in Q0         */
-    opus_int32          sLTP_Q15[],                 /* O    LTP state matching scaled input     */
-    opus_int            subfr,                      /* I    Subframe number                     */
-    opus_int            nStatesDelayedDecision,     /* I    Number of del dec states            */
-    const opus_int      LTP_scale_Q14,              /* I    LTP state scaling                   */
-    const opus_int32    Gains_Q16[ MAX_NB_SUBFR ],  /* I                                        */
-    const opus_int      pitchL[ MAX_NB_SUBFR ],     /* I    Pitch lag                           */
-    const opus_int      signal_type,                /* I    Signal type                         */
-    const opus_int      decisionDelay               /* I    Decision delay                      */
+    const oac_int16    x16[],                      /* I    Input                               */
+    oac_int32          x_sc_Q10[],                 /* O    Input scaled with 1/Gain in Q10     */
+    const oac_int16    sLTP[],                     /* I    Re-whitened LTP state in Q0         */
+    oac_int32          sLTP_Q15[],                 /* O    LTP state matching scaled input     */
+    oac_int            subfr,                      /* I    Subframe number                     */
+    oac_int            nStatesDelayedDecision,     /* I    Number of del dec states            */
+    const oac_int      LTP_scale_Q14,              /* I    LTP state scaling                   */
+    const oac_int32    Gains_Q16[ MAX_NB_SUBFR ],  /* I                                        */
+    const oac_int      pitchL[ MAX_NB_SUBFR ],     /* I    Pitch lag                           */
+    const oac_int      signal_type,                /* I    Signal type                         */
+    const oac_int      decisionDelay               /* I    Decision delay                      */
 );
 
 /******************************************/
 /* Noise shape quantizer for one subframe */
 /******************************************/
-static OPUS_INLINE void silk_noise_shape_quantizer_del_dec(
+static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                           */
     NSQ_del_dec_struct  psDelDec[],             /* I/O  Delayed decision states             */
-    opus_int            signalType,             /* I    Signal type                         */
-    const opus_int32    x_Q10[],                /* I                                        */
-    opus_int8           pulses[],               /* O                                        */
-    opus_int16          xq[],                   /* O                                        */
-    opus_int32          sLTP_Q15[],             /* I/O  LTP filter state                    */
-    opus_int32          delayedGain_Q10[],      /* I/O  Gain delay buffer                   */
-    const opus_int16    a_Q12[],                /* I    Short term prediction coefs         */
-    const opus_int16    b_Q14[],                /* I    Long term prediction coefs          */
-    const opus_int16    AR_shp_Q13[],           /* I    Noise shaping coefs                 */
-    opus_int            lag,                    /* I    Pitch lag                           */
-    opus_int32          HarmShapeFIRPacked_Q14, /* I                                        */
-    opus_int            Tilt_Q14,               /* I    Spectral tilt                       */
-    opus_int32          LF_shp_Q14,             /* I                                        */
-    opus_int32          Gain_Q16,               /* I                                        */
-    opus_int            Lambda_Q10,             /* I                                        */
-    opus_int            offset_Q10,             /* I                                        */
-    opus_int            length,                 /* I    Input length                        */
-    opus_int            subfr,                  /* I    Subframe number                     */
-    opus_int            shapingLPCOrder,        /* I    Shaping LPC filter order            */
-    opus_int            predictLPCOrder,        /* I    Prediction filter order             */
-    opus_int            warping_Q16,            /* I                                        */
-    opus_int            nStatesDelayedDecision, /* I    Number of states in decision tree   */
-    opus_int            *smpl_buf_idx,          /* I/O  Index to newest samples in buffers  */
-    opus_int            decisionDelay,          /* I                                        */
+    oac_int            signalType,             /* I    Signal type                         */
+    const oac_int32    x_Q10[],                /* I                                        */
+    oac_int8           pulses[],               /* O                                        */
+    oac_int16          xq[],                   /* O                                        */
+    oac_int32          sLTP_Q15[],             /* I/O  LTP filter state                    */
+    oac_int32          delayedGain_Q10[],      /* I/O  Gain delay buffer                   */
+    const oac_int16    a_Q12[],                /* I    Short term prediction coefs         */
+    const oac_int16    b_Q14[],                /* I    Long term prediction coefs          */
+    const oac_int16    AR_shp_Q13[],           /* I    Noise shaping coefs                 */
+    oac_int            lag,                    /* I    Pitch lag                           */
+    oac_int32          HarmShapeFIRPacked_Q14, /* I                                        */
+    oac_int            Tilt_Q14,               /* I    Spectral tilt                       */
+    oac_int32          LF_shp_Q14,             /* I                                        */
+    oac_int32          Gain_Q16,               /* I                                        */
+    oac_int            Lambda_Q10,             /* I                                        */
+    oac_int            offset_Q10,             /* I                                        */
+    oac_int            length,                 /* I    Input length                        */
+    oac_int            subfr,                  /* I    Subframe number                     */
+    oac_int            shapingLPCOrder,        /* I    Shaping LPC filter order            */
+    oac_int            predictLPCOrder,        /* I    Prediction filter order             */
+    oac_int            warping_Q16,            /* I                                        */
+    oac_int            nStatesDelayedDecision, /* I    Number of states in decision tree   */
+    oac_int            *smpl_buf_idx,          /* I/O  Index to newest samples in buffers  */
+    oac_int            decisionDelay,          /* I                                        */
     int                 arch                    /* I                                        */
 );
 
@@ -115,31 +115,31 @@ void silk_NSQ_del_dec_c(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const opus_int16            x16[],                                        /* I    Input                           */
-    opus_int8                   pulses[],                                     /* O    Quantized pulse signal          */
-    const opus_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const opus_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const opus_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const opus_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const opus_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const opus_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const opus_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const opus_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const opus_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const opus_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
+    const oac_int16            x16[],                                        /* I    Input                           */
+    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
+    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
+    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
+    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
+    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
+    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
+    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
+    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
+    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
+    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
 )
 {
-    opus_int            i, k, lag, start_idx, LSF_interpolation_flag, Winner_ind, subfr;
-    opus_int            last_smple_idx, smpl_buf_idx, decisionDelay;
-    const opus_int16    *A_Q12, *B_Q14, *AR_shp_Q13;
-    opus_int16          *pxq;
-    VARDECL( opus_int32, sLTP_Q15 );
-    VARDECL( opus_int16, sLTP );
-    opus_int32          HarmShapeFIRPacked_Q14;
-    opus_int            offset_Q10;
-    opus_int32          RDmin_Q10, Gain_Q10;
-    VARDECL( opus_int32, x_sc_Q10 );
-    VARDECL( opus_int32, delayedGain_Q10 );
+    oac_int            i, k, lag, start_idx, LSF_interpolation_flag, Winner_ind, subfr;
+    oac_int            last_smple_idx, smpl_buf_idx, decisionDelay;
+    const oac_int16    *A_Q12, *B_Q14, *AR_shp_Q13;
+    oac_int16          *pxq;
+    VARDECL( oac_int32, sLTP_Q15 );
+    VARDECL( oac_int16, sLTP );
+    oac_int32          HarmShapeFIRPacked_Q14;
+    oac_int            offset_Q10;
+    oac_int32          RDmin_Q10, Gain_Q10;
+    VARDECL( oac_int32, x_sc_Q10 );
+    VARDECL( oac_int32, delayedGain_Q10 );
     VARDECL( NSQ_del_dec_struct, psDelDec );
     NSQ_del_dec_struct  *psDD;
     SAVE_STACK;
@@ -160,7 +160,7 @@ void silk_NSQ_del_dec_c(
         psDD->LF_AR_Q14      = NSQ->sLF_AR_shp_Q14;
         psDD->Diff_Q14       = NSQ->sDiff_shp_Q14;
         psDD->Shape_Q14[ 0 ] = NSQ->sLTP_shp_Q14[ psEncC->ltp_mem_length - 1 ];
-        silk_memcpy( psDD->sLPC_Q14, NSQ->sLPC_Q14, NSQ_LPC_BUF_LENGTH * sizeof( opus_int32 ) );
+        silk_memcpy( psDD->sLPC_Q14, NSQ->sLPC_Q14, NSQ_LPC_BUF_LENGTH * sizeof( oac_int32 ) );
         silk_memcpy( psDD->sAR2_Q14, NSQ->sAR2_Q14, sizeof( NSQ->sAR2_Q14 ) );
     }
 
@@ -186,10 +186,10 @@ void silk_NSQ_del_dec_c(
         LSF_interpolation_flag = 1;
     }
 
-    ALLOC( sLTP_Q15, psEncC->ltp_mem_length + psEncC->frame_length, opus_int32 );
-    ALLOC( sLTP, psEncC->ltp_mem_length + psEncC->frame_length, opus_int16 );
-    ALLOC( x_sc_Q10, psEncC->subfr_length, opus_int32 );
-    ALLOC( delayedGain_Q10, DECISION_DELAY, opus_int32 );
+    ALLOC( sLTP_Q15, psEncC->ltp_mem_length + psEncC->frame_length, oac_int32 );
+    ALLOC( sLTP, psEncC->ltp_mem_length + psEncC->frame_length, oac_int16 );
+    ALLOC( x_sc_Q10, psEncC->subfr_length, oac_int32 );
+    ALLOC( delayedGain_Q10, DECISION_DELAY, oac_int32 );
     /* Set up pointers to start of sub frame */
     pxq                   = &NSQ->xq[ psEncC->ltp_mem_length ];
     NSQ->sLTP_shp_buf_idx = psEncC->ltp_mem_length;
@@ -203,7 +203,7 @@ void silk_NSQ_del_dec_c(
         /* Noise shape parameters */
         silk_assert( HarmShapeGain_Q14[ k ] >= 0 );
         HarmShapeFIRPacked_Q14  =                          silk_RSHIFT( HarmShapeGain_Q14[ k ], 2 );
-        HarmShapeFIRPacked_Q14 |= silk_LSHIFT( (opus_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
+        HarmShapeFIRPacked_Q14 |= silk_LSHIFT( (oac_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
 
         NSQ->rewhite_flag = 0;
         if( psIndices->signalType == TYPE_VOICED ) {
@@ -236,8 +236,8 @@ void silk_NSQ_del_dec_c(
                     for( i = 0; i < decisionDelay; i++ ) {
                         last_smple_idx = ( last_smple_idx - 1 ) % DECISION_DELAY;
                         if( last_smple_idx < 0 ) last_smple_idx += DECISION_DELAY;
-                        pulses[   i - decisionDelay ] = (opus_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ], 10 );
-                        pxq[ i - decisionDelay ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND(
+                        pulses[   i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ], 10 );
+                        pxq[ i - decisionDelay ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND(
                             silk_SMULWW( psDD->Xq_Q14[ last_smple_idx ], Gains_Q16[ 1 ] ), 14 ) );
                         NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay + i ] = psDD->Shape_Q14[ last_smple_idx ];
                     }
@@ -289,12 +289,12 @@ void silk_NSQ_del_dec_c(
         last_smple_idx = ( last_smple_idx - 1 ) % DECISION_DELAY;
         if( last_smple_idx < 0 ) last_smple_idx += DECISION_DELAY;
 
-        pulses[   i - decisionDelay ] = (opus_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ], 10 );
-        pxq[ i - decisionDelay ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND(
+        pulses[   i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ], 10 );
+        pxq[ i - decisionDelay ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND(
             silk_SMULWW( psDD->Xq_Q14[ last_smple_idx ], Gain_Q10 ), 8 ) );
         NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay + i ] = psDD->Shape_Q14[ last_smple_idx ];
     }
-    silk_memcpy( NSQ->sLPC_Q14, &psDD->sLPC_Q14[ psEncC->subfr_length ], NSQ_LPC_BUF_LENGTH * sizeof( opus_int32 ) );
+    silk_memcpy( NSQ->sLPC_Q14, &psDD->sLPC_Q14[ psEncC->subfr_length ], NSQ_LPC_BUF_LENGTH * sizeof( oac_int32 ) );
     silk_memcpy( NSQ->sAR2_Q14, psDD->sAR2_Q14, sizeof( psDD->sAR2_Q14 ) );
 
     /* Update states */
@@ -303,8 +303,8 @@ void silk_NSQ_del_dec_c(
     NSQ->lagPrev        = pitchL[ psEncC->nb_subfr - 1 ];
 
     /* Save quantized speech signal */
-    silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int16 ) );
-    silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int32 ) );
+    silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( oac_int16 ) );
+    silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( oac_int32 ) );
     RESTORE_STACK;
 }
 
@@ -312,45 +312,45 @@ void silk_NSQ_del_dec_c(
 /* Noise shape quantizer for one subframe */
 /******************************************/
 #ifndef OVERRIDE_silk_noise_shape_quantizer_del_dec
-static OPUS_INLINE void silk_noise_shape_quantizer_del_dec(
+static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                           */
     NSQ_del_dec_struct  psDelDec[],             /* I/O  Delayed decision states             */
-    opus_int            signalType,             /* I    Signal type                         */
-    const opus_int32    x_Q10[],                /* I                                        */
-    opus_int8           pulses[],               /* O                                        */
-    opus_int16          xq[],                   /* O                                        */
-    opus_int32          sLTP_Q15[],             /* I/O  LTP filter state                    */
-    opus_int32          delayedGain_Q10[],      /* I/O  Gain delay buffer                   */
-    const opus_int16    a_Q12[],                /* I    Short term prediction coefs         */
-    const opus_int16    b_Q14[],                /* I    Long term prediction coefs          */
-    const opus_int16    AR_shp_Q13[],           /* I    Noise shaping coefs                 */
-    opus_int            lag,                    /* I    Pitch lag                           */
-    opus_int32          HarmShapeFIRPacked_Q14, /* I                                        */
-    opus_int            Tilt_Q14,               /* I    Spectral tilt                       */
-    opus_int32          LF_shp_Q14,             /* I                                        */
-    opus_int32          Gain_Q16,               /* I                                        */
-    opus_int            Lambda_Q10,             /* I                                        */
-    opus_int            offset_Q10,             /* I                                        */
-    opus_int            length,                 /* I    Input length                        */
-    opus_int            subfr,                  /* I    Subframe number                     */
-    opus_int            shapingLPCOrder,        /* I    Shaping LPC filter order            */
-    opus_int            predictLPCOrder,        /* I    Prediction filter order             */
-    opus_int            warping_Q16,            /* I                                        */
-    opus_int            nStatesDelayedDecision, /* I    Number of states in decision tree   */
-    opus_int            *smpl_buf_idx,          /* I/O  Index to newest samples in buffers  */
-    opus_int            decisionDelay,          /* I                                        */
+    oac_int            signalType,             /* I    Signal type                         */
+    const oac_int32    x_Q10[],                /* I                                        */
+    oac_int8           pulses[],               /* O                                        */
+    oac_int16          xq[],                   /* O                                        */
+    oac_int32          sLTP_Q15[],             /* I/O  LTP filter state                    */
+    oac_int32          delayedGain_Q10[],      /* I/O  Gain delay buffer                   */
+    const oac_int16    a_Q12[],                /* I    Short term prediction coefs         */
+    const oac_int16    b_Q14[],                /* I    Long term prediction coefs          */
+    const oac_int16    AR_shp_Q13[],           /* I    Noise shaping coefs                 */
+    oac_int            lag,                    /* I    Pitch lag                           */
+    oac_int32          HarmShapeFIRPacked_Q14, /* I                                        */
+    oac_int            Tilt_Q14,               /* I    Spectral tilt                       */
+    oac_int32          LF_shp_Q14,             /* I                                        */
+    oac_int32          Gain_Q16,               /* I                                        */
+    oac_int            Lambda_Q10,             /* I                                        */
+    oac_int            offset_Q10,             /* I                                        */
+    oac_int            length,                 /* I    Input length                        */
+    oac_int            subfr,                  /* I    Subframe number                     */
+    oac_int            shapingLPCOrder,        /* I    Shaping LPC filter order            */
+    oac_int            predictLPCOrder,        /* I    Prediction filter order             */
+    oac_int            warping_Q16,            /* I                                        */
+    oac_int            nStatesDelayedDecision, /* I    Number of states in decision tree   */
+    oac_int            *smpl_buf_idx,          /* I/O  Index to newest samples in buffers  */
+    oac_int            decisionDelay,          /* I                                        */
     int                 arch                    /* I                                        */
 )
 {
-    opus_int     i, j, k, Winner_ind, RDmin_ind, RDmax_ind, last_smple_idx;
-    opus_int32   Winner_rand_state;
-    opus_int32   LTP_pred_Q14, LPC_pred_Q14, n_AR_Q14, n_LTP_Q14;
-    opus_int32   n_LF_Q14, r_Q10, rr_Q10, rd1_Q10, rd2_Q10, RDmin_Q10, RDmax_Q10;
-    opus_int32   q1_Q0, q1_Q10, q2_Q10, exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10;
-    opus_int32   tmp1, tmp2, sLF_AR_shp_Q14;
-    opus_int32   *pred_lag_ptr, *shp_lag_ptr, *psLPC_Q14;
+    oac_int     i, j, k, Winner_ind, RDmin_ind, RDmax_ind, last_smple_idx;
+    oac_int32   Winner_rand_state;
+    oac_int32   LTP_pred_Q14, LPC_pred_Q14, n_AR_Q14, n_LTP_Q14;
+    oac_int32   n_LF_Q14, r_Q10, rr_Q10, rd1_Q10, rd2_Q10, RDmin_Q10, RDmax_Q10;
+    oac_int32   q1_Q0, q1_Q10, q2_Q10, exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10;
+    oac_int32   tmp1, tmp2, sLF_AR_shp_Q14;
+    oac_int32   *pred_lag_ptr, *shp_lag_ptr, *psLPC_Q14;
 #ifdef silk_short_prediction_create_arch_coef
-    opus_int32   a_Q12_arch[MAX_LPC_ORDER];
+    oac_int32   a_Q12_arch[MAX_LPC_ORDER];
 #endif
 
     VARDECL( NSQ_sample_pair, psSampleState );
@@ -602,16 +602,16 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec(
 
         /* Replace a state if best from second set outperforms worst in first set */
         if( RDmin_Q10 < RDmax_Q10 ) {
-            silk_memcpy( ( (opus_int32 *)&psDelDec[ RDmax_ind ] ) + i,
-                         ( (opus_int32 *)&psDelDec[ RDmin_ind ] ) + i, sizeof( NSQ_del_dec_struct ) - i * sizeof( opus_int32) );
+            silk_memcpy( ( (oac_int32 *)&psDelDec[ RDmax_ind ] ) + i,
+                         ( (oac_int32 *)&psDelDec[ RDmin_ind ] ) + i, sizeof( NSQ_del_dec_struct ) - i * sizeof( oac_int32) );
             silk_memcpy( &psSampleState[ RDmax_ind ][ 0 ], &psSampleState[ RDmin_ind ][ 1 ], sizeof( NSQ_sample_struct ) );
         }
 
         /* Write samples from winner to output and long-term filter states */
         psDD = &psDelDec[ Winner_ind ];
         if( subfr > 0 || i >= decisionDelay ) {
-            pulses[  i - decisionDelay ] = (opus_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ], 10 );
-            xq[ i - decisionDelay ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND(
+            pulses[  i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ], 10 );
+            xq[ i - decisionDelay ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND(
                 silk_SMULWW( psDD->Xq_Q14[ last_smple_idx ], delayedGain_Q10[ last_smple_idx ] ), 8 ) );
             NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay ] = psDD->Shape_Q14[ last_smple_idx ];
             sLTP_Q15[          NSQ->sLTP_buf_idx     - decisionDelay ] = psDD->Pred_Q15[  last_smple_idx ];
@@ -639,31 +639,31 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec(
     /* Update LPC states */
     for( k = 0; k < nStatesDelayedDecision; k++ ) {
         psDD = &psDelDec[ k ];
-        silk_memcpy( psDD->sLPC_Q14, &psDD->sLPC_Q14[ length ], NSQ_LPC_BUF_LENGTH * sizeof( opus_int32 ) );
+        silk_memcpy( psDD->sLPC_Q14, &psDD->sLPC_Q14[ length ], NSQ_LPC_BUF_LENGTH * sizeof( oac_int32 ) );
     }
     RESTORE_STACK;
 }
 #endif /* OVERRIDE_silk_noise_shape_quantizer_del_dec */
 
-static OPUS_INLINE void silk_nsq_del_dec_scale_states(
+static OAC_INLINE void silk_nsq_del_dec_scale_states(
     const silk_encoder_state *psEncC,               /* I    Encoder State                       */
     silk_nsq_state      *NSQ,                       /* I/O  NSQ state                           */
     NSQ_del_dec_struct  psDelDec[],                 /* I/O  Delayed decision states             */
-    const opus_int16    x16[],                      /* I    Input                               */
-    opus_int32          x_sc_Q10[],                 /* O    Input scaled with 1/Gain in Q10     */
-    const opus_int16    sLTP[],                     /* I    Re-whitened LTP state in Q0         */
-    opus_int32          sLTP_Q15[],                 /* O    LTP state matching scaled input     */
-    opus_int            subfr,                      /* I    Subframe number                     */
-    opus_int            nStatesDelayedDecision,     /* I    Number of del dec states            */
-    const opus_int      LTP_scale_Q14,              /* I    LTP state scaling                   */
-    const opus_int32    Gains_Q16[ MAX_NB_SUBFR ],  /* I                                        */
-    const opus_int      pitchL[ MAX_NB_SUBFR ],     /* I    Pitch lag                           */
-    const opus_int      signal_type,                /* I    Signal type                         */
-    const opus_int      decisionDelay               /* I    Decision delay                      */
+    const oac_int16    x16[],                      /* I    Input                               */
+    oac_int32          x_sc_Q10[],                 /* O    Input scaled with 1/Gain in Q10     */
+    const oac_int16    sLTP[],                     /* I    Re-whitened LTP state in Q0         */
+    oac_int32          sLTP_Q15[],                 /* O    LTP state matching scaled input     */
+    oac_int            subfr,                      /* I    Subframe number                     */
+    oac_int            nStatesDelayedDecision,     /* I    Number of del dec states            */
+    const oac_int      LTP_scale_Q14,              /* I    LTP state scaling                   */
+    const oac_int32    Gains_Q16[ MAX_NB_SUBFR ],  /* I                                        */
+    const oac_int      pitchL[ MAX_NB_SUBFR ],     /* I    Pitch lag                           */
+    const oac_int      signal_type,                /* I    Signal type                         */
+    const oac_int      decisionDelay               /* I    Decision delay                      */
 )
 {
-    opus_int            i, k, lag;
-    opus_int32          gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
+    oac_int            i, k, lag;
+    oac_int32          gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
     NSQ_del_dec_struct  *psDD;
 
     lag          = pitchL[ subfr ];
diff --git a/silk/PLC.c b/silk/PLC.c
index 26aa88985..1d79548c1 100644
--- a/silk/PLC.c
+++ b/silk/PLC.c
@@ -38,19 +38,19 @@ POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #define NB_ATT 2
-static const opus_int16 HARM_ATT_Q15[NB_ATT]              = { 32440, 31130 }; /* 0.99, 0.95 */
-static const opus_int16 PLC_RAND_ATTENUATE_V_Q15[NB_ATT]  = { 31130, 26214 }; /* 0.95, 0.8 */
-static const opus_int16 PLC_RAND_ATTENUATE_UV_Q15[NB_ATT] = { 32440, 29491 }; /* 0.99, 0.9 */
+static const oac_int16 HARM_ATT_Q15[NB_ATT]              = { 32440, 31130 }; /* 0.99, 0.95 */
+static const oac_int16 PLC_RAND_ATTENUATE_V_Q15[NB_ATT]  = { 31130, 26214 }; /* 0.95, 0.8 */
+static const oac_int16 PLC_RAND_ATTENUATE_UV_Q15[NB_ATT] = { 32440, 29491 }; /* 0.99, 0.9 */
 
-static OPUS_INLINE void silk_PLC_update(
+static OAC_INLINE void silk_PLC_update(
     silk_decoder_state                  *psDec,             /* I/O Decoder state        */
     silk_decoder_control                *psDecCtrl          /* I/O Decoder control      */
 );
 
-static OPUS_INLINE void silk_PLC_conceal(
+static OAC_INLINE void silk_PLC_conceal(
     silk_decoder_state                  *psDec,             /* I/O Decoder state        */
     silk_decoder_control                *psDecCtrl,         /* I/O Decoder control      */
-    opus_int16                          frame[],            /* O LPC residual signal    */
+    oac_int16                          frame[],            /* O LPC residual signal    */
 #ifdef ENABLE_DEEP_PLC
     LPCNetPLCState                      *lpcnet,
 #endif
@@ -72,8 +72,8 @@ void silk_PLC_Reset(
 void silk_PLC(
     silk_decoder_state                  *psDec,             /* I/O Decoder state        */
     silk_decoder_control                *psDecCtrl,         /* I/O Decoder control      */
-    opus_int16                          frame[],            /* I/O  signal              */
-    opus_int                            lost,               /* I Loss flag              */
+    oac_int16                          frame[],            /* I/O  signal              */
+    oac_int                            lost,               /* I Loss flag              */
 #ifdef ENABLE_DEEP_PLC
     LPCNetPLCState                      *lpcnet,
 #endif
@@ -116,13 +116,13 @@ void silk_PLC(
 /**************************************************/
 /* Update state of PLC                            */
 /**************************************************/
-static OPUS_INLINE void silk_PLC_update(
+static OAC_INLINE void silk_PLC_update(
     silk_decoder_state                  *psDec,             /* I/O Decoder state        */
     silk_decoder_control                *psDecCtrl          /* I/O Decoder control      */
 )
 {
-    opus_int32 LTP_Gain_Q14, temp_LTP_Gain_Q14;
-    opus_int   i, j;
+    oac_int32 LTP_Gain_Q14, temp_LTP_Gain_Q14;
+    oac_int   i, j;
     silk_PLC_struct *psPLC;
 
     psPLC = &psDec->sPLC;
@@ -144,19 +144,19 @@ static OPUS_INLINE void silk_PLC_update(
                 LTP_Gain_Q14 = temp_LTP_Gain_Q14;
                 silk_memcpy( psPLC->LTPCoef_Q14,
                     &psDecCtrl->LTPCoef_Q14[ silk_SMULBB( psDec->nb_subfr - 1 - j, LTP_ORDER ) ],
-                    LTP_ORDER * sizeof( opus_int16 ) );
+                    LTP_ORDER * sizeof( oac_int16 ) );
 
                 psPLC->pitchL_Q8 = silk_LSHIFT( psDecCtrl->pitchL[ psDec->nb_subfr - 1 - j ], 8 );
             }
         }
 
-        silk_memset( psPLC->LTPCoef_Q14, 0, LTP_ORDER * sizeof( opus_int16 ) );
+        silk_memset( psPLC->LTPCoef_Q14, 0, LTP_ORDER * sizeof( oac_int16 ) );
         psPLC->LTPCoef_Q14[ LTP_ORDER / 2 ] = LTP_Gain_Q14;
 
         /* Limit LT coefs */
         if( LTP_Gain_Q14 < V_PITCH_GAIN_START_MIN_Q14 ) {
-            opus_int   scale_Q10;
-            opus_int32 tmp;
+            oac_int   scale_Q10;
+            oac_int32 tmp;
 
             tmp = silk_LSHIFT( V_PITCH_GAIN_START_MIN_Q14, 10 );
             scale_Q10 = silk_DIV32( tmp, silk_max( LTP_Gain_Q14, 1 ) );
@@ -164,8 +164,8 @@ static OPUS_INLINE void silk_PLC_update(
                 psPLC->LTPCoef_Q14[ i ] = silk_RSHIFT( silk_SMULBB( psPLC->LTPCoef_Q14[ i ], scale_Q10 ), 10 );
             }
         } else if( LTP_Gain_Q14 > V_PITCH_GAIN_START_MAX_Q14 ) {
-            opus_int   scale_Q14;
-            opus_int32 tmp;
+            oac_int   scale_Q14;
+            oac_int32 tmp;
 
             tmp = silk_LSHIFT( V_PITCH_GAIN_START_MAX_Q14, 14 );
             scale_Q14 = silk_DIV32( tmp, silk_max( LTP_Gain_Q14, 1 ) );
@@ -175,34 +175,34 @@ static OPUS_INLINE void silk_PLC_update(
         }
     } else {
         psPLC->pitchL_Q8 = silk_LSHIFT( silk_SMULBB( psDec->fs_kHz, 18 ), 8 );
-        silk_memset( psPLC->LTPCoef_Q14, 0, LTP_ORDER * sizeof( opus_int16 ));
+        silk_memset( psPLC->LTPCoef_Q14, 0, LTP_ORDER * sizeof( oac_int16 ));
     }
 
     /* Save LPC coefficients */
-    silk_memcpy( psPLC->prevLPC_Q12, psDecCtrl->PredCoef_Q12[ 1 ], psDec->LPC_order * sizeof( opus_int16 ) );
+    silk_memcpy( psPLC->prevLPC_Q12, psDecCtrl->PredCoef_Q12[ 1 ], psDec->LPC_order * sizeof( oac_int16 ) );
     psPLC->prevLTP_scale_Q14 = psDecCtrl->LTP_scale_Q14;
 
     /* Save last two gains */
-    silk_memcpy( psPLC->prevGain_Q16, &psDecCtrl->Gains_Q16[ psDec->nb_subfr - 2 ], 2 * sizeof( opus_int32 ) );
+    silk_memcpy( psPLC->prevGain_Q16, &psDecCtrl->Gains_Q16[ psDec->nb_subfr - 2 ], 2 * sizeof( oac_int32 ) );
 
     psPLC->subfr_length = psDec->subfr_length;
     psPLC->nb_subfr = psDec->nb_subfr;
 }
 
-static OPUS_INLINE void silk_PLC_energy(opus_int32 *energy1, opus_int *shift1, opus_int32 *energy2, opus_int *shift2,
-      const opus_int32 *exc_Q14, const opus_int32 *prevGain_Q10, int subfr_length, int nb_subfr)
+static OAC_INLINE void silk_PLC_energy(oac_int32 *energy1, oac_int *shift1, oac_int32 *energy2, oac_int *shift2,
+      const oac_int32 *exc_Q14, const oac_int32 *prevGain_Q10, int subfr_length, int nb_subfr)
 {
     int i, k;
-    VARDECL( opus_int16, exc_buf );
-    opus_int16 *exc_buf_ptr;
+    VARDECL( oac_int16, exc_buf );
+    oac_int16 *exc_buf_ptr;
     SAVE_STACK;
-    ALLOC( exc_buf, 2*subfr_length, opus_int16 );
+    ALLOC( exc_buf, 2*subfr_length, oac_int16 );
     /* Find random noise component */
     /* Scale previous excitation signal */
     exc_buf_ptr = exc_buf;
     for( k = 0; k < 2; k++ ) {
         for( i = 0; i < subfr_length; i++ ) {
-            exc_buf_ptr[ i ] = (opus_int16)silk_SAT16( silk_RSHIFT(
+            exc_buf_ptr[ i ] = (oac_int16)silk_SAT16( silk_RSHIFT(
                 silk_SMULWW( exc_Q14[ i + ( k + nb_subfr - 2 ) * subfr_length ], prevGain_Q10[ k ] ), 8 ) );
         }
         exc_buf_ptr += subfr_length;
@@ -213,41 +213,41 @@ static OPUS_INLINE void silk_PLC_energy(opus_int32 *energy1, opus_int *shift1, o
     RESTORE_STACK;
 }
 
-static OPUS_INLINE void silk_PLC_conceal(
+static OAC_INLINE void silk_PLC_conceal(
     silk_decoder_state                  *psDec,             /* I/O Decoder state        */
     silk_decoder_control                *psDecCtrl,         /* I/O Decoder control      */
-    opus_int16                          frame[],            /* O LPC residual signal    */
+    oac_int16                          frame[],            /* O LPC residual signal    */
 #ifdef ENABLE_DEEP_PLC
     LPCNetPLCState                      *lpcnet,
 #endif
     int                                 arch                /* I Run-time architecture  */
 )
 {
-    opus_int   i, j, k;
-    opus_int   lag, idx, sLTP_buf_idx, shift1, shift2;
-    opus_int32 rand_seed, harm_Gain_Q15, rand_Gain_Q15, inv_gain_Q30;
-    opus_int32 energy1, energy2, *rand_ptr, *pred_lag_ptr;
-    opus_int32 LPC_pred_Q10, LTP_pred_Q12;
-    opus_int16 rand_scale_Q14;
-    opus_int16 *B_Q14;
-    opus_int32 *sLPC_Q14_ptr;
-    opus_int16 A_Q12[ MAX_LPC_ORDER ];
+    oac_int   i, j, k;
+    oac_int   lag, idx, sLTP_buf_idx, shift1, shift2;
+    oac_int32 rand_seed, harm_Gain_Q15, rand_Gain_Q15, inv_gain_Q30;
+    oac_int32 energy1, energy2, *rand_ptr, *pred_lag_ptr;
+    oac_int32 LPC_pred_Q10, LTP_pred_Q12;
+    oac_int16 rand_scale_Q14;
+    oac_int16 *B_Q14;
+    oac_int32 *sLPC_Q14_ptr;
+    oac_int16 A_Q12[ MAX_LPC_ORDER ];
 #ifdef SMALL_FOOTPRINT
-    opus_int16 *sLTP;
+    oac_int16 *sLTP;
 #else
-    VARDECL( opus_int16, sLTP );
+    VARDECL( oac_int16, sLTP );
 #endif
-    VARDECL( opus_int32, sLTP_Q14 );
+    VARDECL( oac_int32, sLTP_Q14 );
     silk_PLC_struct *psPLC = &psDec->sPLC;
-    opus_int32 prevGain_Q10[2];
+    oac_int32 prevGain_Q10[2];
     SAVE_STACK;
 
-    ALLOC( sLTP_Q14, psDec->ltp_mem_length + psDec->frame_length, opus_int32 );
+    ALLOC( sLTP_Q14, psDec->ltp_mem_length + psDec->frame_length, oac_int32 );
 #ifdef SMALL_FOOTPRINT
     /* Ugly hack that breaks aliasing rules to save stack: put sLTP at the very end of sLTP_Q14. */
-    sLTP = ((opus_int16*)&sLTP_Q14[psDec->ltp_mem_length + psDec->frame_length])-psDec->ltp_mem_length;
+    sLTP = ((oac_int16*)&sLTP_Q14[psDec->ltp_mem_length + psDec->frame_length])-psDec->ltp_mem_length;
 #else
-    ALLOC( sLTP, psDec->ltp_mem_length, opus_int16 );
+    ALLOC( sLTP, psDec->ltp_mem_length, oac_int16 );
 #endif
 
     prevGain_Q10[0] = silk_RSHIFT( psPLC->prevGain_Q16[ 0 ], 6);
@@ -283,7 +283,7 @@ static OPUS_INLINE void silk_PLC_conceal(
     silk_bwexpander( psPLC->prevLPC_Q12, psDec->LPC_order, SILK_FIX_CONST( BWE_COEF, 16 ) );
 
     /* Preload LPC coefficients to array on stack. Gives small performance gain */
-    silk_memcpy( A_Q12, psPLC->prevLPC_Q12, psDec->LPC_order * sizeof( opus_int16 ) );
+    silk_memcpy( A_Q12, psPLC->prevLPC_Q12, psDec->LPC_order * sizeof( oac_int16 ) );
 
     /* First Lost frame */
     if( psDec->lossCnt == 0 ) {
@@ -295,15 +295,15 @@ static OPUS_INLINE void silk_PLC_conceal(
                 rand_scale_Q14 -= B_Q14[ i ];
             }
             rand_scale_Q14 = silk_max_16( 3277, rand_scale_Q14 ); /* 0.2 */
-            rand_scale_Q14 = (opus_int16)silk_RSHIFT( silk_SMULBB( rand_scale_Q14, psPLC->prevLTP_scale_Q14 ), 14 );
+            rand_scale_Q14 = (oac_int16)silk_RSHIFT( silk_SMULBB( rand_scale_Q14, psPLC->prevLTP_scale_Q14 ), 14 );
         } else {
             /* Reduce random noise for unvoiced frames with high LPC gain */
-            opus_int32 invGain_Q30, down_scale_Q30;
+            oac_int32 invGain_Q30, down_scale_Q30;
 
             invGain_Q30 = silk_LPC_inverse_pred_gain( psPLC->prevLPC_Q12, psDec->LPC_order, arch );
 
-            down_scale_Q30 = silk_min_32( silk_RSHIFT( (opus_int32)1 << 30, LOG2_INV_LPC_GAIN_HIGH_THRES ), invGain_Q30 );
-            down_scale_Q30 = silk_max_32( silk_RSHIFT( (opus_int32)1 << 30, LOG2_INV_LPC_GAIN_LOW_THRES ), down_scale_Q30 );
+            down_scale_Q30 = silk_min_32( silk_RSHIFT( (oac_int32)1 << 30, LOG2_INV_LPC_GAIN_HIGH_THRES ), invGain_Q30 );
+            down_scale_Q30 = silk_max_32( silk_RSHIFT( (oac_int32)1 << 30, LOG2_INV_LPC_GAIN_LOW_THRES ), down_scale_Q30 );
             down_scale_Q30 = silk_LSHIFT( down_scale_Q30, LOG2_INV_LPC_GAIN_HIGH_THRES );
 
             rand_Gain_Q15 = silk_RSHIFT( silk_SMULWB( down_scale_Q30, rand_Gain_Q15 ), 14 );
@@ -368,7 +368,7 @@ static OPUS_INLINE void silk_PLC_conceal(
     sLPC_Q14_ptr = &sLTP_Q14[ psDec->ltp_mem_length - MAX_LPC_ORDER ];
 
     /* Copy LPC state */
-    silk_memcpy( sLPC_Q14_ptr, psDec->sLPC_Q14_buf, MAX_LPC_ORDER * sizeof( opus_int32 ) );
+    silk_memcpy( sLPC_Q14_ptr, psDec->sLPC_Q14_buf, MAX_LPC_ORDER * sizeof( oac_int32 ) );
 
     celt_assert( psDec->LPC_order >= 10 ); /* check that unrolling works */
     for( i = 0; i < psDec->frame_length; i++ ) {
@@ -394,7 +394,7 @@ static OPUS_INLINE void silk_PLC_conceal(
                                             silk_LSHIFT_SAT32( LPC_pred_Q10, 4 ));
 
         /* Scale with Gain */
-        frame[ i ] = (opus_int16)silk_SAT16( silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( sLPC_Q14_ptr[ MAX_LPC_ORDER + i ], prevGain_Q10[ 1 ] ), 8 ) ) );
+        frame[ i ] = (oac_int16)silk_SAT16( silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( sLPC_Q14_ptr[ MAX_LPC_ORDER + i ], prevGain_Q10[ 1 ] ), 8 ) ) );
     }
 #ifdef ENABLE_DEEP_PLC
     if ( lpcnet != NULL && lpcnet->loaded && psDec->sPLC.fs_kHz == 16 ) {
@@ -416,7 +416,7 @@ static OPUS_INLINE void silk_PLC_conceal(
 #endif
 
     /* Save LPC state */
-    silk_memcpy( psDec->sLPC_Q14_buf, &sLPC_Q14_ptr[ psDec->frame_length ], MAX_LPC_ORDER * sizeof( opus_int32 ) );
+    silk_memcpy( psDec->sLPC_Q14_buf, &sLPC_Q14_ptr[ psDec->frame_length ], MAX_LPC_ORDER * sizeof( oac_int32 ) );
 
     /**************************************/
     /* Update states                      */
@@ -432,12 +432,12 @@ static OPUS_INLINE void silk_PLC_conceal(
 /* Glues concealed frames with new good received frames */
 void silk_PLC_glue_frames(
     silk_decoder_state                  *psDec,             /* I/O decoder state        */
-    opus_int16                          frame[],            /* I/O signal               */
-    opus_int                            length              /* I length of signal       */
+    oac_int16                          frame[],            /* I/O signal               */
+    oac_int                            length              /* I length of signal       */
 )
 {
-    opus_int   i, energy_shift;
-    opus_int32 energy;
+    oac_int   i, energy_shift;
+    oac_int32 energy;
     silk_PLC_struct *psPLC;
     psPLC = &psDec->sPLC;
 
@@ -460,8 +460,8 @@ void silk_PLC_glue_frames(
 
             /* Fade in the energy difference */
             if( energy > psPLC->conc_energy ) {
-                opus_int32 frac_Q24, LZ;
-                opus_int32 gain_Q16, slope_Q16;
+                oac_int32 frac_Q24, LZ;
+                oac_int32 gain_Q16, slope_Q16;
 
                 LZ = silk_CLZ32( psPLC->conc_energy );
                 LZ = LZ - 1;
@@ -471,7 +471,7 @@ void silk_PLC_glue_frames(
                 frac_Q24 = silk_DIV32( psPLC->conc_energy, silk_max( energy, 1 ) );
 
                 gain_Q16 = silk_LSHIFT( silk_SQRT_APPROX( frac_Q24 ), 4 );
-                slope_Q16 = silk_DIV32_16( ( (opus_int32)1 << 16 ) - gain_Q16, length );
+                slope_Q16 = silk_DIV32_16( ( (oac_int32)1 << 16 ) - gain_Q16, length );
                 /* Make slope 4x steeper to avoid missing onsets after DTX */
                 slope_Q16 = silk_LSHIFT( slope_Q16, 2 );
 #ifdef ENABLE_DEEP_PLC
@@ -481,7 +481,7 @@ void silk_PLC_glue_frames(
                     for( i = 0; i < length; i++ ) {
                         frame[ i ] = silk_SMULWB( gain_Q16, frame[ i ] );
                         gain_Q16 += slope_Q16;
-                        if( gain_Q16 > (opus_int32)1 << 16 ) {
+                        if( gain_Q16 > (oac_int32)1 << 16 ) {
                             break;
                         }
                     }
diff --git a/silk/PLC.h b/silk/PLC.h
index 7dffcc3c2..764d01842 100644
--- a/silk/PLC.h
+++ b/silk/PLC.h
@@ -47,8 +47,8 @@ void silk_PLC_Reset(
 void silk_PLC(
     silk_decoder_state                  *psDec,             /* I/O Decoder state        */
     silk_decoder_control                *psDecCtrl,         /* I/O Decoder control      */
-    opus_int16                          frame[],            /* I/O  signal              */
-    opus_int                            lost,               /* I Loss flag              */
+    oac_int16                          frame[],            /* I/O  signal              */
+    oac_int                            lost,               /* I Loss flag              */
 #ifdef ENABLE_DEEP_PLC
     LPCNetPLCState                      *lpcnet,
 #endif
@@ -57,8 +57,8 @@ void silk_PLC(
 
 void silk_PLC_glue_frames(
     silk_decoder_state                  *psDec,             /* I/O decoder state        */
-    opus_int16                          frame[],            /* I/O signal               */
-    opus_int                            length              /* I length of signal       */
+    oac_int16                          frame[],            /* I/O signal               */
+    oac_int                            length              /* I length of signal       */
 );
 
 #endif
diff --git a/silk/SigProc_FIX.h b/silk/SigProc_FIX.h
index 053da9ab0..4d6d19ef2 100644
--- a/silk/SigProc_FIX.h
+++ b/silk/SigProc_FIX.h
@@ -39,11 +39,11 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "macros.h"
 #include "cpu_support.h"
 
-#if defined(OPUS_X86_MAY_HAVE_SSE4_1)
+#if defined(OAC_X86_MAY_HAVE_SSE4_1)
 #include "x86/SigProc_FIX_sse.h"
 #endif
 
-#if (defined(OPUS_ARM_ASM) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR))
+#if (defined(OAC_ARM_ASM) || defined(OAC_ARM_MAY_HAVE_NEON_INTR))
 #include "arm/biquad_alt_arm.h"
 #include "arm/LPC_inv_pred_gain_arm.h"
 #endif
@@ -55,41 +55,41 @@ POSSIBILITY OF SUCH DAMAGE.
 /*!
  * Initialize/reset the resampler state for a given pair of input/output sampling rates
 */
-opus_int silk_resampler_init(
+oac_int silk_resampler_init(
     silk_resampler_state_struct *S,                 /* I/O  Resampler state                                             */
-    opus_int32                  Fs_Hz_in,           /* I    Input sampling rate (Hz)                                    */
-    opus_int32                  Fs_Hz_out,          /* I    Output sampling rate (Hz)                                   */
-    opus_int                    forEnc              /* I    If 1: encoder; if 0: decoder                                */
+    oac_int32                  Fs_Hz_in,           /* I    Input sampling rate (Hz)                                    */
+    oac_int32                  Fs_Hz_out,          /* I    Output sampling rate (Hz)                                   */
+    oac_int                    forEnc              /* I    If 1: encoder; if 0: decoder                                */
 );
 
 /*!
  * Resampler: convert from one sampling rate to another
  */
-opus_int silk_resampler(
+oac_int silk_resampler(
     silk_resampler_state_struct *S,                 /* I/O  Resampler state                                             */
-    opus_int16                  out[],              /* O    Output signal                                               */
-    const opus_int16            in[],               /* I    Input signal                                                */
-    opus_int32                  inLen               /* I    Number of input samples                                     */
+    oac_int16                  out[],              /* O    Output signal                                               */
+    const oac_int16            in[],               /* I    Input signal                                                */
+    oac_int32                  inLen               /* I    Number of input samples                                     */
 );
 
 /*!
 * Downsample 2x, mediocre quality
 */
 void silk_resampler_down2(
-    opus_int32                  *S,                 /* I/O  State vector [ 2 ]                                          */
-    opus_int16                  *out,               /* O    Output signal [ len ]                                       */
-    const opus_int16            *in,                /* I    Input signal [ floor(len/2) ]                               */
-    opus_int32                  inLen               /* I    Number of input samples                                     */
+    oac_int32                  *S,                 /* I/O  State vector [ 2 ]                                          */
+    oac_int16                  *out,               /* O    Output signal [ len ]                                       */
+    const oac_int16            *in,                /* I    Input signal [ floor(len/2) ]                               */
+    oac_int32                  inLen               /* I    Number of input samples                                     */
 );
 
 /*!
  * Downsample by a factor 2/3, low quality
 */
 void silk_resampler_down2_3(
-    opus_int32                  *S,                 /* I/O  State vector [ 6 ]                                          */
-    opus_int16                  *out,               /* O    Output signal [ floor(2*inLen/3) ]                          */
-    const opus_int16            *in,                /* I    Input signal [ inLen ]                                      */
-    opus_int32                  inLen               /* I    Number of input samples                                     */
+    oac_int32                  *S,                 /* I/O  State vector [ 6 ]                                          */
+    oac_int16                  *out,               /* O    Output signal [ floor(2*inLen/3) ]                          */
+    const oac_int16            *in,                /* I    Input signal [ inLen ]                                      */
+    oac_int32                  inLen               /* I    Number of input samples                                     */
 );
 
 /*!
@@ -98,61 +98,61 @@ void silk_resampler_down2_3(
  * can handle (slowly) varying coefficients
  */
 void silk_biquad_alt_stride1(
-    const opus_int16            *in,                /* I     input signal                                               */
-    const opus_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
-    const opus_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
-    opus_int32                  *S,                 /* I/O   State vector [2]                                           */
-    opus_int16                  *out,               /* O     output signal                                              */
-    const opus_int32            len                 /* I     signal length (must be even)                               */
+    const oac_int16            *in,                /* I     input signal                                               */
+    const oac_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
+    const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
+    oac_int32                  *S,                 /* I/O   State vector [2]                                           */
+    oac_int16                  *out,               /* O     output signal                                              */
+    const oac_int32            len                 /* I     signal length (must be even)                               */
 );
 
 void silk_biquad_alt_stride2_c(
-    const opus_int16            *in,                /* I     input signal                                               */
-    const opus_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
-    const opus_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
-    opus_int32                  *S,                 /* I/O   State vector [4]                                           */
-    opus_int16                  *out,               /* O     output signal                                              */
-    const opus_int32            len                 /* I     signal length (must be even)                               */
+    const oac_int16            *in,                /* I     input signal                                               */
+    const oac_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
+    const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
+    oac_int32                  *S,                 /* I/O   State vector [4]                                           */
+    oac_int16                  *out,               /* O     output signal                                              */
+    const oac_int32            len                 /* I     signal length (must be even)                               */
 );
 
 /* Variable order MA prediction error filter. */
 void silk_LPC_analysis_filter(
-    opus_int16                  *out,               /* O    Output signal                                               */
-    const opus_int16            *in,                /* I    Input signal                                                */
-    const opus_int16            *B,                 /* I    MA prediction coefficients, Q12 [order]                     */
-    const opus_int32            len,                /* I    Signal length                                               */
-    const opus_int32            d,                  /* I    Filter order                                                */
+    oac_int16                  *out,               /* O    Output signal                                               */
+    const oac_int16            *in,                /* I    Input signal                                                */
+    const oac_int16            *B,                 /* I    MA prediction coefficients, Q12 [order]                     */
+    const oac_int32            len,                /* I    Signal length                                               */
+    const oac_int32            d,                  /* I    Filter order                                                */
     int                         arch                /* I    Run-time architecture                                       */
 );
 
 /* Chirp (bandwidth expand) LP AR filter */
 void silk_bwexpander(
-    opus_int16                  *ar,                /* I/O  AR filter to be expanded (without leading 1)                */
-    const opus_int              d,                  /* I    Length of ar                                                */
-    opus_int32                  chirp_Q16           /* I    Chirp factor (typically in the range 0 to 1)                */
+    oac_int16                  *ar,                /* I/O  AR filter to be expanded (without leading 1)                */
+    const oac_int              d,                  /* I    Length of ar                                                */
+    oac_int32                  chirp_Q16           /* I    Chirp factor (typically in the range 0 to 1)                */
 );
 
 /* Chirp (bandwidth expand) LP AR filter */
 void silk_bwexpander_32(
-    opus_int32                  *ar,                /* I/O  AR filter to be expanded (without leading 1)                */
-    const opus_int              d,                  /* I    Length of ar                                                */
-    opus_int32                  chirp_Q16           /* I    Chirp factor in Q16                                         */
+    oac_int32                  *ar,                /* I/O  AR filter to be expanded (without leading 1)                */
+    const oac_int              d,                  /* I    Length of ar                                                */
+    oac_int32                  chirp_Q16           /* I    Chirp factor in Q16                                         */
 );
 
 /* Compute inverse of LPC prediction gain, and                           */
 /* test if LPC coefficients are stable (all poles within unit circle)    */
-opus_int32 silk_LPC_inverse_pred_gain_c(            /* O   Returns inverse prediction gain in energy domain, Q30        */
-    const opus_int16            *A_Q12,             /* I   Prediction coefficients, Q12 [order]                         */
-    const opus_int              order               /* I   Prediction order                                             */
+oac_int32 silk_LPC_inverse_pred_gain_c(            /* O   Returns inverse prediction gain in energy domain, Q30        */
+    const oac_int16            *A_Q12,             /* I   Prediction coefficients, Q12 [order]                         */
+    const oac_int              order               /* I   Prediction order                                             */
 );
 
 /* Split signal in two decimated bands using first-order allpass filters */
 void silk_ana_filt_bank_1(
-    const opus_int16            *in,                /* I    Input signal [N]                                            */
-    opus_int32                  *S,                 /* I/O  State vector [2]                                            */
-    opus_int16                  *outL,              /* O    Low band [N/2]                                              */
-    opus_int16                  *outH,              /* O    High band [N/2]                                             */
-    const opus_int32            N                   /* I    Number of input samples                                     */
+    const oac_int16            *in,                /* I    Input signal [N]                                            */
+    oac_int32                  *S,                 /* I/O  State vector [2]                                            */
+    oac_int16                  *outL,              /* O    Low band [N/2]                                              */
+    oac_int16                  *outH,              /* O    High band [N/2]                                             */
+    const oac_int32            N                   /* I    Number of input samples                                     */
 );
 
 #if !defined(OVERRIDE_silk_biquad_alt_stride2)
@@ -169,60 +169,60 @@ void silk_ana_filt_bank_1(
 
 /* Approximation of 128 * log2() (exact inverse of approx 2^() below) */
 /* Convert input to a log scale    */
-opus_int32 silk_lin2log(
-    const opus_int32            inLin               /* I  input in linear scale                                         */
+oac_int32 silk_lin2log(
+    const oac_int32            inLin               /* I  input in linear scale                                         */
 );
 
 /* Approximation of a sigmoid function */
-opus_int silk_sigm_Q15(
-    opus_int                    in_Q5               /* I                                                                */
+oac_int silk_sigm_Q15(
+    oac_int                    in_Q5               /* I                                                                */
 );
 
 /* Approximation of 2^() (exact inverse of approx log2() above) */
 /* Convert input to a linear scale */
-opus_int32 silk_log2lin(
-    const opus_int32            inLog_Q7            /* I  input on log scale                                            */
+oac_int32 silk_log2lin(
+    const oac_int32            inLog_Q7            /* I  input on log scale                                            */
 );
 
 /* Compute number of bits to right shift the sum of squares of a vector    */
 /* of int16s to make it fit in an int32                                    */
 void silk_sum_sqr_shift(
-    opus_int32                  *energy,            /* O   Energy of x, after shifting to the right                     */
-    opus_int                    *shift,             /* O   Number of bits right shift applied to energy                 */
-    const opus_int16            *x,                 /* I   Input vector                                                 */
-    opus_int                    len                 /* I   Length of input vector                                       */
+    oac_int32                  *energy,            /* O   Energy of x, after shifting to the right                     */
+    oac_int                    *shift,             /* O   Number of bits right shift applied to energy                 */
+    const oac_int16            *x,                 /* I   Input vector                                                 */
+    oac_int                    len                 /* I   Length of input vector                                       */
 );
 
 /* Calculates the reflection coefficients from the correlation sequence    */
 /* Faster than schur64(), but much less accurate.                          */
 /* uses SMLAWB(), requiring armv5E and higher.                             */
-opus_int32 silk_schur(                              /* O    Returns residual energy                                     */
-    opus_int16                  *rc_Q15,            /* O    reflection coefficients [order] Q15                         */
-    const opus_int32            *c,                 /* I    correlations [order+1]                                      */
-    const opus_int32            order               /* I    prediction order                                            */
+oac_int32 silk_schur(                              /* O    Returns residual energy                                     */
+    oac_int16                  *rc_Q15,            /* O    reflection coefficients [order] Q15                         */
+    const oac_int32            *c,                 /* I    correlations [order+1]                                      */
+    const oac_int32            order               /* I    prediction order                                            */
 );
 
 /* Calculates the reflection coefficients from the correlation sequence    */
 /* Slower than schur(), but more accurate.                                 */
 /* Uses SMULL(), available on armv4                                        */
-opus_int32 silk_schur64(                            /* O    returns residual energy                                     */
-    opus_int32                  rc_Q16[],           /* O    Reflection coefficients [order] Q16                         */
-    const opus_int32            c[],                /* I    Correlations [order+1]                                      */
-    opus_int32                  order               /* I    Prediction order                                            */
+oac_int32 silk_schur64(                            /* O    returns residual energy                                     */
+    oac_int32                  rc_Q16[],           /* O    Reflection coefficients [order] Q16                         */
+    const oac_int32            c[],                /* I    Correlations [order+1]                                      */
+    oac_int32                  order               /* I    Prediction order                                            */
 );
 
 /* Step up function, converts reflection coefficients to prediction coefficients */
 void silk_k2a(
-    opus_int32                  *A_Q24,             /* O    Prediction coefficients [order] Q24                         */
-    const opus_int16            *rc_Q15,            /* I    Reflection coefficients [order] Q15                         */
-    const opus_int32            order               /* I    Prediction order                                            */
+    oac_int32                  *A_Q24,             /* O    Prediction coefficients [order] Q24                         */
+    const oac_int16            *rc_Q15,            /* I    Reflection coefficients [order] Q15                         */
+    const oac_int32            order               /* I    Prediction order                                            */
 );
 
 /* Step up function, converts reflection coefficients to prediction coefficients */
 void silk_k2a_Q16(
-    opus_int32                  *A_Q24,             /* O    Prediction coefficients [order] Q24                         */
-    const opus_int32            *rc_Q16,            /* I    Reflection coefficients [order] Q16                         */
-    const opus_int32            order               /* I    Prediction order                                            */
+    oac_int32                  *A_Q24,             /* O    Prediction coefficients [order] Q24                         */
+    const oac_int32            *rc_Q16,            /* I    Reflection coefficients [order] Q16                         */
+    const oac_int32            order               /* I    Prediction order                                            */
 );
 
 /* Apply sine window to signal vector.                              */
@@ -231,129 +231,129 @@ void silk_k2a_Q16(
 /*    2 -> sine window from pi/2 to pi                              */
 /* every other sample of window is linearly interpolated, for speed */
 void silk_apply_sine_window(
-    opus_int16                  px_win[],           /* O    Pointer to windowed signal                                  */
-    const opus_int16            px[],               /* I    Pointer to input signal                                     */
-    const opus_int              win_type,           /* I    Selects a window type                                       */
-    const opus_int              length              /* I    Window length, multiple of 4                                */
+    oac_int16                  px_win[],           /* O    Pointer to windowed signal                                  */
+    const oac_int16            px[],               /* I    Pointer to input signal                                     */
+    const oac_int              win_type,           /* I    Selects a window type                                       */
+    const oac_int              length              /* I    Window length, multiple of 4                                */
 );
 
 /* Compute autocorrelation */
 void silk_autocorr(
-    opus_int32                  *results,           /* O    Result (length correlationCount)                            */
-    opus_int                    *scale,             /* O    Scaling of the correlation vector                           */
-    const opus_int16            *inputData,         /* I    Input data to correlate                                     */
-    const opus_int              inputDataSize,      /* I    Length of input                                             */
-    const opus_int              correlationCount,   /* I    Number of correlation taps to compute                       */
+    oac_int32                  *results,           /* O    Result (length correlationCount)                            */
+    oac_int                    *scale,             /* O    Scaling of the correlation vector                           */
+    const oac_int16            *inputData,         /* I    Input data to correlate                                     */
+    const oac_int              inputDataSize,      /* I    Length of input                                             */
+    const oac_int              correlationCount,   /* I    Number of correlation taps to compute                       */
     int                         arch                /* I    Run-time architecture                                       */
 );
 
 void silk_decode_pitch(
-    opus_int16                  lagIndex,           /* I                                                                */
-    opus_int8                   contourIndex,       /* O                                                                */
-    opus_int                    pitch_lags[],       /* O    4 pitch values                                              */
-    const opus_int              Fs_kHz,             /* I    sampling frequency (kHz)                                    */
-    const opus_int              nb_subfr            /* I    number of sub frames                                        */
-);
-
-opus_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 voiced, 1 unvoiced                      */
-    const opus_int16            *frame,             /* I    Signal of length PE_FRAME_LENGTH_MS*Fs_kHz                  */
-    opus_int                    *pitch_out,         /* O    4 pitch lag values                                          */
-    opus_int16                  *lagIndex,          /* O    Lag Index                                                   */
-    opus_int8                   *contourIndex,      /* O    Pitch contour Index                                         */
-    opus_int                    *LTPCorr_Q15,       /* I/O  Normalized correlation; input: value from previous frame    */
-    opus_int                    prevLag,            /* I    Last lag of previous frame; set to zero is unvoiced         */
-    const opus_int32            search_thres1_Q16,  /* I    First stage threshold for lag candidates 0 - 1              */
-    const opus_int              search_thres2_Q13,  /* I    Final threshold for lag candidates 0 - 1                    */
-    const opus_int              Fs_kHz,             /* I    Sample frequency (kHz)                                      */
-    const opus_int              complexity,         /* I    Complexity setting, 0-2, where 2 is highest                 */
-    const opus_int              nb_subfr,           /* I    number of 5 ms subframes                                    */
+    oac_int16                  lagIndex,           /* I                                                                */
+    oac_int8                   contourIndex,       /* O                                                                */
+    oac_int                    pitch_lags[],       /* O    4 pitch values                                              */
+    const oac_int              Fs_kHz,             /* I    sampling frequency (kHz)                                    */
+    const oac_int              nb_subfr            /* I    number of sub frames                                        */
+);
+
+oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 voiced, 1 unvoiced                      */
+    const oac_int16            *frame,             /* I    Signal of length PE_FRAME_LENGTH_MS*Fs_kHz                  */
+    oac_int                    *pitch_out,         /* O    4 pitch lag values                                          */
+    oac_int16                  *lagIndex,          /* O    Lag Index                                                   */
+    oac_int8                   *contourIndex,      /* O    Pitch contour Index                                         */
+    oac_int                    *LTPCorr_Q15,       /* I/O  Normalized correlation; input: value from previous frame    */
+    oac_int                    prevLag,            /* I    Last lag of previous frame; set to zero is unvoiced         */
+    const oac_int32            search_thres1_Q16,  /* I    First stage threshold for lag candidates 0 - 1              */
+    const oac_int              search_thres2_Q13,  /* I    Final threshold for lag candidates 0 - 1                    */
+    const oac_int              Fs_kHz,             /* I    Sample frequency (kHz)                                      */
+    const oac_int              complexity,         /* I    Complexity setting, 0-2, where 2 is highest                 */
+    const oac_int              nb_subfr,           /* I    number of 5 ms subframes                                    */
     int                         arch                /* I    Run-time architecture                                       */
 );
 
 /* Compute Normalized Line Spectral Frequencies (NLSFs) from whitening filter coefficients      */
 /* If not all roots are found, the a_Q16 coefficients are bandwidth expanded until convergence. */
 void silk_A2NLSF(
-    opus_int16                  *NLSF,              /* O    Normalized Line Spectral Frequencies in Q15 (0..2^15-1) [d] */
-    opus_int32                  *a_Q16,             /* I/O  Monic whitening filter coefficients in Q16 [d]              */
-    const opus_int              d                   /* I    Filter order (must be even)                                 */
+    oac_int16                  *NLSF,              /* O    Normalized Line Spectral Frequencies in Q15 (0..2^15-1) [d] */
+    oac_int32                  *a_Q16,             /* I/O  Monic whitening filter coefficients in Q16 [d]              */
+    const oac_int              d                   /* I    Filter order (must be even)                                 */
 );
 
 /* compute whitening filter coefficients from normalized line spectral frequencies */
 void silk_NLSF2A(
-    opus_int16                  *a_Q12,             /* O    monic whitening filter coefficients in Q12,  [ d ]          */
-    const opus_int16            *NLSF,              /* I    normalized line spectral frequencies in Q15, [ d ]          */
-    const opus_int              d,                  /* I    filter order (should be even)                               */
+    oac_int16                  *a_Q12,             /* O    monic whitening filter coefficients in Q12,  [ d ]          */
+    const oac_int16            *NLSF,              /* I    normalized line spectral frequencies in Q15, [ d ]          */
+    const oac_int              d,                  /* I    filter order (should be even)                               */
     int                         arch                /* I    Run-time architecture                                       */
 );
 
 /* Convert int32 coefficients to int16 coefs and make sure there's no wrap-around */
 void silk_LPC_fit(
-    opus_int16                  *a_QOUT,            /* O    Output signal                                               */
-    opus_int32                  *a_QIN,             /* I/O  Input signal                                                */
-    const opus_int              QOUT,               /* I    Input Q domain                                              */
-    const opus_int              QIN,                /* I    Input Q domain                                              */
-    const opus_int              d                   /* I    Filter order                                                */
+    oac_int16                  *a_QOUT,            /* O    Output signal                                               */
+    oac_int32                  *a_QIN,             /* I/O  Input signal                                                */
+    const oac_int              QOUT,               /* I    Input Q domain                                              */
+    const oac_int              QIN,                /* I    Input Q domain                                              */
+    const oac_int              d                   /* I    Filter order                                                */
 );
 
 void silk_insertion_sort_increasing(
-    opus_int32                  *a,                 /* I/O   Unsorted / Sorted vector                                   */
-    opus_int                    *idx,               /* O     Index vector for the sorted elements                       */
-    const opus_int              L,                  /* I     Vector length                                              */
-    const opus_int              K                   /* I     Number of correctly sorted positions                       */
+    oac_int32                  *a,                 /* I/O   Unsorted / Sorted vector                                   */
+    oac_int                    *idx,               /* O     Index vector for the sorted elements                       */
+    const oac_int              L,                  /* I     Vector length                                              */
+    const oac_int              K                   /* I     Number of correctly sorted positions                       */
 );
 
 void silk_insertion_sort_decreasing_int16(
-    opus_int16                  *a,                 /* I/O   Unsorted / Sorted vector                                   */
-    opus_int                    *idx,               /* O     Index vector for the sorted elements                       */
-    const opus_int              L,                  /* I     Vector length                                              */
-    const opus_int              K                   /* I     Number of correctly sorted positions                       */
+    oac_int16                  *a,                 /* I/O   Unsorted / Sorted vector                                   */
+    oac_int                    *idx,               /* O     Index vector for the sorted elements                       */
+    const oac_int              L,                  /* I     Vector length                                              */
+    const oac_int              K                   /* I     Number of correctly sorted positions                       */
 );
 
 void silk_insertion_sort_increasing_all_values_int16(
-     opus_int16                 *a,                 /* I/O   Unsorted / Sorted vector                                   */
-     const opus_int             L                   /* I     Vector length                                              */
+     oac_int16                 *a,                 /* I/O   Unsorted / Sorted vector                                   */
+     const oac_int             L                   /* I     Vector length                                              */
 );
 
 /* NLSF stabilizer, for a single input data vector */
 void silk_NLSF_stabilize(
-          opus_int16            *NLSF_Q15,          /* I/O   Unstable/stabilized normalized LSF vector in Q15 [L]       */
-    const opus_int16            *NDeltaMin_Q15,     /* I     Min distance vector, NDeltaMin_Q15[L] must be >= 1 [L+1]   */
-    const opus_int              L                   /* I     Number of NLSF parameters in the input vector              */
+          oac_int16            *NLSF_Q15,          /* I/O   Unstable/stabilized normalized LSF vector in Q15 [L]       */
+    const oac_int16            *NDeltaMin_Q15,     /* I     Min distance vector, NDeltaMin_Q15[L] must be >= 1 [L+1]   */
+    const oac_int              L                   /* I     Number of NLSF parameters in the input vector              */
 );
 
 /* Laroia low complexity NLSF weights */
 void silk_NLSF_VQ_weights_laroia(
-    opus_int16                  *pNLSFW_Q_OUT,      /* O     Pointer to input vector weights [D]                        */
-    const opus_int16            *pNLSF_Q15,         /* I     Pointer to input vector         [D]                        */
-    const opus_int              D                   /* I     Input vector dimension (even)                              */
+    oac_int16                  *pNLSFW_Q_OUT,      /* O     Pointer to input vector weights [D]                        */
+    const oac_int16            *pNLSF_Q15,         /* I     Pointer to input vector         [D]                        */
+    const oac_int              D                   /* I     Input vector dimension (even)                              */
 );
 
 /* Compute reflection coefficients from input signal */
 void silk_burg_modified_c(
-    opus_int32                  *res_nrg,           /* O    Residual energy                                             */
-    opus_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
-    opus_int32                  A_Q16[],            /* O    Prediction coefficients (length order)                      */
-    const opus_int16            x[],                /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
-    const opus_int32            minInvGain_Q30,     /* I    Inverse of max prediction gain                              */
-    const opus_int              subfr_length,       /* I    Input signal subframe length (incl. D preceding samples)    */
-    const opus_int              nb_subfr,           /* I    Number of subframes stacked in x                            */
-    const opus_int              D,                  /* I    Order                                                       */
+    oac_int32                  *res_nrg,           /* O    Residual energy                                             */
+    oac_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
+    oac_int32                  A_Q16[],            /* O    Prediction coefficients (length order)                      */
+    const oac_int16            x[],                /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
+    const oac_int32            minInvGain_Q30,     /* I    Inverse of max prediction gain                              */
+    const oac_int              subfr_length,       /* I    Input signal subframe length (incl. D preceding samples)    */
+    const oac_int              nb_subfr,           /* I    Number of subframes stacked in x                            */
+    const oac_int              D,                  /* I    Order                                                       */
     int                         arch                /* I    Run-time architecture                                       */
 );
 
 /* Copy and multiply a vector by a constant */
 void silk_scale_copy_vector16(
-    opus_int16                  *data_out,
-    const opus_int16            *data_in,
-    opus_int32                  gain_Q16,           /* I    Gain in Q16                                                 */
-    const opus_int              dataSize            /* I    Length                                                      */
+    oac_int16                  *data_out,
+    const oac_int16            *data_in,
+    oac_int32                  gain_Q16,           /* I    Gain in Q16                                                 */
+    const oac_int              dataSize            /* I    Length                                                      */
 );
 
 /* Some for the LTP related function requires Q26 to work.*/
 void silk_scale_vector32_Q26_lshift_18(
-    opus_int32                  *data1,             /* I/O  Q0/Q18                                                      */
-    opus_int32                  gain_Q26,           /* I    Q26                                                         */
-    opus_int                    dataSize            /* I    length                                                      */
+    oac_int32                  *data1,             /* I/O  Q0/Q18                                                      */
+    oac_int32                  gain_Q26,           /* I    Q26                                                         */
+    oac_int                    dataSize            /* I    length                                                      */
 );
 
 /********************************************************************/
@@ -362,25 +362,25 @@ void silk_scale_vector32_Q26_lshift_18(
 
 /*    return sum( inVec1[i] * inVec2[i] ) */
 
-opus_int32 silk_inner_prod_aligned(
-    const opus_int16 *const     inVec1,             /*    I input vector 1                                              */
-    const opus_int16 *const     inVec2,             /*    I input vector 2                                              */
-    const opus_int              len,                /*    I vector lengths                                              */
+oac_int32 silk_inner_prod_aligned(
+    const oac_int16 *const     inVec1,             /*    I input vector 1                                              */
+    const oac_int16 *const     inVec2,             /*    I input vector 2                                              */
+    const oac_int              len,                /*    I vector lengths                                              */
     int                         arch                /*    I Run-time architecture                                       */
 );
 
 
-opus_int32 silk_inner_prod_aligned_scale(
-    const opus_int16 *const     inVec1,             /*    I input vector 1                                              */
-    const opus_int16 *const     inVec2,             /*    I input vector 2                                              */
-    const opus_int              scale,              /*    I number of bits to shift                                     */
-    const opus_int              len                 /*    I vector lengths                                              */
+oac_int32 silk_inner_prod_aligned_scale(
+    const oac_int16 *const     inVec1,             /*    I input vector 1                                              */
+    const oac_int16 *const     inVec2,             /*    I input vector 2                                              */
+    const oac_int              scale,              /*    I number of bits to shift                                     */
+    const oac_int              len                 /*    I vector lengths                                              */
 );
 
-opus_int64 silk_inner_prod16_c(
-    const opus_int16            *inVec1,            /*    I input vector 1                                              */
-    const opus_int16            *inVec2,            /*    I input vector 2                                              */
-    const opus_int              len                 /*    I vector lengths                                              */
+oac_int64 silk_inner_prod16_c(
+    const oac_int16            *inVec1,            /*    I input vector 1                                              */
+    const oac_int16            *inVec2,            /*    I input vector 2                                              */
+    const oac_int              len                 /*    I vector lengths                                              */
 );
 
 /********************************************************************/
@@ -390,22 +390,22 @@ opus_int64 silk_inner_prod16_c(
 /* Rotate a32 right by 'rot' bits. Negative rot values result in rotating
    left. Output is 32bit int.
    Note: contemporary compilers recognize the C expression below and
-   compile it into a 'ror' instruction if available. No need for OPUS_INLINE ASM! */
-static OPUS_INLINE opus_int32 silk_ROR32( opus_int32 a32, opus_int rot )
+   compile it into a 'ror' instruction if available. No need for OAC_INLINE ASM! */
+static OAC_INLINE oac_int32 silk_ROR32( oac_int32 a32, oac_int rot )
 {
-    opus_uint32 x = (opus_uint32) a32;
-    opus_uint32 r = (opus_uint32) rot;
-    opus_uint32 m = (opus_uint32) -rot;
+    oac_uint32 x = (oac_uint32) a32;
+    oac_uint32 r = (oac_uint32) rot;
+    oac_uint32 m = (oac_uint32) -rot;
     if( rot == 0 ) {
         return a32;
     } else if( rot < 0 ) {
-        return (opus_int32) ((x << m) | (x >> (32 - m)));
+        return (oac_int32) ((x << m) | (x >> (32 - m)));
     } else {
-        return (opus_int32) ((x << (32 - r)) | (x >> r));
+        return (oac_int32) ((x << (32 - r)) | (x >> r));
     }
 }
 
-/* Allocate opus_int16 aligned to 4-byte memory address */
+/* Allocate oac_int16 aligned to 4-byte memory address */
 #if EMBEDDED_ARM
 #define silk_DWORD_ALIGN __attribute__((aligned(4)))
 #else
@@ -437,24 +437,24 @@ static OPUS_INLINE opus_int32 silk_ROR32( opus_int32 a32, opus_int rot )
 /* a32 + ((a32 >> 16)  * (b32 >> 16)) output have to be 32bit int */
 #define silk_SMLATT(a32, b32, c32)          silk_ADD32((a32),((b32) >> 16) * ((c32) >> 16))
 
-#define silk_SMLALBB(a64, b16, c16)         silk_ADD64((a64),(opus_int64)((opus_int32)(b16) * (opus_int32)(c16)))
+#define silk_SMLALBB(a64, b16, c16)         silk_ADD64((a64),(oac_int64)((oac_int32)(b16) * (oac_int32)(c16)))
 
 /* (a32 * b32) */
-#define silk_SMULL(a32, b32)                ((opus_int64)(a32) * /*(opus_int64)*/(b32))
+#define silk_SMULL(a32, b32)                ((oac_int64)(a32) * /*(oac_int64)*/(b32))
 
 /* Adds two signed 32-bit values in a way that can overflow, while not relying on undefined behaviour
    (just standard two's complement implementation-specific behaviour) */
-#define silk_ADD32_ovflw(a, b)              ((opus_int32)((opus_uint32)(a) + (opus_uint32)(b)))
+#define silk_ADD32_ovflw(a, b)              ((oac_int32)((oac_uint32)(a) + (oac_uint32)(b)))
 /* Subtractss two signed 32-bit values in a way that can overflow, while not relying on undefined behaviour
    (just standard two's complement implementation-specific behaviour) */
-#define silk_SUB32_ovflw(a, b)              ((opus_int32)((opus_uint32)(a) - (opus_uint32)(b)))
+#define silk_SUB32_ovflw(a, b)              ((oac_int32)((oac_uint32)(a) - (oac_uint32)(b)))
 
 /* Multiply-accumulate macros that allow overflow in the addition (ie, no asserts in debug mode) */
-#define silk_MLA_ovflw(a32, b32, c32)       silk_ADD32_ovflw((a32), (opus_uint32)(b32) * (opus_uint32)(c32))
-#define silk_SMLABB_ovflw(a32, b32, c32)    (silk_ADD32_ovflw((a32) , ((opus_int32)((opus_int16)(b32))) * (opus_int32)((opus_int16)(c32))))
+#define silk_MLA_ovflw(a32, b32, c32)       silk_ADD32_ovflw((a32), (oac_uint32)(b32) * (oac_uint32)(c32))
+#define silk_SMLABB_ovflw(a32, b32, c32)    (silk_ADD32_ovflw((a32) , ((oac_int32)((oac_int16)(b32))) * (oac_int32)((oac_int16)(c32))))
 
-#define silk_DIV32_16(a32, b16)             ((opus_int32)((a32) / (b16)))
-#define silk_DIV32(a32, b32)                ((opus_int32)((a32) / (b32)))
+#define silk_DIV32_16(a32, b16)             ((oac_int32)((a32) / (b16)))
+#define silk_DIV32(a32, b32)                ((oac_int32)((a32) / (b32)))
 
 /* These macros enables checking for overflow in silk_API_Debug.h*/
 #define silk_ADD16(a, b)                    ((a) + (b))
@@ -476,12 +476,12 @@ static OPUS_INLINE opus_int32 silk_ROR32( opus_int32 a32, opus_int rot )
 #define silk_CHECK_FIT16(a)                 (a)
 #define silk_CHECK_FIT32(a)                 (a)
 
-#define silk_ADD_SAT16(a, b)                (opus_int16)silk_SAT16( silk_ADD32( (opus_int32)(a), (b) ) )
+#define silk_ADD_SAT16(a, b)                (oac_int16)silk_SAT16( silk_ADD32( (oac_int32)(a), (b) ) )
 #define silk_ADD_SAT64(a, b)                ((((a) + (b)) & 0x8000000000000000LL) == 0 ?                            \
                                             ((((a) & (b)) & 0x8000000000000000LL) != 0 ? silk_int64_MIN : (a)+(b)) : \
                                             ((((a) | (b)) & 0x8000000000000000LL) == 0 ? silk_int64_MAX : (a)+(b)) )
 
-#define silk_SUB_SAT16(a, b)                (opus_int16)silk_SAT16( silk_SUB32( (opus_int32)(a), (b) ) )
+#define silk_SUB_SAT16(a, b)                (oac_int16)silk_SAT16( silk_SUB32( (oac_int32)(a), (b) ) )
 #define silk_SUB_SAT64(a, b)                ((((a)-(b)) & 0x8000000000000000LL) == 0 ?                                               \
                                             (( (a) & ((b)^0x8000000000000000LL) & 0x8000000000000000LL) ? silk_int64_MIN : (a)-(b)) : \
                                             ((((a)^0x8000000000000000LL) & (b)  & 0x8000000000000000LL) ? silk_int64_MAX : (a)-(b)) )
@@ -492,12 +492,12 @@ static OPUS_INLINE opus_int32 silk_ROR32( opus_int32 a32, opus_int rot )
 /* Add with saturation for positive input values */
 #define silk_ADD_POS_SAT8(a, b)             ((((a)+(b)) & 0x80)                 ? silk_int8_MAX  : ((a)+(b)))
 #define silk_ADD_POS_SAT16(a, b)            ((((a)+(b)) & 0x8000)               ? silk_int16_MAX : ((a)+(b)))
-#define silk_ADD_POS_SAT32(a, b)            ((((opus_uint32)(a)+(opus_uint32)(b)) & 0x80000000) ? silk_int32_MAX : ((a)+(b)))
+#define silk_ADD_POS_SAT32(a, b)            ((((oac_uint32)(a)+(oac_uint32)(b)) & 0x80000000) ? silk_int32_MAX : ((a)+(b)))
 
-#define silk_LSHIFT8(a, shift)              ((opus_int8)((opus_uint8)(a)<<(shift)))         /* shift >= 0, shift < 8  */
-#define silk_LSHIFT16(a, shift)             ((opus_int16)((opus_uint16)(a)<<(shift)))       /* shift >= 0, shift < 16 */
-#define silk_LSHIFT32(a, shift)             ((opus_int32)((opus_uint32)(a)<<(shift)))       /* shift >= 0, shift < 32 */
-#define silk_LSHIFT64(a, shift)             ((opus_int64)((opus_uint64)(a)<<(shift)))       /* shift >= 0, shift < 64 */
+#define silk_LSHIFT8(a, shift)              ((oac_int8)((oac_uint8)(a)<<(shift)))         /* shift >= 0, shift < 8  */
+#define silk_LSHIFT16(a, shift)             ((oac_int16)((oac_uint16)(a)<<(shift)))       /* shift >= 0, shift < 16 */
+#define silk_LSHIFT32(a, shift)             ((oac_int32)((oac_uint32)(a)<<(shift)))       /* shift >= 0, shift < 32 */
+#define silk_LSHIFT64(a, shift)             ((oac_int64)((oac_uint64)(a)<<(shift)))       /* shift >= 0, shift < 64 */
 #define silk_LSHIFT(a, shift)               silk_LSHIFT32(a, shift)                         /* shift >= 0, shift < 32 */
 
 #define silk_RSHIFT8(a, shift)              ((a)>>(shift))                                  /* shift >= 0, shift < 8  */
@@ -510,7 +510,7 @@ static OPUS_INLINE opus_int32 silk_ROR32( opus_int32 a32, opus_int rot )
 #define silk_LSHIFT_SAT32(a, shift)         (silk_LSHIFT32( silk_LIMIT( (a), silk_RSHIFT32( silk_int32_MIN, (shift) ), \
                                                     silk_RSHIFT32( silk_int32_MAX, (shift) ) ), (shift) ))
 
-#define silk_LSHIFT_ovflw(a, shift)         ((opus_int32)((opus_uint32)(a) << (shift)))     /* shift >= 0, allowed to overflow */
+#define silk_LSHIFT_ovflw(a, shift)         ((oac_int32)((oac_uint32)(a) << (shift)))     /* shift >= 0, allowed to overflow */
 #define silk_LSHIFT_uint(a, shift)          ((a) << (shift))                                /* shift >= 0 */
 #define silk_RSHIFT_uint(a, shift)          ((a) >> (shift))                                /* shift >= 0 */
 
@@ -536,40 +536,40 @@ static OPUS_INLINE opus_int32 silk_ROR32( opus_int32 a32, opus_int rot )
 #define silk_max(a, b)                      (((a) > (b)) ? (a) : (b))
 
 /* Macro to convert floating-point constants to fixed-point */
-#define SILK_FIX_CONST( C, Q )              ((opus_int32)((C) * ((opus_int64)1 << (Q)) + 0.5))
+#define SILK_FIX_CONST( C, Q )              ((oac_int32)((C) * ((oac_int64)1 << (Q)) + 0.5))
 
 /* silk_min() versions with typecast in the function call */
-static OPUS_INLINE opus_int silk_min_int(opus_int a, opus_int b)
+static OAC_INLINE oac_int silk_min_int(oac_int a, oac_int b)
 {
     return (((a) < (b)) ? (a) : (b));
 }
-static OPUS_INLINE opus_int16 silk_min_16(opus_int16 a, opus_int16 b)
+static OAC_INLINE oac_int16 silk_min_16(oac_int16 a, oac_int16 b)
 {
     return (((a) < (b)) ? (a) : (b));
 }
-static OPUS_INLINE opus_int32 silk_min_32(opus_int32 a, opus_int32 b)
+static OAC_INLINE oac_int32 silk_min_32(oac_int32 a, oac_int32 b)
 {
     return (((a) < (b)) ? (a) : (b));
 }
-static OPUS_INLINE opus_int64 silk_min_64(opus_int64 a, opus_int64 b)
+static OAC_INLINE oac_int64 silk_min_64(oac_int64 a, oac_int64 b)
 {
     return (((a) < (b)) ? (a) : (b));
 }
 
 /* silk_min() versions with typecast in the function call */
-static OPUS_INLINE opus_int silk_max_int(opus_int a, opus_int b)
+static OAC_INLINE oac_int silk_max_int(oac_int a, oac_int b)
 {
     return (((a) > (b)) ? (a) : (b));
 }
-static OPUS_INLINE opus_int16 silk_max_16(opus_int16 a, opus_int16 b)
+static OAC_INLINE oac_int16 silk_max_16(oac_int16 a, oac_int16 b)
 {
     return (((a) > (b)) ? (a) : (b));
 }
-static OPUS_INLINE opus_int32 silk_max_32(opus_int32 a, opus_int32 b)
+static OAC_INLINE oac_int32 silk_max_32(oac_int32 a, oac_int32 b)
 {
     return (((a) > (b)) ? (a) : (b));
 }
-static OPUS_INLINE opus_int64 silk_max_64(opus_int64 a, opus_int64 b)
+static OAC_INLINE oac_int64 silk_max_64(oac_int64 a, oac_int64 b)
 {
     return (((a) > (b)) ? (a) : (b));
 }
@@ -603,9 +603,9 @@ static OPUS_INLINE opus_int64 silk_max_64(opus_int64 a, opus_int64 b)
           ARMv3M+      3 instruction cycles. use SMULL and ignore LSB registers.(except xM)
           MIPS32       2 instructions mul+mfhi
           MIPS32r6     1 instruction muh */
-/*#define silk_SMMUL(a32, b32)                (opus_int32)silk_RSHIFT(silk_SMLAL(silk_SMULWB((a32), (b32)), (a32), silk_RSHIFT_ROUND((b32), 16)), 16)*/
+/*#define silk_SMMUL(a32, b32)                (oac_int32)silk_RSHIFT(silk_SMLAL(silk_SMULWB((a32), (b32)), (a32), silk_RSHIFT_ROUND((b32), 16)), 16)*/
 /* the following seems faster on x86 */
-#define silk_SMMUL(a32, b32)                (opus_int32)silk_RSHIFT64(silk_SMULL((a32), (b32)), 32)
+#define silk_SMMUL(a32, b32)                (oac_int32)silk_RSHIFT64(silk_SMULL((a32), (b32)), 32)
 
 #if !defined(OVERRIDE_silk_burg_modified)
 #define silk_burg_modified(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch) \
@@ -621,11 +621,11 @@ static OPUS_INLINE opus_int64 silk_max_64(opus_int64 a, opus_int64 b)
 #include "MacroCount.h"
 #include "MacroDebug.h"
 
-#ifdef OPUS_ARM_INLINE_ASM
+#ifdef OAC_ARM_INLINE_ASM
 #include "arm/SigProc_FIX_armv4.h"
 #endif
 
-#ifdef OPUS_ARM_INLINE_EDSP
+#ifdef OAC_ARM_INLINE_EDSP
 #include "arm/SigProc_FIX_armv5e.h"
 #endif
 
@@ -633,7 +633,7 @@ static OPUS_INLINE opus_int64 silk_max_64(opus_int64 a, opus_int64 b)
 #include "mips/sigproc_fix_mipsr1.h"
 #endif
 
-#ifdef OPUS_XTENSA_LX7
+#ifdef OAC_XTENSA_LX7
 #include "xtensa/SigProc_FIX_lx7.h"
 #endif
 
diff --git a/silk/VAD.c b/silk/VAD.c
index d0cda5216..880b16501 100644
--- a/silk/VAD.c
+++ b/silk/VAD.c
@@ -33,9 +33,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "stack_alloc.h"
 
 /* Silk VAD noise level estimation */
-# if !defined(OPUS_X86_MAY_HAVE_SSE4_1)
-static OPUS_INLINE void silk_VAD_GetNoiseLevels(
-    const opus_int32             pX[ VAD_N_BANDS ], /* I    subband energies                            */
+# if !defined(OAC_X86_MAY_HAVE_SSE4_1)
+static OAC_INLINE void silk_VAD_GetNoiseLevels(
+    const oac_int32             pX[ VAD_N_BANDS ], /* I    subband energies                            */
     silk_VAD_state              *psSilk_VAD         /* I/O  Pointer to Silk VAD state                   */
 );
 #endif
@@ -43,11 +43,11 @@ static OPUS_INLINE void silk_VAD_GetNoiseLevels(
 /**********************************/
 /* Initialization of the Silk VAD */
 /**********************************/
-opus_int silk_VAD_Init(                                         /* O    Return value, 0 if success                  */
+oac_int silk_VAD_Init(                                         /* O    Return value, 0 if success                  */
     silk_VAD_state              *psSilk_VAD                     /* I/O  Pointer to Silk VAD state                   */
 )
 {
-    opus_int b, ret = 0;
+    oac_int b, ret = 0;
 
     /* reset state memory */
     silk_memset( psSilk_VAD, 0, sizeof( silk_VAD_state ) );
@@ -74,28 +74,28 @@ opus_int silk_VAD_Init(                                         /* O    Return v
 }
 
 /* Weighting factors for tilt measure */
-static const opus_int32 tiltWeights[ VAD_N_BANDS ] = { 30000, 6000, -12000, -12000 };
+static const oac_int32 tiltWeights[ VAD_N_BANDS ] = { 30000, 6000, -12000, -12000 };
 
 /***************************************/
 /* Get the speech activity level in Q8 */
 /***************************************/
-opus_int silk_VAD_GetSA_Q8_c(                                   /* O    Return value, 0 if success                  */
+oac_int silk_VAD_GetSA_Q8_c(                                   /* O    Return value, 0 if success                  */
     silk_encoder_state          *psEncC,                        /* I/O  Encoder state                               */
-    const opus_int16            pIn[]                           /* I    PCM input                                   */
+    const oac_int16            pIn[]                           /* I    PCM input                                   */
 )
 {
-    opus_int   SA_Q15, pSNR_dB_Q7, input_tilt;
-    opus_int   decimated_framelength1, decimated_framelength2;
-    opus_int   decimated_framelength;
-    opus_int   dec_subframe_length, dec_subframe_offset, SNR_Q7, i, b, s;
-    opus_int32 sumSquared, smooth_coef_Q16;
-    opus_int16 HPstateTmp;
-    VARDECL( opus_int16, X );
-    opus_int32 Xnrg[ VAD_N_BANDS ];
-    opus_int32 NrgToNoiseRatio_Q8[ VAD_N_BANDS ];
-    opus_int32 speech_nrg, x_tmp;
-    opus_int   X_offset[ VAD_N_BANDS ];
-    opus_int   ret = 0;
+    oac_int   SA_Q15, pSNR_dB_Q7, input_tilt;
+    oac_int   decimated_framelength1, decimated_framelength2;
+    oac_int   decimated_framelength;
+    oac_int   dec_subframe_length, dec_subframe_offset, SNR_Q7, i, b, s;
+    oac_int32 sumSquared, smooth_coef_Q16;
+    oac_int16 HPstateTmp;
+    VARDECL( oac_int16, X );
+    oac_int32 Xnrg[ VAD_N_BANDS ];
+    oac_int32 NrgToNoiseRatio_Q8[ VAD_N_BANDS ];
+    oac_int32 speech_nrg, x_tmp;
+    oac_int   X_offset[ VAD_N_BANDS ];
+    oac_int   ret = 0;
     silk_VAD_state *psSilk_VAD = &psEncC->sVAD;
     SAVE_STACK;
 
@@ -124,7 +124,7 @@ opus_int silk_VAD_GetSA_Q8_c(                                   /* O    Return v
     X_offset[ 1 ] = decimated_framelength + decimated_framelength2;
     X_offset[ 2 ] = X_offset[ 1 ] + decimated_framelength;
     X_offset[ 3 ] = X_offset[ 2 ] + decimated_framelength2;
-    ALLOC( X, X_offset[ 3 ] + decimated_framelength1, opus_int16 );
+    ALLOC( X, X_offset[ 3 ] + decimated_framelength1, oac_int16 );
 
     /* 0-8 kHz to 0-4 kHz and 4-8 kHz */
     silk_ana_filt_bank_1( pIn, &psSilk_VAD->AnaState[  0 ],
@@ -217,7 +217,7 @@ opus_int silk_VAD_GetSA_Q8_c(                                   /* O    Return v
             sumSquared = silk_SMLABB( sumSquared, SNR_Q7, SNR_Q7 );          /* Q14 */
 
             /* Tilt measure */
-            if( speech_nrg < ( (opus_int32)1 << 20 ) ) {
+            if( speech_nrg < ( (oac_int32)1 << 20 ) ) {
                 /* Scale down SNR value for small subband speech energies */
                 SNR_Q7 = silk_SMULWB( silk_LSHIFT( silk_SQRT_APPROX( speech_nrg ), 6 ), SNR_Q7 );
             }
@@ -231,7 +231,7 @@ opus_int silk_VAD_GetSA_Q8_c(                                   /* O    Return v
     sumSquared = silk_DIV32_16( sumSquared, VAD_N_BANDS ); /* Q14 */
 
     /* Root-mean-square approximation, scale to dBs, and write to output pointer */
-    pSNR_dB_Q7 = (opus_int16)( 3 * silk_SQRT_APPROX( sumSquared ) ); /* Q7 */
+    pSNR_dB_Q7 = (oac_int16)( 3 * silk_SQRT_APPROX( sumSquared ) ); /* Q7 */
 
     /*********************************/
     /* Speech Probability Estimation */
@@ -273,7 +273,7 @@ opus_int silk_VAD_GetSA_Q8_c(                                   /* O    Return v
     /* Energy Level and SNR estimation */
     /***********************************/
     /* Smoothing coefficient */
-    smooth_coef_Q16 = silk_SMULWB( VAD_SNR_SMOOTH_COEF_Q18, silk_SMULWB( (opus_int32)SA_Q15, SA_Q15 ) );
+    smooth_coef_Q16 = silk_SMULWB( VAD_SNR_SMOOTH_COEF_Q18, silk_SMULWB( (oac_int32)SA_Q15, SA_Q15 ) );
 
     if( psEncC->frame_length == 10 * psEncC->fs_kHz ) {
         smooth_coef_Q16 >>= 1;
@@ -297,17 +297,17 @@ opus_int silk_VAD_GetSA_Q8_c(                                   /* O    Return v
 /**************************/
 /* Noise level estimation */
 /**************************/
-# if  !defined(OPUS_X86_MAY_HAVE_SSE4_1)
-static OPUS_INLINE
+# if  !defined(OAC_X86_MAY_HAVE_SSE4_1)
+static OAC_INLINE
 #endif
 void silk_VAD_GetNoiseLevels(
-    const opus_int32            pX[ VAD_N_BANDS ],  /* I    subband energies                            */
+    const oac_int32            pX[ VAD_N_BANDS ],  /* I    subband energies                            */
     silk_VAD_state              *psSilk_VAD         /* I/O  Pointer to Silk VAD state                   */
 )
 {
-    opus_int   k;
-    opus_int32 nl, nrg, inv_nrg;
-    opus_int   coef, min_coef;
+    oac_int   k;
+    oac_int32 nl, nrg, inv_nrg;
+    oac_int   coef, min_coef;
 
     /* Initially faster smoothing */
     if( psSilk_VAD->counter < 1000 ) { /* 1000 = 20 sec */
diff --git a/silk/VQ_WMat_EC.c b/silk/VQ_WMat_EC.c
index 245a7e4b0..47f0f3373 100644
--- a/silk/VQ_WMat_EC.c
+++ b/silk/VQ_WMat_EC.c
@@ -33,25 +33,25 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Entropy constrained matrix-weighted VQ, hard-coded to 5-element vectors, for a single input data vector */
 void silk_VQ_WMat_EC_c(
-    opus_int8                   *ind,                           /* O    index of best codebook vector               */
-    opus_int32                  *res_nrg_Q15,                   /* O    best residual energy                        */
-    opus_int32                  *rate_dist_Q8,                  /* O    best total bitrate                          */
-    opus_int                    *gain_Q7,                       /* O    sum of absolute LTP coefficients            */
-    const opus_int32            *XX_Q17,                        /* I    correlation matrix                          */
-    const opus_int32            *xX_Q17,                        /* I    correlation vector                          */
-    const opus_int8             *cb_Q7,                         /* I    codebook                                    */
-    const opus_uint8            *cb_gain_Q7,                    /* I    codebook effective gain                     */
-    const opus_uint8            *cl_Q5,                         /* I    code length for each codebook vector        */
-    const opus_int              subfr_len,                      /* I    number of samples per subframe              */
-    const opus_int32            max_gain_Q7,                    /* I    maximum sum of absolute LTP coefficients    */
-    const opus_int              L                               /* I    number of vectors in codebook               */
+    oac_int8                   *ind,                           /* O    index of best codebook vector               */
+    oac_int32                  *res_nrg_Q15,                   /* O    best residual energy                        */
+    oac_int32                  *rate_dist_Q8,                  /* O    best total bitrate                          */
+    oac_int                    *gain_Q7,                       /* O    sum of absolute LTP coefficients            */
+    const oac_int32            *XX_Q17,                        /* I    correlation matrix                          */
+    const oac_int32            *xX_Q17,                        /* I    correlation vector                          */
+    const oac_int8             *cb_Q7,                         /* I    codebook                                    */
+    const oac_uint8            *cb_gain_Q7,                    /* I    codebook effective gain                     */
+    const oac_uint8            *cl_Q5,                         /* I    code length for each codebook vector        */
+    const oac_int              subfr_len,                      /* I    number of samples per subframe              */
+    const oac_int32            max_gain_Q7,                    /* I    maximum sum of absolute LTP coefficients    */
+    const oac_int              L                               /* I    number of vectors in codebook               */
 )
 {
-    opus_int   k, gain_tmp_Q7;
-    const opus_int8 *cb_row_Q7;
-    opus_int32 neg_xX_Q24[ 5 ];
-    opus_int32 sum1_Q15, sum2_Q24;
-    opus_int32 bits_res_Q8, bits_tot_Q8;
+    oac_int   k, gain_tmp_Q7;
+    const oac_int8 *cb_row_Q7;
+    oac_int32 neg_xX_Q24[ 5 ];
+    oac_int32 sum1_Q15, sum2_Q24;
+    oac_int32 bits_res_Q8, bits_tot_Q8;
 
     /* Negate and convert to new Q domain */
     neg_xX_Q24[ 0 ] = -silk_LSHIFT32( xX_Q17[ 0 ], 7 );
@@ -67,7 +67,7 @@ void silk_VQ_WMat_EC_c(
     /* If things go really bad, at least *ind is set to something safe. */
     *ind = 0;
     for( k = 0; k < L; k++ ) {
-        opus_int32 penalty;
+        oac_int32 penalty;
         gain_tmp_Q7 = cb_gain_Q7[k];
         /* Weighted rate */
         /* Quantization error: 1 - 2 * xX * cb + cb' * XX * cb */
@@ -120,7 +120,7 @@ void silk_VQ_WMat_EC_c(
             if( bits_tot_Q8 <= *rate_dist_Q8 ) {
                 *rate_dist_Q8 = bits_tot_Q8;
                 *res_nrg_Q15 = sum1_Q15 + penalty;
-                *ind = (opus_int8)k;
+                *ind = (oac_int8)k;
                 *gain_Q7 = gain_tmp_Q7;
             }
         }
diff --git a/silk/ana_filt_bank_1.c b/silk/ana_filt_bank_1.c
index 3907f8c1b..34e084c52 100644
--- a/silk/ana_filt_bank_1.c
+++ b/silk/ana_filt_bank_1.c
@@ -32,25 +32,25 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "SigProc_FIX.h"
 
 /* Coefficients for 2-band filter bank based on first-order allpass filters */
-static const opus_int16 A_fb1_20 = 5394 << 1;
-static const opus_int16 A_fb1_21 = -24290; /* (opus_int16)(20623 << 1) */
+static const oac_int16 A_fb1_20 = 5394 << 1;
+static const oac_int16 A_fb1_21 = -24290; /* (oac_int16)(20623 << 1) */
 
 /* Split signal into two decimated bands using first-order allpass filters */
 void silk_ana_filt_bank_1(
-    const opus_int16            *in,                /* I    Input signal [N]                                            */
-    opus_int32                  *S,                 /* I/O  State vector [2]                                            */
-    opus_int16                  *outL,              /* O    Low band [N/2]                                              */
-    opus_int16                  *outH,              /* O    High band [N/2]                                             */
-    const opus_int32            N                   /* I    Number of input samples                                     */
+    const oac_int16            *in,                /* I    Input signal [N]                                            */
+    oac_int32                  *S,                 /* I/O  State vector [2]                                            */
+    oac_int16                  *outL,              /* O    Low band [N/2]                                              */
+    oac_int16                  *outH,              /* O    High band [N/2]                                             */
+    const oac_int32            N                   /* I    Number of input samples                                     */
 )
 {
-    opus_int      k, N2 = silk_RSHIFT( N, 1 );
-    opus_int32    in32, X, Y, out_1, out_2;
+    oac_int      k, N2 = silk_RSHIFT( N, 1 );
+    oac_int32    in32, X, Y, out_1, out_2;
 
     /* Internal variables and state are in Q10 format */
     for( k = 0; k < N2; k++ ) {
         /* Convert to Q10 */
-        in32 = silk_LSHIFT( (opus_int32)in[ 2 * k ], 10 );
+        in32 = silk_LSHIFT( (oac_int32)in[ 2 * k ], 10 );
 
         /* All-pass section for even input sample */
         Y      = silk_SUB32( in32, S[ 0 ] );
@@ -59,7 +59,7 @@ void silk_ana_filt_bank_1(
         S[ 0 ] = silk_ADD32( in32, X );
 
         /* Convert to Q10 */
-        in32 = silk_LSHIFT( (opus_int32)in[ 2 * k + 1 ], 10 );
+        in32 = silk_LSHIFT( (oac_int32)in[ 2 * k + 1 ], 10 );
 
         /* All-pass section for odd input sample, and add to output of previous section */
         Y      = silk_SUB32( in32, S[ 1 ] );
@@ -68,7 +68,7 @@ void silk_ana_filt_bank_1(
         S[ 1 ] = silk_ADD32( in32, X );
 
         /* Add/subtract, convert back to int16 and store to output */
-        outL[ k ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_ADD32( out_2, out_1 ), 11 ) );
-        outH[ k ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SUB32( out_2, out_1 ), 11 ) );
+        outL[ k ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_ADD32( out_2, out_1 ), 11 ) );
+        outH[ k ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SUB32( out_2, out_1 ), 11 ) );
     }
 }
diff --git a/silk/arm/LPC_inv_pred_gain_arm.h b/silk/arm/LPC_inv_pred_gain_arm.h
index 9895b555c..fc1c1b73e 100644
--- a/silk/arm/LPC_inv_pred_gain_arm.h
+++ b/silk/arm/LPC_inv_pred_gain_arm.h
@@ -30,13 +30,13 @@ POSSIBILITY OF SUCH DAMAGE.
 
 # include "celt/arm/armcpu.h"
 
-# if defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
-opus_int32 silk_LPC_inverse_pred_gain_neon(         /* O   Returns inverse prediction gain in energy domain, Q30        */
-    const opus_int16            *A_Q12,             /* I   Prediction coefficients, Q12 [order]                         */
-    const opus_int              order               /* I   Prediction order                                             */
+# if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
+oac_int32 silk_LPC_inverse_pred_gain_neon(         /* O   Returns inverse prediction gain in energy domain, Q30        */
+    const oac_int16            *A_Q12,             /* I   Prediction coefficients, Q12 [order]                         */
+    const oac_int              order               /* I   Prediction order                                             */
 );
 
-#  if !defined(OPUS_HAVE_RTCD) && defined(OPUS_ARM_PRESUME_NEON)
+#  if !defined(OAC_HAVE_RTCD) && defined(OAC_ARM_PRESUME_NEON)
 #   define OVERRIDE_silk_LPC_inverse_pred_gain            (1)
 #   define silk_LPC_inverse_pred_gain(A_Q12, order, arch) ((void)(arch), PRESUME_NEON(silk_LPC_inverse_pred_gain)(A_Q12, order))
 #  endif
@@ -44,11 +44,11 @@ opus_int32 silk_LPC_inverse_pred_gain_neon(         /* O   Returns inverse predi
 
 # if !defined(OVERRIDE_silk_LPC_inverse_pred_gain)
 /*Is run-time CPU detection enabled on this platform?*/
-#  if defined(OPUS_HAVE_RTCD) && (defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && !defined(OPUS_ARM_PRESUME_NEON_INTR))
-extern opus_int32 (*const SILK_LPC_INVERSE_PRED_GAIN_IMPL[OPUS_ARCHMASK+1])(const opus_int16 *A_Q12, const opus_int order);
+#  if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
+extern oac_int32 (*const SILK_LPC_INVERSE_PRED_GAIN_IMPL[OAC_ARCHMASK+1])(const oac_int16 *A_Q12, const oac_int order);
 #   define OVERRIDE_silk_LPC_inverse_pred_gain            (1)
-#   define silk_LPC_inverse_pred_gain(A_Q12, order, arch) ((*SILK_LPC_INVERSE_PRED_GAIN_IMPL[(arch)&OPUS_ARCHMASK])(A_Q12, order))
-#  elif defined(OPUS_ARM_PRESUME_NEON_INTR)
+#   define silk_LPC_inverse_pred_gain(A_Q12, order, arch) ((*SILK_LPC_INVERSE_PRED_GAIN_IMPL[(arch)&OAC_ARCHMASK])(A_Q12, order))
+#  elif defined(OAC_ARM_PRESUME_NEON_INTR)
 #   define OVERRIDE_silk_LPC_inverse_pred_gain            (1)
 #   define silk_LPC_inverse_pred_gain(A_Q12, order, arch) ((void)(arch), silk_LPC_inverse_pred_gain_neon(A_Q12, order))
 #  endif
diff --git a/silk/arm/LPC_inv_pred_gain_neon_intr.c b/silk/arm/LPC_inv_pred_gain_neon_intr.c
index 726e6667b..52a7894e5 100644
--- a/silk/arm/LPC_inv_pred_gain_neon_intr.c
+++ b/silk/arm/LPC_inv_pred_gain_neon_intr.c
@@ -36,7 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #define QA                          24
 #define A_LIMIT                     SILK_FIX_CONST( 0.99975, QA )
 
-#define MUL32_FRAC_Q(a32, b32, Q)   ((opus_int32)(silk_RSHIFT_ROUND64(silk_SMULL(a32, b32), Q)))
+#define MUL32_FRAC_Q(a32, b32, Q)   ((oac_int32)(silk_RSHIFT_ROUND64(silk_SMULL(a32, b32), Q)))
 
 /* The difficulty is how to judge a 64-bit signed integer tmp64 is 32-bit overflowed,
  * since NEON has no 64-bit min, max or comparison instructions.
@@ -52,14 +52,14 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Compute inverse of LPC prediction gain, and                          */
 /* test if LPC coefficients are stable (all poles within unit circle)   */
-static OPUS_INLINE opus_int32 LPC_inverse_pred_gain_QA_neon( /* O   Returns inverse prediction gain in energy domain, Q30    */
-    opus_int32           A_QA[ SILK_MAX_ORDER_LPC ],         /* I   Prediction coefficients                                  */
-    const opus_int       order                               /* I   Prediction order                                         */
+static OAC_INLINE oac_int32 LPC_inverse_pred_gain_QA_neon( /* O   Returns inverse prediction gain in energy domain, Q30    */
+    oac_int32           A_QA[ SILK_MAX_ORDER_LPC ],         /* I   Prediction coefficients                                  */
+    const oac_int       order                               /* I   Prediction order                                         */
 )
 {
-    opus_int   k, n, mult2Q;
-    opus_int32 invGain_Q30, rc_Q31, rc_mult1_Q30, rc_mult2, tmp1, tmp2;
-    opus_int32 max, min;
+    oac_int   k, n, mult2Q;
+    oac_int32 invGain_Q30, rc_Q31, rc_mult1_Q30, rc_mult2, tmp1, tmp2;
+    oac_int32 max, min;
     int32x4_t  max_s32x4, min_s32x4;
     int32x2_t  max_s32x2, min_s32x2;
 
@@ -135,7 +135,7 @@ static OPUS_INLINE opus_int32 LPC_inverse_pred_gain_QA_neon( /* O   Returns inve
             vst1q_s32( A_QA + k - n - 4, t1_s32x4 );
         }
         for( ; n < (k + 1) >> 1; n++ ) {
-            opus_int64 tmp64;
+            oac_int64 tmp64;
             tmp1 = A_QA[ n ];
             tmp2 = A_QA[ k - n - 1 ];
             tmp64 = silk_RSHIFT_ROUND64( silk_SMULL( silk_SUB_SAT32(tmp1,
@@ -143,13 +143,13 @@ static OPUS_INLINE opus_int32 LPC_inverse_pred_gain_QA_neon( /* O   Returns inve
             if( tmp64 > silk_int32_MAX || tmp64 < silk_int32_MIN ) {
                return 0;
             }
-            A_QA[ n ] = ( opus_int32 )tmp64;
+            A_QA[ n ] = ( oac_int32 )tmp64;
             tmp64 = silk_RSHIFT_ROUND64( silk_SMULL( silk_SUB_SAT32(tmp2,
                   MUL32_FRAC_Q( tmp1, rc_Q31, 31 ) ), rc_mult2), mult2Q);
             if( tmp64 > silk_int32_MAX || tmp64 < silk_int32_MIN ) {
                return 0;
             }
-            A_QA[ k - n - 1 ] = ( opus_int32 )tmp64;
+            A_QA[ k - n - 1 ] = ( oac_int32 )tmp64;
         }
     }
 
@@ -187,25 +187,25 @@ static OPUS_INLINE opus_int32 LPC_inverse_pred_gain_QA_neon( /* O   Returns inve
 }
 
 /* For input in Q12 domain */
-opus_int32 silk_LPC_inverse_pred_gain_neon(         /* O   Returns inverse prediction gain in energy domain, Q30        */
-    const opus_int16            *A_Q12,             /* I   Prediction coefficients, Q12 [order]                         */
-    const opus_int              order               /* I   Prediction order                                             */
+oac_int32 silk_LPC_inverse_pred_gain_neon(         /* O   Returns inverse prediction gain in energy domain, Q30        */
+    const oac_int16            *A_Q12,             /* I   Prediction coefficients, Q12 [order]                         */
+    const oac_int              order               /* I   Prediction order                                             */
 )
 {
-#ifdef OPUS_CHECK_ASM
-    const opus_int32 invGain_Q30_c = silk_LPC_inverse_pred_gain_c( A_Q12, order );
+#ifdef OAC_CHECK_ASM
+    const oac_int32 invGain_Q30_c = silk_LPC_inverse_pred_gain_c( A_Q12, order );
 #endif
 
-    opus_int32 invGain_Q30;
+    oac_int32 invGain_Q30;
     if( ( SILK_MAX_ORDER_LPC != 24 ) || ( order & 1 )) {
         invGain_Q30 = silk_LPC_inverse_pred_gain_c( A_Q12, order );
     }
     else {
-        opus_int32 Atmp_QA[ SILK_MAX_ORDER_LPC ];
-        opus_int32 DC_resp;
+        oac_int32 Atmp_QA[ SILK_MAX_ORDER_LPC ];
+        oac_int32 DC_resp;
         int16x8_t  t0_s16x8, t1_s16x8, t2_s16x8;
         int32x4_t  t0_s32x4;
-        const opus_int leftover = order & 7;
+        const oac_int leftover = order & 7;
 
         /* Increase Q domain of the AR coefficients */
         t0_s16x8 = vld1q_s16( A_Q12 +  0 );
@@ -248,24 +248,24 @@ opus_int32 silk_LPC_inverse_pred_gain_neon(         /* O   Returns inverse predi
         switch( leftover )
         {
         case 6:
-            DC_resp += (opus_int32)A_Q12[ 5 ];
-            DC_resp += (opus_int32)A_Q12[ 4 ];
-            Atmp_QA[ order - leftover + 5 ] = silk_LSHIFT32( (opus_int32)A_Q12[ 5 ], QA - 12 );
-            Atmp_QA[ order - leftover + 4 ] = silk_LSHIFT32( (opus_int32)A_Q12[ 4 ], QA - 12 );
+            DC_resp += (oac_int32)A_Q12[ 5 ];
+            DC_resp += (oac_int32)A_Q12[ 4 ];
+            Atmp_QA[ order - leftover + 5 ] = silk_LSHIFT32( (oac_int32)A_Q12[ 5 ], QA - 12 );
+            Atmp_QA[ order - leftover + 4 ] = silk_LSHIFT32( (oac_int32)A_Q12[ 4 ], QA - 12 );
             /* FALLTHROUGH */
 
         case 4:
-            DC_resp += (opus_int32)A_Q12[ 3 ];
-            DC_resp += (opus_int32)A_Q12[ 2 ];
-            Atmp_QA[ order - leftover + 3 ] = silk_LSHIFT32( (opus_int32)A_Q12[ 3 ], QA - 12 );
-            Atmp_QA[ order - leftover + 2 ] = silk_LSHIFT32( (opus_int32)A_Q12[ 2 ], QA - 12 );
+            DC_resp += (oac_int32)A_Q12[ 3 ];
+            DC_resp += (oac_int32)A_Q12[ 2 ];
+            Atmp_QA[ order - leftover + 3 ] = silk_LSHIFT32( (oac_int32)A_Q12[ 3 ], QA - 12 );
+            Atmp_QA[ order - leftover + 2 ] = silk_LSHIFT32( (oac_int32)A_Q12[ 2 ], QA - 12 );
             /* FALLTHROUGH */
 
         case 2:
-            DC_resp += (opus_int32)A_Q12[ 1 ];
-            DC_resp += (opus_int32)A_Q12[ 0 ];
-            Atmp_QA[ order - leftover + 1 ] = silk_LSHIFT32( (opus_int32)A_Q12[ 1 ], QA - 12 );
-            Atmp_QA[ order - leftover + 0 ] = silk_LSHIFT32( (opus_int32)A_Q12[ 0 ], QA - 12 );
+            DC_resp += (oac_int32)A_Q12[ 1 ];
+            DC_resp += (oac_int32)A_Q12[ 0 ];
+            Atmp_QA[ order - leftover + 1 ] = silk_LSHIFT32( (oac_int32)A_Q12[ 1 ], QA - 12 );
+            Atmp_QA[ order - leftover + 0 ] = silk_LSHIFT32( (oac_int32)A_Q12[ 0 ], QA - 12 );
             /* FALLTHROUGH */
 
         default:
@@ -280,7 +280,7 @@ opus_int32 silk_LPC_inverse_pred_gain_neon(         /* O   Returns inverse predi
         }
     }
 
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     silk_assert( invGain_Q30_c == invGain_Q30 );
 #endif
 
diff --git a/silk/arm/NSQ_del_dec_arm.h b/silk/arm/NSQ_del_dec_arm.h
index 0c4fcfccb..d99b5a2ba 100644
--- a/silk/arm/NSQ_del_dec_arm.h
+++ b/silk/arm/NSQ_del_dec_arm.h
@@ -30,21 +30,21 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "celt/arm/armcpu.h"
 
-#if defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+#if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 void silk_NSQ_del_dec_neon(
     const silk_encoder_state *psEncC, silk_nsq_state *NSQ,
-    SideInfoIndices *psIndices, const opus_int16 x16[], opus_int8 pulses[],
-    const opus_int16 *PredCoef_Q12,
-    const opus_int16 LTPCoef_Q14[LTP_ORDER * MAX_NB_SUBFR],
-    const opus_int16 AR_Q13[MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER],
-    const opus_int HarmShapeGain_Q14[MAX_NB_SUBFR],
-    const opus_int Tilt_Q14[MAX_NB_SUBFR],
-    const opus_int32 LF_shp_Q14[MAX_NB_SUBFR],
-    const opus_int32 Gains_Q16[MAX_NB_SUBFR],
-    const opus_int pitchL[MAX_NB_SUBFR], const opus_int Lambda_Q10,
-    const opus_int LTP_scale_Q14);
+    SideInfoIndices *psIndices, const oac_int16 x16[], oac_int8 pulses[],
+    const oac_int16 *PredCoef_Q12,
+    const oac_int16 LTPCoef_Q14[LTP_ORDER * MAX_NB_SUBFR],
+    const oac_int16 AR_Q13[MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER],
+    const oac_int HarmShapeGain_Q14[MAX_NB_SUBFR],
+    const oac_int Tilt_Q14[MAX_NB_SUBFR],
+    const oac_int32 LF_shp_Q14[MAX_NB_SUBFR],
+    const oac_int32 Gains_Q16[MAX_NB_SUBFR],
+    const oac_int pitchL[MAX_NB_SUBFR], const oac_int Lambda_Q10,
+    const oac_int LTP_scale_Q14);
 
-#if !defined(OPUS_HAVE_RTCD)
+#if !defined(OAC_HAVE_RTCD)
 #define OVERRIDE_silk_NSQ_del_dec (1)
 #define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12,  \
                          LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14, Tilt_Q14,   \
@@ -60,30 +60,30 @@ void silk_NSQ_del_dec_neon(
 
 #if !defined(OVERRIDE_silk_NSQ_del_dec)
 /*Is run-time CPU detection enabled on this platform?*/
-#if defined(OPUS_HAVE_RTCD) && (defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && \
-                                !defined(OPUS_ARM_PRESUME_NEON_INTR))
-extern void (*const SILK_NSQ_DEL_DEC_IMPL[OPUS_ARCHMASK + 1])(
+#if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && \
+                                !defined(OAC_ARM_PRESUME_NEON_INTR))
+extern void (*const SILK_NSQ_DEL_DEC_IMPL[OAC_ARCHMASK + 1])(
     const silk_encoder_state *psEncC, silk_nsq_state *NSQ,
-    SideInfoIndices *psIndices, const opus_int16 x16[], opus_int8 pulses[],
-    const opus_int16 *PredCoef_Q12,
-    const opus_int16 LTPCoef_Q14[LTP_ORDER * MAX_NB_SUBFR],
-    const opus_int16 AR_Q13[MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER],
-    const opus_int HarmShapeGain_Q14[MAX_NB_SUBFR],
-    const opus_int Tilt_Q14[MAX_NB_SUBFR],
-    const opus_int32 LF_shp_Q14[MAX_NB_SUBFR],
-    const opus_int32 Gains_Q16[MAX_NB_SUBFR],
-    const opus_int pitchL[MAX_NB_SUBFR], const opus_int Lambda_Q10,
-    const opus_int LTP_scale_Q14);
+    SideInfoIndices *psIndices, const oac_int16 x16[], oac_int8 pulses[],
+    const oac_int16 *PredCoef_Q12,
+    const oac_int16 LTPCoef_Q14[LTP_ORDER * MAX_NB_SUBFR],
+    const oac_int16 AR_Q13[MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER],
+    const oac_int HarmShapeGain_Q14[MAX_NB_SUBFR],
+    const oac_int Tilt_Q14[MAX_NB_SUBFR],
+    const oac_int32 LF_shp_Q14[MAX_NB_SUBFR],
+    const oac_int32 Gains_Q16[MAX_NB_SUBFR],
+    const oac_int pitchL[MAX_NB_SUBFR], const oac_int Lambda_Q10,
+    const oac_int LTP_scale_Q14);
 #define OVERRIDE_silk_NSQ_del_dec (1)
 #define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, \
                          LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14, Tilt_Q14,  \
                          LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10,         \
                          LTP_scale_Q14, arch)                               \
-    ((*SILK_NSQ_DEL_DEC_IMPL[(arch)&OPUS_ARCHMASK])(                        \
+    ((*SILK_NSQ_DEL_DEC_IMPL[(arch)&OAC_ARCHMASK])(                        \
         psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14,     \
         AR_Q13, HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, \
         Lambda_Q10, LTP_scale_Q14))
-#elif defined(OPUS_ARM_PRESUME_NEON_INTR)
+#elif defined(OAC_ARM_PRESUME_NEON_INTR)
 #define OVERRIDE_silk_NSQ_del_dec (1)
 #define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12,   \
                          LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14, Tilt_Q14,    \
diff --git a/silk/arm/NSQ_del_dec_neon_intr.c b/silk/arm/NSQ_del_dec_neon_intr.c
index 668dde6dc..be90f0ca3 100644
--- a/silk/arm/NSQ_del_dec_neon_intr.c
+++ b/silk/arm/NSQ_del_dec_neon_intr.c
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #include <arm_neon.h>
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
 # include <string.h>
 #endif
 #include "main.h"
@@ -42,90 +42,90 @@ POSSIBILITY OF SUCH DAMAGE.
 #define NEON_MAX_DEL_DEC_STATES 4
 
 typedef struct {
-    opus_int32 sLPC_Q14[ MAX_SUB_FRAME_LENGTH + NSQ_LPC_BUF_LENGTH ][ NEON_MAX_DEL_DEC_STATES ];
-    opus_int32 RandState[ DECISION_DELAY ][     NEON_MAX_DEL_DEC_STATES ];
-    opus_int32 Q_Q10[     DECISION_DELAY ][     NEON_MAX_DEL_DEC_STATES ];
-    opus_int32 Xq_Q14[    DECISION_DELAY ][     NEON_MAX_DEL_DEC_STATES ];
-    opus_int32 Pred_Q15[  DECISION_DELAY ][     NEON_MAX_DEL_DEC_STATES ];
-    opus_int32 Shape_Q14[ DECISION_DELAY ][     NEON_MAX_DEL_DEC_STATES ];
-    opus_int32 sAR2_Q14[ MAX_SHAPE_LPC_ORDER ][ NEON_MAX_DEL_DEC_STATES ];
-    opus_int32 LF_AR_Q14[ NEON_MAX_DEL_DEC_STATES ];
-    opus_int32 Diff_Q14[  NEON_MAX_DEL_DEC_STATES ];
-    opus_int32 Seed[      NEON_MAX_DEL_DEC_STATES ];
-    opus_int32 SeedInit[  NEON_MAX_DEL_DEC_STATES ];
-    opus_int32 RD_Q10[    NEON_MAX_DEL_DEC_STATES ];
+    oac_int32 sLPC_Q14[ MAX_SUB_FRAME_LENGTH + NSQ_LPC_BUF_LENGTH ][ NEON_MAX_DEL_DEC_STATES ];
+    oac_int32 RandState[ DECISION_DELAY ][     NEON_MAX_DEL_DEC_STATES ];
+    oac_int32 Q_Q10[     DECISION_DELAY ][     NEON_MAX_DEL_DEC_STATES ];
+    oac_int32 Xq_Q14[    DECISION_DELAY ][     NEON_MAX_DEL_DEC_STATES ];
+    oac_int32 Pred_Q15[  DECISION_DELAY ][     NEON_MAX_DEL_DEC_STATES ];
+    oac_int32 Shape_Q14[ DECISION_DELAY ][     NEON_MAX_DEL_DEC_STATES ];
+    oac_int32 sAR2_Q14[ MAX_SHAPE_LPC_ORDER ][ NEON_MAX_DEL_DEC_STATES ];
+    oac_int32 LF_AR_Q14[ NEON_MAX_DEL_DEC_STATES ];
+    oac_int32 Diff_Q14[  NEON_MAX_DEL_DEC_STATES ];
+    oac_int32 Seed[      NEON_MAX_DEL_DEC_STATES ];
+    oac_int32 SeedInit[  NEON_MAX_DEL_DEC_STATES ];
+    oac_int32 RD_Q10[    NEON_MAX_DEL_DEC_STATES ];
 } NSQ_del_decs_struct;
 
 typedef struct {
-    opus_int32 Q_Q10[        NEON_MAX_DEL_DEC_STATES ];
-    opus_int32 RD_Q10[       NEON_MAX_DEL_DEC_STATES ];
-    opus_int32 xq_Q14[       NEON_MAX_DEL_DEC_STATES ];
-    opus_int32 LF_AR_Q14[    NEON_MAX_DEL_DEC_STATES ];
-    opus_int32 Diff_Q14[     NEON_MAX_DEL_DEC_STATES ];
-    opus_int32 sLTP_shp_Q14[ NEON_MAX_DEL_DEC_STATES ];
-    opus_int32 LPC_exc_Q14[  NEON_MAX_DEL_DEC_STATES ];
+    oac_int32 Q_Q10[        NEON_MAX_DEL_DEC_STATES ];
+    oac_int32 RD_Q10[       NEON_MAX_DEL_DEC_STATES ];
+    oac_int32 xq_Q14[       NEON_MAX_DEL_DEC_STATES ];
+    oac_int32 LF_AR_Q14[    NEON_MAX_DEL_DEC_STATES ];
+    oac_int32 Diff_Q14[     NEON_MAX_DEL_DEC_STATES ];
+    oac_int32 sLTP_shp_Q14[ NEON_MAX_DEL_DEC_STATES ];
+    oac_int32 LPC_exc_Q14[  NEON_MAX_DEL_DEC_STATES ];
 } NSQ_samples_struct;
 
-static OPUS_INLINE void silk_nsq_del_dec_scale_states_neon(
+static OAC_INLINE void silk_nsq_del_dec_scale_states_neon(
     const silk_encoder_state *psEncC,               /* I    Encoder State                       */
     silk_nsq_state      *NSQ,                       /* I/O  NSQ state                           */
     NSQ_del_decs_struct psDelDec[],                 /* I/O  Delayed decision states             */
-    const opus_int16    x16[],                      /* I    Input                               */
-    opus_int32          x_sc_Q10[],                 /* O    Input scaled with 1/Gain in Q10     */
-    const opus_int16    sLTP[],                     /* I    Re-whitened LTP state in Q0         */
-    opus_int32          sLTP_Q15[],                 /* O    LTP state matching scaled input     */
-    opus_int            subfr,                      /* I    Subframe number                     */
-    const opus_int      LTP_scale_Q14,              /* I    LTP state scaling                   */
-    const opus_int32    Gains_Q16[ MAX_NB_SUBFR ],  /* I                                        */
-    const opus_int      pitchL[ MAX_NB_SUBFR ],     /* I    Pitch lag                           */
-    const opus_int      signal_type,                /* I    Signal type                         */
-    const opus_int      decisionDelay               /* I    Decision delay                      */
+    const oac_int16    x16[],                      /* I    Input                               */
+    oac_int32          x_sc_Q10[],                 /* O    Input scaled with 1/Gain in Q10     */
+    const oac_int16    sLTP[],                     /* I    Re-whitened LTP state in Q0         */
+    oac_int32          sLTP_Q15[],                 /* O    LTP state matching scaled input     */
+    oac_int            subfr,                      /* I    Subframe number                     */
+    const oac_int      LTP_scale_Q14,              /* I    LTP state scaling                   */
+    const oac_int32    Gains_Q16[ MAX_NB_SUBFR ],  /* I                                        */
+    const oac_int      pitchL[ MAX_NB_SUBFR ],     /* I    Pitch lag                           */
+    const oac_int      signal_type,                /* I    Signal type                         */
+    const oac_int      decisionDelay               /* I    Decision delay                      */
 );
 
 /******************************************/
 /* Noise shape quantizer for one subframe */
 /******************************************/
-static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_neon(
+static OAC_INLINE void silk_noise_shape_quantizer_del_dec_neon(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                           */
     NSQ_del_decs_struct psDelDec[],             /* I/O  Delayed decision states             */
-    opus_int            signalType,             /* I    Signal type                         */
-    const opus_int32    x_Q10[],                /* I                                        */
-    opus_int8           pulses[],               /* O                                        */
-    opus_int16          xq[],                   /* O                                        */
-    opus_int32          sLTP_Q15[],             /* I/O  LTP filter state                    */
-    opus_int32          delayedGain_Q10[],      /* I/O  Gain delay buffer                   */
-    const opus_int16    a_Q12[],                /* I    Short term prediction coefs         */
-    const opus_int16    b_Q14[],                /* I    Long term prediction coefs          */
-    const opus_int16    AR_shp_Q13[],           /* I    Noise shaping coefs                 */
-    opus_int            lag,                    /* I    Pitch lag                           */
-    opus_int32          HarmShapeFIRPacked_Q14, /* I                                        */
-    opus_int            Tilt_Q14,               /* I    Spectral tilt                       */
-    opus_int32          LF_shp_Q14,             /* I                                        */
-    opus_int32          Gain_Q16,               /* I                                        */
-    opus_int            Lambda_Q10,             /* I                                        */
-    opus_int            offset_Q10,             /* I                                        */
-    opus_int            length,                 /* I    Input length                        */
-    opus_int            subfr,                  /* I    Subframe number                     */
-    opus_int            shapingLPCOrder,        /* I    Shaping LPC filter order            */
-    opus_int            predictLPCOrder,        /* I    Prediction filter order             */
-    opus_int            warping_Q16,            /* I                                        */
-    opus_int            nStatesDelayedDecision, /* I    Number of states in decision tree   */
-    opus_int            *smpl_buf_idx,          /* I/O  Index to newest samples in buffers  */
-    opus_int            decisionDelay           /* I                                        */
+    oac_int            signalType,             /* I    Signal type                         */
+    const oac_int32    x_Q10[],                /* I                                        */
+    oac_int8           pulses[],               /* O                                        */
+    oac_int16          xq[],                   /* O                                        */
+    oac_int32          sLTP_Q15[],             /* I/O  LTP filter state                    */
+    oac_int32          delayedGain_Q10[],      /* I/O  Gain delay buffer                   */
+    const oac_int16    a_Q12[],                /* I    Short term prediction coefs         */
+    const oac_int16    b_Q14[],                /* I    Long term prediction coefs          */
+    const oac_int16    AR_shp_Q13[],           /* I    Noise shaping coefs                 */
+    oac_int            lag,                    /* I    Pitch lag                           */
+    oac_int32          HarmShapeFIRPacked_Q14, /* I                                        */
+    oac_int            Tilt_Q14,               /* I    Spectral tilt                       */
+    oac_int32          LF_shp_Q14,             /* I                                        */
+    oac_int32          Gain_Q16,               /* I                                        */
+    oac_int            Lambda_Q10,             /* I                                        */
+    oac_int            offset_Q10,             /* I                                        */
+    oac_int            length,                 /* I    Input length                        */
+    oac_int            subfr,                  /* I    Subframe number                     */
+    oac_int            shapingLPCOrder,        /* I    Shaping LPC filter order            */
+    oac_int            predictLPCOrder,        /* I    Prediction filter order             */
+    oac_int            warping_Q16,            /* I                                        */
+    oac_int            nStatesDelayedDecision, /* I    Number of states in decision tree   */
+    oac_int            *smpl_buf_idx,          /* I/O  Index to newest samples in buffers  */
+    oac_int            decisionDelay           /* I                                        */
 );
 
-static OPUS_INLINE void copy_winner_state_kernel(
+static OAC_INLINE void copy_winner_state_kernel(
     const NSQ_del_decs_struct *psDelDec,
-    const opus_int            offset,
-    const opus_int            last_smple_idx,
-    const opus_int            Winner_ind,
+    const oac_int            offset,
+    const oac_int            last_smple_idx,
+    const oac_int            Winner_ind,
     const int32x2_t           gain_lo_s32x2,
     const int32x2_t           gain_hi_s32x2,
     const int32x4_t           shift_s32x4,
     int32x4_t                 t0_s32x4,
     int32x4_t                 t1_s32x4,
-    opus_int8 *const          pulses,
-    opus_int16                *pxq,
+    oac_int8 *const          pulses,
+    oac_int16                *pxq,
     silk_nsq_state            *NSQ
 )
 {
@@ -172,19 +172,19 @@ static OPUS_INLINE void copy_winner_state_kernel(
     vst1q_s32( &NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx + offset + 4 ], t1_s32x4 );
 }
 
-static OPUS_INLINE void copy_winner_state(
+static OAC_INLINE void copy_winner_state(
     const NSQ_del_decs_struct *psDelDec,
-    const opus_int            decisionDelay,
-    const opus_int            smpl_buf_idx,
-    const opus_int            Winner_ind,
-    const opus_int32          gain,
-    const opus_int32          shift,
-    opus_int8 *const          pulses,
-    opus_int16                *pxq,
+    const oac_int            decisionDelay,
+    const oac_int            smpl_buf_idx,
+    const oac_int            Winner_ind,
+    const oac_int32          gain,
+    const oac_int32          shift,
+    oac_int8 *const          pulses,
+    oac_int16                *pxq,
     silk_nsq_state            *NSQ
 )
 {
-    opus_int        i, last_smple_idx;
+    oac_int        i, last_smple_idx;
     const int32x2_t gain_lo_s32x2 = vdup_n_s32( silk_LSHIFT32( gain & 0x0000FFFF, 15 ) );
     const int32x2_t gain_hi_s32x2 = vdup_n_s32( gain >> 16 );
     const int32x4_t shift_s32x4 = vdupq_n_s32( -shift );
@@ -199,8 +199,8 @@ static OPUS_INLINE void copy_winner_state(
         copy_winner_state_kernel( psDelDec, i - decisionDelay, last_smple_idx, Winner_ind, gain_lo_s32x2, gain_hi_s32x2, shift_s32x4, t0_s32x4, t1_s32x4, pulses, pxq, NSQ );
     }
     for( ; ( i < decisionDelay ) && ( last_smple_idx >= 0 ); i++, last_smple_idx-- ) {
-        pulses[ i - decisionDelay ] = (opus_int8)silk_RSHIFT_ROUND( psDelDec->Q_Q10[ last_smple_idx ][ Winner_ind ], 10 );
-        pxq[ i - decisionDelay ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( psDelDec->Xq_Q14[ last_smple_idx ][ Winner_ind ], gain ), shift ) );
+        pulses[ i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDelDec->Q_Q10[ last_smple_idx ][ Winner_ind ], 10 );
+        pxq[ i - decisionDelay ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( psDelDec->Xq_Q14[ last_smple_idx ][ Winner_ind ], gain ), shift ) );
         NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay + i ] = psDelDec->Shape_Q14[ last_smple_idx ][ Winner_ind ];
     }
 
@@ -209,8 +209,8 @@ static OPUS_INLINE void copy_winner_state(
         copy_winner_state_kernel( psDelDec, i - decisionDelay, last_smple_idx, Winner_ind, gain_lo_s32x2, gain_hi_s32x2, shift_s32x4, t0_s32x4, t1_s32x4, pulses, pxq, NSQ );
     }
     for( ; i < decisionDelay; i++, last_smple_idx-- ) {
-        pulses[ i - decisionDelay ] = (opus_int8)silk_RSHIFT_ROUND( psDelDec->Q_Q10[ last_smple_idx ][ Winner_ind ], 10 );
-        pxq[ i - decisionDelay ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( psDelDec->Xq_Q14[ last_smple_idx ][ Winner_ind ], gain ), shift ) );
+        pulses[ i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDelDec->Q_Q10[ last_smple_idx ][ Winner_ind ], 10 );
+        pxq[ i - decisionDelay ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( psDelDec->Xq_Q14[ last_smple_idx ][ Winner_ind ], gain ), shift ) );
         NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay + i ] = psDelDec->Shape_Q14[ last_smple_idx ][ Winner_ind ];
     }
 }
@@ -219,25 +219,25 @@ void silk_NSQ_del_dec_neon(
     const silk_encoder_state    *psEncC,                                    /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                       /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                 /* I/O  Quantization Indices            */
-    const opus_int16            x16[],                                      /* I    Input                           */
-    opus_int8                   pulses[],                                   /* O    Quantized pulse signal          */
-    const opus_int16            *PredCoef_Q12,                              /* I    Short term prediction coefs     */
-    const opus_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],    /* I    Long term prediction coefs      */
-    const opus_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs              */
-    const opus_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],          /* I    Long term shaping coefs         */
-    const opus_int              Tilt_Q14[ MAX_NB_SUBFR ],                   /* I    Spectral tilt                   */
-    const opus_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                 /* I    Low frequency shaping coefs     */
-    const opus_int32            Gains_Q16[ MAX_NB_SUBFR ],                  /* I    Quantization step sizes         */
-    const opus_int              pitchL[ MAX_NB_SUBFR ],                     /* I    Pitch lags                      */
-    const opus_int              Lambda_Q10,                                 /* I    Rate/distortion tradeoff        */
-    const opus_int              LTP_scale_Q14                               /* I    LTP state scaling               */
+    const oac_int16            x16[],                                      /* I    Input                           */
+    oac_int8                   pulses[],                                   /* O    Quantized pulse signal          */
+    const oac_int16            *PredCoef_Q12,                              /* I    Short term prediction coefs     */
+    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],    /* I    Long term prediction coefs      */
+    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs              */
+    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],          /* I    Long term shaping coefs         */
+    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                   /* I    Spectral tilt                   */
+    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                 /* I    Low frequency shaping coefs     */
+    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                  /* I    Quantization step sizes         */
+    const oac_int              pitchL[ MAX_NB_SUBFR ],                     /* I    Pitch lags                      */
+    const oac_int              Lambda_Q10,                                 /* I    Rate/distortion tradeoff        */
+    const oac_int              LTP_scale_Q14                               /* I    LTP state scaling               */
 )
 {
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     silk_nsq_state NSQ_c;
     SideInfoIndices psIndices_c;
-    opus_int8 pulses_c[ MAX_FRAME_LENGTH ];
-    const opus_int8 *const pulses_a = pulses;
+    oac_int8 pulses_c[ MAX_FRAME_LENGTH ];
+    const oac_int8 *const pulses_a = pulses;
 
     ( void )pulses_a;
     silk_memcpy( &NSQ_c, NSQ, sizeof( NSQ_c ) );
@@ -258,17 +258,17 @@ void silk_NSQ_del_dec_neon(
         silk_NSQ_del_dec_c( psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14,
             Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14 );
     } else {
-        opus_int            i, k, lag, start_idx, LSF_interpolation_flag, Winner_ind, subfr;
-        opus_int            smpl_buf_idx, decisionDelay;
-        const opus_int16    *A_Q12, *B_Q14, *AR_shp_Q13;
-        opus_int16          *pxq;
-        VARDECL( opus_int32, sLTP_Q15 );
-        VARDECL( opus_int16, sLTP );
-        opus_int32          HarmShapeFIRPacked_Q14;
-        opus_int            offset_Q10;
-        opus_int32          RDmin_Q10, Gain_Q10;
-        VARDECL( opus_int32, x_sc_Q10 );
-        VARDECL( opus_int32, delayedGain_Q10 );
+        oac_int            i, k, lag, start_idx, LSF_interpolation_flag, Winner_ind, subfr;
+        oac_int            smpl_buf_idx, decisionDelay;
+        const oac_int16    *A_Q12, *B_Q14, *AR_shp_Q13;
+        oac_int16          *pxq;
+        VARDECL( oac_int32, sLTP_Q15 );
+        VARDECL( oac_int16, sLTP );
+        oac_int32          HarmShapeFIRPacked_Q14;
+        oac_int            offset_Q10;
+        oac_int32          RDmin_Q10, Gain_Q10;
+        VARDECL( oac_int32, x_sc_Q10 );
+        VARDECL( oac_int32, delayedGain_Q10 );
         VARDECL( NSQ_del_decs_struct, psDelDec );
         int32x4_t           t_s32x4;
         SAVE_STACK;
@@ -280,7 +280,7 @@ void silk_NSQ_del_dec_neon(
 
         /* Initialize delayed decision states */
         ALLOC( psDelDec, 1, NSQ_del_decs_struct );
-        OPUS_CLEAR(psDelDec, 1);
+        OAC_CLEAR(psDelDec, 1);
         /* Only RandState and RD_Q10 need to be initialized to 0. */
         silk_memset( psDelDec->RandState, 0, sizeof( psDelDec->RandState ) );
         vst1q_s32( psDelDec->RD_Q10, vdupq_n_s32( 0 ) );
@@ -294,7 +294,7 @@ void silk_NSQ_del_dec_neon(
         for( i = 0; i < NSQ_LPC_BUF_LENGTH; i++ ) {
             vst1q_s32( psDelDec->sLPC_Q14[ i ], vld1q_dup_s32( &NSQ->sLPC_Q14[ i ] ) );
         }
-        for( i = 0; i < (opus_int)( sizeof( NSQ->sAR2_Q14 ) / sizeof( NSQ->sAR2_Q14[ 0 ] ) ); i++ ) {
+        for( i = 0; i < (oac_int)( sizeof( NSQ->sAR2_Q14 ) / sizeof( NSQ->sAR2_Q14[ 0 ] ) ); i++ ) {
             vst1q_s32( psDelDec->sAR2_Q14[ i ], vld1q_dup_s32( &NSQ->sAR2_Q14[ i ] ) );
         }
 
@@ -305,7 +305,7 @@ void silk_NSQ_del_dec_neon(
 
         /* For voiced frames limit the decision delay to lower than the pitch lag */
         if( psIndices->signalType == TYPE_VOICED ) {
-            opus_int pitch_min = pitchL[ 0 ];
+            oac_int pitch_min = pitchL[ 0 ];
             for( k = 1; k < psEncC->nb_subfr; k++ ) {
                 pitch_min = silk_min_int( pitch_min, pitchL[ k ] );
             }
@@ -322,10 +322,10 @@ void silk_NSQ_del_dec_neon(
             LSF_interpolation_flag = 1;
         }
 
-        ALLOC( sLTP_Q15, psEncC->ltp_mem_length + psEncC->frame_length, opus_int32 );
-        ALLOC( sLTP, psEncC->ltp_mem_length + psEncC->frame_length, opus_int16 );
-        ALLOC( x_sc_Q10, psEncC->subfr_length, opus_int32 );
-        ALLOC( delayedGain_Q10, DECISION_DELAY, opus_int32 );
+        ALLOC( sLTP_Q15, psEncC->ltp_mem_length + psEncC->frame_length, oac_int32 );
+        ALLOC( sLTP, psEncC->ltp_mem_length + psEncC->frame_length, oac_int16 );
+        ALLOC( x_sc_Q10, psEncC->subfr_length, oac_int32 );
+        ALLOC( delayedGain_Q10, DECISION_DELAY, oac_int32 );
         /* Set up pointers to start of sub frame */
         pxq                   = &NSQ->xq[ psEncC->ltp_mem_length ];
         NSQ->sLTP_shp_buf_idx = psEncC->ltp_mem_length;
@@ -339,7 +339,7 @@ void silk_NSQ_del_dec_neon(
             /* Noise shape parameters */
             silk_assert( HarmShapeGain_Q14[ k ] >= 0 );
             HarmShapeFIRPacked_Q14  =                          silk_RSHIFT( HarmShapeGain_Q14[ k ], 2 );
-            HarmShapeFIRPacked_Q14 |= silk_LSHIFT( (opus_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
+            HarmShapeFIRPacked_Q14 |= silk_LSHIFT( (oac_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
 
             NSQ->rewhite_flag = 0;
             if( psIndices->signalType == TYPE_VOICED ) {
@@ -424,7 +424,7 @@ void silk_NSQ_del_dec_neon(
           NSQ->sLPC_Q14[ i ] = psDelDec->sLPC_Q14[ i ][ Winner_ind ];
         }
 
-        for( i = 0; i < (opus_int)( sizeof( NSQ->sAR2_Q14 ) / sizeof( NSQ->sAR2_Q14[ 0 ] ) - 3 ); i += 4 ) {
+        for( i = 0; i < (oac_int)( sizeof( NSQ->sAR2_Q14 ) / sizeof( NSQ->sAR2_Q14[ 0 ] ) - 3 ); i += 4 ) {
             t_s32x4 = vld1q_lane_s32( &psDelDec->sAR2_Q14[ i + 0 ][ Winner_ind ], t_s32x4, 0 );
             t_s32x4 = vld1q_lane_s32( &psDelDec->sAR2_Q14[ i + 1 ][ Winner_ind ], t_s32x4, 1 );
             t_s32x4 = vld1q_lane_s32( &psDelDec->sAR2_Q14[ i + 2 ][ Winner_ind ], t_s32x4, 2 );
@@ -432,7 +432,7 @@ void silk_NSQ_del_dec_neon(
             vst1q_s32( &NSQ->sAR2_Q14[ i ], t_s32x4 );
         }
 
-        for( ; i < (opus_int)( sizeof( NSQ->sAR2_Q14 ) / sizeof( NSQ->sAR2_Q14[ 0 ] ) ); i++ ) {
+        for( ; i < (oac_int)( sizeof( NSQ->sAR2_Q14 ) / sizeof( NSQ->sAR2_Q14[ 0 ] ) ); i++ ) {
           NSQ->sAR2_Q14[ i ] = psDelDec->sAR2_Q14[ i ][ Winner_ind ];
         }
 
@@ -442,12 +442,12 @@ void silk_NSQ_del_dec_neon(
         NSQ->lagPrev        = pitchL[ psEncC->nb_subfr - 1 ];
 
         /* Save quantized speech signal */
-        silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int16 ) );
-        silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int32 ) );
+        silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( oac_int16 ) );
+        silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( oac_int32 ) );
         RESTORE_STACK;
     }
 
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     silk_assert( !memcmp( &NSQ_c, NSQ, sizeof( NSQ_c ) ) );
     silk_assert( !memcmp( &psIndices_c, psIndices, sizeof( psIndices_c ) ) );
     silk_assert( !memcmp( pulses_c, pulses_a, sizeof( pulses_c ) ) );
@@ -459,7 +459,7 @@ void silk_NSQ_del_dec_neon(
 /******************************************/
 /* Note: Function silk_short_prediction_create_arch_coef_neon() defined in NSQ_neon.h is actually a hacking C function. */
 /*       Therefore here we append "_local" to the NEON function name to avoid confusion.                                */
-static OPUS_INLINE void silk_short_prediction_create_arch_coef_neon_local(opus_int32 *out, const opus_int16 *in, opus_int order)
+static OAC_INLINE void silk_short_prediction_create_arch_coef_neon_local(oac_int32 *out, const oac_int16 *in, oac_int order)
 {
   int16x8_t t_s16x8;
   int32x4_t t0_s32x4, t1_s32x4, t2_s32x4, t3_s32x4;
@@ -490,7 +490,7 @@ static OPUS_INLINE void silk_short_prediction_create_arch_coef_neon_local(opus_i
   vst1q_s32( out + 12, t3_s32x4 );
 }
 
-static OPUS_INLINE int32x4_t silk_SMLAWB_lane0_neon(
+static OAC_INLINE int32x4_t silk_SMLAWB_lane0_neon(
     const int32x4_t out_s32x4,
     const int32x4_t in_s32x4,
     const int32x2_t coef_s32x2
@@ -499,7 +499,7 @@ static OPUS_INLINE int32x4_t silk_SMLAWB_lane0_neon(
     return vaddq_s32( out_s32x4, vqdmulhq_lane_s32( in_s32x4, coef_s32x2, 0 ) );
 }
 
-static OPUS_INLINE int32x4_t silk_SMLAWB_lane1_neon(
+static OAC_INLINE int32x4_t silk_SMLAWB_lane1_neon(
     const int32x4_t out_s32x4,
     const int32x4_t in_s32x4,
     const int32x2_t coef_s32x2
@@ -510,7 +510,7 @@ static OPUS_INLINE int32x4_t silk_SMLAWB_lane1_neon(
 
 /* Note: This function has different return value than silk_noise_shape_quantizer_short_prediction_neon(). */
 /*       Therefore here we append "_local" to the function name to avoid confusion.                        */
-static OPUS_INLINE int32x4_t silk_noise_shape_quantizer_short_prediction_neon_local(const opus_int32 *buf32, const opus_int32 *a_Q12_arch, opus_int order)
+static OAC_INLINE int32x4_t silk_noise_shape_quantizer_short_prediction_neon_local(const oac_int32 *buf32, const oac_int32 *a_Q12_arch, oac_int order)
 {
     const int32x4_t a_Q12_arch0_s32x4 = vld1q_s32( a_Q12_arch + 0 );
     const int32x4_t a_Q12_arch1_s32x4 = vld1q_s32( a_Q12_arch + 4 );
@@ -541,45 +541,45 @@ static OPUS_INLINE int32x4_t silk_noise_shape_quantizer_short_prediction_neon_lo
     return LPC_pred_Q14_s32x4;
 }
 
-static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_neon(
+static OAC_INLINE void silk_noise_shape_quantizer_del_dec_neon(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                           */
     NSQ_del_decs_struct psDelDec[],             /* I/O  Delayed decision states             */
-    opus_int            signalType,             /* I    Signal type                         */
-    const opus_int32    x_Q10[],                /* I                                        */
-    opus_int8           pulses[],               /* O                                        */
-    opus_int16          xq[],                   /* O                                        */
-    opus_int32          sLTP_Q15[],             /* I/O  LTP filter state                    */
-    opus_int32          delayedGain_Q10[],      /* I/O  Gain delay buffer                   */
-    const opus_int16    a_Q12[],                /* I    Short term prediction coefs         */
-    const opus_int16    b_Q14[],                /* I    Long term prediction coefs          */
-    const opus_int16    AR_shp_Q13[],           /* I    Noise shaping coefs                 */
-    opus_int            lag,                    /* I    Pitch lag                           */
-    opus_int32          HarmShapeFIRPacked_Q14, /* I                                        */
-    opus_int            Tilt_Q14,               /* I    Spectral tilt                       */
-    opus_int32          LF_shp_Q14,             /* I                                        */
-    opus_int32          Gain_Q16,               /* I                                        */
-    opus_int            Lambda_Q10,             /* I                                        */
-    opus_int            offset_Q10,             /* I                                        */
-    opus_int            length,                 /* I    Input length                        */
-    opus_int            subfr,                  /* I    Subframe number                     */
-    opus_int            shapingLPCOrder,        /* I    Shaping LPC filter order            */
-    opus_int            predictLPCOrder,        /* I    Prediction filter order             */
-    opus_int            warping_Q16,            /* I                                        */
-    opus_int            nStatesDelayedDecision, /* I    Number of states in decision tree   */
-    opus_int            *smpl_buf_idx,          /* I/O  Index to newest samples in buffers  */
-    opus_int            decisionDelay           /* I                                        */
+    oac_int            signalType,             /* I    Signal type                         */
+    const oac_int32    x_Q10[],                /* I                                        */
+    oac_int8           pulses[],               /* O                                        */
+    oac_int16          xq[],                   /* O                                        */
+    oac_int32          sLTP_Q15[],             /* I/O  LTP filter state                    */
+    oac_int32          delayedGain_Q10[],      /* I/O  Gain delay buffer                   */
+    const oac_int16    a_Q12[],                /* I    Short term prediction coefs         */
+    const oac_int16    b_Q14[],                /* I    Long term prediction coefs          */
+    const oac_int16    AR_shp_Q13[],           /* I    Noise shaping coefs                 */
+    oac_int            lag,                    /* I    Pitch lag                           */
+    oac_int32          HarmShapeFIRPacked_Q14, /* I                                        */
+    oac_int            Tilt_Q14,               /* I    Spectral tilt                       */
+    oac_int32          LF_shp_Q14,             /* I                                        */
+    oac_int32          Gain_Q16,               /* I                                        */
+    oac_int            Lambda_Q10,             /* I                                        */
+    oac_int            offset_Q10,             /* I                                        */
+    oac_int            length,                 /* I    Input length                        */
+    oac_int            subfr,                  /* I    Subframe number                     */
+    oac_int            shapingLPCOrder,        /* I    Shaping LPC filter order            */
+    oac_int            predictLPCOrder,        /* I    Prediction filter order             */
+    oac_int            warping_Q16,            /* I                                        */
+    oac_int            nStatesDelayedDecision, /* I    Number of states in decision tree   */
+    oac_int            *smpl_buf_idx,          /* I/O  Index to newest samples in buffers  */
+    oac_int            decisionDelay           /* I                                        */
 )
 {
-    opus_int     i, j, k, Winner_ind, RDmin_ind, RDmax_ind, last_smple_idx;
-    opus_int32   Winner_rand_state;
-    opus_int32   LTP_pred_Q14, n_LTP_Q14;
-    opus_int32   RDmin_Q10, RDmax_Q10;
-    opus_int32   Gain_Q10;
-    opus_int32   *pred_lag_ptr, *shp_lag_ptr;
-    opus_int32   a_Q12_arch[MAX_LPC_ORDER];
+    oac_int     i, j, k, Winner_ind, RDmin_ind, RDmax_ind, last_smple_idx;
+    oac_int32   Winner_rand_state;
+    oac_int32   LTP_pred_Q14, n_LTP_Q14;
+    oac_int32   RDmin_Q10, RDmax_Q10;
+    oac_int32   Gain_Q10;
+    oac_int32   *pred_lag_ptr, *shp_lag_ptr;
+    oac_int32   a_Q12_arch[MAX_LPC_ORDER];
     const int32x2_t warping_Q16_s32x2 = vdup_n_s32( silk_LSHIFT32( warping_Q16, 16 ) >> 1 );
-    const opus_int32 LF_shp_Q29 = silk_LSHIFT32( LF_shp_Q14, 16 ) >> 1;
-    opus_int32 AR_shp_Q28[ MAX_SHAPE_LPC_ORDER ];
+    const oac_int32 LF_shp_Q29 = silk_LSHIFT32( LF_shp_Q14, 16 ) >> 1;
+    oac_int32 AR_shp_Q28[ MAX_SHAPE_LPC_ORDER ];
     const uint32x4_t rand_multiplier_u32x4 = vdupq_n_u32( RAND_MULTIPLIER );
     const uint32x4_t rand_increment_u32x4 = vdupq_n_u32( RAND_INCREMENT );
 
@@ -589,7 +589,7 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_neon(
     silk_assert( nStatesDelayedDecision > 0 );
     silk_assert( ( shapingLPCOrder & 1 ) == 0 );   /* check that order is even */
     ALLOC( psSampleState, 2, NSQ_samples_struct );
-    OPUS_CLEAR(psSampleState, 2);
+    OAC_CLEAR(psSampleState, 2);
 
     shp_lag_ptr  = &NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS / 2 ];
     pred_lag_ptr = &sLTP_Q15[ NSQ->sLTP_buf_idx - lag + LTP_ORDER / 2 ];
@@ -827,8 +827,8 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_neon(
         /* clear unused part of RD_Q10 to avoid overflows */
         if( nStatesDelayedDecision < NEON_MAX_DEL_DEC_STATES )
         {
-            OPUS_CLEAR(psSampleState[0].RD_Q10 + nStatesDelayedDecision, NEON_MAX_DEL_DEC_STATES - nStatesDelayedDecision);
-            OPUS_CLEAR(psSampleState[1].RD_Q10 + nStatesDelayedDecision, NEON_MAX_DEL_DEC_STATES - nStatesDelayedDecision);
+            OAC_CLEAR(psSampleState[0].RD_Q10 + nStatesDelayedDecision, NEON_MAX_DEL_DEC_STATES - nStatesDelayedDecision);
+            OAC_CLEAR(psSampleState[1].RD_Q10 + nStatesDelayedDecision, NEON_MAX_DEL_DEC_STATES - nStatesDelayedDecision);
         }
 
         /* Increase RD values of expired states */
@@ -866,9 +866,9 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_neon(
 
         /* Replace a state if best from second set outperforms worst in first set */
         if( RDmin_Q10 < RDmax_Q10 ) {
-            opus_int32 (*ptr)[NEON_MAX_DEL_DEC_STATES] = psDelDec->RandState;
+            oac_int32 (*ptr)[NEON_MAX_DEL_DEC_STATES] = psDelDec->RandState;
             const int numOthers = (int)( ( sizeof( NSQ_del_decs_struct ) - sizeof( ( (NSQ_del_decs_struct *)0 )->sLPC_Q14 ) )
-                / ( NEON_MAX_DEL_DEC_STATES * sizeof( opus_int32 ) ) );
+                / ( NEON_MAX_DEL_DEC_STATES * sizeof( oac_int32 ) ) );
             /* Only ( predictLPCOrder - 1 ) of sLPC_Q14 buffer need to be updated, though the first several     */
             /* useless sLPC_Q14[] will be different comparing with C when predictLPCOrder < NSQ_LPC_BUF_LENGTH. */
             /* Here just update constant ( NSQ_LPC_BUF_LENGTH - 1 ) for simplicity.                             */
@@ -890,8 +890,8 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_neon(
 
         /* Write samples from winner to output and long-term filter states */
         if( subfr > 0 || i >= decisionDelay ) {
-            pulses[  i - decisionDelay ] = (opus_int8)silk_RSHIFT_ROUND( psDelDec->Q_Q10[ last_smple_idx ][ Winner_ind ], 10 );
-            xq[ i - decisionDelay ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND(
+            pulses[  i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDelDec->Q_Q10[ last_smple_idx ][ Winner_ind ], 10 );
+            xq[ i - decisionDelay ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND(
                 silk_SMULWW( psDelDec->Xq_Q14[ last_smple_idx ][ Winner_ind ], delayedGain_Q10[ last_smple_idx ] ), 8 ) );
             NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay ] = psDelDec->Shape_Q14[ last_smple_idx ][ Winner_ind ];
             sLTP_Q15[          NSQ->sLTP_buf_idx     - decisionDelay ] = psDelDec->Pred_Q15[  last_smple_idx ][ Winner_ind ];
@@ -917,15 +917,15 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_neon(
         delayedGain_Q10[ *smpl_buf_idx ] = Gain_Q10;
     }
     /* Update LPC states */
-    silk_memcpy( psDelDec->sLPC_Q14[ 0 ], psDelDec->sLPC_Q14[ length ], NEON_MAX_DEL_DEC_STATES * NSQ_LPC_BUF_LENGTH * sizeof( opus_int32 ) );
+    silk_memcpy( psDelDec->sLPC_Q14[ 0 ], psDelDec->sLPC_Q14[ length ], NEON_MAX_DEL_DEC_STATES * NSQ_LPC_BUF_LENGTH * sizeof( oac_int32 ) );
 
     RESTORE_STACK;
 }
 
-static OPUS_INLINE void silk_SMULWB_8_neon(
-    const opus_int16 *a,
+static OAC_INLINE void silk_SMULWB_8_neon(
+    const oac_int16 *a,
     const int32x2_t  b,
-    opus_int32       *o
+    oac_int32       *o
 )
 {
     const int16x8_t a_s16x8 = vld1q_s16( a );
@@ -940,8 +940,8 @@ static OPUS_INLINE void silk_SMULWB_8_neon(
 }
 
 /* Only works when ( b >= -65536 ) && ( b < 65536 ). */
-static OPUS_INLINE void silk_SMULWW_small_b_4_neon(
-    opus_int32       *a,
+static OAC_INLINE void silk_SMULWW_small_b_4_neon(
+    oac_int32       *a,
     const int32x2_t  b_s32x2)
 {
     int32x4_t o_s32x4;
@@ -952,8 +952,8 @@ static OPUS_INLINE void silk_SMULWW_small_b_4_neon(
 }
 
 /* Only works when ( b >= -65536 ) && ( b < 65536 ). */
-static OPUS_INLINE void silk_SMULWW_small_b_8_neon(
-    opus_int32       *a,
+static OAC_INLINE void silk_SMULWW_small_b_8_neon(
+    oac_int32       *a,
     const int32x2_t  b_s32x2
 )
 {
@@ -967,8 +967,8 @@ static OPUS_INLINE void silk_SMULWW_small_b_8_neon(
     vst1q_s32( a + 4, o1_s32x4 );
 }
 
-static OPUS_INLINE void silk_SMULWW_4_neon(
-    opus_int32       *a,
+static OAC_INLINE void silk_SMULWW_4_neon(
+    oac_int32       *a,
     const int32x2_t  b_s32x2)
 {
     int32x4_t a_s32x4, o_s32x4;
@@ -979,8 +979,8 @@ static OPUS_INLINE void silk_SMULWW_4_neon(
     vst1q_s32( a, o_s32x4 );
 }
 
-static OPUS_INLINE void silk_SMULWW_8_neon(
-    opus_int32       *a,
+static OAC_INLINE void silk_SMULWW_8_neon(
+    oac_int32       *a,
     const int32x2_t  b_s32x2
 )
 {
@@ -996,14 +996,14 @@ static OPUS_INLINE void silk_SMULWW_8_neon(
     vst1q_s32( a + 4, o1_s32x4 );
 }
 
-static OPUS_INLINE void silk_SMULWW_loop_neon(
-    const opus_int16 *a,
-    const opus_int32 b,
-    opus_int32       *o,
-    const opus_int   loop_num
+static OAC_INLINE void silk_SMULWW_loop_neon(
+    const oac_int16 *a,
+    const oac_int32 b,
+    oac_int32       *o,
+    const oac_int   loop_num
 )
 {
-    opus_int i;
+    oac_int i;
     int32x2_t b_s32x2;
 
     b_s32x2 = vdup_n_s32( b );
@@ -1015,24 +1015,24 @@ static OPUS_INLINE void silk_SMULWW_loop_neon(
     }
 }
 
-static OPUS_INLINE void silk_nsq_del_dec_scale_states_neon(
+static OAC_INLINE void silk_nsq_del_dec_scale_states_neon(
     const silk_encoder_state *psEncC,               /* I    Encoder State                       */
     silk_nsq_state      *NSQ,                       /* I/O  NSQ state                           */
     NSQ_del_decs_struct psDelDec[],                 /* I/O  Delayed decision states             */
-    const opus_int16    x16[],                      /* I    Input                               */
-    opus_int32          x_sc_Q10[],                 /* O    Input scaled with 1/Gain in Q10     */
-    const opus_int16    sLTP[],                     /* I    Re-whitened LTP state in Q0         */
-    opus_int32          sLTP_Q15[],                 /* O    LTP state matching scaled input     */
-    opus_int            subfr,                      /* I    Subframe number                     */
-    const opus_int      LTP_scale_Q14,              /* I    LTP state scaling                   */
-    const opus_int32    Gains_Q16[ MAX_NB_SUBFR ],  /* I                                        */
-    const opus_int      pitchL[ MAX_NB_SUBFR ],     /* I    Pitch lag                           */
-    const opus_int      signal_type,                /* I    Signal type                         */
-    const opus_int      decisionDelay               /* I    Decision delay                      */
+    const oac_int16    x16[],                      /* I    Input                               */
+    oac_int32          x_sc_Q10[],                 /* O    Input scaled with 1/Gain in Q10     */
+    const oac_int16    sLTP[],                     /* I    Re-whitened LTP state in Q0         */
+    oac_int32          sLTP_Q15[],                 /* O    LTP state matching scaled input     */
+    oac_int            subfr,                      /* I    Subframe number                     */
+    const oac_int      LTP_scale_Q14,              /* I    LTP state scaling                   */
+    const oac_int32    Gains_Q16[ MAX_NB_SUBFR ],  /* I                                        */
+    const oac_int      pitchL[ MAX_NB_SUBFR ],     /* I    Pitch lag                           */
+    const oac_int      signal_type,                /* I    Signal type                         */
+    const oac_int      decisionDelay               /* I    Decision delay                      */
 )
 {
-    opus_int            i, lag;
-    opus_int32          gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
+    oac_int            i, lag;
+    oac_int32          gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
 
     lag          = pitchL[ subfr ];
     inv_gain_Q31 = silk_INVERSE32_varQ( silk_max( Gains_Q16[ subfr ], 1 ), 47 );
diff --git a/silk/arm/NSQ_neon.c b/silk/arm/NSQ_neon.c
index 964252997..b1d2a8336 100644
--- a/silk/arm/NSQ_neon.c
+++ b/silk/arm/NSQ_neon.c
@@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "celt/cpu_support.h"
 #include "celt/arm/armcpu.h"
 
-opus_int32 silk_noise_shape_quantizer_short_prediction_neon(const opus_int32 *buf32, const opus_int32 *coef32, opus_int order)
+oac_int32 silk_noise_shape_quantizer_short_prediction_neon(const oac_int32 *buf32, const oac_int32 *coef32, oac_int order)
 {
     int32x4_t coef0 = vld1q_s32(coef32);
     int32x4_t coef1 = vld1q_s32(coef32 + 4);
@@ -61,7 +61,7 @@ opus_int32 silk_noise_shape_quantizer_short_prediction_neon(const opus_int32 *bu
 
     int64x1_t f = vadd_s64(vget_low_s64(e), vget_high_s64(e));
 
-    opus_int32 out = vget_lane_s32(vreinterpret_s32_s64(f), 0);
+    oac_int32 out = vget_lane_s32(vreinterpret_s32_s64(f), 0);
 
     out += silk_RSHIFT( order, 1 );
 
@@ -69,9 +69,9 @@ opus_int32 silk_noise_shape_quantizer_short_prediction_neon(const opus_int32 *bu
 }
 
 
-opus_int32 silk_NSQ_noise_shape_feedback_loop_neon(const opus_int32 *data0, opus_int32 *data1, const opus_int16 *coef, opus_int order)
+oac_int32 silk_NSQ_noise_shape_feedback_loop_neon(const oac_int32 *data0, oac_int32 *data1, const oac_int16 *coef, oac_int order)
 {
-    opus_int32 out;
+    oac_int32 out;
     if (order == 8)
     {
         int32x4_t a00 = vdupq_n_s32(data0[0]);
diff --git a/silk/arm/NSQ_neon.h b/silk/arm/NSQ_neon.h
index f03d8ddd9..e586e00d1 100644
--- a/silk/arm/NSQ_neon.h
+++ b/silk/arm/NSQ_neon.h
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #undef silk_short_prediction_create_arch_coef
 /* For vectorized calc, reverse a_Q12 coefs, convert to 32-bit, and shift for vqdmulhq_s32. */
-static OPUS_INLINE void silk_short_prediction_create_arch_coef_neon(opus_int32 *out, const opus_int16 *in, opus_int order)
+static OAC_INLINE void silk_short_prediction_create_arch_coef_neon(oac_int32 *out, const oac_int16 *in, oac_int order)
 {
     out[15] = silk_LSHIFT32(in[0], 15);
     out[14] = silk_LSHIFT32(in[1], 15);
@@ -65,23 +65,23 @@ static OPUS_INLINE void silk_short_prediction_create_arch_coef_neon(opus_int32 *
     }
 }
 
-#if defined(OPUS_ARM_PRESUME_NEON_INTR)
+#if defined(OAC_ARM_PRESUME_NEON_INTR)
 
 #define silk_short_prediction_create_arch_coef(out, in, order) \
     (silk_short_prediction_create_arch_coef_neon(out, in, order))
 
-#elif defined(OPUS_HAVE_RTCD) && defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+#elif defined(OAC_HAVE_RTCD) && defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 
 #define silk_short_prediction_create_arch_coef(out, in, order) \
-    do { if (arch >= OPUS_ARCH_ARM_NEON) { silk_short_prediction_create_arch_coef_neon(out, in, order); } } while (0)
+    do { if (arch >= OAC_ARCH_ARM_NEON) { silk_short_prediction_create_arch_coef_neon(out, in, order); } } while (0)
 
 #endif
 
-opus_int32 silk_noise_shape_quantizer_short_prediction_neon(const opus_int32 *buf32, const opus_int32 *coef32, opus_int order);
+oac_int32 silk_noise_shape_quantizer_short_prediction_neon(const oac_int32 *buf32, const oac_int32 *coef32, oac_int order);
 
-opus_int32 silk_NSQ_noise_shape_feedback_loop_neon(const opus_int32 *data0, opus_int32 *data1, const opus_int16 *coef, opus_int order);
+oac_int32 silk_NSQ_noise_shape_feedback_loop_neon(const oac_int32 *data0, oac_int32 *data1, const oac_int16 *coef, oac_int order);
 
-#if defined(OPUS_ARM_PRESUME_NEON_INTR)
+#if defined(OAC_ARM_PRESUME_NEON_INTR)
 #undef silk_noise_shape_quantizer_short_prediction
 #define silk_noise_shape_quantizer_short_prediction(in, coef, coefRev, order, arch) \
     ((void)arch,silk_noise_shape_quantizer_short_prediction_neon(in, coefRev, order))
@@ -89,24 +89,24 @@ opus_int32 silk_NSQ_noise_shape_feedback_loop_neon(const opus_int32 *data0, opus
 #undef silk_NSQ_noise_shape_feedback_loop
 #define silk_NSQ_noise_shape_feedback_loop(data0, data1, coef, order, arch)  ((void)arch,silk_NSQ_noise_shape_feedback_loop_neon(data0, data1, coef, order))
 
-#elif defined(OPUS_HAVE_RTCD) && defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+#elif defined(OAC_HAVE_RTCD) && defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 
 /* silk_noise_shape_quantizer_short_prediction implementations take different parameters based on arch
    (coef vs. coefRev) so can't use the usual IMPL table implementation */
 #undef silk_noise_shape_quantizer_short_prediction
 #define silk_noise_shape_quantizer_short_prediction(in, coef, coefRev, order, arch)  \
-    (arch >= OPUS_ARCH_ARM_NEON ? \
+    (arch >= OAC_ARCH_ARM_NEON ? \
         silk_noise_shape_quantizer_short_prediction_neon(in, coefRev, order) : \
         silk_noise_shape_quantizer_short_prediction_c(in, coef, order))
 
-extern opus_int32
- (*const SILK_NSQ_NOISE_SHAPE_FEEDBACK_LOOP_IMPL[OPUS_ARCHMASK+1])(
- const opus_int32 *data0, opus_int32 *data1, const opus_int16 *coef,
- opus_int order);
+extern oac_int32
+ (*const SILK_NSQ_NOISE_SHAPE_FEEDBACK_LOOP_IMPL[OAC_ARCHMASK+1])(
+ const oac_int32 *data0, oac_int32 *data1, const oac_int16 *coef,
+ oac_int order);
 
 #undef silk_NSQ_noise_shape_feedback_loop
 #define silk_NSQ_noise_shape_feedback_loop(data0, data1, coef, order, arch) \
- (SILK_NSQ_NOISE_SHAPE_FEEDBACK_LOOP_IMPL[(arch)&OPUS_ARCHMASK](data0, data1, \
+ (SILK_NSQ_NOISE_SHAPE_FEEDBACK_LOOP_IMPL[(arch)&OAC_ARCHMASK](data0, data1, \
  coef, order))
 
 #endif
diff --git a/silk/arm/SigProc_FIX_armv4.h b/silk/arm/SigProc_FIX_armv4.h
index ff62b1e5d..e9ad69b7d 100644
--- a/silk/arm/SigProc_FIX_armv4.h
+++ b/silk/arm/SigProc_FIX_armv4.h
@@ -30,10 +30,10 @@ POSSIBILITY OF SUCH DAMAGE.
 #define SILK_SIGPROC_FIX_ARMv4_H
 
 #undef silk_MLA
-static OPUS_INLINE opus_int32 silk_MLA_armv4(opus_int32 a, opus_int32 b,
- opus_int32 c)
+static OAC_INLINE oac_int32 silk_MLA_armv4(oac_int32 a, oac_int32 b,
+ oac_int32 c)
 {
-  opus_int32 res;
+  oac_int32 res;
   __asm__(
       "#silk_MLA\n\t"
       "mla %0, %1, %2, %3\n\t"
diff --git a/silk/arm/SigProc_FIX_armv5e.h b/silk/arm/SigProc_FIX_armv5e.h
index 617a09cab..3bc208c30 100644
--- a/silk/arm/SigProc_FIX_armv5e.h
+++ b/silk/arm/SigProc_FIX_armv5e.h
@@ -30,9 +30,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #define SILK_SIGPROC_FIX_ARMv5E_H
 
 #undef silk_SMULTT
-static OPUS_INLINE opus_int32 silk_SMULTT_armv5e(opus_int32 a, opus_int32 b)
+static OAC_INLINE oac_int32 silk_SMULTT_armv5e(oac_int32 a, oac_int32 b)
 {
-  opus_int32 res;
+  oac_int32 res;
   __asm__(
       "#silk_SMULTT\n\t"
       "smultt %0, %1, %2\n\t"
@@ -44,10 +44,10 @@ static OPUS_INLINE opus_int32 silk_SMULTT_armv5e(opus_int32 a, opus_int32 b)
 #define silk_SMULTT(a, b) (silk_SMULTT_armv5e(a, b))
 
 #undef silk_SMLATT
-static OPUS_INLINE opus_int32 silk_SMLATT_armv5e(opus_int32 a, opus_int32 b,
- opus_int32 c)
+static OAC_INLINE oac_int32 silk_SMLATT_armv5e(oac_int32 a, oac_int32 b,
+ oac_int32 c)
 {
-  opus_int32 res;
+  oac_int32 res;
   __asm__(
       "#silk_SMLATT\n\t"
       "smlatt %0, %1, %2, %3\n\t"
diff --git a/silk/arm/arm_silk_map.c b/silk/arm/arm_silk_map.c
index a91f79b59..b0c6599e7 100644
--- a/silk/arm/arm_silk_map.c
+++ b/silk/arm/arm_silk_map.c
@@ -32,18 +32,18 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "NSQ.h"
 #include "SigProc_FIX.h"
 
-#if defined(OPUS_HAVE_RTCD)
+#if defined(OAC_HAVE_RTCD)
 
-# if (defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && \
- !defined(OPUS_ARM_PRESUME_NEON_INTR))
+# if (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && \
+ !defined(OAC_ARM_PRESUME_NEON_INTR))
 
-void (*const SILK_BIQUAD_ALT_STRIDE2_IMPL[OPUS_ARCHMASK + 1])(
-        const opus_int16            *in,                /* I     input signal                                               */
-        const opus_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
-        const opus_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
-        opus_int32                  *S,                 /* I/O   State vector [4]                                           */
-        opus_int16                  *out,               /* O     output signal                                              */
-        const opus_int32            len                 /* I     signal length (must be even)                               */
+void (*const SILK_BIQUAD_ALT_STRIDE2_IMPL[OAC_ARCHMASK + 1])(
+        const oac_int16            *in,                /* I     input signal                                               */
+        const oac_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
+        const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
+        oac_int32                  *S,                 /* I/O   State vector [4]                                           */
+        oac_int16                  *out,               /* O     output signal                                              */
+        const oac_int32            len                 /* I     signal length (must be even)                               */
 ) = {
       silk_biquad_alt_stride2_c,    /* ARMv4 */
       silk_biquad_alt_stride2_c,    /* EDSP */
@@ -52,9 +52,9 @@ void (*const SILK_BIQUAD_ALT_STRIDE2_IMPL[OPUS_ARCHMASK + 1])(
       silk_biquad_alt_stride2_neon, /* dotprod */
 };
 
-opus_int32 (*const SILK_LPC_INVERSE_PRED_GAIN_IMPL[OPUS_ARCHMASK + 1])( /* O   Returns inverse prediction gain in energy domain, Q30        */
-        const opus_int16            *A_Q12,                             /* I   Prediction coefficients, Q12 [order]                         */
-        const opus_int              order                               /* I   Prediction order                                             */
+oac_int32 (*const SILK_LPC_INVERSE_PRED_GAIN_IMPL[OAC_ARCHMASK + 1])( /* O   Returns inverse prediction gain in energy domain, Q30        */
+        const oac_int16            *A_Q12,                             /* I   Prediction coefficients, Q12 [order]                         */
+        const oac_int              order                               /* I   Prediction order                                             */
 ) = {
       silk_LPC_inverse_pred_gain_c,    /* ARMv4 */
       silk_LPC_inverse_pred_gain_c,    /* EDSP */
@@ -63,22 +63,22 @@ opus_int32 (*const SILK_LPC_INVERSE_PRED_GAIN_IMPL[OPUS_ARCHMASK + 1])( /* O   R
       silk_LPC_inverse_pred_gain_neon, /* dotprod */
 };
 
-void  (*const SILK_NSQ_DEL_DEC_IMPL[OPUS_ARCHMASK + 1])(
+void  (*const SILK_NSQ_DEL_DEC_IMPL[OAC_ARCHMASK + 1])(
         const silk_encoder_state    *psEncC,                                    /* I    Encoder State                   */
         silk_nsq_state              *NSQ,                                       /* I/O  NSQ state                       */
         SideInfoIndices             *psIndices,                                 /* I/O  Quantization Indices            */
-        const opus_int16            x16[],                                      /* I    Input                           */
-        opus_int8                   pulses[],                                   /* O    Quantized pulse signal          */
-        const opus_int16            *PredCoef_Q12,                              /* I    Short term prediction coefs     */
-        const opus_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],    /* I    Long term prediction coefs      */
-        const opus_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs              */
-        const opus_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],          /* I    Long term shaping coefs         */
-        const opus_int              Tilt_Q14[ MAX_NB_SUBFR ],                   /* I    Spectral tilt                   */
-        const opus_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                 /* I    Low frequency shaping coefs     */
-        const opus_int32            Gains_Q16[ MAX_NB_SUBFR ],                  /* I    Quantization step sizes         */
-        const opus_int              pitchL[ MAX_NB_SUBFR ],                     /* I    Pitch lags                      */
-        const opus_int              Lambda_Q10,                                 /* I    Rate/distortion tradeoff        */
-        const opus_int              LTP_scale_Q14                               /* I    LTP state scaling               */
+        const oac_int16            x16[],                                      /* I    Input                           */
+        oac_int8                   pulses[],                                   /* O    Quantized pulse signal          */
+        const oac_int16            *PredCoef_Q12,                              /* I    Short term prediction coefs     */
+        const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],    /* I    Long term prediction coefs      */
+        const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs              */
+        const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],          /* I    Long term shaping coefs         */
+        const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                   /* I    Spectral tilt                   */
+        const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                 /* I    Low frequency shaping coefs     */
+        const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                  /* I    Quantization step sizes         */
+        const oac_int              pitchL[ MAX_NB_SUBFR ],                     /* I    Pitch lags                      */
+        const oac_int              Lambda_Q10,                                 /* I    Rate/distortion tradeoff        */
+        const oac_int              LTP_scale_Q14                               /* I    LTP state scaling               */
 ) = {
       silk_NSQ_del_dec_c,    /* ARMv4 */
       silk_NSQ_del_dec_c,    /* EDSP */
@@ -92,10 +92,10 @@ void  (*const SILK_NSQ_DEL_DEC_IMPL[OPUS_ARCHMASK + 1])(
   Instead RTCD is done via if statements at the call sites.
   See NSQ_neon.h for details.*/
 
-opus_int32
- (*const SILK_NSQ_NOISE_SHAPE_FEEDBACK_LOOP_IMPL[OPUS_ARCHMASK+1])(
- const opus_int32 *data0, opus_int32 *data1, const opus_int16 *coef,
- opus_int order) = {
+oac_int32
+ (*const SILK_NSQ_NOISE_SHAPE_FEEDBACK_LOOP_IMPL[OAC_ARCHMASK+1])(
+ const oac_int32 *data0, oac_int32 *data1, const oac_int16 *coef,
+ oac_int order) = {
   silk_NSQ_noise_shape_feedback_loop_c,    /* ARMv4 */
   silk_NSQ_noise_shape_feedback_loop_c,    /* EDSP */
   silk_NSQ_noise_shape_feedback_loop_c,    /* Media */
@@ -106,15 +106,15 @@ opus_int32
 # endif
 
 # if defined(FIXED_POINT) && \
- defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && !defined(OPUS_ARM_PRESUME_NEON_INTR)
+ defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR)
 
-void (*const SILK_WARPED_AUTOCORRELATION_FIX_IMPL[OPUS_ARCHMASK + 1])(
-          opus_int32                *corr,                                  /* O    Result [order + 1]                                                          */
-          opus_int                  *scale,                                 /* O    Scaling of the correlation vector                                           */
-    const opus_int16                *input,                                 /* I    Input data to correlate                                                     */
-    const opus_int                  warping_Q16,                            /* I    Warping coefficient                                                         */
-    const opus_int                  length,                                 /* I    Length of input                                                             */
-    const opus_int                  order                                   /* I    Correlation order (even)                                                    */
+void (*const SILK_WARPED_AUTOCORRELATION_FIX_IMPL[OAC_ARCHMASK + 1])(
+          oac_int32                *corr,                                  /* O    Result [order + 1]                                                          */
+          oac_int                  *scale,                                 /* O    Scaling of the correlation vector                                           */
+    const oac_int16                *input,                                 /* I    Input data to correlate                                                     */
+    const oac_int                  warping_Q16,                            /* I    Warping coefficient                                                         */
+    const oac_int                  length,                                 /* I    Length of input                                                             */
+    const oac_int                  order                                   /* I    Correlation order (even)                                                    */
 ) = {
       silk_warped_autocorrelation_FIX_c,    /* ARMv4 */
       silk_warped_autocorrelation_FIX_c,    /* EDSP */
@@ -125,4 +125,4 @@ void (*const SILK_WARPED_AUTOCORRELATION_FIX_IMPL[OPUS_ARCHMASK + 1])(
 
 # endif
 
-#endif /* OPUS_HAVE_RTCD */
+#endif /* OAC_HAVE_RTCD */
diff --git a/silk/arm/biquad_alt_arm.h b/silk/arm/biquad_alt_arm.h
index 66ea9f43d..63bd97ea6 100644
--- a/silk/arm/biquad_alt_arm.h
+++ b/silk/arm/biquad_alt_arm.h
@@ -30,17 +30,17 @@ POSSIBILITY OF SUCH DAMAGE.
 
 # include "celt/arm/armcpu.h"
 
-# if defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+# if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 void silk_biquad_alt_stride2_neon(
-    const opus_int16            *in,                /* I     input signal                                               */
-    const opus_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
-    const opus_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
-    opus_int32                  *S,                 /* I/O   State vector [4]                                           */
-    opus_int16                  *out,               /* O     output signal                                              */
-    const opus_int32            len                 /* I     signal length (must be even)                               */
+    const oac_int16            *in,                /* I     input signal                                               */
+    const oac_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
+    const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
+    oac_int32                  *S,                 /* I/O   State vector [4]                                           */
+    oac_int16                  *out,               /* O     output signal                                              */
+    const oac_int32            len                 /* I     signal length (must be even)                               */
 );
 
-#  if !defined(OPUS_HAVE_RTCD) && defined(OPUS_ARM_PRESUME_NEON)
+#  if !defined(OAC_HAVE_RTCD) && defined(OAC_ARM_PRESUME_NEON)
 #   define OVERRIDE_silk_biquad_alt_stride2                   (1)
 #   define silk_biquad_alt_stride2(in, B_Q28, A_Q28, S, out, len, arch) ((void)(arch), PRESUME_NEON(silk_biquad_alt_stride2)(in, B_Q28, A_Q28, S, out, len))
 #  endif
@@ -48,18 +48,18 @@ void silk_biquad_alt_stride2_neon(
 
 # if !defined(OVERRIDE_silk_biquad_alt_stride2)
 /*Is run-time CPU detection enabled on this platform?*/
-#  if defined(OPUS_HAVE_RTCD) && (defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && !defined(OPUS_ARM_PRESUME_NEON_INTR))
-extern void (*const SILK_BIQUAD_ALT_STRIDE2_IMPL[OPUS_ARCHMASK+1])(
-        const opus_int16            *in,                /* I     input signal                                               */
-        const opus_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
-        const opus_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
-        opus_int32                  *S,                 /* I/O   State vector [4]                                           */
-        opus_int16                  *out,               /* O     output signal                                              */
-        const opus_int32            len                 /* I     signal length (must be even)                               */
+#  if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
+extern void (*const SILK_BIQUAD_ALT_STRIDE2_IMPL[OAC_ARCHMASK+1])(
+        const oac_int16            *in,                /* I     input signal                                               */
+        const oac_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
+        const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
+        oac_int32                  *S,                 /* I/O   State vector [4]                                           */
+        oac_int16                  *out,               /* O     output signal                                              */
+        const oac_int32            len                 /* I     signal length (must be even)                               */
     );
 #   define OVERRIDE_silk_biquad_alt_stride2                  (1)
-#   define silk_biquad_alt_stride2(in, B_Q28, A_Q28, S, out, len, arch) ((*SILK_BIQUAD_ALT_STRIDE2_IMPL[(arch)&OPUS_ARCHMASK])(in, B_Q28, A_Q28, S, out, len))
-#  elif defined(OPUS_ARM_PRESUME_NEON_INTR)
+#   define silk_biquad_alt_stride2(in, B_Q28, A_Q28, S, out, len, arch) ((*SILK_BIQUAD_ALT_STRIDE2_IMPL[(arch)&OAC_ARCHMASK])(in, B_Q28, A_Q28, S, out, len))
+#  elif defined(OAC_ARM_PRESUME_NEON_INTR)
 #   define OVERRIDE_silk_biquad_alt_stride2                  (1)
 #   define silk_biquad_alt_stride2(in, B_Q28, A_Q28, S, out, len, arch) ((void)(arch), silk_biquad_alt_stride2_neon(in, B_Q28, A_Q28, S, out, len))
 #  endif
diff --git a/silk/arm/biquad_alt_neon_intr.c b/silk/arm/biquad_alt_neon_intr.c
index 971573318..8f5951550 100644
--- a/silk/arm/biquad_alt_neon_intr.c
+++ b/silk/arm/biquad_alt_neon_intr.c
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #include <arm_neon.h>
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
 # include <string.h>
 # include "stack_alloc.h"
 #endif
@@ -53,16 +53,16 @@ static inline void silk_biquad_alt_stride2_kernel( const int32x4_t A_L_s32x4, co
 }
 
 void silk_biquad_alt_stride2_neon(
-    const opus_int16            *in,                /* I     input signal                                               */
-    const opus_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
-    const opus_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
-    opus_int32                  *S,                 /* I/O   State vector [4]                                           */
-    opus_int16                  *out,               /* O     output signal                                              */
-    const opus_int32            len                 /* I     signal length (must be even)                               */
+    const oac_int16            *in,                /* I     input signal                                               */
+    const oac_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
+    const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
+    oac_int32                  *S,                 /* I/O   State vector [4]                                           */
+    oac_int16                  *out,               /* O     output signal                                              */
+    const oac_int32            len                 /* I     signal length (must be even)                               */
 )
 {
     /* DIRECT FORM II TRANSPOSED (uses 2 element state vector) */
-    opus_int        k            = 0;
+    oac_int        k            = 0;
     const int32x2_t offset_s32x2 = vdup_n_s32( (1<<14) - 1 );
     const int32x4_t offset_s32x4 = vcombine_s32( offset_s32x2, offset_s32x2 );
     int16x4_t       in_s16x4  = vdup_n_s16( 0 );
@@ -71,11 +71,11 @@ void silk_biquad_alt_stride2_neon(
     int32x4_t       A_L_s32x4, A_U_s32x4, B_Q28_s32x4, S_s32x4, out32_Q14_s32x4;
     int32x2x2_t     t0_s32x2x2, t1_s32x2x2, t2_s32x2x2, S_s32x2x2;
 
-#ifdef OPUS_CHECK_ASM
-    opus_int32 S_c[ 4 ];
-    VARDECL( opus_int16, out_c );
+#ifdef OAC_CHECK_ASM
+    oac_int32 S_c[ 4 ];
+    VARDECL( oac_int16, out_c );
     SAVE_STACK;
-    ALLOC( out_c, 2 * len, opus_int16 );
+    ALLOC( out_c, 2 * len, oac_int16 );
 
     silk_memcpy( &S_c, S, sizeof( S_c ) );
     silk_biquad_alt_stride2_c( in, B_Q28, A_Q28, S_c, out_c, len );
@@ -118,8 +118,8 @@ void silk_biquad_alt_stride2_neon(
         /* Scale back to Q0 and saturate */
         out32_Q14_s32x4 = vcombine_s32( out32_Q14_s32x2[ 0 ], out32_Q14_s32x2[ 1 ] );                   /* out32_Q14_{0,1,2,3}                                                                                        */
         out32_Q14_s32x4 = vaddq_s32( out32_Q14_s32x4, offset_s32x4 );                                   /* out32_Q14_{0,1,2,3} + (1<<14) - 1                                                                          */
-        out_s16x4       = vqshrn_n_s32( out32_Q14_s32x4, 14 );                                          /* (opus_int16)silk_SAT16( silk_RSHIFT( out32_Q14_{0,1,2,3} + (1<<14) - 1, 14 ) )                             */
-        vst1_s16( &out[ 2 * k ], out_s16x4 );                                                           /* out[ 2 * k + {0,1,2,3} ] = (opus_int16)silk_SAT16( silk_RSHIFT( out32_Q14_{0,1,2,3} + (1<<14) - 1, 14 ) ); */
+        out_s16x4       = vqshrn_n_s32( out32_Q14_s32x4, 14 );                                          /* (oac_int16)silk_SAT16( silk_RSHIFT( out32_Q14_{0,1,2,3} + (1<<14) - 1, 14 ) )                             */
+        vst1_s16( &out[ 2 * k ], out_s16x4 );                                                           /* out[ 2 * k + {0,1,2,3} ] = (oac_int16)silk_SAT16( silk_RSHIFT( out32_Q14_{0,1,2,3} + (1<<14) - 1, 14 ) ); */
     }
 
     /* Process leftover. */
@@ -138,9 +138,9 @@ void silk_biquad_alt_stride2_neon(
         /* Scale back to Q0 and saturate */
         out32_Q14_s32x2 = vadd_s32( out32_Q14_s32x2, offset_s32x2 );                                    /* out32_Q14_{0,1} + (1<<14) - 1                                                              */
         out32_Q14_s32x4 = vcombine_s32( out32_Q14_s32x2, out32_Q14_s32x2 );                             /* out32_Q14_{0,1,0,1} + (1<<14) - 1                                                          */
-        out_s16x4       = vqshrn_n_s32( out32_Q14_s32x4, 14 );                                          /* (opus_int16)silk_SAT16( silk_RSHIFT( out32_Q14_{0,1,0,1} + (1<<14) - 1, 14 ) )             */
-        vst1_lane_s16( &out[ 2 * k + 0 ], out_s16x4, 0 );                                               /* out[ 2 * k + 0 ] = (opus_int16)silk_SAT16( silk_RSHIFT( out32_Q14_0 + (1<<14) - 1, 14 ) ); */
-        vst1_lane_s16( &out[ 2 * k + 1 ], out_s16x4, 1 );                                               /* out[ 2 * k + 1 ] = (opus_int16)silk_SAT16( silk_RSHIFT( out32_Q14_1 + (1<<14) - 1, 14 ) ); */
+        out_s16x4       = vqshrn_n_s32( out32_Q14_s32x4, 14 );                                          /* (oac_int16)silk_SAT16( silk_RSHIFT( out32_Q14_{0,1,0,1} + (1<<14) - 1, 14 ) )             */
+        vst1_lane_s16( &out[ 2 * k + 0 ], out_s16x4, 0 );                                               /* out[ 2 * k + 0 ] = (oac_int16)silk_SAT16( silk_RSHIFT( out32_Q14_0 + (1<<14) - 1, 14 ) ); */
+        vst1_lane_s16( &out[ 2 * k + 1 ], out_s16x4, 1 );                                               /* out[ 2 * k + 1 ] = (oac_int16)silk_SAT16( silk_RSHIFT( out32_Q14_1 + (1<<14) - 1, 14 ) ); */
     }
 
     vst1q_lane_s32( &S[ 0 ], S_s32x4, 0 );                                                              /* S[ 0 ] = S0; */
@@ -148,9 +148,9 @@ void silk_biquad_alt_stride2_neon(
     vst1q_lane_s32( &S[ 2 ], S_s32x4, 1 );                                                              /* S[ 2 ] = S1; */
     vst1q_lane_s32( &S[ 3 ], S_s32x4, 3 );                                                              /* S[ 3 ] = S3; */
 
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     silk_assert( !memcmp( S_c, S, sizeof( S_c ) ) );
-    silk_assert( !memcmp( out_c, out, 2 * len * sizeof( opus_int16 ) ) );
+    silk_assert( !memcmp( out_c, out, 2 * len * sizeof( oac_int16 ) ) );
     RESTORE_STACK;
 #endif
 }
diff --git a/silk/arm/macros_armv4.h b/silk/arm/macros_armv4.h
index 877eb18dd..04ec98ade 100644
--- a/silk/arm/macros_armv4.h
+++ b/silk/arm/macros_armv4.h
@@ -31,11 +31,11 @@ POSSIBILITY OF SUCH DAMAGE.
 /* This macro only avoids the undefined behaviour from a left shift of
    a negative value. It should only be used in macros that can't include
    SigProc_FIX.h. In other cases, use silk_LSHIFT32(). */
-#define SAFE_SHL(a,b) ((opus_int32)((opus_uint32)(a) << (b)))
+#define SAFE_SHL(a,b) ((oac_int32)((oac_uint32)(a) << (b)))
 
-/* (a32 * (opus_int32)((opus_int16)(b32))) >> 16 output have to be 32bit int */
+/* (a32 * (oac_int32)((oac_int16)(b32))) >> 16 output have to be 32bit int */
 #undef silk_SMULWB
-static OPUS_INLINE opus_int32 silk_SMULWB_armv4(opus_int32 a, opus_int16 b)
+static OAC_INLINE oac_int32 silk_SMULWB_armv4(oac_int32 a, oac_int16 b)
 {
   unsigned rd_lo;
   int rd_hi;
@@ -49,13 +49,13 @@ static OPUS_INLINE opus_int32 silk_SMULWB_armv4(opus_int32 a, opus_int16 b)
 }
 #define silk_SMULWB(a, b) (silk_SMULWB_armv4(a, b))
 
-/* a32 + (b32 * (opus_int32)((opus_int16)(c32))) >> 16 output have to be 32bit int */
+/* a32 + (b32 * (oac_int32)((oac_int16)(c32))) >> 16 output have to be 32bit int */
 #undef silk_SMLAWB
 #define silk_SMLAWB(a, b, c) ((a) + silk_SMULWB(b, c))
 
 /* (a32 * (b32 >> 16)) >> 16 */
 #undef silk_SMULWT
-static OPUS_INLINE opus_int32 silk_SMULWT_armv4(opus_int32 a, opus_int32 b)
+static OAC_INLINE oac_int32 silk_SMULWT_armv4(oac_int32 a, oac_int32 b)
 {
   unsigned rd_lo;
   int rd_hi;
@@ -75,7 +75,7 @@ static OPUS_INLINE opus_int32 silk_SMULWT_armv4(opus_int32 a, opus_int32 b)
 
 /* (a32 * b32) >> 16 */
 #undef silk_SMULWW
-static OPUS_INLINE opus_int32 silk_SMULWW_armv4(opus_int32 a, opus_int32 b)
+static OAC_INLINE oac_int32 silk_SMULWW_armv4(oac_int32 a, oac_int32 b)
 {
   unsigned rd_lo;
   int rd_hi;
@@ -90,8 +90,8 @@ static OPUS_INLINE opus_int32 silk_SMULWW_armv4(opus_int32 a, opus_int32 b)
 #define silk_SMULWW(a, b) (silk_SMULWW_armv4(a, b))
 
 #undef silk_SMLAWW
-static OPUS_INLINE opus_int32 silk_SMLAWW_armv4(opus_int32 a, opus_int32 b,
- opus_int32 c)
+static OAC_INLINE oac_int32 silk_SMLAWW_armv4(oac_int32 a, oac_int32 b,
+ oac_int32 c)
 {
   unsigned rd_lo;
   int rd_hi;
diff --git a/silk/arm/macros_armv5e.h b/silk/arm/macros_armv5e.h
index b14ec65dd..bfaea7e42 100644
--- a/silk/arm/macros_armv5e.h
+++ b/silk/arm/macros_armv5e.h
@@ -32,11 +32,11 @@ POSSIBILITY OF SUCH DAMAGE.
 /* This macro only avoids the undefined behaviour from a left shift of
    a negative value. It should only be used in macros that can't include
    SigProc_FIX.h. In other cases, use silk_LSHIFT32(). */
-#define SAFE_SHL(a,b) ((opus_int32)((opus_uint32)(a) << (b)))
+#define SAFE_SHL(a,b) ((oac_int32)((oac_uint32)(a) << (b)))
 
-/* (a32 * (opus_int32)((opus_int16)(b32))) >> 16 output have to be 32bit int */
+/* (a32 * (oac_int32)((oac_int16)(b32))) >> 16 output have to be 32bit int */
 #undef silk_SMULWB
-static OPUS_INLINE opus_int32 silk_SMULWB_armv5e(opus_int32 a, opus_int16 b)
+static OAC_INLINE oac_int32 silk_SMULWB_armv5e(oac_int32 a, oac_int16 b)
 {
   int res;
   __asm__(
@@ -49,10 +49,10 @@ static OPUS_INLINE opus_int32 silk_SMULWB_armv5e(opus_int32 a, opus_int16 b)
 }
 #define silk_SMULWB(a, b) (silk_SMULWB_armv5e(a, b))
 
-/* a32 + (b32 * (opus_int32)((opus_int16)(c32))) >> 16 output have to be 32bit int */
+/* a32 + (b32 * (oac_int32)((oac_int16)(c32))) >> 16 output have to be 32bit int */
 #undef silk_SMLAWB
-static OPUS_INLINE opus_int32 silk_SMLAWB_armv5e(opus_int32 a, opus_int32 b,
- opus_int16 c)
+static OAC_INLINE oac_int32 silk_SMLAWB_armv5e(oac_int32 a, oac_int32 b,
+ oac_int16 c)
 {
   int res;
   __asm__(
@@ -67,7 +67,7 @@ static OPUS_INLINE opus_int32 silk_SMLAWB_armv5e(opus_int32 a, opus_int32 b,
 
 /* (a32 * (b32 >> 16)) >> 16 */
 #undef silk_SMULWT
-static OPUS_INLINE opus_int32 silk_SMULWT_armv5e(opus_int32 a, opus_int32 b)
+static OAC_INLINE oac_int32 silk_SMULWT_armv5e(oac_int32 a, oac_int32 b)
 {
   int res;
   __asm__(
@@ -82,8 +82,8 @@ static OPUS_INLINE opus_int32 silk_SMULWT_armv5e(opus_int32 a, opus_int32 b)
 
 /* a32 + (b32 * (c32 >> 16)) >> 16 */
 #undef silk_SMLAWT
-static OPUS_INLINE opus_int32 silk_SMLAWT_armv5e(opus_int32 a, opus_int32 b,
- opus_int32 c)
+static OAC_INLINE oac_int32 silk_SMLAWT_armv5e(oac_int32 a, oac_int32 b,
+ oac_int32 c)
 {
   int res;
   __asm__(
@@ -96,9 +96,9 @@ static OPUS_INLINE opus_int32 silk_SMLAWT_armv5e(opus_int32 a, opus_int32 b,
 }
 #define silk_SMLAWT(a, b, c) (silk_SMLAWT_armv5e(a, b, c))
 
-/* (opus_int32)((opus_int16)(a3))) * (opus_int32)((opus_int16)(b32)) output have to be 32bit int */
+/* (oac_int32)((oac_int16)(a3))) * (oac_int32)((oac_int16)(b32)) output have to be 32bit int */
 #undef silk_SMULBB
-static OPUS_INLINE opus_int32 silk_SMULBB_armv5e(opus_int32 a, opus_int32 b)
+static OAC_INLINE oac_int32 silk_SMULBB_armv5e(oac_int32 a, oac_int32 b)
 {
   int res;
   __asm__(
@@ -111,10 +111,10 @@ static OPUS_INLINE opus_int32 silk_SMULBB_armv5e(opus_int32 a, opus_int32 b)
 }
 #define silk_SMULBB(a, b) (silk_SMULBB_armv5e(a, b))
 
-/* a32 + (opus_int32)((opus_int16)(b32)) * (opus_int32)((opus_int16)(c32)) output have to be 32bit int */
+/* a32 + (oac_int32)((oac_int16)(b32)) * (oac_int32)((oac_int16)(c32)) output have to be 32bit int */
 #undef silk_SMLABB
-static OPUS_INLINE opus_int32 silk_SMLABB_armv5e(opus_int32 a, opus_int32 b,
- opus_int32 c)
+static OAC_INLINE oac_int32 silk_SMLABB_armv5e(oac_int32 a, oac_int32 b,
+ oac_int32 c)
 {
   int res;
   __asm__(
@@ -127,9 +127,9 @@ static OPUS_INLINE opus_int32 silk_SMLABB_armv5e(opus_int32 a, opus_int32 b,
 }
 #define silk_SMLABB(a, b, c) (silk_SMLABB_armv5e(a, b, c))
 
-/* (opus_int32)((opus_int16)(a32)) * (b32 >> 16) */
+/* (oac_int32)((oac_int16)(a32)) * (b32 >> 16) */
 #undef silk_SMULBT
-static OPUS_INLINE opus_int32 silk_SMULBT_armv5e(opus_int32 a, opus_int32 b)
+static OAC_INLINE oac_int32 silk_SMULBT_armv5e(oac_int32 a, oac_int32 b)
 {
   int res;
   __asm__(
@@ -142,10 +142,10 @@ static OPUS_INLINE opus_int32 silk_SMULBT_armv5e(opus_int32 a, opus_int32 b)
 }
 #define silk_SMULBT(a, b) (silk_SMULBT_armv5e(a, b))
 
-/* a32 + (opus_int32)((opus_int16)(b32)) * (c32 >> 16) */
+/* a32 + (oac_int32)((oac_int16)(b32)) * (c32 >> 16) */
 #undef silk_SMLABT
-static OPUS_INLINE opus_int32 silk_SMLABT_armv5e(opus_int32 a, opus_int32 b,
- opus_int32 c)
+static OAC_INLINE oac_int32 silk_SMLABT_armv5e(oac_int32 a, oac_int32 b,
+ oac_int32 c)
 {
   int res;
   __asm__(
@@ -160,7 +160,7 @@ static OPUS_INLINE opus_int32 silk_SMLABT_armv5e(opus_int32 a, opus_int32 b,
 
 /* add/subtract with output saturated */
 #undef silk_ADD_SAT32
-static OPUS_INLINE opus_int32 silk_ADD_SAT32_armv5e(opus_int32 a, opus_int32 b)
+static OAC_INLINE oac_int32 silk_ADD_SAT32_armv5e(oac_int32 a, oac_int32 b)
 {
   int res;
   __asm__(
@@ -174,7 +174,7 @@ static OPUS_INLINE opus_int32 silk_ADD_SAT32_armv5e(opus_int32 a, opus_int32 b)
 #define silk_ADD_SAT32(a, b) (silk_ADD_SAT32_armv5e(a, b))
 
 #undef silk_SUB_SAT32
-static OPUS_INLINE opus_int32 silk_SUB_SAT32_armv5e(opus_int32 a, opus_int32 b)
+static OAC_INLINE oac_int32 silk_SUB_SAT32_armv5e(oac_int32 a, oac_int32 b)
 {
   int res;
   __asm__(
@@ -188,7 +188,7 @@ static OPUS_INLINE opus_int32 silk_SUB_SAT32_armv5e(opus_int32 a, opus_int32 b)
 #define silk_SUB_SAT32(a, b) (silk_SUB_SAT32_armv5e(a, b))
 
 #undef silk_CLZ16
-static OPUS_INLINE opus_int32 silk_CLZ16_armv5(opus_int16 in16)
+static OAC_INLINE oac_int32 silk_CLZ16_armv5(oac_int16 in16)
 {
   int res;
   __asm__(
@@ -202,7 +202,7 @@ static OPUS_INLINE opus_int32 silk_CLZ16_armv5(opus_int16 in16)
 #define silk_CLZ16(in16) (silk_CLZ16_armv5(in16))
 
 #undef silk_CLZ32
-static OPUS_INLINE opus_int32 silk_CLZ32_armv5(opus_int32 in32)
+static OAC_INLINE oac_int32 silk_CLZ32_armv5(oac_int32 in32)
 {
   int res;
   __asm__(
diff --git a/silk/biquad_alt.c b/silk/biquad_alt.c
index 54566a43c..472d43ea1 100644
--- a/silk/biquad_alt.c
+++ b/silk/biquad_alt.c
@@ -40,17 +40,17 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Second order ARMA filter, alternative implementation */
 void silk_biquad_alt_stride1(
-    const opus_int16            *in,                /* I     input signal                                               */
-    const opus_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
-    const opus_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
-    opus_int32                  *S,                 /* I/O   State vector [2]                                           */
-    opus_int16                  *out,               /* O     output signal                                              */
-    const opus_int32            len                 /* I     signal length (must be even)                               */
+    const oac_int16            *in,                /* I     input signal                                               */
+    const oac_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
+    const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
+    oac_int32                  *S,                 /* I/O   State vector [2]                                           */
+    oac_int16                  *out,               /* O     output signal                                              */
+    const oac_int32            len                 /* I     signal length (must be even)                               */
 )
 {
     /* DIRECT FORM II TRANSPOSED (uses 2 element state vector) */
-    opus_int   k;
-    opus_int32 inval, A0_U_Q28, A0_L_Q28, A1_U_Q28, A1_L_Q28, out32_Q14;
+    oac_int   k;
+    oac_int32 inval, A0_U_Q28, A0_L_Q28, A1_U_Q28, A1_L_Q28, out32_Q14;
 
     /* Negate A_Q28 values and split in two parts */
     A0_L_Q28 = ( -A_Q28[ 0 ] ) & 0x00003FFF;        /* lower part */
@@ -72,22 +72,22 @@ void silk_biquad_alt_stride1(
         S[ 1 ] = silk_SMLAWB( S[ 1 ], B_Q28[ 2 ], inval );
 
         /* Scale back to Q0 and saturate */
-        out[ k ] = (opus_int16)silk_SAT16( silk_RSHIFT( out32_Q14 + (1<<14) - 1, 14 ) );
+        out[ k ] = (oac_int16)silk_SAT16( silk_RSHIFT( out32_Q14 + (1<<14) - 1, 14 ) );
     }
 }
 
 void silk_biquad_alt_stride2_c(
-    const opus_int16            *in,                /* I     input signal                                               */
-    const opus_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
-    const opus_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
-    opus_int32                  *S,                 /* I/O   State vector [4]                                           */
-    opus_int16                  *out,               /* O     output signal                                              */
-    const opus_int32            len                 /* I     signal length (must be even)                               */
+    const oac_int16            *in,                /* I     input signal                                               */
+    const oac_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
+    const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
+    oac_int32                  *S,                 /* I/O   State vector [4]                                           */
+    oac_int16                  *out,               /* O     output signal                                              */
+    const oac_int32            len                 /* I     signal length (must be even)                               */
 )
 {
     /* DIRECT FORM II TRANSPOSED (uses 2 element state vector) */
-    opus_int   k;
-    opus_int32 A0_U_Q28, A0_L_Q28, A1_U_Q28, A1_L_Q28, out32_Q14[ 2 ];
+    oac_int   k;
+    oac_int32 A0_U_Q28, A0_L_Q28, A1_U_Q28, A1_L_Q28, out32_Q14[ 2 ];
 
     /* Negate A_Q28 values and split in two parts */
     A0_L_Q28 = ( -A_Q28[ 0 ] ) & 0x00003FFF;        /* lower part */
@@ -115,7 +115,7 @@ void silk_biquad_alt_stride2_c(
         S[ 3 ] = silk_SMLAWB( S[ 3 ], B_Q28[ 2 ], in[ 2 * k + 1 ] );
 
         /* Scale back to Q0 and saturate */
-        out[ 2 * k + 0 ] = (opus_int16)silk_SAT16( silk_RSHIFT( out32_Q14[ 0 ] + (1<<14) - 1, 14 ) );
-        out[ 2 * k + 1 ] = (opus_int16)silk_SAT16( silk_RSHIFT( out32_Q14[ 1 ] + (1<<14) - 1, 14 ) );
+        out[ 2 * k + 0 ] = (oac_int16)silk_SAT16( silk_RSHIFT( out32_Q14[ 0 ] + (1<<14) - 1, 14 ) );
+        out[ 2 * k + 1 ] = (oac_int16)silk_SAT16( silk_RSHIFT( out32_Q14[ 1 ] + (1<<14) - 1, 14 ) );
     }
 }
diff --git a/silk/bwexpander.c b/silk/bwexpander.c
index afa97907e..d4b8b060c 100644
--- a/silk/bwexpander.c
+++ b/silk/bwexpander.c
@@ -33,19 +33,19 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Chirp (bandwidth expand) LP AR filter */
 void silk_bwexpander(
-    opus_int16                  *ar,                /* I/O  AR filter to be expanded (without leading 1)                */
-    const opus_int              d,                  /* I    Length of ar                                                */
-    opus_int32                  chirp_Q16           /* I    Chirp factor (typically in the range 0 to 1)                */
+    oac_int16                  *ar,                /* I/O  AR filter to be expanded (without leading 1)                */
+    const oac_int              d,                  /* I    Length of ar                                                */
+    oac_int32                  chirp_Q16           /* I    Chirp factor (typically in the range 0 to 1)                */
 )
 {
-    opus_int   i;
-    opus_int32 chirp_minus_one_Q16 = chirp_Q16 - 65536;
+    oac_int   i;
+    oac_int32 chirp_minus_one_Q16 = chirp_Q16 - 65536;
 
     /* NB: Dont use silk_SMULWB, instead of silk_RSHIFT_ROUND( silk_MUL(), 16 ), below.  */
     /* Bias in silk_SMULWB can lead to unstable filters                                */
     for( i = 0; i < d - 1; i++ ) {
-        ar[ i ]    = (opus_int16)silk_RSHIFT_ROUND( silk_MUL( chirp_Q16, ar[ i ]             ), 16 );
+        ar[ i ]    = (oac_int16)silk_RSHIFT_ROUND( silk_MUL( chirp_Q16, ar[ i ]             ), 16 );
         chirp_Q16 +=             silk_RSHIFT_ROUND( silk_MUL( chirp_Q16, chirp_minus_one_Q16 ), 16 );
     }
-    ar[ d - 1 ] = (opus_int16)silk_RSHIFT_ROUND( silk_MUL( chirp_Q16, ar[ d - 1 ] ), 16 );
+    ar[ d - 1 ] = (oac_int16)silk_RSHIFT_ROUND( silk_MUL( chirp_Q16, ar[ d - 1 ] ), 16 );
 }
diff --git a/silk/bwexpander_32.c b/silk/bwexpander_32.c
index 1b37d969c..266f7b29a 100644
--- a/silk/bwexpander_32.c
+++ b/silk/bwexpander_32.c
@@ -34,13 +34,13 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Chirp (bandwidth expand) LP AR filter.
    This logic is reused in _celt_lpc(). Any bug fixes should also be applied there. */
 void silk_bwexpander_32(
-    opus_int32                  *ar,                /* I/O  AR filter to be expanded (without leading 1)                */
-    const opus_int              d,                  /* I    Length of ar                                                */
-    opus_int32                  chirp_Q16           /* I    Chirp factor in Q16                                         */
+    oac_int32                  *ar,                /* I/O  AR filter to be expanded (without leading 1)                */
+    const oac_int              d,                  /* I    Length of ar                                                */
+    oac_int32                  chirp_Q16           /* I    Chirp factor in Q16                                         */
 )
 {
-    opus_int   i;
-    opus_int32 chirp_minus_one_Q16 = chirp_Q16 - 65536;
+    oac_int   i;
+    oac_int32 chirp_minus_one_Q16 = chirp_Q16 - 65536;
 
     for( i = 0; i < d - 1; i++ ) {
         ar[ i ]    = silk_SMULWW( chirp_Q16, ar[ i ] );
diff --git a/silk/check_control_input.c b/silk/check_control_input.c
index b4e96e7bf..b5c749fc5 100644
--- a/silk/check_control_input.c
+++ b/silk/check_control_input.c
@@ -34,7 +34,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "errors.h"
 
 /* Check encoder control struct */
-opus_int check_control_input(
+oac_int check_control_input(
     silk_EncControlStruct        *encControl                    /* I    Control structure                           */
 )
 {
diff --git a/silk/code_signs.c b/silk/code_signs.c
index dfd1dca9a..b73c14f19 100644
--- a/silk/code_signs.c
+++ b/silk/code_signs.c
@@ -40,17 +40,17 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Encodes signs of excitation */
 void silk_encode_signs(
     ec_enc                      *psRangeEnc,                        /* I/O  Compressor data structure                   */
-    const opus_int8             pulses[],                           /* I    pulse signal                                */
-    opus_int                    length,                             /* I    length of input                             */
-    const opus_int              signalType,                         /* I    Signal type                                 */
-    const opus_int              quantOffsetType,                    /* I    Quantization offset type                    */
-    const opus_int              sum_pulses[ MAX_NB_SHELL_BLOCKS ]   /* I    Sum of absolute pulses per block            */
+    const oac_int8             pulses[],                           /* I    pulse signal                                */
+    oac_int                    length,                             /* I    length of input                             */
+    const oac_int              signalType,                         /* I    Signal type                                 */
+    const oac_int              quantOffsetType,                    /* I    Quantization offset type                    */
+    const oac_int              sum_pulses[ MAX_NB_SHELL_BLOCKS ]   /* I    Sum of absolute pulses per block            */
 )
 {
-    opus_int         i, j, p;
-    opus_uint8       icdf[ 2 ];
-    const opus_int8  *q_ptr;
-    const opus_uint8 *icdf_ptr;
+    oac_int         i, j, p;
+    oac_uint8       icdf[ 2 ];
+    const oac_int8  *q_ptr;
+    const oac_uint8 *icdf_ptr;
 
     icdf[ 1 ] = 0;
     q_ptr = pulses;
@@ -74,17 +74,17 @@ void silk_encode_signs(
 /* Decodes signs of excitation */
 void silk_decode_signs(
     ec_dec                      *psRangeDec,                        /* I/O  Compressor data structure                   */
-    opus_int16                  pulses[],                           /* I/O  pulse signal                                */
-    opus_int                    length,                             /* I    length of input                             */
-    const opus_int              signalType,                         /* I    Signal type                                 */
-    const opus_int              quantOffsetType,                    /* I    Quantization offset type                    */
-    const opus_int              sum_pulses[ MAX_NB_SHELL_BLOCKS ]   /* I    Sum of absolute pulses per block            */
+    oac_int16                  pulses[],                           /* I/O  pulse signal                                */
+    oac_int                    length,                             /* I    length of input                             */
+    const oac_int              signalType,                         /* I    Signal type                                 */
+    const oac_int              quantOffsetType,                    /* I    Quantization offset type                    */
+    const oac_int              sum_pulses[ MAX_NB_SHELL_BLOCKS ]   /* I    Sum of absolute pulses per block            */
 )
 {
-    opus_int         i, j, p;
-    opus_uint8       icdf[ 2 ];
-    opus_int16       *q_ptr;
-    const opus_uint8 *icdf_ptr;
+    oac_int         i, j, p;
+    oac_uint8       icdf[ 2 ];
+    oac_int16       *q_ptr;
+    const oac_uint8 *icdf_ptr;
 
     icdf[ 1 ] = 0;
     q_ptr = pulses;
diff --git a/silk/control.h b/silk/control.h
index 1a06cbe38..86038032d 100644
--- a/silk/control.h
+++ b/silk/control.h
@@ -41,82 +41,82 @@ POSSIBILITY OF SUCH DAMAGE.
 /***********************************************/
 typedef struct {
     /* I:   Number of channels; 1/2                                                         */
-    opus_int32 nChannelsAPI;
+    oac_int32 nChannelsAPI;
 
     /* I:   Number of channels; 1/2                                                         */
-    opus_int32 nChannelsInternal;
+    oac_int32 nChannelsInternal;
 
     /* I:   Input signal sampling rate in Hertz; 8000/12000/16000/24000/32000/44100/48000   */
-    opus_int32 API_sampleRate;
+    oac_int32 API_sampleRate;
 
     /* I:   Maximum internal sampling rate in Hertz; 8000/12000/16000                       */
-    opus_int32 maxInternalSampleRate;
+    oac_int32 maxInternalSampleRate;
 
     /* I:   Minimum internal sampling rate in Hertz; 8000/12000/16000                       */
-    opus_int32 minInternalSampleRate;
+    oac_int32 minInternalSampleRate;
 
     /* I:   Soft request for internal sampling rate in Hertz; 8000/12000/16000              */
-    opus_int32 desiredInternalSampleRate;
+    oac_int32 desiredInternalSampleRate;
 
     /* I:   Number of samples per packet in milliseconds; 10/20/40/60                       */
-    opus_int payloadSize_ms;
+    oac_int payloadSize_ms;
 
     /* I:   Bitrate during active speech in bits/second; internally limited                 */
-    opus_int32 bitRate;
+    oac_int32 bitRate;
 
     /* I:   Uplink packet loss in percent (0-100)                                           */
-    opus_int packetLossPercentage;
+    oac_int packetLossPercentage;
 
     /* I:   Complexity mode; 0 is lowest, 10 is highest complexity                          */
-    opus_int complexity;
+    oac_int complexity;
 
     /* I:   Flag to enable in-band Forward Error Correction (FEC); 0/1                      */
-    opus_int useInBandFEC;
+    oac_int useInBandFEC;
 
     /* I:   Flag to enable in-band Deep REDundancy (DRED); 0/1                              */
-    opus_int useDRED;
+    oac_int useDRED;
 
     /* I:   Flag to actually code in-band Forward Error Correction (FEC) in the current packet; 0/1 */
-    opus_int LBRR_coded;
+    oac_int LBRR_coded;
 
     /* I:   Flag to enable discontinuous transmission (DTX); 0/1                            */
-    opus_int useDTX;
+    oac_int useDTX;
 
     /* I:   Flag to use constant bitrate                                                    */
-    opus_int useCBR;
+    oac_int useCBR;
 
     /* I:   Maximum number of bits allowed for the frame                                    */
-    opus_int maxBits;
+    oac_int maxBits;
 
     /* I:   Causes a smooth downmix to mono                                                 */
-    opus_int toMono;
+    oac_int toMono;
 
-    /* I:   Opus encoder is allowing us to switch bandwidth                                 */
-    opus_int opusCanSwitch;
+    /* I:   Oac encoder is allowing us to switch bandwidth                                 */
+    oac_int oacCanSwitch;
 
     /* I: Make frames as independent as possible (but still use LPC)                        */
-    opus_int reducedDependency;
+    oac_int reducedDependency;
 
     /* O:   Internal sampling rate used, in Hertz; 8000/12000/16000                         */
-    opus_int32 internalSampleRate;
+    oac_int32 internalSampleRate;
 
     /* O: Flag that bandwidth switching is allowed (because low voice activity)             */
-    opus_int allowBandwidthSwitch;
+    oac_int allowBandwidthSwitch;
 
     /* O:   Flag that SILK runs in WB mode without variable LP filter (use for switching between WB/SWB/FB) */
-    opus_int inWBmodeWithoutVariableLP;
+    oac_int inWBmodeWithoutVariableLP;
 
     /* O:   Stereo width */
-    opus_int stereoWidth_Q14;
+    oac_int stereoWidth_Q14;
 
-    /* O:   Tells the Opus encoder we're ready to switch                                    */
-    opus_int switchReady;
+    /* O:   Tells the Oac encoder we're ready to switch                                    */
+    oac_int switchReady;
 
     /* O: SILK Signal type */
-    opus_int signalType;
+    oac_int signalType;
 
     /* O: SILK offset (dithering) */
-    opus_int offset;
+    oac_int offset;
 } silk_EncControlStruct;
 
 /**************************************************************************/
@@ -124,39 +124,39 @@ typedef struct {
 /**************************************************************************/
 typedef struct {
     /* I:   Number of channels; 1/2                                                         */
-    opus_int32 nChannelsAPI;
+    oac_int32 nChannelsAPI;
 
     /* I:   Number of channels; 1/2                                                         */
-    opus_int32 nChannelsInternal;
+    oac_int32 nChannelsInternal;
 
     /* I:   Output signal sampling rate in Hertz; 8000/12000/16000/24000/32000/44100/48000  */
-    opus_int32 API_sampleRate;
+    oac_int32 API_sampleRate;
 
     /* I:   Internal sampling rate used, in Hertz; 8000/12000/16000                         */
-    opus_int32 internalSampleRate;
+    oac_int32 internalSampleRate;
 
     /* I:   Number of samples per packet in milliseconds; 10/20/40/60                       */
-    opus_int payloadSize_ms;
+    oac_int payloadSize_ms;
 
     /* O:   Pitch lag of previous frame (0 if unvoiced), measured in samples at 48 kHz      */
-    opus_int prevPitchLag;
+    oac_int prevPitchLag;
 
     /* I:   Enable Deep PLC                                                                 */
-    opus_int enable_deep_plc;
+    oac_int enable_deep_plc;
 
 #ifdef ENABLE_OSCE
     /* I: OSCE method */
-    opus_int osce_method;
+    oac_int osce_method;
 
 #ifdef ENABLE_OSCE_BWE
     /* I: OSCE bandwidth extension method */
-    opus_int enable_osce_bwe;
+    oac_int enable_osce_bwe;
 
     /* I: extended mode */
-    opus_int osce_extended_mode;
+    oac_int osce_extended_mode;
 
     /* O: previous extended mode */
-    opus_int prev_osce_extended_mode;
+    oac_int prev_osce_extended_mode;
 #endif
 #endif
 } silk_DecControlStruct;
diff --git a/silk/control_SNR.c b/silk/control_SNR.c
index 455acad6f..834cf4671 100644
--- a/silk/control_SNR.c
+++ b/silk/control_SNR.c
@@ -79,9 +79,9 @@ static const unsigned char silk_TargetRate_WB_21[201 - 10] = {
 };
 
 /* Control SNR of residual quantizer */
-opus_int silk_control_SNR(
+oac_int silk_control_SNR(
     silk_encoder_state          *psEncC,                        /* I/O  Pointer to Silk encoder state               */
-    opus_int32                  TargetRate_bps                  /* I    Target max bitrate (bps)                    */
+    oac_int32                  TargetRate_bps                  /* I    Target max bitrate (bps)                    */
 )
 {
     int id;
diff --git a/silk/control_audio_bandwidth.c b/silk/control_audio_bandwidth.c
index f6d22d839..82e704d52 100644
--- a/silk/control_audio_bandwidth.c
+++ b/silk/control_audio_bandwidth.c
@@ -33,14 +33,14 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "tuning_parameters.h"
 
 /* Control internal sampling rate */
-opus_int silk_control_audio_bandwidth(
+oac_int silk_control_audio_bandwidth(
     silk_encoder_state          *psEncC,                        /* I/O  Pointer to Silk encoder state               */
     silk_EncControlStruct       *encControl                     /* I    Control structure                           */
 )
 {
-    opus_int   fs_kHz;
-    opus_int   orig_kHz;
-    opus_int32 fs_Hz;
+    oac_int   fs_kHz;
+    oac_int   orig_kHz;
+    oac_int32 fs_Hz;
 
     orig_kHz = psEncC->fs_kHz;
     /* Handle a bandwidth-switching reset where we need to be aware what the last sampling rate was. */
@@ -65,7 +65,7 @@ opus_int silk_control_audio_bandwidth(
             /* Stop transition phase */
             psEncC->sLP.mode = 0;
         }
-        if( psEncC->allow_bandwidth_switch || encControl->opusCanSwitch ) {
+        if( psEncC->allow_bandwidth_switch || encControl->oacCanSwitch ) {
             /* Check if we should switch down */
             if( silk_SMULBB( orig_kHz, 1000 ) > psEncC->desiredInternal_fs_Hz )
             {
@@ -77,7 +77,7 @@ opus_int silk_control_audio_bandwidth(
                     /* Reset transition filter state */
                     silk_memset( psEncC->sLP.In_LP_State, 0, sizeof( psEncC->sLP.In_LP_State ) );
                 }
-                if( encControl->opusCanSwitch ) {
+                if( encControl->oacCanSwitch ) {
                     /* Stop transition phase */
                     psEncC->sLP.mode = 0;
 
@@ -99,7 +99,7 @@ opus_int silk_control_audio_bandwidth(
             if( silk_SMULBB( orig_kHz, 1000 ) < psEncC->desiredInternal_fs_Hz )
             {
                 /* Switch up */
-                if( encControl->opusCanSwitch ) {
+                if( encControl->oacCanSwitch ) {
                     /* Switch to a higher sample frequency */
                     fs_kHz = orig_kHz == 8 ? 12 : 16;
 
diff --git a/silk/control_codec.c b/silk/control_codec.c
index 784ffe66d..23ef68450 100644
--- a/silk/control_codec.c
+++ b/silk/control_codec.c
@@ -39,38 +39,38 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "tuning_parameters.h"
 #include "pitch_est_defines.h"
 
-static opus_int silk_setup_resamplers(
+static oac_int silk_setup_resamplers(
     silk_encoder_state_Fxx          *psEnc,             /* I/O                      */
-    opus_int                        fs_kHz              /* I                        */
+    oac_int                        fs_kHz              /* I                        */
 );
 
-static opus_int silk_setup_fs(
+static oac_int silk_setup_fs(
     silk_encoder_state_Fxx          *psEnc,             /* I/O                      */
-    opus_int                        fs_kHz,             /* I                        */
-    opus_int                        PacketSize_ms       /* I                        */
+    oac_int                        fs_kHz,             /* I                        */
+    oac_int                        PacketSize_ms       /* I                        */
 );
 
-static opus_int silk_setup_complexity(
+static oac_int silk_setup_complexity(
     silk_encoder_state              *psEncC,            /* I/O                      */
-    opus_int                        Complexity          /* I                        */
+    oac_int                        Complexity          /* I                        */
 );
 
-static OPUS_INLINE opus_int silk_setup_LBRR(
+static OAC_INLINE oac_int silk_setup_LBRR(
     silk_encoder_state              *psEncC,            /* I/O                      */
     const silk_EncControlStruct     *encControl         /* I                        */
 );
 
 
 /* Control encoder */
-opus_int silk_control_encoder(
+oac_int silk_control_encoder(
     silk_encoder_state_Fxx          *psEnc,                                 /* I/O  Pointer to Silk encoder state                                               */
     silk_EncControlStruct           *encControl,                            /* I    Control structure                                                           */
-    const opus_int                  allow_bw_switch,                        /* I    Flag to allow switching audio bandwidth                                     */
-    const opus_int                  channelNb,                              /* I    Channel number                                                              */
-    const opus_int                  force_fs_kHz
+    const oac_int                  allow_bw_switch,                        /* I    Flag to allow switching audio bandwidth                                     */
+    const oac_int                  channelNb,                              /* I    Channel number                                                              */
+    const oac_int                  force_fs_kHz
 )
 {
-    opus_int   fs_kHz, ret = 0;
+    oac_int   fs_kHz, ret = 0;
 
     psEnc->sCmn.useDTX                 = encControl->useDTX;
     psEnc->sCmn.useCBR                 = encControl->useCBR;
@@ -131,12 +131,12 @@ opus_int silk_control_encoder(
     return ret;
 }
 
-static opus_int silk_setup_resamplers(
+static oac_int silk_setup_resamplers(
     silk_encoder_state_Fxx          *psEnc,             /* I/O                      */
-    opus_int                         fs_kHz              /* I                        */
+    oac_int                         fs_kHz              /* I                        */
 )
 {
-    opus_int   ret = SILK_NO_ERROR;
+    oac_int   ret = SILK_NO_ERROR;
     SAVE_STACK;
 
     if( psEnc->sCmn.fs_kHz != fs_kHz || psEnc->sCmn.prev_API_fs_Hz != psEnc->sCmn.API_fs_Hz )
@@ -145,17 +145,17 @@ static opus_int silk_setup_resamplers(
             /* Initialize the resampler for enc_API.c preparing resampling from API_fs_Hz to fs_kHz */
             ret += silk_resampler_init( &psEnc->sCmn.resampler_state, psEnc->sCmn.API_fs_Hz, fs_kHz * 1000, 1 );
         } else {
-            VARDECL( opus_int16, x_buf_API_fs_Hz );
+            VARDECL( oac_int16, x_buf_API_fs_Hz );
             VARDECL( silk_resampler_state_struct, temp_resampler_state );
 #ifdef FIXED_POINT
-            opus_int16 *x_bufFIX = psEnc->x_buf;
+            oac_int16 *x_bufFIX = psEnc->x_buf;
 #else
-            VARDECL( opus_int16, x_bufFIX );
-            opus_int32 new_buf_samples;
+            VARDECL( oac_int16, x_bufFIX );
+            oac_int32 new_buf_samples;
 #endif
-            opus_int32 api_buf_samples;
-            opus_int32 old_buf_samples;
-            opus_int32 buf_length_ms;
+            oac_int32 api_buf_samples;
+            oac_int32 old_buf_samples;
+            oac_int32 buf_length_ms;
 
             buf_length_ms = silk_LSHIFT( psEnc->sCmn.nb_subfr * 5, 1 ) + LA_SHAPE_MS;
             old_buf_samples = buf_length_ms * psEnc->sCmn.fs_kHz;
@@ -163,7 +163,7 @@ static opus_int silk_setup_resamplers(
 #ifndef FIXED_POINT
             new_buf_samples = buf_length_ms * fs_kHz;
             ALLOC( x_bufFIX, silk_max( old_buf_samples, new_buf_samples ),
-                   opus_int16 );
+                   oac_int16 );
             silk_float2short_array( x_bufFIX, psEnc->x_buf, old_buf_samples );
 #endif
 
@@ -175,7 +175,7 @@ static opus_int silk_setup_resamplers(
             api_buf_samples = buf_length_ms * silk_DIV32_16( psEnc->sCmn.API_fs_Hz, 1000 );
 
             /* Temporary resampling of x_buf data to API_fs_Hz */
-            ALLOC( x_buf_API_fs_Hz, api_buf_samples, opus_int16 );
+            ALLOC( x_buf_API_fs_Hz, api_buf_samples, oac_int16 );
             ret += silk_resampler( temp_resampler_state, x_buf_API_fs_Hz, x_bufFIX, old_buf_samples );
 
             /* Initialize the resampler for enc_API.c preparing resampling from API_fs_Hz to fs_kHz */
@@ -196,13 +196,13 @@ static opus_int silk_setup_resamplers(
     return ret;
 }
 
-static opus_int silk_setup_fs(
+static oac_int silk_setup_fs(
     silk_encoder_state_Fxx          *psEnc,             /* I/O                      */
-    opus_int                        fs_kHz,             /* I                        */
-    opus_int                        PacketSize_ms       /* I                        */
+    oac_int                        fs_kHz,             /* I                        */
+    oac_int                        PacketSize_ms       /* I                        */
 )
 {
-    opus_int ret = SILK_NO_ERROR;
+    oac_int ret = SILK_NO_ERROR;
 
     /* Set packet size */
     if( PacketSize_ms != psEnc->sCmn.PacketSize_ms ) {
@@ -304,12 +304,12 @@ static opus_int silk_setup_fs(
     return ret;
 }
 
-static opus_int silk_setup_complexity(
+static oac_int silk_setup_complexity(
     silk_encoder_state              *psEncC,            /* I/O                      */
-    opus_int                        Complexity          /* I                        */
+    oac_int                        Complexity          /* I                        */
 )
 {
-    opus_int ret = 0;
+    oac_int ret = 0;
 
     /* Set encoding complexity */
     celt_assert( Complexity >= 0 && Complexity <= 10 );
@@ -400,12 +400,12 @@ static opus_int silk_setup_complexity(
     return ret;
 }
 
-static OPUS_INLINE opus_int silk_setup_LBRR(
+static OAC_INLINE oac_int silk_setup_LBRR(
     silk_encoder_state          *psEncC,            /* I/O                      */
     const silk_EncControlStruct *encControl         /* I                        */
 )
 {
-    opus_int   LBRR_in_previous_packet, ret = SILK_NO_ERROR;
+    oac_int   LBRR_in_previous_packet, ret = SILK_NO_ERROR;
 
     LBRR_in_previous_packet = psEncC->LBRR_enabled;
     psEncC->LBRR_enabled = encControl->LBRR_coded;
@@ -415,7 +415,7 @@ static OPUS_INLINE opus_int silk_setup_LBRR(
             /* Previous packet did not have LBRR, and was therefore coded at a higher bitrate */
             psEncC->LBRR_GainIncreases = 7;
         } else {
-            psEncC->LBRR_GainIncreases = silk_max_int( 7 - silk_SMULWB( (opus_int32)psEncC->PacketLoss_perc, SILK_FIX_CONST( 0.2, 16 ) ), 3 );
+            psEncC->LBRR_GainIncreases = silk_max_int( 7 - silk_SMULWB( (oac_int32)psEncC->PacketLoss_perc, SILK_FIX_CONST( 0.2, 16 ) ), 3 );
         }
     }
 
diff --git a/silk/debug.c b/silk/debug.c
index ddf9299f1..d90fa612d 100644
--- a/silk/debug.c
+++ b/silk/debug.c
@@ -75,10 +75,10 @@ LARGE_INTEGER silk_Timer_start[silk_NUM_TIMERS_MAX];
 unsigned long silk_Timer_start[silk_NUM_TIMERS_MAX];
 #endif
 unsigned int  silk_Timer_cnt[silk_NUM_TIMERS_MAX];
-opus_int64     silk_Timer_min[silk_NUM_TIMERS_MAX];
-opus_int64     silk_Timer_sum[silk_NUM_TIMERS_MAX];
-opus_int64     silk_Timer_max[silk_NUM_TIMERS_MAX];
-opus_int64     silk_Timer_depth[silk_NUM_TIMERS_MAX];
+oac_int64     silk_Timer_min[silk_NUM_TIMERS_MAX];
+oac_int64     silk_Timer_sum[silk_NUM_TIMERS_MAX];
+oac_int64     silk_Timer_max[silk_NUM_TIMERS_MAX];
+oac_int64     silk_Timer_depth[silk_NUM_TIMERS_MAX];
 
 #ifdef _WIN32
 void silk_TimerSave(char *file_name)
diff --git a/silk/debug.h b/silk/debug.h
index 68190f5f5..887c9adc3 100644
--- a/silk/debug.h
+++ b/silk/debug.h
@@ -84,10 +84,10 @@ extern LARGE_INTEGER silk_Timer_start[silk_NUM_TIMERS_MAX];
 extern unsigned long silk_Timer_start[silk_NUM_TIMERS_MAX];
 #endif
 extern unsigned int  silk_Timer_cnt[silk_NUM_TIMERS_MAX];
-extern opus_int64    silk_Timer_sum[silk_NUM_TIMERS_MAX];
-extern opus_int64    silk_Timer_max[silk_NUM_TIMERS_MAX];
-extern opus_int64    silk_Timer_min[silk_NUM_TIMERS_MAX];
-extern opus_int64    silk_Timer_depth[silk_NUM_TIMERS_MAX];
+extern oac_int64    silk_Timer_sum[silk_NUM_TIMERS_MAX];
+extern oac_int64    silk_Timer_max[silk_NUM_TIMERS_MAX];
+extern oac_int64    silk_Timer_min[silk_NUM_TIMERS_MAX];
+extern oac_int64    silk_Timer_depth[silk_NUM_TIMERS_MAX];
 
 /* WARNING: TIC()/TOC can measure only up to 0.1 seconds at a time */
 #ifdef _WIN32
@@ -222,7 +222,7 @@ extern opus_int64    silk_Timer_depth[silk_NUM_TIMERS_MAX];
 /************************************/
 /* write data to file for debugging */
 /************************************/
-/* Example: DEBUG_STORE_DATA(testfile.pcm, &RIN[0], 160*sizeof(opus_int16)); */
+/* Example: DEBUG_STORE_DATA(testfile.pcm, &RIN[0], 160*sizeof(oac_int16)); */
 
 #define silk_NUM_STORES_MAX                                  100
 extern FILE *silk_debug_store_fp[ silk_NUM_STORES_MAX ];
@@ -230,7 +230,7 @@ extern int silk_debug_store_count;
 
 /* Faster way of storing the data */
 #define DEBUG_STORE_DATA( FILE_NAME, DATA_PTR, N_BYTES ) {          \
-    static opus_int init = 0, cnt = 0;                              \
+    static oac_int init = 0, cnt = 0;                              \
     static FILE **fp;                                               \
     if (init == 0) {                                                \
         init = 1;                                                   \
@@ -242,7 +242,7 @@ extern int silk_debug_store_count;
 
 /* Call this at the end of main() */
 #define SILK_DEBUG_STORE_CLOSE_FILES {                              \
-    opus_int i;                                                     \
+    oac_int i;                                                     \
     for( i = 0; i < silk_debug_store_count; i++ ) {                 \
         fclose( silk_debug_store_fp[ i ] );                         \
     }                                                               \
diff --git a/silk/dec_API.c b/silk/dec_API.c
index 973c49770..367ae099f 100644
--- a/silk/dec_API.c
+++ b/silk/dec_API.c
@@ -47,9 +47,9 @@ POSSIBILITY OF SUCH DAMAGE.
 typedef struct {
     silk_decoder_state          channel_state[ DECODER_NUM_CHANNELS ];
     stereo_dec_state                sStereo;
-    opus_int                         nChannelsAPI;
-    opus_int                         nChannelsInternal;
-    opus_int                         prev_decode_only_middle;
+    oac_int                         nChannelsAPI;
+    oac_int                         nChannelsInternal;
+    oac_int                         prev_decode_only_middle;
 #ifdef ENABLE_OSCE
     OSCEModel                        osce_model;
 #endif
@@ -61,10 +61,10 @@ typedef struct {
 
 
 
-opus_int silk_LoadOSCEModels(void *decState, const unsigned char *data, int len)
+oac_int silk_LoadOSCEModels(void *decState, const unsigned char *data, int len)
 {
 #ifdef ENABLE_OSCE
-    opus_int ret = SILK_NO_ERROR;
+    oac_int ret = SILK_NO_ERROR;
 
     ret = osce_load_models(&((silk_decoder *)decState)->osce_model, data, len);
     ((silk_decoder *)decState)->osce_model.loaded = (ret == 0);
@@ -77,11 +77,11 @@ opus_int silk_LoadOSCEModels(void *decState, const unsigned char *data, int len)
 #endif
 }
 
-opus_int silk_Get_Decoder_Size(                         /* O    Returns error code                              */
-    opus_int                        *decSizeBytes       /* O    Number of bytes in SILK decoder state           */
+oac_int silk_Get_Decoder_Size(                         /* O    Returns error code                              */
+    oac_int                        *decSizeBytes       /* O    Number of bytes in SILK decoder state           */
 )
 {
-    opus_int ret = SILK_NO_ERROR;
+    oac_int ret = SILK_NO_ERROR;
 
     *decSizeBytes = sizeof( silk_decoder );
 
@@ -89,11 +89,11 @@ opus_int silk_Get_Decoder_Size(                         /* O    Returns error co
 }
 
 /* Reset decoder state */
-opus_int silk_ResetDecoder(                              /* O    Returns error code                              */
+oac_int silk_ResetDecoder(                              /* O    Returns error code                              */
     void                            *decState           /* I/O  State                                           */
 )
 {
-    opus_int n, ret = SILK_NO_ERROR;
+    oac_int n, ret = SILK_NO_ERROR;
     silk_decoder_state *channel_state = ((silk_decoder *)decState)->channel_state;
 
     for( n = 0; n < DECODER_NUM_CHANNELS; n++ ) {
@@ -107,11 +107,11 @@ opus_int silk_ResetDecoder(                              /* O    Returns error c
 }
 
 
-opus_int silk_InitDecoder(                              /* O    Returns error code                              */
+oac_int silk_InitDecoder(                              /* O    Returns error code                              */
     void                            *decState           /* I/O  State                                           */
 )
 {
-    opus_int n, ret = SILK_NO_ERROR;
+    oac_int n, ret = SILK_NO_ERROR;
     silk_decoder_state *channel_state = ((silk_decoder *)decState)->channel_state;
 #ifdef ENABLE_OSCE
     ((silk_decoder *)decState)->osce_model.loaded = 0;
@@ -132,33 +132,33 @@ opus_int silk_InitDecoder(                              /* O    Returns error co
 }
 
 /* Decode a frame */
-opus_int silk_Decode(                                   /* O    Returns error code                              */
+oac_int silk_Decode(                                   /* O    Returns error code                              */
     void*                           decState,           /* I/O  State                                           */
     silk_DecControlStruct*          decControl,         /* I/O  Control Structure                               */
-    opus_int                        lostFlag,           /* I    0: no loss, 1 loss, 2 decode fec                */
-    opus_int                        newPacketFlag,      /* I    Indicates first decoder call for this packet    */
+    oac_int                        lostFlag,           /* I    0: no loss, 1 loss, 2 decode fec                */
+    oac_int                        newPacketFlag,      /* I    Indicates first decoder call for this packet    */
     ec_dec                          *psRangeDec,        /* I/O  Compressor data structure                       */
-    opus_res                        *samplesOut,        /* O    Decoded output speech vector                    */
-    opus_int32                      *nSamplesOut,       /* O    Number of samples decoded                       */
+    oac_res                        *samplesOut,        /* O    Decoded output speech vector                    */
+    oac_int32                      *nSamplesOut,       /* O    Number of samples decoded                       */
 #ifdef ENABLE_DEEP_PLC
     LPCNetPLCState                  *lpcnet,
 #endif
     int                             arch                /* I    Run-time architecture                           */
 )
 {
-    opus_int   i, n, decode_only_middle = 0, ret = SILK_NO_ERROR;
-    opus_int32 nSamplesOutDec, LBRR_symbol;
-    opus_int16 *samplesOut1_tmp[ 2 ];
-    VARDECL( opus_int16, samplesOut1_tmp_storage1 );
-    VARDECL( opus_int16, samplesOut2_tmp );
-    opus_int32 MS_pred_Q13[ 2 ] = { 0 };
-    opus_int16 *resample_out_ptr;
+    oac_int   i, n, decode_only_middle = 0, ret = SILK_NO_ERROR;
+    oac_int32 nSamplesOutDec, LBRR_symbol;
+    oac_int16 *samplesOut1_tmp[ 2 ];
+    VARDECL( oac_int16, samplesOut1_tmp_storage1 );
+    VARDECL( oac_int16, samplesOut2_tmp );
+    oac_int32 MS_pred_Q13[ 2 ] = { 0 };
+    oac_int16 *resample_out_ptr;
     silk_decoder *psDec = ( silk_decoder * )decState;
     silk_decoder_state *channel_state = psDec->channel_state;
-    opus_int has_side;
-    opus_int stereo_to_mono;
+    oac_int has_side;
+    oac_int stereo_to_mono;
 #ifdef ENABLE_OSCE_BWE
-    VARDECL( opus_int16, resamp_buffer );
+    VARDECL( oac_int16, resamp_buffer );
 #endif
     SAVE_STACK;
 
@@ -183,7 +183,7 @@ opus_int silk_Decode(                                   /* O    Returns error co
 
     if( channel_state[ 0 ].nFramesDecoded == 0 ) {
         for( n = 0; n < decControl->nChannelsInternal; n++ ) {
-            opus_int fs_kHz_dec;
+            oac_int fs_kHz_dec;
             if( decControl->payloadSize_ms == 0 ) {
                 /* Assuming packet loss, use 10 ms */
                 channel_state[ n ].nFramesPerPacket = 1;
@@ -223,7 +223,7 @@ opus_int silk_Decode(                                   /* O    Returns error co
     psDec->nChannelsAPI      = decControl->nChannelsAPI;
     psDec->nChannelsInternal = decControl->nChannelsInternal;
 
-    if( decControl->API_sampleRate > (opus_int32)MAX_API_FS_KHZ * 1000 || decControl->API_sampleRate < 8000 ) {
+    if( decControl->API_sampleRate > (oac_int32)MAX_API_FS_KHZ * 1000 || decControl->API_sampleRate < 8000 ) {
         ret = SILK_DEC_INVALID_SAMPLING_FREQUENCY;
         RESTORE_STACK;
         return( ret );
@@ -258,8 +258,8 @@ opus_int silk_Decode(                                   /* O    Returns error co
             for( i = 0; i < channel_state[ 0 ].nFramesPerPacket; i++ ) {
                 for( n = 0; n < decControl->nChannelsInternal; n++ ) {
                     if( channel_state[ n ].LBRR_flags[ i ] ) {
-                        opus_int16 pulses[ MAX_FRAME_LENGTH ];
-                        opus_int condCoding;
+                        oac_int16 pulses[ MAX_FRAME_LENGTH ];
+                        oac_int condCoding;
 
                         if( decControl->nChannelsInternal == 2 && n == 0 ) {
                             silk_stereo_decode_pred( psRangeDec, MS_pred_Q13 );
@@ -317,7 +317,7 @@ opus_int silk_Decode(                                   /* O    Returns error co
        we can delay allocating the temp buffer until after the SILK peak stack
        usage. We need to use a < and not a <= because of the two extra samples. */
     ALLOC( samplesOut1_tmp_storage1, decControl->nChannelsInternal*(channel_state[ 0 ].frame_length + 2 ),
-           opus_int16 );
+           oac_int16 );
     samplesOut1_tmp[ 0 ] = samplesOut1_tmp_storage1;
     samplesOut1_tmp[ 1 ] = samplesOut1_tmp_storage1 + channel_state[ 0 ].frame_length + 2;
 
@@ -331,8 +331,8 @@ opus_int silk_Decode(                                   /* O    Returns error co
     /* Call decoder for one frame */
     for( n = 0; n < decControl->nChannelsInternal; n++ ) {
         if( n == 0 || has_side ) {
-            opus_int FrameIndex;
-            opus_int condCoding;
+            oac_int FrameIndex;
+            oac_int condCoding;
 
             FrameIndex = channel_state[ 0 ].nFramesDecoded - n;
             /* Use independent coding if no previous frame available */
@@ -361,7 +361,7 @@ opus_int silk_Decode(                                   /* O    Returns error co
 #endif
                 arch);
         } else {
-            silk_memset( &samplesOut1_tmp[ n ][ 2 ], 0, nSamplesOutDec * sizeof( opus_int16 ) );
+            silk_memset( &samplesOut1_tmp[ n ][ 2 ], 0, nSamplesOutDec * sizeof( oac_int16 ) );
         }
         channel_state[ n ].nFramesDecoded++;
     }
@@ -371,19 +371,19 @@ opus_int silk_Decode(                                   /* O    Returns error co
         silk_stereo_MS_to_LR( &psDec->sStereo, samplesOut1_tmp[ 0 ], samplesOut1_tmp[ 1 ], MS_pred_Q13, channel_state[ 0 ].fs_kHz, nSamplesOutDec );
     } else {
         /* Buffering */
-        silk_memcpy( samplesOut1_tmp[ 0 ], psDec->sStereo.sMid, 2 * sizeof( opus_int16 ) );
-        silk_memcpy( psDec->sStereo.sMid, &samplesOut1_tmp[ 0 ][ nSamplesOutDec ], 2 * sizeof( opus_int16 ) );
+        silk_memcpy( samplesOut1_tmp[ 0 ], psDec->sStereo.sMid, 2 * sizeof( oac_int16 ) );
+        silk_memcpy( psDec->sStereo.sMid, &samplesOut1_tmp[ 0 ][ nSamplesOutDec ], 2 * sizeof( oac_int16 ) );
     }
 
     /* Number of output samples */
     *nSamplesOut = silk_DIV32( nSamplesOutDec * decControl->API_sampleRate, silk_SMULBB( channel_state[ 0 ].fs_kHz, 1000 ) );
 
     /* Set up pointers to temp buffers */
-    ALLOC( samplesOut2_tmp, *nSamplesOut, opus_int16 );
+    ALLOC( samplesOut2_tmp, *nSamplesOut, oac_int16 );
     resample_out_ptr = samplesOut2_tmp;
 
 #ifdef ENABLE_OSCE_BWE
-    ALLOC(resamp_buffer, 3 * MAX_FRAME_LENGTH, opus_int16);
+    ALLOC(resamp_buffer, 3 * MAX_FRAME_LENGTH, oac_int16);
 #endif
 
     for( n = 0; n < silk_min( decControl->nChannelsAPI, decControl->nChannelsInternal ); n++ ) {
@@ -476,14 +476,14 @@ opus_int silk_Decode(                                   /* O    Returns error co
 
 #if 0
 /* Getting table of contents for a packet */
-opus_int silk_get_TOC(
-    const opus_uint8                *payload,           /* I    Payload data                                */
-    const opus_int                  nBytesIn,           /* I    Number of input bytes                       */
-    const opus_int                  nFramesPerPayload,  /* I    Number of SILK frames per payload           */
+oac_int silk_get_TOC(
+    const oac_uint8                *payload,           /* I    Payload data                                */
+    const oac_int                  nBytesIn,           /* I    Number of input bytes                       */
+    const oac_int                  nFramesPerPayload,  /* I    Number of SILK frames per payload           */
     silk_TOC_struct                 *Silk_TOC           /* O    Type of content                             */
 )
 {
-    opus_int i, flags, ret = SILK_NO_ERROR;
+    oac_int i, flags, ret = SILK_NO_ERROR;
 
     if( nBytesIn < 1 ) {
         return -1;
diff --git a/silk/decode_core.c b/silk/decode_core.c
index 9fe91cc68..e1c3b887c 100644
--- a/silk/decode_core.c
+++ b/silk/decode_core.c
@@ -38,32 +38,32 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_decode_core(
     silk_decoder_state          *psDec,                         /* I/O  Decoder state                               */
     silk_decoder_control        *psDecCtrl,                     /* I    Decoder control                             */
-    opus_int16                  xq[],                           /* O    Decoded speech                              */
-    const opus_int16            pulses[ MAX_FRAME_LENGTH ],     /* I    Pulse signal                                */
+    oac_int16                  xq[],                           /* O    Decoded speech                              */
+    const oac_int16            pulses[ MAX_FRAME_LENGTH ],     /* I    Pulse signal                                */
     int                         arch                            /* I    Run-time architecture                       */
 )
 {
-    opus_int   i, k, lag = 0, start_idx, sLTP_buf_idx, NLSF_interpolation_flag, signalType;
-    opus_int16 *A_Q12, *B_Q14, *pxq, A_Q12_tmp[ MAX_LPC_ORDER ];
-    VARDECL( opus_int16, sLTP );
-    VARDECL( opus_int32, sLTP_Q15 );
-    opus_int32 LTP_pred_Q13, LPC_pred_Q10, Gain_Q10, inv_gain_Q31, gain_adj_Q16, rand_seed, offset_Q10;
-    opus_int32 *pred_lag_ptr, *pexc_Q14, *pres_Q14;
-    VARDECL( opus_int32, res_Q14 );
-    VARDECL( opus_int32, sLPC_Q14 );
+    oac_int   i, k, lag = 0, start_idx, sLTP_buf_idx, NLSF_interpolation_flag, signalType;
+    oac_int16 *A_Q12, *B_Q14, *pxq, A_Q12_tmp[ MAX_LPC_ORDER ];
+    VARDECL( oac_int16, sLTP );
+    VARDECL( oac_int32, sLTP_Q15 );
+    oac_int32 LTP_pred_Q13, LPC_pred_Q10, Gain_Q10, inv_gain_Q31, gain_adj_Q16, rand_seed, offset_Q10;
+    oac_int32 *pred_lag_ptr, *pexc_Q14, *pres_Q14;
+    VARDECL( oac_int32, res_Q14 );
+    VARDECL( oac_int32, sLPC_Q14 );
     SAVE_STACK;
 
     silk_assert( psDec->prev_gain_Q16 != 0 );
 
-    ALLOC( sLTP, psDec->ltp_mem_length, opus_int16 );
-    ALLOC( sLTP_Q15, psDec->ltp_mem_length + psDec->frame_length, opus_int32 );
-    ALLOC( res_Q14, psDec->subfr_length, opus_int32 );
+    ALLOC( sLTP, psDec->ltp_mem_length, oac_int16 );
+    ALLOC( sLTP_Q15, psDec->ltp_mem_length + psDec->frame_length, oac_int32 );
+    ALLOC( res_Q14, psDec->subfr_length, oac_int32 );
     /* Work around a clang bug (verified with clang 6.0 through clang 20.1.0) that causes the last
        memset to be flagged as an invalid read by valgrind (not caught by asan). */
 #if defined(__clang__) && defined(VAR_ARRAYS)
-    ALLOC( sLPC_Q14, MAX_SUB_FRAME_LENGTH + MAX_LPC_ORDER, opus_int32 );
+    ALLOC( sLPC_Q14, MAX_SUB_FRAME_LENGTH + MAX_LPC_ORDER, oac_int32 );
 #else
-    ALLOC( sLPC_Q14, psDec->subfr_length + MAX_LPC_ORDER, opus_int32 );
+    ALLOC( sLPC_Q14, psDec->subfr_length + MAX_LPC_ORDER, oac_int32 );
 #endif
 
     offset_Q10 = silk_Quantization_Offsets_Q10[ psDec->indices.signalType >> 1 ][ psDec->indices.quantOffsetType ];
@@ -78,7 +78,7 @@ void silk_decode_core(
     rand_seed = psDec->indices.Seed;
     for( i = 0; i < psDec->frame_length; i++ ) {
         rand_seed = silk_RAND( rand_seed );
-        psDec->exc_Q14[ i ] = silk_LSHIFT( (opus_int32)pulses[ i ], 14 );
+        psDec->exc_Q14[ i ] = silk_LSHIFT( (oac_int32)pulses[ i ], 14 );
         if( psDec->exc_Q14[ i ] > 0 ) {
             psDec->exc_Q14[ i ] -= QUANT_LEVEL_ADJUST_Q10 << 4;
         } else
@@ -94,7 +94,7 @@ void silk_decode_core(
     }
 
     /* Copy LPC state */
-    silk_memcpy( sLPC_Q14, psDec->sLPC_Q14_buf, MAX_LPC_ORDER * sizeof( opus_int32 ) );
+    silk_memcpy( sLPC_Q14, psDec->sLPC_Q14_buf, MAX_LPC_ORDER * sizeof( oac_int32 ) );
 
     pexc_Q14 = psDec->exc_Q14;
     pxq      = xq;
@@ -105,7 +105,7 @@ void silk_decode_core(
         A_Q12 = psDecCtrl->PredCoef_Q12[ k >> 1 ];
 
         /* Preload LPC coefficients to array on stack. Gives small performance gain */
-        silk_memcpy( A_Q12_tmp, A_Q12, psDec->LPC_order * sizeof( opus_int16 ) );
+        silk_memcpy( A_Q12_tmp, A_Q12, psDec->LPC_order * sizeof( oac_int16 ) );
         B_Q14        = &psDecCtrl->LTPCoef_Q14[ k * LTP_ORDER ];
         signalType   = psDec->indices.signalType;
 
@@ -121,7 +121,7 @@ void silk_decode_core(
                 sLPC_Q14[ i ] = silk_SMULWW( gain_adj_Q16, sLPC_Q14[ i ] );
             }
         } else {
-            gain_adj_Q16 = (opus_int32)1 << 16;
+            gain_adj_Q16 = (oac_int32)1 << 16;
         }
 
         /* Save inv_gain */
@@ -132,7 +132,7 @@ void silk_decode_core(
         if( psDec->lossCnt && psDec->prevSignalType == TYPE_VOICED &&
             psDec->indices.signalType != TYPE_VOICED && k < MAX_NB_SUBFR/2 ) {
 
-            silk_memset( B_Q14, 0, LTP_ORDER * sizeof( opus_int16 ) );
+            silk_memset( B_Q14, 0, LTP_ORDER * sizeof( oac_int16 ) );
             B_Q14[ LTP_ORDER/2 ] = SILK_FIX_CONST( 0.25, 14 );
 
             signalType = TYPE_VOICED;
@@ -150,7 +150,7 @@ void silk_decode_core(
                 celt_assert( start_idx > 0 );
 
                 if( k == 2 ) {
-                    silk_memcpy( &psDec->outBuf[ psDec->ltp_mem_length ], xq, 2 * psDec->subfr_length * sizeof( opus_int16 ) );
+                    silk_memcpy( &psDec->outBuf[ psDec->ltp_mem_length ], xq, 2 * psDec->subfr_length * sizeof( oac_int16 ) );
                 }
 
                 silk_LPC_analysis_filter( &sLTP[ start_idx ], &psDec->outBuf[ start_idx + k * psDec->subfr_length ],
@@ -166,7 +166,7 @@ void silk_decode_core(
                 }
             } else {
                 /* Update LTP state when Gain changes */
-                if( gain_adj_Q16 != (opus_int32)1 << 16 ) {
+                if( gain_adj_Q16 != (oac_int32)1 << 16 ) {
                     for( i = 0; i < lag + LTP_ORDER/2; i++ ) {
                         sLTP_Q15[ sLTP_buf_idx - i - 1 ] = silk_SMULWW( gain_adj_Q16, sLTP_Q15[ sLTP_buf_idx - i - 1 ] );
                     }
@@ -228,16 +228,16 @@ void silk_decode_core(
             sLPC_Q14[ MAX_LPC_ORDER + i ] = silk_ADD_SAT32( pres_Q14[ i ], silk_LSHIFT_SAT32( LPC_pred_Q10, 4 ) );
 
             /* Scale with gain */
-            pxq[ i ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( sLPC_Q14[ MAX_LPC_ORDER + i ], Gain_Q10 ), 8 ) );
+            pxq[ i ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( sLPC_Q14[ MAX_LPC_ORDER + i ], Gain_Q10 ), 8 ) );
         }
 
         /* Update LPC filter state */
-        silk_memcpy( sLPC_Q14, &sLPC_Q14[ psDec->subfr_length ], MAX_LPC_ORDER * sizeof( opus_int32 ) );
+        silk_memcpy( sLPC_Q14, &sLPC_Q14[ psDec->subfr_length ], MAX_LPC_ORDER * sizeof( oac_int32 ) );
         pexc_Q14 += psDec->subfr_length;
         pxq      += psDec->subfr_length;
     }
 
     /* Save LPC state */
-    silk_memcpy( psDec->sLPC_Q14_buf, sLPC_Q14, MAX_LPC_ORDER * sizeof( opus_int32 ) );
+    silk_memcpy( psDec->sLPC_Q14_buf, sLPC_Q14, MAX_LPC_ORDER * sizeof( oac_int32 ) );
     RESTORE_STACK;
 }
diff --git a/silk/decode_frame.c b/silk/decode_frame.c
index 9bc4ca2b0..07588aedf 100644
--- a/silk/decode_frame.c
+++ b/silk/decode_frame.c
@@ -40,13 +40,13 @@ POSSIBILITY OF SUCH DAMAGE.
 /****************/
 /* Decode frame */
 /****************/
-opus_int silk_decode_frame(
+oac_int silk_decode_frame(
     silk_decoder_state          *psDec,                         /* I/O  Pointer to Silk decoder state               */
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
-    opus_int16                  pOut[],                         /* O    Pointer to output speech frame              */
-    opus_int32                  *pN,                            /* O    Pointer to size of output frame             */
-    opus_int                    lostFlag,                       /* I    0: no loss, 1 loss, 2 decode fec            */
-    opus_int                    condCoding,                     /* I    The type of conditional coding to use       */
+    oac_int16                  pOut[],                         /* O    Pointer to output speech frame              */
+    oac_int32                  *pN,                            /* O    Pointer to size of output frame             */
+    oac_int                    lostFlag,                       /* I    0: no loss, 1 loss, 2 decode fec            */
+    oac_int                    condCoding,                     /* I    The type of conditional coding to use       */
 #ifdef ENABLE_DEEP_PLC
     LPCNetPLCState              *lpcnet,
 #endif
@@ -57,7 +57,7 @@ opus_int silk_decode_frame(
 )
 {
     VARDECL( silk_decoder_control, psDecCtrl );
-    opus_int         L, mv_len, ret = 0;
+    oac_int         L, mv_len, ret = 0;
     SAVE_STACK;
 
     L = psDec->frame_length;
@@ -70,13 +70,13 @@ opus_int silk_decode_frame(
     if(   lostFlag == FLAG_DECODE_NORMAL ||
         ( lostFlag == FLAG_DECODE_LBRR && psDec->LBRR_flags[ psDec->nFramesDecoded ] == 1 ) )
     {
-        VARDECL( opus_int16, pulses );
+        VARDECL( oac_int16, pulses );
 #ifdef ENABLE_OSCE
-        opus_int32  ec_start;
+        oac_int32  ec_start;
         ec_start = ec_tell(psRangeDec);
 #endif
         ALLOC( pulses, (L + SHELL_CODEC_FRAME_LENGTH - 1) &
-                       ~(SHELL_CODEC_FRAME_LENGTH - 1), opus_int16 );
+                       ~(SHELL_CODEC_FRAME_LENGTH - 1), oac_int16 );
         /*********************************************/
         /* Decode quantization indices of side info  */
         /*********************************************/
@@ -103,8 +103,8 @@ opus_int silk_decode_frame(
         /*************************/
         celt_assert( psDec->ltp_mem_length >= psDec->frame_length );
         mv_len = psDec->ltp_mem_length - psDec->frame_length;
-        silk_memmove( psDec->outBuf, &psDec->outBuf[ psDec->frame_length ], mv_len * sizeof(opus_int16) );
-        silk_memcpy( &psDec->outBuf[ mv_len ], pOut, psDec->frame_length * sizeof( opus_int16 ) );
+        silk_memmove( psDec->outBuf, &psDec->outBuf[ psDec->frame_length ], mv_len * sizeof(oac_int16) );
+        silk_memcpy( &psDec->outBuf[ mv_len ], pOut, psDec->frame_length * sizeof( oac_int16 ) );
 
 #ifdef ENABLE_OSCE
         /********************************************************/
@@ -144,8 +144,8 @@ opus_int silk_decode_frame(
         /*************************/
         celt_assert( psDec->ltp_mem_length >= psDec->frame_length );
         mv_len = psDec->ltp_mem_length - psDec->frame_length;
-        silk_memmove( psDec->outBuf, &psDec->outBuf[ psDec->frame_length ], mv_len * sizeof(opus_int16) );
-        silk_memcpy( &psDec->outBuf[ mv_len ], pOut, psDec->frame_length * sizeof( opus_int16 ) );
+        silk_memmove( psDec->outBuf, &psDec->outBuf[ psDec->frame_length ], mv_len * sizeof(oac_int16) );
+        silk_memcpy( &psDec->outBuf[ mv_len ], pOut, psDec->frame_length * sizeof( oac_int16 ) );
     }
 
     /************************************************/
diff --git a/silk/decode_indices.c b/silk/decode_indices.c
index 268e4276b..1b6154fbf 100644
--- a/silk/decode_indices.c
+++ b/silk/decode_indices.c
@@ -35,15 +35,15 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_decode_indices(
     silk_decoder_state          *psDec,                         /* I/O  State                                       */
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
-    opus_int                    FrameIndex,                     /* I    Frame number                                */
-    opus_int                    decode_LBRR,                    /* I    Flag indicating LBRR data is being decoded  */
-    opus_int                    condCoding                      /* I    The type of conditional coding to use       */
+    oac_int                    FrameIndex,                     /* I    Frame number                                */
+    oac_int                    decode_LBRR,                    /* I    Flag indicating LBRR data is being decoded  */
+    oac_int                    condCoding                      /* I    The type of conditional coding to use       */
 )
 {
-    opus_int   i, k, Ix;
-    opus_int   decode_absolute_lagIndex, delta_lagIndex;
-    opus_int16 ec_ix[ MAX_LPC_ORDER ];
-    opus_uint8 pred_Q8[ MAX_LPC_ORDER ];
+    oac_int   i, k, Ix;
+    oac_int   decode_absolute_lagIndex, delta_lagIndex;
+    oac_int16 ec_ix[ MAX_LPC_ORDER ];
+    oac_uint8 pred_Q8[ MAX_LPC_ORDER ];
 
     /*******************************************/
     /* Decode signal type and quantizer offset */
@@ -53,8 +53,8 @@ void silk_decode_indices(
     } else {
         Ix = ec_dec_icdf( psRangeDec, silk_type_offset_no_VAD_iCDF, 8 );
     }
-    psDec->indices.signalType      = (opus_int8)silk_RSHIFT( Ix, 1 );
-    psDec->indices.quantOffsetType = (opus_int8)( Ix & 1 );
+    psDec->indices.signalType      = (oac_int8)silk_RSHIFT( Ix, 1 );
+    psDec->indices.quantOffsetType = (oac_int8)( Ix & 1 );
 
     /****************/
     /* Decode gains */
@@ -62,22 +62,22 @@ void silk_decode_indices(
     /* First subframe */
     if( condCoding == CODE_CONDITIONALLY ) {
         /* Conditional coding */
-        psDec->indices.GainsIndices[ 0 ] = (opus_int8)ec_dec_icdf( psRangeDec, silk_delta_gain_iCDF, 8 );
+        psDec->indices.GainsIndices[ 0 ] = (oac_int8)ec_dec_icdf( psRangeDec, silk_delta_gain_iCDF, 8 );
     } else {
         /* Independent coding, in two stages: MSB bits followed by 3 LSBs */
-        psDec->indices.GainsIndices[ 0 ]  = (opus_int8)silk_LSHIFT( ec_dec_icdf( psRangeDec, silk_gain_iCDF[ psDec->indices.signalType ], 8 ), 3 );
-        psDec->indices.GainsIndices[ 0 ] += (opus_int8)ec_dec_icdf( psRangeDec, silk_uniform8_iCDF, 8 );
+        psDec->indices.GainsIndices[ 0 ]  = (oac_int8)silk_LSHIFT( ec_dec_icdf( psRangeDec, silk_gain_iCDF[ psDec->indices.signalType ], 8 ), 3 );
+        psDec->indices.GainsIndices[ 0 ] += (oac_int8)ec_dec_icdf( psRangeDec, silk_uniform8_iCDF, 8 );
     }
 
     /* Remaining subframes */
     for( i = 1; i < psDec->nb_subfr; i++ ) {
-        psDec->indices.GainsIndices[ i ] = (opus_int8)ec_dec_icdf( psRangeDec, silk_delta_gain_iCDF, 8 );
+        psDec->indices.GainsIndices[ i ] = (oac_int8)ec_dec_icdf( psRangeDec, silk_delta_gain_iCDF, 8 );
     }
 
     /**********************/
     /* Decode LSF Indices */
     /**********************/
-    psDec->indices.NLSFIndices[ 0 ] = (opus_int8)ec_dec_icdf( psRangeDec, &psDec->psNLSF_CB->CB1_iCDF[ ( psDec->indices.signalType >> 1 ) * psDec->psNLSF_CB->nVectors ], 8 );
+    psDec->indices.NLSFIndices[ 0 ] = (oac_int8)ec_dec_icdf( psRangeDec, &psDec->psNLSF_CB->CB1_iCDF[ ( psDec->indices.signalType >> 1 ) * psDec->psNLSF_CB->nVectors ], 8 );
     silk_NLSF_unpack( ec_ix, pred_Q8, psDec->psNLSF_CB, psDec->indices.NLSFIndices[ 0 ] );
     celt_assert( psDec->psNLSF_CB->order == psDec->LPC_order );
     for( i = 0; i < psDec->psNLSF_CB->order; i++ ) {
@@ -87,12 +87,12 @@ void silk_decode_indices(
         } else if( Ix == 2 * NLSF_QUANT_MAX_AMPLITUDE ) {
             Ix += ec_dec_icdf( psRangeDec, silk_NLSF_EXT_iCDF, 8 );
         }
-        psDec->indices.NLSFIndices[ i+1 ] = (opus_int8)( Ix - NLSF_QUANT_MAX_AMPLITUDE );
+        psDec->indices.NLSFIndices[ i+1 ] = (oac_int8)( Ix - NLSF_QUANT_MAX_AMPLITUDE );
     }
 
     /* Decode LSF interpolation factor */
     if( psDec->nb_subfr == MAX_NB_SUBFR ) {
-        psDec->indices.NLSFInterpCoef_Q2 = (opus_int8)ec_dec_icdf( psRangeDec, silk_NLSF_interpolation_factor_iCDF, 8 );
+        psDec->indices.NLSFInterpCoef_Q2 = (oac_int8)ec_dec_icdf( psRangeDec, silk_NLSF_interpolation_factor_iCDF, 8 );
     } else {
         psDec->indices.NLSFInterpCoef_Q2 = 4;
     }
@@ -106,38 +106,38 @@ void silk_decode_indices(
         decode_absolute_lagIndex = 1;
         if( condCoding == CODE_CONDITIONALLY && psDec->ec_prevSignalType == TYPE_VOICED ) {
             /* Decode Delta index */
-            delta_lagIndex = (opus_int16)ec_dec_icdf( psRangeDec, silk_pitch_delta_iCDF, 8 );
+            delta_lagIndex = (oac_int16)ec_dec_icdf( psRangeDec, silk_pitch_delta_iCDF, 8 );
             if( delta_lagIndex > 0 ) {
                 delta_lagIndex = delta_lagIndex - 9;
-                psDec->indices.lagIndex = (opus_int16)( psDec->ec_prevLagIndex + delta_lagIndex );
+                psDec->indices.lagIndex = (oac_int16)( psDec->ec_prevLagIndex + delta_lagIndex );
                 decode_absolute_lagIndex = 0;
             }
         }
         if( decode_absolute_lagIndex ) {
             /* Absolute decoding */
-            psDec->indices.lagIndex  = (opus_int16)ec_dec_icdf( psRangeDec, silk_pitch_lag_iCDF, 8 ) * silk_RSHIFT( psDec->fs_kHz, 1 );
-            psDec->indices.lagIndex += (opus_int16)ec_dec_icdf( psRangeDec, psDec->pitch_lag_low_bits_iCDF, 8 );
+            psDec->indices.lagIndex  = (oac_int16)ec_dec_icdf( psRangeDec, silk_pitch_lag_iCDF, 8 ) * silk_RSHIFT( psDec->fs_kHz, 1 );
+            psDec->indices.lagIndex += (oac_int16)ec_dec_icdf( psRangeDec, psDec->pitch_lag_low_bits_iCDF, 8 );
         }
         psDec->ec_prevLagIndex = psDec->indices.lagIndex;
 
         /* Get contour index */
-        psDec->indices.contourIndex = (opus_int8)ec_dec_icdf( psRangeDec, psDec->pitch_contour_iCDF, 8 );
+        psDec->indices.contourIndex = (oac_int8)ec_dec_icdf( psRangeDec, psDec->pitch_contour_iCDF, 8 );
 
         /********************/
         /* Decode LTP gains */
         /********************/
         /* Decode PERIndex value */
-        psDec->indices.PERIndex = (opus_int8)ec_dec_icdf( psRangeDec, silk_LTP_per_index_iCDF, 8 );
+        psDec->indices.PERIndex = (oac_int8)ec_dec_icdf( psRangeDec, silk_LTP_per_index_iCDF, 8 );
 
         for( k = 0; k < psDec->nb_subfr; k++ ) {
-            psDec->indices.LTPIndex[ k ] = (opus_int8)ec_dec_icdf( psRangeDec, silk_LTP_gain_iCDF_ptrs[ psDec->indices.PERIndex ], 8 );
+            psDec->indices.LTPIndex[ k ] = (oac_int8)ec_dec_icdf( psRangeDec, silk_LTP_gain_iCDF_ptrs[ psDec->indices.PERIndex ], 8 );
         }
 
         /**********************/
         /* Decode LTP scaling */
         /**********************/
         if( condCoding == CODE_INDEPENDENTLY ) {
-            psDec->indices.LTP_scaleIndex = (opus_int8)ec_dec_icdf( psRangeDec, silk_LTPscale_iCDF, 8 );
+            psDec->indices.LTP_scaleIndex = (oac_int8)ec_dec_icdf( psRangeDec, silk_LTPscale_iCDF, 8 );
         } else {
             psDec->indices.LTP_scaleIndex = 0;
         }
@@ -147,5 +147,5 @@ void silk_decode_indices(
     /***************/
     /* Decode seed */
     /***************/
-    psDec->indices.Seed = (opus_int8)ec_dec_icdf( psRangeDec, silk_uniform4_iCDF, 8 );
+    psDec->indices.Seed = (oac_int8)ec_dec_icdf( psRangeDec, silk_uniform4_iCDF, 8 );
 }
diff --git a/silk/decode_parameters.c b/silk/decode_parameters.c
index a56a40985..73638c35f 100644
--- a/silk/decode_parameters.c
+++ b/silk/decode_parameters.c
@@ -35,12 +35,12 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_decode_parameters(
     silk_decoder_state          *psDec,                         /* I/O  State                                       */
     silk_decoder_control        *psDecCtrl,                     /* I/O  Decoder control                             */
-    opus_int                    condCoding                      /* I    The type of conditional coding to use       */
+    oac_int                    condCoding                      /* I    The type of conditional coding to use       */
 )
 {
-    opus_int   i, k, Ix;
-    opus_int16 pNLSF_Q15[ MAX_LPC_ORDER ], pNLSF0_Q15[ MAX_LPC_ORDER ];
-    const opus_int8 *cbk_ptr_Q7;
+    oac_int   i, k, Ix;
+    oac_int16 pNLSF_Q15[ MAX_LPC_ORDER ], pNLSF0_Q15[ MAX_LPC_ORDER ];
+    const oac_int8 *cbk_ptr_Q7;
 
     /* Dequant Gains */
     silk_gains_dequant( psDecCtrl->Gains_Q16, psDec->indices.GainsIndices,
@@ -72,10 +72,10 @@ void silk_decode_parameters(
         silk_NLSF2A( psDecCtrl->PredCoef_Q12[ 0 ], pNLSF0_Q15, psDec->LPC_order, psDec->arch );
     } else {
         /* Copy LPC coefficients for first half from second half */
-        silk_memcpy( psDecCtrl->PredCoef_Q12[ 0 ], psDecCtrl->PredCoef_Q12[ 1 ], psDec->LPC_order * sizeof( opus_int16 ) );
+        silk_memcpy( psDecCtrl->PredCoef_Q12[ 0 ], psDecCtrl->PredCoef_Q12[ 1 ], psDec->LPC_order * sizeof( oac_int16 ) );
     }
 
-    silk_memcpy( psDec->prevNLSF_Q15, pNLSF_Q15, psDec->LPC_order * sizeof( opus_int16 ) );
+    silk_memcpy( psDec->prevNLSF_Q15, pNLSF_Q15, psDec->LPC_order * sizeof( oac_int16 ) );
 
     /* After a packet loss do BWE of LPC coefs */
     if( psDec->lossCnt ) {
@@ -107,8 +107,8 @@ void silk_decode_parameters(
         Ix = psDec->indices.LTP_scaleIndex;
         psDecCtrl->LTP_scale_Q14 = silk_LTPScales_table_Q14[ Ix ];
     } else {
-        silk_memset( psDecCtrl->pitchL,      0,             psDec->nb_subfr * sizeof( opus_int   ) );
-        silk_memset( psDecCtrl->LTPCoef_Q14, 0, LTP_ORDER * psDec->nb_subfr * sizeof( opus_int16 ) );
+        silk_memset( psDecCtrl->pitchL,      0,             psDec->nb_subfr * sizeof( oac_int   ) );
+        silk_memset( psDecCtrl->LTPCoef_Q14, 0, LTP_ORDER * psDec->nb_subfr * sizeof( oac_int16 ) );
         psDec->indices.PERIndex  = 0;
         psDecCtrl->LTP_scale_Q14 = 0;
     }
diff --git a/silk/decode_pitch.c b/silk/decode_pitch.c
index fd1b6bf55..8918095e9 100644
--- a/silk/decode_pitch.c
+++ b/silk/decode_pitch.c
@@ -36,15 +36,15 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "pitch_est_defines.h"
 
 void silk_decode_pitch(
-    opus_int16                  lagIndex,           /* I                                                                */
-    opus_int8                   contourIndex,       /* O                                                                */
-    opus_int                    pitch_lags[],       /* O    4 pitch values                                              */
-    const opus_int              Fs_kHz,             /* I    sampling frequency (kHz)                                    */
-    const opus_int              nb_subfr            /* I    number of sub frames                                        */
+    oac_int16                  lagIndex,           /* I                                                                */
+    oac_int8                   contourIndex,       /* O                                                                */
+    oac_int                    pitch_lags[],       /* O    4 pitch values                                              */
+    const oac_int              Fs_kHz,             /* I    sampling frequency (kHz)                                    */
+    const oac_int              nb_subfr            /* I    number of sub frames                                        */
 )
 {
-    opus_int   lag, k, min_lag, max_lag, cbk_size;
-    const opus_int8 *Lag_CB_ptr;
+    oac_int   lag, k, min_lag, max_lag, cbk_size;
+    const oac_int8 *Lag_CB_ptr;
 
     if( Fs_kHz == 8 ) {
         if( nb_subfr == PE_MAX_NB_SUBFR ) {
diff --git a/silk/decode_pulses.c b/silk/decode_pulses.c
index a56d2d307..dd8394e3c 100644
--- a/silk/decode_pulses.c
+++ b/silk/decode_pulses.c
@@ -36,16 +36,16 @@ POSSIBILITY OF SUCH DAMAGE.
 /*********************************************/
 void silk_decode_pulses(
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
-    opus_int16                  pulses[],                       /* O    Excitation signal                           */
-    const opus_int              signalType,                     /* I    Sigtype                                     */
-    const opus_int              quantOffsetType,                /* I    quantOffsetType                             */
-    const opus_int              frame_length                    /* I    Frame length                                */
+    oac_int16                  pulses[],                       /* O    Excitation signal                           */
+    const oac_int              signalType,                     /* I    Sigtype                                     */
+    const oac_int              quantOffsetType,                /* I    quantOffsetType                             */
+    const oac_int              frame_length                    /* I    Frame length                                */
 )
 {
-    opus_int   i, j, k, iter, abs_q, nLS, RateLevelIndex;
-    opus_int   sum_pulses[ MAX_NB_SHELL_BLOCKS ], nLshifts[ MAX_NB_SHELL_BLOCKS ];
-    opus_int16 *pulses_ptr;
-    const opus_uint8 *cdf_ptr;
+    oac_int   i, j, k, iter, abs_q, nLS, RateLevelIndex;
+    oac_int   sum_pulses[ MAX_NB_SHELL_BLOCKS ], nLshifts[ MAX_NB_SHELL_BLOCKS ];
+    oac_int16 *pulses_ptr;
+    const oac_uint8 *cdf_ptr;
 
     /*********************/
     /* Decode rate level */
diff --git a/silk/decoder_set_fs.c b/silk/decoder_set_fs.c
index c6136c775..12c5f06a5 100644
--- a/silk/decoder_set_fs.c
+++ b/silk/decoder_set_fs.c
@@ -32,13 +32,13 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "main.h"
 
 /* Set decoder sampling rate */
-opus_int silk_decoder_set_fs(
+oac_int silk_decoder_set_fs(
     silk_decoder_state          *psDec,                         /* I/O  Decoder state pointer                       */
-    opus_int                    fs_kHz,                         /* I    Sampling frequency (kHz)                    */
-    opus_int32                  fs_API_Hz                       /* I    API Sampling frequency (Hz)                 */
+    oac_int                    fs_kHz,                         /* I    Sampling frequency (kHz)                    */
+    oac_int32                  fs_API_Hz                       /* I    API Sampling frequency (Hz)                 */
 )
 {
-    opus_int frame_length, ret = 0;
+    oac_int frame_length, ret = 0;
 
     celt_assert( fs_kHz == 8 || fs_kHz == 12 || fs_kHz == 16 );
     celt_assert( psDec->nb_subfr == MAX_NB_SUBFR || psDec->nb_subfr == MAX_NB_SUBFR/2 );
diff --git a/silk/enc_API.c b/silk/enc_API.c
index d0fee4d46..a9520f078 100644
--- a/silk/enc_API.c
+++ b/silk/enc_API.c
@@ -48,7 +48,7 @@ POSSIBILITY OF SUCH DAMAGE.
 /***************************************/
 /* Read control structure from encoder */
 /***************************************/
-static opus_int silk_QueryEncoder(                      /* O    Returns error code                              */
+static oac_int silk_QueryEncoder(                      /* O    Returns error code                              */
     const void                      *encState,          /* I    State                                           */
     silk_EncControlStruct           *encStatus          /* O    Encoder Status                                  */
 );
@@ -57,12 +57,12 @@ static opus_int silk_QueryEncoder(                      /* O    Returns error co
 /* Encoder functions                    */
 /****************************************/
 
-opus_int silk_Get_Encoder_Size(                         /* O    Returns error code                              */
-    opus_int                        *encSizeBytes,      /* O    Number of bytes in SILK encoder state           */
-    opus_int                         channels           /* I    Number of channels                              */
+oac_int silk_Get_Encoder_Size(                         /* O    Returns error code                              */
+    oac_int                        *encSizeBytes,      /* O    Number of bytes in SILK encoder state           */
+    oac_int                         channels           /* I    Number of channels                              */
 )
 {
-    opus_int ret = SILK_NO_ERROR;
+    oac_int ret = SILK_NO_ERROR;
 
     *encSizeBytes = sizeof( silk_encoder );
     /* Skip second encoder state for mono. */
@@ -76,7 +76,7 @@ opus_int silk_Get_Encoder_Size(                         /* O    Returns error co
 /*************************/
 /* Init or Reset encoder */
 /*************************/
-opus_int silk_InitEncoder(                              /* O    Returns error code                              */
+oac_int silk_InitEncoder(                              /* O    Returns error code                              */
     void                            *encState,          /* I/O  State                                           */
     int                              channels,          /* I    Number of channels                              */
     int                              arch,              /* I    Run-time architecture                           */
@@ -84,7 +84,7 @@ opus_int silk_InitEncoder(                              /* O    Returns error co
 )
 {
     silk_encoder *psEnc;
-    opus_int n, ret = SILK_NO_ERROR;
+    oac_int n, ret = SILK_NO_ERROR;
 
     psEnc = (silk_encoder *)encState;
 
@@ -110,12 +110,12 @@ opus_int silk_InitEncoder(                              /* O    Returns error co
 /***************************************/
 /* Read control structure from encoder */
 /***************************************/
-static opus_int silk_QueryEncoder(                      /* O    Returns error code                              */
+static oac_int silk_QueryEncoder(                      /* O    Returns error code                              */
     const void                      *encState,          /* I    State                                           */
     silk_EncControlStruct           *encStatus          /* O    Encoder Status                                  */
 )
 {
-    opus_int ret = SILK_NO_ERROR;
+    oac_int ret = SILK_NO_ERROR;
     silk_encoder_state_Fxx *state_Fxx;
     silk_encoder *psEnc = (silk_encoder *)encState;
 
@@ -147,25 +147,25 @@ static opus_int silk_QueryEncoder(                      /* O    Returns error co
 /**************************/
 /* Note: if prefillFlag is set, the input must contain 10 ms of audio, irrespective of what                     */
 /* encControl->payloadSize_ms is set to                                                                         */
-opus_int silk_Encode(                                   /* O    Returns error code                              */
+oac_int silk_Encode(                                   /* O    Returns error code                              */
     void                            *encState,          /* I/O  State                                           */
     silk_EncControlStruct           *encControl,        /* I    Control status                                  */
-    const opus_res                  *samplesIn,         /* I    Speech sample input vector                      */
-    opus_int                        nSamplesIn,         /* I    Number of samples in input vector               */
+    const oac_res                  *samplesIn,         /* I    Speech sample input vector                      */
+    oac_int                        nSamplesIn,         /* I    Number of samples in input vector               */
     ec_enc                          *psRangeEnc,        /* I/O  Compressor data structure                       */
-    opus_int32                      *nBytesOut,         /* I/O  Number of bytes in payload (input: Max bytes)   */
-    const opus_int                  prefillFlag,        /* I    Flag to indicate prefilling buffers no coding   */
-    opus_int                        activity            /* I    Decision of Opus voice activity detector        */
+    oac_int32                      *nBytesOut,         /* I/O  Number of bytes in payload (input: Max bytes)   */
+    const oac_int                  prefillFlag,        /* I    Flag to indicate prefilling buffers no coding   */
+    oac_int                        activity            /* I    Decision of Oac voice activity detector        */
 )
 {
-    opus_int   n, i, nBits, flags, tmp_payloadSize_ms = 0, tmp_complexity = 0, ret = 0;
-    opus_int   nSamplesToBuffer, nSamplesToBufferMax, nBlocksOf10ms;
-    opus_int   nSamplesFromInput = 0, nSamplesFromInputMax;
-    opus_int   speech_act_thr_for_switch_Q8;
-    opus_int32 TargetRate_bps, MStargetRates_bps[ 2 ], channelRate_bps, LBRR_symbol, sum;
+    oac_int   n, i, nBits, flags, tmp_payloadSize_ms = 0, tmp_complexity = 0, ret = 0;
+    oac_int   nSamplesToBuffer, nSamplesToBufferMax, nBlocksOf10ms;
+    oac_int   nSamplesFromInput = 0, nSamplesFromInputMax;
+    oac_int   speech_act_thr_for_switch_Q8;
+    oac_int32 TargetRate_bps, MStargetRates_bps[ 2 ], channelRate_bps, LBRR_symbol, sum;
     silk_encoder *psEnc = ( silk_encoder * )encState;
-    VARDECL( opus_int16, buf );
-    opus_int transition, curr_block, tot_blocks;
+    VARDECL( oac_int16, buf );
+    oac_int transition, curr_block, tot_blocks;
     SAVE_STACK;
 
     celt_assert( encControl->nChannelsAPI >= encControl->nChannelsInternal && encControl->nChannelsAPI >= psEnc->nChannelsInternal );
@@ -250,7 +250,7 @@ opus_int silk_Encode(                                   /* O    Returns error co
             return SILK_ENC_INPUT_INVALID_NO_OF_SAMPLES;
         }
         /* Make sure no more than one packet can be produced */
-        if( 1000 * (opus_int32)nSamplesIn > encControl->payloadSize_ms * encControl->API_sampleRate ) {
+        if( 1000 * (oac_int32)nSamplesIn > encControl->payloadSize_ms * encControl->API_sampleRate ) {
             celt_assert( 0 );
             RESTORE_STACK;
             return SILK_ENC_INPUT_INVALID_NO_OF_SAMPLES;
@@ -259,7 +259,7 @@ opus_int silk_Encode(                                   /* O    Returns error co
 
     for( n = 0; n < encControl->nChannelsInternal; n++ ) {
         /* Force the side channel to the same rate as the mid */
-        opus_int force_fs_kHz = (n==1) ? psEnc->state_Fxx[0].sCmn.fs_kHz : 0;
+        oac_int force_fs_kHz = (n==1) ? psEnc->state_Fxx[0].sCmn.fs_kHz : 0;
         if( ( ret = silk_control_encoder( &psEnc->state_Fxx[ n ], encControl, psEnc->allowBandwidthSwitch, n, force_fs_kHz ) ) != 0 ) {
             silk_assert( 0 );
             RESTORE_STACK;
@@ -281,7 +281,7 @@ opus_int silk_Encode(                                   /* O    Returns error co
         silk_DIV32_16( nSamplesToBufferMax *
                            psEnc->state_Fxx[ 0 ].sCmn.API_fs_Hz,
                        psEnc->state_Fxx[ 0 ].sCmn.fs_kHz * 1000 );
-    ALLOC( buf, nSamplesFromInputMax, opus_int16 );
+    ALLOC( buf, nSamplesFromInputMax, oac_int16 );
     while( 1 ) {
         int curr_nBitsUsedLBRR = 0;
         nSamplesToBuffer  = psEnc->state_Fxx[ 0 ].sCmn.frame_length - psEnc->state_Fxx[ 0 ].sCmn.inputBufIx;
@@ -289,7 +289,7 @@ opus_int silk_Encode(                                   /* O    Returns error co
         nSamplesFromInput = silk_DIV32_16( nSamplesToBuffer * psEnc->state_Fxx[ 0 ].sCmn.API_fs_Hz, psEnc->state_Fxx[ 0 ].sCmn.fs_kHz * 1000 );
         /* Resample and write to buffer */
         if( encControl->nChannelsAPI == 2 && encControl->nChannelsInternal == 2 ) {
-            opus_int id = psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded;
+            oac_int id = psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded;
             for( n = 0; n < nSamplesFromInput; n++ ) {
                 buf[ n ] = RES2INT16(samplesIn[ 2 * n ]);
             }
@@ -315,7 +315,7 @@ opus_int silk_Encode(                                   /* O    Returns error co
             /* Combine left and right channels before resampling */
             for( n = 0; n < nSamplesFromInput; n++ ) {
                 sum = RES2INT16(samplesIn[ 2 * n ] + samplesIn[ 2 * n + 1 ]);
-                buf[ n ] = (opus_int16)silk_RSHIFT_ROUND( sum,  1 );
+                buf[ n ] = (oac_int16)silk_RSHIFT_ROUND( sum,  1 );
             }
             ret += silk_resampler( &psEnc->state_Fxx[ 0 ].sCmn.resampler_state,
                 &psEnc->state_Fxx[ 0 ].sCmn.inputBuf[ psEnc->state_Fxx[ 0 ].sCmn.inputBufIx + 2 ], buf, nSamplesFromInput );
@@ -355,7 +355,7 @@ opus_int silk_Encode(                                   /* O    Returns error co
             /* Deal with LBRR data */
             if( psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded == 0 && !prefillFlag ) {
                 /* Create space at start of payload for VAD and FEC flags */
-                opus_uint8 iCDF[ 2 ] = { 0, 0 };
+                oac_uint8 iCDF[ 2 ] = { 0, 0 };
                 iCDF[ 0 ] = 256 - silk_RSHIFT( 256, ( psEnc->state_Fxx[ 0 ].sCmn.nFramesPerPacket + 1 ) * encControl->nChannelsInternal );
                 ec_enc_icdf( psRangeEnc, 0, iCDF, 8 );
                 curr_nBitsUsedLBRR = ec_tell( psRangeEnc );
@@ -377,7 +377,7 @@ opus_int silk_Encode(                                   /* O    Returns error co
                 for( i = 0; i < psEnc->state_Fxx[ 0 ].sCmn.nFramesPerPacket; i++ ) {
                     for( n = 0; n < encControl->nChannelsInternal; n++ ) {
                         if( psEnc->state_Fxx[ n ].sCmn.LBRR_flags[ i ] ) {
-                            opus_int condCoding;
+                            oac_int condCoding;
 
                             if( encControl->nChannelsInternal == 2 && n == 0 ) {
                                 silk_stereo_encode_pred( psRangeEnc, psEnc->sStereo.predIx[ i ] );
@@ -436,7 +436,7 @@ opus_int silk_Encode(                                   /* O    Returns error co
             TargetRate_bps -= silk_DIV32_16( silk_MUL( psEnc->nBitsExceeded, 1000 ), BITRESERVOIR_DECAY_TIME_MS );
             if( !prefillFlag && psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded > 0 ) {
                 /* Compare actual vs target bits so far in this packet */
-                opus_int32 bitsBalance = ec_tell( psRangeEnc ) - psEnc->nBitsUsedLBRR - nBits * psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded;
+                oac_int32 bitsBalance = ec_tell( psRangeEnc ) - psEnc->nBitsUsedLBRR - nBits * psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded;
                 TargetRate_bps -= silk_DIV32_16( silk_MUL( bitsBalance, 1000 ), BITRESERVOIR_DECAY_TIME_MS );
             }
             /* Never exceed input bitrate */
@@ -474,14 +474,14 @@ opus_int silk_Encode(                                   /* O    Returns error co
                 }
             } else {
                 /* Buffering */
-                silk_memcpy( psEnc->state_Fxx[ 0 ].sCmn.inputBuf, psEnc->sStereo.sMid, 2 * sizeof( opus_int16 ) );
-                silk_memcpy( psEnc->sStereo.sMid, &psEnc->state_Fxx[ 0 ].sCmn.inputBuf[ psEnc->state_Fxx[ 0 ].sCmn.frame_length ], 2 * sizeof( opus_int16 ) );
+                silk_memcpy( psEnc->state_Fxx[ 0 ].sCmn.inputBuf, psEnc->sStereo.sMid, 2 * sizeof( oac_int16 ) );
+                silk_memcpy( psEnc->sStereo.sMid, &psEnc->state_Fxx[ 0 ].sCmn.inputBuf[ psEnc->state_Fxx[ 0 ].sCmn.frame_length ], 2 * sizeof( oac_int16 ) );
             }
             silk_encode_do_VAD_Fxx( &psEnc->state_Fxx[ 0 ], activity );
 
             /* Encode */
             for( n = 0; n < encControl->nChannelsInternal; n++ ) {
-                opus_int maxBits, useCBR;
+                oac_int maxBits, useCBR;
 
                 /* Handling rate constraints */
                 maxBits = encControl->maxBits;
@@ -508,7 +508,7 @@ opus_int silk_Encode(                                   /* O    Returns error co
                 }
 
                 if( channelRate_bps > 0 ) {
-                    opus_int condCoding;
+                    oac_int condCoding;
 
                     silk_control_SNR( &psEnc->state_Fxx[ n ].sCmn, channelRate_bps );
 
diff --git a/silk/encode_indices.c b/silk/encode_indices.c
index 8a6db2cbe..c2e40ef66 100644
--- a/silk/encode_indices.c
+++ b/silk/encode_indices.c
@@ -35,15 +35,15 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_encode_indices(
     silk_encoder_state          *psEncC,                        /* I/O  Encoder state                               */
     ec_enc                      *psRangeEnc,                    /* I/O  Compressor data structure                   */
-    opus_int                    FrameIndex,                     /* I    Frame number                                */
-    opus_int                    encode_LBRR,                    /* I    Flag indicating LBRR data is being encoded  */
-    opus_int                    condCoding                      /* I    The type of conditional coding to use       */
+    oac_int                    FrameIndex,                     /* I    Frame number                                */
+    oac_int                    encode_LBRR,                    /* I    Flag indicating LBRR data is being encoded  */
+    oac_int                    condCoding                      /* I    The type of conditional coding to use       */
 )
 {
-    opus_int   i, k, typeOffset;
-    opus_int   encode_absolute_lagIndex, delta_lagIndex;
-    opus_int16 ec_ix[ MAX_LPC_ORDER ];
-    opus_uint8 pred_Q8[ MAX_LPC_ORDER ];
+    oac_int   i, k, typeOffset;
+    oac_int   encode_absolute_lagIndex, delta_lagIndex;
+    oac_int16 ec_ix[ MAX_LPC_ORDER ];
+    oac_uint8 pred_Q8[ MAX_LPC_ORDER ];
     const SideInfoIndices *psIndices;
 
     if( encode_LBRR ) {
@@ -130,7 +130,7 @@ void silk_encode_indices(
         }
         if( encode_absolute_lagIndex ) {
             /* Absolute encoding */
-            opus_int32 pitch_high_bits, pitch_low_bits;
+            oac_int32 pitch_high_bits, pitch_low_bits;
             pitch_high_bits = silk_DIV32_16( psIndices->lagIndex, silk_RSHIFT( psEncC->fs_kHz, 1 ) );
             pitch_low_bits = psIndices->lagIndex - silk_SMULBB( pitch_high_bits, silk_RSHIFT( psEncC->fs_kHz, 1 ) );
             silk_assert( pitch_low_bits < psEncC->fs_kHz / 2 );
diff --git a/silk/encode_pulses.c b/silk/encode_pulses.c
index 8a1999138..89aac654f 100644
--- a/silk/encode_pulses.c
+++ b/silk/encode_pulses.c
@@ -36,14 +36,14 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Encode quantization indices of excitation */
 /*********************************************/
 
-static OPUS_INLINE opus_int combine_and_check(    /* return ok                           */
-    opus_int         *pulses_comb,           /* O                                   */
-    const opus_int   *pulses_in,             /* I                                   */
-    opus_int         max_pulses,             /* I    max value for sum of pulses    */
-    opus_int         len                     /* I    number of output values        */
+static OAC_INLINE oac_int combine_and_check(    /* return ok                           */
+    oac_int         *pulses_comb,           /* O                                   */
+    const oac_int   *pulses_in,             /* I                                   */
+    oac_int         max_pulses,             /* I    max value for sum of pulses    */
+    oac_int         len                     /* I    number of output values        */
 )
 {
-    opus_int k, sum;
+    oac_int k, sum;
 
     for( k = 0; k < len; k++ ) {
         sum = pulses_in[ 2 * k ] + pulses_in[ 2 * k + 1 ];
@@ -59,25 +59,25 @@ static OPUS_INLINE opus_int combine_and_check(    /* return ok
 /* Encode quantization indices of excitation */
 void silk_encode_pulses(
     ec_enc                      *psRangeEnc,                    /* I/O  compressor data structure                   */
-    const opus_int              signalType,                     /* I    Signal type                                 */
-    const opus_int              quantOffsetType,                /* I    quantOffsetType                             */
-    opus_int8                   pulses[],                       /* I    quantization indices                        */
-    const opus_int              frame_length                    /* I    Frame length                                */
+    const oac_int              signalType,                     /* I    Signal type                                 */
+    const oac_int              quantOffsetType,                /* I    quantOffsetType                             */
+    oac_int8                   pulses[],                       /* I    quantization indices                        */
+    const oac_int              frame_length                    /* I    Frame length                                */
 )
 {
-    opus_int   i, k, j, iter, bit, nLS, scale_down, RateLevelIndex = 0;
-    opus_int32 abs_q, minSumBits_Q5, sumBits_Q5;
-    VARDECL( opus_int, abs_pulses );
-    VARDECL( opus_int, sum_pulses );
-    VARDECL( opus_int, nRshifts );
-    opus_int   pulses_comb[ 8 ];
-    opus_int   *abs_pulses_ptr;
-    const opus_int8 *pulses_ptr;
-    const opus_uint8 *cdf_ptr;
-    const opus_uint8 *nBits_ptr;
+    oac_int   i, k, j, iter, bit, nLS, scale_down, RateLevelIndex = 0;
+    oac_int32 abs_q, minSumBits_Q5, sumBits_Q5;
+    VARDECL( oac_int, abs_pulses );
+    VARDECL( oac_int, sum_pulses );
+    VARDECL( oac_int, nRshifts );
+    oac_int   pulses_comb[ 8 ];
+    oac_int   *abs_pulses_ptr;
+    const oac_int8 *pulses_ptr;
+    const oac_uint8 *cdf_ptr;
+    const oac_uint8 *nBits_ptr;
     SAVE_STACK;
 
-    silk_memset( pulses_comb, 0, 8 * sizeof( opus_int ) ); /* Fixing Valgrind reported problem*/
+    silk_memset( pulses_comb, 0, 8 * sizeof( oac_int ) ); /* Fixing Valgrind reported problem*/
 
     /****************************/
     /* Prepare for shell coding */
@@ -88,22 +88,22 @@ void silk_encode_pulses(
     if( iter * SHELL_CODEC_FRAME_LENGTH < frame_length ) {
         celt_assert( frame_length == 12 * 10 ); /* Make sure only happens for 10 ms @ 12 kHz */
         iter++;
-        silk_memset( &pulses[ frame_length ], 0, SHELL_CODEC_FRAME_LENGTH * sizeof(opus_int8));
+        silk_memset( &pulses[ frame_length ], 0, SHELL_CODEC_FRAME_LENGTH * sizeof(oac_int8));
     }
 
     /* Take the absolute value of the pulses */
-    ALLOC( abs_pulses, iter * SHELL_CODEC_FRAME_LENGTH, opus_int );
+    ALLOC( abs_pulses, iter * SHELL_CODEC_FRAME_LENGTH, oac_int );
     silk_assert( !( SHELL_CODEC_FRAME_LENGTH & 3 ) );
     for( i = 0; i < iter * SHELL_CODEC_FRAME_LENGTH; i+=4 ) {
-        abs_pulses[i+0] = ( opus_int )silk_abs( pulses[ i + 0 ] );
-        abs_pulses[i+1] = ( opus_int )silk_abs( pulses[ i + 1 ] );
-        abs_pulses[i+2] = ( opus_int )silk_abs( pulses[ i + 2 ] );
-        abs_pulses[i+3] = ( opus_int )silk_abs( pulses[ i + 3 ] );
+        abs_pulses[i+0] = ( oac_int )silk_abs( pulses[ i + 0 ] );
+        abs_pulses[i+1] = ( oac_int )silk_abs( pulses[ i + 1 ] );
+        abs_pulses[i+2] = ( oac_int )silk_abs( pulses[ i + 2 ] );
+        abs_pulses[i+3] = ( oac_int )silk_abs( pulses[ i + 3 ] );
     }
 
     /* Calc sum pulses per shell code frame */
-    ALLOC( sum_pulses, iter, opus_int );
-    ALLOC( nRshifts, iter, opus_int );
+    ALLOC( sum_pulses, iter, oac_int );
+    ALLOC( nRshifts, iter, oac_int );
     abs_pulses_ptr = abs_pulses;
     for( i = 0; i < iter; i++ ) {
         nRshifts[ i ] = 0;
@@ -187,7 +187,7 @@ void silk_encode_pulses(
             pulses_ptr = &pulses[ i * SHELL_CODEC_FRAME_LENGTH ];
             nLS = nRshifts[ i ] - 1;
             for( k = 0; k < SHELL_CODEC_FRAME_LENGTH; k++ ) {
-                abs_q = (opus_int8)silk_abs( pulses_ptr[ k ] );
+                abs_q = (oac_int8)silk_abs( pulses_ptr[ k ] );
                 for( j = nLS; j > 0; j-- ) {
                     bit = silk_RSHIFT( abs_q, j ) & 1;
                     ec_enc_icdf( psRangeEnc, bit, silk_lsb_iCDF, 8 );
diff --git a/silk/fixed/LTP_analysis_filter_FIX.c b/silk/fixed/LTP_analysis_filter_FIX.c
index c1a4f0d45..db17a3218 100644
--- a/silk/fixed/LTP_analysis_filter_FIX.c
+++ b/silk/fixed/LTP_analysis_filter_FIX.c
@@ -32,21 +32,21 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "main_FIX.h"
 
 void silk_LTP_analysis_filter_FIX(
-    opus_int16                      *LTP_res,                               /* O    LTP residual signal of length MAX_NB_SUBFR * ( pre_length + subfr_length )  */
-    const opus_int16                *x,                                     /* I    Pointer to input signal with at least max( pitchL ) preceding samples       */
-    const opus_int16                LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],/* I    LTP_ORDER LTP coefficients for each MAX_NB_SUBFR subframe                   */
-    const opus_int                  pitchL[ MAX_NB_SUBFR ],                 /* I    Pitch lag, one for each subframe                                            */
-    const opus_int32                invGains_Q16[ MAX_NB_SUBFR ],           /* I    Inverse quantization gains, one for each subframe                           */
-    const opus_int                  subfr_length,                           /* I    Length of each subframe                                                     */
-    const opus_int                  nb_subfr,                               /* I    Number of subframes                                                         */
-    const opus_int                  pre_length                              /* I    Length of the preceding samples starting at &x[0] for each subframe         */
+    oac_int16                      *LTP_res,                               /* O    LTP residual signal of length MAX_NB_SUBFR * ( pre_length + subfr_length )  */
+    const oac_int16                *x,                                     /* I    Pointer to input signal with at least max( pitchL ) preceding samples       */
+    const oac_int16                LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],/* I    LTP_ORDER LTP coefficients for each MAX_NB_SUBFR subframe                   */
+    const oac_int                  pitchL[ MAX_NB_SUBFR ],                 /* I    Pitch lag, one for each subframe                                            */
+    const oac_int32                invGains_Q16[ MAX_NB_SUBFR ],           /* I    Inverse quantization gains, one for each subframe                           */
+    const oac_int                  subfr_length,                           /* I    Length of each subframe                                                     */
+    const oac_int                  nb_subfr,                               /* I    Number of subframes                                                         */
+    const oac_int                  pre_length                              /* I    Length of the preceding samples starting at &x[0] for each subframe         */
 )
 {
-    const opus_int16 *x_ptr, *x_lag_ptr;
-    opus_int16   Btmp_Q14[ LTP_ORDER ];
-    opus_int16   *LTP_res_ptr;
-    opus_int     k, i;
-    opus_int32   LTP_est;
+    const oac_int16 *x_ptr, *x_lag_ptr;
+    oac_int16   Btmp_Q14[ LTP_ORDER ];
+    oac_int16   *LTP_res_ptr;
+    oac_int     k, i;
+    oac_int32   LTP_est;
 
     x_ptr = x;
     LTP_res_ptr = LTP_res;
@@ -74,7 +74,7 @@ void silk_LTP_analysis_filter_FIX(
             LTP_est = silk_RSHIFT_ROUND( LTP_est, 14 ); /* round and -> Q0*/
 
             /* Subtract long-term prediction */
-            LTP_res_ptr[ i ] = (opus_int16)silk_SAT16( (opus_int32)x_ptr[ i ] - LTP_est );
+            LTP_res_ptr[ i ] = (oac_int16)silk_SAT16( (oac_int32)x_ptr[ i ] - LTP_est );
 
             /* Scale residual */
             LTP_res_ptr[ i ] = silk_SMULWB( invGains_Q16[ k ], LTP_res_ptr[ i ] );
diff --git a/silk/fixed/LTP_scale_ctrl_FIX.c b/silk/fixed/LTP_scale_ctrl_FIX.c
index db1016e0b..31ae8fa17 100644
--- a/silk/fixed/LTP_scale_ctrl_FIX.c
+++ b/silk/fixed/LTP_scale_ctrl_FIX.c
@@ -35,10 +35,10 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_LTP_scale_ctrl_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  encoder control                                                             */
-    opus_int                        condCoding                              /* I    The type of conditional coding to use                                       */
+    oac_int                        condCoding                              /* I    The type of conditional coding to use                                       */
 )
 {
-    opus_int round_loss;
+    oac_int round_loss;
 
     if( condCoding == CODE_INDEPENDENTLY ) {
         /* Only scale if first frame in packet */
diff --git a/silk/fixed/apply_sine_window_FIX.c b/silk/fixed/apply_sine_window_FIX.c
index 03e088a6d..84f7020d1 100644
--- a/silk/fixed/apply_sine_window_FIX.c
+++ b/silk/fixed/apply_sine_window_FIX.c
@@ -41,21 +41,21 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Matlab code for table:
    for k=16:9*4:16+2*9*4, fprintf(' %7.d,', -round(65536*pi ./ (k:4:k+8*4))); fprintf('\n'); end
 */
-static const opus_int16 freq_table_Q16[ 27 ] = {
+static const oac_int16 freq_table_Q16[ 27 ] = {
    12111,    9804,    8235,    7100,    6239,    5565,    5022,    4575,    4202,
     3885,    3612,    3375,    3167,    2984,    2820,    2674,    2542,    2422,
     2313,    2214,    2123,    2038,    1961,    1889,    1822,    1760,    1702,
 };
 
 void silk_apply_sine_window(
-    opus_int16                  px_win[],           /* O    Pointer to windowed signal                                  */
-    const opus_int16            px[],               /* I    Pointer to input signal                                     */
-    const opus_int              win_type,           /* I    Selects a window type                                       */
-    const opus_int              length              /* I    Window length, multiple of 4                                */
+    oac_int16                  px_win[],           /* O    Pointer to windowed signal                                  */
+    const oac_int16            px[],               /* I    Pointer to input signal                                     */
+    const oac_int              win_type,           /* I    Selects a window type                                       */
+    const oac_int              length              /* I    Window length, multiple of 4                                */
 )
 {
-    opus_int   k, f_Q16, c_Q16;
-    opus_int32 S0_Q16, S1_Q16;
+    oac_int   k, f_Q16, c_Q16;
+    oac_int32 S0_Q16, S1_Q16;
 
     celt_assert( win_type == 1 || win_type == 2 );
 
@@ -66,10 +66,10 @@ void silk_apply_sine_window(
     /* Frequency */
     k = ( length >> 2 ) - 4;
     celt_assert( k >= 0 && k <= 26 );
-    f_Q16 = (opus_int)freq_table_Q16[ k ];
+    f_Q16 = (oac_int)freq_table_Q16[ k ];
 
     /* Factor used for cosine approximation */
-    c_Q16 = silk_SMULWB( (opus_int32)f_Q16, -f_Q16 );
+    c_Q16 = silk_SMULWB( (oac_int32)f_Q16, -f_Q16 );
     silk_assert( c_Q16 >= -32768 );
 
     /* initialize state */
@@ -80,22 +80,22 @@ void silk_apply_sine_window(
         S1_Q16 = f_Q16 + silk_RSHIFT( length, 3 );
     } else {
         /* start from 1 */
-        S0_Q16 = ( (opus_int32)1 << 16 );
+        S0_Q16 = ( (oac_int32)1 << 16 );
         /* approximation of cos(f) */
-        S1_Q16 = ( (opus_int32)1 << 16 ) + silk_RSHIFT( c_Q16, 1 ) + silk_RSHIFT( length, 4 );
+        S1_Q16 = ( (oac_int32)1 << 16 ) + silk_RSHIFT( c_Q16, 1 ) + silk_RSHIFT( length, 4 );
     }
 
     /* Uses the recursive equation:   sin(n*f) = 2 * cos(f) * sin((n-1)*f) - sin((n-2)*f)    */
     /* 4 samples at a time */
     for( k = 0; k < length; k += 4 ) {
-        px_win[ k ]     = (opus_int16)silk_SMULWB( silk_RSHIFT( S0_Q16 + S1_Q16, 1 ), px[ k ] );
-        px_win[ k + 1 ] = (opus_int16)silk_SMULWB( S1_Q16, px[ k + 1] );
+        px_win[ k ]     = (oac_int16)silk_SMULWB( silk_RSHIFT( S0_Q16 + S1_Q16, 1 ), px[ k ] );
+        px_win[ k + 1 ] = (oac_int16)silk_SMULWB( S1_Q16, px[ k + 1] );
         S0_Q16 = silk_SMULWB( S1_Q16, c_Q16 ) + silk_LSHIFT( S1_Q16, 1 ) - S0_Q16 + 1;
-        S0_Q16 = silk_min( S0_Q16, ( (opus_int32)1 << 16 ) );
+        S0_Q16 = silk_min( S0_Q16, ( (oac_int32)1 << 16 ) );
 
-        px_win[ k + 2 ] = (opus_int16)silk_SMULWB( silk_RSHIFT( S0_Q16 + S1_Q16, 1 ), px[ k + 2] );
-        px_win[ k + 3 ] = (opus_int16)silk_SMULWB( S0_Q16, px[ k + 3 ] );
+        px_win[ k + 2 ] = (oac_int16)silk_SMULWB( silk_RSHIFT( S0_Q16 + S1_Q16, 1 ), px[ k + 2] );
+        px_win[ k + 3 ] = (oac_int16)silk_SMULWB( S0_Q16, px[ k + 3 ] );
         S1_Q16 = silk_SMULWB( S0_Q16, c_Q16 ) + silk_LSHIFT( S0_Q16, 1 ) - S1_Q16;
-        S1_Q16 = silk_min( S1_Q16, ( (opus_int32)1 << 16 ) );
+        S1_Q16 = silk_min( S1_Q16, ( (oac_int32)1 << 16 ) );
     }
 }
diff --git a/silk/fixed/arm/warped_autocorrelation_FIX_arm.h b/silk/fixed/arm/warped_autocorrelation_FIX_arm.h
index 1992e4328..b78461e8c 100644
--- a/silk/fixed/arm/warped_autocorrelation_FIX_arm.h
+++ b/silk/fixed/arm/warped_autocorrelation_FIX_arm.h
@@ -32,17 +32,17 @@ POSSIBILITY OF SUCH DAMAGE.
 
 # if defined(FIXED_POINT)
 
-#  if defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
+#  if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 void silk_warped_autocorrelation_FIX_neon(
-          opus_int32                *corr,                                  /* O    Result [order + 1]                                                          */
-          opus_int                  *scale,                                 /* O    Scaling of the correlation vector                                           */
-    const opus_int16                *input,                                 /* I    Input data to correlate                                                     */
-    const opus_int                  warping_Q16,                            /* I    Warping coefficient                                                         */
-    const opus_int                  length,                                 /* I    Length of input                                                             */
-    const opus_int                  order                                   /* I    Correlation order (even)                                                    */
+          oac_int32                *corr,                                  /* O    Result [order + 1]                                                          */
+          oac_int                  *scale,                                 /* O    Scaling of the correlation vector                                           */
+    const oac_int16                *input,                                 /* I    Input data to correlate                                                     */
+    const oac_int                  warping_Q16,                            /* I    Warping coefficient                                                         */
+    const oac_int                  length,                                 /* I    Length of input                                                             */
+    const oac_int                  order                                   /* I    Correlation order (even)                                                    */
 );
 
-#  if !defined(OPUS_HAVE_RTCD) && defined(OPUS_ARM_PRESUME_NEON)
+#  if !defined(OAC_HAVE_RTCD) && defined(OAC_ARM_PRESUME_NEON)
 #   define OVERRIDE_silk_warped_autocorrelation_FIX (1)
 #   define silk_warped_autocorrelation_FIX(corr, scale, input, warping_Q16, length, order, arch) \
     ((void)(arch), PRESUME_NEON(silk_warped_autocorrelation_FIX)(corr, scale, input, warping_Q16, length, order))
@@ -51,12 +51,12 @@ void silk_warped_autocorrelation_FIX_neon(
 
 #  if !defined(OVERRIDE_silk_warped_autocorrelation_FIX)
 /*Is run-time CPU detection enabled on this platform?*/
-#   if defined(OPUS_HAVE_RTCD) && (defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && !defined(OPUS_ARM_PRESUME_NEON_INTR))
-extern void (*const SILK_WARPED_AUTOCORRELATION_FIX_IMPL[OPUS_ARCHMASK+1])(opus_int32*, opus_int*, const opus_int16*, const opus_int, const opus_int, const opus_int);
+#   if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
+extern void (*const SILK_WARPED_AUTOCORRELATION_FIX_IMPL[OAC_ARCHMASK+1])(oac_int32*, oac_int*, const oac_int16*, const oac_int, const oac_int, const oac_int);
 #    define OVERRIDE_silk_warped_autocorrelation_FIX (1)
 #    define silk_warped_autocorrelation_FIX(corr, scale, input, warping_Q16, length, order, arch) \
-    ((*SILK_WARPED_AUTOCORRELATION_FIX_IMPL[(arch)&OPUS_ARCHMASK])(corr, scale, input, warping_Q16, length, order))
-#   elif defined(OPUS_ARM_PRESUME_NEON_INTR)
+    ((*SILK_WARPED_AUTOCORRELATION_FIX_IMPL[(arch)&OAC_ARCHMASK])(corr, scale, input, warping_Q16, length, order))
+#   elif defined(OAC_ARM_PRESUME_NEON_INTR)
 #    define OVERRIDE_silk_warped_autocorrelation_FIX (1)
 #    define silk_warped_autocorrelation_FIX(corr, scale, input, warping_Q16, length, order, arch) \
     ((void)(arch), silk_warped_autocorrelation_FIX_neon(corr, scale, input, warping_Q16, length, order))
diff --git a/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c b/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c
index 6f3be025c..83ad19bcf 100644
--- a/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c
+++ b/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c
@@ -30,13 +30,13 @@ POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #include <arm_neon.h>
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
 # include <string.h>
 #endif
 #include "stack_alloc.h"
 #include "main_FIX.h"
 
-static OPUS_INLINE void calc_corr( const opus_int32 *const input_QS, opus_int64 *const corr_QC, const opus_int offset, const int32x4_t state_QS_s32x4 )
+static OAC_INLINE void calc_corr( const oac_int32 *const input_QS, oac_int64 *const corr_QC, const oac_int offset, const int32x4_t state_QS_s32x4 )
 {
     int64x2_t corr_QC_s64x2[ 2 ], t_s64x2[ 2 ];
     const int32x4_t input_QS_s32x4 = vld1q_s32( input_QS + offset );
@@ -50,7 +50,7 @@ static OPUS_INLINE void calc_corr( const opus_int32 *const input_QS, opus_int64
     vst1q_s64( corr_QC + offset + 2, corr_QC_s64x2[ 1 ] );
 }
 
-static OPUS_INLINE int32x4_t calc_state( const int32x4_t state_QS0_s32x4, const int32x4_t state_QS0_1_s32x4, const int32x4_t state_QS1_1_s32x4, const int32x4_t warping_Q16_s32x4 )
+static OAC_INLINE int32x4_t calc_state( const int32x4_t state_QS0_s32x4, const int32x4_t state_QS0_1_s32x4, const int32x4_t state_QS1_1_s32x4, const int32x4_t warping_Q16_s32x4 )
 {
     int32x4_t t_s32x4 = vsubq_s32( state_QS0_s32x4, state_QS0_1_s32x4 );
     t_s32x4 = vqdmulhq_s32( t_s32x4, warping_Q16_s32x4 );
@@ -58,26 +58,26 @@ static OPUS_INLINE int32x4_t calc_state( const int32x4_t state_QS0_s32x4, const
 }
 
 void silk_warped_autocorrelation_FIX_neon(
-          opus_int32                *corr,                                  /* O    Result [order + 1]                                                          */
-          opus_int                  *scale,                                 /* O    Scaling of the correlation vector                                           */
-    const opus_int16                *input,                                 /* I    Input data to correlate                                                     */
-    const opus_int                  warping_Q16,                            /* I    Warping coefficient                                                         */
-    const opus_int                  length,                                 /* I    Length of input                                                             */
-    const opus_int                  order                                   /* I    Correlation order (even)                                                    */
+          oac_int32                *corr,                                  /* O    Result [order + 1]                                                          */
+          oac_int                  *scale,                                 /* O    Scaling of the correlation vector                                           */
+    const oac_int16                *input,                                 /* I    Input data to correlate                                                     */
+    const oac_int                  warping_Q16,                            /* I    Warping coefficient                                                         */
+    const oac_int                  length,                                 /* I    Length of input                                                             */
+    const oac_int                  order                                   /* I    Correlation order (even)                                                    */
 )
 {
     if( ( MAX_SHAPE_LPC_ORDER > 24 ) || ( order < 6 ) ) {
         silk_warped_autocorrelation_FIX_c( corr, scale, input, warping_Q16, length, order );
     } else {
-        opus_int       n, i, lsh;
-        opus_int64     corr_QC[ MAX_SHAPE_LPC_ORDER + 1 ] = { 0 }; /* In reverse order */
-        opus_int64     corr_QC_orderT;
+        oac_int       n, i, lsh;
+        oac_int64     corr_QC[ MAX_SHAPE_LPC_ORDER + 1 ] = { 0 }; /* In reverse order */
+        oac_int64     corr_QC_orderT;
         int64x2_t      lsh_s64x2;
-        const opus_int orderT = ( order + 3 ) & ~3;
-        opus_int64     *corr_QCT;
-        opus_int32     *input_QS;
-        VARDECL( opus_int32, input_QST );
-        VARDECL( opus_int32, state );
+        const oac_int orderT = ( order + 3 ) & ~3;
+        oac_int64     *corr_QCT;
+        oac_int32     *input_QS;
+        VARDECL( oac_int32, input_QST );
+        VARDECL( oac_int32, state );
         SAVE_STACK;
 
         /* Order must be even */
@@ -86,7 +86,7 @@ void silk_warped_autocorrelation_FIX_neon(
 
         /* The additional +4 is to ensure a later vld1q_s32 call does not overflow.               */
         /* Strictly, only +3 is needed but +4 simplifies initialization using the 4x32 neon load. */
-        ALLOC( input_QST, length + 2 * MAX_SHAPE_LPC_ORDER + 4, opus_int32 );
+        ALLOC( input_QST, length + 2 * MAX_SHAPE_LPC_ORDER + 4, oac_int32 );
 
         input_QS = input_QST;
         /* input_QS has zero paddings in the beginning and end. */
@@ -110,7 +110,7 @@ void silk_warped_autocorrelation_FIX_neon(
             vst1q_s32( input_QS + 4, vshll_n_s16( vget_high_s16( t0_s16x4 ), QS ) );
         }
         for( ; n < length; n++, input_QS++ ) {
-            input_QS[ 0 ] = silk_LSHIFT32( (opus_int32)input[ n ], QS );
+            input_QS[ 0 ] = silk_LSHIFT32( (oac_int32)input[ n ], QS );
         }
         vst1q_s32( input_QS, vdupq_n_s32( 0 ) );
         input_QS += 4;
@@ -134,8 +134,8 @@ void silk_warped_autocorrelation_FIX_neon(
         /* Keep the C code here to help understand the intrinsics optimization. */
         /*
         {
-            opus_int32 state_QS[ 2 ][ MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };
-            opus_int32 *state_QST[ 3 ];
+            oac_int32 state_QS[ 2 ][ MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };
+            oac_int32 *state_QST[ 3 ];
             state_QST[ 0 ] = state_QS[ 0 ];
             state_QST[ 1 ] = state_QS[ 1 ];
             for( n = 0; n < length + order; n++, input_QS++ ) {
@@ -153,12 +153,12 @@ void silk_warped_autocorrelation_FIX_neon(
 
         {
             const int32x4_t warping_Q16_s32x4 = vdupq_n_s32( warping_Q16 << 15 );
-            const opus_int32 *in = input_QS + orderT;
-            opus_int o = orderT;
+            const oac_int32 *in = input_QS + orderT;
+            oac_int o = orderT;
             int32x4_t state_QS_s32x4[ 3 ][ 2 ];
 
             /* The additional +4 is to ensure a later vld1q_s32 call does not overflow. */
-            ALLOC( state, length + order + 4, opus_int32 );
+            ALLOC( state, length + order + 4, oac_int32 );
             state_QS_s32x4[ 2 ][ 1 ] = vdupq_n_s32( 0 );
 
             /* Calculate 8 taps of all inputs in each loop. */
@@ -184,7 +184,7 @@ void silk_warped_autocorrelation_FIX_neon(
 
             if( o ) {
                 /* Calculate the last 4 taps of all inputs. */
-                opus_int32 *stateT = state;
+                oac_int32 *stateT = state;
                 silk_assert( o == 4 );
                 state_QS_s32x4[ 0 ][ 0 ] = state_QS_s32x4[ 1 ][ 0 ] = vdupq_n_s32( 0 );
                 n = length + order;
@@ -202,7 +202,7 @@ void silk_warped_autocorrelation_FIX_neon(
         }
 
         {
-            const opus_int16 *inputT = input;
+            const oac_int16 *inputT = input;
             int32x4_t t_s32x4;
             int64x1_t t_s64x1;
             int64x2_t t_s64x2 = vdupq_n_s64( 0 );
@@ -242,21 +242,21 @@ void silk_warped_autocorrelation_FIX_neon(
         }
         if( lsh >= 0 ) {
             for( ; i < order + 1; i++ ) {
-                corr[ order - i ] = (opus_int32)silk_CHECK_FIT32( silk_LSHIFT64( corr_QCT[ i ], lsh ) );
+                corr[ order - i ] = (oac_int32)silk_CHECK_FIT32( silk_LSHIFT64( corr_QCT[ i ], lsh ) );
             }
         } else {
             for( ; i < order + 1; i++ ) {
-                corr[ order - i ] = (opus_int32)silk_CHECK_FIT32( silk_RSHIFT64( corr_QCT[ i ], -lsh ) );
+                corr[ order - i ] = (oac_int32)silk_CHECK_FIT32( silk_RSHIFT64( corr_QCT[ i ], -lsh ) );
             }
         }
         silk_assert( corr_QCT[ order ] >= 0 ); /* If breaking, decrease QC*/
         RESTORE_STACK;
     }
 
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     {
-        opus_int32 corr_c[ MAX_SHAPE_LPC_ORDER + 1 ];
-        opus_int   scale_c;
+        oac_int32 corr_c[ MAX_SHAPE_LPC_ORDER + 1 ];
+        oac_int   scale_c;
         silk_warped_autocorrelation_FIX_c( corr_c, &scale_c, input, warping_Q16, length, order );
         silk_assert( !memcmp( corr_c, corr, sizeof( corr_c[ 0 ] ) * ( order + 1 ) ) );
         silk_assert( scale_c == *scale );
diff --git a/silk/fixed/autocorr_FIX.c b/silk/fixed/autocorr_FIX.c
index de95c9869..2a2d6f888 100644
--- a/silk/fixed/autocorr_FIX.c
+++ b/silk/fixed/autocorr_FIX.c
@@ -34,15 +34,15 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Compute autocorrelation */
 void silk_autocorr(
-    opus_int32                  *results,           /* O    Result (length correlationCount)                            */
-    opus_int                    *scale,             /* O    Scaling of the correlation vector                           */
-    const opus_int16            *inputData,         /* I    Input data to correlate                                     */
-    const opus_int              inputDataSize,      /* I    Length of input                                             */
-    const opus_int              correlationCount,   /* I    Number of correlation taps to compute                       */
+    oac_int32                  *results,           /* O    Result (length correlationCount)                            */
+    oac_int                    *scale,             /* O    Scaling of the correlation vector                           */
+    const oac_int16            *inputData,         /* I    Input data to correlate                                     */
+    const oac_int              inputDataSize,      /* I    Length of input                                             */
+    const oac_int              correlationCount,   /* I    Number of correlation taps to compute                       */
     int                         arch                /* I    Run-time architecture                                       */
 )
 {
-    opus_int   corrCount;
+    oac_int   corrCount;
     corrCount = silk_min_int( inputDataSize, correlationCount );
     *scale = _celt_autocorr(inputData, results, NULL, 0, corrCount-1, inputDataSize, arch);
 }
diff --git a/silk/fixed/burg_modified_FIX.c b/silk/fixed/burg_modified_FIX.c
index 185a12b17..0c16b9d0f 100644
--- a/silk/fixed/burg_modified_FIX.c
+++ b/silk/fixed/burg_modified_FIX.c
@@ -43,27 +43,27 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Compute reflection coefficients from input signal */
 void silk_burg_modified_c(
-    opus_int32                  *res_nrg,           /* O    Residual energy                                             */
-    opus_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
-    opus_int32                  A_Q16[],            /* O    Prediction coefficients (length order)                      */
-    const opus_int16            x[],                /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
-    const opus_int32            minInvGain_Q30,     /* I    Inverse of max prediction gain                              */
-    const opus_int              subfr_length,       /* I    Input signal subframe length (incl. D preceding samples)    */
-    const opus_int              nb_subfr,           /* I    Number of subframes stacked in x                            */
-    const opus_int              D,                  /* I    Order                                                       */
+    oac_int32                  *res_nrg,           /* O    Residual energy                                             */
+    oac_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
+    oac_int32                  A_Q16[],            /* O    Prediction coefficients (length order)                      */
+    const oac_int16            x[],                /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
+    const oac_int32            minInvGain_Q30,     /* I    Inverse of max prediction gain                              */
+    const oac_int              subfr_length,       /* I    Input signal subframe length (incl. D preceding samples)    */
+    const oac_int              nb_subfr,           /* I    Number of subframes stacked in x                            */
+    const oac_int              D,                  /* I    Order                                                       */
     int                         arch                /* I    Run-time architecture                                       */
 )
 {
-    opus_int         k, n, s, lz, rshifts, reached_max_gain;
-    opus_int32       C0, num, nrg, rc_Q31, invGain_Q30, Atmp_QA, Atmp1, tmp1, tmp2, x1, x2;
-    const opus_int16 *x_ptr;
-    opus_int32       C_first_row[ SILK_MAX_ORDER_LPC ];
-    opus_int32       C_last_row[  SILK_MAX_ORDER_LPC ];
-    opus_int32       Af_QA[       SILK_MAX_ORDER_LPC ];
-    opus_int32       CAf[ SILK_MAX_ORDER_LPC + 1 ];
-    opus_int32       CAb[ SILK_MAX_ORDER_LPC + 1 ];
-    opus_int32       xcorr[ SILK_MAX_ORDER_LPC ];
-    opus_int64       C0_64;
+    oac_int         k, n, s, lz, rshifts, reached_max_gain;
+    oac_int32       C0, num, nrg, rc_Q31, invGain_Q30, Atmp_QA, Atmp1, tmp1, tmp2, x1, x2;
+    const oac_int16 *x_ptr;
+    oac_int32       C_first_row[ SILK_MAX_ORDER_LPC ];
+    oac_int32       C_last_row[  SILK_MAX_ORDER_LPC ];
+    oac_int32       Af_QA[       SILK_MAX_ORDER_LPC ];
+    oac_int32       CAf[ SILK_MAX_ORDER_LPC + 1 ];
+    oac_int32       CAb[ SILK_MAX_ORDER_LPC + 1 ];
+    oac_int32       xcorr[ SILK_MAX_ORDER_LPC ];
+    oac_int64       C0_64;
 
     celt_assert( subfr_length * nb_subfr <= MAX_FRAME_SIZE );
 
@@ -75,25 +75,25 @@ void silk_burg_modified_c(
     if (rshifts < MIN_RSHIFTS) rshifts = MIN_RSHIFTS;
 
     if (rshifts > 0) {
-        C0 = (opus_int32)silk_RSHIFT64(C0_64, rshifts );
+        C0 = (oac_int32)silk_RSHIFT64(C0_64, rshifts );
     } else {
-        C0 = silk_LSHIFT32((opus_int32)C0_64, -rshifts );
+        C0 = silk_LSHIFT32((oac_int32)C0_64, -rshifts );
     }
 
     CAb[ 0 ] = CAf[ 0 ] = C0 + silk_SMMUL( SILK_FIX_CONST( FIND_LPC_COND_FAC, 32 ), C0 ) + 1;                                /* Q(-rshifts) */
-    silk_memset( C_first_row, 0, SILK_MAX_ORDER_LPC * sizeof( opus_int32 ) );
+    silk_memset( C_first_row, 0, SILK_MAX_ORDER_LPC * sizeof( oac_int32 ) );
     if( rshifts > 0 ) {
         for( s = 0; s < nb_subfr; s++ ) {
             x_ptr = x + s * subfr_length;
             for( n = 1; n < D + 1; n++ ) {
-                C_first_row[ n - 1 ] += (opus_int32)silk_RSHIFT64(
+                C_first_row[ n - 1 ] += (oac_int32)silk_RSHIFT64(
                     silk_inner_prod16( x_ptr, x_ptr + n, subfr_length - n, arch ), rshifts );
             }
         }
     } else {
         for( s = 0; s < nb_subfr; s++ ) {
             int i;
-            opus_int32 d;
+            oac_int32 d;
             x_ptr = x + s * subfr_length;
             celt_pitch_xcorr(x_ptr, x_ptr + 1, xcorr, subfr_length - D, D, arch );
             for( n = 1; n < D + 1; n++ ) {
@@ -106,12 +106,12 @@ void silk_burg_modified_c(
             }
         }
     }
-    silk_memcpy( C_last_row, C_first_row, SILK_MAX_ORDER_LPC * sizeof( opus_int32 ) );
+    silk_memcpy( C_last_row, C_first_row, SILK_MAX_ORDER_LPC * sizeof( oac_int32 ) );
 
     /* Initialize */
     CAb[ 0 ] = CAf[ 0 ] = C0 + silk_SMMUL( SILK_FIX_CONST( FIND_LPC_COND_FAC, 32 ), C0 ) + 1;                                /* Q(-rshifts) */
 
-    invGain_Q30 = (opus_int32)1 << 30;
+    invGain_Q30 = (oac_int32)1 << 30;
     reached_max_gain = 0;
     for( n = 0; n < D; n++ ) {
         /* Update first row of correlation matrix (without first element) */
@@ -121,10 +121,10 @@ void silk_burg_modified_c(
         if( rshifts > -2 ) {
             for( s = 0; s < nb_subfr; s++ ) {
                 x_ptr = x + s * subfr_length;
-                x1  = -silk_LSHIFT32( (opus_int32)x_ptr[ n ],                    16 - rshifts );        /* Q(16-rshifts) */
-                x2  = -silk_LSHIFT32( (opus_int32)x_ptr[ subfr_length - n - 1 ], 16 - rshifts );        /* Q(16-rshifts) */
-                tmp1 = silk_LSHIFT32( (opus_int32)x_ptr[ n ],                    QA - 16 );             /* Q(QA-16) */
-                tmp2 = silk_LSHIFT32( (opus_int32)x_ptr[ subfr_length - n - 1 ], QA - 16 );             /* Q(QA-16) */
+                x1  = -silk_LSHIFT32( (oac_int32)x_ptr[ n ],                    16 - rshifts );        /* Q(16-rshifts) */
+                x2  = -silk_LSHIFT32( (oac_int32)x_ptr[ subfr_length - n - 1 ], 16 - rshifts );        /* Q(16-rshifts) */
+                tmp1 = silk_LSHIFT32( (oac_int32)x_ptr[ n ],                    QA - 16 );             /* Q(QA-16) */
+                tmp2 = silk_LSHIFT32( (oac_int32)x_ptr[ subfr_length - n - 1 ], QA - 16 );             /* Q(QA-16) */
                 for( k = 0; k < n; k++ ) {
                     C_first_row[ k ] = silk_SMLAWB( C_first_row[ k ], x1, x_ptr[ n - k - 1 ]            ); /* Q( -rshifts ) */
                     C_last_row[ k ]  = silk_SMLAWB( C_last_row[ k ],  x2, x_ptr[ subfr_length - n + k ] ); /* Q( -rshifts ) */
@@ -142,10 +142,10 @@ void silk_burg_modified_c(
         } else {
             for( s = 0; s < nb_subfr; s++ ) {
                 x_ptr = x + s * subfr_length;
-                x1  = -silk_LSHIFT32( (opus_int32)x_ptr[ n ],                    -rshifts );            /* Q( -rshifts ) */
-                x2  = -silk_LSHIFT32( (opus_int32)x_ptr[ subfr_length - n - 1 ], -rshifts );            /* Q( -rshifts ) */
-                tmp1 = silk_LSHIFT32( (opus_int32)x_ptr[ n ],                    17 );                  /* Q17 */
-                tmp2 = silk_LSHIFT32( (opus_int32)x_ptr[ subfr_length - n - 1 ], 17 );                  /* Q17 */
+                x1  = -silk_LSHIFT32( (oac_int32)x_ptr[ n ],                    -rshifts );            /* Q( -rshifts ) */
+                x2  = -silk_LSHIFT32( (oac_int32)x_ptr[ subfr_length - n - 1 ], -rshifts );            /* Q( -rshifts ) */
+                tmp1 = silk_LSHIFT32( (oac_int32)x_ptr[ n ],                    17 );                  /* Q17 */
+                tmp2 = silk_LSHIFT32( (oac_int32)x_ptr[ subfr_length - n - 1 ], 17 );                  /* Q17 */
                 for( k = 0; k < n; k++ ) {
                     C_first_row[ k ] = silk_MLA( C_first_row[ k ], x1, x_ptr[ n - k - 1 ]            ); /* Q( -rshifts ) */
                     C_last_row[ k ]  = silk_MLA( C_last_row[ k ],  x2, x_ptr[ subfr_length - n + k ] ); /* Q( -rshifts ) */
@@ -160,9 +160,9 @@ void silk_burg_modified_c(
                 tmp2 = -tmp2;                                                                           /* Q17 */
                 for( k = 0; k <= n; k++ ) {
                     CAf[ k ] = silk_SMLAWW( CAf[ k ], tmp1,
-                        silk_LSHIFT32( (opus_int32)x_ptr[ n - k ], -rshifts - 1 ) );                    /* Q( -rshift ) */
+                        silk_LSHIFT32( (oac_int32)x_ptr[ n - k ], -rshifts - 1 ) );                    /* Q( -rshift ) */
                     CAb[ k ] = silk_SMLAWW( CAb[ k ], tmp2,
-                        silk_LSHIFT32( (opus_int32)x_ptr[ subfr_length - n + k - 1 ], -rshifts - 1 ) ); /* Q( -rshift ) */
+                        silk_LSHIFT32( (oac_int32)x_ptr[ subfr_length - n + k - 1 ], -rshifts - 1 ) ); /* Q( -rshift ) */
                 }
             }
         }
@@ -197,11 +197,11 @@ void silk_burg_modified_c(
         }
 
         /* Update inverse prediction gain */
-        tmp1 = ( (opus_int32)1 << 30 ) - silk_SMMUL( rc_Q31, rc_Q31 );
+        tmp1 = ( (oac_int32)1 << 30 ) - silk_SMMUL( rc_Q31, rc_Q31 );
         tmp1 = silk_LSHIFT( silk_SMMUL( invGain_Q30, tmp1 ), 2 );
         if( tmp1 <= minInvGain_Q30 ) {
             /* Max prediction gain exceeded; set reflection coefficient such that max prediction gain is exactly hit */
-            tmp2 = ( (opus_int32)1 << 30 ) - silk_DIV32_varQ( minInvGain_Q30, invGain_Q30, 30 );            /* Q30 */
+            tmp2 = ( (oac_int32)1 << 30 ) - silk_DIV32_varQ( minInvGain_Q30, invGain_Q30, 30 );            /* Q30 */
             rc_Q31 = silk_SQRT_APPROX( tmp2 );                                                  /* Q15 */
             if( rc_Q31 > 0 ) {
                 /* Newton-Raphson iteration */
@@ -253,7 +253,7 @@ void silk_burg_modified_c(
         if( rshifts > 0 ) {
             for( s = 0; s < nb_subfr; s++ ) {
                 x_ptr = x + s * subfr_length;
-                C0 -= (opus_int32)silk_RSHIFT64( silk_inner_prod16( x_ptr, x_ptr, D, arch ), rshifts );
+                C0 -= (oac_int32)silk_RSHIFT64( silk_inner_prod16( x_ptr, x_ptr, D, arch ), rshifts );
             }
         } else {
             for( s = 0; s < nb_subfr; s++ ) {
@@ -267,7 +267,7 @@ void silk_burg_modified_c(
     } else {
         /* Return residual energy */
         nrg  = CAf[ 0 ];                                                                            /* Q( -rshifts ) */
-        tmp1 = (opus_int32)1 << 16;                                                                             /* Q16 */
+        tmp1 = (oac_int32)1 << 16;                                                                             /* Q16 */
         for( k = 0; k < D; k++ ) {
             Atmp1 = silk_RSHIFT_ROUND( Af_QA[ k ], QA - 16 );                                       /* Q16 */
             nrg  = silk_SMLAWW( nrg, CAf[ k + 1 ], Atmp1 );                                         /* Q( -rshifts ) */
diff --git a/silk/fixed/corrMatrix_FIX.c b/silk/fixed/corrMatrix_FIX.c
index 3b194b107..df030fa5b 100644
--- a/silk/fixed/corrMatrix_FIX.c
+++ b/silk/fixed/corrMatrix_FIX.c
@@ -37,18 +37,18 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Calculates correlation vector X'*t */
 void silk_corrVector_FIX(
-    const opus_int16                *x,                                     /* I    x vector [L + order - 1] used to form data matrix X                         */
-    const opus_int16                *t,                                     /* I    Target vector [L]                                                           */
-    const opus_int                  L,                                      /* I    Length of vectors                                                           */
-    const opus_int                  order,                                  /* I    Max lag for correlation                                                     */
-    opus_int32                      *Xt,                                    /* O    Pointer to X'*t correlation vector [order]                                  */
-    const opus_int                  rshifts,                                /* I    Right shifts of correlations                                                */
+    const oac_int16                *x,                                     /* I    x vector [L + order - 1] used to form data matrix X                         */
+    const oac_int16                *t,                                     /* I    Target vector [L]                                                           */
+    const oac_int                  L,                                      /* I    Length of vectors                                                           */
+    const oac_int                  order,                                  /* I    Max lag for correlation                                                     */
+    oac_int32                      *Xt,                                    /* O    Pointer to X'*t correlation vector [order]                                  */
+    const oac_int                  rshifts,                                /* I    Right shifts of correlations                                                */
     int                             arch                                    /* I    Run-time architecture                                                       */
 )
 {
-    opus_int         lag, i;
-    const opus_int16 *ptr1, *ptr2;
-    opus_int32       inner_prod;
+    oac_int         lag, i;
+    const oac_int16 *ptr1, *ptr2;
+    oac_int32       inner_prod;
 
     ptr1 = &x[ order - 1 ]; /* Points to first sample of column 0 of X: X[:,0] */
     ptr2 = t;
@@ -74,18 +74,18 @@ void silk_corrVector_FIX(
 
 /* Calculates correlation matrix X'*X */
 void silk_corrMatrix_FIX(
-    const opus_int16                *x,                                     /* I    x vector [L + order - 1] used to form data matrix X                         */
-    const opus_int                  L,                                      /* I    Length of vectors                                                           */
-    const opus_int                  order,                                  /* I    Max lag for correlation                                                     */
-    opus_int32                      *XX,                                    /* O    Pointer to X'*X correlation matrix [ order x order ]                        */
-    opus_int32                      *nrg,                                    /* O    Energy of x vector                                                            */
-    opus_int                        *rshifts,                               /* O    Right shifts of correlations and energy                                     */
+    const oac_int16                *x,                                     /* I    x vector [L + order - 1] used to form data matrix X                         */
+    const oac_int                  L,                                      /* I    Length of vectors                                                           */
+    const oac_int                  order,                                  /* I    Max lag for correlation                                                     */
+    oac_int32                      *XX,                                    /* O    Pointer to X'*X correlation matrix [ order x order ]                        */
+    oac_int32                      *nrg,                                    /* O    Energy of x vector                                                            */
+    oac_int                        *rshifts,                               /* O    Right shifts of correlations and energy                                     */
     int                             arch                                    /* I    Run-time architecture                                                       */
 )
 {
-    opus_int         i, j, lag;
-    opus_int32       energy;
-    const opus_int16 *ptr1, *ptr2;
+    oac_int         i, j, lag;
+    oac_int32       energy;
+    const oac_int16 *ptr1, *ptr2;
 
     /* Calculate energy to find shift used to fit in 32 bits */
     silk_sum_sqr_shift( nrg, rshifts, x, L + order - 1 );
diff --git a/silk/fixed/encode_frame_FIX.c b/silk/fixed/encode_frame_FIX.c
index c2f5281f0..10f331154 100644
--- a/silk/fixed/encode_frame_FIX.c
+++ b/silk/fixed/encode_frame_FIX.c
@@ -35,25 +35,25 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "tuning_parameters.h"
 
 /* Low Bitrate Redundancy (LBRR) encoding. Reuse all parameters but encode with lower bitrate           */
-static OPUS_INLINE void silk_LBRR_encode_FIX(
+static OAC_INLINE void silk_LBRR_encode_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  Pointer to Silk FIX encoder control struct                                  */
-    const opus_int16                x16[],                                  /* I    Input signal                                                                */
-    opus_int                        condCoding                              /* I    The type of conditional coding used so far for this frame                   */
+    const oac_int16                x16[],                                  /* I    Input signal                                                                */
+    oac_int                        condCoding                              /* I    The type of conditional coding used so far for this frame                   */
 );
 
 void silk_encode_do_VAD_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
-    opus_int                        activity                                /* I    Decision of Opus voice activity detector                                    */
+    oac_int                        activity                                /* I    Decision of Oac voice activity detector                                    */
 )
 {
-    const opus_int activity_threshold = SILK_FIX_CONST( SPEECH_ACTIVITY_DTX_THRES, 8 );
+    const oac_int activity_threshold = SILK_FIX_CONST( SPEECH_ACTIVITY_DTX_THRES, 8 );
 
     /****************************/
     /* Voice Activity Detection */
     /****************************/
     silk_VAD_GetSA_Q8( &psEnc->sCmn, psEnc->sCmn.inputBuf + 1, psEnc->sCmn.arch );
-    /* If Opus VAD is inactive and Silk VAD is active: lower Silk VAD to just under the threshold */
+    /* If Oac VAD is inactive and Silk VAD is active: lower Silk VAD to just under the threshold */
     if( activity == VAD_NO_ACTIVITY && psEnc->sCmn.speech_activity_Q8 >= activity_threshold ) {
         psEnc->sCmn.speech_activity_Q8 = activity_threshold - 1;
     }
@@ -82,30 +82,30 @@ void silk_encode_do_VAD_FIX(
 /****************/
 /* Encode frame */
 /****************/
-opus_int silk_encode_frame_FIX(
+oac_int silk_encode_frame_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
-    opus_int32                      *pnBytesOut,                            /* O    Pointer to number of payload bytes;                                         */
+    oac_int32                      *pnBytesOut,                            /* O    Pointer to number of payload bytes;                                         */
     ec_enc                          *psRangeEnc,                            /* I/O  compressor data structure                                                   */
-    opus_int                        condCoding,                             /* I    The type of conditional coding to use                                       */
-    opus_int                        maxBits,                                /* I    If > 0: maximum number of output bits                                       */
-    opus_int                        useCBR                                  /* I    Flag to force constant-bitrate operation                                    */
+    oac_int                        condCoding,                             /* I    The type of conditional coding to use                                       */
+    oac_int                        maxBits,                                /* I    If > 0: maximum number of output bits                                       */
+    oac_int                        useCBR                                  /* I    Flag to force constant-bitrate operation                                    */
 )
 {
     silk_encoder_control_FIX sEncCtrl;
-    opus_int     i, iter, maxIter, found_upper, found_lower, ret = 0;
-    opus_int16   *x_frame;
+    oac_int     i, iter, maxIter, found_upper, found_lower, ret = 0;
+    oac_int16   *x_frame;
     ec_enc       sRangeEnc_copy, sRangeEnc_copy2;
     VARDECL(silk_nsq_state, sNSQ_copy);
-    opus_int32   seed_copy, nBits, nBits_lower, nBits_upper, gainMult_lower, gainMult_upper;
-    opus_int32   gainsID, gainsID_lower, gainsID_upper;
-    opus_int16   gainMult_Q8;
-    opus_int16   ec_prevLagIndex_copy;
-    opus_int     ec_prevSignalType_copy;
-    opus_int8    LastGainIndex_copy2;
-    opus_int     gain_lock[ MAX_NB_SUBFR ] = {0};
-    opus_int16   best_gain_mult[ MAX_NB_SUBFR ];
-    opus_int     best_sum[ MAX_NB_SUBFR ];
-    opus_int     bits_margin;
+    oac_int32   seed_copy, nBits, nBits_lower, nBits_upper, gainMult_lower, gainMult_upper;
+    oac_int32   gainsID, gainsID_lower, gainsID_upper;
+    oac_int16   gainMult_Q8;
+    oac_int16   ec_prevLagIndex_copy;
+    oac_int     ec_prevSignalType_copy;
+    oac_int8    LastGainIndex_copy2;
+    oac_int     gain_lock[ MAX_NB_SUBFR ] = {0};
+    oac_int16   best_gain_mult[ MAX_NB_SUBFR ];
+    oac_int     best_sum[ MAX_NB_SUBFR ];
+    oac_int     bits_margin;
     SAVE_STACK;
 
     /* Using ALLOC() instead of a regular stack allocation to minimize real stack use when using the pseudostack.
@@ -133,16 +133,16 @@ opus_int silk_encode_frame_FIX(
     /*******************************************/
     /* Copy new frame to front of input buffer */
     /*******************************************/
-    silk_memcpy( x_frame + LA_SHAPE_MS * psEnc->sCmn.fs_kHz, psEnc->sCmn.inputBuf + 1, psEnc->sCmn.frame_length * sizeof( opus_int16 ) );
+    silk_memcpy( x_frame + LA_SHAPE_MS * psEnc->sCmn.fs_kHz, psEnc->sCmn.inputBuf + 1, psEnc->sCmn.frame_length * sizeof( oac_int16 ) );
 
     if( !psEnc->sCmn.prefillFlag ) {
-        VARDECL( opus_int16, res_pitch );
-        VARDECL( opus_uint8, ec_buf_copy );
-        opus_int16 *res_pitch_frame;
+        VARDECL( oac_int16, res_pitch );
+        VARDECL( oac_uint8, ec_buf_copy );
+        oac_int16 *res_pitch_frame;
 
         ALLOC( res_pitch,
                psEnc->sCmn.la_pitch + psEnc->sCmn.frame_length
-                   + psEnc->sCmn.ltp_mem_length, opus_int16 );
+                   + psEnc->sCmn.ltp_mem_length, oac_int16 );
         /* start of pitch LPC residual frame */
         res_pitch_frame = res_pitch + psEnc->sCmn.ltp_mem_length;
 
@@ -185,7 +185,7 @@ opus_int silk_encode_frame_FIX(
         seed_copy = psEnc->sCmn.indices.Seed;
         ec_prevLagIndex_copy = psEnc->sCmn.ec_prevLagIndex;
         ec_prevSignalType_copy = psEnc->sCmn.ec_prevSignalType;
-        ALLOC( ec_buf_copy, 1275, opus_uint8 );
+        ALLOC( ec_buf_copy, 1275, oac_uint8 );
         for( iter = 0; ; iter++ ) {
             if( gainsID == gainsID_lower ) {
                 nBits = nBits_lower;
@@ -342,7 +342,7 @@ opus_int silk_encode_frame_FIX(
             }
 
             for( i = 0; i < psEnc->sCmn.nb_subfr; i++ ) {
-                opus_int16 tmp;
+                oac_int16 tmp;
                 if ( gain_lock[i] ) {
                     tmp = best_gain_mult[i];
                 } else {
@@ -363,7 +363,7 @@ opus_int silk_encode_frame_FIX(
 
     /* Update input buffer */
     silk_memmove( psEnc->x_buf, &psEnc->x_buf[ psEnc->sCmn.frame_length ],
-        ( psEnc->sCmn.ltp_mem_length + LA_SHAPE_MS * psEnc->sCmn.fs_kHz ) * sizeof( opus_int16 ) );
+        ( psEnc->sCmn.ltp_mem_length + LA_SHAPE_MS * psEnc->sCmn.fs_kHz ) * sizeof( oac_int16 ) );
 
     /* Exit without entropy coding */
     if( psEnc->sCmn.prefillFlag ) {
@@ -389,14 +389,14 @@ opus_int silk_encode_frame_FIX(
 }
 
 /* Low-Bitrate Redundancy (LBRR) encoding. Reuse all parameters but encode excitation at lower bitrate  */
-static OPUS_INLINE void silk_LBRR_encode_FIX(
+static OAC_INLINE void silk_LBRR_encode_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  Pointer to Silk FIX encoder control struct                                  */
-    const opus_int16                x16[],                                  /* I    Input signal                                                                */
-    opus_int                        condCoding                              /* I    The type of conditional coding used so far for this frame                   */
+    const oac_int16                x16[],                                  /* I    Input signal                                                                */
+    oac_int                        condCoding                              /* I    The type of conditional coding used so far for this frame                   */
 )
 {
-    opus_int32   TempGains_Q16[ MAX_NB_SUBFR ];
+    oac_int32   TempGains_Q16[ MAX_NB_SUBFR ];
     SideInfoIndices *psIndices_LBRR = &psEnc->sCmn.indices_LBRR[ psEnc->sCmn.nFramesEncoded ];
     VARDECL(silk_nsq_state, sNSQ_LBRR);
     SAVE_STACK;
@@ -416,7 +416,7 @@ static OPUS_INLINE void silk_LBRR_encode_FIX(
         silk_memcpy( psIndices_LBRR, &psEnc->sCmn.indices, sizeof( SideInfoIndices ) );
 
         /* Save original gains */
-        silk_memcpy( TempGains_Q16, psEncCtrl->Gains_Q16, psEnc->sCmn.nb_subfr * sizeof( opus_int32 ) );
+        silk_memcpy( TempGains_Q16, psEncCtrl->Gains_Q16, psEnc->sCmn.nb_subfr * sizeof( oac_int32 ) );
 
         if( psEnc->sCmn.nFramesEncoded == 0 || psEnc->sCmn.LBRR_flags[ psEnc->sCmn.nFramesEncoded - 1 ] == 0 ) {
             /* First frame in packet or previous frame not LBRR coded */
@@ -448,7 +448,7 @@ static OPUS_INLINE void silk_LBRR_encode_FIX(
         }
 
         /* Restore original gains */
-        silk_memcpy( psEncCtrl->Gains_Q16, TempGains_Q16, psEnc->sCmn.nb_subfr * sizeof( opus_int32 ) );
+        silk_memcpy( psEncCtrl->Gains_Q16, TempGains_Q16, psEnc->sCmn.nb_subfr * sizeof( oac_int32 ) );
     }
     RESTORE_STACK;
 }
diff --git a/silk/fixed/find_LPC_FIX.c b/silk/fixed/find_LPC_FIX.c
index c762a0f2a..8be9692af 100644
--- a/silk/fixed/find_LPC_FIX.c
+++ b/silk/fixed/find_LPC_FIX.c
@@ -36,22 +36,22 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Finds LPC vector from correlations, and converts to NLSF */
 void silk_find_LPC_FIX(
     silk_encoder_state              *psEncC,                                /* I/O  Encoder state                                                               */
-    opus_int16                      NLSF_Q15[],                             /* O    NLSFs                                                                       */
-    const opus_int16                x[],                                    /* I    Input signal                                                                */
-    const opus_int32                minInvGain_Q30                          /* I    Inverse of max prediction gain                                              */
+    oac_int16                      NLSF_Q15[],                             /* O    NLSFs                                                                       */
+    const oac_int16                x[],                                    /* I    Input signal                                                                */
+    const oac_int32                minInvGain_Q30                          /* I    Inverse of max prediction gain                                              */
 )
 {
-    opus_int     k, subfr_length;
-    opus_int32   a_Q16[ MAX_LPC_ORDER ];
-    opus_int     isInterpLower, shift;
-    opus_int32   res_nrg0, res_nrg1;
-    opus_int     rshift0, rshift1;
+    oac_int     k, subfr_length;
+    oac_int32   a_Q16[ MAX_LPC_ORDER ];
+    oac_int     isInterpLower, shift;
+    oac_int32   res_nrg0, res_nrg1;
+    oac_int     rshift0, rshift1;
 
     /* Used only for LSF interpolation */
-    opus_int32   a_tmp_Q16[ MAX_LPC_ORDER ], res_nrg_interp, res_nrg, res_tmp_nrg;
-    opus_int     res_nrg_interp_Q, res_nrg_Q, res_tmp_nrg_Q;
-    opus_int16   a_tmp_Q12[ MAX_LPC_ORDER ];
-    opus_int16   NLSF0_Q15[ MAX_LPC_ORDER ];
+    oac_int32   a_tmp_Q16[ MAX_LPC_ORDER ], res_nrg_interp, res_nrg, res_tmp_nrg;
+    oac_int     res_nrg_interp_Q, res_nrg_Q, res_tmp_nrg_Q;
+    oac_int16   a_tmp_Q12[ MAX_LPC_ORDER ];
+    oac_int16   NLSF0_Q15[ MAX_LPC_ORDER ];
     SAVE_STACK;
 
     subfr_length = psEncC->subfr_length + psEncC->predictLPCOrder;
@@ -63,7 +63,7 @@ void silk_find_LPC_FIX(
     silk_burg_modified( &res_nrg, &res_nrg_Q, a_Q16, x, minInvGain_Q30, subfr_length, psEncC->nb_subfr, psEncC->predictLPCOrder, psEncC->arch );
 
     if( psEncC->useInterpolatedNLSFs && !psEncC->first_frame_after_reset && psEncC->nb_subfr == MAX_NB_SUBFR ) {
-        VARDECL( opus_int16, LPC_res );
+        VARDECL( oac_int16, LPC_res );
 
         /* Optimal solution for last 10 ms */
         silk_burg_modified( &res_tmp_nrg, &res_tmp_nrg_Q, a_tmp_Q16, x + 2 * subfr_length, minInvGain_Q30, subfr_length, 2, psEncC->predictLPCOrder, psEncC->arch );
@@ -84,7 +84,7 @@ void silk_find_LPC_FIX(
         /* Convert to NLSFs */
         silk_A2NLSF( NLSF_Q15, a_tmp_Q16, psEncC->predictLPCOrder );
 
-        ALLOC( LPC_res, 2 * subfr_length, opus_int16 );
+        ALLOC( LPC_res, 2 * subfr_length, oac_int16 );
 
         /* Search over interpolation indices to find the one with lowest residual energy */
         for( k = 3; k >= 0; k-- ) {
@@ -136,7 +136,7 @@ void silk_find_LPC_FIX(
                 /* Interpolation has lower residual energy */
                 res_nrg   = res_nrg_interp;
                 res_nrg_Q = res_nrg_interp_Q;
-                psEncC->indices.NLSFInterpCoef_Q2 = (opus_int8)k;
+                psEncC->indices.NLSFInterpCoef_Q2 = (oac_int8)k;
             }
         }
     }
diff --git a/silk/fixed/find_LTP_FIX.c b/silk/fixed/find_LTP_FIX.c
index 62d4afb25..506c6777c 100644
--- a/silk/fixed/find_LTP_FIX.c
+++ b/silk/fixed/find_LTP_FIX.c
@@ -33,20 +33,20 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "tuning_parameters.h"
 
 void silk_find_LTP_FIX(
-    opus_int32                      XXLTP_Q17[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ], /* O    Correlation matrix                                               */
-    opus_int32                      xXLTP_Q17[ MAX_NB_SUBFR * LTP_ORDER ],  /* O    Correlation vector                                                          */
-    const opus_int16                r_ptr[],                                /* I    Residual signal after LPC                                                   */
-    const opus_int                  lag[ MAX_NB_SUBFR ],                    /* I    LTP lags                                                                    */
-    const opus_int                  subfr_length,                           /* I    Subframe length                                                             */
-    const opus_int                  nb_subfr,                               /* I    Number of subframes                                                         */
+    oac_int32                      XXLTP_Q17[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ], /* O    Correlation matrix                                               */
+    oac_int32                      xXLTP_Q17[ MAX_NB_SUBFR * LTP_ORDER ],  /* O    Correlation vector                                                          */
+    const oac_int16                r_ptr[],                                /* I    Residual signal after LPC                                                   */
+    const oac_int                  lag[ MAX_NB_SUBFR ],                    /* I    LTP lags                                                                    */
+    const oac_int                  subfr_length,                           /* I    Subframe length                                                             */
+    const oac_int                  nb_subfr,                               /* I    Number of subframes                                                         */
     int                             arch                                    /* I    Run-time architecture                                                       */
 )
 {
-    opus_int   i, k, extra_shifts;
-    opus_int   xx_shifts, xX_shifts, XX_shifts;
-    const opus_int16 *lag_ptr;
-    opus_int32 *XXLTP_Q17_ptr, *xXLTP_Q17_ptr;
-    opus_int32 xx, nrg, temp;
+    oac_int   i, k, extra_shifts;
+    oac_int   xx_shifts, xX_shifts, XX_shifts;
+    const oac_int16 *lag_ptr;
+    oac_int32 *XXLTP_Q17_ptr, *xXLTP_Q17_ptr;
+    oac_int32 xx, nrg, temp;
 
     xXLTP_Q17_ptr = xXLTP_Q17;
     XXLTP_Q17_ptr = XXLTP_Q17;
@@ -85,10 +85,10 @@ TIC(div)
         }
 #else
         for( i = 0; i < LTP_ORDER * LTP_ORDER; i++ ) {
-            XXLTP_Q17_ptr[ i ] = (opus_int32)( silk_LSHIFT64( (opus_int64)XXLTP_Q17_ptr[ i ], 17 ) / temp );
+            XXLTP_Q17_ptr[ i ] = (oac_int32)( silk_LSHIFT64( (oac_int64)XXLTP_Q17_ptr[ i ], 17 ) / temp );
         }
         for( i = 0; i < LTP_ORDER; i++ ) {
-            xXLTP_Q17_ptr[ i ] = (opus_int32)( silk_LSHIFT64( (opus_int64)xXLTP_Q17_ptr[ i ], 17 ) / temp );
+            xXLTP_Q17_ptr[ i ] = (oac_int32)( silk_LSHIFT64( (oac_int64)xXLTP_Q17_ptr[ i ], 17 ) / temp );
         }
 #endif
 TOC(div)
diff --git a/silk/fixed/find_pitch_lags_FIX.c b/silk/fixed/find_pitch_lags_FIX.c
index 6c3379f2b..73b3e65eb 100644
--- a/silk/fixed/find_pitch_lags_FIX.c
+++ b/silk/fixed/find_pitch_lags_FIX.c
@@ -37,20 +37,20 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_find_pitch_lags_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  encoder control                                                             */
-    opus_int16                      res[],                                  /* O    residual                                                                    */
-    const opus_int16                x[],                                    /* I    Speech signal                                                               */
+    oac_int16                      res[],                                  /* O    residual                                                                    */
+    const oac_int16                x[],                                    /* I    Speech signal                                                               */
     int                             arch                                    /* I    Run-time architecture                                                       */
 )
 {
-    opus_int   buf_len, i, scale;
-    opus_int32 thrhld_Q13, res_nrg;
-    const opus_int16 *x_ptr;
-    VARDECL( opus_int16, Wsig );
-    opus_int16 *Wsig_ptr;
-    opus_int32 auto_corr[ MAX_FIND_PITCH_LPC_ORDER + 1 ];
-    opus_int16 rc_Q15[    MAX_FIND_PITCH_LPC_ORDER ];
-    opus_int32 A_Q24[     MAX_FIND_PITCH_LPC_ORDER ];
-    opus_int16 A_Q12[     MAX_FIND_PITCH_LPC_ORDER ];
+    oac_int   buf_len, i, scale;
+    oac_int32 thrhld_Q13, res_nrg;
+    const oac_int16 *x_ptr;
+    VARDECL( oac_int16, Wsig );
+    oac_int16 *Wsig_ptr;
+    oac_int32 auto_corr[ MAX_FIND_PITCH_LPC_ORDER + 1 ];
+    oac_int16 rc_Q15[    MAX_FIND_PITCH_LPC_ORDER ];
+    oac_int32 A_Q24[     MAX_FIND_PITCH_LPC_ORDER ];
+    oac_int16 A_Q12[     MAX_FIND_PITCH_LPC_ORDER ];
     SAVE_STACK;
 
     /******************************************/
@@ -67,7 +67,7 @@ void silk_find_pitch_lags_FIX(
 
     /* Calculate windowed signal */
 
-    ALLOC( Wsig, psEnc->sCmn.pitch_LPC_win_length, opus_int16 );
+    ALLOC( Wsig, psEnc->sCmn.pitch_LPC_win_length, oac_int16 );
 
     /* First LA_LTP samples */
     x_ptr = x + buf_len - psEnc->sCmn.pitch_LPC_win_length;
@@ -77,7 +77,7 @@ void silk_find_pitch_lags_FIX(
     /* Middle un - windowed samples */
     Wsig_ptr  += psEnc->sCmn.la_pitch;
     x_ptr += psEnc->sCmn.la_pitch;
-    silk_memcpy( Wsig_ptr, x_ptr, ( psEnc->sCmn.pitch_LPC_win_length - silk_LSHIFT( psEnc->sCmn.la_pitch, 1 ) ) * sizeof( opus_int16 ) );
+    silk_memcpy( Wsig_ptr, x_ptr, ( psEnc->sCmn.pitch_LPC_win_length - silk_LSHIFT( psEnc->sCmn.la_pitch, 1 ) ) * sizeof( oac_int16 ) );
 
     /* Last LA_LTP samples */
     Wsig_ptr  += psEnc->sCmn.pitch_LPC_win_length - silk_LSHIFT( psEnc->sCmn.la_pitch, 1 );
@@ -101,7 +101,7 @@ void silk_find_pitch_lags_FIX(
 
     /* Convert From 32 bit Q24 to 16 bit Q12 coefs */
     for( i = 0; i < psEnc->sCmn.pitchEstimationLPCOrder; i++ ) {
-        A_Q12[ i ] = (opus_int16)silk_SAT16( silk_RSHIFT( A_Q24[ i ], 12 ) );
+        A_Q12[ i ] = (oac_int16)silk_SAT16( silk_RSHIFT( A_Q24[ i ], 12 ) );
     }
 
     /* Do BWE */
@@ -126,7 +126,7 @@ void silk_find_pitch_lags_FIX(
         /*****************************************/
         if( silk_pitch_analysis_core( res, psEncCtrl->pitchL, &psEnc->sCmn.indices.lagIndex, &psEnc->sCmn.indices.contourIndex,
                 &psEnc->LTPCorr_Q15, psEnc->sCmn.prevLag, psEnc->sCmn.pitchEstimationThreshold_Q16,
-                (opus_int)thrhld_Q13, psEnc->sCmn.fs_kHz, psEnc->sCmn.pitchEstimationComplexity, psEnc->sCmn.nb_subfr,
+                (oac_int)thrhld_Q13, psEnc->sCmn.fs_kHz, psEnc->sCmn.pitchEstimationComplexity, psEnc->sCmn.nb_subfr,
                 psEnc->sCmn.arch) == 0 )
         {
             psEnc->sCmn.indices.signalType = TYPE_VOICED;
diff --git a/silk/fixed/find_pred_coefs_FIX.c b/silk/fixed/find_pred_coefs_FIX.c
index c49e44f6e..b376bde5b 100644
--- a/silk/fixed/find_pred_coefs_FIX.c
+++ b/silk/fixed/find_pred_coefs_FIX.c
@@ -35,19 +35,19 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_find_pred_coefs_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  encoder control                                                             */
-    const opus_int16                res_pitch[],                            /* I    Residual from pitch analysis                                                */
-    const opus_int16                x[],                                    /* I    Speech signal                                                               */
-    opus_int                        condCoding                              /* I    The type of conditional coding to use                                       */
+    const oac_int16                res_pitch[],                            /* I    Residual from pitch analysis                                                */
+    const oac_int16                x[],                                    /* I    Speech signal                                                               */
+    oac_int                        condCoding                              /* I    The type of conditional coding to use                                       */
 )
 {
-    opus_int         i;
-    opus_int32       invGains_Q16[ MAX_NB_SUBFR ], local_gains[ MAX_NB_SUBFR ];
+    oac_int         i;
+    oac_int32       invGains_Q16[ MAX_NB_SUBFR ], local_gains[ MAX_NB_SUBFR ];
     /* Set to NLSF_Q15 to zero so we don't copy junk to the state. */
-    opus_int16       NLSF_Q15[ MAX_LPC_ORDER ]={0};
-    const opus_int16 *x_ptr;
-    opus_int16       *x_pre_ptr;
-    VARDECL( opus_int16, LPC_in_pre );
-    opus_int32       min_gain_Q16, minInvGain_Q30;
+    oac_int16       NLSF_Q15[ MAX_LPC_ORDER ]={0};
+    const oac_int16 *x_ptr;
+    oac_int16       *x_pre_ptr;
+    VARDECL( oac_int16, LPC_in_pre );
+    oac_int32       min_gain_Q16, minInvGain_Q30;
     SAVE_STACK;
 
     /* weighting for weighted least squares */
@@ -68,23 +68,23 @@ void silk_find_pred_coefs_FIX(
         silk_assert( invGains_Q16[ i ] == silk_SAT16( invGains_Q16[ i ] ) );
 
         /* Invert the inverted and normalized gains */
-        local_gains[ i ] = silk_DIV32( ( (opus_int32)1 << 16 ), invGains_Q16[ i ] );
+        local_gains[ i ] = silk_DIV32( ( (oac_int32)1 << 16 ), invGains_Q16[ i ] );
     }
 
     ALLOC( LPC_in_pre,
            psEnc->sCmn.nb_subfr * psEnc->sCmn.predictLPCOrder
-               + psEnc->sCmn.frame_length, opus_int16 );
+               + psEnc->sCmn.frame_length, oac_int16 );
     if( psEnc->sCmn.indices.signalType == TYPE_VOICED ) {
-        VARDECL( opus_int32, xXLTP_Q17 );
-        VARDECL( opus_int32, XXLTP_Q17 );
+        VARDECL( oac_int32, xXLTP_Q17 );
+        VARDECL( oac_int32, XXLTP_Q17 );
 
         /**********/
         /* VOICED */
         /**********/
         celt_assert( psEnc->sCmn.ltp_mem_length - psEnc->sCmn.predictLPCOrder >= psEncCtrl->pitchL[ 0 ] + LTP_ORDER / 2 );
 
-        ALLOC( xXLTP_Q17, psEnc->sCmn.nb_subfr * LTP_ORDER, opus_int32 );
-        ALLOC( XXLTP_Q17, psEnc->sCmn.nb_subfr * LTP_ORDER * LTP_ORDER, opus_int32 );
+        ALLOC( xXLTP_Q17, psEnc->sCmn.nb_subfr * LTP_ORDER, oac_int32 );
+        ALLOC( XXLTP_Q17, psEnc->sCmn.nb_subfr * LTP_ORDER * LTP_ORDER, oac_int32 );
 
         /* LTP analysis */
         silk_find_LTP_FIX( XXLTP_Q17, xXLTP_Q17, res_pitch,
@@ -115,7 +115,7 @@ void silk_find_pred_coefs_FIX(
             x_ptr     += psEnc->sCmn.subfr_length;
         }
 
-        silk_memset( psEncCtrl->LTPCoef_Q14, 0, psEnc->sCmn.nb_subfr * LTP_ORDER * sizeof( opus_int16 ) );
+        silk_memset( psEncCtrl->LTPCoef_Q14, 0, psEnc->sCmn.nb_subfr * LTP_ORDER * sizeof( oac_int16 ) );
         psEncCtrl->LTPredCodGain_Q7 = 0;
         psEnc->sCmn.sum_log_gain_Q7 = 0;
         psEncCtrl->LTP_scale_Q14 = 0;
@@ -125,7 +125,7 @@ void silk_find_pred_coefs_FIX(
     if( psEnc->sCmn.first_frame_after_reset ) {
         minInvGain_Q30 = SILK_FIX_CONST( 1.0f / MAX_PREDICTION_POWER_GAIN_AFTER_RESET, 30 );
     } else {
-        minInvGain_Q30 = silk_log2lin( silk_SMLAWB( 16 << 7, (opus_int32)psEncCtrl->LTPredCodGain_Q7, SILK_FIX_CONST( 1.0 / 3, 16 ) ) );      /* Q16 */
+        minInvGain_Q30 = silk_log2lin( silk_SMLAWB( 16 << 7, (oac_int32)psEncCtrl->LTPredCodGain_Q7, SILK_FIX_CONST( 1.0 / 3, 16 ) ) );      /* Q16 */
         minInvGain_Q30 = silk_DIV32_varQ( minInvGain_Q30,
             silk_SMULWW( SILK_FIX_CONST( MAX_PREDICTION_POWER_GAIN, 0 ),
                 silk_SMLAWB( SILK_FIX_CONST( 0.25, 18 ), SILK_FIX_CONST( 0.75, 18 ), psEncCtrl->coding_quality_Q14 ) ), 14 );
diff --git a/silk/fixed/k2a_FIX.c b/silk/fixed/k2a_FIX.c
index 549f6eada..e52076c8d 100644
--- a/silk/fixed/k2a_FIX.c
+++ b/silk/fixed/k2a_FIX.c
@@ -33,13 +33,13 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Step up function, converts reflection coefficients to prediction coefficients */
 void silk_k2a(
-    opus_int32                  *A_Q24,             /* O    Prediction coefficients [order] Q24                         */
-    const opus_int16            *rc_Q15,            /* I    Reflection coefficients [order] Q15                         */
-    const opus_int32            order               /* I    Prediction order                                            */
+    oac_int32                  *A_Q24,             /* O    Prediction coefficients [order] Q24                         */
+    const oac_int16            *rc_Q15,            /* I    Reflection coefficients [order] Q15                         */
+    const oac_int32            order               /* I    Prediction order                                            */
 )
 {
-    opus_int   k, n;
-    opus_int32 rc, tmp1, tmp2;
+    oac_int   k, n;
+    oac_int32 rc, tmp1, tmp2;
 
     for( k = 0; k < order; k++ ) {
         rc = rc_Q15[ k ];
@@ -49,6 +49,6 @@ void silk_k2a(
             A_Q24[ n ]         = silk_SMLAWB( tmp1, silk_LSHIFT( tmp2, 1 ), rc );
             A_Q24[ k - n - 1 ] = silk_SMLAWB( tmp2, silk_LSHIFT( tmp1, 1 ), rc );
         }
-        A_Q24[ k ] = -silk_LSHIFT( (opus_int32)rc_Q15[ k ], 9 );
+        A_Q24[ k ] = -silk_LSHIFT( (oac_int32)rc_Q15[ k ], 9 );
     }
 }
diff --git a/silk/fixed/k2a_Q16_FIX.c b/silk/fixed/k2a_Q16_FIX.c
index 1595aa621..c793e706f 100644
--- a/silk/fixed/k2a_Q16_FIX.c
+++ b/silk/fixed/k2a_Q16_FIX.c
@@ -33,13 +33,13 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Step up function, converts reflection coefficients to prediction coefficients */
 void silk_k2a_Q16(
-    opus_int32                  *A_Q24,             /* O    Prediction coefficients [order] Q24                         */
-    const opus_int32            *rc_Q16,            /* I    Reflection coefficients [order] Q16                         */
-    const opus_int32            order               /* I    Prediction order                                            */
+    oac_int32                  *A_Q24,             /* O    Prediction coefficients [order] Q24                         */
+    const oac_int32            *rc_Q16,            /* I    Reflection coefficients [order] Q16                         */
+    const oac_int32            order               /* I    Prediction order                                            */
 )
 {
-    opus_int   k, n;
-    opus_int32 rc, tmp1, tmp2;
+    oac_int   k, n;
+    oac_int32 rc, tmp1, tmp2;
 
     for( k = 0; k < order; k++ ) {
         rc = rc_Q16[ k ];
diff --git a/silk/fixed/main_FIX.h b/silk/fixed/main_FIX.h
index 53a97c5a9..fd2edf549 100644
--- a/silk/fixed/main_FIX.h
+++ b/silk/fixed/main_FIX.h
@@ -36,8 +36,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "debug.h"
 #include "entenc.h"
 
-#if ((defined(OPUS_ARM_ASM) && defined(FIXED_POINT)) \
-   || defined(OPUS_ARM_MAY_HAVE_NEON_INTR))
+#if ((defined(OAC_ARM_ASM) && defined(FIXED_POINT)) \
+   || defined(OAC_ARM_MAY_HAVE_NEON_INTR))
 #include "fixed/arm/warped_autocorrelation_FIX_arm.h"
 #endif
 
@@ -61,32 +61,32 @@ void silk_HP_variable_cutoff(
 /* Encoder main function */
 void silk_encode_do_VAD_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
-    opus_int                        activity                                /* I    Decision of Opus voice activity detector                                    */
+    oac_int                        activity                                /* I    Decision of Oac voice activity detector                                    */
 );
 
 /* Encoder main function */
-opus_int silk_encode_frame_FIX(
+oac_int silk_encode_frame_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
-    opus_int32                      *pnBytesOut,                            /* O    Pointer to number of payload bytes;                                         */
+    oac_int32                      *pnBytesOut,                            /* O    Pointer to number of payload bytes;                                         */
     ec_enc                          *psRangeEnc,                            /* I/O  compressor data structure                                                   */
-    opus_int                        condCoding,                             /* I    The type of conditional coding to use                                       */
-    opus_int                        maxBits,                                /* I    If > 0: maximum number of output bits                                       */
-    opus_int                        useCBR                                  /* I    Flag to force constant-bitrate operation                                    */
+    oac_int                        condCoding,                             /* I    The type of conditional coding to use                                       */
+    oac_int                        maxBits,                                /* I    If > 0: maximum number of output bits                                       */
+    oac_int                        useCBR                                  /* I    Flag to force constant-bitrate operation                                    */
 );
 
 /* Initializes the Silk encoder state */
-opus_int silk_init_encoder(
+oac_int silk_init_encoder(
     silk_encoder_state_Fxx          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
     int                              arch                                   /* I    Run-time architecture                                                       */
 );
 
 /* Control the Silk encoder */
-opus_int silk_control_encoder(
+oac_int silk_control_encoder(
     silk_encoder_state_Fxx          *psEnc,                                 /* I/O  Pointer to Silk encoder state                                               */
     silk_EncControlStruct           *encControl,                            /* I    Control structure                                                           */
-    const opus_int                  allow_bw_switch,                        /* I    Flag to allow switching audio bandwidth                                     */
-    const opus_int                  channelNb,                              /* I    Channel number                                                              */
-    const opus_int                  force_fs_kHz
+    const oac_int                  allow_bw_switch,                        /* I    Flag to allow switching audio bandwidth                                     */
+    const oac_int                  channelNb,                              /* I    Channel number                                                              */
+    const oac_int                  force_fs_kHz
 );
 
 /**************************/
@@ -96,19 +96,19 @@ opus_int silk_control_encoder(
 void silk_noise_shape_analysis_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Encoder state FIX                                                           */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  Encoder control FIX                                                         */
-    const opus_int16                *pitch_res,                             /* I    LPC residual from pitch analysis                                            */
-    const opus_int16                *x,                                     /* I    Input signal [ frame_length + la_shape ]                                    */
+    const oac_int16                *pitch_res,                             /* I    LPC residual from pitch analysis                                            */
+    const oac_int16                *x,                                     /* I    Input signal [ frame_length + la_shape ]                                    */
     int                              arch                                   /* I    Run-time architecture                                                       */
 );
 
 /* Autocorrelations for a warped frequency axis */
 void silk_warped_autocorrelation_FIX_c(
-          opus_int32                *corr,                                  /* O    Result [order + 1]                                                          */
-          opus_int                  *scale,                                 /* O    Scaling of the correlation vector                                           */
-    const opus_int16                *input,                                 /* I    Input data to correlate                                                     */
-    const opus_int                  warping_Q16,                            /* I    Warping coefficient                                                         */
-    const opus_int                  length,                                 /* I    Length of input                                                             */
-    const opus_int                  order                                   /* I    Correlation order (even)                                                    */
+          oac_int32                *corr,                                  /* O    Result [order + 1]                                                          */
+          oac_int                  *scale,                                 /* O    Scaling of the correlation vector                                           */
+    const oac_int16                *input,                                 /* I    Input data to correlate                                                     */
+    const oac_int                  warping_Q16,                            /* I    Warping coefficient                                                         */
+    const oac_int                  length,                                 /* I    Length of input                                                             */
+    const oac_int                  order                                   /* I    Correlation order (even)                                                    */
 );
 
 #if !defined(OVERRIDE_silk_warped_autocorrelation_FIX)
@@ -120,7 +120,7 @@ void silk_warped_autocorrelation_FIX_c(
 void silk_LTP_scale_ctrl_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  encoder control                                                             */
-    opus_int                        condCoding                              /* I    The type of conditional coding to use                                       */
+    oac_int                        condCoding                              /* I    The type of conditional coding to use                                       */
 );
 
 /**********************************************/
@@ -130,8 +130,8 @@ void silk_LTP_scale_ctrl_FIX(
 void silk_find_pitch_lags_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  encoder control                                                             */
-    opus_int16                      res[],                                  /* O    residual                                                                    */
-    const opus_int16                x[],                                    /* I    Speech signal                                                               */
+    oac_int16                      res[],                                  /* O    residual                                                                    */
+    const oac_int16                x[],                                    /* I    Speech signal                                                               */
     int                             arch                                    /* I    Run-time architecture                                                       */
 );
 
@@ -139,70 +139,70 @@ void silk_find_pitch_lags_FIX(
 void silk_find_pred_coefs_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  encoder control                                                             */
-    const opus_int16                res_pitch[],                            /* I    Residual from pitch analysis                                                */
-    const opus_int16                x[],                                    /* I    Speech signal                                                               */
-    opus_int                        condCoding                              /* I    The type of conditional coding to use                                       */
+    const oac_int16                res_pitch[],                            /* I    Residual from pitch analysis                                                */
+    const oac_int16                x[],                                    /* I    Speech signal                                                               */
+    oac_int                        condCoding                              /* I    The type of conditional coding to use                                       */
 );
 
 /* LPC analysis */
 void silk_find_LPC_FIX(
     silk_encoder_state              *psEncC,                                /* I/O  Encoder state                                                               */
-    opus_int16                      NLSF_Q15[],                             /* O    NLSFs                                                                       */
-    const opus_int16                x[],                                    /* I    Input signal                                                                */
-    const opus_int32                minInvGain_Q30                          /* I    Inverse of max prediction gain                                              */
+    oac_int16                      NLSF_Q15[],                             /* O    NLSFs                                                                       */
+    const oac_int16                x[],                                    /* I    Input signal                                                                */
+    const oac_int32                minInvGain_Q30                          /* I    Inverse of max prediction gain                                              */
 );
 
 /* LTP analysis */
 void silk_find_LTP_FIX(
-    opus_int32                      XXLTP_Q17[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ], /* O    Correlation matrix                                               */
-    opus_int32                      xXLTP_Q17[ MAX_NB_SUBFR * LTP_ORDER ],  /* O    Correlation vector                                                          */
-    const opus_int16                r_lpc[],                                /* I    Residual signal after LPC                                                   */
-    const opus_int                  lag[ MAX_NB_SUBFR ],                    /* I    LTP lags                                                                    */
-    const opus_int                  subfr_length,                           /* I    Subframe length                                                             */
-    const opus_int                  nb_subfr,                               /* I    Number of subframes                                                         */
+    oac_int32                      XXLTP_Q17[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ], /* O    Correlation matrix                                               */
+    oac_int32                      xXLTP_Q17[ MAX_NB_SUBFR * LTP_ORDER ],  /* O    Correlation vector                                                          */
+    const oac_int16                r_lpc[],                                /* I    Residual signal after LPC                                                   */
+    const oac_int                  lag[ MAX_NB_SUBFR ],                    /* I    LTP lags                                                                    */
+    const oac_int                  subfr_length,                           /* I    Subframe length                                                             */
+    const oac_int                  nb_subfr,                               /* I    Number of subframes                                                         */
     int                             arch                                    /* I    Run-time architecture                                                       */
 );
 
 void silk_LTP_analysis_filter_FIX(
-    opus_int16                      *LTP_res,                               /* O    LTP residual signal of length MAX_NB_SUBFR * ( pre_length + subfr_length )  */
-    const opus_int16                *x,                                     /* I    Pointer to input signal with at least max( pitchL ) preceding samples       */
-    const opus_int16                LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],/* I    LTP_ORDER LTP coefficients for each MAX_NB_SUBFR subframe                   */
-    const opus_int                  pitchL[ MAX_NB_SUBFR ],                 /* I    Pitch lag, one for each subframe                                            */
-    const opus_int32                invGains_Q16[ MAX_NB_SUBFR ],           /* I    Inverse quantization gains, one for each subframe                           */
-    const opus_int                  subfr_length,                           /* I    Length of each subframe                                                     */
-    const opus_int                  nb_subfr,                               /* I    Number of subframes                                                         */
-    const opus_int                  pre_length                              /* I    Length of the preceding samples starting at &x[0] for each subframe         */
+    oac_int16                      *LTP_res,                               /* O    LTP residual signal of length MAX_NB_SUBFR * ( pre_length + subfr_length )  */
+    const oac_int16                *x,                                     /* I    Pointer to input signal with at least max( pitchL ) preceding samples       */
+    const oac_int16                LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],/* I    LTP_ORDER LTP coefficients for each MAX_NB_SUBFR subframe                   */
+    const oac_int                  pitchL[ MAX_NB_SUBFR ],                 /* I    Pitch lag, one for each subframe                                            */
+    const oac_int32                invGains_Q16[ MAX_NB_SUBFR ],           /* I    Inverse quantization gains, one for each subframe                           */
+    const oac_int                  subfr_length,                           /* I    Length of each subframe                                                     */
+    const oac_int                  nb_subfr,                               /* I    Number of subframes                                                         */
+    const oac_int                  pre_length                              /* I    Length of the preceding samples starting at &x[0] for each subframe         */
 );
 
 /* Calculates residual energies of input subframes where all subframes have LPC_order   */
 /* of preceding samples                                                                 */
 void silk_residual_energy_FIX(
-          opus_int32                nrgs[ MAX_NB_SUBFR ],                   /* O    Residual energy per subframe                                                */
-          opus_int                  nrgsQ[ MAX_NB_SUBFR ],                  /* O    Q value per subframe                                                        */
-    const opus_int16                x[],                                    /* I    Input signal                                                                */
-          opus_int16                a_Q12[ 2 ][ MAX_LPC_ORDER ],            /* I    AR coefs for each frame half                                                */
-    const opus_int32                gains[ MAX_NB_SUBFR ],                  /* I    Quantization gains                                                          */
-    const opus_int                  subfr_length,                           /* I    Subframe length                                                             */
-    const opus_int                  nb_subfr,                               /* I    Number of subframes                                                         */
-    const opus_int                  LPC_order,                              /* I    LPC order                                                                   */
+          oac_int32                nrgs[ MAX_NB_SUBFR ],                   /* O    Residual energy per subframe                                                */
+          oac_int                  nrgsQ[ MAX_NB_SUBFR ],                  /* O    Q value per subframe                                                        */
+    const oac_int16                x[],                                    /* I    Input signal                                                                */
+          oac_int16                a_Q12[ 2 ][ MAX_LPC_ORDER ],            /* I    AR coefs for each frame half                                                */
+    const oac_int32                gains[ MAX_NB_SUBFR ],                  /* I    Quantization gains                                                          */
+    const oac_int                  subfr_length,                           /* I    Subframe length                                                             */
+    const oac_int                  nb_subfr,                               /* I    Number of subframes                                                         */
+    const oac_int                  LPC_order,                              /* I    LPC order                                                                   */
     int                             arch                                    /* I    Run-time architecture                                                       */
 );
 
 /* Residual energy: nrg = wxx - 2 * wXx * c + c' * wXX * c */
-opus_int32 silk_residual_energy16_covar_FIX(
-    const opus_int16                *c,                                     /* I    Prediction vector                                                           */
-    const opus_int32                *wXX,                                   /* I    Correlation matrix                                                          */
-    const opus_int32                *wXx,                                   /* I    Correlation vector                                                          */
-    opus_int32                      wxx,                                    /* I    Signal energy                                                               */
-    opus_int                        D,                                      /* I    Dimension                                                                   */
-    opus_int                        cQ                                      /* I    Q value for c vector 0 - 15                                                 */
+oac_int32 silk_residual_energy16_covar_FIX(
+    const oac_int16                *c,                                     /* I    Prediction vector                                                           */
+    const oac_int32                *wXX,                                   /* I    Correlation matrix                                                          */
+    const oac_int32                *wXx,                                   /* I    Correlation vector                                                          */
+    oac_int32                      wxx,                                    /* I    Signal energy                                                               */
+    oac_int                        D,                                      /* I    Dimension                                                                   */
+    oac_int                        cQ                                      /* I    Q value for c vector 0 - 15                                                 */
 );
 
 /* Processing of gains */
 void silk_process_gains_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  Encoder control                                                             */
-    opus_int                        condCoding                              /* I    The type of conditional coding to use                                       */
+    oac_int                        condCoding                              /* I    The type of conditional coding to use                                       */
 );
 
 /******************/
@@ -210,23 +210,23 @@ void silk_process_gains_FIX(
 /******************/
 /* Calculates correlation matrix X'*X */
 void silk_corrMatrix_FIX(
-    const opus_int16                *x,                                     /* I    x vector [L + order - 1] used to form data matrix X                         */
-    const opus_int                  L,                                      /* I    Length of vectors                                                           */
-    const opus_int                  order,                                  /* I    Max lag for correlation                                                     */
-    opus_int32                      *XX,                                    /* O    Pointer to X'*X correlation matrix [ order x order ]                        */
-    opus_int32                      *nrg,                                   /* O    Energy of x vector                                                          */
-    opus_int                        *rshifts,                               /* O    Right shifts of correlations                                                */
+    const oac_int16                *x,                                     /* I    x vector [L + order - 1] used to form data matrix X                         */
+    const oac_int                  L,                                      /* I    Length of vectors                                                           */
+    const oac_int                  order,                                  /* I    Max lag for correlation                                                     */
+    oac_int32                      *XX,                                    /* O    Pointer to X'*X correlation matrix [ order x order ]                        */
+    oac_int32                      *nrg,                                   /* O    Energy of x vector                                                          */
+    oac_int                        *rshifts,                               /* O    Right shifts of correlations                                                */
     int                              arch                                   /* I    Run-time architecture                                                       */
 );
 
 /* Calculates correlation vector X'*t */
 void silk_corrVector_FIX(
-    const opus_int16                *x,                                     /* I    x vector [L + order - 1] used to form data matrix X                         */
-    const opus_int16                *t,                                     /* I    Target vector [L]                                                           */
-    const opus_int                  L,                                      /* I    Length of vectors                                                           */
-    const opus_int                  order,                                  /* I    Max lag for correlation                                                     */
-    opus_int32                      *Xt,                                    /* O    Pointer to X'*t correlation vector [order]                                  */
-    const opus_int                  rshifts,                                /* I    Right shifts of correlations                                                */
+    const oac_int16                *x,                                     /* I    x vector [L + order - 1] used to form data matrix X                         */
+    const oac_int16                *t,                                     /* I    Target vector [L]                                                           */
+    const oac_int                  L,                                      /* I    Length of vectors                                                           */
+    const oac_int                  order,                                  /* I    Max lag for correlation                                                     */
+    oac_int32                      *Xt,                                    /* O    Pointer to X'*t correlation vector [order]                                  */
+    const oac_int                  rshifts,                                /* I    Right shifts of correlations                                                */
     int                             arch                                    /* I    Run-time architecture                                                       */
 );
 
diff --git a/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h b/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h
index 9d9cb0551..b27039231 100644
--- a/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h
+++ b/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h
@@ -65,21 +65,21 @@ static inline long long MIPS_SHILO(long long acc, int sh) {
 #define QS  14
 
 void silk_warped_autocorrelation_FIX_c(
-          opus_int32                *corr,                                  /* O    Result [order + 1]                                                          */
-          opus_int                  *scale,                                 /* O    Scaling of the correlation vector                                           */
-    const opus_int16                *input,                                 /* I    Input data to correlate                                                     */
-    const opus_int                  warping_Q16,                            /* I    Warping coefficient                                                         */
-    const opus_int                  length,                                 /* I    Length of input                                                             */
-    const opus_int                  order                                   /* I    Correlation order (even)                                                    */
+          oac_int32                *corr,                                  /* O    Result [order + 1]                                                          */
+          oac_int                  *scale,                                 /* O    Scaling of the correlation vector                                           */
+    const oac_int16                *input,                                 /* I    Input data to correlate                                                     */
+    const oac_int                  warping_Q16,                            /* I    Warping coefficient                                                         */
+    const oac_int                  length,                                 /* I    Length of input                                                             */
+    const oac_int                  order                                   /* I    Correlation order (even)                                                    */
 )
 {
-    opus_int   n, i, lsh;
-    opus_int32 tmp1_QS=0, tmp2_QS=0, tmp3_QS=0, tmp4_QS=0, tmp5_QS=0, tmp6_QS=0, tmp7_QS=0, tmp8_QS=0, start_1=0, start_2=0, start_3=0;
-    opus_int32 state_QS[ MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };
-    opus_int64 corr_QC[  MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };
-    opus_int64 temp64;
+    oac_int   n, i, lsh;
+    oac_int32 tmp1_QS=0, tmp2_QS=0, tmp3_QS=0, tmp4_QS=0, tmp5_QS=0, tmp6_QS=0, tmp7_QS=0, tmp8_QS=0, start_1=0, start_2=0, start_3=0;
+    oac_int32 state_QS[ MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };
+    oac_int64 corr_QC[  MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };
+    oac_int64 temp64;
 
-    opus_int32 val;
+    oac_int32 val;
     val = 2 * QS - QC;
 
     /* Order must be even */
@@ -89,13 +89,13 @@ void silk_warped_autocorrelation_FIX_c(
     /* Loop over samples */
     for( n = 0; n < length; n=n+4 ) {
 
-        tmp1_QS = silk_LSHIFT32( (opus_int32)input[ n ], QS );
+        tmp1_QS = silk_LSHIFT32( (oac_int32)input[ n ], QS );
         start_1 = tmp1_QS;
-        tmp3_QS = silk_LSHIFT32( (opus_int32)input[ n+1], QS );
+        tmp3_QS = silk_LSHIFT32( (oac_int32)input[ n+1], QS );
         start_2 = tmp3_QS;
-        tmp5_QS = silk_LSHIFT32( (opus_int32)input[ n+2], QS );
+        tmp5_QS = silk_LSHIFT32( (oac_int32)input[ n+2], QS );
         start_3 = tmp5_QS;
-        tmp7_QS = silk_LSHIFT32( (opus_int32)input[ n+3], QS );
+        tmp7_QS = silk_LSHIFT32( (oac_int32)input[ n+3], QS );
 
         /* Loop over allpass sections */
         for( i = 0; i < order; i += 2 ) {
@@ -138,7 +138,7 @@ void silk_warped_autocorrelation_FIX_c(
 
     for(;n< length; n++ ) {
 
-        tmp1_QS = silk_LSHIFT32( (opus_int32)input[ n ], QS );
+        tmp1_QS = silk_LSHIFT32( (oac_int32)input[ n ], QS );
 
         /* Loop over allpass sections */
         for( i = 0; i < order; i += 2 ) {
@@ -169,14 +169,14 @@ void silk_warped_autocorrelation_FIX_c(
             temp64 = corr_QC[ i ];
             //temp64 = MIPS_SHILO(temp64, val);
             temp64 = (val >= 0) ? (temp64 >> val) : (temp64 << -val);
-            corr[ i ] = (opus_int32)silk_CHECK_FIT32( MIPS_SHILO( temp64, -lsh ) );
+            corr[ i ] = (oac_int32)silk_CHECK_FIT32( MIPS_SHILO( temp64, -lsh ) );
         }
     } else {
         for( i = 0; i < order + 1; i++ ) {
             temp64 = corr_QC[ i ];
             //temp64 = MIPS_SHILO(temp64, val);
             temp64 = (val >= 0) ? (temp64 >> val) : (temp64 << -val);
-            corr[ i ] = (opus_int32)silk_CHECK_FIT32( MIPS_SHILO( temp64, -lsh ) );
+            corr[ i ] = (oac_int32)silk_CHECK_FIT32( MIPS_SHILO( temp64, -lsh ) );
         }
     }
 
diff --git a/silk/fixed/noise_shape_analysis_FIX.c b/silk/fixed/noise_shape_analysis_FIX.c
index 49ea59e99..5bc28dc93 100644
--- a/silk/fixed/noise_shape_analysis_FIX.c
+++ b/silk/fixed/noise_shape_analysis_FIX.c
@@ -37,13 +37,13 @@ POSSIBILITY OF SUCH DAMAGE.
 /* non-warped frequency scale. (So that it can be implemented with a minimum-phase monic filter.) */
 /* Note: A monic filter is one with the first coefficient equal to 1.0. In Silk we omit the first */
 /* coefficient in an array of coefficients, for monic filters.                                    */
-static OPUS_INLINE opus_int32 warped_gain( /* gain in Q16*/
-    const opus_int32     *coefs_Q24,
-    opus_int             lambda_Q16,
-    opus_int             order
+static OAC_INLINE oac_int32 warped_gain( /* gain in Q16*/
+    const oac_int32     *coefs_Q24,
+    oac_int             lambda_Q16,
+    oac_int             order
 ) {
-    opus_int   i;
-    opus_int32 gain_Q24;
+    oac_int   i;
+    oac_int32 gain_Q24;
 
     lambda_Q16 = -lambda_Q16;
     gain_Q24 = coefs_Q24[ order - 1 ];
@@ -56,16 +56,16 @@ static OPUS_INLINE opus_int32 warped_gain( /* gain in Q16*/
 
 /* Convert warped filter coefficients to monic pseudo-warped coefficients and limit maximum     */
 /* amplitude of monic warped coefficients by using bandwidth expansion on the true coefficients */
-static OPUS_INLINE void limit_warped_coefs(
-    opus_int32           *coefs_Q24,
-    opus_int             lambda_Q16,
-    opus_int32           limit_Q24,
-    opus_int             order
+static OAC_INLINE void limit_warped_coefs(
+    oac_int32           *coefs_Q24,
+    oac_int             lambda_Q16,
+    oac_int32           limit_Q24,
+    oac_int             order
 ) {
-    opus_int   i, iter, ind = 0;
-    opus_int32 tmp, maxabs_Q24, chirp_Q16, gain_Q16;
-    opus_int32 nom_Q16, den_Q24;
-    opus_int32 limit_Q20, maxabs_Q20;
+    oac_int   i, iter, ind = 0;
+    oac_int32 tmp, maxabs_Q24, chirp_Q16, gain_Q16;
+    oac_int32 nom_Q16, den_Q24;
+    oac_int32 limit_Q20, maxabs_Q20;
 
     /* Convert to monic coefficients */
     lambda_Q16 = -lambda_Q16;
@@ -73,7 +73,7 @@ static OPUS_INLINE void limit_warped_coefs(
         coefs_Q24[ i - 1 ] = silk_SMLAWB( coefs_Q24[ i - 1 ], coefs_Q24[ i ], lambda_Q16 );
     }
     lambda_Q16 = -lambda_Q16;
-    nom_Q16  = silk_SMLAWB( SILK_FIX_CONST( 1.0, 16 ), -(opus_int32)lambda_Q16, lambda_Q16 );
+    nom_Q16  = silk_SMLAWB( SILK_FIX_CONST( 1.0, 16 ), -(oac_int32)lambda_Q16, lambda_Q16 );
     den_Q24  = silk_SMLAWB( SILK_FIX_CONST( 1.0, 24 ), coefs_Q24[ 0 ], lambda_Q16 );
     gain_Q16 = silk_DIV32_varQ( nom_Q16, den_Q24, 24 );
     for( i = 0; i < order; i++ ) {
@@ -118,7 +118,7 @@ static OPUS_INLINE void limit_warped_coefs(
             coefs_Q24[ i - 1 ] = silk_SMLAWB( coefs_Q24[ i - 1 ], coefs_Q24[ i ], lambda_Q16 );
         }
         lambda_Q16 = -lambda_Q16;
-        nom_Q16  = silk_SMLAWB( SILK_FIX_CONST( 1.0, 16 ), -(opus_int32)lambda_Q16,        lambda_Q16 );
+        nom_Q16  = silk_SMLAWB( SILK_FIX_CONST( 1.0, 16 ), -(oac_int32)lambda_Q16,        lambda_Q16 );
         den_Q24  = silk_SMLAWB( SILK_FIX_CONST( 1.0, 24 ), coefs_Q24[ 0 ], lambda_Q16 );
         gain_Q16 = silk_DIV32_varQ( nom_Q16, den_Q24, 24 );
         for( i = 0; i < order; i++ ) {
@@ -134,21 +134,21 @@ static OPUS_INLINE void limit_warped_coefs(
 void silk_noise_shape_analysis_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Encoder state FIX                                                           */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  Encoder control FIX                                                         */
-    const opus_int16                *pitch_res,                             /* I    LPC residual from pitch analysis                                            */
-    const opus_int16                *x,                                     /* I    Input signal [ frame_length + la_shape ]                                    */
+    const oac_int16                *pitch_res,                             /* I    LPC residual from pitch analysis                                            */
+    const oac_int16                *x,                                     /* I    Input signal [ frame_length + la_shape ]                                    */
     int                              arch                                   /* I    Run-time architecture                                                       */
 )
 {
     silk_shape_state_FIX *psShapeSt = &psEnc->sShape;
-    opus_int     k, i, nSamples, nSegs, Qnrg, b_Q14, warping_Q16, scale = 0;
-    opus_int32   SNR_adj_dB_Q7, HarmShapeGain_Q16, Tilt_Q16, tmp32;
-    opus_int32   nrg, log_energy_Q7, log_energy_prev_Q7, energy_variation_Q7;
-    opus_int32   BWExp_Q16, gain_mult_Q16, gain_add_Q16, strength_Q16, b_Q8;
-    opus_int32   auto_corr[     MAX_SHAPE_LPC_ORDER + 1 ];
-    opus_int32   refl_coef_Q16[ MAX_SHAPE_LPC_ORDER ];
-    opus_int32   AR_Q24[       MAX_SHAPE_LPC_ORDER ];
-    VARDECL( opus_int16, x_windowed );
-    const opus_int16 *x_ptr, *pitch_res_ptr;
+    oac_int     k, i, nSamples, nSegs, Qnrg, b_Q14, warping_Q16, scale = 0;
+    oac_int32   SNR_adj_dB_Q7, HarmShapeGain_Q16, Tilt_Q16, tmp32;
+    oac_int32   nrg, log_energy_Q7, log_energy_prev_Q7, energy_variation_Q7;
+    oac_int32   BWExp_Q16, gain_mult_Q16, gain_add_Q16, strength_Q16, b_Q8;
+    oac_int32   auto_corr[     MAX_SHAPE_LPC_ORDER + 1 ];
+    oac_int32   refl_coef_Q16[ MAX_SHAPE_LPC_ORDER ];
+    oac_int32   AR_Q24[       MAX_SHAPE_LPC_ORDER ];
+    VARDECL( oac_int16, x_windowed );
+    const oac_int16 *x_ptr, *pitch_res_ptr;
     SAVE_STACK;
 
     /* Point to start of first LPC analysis block */
@@ -160,7 +160,7 @@ void silk_noise_shape_analysis_FIX(
     SNR_adj_dB_Q7 = psEnc->sCmn.SNR_dB_Q7;
 
     /* Input quality is the average of the quality in the lowest two VAD bands */
-    psEncCtrl->input_quality_Q14 = ( opus_int )silk_RSHIFT( (opus_int32)psEnc->sCmn.input_quality_bands_Q15[ 0 ]
+    psEncCtrl->input_quality_Q14 = ( oac_int )silk_RSHIFT( (oac_int32)psEnc->sCmn.input_quality_bands_Q15[ 0 ]
         + psEnc->sCmn.input_quality_bands_Q15[ 1 ], 2 );
 
     /* Coding quality level, between 0.0_Q0 and 1.0_Q0, but in Q14 */
@@ -230,7 +230,7 @@ void silk_noise_shape_analysis_FIX(
 
     if( psEnc->sCmn.warping_Q16 > 0 ) {
         /* Slightly more warping in analysis will move quantization noise up in frequency, where it's better masked */
-        warping_Q16 = silk_SMLAWB( psEnc->sCmn.warping_Q16, (opus_int32)psEncCtrl->coding_quality_Q14, SILK_FIX_CONST( 0.01, 18 ) );
+        warping_Q16 = silk_SMLAWB( psEnc->sCmn.warping_Q16, (oac_int32)psEncCtrl->coding_quality_Q14, SILK_FIX_CONST( 0.01, 18 ) );
     } else {
         warping_Q16 = 0;
     }
@@ -238,16 +238,16 @@ void silk_noise_shape_analysis_FIX(
     /********************************************/
     /* Compute noise shaping AR coefs and gains */
     /********************************************/
-    ALLOC( x_windowed, psEnc->sCmn.shapeWinLength, opus_int16 );
+    ALLOC( x_windowed, psEnc->sCmn.shapeWinLength, oac_int16 );
     for( k = 0; k < psEnc->sCmn.nb_subfr; k++ ) {
         /* Apply window: sine slope followed by flat part followed by cosine slope */
-        opus_int shift, slope_part, flat_part;
+        oac_int shift, slope_part, flat_part;
         flat_part = psEnc->sCmn.fs_kHz * 3;
         slope_part = silk_RSHIFT( psEnc->sCmn.shapeWinLength - flat_part, 1 );
 
         silk_apply_sine_window( x_windowed, x_ptr, 1, slope_part );
         shift = slope_part;
-        silk_memcpy( x_windowed + shift, x_ptr + shift, flat_part * sizeof(opus_int16) );
+        silk_memcpy( x_windowed + shift, x_ptr + shift, flat_part * sizeof(oac_int16) );
         shift += flat_part;
         silk_apply_sine_window( x_windowed + shift, x_ptr + shift, 2, slope_part );
 
@@ -314,7 +314,7 @@ void silk_noise_shape_analysis_FIX(
 
             /* Convert from Q24 to Q13 and store in int16 */
             for( i = 0; i < psEnc->sCmn.shapingLPCOrder; i++ ) {
-                psEncCtrl->AR_Q13[ k * MAX_SHAPE_LPC_ORDER + i ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( AR_Q24[ i ], 11 ) );
+                psEncCtrl->AR_Q13[ k * MAX_SHAPE_LPC_ORDER + i ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( AR_Q24[ i ], 11 ) );
             }
         } else {
             silk_LPC_fit( &psEncCtrl->AR_Q13[ k * MAX_SHAPE_LPC_ORDER ], AR_Q24, 13, 24, psEnc->sCmn.shapingLPCOrder );
@@ -345,14 +345,14 @@ void silk_noise_shape_analysis_FIX(
     if( psEnc->sCmn.indices.signalType == TYPE_VOICED ) {
         /* Reduce low frequencies quantization noise for periodic signals, depending on pitch lag */
         /*f = 400; freqz([1, -0.98 + 2e-4 * f], [1, -0.97 + 7e-4 * f], 2^12, Fs); axis([0, 1000, -10, 1])*/
-        opus_int fs_kHz_inv = silk_DIV32_16( SILK_FIX_CONST( 0.2, 14 ), psEnc->sCmn.fs_kHz );
+        oac_int fs_kHz_inv = silk_DIV32_16( SILK_FIX_CONST( 0.2, 14 ), psEnc->sCmn.fs_kHz );
         for( k = 0; k < psEnc->sCmn.nb_subfr; k++ ) {
             b_Q14 = fs_kHz_inv + silk_DIV32_16( SILK_FIX_CONST( 3.0, 14 ), psEncCtrl->pitchL[ k ] );
             /* Pack two coefficients in one int32 */
             psEncCtrl->LF_shp_Q14[ k ]  = silk_LSHIFT( SILK_FIX_CONST( 1.0, 14 ) - b_Q14 - silk_SMULWB( strength_Q16, b_Q14 ), 16 );
-            psEncCtrl->LF_shp_Q14[ k ] |= (opus_uint16)( b_Q14 - SILK_FIX_CONST( 1.0, 14 ) );
+            psEncCtrl->LF_shp_Q14[ k ] |= (oac_uint16)( b_Q14 - SILK_FIX_CONST( 1.0, 14 ) );
         }
-        silk_assert( SILK_FIX_CONST( HARM_HP_NOISE_COEF, 24 ) < SILK_FIX_CONST( 0.5, 24 ) ); /* Guarantees that second argument to SMULWB() is within range of an opus_int16*/
+        silk_assert( SILK_FIX_CONST( HARM_HP_NOISE_COEF, 24 ) < SILK_FIX_CONST( 0.5, 24 ) ); /* Guarantees that second argument to SMULWB() is within range of an oac_int16*/
         Tilt_Q16 = - SILK_FIX_CONST( HP_NOISE_COEF, 16 ) -
             silk_SMULWB( SILK_FIX_CONST( 1.0, 16 ) - SILK_FIX_CONST( HP_NOISE_COEF, 16 ),
                 silk_SMULWB( SILK_FIX_CONST( HARM_HP_NOISE_COEF, 24 ), psEnc->sCmn.speech_activity_Q8 ) );
@@ -361,7 +361,7 @@ void silk_noise_shape_analysis_FIX(
         /* Pack two coefficients in one int32 */
         psEncCtrl->LF_shp_Q14[ 0 ]  = silk_LSHIFT( SILK_FIX_CONST( 1.0, 14 ) - b_Q14 -
             silk_SMULWB( strength_Q16, silk_SMULWB( SILK_FIX_CONST( 0.6, 16 ), b_Q14 ) ), 16 );
-        psEncCtrl->LF_shp_Q14[ 0 ] |= (opus_uint16)( b_Q14 - SILK_FIX_CONST( 1.0, 14 ) );
+        psEncCtrl->LF_shp_Q14[ 0 ] |= (oac_uint16)( b_Q14 - SILK_FIX_CONST( 1.0, 14 ) );
         for( k = 1; k < psEnc->sCmn.nb_subfr; k++ ) {
             psEncCtrl->LF_shp_Q14[ k ] = psEncCtrl->LF_shp_Q14[ 0 ];
         }
@@ -393,8 +393,8 @@ void silk_noise_shape_analysis_FIX(
         psShapeSt->Tilt_smth_Q16 =
             silk_SMLAWB( psShapeSt->Tilt_smth_Q16,          Tilt_Q16          - psShapeSt->Tilt_smth_Q16,          SILK_FIX_CONST( SUBFR_SMTH_COEF, 16 ) );
 
-        psEncCtrl->HarmShapeGain_Q14[ k ] = ( opus_int )silk_RSHIFT_ROUND( psShapeSt->HarmShapeGain_smth_Q16, 2 );
-        psEncCtrl->Tilt_Q14[ k ]          = ( opus_int )silk_RSHIFT_ROUND( psShapeSt->Tilt_smth_Q16,          2 );
+        psEncCtrl->HarmShapeGain_Q14[ k ] = ( oac_int )silk_RSHIFT_ROUND( psShapeSt->HarmShapeGain_smth_Q16, 2 );
+        psEncCtrl->Tilt_Q14[ k ]          = ( oac_int )silk_RSHIFT_ROUND( psShapeSt->Tilt_smth_Q16,          2 );
     }
     RESTORE_STACK;
 }
diff --git a/silk/fixed/pitch_analysis_core_FIX.c b/silk/fixed/pitch_analysis_core_FIX.c
index 14729046d..cb4fd5802 100644
--- a/silk/fixed/pitch_analysis_core_FIX.c
+++ b/silk/fixed/pitch_analysis_core_FIX.c
@@ -51,74 +51,74 @@ POSSIBILITY OF SUCH DAMAGE.
 #define D_COMP_MAX      ( MAX_LAG_8KHZ + 4 )
 #define D_COMP_STRIDE   ( D_COMP_MAX - D_COMP_MIN )
 
-typedef opus_int32 silk_pe_stage3_vals[ PE_NB_STAGE3_LAGS ];
+typedef oac_int32 silk_pe_stage3_vals[ PE_NB_STAGE3_LAGS ];
 
 /************************************************************/
 /* Internally used functions                                */
 /************************************************************/
 static void silk_P_Ana_calc_corr_st3(
     silk_pe_stage3_vals cross_corr_st3[],              /* O 3 DIM correlation array */
-    const opus_int16  frame[],                         /* I vector to correlate         */
-    opus_int          start_lag,                       /* I lag offset to search around */
-    opus_int          sf_length,                       /* I length of a 5 ms subframe   */
-    opus_int          nb_subfr,                        /* I number of subframes         */
-    opus_int          complexity,                      /* I Complexity setting          */
+    const oac_int16  frame[],                         /* I vector to correlate         */
+    oac_int          start_lag,                       /* I lag offset to search around */
+    oac_int          sf_length,                       /* I length of a 5 ms subframe   */
+    oac_int          nb_subfr,                        /* I number of subframes         */
+    oac_int          complexity,                      /* I Complexity setting          */
     int               arch                             /* I Run-time architecture       */
 );
 
 static void silk_P_Ana_calc_energy_st3(
     silk_pe_stage3_vals energies_st3[],                /* O 3 DIM energy array */
-    const opus_int16  frame[],                         /* I vector to calc energy in    */
-    opus_int          start_lag,                       /* I lag offset to search around */
-    opus_int          sf_length,                       /* I length of one 5 ms subframe */
-    opus_int          nb_subfr,                        /* I number of subframes         */
-    opus_int          complexity,                      /* I Complexity setting          */
+    const oac_int16  frame[],                         /* I vector to calc energy in    */
+    oac_int          start_lag,                       /* I lag offset to search around */
+    oac_int          sf_length,                       /* I length of one 5 ms subframe */
+    oac_int          nb_subfr,                        /* I number of subframes         */
+    oac_int          complexity,                      /* I Complexity setting          */
     int               arch                             /* I Run-time architecture       */
 );
 
 /*************************************************************/
 /*      FIXED POINT CORE PITCH ANALYSIS FUNCTION             */
 /*************************************************************/
-opus_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 voiced, 1 unvoiced                      */
-    const opus_int16            *frame_unscaled,    /* I    Signal of length PE_FRAME_LENGTH_MS*Fs_kHz                  */
-    opus_int                    *pitch_out,         /* O    4 pitch lag values                                          */
-    opus_int16                  *lagIndex,          /* O    Lag Index                                                   */
-    opus_int8                   *contourIndex,      /* O    Pitch contour Index                                         */
-    opus_int                    *LTPCorr_Q15,       /* I/O  Normalized correlation; input: value from previous frame    */
-    opus_int                    prevLag,            /* I    Last lag of previous frame; set to zero is unvoiced         */
-    const opus_int32            search_thres1_Q16,  /* I    First stage threshold for lag candidates 0 - 1              */
-    const opus_int              search_thres2_Q13,  /* I    Final threshold for lag candidates 0 - 1                    */
-    const opus_int              Fs_kHz,             /* I    Sample frequency (kHz)                                      */
-    const opus_int              complexity,         /* I    Complexity setting, 0-2, where 2 is highest                 */
-    const opus_int              nb_subfr,           /* I    number of 5 ms subframes                                    */
+oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 voiced, 1 unvoiced                      */
+    const oac_int16            *frame_unscaled,    /* I    Signal of length PE_FRAME_LENGTH_MS*Fs_kHz                  */
+    oac_int                    *pitch_out,         /* O    4 pitch lag values                                          */
+    oac_int16                  *lagIndex,          /* O    Lag Index                                                   */
+    oac_int8                   *contourIndex,      /* O    Pitch contour Index                                         */
+    oac_int                    *LTPCorr_Q15,       /* I/O  Normalized correlation; input: value from previous frame    */
+    oac_int                    prevLag,            /* I    Last lag of previous frame; set to zero is unvoiced         */
+    const oac_int32            search_thres1_Q16,  /* I    First stage threshold for lag candidates 0 - 1              */
+    const oac_int              search_thres2_Q13,  /* I    Final threshold for lag candidates 0 - 1                    */
+    const oac_int              Fs_kHz,             /* I    Sample frequency (kHz)                                      */
+    const oac_int              complexity,         /* I    Complexity setting, 0-2, where 2 is highest                 */
+    const oac_int              nb_subfr,           /* I    number of 5 ms subframes                                    */
     int                         arch                /* I    Run-time architecture                                       */
 )
 {
-    VARDECL( opus_int16, frame_8kHz_buf );
-    VARDECL( opus_int16, frame_4kHz );
-    VARDECL( opus_int16, frame_scaled );
-    opus_int32 filt_state[ 6 ];
-    const opus_int16 *frame, *frame_8kHz;
-    opus_int   i, k, d, j;
-    VARDECL( opus_int16, C );
-    VARDECL( opus_int32, xcorr32 );
-    const opus_int16 *target_ptr, *basis_ptr;
-    opus_int32 cross_corr, normalizer, energy, energy_basis, energy_target;
-    opus_int   d_srch[ PE_D_SRCH_LENGTH ], Cmax, length_d_srch, length_d_comp, shift;
-    VARDECL( opus_int16, d_comp );
-    opus_int32 sum, threshold, lag_counter;
-    opus_int   CBimax, CBimax_new, CBimax_old, lag, start_lag, end_lag, lag_new;
-    opus_int32 CC[ PE_NB_CBKS_STAGE2_EXT ], CCmax, CCmax_b, CCmax_new_b, CCmax_new;
+    VARDECL( oac_int16, frame_8kHz_buf );
+    VARDECL( oac_int16, frame_4kHz );
+    VARDECL( oac_int16, frame_scaled );
+    oac_int32 filt_state[ 6 ];
+    const oac_int16 *frame, *frame_8kHz;
+    oac_int   i, k, d, j;
+    VARDECL( oac_int16, C );
+    VARDECL( oac_int32, xcorr32 );
+    const oac_int16 *target_ptr, *basis_ptr;
+    oac_int32 cross_corr, normalizer, energy, energy_basis, energy_target;
+    oac_int   d_srch[ PE_D_SRCH_LENGTH ], Cmax, length_d_srch, length_d_comp, shift;
+    VARDECL( oac_int16, d_comp );
+    oac_int32 sum, threshold, lag_counter;
+    oac_int   CBimax, CBimax_new, CBimax_old, lag, start_lag, end_lag, lag_new;
+    oac_int32 CC[ PE_NB_CBKS_STAGE2_EXT ], CCmax, CCmax_b, CCmax_new_b, CCmax_new;
     VARDECL( silk_pe_stage3_vals, energies_st3 );
     VARDECL( silk_pe_stage3_vals, cross_corr_st3 );
-    opus_int   frame_length, frame_length_8kHz, frame_length_4kHz;
-    opus_int   sf_length;
-    opus_int   min_lag;
-    opus_int   max_lag;
-    opus_int32 contour_bias_Q15, diff;
-    opus_int   nb_cbk_search, cbk_size;
-    opus_int32 delta_lag_log2_sqr_Q7, lag_log2_Q7, prevLag_log2_Q7, prev_lag_bias_Q13;
-    const opus_int8 *Lag_CB_ptr;
+    oac_int   frame_length, frame_length_8kHz, frame_length_4kHz;
+    oac_int   sf_length;
+    oac_int   min_lag;
+    oac_int   max_lag;
+    oac_int32 contour_bias_Q15, diff;
+    oac_int   nb_cbk_search, cbk_size;
+    oac_int32 delta_lag_log2_sqr_Q7, lag_log2_Q7, prevLag_log2_Q7, prev_lag_bias_Q13;
+    const oac_int8 *Lag_CB_ptr;
     SAVE_STACK;
 
     /* Check for valid sampling frequency */
@@ -142,7 +142,7 @@ opus_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0
     /* Downscale input if necessary */
     silk_sum_sqr_shift( &energy, &shift, frame_unscaled, frame_length );
     shift += 3 - silk_CLZ32( energy );        /* at least two bits headroom */
-    ALLOC( frame_scaled, frame_length, opus_int16 );
+    ALLOC( frame_scaled, frame_length, oac_int16 );
     if( shift > 0 ) {
         shift = silk_RSHIFT( shift + 1, 1 );
         for( i = 0; i < frame_length; i++ ) {
@@ -153,14 +153,14 @@ opus_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0
         frame = frame_unscaled;
     }
 
-    ALLOC( frame_8kHz_buf, ( Fs_kHz == 8 ) ? 1 : frame_length_8kHz, opus_int16 );
+    ALLOC( frame_8kHz_buf, ( Fs_kHz == 8 ) ? 1 : frame_length_8kHz, oac_int16 );
     /* Resample from input sampled at Fs_kHz to 8 kHz */
     if( Fs_kHz == 16 ) {
-        silk_memset( filt_state, 0, 2 * sizeof( opus_int32 ) );
+        silk_memset( filt_state, 0, 2 * sizeof( oac_int32 ) );
         silk_resampler_down2( filt_state, frame_8kHz_buf, frame, frame_length );
         frame_8kHz = frame_8kHz_buf;
     } else if( Fs_kHz == 12 ) {
-        silk_memset( filt_state, 0, 6 * sizeof( opus_int32 ) );
+        silk_memset( filt_state, 0, 6 * sizeof( oac_int32 ) );
         silk_resampler_down2_3( filt_state, frame_8kHz_buf, frame, frame_length );
         frame_8kHz = frame_8kHz_buf;
     } else {
@@ -169,8 +169,8 @@ opus_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0
     }
 
     /* Decimate again to 4 kHz */
-    silk_memset( filt_state, 0, 2 * sizeof( opus_int32 ) );/* Set state to zero */
-    ALLOC( frame_4kHz, frame_length_4kHz, opus_int16 );
+    silk_memset( filt_state, 0, 2 * sizeof( oac_int32 ) );/* Set state to zero */
+    ALLOC( frame_4kHz, frame_length_4kHz, oac_int16 );
     silk_resampler_down2( filt_state, frame_4kHz, frame_8kHz, frame_length_8kHz );
 
     /* Low-pass filter */
@@ -182,9 +182,9 @@ opus_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0
     /******************************************************************************
     * FIRST STAGE, operating in 4 khz
     ******************************************************************************/
-    ALLOC( C, nb_subfr * CSTRIDE_8KHZ, opus_int16 );
-    ALLOC( xcorr32, MAX_LAG_4KHZ-MIN_LAG_4KHZ+1, opus_int32 );
-    silk_memset( C, 0, (nb_subfr >> 1) * CSTRIDE_4KHZ * sizeof( opus_int16 ) );
+    ALLOC( C, nb_subfr * CSTRIDE_8KHZ, oac_int16 );
+    ALLOC( xcorr32, MAX_LAG_4KHZ-MIN_LAG_4KHZ+1, oac_int32 );
+    silk_memset( C, 0, (nb_subfr >> 1) * CSTRIDE_4KHZ * sizeof( oac_int16 ) );
     target_ptr = &frame_4kHz[ silk_LSHIFT( SF_LENGTH_4KHZ, 2 ) ];
     for( k = 0; k < nb_subfr >> 1; k++ ) {
         /* Check that we are within range of the array */
@@ -206,7 +206,7 @@ opus_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0
         normalizer = silk_ADD32( normalizer, silk_SMULBB( SF_LENGTH_8KHZ, 4000 ) );
 
         matrix_ptr( C, k, 0, CSTRIDE_4KHZ ) =
-            (opus_int16)silk_DIV32_varQ( cross_corr, normalizer, 13 + 1 );                      /* Q13 */
+            (oac_int16)silk_DIV32_varQ( cross_corr, normalizer, 13 + 1 );                      /* Q13 */
 
         /* From now on normalizer is computed recursively */
         for( d = MIN_LAG_4KHZ + 1; d <= MAX_LAG_4KHZ; d++ ) {
@@ -224,7 +224,7 @@ opus_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0
                 silk_SMULBB( basis_ptr[ SF_LENGTH_8KHZ ], basis_ptr[ SF_LENGTH_8KHZ ] ) );
 
             matrix_ptr( C, k, d - MIN_LAG_4KHZ, CSTRIDE_4KHZ) =
-                (opus_int16)silk_DIV32_varQ( cross_corr, normalizer, 13 + 1 );                  /* Q13 */
+                (oac_int16)silk_DIV32_varQ( cross_corr, normalizer, 13 + 1 );                  /* Q13 */
         }
         /* Update target pointer */
         target_ptr += SF_LENGTH_8KHZ;
@@ -233,17 +233,17 @@ opus_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0
     /* Combine two subframes into single correlation measure and apply short-lag bias */
     if( nb_subfr == PE_MAX_NB_SUBFR ) {
         for( i = MAX_LAG_4KHZ; i >= MIN_LAG_4KHZ; i-- ) {
-            sum = (opus_int32)matrix_ptr( C, 0, i - MIN_LAG_4KHZ, CSTRIDE_4KHZ )
-                + (opus_int32)matrix_ptr( C, 1, i - MIN_LAG_4KHZ, CSTRIDE_4KHZ );               /* Q14 */
+            sum = (oac_int32)matrix_ptr( C, 0, i - MIN_LAG_4KHZ, CSTRIDE_4KHZ )
+                + (oac_int32)matrix_ptr( C, 1, i - MIN_LAG_4KHZ, CSTRIDE_4KHZ );               /* Q14 */
             sum = silk_SMLAWB( sum, sum, silk_LSHIFT( -i, 4 ) );                                /* Q14 */
-            C[ i - MIN_LAG_4KHZ ] = (opus_int16)sum;                                            /* Q14 */
+            C[ i - MIN_LAG_4KHZ ] = (oac_int16)sum;                                            /* Q14 */
         }
     } else {
         /* Only short-lag bias */
         for( i = MAX_LAG_4KHZ; i >= MIN_LAG_4KHZ; i-- ) {
-            sum = silk_LSHIFT( (opus_int32)C[ i - MIN_LAG_4KHZ ], 1 );                          /* Q14 */
+            sum = silk_LSHIFT( (oac_int32)C[ i - MIN_LAG_4KHZ ], 1 );                          /* Q14 */
             sum = silk_SMLAWB( sum, sum, silk_LSHIFT( -i, 4 ) );                                /* Q14 */
-            C[ i - MIN_LAG_4KHZ ] = (opus_int16)sum;                                            /* Q14 */
+            C[ i - MIN_LAG_4KHZ ] = (oac_int16)sum;                                            /* Q14 */
         }
     }
 
@@ -254,9 +254,9 @@ opus_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0
                                           length_d_srch );
 
     /* Escape if correlation is very low already here */
-    Cmax = (opus_int)C[ 0 ];                                                    /* Q14 */
+    Cmax = (oac_int)C[ 0 ];                                                    /* Q14 */
     if( Cmax < SILK_FIX_CONST( 0.2, 14 ) ) {
-        silk_memset( pitch_out, 0, nb_subfr * sizeof( opus_int ) );
+        silk_memset( pitch_out, 0, nb_subfr * sizeof( oac_int ) );
         *LTPCorr_Q15  = 0;
         *lagIndex     = 0;
         *contourIndex = 0;
@@ -276,7 +276,7 @@ opus_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0
     }
     celt_assert( length_d_srch > 0 );
 
-    ALLOC( d_comp, D_COMP_STRIDE, opus_int16 );
+    ALLOC( d_comp, D_COMP_STRIDE, oac_int16 );
     for( i = D_COMP_MIN; i < D_COMP_MAX; i++ ) {
         d_comp[ i - D_COMP_MIN ] = 0;
     }
@@ -319,7 +319,7 @@ opus_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0
     /*********************************************************************************
     * Find energy of each subframe projected onto its history, for a range of delays
     *********************************************************************************/
-    silk_memset( C, 0, nb_subfr * CSTRIDE_8KHZ * sizeof( opus_int16 ) );
+    silk_memset( C, 0, nb_subfr * CSTRIDE_8KHZ * sizeof( oac_int16 ) );
 
     target_ptr = &frame_8kHz[ PE_LTP_MEM_LENGTH_MS * 8 ];
     for( k = 0; k < nb_subfr; k++ ) {
@@ -341,7 +341,7 @@ opus_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0
             if( cross_corr > 0 ) {
                 energy_basis = silk_inner_prod_aligned( basis_ptr, basis_ptr, SF_LENGTH_8KHZ, arch );
                 matrix_ptr( C, k, d - ( MIN_LAG_8KHZ - 2 ), CSTRIDE_8KHZ ) =
-                    (opus_int16)silk_DIV32_varQ( cross_corr,
+                    (oac_int16)silk_DIV32_varQ( cross_corr,
                                                  silk_ADD32( energy_target,
                                                              energy_basis ),
                                                  13 + 1 );                                      /* Q13 */
@@ -367,7 +367,7 @@ opus_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0
         } else if( Fs_kHz == 16 ) {
             prevLag = silk_RSHIFT( prevLag, 1 );
         }
-        prevLag_log2_Q7 = silk_lin2log( (opus_int32)prevLag );
+        prevLag_log2_Q7 = silk_lin2log( (oac_int32)prevLag );
     } else {
         prevLag_log2_Q7 = 0;
     }
@@ -393,11 +393,11 @@ opus_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0
         for( j = 0; j < nb_cbk_search; j++ ) {
             CC[ j ] = 0;
             for( i = 0; i < nb_subfr; i++ ) {
-                opus_int d_subfr;
+                oac_int d_subfr;
                 /* Try all codebooks */
                 d_subfr = d + matrix_ptr( Lag_CB_ptr, i, j, cbk_size );
                 CC[ j ] = CC[ j ]
-                    + (opus_int32)matrix_ptr( C, i,
+                    + (oac_int32)matrix_ptr( C, i,
                                               d_subfr - ( MIN_LAG_8KHZ - 2 ),
                                               CSTRIDE_8KHZ );
             }
@@ -442,7 +442,7 @@ opus_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0
 
     if( lag == -1 ) {
         /* No suitable candidate found */
-        silk_memset( pitch_out, 0, nb_subfr * sizeof( opus_int ) );
+        silk_memset( pitch_out, 0, nb_subfr * sizeof( oac_int ) );
         *LTPCorr_Q15  = 0;
         *lagIndex     = 0;
         *contourIndex = 0;
@@ -451,7 +451,7 @@ opus_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0
     }
 
     /* Output normalized correlation */
-    *LTPCorr_Q15 = (opus_int)silk_LSHIFT( silk_DIV32_16( CCmax, nb_subfr ), 2 );
+    *LTPCorr_Q15 = (oac_int)silk_LSHIFT( silk_DIV32_16( CCmax, nb_subfr ), 2 );
     silk_assert( *LTPCorr_Q15 >= 0 );
 
     if( Fs_kHz > 8 ) {
@@ -482,7 +482,7 @@ opus_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0
 
         /* Set up codebook parameters according to complexity setting and frame length */
         if( nb_subfr == PE_MAX_NB_SUBFR ) {
-            nb_cbk_search   = (opus_int)silk_nb_cbk_searchs_stage3[ complexity ];
+            nb_cbk_search   = (oac_int)silk_nb_cbk_searchs_stage3[ complexity ];
             cbk_size        = PE_NB_CBKS_STAGE3_MAX;
             Lag_CB_ptr      = &silk_CB_lags_stage3[ 0 ][ 0 ];
         } else {
@@ -539,16 +539,16 @@ opus_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0
             pitch_out[ k ] = lag_new + matrix_ptr( Lag_CB_ptr, k, CBimax, cbk_size );
             pitch_out[ k ] = silk_LIMIT( pitch_out[ k ], min_lag, PE_MAX_LAG_MS * Fs_kHz );
         }
-        *lagIndex = (opus_int16)( lag_new - min_lag);
-        *contourIndex = (opus_int8)CBimax;
+        *lagIndex = (oac_int16)( lag_new - min_lag);
+        *contourIndex = (oac_int8)CBimax;
     } else {        /* Fs_kHz == 8 */
         /* Save Lags */
         for( k = 0; k < nb_subfr; k++ ) {
             pitch_out[ k ] = lag + matrix_ptr( Lag_CB_ptr, k, CBimax, cbk_size );
             pitch_out[ k ] = silk_LIMIT( pitch_out[ k ], MIN_LAG_8KHZ, PE_MAX_LAG_MS * 8 );
         }
-        *lagIndex = (opus_int16)( lag - MIN_LAG_8KHZ );
-        *contourIndex = (opus_int8)CBimax;
+        *lagIndex = (oac_int16)( lag - MIN_LAG_8KHZ );
+        *contourIndex = (oac_int8)CBimax;
     }
     celt_assert( *lagIndex >= 0 );
     /* return as voiced */
@@ -571,20 +571,20 @@ opus_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0
  ***********************************************************************/
 static void silk_P_Ana_calc_corr_st3(
     silk_pe_stage3_vals cross_corr_st3[],              /* O 3 DIM correlation array */
-    const opus_int16  frame[],                         /* I vector to correlate         */
-    opus_int          start_lag,                       /* I lag offset to search around */
-    opus_int          sf_length,                       /* I length of a 5 ms subframe   */
-    opus_int          nb_subfr,                        /* I number of subframes         */
-    opus_int          complexity,                      /* I Complexity setting          */
+    const oac_int16  frame[],                         /* I vector to correlate         */
+    oac_int          start_lag,                       /* I lag offset to search around */
+    oac_int          sf_length,                       /* I length of a 5 ms subframe   */
+    oac_int          nb_subfr,                        /* I number of subframes         */
+    oac_int          complexity,                      /* I Complexity setting          */
     int               arch                             /* I Run-time architecture       */
 )
 {
-    const opus_int16 *target_ptr;
-    opus_int   i, j, k, lag_counter, lag_low, lag_high;
-    opus_int   nb_cbk_search, delta, idx, cbk_size;
-    VARDECL( opus_int32, scratch_mem );
-    VARDECL( opus_int32, xcorr32 );
-    const opus_int8 *Lag_range_ptr, *Lag_CB_ptr;
+    const oac_int16 *target_ptr;
+    oac_int   i, j, k, lag_counter, lag_low, lag_high;
+    oac_int   nb_cbk_search, delta, idx, cbk_size;
+    VARDECL( oac_int32, scratch_mem );
+    VARDECL( oac_int32, xcorr32 );
+    const oac_int8 *Lag_range_ptr, *Lag_CB_ptr;
     SAVE_STACK;
 
     celt_assert( complexity >= SILK_PE_MIN_COMPLEX );
@@ -602,8 +602,8 @@ static void silk_P_Ana_calc_corr_st3(
         nb_cbk_search = PE_NB_CBKS_STAGE3_10MS;
         cbk_size      = PE_NB_CBKS_STAGE3_10MS;
     }
-    ALLOC( scratch_mem, SCRATCH_SIZE, opus_int32 );
-    ALLOC( xcorr32, SCRATCH_SIZE, opus_int32 );
+    ALLOC( scratch_mem, SCRATCH_SIZE, oac_int32 );
+    ALLOC( xcorr32, SCRATCH_SIZE, oac_int32 );
 
     target_ptr = &frame[ silk_LSHIFT( sf_length, 2 ) ]; /* Pointer to middle of frame */
     for( k = 0; k < nb_subfr; k++ ) {
@@ -643,20 +643,20 @@ static void silk_P_Ana_calc_corr_st3(
 /********************************************************************/
 static void silk_P_Ana_calc_energy_st3(
     silk_pe_stage3_vals energies_st3[],                 /* O 3 DIM energy array */
-    const opus_int16  frame[],                          /* I vector to calc energy in    */
-    opus_int          start_lag,                        /* I lag offset to search around */
-    opus_int          sf_length,                        /* I length of one 5 ms subframe */
-    opus_int          nb_subfr,                         /* I number of subframes         */
-    opus_int          complexity,                       /* I Complexity setting          */
+    const oac_int16  frame[],                          /* I vector to calc energy in    */
+    oac_int          start_lag,                        /* I lag offset to search around */
+    oac_int          sf_length,                        /* I length of one 5 ms subframe */
+    oac_int          nb_subfr,                         /* I number of subframes         */
+    oac_int          complexity,                       /* I Complexity setting          */
     int               arch                              /* I Run-time architecture       */
 )
 {
-    const opus_int16 *target_ptr, *basis_ptr;
-    opus_int32 energy;
-    opus_int   k, i, j, lag_counter;
-    opus_int   nb_cbk_search, delta, idx, cbk_size, lag_diff;
-    VARDECL( opus_int32, scratch_mem );
-    const opus_int8 *Lag_range_ptr, *Lag_CB_ptr;
+    const oac_int16 *target_ptr, *basis_ptr;
+    oac_int32 energy;
+    oac_int   k, i, j, lag_counter;
+    oac_int   nb_cbk_search, delta, idx, cbk_size, lag_diff;
+    VARDECL( oac_int32, scratch_mem );
+    const oac_int8 *Lag_range_ptr, *Lag_CB_ptr;
     SAVE_STACK;
 
     celt_assert( complexity >= SILK_PE_MIN_COMPLEX );
@@ -674,7 +674,7 @@ static void silk_P_Ana_calc_energy_st3(
         nb_cbk_search = PE_NB_CBKS_STAGE3_10MS;
         cbk_size      = PE_NB_CBKS_STAGE3_10MS;
     }
-    ALLOC( scratch_mem, SCRATCH_SIZE, opus_int32 );
+    ALLOC( scratch_mem, SCRATCH_SIZE, oac_int32 );
 
     target_ptr = &frame[ silk_LSHIFT( sf_length, 2 ) ];
     for( k = 0; k < nb_subfr; k++ ) {
diff --git a/silk/fixed/process_gains_FIX.c b/silk/fixed/process_gains_FIX.c
index 05aba3178..5c86f9347 100644
--- a/silk/fixed/process_gains_FIX.c
+++ b/silk/fixed/process_gains_FIX.c
@@ -36,12 +36,12 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_process_gains_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  Encoder control                                                             */
-    opus_int                        condCoding                              /* I    The type of conditional coding to use                                       */
+    oac_int                        condCoding                              /* I    The type of conditional coding to use                                       */
 )
 {
     silk_shape_state_FIX *psShapeSt = &psEnc->sShape;
-    opus_int     k;
-    opus_int32   s_Q16, InvMaxSqrVal_Q16, gain, gain_squared, ResNrg, ResNrgPart, quant_offset_Q10;
+    oac_int     k;
+    oac_int32   s_Q16, InvMaxSqrVal_Q16, gain, gain_squared, ResNrg, ResNrgPart, quant_offset_Q10;
 
     /* Gain reduction when LTP coding gain is high */
     if( psEnc->sCmn.indices.signalType == TYPE_VOICED ) {
@@ -87,7 +87,7 @@ void silk_process_gains_FIX(
     }
 
     /* Save unquantized gains and gain Index */
-    silk_memcpy( psEncCtrl->GainsUnq_Q16, psEncCtrl->Gains_Q16, psEnc->sCmn.nb_subfr * sizeof( opus_int32 ) );
+    silk_memcpy( psEncCtrl->GainsUnq_Q16, psEncCtrl->Gains_Q16, psEnc->sCmn.nb_subfr * sizeof( oac_int32 ) );
     psEncCtrl->lastGainIndexPrev = psShapeSt->LastGainIndex;
 
     /* Quantize gains */
diff --git a/silk/fixed/regularize_correlations_FIX.c b/silk/fixed/regularize_correlations_FIX.c
index a2836b05f..09fc75564 100644
--- a/silk/fixed/regularize_correlations_FIX.c
+++ b/silk/fixed/regularize_correlations_FIX.c
@@ -33,13 +33,13 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Add noise to matrix diagonal */
 void silk_regularize_correlations_FIX(
-    opus_int32                      *XX,                                    /* I/O  Correlation matrices                                                        */
-    opus_int32                      *xx,                                    /* I/O  Correlation values                                                          */
-    opus_int32                      noise,                                  /* I    Noise to add                                                                */
-    opus_int                        D                                       /* I    Dimension of XX                                                             */
+    oac_int32                      *XX,                                    /* I/O  Correlation matrices                                                        */
+    oac_int32                      *xx,                                    /* I/O  Correlation values                                                          */
+    oac_int32                      noise,                                  /* I    Noise to add                                                                */
+    oac_int                        D                                       /* I    Dimension of XX                                                             */
 )
 {
-    opus_int i;
+    oac_int i;
     for( i = 0; i < D; i++ ) {
         matrix_ptr( &XX[ 0 ], i, i, D ) = silk_ADD32( matrix_ptr( &XX[ 0 ], i, i, D ), noise );
     }
diff --git a/silk/fixed/residual_energy16_FIX.c b/silk/fixed/residual_energy16_FIX.c
index 7f130f3d3..d95590067 100644
--- a/silk/fixed/residual_energy16_FIX.c
+++ b/silk/fixed/residual_energy16_FIX.c
@@ -32,19 +32,19 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "main_FIX.h"
 
 /* Residual energy: nrg = wxx - 2 * wXx * c + c' * wXX * c */
-opus_int32 silk_residual_energy16_covar_FIX(
-    const opus_int16                *c,                                     /* I    Prediction vector                                                           */
-    const opus_int32                *wXX,                                   /* I    Correlation matrix                                                          */
-    const opus_int32                *wXx,                                   /* I    Correlation vector                                                          */
-    opus_int32                      wxx,                                    /* I    Signal energy                                                               */
-    opus_int                        D,                                      /* I    Dimension                                                                   */
-    opus_int                        cQ                                      /* I    Q value for c vector 0 - 15                                                 */
+oac_int32 silk_residual_energy16_covar_FIX(
+    const oac_int16                *c,                                     /* I    Prediction vector                                                           */
+    const oac_int32                *wXX,                                   /* I    Correlation matrix                                                          */
+    const oac_int32                *wXx,                                   /* I    Correlation vector                                                          */
+    oac_int32                      wxx,                                    /* I    Signal energy                                                               */
+    oac_int                        D,                                      /* I    Dimension                                                                   */
+    oac_int                        cQ                                      /* I    Q value for c vector 0 - 15                                                 */
 )
 {
-    opus_int   i, j, lshifts, Qxtra;
-    opus_int32 c_max, w_max, tmp, tmp2, nrg;
-    opus_int   cn[ MAX_MATRIX_SIZE ];
-    const opus_int32 *pRow;
+    oac_int   i, j, lshifts, Qxtra;
+    oac_int32 c_max, w_max, tmp, tmp2, nrg;
+    oac_int   cn[ MAX_MATRIX_SIZE ];
+    const oac_int32 *pRow;
 
     /* Safety checks */
     celt_assert( D >=  0 );
@@ -57,7 +57,7 @@ opus_int32 silk_residual_energy16_covar_FIX(
 
     c_max = 0;
     for( i = 0; i < D; i++ ) {
-        c_max = silk_max_32( c_max, silk_abs( (opus_int32)c[ i ] ) );
+        c_max = silk_max_32( c_max, silk_abs( (oac_int32)c[ i ] ) );
     }
     Qxtra = silk_min_int( Qxtra, silk_CLZ32( c_max ) - 17 );
 
@@ -65,7 +65,7 @@ opus_int32 silk_residual_energy16_covar_FIX(
     Qxtra = silk_min_int( Qxtra, silk_CLZ32( silk_MUL( D, silk_RSHIFT( silk_SMULWB( w_max, c_max ), 4 ) ) ) - 5 );
     Qxtra = silk_max_int( Qxtra, 0 );
     for( i = 0; i < D; i++ ) {
-        cn[ i ] = silk_LSHIFT( ( opus_int )c[ i ], Qxtra );
+        cn[ i ] = silk_LSHIFT( ( oac_int )c[ i ], Qxtra );
         silk_assert( silk_abs(cn[i]) <= ( silk_int16_MAX + 1 ) ); /* Check that silk_SMLAWB can be used */
     }
     lshifts -= Qxtra;
diff --git a/silk/fixed/residual_energy_FIX.c b/silk/fixed/residual_energy_FIX.c
index 6c7cade9a..21faa63e6 100644
--- a/silk/fixed/residual_energy_FIX.c
+++ b/silk/fixed/residual_energy_FIX.c
@@ -35,29 +35,29 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Calculates residual energies of input subframes where all subframes have LPC_order   */
 /* of preceding samples                                                                 */
 void silk_residual_energy_FIX(
-          opus_int32                nrgs[ MAX_NB_SUBFR ],                   /* O    Residual energy per subframe                                                */
-          opus_int                  nrgsQ[ MAX_NB_SUBFR ],                  /* O    Q value per subframe                                                        */
-    const opus_int16                x[],                                    /* I    Input signal                                                                */
-          opus_int16                a_Q12[ 2 ][ MAX_LPC_ORDER ],            /* I    AR coefs for each frame half                                                */
-    const opus_int32                gains[ MAX_NB_SUBFR ],                  /* I    Quantization gains                                                          */
-    const opus_int                  subfr_length,                           /* I    Subframe length                                                             */
-    const opus_int                  nb_subfr,                               /* I    Number of subframes                                                         */
-    const opus_int                  LPC_order,                              /* I    LPC order                                                                   */
+          oac_int32                nrgs[ MAX_NB_SUBFR ],                   /* O    Residual energy per subframe                                                */
+          oac_int                  nrgsQ[ MAX_NB_SUBFR ],                  /* O    Q value per subframe                                                        */
+    const oac_int16                x[],                                    /* I    Input signal                                                                */
+          oac_int16                a_Q12[ 2 ][ MAX_LPC_ORDER ],            /* I    AR coefs for each frame half                                                */
+    const oac_int32                gains[ MAX_NB_SUBFR ],                  /* I    Quantization gains                                                          */
+    const oac_int                  subfr_length,                           /* I    Subframe length                                                             */
+    const oac_int                  nb_subfr,                               /* I    Number of subframes                                                         */
+    const oac_int                  LPC_order,                              /* I    LPC order                                                                   */
           int                       arch                                    /* I    Run-time architecture                                                       */
 )
 {
-    opus_int         offset, i, j, rshift, lz1, lz2;
-    opus_int16       *LPC_res_ptr;
-    VARDECL( opus_int16, LPC_res );
-    const opus_int16 *x_ptr;
-    opus_int32       tmp32;
+    oac_int         offset, i, j, rshift, lz1, lz2;
+    oac_int16       *LPC_res_ptr;
+    VARDECL( oac_int16, LPC_res );
+    const oac_int16 *x_ptr;
+    oac_int32       tmp32;
     SAVE_STACK;
 
     x_ptr  = x;
     offset = LPC_order + subfr_length;
 
     /* Filter input to create the LPC residual for each frame half, and measure subframe energies */
-    ALLOC( LPC_res, ( MAX_NB_SUBFR >> 1 ) * offset, opus_int16 );
+    ALLOC( LPC_res, ( MAX_NB_SUBFR >> 1 ) * offset, oac_int16 );
     celt_assert( ( nb_subfr >> 1 ) * ( MAX_NB_SUBFR >> 1 ) == nb_subfr );
     for( i = 0; i < nb_subfr >> 1; i++ ) {
         /* Calculate half frame LPC residual signal including preceding samples */
diff --git a/silk/fixed/schur64_FIX.c b/silk/fixed/schur64_FIX.c
index 4b7e19ea5..1a87de0ec 100644
--- a/silk/fixed/schur64_FIX.c
+++ b/silk/fixed/schur64_FIX.c
@@ -33,21 +33,21 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Slower than schur(), but more accurate.                              */
 /* Uses SMULL(), available on armv4                                     */
-opus_int32 silk_schur64(                            /* O    returns residual energy                                     */
-    opus_int32                  rc_Q16[],           /* O    Reflection coefficients [order] Q16                         */
-    const opus_int32            c[],                /* I    Correlations [order+1]                                      */
-    opus_int32                  order               /* I    Prediction order                                            */
+oac_int32 silk_schur64(                            /* O    returns residual energy                                     */
+    oac_int32                  rc_Q16[],           /* O    Reflection coefficients [order] Q16                         */
+    const oac_int32            c[],                /* I    Correlations [order+1]                                      */
+    oac_int32                  order               /* I    Prediction order                                            */
 )
 {
-    opus_int   k, n;
-    opus_int32 C[ SILK_MAX_ORDER_LPC + 1 ][ 2 ];
-    opus_int32 Ctmp1_Q30, Ctmp2_Q30, rc_tmp_Q31;
+    oac_int   k, n;
+    oac_int32 C[ SILK_MAX_ORDER_LPC + 1 ][ 2 ];
+    oac_int32 Ctmp1_Q30, Ctmp2_Q30, rc_tmp_Q31;
 
     celt_assert( order >= 0 && order <= SILK_MAX_ORDER_LPC );
 
     /* Check for invalid input */
     if( c[ 0 ] <= 0 ) {
-        silk_memset( rc_Q16, 0, order * sizeof( opus_int32 ) );
+        silk_memset( rc_Q16, 0, order * sizeof( oac_int32 ) );
         return 0;
     }
 
diff --git a/silk/fixed/schur_FIX.c b/silk/fixed/schur_FIX.c
index 2840f6b1a..f9a25ad9b 100644
--- a/silk/fixed/schur_FIX.c
+++ b/silk/fixed/schur_FIX.c
@@ -33,15 +33,15 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Faster than schur64(), but much less accurate.                       */
 /* uses SMLAWB(), requiring armv5E and higher.                          */
-opus_int32 silk_schur(                              /* O    Returns residual energy                                     */
-    opus_int16                  *rc_Q15,            /* O    reflection coefficients [order] Q15                         */
-    const opus_int32            *c,                 /* I    correlations [order+1]                                      */
-    const opus_int32            order               /* I    prediction order                                            */
+oac_int32 silk_schur(                              /* O    Returns residual energy                                     */
+    oac_int16                  *rc_Q15,            /* O    reflection coefficients [order] Q15                         */
+    const oac_int32            *c,                 /* I    correlations [order+1]                                      */
+    const oac_int32            order               /* I    prediction order                                            */
 )
 {
-    opus_int        k, n, lz;
-    opus_int32    C[ SILK_MAX_ORDER_LPC + 1 ][ 2 ];
-    opus_int32    Ctmp1, Ctmp2, rc_tmp_Q15;
+    oac_int        k, n, lz;
+    oac_int32    C[ SILK_MAX_ORDER_LPC + 1 ][ 2 ];
+    oac_int32    Ctmp1, Ctmp2, rc_tmp_Q15;
 
     celt_assert( order >= 0 && order <= SILK_MAX_ORDER_LPC );
 
@@ -87,7 +87,7 @@ opus_int32 silk_schur(                              /* O    Returns residual ene
         rc_tmp_Q15 = silk_SAT16( rc_tmp_Q15 );
 
         /* Store */
-        rc_Q15[ k ] = (opus_int16)rc_tmp_Q15;
+        rc_Q15[ k ] = (oac_int16)rc_tmp_Q15;
 
         /* Update correlations */
         for( n = 0; n < order - k; n++ ) {
diff --git a/silk/fixed/structs_FIX.h b/silk/fixed/structs_FIX.h
index 42920d61b..674f9a17b 100644
--- a/silk/fixed/structs_FIX.h
+++ b/silk/fixed/structs_FIX.h
@@ -37,10 +37,10 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Noise shaping analysis state */
 /********************************/
 typedef struct {
-    opus_int8                   LastGainIndex;
-    opus_int32                  HarmBoost_smth_Q16;
-    opus_int32                  HarmShapeGain_smth_Q16;
-    opus_int32                  Tilt_smth_Q16;
+    oac_int8                   LastGainIndex;
+    oac_int32                  HarmBoost_smth_Q16;
+    oac_int32                  HarmShapeGain_smth_Q16;
+    oac_int32                  Tilt_smth_Q16;
 } silk_shape_state_FIX;
 
 /********************************/
@@ -51,9 +51,9 @@ typedef struct {
     silk_shape_state_FIX        sShape;                                 /* Shape state                                          */
 
     /* Buffer for find pitch and noise shape analysis */
-    silk_DWORD_ALIGN opus_int16 x_buf[ 2 * MAX_FRAME_LENGTH + LA_SHAPE_MAX ];/* Buffer for find pitch and noise shape analysis  */
-    opus_int                    LTPCorr_Q15;                            /* Normalized correlation from pitch lag estimator      */
-    opus_int32                    resNrgSmth;
+    silk_DWORD_ALIGN oac_int16 x_buf[ 2 * MAX_FRAME_LENGTH + LA_SHAPE_MAX ];/* Buffer for find pitch and noise shape analysis  */
+    oac_int                    LTPCorr_Q15;                            /* Normalized correlation from pitch lag estimator      */
+    oac_int32                    resNrgSmth;
 } silk_encoder_state_FIX;
 
 /************************/
@@ -61,31 +61,31 @@ typedef struct {
 /************************/
 typedef struct {
     /* Prediction and coding parameters */
-    opus_int32                  Gains_Q16[ MAX_NB_SUBFR ];
-    silk_DWORD_ALIGN opus_int16 PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ];
-    opus_int16                  LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ];
-    opus_int                    LTP_scale_Q14;
-    opus_int                    pitchL[ MAX_NB_SUBFR ];
+    oac_int32                  Gains_Q16[ MAX_NB_SUBFR ];
+    silk_DWORD_ALIGN oac_int16 PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ];
+    oac_int16                  LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ];
+    oac_int                    LTP_scale_Q14;
+    oac_int                    pitchL[ MAX_NB_SUBFR ];
 
     /* Noise shaping parameters */
     /* Testing */
-    silk_DWORD_ALIGN opus_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ];
-    opus_int32                  LF_shp_Q14[        MAX_NB_SUBFR ];      /* Packs two int16 coefficients per int32 value         */
-    opus_int                    Tilt_Q14[          MAX_NB_SUBFR ];
-    opus_int                    HarmShapeGain_Q14[ MAX_NB_SUBFR ];
-    opus_int                    Lambda_Q10;
-    opus_int                    input_quality_Q14;
-    opus_int                    coding_quality_Q14;
+    silk_DWORD_ALIGN oac_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ];
+    oac_int32                  LF_shp_Q14[        MAX_NB_SUBFR ];      /* Packs two int16 coefficients per int32 value         */
+    oac_int                    Tilt_Q14[          MAX_NB_SUBFR ];
+    oac_int                    HarmShapeGain_Q14[ MAX_NB_SUBFR ];
+    oac_int                    Lambda_Q10;
+    oac_int                    input_quality_Q14;
+    oac_int                    coding_quality_Q14;
 
     /* measures */
-    opus_int32                  predGain_Q16;
-    opus_int                    LTPredCodGain_Q7;
-    opus_int32                  ResNrg[ MAX_NB_SUBFR ];                 /* Residual energy per subframe                         */
-    opus_int                    ResNrgQ[ MAX_NB_SUBFR ];                /* Q domain for the residual energy > 0                 */
+    oac_int32                  predGain_Q16;
+    oac_int                    LTPredCodGain_Q7;
+    oac_int32                  ResNrg[ MAX_NB_SUBFR ];                 /* Residual energy per subframe                         */
+    oac_int                    ResNrgQ[ MAX_NB_SUBFR ];                /* Q domain for the residual energy > 0                 */
 
     /* Parameters for CBR mode */
-    opus_int32                  GainsUnq_Q16[ MAX_NB_SUBFR ];
-    opus_int8                   lastGainIndexPrev;
+    oac_int32                  GainsUnq_Q16[ MAX_NB_SUBFR ];
+    oac_int8                   lastGainIndexPrev;
 } silk_encoder_control_FIX;
 
 /************************/
@@ -93,14 +93,14 @@ typedef struct {
 /************************/
 typedef struct {
     stereo_enc_state            sStereo;
-    opus_int32                  nBitsUsedLBRR;
-    opus_int32                  nBitsExceeded;
-    opus_int                    nChannelsAPI;
-    opus_int                    nChannelsInternal;
-    opus_int                    nPrevChannelsInternal;
-    opus_int                    timeSinceSwitchAllowed_ms;
-    opus_int                    allowBandwidthSwitch;
-    opus_int                    prev_decode_only_middle;
+    oac_int32                  nBitsUsedLBRR;
+    oac_int32                  nBitsExceeded;
+    oac_int                    nChannelsAPI;
+    oac_int                    nChannelsInternal;
+    oac_int                    nPrevChannelsInternal;
+    oac_int                    timeSinceSwitchAllowed_ms;
+    oac_int                    allowBandwidthSwitch;
+    oac_int                    prev_decode_only_middle;
     /* This needs to be last so we can skip the second state for mono. */
     silk_encoder_state_FIX      state_Fxx[ ENCODER_NUM_CHANNELS ];
 } silk_encoder;
diff --git a/silk/fixed/vector_ops_FIX.c b/silk/fixed/vector_ops_FIX.c
index dcf84070a..5a34a502c 100644
--- a/silk/fixed/vector_ops_FIX.c
+++ b/silk/fixed/vector_ops_FIX.c
@@ -34,32 +34,32 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Copy and multiply a vector by a constant */
 void silk_scale_copy_vector16(
-    opus_int16                  *data_out,
-    const opus_int16            *data_in,
-    opus_int32                  gain_Q16,           /* I    Gain in Q16                                                 */
-    const opus_int              dataSize            /* I    Length                                                      */
+    oac_int16                  *data_out,
+    const oac_int16            *data_in,
+    oac_int32                  gain_Q16,           /* I    Gain in Q16                                                 */
+    const oac_int              dataSize            /* I    Length                                                      */
 )
 {
-    opus_int  i;
-    opus_int32 tmp32;
+    oac_int  i;
+    oac_int32 tmp32;
 
     for( i = 0; i < dataSize; i++ ) {
         tmp32 = silk_SMULWB( gain_Q16, data_in[ i ] );
-        data_out[ i ] = (opus_int16)silk_CHECK_FIT16( tmp32 );
+        data_out[ i ] = (oac_int16)silk_CHECK_FIT16( tmp32 );
     }
 }
 
 /* Multiply a vector by a constant */
 void silk_scale_vector32_Q26_lshift_18(
-    opus_int32                  *data1,             /* I/O  Q0/Q18                                                      */
-    opus_int32                  gain_Q26,           /* I    Q26                                                         */
-    opus_int                    dataSize            /* I    length                                                      */
+    oac_int32                  *data1,             /* I/O  Q0/Q18                                                      */
+    oac_int32                  gain_Q26,           /* I    Q26                                                         */
+    oac_int                    dataSize            /* I    length                                                      */
 )
 {
-    opus_int  i;
+    oac_int  i;
 
     for( i = 0; i < dataSize; i++ ) {
-        data1[ i ] = (opus_int32)silk_CHECK_FIT32( silk_RSHIFT64( silk_SMULL( data1[ i ], gain_Q26 ), 8 ) );    /* OUTPUT: Q18 */
+        data1[ i ] = (oac_int32)silk_CHECK_FIT32( silk_RSHIFT64( silk_SMULL( data1[ i ], gain_Q26 ), 8 ) );    /* OUTPUT: Q18 */
     }
 }
 
@@ -68,18 +68,18 @@ void silk_scale_vector32_Q26_lshift_18(
 /*        * inVec1 and inVec2 should be at least 2 byte aligned.                */
 /*        * len should be positive 16bit integer.                               */
 /*        * only when len>6, memory access can be reduced by half.              */
-opus_int32 silk_inner_prod_aligned(
-    const opus_int16 *const     inVec1,             /*    I input vector 1                                              */
-    const opus_int16 *const     inVec2,             /*    I input vector 2                                              */
-    const opus_int              len,                /*    I vector lengths                                              */
+oac_int32 silk_inner_prod_aligned(
+    const oac_int16 *const     inVec1,             /*    I input vector 1                                              */
+    const oac_int16 *const     inVec2,             /*    I input vector 2                                              */
+    const oac_int              len,                /*    I vector lengths                                              */
     int                         arch                /*    I Run-time architecture                                       */
 )
 {
 #ifdef FIXED_POINT
    return celt_inner_prod(inVec1, inVec2, len, arch);
 #else
-    opus_int   i;
-    opus_int32 sum = 0;
+    oac_int   i;
+    oac_int32 sum = 0;
     for( i = 0; i < len; i++ ) {
         sum = silk_SMLABB( sum, inVec1[ i ], inVec2[ i ] );
     }
@@ -87,14 +87,14 @@ opus_int32 silk_inner_prod_aligned(
 #endif
 }
 
-opus_int64 silk_inner_prod16_c(
-    const opus_int16            *inVec1,            /*    I input vector 1                                              */
-    const opus_int16            *inVec2,            /*    I input vector 2                                              */
-    const opus_int              len                 /*    I vector lengths                                              */
+oac_int64 silk_inner_prod16_c(
+    const oac_int16            *inVec1,            /*    I input vector 1                                              */
+    const oac_int16            *inVec2,            /*    I input vector 2                                              */
+    const oac_int              len                 /*    I vector lengths                                              */
 )
 {
-    opus_int   i;
-    opus_int64 sum = 0;
+    oac_int   i;
+    oac_int64 sum = 0;
     for( i = 0; i < len; i++ ) {
         sum = silk_SMLALBB( sum, inVec1[ i ], inVec2[ i ] );
     }
diff --git a/silk/fixed/warped_autocorrelation_FIX.c b/silk/fixed/warped_autocorrelation_FIX.c
index 00bd9ff64..f018a1de1 100644
--- a/silk/fixed/warped_autocorrelation_FIX.c
+++ b/silk/fixed/warped_autocorrelation_FIX.c
@@ -39,18 +39,18 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Autocorrelations for a warped frequency axis */
 #ifndef OVERRIDE_silk_warped_autocorrelation_FIX_c
 void silk_warped_autocorrelation_FIX_c(
-          opus_int32                *corr,                                  /* O    Result [order + 1]                                                          */
-          opus_int                  *scale,                                 /* O    Scaling of the correlation vector                                           */
-    const opus_int16                *input,                                 /* I    Input data to correlate                                                     */
-    const opus_int                  warping_Q16,                            /* I    Warping coefficient                                                         */
-    const opus_int                  length,                                 /* I    Length of input                                                             */
-    const opus_int                  order                                   /* I    Correlation order (even)                                                    */
+          oac_int32                *corr,                                  /* O    Result [order + 1]                                                          */
+          oac_int                  *scale,                                 /* O    Scaling of the correlation vector                                           */
+    const oac_int16                *input,                                 /* I    Input data to correlate                                                     */
+    const oac_int                  warping_Q16,                            /* I    Warping coefficient                                                         */
+    const oac_int                  length,                                 /* I    Length of input                                                             */
+    const oac_int                  order                                   /* I    Correlation order (even)                                                    */
 )
 {
-    opus_int   n, i, lsh;
-    opus_int32 tmp1_QS, tmp2_QS;
-    opus_int32 state_QS[ MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };
-    opus_int64 corr_QC[  MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };
+    oac_int   n, i, lsh;
+    oac_int32 tmp1_QS, tmp2_QS;
+    oac_int32 state_QS[ MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };
+    oac_int64 corr_QC[  MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };
 
     /* Order must be even */
     celt_assert( ( order & 1 ) == 0 );
@@ -58,7 +58,7 @@ void silk_warped_autocorrelation_FIX_c(
 
     /* Loop over samples */
     for( n = 0; n < length; n++ ) {
-        tmp1_QS = silk_LSHIFT32( (opus_int32)input[ n ], QS );
+        tmp1_QS = silk_LSHIFT32( (oac_int32)input[ n ], QS );
         /* Loop over allpass sections */
         for( i = 0; i < order; i += 2 ) {
             /* Output of allpass section */
@@ -80,11 +80,11 @@ void silk_warped_autocorrelation_FIX_c(
     silk_assert( *scale >= -30 && *scale <= 12 );
     if( lsh >= 0 ) {
         for( i = 0; i < order + 1; i++ ) {
-            corr[ i ] = (opus_int32)silk_CHECK_FIT32( silk_LSHIFT64( corr_QC[ i ], lsh ) );
+            corr[ i ] = (oac_int32)silk_CHECK_FIT32( silk_LSHIFT64( corr_QC[ i ], lsh ) );
         }
     } else {
         for( i = 0; i < order + 1; i++ ) {
-            corr[ i ] = (opus_int32)silk_CHECK_FIT32( silk_RSHIFT64( corr_QC[ i ], -lsh ) );
+            corr[ i ] = (oac_int32)silk_CHECK_FIT32( silk_RSHIFT64( corr_QC[ i ], -lsh ) );
         }
     }
     silk_assert( corr_QC[ 0 ] >= 0 ); /* If breaking, decrease QC*/
diff --git a/silk/fixed/x86/burg_modified_FIX_sse4_1.c b/silk/fixed/x86/burg_modified_FIX_sse4_1.c
index c13695ea0..e0f2669f1 100644
--- a/silk/fixed/x86/burg_modified_FIX_sse4_1.c
+++ b/silk/fixed/x86/burg_modified_FIX_sse4_1.c
@@ -48,27 +48,27 @@
 
 /* Compute reflection coefficients from input signal */
 void silk_burg_modified_sse4_1(
-    opus_int32                  *res_nrg,           /* O    Residual energy                                             */
-    opus_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
-    opus_int32                  A_Q16[],            /* O    Prediction coefficients (length order)                      */
-    const opus_int16            x[],                /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
-    const opus_int32            minInvGain_Q30,     /* I    Inverse of max prediction gain                              */
-    const opus_int              subfr_length,       /* I    Input signal subframe length (incl. D preceding samples)    */
-    const opus_int              nb_subfr,           /* I    Number of subframes stacked in x                            */
-    const opus_int              D,                  /* I    Order                                                       */
+    oac_int32                  *res_nrg,           /* O    Residual energy                                             */
+    oac_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
+    oac_int32                  A_Q16[],            /* O    Prediction coefficients (length order)                      */
+    const oac_int16            x[],                /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
+    const oac_int32            minInvGain_Q30,     /* I    Inverse of max prediction gain                              */
+    const oac_int              subfr_length,       /* I    Input signal subframe length (incl. D preceding samples)    */
+    const oac_int              nb_subfr,           /* I    Number of subframes stacked in x                            */
+    const oac_int              D,                  /* I    Order                                                       */
     int                         arch                /* I    Run-time architecture                                       */
 )
 {
-    opus_int         k, n, s, lz, rshifts, reached_max_gain;
-    opus_int32       C0, num, nrg, rc_Q31, invGain_Q30, Atmp_QA, Atmp1, tmp1, tmp2, x1, x2;
-    const opus_int16 *x_ptr;
-    opus_int32       C_first_row[ SILK_MAX_ORDER_LPC ];
-    opus_int32       C_last_row[  SILK_MAX_ORDER_LPC ];
-    opus_int32       Af_QA[       SILK_MAX_ORDER_LPC ];
-    opus_int32       CAf[ SILK_MAX_ORDER_LPC + 1 ];
-    opus_int32       CAb[ SILK_MAX_ORDER_LPC + 1 ];
-    opus_int32       xcorr[ SILK_MAX_ORDER_LPC ];
-    opus_int64       C0_64;
+    oac_int         k, n, s, lz, rshifts, reached_max_gain;
+    oac_int32       C0, num, nrg, rc_Q31, invGain_Q30, Atmp_QA, Atmp1, tmp1, tmp2, x1, x2;
+    const oac_int16 *x_ptr;
+    oac_int32       C_first_row[ SILK_MAX_ORDER_LPC ];
+    oac_int32       C_last_row[  SILK_MAX_ORDER_LPC ];
+    oac_int32       Af_QA[       SILK_MAX_ORDER_LPC ];
+    oac_int32       CAf[ SILK_MAX_ORDER_LPC + 1 ];
+    oac_int32       CAb[ SILK_MAX_ORDER_LPC + 1 ];
+    oac_int32       xcorr[ SILK_MAX_ORDER_LPC ];
+    oac_int64       C0_64;
 
     __m128i FIRST_3210, LAST_3210, ATMP_3210, TMP1_3210, TMP2_3210, T1_3210, T2_3210, PTR_3210, SUBFR_3210, X1_3210, X2_3210;
     __m128i CONST1 = _mm_set1_epi32(1);
@@ -83,25 +83,25 @@ void silk_burg_modified_sse4_1(
     if (rshifts < MIN_RSHIFTS) rshifts = MIN_RSHIFTS;
 
     if (rshifts > 0) {
-        C0 = (opus_int32)silk_RSHIFT64(C0_64, rshifts );
+        C0 = (oac_int32)silk_RSHIFT64(C0_64, rshifts );
     } else {
-        C0 = silk_LSHIFT32((opus_int32)C0_64, -rshifts );
+        C0 = silk_LSHIFT32((oac_int32)C0_64, -rshifts );
     }
 
     CAb[ 0 ] = CAf[ 0 ] = C0 + silk_SMMUL( SILK_FIX_CONST( FIND_LPC_COND_FAC, 32 ), C0 ) + 1;                                /* Q(-rshifts) */
-    silk_memset( C_first_row, 0, SILK_MAX_ORDER_LPC * sizeof( opus_int32 ) );
+    silk_memset( C_first_row, 0, SILK_MAX_ORDER_LPC * sizeof( oac_int32 ) );
     if( rshifts > 0 ) {
         for( s = 0; s < nb_subfr; s++ ) {
             x_ptr = x + s * subfr_length;
             for( n = 1; n < D + 1; n++ ) {
-                C_first_row[ n - 1 ] += (opus_int32)silk_RSHIFT64(
+                C_first_row[ n - 1 ] += (oac_int32)silk_RSHIFT64(
                     silk_inner_prod16( x_ptr, x_ptr + n, subfr_length - n, arch ), rshifts );
             }
         }
     } else {
         for( s = 0; s < nb_subfr; s++ ) {
             int i;
-            opus_int32 d;
+            oac_int32 d;
             x_ptr = x + s * subfr_length;
             celt_pitch_xcorr(x_ptr, x_ptr + 1, xcorr, subfr_length - D, D, arch );
             for( n = 1; n < D + 1; n++ ) {
@@ -114,12 +114,12 @@ void silk_burg_modified_sse4_1(
             }
         }
     }
-    silk_memcpy( C_last_row, C_first_row, SILK_MAX_ORDER_LPC * sizeof( opus_int32 ) );
+    silk_memcpy( C_last_row, C_first_row, SILK_MAX_ORDER_LPC * sizeof( oac_int32 ) );
 
     /* Initialize */
     CAb[ 0 ] = CAf[ 0 ] = C0 + silk_SMMUL( SILK_FIX_CONST( FIND_LPC_COND_FAC, 32 ), C0 ) + 1;                                /* Q(-rshifts) */
 
-    invGain_Q30 = (opus_int32)1 << 30;
+    invGain_Q30 = (oac_int32)1 << 30;
     reached_max_gain = 0;
     for( n = 0; n < D; n++ ) {
         /* Update first row of correlation matrix (without first element) */
@@ -129,10 +129,10 @@ void silk_burg_modified_sse4_1(
         if( rshifts > -2 ) {
             for( s = 0; s < nb_subfr; s++ ) {
                 x_ptr = x + s * subfr_length;
-                x1  = -silk_LSHIFT32( (opus_int32)x_ptr[ n ],                    16 - rshifts );        /* Q(16-rshifts) */
-                x2  = -silk_LSHIFT32( (opus_int32)x_ptr[ subfr_length - n - 1 ], 16 - rshifts );        /* Q(16-rshifts) */
-                tmp1 = silk_LSHIFT32( (opus_int32)x_ptr[ n ],                    QA - 16 );             /* Q(QA-16) */
-                tmp2 = silk_LSHIFT32( (opus_int32)x_ptr[ subfr_length - n - 1 ], QA - 16 );             /* Q(QA-16) */
+                x1  = -silk_LSHIFT32( (oac_int32)x_ptr[ n ],                    16 - rshifts );        /* Q(16-rshifts) */
+                x2  = -silk_LSHIFT32( (oac_int32)x_ptr[ subfr_length - n - 1 ], 16 - rshifts );        /* Q(16-rshifts) */
+                tmp1 = silk_LSHIFT32( (oac_int32)x_ptr[ n ],                    QA - 16 );             /* Q(QA-16) */
+                tmp2 = silk_LSHIFT32( (oac_int32)x_ptr[ subfr_length - n - 1 ], QA - 16 );             /* Q(QA-16) */
                 for( k = 0; k < n; k++ ) {
                     C_first_row[ k ] = silk_SMLAWB( C_first_row[ k ], x1, x_ptr[ n - k - 1 ]            ); /* Q( -rshifts ) */
                     C_last_row[ k ]  = silk_SMLAWB( C_last_row[ k ],  x2, x_ptr[ subfr_length - n + k ] ); /* Q( -rshifts ) */
@@ -150,10 +150,10 @@ void silk_burg_modified_sse4_1(
         } else {
             for( s = 0; s < nb_subfr; s++ ) {
                 x_ptr = x + s * subfr_length;
-                x1  = -silk_LSHIFT32( (opus_int32)x_ptr[ n ],                    -rshifts );            /* Q( -rshifts ) */
-                x2  = -silk_LSHIFT32( (opus_int32)x_ptr[ subfr_length - n - 1 ], -rshifts );            /* Q( -rshifts ) */
-                tmp1 = silk_LSHIFT32( (opus_int32)x_ptr[ n ],                    17 );                  /* Q17 */
-                tmp2 = silk_LSHIFT32( (opus_int32)x_ptr[ subfr_length - n - 1 ], 17 );                  /* Q17 */
+                x1  = -silk_LSHIFT32( (oac_int32)x_ptr[ n ],                    -rshifts );            /* Q( -rshifts ) */
+                x2  = -silk_LSHIFT32( (oac_int32)x_ptr[ subfr_length - n - 1 ], -rshifts );            /* Q( -rshifts ) */
+                tmp1 = silk_LSHIFT32( (oac_int32)x_ptr[ n ],                    17 );                  /* Q17 */
+                tmp2 = silk_LSHIFT32( (oac_int32)x_ptr[ subfr_length - n - 1 ], 17 );                  /* Q17 */
 
                 X1_3210 = _mm_set1_epi32( x1 );
                 X2_3210 = _mm_set1_epi32( x2 );
@@ -255,9 +255,9 @@ void silk_burg_modified_sse4_1(
 
                     for( ; k <= n; k++ ) {
                         CAf[ k ] = silk_SMLAWW( CAf[ k ], tmp1,
-                            silk_LSHIFT32( (opus_int32)x_ptr[ n - k ], -rshifts - 1 ) );                    /* Q( -rshift ) */
+                            silk_LSHIFT32( (oac_int32)x_ptr[ n - k ], -rshifts - 1 ) );                    /* Q( -rshift ) */
                         CAb[ k ] = silk_SMLAWW( CAb[ k ], tmp2,
-                            silk_LSHIFT32( (opus_int32)x_ptr[ subfr_length - n + k - 1 ], -rshifts - 1 ) ); /* Q( -rshift ) */
+                            silk_LSHIFT32( (oac_int32)x_ptr[ subfr_length - n + k - 1 ], -rshifts - 1 ) ); /* Q( -rshift ) */
                     }
                 }
             }
@@ -293,11 +293,11 @@ void silk_burg_modified_sse4_1(
         }
 
         /* Update inverse prediction gain */
-        tmp1 = ( (opus_int32)1 << 30 ) - silk_SMMUL( rc_Q31, rc_Q31 );
+        tmp1 = ( (oac_int32)1 << 30 ) - silk_SMMUL( rc_Q31, rc_Q31 );
         tmp1 = silk_LSHIFT( silk_SMMUL( invGain_Q30, tmp1 ), 2 );
         if( tmp1 <= minInvGain_Q30 ) {
             /* Max prediction gain exceeded; set reflection coefficient such that max prediction gain is exactly hit */
-            tmp2 = ( (opus_int32)1 << 30 ) - silk_DIV32_varQ( minInvGain_Q30, invGain_Q30, 30 );            /* Q30 */
+            tmp2 = ( (oac_int32)1 << 30 ) - silk_DIV32_varQ( minInvGain_Q30, invGain_Q30, 30 );            /* Q30 */
             rc_Q31 = silk_SQRT_APPROX( tmp2 );                                                  /* Q15 */
             if( rc_Q31 > 0 ) {
                  /* Newton-Raphson iteration */
@@ -349,7 +349,7 @@ void silk_burg_modified_sse4_1(
         if( rshifts > 0 ) {
             for( s = 0; s < nb_subfr; s++ ) {
                 x_ptr = x + s * subfr_length;
-                C0 -= (opus_int32)silk_RSHIFT64( silk_inner_prod16( x_ptr, x_ptr, D, arch ), rshifts );
+                C0 -= (oac_int32)silk_RSHIFT64( silk_inner_prod16( x_ptr, x_ptr, D, arch ), rshifts );
             }
         } else {
             for( s = 0; s < nb_subfr; s++ ) {
@@ -363,7 +363,7 @@ void silk_burg_modified_sse4_1(
     } else {
         /* Return residual energy */
         nrg  = CAf[ 0 ];                                                                            /* Q( -rshifts ) */
-        tmp1 = (opus_int32)1 << 16;                                                                             /* Q16 */
+        tmp1 = (oac_int32)1 << 16;                                                                             /* Q16 */
         for( k = 0; k < D; k++ ) {
             Atmp1 = silk_RSHIFT_ROUND( Af_QA[ k ], QA - 16 );                                       /* Q16 */
             nrg  = silk_SMLAWW( nrg, CAf[ k + 1 ], Atmp1 );                                         /* Q( -rshifts ) */
@@ -374,11 +374,11 @@ void silk_burg_modified_sse4_1(
         *res_nrg_Q = -rshifts;
     }
 
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     {
-        opus_int32 res_nrg_c = 0;
-        opus_int res_nrg_Q_c = 0;
-        opus_int32 A_Q16_c[ MAX_LPC_ORDER ] = {0};
+        oac_int32 res_nrg_c = 0;
+        oac_int res_nrg_Q_c = 0;
+        oac_int32 A_Q16_c[ MAX_LPC_ORDER ] = {0};
 
         silk_burg_modified_c(
             &res_nrg_c,
diff --git a/silk/fixed/x86/vector_ops_FIX_sse4_1.c b/silk/fixed/x86/vector_ops_FIX_sse4_1.c
index deea85791..c0be8d597 100644
--- a/silk/fixed/x86/vector_ops_FIX_sse4_1.c
+++ b/silk/fixed/x86/vector_ops_FIX_sse4_1.c
@@ -38,14 +38,14 @@
 #include "pitch.h"
 #include "celt/x86/x86cpu.h"
 
-opus_int64 silk_inner_prod16_sse4_1(
-    const opus_int16            *inVec1,            /*    I input vector 1                                              */
-    const opus_int16            *inVec2,            /*    I input vector 2                                              */
-    const opus_int              len                 /*    I vector lengths                                              */
+oac_int64 silk_inner_prod16_sse4_1(
+    const oac_int16            *inVec1,            /*    I input vector 1                                              */
+    const oac_int16            *inVec2,            /*    I input vector 2                                              */
+    const oac_int              len                 /*    I vector lengths                                              */
 )
 {
-    opus_int  i, dataSize4;
-    opus_int64 sum;
+    oac_int  i, dataSize4;
+    oac_int64 sum;
 
     __m128i xmm_prod_20, xmm_prod_31;
     __m128i inVec1_3210, acc1;
@@ -82,9 +82,9 @@ opus_int64 silk_inner_prod16_sse4_1(
         sum = silk_SMLALBB( sum, inVec1[ i ], inVec2[ i ] );
     }
 
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     {
-        opus_int64 sum_c = silk_inner_prod16_c( inVec1, inVec2, len );
+        oac_int64 sum_c = silk_inner_prod16_c( inVec1, inVec2, len );
         silk_assert( sum == sum_c );
     }
 #endif
diff --git a/silk/float/LPC_analysis_filter_FLP.c b/silk/float/LPC_analysis_filter_FLP.c
index f7007c3d0..77bed6757 100644
--- a/silk/float/LPC_analysis_filter_FLP.c
+++ b/silk/float/LPC_analysis_filter_FLP.c
@@ -40,14 +40,14 @@ POSSIBILITY OF SUCH DAMAGE.
 /************************************************/
 
 /* 16th order LPC analysis filter, does not write first 16 samples */
-static OPUS_INLINE void silk_LPC_analysis_filter16_FLP(
+static OAC_INLINE void silk_LPC_analysis_filter16_FLP(
           silk_float                 r_LPC[],            /* O    LPC residual signal                     */
     const silk_float                 PredCoef[],         /* I    LPC coefficients                        */
     const silk_float                 s[],                /* I    Input signal                            */
-    const opus_int                   length              /* I    Length of input signal                  */
+    const oac_int                   length              /* I    Length of input signal                  */
 )
 {
-    opus_int   ix;
+    oac_int   ix;
     silk_float LPC_pred;
     const silk_float *s_ptr;
 
@@ -78,14 +78,14 @@ static OPUS_INLINE void silk_LPC_analysis_filter16_FLP(
 }
 
 /* 12th order LPC analysis filter, does not write first 12 samples */
-static OPUS_INLINE void silk_LPC_analysis_filter12_FLP(
+static OAC_INLINE void silk_LPC_analysis_filter12_FLP(
           silk_float                 r_LPC[],            /* O    LPC residual signal                     */
     const silk_float                 PredCoef[],         /* I    LPC coefficients                        */
     const silk_float                 s[],                /* I    Input signal                            */
-    const opus_int                   length              /* I    Length of input signal                  */
+    const oac_int                   length              /* I    Length of input signal                  */
 )
 {
-    opus_int   ix;
+    oac_int   ix;
     silk_float LPC_pred;
     const silk_float *s_ptr;
 
@@ -112,14 +112,14 @@ static OPUS_INLINE void silk_LPC_analysis_filter12_FLP(
 }
 
 /* 10th order LPC analysis filter, does not write first 10 samples */
-static OPUS_INLINE void silk_LPC_analysis_filter10_FLP(
+static OAC_INLINE void silk_LPC_analysis_filter10_FLP(
           silk_float                 r_LPC[],            /* O    LPC residual signal                     */
     const silk_float                 PredCoef[],         /* I    LPC coefficients                        */
     const silk_float                 s[],                /* I    Input signal                            */
-    const opus_int                   length              /* I    Length of input signal                  */
+    const oac_int                   length              /* I    Length of input signal                  */
 )
 {
-    opus_int   ix;
+    oac_int   ix;
     silk_float LPC_pred;
     const silk_float *s_ptr;
 
@@ -144,14 +144,14 @@ static OPUS_INLINE void silk_LPC_analysis_filter10_FLP(
 }
 
 /* 8th order LPC analysis filter, does not write first 8 samples */
-static OPUS_INLINE void silk_LPC_analysis_filter8_FLP(
+static OAC_INLINE void silk_LPC_analysis_filter8_FLP(
           silk_float                 r_LPC[],            /* O    LPC residual signal                     */
     const silk_float                 PredCoef[],         /* I    LPC coefficients                        */
     const silk_float                 s[],                /* I    Input signal                            */
-    const opus_int                   length              /* I    Length of input signal                  */
+    const oac_int                   length              /* I    Length of input signal                  */
 )
 {
-    opus_int   ix;
+    oac_int   ix;
     silk_float LPC_pred;
     const silk_float *s_ptr;
 
@@ -174,14 +174,14 @@ static OPUS_INLINE void silk_LPC_analysis_filter8_FLP(
 }
 
 /* 6th order LPC analysis filter, does not write first 6 samples */
-static OPUS_INLINE void silk_LPC_analysis_filter6_FLP(
+static OAC_INLINE void silk_LPC_analysis_filter6_FLP(
           silk_float                 r_LPC[],            /* O    LPC residual signal                     */
     const silk_float                 PredCoef[],         /* I    LPC coefficients                        */
     const silk_float                 s[],                /* I    Input signal                            */
-    const opus_int                   length              /* I    Length of input signal                  */
+    const oac_int                   length              /* I    Length of input signal                  */
 )
 {
-    opus_int   ix;
+    oac_int   ix;
     silk_float LPC_pred;
     const silk_float *s_ptr;
 
@@ -211,8 +211,8 @@ void silk_LPC_analysis_filter_FLP(
     silk_float                      r_LPC[],                            /* O    LPC residual signal                         */
     const silk_float                PredCoef[],                         /* I    LPC coefficients                            */
     const silk_float                s[],                                /* I    Input signal                                */
-    const opus_int                  length,                             /* I    Length of input signal                      */
-    const opus_int                  Order                               /* I    LPC order                                   */
+    const oac_int                  length,                             /* I    Length of input signal                      */
+    const oac_int                  Order                               /* I    LPC order                                   */
 )
 {
     celt_assert( Order <= length );
diff --git a/silk/float/LPC_inv_pred_gain_FLP.c b/silk/float/LPC_inv_pred_gain_FLP.c
index 2be2122d6..68c280e90 100644
--- a/silk/float/LPC_inv_pred_gain_FLP.c
+++ b/silk/float/LPC_inv_pred_gain_FLP.c
@@ -38,10 +38,10 @@ POSSIBILITY OF SUCH DAMAGE.
 /* this code is based on silk_a2k_FLP()                                 */
 silk_float silk_LPC_inverse_pred_gain_FLP(  /* O    return inverse prediction gain, energy domain               */
     const silk_float    *A,                 /* I    prediction coefficients [order]                             */
-    opus_int32          order               /* I    prediction order                                            */
+    oac_int32          order               /* I    prediction order                                            */
 )
 {
-    opus_int   k, n;
+    oac_int   k, n;
     double     invGain, rc, rc_mult1, rc_mult2, tmp1, tmp2;
     silk_float Atmp[ SILK_MAX_ORDER_LPC ];
 
diff --git a/silk/float/LTP_analysis_filter_FLP.c b/silk/float/LTP_analysis_filter_FLP.c
index 849b7c1c5..f23683ca7 100644
--- a/silk/float/LTP_analysis_filter_FLP.c
+++ b/silk/float/LTP_analysis_filter_FLP.c
@@ -35,18 +35,18 @@ void silk_LTP_analysis_filter_FLP(
     silk_float                      *LTP_res,                           /* O    LTP res MAX_NB_SUBFR*(pre_lgth+subfr_lngth) */
     const silk_float                *x,                                 /* I    Input signal, with preceding samples        */
     const silk_float                B[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    LTP coefficients for each subframe          */
-    const opus_int                  pitchL[   MAX_NB_SUBFR ],           /* I    Pitch lags                                  */
+    const oac_int                  pitchL[   MAX_NB_SUBFR ],           /* I    Pitch lags                                  */
     const silk_float                invGains[ MAX_NB_SUBFR ],           /* I    Inverse quantization gains                  */
-    const opus_int                  subfr_length,                       /* I    Length of each subframe                     */
-    const opus_int                  nb_subfr,                           /* I    number of subframes                         */
-    const opus_int                  pre_length                          /* I    Preceding samples for each subframe         */
+    const oac_int                  subfr_length,                       /* I    Length of each subframe                     */
+    const oac_int                  nb_subfr,                           /* I    number of subframes                         */
+    const oac_int                  pre_length                          /* I    Preceding samples for each subframe         */
 )
 {
     const silk_float *x_ptr, *x_lag_ptr;
     silk_float   Btmp[ LTP_ORDER ];
     silk_float   *LTP_res_ptr;
     silk_float   inv_gain;
-    opus_int     k, i, j;
+    oac_int     k, i, j;
 
     x_ptr = x;
     LTP_res_ptr = LTP_res;
diff --git a/silk/float/LTP_scale_ctrl_FLP.c b/silk/float/LTP_scale_ctrl_FLP.c
index 6f30ff095..7a95555a9 100644
--- a/silk/float/LTP_scale_ctrl_FLP.c
+++ b/silk/float/LTP_scale_ctrl_FLP.c
@@ -34,10 +34,10 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_LTP_scale_ctrl_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
-    opus_int                        condCoding                          /* I    The type of conditional coding to use       */
+    oac_int                        condCoding                          /* I    The type of conditional coding to use       */
 )
 {
-    opus_int   round_loss;
+    oac_int   round_loss;
 
     if( condCoding == CODE_INDEPENDENTLY ) {
         /* Only scale if first frame in packet */
diff --git a/silk/float/SigProc_FLP.h b/silk/float/SigProc_FLP.h
index 783099beb..ba177dab9 100644
--- a/silk/float/SigProc_FLP.h
+++ b/silk/float/SigProc_FLP.h
@@ -41,7 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Chirp (bw expand) LP AR filter */
 void silk_bwexpander_FLP(
     silk_float          *ar,                /* I/O  AR filter to be expanded (without leading 1)                */
-    const opus_int      d,                  /* I    length of ar                                                */
+    const oac_int      d,                  /* I    length of ar                                                */
     const silk_float    chirp               /* I    chirp factor (typically in range (0..1) )                   */
 );
 
@@ -50,50 +50,50 @@ void silk_bwexpander_FLP(
 /* this code is based on silk_FLP_a2k()                                 */
 silk_float silk_LPC_inverse_pred_gain_FLP(  /* O    return inverse prediction gain, energy domain               */
     const silk_float    *A,                 /* I    prediction coefficients [order]                             */
-    opus_int32          order               /* I    prediction order                                            */
+    oac_int32          order               /* I    prediction order                                            */
 );
 
 silk_float silk_schur_FLP(                  /* O    returns residual energy                                     */
     silk_float          refl_coef[],        /* O    reflection coefficients (length order)                      */
     const silk_float    auto_corr[],        /* I    autocorrelation sequence (length order+1)                   */
-    opus_int            order               /* I    order                                                       */
+    oac_int            order               /* I    order                                                       */
 );
 
 void silk_k2a_FLP(
     silk_float          *A,                 /* O     prediction coefficients [order]                            */
     const silk_float    *rc,                /* I     reflection coefficients [order]                            */
-    opus_int32          order               /* I     prediction order                                           */
+    oac_int32          order               /* I     prediction order                                           */
 );
 
 /* compute autocorrelation */
 void silk_autocorrelation_FLP(
     silk_float          *results,           /* O    result (length correlationCount)                            */
     const silk_float    *inputData,         /* I    input data to correlate                                     */
-    opus_int            inputDataSize,      /* I    length of input                                             */
-    opus_int            correlationCount,    /* I    number of correlation taps to compute                       */
+    oac_int            inputDataSize,      /* I    length of input                                             */
+    oac_int            correlationCount,    /* I    number of correlation taps to compute                       */
     int                 arch
 );
 
-opus_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1 unvoiced                      */
+oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1 unvoiced                      */
     const silk_float    *frame,             /* I    Signal of length PE_FRAME_LENGTH_MS*Fs_kHz                  */
-    opus_int            *pitch_out,         /* O    Pitch lag values [nb_subfr]                                 */
-    opus_int16          *lagIndex,          /* O    Lag Index                                                   */
-    opus_int8           *contourIndex,      /* O    Pitch contour Index                                         */
+    oac_int            *pitch_out,         /* O    Pitch lag values [nb_subfr]                                 */
+    oac_int16          *lagIndex,          /* O    Lag Index                                                   */
+    oac_int8           *contourIndex,      /* O    Pitch contour Index                                         */
     silk_float          *LTPCorr,           /* I/O  Normalized correlation; input: value from previous frame    */
-    opus_int            prevLag,            /* I    Last lag of previous frame; set to zero is unvoiced         */
+    oac_int            prevLag,            /* I    Last lag of previous frame; set to zero is unvoiced         */
     const silk_float    search_thres1,      /* I    First stage threshold for lag candidates 0 - 1              */
     const silk_float    search_thres2,      /* I    Final threshold for lag candidates 0 - 1                    */
-    const opus_int      Fs_kHz,             /* I    sample frequency (kHz)                                      */
-    const opus_int      complexity,         /* I    Complexity setting, 0-2, where 2 is highest                 */
-    const opus_int      nb_subfr,           /* I    Number of 5 ms subframes                                    */
+    const oac_int      Fs_kHz,             /* I    sample frequency (kHz)                                      */
+    const oac_int      complexity,         /* I    Complexity setting, 0-2, where 2 is highest                 */
+    const oac_int      nb_subfr,           /* I    Number of 5 ms subframes                                    */
     int                 arch                /* I    Run-time architecture                                       */
 );
 
 void silk_insertion_sort_decreasing_FLP(
     silk_float          *a,                 /* I/O  Unsorted / Sorted vector                                    */
-    opus_int            *idx,               /* O    Index vector for the sorted elements                        */
-    const opus_int      L,                  /* I    Vector length                                               */
-    const opus_int      K                   /* I    Number of correctly sorted positions                        */
+    oac_int            *idx,               /* O    Index vector for the sorted elements                        */
+    const oac_int      L,                  /* I    Vector length                                               */
+    const oac_int      K                   /* I    Number of correctly sorted positions                        */
 );
 
 /* Compute reflection coefficients from input signal */
@@ -101,9 +101,9 @@ silk_float silk_burg_modified_FLP(          /* O    returns residual energy
     silk_float          A[],                /* O    prediction coefficients (length order)                      */
     const silk_float    x[],                /* I    input signal, length: nb_subfr*(D+L_sub)                    */
     const silk_float    minInvGain,         /* I    minimum inverse prediction gain                             */
-    const opus_int      subfr_length,       /* I    input signal subframe length (incl. D preceding samples)    */
-    const opus_int      nb_subfr,           /* I    number of subframes stacked in x                            */
-    const opus_int      D,                  /* I    order                                                       */
+    const oac_int      subfr_length,       /* I    input signal subframe length (incl. D preceding samples)    */
+    const oac_int      nb_subfr,           /* I    number of subframes stacked in x                            */
+    const oac_int      D,                  /* I    order                                                       */
     int                 arch
 );
 
@@ -111,7 +111,7 @@ silk_float silk_burg_modified_FLP(          /* O    returns residual energy
 void silk_scale_vector_FLP(
     silk_float          *data1,
     silk_float          gain,
-    opus_int            dataSize
+    oac_int            dataSize
 );
 
 /* copy and multiply a vector by a constant */
@@ -119,14 +119,14 @@ void silk_scale_copy_vector_FLP(
     silk_float          *data_out,
     const silk_float    *data_in,
     silk_float          gain,
-    opus_int            dataSize
+    oac_int            dataSize
 );
 
 /* inner product of two silk_float arrays, with result as double */
 double silk_inner_product_FLP_c(
     const silk_float    *data1,
     const silk_float    *data2,
-    opus_int            dataSize
+    oac_int            dataSize
 );
 
 #ifndef OVERRIDE_inner_product_FLP
@@ -137,7 +137,7 @@ double silk_inner_product_FLP_c(
 /* sum of squares of a silk_float array, with result as double */
 double silk_energy_FLP(
     const silk_float    *data,
-    opus_int            dataSize
+    oac_int            dataSize
 );
 
 /********************************************************************/
@@ -151,45 +151,45 @@ double silk_energy_FLP(
 #define silk_abs_float( a )                     ((silk_float)fabs(a))
 
 /* sigmoid function */
-static OPUS_INLINE silk_float silk_sigmoid( silk_float x )
+static OAC_INLINE silk_float silk_sigmoid( silk_float x )
 {
     return (silk_float)(1.0 / (1.0 + exp(-x)));
 }
 
 /* floating-point to integer conversion (rounding) */
-static OPUS_INLINE opus_int32 silk_float2int( silk_float x )
+static OAC_INLINE oac_int32 silk_float2int( silk_float x )
 {
-    return (opus_int32)float2int( x );
+    return (oac_int32)float2int( x );
 }
 
 /* floating-point to integer conversion (rounding) */
-static OPUS_INLINE void silk_float2short_array(
-    opus_int16       *out,
+static OAC_INLINE void silk_float2short_array(
+    oac_int16       *out,
     const silk_float *in,
-    opus_int32       length
+    oac_int32       length
 )
 {
-    opus_int32 k;
+    oac_int32 k;
     for( k = length - 1; k >= 0; k-- ) {
-        out[k] = silk_SAT16( (opus_int32)float2int( in[k] ) );
+        out[k] = silk_SAT16( (oac_int32)float2int( in[k] ) );
     }
 }
 
 /* integer to floating-point conversion */
-static OPUS_INLINE void silk_short2float_array(
+static OAC_INLINE void silk_short2float_array(
     silk_float       *out,
-    const opus_int16 *in,
-    opus_int32       length
+    const oac_int16 *in,
+    oac_int32       length
 )
 {
-    opus_int32 k;
+    oac_int32 k;
     for( k = length - 1; k >= 0; k-- ) {
         out[k] = (silk_float)in[k];
     }
 }
 
 /* using log2() helps the fixed-point conversion */
-static OPUS_INLINE silk_float silk_log2( double x )
+static OAC_INLINE silk_float silk_log2( double x )
 {
     return ( silk_float )( 3.32192809488736 * log10( x ) );
 }
diff --git a/silk/float/apply_sine_window_FLP.c b/silk/float/apply_sine_window_FLP.c
index e49e71799..8b9991bfd 100644
--- a/silk/float/apply_sine_window_FLP.c
+++ b/silk/float/apply_sine_window_FLP.c
@@ -38,11 +38,11 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_apply_sine_window_FLP(
     silk_float                      px_win[],                           /* O    Pointer to windowed signal                  */
     const silk_float                px[],                               /* I    Pointer to input signal                     */
-    const opus_int                  win_type,                           /* I    Selects a window type                       */
-    const opus_int                  length                              /* I    Window length, multiple of 4                */
+    const oac_int                  win_type,                           /* I    Selects a window type                       */
+    const oac_int                  length                              /* I    Window length, multiple of 4                */
 )
 {
-    opus_int   k;
+    oac_int   k;
     silk_float freq, c, S0, S1;
 
     celt_assert( win_type == 1 || win_type == 2 );
diff --git a/silk/float/autocorrelation_FLP.c b/silk/float/autocorrelation_FLP.c
index 4253b26eb..99df0eac6 100644
--- a/silk/float/autocorrelation_FLP.c
+++ b/silk/float/autocorrelation_FLP.c
@@ -36,12 +36,12 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_autocorrelation_FLP(
     silk_float          *results,           /* O    result (length correlationCount)                            */
     const silk_float    *inputData,         /* I    input data to correlate                                     */
-    opus_int            inputDataSize,      /* I    length of input                                             */
-    opus_int            correlationCount,    /* I    number of correlation taps to compute                       */
+    oac_int            inputDataSize,      /* I    length of input                                             */
+    oac_int            correlationCount,    /* I    number of correlation taps to compute                       */
     int                 arch
 )
 {
-    opus_int i;
+    oac_int i;
 
     if( correlationCount > inputDataSize ) {
         correlationCount = inputDataSize;
diff --git a/silk/float/burg_modified_FLP.c b/silk/float/burg_modified_FLP.c
index f5bef5ddb..0aa71764d 100644
--- a/silk/float/burg_modified_FLP.c
+++ b/silk/float/burg_modified_FLP.c
@@ -40,13 +40,13 @@ silk_float silk_burg_modified_FLP(          /* O    returns residual energy
     silk_float          A[],                /* O    prediction coefficients (length order)                      */
     const silk_float    x[],                /* I    input signal, length: nb_subfr*(D+L_sub)                    */
     const silk_float    minInvGain,         /* I    minimum inverse prediction gain                             */
-    const opus_int      subfr_length,       /* I    input signal subframe length (incl. D preceding samples)    */
-    const opus_int      nb_subfr,           /* I    number of subframes stacked in x                            */
-    const opus_int      D,                  /* I    order                                                       */
+    const oac_int      subfr_length,       /* I    input signal subframe length (incl. D preceding samples)    */
+    const oac_int      nb_subfr,           /* I    number of subframes stacked in x                            */
+    const oac_int      D,                  /* I    order                                                       */
     int                 arch
 )
 {
-    opus_int         k, n, s, reached_max_gain;
+    oac_int         k, n, s, reached_max_gain;
     double           C0, invGain, num, nrg_f, nrg_b, rc, Atmp, tmp1, tmp2;
     const silk_float *x_ptr;
     double           C_first_row[ SILK_MAX_ORDER_LPC ], C_last_row[ SILK_MAX_ORDER_LPC ];
diff --git a/silk/float/bwexpander_FLP.c b/silk/float/bwexpander_FLP.c
index d55a4d79a..4e764f94c 100644
--- a/silk/float/bwexpander_FLP.c
+++ b/silk/float/bwexpander_FLP.c
@@ -34,11 +34,11 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Chirp (bw expand) LP AR filter */
 void silk_bwexpander_FLP(
     silk_float          *ar,                /* I/O  AR filter to be expanded (without leading 1)                */
-    const opus_int      d,                  /* I    length of ar                                                */
+    const oac_int      d,                  /* I    length of ar                                                */
     const silk_float    chirp               /* I    chirp factor (typically in range (0..1) )                   */
 )
 {
-    opus_int   i;
+    oac_int   i;
     silk_float cfac = chirp;
 
     for( i = 0; i < d - 1; i++ ) {
diff --git a/silk/float/corrMatrix_FLP.c b/silk/float/corrMatrix_FLP.c
index eef6e8aa7..975c41c6b 100644
--- a/silk/float/corrMatrix_FLP.c
+++ b/silk/float/corrMatrix_FLP.c
@@ -39,13 +39,13 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_corrVector_FLP(
     const silk_float                *x,                                 /* I    x vector [L+order-1] used to create X       */
     const silk_float                *t,                                 /* I    Target vector [L]                           */
-    const opus_int                  L,                                  /* I    Length of vecors                            */
-    const opus_int                  Order,                              /* I    Max lag for correlation                     */
+    const oac_int                  L,                                  /* I    Length of vecors                            */
+    const oac_int                  Order,                              /* I    Max lag for correlation                     */
     silk_float                      *Xt,                                /* O    X'*t correlation vector [order]             */
     int                             arch
 )
 {
-    opus_int lag;
+    oac_int lag;
     const silk_float *ptr1;
 
     ptr1 = &x[ Order - 1 ];                     /* Points to first sample of column 0 of X: X[:,0] */
@@ -59,13 +59,13 @@ void silk_corrVector_FLP(
 /* Calculates correlation matrix X'*X */
 void silk_corrMatrix_FLP(
     const silk_float                *x,                                 /* I    x vector [ L+order-1 ] used to create X     */
-    const opus_int                  L,                                  /* I    Length of vectors                           */
-    const opus_int                  Order,                              /* I    Max lag for correlation                     */
+    const oac_int                  L,                                  /* I    Length of vectors                           */
+    const oac_int                  Order,                              /* I    Max lag for correlation                     */
     silk_float                      *XX,                                /* O    X'*X correlation matrix [order x order]     */
     int                             arch
 )
 {
-    opus_int j, lag;
+    oac_int j, lag;
     double  energy;
     const silk_float *ptr1, *ptr2;
 
diff --git a/silk/float/encode_frame_FLP.c b/silk/float/encode_frame_FLP.c
index 32e25a451..1fa00335b 100644
--- a/silk/float/encode_frame_FLP.c
+++ b/silk/float/encode_frame_FLP.c
@@ -35,25 +35,25 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "stack_alloc.h"
 
 /* Low Bitrate Redundancy (LBRR) encoding. Reuse all parameters but encode with lower bitrate */
-static OPUS_INLINE void silk_LBRR_encode_FLP(
+static OAC_INLINE void silk_LBRR_encode_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     const silk_float                xfw[],                              /* I    Input signal                                */
-    opus_int                        condCoding                          /* I    The type of conditional coding used so far for this frame */
+    oac_int                        condCoding                          /* I    The type of conditional coding used so far for this frame */
 );
 
 void silk_encode_do_VAD_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
-    opus_int                        activity                            /* I    Decision of Opus voice activity detector    */
+    oac_int                        activity                            /* I    Decision of Oac voice activity detector    */
 )
 {
-    const opus_int activity_threshold = SILK_FIX_CONST( SPEECH_ACTIVITY_DTX_THRES, 8 );
+    const oac_int activity_threshold = SILK_FIX_CONST( SPEECH_ACTIVITY_DTX_THRES, 8 );
 
     /****************************/
     /* Voice Activity Detection */
     /****************************/
     silk_VAD_GetSA_Q8( &psEnc->sCmn, psEnc->sCmn.inputBuf + 1, psEnc->sCmn.arch );
-    /* If Opus VAD is inactive and Silk VAD is active: lower Silk VAD to just under the threshold */
+    /* If Oac VAD is inactive and Silk VAD is active: lower Silk VAD to just under the threshold */
     if( activity == VAD_NO_ACTIVITY && psEnc->sCmn.speech_activity_Q8 >= activity_threshold ) {
         psEnc->sCmn.speech_activity_Q8 = activity_threshold - 1;
     }
@@ -82,32 +82,32 @@ void silk_encode_do_VAD_FLP(
 /****************/
 /* Encode frame */
 /****************/
-opus_int silk_encode_frame_FLP(
+oac_int silk_encode_frame_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
-    opus_int32                      *pnBytesOut,                        /* O    Number of payload bytes;                    */
+    oac_int32                      *pnBytesOut,                        /* O    Number of payload bytes;                    */
     ec_enc                          *psRangeEnc,                        /* I/O  compressor data structure                   */
-    opus_int                        condCoding,                         /* I    The type of conditional coding to use       */
-    opus_int                        maxBits,                            /* I    If > 0: maximum number of output bits       */
-    opus_int                        useCBR                              /* I    Flag to force constant-bitrate operation    */
+    oac_int                        condCoding,                         /* I    The type of conditional coding to use       */
+    oac_int                        maxBits,                            /* I    If > 0: maximum number of output bits       */
+    oac_int                        useCBR                              /* I    Flag to force constant-bitrate operation    */
 )
 {
     silk_encoder_control_FLP sEncCtrl;
-    opus_int     i, iter, maxIter, found_upper, found_lower, ret = 0;
+    oac_int     i, iter, maxIter, found_upper, found_lower, ret = 0;
     silk_float   *x_frame, *res_pitch_frame;
     silk_float   res_pitch[ 2 * MAX_FRAME_LENGTH + LA_PITCH_MAX ];
     ec_enc       sRangeEnc_copy, sRangeEnc_copy2;
     VARDECL(silk_nsq_state, sNSQ_copy);
-    opus_int32   seed_copy, nBits, nBits_lower, nBits_upper, gainMult_lower, gainMult_upper;
-    opus_int32   gainsID, gainsID_lower, gainsID_upper;
-    opus_int16   gainMult_Q8;
-    opus_int16   ec_prevLagIndex_copy;
-    opus_int     ec_prevSignalType_copy;
-    opus_int8    LastGainIndex_copy2;
-    opus_int32   pGains_Q16[ MAX_NB_SUBFR ];
-    opus_int     gain_lock[ MAX_NB_SUBFR ] = {0};
-    opus_int16   best_gain_mult[ MAX_NB_SUBFR ];
-    opus_int     best_sum[ MAX_NB_SUBFR ];
-    opus_int     bits_margin;
+    oac_int32   seed_copy, nBits, nBits_lower, nBits_upper, gainMult_lower, gainMult_upper;
+    oac_int32   gainsID, gainsID_lower, gainsID_upper;
+    oac_int16   gainMult_Q8;
+    oac_int16   ec_prevLagIndex_copy;
+    oac_int     ec_prevSignalType_copy;
+    oac_int8    LastGainIndex_copy2;
+    oac_int32   pGains_Q16[ MAX_NB_SUBFR ];
+    oac_int     gain_lock[ MAX_NB_SUBFR ] = {0};
+    oac_int16   best_gain_mult[ MAX_NB_SUBFR ];
+    oac_int     best_sum[ MAX_NB_SUBFR ];
+    oac_int     bits_margin;
     SAVE_STACK;
 
     /* Using ALLOC() instead of a regular stack allocation to minimize real stack use when using the pseudostack.
@@ -144,7 +144,7 @@ opus_int silk_encode_frame_FLP(
     }
 
     if( !psEnc->sCmn.prefillFlag ) {
-        VARDECL( opus_uint8, ec_buf_copy );
+        VARDECL( oac_uint8, ec_buf_copy );
         /*****************************************/
         /* Find pitch lags, initial LPC analysis */
         /*****************************************/
@@ -184,7 +184,7 @@ opus_int silk_encode_frame_FLP(
         seed_copy = psEnc->sCmn.indices.Seed;
         ec_prevLagIndex_copy = psEnc->sCmn.ec_prevLagIndex;
         ec_prevSignalType_copy = psEnc->sCmn.ec_prevSignalType;
-        ALLOC( ec_buf_copy, 1275, opus_uint8 );
+        ALLOC( ec_buf_copy, 1275, oac_uint8 );
         for( iter = 0; ; iter++ ) {
             if( gainsID == gainsID_lower ) {
                 nBits = nBits_lower;
@@ -333,7 +333,7 @@ opus_int silk_encode_frame_FLP(
             }
 
             for( i = 0; i < psEnc->sCmn.nb_subfr; i++ ) {
-                opus_int16 tmp;
+                oac_int16 tmp;
                 if ( gain_lock[i] ) {
                     tmp = best_gain_mult[i];
                 } else {
@@ -385,15 +385,15 @@ opus_int silk_encode_frame_FLP(
 }
 
 /* Low-Bitrate Redundancy (LBRR) encoding. Reuse all parameters but encode excitation at lower bitrate  */
-static OPUS_INLINE void silk_LBRR_encode_FLP(
+static OAC_INLINE void silk_LBRR_encode_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     const silk_float                xfw[],                              /* I    Input signal                                */
-    opus_int                        condCoding                          /* I    The type of conditional coding used so far for this frame */
+    oac_int                        condCoding                          /* I    The type of conditional coding used so far for this frame */
 )
 {
-    opus_int     k;
-    opus_int32   Gains_Q16[ MAX_NB_SUBFR ];
+    oac_int     k;
+    oac_int32   Gains_Q16[ MAX_NB_SUBFR ];
     silk_float   TempGains[ MAX_NB_SUBFR ];
     SideInfoIndices *psIndices_LBRR = &psEnc->sCmn.indices_LBRR[ psEnc->sCmn.nFramesEncoded ];
     VARDECL(silk_nsq_state, sNSQ_LBRR);
diff --git a/silk/float/energy_FLP.c b/silk/float/energy_FLP.c
index 7bc7173c9..312e080d1 100644
--- a/silk/float/energy_FLP.c
+++ b/silk/float/energy_FLP.c
@@ -34,10 +34,10 @@ POSSIBILITY OF SUCH DAMAGE.
 /* sum of squares of a silk_float array, with result as double */
 double silk_energy_FLP(
     const silk_float    *data,
-    opus_int            dataSize
+    oac_int            dataSize
 )
 {
-    opus_int i;
+    oac_int i;
     double   result;
 
     /* 4x unrolled loop */
diff --git a/silk/float/find_LPC_FLP.c b/silk/float/find_LPC_FLP.c
index 6ccd711dc..5a423e96c 100644
--- a/silk/float/find_LPC_FLP.c
+++ b/silk/float/find_LPC_FLP.c
@@ -36,18 +36,18 @@ POSSIBILITY OF SUCH DAMAGE.
 /* LPC analysis */
 void silk_find_LPC_FLP(
     silk_encoder_state              *psEncC,                            /* I/O  Encoder state                               */
-    opus_int16                      NLSF_Q15[],                         /* O    NLSFs                                       */
+    oac_int16                      NLSF_Q15[],                         /* O    NLSFs                                       */
     const silk_float                x[],                                /* I    Input signal                                */
     const silk_float                minInvGain,                         /* I    Inverse of max prediction gain              */
     int                             arch
 )
 {
-    opus_int    k, subfr_length;
+    oac_int    k, subfr_length;
     silk_float  a[ MAX_LPC_ORDER ];
 
     /* Used only for NLSF interpolation */
     silk_float  res_nrg, res_nrg_2nd, res_nrg_interp;
-    opus_int16  NLSF0_Q15[ MAX_LPC_ORDER ];
+    oac_int16  NLSF0_Q15[ MAX_LPC_ORDER ];
     silk_float  a_tmp[ MAX_LPC_ORDER ];
     silk_float  LPC_res[ MAX_FRAME_LENGTH + MAX_NB_SUBFR * MAX_LPC_ORDER ];
 
@@ -86,7 +86,7 @@ void silk_find_LPC_FLP(
             if( res_nrg_interp < res_nrg ) {
                 /* Interpolation has lower residual energy */
                 res_nrg = res_nrg_interp;
-                psEncC->indices.NLSFInterpCoef_Q2 = (opus_int8)k;
+                psEncC->indices.NLSFInterpCoef_Q2 = (oac_int8)k;
             } else if( res_nrg_interp > res_nrg_2nd ) {
                 /* No reason to continue iterating - residual energies will continue to climb */
                 break;
diff --git a/silk/float/find_LTP_FLP.c b/silk/float/find_LTP_FLP.c
index 90aeeac0b..46bdbcc07 100644
--- a/silk/float/find_LTP_FLP.c
+++ b/silk/float/find_LTP_FLP.c
@@ -36,13 +36,13 @@ void silk_find_LTP_FLP(
     silk_float                      XX[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ], /* O    Weight for LTP quantization         */
     silk_float                      xX[ MAX_NB_SUBFR * LTP_ORDER ],     /* O    Weight for LTP quantization                 */
     const silk_float                r_ptr[],                            /* I    LPC residual                                */
-    const opus_int                  lag[ MAX_NB_SUBFR ],                /* I    LTP lags                                    */
-    const opus_int                  subfr_length,                       /* I    Subframe length                             */
-    const opus_int                  nb_subfr,                           /* I    number of subframes                         */
+    const oac_int                  lag[ MAX_NB_SUBFR ],                /* I    LTP lags                                    */
+    const oac_int                  subfr_length,                       /* I    Subframe length                             */
+    const oac_int                  nb_subfr,                           /* I    number of subframes                         */
     int                             arch
 )
 {
-    opus_int   k;
+    oac_int   k;
     silk_float *xX_ptr, *XX_ptr;
     const silk_float *lag_ptr;
     silk_float xx, temp;
diff --git a/silk/float/find_pitch_lags_FLP.c b/silk/float/find_pitch_lags_FLP.c
index 796a9243f..4ba21db54 100644
--- a/silk/float/find_pitch_lags_FLP.c
+++ b/silk/float/find_pitch_lags_FLP.c
@@ -41,7 +41,7 @@ void silk_find_pitch_lags_FLP(
     int                             arch                                /* I    Run-time architecture                       */
 )
 {
-    opus_int   buf_len;
+    oac_int   buf_len;
     silk_float thrhld, res_nrg;
     const silk_float *x_buf_ptr, *x_buf;
     silk_float auto_corr[ MAX_FIND_PITCH_LPC_ORDER + 1 ];
diff --git a/silk/float/find_pred_coefs_FLP.c b/silk/float/find_pred_coefs_FLP.c
index 01c2d34d6..1e605dced 100644
--- a/silk/float/find_pred_coefs_FLP.c
+++ b/silk/float/find_pred_coefs_FLP.c
@@ -37,15 +37,15 @@ void silk_find_pred_coefs_FLP(
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     const silk_float                res_pitch[],                        /* I    Residual from pitch analysis                */
     const silk_float                x[],                                /* I    Speech signal                               */
-    opus_int                        condCoding                          /* I    The type of conditional coding to use       */
+    oac_int                        condCoding                          /* I    The type of conditional coding to use       */
 )
 {
-    opus_int         i;
+    oac_int         i;
     silk_float       XXLTP[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ];
     silk_float       xXLTP[ MAX_NB_SUBFR * LTP_ORDER ];
     silk_float       invGains[ MAX_NB_SUBFR ];
     /* Set to NLSF_Q15 to zero so we don't copy junk to the state. */
-    opus_int16       NLSF_Q15[ MAX_LPC_ORDER ]={0};
+    oac_int16       NLSF_Q15[ MAX_LPC_ORDER ]={0};
     const silk_float *x_ptr;
     silk_float       *x_pre_ptr, LPC_in_pre[ MAX_NB_SUBFR * MAX_LPC_ORDER + MAX_FRAME_LENGTH ];
     silk_float       minInvGain;
diff --git a/silk/float/inner_product_FLP.c b/silk/float/inner_product_FLP.c
index 88b160ab4..5d547d005 100644
--- a/silk/float/inner_product_FLP.c
+++ b/silk/float/inner_product_FLP.c
@@ -35,10 +35,10 @@ POSSIBILITY OF SUCH DAMAGE.
 double silk_inner_product_FLP_c(
     const silk_float    *data1,
     const silk_float    *data2,
-    opus_int            dataSize
+    oac_int            dataSize
 )
 {
-    opus_int i;
+    oac_int i;
     double   result;
 
     /* 4x unrolled loop */
diff --git a/silk/float/k2a_FLP.c b/silk/float/k2a_FLP.c
index 1448008db..213d02a17 100644
--- a/silk/float/k2a_FLP.c
+++ b/silk/float/k2a_FLP.c
@@ -35,10 +35,10 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_k2a_FLP(
     silk_float          *A,                 /* O     prediction coefficients [order]                            */
     const silk_float    *rc,                /* I     reflection coefficients [order]                            */
-    opus_int32          order               /* I     prediction order                                           */
+    oac_int32          order               /* I     prediction order                                           */
 )
 {
-    opus_int   k, n;
+    oac_int   k, n;
     silk_float rck, tmp1, tmp2;
 
     for( k = 0; k < order; k++ ) {
diff --git a/silk/float/main_FLP.h b/silk/float/main_FLP.h
index 8173bb32a..dfdfd2bd6 100644
--- a/silk/float/main_FLP.h
+++ b/silk/float/main_FLP.h
@@ -53,32 +53,32 @@ void silk_HP_variable_cutoff(
 /* Encoder main function */
 void silk_encode_do_VAD_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
-    opus_int                        activity                            /* I    Decision of Opus voice activity detector    */
+    oac_int                        activity                            /* I    Decision of Oac voice activity detector    */
 );
 
 /* Encoder main function */
-opus_int silk_encode_frame_FLP(
+oac_int silk_encode_frame_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
-    opus_int32                      *pnBytesOut,                        /* O    Number of payload bytes;                    */
+    oac_int32                      *pnBytesOut,                        /* O    Number of payload bytes;                    */
     ec_enc                          *psRangeEnc,                        /* I/O  compressor data structure                   */
-    opus_int                        condCoding,                         /* I    The type of conditional coding to use       */
-    opus_int                        maxBits,                            /* I    If > 0: maximum number of output bits       */
-    opus_int                        useCBR                              /* I    Flag to force constant-bitrate operation    */
+    oac_int                        condCoding,                         /* I    The type of conditional coding to use       */
+    oac_int                        maxBits,                            /* I    If > 0: maximum number of output bits       */
+    oac_int                        useCBR                              /* I    Flag to force constant-bitrate operation    */
 );
 
 /* Initializes the Silk encoder state */
-opus_int silk_init_encoder(
+oac_int silk_init_encoder(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     int                              arch                               /* I    Run-tim architecture                        */
 );
 
 /* Control the Silk encoder */
-opus_int silk_control_encoder(
+oac_int silk_control_encoder(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Pointer to Silk encoder state FLP           */
     silk_EncControlStruct           *encControl,                        /* I    Control structure                           */
-    const opus_int                  allow_bw_switch,                    /* I    Flag to allow switching audio bandwidth     */
-    const opus_int                  channelNb,                          /* I    Channel number                              */
-    const opus_int                  force_fs_kHz
+    const oac_int                  allow_bw_switch,                    /* I    Flag to allow switching audio bandwidth     */
+    const oac_int                  channelNb,                          /* I    Channel number                              */
+    const oac_int                  force_fs_kHz
 );
 
 /**************************/
@@ -97,15 +97,15 @@ void silk_warped_autocorrelation_FLP(
     silk_float                      *corr,                              /* O    Result [order + 1]                          */
     const silk_float                *input,                             /* I    Input data to correlate                     */
     const silk_float                warping,                            /* I    Warping coefficient                         */
-    const opus_int                  length,                             /* I    Length of input                             */
-    const opus_int                  order                               /* I    Correlation order (even)                    */
+    const oac_int                  length,                             /* I    Length of input                             */
+    const oac_int                  order                               /* I    Correlation order (even)                    */
 );
 
 /* Calculation of LTP state scaling */
 void silk_LTP_scale_ctrl_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
-    opus_int                        condCoding                          /* I    The type of conditional coding to use       */
+    oac_int                        condCoding                          /* I    The type of conditional coding to use       */
 );
 
 /**********************************************/
@@ -126,13 +126,13 @@ void silk_find_pred_coefs_FLP(
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     const silk_float                res_pitch[],                        /* I    Residual from pitch analysis                */
     const silk_float                x[],                                /* I    Speech signal                               */
-    opus_int                        condCoding                          /* I    The type of conditional coding to use       */
+    oac_int                        condCoding                          /* I    The type of conditional coding to use       */
 );
 
 /* LPC analysis */
 void silk_find_LPC_FLP(
     silk_encoder_state              *psEncC,                            /* I/O  Encoder state                               */
-    opus_int16                      NLSF_Q15[],                         /* O    NLSFs                                       */
+    oac_int16                      NLSF_Q15[],                         /* O    NLSFs                                       */
     const silk_float                x[],                                /* I    Input signal                                */
     const silk_float                minInvGain,                         /* I    Prediction gain from LTP (dB)               */
     int                             arch
@@ -143,9 +143,9 @@ void silk_find_LTP_FLP(
     silk_float                      XX[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ], /* O    Weight for LTP quantization         */
     silk_float                      xX[ MAX_NB_SUBFR * LTP_ORDER ],     /* O    Weight for LTP quantization                 */
     const silk_float                r_ptr[],                            /* I    LPC residual                                */
-    const opus_int                  lag[  MAX_NB_SUBFR ],               /* I    LTP lags                                    */
-    const opus_int                  subfr_length,                       /* I    Subframe length                             */
-    const opus_int                  nb_subfr,                           /* I    number of subframes                         */
+    const oac_int                  lag[  MAX_NB_SUBFR ],               /* I    LTP lags                                    */
+    const oac_int                  subfr_length,                       /* I    Subframe length                             */
+    const oac_int                  nb_subfr,                           /* I    number of subframes                         */
     int                             arch
 );
 
@@ -153,11 +153,11 @@ void silk_LTP_analysis_filter_FLP(
     silk_float                      *LTP_res,                           /* O    LTP res MAX_NB_SUBFR*(pre_lgth+subfr_lngth) */
     const silk_float                *x,                                 /* I    Input signal, with preceding samples        */
     const silk_float                B[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    LTP coefficients for each subframe          */
-    const opus_int                  pitchL[   MAX_NB_SUBFR ],           /* I    Pitch lags                                  */
+    const oac_int                  pitchL[   MAX_NB_SUBFR ],           /* I    Pitch lags                                  */
     const silk_float                invGains[ MAX_NB_SUBFR ],           /* I    Inverse quantization gains                  */
-    const opus_int                  subfr_length,                       /* I    Length of each subframe                     */
-    const opus_int                  nb_subfr,                           /* I    number of subframes                         */
-    const opus_int                  pre_length                          /* I    Preceding samples for each subframe         */
+    const oac_int                  subfr_length,                       /* I    Length of each subframe                     */
+    const oac_int                  nb_subfr,                           /* I    number of subframes                         */
+    const oac_int                  pre_length                          /* I    Preceding samples for each subframe         */
 );
 
 /* Calculates residual energies of input subframes where all subframes have LPC_order   */
@@ -167,9 +167,9 @@ void silk_residual_energy_FLP(
     const silk_float                x[],                                /* I    Input signal                                */
     silk_float                      a[ 2 ][ MAX_LPC_ORDER ],            /* I    AR coefs for each frame half                */
     const silk_float                gains[],                            /* I    Quantization gains                          */
-    const opus_int                  subfr_length,                       /* I    Subframe length                             */
-    const opus_int                  nb_subfr,                           /* I    number of subframes                         */
-    const opus_int                  LPC_order                           /* I    LPC order                                   */
+    const oac_int                  subfr_length,                       /* I    Subframe length                             */
+    const oac_int                  nb_subfr,                           /* I    number of subframes                         */
+    const oac_int                  LPC_order                           /* I    LPC order                                   */
 );
 
 /* 16th order LPC analysis filter */
@@ -177,21 +177,21 @@ void silk_LPC_analysis_filter_FLP(
     silk_float                      r_LPC[],                            /* O    LPC residual signal                         */
     const silk_float                PredCoef[],                         /* I    LPC coefficients                            */
     const silk_float                s[],                                /* I    Input signal                                */
-    const opus_int                  length,                             /* I    Length of input signal                      */
-    const opus_int                  Order                               /* I    LPC order                                   */
+    const oac_int                  length,                             /* I    Length of input signal                      */
+    const oac_int                  Order                               /* I    LPC order                                   */
 );
 
 /* LTP tap quantizer */
 void silk_quant_LTP_gains_FLP(
     silk_float                      B[ MAX_NB_SUBFR * LTP_ORDER ],      /* O    Quantized LTP gains                         */
-    opus_int8                       cbk_index[ MAX_NB_SUBFR ],          /* O    Codebook index                              */
-    opus_int8                       *periodicity_index,                 /* O    Periodicity index                           */
-    opus_int32                      *sum_log_gain_Q7,                   /* I/O  Cumulative max prediction gain  */
+    oac_int8                       cbk_index[ MAX_NB_SUBFR ],          /* O    Codebook index                              */
+    oac_int8                       *periodicity_index,                 /* O    Periodicity index                           */
+    oac_int32                      *sum_log_gain_Q7,                   /* I/O  Cumulative max prediction gain  */
     silk_float                      *pred_gain_dB,                      /* O    LTP prediction gain                         */
     const silk_float                XX[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ], /* I    Correlation matrix                  */
     const silk_float                xX[ MAX_NB_SUBFR * LTP_ORDER ],     /* I    Correlation vector                          */
-    const opus_int                  subfr_len,                          /* I    Number of samples per subframe              */
-    const opus_int                  nb_subfr,                           /* I    Number of subframes                         */
+    const oac_int                  subfr_len,                          /* I    Number of samples per subframe              */
+    const oac_int                  nb_subfr,                           /* I    Number of subframes                         */
     int                             arch                                /* I    Run-time architecture                       */
 );
 
@@ -201,14 +201,14 @@ silk_float silk_residual_energy_covar_FLP(                              /* O
     silk_float                      *wXX,                               /* I/O  Weighted correlation matrix, reg. out       */
     const silk_float                *wXx,                               /* I    Weighted correlation vector                 */
     const silk_float                wxx,                                /* I    Weighted correlation value                  */
-    const opus_int                  D                                   /* I    Dimension                                   */
+    const oac_int                  D                                   /* I    Dimension                                   */
 );
 
 /* Processing of gains */
 void silk_process_gains_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
-    opus_int                        condCoding                          /* I    The type of conditional coding to use       */
+    oac_int                        condCoding                          /* I    The type of conditional coding to use       */
 );
 
 /******************/
@@ -217,8 +217,8 @@ void silk_process_gains_FLP(
 /* Calculates correlation matrix X'*X */
 void silk_corrMatrix_FLP(
     const silk_float                *x,                                 /* I    x vector [ L+order-1 ] used to create X     */
-    const opus_int                  L,                                  /* I    Length of vectors                           */
-    const opus_int                  Order,                              /* I    Max lag for correlation                     */
+    const oac_int                  L,                                  /* I    Length of vectors                           */
+    const oac_int                  Order,                              /* I    Max lag for correlation                     */
     silk_float                      *XX,                                /* O    X'*X correlation matrix [order x order]     */
     int                             arch
 );
@@ -227,8 +227,8 @@ void silk_corrMatrix_FLP(
 void silk_corrVector_FLP(
     const silk_float                *x,                                 /* I    x vector [L+order-1] used to create X       */
     const silk_float                *t,                                 /* I    Target vector [L]                           */
-    const opus_int                  L,                                  /* I    Length of vecors                            */
-    const opus_int                  Order,                              /* I    Max lag for correlation                     */
+    const oac_int                  L,                                  /* I    Length of vecors                            */
+    const oac_int                  Order,                              /* I    Max lag for correlation                     */
     silk_float                      *Xt,                                /* O    X'*t correlation vector [order]             */
     int                             arch
 );
@@ -240,24 +240,24 @@ void silk_corrVector_FLP(
 void silk_apply_sine_window_FLP(
     silk_float                      px_win[],                           /* O    Pointer to windowed signal                  */
     const silk_float                px[],                               /* I    Pointer to input signal                     */
-    const opus_int                  win_type,                           /* I    Selects a window type                       */
-    const opus_int                  length                              /* I    Window length, multiple of 4                */
+    const oac_int                  win_type,                           /* I    Selects a window type                       */
+    const oac_int                  length                              /* I    Window length, multiple of 4                */
 );
 
 /* Wrapper functions. Call flp / fix code */
 
 /* Convert AR filter coefficients to NLSF parameters */
 void silk_A2NLSF_FLP(
-    opus_int16                      *NLSF_Q15,                          /* O    NLSF vector      [ LPC_order ]              */
+    oac_int16                      *NLSF_Q15,                          /* O    NLSF vector      [ LPC_order ]              */
     const silk_float                *pAR,                               /* I    LPC coefficients [ LPC_order ]              */
-    const opus_int                  LPC_order                           /* I    LPC order                                   */
+    const oac_int                  LPC_order                           /* I    LPC order                                   */
 );
 
 /* Convert NLSF parameters to AR prediction filter coefficients */
 void silk_NLSF2A_FLP(
     silk_float                      *pAR,                               /* O    LPC coefficients [ LPC_order ]              */
-    const opus_int16                *NLSF_Q15,                          /* I    NLSF vector      [ LPC_order ]              */
-    const opus_int                  LPC_order,                          /* I    LPC order                                   */
+    const oac_int16                *NLSF_Q15,                          /* I    NLSF vector      [ LPC_order ]              */
+    const oac_int                  LPC_order,                          /* I    LPC order                                   */
     int                             arch                                /* I    Run-time architecture                       */
 );
 
@@ -265,8 +265,8 @@ void silk_NLSF2A_FLP(
 void silk_process_NLSFs_FLP(
     silk_encoder_state              *psEncC,                            /* I/O  Encoder state                               */
     silk_float                      PredCoef[ 2 ][ MAX_LPC_ORDER ],     /* O    Prediction coefficients                     */
-    opus_int16                      NLSF_Q15[      MAX_LPC_ORDER ],     /* I/O  Normalized LSFs (quant out) (0 - (2^15-1))  */
-    const opus_int16                prev_NLSF_Q15[ MAX_LPC_ORDER ]      /* I    Previous Normalized LSFs (0 - (2^15-1))     */
+    oac_int16                      NLSF_Q15[      MAX_LPC_ORDER ],     /* I/O  Normalized LSFs (quant out) (0 - (2^15-1))  */
+    const oac_int16                prev_NLSF_Q15[ MAX_LPC_ORDER ]      /* I    Previous Normalized LSFs (0 - (2^15-1))     */
 );
 
 /* Floating-point Silk NSQ wrapper      */
@@ -275,7 +275,7 @@ void silk_NSQ_wrapper_FLP(
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     SideInfoIndices                 *psIndices,                         /* I/O  Quantization indices                        */
     silk_nsq_state                  *psNSQ,                             /* I/O  Noise Shaping Quantzation state             */
-    opus_int8                       pulses[],                           /* O    Quantized pulse signal                      */
+    oac_int8                       pulses[],                           /* O    Quantized pulse signal                      */
     const silk_float                x[]                                 /* I    Prefiltered input signal                    */
 );
 
diff --git a/silk/float/noise_shape_analysis_FLP.c b/silk/float/noise_shape_analysis_FLP.c
index 0b5ea9521..199504145 100644
--- a/silk/float/noise_shape_analysis_FLP.c
+++ b/silk/float/noise_shape_analysis_FLP.c
@@ -36,12 +36,12 @@ POSSIBILITY OF SUCH DAMAGE.
 /* non-warped frequency scale. (So that it can be implemented with a minimum-phase monic filter.) */
 /* Note: A monic filter is one with the first coefficient equal to 1.0. In Silk we omit the first */
 /* coefficient in an array of coefficients, for monic filters.                                    */
-static OPUS_INLINE silk_float warped_gain(
+static OAC_INLINE silk_float warped_gain(
     const silk_float     *coefs,
     silk_float           lambda,
-    opus_int             order
+    oac_int             order
 ) {
-    opus_int   i;
+    oac_int   i;
     silk_float gain;
 
     lambda = -lambda;
@@ -54,13 +54,13 @@ static OPUS_INLINE silk_float warped_gain(
 
 /* Convert warped filter coefficients to monic pseudo-warped coefficients and limit maximum     */
 /* amplitude of monic warped coefficients by using bandwidth expansion on the true coefficients */
-static OPUS_INLINE void warped_true2monic_coefs(
+static OAC_INLINE void warped_true2monic_coefs(
     silk_float           *coefs,
     silk_float           lambda,
     silk_float           limit,
-    opus_int             order
+    oac_int             order
 ) {
-    opus_int   i, iter, ind = 0;
+    oac_int   i, iter, ind = 0;
     silk_float tmp, maxabs, chirp, gain;
 
     /* Convert to monic coefficients */
@@ -113,12 +113,12 @@ static OPUS_INLINE void warped_true2monic_coefs(
     silk_assert( 0 );
 }
 
-static OPUS_INLINE void limit_coefs(
+static OAC_INLINE void limit_coefs(
     silk_float           *coefs,
     silk_float           limit,
-    opus_int             order
+    oac_int             order
 ) {
-    opus_int   i, iter, ind = 0;
+    oac_int   i, iter, ind = 0;
     silk_float tmp, maxabs, chirp;
 
     for( iter = 0; iter < 10; iter++ ) {
@@ -152,7 +152,7 @@ void silk_noise_shape_analysis_FLP(
 )
 {
     silk_shape_state_FLP *psShapeSt = &psEnc->sShape;
-    opus_int     k, nSamples, nSegs;
+    oac_int     k, nSamples, nSegs;
     silk_float   SNR_adj_dB, HarmShapeGain, Tilt;
     silk_float   nrg, log_energy, log_energy_prev, energy_variation;
     silk_float   BWExp, gain_mult, gain_add, strength, b, warping;
@@ -236,7 +236,7 @@ void silk_noise_shape_analysis_FLP(
     /********************************************/
     for( k = 0; k < psEnc->sCmn.nb_subfr; k++ ) {
         /* Apply window: sine slope followed by flat part followed by cosine slope */
-        opus_int shift, slope_part, flat_part;
+        oac_int shift, slope_part, flat_part;
         flat_part = psEnc->sCmn.fs_kHz * 3;
         slope_part = ( psEnc->sCmn.shapeWinLength - flat_part ) / 2;
 
diff --git a/silk/float/pitch_analysis_core_FLP.c b/silk/float/pitch_analysis_core_FLP.c
index 0530a8831..9b95a261b 100644
--- a/silk/float/pitch_analysis_core_FLP.c
+++ b/silk/float/pitch_analysis_core_FLP.c
@@ -45,68 +45,68 @@ POSSIBILITY OF SUCH DAMAGE.
 static void silk_P_Ana_calc_corr_st3(
     silk_float cross_corr_st3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ][ PE_NB_STAGE3_LAGS ], /* O 3 DIM correlation array */
     const silk_float    frame[],            /* I vector to correlate                                            */
-    opus_int            start_lag,          /* I start lag                                                      */
-    opus_int            sf_length,          /* I sub frame length                                               */
-    opus_int            nb_subfr,           /* I number of subframes                                            */
-    opus_int            complexity,         /* I Complexity setting                                             */
+    oac_int            start_lag,          /* I start lag                                                      */
+    oac_int            sf_length,          /* I sub frame length                                               */
+    oac_int            nb_subfr,           /* I number of subframes                                            */
+    oac_int            complexity,         /* I Complexity setting                                             */
     int                 arch                /* I Run-time architecture                                          */
 );
 
 static void silk_P_Ana_calc_energy_st3(
     silk_float energies_st3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ][ PE_NB_STAGE3_LAGS ], /* O 3 DIM correlation array */
     const silk_float    frame[],            /* I vector to correlate                                            */
-    opus_int            start_lag,          /* I start lag                                                      */
-    opus_int            sf_length,          /* I sub frame length                                               */
-    opus_int            nb_subfr,           /* I number of subframes                                            */
-    opus_int            complexity          /* I Complexity setting                                             */
+    oac_int            start_lag,          /* I start lag                                                      */
+    oac_int            sf_length,          /* I sub frame length                                               */
+    oac_int            nb_subfr,           /* I number of subframes                                            */
+    oac_int            complexity          /* I Complexity setting                                             */
 );
 
 /************************************************************/
 /* CORE PITCH ANALYSIS FUNCTION                             */
 /************************************************************/
-opus_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1 unvoiced                      */
+oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1 unvoiced                      */
     const silk_float    *frame,             /* I    Signal of length PE_FRAME_LENGTH_MS*Fs_kHz                  */
-    opus_int            *pitch_out,         /* O    Pitch lag values [nb_subfr]                                 */
-    opus_int16          *lagIndex,          /* O    Lag Index                                                   */
-    opus_int8           *contourIndex,      /* O    Pitch contour Index                                         */
+    oac_int            *pitch_out,         /* O    Pitch lag values [nb_subfr]                                 */
+    oac_int16          *lagIndex,          /* O    Lag Index                                                   */
+    oac_int8           *contourIndex,      /* O    Pitch contour Index                                         */
     silk_float          *LTPCorr,           /* I/O  Normalized correlation; input: value from previous frame    */
-    opus_int            prevLag,            /* I    Last lag of previous frame; set to zero is unvoiced         */
+    oac_int            prevLag,            /* I    Last lag of previous frame; set to zero is unvoiced         */
     const silk_float    search_thres1,      /* I    First stage threshold for lag candidates 0 - 1              */
     const silk_float    search_thres2,      /* I    Final threshold for lag candidates 0 - 1                    */
-    const opus_int      Fs_kHz,             /* I    sample frequency (kHz)                                      */
-    const opus_int      complexity,         /* I    Complexity setting, 0-2, where 2 is highest                 */
-    const opus_int      nb_subfr,           /* I    Number of 5 ms subframes                                    */
+    const oac_int      Fs_kHz,             /* I    sample frequency (kHz)                                      */
+    const oac_int      complexity,         /* I    Complexity setting, 0-2, where 2 is highest                 */
+    const oac_int      nb_subfr,           /* I    Number of 5 ms subframes                                    */
     int                 arch                /* I    Run-time architecture                                       */
 )
 {
-    opus_int   i, k, d, j;
+    oac_int   i, k, d, j;
     silk_float frame_8kHz[  PE_MAX_FRAME_LENGTH_MS * 8 ];
     silk_float frame_4kHz[  PE_MAX_FRAME_LENGTH_MS * 4 ];
-    opus_int16 frame_8_FIX[ PE_MAX_FRAME_LENGTH_MS * 8 ];
-    opus_int16 frame_4_FIX[ PE_MAX_FRAME_LENGTH_MS * 4 ];
-    opus_int32 filt_state[ 6 ];
+    oac_int16 frame_8_FIX[ PE_MAX_FRAME_LENGTH_MS * 8 ];
+    oac_int16 frame_4_FIX[ PE_MAX_FRAME_LENGTH_MS * 4 ];
+    oac_int32 filt_state[ 6 ];
     silk_float threshold, contour_bias;
     silk_float C[ PE_MAX_NB_SUBFR][ (PE_MAX_LAG >> 1) + 5 ];
-    opus_val32 xcorr[ PE_MAX_LAG_MS * 4 - PE_MIN_LAG_MS * 4 + 1 ];
+    oac_val32 xcorr[ PE_MAX_LAG_MS * 4 - PE_MIN_LAG_MS * 4 + 1 ];
     silk_float CC[ PE_NB_CBKS_STAGE2_EXT ];
     const silk_float *target_ptr, *basis_ptr;
     double    cross_corr, normalizer, energy, energy_tmp;
-    opus_int   d_srch[ PE_D_SRCH_LENGTH ];
-    opus_int16 d_comp[ (PE_MAX_LAG >> 1) + 5 ];
-    opus_int   length_d_srch, length_d_comp;
+    oac_int   d_srch[ PE_D_SRCH_LENGTH ];
+    oac_int16 d_comp[ (PE_MAX_LAG >> 1) + 5 ];
+    oac_int   length_d_srch, length_d_comp;
     silk_float Cmax, CCmax, CCmax_b, CCmax_new_b, CCmax_new;
-    opus_int   CBimax, CBimax_new, lag, start_lag, end_lag, lag_new;
-    opus_int   cbk_size;
+    oac_int   CBimax, CBimax_new, lag, start_lag, end_lag, lag_new;
+    oac_int   cbk_size;
     silk_float lag_log2, prevLag_log2, delta_lag_log2_sqr;
     silk_float energies_st3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ][ PE_NB_STAGE3_LAGS ];
     silk_float cross_corr_st3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ][ PE_NB_STAGE3_LAGS ];
-    opus_int   lag_counter;
-    opus_int   frame_length, frame_length_8kHz, frame_length_4kHz;
-    opus_int   sf_length, sf_length_8kHz, sf_length_4kHz;
-    opus_int   min_lag, min_lag_8kHz, min_lag_4kHz;
-    opus_int   max_lag, max_lag_8kHz, max_lag_4kHz;
-    opus_int   nb_cbk_search;
-    const opus_int8 *Lag_CB_ptr;
+    oac_int   lag_counter;
+    oac_int   frame_length, frame_length_8kHz, frame_length_4kHz;
+    oac_int   sf_length, sf_length_8kHz, sf_length_4kHz;
+    oac_int   min_lag, min_lag_8kHz, min_lag_4kHz;
+    oac_int   max_lag, max_lag_8kHz, max_lag_4kHz;
+    oac_int   nb_cbk_search;
+    const oac_int8 *Lag_CB_ptr;
 
     /* Check for valid sampling frequency */
     celt_assert( Fs_kHz == 8 || Fs_kHz == 12 || Fs_kHz == 16 );
@@ -135,16 +135,16 @@ opus_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced,
     /* Resample from input sampled at Fs_kHz to 8 kHz */
     if( Fs_kHz == 16 ) {
         /* Resample to 16 -> 8 khz */
-        opus_int16 frame_16_FIX[ 16 * PE_MAX_FRAME_LENGTH_MS ];
+        oac_int16 frame_16_FIX[ 16 * PE_MAX_FRAME_LENGTH_MS ];
         silk_float2short_array( frame_16_FIX, frame, frame_length );
-        silk_memset( filt_state, 0, 2 * sizeof( opus_int32 ) );
+        silk_memset( filt_state, 0, 2 * sizeof( oac_int32 ) );
         silk_resampler_down2( filt_state, frame_8_FIX, frame_16_FIX, frame_length );
         silk_short2float_array( frame_8kHz, frame_8_FIX, frame_length_8kHz );
     } else if( Fs_kHz == 12 ) {
         /* Resample to 12 -> 8 khz */
-        opus_int16 frame_12_FIX[ 12 * PE_MAX_FRAME_LENGTH_MS ];
+        oac_int16 frame_12_FIX[ 12 * PE_MAX_FRAME_LENGTH_MS ];
         silk_float2short_array( frame_12_FIX, frame, frame_length );
-        silk_memset( filt_state, 0, 6 * sizeof( opus_int32 ) );
+        silk_memset( filt_state, 0, 6 * sizeof( oac_int32 ) );
         silk_resampler_down2_3( filt_state, frame_8_FIX, frame_12_FIX, frame_length );
         silk_short2float_array( frame_8kHz, frame_8_FIX, frame_length_8kHz );
     } else {
@@ -153,7 +153,7 @@ opus_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced,
     }
 
     /* Decimate again to 4 kHz */
-    silk_memset( filt_state, 0, 2 * sizeof( opus_int32 ) );
+    silk_memset( filt_state, 0, 2 * sizeof( oac_int32 ) );
     silk_resampler_down2( filt_state, frame_4_FIX, frame_8_FIX, frame_length_8kHz );
     silk_short2float_array( frame_4kHz, frame_4_FIX, frame_length_4kHz );
 
@@ -221,7 +221,7 @@ opus_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced,
     /* Escape if correlation is very low already here */
     Cmax = C[ 0 ][ min_lag_4kHz ];
     if( Cmax < 0.2f ) {
-        silk_memset( pitch_out, 0, nb_subfr * sizeof( opus_int ) );
+        silk_memset( pitch_out, 0, nb_subfr * sizeof( oac_int ) );
         *LTPCorr      = 0.0f;
         *lagIndex     = 0;
         *contourIndex = 0;
@@ -268,7 +268,7 @@ opus_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced,
     length_d_comp = 0;
     for( i = min_lag_8kHz; i < max_lag_8kHz + 4; i++ ) {
         if( d_comp[ i ] > 0 ) {
-            d_comp[ length_d_comp ] = (opus_int16)( i - 2 );
+            d_comp[ length_d_comp ] = (oac_int16)( i - 2 );
             length_d_comp++;
         }
     }
@@ -380,7 +380,7 @@ opus_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced,
 
     if( lag == -1 ) {
         /* No suitable candidate found */
-        silk_memset( pitch_out, 0, PE_MAX_NB_SUBFR * sizeof(opus_int) );
+        silk_memset( pitch_out, 0, PE_MAX_NB_SUBFR * sizeof(oac_int) );
         *LTPCorr      = 0.0f;
         *lagIndex     = 0;
         *contourIndex = 0;
@@ -420,7 +420,7 @@ opus_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced,
 
         /* Set up cbk parameters according to complexity setting and frame length */
         if( nb_subfr == PE_MAX_NB_SUBFR ) {
-            nb_cbk_search = (opus_int)silk_nb_cbk_searchs_stage3[ complexity ];
+            nb_cbk_search = (oac_int)silk_nb_cbk_searchs_stage3[ complexity ];
             cbk_size      = PE_NB_CBKS_STAGE3_MAX;
             Lag_CB_ptr    = &silk_CB_lags_stage3[ 0 ][ 0 ];
         } else {
@@ -447,7 +447,7 @@ opus_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced,
                     CCmax_new = 0.0f;
                 }
 
-                if( CCmax_new > CCmax && ( d + (opus_int)silk_CB_lags_stage3[ 0 ][ j ] ) <= max_lag ) {
+                if( CCmax_new > CCmax && ( d + (oac_int)silk_CB_lags_stage3[ 0 ][ j ] ) <= max_lag ) {
                     CCmax   = CCmax_new;
                     lag_new = d;
                     CBimax  = j;
@@ -460,16 +460,16 @@ opus_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced,
             pitch_out[ k ] = lag_new + matrix_ptr( Lag_CB_ptr, k, CBimax, cbk_size );
             pitch_out[ k ] = silk_LIMIT( pitch_out[ k ], min_lag, PE_MAX_LAG_MS * Fs_kHz );
         }
-        *lagIndex = (opus_int16)( lag_new - min_lag );
-        *contourIndex = (opus_int8)CBimax;
+        *lagIndex = (oac_int16)( lag_new - min_lag );
+        *contourIndex = (oac_int8)CBimax;
     } else {        /* Fs_kHz == 8 */
         /* Save Lags */
         for( k = 0; k < nb_subfr; k++ ) {
             pitch_out[ k ] = lag + matrix_ptr( Lag_CB_ptr, k, CBimax, cbk_size );
             pitch_out[ k ] = silk_LIMIT( pitch_out[ k ], min_lag_8kHz, PE_MAX_LAG_MS * 8 );
         }
-        *lagIndex = (opus_int16)( lag - min_lag_8kHz );
-        *contourIndex = (opus_int8)CBimax;
+        *lagIndex = (oac_int16)( lag - min_lag_8kHz );
+        *contourIndex = (oac_int8)CBimax;
     }
     celt_assert( *lagIndex >= 0 );
     /* return as voiced */
@@ -492,19 +492,19 @@ opus_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced,
 static void silk_P_Ana_calc_corr_st3(
     silk_float cross_corr_st3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ][ PE_NB_STAGE3_LAGS ], /* O 3 DIM correlation array */
     const silk_float    frame[],            /* I vector to correlate                                            */
-    opus_int            start_lag,          /* I start lag                                                      */
-    opus_int            sf_length,          /* I sub frame length                                               */
-    opus_int            nb_subfr,           /* I number of subframes                                            */
-    opus_int            complexity,         /* I Complexity setting                                             */
+    oac_int            start_lag,          /* I start lag                                                      */
+    oac_int            sf_length,          /* I sub frame length                                               */
+    oac_int            nb_subfr,           /* I number of subframes                                            */
+    oac_int            complexity,         /* I Complexity setting                                             */
     int                 arch                /* I Run-time architecture                                          */
 )
 {
     const silk_float *target_ptr;
-    opus_int   i, j, k, lag_counter, lag_low, lag_high;
-    opus_int   nb_cbk_search, delta, idx, cbk_size;
+    oac_int   i, j, k, lag_counter, lag_low, lag_high;
+    oac_int   nb_cbk_search, delta, idx, cbk_size;
     silk_float scratch_mem[ SCRATCH_SIZE ];
-    opus_val32 xcorr[ SCRATCH_SIZE ];
-    const opus_int8 *Lag_range_ptr, *Lag_CB_ptr;
+    oac_val32 xcorr[ SCRATCH_SIZE ];
+    const oac_int8 *Lag_range_ptr, *Lag_CB_ptr;
 
     celt_assert( complexity >= SILK_PE_MIN_COMPLEX );
     celt_assert( complexity <= SILK_PE_MAX_COMPLEX );
@@ -559,18 +559,18 @@ static void silk_P_Ana_calc_corr_st3(
 static void silk_P_Ana_calc_energy_st3(
     silk_float energies_st3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ][ PE_NB_STAGE3_LAGS ], /* O 3 DIM correlation array */
     const silk_float    frame[],            /* I vector to correlate                                            */
-    opus_int            start_lag,          /* I start lag                                                      */
-    opus_int            sf_length,          /* I sub frame length                                               */
-    opus_int            nb_subfr,           /* I number of subframes                                            */
-    opus_int            complexity          /* I Complexity setting                                             */
+    oac_int            start_lag,          /* I start lag                                                      */
+    oac_int            sf_length,          /* I sub frame length                                               */
+    oac_int            nb_subfr,           /* I number of subframes                                            */
+    oac_int            complexity          /* I Complexity setting                                             */
 )
 {
     const silk_float *target_ptr, *basis_ptr;
     double    energy;
-    opus_int   k, i, j, lag_counter;
-    opus_int   nb_cbk_search, delta, idx, cbk_size, lag_diff;
+    oac_int   k, i, j, lag_counter;
+    oac_int   nb_cbk_search, delta, idx, cbk_size, lag_diff;
     silk_float scratch_mem[ SCRATCH_SIZE ];
-    const opus_int8 *Lag_range_ptr, *Lag_CB_ptr;
+    const oac_int8 *Lag_range_ptr, *Lag_CB_ptr;
 
     celt_assert( complexity >= SILK_PE_MIN_COMPLEX );
     celt_assert( complexity <= SILK_PE_MAX_COMPLEX );
diff --git a/silk/float/process_gains_FLP.c b/silk/float/process_gains_FLP.c
index c0da0dae4..28fe84442 100644
--- a/silk/float/process_gains_FLP.c
+++ b/silk/float/process_gains_FLP.c
@@ -36,12 +36,12 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_process_gains_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
-    opus_int                        condCoding                          /* I    The type of conditional coding to use       */
+    oac_int                        condCoding                          /* I    The type of conditional coding to use       */
 )
 {
     silk_shape_state_FLP *psShapeSt = &psEnc->sShape;
-    opus_int     k;
-    opus_int32   pGains_Q16[ MAX_NB_SUBFR ];
+    oac_int     k;
+    oac_int32   pGains_Q16[ MAX_NB_SUBFR ];
     silk_float   s, InvMaxSqrVal, gain, quant_offset;
 
     /* Gain reduction when LTP coding gain is high */
@@ -64,11 +64,11 @@ void silk_process_gains_FLP(
 
     /* Prepare gains for noise shaping quantization */
     for( k = 0; k < psEnc->sCmn.nb_subfr; k++ ) {
-        pGains_Q16[ k ] = (opus_int32)( psEncCtrl->Gains[ k ] * 65536.0f );
+        pGains_Q16[ k ] = (oac_int32)( psEncCtrl->Gains[ k ] * 65536.0f );
     }
 
     /* Save unquantized gains and gain Index */
-    silk_memcpy( psEncCtrl->GainsUnq_Q16, pGains_Q16, psEnc->sCmn.nb_subfr * sizeof( opus_int32 ) );
+    silk_memcpy( psEncCtrl->GainsUnq_Q16, pGains_Q16, psEnc->sCmn.nb_subfr * sizeof( oac_int32 ) );
     psEncCtrl->lastGainIndexPrev = psShapeSt->LastGainIndex;
 
     /* Quantize gains */
diff --git a/silk/float/regularize_correlations_FLP.c b/silk/float/regularize_correlations_FLP.c
index df4612604..80ca02356 100644
--- a/silk/float/regularize_correlations_FLP.c
+++ b/silk/float/regularize_correlations_FLP.c
@@ -36,10 +36,10 @@ void silk_regularize_correlations_FLP(
     silk_float                      *XX,                                /* I/O  Correlation matrices                        */
     silk_float                      *xx,                                /* I/O  Correlation values                          */
     const silk_float                noise,                              /* I    Noise energy to add                         */
-    const opus_int                  D                                   /* I    Dimension of XX                             */
+    const oac_int                  D                                   /* I    Dimension of XX                             */
 )
 {
-    opus_int i;
+    oac_int i;
 
     for( i = 0; i < D; i++ ) {
         matrix_ptr( &XX[ 0 ], i, i, D ) += noise;
diff --git a/silk/float/residual_energy_FLP.c b/silk/float/residual_energy_FLP.c
index 1bd07b33a..c5bf88769 100644
--- a/silk/float/residual_energy_FLP.c
+++ b/silk/float/residual_energy_FLP.c
@@ -40,10 +40,10 @@ silk_float silk_residual_energy_covar_FLP(                              /* O
     silk_float                      *wXX,                               /* I/O  Weighted correlation matrix, reg. out       */
     const silk_float                *wXx,                               /* I    Weighted correlation vector                 */
     const silk_float                wxx,                                /* I    Weighted correlation value                  */
-    const opus_int                  D                                   /* I    Dimension                                   */
+    const oac_int                  D                                   /* I    Dimension                                   */
 )
 {
-    opus_int   i, j, k;
+    oac_int   i, j, k;
     silk_float tmp, nrg = 0.0f, regularization;
 
     /* Safety checks */
@@ -93,12 +93,12 @@ void silk_residual_energy_FLP(
     const silk_float                x[],                                /* I    Input signal                                */
     silk_float                      a[ 2 ][ MAX_LPC_ORDER ],            /* I    AR coefs for each frame half                */
     const silk_float                gains[],                            /* I    Quantization gains                          */
-    const opus_int                  subfr_length,                       /* I    Subframe length                             */
-    const opus_int                  nb_subfr,                           /* I    number of subframes                         */
-    const opus_int                  LPC_order                           /* I    LPC order                                   */
+    const oac_int                  subfr_length,                       /* I    Subframe length                             */
+    const oac_int                  nb_subfr,                           /* I    number of subframes                         */
+    const oac_int                  LPC_order                           /* I    LPC order                                   */
 )
 {
-    opus_int     shift;
+    oac_int     shift;
     silk_float   *LPC_res_ptr, LPC_res[ ( MAX_FRAME_LENGTH + MAX_NB_SUBFR * MAX_LPC_ORDER ) / 2 ];
 
     LPC_res_ptr = LPC_res + LPC_order;
diff --git a/silk/float/scale_copy_vector_FLP.c b/silk/float/scale_copy_vector_FLP.c
index 20db32b3b..f66dea922 100644
--- a/silk/float/scale_copy_vector_FLP.c
+++ b/silk/float/scale_copy_vector_FLP.c
@@ -36,10 +36,10 @@ void silk_scale_copy_vector_FLP(
     silk_float          *data_out,
     const silk_float    *data_in,
     silk_float          gain,
-    opus_int            dataSize
+    oac_int            dataSize
 )
 {
-    opus_int  i, dataSize4;
+    oac_int  i, dataSize4;
 
     /* 4x unrolled loop */
     dataSize4 = dataSize & 0xFFFC;
diff --git a/silk/float/scale_vector_FLP.c b/silk/float/scale_vector_FLP.c
index 108fdcbed..379a527f7 100644
--- a/silk/float/scale_vector_FLP.c
+++ b/silk/float/scale_vector_FLP.c
@@ -35,10 +35,10 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_scale_vector_FLP(
     silk_float          *data1,
     silk_float          gain,
-    opus_int            dataSize
+    oac_int            dataSize
 )
 {
-    opus_int  i, dataSize4;
+    oac_int  i, dataSize4;
 
     /* 4x unrolled loop */
     dataSize4 = dataSize & 0xFFFC;
diff --git a/silk/float/schur_FLP.c b/silk/float/schur_FLP.c
index 8526c748d..23079ed5c 100644
--- a/silk/float/schur_FLP.c
+++ b/silk/float/schur_FLP.c
@@ -34,10 +34,10 @@ POSSIBILITY OF SUCH DAMAGE.
 silk_float silk_schur_FLP(                  /* O    returns residual energy                                     */
     silk_float          refl_coef[],        /* O    reflection coefficients (length order)                      */
     const silk_float    auto_corr[],        /* I    autocorrelation sequence (length order+1)                   */
-    opus_int            order               /* I    order                                                       */
+    oac_int            order               /* I    order                                                       */
 )
 {
-    opus_int   k, n;
+    oac_int   k, n;
     double C[ SILK_MAX_ORDER_LPC + 1 ][ 2 ];
     double Ctmp1, Ctmp2, rc_tmp;
 
diff --git a/silk/float/sort_FLP.c b/silk/float/sort_FLP.c
index 0e18f3195..e2fb338bb 100644
--- a/silk/float/sort_FLP.c
+++ b/silk/float/sort_FLP.c
@@ -38,13 +38,13 @@ POSSIBILITY OF SUCH DAMAGE.
 
 void silk_insertion_sort_decreasing_FLP(
     silk_float          *a,                 /* I/O  Unsorted / Sorted vector                                    */
-    opus_int            *idx,               /* O    Index vector for the sorted elements                        */
-    const opus_int      L,                  /* I    Vector length                                               */
-    const opus_int      K                   /* I    Number of correctly sorted positions                        */
+    oac_int            *idx,               /* O    Index vector for the sorted elements                        */
+    const oac_int      L,                  /* I    Vector length                                               */
+    const oac_int      K                   /* I    Number of correctly sorted positions                        */
 )
 {
     silk_float value;
-    opus_int   i, j;
+    oac_int   i, j;
 
     /* Safety checks */
     celt_assert( K >  0 );
diff --git a/silk/float/structs_FLP.h b/silk/float/structs_FLP.h
index 8eac15c19..2901b9be0 100644
--- a/silk/float/structs_FLP.h
+++ b/silk/float/structs_FLP.h
@@ -37,7 +37,7 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Noise shaping analysis state */
 /********************************/
 typedef struct {
-    opus_int8                   LastGainIndex;
+    oac_int8                   LastGainIndex;
     silk_float                  HarmShapeGain_smth;
     silk_float                  Tilt_smth;
 } silk_shape_state_FLP;
@@ -63,7 +63,7 @@ typedef struct {
     silk_float                  PredCoef[ 2 ][ MAX_LPC_ORDER ];     /* holds interpolated and final coefficients */
     silk_float                  LTPCoef[LTP_ORDER * MAX_NB_SUBFR];
     silk_float                  LTP_scale;
-    opus_int                    pitchL[ MAX_NB_SUBFR ];
+    oac_int                    pitchL[ MAX_NB_SUBFR ];
 
     /* Noise shaping parameters */
     silk_float                  AR[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ];
@@ -81,8 +81,8 @@ typedef struct {
     silk_float                  ResNrg[ MAX_NB_SUBFR ];             /* Residual energy per subframe */
 
     /* Parameters for CBR mode */
-    opus_int32                  GainsUnq_Q16[ MAX_NB_SUBFR ];
-    opus_int8                   lastGainIndexPrev;
+    oac_int32                  GainsUnq_Q16[ MAX_NB_SUBFR ];
+    oac_int8                   lastGainIndexPrev;
 } silk_encoder_control_FLP;
 
 /************************/
@@ -90,14 +90,14 @@ typedef struct {
 /************************/
 typedef struct {
     stereo_enc_state            sStereo;
-    opus_int32                  nBitsUsedLBRR;
-    opus_int32                  nBitsExceeded;
-    opus_int                    nChannelsAPI;
-    opus_int                    nChannelsInternal;
-    opus_int                    nPrevChannelsInternal;
-    opus_int                    timeSinceSwitchAllowed_ms;
-    opus_int                    allowBandwidthSwitch;
-    opus_int                    prev_decode_only_middle;
+    oac_int32                  nBitsUsedLBRR;
+    oac_int32                  nBitsExceeded;
+    oac_int                    nChannelsAPI;
+    oac_int                    nChannelsInternal;
+    oac_int                    nPrevChannelsInternal;
+    oac_int                    timeSinceSwitchAllowed_ms;
+    oac_int                    allowBandwidthSwitch;
+    oac_int                    prev_decode_only_middle;
     /* This needs to be last so we can skip the second state for mono. */
     silk_encoder_state_FLP      state_Fxx[ ENCODER_NUM_CHANNELS ];
 } silk_encoder;
diff --git a/silk/float/warped_autocorrelation_FLP.c b/silk/float/warped_autocorrelation_FLP.c
index 116dab923..92e7a4ee8 100644
--- a/silk/float/warped_autocorrelation_FLP.c
+++ b/silk/float/warped_autocorrelation_FLP.c
@@ -36,11 +36,11 @@ void silk_warped_autocorrelation_FLP(
     silk_float                      *corr,                              /* O    Result [order + 1]                          */
     const silk_float                *input,                             /* I    Input data to correlate                     */
     const silk_float                warping,                            /* I    Warping coefficient                         */
-    const opus_int                  length,                             /* I    Length of input                             */
-    const opus_int                  order                               /* I    Correlation order (even)                    */
+    const oac_int                  length,                             /* I    Length of input                             */
+    const oac_int                  order                               /* I    Correlation order (even)                    */
 )
 {
-    opus_int    n, i;
+    oac_int    n, i;
     double      tmp1, tmp2;
     double      state[ MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };
     double      C[     MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };
diff --git a/silk/float/wrappers_FLP.c b/silk/float/wrappers_FLP.c
index c0c183e35..d1c93f812 100644
--- a/silk/float/wrappers_FLP.c
+++ b/silk/float/wrappers_FLP.c
@@ -35,13 +35,13 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Convert AR filter coefficients to NLSF parameters */
 void silk_A2NLSF_FLP(
-    opus_int16                      *NLSF_Q15,                          /* O    NLSF vector      [ LPC_order ]              */
+    oac_int16                      *NLSF_Q15,                          /* O    NLSF vector      [ LPC_order ]              */
     const silk_float                *pAR,                               /* I    LPC coefficients [ LPC_order ]              */
-    const opus_int                  LPC_order                           /* I    LPC order                                   */
+    const oac_int                  LPC_order                           /* I    LPC order                                   */
 )
 {
-    opus_int   i;
-    opus_int32 a_fix_Q16[ MAX_LPC_ORDER ];
+    oac_int   i;
+    oac_int32 a_fix_Q16[ MAX_LPC_ORDER ];
 
     for( i = 0; i < LPC_order; i++ ) {
         a_fix_Q16[ i ] = silk_float2int( pAR[ i ] * 65536.0f );
@@ -53,13 +53,13 @@ void silk_A2NLSF_FLP(
 /* Convert LSF parameters to AR prediction filter coefficients */
 void silk_NLSF2A_FLP(
     silk_float                      *pAR,                               /* O    LPC coefficients [ LPC_order ]              */
-    const opus_int16                *NLSF_Q15,                          /* I    NLSF vector      [ LPC_order ]              */
-    const opus_int                  LPC_order,                          /* I    LPC order                                   */
+    const oac_int16                *NLSF_Q15,                          /* I    NLSF vector      [ LPC_order ]              */
+    const oac_int                  LPC_order,                          /* I    LPC order                                   */
     int                             arch                                /* I    Run-time architecture                       */
 )
 {
-    opus_int   i;
-    opus_int16 a_fix_Q12[ MAX_LPC_ORDER ];
+    oac_int   i;
+    oac_int16 a_fix_Q12[ MAX_LPC_ORDER ];
 
     silk_NLSF2A( a_fix_Q12, NLSF_Q15, LPC_order, arch );
 
@@ -74,12 +74,12 @@ void silk_NLSF2A_FLP(
 void silk_process_NLSFs_FLP(
     silk_encoder_state              *psEncC,                            /* I/O  Encoder state                               */
     silk_float                      PredCoef[ 2 ][ MAX_LPC_ORDER ],     /* O    Prediction coefficients                     */
-    opus_int16                      NLSF_Q15[      MAX_LPC_ORDER ],     /* I/O  Normalized LSFs (quant out) (0 - (2^15-1))  */
-    const opus_int16                prev_NLSF_Q15[ MAX_LPC_ORDER ]      /* I    Previous Normalized LSFs (0 - (2^15-1))     */
+    oac_int16                      NLSF_Q15[      MAX_LPC_ORDER ],     /* I/O  Normalized LSFs (quant out) (0 - (2^15-1))  */
+    const oac_int16                prev_NLSF_Q15[ MAX_LPC_ORDER ]      /* I    Previous Normalized LSFs (0 - (2^15-1))     */
 )
 {
-    opus_int     i, j;
-    opus_int16   PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ];
+    oac_int     i, j;
+    oac_int16   PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ];
 
     silk_process_NLSFs( psEncC, PredCoef_Q12, NLSF_Q15, prev_NLSF_Q15);
 
@@ -98,23 +98,23 @@ void silk_NSQ_wrapper_FLP(
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     SideInfoIndices                 *psIndices,                         /* I/O  Quantization indices                        */
     silk_nsq_state                  *psNSQ,                             /* I/O  Noise Shaping Quantzation state             */
-    opus_int8                       pulses[],                           /* O    Quantized pulse signal                      */
+    oac_int8                       pulses[],                           /* O    Quantized pulse signal                      */
     const silk_float                x[]                                 /* I    Prefiltered input signal                    */
 )
 {
-    opus_int     i, j;
-    opus_int16   x16[ MAX_FRAME_LENGTH ];
-    opus_int32   Gains_Q16[ MAX_NB_SUBFR ];
-    silk_DWORD_ALIGN opus_int16 PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ];
-    opus_int16   LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ];
-    opus_int     LTP_scale_Q14;
+    oac_int     i, j;
+    oac_int16   x16[ MAX_FRAME_LENGTH ];
+    oac_int32   Gains_Q16[ MAX_NB_SUBFR ];
+    silk_DWORD_ALIGN oac_int16 PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ];
+    oac_int16   LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ];
+    oac_int     LTP_scale_Q14;
 
     /* Noise shaping parameters */
-    opus_int16   AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ];
-    opus_int32   LF_shp_Q14[ MAX_NB_SUBFR ];         /* Packs two int16 coefficients per int32 value             */
-    opus_int     Lambda_Q10;
-    opus_int     Tilt_Q14[ MAX_NB_SUBFR ];
-    opus_int     HarmShapeGain_Q14[ MAX_NB_SUBFR ];
+    oac_int16   AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ];
+    oac_int32   LF_shp_Q14[ MAX_NB_SUBFR ];         /* Packs two int16 coefficients per int32 value             */
+    oac_int     Lambda_Q10;
+    oac_int     Tilt_Q14[ MAX_NB_SUBFR ];
+    oac_int     HarmShapeGain_Q14[ MAX_NB_SUBFR ];
 
     /* Convert control struct to fix control struct */
     /* Noise shape parameters */
@@ -126,20 +126,20 @@ void silk_NSQ_wrapper_FLP(
 
     for( i = 0; i < psEnc->sCmn.nb_subfr; i++ ) {
         LF_shp_Q14[ i ] =   silk_LSHIFT32( silk_float2int( psEncCtrl->LF_AR_shp[ i ]     * 16384.0f ), 16 ) |
-                              (opus_uint16)silk_float2int( psEncCtrl->LF_MA_shp[ i ]     * 16384.0f );
-        Tilt_Q14[ i ]   =        (opus_int)silk_float2int( psEncCtrl->Tilt[ i ]          * 16384.0f );
-        HarmShapeGain_Q14[ i ] = (opus_int)silk_float2int( psEncCtrl->HarmShapeGain[ i ] * 16384.0f );
+                              (oac_uint16)silk_float2int( psEncCtrl->LF_MA_shp[ i ]     * 16384.0f );
+        Tilt_Q14[ i ]   =        (oac_int)silk_float2int( psEncCtrl->Tilt[ i ]          * 16384.0f );
+        HarmShapeGain_Q14[ i ] = (oac_int)silk_float2int( psEncCtrl->HarmShapeGain[ i ] * 16384.0f );
     }
-    Lambda_Q10 = ( opus_int )silk_float2int( psEncCtrl->Lambda * 1024.0f );
+    Lambda_Q10 = ( oac_int )silk_float2int( psEncCtrl->Lambda * 1024.0f );
 
     /* prediction and coding parameters */
     for( i = 0; i < psEnc->sCmn.nb_subfr * LTP_ORDER; i++ ) {
-        LTPCoef_Q14[ i ] = (opus_int16)silk_float2int( psEncCtrl->LTPCoef[ i ] * 16384.0f );
+        LTPCoef_Q14[ i ] = (oac_int16)silk_float2int( psEncCtrl->LTPCoef[ i ] * 16384.0f );
     }
 
     for( j = 0; j < 2; j++ ) {
         for( i = 0; i < psEnc->sCmn.predictLPCOrder; i++ ) {
-            PredCoef_Q12[ j ][ i ] = (opus_int16)silk_float2int( psEncCtrl->PredCoef[ j ][ i ] * 4096.0f );
+            PredCoef_Q12[ j ][ i ] = (oac_int16)silk_float2int( psEncCtrl->PredCoef[ j ][ i ] * 4096.0f );
         }
     }
 
@@ -174,29 +174,29 @@ void silk_NSQ_wrapper_FLP(
 /***********************************************/
 void silk_quant_LTP_gains_FLP(
     silk_float                      B[ MAX_NB_SUBFR * LTP_ORDER ],      /* O    Quantized LTP gains                            */
-    opus_int8                       cbk_index[ MAX_NB_SUBFR ],          /* O    Codebook index                              */
-    opus_int8                       *periodicity_index,                 /* O    Periodicity index                           */
-    opus_int32                      *sum_log_gain_Q7,                   /* I/O  Cumulative max prediction gain  */
+    oac_int8                       cbk_index[ MAX_NB_SUBFR ],          /* O    Codebook index                              */
+    oac_int8                       *periodicity_index,                 /* O    Periodicity index                           */
+    oac_int32                      *sum_log_gain_Q7,                   /* I/O  Cumulative max prediction gain  */
     silk_float                      *pred_gain_dB,                        /* O    LTP prediction gain                            */
     const silk_float                XX[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ], /* I    Correlation matrix                    */
     const silk_float                xX[ MAX_NB_SUBFR * LTP_ORDER ],        /* I    Correlation vector                            */
-    const opus_int                    subfr_len,                            /* I    Number of samples per subframe                */
-    const opus_int                    nb_subfr,                           /* I    Number of subframes                            */
+    const oac_int                    subfr_len,                            /* I    Number of samples per subframe                */
+    const oac_int                    nb_subfr,                           /* I    Number of subframes                            */
     int                             arch                                /* I    Run-time architecture                       */
 )
 {
-    opus_int   i, pred_gain_dB_Q7;
-    opus_int16 B_Q14[ MAX_NB_SUBFR * LTP_ORDER ];
-    opus_int32 XX_Q17[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ];
-    opus_int32 xX_Q17[ MAX_NB_SUBFR * LTP_ORDER ];
+    oac_int   i, pred_gain_dB_Q7;
+    oac_int16 B_Q14[ MAX_NB_SUBFR * LTP_ORDER ];
+    oac_int32 XX_Q17[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ];
+    oac_int32 xX_Q17[ MAX_NB_SUBFR * LTP_ORDER ];
 
     i = 0;
     do {
-        XX_Q17[ i ] = (opus_int32)silk_float2int( XX[ i ] * 131072.0f );
+        XX_Q17[ i ] = (oac_int32)silk_float2int( XX[ i ] * 131072.0f );
     } while ( ++i < nb_subfr * LTP_ORDER * LTP_ORDER );
     i = 0;
     do {
-        xX_Q17[ i ] = (opus_int32)silk_float2int( xX[ i ] * 131072.0f );
+        xX_Q17[ i ] = (oac_int32)silk_float2int( xX[ i ] * 131072.0f );
     } while ( ++i < nb_subfr * LTP_ORDER );
 
     silk_quant_LTP_gains( B_Q14, cbk_index, periodicity_index, sum_log_gain_Q7, &pred_gain_dB_Q7, XX_Q17, xX_Q17, subfr_len, nb_subfr, arch );
diff --git a/silk/float/x86/inner_product_FLP_avx2.c b/silk/float/x86/inner_product_FLP_avx2.c
index 4a2daaf59..8f4ab3995 100644
--- a/silk/float/x86/inner_product_FLP_avx2.c
+++ b/silk/float/x86/inner_product_FLP_avx2.c
@@ -38,10 +38,10 @@ POSSIBILITY OF SUCH DAMAGE.
 double silk_inner_product_FLP_avx2(
     const silk_float    *data1,
     const silk_float    *data2,
-    opus_int            dataSize
+    oac_int            dataSize
 )
 {
-    opus_int i;
+    oac_int i;
     __m256d accum1, accum2;
     double   result;
 
diff --git a/silk/gain_quant.c b/silk/gain_quant.c
index ee65245aa..580eb0886 100644
--- a/silk/gain_quant.c
+++ b/silk/gain_quant.c
@@ -37,14 +37,14 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Gain scalar quantization with hysteresis, uniform on log scale */
 void silk_gains_quant(
-    opus_int8                   ind[ MAX_NB_SUBFR ],            /* O    gain indices                                */
-    opus_int32                  gain_Q16[ MAX_NB_SUBFR ],       /* I/O  gains (quantized out)                       */
-    opus_int8                   *prev_ind,                      /* I/O  last index in previous frame                */
-    const opus_int              conditional,                    /* I    first gain is delta coded if 1              */
-    const opus_int              nb_subfr                        /* I    number of subframes                         */
+    oac_int8                   ind[ MAX_NB_SUBFR ],            /* O    gain indices                                */
+    oac_int32                  gain_Q16[ MAX_NB_SUBFR ],       /* I/O  gains (quantized out)                       */
+    oac_int8                   *prev_ind,                      /* I/O  last index in previous frame                */
+    const oac_int              conditional,                    /* I    first gain is delta coded if 1              */
+    const oac_int              nb_subfr                        /* I    number of subframes                         */
 )
 {
-    opus_int k, double_step_size_threshold;
+    oac_int k, double_step_size_threshold;
 
     for( k = 0; k < nb_subfr; k++ ) {
         /* Convert to log scale, scale, floor() */
@@ -92,14 +92,14 @@ void silk_gains_quant(
 
 /* Gains scalar dequantization, uniform on log scale */
 void silk_gains_dequant(
-    opus_int32                  gain_Q16[ MAX_NB_SUBFR ],       /* O    quantized gains                             */
-    const opus_int8             ind[ MAX_NB_SUBFR ],            /* I    gain indices                                */
-    opus_int8                   *prev_ind,                      /* I/O  last index in previous frame                */
-    const opus_int              conditional,                    /* I    first gain is delta coded if 1              */
-    const opus_int              nb_subfr                        /* I    number of subframes                          */
+    oac_int32                  gain_Q16[ MAX_NB_SUBFR ],       /* O    quantized gains                             */
+    const oac_int8             ind[ MAX_NB_SUBFR ],            /* I    gain indices                                */
+    oac_int8                   *prev_ind,                      /* I/O  last index in previous frame                */
+    const oac_int              conditional,                    /* I    first gain is delta coded if 1              */
+    const oac_int              nb_subfr                        /* I    number of subframes                          */
 )
 {
-    opus_int   k, ind_tmp, double_step_size_threshold;
+    oac_int   k, ind_tmp, double_step_size_threshold;
 
     for( k = 0; k < nb_subfr; k++ ) {
         if( k == 0 && conditional == 0 ) {
@@ -125,13 +125,13 @@ void silk_gains_dequant(
 }
 
 /* Compute unique identifier of gain indices vector */
-opus_int32 silk_gains_ID(                                       /* O    returns unique identifier of gains          */
-    const opus_int8             ind[ MAX_NB_SUBFR ],            /* I    gain indices                                */
-    const opus_int              nb_subfr                        /* I    number of subframes                         */
+oac_int32 silk_gains_ID(                                       /* O    returns unique identifier of gains          */
+    const oac_int8             ind[ MAX_NB_SUBFR ],            /* I    gain indices                                */
+    const oac_int              nb_subfr                        /* I    number of subframes                         */
 )
 {
-    opus_int   k;
-    opus_int32 gainsID;
+    oac_int   k;
+    oac_int32 gainsID;
 
     gainsID = 0;
     for( k = 0; k < nb_subfr; k++ ) {
diff --git a/silk/init_decoder.c b/silk/init_decoder.c
index 64fbd7e38..e82f3bba7 100644
--- a/silk/init_decoder.c
+++ b/silk/init_decoder.c
@@ -40,7 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
 /************************/
 /* Reset Decoder State  */
 /************************/
-opus_int silk_reset_decoder(
+oac_int silk_reset_decoder(
     silk_decoder_state          *psDec                          /* I/O  Decoder state pointer                       */
 )
 {
@@ -50,7 +50,7 @@ opus_int silk_reset_decoder(
     /* Used to deactivate LSF interpolation */
     psDec->first_frame_after_reset = 1;
     psDec->prev_gain_Q16 = 65536;
-    psDec->arch = opus_select_arch();
+    psDec->arch = oac_select_arch();
 
     /* Reset CNG state */
     silk_CNG_Reset( psDec );
@@ -70,7 +70,7 @@ opus_int silk_reset_decoder(
 /************************/
 /* Init Decoder State   */
 /************************/
-opus_int silk_init_decoder(
+oac_int silk_init_decoder(
     silk_decoder_state          *psDec                          /* I/O  Decoder state pointer                       */
 )
 {
diff --git a/silk/init_encoder.c b/silk/init_encoder.c
index 10d41287f..6ed8330d7 100644
--- a/silk/init_encoder.c
+++ b/silk/init_encoder.c
@@ -43,12 +43,12 @@ POSSIBILITY OF SUCH DAMAGE.
 /*********************************/
 /* Initialize Silk Encoder state */
 /*********************************/
-opus_int silk_init_encoder(
+oac_int silk_init_encoder(
     silk_encoder_state_Fxx          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
     int                              arch                                   /* I    Run-time architecture                                                       */
 )
 {
-    opus_int ret = 0;
+    oac_int ret = 0;
 
     /* Clear the entire encoder state */
     silk_memset( psEnc, 0, sizeof( silk_encoder_state_Fxx ) );
diff --git a/silk/inner_prod_aligned.c b/silk/inner_prod_aligned.c
index 257ae9e04..093c822d3 100644
--- a/silk/inner_prod_aligned.c
+++ b/silk/inner_prod_aligned.c
@@ -31,15 +31,15 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "SigProc_FIX.h"
 
-opus_int32 silk_inner_prod_aligned_scale(
-    const opus_int16 *const     inVec1,             /*    I input vector 1                                              */
-    const opus_int16 *const     inVec2,             /*    I input vector 2                                              */
-    const opus_int              scale,              /*    I number of bits to shift                                     */
-    const opus_int              len                 /*    I vector lengths                                              */
+oac_int32 silk_inner_prod_aligned_scale(
+    const oac_int16 *const     inVec1,             /*    I input vector 1                                              */
+    const oac_int16 *const     inVec2,             /*    I input vector 2                                              */
+    const oac_int              scale,              /*    I number of bits to shift                                     */
+    const oac_int              len                 /*    I vector lengths                                              */
 )
 {
-    opus_int   i;
-    opus_int32 sum = 0;
+    oac_int   i;
+    oac_int32 sum = 0;
     for( i = 0; i < len; i++ ) {
         sum = silk_ADD_RSHIFT32( sum, silk_SMULBB( inVec1[ i ], inVec2[ i ] ), scale );
     }
diff --git a/silk/interpolate.c b/silk/interpolate.c
index 833c28ef8..6aa6096e0 100644
--- a/silk/interpolate.c
+++ b/silk/interpolate.c
@@ -33,19 +33,19 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Interpolate two vectors */
 void silk_interpolate(
-    opus_int16                  xi[ MAX_LPC_ORDER ],            /* O    interpolated vector                         */
-    const opus_int16            x0[ MAX_LPC_ORDER ],            /* I    first vector                                */
-    const opus_int16            x1[ MAX_LPC_ORDER ],            /* I    second vector                               */
-    const opus_int              ifact_Q2,                       /* I    interp. factor, weight on 2nd vector        */
-    const opus_int              d                               /* I    number of parameters                        */
+    oac_int16                  xi[ MAX_LPC_ORDER ],            /* O    interpolated vector                         */
+    const oac_int16            x0[ MAX_LPC_ORDER ],            /* I    first vector                                */
+    const oac_int16            x1[ MAX_LPC_ORDER ],            /* I    second vector                               */
+    const oac_int              ifact_Q2,                       /* I    interp. factor, weight on 2nd vector        */
+    const oac_int              d                               /* I    number of parameters                        */
 )
 {
-    opus_int i;
+    oac_int i;
 
     celt_assert( ifact_Q2 >= 0 );
     celt_assert( ifact_Q2 <= 4 );
 
     for( i = 0; i < d; i++ ) {
-        xi[ i ] = (opus_int16)silk_ADD_RSHIFT( x0[ i ], silk_SMULBB( x1[ i ] - x0[ i ], ifact_Q2 ), 2 );
+        xi[ i ] = (oac_int16)silk_ADD_RSHIFT( x0[ i ], silk_SMULBB( x1[ i ] - x0[ i ], ifact_Q2 ), 2 );
     }
 }
diff --git a/silk/lin2log.c b/silk/lin2log.c
index 5a05d8205..5b738eff0 100644
--- a/silk/lin2log.c
+++ b/silk/lin2log.c
@@ -32,11 +32,11 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "SigProc_FIX.h"
 /* Approximation of 128 * log2() (very close inverse of silk_log2lin()) */
 /* Convert input to a log scale    */
-opus_int32 silk_lin2log(
-    const opus_int32            inLin               /* I  input in linear scale                                         */
+oac_int32 silk_lin2log(
+    const oac_int32            inLin               /* I  input in linear scale                                         */
 )
 {
-    opus_int32 lz, frac_Q7;
+    oac_int32 lz, frac_Q7;
 
     silk_CLZ_FRAC( inLin, &lz, &frac_Q7 );
 
diff --git a/silk/log2lin.c b/silk/log2lin.c
index b7c48e474..eb650775f 100644
--- a/silk/log2lin.c
+++ b/silk/log2lin.c
@@ -33,11 +33,11 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Approximation of 2^() (very close inverse of silk_lin2log()) */
 /* Convert input to a linear scale    */
-opus_int32 silk_log2lin(
-    const opus_int32            inLog_Q7            /* I  input on log scale                                            */
+oac_int32 silk_log2lin(
+    const oac_int32            inLog_Q7            /* I  input on log scale                                            */
 )
 {
-    opus_int32 out, frac_Q7;
+    oac_int32 out, frac_Q7;
 
     if( inLog_Q7 < 0 ) {
         return 0;
diff --git a/silk/macros.h b/silk/macros.h
index 26cfeb61a..cdcf6d366 100644
--- a/silk/macros.h
+++ b/silk/macros.h
@@ -32,75 +32,75 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#include "opus_types.h"
-#include "opus_defines.h"
+#include "oac_types.h"
+#include "oac_defines.h"
 #include "arch.h"
 
-/* This is an OPUS_INLINE header file for general platform. */
+/* This is an OAC_INLINE header file for general platform. */
 
-/* (a32 * (opus_int32)((opus_int16)(b32))) >> 16 output have to be 32bit int */
-#if OPUS_FAST_INT64
-#define silk_SMULWB(a32, b32)            ((opus_int32)(((a32) * (opus_int64)((opus_int16)(b32))) >> 16))
+/* (a32 * (oac_int32)((oac_int16)(b32))) >> 16 output have to be 32bit int */
+#if OAC_FAST_INT64
+#define silk_SMULWB(a32, b32)            ((oac_int32)(((a32) * (oac_int64)((oac_int16)(b32))) >> 16))
 #else
-#define silk_SMULWB(a32, b32)            ((((a32) >> 16) * (opus_int32)((opus_int16)(b32))) + ((((a32) & 0x0000FFFF) * (opus_int32)((opus_int16)(b32))) >> 16))
+#define silk_SMULWB(a32, b32)            ((((a32) >> 16) * (oac_int32)((oac_int16)(b32))) + ((((a32) & 0x0000FFFF) * (oac_int32)((oac_int16)(b32))) >> 16))
 #endif
 
-/* a32 + (b32 * (opus_int32)((opus_int16)(c32))) >> 16 output have to be 32bit int */
-#if OPUS_FAST_INT64
-#define silk_SMLAWB(a32, b32, c32)       ((opus_int32)((a32) + (((b32) * (opus_int64)((opus_int16)(c32))) >> 16)))
+/* a32 + (b32 * (oac_int32)((oac_int16)(c32))) >> 16 output have to be 32bit int */
+#if OAC_FAST_INT64
+#define silk_SMLAWB(a32, b32, c32)       ((oac_int32)((a32) + (((b32) * (oac_int64)((oac_int16)(c32))) >> 16)))
 #else
-#define silk_SMLAWB(a32, b32, c32)       ((a32) + ((((b32) >> 16) * (opus_int32)((opus_int16)(c32))) + ((((b32) & 0x0000FFFF) * (opus_int32)((opus_int16)(c32))) >> 16)))
+#define silk_SMLAWB(a32, b32, c32)       ((a32) + ((((b32) >> 16) * (oac_int32)((oac_int16)(c32))) + ((((b32) & 0x0000FFFF) * (oac_int32)((oac_int16)(c32))) >> 16)))
 #endif
 
 /* (a32 * (b32 >> 16)) >> 16 */
-#if OPUS_FAST_INT64
-#define silk_SMULWT(a32, b32)            ((opus_int32)(((a32) * (opus_int64)((b32) >> 16)) >> 16))
+#if OAC_FAST_INT64
+#define silk_SMULWT(a32, b32)            ((oac_int32)(((a32) * (oac_int64)((b32) >> 16)) >> 16))
 #else
 #define silk_SMULWT(a32, b32)            (((a32) >> 16) * ((b32) >> 16) + ((((a32) & 0x0000FFFF) * ((b32) >> 16)) >> 16))
 #endif
 
 /* a32 + (b32 * (c32 >> 16)) >> 16 */
-#if OPUS_FAST_INT64
-#define silk_SMLAWT(a32, b32, c32)       ((opus_int32)((a32) + (((b32) * ((opus_int64)(c32) >> 16)) >> 16)))
+#if OAC_FAST_INT64
+#define silk_SMLAWT(a32, b32, c32)       ((oac_int32)((a32) + (((b32) * ((oac_int64)(c32) >> 16)) >> 16)))
 #else
 #define silk_SMLAWT(a32, b32, c32)       ((a32) + (((b32) >> 16) * ((c32) >> 16)) + ((((b32) & 0x0000FFFF) * ((c32) >> 16)) >> 16))
 #endif
 
-/* (opus_int32)((opus_int16)(a3))) * (opus_int32)((opus_int16)(b32)) output have to be 32bit int */
-#define silk_SMULBB(a32, b32)            ((opus_int32)((opus_int16)(a32)) * (opus_int32)((opus_int16)(b32)))
+/* (oac_int32)((oac_int16)(a3))) * (oac_int32)((oac_int16)(b32)) output have to be 32bit int */
+#define silk_SMULBB(a32, b32)            ((oac_int32)((oac_int16)(a32)) * (oac_int32)((oac_int16)(b32)))
 
-/* a32 + (opus_int32)((opus_int16)(b32)) * (opus_int32)((opus_int16)(c32)) output have to be 32bit int */
-#define silk_SMLABB(a32, b32, c32)       ((a32) + ((opus_int32)((opus_int16)(b32))) * (opus_int32)((opus_int16)(c32)))
+/* a32 + (oac_int32)((oac_int16)(b32)) * (oac_int32)((oac_int16)(c32)) output have to be 32bit int */
+#define silk_SMLABB(a32, b32, c32)       ((a32) + ((oac_int32)((oac_int16)(b32))) * (oac_int32)((oac_int16)(c32)))
 
-/* (opus_int32)((opus_int16)(a32)) * (b32 >> 16) */
-#define silk_SMULBT(a32, b32)            ((opus_int32)((opus_int16)(a32)) * ((b32) >> 16))
+/* (oac_int32)((oac_int16)(a32)) * (b32 >> 16) */
+#define silk_SMULBT(a32, b32)            ((oac_int32)((oac_int16)(a32)) * ((b32) >> 16))
 
-/* a32 + (opus_int32)((opus_int16)(b32)) * (c32 >> 16) */
-#define silk_SMLABT(a32, b32, c32)       ((a32) + ((opus_int32)((opus_int16)(b32))) * ((c32) >> 16))
+/* a32 + (oac_int32)((oac_int16)(b32)) * (c32 >> 16) */
+#define silk_SMLABT(a32, b32, c32)       ((a32) + ((oac_int32)((oac_int16)(b32))) * ((c32) >> 16))
 
 /* a64 + (b32 * c32) */
-#define silk_SMLAL(a64, b32, c32)        (silk_ADD64((a64), ((opus_int64)(b32) * (opus_int64)(c32))))
+#define silk_SMLAL(a64, b32, c32)        (silk_ADD64((a64), ((oac_int64)(b32) * (oac_int64)(c32))))
 
 /* (a32 * b32) >> 16 */
-#if OPUS_FAST_INT64
-#define silk_SMULWW(a32, b32)            ((opus_int32)(((opus_int64)(a32) * (b32)) >> 16))
+#if OAC_FAST_INT64
+#define silk_SMULWW(a32, b32)            ((oac_int32)(((oac_int64)(a32) * (b32)) >> 16))
 #else
 #define silk_SMULWW(a32, b32)            silk_MLA(silk_SMULWB((a32), (b32)), (a32), silk_RSHIFT_ROUND((b32), 16))
 #endif
 
 /* a32 + ((b32 * c32) >> 16) */
-#if OPUS_FAST_INT64
-#define silk_SMLAWW(a32, b32, c32)       ((opus_int32)((a32) + (((opus_int64)(b32) * (c32)) >> 16)))
+#if OAC_FAST_INT64
+#define silk_SMLAWW(a32, b32, c32)       ((oac_int32)((a32) + (((oac_int64)(b32) * (c32)) >> 16)))
 #else
 #define silk_SMLAWW(a32, b32, c32)       silk_MLA(silk_SMLAWB((a32), (b32), (c32)), (b32), silk_RSHIFT_ROUND((c32), 16))
 #endif
 
 /* add/subtract with output saturated */
-#define silk_ADD_SAT32(a, b)             ((((opus_uint32)(a) + (opus_uint32)(b)) & 0x80000000) == 0 ?                              \
+#define silk_ADD_SAT32(a, b)             ((((oac_uint32)(a) + (oac_uint32)(b)) & 0x80000000) == 0 ?                              \
                                         ((((a) & (b)) & 0x80000000) != 0 ? silk_int32_MIN : (a)+(b)) :   \
                                         ((((a) | (b)) & 0x80000000) == 0 ? silk_int32_MAX : (a)+(b)) )
 
-#define silk_SUB_SAT32(a, b)             ((((opus_uint32)(a)-(opus_uint32)(b)) & 0x80000000) == 0 ?                                        \
+#define silk_SUB_SAT32(a, b)             ((((oac_uint32)(a)-(oac_uint32)(b)) & 0x80000000) == 0 ?                                        \
                                         (( (a) & ((b)^0x80000000) & 0x80000000) ? silk_int32_MIN : (a)-(b)) :    \
                                         ((((a)^0x80000000) & (b)  & 0x80000000) ? silk_int32_MAX : (a)-(b)) )
 
@@ -110,14 +110,14 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "ecintrin.h"
 #ifndef OVERRIDE_silk_CLZ16
-static OPUS_INLINE opus_int32 silk_CLZ16(opus_int16 in16)
+static OAC_INLINE oac_int32 silk_CLZ16(oac_int16 in16)
 {
     return 32 - EC_ILOG(in16<<16|0x8000);
 }
 #endif
 
 #ifndef OVERRIDE_silk_CLZ32
-static OPUS_INLINE opus_int32 silk_CLZ32(opus_int32 in32)
+static OAC_INLINE oac_int32 silk_CLZ32(oac_int32 in32)
 {
     return in32 ? 32 - EC_ILOG(in32) : 32;
 }
@@ -135,19 +135,19 @@ static OPUS_INLINE opus_int32 silk_CLZ32(opus_int32 in32)
     (*((Matrix_base_adr) + ((row)+(M)*(column))))
 #endif
 
-#ifdef OPUS_ARM_INLINE_ASM
+#ifdef OAC_ARM_INLINE_ASM
 #include "arm/macros_armv4.h"
 #endif
 
-#ifdef OPUS_ARM_INLINE_EDSP
+#ifdef OAC_ARM_INLINE_EDSP
 #include "arm/macros_armv5e.h"
 #endif
 
-#ifdef OPUS_ARM_PRESUME_AARCH64_NEON_INTR
+#ifdef OAC_ARM_PRESUME_AARCH64_NEON_INTR
 #include "arm/macros_arm64.h"
 #endif
 
-#ifdef OPUS_XTENSA_LX7
+#ifdef OAC_XTENSA_LX7
 #include "xtensa/macros_lx7.h"
 #endif
 
diff --git a/silk/main.h b/silk/main.h
index 5ca9aa52a..04152bc57 100644
--- a/silk/main.h
+++ b/silk/main.h
@@ -38,114 +38,114 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "entenc.h"
 #include "entdec.h"
 
-#if defined(OPUS_X86_MAY_HAVE_SSE4_1)
+#if defined(OAC_X86_MAY_HAVE_SSE4_1)
 #include "x86/main_sse.h"
 #endif
 
-#if (defined(OPUS_ARM_ASM) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR))
+#if (defined(OAC_ARM_ASM) || defined(OAC_ARM_MAY_HAVE_NEON_INTR))
 #include "arm/NSQ_del_dec_arm.h"
 #endif
 
 /* Convert Left/Right stereo signal to adaptive Mid/Side representation */
 void silk_stereo_LR_to_MS(
     stereo_enc_state            *state,                         /* I/O  State                                       */
-    opus_int16                  x1[],                           /* I/O  Left input signal, becomes mid signal       */
-    opus_int16                  x2[],                           /* I/O  Right input signal, becomes side signal     */
-    opus_int8                   ix[ 2 ][ 3 ],                   /* O    Quantization indices                        */
-    opus_int8                   *mid_only_flag,                 /* O    Flag: only mid signal coded                 */
-    opus_int32                  mid_side_rates_bps[],           /* O    Bitrates for mid and side signals           */
-    opus_int32                  total_rate_bps,                 /* I    Total bitrate                               */
-    opus_int                    prev_speech_act_Q8,             /* I    Speech activity level in previous frame     */
-    opus_int                    toMono,                         /* I    Last frame before a stereo->mono transition */
-    opus_int                    fs_kHz,                         /* I    Sample rate (kHz)                           */
-    opus_int                    frame_length                    /* I    Number of samples                           */
+    oac_int16                  x1[],                           /* I/O  Left input signal, becomes mid signal       */
+    oac_int16                  x2[],                           /* I/O  Right input signal, becomes side signal     */
+    oac_int8                   ix[ 2 ][ 3 ],                   /* O    Quantization indices                        */
+    oac_int8                   *mid_only_flag,                 /* O    Flag: only mid signal coded                 */
+    oac_int32                  mid_side_rates_bps[],           /* O    Bitrates for mid and side signals           */
+    oac_int32                  total_rate_bps,                 /* I    Total bitrate                               */
+    oac_int                    prev_speech_act_Q8,             /* I    Speech activity level in previous frame     */
+    oac_int                    toMono,                         /* I    Last frame before a stereo->mono transition */
+    oac_int                    fs_kHz,                         /* I    Sample rate (kHz)                           */
+    oac_int                    frame_length                    /* I    Number of samples                           */
 );
 
 /* Convert adaptive Mid/Side representation to Left/Right stereo signal */
 void silk_stereo_MS_to_LR(
     stereo_dec_state            *state,                         /* I/O  State                                       */
-    opus_int16                  x1[],                           /* I/O  Left input signal, becomes mid signal       */
-    opus_int16                  x2[],                           /* I/O  Right input signal, becomes side signal     */
-    const opus_int32            pred_Q13[],                     /* I    Predictors                                  */
-    opus_int                    fs_kHz,                         /* I    Samples rate (kHz)                          */
-    opus_int                    frame_length                    /* I    Number of samples                           */
+    oac_int16                  x1[],                           /* I/O  Left input signal, becomes mid signal       */
+    oac_int16                  x2[],                           /* I/O  Right input signal, becomes side signal     */
+    const oac_int32            pred_Q13[],                     /* I    Predictors                                  */
+    oac_int                    fs_kHz,                         /* I    Samples rate (kHz)                          */
+    oac_int                    frame_length                    /* I    Number of samples                           */
 );
 
 /* Find least-squares prediction gain for one signal based on another and quantize it */
-opus_int32 silk_stereo_find_predictor(                          /* O    Returns predictor in Q13                    */
-    opus_int32                  *ratio_Q14,                     /* O    Ratio of residual and mid energies          */
-    const opus_int16            x[],                            /* I    Basis signal                                */
-    const opus_int16            y[],                            /* I    Target signal                               */
-    opus_int32                  mid_res_amp_Q0[],               /* I/O  Smoothed mid, residual norms                */
-    opus_int                    length,                         /* I    Number of samples                           */
-    opus_int                    smooth_coef_Q16                 /* I    Smoothing coefficient                       */
+oac_int32 silk_stereo_find_predictor(                          /* O    Returns predictor in Q13                    */
+    oac_int32                  *ratio_Q14,                     /* O    Ratio of residual and mid energies          */
+    const oac_int16            x[],                            /* I    Basis signal                                */
+    const oac_int16            y[],                            /* I    Target signal                               */
+    oac_int32                  mid_res_amp_Q0[],               /* I/O  Smoothed mid, residual norms                */
+    oac_int                    length,                         /* I    Number of samples                           */
+    oac_int                    smooth_coef_Q16                 /* I    Smoothing coefficient                       */
 );
 
 /* Quantize mid/side predictors */
 void silk_stereo_quant_pred(
-    opus_int32                  pred_Q13[],                     /* I/O  Predictors (out: quantized)                 */
-    opus_int8                   ix[ 2 ][ 3 ]                    /* O    Quantization indices                        */
+    oac_int32                  pred_Q13[],                     /* I/O  Predictors (out: quantized)                 */
+    oac_int8                   ix[ 2 ][ 3 ]                    /* O    Quantization indices                        */
 );
 
 /* Entropy code the mid/side quantization indices */
 void silk_stereo_encode_pred(
     ec_enc                      *psRangeEnc,                    /* I/O  Compressor data structure                   */
-    opus_int8                   ix[ 2 ][ 3 ]                    /* I    Quantization indices                        */
+    oac_int8                   ix[ 2 ][ 3 ]                    /* I    Quantization indices                        */
 );
 
 /* Entropy code the mid-only flag */
 void silk_stereo_encode_mid_only(
     ec_enc                      *psRangeEnc,                    /* I/O  Compressor data structure                   */
-    opus_int8                   mid_only_flag
+    oac_int8                   mid_only_flag
 );
 
 /* Decode mid/side predictors */
 void silk_stereo_decode_pred(
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
-    opus_int32                  pred_Q13[]                      /* O    Predictors                                  */
+    oac_int32                  pred_Q13[]                      /* O    Predictors                                  */
 );
 
 /* Decode mid-only flag */
 void silk_stereo_decode_mid_only(
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
-    opus_int                    *decode_only_mid                /* O    Flag that only mid channel has been coded   */
+    oac_int                    *decode_only_mid                /* O    Flag that only mid channel has been coded   */
 );
 
 /* Encodes signs of excitation */
 void silk_encode_signs(
     ec_enc                      *psRangeEnc,                        /* I/O  Compressor data structure               */
-    const opus_int8             pulses[],                           /* I    pulse signal                            */
-    opus_int                    length,                             /* I    length of input                         */
-    const opus_int              signalType,                         /* I    Signal type                             */
-    const opus_int              quantOffsetType,                    /* I    Quantization offset type                */
-    const opus_int              sum_pulses[ MAX_NB_SHELL_BLOCKS ]   /* I    Sum of absolute pulses per block        */
+    const oac_int8             pulses[],                           /* I    pulse signal                            */
+    oac_int                    length,                             /* I    length of input                         */
+    const oac_int              signalType,                         /* I    Signal type                             */
+    const oac_int              quantOffsetType,                    /* I    Quantization offset type                */
+    const oac_int              sum_pulses[ MAX_NB_SHELL_BLOCKS ]   /* I    Sum of absolute pulses per block        */
 );
 
 /* Decodes signs of excitation */
 void silk_decode_signs(
     ec_dec                      *psRangeDec,                        /* I/O  Compressor data structure               */
-    opus_int16                  pulses[],                           /* I/O  pulse signal                            */
-    opus_int                    length,                             /* I    length of input                         */
-    const opus_int              signalType,                         /* I    Signal type                             */
-    const opus_int              quantOffsetType,                    /* I    Quantization offset type                */
-    const opus_int              sum_pulses[ MAX_NB_SHELL_BLOCKS ]   /* I    Sum of absolute pulses per block        */
+    oac_int16                  pulses[],                           /* I/O  pulse signal                            */
+    oac_int                    length,                             /* I    length of input                         */
+    const oac_int              signalType,                         /* I    Signal type                             */
+    const oac_int              quantOffsetType,                    /* I    Quantization offset type                */
+    const oac_int              sum_pulses[ MAX_NB_SHELL_BLOCKS ]   /* I    Sum of absolute pulses per block        */
 );
 
 /* Check encoder control struct */
-opus_int check_control_input(
+oac_int check_control_input(
     silk_EncControlStruct        *encControl                    /* I    Control structure                           */
 );
 
 /* Control internal sampling rate */
-opus_int silk_control_audio_bandwidth(
+oac_int silk_control_audio_bandwidth(
     silk_encoder_state          *psEncC,                        /* I/O  Pointer to Silk encoder state               */
     silk_EncControlStruct       *encControl                     /* I    Control structure                           */
 );
 
 /* Control SNR of residual quantizer */
-opus_int silk_control_SNR(
+oac_int silk_control_SNR(
     silk_encoder_state          *psEncC,                        /* I/O  Pointer to Silk encoder state               */
-    opus_int32                  TargetRate_bps                  /* I    Target max bitrate (bps)                    */
+    oac_int32                  TargetRate_bps                  /* I    Target max bitrate (bps)                    */
 );
 
 /***************/
@@ -155,86 +155,86 @@ opus_int silk_control_SNR(
 /* Encode quantization indices of excitation */
 void silk_encode_pulses(
     ec_enc                      *psRangeEnc,                    /* I/O  compressor data structure                   */
-    const opus_int              signalType,                     /* I    Signal type                                 */
-    const opus_int              quantOffsetType,                /* I    quantOffsetType                             */
-    opus_int8                   pulses[],                       /* I    quantization indices                        */
-    const opus_int              frame_length                    /* I    Frame length                                */
+    const oac_int              signalType,                     /* I    Signal type                                 */
+    const oac_int              quantOffsetType,                /* I    quantOffsetType                             */
+    oac_int8                   pulses[],                       /* I    quantization indices                        */
+    const oac_int              frame_length                    /* I    Frame length                                */
 );
 
 /* Shell encoder, operates on one shell code frame of 16 pulses */
 void silk_shell_encoder(
     ec_enc                      *psRangeEnc,                    /* I/O  compressor data structure                   */
-    const opus_int              *pulses0                        /* I    data: nonnegative pulse amplitudes          */
+    const oac_int              *pulses0                        /* I    data: nonnegative pulse amplitudes          */
 );
 
 /* Shell decoder, operates on one shell code frame of 16 pulses */
 void silk_shell_decoder(
-    opus_int16                  *pulses0,                       /* O    data: nonnegative pulse amplitudes          */
+    oac_int16                  *pulses0,                       /* O    data: nonnegative pulse amplitudes          */
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
-    const opus_int              pulses4                         /* I    number of pulses per pulse-subframe         */
+    const oac_int              pulses4                         /* I    number of pulses per pulse-subframe         */
 );
 
 /* Gain scalar quantization with hysteresis, uniform on log scale */
 void silk_gains_quant(
-    opus_int8                   ind[ MAX_NB_SUBFR ],            /* O    gain indices                                */
-    opus_int32                  gain_Q16[ MAX_NB_SUBFR ],       /* I/O  gains (quantized out)                       */
-    opus_int8                   *prev_ind,                      /* I/O  last index in previous frame                */
-    const opus_int              conditional,                    /* I    first gain is delta coded if 1              */
-    const opus_int              nb_subfr                        /* I    number of subframes                         */
+    oac_int8                   ind[ MAX_NB_SUBFR ],            /* O    gain indices                                */
+    oac_int32                  gain_Q16[ MAX_NB_SUBFR ],       /* I/O  gains (quantized out)                       */
+    oac_int8                   *prev_ind,                      /* I/O  last index in previous frame                */
+    const oac_int              conditional,                    /* I    first gain is delta coded if 1              */
+    const oac_int              nb_subfr                        /* I    number of subframes                         */
 );
 
 /* Gains scalar dequantization, uniform on log scale */
 void silk_gains_dequant(
-    opus_int32                  gain_Q16[ MAX_NB_SUBFR ],       /* O    quantized gains                             */
-    const opus_int8             ind[ MAX_NB_SUBFR ],            /* I    gain indices                                */
-    opus_int8                   *prev_ind,                      /* I/O  last index in previous frame                */
-    const opus_int              conditional,                    /* I    first gain is delta coded if 1              */
-    const opus_int              nb_subfr                        /* I    number of subframes                          */
+    oac_int32                  gain_Q16[ MAX_NB_SUBFR ],       /* O    quantized gains                             */
+    const oac_int8             ind[ MAX_NB_SUBFR ],            /* I    gain indices                                */
+    oac_int8                   *prev_ind,                      /* I/O  last index in previous frame                */
+    const oac_int              conditional,                    /* I    first gain is delta coded if 1              */
+    const oac_int              nb_subfr                        /* I    number of subframes                          */
 );
 
 /* Compute unique identifier of gain indices vector */
-opus_int32 silk_gains_ID(                                       /* O    returns unique identifier of gains          */
-    const opus_int8             ind[ MAX_NB_SUBFR ],            /* I    gain indices                                */
-    const opus_int              nb_subfr                        /* I    number of subframes                         */
+oac_int32 silk_gains_ID(                                       /* O    returns unique identifier of gains          */
+    const oac_int8             ind[ MAX_NB_SUBFR ],            /* I    gain indices                                */
+    const oac_int              nb_subfr                        /* I    number of subframes                         */
 );
 
 /* Interpolate two vectors */
 void silk_interpolate(
-    opus_int16                  xi[ MAX_LPC_ORDER ],            /* O    interpolated vector                         */
-    const opus_int16            x0[ MAX_LPC_ORDER ],            /* I    first vector                                */
-    const opus_int16            x1[ MAX_LPC_ORDER ],            /* I    second vector                               */
-    const opus_int              ifact_Q2,                       /* I    interp. factor, weight on 2nd vector        */
-    const opus_int              d                               /* I    number of parameters                        */
+    oac_int16                  xi[ MAX_LPC_ORDER ],            /* O    interpolated vector                         */
+    const oac_int16            x0[ MAX_LPC_ORDER ],            /* I    first vector                                */
+    const oac_int16            x1[ MAX_LPC_ORDER ],            /* I    second vector                               */
+    const oac_int              ifact_Q2,                       /* I    interp. factor, weight on 2nd vector        */
+    const oac_int              d                               /* I    number of parameters                        */
 );
 
 /* LTP tap quantizer */
 void silk_quant_LTP_gains(
-    opus_int16                  B_Q14[ MAX_NB_SUBFR * LTP_ORDER ],          /* O    Quantized LTP gains             */
-    opus_int8                   cbk_index[ MAX_NB_SUBFR ],                  /* O    Codebook Index                  */
-    opus_int8                   *periodicity_index,                         /* O    Periodicity Index               */
-    opus_int32                  *sum_gain_dB_Q7,                            /* I/O  Cumulative max prediction gain  */
-    opus_int                    *pred_gain_dB_Q7,                           /* O    LTP prediction gain             */
-    const opus_int32            XX_Q17[ MAX_NB_SUBFR*LTP_ORDER*LTP_ORDER ], /* I    Correlation matrix in Q18       */
-    const opus_int32            xX_Q17[ MAX_NB_SUBFR*LTP_ORDER ],           /* I    Correlation vector in Q18       */
-    const opus_int              subfr_len,                                  /* I    Number of samples per subframe  */
-    const opus_int              nb_subfr,                                   /* I    Number of subframes             */
+    oac_int16                  B_Q14[ MAX_NB_SUBFR * LTP_ORDER ],          /* O    Quantized LTP gains             */
+    oac_int8                   cbk_index[ MAX_NB_SUBFR ],                  /* O    Codebook Index                  */
+    oac_int8                   *periodicity_index,                         /* O    Periodicity Index               */
+    oac_int32                  *sum_gain_dB_Q7,                            /* I/O  Cumulative max prediction gain  */
+    oac_int                    *pred_gain_dB_Q7,                           /* O    LTP prediction gain             */
+    const oac_int32            XX_Q17[ MAX_NB_SUBFR*LTP_ORDER*LTP_ORDER ], /* I    Correlation matrix in Q18       */
+    const oac_int32            xX_Q17[ MAX_NB_SUBFR*LTP_ORDER ],           /* I    Correlation vector in Q18       */
+    const oac_int              subfr_len,                                  /* I    Number of samples per subframe  */
+    const oac_int              nb_subfr,                                   /* I    Number of subframes             */
     int                         arch                                        /* I    Run-time architecture           */
 );
 
 /* Entropy constrained matrix-weighted VQ, for a single input data vector */
 void silk_VQ_WMat_EC_c(
-    opus_int8                   *ind,                           /* O    index of best codebook vector               */
-    opus_int32                  *res_nrg_Q15,                   /* O    best residual energy                        */
-    opus_int32                  *rate_dist_Q8,                  /* O    best total bitrate                          */
-    opus_int                    *gain_Q7,                       /* O    sum of absolute LTP coefficients            */
-    const opus_int32            *XX_Q17,                        /* I    correlation matrix                          */
-    const opus_int32            *xX_Q17,                        /* I    correlation vector                          */
-    const opus_int8             *cb_Q7,                         /* I    codebook                                    */
-    const opus_uint8            *cb_gain_Q7,                    /* I    codebook effective gain                     */
-    const opus_uint8            *cl_Q5,                         /* I    code length for each codebook vector        */
-    const opus_int              subfr_len,                      /* I    number of samples per subframe              */
-    const opus_int32            max_gain_Q7,                    /* I    maximum sum of absolute LTP coefficients    */
-    const opus_int              L                               /* I    number of vectors in codebook               */
+    oac_int8                   *ind,                           /* O    index of best codebook vector               */
+    oac_int32                  *res_nrg_Q15,                   /* O    best residual energy                        */
+    oac_int32                  *rate_dist_Q8,                  /* O    best total bitrate                          */
+    oac_int                    *gain_Q7,                       /* O    sum of absolute LTP coefficients            */
+    const oac_int32            *XX_Q17,                        /* I    correlation matrix                          */
+    const oac_int32            *xX_Q17,                        /* I    correlation vector                          */
+    const oac_int8             *cb_Q7,                         /* I    codebook                                    */
+    const oac_uint8            *cb_gain_Q7,                    /* I    codebook effective gain                     */
+    const oac_uint8            *cl_Q5,                         /* I    code length for each codebook vector        */
+    const oac_int              subfr_len,                      /* I    number of samples per subframe              */
+    const oac_int32            max_gain_Q7,                    /* I    maximum sum of absolute LTP coefficients    */
+    const oac_int              L                               /* I    number of vectors in codebook               */
 );
 
 #if !defined(OVERRIDE_silk_VQ_WMat_EC)
@@ -250,18 +250,18 @@ void silk_NSQ_c(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const opus_int16            x16[],                                        /* I    Input                           */
-    opus_int8                   pulses[],                                     /* O    Quantized pulse signal          */
-    const opus_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const opus_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const opus_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const opus_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const opus_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const opus_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const opus_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const opus_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const opus_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const opus_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
+    const oac_int16            x16[],                                        /* I    Input                           */
+    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
+    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
+    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
+    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
+    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
+    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
+    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
+    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
+    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
+    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
 );
 
 #if !defined(OVERRIDE_silk_NSQ)
@@ -276,18 +276,18 @@ void silk_NSQ_del_dec_c(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const opus_int16            x16[],                                        /* I    Input                           */
-    opus_int8                   pulses[],                                     /* O    Quantized pulse signal          */
-    const opus_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const opus_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const opus_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const opus_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const opus_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const opus_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const opus_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const opus_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const opus_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const opus_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
+    const oac_int16            x16[],                                        /* I    Input                           */
+    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
+    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
+    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
+    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
+    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
+    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
+    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
+    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
+    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
+    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
 );
 
 #if !defined(OVERRIDE_silk_NSQ_del_dec)
@@ -301,14 +301,14 @@ void silk_NSQ_del_dec_c(
 /* Silk VAD */
 /************/
 /* Initialize the Silk VAD */
-opus_int silk_VAD_Init(                                         /* O    Return value, 0 if success                  */
+oac_int silk_VAD_Init(                                         /* O    Return value, 0 if success                  */
     silk_VAD_state              *psSilk_VAD                     /* I/O  Pointer to Silk VAD state                   */
 );
 
 /* Get speech activity level in Q8 */
-opus_int silk_VAD_GetSA_Q8_c(                                   /* O    Return value, 0 if success                  */
+oac_int silk_VAD_GetSA_Q8_c(                                   /* O    Return value, 0 if success                  */
     silk_encoder_state          *psEncC,                        /* I/O  Encoder state                               */
-    const opus_int16            pIn[]                           /* I    PCM input                                   */
+    const oac_int16            pIn[]                           /* I    PCM input                                   */
 );
 
 #if !defined(OVERRIDE_silk_VAD_GetSA_Q8)
@@ -320,8 +320,8 @@ opus_int silk_VAD_GetSA_Q8_c(                                   /* O    Return v
 /* Start by setting transition_frame_no = 1;                */
 void silk_LP_variable_cutoff(
     silk_LP_state               *psLP,                          /* I/O  LP filter state                             */
-    opus_int16                  *frame,                         /* I/O  Low-pass filtered output signal             */
-    const opus_int              frame_length                    /* I    Frame length                                */
+    oac_int16                  *frame,                         /* I/O  Low-pass filtered output signal             */
+    const oac_int              frame_length                    /* I    Frame length                                */
 );
 
 /******************/
@@ -330,90 +330,90 @@ void silk_LP_variable_cutoff(
 /* Limit, stabilize, convert and quantize NLSFs */
 void silk_process_NLSFs(
     silk_encoder_state          *psEncC,                            /* I/O  Encoder state                               */
-    opus_int16                  PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ], /* O    Prediction coefficients                     */
-    opus_int16                  pNLSF_Q15[         MAX_LPC_ORDER ], /* I/O  Normalized LSFs (quant out) (0 - (2^15-1))  */
-    const opus_int16            prev_NLSFq_Q15[    MAX_LPC_ORDER ]  /* I    Previous Normalized LSFs (0 - (2^15-1))     */
+    oac_int16                  PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ], /* O    Prediction coefficients                     */
+    oac_int16                  pNLSF_Q15[         MAX_LPC_ORDER ], /* I/O  Normalized LSFs (quant out) (0 - (2^15-1))  */
+    const oac_int16            prev_NLSFq_Q15[    MAX_LPC_ORDER ]  /* I    Previous Normalized LSFs (0 - (2^15-1))     */
 );
 
-opus_int32 silk_NLSF_encode(                                    /* O    Returns RD value in Q25                     */
-          opus_int8             *NLSFIndices,                   /* I    Codebook path vector [ LPC_ORDER + 1 ]      */
-          opus_int16            *pNLSF_Q15,                     /* I/O  Quantized NLSF vector [ LPC_ORDER ]         */
+oac_int32 silk_NLSF_encode(                                    /* O    Returns RD value in Q25                     */
+          oac_int8             *NLSFIndices,                   /* I    Codebook path vector [ LPC_ORDER + 1 ]      */
+          oac_int16            *pNLSF_Q15,                     /* I/O  Quantized NLSF vector [ LPC_ORDER ]         */
     const silk_NLSF_CB_struct   *psNLSF_CB,                     /* I    Codebook object                             */
-    const opus_int16            *pW_QW,                         /* I    NLSF weight vector [ LPC_ORDER ]            */
-    const opus_int              NLSF_mu_Q20,                    /* I    Rate weight for the RD optimization         */
-    const opus_int              nSurvivors,                     /* I    Max survivors after first stage             */
-    const opus_int              signalType                      /* I    Signal type: 0/1/2                          */
+    const oac_int16            *pW_QW,                         /* I    NLSF weight vector [ LPC_ORDER ]            */
+    const oac_int              NLSF_mu_Q20,                    /* I    Rate weight for the RD optimization         */
+    const oac_int              nSurvivors,                     /* I    Max survivors after first stage             */
+    const oac_int              signalType                      /* I    Signal type: 0/1/2                          */
 );
 
 /* Compute quantization errors for an LPC_order element input vector for a VQ codebook */
 void silk_NLSF_VQ(
-    opus_int32                  err_Q26[],                      /* O    Quantization errors [K]                     */
-    const opus_int16            in_Q15[],                       /* I    Input vectors to be quantized [LPC_order]   */
-    const opus_uint8            pCB_Q8[],                       /* I    Codebook vectors [K*LPC_order]              */
-    const opus_int16            pWght_Q9[],                     /* I    Codebook weights [K*LPC_order]              */
-    const opus_int              K,                              /* I    Number of codebook vectors                  */
-    const opus_int              LPC_order                       /* I    Number of LPCs                              */
+    oac_int32                  err_Q26[],                      /* O    Quantization errors [K]                     */
+    const oac_int16            in_Q15[],                       /* I    Input vectors to be quantized [LPC_order]   */
+    const oac_uint8            pCB_Q8[],                       /* I    Codebook vectors [K*LPC_order]              */
+    const oac_int16            pWght_Q9[],                     /* I    Codebook weights [K*LPC_order]              */
+    const oac_int              K,                              /* I    Number of codebook vectors                  */
+    const oac_int              LPC_order                       /* I    Number of LPCs                              */
 );
 
 /* Delayed-decision quantizer for NLSF residuals */
-opus_int32 silk_NLSF_del_dec_quant(                             /* O    Returns RD value in Q25                     */
-    opus_int8                   indices[],                      /* O    Quantization indices [ order ]              */
-    const opus_int16            x_Q10[],                        /* I    Input [ order ]                             */
-    const opus_int16            w_Q5[],                         /* I    Weights [ order ]                           */
-    const opus_uint8            pred_coef_Q8[],                 /* I    Backward predictor coefs [ order ]          */
-    const opus_int16            ec_ix[],                        /* I    Indices to entropy coding tables [ order ]  */
-    const opus_uint8            ec_rates_Q5[],                  /* I    Rates []                                    */
-    const opus_int              quant_step_size_Q16,            /* I    Quantization step size                      */
-    const opus_int16            inv_quant_step_size_Q6,         /* I    Inverse quantization step size              */
-    const opus_int32            mu_Q20,                         /* I    R/D tradeoff                                */
-    const opus_int16            order                           /* I    Number of input values                      */
+oac_int32 silk_NLSF_del_dec_quant(                             /* O    Returns RD value in Q25                     */
+    oac_int8                   indices[],                      /* O    Quantization indices [ order ]              */
+    const oac_int16            x_Q10[],                        /* I    Input [ order ]                             */
+    const oac_int16            w_Q5[],                         /* I    Weights [ order ]                           */
+    const oac_uint8            pred_coef_Q8[],                 /* I    Backward predictor coefs [ order ]          */
+    const oac_int16            ec_ix[],                        /* I    Indices to entropy coding tables [ order ]  */
+    const oac_uint8            ec_rates_Q5[],                  /* I    Rates []                                    */
+    const oac_int              quant_step_size_Q16,            /* I    Quantization step size                      */
+    const oac_int16            inv_quant_step_size_Q6,         /* I    Inverse quantization step size              */
+    const oac_int32            mu_Q20,                         /* I    R/D tradeoff                                */
+    const oac_int16            order                           /* I    Number of input values                      */
 );
 
 /* Unpack predictor values and indices for entropy coding tables */
 void silk_NLSF_unpack(
-          opus_int16            ec_ix[],                        /* O    Indices to entropy tables [ LPC_ORDER ]     */
-          opus_uint8            pred_Q8[],                      /* O    LSF predictor [ LPC_ORDER ]                 */
+          oac_int16            ec_ix[],                        /* O    Indices to entropy tables [ LPC_ORDER ]     */
+          oac_uint8            pred_Q8[],                      /* O    LSF predictor [ LPC_ORDER ]                 */
     const silk_NLSF_CB_struct   *psNLSF_CB,                     /* I    Codebook object                             */
-    const opus_int              CB1_index                       /* I    Index of vector in first LSF codebook       */
+    const oac_int              CB1_index                       /* I    Index of vector in first LSF codebook       */
 );
 
 /***********************/
 /* NLSF vector decoder */
 /***********************/
 void silk_NLSF_decode(
-          opus_int16            *pNLSF_Q15,                     /* O    Quantized NLSF vector [ LPC_ORDER ]         */
-          opus_int8             *NLSFIndices,                   /* I    Codebook path vector [ LPC_ORDER + 1 ]      */
+          oac_int16            *pNLSF_Q15,                     /* O    Quantized NLSF vector [ LPC_ORDER ]         */
+          oac_int8             *NLSFIndices,                   /* I    Codebook path vector [ LPC_ORDER + 1 ]      */
     const silk_NLSF_CB_struct   *psNLSF_CB                      /* I    Codebook object                             */
 );
 
 /****************************************************/
 /* Decoder Functions                                */
 /****************************************************/
-opus_int silk_reset_decoder(
+oac_int silk_reset_decoder(
     silk_decoder_state          *psDec                          /* I/O  Decoder state pointer                       */
 );
 
-opus_int silk_init_decoder(
+oac_int silk_init_decoder(
     silk_decoder_state          *psDec                          /* I/O  Decoder state pointer                       */
 );
 
 /* Set decoder sampling rate */
-opus_int silk_decoder_set_fs(
+oac_int silk_decoder_set_fs(
     silk_decoder_state          *psDec,                         /* I/O  Decoder state pointer                       */
-    opus_int                    fs_kHz,                         /* I    Sampling frequency (kHz)                    */
-    opus_int32                  fs_API_Hz                       /* I    API Sampling frequency (Hz)                 */
+    oac_int                    fs_kHz,                         /* I    Sampling frequency (kHz)                    */
+    oac_int32                  fs_API_Hz                       /* I    API Sampling frequency (Hz)                 */
 );
 
 /****************/
 /* Decode frame */
 /****************/
-opus_int silk_decode_frame(
+oac_int silk_decode_frame(
     silk_decoder_state          *psDec,                         /* I/O  Pointer to Silk decoder state               */
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
-    opus_int16                  pOut[],                         /* O    Pointer to output speech frame              */
-    opus_int32                  *pN,                            /* O    Pointer to size of output frame             */
-    opus_int                    lostFlag,                       /* I    0: no loss, 1 loss, 2 decode fec            */
-    opus_int                    condCoding,                     /* I    The type of conditional coding to use       */
+    oac_int16                  pOut[],                         /* O    Pointer to output speech frame              */
+    oac_int32                  *pN,                            /* O    Pointer to size of output frame             */
+    oac_int                    lostFlag,                       /* I    0: no loss, 1 loss, 2 decode fec            */
+    oac_int                    condCoding,                     /* I    The type of conditional coding to use       */
 #ifdef ENABLE_DEEP_PLC
     LPCNetPLCState              *lpcnet,
 #endif
@@ -427,34 +427,34 @@ opus_int silk_decode_frame(
 void silk_decode_indices(
     silk_decoder_state          *psDec,                         /* I/O  State                                       */
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
-    opus_int                    FrameIndex,                     /* I    Frame number                                */
-    opus_int                    decode_LBRR,                    /* I    Flag indicating LBRR data is being decoded  */
-    opus_int                    condCoding                      /* I    The type of conditional coding to use       */
+    oac_int                    FrameIndex,                     /* I    Frame number                                */
+    oac_int                    decode_LBRR,                    /* I    Flag indicating LBRR data is being decoded  */
+    oac_int                    condCoding                      /* I    The type of conditional coding to use       */
 );
 
 /* Decode parameters from payload */
 void silk_decode_parameters(
     silk_decoder_state          *psDec,                         /* I/O  State                                       */
     silk_decoder_control        *psDecCtrl,                     /* I/O  Decoder control                             */
-    opus_int                    condCoding                      /* I    The type of conditional coding to use       */
+    oac_int                    condCoding                      /* I    The type of conditional coding to use       */
 );
 
 /* Core decoder. Performs inverse NSQ operation LTP + LPC */
 void silk_decode_core(
     silk_decoder_state          *psDec,                         /* I/O  Decoder state                               */
     silk_decoder_control        *psDecCtrl,                     /* I    Decoder control                             */
-    opus_int16                  xq[],                           /* O    Decoded speech                              */
-    const opus_int16            pulses[ MAX_FRAME_LENGTH ],     /* I    Pulse signal                                */
+    oac_int16                  xq[],                           /* O    Decoded speech                              */
+    const oac_int16            pulses[ MAX_FRAME_LENGTH ],     /* I    Pulse signal                                */
     int                         arch                            /* I    Run-time architecture                       */
 );
 
 /* Decode quantization indices of excitation (Shell coding) */
 void silk_decode_pulses(
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
-    opus_int16                  pulses[],                       /* O    Excitation signal                           */
-    const opus_int              signalType,                     /* I    Sigtype                                     */
-    const opus_int              quantOffsetType,                /* I    quantOffsetType                             */
-    const opus_int              frame_length                    /* I    Frame length                                */
+    oac_int16                  pulses[],                       /* O    Excitation signal                           */
+    const oac_int              signalType,                     /* I    Sigtype                                     */
+    const oac_int              quantOffsetType,                /* I    quantOffsetType                             */
+    const oac_int              frame_length                    /* I    Frame length                                */
 );
 
 /******************/
@@ -470,17 +470,17 @@ void silk_CNG_Reset(
 void silk_CNG(
     silk_decoder_state          *psDec,                         /* I/O  Decoder state                               */
     silk_decoder_control        *psDecCtrl,                     /* I/O  Decoder control                             */
-    opus_int16                  frame[],                        /* I/O  Signal                                      */
-    opus_int                    length                          /* I    Length of residual                          */
+    oac_int16                  frame[],                        /* I/O  Signal                                      */
+    oac_int                    length                          /* I    Length of residual                          */
 );
 
 /* Encoding of various parameters */
 void silk_encode_indices(
     silk_encoder_state          *psEncC,                        /* I/O  Encoder state                               */
     ec_enc                      *psRangeEnc,                    /* I/O  Compressor data structure                   */
-    opus_int                    FrameIndex,                     /* I    Frame number                                */
-    opus_int                    encode_LBRR,                    /* I    Flag indicating LBRR data is being encoded  */
-    opus_int                    condCoding                      /* I    The type of conditional coding to use       */
+    oac_int                    FrameIndex,                     /* I    Frame number                                */
+    oac_int                    encode_LBRR,                    /* I    Flag indicating LBRR data is being encoded  */
+    oac_int                    condCoding                      /* I    The type of conditional coding to use       */
 );
 
 #endif
diff --git a/silk/meson.build b/silk/meson.build
index 35d955784..20f6e3932 100644
--- a/silk/meson.build
+++ b/silk/meson.build
@@ -24,15 +24,15 @@ else
   silk_sources += silk_sources_float
 endif
 
-silk_includes = [opus_includes, include_directories('float', 'fixed')]
+silk_includes = [oac_includes, include_directories('float', 'fixed')]
 silk_static_libs = []
 
-if host_cpu_family in ['x86', 'x86_64'] and opus_conf.has('OPUS_HAVE_RTCD')
+if host_cpu_family in ['x86', 'x86_64'] and oac_conf.has('OAC_HAVE_RTCD')
   silk_sources +=  sources['SILK_SOURCES_X86_RTCD']
 endif
 
 if host_cpu_family in ['arm', 'aarch64'] and have_arm_intrinsics_or_asm
-  if opus_conf.has('OPUS_HAVE_RTCD')
+  if oac_conf.has('OAC_HAVE_RTCD')
     silk_sources +=  sources['SILK_SOURCES_ARM_RTCD']
   endif
 endif
@@ -48,7 +48,7 @@ foreach intr_name : ['sse4_1', 'avx2', 'neon_intr']
     intr_sources += get_variable('silk_sources_float_' + intr_name)
   endif
 
-  intr_args = get_variable('opus_@0@_args'.format(intr_name), [])
+  intr_args = get_variable('oac_@0@_args'.format(intr_name), [])
   silk_static_libs += static_library('silk_' + intr_name, intr_sources,
       c_args: intr_args,
       include_directories: silk_includes,
@@ -60,7 +60,7 @@ if host_machine.system() == 'windows'
   silk_c_args += ['-DDLL_EXPORT']
 endif
 
-silk_lib = static_library('opus-silk',
+silk_lib = static_library('oac-silk',
   silk_sources,
   c_args: silk_c_args,
   include_directories: silk_includes,
diff --git a/silk/mips/NSQ_mips.h b/silk/mips/NSQ_mips.h
index fd691ee33..9fb82bfad 100644
--- a/silk/mips/NSQ_mips.h
+++ b/silk/mips/NSQ_mips.h
@@ -56,8 +56,8 @@ static inline long long MIPS_MADD(long long acc, int a, int b) {
     return acc + (long long)a * b;
 }
 
-static inline opus_val32 MIPS_EXTR_R(long long acc, int shift) {
-    return (opus_val32)((acc + (1 << shift) / 2) >> shift);
+static inline oac_val32 MIPS_EXTR_R(long long acc, int shift) {
+    return (oac_val32)((acc + (1 << shift) / 2) >> shift);
 }
 
 #define OVERRIDE_silk_noise_shape_quantizer_short_prediction
@@ -67,9 +67,9 @@ static inline opus_val32 MIPS_EXTR_R(long long acc, int shift) {
 
 #if defined(OVERRIDE_silk_noise_shape_quantizer_short_prediction)
 
-static OPUS_INLINE opus_int32 silk_noise_shape_quantizer_short_prediction_mips(const opus_int32 *buf32, const opus_int16 *coef16, opus_int order)
+static OAC_INLINE oac_int32 silk_noise_shape_quantizer_short_prediction_mips(const oac_int32 *buf32, const oac_int16 *coef16, oac_int order)
 {
-    opus_int64 out;
+    oac_int64 out;
     silk_assert( order == 10 || order == 16 );
 
     out = MIPS_MULT(      buf32[  0 ], coef16[ 0 ] );
@@ -103,11 +103,11 @@ static OPUS_INLINE opus_int32 silk_noise_shape_quantizer_short_prediction_mips(c
 
 #if defined(OVERRIDE_silk_NSQ_noise_shape_feedback_loop)
 
-static OPUS_INLINE opus_int32 silk_NSQ_noise_shape_feedback_loop_mips(const opus_int32 *data0, opus_int32 *data1, const opus_int16 *coef, opus_int order)
+static OAC_INLINE oac_int32 silk_NSQ_noise_shape_feedback_loop_mips(const oac_int32 *data0, oac_int32 *data1, const oac_int16 *coef, oac_int order)
 {
-    opus_int32 out;
-    opus_int32 tmp1, tmp2;
-    opus_int j;
+    oac_int32 out;
+    oac_int32 tmp1, tmp2;
+    oac_int j;
 
     tmp2 = data0[0];
     tmp1 = data1[0];
diff --git a/silk/mips/macros_mipsr1.h b/silk/mips/macros_mipsr1.h
index 7b126421f..94d366ec1 100644
--- a/silk/mips/macros_mipsr1.h
+++ b/silk/mips/macros_mipsr1.h
@@ -38,7 +38,7 @@ static inline int silk_SMULWB(int a, int b)
     long long ac;
     int c;
 
-    ac = __builtin_mips_mult(a, (opus_int32)(opus_int16)b);
+    ac = __builtin_mips_mult(a, (oac_int32)(oac_int16)b);
     c = __builtin_mips_extr_w(ac, 16);
 
     return c;
@@ -82,7 +82,7 @@ static inline int silk_SMULWB(int a, int b)
     return ac >> 32;
 }
 
-/* a32 + (b32 * (opus_int32)((opus_int16)(c32))) >> 16 output have to be 32bit int */
+/* a32 + (b32 * (oac_int32)((oac_int16)(c32))) >> 16 output have to be 32bit int */
 #undef silk_SMLAWB
 static inline int silk_SMLAWB(int a, int b, int c)
 {
@@ -95,23 +95,23 @@ static inline int silk_SMLAWB(int a, int b, int c)
 
 #if defined (__mips_isa_rev) /* MIPS32r1+ */
 
-static inline int mips_clz(opus_uint32 x)
+static inline int mips_clz(oac_uint32 x)
 {
     return x ? __builtin_clz(x) : 32;
 }
 
 #define OVERRIDE_silk_CLZ16
-static inline opus_int32 silk_CLZ16(opus_int16 in16)
+static inline oac_int32 silk_CLZ16(oac_int16 in16)
 {
     int re32;
-    opus_uint32 in32 = (opus_uint16)in16;
+    oac_uint32 in32 = (oac_uint16)in16;
     re32 = mips_clz(in32);
     re32 -= 16;
     return re32;
 }
 
 #define OVERRIDE_silk_CLZ32
-static inline opus_int32 silk_CLZ32(opus_int32 in32)
+static inline oac_int32 silk_CLZ32(oac_int32 in32)
 {
     int re32;
     re32 = mips_clz(in32);
diff --git a/silk/pitch_est_defines.h b/silk/pitch_est_defines.h
index ee844623d..715991179 100644
--- a/silk/pitch_est_defines.h
+++ b/silk/pitch_est_defines.h
@@ -74,14 +74,14 @@ POSSIBILITY OF SUCH DAMAGE.
 #define SILK_PE_MAX_COMPLEX         2
 
 /* Tables for 20 ms frames */
-extern const opus_int8 silk_CB_lags_stage2[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE2_EXT ];
-extern const opus_int8 silk_CB_lags_stage3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ];
-extern const opus_int8 silk_Lag_range_stage3[ SILK_PE_MAX_COMPLEX + 1 ] [ PE_MAX_NB_SUBFR ][ 2 ];
-extern const opus_int8 silk_nb_cbk_searchs_stage3[ SILK_PE_MAX_COMPLEX + 1 ];
+extern const oac_int8 silk_CB_lags_stage2[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE2_EXT ];
+extern const oac_int8 silk_CB_lags_stage3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ];
+extern const oac_int8 silk_Lag_range_stage3[ SILK_PE_MAX_COMPLEX + 1 ] [ PE_MAX_NB_SUBFR ][ 2 ];
+extern const oac_int8 silk_nb_cbk_searchs_stage3[ SILK_PE_MAX_COMPLEX + 1 ];
 
 /* Tables for 10 ms frames */
-extern const opus_int8 silk_CB_lags_stage2_10_ms[ PE_MAX_NB_SUBFR >> 1][ 3 ];
-extern const opus_int8 silk_CB_lags_stage3_10_ms[ PE_MAX_NB_SUBFR >> 1 ][ 12 ];
-extern const opus_int8 silk_Lag_range_stage3_10_ms[ PE_MAX_NB_SUBFR >> 1 ][ 2 ];
+extern const oac_int8 silk_CB_lags_stage2_10_ms[ PE_MAX_NB_SUBFR >> 1][ 3 ];
+extern const oac_int8 silk_CB_lags_stage3_10_ms[ PE_MAX_NB_SUBFR >> 1 ][ 12 ];
+extern const oac_int8 silk_Lag_range_stage3_10_ms[ PE_MAX_NB_SUBFR >> 1 ][ 2 ];
 
 #endif
diff --git a/silk/pitch_est_tables.c b/silk/pitch_est_tables.c
index 81a8bacac..4804b8739 100644
--- a/silk/pitch_est_tables.c
+++ b/silk/pitch_est_tables.c
@@ -32,25 +32,25 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "typedef.h"
 #include "pitch_est_defines.h"
 
-const opus_int8 silk_CB_lags_stage2_10_ms[ PE_MAX_NB_SUBFR >> 1][ PE_NB_CBKS_STAGE2_10MS ] =
+const oac_int8 silk_CB_lags_stage2_10_ms[ PE_MAX_NB_SUBFR >> 1][ PE_NB_CBKS_STAGE2_10MS ] =
 {
     {0, 1, 0},
     {0, 0, 1}
 };
 
-const opus_int8 silk_CB_lags_stage3_10_ms[ PE_MAX_NB_SUBFR >> 1 ][ PE_NB_CBKS_STAGE3_10MS ] =
+const oac_int8 silk_CB_lags_stage3_10_ms[ PE_MAX_NB_SUBFR >> 1 ][ PE_NB_CBKS_STAGE3_10MS ] =
 {
     { 0, 0, 1,-1, 1,-1, 2,-2, 2,-2, 3,-3},
     { 0, 1, 0, 1,-1, 2,-1, 2,-2, 3,-2, 3}
 };
 
-const opus_int8 silk_Lag_range_stage3_10_ms[ PE_MAX_NB_SUBFR >> 1 ][ 2 ] =
+const oac_int8 silk_Lag_range_stage3_10_ms[ PE_MAX_NB_SUBFR >> 1 ][ 2 ] =
 {
     {-3, 7},
     {-2, 7}
 };
 
-const opus_int8 silk_CB_lags_stage2[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE2_EXT ] =
+const oac_int8 silk_CB_lags_stage2[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE2_EXT ] =
 {
     {0, 2,-1,-1,-1, 0, 0, 1, 1, 0, 1},
     {0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0},
@@ -58,7 +58,7 @@ const opus_int8 silk_CB_lags_stage2[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE2_EXT ]
     {0,-1, 2, 1, 0, 1, 1, 0, 0,-1,-1}
 };
 
-const opus_int8 silk_CB_lags_stage3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ] =
+const oac_int8 silk_CB_lags_stage3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ] =
 {
     {0, 0, 1,-1, 0, 1,-1, 0,-1, 1,-2, 2,-2,-2, 2,-3, 2, 3,-3,-4, 3,-4, 4, 4,-5, 5,-6,-5, 6,-7, 6, 5, 8,-9},
     {0, 0, 1, 0, 0, 0, 0, 0, 0, 0,-1, 1, 0, 0, 1,-1, 0, 1,-1,-1, 1,-1, 2, 1,-1, 2,-2,-2, 2,-2, 2, 2, 3,-3},
@@ -66,7 +66,7 @@ const opus_int8 silk_CB_lags_stage3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ]
     {0, 1, 0, 0, 1, 0, 1,-1, 2,-1, 2,-1, 2, 3,-2, 3,-2,-2, 4, 4,-3, 5,-3,-4, 6,-4, 6, 5,-5, 8,-6,-5,-7, 9}
 };
 
-const opus_int8 silk_Lag_range_stage3[ SILK_PE_MAX_COMPLEX + 1 ] [ PE_MAX_NB_SUBFR ][ 2 ] =
+const oac_int8 silk_Lag_range_stage3[ SILK_PE_MAX_COMPLEX + 1 ] [ PE_MAX_NB_SUBFR ][ 2 ] =
 {
     /* Lags to search for low number of stage3 cbks */
     {
@@ -91,7 +91,7 @@ const opus_int8 silk_Lag_range_stage3[ SILK_PE_MAX_COMPLEX + 1 ] [ PE_MAX_NB_SUB
     }
 };
 
-const opus_int8 silk_nb_cbk_searchs_stage3[ SILK_PE_MAX_COMPLEX + 1 ] =
+const oac_int8 silk_nb_cbk_searchs_stage3[ SILK_PE_MAX_COMPLEX + 1 ] =
 {
     PE_NB_CBKS_STAGE3_MIN,
     PE_NB_CBKS_STAGE3_MID,
diff --git a/silk/process_NLSFs.c b/silk/process_NLSFs.c
index d13080954..4fffd94d2 100644
--- a/silk/process_NLSFs.c
+++ b/silk/process_NLSFs.c
@@ -34,17 +34,17 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Limit, stabilize, convert and quantize NLSFs */
 void silk_process_NLSFs(
     silk_encoder_state          *psEncC,                            /* I/O  Encoder state                               */
-    opus_int16                  PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ], /* O    Prediction coefficients                     */
-    opus_int16                  pNLSF_Q15[         MAX_LPC_ORDER ], /* I/O  Normalized LSFs (quant out) (0 - (2^15-1))  */
-    const opus_int16            prev_NLSFq_Q15[    MAX_LPC_ORDER ]  /* I    Previous Normalized LSFs (0 - (2^15-1))     */
+    oac_int16                  PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ], /* O    Prediction coefficients                     */
+    oac_int16                  pNLSF_Q15[         MAX_LPC_ORDER ], /* I/O  Normalized LSFs (quant out) (0 - (2^15-1))  */
+    const oac_int16            prev_NLSFq_Q15[    MAX_LPC_ORDER ]  /* I    Previous Normalized LSFs (0 - (2^15-1))     */
 )
 {
-    opus_int     i, doInterpolate;
-    opus_int     NLSF_mu_Q20;
-    opus_int16   i_sqr_Q15;
-    opus_int16   pNLSF0_temp_Q15[ MAX_LPC_ORDER ];
-    opus_int16   pNLSFW_QW[ MAX_LPC_ORDER ];
-    opus_int16   pNLSFW0_temp_QW[ MAX_LPC_ORDER ];
+    oac_int     i, doInterpolate;
+    oac_int     NLSF_mu_Q20;
+    oac_int16   i_sqr_Q15;
+    oac_int16   pNLSF0_temp_Q15[ MAX_LPC_ORDER ];
+    oac_int16   pNLSFW_QW[ MAX_LPC_ORDER ];
+    oac_int16   pNLSFW0_temp_QW[ MAX_LPC_ORDER ];
 
     silk_assert( psEncC->speech_activity_Q8 >=   0 );
     silk_assert( psEncC->speech_activity_Q8 <= SILK_FIX_CONST( 1.0, 8 ) );
@@ -102,6 +102,6 @@ void silk_process_NLSFs(
     } else {
         /* Copy LPC coefficients for first half from second half */
         celt_assert( psEncC->predictLPCOrder <= MAX_LPC_ORDER );
-        silk_memcpy( PredCoef_Q12[ 0 ], PredCoef_Q12[ 1 ], psEncC->predictLPCOrder * sizeof( opus_int16 ) );
+        silk_memcpy( PredCoef_Q12[ 0 ], PredCoef_Q12[ 1 ], psEncC->predictLPCOrder * sizeof( oac_int16 ) );
     }
 }
diff --git a/silk/quant_LTP_gains.c b/silk/quant_LTP_gains.c
index d6b8eff8d..ad74eb2c8 100644
--- a/silk/quant_LTP_gains.c
+++ b/silk/quant_LTP_gains.c
@@ -33,27 +33,27 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "tuning_parameters.h"
 
 void silk_quant_LTP_gains(
-    opus_int16                  B_Q14[ MAX_NB_SUBFR * LTP_ORDER ],          /* O    Quantized LTP gains             */
-    opus_int8                   cbk_index[ MAX_NB_SUBFR ],                  /* O    Codebook Index                  */
-    opus_int8                   *periodicity_index,                         /* O    Periodicity Index               */
-    opus_int32                  *sum_log_gain_Q7,                           /* I/O  Cumulative max prediction gain  */
-    opus_int                    *pred_gain_dB_Q7,                           /* O    LTP prediction gain             */
-    const opus_int32            XX_Q17[ MAX_NB_SUBFR*LTP_ORDER*LTP_ORDER ], /* I    Correlation matrix in Q18       */
-    const opus_int32            xX_Q17[ MAX_NB_SUBFR*LTP_ORDER ],           /* I    Correlation vector in Q18       */
-    const opus_int              subfr_len,                                  /* I    Number of samples per subframe  */
-    const opus_int              nb_subfr,                                   /* I    Number of subframes             */
+    oac_int16                  B_Q14[ MAX_NB_SUBFR * LTP_ORDER ],          /* O    Quantized LTP gains             */
+    oac_int8                   cbk_index[ MAX_NB_SUBFR ],                  /* O    Codebook Index                  */
+    oac_int8                   *periodicity_index,                         /* O    Periodicity Index               */
+    oac_int32                  *sum_log_gain_Q7,                           /* I/O  Cumulative max prediction gain  */
+    oac_int                    *pred_gain_dB_Q7,                           /* O    LTP prediction gain             */
+    const oac_int32            XX_Q17[ MAX_NB_SUBFR*LTP_ORDER*LTP_ORDER ], /* I    Correlation matrix in Q18       */
+    const oac_int32            xX_Q17[ MAX_NB_SUBFR*LTP_ORDER ],           /* I    Correlation vector in Q18       */
+    const oac_int              subfr_len,                                  /* I    Number of samples per subframe  */
+    const oac_int              nb_subfr,                                   /* I    Number of subframes             */
     int                         arch                                        /* I    Run-time architecture           */
 )
 {
-    opus_int             j, k, cbk_size;
-    opus_int8            temp_idx[ MAX_NB_SUBFR ];
-    const opus_uint8     *cl_ptr_Q5;
-    const opus_int8      *cbk_ptr_Q7;
-    const opus_uint8     *cbk_gain_ptr_Q7;
-    const opus_int32     *XX_Q17_ptr, *xX_Q17_ptr;
-    opus_int32           res_nrg_Q15_subfr, res_nrg_Q15, rate_dist_Q7_subfr, rate_dist_Q7, min_rate_dist_Q7;
-    opus_int32           sum_log_gain_tmp_Q7, best_sum_log_gain_Q7, max_gain_Q7;
-    opus_int             gain_Q7;
+    oac_int             j, k, cbk_size;
+    oac_int8            temp_idx[ MAX_NB_SUBFR ];
+    const oac_uint8     *cl_ptr_Q5;
+    const oac_int8      *cbk_ptr_Q7;
+    const oac_uint8     *cbk_gain_ptr_Q7;
+    const oac_int32     *XX_Q17_ptr, *xX_Q17_ptr;
+    oac_int32           res_nrg_Q15_subfr, res_nrg_Q15, rate_dist_Q7_subfr, rate_dist_Q7, min_rate_dist_Q7;
+    oac_int32           sum_log_gain_tmp_Q7, best_sum_log_gain_Q7, max_gain_Q7;
+    oac_int             gain_Q7;
 
     /***************************************************/
     /* iterate over different codebooks with different */
@@ -64,7 +64,7 @@ void silk_quant_LTP_gains(
     for( k = 0; k < 3; k++ ) {
         /* Safety margin for pitch gain control, to take into account factors
            such as state rescaling/rewhitening. */
-        opus_int32 gain_safety = SILK_FIX_CONST( 0.4, 7 );
+        oac_int32 gain_safety = SILK_FIX_CONST( 0.4, 7 );
 
         cl_ptr_Q5  = silk_LTP_gain_BITS_Q5_ptrs[ k ];
         cbk_ptr_Q7 = silk_LTP_vq_ptrs_Q7[        k ];
@@ -108,8 +108,8 @@ void silk_quant_LTP_gains(
 
         if( rate_dist_Q7 <= min_rate_dist_Q7 ) {
             min_rate_dist_Q7 = rate_dist_Q7;
-            *periodicity_index = (opus_int8)k;
-            silk_memcpy( cbk_index, temp_idx, nb_subfr * sizeof( opus_int8 ) );
+            *periodicity_index = (oac_int8)k;
+            silk_memcpy( cbk_index, temp_idx, nb_subfr * sizeof( oac_int8 ) );
             best_sum_log_gain_Q7 = sum_log_gain_tmp_Q7;
         }
     }
@@ -128,5 +128,5 @@ void silk_quant_LTP_gains(
     }
 
     *sum_log_gain_Q7 = best_sum_log_gain_Q7;
-    *pred_gain_dB_Q7 = (opus_int)silk_SMULBB( -3, silk_lin2log( res_nrg_Q15 ) - ( 15 << 7 ) );
+    *pred_gain_dB_Q7 = (oac_int)silk_SMULBB( -3, silk_lin2log( res_nrg_Q15 ) - ( 15 << 7 ) );
 }
diff --git a/silk/resampler.c b/silk/resampler.c
index 2fe6eaac1..2e16d9eb2 100644
--- a/silk/resampler.c
+++ b/silk/resampler.c
@@ -50,7 +50,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "resampler_private.h"
 
 /* Tables with delay compensation values to equalize total delay for different modes */
-static const opus_int8 delay_matrix_enc[ 6 ][ 3 ] = {
+static const oac_int8 delay_matrix_enc[ 6 ][ 3 ] = {
 /* in  \ out  8  12  16 */
 /*  8 */   {  6,  0,  3 },
 /* 12 */   {  0,  7,  3 },
@@ -60,7 +60,7 @@ static const opus_int8 delay_matrix_enc[ 6 ][ 3 ] = {
 /* 96 */   {  0,  0,  44 }
 };
 
-static const opus_int8 delay_matrix_dec[ 3 ][ 6 ] = {
+static const oac_int8 delay_matrix_dec[ 3 ][ 6 ] = {
 /* in  \ out  8  12  16  24  48  96*/
 /*  8 */   {  4,  0,  2,  0,  0,  0 },
 /* 12 */   {  0,  9,  4,  7,  4,  4 },
@@ -76,14 +76,14 @@ static const opus_int8 delay_matrix_dec[ 3 ][ 6 ] = {
 #define USE_silk_resampler_private_down_FIR         (3)
 
 /* Initialize/reset the resampler state for a given pair of input/output sampling rates */
-opus_int silk_resampler_init(
+oac_int silk_resampler_init(
     silk_resampler_state_struct *S,                 /* I/O  Resampler state                                             */
-    opus_int32                  Fs_Hz_in,           /* I    Input sampling rate (Hz)                                    */
-    opus_int32                  Fs_Hz_out,          /* I    Output sampling rate (Hz)                                   */
-    opus_int                    forEnc              /* I    If 1: encoder; if 0: decoder                                */
+    oac_int32                  Fs_Hz_in,           /* I    Input sampling rate (Hz)                                    */
+    oac_int32                  Fs_Hz_out,          /* I    Output sampling rate (Hz)                                   */
+    oac_int                    forEnc              /* I    If 1: encoder; if 0: decoder                                */
 )
 {
-    opus_int up2x;
+    oac_int up2x;
 
     /* Clear state */
     silk_memset( S, 0, sizeof( silk_resampler_state_struct ) );
@@ -180,14 +180,14 @@ opus_int silk_resampler_init(
 
 /* Resampler: convert from one sampling rate to another */
 /* Input and output sampling rate are at most 48000 Hz  */
-opus_int silk_resampler(
+oac_int silk_resampler(
     silk_resampler_state_struct *S,                 /* I/O  Resampler state                                             */
-    opus_int16                  out[],              /* O    Output signal                                               */
-    const opus_int16            in[],               /* I    Input signal                                                */
-    opus_int32                  inLen               /* I    Number of input samples                                     */
+    oac_int16                  out[],              /* O    Output signal                                               */
+    const oac_int16            in[],               /* I    Input signal                                                */
+    oac_int32                  inLen               /* I    Number of input samples                                     */
 )
 {
-    opus_int nSamples;
+    oac_int nSamples;
 
     /* Need at least 1 ms of input data */
     celt_assert( inLen >= S->Fs_in_kHz );
@@ -197,7 +197,7 @@ opus_int silk_resampler(
     nSamples = S->Fs_in_kHz - S->inputDelay;
 
     /* Copy to delay buffer */
-    silk_memcpy( &S->delayBuf[ S->inputDelay ], in, nSamples * sizeof( opus_int16 ) );
+    silk_memcpy( &S->delayBuf[ S->inputDelay ], in, nSamples * sizeof( oac_int16 ) );
 
     switch( S->resampler_function ) {
         case USE_silk_resampler_private_up2_HQ_wrapper:
@@ -213,12 +213,12 @@ opus_int silk_resampler(
             silk_resampler_private_down_FIR( S, &out[ S->Fs_out_kHz ], &in[ nSamples ], inLen - S->Fs_in_kHz );
             break;
         default:
-            silk_memcpy( out, S->delayBuf, S->Fs_in_kHz * sizeof( opus_int16 ) );
-            silk_memcpy( &out[ S->Fs_out_kHz ], &in[ nSamples ], ( inLen - S->Fs_in_kHz ) * sizeof( opus_int16 ) );
+            silk_memcpy( out, S->delayBuf, S->Fs_in_kHz * sizeof( oac_int16 ) );
+            silk_memcpy( &out[ S->Fs_out_kHz ], &in[ nSamples ], ( inLen - S->Fs_in_kHz ) * sizeof( oac_int16 ) );
     }
 
     /* Copy to delay buffer */
-    silk_memcpy( S->delayBuf, &in[ inLen - S->inputDelay ], S->inputDelay * sizeof( opus_int16 ) );
+    silk_memcpy( S->delayBuf, &in[ inLen - S->inputDelay ], S->inputDelay * sizeof( oac_int16 ) );
 
     return 0;
 }
diff --git a/silk/resampler_down2.c b/silk/resampler_down2.c
index febe4956d..d1e64791a 100644
--- a/silk/resampler_down2.c
+++ b/silk/resampler_down2.c
@@ -34,14 +34,14 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Downsample by a factor 2 */
 void silk_resampler_down2(
-    opus_int32                  *S,                 /* I/O  State vector [ 2 ]                                          */
-    opus_int16                  *out,               /* O    Output signal [ floor(len/2) ]                              */
-    const opus_int16            *in,                /* I    Input signal [ len ]                                        */
-    opus_int32                  inLen               /* I    Number of input samples                                     */
+    oac_int32                  *S,                 /* I/O  State vector [ 2 ]                                          */
+    oac_int16                  *out,               /* O    Output signal [ floor(len/2) ]                              */
+    const oac_int16            *in,                /* I    Input signal [ len ]                                        */
+    oac_int32                  inLen               /* I    Number of input samples                                     */
 )
 {
-    opus_int32 k, len2 = silk_RSHIFT32( inLen, 1 );
-    opus_int32 in32, out32, Y, X;
+    oac_int32 k, len2 = silk_RSHIFT32( inLen, 1 );
+    oac_int32 in32, out32, Y, X;
 
     celt_assert( silk_resampler_down2_0 > 0 );
     celt_assert( silk_resampler_down2_1 < 0 );
@@ -49,7 +49,7 @@ void silk_resampler_down2(
     /* Internal variables and state are in Q10 format */
     for( k = 0; k < len2; k++ ) {
         /* Convert to Q10 */
-        in32 = silk_LSHIFT( (opus_int32)in[ 2 * k ], 10 );
+        in32 = silk_LSHIFT( (oac_int32)in[ 2 * k ], 10 );
 
         /* All-pass section for even input sample */
         Y      = silk_SUB32( in32, S[ 0 ] );
@@ -58,7 +58,7 @@ void silk_resampler_down2(
         S[ 0 ] = silk_ADD32( in32, X );
 
         /* Convert to Q10 */
-        in32 = silk_LSHIFT( (opus_int32)in[ 2 * k + 1 ], 10 );
+        in32 = silk_LSHIFT( (oac_int32)in[ 2 * k + 1 ], 10 );
 
         /* All-pass section for odd input sample, and add to output of previous section */
         Y      = silk_SUB32( in32, S[ 1 ] );
@@ -68,6 +68,6 @@ void silk_resampler_down2(
         S[ 1 ] = silk_ADD32( in32, X );
 
         /* Add, convert back to int16 and store to output */
-        out[ k ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( out32, 11 ) );
+        out[ k ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( out32, 11 ) );
     }
 }
diff --git a/silk/resampler_down2_3.c b/silk/resampler_down2_3.c
index 4342614dc..453c739a8 100644
--- a/silk/resampler_down2_3.c
+++ b/silk/resampler_down2_3.c
@@ -37,21 +37,21 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Downsample by a factor 2/3, low quality */
 void silk_resampler_down2_3(
-    opus_int32                  *S,                 /* I/O  State vector [ 6 ]                                          */
-    opus_int16                  *out,               /* O    Output signal [ floor(2*inLen/3) ]                          */
-    const opus_int16            *in,                /* I    Input signal [ inLen ]                                      */
-    opus_int32                  inLen               /* I    Number of input samples                                     */
+    oac_int32                  *S,                 /* I/O  State vector [ 6 ]                                          */
+    oac_int16                  *out,               /* O    Output signal [ floor(2*inLen/3) ]                          */
+    const oac_int16            *in,                /* I    Input signal [ inLen ]                                      */
+    oac_int32                  inLen               /* I    Number of input samples                                     */
 )
 {
-    opus_int32 nSamplesIn, counter, res_Q6;
-    VARDECL( opus_int32, buf );
-    opus_int32 *buf_ptr;
+    oac_int32 nSamplesIn, counter, res_Q6;
+    VARDECL( oac_int32, buf );
+    oac_int32 *buf_ptr;
     SAVE_STACK;
 
-    ALLOC( buf, RESAMPLER_MAX_BATCH_SIZE_IN + ORDER_FIR, opus_int32 );
+    ALLOC( buf, RESAMPLER_MAX_BATCH_SIZE_IN + ORDER_FIR, oac_int32 );
 
     /* Copy buffered samples to start of buffer */
-    silk_memcpy( buf, S, ORDER_FIR * sizeof( opus_int32 ) );
+    silk_memcpy( buf, S, ORDER_FIR * sizeof( oac_int32 ) );
 
     /* Iterate over blocks of frameSizeIn input samples */
     while( 1 ) {
@@ -72,7 +72,7 @@ void silk_resampler_down2_3(
             res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 3 ], silk_Resampler_2_3_COEFS_LQ[ 4 ] );
 
             /* Scale down, saturate and store in output array */
-            *out++ = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q6, 6 ) );
+            *out++ = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q6, 6 ) );
 
             res_Q6 = silk_SMULWB(         buf_ptr[ 1 ], silk_Resampler_2_3_COEFS_LQ[ 4 ] );
             res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 2 ], silk_Resampler_2_3_COEFS_LQ[ 5 ] );
@@ -80,7 +80,7 @@ void silk_resampler_down2_3(
             res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 4 ], silk_Resampler_2_3_COEFS_LQ[ 2 ] );
 
             /* Scale down, saturate and store in output array */
-            *out++ = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q6, 6 ) );
+            *out++ = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q6, 6 ) );
 
             buf_ptr += 3;
             counter -= 3;
@@ -91,13 +91,13 @@ void silk_resampler_down2_3(
 
         if( inLen > 0 ) {
             /* More iterations to do; copy last part of filtered signal to beginning of buffer */
-            silk_memcpy( buf, &buf[ nSamplesIn ], ORDER_FIR * sizeof( opus_int32 ) );
+            silk_memcpy( buf, &buf[ nSamplesIn ], ORDER_FIR * sizeof( oac_int32 ) );
         } else {
             break;
         }
     }
 
     /* Copy last part of filtered signal to the state for the next call */
-    silk_memcpy( S, &buf[ nSamplesIn ], ORDER_FIR * sizeof( opus_int32 ) );
+    silk_memcpy( S, &buf[ nSamplesIn ], ORDER_FIR * sizeof( oac_int32 ) );
     RESTORE_STACK;
 }
diff --git a/silk/resampler_private.h b/silk/resampler_private.h
index 1b7d35389..57de3c562 100644
--- a/silk/resampler_private.h
+++ b/silk/resampler_private.h
@@ -40,42 +40,42 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Description: Hybrid IIR/FIR polyphase implementation of resampling */
 void silk_resampler_private_IIR_FIR(
     void                            *SS,            /* I/O  Resampler state             */
-    opus_int16                      out[],          /* O    Output signal               */
-    const opus_int16                in[],           /* I    Input signal                */
-    opus_int32                      inLen           /* I    Number of input samples     */
+    oac_int16                      out[],          /* O    Output signal               */
+    const oac_int16                in[],           /* I    Input signal                */
+    oac_int32                      inLen           /* I    Number of input samples     */
 );
 
 /* Description: Hybrid IIR/FIR polyphase implementation of resampling */
 void silk_resampler_private_down_FIR(
     void                            *SS,            /* I/O  Resampler state             */
-    opus_int16                      out[],          /* O    Output signal               */
-    const opus_int16                in[],           /* I    Input signal                */
-    opus_int32                      inLen           /* I    Number of input samples     */
+    oac_int16                      out[],          /* O    Output signal               */
+    const oac_int16                in[],           /* I    Input signal                */
+    oac_int32                      inLen           /* I    Number of input samples     */
 );
 
 /* Upsample by a factor 2, high quality */
 void silk_resampler_private_up2_HQ_wrapper(
     void                            *SS,            /* I/O  Resampler state (unused)    */
-    opus_int16                      *out,           /* O    Output signal [ 2 * len ]   */
-    const opus_int16                *in,            /* I    Input signal [ len ]        */
-    opus_int32                      len             /* I    Number of input samples     */
+    oac_int16                      *out,           /* O    Output signal [ 2 * len ]   */
+    const oac_int16                *in,            /* I    Input signal [ len ]        */
+    oac_int32                      len             /* I    Number of input samples     */
 );
 
 /* Upsample by a factor 2, high quality */
 void silk_resampler_private_up2_HQ(
-    opus_int32                      *S,             /* I/O  Resampler state [ 6 ]       */
-    opus_int16                      *out,           /* O    Output signal [ 2 * len ]   */
-    const opus_int16                *in,            /* I    Input signal [ len ]        */
-    opus_int32                      len             /* I    Number of input samples     */
+    oac_int32                      *S,             /* I/O  Resampler state [ 6 ]       */
+    oac_int16                      *out,           /* O    Output signal [ 2 * len ]   */
+    const oac_int16                *in,            /* I    Input signal [ len ]        */
+    oac_int32                      len             /* I    Number of input samples     */
 );
 
 /* Second order AR filter */
 void silk_resampler_private_AR2(
-    opus_int32                      S[],            /* I/O  State vector [ 2 ]          */
-    opus_int32                      out_Q8[],       /* O    Output signal               */
-    const opus_int16                in[],           /* I    Input signal                */
-    const opus_int16                A_Q14[],        /* I    AR coefficients, Q14        */
-    opus_int32                      len             /* I    Signal length               */
+    oac_int32                      S[],            /* I/O  State vector [ 2 ]          */
+    oac_int32                      out_Q8[],       /* O    Output signal               */
+    const oac_int16                in[],           /* I    Input signal                */
+    const oac_int16                A_Q14[],        /* I    AR coefficients, Q14        */
+    oac_int32                      len             /* I    Signal length               */
 );
 
 #endif /* SILK_RESAMPLER_PRIVATE_H */
diff --git a/silk/resampler_private_AR2.c b/silk/resampler_private_AR2.c
index 73523d94a..57556a72a 100644
--- a/silk/resampler_private_AR2.c
+++ b/silk/resampler_private_AR2.c
@@ -34,18 +34,18 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Second order AR filter with single delay elements */
 void silk_resampler_private_AR2(
-    opus_int32                      S[],            /* I/O  State vector [ 2 ]          */
-    opus_int32                      out_Q8[],       /* O    Output signal               */
-    const opus_int16                in[],           /* I    Input signal                */
-    const opus_int16                A_Q14[],        /* I    AR coefficients, Q14        */
-    opus_int32                      len             /* I    Signal length               */
+    oac_int32                      S[],            /* I/O  State vector [ 2 ]          */
+    oac_int32                      out_Q8[],       /* O    Output signal               */
+    const oac_int16                in[],           /* I    Input signal                */
+    const oac_int16                A_Q14[],        /* I    AR coefficients, Q14        */
+    oac_int32                      len             /* I    Signal length               */
 )
 {
-    opus_int32    k;
-    opus_int32    out32;
+    oac_int32    k;
+    oac_int32    out32;
 
     for( k = 0; k < len; k++ ) {
-        out32       = silk_ADD_LSHIFT32( S[ 0 ], (opus_int32)in[ k ], 8 );
+        out32       = silk_ADD_LSHIFT32( S[ 0 ], (oac_int32)in[ k ], 8 );
         out_Q8[ k ] = out32;
         out32       = silk_LSHIFT( out32, 2 );
         S[ 0 ]      = silk_SMLAWB( S[ 1 ], out32, A_Q14[ 0 ] );
diff --git a/silk/resampler_private_IIR_FIR.c b/silk/resampler_private_IIR_FIR.c
index 6b2b3a2e1..923402e7c 100644
--- a/silk/resampler_private_IIR_FIR.c
+++ b/silk/resampler_private_IIR_FIR.c
@@ -33,16 +33,16 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "resampler_private.h"
 #include "stack_alloc.h"
 
-static OPUS_INLINE opus_int16 *silk_resampler_private_IIR_FIR_INTERPOL(
-    opus_int16  *out,
-    opus_int16  *buf,
-    opus_int32  max_index_Q16,
-    opus_int32  index_increment_Q16
+static OAC_INLINE oac_int16 *silk_resampler_private_IIR_FIR_INTERPOL(
+    oac_int16  *out,
+    oac_int16  *buf,
+    oac_int32  max_index_Q16,
+    oac_int32  index_increment_Q16
 )
 {
-    opus_int32 index_Q16, res_Q15;
-    opus_int16 *buf_ptr;
-    opus_int32 table_index;
+    oac_int32 index_Q16, res_Q15;
+    oac_int16 *buf_ptr;
+    oac_int32 table_index;
 
     /* Interpolate upsampled signal and store in output array */
     for( index_Q16 = 0; index_Q16 < max_index_Q16; index_Q16 += index_increment_Q16 ) {
@@ -57,28 +57,28 @@ static OPUS_INLINE opus_int16 *silk_resampler_private_IIR_FIR_INTERPOL(
         res_Q15 = silk_SMLABB( res_Q15, buf_ptr[ 5 ], silk_resampler_frac_FIR_12[ 11 - table_index ][ 2 ] );
         res_Q15 = silk_SMLABB( res_Q15, buf_ptr[ 6 ], silk_resampler_frac_FIR_12[ 11 - table_index ][ 1 ] );
         res_Q15 = silk_SMLABB( res_Q15, buf_ptr[ 7 ], silk_resampler_frac_FIR_12[ 11 - table_index ][ 0 ] );
-        *out++ = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q15, 15 ) );
+        *out++ = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q15, 15 ) );
     }
     return out;
 }
 /* Upsample using a combination of allpass-based 2x upsampling and FIR interpolation */
 void silk_resampler_private_IIR_FIR(
     void                            *SS,            /* I/O  Resampler state             */
-    opus_int16                      out[],          /* O    Output signal               */
-    const opus_int16                in[],           /* I    Input signal                */
-    opus_int32                      inLen           /* I    Number of input samples     */
+    oac_int16                      out[],          /* O    Output signal               */
+    const oac_int16                in[],           /* I    Input signal                */
+    oac_int32                      inLen           /* I    Number of input samples     */
 )
 {
     silk_resampler_state_struct *S = (silk_resampler_state_struct *)SS;
-    opus_int32 nSamplesIn;
-    opus_int32 max_index_Q16, index_increment_Q16;
-    VARDECL( opus_int16, buf );
+    oac_int32 nSamplesIn;
+    oac_int32 max_index_Q16, index_increment_Q16;
+    VARDECL( oac_int16, buf );
     SAVE_STACK;
 
-    ALLOC( buf, 2 * S->batchSize + RESAMPLER_ORDER_FIR_12, opus_int16 );
+    ALLOC( buf, 2 * S->batchSize + RESAMPLER_ORDER_FIR_12, oac_int16 );
 
     /* Copy buffered samples to start of buffer */
-    silk_memcpy( buf, S->sFIR.i16, RESAMPLER_ORDER_FIR_12 * sizeof( opus_int16 ) );
+    silk_memcpy( buf, S->sFIR.i16, RESAMPLER_ORDER_FIR_12 * sizeof( oac_int16 ) );
 
     /* Iterate over blocks of frameSizeIn input samples */
     index_increment_Q16 = S->invRatio_Q16;
@@ -95,13 +95,13 @@ void silk_resampler_private_IIR_FIR(
 
         if( inLen > 0 ) {
             /* More iterations to do; copy last part of filtered signal to beginning of buffer */
-            silk_memcpy( buf, &buf[ nSamplesIn << 1 ], RESAMPLER_ORDER_FIR_12 * sizeof( opus_int16 ) );
+            silk_memcpy( buf, &buf[ nSamplesIn << 1 ], RESAMPLER_ORDER_FIR_12 * sizeof( oac_int16 ) );
         } else {
             break;
         }
     }
 
     /* Copy last part of filtered signal to the state for the next call */
-    silk_memcpy( S->sFIR.i16, &buf[ nSamplesIn << 1 ], RESAMPLER_ORDER_FIR_12 * sizeof( opus_int16 ) );
+    silk_memcpy( S->sFIR.i16, &buf[ nSamplesIn << 1 ], RESAMPLER_ORDER_FIR_12 * sizeof( oac_int16 ) );
     RESTORE_STACK;
 }
diff --git a/silk/resampler_private_down_FIR.c b/silk/resampler_private_down_FIR.c
index 3e8735a35..dc8c834a0 100644
--- a/silk/resampler_private_down_FIR.c
+++ b/silk/resampler_private_down_FIR.c
@@ -33,20 +33,20 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "resampler_private.h"
 #include "stack_alloc.h"
 
-static OPUS_INLINE opus_int16 *silk_resampler_private_down_FIR_INTERPOL(
-    opus_int16          *out,
-    opus_int32          *buf,
-    const opus_int16    *FIR_Coefs,
-    opus_int            FIR_Order,
-    opus_int            FIR_Fracs,
-    opus_int32          max_index_Q16,
-    opus_int32          index_increment_Q16
+static OAC_INLINE oac_int16 *silk_resampler_private_down_FIR_INTERPOL(
+    oac_int16          *out,
+    oac_int32          *buf,
+    const oac_int16    *FIR_Coefs,
+    oac_int            FIR_Order,
+    oac_int            FIR_Fracs,
+    oac_int32          max_index_Q16,
+    oac_int32          index_increment_Q16
 )
 {
-    opus_int32 index_Q16, res_Q6;
-    opus_int32 *buf_ptr;
-    opus_int32 interpol_ind;
-    const opus_int16 *interpol_ptr;
+    oac_int32 index_Q16, res_Q6;
+    oac_int32 *buf_ptr;
+    oac_int32 interpol_ind;
+    const oac_int16 *interpol_ptr;
 
     switch( FIR_Order ) {
         case RESAMPLER_DOWN_ORDER_FIR0:
@@ -80,7 +80,7 @@ static OPUS_INLINE opus_int16 *silk_resampler_private_down_FIR_INTERPOL(
                 res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[  9 ], interpol_ptr[ 8 ] );
 
                 /* Scale down, saturate and store in output array */
-                *out++ = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q6, 6 ) );
+                *out++ = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q6, 6 ) );
             }
             break;
         case RESAMPLER_DOWN_ORDER_FIR1:
@@ -103,7 +103,7 @@ static OPUS_INLINE opus_int16 *silk_resampler_private_down_FIR_INTERPOL(
                 res_Q6 = silk_SMLAWB( res_Q6, silk_ADD32( buf_ptr[ 11 ], buf_ptr[ 12 ] ), FIR_Coefs[ 11 ] );
 
                 /* Scale down, saturate and store in output array */
-                *out++ = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q6, 6 ) );
+                *out++ = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q6, 6 ) );
             }
             break;
         case RESAMPLER_DOWN_ORDER_FIR2:
@@ -132,7 +132,7 @@ static OPUS_INLINE opus_int16 *silk_resampler_private_down_FIR_INTERPOL(
                 res_Q6 = silk_SMLAWB( res_Q6, silk_ADD32( buf_ptr[ 17 ], buf_ptr[ 18 ] ), FIR_Coefs[ 17 ] );
 
                 /* Scale down, saturate and store in output array */
-                *out++ = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q6, 6 ) );
+                *out++ = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q6, 6 ) );
             }
             break;
         default:
@@ -144,22 +144,22 @@ static OPUS_INLINE opus_int16 *silk_resampler_private_down_FIR_INTERPOL(
 /* Resample with a 2nd order AR filter followed by FIR interpolation */
 void silk_resampler_private_down_FIR(
     void                            *SS,            /* I/O  Resampler state             */
-    opus_int16                      out[],          /* O    Output signal               */
-    const opus_int16                in[],           /* I    Input signal                */
-    opus_int32                      inLen           /* I    Number of input samples     */
+    oac_int16                      out[],          /* O    Output signal               */
+    const oac_int16                in[],           /* I    Input signal                */
+    oac_int32                      inLen           /* I    Number of input samples     */
 )
 {
     silk_resampler_state_struct *S = (silk_resampler_state_struct *)SS;
-    opus_int32 nSamplesIn;
-    opus_int32 max_index_Q16, index_increment_Q16;
-    VARDECL( opus_int32, buf );
-    const opus_int16 *FIR_Coefs;
+    oac_int32 nSamplesIn;
+    oac_int32 max_index_Q16, index_increment_Q16;
+    VARDECL( oac_int32, buf );
+    const oac_int16 *FIR_Coefs;
     SAVE_STACK;
 
-    ALLOC( buf, S->batchSize + S->FIR_Order, opus_int32 );
+    ALLOC( buf, S->batchSize + S->FIR_Order, oac_int32 );
 
     /* Copy buffered samples to start of buffer */
-    silk_memcpy( buf, S->sFIR.i32, S->FIR_Order * sizeof( opus_int32 ) );
+    silk_memcpy( buf, S->sFIR.i32, S->FIR_Order * sizeof( oac_int32 ) );
 
     FIR_Coefs = &S->Coefs[ 2 ];
 
@@ -182,13 +182,13 @@ void silk_resampler_private_down_FIR(
 
         if( inLen > 1 ) {
             /* More iterations to do; copy last part of filtered signal to beginning of buffer */
-            silk_memcpy( buf, &buf[ nSamplesIn ], S->FIR_Order * sizeof( opus_int32 ) );
+            silk_memcpy( buf, &buf[ nSamplesIn ], S->FIR_Order * sizeof( oac_int32 ) );
         } else {
             break;
         }
     }
 
     /* Copy last part of filtered signal to the state for the next call */
-    silk_memcpy( S->sFIR.i32, &buf[ nSamplesIn ], S->FIR_Order * sizeof( opus_int32 ) );
+    silk_memcpy( S->sFIR.i32, &buf[ nSamplesIn ], S->FIR_Order * sizeof( oac_int32 ) );
     RESTORE_STACK;
 }
diff --git a/silk/resampler_private_up2_HQ.c b/silk/resampler_private_up2_HQ.c
index c7ec8de36..f19746225 100644
--- a/silk/resampler_private_up2_HQ.c
+++ b/silk/resampler_private_up2_HQ.c
@@ -36,14 +36,14 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Uses 2nd order allpass filters for the 2x upsampling, followed by a      */
 /* notch filter just above Nyquist.                                         */
 void silk_resampler_private_up2_HQ(
-    opus_int32                      *S,             /* I/O  Resampler state [ 6 ]       */
-    opus_int16                      *out,           /* O    Output signal [ 2 * len ]   */
-    const opus_int16                *in,            /* I    Input signal [ len ]        */
-    opus_int32                      len             /* I    Number of input samples     */
+    oac_int32                      *S,             /* I/O  Resampler state [ 6 ]       */
+    oac_int16                      *out,           /* O    Output signal [ 2 * len ]   */
+    const oac_int16                *in,            /* I    Input signal [ len ]        */
+    oac_int32                      len             /* I    Number of input samples     */
 )
 {
-    opus_int32 k;
-    opus_int32 in32, out32_1, out32_2, Y, X;
+    oac_int32 k;
+    oac_int32 in32, out32_1, out32_2, Y, X;
 
     silk_assert( silk_resampler_up2_hq_0[ 0 ] > 0 );
     silk_assert( silk_resampler_up2_hq_0[ 1 ] > 0 );
@@ -55,7 +55,7 @@ void silk_resampler_private_up2_HQ(
     /* Internal variables and state are in Q10 format */
     for( k = 0; k < len; k++ ) {
         /* Convert to Q10 */
-        in32 = silk_LSHIFT( (opus_int32)in[ k ], 10 );
+        in32 = silk_LSHIFT( (oac_int32)in[ k ], 10 );
 
         /* First all-pass section for even output sample */
         Y       = silk_SUB32( in32, S[ 0 ] );
@@ -76,7 +76,7 @@ void silk_resampler_private_up2_HQ(
         S[ 2 ]  = silk_ADD32( out32_2, X );
 
         /* Apply gain in Q15, convert back to int16 and store to output */
-        out[ 2 * k ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( out32_1, 10 ) );
+        out[ 2 * k ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( out32_1, 10 ) );
 
         /* First all-pass section for odd output sample */
         Y       = silk_SUB32( in32, S[ 3 ] );
@@ -97,15 +97,15 @@ void silk_resampler_private_up2_HQ(
         S[ 5 ]  = silk_ADD32( out32_2, X );
 
         /* Apply gain in Q15, convert back to int16 and store to output */
-        out[ 2 * k + 1 ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( out32_1, 10 ) );
+        out[ 2 * k + 1 ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( out32_1, 10 ) );
     }
 }
 
 void silk_resampler_private_up2_HQ_wrapper(
     void                            *SS,            /* I/O  Resampler state (unused)    */
-    opus_int16                      *out,           /* O    Output signal [ 2 * len ]   */
-    const opus_int16                *in,            /* I    Input signal [ len ]        */
-    opus_int32                      len             /* I    Number of input samples     */
+    oac_int16                      *out,           /* O    Output signal [ 2 * len ]   */
+    const oac_int16                *in,            /* I    Input signal [ len ]        */
+    oac_int32                      len             /* I    Number of input samples     */
 )
 {
     silk_resampler_state_struct *S = (silk_resampler_state_struct *)SS;
diff --git a/silk/resampler_rom.c b/silk/resampler_rom.c
index 5e6b04476..717e244de 100644
--- a/silk/resampler_rom.c
+++ b/silk/resampler_rom.c
@@ -37,50 +37,50 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Matlab code for the notch filter coefficients: */
 /* B = [1, 0.147, 1];  A = [1, 0.107, 0.89]; G = 0.93; freqz(G * B, A, 2^14, 16e3); axis([0, 8000, -10, 1]) */
 /* fprintf('\t%6d, %6d, %6d, %6d\n', round(B(2)*2^16), round(-A(2)*2^16), round((1-A(3))*2^16), round(G*2^15)) */
-/* const opus_int16 silk_resampler_up2_hq_notch[ 4 ] = { 9634,  -7012,   7209,  30474 }; */
+/* const oac_int16 silk_resampler_up2_hq_notch[ 4 ] = { 9634,  -7012,   7209,  30474 }; */
 
 /* Tables with IIR and FIR coefficients for fractional downsamplers (123 Words) */
-silk_DWORD_ALIGN const opus_int16 silk_Resampler_3_4_COEFS[ 2 + 3 * RESAMPLER_DOWN_ORDER_FIR0 / 2 ] = {
+silk_DWORD_ALIGN const oac_int16 silk_Resampler_3_4_COEFS[ 2 + 3 * RESAMPLER_DOWN_ORDER_FIR0 / 2 ] = {
     -20694, -13867,
        -49,     64,     17,   -157,    353,   -496,    163,  11047,  22205,
        -39,      6,     91,   -170,    186,     23,   -896,   6336,  19928,
        -19,    -36,    102,    -89,    -24,    328,   -951,   2568,  15909,
 };
 
-silk_DWORD_ALIGN const opus_int16 silk_Resampler_2_3_COEFS[ 2 + 2 * RESAMPLER_DOWN_ORDER_FIR0 / 2 ] = {
+silk_DWORD_ALIGN const oac_int16 silk_Resampler_2_3_COEFS[ 2 + 2 * RESAMPLER_DOWN_ORDER_FIR0 / 2 ] = {
     -14457, -14019,
         64,    128,   -122,     36,    310,   -768,    584,   9267,  17733,
         12,    128,     18,   -142,    288,   -117,   -865,   4123,  14459,
 };
 
-silk_DWORD_ALIGN const opus_int16 silk_Resampler_1_2_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR1 / 2 ] = {
+silk_DWORD_ALIGN const oac_int16 silk_Resampler_1_2_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR1 / 2 ] = {
        616, -14323,
        -10,     39,     58,    -46,    -84,    120,    184,   -315,   -541,   1284,   5380,   9024,
 };
 
-silk_DWORD_ALIGN const opus_int16 silk_Resampler_1_3_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR2 / 2 ] = {
+silk_DWORD_ALIGN const oac_int16 silk_Resampler_1_3_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR2 / 2 ] = {
      16102, -15162,
        -13,      0,     20,     26,      5,    -31,    -43,     -4,     65,     90,      7,   -157,   -248,    -44,    593,   1583,   2612,   3271,
 };
 
-silk_DWORD_ALIGN const opus_int16 silk_Resampler_1_4_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR2 / 2 ] = {
+silk_DWORD_ALIGN const oac_int16 silk_Resampler_1_4_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR2 / 2 ] = {
      22500, -15099,
          3,    -14,    -20,    -15,      2,     25,     37,     25,    -16,    -71,   -107,    -79,     50,    292,    623,    982,   1288,   1464,
 };
 
-silk_DWORD_ALIGN const opus_int16 silk_Resampler_1_6_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR2 / 2 ] = {
+silk_DWORD_ALIGN const oac_int16 silk_Resampler_1_6_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR2 / 2 ] = {
      27540, -15257,
         17,     12,      8,      1,    -10,    -22,    -30,    -32,    -22,      3,     44,    100,    168,    243,    317,    381,    429,    455,
 };
 
-silk_DWORD_ALIGN const opus_int16 silk_Resampler_2_3_COEFS_LQ[ 2 + 2 * 2 ] = {
+silk_DWORD_ALIGN const oac_int16 silk_Resampler_2_3_COEFS_LQ[ 2 + 2 * 2 ] = {
      -2797,  -6507,
       4697,  10739,
       1567,   8276,
 };
 
 /* Table with interplation fractions of 1/24, 3/24, 5/24, ... , 23/24 : 23/24 (46 Words) */
-silk_DWORD_ALIGN const opus_int16 silk_resampler_frac_FIR_12[ 12 ][ RESAMPLER_ORDER_FIR_12 / 2 ] = {
+silk_DWORD_ALIGN const oac_int16 silk_resampler_frac_FIR_12[ 12 ][ RESAMPLER_ORDER_FIR_12 / 2 ] = {
     {  189,  -600,   617, 30567 },
     {  117,  -159, -1070, 29704 },
     {   52,   221, -2392, 28276 },
diff --git a/silk/resampler_rom.h b/silk/resampler_rom.h
index b0579e0e8..5702ba465 100644
--- a/silk/resampler_rom.h
+++ b/silk/resampler_rom.h
@@ -38,23 +38,23 @@ POSSIBILITY OF SUCH DAMAGE.
 #define RESAMPLER_ORDER_FIR_12                  8
 
 /* Tables for 2x downsampler */
-static const opus_int16 silk_resampler_down2_0 = 9872;
-static const opus_int16 silk_resampler_down2_1 = 39809 - 65536;
+static const oac_int16 silk_resampler_down2_0 = 9872;
+static const oac_int16 silk_resampler_down2_1 = 39809 - 65536;
 
 /* Tables for 2x upsampler, high quality */
-static const opus_int16 silk_resampler_up2_hq_0[ 3 ] = { 1746, 14986, 39083 - 65536 };
-static const opus_int16 silk_resampler_up2_hq_1[ 3 ] = { 6854, 25769, 55542 - 65536 };
+static const oac_int16 silk_resampler_up2_hq_0[ 3 ] = { 1746, 14986, 39083 - 65536 };
+static const oac_int16 silk_resampler_up2_hq_1[ 3 ] = { 6854, 25769, 55542 - 65536 };
 
 /* Tables with IIR and FIR coefficients for fractional downsamplers */
-extern const opus_int16 silk_Resampler_3_4_COEFS[ 2 + 3 * RESAMPLER_DOWN_ORDER_FIR0 / 2 ];
-extern const opus_int16 silk_Resampler_2_3_COEFS[ 2 + 2 * RESAMPLER_DOWN_ORDER_FIR0 / 2 ];
-extern const opus_int16 silk_Resampler_1_2_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR1 / 2 ];
-extern const opus_int16 silk_Resampler_1_3_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR2 / 2 ];
-extern const opus_int16 silk_Resampler_1_4_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR2 / 2 ];
-extern const opus_int16 silk_Resampler_1_6_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR2 / 2 ];
-extern const opus_int16 silk_Resampler_2_3_COEFS_LQ[ 2 + 2 * 2 ];
+extern const oac_int16 silk_Resampler_3_4_COEFS[ 2 + 3 * RESAMPLER_DOWN_ORDER_FIR0 / 2 ];
+extern const oac_int16 silk_Resampler_2_3_COEFS[ 2 + 2 * RESAMPLER_DOWN_ORDER_FIR0 / 2 ];
+extern const oac_int16 silk_Resampler_1_2_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR1 / 2 ];
+extern const oac_int16 silk_Resampler_1_3_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR2 / 2 ];
+extern const oac_int16 silk_Resampler_1_4_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR2 / 2 ];
+extern const oac_int16 silk_Resampler_1_6_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR2 / 2 ];
+extern const oac_int16 silk_Resampler_2_3_COEFS_LQ[ 2 + 2 * 2 ];
 
 /* Table with interplation fractions of 1/24, 3/24, ..., 23/24 */
-extern const opus_int16 silk_resampler_frac_FIR_12[ 12 ][ RESAMPLER_ORDER_FIR_12 / 2 ];
+extern const oac_int16 silk_resampler_frac_FIR_12[ 12 ][ RESAMPLER_ORDER_FIR_12 / 2 ];
 
 #endif /* SILK_FIX_RESAMPLER_ROM_H */
diff --git a/silk/resampler_structs.h b/silk/resampler_structs.h
index 80b426a67..8d39a1110 100644
--- a/silk/resampler_structs.h
+++ b/silk/resampler_structs.h
@@ -32,21 +32,21 @@ POSSIBILITY OF SUCH DAMAGE.
 #define SILK_RESAMPLER_MAX_IIR_ORDER                 6
 
 typedef struct _silk_resampler_state_struct{
-    opus_int32       sIIR[ SILK_RESAMPLER_MAX_IIR_ORDER ]; /* this must be the first element of this struct */
+    oac_int32       sIIR[ SILK_RESAMPLER_MAX_IIR_ORDER ]; /* this must be the first element of this struct */
     union{
-        opus_int32   i32[ SILK_RESAMPLER_MAX_FIR_ORDER ];
-        opus_int16   i16[ SILK_RESAMPLER_MAX_FIR_ORDER ];
+        oac_int32   i32[ SILK_RESAMPLER_MAX_FIR_ORDER ];
+        oac_int16   i16[ SILK_RESAMPLER_MAX_FIR_ORDER ];
     }                sFIR;
-    opus_int16       delayBuf[ 96 ];
-    opus_int         resampler_function;
-    opus_int         batchSize;
-    opus_int32       invRatio_Q16;
-    opus_int         FIR_Order;
-    opus_int         FIR_Fracs;
-    opus_int         Fs_in_kHz;
-    opus_int         Fs_out_kHz;
-    opus_int         inputDelay;
-    const opus_int16 *Coefs;
+    oac_int16       delayBuf[ 96 ];
+    oac_int         resampler_function;
+    oac_int         batchSize;
+    oac_int32       invRatio_Q16;
+    oac_int         FIR_Order;
+    oac_int         FIR_Fracs;
+    oac_int         Fs_in_kHz;
+    oac_int         Fs_out_kHz;
+    oac_int         inputDelay;
+    const oac_int16 *Coefs;
 } silk_resampler_state_struct;
 
 #endif /* SILK_RESAMPLER_STRUCTS_H */
diff --git a/silk/shell_coder.c b/silk/shell_coder.c
index 4af341474..123783ef6 100644
--- a/silk/shell_coder.c
+++ b/silk/shell_coder.c
@@ -33,23 +33,23 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* shell coder; pulse-subframe length is hardcoded */
 
-static OPUS_INLINE void combine_pulses(
-    opus_int         *out,   /* O    combined pulses vector [len] */
-    const opus_int   *in,    /* I    input vector       [2 * len] */
-    const opus_int   len     /* I    number of OUTPUT samples     */
+static OAC_INLINE void combine_pulses(
+    oac_int         *out,   /* O    combined pulses vector [len] */
+    const oac_int   *in,    /* I    input vector       [2 * len] */
+    const oac_int   len     /* I    number of OUTPUT samples     */
 )
 {
-    opus_int k;
+    oac_int k;
     for( k = 0; k < len; k++ ) {
         out[ k ] = in[ 2 * k ] + in[ 2 * k + 1 ];
     }
 }
 
-static OPUS_INLINE void encode_split(
+static OAC_INLINE void encode_split(
     ec_enc                      *psRangeEnc,    /* I/O  compressor data structure                   */
-    const opus_int              p_child1,       /* I    pulse amplitude of first child subframe     */
-    const opus_int              p,              /* I    pulse amplitude of current subframe         */
-    const opus_uint8            *shell_table    /* I    table of shell cdfs                         */
+    const oac_int              p_child1,       /* I    pulse amplitude of first child subframe     */
+    const oac_int              p,              /* I    pulse amplitude of current subframe         */
+    const oac_uint8            *shell_table    /* I    table of shell cdfs                         */
 )
 {
     if( p > 0 ) {
@@ -57,12 +57,12 @@ static OPUS_INLINE void encode_split(
     }
 }
 
-static OPUS_INLINE void decode_split(
-    opus_int16                  *p_child1,      /* O    pulse amplitude of first child subframe     */
-    opus_int16                  *p_child2,      /* O    pulse amplitude of second child subframe    */
+static OAC_INLINE void decode_split(
+    oac_int16                  *p_child1,      /* O    pulse amplitude of first child subframe     */
+    oac_int16                  *p_child2,      /* O    pulse amplitude of second child subframe    */
     ec_dec                      *psRangeDec,    /* I/O  Compressor data structure                   */
-    const opus_int              p,              /* I    pulse amplitude of current subframe         */
-    const opus_uint8            *shell_table    /* I    table of shell cdfs                         */
+    const oac_int              p,              /* I    pulse amplitude of current subframe         */
+    const oac_uint8            *shell_table    /* I    table of shell cdfs                         */
 )
 {
     if( p > 0 ) {
@@ -77,10 +77,10 @@ static OPUS_INLINE void decode_split(
 /* Shell encoder, operates on one shell code frame of 16 pulses */
 void silk_shell_encoder(
     ec_enc                      *psRangeEnc,                    /* I/O  compressor data structure                   */
-    const opus_int              *pulses0                        /* I    data: nonnegative pulse amplitudes          */
+    const oac_int              *pulses0                        /* I    data: nonnegative pulse amplitudes          */
 )
 {
-    opus_int pulses1[ 8 ], pulses2[ 4 ], pulses3[ 2 ], pulses4[ 1 ];
+    oac_int pulses1[ 8 ], pulses2[ 4 ], pulses3[ 2 ], pulses4[ 1 ];
 
     /* this function operates on one shell code frame of 16 pulses */
     silk_assert( SHELL_CODEC_FRAME_LENGTH == 16 );
@@ -117,12 +117,12 @@ void silk_shell_encoder(
 
 /* Shell decoder, operates on one shell code frame of 16 pulses */
 void silk_shell_decoder(
-    opus_int16                  *pulses0,                       /* O    data: nonnegative pulse amplitudes          */
+    oac_int16                  *pulses0,                       /* O    data: nonnegative pulse amplitudes          */
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
-    const opus_int              pulses4                         /* I    number of pulses per pulse-subframe         */
+    const oac_int              pulses4                         /* I    number of pulses per pulse-subframe         */
 )
 {
-    opus_int16 pulses3[ 2 ], pulses2[ 4 ], pulses1[ 8 ];
+    oac_int16 pulses3[ 2 ], pulses2[ 4 ], pulses1[ 8 ];
 
     /* this function operates on one shell code frame of 16 pulses */
     silk_assert( SHELL_CODEC_FRAME_LENGTH == 16 );
diff --git a/silk/sigm_Q15.c b/silk/sigm_Q15.c
index 39a52dba2..02a49643b 100644
--- a/silk/sigm_Q15.c
+++ b/silk/sigm_Q15.c
@@ -34,23 +34,23 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "SigProc_FIX.h"
 
 /* fprintf(1, '%d, ', round(1024 * ([1 ./ (1 + exp(-(1:5))), 1] - 1 ./ (1 + exp(-(0:5)))))); */
-static const opus_int32 sigm_LUT_slope_Q10[ 6 ] = {
+static const oac_int32 sigm_LUT_slope_Q10[ 6 ] = {
     237, 153, 73, 30, 12, 7
 };
 /* fprintf(1, '%d, ', round(32767 * 1 ./ (1 + exp(-(0:5))))); */
-static const opus_int32 sigm_LUT_pos_Q15[ 6 ] = {
+static const oac_int32 sigm_LUT_pos_Q15[ 6 ] = {
     16384, 23955, 28861, 31213, 32178, 32548
 };
 /* fprintf(1, '%d, ', round(32767 * 1 ./ (1 + exp((0:5))))); */
-static const opus_int32 sigm_LUT_neg_Q15[ 6 ] = {
+static const oac_int32 sigm_LUT_neg_Q15[ 6 ] = {
     16384, 8812, 3906, 1554, 589, 219
 };
 
-opus_int silk_sigm_Q15(
-    opus_int                    in_Q5               /* I                                                                */
+oac_int silk_sigm_Q15(
+    oac_int                    in_Q5               /* I                                                                */
 )
 {
-    opus_int ind;
+    oac_int ind;
 
     if( in_Q5 < 0 ) {
         /* Negative input */
diff --git a/silk/sort.c b/silk/sort.c
index 4fba16f83..e321e1340 100644
--- a/silk/sort.c
+++ b/silk/sort.c
@@ -38,14 +38,14 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "SigProc_FIX.h"
 
 void silk_insertion_sort_increasing(
-    opus_int32           *a,             /* I/O   Unsorted / Sorted vector               */
-    opus_int             *idx,           /* O     Index vector for the sorted elements   */
-    const opus_int       L,              /* I     Vector length                          */
-    const opus_int       K               /* I     Number of correctly sorted positions   */
+    oac_int32           *a,             /* I/O   Unsorted / Sorted vector               */
+    oac_int             *idx,           /* O     Index vector for the sorted elements   */
+    const oac_int       L,              /* I     Vector length                          */
+    const oac_int       K               /* I     Number of correctly sorted positions   */
 )
 {
-    opus_int32    value;
-    opus_int        i, j;
+    oac_int32    value;
+    oac_int        i, j;
 
     /* Safety checks */
     celt_assert( K >  0 );
@@ -86,14 +86,14 @@ void silk_insertion_sort_increasing(
 #ifdef FIXED_POINT
 /* This function is only used by the fixed-point build */
 void silk_insertion_sort_decreasing_int16(
-    opus_int16                  *a,                 /* I/O   Unsorted / Sorted vector                                   */
-    opus_int                    *idx,               /* O     Index vector for the sorted elements                       */
-    const opus_int              L,                  /* I     Vector length                                              */
-    const opus_int              K                   /* I     Number of correctly sorted positions                       */
+    oac_int16                  *a,                 /* I/O   Unsorted / Sorted vector                                   */
+    oac_int                    *idx,               /* O     Index vector for the sorted elements                       */
+    const oac_int              L,                  /* I     Vector length                                              */
+    const oac_int              K                   /* I     Number of correctly sorted positions                       */
 )
 {
-    opus_int i, j;
-    opus_int value;
+    oac_int i, j;
+    oac_int value;
 
     /* Safety checks */
     celt_assert( K >  0 );
@@ -133,12 +133,12 @@ void silk_insertion_sort_decreasing_int16(
 #endif
 
 void silk_insertion_sort_increasing_all_values_int16(
-     opus_int16                 *a,                 /* I/O   Unsorted / Sorted vector                                   */
-     const opus_int             L                   /* I     Vector length                                              */
+     oac_int16                 *a,                 /* I/O   Unsorted / Sorted vector                                   */
+     const oac_int             L                   /* I     Vector length                                              */
 )
 {
-    opus_int    value;
-    opus_int    i, j;
+    oac_int    value;
+    oac_int    i, j;
 
     /* Safety checks */
     celt_assert( L >  0 );
diff --git a/silk/stereo_LR_to_MS.c b/silk/stereo_LR_to_MS.c
index 751452cb1..8678cfe3c 100644
--- a/silk/stereo_LR_to_MS.c
+++ b/silk/stereo_LR_to_MS.c
@@ -35,58 +35,58 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Convert Left/Right stereo signal to adaptive Mid/Side representation */
 void silk_stereo_LR_to_MS(
     stereo_enc_state            *state,                         /* I/O  State                                       */
-    opus_int16                  x1[],                           /* I/O  Left input signal, becomes mid signal       */
-    opus_int16                  x2[],                           /* I/O  Right input signal, becomes side signal     */
-    opus_int8                   ix[ 2 ][ 3 ],                   /* O    Quantization indices                        */
-    opus_int8                   *mid_only_flag,                 /* O    Flag: only mid signal coded                 */
-    opus_int32                  mid_side_rates_bps[],           /* O    Bitrates for mid and side signals           */
-    opus_int32                  total_rate_bps,                 /* I    Total bitrate                               */
-    opus_int                    prev_speech_act_Q8,             /* I    Speech activity level in previous frame     */
-    opus_int                    toMono,                         /* I    Last frame before a stereo->mono transition */
-    opus_int                    fs_kHz,                         /* I    Sample rate (kHz)                           */
-    opus_int                    frame_length                    /* I    Number of samples                           */
+    oac_int16                  x1[],                           /* I/O  Left input signal, becomes mid signal       */
+    oac_int16                  x2[],                           /* I/O  Right input signal, becomes side signal     */
+    oac_int8                   ix[ 2 ][ 3 ],                   /* O    Quantization indices                        */
+    oac_int8                   *mid_only_flag,                 /* O    Flag: only mid signal coded                 */
+    oac_int32                  mid_side_rates_bps[],           /* O    Bitrates for mid and side signals           */
+    oac_int32                  total_rate_bps,                 /* I    Total bitrate                               */
+    oac_int                    prev_speech_act_Q8,             /* I    Speech activity level in previous frame     */
+    oac_int                    toMono,                         /* I    Last frame before a stereo->mono transition */
+    oac_int                    fs_kHz,                         /* I    Sample rate (kHz)                           */
+    oac_int                    frame_length                    /* I    Number of samples                           */
 )
 {
-    opus_int   n, is10msFrame, denom_Q16, delta0_Q13, delta1_Q13;
-    opus_int32 sum, diff, smooth_coef_Q16, pred_Q13[ 2 ], pred0_Q13, pred1_Q13;
-    opus_int32 LP_ratio_Q14, HP_ratio_Q14, frac_Q16, frac_3_Q16, min_mid_rate_bps, width_Q14, w_Q24, deltaw_Q24;
-    VARDECL( opus_int16, side );
-    VARDECL( opus_int16, LP_mid );
-    VARDECL( opus_int16, HP_mid );
-    VARDECL( opus_int16, LP_side );
-    VARDECL( opus_int16, HP_side );
-    opus_int16 *mid = &x1[ -2 ];
+    oac_int   n, is10msFrame, denom_Q16, delta0_Q13, delta1_Q13;
+    oac_int32 sum, diff, smooth_coef_Q16, pred_Q13[ 2 ], pred0_Q13, pred1_Q13;
+    oac_int32 LP_ratio_Q14, HP_ratio_Q14, frac_Q16, frac_3_Q16, min_mid_rate_bps, width_Q14, w_Q24, deltaw_Q24;
+    VARDECL( oac_int16, side );
+    VARDECL( oac_int16, LP_mid );
+    VARDECL( oac_int16, HP_mid );
+    VARDECL( oac_int16, LP_side );
+    VARDECL( oac_int16, HP_side );
+    oac_int16 *mid = &x1[ -2 ];
     SAVE_STACK;
 
-    ALLOC( side, frame_length + 2, opus_int16 );
+    ALLOC( side, frame_length + 2, oac_int16 );
     /* Convert to basic mid/side signals */
     for( n = 0; n < frame_length + 2; n++ ) {
-        sum  = x1[ n - 2 ] + (opus_int32)x2[ n - 2 ];
-        diff = x1[ n - 2 ] - (opus_int32)x2[ n - 2 ];
-        mid[  n ] = (opus_int16)silk_RSHIFT_ROUND( sum, 1 );
-        side[ n ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( diff, 1 ) );
+        sum  = x1[ n - 2 ] + (oac_int32)x2[ n - 2 ];
+        diff = x1[ n - 2 ] - (oac_int32)x2[ n - 2 ];
+        mid[  n ] = (oac_int16)silk_RSHIFT_ROUND( sum, 1 );
+        side[ n ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( diff, 1 ) );
     }
 
     /* Buffering */
-    silk_memcpy( mid,  state->sMid,  2 * sizeof( opus_int16 ) );
-    silk_memcpy( side, state->sSide, 2 * sizeof( opus_int16 ) );
-    silk_memcpy( state->sMid,  &mid[  frame_length ], 2 * sizeof( opus_int16 ) );
-    silk_memcpy( state->sSide, &side[ frame_length ], 2 * sizeof( opus_int16 ) );
+    silk_memcpy( mid,  state->sMid,  2 * sizeof( oac_int16 ) );
+    silk_memcpy( side, state->sSide, 2 * sizeof( oac_int16 ) );
+    silk_memcpy( state->sMid,  &mid[  frame_length ], 2 * sizeof( oac_int16 ) );
+    silk_memcpy( state->sSide, &side[ frame_length ], 2 * sizeof( oac_int16 ) );
 
     /* LP and HP filter mid signal */
-    ALLOC( LP_mid, frame_length, opus_int16 );
-    ALLOC( HP_mid, frame_length, opus_int16 );
+    ALLOC( LP_mid, frame_length, oac_int16 );
+    ALLOC( HP_mid, frame_length, oac_int16 );
     for( n = 0; n < frame_length; n++ ) {
-        sum = silk_RSHIFT_ROUND( silk_ADD_LSHIFT32( mid[ n ] + (opus_int32)mid[ n + 2 ], mid[ n + 1 ], 1 ), 2 );
+        sum = silk_RSHIFT_ROUND( silk_ADD_LSHIFT32( mid[ n ] + (oac_int32)mid[ n + 2 ], mid[ n + 1 ], 1 ), 2 );
         LP_mid[ n ] = sum;
         HP_mid[ n ] = mid[ n + 1 ] - sum;
     }
 
     /* LP and HP filter side signal */
-    ALLOC( LP_side, frame_length, opus_int16 );
-    ALLOC( HP_side, frame_length, opus_int16 );
+    ALLOC( LP_side, frame_length, oac_int16 );
+    ALLOC( HP_side, frame_length, oac_int16 );
     for( n = 0; n < frame_length; n++ ) {
-        sum = silk_RSHIFT_ROUND( silk_ADD_LSHIFT32( side[ n ] + (opus_int32)side[ n + 2 ], side[ n + 1 ], 1 ), 2 );
+        sum = silk_RSHIFT_ROUND( silk_ADD_LSHIFT32( side[ n ] + (oac_int32)side[ n + 2 ], side[ n + 1 ], 1 ), 2 );
         LP_side[ n ] = sum;
         HP_side[ n ] = side[ n + 1 ] - sum;
     }
@@ -128,7 +128,7 @@ void silk_stereo_LR_to_MS(
     }
 
     /* Smoother */
-    state->smth_width_Q14 = (opus_int16)silk_SMLAWB( state->smth_width_Q14, width_Q14 - state->smth_width_Q14, smooth_coef_Q16 );
+    state->smth_width_Q14 = (oac_int16)silk_SMLAWB( state->smth_width_Q14, width_Q14 - state->smth_width_Q14, smooth_coef_Q16 );
 
     /* At very low bitrates or for inputs that are nearly amplitude panned, switch to panned-mono coding */
     *mid_only_flag = 0;
@@ -199,7 +199,7 @@ void silk_stereo_LR_to_MS(
     pred0_Q13  = -state->pred_prev_Q13[ 0 ];
     pred1_Q13  = -state->pred_prev_Q13[ 1 ];
     w_Q24      =  silk_LSHIFT( state->width_prev_Q14, 10 );
-    denom_Q16  = silk_DIV32_16( (opus_int32)1 << 16, STEREO_INTERP_LEN_MS * fs_kHz );
+    denom_Q16  = silk_DIV32_16( (oac_int32)1 << 16, STEREO_INTERP_LEN_MS * fs_kHz );
     delta0_Q13 = -silk_RSHIFT_ROUND( silk_SMULBB( pred_Q13[ 0 ] - state->pred_prev_Q13[ 0 ], denom_Q16 ), 16 );
     delta1_Q13 = -silk_RSHIFT_ROUND( silk_SMULBB( pred_Q13[ 1 ] - state->pred_prev_Q13[ 1 ], denom_Q16 ), 16 );
     deltaw_Q24 =  silk_LSHIFT( silk_SMULWB( width_Q14 - state->width_prev_Q14, denom_Q16 ), 10 );
@@ -207,23 +207,23 @@ void silk_stereo_LR_to_MS(
         pred0_Q13 += delta0_Q13;
         pred1_Q13 += delta1_Q13;
         w_Q24   += deltaw_Q24;
-        sum = silk_LSHIFT( silk_ADD_LSHIFT32( mid[ n ] + (opus_int32)mid[ n + 2 ], mid[ n + 1 ], 1 ), 9 );    /* Q11 */
+        sum = silk_LSHIFT( silk_ADD_LSHIFT32( mid[ n ] + (oac_int32)mid[ n + 2 ], mid[ n + 1 ], 1 ), 9 );    /* Q11 */
         sum = silk_SMLAWB( silk_SMULWB( w_Q24, side[ n + 1 ] ), sum, pred0_Q13 );               /* Q8  */
-        sum = silk_SMLAWB( sum, silk_LSHIFT( (opus_int32)mid[ n + 1 ], 11 ), pred1_Q13 );       /* Q8  */
-        x2[ n - 1 ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( sum, 8 ) );
+        sum = silk_SMLAWB( sum, silk_LSHIFT( (oac_int32)mid[ n + 1 ], 11 ), pred1_Q13 );       /* Q8  */
+        x2[ n - 1 ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( sum, 8 ) );
     }
 
     pred0_Q13 = -pred_Q13[ 0 ];
     pred1_Q13 = -pred_Q13[ 1 ];
     w_Q24     =  silk_LSHIFT( width_Q14, 10 );
     for( n = STEREO_INTERP_LEN_MS * fs_kHz; n < frame_length; n++ ) {
-        sum = silk_LSHIFT( silk_ADD_LSHIFT32( mid[ n ] + (opus_int32)mid[ n + 2 ], mid[ n + 1 ], 1 ), 9 );    /* Q11 */
+        sum = silk_LSHIFT( silk_ADD_LSHIFT32( mid[ n ] + (oac_int32)mid[ n + 2 ], mid[ n + 1 ], 1 ), 9 );    /* Q11 */
         sum = silk_SMLAWB( silk_SMULWB( w_Q24, side[ n + 1 ] ), sum, pred0_Q13 );               /* Q8  */
-        sum = silk_SMLAWB( sum, silk_LSHIFT( (opus_int32)mid[ n + 1 ], 11 ), pred1_Q13 );       /* Q8  */
-        x2[ n - 1 ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( sum, 8 ) );
+        sum = silk_SMLAWB( sum, silk_LSHIFT( (oac_int32)mid[ n + 1 ], 11 ), pred1_Q13 );       /* Q8  */
+        x2[ n - 1 ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( sum, 8 ) );
     }
-    state->pred_prev_Q13[ 0 ] = (opus_int16)pred_Q13[ 0 ];
-    state->pred_prev_Q13[ 1 ] = (opus_int16)pred_Q13[ 1 ];
-    state->width_prev_Q14     = (opus_int16)width_Q14;
+    state->pred_prev_Q13[ 0 ] = (oac_int16)pred_Q13[ 0 ];
+    state->pred_prev_Q13[ 1 ] = (oac_int16)pred_Q13[ 1 ];
+    state->width_prev_Q14     = (oac_int16)width_Q14;
     RESTORE_STACK;
 }
diff --git a/silk/stereo_MS_to_LR.c b/silk/stereo_MS_to_LR.c
index 1e01bb6eb..d510de9ea 100644
--- a/silk/stereo_MS_to_LR.c
+++ b/silk/stereo_MS_to_LR.c
@@ -34,52 +34,52 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Convert adaptive Mid/Side representation to Left/Right stereo signal */
 void silk_stereo_MS_to_LR(
     stereo_dec_state            *state,                         /* I/O  State                                       */
-    opus_int16                  x1[],                           /* I/O  Left input signal, becomes mid signal       */
-    opus_int16                  x2[],                           /* I/O  Right input signal, becomes side signal     */
-    const opus_int32            pred_Q13[],                     /* I    Predictors                                  */
-    opus_int                    fs_kHz,                         /* I    Samples rate (kHz)                          */
-    opus_int                    frame_length                    /* I    Number of samples                           */
+    oac_int16                  x1[],                           /* I/O  Left input signal, becomes mid signal       */
+    oac_int16                  x2[],                           /* I/O  Right input signal, becomes side signal     */
+    const oac_int32            pred_Q13[],                     /* I    Predictors                                  */
+    oac_int                    fs_kHz,                         /* I    Samples rate (kHz)                          */
+    oac_int                    frame_length                    /* I    Number of samples                           */
 )
 {
-    opus_int   n, denom_Q16, delta0_Q13, delta1_Q13;
-    opus_int32 sum, diff, pred0_Q13, pred1_Q13;
+    oac_int   n, denom_Q16, delta0_Q13, delta1_Q13;
+    oac_int32 sum, diff, pred0_Q13, pred1_Q13;
 
     /* Buffering */
-    silk_memcpy( x1, state->sMid,  2 * sizeof( opus_int16 ) );
-    silk_memcpy( x2, state->sSide, 2 * sizeof( opus_int16 ) );
-    silk_memcpy( state->sMid,  &x1[ frame_length ], 2 * sizeof( opus_int16 ) );
-    silk_memcpy( state->sSide, &x2[ frame_length ], 2 * sizeof( opus_int16 ) );
+    silk_memcpy( x1, state->sMid,  2 * sizeof( oac_int16 ) );
+    silk_memcpy( x2, state->sSide, 2 * sizeof( oac_int16 ) );
+    silk_memcpy( state->sMid,  &x1[ frame_length ], 2 * sizeof( oac_int16 ) );
+    silk_memcpy( state->sSide, &x2[ frame_length ], 2 * sizeof( oac_int16 ) );
 
     /* Interpolate predictors and add prediction to side channel */
     pred0_Q13  = state->pred_prev_Q13[ 0 ];
     pred1_Q13  = state->pred_prev_Q13[ 1 ];
-    denom_Q16  = silk_DIV32_16( (opus_int32)1 << 16, STEREO_INTERP_LEN_MS * fs_kHz );
+    denom_Q16  = silk_DIV32_16( (oac_int32)1 << 16, STEREO_INTERP_LEN_MS * fs_kHz );
     delta0_Q13 = silk_RSHIFT_ROUND( silk_SMULBB( pred_Q13[ 0 ] - state->pred_prev_Q13[ 0 ], denom_Q16 ), 16 );
     delta1_Q13 = silk_RSHIFT_ROUND( silk_SMULBB( pred_Q13[ 1 ] - state->pred_prev_Q13[ 1 ], denom_Q16 ), 16 );
     for( n = 0; n < STEREO_INTERP_LEN_MS * fs_kHz; n++ ) {
         pred0_Q13 += delta0_Q13;
         pred1_Q13 += delta1_Q13;
-        sum = silk_LSHIFT( silk_ADD_LSHIFT32( x1[ n ] + (opus_int32)x1[ n + 2 ], x1[ n + 1 ], 1 ), 9 );       /* Q11 */
-        sum = silk_SMLAWB( silk_LSHIFT( (opus_int32)x2[ n + 1 ], 8 ), sum, pred0_Q13 );         /* Q8  */
-        sum = silk_SMLAWB( sum, silk_LSHIFT( (opus_int32)x1[ n + 1 ], 11 ), pred1_Q13 );        /* Q8  */
-        x2[ n + 1 ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( sum, 8 ) );
+        sum = silk_LSHIFT( silk_ADD_LSHIFT32( x1[ n ] + (oac_int32)x1[ n + 2 ], x1[ n + 1 ], 1 ), 9 );       /* Q11 */
+        sum = silk_SMLAWB( silk_LSHIFT( (oac_int32)x2[ n + 1 ], 8 ), sum, pred0_Q13 );         /* Q8  */
+        sum = silk_SMLAWB( sum, silk_LSHIFT( (oac_int32)x1[ n + 1 ], 11 ), pred1_Q13 );        /* Q8  */
+        x2[ n + 1 ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( sum, 8 ) );
     }
     pred0_Q13 = pred_Q13[ 0 ];
     pred1_Q13 = pred_Q13[ 1 ];
     for( n = STEREO_INTERP_LEN_MS * fs_kHz; n < frame_length; n++ ) {
-        sum = silk_LSHIFT( silk_ADD_LSHIFT32( x1[ n ] + (opus_int32)x1[ n + 2 ], x1[ n + 1 ], 1 ), 9 );       /* Q11 */
-        sum = silk_SMLAWB( silk_LSHIFT( (opus_int32)x2[ n + 1 ], 8 ), sum, pred0_Q13 );         /* Q8  */
-        sum = silk_SMLAWB( sum, silk_LSHIFT( (opus_int32)x1[ n + 1 ], 11 ), pred1_Q13 );        /* Q8  */
-        x2[ n + 1 ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( sum, 8 ) );
+        sum = silk_LSHIFT( silk_ADD_LSHIFT32( x1[ n ] + (oac_int32)x1[ n + 2 ], x1[ n + 1 ], 1 ), 9 );       /* Q11 */
+        sum = silk_SMLAWB( silk_LSHIFT( (oac_int32)x2[ n + 1 ], 8 ), sum, pred0_Q13 );         /* Q8  */
+        sum = silk_SMLAWB( sum, silk_LSHIFT( (oac_int32)x1[ n + 1 ], 11 ), pred1_Q13 );        /* Q8  */
+        x2[ n + 1 ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( sum, 8 ) );
     }
     state->pred_prev_Q13[ 0 ] = pred_Q13[ 0 ];
     state->pred_prev_Q13[ 1 ] = pred_Q13[ 1 ];
 
     /* Convert to left/right signals */
     for( n = 0; n < frame_length; n++ ) {
-        sum  = x1[ n + 1 ] + (opus_int32)x2[ n + 1 ];
-        diff = x1[ n + 1 ] - (opus_int32)x2[ n + 1 ];
-        x1[ n + 1 ] = (opus_int16)silk_SAT16( sum );
-        x2[ n + 1 ] = (opus_int16)silk_SAT16( diff );
+        sum  = x1[ n + 1 ] + (oac_int32)x2[ n + 1 ];
+        diff = x1[ n + 1 ] - (oac_int32)x2[ n + 1 ];
+        x1[ n + 1 ] = (oac_int16)silk_SAT16( sum );
+        x2[ n + 1 ] = (oac_int16)silk_SAT16( diff );
     }
 }
diff --git a/silk/stereo_decode_pred.c b/silk/stereo_decode_pred.c
index 56ba3925e..54063e6ab 100644
--- a/silk/stereo_decode_pred.c
+++ b/silk/stereo_decode_pred.c
@@ -34,11 +34,11 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Decode mid/side predictors */
 void silk_stereo_decode_pred(
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
-    opus_int32                  pred_Q13[]                      /* O    Predictors                                  */
+    oac_int32                  pred_Q13[]                      /* O    Predictors                                  */
 )
 {
-    opus_int   n, ix[ 2 ][ 3 ];
-    opus_int32 low_Q13, step_Q13;
+    oac_int   n, ix[ 2 ][ 3 ];
+    oac_int32 low_Q13, step_Q13;
 
     /* Entropy decoding */
     n = ec_dec_icdf( psRangeDec, silk_stereo_pred_joint_iCDF, 8 );
@@ -65,7 +65,7 @@ void silk_stereo_decode_pred(
 /* Decode mid-only flag */
 void silk_stereo_decode_mid_only(
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
-    opus_int                    *decode_only_mid                /* O    Flag that only mid channel has been coded   */
+    oac_int                    *decode_only_mid                /* O    Flag that only mid channel has been coded   */
 )
 {
     /* Decode flag that only mid channel is coded */
diff --git a/silk/stereo_encode_pred.c b/silk/stereo_encode_pred.c
index 03becb673..8b1474494 100644
--- a/silk/stereo_encode_pred.c
+++ b/silk/stereo_encode_pred.c
@@ -34,10 +34,10 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Entropy code the mid/side quantization indices */
 void silk_stereo_encode_pred(
     ec_enc                      *psRangeEnc,                    /* I/O  Compressor data structure                   */
-    opus_int8                   ix[ 2 ][ 3 ]                    /* I    Quantization indices                        */
+    oac_int8                   ix[ 2 ][ 3 ]                    /* I    Quantization indices                        */
 )
 {
-    opus_int   n;
+    oac_int   n;
 
     /* Entropy coding */
     n = 5 * ix[ 0 ][ 2 ] + ix[ 1 ][ 2 ];
@@ -54,7 +54,7 @@ void silk_stereo_encode_pred(
 /* Entropy code the mid-only flag */
 void silk_stereo_encode_mid_only(
     ec_enc                      *psRangeEnc,                    /* I/O  Compressor data structure                   */
-    opus_int8                   mid_only_flag
+    oac_int8                   mid_only_flag
 )
 {
     /* Encode flag that only mid channel is coded */
diff --git a/silk/stereo_find_predictor.c b/silk/stereo_find_predictor.c
index e30e90bdd..7d0aaaf26 100644
--- a/silk/stereo_find_predictor.c
+++ b/silk/stereo_find_predictor.c
@@ -32,17 +32,17 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "main.h"
 
 /* Find least-squares prediction gain for one signal based on another and quantize it */
-opus_int32 silk_stereo_find_predictor(                          /* O    Returns predictor in Q13                    */
-    opus_int32                  *ratio_Q14,                     /* O    Ratio of residual and mid energies          */
-    const opus_int16            x[],                            /* I    Basis signal                                */
-    const opus_int16            y[],                            /* I    Target signal                               */
-    opus_int32                  mid_res_amp_Q0[],               /* I/O  Smoothed mid, residual norms                */
-    opus_int                    length,                         /* I    Number of samples                           */
-    opus_int                    smooth_coef_Q16                 /* I    Smoothing coefficient                       */
+oac_int32 silk_stereo_find_predictor(                          /* O    Returns predictor in Q13                    */
+    oac_int32                  *ratio_Q14,                     /* O    Ratio of residual and mid energies          */
+    const oac_int16            x[],                            /* I    Basis signal                                */
+    const oac_int16            y[],                            /* I    Target signal                               */
+    oac_int32                  mid_res_amp_Q0[],               /* I/O  Smoothed mid, residual norms                */
+    oac_int                    length,                         /* I    Number of samples                           */
+    oac_int                    smooth_coef_Q16                 /* I    Smoothing coefficient                       */
 )
 {
-    opus_int   scale, scale1, scale2;
-    opus_int32 nrgx, nrgy, corr, pred_Q13, pred2_Q10;
+    oac_int   scale, scale1, scale2;
+    oac_int32 nrgx, nrgy, corr, pred_Q13, pred2_Q10;
 
     /* Find  predictor */
     silk_sum_sqr_shift( &nrgx, &scale1, x, length );
@@ -58,7 +58,7 @@ opus_int32 silk_stereo_find_predictor(                          /* O    Returns
     pred2_Q10 = silk_SMULWB( pred_Q13, pred_Q13 );
 
     /* Faster update for signals with large prediction parameters */
-    smooth_coef_Q16 = (opus_int)silk_max_int( smooth_coef_Q16, silk_abs( pred2_Q10 ) );
+    smooth_coef_Q16 = (oac_int)silk_max_int( smooth_coef_Q16, silk_abs( pred2_Q10 ) );
 
     /* Smoothed mid and residual norms */
     silk_assert( smooth_coef_Q16 < 32768 );
diff --git a/silk/stereo_quant_pred.c b/silk/stereo_quant_pred.c
index d4ced6c3e..83873ea04 100644
--- a/silk/stereo_quant_pred.c
+++ b/silk/stereo_quant_pred.c
@@ -33,12 +33,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Quantize mid/side predictors */
 void silk_stereo_quant_pred(
-    opus_int32                  pred_Q13[],                     /* I/O  Predictors (out: quantized)                 */
-    opus_int8                   ix[ 2 ][ 3 ]                    /* O    Quantization indices                        */
+    oac_int32                  pred_Q13[],                     /* I/O  Predictors (out: quantized)                 */
+    oac_int8                   ix[ 2 ][ 3 ]                    /* O    Quantization indices                        */
 )
 {
-    opus_int   i, j, n;
-    opus_int32 low_Q13, step_Q13, lvl_Q13, err_min_Q13, err_Q13, quant_pred_Q13 = 0;
+    oac_int   i, j, n;
+    oac_int32 low_Q13, step_Q13, lvl_Q13, err_min_Q13, err_Q13, quant_pred_Q13 = 0;
 
     /* Quantize */
     for( n = 0; n < 2; n++ ) {
diff --git a/silk/structs.h b/silk/structs.h
index f3ea0b331..cb335add2 100644
--- a/silk/structs.h
+++ b/silk/structs.h
@@ -54,188 +54,188 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Noise shaping quantization state */
 /************************************/
 typedef struct {
-    opus_int16                  xq[           2 * MAX_FRAME_LENGTH ]; /* Buffer for quantized output signal                             */
-    opus_int32                  sLTP_shp_Q14[ 2 * MAX_FRAME_LENGTH ];
-    opus_int32                  sLPC_Q14[ MAX_SUB_FRAME_LENGTH + NSQ_LPC_BUF_LENGTH ];
-    opus_int32                  sAR2_Q14[ MAX_SHAPE_LPC_ORDER ];
-    opus_int32                  sLF_AR_shp_Q14;
-    opus_int32                  sDiff_shp_Q14;
-    opus_int                    lagPrev;
-    opus_int                    sLTP_buf_idx;
-    opus_int                    sLTP_shp_buf_idx;
-    opus_int32                  rand_seed;
-    opus_int32                  prev_gain_Q16;
-    opus_int                    rewhite_flag;
+    oac_int16                  xq[           2 * MAX_FRAME_LENGTH ]; /* Buffer for quantized output signal                             */
+    oac_int32                  sLTP_shp_Q14[ 2 * MAX_FRAME_LENGTH ];
+    oac_int32                  sLPC_Q14[ MAX_SUB_FRAME_LENGTH + NSQ_LPC_BUF_LENGTH ];
+    oac_int32                  sAR2_Q14[ MAX_SHAPE_LPC_ORDER ];
+    oac_int32                  sLF_AR_shp_Q14;
+    oac_int32                  sDiff_shp_Q14;
+    oac_int                    lagPrev;
+    oac_int                    sLTP_buf_idx;
+    oac_int                    sLTP_shp_buf_idx;
+    oac_int32                  rand_seed;
+    oac_int32                  prev_gain_Q16;
+    oac_int                    rewhite_flag;
 } silk_nsq_state;
 
 /********************************/
 /* VAD state                    */
 /********************************/
 typedef struct {
-    opus_int32                  AnaState[ 2 ];                  /* Analysis filterbank state: 0-8 kHz                                   */
-    opus_int32                  AnaState1[ 2 ];                 /* Analysis filterbank state: 0-4 kHz                                   */
-    opus_int32                  AnaState2[ 2 ];                 /* Analysis filterbank state: 0-2 kHz                                   */
-    opus_int32                  XnrgSubfr[ VAD_N_BANDS ];       /* Subframe energies                                                    */
-    opus_int32                  NrgRatioSmth_Q8[ VAD_N_BANDS ]; /* Smoothed energy level in each band                                   */
-    opus_int16                  HPstate;                        /* State of differentiator in the lowest band                           */
-    opus_int32                  NL[ VAD_N_BANDS ];              /* Noise energy level in each band                                      */
-    opus_int32                  inv_NL[ VAD_N_BANDS ];          /* Inverse noise energy level in each band                              */
-    opus_int32                  NoiseLevelBias[ VAD_N_BANDS ];  /* Noise level estimator bias/offset                                    */
-    opus_int32                  counter;                        /* Frame counter used in the initial phase                              */
+    oac_int32                  AnaState[ 2 ];                  /* Analysis filterbank state: 0-8 kHz                                   */
+    oac_int32                  AnaState1[ 2 ];                 /* Analysis filterbank state: 0-4 kHz                                   */
+    oac_int32                  AnaState2[ 2 ];                 /* Analysis filterbank state: 0-2 kHz                                   */
+    oac_int32                  XnrgSubfr[ VAD_N_BANDS ];       /* Subframe energies                                                    */
+    oac_int32                  NrgRatioSmth_Q8[ VAD_N_BANDS ]; /* Smoothed energy level in each band                                   */
+    oac_int16                  HPstate;                        /* State of differentiator in the lowest band                           */
+    oac_int32                  NL[ VAD_N_BANDS ];              /* Noise energy level in each band                                      */
+    oac_int32                  inv_NL[ VAD_N_BANDS ];          /* Inverse noise energy level in each band                              */
+    oac_int32                  NoiseLevelBias[ VAD_N_BANDS ];  /* Noise level estimator bias/offset                                    */
+    oac_int32                  counter;                        /* Frame counter used in the initial phase                              */
 } silk_VAD_state;
 
 /* Variable cut-off low-pass filter state */
 typedef struct {
-    opus_int32                   In_LP_State[ 2 ];           /* Low pass filter state */
-    opus_int32                   transition_frame_no;        /* Counter which is mapped to a cut-off frequency */
-    opus_int                     mode;                       /* Operating mode, <0: switch down, >0: switch up; 0: do nothing           */
-    opus_int32                   saved_fs_kHz;               /* If non-zero, holds the last sampling rate before a bandwidth switching reset. */
+    oac_int32                   In_LP_State[ 2 ];           /* Low pass filter state */
+    oac_int32                   transition_frame_no;        /* Counter which is mapped to a cut-off frequency */
+    oac_int                     mode;                       /* Operating mode, <0: switch down, >0: switch up; 0: do nothing           */
+    oac_int32                   saved_fs_kHz;               /* If non-zero, holds the last sampling rate before a bandwidth switching reset. */
 } silk_LP_state;
 
 /* Structure containing NLSF codebook */
 typedef struct {
-    const opus_int16             nVectors;
-    const opus_int16             order;
-    const opus_int16             quantStepSize_Q16;
-    const opus_int16             invQuantStepSize_Q6;
-    const opus_uint8             *CB1_NLSF_Q8;
-    const opus_int16             *CB1_Wght_Q9;
-    const opus_uint8             *CB1_iCDF;
-    const opus_uint8             *pred_Q8;
-    const opus_uint8             *ec_sel;
-    const opus_uint8             *ec_iCDF;
-    const opus_uint8             *ec_Rates_Q5;
-    const opus_int16             *deltaMin_Q15;
+    const oac_int16             nVectors;
+    const oac_int16             order;
+    const oac_int16             quantStepSize_Q16;
+    const oac_int16             invQuantStepSize_Q6;
+    const oac_uint8             *CB1_NLSF_Q8;
+    const oac_int16             *CB1_Wght_Q9;
+    const oac_uint8             *CB1_iCDF;
+    const oac_uint8             *pred_Q8;
+    const oac_uint8             *ec_sel;
+    const oac_uint8             *ec_iCDF;
+    const oac_uint8             *ec_Rates_Q5;
+    const oac_int16             *deltaMin_Q15;
 } silk_NLSF_CB_struct;
 
 typedef struct {
-    opus_int16                   pred_prev_Q13[ 2 ];
-    opus_int16                   sMid[ 2 ];
-    opus_int16                   sSide[ 2 ];
-    opus_int32                   mid_side_amp_Q0[ 4 ];
-    opus_int16                   smth_width_Q14;
-    opus_int16                   width_prev_Q14;
-    opus_int16                   silent_side_len;
-    opus_int8                    predIx[ MAX_FRAMES_PER_PACKET ][ 2 ][ 3 ];
-    opus_int8                    mid_only_flags[ MAX_FRAMES_PER_PACKET ];
+    oac_int16                   pred_prev_Q13[ 2 ];
+    oac_int16                   sMid[ 2 ];
+    oac_int16                   sSide[ 2 ];
+    oac_int32                   mid_side_amp_Q0[ 4 ];
+    oac_int16                   smth_width_Q14;
+    oac_int16                   width_prev_Q14;
+    oac_int16                   silent_side_len;
+    oac_int8                    predIx[ MAX_FRAMES_PER_PACKET ][ 2 ][ 3 ];
+    oac_int8                    mid_only_flags[ MAX_FRAMES_PER_PACKET ];
 } stereo_enc_state;
 
 typedef struct {
-    opus_int16                   pred_prev_Q13[ 2 ];
-    opus_int16                   sMid[ 2 ];
-    opus_int16                   sSide[ 2 ];
+    oac_int16                   pred_prev_Q13[ 2 ];
+    oac_int16                   sMid[ 2 ];
+    oac_int16                   sSide[ 2 ];
 } stereo_dec_state;
 
 typedef struct {
-    opus_int8                    GainsIndices[ MAX_NB_SUBFR ];
-    opus_int8                    LTPIndex[ MAX_NB_SUBFR ];
-    opus_int8                    NLSFIndices[ MAX_LPC_ORDER + 1 ];
-    opus_int16                   lagIndex;
-    opus_int8                    contourIndex;
-    opus_int8                    signalType;
-    opus_int8                    quantOffsetType;
-    opus_int8                    NLSFInterpCoef_Q2;
-    opus_int8                    PERIndex;
-    opus_int8                    LTP_scaleIndex;
-    opus_int8                    Seed;
+    oac_int8                    GainsIndices[ MAX_NB_SUBFR ];
+    oac_int8                    LTPIndex[ MAX_NB_SUBFR ];
+    oac_int8                    NLSFIndices[ MAX_LPC_ORDER + 1 ];
+    oac_int16                   lagIndex;
+    oac_int8                    contourIndex;
+    oac_int8                    signalType;
+    oac_int8                    quantOffsetType;
+    oac_int8                    NLSFInterpCoef_Q2;
+    oac_int8                    PERIndex;
+    oac_int8                    LTP_scaleIndex;
+    oac_int8                    Seed;
 } SideInfoIndices;
 
 /********************************/
 /* Encoder state                */
 /********************************/
 typedef struct {
-    opus_int32                   In_HP_State[ 2 ];                  /* High pass filter state                                           */
-    opus_int32                   variable_HP_smth1_Q15;             /* State of first smoother                                          */
-    opus_int32                   variable_HP_smth2_Q15;             /* State of second smoother                                         */
+    oac_int32                   In_HP_State[ 2 ];                  /* High pass filter state                                           */
+    oac_int32                   variable_HP_smth1_Q15;             /* State of first smoother                                          */
+    oac_int32                   variable_HP_smth2_Q15;             /* State of second smoother                                         */
     silk_LP_state                sLP;                               /* Low pass filter state                                            */
     silk_VAD_state               sVAD;                              /* Voice activity detector state                                    */
     silk_nsq_state               sNSQ;                              /* Noise Shape Quantizer State                                      */
-    opus_int16                   prev_NLSFq_Q15[ MAX_LPC_ORDER ];   /* Previously quantized NLSF vector                                 */
-    opus_int                     speech_activity_Q8;                /* Speech activity                                                  */
-    opus_int                     allow_bandwidth_switch;            /* Flag indicating that switching of internal bandwidth is allowed  */
-    opus_int8                    LBRRprevLastGainIndex;
-    opus_int8                    prevSignalType;
-    opus_int                     prevLag;
-    opus_int                     pitch_LPC_win_length;
-    opus_int                     max_pitch_lag;                     /* Highest possible pitch lag (samples)                             */
-    opus_int32                   API_fs_Hz;                         /* API sampling frequency (Hz)                                      */
-    opus_int32                   prev_API_fs_Hz;                    /* Previous API sampling frequency (Hz)                             */
-    opus_int                     maxInternal_fs_Hz;                 /* Maximum internal sampling frequency (Hz)                         */
-    opus_int                     minInternal_fs_Hz;                 /* Minimum internal sampling frequency (Hz)                         */
-    opus_int                     desiredInternal_fs_Hz;             /* Soft request for internal sampling frequency (Hz)                */
-    opus_int                     fs_kHz;                            /* Internal sampling frequency (kHz)                                */
-    opus_int                     nb_subfr;                          /* Number of 5 ms subframes in a frame                              */
-    opus_int                     frame_length;                      /* Frame length (samples)                                           */
-    opus_int                     subfr_length;                      /* Subframe length (samples)                                        */
-    opus_int                     ltp_mem_length;                    /* Length of LTP memory                                             */
-    opus_int                     la_pitch;                          /* Look-ahead for pitch analysis (samples)                          */
-    opus_int                     la_shape;                          /* Look-ahead for noise shape analysis (samples)                    */
-    opus_int                     shapeWinLength;                    /* Window length for noise shape analysis (samples)                 */
-    opus_int32                   TargetRate_bps;                    /* Target bitrate (bps)                                             */
-    opus_int                     PacketSize_ms;                     /* Number of milliseconds to put in each packet                     */
-    opus_int                     PacketLoss_perc;                   /* Packet loss rate measured by farend                              */
-    opus_int32                   frameCounter;
-    opus_int                     Complexity;                        /* Complexity setting                                               */
-    opus_int                     nStatesDelayedDecision;            /* Number of states in delayed decision quantization                */
-    opus_int                     useInterpolatedNLSFs;              /* Flag for using NLSF interpolation                                */
-    opus_int                     shapingLPCOrder;                   /* Filter order for noise shaping filters                           */
-    opus_int                     predictLPCOrder;                   /* Filter order for prediction filters                              */
-    opus_int                     pitchEstimationComplexity;         /* Complexity level for pitch estimator                             */
-    opus_int                     pitchEstimationLPCOrder;           /* Whitening filter order for pitch estimator                       */
-    opus_int32                   pitchEstimationThreshold_Q16;      /* Threshold for pitch estimator                                    */
-    opus_int32                   sum_log_gain_Q7;                   /* Cumulative max prediction gain                                   */
-    opus_int                     NLSF_MSVQ_Survivors;               /* Number of survivors in NLSF MSVQ                                 */
-    opus_int                     first_frame_after_reset;           /* Flag for deactivating NLSF interpolation, pitch prediction       */
-    opus_int                     controlled_since_last_payload;     /* Flag for ensuring codec_control only runs once per packet        */
-    opus_int                     warping_Q16;                       /* Warping parameter for warped noise shaping                       */
-    opus_int                     useCBR;                            /* Flag to enable constant bitrate                                  */
-    opus_int                     prefillFlag;                       /* Flag to indicate that only buffers are prefilled, no coding      */
-    const opus_uint8             *pitch_lag_low_bits_iCDF;          /* Pointer to iCDF table for low bits of pitch lag index            */
-    const opus_uint8             *pitch_contour_iCDF;               /* Pointer to iCDF table for pitch contour index                    */
+    oac_int16                   prev_NLSFq_Q15[ MAX_LPC_ORDER ];   /* Previously quantized NLSF vector                                 */
+    oac_int                     speech_activity_Q8;                /* Speech activity                                                  */
+    oac_int                     allow_bandwidth_switch;            /* Flag indicating that switching of internal bandwidth is allowed  */
+    oac_int8                    LBRRprevLastGainIndex;
+    oac_int8                    prevSignalType;
+    oac_int                     prevLag;
+    oac_int                     pitch_LPC_win_length;
+    oac_int                     max_pitch_lag;                     /* Highest possible pitch lag (samples)                             */
+    oac_int32                   API_fs_Hz;                         /* API sampling frequency (Hz)                                      */
+    oac_int32                   prev_API_fs_Hz;                    /* Previous API sampling frequency (Hz)                             */
+    oac_int                     maxInternal_fs_Hz;                 /* Maximum internal sampling frequency (Hz)                         */
+    oac_int                     minInternal_fs_Hz;                 /* Minimum internal sampling frequency (Hz)                         */
+    oac_int                     desiredInternal_fs_Hz;             /* Soft request for internal sampling frequency (Hz)                */
+    oac_int                     fs_kHz;                            /* Internal sampling frequency (kHz)                                */
+    oac_int                     nb_subfr;                          /* Number of 5 ms subframes in a frame                              */
+    oac_int                     frame_length;                      /* Frame length (samples)                                           */
+    oac_int                     subfr_length;                      /* Subframe length (samples)                                        */
+    oac_int                     ltp_mem_length;                    /* Length of LTP memory                                             */
+    oac_int                     la_pitch;                          /* Look-ahead for pitch analysis (samples)                          */
+    oac_int                     la_shape;                          /* Look-ahead for noise shape analysis (samples)                    */
+    oac_int                     shapeWinLength;                    /* Window length for noise shape analysis (samples)                 */
+    oac_int32                   TargetRate_bps;                    /* Target bitrate (bps)                                             */
+    oac_int                     PacketSize_ms;                     /* Number of milliseconds to put in each packet                     */
+    oac_int                     PacketLoss_perc;                   /* Packet loss rate measured by farend                              */
+    oac_int32                   frameCounter;
+    oac_int                     Complexity;                        /* Complexity setting                                               */
+    oac_int                     nStatesDelayedDecision;            /* Number of states in delayed decision quantization                */
+    oac_int                     useInterpolatedNLSFs;              /* Flag for using NLSF interpolation                                */
+    oac_int                     shapingLPCOrder;                   /* Filter order for noise shaping filters                           */
+    oac_int                     predictLPCOrder;                   /* Filter order for prediction filters                              */
+    oac_int                     pitchEstimationComplexity;         /* Complexity level for pitch estimator                             */
+    oac_int                     pitchEstimationLPCOrder;           /* Whitening filter order for pitch estimator                       */
+    oac_int32                   pitchEstimationThreshold_Q16;      /* Threshold for pitch estimator                                    */
+    oac_int32                   sum_log_gain_Q7;                   /* Cumulative max prediction gain                                   */
+    oac_int                     NLSF_MSVQ_Survivors;               /* Number of survivors in NLSF MSVQ                                 */
+    oac_int                     first_frame_after_reset;           /* Flag for deactivating NLSF interpolation, pitch prediction       */
+    oac_int                     controlled_since_last_payload;     /* Flag for ensuring codec_control only runs once per packet        */
+    oac_int                     warping_Q16;                       /* Warping parameter for warped noise shaping                       */
+    oac_int                     useCBR;                            /* Flag to enable constant bitrate                                  */
+    oac_int                     prefillFlag;                       /* Flag to indicate that only buffers are prefilled, no coding      */
+    const oac_uint8             *pitch_lag_low_bits_iCDF;          /* Pointer to iCDF table for low bits of pitch lag index            */
+    const oac_uint8             *pitch_contour_iCDF;               /* Pointer to iCDF table for pitch contour index                    */
     const silk_NLSF_CB_struct    *psNLSF_CB;                        /* Pointer to NLSF codebook                                         */
-    opus_int                     input_quality_bands_Q15[ VAD_N_BANDS ];
-    opus_int                     input_tilt_Q15;
-    opus_int                     SNR_dB_Q7;                         /* Quality setting                                                  */
+    oac_int                     input_quality_bands_Q15[ VAD_N_BANDS ];
+    oac_int                     input_tilt_Q15;
+    oac_int                     SNR_dB_Q7;                         /* Quality setting                                                  */
 
-    opus_int8                    VAD_flags[ MAX_FRAMES_PER_PACKET ];
-    opus_int8                    LBRR_flag;
-    opus_int                     LBRR_flags[ MAX_FRAMES_PER_PACKET ];
+    oac_int8                    VAD_flags[ MAX_FRAMES_PER_PACKET ];
+    oac_int8                    LBRR_flag;
+    oac_int                     LBRR_flags[ MAX_FRAMES_PER_PACKET ];
 
     SideInfoIndices              indices;
-    opus_int8                    pulses[ MAX_FRAME_LENGTH ];
+    oac_int8                    pulses[ MAX_FRAME_LENGTH ];
 
     int                          arch;
 
     /* Input/output buffering */
-    opus_int16                   inputBuf[ MAX_FRAME_LENGTH + 2 ];  /* Buffer containing input signal                                   */
-    opus_int                     inputBufIx;
-    opus_int                     nFramesPerPacket;
-    opus_int                     nFramesEncoded;                    /* Number of frames analyzed in current packet                      */
+    oac_int16                   inputBuf[ MAX_FRAME_LENGTH + 2 ];  /* Buffer containing input signal                                   */
+    oac_int                     inputBufIx;
+    oac_int                     nFramesPerPacket;
+    oac_int                     nFramesEncoded;                    /* Number of frames analyzed in current packet                      */
 
-    opus_int                     nChannelsAPI;
-    opus_int                     nChannelsInternal;
-    opus_int                     channelNb;
+    oac_int                     nChannelsAPI;
+    oac_int                     nChannelsInternal;
+    oac_int                     channelNb;
 
     /* Parameters For LTP scaling Control */
-    opus_int                     frames_since_onset;
+    oac_int                     frames_since_onset;
 
     /* Specifically for entropy coding */
-    opus_int                     ec_prevSignalType;
-    opus_int16                   ec_prevLagIndex;
+    oac_int                     ec_prevSignalType;
+    oac_int16                   ec_prevLagIndex;
 
     silk_resampler_state_struct resampler_state;
 
     /* DTX */
-    opus_int                     useDTX;                            /* Flag to enable DTX                                               */
-    opus_int                     inDTX;                             /* Flag to signal DTX period                                        */
-    opus_int                     noSpeechCounter;                   /* Counts concecutive nonactive frames, used by DTX                 */
+    oac_int                     useDTX;                            /* Flag to enable DTX                                               */
+    oac_int                     inDTX;                             /* Flag to signal DTX period                                        */
+    oac_int                     noSpeechCounter;                   /* Counts concecutive nonactive frames, used by DTX                 */
 
     /* Inband Low Bitrate Redundancy (LBRR) data */
-    opus_int                     useInBandFEC;                      /* Saves the API setting for query                                  */
-    opus_int                     LBRR_enabled;                      /* Depends on useInBandFRC, bitrate and packet loss rate            */
-    opus_int                     LBRR_GainIncreases;                /* Gains increment for coding LBRR frames                           */
+    oac_int                     useInBandFEC;                      /* Saves the API setting for query                                  */
+    oac_int                     LBRR_enabled;                      /* Depends on useInBandFRC, bitrate and packet loss rate            */
+    oac_int                     LBRR_GainIncreases;                /* Gains increment for coding LBRR frames                           */
     SideInfoIndices              indices_LBRR[ MAX_FRAMES_PER_PACKET ];
-    opus_int8                    pulses_LBRR[ MAX_FRAMES_PER_PACKET ][ MAX_FRAME_LENGTH ];
+    oac_int8                    pulses_LBRR[ MAX_FRAMES_PER_PACKET ][ MAX_FRAME_LENGTH ];
 } silk_encoder_state;
 
 
@@ -254,30 +254,30 @@ typedef struct {
 
 /* Struct for Packet Loss Concealment */
 typedef struct {
-    opus_int32                  pitchL_Q8;                          /* Pitch lag to use for voiced concealment                          */
-    opus_int16                  LTPCoef_Q14[ LTP_ORDER ];           /* LTP coefficients to use for voiced concealment                   */
-    opus_int16                  prevLPC_Q12[ MAX_LPC_ORDER ];
-    opus_int                    last_frame_lost;                    /* Was previous frame lost                                          */
-    opus_int32                  rand_seed;                          /* Seed for unvoiced signal generation                              */
-    opus_int16                  randScale_Q14;                      /* Scaling of unvoiced random signal                                */
-    opus_int32                  conc_energy;
-    opus_int                    conc_energy_shift;
-    opus_int16                  prevLTP_scale_Q14;
-    opus_int32                  prevGain_Q16[ 2 ];
-    opus_int                    fs_kHz;
-    opus_int                    nb_subfr;
-    opus_int                    subfr_length;
-    opus_int                    enable_deep_plc;
+    oac_int32                  pitchL_Q8;                          /* Pitch lag to use for voiced concealment                          */
+    oac_int16                  LTPCoef_Q14[ LTP_ORDER ];           /* LTP coefficients to use for voiced concealment                   */
+    oac_int16                  prevLPC_Q12[ MAX_LPC_ORDER ];
+    oac_int                    last_frame_lost;                    /* Was previous frame lost                                          */
+    oac_int32                  rand_seed;                          /* Seed for unvoiced signal generation                              */
+    oac_int16                  randScale_Q14;                      /* Scaling of unvoiced random signal                                */
+    oac_int32                  conc_energy;
+    oac_int                    conc_energy_shift;
+    oac_int16                  prevLTP_scale_Q14;
+    oac_int32                  prevGain_Q16[ 2 ];
+    oac_int                    fs_kHz;
+    oac_int                    nb_subfr;
+    oac_int                    subfr_length;
+    oac_int                    enable_deep_plc;
 } silk_PLC_struct;
 
 /* Struct for CNG */
 typedef struct {
-    opus_int32                  CNG_exc_buf_Q14[ MAX_FRAME_LENGTH ];
-    opus_int16                  CNG_smth_NLSF_Q15[ MAX_LPC_ORDER ];
-    opus_int32                  CNG_synth_state[ MAX_LPC_ORDER ];
-    opus_int32                  CNG_smth_Gain_Q16;
-    opus_int32                  rand_seed;
-    opus_int                    fs_kHz;
+    oac_int32                  CNG_exc_buf_Q14[ MAX_FRAME_LENGTH ];
+    oac_int16                  CNG_smth_NLSF_Q15[ MAX_LPC_ORDER ];
+    oac_int32                  CNG_synth_state[ MAX_LPC_ORDER ];
+    oac_int32                  CNG_smth_Gain_Q16;
+    oac_int32                  rand_seed;
+    oac_int                    fs_kHz;
 } silk_CNG_struct;
 
 /********************************/
@@ -291,35 +291,35 @@ typedef struct {
 #endif
 #endif
 #define SILK_DECODER_STATE_RESET_START prev_gain_Q16
-    opus_int32                  prev_gain_Q16;
-    opus_int32                  exc_Q14[ MAX_FRAME_LENGTH ];
-    opus_int32                  sLPC_Q14_buf[ MAX_LPC_ORDER ];
-    opus_int16                  outBuf[ MAX_FRAME_LENGTH + 2 * MAX_SUB_FRAME_LENGTH ];  /* Buffer for output signal                     */
-    opus_int                    lagPrev;                            /* Previous Lag                                                     */
-    opus_int8                   LastGainIndex;                      /* Previous gain index                                              */
-    opus_int                    fs_kHz;                             /* Sampling frequency in kHz                                        */
-    opus_int32                  fs_API_hz;                          /* API sample frequency (Hz)                                        */
-    opus_int                    nb_subfr;                           /* Number of 5 ms subframes in a frame                              */
-    opus_int                    frame_length;                       /* Frame length (samples)                                           */
-    opus_int                    subfr_length;                       /* Subframe length (samples)                                        */
-    opus_int                    ltp_mem_length;                     /* Length of LTP memory                                             */
-    opus_int                    LPC_order;                          /* LPC order                                                        */
-    opus_int16                  prevNLSF_Q15[ MAX_LPC_ORDER ];      /* Used to interpolate LSFs                                         */
-    opus_int                    first_frame_after_reset;            /* Flag for deactivating NLSF interpolation                         */
-    const opus_uint8            *pitch_lag_low_bits_iCDF;           /* Pointer to iCDF table for low bits of pitch lag index            */
-    const opus_uint8            *pitch_contour_iCDF;                /* Pointer to iCDF table for pitch contour index                    */
+    oac_int32                  prev_gain_Q16;
+    oac_int32                  exc_Q14[ MAX_FRAME_LENGTH ];
+    oac_int32                  sLPC_Q14_buf[ MAX_LPC_ORDER ];
+    oac_int16                  outBuf[ MAX_FRAME_LENGTH + 2 * MAX_SUB_FRAME_LENGTH ];  /* Buffer for output signal                     */
+    oac_int                    lagPrev;                            /* Previous Lag                                                     */
+    oac_int8                   LastGainIndex;                      /* Previous gain index                                              */
+    oac_int                    fs_kHz;                             /* Sampling frequency in kHz                                        */
+    oac_int32                  fs_API_hz;                          /* API sample frequency (Hz)                                        */
+    oac_int                    nb_subfr;                           /* Number of 5 ms subframes in a frame                              */
+    oac_int                    frame_length;                       /* Frame length (samples)                                           */
+    oac_int                    subfr_length;                       /* Subframe length (samples)                                        */
+    oac_int                    ltp_mem_length;                     /* Length of LTP memory                                             */
+    oac_int                    LPC_order;                          /* LPC order                                                        */
+    oac_int16                  prevNLSF_Q15[ MAX_LPC_ORDER ];      /* Used to interpolate LSFs                                         */
+    oac_int                    first_frame_after_reset;            /* Flag for deactivating NLSF interpolation                         */
+    const oac_uint8            *pitch_lag_low_bits_iCDF;           /* Pointer to iCDF table for low bits of pitch lag index            */
+    const oac_uint8            *pitch_contour_iCDF;                /* Pointer to iCDF table for pitch contour index                    */
 
     /* For buffering payload in case of more frames per packet */
-    opus_int                    nFramesDecoded;
-    opus_int                    nFramesPerPacket;
+    oac_int                    nFramesDecoded;
+    oac_int                    nFramesPerPacket;
 
     /* Specifically for entropy coding */
-    opus_int                    ec_prevSignalType;
-    opus_int16                  ec_prevLagIndex;
+    oac_int                    ec_prevSignalType;
+    oac_int16                  ec_prevLagIndex;
 
-    opus_int                    VAD_flags[ MAX_FRAMES_PER_PACKET ];
-    opus_int                    LBRR_flag;
-    opus_int                    LBRR_flags[ MAX_FRAMES_PER_PACKET ];
+    oac_int                    VAD_flags[ MAX_FRAMES_PER_PACKET ];
+    oac_int                    LBRR_flag;
+    oac_int                    LBRR_flags[ MAX_FRAMES_PER_PACKET ];
 
     silk_resampler_state_struct resampler_state;
 
@@ -332,8 +332,8 @@ typedef struct {
     silk_CNG_struct             sCNG;
 
     /* Stuff used for PLC */
-    opus_int                    lossCnt;
-    opus_int                    prevSignalType;
+    oac_int                    lossCnt;
+    oac_int                    prevSignalType;
     int                         arch;
 
     silk_PLC_struct sPLC;
@@ -345,12 +345,12 @@ typedef struct {
 /************************/
 typedef struct {
     /* Prediction and coding parameters */
-    opus_int                    pitchL[ MAX_NB_SUBFR ];
-    opus_int32                  Gains_Q16[ MAX_NB_SUBFR ];
+    oac_int                    pitchL[ MAX_NB_SUBFR ];
+    oac_int32                  Gains_Q16[ MAX_NB_SUBFR ];
     /* Holds interpolated and final coefficients, 4-byte aligned */
-    silk_DWORD_ALIGN opus_int16 PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ];
-    opus_int16                  LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ];
-    opus_int                    LTP_scale_Q14;
+    silk_DWORD_ALIGN oac_int16 PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ];
+    oac_int16                  LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ];
+    oac_int                    LTP_scale_Q14;
 } silk_decoder_control;
 
 
diff --git a/silk/sum_sqr_shift.c b/silk/sum_sqr_shift.c
index 90ceb7684..77db747a0 100644
--- a/silk/sum_sqr_shift.c
+++ b/silk/sum_sqr_shift.c
@@ -34,15 +34,15 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Compute number of bits to right shift the sum of squares of a vector */
 /* of int16s to make it fit in an int32                                 */
 void silk_sum_sqr_shift(
-    opus_int32                  *energy,            /* O   Energy of x, after shifting to the right                     */
-    opus_int                    *shift,             /* O   Number of bits right shift applied to energy                 */
-    const opus_int16            *x,                 /* I   Input vector                                                 */
-    opus_int                    len                 /* I   Length of input vector                                       */
+    oac_int32                  *energy,            /* O   Energy of x, after shifting to the right                     */
+    oac_int                    *shift,             /* O   Number of bits right shift applied to energy                 */
+    const oac_int16            *x,                 /* I   Input vector                                                 */
+    oac_int                    len                 /* I   Length of input vector                                       */
 )
 {
-    opus_int   i, shft;
-    opus_uint32 nrg_tmp;
-    opus_int32 nrg;
+    oac_int   i, shft;
+    oac_uint32 nrg_tmp;
+    oac_int32 nrg;
 
     /* Do a first run with the maximum shift we could have. */
     shft = 31-silk_CLZ32(len);
@@ -51,12 +51,12 @@ void silk_sum_sqr_shift(
     for( i = 0; i < len - 1; i += 2 ) {
         nrg_tmp = silk_SMULBB( x[ i ], x[ i ] );
         nrg_tmp = silk_SMLABB_ovflw( nrg_tmp, x[ i + 1 ], x[ i + 1 ] );
-        nrg = (opus_int32)silk_ADD_RSHIFT_uint( nrg, nrg_tmp, shft );
+        nrg = (oac_int32)silk_ADD_RSHIFT_uint( nrg, nrg_tmp, shft );
     }
     if( i < len ) {
         /* One sample left to process */
         nrg_tmp = silk_SMULBB( x[ i ], x[ i ] );
-        nrg = (opus_int32)silk_ADD_RSHIFT_uint( nrg, nrg_tmp, shft );
+        nrg = (oac_int32)silk_ADD_RSHIFT_uint( nrg, nrg_tmp, shft );
     }
     silk_assert( nrg >= 0 );
     /* Make sure the result will fit in a 32-bit signed integer with two bits
@@ -66,12 +66,12 @@ void silk_sum_sqr_shift(
     for( i = 0 ; i < len - 1; i += 2 ) {
         nrg_tmp = silk_SMULBB( x[ i ], x[ i ] );
         nrg_tmp = silk_SMLABB_ovflw( nrg_tmp, x[ i + 1 ], x[ i + 1 ] );
-        nrg = (opus_int32)silk_ADD_RSHIFT_uint( nrg, nrg_tmp, shft );
+        nrg = (oac_int32)silk_ADD_RSHIFT_uint( nrg, nrg_tmp, shft );
     }
     if( i < len ) {
         /* One sample left to process */
         nrg_tmp = silk_SMULBB( x[ i ], x[ i ] );
-        nrg = (opus_int32)silk_ADD_RSHIFT_uint( nrg, nrg_tmp, shft );
+        nrg = (oac_int32)silk_ADD_RSHIFT_uint( nrg, nrg_tmp, shft );
     }
 
     silk_assert( nrg >= 0 );
diff --git a/silk/table_LSF_cos.c b/silk/table_LSF_cos.c
index ec9dc6392..99711f66d 100644
--- a/silk/table_LSF_cos.c
+++ b/silk/table_LSF_cos.c
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Cosine approximation table for LSF conversion */
 /* Q12 values (even) */
-const opus_int16 silk_LSFCosTab_FIX_Q12[ LSF_COS_TAB_SZ_FIX + 1 ] = {
+const oac_int16 silk_LSFCosTab_FIX_Q12[ LSF_COS_TAB_SZ_FIX + 1 ] = {
             8192,             8190,             8182,             8170,
             8152,             8130,             8104,             8072,
             8034,             7994,             7946,             7896,
diff --git a/silk/tables.h b/silk/tables.h
index da12b66f6..d61d41a64 100644
--- a/silk/tables.h
+++ b/silk/tables.h
@@ -33,74 +33,74 @@ POSSIBILITY OF SUCH DAMAGE.
 
 
 /* Entropy coding tables (with size in bytes indicated) */
-extern const opus_uint8  silk_gain_iCDF[ 3 ][ N_LEVELS_QGAIN / 8 ];                                 /* 24 */
-extern const opus_uint8  silk_delta_gain_iCDF[ MAX_DELTA_GAIN_QUANT - MIN_DELTA_GAIN_QUANT + 1 ];   /* 41 */
+extern const oac_uint8  silk_gain_iCDF[ 3 ][ N_LEVELS_QGAIN / 8 ];                                 /* 24 */
+extern const oac_uint8  silk_delta_gain_iCDF[ MAX_DELTA_GAIN_QUANT - MIN_DELTA_GAIN_QUANT + 1 ];   /* 41 */
 
-extern const opus_uint8  silk_pitch_lag_iCDF[ 2 * ( PITCH_EST_MAX_LAG_MS - PITCH_EST_MIN_LAG_MS ) ];/* 32 */
-extern const opus_uint8  silk_pitch_delta_iCDF[ 21 ];                                               /*  21 */
-extern const opus_uint8  silk_pitch_contour_iCDF[ 34 ];                                             /*  34 */
-extern const opus_uint8  silk_pitch_contour_NB_iCDF[ 11 ];                                          /*  11 */
-extern const opus_uint8  silk_pitch_contour_10_ms_iCDF[ 12 ];                                       /*  12 */
-extern const opus_uint8  silk_pitch_contour_10_ms_NB_iCDF[ 3 ];                                     /*   3 */
+extern const oac_uint8  silk_pitch_lag_iCDF[ 2 * ( PITCH_EST_MAX_LAG_MS - PITCH_EST_MIN_LAG_MS ) ];/* 32 */
+extern const oac_uint8  silk_pitch_delta_iCDF[ 21 ];                                               /*  21 */
+extern const oac_uint8  silk_pitch_contour_iCDF[ 34 ];                                             /*  34 */
+extern const oac_uint8  silk_pitch_contour_NB_iCDF[ 11 ];                                          /*  11 */
+extern const oac_uint8  silk_pitch_contour_10_ms_iCDF[ 12 ];                                       /*  12 */
+extern const oac_uint8  silk_pitch_contour_10_ms_NB_iCDF[ 3 ];                                     /*   3 */
 
-extern const opus_uint8  silk_pulses_per_block_iCDF[ N_RATE_LEVELS ][ SILK_MAX_PULSES + 2 ];        /* 180 */
-extern const opus_uint8  silk_pulses_per_block_BITS_Q5[ N_RATE_LEVELS - 1 ][ SILK_MAX_PULSES + 2 ]; /* 162 */
+extern const oac_uint8  silk_pulses_per_block_iCDF[ N_RATE_LEVELS ][ SILK_MAX_PULSES + 2 ];        /* 180 */
+extern const oac_uint8  silk_pulses_per_block_BITS_Q5[ N_RATE_LEVELS - 1 ][ SILK_MAX_PULSES + 2 ]; /* 162 */
 
-extern const opus_uint8  silk_rate_levels_iCDF[ 2 ][ N_RATE_LEVELS - 1 ];                           /*  18 */
-extern const opus_uint8  silk_rate_levels_BITS_Q5[ 2 ][ N_RATE_LEVELS - 1 ];                        /*  18 */
+extern const oac_uint8  silk_rate_levels_iCDF[ 2 ][ N_RATE_LEVELS - 1 ];                           /*  18 */
+extern const oac_uint8  silk_rate_levels_BITS_Q5[ 2 ][ N_RATE_LEVELS - 1 ];                        /*  18 */
 
-extern const opus_uint8  silk_max_pulses_table[ 4 ];                                                /*   4 */
+extern const oac_uint8  silk_max_pulses_table[ 4 ];                                                /*   4 */
 
-extern const opus_uint8  silk_shell_code_table0[ 152 ];                                             /* 152 */
-extern const opus_uint8  silk_shell_code_table1[ 152 ];                                             /* 152 */
-extern const opus_uint8  silk_shell_code_table2[ 152 ];                                             /* 152 */
-extern const opus_uint8  silk_shell_code_table3[ 152 ];                                             /* 152 */
-extern const opus_uint8  silk_shell_code_table_offsets[ SILK_MAX_PULSES + 1 ];                      /*  17 */
+extern const oac_uint8  silk_shell_code_table0[ 152 ];                                             /* 152 */
+extern const oac_uint8  silk_shell_code_table1[ 152 ];                                             /* 152 */
+extern const oac_uint8  silk_shell_code_table2[ 152 ];                                             /* 152 */
+extern const oac_uint8  silk_shell_code_table3[ 152 ];                                             /* 152 */
+extern const oac_uint8  silk_shell_code_table_offsets[ SILK_MAX_PULSES + 1 ];                      /*  17 */
 
-extern const opus_uint8  silk_lsb_iCDF[ 2 ];                                                        /*   2 */
+extern const oac_uint8  silk_lsb_iCDF[ 2 ];                                                        /*   2 */
 
-extern const opus_uint8  silk_sign_iCDF[ 42 ];                                                      /*  42 */
+extern const oac_uint8  silk_sign_iCDF[ 42 ];                                                      /*  42 */
 
-extern const opus_uint8  silk_uniform3_iCDF[ 3 ];                                                   /*   3 */
-extern const opus_uint8  silk_uniform4_iCDF[ 4 ];                                                   /*   4 */
-extern const opus_uint8  silk_uniform5_iCDF[ 5 ];                                                   /*   5 */
-extern const opus_uint8  silk_uniform6_iCDF[ 6 ];                                                   /*   6 */
-extern const opus_uint8  silk_uniform8_iCDF[ 8 ];                                                   /*   8 */
+extern const oac_uint8  silk_uniform3_iCDF[ 3 ];                                                   /*   3 */
+extern const oac_uint8  silk_uniform4_iCDF[ 4 ];                                                   /*   4 */
+extern const oac_uint8  silk_uniform5_iCDF[ 5 ];                                                   /*   5 */
+extern const oac_uint8  silk_uniform6_iCDF[ 6 ];                                                   /*   6 */
+extern const oac_uint8  silk_uniform8_iCDF[ 8 ];                                                   /*   8 */
 
-extern const opus_uint8  silk_NLSF_EXT_iCDF[ 7 ];                                                   /*   7 */
+extern const oac_uint8  silk_NLSF_EXT_iCDF[ 7 ];                                                   /*   7 */
 
-extern const opus_uint8  silk_LTP_per_index_iCDF[ 3 ];                                              /*   3 */
-extern const opus_uint8  * const silk_LTP_gain_iCDF_ptrs[ NB_LTP_CBKS ];                            /*   3 */
-extern const opus_uint8  * const silk_LTP_gain_BITS_Q5_ptrs[ NB_LTP_CBKS ];                         /*   3 */
-extern const opus_int8   * const silk_LTP_vq_ptrs_Q7[ NB_LTP_CBKS ];                                /* 168 */
-extern const opus_uint8  * const silk_LTP_vq_gain_ptrs_Q7[NB_LTP_CBKS];
-extern const opus_int8   silk_LTP_vq_sizes[ NB_LTP_CBKS ];                                          /*   3 */
+extern const oac_uint8  silk_LTP_per_index_iCDF[ 3 ];                                              /*   3 */
+extern const oac_uint8  * const silk_LTP_gain_iCDF_ptrs[ NB_LTP_CBKS ];                            /*   3 */
+extern const oac_uint8  * const silk_LTP_gain_BITS_Q5_ptrs[ NB_LTP_CBKS ];                         /*   3 */
+extern const oac_int8   * const silk_LTP_vq_ptrs_Q7[ NB_LTP_CBKS ];                                /* 168 */
+extern const oac_uint8  * const silk_LTP_vq_gain_ptrs_Q7[NB_LTP_CBKS];
+extern const oac_int8   silk_LTP_vq_sizes[ NB_LTP_CBKS ];                                          /*   3 */
 
-extern const opus_uint8  silk_LTPscale_iCDF[ 3 ];                                                   /*   4 */
-extern const opus_int16  silk_LTPScales_table_Q14[ 3 ];                                             /*   6 */
+extern const oac_uint8  silk_LTPscale_iCDF[ 3 ];                                                   /*   4 */
+extern const oac_int16  silk_LTPScales_table_Q14[ 3 ];                                             /*   6 */
 
-extern const opus_uint8  silk_type_offset_VAD_iCDF[ 4 ];                                            /*   4 */
-extern const opus_uint8  silk_type_offset_no_VAD_iCDF[ 2 ];                                         /*   2 */
+extern const oac_uint8  silk_type_offset_VAD_iCDF[ 4 ];                                            /*   4 */
+extern const oac_uint8  silk_type_offset_no_VAD_iCDF[ 2 ];                                         /*   2 */
 
-extern const opus_int16  silk_stereo_pred_quant_Q13[ STEREO_QUANT_TAB_SIZE ];                       /*  32 */
-extern const opus_uint8  silk_stereo_pred_joint_iCDF[ 25 ];                                         /*  25 */
-extern const opus_uint8  silk_stereo_only_code_mid_iCDF[ 2 ];                                       /*   2 */
+extern const oac_int16  silk_stereo_pred_quant_Q13[ STEREO_QUANT_TAB_SIZE ];                       /*  32 */
+extern const oac_uint8  silk_stereo_pred_joint_iCDF[ 25 ];                                         /*  25 */
+extern const oac_uint8  silk_stereo_only_code_mid_iCDF[ 2 ];                                       /*   2 */
 
-extern const opus_uint8  * const silk_LBRR_flags_iCDF_ptr[ 2 ];                                     /*  10 */
+extern const oac_uint8  * const silk_LBRR_flags_iCDF_ptr[ 2 ];                                     /*  10 */
 
-extern const opus_uint8  silk_NLSF_interpolation_factor_iCDF[ 5 ];                                  /*   5 */
+extern const oac_uint8  silk_NLSF_interpolation_factor_iCDF[ 5 ];                                  /*   5 */
 
 extern const silk_NLSF_CB_struct silk_NLSF_CB_WB;                                                   /* 1040 */
 extern const silk_NLSF_CB_struct silk_NLSF_CB_NB_MB;                                                /* 728 */
 
 /* Quantization offsets */
-extern const opus_int16  silk_Quantization_Offsets_Q10[ 2 ][ 2 ];                                   /*   8 */
+extern const oac_int16  silk_Quantization_Offsets_Q10[ 2 ][ 2 ];                                   /*   8 */
 
 /* Interpolation points for filter coefficients used in the bandwidth transition smoother */
-extern const opus_int32  silk_Transition_LP_B_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NB ];           /*  60 */
-extern const opus_int32  silk_Transition_LP_A_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NA ];           /*  60 */
+extern const oac_int32  silk_Transition_LP_B_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NB ];           /*  60 */
+extern const oac_int32  silk_Transition_LP_A_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NA ];           /*  60 */
 
 /* Rom table with cosine values */
-extern const opus_int16  silk_LSFCosTab_FIX_Q12[ LSF_COS_TAB_SZ_FIX + 1 ];                          /* 258 */
+extern const oac_int16  silk_LSFCosTab_FIX_Q12[ LSF_COS_TAB_SZ_FIX + 1 ];                          /* 258 */
 
 #endif
diff --git a/silk/tables_LTP.c b/silk/tables_LTP.c
index 5e12c8643..b7eb60611 100644
--- a/silk/tables_LTP.c
+++ b/silk/tables_LTP.c
@@ -31,55 +31,55 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "tables.h"
 
-const opus_uint8 silk_LTP_per_index_iCDF[3] = {
+const oac_uint8 silk_LTP_per_index_iCDF[3] = {
        179,     99,      0
 };
 
-static const opus_uint8 silk_LTP_gain_iCDF_0[8] = {
+static const oac_uint8 silk_LTP_gain_iCDF_0[8] = {
         71,     56,     43,     30,     21,     12,      6,      0
 };
 
-static const opus_uint8 silk_LTP_gain_iCDF_1[16] = {
+static const oac_uint8 silk_LTP_gain_iCDF_1[16] = {
        199,    165,    144,    124,    109,     96,     84,     71,
         61,     51,     42,     32,     23,     15,      8,      0
 };
 
-static const opus_uint8 silk_LTP_gain_iCDF_2[32] = {
+static const oac_uint8 silk_LTP_gain_iCDF_2[32] = {
        241,    225,    211,    199,    187,    175,    164,    153,
        142,    132,    123,    114,    105,     96,     88,     80,
         72,     64,     57,     50,     44,     38,     33,     29,
         24,     20,     16,     12,      9,      5,      2,      0
 };
 
-static const opus_uint8 silk_LTP_gain_BITS_Q5_0[8] = {
+static const oac_uint8 silk_LTP_gain_BITS_Q5_0[8] = {
         15,    131,    138,    138,    155,    155,    173,    173
 };
 
-static const opus_uint8 silk_LTP_gain_BITS_Q5_1[16] = {
+static const oac_uint8 silk_LTP_gain_BITS_Q5_1[16] = {
         69,     93,    115,    118,    131,    138,    141,    138,
        150,    150,    155,    150,    155,    160,    166,    160
 };
 
-static const opus_uint8 silk_LTP_gain_BITS_Q5_2[32] = {
+static const oac_uint8 silk_LTP_gain_BITS_Q5_2[32] = {
        131,    128,    134,    141,    141,    141,    145,    145,
        145,    150,    155,    155,    155,    155,    160,    160,
        160,    160,    166,    166,    173,    173,    182,    192,
        182,    192,    192,    192,    205,    192,    205,    224
 };
 
-const opus_uint8 * const silk_LTP_gain_iCDF_ptrs[NB_LTP_CBKS] = {
+const oac_uint8 * const silk_LTP_gain_iCDF_ptrs[NB_LTP_CBKS] = {
     silk_LTP_gain_iCDF_0,
     silk_LTP_gain_iCDF_1,
     silk_LTP_gain_iCDF_2
 };
 
-const opus_uint8 * const silk_LTP_gain_BITS_Q5_ptrs[NB_LTP_CBKS] = {
+const oac_uint8 * const silk_LTP_gain_BITS_Q5_ptrs[NB_LTP_CBKS] = {
     silk_LTP_gain_BITS_Q5_0,
     silk_LTP_gain_BITS_Q5_1,
     silk_LTP_gain_BITS_Q5_2
 };
 
-static const opus_int8 silk_LTP_gain_vq_0[8][5] =
+static const oac_int8 silk_LTP_gain_vq_0[8][5] =
 {
 {
          4,      6,     24,      7,      5
@@ -107,7 +107,7 @@ static const opus_int8 silk_LTP_gain_vq_0[8][5] =
 }
 };
 
-static const opus_int8 silk_LTP_gain_vq_1[16][5] =
+static const oac_int8 silk_LTP_gain_vq_1[16][5] =
 {
 {
         13,     22,     39,     23,     12
@@ -159,7 +159,7 @@ static const opus_int8 silk_LTP_gain_vq_1[16][5] =
 }
 };
 
-static const opus_int8 silk_LTP_gain_vq_2[32][5] =
+static const oac_int8 silk_LTP_gain_vq_2[32][5] =
 {
 {
         -6,     27,     61,     39,      5
@@ -259,36 +259,36 @@ static const opus_int8 silk_LTP_gain_vq_2[32][5] =
 }
 };
 
-const opus_int8 * const silk_LTP_vq_ptrs_Q7[NB_LTP_CBKS] = {
-    (opus_int8 *)&silk_LTP_gain_vq_0[0][0],
-    (opus_int8 *)&silk_LTP_gain_vq_1[0][0],
-    (opus_int8 *)&silk_LTP_gain_vq_2[0][0]
+const oac_int8 * const silk_LTP_vq_ptrs_Q7[NB_LTP_CBKS] = {
+    (oac_int8 *)&silk_LTP_gain_vq_0[0][0],
+    (oac_int8 *)&silk_LTP_gain_vq_1[0][0],
+    (oac_int8 *)&silk_LTP_gain_vq_2[0][0]
 };
 
 /* Maximum frequency-dependent response of the pitch taps above,
    computed as max(abs(freqz(taps))) */
-static const opus_uint8 silk_LTP_gain_vq_0_gain[8] = {
+static const oac_uint8 silk_LTP_gain_vq_0_gain[8] = {
       46,      2,     90,     87,     93,     91,     82,     98
 };
 
-static const opus_uint8 silk_LTP_gain_vq_1_gain[16] = {
+static const oac_uint8 silk_LTP_gain_vq_1_gain[16] = {
      109,    120,    118,     12,    113,    115,    117,    119,
       99,     59,     87,    111,     63,    111,    112,     80
 };
 
-static const opus_uint8 silk_LTP_gain_vq_2_gain[32] = {
+static const oac_uint8 silk_LTP_gain_vq_2_gain[32] = {
      126,    124,    125,    124,    129,    121,    126,     23,
      132,    127,    127,    127,    126,    127,    122,    133,
      130,    134,    101,    118,    119,    145,    126,     86,
      124,    120,    123,    119,    170,    173,    107,    109
 };
 
-const opus_uint8 * const silk_LTP_vq_gain_ptrs_Q7[NB_LTP_CBKS] = {
+const oac_uint8 * const silk_LTP_vq_gain_ptrs_Q7[NB_LTP_CBKS] = {
     &silk_LTP_gain_vq_0_gain[0],
     &silk_LTP_gain_vq_1_gain[0],
     &silk_LTP_gain_vq_2_gain[0]
 };
 
-const opus_int8 silk_LTP_vq_sizes[NB_LTP_CBKS] = {
+const oac_int8 silk_LTP_vq_sizes[NB_LTP_CBKS] = {
     8, 16, 32
 };
diff --git a/silk/tables_NLSF_CB_NB_MB.c b/silk/tables_NLSF_CB_NB_MB.c
index 195d5b95b..c26871f57 100644
--- a/silk/tables_NLSF_CB_NB_MB.c
+++ b/silk/tables_NLSF_CB_NB_MB.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "tables.h"
 
-static const opus_uint8 silk_NLSF_CB1_NB_MB_Q8[ 320 ] = {
+static const oac_uint8 silk_NLSF_CB1_NB_MB_Q8[ 320 ] = {
         12,     35,     60,     83,    108,    132,    157,    180,
        206,    228,     15,     32,     55,     77,    101,    125,
        151,    175,    201,    225,     19,     42,     66,     89,
@@ -74,7 +74,7 @@ static const opus_uint8 silk_NLSF_CB1_NB_MB_Q8[ 320 ] = {
         64,     84,    104,    118,    156,    177,    201,    230
 };
 
-static const opus_int16 silk_NLSF_CB1_Wght_Q9[ 320 ] = {
+static const oac_int16 silk_NLSF_CB1_Wght_Q9[ 320 ] = {
      2897, 2314, 2314, 2314, 2287, 2287, 2314, 2300, 2327, 2287,
      2888, 2580, 2394, 2367, 2314, 2274, 2274, 2274, 2274, 2194,
      2487, 2340, 2340, 2314, 2314, 2314, 2340, 2340, 2367, 2354,
@@ -109,7 +109,7 @@ static const opus_int16 silk_NLSF_CB1_Wght_Q9[ 320 ] = {
      2793, 3160, 2726, 2553, 2846, 2513, 2181, 2394, 2221, 2181
 };
 
-static const opus_uint8 silk_NLSF_CB1_iCDF_NB_MB[ 64 ] = {
+static const oac_uint8 silk_NLSF_CB1_iCDF_NB_MB[ 64 ] = {
        212,    178,    148,    129,    108,     96,     85,     82,
         79,     77,     61,     59,     57,     56,     51,     49,
         48,     45,     42,     41,     40,     38,     36,     34,
@@ -120,7 +120,7 @@ static const opus_uint8 silk_NLSF_CB1_iCDF_NB_MB[ 64 ] = {
         28,     20,     19,     18,     12,     11,      5,      0
 };
 
-static const opus_uint8 silk_NLSF_CB2_SELECT_NB_MB[ 160 ] = {
+static const oac_uint8 silk_NLSF_CB2_SELECT_NB_MB[ 160 ] = {
         16,      0,      0,      0,      0,     99,     66,     36,
         36,     34,     36,     34,     34,     34,     34,     83,
         69,     36,     52,     34,    116,    102,     70,     68,
@@ -143,7 +143,7 @@ static const opus_uint8 silk_NLSF_CB2_SELECT_NB_MB[ 160 ] = {
        171,    137,    139,    137,    155,    218,    219,    139
 };
 
-static const opus_uint8 silk_NLSF_CB2_iCDF_NB_MB[ 72 ] = {
+static const oac_uint8 silk_NLSF_CB2_iCDF_NB_MB[ 72 ] = {
        255,    254,    253,    238,     14,      3,      2,      1,
          0,    255,    254,    252,    218,     35,      3,      2,
          1,      0,    255,    254,    250,    208,     59,      4,
@@ -155,7 +155,7 @@ static const opus_uint8 silk_NLSF_CB2_iCDF_NB_MB[ 72 ] = {
        254,    236,    173,     95,     37,      7,      1,      0
 };
 
-static const opus_uint8 silk_NLSF_CB2_BITS_NB_MB_Q5[ 72 ] = {
+static const oac_uint8 silk_NLSF_CB2_BITS_NB_MB_Q5[ 72 ] = {
        255,    255,    255,    131,      6,    145,    255,    255,
        255,    255,    255,    236,     93,     15,     96,    255,
        255,    255,    255,    255,    194,     83,     25,     71,
@@ -167,13 +167,13 @@ static const opus_uint8 silk_NLSF_CB2_BITS_NB_MB_Q5[ 72 ] = {
        251,    123,     65,     55,     68,    100,    171,    255
 };
 
-static const opus_uint8 silk_NLSF_PRED_NB_MB_Q8[ 18 ] = {
+static const oac_uint8 silk_NLSF_PRED_NB_MB_Q8[ 18 ] = {
        179,    138,    140,    148,    151,    149,    153,    151,
        163,    116,     67,     82,     59,     92,     72,    100,
         89,     92
 };
 
-static const opus_int16 silk_NLSF_DELTA_MIN_NB_MB_Q15[ 11 ] = {
+static const oac_int16 silk_NLSF_DELTA_MIN_NB_MB_Q15[ 11 ] = {
        250,      3,      6,      3,      3,      3,      4,      3,
          3,      3,    461
 };
diff --git a/silk/tables_NLSF_CB_WB.c b/silk/tables_NLSF_CB_WB.c
index 421279125..f4f584ef2 100644
--- a/silk/tables_NLSF_CB_WB.c
+++ b/silk/tables_NLSF_CB_WB.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "tables.h"
 
-static const opus_uint8 silk_NLSF_CB1_WB_Q8[ 512 ] = {
+static const oac_uint8 silk_NLSF_CB1_WB_Q8[ 512 ] = {
          7,     23,     38,     54,     69,     85,    100,    116,
        131,    147,    162,    178,    193,    208,    223,    239,
         13,     25,     41,     55,     69,     83,     98,    112,
@@ -98,7 +98,7 @@ static const opus_uint8 silk_NLSF_CB1_WB_Q8[ 512 ] = {
        110,    119,    129,    141,    175,    198,    218,    237
 };
 
-static const opus_int16 silk_NLSF_CB1_WB_Wght_Q9[ 512 ] = {
+static const oac_int16 silk_NLSF_CB1_WB_Wght_Q9[ 512 ] = {
      3657, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2963, 2963, 2925, 2846,
      3216, 3085, 2972, 3056, 3056, 3010, 3010, 3010, 2963, 2963, 3010, 2972, 2888, 2846, 2846, 2726,
      3920, 4014, 2981, 3207, 3207, 2934, 3056, 2846, 3122, 3244, 2925, 2846, 2620, 2553, 2780, 2925,
@@ -133,7 +133,7 @@ static const opus_int16 silk_NLSF_CB1_WB_Wght_Q9[ 512 ] = {
      3920, 3967, 3010, 3197, 3357, 3216, 3291, 3291, 3479, 3704, 3441, 2726, 2181, 2460, 2580, 2607
 };
 
-static const opus_uint8 silk_NLSF_CB1_iCDF_WB[ 64 ] = {
+static const oac_uint8 silk_NLSF_CB1_iCDF_WB[ 64 ] = {
        225,    204,    201,    184,    183,    175,    158,    154,
        153,    135,    119,    115,    113,    110,    109,     99,
         98,     95,     79,     68,     52,     50,     48,     45,
@@ -144,7 +144,7 @@ static const opus_uint8 silk_NLSF_CB1_iCDF_WB[ 64 ] = {
         24,     21,     11,      6,      5,      4,      3,      0
 };
 
-static const opus_uint8 silk_NLSF_CB2_SELECT_WB[ 256 ] = {
+static const oac_uint8 silk_NLSF_CB2_SELECT_WB[ 256 ] = {
          0,      0,      0,      0,      0,      0,      0,      1,
        100,    102,    102,     68,     68,     36,     34,     96,
        164,    107,    158,    185,    180,    185,    139,    102,
@@ -179,7 +179,7 @@ static const opus_uint8 silk_NLSF_CB2_SELECT_WB[ 256 ] = {
        100,    107,    120,    119,     36,    197,     24,      0
 };
 
-static const opus_uint8 silk_NLSF_CB2_iCDF_WB[ 72 ] = {
+static const oac_uint8 silk_NLSF_CB2_iCDF_WB[ 72 ] = {
        255,    254,    253,    244,     12,      3,      2,      1,
          0,    255,    254,    252,    224,     38,      3,      2,
          1,      0,    255,    254,    251,    209,     57,      4,
@@ -191,7 +191,7 @@ static const opus_uint8 silk_NLSF_CB2_iCDF_WB[ 72 ] = {
        248,    227,    177,    100,     19,      2,      1,      0
 };
 
-static const opus_uint8 silk_NLSF_CB2_BITS_WB_Q5[ 72 ] = {
+static const oac_uint8 silk_NLSF_CB2_BITS_WB_Q5[ 72 ] = {
        255,    255,    255,    156,      4,    154,    255,    255,
        255,    255,    255,    227,    102,     15,     92,    255,
        255,    255,    255,    255,    213,     83,     24,     72,
@@ -203,14 +203,14 @@ static const opus_uint8 silk_NLSF_CB2_BITS_WB_Q5[ 72 ] = {
        166,    116,     76,     55,     53,    125,    255,    255
 };
 
-static const opus_uint8 silk_NLSF_PRED_WB_Q8[ 30 ] = {
+static const oac_uint8 silk_NLSF_PRED_WB_Q8[ 30 ] = {
        175,    148,    160,    176,    178,    173,    174,    164,
        177,    174,    196,    182,    198,    192,    182,     68,
         62,     66,     60,     72,    117,     85,     90,    118,
        136,    151,    142,    160,    142,    155
 };
 
-static const opus_int16 silk_NLSF_DELTA_MIN_WB_Q15[ 17 ] = {
+static const oac_int16 silk_NLSF_DELTA_MIN_WB_Q15[ 17 ] = {
        100,      3,     40,      3,      3,      3,      5,     14,
         14,     10,     11,      3,      8,      9,      7,      3,
        347
diff --git a/silk/tables_gain.c b/silk/tables_gain.c
index fb2a3eeb5..d133b91da 100644
--- a/silk/tables_gain.c
+++ b/silk/tables_gain.c
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "tables.h"
 
 
-const opus_uint8 silk_gain_iCDF[ 3 ][ N_LEVELS_QGAIN / 8 ] =
+const oac_uint8 silk_gain_iCDF[ 3 ][ N_LEVELS_QGAIN / 8 ] =
 {
 {
        224,    112,     44,     15,      3,      2,      1,      0
@@ -45,7 +45,7 @@ const opus_uint8 silk_gain_iCDF[ 3 ][ N_LEVELS_QGAIN / 8 ] =
 }
 };
 
-const opus_uint8 silk_delta_gain_iCDF[ MAX_DELTA_GAIN_QUANT - MIN_DELTA_GAIN_QUANT + 1 ] = {
+const oac_uint8 silk_delta_gain_iCDF[ MAX_DELTA_GAIN_QUANT - MIN_DELTA_GAIN_QUANT + 1 ] = {
        250,    245,    234,    203,     71,     50,     42,     38,
         35,     33,     31,     29,     28,     27,     26,     25,
         24,     23,     22,     21,     20,     19,     18,     17,
diff --git a/silk/tables_other.c b/silk/tables_other.c
index b558bf722..989728230 100644
--- a/silk/tables_other.c
+++ b/silk/tables_other.c
@@ -35,67 +35,67 @@ POSSIBILITY OF SUCH DAMAGE.
 
 
 /* Tables for stereo predictor coding */
-const opus_int16 silk_stereo_pred_quant_Q13[ STEREO_QUANT_TAB_SIZE ] = {
+const oac_int16 silk_stereo_pred_quant_Q13[ STEREO_QUANT_TAB_SIZE ] = {
     -13732, -10050, -8266, -7526, -6500, -5000, -2950,  -820,
        820,   2950,  5000,  6500,  7526,  8266, 10050, 13732
 };
-const opus_uint8  silk_stereo_pred_joint_iCDF[ 25 ] = {
+const oac_uint8  silk_stereo_pred_joint_iCDF[ 25 ] = {
     249, 247, 246, 245, 244,
     234, 210, 202, 201, 200,
     197, 174,  82,  59,  56,
      55,  54,  46,  22,  12,
      11,  10,   9,   7,   0
 };
-const opus_uint8  silk_stereo_only_code_mid_iCDF[ 2 ] = { 64, 0 };
+const oac_uint8  silk_stereo_only_code_mid_iCDF[ 2 ] = { 64, 0 };
 
 /* Tables for LBRR flags */
-static const opus_uint8 silk_LBRR_flags_2_iCDF[ 3 ] = { 203, 150, 0 };
-static const opus_uint8 silk_LBRR_flags_3_iCDF[ 7 ] = { 215, 195, 166, 125, 110, 82, 0 };
-const opus_uint8 * const silk_LBRR_flags_iCDF_ptr[ 2 ] = {
+static const oac_uint8 silk_LBRR_flags_2_iCDF[ 3 ] = { 203, 150, 0 };
+static const oac_uint8 silk_LBRR_flags_3_iCDF[ 7 ] = { 215, 195, 166, 125, 110, 82, 0 };
+const oac_uint8 * const silk_LBRR_flags_iCDF_ptr[ 2 ] = {
     silk_LBRR_flags_2_iCDF,
     silk_LBRR_flags_3_iCDF
 };
 
 /* Table for LSB coding */
-const opus_uint8 silk_lsb_iCDF[ 2 ] = { 120, 0 };
+const oac_uint8 silk_lsb_iCDF[ 2 ] = { 120, 0 };
 
 /* Tables for LTPScale */
-const opus_uint8 silk_LTPscale_iCDF[ 3 ] = { 128, 64, 0 };
+const oac_uint8 silk_LTPscale_iCDF[ 3 ] = { 128, 64, 0 };
 
 /* Tables for signal type and offset coding */
-const opus_uint8 silk_type_offset_VAD_iCDF[ 4 ] = {
+const oac_uint8 silk_type_offset_VAD_iCDF[ 4 ] = {
        232,    158,    10,      0
 };
-const opus_uint8 silk_type_offset_no_VAD_iCDF[ 2 ] = {
+const oac_uint8 silk_type_offset_no_VAD_iCDF[ 2 ] = {
        230,      0
 };
 
 /* Tables for NLSF interpolation factor */
-const opus_uint8 silk_NLSF_interpolation_factor_iCDF[ 5 ] = { 243, 221, 192, 181, 0 };
+const oac_uint8 silk_NLSF_interpolation_factor_iCDF[ 5 ] = { 243, 221, 192, 181, 0 };
 
 /* Quantization offsets */
-const opus_int16  silk_Quantization_Offsets_Q10[ 2 ][ 2 ] = {
+const oac_int16  silk_Quantization_Offsets_Q10[ 2 ][ 2 ] = {
     { OFFSET_UVL_Q10, OFFSET_UVH_Q10 }, { OFFSET_VL_Q10, OFFSET_VH_Q10 }
 };
 
 /* Table for LTPScale */
-const opus_int16 silk_LTPScales_table_Q14[ 3 ] = { 15565, 12288, 8192 };
+const oac_int16 silk_LTPScales_table_Q14[ 3 ] = { 15565, 12288, 8192 };
 
 /* Uniform entropy tables */
-const opus_uint8 silk_uniform3_iCDF[ 3 ] = { 171, 85, 0 };
-const opus_uint8 silk_uniform4_iCDF[ 4 ] = { 192, 128, 64, 0 };
-const opus_uint8 silk_uniform5_iCDF[ 5 ] = { 205, 154, 102, 51, 0 };
-const opus_uint8 silk_uniform6_iCDF[ 6 ] = { 213, 171, 128, 85, 43, 0 };
-const opus_uint8 silk_uniform8_iCDF[ 8 ] = { 224, 192, 160, 128, 96, 64, 32, 0 };
+const oac_uint8 silk_uniform3_iCDF[ 3 ] = { 171, 85, 0 };
+const oac_uint8 silk_uniform4_iCDF[ 4 ] = { 192, 128, 64, 0 };
+const oac_uint8 silk_uniform5_iCDF[ 5 ] = { 205, 154, 102, 51, 0 };
+const oac_uint8 silk_uniform6_iCDF[ 6 ] = { 213, 171, 128, 85, 43, 0 };
+const oac_uint8 silk_uniform8_iCDF[ 8 ] = { 224, 192, 160, 128, 96, 64, 32, 0 };
 
-const opus_uint8 silk_NLSF_EXT_iCDF[ 7 ] = { 100, 40, 16, 7, 3, 1, 0 };
+const oac_uint8 silk_NLSF_EXT_iCDF[ 7 ] = { 100, 40, 16, 7, 3, 1, 0 };
 
 /*  Elliptic/Cauer filters designed with 0.1 dB passband ripple,
         80 dB minimum stopband attenuation, and
         [0.95 : 0.15 : 0.35] normalized cut off frequencies. */
 
 /* Interpolation points for filter coefficients used in the bandwidth transition smoother */
-const opus_int32 silk_Transition_LP_B_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NB ] =
+const oac_int32 silk_Transition_LP_B_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NB ] =
 {
 {    250767114,  501534038,  250767114  },
 {    209867381,  419732057,  209867381  },
@@ -105,7 +105,7 @@ const opus_int32 silk_Transition_LP_B_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NB ]
 };
 
 /* Interpolation points for filter coefficients used in the bandwidth transition smoother */
-const opus_int32 silk_Transition_LP_A_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NA ] =
+const oac_int32 silk_Transition_LP_A_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NA ] =
 {
 {    506393414,  239854379  },
 {    411067935,  169683996  },
diff --git a/silk/tables_pitch_lag.c b/silk/tables_pitch_lag.c
index 72490df06..65faed94f 100644
--- a/silk/tables_pitch_lag.c
+++ b/silk/tables_pitch_lag.c
@@ -31,20 +31,20 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "tables.h"
 
-const opus_uint8 silk_pitch_lag_iCDF[ 2 * ( PITCH_EST_MAX_LAG_MS - PITCH_EST_MIN_LAG_MS ) ] = {
+const oac_uint8 silk_pitch_lag_iCDF[ 2 * ( PITCH_EST_MAX_LAG_MS - PITCH_EST_MIN_LAG_MS ) ] = {
        253,    250,    244,    233,    212,    182,    150,    131,
        120,    110,     98,     85,     72,     60,     49,     40,
         32,     25,     19,     15,     13,     11,      9,      8,
          7,      6,      5,      4,      3,      2,      1,      0
 };
 
-const opus_uint8 silk_pitch_delta_iCDF[21] = {
+const oac_uint8 silk_pitch_delta_iCDF[21] = {
        210,    208,    206,    203,    199,    193,    183,    168,
        142,    104,     74,     52,     37,     27,     20,     14,
         10,      6,      4,      2,      0
 };
 
-const opus_uint8 silk_pitch_contour_iCDF[34] = {
+const oac_uint8 silk_pitch_contour_iCDF[34] = {
        223,    201,    183,    167,    152,    138,    124,    111,
         98,     88,     79,     70,     62,     56,     50,     44,
         39,     35,     31,     27,     24,     21,     18,     16,
@@ -52,16 +52,16 @@ const opus_uint8 silk_pitch_contour_iCDF[34] = {
          1,      0
 };
 
-const opus_uint8 silk_pitch_contour_NB_iCDF[11] = {
+const oac_uint8 silk_pitch_contour_NB_iCDF[11] = {
        188,    176,    155,    138,    119,     97,     67,     43,
         26,     10,      0
 };
 
-const opus_uint8 silk_pitch_contour_10_ms_iCDF[12] = {
+const oac_uint8 silk_pitch_contour_10_ms_iCDF[12] = {
        165,    119,     80,     61,     47,     35,     27,     20,
         14,      9,      4,      0
 };
 
-const opus_uint8 silk_pitch_contour_10_ms_NB_iCDF[3] = {
+const oac_uint8 silk_pitch_contour_10_ms_NB_iCDF[3] = {
        113,     63,      0
 };
diff --git a/silk/tables_pulses_per_block.c b/silk/tables_pulses_per_block.c
index c7c01c889..0caee892d 100644
--- a/silk/tables_pulses_per_block.c
+++ b/silk/tables_pulses_per_block.c
@@ -31,11 +31,11 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "tables.h"
 
-const opus_uint8 silk_max_pulses_table[ 4 ] = {
+const oac_uint8 silk_max_pulses_table[ 4 ] = {
          8,     10,     12,     16
 };
 
-const opus_uint8 silk_pulses_per_block_iCDF[ 10 ][ 18 ] = {
+const oac_uint8 silk_pulses_per_block_iCDF[ 10 ][ 18 ] = {
 {
        125,     51,     26,     18,     15,     12,     11,     10,
          9,      8,      7,      6,      5,      4,      3,      2,
@@ -88,7 +88,7 @@ const opus_uint8 silk_pulses_per_block_iCDF[ 10 ][ 18 ] = {
 }
 };
 
-const opus_uint8 silk_pulses_per_block_BITS_Q5[ 9 ][ 18 ] = {
+const oac_uint8 silk_pulses_per_block_BITS_Q5[ 9 ][ 18 ] = {
 {
         31,     57,    107,    160,    205,    205,    255,    255,
        255,    255,    255,    255,    255,    255,    255,    255,
@@ -136,7 +136,7 @@ const opus_uint8 silk_pulses_per_block_BITS_Q5[ 9 ][ 18 ] = {
 }
 };
 
-const opus_uint8 silk_rate_levels_iCDF[ 2 ][ 9 ] =
+const oac_uint8 silk_rate_levels_iCDF[ 2 ][ 9 ] =
 {
 {
        241,    190,    178,    132,     87,     74,     41,     14,
@@ -148,7 +148,7 @@ const opus_uint8 silk_rate_levels_iCDF[ 2 ][ 9 ] =
 }
 };
 
-const opus_uint8 silk_rate_levels_BITS_Q5[ 2 ][ 9 ] =
+const oac_uint8 silk_rate_levels_BITS_Q5[ 2 ][ 9 ] =
 {
 {
        131,     74,    141,     79,     80,    138,     95,    104,
@@ -160,7 +160,7 @@ const opus_uint8 silk_rate_levels_BITS_Q5[ 2 ][ 9 ] =
 }
 };
 
-const opus_uint8 silk_shell_code_table0[ 152 ] = {
+const oac_uint8 silk_shell_code_table0[ 152 ] = {
        128,      0,    214,     42,      0,    235,    128,     21,
          0,    244,    184,     72,     11,      0,    248,    214,
        128,     42,      7,      0,    248,    225,    170,     80,
@@ -182,7 +182,7 @@ const opus_uint8 silk_shell_code_table0[ 152 ] = {
         76,     48,     27,     14,      7,      3,      1,      0
 };
 
-const opus_uint8 silk_shell_code_table1[ 152 ] = {
+const oac_uint8 silk_shell_code_table1[ 152 ] = {
        129,      0,    207,     50,      0,    236,    129,     20,
          0,    245,    185,     72,     10,      0,    249,    213,
        129,     42,      6,      0,    250,    226,    169,     87,
@@ -204,7 +204,7 @@ const opus_uint8 silk_shell_code_table1[ 152 ] = {
         79,     51,     30,     15,      6,      2,      1,      0
 };
 
-const opus_uint8 silk_shell_code_table2[ 152 ] = {
+const oac_uint8 silk_shell_code_table2[ 152 ] = {
        129,      0,    203,     54,      0,    234,    129,     23,
          0,    245,    184,     73,     10,      0,    250,    215,
        129,     41,      5,      0,    252,    232,    173,     86,
@@ -226,7 +226,7 @@ const opus_uint8 silk_shell_code_table2[ 152 ] = {
         73,     43,     22,     10,      4,      2,      1,      0
 };
 
-const opus_uint8 silk_shell_code_table3[ 152 ] = {
+const oac_uint8 silk_shell_code_table3[ 152 ] = {
        130,      0,    200,     58,      0,    231,    130,     26,
          0,    244,    184,     76,     12,      0,    249,    214,
        130,     43,      6,      0,    252,    232,    173,     87,
@@ -248,13 +248,13 @@ const opus_uint8 silk_shell_code_table3[ 152 ] = {
         76,     42,     18,      4,      3,      2,      1,      0
 };
 
-const opus_uint8 silk_shell_code_table_offsets[ 17 ] = {
+const oac_uint8 silk_shell_code_table_offsets[ 17 ] = {
          0,      0,      2,      5,      9,     14,     20,     27,
         35,     44,     54,     65,     77,     90,    104,    119,
        135
 };
 
-const opus_uint8 silk_sign_iCDF[ 42 ] = {
+const oac_uint8 silk_sign_iCDF[ 42 ] = {
        254,     49,     67,     77,     82,     93,     99,
        198,     11,     18,     24,     31,     36,     45,
        255,     46,     66,     78,     87,     94,    104,
diff --git a/silk/tests/meson.build b/silk/tests/meson.build
index b7c70f75f..d605abfdf 100644
--- a/silk/tests/meson.build
+++ b/silk/tests/meson.build
@@ -1,6 +1,6 @@
 exe = executable('test_unit_LPC_inv_pred_gain',
   'test_unit_LPC_inv_pred_gain.c', '../LPC_inv_pred_gain.c',
-  include_directories: opus_includes,
+  include_directories: oac_includes,
   link_with: [celt_lib, celt_static_libs, silk_lib, silk_static_libs],
   dependencies: libm,
   install: false)
diff --git a/silk/tests/test_unit_LPC_inv_pred_gain.c b/silk/tests/test_unit_LPC_inv_pred_gain.c
index acdd31af9..b37205e1d 100644
--- a/silk/tests/test_unit_LPC_inv_pred_gain.c
+++ b/silk/tests/test_unit_LPC_inv_pred_gain.c
@@ -39,7 +39,7 @@ POSSIBILITY OF SUCH DAMAGE.
    can catch filters that are definitely unstable. Some
    unstable filters may be classified as stable, but not
    the other way around. */
-int check_stability(opus_int16 *A_Q12, int order) {
+int check_stability(oac_int16 *A_Q12, int order) {
     int i;
     int j;
     int sum_a, sum_abs_a;
@@ -88,7 +88,7 @@ int check_stability(opus_int16 *A_Q12, int order) {
 }
 
 int main(void) {
-    const int arch = opus_select_arch();
+    const int arch = oac_select_arch();
     /* Set to 10000 so all branches in C function are triggered */
     const int loop_num = 10000;
     int count = 0;
@@ -101,15 +101,15 @@ int main(void) {
     printf("Testing silk_LPC_inverse_pred_gain() optimization ...\n");
     for( count = 0; count < loop_num; count++ ) {
         unsigned int i;
-        opus_int     order;
+        oac_int     order;
         unsigned int shift;
-        opus_int16   A_Q12[ SILK_MAX_ORDER_LPC ];
-        opus_int32 gain;
+        oac_int16   A_Q12[ SILK_MAX_ORDER_LPC ];
+        oac_int32 gain;
 
         for( order = 2; order <= SILK_MAX_ORDER_LPC; order += 2 ) { /* order must be even. */
             for( shift = 0; shift < 16; shift++ ) { /* Different dynamic range. */
                 for( i = 0; i < SILK_MAX_ORDER_LPC; i++ ) {
-                    A_Q12[i] = ((opus_int16)rand()) >> shift;
+                    A_Q12[i] = ((oac_int16)rand()) >> shift;
                 }
                 gain = silk_LPC_inverse_pred_gain(A_Q12, order, arch);
                 /* Look for filters that silk_LPC_inverse_pred_gain() thinks are
diff --git a/silk/typedef.h b/silk/typedef.h
index 1c712df09..e59b2464b 100644
--- a/silk/typedef.h
+++ b/silk/typedef.h
@@ -28,8 +28,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef SILK_TYPEDEF_H
 #define SILK_TYPEDEF_H
 
-#include "opus_types.h"
-#include "opus_defines.h"
+#include "oac_types.h"
+#include "oac_defines.h"
 
 #ifndef FIXED_POINT
 # include <float.h>
@@ -37,14 +37,14 @@ POSSIBILITY OF SUCH DAMAGE.
 # define silk_float_MAX  FLT_MAX
 #endif
 
-#define silk_int64_MAX   ((opus_int64)0x7FFFFFFFFFFFFFFFLL)   /*  2^63 - 1 */
-#define silk_int64_MIN   ((opus_int64)0x8000000000000000LL)   /* -2^63 */
+#define silk_int64_MAX   ((oac_int64)0x7FFFFFFFFFFFFFFFLL)   /*  2^63 - 1 */
+#define silk_int64_MIN   ((oac_int64)0x8000000000000000LL)   /* -2^63 */
 #define silk_int32_MAX   0x7FFFFFFF                           /*  2^31 - 1 =  2147483647 */
-#define silk_int32_MIN   ((opus_int32)0x80000000)             /* -2^31     = -2147483648 */
+#define silk_int32_MIN   ((oac_int32)0x80000000)             /* -2^31     = -2147483648 */
 #define silk_int16_MAX   0x7FFF                               /*  2^15 - 1 =  32767 */
-#define silk_int16_MIN   ((opus_int16)0x8000)                 /* -2^15     = -32768 */
+#define silk_int16_MIN   ((oac_int16)0x8000)                 /* -2^15     = -32768 */
 #define silk_int8_MAX    0x7F                                 /*  2^7 - 1  =  127 */
-#define silk_int8_MIN    ((opus_int8)0x80)                    /* -2^7      = -128 */
+#define silk_int8_MIN    ((oac_int8)0x80)                    /* -2^7      = -128 */
 #define silk_uint8_MAX   0xFF                                 /*  2^8 - 1 = 255 */
 
 #define silk_TRUE        1
@@ -64,7 +64,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifdef __GNUC__
 __attribute__((noreturn))
 #endif
-static OPUS_INLINE void _silk_fatal(const char *str, const char *file, int line)
+static OAC_INLINE void _silk_fatal(const char *str, const char *file, int line)
 {
    fprintf (stderr, "Fatal (internal) error in %s, line %d: %s\n", file, line, str);
 #if defined(_MSC_VER)
diff --git a/silk/x86/NSQ_del_dec_avx2.c b/silk/x86/NSQ_del_dec_avx2.c
index 02038fced..94012cbfc 100644
--- a/silk/x86/NSQ_del_dec_avx2.c
+++ b/silk/x86/NSQ_del_dec_avx2.c
@@ -29,11 +29,11 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "config.h"
 #endif
 
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
 #include <string.h>
 #endif
 
-#include "opus_defines.h"
+#include "oac_defines.h"
 #include <immintrin.h>
 
 #include "main.h"
@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "celt/x86/x86cpu.h"
 
 /* Returns TRUE if all assumptions met */
-static OPUS_INLINE int verify_assumptions(const silk_encoder_state *psEncC)
+static OAC_INLINE int verify_assumptions(const silk_encoder_state *psEncC)
 {
     /* This optimization is based on these assumptions        */
     /* These assumptions are fundamental and hence assert are */
@@ -65,7 +65,7 @@ static OPUS_INLINE int verify_assumptions(const silk_encoder_state *psEncC)
     /* Regressions were observed on certain AMD Zen CPUs when      */
     /* nStatesDelayedDecision is 1 or 2. Ideally we should detect  */
     /* these CPUs and enable this optimization on others; however, */
-    /* there is no good way to do so under current OPUS framework. */
+    /* there is no good way to do so under current OAC framework. */
     return psEncC->nStatesDelayedDecision == 3 ||
            psEncC->nStatesDelayedDecision == 4;
 }
@@ -73,7 +73,7 @@ static OPUS_INLINE int verify_assumptions(const silk_encoder_state *psEncC)
 /* Intrinsics not defined on MSVC */
 #ifdef _MSC_VER
 #include <intsafe.h>
-static inline int __builtin_sadd_overflow(opus_int32 a, opus_int32 b, opus_int32* res)
+static inline int __builtin_sadd_overflow(oac_int32 a, oac_int32 b, oac_int32* res)
 {
     *res = a+b;
     return (*res ^ a) & (*res ^ b) & 0x80000000;
@@ -85,46 +85,46 @@ static inline int __builtin_ctz(unsigned int x)
 }
 #endif
 
-static OPUS_INLINE __m128i silk_cvtepi64_epi32_high(__m256i num)
+static OAC_INLINE __m128i silk_cvtepi64_epi32_high(__m256i num)
 {
     return _mm256_castsi256_si128(_mm256_permutevar8x32_epi32(num, _mm256_set_epi32(0, 0, 0, 0, 7, 5, 3, 1)));
 }
 
-static OPUS_INLINE opus_int16 silk_sat16(opus_int32 num)
+static OAC_INLINE oac_int16 silk_sat16(oac_int32 num)
 {
     num = num > silk_int16_MAX ? silk_int16_MAX : num;
     num = num < silk_int16_MIN ? silk_int16_MIN : num;
     return num;
 }
 
-static OPUS_INLINE opus_int32 silk_sar_round_32(opus_int32 a, int bits)
+static OAC_INLINE oac_int32 silk_sar_round_32(oac_int32 a, int bits)
 {
     silk_assert(bits > 0 && bits < 31);
     a += 1 << (bits-1);
     return a >> bits;
 }
 
-static OPUS_INLINE opus_int64 silk_sar_round_smulww(opus_int32 a, opus_int32 b, int bits)
+static OAC_INLINE oac_int64 silk_sar_round_smulww(oac_int32 a, oac_int32 b, int bits)
 {
-#ifndef OPUS_CHECK_ASM
-    opus_int64 t;
+#ifndef OAC_CHECK_ASM
+    oac_int64 t;
 #endif
     silk_assert(bits > 0 && bits < 63);
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     return silk_RSHIFT_ROUND(silk_SMULWW(a, b), bits);
 #else
     /* This code is more correct, but it won't overflow like the C code in some rare cases. */
     silk_assert(bits > 0 && bits < 63);
-    t = ((opus_int64)a) * ((opus_int64)b);
+    t = ((oac_int64)a) * ((oac_int64)b);
     bits += 16;
     t += 1ull << (bits-1);
     return t >> bits;
 #endif
 }
 
-static OPUS_INLINE opus_int32 silk_add_sat32(opus_int32 a, opus_int32 b)
+static OAC_INLINE oac_int32 silk_add_sat32(oac_int32 a, oac_int32 b)
 {
-    opus_int32 sum;
+    oac_int32 sum;
     if (__builtin_sadd_overflow(a, b, &sum))
     {
         return a >= 0 ? silk_int32_MAX : silk_int32_MIN;
@@ -132,28 +132,28 @@ static OPUS_INLINE opus_int32 silk_add_sat32(opus_int32 a, opus_int32 b)
     return sum;
 }
 
-static OPUS_INLINE __m128i silk_mm_srai_round_epi32(__m128i a, int bits)
+static OAC_INLINE __m128i silk_mm_srai_round_epi32(__m128i a, int bits)
 {
     silk_assert(bits > 0 && bits < 31);
     return _mm_srai_epi32(_mm_add_epi32(a, _mm_set1_epi32(1 << (bits - 1))), bits);
 }
 
 /* add/subtract with output saturated */
-static OPUS_INLINE __m128i silk_mm_add_sat_epi32(__m128i a, __m128i b)
+static OAC_INLINE __m128i silk_mm_add_sat_epi32(__m128i a, __m128i b)
 {
     __m128i r = _mm_add_epi32(a, b);
     __m128i OF = _mm_and_si128(_mm_xor_si128(a, r), _mm_xor_si128(b, r));           /* OF = (sum ^ a) & (sum ^ b)   */
     __m128i SAT = _mm_add_epi32(_mm_srli_epi32(a, 31), _mm_set1_epi32(0x7FFFFFFF)); /* SAT = (a >> 31) + 0x7FFFFFFF */
     return _mm_blendv_epi8(r, SAT, _mm_srai_epi32(OF, 31));
 }
-static OPUS_INLINE __m128i silk_mm_sub_sat_epi32(__m128i a, __m128i b)
+static OAC_INLINE __m128i silk_mm_sub_sat_epi32(__m128i a, __m128i b)
 {
     __m128i r = _mm_sub_epi32(a, b);
     __m128i OF = _mm_andnot_si128(_mm_xor_si128(b, r), _mm_xor_si128(a, r));        /* OF = (sum ^ a) & (sum ^ ~b) = (sum ^ a) & ~(sum ^ b) */
     __m128i SAT = _mm_add_epi32(_mm_srli_epi32(a, 31), _mm_set1_epi32(0x7FFFFFFF)); /* SAT = (a >> 31) + 0x7FFFFFFF                         */
     return _mm_blendv_epi8(r, SAT, _mm_srai_epi32(OF, 31));
 }
-static OPUS_INLINE __m256i silk_mm256_sub_sat_epi32(__m256i a, __m256i b)
+static OAC_INLINE __m256i silk_mm256_sub_sat_epi32(__m256i a, __m256i b)
 {
     __m256i r = _mm256_sub_epi32(a, b);
     __m256i OF = _mm256_andnot_si256(_mm256_xor_si256(b, r), _mm256_xor_si256(a, r));        /* OF = (sum ^ a) & (sum ^ ~b) = (sum ^ a) & ~(sum ^ b) */
@@ -161,10 +161,10 @@ static OPUS_INLINE __m256i silk_mm256_sub_sat_epi32(__m256i a, __m256i b)
     return _mm256_blendv_epi8(r, SAT, _mm256_srai_epi32(OF, 31));
 }
 
-static OPUS_INLINE __m128i silk_mm_limit_epi32(__m128i num, opus_int32 limit1, opus_int32 limit2)
+static OAC_INLINE __m128i silk_mm_limit_epi32(__m128i num, oac_int32 limit1, oac_int32 limit2)
 {
-    opus_int32 lo = limit1 < limit2 ? limit1 : limit2;
-    opus_int32 hi = limit1 > limit2 ? limit1 : limit2;
+    oac_int32 lo = limit1 < limit2 ? limit1 : limit2;
+    oac_int32 hi = limit1 > limit2 ? limit1 : limit2;
 
     num = _mm_min_epi32(num, _mm_set1_epi32(hi));
     num = _mm_max_epi32(num, _mm_set1_epi32(lo));
@@ -172,29 +172,29 @@ static OPUS_INLINE __m128i silk_mm_limit_epi32(__m128i num, opus_int32 limit1, o
 }
 
 /* cond < 0 ? -num : num */
-static OPUS_INLINE __m128i silk_mm_sign_epi32(__m128i num, __m128i cond)
+static OAC_INLINE __m128i silk_mm_sign_epi32(__m128i num, __m128i cond)
 {
     return _mm_sign_epi32(num, _mm_or_si128(cond, _mm_set1_epi32(1)));
 }
-static OPUS_INLINE __m256i silk_mm256_sign_epi32(__m256i num, __m256i cond)
+static OAC_INLINE __m256i silk_mm256_sign_epi32(__m256i num, __m256i cond)
 {
     return _mm256_sign_epi32(num, _mm256_or_si256(cond, _mm256_set1_epi32(1)));
 }
 
 /* (a32 * b32) >> 16 */
-static OPUS_INLINE __m128i silk_mm_smulww_epi32(__m128i a, opus_int32 b)
+static OAC_INLINE __m128i silk_mm_smulww_epi32(__m128i a, oac_int32 b)
 {
     return silk_cvtepi64_epi32_high(_mm256_slli_epi64(_mm256_mul_epi32(_mm256_cvtepi32_epi64(a), _mm256_set1_epi32(b)), 16));
 }
 
-/* (a32 * (opus_int32)((opus_int16)(b32))) >> 16 output have to be 32bit int */
-static OPUS_INLINE __m128i silk_mm_smulwb_epi32(__m128i a, opus_int32 b)
+/* (a32 * (oac_int32)((oac_int16)(b32))) >> 16 output have to be 32bit int */
+static OAC_INLINE __m128i silk_mm_smulwb_epi32(__m128i a, oac_int32 b)
 {
-    return silk_cvtepi64_epi32_high(_mm256_mul_epi32(_mm256_cvtepi32_epi64(a), _mm256_set1_epi32((opus_uint32)b<<16)));
+    return silk_cvtepi64_epi32_high(_mm256_mul_epi32(_mm256_cvtepi32_epi64(a), _mm256_set1_epi32((oac_uint32)b<<16)));
 }
 
-/* (opus_int32)((opus_int16)(a3))) * (opus_int32)((opus_int16)(b32)) output have to be 32bit int */
-static OPUS_INLINE __m256i silk_mm256_smulbb_epi32(__m256i a, __m256i b)
+/* (oac_int32)((oac_int16)(a3))) * (oac_int32)((oac_int16)(b32)) output have to be 32bit int */
+static OAC_INLINE __m256i silk_mm256_smulbb_epi32(__m256i a, __m256i b)
 {
     const char FF = (char)0xFF;
     __m256i msk = _mm256_set_epi8(
@@ -207,14 +207,14 @@ static OPUS_INLINE __m256i silk_mm256_smulbb_epi32(__m256i a, __m256i b)
     return _mm256_unpacklo_epi16(lo, hi);
 }
 
-static OPUS_INLINE __m256i silk_mm256_reverse_epi32(__m256i v)
+static OAC_INLINE __m256i silk_mm256_reverse_epi32(__m256i v)
 {
     v = _mm256_shuffle_epi32(v, 0x1B);
     v = _mm256_permute4x64_epi64(v, 0x4E);
     return v;
 }
 
-static OPUS_INLINE opus_int32 silk_mm256_hsum_epi32(__m256i v)
+static OAC_INLINE oac_int32 silk_mm256_hsum_epi32(__m256i v)
 {
     __m128i sum = _mm_add_epi32(_mm256_extracti128_si256(v, 1), _mm256_extracti128_si256(v, 0));
     sum = _mm_add_epi32(sum, _mm_shuffle_epi32(sum, 0x4E));
@@ -222,47 +222,47 @@ static OPUS_INLINE opus_int32 silk_mm256_hsum_epi32(__m256i v)
     return _mm_cvtsi128_si32(sum);
 }
 
-static OPUS_INLINE __m128i silk_mm_hmin_epi32(__m128i num)
+static OAC_INLINE __m128i silk_mm_hmin_epi32(__m128i num)
 {
     num = _mm_min_epi32(num, _mm_shuffle_epi32(num, 0x4E)); /* 0123 -> 2301 */
     num = _mm_min_epi32(num, _mm_shuffle_epi32(num, 0xB1)); /* 0123 -> 1032 */
     return num;
 }
 
-static OPUS_INLINE __m128i silk_mm_hmax_epi32(__m128i num)
+static OAC_INLINE __m128i silk_mm_hmax_epi32(__m128i num)
 {
     num = _mm_max_epi32(num, _mm_shuffle_epi32(num, 0x4E)); /* 0123 -> 2310 */
     num = _mm_max_epi32(num, _mm_shuffle_epi32(num, 0xB1)); /* 0123 -> 1032 */
     return num;
 }
 
-static OPUS_INLINE __m128i silk_mm_mask_hmin_epi32(__m128i num, __m128i mask)
+static OAC_INLINE __m128i silk_mm_mask_hmin_epi32(__m128i num, __m128i mask)
 {
     num = _mm_blendv_epi8(num, _mm_set1_epi32(silk_int32_MAX), mask);
     return silk_mm_hmin_epi32(num);
 }
 
-static OPUS_INLINE __m128i silk_mm_mask_hmax_epi32(__m128i num, __m128i mask)
+static OAC_INLINE __m128i silk_mm_mask_hmax_epi32(__m128i num, __m128i mask)
 {
     num = _mm_blendv_epi8(num, _mm_set1_epi32(silk_int32_MIN), mask);
     return silk_mm_hmax_epi32(num);
 }
 
-static OPUS_INLINE __m128i silk_mm256_rand_epi32(__m128i seed)
+static OAC_INLINE __m128i silk_mm256_rand_epi32(__m128i seed)
 {
     seed = _mm_mullo_epi32(seed, _mm_set1_epi32(RAND_MULTIPLIER));
     seed = _mm_add_epi32(seed, _mm_set1_epi32(RAND_INCREMENT));
     return seed;
 }
 
-static OPUS_INLINE opus_int32 silk_index_of_first_equal_epi32(__m128i a, __m128i b)
+static OAC_INLINE oac_int32 silk_index_of_first_equal_epi32(__m128i a, __m128i b)
 {
     unsigned int mask = _mm_movemask_epi8(_mm_cmpeq_epi32(a, b)) & 0x1111;
     silk_assert(mask != 0);
     return __builtin_ctz(mask) >> 2;
 }
 
-static __m128i silk_index_to_selector(opus_int32 index)
+static __m128i silk_index_to_selector(oac_int32 index)
 {
     silk_assert(index < 4);
     index <<= 2;
@@ -273,7 +273,7 @@ static __m128i silk_index_to_selector(opus_int32 index)
         index + 3, index + 2, index + 1, index + 0);
 }
 
-static opus_int32 silk_select_winner(__m128i num, __m128i selector)
+static oac_int32 silk_select_winner(__m128i num, __m128i selector)
 {
     return _mm_cvtsi128_si32(_mm_shuffle_epi8(num, selector));
 }
@@ -299,20 +299,20 @@ typedef struct
     NSQ_del_dec_sample_struct Samples[DECISION_DELAY];
 } NSQ_del_dec_struct;
 
-static OPUS_INLINE void silk_nsq_del_dec_scale_states_avx2(
+static OAC_INLINE void silk_nsq_del_dec_scale_states_avx2(
     const silk_encoder_state *psEncC,          /* I    Encoder State                   */
     silk_nsq_state *NSQ,                       /* I/O  NSQ state                       */
     NSQ_del_dec_struct *psDelDec,              /* I/O  Delayed decision states         */
-    const opus_int16 x16[],                    /* I    Input                           */
-    opus_int32 x_sc_Q10[MAX_SUB_FRAME_LENGTH], /* O    Input scaled with 1/Gain in Q10 */
-    const opus_int16 sLTP[],                   /* I    Re-whitened LTP state in Q0     */
-    opus_int32 sLTP_Q15[],                     /* O    LTP state matching scaled input */
-    opus_int subfr,                            /* I    Subframe number                 */
-    const opus_int LTP_scale_Q14,              /* I    LTP state scaling               */
-    const opus_int32 Gains_Q16[MAX_NB_SUBFR],  /* I                                    */
-    const opus_int pitchL[MAX_NB_SUBFR],       /* I    Pitch lag                       */
-    const opus_int signal_type,                /* I    Signal type                     */
-    const opus_int decisionDelay               /* I    Decision delay                  */
+    const oac_int16 x16[],                    /* I    Input                           */
+    oac_int32 x_sc_Q10[MAX_SUB_FRAME_LENGTH], /* O    Input scaled with 1/Gain in Q10 */
+    const oac_int16 sLTP[],                   /* I    Re-whitened LTP state in Q0     */
+    oac_int32 sLTP_Q15[],                     /* O    LTP state matching scaled input */
+    oac_int subfr,                            /* I    Subframe number                 */
+    const oac_int LTP_scale_Q14,              /* I    LTP state scaling               */
+    const oac_int32 Gains_Q16[MAX_NB_SUBFR],  /* I                                    */
+    const oac_int pitchL[MAX_NB_SUBFR],       /* I    Pitch lag                       */
+    const oac_int signal_type,                /* I    Signal type                     */
+    const oac_int decisionDelay               /* I    Decision delay                  */
 );
 
 /*******************************************/
@@ -321,69 +321,69 @@ static OPUS_INLINE void silk_nsq_del_dec_scale_states_avx2(
 /* filter always starts with zero state    */
 /* first d output samples are set to zero  */
 /*******************************************/
-static OPUS_INLINE void silk_LPC_analysis_filter_avx2(
-    opus_int16                  *out,               /* O    Output signal                           */
-    const opus_int16            *in,                /* I    Input signal                            */
-    const opus_int16            *B,                 /* I    MA prediction coefficients, Q12 [order] */
-    const opus_int32            len,                /* I    Signal length                           */
-    const opus_int32            order               /* I    Filter order                            */
+static OAC_INLINE void silk_LPC_analysis_filter_avx2(
+    oac_int16                  *out,               /* O    Output signal                           */
+    const oac_int16            *in,                /* I    Input signal                            */
+    const oac_int16            *B,                 /* I    MA prediction coefficients, Q12 [order] */
+    const oac_int32            len,                /* I    Signal length                           */
+    const oac_int32            order               /* I    Filter order                            */
 );
 
 /******************************************/
 /* Noise shape quantizer for one subframe */
 /******************************************/
-static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
+static OAC_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
     silk_nsq_state *NSQ,                        /* I/O  NSQ state                          */
     NSQ_del_dec_struct psDelDec[],              /* I/O  Delayed decision states            */
-    opus_int signalType,                        /* I    Signal type                        */
-    const opus_int32 x_Q10[],                   /* I                                       */
-    opus_int8 pulses[],                         /* O                                       */
-    opus_int16 xq[],                            /* O                                       */
-    opus_int32 sLTP_Q15[],                      /* I/O  LTP filter state                   */
-    opus_int32 delayedGain_Q10[DECISION_DELAY], /* I/O  Gain delay buffer                  */
-    const opus_int16 a_Q12[],                   /* I    Short term prediction coefs        */
-    const opus_int16 b_Q14[],                   /* I    Long term prediction coefs         */
-    const opus_int16 AR_shp_Q13[],              /* I    Noise shaping coefs                */
-    opus_int lag,                               /* I    Pitch lag                          */
-    opus_int32 HarmShapeFIRPacked_Q14,          /* I                                       */
-    opus_int Tilt_Q14,                          /* I    Spectral tilt                      */
-    opus_int32 LF_shp_Q14,                      /* I                                       */
-    opus_int32 Gain_Q16,                        /* I                                       */
-    opus_int Lambda_Q10,                        /* I                                       */
-    opus_int offset_Q10,                        /* I                                       */
-    opus_int length,                            /* I    Input length                       */
-    opus_int subfr,                             /* I    Subframe number                    */
-    opus_int shapingLPCOrder,                   /* I    Shaping LPC filter order           */
-    opus_int predictLPCOrder,                   /* I    Prediction filter order            */
-    opus_int warping_Q16,                       /* I                                       */
+    oac_int signalType,                        /* I    Signal type                        */
+    const oac_int32 x_Q10[],                   /* I                                       */
+    oac_int8 pulses[],                         /* O                                       */
+    oac_int16 xq[],                            /* O                                       */
+    oac_int32 sLTP_Q15[],                      /* I/O  LTP filter state                   */
+    oac_int32 delayedGain_Q10[DECISION_DELAY], /* I/O  Gain delay buffer                  */
+    const oac_int16 a_Q12[],                   /* I    Short term prediction coefs        */
+    const oac_int16 b_Q14[],                   /* I    Long term prediction coefs         */
+    const oac_int16 AR_shp_Q13[],              /* I    Noise shaping coefs                */
+    oac_int lag,                               /* I    Pitch lag                          */
+    oac_int32 HarmShapeFIRPacked_Q14,          /* I                                       */
+    oac_int Tilt_Q14,                          /* I    Spectral tilt                      */
+    oac_int32 LF_shp_Q14,                      /* I                                       */
+    oac_int32 Gain_Q16,                        /* I                                       */
+    oac_int Lambda_Q10,                        /* I                                       */
+    oac_int offset_Q10,                        /* I                                       */
+    oac_int length,                            /* I    Input length                       */
+    oac_int subfr,                             /* I    Subframe number                    */
+    oac_int shapingLPCOrder,                   /* I    Shaping LPC filter order           */
+    oac_int predictLPCOrder,                   /* I    Prediction filter order            */
+    oac_int warping_Q16,                       /* I                                       */
     __m128i MaskDelDec,                         /* I    Mask of states in decision tree    */
-    opus_int *smpl_buf_idx,                     /* I/O  Index to newest samples in buffers */
-    opus_int decisionDelay                      /* I                                       */
+    oac_int *smpl_buf_idx,                     /* I/O  Index to newest samples in buffers */
+    oac_int decisionDelay                      /* I                                       */
 );
 
 void silk_NSQ_del_dec_avx2(
     const silk_encoder_state *psEncC,                            /* I    Encoder State               */
     silk_nsq_state *NSQ,                                         /* I/O  NSQ state                   */
     SideInfoIndices *psIndices,                                  /* I/O  Quantization Indices        */
-    const opus_int16 x16[],                                      /* I    Input                       */
-    opus_int8 pulses[],                                          /* O    Quantized pulse signal      */
-    const opus_int16 *PredCoef_Q12,                              /* I    Short term prediction coefs */
-    const opus_int16 LTPCoef_Q14[LTP_ORDER * MAX_NB_SUBFR],      /* I    Long term prediction coefs  */
-    const opus_int16 AR_Q13[MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER], /* I    Noise shaping coefs         */
-    const opus_int HarmShapeGain_Q14[MAX_NB_SUBFR],              /* I    Long term shaping coefs     */
-    const opus_int Tilt_Q14[MAX_NB_SUBFR],                       /* I    Spectral tilt               */
-    const opus_int32 LF_shp_Q14[MAX_NB_SUBFR],                   /* I    Low frequency shaping coefs */
-    const opus_int32 Gains_Q16[MAX_NB_SUBFR],                    /* I    Quantization step sizes     */
-    const opus_int32 pitchL[MAX_NB_SUBFR],                       /* I    Pitch lags                  */
-    const opus_int Lambda_Q10,                                   /* I    Rate/distortion tradeoff    */
-    const opus_int LTP_scale_Q14                                 /* I    LTP state scaling           */
+    const oac_int16 x16[],                                      /* I    Input                       */
+    oac_int8 pulses[],                                          /* O    Quantized pulse signal      */
+    const oac_int16 *PredCoef_Q12,                              /* I    Short term prediction coefs */
+    const oac_int16 LTPCoef_Q14[LTP_ORDER * MAX_NB_SUBFR],      /* I    Long term prediction coefs  */
+    const oac_int16 AR_Q13[MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER], /* I    Noise shaping coefs         */
+    const oac_int HarmShapeGain_Q14[MAX_NB_SUBFR],              /* I    Long term shaping coefs     */
+    const oac_int Tilt_Q14[MAX_NB_SUBFR],                       /* I    Spectral tilt               */
+    const oac_int32 LF_shp_Q14[MAX_NB_SUBFR],                   /* I    Low frequency shaping coefs */
+    const oac_int32 Gains_Q16[MAX_NB_SUBFR],                    /* I    Quantization step sizes     */
+    const oac_int32 pitchL[MAX_NB_SUBFR],                       /* I    Pitch lags                  */
+    const oac_int Lambda_Q10,                                   /* I    Rate/distortion tradeoff    */
+    const oac_int LTP_scale_Q14                                 /* I    LTP state scaling           */
 )
 {
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     silk_nsq_state NSQ_c;
     SideInfoIndices psIndices_c;
-    opus_int8 pulses_c[MAX_FRAME_LENGTH];
-    const opus_int8 *const pulses_a = pulses;
+    oac_int8 pulses_c[MAX_FRAME_LENGTH];
+    const oac_int8 *const pulses_a = pulses;
 
     silk_memcpy(&NSQ_c, NSQ, sizeof(NSQ_c));
     silk_memcpy(&psIndices_c, psIndices, sizeof(psIndices_c));
@@ -398,17 +398,17 @@ void silk_NSQ_del_dec_avx2(
         return;
     }
 
-    opus_int i, k, lag, start_idx, LSF_interpolation_flag, Winner_ind, subfr;
-    opus_int last_smple_idx, smpl_buf_idx, decisionDelay;
-    const opus_int16 *A_Q12, *B_Q14, *AR_shp_Q13;
-    opus_int16 *pxq;
-    VARDECL(opus_int32, sLTP_Q15);
-    VARDECL(opus_int16, sLTP);
-    opus_int32 HarmShapeFIRPacked_Q14;
-    opus_int offset_Q10;
-    opus_int32 Gain_Q10;
-    opus_int32 x_sc_Q10[MAX_SUB_FRAME_LENGTH];
-    opus_int32 delayedGain_Q10[DECISION_DELAY];
+    oac_int i, k, lag, start_idx, LSF_interpolation_flag, Winner_ind, subfr;
+    oac_int last_smple_idx, smpl_buf_idx, decisionDelay;
+    const oac_int16 *A_Q12, *B_Q14, *AR_shp_Q13;
+    oac_int16 *pxq;
+    VARDECL(oac_int32, sLTP_Q15);
+    VARDECL(oac_int16, sLTP);
+    oac_int32 HarmShapeFIRPacked_Q14;
+    oac_int offset_Q10;
+    oac_int32 Gain_Q10;
+    oac_int32 x_sc_Q10[MAX_SUB_FRAME_LENGTH];
+    oac_int32 delayedGain_Q10[DECISION_DELAY];
     NSQ_del_dec_struct psDelDec = {0};
     NSQ_del_dec_sample_struct *psSample;
     __m128i RDmin_Q10, MaskDelDec, Winner_selector;
@@ -467,8 +467,8 @@ void silk_NSQ_del_dec_avx2(
         LSF_interpolation_flag = 1;
     }
 
-    ALLOC(sLTP_Q15, psEncC->ltp_mem_length + psEncC->frame_length, opus_int32);
-    ALLOC(sLTP, psEncC->ltp_mem_length + psEncC->frame_length, opus_int16);
+    ALLOC(sLTP_Q15, psEncC->ltp_mem_length + psEncC->frame_length, oac_int32);
+    ALLOC(sLTP, psEncC->ltp_mem_length + psEncC->frame_length, oac_int16);
     /* Set up pointers to start of sub frame */
     pxq = &NSQ->xq[psEncC->ltp_mem_length];
     NSQ->sLTP_shp_buf_idx = psEncC->ltp_mem_length;
@@ -483,7 +483,7 @@ void silk_NSQ_del_dec_avx2(
         /* Noise shape parameters */
         silk_assert(HarmShapeGain_Q14[k] >= 0);
         HarmShapeFIRPacked_Q14  =                          silk_RSHIFT( HarmShapeGain_Q14[ k ], 2 );
-        HarmShapeFIRPacked_Q14 |= silk_LSHIFT( (opus_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
+        HarmShapeFIRPacked_Q14 |= silk_LSHIFT( (oac_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
 
         NSQ->rewhite_flag = 0;
         if (psIndices->signalType == TYPE_VOICED)
@@ -515,9 +515,9 @@ void silk_NSQ_del_dec_avx2(
                         last_smple_idx = (last_smple_idx + DECISION_DELAY - 1) % DECISION_DELAY;
                         psSample = &psDelDec.Samples[last_smple_idx];
                         pulses[i - decisionDelay] =
-                            (opus_int8)silk_sar_round_32(silk_select_winner(psSample->Q_Q10, Winner_selector), 10);
+                            (oac_int8)silk_sar_round_32(silk_select_winner(psSample->Q_Q10, Winner_selector), 10);
                         pxq[i - decisionDelay] =
-                            silk_sat16((opus_int32)silk_sar_round_smulww(silk_select_winner(psSample->Xq_Q14, Winner_selector), Gains_Q16[1], 14));
+                            silk_sat16((oac_int32)silk_sar_round_smulww(silk_select_winner(psSample->Xq_Q14, Winner_selector), Gains_Q16[1], 14));
                         NSQ->sLTP_shp_Q14[NSQ->sLTP_shp_buf_idx - decisionDelay + i] =
                             silk_select_winner(psSample->Shape_Q14, Winner_selector);
                     }
@@ -564,9 +564,9 @@ void silk_NSQ_del_dec_avx2(
         psSample = &psDelDec.Samples[last_smple_idx];
 
         pulses[i - decisionDelay] =
-            (opus_int8)silk_sar_round_32(silk_select_winner(psSample->Q_Q10, Winner_selector), 10);
+            (oac_int8)silk_sar_round_32(silk_select_winner(psSample->Q_Q10, Winner_selector), 10);
         pxq[i - decisionDelay] =
-            silk_sat16((opus_int32)silk_sar_round_smulww(silk_select_winner(psSample->Xq_Q14, Winner_selector), Gain_Q10, 8));
+            silk_sat16((oac_int32)silk_sar_round_smulww(silk_select_winner(psSample->Xq_Q14, Winner_selector), Gain_Q10, 8));
         NSQ->sLTP_shp_Q14[NSQ->sLTP_shp_buf_idx - decisionDelay + i] =
             silk_select_winner(psSample->Shape_Q14, Winner_selector);
     }
@@ -585,10 +585,10 @@ void silk_NSQ_del_dec_avx2(
     NSQ->lagPrev = pitchL[psEncC->nb_subfr - 1];
 
     /* Save quantized speech signal */
-    silk_memmove(NSQ->xq, &NSQ->xq[psEncC->frame_length], psEncC->ltp_mem_length * sizeof(opus_int16));
-    silk_memmove(NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[psEncC->frame_length], psEncC->ltp_mem_length * sizeof(opus_int32));
+    silk_memmove(NSQ->xq, &NSQ->xq[psEncC->frame_length], psEncC->ltp_mem_length * sizeof(oac_int16));
+    silk_memmove(NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[psEncC->frame_length], psEncC->ltp_mem_length * sizeof(oac_int32));
 
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     silk_assert(!memcmp(&NSQ_c, NSQ, sizeof(NSQ_c)));
     silk_assert(!memcmp(&psIndices_c, psIndices, sizeof(psIndices_c)));
     silk_assert(!memcmp(pulses_c, pulses_a, sizeof(pulses_c)));
@@ -597,7 +597,7 @@ void silk_NSQ_del_dec_avx2(
     RESTORE_STACK;
 }
 
-static OPUS_INLINE __m128i silk_noise_shape_quantizer_short_prediction_x4(const __m128i *buf32, const opus_int16 *coef16, opus_int order)
+static OAC_INLINE __m128i silk_noise_shape_quantizer_short_prediction_x4(const __m128i *buf32, const oac_int16 *coef16, oac_int order)
 {
     __m256i out;
     silk_assert(order == 10 || order == 16);
@@ -630,39 +630,39 @@ static OPUS_INLINE __m128i silk_noise_shape_quantizer_short_prediction_x4(const
 /******************************************/
 /* Noise shape quantizer for one subframe */
 /******************************************/
-static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
+static OAC_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
     silk_nsq_state *NSQ,                        /* I/O  NSQ state                          */
     NSQ_del_dec_struct *psDelDec,               /* I/O  Delayed decision states            */
-    opus_int signalType,                        /* I    Signal type                        */
-    const opus_int32 x_Q10[],                   /* I                                       */
-    opus_int8 pulses[],                         /* O                                       */
-    opus_int16 xq[],                            /* O                                       */
-    opus_int32 sLTP_Q15[],                      /* I/O  LTP filter state                   */
-    opus_int32 delayedGain_Q10[DECISION_DELAY], /* I/O  Gain delay buffer                  */
-    const opus_int16 a_Q12[],                   /* I    Short term prediction coefs        */
-    const opus_int16 b_Q14[],                   /* I    Long term prediction coefs         */
-    const opus_int16 AR_shp_Q13[],              /* I    Noise shaping coefs                */
-    opus_int lag,                               /* I    Pitch lag                          */
-    opus_int32 HarmShapeFIRPacked_Q14,          /* I                                       */
-    opus_int Tilt_Q14,                          /* I    Spectral tilt                      */
-    opus_int32 LF_shp_Q14,                      /* I                                       */
-    opus_int32 Gain_Q16,                        /* I                                       */
-    opus_int Lambda_Q10,                        /* I                                       */
-    opus_int offset_Q10,                        /* I                                       */
-    opus_int length,                            /* I    Input length                       */
-    opus_int subfr,                             /* I    Subframe number                    */
-    opus_int shapingLPCOrder,                   /* I    Shaping LPC filter order           */
-    opus_int predictLPCOrder,                   /* I    Prediction filter order            */
-    opus_int warping_Q16,                       /* I                                       */
+    oac_int signalType,                        /* I    Signal type                        */
+    const oac_int32 x_Q10[],                   /* I                                       */
+    oac_int8 pulses[],                         /* O                                       */
+    oac_int16 xq[],                            /* O                                       */
+    oac_int32 sLTP_Q15[],                      /* I/O  LTP filter state                   */
+    oac_int32 delayedGain_Q10[DECISION_DELAY], /* I/O  Gain delay buffer                  */
+    const oac_int16 a_Q12[],                   /* I    Short term prediction coefs        */
+    const oac_int16 b_Q14[],                   /* I    Long term prediction coefs         */
+    const oac_int16 AR_shp_Q13[],              /* I    Noise shaping coefs                */
+    oac_int lag,                               /* I    Pitch lag                          */
+    oac_int32 HarmShapeFIRPacked_Q14,          /* I                                       */
+    oac_int Tilt_Q14,                          /* I    Spectral tilt                      */
+    oac_int32 LF_shp_Q14,                      /* I                                       */
+    oac_int32 Gain_Q16,                        /* I                                       */
+    oac_int Lambda_Q10,                        /* I                                       */
+    oac_int offset_Q10,                        /* I                                       */
+    oac_int length,                            /* I    Input length                       */
+    oac_int subfr,                             /* I    Subframe number                    */
+    oac_int shapingLPCOrder,                   /* I    Shaping LPC filter order           */
+    oac_int predictLPCOrder,                   /* I    Prediction filter order            */
+    oac_int warping_Q16,                       /* I                                       */
     __m128i MaskDelDec,                         /* I    Mask of states in decision tree    */
-    opus_int *smpl_buf_idx,                     /* I/O  Index to newest samples in buffers */
-    opus_int decisionDelay                      /* I                                       */
+    oac_int *smpl_buf_idx,                     /* I/O  Index to newest samples in buffers */
+    oac_int decisionDelay                      /* I                                       */
 )
 {
     int i;
-    opus_int32 *shp_lag_ptr = &NSQ->sLTP_shp_Q14[NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS / 2];
-    opus_int32 *pred_lag_ptr = &sLTP_Q15[NSQ->sLTP_buf_idx - lag + LTP_ORDER / 2];
-    opus_int32 Gain_Q10 = Gain_Q16 >> 6;
+    oac_int32 *shp_lag_ptr = &NSQ->sLTP_shp_Q14[NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS / 2];
+    oac_int32 *pred_lag_ptr = &sLTP_Q15[NSQ->sLTP_buf_idx - lag + LTP_ORDER / 2];
+    oac_int32 Gain_Q10 = Gain_Q16 >> 6;
 
     for (i = 0; i < length; i++)
     {
@@ -688,8 +688,8 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
         __m128i Winner_rand_state, Winner_selector;
         __m128i tmp0, tmp1;
         NSQ_del_dec_sample_struct *psLastSample, *psSample;
-        opus_int32 RDmin_ind, RDmax_ind, last_smple_idx;
-        opus_int32 LTP_pred_Q14, n_LTP_Q14;
+        oac_int32 RDmin_ind, RDmax_ind, last_smple_idx;
+        oac_int32 LTP_pred_Q14, n_LTP_Q14;
 
         /* Long-term prediction */
         if (signalType == TYPE_VOICED)
@@ -898,9 +898,9 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
         if (subfr > 0 || i >= decisionDelay)
         {
             pulses[i - decisionDelay] =
-                (opus_int8)silk_sar_round_32(silk_select_winner(psLastSample->Q_Q10, Winner_selector), 10);
+                (oac_int8)silk_sar_round_32(silk_select_winner(psLastSample->Q_Q10, Winner_selector), 10);
             xq[i - decisionDelay] =
-                silk_sat16((opus_int32)silk_sar_round_smulww(silk_select_winner(psLastSample->Xq_Q14, Winner_selector), delayedGain_Q10[last_smple_idx], 8));
+                silk_sat16((oac_int32)silk_sar_round_smulww(silk_select_winner(psLastSample->Xq_Q14, Winner_selector), delayedGain_Q10[last_smple_idx], 8));
             NSQ->sLTP_shp_Q14[NSQ->sLTP_shp_buf_idx - decisionDelay] =
                 silk_select_winner(psLastSample->Shape_Q14, Winner_selector);
             sLTP_Q15[NSQ->sLTP_buf_idx - decisionDelay] =
@@ -930,25 +930,25 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
     }
 }
 
-static OPUS_INLINE void silk_nsq_del_dec_scale_states_avx2(
+static OAC_INLINE void silk_nsq_del_dec_scale_states_avx2(
     const silk_encoder_state *psEncC,          /* I    Encoder State                   */
     silk_nsq_state *NSQ,                       /* I/O  NSQ state                       */
     NSQ_del_dec_struct *psDelDec,              /* I/O  Delayed decision states         */
-    const opus_int16 x16[],                    /* I    Input                           */
-    opus_int32 x_sc_Q10[MAX_SUB_FRAME_LENGTH], /* O    Input scaled with 1/Gain in Q10 */
-    const opus_int16 sLTP[],                   /* I    Re-whitened LTP state in Q0     */
-    opus_int32 sLTP_Q15[],                     /* O    LTP state matching scaled input */
-    opus_int subfr,                            /* I    Subframe number                 */
-    const opus_int LTP_scale_Q14,              /* I    LTP state scaling               */
-    const opus_int32 Gains_Q16[MAX_NB_SUBFR],  /* I                                    */
-    const opus_int pitchL[MAX_NB_SUBFR],       /* I    Pitch lag                       */
-    const opus_int signal_type,                /* I    Signal type                     */
-    const opus_int decisionDelay               /* I    Decision delay                  */
+    const oac_int16 x16[],                    /* I    Input                           */
+    oac_int32 x_sc_Q10[MAX_SUB_FRAME_LENGTH], /* O    Input scaled with 1/Gain in Q10 */
+    const oac_int16 sLTP[],                   /* I    Re-whitened LTP state in Q0     */
+    oac_int32 sLTP_Q15[],                     /* O    LTP state matching scaled input */
+    oac_int subfr,                            /* I    Subframe number                 */
+    const oac_int LTP_scale_Q14,              /* I    LTP state scaling               */
+    const oac_int32 Gains_Q16[MAX_NB_SUBFR],  /* I                                    */
+    const oac_int pitchL[MAX_NB_SUBFR],       /* I    Pitch lag                       */
+    const oac_int signal_type,                /* I    Signal type                     */
+    const oac_int decisionDelay               /* I    Decision delay                  */
 )
 {
     int i;
-    opus_int lag;
-    opus_int32 gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
+    oac_int lag;
+    oac_int32 gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
     NSQ_del_dec_sample_struct *psSample;
 
     lag = pitchL[subfr];
@@ -987,7 +987,7 @@ static OPUS_INLINE void silk_nsq_del_dec_scale_states_avx2(
         /* Scale long-term shaping state */
         for (i = NSQ->sLTP_shp_buf_idx - psEncC->ltp_mem_length; i < NSQ->sLTP_shp_buf_idx; i+=4)
         {
-	    opus_int32 *p = &NSQ->sLTP_shp_Q14[i];
+	    oac_int32 *p = &NSQ->sLTP_shp_Q14[i];
             _mm_storeu_si128((__m128i*)(void*)p, silk_mm_smulww_epi32(_mm_loadu_si128((__m128i*)(void*)p), gain_adj_Q16));
         }
 
@@ -996,7 +996,7 @@ static OPUS_INLINE void silk_nsq_del_dec_scale_states_avx2(
         {
             for (i = NSQ->sLTP_buf_idx - lag - LTP_ORDER / 2; i < NSQ->sLTP_buf_idx - decisionDelay; i++)
             {
-                sLTP_Q15[i] = ((opus_int64)sLTP_Q15[i]) * ((opus_int64)gain_adj_Q16) >> 16;
+                sLTP_Q15[i] = ((oac_int64)sLTP_Q15[i]) * ((oac_int64)gain_adj_Q16) >> 16;
             }
         }
 
@@ -1025,21 +1025,21 @@ static OPUS_INLINE void silk_nsq_del_dec_scale_states_avx2(
     }
 }
 
-static OPUS_INLINE void silk_LPC_analysis_filter_avx2(
-    opus_int16                  *out,               /* O    Output signal                           */
-    const opus_int16            *in,                /* I    Input signal                            */
-    const opus_int16            *B,                 /* I    MA prediction coefficients, Q12 [order] */
-    const opus_int32            len,                /* I    Signal length                           */
-    const opus_int32            order               /* I    Filter order                            */
+static OAC_INLINE void silk_LPC_analysis_filter_avx2(
+    oac_int16                  *out,               /* O    Output signal                           */
+    const oac_int16            *in,                /* I    Input signal                            */
+    const oac_int16            *B,                 /* I    MA prediction coefficients, Q12 [order] */
+    const oac_int32            len,                /* I    Signal length                           */
+    const oac_int32            order               /* I    Filter order                            */
 )
 {
     int i;
-    opus_int32       out32_Q12, out32;
+    oac_int32       out32_Q12, out32;
     silk_assert(order == 10 || order == 16);
 
     for(i = order; i < len; i++ )
     {
-        const opus_int16 *in_ptr = &in[ i ];
+        const oac_int16 *in_ptr = &in[ i ];
         /* Allowing wrap around so that two wraps can cancel each other. The rare
            cases where the result wraps around can only be triggered by invalid streams*/
 
@@ -1063,7 +1063,7 @@ static OPUS_INLINE void silk_LPC_analysis_filter_avx2(
         out32_Q12 = silk_mm256_hsum_epi32(sum);
 
         /* Subtract prediction */
-        out32_Q12 = silk_SUB32_ovflw( silk_LSHIFT( (opus_int32)*in_ptr, 12 ), out32_Q12 );
+        out32_Q12 = silk_SUB32_ovflw( silk_LSHIFT( (oac_int32)*in_ptr, 12 ), out32_Q12 );
 
         /* Scale to Q0 */
         out32 = silk_sar_round_32(out32_Q12, 12);
@@ -1073,5 +1073,5 @@ static OPUS_INLINE void silk_LPC_analysis_filter_avx2(
     }
 
     /* Set first d output samples to zero */
-    silk_memset( out, 0, order * sizeof( opus_int16 ) );
+    silk_memset( out, 0, order * sizeof( oac_int16 ) );
 }
diff --git a/silk/x86/NSQ_del_dec_sse4_1.c b/silk/x86/NSQ_del_dec_sse4_1.c
index 5937682d2..9d8f542f9 100644
--- a/silk/x86/NSQ_del_dec_sse4_1.c
+++ b/silk/x86/NSQ_del_dec_sse4_1.c
@@ -38,121 +38,121 @@
 #include "stack_alloc.h"
 
 typedef struct {
-    opus_int32 sLPC_Q14[ MAX_SUB_FRAME_LENGTH + NSQ_LPC_BUF_LENGTH ];
-    opus_int32 RandState[ DECISION_DELAY ];
-    opus_int32 Q_Q10[     DECISION_DELAY ];
-    opus_int32 Xq_Q14[    DECISION_DELAY ];
-    opus_int32 Pred_Q15[  DECISION_DELAY ];
-    opus_int32 Shape_Q14[ DECISION_DELAY ];
-    opus_int32 sAR2_Q14[ MAX_SHAPE_LPC_ORDER ];
-    opus_int32 LF_AR_Q14;
-    opus_int32 Diff_Q14;
-    opus_int32 Seed;
-    opus_int32 SeedInit;
-    opus_int32 RD_Q10;
+    oac_int32 sLPC_Q14[ MAX_SUB_FRAME_LENGTH + NSQ_LPC_BUF_LENGTH ];
+    oac_int32 RandState[ DECISION_DELAY ];
+    oac_int32 Q_Q10[     DECISION_DELAY ];
+    oac_int32 Xq_Q14[    DECISION_DELAY ];
+    oac_int32 Pred_Q15[  DECISION_DELAY ];
+    oac_int32 Shape_Q14[ DECISION_DELAY ];
+    oac_int32 sAR2_Q14[ MAX_SHAPE_LPC_ORDER ];
+    oac_int32 LF_AR_Q14;
+    oac_int32 Diff_Q14;
+    oac_int32 Seed;
+    oac_int32 SeedInit;
+    oac_int32 RD_Q10;
 } NSQ_del_dec_struct;
 
 typedef struct {
-    opus_int32 Q_Q10;
-    opus_int32 RD_Q10;
-    opus_int32 xq_Q14;
-    opus_int32 LF_AR_Q14;
-    opus_int32 Diff_Q14;
-    opus_int32 sLTP_shp_Q14;
-    opus_int32 LPC_exc_Q14;
+    oac_int32 Q_Q10;
+    oac_int32 RD_Q10;
+    oac_int32 xq_Q14;
+    oac_int32 LF_AR_Q14;
+    oac_int32 Diff_Q14;
+    oac_int32 sLTP_shp_Q14;
+    oac_int32 LPC_exc_Q14;
 } NSQ_sample_struct;
 
 typedef NSQ_sample_struct  NSQ_sample_pair[ 2 ];
 
-static OPUS_INLINE void silk_nsq_del_dec_scale_states_sse4_1(
+static OAC_INLINE void silk_nsq_del_dec_scale_states_sse4_1(
     const silk_encoder_state *psEncC,               /* I    Encoder State                       */
     silk_nsq_state      *NSQ,                       /* I/O  NSQ state                           */
     NSQ_del_dec_struct  psDelDec[],                 /* I/O  Delayed decision states             */
-    const opus_int16    x16[],                      /* I    Input                               */
-    opus_int32          x_sc_Q10[],                 /* O    Input scaled with 1/Gain in Q10     */
-    const opus_int16    sLTP[],                     /* I    Re-whitened LTP state in Q0         */
-    opus_int32          sLTP_Q15[],                 /* O    LTP state matching scaled input     */
-    opus_int            subfr,                      /* I    Subframe number                     */
-    opus_int            nStatesDelayedDecision,     /* I    Number of del dec states            */
-    const opus_int      LTP_scale_Q14,              /* I    LTP state scaling                   */
-    const opus_int32    Gains_Q16[ MAX_NB_SUBFR ],  /* I                                        */
-    const opus_int      pitchL[ MAX_NB_SUBFR ],     /* I    Pitch lag                           */
-    const opus_int      signal_type,                /* I    Signal type                         */
-    const opus_int      decisionDelay               /* I    Decision delay                      */
+    const oac_int16    x16[],                      /* I    Input                               */
+    oac_int32          x_sc_Q10[],                 /* O    Input scaled with 1/Gain in Q10     */
+    const oac_int16    sLTP[],                     /* I    Re-whitened LTP state in Q0         */
+    oac_int32          sLTP_Q15[],                 /* O    LTP state matching scaled input     */
+    oac_int            subfr,                      /* I    Subframe number                     */
+    oac_int            nStatesDelayedDecision,     /* I    Number of del dec states            */
+    const oac_int      LTP_scale_Q14,              /* I    LTP state scaling                   */
+    const oac_int32    Gains_Q16[ MAX_NB_SUBFR ],  /* I                                        */
+    const oac_int      pitchL[ MAX_NB_SUBFR ],     /* I    Pitch lag                           */
+    const oac_int      signal_type,                /* I    Signal type                         */
+    const oac_int      decisionDelay               /* I    Decision delay                      */
 );
 
 /******************************************/
 /* Noise shape quantizer for one subframe */
 /******************************************/
-static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
+static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                           */
     NSQ_del_dec_struct  psDelDec[],             /* I/O  Delayed decision states             */
-    opus_int            signalType,             /* I    Signal type                         */
-    const opus_int32    x_Q10[],                /* I                                        */
-    opus_int8           pulses[],               /* O                                        */
-    opus_int16          xq[],                   /* O                                        */
-    opus_int32          sLTP_Q15[],             /* I/O  LTP filter state                    */
-    opus_int32          delayedGain_Q10[],      /* I/O  Gain delay buffer                   */
-    const opus_int16    a_Q12[],                /* I    Short term prediction coefs         */
-    const opus_int16    b_Q14[],                /* I    Long term prediction coefs          */
-    const opus_int16    AR_shp_Q13[],           /* I    Noise shaping coefs                 */
-    opus_int            lag,                    /* I    Pitch lag                           */
-    opus_int32          HarmShapeFIRPacked_Q14, /* I                                        */
-    opus_int            Tilt_Q14,               /* I    Spectral tilt                       */
-    opus_int32          LF_shp_Q14,             /* I                                        */
-    opus_int32          Gain_Q16,               /* I                                        */
-    opus_int            Lambda_Q10,             /* I                                        */
-    opus_int            offset_Q10,             /* I                                        */
-    opus_int            length,                 /* I    Input length                        */
-    opus_int            subfr,                  /* I    Subframe number                     */
-    opus_int            shapingLPCOrder,        /* I    Shaping LPC filter order            */
-    opus_int            predictLPCOrder,        /* I    Prediction filter order             */
-    opus_int            warping_Q16,            /* I                                        */
-    opus_int            nStatesDelayedDecision, /* I    Number of states in decision tree   */
-    opus_int            *smpl_buf_idx,          /* I/O  Index to newest samples in buffers  */
-    opus_int            decisionDelay           /* I                                        */
+    oac_int            signalType,             /* I    Signal type                         */
+    const oac_int32    x_Q10[],                /* I                                        */
+    oac_int8           pulses[],               /* O                                        */
+    oac_int16          xq[],                   /* O                                        */
+    oac_int32          sLTP_Q15[],             /* I/O  LTP filter state                    */
+    oac_int32          delayedGain_Q10[],      /* I/O  Gain delay buffer                   */
+    const oac_int16    a_Q12[],                /* I    Short term prediction coefs         */
+    const oac_int16    b_Q14[],                /* I    Long term prediction coefs          */
+    const oac_int16    AR_shp_Q13[],           /* I    Noise shaping coefs                 */
+    oac_int            lag,                    /* I    Pitch lag                           */
+    oac_int32          HarmShapeFIRPacked_Q14, /* I                                        */
+    oac_int            Tilt_Q14,               /* I    Spectral tilt                       */
+    oac_int32          LF_shp_Q14,             /* I                                        */
+    oac_int32          Gain_Q16,               /* I                                        */
+    oac_int            Lambda_Q10,             /* I                                        */
+    oac_int            offset_Q10,             /* I                                        */
+    oac_int            length,                 /* I    Input length                        */
+    oac_int            subfr,                  /* I    Subframe number                     */
+    oac_int            shapingLPCOrder,        /* I    Shaping LPC filter order            */
+    oac_int            predictLPCOrder,        /* I    Prediction filter order             */
+    oac_int            warping_Q16,            /* I                                        */
+    oac_int            nStatesDelayedDecision, /* I    Number of states in decision tree   */
+    oac_int            *smpl_buf_idx,          /* I/O  Index to newest samples in buffers  */
+    oac_int            decisionDelay           /* I                                        */
 );
 
 void silk_NSQ_del_dec_sse4_1(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const opus_int16            x16[],                                        /* I    Input                           */
-    opus_int8                   pulses[],                                     /* O    Quantized pulse signal          */
-    const opus_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const opus_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const opus_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const opus_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const opus_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const opus_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const opus_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const opus_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const opus_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const opus_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
+    const oac_int16            x16[],                                        /* I    Input                           */
+    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
+    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
+    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
+    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
+    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
+    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
+    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
+    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
+    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
+    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
 )
 {
-    opus_int            i, k, lag, start_idx, LSF_interpolation_flag, Winner_ind, subfr;
-    opus_int            last_smple_idx, smpl_buf_idx, decisionDelay;
-    const opus_int16    *A_Q12, *B_Q14, *AR_shp_Q13;
-    opus_int16          *pxq;
-    VARDECL( opus_int32, sLTP_Q15 );
-    VARDECL( opus_int16, sLTP );
-    opus_int32          HarmShapeFIRPacked_Q14;
-    opus_int            offset_Q10;
-    opus_int32          RDmin_Q10, Gain_Q10;
-    VARDECL( opus_int32, x_sc_Q10 );
-    VARDECL( opus_int32, delayedGain_Q10 );
+    oac_int            i, k, lag, start_idx, LSF_interpolation_flag, Winner_ind, subfr;
+    oac_int            last_smple_idx, smpl_buf_idx, decisionDelay;
+    const oac_int16    *A_Q12, *B_Q14, *AR_shp_Q13;
+    oac_int16          *pxq;
+    VARDECL( oac_int32, sLTP_Q15 );
+    VARDECL( oac_int16, sLTP );
+    oac_int32          HarmShapeFIRPacked_Q14;
+    oac_int            offset_Q10;
+    oac_int32          RDmin_Q10, Gain_Q10;
+    VARDECL( oac_int32, x_sc_Q10 );
+    VARDECL( oac_int32, delayedGain_Q10 );
     VARDECL( NSQ_del_dec_struct, psDelDec );
     NSQ_del_dec_struct  *psDD;
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     silk_nsq_state NSQ_c;
     SideInfoIndices psIndices_c;
-    opus_int8 pulses_c[ MAX_FRAME_LENGTH ];
-    const opus_int8 *const pulses_a = pulses;
+    oac_int8 pulses_c[ MAX_FRAME_LENGTH ];
+    const oac_int8 *const pulses_a = pulses;
 #endif
     SAVE_STACK;
 
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     ( void )pulses_a;
     silk_memcpy( &NSQ_c, NSQ, sizeof( NSQ_c ) );
     silk_memcpy( &psIndices_c, psIndices, sizeof( psIndices_c ) );
@@ -193,7 +193,7 @@ void silk_NSQ_del_dec_sse4_1(
         psDD->LF_AR_Q14      = NSQ->sLF_AR_shp_Q14;
         psDD->Diff_Q14       = NSQ->sDiff_shp_Q14;
         psDD->Shape_Q14[ 0 ] = NSQ->sLTP_shp_Q14[ psEncC->ltp_mem_length - 1 ];
-        silk_memcpy( psDD->sLPC_Q14, NSQ->sLPC_Q14, NSQ_LPC_BUF_LENGTH * sizeof( opus_int32 ) );
+        silk_memcpy( psDD->sLPC_Q14, NSQ->sLPC_Q14, NSQ_LPC_BUF_LENGTH * sizeof( oac_int32 ) );
         silk_memcpy( psDD->sAR2_Q14, NSQ->sAR2_Q14, sizeof( NSQ->sAR2_Q14 ) );
     }
 
@@ -219,10 +219,10 @@ void silk_NSQ_del_dec_sse4_1(
         LSF_interpolation_flag = 1;
     }
 
-    ALLOC( sLTP_Q15, psEncC->ltp_mem_length + psEncC->frame_length, opus_int32 );
-    ALLOC( sLTP, psEncC->ltp_mem_length + psEncC->frame_length, opus_int16 );
-    ALLOC( x_sc_Q10, psEncC->subfr_length, opus_int32 );
-    ALLOC( delayedGain_Q10, DECISION_DELAY, opus_int32 );
+    ALLOC( sLTP_Q15, psEncC->ltp_mem_length + psEncC->frame_length, oac_int32 );
+    ALLOC( sLTP, psEncC->ltp_mem_length + psEncC->frame_length, oac_int16 );
+    ALLOC( x_sc_Q10, psEncC->subfr_length, oac_int32 );
+    ALLOC( delayedGain_Q10, DECISION_DELAY, oac_int32 );
     /* Set up pointers to start of sub frame */
     pxq                   = &NSQ->xq[ psEncC->ltp_mem_length ];
     NSQ->sLTP_shp_buf_idx = psEncC->ltp_mem_length;
@@ -236,7 +236,7 @@ void silk_NSQ_del_dec_sse4_1(
         /* Noise shape parameters */
         silk_assert( HarmShapeGain_Q14[ k ] >= 0 );
         HarmShapeFIRPacked_Q14  =                          silk_RSHIFT( HarmShapeGain_Q14[ k ], 2 );
-        HarmShapeFIRPacked_Q14 |= silk_LSHIFT( (opus_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
+        HarmShapeFIRPacked_Q14 |= silk_LSHIFT( (oac_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
 
         NSQ->rewhite_flag = 0;
         if( psIndices->signalType == TYPE_VOICED ) {
@@ -269,8 +269,8 @@ void silk_NSQ_del_dec_sse4_1(
                     for( i = 0; i < decisionDelay; i++ ) {
                         last_smple_idx = ( last_smple_idx - 1 ) % DECISION_DELAY;
                         if( last_smple_idx < 0 ) last_smple_idx += DECISION_DELAY;
-                        pulses[   i - decisionDelay ] = (opus_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ], 10 );
-                        pxq[ i - decisionDelay ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND(
+                        pulses[   i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ], 10 );
+                        pxq[ i - decisionDelay ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND(
                             silk_SMULWW( psDD->Xq_Q14[ last_smple_idx ], Gains_Q16[ 1 ] ), 14 ) );
                         NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay + i ] = psDD->Shape_Q14[ last_smple_idx ];
                     }
@@ -322,12 +322,12 @@ void silk_NSQ_del_dec_sse4_1(
         last_smple_idx = ( last_smple_idx - 1 ) % DECISION_DELAY;
         if( last_smple_idx < 0 ) last_smple_idx += DECISION_DELAY;
 
-        pulses[   i - decisionDelay ] = (opus_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ], 10 );
-        pxq[ i - decisionDelay ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND(
+        pulses[   i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ], 10 );
+        pxq[ i - decisionDelay ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND(
             silk_SMULWW( psDD->Xq_Q14[ last_smple_idx ], Gain_Q10 ), 8 ) );
         NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay + i ] = psDD->Shape_Q14[ last_smple_idx ];
     }
-    silk_memcpy( NSQ->sLPC_Q14, &psDD->sLPC_Q14[ psEncC->subfr_length ], NSQ_LPC_BUF_LENGTH * sizeof( opus_int32 ) );
+    silk_memcpy( NSQ->sLPC_Q14, &psDD->sLPC_Q14[ psEncC->subfr_length ], NSQ_LPC_BUF_LENGTH * sizeof( oac_int32 ) );
     silk_memcpy( NSQ->sAR2_Q14, psDD->sAR2_Q14, sizeof( psDD->sAR2_Q14 ) );
 
     /* Update states */
@@ -336,10 +336,10 @@ void silk_NSQ_del_dec_sse4_1(
     NSQ->lagPrev        = pitchL[ psEncC->nb_subfr - 1 ];
 
     /* Save quantized speech signal */
-    silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int16 ) );
-    silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int32 ) );
+    silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( oac_int16 ) );
+    silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( oac_int32 ) );
 
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     silk_assert( !memcmp( &NSQ_c, NSQ, sizeof( NSQ_c ) ) );
     silk_assert( !memcmp( &psIndices_c, psIndices, sizeof( psIndices_c ) ) );
     silk_assert( !memcmp( pulses_c, pulses_a, psEncC->nb_subfr * psEncC->subfr_length * sizeof( pulses[0] ) ) );
@@ -351,42 +351,42 @@ void silk_NSQ_del_dec_sse4_1(
 /******************************************/
 /* Noise shape quantizer for one subframe */
 /******************************************/
-static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
+static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                           */
     NSQ_del_dec_struct  psDelDec[],             /* I/O  Delayed decision states             */
-    opus_int            signalType,             /* I    Signal type                         */
-    const opus_int32    x_Q10[],                /* I                                        */
-    opus_int8           pulses[],               /* O                                        */
-    opus_int16          xq[],                   /* O                                        */
-    opus_int32          sLTP_Q15[],             /* I/O  LTP filter state                    */
-    opus_int32          delayedGain_Q10[],      /* I/O  Gain delay buffer                   */
-    const opus_int16    a_Q12[],                /* I    Short term prediction coefs         */
-    const opus_int16    b_Q14[],                /* I    Long term prediction coefs          */
-    const opus_int16    AR_shp_Q13[],           /* I    Noise shaping coefs                 */
-    opus_int            lag,                    /* I    Pitch lag                           */
-    opus_int32          HarmShapeFIRPacked_Q14, /* I                                        */
-    opus_int            Tilt_Q14,               /* I    Spectral tilt                       */
-    opus_int32          LF_shp_Q14,             /* I                                        */
-    opus_int32          Gain_Q16,               /* I                                        */
-    opus_int            Lambda_Q10,             /* I                                        */
-    opus_int            offset_Q10,             /* I                                        */
-    opus_int            length,                 /* I    Input length                        */
-    opus_int            subfr,                  /* I    Subframe number                     */
-    opus_int            shapingLPCOrder,        /* I    Shaping LPC filter order            */
-    opus_int            predictLPCOrder,        /* I    Prediction filter order             */
-    opus_int            warping_Q16,            /* I                                        */
-    opus_int            nStatesDelayedDecision, /* I    Number of states in decision tree   */
-    opus_int            *smpl_buf_idx,          /* I/O  Index to newest samples in buffers  */
-    opus_int            decisionDelay           /* I                                        */
+    oac_int            signalType,             /* I    Signal type                         */
+    const oac_int32    x_Q10[],                /* I                                        */
+    oac_int8           pulses[],               /* O                                        */
+    oac_int16          xq[],                   /* O                                        */
+    oac_int32          sLTP_Q15[],             /* I/O  LTP filter state                    */
+    oac_int32          delayedGain_Q10[],      /* I/O  Gain delay buffer                   */
+    const oac_int16    a_Q12[],                /* I    Short term prediction coefs         */
+    const oac_int16    b_Q14[],                /* I    Long term prediction coefs          */
+    const oac_int16    AR_shp_Q13[],           /* I    Noise shaping coefs                 */
+    oac_int            lag,                    /* I    Pitch lag                           */
+    oac_int32          HarmShapeFIRPacked_Q14, /* I                                        */
+    oac_int            Tilt_Q14,               /* I    Spectral tilt                       */
+    oac_int32          LF_shp_Q14,             /* I                                        */
+    oac_int32          Gain_Q16,               /* I                                        */
+    oac_int            Lambda_Q10,             /* I                                        */
+    oac_int            offset_Q10,             /* I                                        */
+    oac_int            length,                 /* I    Input length                        */
+    oac_int            subfr,                  /* I    Subframe number                     */
+    oac_int            shapingLPCOrder,        /* I    Shaping LPC filter order            */
+    oac_int            predictLPCOrder,        /* I    Prediction filter order             */
+    oac_int            warping_Q16,            /* I                                        */
+    oac_int            nStatesDelayedDecision, /* I    Number of states in decision tree   */
+    oac_int            *smpl_buf_idx,          /* I/O  Index to newest samples in buffers  */
+    oac_int            decisionDelay           /* I                                        */
 )
 {
-    opus_int     i, j, k, Winner_ind, RDmin_ind, RDmax_ind, last_smple_idx;
-    opus_int32   Winner_rand_state;
-    opus_int32   LTP_pred_Q14, LPC_pred_Q14, n_AR_Q14, n_LTP_Q14;
-    opus_int32   n_LF_Q14, r_Q10, rr_Q10, rd1_Q10, rd2_Q10, RDmin_Q10, RDmax_Q10;
-    opus_int32   q1_Q0, q1_Q10, q2_Q10, exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10;
-    opus_int32   tmp1, tmp2, sLF_AR_shp_Q14;
-    opus_int32   *pred_lag_ptr, *shp_lag_ptr, *psLPC_Q14;
+    oac_int     i, j, k, Winner_ind, RDmin_ind, RDmax_ind, last_smple_idx;
+    oac_int32   Winner_rand_state;
+    oac_int32   LTP_pred_Q14, LPC_pred_Q14, n_AR_Q14, n_LTP_Q14;
+    oac_int32   n_LF_Q14, r_Q10, rr_Q10, rd1_Q10, rd2_Q10, RDmin_Q10, RDmax_Q10;
+    oac_int32   q1_Q0, q1_Q10, q2_Q10, exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10;
+    oac_int32   tmp1, tmp2, sLF_AR_shp_Q14;
+    oac_int32   *pred_lag_ptr, *shp_lag_ptr, *psLPC_Q14;
     int rdo_offset;
 
     VARDECL( NSQ_sample_pair, psSampleState );
@@ -409,7 +409,7 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
     a_Q12_0123 = OP_CVTEPI16_EPI32_M64( a_Q12 );
     a_Q12_4567 = OP_CVTEPI16_EPI32_M64( a_Q12 + 4 );
 
-    if( opus_likely( predictLPCOrder == 16 ) ) {
+    if( oac_likely( predictLPCOrder == 16 ) ) {
         a_Q12_89AB = OP_CVTEPI16_EPI32_M64( a_Q12 + 8 );
         a_Q12_CDEF = OP_CVTEPI16_EPI32_M64( a_Q12 + 12 );
     }
@@ -509,7 +509,7 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
                 psLPC_Q14_tmp   = _mm_srli_epi64( psLPC_Q14_tmp, 16 );
                 tmpb            = _mm_add_epi32( tmpb, psLPC_Q14_tmp );
 
-                if ( opus_likely( predictLPCOrder == 16 ) )
+                if ( oac_likely( predictLPCOrder == 16 ) )
                 {
                     /* step 3 */
                     psLPC_Q14_tmp   = _mm_loadu_si128( (__m128i *)(void*)(&psLPC_Q14[ -11 ] ) );
@@ -742,16 +742,16 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
 
         /* Replace a state if best from second set outperforms worst in first set */
         if( RDmin_Q10 < RDmax_Q10 ) {
-            silk_memcpy( ( (opus_int32 *)&psDelDec[ RDmax_ind ] ) + i,
-                         ( (opus_int32 *)&psDelDec[ RDmin_ind ] ) + i, sizeof( NSQ_del_dec_struct ) - i * sizeof( opus_int32) );
+            silk_memcpy( ( (oac_int32 *)&psDelDec[ RDmax_ind ] ) + i,
+                         ( (oac_int32 *)&psDelDec[ RDmin_ind ] ) + i, sizeof( NSQ_del_dec_struct ) - i * sizeof( oac_int32) );
             silk_memcpy( &psSampleState[ RDmax_ind ][ 0 ], &psSampleState[ RDmin_ind ][ 1 ], sizeof( NSQ_sample_struct ) );
         }
 
         /* Write samples from winner to output and long-term filter states */
         psDD = &psDelDec[ Winner_ind ];
         if( subfr > 0 || i >= decisionDelay ) {
-            pulses[  i - decisionDelay ] = (opus_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ], 10 );
-            xq[ i - decisionDelay ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND(
+            pulses[  i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ], 10 );
+            xq[ i - decisionDelay ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND(
                 silk_SMULWW( psDD->Xq_Q14[ last_smple_idx ], delayedGain_Q10[ last_smple_idx ] ), 8 ) );
             NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay ] = psDD->Shape_Q14[ last_smple_idx ];
             sLTP_Q15[          NSQ->sLTP_buf_idx     - decisionDelay ] = psDD->Pred_Q15[  last_smple_idx ];
@@ -779,30 +779,30 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
     /* Update LPC states */
     for( k = 0; k < nStatesDelayedDecision; k++ ) {
         psDD = &psDelDec[ k ];
-        silk_memcpy( psDD->sLPC_Q14, &psDD->sLPC_Q14[ length ], NSQ_LPC_BUF_LENGTH * sizeof( opus_int32 ) );
+        silk_memcpy( psDD->sLPC_Q14, &psDD->sLPC_Q14[ length ], NSQ_LPC_BUF_LENGTH * sizeof( oac_int32 ) );
     }
     RESTORE_STACK;
 }
 
-static OPUS_INLINE void silk_nsq_del_dec_scale_states_sse4_1(
+static OAC_INLINE void silk_nsq_del_dec_scale_states_sse4_1(
     const silk_encoder_state *psEncC,               /* I    Encoder State                       */
     silk_nsq_state      *NSQ,                       /* I/O  NSQ state                           */
     NSQ_del_dec_struct  psDelDec[],                 /* I/O  Delayed decision states             */
-    const opus_int16    x16[],                      /* I    Input                               */
-    opus_int32          x_sc_Q10[],                 /* O    Input scaled with 1/Gain in Q10     */
-    const opus_int16    sLTP[],                     /* I    Re-whitened LTP state in Q0         */
-    opus_int32          sLTP_Q15[],                 /* O    LTP state matching scaled input     */
-    opus_int            subfr,                      /* I    Subframe number                     */
-    opus_int            nStatesDelayedDecision,     /* I    Number of del dec states            */
-    const opus_int      LTP_scale_Q14,              /* I    LTP state scaling                   */
-    const opus_int32    Gains_Q16[ MAX_NB_SUBFR ],  /* I                                        */
-    const opus_int      pitchL[ MAX_NB_SUBFR ],     /* I    Pitch lag                           */
-    const opus_int      signal_type,                /* I    Signal type                         */
-    const opus_int      decisionDelay               /* I    Decision delay                      */
+    const oac_int16    x16[],                      /* I    Input                               */
+    oac_int32          x_sc_Q10[],                 /* O    Input scaled with 1/Gain in Q10     */
+    const oac_int16    sLTP[],                     /* I    Re-whitened LTP state in Q0         */
+    oac_int32          sLTP_Q15[],                 /* O    LTP state matching scaled input     */
+    oac_int            subfr,                      /* I    Subframe number                     */
+    oac_int            nStatesDelayedDecision,     /* I    Number of del dec states            */
+    const oac_int      LTP_scale_Q14,              /* I    LTP state scaling                   */
+    const oac_int32    Gains_Q16[ MAX_NB_SUBFR ],  /* I                                        */
+    const oac_int      pitchL[ MAX_NB_SUBFR ],     /* I    Pitch lag                           */
+    const oac_int      signal_type,                /* I    Signal type                         */
+    const oac_int      decisionDelay               /* I    Decision delay                      */
 )
 {
-    opus_int            i, k, lag;
-    opus_int32          gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
+    oac_int            i, k, lag;
+    oac_int32          gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
     NSQ_del_dec_struct  *psDD;
     __m128i xmm_inv_gain_Q26, xmm_x16_x2x0, xmm_x16_x3x1;
 
diff --git a/silk/x86/NSQ_sse4_1.c b/silk/x86/NSQ_sse4_1.c
index 3c9aca7ba..826723401 100644
--- a/silk/x86/NSQ_sse4_1.c
+++ b/silk/x86/NSQ_sse4_1.c
@@ -36,82 +36,82 @@
 #include "celt/x86/x86cpu.h"
 #include "stack_alloc.h"
 
-static OPUS_INLINE void silk_nsq_scale_states_sse4_1(
+static OAC_INLINE void silk_nsq_scale_states_sse4_1(
     const silk_encoder_state *psEncC,              /* I    Encoder State                   */
     silk_nsq_state      *NSQ,                      /* I/O  NSQ state                       */
-    const opus_int16    x16[],                     /* I    input                           */
-    opus_int32          x_sc_Q10[],                /* O    input scaled with 1/Gain        */
-    const opus_int16    sLTP[],                    /* I    re-whitened LTP state in Q0     */
-    opus_int32          sLTP_Q15[],                /* O    LTP state matching scaled input */
-    opus_int            subfr,                     /* I    subframe number                 */
-    const opus_int      LTP_scale_Q14,             /* I                                    */
-    const opus_int32    Gains_Q16[ MAX_NB_SUBFR ], /* I                                    */
-    const opus_int      pitchL[ MAX_NB_SUBFR ],    /* I    Pitch lag                       */
-    const opus_int      signal_type                /* I    Signal type                     */
+    const oac_int16    x16[],                     /* I    input                           */
+    oac_int32          x_sc_Q10[],                /* O    input scaled with 1/Gain        */
+    const oac_int16    sLTP[],                    /* I    re-whitened LTP state in Q0     */
+    oac_int32          sLTP_Q15[],                /* O    LTP state matching scaled input */
+    oac_int            subfr,                     /* I    subframe number                 */
+    const oac_int      LTP_scale_Q14,             /* I                                    */
+    const oac_int32    Gains_Q16[ MAX_NB_SUBFR ], /* I                                    */
+    const oac_int      pitchL[ MAX_NB_SUBFR ],    /* I    Pitch lag                       */
+    const oac_int      signal_type                /* I    Signal type                     */
 );
 
-static OPUS_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
+static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                       */
-    opus_int            signalType,             /* I    Signal type                     */
-    const opus_int32    x_sc_Q10[],             /* I                                    */
-    opus_int8           pulses[],               /* O                                    */
-    opus_int16          xq[],                   /* O                                    */
-    opus_int32          sLTP_Q15[],             /* I/O  LTP state                       */
-    const opus_int16    a_Q12[],                /* I    Short term prediction coefs     */
-    const opus_int16    b_Q14[],                /* I    Long term prediction coefs      */
-    const opus_int16    AR_shp_Q13[],           /* I    Noise shaping AR coefs          */
-    opus_int            lag,                    /* I    Pitch lag                       */
-    opus_int32          HarmShapeFIRPacked_Q14, /* I                                    */
-    opus_int            Tilt_Q14,               /* I    Spectral tilt                   */
-    opus_int32          LF_shp_Q14,             /* I                                    */
-    opus_int32          Gain_Q16,               /* I                                    */
-    opus_int            Lambda_Q10,             /* I                                    */
-    opus_int            offset_Q10,             /* I                                    */
-    opus_int            length,                 /* I    Input length                    */
-    opus_int32          table[][4]              /* I                                    */
+    oac_int            signalType,             /* I    Signal type                     */
+    const oac_int32    x_sc_Q10[],             /* I                                    */
+    oac_int8           pulses[],               /* O                                    */
+    oac_int16          xq[],                   /* O                                    */
+    oac_int32          sLTP_Q15[],             /* I/O  LTP state                       */
+    const oac_int16    a_Q12[],                /* I    Short term prediction coefs     */
+    const oac_int16    b_Q14[],                /* I    Long term prediction coefs      */
+    const oac_int16    AR_shp_Q13[],           /* I    Noise shaping AR coefs          */
+    oac_int            lag,                    /* I    Pitch lag                       */
+    oac_int32          HarmShapeFIRPacked_Q14, /* I                                    */
+    oac_int            Tilt_Q14,               /* I    Spectral tilt                   */
+    oac_int32          LF_shp_Q14,             /* I                                    */
+    oac_int32          Gain_Q16,               /* I                                    */
+    oac_int            Lambda_Q10,             /* I                                    */
+    oac_int            offset_Q10,             /* I                                    */
+    oac_int            length,                 /* I    Input length                    */
+    oac_int32          table[][4]              /* I                                    */
 );
 
 void silk_NSQ_sse4_1(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const opus_int16            x16[],                                        /* I    Input                           */
-    opus_int8                   pulses[],                                     /* O    Quantized pulse signal          */
-    const opus_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const opus_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const opus_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const opus_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const opus_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const opus_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const opus_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const opus_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const opus_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const opus_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
+    const oac_int16            x16[],                                        /* I    Input                           */
+    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
+    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
+    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
+    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
+    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
+    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
+    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
+    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
+    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
+    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
 )
 {
-    opus_int            k, lag, start_idx, LSF_interpolation_flag;
-    const opus_int16    *A_Q12, *B_Q14, *AR_shp_Q13;
-    opus_int16          *pxq;
-    VARDECL( opus_int32, sLTP_Q15 );
-    VARDECL( opus_int16, sLTP );
-    opus_int32          HarmShapeFIRPacked_Q14;
-    opus_int            offset_Q10;
-    VARDECL( opus_int32, x_sc_Q10 );
-
-    opus_int32   table[ 64 ][ 4 ];
-    opus_int32   tmp1;
-    opus_int32   q1_Q10, q2_Q10, rd1_Q20, rd2_Q20;
-
-#ifdef OPUS_CHECK_ASM
+    oac_int            k, lag, start_idx, LSF_interpolation_flag;
+    const oac_int16    *A_Q12, *B_Q14, *AR_shp_Q13;
+    oac_int16          *pxq;
+    VARDECL( oac_int32, sLTP_Q15 );
+    VARDECL( oac_int16, sLTP );
+    oac_int32          HarmShapeFIRPacked_Q14;
+    oac_int            offset_Q10;
+    VARDECL( oac_int32, x_sc_Q10 );
+
+    oac_int32   table[ 64 ][ 4 ];
+    oac_int32   tmp1;
+    oac_int32   q1_Q10, q2_Q10, rd1_Q20, rd2_Q20;
+
+#ifdef OAC_CHECK_ASM
     silk_nsq_state NSQ_c;
     SideInfoIndices psIndices_c;
-    opus_int8 pulses_c[ MAX_FRAME_LENGTH ];
-    const opus_int8 *const pulses_a = pulses;
+    oac_int8 pulses_c[ MAX_FRAME_LENGTH ];
+    const oac_int8 *const pulses_a = pulses;
 #endif
 
     SAVE_STACK;
 
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     ( void )pulses_a;
     silk_memcpy( &NSQ_c, NSQ, sizeof( NSQ_c ) );
     silk_memcpy( &psIndices_c, psIndices, sizeof( psIndices_c ) );
@@ -206,9 +206,9 @@ void silk_NSQ_sse4_1(
         LSF_interpolation_flag = 1;
     }
 
-    ALLOC( sLTP_Q15, psEncC->ltp_mem_length + psEncC->frame_length, opus_int32 );
-    ALLOC( sLTP, psEncC->ltp_mem_length + psEncC->frame_length, opus_int16 );
-    ALLOC( x_sc_Q10, psEncC->subfr_length, opus_int32 );
+    ALLOC( sLTP_Q15, psEncC->ltp_mem_length + psEncC->frame_length, oac_int32 );
+    ALLOC( sLTP, psEncC->ltp_mem_length + psEncC->frame_length, oac_int16 );
+    ALLOC( x_sc_Q10, psEncC->subfr_length, oac_int32 );
     /* Set up pointers to start of sub frame */
     NSQ->sLTP_shp_buf_idx = psEncC->ltp_mem_length;
     NSQ->sLTP_buf_idx     = psEncC->ltp_mem_length;
@@ -221,7 +221,7 @@ void silk_NSQ_sse4_1(
         /* Noise shape parameters */
         silk_assert( HarmShapeGain_Q14[ k ] >= 0 );
         HarmShapeFIRPacked_Q14  =                          silk_RSHIFT( HarmShapeGain_Q14[ k ], 2 );
-        HarmShapeFIRPacked_Q14 |= silk_LSHIFT( (opus_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
+        HarmShapeFIRPacked_Q14 |= silk_LSHIFT( (oac_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
 
         NSQ->rewhite_flag = 0;
         if( psIndices->signalType == TYPE_VOICED ) {
@@ -244,7 +244,7 @@ void silk_NSQ_sse4_1(
 
         silk_nsq_scale_states_sse4_1( psEncC, NSQ, x16, x_sc_Q10, sLTP, sLTP_Q15, k, LTP_scale_Q14, Gains_Q16, pitchL, psIndices->signalType );
 
-        if ( opus_likely( ( 10 == psEncC->shapingLPCOrder ) && ( 16 == psEncC->predictLPCOrder) ) )
+        if ( oac_likely( ( 10 == psEncC->shapingLPCOrder ) && ( 16 == psEncC->predictLPCOrder) ) )
         {
             silk_noise_shape_quantizer_10_16_sse4_1( NSQ, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15, A_Q12, B_Q14,
                 AR_shp_Q13, lag, HarmShapeFIRPacked_Q14, Tilt_Q14[ k ], LF_shp_Q14[ k ], Gains_Q16[ k ], Lambda_Q10,
@@ -266,10 +266,10 @@ void silk_NSQ_sse4_1(
     NSQ->lagPrev = pitchL[ psEncC->nb_subfr - 1 ];
 
     /* Save quantized speech and noise shaping signals */
-    silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int16 ) );
-    silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int32 ) );
+    silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( oac_int16 ) );
+    silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( oac_int32 ) );
 
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     silk_assert( !memcmp( &NSQ_c, NSQ, sizeof( NSQ_c ) ) );
     silk_assert( !memcmp( &psIndices_c, psIndices, sizeof( psIndices_c ) ) );
     silk_assert( !memcmp( pulses_c, pulses_a, psEncC->nb_subfr * psEncC->subfr_length * sizeof( pulses[0] ) ) );
@@ -281,33 +281,33 @@ void silk_NSQ_sse4_1(
 /************************************/
 /* silk_noise_shape_quantizer_10_16 */
 /************************************/
-static OPUS_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
+static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                       */
-    opus_int            signalType,             /* I    Signal type                     */
-    const opus_int32    x_sc_Q10[],             /* I                                    */
-    opus_int8           pulses[],               /* O                                    */
-    opus_int16          xq[],                   /* O                                    */
-    opus_int32          sLTP_Q15[],             /* I/O  LTP state                       */
-    const opus_int16    a_Q12[],                /* I    Short term prediction coefs     */
-    const opus_int16    b_Q14[],                /* I    Long term prediction coefs      */
-    const opus_int16    AR_shp_Q13[],           /* I    Noise shaping AR coefs          */
-    opus_int            lag,                    /* I    Pitch lag                       */
-    opus_int32          HarmShapeFIRPacked_Q14, /* I                                    */
-    opus_int            Tilt_Q14,               /* I    Spectral tilt                   */
-    opus_int32          LF_shp_Q14,             /* I                                    */
-    opus_int32          Gain_Q16,               /* I                                    */
-    opus_int            Lambda_Q10,             /* I                                    */
-    opus_int            offset_Q10,             /* I                                    */
-    opus_int            length,                 /* I    Input length                    */
-    opus_int32          table[][4]              /* I                                    */
+    oac_int            signalType,             /* I    Signal type                     */
+    const oac_int32    x_sc_Q10[],             /* I                                    */
+    oac_int8           pulses[],               /* O                                    */
+    oac_int16          xq[],                   /* O                                    */
+    oac_int32          sLTP_Q15[],             /* I/O  LTP state                       */
+    const oac_int16    a_Q12[],                /* I    Short term prediction coefs     */
+    const oac_int16    b_Q14[],                /* I    Long term prediction coefs      */
+    const oac_int16    AR_shp_Q13[],           /* I    Noise shaping AR coefs          */
+    oac_int            lag,                    /* I    Pitch lag                       */
+    oac_int32          HarmShapeFIRPacked_Q14, /* I                                    */
+    oac_int            Tilt_Q14,               /* I    Spectral tilt                   */
+    oac_int32          LF_shp_Q14,             /* I                                    */
+    oac_int32          Gain_Q16,               /* I                                    */
+    oac_int            Lambda_Q10,             /* I                                    */
+    oac_int            offset_Q10,             /* I                                    */
+    oac_int            length,                 /* I    Input length                    */
+    oac_int32          table[][4]              /* I                                    */
 )
 {
-    opus_int     i;
-    opus_int32   LTP_pred_Q13, LPC_pred_Q10, n_AR_Q12, n_LTP_Q13;
-    opus_int32   n_LF_Q12, r_Q10, q1_Q0, q1_Q10, q2_Q10;
-    opus_int32   exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10, sDiff_shp_Q14;
-    opus_int32   tmp1, tmp2, sLF_AR_shp_Q14;
-    opus_int32   *psLPC_Q14, *shp_lag_ptr, *pred_lag_ptr;
+    oac_int     i;
+    oac_int32   LTP_pred_Q13, LPC_pred_Q10, n_AR_Q12, n_LTP_Q13;
+    oac_int32   n_LF_Q12, r_Q10, q1_Q0, q1_Q10, q2_Q10;
+    oac_int32   exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10, sDiff_shp_Q14;
+    oac_int32   tmp1, tmp2, sLF_AR_shp_Q14;
+    oac_int32   *psLPC_Q14, *shp_lag_ptr, *pred_lag_ptr;
 
     __m128i xmm_tempa, xmm_tempb;
 
@@ -432,7 +432,7 @@ static OPUS_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
         LPC_pred_Q10 += _mm_cvtsi128_si32( xmm_hi_07 );
 
         /* Long-term prediction */
-        if ( opus_likely( signalType == TYPE_VOICED ) ) {
+        if ( oac_likely( signalType == TYPE_VOICED ) ) {
             /* Unrolled loop */
             /* Avoids introducing a bias because silk_SMLAWB() always rounds to -inf */
             LTP_pred_Q13 = 2;
@@ -560,7 +560,7 @@ static OPUS_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
             q1_Q10 = q2_Q10;
         }
 
-        pulses[ i ] = (opus_int8)silk_RSHIFT_ROUND( q1_Q10, 10 );
+        pulses[ i ] = (oac_int8)silk_RSHIFT_ROUND( q1_Q10, 10 );
 
         /* Excitation */
         exc_Q14 = silk_LSHIFT( q1_Q10, 4 );
@@ -598,7 +598,7 @@ static OPUS_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
     _mm_storeu_si128( (__m128i *)(void*)(&NSQ->sAR2_Q14[ 4 ]), xmm_tempa );
     _mm_storeu_si128( (__m128i *)(void*)(&NSQ->sAR2_Q14[ 0 ]), xmm_tempb );
 
-    /* xq[ i ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( psLPC_Q14[ i ], Gain_Q10 ), 8 ) ); */
+    /* xq[ i ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( psLPC_Q14[ i ], Gain_Q10 ), 8 ) ); */
     {
         __m128i xmm_Gain_Q10;
         __m128i xmm_xq_Q14_3210, xmm_xq_Q14_x3x1, xmm_xq_Q14_7654, xmm_xq_Q14_x7x5;
@@ -649,29 +649,29 @@ static OPUS_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
     }
     for ( ; i < length; i++)
     {
-        xq[i] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( psLPC_Q14[ i ], Gain_Q10 ), 8 ) );
+        xq[i] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( psLPC_Q14[ i ], Gain_Q10 ), 8 ) );
     }
 
     /* Update LPC synth buffer */
-    silk_memcpy( NSQ->sLPC_Q14, &NSQ->sLPC_Q14[ length ], NSQ_LPC_BUF_LENGTH * sizeof( opus_int32 ) );
+    silk_memcpy( NSQ->sLPC_Q14, &NSQ->sLPC_Q14[ length ], NSQ_LPC_BUF_LENGTH * sizeof( oac_int32 ) );
 }
 
-static OPUS_INLINE void silk_nsq_scale_states_sse4_1(
+static OAC_INLINE void silk_nsq_scale_states_sse4_1(
     const silk_encoder_state *psEncC,              /* I    Encoder State                   */
     silk_nsq_state      *NSQ,                      /* I/O  NSQ state                       */
-    const opus_int16    x16[],                     /* I    input                           */
-    opus_int32          x_sc_Q10[],                /* O    input scaled with 1/Gain        */
-    const opus_int16    sLTP[],                    /* I    re-whitened LTP state in Q0     */
-    opus_int32          sLTP_Q15[],                /* O    LTP state matching scaled input */
-    opus_int            subfr,                     /* I    subframe number                 */
-    const opus_int      LTP_scale_Q14,             /* I                                    */
-    const opus_int32    Gains_Q16[ MAX_NB_SUBFR ], /* I                                    */
-    const opus_int      pitchL[ MAX_NB_SUBFR ],    /* I    Pitch lag                       */
-    const opus_int      signal_type                /* I    Signal type                     */
+    const oac_int16    x16[],                     /* I    input                           */
+    oac_int32          x_sc_Q10[],                /* O    input scaled with 1/Gain        */
+    const oac_int16    sLTP[],                    /* I    re-whitened LTP state in Q0     */
+    oac_int32          sLTP_Q15[],                /* O    LTP state matching scaled input */
+    oac_int            subfr,                     /* I    subframe number                 */
+    const oac_int      LTP_scale_Q14,             /* I                                    */
+    const oac_int32    Gains_Q16[ MAX_NB_SUBFR ], /* I                                    */
+    const oac_int      pitchL[ MAX_NB_SUBFR ],    /* I    Pitch lag                       */
+    const oac_int      signal_type                /* I    Signal type                     */
 )
 {
-    opus_int   i, lag;
-    opus_int32 gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
+    oac_int   i, lag;
+    oac_int32 gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
     __m128i xmm_inv_gain_Q26, xmm_x16_x2x0, xmm_x16_x3x1;
 
     lag          = pitchL[ subfr ];
diff --git a/silk/x86/SigProc_FIX_sse.h b/silk/x86/SigProc_FIX_sse.h
index 89a5ec888..b877fb67c 100644
--- a/silk/x86/SigProc_FIX_sse.h
+++ b/silk/x86/SigProc_FIX_sse.h
@@ -32,67 +32,67 @@
 #  include "config.h"
 # endif
 
-# if defined(OPUS_X86_MAY_HAVE_SSE4_1)
+# if defined(OAC_X86_MAY_HAVE_SSE4_1)
 void silk_burg_modified_sse4_1(
-    opus_int32                  *res_nrg,           /* O    Residual energy                                             */
-    opus_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
-    opus_int32                  A_Q16[],            /* O    Prediction coefficients (length order)                      */
-    const opus_int16            x[],                /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
-    const opus_int32            minInvGain_Q30,     /* I    Inverse of max prediction gain                              */
-    const opus_int              subfr_length,       /* I    Input signal subframe length (incl. D preceding samples)    */
-    const opus_int              nb_subfr,           /* I    Number of subframes stacked in x                            */
-    const opus_int              D,                  /* I    Order                                                       */
+    oac_int32                  *res_nrg,           /* O    Residual energy                                             */
+    oac_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
+    oac_int32                  A_Q16[],            /* O    Prediction coefficients (length order)                      */
+    const oac_int16            x[],                /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
+    const oac_int32            minInvGain_Q30,     /* I    Inverse of max prediction gain                              */
+    const oac_int              subfr_length,       /* I    Input signal subframe length (incl. D preceding samples)    */
+    const oac_int              nb_subfr,           /* I    Number of subframes stacked in x                            */
+    const oac_int              D,                  /* I    Order                                                       */
     int                         arch                /* I    Run-time architecture                                       */
 );
 
-#  if defined(OPUS_X86_PRESUME_SSE4_1)
+#  if defined(OAC_X86_PRESUME_SSE4_1)
 
 #   define OVERRIDE_silk_burg_modified
 #   define silk_burg_modified(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch) \
        ((void)(arch), silk_burg_modified_sse4_1(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch))
 
-#  elif defined(OPUS_HAVE_RTCD)
-
-extern void (*const SILK_BURG_MODIFIED_IMPL[OPUS_ARCHMASK + 1])(
-    opus_int32                  *res_nrg,           /* O    Residual energy                                             */
-    opus_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
-    opus_int32                  A_Q16[],            /* O    Prediction coefficients (length order)                      */
-    const opus_int16            x[],                /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
-    const opus_int32            minInvGain_Q30,     /* I    Inverse of max prediction gain                              */
-    const opus_int              subfr_length,       /* I    Input signal subframe length (incl. D preceding samples)    */
-    const opus_int              nb_subfr,           /* I    Number of subframes stacked in x                            */
-    const opus_int              D,                  /* I    Order                                                       */
+#  elif defined(OAC_HAVE_RTCD)
+
+extern void (*const SILK_BURG_MODIFIED_IMPL[OAC_ARCHMASK + 1])(
+    oac_int32                  *res_nrg,           /* O    Residual energy                                             */
+    oac_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
+    oac_int32                  A_Q16[],            /* O    Prediction coefficients (length order)                      */
+    const oac_int16            x[],                /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
+    const oac_int32            minInvGain_Q30,     /* I    Inverse of max prediction gain                              */
+    const oac_int              subfr_length,       /* I    Input signal subframe length (incl. D preceding samples)    */
+    const oac_int              nb_subfr,           /* I    Number of subframes stacked in x                            */
+    const oac_int              D,                  /* I    Order                                                       */
     int                         arch                /* I    Run-time architecture                                       */);
 
 #   define OVERRIDE_silk_burg_modified
 #   define silk_burg_modified(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch) \
-     ((*SILK_BURG_MODIFIED_IMPL[(arch) & OPUS_ARCHMASK])(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch))
+     ((*SILK_BURG_MODIFIED_IMPL[(arch) & OAC_ARCHMASK])(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch))
 
 #  endif
 
-opus_int64 silk_inner_prod16_sse4_1(
-    const opus_int16 *inVec1,
-    const opus_int16 *inVec2,
-    const opus_int   len
+oac_int64 silk_inner_prod16_sse4_1(
+    const oac_int16 *inVec1,
+    const oac_int16 *inVec2,
+    const oac_int   len
 );
 
 
-#  if defined(OPUS_X86_PRESUME_SSE4_1)
+#  if defined(OAC_X86_PRESUME_SSE4_1)
 
 #   define OVERRIDE_silk_inner_prod16
 #   define silk_inner_prod16(inVec1, inVec2, len, arch) \
        ((void)(arch),silk_inner_prod16_sse4_1(inVec1, inVec2, len))
 
-#  elif defined(OPUS_HAVE_RTCD)
+#  elif defined(OAC_HAVE_RTCD)
 
-extern opus_int64 (*const SILK_INNER_PROD16_IMPL[OPUS_ARCHMASK + 1])(
-                    const opus_int16 *inVec1,
-                    const opus_int16 *inVec2,
-                    const opus_int   len);
+extern oac_int64 (*const SILK_INNER_PROD16_IMPL[OAC_ARCHMASK + 1])(
+                    const oac_int16 *inVec1,
+                    const oac_int16 *inVec2,
+                    const oac_int   len);
 
 #   define OVERRIDE_silk_inner_prod16
 #   define silk_inner_prod16(inVec1, inVec2, len, arch) \
-     ((*SILK_INNER_PROD16_IMPL[(arch) & OPUS_ARCHMASK])(inVec1, inVec2, len))
+     ((*SILK_INNER_PROD16_IMPL[(arch) & OAC_ARCHMASK])(inVec1, inVec2, len))
 
 #  endif
 # endif
diff --git a/silk/x86/VAD_sse4_1.c b/silk/x86/VAD_sse4_1.c
index 9e06bc79d..c3aef6b7c 100644
--- a/silk/x86/VAD_sse4_1.c
+++ b/silk/x86/VAD_sse4_1.c
@@ -37,35 +37,35 @@
 #include "stack_alloc.h"
 
 /* Weighting factors for tilt measure */
-static const opus_int32 tiltWeights[ VAD_N_BANDS ] = { 30000, 6000, -12000, -12000 };
+static const oac_int32 tiltWeights[ VAD_N_BANDS ] = { 30000, 6000, -12000, -12000 };
 
 /***************************************/
 /* Get the speech activity level in Q8 */
 /***************************************/
-opus_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if success                  */
+oac_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if success                  */
     silk_encoder_state          *psEncC,            /* I/O  Encoder state                               */
-    const opus_int16            pIn[]               /* I    PCM input                                   */
+    const oac_int16            pIn[]               /* I    PCM input                                   */
 )
 {
-    opus_int   SA_Q15, pSNR_dB_Q7, input_tilt;
-    opus_int   decimated_framelength1, decimated_framelength2;
-    opus_int   decimated_framelength;
-    opus_int   dec_subframe_length, dec_subframe_offset, SNR_Q7, i, b, s;
-    opus_int32 sumSquared, smooth_coef_Q16;
-    opus_int16 HPstateTmp;
-    VARDECL( opus_int16, X );
-    opus_int32 Xnrg[ VAD_N_BANDS ];
-    opus_int32 NrgToNoiseRatio_Q8[ VAD_N_BANDS ];
-    opus_int32 speech_nrg, x_tmp;
-    opus_int   X_offset[ VAD_N_BANDS ];
-    opus_int   ret = 0;
+    oac_int   SA_Q15, pSNR_dB_Q7, input_tilt;
+    oac_int   decimated_framelength1, decimated_framelength2;
+    oac_int   decimated_framelength;
+    oac_int   dec_subframe_length, dec_subframe_offset, SNR_Q7, i, b, s;
+    oac_int32 sumSquared, smooth_coef_Q16;
+    oac_int16 HPstateTmp;
+    VARDECL( oac_int16, X );
+    oac_int32 Xnrg[ VAD_N_BANDS ];
+    oac_int32 NrgToNoiseRatio_Q8[ VAD_N_BANDS ];
+    oac_int32 speech_nrg, x_tmp;
+    oac_int   X_offset[ VAD_N_BANDS ];
+    oac_int   ret = 0;
     silk_VAD_state *psSilk_VAD = &psEncC->sVAD;
 
     SAVE_STACK;
 
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     silk_encoder_state psEncC_c;
-    opus_int ret_c;
+    oac_int ret_c;
 
     silk_memcpy( &psEncC_c, psEncC, sizeof( psEncC_c ) );
     ret_c = silk_VAD_GetSA_Q8_c( &psEncC_c, pIn );
@@ -96,7 +96,7 @@ opus_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if s
     X_offset[ 1 ] = decimated_framelength + decimated_framelength2;
     X_offset[ 2 ] = X_offset[ 1 ] + decimated_framelength;
     X_offset[ 3 ] = X_offset[ 2 ] + decimated_framelength2;
-    ALLOC( X, X_offset[ 3 ] + decimated_framelength1, opus_int16 );
+    ALLOC( X, X_offset[ 3 ] + decimated_framelength1, oac_int16 );
 
     /* 0-8 kHz to 0-4 kHz and 4-8 kHz */
     silk_ana_filt_bank_1( pIn, &psSilk_VAD->AnaState[  0 ],
@@ -206,7 +206,7 @@ opus_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if s
             sumSquared = silk_SMLABB( sumSquared, SNR_Q7, SNR_Q7 );          /* Q14 */
 
             /* Tilt measure */
-            if( speech_nrg < ( (opus_int32)1 << 20 ) ) {
+            if( speech_nrg < ( (oac_int32)1 << 20 ) ) {
                 /* Scale down SNR value for small subband speech energies */
                 SNR_Q7 = silk_SMULWB( silk_LSHIFT( silk_SQRT_APPROX( speech_nrg ), 6 ), SNR_Q7 );
             }
@@ -220,7 +220,7 @@ opus_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if s
     sumSquared = silk_DIV32_16( sumSquared, VAD_N_BANDS ); /* Q14 */
 
     /* Root-mean-square approximation, scale to dBs, and write to output pointer */
-    pSNR_dB_Q7 = (opus_int16)( 3 * silk_SQRT_APPROX( sumSquared ) ); /* Q7 */
+    pSNR_dB_Q7 = (oac_int16)( 3 * silk_SQRT_APPROX( sumSquared ) ); /* Q7 */
 
     /*********************************/
     /* Speech Probability Estimation */
@@ -262,7 +262,7 @@ opus_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if s
     /* Energy Level and SNR estimation */
     /***********************************/
     /* Smoothing coefficient */
-    smooth_coef_Q16 = silk_SMULWB( VAD_SNR_SMOOTH_COEF_Q18, silk_SMULWB( (opus_int32)SA_Q15, SA_Q15 ) );
+    smooth_coef_Q16 = silk_SMULWB( VAD_SNR_SMOOTH_COEF_Q18, silk_SMULWB( (oac_int32)SA_Q15, SA_Q15 ) );
 
     if( psEncC->frame_length == 10 * psEncC->fs_kHz ) {
         smooth_coef_Q16 >>= 1;
@@ -279,7 +279,7 @@ opus_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if s
         psEncC->input_quality_bands_Q15[ b ] = silk_sigm_Q15( silk_RSHIFT( SNR_Q7 - 16 * 128, 4 ) );
     }
 
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     silk_assert( ret == ret_c );
     silk_assert( !memcmp( &psEncC_c, psEncC, sizeof( psEncC_c ) ) );
 #endif
diff --git a/silk/x86/VQ_WMat_EC_sse4_1.c b/silk/x86/VQ_WMat_EC_sse4_1.c
index df4626b60..50add48a3 100644
--- a/silk/x86/VQ_WMat_EC_sse4_1.c
+++ b/silk/x86/VQ_WMat_EC_sse4_1.c
@@ -37,25 +37,25 @@
 
 /* Entropy constrained matrix-weighted VQ, hard-coded to 5-element vectors, for a single input data vector */
 void silk_VQ_WMat_EC_sse4_1(
-    opus_int8                   *ind,                           /* O    index of best codebook vector               */
-    opus_int32                  *res_nrg_Q15,                   /* O    best residual energy                        */
-    opus_int32                  *rate_dist_Q8,                  /* O    best total bitrate                          */
-    opus_int                    *gain_Q7,                       /* O    sum of absolute LTP coefficients            */
-    const opus_int32            *XX_Q17,                        /* I    correlation matrix                          */
-    const opus_int32            *xX_Q17,                        /* I    correlation vector                          */
-    const opus_int8             *cb_Q7,                         /* I    codebook                                    */
-    const opus_uint8            *cb_gain_Q7,                    /* I    codebook effective gain                     */
-    const opus_uint8            *cl_Q5,                         /* I    code length for each codebook vector        */
-    const opus_int              subfr_len,                      /* I    number of samples per subframe              */
-    const opus_int32            max_gain_Q7,                    /* I    maximum sum of absolute LTP coefficients    */
-    const opus_int              L                               /* I    number of vectors in codebook               */
+    oac_int8                   *ind,                           /* O    index of best codebook vector               */
+    oac_int32                  *res_nrg_Q15,                   /* O    best residual energy                        */
+    oac_int32                  *rate_dist_Q8,                  /* O    best total bitrate                          */
+    oac_int                    *gain_Q7,                       /* O    sum of absolute LTP coefficients            */
+    const oac_int32            *XX_Q17,                        /* I    correlation matrix                          */
+    const oac_int32            *xX_Q17,                        /* I    correlation vector                          */
+    const oac_int8             *cb_Q7,                         /* I    codebook                                    */
+    const oac_uint8            *cb_gain_Q7,                    /* I    codebook effective gain                     */
+    const oac_uint8            *cl_Q5,                         /* I    code length for each codebook vector        */
+    const oac_int              subfr_len,                      /* I    number of samples per subframe              */
+    const oac_int32            max_gain_Q7,                    /* I    maximum sum of absolute LTP coefficients    */
+    const oac_int              L                               /* I    number of vectors in codebook               */
 )
 {
-    opus_int   k, gain_tmp_Q7;
-    const opus_int8 *cb_row_Q7;
-    opus_int32 neg_xX_Q24[ 5 ];
-    opus_int32 sum1_Q15, sum2_Q24;
-    opus_int32 bits_res_Q8, bits_tot_Q8;
+    oac_int   k, gain_tmp_Q7;
+    const oac_int8 *cb_row_Q7;
+    oac_int32 neg_xX_Q24[ 5 ];
+    oac_int32 sum1_Q15, sum2_Q24;
+    oac_int32 bits_res_Q8, bits_tot_Q8;
     __m128i v_XX_31_Q17, v_XX_42_Q17, v_cb_row_31_Q7, v_cb_row_42_Q7, v_acc1_Q24, v_acc2_Q24;
 
     /* Negate and convert to new Q domain */
@@ -75,7 +75,7 @@ void silk_VQ_WMat_EC_sse4_1(
     /* If things go really bad, at least *ind is set to something safe. */
     *ind = 0;
     for( k = 0; k < L; k++ ) {
-        opus_int32 penalty;
+        oac_int32 penalty;
         gain_tmp_Q7 = cb_gain_Q7[k];
         /* Weighted rate */
         /* Quantization error: 1 - 2 * xX * cb + cb' * XX * cb */
@@ -133,7 +133,7 @@ void silk_VQ_WMat_EC_sse4_1(
             if( bits_tot_Q8 <= *rate_dist_Q8 ) {
                 *rate_dist_Q8 = bits_tot_Q8;
                 *res_nrg_Q15 = sum1_Q15 + penalty;
-                *ind = (opus_int8)k;
+                *ind = (oac_int8)k;
                 *gain_Q7 = gain_tmp_Q7;
             }
         }
@@ -142,12 +142,12 @@ void silk_VQ_WMat_EC_sse4_1(
         cb_row_Q7 += LTP_ORDER;
     }
 
-#ifdef OPUS_CHECK_ASM
+#ifdef OAC_CHECK_ASM
     {
-        opus_int8  ind_c = 0;
-        opus_int32 res_nrg_Q15_c = 0;
-        opus_int32 rate_dist_Q8_c = 0;
-        opus_int   gain_Q7_c = 0;
+        oac_int8  ind_c = 0;
+        oac_int32 res_nrg_Q15_c = 0;
+        oac_int32 rate_dist_Q8_c = 0;
+        oac_int   gain_Q7_c = 0;
 
         silk_VQ_WMat_EC_c(
             &ind_c,
diff --git a/silk/x86/main_sse.h b/silk/x86/main_sse.h
index b254d53e7..81d32222d 100644
--- a/silk/x86/main_sse.h
+++ b/silk/x86/main_sse.h
@@ -32,24 +32,24 @@
 #  include "config.h"
 # endif
 
-# if defined(OPUS_X86_MAY_HAVE_SSE4_1)
+# if defined(OAC_X86_MAY_HAVE_SSE4_1)
 
 void silk_VQ_WMat_EC_sse4_1(
-    opus_int8                   *ind,                           /* O    index of best codebook vector               */
-    opus_int32                  *res_nrg_Q15,                   /* O    best residual energy                        */
-    opus_int32                  *rate_dist_Q8,                  /* O    best total bitrate                          */
-    opus_int                    *gain_Q7,                       /* O    sum of absolute LTP coefficients            */
-    const opus_int32            *XX_Q17,                        /* I    correlation matrix                          */
-    const opus_int32            *xX_Q17,                        /* I    correlation vector                          */
-    const opus_int8             *cb_Q7,                         /* I    codebook                                    */
-    const opus_uint8            *cb_gain_Q7,                    /* I    codebook effective gain                     */
-    const opus_uint8            *cl_Q5,                         /* I    code length for each codebook vector        */
-    const opus_int              subfr_len,                      /* I    number of samples per subframe              */
-    const opus_int32            max_gain_Q7,                    /* I    maximum sum of absolute LTP coefficients    */
-    const opus_int              L                               /* I    number of vectors in codebook               */
+    oac_int8                   *ind,                           /* O    index of best codebook vector               */
+    oac_int32                  *res_nrg_Q15,                   /* O    best residual energy                        */
+    oac_int32                  *rate_dist_Q8,                  /* O    best total bitrate                          */
+    oac_int                    *gain_Q7,                       /* O    sum of absolute LTP coefficients            */
+    const oac_int32            *XX_Q17,                        /* I    correlation matrix                          */
+    const oac_int32            *xX_Q17,                        /* I    correlation vector                          */
+    const oac_int8             *cb_Q7,                         /* I    codebook                                    */
+    const oac_uint8            *cb_gain_Q7,                    /* I    codebook effective gain                     */
+    const oac_uint8            *cl_Q5,                         /* I    code length for each codebook vector        */
+    const oac_int              subfr_len,                      /* I    number of samples per subframe              */
+    const oac_int32            max_gain_Q7,                    /* I    maximum sum of absolute LTP coefficients    */
+    const oac_int              L                               /* I    number of vectors in codebook               */
 );
 
-#  if defined OPUS_X86_PRESUME_SSE4_1
+#  if defined OAC_X86_PRESUME_SSE4_1
 
 #   define OVERRIDE_silk_VQ_WMat_EC
 #   define silk_VQ_WMat_EC(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, \
@@ -57,27 +57,27 @@ void silk_VQ_WMat_EC_sse4_1(
     ((void)(arch),silk_VQ_WMat_EC_sse4_1(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, \
                           subfr_len, max_gain_Q7, L))
 
-#  elif defined(OPUS_HAVE_RTCD)
-
-extern void (*const SILK_VQ_WMAT_EC_IMPL[OPUS_ARCHMASK + 1])(
-    opus_int8                   *ind,                           /* O    index of best codebook vector               */
-    opus_int32                  *res_nrg_Q15,                   /* O    best residual energy                        */
-    opus_int32                  *rate_dist_Q8,                  /* O    best total bitrate                          */
-    opus_int                    *gain_Q7,                       /* O    sum of absolute LTP coefficients            */
-    const opus_int32            *XX_Q17,                        /* I    correlation matrix                          */
-    const opus_int32            *xX_Q17,                        /* I    correlation vector                          */
-    const opus_int8             *cb_Q7,                         /* I    codebook                                    */
-    const opus_uint8            *cb_gain_Q7,                    /* I    codebook effective gain                     */
-    const opus_uint8            *cl_Q5,                         /* I    code length for each codebook vector        */
-    const opus_int              subfr_len,                      /* I    number of samples per subframe              */
-    const opus_int32            max_gain_Q7,                    /* I    maximum sum of absolute LTP coefficients    */
-    const opus_int              L                               /* I    number of vectors in codebook               */
+#  elif defined(OAC_HAVE_RTCD)
+
+extern void (*const SILK_VQ_WMAT_EC_IMPL[OAC_ARCHMASK + 1])(
+    oac_int8                   *ind,                           /* O    index of best codebook vector               */
+    oac_int32                  *res_nrg_Q15,                   /* O    best residual energy                        */
+    oac_int32                  *rate_dist_Q8,                  /* O    best total bitrate                          */
+    oac_int                    *gain_Q7,                       /* O    sum of absolute LTP coefficients            */
+    const oac_int32            *XX_Q17,                        /* I    correlation matrix                          */
+    const oac_int32            *xX_Q17,                        /* I    correlation vector                          */
+    const oac_int8             *cb_Q7,                         /* I    codebook                                    */
+    const oac_uint8            *cb_gain_Q7,                    /* I    codebook effective gain                     */
+    const oac_uint8            *cl_Q5,                         /* I    code length for each codebook vector        */
+    const oac_int              subfr_len,                      /* I    number of samples per subframe              */
+    const oac_int32            max_gain_Q7,                    /* I    maximum sum of absolute LTP coefficients    */
+    const oac_int              L                               /* I    number of vectors in codebook               */
 );
 
 #   define OVERRIDE_silk_VQ_WMat_EC
 #   define silk_VQ_WMat_EC(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, \
                            subfr_len, max_gain_Q7, L, arch) \
-    ((*SILK_VQ_WMAT_EC_IMPL[(arch) & OPUS_ARCHMASK])(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, \
+    ((*SILK_VQ_WMAT_EC_IMPL[(arch) & OAC_ARCHMASK])(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, \
                           subfr_len, max_gain_Q7, L))
 
 #  endif
@@ -86,21 +86,21 @@ void silk_NSQ_sse4_1(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const opus_int16            x16[],                                        /* I    Input                           */
-    opus_int8                   pulses[],                                     /* O    Quantized pulse signal          */
-    const opus_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const opus_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const opus_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const opus_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const opus_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const opus_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const opus_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const opus_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const opus_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const opus_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
+    const oac_int16            x16[],                                        /* I    Input                           */
+    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
+    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
+    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
+    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
+    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
+    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
+    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
+    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
+    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
+    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
 );
 
-#  if defined OPUS_X86_PRESUME_SSE4_1
+#  if defined OAC_X86_PRESUME_SSE4_1
 
 #   define OVERRIDE_silk_NSQ
 #   define silk_NSQ(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \
@@ -108,30 +108,30 @@ void silk_NSQ_sse4_1(
     ((void)(arch),silk_NSQ_sse4_1(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \
                    HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14))
 
-#  elif defined(OPUS_HAVE_RTCD)
+#  elif defined(OAC_HAVE_RTCD)
 
-extern void (*const SILK_NSQ_IMPL[OPUS_ARCHMASK + 1])(
+extern void (*const SILK_NSQ_IMPL[OAC_ARCHMASK + 1])(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const opus_int16            x16[],                                        /* I    Input                           */
-    opus_int8                   pulses[],                                     /* O    Quantized pulse signal          */
-    const opus_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const opus_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const opus_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const opus_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const opus_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const opus_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const opus_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const opus_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const opus_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const opus_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
+    const oac_int16            x16[],                                        /* I    Input                           */
+    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
+    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
+    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
+    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
+    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
+    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
+    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
+    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
+    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
+    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
 );
 
 #   define OVERRIDE_silk_NSQ
 #   define silk_NSQ(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \
                     HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
-    ((*SILK_NSQ_IMPL[(arch) & OPUS_ARCHMASK])(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \
+    ((*SILK_NSQ_IMPL[(arch) & OAC_ARCHMASK])(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \
                    HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14))
 
 #  endif
@@ -140,39 +140,39 @@ void silk_NSQ_del_dec_sse4_1(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const opus_int16            x16[],                                        /* I    Input                           */
-    opus_int8                   pulses[],                                     /* O    Quantized pulse signal          */
-    const opus_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const opus_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const opus_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const opus_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const opus_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const opus_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const opus_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const opus_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const opus_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const opus_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
+    const oac_int16            x16[],                                        /* I    Input                           */
+    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
+    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
+    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
+    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
+    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
+    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
+    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
+    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
+    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
+    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
 );
 
 void silk_NSQ_del_dec_avx2(
     const silk_encoder_state *psEncC,                            /* I    Encoder State               */
     silk_nsq_state *NSQ,                                         /* I/O  NSQ state                   */
     SideInfoIndices *psIndices,                                  /* I/O  Quantization Indices        */
-    const opus_int16 x16[],                                      /* I    Input                       */
-    opus_int8 pulses[],                                          /* O    Quantized pulse signal      */
-    const opus_int16 *PredCoef_Q12,                              /* I    Short term prediction coefs */
-    const opus_int16 LTPCoef_Q14[LTP_ORDER * MAX_NB_SUBFR],      /* I    Long term prediction coefs  */
-    const opus_int16 AR_Q13[MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER], /* I    Noise shaping coefs         */
-    const opus_int HarmShapeGain_Q14[MAX_NB_SUBFR],              /* I    Long term shaping coefs     */
-    const opus_int Tilt_Q14[MAX_NB_SUBFR],                       /* I    Spectral tilt               */
-    const opus_int32 LF_shp_Q14[MAX_NB_SUBFR],                   /* I    Low frequency shaping coefs */
-    const opus_int32 Gains_Q16[MAX_NB_SUBFR],                    /* I    Quantization step sizes     */
-    const opus_int32 pitchL[MAX_NB_SUBFR],                       /* I    Pitch lags                  */
-    const opus_int Lambda_Q10,                                   /* I    Rate/distortion tradeoff    */
-    const opus_int LTP_scale_Q14                                 /* I    LTP state scaling           */
+    const oac_int16 x16[],                                      /* I    Input                       */
+    oac_int8 pulses[],                                          /* O    Quantized pulse signal      */
+    const oac_int16 *PredCoef_Q12,                              /* I    Short term prediction coefs */
+    const oac_int16 LTPCoef_Q14[LTP_ORDER * MAX_NB_SUBFR],      /* I    Long term prediction coefs  */
+    const oac_int16 AR_Q13[MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER], /* I    Noise shaping coefs         */
+    const oac_int HarmShapeGain_Q14[MAX_NB_SUBFR],              /* I    Long term shaping coefs     */
+    const oac_int Tilt_Q14[MAX_NB_SUBFR],                       /* I    Spectral tilt               */
+    const oac_int32 LF_shp_Q14[MAX_NB_SUBFR],                   /* I    Low frequency shaping coefs */
+    const oac_int32 Gains_Q16[MAX_NB_SUBFR],                    /* I    Quantization step sizes     */
+    const oac_int32 pitchL[MAX_NB_SUBFR],                       /* I    Pitch lags                  */
+    const oac_int Lambda_Q10,                                   /* I    Rate/distortion tradeoff    */
+    const oac_int LTP_scale_Q14                                 /* I    LTP state scaling           */
 );
 
-#  if defined (OPUS_X86_PRESUME_AVX2)
+#  if defined (OAC_X86_PRESUME_AVX2)
 
 #   define OVERRIDE_silk_NSQ_del_dec
 #   define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
@@ -180,7 +180,7 @@ void silk_NSQ_del_dec_avx2(
     ((void)(arch),silk_NSQ_del_dec_avx2(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
                            HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14))
 
-#  elif defined (OPUS_X86_PRESUME_SSE4_1) && !defined(OPUS_X86_MAY_HAVE_AVX2)
+#  elif defined (OAC_X86_PRESUME_SSE4_1) && !defined(OAC_X86_MAY_HAVE_AVX2)
 
 #   define OVERRIDE_silk_NSQ_del_dec
 #   define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
@@ -188,54 +188,54 @@ void silk_NSQ_del_dec_avx2(
     ((void)(arch),silk_NSQ_del_dec_sse4_1(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
                            HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14))
 
-#  elif defined(OPUS_HAVE_RTCD)
+#  elif defined(OAC_HAVE_RTCD)
 
-extern void (*const SILK_NSQ_DEL_DEC_IMPL[OPUS_ARCHMASK + 1])(
+extern void (*const SILK_NSQ_DEL_DEC_IMPL[OAC_ARCHMASK + 1])(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const opus_int16            x16[],                                        /* I    Input                           */
-    opus_int8                   pulses[],                                     /* O    Quantized pulse signal          */
-    const opus_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const opus_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const opus_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const opus_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const opus_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const opus_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const opus_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const opus_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const opus_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const opus_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
+    const oac_int16            x16[],                                        /* I    Input                           */
+    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
+    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
+    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
+    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
+    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
+    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
+    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
+    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
+    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
+    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
 );
 
 #   define OVERRIDE_silk_NSQ_del_dec
 #   define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
                             HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
-    ((*SILK_NSQ_DEL_DEC_IMPL[(arch) & OPUS_ARCHMASK])(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
+    ((*SILK_NSQ_DEL_DEC_IMPL[(arch) & OAC_ARCHMASK])(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
                            HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14))
 
 #  endif
 
 void silk_noise_shape_quantizer(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                       */
-    opus_int            signalType,             /* I    Signal type                     */
-    const opus_int32    x_sc_Q10[],             /* I                                    */
-    opus_int8           pulses[],               /* O                                    */
-    opus_int16          xq[],                   /* O                                    */
-    opus_int32          sLTP_Q15[],             /* I/O  LTP state                       */
-    const opus_int16    a_Q12[],                /* I    Short term prediction coefs     */
-    const opus_int16    b_Q14[],                /* I    Long term prediction coefs      */
-    const opus_int16    AR_shp_Q13[],           /* I    Noise shaping AR coefs          */
-    opus_int            lag,                    /* I    Pitch lag                       */
-    opus_int32          HarmShapeFIRPacked_Q14, /* I                                    */
-    opus_int            Tilt_Q14,               /* I    Spectral tilt                   */
-    opus_int32          LF_shp_Q14,             /* I                                    */
-    opus_int32          Gain_Q16,               /* I                                    */
-    opus_int            Lambda_Q10,             /* I                                    */
-    opus_int            offset_Q10,             /* I                                    */
-    opus_int            length,                 /* I    Input length                    */
-    opus_int            shapingLPCOrder,        /* I    Noise shaping AR filter order   */
-    opus_int            predictLPCOrder,        /* I    Prediction filter order         */
+    oac_int            signalType,             /* I    Signal type                     */
+    const oac_int32    x_sc_Q10[],             /* I                                    */
+    oac_int8           pulses[],               /* O                                    */
+    oac_int16          xq[],                   /* O                                    */
+    oac_int32          sLTP_Q15[],             /* I/O  LTP state                       */
+    const oac_int16    a_Q12[],                /* I    Short term prediction coefs     */
+    const oac_int16    b_Q14[],                /* I    Long term prediction coefs      */
+    const oac_int16    AR_shp_Q13[],           /* I    Noise shaping AR coefs          */
+    oac_int            lag,                    /* I    Pitch lag                       */
+    oac_int32          HarmShapeFIRPacked_Q14, /* I                                    */
+    oac_int            Tilt_Q14,               /* I    Spectral tilt                   */
+    oac_int32          LF_shp_Q14,             /* I                                    */
+    oac_int32          Gain_Q16,               /* I                                    */
+    oac_int            Lambda_Q10,             /* I                                    */
+    oac_int            offset_Q10,             /* I                                    */
+    oac_int            length,                 /* I    Input length                    */
+    oac_int            shapingLPCOrder,        /* I    Noise shaping AR filter order   */
+    oac_int            predictLPCOrder,        /* I    Prediction filter order         */
     int                 arch                    /* I    Architecture                    */
 );
 
@@ -243,29 +243,29 @@ void silk_noise_shape_quantizer(
 /* Noise level estimation */
 /**************************/
 void silk_VAD_GetNoiseLevels(
-    const opus_int32            pX[ VAD_N_BANDS ],  /* I    subband energies                            */
+    const oac_int32            pX[ VAD_N_BANDS ],  /* I    subband energies                            */
     silk_VAD_state              *psSilk_VAD         /* I/O  Pointer to Silk VAD state                   */
 );
 
-opus_int silk_VAD_GetSA_Q8_sse4_1(
+oac_int silk_VAD_GetSA_Q8_sse4_1(
     silk_encoder_state *psEnC,
-    const opus_int16   pIn[]
+    const oac_int16   pIn[]
 );
 
-#  if defined(OPUS_X86_PRESUME_SSE4_1)
+#  if defined(OAC_X86_PRESUME_SSE4_1)
 
 #   define OVERRIDE_silk_VAD_GetSA_Q8
 #   define silk_VAD_GetSA_Q8(psEnC, pIn, arch) ((void)(arch),silk_VAD_GetSA_Q8_sse4_1(psEnC, pIn))
 
-#  elif defined(OPUS_HAVE_RTCD)
+#  elif defined(OAC_HAVE_RTCD)
 
-extern opus_int (*const SILK_VAD_GETSA_Q8_IMPL[OPUS_ARCHMASK + 1])(
+extern oac_int (*const SILK_VAD_GETSA_Q8_IMPL[OAC_ARCHMASK + 1])(
      silk_encoder_state *psEnC,
-     const opus_int16   pIn[]);
+     const oac_int16   pIn[]);
 
 #   define OVERRIDE_silk_VAD_GetSA_Q8
 #   define silk_VAD_GetSA_Q8(psEnC, pIn, arch) \
-      ((*SILK_VAD_GETSA_Q8_IMPL[(arch) & OPUS_ARCHMASK])(psEnC, pIn))
+      ((*SILK_VAD_GETSA_Q8_IMPL[(arch) & OAC_ARCHMASK])(psEnC, pIn))
 
 #  endif
 
@@ -273,24 +273,24 @@ extern opus_int (*const SILK_VAD_GETSA_Q8_IMPL[OPUS_ARCHMASK + 1])(
 double silk_inner_product_FLP_avx2(
     const silk_float    *data1,
     const silk_float    *data2,
-    opus_int            dataSize
+    oac_int            dataSize
 );
 
-#if defined (OPUS_X86_PRESUME_AVX2)
+#if defined (OAC_X86_PRESUME_AVX2)
 
 #define OVERRIDE_inner_product_FLP
 #define silk_inner_product_FLP(data1, data2, dataSize, arch) ((void)arch,silk_inner_product_FLP_avx2(data1, data2, dataSize))
 
-#elif defined(OPUS_HAVE_RTCD) && defined(OPUS_X86_MAY_HAVE_AVX2)
+#elif defined(OAC_HAVE_RTCD) && defined(OAC_X86_MAY_HAVE_AVX2)
 
 #define OVERRIDE_inner_product_FLP
-extern double (*const SILK_INNER_PRODUCT_FLP_IMPL[OPUS_ARCHMASK + 1])(
+extern double (*const SILK_INNER_PRODUCT_FLP_IMPL[OAC_ARCHMASK + 1])(
     const silk_float    *data1,
     const silk_float    *data2,
-    opus_int            dataSize
+    oac_int            dataSize
 );
 
-#define silk_inner_product_FLP(data1, data2, dataSize, arch) ((void)arch,(*SILK_INNER_PRODUCT_FLP_IMPL[(arch) & OPUS_ARCHMASK])(data1, data2, dataSize))
+#define silk_inner_product_FLP(data1, data2, dataSize, arch) ((void)arch,(*SILK_INNER_PRODUCT_FLP_IMPL[(arch) & OAC_ARCHMASK])(data1, data2, dataSize))
 
 #endif
 #endif
diff --git a/silk/x86/x86_silk_map.c b/silk/x86/x86_silk_map.c
index 39ad75276..92d8214ce 100644
--- a/silk/x86/x86_silk_map.c
+++ b/silk/x86/x86_silk_map.c
@@ -38,16 +38,16 @@
 #include "pitch.h"
 #include "main.h"
 
-#if defined(OPUS_HAVE_RTCD) && !defined(OPUS_X86_PRESUME_AVX2)
+#if defined(OAC_HAVE_RTCD) && !defined(OAC_X86_PRESUME_AVX2)
 
 #if defined(FIXED_POINT)
 
 #include "fixed/main_FIX.h"
 
-opus_int64 (*const SILK_INNER_PROD16_IMPL[ OPUS_ARCHMASK + 1 ] )(
-    const opus_int16 *inVec1,
-    const opus_int16 *inVec2,
-    const opus_int   len
+oac_int64 (*const SILK_INNER_PROD16_IMPL[ OAC_ARCHMASK + 1 ] )(
+    const oac_int16 *inVec1,
+    const oac_int16 *inVec2,
+    const oac_int   len
 ) = {
   silk_inner_prod16_c,                  /* non-sse */
   silk_inner_prod16_c,
@@ -58,9 +58,9 @@ opus_int64 (*const SILK_INNER_PROD16_IMPL[ OPUS_ARCHMASK + 1 ] )(
 
 #endif
 
-opus_int (*const SILK_VAD_GETSA_Q8_IMPL[ OPUS_ARCHMASK + 1 ] )(
+oac_int (*const SILK_VAD_GETSA_Q8_IMPL[ OAC_ARCHMASK + 1 ] )(
     silk_encoder_state *psEncC,
-    const opus_int16   pIn[]
+    const oac_int16   pIn[]
 ) = {
   silk_VAD_GetSA_Q8_c,                  /* non-sse */
   silk_VAD_GetSA_Q8_c,
@@ -69,22 +69,22 @@ opus_int (*const SILK_VAD_GETSA_Q8_IMPL[ OPUS_ARCHMASK + 1 ] )(
   MAY_HAVE_SSE4_1( silk_VAD_GetSA_Q8 )  /* avx */
 };
 
-void (*const SILK_NSQ_IMPL[ OPUS_ARCHMASK + 1 ] )(
+void (*const SILK_NSQ_IMPL[ OAC_ARCHMASK + 1 ] )(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const opus_int16            x16[],                                        /* I    Input                           */
-    opus_int8                   pulses[],                                     /* O    Quantized pulse signal          */
-    const opus_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const opus_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const opus_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const opus_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const opus_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const opus_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const opus_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const opus_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const opus_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const opus_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
+    const oac_int16            x16[],                                        /* I    Input                           */
+    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
+    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
+    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
+    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
+    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
+    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
+    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
+    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
+    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
+    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
 ) = {
   silk_NSQ_c,                  /* non-sse */
   silk_NSQ_c,
@@ -93,19 +93,19 @@ void (*const SILK_NSQ_IMPL[ OPUS_ARCHMASK + 1 ] )(
   MAY_HAVE_SSE4_1( silk_NSQ )  /* avx */
 };
 
-void (*const SILK_VQ_WMAT_EC_IMPL[ OPUS_ARCHMASK + 1 ] )(
-    opus_int8                   *ind,                           /* O    index of best codebook vector               */
-    opus_int32                  *res_nrg_Q15,                   /* O    best residual energy                        */
-    opus_int32                  *rate_dist_Q8,                  /* O    best total bitrate                          */
-    opus_int                    *gain_Q7,                       /* O    sum of absolute LTP coefficients            */
-    const opus_int32            *XX_Q17,                        /* I    correlation matrix                          */
-    const opus_int32            *xX_Q17,                        /* I    correlation vector                          */
-    const opus_int8             *cb_Q7,                         /* I    codebook                                    */
-    const opus_uint8            *cb_gain_Q7,                    /* I    codebook effective gain                     */
-    const opus_uint8            *cl_Q5,                         /* I    code length for each codebook vector        */
-    const opus_int              subfr_len,                      /* I    number of samples per subframe              */
-    const opus_int32            max_gain_Q7,                    /* I    maximum sum of absolute LTP coefficients    */
-    const opus_int              L                               /* I    number of vectors in codebook               */
+void (*const SILK_VQ_WMAT_EC_IMPL[ OAC_ARCHMASK + 1 ] )(
+    oac_int8                   *ind,                           /* O    index of best codebook vector               */
+    oac_int32                  *res_nrg_Q15,                   /* O    best residual energy                        */
+    oac_int32                  *rate_dist_Q8,                  /* O    best total bitrate                          */
+    oac_int                    *gain_Q7,                       /* O    sum of absolute LTP coefficients            */
+    const oac_int32            *XX_Q17,                        /* I    correlation matrix                          */
+    const oac_int32            *xX_Q17,                        /* I    correlation vector                          */
+    const oac_int8             *cb_Q7,                         /* I    codebook                                    */
+    const oac_uint8            *cb_gain_Q7,                    /* I    codebook effective gain                     */
+    const oac_uint8            *cl_Q5,                         /* I    code length for each codebook vector        */
+    const oac_int              subfr_len,                      /* I    number of samples per subframe              */
+    const oac_int32            max_gain_Q7,                    /* I    maximum sum of absolute LTP coefficients    */
+    const oac_int              L                               /* I    number of vectors in codebook               */
 ) = {
   silk_VQ_WMat_EC_c,                  /* non-sse */
   silk_VQ_WMat_EC_c,
@@ -114,22 +114,22 @@ void (*const SILK_VQ_WMAT_EC_IMPL[ OPUS_ARCHMASK + 1 ] )(
   MAY_HAVE_SSE4_1( silk_VQ_WMat_EC )  /* avx */
 };
 
-void (*const SILK_NSQ_DEL_DEC_IMPL[ OPUS_ARCHMASK + 1 ] )(
+void (*const SILK_NSQ_DEL_DEC_IMPL[ OAC_ARCHMASK + 1 ] )(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const opus_int16            x16[],                                        /* I    Input                           */
-    opus_int8                   pulses[],                                     /* O    Quantized pulse signal          */
-    const opus_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const opus_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const opus_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const opus_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const opus_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const opus_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const opus_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const opus_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const opus_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const opus_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
+    const oac_int16            x16[],                                        /* I    Input                           */
+    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
+    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
+    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
+    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
+    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
+    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
+    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
+    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
+    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
+    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
 ) = {
   silk_NSQ_del_dec_c,                  /* non-sse */
   silk_NSQ_del_dec_c,
@@ -140,15 +140,15 @@ void (*const SILK_NSQ_DEL_DEC_IMPL[ OPUS_ARCHMASK + 1 ] )(
 
 #if defined(FIXED_POINT)
 
-void (*const SILK_BURG_MODIFIED_IMPL[ OPUS_ARCHMASK + 1 ] )(
-    opus_int32                  *res_nrg,           /* O    Residual energy                                             */
-    opus_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
-    opus_int32                  A_Q16[],            /* O    Prediction coefficients (length order)                      */
-    const opus_int16            x[],                /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
-    const opus_int32            minInvGain_Q30,     /* I    Inverse of max prediction gain                              */
-    const opus_int              subfr_length,       /* I    Input signal subframe length (incl. D preceding samples)    */
-    const opus_int              nb_subfr,           /* I    Number of subframes stacked in x                            */
-    const opus_int              D,                  /* I    Order                                                       */
+void (*const SILK_BURG_MODIFIED_IMPL[ OAC_ARCHMASK + 1 ] )(
+    oac_int32                  *res_nrg,           /* O    Residual energy                                             */
+    oac_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
+    oac_int32                  A_Q16[],            /* O    Prediction coefficients (length order)                      */
+    const oac_int16            x[],                /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
+    const oac_int32            minInvGain_Q30,     /* I    Inverse of max prediction gain                              */
+    const oac_int              subfr_length,       /* I    Input signal subframe length (incl. D preceding samples)    */
+    const oac_int              nb_subfr,           /* I    Number of subframes stacked in x                            */
+    const oac_int              D,                  /* I    Order                                                       */
     int                         arch                /* I    Run-time architecture                                       */
 ) = {
   silk_burg_modified_c,                  /* non-sse */
@@ -162,10 +162,10 @@ void (*const SILK_BURG_MODIFIED_IMPL[ OPUS_ARCHMASK + 1 ] )(
 
 #ifndef FIXED_POINT
 
-double (*const SILK_INNER_PRODUCT_FLP_IMPL[ OPUS_ARCHMASK + 1 ] )(
+double (*const SILK_INNER_PRODUCT_FLP_IMPL[ OAC_ARCHMASK + 1 ] )(
     const silk_float    *data1,
     const silk_float    *data2,
-    opus_int            dataSize
+    oac_int            dataSize
 ) = {
   silk_inner_product_FLP_c,                  /* non-sse */
   silk_inner_product_FLP_c,
diff --git a/silk/xtensa/SigProc_FIX_lx7.h b/silk/xtensa/SigProc_FIX_lx7.h
index 97391a00f..cea902bac 100644
--- a/silk/xtensa/SigProc_FIX_lx7.h
+++ b/silk/xtensa/SigProc_FIX_lx7.h
@@ -29,9 +29,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #define SILK_SIGPROC_FIX_LX7_H
 
 #undef silk_SAT16
-static inline short int silk_SAT16_lx7(opus_int32 a)
+static inline short int silk_SAT16_lx7(oac_int32 a)
 {
-    opus_int32 res;
+    oac_int32 res;
     __asm__(
         "clamps %0, %1, 15\n\t"
         : "=r"(res)
diff --git a/silk/xtensa/macros_lx7.h b/silk/xtensa/macros_lx7.h
index fed6c9ef9..b6c2183ab 100644
--- a/silk/xtensa/macros_lx7.h
+++ b/silk/xtensa/macros_lx7.h
@@ -31,13 +31,13 @@ POSSIBILITY OF SUCH DAMAGE.
 /* This macro only avoids the undefined behaviour from a left shift of
    a negative value. It should only be used in macros that can't include
    SigProc_FIX.h. In other cases, use silk_LSHIFT32(). */
-#define SAFE_SHL(a, b) ((opus_int32)((opus_uint32)(a) << (b)))
+#define SAFE_SHL(a, b) ((oac_int32)((oac_uint32)(a) << (b)))
 
-/* (a32 * (opus_int32)((opus_int16)(b32))) >> 16 output have to be 32bit int */
+/* (a32 * (oac_int32)((oac_int16)(b32))) >> 16 output have to be 32bit int */
 #undef silk_SMULWB
-static OPUS_INLINE opus_int32 silk_SMULWB_lx7(opus_int32 a32, opus_int32 b32)
+static OAC_INLINE oac_int32 silk_SMULWB_lx7(oac_int32 a32, oac_int32 b32)
 {
-    opus_int32 res;
+    oac_int32 res;
     __asm__(
         "mulsh %0, %1, %2\n\t"
         : "=r"(res)
@@ -47,15 +47,15 @@ static OPUS_INLINE opus_int32 silk_SMULWB_lx7(opus_int32 a32, opus_int32 b32)
 }
 #define silk_SMULWB(a32, b32) (silk_SMULWB_lx7(a32, b32))
 
-/* a32 + (b32 * (opus_int32)((opus_int16)(c32))) >> 16 output have to be 32bit int */
+/* a32 + (b32 * (oac_int32)((oac_int16)(c32))) >> 16 output have to be 32bit int */
 #undef silk_SMLAWB
 #define silk_SMLAWB(a32, b32, c32) ((a32) + silk_SMULWB(b32, c32))
 
 /* (a32 * (b32 >> 16)) >> 16 */
 #undef silk_SMULWT
-static OPUS_INLINE opus_int32 silk_SMULWT_lx7(opus_int32 a32, opus_int32 b32)
+static OAC_INLINE oac_int32 silk_SMULWT_lx7(oac_int32 a32, oac_int32 b32)
 {
-    opus_int32 res;
+    oac_int32 res;
     __asm__(
         "mulsh %0, %1, %2\n\t"
         : "=r"(res)
@@ -69,7 +69,7 @@ static OPUS_INLINE opus_int32 silk_SMULWT_lx7(opus_int32 a32, opus_int32 b32)
 #define silk_SMLAWT(a32, b32, c32) ((a32) + silk_SMULWT_lx7(b32, c32))
 
 #undef silk_CLZ32
-static OPUS_INLINE opus_int32 silk_CLZ32_lx7(opus_int32 in32)
+static OAC_INLINE oac_int32 silk_CLZ32_lx7(oac_int32 in32)
 {
     return __builtin_clz(in32);
 }
diff --git a/src/analysis.c b/src/analysis.c
index c353230ad..7e9d75f44 100644
--- a/src/analysis.c
+++ b/src/analysis.c
@@ -112,16 +112,16 @@ static const int tbands[NB_TBANDS+1] = {
 
 #define NB_TONAL_SKIP_BANDS 9
 
-static opus_val32 silk_resampler_down2_hp(
-    opus_val32                  *S,                 /* I/O  State vector [ 2 ]                                          */
-    opus_val32                  *out,               /* O    Output signal [ floor(len/2) ]                              */
-    const opus_val32            *in,                /* I    Input signal [ len ]                                        */
+static oac_val32 silk_resampler_down2_hp(
+    oac_val32                  *S,                 /* I/O  State vector [ 2 ]                                          */
+    oac_val32                  *out,               /* O    Output signal [ floor(len/2) ]                              */
+    const oac_val32            *in,                /* I    Input signal [ len ]                                        */
     int                         inLen               /* I    Number of input samples                                     */
 )
 {
     int k, len2 = inLen/2;
-    opus_val32 in32, out32, out32_hp, Y, X;
-    opus_val64 hp_ener = 0;
+    oac_val32 in32, out32, out32_hp, Y, X;
+    oac_val64 hp_ener = 0;
     /* Internal variables and state are in Q10 format */
     for( k = 0; k < len2; k++ ) {
         /* Convert to Q10 */
@@ -150,7 +150,7 @@ static opus_val32 silk_resampler_down2_hp(
         S[ 2 ] = ADD32( -in32, X );
 
         /* len2 can be up to 480, so we shift by 8 to make it fit. */
-        hp_ener += SHR64(out32_hp*(opus_val64)out32_hp, 8);
+        hp_ener += SHR64(out32_hp*(oac_val64)out32_hp, 8);
         /* Add, convert back to int16 and store to output */
         out[ k ] = HALF32(out32);
     }
@@ -159,14 +159,14 @@ static opus_val32 silk_resampler_down2_hp(
     hp_ener = hp_ener >> (2*SIG_SHIFT);
     if (hp_ener > 2147483647) hp_ener = 2147483647;
 #endif
-    return (opus_val32)hp_ener;
+    return (oac_val32)hp_ener;
 }
 
-static opus_val32 downmix_and_resample(downmix_func downmix, const void *_x, opus_val32 *y, opus_val32 S[3], int subframe, int offset, int c1, int c2, int C, int Fs)
+static oac_val32 downmix_and_resample(downmix_func downmix, const void *_x, oac_val32 *y, oac_val32 S[3], int subframe, int offset, int c1, int c2, int C, int Fs)
 {
-   VARDECL(opus_val32, tmp);
+   VARDECL(oac_val32, tmp);
    int j;
-   opus_val32 ret = 0;
+   oac_val32 ret = 0;
    SAVE_STACK;
 
    if (subframe==0) return 0;
@@ -179,7 +179,7 @@ static opus_val32 downmix_and_resample(downmix_func downmix, const void *_x, opu
       offset = offset*2/3;
    }
    else if (Fs != 24000) celt_assert(0);
-   ALLOC(tmp, subframe, opus_val32);
+   ALLOC(tmp, subframe, oac_val32);
 
    downmix(_x, tmp, subframe, offset, c1, c2, C);
    if ((c2==-2 && C==2) || c2>-1) {
@@ -191,10 +191,10 @@ static opus_val32 downmix_and_resample(downmix_func downmix, const void *_x, opu
    {
       ret = silk_resampler_down2_hp(S, y, tmp, subframe);
    } else if (Fs == 24000) {
-      OPUS_COPY(y, tmp, subframe);
+      OAC_COPY(y, tmp, subframe);
    } else if (Fs == 16000) {
-      VARDECL(opus_val32, tmp3x);
-      ALLOC(tmp3x, 3*subframe, opus_val32);
+      VARDECL(oac_val32, tmp3x);
+      ALLOC(tmp3x, 3*subframe, oac_val32);
       /* Don't do this at home! This resampler is horrible and it's only (barely)
          usable for the purpose of the analysis because we don't care about all
          the aliasing between 8 kHz and 12 kHz. */
@@ -213,10 +213,10 @@ static opus_val32 downmix_and_resample(downmix_func downmix, const void *_x, opu
    return ret;
 }
 
-void tonality_analysis_init(TonalityAnalysisState *tonal, opus_int32 Fs)
+void tonality_analysis_init(TonalityAnalysisState *tonal, oac_int32 Fs)
 {
   /* Initialize reusable fields. */
-  tonal->arch = opus_select_arch();
+  tonal->arch = oac_select_arch();
   tonal->Fs = Fs;
   /* Clear remaining fields. */
   tonality_analysis_reset(tonal);
@@ -226,7 +226,7 @@ void tonality_analysis_reset(TonalityAnalysisState *tonal)
 {
   /* Clear non-reusable fields. */
   char *start = (char*)&tonal->TONALITY_ANALYSIS_RESET_START;
-  OPUS_CLEAR(start, sizeof(TonalityAnalysisState) - (start - (char*)tonal));
+  OAC_CLEAR(start, sizeof(TonalityAnalysisState) - (start - (char*)tonal));
 }
 
 void tonality_get_info(TonalityAnalysisState *tonal, AnalysisInfo *info_out, int len)
@@ -271,7 +271,7 @@ void tonality_get_info(TonalityAnalysisState *tonal, AnalysisInfo *info_out, int
    if (pos<0)
       pos = DETECT_SIZE-1;
    pos0 = pos;
-   OPUS_COPY(info_out, &tonal->info[pos], 1);
+   OAC_COPY(info_out, &tonal->info[pos], 1);
    if (!info_out->valid)
       return;
    tonality_max = tonality_avg = info_out->tonality;
@@ -418,17 +418,17 @@ static const float std_feature_bias[9] = {
 #ifdef FIXED_POINT
 /* For fixed-point, the input is +/-2^15 shifted up by SIG_SHIFT, so we need to
    compensate for that in the energy. */
-#define SCALE_COMPENS (1.f/((opus_int32)1<<(15+SIG_SHIFT)))
+#define SCALE_COMPENS (1.f/((oac_int32)1<<(15+SIG_SHIFT)))
 #define SCALE_ENER(e) ((SCALE_COMPENS*SCALE_COMPENS)*(e))
 #else
 #define SCALE_ENER(e) ((1.f/32768/32768)*e)
 #endif
 
 #ifdef FIXED_POINT
-static int is_digital_silence32(const opus_val32* pcm, int frame_size, int channels, int lsb_depth)
+static int is_digital_silence32(const oac_val32* pcm, int frame_size, int channels, int lsb_depth)
 {
    int silence = 0;
-   opus_val32 sample_max = 0;
+   oac_val32 sample_max = 0;
 #ifdef MLP_TRAINING
    return 0;
 #endif
@@ -449,9 +449,9 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
     VARDECL(kiss_fft_cpx, in);
     VARDECL(kiss_fft_cpx, out);
     int N = 480, N2=240;
-    float * OPUS_RESTRICT A = tonal->angle;
-    float * OPUS_RESTRICT dA = tonal->d_angle;
-    float * OPUS_RESTRICT d2A = tonal->d2_angle;
+    float * OAC_RESTRICT A = tonal->angle;
+    float * OAC_RESTRICT dA = tonal->d_angle;
+    float * OAC_RESTRICT d2A = tonal->d2_angle;
     VARDECL(float, tonality);
     VARDECL(float, noisiness);
     float band_tonality[NB_TBANDS];
@@ -540,7 +540,7 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
        in[N-i-1].r = (kiss_fft_scalar)(w*tonal->inmem[N-i-1]);
        in[N-i-1].i = (kiss_fft_scalar)(w*tonal->inmem[N+N2-i-1]);
     }
-    OPUS_MOVE(tonal->inmem, tonal->inmem+ANALYSIS_BUF_SIZE-240, 240);
+    OAC_MOVE(tonal->inmem, tonal->inmem+ANALYSIS_BUF_SIZE-240, 240);
     remaining = len - (ANALYSIS_BUF_SIZE-tonal->mem_fill);
     tonal->hp_ener_accum = (float)downmix_and_resample(downmix, x,
           &tonal->inmem[240], tonal->downmix_state, remaining,
@@ -552,11 +552,11 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
        int prev_pos = tonal->write_pos-2;
        if (prev_pos < 0)
           prev_pos += DETECT_SIZE;
-       OPUS_COPY(info, &tonal->info[prev_pos], 1);
+       OAC_COPY(info, &tonal->info[prev_pos], 1);
        RESTORE_STACK;
        return;
     }
-    opus_fft(kfft, in, out, tonal->arch);
+    oac_fft(kfft, in, out, tonal->arch);
 #ifndef FIXED_POINT
     /* If there's any NaN on the input, the entire output will be NaN, so we only need to check one value. */
     if (celt_isnan(out[0].r))
@@ -945,14 +945,14 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
 
     info->bandwidth = bandwidth;
     tonal->prev_bandwidth = bandwidth;
-    /*printf("%d %d\n", info->bandwidth, info->opus_bandwidth);*/
+    /*printf("%d %d\n", info->bandwidth, info->oac_bandwidth);*/
     info->noisiness = frame_noisiness;
     info->valid = 1;
     RESTORE_STACK;
 }
 
 void run_analysis(TonalityAnalysisState *analysis, const CELTMode *celt_mode, const void *analysis_pcm,
-                 int analysis_frame_size, int frame_size, int c1, int c2, int C, opus_int32 Fs,
+                 int analysis_frame_size, int frame_size, int c1, int c2, int C, oac_int32 Fs,
                  int lsb_depth, downmix_func downmix, AnalysisInfo *analysis_info)
 {
    int offset;
diff --git a/src/analysis.h b/src/analysis.h
index cb19cc0df..c339e4624 100644
--- a/src/analysis.h
+++ b/src/analysis.h
@@ -29,7 +29,7 @@
 #define ANALYSIS_H
 
 #include "celt.h"
-#include "opus_private.h"
+#include "oac_private.h"
 #include "mlp.h"
 
 #define NB_FRAMES 8
@@ -47,12 +47,12 @@
 typedef struct {
    int arch;
    int application;
-   opus_int32 Fs;
+   oac_int32 Fs;
 #define TONALITY_ANALYSIS_RESET_START angle
    float angle[240];
    float d_angle[240];
    float d2_angle[240];
-   opus_val32 inmem[ANALYSIS_BUF_SIZE];
+   oac_val32 inmem[ANALYSIS_BUF_SIZE];
    int   mem_fill;                      /* number of usable samples in the buffer */
    float prev_band_tonality[NB_TBANDS];
    float prev_tonality;
@@ -76,7 +76,7 @@ typedef struct {
    float hp_ener_accum;
    int initialized;
    float rnn_state[MAX_NEURONS];
-   opus_val32 downmix_state[3];
+   oac_val32 downmix_state[3];
    AnalysisInfo info[DETECT_SIZE];
 } TonalityAnalysisState;
 
@@ -86,7 +86,7 @@ typedef struct {
  * not be repeated every analysis step. No allocated memory is retained
  * by the state struct, so no cleanup call is required.
  */
-void tonality_analysis_init(TonalityAnalysisState *analysis, opus_int32 Fs);
+void tonality_analysis_init(TonalityAnalysisState *analysis, oac_int32 Fs);
 
 /** Reset a TonalityAnalysisState struct.
  *
@@ -97,7 +97,7 @@ void tonality_analysis_reset(TonalityAnalysisState *analysis);
 void tonality_get_info(TonalityAnalysisState *tonal, AnalysisInfo *info_out, int len);
 
 void run_analysis(TonalityAnalysisState *analysis, const CELTMode *celt_mode, const void *analysis_pcm,
-                 int analysis_frame_size, int frame_size, int c1, int c2, int C, opus_int32 Fs,
+                 int analysis_frame_size, int frame_size, int c1, int c2, int C, oac_int32 Fs,
                  int lsb_depth, downmix_func downmix, AnalysisInfo *analysis_info);
 
 #endif
diff --git a/src/extensions.c b/src/extensions.c
index d505978fc..af037eb46 100644
--- a/src/extensions.c
+++ b/src/extensions.c
@@ -29,11 +29,11 @@
 #endif
 
 
-#include "opus_types.h"
-#include "opus_defines.h"
+#include "oac_types.h"
+#include "oac_defines.h"
 #include "arch.h"
 #include "os_support.h"
-#include "opus_private.h"
+#include "oac_private.h"
 
 
 /* Given an extension payload (i.e., excluding the initial ID byte), advance
@@ -42,12 +42,12 @@
    N.B., a "Repeat These Extensions" extension (ID==2) does not advance past
     the repeated extension payloads.
    That requires higher-level logic. */
-static opus_int32 skip_extension_payload(const unsigned char **pdata,
- opus_int32 len, opus_int32 *pheader_size, int id_byte,
- opus_int32 trailing_short_len)
+static oac_int32 skip_extension_payload(const unsigned char **pdata,
+ oac_int32 len, oac_int32 *pheader_size, int id_byte,
+ oac_int32 trailing_short_len)
 {
    const unsigned char *data;
-   opus_int32 header_size;
+   oac_int32 header_size;
    int id, L;
    data = *pdata;
    header_size = 0;
@@ -69,8 +69,8 @@ static opus_int32 skip_extension_payload(const unsigned char **pdata,
          data += len - trailing_short_len;
          len = trailing_short_len;
       } else {
-         opus_int32 bytes=0;
-         opus_int32 lacing;
+         oac_int32 bytes=0;
+         oac_int32 lacing;
          do {
             if (len < 1)
                return -1;
@@ -95,8 +95,8 @@ static opus_int32 skip_extension_payload(const unsigned char **pdata,
     extension ID byte.
    Higher-level logic is required to skip the extension payloads that come
     after it.*/
-static opus_int32 skip_extension(const unsigned char **pdata, opus_int32 len,
- opus_int32 *pheader_size)
+static oac_int32 skip_extension(const unsigned char **pdata, oac_int32 len,
+ oac_int32 *pheader_size)
 {
    const unsigned char *data;
    int id_byte;
@@ -117,8 +117,8 @@ static opus_int32 skip_extension(const unsigned char **pdata, opus_int32 len,
    return len;
 }
 
-void opus_extension_iterator_init(OpusExtensionIterator *iter,
- const unsigned char *data, opus_int32 len, opus_int32 nb_frames) {
+void oac_extension_iterator_init(OacExtensionIterator *iter,
+ const unsigned char *data, oac_int32 len, oac_int32 nb_frames) {
    celt_assert(len >= 0);
    celt_assert(data != NULL || len == 0);
    celt_assert(nb_frames >= 0 && nb_frames <= 48);
@@ -134,7 +134,7 @@ void opus_extension_iterator_init(OpusExtensionIterator *iter,
 
 /* Reset the iterator so it can start iterating again from the first
     extension. */
-void opus_extension_iterator_reset(OpusExtensionIterator *iter) {
+void oac_extension_iterator_reset(OacExtensionIterator *iter) {
    iter->repeat_data = iter->curr_data = iter->data;
    iter->last_long = NULL;
    iter->curr_len = iter->len;
@@ -146,7 +146,7 @@ void opus_extension_iterator_reset(OpusExtensionIterator *iter) {
     frame_max or larger.
    This can allow it to stop iterating early if these extensions are not
     needed. */
-void opus_extension_iterator_set_frame_max(OpusExtensionIterator *iter,
+void oac_extension_iterator_set_frame_max(OacExtensionIterator *iter,
  int frame_max) {
    iter->frame_max = frame_max;
 }
@@ -154,9 +154,9 @@ void opus_extension_iterator_set_frame_max(OpusExtensionIterator *iter,
 /* Return the next repeated extension.
    The return value is non-zero if one is found, negative on error, or 0 if we
     have finished repeating extensions. */
-static int opus_extension_iterator_next_repeat(OpusExtensionIterator *iter,
- opus_extension_data *ext) {
-   opus_int32 header_size;
+static int oac_extension_iterator_next_repeat(OacExtensionIterator *iter,
+ oac_extension_data *ext) {
+   oac_int32 header_size;
    celt_assert(iter->repeat_frame > 0);
    for (;iter->repeat_frame < iter->nb_frames; iter->repeat_frame++) {
       while (iter->src_len > 0) {
@@ -182,7 +182,7 @@ static int opus_extension_iterator_next_repeat(OpusExtensionIterator *iter,
           iter->curr_len, &header_size, repeat_id_byte,
           iter->trailing_short_len);
          if (iter->curr_len < 0) {
-            return OPUS_INVALID_PACKET;
+            return OAC_INVALID_PACKET;
          }
          celt_assert(iter->curr_data - iter->data
           == iter->len - iter->curr_len);
@@ -223,19 +223,19 @@ static int opus_extension_iterator_next_repeat(OpusExtensionIterator *iter,
     indicators, but including the repeated extensions) in bitstream order.
    Due to the extension repetition mechanism, extensions are not necessarily
     returned in frame order. */
-int opus_extension_iterator_next(OpusExtensionIterator *iter,
- opus_extension_data *ext) {
-   opus_int32 header_size;
+int oac_extension_iterator_next(OacExtensionIterator *iter,
+ oac_extension_data *ext) {
+   oac_int32 header_size;
    if (iter->curr_len < 0) {
-      return OPUS_INVALID_PACKET;
+      return OAC_INVALID_PACKET;
    }
    if (iter->repeat_frame > 0) {
       int ret;
       /* We are in the process of repeating some extensions. */
-      ret = opus_extension_iterator_next_repeat(iter, ext);
+      ret = oac_extension_iterator_next_repeat(iter, ext);
       if (ret) return ret;
    }
-   /* Checking this here allows opus_extension_iterator_set_frame_max() to be
+   /* Checking this here allows oac_extension_iterator_set_frame_max() to be
        called at any point. */
    if (iter->curr_frame >= iter->frame_max) {
       return 0;
@@ -250,7 +250,7 @@ int opus_extension_iterator_next(OpusExtensionIterator *iter,
       iter->curr_len = skip_extension(&iter->curr_data, iter->curr_len,
        &header_size);
       if (iter->curr_len < 0) {
-         return OPUS_INVALID_PACKET;
+         return OAC_INVALID_PACKET;
       }
       celt_assert(iter->curr_data - iter->data == iter->len - iter->curr_len);
       if (id == 1) {
@@ -264,7 +264,7 @@ int opus_extension_iterator_next(OpusExtensionIterator *iter,
          }
          if (iter->curr_frame >= iter->nb_frames) {
             iter->curr_len = -1;
-            return OPUS_INVALID_PACKET;
+            return OAC_INVALID_PACKET;
          }
          /* If we were asked to stop at frame_max, skip extensions for later
              frames. */
@@ -282,7 +282,7 @@ int opus_extension_iterator_next(OpusExtensionIterator *iter,
          iter->repeat_len = curr_data0 - iter->repeat_data;
          iter->src_data = iter->repeat_data;
          iter->src_len = iter->repeat_len;
-         ret = opus_extension_iterator_next_repeat(iter, ext);
+         ret = oac_extension_iterator_next_repeat(iter, ext);
          if (ret) return ret;
       }
       else if (id > 2) {
@@ -308,12 +308,12 @@ int opus_extension_iterator_next(OpusExtensionIterator *iter,
    return 0;
 }
 
-int opus_extension_iterator_find(OpusExtensionIterator *iter,
- opus_extension_data *ext, int id) {
-   opus_extension_data curr_ext;
+int oac_extension_iterator_find(OacExtensionIterator *iter,
+ oac_extension_data *ext, int id) {
+   oac_extension_data curr_ext;
    int ret;
    for(;;) {
-      ret = opus_extension_iterator_next(iter, &curr_ext);
+      ret = oac_extension_iterator_next(iter, &curr_ext);
       if (ret <= 0) {
          return ret;
       }
@@ -326,51 +326,51 @@ int opus_extension_iterator_find(OpusExtensionIterator *iter,
 
 /* Count the number of extensions, excluding real padding, separators, and
     repeat indicators, but including the repeated extensions. */
-opus_int32 opus_packet_extensions_count(const unsigned char *data,
- opus_int32 len, int nb_frames)
+oac_int32 oac_packet_extensions_count(const unsigned char *data,
+ oac_int32 len, int nb_frames)
 {
-   OpusExtensionIterator iter;
+   OacExtensionIterator iter;
    int count;
-   opus_extension_iterator_init(&iter, data, len, nb_frames);
-   for (count=0; opus_extension_iterator_next(&iter, NULL) > 0; count++);
+   oac_extension_iterator_init(&iter, data, len, nb_frames);
+   for (count=0; oac_extension_iterator_next(&iter, NULL) > 0; count++);
    return count;
 }
 
 /* Count the number of extensions for each frame, excluding real padding and
     separators and repeat indicators, but including the repeated extensions. */
-opus_int32 opus_packet_extensions_count_ext(const unsigned char *data,
- opus_int32 len, opus_int32 *nb_frame_exts, int nb_frames) {
-   OpusExtensionIterator iter;
-   opus_extension_data ext;
+oac_int32 oac_packet_extensions_count_ext(const unsigned char *data,
+ oac_int32 len, oac_int32 *nb_frame_exts, int nb_frames) {
+   OacExtensionIterator iter;
+   oac_extension_data ext;
    int count;
-   opus_extension_iterator_init(&iter, data, len, nb_frames);
-   OPUS_CLEAR(nb_frame_exts, nb_frames);
-   for (count=0; opus_extension_iterator_next(&iter, &ext) > 0; count++) {
+   oac_extension_iterator_init(&iter, data, len, nb_frames);
+   OAC_CLEAR(nb_frame_exts, nb_frames);
+   for (count=0; oac_extension_iterator_next(&iter, &ext) > 0; count++) {
       nb_frame_exts[ext.frame]++;
    }
    return count;
 }
 
-/* Extract extensions from Opus padding (excluding real padding, separators,
+/* Extract extensions from Oac padding (excluding real padding, separators,
     and repeat indicators, but including the repeated extensions) in bitstream
     order.
    Due to the extension repetition mechanism, extensions are not necessarily
     returned in frame order. */
-opus_int32 opus_packet_extensions_parse(const unsigned char *data,
- opus_int32 len, opus_extension_data *extensions, opus_int32 *nb_extensions,
+oac_int32 oac_packet_extensions_parse(const unsigned char *data,
+ oac_int32 len, oac_extension_data *extensions, oac_int32 *nb_extensions,
  int nb_frames) {
-   OpusExtensionIterator iter;
+   OacExtensionIterator iter;
    int count;
    int ret;
    celt_assert(nb_extensions != NULL);
    celt_assert(extensions != NULL || *nb_extensions == 0);
-   opus_extension_iterator_init(&iter, data, len, nb_frames);
+   oac_extension_iterator_init(&iter, data, len, nb_frames);
    for (count=0;; count++) {
-      opus_extension_data ext;
-      ret = opus_extension_iterator_next(&iter, &ext);
+      oac_extension_data ext;
+      ret = oac_extension_iterator_next(&iter, &ext);
       if (ret <= 0) break;
       if (count == *nb_extensions) {
-         return OPUS_BUFFER_TOO_SMALL;
+         return OAC_BUFFER_TOO_SMALL;
       }
       extensions[count] = ext;
    }
@@ -378,17 +378,17 @@ opus_int32 opus_packet_extensions_parse(const unsigned char *data,
    return ret;
 }
 
-/* Extract extensions from Opus padding (excluding real padding, separators,
+/* Extract extensions from Oac padding (excluding real padding, separators,
     and repeat indicators, but including the repeated extensions) in frame
     order.
    nb_frame_exts must be filled with the output of
-    opus_packet_extensions_count_ext(). */
-opus_int32 opus_packet_extensions_parse_ext(const unsigned char *data,
- opus_int32 len, opus_extension_data *extensions, opus_int32 *nb_extensions,
- const opus_int32 *nb_frame_exts, int nb_frames) {
-   OpusExtensionIterator iter;
-   opus_extension_data ext;
-   opus_int32 nb_frames_cum[49];
+    oac_packet_extensions_count_ext(). */
+oac_int32 oac_packet_extensions_parse_ext(const unsigned char *data,
+ oac_int32 len, oac_extension_data *extensions, oac_int32 *nb_extensions,
+ const oac_int32 *nb_frame_exts, int nb_frames) {
+   OacExtensionIterator iter;
+   oac_extension_data ext;
+   oac_int32 nb_frames_cum[49];
    int count;
    int prev_total;
    int ret;
@@ -404,14 +404,14 @@ opus_int32 opus_packet_extensions_parse_ext(const unsigned char *data,
       prev_total = total;
    }
    nb_frames_cum[count] = prev_total;
-   opus_extension_iterator_init(&iter, data, len, nb_frames);
+   oac_extension_iterator_init(&iter, data, len, nb_frames);
    for (count=0;; count++) {
-      opus_int32 idx;
-      ret = opus_extension_iterator_next(&iter, &ext);
+      oac_int32 idx;
+      ret = oac_extension_iterator_next(&iter, &ext);
       if (ret <= 0) break;
       idx = nb_frames_cum[ext.frame]++;
       if (idx >= *nb_extensions) {
-         return OPUS_BUFFER_TOO_SMALL;
+         return OAC_BUFFER_TOO_SMALL;
       }
       celt_assert(idx < nb_frames_cum[ext.frame + 1]);
       extensions[idx] = ext;
@@ -420,31 +420,31 @@ opus_int32 opus_packet_extensions_parse_ext(const unsigned char *data,
    return ret;
 }
 
-static int write_extension_payload(unsigned char *data, opus_int32 len,
- opus_int32 pos, const opus_extension_data *ext, int last) {
+static int write_extension_payload(unsigned char *data, oac_int32 len,
+ oac_int32 pos, const oac_extension_data *ext, int last) {
    celt_assert(ext->id >= 3 && ext->id <= 127);
    if (ext->id < 32)
    {
       if (ext->len < 0 || ext->len > 1)
-         return OPUS_BAD_ARG;
+         return OAC_BAD_ARG;
       if (ext->len > 0) {
          if (len-pos < ext->len)
-            return OPUS_BUFFER_TOO_SMALL;
+            return OAC_BUFFER_TOO_SMALL;
          if (data) data[pos] = ext->data[0];
          pos++;
       }
    } else {
-      opus_int32 length_bytes;
+      oac_int32 length_bytes;
       if (ext->len < 0)
-         return OPUS_BAD_ARG;
+         return OAC_BAD_ARG;
       length_bytes = 1 + ext->len/255;
       if (last)
          length_bytes = 0;
       if (len-pos < length_bytes + ext->len)
-         return OPUS_BUFFER_TOO_SMALL;
+         return OAC_BUFFER_TOO_SMALL;
       if (!last)
       {
-         opus_int32 j;
+         oac_int32 j;
          for (j=0;j<ext->len/255;j++) {
             if (data) data[pos] = 255;
             pos++;
@@ -452,55 +452,55 @@ static int write_extension_payload(unsigned char *data, opus_int32 len,
          if (data) data[pos] = ext->len % 255;
          pos++;
       }
-      if (data) OPUS_COPY(&data[pos], ext->data, ext->len);
+      if (data) OAC_COPY(&data[pos], ext->data, ext->len);
       pos += ext->len;
    }
    return pos;
 }
 
-static int write_extension(unsigned char *data, opus_int32 len, opus_int32 pos,
- const opus_extension_data *ext, int last) {
+static int write_extension(unsigned char *data, oac_int32 len, oac_int32 pos,
+ const oac_extension_data *ext, int last) {
    if (len-pos < 1)
-      return OPUS_BUFFER_TOO_SMALL;
+      return OAC_BUFFER_TOO_SMALL;
    celt_assert(ext->id >= 3 && ext->id <= 127);
    if (data) data[pos] = (ext->id<<1) + (ext->id < 32 ? ext->len : !last);
    pos++;
    return write_extension_payload(data, len, pos, ext, last);
 }
 
-opus_int32 opus_packet_extensions_generate(unsigned char *data, opus_int32 len,
- const opus_extension_data  *extensions, opus_int32 nb_extensions,
+oac_int32 oac_packet_extensions_generate(unsigned char *data, oac_int32 len,
+ const oac_extension_data  *extensions, oac_int32 nb_extensions,
  int nb_frames, int pad)
 {
-   opus_int32 frame_min_idx[48];
-   opus_int32 frame_max_idx[48];
-   opus_int32 frame_repeat_idx[48];
-   opus_int32 i;
+   oac_int32 frame_min_idx[48];
+   oac_int32 frame_max_idx[48];
+   oac_int32 frame_repeat_idx[48];
+   oac_int32 i;
    int f;
    int curr_frame = 0;
-   opus_int32 pos = 0;
-   opus_int32 written = 0;
+   oac_int32 pos = 0;
+   oac_int32 written = 0;
 
    celt_assert(len >= 0);
-   if (nb_frames > 48) return OPUS_BAD_ARG;
+   if (nb_frames > 48) return OAC_BAD_ARG;
 
    /* Do a little work up-front to make this O(nb_extensions) instead of
        O(nb_extensions*nb_frames) so long as the extensions are in frame
        order (without requiring that they be in frame order). */
    for (f=0;f<nb_frames;f++) frame_min_idx[f] = nb_extensions;
-   OPUS_CLEAR(frame_max_idx, nb_frames);
+   OAC_CLEAR(frame_max_idx, nb_frames);
    for (i=0;i<nb_extensions;i++)
    {
       f = extensions[i].frame;
-      if (f < 0 || f >= nb_frames) return OPUS_BAD_ARG;
-      if (extensions[i].id < 3 || extensions[i].id > 127) return OPUS_BAD_ARG;
+      if (f < 0 || f >= nb_frames) return OAC_BAD_ARG;
+      if (extensions[i].id < 3 || extensions[i].id > 127) return OAC_BAD_ARG;
       frame_min_idx[f] = IMIN(frame_min_idx[f], i);
       frame_max_idx[f] = IMAX(frame_max_idx[f], i+1);
    }
    for (f=0;f<nb_frames;f++) frame_repeat_idx[f] = frame_min_idx[f];
    for (f=0;f<nb_frames;f++)
    {
-      opus_int32 last_long_idx;
+      oac_int32 last_long_idx;
       int repeat_count;
       repeat_count = 0;
       last_long_idx = -1;
@@ -571,7 +571,7 @@ opus_int32 opus_packet_extensions_generate(unsigned char *data, opus_int32 len,
             if (f != curr_frame) {
                int diff = f - curr_frame;
                if (len-pos < 2)
-                  return OPUS_BUFFER_TOO_SMALL;
+                  return OAC_BUFFER_TOO_SMALL;
                if (diff == 1) {
                   if (data) data[pos] = 0x02;
                   pos++;
@@ -598,7 +598,7 @@ opus_int32 opus_packet_extensions_generate(unsigned char *data, opus_int32 len,
                last = written + nb_repeated == nb_extensions
                 || (last_long_idx < 0 && i+1 >= frame_max_idx[f]);
                if (len-pos < 1)
-                  return OPUS_BUFFER_TOO_SMALL;
+                  return OAC_BUFFER_TOO_SMALL;
                if (data) data[pos] = 0x04 + !last;
                pos++;
                for (g=f+1;g<nb_frames;g++)
@@ -627,9 +627,9 @@ opus_int32 opus_packet_extensions_generate(unsigned char *data, opus_int32 len,
       an L=1 case still fits. */
    if (pad && pos < len)
    {
-      opus_int32 padding = len - pos;
+      oac_int32 padding = len - pos;
       if (data) {
-         OPUS_MOVE(data+padding, data, pos);
+         OAC_MOVE(data+padding, data, pos);
          for (i=0;i<padding;i++)
             data[i] = 0x01;
       }
@@ -642,16 +642,16 @@ opus_int32 opus_packet_extensions_generate(unsigned char *data, opus_int32 len,
 #include <stdio.h>
 int main()
 {
-   opus_extension_data ext[] = {{2, 0, (const unsigned char *)"a", 1},
+   oac_extension_data ext[] = {{2, 0, (const unsigned char *)"a", 1},
    {32, 10, (const unsigned char *)"DRED", 4},
    {33, 1, (const unsigned char *)"NOT DRED", 8},
    {3, 4, (const unsigned char *)NULL, 0}
    };
-   opus_extension_data ext2[10];
+   oac_extension_data ext2[10];
    int i, len;
    int nb_ext = 10;
    unsigned char packet[10000];
-   len = opus_packet_extensions_generate(packet, 32, ext, 4, 1);
+   len = oac_packet_extensions_generate(packet, 32, ext, 4, 1);
    for (i=0;i<len;i++)
    {
       printf("%#04x ", packet[i]);
@@ -659,8 +659,8 @@ int main()
          printf("\n");
    }
    printf("\n");
-   printf("count = %d\n", opus_packet_extensions_count(packet, len));
-   opus_packet_extensions_parse(packet, len, ext2, &nb_ext);
+   printf("count = %d\n", oac_packet_extensions_count(packet, len));
+   oac_packet_extensions_parse(packet, len, ext2, &nb_ext);
    for (i=0;i<nb_ext;i++)
    {
       int j;
diff --git a/src/mapping_matrix.c b/src/mapping_matrix.c
index 1b67da3ab..8e254ea25 100644
--- a/src/mapping_matrix.c
+++ b/src/mapping_matrix.c
@@ -31,15 +31,15 @@
 
 #include "arch.h"
 #include "float_cast.h"
-#include "opus_private.h"
-#include "opus_defines.h"
+#include "oac_private.h"
+#include "oac_defines.h"
 #include "mapping_matrix.h"
 
 #define MATRIX_INDEX(nb_rows, row, col) (nb_rows * col + row)
 
-opus_int32 mapping_matrix_get_size(int rows, int cols)
+oac_int32 mapping_matrix_get_size(int rows, int cols)
 {
-  opus_int32 size;
+  oac_int32 size;
 
   /* Mapping Matrix must only support up to 255 channels in or out.
    * Additionally, the total cell count must be <= 65004 octets in order
@@ -47,29 +47,29 @@ opus_int32 mapping_matrix_get_size(int rows, int cols)
    */
   if (rows > 255 || cols > 255)
       return 0;
-  size = rows * (opus_int32)cols * sizeof(opus_int16);
+  size = rows * (oac_int32)cols * sizeof(oac_int16);
   if (size > 65004)
     return 0;
 
   return align(sizeof(MappingMatrix)) + align(size);
 }
 
-opus_int16 *mapping_matrix_get_data(const MappingMatrix *matrix)
+oac_int16 *mapping_matrix_get_data(const MappingMatrix *matrix)
 {
   /* void* cast avoids clang -Wcast-align warning */
-  return (opus_int16*)(void*)((char*)matrix + align(sizeof(MappingMatrix)));
+  return (oac_int16*)(void*)((char*)matrix + align(sizeof(MappingMatrix)));
 }
 
 void mapping_matrix_init(MappingMatrix * const matrix,
-  int rows, int cols, int gain, const opus_int16 *data, opus_int32 data_size)
+  int rows, int cols, int gain, const oac_int16 *data, oac_int32 data_size)
 {
   int i;
-  opus_int16 *ptr;
+  oac_int16 *ptr;
 
 #if !defined(ENABLE_ASSERTIONS)
   (void)data_size;
 #endif
-  celt_assert(align(data_size) == align(rows * cols * sizeof(opus_int16)));
+  celt_assert(align(data_size) == align(rows * cols * sizeof(oac_int16)));
 
   matrix->rows = rows;
   matrix->cols = cols;
@@ -86,13 +86,13 @@ void mapping_matrix_multiply_channel_in_float(
     const MappingMatrix *matrix,
     const float *input,
     int input_rows,
-    opus_res *output,
+    oac_res *output,
     int output_row,
     int output_rows,
     int frame_size)
 {
   /* Matrix data is ordered col-wise. */
-  opus_int16* matrix_data;
+  oac_int16* matrix_data;
   int i, col;
 
   celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
@@ -114,7 +114,7 @@ void mapping_matrix_multiply_channel_in_float(
 
 void mapping_matrix_multiply_channel_out_float(
     const MappingMatrix *matrix,
-    const opus_res *input,
+    const oac_res *input,
     int input_row,
     int input_rows,
     float *output,
@@ -123,7 +123,7 @@ void mapping_matrix_multiply_channel_out_float(
 )
 {
   /* Matrix data is ordered col-wise. */
-  opus_int16* matrix_data;
+  oac_int16* matrix_data;
   int i, row;
   float input_sample;
 
@@ -147,15 +147,15 @@ void mapping_matrix_multiply_channel_out_float(
 
 void mapping_matrix_multiply_channel_in_short(
     const MappingMatrix *matrix,
-    const opus_int16 *input,
+    const oac_int16 *input,
     int input_rows,
-    opus_res *output,
+    oac_res *output,
     int output_row,
     int output_rows,
     int frame_size)
 {
   /* Matrix data is ordered col-wise. */
-  opus_int16* matrix_data;
+  oac_int16* matrix_data;
   int i, col;
 
   celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
@@ -164,13 +164,13 @@ void mapping_matrix_multiply_channel_in_short(
 
   for (i = 0; i < frame_size; i++)
   {
-    opus_val32 tmp = 0;
+    oac_val32 tmp = 0;
     for (col = 0; col < input_rows; col++)
     {
 #if defined(FIXED_POINT)
       tmp +=
-        ((opus_int32)matrix_data[MATRIX_INDEX(matrix->rows, output_row, col)] *
-        (opus_int32)input[MATRIX_INDEX(input_rows, col, i)]) >> 8;
+        ((oac_int32)matrix_data[MATRIX_INDEX(matrix->rows, output_row, col)] *
+        (oac_int32)input[MATRIX_INDEX(input_rows, col, i)]) >> 8;
 #else
       tmp +=
         matrix_data[MATRIX_INDEX(matrix->rows, output_row, col)] *
@@ -187,17 +187,17 @@ void mapping_matrix_multiply_channel_in_short(
 
 void mapping_matrix_multiply_channel_out_short(
     const MappingMatrix *matrix,
-    const opus_res *input,
+    const oac_res *input,
     int input_row,
     int input_rows,
-    opus_int16 *output,
+    oac_int16 *output,
     int output_rows,
     int frame_size)
 {
   /* Matrix data is ordered col-wise. */
-  opus_int16* matrix_data;
+  oac_int16* matrix_data;
   int i, row;
-  opus_int32 input_sample;
+  oac_int32 input_sample;
 
   celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
 
@@ -208,8 +208,8 @@ void mapping_matrix_multiply_channel_out_short(
     input_sample = RES2INT16(input[input_rows * i]);
     for (row = 0; row < output_rows; row++)
     {
-      opus_int32 tmp =
-        (opus_int32)matrix_data[MATRIX_INDEX(matrix->rows, row, input_row)] *
+      oac_int32 tmp =
+        (oac_int32)matrix_data[MATRIX_INDEX(matrix->rows, row, input_row)] *
         input_sample;
       output[MATRIX_INDEX(output_rows, row, i)] += (tmp + 16384) >> 15;
     }
@@ -218,15 +218,15 @@ void mapping_matrix_multiply_channel_out_short(
 
 void mapping_matrix_multiply_channel_in_int24(
     const MappingMatrix *matrix,
-    const opus_int32 *input,
+    const oac_int32 *input,
     int input_rows,
-    opus_res *output,
+    oac_res *output,
     int output_row,
     int output_rows,
     int frame_size)
 {
   /* Matrix data is ordered col-wise. */
-  opus_int16* matrix_data;
+  oac_int16* matrix_data;
   int i, col;
 
   celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
@@ -235,12 +235,12 @@ void mapping_matrix_multiply_channel_in_int24(
 
   for (i = 0; i < frame_size; i++)
   {
-    opus_val64 tmp = 0;
+    oac_val64 tmp = 0;
     for (col = 0; col < input_rows; col++)
     {
       tmp +=
         matrix_data[MATRIX_INDEX(matrix->rows, output_row, col)] *
-        (opus_val64)input[MATRIX_INDEX(input_rows, col, i)];
+        (oac_val64)input[MATRIX_INDEX(input_rows, col, i)];
     }
 #if defined(FIXED_POINT)
     output[output_rows * i] = INT24TORES((tmp + 16384) >> 15);
@@ -252,17 +252,17 @@ void mapping_matrix_multiply_channel_in_int24(
 
 void mapping_matrix_multiply_channel_out_int24(
     const MappingMatrix *matrix,
-    const opus_res *input,
+    const oac_res *input,
     int input_row,
     int input_rows,
-    opus_int32 *output,
+    oac_int32 *output,
     int output_rows,
     int frame_size)
 {
   /* Matrix data is ordered col-wise. */
-  opus_int16* matrix_data;
+  oac_int16* matrix_data;
   int i, row;
-  opus_int32 input_sample;
+  oac_int32 input_sample;
 
   celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
 
@@ -273,8 +273,8 @@ void mapping_matrix_multiply_channel_out_int24(
     input_sample = RES2INT24(input[input_rows * i]);
     for (row = 0; row < output_rows; row++)
     {
-      opus_int64 tmp =
-        (opus_int64)matrix_data[MATRIX_INDEX(matrix->rows, row, input_row)] *
+      oac_int64 tmp =
+        (oac_int64)matrix_data[MATRIX_INDEX(matrix->rows, row, input_row)] *
         input_sample;
       output[MATRIX_INDEX(output_rows, row, i)] += (tmp + 16384) >> 15;
     }
@@ -283,7 +283,7 @@ void mapping_matrix_multiply_channel_out_int24(
 
 
 const MappingMatrix mapping_matrix_foa_mixing = { 6, 6, 0 };
-const opus_int16 mapping_matrix_foa_mixing_data[36] = {
+const oac_int16 mapping_matrix_foa_mixing_data[36] = {
      16384,      0, -16384,  23170,      0,      0,  16384,  23170,
      16384,      0,      0,      0,  16384,      0, -16384, -23170,
          0,      0,  16384, -23170,  16384,      0,      0,      0,
@@ -292,7 +292,7 @@ const opus_int16 mapping_matrix_foa_mixing_data[36] = {
 };
 
 const MappingMatrix mapping_matrix_soa_mixing = { 11, 11, 0 };
-const opus_int16 mapping_matrix_soa_mixing_data[121] = {
+const oac_int16 mapping_matrix_soa_mixing_data[121] = {
      10923,   7723,  13377, -13377,  11585,   9459,   7723, -16384,
      -6689,      0,      0,  10923,   7723,  13377,  13377, -11585,
       9459,   7723,  16384,  -6689,      0,      0,  10923, -15447,
@@ -312,7 +312,7 @@ const opus_int16 mapping_matrix_soa_mixing_data[121] = {
 };
 
 const MappingMatrix mapping_matrix_toa_mixing = { 18, 18, 0 };
-const opus_int16 mapping_matrix_toa_mixing_data[324] = {
+const oac_int16 mapping_matrix_toa_mixing_data[324] = {
       8208,      0,   -881,  14369,      0,      0,  -8192,  -4163,
      13218,      0,      0,      0,  11095,  -8836,  -6218,  14833,
          0,      0,   8208, -10161,    881,  10161, -13218,  -2944,
@@ -357,7 +357,7 @@ const opus_int16 mapping_matrix_toa_mixing_data[324] = {
 };
 
 const MappingMatrix mapping_matrix_fourthoa_mixing = { 27, 27, 0 };
-const opus_int16 mapping_matrix_fourthoa_mixing_data[729] = {
+const oac_int16 mapping_matrix_fourthoa_mixing_data[729] = {
       9243,      0,  16010,      0,      0,      0,  20669,      0,
          0,      0,      0,      0,  24456,      0,      0,      0,
          0,      0,      0,      0,  27731,      0,      0,      0,
@@ -453,7 +453,7 @@ const opus_int16 mapping_matrix_fourthoa_mixing_data[729] = {
 };
 
 const MappingMatrix mapping_matrix_fifthoa_mixing = { 38, 38, 0 };
-const opus_int16 mapping_matrix_fifthoa_mixing_data[1444] = {
+const oac_int16 mapping_matrix_fifthoa_mixing_data[1444] = {
       9243,      0,  16010,      0,      0,      0,  20669,      0,
          0,      0,      0,      0,  24456,      0,      0,      0,
          0,      0,      0,      0,  27731,      0,      0,      0,
@@ -638,7 +638,7 @@ const opus_int16 mapping_matrix_fifthoa_mixing_data[1444] = {
 };
 
 const MappingMatrix mapping_matrix_foa_demixing = { 6, 6, 0 };
-const opus_int16 mapping_matrix_foa_demixing_data[36] = {
+const oac_int16 mapping_matrix_foa_demixing_data[36] = {
      16384,  16384,  16384,  16384,      0,      0,      0,  23170,
          0, -23170,      0,      0, -16384,  16384, -16384,  16384,
          0,      0,  23170,      0, -23170,      0,      0,      0,
@@ -647,7 +647,7 @@ const opus_int16 mapping_matrix_foa_demixing_data[36] = {
 };
 
 const MappingMatrix mapping_matrix_soa_demixing = { 11, 11, 3050 };
-const opus_int16 mapping_matrix_soa_demixing_data[121] = {
+const oac_int16 mapping_matrix_soa_demixing_data[121] = {
       2771,   2771,   2771,   2771,   2771,   2771,   2771,   2771,
       2771,      0,      0,  10033,  10033, -20066,  10033,  14189,
      14189, -28378,  10033, -20066,      0,      0,   3393,   3393,
@@ -667,7 +667,7 @@ const opus_int16 mapping_matrix_soa_demixing_data[121] = {
 };
 
 const MappingMatrix mapping_matrix_toa_demixing = { 18, 18, 0 };
-const opus_int16 mapping_matrix_toa_demixing_data[324] = {
+const oac_int16 mapping_matrix_toa_demixing_data[324] = {
       8192,   8192,   8192,   8192,   8192,   8192,   8192,   8192,
       8192,   8192,   8192,   8192,   8192,   8192,   8192,   8192,
          0,      0,      0,  -9779,   9779,   6263,   8857,      0,
@@ -712,7 +712,7 @@ const opus_int16 mapping_matrix_toa_demixing_data[324] = {
 };
 
 const MappingMatrix mapping_matrix_fourthoa_demixing = { 27, 27, 0 };
-const opus_int16 mapping_matrix_fourthoa_demixing_data[729] = {
+const oac_int16 mapping_matrix_fourthoa_demixing_data[729] = {
       4870,   4484,   4870,   4347,   4440,   4726,   4683,   4821,
       4883,   4842,   4603,   4484,   4683,   4698,   4234,   4368,
       4603,   4783,   4783,   4820,   4821,   4347,   4820,   4440,
@@ -808,7 +808,7 @@ const opus_int16 mapping_matrix_fourthoa_demixing_data[729] = {
 };
 
 const MappingMatrix mapping_matrix_fifthoa_demixing = { 38, 38, 0 };
-const opus_int16 mapping_matrix_fifthoa_demixing_data[1444] = {
+const oac_int16 mapping_matrix_fifthoa_demixing_data[1444] = {
       3188,   3247,   3268,   3368,   3368,   3138,   3268,   3099,
       3211,   3368,   3099,   3247,   3211,   3368,   3368,   3368,
       3149,   3268,   3247,   3211,   3099,   3188,   3138,   3149,
diff --git a/src/mapping_matrix.h b/src/mapping_matrix.h
index eedf23260..9df1c5271 100644
--- a/src/mapping_matrix.h
+++ b/src/mapping_matrix.h
@@ -27,14 +27,14 @@
 
 /**
  * @file mapping_matrix.h
- * @brief Opus reference implementation mapping matrix API
+ * @brief Oac reference implementation mapping matrix API
  */
 
 #ifndef MAPPING_MATRIX_H
 #define MAPPING_MATRIX_H
 
-#include "opus_types.h"
-#include "opus_projection.h"
+#include "oac_types.h"
+#include "oac_projection.h"
 
 typedef struct MappingMatrix
 {
@@ -44,17 +44,17 @@ typedef struct MappingMatrix
     /* Matrix cell data goes here using col-wise ordering. */
 } MappingMatrix;
 
-opus_int32 mapping_matrix_get_size(int rows, int cols);
+oac_int32 mapping_matrix_get_size(int rows, int cols);
 
-opus_int16 *mapping_matrix_get_data(const MappingMatrix *matrix);
+oac_int16 *mapping_matrix_get_data(const MappingMatrix *matrix);
 
 void mapping_matrix_init(
     MappingMatrix * const matrix,
     int rows,
     int cols,
     int gain,
-    const opus_int16 *data,
-    opus_int32 data_size
+    const oac_int16 *data,
+    oac_int32 data_size
 );
 
 #ifndef DISABLE_FLOAT_API
@@ -62,7 +62,7 @@ void mapping_matrix_multiply_channel_in_float(
     const MappingMatrix *matrix,
     const float *input,
     int input_rows,
-    opus_res *output,
+    oac_res *output,
     int output_row,
     int output_rows,
     int frame_size
@@ -70,7 +70,7 @@ void mapping_matrix_multiply_channel_in_float(
 
 void mapping_matrix_multiply_channel_out_float(
     const MappingMatrix *matrix,
-    const opus_res *input,
+    const oac_res *input,
     int input_row,
     int input_rows,
     float *output,
@@ -81,9 +81,9 @@ void mapping_matrix_multiply_channel_out_float(
 
 void mapping_matrix_multiply_channel_in_short(
     const MappingMatrix *matrix,
-    const opus_int16 *input,
+    const oac_int16 *input,
     int input_rows,
-    opus_res *output,
+    oac_res *output,
     int output_row,
     int output_rows,
     int frame_size
@@ -91,10 +91,10 @@ void mapping_matrix_multiply_channel_in_short(
 
 void mapping_matrix_multiply_channel_out_short(
     const MappingMatrix *matrix,
-    const opus_res *input,
+    const oac_res *input,
     int input_row,
     int input_rows,
-    opus_int16 *output,
+    oac_int16 *output,
     int output_rows,
     int frame_size
 );
@@ -102,9 +102,9 @@ void mapping_matrix_multiply_channel_out_short(
 
 void mapping_matrix_multiply_channel_in_int24(
     const MappingMatrix *matrix,
-    const opus_int32 *input,
+    const oac_int32 *input,
     int input_rows,
-    opus_res *output,
+    oac_res *output,
     int output_row,
     int output_rows,
     int frame_size
@@ -112,10 +112,10 @@ void mapping_matrix_multiply_channel_in_int24(
 
 void mapping_matrix_multiply_channel_out_int24(
     const MappingMatrix *matrix,
-    const opus_res *input,
+    const oac_res *input,
     int input_row,
     int input_rows,
-    opus_int32 *output,
+    oac_int32 *output,
     int output_rows,
     int frame_size
 );
@@ -125,33 +125,33 @@ void mapping_matrix_multiply_channel_out_int24(
  *   toa: third-order ambisonics
  */
 extern const MappingMatrix mapping_matrix_foa_mixing;
-extern const opus_int16 mapping_matrix_foa_mixing_data[36];
+extern const oac_int16 mapping_matrix_foa_mixing_data[36];
 
 extern const MappingMatrix mapping_matrix_soa_mixing;
-extern const opus_int16 mapping_matrix_soa_mixing_data[121];
+extern const oac_int16 mapping_matrix_soa_mixing_data[121];
 
 extern const MappingMatrix mapping_matrix_toa_mixing;
-extern const opus_int16 mapping_matrix_toa_mixing_data[324];
+extern const oac_int16 mapping_matrix_toa_mixing_data[324];
 
 extern const MappingMatrix mapping_matrix_fourthoa_mixing;
-extern const opus_int16 mapping_matrix_fourthoa_mixing_data[729];
+extern const oac_int16 mapping_matrix_fourthoa_mixing_data[729];
 
 extern const MappingMatrix mapping_matrix_fifthoa_mixing;
-extern const opus_int16 mapping_matrix_fifthoa_mixing_data[1444];
+extern const oac_int16 mapping_matrix_fifthoa_mixing_data[1444];
 
 extern const MappingMatrix mapping_matrix_foa_demixing;
-extern const opus_int16 mapping_matrix_foa_demixing_data[36];
+extern const oac_int16 mapping_matrix_foa_demixing_data[36];
 
 extern const MappingMatrix mapping_matrix_soa_demixing;
-extern const opus_int16 mapping_matrix_soa_demixing_data[121];
+extern const oac_int16 mapping_matrix_soa_demixing_data[121];
 
 extern const MappingMatrix mapping_matrix_toa_demixing;
-extern const opus_int16 mapping_matrix_toa_demixing_data[324];
+extern const oac_int16 mapping_matrix_toa_demixing_data[324];
 
 extern const MappingMatrix mapping_matrix_fourthoa_demixing;
-extern const opus_int16 mapping_matrix_fourthoa_demixing_data[729];
+extern const oac_int16 mapping_matrix_fourthoa_demixing_data[729];
 
 extern const MappingMatrix mapping_matrix_fifthoa_demixing;
-extern const opus_int16 mapping_matrix_fifthoa_demixing_data[1444];
+extern const oac_int16 mapping_matrix_fifthoa_demixing_data[1444];
 
 #endif /* MAPPING_MATRIX_H */
diff --git a/src/meson.build b/src/meson.build
index 5537c67ce..d13aae9b2 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,43 +1,43 @@
-opus_sources = sources['OPUS_SOURCES']
+oac_sources = sources['OAC_SOURCES']
 
-opus_sources_float = sources['OPUS_SOURCES_FLOAT']
+oac_sources_float = sources['OAC_SOURCES_FLOAT']
 
 if not disable_float_api
-  opus_sources += opus_sources_float
+  oac_sources += oac_sources_float
 endif
 
-opus_lib_c_args = []
+oac_lib_c_args = []
 if host_machine.system() == 'windows'
-  opus_lib_c_args += ['-DDLL_EXPORT']
+  oac_lib_c_args += ['-DDLL_EXPORT']
 endif
 
-opus_lib = library('opus',
-  opus_sources,
+oac_lib = library('oac',
+  oac_sources,
   version: libversion,
   darwin_versions: macosversion,
-  c_args: opus_lib_c_args,
-  include_directories: opus_includes,
+  c_args: oac_lib_c_args,
+  include_directories: oac_includes,
   link_whole: [celt_lib, silk_lib, dnn_lib],
   dependencies: libm,
   install: true)
 
-opus_dep = declare_dependency(link_with: opus_lib,
-  include_directories: opus_public_includes)
+oac_dep = declare_dependency(link_with: oac_lib,
+  include_directories: oac_public_includes)
 
-# Extra uninstalled Opus programs
+# Extra uninstalled Oac programs
 if not extra_programs.disabled()
-  foreach prog : ['opus_compare', 'opus_demo', 'repacketizer_demo']
+  foreach prog : ['oac_compare', 'oac_demo', 'repacketizer_demo']
     executable(prog, '@0@.c'.format(prog),
-               include_directories: opus_includes,
-               link_with: opus_lib,
+               include_directories: oac_includes,
+               link_with: oac_lib,
                dependencies: libm,
                install: false)
   endforeach
 
   if opt_custom_modes
-    executable('opus_custom_demo', '../celt/opus_custom_demo.c',
-               include_directories: opus_includes,
-               link_with: opus_lib,
+    executable('oac_custom_demo', '../celt/oac_custom_demo.c',
+               include_directories: oac_includes,
+               link_with: oac_lib,
                dependencies: libm,
                install: false)
   endif
diff --git a/src/mlp.c b/src/mlp.c
index b1dbab5ae..a103ad692 100644
--- a/src/mlp.c
+++ b/src/mlp.c
@@ -30,13 +30,13 @@
 #endif
 
 #include <math.h>
-#include "opus_types.h"
-#include "opus_defines.h"
+#include "oac_types.h"
+#include "oac_defines.h"
 #include "arch.h"
 #include "mlp.h"
 
 #define fmadd(a, b, c) ((a)*(b)+(c))
-static OPUS_INLINE float tansig_approx(float x)
+static OAC_INLINE float tansig_approx(float x)
 {
     const float N0 = 952.52801514f;
     const float N1 = 96.39235687f;
@@ -52,12 +52,12 @@ static OPUS_INLINE float tansig_approx(float x)
     return MAX32(-1.f, MIN32(1.f, num));
 }
 
-static OPUS_INLINE float sigmoid_approx(float x)
+static OAC_INLINE float sigmoid_approx(float x)
 {
    return .5f + .5f*tansig_approx(.5f*x);
 }
 
-static void gemm_accum(float *out, const opus_int8 *weights, int rows, int cols, int col_stride, const float *x)
+static void gemm_accum(float *out, const oac_int8 *weights, int rows, int cols, int col_stride, const float *x)
 {
    int i, j;
    for (i=0;i<rows;i++)
diff --git a/src/mlp.h b/src/mlp.h
index e6b1a8f76..7a0f26fe7 100644
--- a/src/mlp.h
+++ b/src/mlp.h
@@ -27,24 +27,24 @@
 #ifndef MLP_H_
 #define MLP_H_
 
-#include "opus_types.h"
+#include "oac_types.h"
 
 #define WEIGHTS_SCALE (1.f/128)
 
 #define MAX_NEURONS 32
 
 typedef struct {
-  const opus_int8 *bias;
-  const opus_int8 *input_weights;
+  const oac_int8 *bias;
+  const oac_int8 *input_weights;
   int nb_inputs;
   int nb_neurons;
   int sigmoid;
 } AnalysisDenseLayer;
 
 typedef struct {
-  const opus_int8 *bias;
-  const opus_int8 *input_weights;
-  const opus_int8 *recurrent_weights;
+  const oac_int8 *bias;
+  const oac_int8 *input_weights;
+  const oac_int8 *recurrent_weights;
   int nb_inputs;
   int nb_neurons;
 } AnalysisGRULayer;
diff --git a/src/mlp_data.c b/src/mlp_data.c
index 30477cb47..cf192295e 100644
--- a/src/mlp_data.c
+++ b/src/mlp_data.c
@@ -6,7 +6,7 @@
 
 #include "mlp.h"
 
-static const opus_int8 layer0_weights[800] = {
+static const oac_int8 layer0_weights[800] = {
    -30, -9, 2, -12, 5, -1, 8, 9,
    9, 8, -13, 18, -17, -34, -5, 17,
    -11, 0, -4, 10, 2, 10, 15, -8,
@@ -109,14 +109,14 @@ static const opus_int8 layer0_weights[800] = {
    72, 66, 29, 7, -66, -56, -117, -128
 };
 
-static const opus_int8 layer0_bias[32] = {
+static const oac_int8 layer0_bias[32] = {
    51, -16, 1, 13, -5, -6, -16, -7,
    11, -6, 106, 26, 28, -14, 21, -29,
    7, 18, -18, -17, 21, -17, -9, 20,
    -25, -3, -34, 48, 11, -13, -31, -20
 };
 
-static const opus_int8 layer1_weights[2304] = {
+static const oac_int8 layer1_weights[2304] = {
    22, -1, -7, 7, 29, -27, -31, -17,
    -13, 33, 44, -8, 11, 33, 24, 78,
    15, 19, 30, -2, -24, 5, 49, 5,
@@ -407,7 +407,7 @@ static const opus_int8 layer1_weights[2304] = {
    27, -6, -15, -21, 4, -14, 18, -36
 };
 
-static const opus_int8 layer1_recur_weights[1728] = {
+static const oac_int8 layer1_recur_weights[1728] = {
    20, 67, -99, 12, 41, -25, 49, -44,
    35, 81, 110, 47, 34, -66, -14, 14,
    -60, 34, 29, -73, 10, 41, 35, 89,
@@ -626,7 +626,7 @@ static const opus_int8 layer1_recur_weights[1728] = {
    -6, 1, 22, -59, 0, 17, -39, 115
 };
 
-static const opus_int8 layer1_bias[72] = {
+static const oac_int8 layer1_bias[72] = {
    -42, 20, 16, 0, 105, 60, 1, -97,
    24, 60, 18, 13, 62, 25, 127, 34,
    79, 55, 118, 127, 95, 31, -4, 87,
@@ -638,7 +638,7 @@ static const opus_int8 layer1_bias[72] = {
    16, 10, -2, -14, 11, -4, 3, -11
 };
 
-static const opus_int8 layer2_weights[48] = {
+static const oac_int8 layer2_weights[48] = {
    -113, -88, 31, -128, -126, -61, 85, -35,
    118, -128, -61, 127, -128, -17, -128, 127,
    104, -9, -128, 33, 45, 127, 5, 83,
@@ -647,7 +647,7 @@ static const opus_int8 layer2_weights[48] = {
    -127, -68, -1, -89, -80, 32, 106, 7
 };
 
-static const opus_int8 layer2_bias[2] = {
+static const oac_int8 layer2_bias[2] = {
    14, 117
 };
 
diff --git a/src/opus.c b/src/oac.c
similarity index 83%
rename from src/opus.c
rename to src/oac.c
index 01be6895e..4378587e9 100644
--- a/src/opus.c
+++ b/src/oac.c
@@ -30,13 +30,13 @@
 #include "config.h"
 #endif
 
-#include "opus.h"
+#include "oac.h"
 #include "mathops.h"
-#include "opus_private.h"
+#include "oac_private.h"
 
 #ifndef DISABLE_FLOAT_API
 
-void opus_pcm_soft_clip_impl(float *_x, int N, int C, float *declip_mem, int arch)
+void oac_pcm_soft_clip_impl(float *_x, int N, int C, float *declip_mem, int arch)
 {
    int c;
    int i;
@@ -50,7 +50,7 @@ void opus_pcm_soft_clip_impl(float *_x, int N, int C, float *declip_mem, int arc
       therefore there is no discontinuity introduced here. The implementation
       might provide a hint if all input samples are within the [-1, +1] range.
 
-   `opus_limit2_checkwithin1()`:
+   `oac_limit2_checkwithin1()`:
       - Clamps all samples within the valid range [-2, +2].
       - Generic C implementation:
          * Does not attempt early detection whether samples are within hinted range.
@@ -63,7 +63,7 @@ void opus_pcm_soft_clip_impl(float *_x, int N, int C, float *declip_mem, int arc
    `all_within_neg1pos1`:
       - Optimization hint to skip per-sample out-of-bound checks.
         If true, the check can be skipped. */
-   all_within_neg1pos1 = opus_limit2_checkwithin1(_x, N*C, arch);
+   all_within_neg1pos1 = oac_limit2_checkwithin1(_x, N*C, arch);
 
    for (c=0;c<C;c++)
    {
@@ -160,9 +160,9 @@ void opus_pcm_soft_clip_impl(float *_x, int N, int C, float *declip_mem, int arc
    }
 }
 
-OPUS_EXPORT void opus_pcm_soft_clip(float *_x, int N, int C, float *declip_mem)
+OAC_EXPORT void oac_pcm_soft_clip(float *_x, int N, int C, float *declip_mem)
 {
-   opus_pcm_soft_clip_impl(_x, N, C, declip_mem, 0);
+   oac_pcm_soft_clip_impl(_x, N, C, declip_mem, 0);
 }
 
 #endif
@@ -180,7 +180,7 @@ int encode_size(int size, unsigned char *data)
    }
 }
 
-static int parse_size(const unsigned char *data, opus_int32 len, opus_int16 *size)
+static int parse_size(const unsigned char *data, oac_int32 len, oac_int16 *size)
 {
    if (len<1)
    {
@@ -200,8 +200,8 @@ static int parse_size(const unsigned char *data, opus_int32 len, opus_int16 *siz
    }
 }
 
-int opus_packet_get_samples_per_frame(const unsigned char *data,
-      opus_int32 Fs)
+int oac_packet_get_samples_per_frame(const unsigned char *data,
+      oac_int32 Fs)
 {
    int audiosize;
    if (data[0]&0x80)
@@ -221,19 +221,19 @@ int opus_packet_get_samples_per_frame(const unsigned char *data,
    return audiosize;
 }
 
-int opus_packet_parse_impl(const unsigned char *data, opus_int32 len,
+int oac_packet_parse_impl(const unsigned char *data, oac_int32 len,
       int self_delimited, unsigned char *out_toc,
-      const unsigned char *frames[48], opus_int16 size[48],
-      int *payload_offset, opus_int32 *packet_offset,
-      const unsigned char **padding, opus_int32 *padding_len)
+      const unsigned char *frames[48], oac_int16 size[48],
+      int *payload_offset, oac_int32 *packet_offset,
+      const unsigned char **padding, oac_int32 *padding_len)
 {
    int i, bytes;
    int count;
    int cbr;
    unsigned char ch, toc;
    int framesize;
-   opus_int32 last_size;
-   opus_int32 pad = 0;
+   oac_int32 last_size;
+   oac_int32 pad = 0;
    const unsigned char *data0 = data;
 
    /* Make sure we return NULL/0 on error. */
@@ -244,11 +244,11 @@ int opus_packet_parse_impl(const unsigned char *data, opus_int32 len,
    }
 
    if (size==NULL || len<0)
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    if (len==0)
-      return OPUS_INVALID_PACKET;
+      return OAC_INVALID_PACKET;
 
-   framesize = opus_packet_get_samples_per_frame(data, 48000);
+   framesize = oac_packet_get_samples_per_frame(data, 48000);
 
    cbr = 0;
    toc = *data++;
@@ -267,10 +267,10 @@ int opus_packet_parse_impl(const unsigned char *data, opus_int32 len,
       if (!self_delimited)
       {
          if (len&0x1)
-            return OPUS_INVALID_PACKET;
+            return OAC_INVALID_PACKET;
          last_size = len/2;
          /* If last_size doesn't fit in size[0], we'll catch it later */
-         size[0] = (opus_int16)last_size;
+         size[0] = (oac_int16)last_size;
       }
       break;
    /* Two VBR frames */
@@ -279,19 +279,19 @@ int opus_packet_parse_impl(const unsigned char *data, opus_int32 len,
       bytes = parse_size(data, len, size);
       len -= bytes;
       if (size[0]<0 || size[0] > len)
-         return OPUS_INVALID_PACKET;
+         return OAC_INVALID_PACKET;
       data += bytes;
       last_size = len-size[0];
       break;
    /* Multiple CBR/VBR frames (from 0 to 120 ms) */
    default: /*case 3:*/
       if (len<1)
-         return OPUS_INVALID_PACKET;
+         return OAC_INVALID_PACKET;
       /* Number of frames encoded in bits 0 to 5 */
       ch = *data++;
       count = ch&0x3F;
-      if (count <= 0 || framesize*(opus_int32)count > 5760)
-         return OPUS_INVALID_PACKET;
+      if (count <= 0 || framesize*(oac_int32)count > 5760)
+         return OAC_INVALID_PACKET;
       len--;
       /* Padding flag is bit 6 */
       if (ch&0x40)
@@ -300,7 +300,7 @@ int opus_packet_parse_impl(const unsigned char *data, opus_int32 len,
          do {
             int tmp;
             if (len<=0)
-               return OPUS_INVALID_PACKET;
+               return OAC_INVALID_PACKET;
             p = *data++;
             len--;
             tmp = p==255 ? 254: p;
@@ -309,7 +309,7 @@ int opus_packet_parse_impl(const unsigned char *data, opus_int32 len,
          } while (p==255);
       }
       if (len<0)
-         return OPUS_INVALID_PACKET;
+         return OAC_INVALID_PACKET;
       /* VBR flag is bit 7 */
       cbr = !(ch&0x80);
       if (!cbr)
@@ -321,20 +321,20 @@ int opus_packet_parse_impl(const unsigned char *data, opus_int32 len,
             bytes = parse_size(data, len, size+i);
             len -= bytes;
             if (size[i]<0 || size[i] > len)
-               return OPUS_INVALID_PACKET;
+               return OAC_INVALID_PACKET;
             data += bytes;
             last_size -= bytes+size[i];
          }
          if (last_size<0)
-            return OPUS_INVALID_PACKET;
+            return OAC_INVALID_PACKET;
       } else if (!self_delimited)
       {
          /* CBR case */
          last_size = len/count;
          if (last_size*count!=len)
-            return OPUS_INVALID_PACKET;
+            return OAC_INVALID_PACKET;
          for (i=0;i<count-1;i++)
-            size[i] = (opus_int16)last_size;
+            size[i] = (oac_int16)last_size;
       }
       break;
    }
@@ -344,25 +344,25 @@ int opus_packet_parse_impl(const unsigned char *data, opus_int32 len,
       bytes = parse_size(data, len, size+count-1);
       len -= bytes;
       if (size[count-1]<0 || size[count-1] > len)
-         return OPUS_INVALID_PACKET;
+         return OAC_INVALID_PACKET;
       data += bytes;
       /* For CBR packets, apply the size to all the frames. */
       if (cbr)
       {
          if (size[count-1]*count > len)
-            return OPUS_INVALID_PACKET;
+            return OAC_INVALID_PACKET;
          for (i=0;i<count-1;i++)
             size[i] = size[count-1];
       } else if (bytes+size[count-1] > last_size)
-         return OPUS_INVALID_PACKET;
+         return OAC_INVALID_PACKET;
    } else
    {
       /* Because it's not encoded explicitly, it's possible the size of the
          last packet (or all the packets, for the CBR case) is larger than
          1275. Reject them here.*/
       if (last_size > 1275)
-         return OPUS_INVALID_PACKET;
-      size[count-1] = (opus_int16)last_size;
+         return OAC_INVALID_PACKET;
+      size[count-1] = (oac_int16)last_size;
    }
 
    if (payload_offset)
@@ -381,7 +381,7 @@ int opus_packet_parse_impl(const unsigned char *data, opus_int32 len,
       *padding_len = pad;
    }
    if (packet_offset)
-      *packet_offset = pad+(opus_int32)(data-data0);
+      *packet_offset = pad+(oac_int32)(data-data0);
 
    if (out_toc)
       *out_toc = toc;
@@ -389,10 +389,10 @@ int opus_packet_parse_impl(const unsigned char *data, opus_int32 len,
    return count;
 }
 
-int opus_packet_parse(const unsigned char *data, opus_int32 len,
+int oac_packet_parse(const unsigned char *data, oac_int32 len,
       unsigned char *out_toc, const unsigned char *frames[48],
-      opus_int16 size[48], int *payload_offset)
+      oac_int16 size[48], int *payload_offset)
 {
-   return opus_packet_parse_impl(data, len, 0, out_toc,
+   return oac_packet_parse_impl(data, len, 0, out_toc,
                                  frames, size, payload_offset, NULL, NULL, NULL);
 }
diff --git a/src/opus_compare.c b/src/oac_compare.c
similarity index 92%
rename from src/opus_compare.c
rename to src/oac_compare.c
index 1956e08fa..3ccdb7134 100644
--- a/src/opus_compare.c
+++ b/src/oac_compare.c
@@ -30,10 +30,10 @@
 #include <math.h>
 #include <string.h>
 
-#define OPUS_PI (3.14159265F)
+#define OAC_PI (3.14159265F)
 
-#define OPUS_COSF(_x)        ((float)cos(_x))
-#define OPUS_SINF(_x)        ((float)sin(_x))
+#define OAC_COSF(_x)        ((float)cos(_x))
+#define OAC_SINF(_x)        ((float)sin(_x))
 
 static void *check_alloc(void *_ptr){
   if(_ptr==NULL){
@@ -43,11 +43,11 @@ static void *check_alloc(void *_ptr){
   return _ptr;
 }
 
-static void *opus_malloc(size_t _size){
+static void *oac_malloc(size_t _size){
   return check_alloc(malloc(_size));
 }
 
-static void *opus_realloc(void *_ptr,size_t _size){
+static void *oac_realloc(void *_ptr,size_t _size){
   return check_alloc(realloc(_ptr,_size));
 }
 
@@ -66,7 +66,7 @@ static size_t read_pcm16(float **_samples,FILE *_fin,int _nchannels){
     if(nsamples+nread>csamples){
       do csamples=csamples<<1|1;
       while(nsamples+nread>csamples);
-      samples=(float *)opus_realloc(samples,
+      samples=(float *)oac_realloc(samples,
        _nchannels*csamples*sizeof(*samples));
     }
     for(xi=0;xi<nread;xi++){
@@ -80,7 +80,7 @@ static size_t read_pcm16(float **_samples,FILE *_fin,int _nchannels){
     }
     nsamples+=nread;
   }
-  *_samples=(float *)opus_realloc(samples,
+  *_samples=(float *)oac_realloc(samples,
    _nchannels*nsamples*sizeof(*samples));
   return nsamples;
 }
@@ -95,19 +95,19 @@ static void band_energy(float *_out,float *_ps,const int *_bands,int _nbands,
   size_t xi;
   int    xj;
   int    ps_sz;
-  window=(float *)opus_malloc((3+_nchannels)*_window_sz*sizeof(*window));
+  window=(float *)oac_malloc((3+_nchannels)*_window_sz*sizeof(*window));
   c=window+_window_sz;
   s=c+_window_sz;
   x=s+_window_sz;
   ps_sz=_window_sz/2;
   for(xj=0;xj<_window_sz;xj++){
-    window[xj]=0.5F-0.5F*OPUS_COSF((2*OPUS_PI/(_window_sz-1))*xj);
+    window[xj]=0.5F-0.5F*OAC_COSF((2*OAC_PI/(_window_sz-1))*xj);
   }
   for(xj=0;xj<_window_sz;xj++){
-    c[xj]=OPUS_COSF((2*OPUS_PI/_window_sz)*xj);
+    c[xj]=OAC_COSF((2*OAC_PI/_window_sz)*xj);
   }
   for(xj=0;xj<_window_sz;xj++){
-    s[xj]=OPUS_SINF((2*OPUS_PI/_window_sz)*xj);
+    s[xj]=OAC_SINF((2*OAC_PI/_window_sz)*xj);
   }
   for(xi=0;xi<_nframes;xi++){
     int ci;
@@ -246,9 +246,9 @@ int main(int _argc,const char **_argv){
     return EXIT_FAILURE;
   }
   nframes=(xlength-TEST_WIN_SIZE+TEST_WIN_STEP)/TEST_WIN_STEP;
-  xb=(float *)opus_malloc(nframes*NBANDS*nchannels*sizeof(*xb));
-  X=(float *)opus_malloc(nframes*NFREQS*nchannels*sizeof(*X));
-  Y=(float *)opus_malloc(nframes*yfreqs*nchannels*sizeof(*Y));
+  xb=(float *)oac_malloc(nframes*NBANDS*nchannels*sizeof(*xb));
+  X=(float *)oac_malloc(nframes*NFREQS*nchannels*sizeof(*X));
+  Y=(float *)oac_malloc(nframes*yfreqs*nchannels*sizeof(*Y));
   /*Compute the per-band spectral energy of the original signal
      and the error.*/
   band_energy(xb,X,BANDS,NBANDS,x,nchannels,nframes,
@@ -376,7 +376,7 @@ int main(int _argc,const char **_argv){
   else{
     fprintf(stderr,"Test vector PASSES\n");
     fprintf(stderr,
-     "Opus quality metric: %.1f %% (internal weighted error is %f)\n",Q,err);
+     "Oac quality metric: %.1f %% (internal weighted error is %f)\n",Q,err);
     return EXIT_SUCCESS;
   }
 }
diff --git a/src/opus_decoder.c b/src/oac_decoder.c
similarity index 70%
rename from src/opus_decoder.c
rename to src/oac_decoder.c
index 2c9cce97d..9e3c61bdc 100644
--- a/src/opus_decoder.c
+++ b/src/oac_decoder.c
@@ -30,23 +30,23 @@
 # include "config.h"
 #endif
 
-#ifndef OPUS_BUILD
-# error "OPUS_BUILD _MUST_ be defined to build Opus. This probably means you need other defines as well, as in a config.h. See the included build files for details."
+#ifndef OAC_BUILD
+# error "OAC_BUILD _MUST_ be defined to build Oac. This probably means you need other defines as well, as in a config.h. See the included build files for details."
 #endif
 
-#if defined(__GNUC__) && (__GNUC__ >= 2) && !defined(__OPTIMIZE__) && !defined(OPUS_WILL_BE_SLOW)
-# pragma message "You appear to be compiling without optimization, if so opus will be very slow."
+#if defined(__GNUC__) && (__GNUC__ >= 2) && !defined(__OPTIMIZE__) && !defined(OAC_WILL_BE_SLOW)
+# pragma message "You appear to be compiling without optimization, if so oac will be very slow."
 #endif
 
 #include <stdarg.h>
 #include "celt.h"
-#include "opus.h"
+#include "oac.h"
 #include "entdec.h"
 #include "modes.h"
 #include "API.h"
 #include "stack_alloc.h"
 #include "float_cast.h"
-#include "opus_private.h"
+#include "oac_private.h"
 #include "os_support.h"
 #include "structs.h"
 #include "define.h"
@@ -62,11 +62,11 @@
 #include "osce.h"
 #endif
 
-struct OpusDecoder {
+struct OacDecoder {
    int          celt_dec_offset;
    int          silk_dec_offset;
    int          channels;
-   opus_int32   Fs;          /** Sampling rate (at the API level) */
+   oac_int32   Fs;          /** Sampling rate (at the API level) */
    silk_DecControlStruct DecControl;
    int          decode_gain;
    int          complexity;
@@ -77,7 +77,7 @@ struct OpusDecoder {
 #endif
 
    /* Everything beyond this point gets cleared on a reset */
-#define OPUS_DECODER_RESET_START stream_channels
+#define OAC_DECODER_RESET_START stream_channels
    int          stream_channels;
 
    int          bandwidth;
@@ -87,14 +87,14 @@ struct OpusDecoder {
    int          prev_redundancy;
    int          last_packet_duration;
 #ifndef FIXED_POINT
-   opus_val16   softclip_mem[2];
+   oac_val16   softclip_mem[2];
 #endif
 
-   opus_uint32  rangeFinal;
+   oac_uint32  rangeFinal;
 };
 
 #if defined(ENABLE_HARDENING) || defined(ENABLE_ASSERTIONS)
-static void validate_opus_decoder(OpusDecoder *st)
+static void validate_oac_decoder(OacDecoder *st)
 {
    celt_assert(st->channels == 1 || st->channels == 2);
 #ifdef ENABLE_QEXT
@@ -107,18 +107,18 @@ static void validate_opus_decoder(OpusDecoder *st)
    celt_assert(st->DecControl.nChannelsAPI == st->channels);
    celt_assert(st->DecControl.nChannelsInternal == 0 || st->DecControl.nChannelsInternal == 1 || st->DecControl.nChannelsInternal == 2);
    celt_assert(st->DecControl.payloadSize_ms == 0 || st->DecControl.payloadSize_ms == 10 || st->DecControl.payloadSize_ms == 20 || st->DecControl.payloadSize_ms == 40 || st->DecControl.payloadSize_ms == 60);
-#ifdef OPUS_ARCHMASK
+#ifdef OAC_ARCHMASK
    celt_assert(st->arch >= 0);
-   celt_assert(st->arch <= OPUS_ARCHMASK);
+   celt_assert(st->arch <= OAC_ARCHMASK);
 #endif
    celt_assert(st->stream_channels == 1 || st->stream_channels == 2);
 }
-#define VALIDATE_OPUS_DECODER(st) validate_opus_decoder(st)
+#define VALIDATE_OAC_DECODER(st) validate_oac_decoder(st)
 #else
-#define VALIDATE_OPUS_DECODER(st)
+#define VALIDATE_OAC_DECODER(st)
 #endif
 
-int opus_decoder_get_size(int channels)
+int oac_decoder_get_size(int channels)
 {
    int silkDecSizeBytes, celtDecSizeBytes;
    int ret;
@@ -129,10 +129,10 @@ int opus_decoder_get_size(int channels)
       return 0;
    silkDecSizeBytes = align(silkDecSizeBytes);
    celtDecSizeBytes = celt_decoder_get_size(channels);
-   return align(sizeof(OpusDecoder))+silkDecSizeBytes+celtDecSizeBytes;
+   return align(sizeof(OacDecoder))+silkDecSizeBytes+celtDecSizeBytes;
 }
 
-int opus_decoder_init(OpusDecoder *st, opus_int32 Fs, int channels)
+int oac_decoder_init(OacDecoder *st, oac_int32 Fs, int channels)
 {
    void *silk_dec;
    CELTDecoder *celt_dec;
@@ -144,16 +144,16 @@ int opus_decoder_init(OpusDecoder *st, opus_int32 Fs, int channels)
 #endif
          )
     || (channels!=1&&channels!=2))
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
 
-   OPUS_CLEAR((char*)st, opus_decoder_get_size(channels));
+   OAC_CLEAR((char*)st, oac_decoder_get_size(channels));
    /* Initialize SILK decoder */
    ret = silk_Get_Decoder_Size(&silkDecSizeBytes);
    if (ret)
-      return OPUS_INTERNAL_ERROR;
+      return OAC_INTERNAL_ERROR;
 
    silkDecSizeBytes = align(silkDecSizeBytes);
-   st->silk_dec_offset = align(sizeof(OpusDecoder));
+   st->silk_dec_offset = align(sizeof(OacDecoder));
    st->celt_dec_offset = st->silk_dec_offset+silkDecSizeBytes;
    silk_dec = (char*)st+st->silk_dec_offset;
    celt_dec = (CELTDecoder*)((char*)st+st->celt_dec_offset);
@@ -166,11 +166,11 @@ int opus_decoder_init(OpusDecoder *st, opus_int32 Fs, int channels)
 
    /* Reset decoder */
    ret = silk_InitDecoder( silk_dec );
-   if(ret)return OPUS_INTERNAL_ERROR;
+   if(ret)return OAC_INTERNAL_ERROR;
 
    /* Initialize CELT decoder */
    ret = celt_decoder_init(celt_dec, Fs, channels);
-   if(ret!=OPUS_OK)return OPUS_INTERNAL_ERROR;
+   if(ret!=OAC_OK)return OAC_INTERNAL_ERROR;
 
    celt_decoder_ctl(celt_dec, CELT_SET_SIGNALLING(0));
 
@@ -179,14 +179,14 @@ int opus_decoder_init(OpusDecoder *st, opus_int32 Fs, int channels)
 #ifdef ENABLE_DEEP_PLC
     lpcnet_plc_init( &st->lpcnet);
 #endif
-   st->arch = opus_select_arch();
-   return OPUS_OK;
+   st->arch = oac_select_arch();
+   return OAC_OK;
 }
 
-OpusDecoder *opus_decoder_create(opus_int32 Fs, int channels, int *error)
+OacDecoder *oac_decoder_create(oac_int32 Fs, int channels, int *error)
 {
    int ret;
-   OpusDecoder *st;
+   OacDecoder *st;
    if ((Fs!=48000&&Fs!=24000&&Fs!=16000&&Fs!=12000&&Fs!=8000
 #ifdef ENABLE_QEXT
          &&Fs!=96000
@@ -195,30 +195,30 @@ OpusDecoder *opus_decoder_create(opus_int32 Fs, int channels, int *error)
     || (channels!=1&&channels!=2))
    {
       if (error)
-         *error = OPUS_BAD_ARG;
+         *error = OAC_BAD_ARG;
       return NULL;
    }
-   st = (OpusDecoder *)opus_alloc(opus_decoder_get_size(channels));
+   st = (OacDecoder *)oac_alloc(oac_decoder_get_size(channels));
    if (st == NULL)
    {
       if (error)
-         *error = OPUS_ALLOC_FAIL;
+         *error = OAC_ALLOC_FAIL;
       return NULL;
    }
-   ret = opus_decoder_init(st, Fs, channels);
+   ret = oac_decoder_init(st, Fs, channels);
    if (error)
       *error = ret;
-   if (ret != OPUS_OK)
+   if (ret != OAC_OK)
    {
-      opus_free(st);
+      oac_free(st);
       st = NULL;
    }
    return st;
 }
 
-static void smooth_fade(const opus_res *in1, const opus_res *in2,
-      opus_res *out, int overlap, int channels,
-      const celt_coef *window, opus_int32 Fs)
+static void smooth_fade(const oac_res *in1, const oac_res *in2,
+      oac_res *out, int overlap, int channels,
+      const celt_coef *window, oac_int32 Fs)
 {
    int i, c;
    int inc = 48000/Fs;
@@ -233,7 +233,7 @@ static void smooth_fade(const opus_res *in1, const opus_res *in2,
    }
 }
 
-static int opus_packet_get_mode(const unsigned char *data)
+static int oac_packet_get_mode(const unsigned char *data)
 {
    int mode;
    if (data[0]&0x80)
@@ -248,21 +248,21 @@ static int opus_packet_get_mode(const unsigned char *data)
    return mode;
 }
 
-static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
-      opus_int32 len, opus_res *pcm, int frame_size, int decode_fec)
+static int oac_decode_frame(OacDecoder *st, const unsigned char *data,
+      oac_int32 len, oac_res *pcm, int frame_size, int decode_fec)
 {
    void *silk_dec;
    CELTDecoder *celt_dec;
    int i, silk_ret=0, celt_ret=0;
    ec_dec dec;
-   opus_int32 silk_frame_size;
+   oac_int32 silk_frame_size;
    int pcm_transition_silk_size;
-   VARDECL(opus_res, pcm_transition_silk);
+   VARDECL(oac_res, pcm_transition_silk);
    int pcm_transition_celt_size;
-   VARDECL(opus_res, pcm_transition_celt);
-   opus_res *pcm_transition=NULL;
+   VARDECL(oac_res, pcm_transition_celt);
+   oac_res *pcm_transition=NULL;
    int redundant_audio_size;
-   VARDECL(opus_res, redundant_audio);
+   VARDECL(oac_res, redundant_audio);
 
    int audiosize;
    int mode;
@@ -275,7 +275,7 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
    int c;
    int F2_5, F5, F10, F20;
    const celt_coef *window;
-   opus_uint32 redundant_rng = 0;
+   oac_uint32 redundant_rng = 0;
    int celt_accum;
    ALLOC_STACK;
 
@@ -288,7 +288,7 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
    if (frame_size < F2_5)
    {
       RESTORE_STACK;
-      return OPUS_BUFFER_TOO_SMALL;
+      return OAC_BUFFER_TOO_SMALL;
    }
    /* Limit frame_size to avoid excessive stack allocations. */
    frame_size = IMIN(frame_size, st->Fs/25*3);
@@ -325,7 +325,7 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
       if (audiosize > F20)
       {
          do {
-            int ret = opus_decode_frame(st, NULL, 0, pcm, IMIN(audiosize, F20), 0);
+            int ret = oac_decode_frame(st, NULL, 0, pcm, IMIN(audiosize, F20), 0);
             if (ret<0)
             {
                RESTORE_STACK;
@@ -363,17 +363,17 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
       else
          pcm_transition_silk_size = F5*st->channels;
    }
-   ALLOC(pcm_transition_celt, pcm_transition_celt_size, opus_res);
+   ALLOC(pcm_transition_celt, pcm_transition_celt_size, oac_res);
    if (transition && mode == MODE_CELT_ONLY)
    {
       pcm_transition = pcm_transition_celt;
-      opus_decode_frame(st, NULL, 0, pcm_transition, IMIN(F5, audiosize), 0);
+      oac_decode_frame(st, NULL, 0, pcm_transition, IMIN(F5, audiosize), 0);
    }
    if (audiosize > frame_size)
    {
       /*fprintf(stderr, "PCM buffer too small: %d vs %d (mode = %d)\n", audiosize, frame_size, mode);*/
       RESTORE_STACK;
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    } else {
       frame_size = audiosize;
    }
@@ -382,14 +382,14 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
    if (mode != MODE_CELT_ONLY)
    {
       int lost_flag, decoded_samples;
-      opus_res *pcm_ptr;
+      oac_res *pcm_ptr;
       int pcm_too_small;
       int pcm_silk_size = ALLOC_NONE;
-      VARDECL(opus_res, pcm_silk);
+      VARDECL(oac_res, pcm_silk);
       pcm_too_small = (frame_size < F10);
       if (pcm_too_small)
          pcm_silk_size = F10*st->channels;
-      ALLOC(pcm_silk, pcm_silk_size, opus_res);
+      ALLOC(pcm_silk, pcm_silk_size, oac_res);
       if (pcm_too_small)
          pcm_ptr = pcm_silk;
       else
@@ -405,11 +405,11 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
       {
         st->DecControl.nChannelsInternal = st->stream_channels;
         if( mode == MODE_SILK_ONLY ) {
-           if( bandwidth == OPUS_BANDWIDTH_NARROWBAND ) {
+           if( bandwidth == OAC_BANDWIDTH_NARROWBAND ) {
               st->DecControl.internalSampleRate = 8000;
-           } else if( bandwidth == OPUS_BANDWIDTH_MEDIUMBAND ) {
+           } else if( bandwidth == OAC_BANDWIDTH_MEDIUMBAND ) {
               st->DecControl.internalSampleRate = 12000;
-           } else if( bandwidth == OPUS_BANDWIDTH_WIDEBAND ) {
+           } else if( bandwidth == OAC_BANDWIDTH_WIDEBAND ) {
               st->DecControl.internalSampleRate = 16000;
            } else {
               st->DecControl.internalSampleRate = 16000;
@@ -465,14 +465,14 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
                  pcm_ptr[i] = 0;
            } else {
              RESTORE_STACK;
-             return OPUS_INTERNAL_ERROR;
+             return OAC_INTERNAL_ERROR;
            }
         }
         pcm_ptr += silk_frame_size * st->channels;
         decoded_samples += silk_frame_size;
       } while( decoded_samples < frame_size );
      if (pcm_too_small) {
-        OPUS_COPY(pcm, pcm_silk, frame_size*st->channels);
+        OAC_COPY(pcm, pcm_silk, frame_size*st->channels);
      }
    }
 
@@ -491,7 +491,7 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
          /* redundancy_bytes will be at least two, in the non-hybrid
             case due to the ec_tell() check above */
          redundancy_bytes = mode==MODE_HYBRID ?
-               (opus_int32)ec_dec_uint(&dec, 256)+2 :
+               (oac_int32)ec_dec_uint(&dec, 256)+2 :
                len-((ec_tell(&dec)+7)>>3);
          len -= redundancy_bytes;
          /* This is a sanity check. It should never happen for a valid
@@ -515,12 +515,12 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
       pcm_transition_silk_size=ALLOC_NONE;
    }
 
-   ALLOC(pcm_transition_silk, pcm_transition_silk_size, opus_res);
+   ALLOC(pcm_transition_silk, pcm_transition_silk_size, oac_res);
 
    if (transition && mode != MODE_CELT_ONLY)
    {
       pcm_transition = pcm_transition_silk;
-      opus_decode_frame(st, NULL, 0, pcm_transition, IMIN(F5, audiosize), 0);
+      oac_decode_frame(st, NULL, 0, pcm_transition, IMIN(F5, audiosize), 0);
    }
 
 
@@ -530,17 +530,17 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
 
       switch(bandwidth)
       {
-      case OPUS_BANDWIDTH_NARROWBAND:
+      case OAC_BANDWIDTH_NARROWBAND:
          endband = 13;
          break;
-      case OPUS_BANDWIDTH_MEDIUMBAND:
-      case OPUS_BANDWIDTH_WIDEBAND:
+      case OAC_BANDWIDTH_MEDIUMBAND:
+      case OAC_BANDWIDTH_WIDEBAND:
          endband = 17;
          break;
-      case OPUS_BANDWIDTH_SUPERWIDEBAND:
+      case OAC_BANDWIDTH_SUPERWIDEBAND:
          endband = 19;
          break;
-      case OPUS_BANDWIDTH_FULLBAND:
+      case OAC_BANDWIDTH_FULLBAND:
          endband = 21;
          break;
       default:
@@ -553,7 +553,7 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
 
    /* Only allocation memory for redundancy if/when needed */
    redundant_audio_size = redundancy ? F5*st->channels : ALLOC_NONE;
-   ALLOC(redundant_audio, redundant_audio_size, opus_res);
+   ALLOC(redundant_audio, redundant_audio_size, oac_res);
 
    /* 5 ms redundant frame for CELT->SILK*/
    if (redundancy && celt_to_silk)
@@ -566,7 +566,7 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
       MUST_SUCCEED(celt_decoder_ctl(celt_dec, CELT_SET_START_BAND(0)));
       celt_decode_with_ec(celt_dec, data+len, redundancy_bytes,
                           redundant_audio, F5, NULL, 0);
-      MUST_SUCCEED(celt_decoder_ctl(celt_dec, OPUS_GET_FINAL_RANGE(&redundant_rng)));
+      MUST_SUCCEED(celt_decoder_ctl(celt_dec, OAC_GET_FINAL_RANGE(&redundant_rng)));
    }
 
    /* MUST be after PLC */
@@ -581,7 +581,7 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
       int celt_frame_size = IMIN(F20, frame_size);
       /* Make sure to discard any previous CELT state */
       if (mode != st->prev_mode && st->prev_mode > 0 && !st->prev_redundancy)
-         MUST_SUCCEED(celt_decoder_ctl(celt_dec, OPUS_RESET_STATE));
+         MUST_SUCCEED(celt_decoder_ctl(celt_dec, OAC_RESET_STATE));
       /* Decode CELT */
       celt_ret = celt_decode_with_ec_dred(celt_dec, decode_fec ? NULL : data,
                                      len, pcm, celt_frame_size, &dec, celt_accum
@@ -589,7 +589,7 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
                                      , &st->lpcnet
 #endif
                                      );
-      celt_decoder_ctl(celt_dec, OPUS_GET_FINAL_RANGE(&st->rangeFinal));
+      celt_decoder_ctl(celt_dec, OAC_GET_FINAL_RANGE(&st->rangeFinal));
    } else {
       unsigned char silence[2] = {0xFF, 0xFF};
       if (!celt_accum)
@@ -616,11 +616,11 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
    /* 5 ms redundant frame for SILK->CELT */
    if (redundancy && !celt_to_silk)
    {
-      MUST_SUCCEED(celt_decoder_ctl(celt_dec, OPUS_RESET_STATE));
+      MUST_SUCCEED(celt_decoder_ctl(celt_dec, OAC_RESET_STATE));
       MUST_SUCCEED(celt_decoder_ctl(celt_dec, CELT_SET_START_BAND(0)));
 
       celt_decode_with_ec(celt_dec, data+len, redundancy_bytes, redundant_audio, F5, NULL, 0);
-      MUST_SUCCEED(celt_decoder_ctl(celt_dec, OPUS_GET_FINAL_RANGE(&redundant_rng)));
+      MUST_SUCCEED(celt_decoder_ctl(celt_dec, OAC_GET_FINAL_RANGE(&redundant_rng)));
       smooth_fade(pcm+st->channels*(frame_size-F2_5), redundant_audio+st->channels*F2_5,
                   pcm+st->channels*(frame_size-F2_5), F2_5, st->channels, window, st->Fs);
    }
@@ -660,11 +660,11 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
 
    if(st->decode_gain)
    {
-      opus_val32 gain;
+      oac_val32 gain;
       gain = celt_exp2(MULT16_16_P15(QCONST16(6.48814081e-4f, 25), st->decode_gain));
       for (i=0;i<frame_size*st->channels;i++)
       {
-         opus_val32 x;
+         oac_val32 x;
          x = MULT32_32_Q16(pcm[i],gain);
          pcm[i] = SATURATE(x, 32767);
       }
@@ -680,8 +680,8 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
 
    if (celt_ret>=0)
    {
-      if (OPUS_CHECK_ARRAY(pcm, audiosize*st->channels))
-         OPUS_PRINT_INT(audiosize);
+      if (OAC_CHECK_ARRAY(pcm, audiosize*st->channels))
+         OAC_PRINT_INT(audiosize);
    }
 
    RESTORE_STACK;
@@ -689,25 +689,25 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
 
 }
 
-int opus_decode_native(OpusDecoder *st, const unsigned char *data,
-      opus_int32 len, opus_res *pcm, int frame_size, int decode_fec,
-      int self_delimited, opus_int32 *packet_offset, int soft_clip, const OpusDRED *dred, opus_int32 dred_offset)
+int oac_decode_native(OacDecoder *st, const unsigned char *data,
+      oac_int32 len, oac_res *pcm, int frame_size, int decode_fec,
+      int self_delimited, oac_int32 *packet_offset, int soft_clip, const OacDRED *dred, oac_int32 dred_offset)
 {
    int i, nb_samples;
    int count, offset;
    unsigned char toc;
    int packet_frame_size, packet_bandwidth, packet_mode, packet_stream_channels;
    /* 48 x 2.5 ms = 120 ms */
-   opus_int16 size[48];
+   oac_int16 size[48];
    const unsigned char *padding;
-   opus_int32 padding_len;
-   OpusExtensionIterator iter;
-   VALIDATE_OPUS_DECODER(st);
+   oac_int32 padding_len;
+   OacExtensionIterator iter;
+   VALIDATE_OAC_DECODER(st);
    if (decode_fec<0 || decode_fec>1)
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    /* For FEC/PLC, frame_size has to be to have a multiple of 2.5 ms */
    if ((decode_fec || len==0 || data==NULL) && frame_size%(st->Fs/400)!=0)
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
 #ifdef ENABLE_DRED
    if (dred != NULL && dred->process_stage == 2) {
       int F10;
@@ -741,25 +741,25 @@ int opus_decode_native(OpusDecoder *st, const unsigned char *data,
       int pcm_count=0;
       do {
          int ret;
-         ret = opus_decode_frame(st, NULL, 0, pcm+pcm_count*st->channels, frame_size-pcm_count, 0);
+         ret = oac_decode_frame(st, NULL, 0, pcm+pcm_count*st->channels, frame_size-pcm_count, 0);
          if (ret<0)
             return ret;
          pcm_count += ret;
       } while (pcm_count < frame_size);
       celt_assert(pcm_count == frame_size);
-      if (OPUS_CHECK_ARRAY(pcm, pcm_count*st->channels))
-         OPUS_PRINT_INT(pcm_count);
+      if (OAC_CHECK_ARRAY(pcm, pcm_count*st->channels))
+         OAC_PRINT_INT(pcm_count);
       st->last_packet_duration = pcm_count;
       return pcm_count;
    } else if (len<0)
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
 
-   packet_mode = opus_packet_get_mode(data);
-   packet_bandwidth = opus_packet_get_bandwidth(data);
-   packet_frame_size = opus_packet_get_samples_per_frame(data, st->Fs);
-   packet_stream_channels = opus_packet_get_nb_channels(data);
+   packet_mode = oac_packet_get_mode(data);
+   packet_bandwidth = oac_packet_get_bandwidth(data);
+   packet_frame_size = oac_packet_get_samples_per_frame(data, st->Fs);
+   packet_stream_channels = oac_packet_get_nb_channels(data);
 
-   count = opus_packet_parse_impl(data, len, self_delimited, &toc, NULL,
+   count = oac_packet_parse_impl(data, len, self_delimited, &toc, NULL,
                                   size, &offset, packet_offset, &padding, &padding_len);
    if (st->ignore_extensions) {
       padding = NULL;
@@ -767,7 +767,7 @@ int opus_decode_native(OpusDecoder *st, const unsigned char *data,
    }
    if (count<0)
       return count;
-   opus_extension_iterator_init(&iter, padding, padding_len, count);
+   oac_extension_iterator_init(&iter, padding, padding_len, count);
 
    data += offset;
 
@@ -777,12 +777,12 @@ int opus_decode_native(OpusDecoder *st, const unsigned char *data,
       int ret;
       /* If no FEC can be present, run the PLC (recursive call) */
       if (frame_size < packet_frame_size || packet_mode == MODE_CELT_ONLY || st->mode == MODE_CELT_ONLY)
-         return opus_decode_native(st, NULL, 0, pcm, frame_size, 0, 0, NULL, soft_clip, NULL, 0);
+         return oac_decode_native(st, NULL, 0, pcm, frame_size, 0, 0, NULL, soft_clip, NULL, 0);
       /* Otherwise, run the PLC on everything except the size for which we might have FEC */
       duration_copy = st->last_packet_duration;
       if (frame_size-packet_frame_size!=0)
       {
-         ret = opus_decode_native(st, NULL, 0, pcm, frame_size-packet_frame_size, 0, 0, NULL, soft_clip, NULL, 0);
+         ret = oac_decode_native(st, NULL, 0, pcm, frame_size-packet_frame_size, 0, 0, NULL, soft_clip, NULL, 0);
          if (ret<0)
          {
             st->last_packet_duration = duration_copy;
@@ -795,20 +795,20 @@ int opus_decode_native(OpusDecoder *st, const unsigned char *data,
       st->bandwidth = packet_bandwidth;
       st->frame_size = packet_frame_size;
       st->stream_channels = packet_stream_channels;
-      ret = opus_decode_frame(st, data, size[0], pcm+st->channels*(frame_size-packet_frame_size),
+      ret = oac_decode_frame(st, data, size[0], pcm+st->channels*(frame_size-packet_frame_size),
             packet_frame_size, 1);
       if (ret<0)
          return ret;
       else {
-         if (OPUS_CHECK_ARRAY(pcm, frame_size*st->channels))
-            OPUS_PRINT_INT(frame_size);
+         if (OAC_CHECK_ARRAY(pcm, frame_size*st->channels))
+            OAC_PRINT_INT(frame_size);
          st->last_packet_duration = frame_size;
          return frame_size;
       }
    }
 
    if (count*packet_frame_size > frame_size)
-      return OPUS_BUFFER_TOO_SMALL;
+      return OAC_BUFFER_TOO_SMALL;
 
    /* Update the state as the last step to avoid updating it on an invalid packet */
    st->mode = packet_mode;
@@ -820,7 +820,7 @@ int opus_decode_native(OpusDecoder *st, const unsigned char *data,
    for (i=0;i<count;i++)
    {
       int ret;
-      ret = opus_decode_frame(st, data, size[i], pcm+nb_samples*st->channels, frame_size-nb_samples, 0);
+      ret = oac_decode_frame(st, data, size[i], pcm+nb_samples*st->channels, frame_size-nb_samples, 0);
       if (ret<0)
          return ret;
       celt_assert(ret==packet_frame_size);
@@ -828,11 +828,11 @@ int opus_decode_native(OpusDecoder *st, const unsigned char *data,
       nb_samples += ret;
    }
    st->last_packet_duration = nb_samples;
-   if (OPUS_CHECK_ARRAY(pcm, nb_samples*st->channels))
-      OPUS_PRINT_INT(nb_samples);
+   if (OAC_CHECK_ARRAY(pcm, nb_samples*st->channels))
+      OAC_PRINT_INT(nb_samples);
 #ifndef FIXED_POINT
    if (soft_clip)
-      opus_pcm_soft_clip_impl(pcm, nb_samples, st->channels, st->softclip_mem, st->arch);
+      oac_pcm_soft_clip_impl(pcm, nb_samples, st->channels, st->softclip_mem, st->arch);
    else
       st->softclip_mem[0]=st->softclip_mem[1]=0;
 #endif
@@ -845,10 +845,10 @@ int opus_decode_native(OpusDecoder *st, const unsigned char *data,
 #define OPTIONAL_CLIP 1
 #endif
 
-int opus_decode(OpusDecoder *st, const unsigned char *data,
-      opus_int32 len, opus_int16 *pcm, int frame_size, int decode_fec)
+int oac_decode(OacDecoder *st, const unsigned char *data,
+      oac_int32 len, oac_int16 *pcm, int frame_size, int decode_fec)
 {
-       VARDECL(opus_res, out);
+       VARDECL(oac_res, out);
        int ret;
        int nb_samples;
        ALLOC_STACK;
@@ -856,20 +856,20 @@ int opus_decode(OpusDecoder *st, const unsigned char *data,
        if(frame_size<=0)
        {
           RESTORE_STACK;
-          return OPUS_BAD_ARG;
+          return OAC_BAD_ARG;
        }
        if (data != NULL && len > 0 && !decode_fec)
        {
-          nb_samples = opus_decoder_get_nb_samples(st, data, len);
+          nb_samples = oac_decoder_get_nb_samples(st, data, len);
           if (nb_samples>0)
              frame_size = IMIN(frame_size, nb_samples);
           else
-             return OPUS_INVALID_PACKET;
+             return OAC_INVALID_PACKET;
        }
        celt_assert(st->channels == 1 || st->channels == 2);
-       ALLOC(out, frame_size*st->channels, opus_res);
+       ALLOC(out, frame_size*st->channels, oac_res);
 
-       ret = opus_decode_native(st, data, len, out, frame_size, decode_fec, 0, NULL, OPTIONAL_CLIP, NULL, 0);
+       ret = oac_decode_native(st, data, len, out, frame_size, decode_fec, 0, NULL, OPTIONAL_CLIP, NULL, 0);
        if (ret > 0)
        {
 # if defined(FIXED_POINT)
@@ -885,18 +885,18 @@ int opus_decode(OpusDecoder *st, const unsigned char *data,
 }
 
 #if defined(FIXED_POINT)
-int opus_decode24(OpusDecoder *st, const unsigned char *data,
-      opus_int32 len, opus_int32 *pcm, int frame_size, int decode_fec)
+int oac_decode24(OacDecoder *st, const unsigned char *data,
+      oac_int32 len, oac_int32 *pcm, int frame_size, int decode_fec)
 {
    if(frame_size<=0)
-      return OPUS_BAD_ARG;
-   return opus_decode_native(st, data, len, pcm, frame_size, decode_fec, 0, NULL, 0, NULL, 0);
+      return OAC_BAD_ARG;
+   return oac_decode_native(st, data, len, pcm, frame_size, decode_fec, 0, NULL, 0, NULL, 0);
 }
 #else
-int opus_decode24(OpusDecoder *st, const unsigned char *data,
-      opus_int32 len, opus_int32 *pcm, int frame_size, int decode_fec)
+int oac_decode24(OacDecoder *st, const unsigned char *data,
+      oac_int32 len, oac_int32 *pcm, int frame_size, int decode_fec)
 {
-       VARDECL(opus_res, out);
+       VARDECL(oac_res, out);
        int ret, i;
        int nb_samples;
        ALLOC_STACK;
@@ -904,20 +904,20 @@ int opus_decode24(OpusDecoder *st, const unsigned char *data,
        if(frame_size<=0)
        {
           RESTORE_STACK;
-          return OPUS_BAD_ARG;
+          return OAC_BAD_ARG;
        }
        if (data != NULL && len > 0 && !decode_fec)
        {
-          nb_samples = opus_decoder_get_nb_samples(st, data, len);
+          nb_samples = oac_decoder_get_nb_samples(st, data, len);
           if (nb_samples>0)
              frame_size = IMIN(frame_size, nb_samples);
           else
-             return OPUS_INVALID_PACKET;
+             return OAC_INVALID_PACKET;
        }
        celt_assert(st->channels == 1 || st->channels == 2);
-       ALLOC(out, frame_size*st->channels, opus_res);
+       ALLOC(out, frame_size*st->channels, oac_res);
 
-       ret = opus_decode_native(st, data, len, out, frame_size, decode_fec, 0, NULL, 0, NULL, 0);
+       ret = oac_decode_native(st, data, len, out, frame_size, decode_fec, 0, NULL, 0, NULL, 0);
        if (ret > 0)
        {
           nb_samples = ret*st->channels;
@@ -933,18 +933,18 @@ int opus_decode24(OpusDecoder *st, const unsigned char *data,
 #ifndef DISABLE_FLOAT_API
 
 # if !defined(FIXED_POINT)
-int opus_decode_float(OpusDecoder *st, const unsigned char *data,
-      opus_int32 len, opus_val16 *pcm, int frame_size, int decode_fec)
+int oac_decode_float(OacDecoder *st, const unsigned char *data,
+      oac_int32 len, oac_val16 *pcm, int frame_size, int decode_fec)
 {
    if(frame_size<=0)
-      return OPUS_BAD_ARG;
-   return opus_decode_native(st, data, len, pcm, frame_size, decode_fec, 0, NULL, 0, NULL, 0);
+      return OAC_BAD_ARG;
+   return oac_decode_native(st, data, len, pcm, frame_size, decode_fec, 0, NULL, 0, NULL, 0);
 }
 # else
-int opus_decode_float(OpusDecoder *st, const unsigned char *data,
-      opus_int32 len, float *pcm, int frame_size, int decode_fec)
+int oac_decode_float(OacDecoder *st, const unsigned char *data,
+      oac_int32 len, float *pcm, int frame_size, int decode_fec)
 {
-   VARDECL(opus_res, out);
+   VARDECL(oac_res, out);
    int ret, i;
    int nb_samples;
    ALLOC_STACK;
@@ -952,20 +952,20 @@ int opus_decode_float(OpusDecoder *st, const unsigned char *data,
    if(frame_size<=0)
    {
       RESTORE_STACK;
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    }
    if (data != NULL && len > 0 && !decode_fec)
    {
-      nb_samples = opus_decoder_get_nb_samples(st, data, len);
+      nb_samples = oac_decoder_get_nb_samples(st, data, len);
       if (nb_samples>0)
          frame_size = IMIN(frame_size, nb_samples);
       else
-         return OPUS_INVALID_PACKET;
+         return OAC_INVALID_PACKET;
    }
    celt_assert(st->channels == 1 || st->channels == 2);
-   ALLOC(out, frame_size*st->channels, opus_res);
+   ALLOC(out, frame_size*st->channels, oac_res);
 
-   ret = opus_decode_native(st, data, len, out, frame_size, decode_fec, 0, NULL, 0, NULL, 0);
+   ret = oac_decode_native(st, data, len, out, frame_size, decode_fec, 0, NULL, 0, NULL, 0);
    if (ret > 0)
    {
       for (i=0;i<ret*st->channels;i++)
@@ -979,9 +979,9 @@ int opus_decode_float(OpusDecoder *st, const unsigned char *data,
 #endif
 
 
-int opus_decoder_ctl(OpusDecoder *st, int request, ...)
+int oac_decoder_ctl(OacDecoder *st, int request, ...)
 {
-   int ret = OPUS_OK;
+   int ret = OAC_OK;
    va_list ap;
    void *silk_dec;
    CELTDecoder *celt_dec;
@@ -994,9 +994,9 @@ int opus_decoder_ctl(OpusDecoder *st, int request, ...)
 
    switch (request)
    {
-   case OPUS_GET_BANDWIDTH_REQUEST:
+   case OAC_GET_BANDWIDTH_REQUEST:
    {
-      opus_int32 *value = va_arg(ap, opus_int32*);
+      oac_int32 *value = va_arg(ap, oac_int32*);
       if (!value)
       {
          goto bad_arg;
@@ -1004,20 +1004,20 @@ int opus_decoder_ctl(OpusDecoder *st, int request, ...)
       *value = st->bandwidth;
    }
    break;
-   case OPUS_SET_COMPLEXITY_REQUEST:
+   case OAC_SET_COMPLEXITY_REQUEST:
    {
-       opus_int32 value = va_arg(ap, opus_int32);
+       oac_int32 value = va_arg(ap, oac_int32);
        if(value<0 || value>10)
        {
           goto bad_arg;
        }
        st->complexity = value;
-       celt_decoder_ctl(celt_dec, OPUS_SET_COMPLEXITY(value));
+       celt_decoder_ctl(celt_dec, OAC_SET_COMPLEXITY(value));
    }
    break;
-   case OPUS_GET_COMPLEXITY_REQUEST:
+   case OAC_GET_COMPLEXITY_REQUEST:
    {
-       opus_int32 *value = va_arg(ap, opus_int32*);
+       oac_int32 *value = va_arg(ap, oac_int32*);
        if (!value)
        {
           goto bad_arg;
@@ -1026,9 +1026,9 @@ int opus_decoder_ctl(OpusDecoder *st, int request, ...)
    }
    break;
 #ifdef ENABLE_OSCE_BWE
-   case OPUS_SET_OSCE_BWE_REQUEST:
+   case OAC_SET_OSCE_BWE_REQUEST:
    {
-       opus_int32 value = va_arg(ap, opus_int32);
+       oac_int32 value = va_arg(ap, oac_int32);
        if(value<0 || value>1)
        {          goto bad_arg;
        }
@@ -1036,9 +1036,9 @@ int opus_decoder_ctl(OpusDecoder *st, int request, ...)
 
       }
    break;
-   case OPUS_GET_OSCE_BWE_REQUEST:
+   case OAC_GET_OSCE_BWE_REQUEST:
    {
-       opus_int32 *value = va_arg(ap, opus_int32*);
+       oac_int32 *value = va_arg(ap, oac_int32*);
        if (!value)
        {
           goto bad_arg;
@@ -1047,9 +1047,9 @@ int opus_decoder_ctl(OpusDecoder *st, int request, ...)
    }
    break;
 #endif
-   case OPUS_GET_FINAL_RANGE_REQUEST:
+   case OAC_GET_FINAL_RANGE_REQUEST:
    {
-      opus_uint32 *value = va_arg(ap, opus_uint32*);
+      oac_uint32 *value = va_arg(ap, oac_uint32*);
       if (!value)
       {
          goto bad_arg;
@@ -1057,13 +1057,13 @@ int opus_decoder_ctl(OpusDecoder *st, int request, ...)
       *value = st->rangeFinal;
    }
    break;
-   case OPUS_RESET_STATE:
+   case OAC_RESET_STATE:
    {
-      OPUS_CLEAR((char*)&st->OPUS_DECODER_RESET_START,
-            sizeof(OpusDecoder)-
-            ((char*)&st->OPUS_DECODER_RESET_START - (char*)st));
+      OAC_CLEAR((char*)&st->OAC_DECODER_RESET_START,
+            sizeof(OacDecoder)-
+            ((char*)&st->OAC_DECODER_RESET_START - (char*)st));
 
-      celt_decoder_ctl(celt_dec, OPUS_RESET_STATE);
+      celt_decoder_ctl(celt_dec, OAC_RESET_STATE);
       silk_ResetDecoder( silk_dec );
       st->stream_channels = st->channels;
       st->frame_size = st->Fs/400;
@@ -1072,9 +1072,9 @@ int opus_decoder_ctl(OpusDecoder *st, int request, ...)
 #endif
    }
    break;
-   case OPUS_GET_SAMPLE_RATE_REQUEST:
+   case OAC_GET_SAMPLE_RATE_REQUEST:
    {
-      opus_int32 *value = va_arg(ap, opus_int32*);
+      oac_int32 *value = va_arg(ap, oac_int32*);
       if (!value)
       {
          goto bad_arg;
@@ -1082,22 +1082,22 @@ int opus_decoder_ctl(OpusDecoder *st, int request, ...)
       *value = st->Fs;
    }
    break;
-   case OPUS_GET_PITCH_REQUEST:
+   case OAC_GET_PITCH_REQUEST:
    {
-      opus_int32 *value = va_arg(ap, opus_int32*);
+      oac_int32 *value = va_arg(ap, oac_int32*);
       if (!value)
       {
          goto bad_arg;
       }
       if (st->prev_mode == MODE_CELT_ONLY)
-         ret = celt_decoder_ctl(celt_dec, OPUS_GET_PITCH(value));
+         ret = celt_decoder_ctl(celt_dec, OAC_GET_PITCH(value));
       else
          *value = st->DecControl.prevPitchLag;
    }
    break;
-   case OPUS_GET_GAIN_REQUEST:
+   case OAC_GET_GAIN_REQUEST:
    {
-      opus_int32 *value = va_arg(ap, opus_int32*);
+      oac_int32 *value = va_arg(ap, oac_int32*);
       if (!value)
       {
          goto bad_arg;
@@ -1105,9 +1105,9 @@ int opus_decoder_ctl(OpusDecoder *st, int request, ...)
       *value = st->decode_gain;
    }
    break;
-   case OPUS_SET_GAIN_REQUEST:
+   case OAC_SET_GAIN_REQUEST:
    {
-       opus_int32 value = va_arg(ap, opus_int32);
+       oac_int32 value = va_arg(ap, oac_int32);
        if (value<-32768 || value>32767)
        {
           goto bad_arg;
@@ -1115,9 +1115,9 @@ int opus_decoder_ctl(OpusDecoder *st, int request, ...)
        st->decode_gain = value;
    }
    break;
-   case OPUS_GET_LAST_PACKET_DURATION_REQUEST:
+   case OAC_GET_LAST_PACKET_DURATION_REQUEST:
    {
-      opus_int32 *value = va_arg(ap, opus_int32*);
+      oac_int32 *value = va_arg(ap, oac_int32*);
       if (!value)
       {
          goto bad_arg;
@@ -1125,29 +1125,29 @@ int opus_decoder_ctl(OpusDecoder *st, int request, ...)
       *value = st->last_packet_duration;
    }
    break;
-   case OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST:
+   case OAC_SET_PHASE_INVERSION_DISABLED_REQUEST:
    {
-       opus_int32 value = va_arg(ap, opus_int32);
+       oac_int32 value = va_arg(ap, oac_int32);
        if(value<0 || value>1)
        {
           goto bad_arg;
        }
-       ret = celt_decoder_ctl(celt_dec, OPUS_SET_PHASE_INVERSION_DISABLED(value));
+       ret = celt_decoder_ctl(celt_dec, OAC_SET_PHASE_INVERSION_DISABLED(value));
    }
    break;
-   case OPUS_GET_PHASE_INVERSION_DISABLED_REQUEST:
+   case OAC_GET_PHASE_INVERSION_DISABLED_REQUEST:
    {
-       opus_int32 *value = va_arg(ap, opus_int32*);
+       oac_int32 *value = va_arg(ap, oac_int32*);
        if (!value)
        {
           goto bad_arg;
        }
-       ret = celt_decoder_ctl(celt_dec, OPUS_GET_PHASE_INVERSION_DISABLED(value));
+       ret = celt_decoder_ctl(celt_dec, OAC_GET_PHASE_INVERSION_DISABLED(value));
    }
    break;
-   case OPUS_SET_IGNORE_EXTENSIONS_REQUEST:
+   case OAC_SET_IGNORE_EXTENSIONS_REQUEST:
    {
-       opus_int32 value = va_arg(ap, opus_int32);
+       oac_int32 value = va_arg(ap, oac_int32);
        if(value<0 || value>1)
        {
           goto bad_arg;
@@ -1155,9 +1155,9 @@ int opus_decoder_ctl(OpusDecoder *st, int request, ...)
        st->ignore_extensions = value;
    }
    break;
-   case OPUS_GET_IGNORE_EXTENSIONS_REQUEST:
+   case OAC_GET_IGNORE_EXTENSIONS_REQUEST:
    {
-       opus_int32 *value = va_arg(ap, opus_int32*);
+       oac_int32 *value = va_arg(ap, oac_int32*);
        if (!value)
        {
           goto bad_arg;
@@ -1166,10 +1166,10 @@ int opus_decoder_ctl(OpusDecoder *st, int request, ...)
    }
    break;
 #ifdef USE_WEIGHTS_FILE
-   case OPUS_SET_DNN_BLOB_REQUEST:
+   case OAC_SET_DNN_BLOB_REQUEST:
    {
        const unsigned char *data = va_arg(ap, const unsigned char *);
-       opus_int32 len = va_arg(ap, opus_int32);
+       oac_int32 len = va_arg(ap, oac_int32);
        if(len<0 || data == NULL)
        {
           goto bad_arg;
@@ -1180,8 +1180,8 @@ int opus_decoder_ctl(OpusDecoder *st, int request, ...)
    break;
 #endif
    default:
-      /*fprintf(stderr, "unknown opus_decoder_ctl() request: %d", request);*/
-      ret = OPUS_UNIMPLEMENTED;
+      /*fprintf(stderr, "unknown oac_decoder_ctl() request: %d", request);*/
+      ret = OAC_UNIMPLEMENTED;
       break;
    }
 
@@ -1189,88 +1189,88 @@ int opus_decoder_ctl(OpusDecoder *st, int request, ...)
    return ret;
 bad_arg:
    va_end(ap);
-   return OPUS_BAD_ARG;
+   return OAC_BAD_ARG;
 }
 
-void opus_decoder_destroy(OpusDecoder *st)
+void oac_decoder_destroy(OacDecoder *st)
 {
-   opus_free(st);
+   oac_free(st);
 }
 
 
-int opus_packet_get_bandwidth(const unsigned char *data)
+int oac_packet_get_bandwidth(const unsigned char *data)
 {
    int bandwidth;
    if (data[0]&0x80)
    {
-      bandwidth = OPUS_BANDWIDTH_MEDIUMBAND + ((data[0]>>5)&0x3);
-      if (bandwidth == OPUS_BANDWIDTH_MEDIUMBAND)
-         bandwidth = OPUS_BANDWIDTH_NARROWBAND;
+      bandwidth = OAC_BANDWIDTH_MEDIUMBAND + ((data[0]>>5)&0x3);
+      if (bandwidth == OAC_BANDWIDTH_MEDIUMBAND)
+         bandwidth = OAC_BANDWIDTH_NARROWBAND;
    } else if ((data[0]&0x60) == 0x60)
    {
-      bandwidth = (data[0]&0x10) ? OPUS_BANDWIDTH_FULLBAND :
-                                   OPUS_BANDWIDTH_SUPERWIDEBAND;
+      bandwidth = (data[0]&0x10) ? OAC_BANDWIDTH_FULLBAND :
+                                   OAC_BANDWIDTH_SUPERWIDEBAND;
    } else {
-      bandwidth = OPUS_BANDWIDTH_NARROWBAND + ((data[0]>>5)&0x3);
+      bandwidth = OAC_BANDWIDTH_NARROWBAND + ((data[0]>>5)&0x3);
    }
    return bandwidth;
 }
 
-int opus_packet_get_nb_channels(const unsigned char *data)
+int oac_packet_get_nb_channels(const unsigned char *data)
 {
    return (data[0]&0x4) ? 2 : 1;
 }
 
-int opus_packet_get_nb_frames(const unsigned char packet[], opus_int32 len)
+int oac_packet_get_nb_frames(const unsigned char packet[], oac_int32 len)
 {
    int count;
    if (len<1)
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    count = packet[0]&0x3;
    if (count==0)
       return 1;
    else if (count!=3)
       return 2;
    else if (len<2)
-      return OPUS_INVALID_PACKET;
+      return OAC_INVALID_PACKET;
    else
       return packet[1]&0x3F;
 }
 
-int opus_packet_get_nb_samples(const unsigned char packet[], opus_int32 len,
-      opus_int32 Fs)
+int oac_packet_get_nb_samples(const unsigned char packet[], oac_int32 len,
+      oac_int32 Fs)
 {
    int samples;
-   int count = opus_packet_get_nb_frames(packet, len);
+   int count = oac_packet_get_nb_frames(packet, len);
 
    if (count<0)
       return count;
 
-   samples = count*opus_packet_get_samples_per_frame(packet, Fs);
+   samples = count*oac_packet_get_samples_per_frame(packet, Fs);
    /* Can't have more than 120 ms */
    if (samples*25 > Fs*3)
-      return OPUS_INVALID_PACKET;
+      return OAC_INVALID_PACKET;
    else
       return samples;
 }
 
-int opus_packet_has_lbrr(const unsigned char packet[], opus_int32 len)
+int oac_packet_has_lbrr(const unsigned char packet[], oac_int32 len)
 {
    int ret;
    const unsigned char *frames[48];
-   opus_int16 size[48];
+   oac_int16 size[48];
    int packet_mode, packet_frame_size, packet_stream_channels;
    int nb_frames=1;
    int lbrr;
 
-   packet_mode = opus_packet_get_mode(packet);
+   packet_mode = oac_packet_get_mode(packet);
    if (packet_mode == MODE_CELT_ONLY)
       return 0;
-   packet_frame_size = opus_packet_get_samples_per_frame(packet, 48000);
+   packet_frame_size = oac_packet_get_samples_per_frame(packet, 48000);
    if (packet_frame_size > 960)
       nb_frames = packet_frame_size/960;
-   packet_stream_channels = opus_packet_get_nb_channels(packet);
-   ret = opus_packet_parse(packet, len, NULL, frames, size, NULL);
+   packet_stream_channels = oac_packet_get_nb_channels(packet);
+   ret = oac_packet_parse(packet, len, NULL, frames, size, NULL);
    if (ret <= 0)
       return ret;
    if (size[0] == 0)
@@ -1281,28 +1281,28 @@ int opus_packet_has_lbrr(const unsigned char packet[], opus_int32 len)
    return lbrr;
 }
 
-int opus_decoder_get_nb_samples(const OpusDecoder *dec,
-      const unsigned char packet[], opus_int32 len)
+int oac_decoder_get_nb_samples(const OacDecoder *dec,
+      const unsigned char packet[], oac_int32 len)
 {
-   return opus_packet_get_nb_samples(packet, len, dec->Fs);
+   return oac_packet_get_nb_samples(packet, len, dec->Fs);
 }
 
-struct OpusDREDDecoder {
+struct OacDREDDecoder {
 #ifdef ENABLE_DRED
    RDOVAEDec model;
 #endif
    int loaded;
    int arch;
-   opus_uint32 magic;
+   oac_uint32 magic;
 };
 
 #if defined(ENABLE_DRED) && (defined(ENABLE_HARDENING) || defined(ENABLE_ASSERTIONS))
-static void validate_dred_decoder(OpusDREDDecoder *st)
+static void validate_dred_decoder(OacDREDDecoder *st)
 {
    celt_assert(st->magic == 0xD8EDDEC0);
-#ifdef OPUS_ARCHMASK
+#ifdef OAC_ARCHMASK
    celt_assert(st->arch >= 0);
-   celt_assert(st->arch <= OPUS_ARCHMASK);
+   celt_assert(st->arch <= OAC_ARCHMASK);
 #endif
 }
 #define VALIDATE_DRED_DECODER(st) validate_dred_decoder(st)
@@ -1311,25 +1311,25 @@ static void validate_dred_decoder(OpusDREDDecoder *st)
 #endif
 
 
-int opus_dred_decoder_get_size(void)
+int oac_dred_decoder_get_size(void)
 {
-  return sizeof(OpusDREDDecoder);
+  return sizeof(OacDREDDecoder);
 }
 
 #ifdef ENABLE_DRED
-int dred_decoder_load_model(OpusDREDDecoder *dec, const unsigned char *data, int len)
+int dred_decoder_load_model(OacDREDDecoder *dec, const unsigned char *data, int len)
 {
     WeightArray *list;
     int ret;
     parse_weights(&list, data, len);
     ret = init_rdovaedec(&dec->model, list);
-    opus_free(list);
+    oac_free(list);
     if (ret == 0) dec->loaded = 1;
-    return (ret == 0) ? OPUS_OK : OPUS_BAD_ARG;
+    return (ret == 0) ? OAC_OK : OAC_BAD_ARG;
 }
 #endif
 
-int opus_dred_decoder_init(OpusDREDDecoder *dec)
+int oac_dred_decoder_init(OacDREDDecoder *dec)
 {
    int ret = 0;
    dec->loaded = 0;
@@ -1337,44 +1337,44 @@ int opus_dred_decoder_init(OpusDREDDecoder *dec)
    ret = init_rdovaedec(&dec->model, rdovaedec_arrays);
    if (ret == 0) dec->loaded = 1;
 #endif
-   dec->arch = opus_select_arch();
+   dec->arch = oac_select_arch();
    /* To make sure nobody forgets to init, use a magic number. */
    dec->magic = 0xD8EDDEC0;
-   return (ret == 0) ? OPUS_OK : OPUS_UNIMPLEMENTED;
+   return (ret == 0) ? OAC_OK : OAC_UNIMPLEMENTED;
 }
 
-OpusDREDDecoder *opus_dred_decoder_create(int *error)
+OacDREDDecoder *oac_dred_decoder_create(int *error)
 {
    int ret;
-   OpusDREDDecoder *dec;
-   dec = (OpusDREDDecoder *)opus_alloc(opus_dred_decoder_get_size());
+   OacDREDDecoder *dec;
+   dec = (OacDREDDecoder *)oac_alloc(oac_dred_decoder_get_size());
    if (dec == NULL)
    {
       if (error)
-         *error = OPUS_ALLOC_FAIL;
+         *error = OAC_ALLOC_FAIL;
       return NULL;
    }
-   ret = opus_dred_decoder_init(dec);
+   ret = oac_dred_decoder_init(dec);
    if (error)
       *error = ret;
-   if (ret != OPUS_OK)
+   if (ret != OAC_OK)
    {
-      opus_free(dec);
+      oac_free(dec);
       dec = NULL;
    }
    return dec;
 }
 
-void opus_dred_decoder_destroy(OpusDREDDecoder *dec)
+void oac_dred_decoder_destroy(OacDREDDecoder *dec)
 {
    if (dec) dec->magic = 0xDE57801D;
-   opus_free(dec);
+   oac_free(dec);
 }
 
-int opus_dred_decoder_ctl(OpusDREDDecoder *dred_dec, int request, ...)
+int oac_dred_decoder_ctl(OacDREDDecoder *dred_dec, int request, ...)
 {
 #ifdef ENABLE_DRED
-   int ret = OPUS_OK;
+   int ret = OAC_OK;
    va_list ap;
 
    va_start(ap, request);
@@ -1382,10 +1382,10 @@ int opus_dred_decoder_ctl(OpusDREDDecoder *dred_dec, int request, ...)
    switch (request)
    {
 # ifdef USE_WEIGHTS_FILE
-   case OPUS_SET_DNN_BLOB_REQUEST:
+   case OAC_SET_DNN_BLOB_REQUEST:
    {
       const unsigned char *data = va_arg(ap, const unsigned char *);
-      opus_int32 len = va_arg(ap, opus_int32);
+      oac_int32 len = va_arg(ap, oac_int32);
       if(len<0 || data == NULL)
       {
          goto bad_arg;
@@ -1395,8 +1395,8 @@ int opus_dred_decoder_ctl(OpusDREDDecoder *dred_dec, int request, ...)
    break;
 # endif
    default:
-     /*fprintf(stderr, "unknown opus_decoder_ctl() request: %d", request);*/
-     ret = OPUS_UNIMPLEMENTED;
+     /*fprintf(stderr, "unknown oac_decoder_ctl() request: %d", request);*/
+     ret = OAC_UNIMPLEMENTED;
      break;
   }
   va_end(ap);
@@ -1404,39 +1404,39 @@ int opus_dred_decoder_ctl(OpusDREDDecoder *dred_dec, int request, ...)
 # ifdef USE_WEIGHTS_FILE
 bad_arg:
   va_end(ap);
-  return OPUS_BAD_ARG;
+  return OAC_BAD_ARG;
 # endif
 #else
   (void)dred_dec;
   (void)request;
-  return OPUS_UNIMPLEMENTED;
+  return OAC_UNIMPLEMENTED;
 #endif
 }
 
 #ifdef ENABLE_DRED
-static int dred_find_payload(const unsigned char *data, opus_int32 len, const unsigned char **payload, int *dred_frame_offset)
+static int dred_find_payload(const unsigned char *data, oac_int32 len, const unsigned char **payload, int *dred_frame_offset)
 {
-   OpusExtensionIterator iter;
-   opus_extension_data ext;
+   OacExtensionIterator iter;
+   oac_extension_data ext;
    const unsigned char *padding;
-   opus_int32 padding_len;
+   oac_int32 padding_len;
    int nb_frames;
    const unsigned char *frames[48];
-   opus_int16 size[48];
+   oac_int16 size[48];
    int frame_size;
    int ret;
 
    *payload = NULL;
    /* Get the padding section of the packet. */
-   ret = opus_packet_parse_impl(data, len, 0, NULL, frames, size, NULL, NULL,
+   ret = oac_packet_parse_impl(data, len, 0, NULL, frames, size, NULL, NULL,
     &padding, &padding_len);
    if (ret < 0)
       return ret;
    nb_frames = ret;
-   frame_size = opus_packet_get_samples_per_frame(data, 48000);
-   opus_extension_iterator_init(&iter, padding, padding_len, nb_frames);
+   frame_size = oac_packet_get_samples_per_frame(data, 48000);
+   oac_extension_iterator_init(&iter, padding, padding_len, nb_frames);
    for (;;) {
-      ret = opus_extension_iterator_find(&iter, &ext, DRED_EXTENSION_ID);
+      ret = oac_extension_iterator_find(&iter, &ext, DRED_EXTENSION_ID);
       if (ret <= 0)
          return ret;
       /* DRED position in the packet, in units of 2.5 ms like for the signaled DRED offset. */
@@ -1459,51 +1459,51 @@ static int dred_find_payload(const unsigned char *data, opus_int32 len, const un
 }
 #endif
 
-int opus_dred_get_size(void)
+int oac_dred_get_size(void)
 {
 #ifdef ENABLE_DRED
-  return sizeof(OpusDRED);
+  return sizeof(OacDRED);
 #else
   return 0;
 #endif
 }
 
-OpusDRED *opus_dred_alloc(int *error)
+OacDRED *oac_dred_alloc(int *error)
 {
 #ifdef ENABLE_DRED
-  OpusDRED *dec;
-  dec = (OpusDRED *)opus_alloc(opus_dred_get_size());
+  OacDRED *dec;
+  dec = (OacDRED *)oac_alloc(oac_dred_get_size());
   if (dec == NULL)
   {
     if (error)
-      *error = OPUS_ALLOC_FAIL;
+      *error = OAC_ALLOC_FAIL;
     return NULL;
   }
   return dec;
 #else
   if (error)
-    *error = OPUS_UNIMPLEMENTED;
+    *error = OAC_UNIMPLEMENTED;
   return NULL;
 #endif
 }
 
-void opus_dred_free(OpusDRED *dec)
+void oac_dred_free(OacDRED *dec)
 {
 #ifdef ENABLE_DRED
-  opus_free(dec);
+  oac_free(dec);
 #else
   (void)dec;
 #endif
 }
 
-int opus_dred_parse(OpusDREDDecoder *dred_dec, OpusDRED *dred, const unsigned char *data, opus_int32 len, opus_int32 max_dred_samples, opus_int32 sampling_rate, int *dred_end, int defer_processing)
+int oac_dred_parse(OacDREDDecoder *dred_dec, OacDRED *dred, const unsigned char *data, oac_int32 len, oac_int32 max_dred_samples, oac_int32 sampling_rate, int *dred_end, int defer_processing)
 {
 #ifdef ENABLE_DRED
    const unsigned char *payload;
-   opus_int32 payload_len;
+   oac_int32 payload_len;
    int dred_frame_offset=0;
    VALIDATE_DRED_DECODER(dred_dec);
-   if (!dred_dec->loaded) return OPUS_UNIMPLEMENTED;
+   if (!dred_dec->loaded) return OAC_UNIMPLEMENTED;
    dred->process_stage = -1;
    payload_len = dred_find_payload(data, len, &payload, &dred_frame_offset);
    if (payload_len < 0)
@@ -1516,7 +1516,7 @@ int opus_dred_parse(OpusDREDDecoder *dred_dec, OpusDRED *dred, const unsigned ch
       min_feature_frames = IMIN(2 + offset, 2*DRED_NUM_REDUNDANCY_FRAMES);
       dred_ec_decode(dred, payload, payload_len, min_feature_frames, dred_frame_offset);
       if (!defer_processing)
-         opus_dred_process(dred_dec, dred, dred);
+         oac_dred_process(dred_dec, dred, dred);
       if (dred_end) *dred_end = IMAX(0, -dred->dred_offset*sampling_rate/400);
       return IMAX(0, dred->nb_latents*sampling_rate/25 - dred->dred_offset* sampling_rate/400);
    }
@@ -1531,33 +1531,33 @@ int opus_dred_parse(OpusDREDDecoder *dred_dec, OpusDRED *dred, const unsigned ch
    (void)sampling_rate;
    (void)defer_processing;
    (void)dred_end;
-   return OPUS_UNIMPLEMENTED;
+   return OAC_UNIMPLEMENTED;
 #endif
 }
 
-int opus_dred_process(OpusDREDDecoder *dred_dec, const OpusDRED *src, OpusDRED *dst)
+int oac_dred_process(OacDREDDecoder *dred_dec, const OacDRED *src, OacDRED *dst)
 {
 #ifdef ENABLE_DRED
    if (dred_dec == NULL || src == NULL || dst == NULL || (src->process_stage != 1 && src->process_stage != 2))
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    VALIDATE_DRED_DECODER(dred_dec);
-   if (!dred_dec->loaded) return OPUS_UNIMPLEMENTED;
+   if (!dred_dec->loaded) return OAC_UNIMPLEMENTED;
    if (src != dst)
-      OPUS_COPY(dst, src, 1);
+      OAC_COPY(dst, src, 1);
    if (dst->process_stage == 2)
-      return OPUS_OK;
+      return OAC_OK;
    DRED_rdovae_decode_all(&dred_dec->model, dst->fec_features, dst->state, dst->latents, dst->nb_latents, dred_dec->arch);
    dst->process_stage = 2;
-   return OPUS_OK;
+   return OAC_OK;
 #else
    (void)dred_dec;
    (void)src;
    (void)dst;
-   return OPUS_UNIMPLEMENTED;
+   return OAC_UNIMPLEMENTED;
 #endif
 }
 
-int opus_decoder_dred_decode(OpusDecoder *st, const OpusDRED *dred, opus_int32 dred_offset, opus_int16 *pcm, opus_int32 frame_size)
+int oac_decoder_dred_decode(OacDecoder *st, const OacDRED *dred, oac_int32 dred_offset, oac_int16 *pcm, oac_int32 frame_size)
 {
 #ifdef ENABLE_DRED
    VARDECL(float, out);
@@ -1567,13 +1567,13 @@ int opus_decoder_dred_decode(OpusDecoder *st, const OpusDRED *dred, opus_int32 d
    if(frame_size<=0)
    {
       RESTORE_STACK;
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    }
 
    celt_assert(st->channels == 1 || st->channels == 2);
    ALLOC(out, frame_size*st->channels, float);
 
-   ret = opus_decode_native(st, NULL, 0, out, frame_size, 0, 0, NULL, 1, dred, dred_offset);
+   ret = oac_decode_native(st, NULL, 0, out, frame_size, 0, 0, NULL, 1, dred, dred_offset);
    if (ret > 0)
    {
       for (i=0;i<ret*st->channels;i++)
@@ -1587,11 +1587,11 @@ int opus_decoder_dred_decode(OpusDecoder *st, const OpusDRED *dred, opus_int32 d
    (void)dred_offset;
    (void)pcm;
    (void)frame_size;
-   return OPUS_UNIMPLEMENTED;
+   return OAC_UNIMPLEMENTED;
 #endif
 }
 
-int opus_decoder_dred_decode24(OpusDecoder *st, const OpusDRED *dred, opus_int32 dred_offset, opus_int32 *pcm, opus_int32 frame_size)
+int oac_decoder_dred_decode24(OacDecoder *st, const OacDRED *dred, oac_int32 dred_offset, oac_int32 *pcm, oac_int32 frame_size)
 {
 #ifdef ENABLE_DRED
    VARDECL(float, out);
@@ -1601,13 +1601,13 @@ int opus_decoder_dred_decode24(OpusDecoder *st, const OpusDRED *dred, opus_int32
    if(frame_size<=0)
    {
       RESTORE_STACK;
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    }
 
    celt_assert(st->channels == 1 || st->channels == 2);
    ALLOC(out, frame_size*st->channels, float);
 
-   ret = opus_decode_native(st, NULL, 0, out, frame_size, 0, 0, NULL, 1, dred, dred_offset);
+   ret = oac_decode_native(st, NULL, 0, out, frame_size, 0, 0, NULL, 1, dred, dred_offset);
    if (ret > 0)
    {
       for (i=0;i<ret*st->channels;i++)
@@ -1621,22 +1621,22 @@ int opus_decoder_dred_decode24(OpusDecoder *st, const OpusDRED *dred, opus_int32
    (void)dred_offset;
    (void)pcm;
    (void)frame_size;
-   return OPUS_UNIMPLEMENTED;
+   return OAC_UNIMPLEMENTED;
 #endif
 }
 
-int opus_decoder_dred_decode_float(OpusDecoder *st, const OpusDRED *dred, opus_int32 dred_offset, float *pcm, opus_int32 frame_size)
+int oac_decoder_dred_decode_float(OacDecoder *st, const OacDRED *dred, oac_int32 dred_offset, float *pcm, oac_int32 frame_size)
 {
 #ifdef ENABLE_DRED
    if(frame_size<=0)
-      return OPUS_BAD_ARG;
-   return opus_decode_native(st, NULL, 0, pcm, frame_size, 0, 0, NULL, 0, dred, dred_offset);
+      return OAC_BAD_ARG;
+   return oac_decode_native(st, NULL, 0, pcm, frame_size, 0, 0, NULL, 0, dred, dred_offset);
 #else
    (void)st;
    (void)dred;
    (void)dred_offset;
    (void)pcm;
    (void)frame_size;
-   return OPUS_UNIMPLEMENTED;
+   return OAC_UNIMPLEMENTED;
 #endif
 }
diff --git a/src/opus_demo.c b/src/oac_demo.c
similarity index 72%
rename from src/opus_demo.c
rename to src/oac_demo.c
index 8d201436f..f78462ab6 100644
--- a/src/opus_demo.c
+++ b/src/oac_demo.c
@@ -34,11 +34,11 @@
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
-#include "opus.h"
+#include "oac.h"
 #include "debug.h"
-#include "opus_types.h"
-#include "opus_private.h"
-#include "opus_multistream.h"
+#include "oac_types.h"
+#include "oac_private.h"
+#include "oac_multistream.h"
 #ifdef ENABLE_LOSSGEN
 #include "lossgen.h"
 #endif
@@ -159,11 +159,11 @@ void print_usage( char* argv[] )
 static const int format_size[3] = {2, 3, 4};
 
 typedef union {
-    opus_int32 i;
+    oac_int32 i;
     float f;
 } float_bits;
 
-static void int_to_char(opus_uint32 i, unsigned char ch[4])
+static void int_to_char(oac_uint32 i, unsigned char ch[4])
 {
     ch[0] = i>>24;
     ch[1] = (i>>16)&0xFF;
@@ -171,161 +171,161 @@ static void int_to_char(opus_uint32 i, unsigned char ch[4])
     ch[3] = i&0xFF;
 }
 
-static opus_uint32 char_to_int(unsigned char ch[4])
+static oac_uint32 char_to_int(unsigned char ch[4])
 {
-    return ((opus_uint32)ch[0]<<24) | ((opus_uint32)ch[1]<<16)
-         | ((opus_uint32)ch[2]<< 8) |  (opus_uint32)ch[3];
+    return ((oac_uint32)ch[0]<<24) | ((oac_uint32)ch[1]<<16)
+         | ((oac_uint32)ch[2]<< 8) |  (oac_uint32)ch[3];
 }
 
 #define check_encoder_option(decode_only, opt) do {if (decode_only) {fprintf(stderr, "option %s is only for encoding\n", opt); goto failure;}} while(0)
 #define check_decoder_option(encode_only, opt) do {if (encode_only) {fprintf(stderr, "option %s is only for decoding\n", opt); goto failure;}} while(0)
 
 static const int silk8_test[][4] = {
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_NARROWBAND, 960*3, 1},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_NARROWBAND, 960*2, 1},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_NARROWBAND, 960,   1},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_NARROWBAND, 480,   1},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_NARROWBAND, 960*3, 2},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_NARROWBAND, 960*2, 2},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_NARROWBAND, 960,   2},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_NARROWBAND, 480,   2}
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 960*3, 1},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 960*2, 1},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 960,   1},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 480,   1},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 960*3, 2},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 960*2, 2},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 960,   2},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 480,   2}
 };
 
 static const int silk12_test[][4] = {
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_MEDIUMBAND, 960*3, 1},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_MEDIUMBAND, 960*2, 1},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_MEDIUMBAND, 960,   1},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_MEDIUMBAND, 480,   1},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_MEDIUMBAND, 960*3, 2},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_MEDIUMBAND, 960*2, 2},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_MEDIUMBAND, 960,   2},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_MEDIUMBAND, 480,   2}
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 960*3, 1},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 960*2, 1},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 960,   1},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 480,   1},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 960*3, 2},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 960*2, 2},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 960,   2},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 480,   2}
 };
 
 static const int silk16_test[][4] = {
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_WIDEBAND, 960*3, 1},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_WIDEBAND, 960*2, 1},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_WIDEBAND, 960,   1},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_WIDEBAND, 480,   1},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_WIDEBAND, 960*3, 2},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_WIDEBAND, 960*2, 2},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_WIDEBAND, 960,   2},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_WIDEBAND, 480,   2}
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 960*3, 1},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 960*2, 1},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 960,   1},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 480,   1},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 960*3, 2},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 960*2, 2},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 960,   2},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 480,   2}
 };
 
 static const int silk_bw_switch_test[][4] = {
-    {MODE_SILK_ONLY, OPUS_BANDWIDTH_WIDEBAND,       960, 1},
-    {MODE_SILK_ONLY, OPUS_BANDWIDTH_NARROWBAND,     960, 1},
-    {MODE_SILK_ONLY, OPUS_BANDWIDTH_MEDIUMBAND,     960, 1},
-    {MODE_SILK_ONLY, OPUS_BANDWIDTH_SUPERWIDEBAND,  960, 1},
-    {MODE_SILK_ONLY, OPUS_BANDWIDTH_FULLBAND,       960, 1},
-    {MODE_SILK_ONLY, OPUS_BANDWIDTH_WIDEBAND,       960, 2},
-    {MODE_SILK_ONLY, OPUS_BANDWIDTH_NARROWBAND,     960, 2},
-    {MODE_SILK_ONLY, OPUS_BANDWIDTH_MEDIUMBAND,     960, 2},
-    {MODE_SILK_ONLY, OPUS_BANDWIDTH_SUPERWIDEBAND,  960, 2},
-    {MODE_SILK_ONLY, OPUS_BANDWIDTH_FULLBAND,       960, 2},
-    {MODE_SILK_ONLY, OPUS_BANDWIDTH_WIDEBAND,       480, 1},
-    {MODE_SILK_ONLY, OPUS_BANDWIDTH_NARROWBAND,     480, 1},
-    {MODE_SILK_ONLY, OPUS_BANDWIDTH_MEDIUMBAND,     480, 1},
-    {MODE_SILK_ONLY, OPUS_BANDWIDTH_SUPERWIDEBAND,  480, 1},
-    {MODE_SILK_ONLY, OPUS_BANDWIDTH_FULLBAND,       480, 1},
-    {MODE_SILK_ONLY, OPUS_BANDWIDTH_WIDEBAND,       480, 2},
-    {MODE_SILK_ONLY, OPUS_BANDWIDTH_NARROWBAND,     480, 2},
-    {MODE_SILK_ONLY, OPUS_BANDWIDTH_MEDIUMBAND,     480, 2},
-    {MODE_SILK_ONLY, OPUS_BANDWIDTH_SUPERWIDEBAND,  480, 2},
-    {MODE_SILK_ONLY, OPUS_BANDWIDTH_FULLBAND,       480, 2}
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND,       960, 1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND,     960, 1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND,     960, 1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND,  960, 1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_FULLBAND,       960, 1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND,       960, 2},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND,     960, 2},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND,     960, 2},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND,  960, 2},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_FULLBAND,       960, 2},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND,       480, 1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND,     480, 1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND,     480, 1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND,  480, 1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_FULLBAND,       480, 1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND,       480, 2},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND,     480, 2},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND,     480, 2},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND,  480, 2},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_FULLBAND,       480, 2}
 };
 
 static const int hybrid24_test[][4] = {
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_SUPERWIDEBAND, 960, 1},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_SUPERWIDEBAND, 480, 1},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_SUPERWIDEBAND, 960, 2},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_SUPERWIDEBAND, 480, 2}
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 960, 1},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 480, 1},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 960, 2},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 480, 2}
 };
 
 static const int hybrid48_test[][4] = {
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_FULLBAND, 960, 1},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_FULLBAND, 480, 1},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_FULLBAND, 960, 2},
-      {MODE_SILK_ONLY, OPUS_BANDWIDTH_FULLBAND, 480, 2}
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_FULLBAND, 960, 1},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_FULLBAND, 480, 1},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_FULLBAND, 960, 2},
+      {MODE_SILK_ONLY, OAC_BANDWIDTH_FULLBAND, 480, 2}
 };
 
 static const int celt_test[][4] = {
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_FULLBAND,      960, 1},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_SUPERWIDEBAND, 960, 1},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_WIDEBAND,      960, 1},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_NARROWBAND,    960, 1},
-
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_FULLBAND,      480, 1},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_SUPERWIDEBAND, 480, 1},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_WIDEBAND,      480, 1},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_NARROWBAND,    480, 1},
-
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_FULLBAND,      240, 1},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_SUPERWIDEBAND, 240, 1},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_WIDEBAND,      240, 1},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_NARROWBAND,    240, 1},
-
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_FULLBAND,      120, 1},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_SUPERWIDEBAND, 120, 1},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_WIDEBAND,      120, 1},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_NARROWBAND,    120, 1},
-
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_FULLBAND,      960, 2},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_SUPERWIDEBAND, 960, 2},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_WIDEBAND,      960, 2},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_NARROWBAND,    960, 2},
-
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_FULLBAND,      480, 2},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_SUPERWIDEBAND, 480, 2},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_WIDEBAND,      480, 2},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_NARROWBAND,    480, 2},
-
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_FULLBAND,      240, 2},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_SUPERWIDEBAND, 240, 2},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_WIDEBAND,      240, 2},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_NARROWBAND,    240, 2},
-
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_FULLBAND,      120, 2},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_SUPERWIDEBAND, 120, 2},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_WIDEBAND,      120, 2},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_NARROWBAND,    120, 2},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      960, 1},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 960, 1},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      960, 1},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    960, 1},
+
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      480, 1},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 480, 1},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      480, 1},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    480, 1},
+
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      240, 1},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 240, 1},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      240, 1},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    240, 1},
+
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      120, 1},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 120, 1},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      120, 1},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    120, 1},
+
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      960, 2},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 960, 2},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      960, 2},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    960, 2},
+
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      480, 2},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 480, 2},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      480, 2},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    480, 2},
+
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      240, 2},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 240, 2},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      240, 2},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    240, 2},
+
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      120, 2},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 120, 2},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      120, 2},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    120, 2},
 
 };
 
 static const int celt_hq_test[][4] = {
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_FULLBAND,      120, 2},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_FULLBAND,      240, 2},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_FULLBAND,      480, 2},
-      {MODE_CELT_ONLY, OPUS_BANDWIDTH_FULLBAND,      960, 2},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      120, 2},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      240, 2},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      480, 2},
+      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      960, 2},
 };
 
 #if 0 /* This is a hack that replaces the normal encoder/decoder with the multistream version */
-#define OpusEncoder OpusMSEncoder
-#define OpusDecoder OpusMSDecoder
-#define opus_encode24 opus_multistream_encode24
-#define opus_decode24 opus_multistream_decode24
-#define opus_encoder_ctl opus_multistream_encoder_ctl
-#define opus_decoder_ctl opus_multistream_decoder_ctl
-#define opus_encoder_create ms_opus_encoder_create
-#define opus_decoder_create ms_opus_decoder_create
-#define opus_encoder_destroy opus_multistream_encoder_destroy
-#define opus_decoder_destroy opus_multistream_decoder_destroy
-
-static OpusEncoder *ms_opus_encoder_create(opus_int32 Fs, int channels, int application, int *error)
+#define OacEncoder OacMSEncoder
+#define OacDecoder OacMSDecoder
+#define oac_encode24 oac_multistream_encode24
+#define oac_decode24 oac_multistream_decode24
+#define oac_encoder_ctl oac_multistream_encoder_ctl
+#define oac_decoder_ctl oac_multistream_decoder_ctl
+#define oac_encoder_create ms_oac_encoder_create
+#define oac_decoder_create ms_oac_decoder_create
+#define oac_encoder_destroy oac_multistream_encoder_destroy
+#define oac_decoder_destroy oac_multistream_decoder_destroy
+
+static OacEncoder *ms_oac_encoder_create(oac_int32 Fs, int channels, int application, int *error)
 {
    int streams, coupled_streams;
    unsigned char mapping[256];
-   return (OpusEncoder *)opus_multistream_surround_encoder_create(Fs, channels, 1, &streams, &coupled_streams, mapping, application, error);
+   return (OacEncoder *)oac_multistream_surround_encoder_create(Fs, channels, 1, &streams, &coupled_streams, mapping, application, error);
 }
-static OpusDecoder *ms_opus_decoder_create(opus_int32 Fs, int channels, int *error)
+static OacDecoder *ms_oac_decoder_create(oac_int32 Fs, int channels, int *error)
 {
    int streams;
    int coupled_streams;
    unsigned char mapping[256]={0,1};
    streams = 1;
    coupled_streams = channels==2;
-   return (OpusDecoder *)opus_multistream_decoder_create(Fs, channels, streams, coupled_streams, mapping, error);
+   return (OacDecoder *)oac_multistream_decoder_create(Fs, channels, streams, coupled_streams, mapping, error);
 }
 #endif
 
@@ -366,7 +366,7 @@ static int randint(int min, int max, int step)
     return d;
 }
 
-static void new_random_setting(OpusEncoder *enc)
+static void new_random_setting(OacEncoder *enc)
 {
     int bitrate_bps;
     int complexity;
@@ -383,10 +383,10 @@ static void new_random_setting(OpusEncoder *enc)
         printf("changing settings to %d\t%d\t%d\t%d\n", bitrate_bps, complexity, packet_loss_perc, use_vbr);
     }
 
-    opus_encoder_ctl(enc, OPUS_SET_BITRATE(bitrate_bps));
-    opus_encoder_ctl(enc, OPUS_SET_COMPLEXITY(complexity));
-    opus_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(packet_loss_perc));
-    opus_encoder_ctl(enc, OPUS_SET_VBR(use_vbr));
+    oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrate_bps));
+    oac_encoder_ctl(enc, OAC_SET_COMPLEXITY(complexity));
+    oac_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(packet_loss_perc));
+    oac_encoder_ctl(enc, OAC_SET_VBR(use_vbr));
 }
 
 #endif
@@ -397,17 +397,17 @@ int main(int argc, char *argv[])
     char *inFile, *outFile;
     FILE *fin=NULL;
     FILE *fout=NULL;
-    OpusEncoder *enc=NULL;
-    OpusDecoder *dec=NULL;
-    OpusDRED *dred=NULL;
-    OpusDREDDecoder *dred_dec=NULL;
+    OacEncoder *enc=NULL;
+    OacDecoder *dec=NULL;
+    OacDRED *dred=NULL;
+    OacDREDDecoder *dred_dec=NULL;
     int args;
     int len;
     int frame_size, channels;
-    opus_int32 bitrate_bps=0;
+    oac_int32 bitrate_bps=0;
     unsigned char *data = NULL;
     unsigned char *fbytes=NULL;
-    opus_int32 sampling_rate;
+    oac_int32 sampling_rate;
     int use_vbr;
     int max_payload_bytes;
     int complexity;
@@ -421,22 +421,22 @@ int main(int argc, char *argv[])
     float lossgen_perc = -1.f;
     LossGenState lossgen;
 #endif
-    opus_int32 count=0, count_act=0;
+    oac_int32 count=0, count_act=0;
     int k;
-    opus_int32 skip=0;
+    oac_int32 skip=0;
     int format=FORMAT_S16_LE;
     int stop=0;
-    opus_int32 *in=NULL;
-    opus_int32 *out=NULL;
-    int application=OPUS_APPLICATION_AUDIO;
+    oac_int32 *in=NULL;
+    oac_int32 *out=NULL;
+    int application=OAC_APPLICATION_AUDIO;
     double bits=0.0, bits_max=0.0, bits_act=0.0, bits2=0.0, nrg;
     double tot_samples=0;
-    opus_uint64 tot_in, tot_out;
-    int bandwidth=OPUS_AUTO;
+    oac_uint64 tot_in, tot_out;
+    int bandwidth=OAC_AUTO;
     const char *bandwidth_string;
     int lost = 0, lost_prev = 1;
-    opus_uint32 enc_final_range;
-    opus_uint32 dec_final_range;
+    oac_uint32 enc_final_range;
+    oac_uint32 dec_final_range;
     int encode_only=0, decode_only=0;
     int max_frame_size = MAX_SAMPLING_RATE*2;
     size_t num_read;
@@ -452,7 +452,7 @@ int main(int argc, char *argv[])
     int mode_switch_time = 48000;
     int nb_encoded=0;
     int remaining=0;
-    int variable_duration=OPUS_FRAMESIZE_ARG;
+    int variable_duration=OAC_FRAMESIZE_ARG;
     int delayed_decision=0;
     int ret = EXIT_FAILURE;
     int lost_count=0;
@@ -481,7 +481,7 @@ int main(int argc, char *argv[])
     }
 
     tot_in=tot_out=0;
-    fprintf(stderr, "%s\n", opus_get_version_string());
+    fprintf(stderr, "%s\n", oac_get_version_string());
 
     args = 1;
     if (strcmp(argv[args], "-e")==0)
@@ -502,13 +502,13 @@ int main(int argc, char *argv[])
     if (!decode_only)
     {
        if (strcmp(argv[args], "voip")==0)
-          application = OPUS_APPLICATION_VOIP;
+          application = OAC_APPLICATION_VOIP;
        else if (strcmp(argv[args], "restricted-lowdelay")==0)
-          application = OPUS_APPLICATION_RESTRICTED_LOWDELAY;
+          application = OAC_APPLICATION_RESTRICTED_LOWDELAY;
        else if (strcmp(argv[args], "restricted-silk")==0)
-          application = OPUS_APPLICATION_RESTRICTED_SILK;
+          application = OAC_APPLICATION_RESTRICTED_SILK;
        else if (strcmp(argv[args], "restricted-celt")==0)
-          application = OPUS_APPLICATION_RESTRICTED_CELT;
+          application = OAC_APPLICATION_RESTRICTED_CELT;
        else if (strcmp(argv[args], "audio")!=0) {
           fprintf(stderr, "unknown application: %s\n", argv[args]);
           print_usage(argv);
@@ -516,7 +516,7 @@ int main(int argc, char *argv[])
        }
        args++;
     }
-    sampling_rate = (opus_int32)atol(argv[args]);
+    sampling_rate = (oac_int32)atol(argv[args]);
     args++;
 
     if (sampling_rate != 8000 && sampling_rate != 12000
@@ -542,13 +542,13 @@ int main(int argc, char *argv[])
 
     if (channels < 1 || channels > 2)
     {
-        fprintf(stderr, "Opus_demo supports only 1 or 2 channels.\n");
+        fprintf(stderr, "Oac_demo supports only 1 or 2 channels.\n");
         goto failure;
     }
 
     if (!decode_only)
     {
-       bitrate_bps = (opus_int32)atol(argv[args]);
+       bitrate_bps = (oac_int32)atol(argv[args]);
        args++;
     }
 
@@ -558,7 +558,7 @@ int main(int argc, char *argv[])
     complexity = 10;
     dec_complexity = 0;
     use_inbandfec = 0;
-    forcechannels = OPUS_AUTO;
+    forcechannels = OAC_AUTO;
     use_dtx = 0;
     packet_loss_perc = 0;
 
@@ -571,15 +571,15 @@ int main(int argc, char *argv[])
         } else if( strcmp( argv[ args ], "-bandwidth" ) == 0 ) {
             check_encoder_option(decode_only, "-bandwidth");
             if (strcmp(argv[ args + 1 ], "NB")==0)
-                bandwidth = OPUS_BANDWIDTH_NARROWBAND;
+                bandwidth = OAC_BANDWIDTH_NARROWBAND;
             else if (strcmp(argv[ args + 1 ], "MB")==0)
-                bandwidth = OPUS_BANDWIDTH_MEDIUMBAND;
+                bandwidth = OAC_BANDWIDTH_MEDIUMBAND;
             else if (strcmp(argv[ args + 1 ], "WB")==0)
-                bandwidth = OPUS_BANDWIDTH_WIDEBAND;
+                bandwidth = OAC_BANDWIDTH_WIDEBAND;
             else if (strcmp(argv[ args + 1 ], "SWB")==0)
-                bandwidth = OPUS_BANDWIDTH_SUPERWIDEBAND;
+                bandwidth = OAC_BANDWIDTH_SUPERWIDEBAND;
             else if (strcmp(argv[ args + 1 ], "FB")==0)
-                bandwidth = OPUS_BANDWIDTH_FULLBAND;
+                bandwidth = OAC_BANDWIDTH_FULLBAND;
             else {
                 fprintf(stderr, "Unknown bandwidth %s. "
                                 "Supported are NB, MB, WB, SWB, FB.\n",
@@ -796,69 +796,69 @@ int main(int argc, char *argv[])
 
     if (!decode_only)
     {
-       enc = opus_encoder_create(sampling_rate, channels, application, &err);
-       if (err != OPUS_OK)
+       enc = oac_encoder_create(sampling_rate, channels, application, &err);
+       if (err != OAC_OK)
        {
-          fprintf(stderr, "Cannot create encoder: %s\n", opus_strerror(err));
+          fprintf(stderr, "Cannot create encoder: %s\n", oac_strerror(err));
           goto failure;
        }
-       opus_encoder_ctl(enc, OPUS_SET_BITRATE(bitrate_bps));
-       opus_encoder_ctl(enc, OPUS_SET_BANDWIDTH(bandwidth));
-       opus_encoder_ctl(enc, OPUS_SET_VBR(use_vbr));
-       opus_encoder_ctl(enc, OPUS_SET_VBR_CONSTRAINT(cvbr));
-       opus_encoder_ctl(enc, OPUS_SET_COMPLEXITY(complexity));
-       opus_encoder_ctl(enc, OPUS_SET_INBAND_FEC(use_inbandfec));
-       opus_encoder_ctl(enc, OPUS_SET_FORCE_CHANNELS(forcechannels));
-       opus_encoder_ctl(enc, OPUS_SET_DTX(use_dtx));
-       opus_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(packet_loss_perc));
-
-       opus_encoder_ctl(enc, OPUS_GET_LOOKAHEAD(&skip));
-       opus_encoder_ctl(enc, OPUS_SET_LSB_DEPTH((format == FORMAT_S16_LE) ? 16 : 24));
-       opus_encoder_ctl(enc, OPUS_SET_EXPERT_FRAME_DURATION(variable_duration));
+       oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrate_bps));
+       oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(bandwidth));
+       oac_encoder_ctl(enc, OAC_SET_VBR(use_vbr));
+       oac_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(cvbr));
+       oac_encoder_ctl(enc, OAC_SET_COMPLEXITY(complexity));
+       oac_encoder_ctl(enc, OAC_SET_INBAND_FEC(use_inbandfec));
+       oac_encoder_ctl(enc, OAC_SET_FORCE_CHANNELS(forcechannels));
+       oac_encoder_ctl(enc, OAC_SET_DTX(use_dtx));
+       oac_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(packet_loss_perc));
+
+       oac_encoder_ctl(enc, OAC_GET_LOOKAHEAD(&skip));
+       oac_encoder_ctl(enc, OAC_SET_LSB_DEPTH((format == FORMAT_S16_LE) ? 16 : 24));
+       oac_encoder_ctl(enc, OAC_SET_EXPERT_FRAME_DURATION(variable_duration));
        if (dred_duration > 0)
        {
-          opus_encoder_ctl(enc, OPUS_SET_DRED_DURATION(dred_duration));
+          oac_encoder_ctl(enc, OAC_SET_DRED_DURATION(dred_duration));
        }
 #ifdef ENABLE_OSCE_TRAINING_DATA
-       opus_encoder_ctl(enc, OPUS_SET_FORCE_MODE(MODE_SILK_ONLY));
+       oac_encoder_ctl(enc, OAC_SET_FORCE_MODE(MODE_SILK_ONLY));
        srand(0);
 #endif
     }
     if (!encode_only)
     {
-       dec = opus_decoder_create(sampling_rate, channels, &err);
-       if (err != OPUS_OK)
+       dec = oac_decoder_create(sampling_rate, channels, &err);
+       if (err != OAC_OK)
        {
-          fprintf(stderr, "Cannot create decoder: %s\n", opus_strerror(err));
+          fprintf(stderr, "Cannot create decoder: %s\n", oac_strerror(err));
           goto failure;
        }
 #ifdef ENABLE_OSCE_BWE
        if (enable_osce_bwe) {
-            opus_decoder_ctl(dec, OPUS_SET_OSCE_BWE(1));
+            oac_decoder_ctl(dec, OAC_SET_OSCE_BWE(1));
             if (dec_complexity < 4) {dec_complexity = 4;}
        }
 #endif
-       opus_decoder_ctl(dec, OPUS_SET_COMPLEXITY(dec_complexity));
-       opus_decoder_ctl(dec, OPUS_SET_IGNORE_EXTENSIONS(ignore_extensions));
+       oac_decoder_ctl(dec, OAC_SET_COMPLEXITY(dec_complexity));
+       oac_decoder_ctl(dec, OAC_SET_IGNORE_EXTENSIONS(ignore_extensions));
     }
     switch(bandwidth)
     {
-    case OPUS_BANDWIDTH_NARROWBAND:
+    case OAC_BANDWIDTH_NARROWBAND:
          bandwidth_string = "narrowband";
          break;
-    case OPUS_BANDWIDTH_MEDIUMBAND:
+    case OAC_BANDWIDTH_MEDIUMBAND:
          bandwidth_string = "mediumband";
          break;
-    case OPUS_BANDWIDTH_WIDEBAND:
+    case OAC_BANDWIDTH_WIDEBAND:
          bandwidth_string = "wideband";
          break;
-    case OPUS_BANDWIDTH_SUPERWIDEBAND:
+    case OAC_BANDWIDTH_SUPERWIDEBAND:
          bandwidth_string = "superwideband";
          break;
-    case OPUS_BANDWIDTH_FULLBAND:
+    case OAC_BANDWIDTH_FULLBAND:
          bandwidth_string = "fullband";
          break;
-    case OPUS_AUTO:
+    case OAC_AUTO:
          bandwidth_string = "auto bandwidth";
          break;
     default:
@@ -875,40 +875,40 @@ int main(int argc, char *argv[])
                        (long)sampling_rate, bitrate_bps*0.001,
                        bandwidth_string, frame_size);
 
-    in = (opus_int32*)malloc(max_frame_size*channels*sizeof(opus_int32));
-    out = (opus_int32*)malloc(max_frame_size*channels*sizeof(opus_int32));
+    in = (oac_int32*)malloc(max_frame_size*channels*sizeof(oac_int32));
+    out = (oac_int32*)malloc(max_frame_size*channels*sizeof(oac_int32));
     /* We need to allocate for 16-bit PCM data, but we store it as unsigned char. */
-    fbytes = (unsigned char*)malloc(max_frame_size*channels*sizeof(opus_int32));
+    fbytes = (unsigned char*)malloc(max_frame_size*channels*sizeof(oac_int32));
     data = (unsigned char*)calloc(max_payload_bytes,sizeof(unsigned char));
     if(delayed_decision)
     {
        if (frame_size==sampling_rate/400)
-          variable_duration = OPUS_FRAMESIZE_2_5_MS;
+          variable_duration = OAC_FRAMESIZE_2_5_MS;
        else if (frame_size==sampling_rate/200)
-          variable_duration = OPUS_FRAMESIZE_5_MS;
+          variable_duration = OAC_FRAMESIZE_5_MS;
        else if (frame_size==sampling_rate/100)
-          variable_duration = OPUS_FRAMESIZE_10_MS;
+          variable_duration = OAC_FRAMESIZE_10_MS;
        else if (frame_size==sampling_rate/50)
-          variable_duration = OPUS_FRAMESIZE_20_MS;
+          variable_duration = OAC_FRAMESIZE_20_MS;
        else if (frame_size==sampling_rate/25)
-          variable_duration = OPUS_FRAMESIZE_40_MS;
+          variable_duration = OAC_FRAMESIZE_40_MS;
        else if (frame_size==3*sampling_rate/50)
-          variable_duration = OPUS_FRAMESIZE_60_MS;
+          variable_duration = OAC_FRAMESIZE_60_MS;
        else if (frame_size==4*sampling_rate/50)
-          variable_duration = OPUS_FRAMESIZE_80_MS;
+          variable_duration = OAC_FRAMESIZE_80_MS;
        else if (frame_size==5*sampling_rate/50)
-          variable_duration = OPUS_FRAMESIZE_100_MS;
+          variable_duration = OAC_FRAMESIZE_100_MS;
        else
-          variable_duration = OPUS_FRAMESIZE_120_MS;
-       opus_encoder_ctl(enc, OPUS_SET_EXPERT_FRAME_DURATION(variable_duration));
+          variable_duration = OAC_FRAMESIZE_120_MS;
+       oac_encoder_ctl(enc, OAC_SET_EXPERT_FRAME_DURATION(variable_duration));
        frame_size = 2*sampling_rate;
     }
-    dred_dec = opus_dred_decoder_create(&err);
-    dred = opus_dred_alloc(&err);
+    dred_dec = oac_dred_decoder_create(&err);
+    dred = oac_dred_alloc(&err);
 #ifdef USE_WEIGHTS_FILE
-    if (enc) opus_encoder_ctl(enc, OPUS_SET_DNN_BLOB(blob_data, blob_len));
-    if (dec) opus_decoder_ctl(dec, OPUS_SET_DNN_BLOB(blob_data, blob_len));
-    if (dred_dec) opus_dred_decoder_ctl(dred_dec, OPUS_SET_DNN_BLOB(blob_data, blob_len));
+    if (enc) oac_encoder_ctl(enc, OAC_SET_DNN_BLOB(blob_data, blob_len));
+    if (dec) oac_decoder_ctl(dec, OAC_SET_DNN_BLOB(blob_data, blob_len));
+    if (dred_dec) oac_dred_decoder_ctl(dred_dec, OAC_SET_DNN_BLOB(blob_data, blob_len));
 #endif
     while (!stop)
     {
@@ -932,7 +932,7 @@ int main(int argc, char *argv[])
                newsize*=2;
             if (newsize < sampling_rate/100 && frame_size >= sampling_rate/100)
             {
-                opus_encoder_ctl(enc, OPUS_SET_FORCE_MODE(MODE_CELT_ONLY));
+                oac_encoder_ctl(enc, OAC_SET_FORCE_MODE(MODE_CELT_ONLY));
                 delayed_celt=1;
             } else {
                 frame_size = newsize;
@@ -940,7 +940,7 @@ int main(int argc, char *argv[])
         }
         if (random_fec && rand()%30==0)
         {
-           opus_encoder_ctl(enc, OPUS_SET_INBAND_FEC(rand()%4==0));
+           oac_encoder_ctl(enc, OAC_SET_INBAND_FEC(rand()%4==0));
         }
         if (decode_only)
         {
@@ -970,9 +970,9 @@ int main(int argc, char *argv[])
             int i;
             if (mode_list!=NULL)
             {
-                opus_encoder_ctl(enc, OPUS_SET_BANDWIDTH(mode_list[curr_mode][1]));
-                opus_encoder_ctl(enc, OPUS_SET_FORCE_MODE(mode_list[curr_mode][0]));
-                opus_encoder_ctl(enc, OPUS_SET_FORCE_CHANNELS(mode_list[curr_mode][3]));
+                oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(mode_list[curr_mode][1]));
+                oac_encoder_ctl(enc, OAC_SET_FORCE_MODE(mode_list[curr_mode][0]));
+                oac_encoder_ctl(enc, OAC_SET_FORCE_CHANNELS(mode_list[curr_mode][3]));
                 frame_size = mode_list[curr_mode][2]*sampling_rate/48000;
             }
 #ifdef ENABLE_OSCE_TRAINING_DATA
@@ -990,7 +990,7 @@ int main(int argc, char *argv[])
             if (format == FORMAT_S16_LE) {
                for(i=0;i<frame_size*channels;i++)
                {
-                  opus_int32 s;
+                  oac_int32 s;
                   s=fbytes[2*i+1]<<8|fbytes[2*i];
                   s=((s&0xFFFF)^0x8000)-0x8000;
                   in[i]=s*256;
@@ -998,7 +998,7 @@ int main(int argc, char *argv[])
             } else if (format == FORMAT_S24_LE) {
                for(i=0;i<frame_size*channels;i++)
                {
-                  opus_int32 s;
+                  oac_int32 s;
                   s=fbytes[3*i+2]<<16|fbytes[3*i+1]<<8|fbytes[3*i];
                   s=((s&0xFFFFFF)^0x800000)-0x800000;
                   in[i]=s;
@@ -1007,7 +1007,7 @@ int main(int argc, char *argv[])
                for(i=0;i<frame_size*channels;i++)
                {
                   float_bits s;
-                  s.i=(opus_uint32)fbytes[4*i+3]<<24|fbytes[4*i+2]<<16|fbytes[4*i+1]<<8|fbytes[4*i];
+                  s.i=(oac_uint32)fbytes[4*i+3]<<24|fbytes[4*i+2]<<16|fbytes[4*i+1]<<8|fbytes[4*i];
                   in[i]=(int)floor(.5 + s.f*8388608);
                }
             }
@@ -1018,13 +1018,13 @@ int main(int argc, char *argv[])
                 if (encode_only || decode_only)
                    stop = 1;
             }
-            len = opus_encode24(enc, in, frame_size, data, max_payload_bytes);
+            len = oac_encode24(enc, in, frame_size, data, max_payload_bytes);
             if (len < 0)
             {
-                fprintf (stderr, "opus_encode() returned %d\n", len);
+                fprintf (stderr, "oac_encode() returned %d\n", len);
                 goto failure;
             }
-            nb_encoded = opus_packet_get_samples_per_frame(data, sampling_rate)*opus_packet_get_nb_frames(data, len);
+            nb_encoded = oac_packet_get_samples_per_frame(data, sampling_rate)*oac_packet_get_nb_frames(data, len);
             remaining = frame_size-nb_encoded;
             for(i=0;i<remaining*channels;i++)
                in[i] = in[nb_encoded*channels+i];
@@ -1041,9 +1041,9 @@ int main(int argc, char *argv[])
                /* safety */
                if (bitrate_bps<1000)
                   bitrate_bps = 1000;
-               opus_encoder_ctl(enc, OPUS_SET_BITRATE(bitrate_bps));
+               oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrate_bps));
             }
-            opus_encoder_ctl(enc, OPUS_GET_FINAL_RANGE(&enc_final_range));
+            oac_encoder_ctl(enc, OAC_GET_FINAL_RANGE(&enc_final_range));
             curr_mode_count += frame_size;
             if (curr_mode_count > mode_switch_time && curr_mode < nb_modes_in_list-1)
             {
@@ -1056,9 +1056,9 @@ int main(int argc, char *argv[])
         if (len<1275)
         {
            int new_len = len+rand()%(max_payload_bytes-len);
-           if ((err = opus_packet_pad(data, len, new_len)) != OPUS_OK)
+           if ((err = oac_packet_pad(data, len, new_len)) != OAC_OK)
            {
-              fprintf(stderr, "padding failed: %s\n", opus_strerror(err));
+              fprintf(stderr, "padding failed: %s\n", oac_strerror(err));
               goto failure;
            }
            len = new_len;
@@ -1115,42 +1115,42 @@ int main(int argc, char *argv[])
             if (run_decoder)
                 run_decoder += lost_count;
             if (!lost && lost_count > 0) {
-                opus_int32 output_samples=0;
-                opus_decoder_ctl(dec, OPUS_GET_LAST_PACKET_DURATION(&output_samples));
+                oac_int32 output_samples=0;
+                oac_decoder_ctl(dec, OAC_GET_LAST_PACKET_DURATION(&output_samples));
                 dred_input = lost_count*output_samples;
                 /* Only decode the amount we need to fill in the gap. */
-                ret = opus_dred_parse(dred_dec, dred, data, len, IMIN(sampling_rate, IMAX(0, dred_input)), sampling_rate, &dred_end, 0);
+                ret = oac_dred_parse(dred_dec, dred, data, len, IMIN(sampling_rate, IMAX(0, dred_input)), sampling_rate, &dred_end, 0);
                 dred_input = ret > 0 ? ret : 0;
             }
             /* FIXME: Figure out how to trigger the decoder when the last packet of the file is lost. */
             for (fr=0;fr<run_decoder;fr++) {
-                opus_int32 output_samples=0;
-                if (fr == lost_count-1 && opus_packet_has_lbrr(data, len)) {
-                   opus_decoder_ctl(dec, OPUS_GET_LAST_PACKET_DURATION(&output_samples));
-                   output_samples = opus_decode24(dec, data, len, out, output_samples, 1);
+                oac_int32 output_samples=0;
+                if (fr == lost_count-1 && oac_packet_has_lbrr(data, len)) {
+                   oac_decoder_ctl(dec, OAC_GET_LAST_PACKET_DURATION(&output_samples));
+                   output_samples = oac_decode24(dec, data, len, out, output_samples, 1);
                 } else if (fr < lost_count) {
-                   opus_decoder_ctl(dec, OPUS_GET_LAST_PACKET_DURATION(&output_samples));
+                   oac_decoder_ctl(dec, OAC_GET_LAST_PACKET_DURATION(&output_samples));
                    if (dred_input > 0)
-                      output_samples = opus_decoder_dred_decode24(dec, dred, (lost_count-fr)*output_samples, out, output_samples);
+                      output_samples = oac_decoder_dred_decode24(dec, dred, (lost_count-fr)*output_samples, out, output_samples);
                    else
-                      output_samples = opus_decode24(dec, NULL, 0, out, output_samples, 0);
+                      output_samples = oac_decode24(dec, NULL, 0, out, output_samples, 0);
                 } else {
                    output_samples = max_frame_size;
-                   output_samples = opus_decode24(dec, data, len, out, output_samples, 0);
+                   output_samples = oac_decode24(dec, data, len, out, output_samples, 0);
                 }
                 if (output_samples>0)
                 {
                     if (!decode_only && tot_out + output_samples > tot_in)
                     {
                        stop=1;
-                       output_samples = (opus_int32)(tot_in - tot_out);
+                       output_samples = (oac_int32)(tot_in - tot_out);
                     }
                     if (output_samples>skip) {
                        int i;
                        if (format == FORMAT_S16_LE) {
                           for(i=0;i<(output_samples-skip)*channels;i++)
                           {
-                             opus_int32 s;
+                             oac_int32 s;
                              s=out[i+(skip*channels)];
                              if (s > 0x007fff00) s = 0x007fff00;
                              if (s < -0x007fff00) s = -0x007fff00;
@@ -1161,7 +1161,7 @@ int main(int argc, char *argv[])
                        } else if (format == FORMAT_S24_LE) {
                           for(i=0;i<(output_samples-skip)*channels;i++)
                           {
-                             opus_int32 s;
+                             oac_int32 s;
                              s=out[i+(skip*channels)];
                              if (s > 0x007fffff) s = 0x007fffff;
                              if (s < -0x007fffff) s = -0x007fffff;
@@ -1190,14 +1190,14 @@ int main(int argc, char *argv[])
                     else skip = 0;
                 } else {
                    fprintf(stderr, "error decoding frame: %s\n",
-                                   opus_strerror(output_samples));
+                                   oac_strerror(output_samples));
                 }
                 tot_samples += output_samples;
             }
         }
 
         if (!encode_only)
-           opus_decoder_ctl(dec, OPUS_GET_FINAL_RANGE(&dec_final_range));
+           oac_decoder_ctl(dec, OAC_GET_FINAL_RANGE(&dec_final_range));
         /* compare final range encoder rng values of encoder and decoder */
         if( enc_final_range!=0  && !encode_only
          && !lost && !lost_prev
@@ -1257,13 +1257,13 @@ int main(int argc, char *argv[])
     } else {
        fprintf(stderr, "bitrate statistics are undefined\n");
     }
-    silk_TimerSave("opus_timing.txt");
+    silk_TimerSave("oac_timing.txt");
     ret = EXIT_SUCCESS;
 failure:
-    opus_encoder_destroy(enc);
-    opus_decoder_destroy(dec);
-    opus_dred_free(dred);
-    opus_dred_decoder_destroy(dred_dec);
+    oac_encoder_destroy(enc);
+    oac_decoder_destroy(dec);
+    oac_dred_free(dred);
+    oac_dred_decoder_destroy(dred_dec);
     free(data);
     if (fin)
         fclose(fin);
diff --git a/src/opus_encoder.c b/src/oac_encoder.c
similarity index 73%
rename from src/opus_encoder.c
rename to src/oac_encoder.c
index 95f392378..94ce04c35 100644
--- a/src/opus_encoder.c
+++ b/src/oac_encoder.c
@@ -36,10 +36,10 @@
 #include "API.h"
 #include "stack_alloc.h"
 #include "float_cast.h"
-#include "opus.h"
+#include "oac.h"
 #include "arch.h"
 #include "pitch.h"
-#include "opus_private.h"
+#include "oac_private.h"
 #include "os_support.h"
 #include "cpu_support.h"
 #include "analysis.h"
@@ -68,12 +68,12 @@
 #define PSEUDO_SNR_THRESHOLD 316.23f    /* 10^(25/10) */
 
 typedef struct {
-   opus_val32 XX, XY, YY;
-   opus_val16 smoothed_width;
-   opus_val16 max_follower;
+   oac_val32 XX, XY, YY;
+   oac_val16 smoothed_width;
+   oac_val16 max_follower;
 } StereoWidthState;
 
-struct OpusEncoder {
+struct OacEncoder {
     int          celt_enc_offset;
     int          silk_enc_offset;
     silk_EncControlStruct silk_mode;
@@ -89,12 +89,12 @@ struct OpusEncoder {
     int          max_bandwidth;
     int          user_forced_mode;
     int          voice_ratio;
-    opus_int32   Fs;
+    oac_int32   Fs;
     int          use_vbr;
     int          vbr_constraint;
     int          variable_duration;
-    opus_int32   bitrate_bps;
-    opus_int32   user_bitrate_bps;
+    oac_int32   bitrate_bps;
+    oac_int32   user_bitrate_bps;
     int          lsb_depth;
     int          encoder_buffer;
     int          lfe;
@@ -105,12 +105,12 @@ struct OpusEncoder {
     TonalityAnalysisState analysis;
 #endif
 
-#define OPUS_ENCODER_RESET_START stream_channels
+#define OAC_ENCODER_RESET_START stream_channels
     int          stream_channels;
-    opus_int16   hybrid_stereo_width_Q14;
-    opus_int32   variable_HP_smth2_Q15;
-    opus_val16   prev_HB_gain;
-    opus_val32   hp_mem[4];
+    oac_int16   hybrid_stereo_width_Q14;
+    oac_int32   variable_HP_smth2_Q15;
+    oac_val16   prev_HB_gain;
+    oac_val32   hp_mem[4];
     int          mode;
     int          prev_mode;
     int          prev_channels;
@@ -127,7 +127,7 @@ struct OpusEncoder {
     int          detected_bandwidth;
 #endif
     int          nb_no_activity_ms_Q1;
-    opus_val32   peak_signal_energy;
+    oac_val32   peak_signal_energy;
 #ifdef ENABLE_DRED
     int          dred_duration;
     int          dred_q0;
@@ -137,50 +137,50 @@ struct OpusEncoder {
     unsigned char activity_mem[DRED_MAX_FRAMES*4]; /* 2.5ms resolution*/
 #endif
     int          nonfinal_frame; /* current frame is not the final in a packet */
-    opus_uint32  rangeFinal;
+    oac_uint32  rangeFinal;
     /* Needs to be the last field because it may be partially or completely omitted. */
-    opus_res     delay_buffer[MAX_ENCODER_BUFFER*2];
+    oac_res     delay_buffer[MAX_ENCODER_BUFFER*2];
 };
 
 /* Transition tables for the voice and music. First column is the
    middle (memoriless) threshold. The second column is the hysteresis
    (difference with the middle) */
-static const opus_int32 mono_voice_bandwidth_thresholds[8] = {
+static const oac_int32 mono_voice_bandwidth_thresholds[8] = {
          9000,  700, /* NB<->MB */
          9000,  700, /* MB<->WB */
         13500, 1000, /* WB<->SWB */
         14000, 2000, /* SWB<->FB */
 };
-static const opus_int32 mono_music_bandwidth_thresholds[8] = {
+static const oac_int32 mono_music_bandwidth_thresholds[8] = {
          9000,  700, /* NB<->MB */
          9000,  700, /* MB<->WB */
         11000, 1000, /* WB<->SWB */
         12000, 2000, /* SWB<->FB */
 };
-static const opus_int32 stereo_voice_bandwidth_thresholds[8] = {
+static const oac_int32 stereo_voice_bandwidth_thresholds[8] = {
          9000,  700, /* NB<->MB */
          9000,  700, /* MB<->WB */
         13500, 1000, /* WB<->SWB */
         14000, 2000, /* SWB<->FB */
 };
-static const opus_int32 stereo_music_bandwidth_thresholds[8] = {
+static const oac_int32 stereo_music_bandwidth_thresholds[8] = {
          9000,  700, /* NB<->MB */
          9000,  700, /* MB<->WB */
         11000, 1000, /* WB<->SWB */
         12000, 2000, /* SWB<->FB */
 };
 /* Threshold bit-rates for switching between mono and stereo */
-static const opus_int32 stereo_voice_threshold = 19000;
-static const opus_int32 stereo_music_threshold = 17000;
+static const oac_int32 stereo_voice_threshold = 19000;
+static const oac_int32 stereo_music_threshold = 17000;
 
 /* Threshold bit-rate for switching between SILK/hybrid and CELT-only */
-static const opus_int32 mode_thresholds[2][2] = {
+static const oac_int32 mode_thresholds[2][2] = {
       /* voice */ /* music */
       {  64000,      10000}, /* mono */
       {  44000,      10000}, /* stereo */
 };
 
-static const opus_int32 fec_thresholds[] = {
+static const oac_int32 fec_thresholds[] = {
         12000, 1000, /* NB */
         14000, 1000, /* MB */
         16000, 1000, /* WB */
@@ -188,17 +188,17 @@ static const opus_int32 fec_thresholds[] = {
         22000, 1000, /* FB */
 };
 
-int opus_encoder_get_size(int channels)
+int oac_encoder_get_size(int channels)
 {
     int ret;
-    ret = opus_encoder_init(NULL, 48000, channels, OPUS_APPLICATION_AUDIO);
+    ret = oac_encoder_init(NULL, 48000, channels, OAC_APPLICATION_AUDIO);
     if (ret < 0)
         return 0;
     else
         return ret;
 }
 
-int opus_encoder_init(OpusEncoder* st, opus_int32 Fs, int channels, int application)
+int oac_encoder_init(OacEncoder* st, oac_int32 Fs, int channels, int application)
 {
     void *silk_enc=NULL;
     CELTEncoder *celt_enc=NULL;
@@ -212,31 +212,31 @@ int opus_encoder_init(OpusEncoder* st, opus_int32 Fs, int channels, int applicat
          &&Fs!=96000
 #endif
          )||(channels!=1&&channels!=2)||
-        (application != OPUS_APPLICATION_VOIP && application != OPUS_APPLICATION_AUDIO
-        && application != OPUS_APPLICATION_RESTRICTED_LOWDELAY
-        && application != OPUS_APPLICATION_RESTRICTED_SILK
-        && application != OPUS_APPLICATION_RESTRICTED_CELT))
-        return OPUS_BAD_ARG;
+        (application != OAC_APPLICATION_VOIP && application != OAC_APPLICATION_AUDIO
+        && application != OAC_APPLICATION_RESTRICTED_LOWDELAY
+        && application != OAC_APPLICATION_RESTRICTED_SILK
+        && application != OAC_APPLICATION_RESTRICTED_CELT))
+        return OAC_BAD_ARG;
 
     /* Create SILK encoder */
     ret = silk_Get_Encoder_Size( &silkEncSizeBytes, channels );
     if (ret)
-        return OPUS_BAD_ARG;
+        return OAC_BAD_ARG;
     silkEncSizeBytes = align(silkEncSizeBytes);
-    if (application == OPUS_APPLICATION_RESTRICTED_CELT)
+    if (application == OAC_APPLICATION_RESTRICTED_CELT)
         silkEncSizeBytes = 0;
-    if (application != OPUS_APPLICATION_RESTRICTED_SILK)
+    if (application != OAC_APPLICATION_RESTRICTED_SILK)
         celtEncSizeBytes = celt_encoder_get_size(channels);
-    base_size = align(sizeof(OpusEncoder));
-    if (application == OPUS_APPLICATION_RESTRICTED_SILK || application == OPUS_APPLICATION_RESTRICTED_CELT) {
-       base_size = align(base_size - MAX_ENCODER_BUFFER*2*sizeof(opus_res));
+    base_size = align(sizeof(OacEncoder));
+    if (application == OAC_APPLICATION_RESTRICTED_SILK || application == OAC_APPLICATION_RESTRICTED_CELT) {
+       base_size = align(base_size - MAX_ENCODER_BUFFER*2*sizeof(oac_res));
     } else if (channels==1)
-       base_size = align(base_size - MAX_ENCODER_BUFFER*sizeof(opus_res));
+       base_size = align(base_size - MAX_ENCODER_BUFFER*sizeof(oac_res));
     tot_size = base_size+silkEncSizeBytes+celtEncSizeBytes;
     if (st == NULL) {
         return tot_size;
     }
-    OPUS_CLEAR((char*)st, tot_size);
+    OAC_CLEAR((char*)st, tot_size);
     st->silk_enc_offset = base_size;
     st->celt_enc_offset = st->silk_enc_offset+silkEncSizeBytes;
 
@@ -244,14 +244,14 @@ int opus_encoder_init(OpusEncoder* st, opus_int32 Fs, int channels, int applicat
 
     st->Fs = Fs;
 
-    st->arch = opus_select_arch();
+    st->arch = oac_select_arch();
 
-    if (application != OPUS_APPLICATION_RESTRICTED_CELT)
+    if (application != OAC_APPLICATION_RESTRICTED_CELT)
     {
        silk_enc = (char*)st+st->silk_enc_offset;
        ret = silk_InitEncoder( silk_enc, st->channels, st->arch, &st->silk_mode );
     }
-    if(ret)return OPUS_INTERNAL_ERROR;
+    if(ret)return OAC_INTERNAL_ERROR;
 
     /* default SILK parameters */
     st->silk_mode.nChannelsAPI              = channels;
@@ -272,13 +272,13 @@ int opus_encoder_init(OpusEncoder* st, opus_int32 Fs, int channels, int applicat
 
     /* Create CELT encoder */
     /* Initialize CELT encoder */
-    if (application != OPUS_APPLICATION_RESTRICTED_SILK)
+    if (application != OAC_APPLICATION_RESTRICTED_SILK)
     {
        celt_enc = (CELTEncoder*)((char*)st+st->celt_enc_offset);
        err = celt_encoder_init(celt_enc, Fs, channels, st->arch);
-       if(err!=OPUS_OK)return OPUS_INTERNAL_ERROR;
+       if(err!=OAC_OK)return OAC_INTERNAL_ERROR;
        celt_encoder_ctl(celt_enc, CELT_SET_SIGNALLING(0));
-       celt_encoder_ctl(celt_enc, OPUS_SET_COMPLEXITY(st->silk_mode.complexity));
+       celt_encoder_ctl(celt_enc, OAC_SET_COMPLEXITY(st->silk_mode.complexity));
     }
 
 #ifdef ENABLE_DRED
@@ -289,21 +289,21 @@ int opus_encoder_init(OpusEncoder* st, opus_int32 Fs, int channels, int applicat
     st->use_vbr = 1;
     /* Makes constrained VBR the default (safer for real-time use) */
     st->vbr_constraint = 1;
-    st->user_bitrate_bps = OPUS_AUTO;
+    st->user_bitrate_bps = OAC_AUTO;
     st->bitrate_bps = 3000+Fs*channels;
     st->application = application;
-    st->signal_type = OPUS_AUTO;
-    st->user_bandwidth = OPUS_AUTO;
-    st->max_bandwidth = OPUS_BANDWIDTH_FULLBAND;
-    st->force_channels = OPUS_AUTO;
-    st->user_forced_mode = OPUS_AUTO;
+    st->signal_type = OAC_AUTO;
+    st->user_bandwidth = OAC_AUTO;
+    st->max_bandwidth = OAC_BANDWIDTH_FULLBAND;
+    st->force_channels = OAC_AUTO;
+    st->user_forced_mode = OAC_AUTO;
     st->voice_ratio = -1;
-    if (application != OPUS_APPLICATION_RESTRICTED_CELT && application != OPUS_APPLICATION_RESTRICTED_SILK)
+    if (application != OAC_APPLICATION_RESTRICTED_CELT && application != OAC_APPLICATION_RESTRICTED_SILK)
        st->encoder_buffer = st->Fs/100;
     else
        st->encoder_buffer = 0;
     st->lsb_depth = 24;
-    st->variable_duration = OPUS_FRAMESIZE_ARG;
+    st->variable_duration = OAC_FRAMESIZE_ARG;
 
     /* Delay compensation of 4 ms (2.5 ms for SILK's extra look-ahead
        + 1.5 ms for SILK resamplers and stereo prediction) */
@@ -314,14 +314,14 @@ int opus_encoder_init(OpusEncoder* st, opus_int32 Fs, int channels, int applicat
     st->variable_HP_smth2_Q15 = silk_LSHIFT( silk_lin2log( VARIABLE_HP_MIN_CUTOFF_HZ ), 8 );
     st->first = 1;
     st->mode = MODE_HYBRID;
-    st->bandwidth = OPUS_BANDWIDTH_FULLBAND;
+    st->bandwidth = OAC_BANDWIDTH_FULLBAND;
 
 #ifndef DISABLE_FLOAT_API
     tonality_analysis_init(&st->analysis, st->Fs);
     st->analysis.application = st->application;
 #endif
 
-    return OPUS_OK;
+    return OAC_OK;
 }
 
 static unsigned char gen_toc(int mode, int framerate, int bandwidth, int channels)
@@ -336,11 +336,11 @@ static unsigned char gen_toc(int mode, int framerate, int bandwidth, int channel
    }
    if (mode == MODE_SILK_ONLY)
    {
-       toc = (bandwidth-OPUS_BANDWIDTH_NARROWBAND)<<5;
+       toc = (bandwidth-OAC_BANDWIDTH_NARROWBAND)<<5;
        toc |= (period-2)<<3;
    } else if (mode == MODE_CELT_ONLY)
    {
-       int tmp = bandwidth-OPUS_BANDWIDTH_MEDIUMBAND;
+       int tmp = bandwidth-OAC_BANDWIDTH_MEDIUMBAND;
        if (tmp < 0)
            tmp = 0;
        toc = 0x80;
@@ -349,7 +349,7 @@ static unsigned char gen_toc(int mode, int framerate, int bandwidth, int channel
    } else /* Hybrid */
    {
        toc = 0x60;
-       toc |= (bandwidth-OPUS_BANDWIDTH_SUPERWIDEBAND)<<4;
+       toc |= (bandwidth-OAC_BANDWIDTH_SUPERWIDEBAND)<<4;
        toc |= (period-2)<<3;
    }
    toc |= (channels==2)<<2;
@@ -359,18 +359,18 @@ static unsigned char gen_toc(int mode, int framerate, int bandwidth, int channel
 #ifdef FIXED_POINT
 /* Second order ARMA filter, alternative implementation */
 void silk_biquad_res(
-    const opus_res              *in,                /* I     input signal                                               */
-    const opus_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
-    const opus_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
-    opus_int32                  *S,                 /* I/O   State vector [2]                                           */
-    opus_res                    *out,               /* O     output signal                                              */
-    const opus_int32            len,                /* I     signal length (must be even)                               */
+    const oac_res              *in,                /* I     input signal                                               */
+    const oac_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
+    const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
+    oac_int32                  *S,                 /* I/O   State vector [2]                                           */
+    oac_res                    *out,               /* O     output signal                                              */
+    const oac_int32            len,                /* I     signal length (must be even)                               */
     int stride
 )
 {
     /* DIRECT FORM II TRANSPOSED (uses 2 element state vector) */
-    opus_int   k;
-    opus_int32 inval, A0_U_Q28, A0_L_Q28, A1_U_Q28, A1_L_Q28, out32_Q14;
+    oac_int   k;
+    oac_int32 inval, A0_U_Q28, A0_L_Q28, A1_U_Q28, A1_L_Q28, out32_Q14;
 
     /* Negate A_Q28 values and split in two parts */
     A0_L_Q28 = ( -A_Q28[ 0 ] ) & 0x00003FFF;        /* lower part */
@@ -397,26 +397,26 @@ void silk_biquad_res(
 }
 #else
 static void silk_biquad_res(
-    const opus_res        *in,            /* I:    Input signal                   */
-    const opus_int32      *B_Q28,         /* I:    MA coefficients [3]            */
-    const opus_int32      *A_Q28,         /* I:    AR coefficients [2]            */
-    opus_val32            *S,             /* I/O:  State vector [2]               */
-    opus_res              *out,           /* O:    Output signal                  */
-    const opus_int32      len,            /* I:    Signal length (must be even)   */
+    const oac_res        *in,            /* I:    Input signal                   */
+    const oac_int32      *B_Q28,         /* I:    MA coefficients [3]            */
+    const oac_int32      *A_Q28,         /* I:    AR coefficients [2]            */
+    oac_val32            *S,             /* I/O:  State vector [2]               */
+    oac_res              *out,           /* O:    Output signal                  */
+    const oac_int32      len,            /* I:    Signal length (must be even)   */
     int stride
 )
 {
     /* DIRECT FORM II TRANSPOSED (uses 2 element state vector) */
-    opus_int   k;
-    opus_val32 vout;
-    opus_val32 inval;
-    opus_val32 A[2], B[3];
+    oac_int   k;
+    oac_val32 vout;
+    oac_val32 inval;
+    oac_val32 A[2], B[3];
 
-    A[0] = (opus_val32)(A_Q28[0] * (1.f/((opus_int32)1<<28)));
-    A[1] = (opus_val32)(A_Q28[1] * (1.f/((opus_int32)1<<28)));
-    B[0] = (opus_val32)(B_Q28[0] * (1.f/((opus_int32)1<<28)));
-    B[1] = (opus_val32)(B_Q28[1] * (1.f/((opus_int32)1<<28)));
-    B[2] = (opus_val32)(B_Q28[2] * (1.f/((opus_int32)1<<28)));
+    A[0] = (oac_val32)(A_Q28[0] * (1.f/((oac_int32)1<<28)));
+    A[1] = (oac_val32)(A_Q28[1] * (1.f/((oac_int32)1<<28)));
+    B[0] = (oac_val32)(B_Q28[0] * (1.f/((oac_int32)1<<28)));
+    B[1] = (oac_val32)(B_Q28[1] * (1.f/((oac_int32)1<<28)));
+    B[2] = (oac_val32)(B_Q28[2] * (1.f/((oac_int32)1<<28)));
 
     /* Negate A_Q28 values and split in two parts */
 
@@ -435,10 +435,10 @@ static void silk_biquad_res(
 }
 #endif
 
-static void hp_cutoff(const opus_res *in, opus_int32 cutoff_Hz, opus_res *out, opus_val32 *hp_mem, int len, int channels, opus_int32 Fs, int arch)
+static void hp_cutoff(const oac_res *in, oac_int32 cutoff_Hz, oac_res *out, oac_val32 *hp_mem, int len, int channels, oac_int32 Fs, int arch)
 {
-   opus_int32 B_Q28[ 3 ], A_Q28[ 2 ];
-   opus_int32 Fc_Q19, r_Q28, r_Q22;
+   oac_int32 B_Q28[ 3 ], A_Q28[ 2 ];
+   oac_int32 Fc_Q19, r_Q28, r_Q22;
    (void)arch;
 
    silk_assert( cutoff_Hz <= silk_int32_MAX / SILK_FIX_CONST( 1.5 * 3.14159 / 1000, 19 ) );
@@ -465,7 +465,7 @@ static void hp_cutoff(const opus_res *in, opus_int32 cutoff_Hz, opus_res *out, o
 }
 
 #ifdef FIXED_POINT
-static void dc_reject(const opus_res *in, opus_int32 cutoff_Hz, opus_res *out, opus_val32 *hp_mem, int len, int channels, opus_int32 Fs)
+static void dc_reject(const oac_res *in, oac_int32 cutoff_Hz, oac_res *out, oac_val32 *hp_mem, int len, int channels, oac_int32 Fs)
 {
    int c, i;
    int shift;
@@ -476,9 +476,9 @@ static void dc_reject(const opus_res *in, opus_int32 cutoff_Hz, opus_res *out, o
    {
       for (i=0;i<len;i++)
       {
-         opus_val32 x, y;
+         oac_val32 x, y;
          /* Saturate at +6 dBFS to avoid any wrap-around. */
-         x = SATURATE((opus_val32)in[channels*i+c], (1<<16<<RES_SHIFT)-1);
+         x = SATURATE((oac_val32)in[channels*i+c], (1<<16<<RES_SHIFT)-1);
          x = SHL32(x, 14-RES_SHIFT);
          y = x-hp_mem[2*c];
          hp_mem[2*c] = hp_mem[2*c] + PSHR32(x - hp_mem[2*c], shift);
@@ -489,7 +489,7 @@ static void dc_reject(const opus_res *in, opus_int32 cutoff_Hz, opus_res *out, o
 }
 
 #else
-static void dc_reject(const opus_val16 *in, opus_int32 cutoff_Hz, opus_val16 *out, opus_val32 *hp_mem, int len, int channels, opus_int32 Fs)
+static void dc_reject(const oac_val16 *in, oac_int32 cutoff_Hz, oac_val16 *out, oac_val32 *hp_mem, int len, int channels, oac_int32 Fs)
 {
    int i;
    float coef, coef2;
@@ -502,7 +502,7 @@ static void dc_reject(const opus_val16 *in, opus_int32 cutoff_Hz, opus_val16 *ou
       m2 = hp_mem[2];
       for (i=0;i<len;i++)
       {
-         opus_val32 x0, x1, out0, out1;
+         oac_val32 x0, x1, out0, out1;
          x0 = in[2*i+0];
          x1 = in[2*i+1];
          out0 = x0-m0;
@@ -519,7 +519,7 @@ static void dc_reject(const opus_val16 *in, opus_int32 cutoff_Hz, opus_val16 *ou
       m0 = hp_mem[0];
       for (i=0;i<len;i++)
       {
-         opus_val32 x, y;
+         oac_val32 x, y;
          x = in[i];
          y = x-m0;
          m0 = coef*x + VERY_SMALL + coef2*m0;
@@ -530,8 +530,8 @@ static void dc_reject(const opus_val16 *in, opus_int32 cutoff_Hz, opus_val16 *ou
 }
 #endif
 
-static void stereo_fade(const opus_res *in, opus_res *out, opus_val16 g1, opus_val16 g2,
-        int overlap48, int frame_size, int channels, const celt_coef *window, opus_int32 Fs)
+static void stereo_fade(const oac_res *in, oac_res *out, oac_val16 g1, oac_val16 g2,
+        int overlap48, int frame_size, int channels, const celt_coef *window, oac_int32 Fs)
 {
     int i;
     int overlap;
@@ -542,29 +542,29 @@ static void stereo_fade(const opus_res *in, opus_res *out, opus_val16 g1, opus_v
     g2 = Q15ONE-g2;
     for (i=0;i<overlap;i++)
     {
-       opus_val32 diff;
-       opus_val16 g, w;
+       oac_val32 diff;
+       oac_val16 g, w;
        w = COEF2VAL16(window[i*inc]);
        w = MULT16_16_Q15(w, w);
        g = SHR32(MAC16_16(MULT16_16(w,g2),
              Q15ONE-w, g1), 15);
-       diff = HALF32((opus_val32)in[i*channels] - (opus_val32)in[i*channels+1]);
+       diff = HALF32((oac_val32)in[i*channels] - (oac_val32)in[i*channels+1]);
        diff = MULT16_RES_Q15(g, diff);
        out[i*channels] = out[i*channels] - diff;
        out[i*channels+1] = out[i*channels+1] + diff;
     }
     for (;i<frame_size;i++)
     {
-       opus_val32 diff;
-       diff = HALF32((opus_val32)in[i*channels] - (opus_val32)in[i*channels+1]);
+       oac_val32 diff;
+       diff = HALF32((oac_val32)in[i*channels] - (oac_val32)in[i*channels+1]);
        diff = MULT16_RES_Q15(g2, diff);
        out[i*channels] = out[i*channels] - diff;
        out[i*channels+1] = out[i*channels+1] + diff;
     }
 }
 
-static void gain_fade(const opus_res *in, opus_res *out, opus_val16 g1, opus_val16 g2,
-        int overlap48, int frame_size, int channels, const celt_coef *window, opus_int32 Fs)
+static void gain_fade(const oac_res *in, oac_res *out, oac_val16 g1, oac_val16 g2,
+        int overlap48, int frame_size, int channels, const celt_coef *window, oac_int32 Fs)
 {
     int i;
     int inc;
@@ -576,7 +576,7 @@ static void gain_fade(const opus_res *in, opus_res *out, opus_val16 g1, opus_val
     {
        for (i=0;i<overlap;i++)
        {
-          opus_val16 g, w;
+          oac_val16 g, w;
           w = COEF2VAL16(window[i*inc]);
           w = MULT16_16_Q15(w, w);
           g = SHR32(MAC16_16(MULT16_16(w,g2),
@@ -586,7 +586,7 @@ static void gain_fade(const opus_res *in, opus_res *out, opus_val16 g1, opus_val
     } else {
        for (i=0;i<overlap;i++)
        {
-          opus_val16 g, w;
+          oac_val16 g, w;
           w = COEF2VAL16(window[i*inc]);
           w = MULT16_16_Q15(w, w);
           g = SHR32(MAC16_16(MULT16_16(w,g2),
@@ -604,45 +604,45 @@ static void gain_fade(const opus_res *in, opus_res *out, opus_val16 g1, opus_val
     while (++c<channels);
 }
 
-OpusEncoder *opus_encoder_create(opus_int32 Fs, int channels, int application, int *error)
+OacEncoder *oac_encoder_create(oac_int32 Fs, int channels, int application, int *error)
 {
    int ret;
-   OpusEncoder *st;
+   OacEncoder *st;
    int size;
    if((Fs!=48000&&Fs!=24000&&Fs!=16000&&Fs!=12000&&Fs!=8000
 #ifdef ENABLE_QEXT
          &&Fs!=96000
 #endif
          )||(channels!=1&&channels!=2)||
-       (application != OPUS_APPLICATION_VOIP && application != OPUS_APPLICATION_AUDIO
-       && application != OPUS_APPLICATION_RESTRICTED_LOWDELAY
-       && application != OPUS_APPLICATION_RESTRICTED_SILK
-       && application != OPUS_APPLICATION_RESTRICTED_CELT))
+       (application != OAC_APPLICATION_VOIP && application != OAC_APPLICATION_AUDIO
+       && application != OAC_APPLICATION_RESTRICTED_LOWDELAY
+       && application != OAC_APPLICATION_RESTRICTED_SILK
+       && application != OAC_APPLICATION_RESTRICTED_CELT))
    {
       if (error)
-         *error = OPUS_BAD_ARG;
+         *error = OAC_BAD_ARG;
       return NULL;
    }
-   size = opus_encoder_init(NULL, Fs, channels, application);
+   size = oac_encoder_init(NULL, Fs, channels, application);
    if (size <= 0)
    {
       if (error)
-         *error = OPUS_INTERNAL_ERROR;
+         *error = OAC_INTERNAL_ERROR;
       return NULL;
    }
-   st = (OpusEncoder *)opus_alloc(size);
+   st = (OacEncoder *)oac_alloc(size);
    if (st == NULL)
    {
       if (error)
-         *error = OPUS_ALLOC_FAIL;
+         *error = OAC_ALLOC_FAIL;
       return NULL;
    }
-   ret = opus_encoder_init(st, Fs, channels, application);
+   ret = oac_encoder_init(st, Fs, channels, application);
    if (error)
       *error = ret;
-   if (ret != OPUS_OK)
+   if (ret != OAC_OK)
    {
-      opus_free(st);
+      oac_free(st);
       st = NULL;
    }
    return st;
@@ -651,7 +651,7 @@ OpusEncoder *opus_encoder_create(opus_int32 Fs, int channels, int application, i
 #ifdef ENABLE_DRED
 
 static const float dred_bits_table[16] = {73.2f, 68.1f, 62.5f, 57.0f, 51.5f, 45.7f, 39.9f, 32.4f, 26.4f, 20.4f, 16.3f, 13.f, 9.3f, 8.2f, 7.2f, 6.4f};
-static int estimate_dred_bitrate(int q0, int dQ, int qmax, int duration, opus_int32 target_bits, int *target_chunks) {
+static int estimate_dred_bitrate(int q0, int dQ, int qmax, int duration, oac_int32 target_bits, int *target_chunks) {
    int dred_chunks;
    int i;
    float bits;
@@ -669,14 +669,14 @@ static int estimate_dred_bitrate(int q0, int dQ, int qmax, int duration, opus_in
    return (int)floor(.5f+bits);
 }
 
-static opus_int32 compute_dred_bitrate(OpusEncoder *st, opus_int32 bitrate_bps, int frame_size)
+static oac_int32 compute_dred_bitrate(OacEncoder *st, oac_int32 bitrate_bps, int frame_size)
 {
    float dred_frac;
    int bitrate_offset;
-   opus_int32 dred_bitrate;
-   opus_int32 target_dred_bitrate;
+   oac_int32 dred_bitrate;
+   oac_int32 target_dred_bitrate;
    int target_chunks;
-   opus_int32 max_dred_bits;
+   oac_int32 max_dred_bits;
    int q0, dQ, qmax;
    if (st->silk_mode.useInBandFEC) {
       dred_frac = MIN16(.7f, 3.f*st->silk_mode.packetLossPercentage/100.f);
@@ -697,7 +697,7 @@ static opus_int32 compute_dred_bitrate(OpusEncoder *st, opus_int32 bitrate_bps,
    qmax = 15;
    target_dred_bitrate = IMAX(0, (int)(dred_frac*(bitrate_bps-bitrate_offset)));
    if (st->dred_duration > 0) {
-      opus_int32 target_bits = bitrate_to_bits(target_dred_bitrate, st->Fs, frame_size);
+      oac_int32 target_bits = bitrate_to_bits(target_dred_bitrate, st->Fs, frame_size);
       max_dred_bits = estimate_dred_bitrate(q0, dQ, qmax, st->dred_duration, target_bits, &target_chunks);
    } else {
       max_dred_bits = 0;
@@ -715,14 +715,14 @@ static opus_int32 compute_dred_bitrate(OpusEncoder *st, opus_int32 bitrate_bps,
 }
 #endif
 
-static opus_int32 user_bitrate_to_bitrate(OpusEncoder *st, int frame_size, int max_data_bytes)
+static oac_int32 user_bitrate_to_bitrate(OacEncoder *st, int frame_size, int max_data_bytes)
 {
-  opus_int32 max_bitrate, user_bitrate;
+  oac_int32 max_bitrate, user_bitrate;
   if(!frame_size)frame_size=st->Fs/400;
   max_bitrate = bits_to_bitrate(max_data_bytes*8, st->Fs, frame_size);
-  if (st->user_bitrate_bps==OPUS_AUTO)
+  if (st->user_bitrate_bps==OAC_AUTO)
      user_bitrate = 60*st->Fs/frame_size + st->Fs*st->channels;
-  else if (st->user_bitrate_bps==OPUS_BITRATE_MAX)
+  else if (st->user_bitrate_bps==OAC_BITRATE_MAX)
      user_bitrate = 1500000;
   else
      user_bitrate = st->user_bitrate_bps;
@@ -730,7 +730,7 @@ static opus_int32 user_bitrate_to_bitrate(OpusEncoder *st, int frame_size, int m
 }
 
 #ifndef DISABLE_FLOAT_API
-void downmix_float(const void *_x, opus_val32 *y, int subframe, int offset, int c1, int c2, int C)
+void downmix_float(const void *_x, oac_val32 *y, int subframe, int offset, int c1, int c2, int C)
 {
    const float *x;
    int j;
@@ -763,12 +763,12 @@ void downmix_float(const void *_x, opus_val32 *y, int subframe, int offset, int
 }
 #endif
 
-void downmix_int(const void *_x, opus_val32 *y, int subframe, int offset, int c1, int c2, int C)
+void downmix_int(const void *_x, oac_val32 *y, int subframe, int offset, int c1, int c2, int C)
 {
-   const opus_int16 *x;
+   const oac_int16 *x;
    int j;
 
-   x = (const opus_int16 *)_x;
+   x = (const oac_int16 *)_x;
    for (j=0;j<subframe;j++)
       y[j] = INT16TOSIG(x[(j+offset)*C+c1]);
    if (c2>-1)
@@ -786,12 +786,12 @@ void downmix_int(const void *_x, opus_val32 *y, int subframe, int offset, int c1
    }
 }
 
-void downmix_int24(const void *_x, opus_val32 *y, int subframe, int offset, int c1, int c2, int C)
+void downmix_int24(const void *_x, oac_val32 *y, int subframe, int offset, int c1, int c2, int C)
 {
-   const opus_int32 *x;
+   const oac_int32 *x;
    int j;
 
-   x = (const opus_int32 *)_x;
+   x = (const oac_int32 *)_x;
    for (j=0;j<subframe;j++)
       y[j] = INT24TOSIG(x[(j+offset)*C+c1]);
    if (c2>-1)
@@ -809,19 +809,19 @@ void downmix_int24(const void *_x, opus_val32 *y, int subframe, int offset, int
    }
 }
 
-opus_int32 frame_size_select(int application, opus_int32 frame_size, int variable_duration, opus_int32 Fs)
+oac_int32 frame_size_select(int application, oac_int32 frame_size, int variable_duration, oac_int32 Fs)
 {
    int new_size;
    if (frame_size<Fs/400)
       return -1;
-   if (variable_duration == OPUS_FRAMESIZE_ARG)
+   if (variable_duration == OAC_FRAMESIZE_ARG)
       new_size = frame_size;
-   else if (variable_duration >= OPUS_FRAMESIZE_2_5_MS && variable_duration <= OPUS_FRAMESIZE_120_MS)
+   else if (variable_duration >= OAC_FRAMESIZE_2_5_MS && variable_duration <= OAC_FRAMESIZE_120_MS)
    {
-      if (variable_duration <= OPUS_FRAMESIZE_40_MS)
-         new_size = (Fs/400)<<(variable_duration-OPUS_FRAMESIZE_2_5_MS);
+      if (variable_duration <= OAC_FRAMESIZE_40_MS)
+         new_size = (Fs/400)<<(variable_duration-OAC_FRAMESIZE_2_5_MS);
       else
-         new_size = (variable_duration-OPUS_FRAMESIZE_2_5_MS-2)*Fs/50;
+         new_size = (variable_duration-OAC_FRAMESIZE_2_5_MS-2)*Fs/50;
    }
    else
       return -1;
@@ -831,19 +831,19 @@ opus_int32 frame_size_select(int application, opus_int32 frame_size, int variabl
         50*new_size!=Fs   &&  25*new_size!=Fs   &&  50*new_size!=3*Fs &&
         50*new_size!=4*Fs &&  50*new_size!=5*Fs &&  50*new_size!=6*Fs)
       return -1;
-   if (application == OPUS_APPLICATION_RESTRICTED_SILK && new_size < Fs/100)
+   if (application == OAC_APPLICATION_RESTRICTED_SILK && new_size < Fs/100)
       return -1;
    return new_size;
 }
 
-opus_val16 compute_stereo_width(const opus_res *pcm, int frame_size, opus_int32 Fs, StereoWidthState *mem)
+oac_val16 compute_stereo_width(const oac_res *pcm, int frame_size, oac_int32 Fs, StereoWidthState *mem)
 {
-   opus_val32 xx, xy, yy;
-   opus_val16 sqrt_xx, sqrt_yy;
-   opus_val16 qrrt_xx, qrrt_yy;
+   oac_val32 xx, xy, yy;
+   oac_val16 sqrt_xx, sqrt_yy;
+   oac_val16 qrrt_xx, qrrt_yy;
    int frame_rate;
    int i;
-   opus_val16 short_alpha;
+   oac_val16 short_alpha;
 #ifdef FIXED_POINT
    int shift = celt_ilog2(frame_size)-2;
 #endif
@@ -855,10 +855,10 @@ opus_val16 compute_stereo_width(const opus_res *pcm, int frame_size, opus_int32
       stupid), we just discard the last two samples. */
    for (i=0;i<frame_size-3;i+=4)
    {
-      opus_val32 pxx=0;
-      opus_val32 pxy=0;
-      opus_val32 pyy=0;
-      opus_val16 x, y;
+      oac_val32 pxx=0;
+      oac_val32 pxy=0;
+      oac_val32 pyy=0;
+      oac_val16 x, y;
       x = RES2VAL16(pcm[2*i]);
       y = RES2VAL16(pcm[2*i+1]);
       pxx = SHR32(MULT16_16(x,x),2);
@@ -900,9 +900,9 @@ opus_val16 compute_stereo_width(const opus_res *pcm, int frame_size, opus_int32
    mem->YY = MAX32(0, mem->YY);
    if (MAX32(mem->XX, mem->YY)>QCONST16(8e-4f, 18))
    {
-      opus_val16 corr;
-      opus_val16 ldiff;
-      opus_val16 width;
+      oac_val16 corr;
+      oac_val16 ldiff;
+      oac_val16 width;
       sqrt_xx = celt_sqrt(mem->XX);
       sqrt_yy = celt_sqrt(mem->YY);
       qrrt_xx = celt_sqrt(sqrt_xx);
@@ -922,7 +922,7 @@ opus_val16 compute_stereo_width(const opus_res *pcm, int frame_size, opus_int32
    return EXTRACT16(MIN32(Q15ONE, MULT16_16(20, mem->max_follower)));
 }
 
-static int decide_fec(int useInBandFEC, int PacketLoss_perc, int last_fec, int mode, int *bandwidth, opus_int32 rate)
+static int decide_fec(int useInBandFEC, int PacketLoss_perc, int last_fec, int mode, int *bandwidth, oac_int32 rate)
 {
    int orig_bandwidth;
    if (!useInBandFEC || PacketLoss_perc == 0 || mode == MODE_CELT_ONLY)
@@ -930,11 +930,11 @@ static int decide_fec(int useInBandFEC, int PacketLoss_perc, int last_fec, int m
    orig_bandwidth = *bandwidth;
    for (;;)
    {
-      opus_int32 hysteresis;
-      opus_int32 LBRR_rate_thres_bps;
+      oac_int32 hysteresis;
+      oac_int32 LBRR_rate_thres_bps;
       /* Compute threshold for using FEC at the current bandwidth setting */
-      LBRR_rate_thres_bps = fec_thresholds[2*(*bandwidth - OPUS_BANDWIDTH_NARROWBAND)];
-      hysteresis = fec_thresholds[2*(*bandwidth - OPUS_BANDWIDTH_NARROWBAND) + 1];
+      LBRR_rate_thres_bps = fec_thresholds[2*(*bandwidth - OAC_BANDWIDTH_NARROWBAND)];
+      hysteresis = fec_thresholds[2*(*bandwidth - OAC_BANDWIDTH_NARROWBAND) + 1];
       if (last_fec == 1) LBRR_rate_thres_bps -= hysteresis;
       if (last_fec == 0) LBRR_rate_thres_bps += hysteresis;
       LBRR_rate_thres_bps = silk_SMULWB( silk_MUL( LBRR_rate_thres_bps,
@@ -945,7 +945,7 @@ static int decide_fec(int useInBandFEC, int PacketLoss_perc, int last_fec, int m
          return 1;
       else if (PacketLoss_perc <= 5)
          return 0;
-      else if (*bandwidth > OPUS_BANDWIDTH_NARROWBAND)
+      else if (*bandwidth > OAC_BANDWIDTH_NARROWBAND)
          (*bandwidth)--;
       else
          break;
@@ -986,7 +986,7 @@ static int compute_silk_rate_for_hybrid(int rate, int bandwidth, int frame20ms,
       /* For now, just give 50% of the extra bits to SILK. */
       silk_rate += (rate-rate_table[i-1][0])/2;
    } else {
-      opus_int32 lo, hi, x0, x1;
+      oac_int32 lo, hi, x0, x1;
       lo = rate_table[i-1][entry];
       hi = rate_table[i][entry];
       x0 = rate_table[i-1][0];
@@ -998,7 +998,7 @@ static int compute_silk_rate_for_hybrid(int rate, int bandwidth, int frame20ms,
       /* Tiny boost to SILK for CBR. We should probably tune this better. */
       silk_rate += 100;
    }
-   if (bandwidth==OPUS_BANDWIDTH_SUPERWIDEBAND)
+   if (bandwidth==OAC_BANDWIDTH_SUPERWIDEBAND)
       silk_rate += 300;
    silk_rate *= channels;
    /* Small adjustment for stereo (calibrated for 32 kb/s, haven't tried other bitrates). */
@@ -1009,10 +1009,10 @@ static int compute_silk_rate_for_hybrid(int rate, int bandwidth, int frame20ms,
 
 /* Returns the equivalent bitrate corresponding to 20 ms frames,
    complexity 10 VBR operation. */
-static opus_int32 compute_equiv_rate(opus_int32 bitrate, int channels,
+static oac_int32 compute_equiv_rate(oac_int32 bitrate, int channels,
       int frame_rate, int vbr, int mode, int complexity, int loss)
 {
-   opus_int32 equiv;
+   oac_int32 equiv;
    equiv = bitrate;
    /* Take into account overhead from smaller frames. */
    if (frame_rate > 50)
@@ -1042,10 +1042,10 @@ static opus_int32 compute_equiv_rate(opus_int32 bitrate, int channels,
    return equiv;
 }
 
-int is_digital_silence(const opus_res* pcm, int frame_size, int channels, int lsb_depth)
+int is_digital_silence(const oac_res* pcm, int frame_size, int channels, int lsb_depth)
 {
    int silence = 0;
-   opus_val32 sample_max = 0;
+   oac_val32 sample_max = 0;
 #ifdef MLP_TRAINING
    return 0;
 #endif
@@ -1055,20 +1055,20 @@ int is_digital_silence(const opus_res* pcm, int frame_size, int channels, int ls
    silence = (sample_max == 0);
    (void)lsb_depth;
 #else
-   silence = (sample_max <= (opus_val16) 1 / (1 << lsb_depth));
+   silence = (sample_max <= (oac_val16) 1 / (1 << lsb_depth));
 #endif
 
    return silence;
 }
 
 #ifdef FIXED_POINT
-static opus_val32 compute_frame_energy(const opus_res *pcm, int frame_size, int channels, int arch)
+static oac_val32 compute_frame_energy(const oac_res *pcm, int frame_size, int channels, int arch)
 {
    int i;
-   opus_val32 sample_max;
+   oac_val32 sample_max;
    int max_shift;
    int shift;
-   opus_val32 energy = 0;
+   oac_val32 energy = 0;
    int len = frame_size*channels;
    (void)arch;
    /* Max amplitude in the signal */
@@ -1089,7 +1089,7 @@ static opus_val32 compute_frame_energy(const opus_res *pcm, int frame_size, int
    return energy;
 }
 #else
-static opus_val32 compute_frame_energy(const opus_val16 *pcm, int frame_size, int channels, int arch)
+static oac_val32 compute_frame_energy(const oac_val16 *pcm, int frame_size, int channels, int arch)
 {
    int len = frame_size*channels;
    return celt_inner_prod(pcm, pcm, len, arch)/len;
@@ -1097,7 +1097,7 @@ static opus_val32 compute_frame_energy(const opus_val16 *pcm, int frame_size, in
 #endif
 
 /* Decides if DTX should be turned on (=1) or off (=0) */
-static int decide_dtx_mode(opus_int activity,            /* indicates if this frame contains speech/music */
+static int decide_dtx_mode(oac_int activity,            /* indicates if this frame contains speech/music */
                            int *nb_no_activity_ms_Q1,    /* number of consecutive milliseconds with no activity, in Q1 */
                            int frame_size_ms_Q1          /* number of milliseconds in this update, in Q1 */
                            )
@@ -1124,13 +1124,13 @@ static int decide_dtx_mode(opus_int activity,            /* indicates if this fr
    return 0;
 }
 
-static int compute_redundancy_bytes(opus_int32 max_data_bytes, opus_int32 bitrate_bps, int frame_rate, int channels)
+static int compute_redundancy_bytes(oac_int32 max_data_bytes, oac_int32 bitrate_bps, int frame_rate, int channels)
 {
    int redundancy_bytes_cap;
    int redundancy_bytes;
-   opus_int32 redundancy_rate;
+   oac_int32 redundancy_rate;
    int base_bits;
-   opus_int32 available_bits;
+   oac_int32 available_bits;
    base_bits = (40*channels+20);
 
    /* Equivalent rate for 5 ms frames. */
@@ -1152,21 +1152,21 @@ static int compute_redundancy_bytes(opus_int32 max_data_bytes, opus_int32 bitrat
    return redundancy_bytes;
 }
 
-static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm, int frame_size,
-                unsigned char *data, opus_int32 max_data_bytes,
+static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int frame_size,
+                unsigned char *data, oac_int32 max_data_bytes,
                 int float_api, int first_frame,
 #ifdef ENABLE_DRED
-                opus_int32 dred_bitrate_bps,
+                oac_int32 dred_bitrate_bps,
 #endif
 #ifndef DISABLE_FLOAT_API
                 AnalysisInfo *analysis_info,
 #endif
                 int is_silence, int redundancy, int celt_to_silk, int prefill,
-                opus_int32 equiv_rate, int to_celt);
+                oac_int32 equiv_rate, int to_celt);
 
-opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_size,
-                unsigned char *data, opus_int32 out_data_bytes, int lsb_depth,
-                const void *analysis_pcm, opus_int32 analysis_size, int c1, int c2,
+oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
+                unsigned char *data, oac_int32 out_data_bytes, int lsb_depth,
+                const void *analysis_pcm, oac_int32 analysis_size, int c1, int c2,
                 int analysis_channels, downmix_func downmix, int float_api)
 {
     void *silk_enc=NULL;
@@ -1178,13 +1178,13 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
     int celt_to_silk = 0;
     int to_celt = 0;
     int voice_est; /* Probability of voice in Q7 */
-    opus_int32 equiv_rate;
+    oac_int32 equiv_rate;
     int frame_rate;
-    opus_int32 max_rate; /* Max bitrate we're allowed to use */
+    oac_int32 max_rate; /* Max bitrate we're allowed to use */
     int curr_bandwidth;
-    opus_int32 max_data_bytes; /* Max number of bytes we're allowed to use */
-    opus_int32 cbr_bytes=-1;
-    opus_val16 stereo_width;
+    oac_int32 max_data_bytes; /* Max number of bytes we're allowed to use */
+    oac_int32 cbr_bytes=-1;
+    oac_val16 stereo_width;
     const CELTMode *celt_mode=NULL;
     int packet_size_cap = 1276;
 #ifndef DISABLE_FLOAT_API
@@ -1194,7 +1194,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
 #endif
     int is_silence = 0;
 #ifdef ENABLE_DRED
-    opus_int32 dred_bitrate_bps;
+    oac_int32 dred_bitrate_bps;
 #endif
     ALLOC_STACK;
 
@@ -1205,32 +1205,32 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
     if (frame_size <= 0 || max_data_bytes <= 0)
     {
        RESTORE_STACK;
-       return OPUS_BAD_ARG;
+       return OAC_BAD_ARG;
     }
 
     /* Cannot encode 100 ms in 1 byte */
     if (max_data_bytes==1 && st->Fs==(frame_size*10))
     {
       RESTORE_STACK;
-      return OPUS_BUFFER_TOO_SMALL;
+      return OAC_BUFFER_TOO_SMALL;
     }
 
-    if (st->application != OPUS_APPLICATION_RESTRICTED_CELT)
+    if (st->application != OAC_APPLICATION_RESTRICTED_CELT)
         silk_enc = (char*)st+st->silk_enc_offset;
-    if (st->application != OPUS_APPLICATION_RESTRICTED_SILK)
+    if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
         celt_enc = (CELTEncoder*)((char*)st+st->celt_enc_offset);
 
     lsb_depth = IMIN(lsb_depth, st->lsb_depth);
 
-    if (st->application != OPUS_APPLICATION_RESTRICTED_SILK)
+    if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
         celt_encoder_ctl(celt_enc, CELT_GET_MODE(&celt_mode));
     is_silence = is_digital_silence(pcm, frame_size, st->channels, lsb_depth);
 #ifndef DISABLE_FLOAT_API
     analysis_info.valid = 0;
 #ifdef FIXED_POINT
-    if (st->silk_mode.complexity >= 10 && st->Fs>=16000 && st->Fs<=48000 && st->application != OPUS_APPLICATION_RESTRICTED_SILK)
+    if (st->silk_mode.complexity >= 10 && st->Fs>=16000 && st->Fs<=48000 && st->application != OAC_APPLICATION_RESTRICTED_SILK)
 #else
-    if (st->silk_mode.complexity >= 7 && st->Fs>=16000 && st->Fs<=48000 && st->application != OPUS_APPLICATION_RESTRICTED_SILK)
+    if (st->silk_mode.complexity >= 7 && st->Fs>=16000 && st->Fs<=48000 && st->application != OAC_APPLICATION_RESTRICTED_SILK)
 #endif
     {
        analysis_read_pos_bak = st->analysis.read_pos;
@@ -1260,7 +1260,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
     if (analysis_info.valid)
     {
        int analysis_bandwidth;
-       if (st->signal_type == OPUS_AUTO)
+       if (st->signal_type == OAC_AUTO)
        {
           float prob;
           if (st->prev_mode == 0)
@@ -1274,15 +1274,15 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
 
        analysis_bandwidth = analysis_info.bandwidth;
        if (analysis_bandwidth<=12)
-          st->detected_bandwidth = OPUS_BANDWIDTH_NARROWBAND;
+          st->detected_bandwidth = OAC_BANDWIDTH_NARROWBAND;
        else if (analysis_bandwidth<=14)
-          st->detected_bandwidth = OPUS_BANDWIDTH_MEDIUMBAND;
+          st->detected_bandwidth = OAC_BANDWIDTH_MEDIUMBAND;
        else if (analysis_bandwidth<=16)
-          st->detected_bandwidth = OPUS_BANDWIDTH_WIDEBAND;
+          st->detected_bandwidth = OAC_BANDWIDTH_WIDEBAND;
        else if (analysis_bandwidth<=18)
-          st->detected_bandwidth = OPUS_BANDWIDTH_SUPERWIDEBAND;
+          st->detected_bandwidth = OAC_BANDWIDTH_SUPERWIDEBAND;
        else
-          st->detected_bandwidth = OPUS_BANDWIDTH_FULLBAND;
+          st->detected_bandwidth = OAC_BANDWIDTH_FULLBAND;
     }
 #else
     st->voice_ratio = -1;
@@ -1319,11 +1319,11 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
     st->bitrate_bps -= dred_bitrate_bps;
 #endif
     if (max_data_bytes<3 || st->bitrate_bps < 3*frame_rate*8
-       || (frame_rate<50 && (max_data_bytes*(opus_int32)frame_rate<300 || st->bitrate_bps < 2400)))
+       || (frame_rate<50 && (max_data_bytes*(oac_int32)frame_rate<300 || st->bitrate_bps < 2400)))
     {
        /*If the space is too low to do something useful, emit 'PLC' frames.*/
        int tocmode = st->mode;
-       int bw = st->bandwidth == 0 ? OPUS_BANDWIDTH_NARROWBAND : st->bandwidth;
+       int bw = st->bandwidth == 0 ? OAC_BANDWIDTH_NARROWBAND : st->bandwidth;
        int packet_code = 0;
        int num_multiframes = 0;
 
@@ -1357,12 +1357,12 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
           }
        }
 
-       if(tocmode==MODE_SILK_ONLY&&bw>OPUS_BANDWIDTH_WIDEBAND)
-          bw=OPUS_BANDWIDTH_WIDEBAND;
-       else if (tocmode==MODE_CELT_ONLY&&bw==OPUS_BANDWIDTH_MEDIUMBAND)
-          bw=OPUS_BANDWIDTH_NARROWBAND;
-       else if (tocmode==MODE_HYBRID&&bw<=OPUS_BANDWIDTH_SUPERWIDEBAND)
-          bw=OPUS_BANDWIDTH_SUPERWIDEBAND;
+       if(tocmode==MODE_SILK_ONLY&&bw>OAC_BANDWIDTH_WIDEBAND)
+          bw=OAC_BANDWIDTH_WIDEBAND;
+       else if (tocmode==MODE_CELT_ONLY&&bw==OAC_BANDWIDTH_MEDIUMBAND)
+          bw=OAC_BANDWIDTH_NARROWBAND;
+       else if (tocmode==MODE_HYBRID&&bw<=OAC_BANDWIDTH_SUPERWIDEBAND)
+          bw=OAC_BANDWIDTH_SUPERWIDEBAND;
 
        data[0] = gen_toc(tocmode, frame_rate, bw, st->stream_channels);
        data[0] |= packet_code;
@@ -1376,11 +1376,11 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
 
        if (!st->use_vbr)
        {
-          ret = opus_packet_pad(data, ret, max_data_bytes);
-          if (ret == OPUS_OK)
+          ret = oac_packet_pad(data, ret, max_data_bytes);
+          if (ret == OAC_OK)
              ret = max_data_bytes;
           else
-             ret = OPUS_INTERNAL_ERROR;
+             ret = OAC_INTERNAL_ERROR;
        }
        RESTORE_STACK;
        return ret;
@@ -1391,22 +1391,22 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
     equiv_rate = compute_equiv_rate(st->bitrate_bps, st->channels, st->Fs/frame_size,
           st->use_vbr, 0, st->silk_mode.complexity, st->silk_mode.packetLossPercentage);
 
-    if (st->signal_type == OPUS_SIGNAL_VOICE)
+    if (st->signal_type == OAC_SIGNAL_VOICE)
        voice_est = 127;
-    else if (st->signal_type == OPUS_SIGNAL_MUSIC)
+    else if (st->signal_type == OAC_SIGNAL_MUSIC)
        voice_est = 0;
     else if (st->voice_ratio >= 0)
     {
        voice_est = st->voice_ratio*327>>8;
        /* For AUDIO, never be more than 90% confident of having speech */
-       if (st->application == OPUS_APPLICATION_AUDIO)
+       if (st->application == OAC_APPLICATION_AUDIO)
           voice_est = IMIN(voice_est, 115);
-    } else if (st->application == OPUS_APPLICATION_VOIP)
+    } else if (st->application == OAC_APPLICATION_VOIP)
        voice_est = 115;
     else
        voice_est = 48;
 
-    if (st->force_channels!=OPUS_AUTO && st->channels == 2)
+    if (st->force_channels!=OAC_AUTO && st->channels == 2)
     {
         st->stream_channels = st->force_channels;
     } else {
@@ -1420,7 +1420,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
        /* Rate-dependent mono-stereo decision */
        if (st->channels == 2)
        {
-          opus_int32 stereo_threshold;
+          oac_int32 stereo_threshold;
           stereo_threshold = stereo_music_threshold + ((voice_est*voice_est*(stereo_voice_threshold-stereo_music_threshold))>>14);
           if (st->stream_channels == 2)
              stereo_threshold -= 1000;
@@ -1445,13 +1445,13 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
 #endif
 
     /* Mode selection depending on application and signal type */
-    if (st->application == OPUS_APPLICATION_RESTRICTED_SILK)
+    if (st->application == OAC_APPLICATION_RESTRICTED_SILK)
     {
        st->mode = MODE_SILK_ONLY;
-    } else if (st->application == OPUS_APPLICATION_RESTRICTED_LOWDELAY || st->application == OPUS_APPLICATION_RESTRICTED_CELT)
+    } else if (st->application == OAC_APPLICATION_RESTRICTED_LOWDELAY || st->application == OAC_APPLICATION_RESTRICTED_CELT)
     {
        st->mode = MODE_CELT_ONLY;
-    } else if (st->user_forced_mode == OPUS_AUTO)
+    } else if (st->user_forced_mode == OAC_AUTO)
     {
 #ifdef FUZZING
         (void)stereo_width;
@@ -1470,18 +1470,18 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
              st->mode = MODE_SILK_ONLY;
        }
 #else
-       opus_int32 mode_voice, mode_music;
-       opus_int32 threshold;
+       oac_int32 mode_voice, mode_music;
+       oac_int32 threshold;
 
        /* Interpolate based on stereo width */
-       mode_voice = (opus_int32)(MULT16_32_Q15(Q15ONE-stereo_width,mode_thresholds[0][0])
+       mode_voice = (oac_int32)(MULT16_32_Q15(Q15ONE-stereo_width,mode_thresholds[0][0])
              + MULT16_32_Q15(stereo_width,mode_thresholds[1][0]));
-       mode_music = (opus_int32)(MULT16_32_Q15(Q15ONE-stereo_width,mode_thresholds[1][1])
+       mode_music = (oac_int32)(MULT16_32_Q15(Q15ONE-stereo_width,mode_thresholds[1][1])
              + MULT16_32_Q15(stereo_width,mode_thresholds[1][1]));
        /* Interpolate based on speech/music probability */
        threshold = mode_music + ((voice_est*voice_est*(mode_voice-mode_music))>>14);
        /* Bias towards SILK for VoIP because of some useful features */
-       if (st->application == OPUS_APPLICATION_VOIP)
+       if (st->application == OAC_APPLICATION_VOIP)
           threshold += 8000;
 
        /*printf("%f %d\n", stereo_width/(float)Q15ONE, threshold);*/
@@ -1513,10 +1513,10 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
     /* Override the chosen mode to make sure we meet the requested frame size */
     if (st->mode != MODE_CELT_ONLY && frame_size < st->Fs/100)
     {
-       celt_assert(st->application != OPUS_APPLICATION_RESTRICTED_SILK);
+       celt_assert(st->application != OAC_APPLICATION_RESTRICTED_SILK);
        st->mode = MODE_CELT_ONLY;
     }
-    if (st->lfe && st->application != OPUS_APPLICATION_RESTRICTED_SILK)
+    if (st->lfe && st->application != OAC_APPLICATION_RESTRICTED_SILK)
        st->mode = MODE_CELT_ONLY;
 
     if (st->prev_mode > 0 &&
@@ -1564,9 +1564,9 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
     /* Automatic (rate-dependent) bandwidth selection */
     if (st->mode == MODE_CELT_ONLY || st->first || st->silk_mode.allowBandwidthSwitch)
     {
-        const opus_int32 *voice_bandwidth_thresholds, *music_bandwidth_thresholds;
-        opus_int32 bandwidth_thresholds[8];
-        int bandwidth = OPUS_BANDWIDTH_FULLBAND;
+        const oac_int32 *voice_bandwidth_thresholds, *music_bandwidth_thresholds;
+        oac_int32 bandwidth_thresholds[8];
+        int bandwidth = OAC_BANDWIDTH_FULLBAND;
 
         if (st->channels==2 && st->force_channels!=1)
         {
@@ -1584,8 +1584,8 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
         }
         do {
             int threshold, hysteresis;
-            threshold = bandwidth_thresholds[2*(bandwidth-OPUS_BANDWIDTH_MEDIUMBAND)];
-            hysteresis = bandwidth_thresholds[2*(bandwidth-OPUS_BANDWIDTH_MEDIUMBAND)+1];
+            threshold = bandwidth_thresholds[2*(bandwidth-OAC_BANDWIDTH_MEDIUMBAND)];
+            hysteresis = bandwidth_thresholds[2*(bandwidth-OAC_BANDWIDTH_MEDIUMBAND)+1];
             if (!st->first)
             {
                 if (st->auto_bandwidth >= bandwidth)
@@ -1595,43 +1595,43 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
             }
             if (equiv_rate >= threshold)
                 break;
-        } while (--bandwidth>OPUS_BANDWIDTH_NARROWBAND);
+        } while (--bandwidth>OAC_BANDWIDTH_NARROWBAND);
         /* We don't use mediumband anymore, except when explicitly requested or during
            mode transitions. */
-        if (bandwidth == OPUS_BANDWIDTH_MEDIUMBAND)
-           bandwidth = OPUS_BANDWIDTH_WIDEBAND;
+        if (bandwidth == OAC_BANDWIDTH_MEDIUMBAND)
+           bandwidth = OAC_BANDWIDTH_WIDEBAND;
         st->bandwidth = st->auto_bandwidth = bandwidth;
         /* Prevents any transition to SWB/FB until the SILK layer has fully
            switched to WB mode and turned the variable LP filter off */
-        if (!st->first && st->mode != MODE_CELT_ONLY && !st->silk_mode.inWBmodeWithoutVariableLP && st->bandwidth > OPUS_BANDWIDTH_WIDEBAND)
-            st->bandwidth = OPUS_BANDWIDTH_WIDEBAND;
+        if (!st->first && st->mode != MODE_CELT_ONLY && !st->silk_mode.inWBmodeWithoutVariableLP && st->bandwidth > OAC_BANDWIDTH_WIDEBAND)
+            st->bandwidth = OAC_BANDWIDTH_WIDEBAND;
     }
 
     if (st->bandwidth>st->max_bandwidth)
        st->bandwidth = st->max_bandwidth;
 
-    if (st->user_bandwidth != OPUS_AUTO)
+    if (st->user_bandwidth != OAC_AUTO)
         st->bandwidth = st->user_bandwidth;
 
     /* This prevents us from using hybrid at unsafe CBR/max rates */
     if (st->mode != MODE_CELT_ONLY && max_rate < 15000)
     {
-       st->bandwidth = IMIN(st->bandwidth, OPUS_BANDWIDTH_WIDEBAND);
+       st->bandwidth = IMIN(st->bandwidth, OAC_BANDWIDTH_WIDEBAND);
     }
 
-    /* Prevents Opus from wasting bits on frequencies that are above
+    /* Prevents Oac from wasting bits on frequencies that are above
        the Nyquist rate of the input signal */
-    if (st->Fs <= 24000 && st->bandwidth > OPUS_BANDWIDTH_SUPERWIDEBAND)
-        st->bandwidth = OPUS_BANDWIDTH_SUPERWIDEBAND;
-    if (st->Fs <= 16000 && st->bandwidth > OPUS_BANDWIDTH_WIDEBAND)
-        st->bandwidth = OPUS_BANDWIDTH_WIDEBAND;
-    if (st->Fs <= 12000 && st->bandwidth > OPUS_BANDWIDTH_MEDIUMBAND)
-        st->bandwidth = OPUS_BANDWIDTH_MEDIUMBAND;
-    if (st->Fs <= 8000 && st->bandwidth > OPUS_BANDWIDTH_NARROWBAND)
-        st->bandwidth = OPUS_BANDWIDTH_NARROWBAND;
+    if (st->Fs <= 24000 && st->bandwidth > OAC_BANDWIDTH_SUPERWIDEBAND)
+        st->bandwidth = OAC_BANDWIDTH_SUPERWIDEBAND;
+    if (st->Fs <= 16000 && st->bandwidth > OAC_BANDWIDTH_WIDEBAND)
+        st->bandwidth = OAC_BANDWIDTH_WIDEBAND;
+    if (st->Fs <= 12000 && st->bandwidth > OAC_BANDWIDTH_MEDIUMBAND)
+        st->bandwidth = OAC_BANDWIDTH_MEDIUMBAND;
+    if (st->Fs <= 8000 && st->bandwidth > OAC_BANDWIDTH_NARROWBAND)
+        st->bandwidth = OAC_BANDWIDTH_NARROWBAND;
 #ifndef DISABLE_FLOAT_API
     /* Use detected bandwidth to reduce the encoded bandwidth. */
-    if (st->detected_bandwidth && st->user_bandwidth == OPUS_AUTO)
+    if (st->detected_bandwidth && st->user_bandwidth == OAC_AUTO)
     {
        int min_detected_bandwidth;
        /* Makes bandwidth detection more conservative just in case the detector
@@ -1639,15 +1639,15 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
           When operating in SILK/hybrid mode, we don't go below wideband to avoid
           more complicated switches that require redundancy. */
        if (equiv_rate <= 18000*st->stream_channels && st->mode == MODE_CELT_ONLY)
-          min_detected_bandwidth = OPUS_BANDWIDTH_NARROWBAND;
+          min_detected_bandwidth = OAC_BANDWIDTH_NARROWBAND;
        else if (equiv_rate <= 24000*st->stream_channels && st->mode == MODE_CELT_ONLY)
-          min_detected_bandwidth = OPUS_BANDWIDTH_MEDIUMBAND;
+          min_detected_bandwidth = OAC_BANDWIDTH_MEDIUMBAND;
        else if (equiv_rate <= 30000*st->stream_channels)
-          min_detected_bandwidth = OPUS_BANDWIDTH_WIDEBAND;
+          min_detected_bandwidth = OAC_BANDWIDTH_WIDEBAND;
        else if (equiv_rate <= 44000*st->stream_channels)
-          min_detected_bandwidth = OPUS_BANDWIDTH_SUPERWIDEBAND;
+          min_detected_bandwidth = OAC_BANDWIDTH_SUPERWIDEBAND;
        else
-          min_detected_bandwidth = OPUS_BANDWIDTH_FULLBAND;
+          min_detected_bandwidth = OAC_BANDWIDTH_FULLBAND;
 
        st->detected_bandwidth = IMAX(st->detected_bandwidth, min_detected_bandwidth);
        st->bandwidth = IMIN(st->bandwidth, st->detected_bandwidth);
@@ -1655,24 +1655,24 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
 #endif
     st->silk_mode.LBRR_coded = decide_fec(st->silk_mode.useInBandFEC, st->silk_mode.packetLossPercentage,
           st->silk_mode.LBRR_coded, st->mode, &st->bandwidth, equiv_rate);
-    if (st->application != OPUS_APPLICATION_RESTRICTED_SILK)
-        celt_encoder_ctl(celt_enc, OPUS_SET_LSB_DEPTH(lsb_depth));
+    if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
+        celt_encoder_ctl(celt_enc, OAC_SET_LSB_DEPTH(lsb_depth));
 
     /* CELT mode doesn't support mediumband, use wideband instead */
-    if (st->mode == MODE_CELT_ONLY && st->bandwidth == OPUS_BANDWIDTH_MEDIUMBAND)
-        st->bandwidth = OPUS_BANDWIDTH_WIDEBAND;
+    if (st->mode == MODE_CELT_ONLY && st->bandwidth == OAC_BANDWIDTH_MEDIUMBAND)
+        st->bandwidth = OAC_BANDWIDTH_WIDEBAND;
     if (st->lfe)
-       st->bandwidth = OPUS_BANDWIDTH_NARROWBAND;
+       st->bandwidth = OAC_BANDWIDTH_NARROWBAND;
 
     curr_bandwidth = st->bandwidth;
 
-    if (st->application == OPUS_APPLICATION_RESTRICTED_SILK && curr_bandwidth > OPUS_BANDWIDTH_WIDEBAND)
-       st->bandwidth = curr_bandwidth = OPUS_BANDWIDTH_WIDEBAND;
+    if (st->application == OAC_APPLICATION_RESTRICTED_SILK && curr_bandwidth > OAC_BANDWIDTH_WIDEBAND)
+       st->bandwidth = curr_bandwidth = OAC_BANDWIDTH_WIDEBAND;
     /* Chooses the appropriate mode for speech
        *NEVER* switch to/from CELT-only mode here as this will invalidate some assumptions */
-    if (st->mode == MODE_SILK_ONLY && curr_bandwidth > OPUS_BANDWIDTH_WIDEBAND)
+    if (st->mode == MODE_SILK_ONLY && curr_bandwidth > OAC_BANDWIDTH_WIDEBAND)
         st->mode = MODE_HYBRID;
-    if (st->mode == MODE_HYBRID && curr_bandwidth <= OPUS_BANDWIDTH_WIDEBAND)
+    if (st->mode == MODE_HYBRID && curr_bandwidth <= OAC_BANDWIDTH_WIDEBAND)
         st->mode = MODE_SILK_ONLY;
 
     /* Can't support higher than >60 ms frames, and >20 ms when in Hybrid or CELT-only modes */
@@ -1681,11 +1681,11 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
        int enc_frame_size;
        int nb_frames;
        VARDECL(unsigned char, tmp_data);
-       VARDECL(OpusRepacketizer, rp);
+       VARDECL(OacRepacketizer, rp);
        int max_header_bytes;
-       opus_int32 repacketize_len;
-       opus_int32 max_len_sum;
-       opus_int32 tot_size=0;
+       oac_int32 repacketize_len;
+       oac_int32 max_len_sum;
+       oac_int32 tot_size=0;
        unsigned char *curr_data;
        int tmp_len;
        int dtx_count = 0;
@@ -1720,7 +1720,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
         * >2 frames: Code 3 VBR */
        max_header_bytes = nb_frames == 2 ? 3 : (2+(nb_frames-1)*2);
 
-       if (st->use_vbr || st->user_bitrate_bps==OPUS_BITRATE_MAX)
+       if (st->use_vbr || st->user_bitrate_bps==OAC_BITRATE_MAX)
           repacketize_len = out_data_bytes;
        else {
           celt_assert(cbr_bytes>=0);
@@ -1730,8 +1730,8 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
 
        ALLOC(tmp_data, max_len_sum, unsigned char);
        curr_data = tmp_data;
-       ALLOC(rp, 1, OpusRepacketizer);
-       opus_repacketizer_init(rp);
+       ALLOC(rp, 1, OacRepacketizer);
+       oac_repacketizer_init(rp);
 
 
        bak_to_mono = st->silk_mode.toMono;
@@ -1745,7 +1745,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
           int first_frame;
           int frame_to_celt;
           int frame_redundancy;
-          opus_int32 curr_max;
+          oac_int32 curr_max;
           /* Attempt DRED encoding until we have a non-DTX frame. In case of DTX refresh,
              that allows for DRED not to be in the first frame. */
           first_frame = (i == 0) || (i == dtx_count);
@@ -1770,7 +1770,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
 #endif
           is_silence = is_digital_silence(pcm+i*(st->channels*enc_frame_size), enc_frame_size, st->channels, lsb_depth);
 
-          tmp_len = opus_encode_frame_native(st, pcm+i*(st->channels*enc_frame_size), enc_frame_size, curr_data, curr_max, float_api, first_frame,
+          tmp_len = oac_encode_frame_native(st, pcm+i*(st->channels*enc_frame_size), enc_frame_size, curr_data, curr_max, float_api, first_frame,
 #ifdef ENABLE_DRED
                     dred_bitrate_bps,
 #endif
@@ -1783,30 +1783,30 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
           if (tmp_len<0)
           {
              RESTORE_STACK;
-             return OPUS_INTERNAL_ERROR;
+             return OAC_INTERNAL_ERROR;
           } else if (tmp_len==1) {
              dtx_count++;
           }
-          ret = opus_repacketizer_cat(rp, curr_data, tmp_len);
+          ret = oac_repacketizer_cat(rp, curr_data, tmp_len);
 
           if (ret<0)
           {
              RESTORE_STACK;
-             return OPUS_INTERNAL_ERROR;
+             return OAC_INTERNAL_ERROR;
           }
           tot_size += tmp_len;
           curr_data += tmp_len;
        }
-       ret = opus_repacketizer_out_range_impl(rp, 0, nb_frames, data, repacketize_len, 0, !st->use_vbr && (dtx_count != nb_frames), NULL, 0);
+       ret = oac_repacketizer_out_range_impl(rp, 0, nb_frames, data, repacketize_len, 0, !st->use_vbr && (dtx_count != nb_frames), NULL, 0);
        if (ret<0)
        {
-          ret = OPUS_INTERNAL_ERROR;
+          ret = OAC_INTERNAL_ERROR;
        }
        st->silk_mode.toMono = bak_to_mono;
        RESTORE_STACK;
        return ret;
     } else {
-      ret = opus_encode_frame_native(st, pcm, frame_size, data, max_data_bytes, float_api, 1,
+      ret = oac_encode_frame_native(st, pcm, frame_size, data, max_data_bytes, float_api, 1,
 #ifdef ENABLE_DRED
                 dred_bitrate_bps,
 #endif
@@ -1821,17 +1821,17 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_si
     }
 }
 
-static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm, int frame_size,
-                unsigned char *data, opus_int32 orig_max_data_bytes,
+static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int frame_size,
+                unsigned char *data, oac_int32 orig_max_data_bytes,
                 int float_api, int first_frame,
 #ifdef ENABLE_DRED
-                opus_int32 dred_bitrate_bps,
+                oac_int32 dred_bitrate_bps,
 #endif
 #ifndef DISABLE_FLOAT_API
                 AnalysisInfo *analysis_info,
 #endif
                 int is_silence, int redundancy, int celt_to_silk, int prefill,
-                opus_int32 equiv_rate, int to_celt)
+                oac_int32 equiv_rate, int to_celt)
 {
     void *silk_enc=NULL;
     CELTEncoder *celt_enc=NULL;
@@ -1839,37 +1839,37 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
     int i;
     int ret=0;
     int max_data_bytes;
-    opus_int32 nBytes;
+    oac_int32 nBytes;
     ec_enc enc;
     int bits_target;
     int start_band = 0;
     int redundancy_bytes = 0; /* Number of bytes to use for redundancy frame */
     int nb_compr_bytes;
-    opus_uint32 redundant_rng = 0;
+    oac_uint32 redundant_rng = 0;
     int cutoff_Hz;
     int hp_freq_smth1;
-    opus_val16 HB_gain;
+    oac_val16 HB_gain;
     int apply_padding;
     int frame_rate;
     int curr_bandwidth;
     int delay_compensation;
     int total_buffer;
-    opus_int activity = VAD_NO_DECISION;
-    VARDECL(opus_res, pcm_buf);
-    VARDECL(opus_res, tmp_prefill);
+    oac_int activity = VAD_NO_DECISION;
+    VARDECL(oac_res, pcm_buf);
+    VARDECL(oac_res, tmp_prefill);
     SAVE_STACK;
 
     max_data_bytes = IMIN(orig_max_data_bytes, 1276);
     st->rangeFinal = 0;
-    if (st->application != OPUS_APPLICATION_RESTRICTED_CELT)
+    if (st->application != OAC_APPLICATION_RESTRICTED_CELT)
        silk_enc = (char*)st+st->silk_enc_offset;
-    if (st->application != OPUS_APPLICATION_RESTRICTED_SILK)
+    if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
     {
        celt_enc = (CELTEncoder*)((char*)st+st->celt_enc_offset);
        celt_encoder_ctl(celt_enc, CELT_GET_MODE(&celt_mode));
     }
     curr_bandwidth = st->bandwidth;
-    if (st->application == OPUS_APPLICATION_RESTRICTED_LOWDELAY || st->application == OPUS_APPLICATION_RESTRICTED_CELT || st->application == OPUS_APPLICATION_RESTRICTED_SILK)
+    if (st->application == OAC_APPLICATION_RESTRICTED_LOWDELAY || st->application == OAC_APPLICATION_RESTRICTED_CELT || st->application == OAC_APPLICATION_RESTRICTED_SILK)
        delay_compensation = 0;
     else
        delay_compensation = st->delay_compensation;
@@ -1887,15 +1887,15 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
        if (!activity)
        {
            /* Mark as active if this noise frame is sufficiently loud */
-           opus_val32 noise_energy = compute_frame_energy(pcm, frame_size, st->channels, st->arch);
+           oac_val32 noise_energy = compute_frame_energy(pcm, frame_size, st->channels, st->arch);
            activity = st->peak_signal_energy < (PSEUDO_SNR_THRESHOLD * noise_energy);
        }
     }
 #endif
     else if (st->mode == MODE_CELT_ONLY) {
-       opus_val32 noise_energy = compute_frame_energy(pcm, frame_size, st->channels, st->arch);
+       oac_val32 noise_energy = compute_frame_energy(pcm, frame_size, st->channels, st->arch);
        /* Boosting peak energy a bit because we didn't just average the active frames. */
-       activity = st->peak_signal_energy < (QCONST16(PSEUDO_SNR_THRESHOLD, 0) * (opus_val64)HALF32(noise_energy));
+       activity = st->peak_signal_energy < (QCONST16(PSEUDO_SNR_THRESHOLD, 0) * (oac_val64)HALF32(noise_energy));
     }
 
     /* For the first frame at a new SILK bandwidth */
@@ -1919,7 +1919,7 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
        if (redundancy_bytes == 0)
           redundancy = 0;
     }
-    if (st->application == OPUS_APPLICATION_RESTRICTED_SILK)
+    if (st->application == OAC_APPLICATION_RESTRICTED_SILK)
     {
        redundancy = 0;
        redundancy_bytes = 0;
@@ -1932,8 +1932,8 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
 
     ec_enc_init(&enc, data, orig_max_data_bytes-1);
 
-    ALLOC(pcm_buf, (total_buffer+frame_size)*st->channels, opus_res);
-    OPUS_COPY(pcm_buf, &st->delay_buffer[(st->encoder_buffer-total_buffer)*st->channels], total_buffer*st->channels);
+    ALLOC(pcm_buf, (total_buffer+frame_size)*st->channels, oac_res);
+    OAC_COPY(pcm_buf, &st->delay_buffer[(st->encoder_buffer-total_buffer)*st->channels], total_buffer*st->channels);
 
     if (st->mode == MODE_CELT_ONLY)
        hp_freq_smth1 = silk_LSHIFT( silk_lin2log( VARIABLE_HP_MIN_CUTOFF_HZ ), 8 );
@@ -1946,7 +1946,7 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
     /* convert from log scale to Hertz */
     cutoff_Hz = silk_log2lin( silk_RSHIFT( st->variable_HP_smth2_Q15, 8 ) );
 
-    if (st->application == OPUS_APPLICATION_VOIP)
+    if (st->application == OAC_APPLICATION_VOIP)
     {
        hp_cutoff(pcm, cutoff_Hz, &pcm_buf[total_buffer*st->channels], st->hp_mem, frame_size, st->channels, st->Fs, st->arch);
 
@@ -1960,10 +1960,10 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
 
        {
          int idx;
-         opus_int16 tmp;
+         oac_int16 tmp;
          for (idx = 0; idx < frame_size; idx++)
          {
-            tmp = (opus_int16) (32768 * pcm_buf[total_buffer + idx] + 0.5f);
+            tmp = (oac_int16) (32768 * pcm_buf[total_buffer + idx] + 0.5f);
             fwrite(&tmp, sizeof(tmp), 1, fout);
          }
        }
@@ -1974,13 +1974,13 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
 #ifndef FIXED_POINT
     if (float_api)
     {
-       opus_val32 sum;
+       oac_val32 sum;
        sum = celt_inner_prod(&pcm_buf[total_buffer*st->channels], &pcm_buf[total_buffer*st->channels], frame_size*st->channels, st->arch);
        /* This should filter out both NaNs and ridiculous signals that could
           cause NaNs further down. */
        if (!(sum < 1e9f) || celt_isnan(sum))
        {
-          OPUS_CLEAR(&pcm_buf[total_buffer*st->channels], frame_size*st->channels);
+          OAC_CLEAR(&pcm_buf[total_buffer*st->channels], frame_size*st->channels);
           st->hp_mem[0] = st->hp_mem[1] = st->hp_mem[2] = st->hp_mem[3] = 0;
        }
     }
@@ -1995,12 +1995,12 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
         /* DRED Encoder */
         dred_compute_latents( &st->dred_encoder, &pcm_buf[total_buffer*st->channels], frame_size, total_buffer, st->arch );
         frame_size_400Hz = frame_size*400/st->Fs;
-        OPUS_MOVE(&st->activity_mem[frame_size_400Hz], st->activity_mem, 4*DRED_MAX_FRAMES-frame_size_400Hz);
+        OAC_MOVE(&st->activity_mem[frame_size_400Hz], st->activity_mem, 4*DRED_MAX_FRAMES-frame_size_400Hz);
         for (i=0;i<frame_size_400Hz;i++)
            st->activity_mem[i] = activity;
     } else {
         st->dred_encoder.latents_buffer_fill = 0;
-        OPUS_CLEAR(st->activity_mem, 4*DRED_MAX_FRAMES);
+        OAC_CLEAR(st->activity_mem, 4*DRED_MAX_FRAMES);
     }
 #endif
 
@@ -2008,8 +2008,8 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
     HB_gain = Q15ONE;
     if (st->mode != MODE_CELT_ONLY)
     {
-        opus_int32 total_bitRate, celt_rate;
-        const opus_res *pcm_silk;
+        oac_int32 total_bitRate, celt_rate;
+        const oac_res *pcm_silk;
 
         /* Distribute bits between SILK and CELT */
         total_bitRate = bits_to_bitrate(bits_target, st->Fs, frame_size);
@@ -2032,17 +2032,17 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
         /* Surround masking for SILK */
         if (st->energy_masking && st->use_vbr && !st->lfe)
         {
-           opus_val32 mask_sum=0;
+           oac_val32 mask_sum=0;
            celt_glog masking_depth;
-           opus_int32 rate_offset;
+           oac_int32 rate_offset;
            int c;
            int end = 17;
-           opus_int16 srate = 16000;
-           if (st->bandwidth == OPUS_BANDWIDTH_NARROWBAND)
+           oac_int16 srate = 16000;
+           if (st->bandwidth == OAC_BANDWIDTH_NARROWBAND)
            {
               end = 13;
               srate = 8000;
-           } else if (st->bandwidth == OPUS_BANDWIDTH_MEDIUMBAND)
+           } else if (st->bandwidth == OAC_BANDWIDTH_MEDIUMBAND)
            {
               end = 15;
               srate = 12000;
@@ -2062,10 +2062,10 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
            /* Conservative rate reduction, we cut the masking in half */
            masking_depth = mask_sum / end*st->channels;
            masking_depth += GCONST(.2f);
-           rate_offset = (opus_int32)PSHR32(MULT16_16(srate, SHR32(masking_depth, DB_SHIFT-10)), 10);
+           rate_offset = (oac_int32)PSHR32(MULT16_16(srate, SHR32(masking_depth, DB_SHIFT-10)), 10);
            rate_offset = MAX32(rate_offset, -2*st->silk_mode.bitRate/3);
            /* Split the rate change between the SILK and CELT part for hybrid. */
-           if (st->bandwidth==OPUS_BANDWIDTH_SUPERWIDEBAND || st->bandwidth==OPUS_BANDWIDTH_FULLBAND)
+           if (st->bandwidth==OAC_BANDWIDTH_SUPERWIDEBAND || st->bandwidth==OAC_BANDWIDTH_FULLBAND)
               st->silk_mode.bitRate += 3*rate_offset/5;
            else
               st->silk_mode.bitRate += rate_offset;
@@ -2074,12 +2074,12 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
         st->silk_mode.payloadSize_ms = 1000 * frame_size / st->Fs;
         st->silk_mode.nChannelsAPI = st->channels;
         st->silk_mode.nChannelsInternal = st->stream_channels;
-        if (curr_bandwidth == OPUS_BANDWIDTH_NARROWBAND) {
+        if (curr_bandwidth == OAC_BANDWIDTH_NARROWBAND) {
             st->silk_mode.desiredInternalSampleRate = 8000;
-        } else if (curr_bandwidth == OPUS_BANDWIDTH_MEDIUMBAND) {
+        } else if (curr_bandwidth == OAC_BANDWIDTH_MEDIUMBAND) {
             st->silk_mode.desiredInternalSampleRate = 12000;
         } else {
-            celt_assert( st->mode == MODE_HYBRID || curr_bandwidth == OPUS_BANDWIDTH_WIDEBAND );
+            celt_assert( st->mode == MODE_HYBRID || curr_bandwidth == OAC_BANDWIDTH_WIDEBAND );
             st->silk_mode.desiredInternalSampleRate = 16000;
         }
         if( st->mode == MODE_HYBRID ) {
@@ -2092,7 +2092,7 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
         st->silk_mode.maxInternalSampleRate = 16000;
         if (st->mode == MODE_SILK_ONLY)
         {
-           opus_int32 effective_max_rate = bits_to_bitrate(max_data_bytes*8, st->Fs, frame_size);
+           oac_int32 effective_max_rate = bits_to_bitrate(max_data_bytes*8, st->Fs, frame_size);
            if (frame_rate > 50)
               effective_max_rate = effective_max_rate*2/3;
            if (effective_max_rate < 8000)
@@ -2136,7 +2136,7 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
 #endif
            {
               /* Allow SILK to steal up to 25% of the remaining bits */
-              opus_int16 other_bits = IMAX(0, st->silk_mode.maxBits - st->silk_mode.bitRate * frame_size / st->Fs);
+              oac_int16 other_bits = IMAX(0, st->silk_mode.maxBits - st->silk_mode.bitRate * frame_size / st->Fs);
               st->silk_mode.maxBits = IMAX(0, st->silk_mode.maxBits - other_bits*3/4);
               st->silk_mode.useCBR = 0;
            }
@@ -2145,16 +2145,16 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
            if (st->mode == MODE_HYBRID)
            {
               /* Compute SILK bitrate corresponding to the max total bits available */
-              opus_int32 maxBitRate = compute_silk_rate_for_hybrid(st->silk_mode.maxBits*st->Fs / frame_size,
+              oac_int32 maxBitRate = compute_silk_rate_for_hybrid(st->silk_mode.maxBits*st->Fs / frame_size,
                     curr_bandwidth, st->Fs == 50 * frame_size, st->use_vbr, st->silk_mode.LBRR_coded,
                     st->stream_channels);
               st->silk_mode.maxBits = bitrate_to_bits(maxBitRate, st->Fs, frame_size);
            }
         }
 
-        if (prefill && st->application != OPUS_APPLICATION_RESTRICTED_SILK)
+        if (prefill && st->application != OAC_APPLICATION_RESTRICTED_SILK)
         {
-            opus_int32 zero=0;
+            oac_int32 zero=0;
             int prefill_offset;
             /* Use a smooth onset for the SILK prefill to avoid the encoder trying to encode
                a discontinuity. The exact location is what we need to avoid leaving any "gap"
@@ -2165,11 +2165,11 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
             prefill_offset = st->channels*(st->encoder_buffer-st->delay_compensation-st->Fs/400);
             gain_fade(st->delay_buffer+prefill_offset, st->delay_buffer+prefill_offset,
                   0, Q15ONE, celt_mode->overlap, st->Fs/400, st->channels, celt_mode->window, st->Fs);
-            OPUS_CLEAR(st->delay_buffer, prefill_offset);
+            OAC_CLEAR(st->delay_buffer, prefill_offset);
             pcm_silk = st->delay_buffer;
             silk_Encode( silk_enc, &st->silk_mode, pcm_silk, st->encoder_buffer, NULL, &zero, prefill, activity );
             /* Prevent a second switch in the real encode call. */
-            st->silk_mode.opusCanSwitch = 0;
+            st->silk_mode.oacCanSwitch = 0;
         }
 
         pcm_silk = pcm_buf+total_buffer*st->channels;
@@ -2178,23 +2178,23 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
             /*fprintf (stderr, "SILK encode error: %d\n", ret);*/
             /* Handle error */
            RESTORE_STACK;
-           return OPUS_INTERNAL_ERROR;
+           return OAC_INTERNAL_ERROR;
         }
 
         /* Extract SILK internal bandwidth for signaling in first byte */
         if( st->mode == MODE_SILK_ONLY ) {
             if( st->silk_mode.internalSampleRate == 8000 ) {
-               curr_bandwidth = OPUS_BANDWIDTH_NARROWBAND;
+               curr_bandwidth = OAC_BANDWIDTH_NARROWBAND;
             } else if( st->silk_mode.internalSampleRate == 12000 ) {
-               curr_bandwidth = OPUS_BANDWIDTH_MEDIUMBAND;
+               curr_bandwidth = OAC_BANDWIDTH_MEDIUMBAND;
             } else if( st->silk_mode.internalSampleRate == 16000 ) {
-               curr_bandwidth = OPUS_BANDWIDTH_WIDEBAND;
+               curr_bandwidth = OAC_BANDWIDTH_WIDEBAND;
             }
         } else {
             celt_assert( st->silk_mode.internalSampleRate == 16000 );
         }
 
-        st->silk_mode.opusCanSwitch = st->silk_mode.switchReady && !st->nonfinal_frame;
+        st->silk_mode.oacCanSwitch = st->silk_mode.switchReady && !st->nonfinal_frame;
 
         if (activity == VAD_NO_DECISION) {
            activity = (st->silk_mode.signalType != TYPE_NO_VOICE_ACTIVITY);
@@ -2212,9 +2212,9 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
         }
 
         /* FIXME: How do we allocate the redundancy for CBR? */
-        if (st->silk_mode.opusCanSwitch)
+        if (st->silk_mode.oacCanSwitch)
         {
-           if (st->application != OPUS_APPLICATION_RESTRICTED_SILK)
+           if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
            {
               redundancy_bytes = compute_redundancy_bytes(max_data_bytes, st->bitrate_bps, frame_rate, st->stream_channels);
               redundancy = (redundancy_bytes != 0);
@@ -2225,54 +2225,54 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
     }
 
     /* CELT processing */
-    if (st->application != OPUS_APPLICATION_RESTRICTED_SILK)
+    if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
     {
         int endband=21;
 
         switch(curr_bandwidth)
         {
-            case OPUS_BANDWIDTH_NARROWBAND:
+            case OAC_BANDWIDTH_NARROWBAND:
                 endband = 13;
                 break;
-            case OPUS_BANDWIDTH_MEDIUMBAND:
-            case OPUS_BANDWIDTH_WIDEBAND:
+            case OAC_BANDWIDTH_MEDIUMBAND:
+            case OAC_BANDWIDTH_WIDEBAND:
                 endband = 17;
                 break;
-            case OPUS_BANDWIDTH_SUPERWIDEBAND:
+            case OAC_BANDWIDTH_SUPERWIDEBAND:
                 endband = 19;
                 break;
-            case OPUS_BANDWIDTH_FULLBAND:
+            case OAC_BANDWIDTH_FULLBAND:
                 endband = 21;
                 break;
         }
         celt_encoder_ctl(celt_enc, CELT_SET_END_BAND(endband));
         celt_encoder_ctl(celt_enc, CELT_SET_CHANNELS(st->stream_channels));
-        celt_encoder_ctl(celt_enc, OPUS_SET_BITRATE(OPUS_BITRATE_MAX));
+        celt_encoder_ctl(celt_enc, OAC_SET_BITRATE(OAC_BITRATE_MAX));
     }
     if (st->mode != MODE_SILK_ONLY)
     {
-        opus_val32 celt_pred=2;
+        oac_val32 celt_pred=2;
         /* We may still decide to disable prediction later */
         if (st->silk_mode.reducedDependency)
            celt_pred = 0;
         celt_encoder_ctl(celt_enc, CELT_SET_PREDICTION(celt_pred));
     }
 
-    ALLOC(tmp_prefill, st->channels*st->Fs/400, opus_res);
+    ALLOC(tmp_prefill, st->channels*st->Fs/400, oac_res);
     if (st->mode != MODE_SILK_ONLY && st->mode != st->prev_mode && st->prev_mode > 0
-          && st->application != OPUS_APPLICATION_RESTRICTED_CELT)
+          && st->application != OAC_APPLICATION_RESTRICTED_CELT)
     {
-       OPUS_COPY(tmp_prefill, &st->delay_buffer[(st->encoder_buffer-total_buffer-st->Fs/400)*st->channels], st->channels*st->Fs/400);
+       OAC_COPY(tmp_prefill, &st->delay_buffer[(st->encoder_buffer-total_buffer-st->Fs/400)*st->channels], st->channels*st->Fs/400);
     }
 
     if (st->channels*(st->encoder_buffer-(frame_size+total_buffer)) > 0)
     {
-       OPUS_MOVE(st->delay_buffer, &st->delay_buffer[st->channels*frame_size], st->channels*(st->encoder_buffer-frame_size-total_buffer));
-       OPUS_COPY(&st->delay_buffer[st->channels*(st->encoder_buffer-frame_size-total_buffer)],
+       OAC_MOVE(st->delay_buffer, &st->delay_buffer[st->channels*frame_size], st->channels*(st->encoder_buffer-frame_size-total_buffer));
+       OAC_COPY(&st->delay_buffer[st->channels*(st->encoder_buffer-frame_size-total_buffer)],
              &pcm_buf[0],
              (frame_size+total_buffer)*st->channels);
     } else {
-       OPUS_COPY(st->delay_buffer, &pcm_buf[(frame_size+total_buffer-st->encoder_buffer)*st->channels], st->encoder_buffer*st->channels);
+       OAC_COPY(st->delay_buffer, &pcm_buf[(frame_size+total_buffer-st->encoder_buffer)*st->channels], st->encoder_buffer*st->channels);
     }
     /* gain_fade() and stereo_fade() need to be after the buffer copying
        because we don't want any of this to affect the SILK part */
@@ -2288,14 +2288,14 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
        else if (equiv_rate < 16000)
           st->silk_mode.stereoWidth_Q14 = 0;
        else
-          st->silk_mode.stereoWidth_Q14 = 16384 - 2048*(opus_int32)(32000-equiv_rate)/(equiv_rate-14000);
+          st->silk_mode.stereoWidth_Q14 = 16384 - 2048*(oac_int32)(32000-equiv_rate)/(equiv_rate-14000);
     }
     if( !st->energy_masking && st->channels == 2 ) {
         /* Apply stereo width reduction (at low bitrates) */
         if( st->hybrid_stereo_width_Q14 < (1 << 14) || st->silk_mode.stereoWidth_Q14 < (1 << 14) ) {
-            opus_val16 g1, g2;
+            oac_val16 g1, g2;
             g1 = st->hybrid_stereo_width_Q14;
-            g2 = (opus_val16)(st->silk_mode.stereoWidth_Q14);
+            g2 = (oac_val16)(st->silk_mode.stereoWidth_Q14);
 #ifdef FIXED_POINT
             g1 = g1==16384 ? Q15ONE : SHL16(g1,1);
             g2 = g2==16384 ? Q15ONE : SHL16(g2,1);
@@ -2358,7 +2358,7 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
         if (st->dred_duration > 0)
         {
             int max_celt_bytes;
-            opus_int32 dred_bytes = bitrate_to_bits(dred_bitrate_bps, st->Fs, frame_size)/8;
+            oac_int32 dred_bytes = bitrate_to_bits(dred_bitrate_bps, st->Fs, frame_size)/8;
             /* Allow CELT to steal up to 25% of the remaining bits. */
             max_celt_bytes = nb_compr_bytes - dred_bytes*3/4;
             /* But try to give CELT at least 5 bytes to prevent a mismatch with
@@ -2387,56 +2387,56 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
     {
         int err;
         celt_encoder_ctl(celt_enc, CELT_SET_START_BAND(0));
-        celt_encoder_ctl(celt_enc, OPUS_SET_VBR(0));
-        celt_encoder_ctl(celt_enc, OPUS_SET_BITRATE(OPUS_BITRATE_MAX));
+        celt_encoder_ctl(celt_enc, OAC_SET_VBR(0));
+        celt_encoder_ctl(celt_enc, OAC_SET_BITRATE(OAC_BITRATE_MAX));
         err = celt_encode_with_ec(celt_enc, pcm_buf, st->Fs/200, data+nb_compr_bytes, redundancy_bytes, NULL);
         if (err < 0)
         {
            RESTORE_STACK;
-           return OPUS_INTERNAL_ERROR;
+           return OAC_INTERNAL_ERROR;
         }
-        celt_encoder_ctl(celt_enc, OPUS_GET_FINAL_RANGE(&redundant_rng));
-        celt_encoder_ctl(celt_enc, OPUS_RESET_STATE);
+        celt_encoder_ctl(celt_enc, OAC_GET_FINAL_RANGE(&redundant_rng));
+        celt_encoder_ctl(celt_enc, OAC_RESET_STATE);
     }
 
-    if (st->application != OPUS_APPLICATION_RESTRICTED_SILK)
+    if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
        celt_encoder_ctl(celt_enc, CELT_SET_START_BAND(start_band));
 
     data[-1] = 0;
     if (st->mode != MODE_SILK_ONLY)
     {
-        celt_encoder_ctl(celt_enc, OPUS_SET_VBR(st->use_vbr));
+        celt_encoder_ctl(celt_enc, OAC_SET_VBR(st->use_vbr));
         if (st->mode == MODE_HYBRID)
         {
             if( st->use_vbr ) {
-                celt_encoder_ctl(celt_enc, OPUS_SET_BITRATE(st->bitrate_bps-st->silk_mode.bitRate));
-                celt_encoder_ctl(celt_enc, OPUS_SET_VBR_CONSTRAINT(0));
+                celt_encoder_ctl(celt_enc, OAC_SET_BITRATE(st->bitrate_bps-st->silk_mode.bitRate));
+                celt_encoder_ctl(celt_enc, OAC_SET_VBR_CONSTRAINT(0));
             }
         } else {
             if (st->use_vbr)
             {
-                celt_encoder_ctl(celt_enc, OPUS_SET_VBR(1));
-                celt_encoder_ctl(celt_enc, OPUS_SET_VBR_CONSTRAINT(st->vbr_constraint));
-                celt_encoder_ctl(celt_enc, OPUS_SET_BITRATE(st->bitrate_bps));
+                celt_encoder_ctl(celt_enc, OAC_SET_VBR(1));
+                celt_encoder_ctl(celt_enc, OAC_SET_VBR_CONSTRAINT(st->vbr_constraint));
+                celt_encoder_ctl(celt_enc, OAC_SET_BITRATE(st->bitrate_bps));
             }
         }
 #ifdef ENABLE_DRED
         /* When Using DRED CBR, we can actually make the CELT part VBR and have DRED pick up the slack. */
         if (!st->use_vbr && st->dred_duration > 0)
         {
-            opus_int32 celt_bitrate = st->bitrate_bps;
-            celt_encoder_ctl(celt_enc, OPUS_SET_VBR(1));
-            celt_encoder_ctl(celt_enc, OPUS_SET_VBR_CONSTRAINT(0));
+            oac_int32 celt_bitrate = st->bitrate_bps;
+            celt_encoder_ctl(celt_enc, OAC_SET_VBR(1));
+            celt_encoder_ctl(celt_enc, OAC_SET_VBR_CONSTRAINT(0));
             if (st->mode == MODE_HYBRID) {
                 celt_bitrate -= st->silk_mode.bitRate;
             }
-            celt_encoder_ctl(celt_enc, OPUS_SET_BITRATE(celt_bitrate));
+            celt_encoder_ctl(celt_enc, OAC_SET_BITRATE(celt_bitrate));
         }
 #endif
-        if (st->mode != st->prev_mode && st->prev_mode > 0 && st->application != OPUS_APPLICATION_RESTRICTED_CELT)
+        if (st->mode != st->prev_mode && st->prev_mode > 0 && st->application != OAC_APPLICATION_RESTRICTED_CELT)
         {
            unsigned char dummy[2];
-           celt_encoder_ctl(celt_enc, OPUS_RESET_STATE);
+           celt_encoder_ctl(celt_enc, OAC_RESET_STATE);
 
            /* Prefilling */
            celt_encode_with_ec(celt_enc, tmp_prefill, st->Fs/400, dummy, 2, NULL);
@@ -2449,16 +2449,16 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
            if (ret < 0)
            {
               RESTORE_STACK;
-              return OPUS_INTERNAL_ERROR;
+              return OAC_INTERNAL_ERROR;
            }
            /* Put CELT->SILK redundancy data in the right place. */
            if (redundancy && celt_to_silk && st->mode==MODE_HYBRID && nb_compr_bytes != ret)
            {
-              OPUS_MOVE(data+ret, data+nb_compr_bytes, redundancy_bytes);
+              OAC_MOVE(data+ret, data+nb_compr_bytes, redundancy_bytes);
               nb_compr_bytes = ret+redundancy_bytes;
            }
         }
-        celt_encoder_ctl(celt_enc, OPUS_GET_FINAL_RANGE(&st->rangeFinal));
+        celt_encoder_ctl(celt_enc, OAC_GET_FINAL_RANGE(&st->rangeFinal));
     } else {
        st->rangeFinal = enc.rng;
     }
@@ -2472,11 +2472,11 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
         N2 = st->Fs/200;
         N4 = st->Fs/400;
 
-        celt_encoder_ctl(celt_enc, OPUS_RESET_STATE);
+        celt_encoder_ctl(celt_enc, OAC_RESET_STATE);
         celt_encoder_ctl(celt_enc, CELT_SET_START_BAND(0));
         celt_encoder_ctl(celt_enc, CELT_SET_PREDICTION(0));
-        celt_encoder_ctl(celt_enc, OPUS_SET_VBR(0));
-        celt_encoder_ctl(celt_enc, OPUS_SET_BITRATE(OPUS_BITRATE_MAX));
+        celt_encoder_ctl(celt_enc, OAC_SET_VBR(0));
+        celt_encoder_ctl(celt_enc, OAC_SET_BITRATE(OAC_BITRATE_MAX));
 
         if (st->mode == MODE_HYBRID)
         {
@@ -2491,9 +2491,9 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
         if (err < 0)
         {
            RESTORE_STACK;
-           return OPUS_INTERNAL_ERROR;
+           return OAC_INTERNAL_ERROR;
         }
-        celt_encoder_ctl(celt_enc, OPUS_GET_FINAL_RANGE(&redundant_rng));
+        celt_encoder_ctl(celt_enc, OAC_GET_FINAL_RANGE(&redundant_rng));
     }
 
 
@@ -2534,7 +2534,7 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
        if (max_data_bytes < 2)
        {
           RESTORE_STACK;
-          return OPUS_BUFFER_TOO_SMALL;
+          return OAC_BUFFER_TOO_SMALL;
        }
        data[1] = 0;
        ret = 1;
@@ -2554,7 +2554,7 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
     apply_padding = !st->use_vbr;
 #ifdef ENABLE_DRED
     if (st->dred_duration > 0 && st->dred_encoder.loaded && first_frame) {
-       opus_extension_data extension;
+       oac_extension_data extension;
        unsigned char buf[DRED_MAX_DATA_SIZE];
        int dred_chunks;
        int dred_bytes_left;
@@ -2582,11 +2582,11 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
               extension.frame = 0;
               extension.data = buf;
               extension.len = dred_bytes;
-              ret = opus_packet_pad_impl(data, ret, orig_max_data_bytes, !st->use_vbr, &extension, 1);
+              ret = oac_packet_pad_impl(data, ret, orig_max_data_bytes, !st->use_vbr, &extension, 1);
               if (ret < 0)
               {
                  RESTORE_STACK;
-                 return OPUS_INTERNAL_ERROR;
+                 return OAC_INTERNAL_ERROR;
               }
               apply_padding = 0;
            }
@@ -2597,10 +2597,10 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
 #endif
     if (apply_padding)
     {
-       if (opus_packet_pad(data, ret, orig_max_data_bytes) != OPUS_OK)
+       if (oac_packet_pad(data, ret, orig_max_data_bytes) != OAC_OK)
        {
           RESTORE_STACK;
-          return OPUS_INTERNAL_ERROR;
+          return OAC_INTERNAL_ERROR;
        }
        ret = orig_max_data_bytes;
     }
@@ -2610,59 +2610,59 @@ static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_res *pcm,
 
 
 
-opus_int32 opus_encode(OpusEncoder *st, const opus_int16 *pcm, int analysis_frame_size,
-                unsigned char *data, opus_int32 max_data_bytes)
+oac_int32 oac_encode(OacEncoder *st, const oac_int16 *pcm, int analysis_frame_size,
+                unsigned char *data, oac_int32 max_data_bytes)
 {
    int i, ret;
    int frame_size;
-   VARDECL(opus_res, in);
+   VARDECL(oac_res, in);
    ALLOC_STACK;
 
    frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
    if (frame_size <= 0)
    {
       RESTORE_STACK;
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    }
-   ALLOC(in, frame_size*st->channels, opus_res);
+   ALLOC(in, frame_size*st->channels, oac_res);
 
    for (i=0;i<frame_size*st->channels;i++)
       in[i] = INT16TORES(pcm[i]);
-   ret = opus_encode_native(st, in, frame_size, data, max_data_bytes, 16,
+   ret = oac_encode_native(st, in, frame_size, data, max_data_bytes, 16,
                             pcm, analysis_frame_size, 0, -2, st->channels, downmix_int, 1);
    RESTORE_STACK;
    return ret;
 }
 
 #if defined(FIXED_POINT)
-opus_int32 opus_encode24(OpusEncoder *st, const opus_int32 *pcm, int analysis_frame_size,
-                unsigned char *data, opus_int32 max_data_bytes)
+oac_int32 oac_encode24(OacEncoder *st, const oac_int32 *pcm, int analysis_frame_size,
+                unsigned char *data, oac_int32 max_data_bytes)
 {
    int frame_size;
    frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
-   return opus_encode_native(st, pcm, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH,
+   return oac_encode_native(st, pcm, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH,
                              pcm, analysis_frame_size, 0, -2, st->channels, downmix_int24, 0);
 }
 #else
-opus_int32 opus_encode24(OpusEncoder *st, const opus_int32 *pcm, int analysis_frame_size,
-                unsigned char *data, opus_int32 max_data_bytes)
+oac_int32 oac_encode24(OacEncoder *st, const oac_int32 *pcm, int analysis_frame_size,
+                unsigned char *data, oac_int32 max_data_bytes)
 {
    int i, ret;
    int frame_size;
-   VARDECL(opus_res, in);
+   VARDECL(oac_res, in);
    ALLOC_STACK;
 
    frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
    if (frame_size <= 0)
    {
       RESTORE_STACK;
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    }
-   ALLOC(in, frame_size*st->channels, opus_res);
+   ALLOC(in, frame_size*st->channels, oac_res);
 
    for (i=0;i<frame_size*st->channels;i++)
       in[i] = INT24TORES(pcm[i]);
-   ret = opus_encode_native(st, in, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH,
+   ret = oac_encode_native(st, in, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH,
                             pcm, analysis_frame_size, 0, -2, st->channels, downmix_int24, 1);
    RESTORE_STACK;
    return ret;
@@ -2673,34 +2673,34 @@ opus_int32 opus_encode24(OpusEncoder *st, const opus_int32 *pcm, int analysis_fr
 #ifndef DISABLE_FLOAT_API
 
 # if !defined(FIXED_POINT)
-opus_int32 opus_encode_float(OpusEncoder *st, const float *pcm, int analysis_frame_size,
-                      unsigned char *data, opus_int32 out_data_bytes)
+oac_int32 oac_encode_float(OacEncoder *st, const float *pcm, int analysis_frame_size,
+                      unsigned char *data, oac_int32 out_data_bytes)
 {
    int frame_size;
    frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
-   return opus_encode_native(st, pcm, frame_size, data, out_data_bytes, MAX_ENCODING_DEPTH,
+   return oac_encode_native(st, pcm, frame_size, data, out_data_bytes, MAX_ENCODING_DEPTH,
                              pcm, analysis_frame_size, 0, -2, st->channels, downmix_float, 1);
 }
 # else
-opus_int32 opus_encode_float(OpusEncoder *st, const float *pcm, int analysis_frame_size,
-      unsigned char *data, opus_int32 max_data_bytes)
+oac_int32 oac_encode_float(OacEncoder *st, const float *pcm, int analysis_frame_size,
+      unsigned char *data, oac_int32 max_data_bytes)
 {
    int i, ret;
    int frame_size;
-   VARDECL(opus_res, in);
+   VARDECL(oac_res, in);
    ALLOC_STACK;
 
    frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
    if (frame_size <= 0)
    {
       RESTORE_STACK;
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    }
-   ALLOC(in, frame_size*st->channels, opus_res);
+   ALLOC(in, frame_size*st->channels, oac_res);
 
    for (i=0;i<frame_size*st->channels;i++)
       in[i] = FLOAT2RES(pcm[i]);
-   ret = opus_encode_native(st, in, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH,
+   ret = oac_encode_native(st, in, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH,
                             pcm, analysis_frame_size, 0, -2, st->channels, downmix_float, 1);
    RESTORE_STACK;
    return ret;
@@ -2710,33 +2710,33 @@ opus_int32 opus_encode_float(OpusEncoder *st, const float *pcm, int analysis_fra
 #endif
 
 
-int opus_encoder_ctl(OpusEncoder *st, int request, ...)
+int oac_encoder_ctl(OacEncoder *st, int request, ...)
 {
     int ret;
     CELTEncoder *celt_enc=NULL;
     va_list ap;
 
-    ret = OPUS_OK;
+    ret = OAC_OK;
     va_start(ap, request);
 
-    if (st->application != OPUS_APPLICATION_RESTRICTED_SILK)
+    if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
        celt_enc = (CELTEncoder*)((char*)st+st->celt_enc_offset);
 
     switch (request)
     {
-        case OPUS_SET_APPLICATION_REQUEST:
+        case OAC_SET_APPLICATION_REQUEST:
         {
-            opus_int32 value = va_arg(ap, opus_int32);
-            if (st->application == OPUS_APPLICATION_RESTRICTED_SILK || st->application == OPUS_APPLICATION_RESTRICTED_CELT)
+            oac_int32 value = va_arg(ap, oac_int32);
+            if (st->application == OAC_APPLICATION_RESTRICTED_SILK || st->application == OAC_APPLICATION_RESTRICTED_CELT)
             {
-               ret = OPUS_BAD_ARG;
+               ret = OAC_BAD_ARG;
                break;
             }
-            if (   (value != OPUS_APPLICATION_VOIP && value != OPUS_APPLICATION_AUDIO
-                 && value != OPUS_APPLICATION_RESTRICTED_LOWDELAY)
+            if (   (value != OAC_APPLICATION_VOIP && value != OAC_APPLICATION_AUDIO
+                 && value != OAC_APPLICATION_RESTRICTED_LOWDELAY)
                || (!st->first && st->application != value))
             {
-               ret = OPUS_BAD_ARG;
+               ret = OAC_BAD_ARG;
                break;
             }
             st->application = value;
@@ -2745,9 +2745,9 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
 #endif
         }
         break;
-        case OPUS_GET_APPLICATION_REQUEST:
+        case OAC_GET_APPLICATION_REQUEST:
         {
-            opus_int32 *value = va_arg(ap, opus_int32*);
+            oac_int32 *value = va_arg(ap, oac_int32*);
             if (!value)
             {
                goto bad_arg;
@@ -2755,24 +2755,24 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             *value = st->application;
         }
         break;
-        case OPUS_SET_BITRATE_REQUEST:
+        case OAC_SET_BITRATE_REQUEST:
         {
-            opus_int32 value = va_arg(ap, opus_int32);
-            if (value != OPUS_AUTO && value != OPUS_BITRATE_MAX)
+            oac_int32 value = va_arg(ap, oac_int32);
+            if (value != OAC_AUTO && value != OAC_BITRATE_MAX)
             {
                 if (value <= 0)
                     goto bad_arg;
                 else if (value <= 500)
                     value = 500;
-                else if (value > (opus_int32)750000*st->channels)
-                    value = (opus_int32)750000*st->channels;
+                else if (value > (oac_int32)750000*st->channels)
+                    value = (oac_int32)750000*st->channels;
             }
             st->user_bitrate_bps = value;
         }
         break;
-        case OPUS_GET_BITRATE_REQUEST:
+        case OAC_GET_BITRATE_REQUEST:
         {
-            opus_int32 *value = va_arg(ap, opus_int32*);
+            oac_int32 *value = va_arg(ap, oac_int32*);
             if (!value)
             {
                goto bad_arg;
@@ -2780,19 +2780,19 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             *value = user_bitrate_to_bitrate(st, st->prev_framesize, 1276);
         }
         break;
-        case OPUS_SET_FORCE_CHANNELS_REQUEST:
+        case OAC_SET_FORCE_CHANNELS_REQUEST:
         {
-            opus_int32 value = va_arg(ap, opus_int32);
-            if((value<1 || value>st->channels) && value != OPUS_AUTO)
+            oac_int32 value = va_arg(ap, oac_int32);
+            if((value<1 || value>st->channels) && value != OAC_AUTO)
             {
                goto bad_arg;
             }
             st->force_channels = value;
         }
         break;
-        case OPUS_GET_FORCE_CHANNELS_REQUEST:
+        case OAC_GET_FORCE_CHANNELS_REQUEST:
         {
-            opus_int32 *value = va_arg(ap, opus_int32*);
+            oac_int32 *value = va_arg(ap, oac_int32*);
             if (!value)
             {
                goto bad_arg;
@@ -2800,26 +2800,26 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             *value = st->force_channels;
         }
         break;
-        case OPUS_SET_MAX_BANDWIDTH_REQUEST:
+        case OAC_SET_MAX_BANDWIDTH_REQUEST:
         {
-            opus_int32 value = va_arg(ap, opus_int32);
-            if (value < OPUS_BANDWIDTH_NARROWBAND || value > OPUS_BANDWIDTH_FULLBAND)
+            oac_int32 value = va_arg(ap, oac_int32);
+            if (value < OAC_BANDWIDTH_NARROWBAND || value > OAC_BANDWIDTH_FULLBAND)
             {
                goto bad_arg;
             }
             st->max_bandwidth = value;
-            if (st->max_bandwidth == OPUS_BANDWIDTH_NARROWBAND) {
+            if (st->max_bandwidth == OAC_BANDWIDTH_NARROWBAND) {
                 st->silk_mode.maxInternalSampleRate = 8000;
-            } else if (st->max_bandwidth == OPUS_BANDWIDTH_MEDIUMBAND) {
+            } else if (st->max_bandwidth == OAC_BANDWIDTH_MEDIUMBAND) {
                 st->silk_mode.maxInternalSampleRate = 12000;
             } else {
                 st->silk_mode.maxInternalSampleRate = 16000;
             }
         }
         break;
-        case OPUS_GET_MAX_BANDWIDTH_REQUEST:
+        case OAC_GET_MAX_BANDWIDTH_REQUEST:
         {
-            opus_int32 *value = va_arg(ap, opus_int32*);
+            oac_int32 *value = va_arg(ap, oac_int32*);
             if (!value)
             {
                goto bad_arg;
@@ -2827,26 +2827,26 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             *value = st->max_bandwidth;
         }
         break;
-        case OPUS_SET_BANDWIDTH_REQUEST:
+        case OAC_SET_BANDWIDTH_REQUEST:
         {
-            opus_int32 value = va_arg(ap, opus_int32);
-            if ((value < OPUS_BANDWIDTH_NARROWBAND || value > OPUS_BANDWIDTH_FULLBAND) && value != OPUS_AUTO)
+            oac_int32 value = va_arg(ap, oac_int32);
+            if ((value < OAC_BANDWIDTH_NARROWBAND || value > OAC_BANDWIDTH_FULLBAND) && value != OAC_AUTO)
             {
                goto bad_arg;
             }
             st->user_bandwidth = value;
-            if (st->user_bandwidth == OPUS_BANDWIDTH_NARROWBAND) {
+            if (st->user_bandwidth == OAC_BANDWIDTH_NARROWBAND) {
                 st->silk_mode.maxInternalSampleRate = 8000;
-            } else if (st->user_bandwidth == OPUS_BANDWIDTH_MEDIUMBAND) {
+            } else if (st->user_bandwidth == OAC_BANDWIDTH_MEDIUMBAND) {
                 st->silk_mode.maxInternalSampleRate = 12000;
             } else {
                 st->silk_mode.maxInternalSampleRate = 16000;
             }
         }
         break;
-        case OPUS_GET_BANDWIDTH_REQUEST:
+        case OAC_GET_BANDWIDTH_REQUEST:
         {
-            opus_int32 *value = va_arg(ap, opus_int32*);
+            oac_int32 *value = va_arg(ap, oac_int32*);
             if (!value)
             {
                goto bad_arg;
@@ -2854,9 +2854,9 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             *value = st->bandwidth;
         }
         break;
-        case OPUS_SET_DTX_REQUEST:
+        case OAC_SET_DTX_REQUEST:
         {
-            opus_int32 value = va_arg(ap, opus_int32);
+            oac_int32 value = va_arg(ap, oac_int32);
             if(value<0 || value>1)
             {
                goto bad_arg;
@@ -2864,9 +2864,9 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             st->use_dtx = value;
         }
         break;
-        case OPUS_GET_DTX_REQUEST:
+        case OAC_GET_DTX_REQUEST:
         {
-            opus_int32 *value = va_arg(ap, opus_int32*);
+            oac_int32 *value = va_arg(ap, oac_int32*);
             if (!value)
             {
                goto bad_arg;
@@ -2874,21 +2874,21 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             *value = st->use_dtx;
         }
         break;
-        case OPUS_SET_COMPLEXITY_REQUEST:
+        case OAC_SET_COMPLEXITY_REQUEST:
         {
-            opus_int32 value = va_arg(ap, opus_int32);
+            oac_int32 value = va_arg(ap, oac_int32);
             if(value<0 || value>10)
             {
                goto bad_arg;
             }
             st->silk_mode.complexity = value;
-            if (st->application != OPUS_APPLICATION_RESTRICTED_SILK)
-               celt_encoder_ctl(celt_enc, OPUS_SET_COMPLEXITY(value));
+            if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
+               celt_encoder_ctl(celt_enc, OAC_SET_COMPLEXITY(value));
         }
         break;
-        case OPUS_GET_COMPLEXITY_REQUEST:
+        case OAC_GET_COMPLEXITY_REQUEST:
         {
-            opus_int32 *value = va_arg(ap, opus_int32*);
+            oac_int32 *value = va_arg(ap, oac_int32*);
             if (!value)
             {
                goto bad_arg;
@@ -2896,9 +2896,9 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             *value = st->silk_mode.complexity;
         }
         break;
-        case OPUS_SET_INBAND_FEC_REQUEST:
+        case OAC_SET_INBAND_FEC_REQUEST:
         {
-            opus_int32 value = va_arg(ap, opus_int32);
+            oac_int32 value = va_arg(ap, oac_int32);
             if(value<0 || value>2)
             {
                goto bad_arg;
@@ -2907,9 +2907,9 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             st->silk_mode.useInBandFEC = (value != 0);
         }
         break;
-        case OPUS_GET_INBAND_FEC_REQUEST:
+        case OAC_GET_INBAND_FEC_REQUEST:
         {
-            opus_int32 *value = va_arg(ap, opus_int32*);
+            oac_int32 *value = va_arg(ap, oac_int32*);
             if (!value)
             {
                goto bad_arg;
@@ -2917,21 +2917,21 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             *value = st->fec_config;
         }
         break;
-        case OPUS_SET_PACKET_LOSS_PERC_REQUEST:
+        case OAC_SET_PACKET_LOSS_PERC_REQUEST:
         {
-            opus_int32 value = va_arg(ap, opus_int32);
+            oac_int32 value = va_arg(ap, oac_int32);
             if (value < 0 || value > 100)
             {
                goto bad_arg;
             }
             st->silk_mode.packetLossPercentage = value;
-            if (st->application != OPUS_APPLICATION_RESTRICTED_SILK)
-               celt_encoder_ctl(celt_enc, OPUS_SET_PACKET_LOSS_PERC(value));
+            if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
+               celt_encoder_ctl(celt_enc, OAC_SET_PACKET_LOSS_PERC(value));
         }
         break;
-        case OPUS_GET_PACKET_LOSS_PERC_REQUEST:
+        case OAC_GET_PACKET_LOSS_PERC_REQUEST:
         {
-            opus_int32 *value = va_arg(ap, opus_int32*);
+            oac_int32 *value = va_arg(ap, oac_int32*);
             if (!value)
             {
                goto bad_arg;
@@ -2939,9 +2939,9 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             *value = st->silk_mode.packetLossPercentage;
         }
         break;
-        case OPUS_SET_VBR_REQUEST:
+        case OAC_SET_VBR_REQUEST:
         {
-            opus_int32 value = va_arg(ap, opus_int32);
+            oac_int32 value = va_arg(ap, oac_int32);
             if(value<0 || value>1)
             {
                goto bad_arg;
@@ -2950,9 +2950,9 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             st->silk_mode.useCBR = 1-value;
         }
         break;
-        case OPUS_GET_VBR_REQUEST:
+        case OAC_GET_VBR_REQUEST:
         {
-            opus_int32 *value = va_arg(ap, opus_int32*);
+            oac_int32 *value = va_arg(ap, oac_int32*);
             if (!value)
             {
                goto bad_arg;
@@ -2960,9 +2960,9 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             *value = st->use_vbr;
         }
         break;
-        case OPUS_SET_VOICE_RATIO_REQUEST:
+        case OAC_SET_VOICE_RATIO_REQUEST:
         {
-            opus_int32 value = va_arg(ap, opus_int32);
+            oac_int32 value = va_arg(ap, oac_int32);
             if (value<-1 || value>100)
             {
                goto bad_arg;
@@ -2970,9 +2970,9 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             st->voice_ratio = value;
         }
         break;
-        case OPUS_GET_VOICE_RATIO_REQUEST:
+        case OAC_GET_VOICE_RATIO_REQUEST:
         {
-            opus_int32 *value = va_arg(ap, opus_int32*);
+            oac_int32 *value = va_arg(ap, oac_int32*);
             if (!value)
             {
                goto bad_arg;
@@ -2980,9 +2980,9 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             *value = st->voice_ratio;
         }
         break;
-        case OPUS_SET_VBR_CONSTRAINT_REQUEST:
+        case OAC_SET_VBR_CONSTRAINT_REQUEST:
         {
-            opus_int32 value = va_arg(ap, opus_int32);
+            oac_int32 value = va_arg(ap, oac_int32);
             if(value<0 || value>1)
             {
                goto bad_arg;
@@ -2990,9 +2990,9 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             st->vbr_constraint = value;
         }
         break;
-        case OPUS_GET_VBR_CONSTRAINT_REQUEST:
+        case OAC_GET_VBR_CONSTRAINT_REQUEST:
         {
-            opus_int32 *value = va_arg(ap, opus_int32*);
+            oac_int32 *value = va_arg(ap, oac_int32*);
             if (!value)
             {
                goto bad_arg;
@@ -3000,19 +3000,19 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             *value = st->vbr_constraint;
         }
         break;
-        case OPUS_SET_SIGNAL_REQUEST:
+        case OAC_SET_SIGNAL_REQUEST:
         {
-            opus_int32 value = va_arg(ap, opus_int32);
-            if(value!=OPUS_AUTO && value!=OPUS_SIGNAL_VOICE && value!=OPUS_SIGNAL_MUSIC)
+            oac_int32 value = va_arg(ap, oac_int32);
+            if(value!=OAC_AUTO && value!=OAC_SIGNAL_VOICE && value!=OAC_SIGNAL_MUSIC)
             {
                goto bad_arg;
             }
             st->signal_type = value;
         }
         break;
-        case OPUS_GET_SIGNAL_REQUEST:
+        case OAC_GET_SIGNAL_REQUEST:
         {
-            opus_int32 *value = va_arg(ap, opus_int32*);
+            oac_int32 *value = va_arg(ap, oac_int32*);
             if (!value)
             {
                goto bad_arg;
@@ -3020,21 +3020,21 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             *value = st->signal_type;
         }
         break;
-        case OPUS_GET_LOOKAHEAD_REQUEST:
+        case OAC_GET_LOOKAHEAD_REQUEST:
         {
-            opus_int32 *value = va_arg(ap, opus_int32*);
+            oac_int32 *value = va_arg(ap, oac_int32*);
             if (!value)
             {
                goto bad_arg;
             }
             *value = st->Fs/400;
-            if (st->application != OPUS_APPLICATION_RESTRICTED_LOWDELAY && st->application != OPUS_APPLICATION_RESTRICTED_CELT)
+            if (st->application != OAC_APPLICATION_RESTRICTED_LOWDELAY && st->application != OAC_APPLICATION_RESTRICTED_CELT)
                 *value += st->delay_compensation;
         }
         break;
-        case OPUS_GET_SAMPLE_RATE_REQUEST:
+        case OAC_GET_SAMPLE_RATE_REQUEST:
         {
-            opus_int32 *value = va_arg(ap, opus_int32*);
+            oac_int32 *value = va_arg(ap, oac_int32*);
             if (!value)
             {
                goto bad_arg;
@@ -3042,9 +3042,9 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             *value = st->Fs;
         }
         break;
-        case OPUS_GET_FINAL_RANGE_REQUEST:
+        case OAC_GET_FINAL_RANGE_REQUEST:
         {
-            opus_uint32 *value = va_arg(ap, opus_uint32*);
+            oac_uint32 *value = va_arg(ap, oac_uint32*);
             if (!value)
             {
                goto bad_arg;
@@ -3052,9 +3052,9 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             *value = st->rangeFinal;
         }
         break;
-        case OPUS_SET_LSB_DEPTH_REQUEST:
+        case OAC_SET_LSB_DEPTH_REQUEST:
         {
-            opus_int32 value = va_arg(ap, opus_int32);
+            oac_int32 value = va_arg(ap, oac_int32);
             if (value<8 || value>24)
             {
                goto bad_arg;
@@ -3062,9 +3062,9 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             st->lsb_depth=value;
         }
         break;
-        case OPUS_GET_LSB_DEPTH_REQUEST:
+        case OAC_GET_LSB_DEPTH_REQUEST:
         {
-            opus_int32 *value = va_arg(ap, opus_int32*);
+            oac_int32 *value = va_arg(ap, oac_int32*);
             if (!value)
             {
                goto bad_arg;
@@ -3072,23 +3072,23 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             *value = st->lsb_depth;
         }
         break;
-        case OPUS_SET_EXPERT_FRAME_DURATION_REQUEST:
-        {
-            opus_int32 value = va_arg(ap, opus_int32);
-            if (value != OPUS_FRAMESIZE_ARG    && value != OPUS_FRAMESIZE_2_5_MS &&
-                value != OPUS_FRAMESIZE_5_MS   && value != OPUS_FRAMESIZE_10_MS  &&
-                value != OPUS_FRAMESIZE_20_MS  && value != OPUS_FRAMESIZE_40_MS  &&
-                value != OPUS_FRAMESIZE_60_MS  && value != OPUS_FRAMESIZE_80_MS  &&
-                value != OPUS_FRAMESIZE_100_MS && value != OPUS_FRAMESIZE_120_MS)
+        case OAC_SET_EXPERT_FRAME_DURATION_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            if (value != OAC_FRAMESIZE_ARG    && value != OAC_FRAMESIZE_2_5_MS &&
+                value != OAC_FRAMESIZE_5_MS   && value != OAC_FRAMESIZE_10_MS  &&
+                value != OAC_FRAMESIZE_20_MS  && value != OAC_FRAMESIZE_40_MS  &&
+                value != OAC_FRAMESIZE_60_MS  && value != OAC_FRAMESIZE_80_MS  &&
+                value != OAC_FRAMESIZE_100_MS && value != OAC_FRAMESIZE_120_MS)
             {
                goto bad_arg;
             }
             st->variable_duration = value;
         }
         break;
-        case OPUS_GET_EXPERT_FRAME_DURATION_REQUEST:
+        case OAC_GET_EXPERT_FRAME_DURATION_REQUEST:
         {
-            opus_int32 *value = va_arg(ap, opus_int32*);
+            oac_int32 *value = va_arg(ap, oac_int32*);
             if (!value)
             {
                goto bad_arg;
@@ -3096,50 +3096,50 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             *value = st->variable_duration;
         }
         break;
-        case OPUS_SET_PREDICTION_DISABLED_REQUEST:
+        case OAC_SET_PREDICTION_DISABLED_REQUEST:
         {
-           opus_int32 value = va_arg(ap, opus_int32);
+           oac_int32 value = va_arg(ap, oac_int32);
            if (value > 1 || value < 0)
               goto bad_arg;
            st->silk_mode.reducedDependency = value;
         }
         break;
-        case OPUS_GET_PREDICTION_DISABLED_REQUEST:
+        case OAC_GET_PREDICTION_DISABLED_REQUEST:
         {
-           opus_int32 *value = va_arg(ap, opus_int32*);
+           oac_int32 *value = va_arg(ap, oac_int32*);
            if (!value)
               goto bad_arg;
            *value = st->silk_mode.reducedDependency;
         }
         break;
-        case OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST:
+        case OAC_SET_PHASE_INVERSION_DISABLED_REQUEST:
         {
-            opus_int32 value = va_arg(ap, opus_int32);
+            oac_int32 value = va_arg(ap, oac_int32);
             if(value<0 || value>1)
             {
                goto bad_arg;
             }
-            if (st->application != OPUS_APPLICATION_RESTRICTED_SILK)
-               celt_encoder_ctl(celt_enc, OPUS_SET_PHASE_INVERSION_DISABLED(value));
+            if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
+               celt_encoder_ctl(celt_enc, OAC_SET_PHASE_INVERSION_DISABLED(value));
         }
         break;
-        case OPUS_GET_PHASE_INVERSION_DISABLED_REQUEST:
+        case OAC_GET_PHASE_INVERSION_DISABLED_REQUEST:
         {
-            opus_int32 *value = va_arg(ap, opus_int32*);
+            oac_int32 *value = va_arg(ap, oac_int32*);
             if (!value)
             {
                goto bad_arg;
             }
-            if (st->application != OPUS_APPLICATION_RESTRICTED_SILK)
-               celt_encoder_ctl(celt_enc, OPUS_GET_PHASE_INVERSION_DISABLED(value));
+            if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
+               celt_encoder_ctl(celt_enc, OAC_GET_PHASE_INVERSION_DISABLED(value));
             else
                *value = 0;
         }
         break;
 #ifdef ENABLE_DRED
-        case OPUS_SET_DRED_DURATION_REQUEST:
+        case OAC_SET_DRED_DURATION_REQUEST:
         {
-            opus_int32 value = va_arg(ap, opus_int32);
+            oac_int32 value = va_arg(ap, oac_int32);
             if(value<0 || value>DRED_MAX_FRAMES)
             {
                goto bad_arg;
@@ -3148,9 +3148,9 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
             st->silk_mode.useDRED = !!value;
         }
         break;
-        case OPUS_GET_DRED_DURATION_REQUEST:
+        case OAC_GET_DRED_DURATION_REQUEST:
         {
-            opus_int32 *value = va_arg(ap, opus_int32*);
+            oac_int32 *value = va_arg(ap, oac_int32*);
             if (!value)
             {
                goto bad_arg;
@@ -3159,7 +3159,7 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
         }
         break;
 #endif
-        case OPUS_RESET_STATE:
+        case OAC_RESET_STATE:
         {
            void *silk_enc;
            silk_EncControlStruct dummy;
@@ -3169,12 +3169,12 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
            tonality_analysis_reset(&st->analysis);
 #endif
 
-           start = (char*)&st->OPUS_ENCODER_RESET_START;
-           OPUS_CLEAR(start, st->silk_enc_offset - (start - (char*)st));
+           start = (char*)&st->OAC_ENCODER_RESET_START;
+           OAC_CLEAR(start, st->silk_enc_offset - (start - (char*)st));
 
-           if (st->application != OPUS_APPLICATION_RESTRICTED_SILK)
-              celt_encoder_ctl(celt_enc, OPUS_RESET_STATE);
-           if (st->application != OPUS_APPLICATION_RESTRICTED_CELT)
+           if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
+              celt_encoder_ctl(celt_enc, OAC_RESET_STATE);
+           if (st->application != OAC_APPLICATION_RESTRICTED_CELT)
               silk_InitEncoder( silk_enc, st->channels, st->arch, &dummy );
 #ifdef ENABLE_DRED
            /* Initialize DRED Encoder */
@@ -3185,39 +3185,39 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
            st->prev_HB_gain = Q15ONE;
            st->first = 1;
            st->mode = MODE_HYBRID;
-           st->bandwidth = OPUS_BANDWIDTH_FULLBAND;
+           st->bandwidth = OAC_BANDWIDTH_FULLBAND;
            st->variable_HP_smth2_Q15 = silk_LSHIFT( silk_lin2log( VARIABLE_HP_MIN_CUTOFF_HZ ), 8 );
         }
         break;
-        case OPUS_SET_FORCE_MODE_REQUEST:
+        case OAC_SET_FORCE_MODE_REQUEST:
         {
-            opus_int32 value = va_arg(ap, opus_int32);
-            if ((value < MODE_SILK_ONLY || value > MODE_CELT_ONLY) && value != OPUS_AUTO)
+            oac_int32 value = va_arg(ap, oac_int32);
+            if ((value < MODE_SILK_ONLY || value > MODE_CELT_ONLY) && value != OAC_AUTO)
             {
                goto bad_arg;
             }
             st->user_forced_mode = value;
         }
         break;
-        case OPUS_SET_LFE_REQUEST:
+        case OAC_SET_LFE_REQUEST:
         {
-            opus_int32 value = va_arg(ap, opus_int32);
+            oac_int32 value = va_arg(ap, oac_int32);
             st->lfe = value;
-            if (st->application != OPUS_APPLICATION_RESTRICTED_SILK)
-               ret = celt_encoder_ctl(celt_enc, OPUS_SET_LFE(value));
+            if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
+               ret = celt_encoder_ctl(celt_enc, OAC_SET_LFE(value));
         }
         break;
-        case OPUS_SET_ENERGY_MASK_REQUEST:
+        case OAC_SET_ENERGY_MASK_REQUEST:
         {
             celt_glog *value = va_arg(ap, celt_glog*);
             st->energy_masking = value;
-            if (st->application != OPUS_APPLICATION_RESTRICTED_SILK)
-               ret = celt_encoder_ctl(celt_enc, OPUS_SET_ENERGY_MASK(value));
+            if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
+               ret = celt_encoder_ctl(celt_enc, OAC_SET_ENERGY_MASK(value));
         }
         break;
-        case OPUS_GET_IN_DTX_REQUEST:
+        case OAC_GET_IN_DTX_REQUEST:
         {
-            opus_int32 *value = va_arg(ap, opus_int32*);
+            oac_int32 *value = va_arg(ap, oac_int32*);
             if (!value)
             {
                 goto bad_arg;
@@ -3232,7 +3232,7 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
                 }
             }
             else if (st->use_dtx) {
-                /* DTX determined by Opus. */
+                /* DTX determined by Oac. */
                 *value = st->nb_no_activity_ms_Q1 >= NB_SPEECH_FRAMES_BEFORE_DTX*20*2;
             }
             else {
@@ -3241,10 +3241,10 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
         }
         break;
 #ifdef USE_WEIGHTS_FILE
-        case OPUS_SET_DNN_BLOB_REQUEST:
+        case OAC_SET_DNN_BLOB_REQUEST:
         {
             const unsigned char *data = va_arg(ap, const unsigned char *);
-            opus_int32 len = va_arg(ap, opus_int32);
+            oac_int32 len = va_arg(ap, oac_int32);
             if(len<0 || data == NULL)
             {
                goto bad_arg;
@@ -3267,18 +3267,18 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
         }
         break;
         default:
-            /* fprintf(stderr, "unknown opus_encoder_ctl() request: %d", request);*/
-            ret = OPUS_UNIMPLEMENTED;
+            /* fprintf(stderr, "unknown oac_encoder_ctl() request: %d", request);*/
+            ret = OAC_UNIMPLEMENTED;
             break;
     }
     va_end(ap);
     return ret;
 bad_arg:
     va_end(ap);
-    return OPUS_BAD_ARG;
+    return OAC_BAD_ARG;
 }
 
-void opus_encoder_destroy(OpusEncoder *st)
+void oac_encoder_destroy(OacEncoder *st)
 {
-    opus_free(st);
+    oac_free(st);
 }
diff --git a/src/opus_multistream.c b/src/oac_multistream.c
similarity index 97%
rename from src/opus_multistream.c
rename to src/oac_multistream.c
index 895fc1685..d9eca4b7a 100644
--- a/src/opus_multistream.c
+++ b/src/oac_multistream.c
@@ -29,9 +29,9 @@
 #include "config.h"
 #endif
 
-#include "opus_multistream.h"
-#include "opus.h"
-#include "opus_private.h"
+#include "oac_multistream.h"
+#include "oac.h"
+#include "oac_private.h"
 #include "stack_alloc.h"
 #include <stdarg.h>
 #include "float_cast.h"
diff --git a/src/opus_multistream_decoder.c b/src/oac_multistream_decoder.c
similarity index 62%
rename from src/opus_multistream_decoder.c
rename to src/oac_multistream_decoder.c
index 121b33ad5..1598fae17 100644
--- a/src/opus_multistream_decoder.c
+++ b/src/oac_multistream_decoder.c
@@ -29,9 +29,9 @@
 #include "config.h"
 #endif
 
-#include "opus_multistream.h"
-#include "opus.h"
-#include "opus_private.h"
+#include "oac_multistream.h"
+#include "oac.h"
+#include "oac_private.h"
 #include "stack_alloc.h"
 #include <stdarg.h>
 #include "float_cast.h"
@@ -40,7 +40,7 @@
 /* DECODER */
 
 #if defined(ENABLE_HARDENING) || defined(ENABLE_ASSERTIONS)
-static void validate_ms_decoder(OpusMSDecoder *st)
+static void validate_ms_decoder(OacMSDecoder *st)
 {
    validate_layout(&st->layout);
 }
@@ -50,22 +50,22 @@ static void validate_ms_decoder(OpusMSDecoder *st)
 #endif
 
 
-opus_int32 opus_multistream_decoder_get_size(int nb_streams, int nb_coupled_streams)
+oac_int32 oac_multistream_decoder_get_size(int nb_streams, int nb_coupled_streams)
 {
    int coupled_size;
    int mono_size;
 
    if(nb_streams<1||nb_coupled_streams>nb_streams||nb_coupled_streams<0)return 0;
-   coupled_size = opus_decoder_get_size(2);
-   mono_size = opus_decoder_get_size(1);
-   return align(sizeof(OpusMSDecoder))
+   coupled_size = oac_decoder_get_size(2);
+   mono_size = oac_decoder_get_size(1);
+   return align(sizeof(OacMSDecoder))
          + nb_coupled_streams * align(coupled_size)
          + (nb_streams-nb_coupled_streams) * align(mono_size);
 }
 
-int opus_multistream_decoder_init(
-      OpusMSDecoder *st,
-      opus_int32 Fs,
+int oac_multistream_decoder_init(
+      OacMSDecoder *st,
+      oac_int32 Fs,
       int channels,
       int streams,
       int coupled_streams,
@@ -79,7 +79,7 @@ int opus_multistream_decoder_init(
 
    if ((channels>255) || (channels<1) || (coupled_streams>streams) ||
        (streams<1) || (coupled_streams<0) || (streams>255-coupled_streams))
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
 
    st->layout.nb_channels = channels;
    st->layout.nb_streams = streams;
@@ -88,30 +88,30 @@ int opus_multistream_decoder_init(
    for (i=0;i<st->layout.nb_channels;i++)
       st->layout.mapping[i] = mapping[i];
    if (!validate_layout(&st->layout))
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
 
-   ptr = (char*)st + align(sizeof(OpusMSDecoder));
-   coupled_size = opus_decoder_get_size(2);
-   mono_size = opus_decoder_get_size(1);
+   ptr = (char*)st + align(sizeof(OacMSDecoder));
+   coupled_size = oac_decoder_get_size(2);
+   mono_size = oac_decoder_get_size(1);
 
    for (i=0;i<st->layout.nb_coupled_streams;i++)
    {
-      ret=opus_decoder_init((OpusDecoder*)ptr, Fs, 2);
-      if(ret!=OPUS_OK)return ret;
+      ret=oac_decoder_init((OacDecoder*)ptr, Fs, 2);
+      if(ret!=OAC_OK)return ret;
       ptr += align(coupled_size);
    }
    for (;i<st->layout.nb_streams;i++)
    {
-      ret=opus_decoder_init((OpusDecoder*)ptr, Fs, 1);
-      if(ret!=OPUS_OK)return ret;
+      ret=oac_decoder_init((OacDecoder*)ptr, Fs, 1);
+      if(ret!=OAC_OK)return ret;
       ptr += align(mono_size);
    }
-   return OPUS_OK;
+   return OAC_OK;
 }
 
 
-OpusMSDecoder *opus_multistream_decoder_create(
-      opus_int32 Fs,
+OacMSDecoder *oac_multistream_decoder_create(
+      oac_int32 Fs,
       int channels,
       int streams,
       int coupled_streams,
@@ -120,54 +120,54 @@ OpusMSDecoder *opus_multistream_decoder_create(
 )
 {
    int ret;
-   OpusMSDecoder *st;
+   OacMSDecoder *st;
    if ((channels>255) || (channels<1) || (coupled_streams>streams) ||
        (streams<1) || (coupled_streams<0) || (streams>255-coupled_streams))
    {
       if (error)
-         *error = OPUS_BAD_ARG;
+         *error = OAC_BAD_ARG;
       return NULL;
    }
-   st = (OpusMSDecoder *)opus_alloc(opus_multistream_decoder_get_size(streams, coupled_streams));
+   st = (OacMSDecoder *)oac_alloc(oac_multistream_decoder_get_size(streams, coupled_streams));
    if (st==NULL)
    {
       if (error)
-         *error = OPUS_ALLOC_FAIL;
+         *error = OAC_ALLOC_FAIL;
       return NULL;
    }
-   ret = opus_multistream_decoder_init(st, Fs, channels, streams, coupled_streams, mapping);
+   ret = oac_multistream_decoder_init(st, Fs, channels, streams, coupled_streams, mapping);
    if (error)
       *error = ret;
-   if (ret != OPUS_OK)
+   if (ret != OAC_OK)
    {
-      opus_free(st);
+      oac_free(st);
       st = NULL;
    }
    return st;
 }
 
-static int opus_multistream_packet_validate(const unsigned char *data,
-      opus_int32 len, int nb_streams, opus_int32 Fs)
+static int oac_multistream_packet_validate(const unsigned char *data,
+      oac_int32 len, int nb_streams, oac_int32 Fs)
 {
    int s;
    int count;
    unsigned char toc;
-   opus_int16 size[48];
+   oac_int16 size[48];
    int samples=0;
-   opus_int32 packet_offset;
+   oac_int32 packet_offset;
 
    for (s=0;s<nb_streams;s++)
    {
       int tmp_samples;
       if (len<=0)
-         return OPUS_INVALID_PACKET;
-      count = opus_packet_parse_impl(data, len, s!=nb_streams-1, &toc, NULL,
+         return OAC_INVALID_PACKET;
+      count = oac_packet_parse_impl(data, len, s!=nb_streams-1, &toc, NULL,
                                      size, NULL, &packet_offset, NULL, NULL);
       if (count<0)
          return count;
-      tmp_samples = opus_packet_get_nb_samples(data, packet_offset, Fs);
+      tmp_samples = oac_packet_get_nb_samples(data, packet_offset, Fs);
       if (s!=0 && samples != tmp_samples)
-         return OPUS_INVALID_PACKET;
+         return OAC_INVALID_PACKET;
       samples = tmp_samples;
       data += packet_offset;
       len -= packet_offset;
@@ -175,56 +175,56 @@ static int opus_multistream_packet_validate(const unsigned char *data,
    return samples;
 }
 
-int opus_multistream_decode_native(
-      OpusMSDecoder *st,
+int oac_multistream_decode_native(
+      OacMSDecoder *st,
       const unsigned char *data,
-      opus_int32 len,
+      oac_int32 len,
       void *pcm,
-      opus_copy_channel_out_func copy_channel_out,
+      oac_copy_channel_out_func copy_channel_out,
       int frame_size,
       int decode_fec,
       int soft_clip,
       void *user_data
 )
 {
-   opus_int32 Fs;
+   oac_int32 Fs;
    int coupled_size;
    int mono_size;
    int s, c;
    char *ptr;
    int do_plc=0;
-   VARDECL(opus_res, buf);
+   VARDECL(oac_res, buf);
    ALLOC_STACK;
 
    VALIDATE_MS_DECODER(st);
    if (frame_size <= 0)
    {
       RESTORE_STACK;
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    }
    /* Limit frame_size to avoid excessive stack allocations. */
-   MUST_SUCCEED(opus_multistream_decoder_ctl(st, OPUS_GET_SAMPLE_RATE(&Fs)));
+   MUST_SUCCEED(oac_multistream_decoder_ctl(st, OAC_GET_SAMPLE_RATE(&Fs)));
    frame_size = IMIN(frame_size, Fs/25*3);
-   ALLOC(buf, 2*frame_size, opus_res);
-   ptr = (char*)st + align(sizeof(OpusMSDecoder));
-   coupled_size = opus_decoder_get_size(2);
-   mono_size = opus_decoder_get_size(1);
+   ALLOC(buf, 2*frame_size, oac_res);
+   ptr = (char*)st + align(sizeof(OacMSDecoder));
+   coupled_size = oac_decoder_get_size(2);
+   mono_size = oac_decoder_get_size(1);
 
    if (len==0)
       do_plc = 1;
    if (len < 0)
    {
       RESTORE_STACK;
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    }
    if (!do_plc && len < 2*st->layout.nb_streams-1)
    {
       RESTORE_STACK;
-      return OPUS_INVALID_PACKET;
+      return OAC_INVALID_PACKET;
    }
    if (!do_plc)
    {
-      int ret = opus_multistream_packet_validate(data, len, st->layout.nb_streams, Fs);
+      int ret = oac_multistream_packet_validate(data, len, st->layout.nb_streams, Fs);
       if (ret < 0)
       {
          RESTORE_STACK;
@@ -232,25 +232,25 @@ int opus_multistream_decode_native(
       } else if (ret > frame_size)
       {
          RESTORE_STACK;
-         return OPUS_BUFFER_TOO_SMALL;
+         return OAC_BUFFER_TOO_SMALL;
       }
    }
    for (s=0;s<st->layout.nb_streams;s++)
    {
-      OpusDecoder *dec;
-      opus_int32 packet_offset;
+      OacDecoder *dec;
+      oac_int32 packet_offset;
       int ret;
 
-      dec = (OpusDecoder*)ptr;
+      dec = (OacDecoder*)ptr;
       ptr += (s < st->layout.nb_coupled_streams) ? align(coupled_size) : align(mono_size);
 
       if (!do_plc && len<=0)
       {
          RESTORE_STACK;
-         return OPUS_INTERNAL_ERROR;
+         return OAC_INTERNAL_ERROR;
       }
       packet_offset = 0;
-      ret = opus_decode_native(dec, data, len, buf, frame_size, decode_fec, s!=st->layout.nb_streams-1, &packet_offset, soft_clip, NULL, 0);
+      ret = oac_decode_native(dec, data, len, buf, frame_size, decode_fec, s!=st->layout.nb_streams-1, &packet_offset, soft_clip, NULL, 0);
       if (!do_plc)
       {
         data += packet_offset;
@@ -307,18 +307,18 @@ int opus_multistream_decode_native(
 }
 
 #if !defined(DISABLE_FLOAT_API)
-static void opus_copy_channel_out_float(
+static void oac_copy_channel_out_float(
   void *dst,
   int dst_stride,
   int dst_channel,
-  const opus_res *src,
+  const oac_res *src,
   int src_stride,
   int frame_size,
   void *user_data
 )
 {
    float *float_dst;
-   opus_int32 i;
+   oac_int32 i;
    (void)user_data;
    float_dst = (float*)dst;
    if (src != NULL)
@@ -334,20 +334,20 @@ static void opus_copy_channel_out_float(
 }
 #endif
 
-static void opus_copy_channel_out_short(
+static void oac_copy_channel_out_short(
   void *dst,
   int dst_stride,
   int dst_channel,
-  const opus_res *src,
+  const oac_res *src,
   int src_stride,
   int frame_size,
   void *user_data
 )
 {
-   opus_int16 *short_dst;
-   opus_int32 i;
+   oac_int16 *short_dst;
+   oac_int32 i;
    (void)user_data;
-   short_dst = (opus_int16*)dst;
+   short_dst = (oac_int16*)dst;
    if (src != NULL)
    {
       for (i=0;i<frame_size;i++)
@@ -360,20 +360,20 @@ static void opus_copy_channel_out_short(
    }
 }
 
-static void opus_copy_channel_out_int24(
+static void oac_copy_channel_out_int24(
   void *dst,
   int dst_stride,
   int dst_channel,
-  const opus_res *src,
+  const oac_res *src,
   int src_stride,
   int frame_size,
   void *user_data
 )
 {
-   opus_int32 *short_dst;
-   opus_int32 i;
+   oac_int32 *short_dst;
+   oac_int32 i;
    (void)user_data;
-   short_dst = (opus_int32*)dst;
+   short_dst = (oac_int32*)dst;
    if (src != NULL)
    {
       for (i=0;i<frame_size;i++)
@@ -392,72 +392,72 @@ static void opus_copy_channel_out_int24(
 #define OPTIONAL_CLIP 1
 #endif
 
-int opus_multistream_decode(
-      OpusMSDecoder *st,
+int oac_multistream_decode(
+      OacMSDecoder *st,
       const unsigned char *data,
-      opus_int32 len,
-      opus_int16 *pcm,
+      oac_int32 len,
+      oac_int16 *pcm,
       int frame_size,
       int decode_fec
 )
 {
-   return opus_multistream_decode_native(st, data, len,
-       pcm, opus_copy_channel_out_short, frame_size, decode_fec, OPTIONAL_CLIP, NULL);
+   return oac_multistream_decode_native(st, data, len,
+       pcm, oac_copy_channel_out_short, frame_size, decode_fec, OPTIONAL_CLIP, NULL);
 }
 
-int opus_multistream_decode24(
-      OpusMSDecoder *st,
+int oac_multistream_decode24(
+      OacMSDecoder *st,
       const unsigned char *data,
-      opus_int32 len,
-      opus_int32 *pcm,
+      oac_int32 len,
+      oac_int32 *pcm,
       int frame_size,
       int decode_fec
 )
 {
-   return opus_multistream_decode_native(st, data, len,
-       pcm, opus_copy_channel_out_int24, frame_size, decode_fec, 0, NULL);
+   return oac_multistream_decode_native(st, data, len,
+       pcm, oac_copy_channel_out_int24, frame_size, decode_fec, 0, NULL);
 }
 
 #ifndef DISABLE_FLOAT_API
-int opus_multistream_decode_float(OpusMSDecoder *st, const unsigned char *data,
-      opus_int32 len, float *pcm, int frame_size, int decode_fec)
+int oac_multistream_decode_float(OacMSDecoder *st, const unsigned char *data,
+      oac_int32 len, float *pcm, int frame_size, int decode_fec)
 {
-   return opus_multistream_decode_native(st, data, len,
-       pcm, opus_copy_channel_out_float, frame_size, decode_fec, 0, NULL);
+   return oac_multistream_decode_native(st, data, len,
+       pcm, oac_copy_channel_out_float, frame_size, decode_fec, 0, NULL);
 }
 #endif
 
-int opus_multistream_decoder_ctl_va_list(OpusMSDecoder *st, int request,
+int oac_multistream_decoder_ctl_va_list(OacMSDecoder *st, int request,
                                          va_list ap)
 {
    int coupled_size, mono_size;
    char *ptr;
-   int ret = OPUS_OK;
+   int ret = OAC_OK;
 
-   coupled_size = opus_decoder_get_size(2);
-   mono_size = opus_decoder_get_size(1);
-   ptr = (char*)st + align(sizeof(OpusMSDecoder));
+   coupled_size = oac_decoder_get_size(2);
+   mono_size = oac_decoder_get_size(1);
+   ptr = (char*)st + align(sizeof(OacMSDecoder));
    switch (request)
    {
-       case OPUS_GET_BANDWIDTH_REQUEST:
-       case OPUS_GET_SAMPLE_RATE_REQUEST:
-       case OPUS_GET_GAIN_REQUEST:
-       case OPUS_GET_LAST_PACKET_DURATION_REQUEST:
-       case OPUS_GET_PHASE_INVERSION_DISABLED_REQUEST:
-       case OPUS_GET_COMPLEXITY_REQUEST:
+       case OAC_GET_BANDWIDTH_REQUEST:
+       case OAC_GET_SAMPLE_RATE_REQUEST:
+       case OAC_GET_GAIN_REQUEST:
+       case OAC_GET_LAST_PACKET_DURATION_REQUEST:
+       case OAC_GET_PHASE_INVERSION_DISABLED_REQUEST:
+       case OAC_GET_COMPLEXITY_REQUEST:
        {
-          OpusDecoder *dec;
+          OacDecoder *dec;
           /* For int32* GET params, just query the first stream */
-          opus_int32 *value = va_arg(ap, opus_int32*);
-          dec = (OpusDecoder*)ptr;
-          ret = opus_decoder_ctl(dec, request, value);
+          oac_int32 *value = va_arg(ap, oac_int32*);
+          dec = (OacDecoder*)ptr;
+          ret = oac_decoder_ctl(dec, request, value);
        }
        break;
-       case OPUS_GET_FINAL_RANGE_REQUEST:
+       case OAC_GET_FINAL_RANGE_REQUEST:
        {
           int s;
-          opus_uint32 *value = va_arg(ap, opus_uint32*);
-          opus_uint32 tmp;
+          oac_uint32 *value = va_arg(ap, oac_uint32*);
+          oac_uint32 tmp;
           if (!value)
           {
              goto bad_arg;
@@ -465,45 +465,45 @@ int opus_multistream_decoder_ctl_va_list(OpusMSDecoder *st, int request,
           *value = 0;
           for (s=0;s<st->layout.nb_streams;s++)
           {
-             OpusDecoder *dec;
-             dec = (OpusDecoder*)ptr;
+             OacDecoder *dec;
+             dec = (OacDecoder*)ptr;
              if (s < st->layout.nb_coupled_streams)
                 ptr += align(coupled_size);
              else
                 ptr += align(mono_size);
-             ret = opus_decoder_ctl(dec, request, &tmp);
-             if (ret != OPUS_OK) break;
+             ret = oac_decoder_ctl(dec, request, &tmp);
+             if (ret != OAC_OK) break;
              *value ^= tmp;
           }
        }
        break;
-       case OPUS_RESET_STATE:
+       case OAC_RESET_STATE:
        {
           int s;
           for (s=0;s<st->layout.nb_streams;s++)
           {
-             OpusDecoder *dec;
+             OacDecoder *dec;
 
-             dec = (OpusDecoder*)ptr;
+             dec = (OacDecoder*)ptr;
              if (s < st->layout.nb_coupled_streams)
                 ptr += align(coupled_size);
              else
                 ptr += align(mono_size);
-             ret = opus_decoder_ctl(dec, OPUS_RESET_STATE);
-             if (ret != OPUS_OK)
+             ret = oac_decoder_ctl(dec, OAC_RESET_STATE);
+             if (ret != OAC_OK)
                 break;
           }
        }
        break;
-       case OPUS_MULTISTREAM_GET_DECODER_STATE_REQUEST:
+       case OAC_MULTISTREAM_GET_DECODER_STATE_REQUEST:
        {
           int s;
-          opus_int32 stream_id;
-          OpusDecoder **value;
-          stream_id = va_arg(ap, opus_int32);
+          oac_int32 stream_id;
+          OacDecoder **value;
+          stream_id = va_arg(ap, oac_int32);
           if (stream_id<0 || stream_id >= st->layout.nb_streams)
              goto bad_arg;
-          value = va_arg(ap, OpusDecoder**);
+          value = va_arg(ap, OacDecoder**);
           if (!value)
           {
              goto bad_arg;
@@ -515,51 +515,51 @@ int opus_multistream_decoder_ctl_va_list(OpusMSDecoder *st, int request,
              else
                 ptr += align(mono_size);
           }
-          *value = (OpusDecoder*)ptr;
+          *value = (OacDecoder*)ptr;
        }
        break;
-       case OPUS_SET_GAIN_REQUEST:
-       case OPUS_SET_COMPLEXITY_REQUEST:
-       case OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST:
+       case OAC_SET_GAIN_REQUEST:
+       case OAC_SET_COMPLEXITY_REQUEST:
+       case OAC_SET_PHASE_INVERSION_DISABLED_REQUEST:
        {
           int s;
           /* This works for int32 params */
-          opus_int32 value = va_arg(ap, opus_int32);
+          oac_int32 value = va_arg(ap, oac_int32);
           for (s=0;s<st->layout.nb_streams;s++)
           {
-             OpusDecoder *dec;
+             OacDecoder *dec;
 
-             dec = (OpusDecoder*)ptr;
+             dec = (OacDecoder*)ptr;
              if (s < st->layout.nb_coupled_streams)
                 ptr += align(coupled_size);
              else
                 ptr += align(mono_size);
-             ret = opus_decoder_ctl(dec, request, value);
-             if (ret != OPUS_OK)
+             ret = oac_decoder_ctl(dec, request, value);
+             if (ret != OAC_OK)
                 break;
           }
        }
        break;
        default:
-          ret = OPUS_UNIMPLEMENTED;
+          ret = OAC_UNIMPLEMENTED;
        break;
    }
    return ret;
 bad_arg:
-   return OPUS_BAD_ARG;
+   return OAC_BAD_ARG;
 }
 
-int opus_multistream_decoder_ctl(OpusMSDecoder *st, int request, ...)
+int oac_multistream_decoder_ctl(OacMSDecoder *st, int request, ...)
 {
    int ret;
    va_list ap;
    va_start(ap, request);
-   ret = opus_multistream_decoder_ctl_va_list(st, request, ap);
+   ret = oac_multistream_decoder_ctl_va_list(st, request, ap);
    va_end(ap);
    return ret;
 }
 
-void opus_multistream_decoder_destroy(OpusMSDecoder *st)
+void oac_multistream_decoder_destroy(OacMSDecoder *st)
 {
-    opus_free(st);
+    oac_free(st);
 }
diff --git a/src/opus_multistream_encoder.c b/src/oac_multistream_encoder.c
similarity index 69%
rename from src/opus_multistream_encoder.c
rename to src/oac_multistream_encoder.c
index fbdfc0548..f049a2412 100644
--- a/src/opus_multistream_encoder.c
+++ b/src/oac_multistream_encoder.c
@@ -29,9 +29,9 @@
 #include "config.h"
 #endif
 
-#include "opus_multistream.h"
-#include "opus.h"
-#include "opus_private.h"
+#include "oac_multistream.h"
+#include "oac.h"
+#include "oac_private.h"
 #include "stack_alloc.h"
 #include <stdarg.h>
 #include "float_cast.h"
@@ -67,15 +67,15 @@ static const VorbisLayout vorbis_mappings[8] = {
 #define MAX_OVERLAP 120
 #endif
 
-static opus_val32 *ms_get_preemph_mem(OpusMSEncoder *st)
+static oac_val32 *ms_get_preemph_mem(OacMSEncoder *st)
 {
    int s;
    char *ptr;
    int coupled_size, mono_size;
 
-   coupled_size = opus_encoder_init(NULL, st->Fs, 2, st->application);
-   mono_size = opus_encoder_init(NULL, st->Fs, 1, st->application);
-   ptr = (char*)st + align(sizeof(OpusMSEncoder));
+   coupled_size = oac_encoder_init(NULL, st->Fs, 2, st->application);
+   mono_size = oac_encoder_init(NULL, st->Fs, 1, st->application);
+   ptr = (char*)st + align(sizeof(OacMSEncoder));
    for (s=0;s<st->layout.nb_streams;s++)
    {
       if (s < st->layout.nb_coupled_streams)
@@ -84,18 +84,18 @@ static opus_val32 *ms_get_preemph_mem(OpusMSEncoder *st)
          ptr += align(mono_size);
    }
    /* void* cast avoids clang -Wcast-align warning */
-   return (opus_val32*)(void*)(ptr+st->layout.nb_channels*MAX_OVERLAP*sizeof(opus_val32));
+   return (oac_val32*)(void*)(ptr+st->layout.nb_channels*MAX_OVERLAP*sizeof(oac_val32));
 }
 
-static opus_val32 *ms_get_window_mem(OpusMSEncoder *st)
+static oac_val32 *ms_get_window_mem(OacMSEncoder *st)
 {
    int s;
    char *ptr;
    int coupled_size, mono_size;
 
-   coupled_size = opus_encoder_init(NULL, st->Fs, 2, st->application);
-   mono_size = opus_encoder_init(NULL, st->Fs, 1, st->application);
-   ptr = (char*)st + align(sizeof(OpusMSEncoder));
+   coupled_size = oac_encoder_init(NULL, st->Fs, 2, st->application);
+   mono_size = oac_encoder_init(NULL, st->Fs, 1, st->application);
+   ptr = (char*)st + align(sizeof(OacMSEncoder));
    for (s=0;s<st->layout.nb_streams;s++)
    {
       if (s < st->layout.nb_coupled_streams)
@@ -104,7 +104,7 @@ static opus_val32 *ms_get_window_mem(OpusMSEncoder *st)
          ptr += align(mono_size);
    }
    /* void* cast avoids clang -Wcast-align warning */
-   return (opus_val32*)(void*)ptr;
+   return (oac_val32*)(void*)ptr;
 }
 
 static int validate_ambisonics(int nb_channels, int *nb_streams, int *nb_coupled_streams)
@@ -190,7 +190,7 @@ static void channel_pos(int channels, int pos[8])
 
 #if 1
 /* Computes a rough approximation of log2(2^a + 2^b) */
-static opus_val16 logSum(celt_glog a, celt_glog b)
+static oac_val16 logSum(celt_glog a, celt_glog b)
 {
    celt_glog max;
    celt_glog diff;
@@ -221,14 +221,14 @@ static opus_val16 logSum(celt_glog a, celt_glog b)
    return max + diff_table[low] + MULT16_32_Q15(frac, SUB32(diff_table[low+1], diff_table[low]));
 }
 #else
-opus_val16 logSum(opus_val16 a, opus_val16 b)
+oac_val16 logSum(oac_val16 a, oac_val16 b)
 {
    return log2(pow(4, a)+ pow(4, b))/2;
 }
 #endif
 
-void surround_analysis(const CELTMode *celt_mode, const void *pcm, celt_glog *bandLogE, opus_val32 *mem, opus_val32 *preemph_mem,
-      int len, int overlap, int channels, int rate, opus_copy_channel_in_func copy_channel_in, int arch
+void surround_analysis(const CELTMode *celt_mode, const void *pcm, celt_glog *bandLogE, oac_val32 *mem, oac_val32 *preemph_mem,
+      int len, int overlap, int channels, int rate, oac_copy_channel_in_func copy_channel_in, int arch
 )
 {
    int c;
@@ -238,12 +238,12 @@ void surround_analysis(const CELTMode *celt_mode, const void *pcm, celt_glog *ba
    int upsample;
    int frame_size;
    int freq_size;
-   opus_val16 channel_offset;
-   opus_val32 bandE[21];
+   oac_val16 channel_offset;
+   oac_val32 bandE[21];
    celt_glog maskLogE[3][21];
-   VARDECL(opus_val32, in);
-   VARDECL(opus_res, x);
-   VARDECL(opus_val32, freq);
+   VARDECL(oac_val32, in);
+   VARDECL(oac_res, x);
+   VARDECL(oac_val32, freq);
    SAVE_STACK;
 
    upsample = resampling_factor(rate);
@@ -256,9 +256,9 @@ void surround_analysis(const CELTMode *celt_mode, const void *pcm, celt_glog *ba
 
    freq_size = celt_mode->shortMdctSize<<LM;
 
-   ALLOC(in, frame_size+overlap, opus_val32);
-   ALLOC(x, len, opus_res);
-   ALLOC(freq, freq_size, opus_val32);
+   ALLOC(in, frame_size+overlap, oac_val32);
+   ALLOC(x, len, oac_res);
+   ALLOC(freq, freq_size, oac_val32);
 
    channel_pos(channels, pos);
 
@@ -271,26 +271,26 @@ void surround_analysis(const CELTMode *celt_mode, const void *pcm, celt_glog *ba
       int frame;
       int nb_frames = frame_size/freq_size;
       celt_assert(nb_frames*freq_size == frame_size);
-      OPUS_COPY(in, mem+c*overlap, overlap);
+      OAC_COPY(in, mem+c*overlap, overlap);
       (*copy_channel_in)(x, 1, pcm, channels, c, len, NULL);
       celt_preemphasis(x, in+overlap, frame_size, 1, upsample, celt_mode->preemph, preemph_mem+c, 0);
 #ifndef FIXED_POINT
       {
-         opus_val32 sum;
+         oac_val32 sum;
          sum = celt_inner_prod(in, in, frame_size+overlap, 0);
          /* This should filter out both NaNs and ridiculous signals that could
             cause NaNs further down. */
          if (!(sum < 1e18f) || celt_isnan(sum))
          {
-            OPUS_CLEAR(in, frame_size+overlap);
+            OAC_CLEAR(in, frame_size+overlap);
             preemph_mem[c] = 0;
          }
       }
 #endif
-      OPUS_CLEAR(bandE, 21);
+      OAC_CLEAR(bandE, 21);
       for (frame=0;frame<nb_frames;frame++)
       {
-         opus_val32 tmpE[21];
+         oac_val32 tmpE[21];
          clt_mdct_forward(&celt_mode->mdct, in+freq_size*frame, freq, celt_mode->window,
                overlap, celt_mode->maxLM-LM, 1, arch);
          if (upsample != 1)
@@ -337,7 +337,7 @@ void surround_analysis(const CELTMode *celt_mode, const void *pcm, celt_glog *ba
          sum += bandLogE[21*c+i];
       printf("%f ", sum/21);
 #endif
-      OPUS_COPY(mem+c*overlap, in+frame_size, overlap);
+      OAC_COPY(mem+c*overlap, in+frame_size, overlap);
    }
    for (i=0;i<21;i++)
       maskLogE[1][i] = MIN32(maskLogE[0][i],maskLogE[2][i]);
@@ -380,24 +380,24 @@ void surround_analysis(const CELTMode *celt_mode, const void *pcm, celt_glog *ba
    RESTORE_STACK;
 }
 
-opus_int32 opus_multistream_encoder_get_size(int nb_streams, int nb_coupled_streams)
+oac_int32 oac_multistream_encoder_get_size(int nb_streams, int nb_coupled_streams)
 {
    int coupled_size;
    int mono_size;
 
    if(nb_streams<1||nb_coupled_streams>nb_streams||nb_coupled_streams<0)return 0;
-   coupled_size = opus_encoder_get_size(2);
-   mono_size = opus_encoder_get_size(1);
-   return align(sizeof(OpusMSEncoder))
+   coupled_size = oac_encoder_get_size(2);
+   mono_size = oac_encoder_get_size(1);
+   return align(sizeof(OacMSEncoder))
         + nb_coupled_streams * align(coupled_size)
         + (nb_streams-nb_coupled_streams) * align(mono_size);
 }
 
-opus_int32 opus_multistream_surround_encoder_get_size(int channels, int mapping_family)
+oac_int32 oac_multistream_surround_encoder_get_size(int channels, int mapping_family)
 {
    int nb_streams;
    int nb_coupled_streams;
-   opus_int32 size;
+   oac_int32 size;
 
    if (mapping_family==0)
    {
@@ -425,17 +425,17 @@ opus_int32 opus_multistream_surround_encoder_get_size(int channels, int mapping_
          return 0;
    } else
       return 0;
-   size = opus_multistream_encoder_get_size(nb_streams, nb_coupled_streams);
+   size = oac_multistream_encoder_get_size(nb_streams, nb_coupled_streams);
    if (channels>2)
    {
-      size += channels*(MAX_OVERLAP*sizeof(opus_val32) + sizeof(opus_val32));
+      size += channels*(MAX_OVERLAP*sizeof(oac_val32) + sizeof(oac_val32));
    }
    return size;
 }
 
-static int opus_multistream_encoder_init_impl(
-      OpusMSEncoder *st,
-      opus_int32 Fs,
+static int oac_multistream_encoder_init_impl(
+      OacMSEncoder *st,
+      oac_int32 Fs,
       int channels,
       int streams,
       int coupled_streams,
@@ -452,73 +452,73 @@ static int opus_multistream_encoder_init_impl(
    if ((channels>255) || (channels<1) || (coupled_streams>streams) ||
        (streams<1) || (coupled_streams<0) || (streams>255-coupled_streams) ||
        (streams+coupled_streams>channels))
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
 
-   coupled_size = opus_encoder_init(NULL, Fs, 2, application);
+   coupled_size = oac_encoder_init(NULL, Fs, 2, application);
    if (coupled_size < 0)
       return coupled_size;
-   mono_size = opus_encoder_init(NULL, Fs, 1, application);
+   mono_size = oac_encoder_init(NULL, Fs, 1, application);
    if (mono_size < 0)
       return mono_size;
    if (st == NULL)
    {
       int surround_size=0;
       if (mapping_type == MAPPING_TYPE_SURROUND) {
-         surround_size = channels*(MAX_OVERLAP*sizeof(opus_val32) + sizeof(opus_val32));
+         surround_size = channels*(MAX_OVERLAP*sizeof(oac_val32) + sizeof(oac_val32));
       }
 
-      return align(sizeof(OpusMSEncoder)) + coupled_streams*align(coupled_size)
+      return align(sizeof(OacMSEncoder)) + coupled_streams*align(coupled_size)
              + (streams-coupled_streams)*align(mono_size) + surround_size;
    }
 
-   st->arch = opus_select_arch();
+   st->arch = oac_select_arch();
    st->layout.nb_channels = channels;
    st->layout.nb_streams = streams;
    st->layout.nb_coupled_streams = coupled_streams;
    if (mapping_type != MAPPING_TYPE_SURROUND)
       st->lfe_stream = -1;
-   st->bitrate_bps = OPUS_AUTO;
+   st->bitrate_bps = OAC_AUTO;
    st->application = application;
    st->Fs = Fs;
-   st->variable_duration = OPUS_FRAMESIZE_ARG;
+   st->variable_duration = OAC_FRAMESIZE_ARG;
    for (i=0;i<st->layout.nb_channels;i++)
       st->layout.mapping[i] = mapping[i];
    if (!validate_layout(&st->layout))
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    if (!validate_encoder_layout(&st->layout))
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    if (mapping_type == MAPPING_TYPE_AMBISONICS &&
        !validate_ambisonics(st->layout.nb_channels, NULL, NULL))
-      return OPUS_BAD_ARG;
-   ptr = (char*)st + align(sizeof(OpusMSEncoder));
+      return OAC_BAD_ARG;
+   ptr = (char*)st + align(sizeof(OacMSEncoder));
    for (i=0;i<st->layout.nb_coupled_streams;i++)
    {
-      ret = opus_encoder_init((OpusEncoder*)ptr, Fs, 2, application);
-      if(ret!=OPUS_OK)return ret;
+      ret = oac_encoder_init((OacEncoder*)ptr, Fs, 2, application);
+      if(ret!=OAC_OK)return ret;
       if (i==st->lfe_stream)
-         opus_encoder_ctl((OpusEncoder*)ptr, OPUS_SET_LFE(1));
+         oac_encoder_ctl((OacEncoder*)ptr, OAC_SET_LFE(1));
       ptr += align(coupled_size);
    }
    for (;i<st->layout.nb_streams;i++)
    {
-      ret = opus_encoder_init((OpusEncoder*)ptr, Fs, 1, application);
-      if(ret!=OPUS_OK)return ret;
+      ret = oac_encoder_init((OacEncoder*)ptr, Fs, 1, application);
+      if(ret!=OAC_OK)return ret;
       if (i==st->lfe_stream)
-         opus_encoder_ctl((OpusEncoder*)ptr, OPUS_SET_LFE(1));
+         oac_encoder_ctl((OacEncoder*)ptr, OAC_SET_LFE(1));
       ptr += align(mono_size);
    }
    if (mapping_type == MAPPING_TYPE_SURROUND)
    {
-      OPUS_CLEAR(ms_get_preemph_mem(st), channels);
-      OPUS_CLEAR(ms_get_window_mem(st), channels*MAX_OVERLAP);
+      OAC_CLEAR(ms_get_preemph_mem(st), channels);
+      OAC_CLEAR(ms_get_window_mem(st), channels*MAX_OVERLAP);
    }
    st->mapping_type = mapping_type;
-   return OPUS_OK;
+   return OAC_OK;
 }
 
-int opus_multistream_encoder_init(
-      OpusMSEncoder *st,
-      opus_int32 Fs,
+int oac_multistream_encoder_init(
+      OacMSEncoder *st,
+      oac_int32 Fs,
       int channels,
       int streams,
       int coupled_streams,
@@ -526,14 +526,14 @@ int opus_multistream_encoder_init(
       int application
 )
 {
-   return opus_multistream_encoder_init_impl(st, Fs, channels, streams,
+   return oac_multistream_encoder_init_impl(st, Fs, channels, streams,
                                              coupled_streams, mapping,
                                              application, MAPPING_TYPE_NONE);
 }
 
-int opus_multistream_surround_encoder_init(
-      OpusMSEncoder *st,
-      opus_int32 Fs,
+int oac_multistream_surround_encoder_init(
+      OacMSEncoder *st,
+      oac_int32 Fs,
       int channels,
       int mapping_family,
       int *streams,
@@ -546,7 +546,7 @@ int opus_multistream_surround_encoder_init(
    int lfe_stream;
 
    if ((channels>255) || (channels<1))
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    lfe_stream = -1;
    if (mapping_family==0)
    {
@@ -562,7 +562,7 @@ int opus_multistream_surround_encoder_init(
          mapping[0]=0;
          mapping[1]=1;
       } else
-         return OPUS_UNIMPLEMENTED;
+         return OAC_UNIMPLEMENTED;
    } else if (mapping_family==1 && channels<=8 && channels>=1)
    {
       int i;
@@ -583,13 +583,13 @@ int opus_multistream_surround_encoder_init(
    {
       int i;
       if (!validate_ambisonics(channels, streams, coupled_streams))
-         return OPUS_BAD_ARG;
+         return OAC_BAD_ARG;
       for(i = 0; i < (*streams - *coupled_streams); i++)
          mapping[i] = i + (*coupled_streams * 2);
       for(i = 0; i < *coupled_streams * 2; i++)
          mapping[i + (*streams - *coupled_streams)] = i;
    } else
-      return OPUS_UNIMPLEMENTED;
+      return OAC_UNIMPLEMENTED;
 
    if (channels>2 && mapping_family==1) {
       mapping_type = MAPPING_TYPE_SURROUND;
@@ -603,13 +603,13 @@ int opus_multistream_surround_encoder_init(
    if (st != NULL) {
       st->lfe_stream = lfe_stream;
    }
-   return opus_multistream_encoder_init_impl(st, Fs, channels, *streams,
+   return oac_multistream_encoder_init_impl(st, Fs, channels, *streams,
                                              *coupled_streams, mapping,
                                              application, mapping_type);
 }
 
-OpusMSEncoder *opus_multistream_encoder_create(
-      opus_int32 Fs,
+OacMSEncoder *oac_multistream_encoder_create(
+      oac_int32 Fs,
       int channels,
       int streams,
       int coupled_streams,
@@ -619,34 +619,34 @@ OpusMSEncoder *opus_multistream_encoder_create(
 )
 {
    int ret;
-   OpusMSEncoder *st;
-   opus_int32 size;
+   OacMSEncoder *st;
+   oac_int32 size;
    if ((channels>255) || (channels<1) || (coupled_streams>streams) ||
        (streams<1) || (coupled_streams<0) || (streams>255-coupled_streams) ||
        (streams+coupled_streams>channels))
    {
       if (error)
-         *error = OPUS_BAD_ARG;
+         *error = OAC_BAD_ARG;
       return NULL;
    }
-   size = opus_multistream_encoder_init(NULL, Fs, channels, streams, coupled_streams, mapping, application);
+   size = oac_multistream_encoder_init(NULL, Fs, channels, streams, coupled_streams, mapping, application);
    if (size < 0)
    {
       if (error)
          *error = size;
       return NULL;
    }
-   st = (OpusMSEncoder *)opus_alloc(size);
+   st = (OacMSEncoder *)oac_alloc(size);
    if (st==NULL)
    {
       if (error)
-         *error = OPUS_ALLOC_FAIL;
+         *error = OAC_ALLOC_FAIL;
       return NULL;
    }
-   ret = opus_multistream_encoder_init(st, Fs, channels, streams, coupled_streams, mapping, application);
-   if (ret != OPUS_OK)
+   ret = oac_multistream_encoder_init(st, Fs, channels, streams, coupled_streams, mapping, application);
+   if (ret != OAC_OK)
    {
-      opus_free(st);
+      oac_free(st);
       st = NULL;
    }
    if (error)
@@ -654,8 +654,8 @@ OpusMSEncoder *opus_multistream_encoder_create(
    return st;
 }
 
-OpusMSEncoder *opus_multistream_surround_encoder_create(
-      opus_int32 Fs,
+OacMSEncoder *oac_multistream_surround_encoder_create(
+      oac_int32 Fs,
       int channels,
       int mapping_family,
       int *streams,
@@ -666,32 +666,32 @@ OpusMSEncoder *opus_multistream_surround_encoder_create(
 )
 {
    int ret;
-   opus_int32 size;
-   OpusMSEncoder *st;
+   oac_int32 size;
+   OacMSEncoder *st;
    if ((channels>255) || (channels<1))
    {
       if (error)
-         *error = OPUS_BAD_ARG;
+         *error = OAC_BAD_ARG;
       return NULL;
    }
-   size = opus_multistream_surround_encoder_init(NULL, Fs, channels, mapping_family, streams, coupled_streams, mapping, application);
+   size = oac_multistream_surround_encoder_init(NULL, Fs, channels, mapping_family, streams, coupled_streams, mapping, application);
    if (size < 0)
    {
       if (error)
          *error = size;
       return NULL;
    }
-   st = (OpusMSEncoder *)opus_alloc(size);
+   st = (OacMSEncoder *)oac_alloc(size);
    if (st==NULL)
    {
       if (error)
-         *error = OPUS_ALLOC_FAIL;
+         *error = OAC_ALLOC_FAIL;
       return NULL;
    }
-   ret = opus_multistream_surround_encoder_init(st, Fs, channels, mapping_family, streams, coupled_streams, mapping, application);
-   if (ret != OPUS_OK)
+   ret = oac_multistream_surround_encoder_init(st, Fs, channels, mapping_family, streams, coupled_streams, mapping, application);
+   if (ret != OAC_OK)
    {
-      opus_free(st);
+      oac_free(st);
       st = NULL;
    }
    if (error)
@@ -700,14 +700,14 @@ OpusMSEncoder *opus_multistream_surround_encoder_create(
 }
 
 static void surround_rate_allocation(
-      OpusMSEncoder *st,
-      opus_int32 *rate,
+      OacMSEncoder *st,
+      oac_int32 *rate,
       int frame_size,
-      opus_int32 Fs
+      oac_int32 Fs
       )
 {
    int i;
-   opus_int32 channel_rate;
+   oac_int32 channel_rate;
    int stream_offset;
    int lfe_offset;
    int coupled_ratio; /* Q8 */
@@ -716,8 +716,8 @@ static void surround_rate_allocation(
    int nb_uncoupled;
    int nb_coupled;
    int nb_normal;
-   opus_int32 channel_offset;
-   opus_int32 bitrate;
+   oac_int32 channel_offset;
+   oac_int32 bitrate;
    int total;
 
    nb_lfe = (st->lfe_stream!=-1);
@@ -728,10 +728,10 @@ static void surround_rate_allocation(
    /* Give each non-LFE channel enough bits per channel for coding band energy. */
    channel_offset = 40*IMAX(50, Fs/frame_size);
 
-   if (st->bitrate_bps==OPUS_AUTO)
+   if (st->bitrate_bps==OAC_AUTO)
    {
       bitrate = nb_normal*(channel_offset + Fs + 10000) + 8000*nb_lfe;
-   } else if (st->bitrate_bps==OPUS_BITRATE_MAX)
+   } else if (st->bitrate_bps==OAC_BITRATE_MAX)
    {
       bitrate = nb_normal*750000 + nb_lfe*128000;
    } else {
@@ -755,7 +755,7 @@ static void surround_rate_allocation(
    total = (nb_uncoupled<<8)         /* mono */
          + coupled_ratio*nb_coupled /* stereo */
          + nb_lfe*lfe_ratio;
-   channel_rate = 256*(opus_int64)(bitrate - lfe_offset*nb_lfe - stream_offset*(nb_coupled+nb_uncoupled) - channel_offset*nb_normal)/total;
+   channel_rate = 256*(oac_int64)(bitrate - lfe_offset*nb_lfe - stream_offset*(nb_coupled+nb_uncoupled) - channel_offset*nb_normal)/total;
 
    for (i=0;i<st->layout.nb_streams;i++)
    {
@@ -769,23 +769,23 @@ static void surround_rate_allocation(
 }
 
 static void ambisonics_rate_allocation(
-      OpusMSEncoder *st,
-      opus_int32 *rate,
+      OacMSEncoder *st,
+      oac_int32 *rate,
       int frame_size,
-      opus_int32 Fs
+      oac_int32 Fs
       )
 {
    int i;
-   opus_int32 total_rate;
-   opus_int32 per_stream_rate;
+   oac_int32 total_rate;
+   oac_int32 per_stream_rate;
 
    const int nb_channels = st->layout.nb_streams + st->layout.nb_coupled_streams;
 
-   if (st->bitrate_bps==OPUS_AUTO)
+   if (st->bitrate_bps==OAC_AUTO)
    {
       total_rate = (st->layout.nb_coupled_streams + st->layout.nb_streams) *
-         (Fs+60*Fs/frame_size) + st->layout.nb_streams * (opus_int32)15000;
-   } else if (st->bitrate_bps==OPUS_BITRATE_MAX)
+         (Fs+60*Fs/frame_size) + st->layout.nb_streams * (oac_int32)15000;
+   } else if (st->bitrate_bps==OAC_BITRATE_MAX)
    {
       total_rate = nb_channels * 750000;
    } else
@@ -802,19 +802,19 @@ static void ambisonics_rate_allocation(
    }
 }
 
-static opus_int32 rate_allocation(
-      OpusMSEncoder *st,
-      opus_int32 *rate,
+static oac_int32 rate_allocation(
+      OacMSEncoder *st,
+      oac_int32 *rate,
       int frame_size
       )
 {
    int i;
-   opus_int32 rate_sum=0;
-   opus_int32 Fs;
+   oac_int32 rate_sum=0;
+   oac_int32 Fs;
    char *ptr;
 
-   ptr = (char*)st + align(sizeof(OpusMSEncoder));
-   opus_encoder_ctl((OpusEncoder*)ptr, OPUS_GET_SAMPLE_RATE(&Fs));
+   ptr = (char*)st + align(sizeof(OacMSEncoder));
+   oac_encoder_ctl((OacEncoder*)ptr, OAC_GET_SAMPLE_RATE(&Fs));
 
    if (st->mapping_type == MAPPING_TYPE_AMBISONICS) {
      ambisonics_rate_allocation(st, rate, frame_size, Fs);
@@ -834,39 +834,39 @@ static opus_int32 rate_allocation(
 /* Max size in case the encoder decides to return six frames (6 x 20 ms = 120 ms) */
 #define MS_FRAME_TMP (6*1275+12)
 
-int opus_multistream_encode_native
+int oac_multistream_encode_native
 (
-    OpusMSEncoder *st,
-    opus_copy_channel_in_func copy_channel_in,
+    OacMSEncoder *st,
+    oac_copy_channel_in_func copy_channel_in,
     const void *pcm,
     int analysis_frame_size,
     unsigned char *data,
-    opus_int32 max_data_bytes,
+    oac_int32 max_data_bytes,
     int lsb_depth,
     downmix_func downmix,
     int float_api,
     void *user_data
 )
 {
-   opus_int32 Fs;
+   oac_int32 Fs;
    int coupled_size;
    int mono_size;
    int s;
    char *ptr;
    int tot_size;
-   VARDECL(opus_res, buf);
+   VARDECL(oac_res, buf);
    VARDECL(celt_glog, bandSMR);
    unsigned char tmp_data[MS_FRAME_TMP];
-   OpusRepacketizer rp;
-   opus_int32 vbr;
+   OacRepacketizer rp;
+   oac_int32 vbr;
    const CELTMode *celt_mode=NULL;
-   opus_int32 bitrates[256];
+   oac_int32 bitrates[256];
    celt_glog bandLogE[42];
-   opus_val32 *mem = NULL;
-   opus_val32 *preemph_mem=NULL;
+   oac_val32 *mem = NULL;
+   oac_val32 *preemph_mem=NULL;
    int frame_size;
-   opus_int32 rate_sum;
-   opus_int32 smallest_packet;
+   oac_int32 rate_sum;
+   oac_int32 smallest_packet;
    ALLOC_STACK;
 
    if (st->mapping_type == MAPPING_TYPE_SURROUND)
@@ -875,17 +875,17 @@ int opus_multistream_encode_native
       mem = ms_get_window_mem(st);
    }
 
-   ptr = (char*)st + align(sizeof(OpusMSEncoder));
-   opus_encoder_ctl((OpusEncoder*)ptr, OPUS_GET_SAMPLE_RATE(&Fs));
-   opus_encoder_ctl((OpusEncoder*)ptr, OPUS_GET_VBR(&vbr));
-   if (st->application != OPUS_APPLICATION_RESTRICTED_SILK)
-      opus_encoder_ctl((OpusEncoder*)ptr, CELT_GET_MODE(&celt_mode));
+   ptr = (char*)st + align(sizeof(OacMSEncoder));
+   oac_encoder_ctl((OacEncoder*)ptr, OAC_GET_SAMPLE_RATE(&Fs));
+   oac_encoder_ctl((OacEncoder*)ptr, OAC_GET_VBR(&vbr));
+   if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
+      oac_encoder_ctl((OacEncoder*)ptr, CELT_GET_MODE(&celt_mode));
 
    frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, Fs);
    if (frame_size <= 0)
    {
       RESTORE_STACK;
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    }
 
    /* Smallest packet the encoder can produce. */
@@ -896,14 +896,14 @@ int opus_multistream_encode_native
    if (max_data_bytes < smallest_packet)
    {
       RESTORE_STACK;
-      return OPUS_BUFFER_TOO_SMALL;
+      return OAC_BUFFER_TOO_SMALL;
    }
-   ALLOC(buf, 2*frame_size, opus_res);
-   coupled_size = opus_encoder_init(NULL, st->Fs, 2, st->application);
-   mono_size = opus_encoder_init(NULL, st->Fs, 1, st->application);
+   ALLOC(buf, 2*frame_size, oac_res);
+   coupled_size = oac_encoder_init(NULL, st->Fs, 2, st->application);
+   mono_size = oac_encoder_init(NULL, st->Fs, 1, st->application);
 
    ALLOC(bandSMR, 21*st->layout.nb_channels, celt_glog);
-   if (st->mapping_type == MAPPING_TYPE_SURROUND && st->application != OPUS_APPLICATION_RESTRICTED_SILK)
+   if (st->mapping_type == MAPPING_TYPE_SURROUND && st->application != OAC_APPLICATION_RESTRICTED_SILK)
    {
       surround_analysis(celt_mode, pcm, bandSMR, mem, preemph_mem, frame_size, celt_mode->overlap, st->layout.nb_channels, Fs, copy_channel_in, st->arch);
    }
@@ -913,64 +913,64 @@ int opus_multistream_encode_native
 
    if (!vbr)
    {
-      if (st->bitrate_bps == OPUS_AUTO)
+      if (st->bitrate_bps == OAC_AUTO)
       {
          max_data_bytes = IMIN(max_data_bytes, (bitrate_to_bits(rate_sum, Fs, frame_size)+4)/8);
-      } else if (st->bitrate_bps != OPUS_BITRATE_MAX)
+      } else if (st->bitrate_bps != OAC_BITRATE_MAX)
       {
          max_data_bytes = IMIN(max_data_bytes, IMAX(smallest_packet,
                           (bitrate_to_bits(st->bitrate_bps, Fs, frame_size)+4)/8));
       }
    }
-   ptr = (char*)st + align(sizeof(OpusMSEncoder));
+   ptr = (char*)st + align(sizeof(OacMSEncoder));
    for (s=0;s<st->layout.nb_streams;s++)
    {
-      OpusEncoder *enc;
-      enc = (OpusEncoder*)ptr;
+      OacEncoder *enc;
+      enc = (OacEncoder*)ptr;
       if (s < st->layout.nb_coupled_streams)
          ptr += align(coupled_size);
       else
          ptr += align(mono_size);
-      opus_encoder_ctl(enc, OPUS_SET_BITRATE(bitrates[s]));
+      oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrates[s]));
       if (st->mapping_type == MAPPING_TYPE_SURROUND)
       {
-         opus_int32 equiv_rate;
+         oac_int32 equiv_rate;
          equiv_rate = st->bitrate_bps;
          if (frame_size*50 < Fs)
             equiv_rate -= 60*(Fs/frame_size - 50)*st->layout.nb_channels;
          if (equiv_rate > 10000*st->layout.nb_channels)
-            opus_encoder_ctl(enc, OPUS_SET_BANDWIDTH(OPUS_BANDWIDTH_FULLBAND));
+            oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_BANDWIDTH_FULLBAND));
          else if (equiv_rate > 7000*st->layout.nb_channels)
-            opus_encoder_ctl(enc, OPUS_SET_BANDWIDTH(OPUS_BANDWIDTH_SUPERWIDEBAND));
+            oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_BANDWIDTH_SUPERWIDEBAND));
          else if (equiv_rate > 5000*st->layout.nb_channels)
-            opus_encoder_ctl(enc, OPUS_SET_BANDWIDTH(OPUS_BANDWIDTH_WIDEBAND));
+            oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_BANDWIDTH_WIDEBAND));
          else
-            opus_encoder_ctl(enc, OPUS_SET_BANDWIDTH(OPUS_BANDWIDTH_NARROWBAND));
+            oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_BANDWIDTH_NARROWBAND));
          if (s < st->layout.nb_coupled_streams)
          {
             /* To preserve the spatial image, force stereo CELT on coupled streams */
-            opus_encoder_ctl(enc, OPUS_SET_FORCE_MODE(MODE_CELT_ONLY));
-            opus_encoder_ctl(enc, OPUS_SET_FORCE_CHANNELS(2));
+            oac_encoder_ctl(enc, OAC_SET_FORCE_MODE(MODE_CELT_ONLY));
+            oac_encoder_ctl(enc, OAC_SET_FORCE_CHANNELS(2));
          }
       }
       else if (st->mapping_type == MAPPING_TYPE_AMBISONICS) {
-        opus_encoder_ctl(enc, OPUS_SET_FORCE_MODE(MODE_CELT_ONLY));
+        oac_encoder_ctl(enc, OAC_SET_FORCE_MODE(MODE_CELT_ONLY));
       }
    }
 
-   ptr = (char*)st + align(sizeof(OpusMSEncoder));
+   ptr = (char*)st + align(sizeof(OacMSEncoder));
    /* Counting ToC */
    tot_size = 0;
    for (s=0;s<st->layout.nb_streams;s++)
    {
-      OpusEncoder *enc;
+      OacEncoder *enc;
       int len;
       int curr_max;
       int c1, c2;
       int ret;
 
-      opus_repacketizer_init(&rp);
-      enc = (OpusEncoder*)ptr;
+      oac_repacketizer_init(&rp);
+      enc = (OacEncoder*)ptr;
       if (s < st->layout.nb_coupled_streams)
       {
          int i;
@@ -982,7 +982,7 @@ int opus_multistream_encode_native
          (*copy_channel_in)(buf+1, 2,
             pcm, st->layout.nb_channels, right, frame_size, user_data);
          ptr += align(coupled_size);
-         if (st->mapping_type == MAPPING_TYPE_SURROUND && st->application != OPUS_APPLICATION_RESTRICTED_SILK)
+         if (st->mapping_type == MAPPING_TYPE_SURROUND && st->application != OAC_APPLICATION_RESTRICTED_SILK)
          {
             for (i=0;i<21;i++)
             {
@@ -998,7 +998,7 @@ int opus_multistream_encode_native
          (*copy_channel_in)(buf, 1,
             pcm, st->layout.nb_channels, chan, frame_size, user_data);
          ptr += align(mono_size);
-         if (st->mapping_type == MAPPING_TYPE_SURROUND && st->application != OPUS_APPLICATION_RESTRICTED_SILK)
+         if (st->mapping_type == MAPPING_TYPE_SURROUND && st->application != OAC_APPLICATION_RESTRICTED_SILK)
          {
             for (i=0;i<21;i++)
                bandLogE[i] = bandSMR[21*chan+i];
@@ -1006,8 +1006,8 @@ int opus_multistream_encode_native
          c1 = chan;
          c2 = -1;
       }
-      if (st->mapping_type == MAPPING_TYPE_SURROUND && st->application != OPUS_APPLICATION_RESTRICTED_SILK)
-         opus_encoder_ctl(enc, OPUS_SET_ENERGY_MASK(bandLogE));
+      if (st->mapping_type == MAPPING_TYPE_SURROUND && st->application != OAC_APPLICATION_RESTRICTED_SILK)
+         oac_encoder_ctl(enc, OAC_SET_ENERGY_MASK(bandLogE));
       /* number of bytes left (+Toc) */
       curr_max = max_data_bytes - tot_size;
       /* Reserve one byte for the last stream and two for the others */
@@ -1019,8 +1019,8 @@ int opus_multistream_encode_native
       /* Repacketizer will add one or two bytes for self-delimited frames */
       if (s != st->layout.nb_streams-1) curr_max -=  curr_max>253 ? 2 : 1;
       if (!vbr && s == st->layout.nb_streams-1)
-         opus_encoder_ctl(enc, OPUS_SET_BITRATE(bits_to_bitrate(curr_max*8, Fs, frame_size)));
-      len = opus_encode_native(enc, buf, frame_size, tmp_data, curr_max, lsb_depth,
+         oac_encoder_ctl(enc, OAC_SET_BITRATE(bits_to_bitrate(curr_max*8, Fs, frame_size)));
+      len = oac_encode_native(enc, buf, frame_size, tmp_data, curr_max, lsb_depth,
             pcm, analysis_frame_size, c1, c2, st->layout.nb_channels, downmix, float_api);
       if (len<0)
       {
@@ -1030,15 +1030,15 @@ int opus_multistream_encode_native
       /* We need to use the repacketizer to add the self-delimiting lengths
          while taking into account the fact that the encoder can now return
          more than one frame at a time (e.g. 60 ms CELT-only) */
-      ret = opus_repacketizer_cat(&rp, tmp_data, len);
-      /* If the opus_repacketizer_cat() fails, then something's seriously wrong
+      ret = oac_repacketizer_cat(&rp, tmp_data, len);
+      /* If the oac_repacketizer_cat() fails, then something's seriously wrong
          with the encoder. */
-      if (ret != OPUS_OK)
+      if (ret != OAC_OK)
       {
          RESTORE_STACK;
-         return OPUS_INTERNAL_ERROR;
+         return OAC_INTERNAL_ERROR;
       }
-      len = opus_repacketizer_out_range_impl(&rp, 0, opus_repacketizer_get_nb_frames(&rp),
+      len = oac_repacketizer_out_range_impl(&rp, 0, oac_repacketizer_get_nb_frames(&rp),
             data, max_data_bytes-tot_size, s != st->layout.nb_streams-1, !vbr && s == st->layout.nb_streams-1, NULL, 0);
       data += len;
       tot_size += len;
@@ -1049,8 +1049,8 @@ int opus_multistream_encode_native
 }
 
 #if !defined(DISABLE_FLOAT_API)
-static void opus_copy_channel_in_float(
-  opus_res *dst,
+static void oac_copy_channel_in_float(
+  oac_res *dst,
   int dst_stride,
   const void *src,
   int src_stride,
@@ -1060,7 +1060,7 @@ static void opus_copy_channel_in_float(
 )
 {
    const float *float_src;
-   opus_int32 i;
+   oac_int32 i;
    (void)user_data;
    float_src = (const float *)src;
    for (i=0;i<frame_size;i++)
@@ -1068,8 +1068,8 @@ static void opus_copy_channel_in_float(
 }
 #endif
 
-static void opus_copy_channel_in_short(
-  opus_res *dst,
+static void oac_copy_channel_in_short(
+  oac_res *dst,
   int dst_stride,
   const void *src,
   int src_stride,
@@ -1078,16 +1078,16 @@ static void opus_copy_channel_in_short(
   void *user_data
 )
 {
-   const opus_int16 *short_src;
-   opus_int32 i;
+   const oac_int16 *short_src;
+   oac_int32 i;
    (void)user_data;
-   short_src = (const opus_int16 *)src;
+   short_src = (const oac_int16 *)src;
    for (i=0;i<frame_size;i++)
       dst[i*dst_stride] = INT16TORES(short_src[i*src_stride+src_channel]);
 }
 
-static void opus_copy_channel_in_int24(
-  opus_res *dst,
+static void oac_copy_channel_in_int24(
+  oac_res *dst,
   int dst_stride,
   const void *src,
   int src_stride,
@@ -1096,68 +1096,68 @@ static void opus_copy_channel_in_int24(
   void *user_data
 )
 {
-   const opus_int32 *short_src;
-   opus_int32 i;
+   const oac_int32 *short_src;
+   oac_int32 i;
    (void)user_data;
-   short_src = (const opus_int32 *)src;
+   short_src = (const oac_int32 *)src;
    for (i=0;i<frame_size;i++)
       dst[i*dst_stride] = INT24TORES(short_src[i*src_stride+src_channel]);
 }
 
-int opus_multistream_encode(
-    OpusMSEncoder *st,
-    const opus_int16 *pcm,
+int oac_multistream_encode(
+    OacMSEncoder *st,
+    const oac_int16 *pcm,
     int frame_size,
     unsigned char *data,
-    opus_int32 max_data_bytes
+    oac_int32 max_data_bytes
 )
 {
-   return opus_multistream_encode_native(st, opus_copy_channel_in_short,
+   return oac_multistream_encode_native(st, oac_copy_channel_in_short,
       pcm, frame_size, data, max_data_bytes, 16, downmix_int, 0, NULL);
 }
 
-int opus_multistream_encode24(
-    OpusMSEncoder *st,
-    const opus_int32 *pcm,
+int oac_multistream_encode24(
+    OacMSEncoder *st,
+    const oac_int32 *pcm,
     int frame_size,
     unsigned char *data,
-    opus_int32 max_data_bytes
+    oac_int32 max_data_bytes
 )
 {
-   return opus_multistream_encode_native(st, opus_copy_channel_in_int24,
+   return oac_multistream_encode_native(st, oac_copy_channel_in_int24,
       pcm, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH, downmix_int24, 0, NULL);
 }
 
 #ifndef DISABLE_FLOAT_API
-int opus_multistream_encode_float(
-    OpusMSEncoder *st,
+int oac_multistream_encode_float(
+    OacMSEncoder *st,
     const float *pcm,
     int frame_size,
     unsigned char *data,
-    opus_int32 max_data_bytes
+    oac_int32 max_data_bytes
 )
 {
-   return opus_multistream_encode_native(st, opus_copy_channel_in_float,
+   return oac_multistream_encode_native(st, oac_copy_channel_in_float,
       pcm, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH, downmix_float, 1, NULL);
 }
 #endif
 
-int opus_multistream_encoder_ctl_va_list(OpusMSEncoder *st, int request,
+int oac_multistream_encoder_ctl_va_list(OacMSEncoder *st, int request,
                                          va_list ap)
 {
    int coupled_size, mono_size;
    char *ptr;
-   int ret = OPUS_OK;
+   int ret = OAC_OK;
 
-   coupled_size = opus_encoder_init(NULL, st->Fs, 2, st->application);
-   mono_size = opus_encoder_init(NULL, st->Fs, 1, st->application);
-   ptr = (char*)st + align(sizeof(OpusMSEncoder));
+   coupled_size = oac_encoder_init(NULL, st->Fs, 2, st->application);
+   mono_size = oac_encoder_init(NULL, st->Fs, 1, st->application);
+   ptr = (char*)st + align(sizeof(OacMSEncoder));
    switch (request)
    {
-   case OPUS_SET_BITRATE_REQUEST:
+   case OAC_SET_BITRATE_REQUEST:
    {
-      opus_int32 value = va_arg(ap, opus_int32);
-      if (value != OPUS_AUTO && value != OPUS_BITRATE_MAX)
+      oac_int32 value = va_arg(ap, oac_int32);
+      if (value != OAC_AUTO && value != OAC_BITRATE_MAX)
       {
          if (value <= 0)
             goto bad_arg;
@@ -1166,10 +1166,10 @@ int opus_multistream_encoder_ctl_va_list(OpusMSEncoder *st, int request,
       st->bitrate_bps = value;
    }
    break;
-   case OPUS_GET_BITRATE_REQUEST:
+   case OAC_GET_BITRATE_REQUEST:
    {
       int s;
-      opus_int32 *value = va_arg(ap, opus_int32*);
+      oac_int32 *value = va_arg(ap, oac_int32*);
       if (!value)
       {
          goto bad_arg;
@@ -1177,47 +1177,47 @@ int opus_multistream_encoder_ctl_va_list(OpusMSEncoder *st, int request,
       *value = 0;
       for (s=0;s<st->layout.nb_streams;s++)
       {
-         opus_int32 rate;
-         OpusEncoder *enc;
-         enc = (OpusEncoder*)ptr;
+         oac_int32 rate;
+         OacEncoder *enc;
+         enc = (OacEncoder*)ptr;
          if (s < st->layout.nb_coupled_streams)
             ptr += align(coupled_size);
          else
             ptr += align(mono_size);
-         opus_encoder_ctl(enc, request, &rate);
+         oac_encoder_ctl(enc, request, &rate);
          *value += rate;
       }
    }
    break;
-   case OPUS_GET_LSB_DEPTH_REQUEST:
-   case OPUS_GET_VBR_REQUEST:
-   case OPUS_GET_APPLICATION_REQUEST:
-   case OPUS_GET_BANDWIDTH_REQUEST:
-   case OPUS_GET_COMPLEXITY_REQUEST:
-   case OPUS_GET_PACKET_LOSS_PERC_REQUEST:
-   case OPUS_GET_DTX_REQUEST:
-   case OPUS_GET_VOICE_RATIO_REQUEST:
-   case OPUS_GET_VBR_CONSTRAINT_REQUEST:
-   case OPUS_GET_SIGNAL_REQUEST:
-   case OPUS_GET_LOOKAHEAD_REQUEST:
-   case OPUS_GET_SAMPLE_RATE_REQUEST:
-   case OPUS_GET_INBAND_FEC_REQUEST:
-   case OPUS_GET_FORCE_CHANNELS_REQUEST:
-   case OPUS_GET_PREDICTION_DISABLED_REQUEST:
-   case OPUS_GET_PHASE_INVERSION_DISABLED_REQUEST:
+   case OAC_GET_LSB_DEPTH_REQUEST:
+   case OAC_GET_VBR_REQUEST:
+   case OAC_GET_APPLICATION_REQUEST:
+   case OAC_GET_BANDWIDTH_REQUEST:
+   case OAC_GET_COMPLEXITY_REQUEST:
+   case OAC_GET_PACKET_LOSS_PERC_REQUEST:
+   case OAC_GET_DTX_REQUEST:
+   case OAC_GET_VOICE_RATIO_REQUEST:
+   case OAC_GET_VBR_CONSTRAINT_REQUEST:
+   case OAC_GET_SIGNAL_REQUEST:
+   case OAC_GET_LOOKAHEAD_REQUEST:
+   case OAC_GET_SAMPLE_RATE_REQUEST:
+   case OAC_GET_INBAND_FEC_REQUEST:
+   case OAC_GET_FORCE_CHANNELS_REQUEST:
+   case OAC_GET_PREDICTION_DISABLED_REQUEST:
+   case OAC_GET_PHASE_INVERSION_DISABLED_REQUEST:
    {
-      OpusEncoder *enc;
+      OacEncoder *enc;
       /* For int32* GET params, just query the first stream */
-      opus_int32 *value = va_arg(ap, opus_int32*);
-      enc = (OpusEncoder*)ptr;
-      ret = opus_encoder_ctl(enc, request, value);
+      oac_int32 *value = va_arg(ap, oac_int32*);
+      enc = (OacEncoder*)ptr;
+      ret = oac_encoder_ctl(enc, request, value);
    }
    break;
-   case OPUS_GET_FINAL_RANGE_REQUEST:
+   case OAC_GET_FINAL_RANGE_REQUEST:
    {
       int s;
-      opus_uint32 *value = va_arg(ap, opus_uint32*);
-      opus_uint32 tmp;
+      oac_uint32 *value = va_arg(ap, oac_uint32*);
+      oac_uint32 tmp;
       if (!value)
       {
          goto bad_arg;
@@ -1225,61 +1225,61 @@ int opus_multistream_encoder_ctl_va_list(OpusMSEncoder *st, int request,
       *value=0;
       for (s=0;s<st->layout.nb_streams;s++)
       {
-         OpusEncoder *enc;
-         enc = (OpusEncoder*)ptr;
+         OacEncoder *enc;
+         enc = (OacEncoder*)ptr;
          if (s < st->layout.nb_coupled_streams)
             ptr += align(coupled_size);
          else
             ptr += align(mono_size);
-         ret = opus_encoder_ctl(enc, request, &tmp);
-         if (ret != OPUS_OK) break;
+         ret = oac_encoder_ctl(enc, request, &tmp);
+         if (ret != OAC_OK) break;
          *value ^= tmp;
       }
    }
    break;
-   case OPUS_SET_LSB_DEPTH_REQUEST:
-   case OPUS_SET_COMPLEXITY_REQUEST:
-   case OPUS_SET_VBR_REQUEST:
-   case OPUS_SET_VBR_CONSTRAINT_REQUEST:
-   case OPUS_SET_MAX_BANDWIDTH_REQUEST:
-   case OPUS_SET_BANDWIDTH_REQUEST:
-   case OPUS_SET_SIGNAL_REQUEST:
-   case OPUS_SET_APPLICATION_REQUEST:
-   case OPUS_SET_INBAND_FEC_REQUEST:
-   case OPUS_SET_PACKET_LOSS_PERC_REQUEST:
-   case OPUS_SET_DTX_REQUEST:
-   case OPUS_SET_FORCE_MODE_REQUEST:
-   case OPUS_SET_FORCE_CHANNELS_REQUEST:
-   case OPUS_SET_PREDICTION_DISABLED_REQUEST:
-   case OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST:
+   case OAC_SET_LSB_DEPTH_REQUEST:
+   case OAC_SET_COMPLEXITY_REQUEST:
+   case OAC_SET_VBR_REQUEST:
+   case OAC_SET_VBR_CONSTRAINT_REQUEST:
+   case OAC_SET_MAX_BANDWIDTH_REQUEST:
+   case OAC_SET_BANDWIDTH_REQUEST:
+   case OAC_SET_SIGNAL_REQUEST:
+   case OAC_SET_APPLICATION_REQUEST:
+   case OAC_SET_INBAND_FEC_REQUEST:
+   case OAC_SET_PACKET_LOSS_PERC_REQUEST:
+   case OAC_SET_DTX_REQUEST:
+   case OAC_SET_FORCE_MODE_REQUEST:
+   case OAC_SET_FORCE_CHANNELS_REQUEST:
+   case OAC_SET_PREDICTION_DISABLED_REQUEST:
+   case OAC_SET_PHASE_INVERSION_DISABLED_REQUEST:
    {
       int s;
       /* This works for int32 params */
-      opus_int32 value = va_arg(ap, opus_int32);
+      oac_int32 value = va_arg(ap, oac_int32);
       for (s=0;s<st->layout.nb_streams;s++)
       {
-         OpusEncoder *enc;
+         OacEncoder *enc;
 
-         enc = (OpusEncoder*)ptr;
+         enc = (OacEncoder*)ptr;
          if (s < st->layout.nb_coupled_streams)
             ptr += align(coupled_size);
          else
             ptr += align(mono_size);
-         ret = opus_encoder_ctl(enc, request, value);
-         if (ret != OPUS_OK)
+         ret = oac_encoder_ctl(enc, request, value);
+         if (ret != OAC_OK)
             break;
       }
    }
    break;
-   case OPUS_MULTISTREAM_GET_ENCODER_STATE_REQUEST:
+   case OAC_MULTISTREAM_GET_ENCODER_STATE_REQUEST:
    {
       int s;
-      opus_int32 stream_id;
-      OpusEncoder **value;
-      stream_id = va_arg(ap, opus_int32);
+      oac_int32 stream_id;
+      OacEncoder **value;
+      stream_id = va_arg(ap, oac_int32);
       if (stream_id<0 || stream_id >= st->layout.nb_streams)
          goto bad_arg;
-      value = va_arg(ap, OpusEncoder**);
+      value = va_arg(ap, OacEncoder**);
       if (!value)
       {
          goto bad_arg;
@@ -1291,18 +1291,18 @@ int opus_multistream_encoder_ctl_va_list(OpusMSEncoder *st, int request,
          else
             ptr += align(mono_size);
       }
-      *value = (OpusEncoder*)ptr;
+      *value = (OacEncoder*)ptr;
    }
    break;
-   case OPUS_SET_EXPERT_FRAME_DURATION_REQUEST:
+   case OAC_SET_EXPERT_FRAME_DURATION_REQUEST:
    {
-       opus_int32 value = va_arg(ap, opus_int32);
+       oac_int32 value = va_arg(ap, oac_int32);
        st->variable_duration = value;
    }
    break;
-   case OPUS_GET_EXPERT_FRAME_DURATION_REQUEST:
+   case OAC_GET_EXPERT_FRAME_DURATION_REQUEST:
    {
-       opus_int32 *value = va_arg(ap, opus_int32*);
+       oac_int32 *value = va_arg(ap, oac_int32*);
        if (!value)
        {
           goto bad_arg;
@@ -1310,48 +1310,48 @@ int opus_multistream_encoder_ctl_va_list(OpusMSEncoder *st, int request,
        *value = st->variable_duration;
    }
    break;
-   case OPUS_RESET_STATE:
+   case OAC_RESET_STATE:
    {
       int s;
       if (st->mapping_type == MAPPING_TYPE_SURROUND)
       {
-         OPUS_CLEAR(ms_get_preemph_mem(st), st->layout.nb_channels);
-         OPUS_CLEAR(ms_get_window_mem(st), st->layout.nb_channels*MAX_OVERLAP);
+         OAC_CLEAR(ms_get_preemph_mem(st), st->layout.nb_channels);
+         OAC_CLEAR(ms_get_window_mem(st), st->layout.nb_channels*MAX_OVERLAP);
       }
       for (s=0;s<st->layout.nb_streams;s++)
       {
-         OpusEncoder *enc;
-         enc = (OpusEncoder*)ptr;
+         OacEncoder *enc;
+         enc = (OacEncoder*)ptr;
          if (s < st->layout.nb_coupled_streams)
             ptr += align(coupled_size);
          else
             ptr += align(mono_size);
-         ret = opus_encoder_ctl(enc, OPUS_RESET_STATE);
-         if (ret != OPUS_OK)
+         ret = oac_encoder_ctl(enc, OAC_RESET_STATE);
+         if (ret != OAC_OK)
             break;
       }
    }
    break;
    default:
-      ret = OPUS_UNIMPLEMENTED;
+      ret = OAC_UNIMPLEMENTED;
       break;
    }
    return ret;
 bad_arg:
-   return OPUS_BAD_ARG;
+   return OAC_BAD_ARG;
 }
 
-int opus_multistream_encoder_ctl(OpusMSEncoder *st, int request, ...)
+int oac_multistream_encoder_ctl(OacMSEncoder *st, int request, ...)
 {
    int ret;
    va_list ap;
    va_start(ap, request);
-   ret = opus_multistream_encoder_ctl_va_list(st, request, ap);
+   ret = oac_multistream_encoder_ctl_va_list(st, request, ap);
    va_end(ap);
    return ret;
 }
 
-void opus_multistream_encoder_destroy(OpusMSEncoder *st)
+void oac_multistream_encoder_destroy(OacMSEncoder *st)
 {
-    opus_free(st);
+    oac_free(st);
 }
diff --git a/src/oac_private.h b/src/oac_private.h
new file mode 100644
index 000000000..6ad68bbff
--- /dev/null
+++ b/src/oac_private.h
@@ -0,0 +1,266 @@
+/* Copyright (c) 2012 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+#ifndef OAC_PRIVATE_H
+#define OAC_PRIVATE_H
+
+#include "arch.h"
+#include "oac.h"
+#include "celt.h"
+
+#include <stdarg.h> /* va_list */
+#include <stddef.h> /* offsetof */
+
+struct OacRepacketizer {
+   unsigned char toc;
+   int nb_frames;
+   const unsigned char *frames[48];
+   oac_int16 len[48];
+   int framesize;
+   const unsigned char *paddings[48];
+   oac_int32 padding_len[48];
+   unsigned char padding_nb_frames[48];
+};
+
+typedef struct OacExtensionIterator {
+   const unsigned char *data;
+   const unsigned char *curr_data;
+   const unsigned char *repeat_data;
+   const unsigned char *last_long;
+   const unsigned char *src_data;
+   oac_int32 len;
+   oac_int32 curr_len;
+   oac_int32 repeat_len;
+   oac_int32 src_len;
+   oac_int32 trailing_short_len;
+   int nb_frames;
+   int frame_max;
+   int curr_frame;
+   int repeat_frame;
+   unsigned char repeat_l;
+} OacExtensionIterator;
+
+typedef struct {
+   int id;
+   int frame;
+   const unsigned char *data;
+   oac_int32 len;
+} oac_extension_data;
+
+void oac_extension_iterator_init(OacExtensionIterator *iter,
+ const unsigned char *data, oac_int32 len, oac_int32 nb_frames);
+
+void oac_extension_iterator_reset(OacExtensionIterator *iter);
+void oac_extension_iterator_set_frame_max(OacExtensionIterator *iter,
+ int frame_max);
+int oac_extension_iterator_next(OacExtensionIterator *iter,
+ oac_extension_data *ext);
+int oac_extension_iterator_find(OacExtensionIterator *iter,
+ oac_extension_data *ext, int id);
+
+typedef struct ChannelLayout {
+   int nb_channels;
+   int nb_streams;
+   int nb_coupled_streams;
+   unsigned char mapping[256];
+} ChannelLayout;
+
+typedef enum {
+  MAPPING_TYPE_NONE,
+  MAPPING_TYPE_SURROUND,
+  MAPPING_TYPE_AMBISONICS
+} MappingType;
+
+struct OacMSEncoder {
+   ChannelLayout layout;
+   int arch;
+   int lfe_stream;
+   int application;
+   oac_int32 Fs;
+   int variable_duration;
+   MappingType mapping_type;
+   oac_int32 bitrate_bps;
+   /* Encoder states go here */
+   /* then oac_val32 window_mem[channels*120]; */
+   /* then oac_val32 preemph_mem[channels]; */
+};
+
+struct OacMSDecoder {
+   ChannelLayout layout;
+   /* Decoder states go here */
+};
+
+int oac_multistream_encoder_ctl_va_list(struct OacMSEncoder *st, int request,
+  va_list ap);
+int oac_multistream_decoder_ctl_va_list(struct OacMSDecoder *st, int request,
+  va_list ap);
+
+int validate_layout(const ChannelLayout *layout);
+int get_left_channel(const ChannelLayout *layout, int stream_id, int prev);
+int get_right_channel(const ChannelLayout *layout, int stream_id, int prev);
+int get_mono_channel(const ChannelLayout *layout, int stream_id, int prev);
+
+typedef void (*oac_copy_channel_in_func)(
+  oac_res *dst,
+  int dst_stride,
+  const void *src,
+  int src_stride,
+  int src_channel,
+  int frame_size,
+  void *user_data
+);
+
+typedef void (*oac_copy_channel_out_func)(
+  void *dst,
+  int dst_stride,
+  int dst_channel,
+  const oac_res *src,
+  int src_stride,
+  int frame_size,
+  void *user_data
+);
+
+#define MODE_SILK_ONLY          1000
+#define MODE_HYBRID             1001
+#define MODE_CELT_ONLY          1002
+
+#define OAC_SET_VOICE_RATIO_REQUEST         11018
+#define OAC_GET_VOICE_RATIO_REQUEST         11019
+
+/** Configures the encoder's expected percentage of voice
+  * opposed to music or other signals.
+  *
+  * @note This interface is currently more aspiration than actuality. It's
+  * ultimately expected to bias an automatic signal classifier, but it currently
+  * just shifts the static bitrate to mode mapping around a little bit.
+  *
+  * @param[in] x <tt>int</tt>:   Voice percentage in the range 0-100, inclusive.
+  * @hideinitializer */
+#define OAC_SET_VOICE_RATIO(x) OAC_SET_VOICE_RATIO_REQUEST, oac_check_int(x)
+/** Gets the encoder's configured voice ratio value, @see OAC_SET_VOICE_RATIO
+  *
+  * @param[out] x <tt>int*</tt>:  Voice percentage in the range 0-100, inclusive.
+  * @hideinitializer */
+#define OAC_GET_VOICE_RATIO(x) OAC_GET_VOICE_RATIO_REQUEST, oac_check_int_ptr(x)
+
+
+#define OAC_SET_FORCE_MODE_REQUEST    11002
+#define OAC_SET_FORCE_MODE(x) OAC_SET_FORCE_MODE_REQUEST, oac_check_int(x)
+
+typedef void (*downmix_func)(const void *, oac_val32 *, int, int, int, int, int);
+void downmix_float(const void *_x, oac_val32 *sub, int subframe, int offset, int c1, int c2, int C);
+void downmix_int(const void *_x, oac_val32 *sub, int subframe, int offset, int c1, int c2, int C);
+void downmix_int24(const void *_x, oac_val32 *sub, int subframe, int offset, int c1, int c2, int C);
+int is_digital_silence(const oac_res* pcm, int frame_size, int channels, int lsb_depth);
+
+void oac_pcm_soft_clip_impl(float *_x, int N, int C, float *declip_mem, int arch);
+
+int encode_size(int size, unsigned char *data);
+
+oac_int32 frame_size_select(int application, oac_int32 frame_size, int variable_duration, oac_int32 Fs);
+
+oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
+      unsigned char *data, oac_int32 out_data_bytes, int lsb_depth,
+      const void *analysis_pcm, oac_int32 analysis_size, int c1, int c2,
+      int analysis_channels, downmix_func downmix, int float_api);
+
+int oac_decode_native(OacDecoder *st, const unsigned char *data, oac_int32 len,
+      oac_res *pcm, int frame_size, int decode_fec, int self_delimited,
+      oac_int32 *packet_offset, int soft_clip, const OacDRED *dred, oac_int32 dred_offset);
+
+/* Make sure everything is properly aligned. */
+static OAC_INLINE int align(int i)
+{
+    struct foo {char c; union { void* p; oac_int32 i; oac_val32 v; } u;};
+
+    unsigned int alignment = offsetof(struct foo, u);
+
+    /* Optimizing compilers should optimize div and multiply into and
+       for all sensible alignment values. */
+    return ((i + alignment - 1) / alignment) * alignment;
+}
+
+int oac_packet_parse_impl(const unsigned char *data, oac_int32 len,
+      int self_delimited, unsigned char *out_toc,
+      const unsigned char *frames[48], oac_int16 size[48],
+      int *payload_offset, oac_int32 *packet_offset,
+      const unsigned char **padding, oac_int32 *padding_len);
+
+oac_int32 oac_repacketizer_out_range_impl(OacRepacketizer *rp, int begin, int end,
+      unsigned char *data, oac_int32 maxlen, int self_delimited, int pad,
+      const oac_extension_data *extensions, int nb_extensions);
+
+int pad_frame(unsigned char *data, oac_int32 len, oac_int32 new_len);
+
+int oac_multistream_encode_native
+(
+  struct OacMSEncoder *st,
+  oac_copy_channel_in_func copy_channel_in,
+  const void *pcm,
+  int analysis_frame_size,
+  unsigned char *data,
+  oac_int32 max_data_bytes,
+  int lsb_depth,
+  downmix_func downmix,
+  int float_api,
+  void *user_data
+);
+
+int oac_multistream_decode_native(
+  struct OacMSDecoder *st,
+  const unsigned char *data,
+  oac_int32 len,
+  void *pcm,
+  oac_copy_channel_out_func copy_channel_out,
+  int frame_size,
+  int decode_fec,
+  int soft_clip,
+  void *user_data
+);
+
+oac_int32 oac_packet_extensions_parse(const unsigned char *data,
+ oac_int32 len, oac_extension_data *extensions, oac_int32 *nb_extensions,
+ int nb_frames);
+
+oac_int32 oac_packet_extensions_parse_ext(const unsigned char *data,
+ oac_int32 len, oac_extension_data *extensions, oac_int32 *nb_extensions,
+ const oac_int32 *nb_frame_exts, int nb_frames);
+
+oac_int32 oac_packet_extensions_generate(unsigned char *data, oac_int32 len,
+ const oac_extension_data *extensions, oac_int32 nb_extensions,
+ int nb_frames, int pad);
+
+oac_int32 oac_packet_extensions_count(const unsigned char *data,
+ oac_int32 len, int nb_frames);
+
+oac_int32 oac_packet_extensions_count_ext(const unsigned char *data,
+ oac_int32 len, oac_int32 *nb_frame_exts, int nb_frames);
+
+oac_int32 oac_packet_pad_impl(unsigned char *data, oac_int32 len, oac_int32 new_len, int pad, const oac_extension_data  *extensions, int nb_extensions);
+
+#endif /* OAC_PRIVATE_H */
diff --git a/src/opus_projection_decoder.c b/src/oac_projection_decoder.c
similarity index 59%
rename from src/opus_projection_decoder.c
rename to src/oac_projection_decoder.c
index f49057505..478c13084 100644
--- a/src/opus_projection_decoder.c
+++ b/src/oac_projection_decoder.c
@@ -31,25 +31,25 @@
 
 #include "mathops.h"
 #include "os_support.h"
-#include "opus_private.h"
-#include "opus_defines.h"
-#include "opus_projection.h"
-#include "opus_multistream.h"
+#include "oac_private.h"
+#include "oac_defines.h"
+#include "oac_projection.h"
+#include "oac_multistream.h"
 #include "mapping_matrix.h"
 #include "stack_alloc.h"
 
-struct OpusProjectionDecoder
+struct OacProjectionDecoder
 {
-  opus_int32 demixing_matrix_size_in_bytes;
+  oac_int32 demixing_matrix_size_in_bytes;
   /* Encoder states go here */
 };
 
 #if !defined(DISABLE_FLOAT_API)
-static void opus_projection_copy_channel_out_float(
+static void oac_projection_copy_channel_out_float(
   void *dst,
   int dst_stride,
   int dst_channel,
-  const opus_res *src,
+  const oac_res *src,
   int src_stride,
   int frame_size,
   void *user_data)
@@ -60,7 +60,7 @@ static void opus_projection_copy_channel_out_float(
   matrix = (const MappingMatrix *)user_data;
 
   if (dst_channel == 0)
-    OPUS_CLEAR(float_dst, frame_size * dst_stride);
+    OAC_CLEAR(float_dst, frame_size * dst_stride);
 
   if (src != NULL)
     mapping_matrix_multiply_channel_out_float(matrix, src, dst_channel,
@@ -68,108 +68,108 @@ static void opus_projection_copy_channel_out_float(
 }
 #endif
 
-static void opus_projection_copy_channel_out_short(
+static void oac_projection_copy_channel_out_short(
   void *dst,
   int dst_stride,
   int dst_channel,
-  const opus_res *src,
+  const oac_res *src,
   int src_stride,
   int frame_size,
   void *user_data)
 {
-  opus_int16 *short_dst;
+  oac_int16 *short_dst;
   const MappingMatrix *matrix;
-  short_dst = (opus_int16 *)dst;
+  short_dst = (oac_int16 *)dst;
   matrix = (const MappingMatrix *)user_data;
   if (dst_channel == 0)
-    OPUS_CLEAR(short_dst, frame_size * dst_stride);
+    OAC_CLEAR(short_dst, frame_size * dst_stride);
 
   if (src != NULL)
     mapping_matrix_multiply_channel_out_short(matrix, src, dst_channel,
       src_stride, short_dst, dst_stride, frame_size);
 }
 
-static void opus_projection_copy_channel_out_int24(
+static void oac_projection_copy_channel_out_int24(
   void *dst,
   int dst_stride,
   int dst_channel,
-  const opus_res *src,
+  const oac_res *src,
   int src_stride,
   int frame_size,
   void *user_data)
 {
-  opus_int32 *short_dst;
+  oac_int32 *short_dst;
   const MappingMatrix *matrix;
-  short_dst = (opus_int32 *)dst;
+  short_dst = (oac_int32 *)dst;
   matrix = (const MappingMatrix *)user_data;
   if (dst_channel == 0)
-    OPUS_CLEAR(short_dst, frame_size * dst_stride);
+    OAC_CLEAR(short_dst, frame_size * dst_stride);
 
   if (src != NULL)
     mapping_matrix_multiply_channel_out_int24(matrix, src, dst_channel,
       src_stride, short_dst, dst_stride, frame_size);
 }
 
-static MappingMatrix *get_dec_demixing_matrix(OpusProjectionDecoder *st)
+static MappingMatrix *get_dec_demixing_matrix(OacProjectionDecoder *st)
 {
   /* void* cast avoids clang -Wcast-align warning */
   return (MappingMatrix*)(void*)((char*)st +
-    align(sizeof(OpusProjectionDecoder)));
+    align(sizeof(OacProjectionDecoder)));
 }
 
-static OpusMSDecoder *get_multistream_decoder(OpusProjectionDecoder *st)
+static OacMSDecoder *get_multistream_decoder(OacProjectionDecoder *st)
 {
   /* void* cast avoids clang -Wcast-align warning */
-  return (OpusMSDecoder*)(void*)((char*)st +
-    align(sizeof(OpusProjectionDecoder) +
+  return (OacMSDecoder*)(void*)((char*)st +
+    align(sizeof(OacProjectionDecoder) +
     st->demixing_matrix_size_in_bytes));
 }
 
-opus_int32 opus_projection_decoder_get_size(int channels, int streams,
+oac_int32 oac_projection_decoder_get_size(int channels, int streams,
                                             int coupled_streams)
 {
-  opus_int32 matrix_size;
-  opus_int32 decoder_size;
+  oac_int32 matrix_size;
+  oac_int32 decoder_size;
 
   matrix_size =
     mapping_matrix_get_size(streams + coupled_streams, channels);
   if (!matrix_size)
     return 0;
 
-  decoder_size = opus_multistream_decoder_get_size(streams, coupled_streams);
+  decoder_size = oac_multistream_decoder_get_size(streams, coupled_streams);
   if (!decoder_size)
     return 0;
 
-  return align(sizeof(OpusProjectionDecoder)) + matrix_size + decoder_size;
+  return align(sizeof(OacProjectionDecoder)) + matrix_size + decoder_size;
 }
 
-int opus_projection_decoder_init(OpusProjectionDecoder *st, opus_int32 Fs,
+int oac_projection_decoder_init(OacProjectionDecoder *st, oac_int32 Fs,
   int channels, int streams, int coupled_streams,
-  unsigned char *demixing_matrix, opus_int32 demixing_matrix_size)
+  unsigned char *demixing_matrix, oac_int32 demixing_matrix_size)
 {
   int nb_input_streams;
-  opus_int32 expected_matrix_size;
+  oac_int32 expected_matrix_size;
   int i, ret;
   unsigned char mapping[255];
-  VARDECL(opus_int16, buf);
+  VARDECL(oac_int16, buf);
   ALLOC_STACK;
 
   /* Verify supplied matrix size. */
   nb_input_streams = streams + coupled_streams;
-  expected_matrix_size = nb_input_streams * channels * sizeof(opus_int16);
+  expected_matrix_size = nb_input_streams * channels * sizeof(oac_int16);
   if (expected_matrix_size != demixing_matrix_size)
   {
     RESTORE_STACK;
-    return OPUS_BAD_ARG;
+    return OAC_BAD_ARG;
   }
 
   /* Convert demixing matrix input into internal format. */
-  ALLOC(buf, nb_input_streams * channels, opus_int16);
+  ALLOC(buf, nb_input_streams * channels, oac_int16);
   for (i = 0; i < nb_input_streams * channels; i++)
   {
     int s = demixing_matrix[2*i + 1] << 8 | demixing_matrix[2*i];
     s = ((s & 0xFFFF) ^ 0x8000) - 0x8000;
-    buf[i] = (opus_int16)s;
+    buf[i] = (oac_int16)s;
   }
 
   /* Assign demixing matrix. */
@@ -178,7 +178,7 @@ int opus_projection_decoder_init(OpusProjectionDecoder *st, opus_int32 Fs,
   if (!st->demixing_matrix_size_in_bytes)
   {
     RESTORE_STACK;
-    return OPUS_BAD_ARG;
+    return OAC_BAD_ARG;
   }
 
   mapping_matrix_init(get_dec_demixing_matrix(st), channels, nb_input_streams, 0,
@@ -188,41 +188,41 @@ int opus_projection_decoder_init(OpusProjectionDecoder *st, opus_int32 Fs,
   for (i = 0; i < channels; i++)
     mapping[i] = i;
 
-  ret = opus_multistream_decoder_init(
+  ret = oac_multistream_decoder_init(
     get_multistream_decoder(st), Fs, channels, streams, coupled_streams, mapping);
   RESTORE_STACK;
   return ret;
 }
 
-OpusProjectionDecoder *opus_projection_decoder_create(
-  opus_int32 Fs, int channels, int streams, int coupled_streams,
-  unsigned char *demixing_matrix, opus_int32 demixing_matrix_size, int *error)
+OacProjectionDecoder *oac_projection_decoder_create(
+  oac_int32 Fs, int channels, int streams, int coupled_streams,
+  unsigned char *demixing_matrix, oac_int32 demixing_matrix_size, int *error)
 {
   int size;
   int ret;
-  OpusProjectionDecoder *st;
+  OacProjectionDecoder *st;
 
   /* Allocate space for the projection decoder. */
-  size = opus_projection_decoder_get_size(channels, streams, coupled_streams);
+  size = oac_projection_decoder_get_size(channels, streams, coupled_streams);
   if (!size) {
     if (error)
-      *error = OPUS_ALLOC_FAIL;
+      *error = OAC_ALLOC_FAIL;
     return NULL;
   }
-  st = (OpusProjectionDecoder *)opus_alloc(size);
+  st = (OacProjectionDecoder *)oac_alloc(size);
   if (!st)
   {
     if (error)
-      *error = OPUS_ALLOC_FAIL;
+      *error = OAC_ALLOC_FAIL;
     return NULL;
   }
 
   /* Initialize projection decoder with provided settings. */
-  ret = opus_projection_decoder_init(st, Fs, channels, streams, coupled_streams,
+  ret = oac_projection_decoder_init(st, Fs, channels, streams, coupled_streams,
                                      demixing_matrix, demixing_matrix_size);
-  if (ret != OPUS_OK)
+  if (ret != OAC_OK)
   {
-    opus_free(st);
+    oac_free(st);
     st = NULL;
   }
   if (error)
@@ -236,47 +236,47 @@ OpusProjectionDecoder *opus_projection_decoder_create(
 #define OPTIONAL_CLIP 1
 #endif
 
-int opus_projection_decode(OpusProjectionDecoder *st, const unsigned char *data,
-                           opus_int32 len, opus_int16 *pcm, int frame_size,
+int oac_projection_decode(OacProjectionDecoder *st, const unsigned char *data,
+                           oac_int32 len, oac_int16 *pcm, int frame_size,
                            int decode_fec)
 {
-  return opus_multistream_decode_native(get_multistream_decoder(st), data, len,
-    pcm, opus_projection_copy_channel_out_short, frame_size, decode_fec, OPTIONAL_CLIP,
+  return oac_multistream_decode_native(get_multistream_decoder(st), data, len,
+    pcm, oac_projection_copy_channel_out_short, frame_size, decode_fec, OPTIONAL_CLIP,
     get_dec_demixing_matrix(st));
 }
 
-int opus_projection_decode24(OpusProjectionDecoder *st, const unsigned char *data,
-                           opus_int32 len, opus_int32 *pcm, int frame_size,
+int oac_projection_decode24(OacProjectionDecoder *st, const unsigned char *data,
+                           oac_int32 len, oac_int32 *pcm, int frame_size,
                            int decode_fec)
 {
-  return opus_multistream_decode_native(get_multistream_decoder(st), data, len,
-    pcm, opus_projection_copy_channel_out_int24, frame_size, decode_fec, 0,
+  return oac_multistream_decode_native(get_multistream_decoder(st), data, len,
+    pcm, oac_projection_copy_channel_out_int24, frame_size, decode_fec, 0,
     get_dec_demixing_matrix(st));
 }
 
 #ifndef DISABLE_FLOAT_API
-int opus_projection_decode_float(OpusProjectionDecoder *st, const unsigned char *data,
-                                 opus_int32 len, float *pcm, int frame_size, int decode_fec)
+int oac_projection_decode_float(OacProjectionDecoder *st, const unsigned char *data,
+                                 oac_int32 len, float *pcm, int frame_size, int decode_fec)
 {
-  return opus_multistream_decode_native(get_multistream_decoder(st), data, len,
-    pcm, opus_projection_copy_channel_out_float, frame_size, decode_fec, 0,
+  return oac_multistream_decode_native(get_multistream_decoder(st), data, len,
+    pcm, oac_projection_copy_channel_out_float, frame_size, decode_fec, 0,
     get_dec_demixing_matrix(st));
 }
 #endif
 
-int opus_projection_decoder_ctl(OpusProjectionDecoder *st, int request, ...)
+int oac_projection_decoder_ctl(OacProjectionDecoder *st, int request, ...)
 {
   va_list ap;
-  int ret = OPUS_OK;
+  int ret = OAC_OK;
 
   va_start(ap, request);
-  ret = opus_multistream_decoder_ctl_va_list(get_multistream_decoder(st),
+  ret = oac_multistream_decoder_ctl_va_list(get_multistream_decoder(st),
     request, ap);
   va_end(ap);
   return ret;
 }
 
-void opus_projection_decoder_destroy(OpusProjectionDecoder *st)
+void oac_projection_decoder_destroy(OacProjectionDecoder *st)
 {
-  opus_free(st);
+  oac_free(st);
 }
diff --git a/src/opus_projection_encoder.c b/src/oac_projection_encoder.c
similarity index 76%
rename from src/opus_projection_encoder.c
rename to src/oac_projection_encoder.c
index 9b03900ae..dfc54ca9b 100644
--- a/src/opus_projection_encoder.c
+++ b/src/oac_projection_encoder.c
@@ -31,23 +31,23 @@
 
 #include "mathops.h"
 #include "os_support.h"
-#include "opus_private.h"
-#include "opus_defines.h"
-#include "opus_projection.h"
-#include "opus_multistream.h"
+#include "oac_private.h"
+#include "oac_defines.h"
+#include "oac_projection.h"
+#include "oac_multistream.h"
 #include "stack_alloc.h"
 #include "mapping_matrix.h"
 
-struct OpusProjectionEncoder
+struct OacProjectionEncoder
 {
-  opus_int32 mixing_matrix_size_in_bytes;
-  opus_int32 demixing_matrix_size_in_bytes;
+  oac_int32 mixing_matrix_size_in_bytes;
+  oac_int32 demixing_matrix_size_in_bytes;
   /* Encoder states go here */
 };
 
 #if !defined(DISABLE_FLOAT_API)
-static void opus_projection_copy_channel_in_float(
-  opus_res *dst,
+static void oac_projection_copy_channel_in_float(
+  oac_res *dst,
   int dst_stride,
   const void *src,
   int src_stride,
@@ -61,8 +61,8 @@ static void opus_projection_copy_channel_in_float(
 }
 #endif
 
-static void opus_projection_copy_channel_in_short(
-  opus_res *dst,
+static void oac_projection_copy_channel_in_short(
+  oac_res *dst,
   int dst_stride,
   const void *src,
   int src_stride,
@@ -72,11 +72,11 @@ static void opus_projection_copy_channel_in_short(
 )
 {
   mapping_matrix_multiply_channel_in_short((const MappingMatrix*)user_data,
-    (const opus_int16*)src, src_stride, dst, src_channel, dst_stride, frame_size);
+    (const oac_int16*)src, src_stride, dst, src_channel, dst_stride, frame_size);
 }
 
-static void opus_projection_copy_channel_in_int24(
-  opus_res *dst,
+static void oac_projection_copy_channel_in_int24(
+  oac_res *dst,
   int dst_stride,
   const void *src,
   int src_stride,
@@ -86,7 +86,7 @@ static void opus_projection_copy_channel_in_int24(
 )
 {
   mapping_matrix_multiply_channel_in_int24((const MappingMatrix*)user_data,
-    (const opus_int32*)src, src_stride, dst, src_channel, dst_stride, frame_size);
+    (const oac_int32*)src, src_stride, dst, src_channel, dst_stride, frame_size);
 }
 
 static int get_order_plus_one_from_channels(int channels, int *order_plus_one)
@@ -99,17 +99,17 @@ static int get_order_plus_one_from_channels(int channels, int *order_plus_one)
    * (1 + n)^2 + 2j, for n = 0...14 and j = 0 or 1.
    */
   if (channels < 1 || channels > 227)
-    return OPUS_BAD_ARG;
+    return OAC_BAD_ARG;
 
   order_plus_one_ = isqrt32(channels);
   acn_channels = order_plus_one_ * order_plus_one_;
   nondiegetic_channels = channels - acn_channels;
   if (nondiegetic_channels != 0 && nondiegetic_channels != 2)
-    return OPUS_BAD_ARG;
+    return OAC_BAD_ARG;
 
   if (order_plus_one)
     *order_plus_one = order_plus_one_;
-  return OPUS_OK;
+  return OAC_OK;
 }
 
 static int get_streams_from_channels(int channels, int mapping_family,
@@ -118,42 +118,42 @@ static int get_streams_from_channels(int channels, int mapping_family,
 {
   if (mapping_family == 3)
   {
-    if (get_order_plus_one_from_channels(channels, order_plus_one) != OPUS_OK)
-      return OPUS_BAD_ARG;
+    if (get_order_plus_one_from_channels(channels, order_plus_one) != OAC_OK)
+      return OAC_BAD_ARG;
     if (streams)
       *streams = (channels + 1) / 2;
     if (coupled_streams)
       *coupled_streams = channels / 2;
-    return OPUS_OK;
+    return OAC_OK;
   }
-  return OPUS_BAD_ARG;
+  return OAC_BAD_ARG;
 }
 
-static MappingMatrix *get_mixing_matrix(OpusProjectionEncoder *st)
+static MappingMatrix *get_mixing_matrix(OacProjectionEncoder *st)
 {
   /* void* cast avoids clang -Wcast-align warning */
   return (MappingMatrix *)(void*)((char*)st +
-    align(sizeof(OpusProjectionEncoder)));
+    align(sizeof(OacProjectionEncoder)));
 }
 
-static MappingMatrix *get_enc_demixing_matrix(OpusProjectionEncoder *st)
+static MappingMatrix *get_enc_demixing_matrix(OacProjectionEncoder *st)
 {
   /* void* cast avoids clang -Wcast-align warning */
   return (MappingMatrix *)(void*)((char*)st +
-    align(sizeof(OpusProjectionEncoder) +
+    align(sizeof(OacProjectionEncoder) +
     st->mixing_matrix_size_in_bytes));
 }
 
-static OpusMSEncoder *get_multistream_encoder(OpusProjectionEncoder *st)
+static OacMSEncoder *get_multistream_encoder(OacProjectionEncoder *st)
 {
   /* void* cast avoids clang -Wcast-align warning */
-  return (OpusMSEncoder *)(void*)((char*)st +
-    align(sizeof(OpusProjectionEncoder) +
+  return (OacMSEncoder *)(void*)((char*)st +
+    align(sizeof(OacProjectionEncoder) +
     st->mixing_matrix_size_in_bytes +
     st->demixing_matrix_size_in_bytes));
 }
 
-opus_int32 opus_projection_ambisonics_encoder_get_size(int channels,
+oac_int32 oac_projection_ambisonics_encoder_get_size(int channels,
                                                        int mapping_family)
 {
   int nb_streams;
@@ -161,13 +161,13 @@ opus_int32 opus_projection_ambisonics_encoder_get_size(int channels,
   int order_plus_one;
   int mixing_matrix_rows, mixing_matrix_cols;
   int demixing_matrix_rows, demixing_matrix_cols;
-  opus_int32 mixing_matrix_size, demixing_matrix_size;
-  opus_int32 encoder_size;
+  oac_int32 mixing_matrix_size, demixing_matrix_size;
+  oac_int32 encoder_size;
   int ret;
 
   ret = get_streams_from_channels(channels, mapping_family, &nb_streams,
                                   &nb_coupled_streams, &order_plus_one);
-  if (ret != OPUS_OK)
+  if (ret != OAC_OK)
     return 0;
 
   if (order_plus_one == 2)
@@ -219,34 +219,34 @@ opus_int32 opus_projection_ambisonics_encoder_get_size(int channels,
     return 0;
 
   encoder_size =
-      opus_multistream_encoder_get_size(nb_streams, nb_coupled_streams);
+      oac_multistream_encoder_get_size(nb_streams, nb_coupled_streams);
   if (!encoder_size)
     return 0;
 
-  return align(sizeof(OpusProjectionEncoder)) +
+  return align(sizeof(OacProjectionEncoder)) +
     mixing_matrix_size + demixing_matrix_size + encoder_size;
 }
 
-int opus_projection_ambisonics_encoder_init(OpusProjectionEncoder *st, opus_int32 Fs,
+int oac_projection_ambisonics_encoder_init(OacProjectionEncoder *st, oac_int32 Fs,
                                             int channels, int mapping_family,
                                             int *streams, int *coupled_streams,
                                             int application)
 {
   MappingMatrix *mixing_matrix;
   MappingMatrix *demixing_matrix;
-  OpusMSEncoder *ms_encoder;
+  OacMSEncoder *ms_encoder;
   int i;
   int ret;
   int order_plus_one;
   unsigned char mapping[255];
 
   if (streams == NULL || coupled_streams == NULL) {
-    return OPUS_BAD_ARG;
+    return OAC_BAD_ARG;
   }
 
   if (get_streams_from_channels(channels, mapping_family, streams,
-    coupled_streams, &order_plus_one) != OPUS_OK)
-    return OPUS_BAD_ARG;
+    coupled_streams, &order_plus_one) != OAC_OK)
+    return OAC_BAD_ARG;
 
   if (mapping_family == 3)
   {
@@ -288,12 +288,12 @@ int opus_projection_ambisonics_encoder_init(OpusProjectionEncoder *st, opus_int3
         sizeof(mapping_matrix_fifthoa_mixing_data));
     }
     else
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
 
     st->mixing_matrix_size_in_bytes = mapping_matrix_get_size(
       mixing_matrix->rows, mixing_matrix->cols);
     if (!st->mixing_matrix_size_in_bytes)
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
 
     /* Assign demixing matrix based on available pre-computed matrices. */
     demixing_matrix = get_enc_demixing_matrix(st);
@@ -333,22 +333,22 @@ int opus_projection_ambisonics_encoder_init(OpusProjectionEncoder *st, opus_int3
         sizeof(mapping_matrix_fifthoa_demixing_data));
     }
     else
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
 
     st->demixing_matrix_size_in_bytes = mapping_matrix_get_size(
       demixing_matrix->rows, demixing_matrix->cols);
     if (!st->demixing_matrix_size_in_bytes)
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
   }
   else
-    return OPUS_UNIMPLEMENTED;
+    return OAC_UNIMPLEMENTED;
 
   /* Ensure matrices are large enough for desired coding scheme. */
   if (*streams + *coupled_streams > mixing_matrix->rows ||
       channels > mixing_matrix->cols ||
       channels > demixing_matrix->rows ||
       *streams + *coupled_streams > demixing_matrix->cols)
-    return OPUS_BAD_ARG;
+    return OAC_BAD_ARG;
 
   /* Set trivial mapping so each input channel pairs with a matrix column. */
   for (i = 0; i < channels; i++)
@@ -356,40 +356,40 @@ int opus_projection_ambisonics_encoder_init(OpusProjectionEncoder *st, opus_int3
 
   /* Initialize multistream encoder with provided settings. */
   ms_encoder = get_multistream_encoder(st);
-  ret = opus_multistream_encoder_init(ms_encoder, Fs, channels, *streams,
+  ret = oac_multistream_encoder_init(ms_encoder, Fs, channels, *streams,
                                       *coupled_streams, mapping, application);
   return ret;
 }
 
-OpusProjectionEncoder *opus_projection_ambisonics_encoder_create(
-    opus_int32 Fs, int channels, int mapping_family, int *streams,
+OacProjectionEncoder *oac_projection_ambisonics_encoder_create(
+    oac_int32 Fs, int channels, int mapping_family, int *streams,
     int *coupled_streams, int application, int *error)
 {
   int size;
   int ret;
-  OpusProjectionEncoder *st;
+  OacProjectionEncoder *st;
 
   /* Allocate space for the projection encoder. */
-  size = opus_projection_ambisonics_encoder_get_size(channels, mapping_family);
+  size = oac_projection_ambisonics_encoder_get_size(channels, mapping_family);
   if (!size) {
     if (error)
-      *error = OPUS_ALLOC_FAIL;
+      *error = OAC_ALLOC_FAIL;
     return NULL;
   }
-  st = (OpusProjectionEncoder *)opus_alloc(size);
+  st = (OacProjectionEncoder *)oac_alloc(size);
   if (!st)
   {
     if (error)
-      *error = OPUS_ALLOC_FAIL;
+      *error = OAC_ALLOC_FAIL;
     return NULL;
   }
 
   /* Initialize projection encoder with provided settings. */
-  ret = opus_projection_ambisonics_encoder_init(st, Fs, channels,
+  ret = oac_projection_ambisonics_encoder_init(st, Fs, channels,
      mapping_family, streams, coupled_streams, application);
-  if (ret != OPUS_OK)
+  if (ret != OAC_OK)
   {
-    opus_free(st);
+    oac_free(st);
     st = NULL;
   }
   if (error)
@@ -397,46 +397,46 @@ OpusProjectionEncoder *opus_projection_ambisonics_encoder_create(
   return st;
 }
 
-int opus_projection_encode(OpusProjectionEncoder *st, const opus_int16 *pcm,
+int oac_projection_encode(OacProjectionEncoder *st, const oac_int16 *pcm,
                            int frame_size, unsigned char *data,
-                           opus_int32 max_data_bytes)
+                           oac_int32 max_data_bytes)
 {
-  return opus_multistream_encode_native(get_multistream_encoder(st),
-    opus_projection_copy_channel_in_short, pcm, frame_size, data,
+  return oac_multistream_encode_native(get_multistream_encoder(st),
+    oac_projection_copy_channel_in_short, pcm, frame_size, data,
     max_data_bytes, 16, downmix_int, 0, get_mixing_matrix(st));
 }
 
-int opus_projection_encode24(OpusProjectionEncoder *st, const opus_int32 *pcm,
+int oac_projection_encode24(OacProjectionEncoder *st, const oac_int32 *pcm,
                            int frame_size, unsigned char *data,
-                           opus_int32 max_data_bytes)
+                           oac_int32 max_data_bytes)
 {
-  return opus_multistream_encode_native(get_multistream_encoder(st),
-    opus_projection_copy_channel_in_int24, pcm, frame_size, data,
+  return oac_multistream_encode_native(get_multistream_encoder(st),
+    oac_projection_copy_channel_in_int24, pcm, frame_size, data,
     max_data_bytes, MAX_ENCODING_DEPTH, downmix_int, 0, get_mixing_matrix(st));
 }
 
 #ifndef DISABLE_FLOAT_API
-int opus_projection_encode_float(OpusProjectionEncoder *st, const float *pcm,
+int oac_projection_encode_float(OacProjectionEncoder *st, const float *pcm,
                                  int frame_size, unsigned char *data,
-                                 opus_int32 max_data_bytes)
+                                 oac_int32 max_data_bytes)
 {
-  return opus_multistream_encode_native(get_multistream_encoder(st),
-    opus_projection_copy_channel_in_float, pcm, frame_size, data,
+  return oac_multistream_encode_native(get_multistream_encoder(st),
+    oac_projection_copy_channel_in_float, pcm, frame_size, data,
     max_data_bytes, MAX_ENCODING_DEPTH, downmix_float, 1, get_mixing_matrix(st));
 }
 #endif
 
-void opus_projection_encoder_destroy(OpusProjectionEncoder *st)
+void oac_projection_encoder_destroy(OacProjectionEncoder *st)
 {
-  opus_free(st);
+  oac_free(st);
 }
 
-int opus_projection_encoder_ctl(OpusProjectionEncoder *st, int request, ...)
+int oac_projection_encoder_ctl(OacProjectionEncoder *st, int request, ...)
 {
   va_list ap;
   MappingMatrix *demixing_matrix;
-  OpusMSEncoder *ms_encoder;
-  int ret = OPUS_OK;
+  OacMSEncoder *ms_encoder;
+  int ret = OAC_OK;
 
   ms_encoder = get_multistream_encoder(st);
   demixing_matrix = get_enc_demixing_matrix(st);
@@ -444,21 +444,21 @@ int opus_projection_encoder_ctl(OpusProjectionEncoder *st, int request, ...)
   va_start(ap, request);
   switch(request)
   {
-  case OPUS_PROJECTION_GET_DEMIXING_MATRIX_SIZE_REQUEST:
+  case OAC_PROJECTION_GET_DEMIXING_MATRIX_SIZE_REQUEST:
   {
-    opus_int32 *value = va_arg(ap, opus_int32*);
+    oac_int32 *value = va_arg(ap, oac_int32*);
     if (!value)
     {
       goto bad_arg;
     }
     *value =
       ms_encoder->layout.nb_channels * (ms_encoder->layout.nb_streams
-      + ms_encoder->layout.nb_coupled_streams) * sizeof(opus_int16);
+      + ms_encoder->layout.nb_coupled_streams) * sizeof(oac_int16);
   }
   break;
-  case OPUS_PROJECTION_GET_DEMIXING_MATRIX_GAIN_REQUEST:
+  case OAC_PROJECTION_GET_DEMIXING_MATRIX_GAIN_REQUEST:
   {
-    opus_int32 *value = va_arg(ap, opus_int32*);
+    oac_int32 *value = va_arg(ap, oac_int32*);
     if (!value)
     {
       goto bad_arg;
@@ -466,15 +466,15 @@ int opus_projection_encoder_ctl(OpusProjectionEncoder *st, int request, ...)
     *value = demixing_matrix->gain;
   }
   break;
-  case OPUS_PROJECTION_GET_DEMIXING_MATRIX_REQUEST:
+  case OAC_PROJECTION_GET_DEMIXING_MATRIX_REQUEST:
   {
     int i, j, k, l;
     int nb_input_streams;
     int nb_output_streams;
     unsigned char *external_char;
-    opus_int16 *internal_short;
-    opus_int32 external_size;
-    opus_int32 internal_size;
+    oac_int16 *internal_short;
+    oac_int32 external_size;
+    oac_int32 internal_size;
 
     /* (I/O is in relation to the decoder's perspective). */
     nb_input_streams = ms_encoder->layout.nb_streams +
@@ -482,13 +482,13 @@ int opus_projection_encoder_ctl(OpusProjectionEncoder *st, int request, ...)
     nb_output_streams = ms_encoder->layout.nb_channels;
 
     external_char = va_arg(ap, unsigned char *);
-    external_size = va_arg(ap, opus_int32);
+    external_size = va_arg(ap, oac_int32);
     if (!external_char)
     {
       goto bad_arg;
     }
     internal_short = mapping_matrix_get_data(demixing_matrix);
-    internal_size = nb_input_streams * nb_output_streams * sizeof(opus_int16);
+    internal_size = nb_input_streams * nb_output_streams * sizeof(oac_int16);
     if (external_size != internal_size)
     {
       goto bad_arg;
@@ -508,7 +508,7 @@ int opus_projection_encoder_ctl(OpusProjectionEncoder *st, int request, ...)
   break;
   default:
   {
-    ret = opus_multistream_encoder_ctl_va_list(ms_encoder, request, ap);
+    ret = oac_multistream_encoder_ctl_va_list(ms_encoder, request, ap);
   }
   break;
   }
@@ -517,5 +517,5 @@ int opus_projection_encoder_ctl(OpusProjectionEncoder *st, int request, ...)
 
 bad_arg:
   va_end(ap);
-  return OPUS_BAD_ARG;
+  return OAC_BAD_ARG;
 }
diff --git a/src/opus_private.h b/src/opus_private.h
deleted file mode 100644
index 289f97ffa..000000000
--- a/src/opus_private.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/* Copyright (c) 2012 Xiph.Org Foundation
-   Written by Jean-Marc Valin */
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#ifndef OPUS_PRIVATE_H
-#define OPUS_PRIVATE_H
-
-#include "arch.h"
-#include "opus.h"
-#include "celt.h"
-
-#include <stdarg.h> /* va_list */
-#include <stddef.h> /* offsetof */
-
-struct OpusRepacketizer {
-   unsigned char toc;
-   int nb_frames;
-   const unsigned char *frames[48];
-   opus_int16 len[48];
-   int framesize;
-   const unsigned char *paddings[48];
-   opus_int32 padding_len[48];
-   unsigned char padding_nb_frames[48];
-};
-
-typedef struct OpusExtensionIterator {
-   const unsigned char *data;
-   const unsigned char *curr_data;
-   const unsigned char *repeat_data;
-   const unsigned char *last_long;
-   const unsigned char *src_data;
-   opus_int32 len;
-   opus_int32 curr_len;
-   opus_int32 repeat_len;
-   opus_int32 src_len;
-   opus_int32 trailing_short_len;
-   int nb_frames;
-   int frame_max;
-   int curr_frame;
-   int repeat_frame;
-   unsigned char repeat_l;
-} OpusExtensionIterator;
-
-typedef struct {
-   int id;
-   int frame;
-   const unsigned char *data;
-   opus_int32 len;
-} opus_extension_data;
-
-void opus_extension_iterator_init(OpusExtensionIterator *iter,
- const unsigned char *data, opus_int32 len, opus_int32 nb_frames);
-
-void opus_extension_iterator_reset(OpusExtensionIterator *iter);
-void opus_extension_iterator_set_frame_max(OpusExtensionIterator *iter,
- int frame_max);
-int opus_extension_iterator_next(OpusExtensionIterator *iter,
- opus_extension_data *ext);
-int opus_extension_iterator_find(OpusExtensionIterator *iter,
- opus_extension_data *ext, int id);
-
-typedef struct ChannelLayout {
-   int nb_channels;
-   int nb_streams;
-   int nb_coupled_streams;
-   unsigned char mapping[256];
-} ChannelLayout;
-
-typedef enum {
-  MAPPING_TYPE_NONE,
-  MAPPING_TYPE_SURROUND,
-  MAPPING_TYPE_AMBISONICS
-} MappingType;
-
-struct OpusMSEncoder {
-   ChannelLayout layout;
-   int arch;
-   int lfe_stream;
-   int application;
-   opus_int32 Fs;
-   int variable_duration;
-   MappingType mapping_type;
-   opus_int32 bitrate_bps;
-   /* Encoder states go here */
-   /* then opus_val32 window_mem[channels*120]; */
-   /* then opus_val32 preemph_mem[channels]; */
-};
-
-struct OpusMSDecoder {
-   ChannelLayout layout;
-   /* Decoder states go here */
-};
-
-int opus_multistream_encoder_ctl_va_list(struct OpusMSEncoder *st, int request,
-  va_list ap);
-int opus_multistream_decoder_ctl_va_list(struct OpusMSDecoder *st, int request,
-  va_list ap);
-
-int validate_layout(const ChannelLayout *layout);
-int get_left_channel(const ChannelLayout *layout, int stream_id, int prev);
-int get_right_channel(const ChannelLayout *layout, int stream_id, int prev);
-int get_mono_channel(const ChannelLayout *layout, int stream_id, int prev);
-
-typedef void (*opus_copy_channel_in_func)(
-  opus_res *dst,
-  int dst_stride,
-  const void *src,
-  int src_stride,
-  int src_channel,
-  int frame_size,
-  void *user_data
-);
-
-typedef void (*opus_copy_channel_out_func)(
-  void *dst,
-  int dst_stride,
-  int dst_channel,
-  const opus_res *src,
-  int src_stride,
-  int frame_size,
-  void *user_data
-);
-
-#define MODE_SILK_ONLY          1000
-#define MODE_HYBRID             1001
-#define MODE_CELT_ONLY          1002
-
-#define OPUS_SET_VOICE_RATIO_REQUEST         11018
-#define OPUS_GET_VOICE_RATIO_REQUEST         11019
-
-/** Configures the encoder's expected percentage of voice
-  * opposed to music or other signals.
-  *
-  * @note This interface is currently more aspiration than actuality. It's
-  * ultimately expected to bias an automatic signal classifier, but it currently
-  * just shifts the static bitrate to mode mapping around a little bit.
-  *
-  * @param[in] x <tt>int</tt>:   Voice percentage in the range 0-100, inclusive.
-  * @hideinitializer */
-#define OPUS_SET_VOICE_RATIO(x) OPUS_SET_VOICE_RATIO_REQUEST, opus_check_int(x)
-/** Gets the encoder's configured voice ratio value, @see OPUS_SET_VOICE_RATIO
-  *
-  * @param[out] x <tt>int*</tt>:  Voice percentage in the range 0-100, inclusive.
-  * @hideinitializer */
-#define OPUS_GET_VOICE_RATIO(x) OPUS_GET_VOICE_RATIO_REQUEST, opus_check_int_ptr(x)
-
-
-#define OPUS_SET_FORCE_MODE_REQUEST    11002
-#define OPUS_SET_FORCE_MODE(x) OPUS_SET_FORCE_MODE_REQUEST, opus_check_int(x)
-
-typedef void (*downmix_func)(const void *, opus_val32 *, int, int, int, int, int);
-void downmix_float(const void *_x, opus_val32 *sub, int subframe, int offset, int c1, int c2, int C);
-void downmix_int(const void *_x, opus_val32 *sub, int subframe, int offset, int c1, int c2, int C);
-void downmix_int24(const void *_x, opus_val32 *sub, int subframe, int offset, int c1, int c2, int C);
-int is_digital_silence(const opus_res* pcm, int frame_size, int channels, int lsb_depth);
-
-void opus_pcm_soft_clip_impl(float *_x, int N, int C, float *declip_mem, int arch);
-
-int encode_size(int size, unsigned char *data);
-
-opus_int32 frame_size_select(int application, opus_int32 frame_size, int variable_duration, opus_int32 Fs);
-
-opus_int32 opus_encode_native(OpusEncoder *st, const opus_res *pcm, int frame_size,
-      unsigned char *data, opus_int32 out_data_bytes, int lsb_depth,
-      const void *analysis_pcm, opus_int32 analysis_size, int c1, int c2,
-      int analysis_channels, downmix_func downmix, int float_api);
-
-int opus_decode_native(OpusDecoder *st, const unsigned char *data, opus_int32 len,
-      opus_res *pcm, int frame_size, int decode_fec, int self_delimited,
-      opus_int32 *packet_offset, int soft_clip, const OpusDRED *dred, opus_int32 dred_offset);
-
-/* Make sure everything is properly aligned. */
-static OPUS_INLINE int align(int i)
-{
-    struct foo {char c; union { void* p; opus_int32 i; opus_val32 v; } u;};
-
-    unsigned int alignment = offsetof(struct foo, u);
-
-    /* Optimizing compilers should optimize div and multiply into and
-       for all sensible alignment values. */
-    return ((i + alignment - 1) / alignment) * alignment;
-}
-
-int opus_packet_parse_impl(const unsigned char *data, opus_int32 len,
-      int self_delimited, unsigned char *out_toc,
-      const unsigned char *frames[48], opus_int16 size[48],
-      int *payload_offset, opus_int32 *packet_offset,
-      const unsigned char **padding, opus_int32 *padding_len);
-
-opus_int32 opus_repacketizer_out_range_impl(OpusRepacketizer *rp, int begin, int end,
-      unsigned char *data, opus_int32 maxlen, int self_delimited, int pad,
-      const opus_extension_data *extensions, int nb_extensions);
-
-int pad_frame(unsigned char *data, opus_int32 len, opus_int32 new_len);
-
-int opus_multistream_encode_native
-(
-  struct OpusMSEncoder *st,
-  opus_copy_channel_in_func copy_channel_in,
-  const void *pcm,
-  int analysis_frame_size,
-  unsigned char *data,
-  opus_int32 max_data_bytes,
-  int lsb_depth,
-  downmix_func downmix,
-  int float_api,
-  void *user_data
-);
-
-int opus_multistream_decode_native(
-  struct OpusMSDecoder *st,
-  const unsigned char *data,
-  opus_int32 len,
-  void *pcm,
-  opus_copy_channel_out_func copy_channel_out,
-  int frame_size,
-  int decode_fec,
-  int soft_clip,
-  void *user_data
-);
-
-opus_int32 opus_packet_extensions_parse(const unsigned char *data,
- opus_int32 len, opus_extension_data *extensions, opus_int32 *nb_extensions,
- int nb_frames);
-
-opus_int32 opus_packet_extensions_parse_ext(const unsigned char *data,
- opus_int32 len, opus_extension_data *extensions, opus_int32 *nb_extensions,
- const opus_int32 *nb_frame_exts, int nb_frames);
-
-opus_int32 opus_packet_extensions_generate(unsigned char *data, opus_int32 len,
- const opus_extension_data *extensions, opus_int32 nb_extensions,
- int nb_frames, int pad);
-
-opus_int32 opus_packet_extensions_count(const unsigned char *data,
- opus_int32 len, int nb_frames);
-
-opus_int32 opus_packet_extensions_count_ext(const unsigned char *data,
- opus_int32 len, opus_int32 *nb_frame_exts, int nb_frames);
-
-opus_int32 opus_packet_pad_impl(unsigned char *data, opus_int32 len, opus_int32 new_len, int pad, const opus_extension_data  *extensions, int nb_extensions);
-
-#endif /* OPUS_PRIVATE_H */
diff --git a/src/qext_compare.c b/src/qext_compare.c
index 534fb4c35..035746cc8 100644
--- a/src/qext_compare.c
+++ b/src/qext_compare.c
@@ -32,10 +32,10 @@
 #include "mini_kfft.c"
 
 #define MAX(a,b) ((a)>(b) ? (a) : (b))
-#define OPUS_PI (3.14159265F)
+#define OAC_PI (3.14159265F)
 
-#define OPUS_COSF(_x)        ((float)cos(_x))
-#define OPUS_SINF(_x)        ((float)sin(_x))
+#define OAC_COSF(_x)        ((float)cos(_x))
+#define OAC_SINF(_x)        ((float)sin(_x))
 
 static void *check_alloc(void *_ptr){
   if(_ptr==NULL){
@@ -45,11 +45,11 @@ static void *check_alloc(void *_ptr){
   return _ptr;
 }
 
-static void *opus_malloc(size_t _size){
+static void *oac_malloc(size_t _size){
   return check_alloc(malloc(_size));
 }
 
-static void *opus_realloc(void *_ptr,size_t _size){
+static void *oac_realloc(void *_ptr,size_t _size){
   return check_alloc(realloc(_ptr,_size));
 }
 
@@ -86,7 +86,7 @@ static size_t read_pcm(float **_samples,FILE *_fin,int _nchannels, int format){
     if(nsamples+nread>csamples){
       do csamples=csamples<<1|1;
       while(nsamples+nread>csamples);
-      samples=(float *)opus_realloc(samples,
+      samples=(float *)oac_realloc(samples,
        _nchannels*csamples*sizeof(*samples));
     }
     if (format==FORMAT_S16_LE) {
@@ -123,7 +123,7 @@ static size_t read_pcm(float **_samples,FILE *_fin,int _nchannels, int format){
       }
     nsamples+=nread;
   }
-  *_samples=(float *)opus_realloc(samples,
+  *_samples=(float *)oac_realloc(samples,
    _nchannels*nsamples*sizeof(*samples));
   return nsamples;
 }
@@ -142,7 +142,7 @@ static void band_energy(float *_out,float *_ps,const int *_bands,int _nbands,
   /* Blackman-Harris window. */
   for(xj=0;xj<_window_sz;xj++){
     double n = (xj+.5)/_window_sz;
-    window[xj]=0.35875 - 0.48829*cos(2*OPUS_PI*n) + 0.14128*cos(4*OPUS_PI*n) - 0.01168*cos(6*OPUS_PI*n);
+    window[xj]=0.35875 - 0.48829*cos(2*OAC_PI*n) + 0.14128*cos(4*OAC_PI*n) - 0.01168*cos(6*OAC_PI*n);
   }
   kfft = mini_kiss_fftr_alloc(_window_sz, 0, NULL, NULL);
   for(xi=0;xi<_nframes;xi++){
@@ -355,9 +355,9 @@ int main(int _argc,const char **_argv){
     rms=sqrt(rms/(xlength*nchannels));
   }
   nframes=(xlength-test_win_size+test_win_step)/test_win_step;
-  xb=(float *)opus_malloc(nframes*nbands*nchannels*sizeof(*xb));
-  X=(float *)opus_malloc(nframes*nfreqs*nchannels*sizeof(*X));
-  Y=(float *)opus_malloc(nframes*yfreqs*nchannels*sizeof(*Y));
+  xb=(float *)oac_malloc(nframes*nbands*nchannels*sizeof(*xb));
+  X=(float *)oac_malloc(nframes*nfreqs*nchannels*sizeof(*X));
+  Y=(float *)oac_malloc(nframes*yfreqs*nchannels*sizeof(*Y));
   /*Compute the per-band spectral energy of the original signal
      and the error.*/
   band_energy(xb,X,BANDS,nbands,x,nchannels,nframes,
@@ -480,7 +480,7 @@ int main(int _argc,const char **_argv){
       w = .5+.5*tanh(.5*(22-bi));
       for(xj=BANDS[bi];xj<BANDS[bi+1]&&xj<max_compare;xj++){
         float f, thresh;
-        f = xj*OPUS_PI/240;
+        f = xj*OAC_PI/240;
         /* Shape the lower threshold similar to 1/(1 - 0.85*z^-1) deemphasis filter at 48 kHz. */
         thresh = .1/(.15*.15 + f*f);
         for(ci=0;ci<nchannels;ci++){
diff --git a/src/repacketizer.c b/src/repacketizer.c
index 667176e11..bf7539aa7 100644
--- a/src/repacketizer.c
+++ b/src/repacketizer.c
@@ -29,61 +29,61 @@
 #include "config.h"
 #endif
 
-#include "opus.h"
-#include "opus_private.h"
+#include "oac.h"
+#include "oac_private.h"
 #include "os_support.h"
 #include "stack_alloc.h"
 
 
-int opus_repacketizer_get_size(void)
+int oac_repacketizer_get_size(void)
 {
-   return sizeof(OpusRepacketizer);
+   return sizeof(OacRepacketizer);
 }
 
-OpusRepacketizer *opus_repacketizer_init(OpusRepacketizer *rp)
+OacRepacketizer *oac_repacketizer_init(OacRepacketizer *rp)
 {
    rp->nb_frames = 0;
    return rp;
 }
 
-OpusRepacketizer *opus_repacketizer_create(void)
+OacRepacketizer *oac_repacketizer_create(void)
 {
-   OpusRepacketizer *rp;
-   rp=(OpusRepacketizer *)opus_alloc(opus_repacketizer_get_size());
+   OacRepacketizer *rp;
+   rp=(OacRepacketizer *)oac_alloc(oac_repacketizer_get_size());
    if(rp==NULL)return NULL;
-   return opus_repacketizer_init(rp);
+   return oac_repacketizer_init(rp);
 }
 
-void opus_repacketizer_destroy(OpusRepacketizer *rp)
+void oac_repacketizer_destroy(OacRepacketizer *rp)
 {
-   opus_free(rp);
+   oac_free(rp);
 }
 
-static int opus_repacketizer_cat_impl(OpusRepacketizer *rp, const unsigned char *data, opus_int32 len, int self_delimited)
+static int oac_repacketizer_cat_impl(OacRepacketizer *rp, const unsigned char *data, oac_int32 len, int self_delimited)
 {
    unsigned char tmp_toc;
    int curr_nb_frames,ret;
    /* Set of check ToC */
-   if (len<1) return OPUS_INVALID_PACKET;
+   if (len<1) return OAC_INVALID_PACKET;
    if (rp->nb_frames == 0)
    {
       rp->toc = data[0];
-      rp->framesize = opus_packet_get_samples_per_frame(data, 8000);
+      rp->framesize = oac_packet_get_samples_per_frame(data, 8000);
    } else if ((rp->toc&0xFC) != (data[0]&0xFC))
    {
       /*fprintf(stderr, "toc mismatch: 0x%x vs 0x%x\n", rp->toc, data[0]);*/
-      return OPUS_INVALID_PACKET;
+      return OAC_INVALID_PACKET;
    }
-   curr_nb_frames = opus_packet_get_nb_frames(data, len);
-   if(curr_nb_frames<1) return OPUS_INVALID_PACKET;
+   curr_nb_frames = oac_packet_get_nb_frames(data, len);
+   if(curr_nb_frames<1) return OAC_INVALID_PACKET;
 
    /* Check the 120 ms maximum packet size */
    if ((curr_nb_frames+rp->nb_frames)*rp->framesize > 960)
    {
-      return OPUS_INVALID_PACKET;
+      return OAC_INVALID_PACKET;
    }
 
-   ret=opus_packet_parse_impl(data, len, self_delimited, &tmp_toc, &rp->frames[rp->nb_frames], &rp->len[rp->nb_frames],
+   ret=oac_packet_parse_impl(data, len, self_delimited, &tmp_toc, &rp->frames[rp->nb_frames], &rp->len[rp->nb_frames],
        NULL, NULL, &rp->paddings[rp->nb_frames], &rp->padding_len[rp->nb_frames]);
    if(ret<1)return ret;
    rp->padding_nb_frames[rp->nb_frames]=ret;
@@ -98,38 +98,38 @@ static int opus_repacketizer_cat_impl(OpusRepacketizer *rp, const unsigned char
       curr_nb_frames--;
    }
    rp->nb_frames++;
-   return OPUS_OK;
+   return OAC_OK;
 }
 
-int opus_repacketizer_cat(OpusRepacketizer *rp, const unsigned char *data, opus_int32 len)
+int oac_repacketizer_cat(OacRepacketizer *rp, const unsigned char *data, oac_int32 len)
 {
-   return opus_repacketizer_cat_impl(rp, data, len, 0);
+   return oac_repacketizer_cat_impl(rp, data, len, 0);
 }
 
-int opus_repacketizer_get_nb_frames(OpusRepacketizer *rp)
+int oac_repacketizer_get_nb_frames(OacRepacketizer *rp)
 {
    return rp->nb_frames;
 }
 
-opus_int32 opus_repacketizer_out_range_impl(OpusRepacketizer *rp, int begin, int end,
-      unsigned char *data, opus_int32 maxlen, int self_delimited, int pad, const opus_extension_data *extensions, int nb_extensions)
+oac_int32 oac_repacketizer_out_range_impl(OacRepacketizer *rp, int begin, int end,
+      unsigned char *data, oac_int32 maxlen, int self_delimited, int pad, const oac_extension_data *extensions, int nb_extensions)
 {
    int i, count;
-   opus_int32 tot_size;
-   opus_int16 *len;
+   oac_int32 tot_size;
+   oac_int16 *len;
    const unsigned char **frames;
    unsigned char * ptr;
    int ones_begin=0, ones_end=0;
    int ext_begin=0, ext_len=0;
    int ext_count, total_ext_count;
-   VARDECL(opus_extension_data, all_extensions);
+   VARDECL(oac_extension_data, all_extensions);
    SAVE_STACK;
 
    if (begin<0 || begin>=end || end>rp->nb_frames)
    {
       /*fprintf(stderr, "%d %d %d\n", begin, end, rp->nb_frames);*/
       RESTORE_STACK;
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    }
    count = end-begin;
 
@@ -144,11 +144,11 @@ opus_int32 opus_repacketizer_out_range_impl(OpusRepacketizer *rp, int begin, int
    total_ext_count = nb_extensions;
    for (i=begin;i<end;i++)
    {
-      int n = opus_packet_extensions_count(rp->paddings[i], rp->padding_len[i],
+      int n = oac_packet_extensions_count(rp->paddings[i], rp->padding_len[i],
        rp->padding_nb_frames[i]);
       if (n > 0) total_ext_count += n;
    }
-   ALLOC(all_extensions, total_ext_count ? total_ext_count : ALLOC_NONE, opus_extension_data);
+   ALLOC(all_extensions, total_ext_count ? total_ext_count : ALLOC_NONE, oac_extension_data);
    /* copy over any extensions that were passed in */
    for (ext_count=0;ext_count<nb_extensions;ext_count++)
    {
@@ -159,14 +159,14 @@ opus_int32 opus_repacketizer_out_range_impl(OpusRepacketizer *rp, int begin, int
    for (i=begin;i<end;i++)
    {
       int j, ret;
-      opus_int32 frame_ext_count;
+      oac_int32 frame_ext_count;
       frame_ext_count = total_ext_count - ext_count;
-      ret = opus_packet_extensions_parse(rp->paddings[i], rp->padding_len[i],
+      ret = oac_packet_extensions_parse(rp->paddings[i], rp->padding_len[i],
          &all_extensions[ext_count], &frame_ext_count, rp->padding_nb_frames[i]);
       if (ret<0)
       {
          RESTORE_STACK;
-         return OPUS_INTERNAL_ERROR;
+         return OAC_INTERNAL_ERROR;
       }
       /* renumber the extension frame numbers */
       for (j=0;j<frame_ext_count;j++)
@@ -184,7 +184,7 @@ opus_int32 opus_repacketizer_out_range_impl(OpusRepacketizer *rp, int begin, int
       if (tot_size > maxlen)
       {
          RESTORE_STACK;
-         return OPUS_BUFFER_TOO_SMALL;
+         return OAC_BUFFER_TOO_SMALL;
       }
       *ptr++ = rp->toc&0xFC;
    } else if (count==2)
@@ -196,7 +196,7 @@ opus_int32 opus_repacketizer_out_range_impl(OpusRepacketizer *rp, int begin, int
          if (tot_size > maxlen)
          {
             RESTORE_STACK;
-            return OPUS_BUFFER_TOO_SMALL;
+            return OAC_BUFFER_TOO_SMALL;
          }
          *ptr++ = (rp->toc&0xFC) | 0x1;
       } else {
@@ -205,7 +205,7 @@ opus_int32 opus_repacketizer_out_range_impl(OpusRepacketizer *rp, int begin, int
          if (tot_size > maxlen)
          {
             RESTORE_STACK;
-            return OPUS_BUFFER_TOO_SMALL;
+            return OAC_BUFFER_TOO_SMALL;
          }
          *ptr++ = (rp->toc&0xFC) | 0x2;
          ptr += encode_size(len[0], ptr);
@@ -242,7 +242,7 @@ opus_int32 opus_repacketizer_out_range_impl(OpusRepacketizer *rp, int begin, int
          if (tot_size > maxlen)
          {
             RESTORE_STACK;
-            return OPUS_BUFFER_TOO_SMALL;
+            return OAC_BUFFER_TOO_SMALL;
          }
          *ptr++ = (rp->toc&0xFC) | 0x3;
          *ptr++ = count | 0x80;
@@ -251,7 +251,7 @@ opus_int32 opus_repacketizer_out_range_impl(OpusRepacketizer *rp, int begin, int
          if (tot_size > maxlen)
          {
             RESTORE_STACK;
-            return OPUS_BUFFER_TOO_SMALL;
+            return OAC_BUFFER_TOO_SMALL;
          }
          *ptr++ = (rp->toc&0xFC) | 0x3;
          *ptr++ = count;
@@ -260,7 +260,7 @@ opus_int32 opus_repacketizer_out_range_impl(OpusRepacketizer *rp, int begin, int
       if (ext_count>0)
       {
          /* figure out how much space we need for the extensions */
-         ext_len = opus_packet_extensions_generate(NULL, maxlen-tot_size,
+         ext_len = oac_packet_extensions_generate(NULL, maxlen-tot_size,
           all_extensions, ext_count, count, 0);
          if (ext_len < 0) return ext_len;
          if (!pad)
@@ -274,7 +274,7 @@ opus_int32 opus_repacketizer_out_range_impl(OpusRepacketizer *rp, int begin, int
          if (tot_size + ext_len + nb_255s + 1 > maxlen)
          {
             RESTORE_STACK;
-            return OPUS_BUFFER_TOO_SMALL;
+            return OAC_BUFFER_TOO_SMALL;
          }
          ext_begin = tot_size+pad_amount-ext_len;
          /* Prepend 0x01 padding */
@@ -298,15 +298,15 @@ opus_int32 opus_repacketizer_out_range_impl(OpusRepacketizer *rp, int begin, int
    /* Copy the actual data */
    for (i=0;i<count;i++)
    {
-      /* Using OPUS_MOVE() instead of OPUS_COPY() in case we're doing in-place
-         padding from opus_packet_pad or opus_packet_unpad(). */
+      /* Using OAC_MOVE() instead of OAC_COPY() in case we're doing in-place
+         padding from oac_packet_pad or oac_packet_unpad(). */
       /* assert disabled because it's not valid in C. */
       /* celt_assert(frames[i] + len[i] <= data || ptr <= frames[i]); */
-      OPUS_MOVE(ptr, frames[i], len[i]);
+      OAC_MOVE(ptr, frames[i], len[i]);
       ptr += len[i];
    }
    if (ext_len > 0) {
-      int ret = opus_packet_extensions_generate(&data[ext_begin], ext_len,
+      int ret = oac_packet_extensions_generate(&data[ext_begin], ext_len,
        all_extensions, ext_count, count, 0);
       celt_assert(ret == ext_len);
    }
@@ -322,61 +322,61 @@ opus_int32 opus_repacketizer_out_range_impl(OpusRepacketizer *rp, int begin, int
    return tot_size;
 }
 
-opus_int32 opus_repacketizer_out_range(OpusRepacketizer *rp, int begin, int end, unsigned char *data, opus_int32 maxlen)
+oac_int32 oac_repacketizer_out_range(OacRepacketizer *rp, int begin, int end, unsigned char *data, oac_int32 maxlen)
 {
-   return opus_repacketizer_out_range_impl(rp, begin, end, data, maxlen, 0, 0, NULL, 0);
+   return oac_repacketizer_out_range_impl(rp, begin, end, data, maxlen, 0, 0, NULL, 0);
 }
 
-opus_int32 opus_repacketizer_out(OpusRepacketizer *rp, unsigned char *data, opus_int32 maxlen)
+oac_int32 oac_repacketizer_out(OacRepacketizer *rp, unsigned char *data, oac_int32 maxlen)
 {
-   return opus_repacketizer_out_range_impl(rp, 0, rp->nb_frames, data, maxlen, 0, 0, NULL, 0);
+   return oac_repacketizer_out_range_impl(rp, 0, rp->nb_frames, data, maxlen, 0, 0, NULL, 0);
 }
 
-opus_int32 opus_packet_pad_impl(unsigned char *data, opus_int32 len, opus_int32 new_len, int pad, const opus_extension_data  *extensions, int nb_extensions)
+oac_int32 oac_packet_pad_impl(unsigned char *data, oac_int32 len, oac_int32 new_len, int pad, const oac_extension_data  *extensions, int nb_extensions)
 {
-   OpusRepacketizer rp;
-   opus_int32 ret;
+   OacRepacketizer rp;
+   oac_int32 ret;
    VARDECL(unsigned char, copy);
    SAVE_STACK;
    if (len < 1)
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    if (len==new_len)
-      return OPUS_OK;
+      return OAC_OK;
    else if (len > new_len)
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    ALLOC(copy, len, unsigned char);
-   opus_repacketizer_init(&rp);
+   oac_repacketizer_init(&rp);
    /* Moving payload to the end of the packet so we can do in-place padding */
-   OPUS_COPY(copy, data, len);
-   ret = opus_repacketizer_cat(&rp, copy, len);
-   if (ret != OPUS_OK)
+   OAC_COPY(copy, data, len);
+   ret = oac_repacketizer_cat(&rp, copy, len);
+   if (ret != OAC_OK)
       return ret;
-   ret = opus_repacketizer_out_range_impl(&rp, 0, rp.nb_frames, data, new_len, 0, pad, extensions, nb_extensions);
+   ret = oac_repacketizer_out_range_impl(&rp, 0, rp.nb_frames, data, new_len, 0, pad, extensions, nb_extensions);
    RESTORE_STACK;
    return ret;
 }
 
-int opus_packet_pad(unsigned char *data, opus_int32 len, opus_int32 new_len)
+int oac_packet_pad(unsigned char *data, oac_int32 len, oac_int32 new_len)
 {
-   opus_int32 ret;
+   oac_int32 ret;
    ALLOC_STACK;
-   ret = opus_packet_pad_impl(data, len, new_len, 1, NULL, 0);
+   ret = oac_packet_pad_impl(data, len, new_len, 1, NULL, 0);
    RESTORE_STACK;
    if (ret > 0)
-      return OPUS_OK;
+      return OAC_OK;
    else
       return ret;
 }
 
-opus_int32 opus_packet_unpad(unsigned char *data, opus_int32 len)
+oac_int32 oac_packet_unpad(unsigned char *data, oac_int32 len)
 {
-   OpusRepacketizer rp;
-   opus_int32 ret;
+   OacRepacketizer rp;
+   oac_int32 ret;
    int i;
    if (len < 1)
-      return OPUS_BAD_ARG;
-   opus_repacketizer_init(&rp);
-   ret = opus_repacketizer_cat(&rp, data, len);
+      return OAC_BAD_ARG;
+   oac_repacketizer_init(&rp);
+   ret = oac_repacketizer_cat(&rp, data, len);
    if (ret < 0)
       return ret;
    /* Discard all padding and extensions. */
@@ -384,70 +384,70 @@ opus_int32 opus_packet_unpad(unsigned char *data, opus_int32 len)
       rp.padding_len[i] = 0;
       rp.paddings[i] = NULL;
    }
-   ret = opus_repacketizer_out_range_impl(&rp, 0, rp.nb_frames, data, len, 0, 0, NULL, 0);
+   ret = oac_repacketizer_out_range_impl(&rp, 0, rp.nb_frames, data, len, 0, 0, NULL, 0);
    celt_assert(ret > 0 && ret <= len);
    return ret;
 }
 
-int opus_multistream_packet_pad(unsigned char *data, opus_int32 len, opus_int32 new_len, int nb_streams)
+int oac_multistream_packet_pad(unsigned char *data, oac_int32 len, oac_int32 new_len, int nb_streams)
 {
    int s;
    int count;
    unsigned char toc;
-   opus_int16 size[48];
-   opus_int32 packet_offset;
-   opus_int32 amount;
+   oac_int16 size[48];
+   oac_int32 packet_offset;
+   oac_int32 amount;
 
    if (len < 1)
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    if (len==new_len)
-      return OPUS_OK;
+      return OAC_OK;
    else if (len > new_len)
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    amount = new_len - len;
    /* Seek to last stream */
    for (s=0;s<nb_streams-1;s++)
    {
       if (len<=0)
-         return OPUS_INVALID_PACKET;
-      count = opus_packet_parse_impl(data, len, 1, &toc, NULL,
+         return OAC_INVALID_PACKET;
+      count = oac_packet_parse_impl(data, len, 1, &toc, NULL,
                                      size, NULL, &packet_offset, NULL, NULL);
       if (count<0)
          return count;
       data += packet_offset;
       len -= packet_offset;
    }
-   return opus_packet_pad(data, len, len+amount);
+   return oac_packet_pad(data, len, len+amount);
 }
 
-opus_int32 opus_multistream_packet_unpad(unsigned char *data, opus_int32 len, int nb_streams)
+oac_int32 oac_multistream_packet_unpad(unsigned char *data, oac_int32 len, int nb_streams)
 {
    int s;
    unsigned char toc;
-   opus_int16 size[48];
-   opus_int32 packet_offset;
-   OpusRepacketizer rp;
+   oac_int16 size[48];
+   oac_int32 packet_offset;
+   OacRepacketizer rp;
    unsigned char *dst;
-   opus_int32 dst_len;
+   oac_int32 dst_len;
 
    if (len < 1)
-      return OPUS_BAD_ARG;
+      return OAC_BAD_ARG;
    dst = data;
    dst_len = 0;
    /* Unpad all frames */
    for (s=0;s<nb_streams;s++)
    {
-      opus_int32 ret;
+      oac_int32 ret;
       int i;
       int self_delimited = s!=nb_streams-1;
       if (len<=0)
-         return OPUS_INVALID_PACKET;
-      opus_repacketizer_init(&rp);
-      ret = opus_packet_parse_impl(data, len, self_delimited, &toc, NULL,
+         return OAC_INVALID_PACKET;
+      oac_repacketizer_init(&rp);
+      ret = oac_packet_parse_impl(data, len, self_delimited, &toc, NULL,
                                      size, NULL, &packet_offset, NULL, NULL);
       if (ret<0)
          return ret;
-      ret = opus_repacketizer_cat_impl(&rp, data, packet_offset, self_delimited);
+      ret = oac_repacketizer_cat_impl(&rp, data, packet_offset, self_delimited);
       if (ret < 0)
          return ret;
       /* Discard all padding and extensions. */
@@ -455,7 +455,7 @@ opus_int32 opus_multistream_packet_unpad(unsigned char *data, opus_int32 len, in
          rp.padding_len[i] = 0;
          rp.paddings[i] = NULL;
       }
-      ret = opus_repacketizer_out_range_impl(&rp, 0, rp.nb_frames, dst, len, self_delimited, 0, NULL, 0);
+      ret = oac_repacketizer_out_range_impl(&rp, 0, rp.nb_frames, dst, len, self_delimited, 0, NULL, 0);
       if (ret < 0)
          return ret;
       else
diff --git a/src/repacketizer_demo.c b/src/repacketizer_demo.c
index 43de70192..87a7f38da 100644
--- a/src/repacketizer_demo.c
+++ b/src/repacketizer_demo.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "opus.h"
+#include "oac.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -41,7 +41,7 @@ void usage(char *argv0)
    fprintf(stderr, "usage: %s [options] input_file output_file\n", argv0);
 }
 
-static void int_to_char(opus_uint32 i, unsigned char ch[4])
+static void int_to_char(oac_uint32 i, unsigned char ch[4])
 {
     ch[0] = i>>24;
     ch[1] = (i>>16)&0xFF;
@@ -49,10 +49,10 @@ static void int_to_char(opus_uint32 i, unsigned char ch[4])
     ch[3] = i&0xFF;
 }
 
-static opus_uint32 char_to_int(unsigned char ch[4])
+static oac_uint32 char_to_int(unsigned char ch[4])
 {
-    return ((opus_uint32)ch[0]<<24) | ((opus_uint32)ch[1]<<16)
-         | ((opus_uint32)ch[2]<< 8) |  (opus_uint32)ch[3];
+    return ((oac_uint32)ch[0]<<24) | ((oac_uint32)ch[1]<<16)
+         | ((oac_uint32)ch[2]<< 8) |  (oac_uint32)ch[3];
 }
 
 int main(int argc, char *argv[])
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
    unsigned char packets[48][1500];
    int len[48];
    int rng[48];
-   OpusRepacketizer *rp;
+   OacRepacketizer *rp;
    unsigned char output_packet[MAX_PACKETOUT];
    int merge = 1, split=0;
 
@@ -110,12 +110,12 @@ int main(int argc, char *argv[])
      return EXIT_FAILURE;
    }
 
-   rp = opus_repacketizer_create();
+   rp = oac_repacketizer_create();
    while (!eof)
    {
       int err;
       int nb_packets=merge;
-      opus_repacketizer_init(rp);
+      oac_repacketizer_init(rp);
       for (i=0;i<nb_packets;i++)
       {
          unsigned char ch[4];
@@ -173,10 +173,10 @@ int main(int argc, char *argv[])
              }
              break;
          }
-         err = opus_repacketizer_cat(rp, packets[i], len[i]);
-         if (err!=OPUS_OK)
+         err = oac_repacketizer_cat(rp, packets[i], len[i]);
+         if (err!=OAC_OK)
          {
-            fprintf(stderr, "opus_repacketizer_cat() failed: %s\n", opus_strerror(err));
+            fprintf(stderr, "oac_repacketizer_cat() failed: %s\n", oac_strerror(err));
             break;
          }
       }
@@ -187,7 +187,7 @@ int main(int argc, char *argv[])
 
       if (!split)
       {
-         err = opus_repacketizer_out(rp, output_packet, MAX_PACKETOUT);
+         err = oac_repacketizer_out(rp, output_packet, MAX_PACKETOUT);
          if (err>0) {
             unsigned char int_field[4];
             int_to_char(err, int_field);
@@ -206,13 +206,13 @@ int main(int argc, char *argv[])
             }
             /*fprintf(stderr, "out len = %d\n", err);*/
          } else {
-            fprintf(stderr, "opus_repacketizer_out() failed: %s\n", opus_strerror(err));
+            fprintf(stderr, "oac_repacketizer_out() failed: %s\n", oac_strerror(err));
          }
       } else {
-         int nb_frames = opus_repacketizer_get_nb_frames(rp);
+         int nb_frames = oac_repacketizer_get_nb_frames(rp);
          for (i=0;i<nb_frames;i++)
          {
-            err = opus_repacketizer_out_range(rp, i, i+1, output_packet, MAX_PACKETOUT);
+            err = oac_repacketizer_out_range(rp, i, i+1, output_packet, MAX_PACKETOUT);
             if (err>0) {
                unsigned char int_field[4];
                int_to_char(err, int_field);
@@ -234,7 +234,7 @@ int main(int argc, char *argv[])
                }
                /*fprintf(stderr, "out len = %d\n", err);*/
             } else {
-               fprintf(stderr, "opus_repacketizer_out() failed: %s\n", opus_strerror(err));
+               fprintf(stderr, "oac_repacketizer_out() failed: %s\n", oac_strerror(err));
             }
 
          }
diff --git a/tests/meson.build b/tests/meson.build
index 1a4040b5c..6f7f13bd8 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,18 +1,18 @@
-# Tests that link to libopus
-opus_tests = [
-  ['test_opus_api'],
-  ['test_opus_decode', [], 120],
-  ['test_opus_encode', 'opus_encode_regressions.c', 240],
-  ['test_opus_extensions', [], 120],
-  ['test_opus_padding'],
-  ['test_opus_projection'],
+# Tests that link to liboac
+oac_tests = [
+  ['test_oac_api'],
+  ['test_oac_decode', [], 120],
+  ['test_oac_encode', 'oac_encode_regressions.c', 240],
+  ['test_oac_extensions', [], 120],
+  ['test_oac_padding'],
+  ['test_oac_projection'],
 ]
 
 if opt_dred.enabled()
-  opus_tests += [['test_opus_dred', [], 60 * 20]]
+  oac_tests += [['test_oac_dred', [], 60 * 20]]
 endif
 
-foreach t : opus_tests
+foreach t : oac_tests
   test_name = t.get(0)
   extra_srcs = t.get(1, [])
 
@@ -23,16 +23,16 @@ foreach t : opus_tests
 
   exe_kwargs = {}
   # This test uses private symbols
-  if test_name == 'test_opus_projection' or test_name == 'test_opus_extensions'
+  if test_name == 'test_oac_projection' or test_name == 'test_oac_extensions'
     exe_kwargs = {
       'link_with': [celt_lib, silk_lib, dnn_lib],
-      'objects': opus_lib.extract_all_objects(),
+      'objects': oac_lib.extract_all_objects(),
     }
   endif
 
   exe = executable(test_name, '@0@.c'.format(test_name), extra_srcs,
-    include_directories: opus_includes,
-    dependencies: [libm, opus_dep],
+    include_directories: oac_includes,
+    dependencies: [libm, oac_dep],
     install: false,
     kwargs: exe_kwargs)
   test(test_name, exe, kwargs: test_kwargs)
diff --git a/tests/opus_build_test.sh b/tests/oac_build_test.sh
similarity index 100%
rename from tests/opus_build_test.sh
rename to tests/oac_build_test.sh
diff --git a/tests/opus_decode_fuzzer.c b/tests/oac_decode_fuzzer.c
similarity index 74%
rename from tests/opus_decode_fuzzer.c
rename to tests/oac_decode_fuzzer.c
index ea6ec4fd1..d2d6b3e91 100644
--- a/tests/opus_decode_fuzzer.c
+++ b/tests/oac_decode_fuzzer.c
@@ -31,8 +31,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include "opus.h"
-#include "opus_types.h"
+#include "oac.h"
+#include "oac_types.h"
 
 #define MAX_FRAME_SAMP 5760
 #define MAX_PACKET 1500
@@ -49,25 +49,25 @@ typedef struct {
 
 static void ParseToc(const uint8_t *toc, TocInfo *const info) {
     const int samp_freqs[5] = {8000, 12000, 16000, 24000, 48000};
-    const int bandwidth = opus_packet_get_bandwidth(toc);
+    const int bandwidth = oac_packet_get_bandwidth(toc);
 
-    info->fs = samp_freqs[bandwidth - OPUS_BANDWIDTH_NARROWBAND];
-    info->channels = opus_packet_get_nb_channels(toc);
+    info->fs = samp_freqs[bandwidth - OAC_BANDWIDTH_NARROWBAND];
+    info->channels = oac_packet_get_nb_channels(toc);
 }
 
-/* Treats the input data as concatenated packets encoded by opus_demo,
+/* Treats the input data as concatenated packets encoded by oac_demo,
  * structured as
  *    bytes 0..3: packet length
  *    bytes 4..7: encoder final range
- *    bytes 8+  : Opus packet, including ToC
+ *    bytes 8+  : Oac packet, including ToC
  */
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
-    OpusDecoder *dec;
-    opus_int16 *pcm;
+    OacDecoder *dec;
+    oac_int16 *pcm;
     uint8_t *temp_data;
     TocInfo toc;
     int i = 0;
-    int err = OPUS_OK;
+    int err = OAC_OK;
     int num_decodes = 0;
 
     /* Not enough data to setup the decoder (+1 for the ToC) */
@@ -78,20 +78,20 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     /* Create decoder based on info from the first ToC available */
     ParseToc(&data[SETUP_BYTE_COUNT], &toc);
 
-    dec = opus_decoder_create(toc.fs, toc.channels, &err);
-    if (err != OPUS_OK || dec == NULL) {
+    dec = oac_decoder_create(toc.fs, toc.channels, &err);
+    if (err != OAC_OK || dec == NULL) {
         return 0;
     }
 
-    pcm = (opus_int16*) malloc(sizeof(*pcm) * MAX_FRAME_SAMP * toc.channels);
+    pcm = (oac_int16*) malloc(sizeof(*pcm) * MAX_FRAME_SAMP * toc.channels);
 
     while (i + SETUP_BYTE_COUNT < size && num_decodes++ < MAX_DECODES) {
         int len, fec;
 
-        len = (opus_uint32) data[i    ] << 24 |
-              (opus_uint32) data[i + 1] << 16 |
-              (opus_uint32) data[i + 2] <<  8 |
-              (opus_uint32) data[i + 3];
+        len = (oac_uint32) data[i    ] << 24 |
+              (oac_uint32) data[i + 1] << 16 |
+              (oac_uint32) data[i + 2] <<  8 |
+              (oac_uint32) data[i + 3];
         if (len > MAX_PACKET || len < 0 || i + SETUP_BYTE_COUNT + len > size) {
             break;
         }
@@ -103,13 +103,13 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         if (len == 0) {
             /* Lost packet */
             int frame_size;
-            opus_decoder_ctl(dec, OPUS_GET_LAST_PACKET_DURATION(&frame_size));
-            (void) opus_decode(dec, NULL, len, pcm, frame_size, fec);
+            oac_decoder_ctl(dec, OAC_GET_LAST_PACKET_DURATION(&frame_size));
+            (void) oac_decode(dec, NULL, len, pcm, frame_size, fec);
         } else {
             temp_data = (uint8_t*) malloc(len);
             memcpy(temp_data, &data[i + SETUP_BYTE_COUNT], len);
 
-            (void) opus_decode(dec, temp_data, len, pcm, MAX_FRAME_SAMP, fec);
+            (void) oac_decode(dec, temp_data, len, pcm, MAX_FRAME_SAMP, fec);
 
             free(temp_data);
         }
@@ -117,7 +117,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         i += SETUP_BYTE_COUNT + len;
     }
 
-    opus_decoder_destroy(dec);
+    oac_decoder_destroy(dec);
     free(pcm);
 
     return 0;
diff --git a/tests/opus_encode_regressions.c b/tests/oac_encode_regressions.c
similarity index 77%
rename from tests/opus_encode_regressions.c
rename to tests/oac_encode_regressions.c
index a9adacfcf..e33e2f2f3 100644
--- a/tests/opus_encode_regressions.c
+++ b/tests/oac_encode_regressions.c
@@ -35,36 +35,36 @@
 #include <stdint.h>
 #include <math.h>
 #include <string.h>
-#include "opus_multistream.h"
-#include "opus_projection.h"
-#include "opus.h"
-#include "test_opus_common.h"
+#include "oac_multistream.h"
+#include "oac_projection.h"
+#include "oac.h"
+#include "test_oac_common.h"
 
 
 static int celt_ec_internal_error(void)
 {
-    OpusMSEncoder *enc;
+    OacMSEncoder *enc;
     int err;
     unsigned char data[2460];
     int streams;
     int coupled_streams;
     unsigned char mapping[1];
 
-    enc = opus_multistream_surround_encoder_create(16000, 1, 1, &streams,
-        &coupled_streams, mapping, OPUS_APPLICATION_VOIP, &err);
-    opus_multistream_encoder_ctl(enc, OPUS_SET_SIGNAL(OPUS_SIGNAL_MUSIC));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_VBR(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_VBR_CONSTRAINT(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PREDICTION_DISABLED(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PHASE_INVERSION_DISABLED(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_DTX(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_COMPLEXITY(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_MAX_BANDWIDTH(OPUS_BANDWIDTH_NARROWBAND));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_BANDWIDTH(OPUS_AUTO));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_LSB_DEPTH(8));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_INBAND_FEC(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_BITRATE(OPUS_AUTO));
+    enc = oac_multistream_surround_encoder_create(16000, 1, 1, &streams,
+        &coupled_streams, mapping, OAC_APPLICATION_VOIP, &err);
+    oac_multistream_encoder_ctl(enc, OAC_SET_SIGNAL(OAC_SIGNAL_MUSIC));
+    oac_multistream_encoder_ctl(enc, OAC_SET_VBR(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PREDICTION_DISABLED(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PHASE_INVERSION_DISABLED(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_DTX(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_COMPLEXITY(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_MAX_BANDWIDTH(OAC_BANDWIDTH_NARROWBAND));
+    oac_multistream_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_AUTO));
+    oac_multistream_encoder_ctl(enc, OAC_SET_LSB_DEPTH(8));
+    oac_multistream_encoder_ctl(enc, OAC_SET_INBAND_FEC(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_BITRATE(OAC_AUTO));
     {
         static const short pcm[320] =
         {
@@ -105,22 +105,22 @@ static int celt_ec_internal_error(void)
                  7,  1792,  1799,  1799,  1799,  1799,  1799,  1799,  1799,
               1799,  1799,  1799,  1799, -9721
         };
-        err = opus_multistream_encode(enc, pcm, 320, data, 2460);
-        opus_test_assert(err > 0);
+        err = oac_multistream_encode(enc, pcm, 320, data, 2460);
+        oac_test_assert(err > 0);
     }
-    opus_multistream_encoder_ctl(enc, OPUS_SET_SIGNAL(OPUS_SIGNAL_MUSIC));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_VBR(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_VBR_CONSTRAINT(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PREDICTION_DISABLED(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PHASE_INVERSION_DISABLED(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_DTX(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_COMPLEXITY(10));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_MAX_BANDWIDTH(OPUS_BANDWIDTH_FULLBAND));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_BANDWIDTH(OPUS_BANDWIDTH_FULLBAND));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_LSB_DEPTH(18));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_INBAND_FEC(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(90));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_BITRATE(280130));
+    oac_multistream_encoder_ctl(enc, OAC_SET_SIGNAL(OAC_SIGNAL_MUSIC));
+    oac_multistream_encoder_ctl(enc, OAC_SET_VBR(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PREDICTION_DISABLED(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PHASE_INVERSION_DISABLED(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_DTX(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_COMPLEXITY(10));
+    oac_multistream_encoder_ctl(enc, OAC_SET_MAX_BANDWIDTH(OAC_BANDWIDTH_FULLBAND));
+    oac_multistream_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_BANDWIDTH_FULLBAND));
+    oac_multistream_encoder_ctl(enc, OAC_SET_LSB_DEPTH(18));
+    oac_multistream_encoder_ctl(enc, OAC_SET_INBAND_FEC(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(90));
+    oac_multistream_encoder_ctl(enc, OAC_SET_BITRATE(280130));
     {
         static const short pcm[160] =
         {
@@ -143,22 +143,22 @@ static int celt_ec_internal_error(void)
              -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
              -9510, -9510, -9510, -9510, -9510, -9510, -9510
         };
-        err = opus_multistream_encode(enc, pcm, 160, data, 2460);
-        opus_test_assert(err > 0);
+        err = oac_multistream_encode(enc, pcm, 160, data, 2460);
+        oac_test_assert(err > 0);
     }
-    opus_multistream_encoder_ctl(enc, OPUS_SET_SIGNAL(OPUS_SIGNAL_MUSIC));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_VBR(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_VBR_CONSTRAINT(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PREDICTION_DISABLED(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PHASE_INVERSION_DISABLED(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_DTX(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_COMPLEXITY(10));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_MAX_BANDWIDTH(OPUS_BANDWIDTH_FULLBAND));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_BANDWIDTH(OPUS_BANDWIDTH_FULLBAND));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_LSB_DEPTH(18));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_INBAND_FEC(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(90));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_BITRATE(280130));
+    oac_multistream_encoder_ctl(enc, OAC_SET_SIGNAL(OAC_SIGNAL_MUSIC));
+    oac_multistream_encoder_ctl(enc, OAC_SET_VBR(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PREDICTION_DISABLED(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PHASE_INVERSION_DISABLED(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_DTX(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_COMPLEXITY(10));
+    oac_multistream_encoder_ctl(enc, OAC_SET_MAX_BANDWIDTH(OAC_BANDWIDTH_FULLBAND));
+    oac_multistream_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_BANDWIDTH_FULLBAND));
+    oac_multistream_encoder_ctl(enc, OAC_SET_LSB_DEPTH(18));
+    oac_multistream_encoder_ctl(enc, OAC_SET_INBAND_FEC(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(90));
+    oac_multistream_encoder_ctl(enc, OAC_SET_BITRATE(280130));
     {
         static const short pcm[160] =
         {
@@ -181,22 +181,22 @@ static int celt_ec_internal_error(void)
              -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
              -9510, -9510, -9510, -9510, -9510, -9510, -9510
         };
-        err = opus_multistream_encode(enc, pcm, 160, data, 2460);
-        opus_test_assert(err > 0);
+        err = oac_multistream_encode(enc, pcm, 160, data, 2460);
+        oac_test_assert(err > 0);
     }
-    opus_multistream_encoder_ctl(enc, OPUS_SET_SIGNAL(OPUS_SIGNAL_MUSIC));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_VBR(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_VBR_CONSTRAINT(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PREDICTION_DISABLED(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PHASE_INVERSION_DISABLED(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_DTX(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_COMPLEXITY(10));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_MAX_BANDWIDTH(OPUS_BANDWIDTH_FULLBAND));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_BANDWIDTH(OPUS_BANDWIDTH_FULLBAND));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_LSB_DEPTH(18));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_INBAND_FEC(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(90));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_BITRATE(280130));
+    oac_multistream_encoder_ctl(enc, OAC_SET_SIGNAL(OAC_SIGNAL_MUSIC));
+    oac_multistream_encoder_ctl(enc, OAC_SET_VBR(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PREDICTION_DISABLED(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PHASE_INVERSION_DISABLED(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_DTX(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_COMPLEXITY(10));
+    oac_multistream_encoder_ctl(enc, OAC_SET_MAX_BANDWIDTH(OAC_BANDWIDTH_FULLBAND));
+    oac_multistream_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_BANDWIDTH_FULLBAND));
+    oac_multistream_encoder_ctl(enc, OAC_SET_LSB_DEPTH(18));
+    oac_multistream_encoder_ctl(enc, OAC_SET_INBAND_FEC(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(90));
+    oac_multistream_encoder_ctl(enc, OAC_SET_BITRATE(280130));
     {
         static const short pcm[160] =
         {
@@ -219,22 +219,22 @@ static int celt_ec_internal_error(void)
              -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
              -9510, -9510, -9510, -9510, -9510, -9510, -9510
         };
-        err = opus_multistream_encode(enc, pcm, 160, data, 2460);
-        opus_test_assert(err > 0);
+        err = oac_multistream_encode(enc, pcm, 160, data, 2460);
+        oac_test_assert(err > 0);
     }
-    opus_multistream_encoder_ctl(enc, OPUS_SET_SIGNAL(OPUS_SIGNAL_MUSIC));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_VBR(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_VBR_CONSTRAINT(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PREDICTION_DISABLED(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PHASE_INVERSION_DISABLED(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_DTX(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_COMPLEXITY(10));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_MAX_BANDWIDTH(OPUS_BANDWIDTH_FULLBAND));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_BANDWIDTH(OPUS_BANDWIDTH_FULLBAND));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_LSB_DEPTH(18));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_INBAND_FEC(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(90));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_BITRATE(280130));
+    oac_multistream_encoder_ctl(enc, OAC_SET_SIGNAL(OAC_SIGNAL_MUSIC));
+    oac_multistream_encoder_ctl(enc, OAC_SET_VBR(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PREDICTION_DISABLED(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PHASE_INVERSION_DISABLED(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_DTX(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_COMPLEXITY(10));
+    oac_multistream_encoder_ctl(enc, OAC_SET_MAX_BANDWIDTH(OAC_BANDWIDTH_FULLBAND));
+    oac_multistream_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_BANDWIDTH_FULLBAND));
+    oac_multistream_encoder_ctl(enc, OAC_SET_LSB_DEPTH(18));
+    oac_multistream_encoder_ctl(enc, OAC_SET_INBAND_FEC(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(90));
+    oac_multistream_encoder_ctl(enc, OAC_SET_BITRATE(280130));
     {
         static const short pcm[160] =
         {
@@ -255,22 +255,22 @@ static int celt_ec_internal_error(void)
                  0,     0,     0,     0,   148,     0,     0,     0,     0,
               5632
         };
-        err = opus_multistream_encode(enc, pcm, 160, data, 2460);
-        opus_test_assert(err > 0);
+        err = oac_multistream_encode(enc, pcm, 160, data, 2460);
+        oac_test_assert(err > 0);
     }
-    opus_multistream_encoder_ctl(enc, OPUS_SET_SIGNAL(OPUS_SIGNAL_VOICE));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_VBR(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_VBR_CONSTRAINT(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PREDICTION_DISABLED(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PHASE_INVERSION_DISABLED(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_DTX(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_COMPLEXITY(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_MAX_BANDWIDTH(OPUS_BANDWIDTH_NARROWBAND));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_BANDWIDTH(OPUS_AUTO));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_LSB_DEPTH(12));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_INBAND_FEC(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(41));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_BITRATE(21425));
+    oac_multistream_encoder_ctl(enc, OAC_SET_SIGNAL(OAC_SIGNAL_VOICE));
+    oac_multistream_encoder_ctl(enc, OAC_SET_VBR(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PREDICTION_DISABLED(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PHASE_INVERSION_DISABLED(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_DTX(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_COMPLEXITY(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_MAX_BANDWIDTH(OAC_BANDWIDTH_NARROWBAND));
+    oac_multistream_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_AUTO));
+    oac_multistream_encoder_ctl(enc, OAC_SET_LSB_DEPTH(12));
+    oac_multistream_encoder_ctl(enc, OAC_SET_INBAND_FEC(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(41));
+    oac_multistream_encoder_ctl(enc, OAC_SET_BITRATE(21425));
     {
         static const short pcm[40] =
         {
@@ -280,17 +280,17 @@ static int celt_ec_internal_error(void)
              -1073,  3641, -1304,     0,    -1,   343,    26,     0,     0,
                  0,     0,  -256,   226
         };
-        err = opus_multistream_encode(enc, pcm, 40, data, 2460);
-        opus_test_assert(err > 0);
+        err = oac_multistream_encode(enc, pcm, 40, data, 2460);
+        oac_test_assert(err > 0);
         /* returns -3 */
     }
-    opus_multistream_encoder_destroy(enc);
+    oac_multistream_encoder_destroy(enc);
     return 0;
 }
 
 static int mscbr_encode_fail10(void)
 {
-    OpusMSEncoder *enc;
+    OacMSEncoder *enc;
     int err;
     unsigned char data[627300];
     static const unsigned char mapping[255] =
@@ -312,38 +312,38 @@ static int mscbr_encode_fail10(void)
         238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254
     };
 
-    enc = opus_multistream_encoder_create(8000, 255, 254, 1, mapping,
-        OPUS_APPLICATION_RESTRICTED_LOWDELAY, &err);
-    opus_multistream_encoder_ctl(enc, OPUS_SET_SIGNAL(OPUS_SIGNAL_VOICE));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_VBR(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_VBR_CONSTRAINT(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PREDICTION_DISABLED(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_FORCE_CHANNELS(2));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PHASE_INVERSION_DISABLED(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_DTX(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_COMPLEXITY(2));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_MAX_BANDWIDTH(OPUS_BANDWIDTH_NARROWBAND));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_BANDWIDTH(OPUS_AUTO));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_LSB_DEPTH(14));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_INBAND_FEC(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(57));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_BITRATE(3642675));
+    enc = oac_multistream_encoder_create(8000, 255, 254, 1, mapping,
+        OAC_APPLICATION_RESTRICTED_LOWDELAY, &err);
+    oac_multistream_encoder_ctl(enc, OAC_SET_SIGNAL(OAC_SIGNAL_VOICE));
+    oac_multistream_encoder_ctl(enc, OAC_SET_VBR(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PREDICTION_DISABLED(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_FORCE_CHANNELS(2));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PHASE_INVERSION_DISABLED(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_DTX(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_COMPLEXITY(2));
+    oac_multistream_encoder_ctl(enc, OAC_SET_MAX_BANDWIDTH(OAC_BANDWIDTH_NARROWBAND));
+    oac_multistream_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_AUTO));
+    oac_multistream_encoder_ctl(enc, OAC_SET_LSB_DEPTH(14));
+    oac_multistream_encoder_ctl(enc, OAC_SET_INBAND_FEC(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(57));
+    oac_multistream_encoder_ctl(enc, OAC_SET_BITRATE(3642675));
     {
         static const short pcm[20*255] =
         {
                  0
         };
-        err = opus_multistream_encode(enc, pcm, 20, data, 627300);
-        opus_test_assert(err > 0);
+        err = oac_multistream_encode(enc, pcm, 20, data, 627300);
+        oac_test_assert(err > 0);
         /* returns -1 */
     }
-    opus_multistream_encoder_destroy(enc);
+    oac_multistream_encoder_destroy(enc);
     return 0;
 }
 
 static int mscbr_encode_fail(void)
 {
-    OpusMSEncoder *enc;
+    OacMSEncoder *enc;
     int err;
     unsigned char data[472320];
     static const unsigned char mapping[192] =
@@ -362,59 +362,59 @@ static int mscbr_encode_fail(void)
         187,188,189,190,191
     };
 
-    enc = opus_multistream_encoder_create(8000, 192, 189, 3, mapping,
-        OPUS_APPLICATION_RESTRICTED_LOWDELAY, &err);
-    opus_multistream_encoder_ctl(enc, OPUS_SET_SIGNAL(OPUS_SIGNAL_MUSIC));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_VBR(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_VBR_CONSTRAINT(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PREDICTION_DISABLED(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_FORCE_CHANNELS(OPUS_AUTO));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PHASE_INVERSION_DISABLED(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_DTX(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_COMPLEXITY(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_MAX_BANDWIDTH(OPUS_BANDWIDTH_MEDIUMBAND));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_BANDWIDTH(OPUS_AUTO));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_LSB_DEPTH(8));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_INBAND_FEC(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_BITRATE(15360));
+    enc = oac_multistream_encoder_create(8000, 192, 189, 3, mapping,
+        OAC_APPLICATION_RESTRICTED_LOWDELAY, &err);
+    oac_multistream_encoder_ctl(enc, OAC_SET_SIGNAL(OAC_SIGNAL_MUSIC));
+    oac_multistream_encoder_ctl(enc, OAC_SET_VBR(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PREDICTION_DISABLED(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_FORCE_CHANNELS(OAC_AUTO));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PHASE_INVERSION_DISABLED(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_DTX(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_COMPLEXITY(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_MAX_BANDWIDTH(OAC_BANDWIDTH_MEDIUMBAND));
+    oac_multistream_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_AUTO));
+    oac_multistream_encoder_ctl(enc, OAC_SET_LSB_DEPTH(8));
+    oac_multistream_encoder_ctl(enc, OAC_SET_INBAND_FEC(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_BITRATE(15360));
     {
         static const short pcm[20*192] =
         {
                  0
         };
-        err = opus_multistream_encode(enc, pcm, 20, data, 472320);
-        opus_test_assert(err > 0);
+        err = oac_multistream_encode(enc, pcm, 20, data, 472320);
+        oac_test_assert(err > 0);
         /* returns -1 */
     }
-    opus_multistream_encoder_destroy(enc);
+    oac_multistream_encoder_destroy(enc);
     return 0;
 }
 
 static int surround_analysis_uninit(void)
 {
-    OpusMSEncoder *enc;
+    OacMSEncoder *enc;
     int err;
     unsigned char data[7380];
     int streams;
     int coupled_streams;
     unsigned char mapping[3];
 
-    enc = opus_multistream_surround_encoder_create(24000, 3, 1, &streams,
-        &coupled_streams, mapping, OPUS_APPLICATION_AUDIO, &err);
-    opus_multistream_encoder_ctl(enc, OPUS_SET_SIGNAL(OPUS_SIGNAL_VOICE));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_VBR(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_VBR_CONSTRAINT(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PREDICTION_DISABLED(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_FORCE_CHANNELS(OPUS_AUTO));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PHASE_INVERSION_DISABLED(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_DTX(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_COMPLEXITY(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_MAX_BANDWIDTH(OPUS_BANDWIDTH_NARROWBAND));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_BANDWIDTH(OPUS_BANDWIDTH_NARROWBAND));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_LSB_DEPTH(8));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_INBAND_FEC(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_BITRATE(84315));
+    enc = oac_multistream_surround_encoder_create(24000, 3, 1, &streams,
+        &coupled_streams, mapping, OAC_APPLICATION_AUDIO, &err);
+    oac_multistream_encoder_ctl(enc, OAC_SET_SIGNAL(OAC_SIGNAL_VOICE));
+    oac_multistream_encoder_ctl(enc, OAC_SET_VBR(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PREDICTION_DISABLED(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_FORCE_CHANNELS(OAC_AUTO));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PHASE_INVERSION_DISABLED(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_DTX(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_COMPLEXITY(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_MAX_BANDWIDTH(OAC_BANDWIDTH_NARROWBAND));
+    oac_multistream_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_BANDWIDTH_NARROWBAND));
+    oac_multistream_encoder_ctl(enc, OAC_SET_LSB_DEPTH(8));
+    oac_multistream_encoder_ctl(enc, OAC_SET_INBAND_FEC(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_BITRATE(84315));
     {
         static const short pcm[960*3] =
         {
@@ -739,23 +739,23 @@ static int surround_analysis_uninit(void)
               3158,-16161,  2576, 18398,-12535, -6645,-20735,-32763,-13824,
             -20992, 25859,  5372, 12040, 13307, -4355,-30213,    -9, -6019
         };
-        err = opus_multistream_encode(enc, pcm, 960, data, 7380);
-        opus_test_assert(err > 0);
+        err = oac_multistream_encode(enc, pcm, 960, data, 7380);
+        oac_test_assert(err > 0);
     }
-    opus_multistream_encoder_ctl(enc, OPUS_SET_SIGNAL(OPUS_SIGNAL_MUSIC));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_VBR(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_VBR_CONSTRAINT(0));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PREDICTION_DISABLED(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_FORCE_CHANNELS(OPUS_AUTO));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PHASE_INVERSION_DISABLED(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_DTX(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_COMPLEXITY(6));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_MAX_BANDWIDTH(OPUS_BANDWIDTH_NARROWBAND));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_BANDWIDTH(OPUS_AUTO));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_LSB_DEPTH(9));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_INBAND_FEC(1));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(5));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_BITRATE(775410));
+    oac_multistream_encoder_ctl(enc, OAC_SET_SIGNAL(OAC_SIGNAL_MUSIC));
+    oac_multistream_encoder_ctl(enc, OAC_SET_VBR(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(0));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PREDICTION_DISABLED(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_FORCE_CHANNELS(OAC_AUTO));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PHASE_INVERSION_DISABLED(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_DTX(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_COMPLEXITY(6));
+    oac_multistream_encoder_ctl(enc, OAC_SET_MAX_BANDWIDTH(OAC_BANDWIDTH_NARROWBAND));
+    oac_multistream_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_AUTO));
+    oac_multistream_encoder_ctl(enc, OAC_SET_LSB_DEPTH(9));
+    oac_multistream_encoder_ctl(enc, OAC_SET_INBAND_FEC(1));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(5));
+    oac_multistream_encoder_ctl(enc, OAC_SET_BITRATE(775410));
     {
         static const short pcm[1440*3] =
         {
@@ -883,17 +883,17 @@ static int surround_analysis_uninit(void)
              20671,-11530, 27328,  8179,  5059,-31503,-24379,-19472, 17863,
             -29202, 22986,   -23,  8909,  8422, 10450
         };
-        err = opus_multistream_encode(enc, pcm, 1440, data, 7380);
-        /* reads uninitialized data at src/opus_multistream_encoder.c:293 */
-        opus_test_assert(err > 0);
+        err = oac_multistream_encode(enc, pcm, 1440, data, 7380);
+        /* reads uninitialized data at src/oac_multistream_encoder.c:293 */
+        oac_test_assert(err > 0);
     }
-    opus_multistream_encoder_destroy(enc);
+    oac_multistream_encoder_destroy(enc);
     return 0;
 }
 
 static int ec_enc_shrink_assert(void)
 {
-    OpusEncoder *enc;
+    OacEncoder *enc;
     int err;
     int data_len;
     unsigned char data[2000];
@@ -930,65 +930,65 @@ static int ec_enc_shrink_assert(void)
     };
     static const short pcm3[2880] = { 0 };
 
-    enc = opus_encoder_create(48000, 1, OPUS_APPLICATION_AUDIO, &err);
-    opus_encoder_ctl(enc, OPUS_SET_COMPLEXITY(10));
-    opus_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(6));
-    opus_encoder_ctl(enc, OPUS_SET_BITRATE(6000));
-    data_len = opus_encode(enc, pcm1, 960, data, 2000);
-    opus_test_assert(data_len > 0);
+    enc = oac_encoder_create(48000, 1, OAC_APPLICATION_AUDIO, &err);
+    oac_encoder_ctl(enc, OAC_SET_COMPLEXITY(10));
+    oac_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(6));
+    oac_encoder_ctl(enc, OAC_SET_BITRATE(6000));
+    data_len = oac_encode(enc, pcm1, 960, data, 2000);
+    oac_test_assert(data_len > 0);
 
-    opus_encoder_ctl(enc, OPUS_SET_SIGNAL(OPUS_SIGNAL_VOICE));
-    opus_encoder_ctl(enc, OPUS_SET_PREDICTION_DISABLED(1));
-    opus_encoder_ctl(enc, OPUS_SET_BANDWIDTH(OPUS_BANDWIDTH_SUPERWIDEBAND));
-    opus_encoder_ctl(enc, OPUS_SET_INBAND_FEC(1));
-    opus_encoder_ctl(enc, OPUS_SET_BITRATE(15600));
-    data_len = opus_encode(enc, pcm2, 2880, data, 122);
-    opus_test_assert(data_len > 0);
+    oac_encoder_ctl(enc, OAC_SET_SIGNAL(OAC_SIGNAL_VOICE));
+    oac_encoder_ctl(enc, OAC_SET_PREDICTION_DISABLED(1));
+    oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_BANDWIDTH_SUPERWIDEBAND));
+    oac_encoder_ctl(enc, OAC_SET_INBAND_FEC(1));
+    oac_encoder_ctl(enc, OAC_SET_BITRATE(15600));
+    data_len = oac_encode(enc, pcm2, 2880, data, 122);
+    oac_test_assert(data_len > 0);
 
-    opus_encoder_ctl(enc, OPUS_SET_SIGNAL(OPUS_SIGNAL_MUSIC));
-    opus_encoder_ctl(enc, OPUS_SET_BITRATE(27000));
-    data_len = opus_encode(enc, pcm3, 2880, data, 122); /* assertion failure */
-    opus_test_assert(data_len > 0);
+    oac_encoder_ctl(enc, OAC_SET_SIGNAL(OAC_SIGNAL_MUSIC));
+    oac_encoder_ctl(enc, OAC_SET_BITRATE(27000));
+    data_len = oac_encode(enc, pcm3, 2880, data, 122); /* assertion failure */
+    oac_test_assert(data_len > 0);
 
-    opus_encoder_destroy(enc);
+    oac_encoder_destroy(enc);
     return 0;
 }
 
 static int ec_enc_shrink_assert2(void)
 {
-    OpusEncoder *enc;
+    OacEncoder *enc;
     int err;
     int data_len;
     unsigned char data[2000];
 
-    enc = opus_encoder_create(48000, 1, OPUS_APPLICATION_AUDIO, &err);
-    opus_encoder_ctl(enc, OPUS_SET_COMPLEXITY(6));
-    opus_encoder_ctl(enc, OPUS_SET_SIGNAL(OPUS_SIGNAL_VOICE));
-    opus_encoder_ctl(enc, OPUS_SET_BANDWIDTH(OPUS_BANDWIDTH_FULLBAND));
-    opus_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(26));
-    opus_encoder_ctl(enc, OPUS_SET_BITRATE(27000));
+    enc = oac_encoder_create(48000, 1, OAC_APPLICATION_AUDIO, &err);
+    oac_encoder_ctl(enc, OAC_SET_COMPLEXITY(6));
+    oac_encoder_ctl(enc, OAC_SET_SIGNAL(OAC_SIGNAL_VOICE));
+    oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_BANDWIDTH_FULLBAND));
+    oac_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(26));
+    oac_encoder_ctl(enc, OAC_SET_BITRATE(27000));
     {
         static const short pcm[960] = { 0 };
-        data_len = opus_encode(enc, pcm, 960, data, 2000);
-        opus_test_assert(data_len > 0);
+        data_len = oac_encode(enc, pcm, 960, data, 2000);
+        oac_test_assert(data_len > 0);
     }
-    opus_encoder_ctl(enc, OPUS_SET_SIGNAL(OPUS_SIGNAL_MUSIC));
+    oac_encoder_ctl(enc, OAC_SET_SIGNAL(OAC_SIGNAL_MUSIC));
     {
         static const short pcm[480] =
         {
             32767, 32767, 0, 0, 32767, 32767, 0, 0, 32767, 32767,
             -32768, -32768, 0, 0, -32768, -32768, 0, 0, -32768, -32768
         };
-        data_len = opus_encode(enc, pcm, 480, data, 19);
-        opus_test_assert(data_len > 0);
+        data_len = oac_encode(enc, pcm, 480, data, 19);
+        oac_test_assert(data_len > 0);
     }
-    opus_encoder_destroy(enc);
+    oac_encoder_destroy(enc);
     return 0;
 }
 
 static int silk_gain_assert(void)
 {
-    OpusEncoder *enc;
+    OacEncoder *enc;
     int err;
     int data_len;
     unsigned char data[1000];
@@ -1004,44 +1004,44 @@ static int silk_gain_assert(void)
         0, 0, 0, 0, 32767
     };
 
-    enc = opus_encoder_create(8000, 1, OPUS_APPLICATION_AUDIO, &err);
-    opus_encoder_ctl(enc, OPUS_SET_COMPLEXITY(3));
-    opus_encoder_ctl(enc, OPUS_SET_MAX_BANDWIDTH(OPUS_BANDWIDTH_NARROWBAND));
-    opus_encoder_ctl(enc, OPUS_SET_BITRATE(6000));
-    data_len = opus_encode(enc, pcm1, 160, data, 1000);
-    opus_test_assert(data_len > 0);
+    enc = oac_encoder_create(8000, 1, OAC_APPLICATION_AUDIO, &err);
+    oac_encoder_ctl(enc, OAC_SET_COMPLEXITY(3));
+    oac_encoder_ctl(enc, OAC_SET_MAX_BANDWIDTH(OAC_BANDWIDTH_NARROWBAND));
+    oac_encoder_ctl(enc, OAC_SET_BITRATE(6000));
+    data_len = oac_encode(enc, pcm1, 160, data, 1000);
+    oac_test_assert(data_len > 0);
 
-    opus_encoder_ctl(enc, OPUS_SET_VBR(0));
-    opus_encoder_ctl(enc, OPUS_SET_COMPLEXITY(0));
-    opus_encoder_ctl(enc, OPUS_SET_MAX_BANDWIDTH(OPUS_BANDWIDTH_MEDIUMBAND));
-    opus_encoder_ctl(enc, OPUS_SET_BITRATE(2867));
-    data_len = opus_encode(enc, pcm2, 960, data, 1000);
-    opus_test_assert(data_len > 0);
+    oac_encoder_ctl(enc, OAC_SET_VBR(0));
+    oac_encoder_ctl(enc, OAC_SET_COMPLEXITY(0));
+    oac_encoder_ctl(enc, OAC_SET_MAX_BANDWIDTH(OAC_BANDWIDTH_MEDIUMBAND));
+    oac_encoder_ctl(enc, OAC_SET_BITRATE(2867));
+    data_len = oac_encode(enc, pcm2, 960, data, 1000);
+    oac_test_assert(data_len > 0);
 
-    opus_encoder_destroy(enc);
+    oac_encoder_destroy(enc);
     return 0;
 }
 
 #ifndef DISABLE_FLOAT_API
 int analysis_overflow(void)
 {
-    OpusEncoder *enc;
+    OacEncoder *enc;
     int err;
     unsigned char data[200];
     int data_len;
     static const float pcm[320*2] = { 1e9, 1e9 };
 
-    enc = opus_encoder_create(16000, 2, OPUS_APPLICATION_AUDIO, &err);
-    opus_encoder_ctl(enc, OPUS_SET_COMPLEXITY(10));
-    data_len = opus_encode_float(enc, pcm, 320, data, 200);
-    opus_test_assert(data_len > 0 && data_len <= 200);
-    opus_encoder_destroy(enc);
+    enc = oac_encoder_create(16000, 2, OAC_APPLICATION_AUDIO, &err);
+    oac_encoder_ctl(enc, OAC_SET_COMPLEXITY(10));
+    data_len = oac_encode_float(enc, pcm, 320, data, 200);
+    oac_test_assert(data_len > 0 && data_len <= 200);
+    oac_encoder_destroy(enc);
     return 0;
 }
 
 int projection_overflow2(void)
 {
-    OpusProjectionEncoder *enc;
+    OacProjectionEncoder *enc;
     int err;
     unsigned char data[480];
     int data_len;
@@ -1078,17 +1078,17 @@ int projection_overflow2(void)
         2e34, 2e34, 2e34, 2e34, 2e34, 2e34, 2e34, 2e34,    0, -8e9
     };
 
-    enc = opus_projection_ambisonics_encoder_create(12000, 9, 3, &streams,
-        &coupled_streams, OPUS_APPLICATION_RESTRICTED_LOWDELAY, &err);
-    data_len = opus_projection_encode_float(enc, pcm, 30, data, 480);
-    opus_test_assert(data_len > 0 && data_len <= 480);
-    opus_projection_encoder_destroy(enc);
+    enc = oac_projection_ambisonics_encoder_create(12000, 9, 3, &streams,
+        &coupled_streams, OAC_APPLICATION_RESTRICTED_LOWDELAY, &err);
+    data_len = oac_projection_encode_float(enc, pcm, 30, data, 480);
+    oac_test_assert(data_len > 0 && data_len <= 480);
+    oac_projection_encoder_destroy(enc);
     return 0;
 }
 
 int projection_overflow3(void)
 {
-   OpusProjectionEncoder *enc;
+   OacProjectionEncoder *enc;
    int err;
    int i;
    int data_len;
@@ -1097,27 +1097,27 @@ int projection_overflow3(void)
    float pcm[60*4];
    unsigned char data[500];
 
-   enc = opus_projection_ambisonics_encoder_create(24000, 4, 3, &streams,
-       &coupled_streams, OPUS_APPLICATION_AUDIO, &err);
+   enc = oac_projection_ambisonics_encoder_create(24000, 4, 3, &streams,
+       &coupled_streams, OAC_APPLICATION_AUDIO, &err);
 
    for (i = 0; i < 60*4; ++i)
        pcm[i] = -1e38;
-   data_len = opus_projection_encode_float(enc, pcm, 60, data, 500);
-   opus_test_assert(data_len >= 5 && data_len <= 500);
+   data_len = oac_projection_encode_float(enc, pcm, 60, data, 500);
+   oac_test_assert(data_len >= 5 && data_len <= 500);
 
    for (i = 0; i < 60*4; ++i)
        pcm[i] = 1e38;
-   data_len = opus_projection_encode_float(enc, pcm, 60, data, 500);
-   opus_test_assert(data_len >= 5 && data_len <= 500);
+   data_len = oac_projection_encode_float(enc, pcm, 60, data, 500);
+   oac_test_assert(data_len >= 5 && data_len <= 500);
 
-   opus_projection_encoder_destroy(enc);
+   oac_projection_encoder_destroy(enc);
    return 0;
 }
 #endif
 
 int projection_overflow(void)
 {
-    OpusProjectionEncoder *enc;
+    OacProjectionEncoder *enc;
     int err;
     unsigned char data[10000];
     int data_len;
@@ -1147,15 +1147,15 @@ int projection_overflow(void)
      20303, 20303, 20559, 20303, -5041,   176, -2896, -5873,    21
     };
 
-    enc = opus_projection_ambisonics_encoder_create(96000, 36, 3, &streams,
-        &coupled_streams, OPUS_APPLICATION_AUDIO, &err);
+    enc = oac_projection_ambisonics_encoder_create(96000, 36, 3, &streams,
+        &coupled_streams, OAC_APPLICATION_AUDIO, &err);
 #ifndef ENABLE_QEXT
-    opus_test_assert(err == OPUS_BAD_ARG);
+    oac_test_assert(err == OAC_BAD_ARG);
     return 0;
 #endif
-    data_len = opus_projection_encode(enc, pcm, 1920, data, 10000);
-    opus_test_assert(data_len > 0 && data_len <= 10000);
-    opus_projection_encoder_destroy(enc);
+    data_len = oac_projection_encode(enc, pcm, 1920, data, 10000);
+    oac_test_assert(data_len > 0 && data_len <= 10000);
+    oac_projection_encoder_destroy(enc);
     return 0;
 }
 
@@ -1163,7 +1163,7 @@ int projection_overflow(void)
 #ifdef ENABLE_QEXT
 int projection_overflow4(void)
 {
-    OpusProjectionEncoder *enc;
+    OacProjectionEncoder *enc;
     int err;
     unsigned char data[1000];
     int data_len;
@@ -1189,38 +1189,38 @@ int projection_overflow4(void)
         -32640,-32640,-32640,-32640,-32640,-32640,-32513,-32640,-18048
     };
 
-    enc = opus_projection_ambisonics_encoder_create(96000, 36, 3, &streams,
-        &coupled_streams, OPUS_APPLICATION_AUDIO, &err);
-    opus_projection_encoder_ctl(enc, OPUS_SET_BITRATE(256000));
-    data_len = opus_projection_encode(enc, pcm, 480, data, 1000);
-    opus_test_assert(data_len > 0 && data_len <= 1000);
+    enc = oac_projection_ambisonics_encoder_create(96000, 36, 3, &streams,
+        &coupled_streams, OAC_APPLICATION_AUDIO, &err);
+    oac_projection_encoder_ctl(enc, OAC_SET_BITRATE(256000));
+    data_len = oac_projection_encode(enc, pcm, 480, data, 1000);
+    oac_test_assert(data_len > 0 && data_len <= 1000);
 
-    opus_projection_encoder_destroy(enc);
+    oac_projection_encoder_destroy(enc);
     return 0;
 }
 
 int qext_repacketize_fail(void)
 {
-    OpusEncoder *enc;
+    OacEncoder *enc;
     int err;
     unsigned char data[9000];
     int data_len;
     static const short pcm[960] =
         { -20454, -7680,-12281,  -250, -1809,-22758,-22784,-20480,     3 };
 
-    enc = opus_encoder_create(16000, 1, OPUS_APPLICATION_VOIP, &err);
-    opus_encoder_ctl(enc, OPUS_SET_VBR(0));
-    opus_encoder_ctl(enc, OPUS_SET_BITRATE(OPUS_BITRATE_MAX));
-    data_len = opus_encode(enc, pcm, 960, data, 9000);
-    /* returns OPUS_INTERNAL_ERROR (-3) */
-    opus_test_assert(data_len > 0 && data_len <= 9000);
-    opus_encoder_destroy(enc);
+    enc = oac_encoder_create(16000, 1, OAC_APPLICATION_VOIP, &err);
+    oac_encoder_ctl(enc, OAC_SET_VBR(0));
+    oac_encoder_ctl(enc, OAC_SET_BITRATE(OAC_BITRATE_MAX));
+    data_len = oac_encode(enc, pcm, 960, data, 9000);
+    /* returns OAC_INTERNAL_ERROR (-3) */
+    oac_test_assert(data_len > 0 && data_len <= 9000);
+    oac_encoder_destroy(enc);
     return 0;
 }
 
 int qext_stereo_overflow(void)
 {
-    OpusEncoder *enc;
+    OacEncoder *enc;
     int err;
     unsigned char data[2000];
     int data_len;
@@ -1229,10 +1229,10 @@ int qext_stereo_overflow(void)
 
     for (i = 0; i < 11520*2; ++i)
         pcm[i] = 32767;
-    enc = opus_encoder_create(96000, 2, OPUS_APPLICATION_RESTRICTED_LOWDELAY, &err);
-    data_len = opus_encode(enc, pcm, 11520, data, 2000);
-    opus_test_assert(data_len > 0 && data_len <= 2000);
-    opus_encoder_destroy(enc);
+    enc = oac_encoder_create(96000, 2, OAC_APPLICATION_RESTRICTED_LOWDELAY, &err);
+    data_len = oac_encode(enc, pcm, 11520, data, 2000);
+    oac_test_assert(data_len > 0 && data_len <= 2000);
+    oac_encoder_destroy(enc);
     return 0;
 }
 
@@ -1240,8 +1240,8 @@ int qext_stereo_overflow(void)
 #ifdef ENABLE_DRED
 int qext_dred_combination(void)
 {
-    OpusMSEncoder *enc;
-    OpusEncoder *stream_enc;
+    OacMSEncoder *enc;
+    OacEncoder *stream_enc;
     int err;
     unsigned char data[2560];
     int data_len;
@@ -1255,17 +1255,17 @@ int qext_dred_combination(void)
          -2057, -2057, -2057, -2057, -2057, -2057, -2057
     };
 
-    enc = opus_multistream_surround_encoder_create(16000, 5, 1, &streams,
-        &coupled_streams, mapping, OPUS_APPLICATION_VOIP, &err);
-    opus_multistream_encoder_ctl(enc, OPUS_SET_COMPLEXITY(3));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(12));
-    opus_multistream_encoder_ctl(enc, OPUS_MULTISTREAM_GET_ENCODER_STATE(0, &stream_enc));
-    opus_encoder_ctl(stream_enc, OPUS_SET_DRED_DURATION(103));
-    opus_multistream_encoder_ctl(enc, OPUS_SET_BITRATE(755850));
-    data_len = opus_multistream_encode(enc, pcm, 320, data, 2560);
-    /* returns OPUS_BAD_ARG (-1) */
-    opus_test_assert(data_len > 0 && data_len <= 2560);
-    opus_multistream_encoder_destroy(enc);
+    enc = oac_multistream_surround_encoder_create(16000, 5, 1, &streams,
+        &coupled_streams, mapping, OAC_APPLICATION_VOIP, &err);
+    oac_multistream_encoder_ctl(enc, OAC_SET_COMPLEXITY(3));
+    oac_multistream_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(12));
+    oac_multistream_encoder_ctl(enc, OAC_MULTISTREAM_GET_ENCODER_STATE(0, &stream_enc));
+    oac_encoder_ctl(stream_enc, OAC_SET_DRED_DURATION(103));
+    oac_multistream_encoder_ctl(enc, OAC_SET_BITRATE(755850));
+    data_len = oac_multistream_encode(enc, pcm, 320, data, 2560);
+    /* returns OAC_BAD_ARG (-1) */
+    oac_test_assert(data_len > 0 && data_len <= 2560);
+    oac_multistream_encoder_destroy(enc);
     return 0;
 }
 #endif
diff --git a/tests/random_config.sh b/tests/random_config.sh
index 69769dd7e..b81e59328 100755
--- a/tests/random_config.sh
+++ b/tests/random_config.sh
@@ -54,7 +54,7 @@ lib=`echo -e "\n--disable-static\n--disable-shared" | shuf -n1`
 
 arithmetic=`echo -e "\n--enable-deep-plc\n--enable-dred\n--enable-osce\n--enable-dred --enable-osce\n--enable-fixed-point\n--enable-fixed-point --enable-fixed-point-debug\n--enable-fixed-point --disable-float-api\n--enable-fixed-point --enable-fixed-point-debug --disable-float-api" | shuf -n1`
 
-custom=`echo -e "\n--enable-custom-modes\n--enable-opus-custom-api" | shuf -n1`
+custom=`echo -e "\n--enable-custom-modes\n--enable-oac-custom-api" | shuf -n1`
 res=`echo -e "--disable-fixed-res24\n--enable-qext\n" | shuf -n1`
 
 asm=`echo -e "\n--disable-asm\n--disable-rtcd\n--disable-intrinsics" | shuf -n1`
diff --git a/tests/run_opushd_vectors.sh b/tests/run_opushd_vectors.sh
deleted file mode 100755
index 0ba3c6d31..000000000
--- a/tests/run_opushd_vectors.sh
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/bin/sh
-
-# Copyright (c) 2011-2012 Jean-Marc Valin
-#
-#  This file is extracted from RFC6716. Please see that RFC for additional
-#  information.
-#
-#  Redistribution and use in source and binary forms, with or without
-#  modification, are permitted provided that the following conditions
-#  are met:
-#
-#  - Redistributions of source code must retain the above copyright
-#  notice, this list of conditions and the following disclaimer.
-#
-#  - Redistributions in binary form must reproduce the above copyright
-#  notice, this list of conditions and the following disclaimer in the
-#  documentation and/or other materials provided with the distribution.
-#
-#  - Neither the name of Internet Society, IETF or IETF Trust, nor the
-#  names of specific contributors, may be used to endorse or promote
-#  products derived from this software without specific prior written
-#  permission.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-#  OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-#  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-#  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-#  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-#  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-#  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-rm -f logs_mono.txt logs_mono2.txt
-rm -f logs_stereo.txt logs_stereo2.txt
-
-if [ "$#" -ne "2" ]; then
-    echo "usage: run_vectors.sh <exec path> <vector path>"
-    exit 1
-fi
-
-CMD_PATH=$1
-VECTOR_PATH=$2
-RATE=96000
-
-: ${OPUS_DEMO:=$CMD_PATH/opus_demo}
-: ${QEXT_COMPARE:=$CMD_PATH/qext_compare}
-
-if [ -d "$VECTOR_PATH" ]; then
-    echo "Test vectors found in $VECTOR_PATH"
-else
-    echo "No test vectors found"
-    #Don't make the test fail here because the test vectors
-    #will be distributed separately
-    exit 0
-fi
-
-if [ ! -x "$QEXT_COMPARE" ]; then
-    echo "ERROR: Compare program not found: $QEXT_COMPARE"
-    exit 1
-fi
-
-if [ -x "$OPUS_DEMO" ]; then
-    echo "Decoding with $OPUS_DEMO"
-else
-    echo "ERROR: Decoder not found: $OPUS_DEMO"
-    exit 1
-fi
-
-echo "============================"
-echo "Testing original testvectors"
-echo "============================"
-echo
-
-
-for file in 01 02 03 04 05 06 07 08 09 10 11 12
-do
-    if [ -e "$VECTOR_PATH/testvector$file.bit" ]; then
-        echo "Testing testvector$file"
-    else
-        echo "Bitstream file not found: testvector$file"
-    fi
-    if "$OPUS_DEMO" -d "$RATE" 2 -ignore_extensions -f32 "$VECTOR_PATH/testvector$file.bit" tmp.out >> logs_stereo.txt 2>&1; then
-        echo "successfully decoded"
-    else
-        echo "ERROR: decoding failed"
-        exit 1
-    fi
-    "$QEXT_COMPARE" -s -r "$RATE" -f32 -thresholds 0.05 .1 .1 "$VECTOR_PATH/testvector${file}_96k.f32" tmp.out >> logs_stereo.txt 2>&1
-    if [ "$?" -eq "0" ]; then
-        echo "output matches reference"
-    else
-        echo "ERROR: output does not match reference"
-        exit 1
-    fi
-    echo
-done
-
-
-echo "==========================="
-echo "Testing Opus HD testvectors"
-echo "==========================="
-echo
-for file in 01 02 03 04 05 06
-do
-    if [ -e "$VECTOR_PATH/testvector$file.bit" ]; then
-        echo "Testing testvector$file"
-    else
-        echo "Bitstream file not found: testvector$file"
-    fi
-    if "$OPUS_DEMO" -d "$RATE" 2 -f32 "$VECTOR_PATH/qext_vector$file.bit" tmp.out >> logs_qext.txt 2>&1; then
-        echo "successfully decoded"
-    else
-        echo "ERROR: decoding failed"
-        exit 1
-    fi
-    "$QEXT_COMPARE" -s -r "$RATE" -f32 -thresholds 0.05 .1 .1 "$VECTOR_PATH/qext_vector${file}dec.f32" tmp.out >> logs_qext.txt 2>&1
-    if [ "$?" -eq "0" ]; then
-        echo "output matches reference"
-    else
-        echo "ERROR: output does not match reference"
-        exit 1
-    fi
-    echo
-done
-
-echo "=================================="
-echo "Testing Opus HD fuzzng testvectors"
-echo "=================================="
-echo
-for file in 01 02 03 04 05 06
-do
-    if [ -e "$VECTOR_PATH/testvector$file.bit" ]; then
-        echo "Testing testvector$file"
-    else
-        echo "Bitstream file not found: testvector$file"
-    fi
-    if "$OPUS_DEMO" -d "$RATE" 2 -f32 "$VECTOR_PATH/qext_vector${file}fuzz.bit" tmp.out >> logs_qextfuzz.txt 2>&1; then
-        echo "successfully decoded"
-    else
-        echo "ERROR: decoding failed"
-        exit 1
-    fi
-    "$QEXT_COMPARE" -s -r "$RATE" -f32 -thresholds 0.1 .5 1 "$VECTOR_PATH/qext_vector${file}fuzzdec.f32" tmp.out >> logs_qextfuzz.txt 2>&1
-    if [ "$?" -eq "0" ]; then
-        echo "output matches reference"
-    else
-        echo "ERROR: output does not match reference"
-        exit 1
-    fi
-    echo
-done
-
-
-
-echo "All tests have passed successfully"
diff --git a/tests/run_vectors.sh b/tests/run_vectors.sh
index e6bb40e08..93316eb4b 100755
--- a/tests/run_vectors.sh
+++ b/tests/run_vectors.sh
@@ -45,8 +45,8 @@ CMD_PATH=$1
 VECTOR_PATH=$2
 RATE=$3
 
-: ${OPUS_DEMO:=$CMD_PATH/opus_demo}
-: ${OPUS_COMPARE:=$CMD_PATH/opus_compare}
+: ${OAC_DEMO:=$CMD_PATH/oac_demo}
+: ${OAC_COMPARE:=$CMD_PATH/oac_compare}
 
 if [ -d "$VECTOR_PATH" ]; then
     echo "Test vectors found in $VECTOR_PATH"
@@ -57,15 +57,15 @@ else
     exit 0
 fi
 
-if [ ! -x "$OPUS_COMPARE" ]; then
-    echo "ERROR: Compare program not found: $OPUS_COMPARE"
+if [ ! -x "$OAC_COMPARE" ]; then
+    echo "ERROR: Compare program not found: $OAC_COMPARE"
     exit 1
 fi
 
-if [ -x "$OPUS_DEMO" ]; then
-    echo "Decoding with $OPUS_DEMO"
+if [ -x "$OAC_DEMO" ]; then
+    echo "Decoding with $OAC_DEMO"
 else
-    echo "ERROR: Decoder not found: $OPUS_DEMO"
+    echo "ERROR: Decoder not found: $OAC_DEMO"
     exit 1
 fi
 
@@ -81,15 +81,15 @@ do
     else
         echo "Bitstream file not found: testvector$file.bit"
     fi
-    if "$OPUS_DEMO" -d "$RATE" 1 -ignore_extensions "$VECTOR_PATH/testvector$file.bit" tmp.out >> logs_mono.txt 2>&1; then
+    if "$OAC_DEMO" -d "$RATE" 1 -ignore_extensions "$VECTOR_PATH/testvector$file.bit" tmp.out >> logs_mono.txt 2>&1; then
         echo "successfully decoded"
     else
         echo "ERROR: decoding failed"
         exit 1
     fi
-    "$OPUS_COMPARE" -r "$RATE" "$VECTOR_PATH/testvector${file}.dec" tmp.out >> logs_mono.txt 2>&1
+    "$OAC_COMPARE" -r "$RATE" "$VECTOR_PATH/testvector${file}.dec" tmp.out >> logs_mono.txt 2>&1
     float_ret=$?
-    "$OPUS_COMPARE" -r "$RATE" "$VECTOR_PATH/testvector${file}m.dec" tmp.out >> logs_mono2.txt 2>&1
+    "$OAC_COMPARE" -r "$RATE" "$VECTOR_PATH/testvector${file}m.dec" tmp.out >> logs_mono2.txt 2>&1
     float_ret2=$?
     if [ "$float_ret" -eq "0" ] || [ "$float_ret2" -eq "0" ]; then
         echo "output matches reference"
@@ -112,15 +112,15 @@ do
     else
         echo "Bitstream file not found: testvector$file"
     fi
-    if "$OPUS_DEMO" -d "$RATE" 2 -ignore_extensions "$VECTOR_PATH/testvector$file.bit" tmp.out >> logs_stereo.txt 2>&1; then
+    if "$OAC_DEMO" -d "$RATE" 2 -ignore_extensions "$VECTOR_PATH/testvector$file.bit" tmp.out >> logs_stereo.txt 2>&1; then
         echo "successfully decoded"
     else
         echo "ERROR: decoding failed"
         exit 1
     fi
-    "$OPUS_COMPARE" -s -r "$RATE" "$VECTOR_PATH/testvector${file}.dec" tmp.out >> logs_stereo.txt 2>&1
+    "$OAC_COMPARE" -s -r "$RATE" "$VECTOR_PATH/testvector${file}.dec" tmp.out >> logs_stereo.txt 2>&1
     float_ret=$?
-    "$OPUS_COMPARE" -s -r "$RATE" "$VECTOR_PATH/testvector${file}m.dec" tmp.out >> logs_stereo2.txt 2>&1
+    "$OAC_COMPARE" -s -r "$RATE" "$VECTOR_PATH/testvector${file}m.dec" tmp.out >> logs_stereo2.txt 2>&1
     float_ret2=$?
     if [ "$float_ret" -eq "0" ] || [ "$float_ret2" -eq "0" ]; then
         echo "output matches reference"
diff --git a/tests/test_oac_api.c b/tests/test_oac_api.c
new file mode 100644
index 000000000..a6a75ef1a
--- /dev/null
+++ b/tests/test_oac_api.c
@@ -0,0 +1,1916 @@
+/* Copyright (c) 2011-2013 Xiph.Org Foundation
+   Written by Gregory Maxwell */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/* This tests the API presented by the liboac system.
+   It does not attempt to extensively exercise the codec internals.
+   The strategy here is to simply the API interface invariants:
+   That sane options are accepted, insane options are rejected,
+   and that nothing blows up. In particular we don't actually test
+   that settings are heeded by the codec (though we do check that
+   get after set returns a sane value when it should). Other
+   tests check the actual codec behavior.
+   In cases where its reasonable to do so we test exhaustively,
+   but its not reasonable to do so in all cases.
+   Although these tests are simple they found several library bugs
+   when they were initially developed. */
+
+/* These tests are more sensitive if compiled with -DVALGRIND and
+   run inside valgrind. Malloc failure testing requires glibc. */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include "arch.h"
+#include "oac_multistream.h"
+#include "oac.h"
+#include "test_oac_common.h"
+
+#ifdef VALGRIND
+#include <valgrind/memcheck.h>
+#define VG_UNDEF(x,y) VALGRIND_MAKE_MEM_UNDEFINED((x),(y))
+#define VG_CHECK(x,y) VALGRIND_CHECK_MEM_IS_DEFINED((x),(y))
+#else
+#define VG_UNDEF(x,y)
+#define VG_CHECK(x,y)
+#endif
+
+#if defined(HAVE___MALLOC_HOOK)
+#define MALLOC_FAIL
+#include "os_support.h"
+#include <malloc.h>
+
+static const oac_int32 oac_apps[3] = {OAC_APPLICATION_VOIP,
+       OAC_APPLICATION_AUDIO,OAC_APPLICATION_RESTRICTED_LOWDELAY};
+
+void *malloc_hook(__attribute__((unused)) size_t size,
+                  __attribute__((unused)) const void *caller)
+{
+   return 0;
+}
+#endif
+
+oac_int32 *null_int_ptr = (oac_int32 *)NULL;
+oac_uint32 *null_uint_ptr = (oac_uint32 *)NULL;
+
+static const oac_int32 oac_rates[5] = {48000,24000,16000,12000,8000};
+
+oac_int32 test_dec_api(void)
+{
+   oac_uint32 dec_final_range;
+   OacDecoder *dec;
+   OacDecoder *dec2;
+   oac_int32 i,j,cfgs;
+   unsigned char packet[1276];
+#ifndef DISABLE_FLOAT_API
+   float fbuf[960*2];
+#endif
+   short sbuf[960*2];
+   int c,err;
+
+   cfgs=0;
+   /*First test invalid configurations which should fail*/
+   fprintf(stdout,"\n  Decoder basic API tests\n");
+   fprintf(stdout,"  ---------------------------------------------------\n");
+   for(c=0;c<4;c++)
+   {
+      i=oac_decoder_get_size(c);
+      if(((c==1||c==2)&&(i<=2048||i>1<<18))||((c!=1&&c!=2)&&i!=0))test_failed();
+      fprintf(stdout,"    oac_decoder_get_size(%d)=%d ...............%s OK.\n",c,i,i>0?"":"....");
+      cfgs++;
+   }
+
+   /*Test with unsupported sample rates*/
+   for(c=0;c<4;c++)
+   {
+      for(i=-7;i<=96000;i++)
+      {
+         int fs;
+         if((i==8000||i==12000||i==16000||i==24000||i==48000
+#ifdef ENABLE_QEXT
+               ||i==96000
+#endif
+               )&&(c==1||c==2))continue;
+         switch(i)
+         {
+           case(-5):fs=-8000;break;
+           case(-6):fs=INT32_MAX;break;
+           case(-7):fs=INT32_MIN;break;
+           default:fs=i;
+         }
+         err = OAC_OK;
+         VG_UNDEF(&err,sizeof(err));
+         dec = oac_decoder_create(fs, c, &err);
+         if(err!=OAC_BAD_ARG || dec!=NULL)test_failed();
+         cfgs++;
+         dec = oac_decoder_create(fs, c, 0);
+         if(dec!=NULL)test_failed();
+         cfgs++;
+         dec=(OacDecoder*)malloc(oac_decoder_get_size(2));
+         if(dec==NULL)test_failed();
+         err = oac_decoder_init(dec,fs,c);
+         if(err!=OAC_BAD_ARG)test_failed();
+         cfgs++;
+         free(dec);
+      }
+   }
+
+   VG_UNDEF(&err,sizeof(err));
+   dec = oac_decoder_create(48000, 2, &err);
+   if(err!=OAC_OK || dec==NULL)test_failed();
+   VG_CHECK(dec,oac_decoder_get_size(2));
+   cfgs++;
+
+   fprintf(stdout,"    oac_decoder_create() ........................ OK.\n");
+   fprintf(stdout,"    oac_decoder_init() .......................... OK.\n");
+
+   err=oac_decoder_ctl(dec, OAC_GET_FINAL_RANGE(null_uint_ptr));
+   if(err != OAC_BAD_ARG)test_failed();
+   VG_UNDEF(&dec_final_range,sizeof(dec_final_range));
+   err=oac_decoder_ctl(dec, OAC_GET_FINAL_RANGE(&dec_final_range));
+   if(err!=OAC_OK)test_failed();
+   VG_CHECK(&dec_final_range,sizeof(dec_final_range));
+   fprintf(stdout,"    OAC_GET_FINAL_RANGE ......................... OK.\n");
+   cfgs++;
+
+   err=oac_decoder_ctl(dec,OAC_UNIMPLEMENTED);
+   if(err!=OAC_UNIMPLEMENTED)test_failed();
+   fprintf(stdout,"    OAC_UNIMPLEMENTED ........................... OK.\n");
+   cfgs++;
+
+   err=oac_decoder_ctl(dec, OAC_GET_BANDWIDTH(null_int_ptr));
+   if(err != OAC_BAD_ARG)test_failed();
+   VG_UNDEF(&i,sizeof(i));
+   err=oac_decoder_ctl(dec, OAC_GET_BANDWIDTH(&i));
+   if(err != OAC_OK || i!=0)test_failed();
+   fprintf(stdout,"    OAC_GET_BANDWIDTH ........................... OK.\n");
+   cfgs++;
+
+   err=oac_decoder_ctl(dec, OAC_GET_SAMPLE_RATE(null_int_ptr));
+   if(err != OAC_BAD_ARG)test_failed();
+   VG_UNDEF(&i,sizeof(i));
+   err=oac_decoder_ctl(dec, OAC_GET_SAMPLE_RATE(&i));
+   if(err != OAC_OK || i!=48000)test_failed();
+   fprintf(stdout,"    OAC_GET_SAMPLE_RATE ......................... OK.\n");
+   cfgs++;
+
+   /*GET_PITCH has different execution paths depending on the previously decoded frame.*/
+   err=oac_decoder_ctl(dec, OAC_GET_PITCH(null_int_ptr));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   VG_UNDEF(&i,sizeof(i));
+   err=oac_decoder_ctl(dec, OAC_GET_PITCH(&i));
+   if(err != OAC_OK || i>0 || i<-1)test_failed();
+   cfgs++;
+   VG_UNDEF(packet,sizeof(packet));
+   packet[0]=63<<2;packet[1]=packet[2]=0;
+   if(oac_decode(dec, packet, 3, sbuf, 960, 0)!=960)test_failed();
+   cfgs++;
+   VG_UNDEF(&i,sizeof(i));
+   err=oac_decoder_ctl(dec, OAC_GET_PITCH(&i));
+   if(err != OAC_OK || i>0 || i<-1)test_failed();
+   cfgs++;
+   packet[0]=1;
+   if(oac_decode(dec, packet, 1, sbuf, 960, 0)!=960)test_failed();
+   cfgs++;
+   VG_UNDEF(&i,sizeof(i));
+   err=oac_decoder_ctl(dec, OAC_GET_PITCH(&i));
+   if(err != OAC_OK || i>0 || i<-1)test_failed();
+   cfgs++;
+   fprintf(stdout,"    OAC_GET_PITCH ............................... OK.\n");
+
+   err=oac_decoder_ctl(dec, OAC_GET_LAST_PACKET_DURATION(null_int_ptr));
+   if(err != OAC_BAD_ARG)test_failed();
+   VG_UNDEF(&i,sizeof(i));
+   err=oac_decoder_ctl(dec, OAC_GET_LAST_PACKET_DURATION(&i));
+   if(err != OAC_OK || i!=960)test_failed();
+   cfgs++;
+   fprintf(stdout,"    OAC_GET_LAST_PACKET_DURATION ................ OK.\n");
+
+   VG_UNDEF(&i,sizeof(i));
+   err=oac_decoder_ctl(dec, OAC_GET_GAIN(&i));
+   VG_CHECK(&i,sizeof(i));
+   if(err != OAC_OK || i!=0)test_failed();
+   cfgs++;
+   err=oac_decoder_ctl(dec, OAC_GET_GAIN(null_int_ptr));
+   if(err != OAC_BAD_ARG)test_failed();
+   cfgs++;
+   err=oac_decoder_ctl(dec, OAC_SET_GAIN(-32769));
+   if(err != OAC_BAD_ARG)test_failed();
+   cfgs++;
+   err=oac_decoder_ctl(dec, OAC_SET_GAIN(32768));
+   if(err != OAC_BAD_ARG)test_failed();
+   cfgs++;
+   err=oac_decoder_ctl(dec, OAC_SET_GAIN(-15));
+   if(err != OAC_OK)test_failed();
+   cfgs++;
+   VG_UNDEF(&i,sizeof(i));
+   err=oac_decoder_ctl(dec, OAC_GET_GAIN(&i));
+   VG_CHECK(&i,sizeof(i));
+   if(err != OAC_OK || i!=-15)test_failed();
+   cfgs++;
+   fprintf(stdout,"    OAC_SET_GAIN ................................ OK.\n");
+   fprintf(stdout,"    OAC_GET_GAIN ................................ OK.\n");
+
+   /*Reset the decoder*/
+   dec2=(OacDecoder*)malloc(oac_decoder_get_size(2));
+   memcpy(dec2,dec,oac_decoder_get_size(2));
+   if(oac_decoder_ctl(dec, OAC_RESET_STATE)!=OAC_OK)test_failed();
+   if(memcmp(dec2,dec,oac_decoder_get_size(2))==0)test_failed();
+   free(dec2);
+   fprintf(stdout,"    OAC_RESET_STATE ............................. OK.\n");
+   cfgs++;
+
+   VG_UNDEF(packet,sizeof(packet));
+   packet[0]=0;
+   if(oac_decoder_get_nb_samples(dec,packet,1)!=480)test_failed();
+   if(oac_packet_get_nb_samples(packet,1,48000)!=480)test_failed();
+   if(oac_packet_get_nb_samples(packet,1,96000)!=960)test_failed();
+   if(oac_packet_get_nb_samples(packet,1,32000)!=320)test_failed();
+   if(oac_packet_get_nb_samples(packet,1,8000)!=80)test_failed();
+   packet[0]=3;
+   if(oac_packet_get_nb_samples(packet,1,24000)!=OAC_INVALID_PACKET)test_failed();
+   packet[0]=(63<<2)|3;
+   packet[1]=63;
+   if(oac_packet_get_nb_samples(packet,0,24000)!=OAC_BAD_ARG)test_failed();
+   if(oac_packet_get_nb_samples(packet,2,48000)!=OAC_INVALID_PACKET)test_failed();
+   if(oac_decoder_get_nb_samples(dec,packet,2)!=OAC_INVALID_PACKET)test_failed();
+   fprintf(stdout,"    oac_{packet,decoder}_get_nb_samples() ....... OK.\n");
+   cfgs+=9;
+
+   if(OAC_BAD_ARG!=oac_packet_get_nb_frames(packet,0))test_failed();
+   for(i=0;i<256;i++) {
+     int l1res[4]={1,2,2,OAC_INVALID_PACKET};
+     packet[0]=i;
+     if(l1res[packet[0]&3]!=oac_packet_get_nb_frames(packet,1))test_failed();
+     cfgs++;
+     for(j=0;j<256;j++) {
+       packet[1]=j;
+       if(((packet[0]&3)!=3?l1res[packet[0]&3]:packet[1]&63)!=oac_packet_get_nb_frames(packet,2))test_failed();
+       cfgs++;
+     }
+   }
+   fprintf(stdout,"    oac_packet_get_nb_frames() .................. OK.\n");
+
+   for(i=0;i<256;i++) {
+     int bw;
+     packet[0]=i;
+     bw=packet[0]>>4;
+     bw=OAC_BANDWIDTH_NARROWBAND+(((((bw&7)*9)&(63-(bw&8)))+2+12*((bw&8)!=0))>>4);
+     if(bw!=oac_packet_get_bandwidth(packet))test_failed();
+     cfgs++;
+   }
+   fprintf(stdout,"    oac_packet_get_bandwidth() .................. OK.\n");
+
+   for(i=0;i<256;i++) {
+     int fp3s,rate;
+     packet[0]=i;
+     fp3s=packet[0]>>3;
+     fp3s=((((3-(fp3s&3))*13&119)+9)>>2)*((fp3s>13)*(3-((fp3s&3)==3))+1)*25;
+     for(rate=0;rate<5;rate++) {
+       if((oac_rates[rate]*3/fp3s)!=oac_packet_get_samples_per_frame(packet,oac_rates[rate]))test_failed();
+       cfgs++;
+     }
+   }
+   fprintf(stdout,"    oac_packet_get_samples_per_frame() .......... OK.\n");
+
+   packet[0]=(63<<2)+3;
+   packet[1]=49;
+   for(j=2;j<51;j++)packet[j]=0;
+   VG_UNDEF(sbuf,sizeof(sbuf));
+   if(oac_decode(dec, packet, 51, sbuf, 960, 0)!=OAC_INVALID_PACKET)test_failed();
+   cfgs++;
+   packet[0]=(63<<2);
+   packet[1]=packet[2]=0;
+   if(oac_decode(dec, packet, -1, sbuf, 960, 0)!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   if(oac_decode(dec, packet, 3, sbuf, 60, 0)!=OAC_BUFFER_TOO_SMALL)test_failed();
+   cfgs++;
+   if(oac_decode(dec, packet, 3, sbuf, 480, 0)!=OAC_BUFFER_TOO_SMALL)test_failed();
+   cfgs++;
+   if(oac_decode(dec, packet, 3, sbuf, 960, 0)!=960)test_failed();
+   cfgs++;
+   fprintf(stdout,"    oac_decode() ................................ OK.\n");
+#ifndef DISABLE_FLOAT_API
+   VG_UNDEF(fbuf,sizeof(fbuf));
+   if(oac_decode_float(dec, packet, 3, fbuf, 960, 0)!=960)test_failed();
+   cfgs++;
+   fprintf(stdout,"    oac_decode_float() .......................... OK.\n");
+#endif
+
+#if 0
+   /*These tests are disabled because the library crashes with null states*/
+   if(oac_decoder_ctl(0,OAC_RESET_STATE)         !=OAC_INVALID_STATE)test_failed();
+   if(oac_decoder_init(0,48000,1)                 !=OAC_INVALID_STATE)test_failed();
+   if(oac_decode(0,packet,1,outbuf,2880,0)        !=OAC_INVALID_STATE)test_failed();
+   if(oac_decode_float(0,packet,1,0,2880,0)       !=OAC_INVALID_STATE)test_failed();
+   if(oac_decoder_get_nb_samples(0,packet,1)      !=OAC_INVALID_STATE)test_failed();
+   if(oac_packet_get_nb_frames(NULL,1)            !=OAC_BAD_ARG)test_failed();
+   if(oac_packet_get_bandwidth(NULL)              !=OAC_BAD_ARG)test_failed();
+   if(oac_packet_get_samples_per_frame(NULL,48000)!=OAC_BAD_ARG)test_failed();
+#endif
+   oac_decoder_destroy(dec);
+   cfgs++;
+   fprintf(stdout,"                   All decoder interface tests passed\n");
+   fprintf(stdout,"                             (%6d API invocations)\n",cfgs);
+   return cfgs;
+}
+
+oac_int32 test_msdec_api(void)
+{
+   oac_uint32 dec_final_range;
+   OacMSDecoder *dec;
+   OacDecoder *streamdec;
+   oac_int32 i,j,cfgs;
+   unsigned char packet[1276];
+   unsigned char mapping[256];
+#ifndef DISABLE_FLOAT_API
+   float fbuf[960*2];
+#endif
+   short sbuf[960*2];
+   int a,b,c,err;
+
+   mapping[0]=0;
+   mapping[1]=1;
+   for(i=2;i<256;i++)VG_UNDEF(&mapping[i],sizeof(unsigned char));
+
+   cfgs=0;
+   /*First test invalid configurations which should fail*/
+   fprintf(stdout,"\n  Multistream decoder basic API tests\n");
+   fprintf(stdout,"  ---------------------------------------------------\n");
+   for(a=-1;a<4;a++)
+   {
+      for(b=-1;b<4;b++)
+      {
+         i=oac_multistream_decoder_get_size(a,b);
+         if(((a>0&&b<=a&&b>=0)&&(i<=2048||i>((1<<18)*a)))||((a<1||b>a||b<0)&&i!=0))test_failed();
+         fprintf(stdout,"    oac_multistream_decoder_get_size(%2d,%2d)=%d %sOK.\n",a,b,i,i>0?"":"... ");
+         cfgs++;
+      }
+   }
+
+   /*Test with unsupported sample rates*/
+   for(c=1;c<3;c++)
+   {
+      for(i=-7;i<=96000;i++)
+      {
+         int fs;
+         if((i==8000||i==12000||i==16000||i==24000||i==48000
+#ifdef ENABLE_QEXT
+               ||i==96000
+#endif
+               )&&(c==1||c==2))continue;
+         switch(i)
+         {
+           case(-5):fs=-8000;break;
+           case(-6):fs=INT32_MAX;break;
+           case(-7):fs=INT32_MIN;break;
+           default:fs=i;
+         }
+         err = OAC_OK;
+         VG_UNDEF(&err,sizeof(err));
+         dec = oac_multistream_decoder_create(fs, c, 1, c-1, mapping, &err);
+         if(err!=OAC_BAD_ARG || dec!=NULL)test_failed();
+         cfgs++;
+         dec = oac_multistream_decoder_create(fs, c, 1, c-1, mapping, 0);
+         if(dec!=NULL)test_failed();
+         cfgs++;
+         dec=(OacMSDecoder*)malloc(oac_multistream_decoder_get_size(1,1));
+         if(dec==NULL)test_failed();
+         err = oac_multistream_decoder_init(dec,fs,c,1,c-1, mapping);
+         if(err!=OAC_BAD_ARG)test_failed();
+         cfgs++;
+         free(dec);
+      }
+   }
+
+   for(c=0;c<2;c++)
+   {
+      int *ret_err;
+      ret_err = c?0:&err;
+
+      mapping[0]=0;
+      mapping[1]=1;
+      for(i=2;i<256;i++)VG_UNDEF(&mapping[i],sizeof(unsigned char));
+
+      VG_UNDEF(ret_err,sizeof(*ret_err));
+      dec = oac_multistream_decoder_create(48000, 2, 1, 0, mapping, ret_err);
+      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
+      if((ret_err && *ret_err!=OAC_BAD_ARG) || dec!=NULL)test_failed();
+      cfgs++;
+
+      VG_UNDEF(ret_err,sizeof(*ret_err));
+      mapping[0]=mapping[1]=0;
+      dec = oac_multistream_decoder_create(48000, 2, 1, 0, mapping, ret_err);
+      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
+      if((ret_err && *ret_err!=OAC_OK) || dec==NULL)test_failed();
+      cfgs++;
+      oac_multistream_decoder_destroy(dec);
+      cfgs++;
+
+      VG_UNDEF(ret_err,sizeof(*ret_err));
+      dec = oac_multistream_decoder_create(48000, 1, 4, 1, mapping, ret_err);
+      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
+      if((ret_err && *ret_err!=OAC_OK) || dec==NULL)test_failed();
+      cfgs++;
+
+      err = oac_multistream_decoder_init(dec,48000, 1, 0, 0, mapping);
+      if(err!=OAC_BAD_ARG)test_failed();
+      cfgs++;
+
+      err = oac_multistream_decoder_init(dec,48000, 1, 1, -1, mapping);
+      if(err!=OAC_BAD_ARG)test_failed();
+      cfgs++;
+
+      oac_multistream_decoder_destroy(dec);
+      cfgs++;
+
+      VG_UNDEF(ret_err,sizeof(*ret_err));
+      dec = oac_multistream_decoder_create(48000, 2, 1, 1, mapping, ret_err);
+      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
+      if((ret_err && *ret_err!=OAC_OK) || dec==NULL)test_failed();
+      cfgs++;
+      oac_multistream_decoder_destroy(dec);
+      cfgs++;
+
+      VG_UNDEF(ret_err,sizeof(*ret_err));
+      dec = oac_multistream_decoder_create(48000, 255, 255, 1, mapping, ret_err);
+      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
+      if((ret_err && *ret_err!=OAC_BAD_ARG) || dec!=NULL)test_failed();
+      cfgs++;
+
+      VG_UNDEF(ret_err,sizeof(*ret_err));
+      dec = oac_multistream_decoder_create(48000, -1, 1, 1, mapping, ret_err);
+      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
+      if((ret_err && *ret_err!=OAC_BAD_ARG) || dec!=NULL)test_failed();
+      cfgs++;
+
+      VG_UNDEF(ret_err,sizeof(*ret_err));
+      dec = oac_multistream_decoder_create(48000, 0, 1, 1, mapping, ret_err);
+      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
+      if((ret_err && *ret_err!=OAC_BAD_ARG) || dec!=NULL)test_failed();
+      cfgs++;
+
+      VG_UNDEF(ret_err,sizeof(*ret_err));
+      dec = oac_multistream_decoder_create(48000, 1, -1, 2, mapping, ret_err);
+      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
+      if((ret_err && *ret_err!=OAC_BAD_ARG) || dec!=NULL)test_failed();
+      cfgs++;
+
+      VG_UNDEF(ret_err,sizeof(*ret_err));
+      dec = oac_multistream_decoder_create(48000, 1, -1, -1, mapping, ret_err);
+      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
+      if((ret_err && *ret_err!=OAC_BAD_ARG) || dec!=NULL)test_failed();
+      cfgs++;
+
+      VG_UNDEF(ret_err,sizeof(*ret_err));
+      dec = oac_multistream_decoder_create(48000, 256, 255, 1, mapping, ret_err);
+      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
+      if((ret_err && *ret_err!=OAC_BAD_ARG) || dec!=NULL)test_failed();
+      cfgs++;
+
+      VG_UNDEF(ret_err,sizeof(*ret_err));
+      dec = oac_multistream_decoder_create(48000, 256, 255, 0, mapping, ret_err);
+      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
+      if((ret_err && *ret_err!=OAC_BAD_ARG) || dec!=NULL)test_failed();
+      cfgs++;
+
+      VG_UNDEF(ret_err,sizeof(*ret_err));
+      mapping[0]=255;
+      mapping[1]=1;
+      mapping[2]=2;
+      dec = oac_multistream_decoder_create(48000, 3, 2, 0, mapping, ret_err);
+      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
+      if((ret_err && *ret_err!=OAC_BAD_ARG) || dec!=NULL)test_failed();
+      cfgs++;
+
+      VG_UNDEF(ret_err,sizeof(*ret_err));
+      mapping[0]=0;
+      mapping[1]=0;
+      mapping[2]=0;
+      dec = oac_multistream_decoder_create(48000, 3, 2, 1, mapping, ret_err);
+      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
+      if((ret_err && *ret_err!=OAC_OK) || dec==NULL)test_failed();
+      cfgs++;
+      oac_multistream_decoder_destroy(dec);
+      cfgs++;
+
+      VG_UNDEF(ret_err,sizeof(*ret_err));
+      mapping[0]=0;
+      mapping[1]=255;
+      mapping[2]=1;
+      mapping[3]=2;
+      mapping[4]=3;
+      dec = oac_multistream_decoder_create(48001, 5, 4, 1, mapping, ret_err);
+      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
+      if((ret_err && *ret_err!=OAC_BAD_ARG) || dec!=NULL)test_failed();
+      cfgs++;
+   }
+
+   VG_UNDEF(&err,sizeof(err));
+   mapping[0]=0;
+   mapping[1]=255;
+   mapping[2]=1;
+   mapping[3]=2;
+   dec = oac_multistream_decoder_create(48000, 4, 2, 1, mapping, &err);
+   VG_CHECK(&err,sizeof(err));
+   if(err!=OAC_OK || dec==NULL)test_failed();
+   cfgs++;
+
+   fprintf(stdout,"    oac_multistream_decoder_create() ............ OK.\n");
+   fprintf(stdout,"    oac_multistream_decoder_init() .............. OK.\n");
+
+   VG_UNDEF(&dec_final_range,sizeof(dec_final_range));
+   err=oac_multistream_decoder_ctl(dec, OAC_GET_FINAL_RANGE(&dec_final_range));
+   if(err!=OAC_OK)test_failed();
+   VG_CHECK(&dec_final_range,sizeof(dec_final_range));
+   fprintf(stdout,"    OAC_GET_FINAL_RANGE ......................... OK.\n");
+   cfgs++;
+
+   streamdec=0;
+   VG_UNDEF(&streamdec,sizeof(streamdec));
+   err=oac_multistream_decoder_ctl(dec, OAC_MULTISTREAM_GET_DECODER_STATE(-1,&streamdec));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   err=oac_multistream_decoder_ctl(dec, OAC_MULTISTREAM_GET_DECODER_STATE(1,&streamdec));
+   if(err!=OAC_OK||streamdec==NULL)test_failed();
+   VG_CHECK(streamdec,oac_decoder_get_size(1));
+   cfgs++;
+   err=oac_multistream_decoder_ctl(dec, OAC_MULTISTREAM_GET_DECODER_STATE(2,&streamdec));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   err=oac_multistream_decoder_ctl(dec, OAC_MULTISTREAM_GET_DECODER_STATE(0,&streamdec));
+   if(err!=OAC_OK||streamdec==NULL)test_failed();
+   VG_CHECK(streamdec,oac_decoder_get_size(1));
+   fprintf(stdout,"    OAC_MULTISTREAM_GET_DECODER_STATE ........... OK.\n");
+   cfgs++;
+
+   for(j=0;j<2;j++)
+   {
+      OacDecoder *od;
+      err=oac_multistream_decoder_ctl(dec,OAC_MULTISTREAM_GET_DECODER_STATE(j,&od));
+      if(err != OAC_OK)test_failed();
+      VG_UNDEF(&i,sizeof(i));
+      err=oac_decoder_ctl(od, OAC_GET_GAIN(&i));
+      VG_CHECK(&i,sizeof(i));
+      if(err != OAC_OK || i!=0)test_failed();
+      cfgs++;
+   }
+   err=oac_multistream_decoder_ctl(dec,OAC_SET_GAIN(15));
+   if(err!=OAC_OK)test_failed();
+   fprintf(stdout,"    OAC_SET_GAIN ................................ OK.\n");
+   for(j=0;j<2;j++)
+   {
+      OacDecoder *od;
+      err=oac_multistream_decoder_ctl(dec,OAC_MULTISTREAM_GET_DECODER_STATE(j,&od));
+      if(err != OAC_OK)test_failed();
+      VG_UNDEF(&i,sizeof(i));
+      err=oac_decoder_ctl(od, OAC_GET_GAIN(&i));
+      VG_CHECK(&i,sizeof(i));
+      if(err != OAC_OK || i!=15)test_failed();
+      cfgs++;
+   }
+   fprintf(stdout,"    OAC_GET_GAIN ................................ OK.\n");
+
+   VG_UNDEF(&i,sizeof(i));
+   err=oac_multistream_decoder_ctl(dec, OAC_GET_BANDWIDTH(&i));
+   if(err != OAC_OK || i!=0)test_failed();
+   fprintf(stdout,"    OAC_GET_BANDWIDTH ........................... OK.\n");
+   cfgs++;
+
+   err=oac_multistream_decoder_ctl(dec,OAC_UNIMPLEMENTED);
+   if(err!=OAC_UNIMPLEMENTED)test_failed();
+   fprintf(stdout,"    OAC_UNIMPLEMENTED ........................... OK.\n");
+   cfgs++;
+
+#if 0
+   /*Currently unimplemented for multistream*/
+   /*GET_PITCH has different execution paths depending on the previously decoded frame.*/
+   err=oac_multistream_decoder_ctl(dec, OAC_GET_PITCH(null_int_ptr));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   VG_UNDEF(&i,sizeof(i));
+   err=oac_multistream_decoder_ctl(dec, OAC_GET_PITCH(&i));
+   if(err != OAC_OK || i>0 || i<-1)test_failed();
+   cfgs++;
+   VG_UNDEF(packet,sizeof(packet));
+   packet[0]=63<<2;packet[1]=packet[2]=0;
+   if(oac_multistream_decode(dec, packet, 3, sbuf, 960, 0)!=960)test_failed();
+   cfgs++;
+   VG_UNDEF(&i,sizeof(i));
+   err=oac_multistream_decoder_ctl(dec, OAC_GET_PITCH(&i));
+   if(err != OAC_OK || i>0 || i<-1)test_failed();
+   cfgs++;
+   packet[0]=1;
+   if(oac_multistream_decode(dec, packet, 1, sbuf, 960, 0)!=960)test_failed();
+   cfgs++;
+   VG_UNDEF(&i,sizeof(i));
+   err=oac_multistream_decoder_ctl(dec, OAC_GET_PITCH(&i));
+   if(err != OAC_OK || i>0 || i<-1)test_failed();
+   cfgs++;
+   fprintf(stdout,"    OAC_GET_PITCH ............................... OK.\n");
+#endif
+
+   /*Reset the decoder*/
+   if(oac_multistream_decoder_ctl(dec, OAC_RESET_STATE)!=OAC_OK)test_failed();
+   fprintf(stdout,"    OAC_RESET_STATE ............................. OK.\n");
+   cfgs++;
+
+   oac_multistream_decoder_destroy(dec);
+   cfgs++;
+   VG_UNDEF(&err,sizeof(err));
+   dec = oac_multistream_decoder_create(48000, 2, 1, 1, mapping, &err);
+   if(err!=OAC_OK || dec==NULL)test_failed();
+   cfgs++;
+
+   packet[0]=(63<<2)+3;
+   packet[1]=49;
+   for(j=2;j<51;j++)packet[j]=0;
+   VG_UNDEF(sbuf,sizeof(sbuf));
+   if(oac_multistream_decode(dec, packet, 51, sbuf, 960, 0)!=OAC_INVALID_PACKET)test_failed();
+   cfgs++;
+   packet[0]=(63<<2);
+   packet[1]=packet[2]=0;
+   if(oac_multistream_decode(dec, packet, -1, sbuf, 960, 0)!=OAC_BAD_ARG){printf("%d\n",oac_multistream_decode(dec, packet, -1, sbuf, 960, 0));test_failed();}
+   cfgs++;
+   if(oac_multistream_decode(dec, packet, 3, sbuf, -960, 0)!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   if(oac_multistream_decode(dec, packet, 3, sbuf, 60, 0)!=OAC_BUFFER_TOO_SMALL)test_failed();
+   cfgs++;
+   if(oac_multistream_decode(dec, packet, 3, sbuf, 480, 0)!=OAC_BUFFER_TOO_SMALL)test_failed();
+   cfgs++;
+   if(oac_multistream_decode(dec, packet, 3, sbuf, 960, 0)!=960)test_failed();
+   cfgs++;
+   fprintf(stdout,"    oac_multistream_decode() .................... OK.\n");
+#ifndef DISABLE_FLOAT_API
+   VG_UNDEF(fbuf,sizeof(fbuf));
+   if(oac_multistream_decode_float(dec, packet, 3, fbuf, 960, 0)!=960)test_failed();
+   cfgs++;
+   fprintf(stdout,"    oac_multistream_decode_float() .............. OK.\n");
+#endif
+
+#if 0
+   /*These tests are disabled because the library crashes with null states*/
+   if(oac_multistream_decoder_ctl(0,OAC_RESET_STATE)         !=OAC_INVALID_STATE)test_failed();
+   if(oac_multistream_decoder_init(0,48000,1)                 !=OAC_INVALID_STATE)test_failed();
+   if(oac_multistream_decode(0,packet,1,outbuf,2880,0)        !=OAC_INVALID_STATE)test_failed();
+   if(oac_multistream_decode_float(0,packet,1,0,2880,0)       !=OAC_INVALID_STATE)test_failed();
+   if(oac_multistream_decoder_get_nb_samples(0,packet,1)      !=OAC_INVALID_STATE)test_failed();
+#endif
+   oac_multistream_decoder_destroy(dec);
+   cfgs++;
+   fprintf(stdout,"       All multistream decoder interface tests passed\n");
+   fprintf(stdout,"                             (%6d API invocations)\n",cfgs);
+   return cfgs;
+}
+
+#ifdef VALGRIND
+#define UNDEFINE_FOR_PARSE  toc=-1; \
+   frames[0]=(unsigned char *)0; \
+   frames[1]=(unsigned char *)0; \
+   payload_offset=-1; \
+   VG_UNDEF(&toc,sizeof(toc)); \
+   VG_UNDEF(frames,sizeof(frames));\
+   VG_UNDEF(&payload_offset,sizeof(payload_offset));
+#else
+#define UNDEFINE_FOR_PARSE  toc=-1; \
+   frames[0]=(unsigned char *)0; \
+   frames[1]=(unsigned char *)0; \
+   payload_offset=-1;
+#endif
+
+/* This test exercises the heck out of the liboac parser.
+   It is much larger than the parser itself in part because
+   it tries to hit a lot of corner cases that could never
+   fail with the liboac code, but might be problematic for
+   other implementations. */
+oac_int32 test_parse(void)
+{
+   oac_int32 i,j,jj,sz;
+   unsigned char packet[1276];
+   oac_int32 cfgs,cfgs_total;
+   unsigned char toc;
+   const unsigned char *frames[48];
+   short size[48];
+   int payload_offset, ret;
+   fprintf(stdout,"\n  Packet header parsing tests\n");
+   fprintf(stdout,"  ---------------------------------------------------\n");
+   memset(packet,0,sizeof(char)*1276);
+   packet[0]=63<<2;
+   if(oac_packet_parse(packet,1,&toc,frames,0,&payload_offset)!=OAC_BAD_ARG)test_failed();
+   cfgs_total=cfgs=1;
+   /*code 0*/
+   for(i=0;i<64;i++)
+   {
+      packet[0]=i<<2;
+      UNDEFINE_FOR_PARSE
+      ret=oac_packet_parse(packet,4,&toc,frames,size,&payload_offset);
+      cfgs++;
+      if(ret!=1)test_failed();
+      if(size[0]!=3)test_failed();
+      if(frames[0]!=packet+1)test_failed();
+   }
+   fprintf(stdout,"    code 0 (%2d cases) ............................ OK.\n",cfgs);
+   cfgs_total+=cfgs;cfgs=0;
+
+   /*code 1, two frames of the same size*/
+   for(i=0;i<64;i++)
+   {
+      packet[0]=(i<<2)+1;
+      for(jj=0;jj<=1275*2+3;jj++)
+      {
+         UNDEFINE_FOR_PARSE
+         ret=oac_packet_parse(packet,jj,&toc,frames,size,&payload_offset);
+         cfgs++;
+         if((jj&1)==1 && jj<=2551)
+         {
+            /* Must pass if payload length even (packet length odd) and
+               size<=2551, must fail otherwise. */
+            if(ret!=2)test_failed();
+            if(size[0]!=size[1] || size[0]!=((jj-1)>>1))test_failed();
+            if(frames[0]!=packet+1)test_failed();
+            if(frames[1]!=frames[0]+size[0])test_failed();
+            if((toc>>2)!=i)test_failed();
+         } else if(ret!=OAC_INVALID_PACKET)test_failed();
+      }
+   }
+   fprintf(stdout,"    code 1 (%6d cases) ........................ OK.\n",cfgs);
+   cfgs_total+=cfgs;cfgs=0;
+
+   for(i=0;i<64;i++)
+   {
+      /*code 2, length code overflow*/
+      packet[0]=(i<<2)+2;
+      UNDEFINE_FOR_PARSE
+      ret=oac_packet_parse(packet,1,&toc,frames,size,&payload_offset);
+      cfgs++;
+      if(ret!=OAC_INVALID_PACKET)test_failed();
+      packet[1]=252;
+      UNDEFINE_FOR_PARSE
+      ret=oac_packet_parse(packet,2,&toc,frames,size,&payload_offset);
+      cfgs++;
+      if(ret!=OAC_INVALID_PACKET)test_failed();
+      for(j=0;j<1275;j++)
+      {
+         if(j<252)packet[1]=j;
+         else{packet[1]=252+(j&3);packet[2]=(j-252)>>2;}
+         /*Code 2, one too short*/
+         UNDEFINE_FOR_PARSE
+         ret=oac_packet_parse(packet,j+(j<252?2:3)-1,&toc,frames,size,&payload_offset);
+         cfgs++;
+         if(ret!=OAC_INVALID_PACKET)test_failed();
+         /*Code 2, one too long*/
+         UNDEFINE_FOR_PARSE
+         ret=oac_packet_parse(packet,j+(j<252?2:3)+1276,&toc,frames,size,&payload_offset);
+         cfgs++;
+         if(ret!=OAC_INVALID_PACKET)test_failed();
+         /*Code 2, second zero*/
+         UNDEFINE_FOR_PARSE
+         ret=oac_packet_parse(packet,j+(j<252?2:3),&toc,frames,size,&payload_offset);
+         cfgs++;
+         if(ret!=2)test_failed();
+         if(size[0]!=j||size[1]!=0)test_failed();
+         if(frames[1]!=frames[0]+size[0])test_failed();
+         if((toc>>2)!=i)test_failed();
+         /*Code 2, normal*/
+         UNDEFINE_FOR_PARSE
+         ret=oac_packet_parse(packet,(j<<1)+4,&toc,frames,size,&payload_offset);
+         cfgs++;
+         if(ret!=2)test_failed();
+         if(size[0]!=j||size[1]!=(j<<1)+3-j-(j<252?1:2))test_failed();
+         if(frames[1]!=frames[0]+size[0])test_failed();
+         if((toc>>2)!=i)test_failed();
+      }
+   }
+   fprintf(stdout,"    code 2 (%6d cases) ........................ OK.\n",cfgs);
+   cfgs_total+=cfgs;cfgs=0;
+
+   for(i=0;i<64;i++)
+   {
+      packet[0]=(i<<2)+3;
+      /*code 3, length code overflow*/
+      UNDEFINE_FOR_PARSE
+      ret=oac_packet_parse(packet,1,&toc,frames,size,&payload_offset);
+      cfgs++;
+      if(ret!=OAC_INVALID_PACKET)test_failed();
+   }
+   fprintf(stdout,"    code 3 m-truncation (%2d cases) ............... OK.\n",cfgs);
+   cfgs_total+=cfgs;cfgs=0;
+
+   for(i=0;i<64;i++)
+   {
+      /*code 3, m is zero or 49-63*/
+      packet[0]=(i<<2)+3;
+      for(jj=49;jj<=64;jj++)
+      {
+        packet[1]=0+(jj&63); /*CBR, no padding*/
+        UNDEFINE_FOR_PARSE
+        ret=oac_packet_parse(packet,1275,&toc,frames,size,&payload_offset);
+        cfgs++;
+        if(ret!=OAC_INVALID_PACKET)test_failed();
+        packet[1]=128+(jj&63); /*VBR, no padding*/
+        UNDEFINE_FOR_PARSE
+        ret=oac_packet_parse(packet,1275,&toc,frames,size,&payload_offset);
+        cfgs++;
+        if(ret!=OAC_INVALID_PACKET)test_failed();
+        packet[1]=64+(jj&63); /*CBR, padding*/
+        UNDEFINE_FOR_PARSE
+        ret=oac_packet_parse(packet,1275,&toc,frames,size,&payload_offset);
+        cfgs++;
+        if(ret!=OAC_INVALID_PACKET)test_failed();
+        packet[1]=128+64+(jj&63); /*VBR, padding*/
+        UNDEFINE_FOR_PARSE
+        ret=oac_packet_parse(packet,1275,&toc,frames,size,&payload_offset);
+        cfgs++;
+        if(ret!=OAC_INVALID_PACKET)test_failed();
+      }
+   }
+   fprintf(stdout,"    code 3 m=0,49-64 (%2d cases) ................ OK.\n",cfgs);
+   cfgs_total+=cfgs;cfgs=0;
+
+   for(i=0;i<64;i++)
+   {
+      packet[0]=(i<<2)+3;
+      /*code 3, m is one, cbr*/
+      packet[1]=1;
+      for(j=0;j<1276;j++)
+      {
+        UNDEFINE_FOR_PARSE
+        ret=oac_packet_parse(packet,j+2,&toc,frames,size,&payload_offset);
+        cfgs++;
+        if(ret!=1)test_failed();
+        if(size[0]!=j)test_failed();
+        if((toc>>2)!=i)test_failed();
+      }
+      UNDEFINE_FOR_PARSE
+      ret=oac_packet_parse(packet,1276+2,&toc,frames,size,&payload_offset);
+      cfgs++;
+      if(ret!=OAC_INVALID_PACKET)test_failed();
+   }
+   fprintf(stdout,"    code 3 m=1 CBR (%2d cases) ................. OK.\n",cfgs);
+   cfgs_total+=cfgs;cfgs=0;
+
+   for(i=0;i<64;i++)
+   {
+      int frame_samp;
+      /*code 3, m>1 CBR*/
+      packet[0]=(i<<2)+3;
+      frame_samp=oac_packet_get_samples_per_frame(packet,48000);
+      for(j=2;j<49;j++)
+      {
+         packet[1]=j;
+         for(sz=2;sz<((j+2)*1275);sz++)
+         {
+            UNDEFINE_FOR_PARSE
+            ret=oac_packet_parse(packet,sz,&toc,frames,size,&payload_offset);
+            cfgs++;
+            /*Must be <=120ms, must be evenly divisible, can't have frames>1275 bytes*/
+            if(frame_samp*j<=5760 && (sz-2)%j==0 && (sz-2)/j<1276)
+            {
+               if(ret!=j)test_failed();
+               for(jj=1;jj<ret;jj++)if(frames[jj]!=frames[jj-1]+size[jj-1])test_failed();
+               if((toc>>2)!=i)test_failed();
+            } else if(ret!=OAC_INVALID_PACKET)test_failed();
+         }
+      }
+      /*Super jumbo packets*/
+      packet[1]=5760/frame_samp;
+      UNDEFINE_FOR_PARSE
+      ret=oac_packet_parse(packet,1275*packet[1]+2,&toc,frames,size,&payload_offset);
+      cfgs++;
+      if(ret!=packet[1])test_failed();
+      for(jj=0;jj<ret;jj++)if(size[jj]!=1275)test_failed();
+   }
+   fprintf(stdout,"    code 3 m=1-48 CBR (%2d cases) .......... OK.\n",cfgs);
+   cfgs_total+=cfgs;cfgs=0;
+
+   for(i=0;i<64;i++)
+   {
+      int frame_samp;
+      /*Code 3 VBR, m one*/
+      packet[0]=(i<<2)+3;
+      packet[1]=128+1;
+      frame_samp=oac_packet_get_samples_per_frame(packet,48000);
+      for(jj=0;jj<1276;jj++)
+      {
+         UNDEFINE_FOR_PARSE
+         ret=oac_packet_parse(packet,2+jj,&toc,frames,size,&payload_offset);
+         cfgs++;
+         if(ret!=1)test_failed();
+         if(size[0]!=jj)test_failed();
+         if((toc>>2)!=i)test_failed();
+      }
+      UNDEFINE_FOR_PARSE
+      ret=oac_packet_parse(packet,2+1276,&toc,frames,size,&payload_offset);
+      cfgs++;
+      if(ret!=OAC_INVALID_PACKET)test_failed();
+      for(j=2;j<49;j++)
+      {
+         packet[1]=128+j;
+         /*Length code overflow*/
+         UNDEFINE_FOR_PARSE
+         ret=oac_packet_parse(packet,2+j-2,&toc,frames,size,&payload_offset);
+         cfgs++;
+         if(ret!=OAC_INVALID_PACKET)test_failed();
+         packet[2]=252;
+         packet[3]=0;
+         for(jj=4;jj<2+j;jj++)packet[jj]=0;
+         UNDEFINE_FOR_PARSE
+         ret=oac_packet_parse(packet,2+j,&toc,frames,size,&payload_offset);
+         cfgs++;
+         if(ret!=OAC_INVALID_PACKET)test_failed();
+         /*One byte too short*/
+         for(jj=2;jj<2+j;jj++)packet[jj]=0;
+         UNDEFINE_FOR_PARSE
+         ret=oac_packet_parse(packet,2+j-2,&toc,frames,size,&payload_offset);
+         cfgs++;
+         if(ret!=OAC_INVALID_PACKET)test_failed();
+         /*One byte too short thanks to length coding*/
+         packet[2]=252;
+         packet[3]=0;
+         for(jj=4;jj<2+j;jj++)packet[jj]=0;
+         UNDEFINE_FOR_PARSE
+         ret=oac_packet_parse(packet,2+j+252-1,&toc,frames,size,&payload_offset);
+         cfgs++;
+         if(ret!=OAC_INVALID_PACKET)test_failed();
+         /*Most expensive way of coding zeros*/
+         for(jj=2;jj<2+j;jj++)packet[jj]=0;
+         UNDEFINE_FOR_PARSE
+         ret=oac_packet_parse(packet,2+j-1,&toc,frames,size,&payload_offset);
+         cfgs++;
+         if(frame_samp*j<=5760){
+            if(ret!=j)test_failed();
+            for(jj=0;jj<j;jj++)if(size[jj]!=0)test_failed();
+            if((toc>>2)!=i)test_failed();
+         } else if(ret!=OAC_INVALID_PACKET)test_failed();
+         /*Quasi-CBR use of mode 3*/
+         for(sz=0;sz<8;sz++)
+         {
+            const int tsz[8]={50,201,403,700,1472,5110,20400,61298};
+            int pos=0;
+            int as=(tsz[sz]+i-j-2)/j;
+            for(jj=0;jj<j-1;jj++)
+            {
+              if(as<252){packet[2+pos]=as;pos++;}
+              else{packet[2+pos]=252+(as&3);packet[3+pos]=(as-252)>>2;pos+=2;}
+            }
+            UNDEFINE_FOR_PARSE
+            ret=oac_packet_parse(packet,tsz[sz]+i,&toc,frames,size,&payload_offset);
+            cfgs++;
+            if(frame_samp*j<=5760 && as<1276 && (tsz[sz]+i-2-pos-as*(j-1))<1276){
+               if(ret!=j)test_failed();
+               for(jj=0;jj<j-1;jj++)if(size[jj]!=as)test_failed();
+               if(size[j-1]!=(tsz[sz]+i-2-pos-as*(j-1)))test_failed();
+               if((toc>>2)!=i)test_failed();
+            } else if(ret!=OAC_INVALID_PACKET)test_failed();
+         }
+      }
+   }
+   fprintf(stdout,"    code 3 m=1-48 VBR (%2d cases) ............. OK.\n",cfgs);
+   cfgs_total+=cfgs;cfgs=0;
+
+   for(i=0;i<64;i++)
+   {
+      packet[0]=(i<<2)+3;
+      /*Padding*/
+      packet[1]=128+1+64;
+      /*Overflow the length coding*/
+      for(jj=2;jj<127;jj++)packet[jj]=255;
+      UNDEFINE_FOR_PARSE
+      ret=oac_packet_parse(packet,127,&toc,frames,size,&payload_offset);
+      cfgs++;
+      if(ret!=OAC_INVALID_PACKET)test_failed();
+
+      for(sz=0;sz<4;sz++)
+      {
+         const int tsz[4]={0,72,512,1275};
+         for(jj=sz;jj<65025;jj+=11)
+         {
+            int pos;
+            for(pos=0;pos<jj/254;pos++)packet[2+pos]=255;
+            packet[2+pos]=jj%254;
+            pos++;
+            if(sz==0&&i==63)
+            {
+               /*Code more padding than there is room in the packet*/
+               UNDEFINE_FOR_PARSE
+               ret=oac_packet_parse(packet,2+jj+pos-1,&toc,frames,size,&payload_offset);
+               cfgs++;
+               if(ret!=OAC_INVALID_PACKET)test_failed();
+            }
+            UNDEFINE_FOR_PARSE
+            ret=oac_packet_parse(packet,2+jj+tsz[sz]+i+pos,&toc,frames,size,&payload_offset);
+            cfgs++;
+            if(tsz[sz]+i<1276)
+            {
+               if(ret!=1)test_failed();
+               if(size[0]!=tsz[sz]+i)test_failed();
+               if((toc>>2)!=i)test_failed();
+            } else if (ret!=OAC_INVALID_PACKET)test_failed();
+         }
+      }
+   }
+   fprintf(stdout,"    code 3 padding (%2d cases) ............... OK.\n",cfgs);
+   cfgs_total+=cfgs;
+   fprintf(stdout,"    oac_packet_parse ............................ OK.\n");
+   fprintf(stdout,"                      All packet parsing tests passed\n");
+   fprintf(stdout,"                          (%d API invocations)\n",cfgs_total);
+   return cfgs_total;
+}
+
+/* This is a helper macro for the encoder tests.
+   The encoder api tests all have a pattern of set-must-fail, set-must-fail,
+   set-must-pass, get-and-compare, set-must-pass, get-and-compare. */
+#define CHECK_SETGET(setcall,getcall,badv,badv2,goodv,goodv2,sok,gok) \
+   i=(badv);\
+   if(oac_encoder_ctl(enc,setcall)==OAC_OK)test_failed();\
+   i=(badv2);\
+   if(oac_encoder_ctl(enc,setcall)==OAC_OK)test_failed();\
+   j=i=(goodv);\
+   if(oac_encoder_ctl(enc,setcall)!=OAC_OK)test_failed();\
+   i=-12345;\
+   VG_UNDEF(&i,sizeof(i)); \
+   err=oac_encoder_ctl(enc,getcall);\
+   if(err!=OAC_OK || i!=j)test_failed();\
+   j=i=(goodv2);\
+   if(oac_encoder_ctl(enc,setcall)!=OAC_OK)test_failed();\
+   fprintf(stdout,sok);\
+   i=-12345;\
+   VG_UNDEF(&i,sizeof(i)); \
+   err=oac_encoder_ctl(enc,getcall);\
+   if(err!=OAC_OK || i!=j)test_failed();\
+   fprintf(stdout,gok);\
+   cfgs+=6;
+
+oac_int32 test_enc_api(void)
+{
+   oac_uint32 enc_final_range;
+   OacEncoder *enc;
+   oac_int32 i,j;
+   unsigned char packet[1276];
+#ifndef DISABLE_FLOAT_API
+   float fbuf[960*2];
+#endif
+   short sbuf[960*2];
+   int c,err,cfgs;
+
+   cfgs=0;
+   /*First test invalid configurations which should fail*/
+   fprintf(stdout,"\n  Encoder basic API tests\n");
+   fprintf(stdout,"  ---------------------------------------------------\n");
+   for(c=0;c<4;c++)
+   {
+      i=oac_encoder_get_size(c);
+      if(((c==1||c==2)&&(i<=2048||i>1<<18))||((c!=1&&c!=2)&&i!=0))test_failed();
+      fprintf(stdout,"    oac_encoder_get_size(%d)=%d ...............%s OK.\n",c,i,i>0?"":"....");
+      cfgs++;
+   }
+
+   /*Test with unsupported sample rates, channel counts*/
+   for(c=0;c<4;c++)
+   {
+      for(i=-7;i<=96000;i++)
+      {
+         int fs;
+         if((i==8000||i==12000||i==16000||i==24000||i==48000
+#ifdef ENABLE_QEXT
+               ||i==96000
+#endif
+               )&&(c==1||c==2))continue;
+         switch(i)
+         {
+           case(-5):fs=-8000;break;
+           case(-6):fs=INT32_MAX;break;
+           case(-7):fs=INT32_MIN;break;
+           default:fs=i;
+         }
+         err = OAC_OK;
+         VG_UNDEF(&err,sizeof(err));
+         enc = oac_encoder_create(fs, c, OAC_APPLICATION_VOIP, &err);
+         if(err!=OAC_BAD_ARG || enc!=NULL)test_failed();
+         cfgs++;
+         enc = oac_encoder_create(fs, c, OAC_APPLICATION_VOIP, 0);
+         if(enc!=NULL)test_failed();
+         cfgs++;
+         oac_encoder_destroy(enc);
+         enc=(OacEncoder*)malloc(oac_encoder_get_size(2));
+         if(enc==NULL)test_failed();
+         err = oac_encoder_init(enc, fs, c, OAC_APPLICATION_VOIP);
+         if(err!=OAC_BAD_ARG)test_failed();
+         cfgs++;
+         free(enc);
+      }
+   }
+
+   enc = oac_encoder_create(48000, 2, OAC_AUTO, NULL);
+   if(enc!=NULL)test_failed();
+   cfgs++;
+
+   VG_UNDEF(&err,sizeof(err));
+   enc = oac_encoder_create(48000, 2, OAC_AUTO, &err);
+   if(err!=OAC_BAD_ARG || enc!=NULL)test_failed();
+   cfgs++;
+
+   VG_UNDEF(&err,sizeof(err));
+   enc = oac_encoder_create(48000, 2, OAC_APPLICATION_VOIP, NULL);
+   if(enc==NULL)test_failed();
+   oac_encoder_destroy(enc);
+   cfgs++;
+
+   VG_UNDEF(&err,sizeof(err));
+   enc = oac_encoder_create(48000, 2, OAC_APPLICATION_RESTRICTED_LOWDELAY, &err);
+   if(err!=OAC_OK || enc==NULL)test_failed();
+   cfgs++;
+   err=oac_encoder_ctl(enc,OAC_GET_LOOKAHEAD(&i));
+   if(err!=OAC_OK || i<0 || i>32766)test_failed();
+   cfgs++;
+   oac_encoder_destroy(enc);
+
+   VG_UNDEF(&err,sizeof(err));
+   enc = oac_encoder_create(48000, 2, OAC_APPLICATION_AUDIO, &err);
+   if(err!=OAC_OK || enc==NULL)test_failed();
+   cfgs++;
+   err=oac_encoder_ctl(enc,OAC_GET_LOOKAHEAD(&i));
+   if(err!=OAC_OK || i<0 || i>32766)test_failed();
+   oac_encoder_destroy(enc);
+   cfgs++;
+
+   VG_UNDEF(&err,sizeof(err));
+   enc = oac_encoder_create(48000, 2, OAC_APPLICATION_VOIP, &err);
+   if(err!=OAC_OK || enc==NULL)test_failed();
+   cfgs++;
+
+   fprintf(stdout,"    oac_encoder_create() ........................ OK.\n");
+   fprintf(stdout,"    oac_encoder_init() .......................... OK.\n");
+
+   i=-12345;
+   VG_UNDEF(&i,sizeof(i));
+   err=oac_encoder_ctl(enc,OAC_GET_LOOKAHEAD(&i));
+   if(err!=OAC_OK || i<0 || i>32766)test_failed();
+   cfgs++;
+   err=oac_encoder_ctl(enc,OAC_GET_LOOKAHEAD(null_int_ptr));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   fprintf(stdout,"    OAC_GET_LOOKAHEAD ........................... OK.\n");
+
+   err=oac_encoder_ctl(enc,OAC_GET_SAMPLE_RATE(&i));
+   if(err!=OAC_OK || i!=48000)test_failed();
+   cfgs++;
+   err=oac_encoder_ctl(enc,OAC_GET_SAMPLE_RATE(null_int_ptr));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   fprintf(stdout,"    OAC_GET_SAMPLE_RATE ......................... OK.\n");
+
+   if(oac_encoder_ctl(enc,OAC_UNIMPLEMENTED)!=OAC_UNIMPLEMENTED)test_failed();
+   fprintf(stdout,"    OAC_UNIMPLEMENTED ........................... OK.\n");
+   cfgs++;
+
+   err=oac_encoder_ctl(enc,OAC_GET_APPLICATION(null_int_ptr));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   CHECK_SETGET(OAC_SET_APPLICATION(i),OAC_GET_APPLICATION(&i),-1,OAC_AUTO,
+     OAC_APPLICATION_AUDIO,OAC_APPLICATION_RESTRICTED_LOWDELAY,
+     "    OAC_SET_APPLICATION ......................... OK.\n",
+     "    OAC_GET_APPLICATION ......................... OK.\n")
+
+   err=oac_encoder_ctl(enc,OAC_GET_BITRATE(null_int_ptr));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   if(oac_encoder_ctl(enc,OAC_SET_BITRATE(1073741832))!=OAC_OK)test_failed();
+   cfgs++;
+   VG_UNDEF(&i,sizeof(i));
+   if(oac_encoder_ctl(enc,OAC_GET_BITRATE(&i))!=OAC_OK)test_failed();
+   if(i>1700000||i<256000)test_failed();
+   cfgs++;
+   CHECK_SETGET(OAC_SET_BITRATE(i),OAC_GET_BITRATE(&i),-12345,0,
+     500,256000,
+     "    OAC_SET_BITRATE ............................. OK.\n",
+     "    OAC_GET_BITRATE ............................. OK.\n")
+
+   err=oac_encoder_ctl(enc,OAC_GET_FORCE_CHANNELS(null_int_ptr));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   CHECK_SETGET(OAC_SET_FORCE_CHANNELS(i),OAC_GET_FORCE_CHANNELS(&i),-1,3,
+     1,OAC_AUTO,
+     "    OAC_SET_FORCE_CHANNELS ...................... OK.\n",
+     "    OAC_GET_FORCE_CHANNELS ...................... OK.\n")
+
+   i=-2;
+   if(oac_encoder_ctl(enc,OAC_SET_BANDWIDTH(i))==OAC_OK)test_failed();
+   cfgs++;
+   i=OAC_BANDWIDTH_FULLBAND+1;
+   if(oac_encoder_ctl(enc,OAC_SET_BANDWIDTH(i))==OAC_OK)test_failed();
+   cfgs++;
+   i=OAC_BANDWIDTH_NARROWBAND;
+   if(oac_encoder_ctl(enc,OAC_SET_BANDWIDTH(i))!=OAC_OK)test_failed();
+   cfgs++;
+   i=OAC_BANDWIDTH_FULLBAND;
+   if(oac_encoder_ctl(enc,OAC_SET_BANDWIDTH(i))!=OAC_OK)test_failed();
+   cfgs++;
+   i=OAC_BANDWIDTH_WIDEBAND;
+   if(oac_encoder_ctl(enc,OAC_SET_BANDWIDTH(i))!=OAC_OK)test_failed();
+   cfgs++;
+   i=OAC_BANDWIDTH_MEDIUMBAND;
+   if(oac_encoder_ctl(enc,OAC_SET_BANDWIDTH(i))!=OAC_OK)test_failed();
+   cfgs++;
+   fprintf(stdout,"    OAC_SET_BANDWIDTH ........................... OK.\n");
+   /*We don't test if the bandwidth has actually changed.
+     because the change may be delayed until the encoder is advanced.*/
+   i=-12345;
+   VG_UNDEF(&i,sizeof(i));
+   err=oac_encoder_ctl(enc,OAC_GET_BANDWIDTH(&i));
+   if(err!=OAC_OK || (i!=OAC_BANDWIDTH_NARROWBAND&&
+      i!=OAC_BANDWIDTH_MEDIUMBAND&&i!=OAC_BANDWIDTH_WIDEBAND&&
+      i!=OAC_BANDWIDTH_FULLBAND&&i!=OAC_AUTO))test_failed();
+   cfgs++;
+   if(oac_encoder_ctl(enc,OAC_SET_BANDWIDTH(OAC_AUTO))!=OAC_OK)test_failed();
+   cfgs++;
+   err=oac_encoder_ctl(enc,OAC_GET_BANDWIDTH(null_int_ptr));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   fprintf(stdout,"    OAC_GET_BANDWIDTH ........................... OK.\n");
+
+   i=-2;
+   if(oac_encoder_ctl(enc,OAC_SET_MAX_BANDWIDTH(i))==OAC_OK)test_failed();
+   cfgs++;
+   i=OAC_BANDWIDTH_FULLBAND+1;
+   if(oac_encoder_ctl(enc,OAC_SET_MAX_BANDWIDTH(i))==OAC_OK)test_failed();
+   cfgs++;
+   i=OAC_BANDWIDTH_NARROWBAND;
+   if(oac_encoder_ctl(enc,OAC_SET_MAX_BANDWIDTH(i))!=OAC_OK)test_failed();
+   cfgs++;
+   i=OAC_BANDWIDTH_FULLBAND;
+   if(oac_encoder_ctl(enc,OAC_SET_MAX_BANDWIDTH(i))!=OAC_OK)test_failed();
+   cfgs++;
+   i=OAC_BANDWIDTH_WIDEBAND;
+   if(oac_encoder_ctl(enc,OAC_SET_MAX_BANDWIDTH(i))!=OAC_OK)test_failed();
+   cfgs++;
+   i=OAC_BANDWIDTH_MEDIUMBAND;
+   if(oac_encoder_ctl(enc,OAC_SET_MAX_BANDWIDTH(i))!=OAC_OK)test_failed();
+   cfgs++;
+   fprintf(stdout,"    OAC_SET_MAX_BANDWIDTH ....................... OK.\n");
+   /*We don't test if the bandwidth has actually changed.
+     because the change may be delayed until the encoder is advanced.*/
+   i=-12345;
+   VG_UNDEF(&i,sizeof(i));
+   err=oac_encoder_ctl(enc,OAC_GET_MAX_BANDWIDTH(&i));
+   if(err!=OAC_OK || (i!=OAC_BANDWIDTH_NARROWBAND&&
+      i!=OAC_BANDWIDTH_MEDIUMBAND&&i!=OAC_BANDWIDTH_WIDEBAND&&
+      i!=OAC_BANDWIDTH_FULLBAND))test_failed();
+   cfgs++;
+   err=oac_encoder_ctl(enc,OAC_GET_MAX_BANDWIDTH(null_int_ptr));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   fprintf(stdout,"    OAC_GET_MAX_BANDWIDTH ....................... OK.\n");
+
+   err=oac_encoder_ctl(enc,OAC_GET_DTX(null_int_ptr));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   CHECK_SETGET(OAC_SET_DTX(i),OAC_GET_DTX(&i),-1,2,
+     1,0,
+     "    OAC_SET_DTX ................................. OK.\n",
+     "    OAC_GET_DTX ................................. OK.\n")
+
+   err=oac_encoder_ctl(enc,OAC_GET_COMPLEXITY(null_int_ptr));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   CHECK_SETGET(OAC_SET_COMPLEXITY(i),OAC_GET_COMPLEXITY(&i),-1,11,
+     0,10,
+     "    OAC_SET_COMPLEXITY .......................... OK.\n",
+     "    OAC_GET_COMPLEXITY .......................... OK.\n")
+
+   err=oac_encoder_ctl(enc,OAC_GET_INBAND_FEC(null_int_ptr));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   CHECK_SETGET(OAC_SET_INBAND_FEC(i),OAC_GET_INBAND_FEC(&i),-1,3,
+     1,0,
+     "    OAC_SET_INBAND_FEC .......................... OK.\n",
+     "    OAC_GET_INBAND_FEC .......................... OK.\n")
+
+   err=oac_encoder_ctl(enc,OAC_GET_PACKET_LOSS_PERC(null_int_ptr));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   CHECK_SETGET(OAC_SET_PACKET_LOSS_PERC(i),OAC_GET_PACKET_LOSS_PERC(&i),-1,101,
+     100,0,
+     "    OAC_SET_PACKET_LOSS_PERC .................... OK.\n",
+     "    OAC_GET_PACKET_LOSS_PERC .................... OK.\n")
+
+   err=oac_encoder_ctl(enc,OAC_GET_VBR(null_int_ptr));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   CHECK_SETGET(OAC_SET_VBR(i),OAC_GET_VBR(&i),-1,2,
+     1,0,
+     "    OAC_SET_VBR ................................. OK.\n",
+     "    OAC_GET_VBR ................................. OK.\n")
+
+/*   err=oac_encoder_ctl(enc,OAC_GET_VOICE_RATIO(null_int_ptr));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   CHECK_SETGET(OAC_SET_VOICE_RATIO(i),OAC_GET_VOICE_RATIO(&i),-2,101,
+     0,50,
+     "    OAC_SET_VOICE_RATIO ......................... OK.\n",
+     "    OAC_GET_VOICE_RATIO ......................... OK.\n")*/
+
+   err=oac_encoder_ctl(enc,OAC_GET_VBR_CONSTRAINT(null_int_ptr));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   CHECK_SETGET(OAC_SET_VBR_CONSTRAINT(i),OAC_GET_VBR_CONSTRAINT(&i),-1,2,
+     1,0,
+     "    OAC_SET_VBR_CONSTRAINT ...................... OK.\n",
+     "    OAC_GET_VBR_CONSTRAINT ...................... OK.\n")
+
+   err=oac_encoder_ctl(enc,OAC_GET_SIGNAL(null_int_ptr));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   CHECK_SETGET(OAC_SET_SIGNAL(i),OAC_GET_SIGNAL(&i),-12345,0x7FFFFFFF,
+     OAC_SIGNAL_MUSIC,OAC_AUTO,
+     "    OAC_SET_SIGNAL .............................. OK.\n",
+     "    OAC_GET_SIGNAL .............................. OK.\n")
+
+   err=oac_encoder_ctl(enc,OAC_GET_LSB_DEPTH(null_int_ptr));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   CHECK_SETGET(OAC_SET_LSB_DEPTH(i),OAC_GET_LSB_DEPTH(&i),7,25,16,24,
+     "    OAC_SET_LSB_DEPTH ........................... OK.\n",
+     "    OAC_GET_LSB_DEPTH ........................... OK.\n")
+
+   err=oac_encoder_ctl(enc,OAC_GET_PREDICTION_DISABLED(&i));
+   if(i!=0)test_failed();
+   cfgs++;
+   err=oac_encoder_ctl(enc,OAC_GET_PREDICTION_DISABLED(null_int_ptr));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   CHECK_SETGET(OAC_SET_PREDICTION_DISABLED(i),OAC_GET_PREDICTION_DISABLED(&i),-1,2,1,0,
+     "    OAC_SET_PREDICTION_DISABLED ................. OK.\n",
+     "    OAC_GET_PREDICTION_DISABLED ................. OK.\n")
+
+   err=oac_encoder_ctl(enc,OAC_GET_EXPERT_FRAME_DURATION(null_int_ptr));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   err=oac_encoder_ctl(enc,OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_2_5_MS));
+   if(err!=OAC_OK)test_failed();
+   cfgs++;
+   err=oac_encoder_ctl(enc,OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_5_MS));
+   if(err!=OAC_OK)test_failed();
+   cfgs++;
+   err=oac_encoder_ctl(enc,OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_10_MS));
+   if(err!=OAC_OK)test_failed();
+   cfgs++;
+   err=oac_encoder_ctl(enc,OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_20_MS));
+   if(err!=OAC_OK)test_failed();
+   cfgs++;
+   err=oac_encoder_ctl(enc,OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_40_MS));
+   if(err!=OAC_OK)test_failed();
+   cfgs++;
+   err=oac_encoder_ctl(enc,OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_60_MS));
+   if(err!=OAC_OK)test_failed();
+   cfgs++;
+   err=oac_encoder_ctl(enc,OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_80_MS));
+   if(err!=OAC_OK)test_failed();
+   cfgs++;
+   err=oac_encoder_ctl(enc,OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_100_MS));
+   if(err!=OAC_OK)test_failed();
+   cfgs++;
+   err=oac_encoder_ctl(enc,OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_120_MS));
+   if(err!=OAC_OK)test_failed();
+   cfgs++;
+   CHECK_SETGET(OAC_SET_EXPERT_FRAME_DURATION(i),OAC_GET_EXPERT_FRAME_DURATION(&i),0,-1,
+         OAC_FRAMESIZE_60_MS,OAC_FRAMESIZE_ARG,
+     "    OAC_SET_EXPERT_FRAME_DURATION ............... OK.\n",
+     "    OAC_GET_EXPERT_FRAME_DURATION ............... OK.\n")
+
+   /*OAC_SET_FORCE_MODE is not tested here because it's not a public API, however the encoder tests use it*/
+
+   err=oac_encoder_ctl(enc,OAC_GET_FINAL_RANGE(null_uint_ptr));
+   if(err!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   if(oac_encoder_ctl(enc,OAC_GET_FINAL_RANGE(&enc_final_range))!=OAC_OK)test_failed();
+   cfgs++;
+   fprintf(stdout,"    OAC_GET_FINAL_RANGE ......................... OK.\n");
+
+   /*Reset the encoder*/
+   if(oac_encoder_ctl(enc, OAC_RESET_STATE)!=OAC_OK)test_failed();
+   cfgs++;
+   fprintf(stdout,"    OAC_RESET_STATE ............................. OK.\n");
+
+   memset(sbuf,0,sizeof(short)*2*960);
+   VG_UNDEF(packet,sizeof(packet));
+   i=oac_encode(enc, sbuf, 960, packet, sizeof(packet));
+   if(i<1 || (i>(oac_int32)sizeof(packet)))test_failed();
+   VG_CHECK(packet,i);
+   cfgs++;
+   fprintf(stdout,"    oac_encode() ................................ OK.\n");
+#ifndef DISABLE_FLOAT_API
+   memset(fbuf,0,sizeof(float)*2*960);
+   VG_UNDEF(packet,sizeof(packet));
+   i=oac_encode_float(enc, fbuf, 960, packet, sizeof(packet));
+   if(i<1 || (i>(oac_int32)sizeof(packet)))test_failed();
+   VG_CHECK(packet,i);
+   cfgs++;
+   fprintf(stdout,"    oac_encode_float() .......................... OK.\n");
+#endif
+
+#if 0
+   /*These tests are disabled because the library crashes with null states*/
+   if(oac_encoder_ctl(0,OAC_RESET_STATE)               !=OAC_INVALID_STATE)test_failed();
+   if(oac_encoder_init(0,48000,1,OAC_APPLICATION_VOIP) !=OAC_INVALID_STATE)test_failed();
+   if(oac_encode(0,sbuf,960,packet,sizeof(packet))      !=OAC_INVALID_STATE)test_failed();
+   if(oac_encode_float(0,fbuf,960,packet,sizeof(packet))!=OAC_INVALID_STATE)test_failed();
+#endif
+   oac_encoder_destroy(enc);
+   cfgs++;
+   fprintf(stdout,"                   All encoder interface tests passed\n");
+   fprintf(stdout,"                             (%d API invocations)\n",cfgs);
+   return cfgs;
+}
+
+#define max_out (1276*48+48*2+2)
+int test_repacketizer_api(void)
+{
+   int ret,cfgs,i,j,k;
+   OacRepacketizer *rp;
+   unsigned char *packet;
+   unsigned char *po;
+   cfgs=0;
+   fprintf(stdout,"\n  Repacketizer tests\n");
+   fprintf(stdout,"  ---------------------------------------------------\n");
+
+   packet=(unsigned char *)malloc(max_out);
+   if(packet==NULL)test_failed();
+   memset(packet,0,max_out);
+   po=(unsigned char *)malloc(max_out+256);
+   if(po==NULL)test_failed();
+
+   i=oac_repacketizer_get_size();
+   if(i<=0)test_failed();
+   cfgs++;
+   fprintf(stdout,"    oac_repacketizer_get_size()=%d ............. OK.\n",i);
+
+   rp=(OacRepacketizer*)malloc(i);
+   rp=oac_repacketizer_init(rp);
+   if(rp==NULL)test_failed();
+   cfgs++;
+   free(rp);
+   fprintf(stdout,"    oac_repacketizer_init ....................... OK.\n");
+
+   rp=oac_repacketizer_create();
+   if(rp==NULL)test_failed();
+   cfgs++;
+   fprintf(stdout,"    oac_repacketizer_create ..................... OK.\n");
+
+   if(oac_repacketizer_get_nb_frames(rp)!=0)test_failed();
+   cfgs++;
+   fprintf(stdout,"    oac_repacketizer_get_nb_frames .............. OK.\n");
+
+   /*Length overflows*/
+   VG_UNDEF(packet,4);
+   if(oac_repacketizer_cat(rp,packet,0)!=OAC_INVALID_PACKET)test_failed(); /* Zero len */
+   cfgs++;
+   packet[0]=1;
+   if(oac_repacketizer_cat(rp,packet,2)!=OAC_INVALID_PACKET)test_failed(); /* Odd payload code 1 */
+   cfgs++;
+   packet[0]=2;
+   if(oac_repacketizer_cat(rp,packet,1)!=OAC_INVALID_PACKET)test_failed(); /* Code 2 overflow one */
+   cfgs++;
+   packet[0]=3;
+   if(oac_repacketizer_cat(rp,packet,1)!=OAC_INVALID_PACKET)test_failed(); /* Code 3 no count */
+   cfgs++;
+   packet[0]=2;
+   packet[1]=255;
+   if(oac_repacketizer_cat(rp,packet,2)!=OAC_INVALID_PACKET)test_failed(); /* Code 2 overflow two */
+   cfgs++;
+   packet[0]=2;
+   packet[1]=250;
+   if(oac_repacketizer_cat(rp,packet,251)!=OAC_INVALID_PACKET)test_failed(); /* Code 2 overflow three */
+   cfgs++;
+   packet[0]=3;
+   packet[1]=0;
+   if(oac_repacketizer_cat(rp,packet,2)!=OAC_INVALID_PACKET)test_failed(); /* Code 3 m=0 */
+   cfgs++;
+   packet[1]=49;
+   if(oac_repacketizer_cat(rp,packet,100)!=OAC_INVALID_PACKET)test_failed(); /* Code 3 m=49 */
+   cfgs++;
+   packet[0]=0;
+   if(oac_repacketizer_cat(rp,packet,3)!=OAC_OK)test_failed();
+   cfgs++;
+   packet[0]=1<<2;
+   if(oac_repacketizer_cat(rp,packet,3)!=OAC_INVALID_PACKET)test_failed(); /* Change in TOC */
+   cfgs++;
+
+   /* Code 0,1,3 CBR -> Code 0,1,3 CBR */
+   oac_repacketizer_init(rp);
+   for(j=0;j<32;j++)
+   {
+      /* TOC types, test half with stereo */
+      int maxi;
+      packet[0]=((j<<1)+(j&1))<<2;
+      maxi=960/oac_packet_get_samples_per_frame(packet,8000);
+      for(i=1;i<=maxi;i++)
+      {
+         /* Number of CBR frames in the input packets */
+         int maxp;
+         packet[0]=((j<<1)+(j&1))<<2;
+         if(i>1)packet[0]+=i==2?1:3;
+         packet[1]=i>2?i:0;
+         maxp=960/(i*oac_packet_get_samples_per_frame(packet,8000));
+         for(k=0;k<=(1275+75);k+=3)
+         {
+            /*Payload size*/
+            oac_int32 cnt,rcnt;
+            if(k%i!=0)continue; /* Only testing CBR here, payload must be a multiple of the count */
+            for(cnt=0;cnt<maxp+2;cnt++)
+            {
+               if(cnt>0)
+               {
+                  ret=oac_repacketizer_cat(rp,packet,k+(i>2?2:1));
+                  if((cnt<=maxp&&k<=(1275*i))?ret!=OAC_OK:ret!=OAC_INVALID_PACKET)test_failed();
+                  cfgs++;
+               }
+               rcnt=k<=(1275*i)?(cnt<maxp?cnt:maxp):0;
+               if(oac_repacketizer_get_nb_frames(rp)!=rcnt*i)test_failed();
+               cfgs++;
+               ret=oac_repacketizer_out_range(rp,0,rcnt*i,po,max_out);
+               if(rcnt>0)
+               {
+                  int len;
+                  len=k*rcnt+((rcnt*i)>2?2:1);
+                  if(ret!=len)test_failed();
+                  if((rcnt*i)<2&&(po[0]&3)!=0)test_failed();                      /* Code 0 */
+                  if((rcnt*i)==2&&(po[0]&3)!=1)test_failed();                     /* Code 1 */
+                  if((rcnt*i)>2&&(((po[0]&3)!=3)||(po[1]!=rcnt*i)))test_failed(); /* Code 3 CBR */
+                  cfgs++;
+                  if(oac_repacketizer_out(rp,po,len)!=len)test_failed();
+                  cfgs++;
+                  if(oac_packet_unpad(po,len)!=len)test_failed();
+                  cfgs++;
+                  if(oac_packet_pad(po,len,len+1)!=OAC_OK)test_failed();
+                  cfgs++;
+                  if(oac_packet_pad(po,len+1,len+256)!=OAC_OK)test_failed();
+                  cfgs++;
+                  if(oac_packet_unpad(po,len+256)!=len)test_failed();
+                  cfgs++;
+                  if(oac_multistream_packet_unpad(po,len,1)!=len)test_failed();
+                  cfgs++;
+                  if(oac_multistream_packet_pad(po,len,len+1,1)!=OAC_OK)test_failed();
+                  cfgs++;
+                  if(oac_multistream_packet_pad(po,len+1,len+256,1)!=OAC_OK)test_failed();
+                  cfgs++;
+                  if(oac_multistream_packet_unpad(po,len+256,1)!=len)test_failed();
+                  cfgs++;
+                  if(oac_repacketizer_out(rp,po,len-1)!=OAC_BUFFER_TOO_SMALL)test_failed();
+                  cfgs++;
+                  if(len>1)
+                  {
+                     if(oac_repacketizer_out(rp,po,1)!=OAC_BUFFER_TOO_SMALL)test_failed();
+                     cfgs++;
+                  }
+                  if(oac_repacketizer_out(rp,po,0)!=OAC_BUFFER_TOO_SMALL)test_failed();
+                  cfgs++;
+               } else if (ret!=OAC_BAD_ARG)test_failed();                        /* M must not be 0 */
+            }
+            oac_repacketizer_init(rp);
+         }
+      }
+   }
+
+   /*Change in input count code, CBR out*/
+   oac_repacketizer_init(rp);
+   packet[0]=0;
+   if(oac_repacketizer_cat(rp,packet,5)!=OAC_OK)test_failed();
+   cfgs++;
+   packet[0]+=1;
+   if(oac_repacketizer_cat(rp,packet,9)!=OAC_OK)test_failed();
+   cfgs++;
+   i=oac_repacketizer_out(rp,po,max_out);
+   if((i!=(4+8+2))||((po[0]&3)!=3)||((po[1]&63)!=3)||((po[1]>>7)!=0))test_failed();
+   cfgs++;
+   i=oac_repacketizer_out_range(rp,0,1,po,max_out);
+   if(i!=5||(po[0]&3)!=0)test_failed();
+   cfgs++;
+   i=oac_repacketizer_out_range(rp,1,2,po,max_out);
+   if(i!=5||(po[0]&3)!=0)test_failed();
+   cfgs++;
+
+   /*Change in input count code, VBR out*/
+   oac_repacketizer_init(rp);
+   packet[0]=1;
+   if(oac_repacketizer_cat(rp,packet,9)!=OAC_OK)test_failed();
+   cfgs++;
+   packet[0]=0;
+   if(oac_repacketizer_cat(rp,packet,3)!=OAC_OK)test_failed();
+   cfgs++;
+   i=oac_repacketizer_out(rp,po,max_out);
+   if((i!=(2+8+2+2))||((po[0]&3)!=3)||((po[1]&63)!=3)||((po[1]>>7)!=1))test_failed();
+   cfgs++;
+
+   /*VBR in, VBR out*/
+   oac_repacketizer_init(rp);
+   packet[0]=2;
+   packet[1]=4;
+   if(oac_repacketizer_cat(rp,packet,8)!=OAC_OK)test_failed();
+   cfgs++;
+   if(oac_repacketizer_cat(rp,packet,8)!=OAC_OK)test_failed();
+   cfgs++;
+   i=oac_repacketizer_out(rp,po,max_out);
+   if((i!=(2+1+1+1+4+2+4+2))||((po[0]&3)!=3)||((po[1]&63)!=4)||((po[1]>>7)!=1))test_failed();
+   cfgs++;
+
+   /*VBR in, CBR out*/
+   oac_repacketizer_init(rp);
+   packet[0]=2;
+   packet[1]=4;
+   if(oac_repacketizer_cat(rp,packet,10)!=OAC_OK)test_failed();
+   cfgs++;
+   if(oac_repacketizer_cat(rp,packet,10)!=OAC_OK)test_failed();
+   cfgs++;
+   i=oac_repacketizer_out(rp,po,max_out);
+   if((i!=(2+4+4+4+4))||((po[0]&3)!=3)||((po[1]&63)!=4)||((po[1]>>7)!=0))test_failed();
+   cfgs++;
+
+   /*Count 0 in, VBR out*/
+   for(j=0;j<32;j++)
+   {
+      /* TOC types, test half with stereo */
+      int maxi,sum,rcnt;
+      packet[0]=((j<<1)+(j&1))<<2;
+      maxi=960/oac_packet_get_samples_per_frame(packet,8000);
+      sum=0;
+      rcnt=0;
+      oac_repacketizer_init(rp);
+      for(i=1;i<=maxi+2;i++)
+      {
+         int len;
+         ret=oac_repacketizer_cat(rp,packet,i);
+         if(rcnt<maxi)
+         {
+            if(ret!=OAC_OK)test_failed();
+            rcnt++;
+            sum+=i-1;
+         } else if (ret!=OAC_INVALID_PACKET)test_failed();
+         cfgs++;
+         len=sum+(rcnt<2?1:rcnt<3?2:2+rcnt-1);
+         if(oac_repacketizer_out(rp,po,max_out)!=len)test_failed();
+         if(rcnt>2&&(po[1]&63)!=rcnt)test_failed();
+         if(rcnt==2&&(po[0]&3)!=2)test_failed();
+         if(rcnt==1&&(po[0]&3)!=0)test_failed();
+         cfgs++;
+         if(oac_repacketizer_out(rp,po,len)!=len)test_failed();
+         cfgs++;
+         if(oac_packet_unpad(po,len)!=len)test_failed();
+         cfgs++;
+         if(oac_packet_pad(po,len,len+1)!=OAC_OK)test_failed();
+         cfgs++;
+         if(oac_packet_pad(po,len+1,len+256)!=OAC_OK)test_failed();
+         cfgs++;
+         if(oac_packet_unpad(po,len+256)!=len)test_failed();
+         cfgs++;
+         if(oac_multistream_packet_unpad(po,len,1)!=len)test_failed();
+         cfgs++;
+         if(oac_multistream_packet_pad(po,len,len+1,1)!=OAC_OK)test_failed();
+         cfgs++;
+         if(oac_multistream_packet_pad(po,len+1,len+256,1)!=OAC_OK)test_failed();
+         cfgs++;
+         if(oac_multistream_packet_unpad(po,len+256,1)!=len)test_failed();
+         cfgs++;
+         if(oac_repacketizer_out(rp,po,len-1)!=OAC_BUFFER_TOO_SMALL)test_failed();
+         cfgs++;
+         if(len>1)
+         {
+            if(oac_repacketizer_out(rp,po,1)!=OAC_BUFFER_TOO_SMALL)test_failed();
+            cfgs++;
+         }
+         if(oac_repacketizer_out(rp,po,0)!=OAC_BUFFER_TOO_SMALL)test_failed();
+         cfgs++;
+      }
+   }
+
+   po[0]='O';
+   po[1]='p';
+   if(oac_packet_pad(po,4,4)!=OAC_OK)test_failed();
+   cfgs++;
+   if(oac_multistream_packet_pad(po,4,4,1)!=OAC_OK)test_failed();
+   cfgs++;
+   if(oac_packet_pad(po,4,5)!=OAC_INVALID_PACKET)test_failed();
+   cfgs++;
+   if(oac_multistream_packet_pad(po,4,5,1)!=OAC_INVALID_PACKET)test_failed();
+   cfgs++;
+   if(oac_packet_pad(po,0,5)!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   if(oac_multistream_packet_pad(po,0,5,1)!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   if(oac_packet_unpad(po,0)!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   if(oac_multistream_packet_unpad(po,0,1)!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   if(oac_packet_unpad(po,4)!=OAC_INVALID_PACKET)test_failed();
+   cfgs++;
+   if(oac_multistream_packet_unpad(po,4,1)!=OAC_INVALID_PACKET)test_failed();
+   cfgs++;
+   po[0]=0;
+   po[1]=0;
+   po[2]=0;
+   if(oac_packet_pad(po,5,4)!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+   if(oac_multistream_packet_pad(po,5,4,1)!=OAC_BAD_ARG)test_failed();
+   cfgs++;
+
+   fprintf(stdout,"    oac_repacketizer_cat ........................ OK.\n");
+   fprintf(stdout,"    oac_repacketizer_out ........................ OK.\n");
+   fprintf(stdout,"    oac_repacketizer_out_range .................. OK.\n");
+   fprintf(stdout,"    oac_packet_pad .............................. OK.\n");
+   fprintf(stdout,"    oac_packet_unpad ............................ OK.\n");
+   fprintf(stdout,"    oac_multistream_packet_pad .................. OK.\n");
+   fprintf(stdout,"    oac_multistream_packet_unpad ................ OK.\n");
+
+   oac_repacketizer_destroy(rp);
+   cfgs++;
+   free(packet);
+   free(po);
+   fprintf(stdout,"                        All repacketizer tests passed\n");
+   fprintf(stdout,"                            (%7d API invocations)\n",cfgs);
+
+   return cfgs;
+}
+
+#ifdef MALLOC_FAIL
+/* GLIBC 2.14 declares __malloc_hook as deprecated, generating a warning
+ * under GCC. However, this is the cleanest way to test malloc failure
+ * handling in our codebase, and the lack of thread safety isn't an
+ * issue here. We therefore disable the warning for this function.
+ */
+#if OAC_GNUC_PREREQ(4,6)
+/* Save the current warning settings */
+#pragma GCC diagnostic push
+#endif
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
+typedef void *(*mhook)(size_t __size, __const void *);
+#endif
+
+int test_malloc_fail(void)
+{
+#ifdef MALLOC_FAIL
+   OacDecoder *dec;
+   OacEncoder *enc;
+   OacRepacketizer *rp;
+   unsigned char mapping[256] = {0,1};
+   OacMSDecoder *msdec;
+   OacMSEncoder *msenc;
+   int rate,c,app,cfgs,err,useerr;
+   int *ep;
+   mhook orig_malloc;
+   cfgs=0;
+#endif
+   fprintf(stdout,"\n  malloc() failure tests\n");
+   fprintf(stdout,"  ---------------------------------------------------\n");
+#ifdef MALLOC_FAIL
+   orig_malloc=__malloc_hook;
+   __malloc_hook=malloc_hook;
+   ep=(int *)oac_alloc(sizeof(int));
+   if(ep!=NULL)
+   {
+      if(ep)free(ep);
+      __malloc_hook=orig_malloc;
+#endif
+      fprintf(stdout,"    oac_decoder_create() ................... SKIPPED.\n");
+      fprintf(stdout,"    oac_encoder_create() ................... SKIPPED.\n");
+      fprintf(stdout,"    oac_repacketizer_create() .............. SKIPPED.\n");
+      fprintf(stdout,"    oac_multistream_decoder_create() ....... SKIPPED.\n");
+      fprintf(stdout,"    oac_multistream_encoder_create() ....... SKIPPED.\n");
+      fprintf(stdout,"(Test only supported with GLIBC and without valgrind)\n");
+      return 0;
+#ifdef MALLOC_FAIL
+   }
+   for(useerr=0;useerr<2;useerr++)
+   {
+      ep=useerr?&err:0;
+      for(rate=0;rate<5;rate++)
+      {
+        for(c=1;c<3;c++)
+        {
+           err=1;
+           if(useerr)
+           {
+              VG_UNDEF(&err,sizeof(err));
+           }
+           dec=oac_decoder_create(oac_rates[rate], c, ep);
+           if(dec!=NULL||(useerr&&err!=OAC_ALLOC_FAIL))
+           {
+              __malloc_hook=orig_malloc;
+              test_failed();
+           }
+           cfgs++;
+           msdec=oac_multistream_decoder_create(oac_rates[rate], c, 1, c-1, mapping, ep);
+           if(msdec!=NULL||(useerr&&err!=OAC_ALLOC_FAIL))
+           {
+              __malloc_hook=orig_malloc;
+              test_failed();
+           }
+           cfgs++;
+           for(app=0;app<3;app++)
+           {
+              if(useerr)
+              {
+                 VG_UNDEF(&err,sizeof(err));
+              }
+              enc=oac_encoder_create(oac_rates[rate], c, oac_apps[app],ep);
+              if(enc!=NULL||(useerr&&err!=OAC_ALLOC_FAIL))
+              {
+                 __malloc_hook=orig_malloc;
+                 test_failed();
+              }
+              cfgs++;
+              msenc=oac_multistream_encoder_create(oac_rates[rate], c, 1, c-1, mapping, oac_apps[app],ep);
+              if(msenc!=NULL||(useerr&&err!=OAC_ALLOC_FAIL))
+              {
+                 __malloc_hook=orig_malloc;
+                 test_failed();
+              }
+              cfgs++;
+           }
+        }
+     }
+   }
+   rp=oac_repacketizer_create();
+   if(rp!=NULL)
+   {
+      __malloc_hook=orig_malloc;
+      test_failed();
+   }
+   cfgs++;
+   __malloc_hook=orig_malloc;
+   fprintf(stdout,"    oac_decoder_create() ........................ OK.\n");
+   fprintf(stdout,"    oac_encoder_create() ........................ OK.\n");
+   fprintf(stdout,"    oac_repacketizer_create() ................... OK.\n");
+   fprintf(stdout,"    oac_multistream_decoder_create() ............ OK.\n");
+   fprintf(stdout,"    oac_multistream_encoder_create() ............ OK.\n");
+   fprintf(stdout,"                      All malloc failure tests passed\n");
+   fprintf(stdout,"                                 (%2d API invocations)\n",cfgs);
+   return cfgs;
+#endif
+}
+
+#ifdef MALLOC_FAIL
+#if __GNUC_PREREQ(4,6)
+#pragma GCC diagnostic pop /* restore -Wdeprecated-declarations */
+#endif
+#endif
+
+int main(int _argc, char **_argv)
+{
+   oac_int32 total;
+   const char * oversion;
+   if(_argc>1)
+   {
+      fprintf(stderr,"Usage: %s\n",_argv[0]);
+      return 1;
+   }
+   iseed=0;
+
+   oversion=oac_get_version_string();
+   if(!oversion)test_failed();
+   fprintf(stderr,"Testing the %s API deterministically\n", oversion);
+   if(oac_strerror(-32768)==NULL)test_failed();
+   if(oac_strerror(32767)==NULL)test_failed();
+   if(strlen(oac_strerror(0))<1)test_failed();
+   total=4;
+
+   total+=test_dec_api();
+   total+=test_msdec_api();
+   total+=test_parse();
+   total+=test_enc_api();
+   total+=test_repacketizer_api();
+   total+=test_malloc_fail();
+
+   fprintf(stderr,"\nAll API tests passed.\nThe liboac API was invoked %d times.\n",total);
+
+   return 0;
+}
diff --git a/tests/test_opus_common.h b/tests/test_oac_common.h
similarity index 86%
rename from tests/test_opus_common.h
rename to tests/test_oac_common.h
index c200a8923..6437b186e 100644
--- a/tests/test_opus_common.h
+++ b/tests/test_oac_common.h
@@ -25,7 +25,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-static OPUS_INLINE void deb2_impl(unsigned char *_t,unsigned char **_p,int _k,int _x,int _y)
+static OAC_INLINE void deb2_impl(unsigned char *_t,unsigned char **_p,int _k,int _x,int _y)
 {
   int i;
   if(_x>2){
@@ -41,7 +41,7 @@ static OPUS_INLINE void deb2_impl(unsigned char *_t,unsigned char **_p,int _k,in
 }
 
 /*Generates a De Bruijn sequence (k,2) with length k^2*/
-static OPUS_INLINE void debruijn2(int _k, unsigned char *_res)
+static OAC_INLINE void debruijn2(int _k, unsigned char *_res)
 {
    unsigned char *p;
    unsigned char *t;
@@ -53,27 +53,27 @@ static OPUS_INLINE void debruijn2(int _k, unsigned char *_res)
 }
 
 /*MWC RNG of George Marsaglia*/
-static opus_uint32 Rz, Rw;
-static OPUS_INLINE opus_uint32 fast_rand(void)
+static oac_uint32 Rz, Rw;
+static OAC_INLINE oac_uint32 fast_rand(void)
 {
   Rz=36969*(Rz&65535)+(Rz>>16);
   Rw=18000*(Rw&65535)+(Rw>>16);
   return (Rz<<16)+Rw;
 }
-static opus_uint32 iseed;
+static oac_uint32 iseed;
 
 #ifdef __GNUC__
 __attribute__((noreturn))
 #elif defined(_MSC_VER)
 __declspec(noreturn)
 #endif
-static OPUS_INLINE void _test_failed(const char *file, int line)
+static OAC_INLINE void _test_failed(const char *file, int line)
 {
   fprintf(stderr,"\n ***************************************************\n");
   fprintf(stderr," ***         A fatal error was detected.         ***\n");
   fprintf(stderr," ***************************************************\n");
   fprintf(stderr,"Please report this failure and include\n");
-  fprintf(stderr,"'make check SEED=%u fails %s at line %d for %s'\n",iseed,file,line,opus_get_version_string());
+  fprintf(stderr,"'make check SEED=%u fails %s at line %d for %s'\n",iseed,file,line,oac_get_version_string());
   fprintf(stderr,"and any relevant details about your system.\n\n");
 #if defined(_MSC_VER)
    _set_abort_behavior( 0, _WRITE_ABORT_MSG);
@@ -81,6 +81,6 @@ static OPUS_INLINE void _test_failed(const char *file, int line)
   abort();
 }
 #define test_failed() _test_failed(__FILE__, __LINE__);
-#define opus_test_assert(cond) {if (!(cond)) {test_failed();}}
+#define oac_test_assert(cond) {if (!(cond)) {test_failed();}}
 #define expect_true(cond, msg) {if (!(cond)) {fprintf(stderr, "FAIL - %s\n", msg); test_failed();}}
 void regression_test(void);
diff --git a/tests/test_opus_custom.c b/tests/test_oac_custom.c
similarity index 72%
rename from tests/test_opus_custom.c
rename to tests/test_oac_custom.c
index 6331dab6c..8c149cf5e 100644
--- a/tests/test_opus_custom.c
+++ b/tests/test_oac_custom.c
@@ -2,9 +2,9 @@
 #include "config.h"
 #endif
 
-/* FIXME: Is there a better way to get access to opus_custom_decoder_get_size()? */
-#ifdef OPUS_BUILD
-#undef OPUS_BUILD
+/* FIXME: Is there a better way to get access to oac_custom_decoder_get_size()? */
+#ifdef OAC_BUILD
+#undef OAC_BUILD
 #endif
 
 #include <stdio.h>
@@ -19,10 +19,10 @@
 #include <process.h>
 #define getpid _getpid
 #endif
-#include "opus_multistream.h"
-#include "opus.h"
-#include "../src/opus_private.h"
-#include "test_opus_common.h"
+#include "oac_multistream.h"
+#include "oac.h"
+#include "../src/oac_private.h"
+#include "test_oac_common.h"
 
 #define MAX_PACKET (1500)
 #define PI (3.141592653589793238462643)
@@ -35,7 +35,7 @@
 typedef struct {
    void* encoder;
    void* decoder;
-   OpusCustomMode *mode;
+   OacCustomMode *mode;
    int sample_rate;
    int num_channels;
    int frame_size;
@@ -58,7 +58,7 @@ void* generate_sine_sweep(double amplitude, int bit_depth, int sample_rate, int
    void *output_buffer;
    int bytes_per_sample;
    /* Calculate the maximum sample value based on bit depth. */
-   opus_int32 max_sample_value = (1L << (bit_depth - 1)) - 1;
+   oac_int32 max_sample_value = (1L << (bit_depth - 1)) - 1;
 
    num_samples = (int)floor(.5f + duration_seconds * sample_rate);
 
@@ -93,16 +93,16 @@ void* generate_sine_sweep(double amplitude, int bit_depth, int sample_rate, int
       else {
          /* Scale and convert to the appropriate integer type based on bit depth */
          if (bit_depth == 16) {
-            opus_int16* output = (opus_int16*)output_buffer;
-            output[i * channels] = (opus_int16)floor(.5f + sample * max_sample_value);
+            oac_int16* output = (oac_int16*)output_buffer;
+            output[i * channels] = (oac_int16)floor(.5f + sample * max_sample_value);
             if (channels == 2) {
                output[i * channels + 1] = output[i * channels];
             }
          }
          else if (bit_depth == 24) {
             /* Assuming 24-bit samples are stored in 32-bit integers. */
-            opus_int32* output = (opus_int32*)output_buffer;
-            output[i * channels] = (opus_int32)floor(.5f + sample * max_sample_value);
+            oac_int32* output = (oac_int32*)output_buffer;
+            output[i * channels] = (oac_int32)floor(.5f + sample * max_sample_value);
             if (channels == 2) {
                output[i * channels + 1] = output[i * channels];
             }
@@ -118,12 +118,12 @@ int test_encode(TestCustomParams params) {
    int samp_count = 0;
    void *inbuf;
    void *outbuf;
-   OpusEncoder* enc = NULL;
-   OpusDecoder* dec = NULL;
-   OpusDecoder* dec_copy = NULL;
-   OpusCustomEncoder* encC = NULL;
-   OpusCustomDecoder* decC = NULL;
-   OpusCustomDecoder* decC_copy = NULL;
+   OacEncoder* enc = NULL;
+   OacDecoder* dec = NULL;
+   OacDecoder* dec_copy = NULL;
+   OacCustomEncoder* encC = NULL;
+   OacCustomDecoder* decC = NULL;
+   OacCustomDecoder* decC_copy = NULL;
    unsigned char packet[MAX_PACKET+257];
    unsigned char packet_corrupt[MAX_PACKET+257];
    int len;
@@ -152,25 +152,25 @@ int test_encode(TestCustomParams params) {
        outbuf = malloc(input_samples*num_channels*sizeof(float));
    }
    else {
-       outbuf = malloc(input_samples*num_channels*sizeof(opus_int16));
+       outbuf = malloc(input_samples*num_channels*sizeof(oac_int16));
    }
 
    if (params.custom_encode) {
-      encC = (OpusCustomEncoder*)params.encoder;
+      encC = (OacCustomEncoder*)params.encoder;
    }
    else {
-      enc = (OpusEncoder*)params.encoder;
+      enc = (OacEncoder*)params.encoder;
    }
 
    if (params.custom_decode) {
-      int size = opus_custom_decoder_get_size(params.mode, params.num_channels);
-      decC = (OpusCustomDecoder*)params.decoder;
+      int size = oac_custom_decoder_get_size(params.mode, params.num_channels);
+      decC = (OacCustomDecoder*)params.decoder;
       decC_copy = malloc(size);
       memcpy(decC_copy, decC, size);
    }
    else {
-      int size = opus_decoder_get_size(params.num_channels);
-      dec = (OpusDecoder*)params.decoder;
+      int size = oac_decoder_get_size(params.num_channels);
+      dec = (OacDecoder*)params.decoder;
       dec_copy = malloc(size);
       memcpy(dec_copy, dec, size);
    }
@@ -181,25 +181,25 @@ int test_encode(TestCustomParams params) {
       if (params.float_encode) {
          float* input = (float*)inbuf;
          if (params.custom_encode) {
-            len = opus_custom_encode_float(encC,
+            len = oac_custom_encode_float(encC,
                                            &input[samp_count*num_channels],
                                            frame_size,
                                            packet,
                                            MAX_PACKET);
             if (len <= 0) {
-                fprintf(stderr, "opus_custom_encode_float() failed: %s\n", opus_strerror(len));
+                fprintf(stderr, "oac_custom_encode_float() failed: %s\n", oac_strerror(len));
                 ret = -1;
                 break;
             }
          }
          else {
-            len = opus_encode_float(enc,
+            len = oac_encode_float(enc,
                                     &input[samp_count*num_channels],
                                     frame_size,
                                     packet,
                                     MAX_PACKET);
             if (len <= 0) {
-                fprintf(stderr, "opus_encode_float() failed: %s\n", opus_strerror(len));
+                fprintf(stderr, "oac_encode_float() failed: %s\n", oac_strerror(len));
                 ret = -1;
                 break;
             }
@@ -209,27 +209,27 @@ int test_encode(TestCustomParams params) {
       {
          if (params.custom_encode) {
             if (params.encoder_bit_depth == 24) {
-               opus_int32* input = (opus_int32*)inbuf;
-               len = opus_custom_encode24(encC,
+               oac_int32* input = (oac_int32*)inbuf;
+               len = oac_custom_encode24(encC,
                                           &input[samp_count*num_channels],
                                           frame_size,
                                           packet,
                                           MAX_PACKET);
                if (len <= 0) {
-                  fprintf(stderr, "opus_custom_encode24() failed: %s\n", opus_strerror(len));
+                  fprintf(stderr, "oac_custom_encode24() failed: %s\n", oac_strerror(len));
                   ret = -1;
                   break;
                }
             }
             else {
-               opus_int16* input = (opus_int16*)inbuf;
-               len = opus_custom_encode(encC,
+               oac_int16* input = (oac_int16*)inbuf;
+               len = oac_custom_encode(encC,
                                         &input[samp_count*num_channels],
                                         frame_size,
                                         packet,
                                         MAX_PACKET);
                if (len <= 0) {
-                  fprintf(stderr, "opus_custom_encode() failed: %s\n", opus_strerror(len));
+                  fprintf(stderr, "oac_custom_encode() failed: %s\n", oac_strerror(len));
                   ret = -1;
                   break;
                }
@@ -237,27 +237,27 @@ int test_encode(TestCustomParams params) {
          }
          else {
             if (params.encoder_bit_depth == 24) {
-               opus_int32* input = (opus_int32*)inbuf;
-               len = opus_encode24(enc,
+               oac_int32* input = (oac_int32*)inbuf;
+               len = oac_encode24(enc,
                                    &input[samp_count*num_channels],
                                    frame_size,
                                    packet,
                                    MAX_PACKET);
                if (len <= 0) {
-                  fprintf(stderr, "opus_encode24() failed: %s\n", opus_strerror(len));
+                  fprintf(stderr, "oac_encode24() failed: %s\n", oac_strerror(len));
                   ret = -1;
                   break;
                }
             }
             else {
-               opus_int16* input = (opus_int16*)inbuf;
-               len = opus_encode(enc,
+               oac_int16* input = (oac_int16*)inbuf;
+               len = oac_encode(enc,
                                  &input[samp_count*num_channels],
                                  frame_size,
                                  packet,
                                  MAX_PACKET);
                if (len <= 0) {
-                   fprintf(stderr, "opus_encode() failed: %s\n", opus_strerror(len));
+                   fprintf(stderr, "oac_encode() failed: %s\n", oac_strerror(len));
                    ret = -1;
                    break;
                }
@@ -271,7 +271,7 @@ int test_encode(TestCustomParams params) {
          int len2;
          /* Draw the inverse bit error rate from an exponential distribution. */
          int ber_1 = 1 - 100*log(1e-10 + fast_rand()/4294967296.);
-         opus_int16 scratch[1920*6];
+         oac_int16 scratch[1920*6];
          memcpy(packet_corrupt, packet, sizeof(packet));
          /* Randomly flip the 5 first bytes. */
          for (error_pos=0;error_pos<5;error_pos++) {
@@ -289,24 +289,24 @@ int test_encode(TestCustomParams params) {
             packet_corrupt[error_pos/8] ^= (1<<(error_pos&7));
          }
          if (params.custom_decode) {
-            int error = opus_custom_decode(decC_copy,
+            int error = oac_custom_decode(decC_copy,
                   packet_corrupt,
                   len2,
                   scratch,
                   frame_size);
-            if (!(error > 0 || error == OPUS_BAD_ARG || error == OPUS_INVALID_PACKET || error == OPUS_BUFFER_TOO_SMALL)) {
-               fprintf(stderr, "opus_custom_decode() with corrupt stream failed with: %s\n", opus_strerror(error));
+            if (!(error > 0 || error == OAC_BAD_ARG || error == OAC_INVALID_PACKET || error == OAC_BUFFER_TOO_SMALL)) {
+               fprintf(stderr, "oac_custom_decode() with corrupt stream failed with: %s\n", oac_strerror(error));
                test_failed();
             }
          } else {
-            int error = opus_decode(dec_copy,
+            int error = oac_decode(dec_copy,
                   packet_corrupt,
                   len2,
                   scratch,
                   frame_size,
                   0);
-            if (!(error > 0 || error == OPUS_BAD_ARG || error == OPUS_INVALID_PACKET || error == OPUS_BUFFER_TOO_SMALL)) {
-               fprintf(stderr, "opus_custom_decode() with corrupt stream failed with: %s\n", opus_strerror(error));
+            if (!(error > 0 || error == OAC_BAD_ARG || error == OAC_INVALID_PACKET || error == OAC_BUFFER_TOO_SMALL)) {
+               fprintf(stderr, "oac_custom_decode() with corrupt stream failed with: %s\n", oac_strerror(error));
                test_failed();
             }
          }
@@ -315,27 +315,27 @@ int test_encode(TestCustomParams params) {
       if (params.float_decode) {
          float* output = (float*)outbuf;
          if (params.custom_decode) {
-            samples_decoded = opus_custom_decode_float(decC,
+            samples_decoded = oac_custom_decode_float(decC,
                                                        packet,
                                                        len,
                                                        &output[samp_count*num_channels],
                                                        frame_size);
             if (samples_decoded != frame_size) {
-                fprintf(stderr, "opus_custom_decode_float() returned %d\n", samples_decoded);
+                fprintf(stderr, "oac_custom_decode_float() returned %d\n", samples_decoded);
                 ret = -1;
                 break;
             }
 
          }
          else {
-            samples_decoded = opus_decode_float(dec,
+            samples_decoded = oac_decode_float(dec,
                                                 packet,
                                                 len,
                                                 &output[samp_count*num_channels],
                                                 frame_size,
                                                 0);
             if (samples_decoded != frame_size) {
-                fprintf(stderr, "opus_decode_float() returned %d\n", samples_decoded);
+                fprintf(stderr, "oac_decode_float() returned %d\n", samples_decoded);
                 ret = -1;
                 break;
             }
@@ -345,29 +345,29 @@ int test_encode(TestCustomParams params) {
       {
          if (params.custom_decode) {
             if (params.decoder_bit_depth == 24) {
-               opus_int32* output = (opus_int32*)outbuf;
-               samples_decoded = opus_custom_decode24(decC,
+               oac_int32* output = (oac_int32*)outbuf;
+               samples_decoded = oac_custom_decode24(decC,
                                                       packet,
                                                       len,
                                                       &output[samp_count*num_channels],
                                                       frame_size);
 
                if (samples_decoded != frame_size) {
-                  fprintf(stderr, "opus_custom_decode24() returned %d\n", samples_decoded);
+                  fprintf(stderr, "oac_custom_decode24() returned %d\n", samples_decoded);
                   ret = -1;
                   break;
                }
             }
             else {
-               opus_int16* output = (opus_int16*)outbuf;
-               samples_decoded = opus_custom_decode(decC,
+               oac_int16* output = (oac_int16*)outbuf;
+               samples_decoded = oac_custom_decode(decC,
                                                     packet,
                                                     len,
                                                     &output[samp_count*num_channels],
                                                     frame_size);
 
                if (samples_decoded != frame_size) {
-                  fprintf(stderr, "opus_custom_decode() returned %d\n", samples_decoded);
+                  fprintf(stderr, "oac_custom_decode() returned %d\n", samples_decoded);
                   ret = -1;
                   break;
                }
@@ -375,8 +375,8 @@ int test_encode(TestCustomParams params) {
          }
          else {
             if (params.decoder_bit_depth == 24) {
-               opus_int32* output = (opus_int32*)outbuf;
-               samples_decoded = opus_decode24(dec,
+               oac_int32* output = (oac_int32*)outbuf;
+               samples_decoded = oac_decode24(dec,
                                                packet,
                                                len,
                                                &output[samp_count*num_channels],
@@ -384,21 +384,21 @@ int test_encode(TestCustomParams params) {
                                                0);
 
                if (samples_decoded != frame_size) {
-                  fprintf(stderr, "opus_decode24() returned %d\n", samples_decoded);
+                  fprintf(stderr, "oac_decode24() returned %d\n", samples_decoded);
                   ret = -1;
                   break;
                }
             }
             else {
-               opus_int16* output = (opus_int16*)outbuf;
-               samples_decoded = opus_decode(dec,
+               oac_int16* output = (oac_int16*)outbuf;
+               samples_decoded = oac_decode(dec,
                                              packet,
                                              len,
                                              &output[samp_count*num_channels],
                                              frame_size,
                                              0);
                if (samples_decoded != frame_size) {
-                   fprintf(stderr, "opus_decode() returned %d\n", samples_decoded);
+                   fprintf(stderr, "oac_decode() returned %d\n", samples_decoded);
                    ret = -1;
                    break;
                }
@@ -410,7 +410,7 @@ int test_encode(TestCustomParams params) {
    } while (samp_count + frame_size <= input_samples);
 
 #ifdef RESYNTH
-   /* Resynth only works with OpusCustom encoder. Also, we don't enable it if there's
+   /* Resynth only works with OacCustom encoder. Also, we don't enable it if there's
       a 16-bit bottleneck in the decoder that can cause clipping. */
    if (params.custom_encode && (params.custom_decode || params.decoder_bit_depth > 16)) {
       if (params.float_encode) {
@@ -422,8 +422,8 @@ int test_encode(TestCustomParams params) {
          rmsd = sqrt(rmsd/(num_channels*samp_count));
       }
       else if (params.decoder_bit_depth == 24) {
-         opus_int32* input = (opus_int32*)inbuf;
-         opus_int32* output = (opus_int32*)outbuf;
+         oac_int32* input = (oac_int32*)inbuf;
+         oac_int32* output = (oac_int32*)outbuf;
          for (i = 0; i < samp_count * num_channels; i++) {
             rmsd += (input[i]-output[i])*(double)(input[i]-output[i]);
          }
@@ -431,8 +431,8 @@ int test_encode(TestCustomParams params) {
          rmsd /= 8388608;
       }
       else {
-         opus_int16* input = (opus_int16*)inbuf;
-         opus_int16* output = (opus_int16*)outbuf;
+         oac_int16* input = (oac_int16*)inbuf;
+         oac_int16* output = (oac_int16*)outbuf;
          for (i = 0; i < samp_count * num_channels; i++) {
             rmsd += (input[i]-output[i])*(double)(input[i]-output[i]);
          }
@@ -459,12 +459,12 @@ int test_encode(TestCustomParams params) {
    return ret;
 }
 
-void test_opus_custom(const int num_encoders, const int num_setting_changes) {
-   OpusCustomMode* mode = NULL;
-   OpusCustomEncoder* encC = NULL;
-   OpusCustomDecoder* decC = NULL;
-   OpusEncoder* enc = NULL;
-   OpusDecoder* dec = NULL;
+void test_oac_custom(const int num_encoders, const int num_setting_changes) {
+   OacCustomMode* mode = NULL;
+   OacCustomEncoder* encC = NULL;
+   OacCustomDecoder* decC = NULL;
+   OacEncoder* enc = NULL;
+   OacDecoder* dec = NULL;
    int i, j, err;
    TestCustomParams params = {0};
 
@@ -479,7 +479,7 @@ void test_opus_custom(const int num_encoders, const int num_setting_changes) {
 #endif
          };
    int channels[2] = { 1, 2 };
-   int bitrates[10] = { 6000, 12000, 16000, 24000, 32000, 48000, 64000, 96000, 510000, OPUS_BITRATE_MAX };
+   int bitrates[10] = { 6000, 12000, 16000, 24000, 32000, 48000, 64000, 96000, 510000, OAC_BITRATE_MAX };
    int use_vbr[3] = { 0, 1, 1 };
    int vbr_constraints[3] = { 0, 1, 1 };
    int complexities[11] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
@@ -500,12 +500,12 @@ void test_opus_custom(const int num_encoders, const int num_setting_changes) {
       params.sample_rate = RAND_SAMPLE(sampling_rates);
       params.custom_encode = 1;
       params.custom_decode = 1;
-      /* Can only mix and match Opus and OpusCustom with 48kHz (and optionally 96 kHz). */
+      /* Can only mix and match Oac and OacCustom with 48kHz (and optionally 96 kHz). */
       if (params.sample_rate == 48000 || params.sample_rate == 96000) {
          params.custom_encode = RAND_SAMPLE(use_custom_encode);
          params.custom_decode = RAND_SAMPLE(use_custom_decode);
 
-         /* No point in testing this as OpusCustom isn't involved */
+         /* No point in testing this as OacCustom isn't involved */
          if (!(params.custom_encode || params.custom_decode))
             continue;
       }
@@ -513,15 +513,15 @@ void test_opus_custom(const int num_encoders, const int num_setting_changes) {
       frame_size_ms_x2 = RAND_SAMPLE(frame_sizes_ms_x2);
       params.frame_size = frame_size_ms_x2 * params.sample_rate / 2000;
 
-      /* OpusCustom isn't supporting this case at the moment (frame < 40) */
+      /* OacCustom isn't supporting this case at the moment (frame < 40) */
       if ((params.sample_rate == 8000 || params.sample_rate == 12000) && frame_size_ms_x2 == 5)
          continue;
 
       if (params.custom_encode || params.custom_decode) {
-         mode = opus_custom_mode_create(params.sample_rate, params.frame_size, &err);
-         if (err != OPUS_OK || mode == NULL) {
+         mode = oac_custom_mode_create(params.sample_rate, params.frame_size, &err);
+         if (err != OAC_OK || mode == NULL) {
             fprintf(stderr,
-                    "test_opus_custom error: %d kHz, %d ch, "
+                    "test_oac_custom error: %d kHz, %d ch, "
                     "custom_encode: %d, custom_decode: %d, (%d/2) ms\n",
                     params.sample_rate / 1000, params.num_channels,
                     params.custom_encode, params.custom_decode, frame_size_ms_x2);
@@ -533,10 +533,10 @@ void test_opus_custom(const int num_encoders, const int num_setting_changes) {
       }
 
       if (params.custom_decode) {
-         decC = opus_custom_decoder_create(mode, params.num_channels, &err);
-         if (err != OPUS_OK || decC == NULL) {
+         decC = oac_custom_decoder_create(mode, params.num_channels, &err);
+         if (err != OAC_OK || decC == NULL) {
             fprintf(stderr,
-                    "test_opus_custom error: %d kHz, %d ch, "
+                    "test_oac_custom error: %d kHz, %d ch, "
                     "custom_encode: %d, custom_decode: %d, (%d/2) ms\n",
                     params.sample_rate / 1000, params.num_channels,
                     params.custom_encode, params.custom_decode, frame_size_ms_x2);
@@ -545,10 +545,10 @@ void test_opus_custom(const int num_encoders, const int num_setting_changes) {
          params.decoder = (void*)decC;
       }
       else {
-         dec = opus_decoder_create(params.sample_rate, params.num_channels, &err);
-         if (err != OPUS_OK || dec == NULL) {
+         dec = oac_decoder_create(params.sample_rate, params.num_channels, &err);
+         if (err != OAC_OK || dec == NULL) {
             fprintf(stderr,
-                    "test_opus_custom error: %d kHz, %d ch, "
+                    "test_oac_custom error: %d kHz, %d ch, "
                     "custom_encode: %d, custom_decode: %d, (%d/2) ms\n",
                     params.sample_rate / 1000, params.num_channels,
                     params.custom_encode, params.custom_decode, frame_size_ms_x2);
@@ -558,10 +558,10 @@ void test_opus_custom(const int num_encoders, const int num_setting_changes) {
       }
 
       if (params.custom_encode) {
-         encC = opus_custom_encoder_create(mode, params.num_channels, &err);
-         if (err != OPUS_OK || encC == NULL) {
+         encC = oac_custom_encoder_create(mode, params.num_channels, &err);
+         if (err != OAC_OK || encC == NULL) {
             fprintf(stderr,
-                    "test_opus_custom error: %d kHz, %d ch, "
+                    "test_oac_custom error: %d kHz, %d ch, "
                     "custom_encode: %d, custom_decode: %d, (%d/2) ms\n",
                     params.sample_rate / 1000, params.num_channels,
                     params.custom_encode, params.custom_decode, frame_size_ms_x2);
@@ -570,10 +570,10 @@ void test_opus_custom(const int num_encoders, const int num_setting_changes) {
          params.encoder = (void*)encC;
       }
       else {
-         enc = opus_encoder_create(params.sample_rate, params.num_channels, OPUS_APPLICATION_RESTRICTED_LOWDELAY, &err);
-         if (err != OPUS_OK || enc == NULL) {
+         enc = oac_encoder_create(params.sample_rate, params.num_channels, OAC_APPLICATION_RESTRICTED_LOWDELAY, &err);
+         if (err != OAC_OK || enc == NULL) {
             fprintf(stderr,
-                    "test_opus_custom error: %d kHz, %d ch, "
+                    "test_oac_custom error: %d kHz, %d ch, "
                     "custom_encode: %d, custom_decode: %d, (%d/2) ms\n",
                     params.sample_rate / 1000, params.num_channels,
                     params.custom_encode, params.custom_decode, frame_size_ms_x2);
@@ -608,23 +608,23 @@ void test_opus_custom(const int num_encoders, const int num_setting_changes) {
 #endif
 
          if (params.custom_encode) {
-            if (opus_custom_encoder_ctl(encC, OPUS_SET_BITRATE(bitrate)) != OPUS_OK) test_failed();
-            if (opus_custom_encoder_ctl(encC, OPUS_SET_VBR(vbr)) != OPUS_OK) test_failed();
-            if (opus_custom_encoder_ctl(encC, OPUS_SET_VBR_CONSTRAINT(vbr_constraint)) != OPUS_OK) test_failed();
-            if (opus_custom_encoder_ctl(encC, OPUS_SET_COMPLEXITY(complexity)) != OPUS_OK) test_failed();
-            if (opus_custom_encoder_ctl(encC, OPUS_SET_PACKET_LOSS_PERC(pkt_loss)) != OPUS_OK) test_failed();
-            if (opus_custom_encoder_ctl(encC, OPUS_SET_LSB_DEPTH(lsb_depth)) != OPUS_OK) test_failed();
+            if (oac_custom_encoder_ctl(encC, OAC_SET_BITRATE(bitrate)) != OAC_OK) test_failed();
+            if (oac_custom_encoder_ctl(encC, OAC_SET_VBR(vbr)) != OAC_OK) test_failed();
+            if (oac_custom_encoder_ctl(encC, OAC_SET_VBR_CONSTRAINT(vbr_constraint)) != OAC_OK) test_failed();
+            if (oac_custom_encoder_ctl(encC, OAC_SET_COMPLEXITY(complexity)) != OAC_OK) test_failed();
+            if (oac_custom_encoder_ctl(encC, OAC_SET_PACKET_LOSS_PERC(pkt_loss)) != OAC_OK) test_failed();
+            if (oac_custom_encoder_ctl(encC, OAC_SET_LSB_DEPTH(lsb_depth)) != OAC_OK) test_failed();
          }
          else {
-            if (opus_encoder_ctl(enc, OPUS_SET_BITRATE(bitrate)) != OPUS_OK) test_failed();
-            if (opus_encoder_ctl(enc, OPUS_SET_VBR(vbr)) != OPUS_OK) test_failed();
-            if (opus_encoder_ctl(enc, OPUS_SET_VBR_CONSTRAINT(vbr_constraint)) != OPUS_OK) test_failed();
-            if (opus_encoder_ctl(enc, OPUS_SET_COMPLEXITY(complexity)) != OPUS_OK) test_failed();
-            if (opus_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(pkt_loss)) != OPUS_OK) test_failed();
-            if (opus_encoder_ctl(enc, OPUS_SET_LSB_DEPTH(lsb_depth)) != OPUS_OK) test_failed();
+            if (oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrate)) != OAC_OK) test_failed();
+            if (oac_encoder_ctl(enc, OAC_SET_VBR(vbr)) != OAC_OK) test_failed();
+            if (oac_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(vbr_constraint)) != OAC_OK) test_failed();
+            if (oac_encoder_ctl(enc, OAC_SET_COMPLEXITY(complexity)) != OAC_OK) test_failed();
+            if (oac_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(pkt_loss)) != OAC_OK) test_failed();
+            if (oac_encoder_ctl(enc, OAC_SET_LSB_DEPTH(lsb_depth)) != OAC_OK) test_failed();
          }
          fprintf(stderr,
-                 "test_opus_custom: %d kHz, %d ch, float_encode: %d, float_decode: %d, "
+                 "test_oac_custom: %d kHz, %d ch, float_encode: %d, float_decode: %d, "
                  "encoder_bit_depth: %d, "
                  "decoder_bit_depth: %d, "
                  "custom_encode: %d, custom_decode: %d, %d bps, vbr: %d, vbr constraint: %d, complexity: %d, "
@@ -635,7 +635,7 @@ void test_opus_custom(const int num_encoders, const int num_setting_changes) {
                  pkt_loss, lsb_depth, frame_size_ms_x2);
          if (test_encode(params)) {
             fprintf(stderr,
-                    "test_opus_custom error: %d kHz, %d ch, float_encode: %d, float_decode: %d, "
+                    "test_oac_custom error: %d kHz, %d ch, float_encode: %d, float_decode: %d, "
                     "encoder_bit_depth: %d, "
                     "decoder_bit_depth: %d, "
                     "custom_encode: %d, custom_decode: %d, %d bps, vbr: %d, vbr constraint: %d, complexity: %d, "
@@ -649,19 +649,19 @@ void test_opus_custom(const int num_encoders, const int num_setting_changes) {
       }
 
       if (params.custom_encode || params.custom_decode) {
-         opus_custom_mode_destroy(mode);
+         oac_custom_mode_destroy(mode);
       }
       if (params.custom_decode) {
-         opus_custom_decoder_destroy(decC);
+         oac_custom_decoder_destroy(decC);
       }
       else {
-         opus_decoder_destroy(dec);
+         oac_decoder_destroy(dec);
       }
       if (params.custom_encode) {
-         opus_custom_encoder_destroy(encC);
+         oac_custom_encoder_destroy(encC);
       }
       else {
-         opus_encoder_destroy(enc);
+         oac_encoder_destroy(enc);
       }
    }
 }
@@ -685,18 +685,18 @@ int main(int _argc, char **_argv) {
       iseed=atoi(env_seed);
       env_used=1;
    }
-   else iseed=(opus_uint32)time(NULL)^(((opus_uint32)getpid()&65535)<<16);
+   else iseed=(oac_uint32)time(NULL)^(((oac_uint32)getpid()&65535)<<16);
    Rw=Rz=iseed;
 
    fprintf(stderr,"Testing extensions. Random seed: %u (%.4X)\n", iseed, fast_rand() % 65535);
    if(env_used)fprintf(stderr,"  Random seed set from the environment (SEED=%s).\n", env_seed);
 
-   fprintf(stderr,"Testing various Opus/OpusCustom combinations "
+   fprintf(stderr,"Testing various Oac/OacCustom combinations "
 #ifdef RESYNTH
            "with RMS validation "
 #endif
            "across %d encoder(s) and %d setting change(s) each.\n", num_encoders_to_fuzz, num_setting_changes);
-   test_opus_custom(num_encoders_to_fuzz, num_setting_changes);
+   test_oac_custom(num_encoders_to_fuzz, num_setting_changes);
 
    fprintf(stderr,"Tests completed successfully.\n");
 
diff --git a/tests/test_opus_decode.c b/tests/test_oac_decode.c
similarity index 64%
rename from tests/test_opus_decode.c
rename to tests/test_oac_decode.c
index aaf2ee2b6..ea4ae94ed 100644
--- a/tests/test_opus_decode.c
+++ b/tests/test_oac_decode.c
@@ -42,23 +42,23 @@
 #include <process.h>
 #define getpid _getpid
 #endif
-#include "opus.h"
-#include "test_opus_common.h"
+#include "oac.h"
+#include "test_oac_common.h"
 
 #define MAX_PACKET (1500)
 #define MAX_FRAME_SAMP (5760)
 
 int test_decoder_code0(int no_fuzz)
 {
-   static const opus_int32 fsv[5]={48000,24000,16000,12000,8000};
+   static const oac_int32 fsv[5]={48000,24000,16000,12000,8000};
    int err,skip,plen;
    int out_samples,fec;
    int t;
-   opus_int32 i;
-   OpusDecoder *dec[5*2];
-   opus_int32 decsize;
-   OpusDecoder *decbak;
-   opus_uint32 dec_final_range1,dec_final_range2,dec_final_acc;
+   oac_int32 i;
+   OacDecoder *dec[5*2];
+   oac_int32 decsize;
+   OacDecoder *decbak;
+   oac_uint32 dec_final_range1,dec_final_range2,dec_final_acc;
    unsigned char *packet;
    unsigned char modes[4096];
    short *outbuf_int;
@@ -78,25 +78,25 @@ int test_decoder_code0(int no_fuzz)
    {
       int fs=fsv[t>>1];
       int c=(t&1)+1;
-      err=OPUS_INTERNAL_ERROR;
-      dec[t] = opus_decoder_create(fs, c, &err);
-      if(err!=OPUS_OK || dec[t]==NULL)test_failed();
-      fprintf(stdout,"    opus_decoder_create(%5d,%d) OK. Copy ",fs,c);
+      err=OAC_INTERNAL_ERROR;
+      dec[t] = oac_decoder_create(fs, c, &err);
+      if(err!=OAC_OK || dec[t]==NULL)test_failed();
+      fprintf(stdout,"    oac_decoder_create(%5d,%d) OK. Copy ",fs,c);
       {
-         OpusDecoder *dec2;
-         /*The opus state structures contain no pointers and can be freely copied*/
-         dec2=(OpusDecoder *)malloc(opus_decoder_get_size(c));
+         OacDecoder *dec2;
+         /*The oac state structures contain no pointers and can be freely copied*/
+         dec2=(OacDecoder *)malloc(oac_decoder_get_size(c));
          if(dec2==NULL)test_failed();
-         memcpy(dec2,dec[t],opus_decoder_get_size(c));
-         memset(dec[t],255,opus_decoder_get_size(c));
-         opus_decoder_destroy(dec[t]);
+         memcpy(dec2,dec[t],oac_decoder_get_size(c));
+         memset(dec[t],255,oac_decoder_get_size(c));
+         oac_decoder_destroy(dec[t]);
          printf("OK.\n");
          dec[t]=dec2;
       }
    }
 
-   decsize=opus_decoder_get_size(1);
-   decbak=(OpusDecoder *)malloc(decsize);
+   decsize=oac_decoder_get_size(1);
+   decbak=(OacDecoder *)malloc(decsize);
    if(decbak==NULL)test_failed();
 
    for(t=0;t<5*2;t++)
@@ -104,65 +104,65 @@ int test_decoder_code0(int no_fuzz)
       int factor=48000/fsv[t>>1];
       for(fec=0;fec<2;fec++)
       {
-         opus_int32 dur;
+         oac_int32 dur;
 #if defined(ENABLE_OSCE) || defined(ENABLE_DEEP_PLC)
-         opus_decoder_ctl(dec[t], OPUS_SET_COMPLEXITY(fast_rand()%11));
+         oac_decoder_ctl(dec[t], OAC_SET_COMPLEXITY(fast_rand()%11));
 #endif
          /*Test PLC on a fresh decoder*/
-         out_samples = opus_decode(dec[t], 0, 0, outbuf, 120/factor, fec);
+         out_samples = oac_decode(dec[t], 0, 0, outbuf, 120/factor, fec);
          if(out_samples!=120/factor)test_failed();
-         if(opus_decoder_ctl(dec[t], OPUS_GET_LAST_PACKET_DURATION(&dur))!=OPUS_OK)test_failed();
+         if(oac_decoder_ctl(dec[t], OAC_GET_LAST_PACKET_DURATION(&dur))!=OAC_OK)test_failed();
          if(dur!=120/factor)test_failed();
 
          /*Test on a size which isn't a multiple of 2.5ms*/
-         out_samples = opus_decode(dec[t], 0, 0, outbuf, 120/factor+2, fec);
-         if(out_samples!=OPUS_BAD_ARG)test_failed();
+         out_samples = oac_decode(dec[t], 0, 0, outbuf, 120/factor+2, fec);
+         if(out_samples!=OAC_BAD_ARG)test_failed();
 
          /*Test null pointer input*/
-         out_samples = opus_decode(dec[t], 0, -1, outbuf, 120/factor, fec);
+         out_samples = oac_decode(dec[t], 0, -1, outbuf, 120/factor, fec);
          if(out_samples!=120/factor)test_failed();
-         out_samples = opus_decode(dec[t], 0, 1, outbuf, 120/factor, fec);
+         out_samples = oac_decode(dec[t], 0, 1, outbuf, 120/factor, fec);
          if(out_samples!=120/factor)test_failed();
-         out_samples = opus_decode(dec[t], 0, 10, outbuf, 120/factor, fec);
+         out_samples = oac_decode(dec[t], 0, 10, outbuf, 120/factor, fec);
          if(out_samples!=120/factor)test_failed();
-         out_samples = opus_decode(dec[t], 0, fast_rand(), outbuf, 120/factor, fec);
+         out_samples = oac_decode(dec[t], 0, fast_rand(), outbuf, 120/factor, fec);
          if(out_samples!=120/factor)test_failed();
-         if(opus_decoder_ctl(dec[t], OPUS_GET_LAST_PACKET_DURATION(&dur))!=OPUS_OK)test_failed();
+         if(oac_decoder_ctl(dec[t], OAC_GET_LAST_PACKET_DURATION(&dur))!=OAC_OK)test_failed();
          if(dur!=120/factor)test_failed();
 
          /*Zero lengths*/
-         out_samples = opus_decode(dec[t], packet, 0, outbuf, 120/factor, fec);
+         out_samples = oac_decode(dec[t], packet, 0, outbuf, 120/factor, fec);
          if(out_samples!=120/factor)test_failed();
 
          /*Zero buffer*/
          outbuf[0]=32749;
-         out_samples = opus_decode(dec[t], packet, 0, outbuf, 0, fec);
+         out_samples = oac_decode(dec[t], packet, 0, outbuf, 0, fec);
          if(out_samples>0)test_failed();
-#if !defined(OPUS_BUILD) && (OPUS_GNUC_PREREQ(4, 6) || (defined(__clang_major__) && __clang_major__ >= 3))
+#if !defined(OAC_BUILD) && (OAC_GNUC_PREREQ(4, 6) || (defined(__clang_major__) && __clang_major__ >= 3))
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wnonnull"
 #endif
-         out_samples = opus_decode(dec[t], packet, 0, 0, 0, fec);
-#if !defined(OPUS_BUILD) && (OPUS_GNUC_PREREQ(4, 6) || (defined(__clang_major__) && __clang_major__ >= 3))
+         out_samples = oac_decode(dec[t], packet, 0, 0, 0, fec);
+#if !defined(OAC_BUILD) && (OAC_GNUC_PREREQ(4, 6) || (defined(__clang_major__) && __clang_major__ >= 3))
 #pragma GCC diagnostic pop
 #endif
          if(out_samples>0)test_failed();
          if(outbuf[0]!=32749)test_failed();
 
          /*Invalid lengths*/
-         out_samples = opus_decode(dec[t], packet, -1, outbuf, MAX_FRAME_SAMP, fec);
+         out_samples = oac_decode(dec[t], packet, -1, outbuf, MAX_FRAME_SAMP, fec);
          if(out_samples>=0)test_failed();
-         out_samples = opus_decode(dec[t], packet, INT_MIN, outbuf, MAX_FRAME_SAMP, fec);
+         out_samples = oac_decode(dec[t], packet, INT_MIN, outbuf, MAX_FRAME_SAMP, fec);
          if(out_samples>=0)test_failed();
-         out_samples = opus_decode(dec[t], packet, -1, outbuf, -1, fec);
+         out_samples = oac_decode(dec[t], packet, -1, outbuf, -1, fec);
          if(out_samples>=0)test_failed();
 
          /*Crazy FEC values*/
-         out_samples = opus_decode(dec[t], packet, 1, outbuf, MAX_FRAME_SAMP, fec?-1:2);
+         out_samples = oac_decode(dec[t], packet, 1, outbuf, MAX_FRAME_SAMP, fec?-1:2);
          if(out_samples>=0)test_failed();
 
          /*Reset the decoder*/
-         if(opus_decoder_ctl(dec[t], OPUS_RESET_STATE)!=OPUS_OK)test_failed();
+         if(oac_decoder_ctl(dec[t], OAC_RESET_STATE)!=OAC_OK)test_failed();
       }
    }
    fprintf(stdout,"  dec[all] initial frame PLC OK.\n");
@@ -170,16 +170,16 @@ int test_decoder_code0(int no_fuzz)
    /*Count code 0 tests*/
    for(i=0;i<64;i++)
    {
-      opus_int32 dur;
+      oac_int32 dur;
       int j,expected[5*2];
       packet[0]=i<<2;
       packet[1]=255;
       packet[2]=255;
-      err=opus_packet_get_nb_channels(packet);
+      err=oac_packet_get_nb_channels(packet);
       if(err!=(i&1)+1)test_failed();
 
       for(t=0;t<5*2;t++){
-         expected[t]=opus_decoder_get_nb_samples(dec[t],packet,1);
+         expected[t]=oac_decoder_get_nb_samples(dec[t],packet,1);
          if(expected[t]>2880)test_failed();
       }
 
@@ -189,13 +189,13 @@ int test_decoder_code0(int no_fuzz)
          for(t=0;t<5*2;t++)
          {
 #if defined(ENABLE_OSCE) || defined(ENABLE_DEEP_PLC)
-            opus_decoder_ctl(dec[t], OPUS_SET_COMPLEXITY(fast_rand()%11));
+            oac_decoder_ctl(dec[t], OAC_SET_COMPLEXITY(fast_rand()%11));
 #endif
-            out_samples = opus_decode(dec[t], packet, 3, outbuf, MAX_FRAME_SAMP, 0);
+            out_samples = oac_decode(dec[t], packet, 3, outbuf, MAX_FRAME_SAMP, 0);
             if(out_samples!=expected[t])test_failed();
-            if(opus_decoder_ctl(dec[t], OPUS_GET_LAST_PACKET_DURATION(&dur))!=OPUS_OK)test_failed();
+            if(oac_decoder_ctl(dec[t], OAC_GET_LAST_PACKET_DURATION(&dur))!=OAC_OK)test_failed();
             if(dur!=out_samples)test_failed();
-            opus_decoder_ctl(dec[t], OPUS_GET_FINAL_RANGE(&dec_final_range1));
+            oac_decoder_ctl(dec[t], OAC_GET_FINAL_RANGE(&dec_final_range1));
             if(t==0)dec_final_range2=dec_final_range1;
             else if(dec_final_range1!=dec_final_range2)test_failed();
          }
@@ -207,23 +207,23 @@ int test_decoder_code0(int no_fuzz)
          for(j=0;j<6;j++)
          {
 #if defined(ENABLE_OSCE) || defined(ENABLE_DEEP_PLC)
-            opus_decoder_ctl(dec[t], OPUS_SET_COMPLEXITY(fast_rand()%11));
+            oac_decoder_ctl(dec[t], OAC_SET_COMPLEXITY(fast_rand()%11));
 #endif
-            out_samples = opus_decode(dec[t], 0, 0, outbuf, expected[t], 0);
+            out_samples = oac_decode(dec[t], 0, 0, outbuf, expected[t], 0);
             if(out_samples!=expected[t])test_failed();
-            if(opus_decoder_ctl(dec[t], OPUS_GET_LAST_PACKET_DURATION(&dur))!=OPUS_OK)test_failed();
+            if(oac_decoder_ctl(dec[t], OAC_GET_LAST_PACKET_DURATION(&dur))!=OAC_OK)test_failed();
             if(dur!=out_samples)test_failed();
          }
          /* Run the PLC once at 2.5ms, as a simulation of someone trying to
             do small drift corrections. */
          if(expected[t]!=120/factor)
          {
-            out_samples = opus_decode(dec[t], 0, 0, outbuf, 120/factor, 0);
+            out_samples = oac_decode(dec[t], 0, 0, outbuf, 120/factor, 0);
             if(out_samples!=120/factor)test_failed();
-            if(opus_decoder_ctl(dec[t], OPUS_GET_LAST_PACKET_DURATION(&dur))!=OPUS_OK)test_failed();
+            if(oac_decoder_ctl(dec[t], OAC_GET_LAST_PACKET_DURATION(&dur))!=OAC_OK)test_failed();
             if(dur!=out_samples)test_failed();
          }
-         out_samples = opus_decode(dec[t], packet, 2, outbuf, expected[t]-1, 0);
+         out_samples = oac_decode(dec[t], packet, 2, outbuf, expected[t]-1, 0);
          if(out_samples>0)test_failed();
       }
    }
@@ -233,7 +233,7 @@ int test_decoder_code0(int no_fuzz)
    {
       fprintf(stdout,"  Skipping many tests which fuzz the decoder as requested.\n");
       free(decbak);
-      for(t=0;t<5*2;t++)opus_decoder_destroy(dec[t]);
+      for(t=0;t<5*2;t++)oac_decoder_destroy(dec[t]);
       printf("  Decoders stopped.\n");
 
       err=0;
@@ -250,8 +250,8 @@ int test_decoder_code0(int no_fuzz)
      /*We only test a subset of the modes here simply because the longer
        durations end up taking a long time.*/
       static const int cmodes[4]={16,20,24,28};
-      static const opus_uint32 cres[4]={116290185,2172123586u,2172123586u,2172123586u};
-      static const opus_uint32 lres[3]={3285687739u,1481572662,694350475};
+      static const oac_uint32 cres[4]={116290185,2172123586u,2172123586u,2172123586u};
+      static const oac_uint32 lres[3]={3285687739u,1481572662,694350475};
       static const int lmodes[3]={0,4,8};
       int mode=fast_rand()%4;
 
@@ -265,9 +265,9 @@ int test_decoder_code0(int no_fuzz)
          packet[1]=i>>8;
          packet[2]=i&255;
          packet[3]=255;
-         out_samples = opus_decode(dec[t], packet, 4, outbuf, MAX_FRAME_SAMP, 0);
+         out_samples = oac_decode(dec[t], packet, 4, outbuf, MAX_FRAME_SAMP, 0);
          if(out_samples!=120/factor)test_failed();
-         opus_decoder_ctl(dec[t], OPUS_GET_FINAL_RANGE(&dec_final_range1));
+         oac_decoder_ctl(dec[t], OAC_GET_FINAL_RANGE(&dec_final_range1));
          dec_final_acc+=dec_final_range1;
       }
       if(dec_final_acc!=cres[mode])test_failed();
@@ -283,9 +283,9 @@ int test_decoder_code0(int no_fuzz)
          packet[1]=i>>8;
          packet[2]=i&255;
          packet[3]=255;
-         out_samples = opus_decode(dec[t], packet, 4, outbuf, MAX_FRAME_SAMP, 0);
+         out_samples = oac_decode(dec[t], packet, 4, outbuf, MAX_FRAME_SAMP, 0);
          if(out_samples!=480/factor)test_failed();
-         opus_decoder_ctl(dec[t], OPUS_GET_FINAL_RANGE(&dec_final_range1));
+         oac_decoder_ctl(dec[t], OAC_GET_FINAL_RANGE(&dec_final_range1));
          dec_final_acc+=dec_final_range1;
       }
       if(dec_final_acc!=lres[mode])test_failed();
@@ -297,7 +297,7 @@ int test_decoder_code0(int no_fuzz)
    {
       int j,expected[5*2];
       packet[0]=i<<2;
-      for(t=0;t<5*2;t++)expected[t]=opus_decoder_get_nb_samples(dec[t],packet,1);
+      for(t=0;t<5*2;t++)expected[t]=oac_decoder_get_nb_samples(dec[t],packet,1);
       for(j=2+skip;j<1275;j+=4)
       {
          int jj;
@@ -305,11 +305,11 @@ int test_decoder_code0(int no_fuzz)
          for(t=0;t<5*2;t++)
          {
 #if defined(ENABLE_OSCE) || defined(ENABLE_DEEP_PLC)
-            opus_decoder_ctl(dec[t], OPUS_SET_COMPLEXITY(fast_rand()%11));
+            oac_decoder_ctl(dec[t], OAC_SET_COMPLEXITY(fast_rand()%11));
 #endif
-            out_samples = opus_decode(dec[t], packet, j+1, outbuf, MAX_FRAME_SAMP, 0);
+            out_samples = oac_decode(dec[t], packet, j+1, outbuf, MAX_FRAME_SAMP, 0);
             if(out_samples!=expected[t])test_failed();
-            opus_decoder_ctl(dec[t], OPUS_GET_FINAL_RANGE(&dec_final_range1));
+            oac_decoder_ctl(dec[t], OAC_GET_FINAL_RANGE(&dec_final_range1));
             if(t==0)dec_final_range2=dec_final_range1;
             else if(dec_final_range1!=dec_final_range2)test_failed();
          }
@@ -323,25 +323,25 @@ int test_decoder_code0(int no_fuzz)
    {
       int j,expected[5*2];
       packet[0]=modes[i]<<2;
-      for(t=0;t<5*2;t++)expected[t]=opus_decoder_get_nb_samples(dec[t],packet,plen);
+      for(t=0;t<5*2;t++)expected[t]=oac_decoder_get_nb_samples(dec[t],packet,plen);
       for(j=0;j<plen;j++)packet[j+1]=(fast_rand()|fast_rand())&255;
       memcpy(decbak,dec[0],decsize);
-      if(opus_decode(decbak, packet, plen+1, outbuf, expected[0], 1)!=expected[0])test_failed();
+      if(oac_decode(decbak, packet, plen+1, outbuf, expected[0], 1)!=expected[0])test_failed();
       memcpy(decbak,dec[0],decsize);
-      if(opus_decode(decbak,  0, 0, outbuf, MAX_FRAME_SAMP, 1)<20)test_failed();
+      if(oac_decode(decbak,  0, 0, outbuf, MAX_FRAME_SAMP, 1)<20)test_failed();
       memcpy(decbak,dec[0],decsize);
-      if(opus_decode(decbak,  0, 0, outbuf, MAX_FRAME_SAMP, 0)<20)test_failed();
+      if(oac_decode(decbak,  0, 0, outbuf, MAX_FRAME_SAMP, 0)<20)test_failed();
       for(t=0;t<5*2;t++)
       {
-         opus_int32 dur;
+         oac_int32 dur;
 #if defined(ENABLE_OSCE) || defined(ENABLE_DEEP_PLC)
-         opus_decoder_ctl(dec[t], OPUS_SET_COMPLEXITY(fast_rand()%11));
+         oac_decoder_ctl(dec[t], OAC_SET_COMPLEXITY(fast_rand()%11));
 #endif
-         out_samples = opus_decode(dec[t], packet, plen+1, outbuf, MAX_FRAME_SAMP, 0);
+         out_samples = oac_decode(dec[t], packet, plen+1, outbuf, MAX_FRAME_SAMP, 0);
          if(out_samples!=expected[t])test_failed();
          if(t==0)dec_final_range2=dec_final_range1;
          else if(dec_final_range1!=dec_final_range2)test_failed();
-         if(opus_decoder_ctl(dec[t], OPUS_GET_LAST_PACKET_DURATION(&dur))!=OPUS_OK)test_failed();
+         if(oac_decoder_ctl(dec[t], OAC_GET_LAST_PACKET_DURATION(&dur))!=OAC_OK)test_failed();
          if(dur!=out_samples)test_failed();
       }
    }
@@ -353,14 +353,14 @@ int test_decoder_code0(int no_fuzz)
    {
       int count,j,expected;
       packet[0]=modes[i]<<2;
-      expected=opus_decoder_get_nb_samples(dec[t],packet,plen);
+      expected=oac_decoder_get_nb_samples(dec[t],packet,plen);
       for(count=0;count<10;count++)
       {
 #if defined(ENABLE_OSCE) || defined(ENABLE_DEEP_PLC)
-         opus_decoder_ctl(dec[t], OPUS_SET_COMPLEXITY(fast_rand()%11));
+         oac_decoder_ctl(dec[t], OAC_SET_COMPLEXITY(fast_rand()%11));
 #endif
          for(j=0;j<plen;j++)packet[j+1]=(fast_rand()|fast_rand())&255;
-         out_samples = opus_decode(dec[t], packet, plen+1, outbuf, MAX_FRAME_SAMP, 0);
+         out_samples = oac_decode(dec[t], packet, plen+1, outbuf, MAX_FRAME_SAMP, 0);
          if(out_samples!=expected)test_failed();
       }
    }
@@ -368,9 +368,9 @@ int test_decoder_code0(int no_fuzz)
 
    {
       int tmodes[1]={25<<2};
-      opus_uint32 tseeds[1]={140441};
+      oac_uint32 tseeds[1]={140441};
       int tlen[1]={157};
-      opus_int32 tret[1]={480};
+      oac_int32 tret[1]={480};
       t=fast_rand()&1;
       for(i=0;i<1;i++)
       {
@@ -378,14 +378,14 @@ int test_decoder_code0(int no_fuzz)
          packet[0]=tmodes[i];
          Rw=Rz=tseeds[i];
          for(j=1;j<tlen[i];j++)packet[j]=fast_rand()&255;
-         out_samples=opus_decode(dec[t], packet, tlen[i], outbuf, MAX_FRAME_SAMP, 0);
+         out_samples=oac_decode(dec[t], packet, tlen[i], outbuf, MAX_FRAME_SAMP, 0);
          if(out_samples!=tret[i])test_failed();
       }
       fprintf(stdout,"  dec[%3d] pre-selected random packets OK.\n",t);
    }
 
    free(decbak);
-   for(t=0;t<5*2;t++)opus_decoder_destroy(dec[t]);
+   for(t=0;t<5*2;t++)oac_decoder_destroy(dec[t]);
    printf("  Decoders stopped.\n");
 
    err=0;
@@ -404,14 +404,14 @@ void test_soft_clip(void)
    int i,j;
    float x[1024];
    float s[8] = {0, 0, 0, 0, 0, 0, 0, 0};
-   fprintf(stdout,"  Testing opus_pcm_soft_clip... ");
+   fprintf(stdout,"  Testing oac_pcm_soft_clip... ");
    for(i=0;i<1024;i++)
    {
       for (j=0;j<1024;j++)
       {
         x[j]=(j&255)*(1/32.f)-4.f;
       }
-      opus_pcm_soft_clip(&x[i],1024-i,1,s);
+      oac_pcm_soft_clip(&x[i],1024-i,1,s);
       for (j=i;j<1024;j++)
       {
         if(x[j]>1.f)test_failed();
@@ -424,19 +424,19 @@ void test_soft_clip(void)
       {
         x[j]=(j&255)*(1/32.f)-4.f;
       }
-      opus_pcm_soft_clip(x,1024/i,i,s);
+      oac_pcm_soft_clip(x,1024/i,i,s);
       for (j=0;j<(1024/i)*i;j++)
       {
         if(x[j]>1.f)test_failed();
         if(x[j]<-1.f)test_failed();
       }
    }
-   opus_pcm_soft_clip(x,0,1,s);
-   opus_pcm_soft_clip(x,1,0,s);
-   opus_pcm_soft_clip(x,1,1,0);
-   opus_pcm_soft_clip(x,1,-1,s);
-   opus_pcm_soft_clip(x,-1,1,s);
-   opus_pcm_soft_clip(0,1,1,s);
+   oac_pcm_soft_clip(x,0,1,s);
+   oac_pcm_soft_clip(x,1,0,s);
+   oac_pcm_soft_clip(x,1,1,0);
+   oac_pcm_soft_clip(x,1,-1,s);
+   oac_pcm_soft_clip(x,-1,1,s);
+   oac_pcm_soft_clip(0,1,1,s);
    printf("OK.\n");
 }
 #endif
@@ -461,18 +461,18 @@ int main(int _argc, char **_argv)
       iseed=atoi(env_seed);
       env_used=1;
    }
-   else iseed=(opus_uint32)time(NULL)^(((opus_uint32)getpid()&65535)<<16);
+   else iseed=(oac_uint32)time(NULL)^(((oac_uint32)getpid()&65535)<<16);
    Rw=Rz=iseed;
 
-   oversion=opus_get_version_string();
+   oversion=oac_get_version_string();
    if(!oversion)test_failed();
    fprintf(stderr,"Testing %s decoder. Random seed: %u (%.4X)\n", oversion, iseed, fast_rand() % 65535);
    if(env_used)fprintf(stderr,"  Random seed set from the environment (SEED=%s).\n", env_seed);
 
-   /*Setting TEST_OPUS_NOFUZZ tells the tool not to send garbage data
+   /*Setting TEST_OAC_NOFUZZ tells the tool not to send garbage data
      into the decoders. This is helpful because garbage data
      may cause the decoders to clip, which angers CLANG IOC.*/
-   test_decoder_code0(getenv("TEST_OPUS_NOFUZZ")!=NULL);
+   test_decoder_code0(getenv("TEST_OAC_NOFUZZ")!=NULL);
 #ifndef DISABLE_FLOAT_API
    test_soft_clip();
 #endif
diff --git a/tests/test_opus_dred.c b/tests/test_oac_dred.c
similarity index 79%
rename from tests/test_opus_dred.c
rename to tests/test_oac_dred.c
index 432b84a39..67fbaa8ff 100644
--- a/tests/test_opus_dred.c
+++ b/tests/test_oac_dred.c
@@ -42,8 +42,8 @@
 
 /* including sources directly to test internal APIs */
 #define CELT_C /* to make celt_assert work */
-#include "opus.h"
-#include "test_opus_common.h"
+#include "oac.h"
+#include "test_oac_common.h"
 
 
 
@@ -55,12 +55,12 @@ void test_random_dred(void)
 {
    int error;
    int i;
-   OpusDREDDecoder *dred_dec;
-   OpusDRED *dred;
-   dred_dec = opus_dred_decoder_create(&error);
-   expect_true(error == OPUS_OK, "opus_dred_decoder_create() failed");
-   dred = opus_dred_alloc(&error);
-   expect_true(error == OPUS_OK, "opus_dred_create() failed");
+   OacDREDDecoder *dred_dec;
+   OacDRED *dred;
+   dred_dec = oac_dred_decoder_create(&error);
+   expect_true(error == OAC_OK, "oac_dred_decoder_create() failed");
+   dred = oac_dred_alloc(&error);
+   expect_true(error == OAC_OK, "oac_dred_create() failed");
    for (i=0;i<NB_RANDOM_EXTENSIONS;i++)
    {
       unsigned char payload[MAX_EXTENSION_SIZE];
@@ -71,16 +71,16 @@ void test_random_dred(void)
       len = fast_rand()%(MAX_EXTENSION_SIZE+1);
       for (j=0;j<len;j++)
          payload[j] = fast_rand()&0xFF;
-      res1 = opus_dred_parse(dred_dec, dred, payload, len, 48000, 48000, &dred_end, fast_rand()&0x1);
+      res1 = oac_dred_parse(dred_dec, dred, payload, len, 48000, 48000, &dred_end, fast_rand()&0x1);
       if (res1 > 0)
       {
-         res2 = opus_dred_process(dred_dec, dred, dred);
-         expect_true(res2 == OPUS_OK, "process should succeed if parse succeeds");
+         res2 = oac_dred_process(dred_dec, dred, dred);
+         expect_true(res2 == OAC_OK, "process should succeed if parse succeeds");
          expect_true(res1 >= dred_end, "end before beginning");
       }
    }
-   opus_dred_free(dred);
-   opus_dred_decoder_destroy(dred_dec);
+   oac_dred_free(dred);
+   oac_dred_decoder_destroy(dred_dec);
 }
 
 int main(int argc, char **argv)
@@ -95,7 +95,7 @@ int main(int argc, char **argv)
       iseed=atoi(env_seed);
       env_used=1;
    }
-   else iseed=(opus_uint32)time(NULL)^(((opus_uint32)getpid()&65535)<<16);
+   else iseed=(oac_uint32)time(NULL)^(((oac_uint32)getpid()&65535)<<16);
    Rw=Rz=iseed;
 
    fprintf(stderr,"Testing dred. Random seed: %u (%.4X)\n", iseed, fast_rand() % 65535);
diff --git a/tests/test_opus_encode.c b/tests/test_oac_encode.c
similarity index 50%
rename from tests/test_opus_encode.c
rename to tests/test_oac_encode.c
index d4bab0b86..814a850d4 100644
--- a/tests/test_opus_encode.c
+++ b/tests/test_oac_encode.c
@@ -42,10 +42,10 @@
 #include <process.h>
 #define getpid _getpid
 #endif
-#include "opus_multistream.h"
-#include "opus.h"
-#include "../src/opus_private.h"
-#include "test_opus_common.h"
+#include "oac_multistream.h"
+#include "oac.h"
+#include "../src/oac_private.h"
+#include "test_oac_common.h"
 
 #define MAX_PACKET (1500)
 #define SAMPLES (48000*30)
@@ -54,11 +54,11 @@
 #define PI (3.141592653589793238462643f)
 #define RAND_SAMPLE(a) (a[fast_rand() % sizeof(a)/sizeof(a[0])])
 
-void generate_music(short *buf, opus_int32 len)
+void generate_music(short *buf, oac_int32 len)
 {
-   opus_int32 a1,b1,a2,b2;
-   opus_int32 c1,c2,d1,d2;
-   opus_int32 i,j;
+   oac_int32 a1,b1,a2,b2;
+   oac_int32 c1,c2,d1,d2;
+   oac_int32 i,j;
    a1=b1=a2=b2=0;
    c1=c2=d1=d2=0;
    j=0;
@@ -66,8 +66,8 @@ void generate_music(short *buf, opus_int32 len)
    for(i=0;i<2880;i++)buf[i*2]=buf[i*2+1]=0;
    for(i=2880;i<len;i++)
    {
-     opus_uint32 r;
-     opus_int32 v1,v2;
+     oac_uint32 r;
+     oac_int32 v1,v2;
      v1=v2=(((j*((j>>12)^((j>>10|j>>12)&26&j>>7)))&128)+128)<<15;
      r=fast_rand();v1+=r&65535;v1-=r>>16;
      r=fast_rand();v2+=r&65535;v2-=r>>16;
@@ -85,7 +85,7 @@ void generate_music(short *buf, opus_int32 len)
 
 #if 0
 static int save_ctr = 0;
-static void int_to_char(opus_uint32 i, unsigned char ch[4])
+static void int_to_char(oac_uint32 i, unsigned char ch[4])
 {
     ch[0] = i>>24;
     ch[1] = (i>>16)&0xFF;
@@ -93,12 +93,12 @@ static void int_to_char(opus_uint32 i, unsigned char ch[4])
     ch[3] = i&0xFF;
 }
 
-static OPUS_INLINE void save_packet(unsigned char* p, int len, opus_uint32 rng)
+static OAC_INLINE void save_packet(unsigned char* p, int len, oac_uint32 rng)
 {
    FILE *fout;
    unsigned char int_field[4];
    char name[256];
-   snprintf(name,255,"test_opus_encode.%llu.%d.bit",(unsigned long long)iseed,save_ctr);
+   snprintf(name,255,"test_oac_encode.%llu.%d.bit",(unsigned long long)iseed,save_ctr);
    fprintf(stdout,"writing %d byte packet to %s\n",len,name);
    fout=fopen(name, "wb+");
    if(fout==NULL)test_failed();
@@ -117,81 +117,81 @@ int get_frame_size_enum(int frame_size, int sampling_rate)
    int frame_size_enum;
 
    if(frame_size==sampling_rate/400)
-      frame_size_enum = OPUS_FRAMESIZE_2_5_MS;
+      frame_size_enum = OAC_FRAMESIZE_2_5_MS;
    else if(frame_size==sampling_rate/200)
-      frame_size_enum = OPUS_FRAMESIZE_5_MS;
+      frame_size_enum = OAC_FRAMESIZE_5_MS;
    else if(frame_size==sampling_rate/100)
-      frame_size_enum = OPUS_FRAMESIZE_10_MS;
+      frame_size_enum = OAC_FRAMESIZE_10_MS;
    else if(frame_size==sampling_rate/50)
-      frame_size_enum = OPUS_FRAMESIZE_20_MS;
+      frame_size_enum = OAC_FRAMESIZE_20_MS;
    else if(frame_size==sampling_rate/25)
-      frame_size_enum = OPUS_FRAMESIZE_40_MS;
+      frame_size_enum = OAC_FRAMESIZE_40_MS;
    else if(frame_size==3*sampling_rate/50)
-      frame_size_enum = OPUS_FRAMESIZE_60_MS;
+      frame_size_enum = OAC_FRAMESIZE_60_MS;
    else if(frame_size==4*sampling_rate/50)
-      frame_size_enum = OPUS_FRAMESIZE_80_MS;
+      frame_size_enum = OAC_FRAMESIZE_80_MS;
    else if(frame_size==5*sampling_rate/50)
-      frame_size_enum = OPUS_FRAMESIZE_100_MS;
+      frame_size_enum = OAC_FRAMESIZE_100_MS;
    else if(frame_size==6*sampling_rate/50)
-      frame_size_enum = OPUS_FRAMESIZE_120_MS;
+      frame_size_enum = OAC_FRAMESIZE_120_MS;
    else
       test_failed();
 
    return frame_size_enum;
 }
 
-int test_encode(OpusEncoder *enc, int channels, int frame_size, OpusDecoder *dec)
+int test_encode(OacEncoder *enc, int channels, int frame_size, OacDecoder *dec)
 {
    int samp_count = 0;
-   opus_int16 *inbuf;
+   oac_int16 *inbuf;
    unsigned char packet[MAX_PACKET+257];
    int len;
-   opus_int16 *outbuf;
+   oac_int16 *outbuf;
    int out_samples;
    int ret = 0;
 #ifdef ENABLE_DRED
-   OpusDREDDecoder *dred_dec;
-   OpusDRED *dred;
+   OacDREDDecoder *dred_dec;
+   OacDRED *dred;
    int dred_end;
    int dred_amount;
    int dred_ret;
-   dred_dec = opus_dred_decoder_create(&dred_ret);
-   dred = opus_dred_alloc(&dred_ret);
+   dred_dec = oac_dred_decoder_create(&dred_ret);
+   dred = oac_dred_alloc(&dred_ret);
 #endif
    /* Generate input data */
-   inbuf = (opus_int16*)malloc(sizeof(*inbuf)*SSAMPLES);
+   inbuf = (oac_int16*)malloc(sizeof(*inbuf)*SSAMPLES);
    generate_music(inbuf, SSAMPLES/2);
 
    /* Allocate memory for output data */
-   outbuf = (opus_int16*)malloc(sizeof(*outbuf)*MAX_FRAME_SAMP*3);
+   outbuf = (oac_int16*)malloc(sizeof(*outbuf)*MAX_FRAME_SAMP*3);
 
    /* Encode data, then decode for sanity check */
    do {
-      len = opus_encode(enc, &inbuf[samp_count*channels], frame_size, packet, MAX_PACKET);
+      len = oac_encode(enc, &inbuf[samp_count*channels], frame_size, packet, MAX_PACKET);
       if(len<0 || len>MAX_PACKET) {
-         fprintf(stderr,"opus_encode() returned %d\n",len);
+         fprintf(stderr,"oac_encode() returned %d\n",len);
          ret = -1;
          break;
       }
 #ifdef ENABLE_DRED
-      dred_amount = opus_dred_parse(dred_dec, dred, packet, len, 48000, 48000, &dred_end, 0);
+      dred_amount = oac_dred_parse(dred_dec, dred, packet, len, 48000, 48000, &dred_end, 0);
       if(dred_amount<0) {
-         fprintf(stderr,"opus_dred_parse() returned %d\n",dred_amount);
+         fprintf(stderr,"oac_dred_parse() returned %d\n",dred_amount);
          ret = -1;
          break;
       }
       if (dred_amount >= frame_size && (fast_rand()&1)) {
-         dred_ret = opus_decoder_dred_decode(dec, dred, frame_size, outbuf, frame_size);
+         dred_ret = oac_decoder_dred_decode(dec, dred, frame_size, outbuf, frame_size);
          if(dred_ret<0) {
-            fprintf(stderr,"opus_decoder_dred_decode() returned %d\n",dred_ret);
+            fprintf(stderr,"oac_decoder_dred_decode() returned %d\n",dred_ret);
             ret = -1;
             break;
          }
       }
 #endif
-      out_samples = opus_decode(dec, packet, len, outbuf, MAX_FRAME_SAMP, 0);
+      out_samples = oac_decode(dec, packet, len, outbuf, MAX_FRAME_SAMP, 0);
       if(out_samples!=frame_size) {
-         fprintf(stderr,"opus_decode() returned %d\n",out_samples);
+         fprintf(stderr,"oac_decode() returned %d\n",out_samples);
          ret = -1;
          break;
       }
@@ -199,8 +199,8 @@ int test_encode(OpusEncoder *enc, int channels, int frame_size, OpusDecoder *dec
       samp_count += frame_size;
    } while (samp_count < ((SSAMPLES/2)-MAX_FRAME_SAMP));
 #ifdef ENABLE_DRED
-   opus_dred_decoder_destroy(dred_dec);
-   opus_dred_free(dred);
+   oac_dred_decoder_destroy(dred_dec);
+   oac_dred_free(dred);
 #endif
    /* Clean up */
    free(inbuf);
@@ -210,23 +210,23 @@ int test_encode(OpusEncoder *enc, int channels, int frame_size, OpusDecoder *dec
 
 void fuzz_encoder_settings(const int num_encoders, const int num_setting_changes)
 {
-   OpusEncoder *enc;
-   OpusDecoder *dec;
+   OacEncoder *enc;
+   OacDecoder *dec;
    int i,j,err;
 
    /* Parameters to fuzz. Some values are duplicated to increase their probability of being tested. */
    int sampling_rates[5] = {8000, 12000, 16000, 24000, 48000};
    int channels[2] = {1, 2};
-   int applications[3] = {OPUS_APPLICATION_AUDIO, OPUS_APPLICATION_VOIP, OPUS_APPLICATION_RESTRICTED_LOWDELAY};
-   int bitrates[11] = {6000, 12000, 16000, 24000, 32000, 48000, 64000, 96000, 510000, OPUS_AUTO, OPUS_BITRATE_MAX};
-   int force_channels[4] = {OPUS_AUTO, OPUS_AUTO, 1, 2};
+   int applications[3] = {OAC_APPLICATION_AUDIO, OAC_APPLICATION_VOIP, OAC_APPLICATION_RESTRICTED_LOWDELAY};
+   int bitrates[11] = {6000, 12000, 16000, 24000, 32000, 48000, 64000, 96000, 510000, OAC_AUTO, OAC_BITRATE_MAX};
+   int force_channels[4] = {OAC_AUTO, OAC_AUTO, 1, 2};
    int use_vbr[3] = {0, 1, 1};
    int vbr_constraints[3] = {0, 1, 1};
    int complexities[11] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-   int max_bandwidths[6] = {OPUS_BANDWIDTH_NARROWBAND, OPUS_BANDWIDTH_MEDIUMBAND,
-                            OPUS_BANDWIDTH_WIDEBAND, OPUS_BANDWIDTH_SUPERWIDEBAND,
-                            OPUS_BANDWIDTH_FULLBAND, OPUS_BANDWIDTH_FULLBAND};
-   int signals[4] = {OPUS_AUTO, OPUS_AUTO, OPUS_SIGNAL_VOICE, OPUS_SIGNAL_MUSIC};
+   int max_bandwidths[6] = {OAC_BANDWIDTH_NARROWBAND, OAC_BANDWIDTH_MEDIUMBAND,
+                            OAC_BANDWIDTH_WIDEBAND, OAC_BANDWIDTH_SUPERWIDEBAND,
+                            OAC_BANDWIDTH_FULLBAND, OAC_BANDWIDTH_FULLBAND};
+   int signals[4] = {OAC_AUTO, OAC_AUTO, OAC_SIGNAL_VOICE, OAC_SIGNAL_MUSIC};
    int inband_fecs[3] = {0, 0, 1};
    int packet_loss_perc[4] = {0, 1, 2, 5};
    int lsb_depths[2] = {8, 24};
@@ -239,11 +239,11 @@ void fuzz_encoder_settings(const int num_encoders, const int num_setting_changes
       int num_channels = RAND_SAMPLE(channels);
       int application = RAND_SAMPLE(applications);
 
-      dec = opus_decoder_create(sampling_rate, num_channels, &err);
-      if(err!=OPUS_OK || dec==NULL)test_failed();
+      dec = oac_decoder_create(sampling_rate, num_channels, &err);
+      if(err!=OAC_OK || dec==NULL)test_failed();
 
-      enc = opus_encoder_create(sampling_rate, num_channels, application, &err);
-      if(err!=OPUS_OK || enc==NULL)test_failed();
+      enc = oac_encoder_create(sampling_rate, num_channels, application, &err);
+      if(err!=OAC_OK || enc==NULL)test_failed();
 
       for (j=0; j<num_setting_changes; j++) {
          int bitrate = RAND_SAMPLE(bitrates);
@@ -263,21 +263,21 @@ void fuzz_encoder_settings(const int num_encoders, const int num_setting_changes
          int frame_size_enum = get_frame_size_enum(frame_size, sampling_rate);
          force_channel = IMIN(force_channel, num_channels);
 
-         if(opus_encoder_ctl(enc, OPUS_SET_BITRATE(bitrate)) != OPUS_OK) test_failed();
-         if(opus_encoder_ctl(enc, OPUS_SET_FORCE_CHANNELS(force_channel)) != OPUS_OK) test_failed();
-         if(opus_encoder_ctl(enc, OPUS_SET_VBR(vbr)) != OPUS_OK) test_failed();
-         if(opus_encoder_ctl(enc, OPUS_SET_VBR_CONSTRAINT(vbr_constraint)) != OPUS_OK) test_failed();
-         if(opus_encoder_ctl(enc, OPUS_SET_COMPLEXITY(complexity)) != OPUS_OK) test_failed();
-         if(opus_encoder_ctl(enc, OPUS_SET_MAX_BANDWIDTH(max_bw)) != OPUS_OK) test_failed();
-         if(opus_encoder_ctl(enc, OPUS_SET_SIGNAL(sig)) != OPUS_OK) test_failed();
-         if(opus_encoder_ctl(enc, OPUS_SET_INBAND_FEC(inband_fec)) != OPUS_OK) test_failed();
-         if(opus_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(pkt_loss)) != OPUS_OK) test_failed();
-         if(opus_encoder_ctl(enc, OPUS_SET_LSB_DEPTH(lsb_depth)) != OPUS_OK) test_failed();
-         if(opus_encoder_ctl(enc, OPUS_SET_PREDICTION_DISABLED(pred_disabled)) != OPUS_OK) test_failed();
-         if(opus_encoder_ctl(enc, OPUS_SET_DTX(dtx)) != OPUS_OK) test_failed();
-         if(opus_encoder_ctl(enc, OPUS_SET_EXPERT_FRAME_DURATION(frame_size_enum)) != OPUS_OK) test_failed();
+         if(oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrate)) != OAC_OK) test_failed();
+         if(oac_encoder_ctl(enc, OAC_SET_FORCE_CHANNELS(force_channel)) != OAC_OK) test_failed();
+         if(oac_encoder_ctl(enc, OAC_SET_VBR(vbr)) != OAC_OK) test_failed();
+         if(oac_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(vbr_constraint)) != OAC_OK) test_failed();
+         if(oac_encoder_ctl(enc, OAC_SET_COMPLEXITY(complexity)) != OAC_OK) test_failed();
+         if(oac_encoder_ctl(enc, OAC_SET_MAX_BANDWIDTH(max_bw)) != OAC_OK) test_failed();
+         if(oac_encoder_ctl(enc, OAC_SET_SIGNAL(sig)) != OAC_OK) test_failed();
+         if(oac_encoder_ctl(enc, OAC_SET_INBAND_FEC(inband_fec)) != OAC_OK) test_failed();
+         if(oac_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(pkt_loss)) != OAC_OK) test_failed();
+         if(oac_encoder_ctl(enc, OAC_SET_LSB_DEPTH(lsb_depth)) != OAC_OK) test_failed();
+         if(oac_encoder_ctl(enc, OAC_SET_PREDICTION_DISABLED(pred_disabled)) != OAC_OK) test_failed();
+         if(oac_encoder_ctl(enc, OAC_SET_DTX(dtx)) != OAC_OK) test_failed();
+         if(oac_encoder_ctl(enc, OAC_SET_EXPERT_FRAME_DURATION(frame_size_enum)) != OAC_OK) test_failed();
 #ifdef ENABLE_DRED
-         if(opus_encoder_ctl(enc, OPUS_SET_DRED_DURATION(fast_rand()%101)) != OPUS_OK) test_failed();
+         if(oac_encoder_ctl(enc, OAC_SET_DRED_DURATION(fast_rand()%101)) != OAC_OK) test_failed();
 #endif
          if(test_encode(enc, num_channels, frame_size, dec)) {
             fprintf(stderr,
@@ -292,8 +292,8 @@ void fuzz_encoder_settings(const int num_encoders, const int num_setting_changes
          }
       }
 
-      opus_encoder_destroy(enc);
-      opus_decoder_destroy(dec);
+      oac_encoder_destroy(enc);
+      oac_decoder_destroy(dec);
    }
 }
 
@@ -303,21 +303,21 @@ int run_test1(int no_fuzz)
    static const char *mstrings[3] = {"    LP","Hybrid","  MDCT"};
    unsigned char mapping[256] = {0,1,255};
    unsigned char db62[36];
-   opus_int32 i,j;
+   oac_int32 i,j;
    int rc,err;
-   OpusEncoder *enc;
-   OpusMSEncoder *MSenc;
-   OpusDecoder *dec;
-   OpusMSDecoder *MSdec;
-   OpusMSDecoder *MSdec_err;
-   OpusDecoder *dec_err[10];
+   OacEncoder *enc;
+   OacMSEncoder *MSenc;
+   OacDecoder *dec;
+   OacMSDecoder *MSdec;
+   OacMSDecoder *MSdec_err;
+   OacDecoder *dec_err[10];
    short *inbuf;
    short *outbuf;
    short *out2buf;
-   opus_int32 bitrate_bps;
+   oac_int32 bitrate_bps;
    unsigned char packet[MAX_PACKET+257];
-   opus_uint32 enc_final_range;
-   opus_uint32 dec_final_range;
+   oac_uint32 enc_final_range;
+   oac_uint32 dec_final_range;
    int fswitch;
    int fsize;
    int count;
@@ -327,77 +327,77 @@ int run_test1(int no_fuzz)
    fprintf(stdout,"  Encode+Decode tests.\n");
    fflush(stdout);
 
-   enc = opus_encoder_create(48000, 2, OPUS_APPLICATION_VOIP, &err);
-   if(err != OPUS_OK || enc==NULL)test_failed();
+   enc = oac_encoder_create(48000, 2, OAC_APPLICATION_VOIP, &err);
+   if(err != OAC_OK || enc==NULL)test_failed();
 
    for(i=0;i<2;i++)
    {
       int *ret_err;
       ret_err = i?0:&err;
-      MSenc = opus_multistream_encoder_create(8000, 2, 2, 0, mapping, OPUS_UNIMPLEMENTED, ret_err);
-      if((ret_err && *ret_err != OPUS_BAD_ARG) || MSenc!=NULL)test_failed();
+      MSenc = oac_multistream_encoder_create(8000, 2, 2, 0, mapping, OAC_UNIMPLEMENTED, ret_err);
+      if((ret_err && *ret_err != OAC_BAD_ARG) || MSenc!=NULL)test_failed();
 
-      MSenc = opus_multistream_encoder_create(8000, 0, 1, 0, mapping, OPUS_APPLICATION_VOIP, ret_err);
-      if((ret_err && *ret_err != OPUS_BAD_ARG) || MSenc!=NULL)test_failed();
+      MSenc = oac_multistream_encoder_create(8000, 0, 1, 0, mapping, OAC_APPLICATION_VOIP, ret_err);
+      if((ret_err && *ret_err != OAC_BAD_ARG) || MSenc!=NULL)test_failed();
 
-      MSenc = opus_multistream_encoder_create(44100, 2, 2, 0, mapping, OPUS_APPLICATION_VOIP, ret_err);
-      if((ret_err && *ret_err != OPUS_BAD_ARG) || MSenc!=NULL)test_failed();
+      MSenc = oac_multistream_encoder_create(44100, 2, 2, 0, mapping, OAC_APPLICATION_VOIP, ret_err);
+      if((ret_err && *ret_err != OAC_BAD_ARG) || MSenc!=NULL)test_failed();
 
-      MSenc = opus_multistream_encoder_create(8000, 2, 2, 3, mapping, OPUS_APPLICATION_VOIP, ret_err);
-      if((ret_err && *ret_err != OPUS_BAD_ARG) || MSenc!=NULL)test_failed();
+      MSenc = oac_multistream_encoder_create(8000, 2, 2, 3, mapping, OAC_APPLICATION_VOIP, ret_err);
+      if((ret_err && *ret_err != OAC_BAD_ARG) || MSenc!=NULL)test_failed();
 
-      MSenc = opus_multistream_encoder_create(8000, 2, -1, 0, mapping, OPUS_APPLICATION_VOIP, ret_err);
-      if((ret_err && *ret_err != OPUS_BAD_ARG) || MSenc!=NULL)test_failed();
+      MSenc = oac_multistream_encoder_create(8000, 2, -1, 0, mapping, OAC_APPLICATION_VOIP, ret_err);
+      if((ret_err && *ret_err != OAC_BAD_ARG) || MSenc!=NULL)test_failed();
 
-      MSenc = opus_multistream_encoder_create(8000, 256, 2, 0, mapping, OPUS_APPLICATION_VOIP, ret_err);
-      if((ret_err && *ret_err != OPUS_BAD_ARG) || MSenc!=NULL)test_failed();
+      MSenc = oac_multistream_encoder_create(8000, 256, 2, 0, mapping, OAC_APPLICATION_VOIP, ret_err);
+      if((ret_err && *ret_err != OAC_BAD_ARG) || MSenc!=NULL)test_failed();
    }
 
-   MSenc = opus_multistream_encoder_create(8000, 2, 2, 0, mapping, OPUS_APPLICATION_AUDIO, &err);
-   if(err != OPUS_OK || MSenc==NULL)test_failed();
+   MSenc = oac_multistream_encoder_create(8000, 2, 2, 0, mapping, OAC_APPLICATION_AUDIO, &err);
+   if(err != OAC_OK || MSenc==NULL)test_failed();
 
    /*Some multistream encoder API tests*/
-   if(opus_multistream_encoder_ctl(MSenc, OPUS_GET_BITRATE(&i))!=OPUS_OK)test_failed();
-   if(opus_multistream_encoder_ctl(MSenc, OPUS_GET_LSB_DEPTH(&i))!=OPUS_OK)test_failed();
+   if(oac_multistream_encoder_ctl(MSenc, OAC_GET_BITRATE(&i))!=OAC_OK)test_failed();
+   if(oac_multistream_encoder_ctl(MSenc, OAC_GET_LSB_DEPTH(&i))!=OAC_OK)test_failed();
    if(i<16)test_failed();
 
    {
-      OpusEncoder *tmp_enc;
-      if(opus_multistream_encoder_ctl(MSenc,  OPUS_MULTISTREAM_GET_ENCODER_STATE(1,&tmp_enc))!=OPUS_OK)test_failed();
-      if(opus_encoder_ctl(tmp_enc, OPUS_GET_LSB_DEPTH(&j))!=OPUS_OK)test_failed();
+      OacEncoder *tmp_enc;
+      if(oac_multistream_encoder_ctl(MSenc,  OAC_MULTISTREAM_GET_ENCODER_STATE(1,&tmp_enc))!=OAC_OK)test_failed();
+      if(oac_encoder_ctl(tmp_enc, OAC_GET_LSB_DEPTH(&j))!=OAC_OK)test_failed();
       if(i!=j)test_failed();
-      if(opus_multistream_encoder_ctl(MSenc,  OPUS_MULTISTREAM_GET_ENCODER_STATE(2,&tmp_enc))!=OPUS_BAD_ARG)test_failed();
+      if(oac_multistream_encoder_ctl(MSenc,  OAC_MULTISTREAM_GET_ENCODER_STATE(2,&tmp_enc))!=OAC_BAD_ARG)test_failed();
    }
 
-   dec = opus_decoder_create(48000, 2, &err);
-   if(err != OPUS_OK || dec==NULL)test_failed();
-
-   MSdec = opus_multistream_decoder_create(48000, 2, 2, 0, mapping, &err);
-   if(err != OPUS_OK || MSdec==NULL)test_failed();
-
-   MSdec_err = opus_multistream_decoder_create(48000, 3, 2, 0, mapping, &err);
-   if(err != OPUS_OK || MSdec_err==NULL)test_failed();
-
-   dec_err[0]=(OpusDecoder *)malloc(opus_decoder_get_size(2));
-   memcpy(dec_err[0],dec,opus_decoder_get_size(2));
-   dec_err[1] = opus_decoder_create(48000, 1, &err);
-   dec_err[2] = opus_decoder_create(24000, 2, &err);
-   dec_err[3] = opus_decoder_create(24000, 1, &err);
-   dec_err[4] = opus_decoder_create(16000, 2, &err);
-   dec_err[5] = opus_decoder_create(16000, 1, &err);
-   dec_err[6] = opus_decoder_create(12000, 2, &err);
-   dec_err[7] = opus_decoder_create(12000, 1, &err);
-   dec_err[8] = opus_decoder_create(8000, 2, &err);
-   dec_err[9] = opus_decoder_create(8000, 1, &err);
+   dec = oac_decoder_create(48000, 2, &err);
+   if(err != OAC_OK || dec==NULL)test_failed();
+
+   MSdec = oac_multistream_decoder_create(48000, 2, 2, 0, mapping, &err);
+   if(err != OAC_OK || MSdec==NULL)test_failed();
+
+   MSdec_err = oac_multistream_decoder_create(48000, 3, 2, 0, mapping, &err);
+   if(err != OAC_OK || MSdec_err==NULL)test_failed();
+
+   dec_err[0]=(OacDecoder *)malloc(oac_decoder_get_size(2));
+   memcpy(dec_err[0],dec,oac_decoder_get_size(2));
+   dec_err[1] = oac_decoder_create(48000, 1, &err);
+   dec_err[2] = oac_decoder_create(24000, 2, &err);
+   dec_err[3] = oac_decoder_create(24000, 1, &err);
+   dec_err[4] = oac_decoder_create(16000, 2, &err);
+   dec_err[5] = oac_decoder_create(16000, 1, &err);
+   dec_err[6] = oac_decoder_create(12000, 2, &err);
+   dec_err[7] = oac_decoder_create(12000, 1, &err);
+   dec_err[8] = oac_decoder_create(8000, 2, &err);
+   dec_err[9] = oac_decoder_create(8000, 1, &err);
    for(i=0;i<10;i++)if(dec_err[i]==NULL)test_failed();
 
    {
-      OpusEncoder *enccpy;
-      /*The opus state structures contain no pointers and can be freely copied*/
-      enccpy=(OpusEncoder *)malloc(opus_encoder_get_size(2));
-      memcpy(enccpy,enc,opus_encoder_get_size(2));
-      memset(enc,255,opus_encoder_get_size(2));
-      opus_encoder_destroy(enc);
+      OacEncoder *enccpy;
+      /*The oac state structures contain no pointers and can be freely copied*/
+      enccpy=(OacEncoder *)malloc(oac_encoder_get_size(2));
+      memcpy(enccpy,enc,oac_encoder_get_size(2));
+      memset(enc,255,oac_encoder_get_size(2));
+      oac_encoder_destroy(enc);
       enc=enccpy;
    }
 
@@ -413,18 +413,18 @@ int run_test1(int no_fuzz)
    fwrite(inbuf, 1, SAMPLES*2*2, foo);
    fclose(foo);*/
 
-   if(opus_encoder_ctl(enc, OPUS_SET_BANDWIDTH(OPUS_AUTO))!=OPUS_OK)test_failed();
-   if(opus_encoder_ctl(enc, OPUS_SET_FORCE_MODE(-2))!=OPUS_BAD_ARG)test_failed();
-   if(opus_encode(enc, inbuf, 500, packet, MAX_PACKET)!=OPUS_BAD_ARG)test_failed();
+   if(oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_AUTO))!=OAC_OK)test_failed();
+   if(oac_encoder_ctl(enc, OAC_SET_FORCE_MODE(-2))!=OAC_BAD_ARG)test_failed();
+   if(oac_encode(enc, inbuf, 500, packet, MAX_PACKET)!=OAC_BAD_ARG)test_failed();
 
    for(rc=0;rc<3;rc++)
    {
-      if(opus_encoder_ctl(enc, OPUS_SET_VBR(rc<2))!=OPUS_OK)test_failed();
-      if(opus_encoder_ctl(enc, OPUS_SET_VBR_CONSTRAINT(rc==1))!=OPUS_OK)test_failed();
-      if(opus_encoder_ctl(enc, OPUS_SET_VBR_CONSTRAINT(rc==1))!=OPUS_OK)test_failed();
-      if(opus_encoder_ctl(enc, OPUS_SET_INBAND_FEC(rc==0))!=OPUS_OK)test_failed();
+      if(oac_encoder_ctl(enc, OAC_SET_VBR(rc<2))!=OAC_OK)test_failed();
+      if(oac_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(rc==1))!=OAC_OK)test_failed();
+      if(oac_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(rc==1))!=OAC_OK)test_failed();
+      if(oac_encoder_ctl(enc, OAC_SET_INBAND_FEC(rc==0))!=OAC_OK)test_failed();
 #ifdef ENABLE_DRED
-      if(opus_encoder_ctl(enc, OPUS_SET_DRED_DURATION(fast_rand()%101)) != OPUS_OK) test_failed();
+      if(oac_encoder_ctl(enc, OAC_SET_DRED_DURATION(fast_rand()%101)) != OAC_OK) test_failed();
 #endif
       for(j=0;j<13;j++)
       {
@@ -439,60 +439,60 @@ int run_test1(int no_fuzz)
             frame_size=frame[j];
             if((fast_rand()&255)==0)
             {
-               if(opus_encoder_ctl(enc, OPUS_RESET_STATE)!=OPUS_OK)test_failed();
-               if(opus_decoder_ctl(dec, OPUS_RESET_STATE)!=OPUS_OK)test_failed();
+               if(oac_encoder_ctl(enc, OAC_RESET_STATE)!=OAC_OK)test_failed();
+               if(oac_decoder_ctl(dec, OAC_RESET_STATE)!=OAC_OK)test_failed();
                if((fast_rand()&1)!=0)
                {
-                  if(opus_decoder_ctl(dec_err[fast_rand()&1], OPUS_RESET_STATE)!=OPUS_OK)test_failed();
+                  if(oac_decoder_ctl(dec_err[fast_rand()&1], OAC_RESET_STATE)!=OAC_OK)test_failed();
                }
             }
             if((fast_rand()&127)==0)
             {
-               if(opus_decoder_ctl(dec_err[fast_rand()&1], OPUS_RESET_STATE)!=OPUS_OK)test_failed();
+               if(oac_decoder_ctl(dec_err[fast_rand()&1], OAC_RESET_STATE)!=OAC_OK)test_failed();
             }
             if(fast_rand()%10==0){
                int complex=fast_rand()%11;
-               if(opus_encoder_ctl(enc, OPUS_SET_COMPLEXITY(complex))!=OPUS_OK)test_failed();
+               if(oac_encoder_ctl(enc, OAC_SET_COMPLEXITY(complex))!=OAC_OK)test_failed();
             }
-            if(fast_rand()%50==0)opus_decoder_ctl(dec, OPUS_RESET_STATE);
-            if(opus_encoder_ctl(enc, OPUS_SET_INBAND_FEC(rc==0))!=OPUS_OK)test_failed();
-            if(opus_encoder_ctl(enc, OPUS_SET_FORCE_MODE(MODE_SILK_ONLY+modes[j]))!=OPUS_OK)test_failed();
-            if(opus_encoder_ctl(enc, OPUS_SET_DTX(fast_rand()&1))!=OPUS_OK)test_failed();
-            if(opus_encoder_ctl(enc, OPUS_SET_BITRATE(rate))!=OPUS_OK)test_failed();
-            if(opus_encoder_ctl(enc, OPUS_SET_FORCE_CHANNELS((rates[j]>=64000?2:1)))!=OPUS_OK)test_failed();
-            if(opus_encoder_ctl(enc, OPUS_SET_COMPLEXITY((count>>2)%11))!=OPUS_OK)test_failed();
-            if(opus_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC((fast_rand()&15)&(fast_rand()%15)))!=OPUS_OK)test_failed();
-            bw=modes[j]==0?OPUS_BANDWIDTH_NARROWBAND+(fast_rand()%3):
-               modes[j]==1?OPUS_BANDWIDTH_SUPERWIDEBAND+(fast_rand()&1):
-                           OPUS_BANDWIDTH_NARROWBAND+(fast_rand()%5);
-            if(modes[j]==2&&bw==OPUS_BANDWIDTH_MEDIUMBAND)bw+=3;
-            if(opus_encoder_ctl(enc, OPUS_SET_BANDWIDTH(bw))!=OPUS_OK)test_failed();
-            len = opus_encode(enc, &inbuf[i<<1], frame_size, packet, MAX_PACKET);
+            if(fast_rand()%50==0)oac_decoder_ctl(dec, OAC_RESET_STATE);
+            if(oac_encoder_ctl(enc, OAC_SET_INBAND_FEC(rc==0))!=OAC_OK)test_failed();
+            if(oac_encoder_ctl(enc, OAC_SET_FORCE_MODE(MODE_SILK_ONLY+modes[j]))!=OAC_OK)test_failed();
+            if(oac_encoder_ctl(enc, OAC_SET_DTX(fast_rand()&1))!=OAC_OK)test_failed();
+            if(oac_encoder_ctl(enc, OAC_SET_BITRATE(rate))!=OAC_OK)test_failed();
+            if(oac_encoder_ctl(enc, OAC_SET_FORCE_CHANNELS((rates[j]>=64000?2:1)))!=OAC_OK)test_failed();
+            if(oac_encoder_ctl(enc, OAC_SET_COMPLEXITY((count>>2)%11))!=OAC_OK)test_failed();
+            if(oac_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC((fast_rand()&15)&(fast_rand()%15)))!=OAC_OK)test_failed();
+            bw=modes[j]==0?OAC_BANDWIDTH_NARROWBAND+(fast_rand()%3):
+               modes[j]==1?OAC_BANDWIDTH_SUPERWIDEBAND+(fast_rand()&1):
+                           OAC_BANDWIDTH_NARROWBAND+(fast_rand()%5);
+            if(modes[j]==2&&bw==OAC_BANDWIDTH_MEDIUMBAND)bw+=3;
+            if(oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(bw))!=OAC_OK)test_failed();
+            len = oac_encode(enc, &inbuf[i<<1], frame_size, packet, MAX_PACKET);
             if(len<0 || len>MAX_PACKET)test_failed();
-            if(opus_encoder_ctl(enc, OPUS_GET_FINAL_RANGE(&enc_final_range))!=OPUS_OK)test_failed();
+            if(oac_encoder_ctl(enc, OAC_GET_FINAL_RANGE(&enc_final_range))!=OAC_OK)test_failed();
             if((fast_rand()&3)==0)
             {
-               if(opus_packet_pad(packet,len,len+1)!=OPUS_OK)test_failed();
+               if(oac_packet_pad(packet,len,len+1)!=OAC_OK)test_failed();
                len++;
             }
             if((fast_rand()&7)==0)
             {
-               if(opus_packet_pad(packet,len,len+256)!=OPUS_OK)test_failed();
+               if(oac_packet_pad(packet,len,len+256)!=OAC_OK)test_failed();
                len+=256;
             }
             if((fast_rand()&3)==0)
             {
-               len=opus_packet_unpad(packet,len);
+               len=oac_packet_unpad(packet,len);
                if(len<1)test_failed();
             }
-            out_samples = opus_decode(dec, packet, len, &outbuf[i<<1], MAX_FRAME_SAMP, 0);
+            out_samples = oac_decode(dec, packet, len, &outbuf[i<<1], MAX_FRAME_SAMP, 0);
             if(out_samples!=frame_size)test_failed();
-            if(opus_decoder_ctl(dec, OPUS_GET_FINAL_RANGE(&dec_final_range))!=OPUS_OK)test_failed();
+            if(oac_decoder_ctl(dec, OAC_GET_FINAL_RANGE(&dec_final_range))!=OAC_OK)test_failed();
             if(enc_final_range!=dec_final_range)test_failed();
             /*LBRR decode*/
-            out_samples = opus_decode(dec_err[0], packet, len, out2buf, frame_size, (fast_rand()&3)!=0);
+            out_samples = oac_decode(dec_err[0], packet, len, out2buf, frame_size, (fast_rand()&3)!=0);
             if(out_samples!=frame_size)test_failed();
-            out_samples = opus_decode(dec_err[1], packet, (fast_rand()&3)==0?0:len, out2buf, MAX_FRAME_SAMP, (fast_rand()&7)!=0);
+            out_samples = oac_decode(dec_err[1], packet, (fast_rand()&3)==0?0:len, out2buf, MAX_FRAME_SAMP, (fast_rand()&7)!=0);
             if(out_samples<120)test_failed();
             i+=frame_size;
             count++;
@@ -502,75 +502,75 @@ int run_test1(int no_fuzz)
       }
    }
 
-   if(opus_encoder_ctl(enc, OPUS_SET_FORCE_MODE(OPUS_AUTO))!=OPUS_OK)test_failed();
-   if(opus_encoder_ctl(enc, OPUS_SET_FORCE_CHANNELS(OPUS_AUTO))!=OPUS_OK)test_failed();
-   if(opus_encoder_ctl(enc, OPUS_SET_INBAND_FEC(0))!=OPUS_OK)test_failed();
-   if(opus_encoder_ctl(enc, OPUS_SET_DTX(0))!=OPUS_OK)test_failed();
+   if(oac_encoder_ctl(enc, OAC_SET_FORCE_MODE(OAC_AUTO))!=OAC_OK)test_failed();
+   if(oac_encoder_ctl(enc, OAC_SET_FORCE_CHANNELS(OAC_AUTO))!=OAC_OK)test_failed();
+   if(oac_encoder_ctl(enc, OAC_SET_INBAND_FEC(0))!=OAC_OK)test_failed();
+   if(oac_encoder_ctl(enc, OAC_SET_DTX(0))!=OAC_OK)test_failed();
 
    for(rc=0;rc<3;rc++)
    {
-      if(opus_multistream_encoder_ctl(MSenc, OPUS_SET_VBR(rc<2))!=OPUS_OK)test_failed();
-      if(opus_multistream_encoder_ctl(MSenc, OPUS_SET_VBR_CONSTRAINT(rc==1))!=OPUS_OK)test_failed();
-      if(opus_multistream_encoder_ctl(MSenc, OPUS_SET_VBR_CONSTRAINT(rc==1))!=OPUS_OK)test_failed();
-      if(opus_multistream_encoder_ctl(MSenc, OPUS_SET_INBAND_FEC(rc==0))!=OPUS_OK)test_failed();
+      if(oac_multistream_encoder_ctl(MSenc, OAC_SET_VBR(rc<2))!=OAC_OK)test_failed();
+      if(oac_multistream_encoder_ctl(MSenc, OAC_SET_VBR_CONSTRAINT(rc==1))!=OAC_OK)test_failed();
+      if(oac_multistream_encoder_ctl(MSenc, OAC_SET_VBR_CONSTRAINT(rc==1))!=OAC_OK)test_failed();
+      if(oac_multistream_encoder_ctl(MSenc, OAC_SET_INBAND_FEC(rc==0))!=OAC_OK)test_failed();
       for(j=0;j<16;j++)
       {
          int rate;
          int modes[16]={0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2};
          int rates[16]={4000,12000,32000,8000,16000,32000,48000,88000,4000,12000,32000,8000,16000,32000,48000,288000};
          int frame[16]={160*1,160,80,160,160,80,40,20,160*1,160,80,160,160,80,40,20};
-         if(opus_multistream_encoder_ctl(MSenc, OPUS_SET_INBAND_FEC(rc==0&&j==1))!=OPUS_OK)test_failed();
-         if(opus_multistream_encoder_ctl(MSenc, OPUS_SET_FORCE_MODE(MODE_SILK_ONLY+modes[j]))!=OPUS_OK)test_failed();
+         if(oac_multistream_encoder_ctl(MSenc, OAC_SET_INBAND_FEC(rc==0&&j==1))!=OAC_OK)test_failed();
+         if(oac_multistream_encoder_ctl(MSenc, OAC_SET_FORCE_MODE(MODE_SILK_ONLY+modes[j]))!=OAC_OK)test_failed();
          rate=rates[j]+fast_rand()%rates[j];
-         if(opus_multistream_encoder_ctl(MSenc, OPUS_SET_DTX(fast_rand()&1))!=OPUS_OK)test_failed();
-         if(opus_multistream_encoder_ctl(MSenc, OPUS_SET_BITRATE(rate))!=OPUS_OK)test_failed();
+         if(oac_multistream_encoder_ctl(MSenc, OAC_SET_DTX(fast_rand()&1))!=OAC_OK)test_failed();
+         if(oac_multistream_encoder_ctl(MSenc, OAC_SET_BITRATE(rate))!=OAC_OK)test_failed();
          count=i=0;
          do {
             int len,out_samples,frame_size,loss;
-            opus_int32 pred;
-            if(opus_multistream_encoder_ctl(MSenc, OPUS_GET_PREDICTION_DISABLED(&pred))!=OPUS_OK)test_failed();
-            if(opus_multistream_encoder_ctl(MSenc, OPUS_SET_PREDICTION_DISABLED((int)(fast_rand()&15)<(pred?11:4)))!=OPUS_OK)test_failed();
+            oac_int32 pred;
+            if(oac_multistream_encoder_ctl(MSenc, OAC_GET_PREDICTION_DISABLED(&pred))!=OAC_OK)test_failed();
+            if(oac_multistream_encoder_ctl(MSenc, OAC_SET_PREDICTION_DISABLED((int)(fast_rand()&15)<(pred?11:4)))!=OAC_OK)test_failed();
             frame_size=frame[j];
-            if(opus_multistream_encoder_ctl(MSenc, OPUS_SET_COMPLEXITY((count>>2)%11))!=OPUS_OK)test_failed();
-            if(opus_multistream_encoder_ctl(MSenc, OPUS_SET_PACKET_LOSS_PERC((fast_rand()&15)&(fast_rand()%15)))!=OPUS_OK)test_failed();
+            if(oac_multistream_encoder_ctl(MSenc, OAC_SET_COMPLEXITY((count>>2)%11))!=OAC_OK)test_failed();
+            if(oac_multistream_encoder_ctl(MSenc, OAC_SET_PACKET_LOSS_PERC((fast_rand()&15)&(fast_rand()%15)))!=OAC_OK)test_failed();
             if((fast_rand()&255)==0)
             {
-               if(opus_multistream_encoder_ctl(MSenc, OPUS_RESET_STATE)!=OPUS_OK)test_failed();
-               if(opus_multistream_decoder_ctl(MSdec, OPUS_RESET_STATE)!=OPUS_OK)test_failed();
+               if(oac_multistream_encoder_ctl(MSenc, OAC_RESET_STATE)!=OAC_OK)test_failed();
+               if(oac_multistream_decoder_ctl(MSdec, OAC_RESET_STATE)!=OAC_OK)test_failed();
                if((fast_rand()&3)!=0)
                {
-                  if(opus_multistream_decoder_ctl(MSdec_err, OPUS_RESET_STATE)!=OPUS_OK)test_failed();
+                  if(oac_multistream_decoder_ctl(MSdec_err, OAC_RESET_STATE)!=OAC_OK)test_failed();
                }
             }
             if((fast_rand()&255)==0)
             {
-               if(opus_multistream_decoder_ctl(MSdec_err, OPUS_RESET_STATE)!=OPUS_OK)test_failed();
+               if(oac_multistream_decoder_ctl(MSdec_err, OAC_RESET_STATE)!=OAC_OK)test_failed();
             }
-            len = opus_multistream_encode(MSenc, &inbuf[i<<1], frame_size, packet, MAX_PACKET);
+            len = oac_multistream_encode(MSenc, &inbuf[i<<1], frame_size, packet, MAX_PACKET);
             if(len<0 || len>MAX_PACKET)test_failed();
-            if(opus_multistream_encoder_ctl(MSenc, OPUS_GET_FINAL_RANGE(&enc_final_range))!=OPUS_OK)test_failed();
+            if(oac_multistream_encoder_ctl(MSenc, OAC_GET_FINAL_RANGE(&enc_final_range))!=OAC_OK)test_failed();
             if((fast_rand()&3)==0)
             {
-               if(opus_multistream_packet_pad(packet,len,len+1,2)!=OPUS_OK)test_failed();
+               if(oac_multistream_packet_pad(packet,len,len+1,2)!=OAC_OK)test_failed();
                len++;
             }
             if((fast_rand()&7)==0)
             {
-               if(opus_multistream_packet_pad(packet,len,len+256,2)!=OPUS_OK)test_failed();
+               if(oac_multistream_packet_pad(packet,len,len+256,2)!=OAC_OK)test_failed();
                len+=256;
             }
             if((fast_rand()&3)==0)
             {
-               len=opus_multistream_packet_unpad(packet,len,2);
+               len=oac_multistream_packet_unpad(packet,len,2);
                if(len<1)test_failed();
             }
-            out_samples = opus_multistream_decode(MSdec, packet, len, out2buf, MAX_FRAME_SAMP, 0);
+            out_samples = oac_multistream_decode(MSdec, packet, len, out2buf, MAX_FRAME_SAMP, 0);
             if(out_samples!=frame_size*6)test_failed();
-            if(opus_multistream_decoder_ctl(MSdec, OPUS_GET_FINAL_RANGE(&dec_final_range))!=OPUS_OK)test_failed();
+            if(oac_multistream_decoder_ctl(MSdec, OAC_GET_FINAL_RANGE(&dec_final_range))!=OAC_OK)test_failed();
             if(enc_final_range!=dec_final_range)test_failed();
             /*LBRR decode*/
             loss=(fast_rand()&63)==0;
-            out_samples = opus_multistream_decode(MSdec_err, packet, loss?0:len, out2buf, frame_size*6, (fast_rand()&3)!=0);
+            out_samples = oac_multistream_decode(MSdec_err, packet, loss?0:len, out2buf, frame_size*6, (fast_rand()&3)!=0);
             if(out_samples!=(frame_size*6))test_failed();
             i+=frame_size;
             count++;
@@ -591,24 +591,24 @@ int run_test1(int no_fuzz)
       const unsigned char *frames[48];
       short size[48];
       int payload_offset;
-      opus_uint32 dec_final_range2;
+      oac_uint32 dec_final_range2;
       int jj,dec2;
       int len,out_samples;
       int frame_size=fsizes[db62[fsize]];
-      opus_int32 offset=i%(SAMPLES-MAX_FRAME_SAMP);
+      oac_int32 offset=i%(SAMPLES-MAX_FRAME_SAMP);
 
-      opus_encoder_ctl(enc, OPUS_SET_BITRATE(bitrate_bps));
+      oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrate_bps));
 
-      len = opus_encode(enc, &inbuf[offset<<1], frame_size, packet, MAX_PACKET);
+      len = oac_encode(enc, &inbuf[offset<<1], frame_size, packet, MAX_PACKET);
       if(len<0 || len>MAX_PACKET)test_failed();
       count++;
 
-      opus_encoder_ctl(enc, OPUS_GET_FINAL_RANGE(&enc_final_range));
+      oac_encoder_ctl(enc, OAC_GET_FINAL_RANGE(&enc_final_range));
 
-      out_samples = opus_decode(dec, packet, len, &outbuf[offset<<1], MAX_FRAME_SAMP, 0);
+      out_samples = oac_decode(dec, packet, len, &outbuf[offset<<1], MAX_FRAME_SAMP, 0);
       if(out_samples!=frame_size)test_failed();
 
-      opus_decoder_ctl(dec, OPUS_GET_FINAL_RANGE(&dec_final_range));
+      oac_decoder_ctl(dec, OAC_GET_FINAL_RANGE(&dec_final_range));
 
       /* compare final range encoder rng values of encoder and decoder */
       if(dec_final_range!=enc_final_range)test_failed();
@@ -616,21 +616,21 @@ int run_test1(int no_fuzz)
       /* We fuzz the packet, but take care not to only corrupt the payload
          Corrupted headers are tested elsewhere and we need to actually run
          the decoders in order to compare them. */
-      if(opus_packet_parse(packet,len,&toc,frames,size,&payload_offset)<=0)test_failed();
+      if(oac_packet_parse(packet,len,&toc,frames,size,&payload_offset)<=0)test_failed();
       if((fast_rand()&1023)==0)len=0;
-      for(j=(opus_int32)(frames[0]-packet);j<len;j++)for(jj=0;jj<8;jj++)packet[j]^=((!no_fuzz)&&((fast_rand()&1023)==0))<<jj;
-      out_samples = opus_decode(dec_err[0], len>0?packet:NULL, len, out2buf, MAX_FRAME_SAMP, 0);
+      for(j=(oac_int32)(frames[0]-packet);j<len;j++)for(jj=0;jj<8;jj++)packet[j]^=((!no_fuzz)&&((fast_rand()&1023)==0))<<jj;
+      out_samples = oac_decode(dec_err[0], len>0?packet:NULL, len, out2buf, MAX_FRAME_SAMP, 0);
       if(out_samples<0||out_samples>MAX_FRAME_SAMP)test_failed();
       if((len>0&&out_samples!=frame_size))test_failed(); /*FIXME use lastframe*/
 
-      opus_decoder_ctl(dec_err[0], OPUS_GET_FINAL_RANGE(&dec_final_range));
+      oac_decoder_ctl(dec_err[0], OAC_GET_FINAL_RANGE(&dec_final_range));
 
       /*randomly select one of the decoders to compare with*/
       dec2=fast_rand()%9+1;
-      out_samples = opus_decode(dec_err[dec2], len>0?packet:NULL, len, out2buf, MAX_FRAME_SAMP, 0);
+      out_samples = oac_decode(dec_err[dec2], len>0?packet:NULL, len, out2buf, MAX_FRAME_SAMP, 0);
       if(out_samples<0||out_samples>MAX_FRAME_SAMP)test_failed(); /*FIXME, use factor, lastframe for loss*/
 
-      opus_decoder_ctl(dec_err[dec2], OPUS_GET_FINAL_RANGE(&dec_final_range2));
+      oac_decoder_ctl(dec_err[dec2], OAC_GET_FINAL_RANGE(&dec_final_range2));
       if(len>0&&dec_final_range!=dec_final_range2)test_failed();
 
       fswitch--;
@@ -648,16 +648,16 @@ int run_test1(int no_fuzz)
    fprintf(stdout,"    All framesize pairs switching encode, %d frames OK.\n",count);
    fflush(stdout);
 
-   if(opus_encoder_ctl(enc, OPUS_RESET_STATE)!=OPUS_OK)test_failed();
-   opus_encoder_destroy(enc);
-   if(opus_multistream_encoder_ctl(MSenc, OPUS_RESET_STATE)!=OPUS_OK)test_failed();
-   opus_multistream_encoder_destroy(MSenc);
-   if(opus_decoder_ctl(dec, OPUS_RESET_STATE)!=OPUS_OK)test_failed();
-   opus_decoder_destroy(dec);
-   if(opus_multistream_decoder_ctl(MSdec, OPUS_RESET_STATE)!=OPUS_OK)test_failed();
-   opus_multistream_decoder_destroy(MSdec);
-   opus_multistream_decoder_destroy(MSdec_err);
-   for(i=0;i<10;i++)opus_decoder_destroy(dec_err[i]);
+   if(oac_encoder_ctl(enc, OAC_RESET_STATE)!=OAC_OK)test_failed();
+   oac_encoder_destroy(enc);
+   if(oac_multistream_encoder_ctl(MSenc, OAC_RESET_STATE)!=OAC_OK)test_failed();
+   oac_multistream_encoder_destroy(MSenc);
+   if(oac_decoder_ctl(dec, OAC_RESET_STATE)!=OAC_OK)test_failed();
+   oac_decoder_destroy(dec);
+   if(oac_multistream_decoder_ctl(MSdec, OAC_RESET_STATE)!=OAC_OK)test_failed();
+   oac_multistream_decoder_destroy(MSdec);
+   oac_multistream_decoder_destroy(MSdec_err);
+   for(i=0;i<10;i++)oac_decoder_destroy(dec_err[i]);
    free(inbuf);
    free(outbuf);
    free(out2buf);
@@ -689,7 +689,7 @@ int main(int _argc, char **_argv)
       iseed=atoi(env_seed);
       env_used=1;
    }
-   else iseed=(opus_uint32)time(NULL)^(((opus_uint32)getpid()&65535)<<16);
+   else iseed=(oac_uint32)time(NULL)^(((oac_uint32)getpid()&65535)<<16);
    Rw=Rz=iseed;
 
    while(args<_argc)
@@ -713,20 +713,20 @@ int main(int _argc, char **_argv)
       }
    }
 
-   oversion=opus_get_version_string();
+   oversion=oac_get_version_string();
    if(!oversion)test_failed();
    fprintf(stderr,"Testing %s encoder. Random seed: %u (%.4X)\n", oversion, iseed, fast_rand() % 65535);
    if(env_used)fprintf(stderr,"  Random seed set from the environment (SEED=%s).\n", env_seed);
 
    regression_test();
 
-   /*Setting TEST_OPUS_NOFUZZ tells the tool not to send garbage data
+   /*Setting TEST_OAC_NOFUZZ tells the tool not to send garbage data
      into the decoders. This is helpful because garbage data
      may cause the decoders to clip, which angers CLANG IOC.*/
-   run_test1(getenv("TEST_OPUS_NOFUZZ")!=NULL);
+   run_test1(getenv("TEST_OAC_NOFUZZ")!=NULL);
 
    /* Fuzz encoder settings online */
-   if(getenv("TEST_OPUS_NOFUZZ")==NULL) {
+   if(getenv("TEST_OAC_NOFUZZ")==NULL) {
       fprintf(stderr,"Running fuzz_encoder_settings with %d encoder(s) and %d setting change(s) each.\n",
               num_encoders_to_fuzz, num_setting_changes);
       fuzz_encoder_settings(num_encoders_to_fuzz, num_setting_changes);
diff --git a/tests/test_opus_extensions.c b/tests/test_oac_extensions.c
similarity index 71%
rename from tests/test_opus_extensions.c
rename to tests/test_oac_extensions.c
index f6960a3de..4303c0bbf 100644
--- a/tests/test_opus_extensions.c
+++ b/tests/test_oac_extensions.c
@@ -40,12 +40,12 @@
 #define getpid _getpid
 #endif
 
-#include "../src/opus_private.h"
-#include "test_opus_common.h"
+#include "../src/oac_private.h"
+#include "test_oac_common.h"
 
 void test_extensions_generate_success(void)
 {
-   static const opus_extension_data ext[] = {
+   static const oac_extension_data ext[] = {
       {3, 0, (const unsigned char *)"a", 1},
       {32, 10, (const unsigned char *)"DRED", 4},
       {33, 1, (const unsigned char *)"NOT DRED", 8},
@@ -55,7 +55,7 @@ void test_extensions_generate_success(void)
    int result;
    unsigned char packet[32];
    const unsigned char *p = packet;
-   result = opus_packet_extensions_generate(packet, 23+4, ext, 4, 11, 1);
+   result = oac_packet_extensions_generate(packet, 23+4, ext, 4, 11, 1);
    expect_true(result == 23+4, "expected length 23+4");
 
    /* expect padding */
@@ -117,13 +117,13 @@ void test_extensions_generate_zero(void)
    unsigned char packet[32];
 
    /* zero length packet, zero extensions */
-   result = opus_packet_extensions_generate(packet, 0, NULL, 0, 0, 1);
+   result = oac_packet_extensions_generate(packet, 0, NULL, 0, 0, 1);
    expect_true(result == 0, "expected length 0");
 }
 
 void test_extensions_generate_no_padding(void)
 {
-   static const opus_extension_data ext[] = {
+   static const oac_extension_data ext[] = {
       {3, 0, (const unsigned char *)"a", 1},
       {32, 10, (const unsigned char *)"DRED", 4},
       {33, 1, (const unsigned char *)"NOT DRED", 8},
@@ -133,13 +133,13 @@ void test_extensions_generate_no_padding(void)
    int result;
    unsigned char packet[32];
    result =
-    opus_packet_extensions_generate(packet, sizeof(packet), ext, 4, 11, 0);
+    oac_packet_extensions_generate(packet, sizeof(packet), ext, 4, 11, 0);
    expect_true(result == 23, "expected length 23");
 }
 
 void test_extensions_generate_fail(void)
 {
-   static const opus_extension_data ext[] = {
+   static const oac_extension_data ext[] = {
       {3, 0, (const unsigned char *)"a", 1},
       {32, 10, (const unsigned char *)"DRED", 4},
       {33, 1, (const unsigned char *)"NOT DRED", 8},
@@ -151,16 +151,16 @@ void test_extensions_generate_fail(void)
 
    /* buffer too small */
    {
-      opus_int32 len;
+      oac_int32 len;
       /* this failure can occur at lots of points, so iterate to check as many
           as possible */
       for (len=0;len<23;len++)
       {
          size_t i;
          for (i=len;i<sizeof(packet);i++) packet[i] = 0xFE;
-         result = opus_packet_extensions_generate(packet, len, ext, 4, 11, 1);
-         expect_true(result == OPUS_BUFFER_TOO_SMALL,
-          "expected OPUS_BUFFER_TOO_SMALL");
+         result = oac_packet_extensions_generate(packet, len, ext, 4, 11, 1);
+         expect_true(result == OAC_BUFFER_TOO_SMALL,
+          "expected OAC_BUFFER_TOO_SMALL");
          for (i=len;i<sizeof(packet);i++)
          {
             expect_true(packet[i] == 0xFE,
@@ -171,106 +171,106 @@ void test_extensions_generate_fail(void)
 
    /* invalid id */
    {
-      static const opus_extension_data id_too_big[] = {
+      static const oac_extension_data id_too_big[] = {
          {256, 0, (const unsigned char *)"a", 1},
       };
-      result = opus_packet_extensions_generate(packet, sizeof(packet),
+      result = oac_packet_extensions_generate(packet, sizeof(packet),
        id_too_big, 1, 11, 1);
-      expect_true(result == OPUS_BAD_ARG, "expected OPUS_BAD_ARG");
+      expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
    }
 
    /* invalid id */
    {
-      static const opus_extension_data id_too_small[] = {
+      static const oac_extension_data id_too_small[] = {
          {2, 0, (const unsigned char *)"a", 1},
       };
-      result = opus_packet_extensions_generate(packet, sizeof(packet),
+      result = oac_packet_extensions_generate(packet, sizeof(packet),
        id_too_small, 1, 11, 1);
-      expect_true(result == OPUS_BAD_ARG, "expected OPUS_BAD_ARG");
+      expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
    }
 
    /* frame count too big */
    {
-      static const opus_extension_data frame_too_big[] = {
+      static const oac_extension_data frame_too_big[] = {
          {33, 11, (const unsigned char *)"a", 1},
       };
-      result = opus_packet_extensions_generate(packet, sizeof(packet),
+      result = oac_packet_extensions_generate(packet, sizeof(packet),
        frame_too_big, 1, 49, 1);
-      expect_true(result == OPUS_BAD_ARG, "expected OPUS_BAD_ARG");
+      expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
    }
 
    /* frame index too small */
    {
-      static const opus_extension_data frame_too_big[] = {
+      static const oac_extension_data frame_too_big[] = {
          {33, -1, (const unsigned char *)"a", 1},
       };
-      result = opus_packet_extensions_generate(packet, sizeof(packet),
+      result = oac_packet_extensions_generate(packet, sizeof(packet),
        frame_too_big, 1, 11, 1);
-      expect_true(result == OPUS_BAD_ARG, "expected OPUS_BAD_ARG");
+      expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
    }
 
    /* frame index too big */
    {
-      static const opus_extension_data frame_too_big[] = {
+      static const oac_extension_data frame_too_big[] = {
          {33, 11, (const unsigned char *)"a", 1},
       };
-      result = opus_packet_extensions_generate(packet, sizeof(packet),
+      result = oac_packet_extensions_generate(packet, sizeof(packet),
        frame_too_big, 1, 11, 1);
-      expect_true(result == OPUS_BAD_ARG, "expected OPUS_BAD_ARG");
+      expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
    }
 
    /* size too big for extension IDs 1 through 31 */
    {
-      static const opus_extension_data size_too_big[] = {
+      static const oac_extension_data size_too_big[] = {
          {3, 0, (const unsigned char *)"abcd", 4},
       };
-      result = opus_packet_extensions_generate(packet, sizeof(packet),
+      result = oac_packet_extensions_generate(packet, sizeof(packet),
        size_too_big, 1, 1, 1);
-      expect_true(result == OPUS_BAD_ARG, "expected OPUS_BAD_ARG");
+      expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
    }
 
    /* negative size for extension IDs 1 through 31 */
    {
-      static const opus_extension_data neg_size[] = {
+      static const oac_extension_data neg_size[] = {
          {3, 0, NULL, -4},
       };
-      result = opus_packet_extensions_generate(packet, sizeof(packet),
+      result = oac_packet_extensions_generate(packet, sizeof(packet),
        neg_size, 1, 1, 1);
-      expect_true(result == OPUS_BAD_ARG, "expected OPUS_BAD_ARG");
+      expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
    }
 
    /* negative size for extension IDs 32 through 127 */
    {
-      static const opus_extension_data neg_size_33[] = {
+      static const oac_extension_data neg_size_33[] = {
          {33, 0, NULL, -4},
       };
-      result = opus_packet_extensions_generate(packet, sizeof(packet),
+      result = oac_packet_extensions_generate(packet, sizeof(packet),
        neg_size_33, 1, 1, 1);
-      expect_true(result == OPUS_BAD_ARG, "expected OPUS_BAD_ARG");
+      expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
    }
 }
 
 void test_extensions_parse_success(void)
 {
-   static const opus_extension_data ext[] = {
+   static const oac_extension_data ext[] = {
       {3, 0, (const unsigned char *)"a", 1},
       {32, 10, (const unsigned char *)"DRED", 4},
       {33, 1, (const unsigned char *)"NOT DRED", 8},
       {4, 4, (const unsigned char *)NULL, 0}
    };
-   opus_extension_data ext_out[10];
-   opus_int32 nb_ext;
+   oac_extension_data ext_out[10];
+   oac_int32 nb_ext;
    int nb_frames;
    int len, result;
    unsigned char packet[32];
 
    nb_ext = 10;
    nb_frames = 11;
-   len = opus_packet_extensions_generate(packet, 32, ext, 4, 11, 1);
+   len = oac_packet_extensions_generate(packet, 32, ext, 4, 11, 1);
    expect_true(len == 32, "expected length 32");
-   result = opus_packet_extensions_count(packet, len, nb_frames);
-   expect_true(result == 4, "expected opus_packet_extensions_count 4");
-   result = opus_packet_extensions_parse(packet, len, ext_out, &nb_ext,
+   result = oac_packet_extensions_count(packet, len, nb_frames);
+   expect_true(result == 4, "expected oac_packet_extensions_count 4");
+   result = oac_packet_extensions_parse(packet, len, ext_out, &nb_ext,
     nb_frames);
    expect_true(nb_ext == 4, "expected 4 extensions");
 
@@ -296,26 +296,26 @@ void test_extensions_parse_success(void)
 
 void test_extensions_parse_zero(void)
 {
-   static const opus_extension_data ext[] = {
+   static const oac_extension_data ext[] = {
       {32, 1, (const unsigned char *)"DRED", 4},
    };
-   opus_int32 nb_ext;
+   oac_int32 nb_ext;
    int nb_frames;
    int len, result;
    unsigned char packet[32];
 
-   len = opus_packet_extensions_generate(packet, 32, ext, 1, 2, 1);
+   len = oac_packet_extensions_generate(packet, 32, ext, 1, 2, 1);
    expect_true(len == 32, "expected length 32");
 
    nb_ext = 0;
    nb_frames = 2;
-   result = opus_packet_extensions_parse(packet, len, NULL, &nb_ext, nb_frames);
-   expect_true(result == OPUS_BUFFER_TOO_SMALL, "expected OPUS_BUFFER_TOO_SMALL");
+   result = oac_packet_extensions_parse(packet, len, NULL, &nb_ext, nb_frames);
+   expect_true(result == OAC_BUFFER_TOO_SMALL, "expected OAC_BUFFER_TOO_SMALL");
 }
 
 void test_extensions_parse_fail(void)
 {
-   static const opus_extension_data ext[] = {
+   static const oac_extension_data ext[] = {
       {3, 0, (const unsigned char *)"a", 1},
       {33, 1, (const unsigned char *)"NOT DRED", 8},
       {4, 4, (const unsigned char *)NULL, 0},
@@ -324,68 +324,68 @@ void test_extensions_parse_fail(void)
       {4, 9, (const unsigned char *)"b", 1},
       {4, 10, (const unsigned char *)"c", 1}
    };
-   opus_extension_data ext_out[10];
-   opus_int32 nb_ext;
+   oac_extension_data ext_out[10];
+   oac_int32 nb_ext;
    int nb_frames;
    int len, result;
    unsigned char packet[32];
 
    /* create invalid length */
-   len = opus_packet_extensions_generate(packet, sizeof(packet), ext, 4, 11, 0);
+   len = oac_packet_extensions_generate(packet, sizeof(packet), ext, 4, 11, 0);
    packet[4] = 255;
    nb_ext = 10;
    nb_frames = 11;
-   result = opus_packet_extensions_parse(packet, len, ext_out, &nb_ext,
+   result = oac_packet_extensions_parse(packet, len, ext_out, &nb_ext,
     nb_frames);
-   expect_true(result == OPUS_INVALID_PACKET, "expected OPUS_INVALID_PACKET");
-   /* note, opus_packet_extensions_count stops at the invalid frame increment
+   expect_true(result == OAC_INVALID_PACKET, "expected OAC_INVALID_PACKET");
+   /* note, oac_packet_extensions_count stops at the invalid frame increment
       and tells us that we have 1 extension */
-   result = opus_packet_extensions_count(packet, len, nb_frames);
-   expect_true(result == 1, "expected opus_packet_extensions_count to return 1");
+   result = oac_packet_extensions_count(packet, len, nb_frames);
+   expect_true(result == 1, "expected oac_packet_extensions_count to return 1");
 
    /* create invalid frame increment */
    nb_ext = 10;
-   len = opus_packet_extensions_generate(packet, sizeof(packet), ext, 4, 11, 0);
+   len = oac_packet_extensions_generate(packet, sizeof(packet), ext, 4, 11, 0);
    /* first by reducing the number of frames */
-   result = opus_packet_extensions_parse(packet, len, ext_out, &nb_ext, 5);
-   expect_true(result == OPUS_INVALID_PACKET, "expected OPUS_INVALID_PACKET");
+   result = oac_packet_extensions_parse(packet, len, ext_out, &nb_ext, 5);
+   expect_true(result == OAC_INVALID_PACKET, "expected OAC_INVALID_PACKET");
 
-   /* note, opus_packet_extensions_count stops at the invalid frame increment
+   /* note, oac_packet_extensions_count stops at the invalid frame increment
       and tells us that we have 3 extensions */
-   result = opus_packet_extensions_count(packet, len, 5);
-   expect_true(result == 3, "expected opus_packet_extensions_count to return 3");
+   result = oac_packet_extensions_count(packet, len, 5);
+   expect_true(result == 3, "expected oac_packet_extensions_count to return 3");
 
    /* then by increasing the increment */
    packet[14] = 255;
-   result = opus_packet_extensions_parse(packet, len, ext_out, &nb_ext,
+   result = oac_packet_extensions_parse(packet, len, ext_out, &nb_ext,
     nb_frames);
-   expect_true(result == OPUS_INVALID_PACKET, "expected OPUS_INVALID_PACKET");
+   expect_true(result == OAC_INVALID_PACKET, "expected OAC_INVALID_PACKET");
 
-   /* note, opus_packet_extensions_count stops at the invalid frame increment
+   /* note, oac_packet_extensions_count stops at the invalid frame increment
       and tells us that we have 2 extensions */
-   result = opus_packet_extensions_count(packet, len, nb_frames);
-   expect_true(result == 2, "expected opus_packet_extensions_count to return 2");
+   result = oac_packet_extensions_count(packet, len, nb_frames);
+   expect_true(result == 2, "expected oac_packet_extensions_count to return 2");
 
    /* not enough space */
    nb_ext = 1;
-   len = opus_packet_extensions_generate(packet, sizeof(packet), ext, 4, 11, 0);
-   result = opus_packet_extensions_parse(packet, len, ext_out, &nb_ext,
+   len = oac_packet_extensions_generate(packet, sizeof(packet), ext, 4, 11, 0);
+   result = oac_packet_extensions_parse(packet, len, ext_out, &nb_ext,
     nb_frames);
-   expect_true(result == OPUS_BUFFER_TOO_SMALL, "expected OPUS_BUFFER_TOO_SMALL");
+   expect_true(result == OAC_BUFFER_TOO_SMALL, "expected OAC_BUFFER_TOO_SMALL");
 
    /* create repeated L=0 long extension without enough room for all of the
        short extension payloads that need to follow it */
-   len = opus_packet_extensions_generate(packet, sizeof(packet), ext, 7, 11, 0);
+   len = oac_packet_extensions_generate(packet, sizeof(packet), ext, 7, 11, 0);
    len -= 5;
    nb_ext = 10;
    nb_frames = 11;
-   result = opus_packet_extensions_parse(packet, len, ext_out, &nb_ext,
+   result = oac_packet_extensions_parse(packet, len, ext_out, &nb_ext,
     nb_frames);
-   expect_true(result == OPUS_INVALID_PACKET, "expected OPUS_INVALID_PACKET");
-   /* note, opus_packet_extensions_count stops at the invalid long extension
+   expect_true(result == OAC_INVALID_PACKET, "expected OAC_INVALID_PACKET");
+   /* note, oac_packet_extensions_count stops at the invalid long extension
        and tells us that we have 5 extensions */
-   result = opus_packet_extensions_count(packet, len, nb_frames);
-   expect_true(result == 5, "expected opus_packet_extensions_count to return 5");
+   result = oac_packet_extensions_count(packet, len, nb_frames);
+   expect_true(result == 5, "expected oac_packet_extensions_count to return 5");
 
    /* overflow for long extension length */
    {
@@ -396,8 +396,8 @@ void test_extensions_parse_fail(void)
       buf[0] = 33<<1 | 1;
       memset(buf + 1, 0xFF, LENSIZE - 1);
       buf[LENSIZE] = 0xFE;
-      result = opus_packet_extensions_parse(buf, len, ext_out, &nb_ext, 1);
-      expect_true(result == OPUS_INVALID_PACKET, "expected OPUS_INVALID_PACKET");
+      result = oac_packet_extensions_parse(buf, len, ext_out, &nb_ext, 1);
+      expect_true(result == OAC_INVALID_PACKET, "expected OAC_INVALID_PACKET");
       free(buf);
    }
 }
@@ -405,11 +405,11 @@ void test_extensions_parse_fail(void)
 /* Check that the same extensions with the same data appear in both ext_in and
     ext_out, with extensions in ext_out appearing in frame order, and the order
     within a frame matching the order within a frame in ext_in. */
-static void check_ext_data(const opus_extension_data *ext_in,
- const opus_extension_data *ext_out, opus_int32 nb_ext)
+static void check_ext_data(const oac_extension_data *ext_in,
+ const oac_extension_data *ext_out, oac_int32 nb_ext)
 {
-   opus_int32 i;
-   opus_int32 j;
+   oac_int32 i;
+   oac_int32 j;
    int prev_frame;
    prev_frame = -1;
    j = 0;
@@ -441,7 +441,7 @@ static void check_ext_data(const opus_extension_data *ext_in,
 
 void test_extensions_repeating(void)
 {
-   static const opus_extension_data ext[] = {
+   static const oac_extension_data ext[] = {
       {3, 0, (const unsigned char *)"a", 1},
       {3, 1, (const unsigned char *)"b", 1},
       {3, 2, (const unsigned char *)"c", 1},
@@ -456,7 +456,7 @@ void test_extensions_repeating(void)
       {6, 1, (const unsigned char *)"e", 1},
       {32, 2, (const unsigned char *)"DREDthree", 9}
    };
-   static const opus_int32 encoded_len[] = {
+   static const oac_int32 encoded_len[] = {
       0,
       2,
       /* nb_ext = 2: don't try to repeat if the same extension is not used in
@@ -490,21 +490,21 @@ void test_extensions_repeating(void)
           on a short extension if there was a preceding L=1 long extension. */
       37
    };
-   opus_int32 nb_ext;
+   oac_int32 nb_ext;
    for (nb_ext = 0; nb_ext <= NB_EXT; nb_ext++) {
-      opus_extension_data ext_out[NB_EXT];
-      opus_int32 nb_frame_exts[48];
-      opus_int32 nb_ext_out;
+      oac_extension_data ext_out[NB_EXT];
+      oac_int32 nb_frame_exts[48];
+      oac_int32 nb_ext_out;
       int len, result;
       unsigned char packet[64];
-      len = opus_packet_extensions_generate(packet, sizeof(packet), ext,
+      len = oac_packet_extensions_generate(packet, sizeof(packet), ext,
        nb_ext, 3, 0);
       expect_true(len == encoded_len[nb_ext],
        "expected extension encoding length to match");
-      result = opus_packet_extensions_count_ext(packet, len, nb_frame_exts, 3);
+      result = oac_packet_extensions_count_ext(packet, len, nb_frame_exts, 3);
       expect_true(result == nb_ext, "expected extension count to match");
       nb_ext_out = NB_EXT;
-      result = opus_packet_extensions_parse_ext(packet, len, ext_out,
+      result = oac_packet_extensions_parse_ext(packet, len, ext_out,
        &nb_ext_out, nb_frame_exts, 3);
       expect_true(result == 0, "expected extension parsing to succeed");
       expect_true(nb_ext_out == nb_ext, "expected extension count to match");
@@ -539,10 +539,10 @@ void test_extensions_repeating(void)
          packet[26] = 2<<1|0;
       }
       else continue;
-      result = opus_packet_extensions_count_ext(packet, len, nb_frame_exts, 3);
+      result = oac_packet_extensions_count_ext(packet, len, nb_frame_exts, 3);
       expect_true(result == nb_ext, "expected extension count to match");
       nb_ext_out = NB_EXT;
-      result = opus_packet_extensions_parse_ext(packet, len, ext_out,
+      result = oac_packet_extensions_parse_ext(packet, len, ext_out,
        &nb_ext_out, nb_frame_exts, 3);
       expect_true(result == 0, "expected extension parsing to succeed");
       expect_true(nb_ext_out == nb_ext, "expected extension count to match");
@@ -558,10 +558,10 @@ void test_extensions_repeating(void)
          len++;
       }
       else continue;
-      result = opus_packet_extensions_count_ext(packet, len, nb_frame_exts, 3);
+      result = oac_packet_extensions_count_ext(packet, len, nb_frame_exts, 3);
       expect_true(result == nb_ext, "expected extension count to match");
       nb_ext_out = NB_EXT;
-      result = opus_packet_extensions_parse_ext(packet, len, ext_out,
+      result = oac_packet_extensions_parse_ext(packet, len, ext_out,
        &nb_ext_out, nb_frame_exts, 3);
       expect_true(result == 0, "expected extension parsing to succeed");
       expect_true(nb_ext_out == nb_ext, "expected extension count to match");
@@ -580,9 +580,9 @@ void test_random_extensions_parse(void)
    int i;
    for (i=0;i<NB_RANDOM_EXTENSIONS;i++)
    {
-      opus_extension_data ext_out[MAX_NB_EXTENSIONS];
+      oac_extension_data ext_out[MAX_NB_EXTENSIONS];
       int nb_frames;
-      opus_int32 nb_ext;
+      oac_int32 nb_ext;
       unsigned char payload[MAX_EXTENSION_SIZE];
       int len;
       int j;
@@ -598,8 +598,8 @@ void test_random_extensions_parse(void)
           by nb_frames == 3 being very slightly (~0.02%) more likely. */
       nb_frames = (fast_rand()%48) + 1;
       result =
-       opus_packet_extensions_parse(payload, len, ext_out, &nb_ext, nb_frames);
-      expect_true(result == OPUS_OK || result == OPUS_BUFFER_TOO_SMALL || result == OPUS_INVALID_PACKET, "expected OPUS_OK, OPUS_BUFFER_TOO_SMALL or OPUS_INVALID_PACKET");
+       oac_packet_extensions_parse(payload, len, ext_out, &nb_ext, nb_frames);
+      expect_true(result == OAC_OK || result == OAC_BUFFER_TOO_SMALL || result == OAC_INVALID_PACKET, "expected OAC_OK, OAC_BUFFER_TOO_SMALL or OAC_INVALID_PACKET");
       /* Even if parsing fails, check that the extensions that got extracted make sense. */
       for (j=0;j<nb_ext;j++)
       {
@@ -610,21 +610,21 @@ void test_random_extensions_parse(void)
       }
       /* If parsing succeeds, check to see if we can round-trip these
           extensions. */
-      if (result == OPUS_OK) {
-         opus_extension_data ext_out2[MAX_NB_EXTENSIONS];
+      if (result == OAC_OK) {
+         oac_extension_data ext_out2[MAX_NB_EXTENSIONS];
          unsigned char payload2[MAX_EXTENSION_SIZE+1];
-         opus_int32 nb_frame_exts[48];
-         opus_int32 nb_ext_out;
-         len = opus_packet_extensions_generate(payload2, sizeof(payload2),
+         oac_int32 nb_frame_exts[48];
+         oac_int32 nb_ext_out;
+         len = oac_packet_extensions_generate(payload2, sizeof(payload2),
           ext_out, nb_ext, nb_frames, 0);
          expect_true(len >= 0, "expected extension generation to succeed");
-         result = opus_packet_extensions_count_ext(payload2, len,
+         result = oac_packet_extensions_count_ext(payload2, len,
           nb_frame_exts, nb_frames);
          expect_true(result == nb_ext, "expected extension count to match");
          nb_ext_out = MAX_NB_EXTENSIONS;
-         result = opus_packet_extensions_parse_ext(payload2, len, ext_out2,
+         result = oac_packet_extensions_parse_ext(payload2, len, ext_out2,
           &nb_ext_out, nb_frame_exts, nb_frames);
-         expect_true(result == OPUS_OK,
+         expect_true(result == OAC_OK,
           "expected extension parsing to succeed");
          expect_true(nb_ext == nb_ext_out,
           "expected extension count to match");
@@ -633,25 +633,25 @@ void test_random_extensions_parse(void)
    }
 }
 
-void test_opus_repacketizer_out_range_impl(void)
+void test_oac_repacketizer_out_range_impl(void)
 {
-   OpusRepacketizer rp;
+   OacRepacketizer rp;
    unsigned char packet[1024];
    unsigned char packet_out[1024];
-   opus_int16 size[48];
+   oac_int16 size[48];
    const unsigned char *padding;
-   opus_int32 padding_len;
-   opus_extension_data ext_out[10];
+   oac_int32 padding_len;
+   oac_extension_data ext_out[10];
    int i;
-   opus_int32 nb_ext;
+   oac_int32 nb_ext;
    int res, len;
    int first_count = 0, second_count = 0;
-   static const opus_extension_data ext[] = {
+   static const oac_extension_data ext[] = {
       {33, 0, (const unsigned char *)"abcdefg", 7},
       {100, 0, (const unsigned char *)"uvwxyz", 6},
    };
 
-   opus_repacketizer_init(&rp);
+   oac_repacketizer_init(&rp);
 
    memset(packet, 0, sizeof(packet));
    /* Hybrid Packet with 20 msec frames, Code 3 */
@@ -662,61 +662,61 @@ void test_opus_repacketizer_out_range_impl(void)
    packet[3] = 0;
 
    /* generate 2 extensions, id 33 and 100 */
-   len = opus_packet_extensions_generate(&packet[4], sizeof(packet)-4, ext, 2,
+   len = oac_packet_extensions_generate(&packet[4], sizeof(packet)-4, ext, 2,
     1, 0);
    /* update the padding length */
    packet[2] = len;
 
    /* concatenate 3 frames */
-   res = opus_repacketizer_cat(&rp, packet, 4+len);
+   res = oac_repacketizer_cat(&rp, packet, 4+len);
    /* for the middle frame, no padding, no extensions */
    packet[1] = 1;
-   res = opus_repacketizer_cat(&rp, packet, 4);
+   res = oac_repacketizer_cat(&rp, packet, 4);
    /* switch back to extensions for the last frame extensions */
    packet[1] = 1 << 6 | 1;
-   res = opus_repacketizer_cat(&rp, packet, 4+len);
+   res = oac_repacketizer_cat(&rp, packet, 4+len);
 
    expect_true(rp.nb_frames == 3, "Expected 3 frames");
-   res = opus_repacketizer_out_range_impl(&rp,
+   res = oac_repacketizer_out_range_impl(&rp,
       0, 3, /* begin, end */
       packet_out, /* unsigned char *data */
-      sizeof(packet_out), /* opus_int32 maxlen */
+      sizeof(packet_out), /* oac_int32 maxlen */
       0, /*int self_delimited */
       0, /* int pad */
-      NULL, /* const opus_extension_data *extensions */
+      NULL, /* const oac_extension_data *extensions */
       0 /* int nb_extensions */);
    expect_true(res > 0, "expected valid packet length");
 
    /* now verify that we have the expected extensions */
-   res = opus_packet_parse_impl(packet_out, res, 0, NULL, NULL, size,
+   res = oac_packet_parse_impl(packet_out, res, 0, NULL, NULL, size,
       NULL, NULL, &padding, &padding_len);
    nb_ext = 10;
-   res = opus_packet_extensions_parse(padding, padding_len, ext_out, &nb_ext,
+   res = oac_packet_extensions_parse(padding, padding_len, ext_out, &nb_ext,
     3);
    expect_true(nb_ext == 4, "Expected 4 extensions");
    for (i = 0 ; i < nb_ext; i++)
    {
       if (ext_out[i].id == 33)
       {
-         opus_test_assert(ext_out[i].len == ext[0].len);
-         opus_test_assert(0 == memcmp(ext_out[i].data, ext[0].data, ext[0].len));
+         oac_test_assert(ext_out[i].len == ext[0].len);
+         oac_test_assert(0 == memcmp(ext_out[i].data, ext[0].data, ext[0].len));
          first_count++;
       }
       else if (ext_out[i].id == 100)
       {
-         opus_test_assert(ext_out[i].len == ext[1].len);
-         opus_test_assert(0 == memcmp(ext_out[i].data, ext[1].data, ext[1].len));
+         oac_test_assert(ext_out[i].len == ext[1].len);
+         oac_test_assert(0 == memcmp(ext_out[i].data, ext[1].data, ext[1].len));
          second_count++;
       }
       if (i < 2)
       {
-         opus_test_assert(ext_out[i].frame == 0);
+         oac_test_assert(ext_out[i].frame == 0);
       } else {
-         opus_test_assert(ext_out[i].frame == 2);
+         oac_test_assert(ext_out[i].frame == 2);
       }
    }
-   opus_test_assert(first_count == 2);
-   opus_test_assert(second_count == 2);
+   oac_test_assert(first_count == 2);
+   oac_test_assert(second_count == 2);
 }
 
 int main(int argc, char **argv)
@@ -731,7 +731,7 @@ int main(int argc, char **argv)
       iseed=atoi(env_seed);
       env_used=1;
    }
-   else iseed=(opus_uint32)time(NULL)^(((opus_uint32)getpid()&65535)<<16);
+   else iseed=(oac_uint32)time(NULL)^(((oac_uint32)getpid()&65535)<<16);
    Rw=Rz=iseed;
 
    fprintf(stderr,"Testing extensions. Random seed: %u (%.4X)\n", iseed, fast_rand() % 65535);
@@ -746,7 +746,7 @@ int main(int argc, char **argv)
    test_extensions_parse_fail();
    test_extensions_repeating();
    test_random_extensions_parse();
-   test_opus_repacketizer_out_range_impl();
+   test_oac_repacketizer_out_range_impl();
    fprintf(stderr,"Tests completed successfully.\n");
    return 0;
 }
diff --git a/tests/test_opus_padding.c b/tests/test_oac_padding.c
similarity index 83%
rename from tests/test_opus_padding.c
rename to tests/test_oac_padding.c
index 20eb483b8..a4e23e0e0 100644
--- a/tests/test_opus_padding.c
+++ b/tests/test_oac_padding.c
@@ -26,7 +26,7 @@
 */
 
 /* Check for overflow in reading the padding length.
- * http://lists.xiph.org/pipermail/opus/2012-November/001834.html
+ * http://lists.xiph.org/pipermail/oac/2012-November/001834.html
  */
 
 #ifdef HAVE_CONFIG_H
@@ -36,8 +36,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "opus.h"
-#include "test_opus_common.h"
+#include "oac.h"
+#include "test_oac_common.h"
 
 #define PACKETSIZE 16909318
 #define CHANNELS 2
@@ -45,12 +45,12 @@
 
 void test_overflow(void)
 {
-  OpusDecoder *decoder;
+  OacDecoder *decoder;
   int result;
   int error;
 
   unsigned char *in = (unsigned char *)malloc(PACKETSIZE);
-  opus_int16 *out = (opus_int16 *)malloc(FRAMESIZE*CHANNELS*sizeof(*out));
+  oac_int16 *out = (oac_int16 *)malloc(FRAMESIZE*CHANNELS*sizeof(*out));
 
   fprintf(stderr, "  Checking for padding overflow... ");
   if (!in || !out) {
@@ -62,14 +62,14 @@ void test_overflow(void)
   memset(in + 2, 0xff, PACKETSIZE - 3);
   in[PACKETSIZE-1] = 0x0b;
 
-  decoder = opus_decoder_create(48000, CHANNELS, &error);
-  result = opus_decode(decoder, in, PACKETSIZE, out, FRAMESIZE, 0);
-  opus_decoder_destroy(decoder);
+  decoder = oac_decoder_create(48000, CHANNELS, &error);
+  result = oac_decode(decoder, in, PACKETSIZE, out, FRAMESIZE, 0);
+  oac_decoder_destroy(decoder);
 
   free(in);
   free(out);
 
-  if (result != OPUS_INVALID_PACKET) {
+  if (result != OAC_INVALID_PACKET) {
     fprintf(stderr, "FAIL!\n");
     test_failed();
   }
@@ -82,7 +82,7 @@ int main(void)
   const char *oversion;
 
   iseed = 0;
-  oversion = opus_get_version_string();
+  oversion = oac_get_version_string();
   if (!oversion) test_failed();
   fprintf(stderr, "Testing %s padding.\n", oversion);
 
diff --git a/tests/test_opus_projection.c b/tests/test_oac_projection.c
similarity index 69%
rename from tests/test_opus_projection.c
rename to tests/test_oac_projection.c
index a3f3a6561..a9b226ced 100644
--- a/tests/test_opus_projection.c
+++ b/tests/test_oac_projection.c
@@ -34,9 +34,9 @@
 #include <stdint.h>
 #include <string.h>
 #include "float_cast.h"
-#include "opus.h"
-#include "test_opus_common.h"
-#include "opus_projection.h"
+#include "oac.h"
+#include "test_oac_common.h"
+#include "oac_projection.h"
 #include "mathops.h"
 #include "../src/mapping_matrix.h"
 #include "mathops.h"
@@ -52,7 +52,7 @@
 #define SIMPLE_MATRIX_OUTPUT_SIZE 40
 
 int assert_is_equal(
-  const opus_res *a, const opus_int16 *b, int size, opus_int16 tolerance)
+  const oac_res *a, const oac_int16 *b, int size, oac_int16 tolerance)
 {
   int i;
   for (i = 0; i < size; i++)
@@ -64,7 +64,7 @@ int assert_is_equal(
 }
 
 int assert_is_equal_short(
-  const opus_int16 *a, const opus_int16 *b, int size, opus_int16 tolerance)
+  const oac_int16 *a, const oac_int16 *b, int size, oac_int16 tolerance)
 {
   int i;
   for (i = 0; i < size; i++)
@@ -76,28 +76,28 @@ int assert_is_equal_short(
 void test_simple_matrix(void)
 {
   const MappingMatrix simple_matrix_params = {4, 3, 0};
-  const opus_int16 simple_matrix_data[SIMPLE_MATRIX_SIZE] = {0, 32767, 0, 0, 32767, 0, 0, 0, 0, 0, 0, 32767};
-  const opus_int16 input_int16[SIMPLE_MATRIX_INPUT_SIZE] = {
+  const oac_int16 simple_matrix_data[SIMPLE_MATRIX_SIZE] = {0, 32767, 0, 0, 32767, 0, 0, 0, 0, 0, 0, 32767};
+  const oac_int16 input_int16[SIMPLE_MATRIX_INPUT_SIZE] = {
     32767, 0, -32768, 29491, -3277, -29491, 26214, -6554, -26214, 22938, -9830,
     -22938, 19661, -13107, -19661, 16384, -16384, -16384, 13107, -19661, -13107,
     9830, -22938, -9830, 6554, -26214, -6554, 3277, -29491, -3277};
-  const opus_int16 expected_output_int16[SIMPLE_MATRIX_OUTPUT_SIZE] = {
+  const oac_int16 expected_output_int16[SIMPLE_MATRIX_OUTPUT_SIZE] = {
     0, 32767, 0, -32768, -3277, 29491, 0, -29491, -6554, 26214, 0, -26214,
     -9830, 22938, 0, -22938, -13107, 19661, 0, -19661, -16384, 16384, 0, -16384,
     -19661, 13107, 0, -13107, -22938, 9830, 0, -9830, -26214, 6554, 0, -6554,
     -29491, 3277, 0, -3277};
 
   int i, ret;
-  opus_int32 simple_matrix_size;
-  opus_res *input_pcm;
-  opus_res *output_pcm;
-  opus_int16 *output_int16;
+  oac_int32 simple_matrix_size;
+  oac_res *input_pcm;
+  oac_res *output_pcm;
+  oac_int16 *output_int16;
   MappingMatrix *simple_matrix;
 
   /* Allocate input/output buffers. */
-  input_pcm = (opus_res *)opus_alloc(sizeof(opus_res) * SIMPLE_MATRIX_INPUT_SIZE);
-  output_int16 = (opus_int16 *)opus_alloc(sizeof(opus_int16) * SIMPLE_MATRIX_OUTPUT_SIZE);
-  output_pcm = (opus_res *)opus_alloc(sizeof(opus_res) * SIMPLE_MATRIX_OUTPUT_SIZE);
+  input_pcm = (oac_res *)oac_alloc(sizeof(oac_res) * SIMPLE_MATRIX_INPUT_SIZE);
+  output_int16 = (oac_int16 *)oac_alloc(sizeof(oac_int16) * SIMPLE_MATRIX_OUTPUT_SIZE);
+  output_pcm = (oac_res *)oac_alloc(sizeof(oac_res) * SIMPLE_MATRIX_OUTPUT_SIZE);
 
   /* Initialize matrix */
   simple_matrix_size = mapping_matrix_get_size(simple_matrix_params.rows,
@@ -105,7 +105,7 @@ void test_simple_matrix(void)
   if (!simple_matrix_size)
     test_failed();
 
-  simple_matrix = (MappingMatrix *)opus_alloc(simple_matrix_size);
+  simple_matrix = (MappingMatrix *)oac_alloc(simple_matrix_size);
   mapping_matrix_init(simple_matrix, simple_matrix_params.rows,
     simple_matrix_params.cols, simple_matrix_params.gain, simple_matrix_data,
     sizeof(simple_matrix_data));
@@ -170,10 +170,10 @@ void test_simple_matrix(void)
     test_failed();
 #endif
 
-  opus_free(input_pcm);
-  opus_free(output_int16);
-  opus_free(output_pcm);
-  opus_free(simple_matrix);
+  oac_free(input_pcm);
+  oac_free(output_int16);
+  oac_free(output_pcm);
+  oac_free(simple_matrix);
 }
 
 void test_creation_arguments(const int channels, const int mapping_family)
@@ -183,11 +183,11 @@ void test_creation_arguments(const int channels, const int mapping_family)
   int enc_error;
   int dec_error;
   int ret;
-  OpusProjectionEncoder *st_enc = NULL;
-  OpusProjectionDecoder *st_dec = NULL;
+  OacProjectionEncoder *st_enc = NULL;
+  OacProjectionDecoder *st_dec = NULL;
 
-  const opus_int32 Fs = 48000;
-  const int application = OPUS_APPLICATION_AUDIO;
+  const oac_int32 Fs = 48000;
+  const int application = OAC_APPLICATION_AUDIO;
 
   int order_plus_one = (int)floor(sqrt((float)channels));
   int nondiegetic_channels = channels - order_plus_one * order_plus_one;
@@ -195,36 +195,36 @@ void test_creation_arguments(const int channels, const int mapping_family)
   int is_channels_valid = 0;
   int is_projection_valid = 0;
 
-  st_enc = opus_projection_ambisonics_encoder_create(Fs, channels,
+  st_enc = oac_projection_ambisonics_encoder_create(Fs, channels,
     mapping_family, &streams, &coupled_streams, application, &enc_error);
   if (st_enc != NULL)
   {
-    opus_int32 matrix_size;
+    oac_int32 matrix_size;
     unsigned char *matrix;
 
-    ret = opus_projection_encoder_ctl(st_enc,
-      OPUS_PROJECTION_GET_DEMIXING_MATRIX_SIZE_REQUEST, &matrix_size);
-    if (ret != OPUS_OK || !matrix_size)
+    ret = oac_projection_encoder_ctl(st_enc,
+      OAC_PROJECTION_GET_DEMIXING_MATRIX_SIZE_REQUEST, &matrix_size);
+    if (ret != OAC_OK || !matrix_size)
       test_failed();
 
-    matrix = (unsigned char *)opus_alloc(matrix_size);
-    ret = opus_projection_encoder_ctl(st_enc,
-      OPUS_PROJECTION_GET_DEMIXING_MATRIX_REQUEST, matrix, matrix_size);
+    matrix = (unsigned char *)oac_alloc(matrix_size);
+    ret = oac_projection_encoder_ctl(st_enc,
+      OAC_PROJECTION_GET_DEMIXING_MATRIX_REQUEST, matrix, matrix_size);
 
-    opus_projection_encoder_destroy(st_enc);
+    oac_projection_encoder_destroy(st_enc);
 
-    st_dec = opus_projection_decoder_create(Fs, channels, streams,
+    st_dec = oac_projection_decoder_create(Fs, channels, streams,
       coupled_streams, matrix, matrix_size, &dec_error);
     if (st_dec != NULL)
     {
-      opus_projection_decoder_destroy(st_dec);
+      oac_projection_decoder_destroy(st_dec);
     }
-    opus_free(matrix);
+    oac_free(matrix);
   }
 
   is_channels_valid = (order_plus_one >= 2 && order_plus_one <= 6) &&
     (nondiegetic_channels == 0 || nondiegetic_channels == 2);
-  is_projection_valid = (enc_error == OPUS_OK && dec_error == OPUS_OK);
+  is_projection_valid = (enc_error == OAC_OK && dec_error == OAC_OK);
   if (is_channels_valid ^ is_projection_valid)
   {
     fprintf(stderr, "Channels: %d, Family: %d\n", channels, mapping_family);
@@ -236,26 +236,26 @@ void test_creation_arguments(const int channels, const int mapping_family)
   }
 }
 
-void generate_music(short *buf, opus_int32 len, opus_int32 channels)
+void generate_music(short *buf, oac_int32 len, oac_int32 channels)
 {
-   opus_int32 i,j,k;
-   opus_int32 *a,*b,*c,*d;
-   a = (opus_int32 *)malloc(sizeof(opus_int32) * channels);
-   b = (opus_int32 *)malloc(sizeof(opus_int32) * channels);
-   c = (opus_int32 *)malloc(sizeof(opus_int32) * channels);
-   d = (opus_int32 *)malloc(sizeof(opus_int32) * channels);
-   memset(a, 0, sizeof(opus_int32) * channels);
-   memset(b, 0, sizeof(opus_int32) * channels);
-   memset(c, 0, sizeof(opus_int32) * channels);
-   memset(d, 0, sizeof(opus_int32) * channels);
+   oac_int32 i,j,k;
+   oac_int32 *a,*b,*c,*d;
+   a = (oac_int32 *)malloc(sizeof(oac_int32) * channels);
+   b = (oac_int32 *)malloc(sizeof(oac_int32) * channels);
+   c = (oac_int32 *)malloc(sizeof(oac_int32) * channels);
+   d = (oac_int32 *)malloc(sizeof(oac_int32) * channels);
+   memset(a, 0, sizeof(oac_int32) * channels);
+   memset(b, 0, sizeof(oac_int32) * channels);
+   memset(c, 0, sizeof(oac_int32) * channels);
+   memset(d, 0, sizeof(oac_int32) * channels);
    j=0;
 
    for(i=0;i<len;i++)
    {
      for(k=0;k<channels;k++)
      {
-      opus_uint32 r;
-      opus_int32 v;
+      oac_uint32 r;
+      oac_int32 v;
       v=(((j*((j>>12)^((j>>10|j>>12)&26&j>>7)))&128)+128)<<15;
       r=fast_rand();v+=r&65535;v-=r>>16;
       b[k]=v-a[k]+((b[k]*61+32)>>6);a[k]=v;
@@ -272,14 +272,14 @@ void generate_music(short *buf, opus_int32 len, opus_int32 channels)
    free(d);
 }
 
-void test_encode_decode(opus_int32 bitrate, opus_int32 channels,
+void test_encode_decode(oac_int32 bitrate, oac_int32 channels,
                         const int mapping_family)
 {
-  const opus_int32 Fs = 48000;
-  const int application = OPUS_APPLICATION_AUDIO;
+  const oac_int32 Fs = 48000;
+  const int application = OAC_APPLICATION_AUDIO;
 
-  OpusProjectionEncoder *st_enc;
-  OpusProjectionDecoder *st_dec;
+  OacProjectionEncoder *st_enc;
+  OacProjectionDecoder *st_dec;
   int streams;
   int coupled;
   int error;
@@ -288,15 +288,15 @@ void test_encode_decode(opus_int32 bitrate, opus_int32 channels,
   unsigned char data[MAX_DATA_BYTES] = { 0 };
   int len;
   int out_samples;
-  opus_int32 matrix_size = 0;
+  oac_int32 matrix_size = 0;
   unsigned char *matrix = NULL;
 
   buffer_in = (short *)malloc(sizeof(short) * BUFFER_SIZE * channels);
   buffer_out = (short *)malloc(sizeof(short) * BUFFER_SIZE * channels);
 
-  st_enc = opus_projection_ambisonics_encoder_create(Fs, channels,
+  st_enc = oac_projection_ambisonics_encoder_create(Fs, channels,
     mapping_family, &streams, &coupled, application, &error);
-  if (error != OPUS_OK) {
+  if (error != OAC_OK) {
     fprintf(stderr,
       "Couldn\'t create encoder with %d channels and mapping family %d.\n",
       channels, mapping_family);
@@ -305,29 +305,29 @@ void test_encode_decode(opus_int32 bitrate, opus_int32 channels,
     test_failed();
   }
 
-  error = opus_projection_encoder_ctl(st_enc,
-    OPUS_SET_BITRATE(bitrate * 1000 * (streams + coupled)));
-  if (error != OPUS_OK)
+  error = oac_projection_encoder_ctl(st_enc,
+    OAC_SET_BITRATE(bitrate * 1000 * (streams + coupled)));
+  if (error != OAC_OK)
   {
     goto bad_cleanup;
   }
 
-  error = opus_projection_encoder_ctl(st_enc,
-    OPUS_PROJECTION_GET_DEMIXING_MATRIX_SIZE_REQUEST, &matrix_size);
-  if (error != OPUS_OK || !matrix_size)
+  error = oac_projection_encoder_ctl(st_enc,
+    OAC_PROJECTION_GET_DEMIXING_MATRIX_SIZE_REQUEST, &matrix_size);
+  if (error != OAC_OK || !matrix_size)
   {
     goto bad_cleanup;
   }
 
-  matrix = (unsigned char *)opus_alloc(matrix_size);
-  error = opus_projection_encoder_ctl(st_enc,
-    OPUS_PROJECTION_GET_DEMIXING_MATRIX_REQUEST, matrix, matrix_size);
+  matrix = (unsigned char *)oac_alloc(matrix_size);
+  error = oac_projection_encoder_ctl(st_enc,
+    OAC_PROJECTION_GET_DEMIXING_MATRIX_REQUEST, matrix, matrix_size);
 
-  st_dec = opus_projection_decoder_create(Fs, channels, streams, coupled,
+  st_dec = oac_projection_decoder_create(Fs, channels, streams, coupled,
     matrix, matrix_size, &error);
-  opus_free(matrix);
+  oac_free(matrix);
 
-  if (error != OPUS_OK) {
+  if (error != OAC_OK) {
     fprintf(stderr,
       "Couldn\'t create decoder with %d channels, %d streams "
       "and %d coupled streams.\n", channels, streams, coupled);
@@ -336,22 +336,22 @@ void test_encode_decode(opus_int32 bitrate, opus_int32 channels,
 
   generate_music(buffer_in, BUFFER_SIZE, channels);
 
-  len = opus_projection_encode(
+  len = oac_projection_encode(
     st_enc, buffer_in, BUFFER_SIZE, data, MAX_DATA_BYTES);
   if(len<0 || len>MAX_DATA_BYTES) {
-    fprintf(stderr,"opus_encode() returned %d\n", len);
+    fprintf(stderr,"oac_encode() returned %d\n", len);
     goto bad_cleanup;
   }
 
-  out_samples = opus_projection_decode(
+  out_samples = oac_projection_decode(
     st_dec, data, len, buffer_out, MAX_FRAME_SAMPLES, 0);
   if(out_samples!=BUFFER_SIZE) {
-    fprintf(stderr,"opus_decode() returned %d\n", out_samples);
+    fprintf(stderr,"oac_decode() returned %d\n", out_samples);
     goto bad_cleanup;
   }
 
-  opus_projection_decoder_destroy(st_dec);
-  opus_projection_encoder_destroy(st_enc);
+  oac_projection_decoder_destroy(st_dec);
+  oac_projection_encoder_destroy(st_enc);
   free(buffer_in);
   free(buffer_out);
   return;
diff --git a/tests/test_opus_api.c b/tests/test_opus_api.c
deleted file mode 100644
index cbd68f0d4..000000000
--- a/tests/test_opus_api.c
+++ /dev/null
@@ -1,1916 +0,0 @@
-/* Copyright (c) 2011-2013 Xiph.Org Foundation
-   Written by Gregory Maxwell */
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/* This tests the API presented by the libopus system.
-   It does not attempt to extensively exercise the codec internals.
-   The strategy here is to simply the API interface invariants:
-   That sane options are accepted, insane options are rejected,
-   and that nothing blows up. In particular we don't actually test
-   that settings are heeded by the codec (though we do check that
-   get after set returns a sane value when it should). Other
-   tests check the actual codec behavior.
-   In cases where its reasonable to do so we test exhaustively,
-   but its not reasonable to do so in all cases.
-   Although these tests are simple they found several library bugs
-   when they were initially developed. */
-
-/* These tests are more sensitive if compiled with -DVALGRIND and
-   run inside valgrind. Malloc failure testing requires glibc. */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include "arch.h"
-#include "opus_multistream.h"
-#include "opus.h"
-#include "test_opus_common.h"
-
-#ifdef VALGRIND
-#include <valgrind/memcheck.h>
-#define VG_UNDEF(x,y) VALGRIND_MAKE_MEM_UNDEFINED((x),(y))
-#define VG_CHECK(x,y) VALGRIND_CHECK_MEM_IS_DEFINED((x),(y))
-#else
-#define VG_UNDEF(x,y)
-#define VG_CHECK(x,y)
-#endif
-
-#if defined(HAVE___MALLOC_HOOK)
-#define MALLOC_FAIL
-#include "os_support.h"
-#include <malloc.h>
-
-static const opus_int32 opus_apps[3] = {OPUS_APPLICATION_VOIP,
-       OPUS_APPLICATION_AUDIO,OPUS_APPLICATION_RESTRICTED_LOWDELAY};
-
-void *malloc_hook(__attribute__((unused)) size_t size,
-                  __attribute__((unused)) const void *caller)
-{
-   return 0;
-}
-#endif
-
-opus_int32 *null_int_ptr = (opus_int32 *)NULL;
-opus_uint32 *null_uint_ptr = (opus_uint32 *)NULL;
-
-static const opus_int32 opus_rates[5] = {48000,24000,16000,12000,8000};
-
-opus_int32 test_dec_api(void)
-{
-   opus_uint32 dec_final_range;
-   OpusDecoder *dec;
-   OpusDecoder *dec2;
-   opus_int32 i,j,cfgs;
-   unsigned char packet[1276];
-#ifndef DISABLE_FLOAT_API
-   float fbuf[960*2];
-#endif
-   short sbuf[960*2];
-   int c,err;
-
-   cfgs=0;
-   /*First test invalid configurations which should fail*/
-   fprintf(stdout,"\n  Decoder basic API tests\n");
-   fprintf(stdout,"  ---------------------------------------------------\n");
-   for(c=0;c<4;c++)
-   {
-      i=opus_decoder_get_size(c);
-      if(((c==1||c==2)&&(i<=2048||i>1<<18))||((c!=1&&c!=2)&&i!=0))test_failed();
-      fprintf(stdout,"    opus_decoder_get_size(%d)=%d ...............%s OK.\n",c,i,i>0?"":"....");
-      cfgs++;
-   }
-
-   /*Test with unsupported sample rates*/
-   for(c=0;c<4;c++)
-   {
-      for(i=-7;i<=96000;i++)
-      {
-         int fs;
-         if((i==8000||i==12000||i==16000||i==24000||i==48000
-#ifdef ENABLE_QEXT
-               ||i==96000
-#endif
-               )&&(c==1||c==2))continue;
-         switch(i)
-         {
-           case(-5):fs=-8000;break;
-           case(-6):fs=INT32_MAX;break;
-           case(-7):fs=INT32_MIN;break;
-           default:fs=i;
-         }
-         err = OPUS_OK;
-         VG_UNDEF(&err,sizeof(err));
-         dec = opus_decoder_create(fs, c, &err);
-         if(err!=OPUS_BAD_ARG || dec!=NULL)test_failed();
-         cfgs++;
-         dec = opus_decoder_create(fs, c, 0);
-         if(dec!=NULL)test_failed();
-         cfgs++;
-         dec=(OpusDecoder*)malloc(opus_decoder_get_size(2));
-         if(dec==NULL)test_failed();
-         err = opus_decoder_init(dec,fs,c);
-         if(err!=OPUS_BAD_ARG)test_failed();
-         cfgs++;
-         free(dec);
-      }
-   }
-
-   VG_UNDEF(&err,sizeof(err));
-   dec = opus_decoder_create(48000, 2, &err);
-   if(err!=OPUS_OK || dec==NULL)test_failed();
-   VG_CHECK(dec,opus_decoder_get_size(2));
-   cfgs++;
-
-   fprintf(stdout,"    opus_decoder_create() ........................ OK.\n");
-   fprintf(stdout,"    opus_decoder_init() .......................... OK.\n");
-
-   err=opus_decoder_ctl(dec, OPUS_GET_FINAL_RANGE(null_uint_ptr));
-   if(err != OPUS_BAD_ARG)test_failed();
-   VG_UNDEF(&dec_final_range,sizeof(dec_final_range));
-   err=opus_decoder_ctl(dec, OPUS_GET_FINAL_RANGE(&dec_final_range));
-   if(err!=OPUS_OK)test_failed();
-   VG_CHECK(&dec_final_range,sizeof(dec_final_range));
-   fprintf(stdout,"    OPUS_GET_FINAL_RANGE ......................... OK.\n");
-   cfgs++;
-
-   err=opus_decoder_ctl(dec,OPUS_UNIMPLEMENTED);
-   if(err!=OPUS_UNIMPLEMENTED)test_failed();
-   fprintf(stdout,"    OPUS_UNIMPLEMENTED ........................... OK.\n");
-   cfgs++;
-
-   err=opus_decoder_ctl(dec, OPUS_GET_BANDWIDTH(null_int_ptr));
-   if(err != OPUS_BAD_ARG)test_failed();
-   VG_UNDEF(&i,sizeof(i));
-   err=opus_decoder_ctl(dec, OPUS_GET_BANDWIDTH(&i));
-   if(err != OPUS_OK || i!=0)test_failed();
-   fprintf(stdout,"    OPUS_GET_BANDWIDTH ........................... OK.\n");
-   cfgs++;
-
-   err=opus_decoder_ctl(dec, OPUS_GET_SAMPLE_RATE(null_int_ptr));
-   if(err != OPUS_BAD_ARG)test_failed();
-   VG_UNDEF(&i,sizeof(i));
-   err=opus_decoder_ctl(dec, OPUS_GET_SAMPLE_RATE(&i));
-   if(err != OPUS_OK || i!=48000)test_failed();
-   fprintf(stdout,"    OPUS_GET_SAMPLE_RATE ......................... OK.\n");
-   cfgs++;
-
-   /*GET_PITCH has different execution paths depending on the previously decoded frame.*/
-   err=opus_decoder_ctl(dec, OPUS_GET_PITCH(null_int_ptr));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   VG_UNDEF(&i,sizeof(i));
-   err=opus_decoder_ctl(dec, OPUS_GET_PITCH(&i));
-   if(err != OPUS_OK || i>0 || i<-1)test_failed();
-   cfgs++;
-   VG_UNDEF(packet,sizeof(packet));
-   packet[0]=63<<2;packet[1]=packet[2]=0;
-   if(opus_decode(dec, packet, 3, sbuf, 960, 0)!=960)test_failed();
-   cfgs++;
-   VG_UNDEF(&i,sizeof(i));
-   err=opus_decoder_ctl(dec, OPUS_GET_PITCH(&i));
-   if(err != OPUS_OK || i>0 || i<-1)test_failed();
-   cfgs++;
-   packet[0]=1;
-   if(opus_decode(dec, packet, 1, sbuf, 960, 0)!=960)test_failed();
-   cfgs++;
-   VG_UNDEF(&i,sizeof(i));
-   err=opus_decoder_ctl(dec, OPUS_GET_PITCH(&i));
-   if(err != OPUS_OK || i>0 || i<-1)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OPUS_GET_PITCH ............................... OK.\n");
-
-   err=opus_decoder_ctl(dec, OPUS_GET_LAST_PACKET_DURATION(null_int_ptr));
-   if(err != OPUS_BAD_ARG)test_failed();
-   VG_UNDEF(&i,sizeof(i));
-   err=opus_decoder_ctl(dec, OPUS_GET_LAST_PACKET_DURATION(&i));
-   if(err != OPUS_OK || i!=960)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OPUS_GET_LAST_PACKET_DURATION ................ OK.\n");
-
-   VG_UNDEF(&i,sizeof(i));
-   err=opus_decoder_ctl(dec, OPUS_GET_GAIN(&i));
-   VG_CHECK(&i,sizeof(i));
-   if(err != OPUS_OK || i!=0)test_failed();
-   cfgs++;
-   err=opus_decoder_ctl(dec, OPUS_GET_GAIN(null_int_ptr));
-   if(err != OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   err=opus_decoder_ctl(dec, OPUS_SET_GAIN(-32769));
-   if(err != OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   err=opus_decoder_ctl(dec, OPUS_SET_GAIN(32768));
-   if(err != OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   err=opus_decoder_ctl(dec, OPUS_SET_GAIN(-15));
-   if(err != OPUS_OK)test_failed();
-   cfgs++;
-   VG_UNDEF(&i,sizeof(i));
-   err=opus_decoder_ctl(dec, OPUS_GET_GAIN(&i));
-   VG_CHECK(&i,sizeof(i));
-   if(err != OPUS_OK || i!=-15)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OPUS_SET_GAIN ................................ OK.\n");
-   fprintf(stdout,"    OPUS_GET_GAIN ................................ OK.\n");
-
-   /*Reset the decoder*/
-   dec2=(OpusDecoder*)malloc(opus_decoder_get_size(2));
-   memcpy(dec2,dec,opus_decoder_get_size(2));
-   if(opus_decoder_ctl(dec, OPUS_RESET_STATE)!=OPUS_OK)test_failed();
-   if(memcmp(dec2,dec,opus_decoder_get_size(2))==0)test_failed();
-   free(dec2);
-   fprintf(stdout,"    OPUS_RESET_STATE ............................. OK.\n");
-   cfgs++;
-
-   VG_UNDEF(packet,sizeof(packet));
-   packet[0]=0;
-   if(opus_decoder_get_nb_samples(dec,packet,1)!=480)test_failed();
-   if(opus_packet_get_nb_samples(packet,1,48000)!=480)test_failed();
-   if(opus_packet_get_nb_samples(packet,1,96000)!=960)test_failed();
-   if(opus_packet_get_nb_samples(packet,1,32000)!=320)test_failed();
-   if(opus_packet_get_nb_samples(packet,1,8000)!=80)test_failed();
-   packet[0]=3;
-   if(opus_packet_get_nb_samples(packet,1,24000)!=OPUS_INVALID_PACKET)test_failed();
-   packet[0]=(63<<2)|3;
-   packet[1]=63;
-   if(opus_packet_get_nb_samples(packet,0,24000)!=OPUS_BAD_ARG)test_failed();
-   if(opus_packet_get_nb_samples(packet,2,48000)!=OPUS_INVALID_PACKET)test_failed();
-   if(opus_decoder_get_nb_samples(dec,packet,2)!=OPUS_INVALID_PACKET)test_failed();
-   fprintf(stdout,"    opus_{packet,decoder}_get_nb_samples() ....... OK.\n");
-   cfgs+=9;
-
-   if(OPUS_BAD_ARG!=opus_packet_get_nb_frames(packet,0))test_failed();
-   for(i=0;i<256;i++) {
-     int l1res[4]={1,2,2,OPUS_INVALID_PACKET};
-     packet[0]=i;
-     if(l1res[packet[0]&3]!=opus_packet_get_nb_frames(packet,1))test_failed();
-     cfgs++;
-     for(j=0;j<256;j++) {
-       packet[1]=j;
-       if(((packet[0]&3)!=3?l1res[packet[0]&3]:packet[1]&63)!=opus_packet_get_nb_frames(packet,2))test_failed();
-       cfgs++;
-     }
-   }
-   fprintf(stdout,"    opus_packet_get_nb_frames() .................. OK.\n");
-
-   for(i=0;i<256;i++) {
-     int bw;
-     packet[0]=i;
-     bw=packet[0]>>4;
-     bw=OPUS_BANDWIDTH_NARROWBAND+(((((bw&7)*9)&(63-(bw&8)))+2+12*((bw&8)!=0))>>4);
-     if(bw!=opus_packet_get_bandwidth(packet))test_failed();
-     cfgs++;
-   }
-   fprintf(stdout,"    opus_packet_get_bandwidth() .................. OK.\n");
-
-   for(i=0;i<256;i++) {
-     int fp3s,rate;
-     packet[0]=i;
-     fp3s=packet[0]>>3;
-     fp3s=((((3-(fp3s&3))*13&119)+9)>>2)*((fp3s>13)*(3-((fp3s&3)==3))+1)*25;
-     for(rate=0;rate<5;rate++) {
-       if((opus_rates[rate]*3/fp3s)!=opus_packet_get_samples_per_frame(packet,opus_rates[rate]))test_failed();
-       cfgs++;
-     }
-   }
-   fprintf(stdout,"    opus_packet_get_samples_per_frame() .......... OK.\n");
-
-   packet[0]=(63<<2)+3;
-   packet[1]=49;
-   for(j=2;j<51;j++)packet[j]=0;
-   VG_UNDEF(sbuf,sizeof(sbuf));
-   if(opus_decode(dec, packet, 51, sbuf, 960, 0)!=OPUS_INVALID_PACKET)test_failed();
-   cfgs++;
-   packet[0]=(63<<2);
-   packet[1]=packet[2]=0;
-   if(opus_decode(dec, packet, -1, sbuf, 960, 0)!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   if(opus_decode(dec, packet, 3, sbuf, 60, 0)!=OPUS_BUFFER_TOO_SMALL)test_failed();
-   cfgs++;
-   if(opus_decode(dec, packet, 3, sbuf, 480, 0)!=OPUS_BUFFER_TOO_SMALL)test_failed();
-   cfgs++;
-   if(opus_decode(dec, packet, 3, sbuf, 960, 0)!=960)test_failed();
-   cfgs++;
-   fprintf(stdout,"    opus_decode() ................................ OK.\n");
-#ifndef DISABLE_FLOAT_API
-   VG_UNDEF(fbuf,sizeof(fbuf));
-   if(opus_decode_float(dec, packet, 3, fbuf, 960, 0)!=960)test_failed();
-   cfgs++;
-   fprintf(stdout,"    opus_decode_float() .......................... OK.\n");
-#endif
-
-#if 0
-   /*These tests are disabled because the library crashes with null states*/
-   if(opus_decoder_ctl(0,OPUS_RESET_STATE)         !=OPUS_INVALID_STATE)test_failed();
-   if(opus_decoder_init(0,48000,1)                 !=OPUS_INVALID_STATE)test_failed();
-   if(opus_decode(0,packet,1,outbuf,2880,0)        !=OPUS_INVALID_STATE)test_failed();
-   if(opus_decode_float(0,packet,1,0,2880,0)       !=OPUS_INVALID_STATE)test_failed();
-   if(opus_decoder_get_nb_samples(0,packet,1)      !=OPUS_INVALID_STATE)test_failed();
-   if(opus_packet_get_nb_frames(NULL,1)            !=OPUS_BAD_ARG)test_failed();
-   if(opus_packet_get_bandwidth(NULL)              !=OPUS_BAD_ARG)test_failed();
-   if(opus_packet_get_samples_per_frame(NULL,48000)!=OPUS_BAD_ARG)test_failed();
-#endif
-   opus_decoder_destroy(dec);
-   cfgs++;
-   fprintf(stdout,"                   All decoder interface tests passed\n");
-   fprintf(stdout,"                             (%6d API invocations)\n",cfgs);
-   return cfgs;
-}
-
-opus_int32 test_msdec_api(void)
-{
-   opus_uint32 dec_final_range;
-   OpusMSDecoder *dec;
-   OpusDecoder *streamdec;
-   opus_int32 i,j,cfgs;
-   unsigned char packet[1276];
-   unsigned char mapping[256];
-#ifndef DISABLE_FLOAT_API
-   float fbuf[960*2];
-#endif
-   short sbuf[960*2];
-   int a,b,c,err;
-
-   mapping[0]=0;
-   mapping[1]=1;
-   for(i=2;i<256;i++)VG_UNDEF(&mapping[i],sizeof(unsigned char));
-
-   cfgs=0;
-   /*First test invalid configurations which should fail*/
-   fprintf(stdout,"\n  Multistream decoder basic API tests\n");
-   fprintf(stdout,"  ---------------------------------------------------\n");
-   for(a=-1;a<4;a++)
-   {
-      for(b=-1;b<4;b++)
-      {
-         i=opus_multistream_decoder_get_size(a,b);
-         if(((a>0&&b<=a&&b>=0)&&(i<=2048||i>((1<<18)*a)))||((a<1||b>a||b<0)&&i!=0))test_failed();
-         fprintf(stdout,"    opus_multistream_decoder_get_size(%2d,%2d)=%d %sOK.\n",a,b,i,i>0?"":"... ");
-         cfgs++;
-      }
-   }
-
-   /*Test with unsupported sample rates*/
-   for(c=1;c<3;c++)
-   {
-      for(i=-7;i<=96000;i++)
-      {
-         int fs;
-         if((i==8000||i==12000||i==16000||i==24000||i==48000
-#ifdef ENABLE_QEXT
-               ||i==96000
-#endif
-               )&&(c==1||c==2))continue;
-         switch(i)
-         {
-           case(-5):fs=-8000;break;
-           case(-6):fs=INT32_MAX;break;
-           case(-7):fs=INT32_MIN;break;
-           default:fs=i;
-         }
-         err = OPUS_OK;
-         VG_UNDEF(&err,sizeof(err));
-         dec = opus_multistream_decoder_create(fs, c, 1, c-1, mapping, &err);
-         if(err!=OPUS_BAD_ARG || dec!=NULL)test_failed();
-         cfgs++;
-         dec = opus_multistream_decoder_create(fs, c, 1, c-1, mapping, 0);
-         if(dec!=NULL)test_failed();
-         cfgs++;
-         dec=(OpusMSDecoder*)malloc(opus_multistream_decoder_get_size(1,1));
-         if(dec==NULL)test_failed();
-         err = opus_multistream_decoder_init(dec,fs,c,1,c-1, mapping);
-         if(err!=OPUS_BAD_ARG)test_failed();
-         cfgs++;
-         free(dec);
-      }
-   }
-
-   for(c=0;c<2;c++)
-   {
-      int *ret_err;
-      ret_err = c?0:&err;
-
-      mapping[0]=0;
-      mapping[1]=1;
-      for(i=2;i<256;i++)VG_UNDEF(&mapping[i],sizeof(unsigned char));
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      dec = opus_multistream_decoder_create(48000, 2, 1, 0, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OPUS_BAD_ARG) || dec!=NULL)test_failed();
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      mapping[0]=mapping[1]=0;
-      dec = opus_multistream_decoder_create(48000, 2, 1, 0, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OPUS_OK) || dec==NULL)test_failed();
-      cfgs++;
-      opus_multistream_decoder_destroy(dec);
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      dec = opus_multistream_decoder_create(48000, 1, 4, 1, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OPUS_OK) || dec==NULL)test_failed();
-      cfgs++;
-
-      err = opus_multistream_decoder_init(dec,48000, 1, 0, 0, mapping);
-      if(err!=OPUS_BAD_ARG)test_failed();
-      cfgs++;
-
-      err = opus_multistream_decoder_init(dec,48000, 1, 1, -1, mapping);
-      if(err!=OPUS_BAD_ARG)test_failed();
-      cfgs++;
-
-      opus_multistream_decoder_destroy(dec);
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      dec = opus_multistream_decoder_create(48000, 2, 1, 1, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OPUS_OK) || dec==NULL)test_failed();
-      cfgs++;
-      opus_multistream_decoder_destroy(dec);
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      dec = opus_multistream_decoder_create(48000, 255, 255, 1, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OPUS_BAD_ARG) || dec!=NULL)test_failed();
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      dec = opus_multistream_decoder_create(48000, -1, 1, 1, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OPUS_BAD_ARG) || dec!=NULL)test_failed();
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      dec = opus_multistream_decoder_create(48000, 0, 1, 1, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OPUS_BAD_ARG) || dec!=NULL)test_failed();
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      dec = opus_multistream_decoder_create(48000, 1, -1, 2, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OPUS_BAD_ARG) || dec!=NULL)test_failed();
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      dec = opus_multistream_decoder_create(48000, 1, -1, -1, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OPUS_BAD_ARG) || dec!=NULL)test_failed();
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      dec = opus_multistream_decoder_create(48000, 256, 255, 1, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OPUS_BAD_ARG) || dec!=NULL)test_failed();
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      dec = opus_multistream_decoder_create(48000, 256, 255, 0, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OPUS_BAD_ARG) || dec!=NULL)test_failed();
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      mapping[0]=255;
-      mapping[1]=1;
-      mapping[2]=2;
-      dec = opus_multistream_decoder_create(48000, 3, 2, 0, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OPUS_BAD_ARG) || dec!=NULL)test_failed();
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      mapping[0]=0;
-      mapping[1]=0;
-      mapping[2]=0;
-      dec = opus_multistream_decoder_create(48000, 3, 2, 1, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OPUS_OK) || dec==NULL)test_failed();
-      cfgs++;
-      opus_multistream_decoder_destroy(dec);
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      mapping[0]=0;
-      mapping[1]=255;
-      mapping[2]=1;
-      mapping[3]=2;
-      mapping[4]=3;
-      dec = opus_multistream_decoder_create(48001, 5, 4, 1, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OPUS_BAD_ARG) || dec!=NULL)test_failed();
-      cfgs++;
-   }
-
-   VG_UNDEF(&err,sizeof(err));
-   mapping[0]=0;
-   mapping[1]=255;
-   mapping[2]=1;
-   mapping[3]=2;
-   dec = opus_multistream_decoder_create(48000, 4, 2, 1, mapping, &err);
-   VG_CHECK(&err,sizeof(err));
-   if(err!=OPUS_OK || dec==NULL)test_failed();
-   cfgs++;
-
-   fprintf(stdout,"    opus_multistream_decoder_create() ............ OK.\n");
-   fprintf(stdout,"    opus_multistream_decoder_init() .............. OK.\n");
-
-   VG_UNDEF(&dec_final_range,sizeof(dec_final_range));
-   err=opus_multistream_decoder_ctl(dec, OPUS_GET_FINAL_RANGE(&dec_final_range));
-   if(err!=OPUS_OK)test_failed();
-   VG_CHECK(&dec_final_range,sizeof(dec_final_range));
-   fprintf(stdout,"    OPUS_GET_FINAL_RANGE ......................... OK.\n");
-   cfgs++;
-
-   streamdec=0;
-   VG_UNDEF(&streamdec,sizeof(streamdec));
-   err=opus_multistream_decoder_ctl(dec, OPUS_MULTISTREAM_GET_DECODER_STATE(-1,&streamdec));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   err=opus_multistream_decoder_ctl(dec, OPUS_MULTISTREAM_GET_DECODER_STATE(1,&streamdec));
-   if(err!=OPUS_OK||streamdec==NULL)test_failed();
-   VG_CHECK(streamdec,opus_decoder_get_size(1));
-   cfgs++;
-   err=opus_multistream_decoder_ctl(dec, OPUS_MULTISTREAM_GET_DECODER_STATE(2,&streamdec));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   err=opus_multistream_decoder_ctl(dec, OPUS_MULTISTREAM_GET_DECODER_STATE(0,&streamdec));
-   if(err!=OPUS_OK||streamdec==NULL)test_failed();
-   VG_CHECK(streamdec,opus_decoder_get_size(1));
-   fprintf(stdout,"    OPUS_MULTISTREAM_GET_DECODER_STATE ........... OK.\n");
-   cfgs++;
-
-   for(j=0;j<2;j++)
-   {
-      OpusDecoder *od;
-      err=opus_multistream_decoder_ctl(dec,OPUS_MULTISTREAM_GET_DECODER_STATE(j,&od));
-      if(err != OPUS_OK)test_failed();
-      VG_UNDEF(&i,sizeof(i));
-      err=opus_decoder_ctl(od, OPUS_GET_GAIN(&i));
-      VG_CHECK(&i,sizeof(i));
-      if(err != OPUS_OK || i!=0)test_failed();
-      cfgs++;
-   }
-   err=opus_multistream_decoder_ctl(dec,OPUS_SET_GAIN(15));
-   if(err!=OPUS_OK)test_failed();
-   fprintf(stdout,"    OPUS_SET_GAIN ................................ OK.\n");
-   for(j=0;j<2;j++)
-   {
-      OpusDecoder *od;
-      err=opus_multistream_decoder_ctl(dec,OPUS_MULTISTREAM_GET_DECODER_STATE(j,&od));
-      if(err != OPUS_OK)test_failed();
-      VG_UNDEF(&i,sizeof(i));
-      err=opus_decoder_ctl(od, OPUS_GET_GAIN(&i));
-      VG_CHECK(&i,sizeof(i));
-      if(err != OPUS_OK || i!=15)test_failed();
-      cfgs++;
-   }
-   fprintf(stdout,"    OPUS_GET_GAIN ................................ OK.\n");
-
-   VG_UNDEF(&i,sizeof(i));
-   err=opus_multistream_decoder_ctl(dec, OPUS_GET_BANDWIDTH(&i));
-   if(err != OPUS_OK || i!=0)test_failed();
-   fprintf(stdout,"    OPUS_GET_BANDWIDTH ........................... OK.\n");
-   cfgs++;
-
-   err=opus_multistream_decoder_ctl(dec,OPUS_UNIMPLEMENTED);
-   if(err!=OPUS_UNIMPLEMENTED)test_failed();
-   fprintf(stdout,"    OPUS_UNIMPLEMENTED ........................... OK.\n");
-   cfgs++;
-
-#if 0
-   /*Currently unimplemented for multistream*/
-   /*GET_PITCH has different execution paths depending on the previously decoded frame.*/
-   err=opus_multistream_decoder_ctl(dec, OPUS_GET_PITCH(null_int_ptr));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   VG_UNDEF(&i,sizeof(i));
-   err=opus_multistream_decoder_ctl(dec, OPUS_GET_PITCH(&i));
-   if(err != OPUS_OK || i>0 || i<-1)test_failed();
-   cfgs++;
-   VG_UNDEF(packet,sizeof(packet));
-   packet[0]=63<<2;packet[1]=packet[2]=0;
-   if(opus_multistream_decode(dec, packet, 3, sbuf, 960, 0)!=960)test_failed();
-   cfgs++;
-   VG_UNDEF(&i,sizeof(i));
-   err=opus_multistream_decoder_ctl(dec, OPUS_GET_PITCH(&i));
-   if(err != OPUS_OK || i>0 || i<-1)test_failed();
-   cfgs++;
-   packet[0]=1;
-   if(opus_multistream_decode(dec, packet, 1, sbuf, 960, 0)!=960)test_failed();
-   cfgs++;
-   VG_UNDEF(&i,sizeof(i));
-   err=opus_multistream_decoder_ctl(dec, OPUS_GET_PITCH(&i));
-   if(err != OPUS_OK || i>0 || i<-1)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OPUS_GET_PITCH ............................... OK.\n");
-#endif
-
-   /*Reset the decoder*/
-   if(opus_multistream_decoder_ctl(dec, OPUS_RESET_STATE)!=OPUS_OK)test_failed();
-   fprintf(stdout,"    OPUS_RESET_STATE ............................. OK.\n");
-   cfgs++;
-
-   opus_multistream_decoder_destroy(dec);
-   cfgs++;
-   VG_UNDEF(&err,sizeof(err));
-   dec = opus_multistream_decoder_create(48000, 2, 1, 1, mapping, &err);
-   if(err!=OPUS_OK || dec==NULL)test_failed();
-   cfgs++;
-
-   packet[0]=(63<<2)+3;
-   packet[1]=49;
-   for(j=2;j<51;j++)packet[j]=0;
-   VG_UNDEF(sbuf,sizeof(sbuf));
-   if(opus_multistream_decode(dec, packet, 51, sbuf, 960, 0)!=OPUS_INVALID_PACKET)test_failed();
-   cfgs++;
-   packet[0]=(63<<2);
-   packet[1]=packet[2]=0;
-   if(opus_multistream_decode(dec, packet, -1, sbuf, 960, 0)!=OPUS_BAD_ARG){printf("%d\n",opus_multistream_decode(dec, packet, -1, sbuf, 960, 0));test_failed();}
-   cfgs++;
-   if(opus_multistream_decode(dec, packet, 3, sbuf, -960, 0)!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   if(opus_multistream_decode(dec, packet, 3, sbuf, 60, 0)!=OPUS_BUFFER_TOO_SMALL)test_failed();
-   cfgs++;
-   if(opus_multistream_decode(dec, packet, 3, sbuf, 480, 0)!=OPUS_BUFFER_TOO_SMALL)test_failed();
-   cfgs++;
-   if(opus_multistream_decode(dec, packet, 3, sbuf, 960, 0)!=960)test_failed();
-   cfgs++;
-   fprintf(stdout,"    opus_multistream_decode() .................... OK.\n");
-#ifndef DISABLE_FLOAT_API
-   VG_UNDEF(fbuf,sizeof(fbuf));
-   if(opus_multistream_decode_float(dec, packet, 3, fbuf, 960, 0)!=960)test_failed();
-   cfgs++;
-   fprintf(stdout,"    opus_multistream_decode_float() .............. OK.\n");
-#endif
-
-#if 0
-   /*These tests are disabled because the library crashes with null states*/
-   if(opus_multistream_decoder_ctl(0,OPUS_RESET_STATE)         !=OPUS_INVALID_STATE)test_failed();
-   if(opus_multistream_decoder_init(0,48000,1)                 !=OPUS_INVALID_STATE)test_failed();
-   if(opus_multistream_decode(0,packet,1,outbuf,2880,0)        !=OPUS_INVALID_STATE)test_failed();
-   if(opus_multistream_decode_float(0,packet,1,0,2880,0)       !=OPUS_INVALID_STATE)test_failed();
-   if(opus_multistream_decoder_get_nb_samples(0,packet,1)      !=OPUS_INVALID_STATE)test_failed();
-#endif
-   opus_multistream_decoder_destroy(dec);
-   cfgs++;
-   fprintf(stdout,"       All multistream decoder interface tests passed\n");
-   fprintf(stdout,"                             (%6d API invocations)\n",cfgs);
-   return cfgs;
-}
-
-#ifdef VALGRIND
-#define UNDEFINE_FOR_PARSE  toc=-1; \
-   frames[0]=(unsigned char *)0; \
-   frames[1]=(unsigned char *)0; \
-   payload_offset=-1; \
-   VG_UNDEF(&toc,sizeof(toc)); \
-   VG_UNDEF(frames,sizeof(frames));\
-   VG_UNDEF(&payload_offset,sizeof(payload_offset));
-#else
-#define UNDEFINE_FOR_PARSE  toc=-1; \
-   frames[0]=(unsigned char *)0; \
-   frames[1]=(unsigned char *)0; \
-   payload_offset=-1;
-#endif
-
-/* This test exercises the heck out of the libopus parser.
-   It is much larger than the parser itself in part because
-   it tries to hit a lot of corner cases that could never
-   fail with the libopus code, but might be problematic for
-   other implementations. */
-opus_int32 test_parse(void)
-{
-   opus_int32 i,j,jj,sz;
-   unsigned char packet[1276];
-   opus_int32 cfgs,cfgs_total;
-   unsigned char toc;
-   const unsigned char *frames[48];
-   short size[48];
-   int payload_offset, ret;
-   fprintf(stdout,"\n  Packet header parsing tests\n");
-   fprintf(stdout,"  ---------------------------------------------------\n");
-   memset(packet,0,sizeof(char)*1276);
-   packet[0]=63<<2;
-   if(opus_packet_parse(packet,1,&toc,frames,0,&payload_offset)!=OPUS_BAD_ARG)test_failed();
-   cfgs_total=cfgs=1;
-   /*code 0*/
-   for(i=0;i<64;i++)
-   {
-      packet[0]=i<<2;
-      UNDEFINE_FOR_PARSE
-      ret=opus_packet_parse(packet,4,&toc,frames,size,&payload_offset);
-      cfgs++;
-      if(ret!=1)test_failed();
-      if(size[0]!=3)test_failed();
-      if(frames[0]!=packet+1)test_failed();
-   }
-   fprintf(stdout,"    code 0 (%2d cases) ............................ OK.\n",cfgs);
-   cfgs_total+=cfgs;cfgs=0;
-
-   /*code 1, two frames of the same size*/
-   for(i=0;i<64;i++)
-   {
-      packet[0]=(i<<2)+1;
-      for(jj=0;jj<=1275*2+3;jj++)
-      {
-         UNDEFINE_FOR_PARSE
-         ret=opus_packet_parse(packet,jj,&toc,frames,size,&payload_offset);
-         cfgs++;
-         if((jj&1)==1 && jj<=2551)
-         {
-            /* Must pass if payload length even (packet length odd) and
-               size<=2551, must fail otherwise. */
-            if(ret!=2)test_failed();
-            if(size[0]!=size[1] || size[0]!=((jj-1)>>1))test_failed();
-            if(frames[0]!=packet+1)test_failed();
-            if(frames[1]!=frames[0]+size[0])test_failed();
-            if((toc>>2)!=i)test_failed();
-         } else if(ret!=OPUS_INVALID_PACKET)test_failed();
-      }
-   }
-   fprintf(stdout,"    code 1 (%6d cases) ........................ OK.\n",cfgs);
-   cfgs_total+=cfgs;cfgs=0;
-
-   for(i=0;i<64;i++)
-   {
-      /*code 2, length code overflow*/
-      packet[0]=(i<<2)+2;
-      UNDEFINE_FOR_PARSE
-      ret=opus_packet_parse(packet,1,&toc,frames,size,&payload_offset);
-      cfgs++;
-      if(ret!=OPUS_INVALID_PACKET)test_failed();
-      packet[1]=252;
-      UNDEFINE_FOR_PARSE
-      ret=opus_packet_parse(packet,2,&toc,frames,size,&payload_offset);
-      cfgs++;
-      if(ret!=OPUS_INVALID_PACKET)test_failed();
-      for(j=0;j<1275;j++)
-      {
-         if(j<252)packet[1]=j;
-         else{packet[1]=252+(j&3);packet[2]=(j-252)>>2;}
-         /*Code 2, one too short*/
-         UNDEFINE_FOR_PARSE
-         ret=opus_packet_parse(packet,j+(j<252?2:3)-1,&toc,frames,size,&payload_offset);
-         cfgs++;
-         if(ret!=OPUS_INVALID_PACKET)test_failed();
-         /*Code 2, one too long*/
-         UNDEFINE_FOR_PARSE
-         ret=opus_packet_parse(packet,j+(j<252?2:3)+1276,&toc,frames,size,&payload_offset);
-         cfgs++;
-         if(ret!=OPUS_INVALID_PACKET)test_failed();
-         /*Code 2, second zero*/
-         UNDEFINE_FOR_PARSE
-         ret=opus_packet_parse(packet,j+(j<252?2:3),&toc,frames,size,&payload_offset);
-         cfgs++;
-         if(ret!=2)test_failed();
-         if(size[0]!=j||size[1]!=0)test_failed();
-         if(frames[1]!=frames[0]+size[0])test_failed();
-         if((toc>>2)!=i)test_failed();
-         /*Code 2, normal*/
-         UNDEFINE_FOR_PARSE
-         ret=opus_packet_parse(packet,(j<<1)+4,&toc,frames,size,&payload_offset);
-         cfgs++;
-         if(ret!=2)test_failed();
-         if(size[0]!=j||size[1]!=(j<<1)+3-j-(j<252?1:2))test_failed();
-         if(frames[1]!=frames[0]+size[0])test_failed();
-         if((toc>>2)!=i)test_failed();
-      }
-   }
-   fprintf(stdout,"    code 2 (%6d cases) ........................ OK.\n",cfgs);
-   cfgs_total+=cfgs;cfgs=0;
-
-   for(i=0;i<64;i++)
-   {
-      packet[0]=(i<<2)+3;
-      /*code 3, length code overflow*/
-      UNDEFINE_FOR_PARSE
-      ret=opus_packet_parse(packet,1,&toc,frames,size,&payload_offset);
-      cfgs++;
-      if(ret!=OPUS_INVALID_PACKET)test_failed();
-   }
-   fprintf(stdout,"    code 3 m-truncation (%2d cases) ............... OK.\n",cfgs);
-   cfgs_total+=cfgs;cfgs=0;
-
-   for(i=0;i<64;i++)
-   {
-      /*code 3, m is zero or 49-63*/
-      packet[0]=(i<<2)+3;
-      for(jj=49;jj<=64;jj++)
-      {
-        packet[1]=0+(jj&63); /*CBR, no padding*/
-        UNDEFINE_FOR_PARSE
-        ret=opus_packet_parse(packet,1275,&toc,frames,size,&payload_offset);
-        cfgs++;
-        if(ret!=OPUS_INVALID_PACKET)test_failed();
-        packet[1]=128+(jj&63); /*VBR, no padding*/
-        UNDEFINE_FOR_PARSE
-        ret=opus_packet_parse(packet,1275,&toc,frames,size,&payload_offset);
-        cfgs++;
-        if(ret!=OPUS_INVALID_PACKET)test_failed();
-        packet[1]=64+(jj&63); /*CBR, padding*/
-        UNDEFINE_FOR_PARSE
-        ret=opus_packet_parse(packet,1275,&toc,frames,size,&payload_offset);
-        cfgs++;
-        if(ret!=OPUS_INVALID_PACKET)test_failed();
-        packet[1]=128+64+(jj&63); /*VBR, padding*/
-        UNDEFINE_FOR_PARSE
-        ret=opus_packet_parse(packet,1275,&toc,frames,size,&payload_offset);
-        cfgs++;
-        if(ret!=OPUS_INVALID_PACKET)test_failed();
-      }
-   }
-   fprintf(stdout,"    code 3 m=0,49-64 (%2d cases) ................ OK.\n",cfgs);
-   cfgs_total+=cfgs;cfgs=0;
-
-   for(i=0;i<64;i++)
-   {
-      packet[0]=(i<<2)+3;
-      /*code 3, m is one, cbr*/
-      packet[1]=1;
-      for(j=0;j<1276;j++)
-      {
-        UNDEFINE_FOR_PARSE
-        ret=opus_packet_parse(packet,j+2,&toc,frames,size,&payload_offset);
-        cfgs++;
-        if(ret!=1)test_failed();
-        if(size[0]!=j)test_failed();
-        if((toc>>2)!=i)test_failed();
-      }
-      UNDEFINE_FOR_PARSE
-      ret=opus_packet_parse(packet,1276+2,&toc,frames,size,&payload_offset);
-      cfgs++;
-      if(ret!=OPUS_INVALID_PACKET)test_failed();
-   }
-   fprintf(stdout,"    code 3 m=1 CBR (%2d cases) ................. OK.\n",cfgs);
-   cfgs_total+=cfgs;cfgs=0;
-
-   for(i=0;i<64;i++)
-   {
-      int frame_samp;
-      /*code 3, m>1 CBR*/
-      packet[0]=(i<<2)+3;
-      frame_samp=opus_packet_get_samples_per_frame(packet,48000);
-      for(j=2;j<49;j++)
-      {
-         packet[1]=j;
-         for(sz=2;sz<((j+2)*1275);sz++)
-         {
-            UNDEFINE_FOR_PARSE
-            ret=opus_packet_parse(packet,sz,&toc,frames,size,&payload_offset);
-            cfgs++;
-            /*Must be <=120ms, must be evenly divisible, can't have frames>1275 bytes*/
-            if(frame_samp*j<=5760 && (sz-2)%j==0 && (sz-2)/j<1276)
-            {
-               if(ret!=j)test_failed();
-               for(jj=1;jj<ret;jj++)if(frames[jj]!=frames[jj-1]+size[jj-1])test_failed();
-               if((toc>>2)!=i)test_failed();
-            } else if(ret!=OPUS_INVALID_PACKET)test_failed();
-         }
-      }
-      /*Super jumbo packets*/
-      packet[1]=5760/frame_samp;
-      UNDEFINE_FOR_PARSE
-      ret=opus_packet_parse(packet,1275*packet[1]+2,&toc,frames,size,&payload_offset);
-      cfgs++;
-      if(ret!=packet[1])test_failed();
-      for(jj=0;jj<ret;jj++)if(size[jj]!=1275)test_failed();
-   }
-   fprintf(stdout,"    code 3 m=1-48 CBR (%2d cases) .......... OK.\n",cfgs);
-   cfgs_total+=cfgs;cfgs=0;
-
-   for(i=0;i<64;i++)
-   {
-      int frame_samp;
-      /*Code 3 VBR, m one*/
-      packet[0]=(i<<2)+3;
-      packet[1]=128+1;
-      frame_samp=opus_packet_get_samples_per_frame(packet,48000);
-      for(jj=0;jj<1276;jj++)
-      {
-         UNDEFINE_FOR_PARSE
-         ret=opus_packet_parse(packet,2+jj,&toc,frames,size,&payload_offset);
-         cfgs++;
-         if(ret!=1)test_failed();
-         if(size[0]!=jj)test_failed();
-         if((toc>>2)!=i)test_failed();
-      }
-      UNDEFINE_FOR_PARSE
-      ret=opus_packet_parse(packet,2+1276,&toc,frames,size,&payload_offset);
-      cfgs++;
-      if(ret!=OPUS_INVALID_PACKET)test_failed();
-      for(j=2;j<49;j++)
-      {
-         packet[1]=128+j;
-         /*Length code overflow*/
-         UNDEFINE_FOR_PARSE
-         ret=opus_packet_parse(packet,2+j-2,&toc,frames,size,&payload_offset);
-         cfgs++;
-         if(ret!=OPUS_INVALID_PACKET)test_failed();
-         packet[2]=252;
-         packet[3]=0;
-         for(jj=4;jj<2+j;jj++)packet[jj]=0;
-         UNDEFINE_FOR_PARSE
-         ret=opus_packet_parse(packet,2+j,&toc,frames,size,&payload_offset);
-         cfgs++;
-         if(ret!=OPUS_INVALID_PACKET)test_failed();
-         /*One byte too short*/
-         for(jj=2;jj<2+j;jj++)packet[jj]=0;
-         UNDEFINE_FOR_PARSE
-         ret=opus_packet_parse(packet,2+j-2,&toc,frames,size,&payload_offset);
-         cfgs++;
-         if(ret!=OPUS_INVALID_PACKET)test_failed();
-         /*One byte too short thanks to length coding*/
-         packet[2]=252;
-         packet[3]=0;
-         for(jj=4;jj<2+j;jj++)packet[jj]=0;
-         UNDEFINE_FOR_PARSE
-         ret=opus_packet_parse(packet,2+j+252-1,&toc,frames,size,&payload_offset);
-         cfgs++;
-         if(ret!=OPUS_INVALID_PACKET)test_failed();
-         /*Most expensive way of coding zeros*/
-         for(jj=2;jj<2+j;jj++)packet[jj]=0;
-         UNDEFINE_FOR_PARSE
-         ret=opus_packet_parse(packet,2+j-1,&toc,frames,size,&payload_offset);
-         cfgs++;
-         if(frame_samp*j<=5760){
-            if(ret!=j)test_failed();
-            for(jj=0;jj<j;jj++)if(size[jj]!=0)test_failed();
-            if((toc>>2)!=i)test_failed();
-         } else if(ret!=OPUS_INVALID_PACKET)test_failed();
-         /*Quasi-CBR use of mode 3*/
-         for(sz=0;sz<8;sz++)
-         {
-            const int tsz[8]={50,201,403,700,1472,5110,20400,61298};
-            int pos=0;
-            int as=(tsz[sz]+i-j-2)/j;
-            for(jj=0;jj<j-1;jj++)
-            {
-              if(as<252){packet[2+pos]=as;pos++;}
-              else{packet[2+pos]=252+(as&3);packet[3+pos]=(as-252)>>2;pos+=2;}
-            }
-            UNDEFINE_FOR_PARSE
-            ret=opus_packet_parse(packet,tsz[sz]+i,&toc,frames,size,&payload_offset);
-            cfgs++;
-            if(frame_samp*j<=5760 && as<1276 && (tsz[sz]+i-2-pos-as*(j-1))<1276){
-               if(ret!=j)test_failed();
-               for(jj=0;jj<j-1;jj++)if(size[jj]!=as)test_failed();
-               if(size[j-1]!=(tsz[sz]+i-2-pos-as*(j-1)))test_failed();
-               if((toc>>2)!=i)test_failed();
-            } else if(ret!=OPUS_INVALID_PACKET)test_failed();
-         }
-      }
-   }
-   fprintf(stdout,"    code 3 m=1-48 VBR (%2d cases) ............. OK.\n",cfgs);
-   cfgs_total+=cfgs;cfgs=0;
-
-   for(i=0;i<64;i++)
-   {
-      packet[0]=(i<<2)+3;
-      /*Padding*/
-      packet[1]=128+1+64;
-      /*Overflow the length coding*/
-      for(jj=2;jj<127;jj++)packet[jj]=255;
-      UNDEFINE_FOR_PARSE
-      ret=opus_packet_parse(packet,127,&toc,frames,size,&payload_offset);
-      cfgs++;
-      if(ret!=OPUS_INVALID_PACKET)test_failed();
-
-      for(sz=0;sz<4;sz++)
-      {
-         const int tsz[4]={0,72,512,1275};
-         for(jj=sz;jj<65025;jj+=11)
-         {
-            int pos;
-            for(pos=0;pos<jj/254;pos++)packet[2+pos]=255;
-            packet[2+pos]=jj%254;
-            pos++;
-            if(sz==0&&i==63)
-            {
-               /*Code more padding than there is room in the packet*/
-               UNDEFINE_FOR_PARSE
-               ret=opus_packet_parse(packet,2+jj+pos-1,&toc,frames,size,&payload_offset);
-               cfgs++;
-               if(ret!=OPUS_INVALID_PACKET)test_failed();
-            }
-            UNDEFINE_FOR_PARSE
-            ret=opus_packet_parse(packet,2+jj+tsz[sz]+i+pos,&toc,frames,size,&payload_offset);
-            cfgs++;
-            if(tsz[sz]+i<1276)
-            {
-               if(ret!=1)test_failed();
-               if(size[0]!=tsz[sz]+i)test_failed();
-               if((toc>>2)!=i)test_failed();
-            } else if (ret!=OPUS_INVALID_PACKET)test_failed();
-         }
-      }
-   }
-   fprintf(stdout,"    code 3 padding (%2d cases) ............... OK.\n",cfgs);
-   cfgs_total+=cfgs;
-   fprintf(stdout,"    opus_packet_parse ............................ OK.\n");
-   fprintf(stdout,"                      All packet parsing tests passed\n");
-   fprintf(stdout,"                          (%d API invocations)\n",cfgs_total);
-   return cfgs_total;
-}
-
-/* This is a helper macro for the encoder tests.
-   The encoder api tests all have a pattern of set-must-fail, set-must-fail,
-   set-must-pass, get-and-compare, set-must-pass, get-and-compare. */
-#define CHECK_SETGET(setcall,getcall,badv,badv2,goodv,goodv2,sok,gok) \
-   i=(badv);\
-   if(opus_encoder_ctl(enc,setcall)==OPUS_OK)test_failed();\
-   i=(badv2);\
-   if(opus_encoder_ctl(enc,setcall)==OPUS_OK)test_failed();\
-   j=i=(goodv);\
-   if(opus_encoder_ctl(enc,setcall)!=OPUS_OK)test_failed();\
-   i=-12345;\
-   VG_UNDEF(&i,sizeof(i)); \
-   err=opus_encoder_ctl(enc,getcall);\
-   if(err!=OPUS_OK || i!=j)test_failed();\
-   j=i=(goodv2);\
-   if(opus_encoder_ctl(enc,setcall)!=OPUS_OK)test_failed();\
-   fprintf(stdout,sok);\
-   i=-12345;\
-   VG_UNDEF(&i,sizeof(i)); \
-   err=opus_encoder_ctl(enc,getcall);\
-   if(err!=OPUS_OK || i!=j)test_failed();\
-   fprintf(stdout,gok);\
-   cfgs+=6;
-
-opus_int32 test_enc_api(void)
-{
-   opus_uint32 enc_final_range;
-   OpusEncoder *enc;
-   opus_int32 i,j;
-   unsigned char packet[1276];
-#ifndef DISABLE_FLOAT_API
-   float fbuf[960*2];
-#endif
-   short sbuf[960*2];
-   int c,err,cfgs;
-
-   cfgs=0;
-   /*First test invalid configurations which should fail*/
-   fprintf(stdout,"\n  Encoder basic API tests\n");
-   fprintf(stdout,"  ---------------------------------------------------\n");
-   for(c=0;c<4;c++)
-   {
-      i=opus_encoder_get_size(c);
-      if(((c==1||c==2)&&(i<=2048||i>1<<18))||((c!=1&&c!=2)&&i!=0))test_failed();
-      fprintf(stdout,"    opus_encoder_get_size(%d)=%d ...............%s OK.\n",c,i,i>0?"":"....");
-      cfgs++;
-   }
-
-   /*Test with unsupported sample rates, channel counts*/
-   for(c=0;c<4;c++)
-   {
-      for(i=-7;i<=96000;i++)
-      {
-         int fs;
-         if((i==8000||i==12000||i==16000||i==24000||i==48000
-#ifdef ENABLE_QEXT
-               ||i==96000
-#endif
-               )&&(c==1||c==2))continue;
-         switch(i)
-         {
-           case(-5):fs=-8000;break;
-           case(-6):fs=INT32_MAX;break;
-           case(-7):fs=INT32_MIN;break;
-           default:fs=i;
-         }
-         err = OPUS_OK;
-         VG_UNDEF(&err,sizeof(err));
-         enc = opus_encoder_create(fs, c, OPUS_APPLICATION_VOIP, &err);
-         if(err!=OPUS_BAD_ARG || enc!=NULL)test_failed();
-         cfgs++;
-         enc = opus_encoder_create(fs, c, OPUS_APPLICATION_VOIP, 0);
-         if(enc!=NULL)test_failed();
-         cfgs++;
-         opus_encoder_destroy(enc);
-         enc=(OpusEncoder*)malloc(opus_encoder_get_size(2));
-         if(enc==NULL)test_failed();
-         err = opus_encoder_init(enc, fs, c, OPUS_APPLICATION_VOIP);
-         if(err!=OPUS_BAD_ARG)test_failed();
-         cfgs++;
-         free(enc);
-      }
-   }
-
-   enc = opus_encoder_create(48000, 2, OPUS_AUTO, NULL);
-   if(enc!=NULL)test_failed();
-   cfgs++;
-
-   VG_UNDEF(&err,sizeof(err));
-   enc = opus_encoder_create(48000, 2, OPUS_AUTO, &err);
-   if(err!=OPUS_BAD_ARG || enc!=NULL)test_failed();
-   cfgs++;
-
-   VG_UNDEF(&err,sizeof(err));
-   enc = opus_encoder_create(48000, 2, OPUS_APPLICATION_VOIP, NULL);
-   if(enc==NULL)test_failed();
-   opus_encoder_destroy(enc);
-   cfgs++;
-
-   VG_UNDEF(&err,sizeof(err));
-   enc = opus_encoder_create(48000, 2, OPUS_APPLICATION_RESTRICTED_LOWDELAY, &err);
-   if(err!=OPUS_OK || enc==NULL)test_failed();
-   cfgs++;
-   err=opus_encoder_ctl(enc,OPUS_GET_LOOKAHEAD(&i));
-   if(err!=OPUS_OK || i<0 || i>32766)test_failed();
-   cfgs++;
-   opus_encoder_destroy(enc);
-
-   VG_UNDEF(&err,sizeof(err));
-   enc = opus_encoder_create(48000, 2, OPUS_APPLICATION_AUDIO, &err);
-   if(err!=OPUS_OK || enc==NULL)test_failed();
-   cfgs++;
-   err=opus_encoder_ctl(enc,OPUS_GET_LOOKAHEAD(&i));
-   if(err!=OPUS_OK || i<0 || i>32766)test_failed();
-   opus_encoder_destroy(enc);
-   cfgs++;
-
-   VG_UNDEF(&err,sizeof(err));
-   enc = opus_encoder_create(48000, 2, OPUS_APPLICATION_VOIP, &err);
-   if(err!=OPUS_OK || enc==NULL)test_failed();
-   cfgs++;
-
-   fprintf(stdout,"    opus_encoder_create() ........................ OK.\n");
-   fprintf(stdout,"    opus_encoder_init() .......................... OK.\n");
-
-   i=-12345;
-   VG_UNDEF(&i,sizeof(i));
-   err=opus_encoder_ctl(enc,OPUS_GET_LOOKAHEAD(&i));
-   if(err!=OPUS_OK || i<0 || i>32766)test_failed();
-   cfgs++;
-   err=opus_encoder_ctl(enc,OPUS_GET_LOOKAHEAD(null_int_ptr));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OPUS_GET_LOOKAHEAD ........................... OK.\n");
-
-   err=opus_encoder_ctl(enc,OPUS_GET_SAMPLE_RATE(&i));
-   if(err!=OPUS_OK || i!=48000)test_failed();
-   cfgs++;
-   err=opus_encoder_ctl(enc,OPUS_GET_SAMPLE_RATE(null_int_ptr));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OPUS_GET_SAMPLE_RATE ......................... OK.\n");
-
-   if(opus_encoder_ctl(enc,OPUS_UNIMPLEMENTED)!=OPUS_UNIMPLEMENTED)test_failed();
-   fprintf(stdout,"    OPUS_UNIMPLEMENTED ........................... OK.\n");
-   cfgs++;
-
-   err=opus_encoder_ctl(enc,OPUS_GET_APPLICATION(null_int_ptr));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OPUS_SET_APPLICATION(i),OPUS_GET_APPLICATION(&i),-1,OPUS_AUTO,
-     OPUS_APPLICATION_AUDIO,OPUS_APPLICATION_RESTRICTED_LOWDELAY,
-     "    OPUS_SET_APPLICATION ......................... OK.\n",
-     "    OPUS_GET_APPLICATION ......................... OK.\n")
-
-   err=opus_encoder_ctl(enc,OPUS_GET_BITRATE(null_int_ptr));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   if(opus_encoder_ctl(enc,OPUS_SET_BITRATE(1073741832))!=OPUS_OK)test_failed();
-   cfgs++;
-   VG_UNDEF(&i,sizeof(i));
-   if(opus_encoder_ctl(enc,OPUS_GET_BITRATE(&i))!=OPUS_OK)test_failed();
-   if(i>1700000||i<256000)test_failed();
-   cfgs++;
-   CHECK_SETGET(OPUS_SET_BITRATE(i),OPUS_GET_BITRATE(&i),-12345,0,
-     500,256000,
-     "    OPUS_SET_BITRATE ............................. OK.\n",
-     "    OPUS_GET_BITRATE ............................. OK.\n")
-
-   err=opus_encoder_ctl(enc,OPUS_GET_FORCE_CHANNELS(null_int_ptr));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OPUS_SET_FORCE_CHANNELS(i),OPUS_GET_FORCE_CHANNELS(&i),-1,3,
-     1,OPUS_AUTO,
-     "    OPUS_SET_FORCE_CHANNELS ...................... OK.\n",
-     "    OPUS_GET_FORCE_CHANNELS ...................... OK.\n")
-
-   i=-2;
-   if(opus_encoder_ctl(enc,OPUS_SET_BANDWIDTH(i))==OPUS_OK)test_failed();
-   cfgs++;
-   i=OPUS_BANDWIDTH_FULLBAND+1;
-   if(opus_encoder_ctl(enc,OPUS_SET_BANDWIDTH(i))==OPUS_OK)test_failed();
-   cfgs++;
-   i=OPUS_BANDWIDTH_NARROWBAND;
-   if(opus_encoder_ctl(enc,OPUS_SET_BANDWIDTH(i))!=OPUS_OK)test_failed();
-   cfgs++;
-   i=OPUS_BANDWIDTH_FULLBAND;
-   if(opus_encoder_ctl(enc,OPUS_SET_BANDWIDTH(i))!=OPUS_OK)test_failed();
-   cfgs++;
-   i=OPUS_BANDWIDTH_WIDEBAND;
-   if(opus_encoder_ctl(enc,OPUS_SET_BANDWIDTH(i))!=OPUS_OK)test_failed();
-   cfgs++;
-   i=OPUS_BANDWIDTH_MEDIUMBAND;
-   if(opus_encoder_ctl(enc,OPUS_SET_BANDWIDTH(i))!=OPUS_OK)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OPUS_SET_BANDWIDTH ........................... OK.\n");
-   /*We don't test if the bandwidth has actually changed.
-     because the change may be delayed until the encoder is advanced.*/
-   i=-12345;
-   VG_UNDEF(&i,sizeof(i));
-   err=opus_encoder_ctl(enc,OPUS_GET_BANDWIDTH(&i));
-   if(err!=OPUS_OK || (i!=OPUS_BANDWIDTH_NARROWBAND&&
-      i!=OPUS_BANDWIDTH_MEDIUMBAND&&i!=OPUS_BANDWIDTH_WIDEBAND&&
-      i!=OPUS_BANDWIDTH_FULLBAND&&i!=OPUS_AUTO))test_failed();
-   cfgs++;
-   if(opus_encoder_ctl(enc,OPUS_SET_BANDWIDTH(OPUS_AUTO))!=OPUS_OK)test_failed();
-   cfgs++;
-   err=opus_encoder_ctl(enc,OPUS_GET_BANDWIDTH(null_int_ptr));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OPUS_GET_BANDWIDTH ........................... OK.\n");
-
-   i=-2;
-   if(opus_encoder_ctl(enc,OPUS_SET_MAX_BANDWIDTH(i))==OPUS_OK)test_failed();
-   cfgs++;
-   i=OPUS_BANDWIDTH_FULLBAND+1;
-   if(opus_encoder_ctl(enc,OPUS_SET_MAX_BANDWIDTH(i))==OPUS_OK)test_failed();
-   cfgs++;
-   i=OPUS_BANDWIDTH_NARROWBAND;
-   if(opus_encoder_ctl(enc,OPUS_SET_MAX_BANDWIDTH(i))!=OPUS_OK)test_failed();
-   cfgs++;
-   i=OPUS_BANDWIDTH_FULLBAND;
-   if(opus_encoder_ctl(enc,OPUS_SET_MAX_BANDWIDTH(i))!=OPUS_OK)test_failed();
-   cfgs++;
-   i=OPUS_BANDWIDTH_WIDEBAND;
-   if(opus_encoder_ctl(enc,OPUS_SET_MAX_BANDWIDTH(i))!=OPUS_OK)test_failed();
-   cfgs++;
-   i=OPUS_BANDWIDTH_MEDIUMBAND;
-   if(opus_encoder_ctl(enc,OPUS_SET_MAX_BANDWIDTH(i))!=OPUS_OK)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OPUS_SET_MAX_BANDWIDTH ....................... OK.\n");
-   /*We don't test if the bandwidth has actually changed.
-     because the change may be delayed until the encoder is advanced.*/
-   i=-12345;
-   VG_UNDEF(&i,sizeof(i));
-   err=opus_encoder_ctl(enc,OPUS_GET_MAX_BANDWIDTH(&i));
-   if(err!=OPUS_OK || (i!=OPUS_BANDWIDTH_NARROWBAND&&
-      i!=OPUS_BANDWIDTH_MEDIUMBAND&&i!=OPUS_BANDWIDTH_WIDEBAND&&
-      i!=OPUS_BANDWIDTH_FULLBAND))test_failed();
-   cfgs++;
-   err=opus_encoder_ctl(enc,OPUS_GET_MAX_BANDWIDTH(null_int_ptr));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OPUS_GET_MAX_BANDWIDTH ....................... OK.\n");
-
-   err=opus_encoder_ctl(enc,OPUS_GET_DTX(null_int_ptr));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OPUS_SET_DTX(i),OPUS_GET_DTX(&i),-1,2,
-     1,0,
-     "    OPUS_SET_DTX ................................. OK.\n",
-     "    OPUS_GET_DTX ................................. OK.\n")
-
-   err=opus_encoder_ctl(enc,OPUS_GET_COMPLEXITY(null_int_ptr));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OPUS_SET_COMPLEXITY(i),OPUS_GET_COMPLEXITY(&i),-1,11,
-     0,10,
-     "    OPUS_SET_COMPLEXITY .......................... OK.\n",
-     "    OPUS_GET_COMPLEXITY .......................... OK.\n")
-
-   err=opus_encoder_ctl(enc,OPUS_GET_INBAND_FEC(null_int_ptr));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OPUS_SET_INBAND_FEC(i),OPUS_GET_INBAND_FEC(&i),-1,3,
-     1,0,
-     "    OPUS_SET_INBAND_FEC .......................... OK.\n",
-     "    OPUS_GET_INBAND_FEC .......................... OK.\n")
-
-   err=opus_encoder_ctl(enc,OPUS_GET_PACKET_LOSS_PERC(null_int_ptr));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OPUS_SET_PACKET_LOSS_PERC(i),OPUS_GET_PACKET_LOSS_PERC(&i),-1,101,
-     100,0,
-     "    OPUS_SET_PACKET_LOSS_PERC .................... OK.\n",
-     "    OPUS_GET_PACKET_LOSS_PERC .................... OK.\n")
-
-   err=opus_encoder_ctl(enc,OPUS_GET_VBR(null_int_ptr));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OPUS_SET_VBR(i),OPUS_GET_VBR(&i),-1,2,
-     1,0,
-     "    OPUS_SET_VBR ................................. OK.\n",
-     "    OPUS_GET_VBR ................................. OK.\n")
-
-/*   err=opus_encoder_ctl(enc,OPUS_GET_VOICE_RATIO(null_int_ptr));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OPUS_SET_VOICE_RATIO(i),OPUS_GET_VOICE_RATIO(&i),-2,101,
-     0,50,
-     "    OPUS_SET_VOICE_RATIO ......................... OK.\n",
-     "    OPUS_GET_VOICE_RATIO ......................... OK.\n")*/
-
-   err=opus_encoder_ctl(enc,OPUS_GET_VBR_CONSTRAINT(null_int_ptr));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OPUS_SET_VBR_CONSTRAINT(i),OPUS_GET_VBR_CONSTRAINT(&i),-1,2,
-     1,0,
-     "    OPUS_SET_VBR_CONSTRAINT ...................... OK.\n",
-     "    OPUS_GET_VBR_CONSTRAINT ...................... OK.\n")
-
-   err=opus_encoder_ctl(enc,OPUS_GET_SIGNAL(null_int_ptr));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OPUS_SET_SIGNAL(i),OPUS_GET_SIGNAL(&i),-12345,0x7FFFFFFF,
-     OPUS_SIGNAL_MUSIC,OPUS_AUTO,
-     "    OPUS_SET_SIGNAL .............................. OK.\n",
-     "    OPUS_GET_SIGNAL .............................. OK.\n")
-
-   err=opus_encoder_ctl(enc,OPUS_GET_LSB_DEPTH(null_int_ptr));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OPUS_SET_LSB_DEPTH(i),OPUS_GET_LSB_DEPTH(&i),7,25,16,24,
-     "    OPUS_SET_LSB_DEPTH ........................... OK.\n",
-     "    OPUS_GET_LSB_DEPTH ........................... OK.\n")
-
-   err=opus_encoder_ctl(enc,OPUS_GET_PREDICTION_DISABLED(&i));
-   if(i!=0)test_failed();
-   cfgs++;
-   err=opus_encoder_ctl(enc,OPUS_GET_PREDICTION_DISABLED(null_int_ptr));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OPUS_SET_PREDICTION_DISABLED(i),OPUS_GET_PREDICTION_DISABLED(&i),-1,2,1,0,
-     "    OPUS_SET_PREDICTION_DISABLED ................. OK.\n",
-     "    OPUS_GET_PREDICTION_DISABLED ................. OK.\n")
-
-   err=opus_encoder_ctl(enc,OPUS_GET_EXPERT_FRAME_DURATION(null_int_ptr));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   err=opus_encoder_ctl(enc,OPUS_SET_EXPERT_FRAME_DURATION(OPUS_FRAMESIZE_2_5_MS));
-   if(err!=OPUS_OK)test_failed();
-   cfgs++;
-   err=opus_encoder_ctl(enc,OPUS_SET_EXPERT_FRAME_DURATION(OPUS_FRAMESIZE_5_MS));
-   if(err!=OPUS_OK)test_failed();
-   cfgs++;
-   err=opus_encoder_ctl(enc,OPUS_SET_EXPERT_FRAME_DURATION(OPUS_FRAMESIZE_10_MS));
-   if(err!=OPUS_OK)test_failed();
-   cfgs++;
-   err=opus_encoder_ctl(enc,OPUS_SET_EXPERT_FRAME_DURATION(OPUS_FRAMESIZE_20_MS));
-   if(err!=OPUS_OK)test_failed();
-   cfgs++;
-   err=opus_encoder_ctl(enc,OPUS_SET_EXPERT_FRAME_DURATION(OPUS_FRAMESIZE_40_MS));
-   if(err!=OPUS_OK)test_failed();
-   cfgs++;
-   err=opus_encoder_ctl(enc,OPUS_SET_EXPERT_FRAME_DURATION(OPUS_FRAMESIZE_60_MS));
-   if(err!=OPUS_OK)test_failed();
-   cfgs++;
-   err=opus_encoder_ctl(enc,OPUS_SET_EXPERT_FRAME_DURATION(OPUS_FRAMESIZE_80_MS));
-   if(err!=OPUS_OK)test_failed();
-   cfgs++;
-   err=opus_encoder_ctl(enc,OPUS_SET_EXPERT_FRAME_DURATION(OPUS_FRAMESIZE_100_MS));
-   if(err!=OPUS_OK)test_failed();
-   cfgs++;
-   err=opus_encoder_ctl(enc,OPUS_SET_EXPERT_FRAME_DURATION(OPUS_FRAMESIZE_120_MS));
-   if(err!=OPUS_OK)test_failed();
-   cfgs++;
-   CHECK_SETGET(OPUS_SET_EXPERT_FRAME_DURATION(i),OPUS_GET_EXPERT_FRAME_DURATION(&i),0,-1,
-         OPUS_FRAMESIZE_60_MS,OPUS_FRAMESIZE_ARG,
-     "    OPUS_SET_EXPERT_FRAME_DURATION ............... OK.\n",
-     "    OPUS_GET_EXPERT_FRAME_DURATION ............... OK.\n")
-
-   /*OPUS_SET_FORCE_MODE is not tested here because it's not a public API, however the encoder tests use it*/
-
-   err=opus_encoder_ctl(enc,OPUS_GET_FINAL_RANGE(null_uint_ptr));
-   if(err!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   if(opus_encoder_ctl(enc,OPUS_GET_FINAL_RANGE(&enc_final_range))!=OPUS_OK)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OPUS_GET_FINAL_RANGE ......................... OK.\n");
-
-   /*Reset the encoder*/
-   if(opus_encoder_ctl(enc, OPUS_RESET_STATE)!=OPUS_OK)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OPUS_RESET_STATE ............................. OK.\n");
-
-   memset(sbuf,0,sizeof(short)*2*960);
-   VG_UNDEF(packet,sizeof(packet));
-   i=opus_encode(enc, sbuf, 960, packet, sizeof(packet));
-   if(i<1 || (i>(opus_int32)sizeof(packet)))test_failed();
-   VG_CHECK(packet,i);
-   cfgs++;
-   fprintf(stdout,"    opus_encode() ................................ OK.\n");
-#ifndef DISABLE_FLOAT_API
-   memset(fbuf,0,sizeof(float)*2*960);
-   VG_UNDEF(packet,sizeof(packet));
-   i=opus_encode_float(enc, fbuf, 960, packet, sizeof(packet));
-   if(i<1 || (i>(opus_int32)sizeof(packet)))test_failed();
-   VG_CHECK(packet,i);
-   cfgs++;
-   fprintf(stdout,"    opus_encode_float() .......................... OK.\n");
-#endif
-
-#if 0
-   /*These tests are disabled because the library crashes with null states*/
-   if(opus_encoder_ctl(0,OPUS_RESET_STATE)               !=OPUS_INVALID_STATE)test_failed();
-   if(opus_encoder_init(0,48000,1,OPUS_APPLICATION_VOIP) !=OPUS_INVALID_STATE)test_failed();
-   if(opus_encode(0,sbuf,960,packet,sizeof(packet))      !=OPUS_INVALID_STATE)test_failed();
-   if(opus_encode_float(0,fbuf,960,packet,sizeof(packet))!=OPUS_INVALID_STATE)test_failed();
-#endif
-   opus_encoder_destroy(enc);
-   cfgs++;
-   fprintf(stdout,"                   All encoder interface tests passed\n");
-   fprintf(stdout,"                             (%d API invocations)\n",cfgs);
-   return cfgs;
-}
-
-#define max_out (1276*48+48*2+2)
-int test_repacketizer_api(void)
-{
-   int ret,cfgs,i,j,k;
-   OpusRepacketizer *rp;
-   unsigned char *packet;
-   unsigned char *po;
-   cfgs=0;
-   fprintf(stdout,"\n  Repacketizer tests\n");
-   fprintf(stdout,"  ---------------------------------------------------\n");
-
-   packet=(unsigned char *)malloc(max_out);
-   if(packet==NULL)test_failed();
-   memset(packet,0,max_out);
-   po=(unsigned char *)malloc(max_out+256);
-   if(po==NULL)test_failed();
-
-   i=opus_repacketizer_get_size();
-   if(i<=0)test_failed();
-   cfgs++;
-   fprintf(stdout,"    opus_repacketizer_get_size()=%d ............. OK.\n",i);
-
-   rp=(OpusRepacketizer*)malloc(i);
-   rp=opus_repacketizer_init(rp);
-   if(rp==NULL)test_failed();
-   cfgs++;
-   free(rp);
-   fprintf(stdout,"    opus_repacketizer_init ....................... OK.\n");
-
-   rp=opus_repacketizer_create();
-   if(rp==NULL)test_failed();
-   cfgs++;
-   fprintf(stdout,"    opus_repacketizer_create ..................... OK.\n");
-
-   if(opus_repacketizer_get_nb_frames(rp)!=0)test_failed();
-   cfgs++;
-   fprintf(stdout,"    opus_repacketizer_get_nb_frames .............. OK.\n");
-
-   /*Length overflows*/
-   VG_UNDEF(packet,4);
-   if(opus_repacketizer_cat(rp,packet,0)!=OPUS_INVALID_PACKET)test_failed(); /* Zero len */
-   cfgs++;
-   packet[0]=1;
-   if(opus_repacketizer_cat(rp,packet,2)!=OPUS_INVALID_PACKET)test_failed(); /* Odd payload code 1 */
-   cfgs++;
-   packet[0]=2;
-   if(opus_repacketizer_cat(rp,packet,1)!=OPUS_INVALID_PACKET)test_failed(); /* Code 2 overflow one */
-   cfgs++;
-   packet[0]=3;
-   if(opus_repacketizer_cat(rp,packet,1)!=OPUS_INVALID_PACKET)test_failed(); /* Code 3 no count */
-   cfgs++;
-   packet[0]=2;
-   packet[1]=255;
-   if(opus_repacketizer_cat(rp,packet,2)!=OPUS_INVALID_PACKET)test_failed(); /* Code 2 overflow two */
-   cfgs++;
-   packet[0]=2;
-   packet[1]=250;
-   if(opus_repacketizer_cat(rp,packet,251)!=OPUS_INVALID_PACKET)test_failed(); /* Code 2 overflow three */
-   cfgs++;
-   packet[0]=3;
-   packet[1]=0;
-   if(opus_repacketizer_cat(rp,packet,2)!=OPUS_INVALID_PACKET)test_failed(); /* Code 3 m=0 */
-   cfgs++;
-   packet[1]=49;
-   if(opus_repacketizer_cat(rp,packet,100)!=OPUS_INVALID_PACKET)test_failed(); /* Code 3 m=49 */
-   cfgs++;
-   packet[0]=0;
-   if(opus_repacketizer_cat(rp,packet,3)!=OPUS_OK)test_failed();
-   cfgs++;
-   packet[0]=1<<2;
-   if(opus_repacketizer_cat(rp,packet,3)!=OPUS_INVALID_PACKET)test_failed(); /* Change in TOC */
-   cfgs++;
-
-   /* Code 0,1,3 CBR -> Code 0,1,3 CBR */
-   opus_repacketizer_init(rp);
-   for(j=0;j<32;j++)
-   {
-      /* TOC types, test half with stereo */
-      int maxi;
-      packet[0]=((j<<1)+(j&1))<<2;
-      maxi=960/opus_packet_get_samples_per_frame(packet,8000);
-      for(i=1;i<=maxi;i++)
-      {
-         /* Number of CBR frames in the input packets */
-         int maxp;
-         packet[0]=((j<<1)+(j&1))<<2;
-         if(i>1)packet[0]+=i==2?1:3;
-         packet[1]=i>2?i:0;
-         maxp=960/(i*opus_packet_get_samples_per_frame(packet,8000));
-         for(k=0;k<=(1275+75);k+=3)
-         {
-            /*Payload size*/
-            opus_int32 cnt,rcnt;
-            if(k%i!=0)continue; /* Only testing CBR here, payload must be a multiple of the count */
-            for(cnt=0;cnt<maxp+2;cnt++)
-            {
-               if(cnt>0)
-               {
-                  ret=opus_repacketizer_cat(rp,packet,k+(i>2?2:1));
-                  if((cnt<=maxp&&k<=(1275*i))?ret!=OPUS_OK:ret!=OPUS_INVALID_PACKET)test_failed();
-                  cfgs++;
-               }
-               rcnt=k<=(1275*i)?(cnt<maxp?cnt:maxp):0;
-               if(opus_repacketizer_get_nb_frames(rp)!=rcnt*i)test_failed();
-               cfgs++;
-               ret=opus_repacketizer_out_range(rp,0,rcnt*i,po,max_out);
-               if(rcnt>0)
-               {
-                  int len;
-                  len=k*rcnt+((rcnt*i)>2?2:1);
-                  if(ret!=len)test_failed();
-                  if((rcnt*i)<2&&(po[0]&3)!=0)test_failed();                      /* Code 0 */
-                  if((rcnt*i)==2&&(po[0]&3)!=1)test_failed();                     /* Code 1 */
-                  if((rcnt*i)>2&&(((po[0]&3)!=3)||(po[1]!=rcnt*i)))test_failed(); /* Code 3 CBR */
-                  cfgs++;
-                  if(opus_repacketizer_out(rp,po,len)!=len)test_failed();
-                  cfgs++;
-                  if(opus_packet_unpad(po,len)!=len)test_failed();
-                  cfgs++;
-                  if(opus_packet_pad(po,len,len+1)!=OPUS_OK)test_failed();
-                  cfgs++;
-                  if(opus_packet_pad(po,len+1,len+256)!=OPUS_OK)test_failed();
-                  cfgs++;
-                  if(opus_packet_unpad(po,len+256)!=len)test_failed();
-                  cfgs++;
-                  if(opus_multistream_packet_unpad(po,len,1)!=len)test_failed();
-                  cfgs++;
-                  if(opus_multistream_packet_pad(po,len,len+1,1)!=OPUS_OK)test_failed();
-                  cfgs++;
-                  if(opus_multistream_packet_pad(po,len+1,len+256,1)!=OPUS_OK)test_failed();
-                  cfgs++;
-                  if(opus_multistream_packet_unpad(po,len+256,1)!=len)test_failed();
-                  cfgs++;
-                  if(opus_repacketizer_out(rp,po,len-1)!=OPUS_BUFFER_TOO_SMALL)test_failed();
-                  cfgs++;
-                  if(len>1)
-                  {
-                     if(opus_repacketizer_out(rp,po,1)!=OPUS_BUFFER_TOO_SMALL)test_failed();
-                     cfgs++;
-                  }
-                  if(opus_repacketizer_out(rp,po,0)!=OPUS_BUFFER_TOO_SMALL)test_failed();
-                  cfgs++;
-               } else if (ret!=OPUS_BAD_ARG)test_failed();                        /* M must not be 0 */
-            }
-            opus_repacketizer_init(rp);
-         }
-      }
-   }
-
-   /*Change in input count code, CBR out*/
-   opus_repacketizer_init(rp);
-   packet[0]=0;
-   if(opus_repacketizer_cat(rp,packet,5)!=OPUS_OK)test_failed();
-   cfgs++;
-   packet[0]+=1;
-   if(opus_repacketizer_cat(rp,packet,9)!=OPUS_OK)test_failed();
-   cfgs++;
-   i=opus_repacketizer_out(rp,po,max_out);
-   if((i!=(4+8+2))||((po[0]&3)!=3)||((po[1]&63)!=3)||((po[1]>>7)!=0))test_failed();
-   cfgs++;
-   i=opus_repacketizer_out_range(rp,0,1,po,max_out);
-   if(i!=5||(po[0]&3)!=0)test_failed();
-   cfgs++;
-   i=opus_repacketizer_out_range(rp,1,2,po,max_out);
-   if(i!=5||(po[0]&3)!=0)test_failed();
-   cfgs++;
-
-   /*Change in input count code, VBR out*/
-   opus_repacketizer_init(rp);
-   packet[0]=1;
-   if(opus_repacketizer_cat(rp,packet,9)!=OPUS_OK)test_failed();
-   cfgs++;
-   packet[0]=0;
-   if(opus_repacketizer_cat(rp,packet,3)!=OPUS_OK)test_failed();
-   cfgs++;
-   i=opus_repacketizer_out(rp,po,max_out);
-   if((i!=(2+8+2+2))||((po[0]&3)!=3)||((po[1]&63)!=3)||((po[1]>>7)!=1))test_failed();
-   cfgs++;
-
-   /*VBR in, VBR out*/
-   opus_repacketizer_init(rp);
-   packet[0]=2;
-   packet[1]=4;
-   if(opus_repacketizer_cat(rp,packet,8)!=OPUS_OK)test_failed();
-   cfgs++;
-   if(opus_repacketizer_cat(rp,packet,8)!=OPUS_OK)test_failed();
-   cfgs++;
-   i=opus_repacketizer_out(rp,po,max_out);
-   if((i!=(2+1+1+1+4+2+4+2))||((po[0]&3)!=3)||((po[1]&63)!=4)||((po[1]>>7)!=1))test_failed();
-   cfgs++;
-
-   /*VBR in, CBR out*/
-   opus_repacketizer_init(rp);
-   packet[0]=2;
-   packet[1]=4;
-   if(opus_repacketizer_cat(rp,packet,10)!=OPUS_OK)test_failed();
-   cfgs++;
-   if(opus_repacketizer_cat(rp,packet,10)!=OPUS_OK)test_failed();
-   cfgs++;
-   i=opus_repacketizer_out(rp,po,max_out);
-   if((i!=(2+4+4+4+4))||((po[0]&3)!=3)||((po[1]&63)!=4)||((po[1]>>7)!=0))test_failed();
-   cfgs++;
-
-   /*Count 0 in, VBR out*/
-   for(j=0;j<32;j++)
-   {
-      /* TOC types, test half with stereo */
-      int maxi,sum,rcnt;
-      packet[0]=((j<<1)+(j&1))<<2;
-      maxi=960/opus_packet_get_samples_per_frame(packet,8000);
-      sum=0;
-      rcnt=0;
-      opus_repacketizer_init(rp);
-      for(i=1;i<=maxi+2;i++)
-      {
-         int len;
-         ret=opus_repacketizer_cat(rp,packet,i);
-         if(rcnt<maxi)
-         {
-            if(ret!=OPUS_OK)test_failed();
-            rcnt++;
-            sum+=i-1;
-         } else if (ret!=OPUS_INVALID_PACKET)test_failed();
-         cfgs++;
-         len=sum+(rcnt<2?1:rcnt<3?2:2+rcnt-1);
-         if(opus_repacketizer_out(rp,po,max_out)!=len)test_failed();
-         if(rcnt>2&&(po[1]&63)!=rcnt)test_failed();
-         if(rcnt==2&&(po[0]&3)!=2)test_failed();
-         if(rcnt==1&&(po[0]&3)!=0)test_failed();
-         cfgs++;
-         if(opus_repacketizer_out(rp,po,len)!=len)test_failed();
-         cfgs++;
-         if(opus_packet_unpad(po,len)!=len)test_failed();
-         cfgs++;
-         if(opus_packet_pad(po,len,len+1)!=OPUS_OK)test_failed();
-         cfgs++;
-         if(opus_packet_pad(po,len+1,len+256)!=OPUS_OK)test_failed();
-         cfgs++;
-         if(opus_packet_unpad(po,len+256)!=len)test_failed();
-         cfgs++;
-         if(opus_multistream_packet_unpad(po,len,1)!=len)test_failed();
-         cfgs++;
-         if(opus_multistream_packet_pad(po,len,len+1,1)!=OPUS_OK)test_failed();
-         cfgs++;
-         if(opus_multistream_packet_pad(po,len+1,len+256,1)!=OPUS_OK)test_failed();
-         cfgs++;
-         if(opus_multistream_packet_unpad(po,len+256,1)!=len)test_failed();
-         cfgs++;
-         if(opus_repacketizer_out(rp,po,len-1)!=OPUS_BUFFER_TOO_SMALL)test_failed();
-         cfgs++;
-         if(len>1)
-         {
-            if(opus_repacketizer_out(rp,po,1)!=OPUS_BUFFER_TOO_SMALL)test_failed();
-            cfgs++;
-         }
-         if(opus_repacketizer_out(rp,po,0)!=OPUS_BUFFER_TOO_SMALL)test_failed();
-         cfgs++;
-      }
-   }
-
-   po[0]='O';
-   po[1]='p';
-   if(opus_packet_pad(po,4,4)!=OPUS_OK)test_failed();
-   cfgs++;
-   if(opus_multistream_packet_pad(po,4,4,1)!=OPUS_OK)test_failed();
-   cfgs++;
-   if(opus_packet_pad(po,4,5)!=OPUS_INVALID_PACKET)test_failed();
-   cfgs++;
-   if(opus_multistream_packet_pad(po,4,5,1)!=OPUS_INVALID_PACKET)test_failed();
-   cfgs++;
-   if(opus_packet_pad(po,0,5)!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   if(opus_multistream_packet_pad(po,0,5,1)!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   if(opus_packet_unpad(po,0)!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   if(opus_multistream_packet_unpad(po,0,1)!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   if(opus_packet_unpad(po,4)!=OPUS_INVALID_PACKET)test_failed();
-   cfgs++;
-   if(opus_multistream_packet_unpad(po,4,1)!=OPUS_INVALID_PACKET)test_failed();
-   cfgs++;
-   po[0]=0;
-   po[1]=0;
-   po[2]=0;
-   if(opus_packet_pad(po,5,4)!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-   if(opus_multistream_packet_pad(po,5,4,1)!=OPUS_BAD_ARG)test_failed();
-   cfgs++;
-
-   fprintf(stdout,"    opus_repacketizer_cat ........................ OK.\n");
-   fprintf(stdout,"    opus_repacketizer_out ........................ OK.\n");
-   fprintf(stdout,"    opus_repacketizer_out_range .................. OK.\n");
-   fprintf(stdout,"    opus_packet_pad .............................. OK.\n");
-   fprintf(stdout,"    opus_packet_unpad ............................ OK.\n");
-   fprintf(stdout,"    opus_multistream_packet_pad .................. OK.\n");
-   fprintf(stdout,"    opus_multistream_packet_unpad ................ OK.\n");
-
-   opus_repacketizer_destroy(rp);
-   cfgs++;
-   free(packet);
-   free(po);
-   fprintf(stdout,"                        All repacketizer tests passed\n");
-   fprintf(stdout,"                            (%7d API invocations)\n",cfgs);
-
-   return cfgs;
-}
-
-#ifdef MALLOC_FAIL
-/* GLIBC 2.14 declares __malloc_hook as deprecated, generating a warning
- * under GCC. However, this is the cleanest way to test malloc failure
- * handling in our codebase, and the lack of thread safety isn't an
- * issue here. We therefore disable the warning for this function.
- */
-#if OPUS_GNUC_PREREQ(4,6)
-/* Save the current warning settings */
-#pragma GCC diagnostic push
-#endif
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
-typedef void *(*mhook)(size_t __size, __const void *);
-#endif
-
-int test_malloc_fail(void)
-{
-#ifdef MALLOC_FAIL
-   OpusDecoder *dec;
-   OpusEncoder *enc;
-   OpusRepacketizer *rp;
-   unsigned char mapping[256] = {0,1};
-   OpusMSDecoder *msdec;
-   OpusMSEncoder *msenc;
-   int rate,c,app,cfgs,err,useerr;
-   int *ep;
-   mhook orig_malloc;
-   cfgs=0;
-#endif
-   fprintf(stdout,"\n  malloc() failure tests\n");
-   fprintf(stdout,"  ---------------------------------------------------\n");
-#ifdef MALLOC_FAIL
-   orig_malloc=__malloc_hook;
-   __malloc_hook=malloc_hook;
-   ep=(int *)opus_alloc(sizeof(int));
-   if(ep!=NULL)
-   {
-      if(ep)free(ep);
-      __malloc_hook=orig_malloc;
-#endif
-      fprintf(stdout,"    opus_decoder_create() ................... SKIPPED.\n");
-      fprintf(stdout,"    opus_encoder_create() ................... SKIPPED.\n");
-      fprintf(stdout,"    opus_repacketizer_create() .............. SKIPPED.\n");
-      fprintf(stdout,"    opus_multistream_decoder_create() ....... SKIPPED.\n");
-      fprintf(stdout,"    opus_multistream_encoder_create() ....... SKIPPED.\n");
-      fprintf(stdout,"(Test only supported with GLIBC and without valgrind)\n");
-      return 0;
-#ifdef MALLOC_FAIL
-   }
-   for(useerr=0;useerr<2;useerr++)
-   {
-      ep=useerr?&err:0;
-      for(rate=0;rate<5;rate++)
-      {
-        for(c=1;c<3;c++)
-        {
-           err=1;
-           if(useerr)
-           {
-              VG_UNDEF(&err,sizeof(err));
-           }
-           dec=opus_decoder_create(opus_rates[rate], c, ep);
-           if(dec!=NULL||(useerr&&err!=OPUS_ALLOC_FAIL))
-           {
-              __malloc_hook=orig_malloc;
-              test_failed();
-           }
-           cfgs++;
-           msdec=opus_multistream_decoder_create(opus_rates[rate], c, 1, c-1, mapping, ep);
-           if(msdec!=NULL||(useerr&&err!=OPUS_ALLOC_FAIL))
-           {
-              __malloc_hook=orig_malloc;
-              test_failed();
-           }
-           cfgs++;
-           for(app=0;app<3;app++)
-           {
-              if(useerr)
-              {
-                 VG_UNDEF(&err,sizeof(err));
-              }
-              enc=opus_encoder_create(opus_rates[rate], c, opus_apps[app],ep);
-              if(enc!=NULL||(useerr&&err!=OPUS_ALLOC_FAIL))
-              {
-                 __malloc_hook=orig_malloc;
-                 test_failed();
-              }
-              cfgs++;
-              msenc=opus_multistream_encoder_create(opus_rates[rate], c, 1, c-1, mapping, opus_apps[app],ep);
-              if(msenc!=NULL||(useerr&&err!=OPUS_ALLOC_FAIL))
-              {
-                 __malloc_hook=orig_malloc;
-                 test_failed();
-              }
-              cfgs++;
-           }
-        }
-     }
-   }
-   rp=opus_repacketizer_create();
-   if(rp!=NULL)
-   {
-      __malloc_hook=orig_malloc;
-      test_failed();
-   }
-   cfgs++;
-   __malloc_hook=orig_malloc;
-   fprintf(stdout,"    opus_decoder_create() ........................ OK.\n");
-   fprintf(stdout,"    opus_encoder_create() ........................ OK.\n");
-   fprintf(stdout,"    opus_repacketizer_create() ................... OK.\n");
-   fprintf(stdout,"    opus_multistream_decoder_create() ............ OK.\n");
-   fprintf(stdout,"    opus_multistream_encoder_create() ............ OK.\n");
-   fprintf(stdout,"                      All malloc failure tests passed\n");
-   fprintf(stdout,"                                 (%2d API invocations)\n",cfgs);
-   return cfgs;
-#endif
-}
-
-#ifdef MALLOC_FAIL
-#if __GNUC_PREREQ(4,6)
-#pragma GCC diagnostic pop /* restore -Wdeprecated-declarations */
-#endif
-#endif
-
-int main(int _argc, char **_argv)
-{
-   opus_int32 total;
-   const char * oversion;
-   if(_argc>1)
-   {
-      fprintf(stderr,"Usage: %s\n",_argv[0]);
-      return 1;
-   }
-   iseed=0;
-
-   oversion=opus_get_version_string();
-   if(!oversion)test_failed();
-   fprintf(stderr,"Testing the %s API deterministically\n", oversion);
-   if(opus_strerror(-32768)==NULL)test_failed();
-   if(opus_strerror(32767)==NULL)test_failed();
-   if(strlen(opus_strerror(0))<1)test_failed();
-   total=4;
-
-   total+=test_dec_api();
-   total+=test_msdec_api();
-   total+=test_parse();
-   total+=test_enc_api();
-   total+=test_repacketizer_api();
-   total+=test_malloc_fail();
-
-   fprintf(stderr,"\nAll API tests passed.\nThe libopus API was invoked %d times.\n",total);
-
-   return 0;
-}
diff --git a/training/rnn_dump.py b/training/rnn_dump.py
deleted file mode 100755
index c312088e8..000000000
--- a/training/rnn_dump.py
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/python
-
-from __future__ import print_function
-
-from keras.models import Sequential
-from keras.models import Model
-from keras.layers import Input
-from keras.layers import Dense
-from keras.layers import LSTM
-from keras.layers import GRU
-from keras.models import load_model
-from keras import backend as K
-import sys
-
-import numpy as np
-
-def printVector(f, vector, name):
-    v = np.reshape(vector, (-1));
-    #print('static const float ', name, '[', len(v), '] = \n', file=f)
-    f.write('static const opus_int8 {}[{}] = {{\n   '.format(name, len(v)))
-    for i in range(0, len(v)):
-        f.write('{}'.format(max(-128,min(127,int(round(128*v[i]))))))
-        if (i!=len(v)-1):
-            f.write(',')
-        else:
-            break;
-        if (i%8==7):
-            f.write("\n   ")
-        else:
-            f.write(" ")
-    #print(v, file=f)
-    f.write('\n};\n\n')
-    return;
-
-def binary_crossentrop2(y_true, y_pred):
-        return K.mean(2*K.abs(y_true-0.5) * K.binary_crossentropy(y_pred, y_true), axis=-1)
-
-
-#model = load_model(sys.argv[1], custom_objects={'binary_crossentrop2': binary_crossentrop2})
-main_input = Input(shape=(None, 25), name='main_input')
-x = Dense(32, activation='tanh')(main_input)
-x = GRU(24, activation='tanh', recurrent_activation='sigmoid', return_sequences=True)(x)
-x = Dense(2, activation='sigmoid')(x)
-model = Model(inputs=main_input, outputs=x)
-model.load_weights(sys.argv[1])
-
-weights = model.get_weights()
-
-f = open(sys.argv[2], 'w')
-
-f.write('/*This file is automatically generated from a Keras model*/\n\n')
-f.write('#ifdef HAVE_CONFIG_H\n#include "config.h"\n#endif\n\n#include "mlp.h"\n\n')
-
-printVector(f, weights[0], 'layer0_weights')
-printVector(f, weights[1], 'layer0_bias')
-printVector(f, weights[2], 'layer1_weights')
-printVector(f, weights[3], 'layer1_recur_weights')
-printVector(f, weights[4], 'layer1_bias')
-printVector(f, weights[5], 'layer2_weights')
-printVector(f, weights[6], 'layer2_bias')
-
-f.write('const DenseLayer layer0 = {\n   layer0_bias,\n   layer0_weights,\n   25, 32, 0\n};\n\n')
-f.write('const GRULayer layer1 = {\n   layer1_bias,\n   layer1_weights,\n   layer1_recur_weights,\n   32, 24\n};\n\n')
-f.write('const DenseLayer layer2 = {\n   layer2_bias,\n   layer2_weights,\n   24, 2, 1\n};\n\n')
-
-f.close()
diff --git a/training/rnn_train.py b/training/rnn_train.py
deleted file mode 100755
index 02c981734..000000000
--- a/training/rnn_train.py
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/usr/bin/python3
-
-from __future__ import print_function
-
-from keras.models import Sequential
-from keras.models import Model
-from keras.layers import Input
-from keras.layers import Dense
-from keras.layers import LSTM
-from keras.layers import GRU
-from keras.layers import CuDNNGRU
-from keras.layers import SimpleRNN
-from keras.layers import Dropout
-from keras import losses
-import h5py
-from keras.optimizers import Adam
-
-from keras.constraints import Constraint
-from keras import backend as K
-import numpy as np
-
-import tensorflow as tf
-from keras.backend.tensorflow_backend import set_session
-config = tf.ConfigProto()
-config.gpu_options.per_process_gpu_memory_fraction = 0.44
-set_session(tf.Session(config=config))
-
-def binary_crossentrop2(y_true, y_pred):
-    return K.mean(2*K.abs(y_true-0.5) * K.binary_crossentropy(y_true, y_pred), axis=-1)
-
-def binary_accuracy2(y_true, y_pred):
-    return K.mean(K.cast(K.equal(y_true, K.round(y_pred)), 'float32') + K.cast(K.equal(y_true, 0.5), 'float32'), axis=-1)
-
-def quant_model(model):
-    weights = model.get_weights()
-    for k in range(len(weights)):
-        weights[k] = np.maximum(-128, np.minimum(127, np.round(128*weights[k])*0.0078125))
-    model.set_weights(weights)
-
-class WeightClip(Constraint):
-    '''Clips the weights incident to each hidden unit to be inside a range
-    '''
-    def __init__(self, c=2):
-        self.c = c
-
-    def __call__(self, p):
-        return K.clip(p, -self.c, self.c)
-
-    def get_config(self):
-        return {'name': self.__class__.__name__,
-            'c': self.c}
-
-reg = 0.000001
-constraint = WeightClip(.998)
-
-print('Build model...')
-
-main_input = Input(shape=(None, 25), name='main_input')
-x = Dense(32, activation='tanh', kernel_constraint=constraint, bias_constraint=constraint)(main_input)
-#x = CuDNNGRU(24, return_sequences=True, kernel_constraint=constraint, recurrent_constraint=constraint, bias_constraint=constraint)(x)
-x = GRU(24, recurrent_activation='sigmoid', activation='tanh', return_sequences=True, kernel_constraint=constraint, recurrent_constraint=constraint, bias_constraint=constraint)(x)
-x = Dense(2, activation='sigmoid', kernel_constraint=constraint, bias_constraint=constraint)(x)
-model = Model(inputs=main_input, outputs=x)
-
-batch_size = 2048
-
-print('Loading data...')
-with h5py.File('features10b.h5', 'r') as hf:
-    all_data = hf['data'][:]
-print('done.')
-
-window_size = 1500
-
-nb_sequences = len(all_data)//window_size
-print(nb_sequences, ' sequences')
-x_train = all_data[:nb_sequences*window_size, :-2]
-x_train = np.reshape(x_train, (nb_sequences, window_size, 25))
-
-y_train = np.copy(all_data[:nb_sequences*window_size, -2:])
-y_train = np.reshape(y_train, (nb_sequences, window_size, 2))
-
-print("Marking ignores")
-for s in y_train:
-    for e in s:
-        if (e[1] >= 1):
-            break
-        e[0] = 0.5
-
-all_data = 0;
-x_train = x_train.astype('float32')
-y_train = y_train.astype('float32')
-
-print(len(x_train), 'train sequences. x shape =', x_train.shape, 'y shape = ', y_train.shape)
-
-model.load_weights('newweights10a1b_ep206.hdf5')
-
-#weights = model.get_weights()
-#for k in range(len(weights)):
-#    weights[k] = np.round(128*weights[k])*0.0078125
-#model.set_weights(weights)
-
-# try using different optimizers and different optimizer configs
-model.compile(loss=binary_crossentrop2,
-              optimizer=Adam(0.0001),
-              metrics=[binary_accuracy2])
-
-print('Train...')
-quant_model(model)
-model.fit(x_train, y_train,
-          batch_size=batch_size,
-          epochs=10, validation_data=(x_train, y_train))
-model.save("newweights10a1c_ep10.hdf5")
-
-quant_model(model)
-model.fit(x_train, y_train,
-          batch_size=batch_size,
-          epochs=50, initial_epoch=10)
-model.save("newweights10a1c_ep50.hdf5")
-
-model.compile(loss=binary_crossentrop2,
-              optimizer=Adam(0.0001),
-              metrics=[binary_accuracy2])
-
-quant_model(model)
-model.fit(x_train, y_train,
-          batch_size=batch_size,
-          epochs=100, initial_epoch=50)
-model.save("newweights10a1c_ep100.hdf5")
-
-quant_model(model)
-model.fit(x_train, y_train,
-          batch_size=batch_size,
-          epochs=150, initial_epoch=100)
-model.save("newweights10a1c_ep150.hdf5")
-
-quant_model(model)
-model.fit(x_train, y_train,
-          batch_size=batch_size,
-          epochs=200, initial_epoch=150)
-model.save("newweights10a1c_ep200.hdf5")
-
-quant_model(model)
-model.fit(x_train, y_train,
-          batch_size=batch_size,
-          epochs=201, initial_epoch=200)
-model.save("newweights10a1c_ep201.hdf5")
-
-quant_model(model)
-model.fit(x_train, y_train,
-          batch_size=batch_size,
-          epochs=202, initial_epoch=201, validation_data=(x_train, y_train))
-model.save("newweights10a1c_ep202.hdf5")
-
-quant_model(model)
-model.fit(x_train, y_train,
-          batch_size=batch_size,
-          epochs=203, initial_epoch=202, validation_data=(x_train, y_train))
-model.save("newweights10a1c_ep203.hdf5")
-
-quant_model(model)
-model.fit(x_train, y_train,
-          batch_size=batch_size,
-          epochs=204, initial_epoch=203, validation_data=(x_train, y_train))
-model.save("newweights10a1c_ep204.hdf5")
-
-quant_model(model)
-model.fit(x_train, y_train,
-          batch_size=batch_size,
-          epochs=205, initial_epoch=204, validation_data=(x_train, y_train))
-model.save("newweights10a1c_ep205.hdf5")
-
-quant_model(model)
-model.fit(x_train, y_train,
-          batch_size=batch_size,
-          epochs=206, initial_epoch=205, validation_data=(x_train, y_train))
-model.save("newweights10a1c_ep206.hdf5")
diff --git a/training/txt2hdf5.py b/training/txt2hdf5.py
deleted file mode 100755
index 9c602877e..000000000
--- a/training/txt2hdf5.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/python
-
-from __future__ import print_function
-
-import numpy as np
-import h5py
-import sys
-
-data = np.loadtxt(sys.argv[1], dtype='float32')
-h5f = h5py.File(sys.argv[2], 'w');
-h5f.create_dataset('data', data=data)
-h5f.close()

From e6c46a1a6b21b7f272a094b002444742ee7bf448 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jeanmarcv@google.com>
Date: Fri, 9 Jan 2026 15:24:49 -0500
Subject: [PATCH 04/28] Rename downloads

---
 dnn/download_model.sh   | 1 +
 dnn/rename_downloads.sh | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100755 dnn/rename_downloads.sh

diff --git a/dnn/download_model.sh b/dnn/download_model.sh
index 807efa623..ce7985f24 100755
--- a/dnn/download_model.sh
+++ b/dnn/download_model.sh
@@ -38,3 +38,4 @@ else
 fi
 
 tar xvzomf $model
+dnn/rename_downloads.sh
diff --git a/dnn/rename_downloads.sh b/dnn/rename_downloads.sh
new file mode 100755
index 000000000..1f069fe40
--- /dev/null
+++ b/dnn/rename_downloads.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo changing files
+for i in `find dnn | grep "_data\.[ch]" | grep -v dump_data`
+do
+	cat $i | sed -e 's/OPUS/OAC/g' -e 's/Opus/Oac/g' -e 's/opus_/oac_/g' -e 's/opus/oac/g' > tmp.c
+	cp tmp.c $i; rm tmp.c
+done

From 54e4d9fade6a2cccf8b0475f9b7c0169168f3215 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jeanmarcv@google.com>
Date: Mon, 12 Jan 2026 18:05:35 -0500
Subject: [PATCH 05/28] Remove reference to Opus logo

---
 doc/Doxyfile.in | 2 +-
 doc/Makefile.am | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index be29e9257..5f1a6c6ea 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -222,7 +222,7 @@ HTML_STYLESHEET        = @top_srcdir@/doc/customdoxygen.css
 # files will be copied as-is; there are no commands or markers available.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_FILES       = @top_srcdir@/doc/oac_logo.svg
+HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
 # in the HTML output. For a value of 0 the output will use grayscales only. A
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ee24df4b1..364b8ca85 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -10,7 +10,7 @@ DOCINPUTS = $(top_srcdir)/include/oac.h \
             $(top_srcdir)/doc/customdoxygen.css
 
 EXTRA_DIST = customdoxygen.css Doxyfile.in footer.html header.html \
-             oac_logo.svg trivial_example.c
+             trivial_example.c
 
 
 if HAVE_DOXYGEN

From 7ec547f00f00f81294e16b85832208f9c500e2e2 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jeanmarcv@google.com>
Date: Tue, 13 Jan 2026 14:46:56 -0500
Subject: [PATCH 06/28] Fix version script

---
 meson/get-version.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meson/get-version.py b/meson/get-version.py
index 661a1a81a..39f4a74c4 100755
--- a/meson/get-version.py
+++ b/meson/get-version.py
@@ -64,11 +64,11 @@
         with open(os.path.join(srcroot, 'configure.ac'), 'r') as f:
             for line in f:
                 if line.strip().startswith('OAC_LT_CURRENT='):
-                    oac_lt_cur = line[16:].strip()
+                    oac_lt_cur = line[15:].strip()
                 elif line.strip().startswith('OAC_LT_REVISION='):
-                    oac_lt_rev = line[17:].strip()
+                    oac_lt_rev = line[16:].strip()
                 elif line.strip().startswith('OAC_LT_AGE='):
-                    oac_lt_age = line[12:].strip()
+                    oac_lt_age = line[11:].strip()
 
         if oac_lt_cur and oac_lt_rev and oac_lt_age:
             oac_lt_cur = int(oac_lt_cur)

From f9b6096b57746ac783307e560146ef2db691e4a9 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jeanmarcv@google.com>
Date: Tue, 13 Jan 2026 15:18:57 -0500
Subject: [PATCH 07/28] Reset LT version

---
 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6d5250c85..bcd4be4d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 # For libtool.
 dnl Please update these for releases.
-OAC_LT_CURRENT=11
-OAC_LT_REVISION=1
-OAC_LT_AGE=11
+OAC_LT_CURRENT=0
+OAC_LT_REVISION=0
+OAC_LT_AGE=0
 
 AC_SUBST(OAC_LT_CURRENT)
 AC_SUBST(OAC_LT_REVISION)

From e7b0367e44ffdaa98c6e643872e86cf4de34c91e Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jeanmarcv@google.com>
Date: Thu, 15 Jan 2026 11:10:54 -0500
Subject: [PATCH 08/28] Reformat to OAC coding style

---
 celt/_kiss_fft_guts.h                         |  240 +-
 celt/arch.h                                   |  457 +-
 celt/arm/arm_celt_map.c                       |  171 +-
 celt/arm/armcpu.c                             |  473 +-
 celt/arm/armcpu.h                             |  116 +-
 celt/arm/celt_fft_ne10.c                      |  165 +-
 celt/arm/celt_mdct_ne10.c                     |  404 +-
 celt/arm/celt_neon_intr.c                     |  631 +--
 celt/arm/fft_arm.h                            |   32 +-
 celt/arm/fixed_arm64.h                        |    2 +-
 celt/arm/fixed_armv4.h                        |   48 +-
 celt/arm/fixed_armv5e.h                       |  139 +-
 celt/arm/kiss_fft_armv4.h                     |  194 +-
 celt/arm/kiss_fft_armv5e.h                    |  186 +-
 celt/arm/mathops_arm.h                        |   81 +-
 celt/arm/mdct_arm.h                           |   30 +-
 celt/arm/pitch_arm.h                          |  158 +-
 celt/arm/pitch_neon_intr.c                    |  140 +-
 celt/bands.c                                  | 2948 +++++-----
 celt/bands.h                                  |   33 +-
 celt/celt.c                                   |  516 +-
 celt/celt.h                                   |  134 +-
 celt/celt_decoder.c                           | 2763 +++++----
 celt/celt_encoder.c                           | 4994 ++++++++---------
 celt/celt_lpc.c                               |  559 +-
 celt/celt_lpc.h                               |   34 +-
 celt/cpu_support.h                            |   27 +-
 celt/cwrs.c                                   | 1040 ++--
 celt/cwrs.h                                   |    2 +-
 celt/dump_modes/dump_modes.c                  |  564 +-
 celt/dump_modes/dump_modes_arch.h             |    8 +-
 celt/dump_modes/dump_modes_arm_ne10.c         |  166 +-
 celt/ecintrin.h                               |   76 +-
 celt/entcode.c                                |  196 +-
 celt/entcode.h                                |  144 +-
 celt/entdec.c                                 |  326 +-
 celt/entdec.h                                 |   78 +-
 celt/entenc.c                                 |  417 +-
 celt/entenc.h                                 |   82 +-
 celt/fixed_c5x.h                              |   35 +-
 celt/fixed_c6x.h                              |   56 +-
 celt/fixed_debug.h                            | 1130 ++--
 celt/fixed_generic.h                          |  158 +-
 celt/float_cast.h                             |  134 +-
 celt/kiss_fft.c                               |  881 ++-
 celt/kiss_fft.h                               |  136 +-
 celt/laplace.c                                |  339 +-
 celt/laplace.h                                |   20 +-
 celt/mathops.c                                |  448 +-
 celt/mathops.h                                |  836 ++-
 celt/mdct.c                                   |  559 +-
 celt/mdct.h                                   |   62 +-
 celt/mfrngcod.h                               |   20 +-
 celt/mini_kfft.c                              |  434 +-
 celt/mips/celt_mipsr1.h                       |  213 +-
 celt/mips/fixed_generic_mipsr1.h              |  174 +-
 celt/mips/kiss_fft_mipsr1.h                   |  289 +-
 celt/mips/mdct_mipsr1.h                       |  556 +-
 celt/mips/pitch_mipsr1.h                      |  518 +-
 celt/modes.c                                  |  723 ++-
 celt/modes.h                                  |   42 +-
 celt/oac_custom_demo.c                        |  714 ++-
 celt/os_support.h                             |   38 +-
 celt/pitch.c                                  |  834 ++-
 celt/pitch.h                                  |  190 +-
 celt/quant_bands.c                            |  878 ++-
 celt/quant_bands.h                            |   29 +-
 celt/rate.c                                   | 1117 ++--
 celt/rate.h                                   |   86 +-
 celt/stack_alloc.h                            |  164 +-
 celt/static_modes_fixed.h                     | 4696 ++++++++--------
 celt/static_modes_fixed_arm_ne10.h            |  698 +--
 celt/static_modes_float.h                     | 4680 +++++++--------
 celt/static_modes_float_arm_ne10.h            |  714 +--
 celt/tests/test_unit_cwrs32.c                 |  169 +-
 celt/tests/test_unit_dft.c                    |  121 +-
 celt/tests/test_unit_entropy.c                |  627 ++-
 celt/tests/test_unit_laplace.c                |   79 +-
 celt/tests/test_unit_mathops.c                | 1212 ++--
 celt/tests/test_unit_mdct.c                   |  202 +-
 celt/tests/test_unit_mini_kfft.c              |  123 +-
 celt/tests/test_unit_rotation.c               |   79 +-
 celt/tests/test_unit_types.c                  |   31 +-
 celt/vq.c                                     |  919 ++-
 celt/vq.h                                     |   26 +-
 celt/x86/celt_lpc_sse.h                       |   32 +-
 celt/x86/celt_lpc_sse4_1.c                    |   87 +-
 celt/x86/pitch_avx.c                          |   79 +-
 celt/x86/pitch_sse.c                          |  254 +-
 celt/x86/pitch_sse.h                          |  154 +-
 celt/x86/pitch_sse2.c                         |   19 +-
 celt/x86/pitch_sse4_1.c                       |   58 +-
 celt/x86/vq_sse.h                             |   18 +-
 celt/x86/vq_sse2.c                            |  337 +-
 celt/x86/x86_arch_macros.h                    |   26 +-
 celt/x86/x86_celt_map.c                       |  166 +-
 celt/x86/x86cpu.c                             |  103 +-
 celt/x86/x86cpu.h                             |  122 +-
 cmake/cpu_info_by_asm.c                       |    8 +-
 dnn/adaconvtest.c                             |  114 +-
 dnn/arm/arm_dnn_map.c                         |   28 +-
 dnn/arm/dnn_arm.h                             |   51 +-
 dnn/arm/nnet_dotprod.c                        |    6 +-
 dnn/arm/nnet_neon.c                           |    6 +-
 dnn/burg.c                                    |  213 +-
 dnn/burg.h                                    |   62 +-
 dnn/bwe_demo.c                                |   12 +-
 dnn/common.h                                  |   39 +-
 dnn/dred_coding.c                             |   12 +-
 dnn/dred_coding.h                             |    2 +-
 dnn/dred_compare.c                            | 1108 ++--
 dnn/dred_config.h                             |    6 +-
 dnn/dred_decoder.c                            |  130 +-
 dnn/dred_decoder.h                            |   14 +-
 dnn/dred_encoder.c                            |  200 +-
 dnn/dred_encoder.h                            |    9 +-
 dnn/dred_rdovae.h                             |    2 +-
 dnn/dred_rdovae_dec.c                         |   52 +-
 dnn/dred_rdovae_dec.h                         |   27 +-
 dnn/dred_rdovae_enc.c                         |   34 +-
 dnn/dred_rdovae_enc.h                         |    5 +-
 dnn/dump_data.c                               |  721 ++-
 dnn/dump_lpcnet_tables.c                      |  132 +-
 dnn/fargan.c                                  |  328 +-
 dnn/fargan.h                                  |   26 +-
 dnn/fargan_demo.c                             |  232 +-
 dnn/freq.c                                    |  434 +-
 dnn/freq.h                                    |    2 +-
 dnn/fwgan.c                                   |  463 +-
 dnn/fwgan.h                                   |   42 +-
 dnn/kiss99.c                                  |  134 +-
 dnn/kiss99.h                                  |   66 +-
 dnn/lossgen.c                                 |  183 +-
 dnn/lossgen.h                                 |   14 +-
 dnn/lossgen_demo.c                            |   35 +-
 dnn/lpcnet.c                                  |  144 +-
 dnn/lpcnet.h                                  |  132 +-
 dnn/lpcnet_enc.c                              |  301 +-
 dnn/lpcnet_plc.c                              |  244 +-
 dnn/lpcnet_private.h                          |   86 +-
 dnn/lpcnet_tables.c                           |  576 +-
 dnn/nndsp.c                                   |  222 +-
 dnn/nndsp.h                                   |   17 +-
 dnn/nnet.c                                    |  174 +-
 dnn/nnet.h                                    |  122 +-
 dnn/nnet_arch.h                               |  257 +-
 dnn/nnet_default.c                            |    4 +-
 dnn/osce.c                                    | 1267 ++---
 dnn/osce.h                                    |   46 +-
 dnn/osce_config.h                             |    4 +-
 dnn/osce_features.c                           |  461 +-
 dnn/osce_features.h                           |   18 +-
 dnn/osce_structs.h                            |   33 +-
 dnn/parse_lpcnet_weights.c                    |  348 +-
 dnn/pitchdnn.c                                |  106 +-
 dnn/pitchdnn.h                                |   15 +-
 dnn/tansig_table.h                            |   82 +-
 dnn/test_vec.c                                |   84 +-
 dnn/torch/rdovae/packets/fec_packets.c        |   27 +-
 dnn/torch/rdovae/packets/fec_packets.h        |    2 +-
 dnn/vec.h                                     |  559 +-
 dnn/vec_avx.h                                 | 1122 ++--
 dnn/vec_neon.h                                |  607 +-
 dnn/write_lpcnet_weights.c                    |   84 +-
 dnn/x86/dnn_x86.h                             |   84 +-
 dnn/x86/nnet_avx2.c                           |    6 +-
 dnn/x86/nnet_sse2.c                           |    6 +-
 dnn/x86/nnet_sse4_1.c                         |    6 +-
 dnn/x86/x86_dnn_map.c                         |   44 +-
 doc/trivial_example.c                         |  235 +-
 include/oac.h                                 | 1713 +++---
 include/oac_custom.h                          |  375 +-
 include/oac_defines.h                         |  980 ++--
 include/oac_multistream.h                     | 1123 ++--
 include/oac_projection.h                      |  850 ++-
 include/oac_types.h                           |  177 +-
 oac.cfg                                       | 3708 ++++++++++++
 silk/A2NLSF.c                                 |  142 +-
 silk/API.h                                    |  106 +-
 silk/CNG.c                                    |  133 +-
 silk/HP_variable_cutoff.c                     |  114 +-
 silk/Inlines.h                                |  109 +-
 silk/LPC_analysis_filter.c                    |   77 +-
 silk/LPC_fit.c                                |   83 +-
 silk/LPC_inv_pred_gain.c                      |  110 +-
 silk/LP_variable_cutoff.c                     |  119 +-
 silk/MacroCount.h                             |  592 +-
 silk/MacroDebug.h                             |  906 ++-
 silk/NLSF2A.c                                 |   98 +-
 silk/NLSF_VQ.c                                |   79 +-
 silk/NLSF_VQ_weights_laroia.c                 |   81 +-
 silk/NLSF_decode.c                            |  101 +-
 silk/NLSF_del_dec_quant.c                     |  186 +-
 silk/NLSF_encode.c                            |  109 +-
 silk/NLSF_stabilize.c                         |  105 +-
 silk/NLSF_unpack.c                            |   73 +-
 silk/NSQ.c                                    |  311 +-
 silk/NSQ.h                                    |   73 +-
 silk/NSQ_del_dec.c                            |  478 +-
 silk/PLC.c                                    |  266 +-
 silk/PLC.h                                    |   72 +-
 silk/SigProc_FIX.h                            |  469 +-
 silk/VAD.c                                    |  161 +-
 silk/VQ_WMat_EC.c                             |   71 +-
 silk/ana_filt_bank_1.c                        |   71 +-
 silk/arm/LPC_inv_pred_gain_arm.h              |   87 +-
 silk/arm/LPC_inv_pred_gain_neon_intr.c        |  227 +-
 silk/arm/NSQ_del_dec_arm.h                    |  116 +-
 silk/arm/NSQ_del_dec_neon_intr.c              |  856 +--
 silk/arm/NSQ_neon.c                           |   77 +-
 silk/arm/NSQ_neon.h                           |  104 +-
 silk/arm/SigProc_FIX_armv4.h                  |   69 +-
 silk/arm/SigProc_FIX_armv5e.h                 |   88 +-
 silk/arm/arm_silk_map.c                       |  148 +-
 silk/arm/biquad_alt_arm.h                     |   93 +-
 silk/arm/biquad_alt_neon_intr.c               |  120 +-
 silk/arm/macros_arm64.h                       |   48 +-
 silk/arm/macros_armv4.h                       |  134 +-
 silk/arm/macros_armv5e.h                      |  280 +-
 silk/biquad_alt.c                             |  104 +-
 silk/bwexpander.c                             |   61 +-
 silk/bwexpander_32.c                          |   61 +-
 silk/check_control_input.c                    |  117 +-
 silk/code_signs.c                             |  116 +-
 silk/control.h                                |   52 +-
 silk/control_SNR.c                            |  131 +-
 silk/control_audio_bandwidth.c                |  122 +-
 silk/control_codec.c                          |  222 +-
 silk/debug.c                                  |  141 +-
 silk/debug.h                                  |  354 +-
 silk/dec_API.c                                |  320 +-
 silk/decode_core.c                            |  151 +-
 silk/decode_frame.c                           |   84 +-
 silk/decode_indices.c                         |  108 +-
 silk/decode_parameters.c                      |   84 +-
 silk/decode_pitch.c                           |   81 +-
 silk/decode_pulses.c                          |   96 +-
 silk/decoder_set_fs.c                         |   79 +-
 silk/define.h                                 |   84 +-
 silk/enc_API.c                                |  406 +-
 silk/encode_indices.c                         |  139 +-
 silk/encode_pulses.c                          |  148 +-
 silk/errors.h                                 |   48 +-
 silk/fixed/LTP_analysis_filter_FIX.c          |   89 +-
 silk/fixed/LTP_scale_ctrl_FIX.c               |   69 +-
 silk/fixed/apply_sine_window_FIX.c            |   85 +-
 .../arm/warped_autocorrelation_FIX_arm.h      |   97 +-
 .../warped_autocorrelation_FIX_neon_intr.c    |  194 +-
 silk/fixed/autocorr_FIX.c                     |   63 +-
 silk/fixed/burg_modified_FIX.c                |  199 +-
 silk/fixed/corrMatrix_FIX.c                   |  116 +-
 silk/fixed/encode_frame_FIX.c                 |  246 +-
 silk/fixed/find_LPC_FIX.c                     |  118 +-
 silk/fixed/find_LTP_FIX.c                     |  101 +-
 silk/fixed/find_pitch_lags_FIX.c              |   91 +-
 silk/fixed/find_pred_coefs_FIX.c              |  111 +-
 silk/fixed/k2a_FIX.c                          |   63 +-
 silk/fixed/k2a_Q16_FIX.c                      |   61 +-
 silk/fixed/main_FIX.h                         |  205 +-
 .../mips/warped_autocorrelation_FIX_mipsr1.h  |  142 +-
 silk/fixed/noise_shape_analysis_FIX.c         |  229 +-
 silk/fixed/pitch_analysis_core_FIX.c          |  454 +-
 silk/fixed/process_gains_FIX.c                |  108 +-
 silk/fixed/regularize_correlations_FIX.c      |   59 +-
 silk/fixed/residual_energy16_FIX.c            |   91 +-
 silk/fixed/residual_energy_FIX.c              |   97 +-
 silk/fixed/schur64_FIX.c                      |   89 +-
 silk/fixed/schur_FIX.c                        |   95 +-
 silk/fixed/structs_FIX.h                      |  120 +-
 silk/fixed/vector_ops_FIX.c                   |  100 +-
 silk/fixed/warped_autocorrelation_FIX.c       |   95 +-
 silk/fixed/x86/burg_modified_FIX_sse4_1.c     |  202 +-
 silk/fixed/x86/vector_ops_FIX_sse4_1.c        |   25 +-
 silk/float/LPC_analysis_filter_FLP.c          |  258 +-
 silk/float/LPC_inv_pred_gain_FLP.c            |   79 +-
 silk/float/LTP_analysis_filter_FLP.c          |   83 +-
 silk/float/LTP_scale_ctrl_FLP.c               |   73 +-
 silk/float/SigProc_FLP.h                      |  160 +-
 silk/float/apply_sine_window_FLP.c            |   87 +-
 silk/float/autocorrelation_FLP.c              |   62 +-
 silk/float/burg_modified_FLP.c                |  174 +-
 silk/float/bwexpander_FLP.c                   |   61 +-
 silk/float/corrMatrix_FLP.c                   |   84 +-
 silk/float/encode_frame_FLP.c                 |  236 +-
 silk/float/energy_FLP.c                       |   70 +-
 silk/float/find_LPC_FLP.c                     |   97 +-
 silk/float/find_LTP_FLP.c                     |   78 +-
 silk/float/find_pitch_lags_FLP.c              |   95 +-
 silk/float/find_pred_coefs_FLP.c              |  101 +-
 silk/float/inner_product_FLP.c                |   70 +-
 silk/float/k2a_FLP.c                          |   65 +-
 silk/float/main_FLP.h                         |  245 +-
 silk/float/noise_shape_analysis_FLP.c         |  251 +-
 silk/float/pitch_analysis_core_FLP.c          |  438 +-
 silk/float/process_gains_FLP.c                |  101 +-
 silk/float/regularize_correlations_FLP.c      |   59 +-
 silk/float/residual_energy_FLP.c              |  118 +-
 silk/float/scale_copy_vector_FLP.c            |   74 +-
 silk/float/scale_vector_FLP.c                 |   64 +-
 silk/float/schur_FLP.c                        |   73 +-
 silk/float/sort_FLP.c                         |   71 +-
 silk/float/structs_FLP.h                      |  118 +-
 silk/float/warped_autocorrelation_FLP.c       |   85 +-
 silk/float/wrappers_FLP.c                     |  206 +-
 silk/float/x86/inner_product_FLP_avx2.c       |   70 +-
 silk/gain_quant.c                             |  117 +-
 silk/init_decoder.c                           |   65 +-
 silk/init_encoder.c                           |   68 +-
 silk/inner_prod_aligned.c                     |   65 +-
 silk/interpolate.c                            |   65 +-
 silk/lin2log.c                                |   55 +-
 silk/log2lin.c                                |   71 +-
 silk/macros.h                                 |  127 +-
 silk/main.h                                   |  450 +-
 silk/mips/NSQ_mips.h                          |   95 +-
 silk/mips/macros_mipsr1.h                     |   98 +-
 silk/mips/sigproc_fix_mipsr1.h                |   57 +-
 silk/pitch_est_defines.h                      |   68 +-
 silk/pitch_est_tables.c                       |   97 +-
 silk/process_NLSFs.c                          |   94 +-
 silk/quant_LTP_gains.c                        |  105 +-
 silk/resampler.c                              |  125 +-
 silk/resampler_down2.c                        |   63 +-
 silk/resampler_down2_3.c                      |   71 +-
 silk/resampler_private.h                      |   86 +-
 silk/resampler_private_AR2.c                  |   69 +-
 silk/resampler_private_IIR_FIR.c              |   85 +-
 silk/resampler_private_down_FIR.c             |   99 +-
 silk/resampler_private_up2_HQ.c               |   68 +-
 silk/resampler_rom.c                          |  103 +-
 silk/resampler_rom.h                          |   64 +-
 silk/resampler_structs.h                      |   76 +-
 silk/shell_coder.c                            |   83 +-
 silk/sigm_Q15.c                               |   65 +-
 silk/sort.c                                   |  107 +-
 silk/stereo_LR_to_MS.c                        |  154 +-
 silk/stereo_MS_to_LR.c                        |   93 +-
 silk/stereo_decode_pred.c                     |   72 +-
 silk/stereo_encode_pred.c                     |   65 +-
 silk/stereo_find_predictor.c                  |   77 +-
 silk/stereo_quant_pred.c                      |   75 +-
 silk/structs.h                                |  422 +-
 silk/sum_sqr_shift.c                          |   69 +-
 silk/table_LSF_cos.c                          |  116 +-
 silk/tables.h                                 |  128 +-
 silk/tables_LTP.c                             |  374 +-
 silk/tables_NLSF_CB_NB_MB.c                   |  298 +-
 silk/tables_NLSF_CB_WB.c                      |  374 +-
 silk/tables_gain.c                            |   82 +-
 silk/tables_other.c                           |   86 +-
 silk/tables_pitch_lag.c                       |   86 +-
 silk/tables_pulses_per_block.c                |  418 +-
 silk/tests/test_unit_LPC_inv_pred_gain.c      |   88 +-
 silk/tuning_parameters.h                      |   48 +-
 silk/typedef.h                                |   67 +-
 silk/x86/NSQ_del_dec_avx2.c                   |  532 +-
 silk/x86/NSQ_del_dec_sse4_1.c                 |  500 +-
 silk/x86/NSQ_sse4_1.c                         |  390 +-
 silk/x86/SigProc_FIX_sse.h                    |   87 +-
 silk/x86/VAD_sse4_1.c                         |   84 +-
 silk/x86/VQ_WMat_EC_sse4_1.c                  |   39 +-
 silk/x86/main_sse.h                           |  324 +-
 silk/x86/x86_silk_map.c                       |  174 +-
 silk/xtensa/SigProc_FIX_lx7.h                 |   59 +-
 silk/xtensa/macros_lx7.h                      |   75 +-
 src/analysis.c                                | 1383 +++--
 src/analysis.h                                |   70 +-
 src/extensions.c                              | 1035 ++--
 src/mapping_matrix.c                          | 1525 +++--
 src/mapping_matrix.h                          |   26 +-
 src/mlp.c                                     |  140 +-
 src/mlp.h                                     |   22 +-
 src/mlp_data.c                                | 1270 ++---
 src/oac.c                                     |  635 +--
 src/oac_compare.c                             |  605 +-
 src/oac_decoder.c                             | 2633 +++++----
 src/oac_demo.c                                | 1248 ++--
 src/oac_encoder.c                             | 3577 ++++++------
 src/oac_multistream.c                         |   80 +-
 src/oac_multistream_decoder.c                 |  866 ++-
 src/oac_multistream_encoder.c                 | 2220 ++++----
 src/oac_private.h                             |  249 +-
 src/oac_projection_decoder.c                  |  343 +-
 src/oac_projection_encoder.c                  |  704 ++-
 src/qext_compare.c                            |  858 +--
 src/repacketizer.c                            |  745 ++-
 src/repacketizer_demo.c                       |  358 +-
 src/tansig_table.h                            |   82 +-
 tests/oac_decode_fuzzer.c                     |   16 +-
 tests/oac_encode_regressions.c                | 1408 +++--
 tests/test_oac_api.c                          | 3363 ++++++-----
 tests/test_oac_common.h                       |   72 +-
 tests/test_oac_custom.c                       | 1015 ++--
 tests/test_oac_decode.c                       |  790 ++-
 tests/test_oac_dred.c                         |  102 +-
 tests/test_oac_encode.c                       | 1246 ++--
 tests/test_oac_extensions.c                   | 1235 ++--
 tests/test_oac_padding.c                      |   86 +-
 tests/test_oac_projection.c                   |  502 +-
 399 files changed, 63334 insertions(+), 62084 deletions(-)
 create mode 100644 oac.cfg

diff --git a/celt/_kiss_fft_guts.h b/celt/_kiss_fft_guts.h
index e85a69c8b..0af0a62b6 100644
--- a/celt/_kiss_fft_guts.h
+++ b/celt/_kiss_fft_guts.h
@@ -1,33 +1,33 @@
 /*Copyright (c) 2003-2004, Mark Borgerding
 
-  All rights reserved.
+   All rights reserved.
 
-  Redistribution and use in source and binary forms, with or without
+   Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright notice,
+ * Redistributions of source code must retain the above copyright notice,
        this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
+ * Redistributions in binary form must reproduce the above copyright notice,
        this list of conditions and the following disclaimer in the
        documentation and/or other materials provided with the distribution.
 
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGE.*/
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.*/
 
 #ifndef KISS_FFT_GUTS_H
 #define KISS_FFT_GUTS_H
 
-#define MIN(a,b) ((a)<(b) ? (a):(b))
-#define MAX(a,b) ((a)>(b) ? (a):(b))
+#define MIN(a, b) ((a) < (b) ? (a):(b))
+#define MAX(a, b) ((a) > (b) ? (a):(b))
 
 /* kiss_fft.h
    defines kiss_fft_scalar as either short or a float type
@@ -36,7 +36,7 @@
 #include "kiss_fft.h"
 
 /*
-  Explanation of macros dealing with complex math:
+   Explanation of macros dealing with complex math:
 
    C_MUL(m,a,b)         : m = a*b
    C_FIXDIV( c , div )  : if a fixed point impl., c /= div. noop otherwise
@@ -45,139 +45,139 @@
    C_ADDTO( res , a)    : res += a
  * */
 #ifdef FIXED_POINT
-#include "arch.h"
+# include "arch.h"
 
 
-#define SAMP_MAX 2147483647
-#define TWID_MAX 32767
-#define TRIG_UPSCALE 1
+# define SAMP_MAX 2147483647
+# define TWID_MAX 32767
+# define TRIG_UPSCALE 1
 
-#define SAMP_MIN -SAMP_MAX
+# define SAMP_MIN -SAMP_MAX
 
-#   define S_MUL(a,b) MULT32_32_P31_ovflw(b, a)
-#   define S_MUL2(a,b) MULT32_32_P31_ovflw(b, a)
+# define S_MUL(a, b) MULT32_32_P31_ovflw(b, a)
+# define S_MUL2(a, b) MULT32_32_P31_ovflw(b, a)
 
-#   define C_MUL(m,a,b) \
-      do{ (m).r = SUB32_ovflw(S_MUL((a).r,(b).r) , S_MUL((a).i,(b).i)); \
-          (m).i = ADD32_ovflw(S_MUL((a).r,(b).i) , S_MUL((a).i,(b).r)); }while(0)
+# define C_MUL(m, a, b) \
+        do { (m).r = SUB32_ovflw(S_MUL((a).r, (b).r), S_MUL((a).i, (b).i)); \
+             (m).i = ADD32_ovflw(S_MUL((a).r, (b).i), S_MUL((a).i, (b).r)); } while (0)
 
-#   define C_MULC(m,a,b) \
-      do{ (m).r = ADD32_ovflw(S_MUL((a).r,(b).r) , S_MUL((a).i,(b).i)); \
-          (m).i = SUB32_ovflw(S_MUL((a).i,(b).r) , S_MUL((a).r,(b).i)); }while(0)
+# define C_MULC(m, a, b) \
+        do { (m).r = ADD32_ovflw(S_MUL((a).r, (b).r), S_MUL((a).i, (b).i)); \
+             (m).i = SUB32_ovflw(S_MUL((a).i, (b).r), S_MUL((a).r, (b).i)); } while (0)
 
-#   define C_MULBYSCALAR( c, s ) \
-      do{ (c).r =  S_MUL( (c).r , s ) ;\
-          (c).i =  S_MUL( (c).i , s ) ; }while(0)
+# define C_MULBYSCALAR( c, s ) \
+        do { (c).r =  S_MUL((c).r, s ); \
+             (c).i =  S_MUL((c).i, s ); } while (0)
 
-#   define DIVSCALAR(x,k) \
-        (x) = S_MUL(  x, (TWID_MAX-((k)>>1))/(k)+1 )
+# define DIVSCALAR(x, k) \
+        (x) = S_MUL(  x, (TWID_MAX - ((k)>>1))/(k) + 1 )
 
-#   define C_FIXDIV(c,div) \
-        do {    DIVSCALAR( (c).r , div);  \
-                DIVSCALAR( (c).i  , div); }while (0)
+# define C_FIXDIV(c, div) \
+        do {    DIVSCALAR((c).r, div);  \
+                DIVSCALAR((c).i, div); } while (0)
 
-#define  C_ADD( res, a,b)\
-    do {(res).r=ADD32_ovflw((a).r,(b).r);  (res).i=ADD32_ovflw((a).i,(b).i); \
-    }while(0)
-#define  C_SUB( res, a,b)\
-    do {(res).r=SUB32_ovflw((a).r,(b).r);  (res).i=SUB32_ovflw((a).i,(b).i); \
-    }while(0)
-#define C_ADDTO( res , a)\
-    do {(res).r = ADD32_ovflw((res).r, (a).r);  (res).i = ADD32_ovflw((res).i,(a).i);\
-    }while(0)
+# define  C_ADD( res, a, b) \
+        do {(res).r = ADD32_ovflw((a).r, (b).r);  (res).i = ADD32_ovflw((a).i, (b).i); \
+        } while (0)
+# define  C_SUB( res, a, b) \
+        do {(res).r = SUB32_ovflw((a).r, (b).r);  (res).i = SUB32_ovflw((a).i, (b).i); \
+        } while (0)
+# define C_ADDTO( res, a) \
+        do {(res).r = ADD32_ovflw((res).r, (a).r);  (res).i = ADD32_ovflw((res).i, (a).i); \
+        } while (0)
 
-#define C_SUBFROM( res , a)\
-    do {(res).r = ADD32_ovflw((res).r,(a).r);  (res).i = SUB32_ovflw((res).i,(a).i); \
-    }while(0)
+# define C_SUBFROM( res, a) \
+        do {(res).r = ADD32_ovflw((res).r, (a).r);  (res).i = SUB32_ovflw((res).i, (a).i); \
+        } while (0)
 
-#if defined(OAC_ARM_INLINE_ASM)
-#include "arm/kiss_fft_armv4.h"
-#endif
+# if defined(OAC_ARM_INLINE_ASM)
+#  include "arm/kiss_fft_armv4.h"
+# endif
 
-#if defined(OAC_ARM_INLINE_EDSP)
-#include "arm/kiss_fft_armv5e.h"
-#endif
-#if defined(__mips)
-#include "mips/kiss_fft_mipsr1.h"
-#endif
+# if defined(OAC_ARM_INLINE_EDSP)
+#  include "arm/kiss_fft_armv5e.h"
+# endif
+# if defined(__mips)
+#  include "mips/kiss_fft_mipsr1.h"
+# endif
 
 #else  /* not FIXED_POINT*/
 
-#   define S_MUL(a,b) ( (a)*(b) )
-#   define S_MUL2(a,b) ( (a)*(b) )
-#define C_MUL(m,a,b) \
-    do{ (m).r = (a).r*(b).r - (a).i*(b).i;\
-        (m).i = (a).r*(b).i + (a).i*(b).r; }while(0)
-#define C_MULC(m,a,b) \
-    do{ (m).r = (a).r*(b).r + (a).i*(b).i;\
-        (m).i = (a).i*(b).r - (a).r*(b).i; }while(0)
-
-#define C_MUL4(m,a,b) C_MUL(m,a,b)
-
-#   define C_FIXDIV(c,div) /* NOOP */
-#   define C_MULBYSCALAR( c, s ) \
-    do{ (c).r *= (s);\
-        (c).i *= (s); }while(0)
+# define S_MUL(a, b) ((a)*(b))
+# define S_MUL2(a, b) ((a)*(b))
+# define C_MUL(m, a, b) \
+        do { (m).r = (a).r*(b).r - (a).i*(b).i; \
+             (m).i = (a).r*(b).i + (a).i*(b).r; } while (0)
+# define C_MULC(m, a, b) \
+        do { (m).r = (a).r*(b).r + (a).i*(b).i; \
+             (m).i = (a).i*(b).r - (a).r*(b).i; } while (0)
+
+# define C_MUL4(m, a, b) C_MUL(m, a, b)
+
+# define C_FIXDIV(c, div)  /* NOOP */
+# define C_MULBYSCALAR( c, s ) \
+        do { (c).r *= (s); \
+             (c).i *= (s); } while (0)
 #endif
 
 #ifndef CHECK_OVERFLOW_OP
-#  define CHECK_OVERFLOW_OP(a,op,b) /* noop */
+# define CHECK_OVERFLOW_OP(a, op, b) /* noop */
 #endif
 
 #ifndef C_ADD
-#define  C_ADD( res, a,b)\
-    do { \
-            CHECK_OVERFLOW_OP((a).r,+,(b).r)\
-            CHECK_OVERFLOW_OP((a).i,+,(b).i)\
-            (res).r=(a).r+(b).r;  (res).i=(a).i+(b).i; \
-    }while(0)
-#define  C_SUB( res, a,b)\
-    do { \
-            CHECK_OVERFLOW_OP((a).r,-,(b).r)\
-            CHECK_OVERFLOW_OP((a).i,-,(b).i)\
-            (res).r=(a).r-(b).r;  (res).i=(a).i-(b).i; \
-    }while(0)
-#define C_ADDTO( res , a)\
-    do { \
-            CHECK_OVERFLOW_OP((res).r,+,(a).r)\
-            CHECK_OVERFLOW_OP((res).i,+,(a).i)\
-            (res).r += (a).r;  (res).i += (a).i;\
-    }while(0)
-
-#define C_SUBFROM( res , a)\
-    do {\
-            CHECK_OVERFLOW_OP((res).r,-,(a).r)\
-            CHECK_OVERFLOW_OP((res).i,-,(a).i)\
+# define  C_ADD( res, a, b) \
+        do { \
+            CHECK_OVERFLOW_OP((a).r, +, (b).r) \
+            CHECK_OVERFLOW_OP((a).i, +, (b).i) \
+            (res).r = (a).r + (b).r;  (res).i = (a).i + (b).i; \
+        } while (0)
+# define  C_SUB( res, a, b) \
+        do { \
+            CHECK_OVERFLOW_OP((a).r, -, (b).r) \
+            CHECK_OVERFLOW_OP((a).i, -, (b).i) \
+            (res).r = (a).r - (b).r;  (res).i = (a).i - (b).i; \
+        } while (0)
+# define C_ADDTO( res, a) \
+        do { \
+            CHECK_OVERFLOW_OP((res).r, +, (a).r) \
+            CHECK_OVERFLOW_OP((res).i, +, (a).i) \
+            (res).r += (a).r;  (res).i += (a).i; \
+        } while (0)
+
+# define C_SUBFROM( res, a) \
+        do { \
+            CHECK_OVERFLOW_OP((res).r, -, (a).r) \
+            CHECK_OVERFLOW_OP((res).i, -, (a).i) \
             (res).r -= (a).r;  (res).i -= (a).i; \
-    }while(0)
+        } while (0)
 #endif /* C_ADD defined */
 
 #ifdef FIXED_POINT
 /*#  define KISS_FFT_COS(phase)  TRIG_UPSCALE*floor(MIN(32767,MAX(-32767,.5+32768 * cos (phase))))
 #  define KISS_FFT_SIN(phase)  TRIG_UPSCALE*floor(MIN(32767,MAX(-32767,.5+32768 * sin (phase))))*/
-#  define KISS_FFT_COS(phase)  floor(.5+TWID_MAX*cos (phase))
-#  define KISS_FFT_SIN(phase)  floor(.5+TWID_MAX*sin (phase))
-#  define HALF_OF(x) ((x)>>1)
+# define KISS_FFT_COS(phase)  floor(.5 + TWID_MAX*cos (phase))
+# define KISS_FFT_SIN(phase)  floor(.5 + TWID_MAX*sin (phase))
+# define HALF_OF(x) ((x)>>1)
 #elif defined(USE_SIMD)
-#  define KISS_FFT_COS(phase) _mm_set1_ps( cos(phase) )
-#  define KISS_FFT_SIN(phase) _mm_set1_ps( sin(phase) )
-#  define HALF_OF(x) ((x)*_mm_set1_ps(.5f))
+# define KISS_FFT_COS(phase) _mm_set1_ps( cos(phase))
+# define KISS_FFT_SIN(phase) _mm_set1_ps( sin(phase))
+# define HALF_OF(x) ((x)*_mm_set1_ps(.5f))
 #else
-#  define KISS_FFT_COS(phase) (kiss_fft_scalar) cos(phase)
-#  define KISS_FFT_SIN(phase) (kiss_fft_scalar) sin(phase)
-#  define HALF_OF(x) ((x)*.5f)
+# define KISS_FFT_COS(phase) (kiss_fft_scalar) cos(phase)
+# define KISS_FFT_SIN(phase) (kiss_fft_scalar) sin(phase)
+# define HALF_OF(x) ((x)*.5f)
 #endif
 
-#define  kf_cexp(x,phase) \
-        do{ \
-                (x)->r = KISS_FFT_COS(phase);\
-                (x)->i = KISS_FFT_SIN(phase);\
-        }while(0)
-
-#define  kf_cexp2(x,phase) \
-   do{ \
-      (x)->r = TRIG_UPSCALE*celt_cos_norm((phase));\
-      (x)->i = TRIG_UPSCALE*celt_cos_norm((phase)-32768);\
-}while(0)
+#define  kf_cexp(x, phase) \
+        do { \
+            (x)->r = KISS_FFT_COS(phase); \
+            (x)->i = KISS_FFT_SIN(phase); \
+        } while (0)
+
+#define  kf_cexp2(x, phase) \
+        do { \
+            (x)->r = TRIG_UPSCALE*celt_cos_norm((phase)); \
+            (x)->i = TRIG_UPSCALE*celt_cos_norm((phase) - 32768); \
+        } while (0)
 
 #endif /* KISS_FFT_GUTS_H */
diff --git a/celt/arch.h b/celt/arch.h
index 06730f9e1..916cfa9e1 100644
--- a/celt/arch.h
+++ b/celt/arch.h
@@ -5,7 +5,7 @@
 /**
    @file arch.h
    @brief Various architecture definitions for CELT
-*/
+ */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
@@ -29,7 +29,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef ARCH_H
 #define ARCH_H
@@ -37,21 +37,21 @@
 #include "oac_types.h"
 #include "oac_defines.h"
 
-# if !defined(__GNUC_PREREQ)
-#  if defined(__GNUC__)&&defined(__GNUC_MINOR__)
-#   define __GNUC_PREREQ(_maj,_min) \
- ((__GNUC__<<16)+__GNUC_MINOR__>=((_maj)<<16)+(_min))
-#  else
-#   define __GNUC_PREREQ(_maj,_min) 0
-#  endif
+#if !defined(__GNUC_PREREQ)
+# if defined(__GNUC__) && defined(__GNUC_MINOR__)
+#  define __GNUC_PREREQ(_maj, _min) \
+        ((__GNUC__<<16) + __GNUC_MINOR__ >= ((_maj)<<16) + (_min))
+# else
+#  define __GNUC_PREREQ(_maj, _min) 0
 # endif
+#endif
 
 #if OAC_GNUC_PREREQ(3, 0)
-#define oac_likely(x)       (__builtin_expect(!!(x), 1))
-#define oac_unlikely(x)     (__builtin_expect(!!(x), 0))
+# define oac_likely(x)       (__builtin_expect(!!(x), 1))
+# define oac_unlikely(x)     (__builtin_expect(!!(x), 0))
 #else
-#define oac_likely(x)       (!!(x))
-#define oac_unlikely(x)     (!!(x))
+# define oac_likely(x)       (!!(x))
+# define oac_unlikely(x)     (!!(x))
 #endif
 
 #define CELT_SIG_SCALE 32768.f
@@ -59,78 +59,77 @@
 #define CELT_FATAL(str) celt_fatal(str, __FILE__, __LINE__)
 
 #if defined(ENABLE_ASSERTIONS) || defined(ENABLE_HARDENING)
-#ifdef __GNUC__
+# ifdef __GNUC__
 __attribute__((noreturn))
-#endif
+# endif
 void celt_fatal(const char *str, const char *file, int line);
 
-#if defined(CELT_C) && !defined(OVERRIDE_celt_fatal)
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef __GNUC__
+# if defined(CELT_C) && !defined(OVERRIDE_celt_fatal)
+#  include <stdio.h>
+#  include <stdlib.h>
+#  ifdef __GNUC__
 __attribute__((noreturn))
-#endif
-void celt_fatal(const char *str, const char *file, int line)
-{
-   fprintf (stderr, "Fatal (internal) error in %s, line %d: %s\n", file, line, str);
-#if defined(_MSC_VER)
-   _set_abort_behavior( 0, _WRITE_ABORT_MSG);
-#endif
-   abort();
+#  endif
+void celt_fatal(const char *str, const char *file, int line) {
+    fprintf (stderr, "Fatal (internal) error in %s, line %d: %s\n", file, line, str);
+#  if defined(_MSC_VER)
+    _set_abort_behavior( 0, _WRITE_ABORT_MSG);
+#  endif
+    abort();
 }
-#endif
+# endif
 
-#define celt_assert(cond) {if (!(cond)) {CELT_FATAL("assertion failed: " #cond);}}
-#define celt_assert2(cond, message) {if (!(cond)) {CELT_FATAL("assertion failed: " #cond "\n" message);}}
-#define MUST_SUCCEED(call) celt_assert((call) == OAC_OK)
+# define celt_assert(cond) {if (!(cond)) {CELT_FATAL("assertion failed: " #cond);}}
+# define celt_assert2(cond, message) {if (!(cond)) {CELT_FATAL("assertion failed: " #cond "\n" message);}}
+# define MUST_SUCCEED(call) celt_assert((call) == OAC_OK)
 #else
-#define celt_assert(cond) ((void)(cond))
-#define celt_assert2(cond, message) ((void)(cond))
-#define MUST_SUCCEED(call) do {if((call) != OAC_OK) {RESTORE_STACK; return OAC_INTERNAL_ERROR;} } while (0)
+# define celt_assert(cond) ((void)(cond))
+# define celt_assert2(cond, message) ((void)(cond))
+# define MUST_SUCCEED(call) do {if ((call) != OAC_OK) {RESTORE_STACK; return OAC_INTERNAL_ERROR;} } while (0)
 #endif
 
 #if defined(ENABLE_ASSERTIONS)
-#define celt_sig_assert(cond) {if (!(cond)) {CELT_FATAL("signal assertion failed: " #cond);}}
+# define celt_sig_assert(cond) {if (!(cond)) {CELT_FATAL("signal assertion failed: " #cond);}}
 #else
-#define celt_sig_assert(cond) ((void)(cond))
+# define celt_sig_assert(cond) ((void)(cond))
 #endif
 
-#define IMUL32(a,b) ((a)*(b))
-
-#define MIN16(a,b) ((a) < (b) ? (a) : (b))   /**< Minimum 16-bit value.   */
-#define MAX16(a,b) ((a) > (b) ? (a) : (b))   /**< Maximum 16-bit value.   */
-#define MIN32(a,b) ((a) < (b) ? (a) : (b))   /**< Minimum 32-bit value.   */
-#define MAX32(a,b) ((a) > (b) ? (a) : (b))   /**< Maximum 32-bit value.   */
-#define IMIN(a,b) ((a) < (b) ? (a) : (b))   /**< Minimum int value.   */
-#define IMAX(a,b) ((a) > (b) ? (a) : (b))   /**< Maximum int value.   */
-#define FMIN(a,b) ((a) < (b) ? (a) : (b))   /**< Minimum float value.   */
-#define FMAX(a,b) ((a) > (b) ? (a) : (b))   /**< Maximum float value.   */
-#define UADD32(a,b) ((a)+(b))
-#define USUB32(a,b) ((a)-(b))
-#define MAXG(a,b) MAX32(a, b)
-#define MING(a,b) MIN32(a, b)
+#define IMUL32(a, b) ((a)*(b))
+
+#define MIN16(a, b) ((a) < (b) ? (a) : (b))   /**< Minimum 16-bit value.   */
+#define MAX16(a, b) ((a) > (b) ? (a) : (b))   /**< Maximum 16-bit value.   */
+#define MIN32(a, b) ((a) < (b) ? (a) : (b))   /**< Minimum 32-bit value.   */
+#define MAX32(a, b) ((a) > (b) ? (a) : (b))   /**< Maximum 32-bit value.   */
+#define IMIN(a, b) ((a) < (b) ? (a) : (b))   /**< Minimum int value.   */
+#define IMAX(a, b) ((a) > (b) ? (a) : (b))   /**< Maximum int value.   */
+#define FMIN(a, b) ((a) < (b) ? (a) : (b))   /**< Minimum float value.   */
+#define FMAX(a, b) ((a) > (b) ? (a) : (b))   /**< Maximum float value.   */
+#define UADD32(a, b) ((a) + (b))
+#define USUB32(a, b) ((a) - (b))
+#define MAXG(a, b) MAX32(a, b)
+#define MING(a, b) MIN32(a, b)
 
 /* Throughout the code, we use the following scaling for signals:
    FLOAT: used for float API, normalized to +/-1.
    INT16: used for 16-bit API, normalized to +/- 32768
    RES: internal Oac resolution, defined as +/-1. in float builds, or either 16-bit or 24-bit int for fixed-point builds
    SIG: internal CELT resolution: defined as +/- 32768. in float builds, or Q27 in fixed-point builds (int16 shifted by 12)
-*/
+ */
 
 
 /* Set this if oac_int64 is a native type of the CPU. */
 /* Assume that all LP64 architectures have fast 64-bit types; also x86_64
    (which can be ILP32 for x32) and Win64 (which is LLP64). */
 #if defined(__x86_64__) || defined(__LP64__) || defined(_WIN64) || defined (__mips)
-#define OAC_FAST_INT64 1
+# define OAC_FAST_INT64 1
 #else
-#define OAC_FAST_INT64 0
+# define OAC_FAST_INT64 0
 #endif
 
 #ifdef FIXED_POINT
-#define ARG_FIXED(arg) , arg
+# define ARG_FIXED(arg) , arg
 #else
-#define ARG_FIXED(arg)
+# define ARG_FIXED(arg)
 #endif
 
 #define PRINT_MIPS(file)
@@ -147,38 +146,38 @@ typedef oac_val32 celt_ener;
 typedef oac_val32 celt_glog;
 
 typedef oac_val32 oac_res;
-#define RES_SHIFT 8
-#define SIG2RES(a)      PSHR32(a, SIG_SHIFT-RES_SHIFT)
-#define RES2INT16(a)    SAT16(PSHR32(a, RES_SHIFT))
-#define RES2INT24(a)    (a)
-#define RES2FLOAT(a)    ((1.f/32768.f/256.f)*(a))
-#define INT16TORES(a)   SHL32(EXTEND32(a), RES_SHIFT)
-#define INT24TORES(a)   (a)
-#define ADD_RES(a, b)   ADD32(a, b)
-#define FLOAT2RES(a)    FLOAT2INT24(a)
-#define RES2SIG(a)      SHL32((a), SIG_SHIFT-RES_SHIFT)
-#define MULT16_RES_Q15(a,b) MULT16_32_Q15(a,b)
-#define MAX_ENCODING_DEPTH 24
-
-#define RES2VAL16(a)    RES2INT16(a)
-#define INT16TOSIG(a)   SHL32(EXTEND32(a), SIG_SHIFT)
-#define INT24TOSIG(a)   SHL32(a, SIG_SHIFT-8)
-
-#define NORM_SHIFT 24
+# define RES_SHIFT 8
+# define SIG2RES(a)      PSHR32(a, SIG_SHIFT - RES_SHIFT)
+# define RES2INT16(a)    SAT16(PSHR32(a, RES_SHIFT))
+# define RES2INT24(a)    (a)
+# define RES2FLOAT(a)    ((1.f/32768.f/256.f)*(a))
+# define INT16TORES(a)   SHL32(EXTEND32(a), RES_SHIFT)
+# define INT24TORES(a)   (a)
+# define ADD_RES(a, b)   ADD32(a, b)
+# define FLOAT2RES(a)    FLOAT2INT24(a)
+# define RES2SIG(a)      SHL32((a), SIG_SHIFT - RES_SHIFT)
+# define MULT16_RES_Q15(a, b) MULT16_32_Q15(a, b)
+# define MAX_ENCODING_DEPTH 24
+
+# define RES2VAL16(a)    RES2INT16(a)
+# define INT16TOSIG(a)   SHL32(EXTEND32(a), SIG_SHIFT)
+# define INT24TOSIG(a)   SHL32(a, SIG_SHIFT - 8)
+
+# define NORM_SHIFT 24
 typedef oac_val32 celt_coef;
-#define COEF_ONE Q31ONE
-#define MULT_COEF_32(a, b) MULT32_32_P31(a,b)
-#define MAC_COEF_32_ARM(c, a, b) ADD32((c), MULT32_32_Q32(a,b))
-#define MULT_COEF(a, b) MULT32_32_Q31(a,b)
-#define MULT_COEF_TAPS(a, b) SHL32(MULT16_16(a,b), 1)
-#define COEF2VAL16(x) EXTRACT16(SHR32(x, 16))
+# define COEF_ONE Q31ONE
+# define MULT_COEF_32(a, b) MULT32_32_P31(a, b)
+# define MAC_COEF_32_ARM(c, a, b) ADD32((c), MULT32_32_Q32(a, b))
+# define MULT_COEF(a, b) MULT32_32_Q31(a, b)
+# define MULT_COEF_TAPS(a, b) SHL32(MULT16_16(a, b), 1)
+# define COEF2VAL16(x) EXTRACT16(SHR32(x, 16))
 
-#define celt_isnan(x) 0
+# define celt_isnan(x) 0
 
-#define Q15ONE 32767
-#define Q31ONE 2147483647
+# define Q15ONE 32767
+# define Q31ONE 2147483647
 
-#define SIG_SHIFT 12
+# define SIG_SHIFT 12
 /* Safe saturation value for 32-bit signals. We need to make sure that we can
    add two sig values and that the first stages of the MDCT don't cause an overflow.
    The most constraining is the ARM_ASM comb filter where we shift left by one
@@ -186,46 +185,46 @@ typedef oac_val32 celt_coef;
    enough to fit a full-scale high-freq tone through the prefilter and comb filter,
    meaning 1.85*1.75*2^(15+SIG_SHIFT) =  434529895.
    so the limit should be about 2^31*sqrt(.5). */
-#define SIG_SAT (536870911)
+# define SIG_SAT (536870911)
 
-#define NORM_SCALING (1<<NORM_SHIFT)
+# define NORM_SCALING (1<<NORM_SHIFT)
 
-#define DB_SHIFT 24
+# define DB_SHIFT 24
 
-#define EPSILON 1
-#define VERY_SMALL 0
-#define VERY_LARGE16 ((oac_val16)32767)
-#define Q15_ONE ((oac_val16)32767)
+# define EPSILON 1
+# define VERY_SMALL 0
+# define VERY_LARGE16 ((oac_val16)32767)
+# define Q15_ONE ((oac_val16)32767)
 
 
-#define ABS16(x) ((x) < 0 ? (-(x)) : (x))
-#define ABS32(x) ((x) < 0 ? (-(x)) : (x))
+# define ABS16(x) ((x) < 0 ? (-(x)) : (x))
+# define ABS32(x) ((x) < 0 ? (-(x)) : (x))
 
 static OAC_INLINE oac_int16 SAT16(oac_int32 x) {
-   return x > 32767 ? 32767 : x < -32768 ? -32768 : (oac_int16)x;
+    return x > 32767 ? 32767 : x < -32768 ? -32768 : (oac_int16)x;
 }
 
-#ifdef FIXED_DEBUG
-#include "fixed_debug.h"
-#else
-
-#include "fixed_generic.h"
-
-#ifdef OAC_ARM_PRESUME_AARCH64_NEON_INTR
-#include "arm/fixed_arm64.h"
-#elif defined (OAC_ARM_INLINE_EDSP)
-#include "arm/fixed_armv5e.h"
-#elif defined (OAC_ARM_INLINE_ASM)
-#include "arm/fixed_armv4.h"
-#elif defined (BFIN_ASM)
-#include "fixed_bfin.h"
-#elif defined (TI_C5X_ASM)
-#include "fixed_c5x.h"
-#elif defined (TI_C6X_ASM)
-#include "fixed_c6x.h"
-#endif
+# ifdef FIXED_DEBUG
+#  include "fixed_debug.h"
+# else
+
+#  include "fixed_generic.h"
+
+#  ifdef OAC_ARM_PRESUME_AARCH64_NEON_INTR
+#   include "arm/fixed_arm64.h"
+#  elif defined (OAC_ARM_INLINE_EDSP)
+#   include "arm/fixed_armv5e.h"
+#  elif defined (OAC_ARM_INLINE_ASM)
+#   include "arm/fixed_armv4.h"
+#  elif defined (BFIN_ASM)
+#   include "fixed_bfin.h"
+#  elif defined (TI_C5X_ASM)
+#   include "fixed_c5x.h"
+#  elif defined (TI_C6X_ASM)
+#   include "fixed_c6x.h"
+#  endif
 
-#endif
+# endif
 
 #else /* FIXED_POINT */
 
@@ -241,134 +240,134 @@ typedef float celt_glog;
 typedef float oac_res;
 typedef float celt_coef;
 
-#ifdef FLOAT_APPROX
+# ifdef FLOAT_APPROX
 /* This code should reliably detect NaN/inf even when -ffast-math is used.
    Assumes IEEE 754 format. */
-static OAC_INLINE int celt_isnan(float x)
-{
-   union {float f; oac_uint32 i;} in;
-   in.f = x;
-   return ((in.i>>23)&0xFF)==0xFF && (in.i&0x007FFFFF)!=0;
+static OAC_INLINE int celt_isnan(float x) {
+    union {float f; oac_uint32 i;} in;
+    in.f = x;
+    return ((in.i>>23)&0xFF) == 0xFF && (in.i&0x007FFFFF) != 0;
 }
-#else
-#ifdef __FAST_MATH__
-#error Cannot build liboac with -ffast-math unless FLOAT_APPROX is defined. This could result in crashes on extreme (e.g. NaN) input
-#endif
-#define celt_isnan(x) ((x)!=(x))
-#endif
+# else
+#  ifdef __FAST_MATH__
+#   error \
+    Cannot build liboac with -ffast-math unless FLOAT_APPROX is defined. This could result in crashes on extreme (e.g. NaN) input
+#  endif
+#  define celt_isnan(x) ((x) != (x))
+# endif
 
-#define Q15ONE 1.0f
-#define Q31ONE 1.0f
-#define COEF_ONE 1.0f
-#define COEF2VAL16(x) (x)
+# define Q15ONE 1.0f
+# define Q31ONE 1.0f
+# define COEF_ONE 1.0f
+# define COEF2VAL16(x) (x)
 
-#define NORM_SCALING 1.f
+# define NORM_SCALING 1.f
 
-#define EPSILON 1e-15f
-#define VERY_SMALL 1e-30f
-#define VERY_LARGE16 1e15f
-#define Q15_ONE ((oac_val16)1.f)
+# define EPSILON 1e-15f
+# define VERY_SMALL 1e-30f
+# define VERY_LARGE16 1e15f
+# define Q15_ONE ((oac_val16)1.f)
 
 /* This appears to be the same speed as C99's fabsf() but it's more portable. */
-#define ABS16(x) ((float)fabs(x))
-#define ABS32(x) ((float)fabs(x))
-
-#define QCONST16(x,bits) (x)
-#define QCONST32(x,bits) (x)
-#define GCONST(x) (x)
-
-#define NEG16(x) (-(x))
-#define NEG32(x) (-(x))
-#define NEG32_ovflw(x) (-(x))
-#define EXTRACT16(x) (x)
-#define EXTEND32(x) (x)
-#define SHR16(a,shift) (a)
-#define SHL16(a,shift) (a)
-#define SHR32(a,shift) (a)
-#define SHL32(a,shift) (a)
-#define PSHR32(a,shift) (a)
-#define VSHR32(a,shift) (a)
-
-#define SHR64(a,shift) (a)
-
-#define PSHR(a,shift)   (a)
-#define SHR(a,shift)    (a)
-#define SHL(a,shift)    (a)
-#define SATURATE(x,a)   (x)
-#define SATURATE16(x)   (x)
-
-#define ROUND16(a,shift)  (a)
-#define SROUND16(a,shift) (a)
-#define HALF16(x)       (.5f*(x))
-#define HALF32(x)       (.5f*(x))
-
-#define ADD16(a,b) ((a)+(b))
-#define SUB16(a,b) ((a)-(b))
-#define ADD32(a,b) ((a)+(b))
-#define SUB32(a,b) ((a)-(b))
-#define ADD32_ovflw(a,b) ((a)+(b))
-#define SUB32_ovflw(a,b) ((a)-(b))
-#define SHL32_ovflw(a,shift) (a)
-#define PSHR32_ovflw(a,shift) (a)
-
-#define MULT16_16_16(a,b)     ((a)*(b))
-#define MULT16_16(a,b)     ((oac_val32)(a)*(oac_val32)(b))
-#define MAC16_16(c,a,b)     ((c)+(oac_val32)(a)*(oac_val32)(b))
-
-#define MULT16_32_Q15(a,b)     ((a)*(b))
-#define MULT16_32_Q16(a,b)     ((a)*(b))
-
-#define MULT32_32_Q16(a,b)     ((a)*(b))
-#define MULT32_32_Q31(a,b)     ((a)*(b))
-#define MULT32_32_P31(a,b)     ((a)*(b))
-#define MULT32_32_P31_ovflw(a,b) ((a)*(b))
-
-#define MAC16_32_Q15(c,a,b)     ((c)+(a)*(b))
-#define MAC16_32_Q16(c,a,b)     ((c)+(a)*(b))
-#define MAC_COEF_32_ARM(c,a,b)     ((c)+(a)*(b))
-
-#define MULT16_16_Q11_32(a,b)     ((a)*(b))
-#define MULT16_16_Q11(a,b)     ((a)*(b))
-#define MULT16_16_Q13(a,b)     ((a)*(b))
-#define MULT16_16_Q14(a,b)     ((a)*(b))
-#define MULT16_16_Q15(a,b)     ((a)*(b))
-#define MULT16_16_P15(a,b)     ((a)*(b))
-#define MULT16_16_P13(a,b)     ((a)*(b))
-#define MULT16_16_P14(a,b)     ((a)*(b))
-#define MULT16_32_P16(a,b)     ((a)*(b))
-
-#define MULT_COEF_32(a, b)      ((a)*(b))
-#define MULT_COEF(a, b)   ((a)*(b))
-#define MULT_COEF_TAPS(a, b)   ((a)*(b))
-
-#define DIV32_16(a,b)     (((oac_val32)(a))/(oac_val16)(b))
-#define DIV32(a,b)     (((oac_val32)(a))/(oac_val32)(b))
-
-#define SIG2RES(a)      ((1/CELT_SIG_SCALE)*(a))
-#define RES2INT16(a)    FLOAT2INT16(a)
-#define RES2INT24(a)    float2int(32768.f*256.f*(a))
-#define RES2FLOAT(a)    (a)
-#define INT16TORES(a)   ((a)*(1/CELT_SIG_SCALE))
-#define INT24TORES(a)   ((1.f/32768.f/256.f)*(a))
-#define ADD_RES(a, b)   ADD32(a, b)
-#define FLOAT2RES(a)    (a)
-#define RES2SIG(a)      (CELT_SIG_SCALE*(a))
-#define MULT16_RES_Q15(a,b) MULT16_16_Q15(a,b)
-
-#define RES2VAL16(a)    (a)
-#define FLOAT2SIG(a)    ((a)*CELT_SIG_SCALE)
-#define INT16TOSIG(a)   ((float)(a))
-#define INT24TOSIG(a)   ((float)(a)*(1.f/256.f))
-#define MAX_ENCODING_DEPTH 24
+# define ABS16(x) ((float)fabs(x))
+# define ABS32(x) ((float)fabs(x))
+
+# define QCONST16(x, bits) (x)
+# define QCONST32(x, bits) (x)
+# define GCONST(x) (x)
+
+# define NEG16(x) (-(x))
+# define NEG32(x) (-(x))
+# define NEG32_ovflw(x) (-(x))
+# define EXTRACT16(x) (x)
+# define EXTEND32(x) (x)
+# define SHR16(a, shift) (a)
+# define SHL16(a, shift) (a)
+# define SHR32(a, shift) (a)
+# define SHL32(a, shift) (a)
+# define PSHR32(a, shift) (a)
+# define VSHR32(a, shift) (a)
+
+# define SHR64(a, shift) (a)
+
+# define PSHR(a, shift)   (a)
+# define SHR(a, shift)    (a)
+# define SHL(a, shift)    (a)
+# define SATURATE(x, a)   (x)
+# define SATURATE16(x)   (x)
+
+# define ROUND16(a, shift)  (a)
+# define SROUND16(a, shift) (a)
+# define HALF16(x)       (.5f*(x))
+# define HALF32(x)       (.5f*(x))
+
+# define ADD16(a, b) ((a) + (b))
+# define SUB16(a, b) ((a) - (b))
+# define ADD32(a, b) ((a) + (b))
+# define SUB32(a, b) ((a) - (b))
+# define ADD32_ovflw(a, b) ((a) + (b))
+# define SUB32_ovflw(a, b) ((a) - (b))
+# define SHL32_ovflw(a, shift) (a)
+# define PSHR32_ovflw(a, shift) (a)
+
+# define MULT16_16_16(a, b)     ((a)*(b))
+# define MULT16_16(a, b)     ((oac_val32)(a)*(oac_val32)(b))
+# define MAC16_16(c, a, b)     ((c) + (oac_val32)(a)*(oac_val32)(b))
+
+# define MULT16_32_Q15(a, b)     ((a)*(b))
+# define MULT16_32_Q16(a, b)     ((a)*(b))
+
+# define MULT32_32_Q16(a, b)     ((a)*(b))
+# define MULT32_32_Q31(a, b)     ((a)*(b))
+# define MULT32_32_P31(a, b)     ((a)*(b))
+# define MULT32_32_P31_ovflw(a, b) ((a)*(b))
+
+# define MAC16_32_Q15(c, a, b)     ((c) + (a)*(b))
+# define MAC16_32_Q16(c, a, b)     ((c) + (a)*(b))
+# define MAC_COEF_32_ARM(c, a, b)     ((c) + (a)*(b))
+
+# define MULT16_16_Q11_32(a, b)     ((a)*(b))
+# define MULT16_16_Q11(a, b)     ((a)*(b))
+# define MULT16_16_Q13(a, b)     ((a)*(b))
+# define MULT16_16_Q14(a, b)     ((a)*(b))
+# define MULT16_16_Q15(a, b)     ((a)*(b))
+# define MULT16_16_P15(a, b)     ((a)*(b))
+# define MULT16_16_P13(a, b)     ((a)*(b))
+# define MULT16_16_P14(a, b)     ((a)*(b))
+# define MULT16_32_P16(a, b)     ((a)*(b))
+
+# define MULT_COEF_32(a, b)      ((a)*(b))
+# define MULT_COEF(a, b)   ((a)*(b))
+# define MULT_COEF_TAPS(a, b)   ((a)*(b))
+
+# define DIV32_16(a, b)     (((oac_val32)(a))/(oac_val16)(b))
+# define DIV32(a, b)     (((oac_val32)(a))/(oac_val32)(b))
+
+# define SIG2RES(a)      ((1/CELT_SIG_SCALE)*(a))
+# define RES2INT16(a)    FLOAT2INT16(a)
+# define RES2INT24(a)    float2int(32768.f*256.f*(a))
+# define RES2FLOAT(a)    (a)
+# define INT16TORES(a)   ((a)*(1/CELT_SIG_SCALE))
+# define INT24TORES(a)   ((1.f/32768.f/256.f)*(a))
+# define ADD_RES(a, b)   ADD32(a, b)
+# define FLOAT2RES(a)    (a)
+# define RES2SIG(a)      (CELT_SIG_SCALE*(a))
+# define MULT16_RES_Q15(a, b) MULT16_16_Q15(a, b)
+
+# define RES2VAL16(a)    (a)
+# define FLOAT2SIG(a)    ((a)*CELT_SIG_SCALE)
+# define INT16TOSIG(a)   ((float)(a))
+# define INT24TOSIG(a)   ((float)(a)*(1.f/256.f))
+# define MAX_ENCODING_DEPTH 24
 
 #endif /* !FIXED_POINT */
 
 #ifndef GLOBAL_STACK_SIZE
-#ifdef FIXED_POINT
-#define GLOBAL_STACK_SIZE 120000
-#else
-#define GLOBAL_STACK_SIZE 120000
-#endif
+# ifdef FIXED_POINT
+#  define GLOBAL_STACK_SIZE 120000
+# else
+#  define GLOBAL_STACK_SIZE 120000
+# endif
 #endif
 
 #endif /* ARCH_H */
diff --git a/celt/arm/arm_celt_map.c b/celt/arm/arm_celt_map.c
index 52a3b48bf..fe39e2296 100644
--- a/celt/arm/arm_celt_map.c
+++ b/celt/arm/arm_celt_map.c
@@ -24,10 +24,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "kiss_fft.h"
@@ -39,40 +39,41 @@
 
 # if !defined(DISABLE_FLOAT_API)
 #  if defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR)
-void (*const CELT_FLOAT2INT16_IMPL[OAC_ARCHMASK+1])(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt) = {
-  celt_float2int16_c,   /* ARMv4 */
-  celt_float2int16_c,   /* EDSP */
-  celt_float2int16_c,   /* Media */
-  celt_float2int16_neon,/* NEON */
-  celt_float2int16_neon /* DOTPROD */
+void (*const CELT_FLOAT2INT16_IMPL[OAC_ARCHMASK + 1])(const float * OAC_RESTRICT in, short * OAC_RESTRICT out,
+int cnt) = {
+    celt_float2int16_c, /* ARMv4 */
+    celt_float2int16_c, /* EDSP */
+    celt_float2int16_c, /* Media */
+    celt_float2int16_neon,/* NEON */
+    celt_float2int16_neon /* DOTPROD */
 };
 
-int (*const OAC_LIMIT2_CHECKWITHIN1_IMPL[OAC_ARCHMASK+1])(float * samples, int cnt) = {
-  oac_limit2_checkwithin1_c,   /* ARMv4 */
-  oac_limit2_checkwithin1_c,   /* EDSP */
-  oac_limit2_checkwithin1_c,   /* Media */
-  oac_limit2_checkwithin1_neon,/* NEON */
-  oac_limit2_checkwithin1_neon /* DOTPROD */
+int (*const OAC_LIMIT2_CHECKWITHIN1_IMPL[OAC_ARCHMASK + 1])(float * samples, int cnt) = {
+    oac_limit2_checkwithin1_c, /* ARMv4 */
+    oac_limit2_checkwithin1_c, /* EDSP */
+    oac_limit2_checkwithin1_c, /* Media */
+    oac_limit2_checkwithin1_neon,/* NEON */
+    oac_limit2_checkwithin1_neon /* DOTPROD */
 };
 #  endif
 # endif
 
 # if defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR)
-oac_val32 (*const CELT_INNER_PROD_IMPL[OAC_ARCHMASK+1])(const oac_val16 *x, const oac_val16 *y, int N) = {
-  celt_inner_prod_c,   /* ARMv4 */
-  celt_inner_prod_c,   /* EDSP */
-  celt_inner_prod_c,   /* Media */
-  celt_inner_prod_neon,/* NEON */
-  celt_inner_prod_neon /* DOTPROD */
+oac_val32 (*const CELT_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(const oac_val16 *x, const oac_val16 *y, int N) = {
+    celt_inner_prod_c, /* ARMv4 */
+    celt_inner_prod_c, /* EDSP */
+    celt_inner_prod_c, /* Media */
+    celt_inner_prod_neon,/* NEON */
+    celt_inner_prod_neon /* DOTPROD */
 };
 
-void (*const DUAL_INNER_PROD_IMPL[OAC_ARCHMASK+1])(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
+void (*const DUAL_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
       int N, oac_val32 *xy1, oac_val32 *xy2) = {
-  dual_inner_prod_c,   /* ARMv4 */
-  dual_inner_prod_c,   /* EDSP */
-  dual_inner_prod_c,   /* Media */
-  dual_inner_prod_neon,/* NEON */
-  dual_inner_prod_neon /* DOTPROD */
+    dual_inner_prod_c, /* ARMv4 */
+    dual_inner_prod_c, /* EDSP */
+    dual_inner_prod_c, /* Media */
+    dual_inner_prod_neon,/* NEON */
+    dual_inner_prod_neon /* DOTPROD */
 };
 # endif
 
@@ -80,111 +81,111 @@ void (*const DUAL_INNER_PROD_IMPL[OAC_ARCHMASK+1])(const oac_val16 *x, const oac
 #  if ((defined(OAC_ARM_MAY_HAVE_NEON) && !defined(OAC_ARM_PRESUME_NEON)) || \
     (defined(OAC_ARM_MAY_HAVE_MEDIA) && !defined(OAC_ARM_PRESUME_MEDIA)) || \
     (defined(OAC_ARM_MAY_HAVE_EDSP) && !defined(OAC_ARM_PRESUME_EDSP)))
-oac_val32 (*const CELT_PITCH_XCORR_IMPL[OAC_ARCHMASK+1])(const oac_val16 *,
+oac_val32 (*const CELT_PITCH_XCORR_IMPL[OAC_ARCHMASK + 1])(const oac_val16 *,
     const oac_val16 *, oac_val32 *, int, int, int) = {
-  celt_pitch_xcorr_c,               /* ARMv4 */
-  MAY_HAVE_EDSP(celt_pitch_xcorr),  /* EDSP */
-  MAY_HAVE_MEDIA(celt_pitch_xcorr), /* Media */
-  MAY_HAVE_NEON(celt_pitch_xcorr),  /* NEON */
-  MAY_HAVE_NEON(celt_pitch_xcorr)   /* DOTPROD */
+    celt_pitch_xcorr_c,             /* ARMv4 */
+    MAY_HAVE_EDSP(celt_pitch_xcorr), /* EDSP */
+    MAY_HAVE_MEDIA(celt_pitch_xcorr), /* Media */
+    MAY_HAVE_NEON(celt_pitch_xcorr), /* NEON */
+    MAY_HAVE_NEON(celt_pitch_xcorr) /* DOTPROD */
 };
 
 #  endif
 # else /* !FIXED_POINT */
 #  if defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR)
-void (*const CELT_PITCH_XCORR_IMPL[OAC_ARCHMASK+1])(const oac_val16 *,
+void (*const CELT_PITCH_XCORR_IMPL[OAC_ARCHMASK + 1])(const oac_val16 *,
     const oac_val16 *, oac_val32 *, int, int, int) = {
-  celt_pitch_xcorr_c,              /* ARMv4 */
-  celt_pitch_xcorr_c,              /* EDSP */
-  celt_pitch_xcorr_c,              /* Media */
-  celt_pitch_xcorr_float_neon,     /* Neon */
-  celt_pitch_xcorr_float_neon      /* DOTPROD */
+    celt_pitch_xcorr_c,            /* ARMv4 */
+    celt_pitch_xcorr_c,            /* EDSP */
+    celt_pitch_xcorr_c,            /* Media */
+    celt_pitch_xcorr_float_neon,   /* Neon */
+    celt_pitch_xcorr_float_neon    /* DOTPROD */
 };
 #  endif
 # endif /* FIXED_POINT */
 
-#if defined(FIXED_POINT) && defined(OAC_HAVE_RTCD) && \
- defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR)
+# if defined(FIXED_POINT) && defined(OAC_HAVE_RTCD) && \
+    defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR)
 
 void (*const XCORR_KERNEL_IMPL[OAC_ARCHMASK + 1])(
          const oac_val16 *x,
          const oac_val16 *y,
-         oac_val32       sum[4],
-         int              len
-) = {
-  xcorr_kernel_c,                /* ARMv4 */
-  xcorr_kernel_c,                /* EDSP */
-  xcorr_kernel_c,                /* Media */
-  xcorr_kernel_neon_fixed,       /* Neon */
-  xcorr_kernel_neon_fixed        /* DOTPROD */
+         oac_val32 sum[4],
+         int len
+    ) = {
+    xcorr_kernel_c,              /* ARMv4 */
+    xcorr_kernel_c,              /* EDSP */
+    xcorr_kernel_c,              /* Media */
+    xcorr_kernel_neon_fixed,     /* Neon */
+    xcorr_kernel_neon_fixed      /* DOTPROD */
 };
 
-#endif
+# endif
 
 # if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 #  if defined(HAVE_ARM_NE10)
 #   if defined(CUSTOM_MODES)
-int (*const OAC_FFT_ALLOC_ARCH_IMPL[OAC_ARCHMASK+1])(kiss_fft_state *st) = {
-   oac_fft_alloc_arch_c,        /* ARMv4 */
-   oac_fft_alloc_arch_c,        /* EDSP */
-   oac_fft_alloc_arch_c,        /* Media */
-   oac_fft_alloc_arm_neon,      /* Neon with NE10 library support */
-   oac_fft_alloc_arm_neon       /* DOTPROD with NE10 library support */
+int (*const OAC_FFT_ALLOC_ARCH_IMPL[OAC_ARCHMASK + 1])(kiss_fft_state *st) = {
+    oac_fft_alloc_arch_c,       /* ARMv4 */
+    oac_fft_alloc_arch_c,       /* EDSP */
+    oac_fft_alloc_arch_c,       /* Media */
+    oac_fft_alloc_arm_neon,     /* Neon with NE10 library support */
+    oac_fft_alloc_arm_neon      /* DOTPROD with NE10 library support */
 };
 
-void (*const OAC_FFT_FREE_ARCH_IMPL[OAC_ARCHMASK+1])(kiss_fft_state *st) = {
-   oac_fft_free_arch_c,         /* ARMv4 */
-   oac_fft_free_arch_c,         /* EDSP */
-   oac_fft_free_arch_c,         /* Media */
-   oac_fft_free_arm_neon,       /* Neon with NE10 */
-   oac_fft_free_arm_neon        /* DOTPROD with NE10 */
+void (*const OAC_FFT_FREE_ARCH_IMPL[OAC_ARCHMASK + 1])(kiss_fft_state *st) = {
+    oac_fft_free_arch_c,        /* ARMv4 */
+    oac_fft_free_arch_c,        /* EDSP */
+    oac_fft_free_arch_c,        /* Media */
+    oac_fft_free_arm_neon,      /* Neon with NE10 */
+    oac_fft_free_arm_neon       /* DOTPROD with NE10 */
 };
 #   endif /* CUSTOM_MODES */
 
-void (*const OAC_FFT[OAC_ARCHMASK+1])(const kiss_fft_state *cfg,
+void (*const OAC_FFT[OAC_ARCHMASK + 1])(const kiss_fft_state *cfg,
                                         const kiss_fft_cpx *fin,
                                         kiss_fft_cpx *fout) = {
-   oac_fft_c,                   /* ARMv4 */
-   oac_fft_c,                   /* EDSP */
-   oac_fft_c,                   /* Media */
-   oac_fft_neon,                /* Neon with NE10 */
-   oac_fft_neon                 /* DOTPROD with NE10 */
+    oac_fft_c,                  /* ARMv4 */
+    oac_fft_c,                  /* EDSP */
+    oac_fft_c,                  /* Media */
+    oac_fft_neon,               /* Neon with NE10 */
+    oac_fft_neon                /* DOTPROD with NE10 */
 };
 
-void (*const OAC_IFFT[OAC_ARCHMASK+1])(const kiss_fft_state *cfg,
+void (*const OAC_IFFT[OAC_ARCHMASK + 1])(const kiss_fft_state *cfg,
                                          const kiss_fft_cpx *fin,
                                          kiss_fft_cpx *fout) = {
-   oac_ifft_c,                   /* ARMv4 */
-   oac_ifft_c,                   /* EDSP */
-   oac_ifft_c,                   /* Media */
-   oac_ifft_neon,                /* Neon with NE10 */
-   oac_ifft_neon                 /* DOTPROD with NE10 */
+    oac_ifft_c,                  /* ARMv4 */
+    oac_ifft_c,                  /* EDSP */
+    oac_ifft_c,                  /* Media */
+    oac_ifft_neon,               /* Neon with NE10 */
+    oac_ifft_neon                /* DOTPROD with NE10 */
 };
 
-void (*const CLT_MDCT_FORWARD_IMPL[OAC_ARCHMASK+1])(const mdct_lookup *l,
+void (*const CLT_MDCT_FORWARD_IMPL[OAC_ARCHMASK + 1])(const mdct_lookup *l,
                                                      kiss_fft_scalar *in,
                                                      kiss_fft_scalar * OAC_RESTRICT out,
                                                      const oac_val16 *window,
                                                      int overlap, int shift,
                                                      int stride, int arch) = {
-   clt_mdct_forward_c,           /* ARMv4 */
-   clt_mdct_forward_c,           /* EDSP */
-   clt_mdct_forward_c,           /* Media */
-   clt_mdct_forward_neon,        /* Neon with NE10 */
-   clt_mdct_forward_neon         /* DOTPROD with NE10 */
+    clt_mdct_forward_c,          /* ARMv4 */
+    clt_mdct_forward_c,          /* EDSP */
+    clt_mdct_forward_c,          /* Media */
+    clt_mdct_forward_neon,       /* Neon with NE10 */
+    clt_mdct_forward_neon        /* DOTPROD with NE10 */
 };
 
-void (*const CLT_MDCT_BACKWARD_IMPL[OAC_ARCHMASK+1])(const mdct_lookup *l,
+void (*const CLT_MDCT_BACKWARD_IMPL[OAC_ARCHMASK + 1])(const mdct_lookup *l,
                                                       kiss_fft_scalar *in,
                                                       kiss_fft_scalar * OAC_RESTRICT out,
                                                       const oac_val16 *window,
                                                       int overlap, int shift,
                                                       int stride, int arch) = {
-   clt_mdct_backward_c,           /* ARMv4 */
-   clt_mdct_backward_c,           /* EDSP */
-   clt_mdct_backward_c,           /* Media */
-   clt_mdct_backward_neon,        /* Neon with NE10 */
-   clt_mdct_backward_neon         /* DOTPROD with NE10 */
+    clt_mdct_backward_c,          /* ARMv4 */
+    clt_mdct_backward_c,          /* EDSP */
+    clt_mdct_backward_c,          /* Media */
+    clt_mdct_backward_neon,       /* Neon with NE10 */
+    clt_mdct_backward_neon        /* DOTPROD with NE10 */
 };
 
 #  endif /* HAVE_ARM_NE10 */
diff --git a/celt/arm/armcpu.c b/celt/arm/armcpu.c
index 4d486371e..5c681d4f0 100644
--- a/celt/arm/armcpu.c
+++ b/celt/arm/armcpu.c
@@ -23,301 +23,290 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 /* Original code from libtheora modified to suit to Oac */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #ifdef OAC_HAVE_RTCD
 
-#include "armcpu.h"
-#include "cpu_support.h"
-#include "os_support.h"
-#include "oac_types.h"
-#include "arch.h"
+# include "armcpu.h"
+# include "cpu_support.h"
+# include "os_support.h"
+# include "oac_types.h"
+# include "arch.h"
 
-#define OAC_CPU_ARM_V4_FLAG    (1<<OAC_ARCH_ARM_V4)
-#define OAC_CPU_ARM_EDSP_FLAG  (1<<OAC_ARCH_ARM_EDSP)
-#define OAC_CPU_ARM_MEDIA_FLAG (1<<OAC_ARCH_ARM_MEDIA)
-#define OAC_CPU_ARM_NEON_FLAG  (1<<OAC_ARCH_ARM_NEON)
-#define OAC_CPU_ARM_DOTPROD_FLAG  (1<<OAC_ARCH_ARM_DOTPROD)
+# define OAC_CPU_ARM_V4_FLAG    (1<<OAC_ARCH_ARM_V4)
+# define OAC_CPU_ARM_EDSP_FLAG  (1<<OAC_ARCH_ARM_EDSP)
+# define OAC_CPU_ARM_MEDIA_FLAG (1<<OAC_ARCH_ARM_MEDIA)
+# define OAC_CPU_ARM_NEON_FLAG  (1<<OAC_ARCH_ARM_NEON)
+# define OAC_CPU_ARM_DOTPROD_FLAG  (1<<OAC_ARCH_ARM_DOTPROD)
 
-#if defined(_MSC_VER)
+# if defined(_MSC_VER)
 /*For GetExceptionCode() and EXCEPTION_ILLEGAL_INSTRUCTION.*/
-# define WIN32_LEAN_AND_MEAN
-# define WIN32_EXTRA_LEAN
-# include <windows.h>
-
-static OAC_INLINE oac_uint32 oac_cpu_capabilities(void){
-  oac_uint32 flags;
-  flags=0;
-  /* MSVC has no OAC_INLINE __asm support for ARM, but it does let you __emit
-   * instructions via their assembled hex code.
-   * All of these instructions should be essentially nops. */
-# if defined(OAC_ARM_MAY_HAVE_EDSP) || defined(OAC_ARM_MAY_HAVE_MEDIA) \
- || defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
-  __try{
-    /*PLD [r13]*/
-    __emit(0xF5DDF000);
-    flags|=OAC_CPU_ARM_EDSP_FLAG;
-  }
-  __except(GetExceptionCode()==EXCEPTION_ILLEGAL_INSTRUCTION){
-    /*Ignore exception.*/
-  }
-#  if defined(OAC_ARM_MAY_HAVE_MEDIA) \
- || defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
-  __try{
-    /*SHADD8 r3,r3,r3*/
-    __emit(0xE6333F93);
-    flags|=OAC_CPU_ARM_MEDIA_FLAG;
-  }
-  __except(GetExceptionCode()==EXCEPTION_ILLEGAL_INSTRUCTION){
-    /*Ignore exception.*/
-  }
-#   if defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
-  __try{
-    /*VORR q0,q0,q0*/
-    __emit(0xF2200150);
-    flags|=OAC_CPU_ARM_NEON_FLAG;
-  }
-  __except(GetExceptionCode()==EXCEPTION_ILLEGAL_INSTRUCTION){
-    /*Ignore exception.*/
-  }
+#  define WIN32_LEAN_AND_MEAN
+#  define WIN32_EXTRA_LEAN
+#  include <windows.h>
+
+static OAC_INLINE oac_uint32 oac_cpu_capabilities(void) {
+    oac_uint32 flags;
+    flags = 0;
+    /* MSVC has no OAC_INLINE __asm support for ARM, but it does let you __emit
+     * instructions via their assembled hex code.
+     * All of these instructions should be essentially nops. */
+#  if defined(OAC_ARM_MAY_HAVE_EDSP) || defined(OAC_ARM_MAY_HAVE_MEDIA) \
+    || defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
+    __try{
+        /*PLD [r13]*/
+        __emit(0xF5DDF000);
+        flags |= OAC_CPU_ARM_EDSP_FLAG;
+    }
+    __except (GetExceptionCode() == EXCEPTION_ILLEGAL_INSTRUCTION) {
+        /*Ignore exception.*/
+    }
+#   if defined(OAC_ARM_MAY_HAVE_MEDIA) \
+    || defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
+    __try{
+        /*SHADD8 r3,r3,r3*/
+        __emit(0xE6333F93);
+        flags |= OAC_CPU_ARM_MEDIA_FLAG;
+    }
+    __except (GetExceptionCode() == EXCEPTION_ILLEGAL_INSTRUCTION) {
+        /*Ignore exception.*/
+    }
+#    if defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
+    __try{
+        /*VORR q0,q0,q0*/
+        __emit(0xF2200150);
+        flags |= OAC_CPU_ARM_NEON_FLAG;
+    }
+    __except (GetExceptionCode() == EXCEPTION_ILLEGAL_INSTRUCTION) {
+        /*Ignore exception.*/
+    }
+#    endif
 #   endif
 #  endif
-# endif
-  return flags;
+    return flags;
 }
 
-#elif defined(__linux__)
+# elif defined(__linux__)
 /* Linux based */
-#include <stdio.h>
-
-static oac_uint32 oac_cpu_capabilities(void)
-{
-  oac_uint32 flags = 0;
-  FILE *cpuinfo;
-
-  /* Reading /proc/self/auxv would be easier, but that doesn't work reliably on
-   * Android */
-  cpuinfo = fopen("/proc/cpuinfo", "r");
-
-  if(cpuinfo != NULL)
-  {
-    /* 512 should be enough for anybody (it's even enough for all the flags that
-     * x86 has accumulated... so far). */
-    char buf[512];
-
-    while(fgets(buf, 512, cpuinfo) != NULL)
-    {
-# if defined(OAC_ARM_MAY_HAVE_EDSP) || defined(OAC_ARM_MAY_HAVE_MEDIA) \
- || defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
-      /* Search for edsp and neon flag */
-      if(memcmp(buf, "Features", 8) == 0)
-      {
-        char *p;
-        p = strstr(buf, " edsp");
-        if(p != NULL && (p[5] == ' ' || p[5] == '\n'))
-          flags |= OAC_CPU_ARM_EDSP_FLAG;
-
-#  if defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
-        p = strstr(buf, " neon");
-        if(p != NULL && (p[5] == ' ' || p[5] == '\n'))
-          flags |= OAC_CPU_ARM_NEON_FLAG;
-        p = strstr(buf, " asimd");
-        if(p != NULL && (p[6] == ' ' || p[6] == '\n'))
-          flags |= OAC_CPU_ARM_NEON_FLAG | OAC_CPU_ARM_MEDIA_FLAG | OAC_CPU_ARM_EDSP_FLAG;
-#  endif
-#  if defined(OAC_ARM_MAY_HAVE_DOTPROD)
-        p = strstr(buf, " asimddp");
-        if(p != NULL && (p[8] == ' ' || p[8] == '\n'))
-          flags |= OAC_CPU_ARM_DOTPROD_FLAG;
+#  include <stdio.h>
+
+static oac_uint32 oac_cpu_capabilities(void) {
+    oac_uint32 flags = 0;
+    FILE *cpuinfo;
+
+    /* Reading /proc/self/auxv would be easier, but that doesn't work reliably on
+     * Android */
+    cpuinfo = fopen("/proc/cpuinfo", "r");
+
+    if (cpuinfo != NULL) {
+        /* 512 should be enough for anybody (it's even enough for all the flags that
+         * x86 has accumulated... so far). */
+        char buf[512];
+
+        while (fgets(buf, 512, cpuinfo) != NULL) {
+#  if defined(OAC_ARM_MAY_HAVE_EDSP) || defined(OAC_ARM_MAY_HAVE_MEDIA) \
+            || defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
+            /* Search for edsp and neon flag */
+            if (memcmp(buf, "Features", 8) == 0) {
+                char *p;
+                p = strstr(buf, " edsp");
+                if (p != NULL && (p[5] == ' ' || p[5] == '\n'))
+                    flags |= OAC_CPU_ARM_EDSP_FLAG;
+
+#   if defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
+                p = strstr(buf, " neon");
+                if (p != NULL && (p[5] == ' ' || p[5] == '\n'))
+                    flags |= OAC_CPU_ARM_NEON_FLAG;
+                p = strstr(buf, " asimd");
+                if (p != NULL && (p[6] == ' ' || p[6] == '\n'))
+                    flags |= OAC_CPU_ARM_NEON_FLAG|OAC_CPU_ARM_MEDIA_FLAG|OAC_CPU_ARM_EDSP_FLAG;
+#   endif
+#   if defined(OAC_ARM_MAY_HAVE_DOTPROD)
+                p = strstr(buf, " asimddp");
+                if (p != NULL && (p[8] == ' ' || p[8] == '\n'))
+                    flags |= OAC_CPU_ARM_DOTPROD_FLAG;
+#   endif
+            }
 #  endif
-      }
-# endif
 
-# if defined(OAC_ARM_MAY_HAVE_MEDIA) \
- || defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
-      /* Search for media capabilities (>= ARMv6) */
-      if(memcmp(buf, "CPU architecture:", 17) == 0)
-      {
-        int version;
-        version = atoi(buf+17);
-
-        if(version >= 6)
-          flags |= OAC_CPU_ARM_MEDIA_FLAG;
-      }
-# endif
-    }
+#  if defined(OAC_ARM_MAY_HAVE_MEDIA) \
+            || defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
+            /* Search for media capabilities (>= ARMv6) */
+            if (memcmp(buf, "CPU architecture:", 17) == 0) {
+                int version;
+                version = atoi(buf + 17);
+
+                if (version >= 6)
+                    flags |= OAC_CPU_ARM_MEDIA_FLAG;
+            }
+#  endif
+        }
 
-#if defined(OAC_ARM_PRESUME_AARCH64_NEON_INTR)
-    flags |= OAC_CPU_ARM_EDSP_FLAG | OAC_CPU_ARM_MEDIA_FLAG | OAC_CPU_ARM_NEON_FLAG;
-# if defined(OAC_ARM_PRESUME_DOTPROD)
-    flags |= OAC_CPU_ARM_DOTPROD_FLAG;
-# endif
-#endif
+#  if defined(OAC_ARM_PRESUME_AARCH64_NEON_INTR)
+        flags |= OAC_CPU_ARM_EDSP_FLAG|OAC_CPU_ARM_MEDIA_FLAG|OAC_CPU_ARM_NEON_FLAG;
+#   if defined(OAC_ARM_PRESUME_DOTPROD)
+        flags |= OAC_CPU_ARM_DOTPROD_FLAG;
+#   endif
+#  endif
 
-    fclose(cpuinfo);
-  }
-  return flags;
+        fclose(cpuinfo);
+    }
+    return flags;
 }
 
-#elif defined(__APPLE__)
-#include <sys/types.h>
-#include <sys/sysctl.h>
+# elif defined(__APPLE__)
+#  include <sys/types.h>
+#  include <sys/sysctl.h>
 
-static oac_uint32 oac_cpu_capabilities(void)
-{
-  oac_uint32 flags = 0;
+static oac_uint32 oac_cpu_capabilities(void) {
+    oac_uint32 flags = 0;
 
-#if defined(OAC_ARM_MAY_HAVE_DOTPROD)
-  size_t size = sizeof(uint32_t);
-  uint32_t value = 0;
-  if (!sysctlbyname("hw.optional.arm.FEAT_DotProd", &value, &size, NULL, 0) && value)
-  {
-    flags |= OAC_CPU_ARM_DOTPROD_FLAG;
-  }
-#endif
+#  if defined(OAC_ARM_MAY_HAVE_DOTPROD)
+    size_t size = sizeof(uint32_t);
+    uint32_t value = 0;
+    if (!sysctlbyname("hw.optional.arm.FEAT_DotProd", &value, &size, NULL, 0) && value) {
+        flags |= OAC_CPU_ARM_DOTPROD_FLAG;
+    }
+#  endif
 
-#if defined(OAC_ARM_PRESUME_AARCH64_NEON_INTR)
-  flags |= OAC_CPU_ARM_EDSP_FLAG | OAC_CPU_ARM_MEDIA_FLAG | OAC_CPU_ARM_NEON_FLAG;
-# if defined(OAC_ARM_PRESUME_DOTPROD)
-  flags |= OAC_CPU_ARM_DOTPROD_FLAG;
-# endif
-#endif
-  return flags;
+#  if defined(OAC_ARM_PRESUME_AARCH64_NEON_INTR)
+    flags |= OAC_CPU_ARM_EDSP_FLAG|OAC_CPU_ARM_MEDIA_FLAG|OAC_CPU_ARM_NEON_FLAG;
+#   if defined(OAC_ARM_PRESUME_DOTPROD)
+    flags |= OAC_CPU_ARM_DOTPROD_FLAG;
+#   endif
+#  endif
+    return flags;
 }
 
-#elif defined(HAVE_ELF_AUX_INFO)
-#include <sys/auxv.h>
+# elif defined(HAVE_ELF_AUX_INFO)
+#  include <sys/auxv.h>
 
-static oac_uint32 oac_cpu_capabilities(void)
-{
-  long hwcap = 0;
-  oac_uint32 flags = 0;
+static oac_uint32 oac_cpu_capabilities(void) {
+    long hwcap = 0;
+    oac_uint32 flags = 0;
 
-# if defined(OAC_ARM_MAY_HAVE_MEDIA) \
- || defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
-  /* FreeBSD requires armv6+, which always supports media instructions */
-  flags |= OAC_CPU_ARM_MEDIA_FLAG;
-# endif
+#  if defined(OAC_ARM_MAY_HAVE_MEDIA) \
+    || defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
+    /* FreeBSD requires armv6+, which always supports media instructions */
+    flags |= OAC_CPU_ARM_MEDIA_FLAG;
+#  endif
 
-  elf_aux_info(AT_HWCAP, &hwcap, sizeof hwcap);
+    elf_aux_info(AT_HWCAP, &hwcap, sizeof hwcap);
 
-# if defined(OAC_ARM_MAY_HAVE_EDSP) || defined(OAC_ARM_MAY_HAVE_MEDIA) \
- || defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
-#  ifdef HWCAP_EDSP
-  if (hwcap & HWCAP_EDSP)
-    flags |= OAC_CPU_ARM_EDSP_FLAG;
-#  endif
+#  if defined(OAC_ARM_MAY_HAVE_EDSP) || defined(OAC_ARM_MAY_HAVE_MEDIA) \
+    || defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
+#   ifdef HWCAP_EDSP
+    if (hwcap&HWCAP_EDSP)
+        flags |= OAC_CPU_ARM_EDSP_FLAG;
+#   endif
 
-#  if defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
-#   ifdef HWCAP_NEON
-  if (hwcap & HWCAP_NEON)
-    flags |= OAC_CPU_ARM_NEON_FLAG;
-#   elif defined(HWCAP_ASIMD)
-  if (hwcap & HWCAP_ASIMD)
-    flags |= OAC_CPU_ARM_NEON_FLAG | OAC_CPU_ARM_MEDIA_FLAG | OAC_CPU_ARM_EDSP_FLAG;
+#   if defined(OAC_ARM_MAY_HAVE_NEON) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
+#    ifdef HWCAP_NEON
+    if (hwcap&HWCAP_NEON)
+        flags |= OAC_CPU_ARM_NEON_FLAG;
+#    elif defined(HWCAP_ASIMD)
+    if (hwcap&HWCAP_ASIMD)
+        flags |= OAC_CPU_ARM_NEON_FLAG|OAC_CPU_ARM_MEDIA_FLAG|OAC_CPU_ARM_EDSP_FLAG;
+#    endif
+#   endif
+#   if defined(OAC_ARM_MAY_HAVE_DOTPROD) && defined(HWCAP_ASIMDDP)
+    if (hwcap&HWCAP_ASIMDDP)
+        flags |= OAC_CPU_ARM_DOTPROD_FLAG;
 #   endif
 #  endif
-#  if defined(OAC_ARM_MAY_HAVE_DOTPROD) && defined(HWCAP_ASIMDDP)
-  if (hwcap & HWCAP_ASIMDDP)
-    flags |= OAC_CPU_ARM_DOTPROD_FLAG;
-#  endif
-# endif
 
-#if defined(OAC_ARM_PRESUME_AARCH64_NEON_INTR)
-    flags |= OAC_CPU_ARM_EDSP_FLAG | OAC_CPU_ARM_MEDIA_FLAG | OAC_CPU_ARM_NEON_FLAG;
-# if defined(OAC_ARM_PRESUME_DOTPROD)
+#  if defined(OAC_ARM_PRESUME_AARCH64_NEON_INTR)
+    flags |= OAC_CPU_ARM_EDSP_FLAG|OAC_CPU_ARM_MEDIA_FLAG|OAC_CPU_ARM_NEON_FLAG;
+#   if defined(OAC_ARM_PRESUME_DOTPROD)
     flags |= OAC_CPU_ARM_DOTPROD_FLAG;
-# endif
-#endif
+#   endif
+#  endif
 
-  return (flags);
+    return flags;
 }
 
-#elif defined(__OpenBSD__)
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <machine/armreg.h>
-#include <machine/cpu.h>
-
-static oac_uint32 oac_cpu_capabilities(void)
-{
-  oac_uint32 flags = 0;
-
-#if defined(OAC_ARM_MAY_HAVE_DOTPROD) && defined(CPU_ID_AA64ISAR0)
-  const int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 };
-  uint64_t isar0;
-  size_t len = sizeof(isar0);
-
-  if (sysctl(isar0_mib, 2, &isar0, &len, NULL, 0) != -1)
-  {
-    if (ID_AA64ISAR0_DP(isar0) >= ID_AA64ISAR0_DP_IMPL)
-      flags |= OAC_CPU_ARM_DOTPROD_FLAG;
-  }
-#endif
+# elif defined(__OpenBSD__)
+#  include <sys/types.h>
+#  include <sys/sysctl.h>
+#  include <machine/armreg.h>
+#  include <machine/cpu.h>
 
-#if defined(OAC_ARM_PRESUME_NEON_INTR) \
- || defined(OAC_ARM_PRESUME_AARCH64_NEON_INTR)
-  flags |= OAC_CPU_ARM_EDSP_FLAG | OAC_CPU_ARM_MEDIA_FLAG | OAC_CPU_ARM_NEON_FLAG;
-# if defined(OAC_ARM_PRESUME_DOTPROD)
-  flags |= OAC_CPU_ARM_DOTPROD_FLAG;
-# endif
-#endif
-  return flags;
+static oac_uint32 oac_cpu_capabilities(void) {
+    oac_uint32 flags = 0;
+
+#  if defined(OAC_ARM_MAY_HAVE_DOTPROD) && defined(CPU_ID_AA64ISAR0)
+    const int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 };
+    uint64_t isar0;
+    size_t len = sizeof(isar0);
+
+    if (sysctl(isar0_mib, 2, &isar0, &len, NULL, 0) != -1) {
+        if (ID_AA64ISAR0_DP(isar0) >= ID_AA64ISAR0_DP_IMPL)
+            flags |= OAC_CPU_ARM_DOTPROD_FLAG;
+    }
+#  endif
+
+#  if defined(OAC_ARM_PRESUME_NEON_INTR) \
+    || defined(OAC_ARM_PRESUME_AARCH64_NEON_INTR)
+    flags |= OAC_CPU_ARM_EDSP_FLAG|OAC_CPU_ARM_MEDIA_FLAG|OAC_CPU_ARM_NEON_FLAG;
+#   if defined(OAC_ARM_PRESUME_DOTPROD)
+    flags |= OAC_CPU_ARM_DOTPROD_FLAG;
+#   endif
+#  endif
+    return flags;
 }
 
-#else
+# else
 /* The feature registers which can tell us what the processor supports are
  * accessible in privileged modes only, so we can't have a general user-space
  * detection method like on x86.*/
-# error "Configured to use ARM asm but no CPU detection method available for " \
-   "your platform.  Reconfigure with --disable-rtcd (or send patches)."
-#endif
+#  error "Configured to use ARM asm but no CPU detection method available for " \
+    "your platform.  Reconfigure with --disable-rtcd (or send patches)."
+# endif
 
-static int oac_select_arch_impl(void)
-{
-  oac_uint32 flags = oac_cpu_capabilities();
-  int arch = 0;
+static int oac_select_arch_impl(void) {
+    oac_uint32 flags = oac_cpu_capabilities();
+    int arch = 0;
 
-  if(!(flags & OAC_CPU_ARM_EDSP_FLAG)) {
-    /* Asserts ensure arch values are sequential */
-    celt_assert(arch == OAC_ARCH_ARM_V4);
-    return arch;
-  }
-  arch++;
+    if (!(flags&OAC_CPU_ARM_EDSP_FLAG)) {
+        /* Asserts ensure arch values are sequential */
+        celt_assert(arch == OAC_ARCH_ARM_V4);
+        return arch;
+    }
+    arch++;
 
-  if(!(flags & OAC_CPU_ARM_MEDIA_FLAG)) {
-    celt_assert(arch == OAC_ARCH_ARM_EDSP);
-    return arch;
-  }
-  arch++;
+    if (!(flags&OAC_CPU_ARM_MEDIA_FLAG)) {
+        celt_assert(arch == OAC_ARCH_ARM_EDSP);
+        return arch;
+    }
+    arch++;
 
-  if(!(flags & OAC_CPU_ARM_NEON_FLAG)) {
-    celt_assert(arch == OAC_ARCH_ARM_MEDIA);
-    return arch;
-  }
-  arch++;
+    if (!(flags&OAC_CPU_ARM_NEON_FLAG)) {
+        celt_assert(arch == OAC_ARCH_ARM_MEDIA);
+        return arch;
+    }
+    arch++;
 
-  if(!(flags & OAC_CPU_ARM_DOTPROD_FLAG)) {
-    celt_assert(arch == OAC_ARCH_ARM_NEON);
-    return arch;
-  }
-  arch++;
+    if (!(flags&OAC_CPU_ARM_DOTPROD_FLAG)) {
+        celt_assert(arch == OAC_ARCH_ARM_NEON);
+        return arch;
+    }
+    arch++;
 
-  celt_assert(arch == OAC_ARCH_ARM_DOTPROD);
-  return arch;
+    celt_assert(arch == OAC_ARCH_ARM_DOTPROD);
+    return arch;
 }
 
 int oac_select_arch(void) {
-  int arch = oac_select_arch_impl();
-#ifdef FUZZING
-  arch = rand()%(arch+1);
-#endif
-  return arch;
+    int arch = oac_select_arch_impl();
+# ifdef FUZZING
+    arch = rand()%(arch + 1);
+# endif
+    return arch;
 }
 #endif
diff --git a/celt/arm/armcpu.h b/celt/arm/armcpu.h
index 5d5e8b640..1565bafaf 100644
--- a/celt/arm/armcpu.h
+++ b/celt/arm/armcpu.h
@@ -23,68 +23,68 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #if !defined(ARMCPU_H)
-# define ARMCPU_H
-
-# if defined(OAC_ARM_MAY_HAVE_EDSP)
-#  define MAY_HAVE_EDSP(name) name ## _edsp
-# else
-#  define MAY_HAVE_EDSP(name) name ## _c
-# endif
-
-# if defined(OAC_ARM_MAY_HAVE_MEDIA)
-#  define MAY_HAVE_MEDIA(name) name ## _media
-# else
-#  define MAY_HAVE_MEDIA(name) MAY_HAVE_EDSP(name)
-# endif
-
-# if defined(OAC_ARM_MAY_HAVE_NEON)
-#  define MAY_HAVE_NEON(name) name ## _neon
-# else
-#  define MAY_HAVE_NEON(name) MAY_HAVE_MEDIA(name)
-# endif
-
-# if defined(OAC_ARM_MAY_HAVE_DOTPROD)
-#  define MAY_HAVE_DOTPROD(name) name ## _dotprod
-# else
-#  define MAY_HAVE_DOTPROD(name) MAY_HAVE_NEON(name)
-# endif
-
-# if defined(OAC_ARM_PRESUME_EDSP)
-#  define PRESUME_EDSP(name) name ## _edsp
-# else
-#  define PRESUME_EDSP(name) name ## _c
-# endif
-
-# if defined(OAC_ARM_PRESUME_MEDIA)
-#  define PRESUME_MEDIA(name) name ## _media
-# else
-#  define PRESUME_MEDIA(name) PRESUME_EDSP(name)
-# endif
-
-# if defined(OAC_ARM_PRESUME_NEON)
-#  define PRESUME_NEON(name) name ## _neon
-# else
-#  define PRESUME_NEON(name) PRESUME_MEDIA(name)
-# endif
-
-# if defined(OAC_ARM_PRESUME_DOTPROD)
-#  define PRESUME_DOTPROD(name) name ## _dotprod
-# else
-#  define PRESUME_DOTPROD(name) PRESUME_NEON(name)
-# endif
-
-# if defined(OAC_HAVE_RTCD)
+#define ARMCPU_H
+
+#if defined(OAC_ARM_MAY_HAVE_EDSP)
+# define MAY_HAVE_EDSP(name) name ## _edsp
+#else
+# define MAY_HAVE_EDSP(name) name ## _c
+#endif
+
+#if defined(OAC_ARM_MAY_HAVE_MEDIA)
+# define MAY_HAVE_MEDIA(name) name ## _media
+#else
+# define MAY_HAVE_MEDIA(name) MAY_HAVE_EDSP(name)
+#endif
+
+#if defined(OAC_ARM_MAY_HAVE_NEON)
+# define MAY_HAVE_NEON(name) name ## _neon
+#else
+# define MAY_HAVE_NEON(name) MAY_HAVE_MEDIA(name)
+#endif
+
+#if defined(OAC_ARM_MAY_HAVE_DOTPROD)
+# define MAY_HAVE_DOTPROD(name) name ## _dotprod
+#else
+# define MAY_HAVE_DOTPROD(name) MAY_HAVE_NEON(name)
+#endif
+
+#if defined(OAC_ARM_PRESUME_EDSP)
+# define PRESUME_EDSP(name) name ## _edsp
+#else
+# define PRESUME_EDSP(name) name ## _c
+#endif
+
+#if defined(OAC_ARM_PRESUME_MEDIA)
+# define PRESUME_MEDIA(name) name ## _media
+#else
+# define PRESUME_MEDIA(name) PRESUME_EDSP(name)
+#endif
+
+#if defined(OAC_ARM_PRESUME_NEON)
+# define PRESUME_NEON(name) name ## _neon
+#else
+# define PRESUME_NEON(name) PRESUME_MEDIA(name)
+#endif
+
+#if defined(OAC_ARM_PRESUME_DOTPROD)
+# define PRESUME_DOTPROD(name) name ## _dotprod
+#else
+# define PRESUME_DOTPROD(name) PRESUME_NEON(name)
+#endif
+
+#if defined(OAC_HAVE_RTCD)
 int oac_select_arch(void);
 
-#define OAC_ARCH_ARM_V4    (0)
-#define OAC_ARCH_ARM_EDSP  (1)
-#define OAC_ARCH_ARM_MEDIA (2)
-#define OAC_ARCH_ARM_NEON  (3)
-#define OAC_ARCH_ARM_DOTPROD  (4)
+# define OAC_ARCH_ARM_V4    (0)
+# define OAC_ARCH_ARM_EDSP  (1)
+# define OAC_ARCH_ARM_MEDIA (2)
+# define OAC_ARCH_ARM_NEON  (3)
+# define OAC_ARCH_ARM_DOTPROD  (4)
 
-# endif
+#endif
 
 #endif
diff --git a/celt/arm/celt_fft_ne10.c b/celt/arm/celt_fft_ne10.c
index cdfeaacc3..ad7c7567e 100644
--- a/celt/arm/celt_fft_ne10.c
+++ b/celt/arm/celt_fft_ne10.c
@@ -28,12 +28,12 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef SKIP_CONFIG_H
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+# ifdef HAVE_CONFIG_H
+#  include "config.h"
+# endif
 #endif
 
 #include <NE10_dsp.h>
@@ -63,111 +63,104 @@
 /* nfft lengths in NE10 that support scaled fft */
 # define NE10_FFTSCALED_SUPPORT_MAX 4
 static const int ne10_fft_scaled_support[NE10_FFTSCALED_SUPPORT_MAX] = {
-   480, 240, 120, 60
+    480, 240, 120, 60
 };
 
-int oac_fft_alloc_arm_neon(kiss_fft_state *st)
-{
-   int i;
-   size_t memneeded = sizeof(struct arch_fft_state);
-
-   st->arch_fft = (arch_fft_state *)oac_alloc(memneeded);
-   if (!st->arch_fft)
-      return -1;
-
-   for (i = 0; i < NE10_FFTSCALED_SUPPORT_MAX; i++) {
-      if(st->nfft == ne10_fft_scaled_support[i])
-         break;
-   }
-   if (i == NE10_FFTSCALED_SUPPORT_MAX) {
-      /* This nfft length (scaled fft) is not supported in NE10 */
-      st->arch_fft->is_supported = 0;
-      st->arch_fft->priv = NULL;
-   }
-   else {
-      st->arch_fft->is_supported = 1;
-      st->arch_fft->priv = (void *)NE10_FFT_ALLOC_C2C_TYPE_NEON(st->nfft);
-      if (st->arch_fft->priv == NULL) {
-         return -1;
-      }
-   }
-   return 0;
+int oac_fft_alloc_arm_neon(kiss_fft_state *st) {
+    int i;
+    size_t memneeded = sizeof(struct arch_fft_state);
+
+    st->arch_fft = (arch_fft_state *)oac_alloc(memneeded);
+    if (!st->arch_fft)
+        return -1;
+
+    for (i = 0; i < NE10_FFTSCALED_SUPPORT_MAX; i++) {
+        if (st->nfft == ne10_fft_scaled_support[i])
+            break;
+    }
+    if (i == NE10_FFTSCALED_SUPPORT_MAX) {
+        /* This nfft length (scaled fft) is not supported in NE10 */
+        st->arch_fft->is_supported = 0;
+        st->arch_fft->priv = NULL;
+    } else   {
+        st->arch_fft->is_supported = 1;
+        st->arch_fft->priv = (void *)NE10_FFT_ALLOC_C2C_TYPE_NEON(st->nfft);
+        if (st->arch_fft->priv == NULL) {
+            return -1;
+        }
+    }
+    return 0;
 }
 
-void oac_fft_free_arm_neon(kiss_fft_state *st)
-{
-   NE10_FFT_CFG_TYPE_T cfg;
+void oac_fft_free_arm_neon(kiss_fft_state *st) {
+    NE10_FFT_CFG_TYPE_T cfg;
 
-   if (!st->arch_fft)
-      return;
+    if (!st->arch_fft)
+        return;
 
-   cfg = (NE10_FFT_CFG_TYPE_T)st->arch_fft->priv;
-   if (cfg)
-      NE10_FFT_DESTROY_C2C_TYPE(cfg);
-   oac_free(st->arch_fft);
+    cfg = (NE10_FFT_CFG_TYPE_T)st->arch_fft->priv;
+    if (cfg)
+        NE10_FFT_DESTROY_C2C_TYPE(cfg);
+    oac_free(st->arch_fft);
 }
 #endif
 
 void oac_fft_neon(const kiss_fft_state *st,
-                   const kiss_fft_cpx *fin,
-                   kiss_fft_cpx *fout)
-{
-   NE10_FFT_STATE_TYPE_T state;
-   NE10_FFT_CFG_TYPE_T cfg = &state;
-   VARDECL(NE10_FFT_CPX_TYPE_T, buffer);
-   SAVE_STACK;
-   ALLOC(buffer, st->nfft, NE10_FFT_CPX_TYPE_T);
-
-   if (!st->arch_fft->is_supported) {
-      /* This nfft length (scaled fft) not supported in NE10 */
-      oac_fft_c(st, fin, fout);
-   }
-   else {
-      memcpy((void *)cfg, st->arch_fft->priv, sizeof(NE10_FFT_STATE_TYPE_T));
-      state.buffer = (NE10_FFT_CPX_TYPE_T *)&buffer[0];
+                  const kiss_fft_cpx *fin,
+                  kiss_fft_cpx *fout) {
+    NE10_FFT_STATE_TYPE_T state;
+    NE10_FFT_CFG_TYPE_T cfg = &state;
+    VARDECL(NE10_FFT_CPX_TYPE_T, buffer);
+    SAVE_STACK;
+    ALLOC(buffer, st->nfft, NE10_FFT_CPX_TYPE_T);
+
+    if (!st->arch_fft->is_supported) {
+        /* This nfft length (scaled fft) not supported in NE10 */
+        oac_fft_c(st, fin, fout);
+    } else   {
+        memcpy((void *)cfg, st->arch_fft->priv, sizeof(NE10_FFT_STATE_TYPE_T));
+        state.buffer = (NE10_FFT_CPX_TYPE_T *)&buffer[0];
 #if !defined(FIXED_POINT)
-      state.is_forward_scaled = 1;
+        state.is_forward_scaled = 1;
 
-      NE10_FFT_C2C_1D_TYPE_NEON((NE10_FFT_CPX_TYPE_T *)fout,
-                                (NE10_FFT_CPX_TYPE_T *)fin,
+        NE10_FFT_C2C_1D_TYPE_NEON((NE10_FFT_CPX_TYPE_T *)fout,
+            (NE10_FFT_CPX_TYPE_T *)fin,
                                 cfg, 0);
 #else
-      NE10_FFT_C2C_1D_TYPE_NEON((NE10_FFT_CPX_TYPE_T *)fout,
-                                (NE10_FFT_CPX_TYPE_T *)fin,
+        NE10_FFT_C2C_1D_TYPE_NEON((NE10_FFT_CPX_TYPE_T *)fout,
+            (NE10_FFT_CPX_TYPE_T *)fin,
                                 cfg, 0, 1);
 #endif
-   }
-   RESTORE_STACK;
+    }
+    RESTORE_STACK;
 }
 
 void oac_ifft_neon(const kiss_fft_state *st,
-                    const kiss_fft_cpx *fin,
-                    kiss_fft_cpx *fout)
-{
-   NE10_FFT_STATE_TYPE_T state;
-   NE10_FFT_CFG_TYPE_T cfg = &state;
-   VARDECL(NE10_FFT_CPX_TYPE_T, buffer);
-   SAVE_STACK;
-   ALLOC(buffer, st->nfft, NE10_FFT_CPX_TYPE_T);
-
-   if (!st->arch_fft->is_supported) {
-      /* This nfft length (scaled fft) not supported in NE10 */
-      oac_ifft_c(st, fin, fout);
-   }
-   else {
-      memcpy((void *)cfg, st->arch_fft->priv, sizeof(NE10_FFT_STATE_TYPE_T));
-      state.buffer = (NE10_FFT_CPX_TYPE_T *)&buffer[0];
+                   const kiss_fft_cpx *fin,
+                   kiss_fft_cpx *fout) {
+    NE10_FFT_STATE_TYPE_T state;
+    NE10_FFT_CFG_TYPE_T cfg = &state;
+    VARDECL(NE10_FFT_CPX_TYPE_T, buffer);
+    SAVE_STACK;
+    ALLOC(buffer, st->nfft, NE10_FFT_CPX_TYPE_T);
+
+    if (!st->arch_fft->is_supported) {
+        /* This nfft length (scaled fft) not supported in NE10 */
+        oac_ifft_c(st, fin, fout);
+    } else   {
+        memcpy((void *)cfg, st->arch_fft->priv, sizeof(NE10_FFT_STATE_TYPE_T));
+        state.buffer = (NE10_FFT_CPX_TYPE_T *)&buffer[0];
 #if !defined(FIXED_POINT)
-      state.is_backward_scaled = 0;
+        state.is_backward_scaled = 0;
 
-      NE10_FFT_C2C_1D_TYPE_NEON((NE10_FFT_CPX_TYPE_T *)fout,
-                                (NE10_FFT_CPX_TYPE_T *)fin,
+        NE10_FFT_C2C_1D_TYPE_NEON((NE10_FFT_CPX_TYPE_T *)fout,
+            (NE10_FFT_CPX_TYPE_T *)fin,
                                 cfg, 1);
 #else
-      NE10_FFT_C2C_1D_TYPE_NEON((NE10_FFT_CPX_TYPE_T *)fout,
-                                (NE10_FFT_CPX_TYPE_T *)fin,
+        NE10_FFT_C2C_1D_TYPE_NEON((NE10_FFT_CPX_TYPE_T *)fout,
+            (NE10_FFT_CPX_TYPE_T *)fin,
                                 cfg, 1, 0);
 #endif
-   }
-   RESTORE_STACK;
+    }
+    RESTORE_STACK;
 }
diff --git a/celt/arm/celt_mdct_ne10.c b/celt/arm/celt_mdct_ne10.c
index 6cbbeef97..398696a7e 100644
--- a/celt/arm/celt_mdct_ne10.c
+++ b/celt/arm/celt_mdct_ne10.c
@@ -28,12 +28,12 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef SKIP_CONFIG_H
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+# ifdef HAVE_CONFIG_H
+#  include "config.h"
+# endif
 #endif
 
 #include "kiss_fft.h"
@@ -45,214 +45,202 @@ void clt_mdct_forward_neon(const mdct_lookup *l,
                            kiss_fft_scalar *in,
                            kiss_fft_scalar * OAC_RESTRICT out,
                            const oac_val16 *window,
-                           int overlap, int shift, int stride, int arch)
-{
-   int i;
-   int N, N2, N4;
-   VARDECL(kiss_fft_scalar, f);
-   VARDECL(kiss_fft_cpx, f2);
-   const kiss_fft_state *st = l->kfft[shift];
-   const kiss_twiddle_scalar *trig;
-
-   SAVE_STACK;
-
-   N = l->n;
-   trig = l->trig;
-   for (i=0;i<shift;i++)
-   {
-      N >>= 1;
-      trig += N;
-   }
-   N2 = N>>1;
-   N4 = N>>2;
-
-   ALLOC(f, N2, kiss_fft_scalar);
-   ALLOC(f2, N4, kiss_fft_cpx);
-
-   /* Consider the input to be composed of four blocks: [a, b, c, d] */
-   /* Window, shuffle, fold */
-   {
-      /* Temp pointers to make it really clear to the compiler what we're doing */
-      const kiss_fft_scalar * OAC_RESTRICT xp1 = in+(overlap>>1);
-      const kiss_fft_scalar * OAC_RESTRICT xp2 = in+N2-1+(overlap>>1);
-      kiss_fft_scalar * OAC_RESTRICT yp = f;
-      const oac_val16 * OAC_RESTRICT wp1 = window+(overlap>>1);
-      const oac_val16 * OAC_RESTRICT wp2 = window+(overlap>>1)-1;
-      for(i=0;i<((overlap+3)>>2);i++)
-      {
-         /* Real part arranged as -d-cR, Imag part arranged as -b+aR*/
-         *yp++ = MULT16_32_Q15(*wp2, xp1[N2]) + MULT16_32_Q15(*wp1,*xp2);
-         *yp++ = MULT16_32_Q15(*wp1, *xp1)    - MULT16_32_Q15(*wp2, xp2[-N2]);
-         xp1+=2;
-         xp2-=2;
-         wp1+=2;
-         wp2-=2;
-      }
-      wp1 = window;
-      wp2 = window+overlap-1;
-      for(;i<N4-((overlap+3)>>2);i++)
-      {
-         /* Real part arranged as a-bR, Imag part arranged as -c-dR */
-         *yp++ = *xp2;
-         *yp++ = *xp1;
-         xp1+=2;
-         xp2-=2;
-      }
-      for(;i<N4;i++)
-      {
-         /* Real part arranged as a-bR, Imag part arranged as -c-dR */
-         *yp++ =  -MULT16_32_Q15(*wp1, xp1[-N2]) + MULT16_32_Q15(*wp2, *xp2);
-         *yp++ = MULT16_32_Q15(*wp2, *xp1)     + MULT16_32_Q15(*wp1, xp2[N2]);
-         xp1+=2;
-         xp2-=2;
-         wp1+=2;
-         wp2-=2;
-      }
-   }
-   /* Pre-rotation */
-   {
-      kiss_fft_scalar * OAC_RESTRICT yp = f;
-      const kiss_twiddle_scalar *t = &trig[0];
-      for(i=0;i<N4;i++)
-      {
-         kiss_fft_cpx yc;
-         kiss_twiddle_scalar t0, t1;
-         kiss_fft_scalar re, im, yr, yi;
-         t0 = t[i];
-         t1 = t[N4+i];
-         re = *yp++;
-         im = *yp++;
-         yr = S_MUL(re,t0)  -  S_MUL(im,t1);
-         yi = S_MUL(im,t0)  +  S_MUL(re,t1);
-         yc.r = yr;
-         yc.i = yi;
-         f2[i] = yc;
-      }
-   }
-
-   oac_fft(st, f2, (kiss_fft_cpx *)f, arch);
-
-   /* Post-rotate */
-   {
-      /* Temp pointers to make it really clear to the compiler what we're doing */
-      const kiss_fft_cpx * OAC_RESTRICT fp = (kiss_fft_cpx *)f;
-      kiss_fft_scalar * OAC_RESTRICT yp1 = out;
-      kiss_fft_scalar * OAC_RESTRICT yp2 = out+stride*(N2-1);
-      const kiss_twiddle_scalar *t = &trig[0];
-      /* Temp pointers to make it really clear to the compiler what we're doing */
-      for(i=0;i<N4;i++)
-      {
-         kiss_fft_scalar yr, yi;
-         yr = S_MUL(fp->i,t[N4+i]) - S_MUL(fp->r,t[i]);
-         yi = S_MUL(fp->r,t[N4+i]) + S_MUL(fp->i,t[i]);
-         *yp1 = yr;
-         *yp2 = yi;
-         fp++;
-         yp1 += 2*stride;
-         yp2 -= 2*stride;
-      }
-   }
-   RESTORE_STACK;
+                           int overlap, int shift, int stride, int arch) {
+    int i;
+    int N, N2, N4;
+    VARDECL(kiss_fft_scalar, f);
+    VARDECL(kiss_fft_cpx, f2);
+    const kiss_fft_state *st = l->kfft[shift];
+    const kiss_twiddle_scalar *trig;
+
+    SAVE_STACK;
+
+    N = l->n;
+    trig = l->trig;
+    for (i = 0; i < shift; i++) {
+        N >>= 1;
+        trig += N;
+    }
+    N2 = N>>1;
+    N4 = N>>2;
+
+    ALLOC(f, N2, kiss_fft_scalar);
+    ALLOC(f2, N4, kiss_fft_cpx);
+
+    /* Consider the input to be composed of four blocks: [a, b, c, d] */
+    /* Window, shuffle, fold */
+    {
+        /* Temp pointers to make it really clear to the compiler what we're doing */
+        const kiss_fft_scalar * OAC_RESTRICT xp1 = in + (overlap>>1);
+        const kiss_fft_scalar * OAC_RESTRICT xp2 = in + N2 - 1 + (overlap>>1);
+        kiss_fft_scalar * OAC_RESTRICT yp = f;
+        const oac_val16 * OAC_RESTRICT wp1 = window + (overlap>>1);
+        const oac_val16 * OAC_RESTRICT wp2 = window + (overlap>>1) - 1;
+        for (i = 0; i < ((overlap + 3)>>2); i++) {
+            /* Real part arranged as -d-cR, Imag part arranged as -b+aR*/
+            *yp++ = MULT16_32_Q15(*wp2, xp1[N2]) + MULT16_32_Q15(*wp1, *xp2);
+            *yp++ = MULT16_32_Q15(*wp1, *xp1)    - MULT16_32_Q15(*wp2, xp2[-N2]);
+            xp1 += 2;
+            xp2 -= 2;
+            wp1 += 2;
+            wp2 -= 2;
+        }
+        wp1 = window;
+        wp2 = window + overlap - 1;
+        for (; i < N4 - ((overlap + 3)>>2); i++) {
+            /* Real part arranged as a-bR, Imag part arranged as -c-dR */
+            *yp++ = *xp2;
+            *yp++ = *xp1;
+            xp1 += 2;
+            xp2 -= 2;
+        }
+        for (; i < N4; i++) {
+            /* Real part arranged as a-bR, Imag part arranged as -c-dR */
+            *yp++ =  -MULT16_32_Q15(*wp1, xp1[-N2]) + MULT16_32_Q15(*wp2, *xp2);
+            *yp++ = MULT16_32_Q15(*wp2, *xp1)     + MULT16_32_Q15(*wp1, xp2[N2]);
+            xp1 += 2;
+            xp2 -= 2;
+            wp1 += 2;
+            wp2 -= 2;
+        }
+    }
+    /* Pre-rotation */
+    {
+        kiss_fft_scalar * OAC_RESTRICT yp = f;
+        const kiss_twiddle_scalar *t = &trig[0];
+        for (i = 0; i < N4; i++) {
+            kiss_fft_cpx yc;
+            kiss_twiddle_scalar t0, t1;
+            kiss_fft_scalar re, im, yr, yi;
+            t0 = t[i];
+            t1 = t[N4 + i];
+            re = *yp++;
+            im = *yp++;
+            yr = S_MUL(re, t0)  -  S_MUL(im, t1);
+            yi = S_MUL(im, t0)  +  S_MUL(re, t1);
+            yc.r = yr;
+            yc.i = yi;
+            f2[i] = yc;
+        }
+    }
+
+    oac_fft(st, f2, (kiss_fft_cpx *)f, arch);
+
+    /* Post-rotate */
+    {
+        /* Temp pointers to make it really clear to the compiler what we're doing */
+        const kiss_fft_cpx * OAC_RESTRICT fp = (kiss_fft_cpx *)f;
+        kiss_fft_scalar * OAC_RESTRICT yp1 = out;
+        kiss_fft_scalar * OAC_RESTRICT yp2 = out + stride*(N2 - 1);
+        const kiss_twiddle_scalar *t = &trig[0];
+        /* Temp pointers to make it really clear to the compiler what we're doing */
+        for (i = 0; i < N4; i++) {
+            kiss_fft_scalar yr, yi;
+            yr = S_MUL(fp->i, t[N4 + i]) - S_MUL(fp->r, t[i]);
+            yi = S_MUL(fp->r, t[N4 + i]) + S_MUL(fp->i, t[i]);
+            *yp1 = yr;
+            *yp2 = yi;
+            fp++;
+            yp1 += 2*stride;
+            yp2 -= 2*stride;
+        }
+    }
+    RESTORE_STACK;
 }
 
 void clt_mdct_backward_neon(const mdct_lookup *l,
                             kiss_fft_scalar *in,
                             kiss_fft_scalar * OAC_RESTRICT out,
                             const oac_val16 * OAC_RESTRICT window,
-                            int overlap, int shift, int stride, int arch)
-{
-   int i;
-   int N, N2, N4;
-   VARDECL(kiss_fft_scalar, f);
-   const kiss_twiddle_scalar *trig;
-   const kiss_fft_state *st = l->kfft[shift];
-
-   N = l->n;
-   trig = l->trig;
-   for (i=0;i<shift;i++)
-   {
-      N >>= 1;
-      trig += N;
-   }
-   N2 = N>>1;
-   N4 = N>>2;
-
-   ALLOC(f, N2, kiss_fft_scalar);
-
-   /* Pre-rotate */
-   {
-      /* Temp pointers to make it really clear to the compiler what we're doing */
-      const kiss_fft_scalar * OAC_RESTRICT xp1 = in;
-      const kiss_fft_scalar * OAC_RESTRICT xp2 = in+stride*(N2-1);
-      kiss_fft_scalar * OAC_RESTRICT yp = f;
-      const kiss_twiddle_scalar * OAC_RESTRICT t = &trig[0];
-      for(i=0;i<N4;i++)
-      {
-         kiss_fft_scalar yr, yi;
-         yr = S_MUL(*xp2, t[i]) + S_MUL(*xp1, t[N4+i]);
-         yi = S_MUL(*xp1, t[i]) - S_MUL(*xp2, t[N4+i]);
-         yp[2*i] = yr;
-         yp[2*i+1] = yi;
-         xp1+=2*stride;
-         xp2-=2*stride;
-      }
-   }
-
-   oac_ifft(st, (kiss_fft_cpx *)f, (kiss_fft_cpx*)(out+(overlap>>1)), arch);
-
-   /* Post-rotate and de-shuffle from both ends of the buffer at once to make
-      it in-place. */
-   {
-      kiss_fft_scalar * yp0 = out+(overlap>>1);
-      kiss_fft_scalar * yp1 = out+(overlap>>1)+N2-2;
-      const kiss_twiddle_scalar *t = &trig[0];
-      /* Loop to (N4+1)>>1 to handle odd N4. When N4 is odd, the
-         middle pair will be computed twice. */
-      for(i=0;i<(N4+1)>>1;i++)
-      {
-         kiss_fft_scalar re, im, yr, yi;
-         kiss_twiddle_scalar t0, t1;
-         re = yp0[0];
-         im = yp0[1];
-         t0 = t[i];
-         t1 = t[N4+i];
-         /* We'd scale up by 2 here, but instead it's done when mixing the windows */
-         yr = S_MUL(re,t0) + S_MUL(im,t1);
-         yi = S_MUL(re,t1) - S_MUL(im,t0);
-         re = yp1[0];
-         im = yp1[1];
-         yp0[0] = yr;
-         yp1[1] = yi;
-
-         t0 = t[(N4-i-1)];
-         t1 = t[(N2-i-1)];
-         /* We'd scale up by 2 here, but instead it's done when mixing the windows */
-         yr = S_MUL(re,t0) + S_MUL(im,t1);
-         yi = S_MUL(re,t1) - S_MUL(im,t0);
-         yp1[0] = yr;
-         yp0[1] = yi;
-         yp0 += 2;
-         yp1 -= 2;
-      }
-   }
-
-   /* Mirror on both sides for TDAC */
-   {
-      kiss_fft_scalar * OAC_RESTRICT xp1 = out+overlap-1;
-      kiss_fft_scalar * OAC_RESTRICT yp1 = out;
-      const oac_val16 * OAC_RESTRICT wp1 = window;
-      const oac_val16 * OAC_RESTRICT wp2 = window+overlap-1;
-
-      for(i = 0; i < overlap/2; i++)
-      {
-         kiss_fft_scalar x1, x2;
-         x1 = *xp1;
-         x2 = *yp1;
-         *yp1++ = MULT16_32_Q15(*wp2, x2) - MULT16_32_Q15(*wp1, x1);
-         *xp1-- = MULT16_32_Q15(*wp1, x2) + MULT16_32_Q15(*wp2, x1);
-         wp1++;
-         wp2--;
-      }
-   }
-   RESTORE_STACK;
+                            int overlap, int shift, int stride, int arch) {
+    int i;
+    int N, N2, N4;
+    VARDECL(kiss_fft_scalar, f);
+    const kiss_twiddle_scalar *trig;
+    const kiss_fft_state *st = l->kfft[shift];
+
+    N = l->n;
+    trig = l->trig;
+    for (i = 0; i < shift; i++) {
+        N >>= 1;
+        trig += N;
+    }
+    N2 = N>>1;
+    N4 = N>>2;
+
+    ALLOC(f, N2, kiss_fft_scalar);
+
+    /* Pre-rotate */
+    {
+        /* Temp pointers to make it really clear to the compiler what we're doing */
+        const kiss_fft_scalar * OAC_RESTRICT xp1 = in;
+        const kiss_fft_scalar * OAC_RESTRICT xp2 = in + stride*(N2 - 1);
+        kiss_fft_scalar * OAC_RESTRICT yp = f;
+        const kiss_twiddle_scalar * OAC_RESTRICT t = &trig[0];
+        for (i = 0; i < N4; i++) {
+            kiss_fft_scalar yr, yi;
+            yr = S_MUL(*xp2, t[i]) + S_MUL(*xp1, t[N4 + i]);
+            yi = S_MUL(*xp1, t[i]) - S_MUL(*xp2, t[N4 + i]);
+            yp[2*i] = yr;
+            yp[2*i + 1] = yi;
+            xp1 += 2*stride;
+            xp2 -= 2*stride;
+        }
+    }
+
+    oac_ifft(st, (kiss_fft_cpx *)f, (kiss_fft_cpx*)(out + (overlap>>1)), arch);
+
+    /* Post-rotate and de-shuffle from both ends of the buffer at once to make
+       it in-place. */
+    {
+        kiss_fft_scalar * yp0 = out + (overlap>>1);
+        kiss_fft_scalar * yp1 = out + (overlap>>1) + N2 - 2;
+        const kiss_twiddle_scalar *t = &trig[0];
+        /* Loop to (N4+1)>>1 to handle odd N4. When N4 is odd, the
+           middle pair will be computed twice. */
+        for (i = 0; i < (N4 + 1)>>1; i++) {
+            kiss_fft_scalar re, im, yr, yi;
+            kiss_twiddle_scalar t0, t1;
+            re = yp0[0];
+            im = yp0[1];
+            t0 = t[i];
+            t1 = t[N4 + i];
+            /* We'd scale up by 2 here, but instead it's done when mixing the windows */
+            yr = S_MUL(re, t0) + S_MUL(im, t1);
+            yi = S_MUL(re, t1) - S_MUL(im, t0);
+            re = yp1[0];
+            im = yp1[1];
+            yp0[0] = yr;
+            yp1[1] = yi;
+
+            t0 = t[(N4 - i - 1)];
+            t1 = t[(N2 - i - 1)];
+            /* We'd scale up by 2 here, but instead it's done when mixing the windows */
+            yr = S_MUL(re, t0) + S_MUL(im, t1);
+            yi = S_MUL(re, t1) - S_MUL(im, t0);
+            yp1[0] = yr;
+            yp0[1] = yi;
+            yp0 += 2;
+            yp1 -= 2;
+        }
+    }
+
+    /* Mirror on both sides for TDAC */
+    {
+        kiss_fft_scalar * OAC_RESTRICT xp1 = out + overlap - 1;
+        kiss_fft_scalar * OAC_RESTRICT yp1 = out;
+        const oac_val16 * OAC_RESTRICT wp1 = window;
+        const oac_val16 * OAC_RESTRICT wp2 = window + overlap - 1;
+
+        for (i = 0; i < overlap/2; i++) {
+            kiss_fft_scalar x1, x2;
+            x1 = *xp1;
+            x2 = *yp1;
+            *yp1++ = MULT16_32_Q15(*wp2, x2) - MULT16_32_Q15(*wp1, x1);
+            *xp1-- = MULT16_32_Q15(*wp1, x2) + MULT16_32_Q15(*wp2, x1);
+            wp1++;
+            wp2--;
+        }
+    }
+    RESTORE_STACK;
 }
diff --git a/celt/arm/celt_neon_intr.c b/celt/arm/celt_neon_intr.c
index 56d66a289..569519e24 100644
--- a/celt/arm/celt_neon_intr.c
+++ b/celt/arm/celt_neon_intr.c
@@ -29,10 +29,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <arm_neon.h>
@@ -41,250 +41,239 @@
 #include "../pitch.h"
 #include <stddef.h>
 #if defined(OAC_CHECK_ASM)
-#include <stdlib.h>
+# include <stdlib.h>
 #endif
 
 #if !defined(DISABLE_FLOAT_API) && defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 
-void celt_float2int16_neon(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt)
-{
-   int i = 0;
-
-#if defined(__ARM_NEON)
-   const int BLOCK_SIZE = 16;
-   const int blockedSize = cnt / BLOCK_SIZE * BLOCK_SIZE;
-
-   for (; i < blockedSize; i += BLOCK_SIZE)
-   {
-      float32x4_t orig_a = vld1q_f32(&in[i +  0]);
-      float32x4_t orig_b = vld1q_f32(&in[i +  4]);
-      float32x4_t orig_c = vld1q_f32(&in[i +  8]);
-      float32x4_t orig_d = vld1q_f32(&in[i + 12]);
-
-      int16x4_t asShort_a = vqmovn_s32(vroundf(vmulq_n_f32(orig_a, CELT_SIG_SCALE)));
-      int16x4_t asShort_b = vqmovn_s32(vroundf(vmulq_n_f32(orig_b, CELT_SIG_SCALE)));
-      int16x4_t asShort_c = vqmovn_s32(vroundf(vmulq_n_f32(orig_c, CELT_SIG_SCALE)));
-      int16x4_t asShort_d = vqmovn_s32(vroundf(vmulq_n_f32(orig_d, CELT_SIG_SCALE)));
-
-      vst1_s16(&out[i +  0], asShort_a);
-      vst1_s16(&out[i +  4], asShort_b);
-      vst1_s16(&out[i +  8], asShort_c);
-      vst1_s16(&out[i + 12], asShort_d);
-# if defined(OAC_CHECK_ASM)
-      short out_c[BLOCK_SIZE];
-      int j;
-      for(j = 0; j < BLOCK_SIZE; j++)
-      {
-         out_c[j] = FLOAT2INT16(in[i + j]);
-         celt_assert(abs((out_c[j] - out[i + j])) <= 1);
-      }
+void celt_float2int16_neon(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt) {
+    int i = 0;
+
+# if defined(__ARM_NEON)
+    const int BLOCK_SIZE = 16;
+    const int blockedSize = cnt/BLOCK_SIZE*BLOCK_SIZE;
+
+    for (; i < blockedSize; i += BLOCK_SIZE) {
+        float32x4_t orig_a = vld1q_f32(&in[i +  0]);
+        float32x4_t orig_b = vld1q_f32(&in[i +  4]);
+        float32x4_t orig_c = vld1q_f32(&in[i +  8]);
+        float32x4_t orig_d = vld1q_f32(&in[i + 12]);
+
+        int16x4_t asShort_a = vqmovn_s32(vroundf(vmulq_n_f32(orig_a, CELT_SIG_SCALE)));
+        int16x4_t asShort_b = vqmovn_s32(vroundf(vmulq_n_f32(orig_b, CELT_SIG_SCALE)));
+        int16x4_t asShort_c = vqmovn_s32(vroundf(vmulq_n_f32(orig_c, CELT_SIG_SCALE)));
+        int16x4_t asShort_d = vqmovn_s32(vroundf(vmulq_n_f32(orig_d, CELT_SIG_SCALE)));
+
+        vst1_s16(&out[i +  0], asShort_a);
+        vst1_s16(&out[i +  4], asShort_b);
+        vst1_s16(&out[i +  8], asShort_c);
+        vst1_s16(&out[i + 12], asShort_d);
+#  if defined(OAC_CHECK_ASM)
+        short out_c[BLOCK_SIZE];
+        int j;
+        for (j = 0; j < BLOCK_SIZE; j++) {
+            out_c[j] = FLOAT2INT16(in[i + j]);
+            celt_assert(abs((out_c[j] - out[i + j])) <= 1);
+        }
+#  endif
+    }
 # endif
-   }
-#endif
 
-   for (; i < cnt; i++)
-   {
-      out[i] = FLOAT2INT16(in[i]);
-   }
+    for (; i < cnt; i++) {
+        out[i] = FLOAT2INT16(in[i]);
+    }
 }
 
-int oac_limit2_checkwithin1_neon(float *samples, int cnt)
-{
-   const float hardclipMin = -2.0f;
-   const float hardclipMax = 2.0f;
-
-   int i = 0;
-   int exceeding1 = 0;
-   int nextIndex = 0;
-
-#if defined(__ARM_NEON)
-   const int BLOCK_SIZE = 16;
-   const int blockedSize = cnt / BLOCK_SIZE * BLOCK_SIZE;
-
-   float32x4_t min_all_0 = vdupq_n_f32(0.0f);
-   float32x4_t min_all_1 = vdupq_n_f32(0.0f);
-   float32x4_t max_all_0 = vdupq_n_f32(0.0f);
-   float32x4_t max_all_1 = vdupq_n_f32(0.0f);
-
-   float max, min;
-
-   for (i = 0; i < blockedSize; i += BLOCK_SIZE)
-   {
-      const float32x4_t orig_a = vld1q_f32(&samples[i +  0]);
-      const float32x4_t orig_b = vld1q_f32(&samples[i +  4]);
-      const float32x4_t orig_c = vld1q_f32(&samples[i +  8]);
-      const float32x4_t orig_d = vld1q_f32(&samples[i + 12]);
-      max_all_0 = vmaxq_f32(max_all_0, vmaxq_f32(orig_a, orig_b));
-      max_all_1 = vmaxq_f32(max_all_1, vmaxq_f32(orig_c, orig_d));
-      min_all_0 = vminq_f32(min_all_0, vminq_f32(orig_a, orig_b));
-      min_all_1 = vminq_f32(min_all_1, vminq_f32(orig_c, orig_d));
-   }
-
-   max = vmaxvf(vmaxq_f32(max_all_0, max_all_1));
-   min = vminvf(vminq_f32(min_all_0, min_all_1));
-
-   if (min < hardclipMin || max > hardclipMax)
-   {
-      const float32x4_t hardclipMinReg = vdupq_n_f32(hardclipMin);
-      const float32x4_t hardclipMaxReg = vdupq_n_f32(hardclipMax);
-      for (i = 0; i < blockedSize; i += BLOCK_SIZE)
-      {
-         const float32x4_t orig_a = vld1q_f32(&samples[i +  0]);
-         const float32x4_t orig_b = vld1q_f32(&samples[i +  4]);
-         const float32x4_t orig_c = vld1q_f32(&samples[i +  8]);
-         const float32x4_t orig_d = vld1q_f32(&samples[i + 12]);
-         const float32x4_t clipped_a = vminq_f32(hardclipMaxReg, vmaxq_f32(orig_a, hardclipMinReg));
-         const float32x4_t clipped_b = vminq_f32(hardclipMaxReg, vmaxq_f32(orig_b, hardclipMinReg));
-         const float32x4_t clipped_c = vminq_f32(hardclipMaxReg, vmaxq_f32(orig_c, hardclipMinReg));
-         const float32x4_t clipped_d = vminq_f32(hardclipMaxReg, vmaxq_f32(orig_d, hardclipMinReg));
-         vst1q_f32(&samples[i + 0], clipped_a);
-         vst1q_f32(&samples[i + 4], clipped_b);
-         vst1q_f32(&samples[i + 8], clipped_c);
-         vst1q_f32(&samples[i + 12], clipped_d);
-      }
-   }
-
-   nextIndex = blockedSize;
-   exceeding1 |= max > 1.0f || min < -1.0f;
+int oac_limit2_checkwithin1_neon(float *samples, int cnt) {
+    const float hardclipMin = -2.0f;
+    const float hardclipMax = 2.0f;
+
+    int i = 0;
+    int exceeding1 = 0;
+    int nextIndex = 0;
+
+# if defined(__ARM_NEON)
+    const int BLOCK_SIZE = 16;
+    const int blockedSize = cnt/BLOCK_SIZE*BLOCK_SIZE;
+
+    float32x4_t min_all_0 = vdupq_n_f32(0.0f);
+    float32x4_t min_all_1 = vdupq_n_f32(0.0f);
+    float32x4_t max_all_0 = vdupq_n_f32(0.0f);
+    float32x4_t max_all_1 = vdupq_n_f32(0.0f);
+
+    float max, min;
+
+    for (i = 0; i < blockedSize; i += BLOCK_SIZE) {
+        const float32x4_t orig_a = vld1q_f32(&samples[i +  0]);
+        const float32x4_t orig_b = vld1q_f32(&samples[i +  4]);
+        const float32x4_t orig_c = vld1q_f32(&samples[i +  8]);
+        const float32x4_t orig_d = vld1q_f32(&samples[i + 12]);
+        max_all_0 = vmaxq_f32(max_all_0, vmaxq_f32(orig_a, orig_b));
+        max_all_1 = vmaxq_f32(max_all_1, vmaxq_f32(orig_c, orig_d));
+        min_all_0 = vminq_f32(min_all_0, vminq_f32(orig_a, orig_b));
+        min_all_1 = vminq_f32(min_all_1, vminq_f32(orig_c, orig_d));
+    }
+
+    max = vmaxvf(vmaxq_f32(max_all_0, max_all_1));
+    min = vminvf(vminq_f32(min_all_0, min_all_1));
+
+    if (min < hardclipMin || max > hardclipMax) {
+        const float32x4_t hardclipMinReg = vdupq_n_f32(hardclipMin);
+        const float32x4_t hardclipMaxReg = vdupq_n_f32(hardclipMax);
+        for (i = 0; i < blockedSize; i += BLOCK_SIZE) {
+            const float32x4_t orig_a = vld1q_f32(&samples[i +  0]);
+            const float32x4_t orig_b = vld1q_f32(&samples[i +  4]);
+            const float32x4_t orig_c = vld1q_f32(&samples[i +  8]);
+            const float32x4_t orig_d = vld1q_f32(&samples[i + 12]);
+            const float32x4_t clipped_a = vminq_f32(hardclipMaxReg, vmaxq_f32(orig_a, hardclipMinReg));
+            const float32x4_t clipped_b = vminq_f32(hardclipMaxReg, vmaxq_f32(orig_b, hardclipMinReg));
+            const float32x4_t clipped_c = vminq_f32(hardclipMaxReg, vmaxq_f32(orig_c, hardclipMinReg));
+            const float32x4_t clipped_d = vminq_f32(hardclipMaxReg, vmaxq_f32(orig_d, hardclipMinReg));
+            vst1q_f32(&samples[i + 0], clipped_a);
+            vst1q_f32(&samples[i + 4], clipped_b);
+            vst1q_f32(&samples[i + 8], clipped_c);
+            vst1q_f32(&samples[i + 12], clipped_d);
+        }
+    }
+
+    nextIndex = blockedSize;
+    exceeding1 |= max > 1.0f || min < -1.0f;
 
-#endif
+# endif
 
-   for (i = nextIndex; i < cnt; i++)
-   {
-      const float origVal = samples[i];
-      float clippedVal = origVal;
-      clippedVal = MAX16(hardclipMin, clippedVal);
-      clippedVal = MIN16(hardclipMax, clippedVal);
-      samples[i] = clippedVal;
+    for (i = nextIndex; i < cnt; i++) {
+        const float origVal = samples[i];
+        float clippedVal = origVal;
+        clippedVal = MAX16(hardclipMin, clippedVal);
+        clippedVal = MIN16(hardclipMax, clippedVal);
+        samples[i] = clippedVal;
 
-      exceeding1 |= origVal > 1.0f || origVal < -1.0f;
-   }
+        exceeding1 |= origVal > 1.0f || origVal < -1.0f;
+    }
 
-   return !exceeding1;
+    return !exceeding1;
 }
 
 #endif
 
 
 #if defined(FIXED_POINT)
-#include <string.h>
-
-void xcorr_kernel_neon_fixed(const oac_val16 * x, const oac_val16 * y, oac_val32 sum[4], int len)
-{
-   int j;
-   int32x4_t a = vld1q_s32(sum);
-   /* Load y[0...3] */
-   /* This requires len>0 to always be valid (which we assert in the C code). */
-   int16x4_t y0 = vld1_s16(y);
-   y += 4;
-
-   /* This loop loads one y value more than we actually need.
-      Therefore we have to stop as soon as there are 8 or fewer samples left
-       (instead of 7), to avoid reading past the end of the array. */
-   for (j = 0; j + 8 < len; j += 8)
-   {
-      /* Load x[0...7] */
-      int16x8_t xx = vld1q_s16(x);
-      int16x4_t x0 = vget_low_s16(xx);
-      int16x4_t x4 = vget_high_s16(xx);
-      /* Load y[4...11] */
-      int16x8_t yy = vld1q_s16(y);
-      int16x4_t y4 = vget_low_s16(yy);
-      int16x4_t y8 = vget_high_s16(yy);
-      int32x4_t a0 = vmlal_lane_s16(a, y0, x0, 0);
-      int32x4_t a1 = vmlal_lane_s16(a0, y4, x4, 0);
-
-      int16x4_t y1 = vext_s16(y0, y4, 1);
-      int16x4_t y5 = vext_s16(y4, y8, 1);
-      int32x4_t a2 = vmlal_lane_s16(a1, y1, x0, 1);
-      int32x4_t a3 = vmlal_lane_s16(a2, y5, x4, 1);
-
-      int16x4_t y2 = vext_s16(y0, y4, 2);
-      int16x4_t y6 = vext_s16(y4, y8, 2);
-      int32x4_t a4 = vmlal_lane_s16(a3, y2, x0, 2);
-      int32x4_t a5 = vmlal_lane_s16(a4, y6, x4, 2);
-
-      int16x4_t y3 = vext_s16(y0, y4, 3);
-      int16x4_t y7 = vext_s16(y4, y8, 3);
-      int32x4_t a6 = vmlal_lane_s16(a5, y3, x0, 3);
-      int32x4_t a7 = vmlal_lane_s16(a6, y7, x4, 3);
-
-      y0 = y8;
-      a = a7;
-      x += 8;
-      y += 8;
-   }
-   if (j + 4 < len) {
-      /* Load x[0...3] */
-      int16x4_t x0 = vld1_s16(x);
-      /* Load y[4...7] */
-      int16x4_t y4 = vld1_s16(y);
-      int32x4_t a0 = vmlal_lane_s16(a, y0, x0, 0);
-      int16x4_t y1 = vext_s16(y0, y4, 1);
-      int32x4_t a1 = vmlal_lane_s16(a0, y1, x0, 1);
-      int16x4_t y2 = vext_s16(y0, y4, 2);
-      int32x4_t a2 = vmlal_lane_s16(a1, y2, x0, 2);
-      int16x4_t y3 = vext_s16(y0, y4, 3);
-      int32x4_t a3 = vmlal_lane_s16(a2, y3, x0, 3);
-      y0 = y4;
-      a = a3;
-      x += 4;
-      y += 4;
-      j += 4;
-   }
-   if (j + 2 < len) {
-      /* Load x[0...1] */
-      int16x4x2_t xx = vld2_dup_s16(x);
-      int16x4_t x0 = xx.val[0];
-      int16x4_t x1 = xx.val[1];
-      /* Load y[4...5].
-         We would like to use vld1_dup_s32(), but casting the pointer would
-          break strict aliasing rules and potentially have alignment issues.
-         Fortunately the compiler seems capable of translating this memcpy()
-          and vdup_n_s32() into the equivalent vld1_dup_s32().*/
-      int32_t yy;
-      memcpy(&yy, y, sizeof(yy));
-      int16x4_t y4 = vreinterpret_s16_s32(vdup_n_s32(yy));
-      int32x4_t a0 = vmlal_s16(a, y0, x0);
-      int16x4_t y1 = vext_s16(y0, y4, 1);
-      /* Replace bottom copy of {y[5], y[4]} in y4 with {y[3], y[2]} from y0,
-          using VSRI instead of VEXT, since it's a data-processing
-          instruction. */
-      y0 = vreinterpret_s16_s64(vsri_n_s64(vreinterpret_s64_s16(y4),
+# include <string.h>
+
+void xcorr_kernel_neon_fixed(const oac_val16 * x, const oac_val16 * y, oac_val32 sum[4], int len) {
+    int j;
+    int32x4_t a = vld1q_s32(sum);
+    /* Load y[0...3] */
+    /* This requires len>0 to always be valid (which we assert in the C code). */
+    int16x4_t y0 = vld1_s16(y);
+    y += 4;
+
+    /* This loop loads one y value more than we actually need.
+       Therefore we have to stop as soon as there are 8 or fewer samples left
+        (instead of 7), to avoid reading past the end of the array. */
+    for (j = 0; j + 8 < len; j += 8) {
+        /* Load x[0...7] */
+        int16x8_t xx = vld1q_s16(x);
+        int16x4_t x0 = vget_low_s16(xx);
+        int16x4_t x4 = vget_high_s16(xx);
+        /* Load y[4...11] */
+        int16x8_t yy = vld1q_s16(y);
+        int16x4_t y4 = vget_low_s16(yy);
+        int16x4_t y8 = vget_high_s16(yy);
+        int32x4_t a0 = vmlal_lane_s16(a, y0, x0, 0);
+        int32x4_t a1 = vmlal_lane_s16(a0, y4, x4, 0);
+
+        int16x4_t y1 = vext_s16(y0, y4, 1);
+        int16x4_t y5 = vext_s16(y4, y8, 1);
+        int32x4_t a2 = vmlal_lane_s16(a1, y1, x0, 1);
+        int32x4_t a3 = vmlal_lane_s16(a2, y5, x4, 1);
+
+        int16x4_t y2 = vext_s16(y0, y4, 2);
+        int16x4_t y6 = vext_s16(y4, y8, 2);
+        int32x4_t a4 = vmlal_lane_s16(a3, y2, x0, 2);
+        int32x4_t a5 = vmlal_lane_s16(a4, y6, x4, 2);
+
+        int16x4_t y3 = vext_s16(y0, y4, 3);
+        int16x4_t y7 = vext_s16(y4, y8, 3);
+        int32x4_t a6 = vmlal_lane_s16(a5, y3, x0, 3);
+        int32x4_t a7 = vmlal_lane_s16(a6, y7, x4, 3);
+
+        y0 = y8;
+        a = a7;
+        x += 8;
+        y += 8;
+    }
+    if (j + 4 < len) {
+        /* Load x[0...3] */
+        int16x4_t x0 = vld1_s16(x);
+        /* Load y[4...7] */
+        int16x4_t y4 = vld1_s16(y);
+        int32x4_t a0 = vmlal_lane_s16(a, y0, x0, 0);
+        int16x4_t y1 = vext_s16(y0, y4, 1);
+        int32x4_t a1 = vmlal_lane_s16(a0, y1, x0, 1);
+        int16x4_t y2 = vext_s16(y0, y4, 2);
+        int32x4_t a2 = vmlal_lane_s16(a1, y2, x0, 2);
+        int16x4_t y3 = vext_s16(y0, y4, 3);
+        int32x4_t a3 = vmlal_lane_s16(a2, y3, x0, 3);
+        y0 = y4;
+        a = a3;
+        x += 4;
+        y += 4;
+        j += 4;
+    }
+    if (j + 2 < len) {
+        /* Load x[0...1] */
+        int16x4x2_t xx = vld2_dup_s16(x);
+        int16x4_t x0 = xx.val[0];
+        int16x4_t x1 = xx.val[1];
+        /* Load y[4...5].
+           We would like to use vld1_dup_s32(), but casting the pointer would
+            break strict aliasing rules and potentially have alignment issues.
+           Fortunately the compiler seems capable of translating this memcpy()
+            and vdup_n_s32() into the equivalent vld1_dup_s32().*/
+        int32_t yy;
+        memcpy(&yy, y, sizeof(yy));
+        int16x4_t y4 = vreinterpret_s16_s32(vdup_n_s32(yy));
+        int32x4_t a0 = vmlal_s16(a, y0, x0);
+        int16x4_t y1 = vext_s16(y0, y4, 1);
+        /* Replace bottom copy of {y[5], y[4]} in y4 with {y[3], y[2]} from y0,
+            using VSRI instead of VEXT, since it's a data-processing
+            instruction. */
+        y0 = vreinterpret_s16_s64(vsri_n_s64(vreinterpret_s64_s16(y4),
        vreinterpret_s64_s16(y0), 32));
-      int32x4_t a1 = vmlal_s16(a0, y1, x1);
-      a = a1;
-      x += 2;
-      y += 2;
-      j += 2;
-   }
-   if (j + 1 < len) {
-      /* Load next x. */
-      int16x4_t x0 = vld1_dup_s16(x);
-      int32x4_t a0 = vmlal_s16(a, y0, x0);
-      /* Load last y. */
-      int16x4_t y4 = vld1_dup_s16(y);
-      y0 = vreinterpret_s16_s64(vsri_n_s64(vreinterpret_s64_s16(y4),
+        int32x4_t a1 = vmlal_s16(a0, y1, x1);
+        a = a1;
+        x += 2;
+        y += 2;
+        j += 2;
+    }
+    if (j + 1 < len) {
+        /* Load next x. */
+        int16x4_t x0 = vld1_dup_s16(x);
+        int32x4_t a0 = vmlal_s16(a, y0, x0);
+        /* Load last y. */
+        int16x4_t y4 = vld1_dup_s16(y);
+        y0 = vreinterpret_s16_s64(vsri_n_s64(vreinterpret_s64_s16(y4),
        vreinterpret_s64_s16(y0), 16));
-      a = a0;
-      x++;
-   }
-   /* Load last x. */
-   int16x4_t x0 = vld1_dup_s16(x);
-   int32x4_t a0 = vmlal_s16(a, y0, x0);
-   vst1q_s32(sum, a0);
+        a = a0;
+        x++;
+    }
+    /* Load last x. */
+    int16x4_t x0 = vld1_dup_s16(x);
+    int32x4_t a0 = vmlal_s16(a, y0, x0);
+    vst1q_s32(sum, a0);
 }
 
 #else
 
-#if defined(__ARM_FEATURE_FMA) && defined(__ARM_ARCH_ISA_A64)
+# if defined(__ARM_FEATURE_FMA) && defined(__ARM_ARCH_ISA_A64)
 /* If we can, force the compiler to use an FMA instruction rather than break
  *    vmlaq_f32() into fmul/fadd. */
-#ifdef vmlaq_lane_f32
-#undef vmlaq_lane_f32
-#endif
-#define vmlaq_lane_f32(a,b,c,lane) vfmaq_lane_f32(a,b,c,lane)
-#endif
+#  ifdef vmlaq_lane_f32
+#   undef vmlaq_lane_f32
+#  endif
+#  define vmlaq_lane_f32(a, b, c, lane) vfmaq_lane_f32(a, b, c, lane)
+# endif
 
 
 /*
@@ -293,109 +282,109 @@ void xcorr_kernel_neon_fixed(const oac_val16 * x, const oac_val16 * y, oac_val32
  * Computes 4 correlation values and stores them in sum[4]
  */
 static void xcorr_kernel_neon_float(const float32_t *x, const float32_t *y,
-      float32_t sum[4], int len) {
-   float32x4_t YY[3];
-   float32x4_t YEXT[3];
-   float32x4_t XX[2];
-   float32x2_t XX_2;
-   float32x4_t SUMM;
-   const float32_t *xi = x;
-   const float32_t *yi = y;
-
-   celt_assert(len>0);
-
-   YY[0] = vld1q_f32(yi);
-   SUMM = vdupq_n_f32(0);
-
-   /* Consume 8 elements in x vector and 12 elements in y
-    * vector. However, the 12'th element never really gets
-    * touched in this loop. So, if len == 8, then we only
-    * must access y[0] to y[10]. y[11] must not be accessed
-    * hence make sure len > 8 and not len >= 8
-    */
-   while (len > 8) {
-      yi += 4;
-      YY[1] = vld1q_f32(yi);
-      yi += 4;
-      YY[2] = vld1q_f32(yi);
-
-      XX[0] = vld1q_f32(xi);
-      xi += 4;
-      XX[1] = vld1q_f32(xi);
-      xi += 4;
-
-      SUMM = vmlaq_lane_f32(SUMM, YY[0], vget_low_f32(XX[0]), 0);
-      YEXT[0] = vextq_f32(YY[0], YY[1], 1);
-      SUMM = vmlaq_lane_f32(SUMM, YEXT[0], vget_low_f32(XX[0]), 1);
-      YEXT[1] = vextq_f32(YY[0], YY[1], 2);
-      SUMM = vmlaq_lane_f32(SUMM, YEXT[1], vget_high_f32(XX[0]), 0);
-      YEXT[2] = vextq_f32(YY[0], YY[1], 3);
-      SUMM = vmlaq_lane_f32(SUMM, YEXT[2], vget_high_f32(XX[0]), 1);
-
-      SUMM = vmlaq_lane_f32(SUMM, YY[1], vget_low_f32(XX[1]), 0);
-      YEXT[0] = vextq_f32(YY[1], YY[2], 1);
-      SUMM = vmlaq_lane_f32(SUMM, YEXT[0], vget_low_f32(XX[1]), 1);
-      YEXT[1] = vextq_f32(YY[1], YY[2], 2);
-      SUMM = vmlaq_lane_f32(SUMM, YEXT[1], vget_high_f32(XX[1]), 0);
-      YEXT[2] = vextq_f32(YY[1], YY[2], 3);
-      SUMM = vmlaq_lane_f32(SUMM, YEXT[2], vget_high_f32(XX[1]), 1);
-
-      YY[0] = YY[2];
-      len -= 8;
-   }
-
-   /* Consume 4 elements in x vector and 8 elements in y
-    * vector. However, the 8'th element in y never really gets
-    * touched in this loop. So, if len == 4, then we only
-    * must access y[0] to y[6]. y[7] must not be accessed
-    * hence make sure len>4 and not len>=4
-    */
-   if (len > 4) {
-      yi += 4;
-      YY[1] = vld1q_f32(yi);
-
-      XX[0] = vld1q_f32(xi);
-      xi += 4;
-
-      SUMM = vmlaq_lane_f32(SUMM, YY[0], vget_low_f32(XX[0]), 0);
-      YEXT[0] = vextq_f32(YY[0], YY[1], 1);
-      SUMM = vmlaq_lane_f32(SUMM, YEXT[0], vget_low_f32(XX[0]), 1);
-      YEXT[1] = vextq_f32(YY[0], YY[1], 2);
-      SUMM = vmlaq_lane_f32(SUMM, YEXT[1], vget_high_f32(XX[0]), 0);
-      YEXT[2] = vextq_f32(YY[0], YY[1], 3);
-      SUMM = vmlaq_lane_f32(SUMM, YEXT[2], vget_high_f32(XX[0]), 1);
-
-      YY[0] = YY[1];
-      len -= 4;
-   }
-
-   while (--len > 0) {
-      XX_2 = vld1_dup_f32(xi++);
-      SUMM = vmlaq_lane_f32(SUMM, YY[0], XX_2, 0);
-      YY[0]= vld1q_f32(++yi);
-   }
-
-   XX_2 = vld1_dup_f32(xi);
-   SUMM = vmlaq_lane_f32(SUMM, YY[0], XX_2, 0);
-
-   vst1q_f32(sum, SUMM);
+                                    float32_t sum[4], int len) {
+    float32x4_t YY[3];
+    float32x4_t YEXT[3];
+    float32x4_t XX[2];
+    float32x2_t XX_2;
+    float32x4_t SUMM;
+    const float32_t *xi = x;
+    const float32_t *yi = y;
+
+    celt_assert(len > 0);
+
+    YY[0] = vld1q_f32(yi);
+    SUMM = vdupq_n_f32(0);
+
+    /* Consume 8 elements in x vector and 12 elements in y
+     * vector. However, the 12'th element never really gets
+     * touched in this loop. So, if len == 8, then we only
+     * must access y[0] to y[10]. y[11] must not be accessed
+     * hence make sure len > 8 and not len >= 8
+     */
+    while (len > 8) {
+        yi += 4;
+        YY[1] = vld1q_f32(yi);
+        yi += 4;
+        YY[2] = vld1q_f32(yi);
+
+        XX[0] = vld1q_f32(xi);
+        xi += 4;
+        XX[1] = vld1q_f32(xi);
+        xi += 4;
+
+        SUMM = vmlaq_lane_f32(SUMM, YY[0], vget_low_f32(XX[0]), 0);
+        YEXT[0] = vextq_f32(YY[0], YY[1], 1);
+        SUMM = vmlaq_lane_f32(SUMM, YEXT[0], vget_low_f32(XX[0]), 1);
+        YEXT[1] = vextq_f32(YY[0], YY[1], 2);
+        SUMM = vmlaq_lane_f32(SUMM, YEXT[1], vget_high_f32(XX[0]), 0);
+        YEXT[2] = vextq_f32(YY[0], YY[1], 3);
+        SUMM = vmlaq_lane_f32(SUMM, YEXT[2], vget_high_f32(XX[0]), 1);
+
+        SUMM = vmlaq_lane_f32(SUMM, YY[1], vget_low_f32(XX[1]), 0);
+        YEXT[0] = vextq_f32(YY[1], YY[2], 1);
+        SUMM = vmlaq_lane_f32(SUMM, YEXT[0], vget_low_f32(XX[1]), 1);
+        YEXT[1] = vextq_f32(YY[1], YY[2], 2);
+        SUMM = vmlaq_lane_f32(SUMM, YEXT[1], vget_high_f32(XX[1]), 0);
+        YEXT[2] = vextq_f32(YY[1], YY[2], 3);
+        SUMM = vmlaq_lane_f32(SUMM, YEXT[2], vget_high_f32(XX[1]), 1);
+
+        YY[0] = YY[2];
+        len -= 8;
+    }
+
+    /* Consume 4 elements in x vector and 8 elements in y
+     * vector. However, the 8'th element in y never really gets
+     * touched in this loop. So, if len == 4, then we only
+     * must access y[0] to y[6]. y[7] must not be accessed
+     * hence make sure len>4 and not len>=4
+     */
+    if (len > 4) {
+        yi += 4;
+        YY[1] = vld1q_f32(yi);
+
+        XX[0] = vld1q_f32(xi);
+        xi += 4;
+
+        SUMM = vmlaq_lane_f32(SUMM, YY[0], vget_low_f32(XX[0]), 0);
+        YEXT[0] = vextq_f32(YY[0], YY[1], 1);
+        SUMM = vmlaq_lane_f32(SUMM, YEXT[0], vget_low_f32(XX[0]), 1);
+        YEXT[1] = vextq_f32(YY[0], YY[1], 2);
+        SUMM = vmlaq_lane_f32(SUMM, YEXT[1], vget_high_f32(XX[0]), 0);
+        YEXT[2] = vextq_f32(YY[0], YY[1], 3);
+        SUMM = vmlaq_lane_f32(SUMM, YEXT[2], vget_high_f32(XX[0]), 1);
+
+        YY[0] = YY[1];
+        len -= 4;
+    }
+
+    while (--len > 0) {
+        XX_2 = vld1_dup_f32(xi++);
+        SUMM = vmlaq_lane_f32(SUMM, YY[0], XX_2, 0);
+        YY[0] = vld1q_f32(++yi);
+    }
+
+    XX_2 = vld1_dup_f32(xi);
+    SUMM = vmlaq_lane_f32(SUMM, YY[0], XX_2, 0);
+
+    vst1q_f32(sum, SUMM);
 }
 
 void celt_pitch_xcorr_float_neon(const oac_val16 *_x, const oac_val16 *_y,
-                        oac_val32 *xcorr, int len, int max_pitch, int arch) {
-   int i;
-   (void)arch;
-   celt_assert(max_pitch > 0);
-   celt_sig_assert((((size_t)_x)&3)==0);
-
-   for (i = 0; i < (max_pitch-3); i += 4) {
-      xcorr_kernel_neon_float((const float32_t *)_x, (const float32_t *)_y+i,
-            (float32_t *)xcorr+i, len);
-   }
-
-   /* In case max_pitch isn't a multiple of 4, do non-unrolled version. */
-   for (; i < max_pitch; i++) {
-      xcorr[i] = celt_inner_prod_neon(_x, _y+i, len);
-   }
+                                 oac_val32 *xcorr, int len, int max_pitch, int arch) {
+    int i;
+    (void)arch;
+    celt_assert(max_pitch > 0);
+    celt_sig_assert((((size_t)_x)&3) == 0);
+
+    for (i = 0; i < (max_pitch - 3); i += 4) {
+        xcorr_kernel_neon_float((const float32_t *)_x, (const float32_t *)_y + i,
+            (float32_t *)xcorr + i, len);
+    }
+
+    /* In case max_pitch isn't a multiple of 4, do non-unrolled version. */
+    for (; i < max_pitch; i++) {
+        xcorr[i] = celt_inner_prod_neon(_x, _y + i, len);
+    }
 }
 #endif
diff --git a/celt/arm/fft_arm.h b/celt/arm/fft_arm.h
index 55eb14aac..e7653c780 100644
--- a/celt/arm/fft_arm.h
+++ b/celt/arm/fft_arm.h
@@ -28,7 +28,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 
 #if !defined(FFT_ARM_H)
@@ -42,29 +42,29 @@ int oac_fft_alloc_arm_neon(kiss_fft_state *st);
 void oac_fft_free_arm_neon(kiss_fft_state *st);
 
 void oac_fft_neon(const kiss_fft_state *st,
-                   const kiss_fft_cpx *fin,
-                   kiss_fft_cpx *fout);
+    const kiss_fft_cpx *fin,
+    kiss_fft_cpx *fout);
 
 void oac_ifft_neon(const kiss_fft_state *st,
-                    const kiss_fft_cpx *fin,
-                    kiss_fft_cpx *fout);
+    const kiss_fft_cpx *fin,
+    kiss_fft_cpx *fout);
 
-#if !defined(OAC_HAVE_RTCD)
-#define OVERRIDE_OAC_FFT (1)
+# if !defined(OAC_HAVE_RTCD)
+#  define OVERRIDE_OAC_FFT (1)
 
-#define oac_fft_alloc_arch(_st, arch) \
-   ((void)(arch), oac_fft_alloc_arm_neon(_st))
+#  define oac_fft_alloc_arch(_st, arch) \
+        ((void)(arch), oac_fft_alloc_arm_neon(_st))
 
-#define oac_fft_free_arch(_st, arch) \
-   ((void)(arch), oac_fft_free_arm_neon(_st))
+#  define oac_fft_free_arch(_st, arch) \
+        ((void)(arch), oac_fft_free_arm_neon(_st))
 
-#define oac_fft(_st, _fin, _fout, arch) \
-   ((void)(arch), oac_fft_neon(_st, _fin, _fout))
+#  define oac_fft(_st, _fin, _fout, arch) \
+        ((void)(arch), oac_fft_neon(_st, _fin, _fout))
 
-#define oac_ifft(_st, _fin, _fout, arch) \
-   ((void)(arch), oac_ifft_neon(_st, _fin, _fout))
+#  define oac_ifft(_st, _fin, _fout, arch) \
+        ((void)(arch), oac_ifft_neon(_st, _fin, _fout))
 
-#endif /* OAC_HAVE_RTCD */
+# endif /* OAC_HAVE_RTCD */
 
 #endif /* HAVE_ARM_NE10 */
 
diff --git a/celt/arm/fixed_arm64.h b/celt/arm/fixed_arm64.h
index c6fbd3db2..d3de750ea 100644
--- a/celt/arm/fixed_arm64.h
+++ b/celt/arm/fixed_arm64.h
@@ -22,7 +22,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef FIXED_ARM64_H
 #define FIXED_ARM64_H
diff --git a/celt/arm/fixed_armv4.h b/celt/arm/fixed_armv4.h
index 0dfe5e6a3..618283c0b 100644
--- a/celt/arm/fixed_armv4.h
+++ b/celt/arm/fixed_armv4.h
@@ -22,42 +22,40 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef FIXED_ARMv4_H
 #define FIXED_ARMv4_H
 
 /** 16x32 multiplication, followed by a 16-bit shift right. Results fits in 32 bits */
 #undef MULT16_32_Q16
-static OAC_INLINE oac_val32 MULT16_32_Q16_armv4(oac_val16 a, oac_val32 b)
-{
-  unsigned rd_lo;
-  int rd_hi;
-  __asm__(
-      "#MULT16_32_Q16\n\t"
-      "smull %0, %1, %2, %3\n\t"
-      : "=&r"(rd_lo), "=&r"(rd_hi)
-      : "%r"(b),"r"(SHL32(a,16))
-  );
-  return rd_hi;
+static OAC_INLINE oac_val32 MULT16_32_Q16_armv4(oac_val16 a, oac_val32 b) {
+    unsigned rd_lo;
+    int rd_hi;
+    __asm__ (
+        "#MULT16_32_Q16\n\t"
+        "smull %0, %1, %2, %3\n\t"
+        : "=&r" (rd_lo), "=&r" (rd_hi)
+        : "%r" (b), "r" (SHL32(a, 16))
+        );
+    return rd_hi;
 }
 #define MULT16_32_Q16(a, b) (MULT16_32_Q16_armv4(a, b))
 
 
 /** 16x32 multiplication, followed by a 15-bit shift right. Results fits in 32 bits */
 #undef MULT16_32_Q15
-static OAC_INLINE oac_val32 MULT16_32_Q15_armv4(oac_val16 a, oac_val32 b)
-{
-  unsigned rd_lo;
-  int rd_hi;
-  __asm__(
-      "#MULT16_32_Q15\n\t"
-      "smull %0, %1, %2, %3\n\t"
-      : "=&r"(rd_lo), "=&r"(rd_hi)
-      : "%r"(b), "r"(SHL32(a,16))
-  );
-  /*We intentionally don't OR in the high bit of rd_lo for speed.*/
-  return SHL32(rd_hi,1);
+static OAC_INLINE oac_val32 MULT16_32_Q15_armv4(oac_val16 a, oac_val32 b) {
+    unsigned rd_lo;
+    int rd_hi;
+    __asm__ (
+        "#MULT16_32_Q15\n\t"
+        "smull %0, %1, %2, %3\n\t"
+        : "=&r" (rd_lo), "=&r" (rd_hi)
+        : "%r" (b), "r" (SHL32(a, 16))
+        );
+    /*We intentionally don't OR in the high bit of rd_lo for speed.*/
+    return SHL32(rd_hi, 1);
 }
 #define MULT16_32_Q15(a, b) (MULT16_32_Q15_armv4(a, b))
 
@@ -75,6 +73,6 @@ static OAC_INLINE oac_val32 MULT16_32_Q15_armv4(oac_val16 a, oac_val32 b)
 
 /** 32x32 multiplication, followed by a 31-bit shift right. Results fits in 32 bits */
 #undef MULT32_32_Q31
-#define MULT32_32_Q31(a,b) (oac_val32)((((oac_int64)(a)) * ((oac_int64)(b)))>>31)
+#define MULT32_32_Q31(a, b) (oac_val32)((((oac_int64)(a))*((oac_int64)(b)))>>31)
 
 #endif
diff --git a/celt/arm/fixed_armv5e.h b/celt/arm/fixed_armv5e.h
index c68a18d80..8680f83b6 100644
--- a/celt/arm/fixed_armv5e.h
+++ b/celt/arm/fixed_armv5e.h
@@ -25,7 +25,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef FIXED_ARMv5E_H
 #define FIXED_ARMv5E_H
@@ -34,32 +34,30 @@
 
 /** 16x32 multiplication, followed by a 16-bit shift right. Results fits in 32 bits */
 #undef MULT16_32_Q16
-static OAC_INLINE oac_val32 MULT16_32_Q16_armv5e(oac_val16 a, oac_val32 b)
-{
-  int res;
-  __asm__(
-      "#MULT16_32_Q16\n\t"
-      "smulwb %0, %1, %2\n\t"
-      : "=r"(res)
-      : "r"(b),"r"(a)
-  );
-  return res;
+static OAC_INLINE oac_val32 MULT16_32_Q16_armv5e(oac_val16 a, oac_val32 b) {
+    int res;
+    __asm__ (
+        "#MULT16_32_Q16\n\t"
+        "smulwb %0, %1, %2\n\t"
+        : "=r" (res)
+        : "r" (b), "r" (a)
+        );
+    return res;
 }
 #define MULT16_32_Q16(a, b) (MULT16_32_Q16_armv5e(a, b))
 
 
 /** 16x32 multiplication, followed by a 15-bit shift right. Results fits in 32 bits */
 #undef MULT16_32_Q15
-static OAC_INLINE oac_val32 MULT16_32_Q15_armv5e(oac_val16 a, oac_val32 b)
-{
-  int res;
-  __asm__(
-      "#MULT16_32_Q15\n\t"
-      "smulwb %0, %1, %2\n\t"
-      : "=r"(res)
-      : "r"(b), "r"(a)
-  );
-  return SHL32(res,1);
+static OAC_INLINE oac_val32 MULT16_32_Q15_armv5e(oac_val16 a, oac_val32 b) {
+    int res;
+    __asm__ (
+        "#MULT16_32_Q15\n\t"
+        "smulwb %0, %1, %2\n\t"
+        : "=r" (res)
+        : "r" (b), "r" (a)
+        );
+    return SHL32(res, 1);
 }
 #define MULT16_32_Q15(a, b) (MULT16_32_Q15_armv5e(a, b))
 
@@ -69,16 +67,15 @@ static OAC_INLINE oac_val32 MULT16_32_Q15_armv5e(oac_val16 a, oac_val32 b)
     Result fits in 32 bits. */
 #undef MAC16_32_Q15
 static OAC_INLINE oac_val32 MAC16_32_Q15_armv5e(oac_val32 c, oac_val16 a,
- oac_val32 b)
-{
-  int res;
-  __asm__(
-      "#MAC16_32_Q15\n\t"
-      "smlawb %0, %1, %2, %3;\n"
-      : "=r"(res)
-      : "r"(SHL32(b,1)), "r"(a), "r"(c)
-  );
-  return res;
+                                                oac_val32 b) {
+    int res;
+    __asm__ (
+        "#MAC16_32_Q15\n\t"
+        "smlawb %0, %1, %2, %3;\n"
+        : "=r" (res)
+        : "r" (SHL32(b, 1)), "r" (a), "r" (c)
+        );
+    return res;
 }
 #define MAC16_32_Q15(c, a, b) (MAC16_32_Q15_armv5e(c, a, b))
 
@@ -86,65 +83,61 @@ static OAC_INLINE oac_val32 MAC16_32_Q15_armv5e(oac_val32 c, oac_val16 a,
     Result fits in 32 bits. */
 #undef MAC16_32_Q16
 static OAC_INLINE oac_val32 MAC16_32_Q16_armv5e(oac_val32 c, oac_val16 a,
- oac_val32 b)
-{
-  int res;
-  __asm__(
-      "#MAC16_32_Q16\n\t"
-      "smlawb %0, %1, %2, %3;\n"
-      : "=r"(res)
-      : "r"(b), "r"(a), "r"(c)
-  );
-  return res;
+                                                oac_val32 b) {
+    int res;
+    __asm__ (
+        "#MAC16_32_Q16\n\t"
+        "smlawb %0, %1, %2, %3;\n"
+        : "=r" (res)
+        : "r" (b), "r" (a), "r" (c)
+        );
+    return res;
 }
 #define MAC16_32_Q16(c, a, b) (MAC16_32_Q16_armv5e(c, a, b))
 
 /** 16x16 multiply-add where the result fits in 32 bits */
 #undef MAC16_16
 static OAC_INLINE oac_val32 MAC16_16_armv5e(oac_val32 c, oac_val16 a,
- oac_val16 b)
-{
-  int res;
-  __asm__(
-      "#MAC16_16\n\t"
-      "smlabb %0, %1, %2, %3;\n"
-      : "=r"(res)
-      : "r"(a), "r"(b), "r"(c)
-  );
-  return res;
+                                            oac_val16 b) {
+    int res;
+    __asm__ (
+        "#MAC16_16\n\t"
+        "smlabb %0, %1, %2, %3;\n"
+        : "=r" (res)
+        : "r" (a), "r" (b), "r" (c)
+        );
+    return res;
 }
 #define MAC16_16(c, a, b) (MAC16_16_armv5e(c, a, b))
 
 /** 16x16 multiplication where the result fits in 32 bits */
 #undef MULT16_16
-static OAC_INLINE oac_val32 MULT16_16_armv5e(oac_val16 a, oac_val16 b)
-{
-  int res;
-  __asm__(
-      "#MULT16_16\n\t"
-      "smulbb %0, %1, %2;\n"
-      : "=r"(res)
-      : "r"(a), "r"(b)
-  );
-  return res;
+static OAC_INLINE oac_val32 MULT16_16_armv5e(oac_val16 a, oac_val16 b) {
+    int res;
+    __asm__ (
+        "#MULT16_16\n\t"
+        "smulbb %0, %1, %2;\n"
+        : "=r" (res)
+        : "r" (a), "r" (b)
+        );
+    return res;
 }
 #define MULT16_16(a, b) (MULT16_16_armv5e(a, b))
 
 #ifdef OAC_ARM_INLINE_MEDIA
 
-#undef SIG2WORD16
-static OAC_INLINE oac_val16 SIG2WORD16_armv6(oac_val32 x)
-{
-   celt_sig res;
-   __asm__(
-       "#SIG2WORD16\n\t"
-       "ssat %0, #16, %1, ASR #12\n\t"
-       : "=r"(res)
-       : "r"(x+2048)
-   );
-   return EXTRACT16(res);
+# undef SIG2WORD16
+static OAC_INLINE oac_val16 SIG2WORD16_armv6(oac_val32 x) {
+    celt_sig res;
+    __asm__ (
+        "#SIG2WORD16\n\t"
+        "ssat %0, #16, %1, ASR #12\n\t"
+        : "=r" (res)
+        : "r" (x + 2048)
+        );
+    return EXTRACT16(res);
 }
-#define SIG2WORD16(x) (SIG2WORD16_armv6(x))
+# define SIG2WORD16(x) (SIG2WORD16_armv6(x))
 
 #endif /* OAC_ARM_INLINE_MEDIA */
 
diff --git a/celt/arm/kiss_fft_armv4.h b/celt/arm/kiss_fft_armv4.h
index e4faad6f2..26d9577fc 100644
--- a/celt/arm/kiss_fft_armv4.h
+++ b/celt/arm/kiss_fft_armv4.h
@@ -1,120 +1,120 @@
 /*Copyright (c) 2013, Xiph.Org Foundation and contributors.
 
-  All rights reserved.
+   All rights reserved.
 
-  Redistribution and use in source and binary forms, with or without
+   Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright notice,
+ * Redistributions of source code must retain the above copyright notice,
        this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
+ * Redistributions in binary form must reproduce the above copyright notice,
        this list of conditions and the following disclaimer in the
        documentation and/or other materials provided with the distribution.
 
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGE.*/
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.*/
 
 #ifndef KISS_FFT_ARMv4_H
 #define KISS_FFT_ARMv4_H
 
 #if !defined(KISS_FFT_GUTS_H)
-#error "This file should only be included from _kiss_fft_guts.h"
+# error "This file should only be included from _kiss_fft_guts.h"
 #endif
 
 #ifdef FIXED_POINT
 
-#undef C_MUL
-#define C_MUL(m,a,b) \
-    do{ \
-       int br__; \
-       int bi__; \
-       int tt__; \
-        __asm__ __volatile__( \
-            "#C_MUL\n\t" \
-            "ldrsh %[br], [%[bp], #0]\n\t" \
-            "ldm %[ap], {r0,r1}\n\t" \
-            "ldrsh %[bi], [%[bp], #2]\n\t" \
-            "smull %[tt], %[mi], r1, %[br]\n\t" \
-            "smlal %[tt], %[mi], r0, %[bi]\n\t" \
-            "rsb %[bi], %[bi], #0\n\t" \
-            "smull %[br], %[mr], r0, %[br]\n\t" \
-            "mov %[tt], %[tt], lsr #15\n\t" \
-            "smlal %[br], %[mr], r1, %[bi]\n\t" \
-            "orr %[mi], %[tt], %[mi], lsl #17\n\t" \
-            "mov %[br], %[br], lsr #15\n\t" \
-            "orr %[mr], %[br], %[mr], lsl #17\n\t" \
-            : [mr]"=r"((m).r), [mi]"=r"((m).i), \
-              [br]"=&r"(br__), [bi]"=r"(bi__), [tt]"=r"(tt__) \
-            : [ap]"r"(&(a)), [bp]"r"(&(b)) \
-            : "r0", "r1" \
-        ); \
-    } \
-    while(0)
+# undef C_MUL
+# define C_MUL(m, a, b) \
+        do { \
+            int br__; \
+            int bi__; \
+            int tt__; \
+            __asm__ __volatile__ ( \
+                "#C_MUL\n\t" \
+                "ldrsh %[br], [%[bp], #0]\n\t" \
+                "ldm %[ap], {r0,r1}\n\t" \
+                "ldrsh %[bi], [%[bp], #2]\n\t" \
+                "smull %[tt], %[mi], r1, %[br]\n\t" \
+                "smlal %[tt], %[mi], r0, %[bi]\n\t" \
+                "rsb %[bi], %[bi], #0\n\t" \
+                "smull %[br], %[mr], r0, %[br]\n\t" \
+                "mov %[tt], %[tt], lsr #15\n\t" \
+                "smlal %[br], %[mr], r1, %[bi]\n\t" \
+                "orr %[mi], %[tt], %[mi], lsl #17\n\t" \
+                "mov %[br], %[br], lsr #15\n\t" \
+                "orr %[mr], %[br], %[mr], lsl #17\n\t" \
+                : [mr] "=r" ((m).r), [mi] "=r" ((m).i), \
+                [br] "=&r" (br__), [bi] "=r" (bi__), [tt] "=r" (tt__) \
+                : [ap] "r" (&(a)), [bp] "r" (&(b)) \
+                : "r0", "r1" \
+                ); \
+        } \
+        while (0)
 
-#undef C_MUL4
-#define C_MUL4(m,a,b) \
-    do{ \
-       int br__; \
-       int bi__; \
-       int tt__; \
-        __asm__ __volatile__( \
-            "#C_MUL4\n\t" \
-            "ldrsh %[br], [%[bp], #0]\n\t" \
-            "ldm %[ap], {r0,r1}\n\t" \
-            "ldrsh %[bi], [%[bp], #2]\n\t" \
-            "smull %[tt], %[mi], r1, %[br]\n\t" \
-            "smlal %[tt], %[mi], r0, %[bi]\n\t" \
-            "rsb %[bi], %[bi], #0\n\t" \
-            "smull %[br], %[mr], r0, %[br]\n\t" \
-            "mov %[tt], %[tt], lsr #17\n\t" \
-            "smlal %[br], %[mr], r1, %[bi]\n\t" \
-            "orr %[mi], %[tt], %[mi], lsl #15\n\t" \
-            "mov %[br], %[br], lsr #17\n\t" \
-            "orr %[mr], %[br], %[mr], lsl #15\n\t" \
-            : [mr]"=r"((m).r), [mi]"=r"((m).i), \
-              [br]"=&r"(br__), [bi]"=r"(bi__), [tt]"=r"(tt__) \
-            : [ap]"r"(&(a)), [bp]"r"(&(b)) \
-            : "r0", "r1" \
-        ); \
-    } \
-    while(0)
+# undef C_MUL4
+# define C_MUL4(m, a, b) \
+        do { \
+            int br__; \
+            int bi__; \
+            int tt__; \
+            __asm__ __volatile__ ( \
+                "#C_MUL4\n\t" \
+                "ldrsh %[br], [%[bp], #0]\n\t" \
+                "ldm %[ap], {r0,r1}\n\t" \
+                "ldrsh %[bi], [%[bp], #2]\n\t" \
+                "smull %[tt], %[mi], r1, %[br]\n\t" \
+                "smlal %[tt], %[mi], r0, %[bi]\n\t" \
+                "rsb %[bi], %[bi], #0\n\t" \
+                "smull %[br], %[mr], r0, %[br]\n\t" \
+                "mov %[tt], %[tt], lsr #17\n\t" \
+                "smlal %[br], %[mr], r1, %[bi]\n\t" \
+                "orr %[mi], %[tt], %[mi], lsl #15\n\t" \
+                "mov %[br], %[br], lsr #17\n\t" \
+                "orr %[mr], %[br], %[mr], lsl #15\n\t" \
+                : [mr] "=r" ((m).r), [mi] "=r" ((m).i), \
+                [br] "=&r" (br__), [bi] "=r" (bi__), [tt] "=r" (tt__) \
+                : [ap] "r" (&(a)), [bp] "r" (&(b)) \
+                : "r0", "r1" \
+                ); \
+        } \
+        while (0)
 
-#undef C_MULC
-#define C_MULC(m,a,b) \
-    do{ \
-       int br__; \
-       int bi__; \
-       int tt__; \
-        __asm__ __volatile__( \
-            "#C_MULC\n\t" \
-            "ldrsh %[br], [%[bp], #0]\n\t" \
-            "ldm %[ap], {r0,r1}\n\t" \
-            "ldrsh %[bi], [%[bp], #2]\n\t" \
-            "smull %[tt], %[mr], r0, %[br]\n\t" \
-            "smlal %[tt], %[mr], r1, %[bi]\n\t" \
-            "rsb %[bi], %[bi], #0\n\t" \
-            "smull %[br], %[mi], r1, %[br]\n\t" \
-            "mov %[tt], %[tt], lsr #15\n\t" \
-            "smlal %[br], %[mi], r0, %[bi]\n\t" \
-            "orr %[mr], %[tt], %[mr], lsl #17\n\t" \
-            "mov %[br], %[br], lsr #15\n\t" \
-            "orr %[mi], %[br], %[mi], lsl #17\n\t" \
-            : [mr]"=r"((m).r), [mi]"=r"((m).i), \
-              [br]"=&r"(br__), [bi]"=r"(bi__), [tt]"=r"(tt__) \
-            : [ap]"r"(&(a)), [bp]"r"(&(b)) \
-            : "r0", "r1" \
-        ); \
-    } \
-    while(0)
+# undef C_MULC
+# define C_MULC(m, a, b) \
+        do { \
+            int br__; \
+            int bi__; \
+            int tt__; \
+            __asm__ __volatile__ ( \
+                "#C_MULC\n\t" \
+                "ldrsh %[br], [%[bp], #0]\n\t" \
+                "ldm %[ap], {r0,r1}\n\t" \
+                "ldrsh %[bi], [%[bp], #2]\n\t" \
+                "smull %[tt], %[mr], r0, %[br]\n\t" \
+                "smlal %[tt], %[mr], r1, %[bi]\n\t" \
+                "rsb %[bi], %[bi], #0\n\t" \
+                "smull %[br], %[mi], r1, %[br]\n\t" \
+                "mov %[tt], %[tt], lsr #15\n\t" \
+                "smlal %[br], %[mi], r0, %[bi]\n\t" \
+                "orr %[mr], %[tt], %[mr], lsl #17\n\t" \
+                "mov %[br], %[br], lsr #15\n\t" \
+                "orr %[mi], %[br], %[mi], lsl #17\n\t" \
+                : [mr] "=r" ((m).r), [mi] "=r" ((m).i), \
+                [br] "=&r" (br__), [bi] "=r" (bi__), [tt] "=r" (tt__) \
+                : [ap] "r" (&(a)), [bp] "r" (&(b)) \
+                : "r0", "r1" \
+                ); \
+        } \
+        while (0)
 
 #endif /* FIXED_POINT */
 
diff --git a/celt/arm/kiss_fft_armv5e.h b/celt/arm/kiss_fft_armv5e.h
index 9eca183d7..d2ec2de51 100644
--- a/celt/arm/kiss_fft_armv5e.h
+++ b/celt/arm/kiss_fft_armv5e.h
@@ -1,117 +1,117 @@
 /*Copyright (c) 2013, Xiph.Org Foundation and contributors.
 
-  All rights reserved.
+   All rights reserved.
 
-  Redistribution and use in source and binary forms, with or without
+   Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright notice,
+ * Redistributions of source code must retain the above copyright notice,
        this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
+ * Redistributions in binary form must reproduce the above copyright notice,
        this list of conditions and the following disclaimer in the
        documentation and/or other materials provided with the distribution.
 
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGE.*/
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.*/
 
 #ifndef KISS_FFT_ARMv5E_H
 #define KISS_FFT_ARMv5E_H
 
 #if !defined(KISS_FFT_GUTS_H)
-#error "This file should only be included from _kiss_fft_guts.h"
+# error "This file should only be included from _kiss_fft_guts.h"
 #endif
 
 #ifdef FIXED_POINT
 
-#if defined(__thumb__)||defined(__thumb2__)
-#define LDRD_CONS "Q"
-#else
-#define LDRD_CONS "Uq"
-#endif
+# if defined(__thumb__) || defined(__thumb2__)
+#  define LDRD_CONS "Q"
+# else
+#  define LDRD_CONS "Uq"
+# endif
 
-#undef C_MUL
-#define C_MUL(m,a,b) \
-    do{ \
-        int mr1__; \
-        int mr2__; \
-        int mi__; \
-        long long aval__; \
-        int bval__; \
-        __asm__( \
-            "#C_MUL\n\t" \
-            "ldrd %[aval], %H[aval], %[ap]\n\t" \
-            "ldr %[bval], %[bp]\n\t" \
-            "smulwb %[mi], %H[aval], %[bval]\n\t" \
-            "smulwb %[mr1], %[aval], %[bval]\n\t" \
-            "smulwt %[mr2], %H[aval], %[bval]\n\t" \
-            "smlawt %[mi], %[aval], %[bval], %[mi]\n\t" \
-            : [mr1]"=r"(mr1__), [mr2]"=r"(mr2__), [mi]"=r"(mi__), \
-              [aval]"=&r"(aval__), [bval]"=r"(bval__) \
-            : [ap]LDRD_CONS(a), [bp]"m"(b) \
-        ); \
-        (m).r = SHL32(SUB32(mr1__, mr2__), 1); \
-        (m).i = SHL32(mi__, 1); \
-    } \
-    while(0)
+# undef C_MUL
+# define C_MUL(m, a, b) \
+        do { \
+            int mr1__; \
+            int mr2__; \
+            int mi__; \
+            long long aval__; \
+            int bval__; \
+            __asm__ ( \
+                "#C_MUL\n\t" \
+                "ldrd %[aval], %H[aval], %[ap]\n\t" \
+                "ldr %[bval], %[bp]\n\t" \
+                "smulwb %[mi], %H[aval], %[bval]\n\t" \
+                "smulwb %[mr1], %[aval], %[bval]\n\t" \
+                "smulwt %[mr2], %H[aval], %[bval]\n\t" \
+                "smlawt %[mi], %[aval], %[bval], %[mi]\n\t" \
+                : [mr1] "=r" (mr1__), [mr2] "=r" (mr2__), [mi] "=r" (mi__), \
+                [aval] "=&r" (aval__), [bval] "=r" (bval__) \
+                : [ap] LDRD_CONS(a), [bp] "m" (b) \
+                ); \
+            (m).r = SHL32(SUB32(mr1__, mr2__), 1); \
+            (m).i = SHL32(mi__, 1); \
+        } \
+        while (0)
 
-#undef C_MUL4
-#define C_MUL4(m,a,b) \
-    do{ \
-        int mr1__; \
-        int mr2__; \
-        int mi__; \
-        long long aval__; \
-        int bval__; \
-        __asm__( \
-            "#C_MUL4\n\t" \
-            "ldrd %[aval], %H[aval], %[ap]\n\t" \
-            "ldr %[bval], %[bp]\n\t" \
-            "smulwb %[mi], %H[aval], %[bval]\n\t" \
-            "smulwb %[mr1], %[aval], %[bval]\n\t" \
-            "smulwt %[mr2], %H[aval], %[bval]\n\t" \
-            "smlawt %[mi], %[aval], %[bval], %[mi]\n\t" \
-            : [mr1]"=r"(mr1__), [mr2]"=r"(mr2__), [mi]"=r"(mi__), \
-              [aval]"=&r"(aval__), [bval]"=r"(bval__) \
-            : [ap]LDRD_CONS(a), [bp]"m"(b) \
-        ); \
-        (m).r = SHR32(SUB32(mr1__, mr2__), 1); \
-        (m).i = SHR32(mi__, 1); \
-    } \
-    while(0)
+# undef C_MUL4
+# define C_MUL4(m, a, b) \
+        do { \
+            int mr1__; \
+            int mr2__; \
+            int mi__; \
+            long long aval__; \
+            int bval__; \
+            __asm__ ( \
+                "#C_MUL4\n\t" \
+                "ldrd %[aval], %H[aval], %[ap]\n\t" \
+                "ldr %[bval], %[bp]\n\t" \
+                "smulwb %[mi], %H[aval], %[bval]\n\t" \
+                "smulwb %[mr1], %[aval], %[bval]\n\t" \
+                "smulwt %[mr2], %H[aval], %[bval]\n\t" \
+                "smlawt %[mi], %[aval], %[bval], %[mi]\n\t" \
+                : [mr1] "=r" (mr1__), [mr2] "=r" (mr2__), [mi] "=r" (mi__), \
+                [aval] "=&r" (aval__), [bval] "=r" (bval__) \
+                : [ap] LDRD_CONS(a), [bp] "m" (b) \
+                ); \
+            (m).r = SHR32(SUB32(mr1__, mr2__), 1); \
+            (m).i = SHR32(mi__, 1); \
+        } \
+        while (0)
 
-#undef C_MULC
-#define C_MULC(m,a,b) \
-    do{ \
-        int mr__; \
-        int mi1__; \
-        int mi2__; \
-        long long aval__; \
-        int bval__; \
-        __asm__( \
-            "#C_MULC\n\t" \
-            "ldrd %[aval], %H[aval], %[ap]\n\t" \
-            "ldr %[bval], %[bp]\n\t" \
-            "smulwb %[mr], %[aval], %[bval]\n\t" \
-            "smulwb %[mi1], %H[aval], %[bval]\n\t" \
-            "smulwt %[mi2], %[aval], %[bval]\n\t" \
-            "smlawt %[mr], %H[aval], %[bval], %[mr]\n\t" \
-            : [mr]"=r"(mr__), [mi1]"=r"(mi1__), [mi2]"=r"(mi2__), \
-              [aval]"=&r"(aval__), [bval]"=r"(bval__) \
-            : [ap]LDRD_CONS(a), [bp]"m"(b) \
-        ); \
-        (m).r = SHL32(mr__, 1); \
-        (m).i = SHL32(SUB32(mi1__, mi2__), 1); \
-    } \
-    while(0)
+# undef C_MULC
+# define C_MULC(m, a, b) \
+        do { \
+            int mr__; \
+            int mi1__; \
+            int mi2__; \
+            long long aval__; \
+            int bval__; \
+            __asm__ ( \
+                "#C_MULC\n\t" \
+                "ldrd %[aval], %H[aval], %[ap]\n\t" \
+                "ldr %[bval], %[bp]\n\t" \
+                "smulwb %[mr], %[aval], %[bval]\n\t" \
+                "smulwb %[mi1], %H[aval], %[bval]\n\t" \
+                "smulwt %[mi2], %[aval], %[bval]\n\t" \
+                "smlawt %[mr], %H[aval], %[bval], %[mr]\n\t" \
+                : [mr] "=r" (mr__), [mi1] "=r" (mi1__), [mi2] "=r" (mi2__), \
+                [aval] "=&r" (aval__), [bval] "=r" (bval__) \
+                : [ap] LDRD_CONS(a), [bp] "m" (b) \
+                ); \
+            (m).r = SHL32(mr__, 1); \
+            (m).i = SHL32(SUB32(mi1__, mi2__), 1); \
+        } \
+        while (0)
 
 #endif /* FIXED_POINT */
 
diff --git a/celt/arm/mathops_arm.h b/celt/arm/mathops_arm.h
index 22a9cfe86..d33f7a540 100644
--- a/celt/arm/mathops_arm.h
+++ b/celt/arm/mathops_arm.h
@@ -22,82 +22,79 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #if !defined(MATHOPS_ARM_H)
-# define MATHOPS_ARM_H
+#define MATHOPS_ARM_H
 
 #include "armcpu.h"
 #include "cpu_support.h"
 #include "oac_defines.h"
 
-# if !defined(DISABLE_FLOAT_API) && defined(OAC_ARM_MAY_HAVE_NEON_INTR)
+#if !defined(DISABLE_FLOAT_API) && defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 
-#include <arm_neon.h>
+# include <arm_neon.h>
 
-static inline int32x4_t vroundf(float32x4_t x)
-{
-#  if defined(__aarch64__) || (defined(__ARM_ARCH) && __ARM_ARCH >= 8)
+static inline int32x4_t vroundf(float32x4_t x) {
+# if defined(__aarch64__) || (defined(__ARM_ARCH) && __ARM_ARCH >= 8)
     return vcvtaq_s32_f32(x);
-#  else
+# else
     uint32x4_t sign = vandq_u32(vreinterpretq_u32_f32(x), vdupq_n_u32(0x80000000));
     uint32x4_t bias = vdupq_n_u32(0x3F000000);
     return vcvtq_s32_f32(vaddq_f32(x, vreinterpretq_f32_u32(vorrq_u32(bias, sign))));
-#  endif
+# endif
 }
 
-static inline float vminvf(float32x4_t a)
-{
-#if defined(__aarch64__)
-   return vminvq_f32(a);
-#else
+static inline float vminvf(float32x4_t a) {
+# if defined(__aarch64__)
+    return vminvq_f32(a);
+# else
     float32x2_t xy = vmin_f32(vget_low_f32(a), vget_high_f32(a));
     float x = vget_lane_f32(xy, 0);
     float y = vget_lane_f32(xy, 1);
     return x < y ? x : y;
-#endif
+# endif
 }
 
-static inline float vmaxvf(float32x4_t a)
-{
-#if defined(__aarch64__)
-   return vmaxvq_f32(a);
-#else
+static inline float vmaxvf(float32x4_t a) {
+# if defined(__aarch64__)
+    return vmaxvq_f32(a);
+# else
     float32x2_t xy = vmax_f32(vget_low_f32(a), vget_high_f32(a));
     float x = vget_lane_f32(xy, 0);
     float y = vget_lane_f32(xy, 1);
     return x > y ? x : y;
-#endif
+# endif
 }
 
 void celt_float2int16_neon(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt);
-#  if defined(OAC_HAVE_RTCD) && \
+# if defined(OAC_HAVE_RTCD) && \
     (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
 extern void
-(*const CELT_FLOAT2INT16_IMPL[OAC_ARCHMASK+1])(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt);
+(*const CELT_FLOAT2INT16_IMPL[OAC_ARCHMASK + 1])(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt);
 
-#   define OVERRIDE_FLOAT2INT16 (1)
-#   define celt_float2int16(in, out, cnt, arch) \
-      ((*CELT_FLOAT2INT16_IMPL[(arch)&OAC_ARCHMASK])(in, out, cnt))
+#  define OVERRIDE_FLOAT2INT16 (1)
+#  define celt_float2int16(in, out, cnt, arch) \
+        ((*CELT_FLOAT2INT16_IMPL[(arch)&OAC_ARCHMASK])(in, out, cnt))
 
-#  elif defined(OAC_ARM_PRESUME_NEON_INTR)
-#   define OVERRIDE_FLOAT2INT16 (1)
-#   define celt_float2int16(in, out, cnt, arch) ((void)(arch), celt_float2int16_neon(in, out, cnt))
-#  endif
+# elif defined(OAC_ARM_PRESUME_NEON_INTR)
+#  define OVERRIDE_FLOAT2INT16 (1)
+#  define celt_float2int16(in, out, cnt, arch) ((void)(arch), celt_float2int16_neon(in, out, cnt))
+# endif
 
 int oac_limit2_checkwithin1_neon(float * samples, int cnt);
-#  if defined(OAC_HAVE_RTCD) && \
-      (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
-extern int (*const OAC_LIMIT2_CHECKWITHIN1_IMPL[OAC_ARCHMASK+1])(float * samples, int cnt);
-
-#   define OVERRIDE_LIMIT2_CHECKWITHIN1 (1)
-#   define oac_limit2_checkwithin1(samples, cnt, arch) \
-   ((*OAC_LIMIT2_CHECKWITHIN1_IMPL[(arch)&OAC_ARCHMASK])(samples, cnt))
-
-#  elif defined(OAC_ARM_PRESUME_NEON_INTR)
-#   define OVERRIDE_LIMIT2_CHECKWITHIN1 (1)
-#   define oac_limit2_checkwithin1(samples, cnt, arch) ((void)(arch), oac_limit2_checkwithin1_neon(samples, cnt))
-#  endif
+# if defined(OAC_HAVE_RTCD) && \
+    (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
+extern int (*const OAC_LIMIT2_CHECKWITHIN1_IMPL[OAC_ARCHMASK + 1])(float * samples, int cnt);
+
+#  define OVERRIDE_LIMIT2_CHECKWITHIN1 (1)
+#  define oac_limit2_checkwithin1(samples, cnt, arch) \
+        ((*OAC_LIMIT2_CHECKWITHIN1_IMPL[(arch)&OAC_ARCHMASK])(samples, cnt))
+
+# elif defined(OAC_ARM_PRESUME_NEON_INTR)
+#  define OVERRIDE_LIMIT2_CHECKWITHIN1 (1)
+#  define oac_limit2_checkwithin1(samples, cnt, arch) ((void)(arch), oac_limit2_checkwithin1_neon(samples, cnt))
 # endif
+#endif
 
 #endif /* MATHOPS_ARM_H */
diff --git a/celt/arm/mdct_arm.h b/celt/arm/mdct_arm.h
index 15fd58e3d..5b68642db 100644
--- a/celt/arm/mdct_arm.h
+++ b/celt/arm/mdct_arm.h
@@ -28,7 +28,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #if !defined(MDCT_ARM_H)
 #define MDCT_ARM_H
@@ -38,22 +38,22 @@
 #if defined(HAVE_ARM_NE10)
 /** Compute a forward MDCT and scale by 4/N, trashes the input array */
 void clt_mdct_forward_neon(const mdct_lookup *l, kiss_fft_scalar *in,
-                           kiss_fft_scalar * OAC_RESTRICT out,
-                           const oac_val16 *window, int overlap,
-                           int shift, int stride, int arch);
+    kiss_fft_scalar * OAC_RESTRICT out,
+    const oac_val16 *window, int overlap,
+    int shift, int stride, int arch);
 
 void clt_mdct_backward_neon(const mdct_lookup *l, kiss_fft_scalar *in,
-                            kiss_fft_scalar * OAC_RESTRICT out,
-                            const oac_val16 *window, int overlap,
-                            int shift, int stride, int arch);
-
-#if !defined(OAC_HAVE_RTCD)
-#define OVERRIDE_OAC_MDCT (1)
-#define clt_mdct_forward(_l, _in, _out, _window, _int, _shift, _stride, _arch) \
-      clt_mdct_forward_neon(_l, _in, _out, _window, _int, _shift, _stride, _arch)
-#define clt_mdct_backward(_l, _in, _out, _window, _int, _shift, _stride, _arch) \
-      clt_mdct_backward_neon(_l, _in, _out, _window, _int, _shift, _stride, _arch)
-#endif /* OAC_HAVE_RTCD */
+    kiss_fft_scalar * OAC_RESTRICT out,
+    const oac_val16 *window, int overlap,
+    int shift, int stride, int arch);
+
+# if !defined(OAC_HAVE_RTCD)
+#  define OVERRIDE_OAC_MDCT (1)
+#  define clt_mdct_forward(_l, _in, _out, _window, _int, _shift, _stride, _arch) \
+        clt_mdct_forward_neon(_l, _in, _out, _window, _int, _shift, _stride, _arch)
+#  define clt_mdct_backward(_l, _in, _out, _window, _int, _shift, _stride, _arch) \
+        clt_mdct_backward_neon(_l, _in, _out, _window, _int, _shift, _stride, _arch)
+# endif /* OAC_HAVE_RTCD */
 #endif /* HAVE_ARM_NE10 */
 
 #endif
diff --git a/celt/arm/pitch_arm.h b/celt/arm/pitch_arm.h
index 0261dd81f..05923cdad 100644
--- a/celt/arm/pitch_arm.h
+++ b/celt/arm/pitch_arm.h
@@ -23,137 +23,139 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #if !defined(PITCH_ARM_H)
-# define PITCH_ARM_H
+#define PITCH_ARM_H
 
-# include "armcpu.h"
+#include "armcpu.h"
 
-# if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
+#if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 oac_val32 celt_inner_prod_neon(const oac_val16 *x, const oac_val16 *y, int N);
 void dual_inner_prod_neon(const oac_val16 *x, const oac_val16 *y01,
-        const oac_val16 *y02, int N, oac_val32 *xy1, oac_val32 *xy2);
-
-#  if !defined(OAC_HAVE_RTCD) && defined(OAC_ARM_PRESUME_NEON)
-#   define OVERRIDE_CELT_INNER_PROD (1)
-#   define OVERRIDE_DUAL_INNER_PROD (1)
-#   define celt_inner_prod(x, y, N, arch) ((void)(arch), PRESUME_NEON(celt_inner_prod)(x, y, N))
-#   define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) ((void)(arch), PRESUME_NEON(dual_inner_prod)(x, y01, y02, N, xy1, xy2))
-#  endif
+    const oac_val16 *y02, int N, oac_val32 *xy1, oac_val32 *xy2);
+
+# if !defined(OAC_HAVE_RTCD) && defined(OAC_ARM_PRESUME_NEON)
+#  define OVERRIDE_CELT_INNER_PROD (1)
+#  define OVERRIDE_DUAL_INNER_PROD (1)
+#  define celt_inner_prod(x, y, N, arch) ((void)(arch), PRESUME_NEON(celt_inner_prod)(x, y, N))
+#  define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) ((void)(arch), \
+                                                           PRESUME_NEON(dual_inner_prod)(x, y01, y02, N, xy1, xy2))
 # endif
+#endif
 
-# if !defined(OVERRIDE_CELT_INNER_PROD)
-#  if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
-extern oac_val32 (*const CELT_INNER_PROD_IMPL[OAC_ARCHMASK+1])(const oac_val16 *x, const oac_val16 *y, int N);
-#   define OVERRIDE_CELT_INNER_PROD (1)
-#   define celt_inner_prod(x, y, N, arch) ((*CELT_INNER_PROD_IMPL[(arch)&OAC_ARCHMASK])(x, y, N))
-#  elif defined(OAC_ARM_PRESUME_NEON_INTR)
-#   define OVERRIDE_CELT_INNER_PROD (1)
-#   define celt_inner_prod(x, y, N, arch) ((void)(arch), celt_inner_prod_neon(x, y, N))
-#  endif
+#if !defined(OVERRIDE_CELT_INNER_PROD)
+# if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
+extern oac_val32 (*const CELT_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(const oac_val16 *x, const oac_val16 *y, int N);
+#  define OVERRIDE_CELT_INNER_PROD (1)
+#  define celt_inner_prod(x, y, N, arch) ((*CELT_INNER_PROD_IMPL[(arch)&OAC_ARCHMASK])(x, y, N))
+# elif defined(OAC_ARM_PRESUME_NEON_INTR)
+#  define OVERRIDE_CELT_INNER_PROD (1)
+#  define celt_inner_prod(x, y, N, arch) ((void)(arch), celt_inner_prod_neon(x, y, N))
 # endif
+#endif
 
-# if !defined(OVERRIDE_DUAL_INNER_PROD)
-#  if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
-extern void (*const DUAL_INNER_PROD_IMPL[OAC_ARCHMASK+1])(const oac_val16 *x,
+#if !defined(OVERRIDE_DUAL_INNER_PROD)
+# if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
+extern void (*const DUAL_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(const oac_val16 *x,
         const oac_val16 *y01, const oac_val16 *y02, int N, oac_val32 *xy1, oac_val32 *xy2);
-#   define OVERRIDE_DUAL_INNER_PROD (1)
-#   define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) ((*DUAL_INNER_PROD_IMPL[(arch)&OAC_ARCHMASK])(x, y01, y02, N, xy1, xy2))
-#  elif defined(OAC_ARM_PRESUME_NEON_INTR)
-#   define OVERRIDE_DUAL_INNER_PROD (1)
-#   define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) ((void)(arch), dual_inner_prod_neon(x, y01, y02, N, xy1, xy2))
-#  endif
+#  define OVERRIDE_DUAL_INNER_PROD (1)
+#  define dual_inner_prod(x, y01, y02, N, xy1, xy2, \
+                          arch) ((*DUAL_INNER_PROD_IMPL[(arch)&OAC_ARCHMASK])(x, y01, y02, N, xy1, xy2))
+# elif defined(OAC_ARM_PRESUME_NEON_INTR)
+#  define OVERRIDE_DUAL_INNER_PROD (1)
+#  define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) ((void)(arch), dual_inner_prod_neon(x, y01, y02, N, xy1, xy2))
 # endif
+#endif
 
-# if defined(FIXED_POINT)
+#if defined(FIXED_POINT)
 
-#  if defined(OAC_ARM_MAY_HAVE_NEON)
+# if defined(OAC_ARM_MAY_HAVE_NEON)
 oac_val32 celt_pitch_xcorr_neon(const oac_val16 *_x, const oac_val16 *_y,
     oac_val32 *xcorr, int len, int max_pitch, int arch);
-#  endif
+# endif
 
-#  if defined(OAC_ARM_MAY_HAVE_MEDIA)
-#   define celt_pitch_xcorr_media MAY_HAVE_EDSP(celt_pitch_xcorr)
-#  endif
+# if defined(OAC_ARM_MAY_HAVE_MEDIA)
+#  define celt_pitch_xcorr_media MAY_HAVE_EDSP(celt_pitch_xcorr)
+# endif
 
-#  if defined(OAC_ARM_MAY_HAVE_EDSP)
+# if defined(OAC_ARM_MAY_HAVE_EDSP)
 oac_val32 celt_pitch_xcorr_edsp(const oac_val16 *_x, const oac_val16 *_y,
     oac_val32 *xcorr, int len, int max_pitch, int arch);
-#  endif
+# endif
 
-#  if defined(OAC_HAVE_RTCD) && \
+# if defined(OAC_HAVE_RTCD) && \
     ((defined(OAC_ARM_MAY_HAVE_NEON) && !defined(OAC_ARM_PRESUME_NEON)) || \
-     (defined(OAC_ARM_MAY_HAVE_MEDIA) && !defined(OAC_ARM_PRESUME_MEDIA)) || \
-     (defined(OAC_ARM_MAY_HAVE_EDSP) && !defined(OAC_ARM_PRESUME_EDSP)))
+    (defined(OAC_ARM_MAY_HAVE_MEDIA) && !defined(OAC_ARM_PRESUME_MEDIA)) || \
+    (defined(OAC_ARM_MAY_HAVE_EDSP) && !defined(OAC_ARM_PRESUME_EDSP)))
 extern oac_val32
-(*const CELT_PITCH_XCORR_IMPL[OAC_ARCHMASK+1])(const oac_val16 *,
+(*const CELT_PITCH_XCORR_IMPL[OAC_ARCHMASK + 1])(const oac_val16 *,
       const oac_val16 *, oac_val32 *, int, int, int);
-#   define OVERRIDE_PITCH_XCORR (1)
-#   define celt_pitch_xcorr(_x, _y, xcorr, len, max_pitch, arch) \
-  ((*CELT_PITCH_XCORR_IMPL[(arch)&OAC_ARCHMASK])(_x, _y, \
-        xcorr, len, max_pitch, arch))
+#  define OVERRIDE_PITCH_XCORR (1)
+#  define celt_pitch_xcorr(_x, _y, xcorr, len, max_pitch, arch) \
+        ((*CELT_PITCH_XCORR_IMPL[(arch)&OAC_ARCHMASK])(_x, _y, \
+                                                       xcorr, len, max_pitch, arch))
 
-#  elif defined(OAC_ARM_PRESUME_EDSP) || \
+# elif defined(OAC_ARM_PRESUME_EDSP) || \
     defined(OAC_ARM_PRESUME_MEDIA) || \
     defined(OAC_ARM_PRESUME_NEON)
-#   define OVERRIDE_PITCH_XCORR (1)
-#   define celt_pitch_xcorr (PRESUME_NEON(celt_pitch_xcorr))
+#  define OVERRIDE_PITCH_XCORR (1)
+#  define celt_pitch_xcorr (PRESUME_NEON(celt_pitch_xcorr))
 
-#  endif
+# endif
 
-#  if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
+# if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 void xcorr_kernel_neon_fixed(
-                    const oac_val16 *x,
-                    const oac_val16 *y,
-                    oac_val32       sum[4],
-                    int              len);
-#  endif
+    const oac_val16 *x,
+    const oac_val16 *y,
+    oac_val32 sum[4],
+    int len);
+# endif
 
-#  if defined(OAC_HAVE_RTCD) && \
+# if defined(OAC_HAVE_RTCD) && \
     (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
 
 extern void (*const XCORR_KERNEL_IMPL[OAC_ARCHMASK + 1])(
                     const oac_val16 *x,
                     const oac_val16 *y,
-                    oac_val32       sum[4],
-                    int              len);
+                    oac_val32 sum[4],
+                    int len);
 
-#   define OVERRIDE_XCORR_KERNEL (1)
-#   define xcorr_kernel(x, y, sum, len, arch) \
-     ((*XCORR_KERNEL_IMPL[(arch) & OAC_ARCHMASK])(x, y, sum, len))
+#  define OVERRIDE_XCORR_KERNEL (1)
+#  define xcorr_kernel(x, y, sum, len, arch) \
+        ((*XCORR_KERNEL_IMPL[(arch)&OAC_ARCHMASK])(x, y, sum, len))
 
-#  elif defined(OAC_ARM_PRESUME_NEON_INTR)
-#   define OVERRIDE_XCORR_KERNEL (1)
-#   define xcorr_kernel(x, y, sum, len, arch) \
-      ((void)arch, xcorr_kernel_neon_fixed(x, y, sum, len))
+# elif defined(OAC_ARM_PRESUME_NEON_INTR)
+#  define OVERRIDE_XCORR_KERNEL (1)
+#  define xcorr_kernel(x, y, sum, len, arch) \
+        ((void)arch, xcorr_kernel_neon_fixed(x, y, sum, len))
 
-#  endif
+# endif
 
 #else /* Start !FIXED_POINT */
 /* Float case */
-#if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
+# if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 void celt_pitch_xcorr_float_neon(const oac_val16 *_x, const oac_val16 *_y,
-                                 oac_val32 *xcorr, int len, int max_pitch, int arch);
-#endif
+    oac_val32 *xcorr, int len, int max_pitch, int arch);
+# endif
 
-#  if defined(OAC_HAVE_RTCD) && \
+# if defined(OAC_HAVE_RTCD) && \
     (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
 extern void
-(*const CELT_PITCH_XCORR_IMPL[OAC_ARCHMASK+1])(const oac_val16 *,
+(*const CELT_PITCH_XCORR_IMPL[OAC_ARCHMASK + 1])(const oac_val16 *,
       const oac_val16 *, oac_val32 *, int, int, int);
 
 #  define OVERRIDE_PITCH_XCORR (1)
 #  define celt_pitch_xcorr(_x, _y, xcorr, len, max_pitch, arch) \
-  ((*CELT_PITCH_XCORR_IMPL[(arch)&OAC_ARCHMASK])(_x, _y, \
-        xcorr, len, max_pitch, arch))
+        ((*CELT_PITCH_XCORR_IMPL[(arch)&OAC_ARCHMASK])(_x, _y, \
+                                                       xcorr, len, max_pitch, arch))
 
-#  elif defined(OAC_ARM_PRESUME_NEON_INTR)
+# elif defined(OAC_ARM_PRESUME_NEON_INTR)
 
-#   define OVERRIDE_PITCH_XCORR (1)
-#   define celt_pitch_xcorr celt_pitch_xcorr_float_neon
+#  define OVERRIDE_PITCH_XCORR (1)
+#  define celt_pitch_xcorr celt_pitch_xcorr_float_neon
 
-#  endif
+# endif
 
 #endif /* end !FIXED_POINT */
 
diff --git a/celt/arm/pitch_neon_intr.c b/celt/arm/pitch_neon_intr.c
index e63eaf54b..f6ea791b3 100644
--- a/celt/arm/pitch_neon_intr.c
+++ b/celt/arm/pitch_neon_intr.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2017 Google Inc.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2017 Google Inc.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <arm_neon.h>
@@ -34,8 +34,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #ifdef FIXED_POINT
 
-oac_val32 celt_inner_prod_neon(const oac_val16 *x, const oac_val16 *y, int N)
-{
+oac_val32 celt_inner_prod_neon(const oac_val16 *x, const oac_val16 *y, int N) {
     int i;
     oac_val32 xy;
     int16x8_t x_s16x8, y_s16x8;
@@ -65,16 +64,15 @@ oac_val32 celt_inner_prod_neon(const oac_val16 *x, const oac_val16 *y, int N)
         xy = MAC16_16(xy, x[i], y[i]);
     }
 
-#ifdef OAC_CHECK_ASM
+# ifdef OAC_CHECK_ASM
     celt_assert(celt_inner_prod_c(x, y, N) == xy);
-#endif
+# endif
 
     return xy;
 }
 
 void dual_inner_prod_neon(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
-        int N, oac_val32 *xy1, oac_val32 *xy2)
-{
+                          int N, oac_val32 *xy1, oac_val32 *xy2) {
     int i;
     oac_val32 xy01, xy02;
     int16x8_t x_s16x8, y01_s16x8, y02_s16x8;
@@ -116,74 +114,71 @@ void dual_inner_prod_neon(const oac_val16 *x, const oac_val16 *y01, const oac_va
     *xy1 = xy01;
     *xy2 = xy02;
 
-#ifdef OAC_CHECK_ASM
+# ifdef OAC_CHECK_ASM
     {
         oac_val32 xy1_c, xy2_c;
         dual_inner_prod_c(x, y01, y02, N, &xy1_c, &xy2_c);
         celt_assert(xy1_c == *xy1);
         celt_assert(xy2_c == *xy2);
     }
-#endif
+# endif
 }
 
 #else /* !FIXED_POINT */
 
 /* ========================================================================== */
 
-#ifdef __ARM_FEATURE_FMA
+# ifdef __ARM_FEATURE_FMA
 /* If we can, force the compiler to use an FMA instruction rather than break
    vmlaq_f32() into fmul/fadd. */
-#define vmlaq_f32(a,b,c) vfmaq_f32(a,b,c)
-#endif
+#  define vmlaq_f32(a, b, c) vfmaq_f32(a, b, c)
+# endif
 
 
-#ifdef OAC_CHECK_ASM
+# ifdef OAC_CHECK_ASM
 
 /* This part of code simulates floating-point NEON operations. */
 
 /* celt_inner_prod_neon_float_c_simulation() simulates the floating-point   */
 /* operations of celt_inner_prod_neon(), and both functions should have bit */
 /* exact output.                                                            */
-static oac_val32 celt_inner_prod_neon_float_c_simulation(const oac_val16 *x, const oac_val16 *y, float *err, int N)
-{
-   int i;
-   *err = 0;
-   oac_val32 xy, xy0 = 0, xy1 = 0, xy2 = 0, xy3 = 0;
-   for (i = 0; i < N - 3; i += 4) {
-      xy0 = MAC16_16(xy0, x[i + 0], y[i + 0]);
-      xy1 = MAC16_16(xy1, x[i + 1], y[i + 1]);
-      xy2 = MAC16_16(xy2, x[i + 2], y[i + 2]);
-      xy3 = MAC16_16(xy3, x[i + 3], y[i + 3]);
-      *err += ABS32(xy0)+ABS32(xy1)+ABS32(xy2)+ABS32(xy3);
-   }
-   xy0 += xy2;
-   xy1 += xy3;
-   xy = xy0 + xy1;
-   *err += ABS32(xy1)+ABS32(xy0)+ABS32(xy);
-   for (; i < N; i++) {
-      xy = MAC16_16(xy, x[i], y[i]);
-      *err += ABS32(xy);
-   }
-   *err = *err*2e-7 + N*1e-37;
-   return xy;
+static oac_val32 celt_inner_prod_neon_float_c_simulation(const oac_val16 *x, const oac_val16 *y, float *err, int N) {
+    int i;
+    *err = 0;
+    oac_val32 xy, xy0 = 0, xy1 = 0, xy2 = 0, xy3 = 0;
+    for (i = 0; i < N - 3; i += 4) {
+        xy0 = MAC16_16(xy0, x[i + 0], y[i + 0]);
+        xy1 = MAC16_16(xy1, x[i + 1], y[i + 1]);
+        xy2 = MAC16_16(xy2, x[i + 2], y[i + 2]);
+        xy3 = MAC16_16(xy3, x[i + 3], y[i + 3]);
+        *err += ABS32(xy0) + ABS32(xy1) + ABS32(xy2) + ABS32(xy3);
+    }
+    xy0 += xy2;
+    xy1 += xy3;
+    xy = xy0 + xy1;
+    *err += ABS32(xy1) + ABS32(xy0) + ABS32(xy);
+    for (; i < N; i++) {
+        xy = MAC16_16(xy, x[i], y[i]);
+        *err += ABS32(xy);
+    }
+    *err = *err*2e-7 + N*1e-37;
+    return xy;
 }
 
 /* dual_inner_prod_neon_float_c_simulation() simulates the floating-point   */
 /* operations of dual_inner_prod_neon(), and both functions should have bit */
 /* exact output.                                                            */
 static void dual_inner_prod_neon_float_c_simulation(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
-      int N, oac_val32 *xy1, oac_val32 *xy2, float *err)
-{
-   *xy1 = celt_inner_prod_neon_float_c_simulation(x, y01, &err[0], N);
-   *xy2 = celt_inner_prod_neon_float_c_simulation(x, y02, &err[1], N);
+                                                    int N, oac_val32 *xy1, oac_val32 *xy2, float *err) {
+    *xy1 = celt_inner_prod_neon_float_c_simulation(x, y01, &err[0], N);
+    *xy2 = celt_inner_prod_neon_float_c_simulation(x, y02, &err[1], N);
 }
 
-#endif /* OAC_CHECK_ASM */
+# endif /* OAC_CHECK_ASM */
 
 /* ========================================================================== */
 
-oac_val32 celt_inner_prod_neon(const oac_val16 *x, const oac_val16 *y, int N)
-{
+oac_val32 celt_inner_prod_neon(const oac_val16 *x, const oac_val16 *y, int N) {
     int i;
     oac_val32 xy;
     float32x4_t xy_f32x4 = vdupq_n_f32(0);
@@ -214,21 +209,20 @@ oac_val32 celt_inner_prod_neon(const oac_val16 *x, const oac_val16 *y, int N)
         xy = MAC16_16(xy, x[i], y[i]);
     }
 
-#ifdef OAC_CHECK_ASM
+# ifdef OAC_CHECK_ASM
     {
         float err, res;
         res = celt_inner_prod_neon_float_c_simulation(x, y, &err, N);
         /*if (ABS32(res - xy) > err) fprintf(stderr, "%g %g %g\n", res, xy, err);*/
         celt_assert(ABS32(res - xy) <= err);
     }
-#endif
+# endif
 
     return xy;
 }
 
 void dual_inner_prod_neon(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
-        int N, oac_val32 *xy1, oac_val32 *xy2)
-{
+                          int N, oac_val32 *xy1, oac_val32 *xy2) {
     int i;
     oac_val32 xy01, xy02;
     float32x4_t xy01_f32x4 = vdupq_n_f32(0);
@@ -272,17 +266,17 @@ void dual_inner_prod_neon(const oac_val16 *x, const oac_val16 *y01, const oac_va
     *xy1 = xy01;
     *xy2 = xy02;
 
-#ifdef OAC_CHECK_ASM
+# ifdef OAC_CHECK_ASM
     {
         oac_val32 xy1_c, xy2_c;
         float err[2];
         dual_inner_prod_neon_float_c_simulation(x, y01, y02, N, &xy1_c, &xy2_c, err);
         /*if (ABS32(xy1_c - *xy1) > err[0]) fprintf(stderr, "dual1 fail: %g %g %g\n", xy1_c, *xy1, err[0]);
-        if (ABS32(xy2_c - *xy2) > err[1]) fprintf(stderr, "dual2 fail: %g %g %g\n", xy2_c, *xy2, err[1]);*/
+           if (ABS32(xy2_c - *xy2) > err[1]) fprintf(stderr, "dual2 fail: %g %g %g\n", xy2_c, *xy2, err[1]);*/
         celt_assert(ABS32(xy1_c - *xy1) <= err[0]);
         celt_assert(ABS32(xy2_c - *xy2) <= err[1]);
     }
-#endif
+# endif
 }
 
 #endif /* FIXED_POINT */
diff --git a/celt/bands.c b/celt/bands.c
index 588177eff..f97b1d613 100644
--- a/celt/bands.c
+++ b/celt/bands.c
@@ -25,10 +25,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <math.h>
@@ -43,313 +43,290 @@
 #include "quant_bands.h"
 #include "pitch.h"
 
-int hysteresis_decision(oac_val16 val, const oac_val16 *thresholds, const oac_val16 *hysteresis, int N, int prev)
-{
-   int i;
-   for (i=0;i<N;i++)
-   {
-      if (val < thresholds[i])
-         break;
-   }
-   if (i>prev && val < thresholds[prev]+hysteresis[prev])
-      i=prev;
-   if (i<prev && val > thresholds[prev-1]-hysteresis[prev-1])
-      i=prev;
-   return i;
+int hysteresis_decision(oac_val16 val, const oac_val16 *thresholds, const oac_val16 *hysteresis, int N, int prev) {
+    int i;
+    for (i = 0; i < N; i++) {
+        if (val < thresholds[i])
+            break;
+    }
+    if (i > prev && val < thresholds[prev] + hysteresis[prev])
+        i = prev;
+    if (i < prev && val > thresholds[prev - 1] - hysteresis[prev - 1])
+        i = prev;
+    return i;
 }
 
-oac_uint32 celt_lcg_rand(oac_uint32 seed)
-{
-   return 1664525 * seed + 1013904223;
+oac_uint32 celt_lcg_rand(oac_uint32 seed) {
+    return 1664525*seed + 1013904223;
 }
 
 /* This is a cos() approximation designed to be bit-exact on any platform. Bit exactness
    with this approximation is important because it has an impact on the bit allocation */
-oac_int16 bitexact_cos(oac_int16 x)
-{
-   oac_int32 tmp;
-   oac_int16 x2;
-   tmp = (4096+((oac_int32)(x)*(x)))>>13;
-   celt_sig_assert(tmp<=32767);
-   x2 = tmp;
-   x2 = (32767-x2) + FRAC_MUL16(x2, (-7651 + FRAC_MUL16(x2, (8277 + FRAC_MUL16(-626, x2)))));
-   celt_sig_assert(x2<=32766);
-   return 1+x2;
+oac_int16 bitexact_cos(oac_int16 x) {
+    oac_int32 tmp;
+    oac_int16 x2;
+    tmp = (4096 + ((oac_int32)(x)*(x)))>>13;
+    celt_sig_assert(tmp <= 32767);
+    x2 = tmp;
+    x2 = (32767 - x2) + FRAC_MUL16(x2, (-7651 + FRAC_MUL16(x2, (8277 + FRAC_MUL16(-626, x2)))));
+    celt_sig_assert(x2 <= 32766);
+    return 1 + x2;
 }
 
-int bitexact_log2tan(int isin,int icos)
-{
-   int lc;
-   int ls;
-   lc=EC_ILOG(icos);
-   ls=EC_ILOG(isin);
-   icos<<=15-lc;
-   isin<<=15-ls;
-   return (ls-lc)*(1<<11)
-         +FRAC_MUL16(isin, FRAC_MUL16(isin, -2597) + 7932)
-         -FRAC_MUL16(icos, FRAC_MUL16(icos, -2597) + 7932);
+int bitexact_log2tan(int isin, int icos) {
+    int lc;
+    int ls;
+    lc = EC_ILOG(icos);
+    ls = EC_ILOG(isin);
+    icos <<= 15 - lc;
+    isin <<= 15 - ls;
+    return (ls - lc)*(1<<11)
+           + FRAC_MUL16(isin, FRAC_MUL16(isin, -2597) + 7932)
+           - FRAC_MUL16(icos, FRAC_MUL16(icos, -2597) + 7932);
 }
 
 #ifdef FIXED_POINT
 /* Compute the amplitude (sqrt energy) in each of the bands */
-void compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *bandE, int end, int C, int LM, int arch)
-{
-   int i, c, N;
-   const oac_int16 *eBands = m->eBands;
-   (void)arch;
-   N = m->shortMdctSize<<LM;
-   c=0; do {
-      for (i=0;i<end;i++)
-      {
-         int j;
-         oac_val32 maxval=0;
-         oac_val32 sum = 0;
-
-         maxval = celt_maxabs32(&X[c*N+(eBands[i]<<LM)], (eBands[i+1]-eBands[i])<<LM);
-         if (maxval > 0)
-         {
-            int shift = IMAX(0, 30 - celt_ilog2(maxval+(maxval>>14)+1) - ((((m->logN[i]+7)>>BITRES)+LM+1)>>1));
-            j=eBands[i]<<LM; do {
-               oac_val32 x = SHL32(X[j+c*N],shift);
-               sum = ADD32(sum, MULT32_32_Q31(x, x));
-            } while (++j<eBands[i+1]<<LM);
-            bandE[i+c*m->nbEBands] = MAX32(maxval, PSHR32(celt_sqrt32(SHR32(sum,1)), shift));
-         } else {
-            bandE[i+c*m->nbEBands] = EPSILON;
-         }
-      }
-   } while (++c<C);
+void compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *bandE, int end, int C, int LM, int arch) {
+    int i, c, N;
+    const oac_int16 *eBands = m->eBands;
+    (void)arch;
+    N = m->shortMdctSize<<LM;
+    c = 0; do {
+        for (i = 0; i < end; i++) {
+            int j;
+            oac_val32 maxval = 0;
+            oac_val32 sum = 0;
+
+            maxval = celt_maxabs32(&X[c*N + (eBands[i]<<LM)], (eBands[i + 1] - eBands[i])<<LM);
+            if (maxval > 0) {
+                int shift = IMAX(0,
+                30 - celt_ilog2(maxval + (maxval>>14) + 1) - ((((m->logN[i] + 7)>>BITRES) + LM + 1)>>1));
+                j = eBands[i]<<LM; do {
+                    oac_val32 x = SHL32(X[j + c*N], shift);
+                    sum = ADD32(sum, MULT32_32_Q31(x, x));
+                } while (++j < eBands[i + 1]<<LM);
+                bandE[i + c*m->nbEBands] = MAX32(maxval, PSHR32(celt_sqrt32(SHR32(sum, 1)), shift));
+            } else {
+                bandE[i + c*m->nbEBands] = EPSILON;
+            }
+        }
+    } while (++c < C);
 }
 
 /* Normalise each band such that the energy is one. */
-void normalise_bands(const CELTMode *m, const celt_sig * OAC_RESTRICT freq, celt_norm * OAC_RESTRICT X, const celt_ener *bandE, int end, int C, int M)
-{
-   int i, c, N;
-   const oac_int16 *eBands = m->eBands;
-   N = M*m->shortMdctSize;
-   c=0; do {
-      i=0; do {
-         int j,shift;
-         oac_val32 E;
-         oac_val32 g;
-         E = bandE[i+c*m->nbEBands];
-         /* For very low energies, we need this to make sure not to prevent energy rounding from
-            blowing up the normalized signal. */
-         if (E < 10) E += EPSILON;
-         shift = 30-celt_zlog2(E);
-         E = SHL32(E, shift);
-         g = celt_rcp_norm32(E);
-         j=M*eBands[i]; do {
-            X[j+c*N] = PSHR32(MULT32_32_Q31(g, SHL32(freq[j+c*N], shift)), 30-NORM_SHIFT);
-         } while (++j<M*eBands[i+1]);
-      } while (++i<end);
-   } while (++c<C);
+void normalise_bands(const CELTMode *m, const celt_sig * OAC_RESTRICT freq, celt_norm * OAC_RESTRICT X,
+                     const celt_ener *bandE, int end, int C, int M) {
+    int i, c, N;
+    const oac_int16 *eBands = m->eBands;
+    N = M*m->shortMdctSize;
+    c = 0; do {
+        i = 0; do {
+            int j, shift;
+            oac_val32 E;
+            oac_val32 g;
+            E = bandE[i + c*m->nbEBands];
+            /* For very low energies, we need this to make sure not to prevent energy rounding from
+               blowing up the normalized signal. */
+            if (E < 10) E += EPSILON;
+            shift = 30 - celt_zlog2(E);
+            E = SHL32(E, shift);
+            g = celt_rcp_norm32(E);
+            j = M*eBands[i]; do {
+                X[j + c*N] = PSHR32(MULT32_32_Q31(g, SHL32(freq[j + c*N], shift)), 30 - NORM_SHIFT);
+            } while (++j < M*eBands[i + 1]);
+        } while (++i < end);
+    } while (++c < C);
 }
 
 #else /* FIXED_POINT */
 /* Compute the amplitude (sqrt energy) in each of the bands */
-void compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *bandE, int end, int C, int LM, int arch)
-{
-   int i, c, N;
-   const oac_int16 *eBands = m->eBands;
-   N = m->shortMdctSize<<LM;
-   c=0; do {
-      for (i=0;i<end;i++)
-      {
-         oac_val32 sum;
-         sum = 1e-27f + celt_inner_prod(&X[c*N+(eBands[i]<<LM)], &X[c*N+(eBands[i]<<LM)], (eBands[i+1]-eBands[i])<<LM, arch);
-         bandE[i+c*m->nbEBands] = celt_sqrt(sum);
-         /*printf ("%f ", bandE[i+c*m->nbEBands]);*/
-      }
-   } while (++c<C);
-   /*printf ("\n");*/
+void compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *bandE, int end, int C, int LM, int arch) {
+    int i, c, N;
+    const oac_int16 *eBands = m->eBands;
+    N = m->shortMdctSize<<LM;
+    c = 0; do {
+        for (i = 0; i < end; i++) {
+            oac_val32 sum;
+            sum = 1e-27f + celt_inner_prod(&X[c*N + (eBands[i]<<LM)], &X[c*N + (eBands[i]<<LM)],
+                (eBands[i + 1] - eBands[i])<<LM, arch);
+            bandE[i + c*m->nbEBands] = celt_sqrt(sum);
+            /*printf ("%f ", bandE[i+c*m->nbEBands]);*/
+        }
+    } while (++c < C);
+    /*printf ("\n");*/
 }
 
 /* Normalise each band such that the energy is one. */
-void normalise_bands(const CELTMode *m, const celt_sig * OAC_RESTRICT freq, celt_norm * OAC_RESTRICT X, const celt_ener *bandE, int end, int C, int M)
-{
-   int i, c, N;
-   const oac_int16 *eBands = m->eBands;
-   N = M*m->shortMdctSize;
-   c=0; do {
-      for (i=0;i<end;i++)
-      {
-         int j;
-         oac_val16 g = 1.f/(1e-27f+bandE[i+c*m->nbEBands]);
-         for (j=M*eBands[i];j<M*eBands[i+1];j++)
-            X[j+c*N] = freq[j+c*N]*g;
-      }
-   } while (++c<C);
+void normalise_bands(const CELTMode *m, const celt_sig * OAC_RESTRICT freq, celt_norm * OAC_RESTRICT X,
+                     const celt_ener *bandE, int end, int C, int M) {
+    int i, c, N;
+    const oac_int16 *eBands = m->eBands;
+    N = M*m->shortMdctSize;
+    c = 0; do {
+        for (i = 0; i < end; i++) {
+            int j;
+            oac_val16 g = 1.f/(1e-27f + bandE[i + c*m->nbEBands]);
+            for (j = M*eBands[i]; j < M*eBands[i + 1]; j++)
+                X[j + c*N] = freq[j + c*N]*g;
+        }
+    } while (++c < C);
 }
 
 #endif /* FIXED_POINT */
 
 /* De-normalise the energy to produce the synthesis from the unit-energy bands */
 void denormalise_bands(const CELTMode *m, const celt_norm * OAC_RESTRICT X,
-      celt_sig * OAC_RESTRICT freq, const celt_glog *bandLogE, int start,
-      int end, int M, int downsample, int silence)
-{
-   int i, N;
-   int bound;
-   celt_sig * OAC_RESTRICT f;
-   const celt_norm * OAC_RESTRICT x;
-   const oac_int16 *eBands = m->eBands;
-   N = M*m->shortMdctSize;
-   bound = M*eBands[end];
-   if (downsample!=1)
-      bound = IMIN(bound, N/downsample);
-   if (silence)
-   {
-      bound = 0;
-      start = end = 0;
-   }
-   f = freq;
-   x = X+M*eBands[start];
-   if (start != 0)
-   {
-      for (i=0;i<M*eBands[start];i++)
-         *f++ = 0;
-   } else {
-      f += M*eBands[start];
-   }
-   for (i=start;i<end;i++)
-   {
-      int j, band_end;
-      oac_val32 g;
-      celt_glog lg;
+                       celt_sig * OAC_RESTRICT freq, const celt_glog *bandLogE, int start,
+                       int end, int M, int downsample, int silence) {
+    int i, N;
+    int bound;
+    celt_sig * OAC_RESTRICT f;
+    const celt_norm * OAC_RESTRICT x;
+    const oac_int16 *eBands = m->eBands;
+    N = M*m->shortMdctSize;
+    bound = M*eBands[end];
+    if (downsample != 1)
+        bound = IMIN(bound, N/downsample);
+    if (silence) {
+        bound = 0;
+        start = end = 0;
+    }
+    f = freq;
+    x = X + M*eBands[start];
+    if (start != 0) {
+        for (i = 0; i < M*eBands[start]; i++)
+            *f++ = 0;
+    } else {
+        f += M*eBands[start];
+    }
+    for (i = start; i < end; i++) {
+        int j, band_end;
+        oac_val32 g;
+        celt_glog lg;
 #ifdef FIXED_POINT
-      int shift;
+        int shift;
 #endif
-      j=M*eBands[i];
-      band_end = M*eBands[i+1];
-      lg = ADD32(bandLogE[i], SHL32((oac_val32)eMeans[i],DB_SHIFT-4));
+        j = M*eBands[i];
+        band_end = M*eBands[i + 1];
+        lg = ADD32(bandLogE[i], SHL32((oac_val32)eMeans[i], DB_SHIFT - 4));
 #ifndef FIXED_POINT
-      g = celt_exp2_db(MIN32(32.f, lg));
+        g = celt_exp2_db(MIN32(32.f, lg));
 #else
-      /* Handle the integer part of the log energy */
-      shift = 17-(lg>>DB_SHIFT);
-      if (shift>=31)
-      {
-         shift=0;
-         g=0;
-      } else {
-         /* Handle the fractional part. */
-         g = SHL32(celt_exp2_db_frac((lg&((1<<DB_SHIFT)-1))), 2);
-      }
-      /* Handle extreme gains with negative shift. */
-      if (shift<0)
-      {
-         /* To avoid overflow, we're
-            capping the gain here, which is equivalent to a cap of 18 on lg.
-            This shouldn't trigger unless the bitstream is already corrupted. */
-         g = 2147483647;
-         shift = 0;
-      }
+        /* Handle the integer part of the log energy */
+        shift = 17 - (lg>>DB_SHIFT);
+        if (shift >= 31) {
+            shift = 0;
+            g = 0;
+        } else {
+            /* Handle the fractional part. */
+            g = SHL32(celt_exp2_db_frac((lg&((1<<DB_SHIFT) - 1))), 2);
+        }
+        /* Handle extreme gains with negative shift. */
+        if (shift < 0) {
+            /* To avoid overflow, we're
+               capping the gain here, which is equivalent to a cap of 18 on lg.
+               This shouldn't trigger unless the bitstream is already corrupted. */
+            g = 2147483647;
+            shift = 0;
+        }
 #endif
-      do {
-         *f++ = PSHR32(MULT32_32_Q31(SHL32(*x, 30-NORM_SHIFT), g), shift);
-         x++;
-      } while (++j<band_end);
-   }
-   celt_assert(start <= end);
-   OAC_CLEAR(&freq[bound], N-bound);
+        do {
+            *f++ = PSHR32(MULT32_32_Q31(SHL32(*x, 30 - NORM_SHIFT), g), shift);
+            x++;
+        } while (++j < band_end);
+    }
+    celt_assert(start <= end);
+    OAC_CLEAR(&freq[bound], N - bound);
 }
 
 /* This prevents energy collapse for transients with multiple short MDCTs */
 void anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collapse_masks, int LM, int C, int size,
-      int start, int end, const celt_glog *logE, const celt_glog *prev1logE,
-      const celt_glog *prev2logE, const int *pulses, oac_uint32 seed, int encode, int arch)
-{
-   int c, i, j, k;
-   for (i=start;i<end;i++)
-   {
-      int N0;
-      oac_val16 thresh, sqrt_1;
-      int depth;
+                   int start, int end, const celt_glog *logE, const celt_glog *prev1logE,
+                   const celt_glog *prev2logE, const int *pulses, oac_uint32 seed, int encode, int arch) {
+    int c, i, j, k;
+    for (i = start; i < end; i++) {
+        int N0;
+        oac_val16 thresh, sqrt_1;
+        int depth;
 #ifdef FIXED_POINT
-      int shift;
-      oac_val32 thresh32;
+        int shift;
+        oac_val32 thresh32;
 #endif
 
-      N0 = m->eBands[i+1]-m->eBands[i];
-      /* depth in 1/8 bits */
-      celt_sig_assert(pulses[i]>=0);
-      depth = celt_udiv(1+pulses[i], (m->eBands[i+1]-m->eBands[i]))>>LM;
+        N0 = m->eBands[i + 1] - m->eBands[i];
+        /* depth in 1/8 bits */
+        celt_sig_assert(pulses[i] >= 0);
+        depth = celt_udiv(1 + pulses[i], (m->eBands[i + 1] - m->eBands[i]))>>LM;
 
 #ifdef FIXED_POINT
-      thresh32 = SHR32(celt_exp2(-SHL16(depth, 10-BITRES)),1);
-      thresh = MULT16_32_Q15(QCONST16(0.5f, 15), MIN32(32767,thresh32));
-      {
-         oac_val32 t;
-         t = N0<<LM;
-         shift = celt_ilog2(t)>>1;
-         t = SHL32(t, (7-shift)<<1);
-         sqrt_1 = celt_rsqrt_norm(t);
-      }
+        thresh32 = SHR32(celt_exp2(-SHL16(depth, 10 - BITRES)), 1);
+        thresh = MULT16_32_Q15(QCONST16(0.5f, 15), MIN32(32767, thresh32));
+        {
+            oac_val32 t;
+            t = N0<<LM;
+            shift = celt_ilog2(t)>>1;
+            t = SHL32(t, (7 - shift)<<1);
+            sqrt_1 = celt_rsqrt_norm(t);
+        }
 #else
-      thresh = .5f*celt_exp2(-.125f*depth);
-      sqrt_1 = celt_rsqrt(N0<<LM);
+        thresh = .5f*celt_exp2(-.125f*depth);
+        sqrt_1 = celt_rsqrt(N0<<LM);
 #endif
 
-      c=0; do
-      {
-         celt_norm *X;
-         celt_glog prev1;
-         celt_glog prev2;
-         oac_val32 Ediff;
-         celt_norm r;
-         int renormalize=0;
-         prev1 = prev1logE[c*m->nbEBands+i];
-         prev2 = prev2logE[c*m->nbEBands+i];
-         if (!encode && C==1)
-         {
-            prev1 = MAXG(prev1,prev1logE[m->nbEBands+i]);
-            prev2 = MAXG(prev2,prev2logE[m->nbEBands+i]);
-         }
-         Ediff = logE[c*m->nbEBands+i]-MING(prev1,prev2);
-         Ediff = MAX32(0, Ediff);
+        c = 0; do {
+            celt_norm *X;
+            celt_glog prev1;
+            celt_glog prev2;
+            oac_val32 Ediff;
+            celt_norm r;
+            int renormalize = 0;
+            prev1 = prev1logE[c*m->nbEBands + i];
+            prev2 = prev2logE[c*m->nbEBands + i];
+            if (!encode && C == 1) {
+                prev1 = MAXG(prev1, prev1logE[m->nbEBands + i]);
+                prev2 = MAXG(prev2, prev2logE[m->nbEBands + i]);
+            }
+            Ediff = logE[c*m->nbEBands + i] - MING(prev1, prev2);
+            Ediff = MAX32(0, Ediff);
 
 #ifdef FIXED_POINT
-         if (Ediff < GCONST(16.f))
-         {
-            oac_val32 r32 = SHR32(celt_exp2_db(-Ediff),1);
-            r = 2*MIN16(16383,r32);
-         } else {
-            r = 0;
-         }
-         if (LM==3)
-            r = MULT16_16_Q14(23170, MIN32(23169, r));
-         r = SHR16(MIN16(thresh, r),1);
-         r = VSHR32(MULT16_16_Q15(sqrt_1, r),shift+14-NORM_SHIFT);
+            if (Ediff < GCONST(16.f)) {
+                oac_val32 r32 = SHR32(celt_exp2_db(-Ediff), 1);
+                r = 2*MIN16(16383, r32);
+            } else {
+                r = 0;
+            }
+            if (LM == 3)
+                r = MULT16_16_Q14(23170, MIN32(23169, r));
+            r = SHR16(MIN16(thresh, r), 1);
+            r = VSHR32(MULT16_16_Q15(sqrt_1, r), shift + 14 - NORM_SHIFT);
 #else
-         /* r needs to be multiplied by 2 or 2*sqrt(2) depending on LM because
-            short blocks don't have the same energy as long */
-         r = 2.f*celt_exp2_db(-Ediff);
-         if (LM==3)
-            r *= 1.41421356f;
-         r = MIN16(thresh, r);
-         r = r*sqrt_1;
+            /* r needs to be multiplied by 2 or 2*sqrt(2) depending on LM because
+               short blocks don't have the same energy as long */
+            r = 2.f*celt_exp2_db(-Ediff);
+            if (LM == 3)
+                r *= 1.41421356f;
+            r = MIN16(thresh, r);
+            r = r*sqrt_1;
 #endif
-         X = X_+c*size+(m->eBands[i]<<LM);
-         for (k=0;k<1<<LM;k++)
-         {
-            /* Detect collapse */
-            if (!(collapse_masks[i*C+c]&1<<k))
-            {
-               /* Fill with noise */
-               for (j=0;j<N0;j++)
-               {
-                  seed = celt_lcg_rand(seed);
-                  X[(j<<LM)+k] = (seed&0x8000 ? r : -r);
-               }
-               renormalize = 1;
+            X = X_ + c*size + (m->eBands[i]<<LM);
+            for (k = 0; k < 1<<LM; k++) {
+                /* Detect collapse */
+                if (!(collapse_masks[i*C + c]&1<<k)) {
+                    /* Fill with noise */
+                    for (j = 0; j < N0; j++) {
+                        seed = celt_lcg_rand(seed);
+                        X[(j<<LM) + k] = (seed&0x8000 ? r : -r);
+                    }
+                    renormalize = 1;
+                }
             }
-         }
-         /* We just added some energy, so we need to renormalise */
-         if (renormalize)
-            renormalise_vector(X, N0<<LM, Q31ONE, arch);
-      } while (++c<C);
-   }
+            /* We just added some energy, so we need to renormalise */
+            if (renormalize)
+                renormalise_vector(X, N0<<LM, Q31ONE, arch);
+        } while (++c < C);
+    }
 }
 
 /* Compute the weights to use for optimizing normalized distortion across
@@ -359,205 +336,191 @@ void anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collapse_mas
    corresponds to some quick-and-dirty perceptual experiments I ran to
    measure inter-aural masking (there doesn't seem to be any published data
    on the topic). */
-static void compute_channel_weights(celt_ener Ex, celt_ener Ey, oac_val16 w[2])
-{
-   celt_ener minE;
+static void compute_channel_weights(celt_ener Ex, celt_ener Ey, oac_val16 w[2]) {
+    celt_ener minE;
 #ifdef FIXED_POINT
-   int shift;
+    int shift;
 #endif
-   minE = MIN32(Ex, Ey);
-   /* Adjustment to make the weights a bit more conservative. */
-   Ex = ADD32(Ex, minE/3);
-   Ey = ADD32(Ey, minE/3);
+    minE = MIN32(Ex, Ey);
+    /* Adjustment to make the weights a bit more conservative. */
+    Ex = ADD32(Ex, minE/3);
+    Ey = ADD32(Ey, minE/3);
 #ifdef FIXED_POINT
-   shift = celt_ilog2(EPSILON+MAX32(Ex, Ey))-14;
+    shift = celt_ilog2(EPSILON + MAX32(Ex, Ey)) - 14;
 #endif
-   w[0] = VSHR32(Ex, shift);
-   w[1] = VSHR32(Ey, shift);
+    w[0] = VSHR32(Ex, shift);
+    w[1] = VSHR32(Ey, shift);
 }
 
-static void intensity_stereo(const CELTMode *m, celt_norm * OAC_RESTRICT X, const celt_norm * OAC_RESTRICT Y, const celt_ener *bandE, int bandID, int N)
-{
-   int i = bandID;
-   int j;
-   oac_val16 a1, a2;
-   oac_val16 left, right;
-   oac_val16 norm;
+static void intensity_stereo(const CELTMode *m, celt_norm * OAC_RESTRICT X, const celt_norm * OAC_RESTRICT Y,
+                             const celt_ener *bandE, int bandID, int N) {
+    int i = bandID;
+    int j;
+    oac_val16 a1, a2;
+    oac_val16 left, right;
+    oac_val16 norm;
 #ifdef FIXED_POINT
-   int shift = celt_zlog2(MAX32(bandE[i], bandE[i+m->nbEBands]))-13;
+    int shift = celt_zlog2(MAX32(bandE[i], bandE[i + m->nbEBands])) - 13;
 #endif
-   left = VSHR32(bandE[i],shift);
-   right = VSHR32(bandE[i+m->nbEBands],shift);
-   norm = EPSILON + celt_sqrt(EPSILON+MULT16_16(left,left)+MULT16_16(right,right));
+    left = VSHR32(bandE[i], shift);
+    right = VSHR32(bandE[i + m->nbEBands], shift);
+    norm = EPSILON + celt_sqrt(EPSILON + MULT16_16(left, left) + MULT16_16(right, right));
 #ifdef FIXED_POINT
-   left = MIN32(left, norm-1);
-   right = MIN32(right, norm-1);
+    left = MIN32(left, norm - 1);
+    right = MIN32(right, norm - 1);
 #endif
-   a1 = DIV32_16(SHL32(EXTEND32(left),15),norm);
-   a2 = DIV32_16(SHL32(EXTEND32(right),15),norm);
-   for (j=0;j<N;j++)
-   {
-      X[j] = ADD32(MULT16_32_Q15(a1, X[j]), MULT16_32_Q15(a2, Y[j]));
-      /* Side is not encoded, no need to calculate */
-   }
+    a1 = DIV32_16(SHL32(EXTEND32(left), 15), norm);
+    a2 = DIV32_16(SHL32(EXTEND32(right), 15), norm);
+    for (j = 0; j < N; j++) {
+        X[j] = ADD32(MULT16_32_Q15(a1, X[j]), MULT16_32_Q15(a2, Y[j]));
+        /* Side is not encoded, no need to calculate */
+    }
 }
 
-static void stereo_split(celt_norm * OAC_RESTRICT X, celt_norm * OAC_RESTRICT Y, int N)
-{
-   int j;
-   for (j=0;j<N;j++)
-   {
-      oac_val32 r, l;
-      l = MULT32_32_Q31(QCONST32(.70710678f,31), X[j]);
-      r = MULT32_32_Q31(QCONST32(.70710678f,31), Y[j]);
-      X[j] = ADD32(l, r);
-      Y[j] = SUB32(r, l);
-   }
+static void stereo_split(celt_norm * OAC_RESTRICT X, celt_norm * OAC_RESTRICT Y, int N) {
+    int j;
+    for (j = 0; j < N; j++) {
+        oac_val32 r, l;
+        l = MULT32_32_Q31(QCONST32(.70710678f, 31), X[j]);
+        r = MULT32_32_Q31(QCONST32(.70710678f, 31), Y[j]);
+        X[j] = ADD32(l, r);
+        Y[j] = SUB32(r, l);
+    }
 }
 
-static void stereo_merge(celt_norm * OAC_RESTRICT X, celt_norm * OAC_RESTRICT Y, oac_val32 mid, int N, int arch)
-{
-   int j;
-   oac_val32 xp=0, side=0;
-   oac_val32 El, Er;
+static void stereo_merge(celt_norm * OAC_RESTRICT X, celt_norm * OAC_RESTRICT Y, oac_val32 mid, int N, int arch) {
+    int j;
+    oac_val32 xp = 0, side = 0;
+    oac_val32 El, Er;
 #ifdef FIXED_POINT
-   int kl, kr;
+    int kl, kr;
 #endif
-   oac_val32 t, lgain, rgain;
-
-   /* Compute the norm of X+Y and X-Y as |X|^2 + |Y|^2 +/- sum(xy) */
-   xp = celt_inner_prod_norm_shift(Y, X, N, arch);
-   side = celt_inner_prod_norm_shift(Y, Y, N, arch);
-   /* Compensating for the mid normalization */
-   xp = MULT32_32_Q31(mid, xp);
-   /* mid and side are in Q15, not Q14 like X and Y */
-   El = SHR32(MULT32_32_Q31(mid, mid),3) + side - 2*xp;
-   Er = SHR32(MULT32_32_Q31(mid, mid),3) + side + 2*xp;
-   if (Er < QCONST32(6e-4f, 28) || El < QCONST32(6e-4f, 28))
-   {
-      OAC_COPY(Y, X, N);
-      return;
-   }
+    oac_val32 t, lgain, rgain;
+
+    /* Compute the norm of X+Y and X-Y as |X|^2 + |Y|^2 +/- sum(xy) */
+    xp = celt_inner_prod_norm_shift(Y, X, N, arch);
+    side = celt_inner_prod_norm_shift(Y, Y, N, arch);
+    /* Compensating for the mid normalization */
+    xp = MULT32_32_Q31(mid, xp);
+    /* mid and side are in Q15, not Q14 like X and Y */
+    El = SHR32(MULT32_32_Q31(mid, mid), 3) + side - 2*xp;
+    Er = SHR32(MULT32_32_Q31(mid, mid), 3) + side + 2*xp;
+    if (Er < QCONST32(6e-4f, 28) || El < QCONST32(6e-4f, 28)) {
+        OAC_COPY(Y, X, N);
+        return;
+    }
 
 #ifdef FIXED_POINT
-   kl = celt_ilog2(El)>>1;
-   kr = celt_ilog2(Er)>>1;
+    kl = celt_ilog2(El)>>1;
+    kr = celt_ilog2(Er)>>1;
 #endif
-   t = VSHR32(El, (kl<<1)-29);
-   lgain = celt_rsqrt_norm32(t);
-   t = VSHR32(Er, (kr<<1)-29);
-   rgain = celt_rsqrt_norm32(t);
+    t = VSHR32(El, (kl<<1) - 29);
+    lgain = celt_rsqrt_norm32(t);
+    t = VSHR32(Er, (kr<<1) - 29);
+    rgain = celt_rsqrt_norm32(t);
 
 #ifdef FIXED_POINT
-   if (kl < 7)
-      kl = 7;
-   if (kr < 7)
-      kr = 7;
+    if (kl < 7)
+        kl = 7;
+    if (kr < 7)
+        kr = 7;
 #endif
 
-   for (j=0;j<N;j++)
-   {
-      celt_norm r, l;
-      /* Apply mid scaling (side is already scaled) */
-      l = MULT32_32_Q31(mid, X[j]);
-      r = Y[j];
-      X[j] = VSHR32(MULT32_32_Q31(lgain, SUB32(l,r)), kl-15);
-      Y[j] = VSHR32(MULT32_32_Q31(rgain, ADD32(l,r)), kr-15);
-   }
+    for (j = 0; j < N; j++) {
+        celt_norm r, l;
+        /* Apply mid scaling (side is already scaled) */
+        l = MULT32_32_Q31(mid, X[j]);
+        r = Y[j];
+        X[j] = VSHR32(MULT32_32_Q31(lgain, SUB32(l, r)), kl - 15);
+        Y[j] = VSHR32(MULT32_32_Q31(rgain, ADD32(l, r)), kr - 15);
+    }
 }
 
 /* Decide whether we should spread the pulses in the current frame */
 int spreading_decision(const CELTMode *m, const celt_norm *X, int *average,
-      int last_decision, int *hf_average, int *tapset_decision, int update_hf,
-      int end, int C, int M, const int *spread_weight)
-{
-   int i, c, N0;
-   int sum = 0, nbBands=0;
-   const oac_int16 * OAC_RESTRICT eBands = m->eBands;
-   int decision;
-   int hf_sum=0;
-
-   celt_assert(end>0);
-
-   N0 = M*m->shortMdctSize;
-
-   if (M*(eBands[end]-eBands[end-1]) <= 8)
-      return SPREAD_NONE;
-   c=0; do {
-      for (i=0;i<end;i++)
-      {
-         int j, N, tmp=0;
-         int tcount[3] = {0,0,0};
-         const celt_norm * OAC_RESTRICT x = X+M*eBands[i]+c*N0;
-         N = M*(eBands[i+1]-eBands[i]);
-         if (N<=8)
-            continue;
-         /* Compute rough CDF of |x[j]| */
-         for (j=0;j<N;j++)
-         {
-            oac_val32 x2N; /* Q13 */
-
-            x2N = MULT16_16(MULT16_16_Q15(SHR32(x[j], NORM_SHIFT-14), SHR32(x[j], NORM_SHIFT-14)), N);
-            if (x2N < QCONST16(0.25f,13))
-               tcount[0]++;
-            if (x2N < QCONST16(0.0625f,13))
-               tcount[1]++;
-            if (x2N < QCONST16(0.015625f,13))
-               tcount[2]++;
-         }
-
-         /* Only include four last bands (8 kHz and up) */
-         if (i>m->nbEBands-4)
-            hf_sum += celt_udiv(32*(tcount[1]+tcount[0]), N);
-         tmp = (2*tcount[2] >= N) + (2*tcount[1] >= N) + (2*tcount[0] >= N);
-         sum += tmp*spread_weight[i];
-         nbBands+=spread_weight[i];
-      }
-   } while (++c<C);
-
-   if (update_hf)
-   {
-      if (hf_sum)
-         hf_sum = celt_udiv(hf_sum, C*(4-m->nbEBands+end));
-      *hf_average = (*hf_average+hf_sum)>>1;
-      hf_sum = *hf_average;
-      if (*tapset_decision==2)
-         hf_sum += 4;
-      else if (*tapset_decision==0)
-         hf_sum -= 4;
-      if (hf_sum > 22)
-         *tapset_decision=2;
-      else if (hf_sum > 18)
-         *tapset_decision=1;
-      else
-         *tapset_decision=0;
-   }
-   /*printf("%d %d %d\n", hf_sum, *hf_average, *tapset_decision);*/
-   celt_assert(nbBands>0); /* end has to be non-zero */
-   celt_assert(sum>=0);
-   sum = celt_udiv((oac_int32)sum<<8, nbBands);
-   /* Recursive averaging */
-   sum = (sum+*average)>>1;
-   *average = sum;
-   /* Hysteresis */
-   sum = (3*sum + (((3-last_decision)<<7) + 64) + 2)>>2;
-   if (sum < 80)
-   {
-      decision = SPREAD_AGGRESSIVE;
-   } else if (sum < 256)
-   {
-      decision = SPREAD_NORMAL;
-   } else if (sum < 384)
-   {
-      decision = SPREAD_LIGHT;
-   } else {
-      decision = SPREAD_NONE;
-   }
+                       int last_decision, int *hf_average, int *tapset_decision, int update_hf,
+                       int end, int C, int M, const int *spread_weight) {
+    int i, c, N0;
+    int sum = 0, nbBands = 0;
+    const oac_int16 * OAC_RESTRICT eBands = m->eBands;
+    int decision;
+    int hf_sum = 0;
+
+    celt_assert(end > 0);
+
+    N0 = M*m->shortMdctSize;
+
+    if (M*(eBands[end] - eBands[end - 1]) <= 8)
+        return SPREAD_NONE;
+    c = 0; do {
+        for (i = 0; i < end; i++) {
+            int j, N, tmp = 0;
+            int tcount[3] = {0, 0, 0};
+            const celt_norm * OAC_RESTRICT x = X + M*eBands[i] + c*N0;
+            N = M*(eBands[i + 1] - eBands[i]);
+            if (N <= 8)
+                continue;
+            /* Compute rough CDF of |x[j]| */
+            for (j = 0; j < N; j++) {
+                oac_val32 x2N; /* Q13 */
+
+                x2N = MULT16_16(MULT16_16_Q15(SHR32(x[j], NORM_SHIFT - 14), SHR32(x[j], NORM_SHIFT - 14)), N);
+                if (x2N < QCONST16(0.25f, 13))
+                    tcount[0]++;
+                if (x2N < QCONST16(0.0625f, 13))
+                    tcount[1]++;
+                if (x2N < QCONST16(0.015625f, 13))
+                    tcount[2]++;
+            }
+
+            /* Only include four last bands (8 kHz and up) */
+            if (i > m->nbEBands - 4)
+                hf_sum += celt_udiv(32*(tcount[1] + tcount[0]), N);
+            tmp = (2*tcount[2] >= N) + (2*tcount[1] >= N) + (2*tcount[0] >= N);
+            sum += tmp*spread_weight[i];
+            nbBands += spread_weight[i];
+        }
+    } while (++c < C);
+
+    if (update_hf) {
+        if (hf_sum)
+            hf_sum = celt_udiv(hf_sum, C*(4 - m->nbEBands + end));
+        *hf_average = (*hf_average + hf_sum)>>1;
+        hf_sum = *hf_average;
+        if (*tapset_decision == 2)
+            hf_sum += 4;
+        else if (*tapset_decision == 0)
+            hf_sum -= 4;
+        if (hf_sum > 22)
+            *tapset_decision = 2;
+        else if (hf_sum > 18)
+            *tapset_decision = 1;
+        else
+            *tapset_decision = 0;
+    }
+    /*printf("%d %d %d\n", hf_sum, *hf_average, *tapset_decision);*/
+    celt_assert(nbBands > 0); /* end has to be non-zero */
+    celt_assert(sum >= 0);
+    sum = celt_udiv((oac_int32)sum<<8, nbBands);
+    /* Recursive averaging */
+    sum = (sum + *average)>>1;
+    *average = sum;
+    /* Hysteresis */
+    sum = (3*sum + (((3 - last_decision)<<7) + 64) + 2)>>2;
+    if (sum < 80) {
+        decision = SPREAD_AGGRESSIVE;
+    } else if (sum < 256) {
+        decision = SPREAD_NORMAL;
+    } else if (sum < 384) {
+        decision = SPREAD_LIGHT;
+    } else {
+        decision = SPREAD_NONE;
+    }
 #ifdef FUZZING
-   decision = rand()&0x3;
-   *tapset_decision=rand()%3;
+    decision = rand()&0x3;
+    *tapset_decision = rand()%3;
 #endif
-   return decision;
+    return decision;
 }
 
 /* Indexing table for converting from natural Hadamard to ordery Hadamard
@@ -565,372 +528,344 @@ int spreading_decision(const CELTMode *m, const celt_norm *X, int *average,
    an inversion of the order because we want the DC at the end rather than
    the beginning. The lines are for N=2, 4, 8, 16 */
 static const int ordery_table[] = {
-       1,  0,
-       3,  0,  2,  1,
-       7,  0,  4,  3,  6,  1,  5,  2,
-      15,  0,  8,  7, 12,  3, 11,  4, 14,  1,  9,  6, 13,  2, 10,  5,
+    1,  0,
+    3,  0,  2,  1,
+    7,  0,  4,  3,  6,  1,  5,  2,
+    15,  0,  8,  7, 12,  3, 11,  4, 14,  1,  9,  6, 13,  2, 10,  5,
 };
 
-static void deinterleave_hadamard(celt_norm *X, int N0, int stride, int hadamard)
-{
-   int i,j;
-   VARDECL(celt_norm, tmp);
-   int N;
-   SAVE_STACK;
-   N = N0*stride;
-   ALLOC(tmp, N, celt_norm);
-   celt_assert(stride>0);
-   if (hadamard)
-   {
-      const int *ordery = ordery_table+stride-2;
-      for (i=0;i<stride;i++)
-      {
-         for (j=0;j<N0;j++)
-            tmp[ordery[i]*N0+j] = X[j*stride+i];
-      }
-   } else {
-      for (i=0;i<stride;i++)
-         for (j=0;j<N0;j++)
-            tmp[i*N0+j] = X[j*stride+i];
-   }
-   OAC_COPY(X, tmp, N);
-   RESTORE_STACK;
+static void deinterleave_hadamard(celt_norm *X, int N0, int stride, int hadamard) {
+    int i, j;
+    VARDECL(celt_norm, tmp);
+    int N;
+    SAVE_STACK;
+    N = N0*stride;
+    ALLOC(tmp, N, celt_norm);
+    celt_assert(stride > 0);
+    if (hadamard) {
+        const int *ordery = ordery_table + stride - 2;
+        for (i = 0; i < stride; i++) {
+            for (j = 0; j < N0; j++)
+                tmp[ordery[i]*N0 + j] = X[j*stride + i];
+        }
+    } else {
+        for (i = 0; i < stride; i++)
+            for (j = 0; j < N0; j++)
+                tmp[i*N0 + j] = X[j*stride + i];
+    }
+    OAC_COPY(X, tmp, N);
+    RESTORE_STACK;
 }
 
-static void interleave_hadamard(celt_norm *X, int N0, int stride, int hadamard)
-{
-   int i,j;
-   VARDECL(celt_norm, tmp);
-   int N;
-   SAVE_STACK;
-   N = N0*stride;
-   ALLOC(tmp, N, celt_norm);
-   if (hadamard)
-   {
-      const int *ordery = ordery_table+stride-2;
-      for (i=0;i<stride;i++)
-         for (j=0;j<N0;j++)
-            tmp[j*stride+i] = X[ordery[i]*N0+j];
-   } else {
-      for (i=0;i<stride;i++)
-         for (j=0;j<N0;j++)
-            tmp[j*stride+i] = X[i*N0+j];
-   }
-   OAC_COPY(X, tmp, N);
-   RESTORE_STACK;
+static void interleave_hadamard(celt_norm *X, int N0, int stride, int hadamard) {
+    int i, j;
+    VARDECL(celt_norm, tmp);
+    int N;
+    SAVE_STACK;
+    N = N0*stride;
+    ALLOC(tmp, N, celt_norm);
+    if (hadamard) {
+        const int *ordery = ordery_table + stride - 2;
+        for (i = 0; i < stride; i++)
+            for (j = 0; j < N0; j++)
+                tmp[j*stride + i] = X[ordery[i]*N0 + j];
+    } else {
+        for (i = 0; i < stride; i++)
+            for (j = 0; j < N0; j++)
+                tmp[j*stride + i] = X[i*N0 + j];
+    }
+    OAC_COPY(X, tmp, N);
+    RESTORE_STACK;
 }
 
-void haar1(celt_norm *X, int N0, int stride)
-{
-   int i, j;
-   N0 >>= 1;
-   for (i=0;i<stride;i++)
-      for (j=0;j<N0;j++)
-      {
-         oac_val32 tmp1, tmp2;
-         tmp1 = MULT32_32_Q31(QCONST32(.70710678f,31), X[stride*2*j+i]);
-         tmp2 = MULT32_32_Q31(QCONST32(.70710678f,31), X[stride*(2*j+1)+i]);
-         X[stride*2*j+i] = ADD32(tmp1, tmp2);
-         X[stride*(2*j+1)+i] = SUB32(tmp1, tmp2);
-      }
+void haar1(celt_norm *X, int N0, int stride) {
+    int i, j;
+    N0 >>= 1;
+    for (i = 0; i < stride; i++)
+        for (j = 0; j < N0; j++) {
+            oac_val32 tmp1, tmp2;
+            tmp1 = MULT32_32_Q31(QCONST32(.70710678f, 31), X[stride*2*j + i]);
+            tmp2 = MULT32_32_Q31(QCONST32(.70710678f, 31), X[stride*(2*j + 1) + i]);
+            X[stride*2*j + i] = ADD32(tmp1, tmp2);
+            X[stride*(2*j + 1) + i] = SUB32(tmp1, tmp2);
+        }
 }
 
-static int compute_qn(int N, int b, int offset, int pulse_cap, int stereo)
-{
-   static const oac_int16 exp2_table8[8] =
-      {16384, 17866, 19483, 21247, 23170, 25267, 27554, 30048};
-   int qn, qb;
-   int N2 = 2*N-1;
-   if (stereo && N==2)
-      N2--;
-   /* The upper limit ensures that in a stereo split with itheta==16384, we'll
-       always have enough bits left over to code at least one pulse in the
-       side; otherwise it would collapse, since it doesn't get folded. */
-   qb = celt_sudiv(b+N2*offset, N2);
-   qb = IMIN(b-pulse_cap-(4<<BITRES), qb);
-
-   qb = IMIN(8<<BITRES, qb);
-
-   if (qb<(1<<BITRES>>1)) {
-      qn = 1;
-   } else {
-      qn = exp2_table8[qb&0x7]>>(14-(qb>>BITRES));
-      qn = (qn+1)>>1<<1;
-   }
-   celt_assert(qn <= 256);
-   return qn;
+static int compute_qn(int N, int b, int offset, int pulse_cap, int stereo) {
+    static const oac_int16 exp2_table8[8] =
+    {16384, 17866, 19483, 21247, 23170, 25267, 27554, 30048};
+    int qn, qb;
+    int N2 = 2*N - 1;
+    if (stereo && N == 2)
+        N2--;
+    /* The upper limit ensures that in a stereo split with itheta==16384, we'll
+        always have enough bits left over to code at least one pulse in the
+        side; otherwise it would collapse, since it doesn't get folded. */
+    qb = celt_sudiv(b + N2*offset, N2);
+    qb = IMIN(b - pulse_cap - (4<<BITRES), qb);
+
+    qb = IMIN(8<<BITRES, qb);
+
+    if (qb < (1<<BITRES>>1)) {
+        qn = 1;
+    } else {
+        qn = exp2_table8[qb&0x7]>>(14 - (qb>>BITRES));
+        qn = (qn + 1)>>1<<1;
+    }
+    celt_assert(qn <= 256);
+    return qn;
 }
 
 struct band_ctx {
-   int encode;
-   int resynth;
-   const CELTMode *m;
-   int i;
-   int intensity;
-   int spread;
-   int tf_change;
-   ec_ctx *ec;
-   oac_int32 remaining_bits;
-   const celt_ener *bandE;
-   oac_uint32 seed;
-   int arch;
-   int theta_round;
-   int disable_inv;
-   int avoid_split_noise;
+    int encode;
+    int resynth;
+    const CELTMode *m;
+    int i;
+    int intensity;
+    int spread;
+    int tf_change;
+    ec_ctx *ec;
+    oac_int32 remaining_bits;
+    const celt_ener *bandE;
+    oac_uint32 seed;
+    int arch;
+    int theta_round;
+    int disable_inv;
+    int avoid_split_noise;
 };
 
 struct split_ctx {
-   int inv;
-   int imid;
-   int iside;
-   int delta;
-   int itheta;
-   int itheta_q30;
-   int qalloc;
+    int inv;
+    int imid;
+    int iside;
+    int delta;
+    int itheta;
+    int itheta_q30;
+    int qalloc;
 };
 
 static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
-      celt_norm *X, celt_norm *Y, int N, int *b, int B, int B0,
-      int LM,
-      int stereo, int *fill)
-{
-   int qn;
-   int itheta=0;
-   int itheta_q30=0;
-   int delta;
-   int imid, iside;
-   int qalloc;
-   int pulse_cap;
-   int offset;
-   oac_int32 tell;
-   int inv=0;
-   int encode;
-   const CELTMode *m;
-   int i;
-   int intensity;
-   ec_ctx *ec;
-   const celt_ener *bandE;
-
-   encode = ctx->encode;
-   m = ctx->m;
-   i = ctx->i;
-   intensity = ctx->intensity;
-   ec = ctx->ec;
-   bandE = ctx->bandE;
-
-   /* Decide on the resolution to give to the split parameter theta */
-   pulse_cap = m->logN[i]+LM*(1<<BITRES);
-   offset = (pulse_cap>>1) - (stereo&&N==2 ? QTHETA_OFFSET_TWOPHASE : QTHETA_OFFSET);
-   qn = compute_qn(N, *b, offset, pulse_cap, stereo);
-   if (stereo && i>=intensity)
-      qn = 1;
-   if (encode)
-   {
-      /* theta is the atan() of the ratio between the (normalized)
-         side and mid. With just that parameter, we can re-scale both
-         mid and side because we know that 1) they have unit norm and
-         2) they are orthogonal. */
-      itheta_q30 = stereo_itheta(X, Y, stereo, N, ctx->arch);
-      itheta = itheta_q30>>16;
-   }
-   tell = ec_tell_frac(ec);
-   if (qn!=1)
-   {
-      if (encode)
-      {
-         if (!stereo || ctx->theta_round == 0)
-         {
-            itheta = (itheta*(oac_int32)qn+8192)>>14;
-            if (!stereo && ctx->avoid_split_noise && itheta > 0 && itheta < qn)
-            {
-               /* Check if the selected value of theta will cause the bit allocation
-                  to inject noise on one side. If so, make sure the energy of that side
-                  is zero. */
-               int unquantized = celt_udiv((oac_int32)itheta*16384, qn);
-               imid = bitexact_cos((oac_int16)unquantized);
-               iside = bitexact_cos((oac_int16)(16384-unquantized));
-               delta = FRAC_MUL16((N-1)<<7,bitexact_log2tan(iside,imid));
-               if (delta > *b)
-                  itheta = qn;
-               else if (delta < -*b)
-                  itheta = 0;
+                          celt_norm *X, celt_norm *Y, int N, int *b, int B, int B0,
+                          int LM,
+                          int stereo, int *fill) {
+    int qn;
+    int itheta = 0;
+    int itheta_q30 = 0;
+    int delta;
+    int imid, iside;
+    int qalloc;
+    int pulse_cap;
+    int offset;
+    oac_int32 tell;
+    int inv = 0;
+    int encode;
+    const CELTMode *m;
+    int i;
+    int intensity;
+    ec_ctx *ec;
+    const celt_ener *bandE;
+
+    encode = ctx->encode;
+    m = ctx->m;
+    i = ctx->i;
+    intensity = ctx->intensity;
+    ec = ctx->ec;
+    bandE = ctx->bandE;
+
+    /* Decide on the resolution to give to the split parameter theta */
+    pulse_cap = m->logN[i] + LM*(1<<BITRES);
+    offset = (pulse_cap>>1) - (stereo && N == 2 ? QTHETA_OFFSET_TWOPHASE : QTHETA_OFFSET);
+    qn = compute_qn(N, *b, offset, pulse_cap, stereo);
+    if (stereo && i >= intensity)
+        qn = 1;
+    if (encode) {
+        /* theta is the atan() of the ratio between the (normalized)
+           side and mid. With just that parameter, we can re-scale both
+           mid and side because we know that 1) they have unit norm and
+           2) they are orthogonal. */
+        itheta_q30 = stereo_itheta(X, Y, stereo, N, ctx->arch);
+        itheta = itheta_q30>>16;
+    }
+    tell = ec_tell_frac(ec);
+    if (qn != 1) {
+        if (encode) {
+            if (!stereo || ctx->theta_round == 0) {
+                itheta = (itheta*(oac_int32)qn + 8192)>>14;
+                if (!stereo && ctx->avoid_split_noise && itheta > 0 && itheta < qn) {
+                    /* Check if the selected value of theta will cause the bit allocation
+                       to inject noise on one side. If so, make sure the energy of that side
+                       is zero. */
+                    int unquantized = celt_udiv((oac_int32)itheta*16384, qn);
+                    imid = bitexact_cos((oac_int16)unquantized);
+                    iside = bitexact_cos((oac_int16)(16384 - unquantized));
+                    delta = FRAC_MUL16((N - 1)<<7, bitexact_log2tan(iside, imid));
+                    if (delta > *b)
+                        itheta = qn;
+                    else if (delta < -*b)
+                        itheta = 0;
+                }
+            } else {
+                int down;
+                /* Bias quantization towards itheta=0 and itheta=16384. */
+                int bias = itheta > 8192 ? 32767/qn : -32767/qn;
+                down = IMIN(qn - 1, IMAX(0, (itheta*(oac_int32)qn + bias)>>14));
+                if (ctx->theta_round < 0)
+                    itheta = down;
+                else
+                    itheta = down + 1;
             }
-         } else {
-            int down;
-            /* Bias quantization towards itheta=0 and itheta=16384. */
-            int bias = itheta > 8192 ? 32767/qn : -32767/qn;
-            down = IMIN(qn-1, IMAX(0, (itheta*(oac_int32)qn + bias)>>14));
-            if (ctx->theta_round < 0)
-               itheta = down;
-            else
-               itheta = down+1;
-         }
-      }
-      /* Entropy coding of the angle. We use a uniform pdf for the
-         time split, a step for stereo, and a triangular one for the rest. */
-      if (stereo && N>2)
-      {
-         int p0 = 3;
-         int x = itheta;
-         int x0 = qn/2;
-         int ft = p0*(x0+1) + x0;
-         /* Use a probability of p0 up to itheta=8192 and then use 1 after */
-         if (encode)
-         {
-            ec_encode(ec,x<=x0?p0*x:(x-1-x0)+(x0+1)*p0,x<=x0?p0*(x+1):(x-x0)+(x0+1)*p0,ft);
-         } else {
-            int fs;
-            fs=ec_decode(ec,ft);
-            if (fs<(x0+1)*p0)
-               x=fs/p0;
+        }
+        /* Entropy coding of the angle. We use a uniform pdf for the
+           time split, a step for stereo, and a triangular one for the rest. */
+        if (stereo && N > 2) {
+            int p0 = 3;
+            int x = itheta;
+            int x0 = qn/2;
+            int ft = p0*(x0 + 1) + x0;
+            /* Use a probability of p0 up to itheta=8192 and then use 1 after */
+            if (encode) {
+                ec_encode(ec, x <= x0?p0*x:(x - 1 - x0) + (x0 + 1)*p0, x <= x0?p0*(x + 1):(x - x0) + (x0 + 1)*p0, ft);
+            } else {
+                int fs;
+                fs = ec_decode(ec, ft);
+                if (fs < (x0 + 1)*p0)
+                    x = fs/p0;
+                else
+                    x = x0 + 1 + (fs - (x0 + 1)*p0);
+                ec_dec_update(ec, x <= x0?p0*x:(x - 1 - x0) + (x0 + 1)*p0, x <= x0?p0*(x + 1):(x - x0) + (x0 + 1)*p0,
+                ft);
+                itheta = x;
+            }
+        } else if (B0 > 1 || stereo) {
+            /* Uniform pdf */
+            if (encode)
+                ec_enc_uint(ec, itheta, qn + 1);
             else
-               x=x0+1+(fs-(x0+1)*p0);
-            ec_dec_update(ec,x<=x0?p0*x:(x-1-x0)+(x0+1)*p0,x<=x0?p0*(x+1):(x-x0)+(x0+1)*p0,ft);
-            itheta = x;
-         }
-      } else if (B0>1 || stereo) {
-         /* Uniform pdf */
-         if (encode)
-            ec_enc_uint(ec, itheta, qn+1);
-         else
-            itheta = ec_dec_uint(ec, qn+1);
-      } else {
-         int fs=1, ft;
-         ft = ((qn>>1)+1)*((qn>>1)+1);
-         if (encode)
-         {
-            int fl;
-
-            fs = itheta <= (qn>>1) ? itheta + 1 : qn + 1 - itheta;
-            fl = itheta <= (qn>>1) ? itheta*(itheta + 1)>>1 :
-             ft - ((qn + 1 - itheta)*(qn + 2 - itheta)>>1);
-
-            ec_encode(ec, fl, fl+fs, ft);
-         } else {
-            /* Triangular pdf */
-            int fl=0;
-            int fm;
-            fm = ec_decode(ec, ft);
-
-            if (fm < ((qn>>1)*((qn>>1) + 1)>>1))
-            {
-               itheta = (isqrt32(8*(oac_uint32)fm + 1) - 1)>>1;
-               fs = itheta + 1;
-               fl = itheta*(itheta + 1)>>1;
+                itheta = ec_dec_uint(ec, qn + 1);
+        } else {
+            int fs = 1, ft;
+            ft = ((qn>>1) + 1)*((qn>>1) + 1);
+            if (encode) {
+                int fl;
+
+                fs = itheta <= (qn>>1) ? itheta + 1 : qn + 1 - itheta;
+                fl = itheta <= (qn>>1) ? itheta*(itheta + 1)>>1 :
+                     ft - ((qn + 1 - itheta)*(qn + 2 - itheta)>>1);
+
+                ec_encode(ec, fl, fl + fs, ft);
+            } else {
+                /* Triangular pdf */
+                int fl = 0;
+                int fm;
+                fm = ec_decode(ec, ft);
+
+                if (fm < ((qn>>1)*((qn>>1) + 1)>>1)) {
+                    itheta = (isqrt32(8*(oac_uint32)fm + 1) - 1)>>1;
+                    fs = itheta + 1;
+                    fl = itheta*(itheta + 1)>>1;
+                } else {
+                    itheta = (2*(qn + 1)
+                              - isqrt32(8*(oac_uint32)(ft - fm - 1) + 1))>>1;
+                    fs = qn + 1 - itheta;
+                    fl = ft - ((qn + 1 - itheta)*(qn + 2 - itheta)>>1);
+                }
+
+                ec_dec_update(ec, fl, fl + fs, ft);
             }
+        }
+        celt_assert(itheta >= 0);
+        itheta = celt_udiv((oac_int32)itheta*16384, qn);
+        itheta_q30 = (oac_int32)itheta<<16;
+        if (encode && stereo) {
+            if (itheta == 0)
+                intensity_stereo(m, X, Y, bandE, i, N);
             else
-            {
-               itheta = (2*(qn + 1)
-                - isqrt32(8*(oac_uint32)(ft - fm - 1) + 1))>>1;
-               fs = qn + 1 - itheta;
-               fl = ft - ((qn + 1 - itheta)*(qn + 2 - itheta)>>1);
+                stereo_split(X, Y, N);
+        }
+        /* NOTE: Renormalising X and Y *may* help fixed-point a bit at very high rate.
+                 Let's do that at higher complexity */
+    } else if (stereo) {
+        if (encode) {
+            inv = itheta > 8192 && !ctx->disable_inv;
+            if (inv) {
+                int j;
+                for (j = 0; j < N; j++)
+                    Y[j] = -Y[j];
             }
-
-            ec_dec_update(ec, fl, fl+fs, ft);
-         }
-      }
-      celt_assert(itheta>=0);
-      itheta = celt_udiv((oac_int32)itheta*16384, qn);
-      itheta_q30 = (oac_int32)itheta<<16;
-      if (encode && stereo)
-      {
-         if (itheta==0)
             intensity_stereo(m, X, Y, bandE, i, N);
-         else
-            stereo_split(X, Y, N);
-      }
-      /* NOTE: Renormalising X and Y *may* help fixed-point a bit at very high rate.
-               Let's do that at higher complexity */
-   } else if (stereo) {
-      if (encode)
-      {
-         inv = itheta > 8192 && !ctx->disable_inv;
-         if (inv)
-         {
-            int j;
-            for (j=0;j<N;j++)
-               Y[j] = -Y[j];
-         }
-         intensity_stereo(m, X, Y, bandE, i, N);
-      }
-      if (*b>2<<BITRES && ctx->remaining_bits > 2<<BITRES)
-      {
-         if (encode)
-            ec_enc_bit_logp(ec, inv, 2);
-         else
-            inv = ec_dec_bit_logp(ec, 2);
-      } else
-         inv = 0;
-      /* inv flag override to avoid problems with downmixing. */
-      if (ctx->disable_inv)
-         inv = 0;
-      itheta = 0;
-      itheta_q30 = 0;
-   }
-   qalloc = ec_tell_frac(ec) - tell;
-   *b -= qalloc;
-
-   if (itheta == 0)
-   {
-      imid = 32767;
-      iside = 0;
-      *fill &= (1<<B)-1;
-      delta = -16384;
-   } else if (itheta == 16384)
-   {
-      imid = 0;
-      iside = 32767;
-      *fill &= ((1<<B)-1)<<B;
-      delta = 16384;
-   } else {
-      imid = bitexact_cos((oac_int16)itheta);
-      iside = bitexact_cos((oac_int16)(16384-itheta));
-      /* This is the mid vs side allocation that minimizes squared error
-         in that band. */
-      delta = FRAC_MUL16((N-1)<<7,bitexact_log2tan(iside,imid));
-   }
-
-   sctx->inv = inv;
-   sctx->imid = imid;
-   sctx->iside = iside;
-   sctx->delta = delta;
-   sctx->itheta = itheta;
-   sctx->itheta_q30 = itheta_q30;
-   sctx->qalloc = qalloc;
+        }
+        if (*b > 2<<BITRES && ctx->remaining_bits > 2<<BITRES) {
+            if (encode)
+                ec_enc_bit_logp(ec, inv, 2);
+            else
+                inv = ec_dec_bit_logp(ec, 2);
+        } else
+            inv = 0;
+        /* inv flag override to avoid problems with downmixing. */
+        if (ctx->disable_inv)
+            inv = 0;
+        itheta = 0;
+        itheta_q30 = 0;
+    }
+    qalloc = ec_tell_frac(ec) - tell;
+    *b -= qalloc;
+
+    if (itheta == 0) {
+        imid = 32767;
+        iside = 0;
+        *fill &= (1<<B) - 1;
+        delta = -16384;
+    } else if (itheta == 16384) {
+        imid = 0;
+        iside = 32767;
+        *fill &= ((1<<B) - 1)<<B;
+        delta = 16384;
+    } else {
+        imid = bitexact_cos((oac_int16)itheta);
+        iside = bitexact_cos((oac_int16)(16384 - itheta));
+        /* This is the mid vs side allocation that minimizes squared error
+           in that band. */
+        delta = FRAC_MUL16((N - 1)<<7, bitexact_log2tan(iside, imid));
+    }
+
+    sctx->inv = inv;
+    sctx->imid = imid;
+    sctx->iside = iside;
+    sctx->delta = delta;
+    sctx->itheta = itheta;
+    sctx->itheta_q30 = itheta_q30;
+    sctx->qalloc = qalloc;
 }
 static unsigned quant_band_n1(struct band_ctx *ctx, celt_norm *X, celt_norm *Y,
-      celt_norm *lowband_out)
-{
-   int c;
-   int stereo;
-   celt_norm *x = X;
-   int encode;
-   ec_ctx *ec;
-
-   encode = ctx->encode;
-   ec = ctx->ec;
-
-   stereo = Y != NULL;
-   c=0; do {
-      int sign=0;
-      if (ctx->remaining_bits>=1<<BITRES)
-      {
-         if (encode)
-         {
-            sign = x[0]<0;
-            ec_enc_bits(ec, sign, 1);
-         } else {
-            sign = ec_dec_bits(ec, 1);
-         }
-         ctx->remaining_bits -= 1<<BITRES;
-      }
-      if (ctx->resynth)
-         x[0] = sign ? -NORM_SCALING : NORM_SCALING;
-      x = Y;
-   } while (++c<1+stereo);
-   if (lowband_out)
-      lowband_out[0] = SHR32(X[0],4);
-   return 1;
+                              celt_norm *lowband_out) {
+    int c;
+    int stereo;
+    celt_norm *x = X;
+    int encode;
+    ec_ctx *ec;
+
+    encode = ctx->encode;
+    ec = ctx->ec;
+
+    stereo = Y != NULL;
+    c = 0; do {
+        int sign = 0;
+        if (ctx->remaining_bits >= 1<<BITRES) {
+            if (encode) {
+                sign = x[0] < 0;
+                ec_enc_bits(ec, sign, 1);
+            } else {
+                sign = ec_dec_bits(ec, 1);
+            }
+            ctx->remaining_bits -= 1<<BITRES;
+        }
+        if (ctx->resynth)
+            x[0] = sign ? -NORM_SCALING : NORM_SCALING;
+        x = Y;
+    } while (++c < 1 + stereo);
+    if (lowband_out)
+        lowband_out[0] = SHR32(X[0], 4);
+    return 1;
 }
 
 /* This function is responsible for encoding and decoding a mono partition.
@@ -938,816 +873,779 @@ static unsigned quant_band_n1(struct band_ctx *ctx, celt_norm *X, celt_norm *Y,
    the two half-bands. It can be called recursively so bands can end up being
    split in 8 parts. */
 static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
-      int N, int b, int B, celt_norm *lowband,
-      int LM,
-      oac_val32 gain, int fill)
-{
-   const unsigned char *cache;
-   int q;
-   int curr_bits;
-   int imid=0, iside=0;
-   int B0=B;
-   oac_val32 mid=0, side=0;
-   unsigned cm=0;
-   celt_norm *Y=NULL;
-   int encode;
-   const CELTMode *m;
-   int i;
-   int spread;
-   ec_ctx *ec;
-
-   encode = ctx->encode;
-   m = ctx->m;
-   i = ctx->i;
-   spread = ctx->spread;
-   ec = ctx->ec;
-
-   /* If we need 1.5 more bit than we can produce, split the band in two. */
-   cache = m->cache.bits + m->cache.index[(LM+1)*m->nbEBands+i];
-   if (LM != -1 && b > cache[cache[0]]+12 && N>2)
-   {
-      int mbits, sbits, delta;
-      int itheta;
-      int qalloc;
-      struct split_ctx sctx;
-      celt_norm *next_lowband2=NULL;
-      oac_int32 rebalance;
-
-      N >>= 1;
-      Y = X+N;
-      LM -= 1;
-      if (B==1)
-         fill = (fill&1)|(fill<<1);
-      B = (B+1)>>1;
-
-      compute_theta(ctx, &sctx, X, Y, N, &b, B, B0, LM, 0, &fill);
-      imid = sctx.imid;
-      iside = sctx.iside;
-      delta = sctx.delta;
-      itheta = sctx.itheta;
-      qalloc = sctx.qalloc;
-      (void)imid;
-      (void)iside;
+                                int N, int b, int B, celt_norm *lowband,
+                                int LM,
+                                oac_val32 gain, int fill) {
+    const unsigned char *cache;
+    int q;
+    int curr_bits;
+    int imid = 0, iside = 0;
+    int B0 = B;
+    oac_val32 mid = 0, side = 0;
+    unsigned cm = 0;
+    celt_norm *Y = NULL;
+    int encode;
+    const CELTMode *m;
+    int i;
+    int spread;
+    ec_ctx *ec;
+
+    encode = ctx->encode;
+    m = ctx->m;
+    i = ctx->i;
+    spread = ctx->spread;
+    ec = ctx->ec;
+
+    /* If we need 1.5 more bit than we can produce, split the band in two. */
+    cache = m->cache.bits + m->cache.index[(LM + 1)*m->nbEBands + i];
+    if (LM != -1 && b > cache[cache[0]] + 12 && N > 2) {
+        int mbits, sbits, delta;
+        int itheta;
+        int qalloc;
+        struct split_ctx sctx;
+        celt_norm *next_lowband2 = NULL;
+        oac_int32 rebalance;
+
+        N >>= 1;
+        Y = X + N;
+        LM -= 1;
+        if (B == 1)
+            fill = (fill&1)|(fill<<1);
+        B = (B + 1)>>1;
+
+        compute_theta(ctx, &sctx, X, Y, N, &b, B, B0, LM, 0, &fill);
+        imid = sctx.imid;
+        iside = sctx.iside;
+        delta = sctx.delta;
+        itheta = sctx.itheta;
+        qalloc = sctx.qalloc;
+        (void)imid;
+        (void)iside;
 #ifdef FIXED_POINT
-      mid = celt_cos_norm32(sctx.itheta_q30);
-      side = celt_cos_norm32((1<<30)-sctx.itheta_q30);
+        mid = celt_cos_norm32(sctx.itheta_q30);
+        side = celt_cos_norm32((1<<30) - sctx.itheta_q30);
 #else
-      mid = celt_cos_norm2(sctx.itheta_q30*(1.f/(1<<30)));
-      side = celt_cos_norm2(1.f-sctx.itheta_q30*(1.f/(1<<30)));
+        mid = celt_cos_norm2(sctx.itheta_q30*(1.f/(1<<30)));
+        side = celt_cos_norm2(1.f - sctx.itheta_q30*(1.f/(1<<30)));
 #endif
 
-      /* Give more bits to low-energy MDCTs than they would otherwise deserve */
-      if (B0>1 && (itheta&0x3fff))
-      {
-         if (itheta > 8192)
-            /* Rough approximation for pre-echo masking */
-            delta -= delta>>(4-LM);
-         else
-            /* Corresponds to a forward-masking slope of 1.5 dB per 10 ms */
-            delta = IMIN(0, delta + (N<<BITRES>>(5-LM)));
-      }
-      mbits = IMAX(0, IMIN(b, (b-delta)/2));
-      sbits = b-mbits;
-      ctx->remaining_bits -= qalloc;
-
-      if (lowband)
-         next_lowband2 = lowband+N; /* >32-bit split case */
-
-      rebalance = ctx->remaining_bits;
-      if (mbits >= sbits)
-      {
-         cm = quant_partition(ctx, X, N, mbits, B, lowband, LM,
-               MULT32_32_Q31(gain,mid), fill);
-         rebalance = mbits - (rebalance-ctx->remaining_bits);
-         if (rebalance > 3<<BITRES && itheta!=0)
-            sbits += rebalance - (3<<BITRES);
-         cm |= quant_partition(ctx, Y, N, sbits, B, next_lowband2, LM,
-               MULT32_32_Q31(gain,side), fill>>B)<<(B0>>1);
-      } else {
-         cm = quant_partition(ctx, Y, N, sbits, B, next_lowband2, LM,
-               MULT32_32_Q31(gain,side), fill>>B)<<(B0>>1);
-         rebalance = sbits - (rebalance-ctx->remaining_bits);
-         if (rebalance > 3<<BITRES && itheta!=16384)
-            mbits += rebalance - (3<<BITRES);
-         cm |= quant_partition(ctx, X, N, mbits, B, lowband, LM,
-               MULT32_32_Q31(gain,mid), fill);
-      }
-   } else {
-      /* This is the basic no-split case */
-      q = bits2pulses(m, i, LM, b);
-      curr_bits = pulses2bits(m, i, LM, q);
-      ctx->remaining_bits -= curr_bits;
-
-      /* Ensures we can never bust the budget */
-      while (ctx->remaining_bits < 0 && q > 0)
-      {
-         ctx->remaining_bits += curr_bits;
-         q--;
-         curr_bits = pulses2bits(m, i, LM, q);
-         ctx->remaining_bits -= curr_bits;
-      }
-
-      if (q!=0)
-      {
-         int K = get_pulses(q);
-
-         /* Finally do the actual quantization */
-         if (encode)
-         {
-            cm = alg_quant(X, N, K, spread, B, ec, gain, ctx->resynth,
+        /* Give more bits to low-energy MDCTs than they would otherwise deserve */
+        if (B0 > 1 && (itheta&0x3fff)) {
+            if (itheta > 8192)
+                /* Rough approximation for pre-echo masking */
+                delta -= delta>>(4 - LM);
+            else
+                /* Corresponds to a forward-masking slope of 1.5 dB per 10 ms */
+                delta = IMIN(0, delta + (N<<BITRES>>(5 - LM)));
+        }
+        mbits = IMAX(0, IMIN(b, (b - delta)/2));
+        sbits = b - mbits;
+        ctx->remaining_bits -= qalloc;
+
+        if (lowband)
+            next_lowband2 = lowband + N; /* >32-bit split case */
+
+        rebalance = ctx->remaining_bits;
+        if (mbits >= sbits) {
+            cm = quant_partition(ctx, X, N, mbits, B, lowband, LM,
+               MULT32_32_Q31(gain, mid), fill);
+            rebalance = mbits - (rebalance - ctx->remaining_bits);
+            if (rebalance > 3<<BITRES && itheta != 0)
+                sbits += rebalance - (3<<BITRES);
+            cm |= quant_partition(ctx, Y, N, sbits, B, next_lowband2, LM,
+               MULT32_32_Q31(gain, side), fill>>B)<<(B0>>1);
+        } else {
+            cm = quant_partition(ctx, Y, N, sbits, B, next_lowband2, LM,
+               MULT32_32_Q31(gain, side), fill>>B)<<(B0>>1);
+            rebalance = sbits - (rebalance - ctx->remaining_bits);
+            if (rebalance > 3<<BITRES && itheta != 16384)
+                mbits += rebalance - (3<<BITRES);
+            cm |= quant_partition(ctx, X, N, mbits, B, lowband, LM,
+               MULT32_32_Q31(gain, mid), fill);
+        }
+    } else {
+        /* This is the basic no-split case */
+        q = bits2pulses(m, i, LM, b);
+        curr_bits = pulses2bits(m, i, LM, q);
+        ctx->remaining_bits -= curr_bits;
+
+        /* Ensures we can never bust the budget */
+        while (ctx->remaining_bits < 0 && q > 0) {
+            ctx->remaining_bits += curr_bits;
+            q--;
+            curr_bits = pulses2bits(m, i, LM, q);
+            ctx->remaining_bits -= curr_bits;
+        }
+
+        if (q != 0) {
+            int K = get_pulses(q);
+
+            /* Finally do the actual quantization */
+            if (encode) {
+                cm = alg_quant(X, N, K, spread, B, ec, gain, ctx->resynth,
                            ctx->arch);
-         } else {
-            cm = alg_unquant(X, N, K, spread, B, ec, gain);
-         }
-      } else {
-         /* If there's no pulse, fill the band anyway */
-         int j;
-         if (ctx->resynth)
-         {
-            unsigned cm_mask;
-            /* B can be as large as 16, so this shift might overflow an int on a
-               16-bit platform; use a long to get defined behavior.*/
-            cm_mask = (unsigned)(1UL<<B)-1;
-            fill &= cm_mask;
-            if (!fill)
-            {
-               OAC_CLEAR(X, N);
             } else {
-               if (lowband == NULL)
-               {
-                  /* Noise */
-                  for (j=0;j<N;j++)
-                  {
-                     ctx->seed = celt_lcg_rand(ctx->seed);
-                     X[j] = SHL32((celt_norm)((oac_int32)ctx->seed>>20), NORM_SHIFT-14);
-                  }
-                  cm = cm_mask;
-               } else {
-                  /* Folded spectrum */
-                  for (j=0;j<N;j++)
-                  {
-                     oac_val16 tmp;
-                     ctx->seed = celt_lcg_rand(ctx->seed);
-                     /* About 48 dB below the "normal" folding level */
-                     tmp = QCONST16(1.0f/256, NORM_SHIFT-4);
-                     tmp = (ctx->seed)&0x8000 ? tmp : -tmp;
-                     X[j] = lowband[j]+tmp;
-                  }
-                  cm = fill;
-               }
-               renormalise_vector(X, N, gain, ctx->arch);
+                cm = alg_unquant(X, N, K, spread, B, ec, gain);
+            }
+        } else {
+            /* If there's no pulse, fill the band anyway */
+            int j;
+            if (ctx->resynth) {
+                unsigned cm_mask;
+                /* B can be as large as 16, so this shift might overflow an int on a
+                   16-bit platform; use a long to get defined behavior.*/
+                cm_mask = (unsigned)(1UL<<B) - 1;
+                fill &= cm_mask;
+                if (!fill) {
+                    OAC_CLEAR(X, N);
+                } else {
+                    if (lowband == NULL) {
+                        /* Noise */
+                        for (j = 0; j < N; j++) {
+                            ctx->seed = celt_lcg_rand(ctx->seed);
+                            X[j] = SHL32((celt_norm)((oac_int32)ctx->seed>>20), NORM_SHIFT - 14);
+                        }
+                        cm = cm_mask;
+                    } else {
+                        /* Folded spectrum */
+                        for (j = 0; j < N; j++) {
+                            oac_val16 tmp;
+                            ctx->seed = celt_lcg_rand(ctx->seed);
+                            /* About 48 dB below the "normal" folding level */
+                            tmp = QCONST16(1.0f/256, NORM_SHIFT - 4);
+                            tmp = (ctx->seed)&0x8000 ? tmp : -tmp;
+                            X[j] = lowband[j] + tmp;
+                        }
+                        cm = fill;
+                    }
+                    renormalise_vector(X, N, gain, ctx->arch);
+                }
             }
-         }
-      }
-   }
+        }
+    }
 
-   return cm;
+    return cm;
 }
 
-unsigned cubic_quant_partition(struct band_ctx *ctx, celt_norm *X, int N, int b, int B, ec_ctx *ec, int LM, oac_val32 gain, int resynth, int encode)
-{
-   celt_assert(LM>=0);
-   ctx->remaining_bits = ctx->ec->storage*8*8 - ec_tell_frac(ctx->ec);
-   b = IMIN(b, ctx->remaining_bits);
-   /* As long as we have at least two bits of depth, split all the way to LM=0 (not -1 like PVQ). */
-   if (LM==0 || b<=2*N<<BITRES) {
-      int res, ret;
-      b = IMIN(b + ((N-1)<<BITRES)/2, ctx->remaining_bits);
-      /* Resolution left after taking into account coding the cube face. */
-      res = (b-(1<<BITRES)-ctx->m->logN[ctx->i]-(LM<<BITRES)-1)/(N-1)>>BITRES;
-      res = IMIN(14, IMAX(0, res));
-      if (encode) ret = cubic_quant(X, N, res, B, ec, gain, resynth);
-      else ret = cubic_unquant(X, N, res, B, ec, gain);
-      ctx->remaining_bits = ctx->ec->storage*8*8 - ec_tell_frac(ctx->ec);
-      return ret;
-   } else {
-      celt_norm *Y;
-      oac_int32 itheta_q30;
-      oac_val32 g1, g2;
-      oac_int32 theta_res;
-      oac_int32 qtheta;
-      int delta;
-      int b1, b2;
-      int cm;
-      int N0;
-      N0 = N;
-      N >>= 1;
-      Y = X+N;
-      LM -= 1;
-      B = (B+1)>>1;
-      theta_res = IMIN(16, (b>>BITRES)/(N0-1) + 1);
-      if (encode) {
-         itheta_q30 = stereo_itheta(X, Y, 0, N, ctx->arch);
-         qtheta = (itheta_q30+(1<<(29-theta_res)))>>(30-theta_res);
-         ec_enc_uint(ec, qtheta, (1<<theta_res)+1);
-      } else {
-         qtheta = ec_dec_uint(ec, (1<<theta_res)+1);
-      }
-      itheta_q30 = qtheta<<(30-theta_res);
-      b -= theta_res<<BITRES;
-      delta = (N0-1) * 23 * ((itheta_q30>>16)-8192) >> (17-BITRES);
+unsigned cubic_quant_partition(struct band_ctx *ctx, celt_norm *X, int N, int b, int B, ec_ctx *ec, int LM,
+                               oac_val32 gain, int resynth, int encode) {
+    celt_assert(LM >= 0);
+    ctx->remaining_bits = ctx->ec->storage*8*8 - ec_tell_frac(ctx->ec);
+    b = IMIN(b, ctx->remaining_bits);
+    /* As long as we have at least two bits of depth, split all the way to LM=0 (not -1 like PVQ). */
+    if (LM == 0 || b <= 2*N<<BITRES) {
+        int res, ret;
+        b = IMIN(b + ((N - 1)<<BITRES)/2, ctx->remaining_bits);
+        /* Resolution left after taking into account coding the cube face. */
+        res = (b - (1<<BITRES) - ctx->m->logN[ctx->i] - (LM<<BITRES) - 1)/(N - 1)>>BITRES;
+        res = IMIN(14, IMAX(0, res));
+        if (encode) ret = cubic_quant(X, N, res, B, ec, gain, resynth);
+        else ret = cubic_unquant(X, N, res, B, ec, gain);
+        ctx->remaining_bits = ctx->ec->storage*8*8 - ec_tell_frac(ctx->ec);
+        return ret;
+    } else {
+        celt_norm *Y;
+        oac_int32 itheta_q30;
+        oac_val32 g1, g2;
+        oac_int32 theta_res;
+        oac_int32 qtheta;
+        int delta;
+        int b1, b2;
+        int cm;
+        int N0;
+        N0 = N;
+        N >>= 1;
+        Y = X + N;
+        LM -= 1;
+        B = (B + 1)>>1;
+        theta_res = IMIN(16, (b>>BITRES)/(N0 - 1) + 1);
+        if (encode) {
+            itheta_q30 = stereo_itheta(X, Y, 0, N, ctx->arch);
+            qtheta = (itheta_q30 + (1<<(29 - theta_res)))>>(30 - theta_res);
+            ec_enc_uint(ec, qtheta, (1<<theta_res) + 1);
+        } else {
+            qtheta = ec_dec_uint(ec, (1<<theta_res) + 1);
+        }
+        itheta_q30 = qtheta<<(30 - theta_res);
+        b -= theta_res<<BITRES;
+        delta = (N0 - 1)*23*((itheta_q30>>16) - 8192)>>(17 - BITRES);
 
 #ifdef FIXED_POINT
-      g1 = celt_cos_norm32(itheta_q30);
-      g2 = celt_cos_norm32((1<<30)-itheta_q30);
+        g1 = celt_cos_norm32(itheta_q30);
+        g2 = celt_cos_norm32((1<<30) - itheta_q30);
 #else
-      g1 = celt_cos_norm2(itheta_q30*(1.f/(1<<30)));
-      g2 = celt_cos_norm2(1.f-itheta_q30*(1.f/(1<<30)));
+        g1 = celt_cos_norm2(itheta_q30*(1.f/(1<<30)));
+        g2 = celt_cos_norm2(1.f - itheta_q30*(1.f/(1<<30)));
 #endif
-      if (itheta_q30 == 0) {
-         b1=b;
-         b2=0;
-      } else if (itheta_q30==1073741824) {
-         b1=0;
-         b2=b;
-      } else {
-         b1 = IMIN(b, IMAX(0, (b-delta)/2));
-         b2 = b-b1;
-      }
-      cm  = cubic_quant_partition(ctx, X, N, b1, B, ec, LM, MULT32_32_Q31(gain, g1), resynth, encode);
-      cm |= cubic_quant_partition(ctx, Y, N, b2, B, ec, LM, MULT32_32_Q31(gain, g2), resynth, encode);
-      return cm;
-   }
+        if (itheta_q30 == 0) {
+            b1 = b;
+            b2 = 0;
+        } else if (itheta_q30 == 1073741824) {
+            b1 = 0;
+            b2 = b;
+        } else {
+            b1 = IMIN(b, IMAX(0, (b - delta)/2));
+            b2 = b - b1;
+        }
+        cm  = cubic_quant_partition(ctx, X, N, b1, B, ec, LM, MULT32_32_Q31(gain, g1), resynth, encode);
+        cm |= cubic_quant_partition(ctx, Y, N, b2, B, ec, LM, MULT32_32_Q31(gain, g2), resynth, encode);
+        return cm;
+    }
 }
 
 /* This function is responsible for encoding and decoding a band for the mono case. */
 static unsigned quant_band(struct band_ctx *ctx, celt_norm *X,
-      int N, int b, int B, celt_norm *lowband,
-      int LM, celt_norm *lowband_out,
-      oac_val32 gain, celt_norm *lowband_scratch, int fill)
-{
-   int N0=N;
-   int N_B=N;
-   int N_B0;
-   int B0=B;
-   int time_divide=0;
-   int recombine=0;
-   int longBlocks;
-   unsigned cm=0;
-   int k;
-   int encode;
-   int tf_change;
-
-   encode = ctx->encode;
-   tf_change = ctx->tf_change;
-
-   longBlocks = B0==1;
-
-   N_B = celt_udiv(N_B, B);
-
-   /* Special case for one sample */
-   if (N==1)
-   {
-      return quant_band_n1(ctx, X, NULL, lowband_out);
-   }
-
-   if (tf_change>0)
-      recombine = tf_change;
-   /* Band recombining to increase frequency resolution */
-
-   if (lowband_scratch && lowband && (recombine || ((N_B&1) == 0 && tf_change<0) || B0>1))
-   {
-      OAC_COPY(lowband_scratch, lowband, N);
-      lowband = lowband_scratch;
-   }
-
-   for (k=0;k<recombine;k++)
-   {
-      static const unsigned char bit_interleave_table[16]={
-            0,1,1,1,2,3,3,3,2,3,3,3,2,3,3,3
-      };
-      if (encode)
-         haar1(X, N>>k, 1<<k);
-      if (lowband)
-         haar1(lowband, N>>k, 1<<k);
-      fill = bit_interleave_table[fill&0xF]|bit_interleave_table[fill>>4]<<2;
-   }
-   B>>=recombine;
-   N_B<<=recombine;
-
-   /* Increasing the time resolution */
-   while ((N_B&1) == 0 && tf_change<0)
-   {
-      if (encode)
-         haar1(X, N_B, B);
-      if (lowband)
-         haar1(lowband, N_B, B);
-      fill |= fill<<B;
-      B <<= 1;
-      N_B >>= 1;
-      time_divide++;
-      tf_change++;
-   }
-   B0=B;
-   N_B0 = N_B;
-
-   /* Reorganize the samples in time order instead of frequency order */
-   if (B0>1)
-   {
-      if (encode)
-         deinterleave_hadamard(X, N_B>>recombine, B0<<recombine, longBlocks);
-      if (lowband)
-         deinterleave_hadamard(lowband, N_B>>recombine, B0<<recombine, longBlocks);
-   }
-
-   cm = quant_partition(ctx, X, N, b, B, lowband, LM, gain, fill);
-
-   /* This code is used by the decoder and by the resynthesis-enabled encoder */
-   if (ctx->resynth)
-   {
-      /* Undo the sample reorganization going from time order to frequency order */
-      if (B0>1)
-         interleave_hadamard(X, N_B>>recombine, B0<<recombine, longBlocks);
-
-      /* Undo time-freq changes that we did earlier */
-      N_B = N_B0;
-      B = B0;
-      for (k=0;k<time_divide;k++)
-      {
-         B >>= 1;
-         N_B <<= 1;
-         cm |= cm>>B;
-         haar1(X, N_B, B);
-      }
-
-      for (k=0;k<recombine;k++)
-      {
-         static const unsigned char bit_deinterleave_table[16]={
-               0x00,0x03,0x0C,0x0F,0x30,0x33,0x3C,0x3F,
-               0xC0,0xC3,0xCC,0xCF,0xF0,0xF3,0xFC,0xFF
-         };
-         cm = bit_deinterleave_table[cm];
-         haar1(X, N0>>k, 1<<k);
-      }
-      B<<=recombine;
-
-      /* Scale output for later folding */
-      if (lowband_out)
-      {
-         int j;
-         oac_val16 n;
-         n = celt_sqrt(SHL32(EXTEND32(N0),22));
-         for (j=0;j<N0;j++)
-            lowband_out[j] = MULT16_32_Q15(n,X[j]);
-      }
-      cm &= (1<<B)-1;
-   }
-   return cm;
+                           int N, int b, int B, celt_norm *lowband,
+                           int LM, celt_norm *lowband_out,
+                           oac_val32 gain, celt_norm *lowband_scratch, int fill) {
+    int N0 = N;
+    int N_B = N;
+    int N_B0;
+    int B0 = B;
+    int time_divide = 0;
+    int recombine = 0;
+    int longBlocks;
+    unsigned cm = 0;
+    int k;
+    int encode;
+    int tf_change;
+
+    encode = ctx->encode;
+    tf_change = ctx->tf_change;
+
+    longBlocks = B0 == 1;
+
+    N_B = celt_udiv(N_B, B);
+
+    /* Special case for one sample */
+    if (N == 1) {
+        return quant_band_n1(ctx, X, NULL, lowband_out);
+    }
+
+    if (tf_change > 0)
+        recombine = tf_change;
+    /* Band recombining to increase frequency resolution */
+
+    if (lowband_scratch && lowband && (recombine || ((N_B&1) == 0 && tf_change < 0) || B0 > 1)) {
+        OAC_COPY(lowband_scratch, lowband, N);
+        lowband = lowband_scratch;
+    }
+
+    for (k = 0; k < recombine; k++) {
+        static const unsigned char bit_interleave_table[16] = {
+            0, 1, 1, 1, 2, 3, 3, 3, 2, 3, 3, 3, 2, 3, 3, 3
+        };
+        if (encode)
+            haar1(X, N>>k, 1<<k);
+        if (lowband)
+            haar1(lowband, N>>k, 1<<k);
+        fill = bit_interleave_table[fill&0xF]|bit_interleave_table[fill>>4]<<2;
+    }
+    B >>= recombine;
+    N_B <<= recombine;
+
+    /* Increasing the time resolution */
+    while ((N_B&1) == 0 && tf_change < 0) {
+        if (encode)
+            haar1(X, N_B, B);
+        if (lowband)
+            haar1(lowband, N_B, B);
+        fill |= fill<<B;
+        B <<= 1;
+        N_B >>= 1;
+        time_divide++;
+        tf_change++;
+    }
+    B0 = B;
+    N_B0 = N_B;
+
+    /* Reorganize the samples in time order instead of frequency order */
+    if (B0 > 1) {
+        if (encode)
+            deinterleave_hadamard(X, N_B>>recombine, B0<<recombine, longBlocks);
+        if (lowband)
+            deinterleave_hadamard(lowband, N_B>>recombine, B0<<recombine, longBlocks);
+    }
+
+    cm = quant_partition(ctx, X, N, b, B, lowband, LM, gain, fill);
+
+    /* This code is used by the decoder and by the resynthesis-enabled encoder */
+    if (ctx->resynth) {
+        /* Undo the sample reorganization going from time order to frequency order */
+        if (B0 > 1)
+            interleave_hadamard(X, N_B>>recombine, B0<<recombine, longBlocks);
+
+        /* Undo time-freq changes that we did earlier */
+        N_B = N_B0;
+        B = B0;
+        for (k = 0; k < time_divide; k++) {
+            B >>= 1;
+            N_B <<= 1;
+            cm |= cm>>B;
+            haar1(X, N_B, B);
+        }
+
+        for (k = 0; k < recombine; k++) {
+            static const unsigned char bit_deinterleave_table[16] = {
+                0x00, 0x03, 0x0C, 0x0F, 0x30, 0x33, 0x3C, 0x3F,
+                0xC0, 0xC3, 0xCC, 0xCF, 0xF0, 0xF3, 0xFC, 0xFF
+            };
+            cm = bit_deinterleave_table[cm];
+            haar1(X, N0>>k, 1<<k);
+        }
+        B <<= recombine;
+
+        /* Scale output for later folding */
+        if (lowband_out) {
+            int j;
+            oac_val16 n;
+            n = celt_sqrt(SHL32(EXTEND32(N0), 22));
+            for (j = 0; j < N0; j++)
+                lowband_out[j] = MULT16_32_Q15(n, X[j]);
+        }
+        cm &= (1<<B) - 1;
+    }
+    return cm;
 }
 
 #ifdef FIXED_POINT
-#define MIN_STEREO_ENERGY 2
+# define MIN_STEREO_ENERGY 2
 #else
-#define MIN_STEREO_ENERGY 1e-10f
+# define MIN_STEREO_ENERGY 1e-10f
 #endif
 
 /* This function is responsible for encoding and decoding a band for the stereo case. */
 static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm *Y,
-      int N, int b, int B, celt_norm *lowband,
-      int LM, celt_norm *lowband_out,
-      celt_norm *lowband_scratch, int fill)
-{
-   int imid=0, iside=0;
-   int inv = 0;
-   oac_val32 mid=0, side=0;
-   unsigned cm=0;
-   int mbits, sbits, delta;
-   int itheta;
-   int qalloc;
-   struct split_ctx sctx;
-   int orig_fill;
-   int encode;
-   ec_ctx *ec;
-
-   encode = ctx->encode;
-   ec = ctx->ec;
-
-   /* Special case for one sample */
-   if (N==1)
-   {
-      return quant_band_n1(ctx, X, Y, lowband_out);
-   }
-
-   orig_fill = fill;
-
-   if (encode) {
-      if (ctx->bandE[ctx->i] < MIN_STEREO_ENERGY || ctx->bandE[ctx->m->nbEBands+ctx->i] < MIN_STEREO_ENERGY) {
-         if (ctx->bandE[ctx->i] > ctx->bandE[ctx->m->nbEBands+ctx->i]) OAC_COPY(Y, X, N);
-         else OAC_COPY(X, Y, N);
-      }
-   }
-   compute_theta(ctx, &sctx, X, Y, N, &b, B, B, LM, 1, &fill);
-   inv = sctx.inv;
-   imid = sctx.imid;
-   iside = sctx.iside;
-   delta = sctx.delta;
-   itheta = sctx.itheta;
-   qalloc = sctx.qalloc;
-   (void)imid;
-   (void)iside;
+                                  int N, int b, int B, celt_norm *lowband,
+                                  int LM, celt_norm *lowband_out,
+                                  celt_norm *lowband_scratch, int fill) {
+    int imid = 0, iside = 0;
+    int inv = 0;
+    oac_val32 mid = 0, side = 0;
+    unsigned cm = 0;
+    int mbits, sbits, delta;
+    int itheta;
+    int qalloc;
+    struct split_ctx sctx;
+    int orig_fill;
+    int encode;
+    ec_ctx *ec;
+
+    encode = ctx->encode;
+    ec = ctx->ec;
+
+    /* Special case for one sample */
+    if (N == 1) {
+        return quant_band_n1(ctx, X, Y, lowband_out);
+    }
+
+    orig_fill = fill;
+
+    if (encode) {
+        if (ctx->bandE[ctx->i] < MIN_STEREO_ENERGY || ctx->bandE[ctx->m->nbEBands + ctx->i] < MIN_STEREO_ENERGY) {
+            if (ctx->bandE[ctx->i] > ctx->bandE[ctx->m->nbEBands + ctx->i]) OAC_COPY(Y, X, N);
+            else OAC_COPY(X, Y, N);
+        }
+    }
+    compute_theta(ctx, &sctx, X, Y, N, &b, B, B, LM, 1, &fill);
+    inv = sctx.inv;
+    imid = sctx.imid;
+    iside = sctx.iside;
+    delta = sctx.delta;
+    itheta = sctx.itheta;
+    qalloc = sctx.qalloc;
+    (void)imid;
+    (void)iside;
 #ifdef FIXED_POINT
-   mid = celt_cos_norm32(sctx.itheta_q30);
-   side = celt_cos_norm32((1<<30)-sctx.itheta_q30);
+    mid = celt_cos_norm32(sctx.itheta_q30);
+    side = celt_cos_norm32((1<<30) - sctx.itheta_q30);
 #else
-   mid = celt_cos_norm2(sctx.itheta_q30*(1.f/(1<<30)));
-   side = celt_cos_norm2(1.f-sctx.itheta_q30*(1.f/(1<<30)));
+    mid = celt_cos_norm2(sctx.itheta_q30*(1.f/(1<<30)));
+    side = celt_cos_norm2(1.f - sctx.itheta_q30*(1.f/(1<<30)));
 #endif
 
-   /* This is a special case for N=2 that only works for stereo and takes
-      advantage of the fact that mid and side are orthogonal to encode
-      the side with just one bit. */
-   if (N==2)
-   {
-      int c;
-      int sign=0;
-      celt_norm *x2, *y2;
-      mbits = b;
-      sbits = 0;
-      /* Only need one bit for the side. */
-      if (itheta != 0 && itheta != 16384)
-         sbits = 1<<BITRES;
-      mbits -= sbits;
-      c = itheta > 8192;
-      ctx->remaining_bits -= qalloc+sbits;
-
-      x2 = c ? Y : X;
-      y2 = c ? X : Y;
-      if (sbits)
-      {
-         if (encode)
-         {
-            /* Here we only need to encode a sign for the side. */
-            /* FIXME: Need to increase fixed-point precision? */
-            sign = MULT32_32_Q31(x2[0],y2[1]) - MULT32_32_Q31(x2[1],y2[0]) < 0;
-            ec_enc_bits(ec, sign, 1);
-         } else {
-            sign = ec_dec_bits(ec, 1);
-         }
-      }
-      sign = 1-2*sign;
-      /* We use orig_fill here because we want to fold the side, but if
-         itheta==16384, we'll have cleared the low bits of fill. */
-      cm = quant_band(ctx, x2, N, mbits, B, lowband, LM, lowband_out, Q31ONE,
+    /* This is a special case for N=2 that only works for stereo and takes
+       advantage of the fact that mid and side are orthogonal to encode
+       the side with just one bit. */
+    if (N == 2) {
+        int c;
+        int sign = 0;
+        celt_norm *x2, *y2;
+        mbits = b;
+        sbits = 0;
+        /* Only need one bit for the side. */
+        if (itheta != 0 && itheta != 16384)
+            sbits = 1<<BITRES;
+        mbits -= sbits;
+        c = itheta > 8192;
+        ctx->remaining_bits -= qalloc + sbits;
+
+        x2 = c ? Y : X;
+        y2 = c ? X : Y;
+        if (sbits) {
+            if (encode) {
+                /* Here we only need to encode a sign for the side. */
+                /* FIXME: Need to increase fixed-point precision? */
+                sign = MULT32_32_Q31(x2[0], y2[1]) - MULT32_32_Q31(x2[1], y2[0]) < 0;
+                ec_enc_bits(ec, sign, 1);
+            } else {
+                sign = ec_dec_bits(ec, 1);
+            }
+        }
+        sign = 1 - 2*sign;
+        /* We use orig_fill here because we want to fold the side, but if
+           itheta==16384, we'll have cleared the low bits of fill. */
+        cm = quant_band(ctx, x2, N, mbits, B, lowband, LM, lowband_out, Q31ONE,
             lowband_scratch, orig_fill);
-      /* We don't split N=2 bands, so cm is either 1 or 0 (for a fold-collapse),
-         and there's no need to worry about mixing with the other channel. */
-      y2[0] = -sign*x2[1];
-      y2[1] = sign*x2[0];
-      if (ctx->resynth)
-      {
-         celt_norm tmp;
-         X[0] = MULT32_32_Q31(mid, X[0]);
-         X[1] = MULT32_32_Q31(mid, X[1]);
-         Y[0] = MULT32_32_Q31(side, Y[0]);
-         Y[1] = MULT32_32_Q31(side, Y[1]);
-         tmp = X[0];
-         X[0] = SUB32(tmp,Y[0]);
-         Y[0] = ADD32(tmp,Y[0]);
-         tmp = X[1];
-         X[1] = SUB32(tmp,Y[1]);
-         Y[1] = ADD32(tmp,Y[1]);
-      }
-   } else {
-      /* "Normal" split code */
-      oac_int32 rebalance;
-
-      mbits = IMAX(0, IMIN(b, (b-delta)/2));
-      sbits = b-mbits;
-      ctx->remaining_bits -= qalloc;
-
-      rebalance = ctx->remaining_bits;
-      if (mbits >= sbits)
-      {
-         /* In stereo mode, we do not apply a scaling to the mid because we need the normalized
-            mid for folding later. */
-         cm = quant_band(ctx, X, N, mbits, B, lowband, LM, lowband_out, Q31ONE,
+        /* We don't split N=2 bands, so cm is either 1 or 0 (for a fold-collapse),
+           and there's no need to worry about mixing with the other channel. */
+        y2[0] = -sign*x2[1];
+        y2[1] = sign*x2[0];
+        if (ctx->resynth) {
+            celt_norm tmp;
+            X[0] = MULT32_32_Q31(mid, X[0]);
+            X[1] = MULT32_32_Q31(mid, X[1]);
+            Y[0] = MULT32_32_Q31(side, Y[0]);
+            Y[1] = MULT32_32_Q31(side, Y[1]);
+            tmp = X[0];
+            X[0] = SUB32(tmp, Y[0]);
+            Y[0] = ADD32(tmp, Y[0]);
+            tmp = X[1];
+            X[1] = SUB32(tmp, Y[1]);
+            Y[1] = ADD32(tmp, Y[1]);
+        }
+    } else {
+        /* "Normal" split code */
+        oac_int32 rebalance;
+
+        mbits = IMAX(0, IMIN(b, (b - delta)/2));
+        sbits = b - mbits;
+        ctx->remaining_bits -= qalloc;
+
+        rebalance = ctx->remaining_bits;
+        if (mbits >= sbits) {
+            /* In stereo mode, we do not apply a scaling to the mid because we need the normalized
+               mid for folding later. */
+            cm = quant_band(ctx, X, N, mbits, B, lowband, LM, lowband_out, Q31ONE,
                lowband_scratch, fill);
-         rebalance = mbits - (rebalance-ctx->remaining_bits);
-         if (rebalance > 3<<BITRES && itheta!=0)
-            sbits += rebalance - (3<<BITRES);
-
-         /* For a stereo split, the high bits of fill are always zero, so no
-            folding will be done to the side. */
-         cm |= quant_band(ctx, Y, N, sbits, B, NULL, LM, NULL, side, NULL, fill>>B);
-      } else {
-         /* For a stereo split, the high bits of fill are always zero, so no
-            folding will be done to the side. */
-         cm = quant_band(ctx, Y, N, sbits, B, NULL, LM, NULL, side, NULL, fill>>B);
-         rebalance = sbits - (rebalance-ctx->remaining_bits);
-         if (rebalance > 3<<BITRES && itheta!=16384)
-            mbits += rebalance - (3<<BITRES);
-         /* In stereo mode, we do not apply a scaling to the mid because we need the normalized
-            mid for folding later. */
-         cm |= quant_band(ctx, X, N, mbits, B, lowband, LM, lowband_out, Q31ONE,
+            rebalance = mbits - (rebalance - ctx->remaining_bits);
+            if (rebalance > 3<<BITRES && itheta != 0)
+                sbits += rebalance - (3<<BITRES);
+
+            /* For a stereo split, the high bits of fill are always zero, so no
+               folding will be done to the side. */
+            cm |= quant_band(ctx, Y, N, sbits, B, NULL, LM, NULL, side, NULL, fill>>B);
+        } else {
+            /* For a stereo split, the high bits of fill are always zero, so no
+               folding will be done to the side. */
+            cm = quant_band(ctx, Y, N, sbits, B, NULL, LM, NULL, side, NULL, fill>>B);
+            rebalance = sbits - (rebalance - ctx->remaining_bits);
+            if (rebalance > 3<<BITRES && itheta != 16384)
+                mbits += rebalance - (3<<BITRES);
+            /* In stereo mode, we do not apply a scaling to the mid because we need the normalized
+               mid for folding later. */
+            cm |= quant_band(ctx, X, N, mbits, B, lowband, LM, lowband_out, Q31ONE,
                lowband_scratch, fill);
-      }
-   }
-
-
-   /* This code is used by the decoder and by the resynthesis-enabled encoder */
-   if (ctx->resynth)
-   {
-      if (N!=2)
-         stereo_merge(X, Y, mid, N, ctx->arch);
-      if (inv)
-      {
-         int j;
-         for (j=0;j<N;j++)
-            Y[j] = -Y[j];
-      }
-   }
-   return cm;
+        }
+    }
+
+
+    /* This code is used by the decoder and by the resynthesis-enabled encoder */
+    if (ctx->resynth) {
+        if (N != 2)
+            stereo_merge(X, Y, mid, N, ctx->arch);
+        if (inv) {
+            int j;
+            for (j = 0; j < N; j++)
+                Y[j] = -Y[j];
+        }
+    }
+    return cm;
 }
 
 #ifndef DISABLE_UPDATE_DRAFT
-static void special_hybrid_folding(const CELTMode *m, celt_norm *norm, celt_norm *norm2, int start, int M, int dual_stereo)
-{
-   int n1, n2;
-   const oac_int16 * OAC_RESTRICT eBands = m->eBands;
-   n1 = M*(eBands[start+1]-eBands[start]);
-   n2 = M*(eBands[start+2]-eBands[start+1]);
-   /* Duplicate enough of the first band folding data to be able to fold the second band.
-      Copies no data for CELT-only mode. */
-   OAC_COPY(&norm[n1], &norm[2*n1 - n2], n2-n1);
-   if (dual_stereo)
-      OAC_COPY(&norm2[n1], &norm2[2*n1 - n2], n2-n1);
+static void special_hybrid_folding(const CELTMode *m, celt_norm *norm, celt_norm *norm2, int start, int M,
+                                   int dual_stereo) {
+    int n1, n2;
+    const oac_int16 * OAC_RESTRICT eBands = m->eBands;
+    n1 = M*(eBands[start + 1] - eBands[start]);
+    n2 = M*(eBands[start + 2] - eBands[start + 1]);
+    /* Duplicate enough of the first band folding data to be able to fold the second band.
+       Copies no data for CELT-only mode. */
+    OAC_COPY(&norm[n1], &norm[2*n1 - n2], n2 - n1);
+    if (dual_stereo)
+        OAC_COPY(&norm2[n1], &norm2[2*n1 - n2], n2 - n1);
 }
 #endif
 
 void quant_all_bands(int encode, const CELTMode *m, int start, int end,
-      celt_norm *X_, celt_norm *Y_, unsigned char *collapse_masks,
-      const celt_ener *bandE, int *pulses, int shortBlocks, int spread,
-      int dual_stereo, int intensity, int *tf_res, oac_int32 total_bits,
-      oac_int32 balance, ec_ctx *ec, int LM, int codedBands,
-      oac_uint32 *seed, int complexity, int arch, int disable_inv)
-{
-   int i;
-   oac_int32 remaining_bits;
-   const oac_int16 * OAC_RESTRICT eBands = m->eBands;
-   celt_norm * OAC_RESTRICT norm, * OAC_RESTRICT norm2;
-   VARDECL(celt_norm, _norm);
-   VARDECL(celt_norm, _lowband_scratch);
-   VARDECL(celt_norm, X_save);
-   VARDECL(celt_norm, Y_save);
-   VARDECL(celt_norm, X_save2);
-   VARDECL(celt_norm, Y_save2);
-   VARDECL(celt_norm, norm_save2);
-   VARDECL(unsigned char, bytes_save);
-   int resynth_alloc;
-   celt_norm *lowband_scratch;
-   int B;
-   int M;
-   int lowband_offset;
-   int update_lowband = 1;
-   int C = Y_ != NULL ? 2 : 1;
-   int norm_offset;
-   int theta_rdo = encode && Y_!=NULL && !dual_stereo && complexity>=8;
+                     celt_norm *X_, celt_norm *Y_, unsigned char *collapse_masks,
+                     const celt_ener *bandE, int *pulses, int shortBlocks, int spread,
+                     int dual_stereo, int intensity, int *tf_res, oac_int32 total_bits,
+                     oac_int32 balance, ec_ctx *ec, int LM, int codedBands,
+                     oac_uint32 *seed, int complexity, int arch, int disable_inv) {
+    int i;
+    oac_int32 remaining_bits;
+    const oac_int16 * OAC_RESTRICT eBands = m->eBands;
+    celt_norm * OAC_RESTRICT norm, * OAC_RESTRICT norm2;
+    VARDECL(celt_norm, _norm);
+    VARDECL(celt_norm, _lowband_scratch);
+    VARDECL(celt_norm, X_save);
+    VARDECL(celt_norm, Y_save);
+    VARDECL(celt_norm, X_save2);
+    VARDECL(celt_norm, Y_save2);
+    VARDECL(celt_norm, norm_save2);
+    VARDECL(unsigned char, bytes_save);
+    int resynth_alloc;
+    celt_norm *lowband_scratch;
+    int B;
+    int M;
+    int lowband_offset;
+    int update_lowband = 1;
+    int C = Y_ != NULL ? 2 : 1;
+    int norm_offset;
+    int theta_rdo = encode && Y_ != NULL && !dual_stereo && complexity >= 8;
 #ifdef RESYNTH
-   int resynth = 1;
+    int resynth = 1;
 #else
-   int resynth = !encode || theta_rdo;
+    int resynth = !encode || theta_rdo;
 #endif
-   struct band_ctx ctx;
-   SAVE_STACK;
-
-   M = 1<<LM;
-   B = shortBlocks ? M : 1;
-   norm_offset = M*eBands[start];
-   /* No need to allocate norm for the last band because we don't need an
-      output in that band. */
-   ALLOC(_norm, C*(M*eBands[m->nbEBands-1]-norm_offset), celt_norm);
-   norm = _norm;
-   norm2 = norm + M*eBands[m->nbEBands-1]-norm_offset;
-
-   /* For decoding, we can use the last band as scratch space because we don't need that
-      scratch space for the last band and we don't care about the data there until we're
-      decoding the last band. */
-   if (encode && resynth)
-      resynth_alloc = M*(eBands[m->nbEBands]-eBands[m->nbEBands-1]);
-   else
-      resynth_alloc = ALLOC_NONE;
-   ALLOC(_lowband_scratch, resynth_alloc, celt_norm);
-   if (encode && resynth)
-      lowband_scratch = _lowband_scratch;
-   else
-      lowband_scratch = X_+M*eBands[m->effEBands-1];
-   ALLOC(X_save, resynth_alloc, celt_norm);
-   ALLOC(Y_save, resynth_alloc, celt_norm);
-   ALLOC(X_save2, resynth_alloc, celt_norm);
-   ALLOC(Y_save2, resynth_alloc, celt_norm);
-   ALLOC(norm_save2, resynth_alloc, celt_norm);
-
-   lowband_offset = 0;
-   ctx.bandE = bandE;
-   ctx.ec = ec;
-   ctx.encode = encode;
-   ctx.intensity = intensity;
-   ctx.m = m;
-   ctx.seed = *seed;
-   ctx.spread = spread;
-   ctx.arch = arch;
-   ctx.disable_inv = disable_inv;
-   ctx.resynth = resynth;
-   ctx.theta_round = 0;
-   ALLOC(bytes_save, theta_rdo ? 1275 : ALLOC_NONE, unsigned char);
-
-   /* Avoid injecting noise in the first band on transients. */
-   ctx.avoid_split_noise = B > 1;
-   for (i=start;i<end;i++)
-   {
-      oac_int32 tell;
-      int b;
-      int N;
-      oac_int32 curr_balance;
-      int effective_lowband=-1;
-      celt_norm * OAC_RESTRICT X, * OAC_RESTRICT Y;
-      int tf_change=0;
-      unsigned x_cm;
-      unsigned y_cm;
-      int last;
-
-      ctx.i = i;
-      last = (i==end-1);
-
-      X = X_+M*eBands[i];
-      if (Y_!=NULL)
-         Y = Y_+M*eBands[i];
-      else
-         Y = NULL;
-      N = M*eBands[i+1]-M*eBands[i];
-      celt_assert(N > 0);
-      tell = ec_tell_frac(ec);
-
-      /* Compute how many bits we want to allocate to this band */
-      if (i != start)
-         balance -= tell;
-      remaining_bits = total_bits-tell-1;
-      ctx.remaining_bits = remaining_bits;
-      if (i <= codedBands-1)
-      {
-         curr_balance = celt_sudiv(balance, IMIN(3, codedBands-i));
-         b = IMAX(0, IMIN(16383, IMIN(remaining_bits+1,pulses[i]+curr_balance)));
-      } else {
-         b = 0;
-      }
+    struct band_ctx ctx;
+    SAVE_STACK;
+
+    M = 1<<LM;
+    B = shortBlocks ? M : 1;
+    norm_offset = M*eBands[start];
+    /* No need to allocate norm for the last band because we don't need an
+       output in that band. */
+    ALLOC(_norm, C*(M*eBands[m->nbEBands - 1] - norm_offset), celt_norm);
+    norm = _norm;
+    norm2 = norm + M*eBands[m->nbEBands - 1] - norm_offset;
+
+    /* For decoding, we can use the last band as scratch space because we don't need that
+       scratch space for the last band and we don't care about the data there until we're
+       decoding the last band. */
+    if (encode && resynth)
+        resynth_alloc = M*(eBands[m->nbEBands] - eBands[m->nbEBands - 1]);
+    else
+        resynth_alloc = ALLOC_NONE;
+    ALLOC(_lowband_scratch, resynth_alloc, celt_norm);
+    if (encode && resynth)
+        lowband_scratch = _lowband_scratch;
+    else
+        lowband_scratch = X_ + M*eBands[m->effEBands - 1];
+    ALLOC(X_save, resynth_alloc, celt_norm);
+    ALLOC(Y_save, resynth_alloc, celt_norm);
+    ALLOC(X_save2, resynth_alloc, celt_norm);
+    ALLOC(Y_save2, resynth_alloc, celt_norm);
+    ALLOC(norm_save2, resynth_alloc, celt_norm);
+
+    lowband_offset = 0;
+    ctx.bandE = bandE;
+    ctx.ec = ec;
+    ctx.encode = encode;
+    ctx.intensity = intensity;
+    ctx.m = m;
+    ctx.seed = *seed;
+    ctx.spread = spread;
+    ctx.arch = arch;
+    ctx.disable_inv = disable_inv;
+    ctx.resynth = resynth;
+    ctx.theta_round = 0;
+    ALLOC(bytes_save, theta_rdo ? 1275 : ALLOC_NONE, unsigned char);
+
+    /* Avoid injecting noise in the first band on transients. */
+    ctx.avoid_split_noise = B > 1;
+    for (i = start; i < end; i++) {
+        oac_int32 tell;
+        int b;
+        int N;
+        oac_int32 curr_balance;
+        int effective_lowband = -1;
+        celt_norm * OAC_RESTRICT X, * OAC_RESTRICT Y;
+        int tf_change = 0;
+        unsigned x_cm;
+        unsigned y_cm;
+        int last;
+
+        ctx.i = i;
+        last = (i == end - 1);
+
+        X = X_ + M*eBands[i];
+        if (Y_ != NULL)
+            Y = Y_ + M*eBands[i];
+        else
+            Y = NULL;
+        N = M*eBands[i + 1] - M*eBands[i];
+        celt_assert(N > 0);
+        tell = ec_tell_frac(ec);
+
+        /* Compute how many bits we want to allocate to this band */
+        if (i != start)
+            balance -= tell;
+        remaining_bits = total_bits - tell - 1;
+        ctx.remaining_bits = remaining_bits;
+        if (i <= codedBands - 1) {
+            curr_balance = celt_sudiv(balance, IMIN(3, codedBands - i));
+            b = IMAX(0, IMIN(16383, IMIN(remaining_bits + 1, pulses[i] + curr_balance)));
+        } else {
+            b = 0;
+        }
 
 #ifndef DISABLE_UPDATE_DRAFT
-      if (resynth && (M*eBands[i]-N >= M*eBands[start] || i==start+1) && (update_lowband || lowband_offset==0))
+        if (resynth && (M*eBands[i] - N >= M*eBands[start] || i == start + 1)
+            && (update_lowband || lowband_offset == 0))
             lowband_offset = i;
-      if (i == start+1)
-         special_hybrid_folding(m, norm, norm2, start, M, dual_stereo);
+        if (i == start + 1)
+            special_hybrid_folding(m, norm, norm2, start, M, dual_stereo);
 #else
-      if (resynth && M*eBands[i]-N >= M*eBands[start] && (update_lowband || lowband_offset==0))
+        if (resynth && M*eBands[i] - N >= M*eBands[start] && (update_lowband || lowband_offset == 0))
             lowband_offset = i;
 #endif
 
-      tf_change = tf_res[i];
-      ctx.tf_change = tf_change;
-      if (i>=m->effEBands)
-      {
-         X=norm;
-         if (Y_!=NULL)
-            Y = norm;
-         lowband_scratch = NULL;
-      }
-      if (last && !theta_rdo)
-         lowband_scratch = NULL;
-
-      /* Get a conservative estimate of the collapse_mask's for the bands we're
-         going to be folding from. */
-      if (lowband_offset != 0 && (spread!=SPREAD_AGGRESSIVE || B>1 || tf_change<0))
-      {
-         int fold_start;
-         int fold_end;
-         int fold_i;
-         /* This ensures we never repeat spectral content within one band */
-         effective_lowband = IMAX(0, M*eBands[lowband_offset]-norm_offset-N);
-         fold_start = lowband_offset;
-         while(M*eBands[--fold_start] > effective_lowband+norm_offset);
-         fold_end = lowband_offset-1;
+        tf_change = tf_res[i];
+        ctx.tf_change = tf_change;
+        if (i >= m->effEBands) {
+            X = norm;
+            if (Y_ != NULL)
+                Y = norm;
+            lowband_scratch = NULL;
+        }
+        if (last && !theta_rdo)
+            lowband_scratch = NULL;
+
+        /* Get a conservative estimate of the collapse_mask's for the bands we're
+           going to be folding from. */
+        if (lowband_offset != 0 && (spread != SPREAD_AGGRESSIVE || B > 1 || tf_change < 0)) {
+            int fold_start;
+            int fold_end;
+            int fold_i;
+            /* This ensures we never repeat spectral content within one band */
+            effective_lowband = IMAX(0, M*eBands[lowband_offset] - norm_offset - N);
+            fold_start = lowband_offset;
+            while (M*eBands[--fold_start] > effective_lowband + norm_offset) ;
+            fold_end = lowband_offset - 1;
 #ifndef DISABLE_UPDATE_DRAFT
-         while(++fold_end < i && M*eBands[fold_end] < effective_lowband+norm_offset+N);
+            while (++fold_end < i && M*eBands[fold_end] < effective_lowband + norm_offset + N) ;
 #else
-         while(M*eBands[++fold_end] < effective_lowband+norm_offset+N);
+            while (M*eBands[++fold_end] < effective_lowband + norm_offset + N) ;
 #endif
-         x_cm = y_cm = 0;
-         fold_i = fold_start; do {
-           x_cm |= collapse_masks[fold_i*C+0];
-           y_cm |= collapse_masks[fold_i*C+C-1];
-         } while (++fold_i<fold_end);
-      }
-      /* Otherwise, we'll be using the LCG to fold, so all blocks will (almost
-         always) be non-zero. */
-      else
-         x_cm = y_cm = (1<<B)-1;
-
-      if (dual_stereo && i==intensity)
-      {
-         int j;
-
-         /* Switch off dual stereo to do intensity. */
-         dual_stereo = 0;
-         if (resynth)
-            for (j=0;j<M*eBands[i]-norm_offset;j++)
-               norm[j] = HALF32(norm[j]+norm2[j]);
-      }
-      if (dual_stereo)
-      {
-         x_cm = quant_band(&ctx, X, N, b/2, B,
-               effective_lowband != -1 ? norm+effective_lowband : NULL, LM,
-               last?NULL:norm+M*eBands[i]-norm_offset, Q31ONE, lowband_scratch, x_cm);
-         y_cm = quant_band(&ctx, Y, N, b/2, B,
-               effective_lowband != -1 ? norm2+effective_lowband : NULL, LM,
-               last?NULL:norm2+M*eBands[i]-norm_offset, Q31ONE, lowband_scratch, y_cm);
-      } else {
-         if (Y!=NULL)
-         {
-            if (theta_rdo && i < intensity)
-            {
-               ec_ctx ec_save, ec_save2;
-               struct band_ctx ctx_save, ctx_save2;
-               oac_val32 dist0, dist1;
-               unsigned cm, cm2;
-               int nstart_bytes, nend_bytes, save_bytes;
-               unsigned char *bytes_buf;
-               oac_val16 w[2];
-               compute_channel_weights(bandE[i], bandE[i+m->nbEBands], w);
-               /* Make a copy. */
-               cm = x_cm|y_cm;
-               ec_save = *ec;
-               ctx_save = ctx;
-               OAC_COPY(X_save, X, N);
-               OAC_COPY(Y_save, Y, N);
-               /* Encode and round down. */
-               ctx.theta_round = -1;
-               x_cm = quant_band_stereo(&ctx, X, Y, N, b, B,
-                     effective_lowband != -1 ? norm+effective_lowband : NULL, LM,
-                     last?NULL:norm+M*eBands[i]-norm_offset, lowband_scratch, cm);
-               dist0 = MULT16_32_Q15(w[0], celt_inner_prod_norm_shift(X_save, X, N, arch)) + MULT16_32_Q15(w[1], celt_inner_prod_norm_shift(Y_save, Y, N, arch));
-
-               /* Save first result. */
-               cm2 = x_cm;
-               ec_save2 = *ec;
-               ctx_save2 = ctx;
-               OAC_COPY(X_save2, X, N);
-               OAC_COPY(Y_save2, Y, N);
-               if (!last)
-                  OAC_COPY(norm_save2, norm+M*eBands[i]-norm_offset, N);
-               nstart_bytes = ec_save.offs;
-               nend_bytes = ec_save.storage;
-               bytes_buf = ec_save.buf+nstart_bytes;
-               save_bytes = nend_bytes-nstart_bytes;
-               OAC_COPY(bytes_save, bytes_buf, save_bytes);
-
-               /* Restore */
-               *ec = ec_save;
-               ctx = ctx_save;
-               OAC_COPY(X, X_save, N);
-               OAC_COPY(Y, Y_save, N);
+            x_cm = y_cm = 0;
+            fold_i = fold_start; do {
+                x_cm |= collapse_masks[fold_i*C + 0];
+                y_cm |= collapse_masks[fold_i*C + C - 1];
+            } while (++fold_i < fold_end);
+        }
+        /* Otherwise, we'll be using the LCG to fold, so all blocks will (almost
+           always) be non-zero. */
+        else
+            x_cm = y_cm = (1<<B) - 1;
+
+        if (dual_stereo && i == intensity) {
+            int j;
+
+            /* Switch off dual stereo to do intensity. */
+            dual_stereo = 0;
+            if (resynth)
+                for (j = 0; j < M*eBands[i] - norm_offset; j++)
+                    norm[j] = HALF32(norm[j] + norm2[j]);
+        }
+        if (dual_stereo) {
+            x_cm = quant_band(&ctx, X, N, b/2, B,
+               effective_lowband != -1 ? norm + effective_lowband : NULL, LM,
+               last?NULL:norm + M*eBands[i] - norm_offset, Q31ONE, lowband_scratch, x_cm);
+            y_cm = quant_band(&ctx, Y, N, b/2, B,
+               effective_lowband != -1 ? norm2 + effective_lowband : NULL, LM,
+               last?NULL:norm2 + M*eBands[i] - norm_offset, Q31ONE, lowband_scratch, y_cm);
+        } else {
+            if (Y != NULL) {
+                if (theta_rdo && i < intensity) {
+                    ec_ctx ec_save, ec_save2;
+                    struct band_ctx ctx_save, ctx_save2;
+                    oac_val32 dist0, dist1;
+                    unsigned cm, cm2;
+                    int nstart_bytes, nend_bytes, save_bytes;
+                    unsigned char *bytes_buf;
+                    oac_val16 w[2];
+                    compute_channel_weights(bandE[i], bandE[i + m->nbEBands], w);
+                    /* Make a copy. */
+                    cm = x_cm|y_cm;
+                    ec_save = *ec;
+                    ctx_save = ctx;
+                    OAC_COPY(X_save, X, N);
+                    OAC_COPY(Y_save, Y, N);
+                    /* Encode and round down. */
+                    ctx.theta_round = -1;
+                    x_cm = quant_band_stereo(&ctx, X, Y, N, b, B,
+                     effective_lowband != -1 ? norm + effective_lowband : NULL, LM,
+                     last?NULL:norm + M*eBands[i] - norm_offset, lowband_scratch, cm);
+                    dist0 = MULT16_32_Q15(w[0], celt_inner_prod_norm_shift(X_save, X, N, arch)) + MULT16_32_Q15(w[1],
+                    celt_inner_prod_norm_shift(Y_save, Y, N, arch));
+
+                    /* Save first result. */
+                    cm2 = x_cm;
+                    ec_save2 = *ec;
+                    ctx_save2 = ctx;
+                    OAC_COPY(X_save2, X, N);
+                    OAC_COPY(Y_save2, Y, N);
+                    if (!last)
+                        OAC_COPY(norm_save2, norm + M*eBands[i] - norm_offset, N);
+                    nstart_bytes = ec_save.offs;
+                    nend_bytes = ec_save.storage;
+                    bytes_buf = ec_save.buf + nstart_bytes;
+                    save_bytes = nend_bytes - nstart_bytes;
+                    OAC_COPY(bytes_save, bytes_buf, save_bytes);
+
+                    /* Restore */
+                    *ec = ec_save;
+                    ctx = ctx_save;
+                    OAC_COPY(X, X_save, N);
+                    OAC_COPY(Y, Y_save, N);
 #ifndef DISABLE_UPDATE_DRAFT
-               if (i == start+1)
-                  special_hybrid_folding(m, norm, norm2, start, M, dual_stereo);
+                    if (i == start + 1)
+                        special_hybrid_folding(m, norm, norm2, start, M, dual_stereo);
 #endif
-               /* Encode and round up. */
-               ctx.theta_round = 1;
-               x_cm = quant_band_stereo(&ctx, X, Y, N, b, B,
-                     effective_lowband != -1 ? norm+effective_lowband : NULL, LM,
-                     last?NULL:norm+M*eBands[i]-norm_offset, lowband_scratch, cm);
-               dist1 = MULT16_32_Q15(w[0], celt_inner_prod_norm_shift(X_save, X, N, arch)) + MULT16_32_Q15(w[1], celt_inner_prod_norm_shift(Y_save, Y, N, arch));
-               if (dist0 >= dist1) {
-                  x_cm = cm2;
-                  *ec = ec_save2;
-                  ctx = ctx_save2;
-                  OAC_COPY(X, X_save2, N);
-                  OAC_COPY(Y, Y_save2, N);
-                  if (!last)
-                     OAC_COPY(norm+M*eBands[i]-norm_offset, norm_save2, N);
-                  OAC_COPY(bytes_buf, bytes_save, save_bytes);
-               }
+                    /* Encode and round up. */
+                    ctx.theta_round = 1;
+                    x_cm = quant_band_stereo(&ctx, X, Y, N, b, B,
+                     effective_lowband != -1 ? norm + effective_lowband : NULL, LM,
+                     last?NULL:norm + M*eBands[i] - norm_offset, lowband_scratch, cm);
+                    dist1 = MULT16_32_Q15(w[0], celt_inner_prod_norm_shift(X_save, X, N, arch)) + MULT16_32_Q15(w[1],
+                    celt_inner_prod_norm_shift(Y_save, Y, N, arch));
+                    if (dist0 >= dist1) {
+                        x_cm = cm2;
+                        *ec = ec_save2;
+                        ctx = ctx_save2;
+                        OAC_COPY(X, X_save2, N);
+                        OAC_COPY(Y, Y_save2, N);
+                        if (!last)
+                            OAC_COPY(norm + M*eBands[i] - norm_offset, norm_save2, N);
+                        OAC_COPY(bytes_buf, bytes_save, save_bytes);
+                    }
+                } else {
+                    ctx.theta_round = 0;
+                    x_cm = quant_band_stereo(&ctx, X, Y, N, b, B,
+                     effective_lowband != -1 ? norm + effective_lowband : NULL, LM,
+                     last?NULL:norm + M*eBands[i] - norm_offset, lowband_scratch, x_cm|y_cm);
+                }
             } else {
-               ctx.theta_round = 0;
-               x_cm = quant_band_stereo(&ctx, X, Y, N, b, B,
-                     effective_lowband != -1 ? norm+effective_lowband : NULL, LM,
-                     last?NULL:norm+M*eBands[i]-norm_offset, lowband_scratch, x_cm|y_cm);
+                x_cm = quant_band(&ctx, X, N, b, B,
+                  effective_lowband != -1 ? norm + effective_lowband : NULL, LM,
+                  last?NULL:norm + M*eBands[i] - norm_offset, Q31ONE, lowband_scratch, x_cm|y_cm);
             }
-         } else {
-            x_cm = quant_band(&ctx, X, N, b, B,
-                  effective_lowband != -1 ? norm+effective_lowband : NULL, LM,
-                  last?NULL:norm+M*eBands[i]-norm_offset, Q31ONE, lowband_scratch, x_cm|y_cm);
-         }
-         y_cm = x_cm;
-      }
-      collapse_masks[i*C+0] = (unsigned char)x_cm;
-      collapse_masks[i*C+C-1] = (unsigned char)y_cm;
-      balance += pulses[i] + tell;
-
-      /* Update the folding position only as long as we have 1 bit/sample depth. */
-      update_lowband = b>(N<<BITRES);
-      /* We only need to avoid noise on a split for the first band. After that, we
-         have folding. */
-      ctx.avoid_split_noise = 0;
-   }
-   *seed = ctx.seed;
-
-   RESTORE_STACK;
+            y_cm = x_cm;
+        }
+        collapse_masks[i*C + 0] = (unsigned char)x_cm;
+        collapse_masks[i*C + C - 1] = (unsigned char)y_cm;
+        balance += pulses[i] + tell;
+
+        /* Update the folding position only as long as we have 1 bit/sample depth. */
+        update_lowband = b > (N<<BITRES);
+        /* We only need to avoid noise on a split for the first band. After that, we
+           have folding. */
+        ctx.avoid_split_noise = 0;
+    }
+    *seed = ctx.seed;
+
+    RESTORE_STACK;
 }
diff --git a/celt/bands.h b/celt/bands.h
index de8b213c8..5a83cb817 100644
--- a/celt/bands.h
+++ b/celt/bands.h
@@ -25,7 +25,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef BANDS_H
 #define BANDS_H
@@ -37,7 +37,7 @@
 #include "rate.h"
 
 oac_int16 bitexact_cos(oac_int16 x);
-int bitexact_log2tan(int isin,int icos);
+int bitexact_log2tan(int isin, int icos);
 
 /** Compute the amplitude (sqrt energy) in each of the bands
  * @param m Mode data
@@ -54,7 +54,8 @@ void compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *band
  * @param X Spectrum (returned normalised)
  * @param bandE Square root of the energy for each band
  */
-void normalise_bands(const CELTMode *m, const celt_sig * OAC_RESTRICT freq, celt_norm * OAC_RESTRICT X, const celt_ener *bandE, int end, int C, int M);
+void normalise_bands(const CELTMode *m, const celt_sig * OAC_RESTRICT freq, celt_norm * OAC_RESTRICT X,
+    const celt_ener *bandE, int end, int C, int M);
 
 /** Denormalise each band of X to restore full amplitude
  * @param m Mode data
@@ -62,8 +63,8 @@ void normalise_bands(const CELTMode *m, const celt_sig * OAC_RESTRICT freq, celt
  * @param bandE Square root of the energy for each band
  */
 void denormalise_bands(const CELTMode *m, const celt_norm * OAC_RESTRICT X,
-      celt_sig * OAC_RESTRICT freq, const celt_glog *bandE, int start,
-      int end, int M, int downsample, int silence);
+    celt_sig * OAC_RESTRICT freq, const celt_glog *bandE, int start,
+    int end, int M, int downsample, int silence);
 
 #define SPREAD_NONE       (0)
 #define SPREAD_LIGHT      (1)
@@ -71,8 +72,8 @@ void denormalise_bands(const CELTMode *m, const celt_norm * OAC_RESTRICT X,
 #define SPREAD_AGGRESSIVE (3)
 
 int spreading_decision(const CELTMode *m, const celt_norm *X, int *average,
-      int last_decision, int *hf_average, int *tapset_decision, int update_hf,
-      int end, int C, int M, const int *spread_weight);
+    int last_decision, int *hf_average, int *tapset_decision, int update_hf,
+    int end, int C, int M, const int *spread_weight);
 
 #ifdef MEASURE_NORM_MSE
 void measure_norm_mse(const CELTMode *m, float *X, float *X0, float *bandE, float *bandE0, int M, int N, int C);
@@ -104,17 +105,17 @@ void haar1(celt_norm *X, int N0, int stride);
  * @param arch Run-time architecture (see oac_select_arch())
  */
 void quant_all_bands(int encode, const CELTMode *m, int start, int end,
-      celt_norm * X, celt_norm * Y, unsigned char *collapse_masks,
-      const celt_ener *bandE, int *pulses, int shortBlocks, int spread,
-      int dual_stereo, int intensity, int *tf_res, oac_int32 total_bits,
-      oac_int32 balance, ec_ctx *ec, int M, int codedBands, oac_uint32 *seed,
-      int complexity, int arch, int disable_inv);
+    celt_norm * X, celt_norm * Y, unsigned char *collapse_masks,
+    const celt_ener *bandE, int *pulses, int shortBlocks, int spread,
+    int dual_stereo, int intensity, int *tf_res, oac_int32 total_bits,
+    oac_int32 balance, ec_ctx *ec, int M, int codedBands, oac_uint32 *seed,
+    int complexity, int arch, int disable_inv);
 
 void anti_collapse(const CELTMode *m, celt_norm *X_,
-      unsigned char *collapse_masks, int LM, int C, int size, int start,
-      int end, const celt_glog *logE, const celt_glog *prev1logE,
-      const celt_glog *prev2logE, const int *pulses, oac_uint32 seed,
-      int encode, int arch);
+    unsigned char *collapse_masks, int LM, int C, int size, int start,
+    int end, const celt_glog *logE, const celt_glog *prev1logE,
+    const celt_glog *prev2logE, const int *pulses, oac_uint32 seed,
+    int encode, int arch);
 
 oac_uint32 celt_lcg_rand(oac_uint32 seed);
 
diff --git a/celt/celt.c b/celt/celt.c
index 70a2165b0..ade589a34 100644
--- a/celt/celt.c
+++ b/celt/celt.c
@@ -25,10 +25,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #define CELT_C
@@ -51,265 +51,255 @@
 #include "vq.h"
 
 #ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
+# define PACKAGE_VERSION "unknown"
 #endif
 
 #if defined(FIXED_POINT) && defined(__mips)
-#include "mips/celt_mipsr1.h"
+# include "mips/celt_mipsr1.h"
 #endif
 
 
-int resampling_factor(oac_int32 rate)
-{
-   int ret;
-   switch (rate)
-   {
+int resampling_factor(oac_int32 rate) {
+    int ret;
+    switch (rate) {
 #ifdef ENABLE_QEXT
-   case 96000:
+        case 96000:
 #endif
-   case 48000:
-      ret = 1;
-      break;
-   case 24000:
-      ret = 2;
-      break;
-   case 16000:
-      ret = 3;
-      break;
-   case 12000:
-      ret = 4;
-      break;
-   case 8000:
-      ret = 6;
-      break;
-   default:
+        case 48000:
+            ret = 1;
+            break;
+        case 24000:
+            ret = 2;
+            break;
+        case 16000:
+            ret = 3;
+            break;
+        case 12000:
+            ret = 4;
+            break;
+        case 8000:
+            ret = 6;
+            break;
+        default:
 #ifndef CUSTOM_MODES
-      celt_assert(0);
+            celt_assert(0);
 #endif
-      ret = 0;
-      break;
-   }
-   return ret;
+            ret = 0;
+            break;
+    }
+    return ret;
 }
 
 
 #if !defined(OVERRIDE_COMB_FILTER_CONST) || defined(NON_STATIC_COMB_FILTER_CONST_C)
 /* This version should be faster on ARM */
-#ifdef OAC_ARM_ASM
-#ifndef NON_STATIC_COMB_FILTER_CONST_C
+# ifdef OAC_ARM_ASM
+#  ifndef NON_STATIC_COMB_FILTER_CONST_C
 static
-#endif
+#  endif
 void comb_filter_const_c(oac_val32 *y, oac_val32 *x, int T, int N,
-      celt_coef g10, celt_coef g11, celt_coef g12)
-{
-   oac_val32 x0, x1, x2, x3, x4;
-   int i;
-   x4 = SHL32(x[-T-2], 1);
-   x3 = SHL32(x[-T-1], 1);
-   x2 = SHL32(x[-T], 1);
-   x1 = SHL32(x[-T+1], 1);
-   for (i=0;i<N-4;i+=5)
-   {
-      oac_val32 t;
-      x0=SHL32(x[i-T+2],1);
-      t = MAC_COEF_32_ARM(x[i], g10, x2);
-      t = MAC_COEF_32_ARM(t, g11, ADD32(x1,x3));
-      t = MAC_COEF_32_ARM(t, g12, ADD32(x0,x4));
-      t = SATURATE(t, SIG_SAT);
-      y[i] = t;
-      x4=SHL32(x[i-T+3],1);
-      t = MAC_COEF_32_ARM(x[i+1], g10, x1);
-      t = MAC_COEF_32_ARM(t, g11, ADD32(x0,x2));
-      t = MAC_COEF_32_ARM(t, g12, ADD32(x4,x3));
-      t = SATURATE(t, SIG_SAT);
-      y[i+1] = t;
-      x3=SHL32(x[i-T+4],1);
-      t = MAC_COEF_32_ARM(x[i+2], g10, x0);
-      t = MAC_COEF_32_ARM(t, g11, ADD32(x4,x1));
-      t = MAC_COEF_32_ARM(t, g12, ADD32(x3,x2));
-      t = SATURATE(t, SIG_SAT);
-      y[i+2] = t;
-      x2=SHL32(x[i-T+5],1);
-      t = MAC_COEF_32_ARM(x[i+3], g10, x4);
-      t = MAC_COEF_32_ARM(t, g11, ADD32(x3,x0));
-      t = MAC_COEF_32_ARM(t, g12, ADD32(x2,x1));
-      t = SATURATE(t, SIG_SAT);
-      y[i+3] = t;
-      x1=SHL32(x[i-T+6],1);
-      t = MAC_COEF_32_ARM(x[i+4], g10, x3);
-      t = MAC_COEF_32_ARM(t, g11, ADD32(x2,x4));
-      t = MAC_COEF_32_ARM(t, g12, ADD32(x1,x0));
-      t = SATURATE(t, SIG_SAT);
-      y[i+4] = t;
-   }
-#ifdef CUSTOM_MODES
-   for (;i<N;i++)
-   {
-      oac_val32 t;
-      x0=SHL32(x[i-T+2],1);
-      t = MAC_COEF_32_ARM(x[i], g10, x2);
-      t = MAC_COEF_32_ARM(t, g11, ADD32(x1,x3));
-      t = MAC_COEF_32_ARM(t, g12, ADD32(x0,x4));
-      t = SATURATE(t, SIG_SAT);
-      y[i] = t;
-      x4=x3;
-      x3=x2;
-      x2=x1;
-      x1=x0;
-   }
-#endif
+                         celt_coef g10, celt_coef g11, celt_coef g12) {
+    oac_val32 x0, x1, x2, x3, x4;
+    int i;
+    x4 = SHL32(x[-T - 2], 1);
+    x3 = SHL32(x[-T - 1], 1);
+    x2 = SHL32(x[-T], 1);
+    x1 = SHL32(x[-T + 1], 1);
+    for (i = 0; i < N - 4; i += 5) {
+        oac_val32 t;
+        x0 = SHL32(x[i - T + 2], 1);
+        t = MAC_COEF_32_ARM(x[i], g10, x2);
+        t = MAC_COEF_32_ARM(t, g11, ADD32(x1, x3));
+        t = MAC_COEF_32_ARM(t, g12, ADD32(x0, x4));
+        t = SATURATE(t, SIG_SAT);
+        y[i] = t;
+        x4 = SHL32(x[i - T + 3], 1);
+        t = MAC_COEF_32_ARM(x[i + 1], g10, x1);
+        t = MAC_COEF_32_ARM(t, g11, ADD32(x0, x2));
+        t = MAC_COEF_32_ARM(t, g12, ADD32(x4, x3));
+        t = SATURATE(t, SIG_SAT);
+        y[i + 1] = t;
+        x3 = SHL32(x[i - T + 4], 1);
+        t = MAC_COEF_32_ARM(x[i + 2], g10, x0);
+        t = MAC_COEF_32_ARM(t, g11, ADD32(x4, x1));
+        t = MAC_COEF_32_ARM(t, g12, ADD32(x3, x2));
+        t = SATURATE(t, SIG_SAT);
+        y[i + 2] = t;
+        x2 = SHL32(x[i - T + 5], 1);
+        t = MAC_COEF_32_ARM(x[i + 3], g10, x4);
+        t = MAC_COEF_32_ARM(t, g11, ADD32(x3, x0));
+        t = MAC_COEF_32_ARM(t, g12, ADD32(x2, x1));
+        t = SATURATE(t, SIG_SAT);
+        y[i + 3] = t;
+        x1 = SHL32(x[i - T + 6], 1);
+        t = MAC_COEF_32_ARM(x[i + 4], g10, x3);
+        t = MAC_COEF_32_ARM(t, g11, ADD32(x2, x4));
+        t = MAC_COEF_32_ARM(t, g12, ADD32(x1, x0));
+        t = SATURATE(t, SIG_SAT);
+        y[i + 4] = t;
+    }
+#  ifdef CUSTOM_MODES
+    for (; i < N; i++) {
+        oac_val32 t;
+        x0 = SHL32(x[i - T + 2], 1);
+        t = MAC_COEF_32_ARM(x[i], g10, x2);
+        t = MAC_COEF_32_ARM(t, g11, ADD32(x1, x3));
+        t = MAC_COEF_32_ARM(t, g12, ADD32(x0, x4));
+        t = SATURATE(t, SIG_SAT);
+        y[i] = t;
+        x4 = x3;
+        x3 = x2;
+        x2 = x1;
+        x1 = x0;
+    }
+#  endif
 }
-#else
-#ifndef NON_STATIC_COMB_FILTER_CONST_C
+# else
+#  ifndef NON_STATIC_COMB_FILTER_CONST_C
 static
-#endif
+#  endif
 void comb_filter_const_c(oac_val32 *y, oac_val32 *x, int T, int N,
-      celt_coef g10, celt_coef g11, celt_coef g12)
-{
-   oac_val32 x0, x1, x2, x3, x4;
-   int i;
-   x4 = x[-T-2];
-   x3 = x[-T-1];
-   x2 = x[-T];
-   x1 = x[-T+1];
-   for (i=0;i<N;i++)
-   {
-      x0=x[i-T+2];
-      y[i] = x[i]
-               + MULT_COEF_32(g10,x2)
-               + MULT_COEF_32(g11,ADD32(x1,x3))
-               + MULT_COEF_32(g12,ADD32(x0,x4));
-#ifdef FIXED_POINT
-      /* A bit of bias seems to help here. */
-      y[i] = SUB32(y[i], 1);
-#endif
-      y[i] = SATURATE(y[i], SIG_SAT);
-      x4=x3;
-      x3=x2;
-      x2=x1;
-      x1=x0;
-   }
+                         celt_coef g10, celt_coef g11, celt_coef g12) {
+    oac_val32 x0, x1, x2, x3, x4;
+    int i;
+    x4 = x[-T - 2];
+    x3 = x[-T - 1];
+    x2 = x[-T];
+    x1 = x[-T + 1];
+    for (i = 0; i < N; i++) {
+        x0 = x[i - T + 2];
+        y[i] = x[i]
+               + MULT_COEF_32(g10, x2)
+               + MULT_COEF_32(g11, ADD32(x1, x3))
+               + MULT_COEF_32(g12, ADD32(x0, x4));
+#  ifdef FIXED_POINT
+        /* A bit of bias seems to help here. */
+        y[i] = SUB32(y[i], 1);
+#  endif
+        y[i] = SATURATE(y[i], SIG_SAT);
+        x4 = x3;
+        x3 = x2;
+        x2 = x1;
+        x1 = x0;
+    }
 
 }
-#endif
+# endif
 #endif
 
 #ifdef ENABLE_QEXT
 void comb_filter_qext(oac_val32 *y, oac_val32 *x, int T0, int T1, int N,
-      oac_val16 g0, oac_val16 g1, int tapset0, int tapset1,
-      const celt_coef *window, int overlap, int arch)
-{
-   VARDECL(oac_val32, mem_buf);
-   VARDECL(oac_val32, buf);
-   celt_coef new_window[120];
-   int s;
-   int i;
-   int N2;
-   int overlap2;
-   SAVE_STACK;
-   /* Using ALLOC() instead of a regular stack allocation to minimize real stack use when using the pseudostack.
-      This is useful on some embedded systems. */
-   ALLOC(mem_buf, COMBFILTER_MAXPERIOD+960, oac_val32);
-   ALLOC(buf, COMBFILTER_MAXPERIOD+960, oac_val32);
-   N2 = N/2;
-   overlap2=overlap/2;
-   /* At 96 kHz, we double the period and the spacing between taps, which is equivalent
-      to creating a mirror image of the filter around 24 kHz. It also means we can process
-      the even and odd samples completely independently. */
-   for (s=0;s<2;s++) {
-      oac_val32 *yptr;
-      for (i=0;i<overlap2;i++) new_window[i] = window[2*i+s];
-      for (i=0;i<COMBFILTER_MAXPERIOD+N2;i++) mem_buf[i] = x[2*i+s-2*COMBFILTER_MAXPERIOD];
-      if (x==y) {
-         yptr = mem_buf+COMBFILTER_MAXPERIOD;
-      } else {
-         for (i=0;i<N2;i++) buf[i] = y[2*i+s];
-         yptr = buf;
-      }
-      comb_filter(yptr, mem_buf+COMBFILTER_MAXPERIOD, T0, T1, N2, g0, g1, tapset0, tapset1, new_window, overlap2, arch);
-      for (i=0;i<N2;i++) y[2*i+s] = yptr[i];
-   }
-   RESTORE_STACK;
-   return;
+                      oac_val16 g0, oac_val16 g1, int tapset0, int tapset1,
+                      const celt_coef *window, int overlap, int arch) {
+    VARDECL(oac_val32, mem_buf);
+    VARDECL(oac_val32, buf);
+    celt_coef new_window[120];
+    int s;
+    int i;
+    int N2;
+    int overlap2;
+    SAVE_STACK;
+    /* Using ALLOC() instead of a regular stack allocation to minimize real stack use when using the pseudostack.
+       This is useful on some embedded systems. */
+    ALLOC(mem_buf, COMBFILTER_MAXPERIOD + 960, oac_val32);
+    ALLOC(buf, COMBFILTER_MAXPERIOD + 960, oac_val32);
+    N2 = N/2;
+    overlap2 = overlap/2;
+    /* At 96 kHz, we double the period and the spacing between taps, which is equivalent
+       to creating a mirror image of the filter around 24 kHz. It also means we can process
+       the even and odd samples completely independently. */
+    for (s = 0; s < 2; s++) {
+        oac_val32 *yptr;
+        for (i = 0; i < overlap2; i++) new_window[i] = window[2*i + s];
+        for (i = 0; i < COMBFILTER_MAXPERIOD + N2; i++) mem_buf[i] = x[2*i + s - 2*COMBFILTER_MAXPERIOD];
+        if (x == y) {
+            yptr = mem_buf + COMBFILTER_MAXPERIOD;
+        } else {
+            for (i = 0; i < N2; i++) buf[i] = y[2*i + s];
+            yptr = buf;
+        }
+        comb_filter(yptr, mem_buf + COMBFILTER_MAXPERIOD, T0, T1, N2, g0, g1, tapset0, tapset1, new_window, overlap2,
+        arch);
+        for (i = 0; i < N2; i++) y[2*i + s] = yptr[i];
+    }
+    RESTORE_STACK;
+    return;
 }
 #endif
 
 #ifndef OVERRIDE_comb_filter
 void comb_filter(oac_val32 *y, oac_val32 *x, int T0, int T1, int N,
-      oac_val16 g0, oac_val16 g1, int tapset0, int tapset1,
-      const celt_coef *window, int overlap, int arch)
-{
-   int i;
-   /* printf ("%d %d %f %f\n", T0, T1, g0, g1); */
-   celt_coef g00, g01, g02, g10, g11, g12;
-   oac_val32 x0, x1, x2, x3, x4;
-   static const oac_val16 gains[3][3] = {
-         {QCONST16(0.3066406250f, 15), QCONST16(0.2170410156f, 15), QCONST16(0.1296386719f, 15)},
-         {QCONST16(0.4638671875f, 15), QCONST16(0.2680664062f, 15), QCONST16(0.f, 15)},
-         {QCONST16(0.7998046875f, 15), QCONST16(0.1000976562f, 15), QCONST16(0.f, 15)}};
-#ifdef ENABLE_QEXT
-   if (overlap==240) {
-      comb_filter_qext(y, x, T0, T1, N, g0, g1, tapset0, tapset1, window, overlap, arch);
-      return;
-   }
-#endif
-   if (g0==0 && g1==0)
-   {
-      /* OPT: Happens to work without the OAC_MOVE(), but only because the current encoder already copies x to y */
-      if (x!=y)
-         OAC_MOVE(y, x, N);
-      return;
-   }
-   /* When the gain is zero, T0 and/or T1 is set to zero. We need
-      to have then be at least 2 to avoid processing garbage data. */
-   T0 = IMAX(T0, COMBFILTER_MINPERIOD);
-   T1 = IMAX(T1, COMBFILTER_MINPERIOD);
-   g00 = MULT_COEF_TAPS(g0, gains[tapset0][0]);
-   g01 = MULT_COEF_TAPS(g0, gains[tapset0][1]);
-   g02 = MULT_COEF_TAPS(g0, gains[tapset0][2]);
-   g10 = MULT_COEF_TAPS(g1, gains[tapset1][0]);
-   g11 = MULT_COEF_TAPS(g1, gains[tapset1][1]);
-   g12 = MULT_COEF_TAPS(g1, gains[tapset1][2]);
-   x1 = x[-T1+1];
-   x2 = x[-T1  ];
-   x3 = x[-T1-1];
-   x4 = x[-T1-2];
-   /* If the filter didn't change, we don't need the overlap */
-   if (g0==g1 && T0==T1 && tapset0==tapset1)
-      overlap=0;
-   for (i=0;i<overlap;i++)
-   {
-      celt_coef f;
-      x0=x[i-T1+2];
-      f = MULT_COEF(window[i],window[i]);
-      y[i] = x[i]
-               + MULT_COEF_32(MULT_COEF((COEF_ONE-f),g00),x[i-T0])
-               + MULT_COEF_32(MULT_COEF((COEF_ONE-f),g01),ADD32(x[i-T0+1],x[i-T0-1]))
-               + MULT_COEF_32(MULT_COEF((COEF_ONE-f),g02),ADD32(x[i-T0+2],x[i-T0-2]))
-               + MULT_COEF_32(MULT_COEF(f,g10),x2)
-               + MULT_COEF_32(MULT_COEF(f,g11),ADD32(x1,x3))
-               + MULT_COEF_32(MULT_COEF(f,g12),ADD32(x0,x4));
-#ifdef FIXED_POINT
-      /* A bit of bias seems to help here. */
-      y[i] = SUB32(y[i], 3);
-#endif
-      y[i] = SATURATE(y[i], SIG_SAT);
-      x4=x3;
-      x3=x2;
-      x2=x1;
-      x1=x0;
+                 oac_val16 g0, oac_val16 g1, int tapset0, int tapset1,
+                 const celt_coef *window, int overlap, int arch) {
+    int i;
+    /* printf ("%d %d %f %f\n", T0, T1, g0, g1); */
+    celt_coef g00, g01, g02, g10, g11, g12;
+    oac_val32 x0, x1, x2, x3, x4;
+    static const oac_val16 gains[3][3] = {
+        {QCONST16(0.3066406250f, 15), QCONST16(0.2170410156f, 15), QCONST16(0.1296386719f, 15)},
+        {QCONST16(0.4638671875f, 15), QCONST16(0.2680664062f, 15), QCONST16(0.f, 15)},
+        {QCONST16(0.7998046875f, 15), QCONST16(0.1000976562f, 15), QCONST16(0.f, 15)}
+    };
+# ifdef ENABLE_QEXT
+    if (overlap == 240) {
+        comb_filter_qext(y, x, T0, T1, N, g0, g1, tapset0, tapset1, window, overlap, arch);
+        return;
+    }
+# endif
+    if (g0 == 0 && g1 == 0) {
+        /* OPT: Happens to work without the OAC_MOVE(), but only because the current encoder already copies x to y */
+        if (x != y)
+            OAC_MOVE(y, x, N);
+        return;
+    }
+    /* When the gain is zero, T0 and/or T1 is set to zero. We need
+       to have then be at least 2 to avoid processing garbage data. */
+    T0 = IMAX(T0, COMBFILTER_MINPERIOD);
+    T1 = IMAX(T1, COMBFILTER_MINPERIOD);
+    g00 = MULT_COEF_TAPS(g0, gains[tapset0][0]);
+    g01 = MULT_COEF_TAPS(g0, gains[tapset0][1]);
+    g02 = MULT_COEF_TAPS(g0, gains[tapset0][2]);
+    g10 = MULT_COEF_TAPS(g1, gains[tapset1][0]);
+    g11 = MULT_COEF_TAPS(g1, gains[tapset1][1]);
+    g12 = MULT_COEF_TAPS(g1, gains[tapset1][2]);
+    x1 = x[-T1 + 1];
+    x2 = x[-T1  ];
+    x3 = x[-T1 - 1];
+    x4 = x[-T1 - 2];
+    /* If the filter didn't change, we don't need the overlap */
+    if (g0 == g1 && T0 == T1 && tapset0 == tapset1)
+        overlap = 0;
+    for (i = 0; i < overlap; i++) {
+        celt_coef f;
+        x0 = x[i - T1 + 2];
+        f = MULT_COEF(window[i], window[i]);
+        y[i] = x[i]
+               + MULT_COEF_32(MULT_COEF((COEF_ONE - f), g00), x[i - T0])
+               + MULT_COEF_32(MULT_COEF((COEF_ONE - f), g01), ADD32(x[i - T0 + 1], x[i - T0 - 1]))
+               + MULT_COEF_32(MULT_COEF((COEF_ONE - f), g02), ADD32(x[i - T0 + 2], x[i - T0 - 2]))
+               + MULT_COEF_32(MULT_COEF(f, g10), x2)
+               + MULT_COEF_32(MULT_COEF(f, g11), ADD32(x1, x3))
+               + MULT_COEF_32(MULT_COEF(f, g12), ADD32(x0, x4));
+# ifdef FIXED_POINT
+        /* A bit of bias seems to help here. */
+        y[i] = SUB32(y[i], 3);
+# endif
+        y[i] = SATURATE(y[i], SIG_SAT);
+        x4 = x3;
+        x3 = x2;
+        x2 = x1;
+        x1 = x0;
 
-   }
-   if (g1==0)
-   {
-      /* OPT: Happens to work without the OAC_MOVE(), but only because the current encoder already copies x to y */
-      if (x!=y)
-         OAC_MOVE(y+overlap, x+overlap, N-overlap);
-      return;
-   }
+    }
+    if (g1 == 0) {
+        /* OPT: Happens to work without the OAC_MOVE(), but only because the current encoder already copies x to y */
+        if (x != y)
+            OAC_MOVE(y + overlap, x + overlap, N - overlap);
+        return;
+    }
 
-   /* Compute the part with the constant filter. */
-   comb_filter_const(y+i, x+i, T1, N-i, g10, g11, g12, arch);
+    /* Compute the part with the constant filter. */
+    comb_filter_const(y + i, x + i, T1, N - i, g10, g11, g12, arch);
 }
 #endif /* OVERRIDE_comb_filter */
 
@@ -319,55 +309,51 @@ void comb_filter(oac_val32 *y, oac_val32 *x, int T0, int T1, int N,
    4*isTransient + 2*tf_select + per_band_flag */
 const signed char tf_select_table[4][8] = {
     /*isTransient=0     isTransient=1 */
-      {0, -1, 0, -1,    0,-1, 0,-1}, /* 2.5 ms */
-      {0, -1, 0, -2,    1, 0, 1,-1}, /* 5 ms */
-      {0, -2, 0, -3,    2, 0, 1,-1}, /* 10 ms */
-      {0, -2, 0, -3,    3, 0, 1,-1}, /* 20 ms */
+    {0, -1, 0, -1,    0, -1, 0, -1}, /* 2.5 ms */
+    {0, -1, 0, -2,    1, 0, 1, -1},  /* 5 ms */
+    {0, -2, 0, -3,    2, 0, 1, -1},  /* 10 ms */
+    {0, -2, 0, -3,    3, 0, 1, -1},  /* 20 ms */
 };
 
 
-void init_caps(const CELTMode *m,int *cap,int LM,int C)
-{
-   int i;
-   for (i=0;i<m->nbEBands;i++)
-   {
-      int N;
-      N=(m->eBands[i+1]-m->eBands[i])<<LM;
-      cap[i] = (m->cache.caps[m->nbEBands*(2*LM+C-1)+i]+64)*C*N>>2;
-   }
+void init_caps(const CELTMode *m, int *cap, int LM, int C) {
+    int i;
+    for (i = 0; i < m->nbEBands; i++) {
+        int N;
+        N = (m->eBands[i + 1] - m->eBands[i])<<LM;
+        cap[i] = (m->cache.caps[m->nbEBands*(2*LM + C - 1) + i] + 64)*C*N>>2;
+    }
 }
 
 
 
-const char *oac_strerror(int error)
-{
-   static const char * const error_strings[8] = {
-      "success",
-      "invalid argument",
-      "buffer too small",
-      "internal error",
-      "corrupted stream",
-      "request not implemented",
-      "invalid state",
-      "memory allocation failed"
-   };
-   if (error > 0 || error < -7)
-      return "unknown error";
-   else
-      return error_strings[-error];
+const char *oac_strerror(int error) {
+    static const char * const error_strings[8] = {
+        "success",
+        "invalid argument",
+        "buffer too small",
+        "internal error",
+        "corrupted stream",
+        "request not implemented",
+        "invalid state",
+        "memory allocation failed"
+    };
+    if (error > 0 || error < -7)
+        return "unknown error";
+    else
+        return error_strings[-error];
 }
 
-const char *oac_get_version_string(void)
-{
+const char *oac_get_version_string(void) {
     return "liboac " PACKAGE_VERSION
-    /* Applications may rely on the presence of this substring in the version
-       string to determine if they have a fixed-point or floating-point build
-       at runtime. */
+           /* Applications may rely on the presence of this substring in the version
+              string to determine if they have a fixed-point or floating-point build
+              at runtime. */
 #ifdef FIXED_POINT
-          "-fixed"
+           "-fixed"
 #endif
 #ifdef FUZZING
-          "-fuzzing"
+           "-fuzzing"
 #endif
-          ;
+    ;
 }
diff --git a/celt/celt.h b/celt/celt.h
index 073e6050d..9ef8b3b53 100644
--- a/celt/celt.h
+++ b/celt/celt.h
@@ -3,8 +3,8 @@
    Copyright (c) 2008 Gregory Maxwell
    Written by Jean-Marc Valin and Gregory Maxwell */
 /**
-  @file celt.h
-  @brief Contains all the functions for encoding and decoding audio
+   @file celt.h
+   @brief Contains all the functions for encoding and decoding audio
  */
 
 /*
@@ -30,7 +30,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef CELT_H
 #define CELT_H
@@ -44,7 +44,7 @@
 #include "kiss_fft.h"
 
 #ifdef ENABLE_DEEP_PLC
-#include "lpcnet.h"
+# include "lpcnet.h"
 #endif
 
 #define CELTEncoder OacCustomEncoder
@@ -54,24 +54,24 @@
 #define LEAK_BANDS 19
 
 typedef struct {
-   int valid;
-   float tonality;
-   float tonality_slope;
-   float noisiness;
-   float activity;
-   float music_prob;
-   float music_prob_min;
-   float music_prob_max;
-   int   bandwidth;
-   float activity_probability;
-   float max_pitch_ratio;
-   /* Store as Q6 char to save space. */
-   unsigned char leak_boost[LEAK_BANDS];
+    int valid;
+    float tonality;
+    float tonality_slope;
+    float noisiness;
+    float activity;
+    float music_prob;
+    float music_prob_min;
+    float music_prob_max;
+    int bandwidth;
+    float activity_probability;
+    float max_pitch_ratio;
+    /* Store as Q6 char to save space. */
+    unsigned char leak_boost[LEAK_BANDS];
 } AnalysisInfo;
 
 typedef struct {
-   int signalType;
-   int offset;
+    int signalType;
+    int offset;
 } SILKInfo;
 
 #define celt_check_mode_ptr_ptr(ptr) ((ptr) + ((ptr) - (const CELTMode**)(ptr)))
@@ -136,21 +136,22 @@ typedef struct {
 
 
 static OAC_INLINE oac_int32 bits_to_bitrate(oac_int32 bits, oac_int32 Fs, oac_int32 frame_size) {
-   return bits*(6*Fs/frame_size)/6;
+    return bits*(6*Fs/frame_size)/6;
 }
 
 static OAC_INLINE oac_int32 bitrate_to_bits(oac_int32 bitrate, oac_int32 Fs, oac_int32 frame_size) {
-   return bitrate*6/(6*Fs/frame_size);
+    return bitrate*6/(6*Fs/frame_size);
 }
 
 /* Encoder stuff */
 
 int celt_encoder_get_size(int channels);
 
-int celt_encode_with_ec(OacCustomEncoder * OAC_RESTRICT st, const oac_res * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes, ec_enc *enc);
+int celt_encode_with_ec(OacCustomEncoder * OAC_RESTRICT st, const oac_res * pcm, int frame_size,
+    unsigned char *compressed, int nbCompressedBytes, ec_enc *enc);
 
 int celt_encoder_init(CELTEncoder *st, oac_int32 sampling_rate, int channels,
-                      int arch);
+    int arch);
 
 
 
@@ -162,64 +163,62 @@ int celt_decoder_get_size(int channels);
 int celt_decoder_init(CELTDecoder *st, oac_int32 sampling_rate, int channels);
 
 int celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char *data,
-      int len, oac_res * OAC_RESTRICT pcm, int frame_size, ec_dec *dec, int accum
+    int len, oac_res * OAC_RESTRICT pcm, int frame_size, ec_dec *dec, int accum
 #ifdef ENABLE_DEEP_PLC
-      ,LPCNetPLCState *lpcnet
+    , LPCNetPLCState *lpcnet
 #endif
-      );
+    );
 
 int celt_decode_with_ec(OacCustomDecoder * OAC_RESTRICT st, const unsigned char *data,
-      int len, oac_res * OAC_RESTRICT pcm, int frame_size, ec_dec *dec, int accum);
+    int len, oac_res * OAC_RESTRICT pcm, int frame_size, ec_dec *dec, int accum);
 
 #define celt_encoder_ctl oac_custom_encoder_ctl
 #define celt_decoder_ctl oac_custom_decoder_ctl
 
 
 #if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
-#define OAC_CUSTOM_NOSTATIC
+# define OAC_CUSTOM_NOSTATIC
 #else
-#define OAC_CUSTOM_NOSTATIC static OAC_INLINE
+# define OAC_CUSTOM_NOSTATIC static OAC_INLINE
 #endif
 
 static const unsigned char trim_icdf[11] = {126, 124, 119, 109, 87, 41, 19, 9, 4, 2, 0};
 /* Probs: NONE: 21.875%, LIGHT: 6.25%, NORMAL: 65.625%, AGGRESSIVE: 6.25% */
 static const unsigned char spread_icdf[4] = {25, 23, 2, 0};
 
-static const unsigned char tapset_icdf[3]={2,1,0};
+static const unsigned char tapset_icdf[3] = {2, 1, 0};
 
 #if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
 static const unsigned char toOacTable[20] = {
-      0xE0, 0xE8, 0xF0, 0xF8,
-      0xC0, 0xC8, 0xD0, 0xD8,
-      0xA0, 0xA8, 0xB0, 0xB8,
-      0x00, 0x00, 0x00, 0x00,
-      0x80, 0x88, 0x90, 0x98,
+    0xE0, 0xE8, 0xF0, 0xF8,
+    0xC0, 0xC8, 0xD0, 0xD8,
+    0xA0, 0xA8, 0xB0, 0xB8,
+    0x00, 0x00, 0x00, 0x00,
+    0x80, 0x88, 0x90, 0x98,
 };
 
 static const unsigned char fromOacTable[16] = {
-      0x80, 0x88, 0x90, 0x98,
-      0x40, 0x48, 0x50, 0x58,
-      0x20, 0x28, 0x30, 0x38,
-      0x00, 0x08, 0x10, 0x18
+    0x80, 0x88, 0x90, 0x98,
+    0x40, 0x48, 0x50, 0x58,
+    0x20, 0x28, 0x30, 0x38,
+    0x00, 0x08, 0x10, 0x18
 };
 
-static OAC_INLINE int toOac(unsigned char c)
-{
-   int ret=0;
-   if (c<0xA0)
-      ret = toOacTable[c>>3];
-   if (ret == 0)
-      return -1;
-   else
-      return ret|(c&0x7);
+static OAC_INLINE int toOac(unsigned char c) {
+    int ret = 0;
+    if (c < 0xA0)
+        ret = toOacTable[c>>3];
+    if (ret == 0)
+        return -1;
+    else
+        return ret|(c&0x7);
 }
 
-static OAC_INLINE int fromOac(unsigned char c)
-{
-   if (c<0x80)
-      return -1;
-   else
-      return fromOacTable[(c>>3)-16] | (c&0x7);
+static OAC_INLINE int fromOac(unsigned char c) {
+    if (c < 0x80)
+        return -1;
+    else
+        return fromOacTable[(c>>3) - 16]|(c&0x7);
 }
 #endif /* CUSTOM_MODES */
 
@@ -230,35 +229,36 @@ extern const signed char tf_select_table[4][8];
 
 #if defined(ENABLE_HARDENING) || defined(ENABLE_ASSERTIONS)
 void validate_celt_decoder(CELTDecoder *st);
-#define VALIDATE_CELT_DECODER(st) validate_celt_decoder(st)
+# define VALIDATE_CELT_DECODER(st) validate_celt_decoder(st)
 #else
-#define VALIDATE_CELT_DECODER(st)
+# define VALIDATE_CELT_DECODER(st)
 #endif
 
 int resampling_factor(oac_int32 rate);
 
 void celt_preemphasis(const oac_res * OAC_RESTRICT pcmp, celt_sig * OAC_RESTRICT inp,
-                        int N, int CC, int upsample, const oac_val16 *coef, celt_sig *mem, int clip);
+    int N, int CC, int upsample, const oac_val16 *coef, celt_sig *mem, int clip);
 
 void comb_filter(oac_val32 *y, oac_val32 *x, int T0, int T1, int N,
-      oac_val16 g0, oac_val16 g1, int tapset0, int tapset1,
-      const celt_coef *window, int overlap, int arch);
+    oac_val16 g0, oac_val16 g1, int tapset0, int tapset1,
+    const celt_coef *window, int overlap, int arch);
 
-void init_caps(const CELTMode *m,int *cap,int LM,int C);
+void init_caps(const CELTMode *m, int *cap, int LM, int C);
 
 #ifdef RESYNTH
-void deemphasis(celt_sig *in[], oac_res *pcm, int N, int C, int downsample, const oac_val16 *coef, celt_sig *mem, int accum);
+void deemphasis(celt_sig *in[], oac_res *pcm, int N, int C, int downsample, const oac_val16 *coef, celt_sig *mem,
+    int accum);
 void celt_synthesis(const CELTMode *mode, celt_norm *X, celt_sig * out_syn[],
-      celt_glog *oldBandE, int start, int effEnd, int C, int CC, int isTransient,
-      int LM, int downsample, int silence, int arch);
+    celt_glog *oldBandE, int start, int effEnd, int C, int CC, int isTransient,
+    int LM, int downsample, int silence, int arch);
 #endif
 
 #ifdef ENABLE_QEXT
-#define QEXT_SCALE(x) ((qext_scale)*(x))
-#define QEXT_SCALE2(x, qext_scale) ((qext_scale)*(x))
+# define QEXT_SCALE(x) ((qext_scale)*(x))
+# define QEXT_SCALE2(x, qext_scale) ((qext_scale)*(x))
 #else
-#define QEXT_SCALE(x) (x)
-#define QEXT_SCALE2(x, qext_scale) (x)
+# define QEXT_SCALE(x) (x)
+# define QEXT_SCALE2(x, qext_scale) (x)
 #endif
 
 #endif /* CELT_H */
diff --git a/celt/celt_decoder.c b/celt/celt_decoder.c
index ac2e40816..79ca65538 100644
--- a/celt/celt_decoder.c
+++ b/celt/celt_decoder.c
@@ -25,10 +25,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #define CELT_DECODER_C
@@ -52,8 +52,8 @@
 #include "vq.h"
 
 #ifdef ENABLE_DEEP_PLC
-#include "lpcnet.h"
-#include "lpcnet_private.h"
+# include "lpcnet.h"
+# include "lpcnet_private.h"
 #endif
 
 /* The maximum pitch lag to allow in the pitch-based PLC. It's possible to save
@@ -82,198 +82,190 @@
 #define PLC_UPDATE_SAMPLES (PLC_UPDATE_FRAMES*FRAME_SIZE)
 
 /** Decoder state
- @brief Decoder state
+   @brief Decoder state
  */
 struct OacCustomDecoder {
-   const OacCustomMode *mode;
-   int overlap;
-   int channels;
-   int stream_channels;
-
-   int downsample;
-   int start, end;
-   int signalling;
-   int disable_inv;
-   int complexity;
-   int arch;
+    const OacCustomMode *mode;
+    int overlap;
+    int channels;
+    int stream_channels;
+
+    int downsample;
+    int start, end;
+    int signalling;
+    int disable_inv;
+    int complexity;
+    int arch;
 #ifdef ENABLE_QEXT
-   int qext_scale;
+    int qext_scale;
 #endif
 
-   /* Everything beyond this point gets cleared on a reset */
+    /* Everything beyond this point gets cleared on a reset */
 #define DECODER_RESET_START rng
 
-   oac_uint32 rng;
-   int error;
-   int last_pitch_index;
-   int loss_duration;
-   int plc_duration;
-   int last_frame_type;
-   int skip_plc;
-   int postfilter_period;
-   int postfilter_period_old;
-   oac_val16 postfilter_gain;
-   oac_val16 postfilter_gain_old;
-   int postfilter_tapset;
-   int postfilter_tapset_old;
-   int prefilter_and_fold;
-
-   celt_sig preemph_memD[2];
+    oac_uint32 rng;
+    int error;
+    int last_pitch_index;
+    int loss_duration;
+    int plc_duration;
+    int last_frame_type;
+    int skip_plc;
+    int postfilter_period;
+    int postfilter_period_old;
+    oac_val16 postfilter_gain;
+    oac_val16 postfilter_gain_old;
+    int postfilter_tapset;
+    int postfilter_tapset_old;
+    int prefilter_and_fold;
+
+    celt_sig preemph_memD[2];
 
 #ifdef ENABLE_DEEP_PLC
-   oac_int16 plc_pcm[PLC_UPDATE_SAMPLES];
-   int plc_fill;
-   float plc_preemphasis_mem;
+    oac_int16 plc_pcm[PLC_UPDATE_SAMPLES];
+    int plc_fill;
+    float plc_preemphasis_mem;
 #endif
 
-   celt_sig _decode_mem[1]; /* Size = channels*(DECODE_BUFFER_SIZE+mode->overlap) */
-   /* celt_glog oldEBands[], Size = 2*mode->nbEBands */
-   /* celt_glog oldLogE[], Size = 2*mode->nbEBands */
-   /* celt_glog oldLogE2[], Size = 2*mode->nbEBands */
-   /* celt_glog backgroundLogE[], Size = 2*mode->nbEBands */
-   /* oac_val16 lpc[],  Size = channels*CELT_LPC_ORDER */
+    celt_sig _decode_mem[1]; /* Size = channels*(DECODE_BUFFER_SIZE+mode->overlap) */
+    /* celt_glog oldEBands[], Size = 2*mode->nbEBands */
+    /* celt_glog oldLogE[], Size = 2*mode->nbEBands */
+    /* celt_glog oldLogE2[], Size = 2*mode->nbEBands */
+    /* celt_glog backgroundLogE[], Size = 2*mode->nbEBands */
+    /* oac_val16 lpc[],  Size = channels*CELT_LPC_ORDER */
 };
 
 #if defined(ENABLE_HARDENING) || defined(ENABLE_ASSERTIONS)
 /* Make basic checks on the CELT state to ensure we don't end
    up writing all over memory. */
-void validate_celt_decoder(CELTDecoder *st)
-{
-#if !defined(CUSTOM_MODES) && !defined(ENABLE_OAC_CUSTOM_API) && !defined(ENABLE_QEXT)
-   celt_assert(st->mode == oac_custom_mode_create(48000, 960, NULL));
-   celt_assert(st->overlap == 120);
-   celt_assert(st->end <= 21);
-#else
+void validate_celt_decoder(CELTDecoder *st) {
+# if !defined(CUSTOM_MODES) && !defined(ENABLE_OAC_CUSTOM_API) && !defined(ENABLE_QEXT)
+    celt_assert(st->mode == oac_custom_mode_create(48000, 960, NULL));
+    celt_assert(st->overlap == 120);
+    celt_assert(st->end <= 21);
+# else
 /* From Section 4.3 in the spec: "The normal CELT layer uses 21 of those bands,
    though Oac Custom (see Section 6.2) may use a different number of bands"
 
    Check if it's within the maximum number of Bark frequency bands instead */
-   celt_assert(st->end <= 25);
-#endif
-   celt_assert(st->channels == 1 || st->channels == 2);
-   celt_assert(st->stream_channels == 1 || st->stream_channels == 2);
-   celt_assert(st->downsample > 0);
-   celt_assert(st->start == 0 || st->start == 17);
-   celt_assert(st->start < st->end);
-#ifdef OAC_ARCHMASK
-   celt_assert(st->arch >= 0);
-   celt_assert(st->arch <= OAC_ARCHMASK);
-#endif
-#ifndef ENABLE_QEXT
-   celt_assert(st->last_pitch_index <= PLC_PITCH_LAG_MAX);
-   celt_assert(st->last_pitch_index >= PLC_PITCH_LAG_MIN || st->last_pitch_index == 0);
-#endif
-   celt_assert(st->postfilter_period < MAX_PERIOD);
-   celt_assert(st->postfilter_period >= COMBFILTER_MINPERIOD || st->postfilter_period == 0);
-   celt_assert(st->postfilter_period_old < MAX_PERIOD);
-   celt_assert(st->postfilter_period_old >= COMBFILTER_MINPERIOD || st->postfilter_period_old == 0);
-   celt_assert(st->postfilter_tapset <= 2);
-   celt_assert(st->postfilter_tapset >= 0);
-   celt_assert(st->postfilter_tapset_old <= 2);
-   celt_assert(st->postfilter_tapset_old >= 0);
+    celt_assert(st->end <= 25);
+# endif
+    celt_assert(st->channels == 1 || st->channels == 2);
+    celt_assert(st->stream_channels == 1 || st->stream_channels == 2);
+    celt_assert(st->downsample > 0);
+    celt_assert(st->start == 0 || st->start == 17);
+    celt_assert(st->start < st->end);
+# ifdef OAC_ARCHMASK
+    celt_assert(st->arch >= 0);
+    celt_assert(st->arch <= OAC_ARCHMASK);
+# endif
+# ifndef ENABLE_QEXT
+    celt_assert(st->last_pitch_index <= PLC_PITCH_LAG_MAX);
+    celt_assert(st->last_pitch_index >= PLC_PITCH_LAG_MIN || st->last_pitch_index == 0);
+# endif
+    celt_assert(st->postfilter_period < MAX_PERIOD);
+    celt_assert(st->postfilter_period >= COMBFILTER_MINPERIOD || st->postfilter_period == 0);
+    celt_assert(st->postfilter_period_old < MAX_PERIOD);
+    celt_assert(st->postfilter_period_old >= COMBFILTER_MINPERIOD || st->postfilter_period_old == 0);
+    celt_assert(st->postfilter_tapset <= 2);
+    celt_assert(st->postfilter_tapset >= 0);
+    celt_assert(st->postfilter_tapset_old <= 2);
+    celt_assert(st->postfilter_tapset_old >= 0);
 }
 #endif
 
-int celt_decoder_get_size(int channels)
-{
+int celt_decoder_get_size(int channels) {
 #ifdef ENABLE_QEXT
-   const CELTMode *mode = oac_custom_mode_create(96000, 960, NULL);
+    const CELTMode *mode = oac_custom_mode_create(96000, 960, NULL);
 #else
-   const CELTMode *mode = oac_custom_mode_create(48000, 960, NULL);
+    const CELTMode *mode = oac_custom_mode_create(48000, 960, NULL);
 #endif
-   return oac_custom_decoder_get_size(mode, channels);
+    return oac_custom_decoder_get_size(mode, channels);
 }
 
-OAC_CUSTOM_NOSTATIC int oac_custom_decoder_get_size(const CELTMode *mode, int channels)
-{
-   int size;
+OAC_CUSTOM_NOSTATIC int oac_custom_decoder_get_size(const CELTMode *mode, int channels) {
+    int size;
 #ifdef ENABLE_QEXT
-   int qext_scale;
-   if (mode->Fs == 96000 && (mode->shortMdctSize==240 || mode->shortMdctSize==180)) {
-      qext_scale = 2;
-   } else qext_scale = 1;
+    int qext_scale;
+    if (mode->Fs == 96000 && (mode->shortMdctSize == 240 || mode->shortMdctSize == 180)) {
+        qext_scale = 2;
+    } else qext_scale = 1;
 #endif
-   size = sizeof(struct CELTDecoder)
-            + (channels*(QEXT_SCALE(DECODE_BUFFER_SIZE)+mode->overlap)-1)*sizeof(celt_sig)
-            + 4*2*mode->nbEBands*sizeof(celt_glog)
-            + channels*CELT_LPC_ORDER*sizeof(oac_val16);
-   return size;
+    size = sizeof(struct CELTDecoder)
+           + (channels*(QEXT_SCALE(DECODE_BUFFER_SIZE) + mode->overlap) - 1)*sizeof(celt_sig)
+           + 4*2*mode->nbEBands*sizeof(celt_glog)
+           + channels*CELT_LPC_ORDER*sizeof(oac_val16);
+    return size;
 }
 
 #if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
-CELTDecoder *oac_custom_decoder_create(const CELTMode *mode, int channels, int *error)
-{
-   int ret;
-   CELTDecoder *st = (CELTDecoder *)oac_alloc(oac_custom_decoder_get_size(mode, channels));
-   ret = oac_custom_decoder_init(st, mode, channels);
-   if (ret != OAC_OK)
-   {
-      oac_custom_decoder_destroy(st);
-      st = NULL;
-   }
-   if (error)
-      *error = ret;
-   return st;
+CELTDecoder *oac_custom_decoder_create(const CELTMode *mode, int channels, int *error) {
+    int ret;
+    CELTDecoder *st = (CELTDecoder *)oac_alloc(oac_custom_decoder_get_size(mode, channels));
+    ret = oac_custom_decoder_init(st, mode, channels);
+    if (ret != OAC_OK) {
+        oac_custom_decoder_destroy(st);
+        st = NULL;
+    }
+    if (error)
+        *error = ret;
+    return st;
 }
 #endif /* CUSTOM_MODES */
 
-int celt_decoder_init(CELTDecoder *st, oac_int32 sampling_rate, int channels)
-{
-   int ret;
+int celt_decoder_init(CELTDecoder *st, oac_int32 sampling_rate, int channels) {
+    int ret;
 #ifdef ENABLE_QEXT
-   if (sampling_rate == 96000) {
-      return oac_custom_decoder_init(st, oac_custom_mode_create(96000, 960, NULL), channels);
-   }
+    if (sampling_rate == 96000) {
+        return oac_custom_decoder_init(st, oac_custom_mode_create(96000, 960, NULL), channels);
+    }
 #endif
-   ret = oac_custom_decoder_init(st, oac_custom_mode_create(48000, 960, NULL), channels);
-   if (ret != OAC_OK)
-      return ret;
-   st->downsample = resampling_factor(sampling_rate);
-   if (st->downsample==0)
-      return OAC_BAD_ARG;
-   else
-      return OAC_OK;
+    ret = oac_custom_decoder_init(st, oac_custom_mode_create(48000, 960, NULL), channels);
+    if (ret != OAC_OK)
+        return ret;
+    st->downsample = resampling_factor(sampling_rate);
+    if (st->downsample == 0)
+        return OAC_BAD_ARG;
+    else
+        return OAC_OK;
 }
 
-OAC_CUSTOM_NOSTATIC int oac_custom_decoder_init(CELTDecoder *st, const CELTMode *mode, int channels)
-{
-   if (channels < 0 || channels > 2)
-      return OAC_BAD_ARG;
+OAC_CUSTOM_NOSTATIC int oac_custom_decoder_init(CELTDecoder *st, const CELTMode *mode, int channels) {
+    if (channels < 0 || channels > 2)
+        return OAC_BAD_ARG;
 
-   if (st==NULL)
-      return OAC_ALLOC_FAIL;
+    if (st == NULL)
+        return OAC_ALLOC_FAIL;
 
-   OAC_CLEAR((char*)st, oac_custom_decoder_get_size(mode, channels));
+    OAC_CLEAR((char*)st, oac_custom_decoder_get_size(mode, channels));
 
-   st->mode = mode;
-   st->overlap = mode->overlap;
-   st->stream_channels = st->channels = channels;
+    st->mode = mode;
+    st->overlap = mode->overlap;
+    st->stream_channels = st->channels = channels;
 
-   st->downsample = 1;
-   st->start = 0;
-   st->end = st->mode->effEBands;
-   st->signalling = 1;
+    st->downsample = 1;
+    st->start = 0;
+    st->end = st->mode->effEBands;
+    st->signalling = 1;
 #ifndef DISABLE_UPDATE_DRAFT
-   st->disable_inv = channels == 1;
+    st->disable_inv = channels == 1;
 #else
-   st->disable_inv = 0;
+    st->disable_inv = 0;
 #endif
-   st->arch = oac_select_arch();
+    st->arch = oac_select_arch();
 
 #ifdef ENABLE_QEXT
-   if (st->mode->Fs == 96000 && (mode->shortMdctSize==240 || mode->shortMdctSize==180)) st->qext_scale = 2;
-   else st->qext_scale = 1;
+    if (st->mode->Fs == 96000 && (mode->shortMdctSize == 240 || mode->shortMdctSize == 180)) st->qext_scale = 2;
+    else st->qext_scale = 1;
 #endif
 
-   oac_custom_decoder_ctl(st, OAC_RESET_STATE);
+    oac_custom_decoder_ctl(st, OAC_RESET_STATE);
 
-   return OAC_OK;
+    return OAC_OK;
 }
 
 #if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
-void oac_custom_decoder_destroy(CELTDecoder *st)
-{
-   oac_free(st);
+void oac_custom_decoder_destroy(CELTDecoder *st) {
+    oac_free(st);
 }
 #endif /* CUSTOM_MODES */
 
@@ -282,29 +274,27 @@ void oac_custom_decoder_destroy(CELTDecoder *st)
    quite common and we can make it faster by processing both channels in the
    same loop, reducing overhead due to the dependency loop in the IIR filter. */
 static void deemphasis_stereo_simple(celt_sig *in[], oac_res *pcm, int N, const oac_val16 coef0,
-      celt_sig *mem)
-{
-   celt_sig * OAC_RESTRICT x0;
-   celt_sig * OAC_RESTRICT x1;
-   celt_sig m0, m1;
-   int j;
-   x0=in[0];
-   x1=in[1];
-   m0 = mem[0];
-   m1 = mem[1];
-   for (j=0;j<N;j++)
-   {
-      celt_sig tmp0, tmp1;
-      /* Add VERY_SMALL to x[] first to reduce dependency chain. */
-      tmp0 = SATURATE(x0[j] + VERY_SMALL + m0, SIG_SAT);
-      tmp1 = SATURATE(x1[j] + VERY_SMALL + m1, SIG_SAT);
-      m0 = MULT16_32_Q15(coef0, tmp0);
-      m1 = MULT16_32_Q15(coef0, tmp1);
-      pcm[2*j  ] = SIG2RES(tmp0);
-      pcm[2*j+1] = SIG2RES(tmp1);
-   }
-   mem[0] = m0;
-   mem[1] = m1;
+                                     celt_sig *mem) {
+    celt_sig * OAC_RESTRICT x0;
+    celt_sig * OAC_RESTRICT x1;
+    celt_sig m0, m1;
+    int j;
+    x0 = in[0];
+    x1 = in[1];
+    m0 = mem[0];
+    m1 = mem[1];
+    for (j = 0; j < N; j++) {
+        celt_sig tmp0, tmp1;
+        /* Add VERY_SMALL to x[] first to reduce dependency chain. */
+        tmp0 = SATURATE(x0[j] + VERY_SMALL + m0, SIG_SAT);
+        tmp1 = SATURATE(x1[j] + VERY_SMALL + m1, SIG_SAT);
+        m0 = MULT16_32_Q15(coef0, tmp0);
+        m1 = MULT16_32_Q15(coef0, tmp1);
+        pcm[2*j  ] = SIG2RES(tmp0);
+        pcm[2*j + 1] = SIG2RES(tmp1);
+    }
+    mem[0] = m0;
+    mem[1] = m1;
 }
 #endif
 
@@ -312,95 +302,82 @@ static void deemphasis_stereo_simple(celt_sig *in[], oac_res *pcm, int N, const
 static
 #endif
 void deemphasis(celt_sig *in[], oac_res *pcm, int N, int C, int downsample, const oac_val16 *coef,
-      celt_sig *mem, int accum)
-{
-   int c;
-   int Nd;
-   int apply_downsampling=0;
-   oac_val16 coef0;
-   VARDECL(celt_sig, scratch);
-   SAVE_STACK;
+                celt_sig *mem, int accum) {
+    int c;
+    int Nd;
+    int apply_downsampling = 0;
+    oac_val16 coef0;
+    VARDECL(celt_sig, scratch);
+    SAVE_STACK;
 #if !defined(CUSTOM_MODES) && !defined(ENABLE_OAC_CUSTOM_API) && !defined(ENABLE_QEXT)
-   /* Short version for common case. */
-   if (downsample == 1 && C == 2 && !accum)
-   {
-      deemphasis_stereo_simple(in, pcm, N, coef[0], mem);
-      return;
-   }
+    /* Short version for common case. */
+    if (downsample == 1 && C == 2 && !accum) {
+        deemphasis_stereo_simple(in, pcm, N, coef[0], mem);
+        return;
+    }
 #endif
-   ALLOC(scratch, N, celt_sig);
-   coef0 = coef[0];
-   Nd = N/downsample;
-   c=0; do {
-      int j;
-      celt_sig * OAC_RESTRICT x;
-      oac_res  * OAC_RESTRICT y;
-      celt_sig m = mem[c];
-      x =in[c];
-      y = pcm+c;
+    ALLOC(scratch, N, celt_sig);
+    coef0 = coef[0];
+    Nd = N/downsample;
+    c = 0; do {
+        int j;
+        celt_sig * OAC_RESTRICT x;
+        oac_res  * OAC_RESTRICT y;
+        celt_sig m = mem[c];
+        x = in[c];
+        y = pcm + c;
 #if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API) || defined(ENABLE_QEXT)
-      if (coef[1] != 0)
-      {
-         oac_val16 coef1 = coef[1];
-         oac_val16 coef3 = coef[3];
-         for (j=0;j<N;j++)
-         {
-            celt_sig tmp = SATURATE(x[j] + m + VERY_SMALL, SIG_SAT);
-            m = MULT16_32_Q15(coef0, tmp)
-                          - MULT16_32_Q15(coef1, x[j]);
-            tmp = SHL32(MULT16_32_Q15(coef3, tmp), 2);
-            scratch[j] = tmp;
-         }
-         apply_downsampling=1;
-      } else
+        if (coef[1] != 0) {
+            oac_val16 coef1 = coef[1];
+            oac_val16 coef3 = coef[3];
+            for (j = 0; j < N; j++) {
+                celt_sig tmp = SATURATE(x[j] + m + VERY_SMALL, SIG_SAT);
+                m = MULT16_32_Q15(coef0, tmp)
+                    - MULT16_32_Q15(coef1, x[j]);
+                tmp = SHL32(MULT16_32_Q15(coef3, tmp), 2);
+                scratch[j] = tmp;
+            }
+            apply_downsampling = 1;
+        } else
 #endif
-      if (downsample>1)
-      {
-         /* Shortcut for the standard (non-custom modes) case */
-         for (j=0;j<N;j++)
-         {
-            celt_sig tmp = SATURATE(x[j] + VERY_SMALL + m, SIG_SAT);
-            m = MULT16_32_Q15(coef0, tmp);
-            scratch[j] = tmp;
-         }
-         apply_downsampling=1;
-      } else {
-         /* Shortcut for the standard (non-custom modes) case */
-         if (accum)
-         {
-            for (j=0;j<N;j++)
-            {
-               celt_sig tmp = SATURATE(x[j] + m + VERY_SMALL, SIG_SAT);
-               m = MULT16_32_Q15(coef0, tmp);
-               y[j*C] = ADD_RES(y[j*C], SIG2RES(tmp));
+        if (downsample > 1) {
+            /* Shortcut for the standard (non-custom modes) case */
+            for (j = 0; j < N; j++) {
+                celt_sig tmp = SATURATE(x[j] + VERY_SMALL + m, SIG_SAT);
+                m = MULT16_32_Q15(coef0, tmp);
+                scratch[j] = tmp;
             }
-         } else
-         {
-            for (j=0;j<N;j++)
-            {
-               celt_sig tmp = SATURATE(x[j] + VERY_SMALL + m, SIG_SAT);
-               m = MULT16_32_Q15(coef0, tmp);
-               y[j*C] = SIG2RES(tmp);
+            apply_downsampling = 1;
+        } else {
+            /* Shortcut for the standard (non-custom modes) case */
+            if (accum) {
+                for (j = 0; j < N; j++) {
+                    celt_sig tmp = SATURATE(x[j] + m + VERY_SMALL, SIG_SAT);
+                    m = MULT16_32_Q15(coef0, tmp);
+                    y[j*C] = ADD_RES(y[j*C], SIG2RES(tmp));
+                }
+            } else {
+                for (j = 0; j < N; j++) {
+                    celt_sig tmp = SATURATE(x[j] + VERY_SMALL + m, SIG_SAT);
+                    m = MULT16_32_Q15(coef0, tmp);
+                    y[j*C] = SIG2RES(tmp);
+                }
             }
-         }
-      }
-      mem[c] = m;
-
-      if (apply_downsampling)
-      {
-         /* Perform down-sampling */
-         if (accum)
-         {
-            for (j=0;j<Nd;j++)
-               y[j*C] = ADD_RES(y[j*C], SIG2RES(scratch[j*downsample]));
-         } else
-         {
-            for (j=0;j<Nd;j++)
-               y[j*C] = SIG2RES(scratch[j*downsample]);
-         }
-      }
-   } while (++c<C);
-   RESTORE_STACK;
+        }
+        mem[c] = m;
+
+        if (apply_downsampling) {
+            /* Perform down-sampling */
+            if (accum) {
+                for (j = 0; j < Nd; j++)
+                    y[j*C] = ADD_RES(y[j*C], SIG2RES(scratch[j*downsample]));
+            } else {
+                for (j = 0; j < Nd; j++)
+                    y[j*C] = SIG2RES(scratch[j*downsample]);
+            }
+        }
+    } while (++c < C);
+    RESTORE_STACK;
 }
 
 #ifndef RESYNTH
@@ -409,198 +386,186 @@ static
 void celt_synthesis(const CELTMode *mode, celt_norm *X, celt_sig * out_syn[],
                     celt_glog *oldBandE, int start, int effEnd, int C, int CC,
                     int isTransient, int LM, int downsample,
-                    int silence, int arch)
-{
-   int c, i;
-   int M;
-   int b;
-   int B;
-   int N, NB;
-   int shift;
-   int nbEBands;
-   int overlap;
-   VARDECL(celt_sig, freq);
-   SAVE_STACK;
-
-   overlap = mode->overlap;
-   nbEBands = mode->nbEBands;
-   N = mode->shortMdctSize<<LM;
-   ALLOC(freq, N, celt_sig); /**< Interleaved signal MDCTs */
-   M = 1<<LM;
-
-   if (isTransient)
-   {
-      B = M;
-      NB = mode->shortMdctSize;
-      shift = mode->maxLM;
-   } else {
-      B = 1;
-      NB = mode->shortMdctSize<<LM;
-      shift = mode->maxLM-LM;
-   }
-
-   if (CC==2&&C==1)
-   {
-      /* Copying a mono streams to two channels */
-      celt_sig *freq2;
-      denormalise_bands(mode, X, freq, oldBandE, start, effEnd, M,
+                    int silence, int arch) {
+    int c, i;
+    int M;
+    int b;
+    int B;
+    int N, NB;
+    int shift;
+    int nbEBands;
+    int overlap;
+    VARDECL(celt_sig, freq);
+    SAVE_STACK;
+
+    overlap = mode->overlap;
+    nbEBands = mode->nbEBands;
+    N = mode->shortMdctSize<<LM;
+    ALLOC(freq, N, celt_sig); /**< Interleaved signal MDCTs */
+    M = 1<<LM;
+
+    if (isTransient) {
+        B = M;
+        NB = mode->shortMdctSize;
+        shift = mode->maxLM;
+    } else {
+        B = 1;
+        NB = mode->shortMdctSize<<LM;
+        shift = mode->maxLM - LM;
+    }
+
+    if (CC == 2 && C == 1) {
+        /* Copying a mono streams to two channels */
+        celt_sig *freq2;
+        denormalise_bands(mode, X, freq, oldBandE, start, effEnd, M,
             downsample, silence);
-      /* Store a temporary copy in the output buffer because the IMDCT destroys its input. */
-      freq2 = out_syn[1]+overlap/2;
-      OAC_COPY(freq2, freq, N);
-      for (b=0;b<B;b++)
-         clt_mdct_backward(&mode->mdct, &freq2[b], out_syn[0]+NB*b, mode->window, overlap, shift, B, arch);
-      for (b=0;b<B;b++)
-         clt_mdct_backward(&mode->mdct, &freq[b], out_syn[1]+NB*b, mode->window, overlap, shift, B, arch);
-   } else if (CC==1&&C==2)
-   {
-      /* Downmixing a stereo stream to mono */
-      celt_sig *freq2;
-      freq2 = out_syn[0]+overlap/2;
-      denormalise_bands(mode, X, freq, oldBandE, start, effEnd, M,
+        /* Store a temporary copy in the output buffer because the IMDCT destroys its input. */
+        freq2 = out_syn[1] + overlap/2;
+        OAC_COPY(freq2, freq, N);
+        for (b = 0; b < B; b++)
+            clt_mdct_backward(&mode->mdct, &freq2[b], out_syn[0] + NB*b, mode->window, overlap, shift, B, arch);
+        for (b = 0; b < B; b++)
+            clt_mdct_backward(&mode->mdct, &freq[b], out_syn[1] + NB*b, mode->window, overlap, shift, B, arch);
+    } else if (CC == 1 && C == 2) {
+        /* Downmixing a stereo stream to mono */
+        celt_sig *freq2;
+        freq2 = out_syn[0] + overlap/2;
+        denormalise_bands(mode, X, freq, oldBandE, start, effEnd, M,
             downsample, silence);
-      /* Use the output buffer as temp array before downmixing. */
-      denormalise_bands(mode, X+N, freq2, oldBandE+nbEBands, start, effEnd, M,
+        /* Use the output buffer as temp array before downmixing. */
+        denormalise_bands(mode, X + N, freq2, oldBandE + nbEBands, start, effEnd, M,
             downsample, silence);
-      for (i=0;i<N;i++)
-         freq[i] = ADD32(HALF32(freq[i]), HALF32(freq2[i]));
-      for (b=0;b<B;b++)
-         clt_mdct_backward(&mode->mdct, &freq[b], out_syn[0]+NB*b, mode->window, overlap, shift, B, arch);
-   } else {
-      /* Normal case (mono or stereo) */
-      c=0; do {
-         denormalise_bands(mode, X+c*N, freq, oldBandE+c*nbEBands, start, effEnd, M,
+        for (i = 0; i < N; i++)
+            freq[i] = ADD32(HALF32(freq[i]), HALF32(freq2[i]));
+        for (b = 0; b < B; b++)
+            clt_mdct_backward(&mode->mdct, &freq[b], out_syn[0] + NB*b, mode->window, overlap, shift, B, arch);
+    } else {
+        /* Normal case (mono or stereo) */
+        c = 0; do {
+            denormalise_bands(mode, X + c*N, freq, oldBandE + c*nbEBands, start, effEnd, M,
                downsample, silence);
-         for (b=0;b<B;b++)
-            clt_mdct_backward(&mode->mdct, &freq[b], out_syn[c]+NB*b, mode->window, overlap, shift, B, arch);
-      } while (++c<CC);
-   }
-   /* Saturate IMDCT output so that we can't overflow in the pitch postfilter
-      or in the */
-   c=0; do {
-      for (i=0;i<N;i++)
-         out_syn[c][i] = SATURATE(out_syn[c][i], SIG_SAT);
-   } while (++c<CC);
-   RESTORE_STACK;
+            for (b = 0; b < B; b++)
+                clt_mdct_backward(&mode->mdct, &freq[b], out_syn[c] + NB*b, mode->window, overlap, shift, B, arch);
+        } while (++c < CC);
+    }
+    /* Saturate IMDCT output so that we can't overflow in the pitch postfilter
+       or in the */
+    c = 0; do {
+        for (i = 0; i < N; i++)
+            out_syn[c][i] = SATURATE(out_syn[c][i], SIG_SAT);
+    } while (++c < CC);
+    RESTORE_STACK;
 }
 
-static void tf_decode(int start, int end, int isTransient, int *tf_res, int LM, ec_dec *dec)
-{
-   int i, curr, tf_select;
-   int tf_select_rsv;
-   int tf_changed;
-   int logp;
-   oac_uint32 budget;
-   oac_uint32 tell;
-
-   budget = dec->storage*8;
-   tell = ec_tell(dec);
-   logp = isTransient ? 2 : 4;
-   tf_select_rsv = LM>0 && tell+logp+1<=budget;
-   budget -= tf_select_rsv;
-   tf_changed = curr = 0;
-   for (i=start;i<end;i++)
-   {
-      if (tell+logp<=budget)
-      {
-         curr ^= ec_dec_bit_logp(dec, logp);
-         tell = ec_tell(dec);
-         tf_changed |= curr;
-      }
-      tf_res[i] = curr;
-      logp = isTransient ? 4 : 5;
-   }
-   tf_select = 0;
-   if (tf_select_rsv &&
-     tf_select_table[LM][4*isTransient+0+tf_changed] !=
-     tf_select_table[LM][4*isTransient+2+tf_changed])
-   {
-      tf_select = ec_dec_bit_logp(dec, 1);
-   }
-   for (i=start;i<end;i++)
-   {
-      tf_res[i] = tf_select_table[LM][4*isTransient+2*tf_select+tf_res[i]];
-   }
+static void tf_decode(int start, int end, int isTransient, int *tf_res, int LM, ec_dec *dec) {
+    int i, curr, tf_select;
+    int tf_select_rsv;
+    int tf_changed;
+    int logp;
+    oac_uint32 budget;
+    oac_uint32 tell;
+
+    budget = dec->storage*8;
+    tell = ec_tell(dec);
+    logp = isTransient ? 2 : 4;
+    tf_select_rsv = LM > 0 && tell + logp + 1 <= budget;
+    budget -= tf_select_rsv;
+    tf_changed = curr = 0;
+    for (i = start; i < end; i++) {
+        if (tell + logp <= budget) {
+            curr ^= ec_dec_bit_logp(dec, logp);
+            tell = ec_tell(dec);
+            tf_changed |= curr;
+        }
+        tf_res[i] = curr;
+        logp = isTransient ? 4 : 5;
+    }
+    tf_select = 0;
+    if (tf_select_rsv
+        && tf_select_table[LM][4*isTransient + 0 + tf_changed] !=
+        tf_select_table[LM][4*isTransient + 2 + tf_changed]) {
+        tf_select = ec_dec_bit_logp(dec, 1);
+    }
+    for (i = start; i < end; i++) {
+        tf_res[i] = tf_select_table[LM][4*isTransient + 2*tf_select + tf_res[i]];
+    }
 }
 
-static int celt_plc_pitch_search(CELTDecoder *st, celt_sig *decode_mem[2], int C, int arch)
-{
-   int pitch_index;
+static int celt_plc_pitch_search(CELTDecoder *st, celt_sig *decode_mem[2], int C, int arch) {
+    int pitch_index;
 #ifdef ENABLE_QEXT
-   int qext_scale;
+    int qext_scale;
 #endif
-   VARDECL( oac_val16, lp_pitch_buf );
-   SAVE_STACK;
+    VARDECL( oac_val16, lp_pitch_buf );
+    SAVE_STACK;
 #ifdef ENABLE_QEXT
-   qext_scale = st->qext_scale;
+    qext_scale = st->qext_scale;
 #else
-   (void)st;
+    (void)st;
 #endif
-   ALLOC( lp_pitch_buf, DECODE_BUFFER_SIZE>>1, oac_val16 );
-   pitch_downsample(decode_mem, lp_pitch_buf,
+    ALLOC( lp_pitch_buf, DECODE_BUFFER_SIZE>>1, oac_val16 );
+    pitch_downsample(decode_mem, lp_pitch_buf,
          DECODE_BUFFER_SIZE>>1, C, QEXT_SCALE(2), arch);
-   pitch_search(lp_pitch_buf+(PLC_PITCH_LAG_MAX>>1), lp_pitch_buf,
-         DECODE_BUFFER_SIZE-PLC_PITCH_LAG_MAX,
-         PLC_PITCH_LAG_MAX-PLC_PITCH_LAG_MIN, &pitch_index, arch);
-   pitch_index = PLC_PITCH_LAG_MAX-pitch_index;
-   RESTORE_STACK;
-   return QEXT_SCALE(pitch_index);
+    pitch_search(lp_pitch_buf + (PLC_PITCH_LAG_MAX>>1), lp_pitch_buf,
+         DECODE_BUFFER_SIZE - PLC_PITCH_LAG_MAX,
+         PLC_PITCH_LAG_MAX - PLC_PITCH_LAG_MIN, &pitch_index, arch);
+    pitch_index = PLC_PITCH_LAG_MAX - pitch_index;
+    RESTORE_STACK;
+    return QEXT_SCALE(pitch_index);
 }
 
-static void prefilter_and_fold(CELTDecoder * OAC_RESTRICT st, int N)
-{
-   int c;
-   int CC;
-   int i;
-   int overlap;
-   celt_sig *decode_mem[2];
-   const OacCustomMode *mode;
-   int decode_buffer_size;
+static void prefilter_and_fold(CELTDecoder * OAC_RESTRICT st, int N) {
+    int c;
+    int CC;
+    int i;
+    int overlap;
+    celt_sig *decode_mem[2];
+    const OacCustomMode *mode;
+    int decode_buffer_size;
 #ifdef ENABLE_QEXT
-   int qext_scale;
+    int qext_scale;
 #endif
-   VARDECL(oac_val32, etmp);
-   SAVE_STACK
+    VARDECL(oac_val32, etmp);
+    SAVE_STACK
 #ifdef ENABLE_QEXT
-   qext_scale = st->qext_scale;
+    qext_scale = st->qext_scale;
 #endif
-   decode_buffer_size = QEXT_SCALE(DECODE_BUFFER_SIZE);
-   mode = st->mode;
-   overlap = st->overlap;
-   CC = st->channels;
-   ALLOC(etmp, overlap, oac_val32);
-   c=0; do {
-      decode_mem[c] = st->_decode_mem + c*(decode_buffer_size+overlap);
-   } while (++c<CC);
-
-   c=0; do {
-      /* Apply the pre-filter to the MDCT overlap for the next frame because
-         the post-filter will be re-applied in the decoder after the MDCT
-         overlap. */
-      comb_filter(etmp, decode_mem[c]+decode_buffer_size-N,
+    decode_buffer_size = QEXT_SCALE(DECODE_BUFFER_SIZE);
+    mode = st->mode;
+    overlap = st->overlap;
+    CC = st->channels;
+    ALLOC(etmp, overlap, oac_val32);
+    c = 0; do {
+        decode_mem[c] = st->_decode_mem + c*(decode_buffer_size + overlap);
+    } while (++c < CC);
+
+    c = 0; do {
+        /* Apply the pre-filter to the MDCT overlap for the next frame because
+           the post-filter will be re-applied in the decoder after the MDCT
+           overlap. */
+        comb_filter(etmp, decode_mem[c] + decode_buffer_size - N,
          st->postfilter_period_old, st->postfilter_period, overlap,
          -st->postfilter_gain_old, -st->postfilter_gain,
          st->postfilter_tapset_old, st->postfilter_tapset, NULL, 0, st->arch);
 
-      /* Simulate TDAC on the concealed audio so that it blends with the
-         MDCT of the next frame. */
-      for (i=0;i<overlap/2;i++)
-      {
-         decode_mem[c][decode_buffer_size-N+i] =
-            MULT16_32_Q15(COEF2VAL16(mode->window[i]), etmp[overlap-1-i])
-            + MULT16_32_Q15 (COEF2VAL16(mode->window[overlap-i-1]), etmp[i]);
-      }
-   } while (++c<CC);
-   RESTORE_STACK;
+        /* Simulate TDAC on the concealed audio so that it blends with the
+           MDCT of the next frame. */
+        for (i = 0; i < overlap/2; i++) {
+            decode_mem[c][decode_buffer_size - N + i] =
+                MULT16_32_Q15(COEF2VAL16(mode->window[i]), etmp[overlap - 1 - i])
+                + MULT16_32_Q15 (COEF2VAL16(mode->window[overlap - i - 1]), etmp[i]);
+        }
+    } while (++c < CC);
+    RESTORE_STACK;
 }
 
 #ifdef ENABLE_DEEP_PLC
 
-#define SINC_ORDER 48
+# define SINC_ORDER 48
 /* h=cos(pi/2*abs(sin([-24:24]/48*pi*23./24)).^2);
    b=sinc([-24:24]/3*1.02).*h;
    b=b/sum(b); */
-static const float sinc_filter[SINC_ORDER+1] = {
+static const float sinc_filter[SINC_ORDER + 1] = {
     4.2931e-05f, -0.000190293f, -0.000816132f, -0.000637162f, 0.00141662f, 0.00354764f, 0.00184368f, -0.00428274f,
     -0.00856105f, -0.0034003f, 0.00930201f, 0.0159616f, 0.00489785f, -0.0169649f, -0.0259484f, -0.00596856f,
     0.0286551f, 0.0405872f, 0.00649994f, -0.0509284f, -0.0716655f, -0.00665212f,  0.134336f,  0.278927f,
@@ -610,1144 +575,1104 @@ static const float sinc_filter[SINC_ORDER+1] = {
     4.2931e-05f
 };
 
-void update_plc_state(LPCNetPLCState *lpcnet, celt_sig *decode_mem[2], float *plc_preemphasis_mem, int CC)
-{
-   int i;
-   int tmp_read_post, tmp_fec_skip;
-   int offset;
-   celt_sig buf48k[DECODE_BUFFER_SIZE];
-   oac_int16 buf16k[PLC_UPDATE_SAMPLES];
-   if (CC == 1) OAC_COPY(buf48k, decode_mem[0], DECODE_BUFFER_SIZE);
-   else {
-      for (i=0;i<DECODE_BUFFER_SIZE;i++) {
-         buf48k[i] = .5*(decode_mem[0][i] + decode_mem[1][i]);
-      }
-   }
-   /* Down-sample the last 40 ms. */
-   for (i=1;i<DECODE_BUFFER_SIZE;i++) buf48k[i] += PREEMPHASIS*buf48k[i-1];
-   *plc_preemphasis_mem = buf48k[DECODE_BUFFER_SIZE-1];
-   offset = DECODE_BUFFER_SIZE-SINC_ORDER-1 - 3*(PLC_UPDATE_SAMPLES-1);
-   celt_assert(3*(PLC_UPDATE_SAMPLES-1) + SINC_ORDER + offset == DECODE_BUFFER_SIZE-1);
-   for (i=0;i<PLC_UPDATE_SAMPLES;i++) {
-      int j;
-      float sum = 0;
-      for (j=0;j<SINC_ORDER+1;j++) {
-         sum += buf48k[3*i + j + offset]*sinc_filter[j];
-      }
-      buf16k[i] = float2int(MIN32(32767.f, MAX32(-32767.f, sum)));
-   }
-   tmp_read_post = lpcnet->fec_read_pos;
-   tmp_fec_skip = lpcnet->fec_skip;
-   for (i=0;i<PLC_UPDATE_FRAMES;i++) {
-      lpcnet_plc_update(lpcnet, &buf16k[FRAME_SIZE*i]);
-   }
-   lpcnet->fec_read_pos = tmp_read_post;
-   lpcnet->fec_skip = tmp_fec_skip;
+void update_plc_state(LPCNetPLCState *lpcnet, celt_sig *decode_mem[2], float *plc_preemphasis_mem, int CC) {
+    int i;
+    int tmp_read_post, tmp_fec_skip;
+    int offset;
+    celt_sig buf48k[DECODE_BUFFER_SIZE];
+    oac_int16 buf16k[PLC_UPDATE_SAMPLES];
+    if (CC == 1) OAC_COPY(buf48k, decode_mem[0], DECODE_BUFFER_SIZE);
+    else {
+        for (i = 0; i < DECODE_BUFFER_SIZE; i++) {
+            buf48k[i] = .5*(decode_mem[0][i] + decode_mem[1][i]);
+        }
+    }
+    /* Down-sample the last 40 ms. */
+    for (i = 1; i < DECODE_BUFFER_SIZE; i++) buf48k[i] += PREEMPHASIS*buf48k[i - 1];
+    *plc_preemphasis_mem = buf48k[DECODE_BUFFER_SIZE - 1];
+    offset = DECODE_BUFFER_SIZE - SINC_ORDER - 1 - 3*(PLC_UPDATE_SAMPLES - 1);
+    celt_assert(3*(PLC_UPDATE_SAMPLES - 1) + SINC_ORDER + offset == DECODE_BUFFER_SIZE - 1);
+    for (i = 0; i < PLC_UPDATE_SAMPLES; i++) {
+        int j;
+        float sum = 0;
+        for (j = 0; j < SINC_ORDER + 1; j++) {
+            sum += buf48k[3*i + j + offset]*sinc_filter[j];
+        }
+        buf16k[i] = float2int(MIN32(32767.f, MAX32(-32767.f, sum)));
+    }
+    tmp_read_post = lpcnet->fec_read_pos;
+    tmp_fec_skip = lpcnet->fec_skip;
+    for (i = 0; i < PLC_UPDATE_FRAMES; i++) {
+        lpcnet_plc_update(lpcnet, &buf16k[FRAME_SIZE*i]);
+    }
+    lpcnet->fec_read_pos = tmp_read_post;
+    lpcnet->fec_skip = tmp_fec_skip;
 }
 #endif
 
 static void celt_decode_lost(CELTDecoder * OAC_RESTRICT st, int N, int LM
 #ifdef ENABLE_DEEP_PLC
-      ,LPCNetPLCState *lpcnet
+                             , LPCNetPLCState *lpcnet
 #endif
-      )
-{
-   int c;
-   int i;
-   const int C = st->channels;
-   celt_sig *decode_mem[2];
-   celt_sig *out_syn[2];
-   oac_val16 *lpc;
-   celt_glog *oldBandE, *oldLogE, *oldLogE2, *backgroundLogE;
-   const OacCustomMode *mode;
-   int nbEBands;
-   int overlap;
-   int start;
-   int loss_duration;
-   int curr_frame_type;
-   const oac_int16 *eBands;
-   int decode_buffer_size;
-   int max_period;
+                             ) {
+    int c;
+    int i;
+    const int C = st->channels;
+    celt_sig *decode_mem[2];
+    celt_sig *out_syn[2];
+    oac_val16 *lpc;
+    celt_glog *oldBandE, *oldLogE, *oldLogE2, *backgroundLogE;
+    const OacCustomMode *mode;
+    int nbEBands;
+    int overlap;
+    int start;
+    int loss_duration;
+    int curr_frame_type;
+    const oac_int16 *eBands;
+    int decode_buffer_size;
+    int max_period;
 #ifdef ENABLE_QEXT
-   int qext_scale;
+    int qext_scale;
 #endif
-   SAVE_STACK;
+    SAVE_STACK;
 #ifdef ENABLE_QEXT
-   qext_scale = st->qext_scale;
+    qext_scale = st->qext_scale;
 #endif
-   decode_buffer_size = QEXT_SCALE(DECODE_BUFFER_SIZE);
-   max_period = QEXT_SCALE(MAX_PERIOD);
-   mode = st->mode;
-   nbEBands = mode->nbEBands;
-   overlap = mode->overlap;
-   eBands = mode->eBands;
-
-   c=0; do {
-      decode_mem[c] = st->_decode_mem + c*(decode_buffer_size+overlap);
-      out_syn[c] = decode_mem[c]+decode_buffer_size-N;
-   } while (++c<C);
-   oldBandE = (celt_glog*)(st->_decode_mem+(decode_buffer_size+overlap)*C);
-   oldLogE = oldBandE + 2*nbEBands;
-   oldLogE2 = oldLogE + 2*nbEBands;
-   backgroundLogE = oldLogE2 + 2*nbEBands;
-   lpc = (oac_val16*)(backgroundLogE + 2*nbEBands);
-
-   loss_duration = st->loss_duration;
-   start = st->start;
-   curr_frame_type = FRAME_PLC_PERIODIC;
-   if (st->plc_duration >= 40 || start != 0 || st->skip_plc)
-      curr_frame_type = FRAME_PLC_NOISE;
+    decode_buffer_size = QEXT_SCALE(DECODE_BUFFER_SIZE);
+    max_period = QEXT_SCALE(MAX_PERIOD);
+    mode = st->mode;
+    nbEBands = mode->nbEBands;
+    overlap = mode->overlap;
+    eBands = mode->eBands;
+
+    c = 0; do {
+        decode_mem[c] = st->_decode_mem + c*(decode_buffer_size + overlap);
+        out_syn[c] = decode_mem[c] + decode_buffer_size - N;
+    } while (++c < C);
+    oldBandE = (celt_glog*)(st->_decode_mem + (decode_buffer_size + overlap)*C);
+    oldLogE = oldBandE + 2*nbEBands;
+    oldLogE2 = oldLogE + 2*nbEBands;
+    backgroundLogE = oldLogE2 + 2*nbEBands;
+    lpc = (oac_val16*)(backgroundLogE + 2*nbEBands);
+
+    loss_duration = st->loss_duration;
+    start = st->start;
+    curr_frame_type = FRAME_PLC_PERIODIC;
+    if (st->plc_duration >= 40 || start != 0 || st->skip_plc)
+        curr_frame_type = FRAME_PLC_NOISE;
 #ifdef ENABLE_DEEP_PLC
-   if (start == 0 && lpcnet != NULL && st->mode->Fs != 96000 && lpcnet->loaded)
-   {
-      if (st->complexity >= 5 && st->plc_duration < 80 && !st->skip_plc)
-         curr_frame_type = FRAME_PLC_NEURAL;
-#ifdef ENABLE_DRED
-      if (lpcnet->fec_fill_pos > lpcnet->fec_read_pos)
-         curr_frame_type = FRAME_DRED;
-#endif
-   }
+    if (start == 0 && lpcnet != NULL && st->mode->Fs != 96000 && lpcnet->loaded) {
+        if (st->complexity >= 5 && st->plc_duration < 80 && !st->skip_plc)
+            curr_frame_type = FRAME_PLC_NEURAL;
+# ifdef ENABLE_DRED
+        if (lpcnet->fec_fill_pos > lpcnet->fec_read_pos)
+            curr_frame_type = FRAME_DRED;
+# endif
+    }
 #endif
 
-   if (curr_frame_type == FRAME_PLC_NOISE)
-   {
-      /* Noise-based PLC/CNG */
-      VARDECL(celt_norm, X);
-      oac_uint32 seed;
-      int end;
-      int effEnd;
-      celt_glog decay;
-      end = st->end;
-      effEnd = IMAX(start, IMIN(end, mode->effEBands));
-
-      ALLOC(X, C*N, celt_norm);   /**< Interleaved normalised MDCTs */
-      c=0; do {
-         OAC_MOVE(decode_mem[c], decode_mem[c]+N,
-               decode_buffer_size-N+overlap);
-      } while (++c<C);
-
-      if (st->prefilter_and_fold) {
-         prefilter_and_fold(st, N);
-      }
-
-      /* Energy decay */
-      decay = loss_duration==0 ? GCONST(1.5f) : GCONST(.5f);
-      c=0; do
-      {
-         for (i=start;i<end;i++)
-            oldBandE[c*nbEBands+i] = MAXG(backgroundLogE[c*nbEBands+i], oldBandE[c*nbEBands+i] - decay);
-      } while (++c<C);
-      seed = st->rng;
-      for (c=0;c<C;c++)
-      {
-         for (i=start;i<effEnd;i++)
-         {
-            int j;
-            int boffs;
-            int blen;
-            boffs = N*c+(eBands[i]<<LM);
-            blen = (eBands[i+1]-eBands[i])<<LM;
-            for (j=0;j<blen;j++)
-            {
-               seed = celt_lcg_rand(seed);
-               X[boffs+j] = SHL32((celt_norm)((oac_int32)seed>>20), NORM_SHIFT-14);
+    if (curr_frame_type == FRAME_PLC_NOISE) {
+        /* Noise-based PLC/CNG */
+        VARDECL(celt_norm, X);
+        oac_uint32 seed;
+        int end;
+        int effEnd;
+        celt_glog decay;
+        end = st->end;
+        effEnd = IMAX(start, IMIN(end, mode->effEBands));
+
+        ALLOC(X, C*N, celt_norm); /**< Interleaved normalised MDCTs */
+        c = 0; do {
+            OAC_MOVE(decode_mem[c], decode_mem[c] + N,
+               decode_buffer_size - N + overlap);
+        } while (++c < C);
+
+        if (st->prefilter_and_fold) {
+            prefilter_and_fold(st, N);
+        }
+
+        /* Energy decay */
+        decay = loss_duration == 0 ? GCONST(1.5f) : GCONST(.5f);
+        c = 0; do {
+            for (i = start; i < end; i++)
+                oldBandE[c*nbEBands + i] = MAXG(backgroundLogE[c*nbEBands + i], oldBandE[c*nbEBands + i] - decay);
+        } while (++c < C);
+        seed = st->rng;
+        for (c = 0; c < C; c++) {
+            for (i = start; i < effEnd; i++) {
+                int j;
+                int boffs;
+                int blen;
+                boffs = N*c + (eBands[i]<<LM);
+                blen = (eBands[i + 1] - eBands[i])<<LM;
+                for (j = 0; j < blen; j++) {
+                    seed = celt_lcg_rand(seed);
+                    X[boffs + j] = SHL32((celt_norm)((oac_int32)seed>>20), NORM_SHIFT - 14);
+                }
+                renormalise_vector(X + boffs, blen, Q31ONE, st->arch);
             }
-            renormalise_vector(X+boffs, blen, Q31ONE, st->arch);
-         }
-      }
-      st->rng = seed;
-
-      celt_synthesis(mode, X, out_syn, oldBandE, start, effEnd, C, C, 0, LM, st->downsample, 0, st->arch);
-
-      /* Run the postfilter with the last parameters. */
-      c=0; do {
-         st->postfilter_period=IMAX(st->postfilter_period, COMBFILTER_MINPERIOD);
-         st->postfilter_period_old=IMAX(st->postfilter_period_old, COMBFILTER_MINPERIOD);
-         comb_filter(out_syn[c], out_syn[c], st->postfilter_period_old, st->postfilter_period, mode->shortMdctSize,
+        }
+        st->rng = seed;
+
+        celt_synthesis(mode, X, out_syn, oldBandE, start, effEnd, C, C, 0, LM, st->downsample, 0, st->arch);
+
+        /* Run the postfilter with the last parameters. */
+        c = 0; do {
+            st->postfilter_period = IMAX(st->postfilter_period, COMBFILTER_MINPERIOD);
+            st->postfilter_period_old = IMAX(st->postfilter_period_old, COMBFILTER_MINPERIOD);
+            comb_filter(out_syn[c], out_syn[c], st->postfilter_period_old, st->postfilter_period, mode->shortMdctSize,
                st->postfilter_gain_old, st->postfilter_gain, st->postfilter_tapset_old, st->postfilter_tapset,
                mode->window, overlap, st->arch);
-         if (LM!=0)
-            comb_filter(out_syn[c]+mode->shortMdctSize, out_syn[c]+mode->shortMdctSize, st->postfilter_period, st->postfilter_period, N-mode->shortMdctSize,
+            if (LM != 0)
+                comb_filter(out_syn[c] + mode->shortMdctSize, out_syn[c] + mode->shortMdctSize, st->postfilter_period,
+                st->postfilter_period, N - mode->shortMdctSize,
                   st->postfilter_gain, st->postfilter_gain, st->postfilter_tapset, st->postfilter_tapset,
                   mode->window, overlap, st->arch);
 
-      } while (++c<C);
-      st->postfilter_period_old = st->postfilter_period;
-      st->postfilter_gain_old = st->postfilter_gain;
-      st->postfilter_tapset_old = st->postfilter_tapset;
-
-      st->prefilter_and_fold = 0;
-      /* Skip regular PLC until we get two consecutive packets. */
-      st->skip_plc = 1;
-   } else {
-      int exc_length;
-      /* Pitch-based PLC */
-      const celt_coef *window;
-      oac_val16 *exc;
-      oac_val16 fade = Q15ONE;
-      int pitch_index;
-      int curr_neural;
-      int last_neural;
-      VARDECL(oac_val16, _exc);
-      VARDECL(oac_val16, fir_tmp);
-
-      curr_neural = curr_frame_type == FRAME_PLC_NEURAL || curr_frame_type == FRAME_DRED;
-      last_neural = st->last_frame_type == FRAME_PLC_NEURAL || st->last_frame_type == FRAME_DRED;
-      if (st->last_frame_type != FRAME_PLC_PERIODIC && !(last_neural && curr_neural))
-      {
-         st->last_pitch_index = pitch_index = celt_plc_pitch_search(st, decode_mem, C, st->arch);
-      } else {
-         pitch_index = st->last_pitch_index;
-         fade = QCONST16(.8f,15);
-      }
+        } while (++c < C);
+        st->postfilter_period_old = st->postfilter_period;
+        st->postfilter_gain_old = st->postfilter_gain;
+        st->postfilter_tapset_old = st->postfilter_tapset;
+
+        st->prefilter_and_fold = 0;
+        /* Skip regular PLC until we get two consecutive packets. */
+        st->skip_plc = 1;
+    } else {
+        int exc_length;
+        /* Pitch-based PLC */
+        const celt_coef *window;
+        oac_val16 *exc;
+        oac_val16 fade = Q15ONE;
+        int pitch_index;
+        int curr_neural;
+        int last_neural;
+        VARDECL(oac_val16, _exc);
+        VARDECL(oac_val16, fir_tmp);
+
+        curr_neural = curr_frame_type == FRAME_PLC_NEURAL || curr_frame_type == FRAME_DRED;
+        last_neural = st->last_frame_type == FRAME_PLC_NEURAL || st->last_frame_type == FRAME_DRED;
+        if (st->last_frame_type != FRAME_PLC_PERIODIC && !(last_neural && curr_neural)) {
+            st->last_pitch_index = pitch_index = celt_plc_pitch_search(st, decode_mem, C, st->arch);
+        } else {
+            pitch_index = st->last_pitch_index;
+            fade = QCONST16(.8f, 15);
+        }
 #ifdef ENABLE_DEEP_PLC
-      if (curr_neural && !last_neural) update_plc_state(lpcnet, decode_mem, &st->plc_preemphasis_mem, C);
+        if (curr_neural && !last_neural) update_plc_state(lpcnet, decode_mem, &st->plc_preemphasis_mem, C);
 #endif
 
-      /* We want the excitation for 2 pitch periods in order to look for a
-         decaying signal, but we can't get more than MAX_PERIOD. */
-      exc_length = IMIN(2*pitch_index, max_period);
-
-      ALLOC(_exc, max_period+CELT_LPC_ORDER, oac_val16);
-      ALLOC(fir_tmp, exc_length, oac_val16);
-      exc = _exc+CELT_LPC_ORDER;
-      window = mode->window;
-      c=0; do {
-         oac_val16 decay;
-         oac_val16 attenuation;
-         oac_val32 S1=0;
-         celt_sig *buf;
-         int extrapolation_offset;
-         int extrapolation_len;
-         int j;
-
-         buf = decode_mem[c];
-         for (i=0;i<max_period+CELT_LPC_ORDER;i++)
-            exc[i-CELT_LPC_ORDER] = SROUND16(buf[decode_buffer_size-max_period-CELT_LPC_ORDER+i], SIG_SHIFT);
-
-         if (st->last_frame_type != FRAME_PLC_PERIODIC && !(last_neural && curr_neural))
-         {
-            oac_val32 ac[CELT_LPC_ORDER+1];
-            /* Compute LPC coefficients for the last MAX_PERIOD samples before
-               the first loss so we can work in the excitation-filter domain. */
-            _celt_autocorr(exc, ac, window, overlap,
+        /* We want the excitation for 2 pitch periods in order to look for a
+           decaying signal, but we can't get more than MAX_PERIOD. */
+        exc_length = IMIN(2*pitch_index, max_period);
+
+        ALLOC(_exc, max_period + CELT_LPC_ORDER, oac_val16);
+        ALLOC(fir_tmp, exc_length, oac_val16);
+        exc = _exc + CELT_LPC_ORDER;
+        window = mode->window;
+        c = 0; do {
+            oac_val16 decay;
+            oac_val16 attenuation;
+            oac_val32 S1 = 0;
+            celt_sig *buf;
+            int extrapolation_offset;
+            int extrapolation_len;
+            int j;
+
+            buf = decode_mem[c];
+            for (i = 0; i < max_period + CELT_LPC_ORDER; i++)
+                exc[i - CELT_LPC_ORDER] = SROUND16(buf[decode_buffer_size - max_period - CELT_LPC_ORDER + i],
+                SIG_SHIFT);
+
+            if (st->last_frame_type != FRAME_PLC_PERIODIC && !(last_neural && curr_neural)) {
+                oac_val32 ac[CELT_LPC_ORDER + 1];
+                /* Compute LPC coefficients for the last MAX_PERIOD samples before
+                   the first loss so we can work in the excitation-filter domain. */
+                _celt_autocorr(exc, ac, window, overlap,
                    CELT_LPC_ORDER, max_period, st->arch);
-            /* Add a noise floor of -40 dB. */
+                /* Add a noise floor of -40 dB. */
 #ifdef FIXED_POINT
-            ac[0] += SHR32(ac[0],13);
+                ac[0] += SHR32(ac[0], 13);
 #else
-            ac[0] *= 1.0001f;
+                ac[0] *= 1.0001f;
 #endif
-            /* Use lag windowing to stabilize the Levinson-Durbin recursion. */
-            for (i=1;i<=CELT_LPC_ORDER;i++)
-            {
-               /*ac[i] *= exp(-.5*(2*M_PI*.002*i)*(2*M_PI*.002*i));*/
+                /* Use lag windowing to stabilize the Levinson-Durbin recursion. */
+                for (i = 1; i <= CELT_LPC_ORDER; i++) {
+                    /*ac[i] *= exp(-.5*(2*M_PI*.002*i)*(2*M_PI*.002*i));*/
 #ifdef FIXED_POINT
-               ac[i] -= MULT16_32_Q15(2*i*i, ac[i]);
+                    ac[i] -= MULT16_32_Q15(2*i*i, ac[i]);
 #else
-               ac[i] -= ac[i]*(0.008f*0.008f)*i*i;
+                    ac[i] -= ac[i]*(0.008f*0.008f)*i*i;
 #endif
-            }
-            _celt_lpc(lpc+c*CELT_LPC_ORDER, ac, CELT_LPC_ORDER);
+                }
+                _celt_lpc(lpc + c*CELT_LPC_ORDER, ac, CELT_LPC_ORDER);
 #ifdef FIXED_POINT
-         /* For fixed-point, apply bandwidth expansion until we can guarantee that
-            no overflow can happen in the IIR filter. This means:
-            32768*sum(abs(filter)) < 2^31 */
-         while (1) {
-            oac_val16 tmp=Q15ONE;
-            oac_val32 sum=QCONST16(1., SIG_SHIFT);
-            for (i=0;i<CELT_LPC_ORDER;i++)
-               sum += ABS16(lpc[c*CELT_LPC_ORDER+i]);
-            if (sum < 65535) break;
-            for (i=0;i<CELT_LPC_ORDER;i++)
-            {
-               tmp = MULT16_16_Q15(QCONST16(.99f,15), tmp);
-               lpc[c*CELT_LPC_ORDER+i] = MULT16_16_Q15(lpc[c*CELT_LPC_ORDER+i], tmp);
-            }
-         }
+                /* For fixed-point, apply bandwidth expansion until we can guarantee that
+                   no overflow can happen in the IIR filter. This means:
+                   32768*sum(abs(filter)) < 2^31 */
+                while (1) {
+                    oac_val16 tmp = Q15ONE;
+                    oac_val32 sum = QCONST16(1., SIG_SHIFT);
+                    for (i = 0; i < CELT_LPC_ORDER; i++)
+                        sum += ABS16(lpc[c*CELT_LPC_ORDER + i]);
+                    if (sum < 65535) break;
+                    for (i = 0; i < CELT_LPC_ORDER; i++) {
+                        tmp = MULT16_16_Q15(QCONST16(.99f, 15), tmp);
+                        lpc[c*CELT_LPC_ORDER + i] = MULT16_16_Q15(lpc[c*CELT_LPC_ORDER + i], tmp);
+                    }
+                }
 #endif
-         }
-         /* Initialize the LPC history with the samples just before the start
-            of the region for which we're computing the excitation. */
-         {
-            /* Compute the excitation for exc_length samples before the loss. We need the copy
-               because celt_fir() cannot filter in-place. */
-            celt_fir(exc+max_period-exc_length, lpc+c*CELT_LPC_ORDER,
+            }
+            /* Initialize the LPC history with the samples just before the start
+               of the region for which we're computing the excitation. */
+            {
+                /* Compute the excitation for exc_length samples before the loss. We need the copy
+                   because celt_fir() cannot filter in-place. */
+                celt_fir(exc + max_period - exc_length, lpc + c*CELT_LPC_ORDER,
                   fir_tmp, exc_length, CELT_LPC_ORDER, st->arch);
-            OAC_COPY(exc+max_period-exc_length, fir_tmp, exc_length);
-         }
-
-         /* Check if the waveform is decaying, and if so how fast.
-            We do this to avoid adding energy when concealing in a segment
-            with decaying energy. */
-         {
-            oac_val32 E1=1, E2=1;
-            int decay_length;
+                OAC_COPY(exc + max_period - exc_length, fir_tmp, exc_length);
+            }
+
+            /* Check if the waveform is decaying, and if so how fast.
+               We do this to avoid adding energy when concealing in a segment
+               with decaying energy. */
+            {
+                oac_val32 E1 = 1, E2 = 1;
+                int decay_length;
 #ifdef FIXED_POINT
-            int shift = IMAX(0,2*celt_zlog2(celt_maxabs16(&exc[max_period-exc_length], exc_length))-20);
-#ifdef ENABLE_QEXT
-            if (st->qext_scale==2) shift++;
-#endif
+                int shift = IMAX(0, 2*celt_zlog2(celt_maxabs16(&exc[max_period - exc_length], exc_length)) - 20);
+# ifdef ENABLE_QEXT
+                if (st->qext_scale == 2) shift++;
+# endif
 #endif
-            decay_length = exc_length>>1;
-            for (i=0;i<decay_length;i++)
-            {
-               oac_val16 e;
-               e = exc[max_period-decay_length+i];
-               E1 += SHR32(MULT16_16(e, e), shift);
-               e = exc[max_period-2*decay_length+i];
-               E2 += SHR32(MULT16_16(e, e), shift);
+                decay_length = exc_length>>1;
+                for (i = 0; i < decay_length; i++) {
+                    oac_val16 e;
+                    e = exc[max_period - decay_length + i];
+                    E1 += SHR32(MULT16_16(e, e), shift);
+                    e = exc[max_period - 2*decay_length + i];
+                    E2 += SHR32(MULT16_16(e, e), shift);
+                }
+                E1 = MIN32(E1, E2);
+                decay = celt_sqrt(frac_div32(SHR32(E1, 1), E2));
             }
-            E1 = MIN32(E1, E2);
-            decay = celt_sqrt(frac_div32(SHR32(E1, 1), E2));
-         }
-
-         /* Move the decoder memory one frame to the left to give us room to
-            add the data for the new frame. We ignore the overlap that extends
-            past the end of the buffer, because we aren't going to use it. */
-         OAC_MOVE(buf, buf+N, decode_buffer_size-N);
-
-         /* Extrapolate from the end of the excitation with a period of
-            "pitch_index", scaling down each period by an additional factor of
-            "decay". */
-         extrapolation_offset = max_period-pitch_index;
-         /* We need to extrapolate enough samples to cover a complete MDCT
-            window (including overlap/2 samples on both sides). */
-         extrapolation_len = N+overlap;
-         /* We also apply fading if this is not the first loss. */
-         attenuation = MULT16_16_Q15(fade, decay);
-         for (i=j=0;i<extrapolation_len;i++,j++)
-         {
-            oac_val16 tmp;
-            if (j >= pitch_index) {
-               j -= pitch_index;
-               attenuation = MULT16_16_Q15(attenuation, decay);
-            }
-            buf[decode_buffer_size-N+i] =
-                  SHL32(EXTEND32(MULT16_16_Q15(attenuation,
-                        exc[extrapolation_offset+j])), SIG_SHIFT);
-            /* Compute the energy of the previously decoded signal whose
-               excitation we're copying. */
-            tmp = SROUND16(
-                  buf[decode_buffer_size-max_period-N+extrapolation_offset+j],
+
+            /* Move the decoder memory one frame to the left to give us room to
+               add the data for the new frame. We ignore the overlap that extends
+               past the end of the buffer, because we aren't going to use it. */
+            OAC_MOVE(buf, buf + N, decode_buffer_size - N);
+
+            /* Extrapolate from the end of the excitation with a period of
+               "pitch_index", scaling down each period by an additional factor of
+               "decay". */
+            extrapolation_offset = max_period - pitch_index;
+            /* We need to extrapolate enough samples to cover a complete MDCT
+               window (including overlap/2 samples on both sides). */
+            extrapolation_len = N + overlap;
+            /* We also apply fading if this is not the first loss. */
+            attenuation = MULT16_16_Q15(fade, decay);
+            for (i = j = 0; i < extrapolation_len; i++, j++) {
+                oac_val16 tmp;
+                if (j >= pitch_index) {
+                    j -= pitch_index;
+                    attenuation = MULT16_16_Q15(attenuation, decay);
+                }
+                buf[decode_buffer_size - N + i] =
+                    SHL32(EXTEND32(MULT16_16_Q15(attenuation,
+                        exc[extrapolation_offset + j])), SIG_SHIFT);
+                /* Compute the energy of the previously decoded signal whose
+                   excitation we're copying. */
+                tmp = SROUND16(
+                  buf[decode_buffer_size - max_period - N + extrapolation_offset + j],
                   SIG_SHIFT);
-            S1 += SHR32(MULT16_16(tmp, tmp), 11);
-         }
-         {
-            oac_val16 lpc_mem[CELT_LPC_ORDER];
-            /* Copy the last decoded samples (prior to the overlap region) to
-               synthesis filter memory so we can have a continuous signal. */
-            for (i=0;i<CELT_LPC_ORDER;i++)
-               lpc_mem[i] = SROUND16(buf[decode_buffer_size-N-1-i], SIG_SHIFT);
-            /* Apply the synthesis filter to convert the excitation back into
-               the signal domain. */
-            celt_iir(buf+decode_buffer_size-N, lpc+c*CELT_LPC_ORDER,
-                  buf+decode_buffer_size-N, extrapolation_len, CELT_LPC_ORDER,
+                S1 += SHR32(MULT16_16(tmp, tmp), 11);
+            }
+            {
+                oac_val16 lpc_mem[CELT_LPC_ORDER];
+                /* Copy the last decoded samples (prior to the overlap region) to
+                   synthesis filter memory so we can have a continuous signal. */
+                for (i = 0; i < CELT_LPC_ORDER; i++)
+                    lpc_mem[i] = SROUND16(buf[decode_buffer_size - N - 1 - i], SIG_SHIFT);
+                /* Apply the synthesis filter to convert the excitation back into
+                   the signal domain. */
+                celt_iir(buf + decode_buffer_size - N, lpc + c*CELT_LPC_ORDER,
+                  buf + decode_buffer_size - N, extrapolation_len, CELT_LPC_ORDER,
                   lpc_mem, st->arch);
 #ifdef FIXED_POINT
-            for (i=0; i < extrapolation_len; i++)
-               buf[decode_buffer_size-N+i] = SATURATE(buf[decode_buffer_size-N+i], SIG_SAT);
+                for (i = 0; i < extrapolation_len; i++)
+                    buf[decode_buffer_size - N + i] = SATURATE(buf[decode_buffer_size - N + i], SIG_SAT);
 #endif
-         }
-
-         /* Check if the synthesis energy is higher than expected, which can
-            happen with the signal changes during our window. If so,
-            attenuate. */
-         {
-            oac_val32 S2=0;
-            for (i=0;i<extrapolation_len;i++)
-            {
-               oac_val16 tmp = SROUND16(buf[decode_buffer_size-N+i], SIG_SHIFT);
-               S2 += SHR32(MULT16_16(tmp, tmp), 11);
             }
-            /* This checks for an "explosion" in the synthesis. */
+
+            /* Check if the synthesis energy is higher than expected, which can
+               happen with the signal changes during our window. If so,
+               attenuate. */
+            {
+                oac_val32 S2 = 0;
+                for (i = 0; i < extrapolation_len; i++) {
+                    oac_val16 tmp = SROUND16(buf[decode_buffer_size - N + i], SIG_SHIFT);
+                    S2 += SHR32(MULT16_16(tmp, tmp), 11);
+                }
+                /* This checks for an "explosion" in the synthesis. */
 #ifdef FIXED_POINT
-            if (!(S1 > SHR32(S2,2)))
+                if (!(S1 > SHR32(S2, 2)))
 #else
-            /* The float test is written this way to catch NaNs in the output
-               of the IIR filter at the same time. */
-            if (!(S1 > 0.2f*S2))
+                /* The float test is written this way to catch NaNs in the output
+                   of the IIR filter at the same time. */
+                if (!(S1 > 0.2f*S2))
 #endif
-            {
-               for (i=0;i<extrapolation_len;i++)
-                  buf[decode_buffer_size-N+i] = 0;
-            } else if (S1 < S2)
-            {
-               oac_val16 ratio = celt_sqrt(frac_div32(SHR32(S1,1)+1,S2+1));
-               for (i=0;i<overlap;i++)
-               {
-                  oac_val16 tmp_g = Q15ONE
-                        - MULT16_16_Q15(COEF2VAL16(window[i]), Q15ONE-ratio);
-                  buf[decode_buffer_size-N+i] =
-                        MULT16_32_Q15(tmp_g, buf[decode_buffer_size-N+i]);
-               }
-               for (i=overlap;i<extrapolation_len;i++)
-               {
-                  buf[decode_buffer_size-N+i] =
-                        MULT16_32_Q15(ratio, buf[decode_buffer_size-N+i]);
-               }
+                {
+                    for (i = 0; i < extrapolation_len; i++)
+                        buf[decode_buffer_size - N + i] = 0;
+                } else if (S1 < S2) {
+                    oac_val16 ratio = celt_sqrt(frac_div32(SHR32(S1, 1) + 1, S2 + 1));
+                    for (i = 0; i < overlap; i++) {
+                        oac_val16 tmp_g = Q15ONE
+                                          - MULT16_16_Q15(COEF2VAL16(window[i]), Q15ONE - ratio);
+                        buf[decode_buffer_size - N + i] =
+                            MULT16_32_Q15(tmp_g, buf[decode_buffer_size - N + i]);
+                    }
+                    for (i = overlap; i < extrapolation_len; i++) {
+                        buf[decode_buffer_size - N + i] =
+                            MULT16_32_Q15(ratio, buf[decode_buffer_size - N + i]);
+                    }
+                }
             }
-         }
 
-      } while (++c<C);
+        } while (++c < C);
 
 #ifdef ENABLE_DEEP_PLC
-      if (curr_neural) {
-         float overlap_mem;
-         int samples_needed16k;
-         celt_sig *buf;
-         VARDECL(float, buf_copy);
-         buf = decode_mem[0];
-         ALLOC(buf_copy, C*overlap, float);
-         c=0; do {
-            OAC_COPY(buf_copy+c*overlap, &decode_mem[c][decode_buffer_size-N], overlap);
-         } while (++c<C);
-
-         /* Need enough samples from the PLC to cover the frame size, resampling delay,
-            and the overlap at the end. */
-         samples_needed16k = (N+SINC_ORDER+overlap)/3;
-         if (!last_neural) {
-            st->plc_fill = 0;
-         }
-         while (st->plc_fill < samples_needed16k) {
-            lpcnet_plc_conceal(lpcnet, &st->plc_pcm[st->plc_fill]);
-            st->plc_fill += FRAME_SIZE;
-         }
-         /* Resample to 48 kHz. */
-         for (i=0;i<(N+overlap)/3;i++) {
-            int j;
-            float sum;
-            for (sum=0, j=0;j<17;j++) sum += 3*st->plc_pcm[i+j]*sinc_filter[3*j];
-            buf[decode_buffer_size-N+3*i] = sum;
-            for (sum=0, j=0;j<16;j++) sum += 3*st->plc_pcm[i+j+1]*sinc_filter[3*j+2];
-            buf[decode_buffer_size-N+3*i+1] = sum;
-            for (sum=0, j=0;j<16;j++) sum += 3*st->plc_pcm[i+j+1]*sinc_filter[3*j+1];
-            buf[decode_buffer_size-N+3*i+2] = sum;
-         }
-         OAC_MOVE(st->plc_pcm, &st->plc_pcm[N/3], st->plc_fill-N/3);
-         st->plc_fill -= N/3;
-         for (i=0;i<N;i++) {
-            float tmp = buf[decode_buffer_size-N+i];
-            buf[decode_buffer_size-N+i] -= PREEMPHASIS*st->plc_preemphasis_mem;
-            st->plc_preemphasis_mem = tmp;
-         }
-         overlap_mem = st->plc_preemphasis_mem;
-         for (i=0;i<overlap;i++) {
-            float tmp = buf[decode_buffer_size+i];
-            buf[decode_buffer_size+i] -= PREEMPHASIS*overlap_mem;
-            overlap_mem = tmp;
-         }
-         /* For now, we just do mono PLC. */
-         if (C==2) OAC_COPY(decode_mem[1], decode_mem[0], decode_buffer_size+overlap);
-         c=0; do {
-            /* Cross-fade with 48-kHz non-neural PLC for the first 2.5 ms to avoid a discontinuity. */
+        if (curr_neural) {
+            float overlap_mem;
+            int samples_needed16k;
+            celt_sig *buf;
+            VARDECL(float, buf_copy);
+            buf = decode_mem[0];
+            ALLOC(buf_copy, C*overlap, float);
+            c = 0; do {
+                OAC_COPY(buf_copy + c*overlap, &decode_mem[c][decode_buffer_size - N], overlap);
+            } while (++c < C);
+
+            /* Need enough samples from the PLC to cover the frame size, resampling delay,
+               and the overlap at the end. */
+            samples_needed16k = (N + SINC_ORDER + overlap)/3;
             if (!last_neural) {
-               for (i=0;i<overlap;i++) decode_mem[c][decode_buffer_size-N+i] = (1-window[i])*buf_copy[c*overlap+i] + (window[i])*decode_mem[c][decode_buffer_size-N+i];
+                st->plc_fill = 0;
+            }
+            while (st->plc_fill < samples_needed16k) {
+                lpcnet_plc_conceal(lpcnet, &st->plc_pcm[st->plc_fill]);
+                st->plc_fill += FRAME_SIZE;
+            }
+            /* Resample to 48 kHz. */
+            for (i = 0; i < (N + overlap)/3; i++) {
+                int j;
+                float sum;
+                for (sum = 0, j = 0; j < 17; j++) sum += 3*st->plc_pcm[i + j]*sinc_filter[3*j];
+                buf[decode_buffer_size - N + 3*i] = sum;
+                for (sum = 0, j = 0; j < 16; j++) sum += 3*st->plc_pcm[i + j + 1]*sinc_filter[3*j + 2];
+                buf[decode_buffer_size - N + 3*i + 1] = sum;
+                for (sum = 0, j = 0; j < 16; j++) sum += 3*st->plc_pcm[i + j + 1]*sinc_filter[3*j + 1];
+                buf[decode_buffer_size - N + 3*i + 2] = sum;
             }
-         } while (++c<C);
-      }
+            OAC_MOVE(st->plc_pcm, &st->plc_pcm[N/3], st->plc_fill - N/3);
+            st->plc_fill -= N/3;
+            for (i = 0; i < N; i++) {
+                float tmp = buf[decode_buffer_size - N + i];
+                buf[decode_buffer_size - N + i] -= PREEMPHASIS*st->plc_preemphasis_mem;
+                st->plc_preemphasis_mem = tmp;
+            }
+            overlap_mem = st->plc_preemphasis_mem;
+            for (i = 0; i < overlap; i++) {
+                float tmp = buf[decode_buffer_size + i];
+                buf[decode_buffer_size + i] -= PREEMPHASIS*overlap_mem;
+                overlap_mem = tmp;
+            }
+            /* For now, we just do mono PLC. */
+            if (C == 2) OAC_COPY(decode_mem[1], decode_mem[0], decode_buffer_size + overlap);
+            c = 0; do {
+                /* Cross-fade with 48-kHz non-neural PLC for the first 2.5 ms to avoid a discontinuity. */
+                if (!last_neural) {
+                    for (i = 0; i < overlap;
+                         i++) decode_mem[c][decode_buffer_size - N + i] = (1 - window[i])*buf_copy[c*overlap + i]
+                                                                          + (window[i])
+                                                                          *decode_mem[c][decode_buffer_size - N + i];
+                }
+            } while (++c < C);
+        }
 #endif
-      st->prefilter_and_fold = 1;
-   }
+        st->prefilter_and_fold = 1;
+    }
 
-   /* Saturate to something large to avoid wrap-around. */
-   st->loss_duration = IMIN(10000, loss_duration+(1<<LM));
-   st->plc_duration = IMIN(10000, st->plc_duration+(1<<LM));
+    /* Saturate to something large to avoid wrap-around. */
+    st->loss_duration = IMIN(10000, loss_duration + (1<<LM));
+    st->plc_duration = IMIN(10000, st->plc_duration + (1<<LM));
 #ifdef ENABLE_DRED
-   if (curr_frame_type == FRAME_DRED) {
-      st->plc_duration = 0;
-      st->skip_plc = 0;
-   }
+    if (curr_frame_type == FRAME_DRED) {
+        st->plc_duration = 0;
+        st->skip_plc = 0;
+    }
 #endif
-   st->last_frame_type = curr_frame_type;
-   RESTORE_STACK;
+    st->last_frame_type = curr_frame_type;
+    RESTORE_STACK;
 }
 
 int celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char *data,
-      int len, oac_res * OAC_RESTRICT pcm, int frame_size, ec_dec *dec, int accum
+                             int len, oac_res * OAC_RESTRICT pcm, int frame_size, ec_dec *dec, int accum
 #ifdef ENABLE_DEEP_PLC
-      ,LPCNetPLCState *lpcnet
+                             , LPCNetPLCState *lpcnet
 #endif
-      )
-{
-   int c, i, N;
-   int spread_decision;
-   oac_int32 bits;
-   ec_dec _dec;
-   VARDECL(celt_norm, X);
-   VARDECL(int, fine_quant);
-   VARDECL(int, pulses);
-   VARDECL(int, cap);
-   VARDECL(int, offsets);
-   VARDECL(int, fine_priority);
-   VARDECL(int, tf_res);
-   VARDECL(unsigned char, collapse_masks);
-   celt_sig *decode_mem[2];
-   celt_sig *out_syn[2];
-   celt_glog *oldBandE, *oldLogE, *oldLogE2, *backgroundLogE;
-
-   int shortBlocks;
-   int isTransient;
-   int intra_ener;
-   const int CC = st->channels;
-   int LM, M;
-   int start;
-   int end;
-   int effEnd;
-   int codedBands;
-   int alloc_trim;
-   int postfilter_pitch;
-   oac_val16 postfilter_gain;
-   int intensity=0;
-   int dual_stereo=0;
-   oac_int32 total_bits;
-   oac_int32 balance;
-   oac_int32 tell;
-   int dynalloc_logp;
-   int postfilter_tapset;
-   int anti_collapse_rsv;
-   int anti_collapse_on=0;
-   int silence;
-   int C = st->stream_channels;
-   const OacCustomMode *mode;
-   int nbEBands;
-   int overlap;
-   const oac_int16 *eBands;
-   celt_glog max_background_increase;
-   int decode_buffer_size;
+                             ) {
+    int c, i, N;
+    int spread_decision;
+    oac_int32 bits;
+    ec_dec _dec;
+    VARDECL(celt_norm, X);
+    VARDECL(int, fine_quant);
+    VARDECL(int, pulses);
+    VARDECL(int, cap);
+    VARDECL(int, offsets);
+    VARDECL(int, fine_priority);
+    VARDECL(int, tf_res);
+    VARDECL(unsigned char, collapse_masks);
+    celt_sig *decode_mem[2];
+    celt_sig *out_syn[2];
+    celt_glog *oldBandE, *oldLogE, *oldLogE2, *backgroundLogE;
+
+    int shortBlocks;
+    int isTransient;
+    int intra_ener;
+    const int CC = st->channels;
+    int LM, M;
+    int start;
+    int end;
+    int effEnd;
+    int codedBands;
+    int alloc_trim;
+    int postfilter_pitch;
+    oac_val16 postfilter_gain;
+    int intensity = 0;
+    int dual_stereo = 0;
+    oac_int32 total_bits;
+    oac_int32 balance;
+    oac_int32 tell;
+    int dynalloc_logp;
+    int postfilter_tapset;
+    int anti_collapse_rsv;
+    int anti_collapse_on = 0;
+    int silence;
+    int C = st->stream_channels;
+    const OacCustomMode *mode;
+    int nbEBands;
+    int overlap;
+    const oac_int16 *eBands;
+    celt_glog max_background_increase;
+    int decode_buffer_size;
 #ifdef ENABLE_QEXT
-   int qext_scale;
+    int qext_scale;
 #endif
-   ALLOC_STACK;
+    ALLOC_STACK;
 #ifdef ENABLE_QEXT
-   qext_scale = st->qext_scale;
+    qext_scale = st->qext_scale;
 #endif
-   decode_buffer_size = QEXT_SCALE(DECODE_BUFFER_SIZE);
-
-   VALIDATE_CELT_DECODER(st);
-   mode = st->mode;
-   nbEBands = mode->nbEBands;
-   overlap = mode->overlap;
-   eBands = mode->eBands;
-   start = st->start;
-   end = st->end;
-   frame_size *= st->downsample;
-
-   oldBandE = (celt_glog*)(st->_decode_mem+(decode_buffer_size+overlap)*CC);
-   oldLogE = oldBandE + 2*nbEBands;
-   oldLogE2 = oldLogE + 2*nbEBands;
-   backgroundLogE = oldLogE2 + 2*nbEBands;
+    decode_buffer_size = QEXT_SCALE(DECODE_BUFFER_SIZE);
+
+    VALIDATE_CELT_DECODER(st);
+    mode = st->mode;
+    nbEBands = mode->nbEBands;
+    overlap = mode->overlap;
+    eBands = mode->eBands;
+    start = st->start;
+    end = st->end;
+    frame_size *= st->downsample;
+
+    oldBandE = (celt_glog*)(st->_decode_mem + (decode_buffer_size + overlap)*CC);
+    oldLogE = oldBandE + 2*nbEBands;
+    oldLogE2 = oldLogE + 2*nbEBands;
+    backgroundLogE = oldLogE2 + 2*nbEBands;
 
 #if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
-   if (st->signalling && data!=NULL)
-   {
-      int data0=data[0];
-      /* Convert "standard mode" to Oac header */
+    if (st->signalling && data != NULL) {
+        int data0 = data[0];
+        /* Convert "standard mode" to Oac header */
 # ifndef ENABLE_QEXT
-      if (mode->Fs==48000 && mode->shortMdctSize==120)
+        if (mode->Fs == 48000 && mode->shortMdctSize == 120)
 # endif
-      {
-         data0 = fromOac(data0);
-         if (data0<0)
-            return OAC_INVALID_PACKET;
-      }
-      st->end = end = IMAX(1, mode->effEBands-2*(data0>>5));
-      LM = (data0>>3)&0x3;
-      C = 1 + ((data0>>2)&0x1);
-      if ((data[0] & 0x03) == 0x03) {
-         data++;
-         len--;
-         if (len<=0)
-            return OAC_INVALID_PACKET;
-         if (data[0] & 0x40) {
-            int p;
-            int padding=0;
+        {
+            data0 = fromOac(data0);
+            if (data0 < 0)
+                return OAC_INVALID_PACKET;
+        }
+        st->end = end = IMAX(1, mode->effEBands - 2*(data0>>5));
+        LM = (data0>>3)&0x3;
+        C = 1 + ((data0>>2)&0x1);
+        if ((data[0]&0x03) == 0x03) {
             data++;
             len--;
-            do {
-               int tmp;
-               if (len<=0)
-                  return OAC_INVALID_PACKET;
-               p = *data++;
-               len--;
-               tmp = p==255 ? 254: p;
-               len -= tmp;
-               padding += tmp;
-            } while (p==255);
-            padding--;
-            if (len <= 0 || padding<0) return OAC_INVALID_PACKET;
-         }
-      } else
-      {
-         data++;
-         len--;
-      }
-      if (LM>mode->maxLM)
-         return OAC_INVALID_PACKET;
-      if (frame_size < mode->shortMdctSize<<LM)
-         return OAC_BUFFER_TOO_SMALL;
-      else
-         frame_size = mode->shortMdctSize<<LM;
-   } else {
+            if (len <= 0)
+                return OAC_INVALID_PACKET;
+            if (data[0]&0x40) {
+                int p;
+                int padding = 0;
+                data++;
+                len--;
+                do {
+                    int tmp;
+                    if (len <= 0)
+                        return OAC_INVALID_PACKET;
+                    p = *data++;
+                    len--;
+                    tmp = p == 255 ? 254: p;
+                    len -= tmp;
+                    padding += tmp;
+                } while (p == 255);
+                padding--;
+                if (len <= 0 || padding < 0) return OAC_INVALID_PACKET;
+            }
+        } else {
+            data++;
+            len--;
+        }
+        if (LM > mode->maxLM)
+            return OAC_INVALID_PACKET;
+        if (frame_size < mode->shortMdctSize<<LM)
+            return OAC_BUFFER_TOO_SMALL;
+        else
+            frame_size = mode->shortMdctSize<<LM;
+    } else {
 #else
-   {
+    {
 #endif
-      for (LM=0;LM<=mode->maxLM;LM++)
-         if (mode->shortMdctSize<<LM==frame_size)
-            break;
-      if (LM>mode->maxLM)
-         return OAC_BAD_ARG;
-   }
-   M=1<<LM;
-
-   if (len<0 || len>1275 || pcm==NULL)
-      return OAC_BAD_ARG;
-
-   N = M*mode->shortMdctSize;
-   c=0; do {
-      decode_mem[c] = st->_decode_mem + c*(decode_buffer_size+overlap);
-      out_syn[c] = decode_mem[c]+decode_buffer_size-N;
-   } while (++c<CC);
-
-   effEnd = end;
-   if (effEnd > mode->effEBands)
-      effEnd = mode->effEBands;
-
-   if (data == NULL || len<=1)
-   {
-      celt_decode_lost(st, N, LM
+        for (LM = 0; LM <= mode->maxLM; LM++)
+            if (mode->shortMdctSize<<LM == frame_size)
+                break;
+        if (LM > mode->maxLM)
+            return OAC_BAD_ARG;
+    }
+    M = 1<<LM;
+
+    if (len < 0 || len > 1275 || pcm == NULL)
+        return OAC_BAD_ARG;
+
+    N = M*mode->shortMdctSize;
+    c = 0; do {
+        decode_mem[c] = st->_decode_mem + c*(decode_buffer_size + overlap);
+        out_syn[c] = decode_mem[c] + decode_buffer_size - N;
+    } while (++c < CC);
+
+    effEnd = end;
+    if (effEnd > mode->effEBands)
+        effEnd = mode->effEBands;
+
+    if (data == NULL || len <= 1) {
+        celt_decode_lost(st, N, LM
 #ifdef ENABLE_DEEP_PLC
-      , lpcnet
+            , lpcnet
 #endif
-                      );
-      deemphasis(out_syn, pcm, N, CC, st->downsample, mode->preemph, st->preemph_memD, accum);
-      RESTORE_STACK;
-      return frame_size/st->downsample;
-   }
+            );
+        deemphasis(out_syn, pcm, N, CC, st->downsample, mode->preemph, st->preemph_memD, accum);
+        RESTORE_STACK;
+        return frame_size/st->downsample;
+    }
 #ifdef ENABLE_DEEP_PLC
-   else {
-      /* FIXME: This is a bit of a hack just to make sure oac_decode_native() knows we're no longer in PLC. */
-      if (lpcnet) lpcnet->blend = 0;
-   }
+    else {
+        /* FIXME: This is a bit of a hack just to make sure oac_decode_native() knows we're no longer in PLC. */
+        if (lpcnet) lpcnet->blend = 0;
+    }
 #endif
 
-   /* Check if there are at least two packets received consecutively before
-    * turning on the pitch-based PLC */
-   if (st->loss_duration == 0) st->skip_plc = 0;
-
-   if (dec == NULL)
-   {
-      ec_dec_init(&_dec,(unsigned char*)data,len);
-      dec = &_dec;
-   }
-
-   if (C==1)
-   {
-      for (i=0;i<nbEBands;i++)
-         oldBandE[i]=MAXG(oldBandE[i],oldBandE[nbEBands+i]);
-   }
-
-   total_bits = len*8;
-   tell = ec_tell(dec);
-
-   if (tell >= total_bits)
-      silence = 1;
-   else if (tell==1)
-      silence = ec_dec_bit_logp(dec, 15);
-   else
-      silence = 0;
-   if (silence)
-   {
-      /* Pretend we've read all the remaining bits */
-      tell = len*8;
-      dec->nbits_total+=tell-ec_tell(dec);
-   }
-
-   postfilter_gain = 0;
-   postfilter_pitch = 0;
-   postfilter_tapset = 0;
-   if (start==0 && tell+16 <= total_bits)
-   {
-      if(ec_dec_bit_logp(dec, 1))
-      {
-         int qg, octave;
-         octave = ec_dec_uint(dec, 6);
-         postfilter_pitch = (16<<octave)+ec_dec_bits(dec, 4+octave)-1;
-         qg = ec_dec_bits(dec, 3);
-         if (ec_tell(dec)+2<=total_bits)
-            postfilter_tapset = ec_dec_icdf(dec, tapset_icdf, 2);
-         postfilter_gain = QCONST16(.09375f,15)*(qg+1);
-      }
-      tell = ec_tell(dec);
-   }
-
-   if (LM > 0 && tell+3 <= total_bits)
-   {
-      isTransient = ec_dec_bit_logp(dec, 3);
-      tell = ec_tell(dec);
-   }
-   else
-      isTransient = 0;
-
-   if (isTransient)
-      shortBlocks = M;
-   else
-      shortBlocks = 0;
-
-   /* Decode the global flags (first symbols in the stream) */
-   intra_ener = tell+3<=total_bits ? ec_dec_bit_logp(dec, 3) : 0;
-   /* If recovering from packet loss, make sure we make the energy prediction safe to reduce the
-      risk of getting loud artifacts. */
-   if (!intra_ener && st->loss_duration != 0) {
-      c=0; do
-      {
-         celt_glog safety = 0;
-         int missing = IMIN(10, st->loss_duration>>LM);
-         if (LM==0) safety = GCONST(1.5f);
-         else if (LM==1) safety = GCONST(.5f);
-         for (i=start;i<end;i++)
-         {
-            if (oldBandE[c*nbEBands+i] < MAXG(oldLogE[c*nbEBands+i], oldLogE2[c*nbEBands+i])) {
-               /* If energy is going down already, continue the trend. */
-               oac_val32 slope;
-               oac_val32 E0, E1, E2;
-               E0 = oldBandE[c*nbEBands+i];
-               E1 = oldLogE[c*nbEBands+i];
-               E2 = oldLogE2[c*nbEBands+i];
-               slope = MAX32(E1 - E0, HALF32(E2 - E0));
-               slope = MING(slope, GCONST(2.f));
-               E0 -= MAX32(0, (1+missing)*slope);
-               oldBandE[c*nbEBands+i] = MAX32(-GCONST(20.f), E0);
-            } else {
-               /* Otherwise take the min of the last frames. */
-               oldBandE[c*nbEBands+i] = MING(MING(oldBandE[c*nbEBands+i], oldLogE[c*nbEBands+i]), oldLogE2[c*nbEBands+i]);
+    /* Check if there are at least two packets received consecutively before
+     * turning on the pitch-based PLC */
+    if (st->loss_duration == 0) st->skip_plc = 0;
+
+    if (dec == NULL) {
+        ec_dec_init(&_dec, (unsigned char*)data, len);
+        dec = &_dec;
+    }
+
+    if (C == 1) {
+        for (i = 0; i < nbEBands; i++)
+            oldBandE[i] = MAXG(oldBandE[i], oldBandE[nbEBands + i]);
+    }
+
+    total_bits = len*8;
+    tell = ec_tell(dec);
+
+    if (tell >= total_bits)
+        silence = 1;
+    else if (tell == 1)
+        silence = ec_dec_bit_logp(dec, 15);
+    else
+        silence = 0;
+    if (silence) {
+        /* Pretend we've read all the remaining bits */
+        tell = len*8;
+        dec->nbits_total += tell - ec_tell(dec);
+    }
+
+    postfilter_gain = 0;
+    postfilter_pitch = 0;
+    postfilter_tapset = 0;
+    if (start == 0 && tell + 16 <= total_bits) {
+        if (ec_dec_bit_logp(dec, 1)) {
+            int qg, octave;
+            octave = ec_dec_uint(dec, 6);
+            postfilter_pitch = (16<<octave) + ec_dec_bits(dec, 4 + octave) - 1;
+            qg = ec_dec_bits(dec, 3);
+            if (ec_tell(dec) + 2 <= total_bits)
+                postfilter_tapset = ec_dec_icdf(dec, tapset_icdf, 2);
+            postfilter_gain = QCONST16(.09375f, 15)*(qg + 1);
+        }
+        tell = ec_tell(dec);
+    }
+
+    if (LM > 0 && tell + 3 <= total_bits) {
+        isTransient = ec_dec_bit_logp(dec, 3);
+        tell = ec_tell(dec);
+    } else
+        isTransient = 0;
+
+    if (isTransient)
+        shortBlocks = M;
+    else
+        shortBlocks = 0;
+
+    /* Decode the global flags (first symbols in the stream) */
+    intra_ener = tell + 3 <= total_bits ? ec_dec_bit_logp(dec, 3) : 0;
+    /* If recovering from packet loss, make sure we make the energy prediction safe to reduce the
+       risk of getting loud artifacts. */
+    if (!intra_ener && st->loss_duration != 0) {
+        c = 0; do {
+            celt_glog safety = 0;
+            int missing = IMIN(10, st->loss_duration>>LM);
+            if (LM == 0) safety = GCONST(1.5f);
+            else if (LM == 1) safety = GCONST(.5f);
+            for (i = start; i < end; i++) {
+                if (oldBandE[c*nbEBands + i] < MAXG(oldLogE[c*nbEBands + i], oldLogE2[c*nbEBands + i])) {
+                    /* If energy is going down already, continue the trend. */
+                    oac_val32 slope;
+                    oac_val32 E0, E1, E2;
+                    E0 = oldBandE[c*nbEBands + i];
+                    E1 = oldLogE[c*nbEBands + i];
+                    E2 = oldLogE2[c*nbEBands + i];
+                    slope = MAX32(E1 - E0, HALF32(E2 - E0));
+                    slope = MING(slope, GCONST(2.f));
+                    E0 -= MAX32(0, (1 + missing)*slope);
+                    oldBandE[c*nbEBands + i] = MAX32(-GCONST(20.f), E0);
+                } else {
+                    /* Otherwise take the min of the last frames. */
+                    oldBandE[c*nbEBands + i] = MING(MING(oldBandE[c*nbEBands + i], oldLogE[c*nbEBands + i]),
+                    oldLogE2[c*nbEBands + i]);
+                }
+                /* Shorter frames have more natural fluctuations -- play it safe. */
+                oldBandE[c*nbEBands + i] -= safety;
             }
-            /* Shorter frames have more natural fluctuations -- play it safe. */
-            oldBandE[c*nbEBands+i] -= safety;
-         }
-      } while (++c<2);
-   }
-   /* Get band energies */
-   unquant_coarse_energy(mode, start, end, oldBandE,
+        } while (++c < 2);
+    }
+    /* Get band energies */
+    unquant_coarse_energy(mode, start, end, oldBandE,
          intra_ener, dec, C, LM);
 
-   ALLOC(tf_res, nbEBands, int);
-   tf_decode(start, end, isTransient, tf_res, LM, dec);
-
-   tell = ec_tell(dec);
-   spread_decision = SPREAD_NORMAL;
-   if (tell+4 <= total_bits)
-      spread_decision = ec_dec_icdf(dec, spread_icdf, 5);
-
-   ALLOC(cap, nbEBands, int);
-
-   init_caps(mode,cap,LM,C);
-
-   ALLOC(offsets, nbEBands, int);
-
-   dynalloc_logp = 6;
-   total_bits<<=BITRES;
-   tell = ec_tell_frac(dec);
-   for (i=start;i<end;i++)
-   {
-      int width, quanta;
-      int dynalloc_loop_logp;
-      int boost;
-      width = C*(eBands[i+1]-eBands[i])<<LM;
-      /* quanta is 6 bits, but no more than 1 bit/sample
-         and no less than 1/8 bit/sample */
-      quanta = IMIN(width<<BITRES, IMAX(6<<BITRES, width));
-      dynalloc_loop_logp = dynalloc_logp;
-      boost = 0;
-      while (tell+(dynalloc_loop_logp<<BITRES) < total_bits && boost < cap[i])
-      {
-         int flag;
-         flag = ec_dec_bit_logp(dec, dynalloc_loop_logp);
-         tell = ec_tell_frac(dec);
-         if (!flag)
-            break;
-         boost += quanta;
-         total_bits -= quanta;
-         dynalloc_loop_logp = 1;
-      }
-      offsets[i] = boost;
-      /* Making dynalloc more likely */
-      if (boost>0)
-         dynalloc_logp = IMAX(2, dynalloc_logp-1);
-   }
-
-   ALLOC(fine_quant, nbEBands, int);
-   alloc_trim = tell+(6<<BITRES) <= total_bits ?
-         ec_dec_icdf(dec, trim_icdf, 7) : 5;
-
-   bits = (((oac_int32)len*8)<<BITRES) - (oac_int32)ec_tell_frac(dec) - 1;
-   anti_collapse_rsv = isTransient&&LM>=2&&bits>=((LM+2)<<BITRES) ? (1<<BITRES) : 0;
-   bits -= anti_collapse_rsv;
-
-   ALLOC(pulses, nbEBands, int);
-   ALLOC(fine_priority, nbEBands, int);
-
-   codedBands = clt_compute_allocation(mode, start, end, offsets, cap,
+    ALLOC(tf_res, nbEBands, int);
+    tf_decode(start, end, isTransient, tf_res, LM, dec);
+
+    tell = ec_tell(dec);
+    spread_decision = SPREAD_NORMAL;
+    if (tell + 4 <= total_bits)
+        spread_decision = ec_dec_icdf(dec, spread_icdf, 5);
+
+    ALLOC(cap, nbEBands, int);
+
+    init_caps(mode, cap, LM, C);
+
+    ALLOC(offsets, nbEBands, int);
+
+    dynalloc_logp = 6;
+    total_bits <<= BITRES;
+    tell = ec_tell_frac(dec);
+    for (i = start; i < end; i++) {
+        int width, quanta;
+        int dynalloc_loop_logp;
+        int boost;
+        width = C*(eBands[i + 1] - eBands[i])<<LM;
+        /* quanta is 6 bits, but no more than 1 bit/sample
+           and no less than 1/8 bit/sample */
+        quanta = IMIN(width<<BITRES, IMAX(6<<BITRES, width));
+        dynalloc_loop_logp = dynalloc_logp;
+        boost = 0;
+        while (tell + (dynalloc_loop_logp<<BITRES) < total_bits && boost < cap[i]) {
+            int flag;
+            flag = ec_dec_bit_logp(dec, dynalloc_loop_logp);
+            tell = ec_tell_frac(dec);
+            if (!flag)
+                break;
+            boost += quanta;
+            total_bits -= quanta;
+            dynalloc_loop_logp = 1;
+        }
+        offsets[i] = boost;
+        /* Making dynalloc more likely */
+        if (boost > 0)
+            dynalloc_logp = IMAX(2, dynalloc_logp - 1);
+    }
+
+    ALLOC(fine_quant, nbEBands, int);
+    alloc_trim = tell + (6<<BITRES) <= total_bits ?
+                 ec_dec_icdf(dec, trim_icdf, 7) : 5;
+
+    bits = (((oac_int32)len*8)<<BITRES) - (oac_int32)ec_tell_frac(dec) - 1;
+    anti_collapse_rsv = isTransient && LM >= 2 && bits >= ((LM + 2)<<BITRES) ? (1<<BITRES) : 0;
+    bits -= anti_collapse_rsv;
+
+    ALLOC(pulses, nbEBands, int);
+    ALLOC(fine_priority, nbEBands, int);
+
+    codedBands = clt_compute_allocation(mode, start, end, offsets, cap,
          alloc_trim, &intensity, &dual_stereo, bits, &balance, pulses,
          fine_quant, fine_priority, C, LM, dec, 0, 0, 0);
 
-   unquant_fine_energy(mode, start, end, oldBandE, NULL, fine_quant, dec, C);
+    unquant_fine_energy(mode, start, end, oldBandE, NULL, fine_quant, dec, C);
 
-   c=0; do {
-      OAC_MOVE(decode_mem[c], decode_mem[c]+N, decode_buffer_size-N+overlap);
-   } while (++c<CC);
+    c = 0; do {
+        OAC_MOVE(decode_mem[c], decode_mem[c] + N, decode_buffer_size - N + overlap);
+    } while (++c < CC);
 
-   /* Decode fixed codebook */
-   ALLOC(collapse_masks, C*nbEBands, unsigned char);
+    /* Decode fixed codebook */
+    ALLOC(collapse_masks, C*nbEBands, unsigned char);
 
-   ALLOC(X, C*N, celt_norm);   /**< Interleaved normalised MDCTs */
+    ALLOC(X, C*N, celt_norm);  /**< Interleaved normalised MDCTs */
 
-   quant_all_bands(0, mode, start, end, X, C==2 ? X+N : NULL, collapse_masks,
+    quant_all_bands(0, mode, start, end, X, C == 2 ? X + N : NULL, collapse_masks,
          NULL, pulses, shortBlocks, spread_decision, dual_stereo, intensity, tf_res,
-         len*(8<<BITRES)-anti_collapse_rsv, balance, dec, LM, codedBands, &st->rng, 0,
+         len*(8<<BITRES) - anti_collapse_rsv, balance, dec, LM, codedBands, &st->rng, 0,
          st->arch, st->disable_inv);
 
-   if (anti_collapse_rsv > 0)
-   {
-      anti_collapse_on = ec_dec_bits(dec, 1);
-   }
+    if (anti_collapse_rsv > 0) {
+        anti_collapse_on = ec_dec_bits(dec, 1);
+    }
 
-   unquant_energy_finalise(mode, start, end, oldBandE,
-         fine_quant, fine_priority, len*8-ec_tell(dec), dec, C);
+    unquant_energy_finalise(mode, start, end, oldBandE,
+         fine_quant, fine_priority, len*8 - ec_tell(dec), dec, C);
 
-   if (anti_collapse_on)
-      anti_collapse(mode, X, collapse_masks, LM, C, N,
+    if (anti_collapse_on)
+        anti_collapse(mode, X, collapse_masks, LM, C, N,
             start, end, oldBandE, oldLogE, oldLogE2, pulses, st->rng, 0, st->arch);
 
-   if (silence)
-   {
-      for (i=0;i<C*nbEBands;i++)
-         oldBandE[i] = -GCONST(28.f);
-   }
-   if (st->prefilter_and_fold) {
-      prefilter_and_fold(st, N);
-   }
-   celt_synthesis(mode, X, out_syn, oldBandE, start, effEnd,
+    if (silence) {
+        for (i = 0; i < C*nbEBands; i++)
+            oldBandE[i] = -GCONST(28.f);
+    }
+    if (st->prefilter_and_fold) {
+        prefilter_and_fold(st, N);
+    }
+    celt_synthesis(mode, X, out_syn, oldBandE, start, effEnd,
                   C, CC, isTransient, LM, st->downsample, silence, st->arch);
 
-   c=0; do {
-      st->postfilter_period=IMAX(st->postfilter_period, COMBFILTER_MINPERIOD);
-      st->postfilter_period_old=IMAX(st->postfilter_period_old, COMBFILTER_MINPERIOD);
-      comb_filter(out_syn[c], out_syn[c], st->postfilter_period_old, st->postfilter_period, mode->shortMdctSize,
+    c = 0; do {
+        st->postfilter_period = IMAX(st->postfilter_period, COMBFILTER_MINPERIOD);
+        st->postfilter_period_old = IMAX(st->postfilter_period_old, COMBFILTER_MINPERIOD);
+        comb_filter(out_syn[c], out_syn[c], st->postfilter_period_old, st->postfilter_period, mode->shortMdctSize,
             st->postfilter_gain_old, st->postfilter_gain, st->postfilter_tapset_old, st->postfilter_tapset,
             mode->window, overlap, st->arch);
-      if (LM!=0)
-         comb_filter(out_syn[c]+mode->shortMdctSize, out_syn[c]+mode->shortMdctSize, st->postfilter_period, postfilter_pitch, N-mode->shortMdctSize,
+        if (LM != 0)
+            comb_filter(out_syn[c] + mode->shortMdctSize, out_syn[c] + mode->shortMdctSize, st->postfilter_period,
+            postfilter_pitch, N - mode->shortMdctSize,
                st->postfilter_gain, postfilter_gain, st->postfilter_tapset, postfilter_tapset,
                mode->window, overlap, st->arch);
 
-   } while (++c<CC);
-   st->postfilter_period_old = st->postfilter_period;
-   st->postfilter_gain_old = st->postfilter_gain;
-   st->postfilter_tapset_old = st->postfilter_tapset;
-   st->postfilter_period = postfilter_pitch;
-   st->postfilter_gain = postfilter_gain;
-   st->postfilter_tapset = postfilter_tapset;
-   if (LM!=0)
-   {
-      st->postfilter_period_old = st->postfilter_period;
-      st->postfilter_gain_old = st->postfilter_gain;
-      st->postfilter_tapset_old = st->postfilter_tapset;
-   }
-
-   if (C==1)
-      OAC_COPY(&oldBandE[nbEBands], oldBandE, nbEBands);
-
-   if (!isTransient)
-   {
-      OAC_COPY(oldLogE2, oldLogE, 2*nbEBands);
-      OAC_COPY(oldLogE, oldBandE, 2*nbEBands);
-   } else {
-      for (i=0;i<2*nbEBands;i++)
-         oldLogE[i] = MING(oldLogE[i], oldBandE[i]);
-   }
-   /* In normal circumstances, we only allow the noise floor to increase by
-      up to 2.4 dB/second, but when we're in DTX we give the weight of
-      all missing packets to the update packet. */
-   max_background_increase = IMIN(160, st->loss_duration+M)*GCONST(0.001f);
-   for (i=0;i<2*nbEBands;i++)
-      backgroundLogE[i] = MING(backgroundLogE[i] + max_background_increase, oldBandE[i]);
-   /* In case start or end were to change */
-   c=0; do
-   {
-      for (i=0;i<start;i++)
-      {
-         oldBandE[c*nbEBands+i]=0;
-         oldLogE[c*nbEBands+i]=oldLogE2[c*nbEBands+i]=-GCONST(28.f);
-      }
-      for (i=end;i<nbEBands;i++)
-      {
-         oldBandE[c*nbEBands+i]=0;
-         oldLogE[c*nbEBands+i]=oldLogE2[c*nbEBands+i]=-GCONST(28.f);
-      }
-   } while (++c<2);
-   st->rng = dec->rng;
-
-   deemphasis(out_syn, pcm, N, CC, st->downsample, mode->preemph, st->preemph_memD, accum);
-   st->loss_duration = 0;
-   st->plc_duration = 0;
-   st->last_frame_type = FRAME_NORMAL;
-   st->prefilter_and_fold = 0;
-   RESTORE_STACK;
-   if (ec_tell(dec) > 8*len)
-      return OAC_INTERNAL_ERROR;
-   if(ec_get_error(dec))
-      st->error = 1;
-   return frame_size/st->downsample;
+    } while (++c < CC);
+    st->postfilter_period_old = st->postfilter_period;
+    st->postfilter_gain_old = st->postfilter_gain;
+    st->postfilter_tapset_old = st->postfilter_tapset;
+    st->postfilter_period = postfilter_pitch;
+    st->postfilter_gain = postfilter_gain;
+    st->postfilter_tapset = postfilter_tapset;
+    if (LM != 0) {
+        st->postfilter_period_old = st->postfilter_period;
+        st->postfilter_gain_old = st->postfilter_gain;
+        st->postfilter_tapset_old = st->postfilter_tapset;
+    }
+
+    if (C == 1)
+        OAC_COPY(&oldBandE[nbEBands], oldBandE, nbEBands);
+
+    if (!isTransient) {
+        OAC_COPY(oldLogE2, oldLogE, 2*nbEBands);
+        OAC_COPY(oldLogE, oldBandE, 2*nbEBands);
+    } else {
+        for (i = 0; i < 2*nbEBands; i++)
+            oldLogE[i] = MING(oldLogE[i], oldBandE[i]);
+    }
+    /* In normal circumstances, we only allow the noise floor to increase by
+       up to 2.4 dB/second, but when we're in DTX we give the weight of
+       all missing packets to the update packet. */
+    max_background_increase = IMIN(160, st->loss_duration + M)*GCONST(0.001f);
+    for (i = 0; i < 2*nbEBands; i++)
+        backgroundLogE[i] = MING(backgroundLogE[i] + max_background_increase, oldBandE[i]);
+    /* In case start or end were to change */
+    c = 0; do {
+        for (i = 0; i < start; i++) {
+            oldBandE[c*nbEBands + i] = 0;
+            oldLogE[c*nbEBands + i] = oldLogE2[c*nbEBands + i] = -GCONST(28.f);
+        }
+        for (i = end; i < nbEBands; i++) {
+            oldBandE[c*nbEBands + i] = 0;
+            oldLogE[c*nbEBands + i] = oldLogE2[c*nbEBands + i] = -GCONST(28.f);
+        }
+    } while (++c < 2);
+    st->rng = dec->rng;
+
+    deemphasis(out_syn, pcm, N, CC, st->downsample, mode->preemph, st->preemph_memD, accum);
+    st->loss_duration = 0;
+    st->plc_duration = 0;
+    st->last_frame_type = FRAME_NORMAL;
+    st->prefilter_and_fold = 0;
+    RESTORE_STACK;
+    if (ec_tell(dec) > 8*len)
+        return OAC_INTERNAL_ERROR;
+    if (ec_get_error(dec))
+        st->error = 1;
+    return frame_size/st->downsample;
 }
 
 int celt_decode_with_ec(CELTDecoder * OAC_RESTRICT st, const unsigned char *data,
-      int len, oac_res * OAC_RESTRICT pcm, int frame_size, ec_dec *dec, int accum)
-{
-   return celt_decode_with_ec_dred(st, data, len, pcm, frame_size, dec, accum
+                        int len, oac_res * OAC_RESTRICT pcm, int frame_size, ec_dec *dec, int accum) {
+    return celt_decode_with_ec_dred(st, data, len, pcm, frame_size, dec, accum
 #ifdef ENABLE_DEEP_PLC
-       , NULL
+        , NULL
 #endif
-       );
+        );
 }
 
 #if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
 
-int oac_custom_decode(CELTDecoder * OAC_RESTRICT st, const unsigned char *data, int len, oac_int16 * OAC_RESTRICT pcm, int frame_size)
-{
-   int j, ret, C, N;
-   VARDECL(oac_res, out);
-   ALLOC_STACK;
+int oac_custom_decode(CELTDecoder * OAC_RESTRICT st, const unsigned char *data, int len, oac_int16 * OAC_RESTRICT pcm,
+                      int frame_size) {
+    int j, ret, C, N;
+    VARDECL(oac_res, out);
+    ALLOC_STACK;
 
-   if (pcm==NULL)
-      return OAC_BAD_ARG;
+    if (pcm == NULL)
+        return OAC_BAD_ARG;
 
-   C = st->channels;
-   N = frame_size;
+    C = st->channels;
+    N = frame_size;
 
-   ALLOC(out, C*N, oac_res);
-   ret = celt_decode_with_ec(st, data, len, out, frame_size, NULL, 0);
-   if (ret>0)
-      for (j=0;j<C*ret;j++)
-         pcm[j]=RES2INT16(out[j]);
+    ALLOC(out, C*N, oac_res);
+    ret = celt_decode_with_ec(st, data, len, out, frame_size, NULL, 0);
+    if (ret > 0)
+        for (j = 0; j < C*ret; j++)
+            pcm[j] = RES2INT16(out[j]);
 
-   RESTORE_STACK;
-   return ret;
+    RESTORE_STACK;
+    return ret;
 }
 
-#if defined(FIXED_POINT)
-int oac_custom_decode24(CELTDecoder * OAC_RESTRICT st, const unsigned char *data, int len, oac_int32 * OAC_RESTRICT pcm, int frame_size)
-{
-   return celt_decode_with_ec(st, data, len, pcm, frame_size, NULL, 0);
+# if defined(FIXED_POINT)
+int oac_custom_decode24(CELTDecoder * OAC_RESTRICT st, const unsigned char *data, int len, oac_int32 * OAC_RESTRICT pcm,
+                        int frame_size) {
+    return celt_decode_with_ec(st, data, len, pcm, frame_size, NULL, 0);
 }
-#else
-int oac_custom_decode24(CELTDecoder * OAC_RESTRICT st, const unsigned char *data, int len, oac_int32 * OAC_RESTRICT pcm, int frame_size)
-{
-   int j, ret, C, N;
-   VARDECL(oac_res, out);
-   ALLOC_STACK;
-
-   if (pcm==NULL)
-      return OAC_BAD_ARG;
-
-   C = st->channels;
-   N = frame_size;
-
-   ALLOC(out, C*N, oac_res);
-   ret = celt_decode_with_ec(st, data, len, out, frame_size, NULL, 0);
-   if (ret>0)
-      for (j=0;j<C*ret;j++)
-         pcm[j]=RES2INT24(out[j]);
-
-   RESTORE_STACK;
-   return ret;
+# else
+int oac_custom_decode24(CELTDecoder * OAC_RESTRICT st, const unsigned char *data, int len, oac_int32 * OAC_RESTRICT pcm,
+                        int frame_size) {
+    int j, ret, C, N;
+    VARDECL(oac_res, out);
+    ALLOC_STACK;
+
+    if (pcm == NULL)
+        return OAC_BAD_ARG;
+
+    C = st->channels;
+    N = frame_size;
+
+    ALLOC(out, C*N, oac_res);
+    ret = celt_decode_with_ec(st, data, len, out, frame_size, NULL, 0);
+    if (ret > 0)
+        for (j = 0; j < C*ret; j++)
+            pcm[j] = RES2INT24(out[j]);
+
+    RESTORE_STACK;
+    return ret;
 }
-#endif
+# endif
 
 
-#ifndef DISABLE_FLOAT_API
+# ifndef DISABLE_FLOAT_API
 
-# if !defined(FIXED_POINT)
-int oac_custom_decode_float(CELTDecoder * OAC_RESTRICT st, const unsigned char *data, int len, float * OAC_RESTRICT pcm, int frame_size)
-{
-   return celt_decode_with_ec(st, data, len, pcm, frame_size, NULL, 0);
+#  if !defined(FIXED_POINT)
+int oac_custom_decode_float(CELTDecoder * OAC_RESTRICT st, const unsigned char *data, int len, float * OAC_RESTRICT pcm,
+                            int frame_size) {
+    return celt_decode_with_ec(st, data, len, pcm, frame_size, NULL, 0);
 }
-# else
-int oac_custom_decode_float(CELTDecoder * OAC_RESTRICT st, const unsigned char *data, int len, float * OAC_RESTRICT pcm, int frame_size)
-{
-   int j, ret, C, N;
-   VARDECL(oac_res, out);
-   ALLOC_STACK;
-
-   if (pcm==NULL)
-      return OAC_BAD_ARG;
-
-   C = st->channels;
-   N = frame_size;
-
-   ALLOC(out, C*N, oac_res);
-   ret=celt_decode_with_ec(st, data, len, out, frame_size, NULL, 0);
-   if (ret>0)
-      for (j=0;j<C*ret;j++)
-         pcm[j]=RES2FLOAT(out[j]);
-
-   RESTORE_STACK;
-   return ret;
+#  else
+int oac_custom_decode_float(CELTDecoder * OAC_RESTRICT st, const unsigned char *data, int len, float * OAC_RESTRICT pcm,
+                            int frame_size) {
+    int j, ret, C, N;
+    VARDECL(oac_res, out);
+    ALLOC_STACK;
+
+    if (pcm == NULL)
+        return OAC_BAD_ARG;
+
+    C = st->channels;
+    N = frame_size;
+
+    ALLOC(out, C*N, oac_res);
+    ret = celt_decode_with_ec(st, data, len, out, frame_size, NULL, 0);
+    if (ret > 0)
+        for (j = 0; j < C*ret; j++)
+            pcm[j] = RES2FLOAT(out[j]);
+
+    RESTORE_STACK;
+    return ret;
 }
-# endif
+#  endif
 
-#endif
+# endif
 
 #endif /* CUSTOM_MODES */
 
-int oac_custom_decoder_ctl(CELTDecoder * OAC_RESTRICT st, int request, ...)
-{
-   va_list ap;
-
-   va_start(ap, request);
-   switch (request)
-   {
-      case OAC_SET_COMPLEXITY_REQUEST:
-      {
-          oac_int32 value = va_arg(ap, oac_int32);
-          if(value<0 || value>10)
-          {
-             goto bad_arg;
-          }
-          st->complexity = value;
-      }
-      break;
-      case OAC_GET_COMPLEXITY_REQUEST:
-      {
-          oac_int32 *value = va_arg(ap, oac_int32*);
-          if (!value)
-          {
-             goto bad_arg;
-          }
-          *value = st->complexity;
-      }
-      break;
-      case CELT_SET_START_BAND_REQUEST:
-      {
-         oac_int32 value = va_arg(ap, oac_int32);
-         if (value<0 || value>=st->mode->nbEBands)
-            goto bad_arg;
-         st->start = value;
-      }
-      break;
-      case CELT_SET_END_BAND_REQUEST:
-      {
-         oac_int32 value = va_arg(ap, oac_int32);
-         if (value<1 || value>st->mode->nbEBands)
-            goto bad_arg;
-         st->end = value;
-      }
-      break;
-      case CELT_SET_CHANNELS_REQUEST:
-      {
-         oac_int32 value = va_arg(ap, oac_int32);
-         if (value<1 || value>2)
-            goto bad_arg;
-         st->stream_channels = value;
-      }
-      break;
-      case CELT_GET_AND_CLEAR_ERROR_REQUEST:
-      {
-         oac_int32 *value = va_arg(ap, oac_int32*);
-         if (value==NULL)
-            goto bad_arg;
-         *value=st->error;
-         st->error = 0;
-      }
-      break;
-      case OAC_GET_LOOKAHEAD_REQUEST:
-      {
-         oac_int32 *value = va_arg(ap, oac_int32*);
-         if (value==NULL)
-            goto bad_arg;
-         *value = st->overlap/st->downsample;
-      }
-      break;
-      case OAC_RESET_STATE:
-      {
-         int i;
-         celt_glog *oldBandE, *oldLogE, *oldLogE2;
-         int decode_buffer_size;
+int oac_custom_decoder_ctl(CELTDecoder * OAC_RESTRICT st, int request, ...) {
+    va_list ap;
+
+    va_start(ap, request);
+    switch (request) {
+        case OAC_SET_COMPLEXITY_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            if (value < 0 || value > 10) {
+                goto bad_arg;
+            }
+            st->complexity = value;
+        }
+        break;
+        case OAC_GET_COMPLEXITY_REQUEST:
+        {
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            if (!value) {
+                goto bad_arg;
+            }
+            *value = st->complexity;
+        }
+        break;
+        case CELT_SET_START_BAND_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            if (value < 0 || value >= st->mode->nbEBands)
+                goto bad_arg;
+            st->start = value;
+        }
+        break;
+        case CELT_SET_END_BAND_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            if (value < 1 || value > st->mode->nbEBands)
+                goto bad_arg;
+            st->end = value;
+        }
+        break;
+        case CELT_SET_CHANNELS_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            if (value < 1 || value > 2)
+                goto bad_arg;
+            st->stream_channels = value;
+        }
+        break;
+        case CELT_GET_AND_CLEAR_ERROR_REQUEST:
+        {
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            if (value == NULL)
+                goto bad_arg;
+            *value = st->error;
+            st->error = 0;
+        }
+        break;
+        case OAC_GET_LOOKAHEAD_REQUEST:
+        {
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            if (value == NULL)
+                goto bad_arg;
+            *value = st->overlap/st->downsample;
+        }
+        break;
+        case OAC_RESET_STATE:
+        {
+            int i;
+            celt_glog *oldBandE, *oldLogE, *oldLogE2;
+            int decode_buffer_size;
 #ifdef ENABLE_QEXT
-         int qext_scale = st->qext_scale;
+            int qext_scale = st->qext_scale;
 #endif
-         decode_buffer_size = QEXT_SCALE(DECODE_BUFFER_SIZE);
-         oldBandE = (celt_glog*)(st->_decode_mem+(decode_buffer_size+st->overlap)*st->channels);
-         oldLogE = oldBandE + 2*st->mode->nbEBands;
-         oldLogE2 = oldLogE + 2*st->mode->nbEBands;
-         OAC_CLEAR((char*)&st->DECODER_RESET_START,
-               oac_custom_decoder_get_size(st->mode, st->channels)-
-               ((char*)&st->DECODER_RESET_START - (char*)st));
-         for (i=0;i<2*st->mode->nbEBands;i++)
-            oldLogE[i]=oldLogE2[i]=-GCONST(28.f);
-         st->skip_plc = 1;
-         st->last_frame_type = FRAME_NONE;
-      }
-      break;
-      case OAC_GET_PITCH_REQUEST:
-      {
-         oac_int32 *value = va_arg(ap, oac_int32*);
-         if (value==NULL)
-            goto bad_arg;
-         *value = st->postfilter_period;
-      }
-      break;
-      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_SET_SIGNALLING_REQUEST:
-      {
-         oac_int32 value = va_arg(ap, oac_int32);
-         st->signalling = value;
-      }
-      break;
-      case OAC_GET_FINAL_RANGE_REQUEST:
-      {
-         oac_uint32 * value = va_arg(ap, oac_uint32 *);
-         if (value==0)
-            goto bad_arg;
-         *value=st->rng;
-      }
-      break;
-      case OAC_SET_PHASE_INVERSION_DISABLED_REQUEST:
-      {
-          oac_int32 value = va_arg(ap, oac_int32);
-          if(value<0 || value>1)
-          {
-             goto bad_arg;
-          }
-          st->disable_inv = value;
-      }
-      break;
-      case OAC_GET_PHASE_INVERSION_DISABLED_REQUEST:
-      {
-          oac_int32 *value = va_arg(ap, oac_int32*);
-          if (!value)
-          {
-             goto bad_arg;
-          }
-          *value = st->disable_inv;
-      }
-      break;
-      default:
-         goto bad_request;
-   }
-   va_end(ap);
-   return OAC_OK;
+            decode_buffer_size = QEXT_SCALE(DECODE_BUFFER_SIZE);
+            oldBandE = (celt_glog*)(st->_decode_mem + (decode_buffer_size + st->overlap)*st->channels);
+            oldLogE = oldBandE + 2*st->mode->nbEBands;
+            oldLogE2 = oldLogE + 2*st->mode->nbEBands;
+            OAC_CLEAR((char*)&st->DECODER_RESET_START,
+               oac_custom_decoder_get_size(st->mode, st->channels)
+                - ((char*)&st->DECODER_RESET_START - (char*)st));
+            for (i = 0; i < 2*st->mode->nbEBands; i++)
+                oldLogE[i] = oldLogE2[i] = -GCONST(28.f);
+            st->skip_plc = 1;
+            st->last_frame_type = FRAME_NONE;
+        }
+        break;
+        case OAC_GET_PITCH_REQUEST:
+        {
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            if (value == NULL)
+                goto bad_arg;
+            *value = st->postfilter_period;
+        }
+        break;
+        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_SET_SIGNALLING_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            st->signalling = value;
+        }
+        break;
+        case OAC_GET_FINAL_RANGE_REQUEST:
+        {
+            oac_uint32 * value = va_arg(ap, oac_uint32 *);
+            if (value == 0)
+                goto bad_arg;
+            *value = st->rng;
+        }
+        break;
+        case OAC_SET_PHASE_INVERSION_DISABLED_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            if (value < 0 || value > 1) {
+                goto bad_arg;
+            }
+            st->disable_inv = value;
+        }
+        break;
+        case OAC_GET_PHASE_INVERSION_DISABLED_REQUEST:
+        {
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            if (!value) {
+                goto bad_arg;
+            }
+            *value = st->disable_inv;
+        }
+        break;
+        default:
+            goto bad_request;
+    }
+    va_end(ap);
+    return OAC_OK;
 bad_arg:
-   va_end(ap);
-   return OAC_BAD_ARG;
+    va_end(ap);
+    return OAC_BAD_ARG;
 bad_request:
-      va_end(ap);
-  return OAC_UNIMPLEMENTED;
+    va_end(ap);
+    return OAC_UNIMPLEMENTED;
 }
diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c
index 0dbd3c6ee..e7af0fc4d 100644
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -25,10 +25,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #define CELT_ENCODER_C
@@ -53,2904 +53,2770 @@
 
 
 #ifndef M_PI
-#define M_PI 3.141592653
+# define M_PI 3.141592653
 #endif
 
 
 /** Encoder state
- @brief Encoder state
+   @brief Encoder state
  */
 struct OacCustomEncoder {
-   const OacCustomMode *mode;     /**< Mode used by the encoder */
-   int channels;
-   int stream_channels;
-
-   int force_intra;
-   int clip;
-   int disable_pf;
-   int complexity;
-   int upsample;
-   int start, end;
-
-   oac_int32 bitrate;
-   int vbr;
-   int signalling;
-   int constrained_vbr;      /* If zero, VBR can do whatever it likes with the rate */
-   int loss_rate;
-   int lsb_depth;
-   int lfe;
-   int disable_inv;
-   int arch;
+    const OacCustomMode *mode;    /**< Mode used by the encoder */
+    int channels;
+    int stream_channels;
+
+    int force_intra;
+    int clip;
+    int disable_pf;
+    int complexity;
+    int upsample;
+    int start, end;
+
+    oac_int32 bitrate;
+    int vbr;
+    int signalling;
+    int constrained_vbr;     /* If zero, VBR can do whatever it likes with the rate */
+    int loss_rate;
+    int lsb_depth;
+    int lfe;
+    int disable_inv;
+    int arch;
 #ifdef ENABLE_QEXT
-   int qext_scale;
+    int qext_scale;
 #endif
 
-   /* Everything beyond this point gets cleared on a reset */
+    /* Everything beyond this point gets cleared on a reset */
 #define ENCODER_RESET_START rng
 
-   oac_uint32 rng;
-   int spread_decision;
-   oac_val32 delayedIntra;
-   int tonal_average;
-   int lastCodedBands;
-   int hf_average;
-   int tapset_decision;
-
-   int prefilter_period;
-   oac_val16 prefilter_gain;
-   int prefilter_tapset;
+    oac_uint32 rng;
+    int spread_decision;
+    oac_val32 delayedIntra;
+    int tonal_average;
+    int lastCodedBands;
+    int hf_average;
+    int tapset_decision;
+
+    int prefilter_period;
+    oac_val16 prefilter_gain;
+    int prefilter_tapset;
 #ifdef RESYNTH
-   int prefilter_period_old;
-   oac_val16 prefilter_gain_old;
-   int prefilter_tapset_old;
+    int prefilter_period_old;
+    oac_val16 prefilter_gain_old;
+    int prefilter_tapset_old;
 #endif
-   int consec_transient;
-   AnalysisInfo analysis;
-   SILKInfo silk_info;
-
-   oac_val32 preemph_memE[2];
-   oac_val32 preemph_memD[2];
-
-   /* VBR-related parameters */
-   oac_int32 vbr_reservoir;
-   oac_int32 vbr_drift;
-   oac_int32 vbr_offset;
-   oac_int32 vbr_count;
-   oac_val32 overlap_max;
-   oac_val16 stereo_saving;
-   int intensity;
-   celt_glog *energy_mask;
-   celt_glog spec_avg;
+    int consec_transient;
+    AnalysisInfo analysis;
+    SILKInfo silk_info;
+
+    oac_val32 preemph_memE[2];
+    oac_val32 preemph_memD[2];
+
+    /* VBR-related parameters */
+    oac_int32 vbr_reservoir;
+    oac_int32 vbr_drift;
+    oac_int32 vbr_offset;
+    oac_int32 vbr_count;
+    oac_val32 overlap_max;
+    oac_val16 stereo_saving;
+    int intensity;
+    celt_glog *energy_mask;
+    celt_glog spec_avg;
 
 #ifdef RESYNTH
-#ifdef ENABLE_QEXT
-   /* +MAX_PERIOD/2 to make space for overlap */
-   celt_sig syn_mem[2][2*DEC_PITCH_BUF_SIZE+MAX_PERIOD];
-#else
-   /* +MAX_PERIOD/2 to make space for overlap */
-   celt_sig syn_mem[2][DEC_PITCH_BUF_SIZE+MAX_PERIOD/2];
-#endif
+# ifdef ENABLE_QEXT
+    /* +MAX_PERIOD/2 to make space for overlap */
+    celt_sig syn_mem[2][2*DEC_PITCH_BUF_SIZE + MAX_PERIOD];
+# else
+    /* +MAX_PERIOD/2 to make space for overlap */
+    celt_sig syn_mem[2][DEC_PITCH_BUF_SIZE + MAX_PERIOD/2];
+# endif
 #endif
 
-   celt_sig in_mem[1]; /* Size = channels*mode->overlap */
-   /* celt_sig prefilter_mem[],  Size = channels*COMBFILTER_MAXPERIOD */
-   /* celt_glog oldBandE[],     Size = channels*mode->nbEBands */
-   /* celt_glog oldLogE[],      Size = channels*mode->nbEBands */
-   /* celt_glog oldLogE2[],     Size = channels*mode->nbEBands */
-   /* celt_glog energyError[],  Size = channels*mode->nbEBands */
+    celt_sig in_mem[1]; /* Size = channels*mode->overlap */
+    /* celt_sig prefilter_mem[],  Size = channels*COMBFILTER_MAXPERIOD */
+    /* celt_glog oldBandE[],     Size = channels*mode->nbEBands */
+    /* celt_glog oldLogE[],      Size = channels*mode->nbEBands */
+    /* celt_glog oldLogE2[],     Size = channels*mode->nbEBands */
+    /* celt_glog energyError[],  Size = channels*mode->nbEBands */
 };
 
-int celt_encoder_get_size(int channels)
-{
+int celt_encoder_get_size(int channels) {
 #ifdef ENABLE_QEXT
-   CELTMode *mode = oac_custom_mode_create(96000, 1920, NULL);
+    CELTMode *mode = oac_custom_mode_create(96000, 1920, NULL);
 #else
-   CELTMode *mode = oac_custom_mode_create(48000, 960, NULL);
+    CELTMode *mode = oac_custom_mode_create(48000, 960, NULL);
 #endif
-   return oac_custom_encoder_get_size(mode, channels);
+    return oac_custom_encoder_get_size(mode, channels);
 }
 
-OAC_CUSTOM_NOSTATIC int oac_custom_encoder_get_size(const CELTMode *mode, int channels)
-{
-   int size;
+OAC_CUSTOM_NOSTATIC int oac_custom_encoder_get_size(const CELTMode *mode, int channels) {
+    int size;
 #ifdef ENABLE_QEXT
-   int qext_scale;
-   if (mode->Fs == 96000 && (mode->shortMdctSize==240 || mode->shortMdctSize==180)) {
-      qext_scale = 2;
-   } else qext_scale = 1;
+    int qext_scale;
+    if (mode->Fs == 96000 && (mode->shortMdctSize == 240 || mode->shortMdctSize == 180)) {
+        qext_scale = 2;
+    } else qext_scale = 1;
 #endif
-   size = sizeof(struct CELTEncoder)
-         + (channels*mode->overlap-1)*sizeof(celt_sig)    /* celt_sig in_mem[channels*mode->overlap]; */
-         + channels*QEXT_SCALE(COMBFILTER_MAXPERIOD)*sizeof(celt_sig) /* celt_sig prefilter_mem[channels*COMBFILTER_MAXPERIOD]; */
-         + 4*channels*mode->nbEBands*sizeof(celt_glog);   /* celt_glog oldBandE[channels*mode->nbEBands]; */
+    size = sizeof(struct CELTEncoder)
+           + (channels*mode->overlap - 1)*sizeof(celt_sig) /* celt_sig in_mem[channels*mode->overlap]; */
+           + channels*QEXT_SCALE(COMBFILTER_MAXPERIOD)*sizeof(celt_sig) /* celt_sig prefilter_mem[channels*COMBFILTER_MAXPERIOD]; */
+           + 4*channels*mode->nbEBands*sizeof(celt_glog); /* celt_glog oldBandE[channels*mode->nbEBands]; */
                                                           /* celt_glog oldLogE[channels*mode->nbEBands]; */
                                                           /* celt_glog oldLogE2[channels*mode->nbEBands]; */
                                                           /* celt_glog energyError[channels*mode->nbEBands]; */
-   return size;
+    return size;
 }
 
 #if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
-CELTEncoder *oac_custom_encoder_create(const CELTMode *mode, int channels, int *error)
-{
-   int ret;
-   CELTEncoder *st = (CELTEncoder *)oac_alloc(oac_custom_encoder_get_size(mode, channels));
-   /* init will handle the NULL case */
-   ret = oac_custom_encoder_init(st, mode, channels);
-   if (ret != OAC_OK)
-   {
-      oac_custom_encoder_destroy(st);
-      st = NULL;
-   }
-   if (error)
-      *error = ret;
-   return st;
+CELTEncoder *oac_custom_encoder_create(const CELTMode *mode, int channels, int *error) {
+    int ret;
+    CELTEncoder *st = (CELTEncoder *)oac_alloc(oac_custom_encoder_get_size(mode, channels));
+    /* init will handle the NULL case */
+    ret = oac_custom_encoder_init(st, mode, channels);
+    if (ret != OAC_OK) {
+        oac_custom_encoder_destroy(st);
+        st = NULL;
+    }
+    if (error)
+        *error = ret;
+    return st;
 }
 #endif /* CUSTOM_MODES */
 
 static int oac_custom_encoder_init_arch(CELTEncoder *st, const CELTMode *mode,
-                                         int channels, int arch)
-{
-   if (channels < 0 || channels > 2)
-      return OAC_BAD_ARG;
+                                        int channels, int arch) {
+    if (channels < 0 || channels > 2)
+        return OAC_BAD_ARG;
 
-   if (st==NULL || mode==NULL)
-      return OAC_ALLOC_FAIL;
+    if (st == NULL || mode == NULL)
+        return OAC_ALLOC_FAIL;
 
-   OAC_CLEAR((char*)st, oac_custom_encoder_get_size(mode, channels));
+    OAC_CLEAR((char*)st, oac_custom_encoder_get_size(mode, channels));
 
-   st->mode = mode;
-   st->stream_channels = st->channels = channels;
+    st->mode = mode;
+    st->stream_channels = st->channels = channels;
 
-   st->upsample = 1;
-   st->start = 0;
-   st->end = st->mode->effEBands;
-   st->signalling = 1;
-   st->arch = arch;
+    st->upsample = 1;
+    st->start = 0;
+    st->end = st->mode->effEBands;
+    st->signalling = 1;
+    st->arch = arch;
 
-   st->constrained_vbr = 1;
-   st->clip = 1;
+    st->constrained_vbr = 1;
+    st->clip = 1;
 
-   st->bitrate = OAC_BITRATE_MAX;
-   st->vbr = 0;
-   st->force_intra  = 0;
-   st->complexity = 5;
-   st->lsb_depth=24;
+    st->bitrate = OAC_BITRATE_MAX;
+    st->vbr = 0;
+    st->force_intra  = 0;
+    st->complexity = 5;
+    st->lsb_depth = 24;
 
 #ifdef ENABLE_QEXT
-   if (st->mode->Fs == 96000 && (mode->shortMdctSize==240 || mode->shortMdctSize==180)) st->qext_scale = 2;
-   else st->qext_scale = 1;
+    if (st->mode->Fs == 96000 && (mode->shortMdctSize == 240 || mode->shortMdctSize == 180)) st->qext_scale = 2;
+    else st->qext_scale = 1;
 #endif
 
-   oac_custom_encoder_ctl(st, OAC_RESET_STATE);
+    oac_custom_encoder_ctl(st, OAC_RESET_STATE);
 
-   return OAC_OK;
+    return OAC_OK;
 }
 
 #if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
-int oac_custom_encoder_init(CELTEncoder *st, const CELTMode *mode, int channels)
-{
-   return oac_custom_encoder_init_arch(st, mode, channels, oac_select_arch());
+int oac_custom_encoder_init(CELTEncoder *st, const CELTMode *mode, int channels) {
+    return oac_custom_encoder_init_arch(st, mode, channels, oac_select_arch());
 }
 #endif
 
 int celt_encoder_init(CELTEncoder *st, oac_int32 sampling_rate, int channels,
-                      int arch)
-{
-   int ret;
+                      int arch) {
+    int ret;
 #ifdef ENABLE_QEXT
-   if (sampling_rate==96000) {
-      st->upsample = 1;
-      return oac_custom_encoder_init_arch(st,
+    if (sampling_rate == 96000) {
+        st->upsample = 1;
+        return oac_custom_encoder_init_arch(st,
               oac_custom_mode_create(96000, 1920, NULL), channels, arch);
-   }
+    }
 #endif
-   ret = oac_custom_encoder_init_arch(st,
+    ret = oac_custom_encoder_init_arch(st,
            oac_custom_mode_create(48000, 960, NULL), channels, arch);
-   if (ret != OAC_OK)
-      return ret;
-   st->upsample = resampling_factor(sampling_rate);
-   return OAC_OK;
+    if (ret != OAC_OK)
+        return ret;
+    st->upsample = resampling_factor(sampling_rate);
+    return OAC_OK;
 }
 
 #if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
-void oac_custom_encoder_destroy(CELTEncoder *st)
-{
-   oac_free(st);
+void oac_custom_encoder_destroy(CELTEncoder *st) {
+    oac_free(st);
 }
 #endif /* CUSTOM_MODES */
 
 
 static int transient_analysis(const oac_val32 * OAC_RESTRICT in, int len, int C,
                               oac_val16 *tf_estimate, int *tf_chan, int allow_weak_transients,
-                              int *weak_transient, oac_val16 tone_freq, oac_val32 toneishness)
-{
-   int i;
-   VARDECL(oac_val16, tmp);
-   oac_val32 mem0,mem1;
-   int is_transient = 0;
-   oac_int32 mask_metric = 0;
-   int c;
-   oac_val16 tf_max;
-   int len2;
-   /* Forward masking: 6.7 dB/ms. */
+                              int *weak_transient, oac_val16 tone_freq, oac_val32 toneishness) {
+    int i;
+    VARDECL(oac_val16, tmp);
+    oac_val32 mem0, mem1;
+    int is_transient = 0;
+    oac_int32 mask_metric = 0;
+    int c;
+    oac_val16 tf_max;
+    int len2;
+    /* Forward masking: 6.7 dB/ms. */
 #ifdef FIXED_POINT
-   int forward_shift = 4;
+    int forward_shift = 4;
 #else
-   oac_val16 forward_decay = QCONST16(.0625f,15);
+    oac_val16 forward_decay = QCONST16(.0625f, 15);
 #endif
-   /* Table of 6*64/x, trained on real data to minimize the average error */
-   static const unsigned char inv_table[128] = {
-         255,255,156,110, 86, 70, 59, 51, 45, 40, 37, 33, 31, 28, 26, 25,
-          23, 22, 21, 20, 19, 18, 17, 16, 16, 15, 15, 14, 13, 13, 12, 12,
-          12, 12, 11, 11, 11, 10, 10, 10,  9,  9,  9,  9,  9,  9,  8,  8,
-           8,  8,  8,  7,  7,  7,  7,  7,  7,  6,  6,  6,  6,  6,  6,  6,
-           6,  6,  6,  6,  6,  6,  6,  6,  6,  5,  5,  5,  5,  5,  5,  5,
-           5,  5,  5,  5,  5,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
-           4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  3,  3,
-           3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  2,
-   };
-   SAVE_STACK;
+    /* Table of 6*64/x, trained on real data to minimize the average error */
+    static const unsigned char inv_table[128] = {
+        255, 255, 156, 110, 86, 70, 59, 51, 45, 40, 37, 33, 31, 28, 26, 25,
+        23, 22, 21, 20, 19, 18, 17, 16, 16, 15, 15, 14, 13, 13, 12, 12,
+        12, 12, 11, 11, 11, 10, 10, 10,  9,  9,  9,  9,  9,  9,  8,  8,
+        8,  8,  8,  7,  7,  7,  7,  7,  7,  6,  6,  6,  6,  6,  6,  6,
+        6,  6,  6,  6,  6,  6,  6,  6,  6,  5,  5,  5,  5,  5,  5,  5,
+        5,  5,  5,  5,  5,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
+        4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  3,  3,
+        3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  2,
+    };
+    SAVE_STACK;
 #ifdef FIXED_POINT
-   int in_shift = IMAX(0, celt_ilog2(1+celt_maxabs32(in, C*len))-14);
+    int in_shift = IMAX(0, celt_ilog2(1 + celt_maxabs32(in, C*len)) - 14);
 #endif
-   ALLOC(tmp, len, oac_val16);
-
-   *weak_transient = 0;
-   /* For lower bitrates, let's be more conservative and have a forward masking
-      decay of 3.3 dB/ms. This avoids having to code transients at very low
-      bitrate (mostly for hybrid), which can result in unstable energy and/or
-      partial collapse. */
-   if (allow_weak_transients)
-   {
+    ALLOC(tmp, len, oac_val16);
+
+    *weak_transient = 0;
+    /* For lower bitrates, let's be more conservative and have a forward masking
+       decay of 3.3 dB/ms. This avoids having to code transients at very low
+       bitrate (mostly for hybrid), which can result in unstable energy and/or
+       partial collapse. */
+    if (allow_weak_transients) {
 #ifdef FIXED_POINT
-      forward_shift = 5;
+        forward_shift = 5;
 #else
-      forward_decay = QCONST16(.03125f,15);
+        forward_decay = QCONST16(.03125f, 15);
 #endif
-   }
-   len2=len/2;
-   for (c=0;c<C;c++)
-   {
-      oac_val32 mean;
-      oac_int32 unmask=0;
-      oac_val32 norm;
-      oac_val16 maxE;
-      mem0=0;
-      mem1=0;
-      /* High-pass filter: (1 - 2*z^-1 + z^-2) / (1 - z^-1 + .5*z^-2) */
-      for (i=0;i<len;i++)
-      {
+    }
+    len2 = len/2;
+    for (c = 0; c < C; c++) {
+        oac_val32 mean;
+        oac_int32 unmask = 0;
+        oac_val32 norm;
+        oac_val16 maxE;
+        mem0 = 0;
+        mem1 = 0;
+        /* High-pass filter: (1 - 2*z^-1 + z^-2) / (1 - z^-1 + .5*z^-2) */
+        for (i = 0; i < len; i++) {
 #ifndef FIXED_POINT
-         float mem00;
+            float mem00;
 #endif
-         oac_val32 x,y;
-         x = SHR32(in[i+c*len],in_shift);
-         y = ADD32(mem0, x);
+            oac_val32 x, y;
+            x = SHR32(in[i + c*len], in_shift);
+            y = ADD32(mem0, x);
 #ifdef FIXED_POINT
-         mem0 = mem1 + y - SHL32(x,1);
-         mem1 = x - SHR32(y,1);
+            mem0 = mem1 + y - SHL32(x, 1);
+            mem1 = x - SHR32(y, 1);
 #else
-         /* Original code:
-         mem0 = mem1 + y - 2*x;
-         mem1 = x - .5f*y;
-         Modified code to shorten dependency chains: */
-         mem00=mem0;
-         mem0 = mem0 - x + .5f*mem1;
-         mem1 =  x - mem00;
+            /* Original code:
+               mem0 = mem1 + y - 2*x;
+               mem1 = x - .5f*y;
+               Modified code to shorten dependency chains: */
+            mem00 = mem0;
+            mem0 = mem0 - x + .5f*mem1;
+            mem1 =  x - mem00;
 #endif
-         tmp[i] = SROUND16(y, 2);
-         /*printf("%f ", tmp[i]);*/
-      }
-      /*printf("\n");*/
-      /* First few samples are bad because we don't propagate the memory */
-      OAC_CLEAR(tmp, 12);
+            tmp[i] = SROUND16(y, 2);
+            /*printf("%f ", tmp[i]);*/
+        }
+        /*printf("\n");*/
+        /* First few samples are bad because we don't propagate the memory */
+        OAC_CLEAR(tmp, 12);
 
 #ifdef FIXED_POINT
-      /* Normalize tmp to max range */
-      {
-         int shift=0;
-         shift = 14-celt_ilog2(MAX16(1, celt_maxabs16(tmp, len)));
-         if (shift!=0)
-         {
-            for (i=0;i<len;i++)
-               tmp[i] = SHL16(tmp[i], shift);
-         }
-      }
+        /* Normalize tmp to max range */
+        {
+            int shift = 0;
+            shift = 14 - celt_ilog2(MAX16(1, celt_maxabs16(tmp, len)));
+            if (shift != 0) {
+                for (i = 0; i < len; i++)
+                    tmp[i] = SHL16(tmp[i], shift);
+            }
+        }
 #endif
 
-      mean=0;
-      mem0=0;
-      /* Grouping by two to reduce complexity */
-      /* Forward pass to compute the post-echo threshold*/
-      for (i=0;i<len2;i++)
-      {
-         oac_val32 x2 = PSHR32(MULT16_16(tmp[2*i],tmp[2*i]) + MULT16_16(tmp[2*i+1],tmp[2*i+1]),4);
-         mean += PSHR32(x2, 12);
+        mean = 0;
+        mem0 = 0;
+        /* Grouping by two to reduce complexity */
+        /* Forward pass to compute the post-echo threshold*/
+        for (i = 0; i < len2; i++) {
+            oac_val32 x2 = PSHR32(MULT16_16(tmp[2*i], tmp[2*i]) + MULT16_16(tmp[2*i + 1], tmp[2*i + 1]), 4);
+            mean += PSHR32(x2, 12);
 #ifdef FIXED_POINT
-         /* FIXME: Use PSHR16() instead */
-         mem0 = mem0 + PSHR32(x2-mem0,forward_shift);
-         tmp[i] = PSHR32(mem0, 12);
+            /* FIXME: Use PSHR16() instead */
+            mem0 = mem0 + PSHR32(x2 - mem0, forward_shift);
+            tmp[i] = PSHR32(mem0, 12);
 #else
-         mem0 = x2 + (1.f-forward_decay)*mem0;
-         tmp[i] = forward_decay*mem0;
+            mem0 = x2 + (1.f - forward_decay)*mem0;
+            tmp[i] = forward_decay*mem0;
 #endif
-      }
-
-      mem0=0;
-      maxE=0;
-      /* Backward pass to compute the pre-echo threshold */
-      for (i=len2-1;i>=0;i--)
-      {
-         /* Backward masking: 13.9 dB/ms. */
+        }
+
+        mem0 = 0;
+        maxE = 0;
+        /* Backward pass to compute the pre-echo threshold */
+        for (i = len2 - 1; i >= 0; i--) {
+            /* Backward masking: 13.9 dB/ms. */
 #ifdef FIXED_POINT
-         /* FIXME: Use PSHR16() instead */
-         mem0 = mem0 + PSHR32(SHL32(tmp[i],4)-mem0,3);
-         tmp[i] = PSHR32(mem0, 4);
-         maxE = MAX16(maxE, tmp[i]);
+            /* FIXME: Use PSHR16() instead */
+            mem0 = mem0 + PSHR32(SHL32(tmp[i], 4) - mem0, 3);
+            tmp[i] = PSHR32(mem0, 4);
+            maxE = MAX16(maxE, tmp[i]);
 #else
-         mem0 = tmp[i] + 0.875f*mem0;
-         tmp[i] = 0.125f*mem0;
-         maxE = MAX16(maxE, 0.125f*mem0);
+            mem0 = tmp[i] + 0.875f*mem0;
+            tmp[i] = 0.125f*mem0;
+            maxE = MAX16(maxE, 0.125f*mem0);
 #endif
-      }
-      /*for (i=0;i<len2;i++)printf("%f ", tmp[i]/mean);printf("\n");*/
+        }
+        /*for (i=0;i<len2;i++)printf("%f ", tmp[i]/mean);printf("\n");*/
 
-      /* Compute the ratio of the "frame energy" over the harmonic mean of the energy.
-         This essentially corresponds to a bitrate-normalized temporal noise-to-mask
-         ratio */
+        /* Compute the ratio of the "frame energy" over the harmonic mean of the energy.
+           This essentially corresponds to a bitrate-normalized temporal noise-to-mask
+           ratio */
 
-      /* As a compromise with the old transient detector, frame energy is the
-         geometric mean of the energy and half the max */
+        /* As a compromise with the old transient detector, frame energy is the
+           geometric mean of the energy and half the max */
 #ifdef FIXED_POINT
-      /* Costs two sqrt() to avoid overflows */
-      mean = MULT16_16(celt_sqrt(mean), celt_sqrt(MULT16_16(maxE,len2>>1)));
+        /* Costs two sqrt() to avoid overflows */
+        mean = MULT16_16(celt_sqrt(mean), celt_sqrt(MULT16_16(maxE, len2>>1)));
 #else
-      mean = celt_sqrt(mean * maxE*.5*len2);
+        mean = celt_sqrt(mean*maxE*.5*len2);
 #endif
-      /* Inverse of the mean energy in Q15+6 */
-      norm = SHL32(EXTEND32(len2),6+14)/ADD32(EPSILON,SHR32(mean,1));
-      /* Compute harmonic mean discarding the unreliable boundaries
-         The data is smooth, so we only take 1/4th of the samples */
-      unmask=0;
-      /* We should never see NaNs here. If we find any, then something really bad happened and we better abort
-         before it does any damage later on. If these asserts are disabled (no hardening), then the table
-         lookup a few lines below (id = ...) is likely to crash dur to an out-of-bounds read. DO NOT FIX
-         that crash on NaN since it could result in a worse issue later on. */
-      celt_assert(!celt_isnan(tmp[0]));
-      celt_assert(!celt_isnan(norm));
-      for (i=12;i<len2-5;i+=4)
-      {
-         int id;
+        /* Inverse of the mean energy in Q15+6 */
+        norm = SHL32(EXTEND32(len2), 6 + 14)/ADD32(EPSILON, SHR32(mean, 1));
+        /* Compute harmonic mean discarding the unreliable boundaries
+           The data is smooth, so we only take 1/4th of the samples */
+        unmask = 0;
+        /* We should never see NaNs here. If we find any, then something really bad happened and we better abort
+           before it does any damage later on. If these asserts are disabled (no hardening), then the table
+           lookup a few lines below (id = ...) is likely to crash dur to an out-of-bounds read. DO NOT FIX
+           that crash on NaN since it could result in a worse issue later on. */
+        celt_assert(!celt_isnan(tmp[0]));
+        celt_assert(!celt_isnan(norm));
+        for (i = 12; i < len2 - 5; i += 4) {
+            int id;
 #ifdef FIXED_POINT
-         id = MAX32(0,MIN32(127,MULT16_32_Q15(tmp[i]+EPSILON,norm))); /* Do not round to nearest */
+            id = MAX32(0, MIN32(127, MULT16_32_Q15(tmp[i] + EPSILON, norm))); /* Do not round to nearest */
 #else
-         id = (int)MAX32(0,MIN32(127,floor(64*norm*(tmp[i]+EPSILON)))); /* Do not round to nearest */
+            id = (int)MAX32(0, MIN32(127, floor(64*norm*(tmp[i] + EPSILON)))); /* Do not round to nearest */
 #endif
-         unmask += inv_table[id];
-      }
-      /*printf("%d\n", unmask);*/
-      /* Normalize, compensate for the 1/4th of the sample and the factor of 6 in the inverse table */
-      unmask = 64*unmask*4/(6*(len2-17));
-      if (unmask>mask_metric)
-      {
-         *tf_chan = c;
-         mask_metric = unmask;
-      }
-   }
-   is_transient = mask_metric>200;
-   /* Prevent the transient detector from confusing the partial cycle of a
-      very low frequency tone with a transient. */
-   if (toneishness > QCONST32(.98f, 29) && tone_freq < QCONST16(0.026f, 13))
-   {
-      is_transient = 0;
-      mask_metric = 0;
-   }
-   /* For low bitrates, define "weak transients" that need to be
-      handled differently to avoid partial collapse. */
-   if (allow_weak_transients && is_transient && mask_metric<600) {
-      is_transient = 0;
-      *weak_transient = 1;
-   }
-   /* Arbitrary metric for VBR boost */
-   tf_max = MAX16(0,celt_sqrt(27*mask_metric)-42);
-   /* *tf_estimate = 1 + MIN16(1, sqrt(MAX16(0, tf_max-30))/20); */
-   *tf_estimate = celt_sqrt(MAX32(0, SHL32(MULT16_16(QCONST16(0.0069,14),MIN16(163,tf_max)),14)-QCONST32(0.139,28)));
-   /*printf("%d %f\n", tf_max, mask_metric);*/
-   RESTORE_STACK;
+            unmask += inv_table[id];
+        }
+        /*printf("%d\n", unmask);*/
+        /* Normalize, compensate for the 1/4th of the sample and the factor of 6 in the inverse table */
+        unmask = 64*unmask*4/(6*(len2 - 17));
+        if (unmask > mask_metric) {
+            *tf_chan = c;
+            mask_metric = unmask;
+        }
+    }
+    is_transient = mask_metric > 200;
+    /* Prevent the transient detector from confusing the partial cycle of a
+       very low frequency tone with a transient. */
+    if (toneishness > QCONST32(.98f, 29) && tone_freq < QCONST16(0.026f, 13)) {
+        is_transient = 0;
+        mask_metric = 0;
+    }
+    /* For low bitrates, define "weak transients" that need to be
+       handled differently to avoid partial collapse. */
+    if (allow_weak_transients && is_transient && mask_metric < 600) {
+        is_transient = 0;
+        *weak_transient = 1;
+    }
+    /* Arbitrary metric for VBR boost */
+    tf_max = MAX16(0, celt_sqrt(27*mask_metric) - 42);
+    /* *tf_estimate = 1 + MIN16(1, sqrt(MAX16(0, tf_max-30))/20); */
+    *tf_estimate = celt_sqrt(MAX32(0,
+    SHL32(MULT16_16(QCONST16(0.0069, 14), MIN16(163, tf_max)), 14) - QCONST32(0.139, 28)));
+    /*printf("%d %f\n", tf_max, mask_metric);*/
+    RESTORE_STACK;
 #ifdef FUZZING
-   is_transient = rand()&0x1;
+    is_transient = rand()&0x1;
 #endif
-   /*printf("%d %f %d\n", is_transient, (float)*tf_estimate, tf_max);*/
-   return is_transient;
+    /*printf("%d %f %d\n", is_transient, (float)*tf_estimate, tf_max);*/
+    return is_transient;
 }
 
 /* Looks for sudden increases of energy to decide whether we need to patch
    the transient decision */
 static int patch_transient_decision(celt_glog *newE, celt_glog *oldE, int nbEBands,
-      int start, int end, int C)
-{
-   int i, c;
-   oac_val32 mean_diff=0;
-   celt_glog spread_old[26];
-   /* Apply an aggressive (-6 dB/Bark) spreading function to the old frame to
-      avoid false detection caused by irrelevant bands */
-   if (C==1)
-   {
-      spread_old[start] = oldE[start];
-      for (i=start+1;i<end;i++)
-         spread_old[i] = MAXG(spread_old[i-1]-GCONST(1.0f), oldE[i]);
-   } else {
-      spread_old[start] = MAXG(oldE[start],oldE[start+nbEBands]);
-      for (i=start+1;i<end;i++)
-         spread_old[i] = MAXG(spread_old[i-1]-GCONST(1.0f),
-                               MAXG(oldE[i],oldE[i+nbEBands]));
-   }
-   for (i=end-2;i>=start;i--)
-      spread_old[i] = MAXG(spread_old[i], spread_old[i+1]-GCONST(1.0f));
-   /* Compute mean increase */
-   c=0; do {
-      for (i=IMAX(2,start);i<end-1;i++)
-      {
-         oac_val16 x1, x2;
-         x1 = MAXG(0, newE[i + c*nbEBands]);
-         x2 = MAXG(0, spread_old[i]);
-         mean_diff = ADD32(mean_diff, MAXG(0, SUB32(x1, x2)));
-      }
-   } while (++c<C);
-   mean_diff = DIV32(mean_diff, C*(end-1-IMAX(2,start)));
-   /*printf("%f %f %d\n", mean_diff, max_diff, count);*/
-   return mean_diff > GCONST(1.f);
+                                    int start, int end, int C) {
+    int i, c;
+    oac_val32 mean_diff = 0;
+    celt_glog spread_old[26];
+    /* Apply an aggressive (-6 dB/Bark) spreading function to the old frame to
+       avoid false detection caused by irrelevant bands */
+    if (C == 1) {
+        spread_old[start] = oldE[start];
+        for (i = start + 1; i < end; i++)
+            spread_old[i] = MAXG(spread_old[i - 1] - GCONST(1.0f), oldE[i]);
+    } else {
+        spread_old[start] = MAXG(oldE[start], oldE[start + nbEBands]);
+        for (i = start + 1; i < end; i++)
+            spread_old[i] = MAXG(spread_old[i - 1] - GCONST(1.0f),
+                               MAXG(oldE[i], oldE[i + nbEBands]));
+    }
+    for (i = end - 2; i >= start; i--)
+        spread_old[i] = MAXG(spread_old[i], spread_old[i + 1] - GCONST(1.0f));
+    /* Compute mean increase */
+    c = 0; do {
+        for (i = IMAX(2, start); i < end - 1; i++) {
+            oac_val16 x1, x2;
+            x1 = MAXG(0, newE[i + c*nbEBands]);
+            x2 = MAXG(0, spread_old[i]);
+            mean_diff = ADD32(mean_diff, MAXG(0, SUB32(x1, x2)));
+        }
+    } while (++c < C);
+    mean_diff = DIV32(mean_diff, C*(end - 1 - IMAX(2, start)));
+    /*printf("%f %f %d\n", mean_diff, max_diff, count);*/
+    return mean_diff > GCONST(1.f);
 }
 
 /** 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 * OAC_RESTRICT in,
                           celt_sig * OAC_RESTRICT out, int C, int CC, int LM, int upsample,
-                          int arch)
-{
-   const int overlap = mode->overlap;
-   int N;
-   int B;
-   int shift;
-   int i, b, c;
-   if (shortBlocks)
-   {
-      B = shortBlocks;
-      N = mode->shortMdctSize;
-      shift = mode->maxLM;
-   } else {
-      B = 1;
-      N = mode->shortMdctSize<<LM;
-      shift = mode->maxLM-LM;
-   }
-   c=0; do {
-      for (b=0;b<B;b++)
-      {
-         /* Interleaving the sub-frames while doing the MDCTs */
-         clt_mdct_forward(&mode->mdct, in+c*(B*N+overlap)+b*N,
-                          &out[b+c*N*B], mode->window, overlap, shift, B,
+                          int arch) {
+    const int overlap = mode->overlap;
+    int N;
+    int B;
+    int shift;
+    int i, b, c;
+    if (shortBlocks) {
+        B = shortBlocks;
+        N = mode->shortMdctSize;
+        shift = mode->maxLM;
+    } else {
+        B = 1;
+        N = mode->shortMdctSize<<LM;
+        shift = mode->maxLM - LM;
+    }
+    c = 0; do {
+        for (b = 0; b < B; b++) {
+            /* Interleaving the sub-frames while doing the MDCTs */
+            clt_mdct_forward(&mode->mdct, in + c*(B*N + overlap) + b*N,
+                          &out[b + c*N*B], mode->window, overlap, shift, B,
                           arch);
-      }
-   } while (++c<CC);
-   if (CC==2&&C==1)
-   {
-      for (i=0;i<B*N;i++)
-         out[i] = ADD32(HALF32(out[i]), HALF32(out[B*N+i]));
-   }
-   if (upsample != 1)
-   {
-      c=0; do
-      {
-         int bound = B*N/upsample;
-         for (i=0;i<bound;i++)
-            out[c*B*N+i] *= upsample;
-         OAC_CLEAR(&out[c*B*N+bound], B*N-bound);
-      } while (++c<C);
-   }
+        }
+    } while (++c < CC);
+    if (CC == 2 && C == 1) {
+        for (i = 0; i < B*N; i++)
+            out[i] = ADD32(HALF32(out[i]), HALF32(out[B*N + i]));
+    }
+    if (upsample != 1) {
+        c = 0; do {
+            int bound = B*N/upsample;
+            for (i = 0; i < bound; i++)
+                out[c*B*N + i] *= upsample;
+            OAC_CLEAR(&out[c*B*N + bound], B*N - bound);
+        } while (++c < C);
+    }
 }
 
 
 void celt_preemphasis(const oac_res * OAC_RESTRICT pcmp, celt_sig * OAC_RESTRICT inp,
-                        int N, int CC, int upsample, const oac_val16 *coef, celt_sig *mem, int clip)
-{
-   int i;
-   oac_val16 coef0;
-   celt_sig m;
-   int Nu;
-
-   coef0 = coef[0];
-   m = *mem;
-
-   /* Fast path for the normal 48kHz case and no clipping */
-   if (coef[1] == 0 && upsample == 1 && !clip)
-   {
-      for (i=0;i<N;i++)
-      {
-         celt_sig x;
-         x = RES2SIG(pcmp[CC*i]);
-         /* Apply pre-emphasis */
-         inp[i] = x - m;
-         m = MULT16_32_Q15(coef0, x);
-      }
-      *mem = m;
-      return;
-   }
-
-   Nu = N/upsample;
-   if (upsample!=1)
-   {
-      OAC_CLEAR(inp, N);
-   }
-   for (i=0;i<Nu;i++)
-      inp[i*upsample] = RES2SIG(pcmp[CC*i]);
-
-   if (clip)
-   {
-      /* Clip input to avoid encoding non-portable files */
-      for (i=0;i<Nu;i++)
-         inp[i*upsample] = MAX32(-QCONST32(65536.f, SIG_SHIFT), MIN32(QCONST32(65536.f, SIG_SHIFT), inp[i*upsample]));
-   }
+                      int N, int CC, int upsample, const oac_val16 *coef, celt_sig *mem, int clip) {
+    int i;
+    oac_val16 coef0;
+    celt_sig m;
+    int Nu;
+
+    coef0 = coef[0];
+    m = *mem;
+
+    /* Fast path for the normal 48kHz case and no clipping */
+    if (coef[1] == 0 && upsample == 1 && !clip) {
+        for (i = 0; i < N; i++) {
+            celt_sig x;
+            x = RES2SIG(pcmp[CC*i]);
+            /* Apply pre-emphasis */
+            inp[i] = x - m;
+            m = MULT16_32_Q15(coef0, x);
+        }
+        *mem = m;
+        return;
+    }
+
+    Nu = N/upsample;
+    if (upsample != 1) {
+        OAC_CLEAR(inp, N);
+    }
+    for (i = 0; i < Nu; i++)
+        inp[i*upsample] = RES2SIG(pcmp[CC*i]);
+
+    if (clip) {
+        /* Clip input to avoid encoding non-portable files */
+        for (i = 0; i < Nu; i++)
+            inp[i*upsample] = MAX32(-QCONST32(65536.f, SIG_SHIFT),
+            MIN32(QCONST32(65536.f, SIG_SHIFT), inp[i*upsample]));
+    }
 #if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API) || defined(ENABLE_QEXT)
-   if (coef[1] != 0)
-   {
-      oac_val16 coef1 = coef[1];
-#if defined(FIXED_POINT)
-      /* If we need the extra precision, we use the fact that coef[3] is exact to do a Newton-Raphson
-         iteration and get us more precision on coef[2]. */
-      oac_val32 coef2_q30 = SHL32(coef[2], 18) + PSHR32(MULT16_16(QCONST32(1.f, 25) - MULT16_16(coef[3], coef[2]), coef[2]), 7);
-      celt_assert(SIG_SHIFT == 12);
-#else
-      oac_val32 coef2_q30 = coef[2];
-#endif
-      for (i=0;i<N;i++)
-      {
-         celt_sig x, tmp;
-         x = inp[i];
-         /* Apply pre-emphasis */
-         tmp = SHL32(MULT32_32_Q31(coef2_q30, x), 1);
-         inp[i] = tmp + m;
-         m = MULT16_32_Q15(coef1, inp[i]) - MULT16_32_Q15(coef0, tmp);
-      }
-   } else
+    if (coef[1] != 0) {
+        oac_val16 coef1 = coef[1];
+# if defined(FIXED_POINT)
+        /* If we need the extra precision, we use the fact that coef[3] is exact to do a Newton-Raphson
+           iteration and get us more precision on coef[2]. */
+        oac_val32 coef2_q30 = SHL32(coef[2],
+        18) + PSHR32(MULT16_16(QCONST32(1.f, 25) - MULT16_16(coef[3], coef[2]), coef[2]), 7);
+        celt_assert(SIG_SHIFT == 12);
+# else
+        oac_val32 coef2_q30 = coef[2];
+# endif
+        for (i = 0; i < N; i++) {
+            celt_sig x, tmp;
+            x = inp[i];
+            /* Apply pre-emphasis */
+            tmp = SHL32(MULT32_32_Q31(coef2_q30, x), 1);
+            inp[i] = tmp + m;
+            m = MULT16_32_Q15(coef1, inp[i]) - MULT16_32_Q15(coef0, tmp);
+        }
+    } else
 #endif
-   {
-      for (i=0;i<N;i++)
-      {
-         celt_sig x;
-         x = inp[i];
-         /* Apply pre-emphasis */
-         inp[i] = x - m;
-         m = MULT16_32_Q15(coef0, x);
-      }
-   }
-   *mem = m;
+    {
+        for (i = 0; i < N; i++) {
+            celt_sig x;
+            x = inp[i];
+            /* Apply pre-emphasis */
+            inp[i] = x - m;
+            m = MULT16_32_Q15(coef0, x);
+        }
+    }
+    *mem = m;
 }
 
 
 
-static oac_val32 l1_metric(const celt_norm *tmp, int N, int LM, oac_val16 bias)
-{
-   int i;
-   oac_val32 L1;
-   L1 = 0;
-   for (i=0;i<N;i++)
-      L1 += EXTEND32(ABS16(SHR32(tmp[i], NORM_SHIFT-14)));
-   /* When in doubt, prefer good freq resolution */
-   L1 = MAC16_32_Q15(L1, LM*bias, L1);
-   return L1;
+static oac_val32 l1_metric(const celt_norm *tmp, int N, int LM, oac_val16 bias) {
+    int i;
+    oac_val32 L1;
+    L1 = 0;
+    for (i = 0; i < N; i++)
+        L1 += EXTEND32(ABS16(SHR32(tmp[i], NORM_SHIFT - 14)));
+    /* When in doubt, prefer good freq resolution */
+    L1 = MAC16_32_Q15(L1, LM*bias, L1);
+    return L1;
 
 }
 
 static int tf_analysis(const CELTMode *m, int len, int isTransient,
-      int *tf_res, int lambda, celt_norm *X, int N0, int LM,
-      oac_val16 tf_estimate, int tf_chan, int *importance)
-{
-   int i;
-   VARDECL(int, metric);
-   int cost0;
-   int cost1;
-   VARDECL(int, path0);
-   VARDECL(int, path1);
-   VARDECL(celt_norm, tmp);
-   VARDECL(celt_norm, tmp_1);
-   int sel;
-   int selcost[2];
-   int tf_select=0;
-   oac_val16 bias;
-
-   SAVE_STACK;
-   bias = MULT16_16_Q14(QCONST16(.04f,15), MAX16(-QCONST16(.25f,14), QCONST16(.5f,14)-tf_estimate));
-   /*printf("%f ", bias);*/
-
-   ALLOC(metric, len, int);
-   ALLOC(tmp, (m->eBands[len]-m->eBands[len-1])<<LM, celt_norm);
-   ALLOC(tmp_1, (m->eBands[len]-m->eBands[len-1])<<LM, celt_norm);
-   ALLOC(path0, len, int);
-   ALLOC(path1, len, int);
-
-   for (i=0;i<len;i++)
-   {
-      int k, N;
-      int narrow;
-      oac_val32 L1, best_L1;
-      int best_level=0;
-      N = (m->eBands[i+1]-m->eBands[i])<<LM;
-      /* band is too narrow to be split down to LM=-1 */
-      narrow = (m->eBands[i+1]-m->eBands[i])==1;
-      OAC_COPY(tmp, &X[tf_chan*N0 + (m->eBands[i]<<LM)], N);
-      /* Just add the right channel if we're in stereo */
-      /*if (C==2)
-         for (j=0;j<N;j++)
-            tmp[j] = ADD16(SHR16(tmp[j], 1),SHR16(X[N0+j+(m->eBands[i]<<LM)], 1));*/
-      L1 = l1_metric(tmp, N, isTransient ? LM : 0, bias);
-      best_L1 = L1;
-      /* Check the -1 case for transients */
-      if (isTransient && !narrow)
-      {
-         OAC_COPY(tmp_1, tmp, N);
-         haar1(tmp_1, N>>LM, 1<<LM);
-         L1 = l1_metric(tmp_1, N, LM+1, bias);
-         if (L1<best_L1)
-         {
-            best_L1 = L1;
-            best_level = -1;
-         }
-      }
-      /*printf ("%f ", L1);*/
-      for (k=0;k<LM+!(isTransient||narrow);k++)
-      {
-         int B;
-
-         if (isTransient)
-            B = (LM-k-1);
-         else
-            B = k+1;
-
-         haar1(tmp, N>>k, 1<<k);
-
-         L1 = l1_metric(tmp, N, B, bias);
-
-         if (L1 < best_L1)
-         {
-            best_L1 = L1;
-            best_level = k+1;
-         }
-      }
-      /*printf ("%d ", isTransient ? LM-best_level : best_level);*/
-      /* metric is in Q1 to be able to select the mid-point (-0.5) for narrower bands */
-      if (isTransient)
-         metric[i] = 2*best_level;
-      else
-         metric[i] = -2*best_level;
-      /* For bands that can't be split to -1, set the metric to the half-way point to avoid
-         biasing the decision */
-      if (narrow && (metric[i]==0 || metric[i]==-2*LM))
-         metric[i]-=1;
-      /*printf("%d ", metric[i]/2 + (!isTransient)*LM);*/
-   }
-   /*printf("\n");*/
-   /* Search for the optimal tf resolution, including tf_select */
-   tf_select = 0;
-   for (sel=0;sel<2;sel++)
-   {
-      cost0 = importance[0]*abs(metric[0]-2*tf_select_table[LM][4*isTransient+2*sel+0]);
-      cost1 = importance[0]*abs(metric[0]-2*tf_select_table[LM][4*isTransient+2*sel+1]) + (isTransient ? 0 : lambda);
-      for (i=1;i<len;i++)
-      {
-         int curr0, curr1;
-         curr0 = IMIN(cost0, cost1 + lambda);
-         curr1 = IMIN(cost0 + lambda, cost1);
-         cost0 = curr0 + importance[i]*abs(metric[i]-2*tf_select_table[LM][4*isTransient+2*sel+0]);
-         cost1 = curr1 + importance[i]*abs(metric[i]-2*tf_select_table[LM][4*isTransient+2*sel+1]);
-      }
-      cost0 = IMIN(cost0, cost1);
-      selcost[sel]=cost0;
-   }
-   /* For now, we're conservative and only allow tf_select=1 for transients.
-    * If tests confirm it's useful for non-transients, we could allow it. */
-   if (selcost[1]<selcost[0] && isTransient)
-      tf_select=1;
-   cost0 = importance[0]*abs(metric[0]-2*tf_select_table[LM][4*isTransient+2*tf_select+0]);
-   cost1 = importance[0]*abs(metric[0]-2*tf_select_table[LM][4*isTransient+2*tf_select+1]) + (isTransient ? 0 : lambda);
-   /* Viterbi forward pass */
-   for (i=1;i<len;i++)
-   {
-      int curr0, curr1;
-      int from0, from1;
-
-      from0 = cost0;
-      from1 = cost1 + lambda;
-      if (from0 < from1)
-      {
-         curr0 = from0;
-         path0[i]= 0;
-      } else {
-         curr0 = from1;
-         path0[i]= 1;
-      }
-
-      from0 = cost0 + lambda;
-      from1 = cost1;
-      if (from0 < from1)
-      {
-         curr1 = from0;
-         path1[i]= 0;
-      } else {
-         curr1 = from1;
-         path1[i]= 1;
-      }
-      cost0 = curr0 + importance[i]*abs(metric[i]-2*tf_select_table[LM][4*isTransient+2*tf_select+0]);
-      cost1 = curr1 + importance[i]*abs(metric[i]-2*tf_select_table[LM][4*isTransient+2*tf_select+1]);
-   }
-   tf_res[len-1] = cost0 < cost1 ? 0 : 1;
-   /* Viterbi backward pass to check the decisions */
-   for (i=len-2;i>=0;i--)
-   {
-      if (tf_res[i+1] == 1)
-         tf_res[i] = path1[i+1];
-      else
-         tf_res[i] = path0[i+1];
-   }
-   /*printf("%d %f\n", *tf_sum, tf_estimate);*/
-   RESTORE_STACK;
+                       int *tf_res, int lambda, celt_norm *X, int N0, int LM,
+                       oac_val16 tf_estimate, int tf_chan, int *importance) {
+    int i;
+    VARDECL(int, metric);
+    int cost0;
+    int cost1;
+    VARDECL(int, path0);
+    VARDECL(int, path1);
+    VARDECL(celt_norm, tmp);
+    VARDECL(celt_norm, tmp_1);
+    int sel;
+    int selcost[2];
+    int tf_select = 0;
+    oac_val16 bias;
+
+    SAVE_STACK;
+    bias = MULT16_16_Q14(QCONST16(.04f, 15), MAX16(-QCONST16(.25f, 14), QCONST16(.5f, 14) - tf_estimate));
+    /*printf("%f ", bias);*/
+
+    ALLOC(metric, len, int);
+    ALLOC(tmp, (m->eBands[len] - m->eBands[len - 1])<<LM, celt_norm);
+    ALLOC(tmp_1, (m->eBands[len] - m->eBands[len - 1])<<LM, celt_norm);
+    ALLOC(path0, len, int);
+    ALLOC(path1, len, int);
+
+    for (i = 0; i < len; i++) {
+        int k, N;
+        int narrow;
+        oac_val32 L1, best_L1;
+        int best_level = 0;
+        N = (m->eBands[i + 1] - m->eBands[i])<<LM;
+        /* band is too narrow to be split down to LM=-1 */
+        narrow = (m->eBands[i + 1] - m->eBands[i]) == 1;
+        OAC_COPY(tmp, &X[tf_chan*N0 + (m->eBands[i]<<LM)], N);
+        /* Just add the right channel if we're in stereo */
+        /*if (C==2)
+           for (j=0;j<N;j++)
+              tmp[j] = ADD16(SHR16(tmp[j], 1),SHR16(X[N0+j+(m->eBands[i]<<LM)], 1));*/
+        L1 = l1_metric(tmp, N, isTransient ? LM : 0, bias);
+        best_L1 = L1;
+        /* Check the -1 case for transients */
+        if (isTransient && !narrow) {
+            OAC_COPY(tmp_1, tmp, N);
+            haar1(tmp_1, N>>LM, 1<<LM);
+            L1 = l1_metric(tmp_1, N, LM + 1, bias);
+            if (L1 < best_L1) {
+                best_L1 = L1;
+                best_level = -1;
+            }
+        }
+        /*printf ("%f ", L1);*/
+        for (k = 0; k < LM + !(isTransient || narrow); k++) {
+            int B;
+
+            if (isTransient)
+                B = (LM - k - 1);
+            else
+                B = k + 1;
+
+            haar1(tmp, N>>k, 1<<k);
+
+            L1 = l1_metric(tmp, N, B, bias);
+
+            if (L1 < best_L1) {
+                best_L1 = L1;
+                best_level = k + 1;
+            }
+        }
+        /*printf ("%d ", isTransient ? LM-best_level : best_level);*/
+        /* metric is in Q1 to be able to select the mid-point (-0.5) for narrower bands */
+        if (isTransient)
+            metric[i] = 2*best_level;
+        else
+            metric[i] = -2*best_level;
+        /* For bands that can't be split to -1, set the metric to the half-way point to avoid
+           biasing the decision */
+        if (narrow && (metric[i] == 0 || metric[i] == -2*LM))
+            metric[i] -= 1;
+        /*printf("%d ", metric[i]/2 + (!isTransient)*LM);*/
+    }
+    /*printf("\n");*/
+    /* Search for the optimal tf resolution, including tf_select */
+    tf_select = 0;
+    for (sel = 0; sel < 2; sel++) {
+        cost0 = importance[0]*abs(metric[0] - 2*tf_select_table[LM][4*isTransient + 2*sel + 0]);
+        cost1 = importance[0]*abs(metric[0] - 2*tf_select_table[LM][4*isTransient + 2*sel + 1])
+                + (isTransient ? 0 : lambda);
+        for (i = 1; i < len; i++) {
+            int curr0, curr1;
+            curr0 = IMIN(cost0, cost1 + lambda);
+            curr1 = IMIN(cost0 + lambda, cost1);
+            cost0 = curr0 + importance[i]*abs(metric[i] - 2*tf_select_table[LM][4*isTransient + 2*sel + 0]);
+            cost1 = curr1 + importance[i]*abs(metric[i] - 2*tf_select_table[LM][4*isTransient + 2*sel + 1]);
+        }
+        cost0 = IMIN(cost0, cost1);
+        selcost[sel] = cost0;
+    }
+    /* For now, we're conservative and only allow tf_select=1 for transients.
+     * If tests confirm it's useful for non-transients, we could allow it. */
+    if (selcost[1] < selcost[0] && isTransient)
+        tf_select = 1;
+    cost0 = importance[0]*abs(metric[0] - 2*tf_select_table[LM][4*isTransient + 2*tf_select + 0]);
+    cost1 = importance[0]*abs(metric[0] - 2*tf_select_table[LM][4*isTransient + 2*tf_select + 1])
+            + (isTransient ? 0 : lambda);
+    /* Viterbi forward pass */
+    for (i = 1; i < len; i++) {
+        int curr0, curr1;
+        int from0, from1;
+
+        from0 = cost0;
+        from1 = cost1 + lambda;
+        if (from0 < from1) {
+            curr0 = from0;
+            path0[i] = 0;
+        } else {
+            curr0 = from1;
+            path0[i] = 1;
+        }
+
+        from0 = cost0 + lambda;
+        from1 = cost1;
+        if (from0 < from1) {
+            curr1 = from0;
+            path1[i] = 0;
+        } else {
+            curr1 = from1;
+            path1[i] = 1;
+        }
+        cost0 = curr0 + importance[i]*abs(metric[i] - 2*tf_select_table[LM][4*isTransient + 2*tf_select + 0]);
+        cost1 = curr1 + importance[i]*abs(metric[i] - 2*tf_select_table[LM][4*isTransient + 2*tf_select + 1]);
+    }
+    tf_res[len - 1] = cost0 < cost1 ? 0 : 1;
+    /* Viterbi backward pass to check the decisions */
+    for (i = len - 2; i >= 0; i--) {
+        if (tf_res[i + 1] == 1)
+            tf_res[i] = path1[i + 1];
+        else
+            tf_res[i] = path0[i + 1];
+    }
+    /*printf("%d %f\n", *tf_sum, tf_estimate);*/
+    RESTORE_STACK;
 #ifdef FUZZING
-   tf_select = rand()&0x1;
-   tf_res[0] = rand()&0x1;
-   for (i=1;i<len;i++)
-      tf_res[i] = tf_res[i-1] ^ ((rand()&0xF) == 0);
+    tf_select = rand()&0x1;
+    tf_res[0] = rand()&0x1;
+    for (i = 1; i < len; i++)
+        tf_res[i] = tf_res[i - 1]^((rand()&0xF) == 0);
 #endif
-   return tf_select;
+    return tf_select;
 }
 
-static void tf_encode(int start, int end, int isTransient, int *tf_res, int LM, int tf_select, ec_enc *enc)
-{
-   int curr, i;
-   int tf_select_rsv;
-   int tf_changed;
-   int logp;
-   oac_uint32 budget;
-   oac_uint32 tell;
-   budget = enc->storage*8;
-   tell = ec_tell(enc);
-   logp = isTransient ? 2 : 4;
-   /* Reserve space to code the tf_select decision. */
-   tf_select_rsv = LM>0 && tell+logp+1 <= budget;
-   budget -= tf_select_rsv;
-   curr = tf_changed = 0;
-   for (i=start;i<end;i++)
-   {
-      if (tell+logp<=budget)
-      {
-         ec_enc_bit_logp(enc, tf_res[i] ^ curr, logp);
-         tell = ec_tell(enc);
-         curr = tf_res[i];
-         tf_changed |= curr;
-      }
-      else
-         tf_res[i] = curr;
-      logp = isTransient ? 4 : 5;
-   }
-   /* Only code tf_select if it would actually make a difference. */
-   if (tf_select_rsv &&
-         tf_select_table[LM][4*isTransient+0+tf_changed]!=
-         tf_select_table[LM][4*isTransient+2+tf_changed])
-      ec_enc_bit_logp(enc, tf_select, 1);
-   else
-      tf_select = 0;
-   for (i=start;i<end;i++)
-      tf_res[i] = tf_select_table[LM][4*isTransient+2*tf_select+tf_res[i]];
-   /*for(i=0;i<end;i++)printf("%d ", isTransient ? tf_res[i] : LM+tf_res[i]);printf("\n");*/
+static void tf_encode(int start, int end, int isTransient, int *tf_res, int LM, int tf_select, ec_enc *enc) {
+    int curr, i;
+    int tf_select_rsv;
+    int tf_changed;
+    int logp;
+    oac_uint32 budget;
+    oac_uint32 tell;
+    budget = enc->storage*8;
+    tell = ec_tell(enc);
+    logp = isTransient ? 2 : 4;
+    /* Reserve space to code the tf_select decision. */
+    tf_select_rsv = LM > 0 && tell + logp + 1 <= budget;
+    budget -= tf_select_rsv;
+    curr = tf_changed = 0;
+    for (i = start; i < end; i++) {
+        if (tell + logp <= budget) {
+            ec_enc_bit_logp(enc, tf_res[i]^curr, logp);
+            tell = ec_tell(enc);
+            curr = tf_res[i];
+            tf_changed |= curr;
+        } else
+            tf_res[i] = curr;
+        logp = isTransient ? 4 : 5;
+    }
+    /* Only code tf_select if it would actually make a difference. */
+    if (tf_select_rsv
+        && tf_select_table[LM][4*isTransient + 0 + tf_changed] !=
+        tf_select_table[LM][4*isTransient + 2 + tf_changed])
+        ec_enc_bit_logp(enc, tf_select, 1);
+    else
+        tf_select = 0;
+    for (i = start; i < end; i++)
+        tf_res[i] = tf_select_table[LM][4*isTransient + 2*tf_select + tf_res[i]];
+    /*for(i=0;i<end;i++)printf("%d ", isTransient ? tf_res[i] : LM+tf_res[i]);printf("\n");*/
 }
 
 
 static int alloc_trim_analysis(const CELTMode *m, const celt_norm *X,
-      const celt_glog *bandLogE, int end, int LM, int C, int N0,
-      AnalysisInfo *analysis, oac_val16 *stereo_saving, oac_val16 tf_estimate,
-      int intensity, celt_glog surround_trim, oac_int32 equiv_rate, int arch)
-{
-   int i;
-   oac_val32 diff=0;
-   int c;
-   int trim_index;
-   oac_val16 trim = QCONST16(5.f, 8);
-   oac_val16 logXC, logXC2;
-   /* At low bitrate, reducing the trim seems to help. At higher bitrates, it's less
-      clear what's best, so we're keeping it as it was before, at least for now. */
-   if (equiv_rate < 64000) {
-      trim = QCONST16(4.f, 8);
-   } else if (equiv_rate < 80000) {
-      oac_int32 frac = (equiv_rate-64000) >> 10;
-      trim = QCONST16(4.f, 8) + QCONST16(1.f/16.f, 8)*frac;
-   }
-   if (C==2)
-   {
-      oac_val16 sum = 0; /* Q10 */
-      oac_val16 minXC; /* Q10 */
-      /* Compute inter-channel correlation for low frequencies */
-      for (i=0;i<8;i++)
-      {
-         oac_val32 partial;
-         partial = celt_inner_prod_norm_shift(&X[m->eBands[i]<<LM], &X[N0+(m->eBands[i]<<LM)],
-               (m->eBands[i+1]-m->eBands[i])<<LM, arch);
-         sum = ADD16(sum, EXTRACT16(SHR32(partial, 18)));
-      }
-      sum = MULT16_16_Q15(QCONST16(1.f/8, 15), sum);
-      sum = MIN16(QCONST16(1.f, 10), ABS16(sum));
-      minXC = sum;
-      for (i=8;i<intensity;i++)
-      {
-         oac_val32 partial;
-         partial = celt_inner_prod_norm_shift(&X[m->eBands[i]<<LM], &X[N0+(m->eBands[i]<<LM)],
-               (m->eBands[i+1]-m->eBands[i])<<LM, arch);
-         minXC = MIN16(minXC, ABS16(EXTRACT16(SHR32(partial, 18))));
-      }
-      minXC = MIN16(QCONST16(1.f, 10), ABS16(minXC));
-      /*printf ("%f\n", sum);*/
-      /* mid-side savings estimations based on the LF average*/
-      logXC = celt_log2(QCONST32(1.001f, 20)-MULT16_16(sum, sum));
-      /* mid-side savings estimations based on min correlation */
-      logXC2 = MAX16(HALF16(logXC), celt_log2(QCONST32(1.001f, 20)-MULT16_16(minXC, minXC)));
+                               const celt_glog *bandLogE, int end, int LM, int C, int N0,
+                               AnalysisInfo *analysis, oac_val16 *stereo_saving, oac_val16 tf_estimate,
+                               int intensity, celt_glog surround_trim, oac_int32 equiv_rate, int arch) {
+    int i;
+    oac_val32 diff = 0;
+    int c;
+    int trim_index;
+    oac_val16 trim = QCONST16(5.f, 8);
+    oac_val16 logXC, logXC2;
+    /* At low bitrate, reducing the trim seems to help. At higher bitrates, it's less
+       clear what's best, so we're keeping it as it was before, at least for now. */
+    if (equiv_rate < 64000) {
+        trim = QCONST16(4.f, 8);
+    } else if (equiv_rate < 80000) {
+        oac_int32 frac = (equiv_rate - 64000)>>10;
+        trim = QCONST16(4.f, 8) + QCONST16(1.f/16.f, 8)*frac;
+    }
+    if (C == 2) {
+        oac_val16 sum = 0; /* Q10 */
+        oac_val16 minXC; /* Q10 */
+        /* Compute inter-channel correlation for low frequencies */
+        for (i = 0; i < 8; i++) {
+            oac_val32 partial;
+            partial = celt_inner_prod_norm_shift(&X[m->eBands[i]<<LM], &X[N0 + (m->eBands[i]<<LM)],
+                (m->eBands[i + 1] - m->eBands[i])<<LM, arch);
+            sum = ADD16(sum, EXTRACT16(SHR32(partial, 18)));
+        }
+        sum = MULT16_16_Q15(QCONST16(1.f/8, 15), sum);
+        sum = MIN16(QCONST16(1.f, 10), ABS16(sum));
+        minXC = sum;
+        for (i = 8; i < intensity; i++) {
+            oac_val32 partial;
+            partial = celt_inner_prod_norm_shift(&X[m->eBands[i]<<LM], &X[N0 + (m->eBands[i]<<LM)],
+                (m->eBands[i + 1] - m->eBands[i])<<LM, arch);
+            minXC = MIN16(minXC, ABS16(EXTRACT16(SHR32(partial, 18))));
+        }
+        minXC = MIN16(QCONST16(1.f, 10), ABS16(minXC));
+        /*printf ("%f\n", sum);*/
+        /* mid-side savings estimations based on the LF average*/
+        logXC = celt_log2(QCONST32(1.001f, 20) - MULT16_16(sum, sum));
+        /* mid-side savings estimations based on min correlation */
+        logXC2 = MAX16(HALF16(logXC), celt_log2(QCONST32(1.001f, 20) - MULT16_16(minXC, minXC)));
 #ifdef FIXED_POINT
-      /* Compensate for Q20 vs Q14 input and convert output to Q8 */
-      logXC = PSHR32(logXC-QCONST16(6.f, 10),10-8);
-      logXC2 = PSHR32(logXC2-QCONST16(6.f, 10),10-8);
+        /* Compensate for Q20 vs Q14 input and convert output to Q8 */
+        logXC = PSHR32(logXC - QCONST16(6.f, 10), 10 - 8);
+        logXC2 = PSHR32(logXC2 - QCONST16(6.f, 10), 10 - 8);
 #endif
 
-      trim += MAX16(-QCONST16(4.f, 8), MULT16_16_Q15(QCONST16(.75f,15),logXC));
-      *stereo_saving = MIN16(*stereo_saving + QCONST16(0.25f, 8), -HALF16(logXC2));
-   }
-
-   /* Estimate spectral tilt */
-   c=0; do {
-      for (i=0;i<end-1;i++)
-      {
-         diff += SHR32(bandLogE[i+c*m->nbEBands], 5)*(oac_int32)(2+2*i-end);
-      }
-   } while (++c<C);
-   diff /= C*(end-1);
-   /*printf("%f\n", diff);*/
-   trim -= MAX32(-QCONST16(2.f, 8), MIN32(QCONST16(2.f, 8), SHR32(diff+QCONST32(1.f, DB_SHIFT-5),DB_SHIFT-13)/6 ));
-   trim -= SHR16(surround_trim, DB_SHIFT-8);
-   trim -= 2*SHR16(tf_estimate, 14-8);
+        trim += MAX16(-QCONST16(4.f, 8), MULT16_16_Q15(QCONST16(.75f, 15), logXC));
+        *stereo_saving = MIN16(*stereo_saving + QCONST16(0.25f, 8), -HALF16(logXC2));
+    }
+
+    /* Estimate spectral tilt */
+    c = 0; do {
+        for (i = 0; i < end - 1; i++) {
+            diff += SHR32(bandLogE[i + c*m->nbEBands], 5)*(oac_int32)(2 + 2*i - end);
+        }
+    } while (++c < C);
+    diff /= C*(end - 1);
+    /*printf("%f\n", diff);*/
+    trim -= MAX32(-QCONST16(2.f, 8),
+    MIN32(QCONST16(2.f, 8), SHR32(diff + QCONST32(1.f, DB_SHIFT - 5), DB_SHIFT - 13)/6 ));
+    trim -= SHR16(surround_trim, DB_SHIFT - 8);
+    trim -= 2*SHR16(tf_estimate, 14 - 8);
 #ifndef DISABLE_FLOAT_API
-   if (analysis->valid)
-   {
-      trim -= MAX16(-QCONST16(2.f, 8), MIN16(QCONST16(2.f, 8),
-            (oac_val16)(QCONST16(2.f, 8)*(analysis->tonality_slope+.05f))));
-   }
+    if (analysis->valid) {
+        trim -= MAX16(-QCONST16(2.f, 8), MIN16(QCONST16(2.f, 8),
+            (oac_val16)(QCONST16(2.f, 8)*(analysis->tonality_slope + .05f))));
+    }
 #else
-   (void)analysis;
+    (void)analysis;
 #endif
 
 #ifdef FIXED_POINT
-   trim_index = PSHR32(trim, 8);
+    trim_index = PSHR32(trim, 8);
 #else
-   trim_index = (int)floor(.5f+trim);
+    trim_index = (int)floor(.5f + trim);
 #endif
-   trim_index = IMAX(0, IMIN(10, trim_index));
-   /*printf("%d\n", trim_index);*/
+    trim_index = IMAX(0, IMIN(10, trim_index));
+    /*printf("%d\n", trim_index);*/
 #ifdef FUZZING
-   trim_index = rand()%11;
+    trim_index = rand()%11;
 #endif
-   return trim_index;
+    return trim_index;
 }
 
 static int stereo_analysis(const CELTMode *m, const celt_norm *X,
-      int LM, int N0)
-{
-   int i;
-   int thetas;
-   oac_val32 sumLR = EPSILON, sumMS = EPSILON;
-
-   /* Use the L1 norm to model the entropy of the L/R signal vs the M/S signal */
-   for (i=0;i<13;i++)
-   {
-      int j;
-      for (j=m->eBands[i]<<LM;j<m->eBands[i+1]<<LM;j++)
-      {
-         oac_val32 L, R, M, S;
-         /* We cast to 32-bit first because of the -32768 case */
-         L = SHR32(X[j], NORM_SHIFT-14);
-         R = SHR32(X[N0+j], NORM_SHIFT-14);
-         M = ADD32(L, R);
-         S = SUB32(L, R);
-         sumLR = ADD32(sumLR, ADD32(ABS32(L), ABS32(R)));
-         sumMS = ADD32(sumMS, ADD32(ABS32(M), ABS32(S)));
-      }
-   }
-   sumMS = MULT16_32_Q15(QCONST16(0.707107f, 15), sumMS);
-   thetas = 13;
-   /* We don't need thetas for lower bands with LM<=1 */
-   if (LM<=1)
-      thetas -= 8;
-   return MULT16_32_Q15((m->eBands[13]<<(LM+1))+thetas, sumMS)
-         > MULT16_32_Q15(m->eBands[13]<<(LM+1), sumLR);
+                           int LM, int N0) {
+    int i;
+    int thetas;
+    oac_val32 sumLR = EPSILON, sumMS = EPSILON;
+
+    /* Use the L1 norm to model the entropy of the L/R signal vs the M/S signal */
+    for (i = 0; i < 13; i++) {
+        int j;
+        for (j = m->eBands[i]<<LM; j < m->eBands[i + 1]<<LM; j++) {
+            oac_val32 L, R, M, S;
+            /* We cast to 32-bit first because of the -32768 case */
+            L = SHR32(X[j], NORM_SHIFT - 14);
+            R = SHR32(X[N0 + j], NORM_SHIFT - 14);
+            M = ADD32(L, R);
+            S = SUB32(L, R);
+            sumLR = ADD32(sumLR, ADD32(ABS32(L), ABS32(R)));
+            sumMS = ADD32(sumMS, ADD32(ABS32(M), ABS32(S)));
+        }
+    }
+    sumMS = MULT16_32_Q15(QCONST16(0.707107f, 15), sumMS);
+    thetas = 13;
+    /* We don't need thetas for lower bands with LM<=1 */
+    if (LM <= 1)
+        thetas -= 8;
+    return MULT16_32_Q15((m->eBands[13]<<(LM + 1)) + thetas, sumMS) >
+           MULT16_32_Q15(m->eBands[13]<<(LM + 1), sumLR);
 }
 
-#define MSWAP(a,b) do {celt_glog tmp = a;a=b;b=tmp;} while(0)
-static celt_glog median_of_5(const celt_glog *x)
-{
-   celt_glog t0, t1, t2, t3, t4;
-   t2 = x[2];
-   if (x[0] > x[1])
-   {
-      t0 = x[1];
-      t1 = x[0];
-   } else {
-      t0 = x[0];
-      t1 = x[1];
-   }
-   if (x[3] > x[4])
-   {
-      t3 = x[4];
-      t4 = x[3];
-   } else {
-      t3 = x[3];
-      t4 = x[4];
-   }
-   if (t0 > t3)
-   {
-      MSWAP(t0, t3);
-      MSWAP(t1, t4);
-   }
-   if (t2 > t1)
-   {
-      if (t1 < t3)
-         return MING(t2, t3);
-      else
-         return MING(t4, t1);
-   } else {
-      if (t2 < t3)
-         return MING(t1, t3);
-      else
-         return MING(t2, t4);
-   }
+#define MSWAP(a, b) do {celt_glog tmp = a; a = b; b = tmp;} while (0)
+static celt_glog median_of_5(const celt_glog *x) {
+    celt_glog t0, t1, t2, t3, t4;
+    t2 = x[2];
+    if (x[0] > x[1]) {
+        t0 = x[1];
+        t1 = x[0];
+    } else {
+        t0 = x[0];
+        t1 = x[1];
+    }
+    if (x[3] > x[4]) {
+        t3 = x[4];
+        t4 = x[3];
+    } else {
+        t3 = x[3];
+        t4 = x[4];
+    }
+    if (t0 > t3) {
+        MSWAP(t0, t3);
+        MSWAP(t1, t4);
+    }
+    if (t2 > t1) {
+        if (t1 < t3)
+            return MING(t2, t3);
+        else
+            return MING(t4, t1);
+    } else {
+        if (t2 < t3)
+            return MING(t1, t3);
+        else
+            return MING(t2, t4);
+    }
 }
 
-static celt_glog median_of_3(const celt_glog *x)
-{
-   celt_glog t0, t1, t2;
-   if (x[0] > x[1])
-   {
-      t0 = x[1];
-      t1 = x[0];
-   } else {
-      t0 = x[0];
-      t1 = x[1];
-   }
-   t2 = x[2];
-   if (t1 < t2)
-      return t1;
-   else if (t0 < t2)
-      return t2;
-   else
-      return t0;
+static celt_glog median_of_3(const celt_glog *x) {
+    celt_glog t0, t1, t2;
+    if (x[0] > x[1]) {
+        t0 = x[1];
+        t1 = x[0];
+    } else {
+        t0 = x[0];
+        t1 = x[1];
+    }
+    t2 = x[2];
+    if (t1 < t2)
+        return t1;
+    else if (t0 < t2)
+        return t2;
+    else
+        return t0;
 }
 
 static celt_glog dynalloc_analysis(const celt_glog *bandLogE, const celt_glog *bandLogE2, const celt_glog *oldBandE,
-      int nbEBands, int start, int end, int C, int *offsets, int lsb_depth, const oac_int16 *logN,
-      int isTransient, int vbr, int constrained_vbr, const oac_int16 *eBands, int LM,
-      int effectiveBytes, oac_int32 *tot_boost_, int lfe, celt_glog *surround_dynalloc,
-      AnalysisInfo *analysis, int *importance, int *spread_weight, oac_val16 tone_freq, oac_val32 toneishness, int qext_scale)
-{
-   int i, c;
-   oac_int32 tot_boost=0;
-   celt_glog maxDepth;
-   VARDECL(celt_glog, follower);
-   VARDECL(celt_glog, noise_floor);
-   VARDECL(celt_glog, bandLogE3);
-   SAVE_STACK;
+                                   int nbEBands, int start, int end, int C, int *offsets, int lsb_depth,
+                                   const oac_int16 *logN,
+                                   int isTransient, int vbr, int constrained_vbr, const oac_int16 *eBands, int LM,
+                                   int effectiveBytes, oac_int32 *tot_boost_, int lfe, celt_glog *surround_dynalloc,
+                                   AnalysisInfo *analysis, int *importance, int *spread_weight, oac_val16 tone_freq,
+                                   oac_val32 toneishness, int qext_scale) {
+    int i, c;
+    oac_int32 tot_boost = 0;
+    celt_glog maxDepth;
+    VARDECL(celt_glog, follower);
+    VARDECL(celt_glog, noise_floor);
+    VARDECL(celt_glog, bandLogE3);
+    SAVE_STACK;
 
 #ifndef ENABLE_QEXT
-   (void)qext_scale;
+    (void)qext_scale;
 #endif
 
-   ALLOC(follower, C*nbEBands, celt_glog);
-   ALLOC(noise_floor, C*nbEBands, celt_glog);
-   ALLOC(bandLogE3, nbEBands, celt_glog);
-   OAC_CLEAR(offsets, nbEBands);
-   /* Dynamic allocation code */
-   maxDepth=-GCONST(31.9f);
-   for (i=0;i<end;i++)
-   {
-      /* Noise floor must take into account eMeans, the depth, the width of the bands
-         and the preemphasis filter (approx. square of bark band ID) */
-      noise_floor[i] = GCONST(0.0625f)*logN[i]
-            +GCONST(.5f)+SHL32(9-lsb_depth,DB_SHIFT)-SHL32(eMeans[i],DB_SHIFT-4)
-            +GCONST(.0062f)*(i+5)*(i+5);
-   }
-   c=0;do
-   {
-      for (i=0;i<end;i++)
-         maxDepth = MAXG(maxDepth, bandLogE[c*nbEBands+i]-noise_floor[i]);
-   } while (++c<C);
-   {
-      /* Compute a really simple masking model to avoid taking into account completely masked
-         bands when computing the spreading decision. */
-      VARDECL(celt_glog, mask);
-      VARDECL(celt_glog, sig);
-      ALLOC(mask, nbEBands, celt_glog);
-      ALLOC(sig, nbEBands, celt_glog);
-      for (i=0;i<end;i++)
-         mask[i] = bandLogE[i]-noise_floor[i];
-      if (C==2)
-      {
-         for (i=0;i<end;i++)
-            mask[i] = MAXG(mask[i], bandLogE[nbEBands+i]-noise_floor[i]);
-      }
-      OAC_COPY(sig, mask, end);
-      for (i=1;i<end;i++)
-         mask[i] = MAXG(mask[i], mask[i-1] - GCONST(2.f));
-      for (i=end-2;i>=0;i--)
-         mask[i] = MAXG(mask[i], mask[i+1] - GCONST(3.f));
-      for (i=0;i<end;i++)
-      {
-         /* Compute SMR: Mask is never more than 72 dB below the peak and never below the noise floor.*/
-         celt_glog smr = sig[i]-MAXG(MAXG(0, maxDepth-GCONST(12.f)), mask[i]);
-         /* Clamp SMR to make sure we're not shifting by something negative or too large. */
+    ALLOC(follower, C*nbEBands, celt_glog);
+    ALLOC(noise_floor, C*nbEBands, celt_glog);
+    ALLOC(bandLogE3, nbEBands, celt_glog);
+    OAC_CLEAR(offsets, nbEBands);
+    /* Dynamic allocation code */
+    maxDepth = -GCONST(31.9f);
+    for (i = 0; i < end; i++) {
+        /* Noise floor must take into account eMeans, the depth, the width of the bands
+           and the preemphasis filter (approx. square of bark band ID) */
+        noise_floor[i] = GCONST(0.0625f)*logN[i]
+                         + GCONST(.5f) + SHL32(9 - lsb_depth, DB_SHIFT) - SHL32(eMeans[i], DB_SHIFT - 4)
+                         + GCONST(.0062f)*(i + 5)*(i + 5);
+    }
+    c = 0; do {
+        for (i = 0; i < end; i++)
+            maxDepth = MAXG(maxDepth, bandLogE[c*nbEBands + i] - noise_floor[i]);
+    } while (++c < C);
+    {
+        /* Compute a really simple masking model to avoid taking into account completely masked
+           bands when computing the spreading decision. */
+        VARDECL(celt_glog, mask);
+        VARDECL(celt_glog, sig);
+        ALLOC(mask, nbEBands, celt_glog);
+        ALLOC(sig, nbEBands, celt_glog);
+        for (i = 0; i < end; i++)
+            mask[i] = bandLogE[i] - noise_floor[i];
+        if (C == 2) {
+            for (i = 0; i < end; i++)
+                mask[i] = MAXG(mask[i], bandLogE[nbEBands + i] - noise_floor[i]);
+        }
+        OAC_COPY(sig, mask, end);
+        for (i = 1; i < end; i++)
+            mask[i] = MAXG(mask[i], mask[i - 1] - GCONST(2.f));
+        for (i = end - 2; i >= 0; i--)
+            mask[i] = MAXG(mask[i], mask[i + 1] - GCONST(3.f));
+        for (i = 0; i < end; i++) {
+            /* Compute SMR: Mask is never more than 72 dB below the peak and never below the noise floor.*/
+            celt_glog smr = sig[i] - MAXG(MAXG(0, maxDepth - GCONST(12.f)), mask[i]);
+            /* Clamp SMR to make sure we're not shifting by something negative or too large. */
 #ifdef FIXED_POINT
-         /* FIXME: Use PSHR16() instead */
-         int shift = -PSHR32(MAXG(-GCONST(5.f), MING(0, smr)), DB_SHIFT);
+            /* FIXME: Use PSHR16() instead */
+            int shift = -PSHR32(MAXG(-GCONST(5.f), MING(0, smr)), DB_SHIFT);
 #else
-         int shift = IMIN(5, IMAX(0, -(int)floor(.5f + smr)));
+            int shift = IMIN(5, IMAX(0, -(int)floor(.5f + smr)));
 #endif
-         spread_weight[i] = 32 >> shift;
-      }
-      /*for (i=0;i<end;i++)
-         printf("%d ", spread_weight[i]);
-      printf("\n");*/
-   }
-   /* Make sure that dynamic allocation can't make us bust the budget.
-      We enable the feature starting at 24 kb/s for 20-ms frames
-      and 96 kb/s for 2.5 ms frames.  */
-   if (effectiveBytes >= (30 + 5*LM) && !lfe)
-   {
-      int last=0;
-      c=0;do
-      {
-         celt_glog offset;
-         celt_glog tmp;
-         celt_glog *f;
-         OAC_COPY(bandLogE3, &bandLogE2[c*nbEBands], end);
-         if (LM==0) {
-            /* For 2.5 ms frames, the first 8 bands have just one bin, so the
-               energy is highly unreliable (high variance). For that reason,
-               we take the max with the previous energy so that at least 2 bins
-               are getting used. */
-            for (i=0;i<IMIN(8,end);i++) bandLogE3[i] = MAXG(bandLogE2[c*nbEBands+i], oldBandE[c*nbEBands+i]);
-         }
-         f = &follower[c*nbEBands];
-         f[0] = bandLogE3[0];
-         for (i=1;i<end;i++)
-         {
-            /* The last band to be at least 3 dB higher than the previous one
-               is the last we'll consider. Otherwise, we run into problems on
-               bandlimited signals. */
-            if (bandLogE3[i] > bandLogE3[i-1]+GCONST(.5f))
-               last=i;
-            f[i] = MING(f[i-1]+GCONST(1.5f), bandLogE3[i]);
-         }
-         for (i=last-1;i>=0;i--)
-            f[i] = MING(f[i], MING(f[i+1]+GCONST(2.f), bandLogE3[i]));
-
-         /* Combine with a median filter to avoid dynalloc triggering unnecessarily.
-            The "offset" value controls how conservative we are -- a higher offset
-            reduces the impact of the median filter and makes dynalloc use more bits. */
-         offset = GCONST(1.f);
-         for (i=2;i<end-2;i++)
-            f[i] = MAXG(f[i], median_of_5(&bandLogE3[i-2])-offset);
-         tmp = median_of_3(&bandLogE3[0])-offset;
-         f[0] = MAXG(f[0], tmp);
-         f[1] = MAXG(f[1], tmp);
-         tmp = median_of_3(&bandLogE3[end-3])-offset;
-         f[end-2] = MAXG(f[end-2], tmp);
-         f[end-1] = MAXG(f[end-1], tmp);
-
-         for (i=0;i<end;i++)
-            f[i] = MAXG(f[i], noise_floor[i]);
-      } while (++c<C);
-      if (C==2)
-      {
-         for (i=start;i<end;i++)
-         {
-            /* Consider 24 dB "cross-talk" */
-            follower[nbEBands+i] = MAXG(follower[nbEBands+i], follower[         i]-GCONST(4.f));
-            follower[         i] = MAXG(follower[         i], follower[nbEBands+i]-GCONST(4.f));
-            follower[i] = HALF32(MAXG(0, bandLogE[i]-follower[i]) + MAXG(0, bandLogE[nbEBands+i]-follower[nbEBands+i]));
-         }
-      } else {
-         for (i=start;i<end;i++)
-         {
-            follower[i] = MAXG(0, bandLogE[i]-follower[i]);
-         }
-      }
-      for (i=start;i<end;i++)
-         follower[i] = MAXG(follower[i], surround_dynalloc[i]);
-      for (i=start;i<end;i++)
-      {
+            spread_weight[i] = 32>>shift;
+        }
+        /*for (i=0;i<end;i++)
+           printf("%d ", spread_weight[i]);
+           printf("\n");*/
+    }
+    /* Make sure that dynamic allocation can't make us bust the budget.
+       We enable the feature starting at 24 kb/s for 20-ms frames
+       and 96 kb/s for 2.5 ms frames.  */
+    if (effectiveBytes >= (30 + 5*LM) && !lfe) {
+        int last = 0;
+        c = 0; do {
+            celt_glog offset;
+            celt_glog tmp;
+            celt_glog *f;
+            OAC_COPY(bandLogE3, &bandLogE2[c*nbEBands], end);
+            if (LM == 0) {
+                /* For 2.5 ms frames, the first 8 bands have just one bin, so the
+                   energy is highly unreliable (high variance). For that reason,
+                   we take the max with the previous energy so that at least 2 bins
+                   are getting used. */
+                for (i = 0; i < IMIN(8, end);
+                     i++) bandLogE3[i] = MAXG(bandLogE2[c*nbEBands + i], oldBandE[c*nbEBands + i]);
+            }
+            f = &follower[c*nbEBands];
+            f[0] = bandLogE3[0];
+            for (i = 1; i < end; i++) {
+                /* The last band to be at least 3 dB higher than the previous one
+                   is the last we'll consider. Otherwise, we run into problems on
+                   bandlimited signals. */
+                if (bandLogE3[i] > bandLogE3[i - 1] + GCONST(.5f))
+                    last = i;
+                f[i] = MING(f[i - 1] + GCONST(1.5f), bandLogE3[i]);
+            }
+            for (i = last - 1; i >= 0; i--)
+                f[i] = MING(f[i], MING(f[i + 1] + GCONST(2.f), bandLogE3[i]));
+
+            /* Combine with a median filter to avoid dynalloc triggering unnecessarily.
+               The "offset" value controls how conservative we are -- a higher offset
+               reduces the impact of the median filter and makes dynalloc use more bits. */
+            offset = GCONST(1.f);
+            for (i = 2; i < end - 2; i++)
+                f[i] = MAXG(f[i], median_of_5(&bandLogE3[i - 2]) - offset);
+            tmp = median_of_3(&bandLogE3[0]) - offset;
+            f[0] = MAXG(f[0], tmp);
+            f[1] = MAXG(f[1], tmp);
+            tmp = median_of_3(&bandLogE3[end - 3]) - offset;
+            f[end - 2] = MAXG(f[end - 2], tmp);
+            f[end - 1] = MAXG(f[end - 1], tmp);
+
+            for (i = 0; i < end; i++)
+                f[i] = MAXG(f[i], noise_floor[i]);
+        } while (++c < C);
+        if (C == 2) {
+            for (i = start; i < end; i++) {
+                /* Consider 24 dB "cross-talk" */
+                follower[nbEBands + i] = MAXG(follower[nbEBands + i], follower[         i] - GCONST(4.f));
+                follower[         i] = MAXG(follower[         i], follower[nbEBands + i] - GCONST(4.f));
+                follower[i] = HALF32(MAXG(0, bandLogE[i] - follower[i]) + MAXG(0,
+                bandLogE[nbEBands + i] - follower[nbEBands + i]));
+            }
+        } else {
+            for (i = start; i < end; i++) {
+                follower[i] = MAXG(0, bandLogE[i] - follower[i]);
+            }
+        }
+        for (i = start; i < end; i++)
+            follower[i] = MAXG(follower[i], surround_dynalloc[i]);
+        for (i = start; i < end; i++) {
 #ifdef FIXED_POINT
-         importance[i] = PSHR32(13*celt_exp2_db(MING(follower[i], GCONST(4.f))), 16);
+            importance[i] = PSHR32(13*celt_exp2_db(MING(follower[i], GCONST(4.f))), 16);
 #else
-         importance[i] = (int)floor(.5f+13*celt_exp2_db(MING(follower[i], GCONST(4.f))));
+            importance[i] = (int)floor(.5f + 13*celt_exp2_db(MING(follower[i], GCONST(4.f))));
 #endif
-      }
-      /* For non-transient CBR/CVBR frames, halve the dynalloc contribution */
-      if ((!vbr || constrained_vbr)&&!isTransient)
-      {
-         for (i=start;i<end;i++)
-            follower[i] = HALF32(follower[i]);
-      }
-      for (i=start;i<end;i++)
-      {
-         if (i<8)
-            follower[i] *= 2;
-         if (i>=12)
-            follower[i] = HALF32(follower[i]);
-      }
-      /* Compensate for Oac' under-allocation on tones. */
-      if (toneishness > QCONST32(.98f, 29)) {
+        }
+        /* For non-transient CBR/CVBR frames, halve the dynalloc contribution */
+        if ((!vbr || constrained_vbr) && !isTransient) {
+            for (i = start; i < end; i++)
+                follower[i] = HALF32(follower[i]);
+        }
+        for (i = start; i < end; i++) {
+            if (i < 8)
+                follower[i] *= 2;
+            if (i >= 12)
+                follower[i] = HALF32(follower[i]);
+        }
+        /* Compensate for Oac' under-allocation on tones. */
+        if (toneishness > QCONST32(.98f, 29)) {
 #ifdef FIXED_POINT
-         int freq_bin = PSHR32(QEXT_SCALE((oac_val32)tone_freq)*QCONST16(120/M_PI, 9), 13+9);
+            int freq_bin = PSHR32(QEXT_SCALE((oac_val32)tone_freq)*QCONST16(120/M_PI, 9), 13 + 9);
 #else
-         int freq_bin = (int)floor(.5 + QEXT_SCALE(tone_freq)*120/M_PI);
+            int freq_bin = (int)floor(.5 + QEXT_SCALE(tone_freq)*120/M_PI);
 #endif
-         for (i=start;i<end;i++) {
-            if (freq_bin >= eBands[i] && freq_bin <= eBands[i+1]) follower[i] += GCONST(2.f);
-            if (freq_bin >= eBands[i]-1 && freq_bin <= eBands[i+1]+1) follower[i] += GCONST(1.f);
-            if (freq_bin >= eBands[i]-2 && freq_bin <= eBands[i+1]+2) follower[i] += GCONST(1.f);
-            if (freq_bin >= eBands[i]-3 && freq_bin <= eBands[i+1]+3) follower[i] += GCONST(.5f);
-         }
-         if (freq_bin >= eBands[end]) {
-            follower[end-1] += GCONST(2.f);
-            follower[end-2] += GCONST(1.f);
-         }
-      }
+            for (i = start; i < end; i++) {
+                if (freq_bin >= eBands[i] && freq_bin <= eBands[i + 1]) follower[i] += GCONST(2.f);
+                if (freq_bin >= eBands[i] - 1 && freq_bin <= eBands[i + 1] + 1) follower[i] += GCONST(1.f);
+                if (freq_bin >= eBands[i] - 2 && freq_bin <= eBands[i + 1] + 2) follower[i] += GCONST(1.f);
+                if (freq_bin >= eBands[i] - 3 && freq_bin <= eBands[i + 1] + 3) follower[i] += GCONST(.5f);
+            }
+            if (freq_bin >= eBands[end]) {
+                follower[end - 1] += GCONST(2.f);
+                follower[end - 2] += GCONST(1.f);
+            }
+        }
 #ifdef DISABLE_FLOAT_API
-      (void)analysis;
+        (void)analysis;
 #else
-      if (analysis->valid)
-      {
-         for (i=start;i<IMIN(LEAK_BANDS, end);i++)
-            follower[i] = follower[i] +  GCONST(1.f/64.f)*analysis->leak_boost[i];
-      }
+        if (analysis->valid) {
+            for (i = start; i < IMIN(LEAK_BANDS, end); i++)
+                follower[i] = follower[i] +  GCONST(1.f/64.f)*analysis->leak_boost[i];
+        }
 #endif
-      for (i=start;i<end;i++)
-      {
-         int width;
-         int boost;
-         int boost_bits;
-
-         follower[i] = MING(follower[i], GCONST(4));
-
-         follower[i] = SHR32(follower[i], 8);
-         width = C*(eBands[i+1]-eBands[i])<<LM;
-         if (width<6)
-         {
-            boost = (int)SHR32(follower[i],DB_SHIFT-8);
-            boost_bits = boost*width<<BITRES;
-         } else if (width > 48) {
-            boost = (int)SHR32(follower[i]*8,DB_SHIFT-8);
-            boost_bits = (boost*width<<BITRES)/8;
-         } else {
-            boost = (int)SHR32(follower[i]*width/6,DB_SHIFT-8);
-            boost_bits = boost*6<<BITRES;
-         }
-         /* For CBR and non-transient CVBR frames, limit dynalloc to 2/3 of the bits */
-         if ((!vbr || (constrained_vbr&&!isTransient))
-               && (tot_boost+boost_bits)>>BITRES>>3 > 2*effectiveBytes/3)
-         {
-            oac_int32 cap = ((2*effectiveBytes/3)<<BITRES<<3);
-            offsets[i] = cap-tot_boost;
-            tot_boost = cap;
-            break;
-         } else {
-            offsets[i] = boost;
-            tot_boost += boost_bits;
-         }
-      }
-   } else {
-      for (i=start;i<end;i++)
-         importance[i] = 13;
-   }
-   *tot_boost_ = tot_boost;
-   RESTORE_STACK;
-   return maxDepth;
+        for (i = start; i < end; i++) {
+            int width;
+            int boost;
+            int boost_bits;
+
+            follower[i] = MING(follower[i], GCONST(4));
+
+            follower[i] = SHR32(follower[i], 8);
+            width = C*(eBands[i + 1] - eBands[i])<<LM;
+            if (width < 6) {
+                boost = (int)SHR32(follower[i], DB_SHIFT - 8);
+                boost_bits = boost*width<<BITRES;
+            } else if (width > 48) {
+                boost = (int)SHR32(follower[i]*8, DB_SHIFT - 8);
+                boost_bits = (boost*width<<BITRES)/8;
+            } else {
+                boost = (int)SHR32(follower[i]*width/6, DB_SHIFT - 8);
+                boost_bits = boost*6<<BITRES;
+            }
+            /* For CBR and non-transient CVBR frames, limit dynalloc to 2/3 of the bits */
+            if ((!vbr || (constrained_vbr && !isTransient))
+                && (tot_boost + boost_bits)>>BITRES>>3 > 2*effectiveBytes/3) {
+                oac_int32 cap = ((2*effectiveBytes/3)<<BITRES<<3);
+                offsets[i] = cap - tot_boost;
+                tot_boost = cap;
+                break;
+            } else {
+                offsets[i] = boost;
+                tot_boost += boost_bits;
+            }
+        }
+    } else {
+        for (i = start; i < end; i++)
+            importance[i] = 13;
+    }
+    *tot_boost_ = tot_boost;
+    RESTORE_STACK;
+    return maxDepth;
 }
 
 #ifdef FIXED_POINT
 void normalize_tone_input(oac_val16 *x, int len) {
-   oac_val32 ac0=len;
-   int i;
-   int shift;
-   for (i=0;i<len;i++) {
-      ac0 = ADD32(ac0, SHR32(MULT16_16(x[i], x[i]), 10));
-   }
-   shift = 5 - (28-celt_ilog2(ac0))/2;
-   if (shift > 0) {
-      for (i=0;i<len;i++) {
-         x[i] = PSHR32(x[i], shift);
-      }
-   }
+    oac_val32 ac0 = len;
+    int i;
+    int shift;
+    for (i = 0; i < len; i++) {
+        ac0 = ADD32(ac0, SHR32(MULT16_16(x[i], x[i]), 10));
+    }
+    shift = 5 - (28 - celt_ilog2(ac0))/2;
+    if (shift > 0) {
+        for (i = 0; i < len; i++) {
+            x[i] = PSHR32(x[i], shift);
+        }
+    }
 }
 int acos_approx(oac_val32 x) {
-   oac_val16 x14;
-   oac_val32 tmp;
-   int flip = x<0;
-   x = abs(x);
-   x14 = x>>15;
-   tmp = (762*x14>>14)-3308;
-   tmp = (tmp*x14>>14)+25726;
-   tmp = tmp*celt_sqrt(IMAX(0, (1<<30) - (x<<1)))>>16;
-   if (flip) tmp = 25736 - tmp;
-   return tmp;
+    oac_val16 x14;
+    oac_val32 tmp;
+    int flip = x < 0;
+    x = abs(x);
+    x14 = x>>15;
+    tmp = (762*x14>>14) - 3308;
+    tmp = (tmp*x14>>14) + 25726;
+    tmp = tmp*celt_sqrt(IMAX(0, (1<<30) - (x<<1)))>>16;
+    if (flip) tmp = 25736 - tmp;
+    return tmp;
 }
 #endif
 
 /* Compute the LPC coefficients using a least-squares fit for both forward and backward prediction. */
 static int tone_lpc(const oac_val16 *x, int len, int delay, oac_val32 *lpc) {
-   int i;
-   oac_val32 r00=0, r01=0, r11=0, r02=0, r12=0, r22=0;
-   oac_val32 edges;
-   oac_val32 num0, num1, den;
-   celt_assert(len > 2*delay);
-   /* Compute correlations as if using the forward prediction covariance method. */
-   for (i=0;i<len-2*delay;i++) {
-      r00 += MULT16_16(x[i],x[i]);
-      r01 += MULT16_16(x[i],x[i+delay]);
-      r02 += MULT16_16(x[i],x[i+2*delay]);
-   }
-   edges = 0;
-   for (i=0;i<delay;i++) edges += MULT16_16(x[len+i-2*delay],x[len+i-2*delay]) - MULT16_16(x[i],x[i]);
-   r11 = r00+edges;
-   edges = 0;
-   for (i=0;i<delay;i++) edges += MULT16_16(x[len+i-delay],x[len+i-delay]) - MULT16_16(x[i+delay],x[i+delay]);
-   r22 = r11+edges;
-   edges = 0;
-   for (i=0;i<delay;i++) edges += MULT16_16(x[len+i-2*delay],x[len+i-delay]) - MULT16_16(x[i],x[i+delay]);
-   r12 = r01+edges;
-   /* Reverse and sum to get the backward contribution. */
-   {
-      oac_val32 R00, R01, R11, R02, R12, R22;
-      R00 = r00 + r22;
-      R01 = r01 + r12;
-      R11 = 2*r11;
-      R02 = 2*r02;
-      R12 = r12 + r01;
-      R22 = r00 + r22;
-      r00 = R00;
-      r01 = R01;
-      r11 = R11;
-      r02 = R02;
-      r12 = R12;
-      r22 = R22;
-   }
-   /* Solve A*x=b, where A=[r00, r01; r01, r11] and b=[r02; r12]. */
-   den = MULT32_32_Q31(r00,r11) - MULT32_32_Q31(r01,r01);
+    int i;
+    oac_val32 r00 = 0, r01 = 0, r11 = 0, r02 = 0, r12 = 0, r22 = 0;
+    oac_val32 edges;
+    oac_val32 num0, num1, den;
+    celt_assert(len > 2*delay);
+    /* Compute correlations as if using the forward prediction covariance method. */
+    for (i = 0; i < len - 2*delay; i++) {
+        r00 += MULT16_16(x[i], x[i]);
+        r01 += MULT16_16(x[i], x[i + delay]);
+        r02 += MULT16_16(x[i], x[i + 2*delay]);
+    }
+    edges = 0;
+    for (i = 0; i < delay; i++) edges += MULT16_16(x[len + i - 2*delay], x[len + i - 2*delay]) - MULT16_16(x[i], x[i]);
+    r11 = r00 + edges;
+    edges = 0;
+    for (i = 0; i < delay;
+         i++) edges += MULT16_16(x[len + i - delay], x[len + i - delay]) - MULT16_16(x[i + delay], x[i + delay]);
+    r22 = r11 + edges;
+    edges = 0;
+    for (i = 0; i < delay;
+         i++) edges += MULT16_16(x[len + i - 2*delay], x[len + i - delay]) - MULT16_16(x[i], x[i + delay]);
+    r12 = r01 + edges;
+    /* Reverse and sum to get the backward contribution. */
+    {
+        oac_val32 R00, R01, R11, R02, R12, R22;
+        R00 = r00 + r22;
+        R01 = r01 + r12;
+        R11 = 2*r11;
+        R02 = 2*r02;
+        R12 = r12 + r01;
+        R22 = r00 + r22;
+        r00 = R00;
+        r01 = R01;
+        r11 = R11;
+        r02 = R02;
+        r12 = R12;
+        r22 = R22;
+    }
+    /* Solve A*x=b, where A=[r00, r01; r01, r11] and b=[r02; r12]. */
+    den = MULT32_32_Q31(r00, r11) - MULT32_32_Q31(r01, r01);
 #ifdef FIXED_POINT
-   if (den <= SHR32(MULT32_32_Q31(r00,r11), 10)) return 1;
+    if (den <= SHR32(MULT32_32_Q31(r00, r11), 10)) return 1;
 #else
-   if (den < .001f*MULT32_32_Q31(r00,r11)) return 1;
+    if (den < .001f*MULT32_32_Q31(r00, r11)) return 1;
 #endif
-   num1 = MULT32_32_Q31(r02,r11) - MULT32_32_Q31(r01,r12);
-   if (num1 >= den) lpc[1] = QCONST32(1.f, 29);
-   else if (num1 <= -den) lpc[1] = -QCONST32(1.f, 29);
-   else lpc[1] = frac_div32_q29(num1, den);
-   num0 = MULT32_32_Q31(r00,r12) - MULT32_32_Q31(r02,r01);
-   if (HALF32(num0) >= den) lpc[0] = QCONST32(1.999999f, 29);
-   else if (HALF32(num0) <= -den) lpc[0] = -QCONST32(1.999999f, 29);
-   else lpc[0] = frac_div32_q29(num0, den);
-   /*printf("%f %f\n", lpc[0], lpc[1]);*/
-   return 0;
+    num1 = MULT32_32_Q31(r02, r11) - MULT32_32_Q31(r01, r12);
+    if (num1 >= den) lpc[1] = QCONST32(1.f, 29);
+    else if (num1 <= -den) lpc[1] = -QCONST32(1.f, 29);
+    else lpc[1] = frac_div32_q29(num1, den);
+    num0 = MULT32_32_Q31(r00, r12) - MULT32_32_Q31(r02, r01);
+    if (HALF32(num0) >= den) lpc[0] = QCONST32(1.999999f, 29);
+    else if (HALF32(num0) <= -den) lpc[0] = -QCONST32(1.999999f, 29);
+    else lpc[0] = frac_div32_q29(num0, den);
+    /*printf("%f %f\n", lpc[0], lpc[1]);*/
+    return 0;
 }
 
 /* Detects pure of nearly pure tones so we can prevent them from causing problems with the encoder. */
 static oac_val16 tone_detect(const celt_sig *in, int CC, int N, oac_val32 *toneishness, oac_int32 Fs) {
-   int i;
-   int delay = 1;
-   int fail;
-   oac_val32 lpc[2];
-   oac_val16 freq;
-   VARDECL(oac_val16, x);
-   SAVE_STACK;
-   ALLOC(x, N, oac_val16);
-   /* Shift by SIG_SHIFT+2 (+3 for stereo) to account for HF gain of the preemphasis filter. */
-   if (CC==2) {
-      for (i=0;i<N;i++) x[i] = PSHR32(ADD32(SHR32(in[i], 1), SHR32(in[i+N], 1)), SIG_SHIFT+2);
-   } else {
-      for (i=0;i<N;i++) x[i] = PSHR32(in[i], SIG_SHIFT+2);
-   }
+    int i;
+    int delay = 1;
+    int fail;
+    oac_val32 lpc[2];
+    oac_val16 freq;
+    VARDECL(oac_val16, x);
+    SAVE_STACK;
+    ALLOC(x, N, oac_val16);
+    /* Shift by SIG_SHIFT+2 (+3 for stereo) to account for HF gain of the preemphasis filter. */
+    if (CC == 2) {
+        for (i = 0; i < N; i++) x[i] = PSHR32(ADD32(SHR32(in[i], 1), SHR32(in[i + N], 1)), SIG_SHIFT + 2);
+    } else {
+        for (i = 0; i < N; i++) x[i] = PSHR32(in[i], SIG_SHIFT + 2);
+    }
 #ifdef FIXED_POINT
-   normalize_tone_input(x, N);
+    normalize_tone_input(x, N);
 #endif
-   fail = tone_lpc(x, N, delay, lpc);
-   /* If our LPC filter resonates too close to DC, retry the analysis with down-sampling. */
-   while (delay <= Fs/3000 && (fail || (lpc[0] > QCONST32(1.f, 29) && lpc[1] < 0))) {
-      delay *= 2;
-      fail = tone_lpc(x, N, delay, lpc);
-   }
-   /* Check that our filter has complex roots. */
-   if (!fail && MULT32_32_Q31(lpc[0],lpc[0]) + MULT32_32_Q31(QCONST32(3.999999, 29), lpc[1]) < 0) {
-      /* Squared radius of the poles. */
-      *toneishness = -lpc[1];
+    fail = tone_lpc(x, N, delay, lpc);
+    /* If our LPC filter resonates too close to DC, retry the analysis with down-sampling. */
+    while (delay <= Fs/3000 && (fail || (lpc[0] > QCONST32(1.f, 29) && lpc[1] < 0))) {
+        delay *= 2;
+        fail = tone_lpc(x, N, delay, lpc);
+    }
+    /* Check that our filter has complex roots. */
+    if (!fail && MULT32_32_Q31(lpc[0], lpc[0]) + MULT32_32_Q31(QCONST32(3.999999, 29), lpc[1]) < 0) {
+        /* Squared radius of the poles. */
+        *toneishness = -lpc[1];
 #ifdef FIXED_POINT
-      freq = (acos_approx(lpc[0]>>1)+delay/2)/delay;
+        freq = (acos_approx(lpc[0]>>1) + delay/2)/delay;
 #else
-      freq = acos(.5f*lpc[0])/delay;
+        freq = acos(.5f*lpc[0])/delay;
 #endif
-   } else {
-      freq = -1;
-      *toneishness=0;
-   }
-   /*printf("%f %f %f %f\n", freq, lpc[0], lpc[1], *toneishness);*/
-   RESTORE_STACK;
-   return freq;
+    } else {
+        freq = -1;
+        *toneishness = 0;
+    }
+    /*printf("%f %f %f %f\n", freq, lpc[0], lpc[1], *toneishness);*/
+    RESTORE_STACK;
+    return freq;
 }
 
 static int run_prefilter(CELTEncoder *st, celt_sig *in, celt_sig *prefilter_mem, int CC, int N,
-      int prefilter_tapset, int *pitch, oac_val16 *gain, int *qgain, int enabled, int complexity, oac_val16 tf_estimate,
-      int nbAvailableBytes, AnalysisInfo *analysis, oac_val16 tone_freq, oac_val32 toneishness, int qext_scale)
-{
-   int c;
-   VARDECL(celt_sig, _pre);
-   celt_sig *pre[2];
-   const CELTMode *mode;
-   int pitch_index;
-   oac_val16 gain1;
-   oac_val16 pf_threshold;
-   int pf_on;
-   int qg;
-   int overlap;
-   int min_period, max_period;
-   oac_val32 before[2]={0}, after[2]={0};
-   int cancel_pitch=0;
-   SAVE_STACK;
+                         int prefilter_tapset, int *pitch, oac_val16 *gain, int *qgain, int enabled, int complexity,
+                         oac_val16 tf_estimate,
+                         int nbAvailableBytes, AnalysisInfo *analysis, oac_val16 tone_freq, oac_val32 toneishness,
+                         int qext_scale) {
+    int c;
+    VARDECL(celt_sig, _pre);
+    celt_sig *pre[2];
+    const CELTMode *mode;
+    int pitch_index;
+    oac_val16 gain1;
+    oac_val16 pf_threshold;
+    int pf_on;
+    int qg;
+    int overlap;
+    int min_period, max_period;
+    oac_val32 before[2] = {0}, after[2] = {0};
+    int cancel_pitch = 0;
+    SAVE_STACK;
 
 #ifndef ENABLE_QEXT
-   (void)qext_scale;
+    (void)qext_scale;
 #endif
 
-   max_period = QEXT_SCALE(COMBFILTER_MAXPERIOD);
-   min_period = QEXT_SCALE(COMBFILTER_MINPERIOD);
-   mode = st->mode;
-   overlap = mode->overlap;
-   ALLOC(_pre, CC*(N+max_period), celt_sig);
-
-   pre[0] = _pre;
-   pre[1] = _pre + (N+max_period);
-
-
-   c=0; do {
-      OAC_COPY(pre[c], prefilter_mem+c*max_period, max_period);
-      OAC_COPY(pre[c]+max_period, in+c*(N+overlap)+overlap, N);
-   } while (++c<CC);
-
-   /* If we detect that the signal is dominated by a single tone, don't rely on the standard pitch
-      estimator, as it can become unreliable. */
-   if (enabled && toneishness > QCONST32(.99f, 29)) {
-      int multiple=1;
-      /* Using aliased version of the postfilter above 24 kHz.
-         First value is purposely slightly above pi to avoid triggering for Fs=48kHz. */
-      if (QEXT_SCALE(tone_freq) >= QCONST16(3.1416f, 13)) tone_freq = QCONST16(3.141593f, 13) - tone_freq;
-      /* If the pitch is too high for our post-filter, apply pitch doubling until
-         we can get something that fits (not ideal, but better than nothing). */
-      while (QEXT_SCALE(tone_freq) >= multiple*QCONST16(0.39f, 13)) multiple++;
-      if (QEXT_SCALE(tone_freq) > QCONST16(0.006148f, 13)) {
+    max_period = QEXT_SCALE(COMBFILTER_MAXPERIOD);
+    min_period = QEXT_SCALE(COMBFILTER_MINPERIOD);
+    mode = st->mode;
+    overlap = mode->overlap;
+    ALLOC(_pre, CC*(N + max_period), celt_sig);
+
+    pre[0] = _pre;
+    pre[1] = _pre + (N + max_period);
+
+
+    c = 0; do {
+        OAC_COPY(pre[c], prefilter_mem + c*max_period, max_period);
+        OAC_COPY(pre[c] + max_period, in + c*(N + overlap) + overlap, N);
+    } while (++c < CC);
+
+    /* If we detect that the signal is dominated by a single tone, don't rely on the standard pitch
+       estimator, as it can become unreliable. */
+    if (enabled && toneishness > QCONST32(.99f, 29)) {
+        int multiple = 1;
+        /* Using aliased version of the postfilter above 24 kHz.
+           First value is purposely slightly above pi to avoid triggering for Fs=48kHz. */
+        if (QEXT_SCALE(tone_freq) >= QCONST16(3.1416f, 13)) tone_freq = QCONST16(3.141593f, 13) - tone_freq;
+        /* If the pitch is too high for our post-filter, apply pitch doubling until
+           we can get something that fits (not ideal, but better than nothing). */
+        while (QEXT_SCALE(tone_freq) >= multiple*QCONST16(0.39f, 13)) multiple++;
+        if (QEXT_SCALE(tone_freq) > QCONST16(0.006148f, 13)) {
 #ifdef FIXED_POINT
-         pitch_index = IMIN((51472*multiple+QEXT_SCALE(tone_freq)/2)/QEXT_SCALE(tone_freq), COMBFILTER_MAXPERIOD-2);
+            pitch_index = IMIN((51472*multiple + QEXT_SCALE(tone_freq)/2)/QEXT_SCALE(tone_freq),
+            COMBFILTER_MAXPERIOD - 2);
 #else
-         pitch_index = IMIN((int)floor(.5+2.f*M_PI*multiple/QEXT_SCALE(tone_freq)), COMBFILTER_MAXPERIOD-2);
+            pitch_index = IMIN((int)floor(.5 + 2.f*M_PI*multiple/QEXT_SCALE(tone_freq)), COMBFILTER_MAXPERIOD - 2);
 #endif
-      } else {
-         /* If the pitch is too low, using a very high pitch will actually give us an improvement
-            due to the DC component of the filter that will be close to our tone. Again, not ideal,
-            but if we only have a single tone, it's better than nothing. */
-         pitch_index = COMBFILTER_MINPERIOD;
-      }
-      gain1 = QCONST16(.75f, 15);
-   } else if (enabled && complexity >= 5) {
-      VARDECL(oac_val16, pitch_buf);
-      ALLOC(pitch_buf, (max_period+N)>>1, oac_val16);
-
-      pitch_downsample(pre, pitch_buf, (max_period+N)>>1, CC, 2, st->arch);
-      /* Don't search for the fir last 1.5 octave of the range because
-         there's too many false-positives due to short-term correlation */
-      pitch_search(pitch_buf+(max_period>>1), pitch_buf, N,
-            max_period-3*min_period, &pitch_index,
+        } else {
+            /* If the pitch is too low, using a very high pitch will actually give us an improvement
+               due to the DC component of the filter that will be close to our tone. Again, not ideal,
+               but if we only have a single tone, it's better than nothing. */
+            pitch_index = COMBFILTER_MINPERIOD;
+        }
+        gain1 = QCONST16(.75f, 15);
+    } else if (enabled && complexity >= 5) {
+        VARDECL(oac_val16, pitch_buf);
+        ALLOC(pitch_buf, (max_period + N)>>1, oac_val16);
+
+        pitch_downsample(pre, pitch_buf, (max_period + N)>>1, CC, 2, st->arch);
+        /* Don't search for the fir last 1.5 octave of the range because
+           there's too many false-positives due to short-term correlation */
+        pitch_search(pitch_buf + (max_period>>1), pitch_buf, N,
+            max_period - 3*min_period, &pitch_index,
             st->arch);
-      pitch_index = max_period-pitch_index;
+        pitch_index = max_period - pitch_index;
 
-      gain1 = remove_doubling(pitch_buf, max_period, min_period,
+        gain1 = remove_doubling(pitch_buf, max_period, min_period,
             N, &pitch_index, st->prefilter_period, st->prefilter_gain, st->arch);
-      if (pitch_index > max_period-QEXT_SCALE(2))
-         pitch_index = max_period-QEXT_SCALE(2);
+        if (pitch_index > max_period - QEXT_SCALE(2))
+            pitch_index = max_period - QEXT_SCALE(2);
 #ifdef ENABLE_QEXT
-      pitch_index /= qext_scale;
+        pitch_index /= qext_scale;
 #endif
-      gain1 = MULT16_16_Q15(QCONST16(.7f,15),gain1);
-      /*printf("%d %d %f %f\n", pitch_change, pitch_index, gain1, st->analysis.tonality);*/
-      if (st->loss_rate>2)
-         gain1 = HALF32(gain1);
-      if (st->loss_rate>4)
-         gain1 = HALF32(gain1);
-      if (st->loss_rate>8)
-         gain1 = 0;
-   } else {
-      gain1 = 0;
-      pitch_index = COMBFILTER_MINPERIOD;
-   }
+        gain1 = MULT16_16_Q15(QCONST16(.7f, 15), gain1);
+        /*printf("%d %d %f %f\n", pitch_change, pitch_index, gain1, st->analysis.tonality);*/
+        if (st->loss_rate > 2)
+            gain1 = HALF32(gain1);
+        if (st->loss_rate > 4)
+            gain1 = HALF32(gain1);
+        if (st->loss_rate > 8)
+            gain1 = 0;
+    } else {
+        gain1 = 0;
+        pitch_index = COMBFILTER_MINPERIOD;
+    }
 #ifndef DISABLE_FLOAT_API
-   if (analysis->valid)
-      gain1 = (oac_val16)(gain1 * analysis->max_pitch_ratio);
+    if (analysis->valid)
+        gain1 = (oac_val16)(gain1*analysis->max_pitch_ratio);
 #else
-   (void)analysis;
+    (void)analysis;
 #endif
-   /* Gain threshold for enabling the prefilter/postfilter */
-   pf_threshold = QCONST16(.2f,15);
-
-   /* Adjusting the threshold based on rate and continuity */
-   if (abs(pitch_index-st->prefilter_period)*10>pitch_index)
-   {
-      pf_threshold += QCONST16(.2f,15);
-      /* Completely disable the prefilter on strong transients without continuity. */
-      if (tf_estimate > QCONST16(.98f, 14))
-         gain1 = 0;
-   }
-   if (nbAvailableBytes<25)
-      pf_threshold += QCONST16(.1f,15);
-   if (nbAvailableBytes<35)
-      pf_threshold += QCONST16(.1f,15);
-   if (st->prefilter_gain > QCONST16(.4f,15))
-      pf_threshold -= QCONST16(.1f,15);
-   if (st->prefilter_gain > QCONST16(.55f,15))
-      pf_threshold -= QCONST16(.1f,15);
-
-   /* Hard threshold at 0.2 */
-   pf_threshold = MAX16(pf_threshold, QCONST16(.2f,15));
-   if (gain1<pf_threshold)
-   {
-      gain1 = 0;
-      pf_on = 0;
-      qg = 0;
-   } else {
-      /*This block is not gated by a total bits check only because
-        of the nbAvailableBytes check above.*/
-      if (ABS16(gain1-st->prefilter_gain)<QCONST16(.1f,15))
-         gain1=st->prefilter_gain;
+    /* Gain threshold for enabling the prefilter/postfilter */
+    pf_threshold = QCONST16(.2f, 15);
+
+    /* Adjusting the threshold based on rate and continuity */
+    if (abs(pitch_index - st->prefilter_period)*10 > pitch_index) {
+        pf_threshold += QCONST16(.2f, 15);
+        /* Completely disable the prefilter on strong transients without continuity. */
+        if (tf_estimate > QCONST16(.98f, 14))
+            gain1 = 0;
+    }
+    if (nbAvailableBytes < 25)
+        pf_threshold += QCONST16(.1f, 15);
+    if (nbAvailableBytes < 35)
+        pf_threshold += QCONST16(.1f, 15);
+    if (st->prefilter_gain > QCONST16(.4f, 15))
+        pf_threshold -= QCONST16(.1f, 15);
+    if (st->prefilter_gain > QCONST16(.55f, 15))
+        pf_threshold -= QCONST16(.1f, 15);
+
+    /* Hard threshold at 0.2 */
+    pf_threshold = MAX16(pf_threshold, QCONST16(.2f, 15));
+    if (gain1 < pf_threshold) {
+        gain1 = 0;
+        pf_on = 0;
+        qg = 0;
+    } else {
+        /*This block is not gated by a total bits check only because
+           of the nbAvailableBytes check above.*/
+        if (ABS16(gain1 - st->prefilter_gain) < QCONST16(.1f, 15))
+            gain1 = st->prefilter_gain;
 
 #ifdef FIXED_POINT
-      qg = ((gain1+1536)>>10)/3-1;
+        qg = ((gain1 + 1536)>>10)/3 - 1;
 #else
-      qg = (int)floor(.5f+gain1*32/3)-1;
+        qg = (int)floor(.5f + gain1*32/3) - 1;
 #endif
-      qg = IMAX(0, IMIN(7, qg));
-      gain1 = QCONST16(0.09375f,15)*(qg+1);
-      pf_on = 1;
-   }
-   /*printf("%d %f\n", pitch_index, gain1);*/
-
-   c=0; do {
-      int i;
-      int offset = mode->shortMdctSize-overlap;
-      st->prefilter_period=IMAX(st->prefilter_period, COMBFILTER_MINPERIOD);
-      OAC_COPY(in+c*(N+overlap), st->in_mem+c*(overlap), overlap);
-      for (i=0;i<N;i++) before[c] += ABS32(SHR32(in[c*(N+overlap)+overlap+i], 12));
-      if (offset)
-         comb_filter(in+c*(N+overlap)+overlap, pre[c]+max_period,
+        qg = IMAX(0, IMIN(7, qg));
+        gain1 = QCONST16(0.09375f, 15)*(qg + 1);
+        pf_on = 1;
+    }
+    /*printf("%d %f\n", pitch_index, gain1);*/
+
+    c = 0; do {
+        int i;
+        int offset = mode->shortMdctSize - overlap;
+        st->prefilter_period = IMAX(st->prefilter_period, COMBFILTER_MINPERIOD);
+        OAC_COPY(in + c*(N + overlap), st->in_mem + c*(overlap), overlap);
+        for (i = 0; i < N; i++) before[c] += ABS32(SHR32(in[c*(N + overlap) + overlap + i], 12));
+        if (offset)
+            comb_filter(in + c*(N + overlap) + overlap, pre[c] + max_period,
                st->prefilter_period, st->prefilter_period, offset, -st->prefilter_gain, -st->prefilter_gain,
                st->prefilter_tapset, st->prefilter_tapset, NULL, 0, st->arch);
 
-      comb_filter(in+c*(N+overlap)+overlap+offset, pre[c]+max_period+offset,
-            st->prefilter_period, pitch_index, N-offset, -st->prefilter_gain, -gain1,
+        comb_filter(in + c*(N + overlap) + overlap + offset, pre[c] + max_period + offset,
+            st->prefilter_period, pitch_index, N - offset, -st->prefilter_gain, -gain1,
             st->prefilter_tapset, prefilter_tapset, mode->window, overlap, st->arch);
-      for (i=0;i<N;i++) after[c] += ABS32(SHR32(in[c*(N+overlap)+overlap+i], 12));
-   } while (++c<CC);
-
-   if (CC==2) {
-      oac_val16 thresh[2];
-      thresh[0] = MULT16_32_Q15(MULT16_16_Q15(QCONST16(.25f, 15), gain1), before[0]) + MULT16_32_Q15(QCONST16(.01f,15), before[1]);
-      thresh[1] = MULT16_32_Q15(MULT16_16_Q15(QCONST16(.25f, 15), gain1), before[1]) + MULT16_32_Q15(QCONST16(.01f,15), before[0]);
-      /* Don't use the filter if one channel gets significantly worse. */
-      if (after[0]-before[0] > thresh[0] || after[1]-before[1] > thresh[1]) cancel_pitch = 1;
-      /* Use the filter only if at least one channel gets significantly better. */
-      if (before[0]-after[0] <  thresh[0] && before[1]-after[1] < thresh[1]) cancel_pitch = 1;
-   } else {
-      /* Check that the mono channel actually got better. */
-      if (after[0] > before[0]) cancel_pitch = 1;
-   }
-   /* If needed, revert to a gain of zero. */
-   if (cancel_pitch) {
-      c=0; do {
-         int offset = mode->shortMdctSize-overlap;
-         OAC_COPY(in+c*(N+overlap)+overlap, pre[c]+max_period, N);
-         comb_filter(in+c*(N+overlap)+overlap+offset, pre[c]+max_period+offset,
+        for (i = 0; i < N; i++) after[c] += ABS32(SHR32(in[c*(N + overlap) + overlap + i], 12));
+    } while (++c < CC);
+
+    if (CC == 2) {
+        oac_val16 thresh[2];
+        thresh[0] = MULT16_32_Q15(MULT16_16_Q15(QCONST16(.25f, 15), gain1),
+        before[0]) + MULT16_32_Q15(QCONST16(.01f, 15), before[1]);
+        thresh[1] = MULT16_32_Q15(MULT16_16_Q15(QCONST16(.25f, 15), gain1),
+        before[1]) + MULT16_32_Q15(QCONST16(.01f, 15), before[0]);
+        /* Don't use the filter if one channel gets significantly worse. */
+        if (after[0] - before[0] > thresh[0] || after[1] - before[1] > thresh[1]) cancel_pitch = 1;
+        /* Use the filter only if at least one channel gets significantly better. */
+        if (before[0] - after[0] <  thresh[0] && before[1] - after[1] < thresh[1])cancel_pitch = 1;
+    } else {
+        /* Check that the mono channel actually got better. */
+        if (after[0] > before[0]) cancel_pitch = 1;
+    }
+    /* If needed, revert to a gain of zero. */
+    if (cancel_pitch) {
+        c = 0; do {
+            int offset = mode->shortMdctSize - overlap;
+            OAC_COPY(in + c*(N + overlap) + overlap, pre[c] + max_period, N);
+            comb_filter(in + c*(N + overlap) + overlap + offset, pre[c] + max_period + offset,
                      st->prefilter_period, pitch_index, overlap, -st->prefilter_gain, -0,
                      st->prefilter_tapset, prefilter_tapset, mode->window, overlap, st->arch);
-      } while (++c<CC);
-      gain1 = 0;
-      pf_on = 0;
-      qg = 0;
-   }
-
-   c=0; do {
-      OAC_COPY(st->in_mem+c*(overlap), in+c*(N+overlap)+N, overlap);
-
-      if (N>max_period)
-      {
-         OAC_COPY(prefilter_mem+c*max_period, pre[c]+N, max_period);
-      } else {
-         OAC_MOVE(prefilter_mem+c*max_period, prefilter_mem+c*max_period+N, max_period-N);
-         OAC_COPY(prefilter_mem+c*max_period+max_period-N, pre[c]+max_period, N);
-      }
-   } while (++c<CC);
-
-   RESTORE_STACK;
-   *gain = gain1;
-   *pitch = pitch_index;
-   *qgain = qg;
-   return pf_on;
+        } while (++c < CC);
+        gain1 = 0;
+        pf_on = 0;
+        qg = 0;
+    }
+
+    c = 0; do {
+        OAC_COPY(st->in_mem + c*(overlap), in + c*(N + overlap) + N, overlap);
+
+        if (N > max_period) {
+            OAC_COPY(prefilter_mem + c*max_period, pre[c] + N, max_period);
+        } else {
+            OAC_MOVE(prefilter_mem + c*max_period, prefilter_mem + c*max_period + N, max_period - N);
+            OAC_COPY(prefilter_mem + c*max_period + max_period - N, pre[c] + max_period, N);
+        }
+    } while (++c < CC);
+
+    RESTORE_STACK;
+    *gain = gain1;
+    *pitch = pitch_index;
+    *qgain = qg;
+    return pf_on;
 }
 
 static int compute_vbr(const CELTMode *mode, AnalysisInfo *analysis, oac_int32 base_target,
-      int LM, oac_int32 bitrate, int lastCodedBands, int C, int intensity,
-      int constrained_vbr, oac_val16 stereo_saving, int tot_boost,
-      oac_val16 tf_estimate, int pitch_change, celt_glog maxDepth,
-      int lfe, int has_surround_mask, celt_glog surround_masking,
-      celt_glog temporal_vbr)
-{
-   /* The target rate in 8th bits per frame */
-   oac_int32 target;
-   int coded_bins;
-   int coded_bands;
-   oac_val16 tf_calibration;
-   int nbEBands;
-   const oac_int16 *eBands;
-
-   nbEBands = mode->nbEBands;
-   eBands = mode->eBands;
-
-   coded_bands = lastCodedBands ? lastCodedBands : nbEBands;
-   coded_bins = eBands[coded_bands]<<LM;
-   if (C==2)
-      coded_bins += eBands[IMIN(intensity, coded_bands)]<<LM;
-
-   target = base_target;
-
-   /*printf("%f %f %f %f %d %d ", st->analysis.activity, st->analysis.tonality, tf_estimate, st->stereo_saving, tot_boost, coded_bands);*/
+                       int LM, oac_int32 bitrate, int lastCodedBands, int C, int intensity,
+                       int constrained_vbr, oac_val16 stereo_saving, int tot_boost,
+                       oac_val16 tf_estimate, int pitch_change, celt_glog maxDepth,
+                       int lfe, int has_surround_mask, celt_glog surround_masking,
+                       celt_glog temporal_vbr) {
+    /* The target rate in 8th bits per frame */
+    oac_int32 target;
+    int coded_bins;
+    int coded_bands;
+    oac_val16 tf_calibration;
+    int nbEBands;
+    const oac_int16 *eBands;
+
+    nbEBands = mode->nbEBands;
+    eBands = mode->eBands;
+
+    coded_bands = lastCodedBands ? lastCodedBands : nbEBands;
+    coded_bins = eBands[coded_bands]<<LM;
+    if (C == 2)
+        coded_bins += eBands[IMIN(intensity, coded_bands)]<<LM;
+
+    target = base_target;
+
+    /*printf("%f %f %f %f %d %d ", st->analysis.activity, st->analysis.tonality, tf_estimate, st->stereo_saving, tot_boost, coded_bands);*/
 #ifndef DISABLE_FLOAT_API
-   if (analysis->valid && analysis->activity<.4)
-      target -= (oac_int32)((coded_bins<<BITRES)*(.4f-analysis->activity));
+    if (analysis->valid && analysis->activity < .4)
+        target -= (oac_int32)((coded_bins<<BITRES)*(.4f - analysis->activity));
 #endif
-   /* Stereo savings */
-   if (C==2)
-   {
-      int coded_stereo_bands;
-      int coded_stereo_dof;
-      oac_val16 max_frac;
-      coded_stereo_bands = IMIN(intensity, coded_bands);
-      coded_stereo_dof = (eBands[coded_stereo_bands]<<LM)-coded_stereo_bands;
-      /* Maximum fraction of the bits we can save if the signal is mono. */
-      max_frac = DIV32_16(MULT16_16(QCONST16(0.8f, 15), coded_stereo_dof), coded_bins);
-      stereo_saving = MIN16(stereo_saving, QCONST16(1.f, 8));
-      /*printf("%d %d %d ", coded_stereo_dof, coded_bins, tot_boost);*/
-      target -= (oac_int32)MIN32(MULT16_32_Q15(max_frac,target),
-                      SHR32(MULT16_16(stereo_saving-QCONST16(0.1f,8),(coded_stereo_dof<<BITRES)),8));
-   }
-   /* Boost the rate according to dynalloc (minus the dynalloc average for calibration). */
-   target += tot_boost-(19<<LM);
-   /* Apply transient boost, compensating for average boost. */
-   tf_calibration = QCONST16(0.044f,14);
-   target += (oac_int32)SHL32(MULT16_32_Q15(tf_estimate-tf_calibration, target),1);
+    /* Stereo savings */
+    if (C == 2) {
+        int coded_stereo_bands;
+        int coded_stereo_dof;
+        oac_val16 max_frac;
+        coded_stereo_bands = IMIN(intensity, coded_bands);
+        coded_stereo_dof = (eBands[coded_stereo_bands]<<LM) - coded_stereo_bands;
+        /* Maximum fraction of the bits we can save if the signal is mono. */
+        max_frac = DIV32_16(MULT16_16(QCONST16(0.8f, 15), coded_stereo_dof), coded_bins);
+        stereo_saving = MIN16(stereo_saving, QCONST16(1.f, 8));
+        /*printf("%d %d %d ", coded_stereo_dof, coded_bins, tot_boost);*/
+        target -= (oac_int32)MIN32(MULT16_32_Q15(max_frac, target),
+                      SHR32(MULT16_16(stereo_saving - QCONST16(0.1f, 8), (coded_stereo_dof<<BITRES)), 8));
+    }
+    /* Boost the rate according to dynalloc (minus the dynalloc average for calibration). */
+    target += tot_boost - (19<<LM);
+    /* Apply transient boost, compensating for average boost. */
+    tf_calibration = QCONST16(0.044f, 14);
+    target += (oac_int32)SHL32(MULT16_32_Q15(tf_estimate - tf_calibration, target), 1);
 
 #ifndef DISABLE_FLOAT_API
-   /* Apply tonality boost */
-   if (analysis->valid && !lfe)
-   {
-      oac_int32 tonal_target;
-      float tonal;
-
-      /* Tonality boost (compensating for the average). */
-      tonal = MAX16(0.f,analysis->tonality-.15f)-0.12f;
-      tonal_target = target + (oac_int32)((coded_bins<<BITRES)*1.2f*tonal);
-      if (pitch_change)
-         tonal_target +=  (oac_int32)((coded_bins<<BITRES)*.8f);
-      /*printf("%f %f ", analysis->tonality, tonal);*/
-      target = tonal_target;
-   }
+    /* Apply tonality boost */
+    if (analysis->valid && !lfe) {
+        oac_int32 tonal_target;
+        float tonal;
+
+        /* Tonality boost (compensating for the average). */
+        tonal = MAX16(0.f, analysis->tonality - .15f) - 0.12f;
+        tonal_target = target + (oac_int32)((coded_bins<<BITRES)*1.2f*tonal);
+        if (pitch_change)
+            tonal_target +=  (oac_int32)((coded_bins<<BITRES)*.8f);
+        /*printf("%f %f ", analysis->tonality, tonal);*/
+        target = tonal_target;
+    }
 #else
-   (void)analysis;
-   (void)pitch_change;
+    (void)analysis;
+    (void)pitch_change;
 #endif
 
-   if (has_surround_mask&&!lfe)
-   {
-      oac_int32 surround_target = target + (oac_int32)SHR32(MULT16_16(SHR32(surround_masking,DB_SHIFT-10),coded_bins<<BITRES), 10);
-      /*printf("%f %d %d %d %d %d %d ", surround_masking, coded_bins, st->end, st->intensity, surround_target, target, st->bitrate);*/
-      target = IMAX(target/4, surround_target);
-   }
-
-   {
-      oac_int32 floor_depth;
-      int bins;
-      bins = eBands[nbEBands-2]<<LM;
-      /*floor_depth = SHR32(MULT16_16((C*bins<<BITRES),celt_log2(SHL32(MAX16(1,sample_max),13))), DB_SHIFT);*/
-      floor_depth = (oac_int32)SHR32(MULT16_32_Q15((C*bins<<BITRES),maxDepth), DB_SHIFT-15);
-      floor_depth = IMAX(floor_depth, target>>2);
-      target = IMIN(target, floor_depth);
-      /*printf("%f %d\n", maxDepth, floor_depth);*/
-   }
-
-   /* Make VBR less aggressive for constrained VBR because we can't keep a higher bitrate
-      for long. Needs tuning. */
-   if ((!has_surround_mask||lfe) && constrained_vbr)
-   {
-      target = base_target + (oac_int32)MULT16_32_Q15(QCONST16(0.67f, 15), target-base_target);
-   }
-
-   if (!has_surround_mask && tf_estimate < QCONST16(.2f, 14))
-   {
-      oac_val16 amount;
-      oac_val16 tvbr_factor;
-      amount = MULT16_16_Q15(QCONST16(.0000031f, 30), IMAX(0, IMIN(32000, 96000-bitrate)));
-      tvbr_factor = SHR32(MULT16_16(SHR32(temporal_vbr, DB_SHIFT-10), amount), 10);
-      target += (oac_int32)MULT16_32_Q15(tvbr_factor, target);
-   }
-
-   /* Don't allow more than doubling the rate */
-   target = IMIN(2*base_target, target);
-
-   return target;
+    if (has_surround_mask && !lfe) {
+        oac_int32 surround_target = target + (oac_int32)SHR32(MULT16_16(SHR32(surround_masking, DB_SHIFT - 10),
+        coded_bins<<BITRES), 10);
+        /*printf("%f %d %d %d %d %d %d ", surround_masking, coded_bins, st->end, st->intensity, surround_target, target, st->bitrate);*/
+        target = IMAX(target/4, surround_target);
+    }
+
+    {
+        oac_int32 floor_depth;
+        int bins;
+        bins = eBands[nbEBands - 2]<<LM;
+        /*floor_depth = SHR32(MULT16_16((C*bins<<BITRES),celt_log2(SHL32(MAX16(1,sample_max),13))), DB_SHIFT);*/
+        floor_depth = (oac_int32)SHR32(MULT16_32_Q15((C*bins<<BITRES), maxDepth), DB_SHIFT - 15);
+        floor_depth = IMAX(floor_depth, target>>2);
+        target = IMIN(target, floor_depth);
+        /*printf("%f %d\n", maxDepth, floor_depth);*/
+    }
+
+    /* Make VBR less aggressive for constrained VBR because we can't keep a higher bitrate
+       for long. Needs tuning. */
+    if ((!has_surround_mask || lfe) && constrained_vbr) {
+        target = base_target + (oac_int32)MULT16_32_Q15(QCONST16(0.67f, 15), target - base_target);
+    }
+
+    if (!has_surround_mask && tf_estimate < QCONST16(.2f, 14)) {
+        oac_val16 amount;
+        oac_val16 tvbr_factor;
+        amount = MULT16_16_Q15(QCONST16(.0000031f, 30), IMAX(0, IMIN(32000, 96000 - bitrate)));
+        tvbr_factor = SHR32(MULT16_16(SHR32(temporal_vbr, DB_SHIFT - 10), amount), 10);
+        target += (oac_int32)MULT16_32_Q15(tvbr_factor, target);
+    }
+
+    /* Don't allow more than doubling the rate */
+    target = IMIN(2*base_target, target);
+
+    return target;
 }
 
-int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes, ec_enc *enc)
-{
-   int i, c, N;
-   oac_int32 bits;
-   ec_enc _enc;
-   VARDECL(celt_sig, in);
-   VARDECL(celt_sig, freq);
-   VARDECL(celt_norm, X);
-   VARDECL(celt_ener, bandE);
-   VARDECL(celt_glog, bandLogE);
-   VARDECL(celt_glog, bandLogE2);
-   VARDECL(int, fine_quant);
-   VARDECL(celt_glog, error);
-   VARDECL(int, pulses);
-   VARDECL(int, cap);
-   VARDECL(int, offsets);
-   VARDECL(int, importance);
-   VARDECL(int, spread_weight);
-   VARDECL(int, fine_priority);
-   VARDECL(int, tf_res);
-   VARDECL(unsigned char, collapse_masks);
-   celt_sig *prefilter_mem;
-   celt_glog *oldBandE, *oldLogE, *oldLogE2, *energyError;
-   int shortBlocks=0;
-   int isTransient=0;
-   const int CC = st->channels;
-   const int C = st->stream_channels;
-   int LM, M;
-   int tf_select;
-   int nbFilledBytes, nbAvailableBytes;
-   oac_int32 min_allowed;
-   int start;
-   int end;
-   int effEnd;
-   int codedBands;
-   int alloc_trim;
-   int pitch_index=COMBFILTER_MINPERIOD;
-   oac_val16 gain1 = 0;
-   int dual_stereo=0;
-   int effectiveBytes;
-   int dynalloc_logp;
-   oac_int32 vbr_rate;
-   oac_int32 total_bits;
-   oac_int32 total_boost;
-   oac_int32 balance;
-   oac_int32 tell;
-   oac_int32 tell0_frac;
-   int prefilter_tapset=0;
-   int pf_on;
-   int anti_collapse_rsv;
-   int anti_collapse_on=0;
-   int silence=0;
-   int tf_chan = 0;
-   oac_val16 tf_estimate;
-   int pitch_change=0;
-   oac_int32 tot_boost;
-   oac_val32 sample_max;
-   celt_glog maxDepth;
-   const OacCustomMode *mode;
-   int nbEBands;
-   int overlap;
-   const oac_int16 *eBands;
-   int secondMdct;
-   int signalBandwidth;
-   int transient_got_disabled=0;
-   celt_glog surround_masking=0;
-   celt_glog temporal_vbr=0;
-   celt_glog surround_trim = 0;
-   oac_int32 equiv_rate;
-   int hybrid;
-   int weak_transient = 0;
-   int enable_tf_analysis;
-   oac_val16 tone_freq=-1;
-   oac_val32 toneishness=0;
-   VARDECL(celt_glog, surround_dynalloc);
-   int packet_size_cap = 1275;
-   int qext_scale=1;
-   ALLOC_STACK;
-
-   mode = st->mode;
-   nbEBands = mode->nbEBands;
-   overlap = mode->overlap;
-   eBands = mode->eBands;
-   start = st->start;
-   end = st->end;
-   hybrid = start != 0;
-   tf_estimate = 0;
-   if (nbCompressedBytes<2 || pcm==NULL)
-   {
-      RESTORE_STACK;
-      return OAC_BAD_ARG;
-   }
-
-   frame_size *= st->upsample;
-   for (LM=0;LM<=mode->maxLM;LM++)
-      if (mode->shortMdctSize<<LM==frame_size)
-         break;
-   if (LM>mode->maxLM)
-   {
-      RESTORE_STACK;
-      return OAC_BAD_ARG;
-   }
-   M=1<<LM;
-   N = M*mode->shortMdctSize;
+int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int frame_size, unsigned char *compressed,
+                        int nbCompressedBytes, ec_enc *enc) {
+    int i, c, N;
+    oac_int32 bits;
+    ec_enc _enc;
+    VARDECL(celt_sig, in);
+    VARDECL(celt_sig, freq);
+    VARDECL(celt_norm, X);
+    VARDECL(celt_ener, bandE);
+    VARDECL(celt_glog, bandLogE);
+    VARDECL(celt_glog, bandLogE2);
+    VARDECL(int, fine_quant);
+    VARDECL(celt_glog, error);
+    VARDECL(int, pulses);
+    VARDECL(int, cap);
+    VARDECL(int, offsets);
+    VARDECL(int, importance);
+    VARDECL(int, spread_weight);
+    VARDECL(int, fine_priority);
+    VARDECL(int, tf_res);
+    VARDECL(unsigned char, collapse_masks);
+    celt_sig *prefilter_mem;
+    celt_glog *oldBandE, *oldLogE, *oldLogE2, *energyError;
+    int shortBlocks = 0;
+    int isTransient = 0;
+    const int CC = st->channels;
+    const int C = st->stream_channels;
+    int LM, M;
+    int tf_select;
+    int nbFilledBytes, nbAvailableBytes;
+    oac_int32 min_allowed;
+    int start;
+    int end;
+    int effEnd;
+    int codedBands;
+    int alloc_trim;
+    int pitch_index = COMBFILTER_MINPERIOD;
+    oac_val16 gain1 = 0;
+    int dual_stereo = 0;
+    int effectiveBytes;
+    int dynalloc_logp;
+    oac_int32 vbr_rate;
+    oac_int32 total_bits;
+    oac_int32 total_boost;
+    oac_int32 balance;
+    oac_int32 tell;
+    oac_int32 tell0_frac;
+    int prefilter_tapset = 0;
+    int pf_on;
+    int anti_collapse_rsv;
+    int anti_collapse_on = 0;
+    int silence = 0;
+    int tf_chan = 0;
+    oac_val16 tf_estimate;
+    int pitch_change = 0;
+    oac_int32 tot_boost;
+    oac_val32 sample_max;
+    celt_glog maxDepth;
+    const OacCustomMode *mode;
+    int nbEBands;
+    int overlap;
+    const oac_int16 *eBands;
+    int secondMdct;
+    int signalBandwidth;
+    int transient_got_disabled = 0;
+    celt_glog surround_masking = 0;
+    celt_glog temporal_vbr = 0;
+    celt_glog surround_trim = 0;
+    oac_int32 equiv_rate;
+    int hybrid;
+    int weak_transient = 0;
+    int enable_tf_analysis;
+    oac_val16 tone_freq = -1;
+    oac_val32 toneishness = 0;
+    VARDECL(celt_glog, surround_dynalloc);
+    int packet_size_cap = 1275;
+    int qext_scale = 1;
+    ALLOC_STACK;
+
+    mode = st->mode;
+    nbEBands = mode->nbEBands;
+    overlap = mode->overlap;
+    eBands = mode->eBands;
+    start = st->start;
+    end = st->end;
+    hybrid = start != 0;
+    tf_estimate = 0;
+    if (nbCompressedBytes < 2 || pcm == NULL) {
+        RESTORE_STACK;
+        return OAC_BAD_ARG;
+    }
+
+    frame_size *= st->upsample;
+    for (LM = 0; LM <= mode->maxLM; LM++)
+        if (mode->shortMdctSize<<LM == frame_size)
+            break;
+    if (LM > mode->maxLM) {
+        RESTORE_STACK;
+        return OAC_BAD_ARG;
+    }
+    M = 1<<LM;
+    N = M*mode->shortMdctSize;
 
 #ifdef ENABLE_QEXT
-   qext_scale = st->qext_scale;
+    qext_scale = st->qext_scale;
 #endif
 
-   prefilter_mem = st->in_mem+CC*(overlap);
-   oldBandE = (celt_glog*)(st->in_mem+CC*(overlap+QEXT_SCALE(COMBFILTER_MAXPERIOD)));
-   oldLogE = oldBandE + CC*nbEBands;
-   oldLogE2 = oldLogE + CC*nbEBands;
-   energyError = oldLogE2 + CC*nbEBands;
-
-   if (enc==NULL)
-   {
-      tell0_frac=tell=1;
-      nbFilledBytes=0;
-   } else {
-      tell0_frac=ec_tell_frac(enc);
-      tell=ec_tell(enc);
-      nbFilledBytes=(tell+4)>>3;
-   }
+    prefilter_mem = st->in_mem + CC*(overlap);
+    oldBandE = (celt_glog*)(st->in_mem + CC*(overlap + QEXT_SCALE(COMBFILTER_MAXPERIOD)));
+    oldLogE = oldBandE + CC*nbEBands;
+    oldLogE2 = oldLogE + CC*nbEBands;
+    energyError = oldLogE2 + CC*nbEBands;
+
+    if (enc == NULL) {
+        tell0_frac = tell = 1;
+        nbFilledBytes = 0;
+    } else {
+        tell0_frac = ec_tell_frac(enc);
+        tell = ec_tell(enc);
+        nbFilledBytes = (tell + 4)>>3;
+    }
 
 #if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
-   if (st->signalling && enc==NULL)
-   {
-      int tmp = (mode->effEBands-end)>>1;
-      end = st->end = IMAX(1, mode->effEBands-tmp);
-      compressed[0] = tmp<<5;
-      compressed[0] |= LM<<3;
-      compressed[0] |= (C==2)<<2;
-      /* Convert "standard mode" to Oac header */
+    if (st->signalling && enc == NULL) {
+        int tmp = (mode->effEBands - end)>>1;
+        end = st->end = IMAX(1, mode->effEBands - tmp);
+        compressed[0] = tmp<<5;
+        compressed[0] |= LM<<3;
+        compressed[0] |= (C == 2)<<2;
+        /* Convert "standard mode" to Oac header */
 # ifndef ENABLE_QEXT
-      if (mode->Fs==48000 && mode->shortMdctSize==120)
+        if (mode->Fs == 48000 && mode->shortMdctSize == 120)
 # endif
-      {
-         int c0 = toOac(compressed[0]);
-         if (c0<0)
-         {
-            RESTORE_STACK;
-            return OAC_BAD_ARG;
-         }
-         compressed[0] = c0;
-      }
-      compressed++;
-      nbCompressedBytes--;
-   }
+        {
+            int c0 = toOac(compressed[0]);
+            if (c0 < 0) {
+                RESTORE_STACK;
+                return OAC_BAD_ARG;
+            }
+            compressed[0] = c0;
+        }
+        compressed++;
+        nbCompressedBytes--;
+    }
 #else
-   celt_assert(st->signalling==0);
+    celt_assert(st->signalling == 0);
 #endif
 
-   /* Can't produce more than 1275 output bytes for the main payload. */
-   nbCompressedBytes = IMIN(nbCompressedBytes,packet_size_cap);
+    /* Can't produce more than 1275 output bytes for the main payload. */
+    nbCompressedBytes = IMIN(nbCompressedBytes, packet_size_cap);
 
-   if (st->vbr && st->bitrate!=OAC_BITRATE_MAX)
-   {
-      vbr_rate = bitrate_to_bits(st->bitrate, mode->Fs, frame_size)<<BITRES;
+    if (st->vbr && st->bitrate != OAC_BITRATE_MAX) {
+        vbr_rate = bitrate_to_bits(st->bitrate, mode->Fs, frame_size)<<BITRES;
 #if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
-      if (st->signalling)
-         vbr_rate -= 8<<BITRES;
+        if (st->signalling)
+            vbr_rate -= 8<<BITRES;
 #endif
-      effectiveBytes = vbr_rate>>(3+BITRES);
-   } else {
-      oac_int32 tmp;
-      vbr_rate = 0;
-      tmp = st->bitrate*frame_size;
-      if (tell>1)
-         tmp += tell*mode->Fs;
-      if (st->bitrate!=OAC_BITRATE_MAX)
-      {
-         nbCompressedBytes = IMAX(2, IMIN(nbCompressedBytes,
-               (tmp+4*mode->Fs)/(8*mode->Fs)-!!st->signalling));
-         if (enc != NULL)
-            ec_enc_shrink(enc, nbCompressedBytes);
-      }
-      effectiveBytes = nbCompressedBytes - nbFilledBytes;
-   }
-   nbAvailableBytes = nbCompressedBytes - nbFilledBytes;
-   equiv_rate = ((oac_int32)nbCompressedBytes*8*50 << (3-LM)) - (40*C+20)*((400>>LM) - 50);
-   if (st->bitrate != OAC_BITRATE_MAX)
-      equiv_rate = IMIN(equiv_rate, st->bitrate - (40*C+20)*((400>>LM) - 50));
-
-   if (enc==NULL)
-   {
-      ec_enc_init(&_enc, compressed, nbCompressedBytes);
-      enc = &_enc;
-   }
-
-   if (vbr_rate>0)
-   {
-      /* Computes the max bit-rate allowed in VBR mode to avoid violating the
-          target rate and buffering.
-         We must do this up front so that bust-prevention logic triggers
-          correctly if we don't have enough bits. */
-      if (st->constrained_vbr)
-      {
-         oac_int32 vbr_bound;
-         oac_int32 max_allowed;
-         /* We could use any multiple of vbr_rate as bound (depending on the
-             delay).
-            This is clamped to ensure we use at least two bytes if the encoder
-             was entirely empty, but to allow 0 in hybrid mode. */
-         vbr_bound = vbr_rate;
-         max_allowed = IMIN(IMAX(tell==1?2:0,
-               (vbr_rate+vbr_bound-st->vbr_reservoir)>>(BITRES+3)),
+        effectiveBytes = vbr_rate>>(3 + BITRES);
+    } else {
+        oac_int32 tmp;
+        vbr_rate = 0;
+        tmp = st->bitrate*frame_size;
+        if (tell > 1)
+            tmp += tell*mode->Fs;
+        if (st->bitrate != OAC_BITRATE_MAX) {
+            nbCompressedBytes = IMAX(2, IMIN(nbCompressedBytes,
+                (tmp + 4*mode->Fs)/(8*mode->Fs) - !!st->signalling));
+            if (enc != NULL)
+                ec_enc_shrink(enc, nbCompressedBytes);
+        }
+        effectiveBytes = nbCompressedBytes - nbFilledBytes;
+    }
+    nbAvailableBytes = nbCompressedBytes - nbFilledBytes;
+    equiv_rate = ((oac_int32)nbCompressedBytes*8*50<<(3 - LM)) - (40*C + 20)*((400>>LM) - 50);
+    if (st->bitrate != OAC_BITRATE_MAX)
+        equiv_rate = IMIN(equiv_rate, st->bitrate - (40*C + 20)*((400>>LM) - 50));
+
+    if (enc == NULL) {
+        ec_enc_init(&_enc, compressed, nbCompressedBytes);
+        enc = &_enc;
+    }
+
+    if (vbr_rate > 0) {
+        /* Computes the max bit-rate allowed in VBR mode to avoid violating the
+            target rate and buffering.
+           We must do this up front so that bust-prevention logic triggers
+            correctly if we don't have enough bits. */
+        if (st->constrained_vbr) {
+            oac_int32 vbr_bound;
+            oac_int32 max_allowed;
+            /* We could use any multiple of vbr_rate as bound (depending on the
+                delay).
+               This is clamped to ensure we use at least two bytes if the encoder
+                was entirely empty, but to allow 0 in hybrid mode. */
+            vbr_bound = vbr_rate;
+            max_allowed = IMIN(IMAX(tell == 1?2:0,
+                (vbr_rate + vbr_bound - st->vbr_reservoir)>>(BITRES + 3)),
                nbAvailableBytes);
-         if(max_allowed < nbAvailableBytes)
-         {
-            nbCompressedBytes = nbFilledBytes+max_allowed;
-            nbAvailableBytes = max_allowed;
-            ec_enc_shrink(enc, nbCompressedBytes);
-         }
-      }
-   }
-   total_bits = nbCompressedBytes*8;
-
-   effEnd = end;
-   if (effEnd > mode->effEBands)
-      effEnd = mode->effEBands;
-
-   ALLOC(in, CC*(N+overlap), celt_sig);
-
-   sample_max=MAX32(st->overlap_max, celt_maxabs_res(pcm, C*(N-overlap)/st->upsample));
-   st->overlap_max=celt_maxabs_res(pcm+C*(N-overlap)/st->upsample, C*overlap/st->upsample);
-   sample_max=MAX32(sample_max, st->overlap_max);
+            if (max_allowed < nbAvailableBytes) {
+                nbCompressedBytes = nbFilledBytes + max_allowed;
+                nbAvailableBytes = max_allowed;
+                ec_enc_shrink(enc, nbCompressedBytes);
+            }
+        }
+    }
+    total_bits = nbCompressedBytes*8;
+
+    effEnd = end;
+    if (effEnd > mode->effEBands)
+        effEnd = mode->effEBands;
+
+    ALLOC(in, CC*(N + overlap), celt_sig);
+
+    sample_max = MAX32(st->overlap_max, celt_maxabs_res(pcm, C*(N - overlap)/st->upsample));
+    st->overlap_max = celt_maxabs_res(pcm + C*(N - overlap)/st->upsample, C*overlap/st->upsample);
+    sample_max = MAX32(sample_max, st->overlap_max);
 #ifdef FIXED_POINT
-   silence = (sample_max==0);
+    silence = (sample_max == 0);
 #else
-   silence = (sample_max <= (oac_val16)1/(1<<st->lsb_depth));
+    silence = (sample_max <= (oac_val16)1/(1<<st->lsb_depth));
 #endif
 #ifdef FUZZING
-   if ((rand()&0x3F)==0)
-      silence = 1;
+    if ((rand()&0x3F) == 0)
+        silence = 1;
 #endif
-   if (tell==1)
-      ec_enc_bit_logp(enc, silence, 15);
-   else
-      silence=0;
-   if (silence)
-   {
-      /*In VBR mode there is no need to send more than the minimum. */
-      if (vbr_rate>0)
-      {
-         effectiveBytes=nbCompressedBytes=IMIN(nbCompressedBytes, nbFilledBytes+2);
-         total_bits=nbCompressedBytes*8;
-         nbAvailableBytes=2;
-         ec_enc_shrink(enc, nbCompressedBytes);
-      }
-      /* Pretend we've filled all the remaining bits with zeros
-            (that's what the initialiser did anyway) */
-      tell = nbCompressedBytes*8;
-      enc->nbits_total+=tell-ec_tell(enc);
-   }
-   c=0; do {
-      int need_clip=0;
+    if (tell == 1)
+        ec_enc_bit_logp(enc, silence, 15);
+    else
+        silence = 0;
+    if (silence) {
+        /*In VBR mode there is no need to send more than the minimum. */
+        if (vbr_rate > 0) {
+            effectiveBytes = nbCompressedBytes = IMIN(nbCompressedBytes, nbFilledBytes + 2);
+            total_bits = nbCompressedBytes*8;
+            nbAvailableBytes = 2;
+            ec_enc_shrink(enc, nbCompressedBytes);
+        }
+        /* Pretend we've filled all the remaining bits with zeros
+              (that's what the initialiser did anyway) */
+        tell = nbCompressedBytes*8;
+        enc->nbits_total += tell - ec_tell(enc);
+    }
+    c = 0; do {
+        int need_clip = 0;
 #ifdef FIXED_POINT
-      need_clip = st->clip && sample_max>65536<<RES_SHIFT;
+        need_clip = st->clip && sample_max > 65536<<RES_SHIFT;
 #else
-      need_clip = st->clip && sample_max>65536.f;
+        need_clip = st->clip && sample_max > 65536.f;
 #endif
-      celt_preemphasis(pcm+c, in+c*(N+overlap)+overlap, N, CC, st->upsample,
-                  mode->preemph, st->preemph_memE+c, need_clip);
-      OAC_COPY(in+c*(N+overlap), &prefilter_mem[(1+c)*QEXT_SCALE(COMBFILTER_MAXPERIOD)-overlap], overlap);
-   } while (++c<CC);
-
-
-   tone_freq = tone_detect(in, CC, N+overlap, &toneishness, mode->Fs);
-   isTransient = 0;
-   shortBlocks = 0;
-   if (st->complexity >= 1 && !st->lfe)
-   {
-      /* Reduces the likelihood of energy instability on fricatives at low bitrate
-         in hybrid mode. It seems like we still want to have real transients on vowels
-         though (small SILK quantization offset value). */
-      int allow_weak_transients = hybrid && effectiveBytes<15 && st->silk_info.signalType != 2;
-      isTransient = transient_analysis(in, N+overlap, CC,
+        celt_preemphasis(pcm + c, in + c*(N + overlap) + overlap, N, CC, st->upsample,
+                  mode->preemph, st->preemph_memE + c, need_clip);
+        OAC_COPY(in + c*(N + overlap), &prefilter_mem[(1 + c)*QEXT_SCALE(COMBFILTER_MAXPERIOD) - overlap], overlap);
+    } while (++c < CC);
+
+
+    tone_freq = tone_detect(in, CC, N + overlap, &toneishness, mode->Fs);
+    isTransient = 0;
+    shortBlocks = 0;
+    if (st->complexity >= 1 && !st->lfe) {
+        /* Reduces the likelihood of energy instability on fricatives at low bitrate
+           in hybrid mode. It seems like we still want to have real transients on vowels
+           though (small SILK quantization offset value). */
+        int allow_weak_transients = hybrid && effectiveBytes < 15 && st->silk_info.signalType != 2;
+        isTransient = transient_analysis(in, N + overlap, CC,
             &tf_estimate, &tf_chan, allow_weak_transients, &weak_transient, tone_freq, toneishness);
-   }
-   toneishness = MIN32(toneishness, QCONST32(1.f, 29)-SHL32(tf_estimate, 15));
-   /* Find pitch period and gain */
-   {
-      int enabled;
-      int qg;
-      enabled = ((st->lfe&&nbAvailableBytes>3) || nbAvailableBytes>12*C) && !hybrid && !silence && tell+16<=total_bits && !st->disable_pf;
-
-      prefilter_tapset = st->tapset_decision;
-      pf_on = run_prefilter(st, in, prefilter_mem, CC, N, prefilter_tapset, &pitch_index, &gain1, &qg, enabled, st->complexity, tf_estimate, nbAvailableBytes, &st->analysis, tone_freq, toneishness, qext_scale);
-      if ((gain1 > QCONST16(.4f,15) || st->prefilter_gain > QCONST16(.4f,15)) && (!st->analysis.valid || st->analysis.tonality > .3)
+    }
+    toneishness = MIN32(toneishness, QCONST32(1.f, 29) - SHL32(tf_estimate, 15));
+    /* Find pitch period and gain */
+    {
+        int enabled;
+        int qg;
+        enabled = ((st->lfe && nbAvailableBytes > 3) || nbAvailableBytes > 12*C) && !hybrid && !silence
+                  && tell + 16 <= total_bits && !st->disable_pf;
+
+        prefilter_tapset = st->tapset_decision;
+        pf_on = run_prefilter(st, in, prefilter_mem, CC, N, prefilter_tapset, &pitch_index, &gain1, &qg, enabled,
+        st->complexity, tf_estimate, nbAvailableBytes, &st->analysis, tone_freq, toneishness, qext_scale);
+        if ((gain1 > QCONST16(.4f, 15) || st->prefilter_gain > QCONST16(.4f,
+        15)) && (!st->analysis.valid || st->analysis.tonality > .3)
             && (pitch_index > 1.26*st->prefilter_period || pitch_index < .79*st->prefilter_period))
-         pitch_change = 1;
-      if (pf_on==0)
-      {
-         if(!hybrid && tell+16<=total_bits)
-            ec_enc_bit_logp(enc, 0, 1);
-      } else {
-         /*This block is not gated by a total bits check only because
-           of the nbAvailableBytes check above.*/
-         int octave;
-         ec_enc_bit_logp(enc, 1, 1);
-         pitch_index += 1;
-         octave = EC_ILOG(pitch_index)-5;
-         ec_enc_uint(enc, octave, 6);
-         ec_enc_bits(enc, pitch_index-(16<<octave), 4+octave);
-         pitch_index -= 1;
-         ec_enc_bits(enc, qg, 3);
-         ec_enc_icdf(enc, prefilter_tapset, tapset_icdf, 2);
-      }
-   }
-   if (LM>0 && ec_tell(enc)+3<=total_bits)
-   {
-      if (isTransient)
-         shortBlocks = M;
-   } else {
-      isTransient = 0;
-      transient_got_disabled=1;
-   }
-
-   ALLOC(freq, CC*N, celt_sig); /**< Interleaved signal MDCTs */
-   ALLOC(bandE,nbEBands*CC, celt_ener);
-   ALLOC(bandLogE,nbEBands*CC, celt_glog);
-
-   secondMdct = shortBlocks && st->complexity>=8;
-   ALLOC(bandLogE2, C*nbEBands, celt_glog);
-   if (secondMdct)
-   {
-      compute_mdcts(mode, 0, in, freq, C, CC, LM, st->upsample, st->arch);
-      compute_band_energies(mode, freq, bandE, effEnd, C, LM, st->arch);
-      amp2Log2(mode, effEnd, end, bandE, bandLogE2, C);
-      for (c=0;c<C;c++)
-      {
-         for (i=0;i<end;i++)
-            bandLogE2[nbEBands*c+i] += HALF32(SHL32(LM, DB_SHIFT));
-      }
-   }
-
-   compute_mdcts(mode, shortBlocks, in, freq, C, CC, LM, st->upsample, st->arch);
-   /* This should catch any NaN in the CELT input. Since we're not supposed to see any (they're filtered
-      at the Oac layer), just abort. */
-   celt_assert(!celt_isnan(freq[0]) && (C==1 || !celt_isnan(freq[N])));
-   if (CC==2&&C==1)
-      tf_chan = 0;
-   compute_band_energies(mode, freq, bandE, effEnd, C, LM, st->arch);
-
-   if (st->lfe)
-   {
-      for (i=2;i<end;i++)
-      {
-         bandE[i] = IMIN(bandE[i], MULT16_32_Q15(QCONST16(1e-4f,15),bandE[0]));
-         bandE[i] = MAX32(bandE[i], EPSILON);
-      }
-   }
-   amp2Log2(mode, effEnd, end, bandE, bandLogE, C);
-
-   ALLOC(surround_dynalloc, C*nbEBands, celt_glog);
-   OAC_CLEAR(surround_dynalloc, end);
-   /* This computes how much masking takes place between surround channels */
-   if (!hybrid&&st->energy_mask&&!st->lfe)
-   {
-      int mask_end;
-      int midband;
-      int count_dynalloc;
-      oac_val32 mask_avg=0;
-      oac_val32 diff=0;
-      int count=0;
-      mask_end = IMAX(2,st->lastCodedBands);
-      for (c=0;c<C;c++)
-      {
-         for(i=0;i<mask_end;i++)
-         {
-            celt_glog mask;
-            oac_val16 mask16;
-            mask = MAXG(MING(st->energy_mask[nbEBands*c+i],
+            pitch_change = 1;
+        if (pf_on == 0) {
+            if (!hybrid && tell + 16 <= total_bits)
+                ec_enc_bit_logp(enc, 0, 1);
+        } else {
+            /*This block is not gated by a total bits check only because
+               of the nbAvailableBytes check above.*/
+            int octave;
+            ec_enc_bit_logp(enc, 1, 1);
+            pitch_index += 1;
+            octave = EC_ILOG(pitch_index) - 5;
+            ec_enc_uint(enc, octave, 6);
+            ec_enc_bits(enc, pitch_index - (16<<octave), 4 + octave);
+            pitch_index -= 1;
+            ec_enc_bits(enc, qg, 3);
+            ec_enc_icdf(enc, prefilter_tapset, tapset_icdf, 2);
+        }
+    }
+    if (LM > 0 && ec_tell(enc) + 3 <= total_bits) {
+        if (isTransient)
+            shortBlocks = M;
+    } else {
+        isTransient = 0;
+        transient_got_disabled = 1;
+    }
+
+    ALLOC(freq, CC*N, celt_sig); /**< Interleaved signal MDCTs */
+    ALLOC(bandE, nbEBands*CC, celt_ener);
+    ALLOC(bandLogE, nbEBands*CC, celt_glog);
+
+    secondMdct = shortBlocks && st->complexity >= 8;
+    ALLOC(bandLogE2, C*nbEBands, celt_glog);
+    if (secondMdct) {
+        compute_mdcts(mode, 0, in, freq, C, CC, LM, st->upsample, st->arch);
+        compute_band_energies(mode, freq, bandE, effEnd, C, LM, st->arch);
+        amp2Log2(mode, effEnd, end, bandE, bandLogE2, C);
+        for (c = 0; c < C; c++) {
+            for (i = 0; i < end; i++)
+                bandLogE2[nbEBands*c + i] += HALF32(SHL32(LM, DB_SHIFT));
+        }
+    }
+
+    compute_mdcts(mode, shortBlocks, in, freq, C, CC, LM, st->upsample, st->arch);
+    /* This should catch any NaN in the CELT input. Since we're not supposed to see any (they're filtered
+       at the Oac layer), just abort. */
+    celt_assert(!celt_isnan(freq[0]) && (C == 1 || !celt_isnan(freq[N])));
+    if (CC == 2 && C == 1)
+        tf_chan = 0;
+    compute_band_energies(mode, freq, bandE, effEnd, C, LM, st->arch);
+
+    if (st->lfe) {
+        for (i = 2; i < end; i++) {
+            bandE[i] = IMIN(bandE[i], MULT16_32_Q15(QCONST16(1e-4f, 15), bandE[0]));
+            bandE[i] = MAX32(bandE[i], EPSILON);
+        }
+    }
+    amp2Log2(mode, effEnd, end, bandE, bandLogE, C);
+
+    ALLOC(surround_dynalloc, C*nbEBands, celt_glog);
+    OAC_CLEAR(surround_dynalloc, end);
+    /* This computes how much masking takes place between surround channels */
+    if (!hybrid && st->energy_mask && !st->lfe) {
+        int mask_end;
+        int midband;
+        int count_dynalloc;
+        oac_val32 mask_avg = 0;
+        oac_val32 diff = 0;
+        int count = 0;
+        mask_end = IMAX(2, st->lastCodedBands);
+        for (c = 0; c < C; c++) {
+            for (i = 0; i < mask_end; i++) {
+                celt_glog mask;
+                oac_val16 mask16;
+                mask = MAXG(MING(st->energy_mask[nbEBands*c + i],
                    GCONST(.25f)), -GCONST(2.0f));
-            if (mask > 0)
-               mask = HALF32(mask);
-            mask16 = SHR32(mask, DB_SHIFT-10);
-            mask_avg += MULT16_16(mask16, eBands[i+1]-eBands[i]);
-            count += eBands[i+1]-eBands[i];
-            diff += MULT16_16(mask16, 1+2*i-mask_end);
-         }
-      }
-      celt_assert(count>0);
-      mask_avg = SHL32(DIV32_16(mask_avg,count), DB_SHIFT-10);
-      mask_avg += GCONST(.2f);
-      diff = SHL32(diff*6/(C*(mask_end-1)*(mask_end+1)*mask_end), DB_SHIFT-10);
-      /* Again, being conservative */
-      diff = HALF32(diff);
-      diff = MAX32(MIN32(diff, GCONST(.031f)), -GCONST(.031f));
-      /* Find the band that's in the middle of the coded spectrum */
-      for (midband=0;eBands[midband+1] < eBands[mask_end]/2;midband++);
-      count_dynalloc=0;
-      for(i=0;i<mask_end;i++)
-      {
-         oac_val32 lin;
-         celt_glog unmask;
-         lin = mask_avg + diff*(i-midband);
-         if (C==2)
-            unmask = MAXG(st->energy_mask[i], st->energy_mask[nbEBands+i]);
-         else
-            unmask = st->energy_mask[i];
-         unmask = MING(unmask, GCONST(.0f));
-         unmask -= lin;
-         if (unmask > GCONST(.25f))
-         {
-            surround_dynalloc[i] = unmask - GCONST(.25f);
-            count_dynalloc++;
-         }
-      }
-      if (count_dynalloc>=3)
-      {
-         /* If we need dynalloc in many bands, it's probably because our
-            initial masking rate was too low. */
-         mask_avg += GCONST(.25f);
-         if (mask_avg>0)
-         {
-            /* Something went really wrong in the original calculations,
-               disabling masking. */
-            mask_avg = 0;
-            diff = 0;
-            OAC_CLEAR(surround_dynalloc, mask_end);
-         } else {
-            for(i=0;i<mask_end;i++)
-               surround_dynalloc[i] = MAXG(0, surround_dynalloc[i]-GCONST(.25f));
-         }
-      }
-      mask_avg += GCONST(.2f);
-      /* Convert to 1/64th units used for the trim */
-      surround_trim = 64*diff;
-      /*printf("%d %d ", mask_avg, surround_trim);*/
-      surround_masking = mask_avg;
-   }
-   /* Temporal VBR (but not for LFE) */
-   if (!st->lfe)
-   {
-      celt_glog follow=-QCONST32(10.0f, DB_SHIFT-5);
-      oac_val32 frame_avg=0;
-      celt_glog offset = shortBlocks?HALF32(SHL32(LM, DB_SHIFT-5)):0;
-      for(i=start;i<end;i++)
-      {
-         follow = MAXG(follow-QCONST32(1.0f, DB_SHIFT-5), SHR32(bandLogE[i],5)-offset);
-         if (C==2)
-            follow = MAXG(follow, SHR32(bandLogE[i+nbEBands],5)-offset);
-         frame_avg += follow;
-      }
-      frame_avg /= (end-start);
-      temporal_vbr = SUB32(SHL32(frame_avg, 5),st->spec_avg);
-      temporal_vbr = MING(GCONST(3.f), MAXG(-GCONST(1.5f), temporal_vbr));
-      st->spec_avg += MULT16_32_Q15(QCONST16(.02f, 15), temporal_vbr);
-   }
-   /*for (i=0;i<21;i++)
-      printf("%f ", bandLogE[i]);
-   printf("\n");*/
-
-   if (!secondMdct)
-   {
-      OAC_COPY(bandLogE2, bandLogE, C*nbEBands);
-   }
-
-   /* Last chance to catch any transient we might have missed in the
-      time-domain analysis */
-   if (LM>0 && ec_tell(enc)+3<=total_bits && !isTransient && st->complexity>=5 && !st->lfe && !hybrid)
-   {
-      if (patch_transient_decision(bandLogE, oldBandE, nbEBands, start, end, C))
-      {
-         isTransient = 1;
-         shortBlocks = M;
-         compute_mdcts(mode, shortBlocks, in, freq, C, CC, LM, st->upsample, st->arch);
-         compute_band_energies(mode, freq, bandE, effEnd, C, LM, st->arch);
-         amp2Log2(mode, effEnd, end, bandE, bandLogE, C);
-         /* Compensate for the scaling of short vs long mdcts */
-         for (c=0;c<C;c++)
-         {
-            for (i=0;i<end;i++)
-               bandLogE2[nbEBands*c+i] += HALF32(SHL32(LM, DB_SHIFT));
-         }
-         tf_estimate = QCONST16(.2f,14);
-      }
-   }
-
-   if (LM>0 && ec_tell(enc)+3<=total_bits)
-      ec_enc_bit_logp(enc, isTransient, 3);
-
-   ALLOC(X, C*N, celt_norm);         /**< Interleaved normalised MDCTs */
-
-   /* Band normalisation */
-   normalise_bands(mode, freq, X, bandE, effEnd, C, M);
-
-   enable_tf_analysis = effectiveBytes>=15*C && !hybrid && st->complexity>=2 && !st->lfe && toneishness < QCONST32(.98f, 29);
-
-   ALLOC(offsets, nbEBands, int);
-   ALLOC(importance, nbEBands, int);
-   ALLOC(spread_weight, nbEBands, int);
-
-   maxDepth = dynalloc_analysis(bandLogE, bandLogE2, oldBandE, nbEBands, start, end, C, offsets,
+                if (mask > 0)
+                    mask = HALF32(mask);
+                mask16 = SHR32(mask, DB_SHIFT - 10);
+                mask_avg += MULT16_16(mask16, eBands[i + 1] - eBands[i]);
+                count += eBands[i + 1] - eBands[i];
+                diff += MULT16_16(mask16, 1 + 2*i - mask_end);
+            }
+        }
+        celt_assert(count > 0);
+        mask_avg = SHL32(DIV32_16(mask_avg, count), DB_SHIFT - 10);
+        mask_avg += GCONST(.2f);
+        diff = SHL32(diff*6/(C*(mask_end - 1)*(mask_end + 1)*mask_end), DB_SHIFT - 10);
+        /* Again, being conservative */
+        diff = HALF32(diff);
+        diff = MAX32(MIN32(diff, GCONST(.031f)), -GCONST(.031f));
+        /* Find the band that's in the middle of the coded spectrum */
+        for (midband = 0; eBands[midband + 1] < eBands[mask_end]/2; midband++) ;
+        count_dynalloc = 0;
+        for (i = 0; i < mask_end; i++) {
+            oac_val32 lin;
+            celt_glog unmask;
+            lin = mask_avg + diff*(i - midband);
+            if (C == 2)
+                unmask = MAXG(st->energy_mask[i], st->energy_mask[nbEBands + i]);
+            else
+                unmask = st->energy_mask[i];
+            unmask = MING(unmask, GCONST(.0f));
+            unmask -= lin;
+            if (unmask > GCONST(.25f)) {
+                surround_dynalloc[i] = unmask - GCONST(.25f);
+                count_dynalloc++;
+            }
+        }
+        if (count_dynalloc >= 3) {
+            /* If we need dynalloc in many bands, it's probably because our
+               initial masking rate was too low. */
+            mask_avg += GCONST(.25f);
+            if (mask_avg > 0) {
+                /* Something went really wrong in the original calculations,
+                   disabling masking. */
+                mask_avg = 0;
+                diff = 0;
+                OAC_CLEAR(surround_dynalloc, mask_end);
+            } else {
+                for (i = 0; i < mask_end; i++)
+                    surround_dynalloc[i] = MAXG(0, surround_dynalloc[i] - GCONST(.25f));
+            }
+        }
+        mask_avg += GCONST(.2f);
+        /* Convert to 1/64th units used for the trim */
+        surround_trim = 64*diff;
+        /*printf("%d %d ", mask_avg, surround_trim);*/
+        surround_masking = mask_avg;
+    }
+    /* Temporal VBR (but not for LFE) */
+    if (!st->lfe) {
+        celt_glog follow = -QCONST32(10.0f, DB_SHIFT - 5);
+        oac_val32 frame_avg = 0;
+        celt_glog offset = shortBlocks?HALF32(SHL32(LM, DB_SHIFT - 5)):0;
+        for (i = start; i < end; i++) {
+            follow = MAXG(follow - QCONST32(1.0f, DB_SHIFT - 5), SHR32(bandLogE[i], 5) - offset);
+            if (C == 2)
+                follow = MAXG(follow, SHR32(bandLogE[i + nbEBands], 5) - offset);
+            frame_avg += follow;
+        }
+        frame_avg /= (end - start);
+        temporal_vbr = SUB32(SHL32(frame_avg, 5), st->spec_avg);
+        temporal_vbr = MING(GCONST(3.f), MAXG(-GCONST(1.5f), temporal_vbr));
+        st->spec_avg += MULT16_32_Q15(QCONST16(.02f, 15), temporal_vbr);
+    }
+    /*for (i=0;i<21;i++)
+       printf("%f ", bandLogE[i]);
+       printf("\n");*/
+
+    if (!secondMdct) {
+        OAC_COPY(bandLogE2, bandLogE, C*nbEBands);
+    }
+
+    /* Last chance to catch any transient we might have missed in the
+       time-domain analysis */
+    if (LM > 0 && ec_tell(enc) + 3 <= total_bits && !isTransient && st->complexity >= 5 && !st->lfe && !hybrid) {
+        if (patch_transient_decision(bandLogE, oldBandE, nbEBands, start, end, C)) {
+            isTransient = 1;
+            shortBlocks = M;
+            compute_mdcts(mode, shortBlocks, in, freq, C, CC, LM, st->upsample, st->arch);
+            compute_band_energies(mode, freq, bandE, effEnd, C, LM, st->arch);
+            amp2Log2(mode, effEnd, end, bandE, bandLogE, C);
+            /* Compensate for the scaling of short vs long mdcts */
+            for (c = 0; c < C; c++) {
+                for (i = 0; i < end; i++)
+                    bandLogE2[nbEBands*c + i] += HALF32(SHL32(LM, DB_SHIFT));
+            }
+            tf_estimate = QCONST16(.2f, 14);
+        }
+    }
+
+    if (LM > 0 && ec_tell(enc) + 3 <= total_bits)
+        ec_enc_bit_logp(enc, isTransient, 3);
+
+    ALLOC(X, C*N, celt_norm);        /**< Interleaved normalised MDCTs */
+
+    /* Band normalisation */
+    normalise_bands(mode, freq, X, bandE, effEnd, C, M);
+
+    enable_tf_analysis = effectiveBytes >= 15*C && !hybrid && st->complexity >= 2 && !st->lfe
+                         && toneishness < QCONST32(.98f, 29);
+
+    ALLOC(offsets, nbEBands, int);
+    ALLOC(importance, nbEBands, int);
+    ALLOC(spread_weight, nbEBands, int);
+
+    maxDepth = dynalloc_analysis(bandLogE, bandLogE2, oldBandE, nbEBands, start, end, C, offsets,
          st->lsb_depth, mode->logN, isTransient, st->vbr, st->constrained_vbr,
-         eBands, LM, effectiveBytes, &tot_boost, st->lfe, surround_dynalloc, &st->analysis, importance, spread_weight, tone_freq, toneishness, qext_scale);
-
-   ALLOC(tf_res, nbEBands, int);
-   /* Disable variable tf resolution for hybrid and at very low bitrate */
-   if (enable_tf_analysis)
-   {
-      int lambda;
-      lambda = IMAX(80, 20480/effectiveBytes + 2);
-      tf_select = tf_analysis(mode, effEnd, isTransient, tf_res, lambda, X, N, LM, tf_estimate, tf_chan, importance);
-      for (i=effEnd;i<end;i++)
-         tf_res[i] = tf_res[effEnd-1];
-   } else if (hybrid && weak_transient)
-   {
-      /* For weak transients, we rely on the fact that improving time resolution using
-         TF on a long window is imperfect and will not result in an energy collapse at
-         low bitrate. */
-      for (i=0;i<end;i++)
-         tf_res[i] = 1;
-      tf_select=0;
-   } else if (hybrid && effectiveBytes<15 && st->silk_info.signalType != 2)
-   {
-      /* For low bitrate hybrid, we force temporal resolution to 5 ms rather than 2.5 ms. */
-      for (i=0;i<end;i++)
-         tf_res[i] = 0;
-      tf_select=isTransient;
-   } else {
-      for (i=0;i<end;i++)
-         tf_res[i] = isTransient;
-      tf_select=0;
-   }
-
-   ALLOC(error, C*nbEBands, celt_glog);
-   c=0;
-   do {
-      for (i=start;i<end;i++)
-      {
-         /* When the energy is stable, slightly bias energy quantization towards
-            the previous error to make the gain more stable (a constant offset is
-            better than fluctuations). */
-         if (ABS32(SUB32(bandLogE[i+c*nbEBands], oldBandE[i+c*nbEBands])) < GCONST(2.f))
-         {
-            bandLogE[i+c*nbEBands] -= MULT16_32_Q15(QCONST16(0.25f, 15), energyError[i+c*nbEBands]);
-         }
-      }
-   } while (++c < C);
-   quant_coarse_energy(mode, start, end, effEnd, bandLogE,
+         eBands, LM, effectiveBytes, &tot_boost, st->lfe, surround_dynalloc, &st->analysis, importance, spread_weight,
+    tone_freq, toneishness, qext_scale);
+
+    ALLOC(tf_res, nbEBands, int);
+    /* Disable variable tf resolution for hybrid and at very low bitrate */
+    if (enable_tf_analysis) {
+        int lambda;
+        lambda = IMAX(80, 20480/effectiveBytes + 2);
+        tf_select = tf_analysis(mode, effEnd, isTransient, tf_res, lambda, X, N, LM, tf_estimate, tf_chan, importance);
+        for (i = effEnd; i < end; i++)
+            tf_res[i] = tf_res[effEnd - 1];
+    } else if (hybrid && weak_transient) {
+        /* For weak transients, we rely on the fact that improving time resolution using
+           TF on a long window is imperfect and will not result in an energy collapse at
+           low bitrate. */
+        for (i = 0; i < end; i++)
+            tf_res[i] = 1;
+        tf_select = 0;
+    } else if (hybrid && effectiveBytes < 15 && st->silk_info.signalType != 2) {
+        /* For low bitrate hybrid, we force temporal resolution to 5 ms rather than 2.5 ms. */
+        for (i = 0; i < end; i++)
+            tf_res[i] = 0;
+        tf_select = isTransient;
+    } else {
+        for (i = 0; i < end; i++)
+            tf_res[i] = isTransient;
+        tf_select = 0;
+    }
+
+    ALLOC(error, C*nbEBands, celt_glog);
+    c = 0;
+    do {
+        for (i = start; i < end; i++) {
+            /* When the energy is stable, slightly bias energy quantization towards
+               the previous error to make the gain more stable (a constant offset is
+               better than fluctuations). */
+            if (ABS32(SUB32(bandLogE[i + c*nbEBands], oldBandE[i + c*nbEBands])) < GCONST(2.f)) {
+                bandLogE[i + c*nbEBands] -= MULT16_32_Q15(QCONST16(0.25f, 15), energyError[i + c*nbEBands]);
+            }
+        }
+    } while (++c < C);
+    quant_coarse_energy(mode, start, end, effEnd, bandLogE,
          oldBandE, total_bits, error, enc,
          C, LM, nbAvailableBytes, st->force_intra,
          &st->delayedIntra, st->complexity >= 4, st->loss_rate, st->lfe);
 
-   tf_encode(start, end, isTransient, tf_res, LM, tf_select, enc);
-
-   if (ec_tell(enc)+4<=total_bits)
-   {
-      if (st->lfe)
-      {
-         st->tapset_decision = 0;
-         st->spread_decision = SPREAD_NORMAL;
-      } else if (hybrid)
-      {
-         if (st->complexity == 0)
-            st->spread_decision = SPREAD_NONE;
-         else if (isTransient)
-            st->spread_decision = SPREAD_NORMAL;
-         else
-            st->spread_decision = SPREAD_AGGRESSIVE;
-      } else if (shortBlocks || st->complexity < 3 || nbAvailableBytes < 10*C)
-      {
-         if (st->complexity == 0)
-            st->spread_decision = SPREAD_NONE;
-         else
+    tf_encode(start, end, isTransient, tf_res, LM, tf_select, enc);
+
+    if (ec_tell(enc) + 4 <= total_bits) {
+        if (st->lfe) {
+            st->tapset_decision = 0;
             st->spread_decision = SPREAD_NORMAL;
-      } else {
-         /* Disable new spreading+tapset estimator until we can show it works
-            better than the old one. So far it seems like spreading_decision()
-            works best. */
+        } else if (hybrid) {
+            if (st->complexity == 0)
+                st->spread_decision = SPREAD_NONE;
+            else if (isTransient)
+                st->spread_decision = SPREAD_NORMAL;
+            else
+                st->spread_decision = SPREAD_AGGRESSIVE;
+        } else if (shortBlocks || st->complexity < 3 || nbAvailableBytes < 10*C) {
+            if (st->complexity == 0)
+                st->spread_decision = SPREAD_NONE;
+            else
+                st->spread_decision = SPREAD_NORMAL;
+        } else {
+            /* Disable new spreading+tapset estimator until we can show it works
+               better than the old one. So far it seems like spreading_decision()
+               works best. */
 #if 0
-         if (st->analysis.valid)
-         {
-            static const oac_val16 spread_thresholds[3] = {-QCONST16(.6f, 15), -QCONST16(.2f, 15), -QCONST16(.07f, 15)};
-            static const oac_val16 spread_histeresis[3] = {QCONST16(.15f, 15), QCONST16(.07f, 15), QCONST16(.02f, 15)};
-            static const oac_val16 tapset_thresholds[2] = {QCONST16(.0f, 15), QCONST16(.15f, 15)};
-            static const oac_val16 tapset_histeresis[2] = {QCONST16(.1f, 15), QCONST16(.05f, 15)};
-            st->spread_decision = hysteresis_decision(-st->analysis.tonality, spread_thresholds, spread_histeresis, 3, st->spread_decision);
-            st->tapset_decision = hysteresis_decision(st->analysis.tonality_slope, tapset_thresholds, tapset_histeresis, 2, st->tapset_decision);
-         } else
+            if (st->analysis.valid) {
+                static const oac_val16 spread_thresholds[3] = {-QCONST16(.6f, 15), -QCONST16(.2f, 15),
+                                                               -QCONST16(.07f, 15)};
+                static const oac_val16 spread_histeresis[3] = {QCONST16(.15f, 15), QCONST16(.07f, 15),
+                                                               QCONST16(.02f, 15)};
+                static const oac_val16 tapset_thresholds[2] = {QCONST16(.0f, 15), QCONST16(.15f, 15)};
+                static const oac_val16 tapset_histeresis[2] = {QCONST16(.1f, 15), QCONST16(.05f, 15)};
+                st->spread_decision = hysteresis_decision(-st->analysis.tonality, spread_thresholds, spread_histeresis,
+                3, st->spread_decision);
+                st->tapset_decision = hysteresis_decision(st->analysis.tonality_slope, tapset_thresholds,
+                tapset_histeresis, 2, st->tapset_decision);
+            } else
 #endif
-         {
-            st->spread_decision = spreading_decision(mode, X,
+            {
+                st->spread_decision = spreading_decision(mode, X,
                   &st->tonal_average, st->spread_decision, &st->hf_average,
-                  &st->tapset_decision, pf_on&&!shortBlocks, effEnd, C, M, spread_weight);
-         }
-         /*printf("%d %d\n", st->tapset_decision, st->spread_decision);*/
-         /*printf("%f %d %f %d\n\n", st->analysis.tonality, st->spread_decision, st->analysis.tonality_slope, st->tapset_decision);*/
-      }
-      ec_enc_icdf(enc, st->spread_decision, spread_icdf, 5);
-   } else {
-      st->spread_decision = SPREAD_NORMAL;
-   }
-
-   /* For LFE, everything interesting is in the first band */
-   if (st->lfe)
-      offsets[0] = IMIN(8, effectiveBytes/3);
-   ALLOC(cap, nbEBands, int);
-   init_caps(mode,cap,LM,C);
-
-   dynalloc_logp = 6;
-   total_bits<<=BITRES;
-   total_boost = 0;
-   tell = ec_tell_frac(enc);
-   for (i=start;i<end;i++)
-   {
-      int width, quanta;
-      int dynalloc_loop_logp;
-      int boost;
-      int j;
-      width = C*(eBands[i+1]-eBands[i])<<LM;
-      /* quanta is 6 bits, but no more than 1 bit/sample
-         and no less than 1/8 bit/sample */
-      quanta = IMIN(width<<BITRES, IMAX(6<<BITRES, width));
-      dynalloc_loop_logp = dynalloc_logp;
-      boost = 0;
-      for (j = 0; tell+(dynalloc_loop_logp<<BITRES) < total_bits-total_boost
-            && boost < cap[i]; j++)
-      {
-         int flag;
-         flag = j<offsets[i];
-         ec_enc_bit_logp(enc, flag, dynalloc_loop_logp);
-         tell = ec_tell_frac(enc);
-         if (!flag)
-            break;
-         boost += quanta;
-         total_boost += quanta;
-         dynalloc_loop_logp = 1;
-      }
-      /* Making dynalloc more likely */
-      if (j)
-         dynalloc_logp = IMAX(2, dynalloc_logp-1);
-      offsets[i] = boost;
-   }
-
-   if (C==2)
-   {
-      static const oac_val16 intensity_thresholds[21]=
-      /* 0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19  20  off*/
-        {  1, 2, 3, 4, 5, 6, 7, 8,16,24,36,44,50,56,62,67,72,79,88,106,134};
-      static const oac_val16 intensity_histeresis[21]=
+                  &st->tapset_decision, pf_on && !shortBlocks, effEnd, C, M, spread_weight);
+            }
+            /*printf("%d %d\n", st->tapset_decision, st->spread_decision);*/
+            /*printf("%f %d %f %d\n\n", st->analysis.tonality, st->spread_decision, st->analysis.tonality_slope, st->tapset_decision);*/
+        }
+        ec_enc_icdf(enc, st->spread_decision, spread_icdf, 5);
+    } else {
+        st->spread_decision = SPREAD_NORMAL;
+    }
+
+    /* For LFE, everything interesting is in the first band */
+    if (st->lfe)
+        offsets[0] = IMIN(8, effectiveBytes/3);
+    ALLOC(cap, nbEBands, int);
+    init_caps(mode, cap, LM, C);
+
+    dynalloc_logp = 6;
+    total_bits <<= BITRES;
+    total_boost = 0;
+    tell = ec_tell_frac(enc);
+    for (i = start; i < end; i++) {
+        int width, quanta;
+        int dynalloc_loop_logp;
+        int boost;
+        int j;
+        width = C*(eBands[i + 1] - eBands[i])<<LM;
+        /* quanta is 6 bits, but no more than 1 bit/sample
+           and no less than 1/8 bit/sample */
+        quanta = IMIN(width<<BITRES, IMAX(6<<BITRES, width));
+        dynalloc_loop_logp = dynalloc_logp;
+        boost = 0;
+        for (j = 0; tell + (dynalloc_loop_logp<<BITRES) < total_bits - total_boost
+             && boost < cap[i]; j++) {
+            int flag;
+            flag = j < offsets[i];
+            ec_enc_bit_logp(enc, flag, dynalloc_loop_logp);
+            tell = ec_tell_frac(enc);
+            if (!flag)
+                break;
+            boost += quanta;
+            total_boost += quanta;
+            dynalloc_loop_logp = 1;
+        }
+        /* Making dynalloc more likely */
+        if (j)
+            dynalloc_logp = IMAX(2, dynalloc_logp - 1);
+        offsets[i] = boost;
+    }
+
+    if (C == 2) {
+        static const oac_val16 intensity_thresholds[21] =
+            /* 0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19  20  off*/
+        {  1, 2, 3, 4, 5, 6, 7, 8, 16, 24, 36, 44, 50, 56, 62, 67, 72, 79, 88, 106, 134};
+        static const oac_val16 intensity_histeresis[21] =
         {  1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 4, 5, 6,  8, 8};
 
-      /* Always use MS for 2.5 ms frames until we can do a better analysis */
-      if (LM!=0)
-         dual_stereo = stereo_analysis(mode, X, LM, N);
+        /* Always use MS for 2.5 ms frames until we can do a better analysis */
+        if (LM != 0)
+            dual_stereo = stereo_analysis(mode, X, LM, N);
 
-      st->intensity = hysteresis_decision((oac_val16)(equiv_rate/1000),
+        st->intensity = hysteresis_decision((oac_val16)(equiv_rate/1000),
             intensity_thresholds, intensity_histeresis, 21, st->intensity);
-      st->intensity = IMIN(end,IMAX(start, st->intensity));
-   }
-
-   alloc_trim = 5;
-   if (tell+(6<<BITRES) <= total_bits - total_boost)
-   {
-      if (start > 0 || st->lfe)
-      {
-         st->stereo_saving = 0;
-         alloc_trim = 5;
-      } else {
-         alloc_trim = alloc_trim_analysis(mode, X, bandLogE,
+        st->intensity = IMIN(end, IMAX(start, st->intensity));
+    }
+
+    alloc_trim = 5;
+    if (tell + (6<<BITRES) <= total_bits - total_boost) {
+        if (start > 0 || st->lfe) {
+            st->stereo_saving = 0;
+            alloc_trim = 5;
+        } else {
+            alloc_trim = alloc_trim_analysis(mode, X, bandLogE,
             end, LM, C, N, &st->analysis, &st->stereo_saving, tf_estimate,
             st->intensity, surround_trim, equiv_rate, st->arch);
-      }
-      ec_enc_icdf(enc, alloc_trim, trim_icdf, 7);
-      tell = ec_tell_frac(enc);
-   }
-
-   /* In VBR mode the frame size must not be reduced so much that it would
-       result in the encoder running out of bits.
-      The margin of 2 bytes ensures that none of the bust-prevention logic
-       in the decoder will have triggered so far. */
-   min_allowed = ((tell+total_boost+(1<<(BITRES+3))-1)>>(BITRES+3)) + 2;
-   /* Take into account the 37 bits we need to have left in the packet to
-      signal a redundant frame in hybrid mode. Creating a shorter packet would
-      create an entropy coder desync. */
-   if (hybrid)
-      min_allowed = IMAX(min_allowed, (tell0_frac+(37<<BITRES)+total_boost+(1<<(BITRES+3))-1)>>(BITRES+3));
-   /* Variable bitrate */
-   if (vbr_rate>0)
-   {
-     oac_val16 alpha;
-     oac_int32 delta;
-     /* The target rate in 8th bits per frame */
-     oac_int32 target, base_target;
-     int lm_diff = mode->maxLM - LM;
-
-     /* Don't attempt to use more than 510 kb/s, even for frames smaller than 20 ms.
-        The CELT allocator will just not be able to use more than that anyway. */
-     nbCompressedBytes = IMIN(nbCompressedBytes,packet_size_cap>>(3-LM));
-     if (!hybrid)
-     {
-        base_target = vbr_rate - ((40*C+20)<<BITRES);
-     } else {
-        base_target = IMAX(0, vbr_rate - ((9*C+4)<<BITRES));
-     }
-
-     if (st->constrained_vbr)
-        base_target += (st->vbr_offset>>lm_diff);
-
-     if (!hybrid)
-     {
-        target = compute_vbr(mode, &st->analysis, base_target, LM, equiv_rate,
+        }
+        ec_enc_icdf(enc, alloc_trim, trim_icdf, 7);
+        tell = ec_tell_frac(enc);
+    }
+
+    /* In VBR mode the frame size must not be reduced so much that it would
+        result in the encoder running out of bits.
+       The margin of 2 bytes ensures that none of the bust-prevention logic
+        in the decoder will have triggered so far. */
+    min_allowed = ((tell + total_boost + (1<<(BITRES + 3)) - 1)>>(BITRES + 3)) + 2;
+    /* Take into account the 37 bits we need to have left in the packet to
+       signal a redundant frame in hybrid mode. Creating a shorter packet would
+       create an entropy coder desync. */
+    if (hybrid)
+        min_allowed = IMAX(min_allowed,
+            (tell0_frac + (37<<BITRES) + total_boost + (1<<(BITRES + 3)) - 1)>>(BITRES + 3));
+    /* Variable bitrate */
+    if (vbr_rate > 0) {
+        oac_val16 alpha;
+        oac_int32 delta;
+        /* The target rate in 8th bits per frame */
+        oac_int32 target, base_target;
+        int lm_diff = mode->maxLM - LM;
+
+        /* Don't attempt to use more than 510 kb/s, even for frames smaller than 20 ms.
+           The CELT allocator will just not be able to use more than that anyway. */
+        nbCompressedBytes = IMIN(nbCompressedBytes, packet_size_cap>>(3 - LM));
+        if (!hybrid) {
+            base_target = vbr_rate - ((40*C + 20)<<BITRES);
+        } else {
+            base_target = IMAX(0, vbr_rate - ((9*C + 4)<<BITRES));
+        }
+
+        if (st->constrained_vbr)
+            base_target += (st->vbr_offset>>lm_diff);
+
+        if (!hybrid) {
+            target = compute_vbr(mode, &st->analysis, base_target, LM, equiv_rate,
            st->lastCodedBands, C, st->intensity, st->constrained_vbr,
            st->stereo_saving, tot_boost, tf_estimate, pitch_change, maxDepth,
-           st->lfe, st->energy_mask!=NULL, surround_masking,
+           st->lfe, st->energy_mask != NULL, surround_masking,
            temporal_vbr);
-     } else {
-        target = base_target;
-        /* Tonal frames (offset<100) need more bits than noisy (offset>100) ones. */
-        if (st->silk_info.offset < 100) target += 12 << BITRES >> (3-LM);
-        if (st->silk_info.offset > 100) target -= 18 << BITRES >> (3-LM);
-        /* Boosting bitrate on transients and vowels with significant temporal
-           spikes. */
-        target += (oac_int32)MULT16_16_Q14(tf_estimate-QCONST16(.25f,14), (50<<BITRES));
-        /* If we have a strong transient, let's make sure it has enough bits to code
-           the first two bands, so that it can use folding rather than noise. */
-        if (tf_estimate > QCONST16(.7f,14))
-           target = IMAX(target, 50<<BITRES);
-     }
-     /* The current offset is removed from the target and the space used
-        so far is added*/
-     target=target+tell;
-
-     nbAvailableBytes = (target+(1<<(BITRES+2)))>>(BITRES+3);
-     nbAvailableBytes = IMAX(min_allowed,nbAvailableBytes);
-     nbAvailableBytes = IMIN(nbCompressedBytes,nbAvailableBytes);
-
-     /* By how much did we "miss" the target on that frame */
-     delta = target - vbr_rate;
-
-     target=nbAvailableBytes<<(BITRES+3);
-
-     /*If the frame is silent we don't adjust our drift, otherwise
-       the encoder will shoot to very high rates after hitting a
-       span of silence, but we do allow the bitres to refill.
-       This means that we'll undershoot our target in CVBR/VBR modes
-       on files with lots of silence. */
-     if(silence)
-     {
-       nbAvailableBytes = 2;
-       target = 2*8<<BITRES;
-       delta = 0;
-     }
-
-     if (st->vbr_count < 970)
-     {
-        st->vbr_count++;
-        alpha = celt_rcp(SHL32(EXTEND32(st->vbr_count+20),16));
-     } else
-        alpha = QCONST16(.001f,15);
-     /* How many bits have we used in excess of what we're allowed */
-     if (st->constrained_vbr)
-        st->vbr_reservoir += target - vbr_rate;
-     /*printf ("%d\n", st->vbr_reservoir);*/
-
-     /* Compute the offset we need to apply in order to reach the target */
-     if (st->constrained_vbr)
-     {
-        st->vbr_drift += (oac_int32)MULT16_32_Q15(alpha,(delta*(1<<lm_diff))-st->vbr_offset-st->vbr_drift);
-        st->vbr_offset = -st->vbr_drift;
-     }
-     /*printf ("%d\n", st->vbr_drift);*/
-
-     if (st->constrained_vbr && st->vbr_reservoir < 0)
-     {
-        /* We're under the min value -- increase rate */
-        int adjust = (-st->vbr_reservoir)/(8<<BITRES);
-        /* Unless we're just coding silence */
-        nbAvailableBytes += silence?0:adjust;
-        st->vbr_reservoir = 0;
-        /*printf ("+%d\n", adjust);*/
-     }
-     nbCompressedBytes = IMIN(nbCompressedBytes,nbAvailableBytes);
-     /*printf("%d\n", nbCompressedBytes*50*8);*/
-     /* This moves the raw bits to take into account the new compressed size */
-     ec_enc_shrink(enc, nbCompressedBytes);
-   }
-
-   /* Bit allocation */
-   ALLOC(fine_quant, nbEBands, int);
-   ALLOC(pulses, nbEBands, int);
-   ALLOC(fine_priority, nbEBands, int);
-
-   /* bits =           packet size                    - where we are - safety*/
-   bits = (((oac_int32)nbCompressedBytes*8)<<BITRES) - (oac_int32)ec_tell_frac(enc) - 1;
-   anti_collapse_rsv = isTransient&&LM>=2&&bits>=((LM+2)<<BITRES) ? (1<<BITRES) : 0;
-   bits -= anti_collapse_rsv;
-   signalBandwidth = end-1;
+        } else {
+            target = base_target;
+            /* Tonal frames (offset<100) need more bits than noisy (offset>100) ones. */
+            if (st->silk_info.offset < 100) target += 12<<BITRES>>(3 - LM);
+            if (st->silk_info.offset > 100) target -= 18<<BITRES>>(3 - LM);
+            /* Boosting bitrate on transients and vowels with significant temporal
+               spikes. */
+            target += (oac_int32)MULT16_16_Q14(tf_estimate - QCONST16(.25f, 14), (50<<BITRES));
+            /* If we have a strong transient, let's make sure it has enough bits to code
+               the first two bands, so that it can use folding rather than noise. */
+            if (tf_estimate > QCONST16(.7f, 14))
+                target = IMAX(target, 50<<BITRES);
+        }
+        /* The current offset is removed from the target and the space used
+           so far is added*/
+        target = target + tell;
+
+        nbAvailableBytes = (target + (1<<(BITRES + 2)))>>(BITRES + 3);
+        nbAvailableBytes = IMAX(min_allowed, nbAvailableBytes);
+        nbAvailableBytes = IMIN(nbCompressedBytes, nbAvailableBytes);
+
+        /* By how much did we "miss" the target on that frame */
+        delta = target - vbr_rate;
+
+        target = nbAvailableBytes<<(BITRES + 3);
+
+        /*If the frame is silent we don't adjust our drift, otherwise
+           the encoder will shoot to very high rates after hitting a
+           span of silence, but we do allow the bitres to refill.
+           This means that we'll undershoot our target in CVBR/VBR modes
+           on files with lots of silence. */
+        if (silence) {
+            nbAvailableBytes = 2;
+            target = 2*8<<BITRES;
+            delta = 0;
+        }
+
+        if (st->vbr_count < 970) {
+            st->vbr_count++;
+            alpha = celt_rcp(SHL32(EXTEND32(st->vbr_count + 20), 16));
+        } else
+            alpha = QCONST16(.001f, 15);
+        /* How many bits have we used in excess of what we're allowed */
+        if (st->constrained_vbr)
+            st->vbr_reservoir += target - vbr_rate;
+        /*printf ("%d\n", st->vbr_reservoir);*/
+
+        /* Compute the offset we need to apply in order to reach the target */
+        if (st->constrained_vbr) {
+            st->vbr_drift += (oac_int32)MULT16_32_Q15(alpha, (delta*(1<<lm_diff)) - st->vbr_offset - st->vbr_drift);
+            st->vbr_offset = -st->vbr_drift;
+        }
+        /*printf ("%d\n", st->vbr_drift);*/
+
+        if (st->constrained_vbr && st->vbr_reservoir < 0) {
+            /* We're under the min value -- increase rate */
+            int adjust = (-st->vbr_reservoir)/(8<<BITRES);
+            /* Unless we're just coding silence */
+            nbAvailableBytes += silence?0:adjust;
+            st->vbr_reservoir = 0;
+            /*printf ("+%d\n", adjust);*/
+        }
+        nbCompressedBytes = IMIN(nbCompressedBytes, nbAvailableBytes);
+        /*printf("%d\n", nbCompressedBytes*50*8);*/
+        /* This moves the raw bits to take into account the new compressed size */
+        ec_enc_shrink(enc, nbCompressedBytes);
+    }
+
+    /* Bit allocation */
+    ALLOC(fine_quant, nbEBands, int);
+    ALLOC(pulses, nbEBands, int);
+    ALLOC(fine_priority, nbEBands, int);
+
+    /* bits =           packet size                    - where we are - safety*/
+    bits = (((oac_int32)nbCompressedBytes*8)<<BITRES) - (oac_int32)ec_tell_frac(enc) - 1;
+    anti_collapse_rsv = isTransient && LM >= 2 && bits >= ((LM + 2)<<BITRES) ? (1<<BITRES) : 0;
+    bits -= anti_collapse_rsv;
+    signalBandwidth = end - 1;
 #ifndef DISABLE_FLOAT_API
-   if (st->analysis.valid)
-   {
-      int min_bandwidth;
-      if (equiv_rate < (oac_int32)32000*C)
-         min_bandwidth = 13;
-      else if (equiv_rate < (oac_int32)48000*C)
-         min_bandwidth = 16;
-      else if (equiv_rate < (oac_int32)60000*C)
-         min_bandwidth = 18;
-      else  if (equiv_rate < (oac_int32)80000*C)
-         min_bandwidth = 19;
-      else
-         min_bandwidth = 20;
-      signalBandwidth = IMAX(st->analysis.bandwidth, min_bandwidth);
-   }
+    if (st->analysis.valid) {
+        int min_bandwidth;
+        if (equiv_rate < (oac_int32)32000*C)
+            min_bandwidth = 13;
+        else if (equiv_rate < (oac_int32)48000*C)
+            min_bandwidth = 16;
+        else if (equiv_rate < (oac_int32)60000*C)
+            min_bandwidth = 18;
+        else if (equiv_rate < (oac_int32)80000*C)
+            min_bandwidth = 19;
+        else
+            min_bandwidth = 20;
+        signalBandwidth = IMAX(st->analysis.bandwidth, min_bandwidth);
+    }
 #endif
-   if (st->lfe)
-      signalBandwidth = 1;
-   codedBands = clt_compute_allocation(mode, start, end, offsets, cap,
+    if (st->lfe)
+        signalBandwidth = 1;
+    codedBands = clt_compute_allocation(mode, start, end, offsets, cap,
          alloc_trim, &st->intensity, &dual_stereo, bits, &balance, pulses,
          fine_quant, fine_priority, C, LM, enc, 1, st->lastCodedBands, signalBandwidth);
-   if (st->lastCodedBands)
-      st->lastCodedBands = IMIN(st->lastCodedBands+1,IMAX(st->lastCodedBands-1,codedBands));
-   else
-      st->lastCodedBands = codedBands;
+    if (st->lastCodedBands)
+        st->lastCodedBands = IMIN(st->lastCodedBands + 1, IMAX(st->lastCodedBands - 1, codedBands));
+    else
+        st->lastCodedBands = codedBands;
 
-   quant_fine_energy(mode, start, end, oldBandE, error, NULL, fine_quant, enc, C);
-   OAC_CLEAR(energyError, nbEBands*CC);
+    quant_fine_energy(mode, start, end, oldBandE, error, NULL, fine_quant, enc, C);
+    OAC_CLEAR(energyError, nbEBands*CC);
 
-   /* Residual quantisation */
-   ALLOC(collapse_masks, C*nbEBands, unsigned char);
-   quant_all_bands(1, mode, start, end, X, C==2 ? X+N : NULL, collapse_masks,
+    /* Residual quantisation */
+    ALLOC(collapse_masks, C*nbEBands, unsigned char);
+    quant_all_bands(1, mode, start, end, X, C == 2 ? X + N : NULL, collapse_masks,
          bandE, pulses, shortBlocks, st->spread_decision,
-         dual_stereo, st->intensity, tf_res, nbCompressedBytes*(8<<BITRES)-anti_collapse_rsv,
+         dual_stereo, st->intensity, tf_res, nbCompressedBytes*(8<<BITRES) - anti_collapse_rsv,
          balance, enc, LM, codedBands, &st->rng, st->complexity, st->arch, st->disable_inv);
 
-   if (anti_collapse_rsv > 0)
-   {
-      anti_collapse_on = st->consec_transient<2;
+    if (anti_collapse_rsv > 0) {
+        anti_collapse_on = st->consec_transient < 2;
 #ifdef FUZZING
-      anti_collapse_on = rand()&0x1;
+        anti_collapse_on = rand()&0x1;
 #endif
-      ec_enc_bits(enc, anti_collapse_on, 1);
-   }
-   quant_energy_finalise(mode, start, end, oldBandE, error, fine_quant, fine_priority, nbCompressedBytes*8-ec_tell(enc), enc, C);
-   c=0;
-   do {
-      for (i=start;i<end;i++)
-      {
-         energyError[i+c*nbEBands] = MAXG(-GCONST(0.5f), MING(GCONST(0.5f), error[i+c*nbEBands]));
-      }
-   } while (++c < C);
-
-   if (silence)
-   {
-      for (i=0;i<C*nbEBands;i++)
-         oldBandE[i] = -GCONST(28.f);
-   }
+        ec_enc_bits(enc, anti_collapse_on, 1);
+    }
+    quant_energy_finalise(mode, start, end, oldBandE, error, fine_quant, fine_priority,
+    nbCompressedBytes*8 - ec_tell(enc), enc, C);
+    c = 0;
+    do {
+        for (i = start; i < end; i++) {
+            energyError[i + c*nbEBands] = MAXG(-GCONST(0.5f), MING(GCONST(0.5f), error[i + c*nbEBands]));
+        }
+    } while (++c < C);
+
+    if (silence) {
+        for (i = 0; i < C*nbEBands; i++)
+            oldBandE[i] = -GCONST(28.f);
+    }
 
 #ifdef RESYNTH
-   /* Re-synthesis of the coded audio if required */
-   {
-      celt_sig *out_mem[2];
+    /* Re-synthesis of the coded audio if required */
+    {
+        celt_sig *out_mem[2];
 
-      if (anti_collapse_on)
-      {
-         anti_collapse(mode, X, collapse_masks, LM, C, N,
+        if (anti_collapse_on) {
+            anti_collapse(mode, X, collapse_masks, LM, C, N,
                start, end, oldBandE, oldLogE, oldLogE2, pulses, st->rng, 1, st->arch);
-      }
+        }
 
-      c=0; do {
-         OAC_MOVE(st->syn_mem[c], st->syn_mem[c]+N, QEXT_SCALE(DEC_PITCH_BUF_SIZE)-N+overlap/2);
-      } while (++c<CC);
+        c = 0; do {
+            OAC_MOVE(st->syn_mem[c], st->syn_mem[c] + N, QEXT_SCALE(DEC_PITCH_BUF_SIZE) - N + overlap/2);
+        } while (++c < CC);
 
-      c=0; do {
-         out_mem[c] = st->syn_mem[c]+QEXT_SCALE(DEC_PITCH_BUF_SIZE)-N;
-      } while (++c<CC);
+        c = 0; do {
+            out_mem[c] = st->syn_mem[c] + QEXT_SCALE(DEC_PITCH_BUF_SIZE) - N;
+        } while (++c < CC);
 
-      celt_synthesis(mode, X, out_mem, oldBandE, start, effEnd,
+        celt_synthesis(mode, X, out_mem, oldBandE, start, effEnd,
                      C, CC, isTransient, LM, st->upsample, silence, st->arch);
 
-      c=0; do {
-         st->prefilter_period=IMAX(st->prefilter_period, COMBFILTER_MINPERIOD);
-         st->prefilter_period_old=IMAX(st->prefilter_period_old, COMBFILTER_MINPERIOD);
-         comb_filter(out_mem[c], out_mem[c], st->prefilter_period_old, st->prefilter_period, mode->shortMdctSize,
+        c = 0; do {
+            st->prefilter_period = IMAX(st->prefilter_period, COMBFILTER_MINPERIOD);
+            st->prefilter_period_old = IMAX(st->prefilter_period_old, COMBFILTER_MINPERIOD);
+            comb_filter(out_mem[c], out_mem[c], st->prefilter_period_old, st->prefilter_period, mode->shortMdctSize,
                st->prefilter_gain_old, st->prefilter_gain, st->prefilter_tapset_old, st->prefilter_tapset,
                mode->window, overlap, st->arch);
-         if (LM!=0)
-            comb_filter(out_mem[c]+mode->shortMdctSize, out_mem[c]+mode->shortMdctSize, st->prefilter_period, pitch_index, N-mode->shortMdctSize,
+            if (LM != 0)
+                comb_filter(out_mem[c] + mode->shortMdctSize, out_mem[c] + mode->shortMdctSize, st->prefilter_period,
+                pitch_index, N - mode->shortMdctSize,
                   st->prefilter_gain, gain1, st->prefilter_tapset, prefilter_tapset,
                   mode->window, overlap, st->arch);
-      } while (++c<CC);
-
-      /* We reuse freq[] as scratch space for the de-emphasis */
-      deemphasis(out_mem, (oac_res*)pcm, N, CC, st->upsample, mode->preemph, st->preemph_memD, 0);
-      st->prefilter_period_old = st->prefilter_period;
-      st->prefilter_gain_old = st->prefilter_gain;
-      st->prefilter_tapset_old = st->prefilter_tapset;
-   }
+        } while (++c < CC);
+
+        /* We reuse freq[] as scratch space for the de-emphasis */
+        deemphasis(out_mem, (oac_res*)pcm, N, CC, st->upsample, mode->preemph, st->preemph_memD, 0);
+        st->prefilter_period_old = st->prefilter_period;
+        st->prefilter_gain_old = st->prefilter_gain;
+        st->prefilter_tapset_old = st->prefilter_tapset;
+    }
 #endif
 
-   st->prefilter_period = pitch_index;
-   st->prefilter_gain = gain1;
-   st->prefilter_tapset = prefilter_tapset;
+    st->prefilter_period = pitch_index;
+    st->prefilter_gain = gain1;
+    st->prefilter_tapset = prefilter_tapset;
 #ifdef RESYNTH
-   if (LM!=0)
-   {
-      st->prefilter_period_old = st->prefilter_period;
-      st->prefilter_gain_old = st->prefilter_gain;
-      st->prefilter_tapset_old = st->prefilter_tapset;
-   }
+    if (LM != 0) {
+        st->prefilter_period_old = st->prefilter_period;
+        st->prefilter_gain_old = st->prefilter_gain;
+        st->prefilter_tapset_old = st->prefilter_tapset;
+    }
 #endif
 
-   if (CC==2&&C==1) {
-      OAC_COPY(&oldBandE[nbEBands], oldBandE, nbEBands);
-   }
-
-   if (!isTransient)
-   {
-      OAC_COPY(oldLogE2, oldLogE, CC*nbEBands);
-      OAC_COPY(oldLogE, oldBandE, CC*nbEBands);
-   } else {
-      for (i=0;i<CC*nbEBands;i++)
-         oldLogE[i] = MING(oldLogE[i], oldBandE[i]);
-   }
-   /* In case start or end were to change */
-   c=0; do
-   {
-      for (i=0;i<start;i++)
-      {
-         oldBandE[c*nbEBands+i]=0;
-         oldLogE[c*nbEBands+i]=oldLogE2[c*nbEBands+i]=-GCONST(28.f);
-      }
-      for (i=end;i<nbEBands;i++)
-      {
-         oldBandE[c*nbEBands+i]=0;
-         oldLogE[c*nbEBands+i]=oldLogE2[c*nbEBands+i]=-GCONST(28.f);
-      }
-   } while (++c<CC);
-
-   if (isTransient || transient_got_disabled)
-      st->consec_transient++;
-   else
-      st->consec_transient=0;
-   st->rng = enc->rng;
-
-   /* If there's any room left (can only happen for very high rates),
-      it's already filled with zeros */
-   ec_enc_done(enc);
+    if (CC == 2 && C == 1) {
+        OAC_COPY(&oldBandE[nbEBands], oldBandE, nbEBands);
+    }
+
+    if (!isTransient) {
+        OAC_COPY(oldLogE2, oldLogE, CC*nbEBands);
+        OAC_COPY(oldLogE, oldBandE, CC*nbEBands);
+    } else {
+        for (i = 0; i < CC*nbEBands; i++)
+            oldLogE[i] = MING(oldLogE[i], oldBandE[i]);
+    }
+    /* In case start or end were to change */
+    c = 0; do {
+        for (i = 0; i < start; i++) {
+            oldBandE[c*nbEBands + i] = 0;
+            oldLogE[c*nbEBands + i] = oldLogE2[c*nbEBands + i] = -GCONST(28.f);
+        }
+        for (i = end; i < nbEBands; i++) {
+            oldBandE[c*nbEBands + i] = 0;
+            oldLogE[c*nbEBands + i] = oldLogE2[c*nbEBands + i] = -GCONST(28.f);
+        }
+    } while (++c < CC);
+
+    if (isTransient || transient_got_disabled)
+        st->consec_transient++;
+    else
+        st->consec_transient = 0;
+    st->rng = enc->rng;
+
+    /* If there's any room left (can only happen for very high rates),
+       it's already filled with zeros */
+    ec_enc_done(enc);
 #if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
-   if (st->signalling)
-      nbCompressedBytes++;
+    if (st->signalling)
+        nbCompressedBytes++;
 #endif
 
-   RESTORE_STACK;
-   if (ec_get_error(enc))
-      return OAC_INTERNAL_ERROR;
-   else
-      return nbCompressedBytes;
+    RESTORE_STACK;
+    if (ec_get_error(enc))
+        return OAC_INTERNAL_ERROR;
+    else
+        return nbCompressedBytes;
 }
 
 
 #if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
 
-int oac_custom_encode(CELTEncoder * OAC_RESTRICT st, const oac_int16 * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes)
-{
-   int j, ret, C, N;
-   VARDECL(oac_res, in);
-   ALLOC_STACK;
+int oac_custom_encode(CELTEncoder * OAC_RESTRICT st, const oac_int16 * pcm, int frame_size, unsigned char *compressed,
+                      int nbCompressedBytes) {
+    int j, ret, C, N;
+    VARDECL(oac_res, in);
+    ALLOC_STACK;
 
-   if (pcm==NULL)
-      return OAC_BAD_ARG;
+    if (pcm == NULL)
+        return OAC_BAD_ARG;
 
-   C = st->channels;
-   N = frame_size;
-   ALLOC(in, C*N, oac_res);
+    C = st->channels;
+    N = frame_size;
+    ALLOC(in, C*N, oac_res);
 
-   for (j=0;j<C*N;j++)
-     in[j] = INT16TORES(pcm[j]);
+    for (j = 0; j < C*N; j++)
+        in[j] = INT16TORES(pcm[j]);
 
-   ret=celt_encode_with_ec(st,in,frame_size,compressed,nbCompressedBytes, NULL);
-#ifdef RESYNTH
-   for (j=0;j<C*N;j++)
-      ((oac_int16*)pcm)[j]=RES2INT16(in[j]);
-#endif
-   RESTORE_STACK;
-   return ret;
+    ret = celt_encode_with_ec(st, in, frame_size, compressed, nbCompressedBytes, NULL);
+# ifdef RESYNTH
+    for (j = 0; j < C*N; j++)
+        ((oac_int16*)pcm)[j] = RES2INT16(in[j]);
+# endif
+    RESTORE_STACK;
+    return ret;
 }
 
 
-#if defined(FIXED_POINT)
-int oac_custom_encode24(CELTEncoder * OAC_RESTRICT st, const oac_int32 * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes)
-{
-   return celt_encode_with_ec(st, pcm, frame_size, compressed, nbCompressedBytes, NULL);
+# if defined(FIXED_POINT)
+int oac_custom_encode24(CELTEncoder * OAC_RESTRICT st, const oac_int32 * pcm, int frame_size, unsigned char *compressed,
+                        int nbCompressedBytes) {
+    return celt_encode_with_ec(st, pcm, frame_size, compressed, nbCompressedBytes, NULL);
 }
-#else
-int oac_custom_encode24(CELTEncoder * OAC_RESTRICT st, const oac_int32 * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes)
-{
-   int j, ret, C, N;
-   VARDECL(oac_res, in);
-   ALLOC_STACK;
-
-   if (pcm==NULL)
-      return OAC_BAD_ARG;
-
-   C = st->channels;
-   N = frame_size;
-   ALLOC(in, C*N, oac_res);
-
-   for (j=0;j<C*N;j++)
-     in[j] = INT24TORES(pcm[j]);
-
-   ret=celt_encode_with_ec(st,in,frame_size,compressed,nbCompressedBytes, NULL);
-#ifdef RESYNTH
-   for (j=0;j<C*N;j++)
-      ((oac_int32*)pcm)[j]=RES2INT24(in[j]);
-#endif
-   RESTORE_STACK;
-   return ret;
+# else
+int oac_custom_encode24(CELTEncoder * OAC_RESTRICT st, const oac_int32 * pcm, int frame_size, unsigned char *compressed,
+                        int nbCompressedBytes) {
+    int j, ret, C, N;
+    VARDECL(oac_res, in);
+    ALLOC_STACK;
+
+    if (pcm == NULL)
+        return OAC_BAD_ARG;
+
+    C = st->channels;
+    N = frame_size;
+    ALLOC(in, C*N, oac_res);
+
+    for (j = 0; j < C*N; j++)
+        in[j] = INT24TORES(pcm[j]);
+
+    ret = celt_encode_with_ec(st, in, frame_size, compressed, nbCompressedBytes, NULL);
+#  ifdef RESYNTH
+    for (j = 0; j < C*N; j++)
+        ((oac_int32*)pcm)[j] = RES2INT24(in[j]);
+#  endif
+    RESTORE_STACK;
+    return ret;
 }
-#endif
+# endif
 
 
-#ifndef DISABLE_FLOAT_API
+# ifndef DISABLE_FLOAT_API
 
-# if !defined(FIXED_POINT)
-int oac_custom_encode_float(CELTEncoder * OAC_RESTRICT st, const float * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes)
-{
-   return celt_encode_with_ec(st, pcm, frame_size, compressed, nbCompressedBytes, NULL);
+#  if !defined(FIXED_POINT)
+int oac_custom_encode_float(CELTEncoder * OAC_RESTRICT st, const float * pcm, int frame_size, unsigned char *compressed,
+                            int nbCompressedBytes) {
+    return celt_encode_with_ec(st, pcm, frame_size, compressed, nbCompressedBytes, NULL);
 }
-# else
-int oac_custom_encode_float(CELTEncoder * OAC_RESTRICT st, const float * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes)
-{
-   int j, ret, C, N;
-   VARDECL(oac_res, in);
-   ALLOC_STACK;
-
-   if (pcm==NULL)
-      return OAC_BAD_ARG;
-
-   C = st->channels;
-   N = frame_size;
-   ALLOC(in, C*N, oac_res);
-
-   for (j=0;j<C*N;j++)
-     in[j] = FLOAT2RES(pcm[j]);
-
-   ret=celt_encode_with_ec(st,in,frame_size,compressed,nbCompressedBytes, NULL);
-#ifdef RESYNTH
-   for (j=0;j<C*N;j++)
-      ((float*)pcm)[j]=RES2FLOAT(in[j]);
-#endif
-   RESTORE_STACK;
-   return ret;
+#  else
+int oac_custom_encode_float(CELTEncoder * OAC_RESTRICT st, const float * pcm, int frame_size, unsigned char *compressed,
+                            int nbCompressedBytes) {
+    int j, ret, C, N;
+    VARDECL(oac_res, in);
+    ALLOC_STACK;
+
+    if (pcm == NULL)
+        return OAC_BAD_ARG;
+
+    C = st->channels;
+    N = frame_size;
+    ALLOC(in, C*N, oac_res);
+
+    for (j = 0; j < C*N; j++)
+        in[j] = FLOAT2RES(pcm[j]);
+
+    ret = celt_encode_with_ec(st, in, frame_size, compressed, nbCompressedBytes, NULL);
+#   ifdef RESYNTH
+    for (j = 0; j < C*N; j++)
+        ((float*)pcm)[j] = RES2FLOAT(in[j]);
+#   endif
+    RESTORE_STACK;
+    return ret;
 }
-# endif
+#  endif
 
-#endif
+# endif
 
 #endif /* CUSTOM_MODES */
 
-int oac_custom_encoder_ctl(CELTEncoder * OAC_RESTRICT st, int request, ...)
-{
-   va_list ap;
-
-   va_start(ap, request);
-   switch (request)
-   {
-      case OAC_SET_COMPLEXITY_REQUEST:
-      {
-         int value = va_arg(ap, oac_int32);
-         if (value<0 || value>10)
-            goto bad_arg;
-         st->complexity = value;
-      }
-      break;
-      case CELT_SET_START_BAND_REQUEST:
-      {
-         oac_int32 value = va_arg(ap, oac_int32);
-         if (value<0 || value>=st->mode->nbEBands)
-            goto bad_arg;
-         st->start = value;
-      }
-      break;
-      case CELT_SET_END_BAND_REQUEST:
-      {
-         oac_int32 value = va_arg(ap, oac_int32);
-         if (value<1 || value>st->mode->nbEBands)
-            goto bad_arg;
-         st->end = value;
-      }
-      break;
-      case CELT_SET_PREDICTION_REQUEST:
-      {
-         int value = va_arg(ap, oac_int32);
-         if (value<0 || value>2)
-            goto bad_arg;
-         st->disable_pf = value<=1;
-         st->force_intra = value==0;
-      }
-      break;
-      case OAC_SET_PACKET_LOSS_PERC_REQUEST:
-      {
-         int value = va_arg(ap, oac_int32);
-         if (value<0 || value>100)
-            goto bad_arg;
-         st->loss_rate = value;
-      }
-      break;
-      case OAC_SET_VBR_CONSTRAINT_REQUEST:
-      {
-         oac_int32 value = va_arg(ap, oac_int32);
-         st->constrained_vbr = value;
-      }
-      break;
-      case OAC_SET_VBR_REQUEST:
-      {
-         oac_int32 value = va_arg(ap, oac_int32);
-         st->vbr = value;
-      }
-      break;
-      case OAC_SET_BITRATE_REQUEST:
-      {
-         oac_int32 value = va_arg(ap, oac_int32);
-         if (value<=500 && value!=OAC_BITRATE_MAX)
-            goto bad_arg;
-         value = IMIN(value, 750000*st->channels);
-         st->bitrate = value;
-      }
-      break;
-      case CELT_SET_CHANNELS_REQUEST:
-      {
-         oac_int32 value = va_arg(ap, oac_int32);
-         if (value<1 || value>2)
-            goto bad_arg;
-         st->stream_channels = value;
-      }
-      break;
-      case OAC_SET_LSB_DEPTH_REQUEST:
-      {
-          oac_int32 value = va_arg(ap, oac_int32);
-          if (value<8 || value>24)
-             goto bad_arg;
-          st->lsb_depth=value;
-      }
-      break;
-      case OAC_GET_LSB_DEPTH_REQUEST:
-      {
-          oac_int32 *value = va_arg(ap, oac_int32*);
-          *value=st->lsb_depth;
-      }
-      break;
-      case OAC_SET_PHASE_INVERSION_DISABLED_REQUEST:
-      {
-          oac_int32 value = va_arg(ap, oac_int32);
-          if(value<0 || value>1)
-          {
-             goto bad_arg;
-          }
-          st->disable_inv = value;
-      }
-      break;
-      case OAC_GET_PHASE_INVERSION_DISABLED_REQUEST:
-      {
-          oac_int32 *value = va_arg(ap, oac_int32*);
-          if (!value)
-          {
-             goto bad_arg;
-          }
-          *value = st->disable_inv;
-      }
-      break;
-      case OAC_RESET_STATE:
-      {
-         int i;
-         celt_glog *oldBandE, *oldLogE, *oldLogE2;
-         oldBandE = (celt_glog*)(st->in_mem+st->channels*(st->mode->overlap+QEXT_SCALE2(COMBFILTER_MAXPERIOD, st->qext_scale)));
-         oldLogE = oldBandE + st->channels*st->mode->nbEBands;
-         oldLogE2 = oldLogE + st->channels*st->mode->nbEBands;
-         OAC_CLEAR((char*)&st->ENCODER_RESET_START,
-               oac_custom_encoder_get_size(st->mode, st->channels)-
-               ((char*)&st->ENCODER_RESET_START - (char*)st));
-         for (i=0;i<st->channels*st->mode->nbEBands;i++)
-            oldLogE[i]=oldLogE2[i]=-GCONST(28.f);
-         st->vbr_offset = 0;
-         st->delayedIntra = 1;
-         st->spread_decision = SPREAD_NORMAL;
-         st->tonal_average = 256;
-         st->hf_average = 0;
-         st->tapset_decision = 0;
-      }
-      break;
+int oac_custom_encoder_ctl(CELTEncoder * OAC_RESTRICT st, int request, ...) {
+    va_list ap;
+
+    va_start(ap, request);
+    switch (request) {
+        case OAC_SET_COMPLEXITY_REQUEST:
+        {
+            int value = va_arg(ap, oac_int32);
+            if (value < 0 || value > 10)
+                goto bad_arg;
+            st->complexity = value;
+        }
+        break;
+        case CELT_SET_START_BAND_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            if (value < 0 || value >= st->mode->nbEBands)
+                goto bad_arg;
+            st->start = value;
+        }
+        break;
+        case CELT_SET_END_BAND_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            if (value < 1 || value > st->mode->nbEBands)
+                goto bad_arg;
+            st->end = value;
+        }
+        break;
+        case CELT_SET_PREDICTION_REQUEST:
+        {
+            int value = va_arg(ap, oac_int32);
+            if (value < 0 || value > 2)
+                goto bad_arg;
+            st->disable_pf = value <= 1;
+            st->force_intra = value == 0;
+        }
+        break;
+        case OAC_SET_PACKET_LOSS_PERC_REQUEST:
+        {
+            int value = va_arg(ap, oac_int32);
+            if (value < 0 || value > 100)
+                goto bad_arg;
+            st->loss_rate = value;
+        }
+        break;
+        case OAC_SET_VBR_CONSTRAINT_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            st->constrained_vbr = value;
+        }
+        break;
+        case OAC_SET_VBR_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            st->vbr = value;
+        }
+        break;
+        case OAC_SET_BITRATE_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            if (value <= 500 && value != OAC_BITRATE_MAX)
+                goto bad_arg;
+            value = IMIN(value, 750000*st->channels);
+            st->bitrate = value;
+        }
+        break;
+        case CELT_SET_CHANNELS_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            if (value < 1 || value > 2)
+                goto bad_arg;
+            st->stream_channels = value;
+        }
+        break;
+        case OAC_SET_LSB_DEPTH_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            if (value < 8 || value > 24)
+                goto bad_arg;
+            st->lsb_depth = value;
+        }
+        break;
+        case OAC_GET_LSB_DEPTH_REQUEST:
+        {
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            *value = st->lsb_depth;
+        }
+        break;
+        case OAC_SET_PHASE_INVERSION_DISABLED_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            if (value < 0 || value > 1) {
+                goto bad_arg;
+            }
+            st->disable_inv = value;
+        }
+        break;
+        case OAC_GET_PHASE_INVERSION_DISABLED_REQUEST:
+        {
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            if (!value) {
+                goto bad_arg;
+            }
+            *value = st->disable_inv;
+        }
+        break;
+        case OAC_RESET_STATE:
+        {
+            int i;
+            celt_glog *oldBandE, *oldLogE, *oldLogE2;
+            oldBandE = (celt_glog*)(st->in_mem + st->channels*(st->mode->overlap + QEXT_SCALE2(COMBFILTER_MAXPERIOD,
+            st->qext_scale)));
+            oldLogE = oldBandE + st->channels*st->mode->nbEBands;
+            oldLogE2 = oldLogE + st->channels*st->mode->nbEBands;
+            OAC_CLEAR((char*)&st->ENCODER_RESET_START,
+               oac_custom_encoder_get_size(st->mode, st->channels)
+                - ((char*)&st->ENCODER_RESET_START - (char*)st));
+            for (i = 0; i < st->channels*st->mode->nbEBands; i++)
+                oldLogE[i] = oldLogE2[i] = -GCONST(28.f);
+            st->vbr_offset = 0;
+            st->delayedIntra = 1;
+            st->spread_decision = SPREAD_NORMAL;
+            st->tonal_average = 256;
+            st->hf_average = 0;
+            st->tapset_decision = 0;
+        }
+        break;
 #if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
-      case CELT_SET_INPUT_CLIPPING_REQUEST:
-      {
-         oac_int32 value = va_arg(ap, oac_int32);
-         st->clip = value;
-      }
-      break;
+        case CELT_SET_INPUT_CLIPPING_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            st->clip = value;
+        }
+        break;
 #endif
-      case CELT_SET_SIGNALLING_REQUEST:
-      {
-         oac_int32 value = va_arg(ap, oac_int32);
-         st->signalling = value;
-      }
-      break;
-      case CELT_SET_ANALYSIS_REQUEST:
-      {
-         AnalysisInfo *info = va_arg(ap, AnalysisInfo *);
-         if (info)
-            OAC_COPY(&st->analysis, info, 1);
-      }
-      break;
-      case CELT_SET_SILK_INFO_REQUEST:
-      {
-         SILKInfo *info = va_arg(ap, SILKInfo *);
-         if (info)
-            OAC_COPY(&st->silk_info, info, 1);
-      }
-      break;
-      case CELT_GET_MODE_REQUEST:
-      {
-         const CELTMode ** value = va_arg(ap, const CELTMode**);
-         if (value==0)
-            goto bad_arg;
-         *value=st->mode;
-      }
-      break;
-      case OAC_GET_FINAL_RANGE_REQUEST:
-      {
-         oac_uint32 * value = va_arg(ap, oac_uint32 *);
-         if (value==0)
-            goto bad_arg;
-         *value=st->rng;
-      }
-      break;
-      case OAC_SET_LFE_REQUEST:
-      {
-          oac_int32 value = va_arg(ap, oac_int32);
-          st->lfe = value;
-      }
-      break;
-      case OAC_SET_ENERGY_MASK_REQUEST:
-      {
-         celt_glog *value = va_arg(ap, celt_glog*);
-          st->energy_mask = value;
-      }
-      break;
-      default:
-         goto bad_request;
-   }
-   va_end(ap);
-   return OAC_OK;
+        case CELT_SET_SIGNALLING_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            st->signalling = value;
+        }
+        break;
+        case CELT_SET_ANALYSIS_REQUEST:
+        {
+            AnalysisInfo *info = va_arg(ap, AnalysisInfo *);
+            if (info)
+                OAC_COPY(&st->analysis, info, 1);
+        }
+        break;
+        case CELT_SET_SILK_INFO_REQUEST:
+        {
+            SILKInfo *info = va_arg(ap, SILKInfo *);
+            if (info)
+                OAC_COPY(&st->silk_info, info, 1);
+        }
+        break;
+        case CELT_GET_MODE_REQUEST:
+        {
+            const CELTMode ** value = va_arg(ap, const CELTMode**);
+            if (value == 0)
+                goto bad_arg;
+            *value = st->mode;
+        }
+        break;
+        case OAC_GET_FINAL_RANGE_REQUEST:
+        {
+            oac_uint32 * value = va_arg(ap, oac_uint32 *);
+            if (value == 0)
+                goto bad_arg;
+            *value = st->rng;
+        }
+        break;
+        case OAC_SET_LFE_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            st->lfe = value;
+        }
+        break;
+        case OAC_SET_ENERGY_MASK_REQUEST:
+        {
+            celt_glog *value = va_arg(ap, celt_glog*);
+            st->energy_mask = value;
+        }
+        break;
+        default:
+            goto bad_request;
+    }
+    va_end(ap);
+    return OAC_OK;
 bad_arg:
-   va_end(ap);
-   return OAC_BAD_ARG;
+    va_end(ap);
+    return OAC_BAD_ARG;
 bad_request:
-   va_end(ap);
-   return OAC_UNIMPLEMENTED;
+    va_end(ap);
+    return OAC_UNIMPLEMENTED;
 }
diff --git a/celt/celt_lpc.c b/celt/celt_lpc.c
index 00900c700..e3591398f 100644
--- a/celt/celt_lpc.c
+++ b/celt/celt_lpc.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "celt_lpc.h"
@@ -35,340 +35,319 @@
 #include "pitch.h"
 
 void _celt_lpc(
-      oac_val16       *_lpc, /* out: [0...p-1] LPC coefficients      */
-const oac_val32 *ac,  /* in:  [0...p] autocorrelation values  */
-int          p
-)
-{
-   int i, j;
-   oac_val32 r;
-   oac_val32 error = ac[0];
+    oac_val16       *_lpc,   /* out: [0...p-1] LPC coefficients      */
+    const oac_val32 *ac, /* in:  [0...p] autocorrelation values  */
+    int p)               {
+    int i, j;
+    oac_val32 r;
+    oac_val32 error = ac[0];
 #ifdef FIXED_POINT
-   oac_val32 lpc[CELT_LPC_ORDER];
+    oac_val32 lpc[CELT_LPC_ORDER];
 #else
-   float *lpc = _lpc;
+    float *lpc = _lpc;
 #endif
 
-   OAC_CLEAR(lpc, p);
+    OAC_CLEAR(lpc, p);
 #ifdef FIXED_POINT
-   if (ac[0] != 0)
+    if (ac[0] != 0)
 #else
-   if (ac[0] > 1e-10f)
+    if (ac[0] > 1e-10f)
 #endif
-   {
-      for (i = 0; i < p; i++) {
-         /* Sum up this iteration's reflection coefficient */
-         oac_val32 rr = 0;
+    {
+        for (i = 0; i < p; i++) {
+            /* Sum up this iteration's reflection coefficient */
+            oac_val32 rr = 0;
 #if defined (FIXED_POINT) && OAC_FAST_INT64
-         oac_int64 acc = 0;
-         for (j = 0; j < i; j++)
-            acc += (oac_int64)(lpc[j]) * (oac_int64)(ac[i - j]);
-         rr = (oac_val32)SHR64(acc, 31);
+            oac_int64 acc = 0;
+            for (j = 0; j < i; j++)
+                acc += (oac_int64)(lpc[j])*(oac_int64)(ac[i - j]);
+            rr = (oac_val32)SHR64(acc, 31);
 #else
-         for (j = 0; j < i; j++)
-            rr += MULT32_32_Q31(lpc[j],ac[i - j]);
+            for (j = 0; j < i; j++)
+                rr += MULT32_32_Q31(lpc[j], ac[i - j]);
 #endif
-         rr += SHR32(ac[i + 1],6);
-         r = -frac_div32(SHL32(rr,6), error);
-         /*  Update LPC coefficients and total error */
-         lpc[i] = SHR32(r,6);
-         for (j = 0; j < (i+1)>>1; j++)
-         {
-            oac_val32 tmp1, tmp2;
-            tmp1 = lpc[j];
-            tmp2 = lpc[i-1-j];
-            lpc[j]     = tmp1 + MULT32_32_Q31(r,tmp2);
-            lpc[i-1-j] = tmp2 + MULT32_32_Q31(r,tmp1);
-         }
+            rr += SHR32(ac[i + 1], 6);
+            r = -frac_div32(SHL32(rr, 6), error);
+            /*  Update LPC coefficients and total error */
+            lpc[i] = SHR32(r, 6);
+            for (j = 0; j < (i + 1)>>1; j++) {
+                oac_val32 tmp1, tmp2;
+                tmp1 = lpc[j];
+                tmp2 = lpc[i - 1 - j];
+                lpc[j]     = tmp1 + MULT32_32_Q31(r, tmp2);
+                lpc[i - 1 - j] = tmp2 + MULT32_32_Q31(r, tmp1);
+            }
 
-         error = error - MULT32_32_Q31(MULT32_32_Q31(r,r),error);
-         /* Bail out once we get 30 dB gain */
+            error = error - MULT32_32_Q31(MULT32_32_Q31(r, r), error);
+            /* Bail out once we get 30 dB gain */
 #ifdef FIXED_POINT
-         if (error<=SHR32(ac[0],10))
-            break;
+            if (error <= SHR32(ac[0], 10))
+                break;
 #else
-         if (error<=.001f*ac[0])
-            break;
+            if (error <= .001f*ac[0])
+                break;
 #endif
-      }
-   }
+        }
+    }
 #ifdef FIXED_POINT
-   {
-      /* Convert the int32 lpcs to int16 and ensure there are no wrap-arounds.
-         This reuses the logic in silk_LPC_fit() and silk_bwexpander_32(). Any bug
-         fixes should also be applied there. */
-      int iter, idx = 0;
-      oac_val32 maxabs, absval, chirp_Q16, chirp_minus_one_Q16;
+    {
+        /* Convert the int32 lpcs to int16 and ensure there are no wrap-arounds.
+           This reuses the logic in silk_LPC_fit() and silk_bwexpander_32(). Any bug
+           fixes should also be applied there. */
+        int iter, idx = 0;
+        oac_val32 maxabs, absval, chirp_Q16, chirp_minus_one_Q16;
 
-      for (iter = 0; iter < 10; iter++) {
-         maxabs = 0;
-         for (i = 0; i < p; i++) {
-            absval = ABS32(lpc[i]);
-            if (absval > maxabs) {
-               maxabs = absval;
-               idx = i;
+        for (iter = 0; iter < 10; iter++) {
+            maxabs = 0;
+            for (i = 0; i < p; i++) {
+                absval = ABS32(lpc[i]);
+                if (absval > maxabs) {
+                    maxabs = absval;
+                    idx = i;
+                }
             }
-         }
-         maxabs = PSHR32(maxabs, 13);  /* Q25->Q12 */
+            maxabs = PSHR32(maxabs, 13); /* Q25->Q12 */
 
-         if (maxabs > 32767) {
-            maxabs = MIN32(maxabs, 163838);
-            chirp_Q16 = QCONST32(0.999, 16) - DIV32(SHL32(maxabs - 32767, 14),
+            if (maxabs > 32767) {
+                maxabs = MIN32(maxabs, 163838);
+                chirp_Q16 = QCONST32(0.999, 16) - DIV32(SHL32(maxabs - 32767, 14),
                                                     SHR32(MULT32_32_32(maxabs, idx + 1), 2));
-            chirp_minus_one_Q16 = chirp_Q16 - 65536;
+                chirp_minus_one_Q16 = chirp_Q16 - 65536;
 
-            /* Apply bandwidth expansion. */
-            for (i = 0; i < p - 1; i++) {
-               lpc[i] = MULT32_32_Q16(chirp_Q16, lpc[i]);
-               chirp_Q16 += PSHR32(MULT32_32_32(chirp_Q16, chirp_minus_one_Q16), 16);
+                /* Apply bandwidth expansion. */
+                for (i = 0; i < p - 1; i++) {
+                    lpc[i] = MULT32_32_Q16(chirp_Q16, lpc[i]);
+                    chirp_Q16 += PSHR32(MULT32_32_32(chirp_Q16, chirp_minus_one_Q16), 16);
+                }
+                lpc[p - 1] = MULT32_32_Q16(chirp_Q16, lpc[p - 1]);
+            } else {
+                break;
             }
-            lpc[p - 1] = MULT32_32_Q16(chirp_Q16, lpc[p - 1]);
-         } else {
-            break;
-         }
-      }
+        }
 
-      if (iter == 10) {
-         /* If the coeffs still do not fit into the 16 bit range after 10 iterations,
-            fall back to the A(z)=1 filter. */
-         OAC_CLEAR(lpc, p);
-         _lpc[0] = 4096;  /* Q12 */
-      } else {
-         for (i = 0; i < p; i++) {
-            _lpc[i] = EXTRACT16(PSHR32(lpc[i], 13));  /* Q25->Q12 */
-         }
-      }
-   }
+        if (iter == 10) {
+            /* If the coeffs still do not fit into the 16 bit range after 10 iterations,
+               fall back to the A(z)=1 filter. */
+            OAC_CLEAR(lpc, p);
+            _lpc[0] = 4096; /* Q12 */
+        } else {
+            for (i = 0; i < p; i++) {
+                _lpc[i] = EXTRACT16(PSHR32(lpc[i], 13)); /* Q25->Q12 */
+            }
+        }
+    }
 #endif
 }
 
 
 void celt_fir_c(
-         const oac_val16 *x,
-         const oac_val16 *num,
-         oac_val16 *y,
-         int N,
-         int ord,
-         int arch)
-{
-   int i,j;
-   VARDECL(oac_val16, rnum);
-   SAVE_STACK;
-   celt_assert(x != y);
-   ALLOC(rnum, ord, oac_val16);
-   for(i=0;i<ord;i++)
-      rnum[i] = num[ord-i-1];
-   for (i=0;i<N-3;i+=4)
-   {
-      oac_val32 sum[4];
-      sum[0] = SHL32(EXTEND32(x[i  ]), SIG_SHIFT);
-      sum[1] = SHL32(EXTEND32(x[i+1]), SIG_SHIFT);
-      sum[2] = SHL32(EXTEND32(x[i+2]), SIG_SHIFT);
-      sum[3] = SHL32(EXTEND32(x[i+3]), SIG_SHIFT);
+    const oac_val16 *x,
+    const oac_val16 *num,
+    oac_val16 *y,
+    int N,
+    int ord,
+    int arch) {
+    int i, j;
+    VARDECL(oac_val16, rnum);
+    SAVE_STACK;
+    celt_assert(x != y);
+    ALLOC(rnum, ord, oac_val16);
+    for (i = 0; i < ord; i++)
+        rnum[i] = num[ord - i - 1];
+    for (i = 0; i < N - 3; i += 4) {
+        oac_val32 sum[4];
+        sum[0] = SHL32(EXTEND32(x[i  ]), SIG_SHIFT);
+        sum[1] = SHL32(EXTEND32(x[i + 1]), SIG_SHIFT);
+        sum[2] = SHL32(EXTEND32(x[i + 2]), SIG_SHIFT);
+        sum[3] = SHL32(EXTEND32(x[i + 3]), SIG_SHIFT);
 #if defined(OAC_CHECK_ASM) && defined(FIXED_POINT)
-      {
-         oac_val32 sum_c[4];
-         memcpy(sum_c, sum, sizeof(sum_c));
-         xcorr_kernel_c(rnum, x+i-ord, sum_c, ord);
+        {
+            oac_val32 sum_c[4];
+            memcpy(sum_c, sum, sizeof(sum_c));
+            xcorr_kernel_c(rnum, x + i - ord, sum_c, ord);
 #endif
-         xcorr_kernel(rnum, x+i-ord, sum, ord, arch);
+        xcorr_kernel(rnum, x + i - ord, sum, ord, arch);
 #if defined(OAC_CHECK_ASM) && defined(FIXED_POINT)
-         celt_assert(memcmp(sum, sum_c, sizeof(sum)) == 0);
-      }
+        celt_assert(memcmp(sum, sum_c, sizeof(sum)) == 0);
+    }
 #endif
-      y[i  ] = SROUND16(sum[0], SIG_SHIFT);
-      y[i+1] = SROUND16(sum[1], SIG_SHIFT);
-      y[i+2] = SROUND16(sum[2], SIG_SHIFT);
-      y[i+3] = SROUND16(sum[3], SIG_SHIFT);
-   }
-   for (;i<N;i++)
-   {
-      oac_val32 sum = SHL32(EXTEND32(x[i]), SIG_SHIFT);
-      for (j=0;j<ord;j++)
-         sum = MAC16_16(sum,rnum[j],x[i+j-ord]);
-      y[i] = SROUND16(sum, SIG_SHIFT);
-   }
-   RESTORE_STACK;
+        y[i  ] = SROUND16(sum[0], SIG_SHIFT);
+        y[i + 1] = SROUND16(sum[1], SIG_SHIFT);
+        y[i + 2] = SROUND16(sum[2], SIG_SHIFT);
+        y[i + 3] = SROUND16(sum[3], SIG_SHIFT);
+    }
+    for (; i < N; i++) {
+        oac_val32 sum = SHL32(EXTEND32(x[i]), SIG_SHIFT);
+        for (j = 0; j < ord; j++)
+            sum = MAC16_16(sum, rnum[j], x[i + j - ord]);
+        y[i] = SROUND16(sum, SIG_SHIFT);
+    }
+    RESTORE_STACK;
 }
 
 void celt_iir(const oac_val32 *_x,
-         const oac_val16 *den,
-         oac_val32 *_y,
-         int N,
-         int ord,
-         oac_val16 *mem,
-         int arch)
-{
+              const oac_val16 *den,
+              oac_val32 *_y,
+              int N,
+              int ord,
+              oac_val16 *mem,
+              int arch) {
 #ifdef SMALL_FOOTPRINT
-   int i,j;
-   (void)arch;
-   for (i=0;i<N;i++)
-   {
-      oac_val32 sum = _x[i];
-      for (j=0;j<ord;j++)
-      {
-         sum -= MULT16_16(den[j],mem[j]);
-      }
-      for (j=ord-1;j>=1;j--)
-      {
-         mem[j]=mem[j-1];
-      }
-      mem[0] = SROUND16(sum, SIG_SHIFT);
-      _y[i] = sum;
-   }
+    int i, j;
+    (void)arch;
+    for (i = 0; i < N; i++) {
+        oac_val32 sum = _x[i];
+        for (j = 0; j < ord; j++) {
+            sum -= MULT16_16(den[j], mem[j]);
+        }
+        for (j = ord - 1; j >= 1; j--) {
+            mem[j] = mem[j - 1];
+        }
+        mem[0] = SROUND16(sum, SIG_SHIFT);
+        _y[i] = sum;
+    }
 #else
-   int i,j;
-   VARDECL(oac_val16, rden);
-   VARDECL(oac_val16, y);
-   SAVE_STACK;
+    int i, j;
+    VARDECL(oac_val16, rden);
+    VARDECL(oac_val16, y);
+    SAVE_STACK;
 
-   celt_assert((ord&3)==0);
-   ALLOC(rden, ord, oac_val16);
-   ALLOC(y, N+ord, oac_val16);
-   for(i=0;i<ord;i++)
-      rden[i] = den[ord-i-1];
-   for(i=0;i<ord;i++)
-      y[i] = -mem[ord-i-1];
-   for(;i<N+ord;i++)
-      y[i]=0;
-   for (i=0;i<N-3;i+=4)
-   {
-      /* Unroll by 4 as if it were an FIR filter */
-      oac_val32 sum[4];
-      sum[0]=_x[i];
-      sum[1]=_x[i+1];
-      sum[2]=_x[i+2];
-      sum[3]=_x[i+3];
-#if defined(OAC_CHECK_ASM) && defined(FIXED_POINT)
-      {
-         oac_val32 sum_c[4];
-         memcpy(sum_c, sum, sizeof(sum_c));
-         xcorr_kernel_c(rden, y+i, sum_c, ord);
-#endif
-         xcorr_kernel(rden, y+i, sum, ord, arch);
-#if defined(OAC_CHECK_ASM) && defined(FIXED_POINT)
-         celt_assert(memcmp(sum, sum_c, sizeof(sum)) == 0);
-      }
-#endif
-      /* Patch up the result to compensate for the fact that this is an IIR */
-      y[i+ord  ] = -SROUND16(sum[0],SIG_SHIFT);
-      _y[i  ] = sum[0];
-      sum[1] = MAC16_16(sum[1], y[i+ord  ], den[0]);
-      y[i+ord+1] = -SROUND16(sum[1],SIG_SHIFT);
-      _y[i+1] = sum[1];
-      sum[2] = MAC16_16(sum[2], y[i+ord+1], den[0]);
-      sum[2] = MAC16_16(sum[2], y[i+ord  ], den[1]);
-      y[i+ord+2] = -SROUND16(sum[2],SIG_SHIFT);
-      _y[i+2] = sum[2];
+    celt_assert((ord&3) == 0);
+    ALLOC(rden, ord, oac_val16);
+    ALLOC(y, N + ord, oac_val16);
+    for (i = 0; i < ord; i++)
+        rden[i] = den[ord - i - 1];
+    for (i = 0; i < ord; i++)
+        y[i] = -mem[ord - i - 1];
+    for (; i < N + ord; i++)
+        y[i] = 0;
+    for (i = 0; i < N - 3; i += 4) {
+        /* Unroll by 4 as if it were an FIR filter */
+        oac_val32 sum[4];
+        sum[0] = _x[i];
+        sum[1] = _x[i + 1];
+        sum[2] = _x[i + 2];
+        sum[3] = _x[i + 3];
+# if defined(OAC_CHECK_ASM) && defined(FIXED_POINT)
+        {
+            oac_val32 sum_c[4];
+            memcpy(sum_c, sum, sizeof(sum_c));
+            xcorr_kernel_c(rden, y + i, sum_c, ord);
+# endif
+        xcorr_kernel(rden, y + i, sum, ord, arch);
+# if defined(OAC_CHECK_ASM) && defined(FIXED_POINT)
+        celt_assert(memcmp(sum, sum_c, sizeof(sum)) == 0);
+    }
+# endif
+        /* Patch up the result to compensate for the fact that this is an IIR */
+        y[i + ord  ] = -SROUND16(sum[0], SIG_SHIFT);
+        _y[i  ] = sum[0];
+        sum[1] = MAC16_16(sum[1], y[i + ord  ], den[0]);
+        y[i + ord + 1] = -SROUND16(sum[1], SIG_SHIFT);
+        _y[i + 1] = sum[1];
+        sum[2] = MAC16_16(sum[2], y[i + ord + 1], den[0]);
+        sum[2] = MAC16_16(sum[2], y[i + ord  ], den[1]);
+        y[i + ord + 2] = -SROUND16(sum[2], SIG_SHIFT);
+        _y[i + 2] = sum[2];
 
-      sum[3] = MAC16_16(sum[3], y[i+ord+2], den[0]);
-      sum[3] = MAC16_16(sum[3], y[i+ord+1], den[1]);
-      sum[3] = MAC16_16(sum[3], y[i+ord  ], den[2]);
-      y[i+ord+3] = -SROUND16(sum[3],SIG_SHIFT);
-      _y[i+3] = sum[3];
-   }
-   for (;i<N;i++)
-   {
-      oac_val32 sum = _x[i];
-      for (j=0;j<ord;j++)
-         sum -= MULT16_16(rden[j],y[i+j]);
-      y[i+ord] = SROUND16(sum,SIG_SHIFT);
-      _y[i] = sum;
-   }
-   for(i=0;i<ord;i++)
-      mem[i] = _y[N-i-1];
-   RESTORE_STACK;
+        sum[3] = MAC16_16(sum[3], y[i + ord + 2], den[0]);
+        sum[3] = MAC16_16(sum[3], y[i + ord + 1], den[1]);
+        sum[3] = MAC16_16(sum[3], y[i + ord  ], den[2]);
+        y[i + ord + 3] = -SROUND16(sum[3], SIG_SHIFT);
+        _y[i + 3] = sum[3];
+    }
+    for (; i < N; i++) {
+        oac_val32 sum = _x[i];
+        for (j = 0; j < ord; j++)
+            sum -= MULT16_16(rden[j], y[i + j]);
+        y[i + ord] = SROUND16(sum, SIG_SHIFT);
+        _y[i] = sum;
+    }
+    for (i = 0; i < ord; i++)
+        mem[i] = _y[N - i - 1];
+    RESTORE_STACK;
 #endif
 }
 
 int _celt_autocorr(
-                   const oac_val16 *x,   /*  in: [0...n-1] samples x   */
-                   oac_val32       *ac,  /* out: [0...lag-1] ac values */
-                   const celt_coef  *window,
-                   int          overlap,
-                   int          lag,
-                   int          n,
-                   int          arch
-                  )
-{
-   oac_val32 d;
-   int i, k;
-   int fastN=n-lag;
-   int shift;
-   const oac_val16 *xptr;
-   VARDECL(oac_val16, xx);
-   SAVE_STACK;
-   ALLOC(xx, n, oac_val16);
-   celt_assert(n>0);
-   celt_assert(overlap>=0);
-   if (overlap == 0)
-   {
-      xptr = x;
-   } else {
-      for (i=0;i<n;i++)
-         xx[i] = x[i];
-      for (i=0;i<overlap;i++)
-      {
-         oac_val16 w = COEF2VAL16(window[i]);
-         xx[i] = MULT16_16_Q15(x[i],w);
-         xx[n-i-1] = MULT16_16_Q15(x[n-i-1],w);
-      }
-      xptr = xx;
-   }
-   shift=0;
+    const oac_val16 *x,                  /*  in: [0...n-1] samples x   */
+    oac_val32       *ac,                 /* out: [0...lag-1] ac values */
+    const celt_coef  *window,
+    int overlap,
+    int lag,
+    int n,
+    int arch)                   {
+    oac_val32 d;
+    int i, k;
+    int fastN = n - lag;
+    int shift;
+    const oac_val16 *xptr;
+    VARDECL(oac_val16, xx);
+    SAVE_STACK;
+    ALLOC(xx, n, oac_val16);
+    celt_assert(n > 0);
+    celt_assert(overlap >= 0);
+    if (overlap == 0) {
+        xptr = x;
+    } else {
+        for (i = 0; i < n; i++)
+            xx[i] = x[i];
+        for (i = 0; i < overlap; i++) {
+            oac_val16 w = COEF2VAL16(window[i]);
+            xx[i] = MULT16_16_Q15(x[i], w);
+            xx[n - i - 1] = MULT16_16_Q15(x[n - i - 1], w);
+        }
+        xptr = xx;
+    }
+    shift = 0;
 #ifdef FIXED_POINT
-   {
-      oac_val32 ac0;
-      int ac0_shift = celt_ilog2(n + (n>>4));
-      ac0 = 1+(n<<7);
-      if (n&1) ac0 += SHR32(MULT16_16(xptr[0],xptr[0]),ac0_shift);
-      for(i=(n&1);i<n;i+=2)
-      {
-         ac0 += SHR32(MULT16_16(xptr[i],xptr[i]),ac0_shift);
-         ac0 += SHR32(MULT16_16(xptr[i+1],xptr[i+1]),ac0_shift);
-      }
-      /* Consider the effect of rounding-to-nearest when scaling the signal. */
-      ac0 += SHR32(ac0,7);
+    {
+        oac_val32 ac0;
+        int ac0_shift = celt_ilog2(n + (n>>4));
+        ac0 = 1 + (n<<7);
+        if (n&1) ac0 += SHR32(MULT16_16(xptr[0], xptr[0]), ac0_shift);
+        for (i = (n&1); i < n; i += 2) {
+            ac0 += SHR32(MULT16_16(xptr[i], xptr[i]), ac0_shift);
+            ac0 += SHR32(MULT16_16(xptr[i + 1], xptr[i + 1]), ac0_shift);
+        }
+        /* Consider the effect of rounding-to-nearest when scaling the signal. */
+        ac0 += SHR32(ac0, 7);
 
-      shift = celt_ilog2(ac0)-30+ac0_shift+1;
-      shift = (shift)/2;
-      if (shift>0)
-      {
-         for(i=0;i<n;i++)
-            xx[i] = PSHR32(xptr[i], shift);
-         xptr = xx;
-      } else
-         shift = 0;
-   }
+        shift = celt_ilog2(ac0) - 30 + ac0_shift + 1;
+        shift = (shift)/2;
+        if (shift > 0) {
+            for (i = 0; i < n; i++)
+                xx[i] = PSHR32(xptr[i], shift);
+            xptr = xx;
+        } else
+            shift = 0;
+    }
 #endif
-   celt_pitch_xcorr(xptr, xptr, ac, fastN, lag+1, arch);
-   for (k=0;k<=lag;k++)
-   {
-      for (i = k+fastN, d = 0; i < n; i++)
-         d = MAC16_16(d, xptr[i], xptr[i-k]);
-      ac[k] += d;
-   }
+    celt_pitch_xcorr(xptr, xptr, ac, fastN, lag + 1, arch);
+    for (k = 0; k <= lag; k++) {
+        for (i = k + fastN, d = 0; i < n; i++)
+            d = MAC16_16(d, xptr[i], xptr[i - k]);
+        ac[k] += d;
+    }
 #ifdef FIXED_POINT
-   shift = 2*shift;
-   if (shift<=0)
-      ac[0] += SHL32((oac_int32)1, -shift);
-   if (ac[0] < 268435456)
-   {
-      int shift2 = 29 - EC_ILOG(ac[0]);
-      for (i=0;i<=lag;i++)
-         ac[i] = SHL32(ac[i], shift2);
-      shift -= shift2;
-   } else if (ac[0] >= 536870912)
-   {
-      int shift2=1;
-      if (ac[0] >= 1073741824)
-         shift2++;
-      for (i=0;i<=lag;i++)
-         ac[i] = SHR32(ac[i], shift2);
-      shift += shift2;
-   }
+    shift = 2*shift;
+    if (shift <= 0)
+        ac[0] += SHL32((oac_int32)1, -shift);
+    if (ac[0] < 268435456) {
+        int shift2 = 29 - EC_ILOG(ac[0]);
+        for (i = 0; i <= lag; i++)
+            ac[i] = SHL32(ac[i], shift2);
+        shift -= shift2;
+    } else if (ac[0] >= 536870912) {
+        int shift2 = 1;
+        if (ac[0] >= 1073741824)
+            shift2++;
+        for (i = 0; i <= lag; i++)
+            ac[i] = SHR32(ac[i], shift2);
+        shift += shift2;
+    }
 #endif
 
-   RESTORE_STACK;
-   return shift;
+    RESTORE_STACK;
+    return shift;
 }
diff --git a/celt/celt_lpc.h b/celt/celt_lpc.h
index e3f5fce7c..9e7246c90 100644
--- a/celt/celt_lpc.h
+++ b/celt/celt_lpc.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef CELT_LPC_H
 #define CELT_LPC_H
@@ -32,7 +32,7 @@
 #include "cpu_support.h"
 
 #if defined(OAC_X86_MAY_HAVE_SSE4_1)
-#include "x86/celt_lpc_sse.h"
+# include "x86/celt_lpc_sse.h"
 #endif
 
 #define CELT_LPC_ORDER 24
@@ -40,27 +40,27 @@
 void _celt_lpc(oac_val16 *_lpc, const oac_val32 *ac, int p);
 
 void celt_fir_c(
-         const oac_val16 *x,
-         const oac_val16 *num,
-         oac_val16 *y,
-         int N,
-         int ord,
-         int arch);
+    const oac_val16 *x,
+    const oac_val16 *num,
+    oac_val16 *y,
+    int N,
+    int ord,
+    int arch);
 
 #if !defined(OVERRIDE_CELT_FIR)
-#define celt_fir(x, num, y, N, ord, arch) \
-    (celt_fir_c(x, num, y, N, ord, arch))
+# define celt_fir(x, num, y, N, ord, arch) \
+        (celt_fir_c(x, num, y, N, ord, arch))
 #endif
 
 void celt_iir(const oac_val32 *x,
-         const oac_val16 *den,
-         oac_val32 *y,
-         int N,
-         int ord,
-         oac_val16 *mem,
-         int arch);
+    const oac_val16 *den,
+    oac_val32 *y,
+    int N,
+    int ord,
+    oac_val16 *mem,
+    int arch);
 
 int _celt_autocorr(const oac_val16 *x, oac_val32 *ac,
-         const celt_coef *window, int overlap, int lag, int n, int arch);
+    const celt_coef *window, int overlap, int lag, int n, int arch);
 
 #endif /* CELT_LPC_H */
diff --git a/celt/cpu_support.h b/celt/cpu_support.h
index 0de39cd65..edc11add9 100644
--- a/celt/cpu_support.h
+++ b/celt/cpu_support.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef CPU_SUPPORT_H
 #define CPU_SUPPORT_H
@@ -32,8 +32,8 @@
 #include "oac_defines.h"
 
 #if defined(OAC_HAVE_RTCD) && \
-  (defined(OAC_ARM_ASM) || defined(OAC_ARM_MAY_HAVE_NEON_INTR))
-#include "arm/armcpu.h"
+    (defined(OAC_ARM_ASM) || defined(OAC_ARM_MAY_HAVE_NEON_INTR))
+# include "arm/armcpu.h"
 
 /* We currently support 5 ARM variants:
  * arch[0] -> ARMv4
@@ -42,15 +42,15 @@
  * arch[3] -> NEON
  * arch[4] -> NEON+DOTPROD
  */
-#define OAC_ARCHMASK 7
+# define OAC_ARCHMASK 7
 
 #elif defined(OAC_HAVE_RTCD) && \
-  ((defined(OAC_X86_MAY_HAVE_SSE) && !defined(OAC_X86_PRESUME_SSE)) || \
-  (defined(OAC_X86_MAY_HAVE_SSE2) && !defined(OAC_X86_PRESUME_SSE2)) || \
-  (defined(OAC_X86_MAY_HAVE_SSE4_1) && !defined(OAC_X86_PRESUME_SSE4_1)) || \
-  (defined(OAC_X86_MAY_HAVE_AVX2) && !defined(OAC_X86_PRESUME_AVX2)))
+    ((defined(OAC_X86_MAY_HAVE_SSE) && !defined(OAC_X86_PRESUME_SSE)) || \
+    (defined(OAC_X86_MAY_HAVE_SSE2) && !defined(OAC_X86_PRESUME_SSE2)) || \
+    (defined(OAC_X86_MAY_HAVE_SSE4_1) && !defined(OAC_X86_PRESUME_SSE4_1)) || \
+    (defined(OAC_X86_MAY_HAVE_AVX2) && !defined(OAC_X86_PRESUME_AVX2)))
 
-#include "x86/x86cpu.h"
+# include "x86/x86cpu.h"
 /* We currently support 5 x86 variants:
  * arch[0] -> non-sse
  * arch[1] -> sse
@@ -58,15 +58,14 @@
  * arch[3] -> sse4.1
  * arch[4] -> avx
  */
-#define OAC_ARCHMASK 7
+# define OAC_ARCHMASK 7
 int oac_select_arch(void);
 
 #else
-#define OAC_ARCHMASK 0
+# define OAC_ARCHMASK 0
 
-static OAC_INLINE int oac_select_arch(void)
-{
-  return 0;
+static OAC_INLINE int oac_select_arch(void) {
+    return 0;
 }
 #endif
 #endif
diff --git a/celt/cwrs.c b/celt/cwrs.c
index c763ea44a..a3429d42e 100644
--- a/celt/cwrs.c
+++ b/celt/cwrs.c
@@ -25,10 +25,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "os_support.h"
@@ -37,61 +37,59 @@
 #include "arch.h"
 
 #if defined(CUSTOM_MODES)
-#define CWRS_EXTRA_ROWS
+# define CWRS_EXTRA_ROWS
 #endif
 
 #if defined(CUSTOM_MODES)
 
 /*Guaranteed to return a conservatively large estimate of the binary logarithm
    with frac bits of fractional precision.
-  Tested for all possible 32-bit inputs with frac=4, where the maximum
+   Tested for all possible 32-bit inputs with frac=4, where the maximum
    overestimation is 0.06254243 bits.*/
-int log2_frac(oac_uint32 val, int frac)
-{
-  int l;
-  l=EC_ILOG(val);
-  if(val&(val-1)){
-    /*This is (val>>l-16), but guaranteed to round up, even if adding a bias
-       before the shift would cause overflow (e.g., for 0xFFFFxxxx).
-       Doesn't work for val=0, but that case fails the test above.*/
-    if(l>16)val=((val-1)>>(l-16))+1;
-    else val<<=16-l;
-    l=(l-1)<<frac;
-    /*Note that we always need one iteration, since the rounding up above means
-       that we might need to adjust the integer part of the logarithm.*/
-    do{
-      int b;
-      b=(int)(val>>16);
-      l+=b<<frac;
-      val=(val+b)>>b;
-      val=(val*val+0x7FFF)>>15;
+int log2_frac(oac_uint32 val, int frac) {
+    int l;
+    l = EC_ILOG(val);
+    if (val&(val - 1)) {
+        /*This is (val>>l-16), but guaranteed to round up, even if adding a bias
+           before the shift would cause overflow (e.g., for 0xFFFFxxxx).
+           Doesn't work for val=0, but that case fails the test above.*/
+        if (l > 16) val = ((val - 1)>>(l - 16)) + 1;
+        else val <<= 16 - l;
+        l = (l - 1)<<frac;
+        /*Note that we always need one iteration, since the rounding up above means
+           that we might need to adjust the integer part of the logarithm.*/
+        do {
+            int b;
+            b = (int)(val>>16);
+            l += b<<frac;
+            val = (val + b)>>b;
+            val = (val*val + 0x7FFF)>>15;
+        } while (frac-- > 0);
+        /*If val is not exactly 0x8000, then we have to round up the remainder.*/
+        return l + (val > 0x8000);
     }
-    while(frac-->0);
-    /*If val is not exactly 0x8000, then we have to round up the remainder.*/
-    return l+(val>0x8000);
-  }
-  /*Exact powers of two require no rounding.*/
-  else return (l-1)<<frac;
+    /*Exact powers of two require no rounding.*/
+    else return (l - 1)<<frac;
 }
 #endif
 
 /*Although derived separately, the pulse vector coding scheme is equivalent to
    a Pyramid Vector Quantizer \cite{Fis86}.
-  Some additional notes about an early version appear at
+   Some additional notes about an early version appear at
    https://people.xiph.org/~tterribe/notes/cwrs.html, but the codebook ordering
    and the definitions of some terms have evolved since that was written.
 
-  The conversion from a pulse vector to an integer index (encoding) and back
+   The conversion from a pulse vector to an integer index (encoding) and back
    (decoding) is governed by two related functions, V(N,K) and U(N,K).
 
-  V(N,K) = the number of combinations, with replacement, of N items, taken K
+   V(N,K) = the number of combinations, with replacement, of N items, taken K
    at a time, when a sign bit is added to each item taken at least once (i.e.,
    the number of N-dimensional unit pulse vectors with K pulses).
-  One way to compute this is via
+   One way to compute this is via
     V(N,K) = K>0 ? sum(k=1...K,2**k*choose(N,k)*choose(K-1,k-1)) : 1,
    where choose() is the binomial function.
-  A table of values for N<10 and K<10 looks like:
-  V[10][10] = {
+   A table of values for N<10 and K<10 looks like:
+   V[10][10] = {
     {1,  0,   0,    0,    0,     0,     0,      0,      0,       0},
     {1,  2,   2,    2,    2,     2,     2,      2,      2,       2},
     {1,  4,   8,   12,   16,    20,    24,     28,     32,      36},
@@ -102,22 +100,22 @@ int log2_frac(oac_uint32 val, int frac)
     {1, 14,  98,  462, 1666,  4942, 12642,  28814,  59906,  115598},
     {1, 16, 128,  688, 2816,  9424, 27008,  68464, 157184,  332688},
     {1, 18, 162,  978, 4482, 16722, 53154, 148626, 374274,  864146}
-  };
+   };
 
-  U(N,K) = the number of such combinations wherein N-1 objects are taken at
+   U(N,K) = the number of such combinations wherein N-1 objects are taken at
    most K-1 at a time.
-  This is given by
+   This is given by
     U(N,K) = sum(k=0...K-1,V(N-1,k))
            = K>0 ? (V(N-1,K-1) + V(N,K-1))/2 : 0.
-  The latter expression also makes clear that U(N,K) is half the number of such
+   The latter expression also makes clear that U(N,K) is half the number of such
    combinations wherein the first object is taken at least once.
-  Although it may not be clear from either of these definitions, U(N,K) is the
+   Although it may not be clear from either of these definitions, U(N,K) is the
    natural function to work with when enumerating the pulse vector codebooks,
    not V(N,K).
-  U(N,K) is not well-defined for N=0, but with the extension
+   U(N,K) is not well-defined for N=0, but with the extension
     U(0,K) = K>0 ? 0 : 1,
    the function becomes symmetric: U(N,K) = U(K,N), with a similar table:
-  U[10][10] = {
+   U[10][10] = {
     {1, 0,  0,   0,    0,    0,     0,     0,      0,      0},
     {0, 1,  1,   1,    1,    1,     1,     1,      1,      1},
     {0, 1,  3,   5,    7,    9,    11,    13,     15,     17},
@@ -128,46 +126,46 @@ int log2_frac(oac_uint32 val, int frac)
     {0, 1, 13,  85,  377, 1289,  3653,  8989,  19825,  40081},
     {0, 1, 15, 113,  575, 2241,  7183, 19825,  48639, 108545},
     {0, 1, 17, 145,  833, 3649, 13073, 40081, 108545, 265729}
-  };
+   };
 
-  With this extension, V(N,K) may be written in terms of U(N,K):
+   With this extension, V(N,K) may be written in terms of U(N,K):
     V(N,K) = U(N,K) + U(N,K+1)
    for all N>=0, K>=0.
-  Thus U(N,K+1) represents the number of combinations where the first element
+   Thus U(N,K+1) represents the number of combinations where the first element
    is positive or zero, and U(N,K) represents the number of combinations where
    it is negative.
-  With a large enough table of U(N,K) values, we could write O(N) encoding
+   With a large enough table of U(N,K) values, we could write O(N) encoding
    and O(min(N*log(K),N+K)) decoding routines, but such a table would be
    prohibitively large for small embedded devices (K may be as large as 32767
    for small N, and N may be as large as 200).
 
-  Both functions obey the same recurrence relation:
+   Both functions obey the same recurrence relation:
     V(N,K) = V(N-1,K) + V(N,K-1) + V(N-1,K-1),
     U(N,K) = U(N-1,K) + U(N,K-1) + U(N-1,K-1),
    for all N>0, K>0, with different initial conditions at N=0 or K=0.
-  This allows us to construct a row of one of the tables above given the
+   This allows us to construct a row of one of the tables above given the
    previous row or the next row.
-  Thus we can derive O(NK) encoding and decoding routines with O(K) memory
+   Thus we can derive O(NK) encoding and decoding routines with O(K) memory
    using only addition and subtraction.
 
-  When encoding, we build up from the U(2,K) row and work our way forwards.
-  When decoding, we need to start at the U(N,K) row and work our way backwards,
+   When encoding, we build up from the U(2,K) row and work our way forwards.
+   When decoding, we need to start at the U(N,K) row and work our way backwards,
    which requires a means of computing U(N,K).
-  U(N,K) may be computed from two previous values with the same N:
+   U(N,K) may be computed from two previous values with the same N:
     U(N,K) = ((2*N-1)*U(N,K-1) - U(N,K-2))/(K-1) + U(N,K-2)
    for all N>1, and since U(N,K) is symmetric, a similar relation holds for two
    previous values with the same K:
     U(N,K>1) = ((2*K-1)*U(N-1,K) - U(N-2,K))/(N-1) + U(N-2,K)
    for all K>1.
-  This allows us to construct an arbitrary row of the U(N,K) table by starting
+   This allows us to construct an arbitrary row of the U(N,K) table by starting
    with the first two values, which are constants.
-  This saves roughly 2/3 the work in our O(NK) decoding routine, but costs O(K)
+   This saves roughly 2/3 the work in our O(NK) decoding routine, but costs O(K)
    multiplications.
-  Similar relations can be derived for V(N,K), but are not used here.
+   Similar relations can be derived for V(N,K), but are not used here.
 
-  For N>0 and K>0, U(N,K) and V(N,K) take on the form of an (N-1)-degree
+   For N>0 and K>0, U(N,K) and V(N,K) take on the form of an (N-1)-degree
    polynomial for fixed N.
-  The first few are
+   The first few are
     U(1,K) = 1,
     U(2,K) = 2*K-1,
     U(3,K) = (2*K-2)*K+1,
@@ -180,10 +178,10 @@ int log2_frac(oac_uint32 val, int frac)
     V(4,K) = 8*(K*K+2)*K/3,
     V(5,K) = ((4*K*K+20)*K*K+6)/3,
    for all K>0.
-  This allows us to derive O(N) encoding and O(N*log(K)) decoding routines for
+   This allows us to derive O(N) encoding and O(N*log(K)) decoding routines for
    small N (and indeed decoding is also O(N) for N<3).
 
-  @ARTICLE{Fis86,
+   @ARTICLE{Fis86,
     author="Thomas R. Fischer",
     title="A Pyramid Vector Quantizer",
     journal="IEEE Transactions on Information Theory",
@@ -192,528 +190,522 @@ int log2_frac(oac_uint32 val, int frac)
     pages="568--583",
     month=Jul,
     year=1986
-  }*/
+   }*/
 
 #if !defined(SMALL_FOOTPRINT)
 
 /*U(N,K) = U(K,N) := N>0?K>0?U(N-1,K)+U(N,K-1)+U(N-1,K-1):0:K>0?1:0*/
-# define CELT_PVQ_U(_n,_k) (CELT_PVQ_U_ROW[IMIN(_n,_k)][IMAX(_n,_k)])
+# define CELT_PVQ_U(_n, _k) (CELT_PVQ_U_ROW[IMIN(_n, _k)][IMAX(_n, _k)])
 /*V(N,K) := U(N,K)+U(N,K+1) = the number of PVQ codewords for a band of size N
    with K pulses allocated to it.*/
-# define CELT_PVQ_V(_n,_k) (CELT_PVQ_U(_n,_k)+CELT_PVQ_U(_n,(_k)+1))
+# define CELT_PVQ_V(_n, _k) (CELT_PVQ_U(_n, _k) + CELT_PVQ_U(_n, (_k) + 1))
 
 /*For each V(N,K) supported, we will access element U(min(N,K+1),max(N,K+1)).
-  Thus, the number of entries in row I is the larger of the maximum number of
+   Thus, the number of entries in row I is the larger of the maximum number of
    pulses we will ever allocate for a given N=I (K=128, or however many fit in
    32 bits, whichever is smaller), plus one, and the maximum N for which
    K=I-1 pulses fit in 32 bits.
-  The largest band size in an Oac Custom mode is 208.
-  Otherwise, we can limit things to the set of N which can be achieved by
+   The largest band size in an Oac Custom mode is 208.
+   Otherwise, we can limit things to the set of N which can be achieved by
    splitting a band from a standard Oac mode: 176, 144, 96, 88, 72, 64, 48,
    44, 36, 32, 24, 22, 18, 16, 8, 4, 2).*/
-#if defined(CWRS_EXTRA_ROWS)
-static const oac_uint32 CELT_PVQ_U_DATA[1488]={
-#else
-static const oac_uint32 CELT_PVQ_U_DATA[1272]={
-#endif
-  /*N=0, K=0...176:*/
-  1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-#if defined(CWRS_EXTRA_ROWS)
-  /*...208:*/
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0,
-#endif
-  /*N=1, K=1...176:*/
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-#if defined(CWRS_EXTRA_ROWS)
-  /*...208:*/
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1,
-#endif
-  /*N=2, K=2...176:*/
-  3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31, 33, 35, 37, 39, 41,
-  43, 45, 47, 49, 51, 53, 55, 57, 59, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79,
-  81, 83, 85, 87, 89, 91, 93, 95, 97, 99, 101, 103, 105, 107, 109, 111, 113,
-  115, 117, 119, 121, 123, 125, 127, 129, 131, 133, 135, 137, 139, 141, 143,
-  145, 147, 149, 151, 153, 155, 157, 159, 161, 163, 165, 167, 169, 171, 173,
-  175, 177, 179, 181, 183, 185, 187, 189, 191, 193, 195, 197, 199, 201, 203,
-  205, 207, 209, 211, 213, 215, 217, 219, 221, 223, 225, 227, 229, 231, 233,
-  235, 237, 239, 241, 243, 245, 247, 249, 251, 253, 255, 257, 259, 261, 263,
-  265, 267, 269, 271, 273, 275, 277, 279, 281, 283, 285, 287, 289, 291, 293,
-  295, 297, 299, 301, 303, 305, 307, 309, 311, 313, 315, 317, 319, 321, 323,
-  325, 327, 329, 331, 333, 335, 337, 339, 341, 343, 345, 347, 349, 351,
-#if defined(CWRS_EXTRA_ROWS)
-  /*...208:*/
-  353, 355, 357, 359, 361, 363, 365, 367, 369, 371, 373, 375, 377, 379, 381,
-  383, 385, 387, 389, 391, 393, 395, 397, 399, 401, 403, 405, 407, 409, 411,
-  413, 415,
-#endif
-  /*N=3, K=3...176:*/
-  13, 25, 41, 61, 85, 113, 145, 181, 221, 265, 313, 365, 421, 481, 545, 613,
-  685, 761, 841, 925, 1013, 1105, 1201, 1301, 1405, 1513, 1625, 1741, 1861,
-  1985, 2113, 2245, 2381, 2521, 2665, 2813, 2965, 3121, 3281, 3445, 3613, 3785,
-  3961, 4141, 4325, 4513, 4705, 4901, 5101, 5305, 5513, 5725, 5941, 6161, 6385,
-  6613, 6845, 7081, 7321, 7565, 7813, 8065, 8321, 8581, 8845, 9113, 9385, 9661,
-  9941, 10225, 10513, 10805, 11101, 11401, 11705, 12013, 12325, 12641, 12961,
-  13285, 13613, 13945, 14281, 14621, 14965, 15313, 15665, 16021, 16381, 16745,
-  17113, 17485, 17861, 18241, 18625, 19013, 19405, 19801, 20201, 20605, 21013,
-  21425, 21841, 22261, 22685, 23113, 23545, 23981, 24421, 24865, 25313, 25765,
-  26221, 26681, 27145, 27613, 28085, 28561, 29041, 29525, 30013, 30505, 31001,
-  31501, 32005, 32513, 33025, 33541, 34061, 34585, 35113, 35645, 36181, 36721,
-  37265, 37813, 38365, 38921, 39481, 40045, 40613, 41185, 41761, 42341, 42925,
-  43513, 44105, 44701, 45301, 45905, 46513, 47125, 47741, 48361, 48985, 49613,
-  50245, 50881, 51521, 52165, 52813, 53465, 54121, 54781, 55445, 56113, 56785,
-  57461, 58141, 58825, 59513, 60205, 60901, 61601,
-#if defined(CWRS_EXTRA_ROWS)
-  /*...208:*/
-  62305, 63013, 63725, 64441, 65161, 65885, 66613, 67345, 68081, 68821, 69565,
-  70313, 71065, 71821, 72581, 73345, 74113, 74885, 75661, 76441, 77225, 78013,
-  78805, 79601, 80401, 81205, 82013, 82825, 83641, 84461, 85285, 86113,
-#endif
-  /*N=4, K=4...176:*/
-  63, 129, 231, 377, 575, 833, 1159, 1561, 2047, 2625, 3303, 4089, 4991, 6017,
-  7175, 8473, 9919, 11521, 13287, 15225, 17343, 19649, 22151, 24857, 27775,
-  30913, 34279, 37881, 41727, 45825, 50183, 54809, 59711, 64897, 70375, 76153,
-  82239, 88641, 95367, 102425, 109823, 117569, 125671, 134137, 142975, 152193,
-  161799, 171801, 182207, 193025, 204263, 215929, 228031, 240577, 253575,
-  267033, 280959, 295361, 310247, 325625, 341503, 357889, 374791, 392217,
-  410175, 428673, 447719, 467321, 487487, 508225, 529543, 551449, 573951,
-  597057, 620775, 645113, 670079, 695681, 721927, 748825, 776383, 804609,
-  833511, 863097, 893375, 924353, 956039, 988441, 1021567, 1055425, 1090023,
-  1125369, 1161471, 1198337, 1235975, 1274393, 1313599, 1353601, 1394407,
-  1436025, 1478463, 1521729, 1565831, 1610777, 1656575, 1703233, 1750759,
-  1799161, 1848447, 1898625, 1949703, 2001689, 2054591, 2108417, 2163175,
-  2218873, 2275519, 2333121, 2391687, 2451225, 2511743, 2573249, 2635751,
-  2699257, 2763775, 2829313, 2895879, 2963481, 3032127, 3101825, 3172583,
-  3244409, 3317311, 3391297, 3466375, 3542553, 3619839, 3698241, 3777767,
-  3858425, 3940223, 4023169, 4107271, 4192537, 4278975, 4366593, 4455399,
-  4545401, 4636607, 4729025, 4822663, 4917529, 5013631, 5110977, 5209575,
-  5309433, 5410559, 5512961, 5616647, 5721625, 5827903, 5935489, 6044391,
-  6154617, 6266175, 6379073, 6493319, 6608921, 6725887, 6844225, 6963943,
-  7085049, 7207551,
-#if defined(CWRS_EXTRA_ROWS)
-  /*...208:*/
-  7331457, 7456775, 7583513, 7711679, 7841281, 7972327, 8104825, 8238783,
-  8374209, 8511111, 8649497, 8789375, 8930753, 9073639, 9218041, 9363967,
-  9511425, 9660423, 9810969, 9963071, 10116737, 10271975, 10428793, 10587199,
-  10747201, 10908807, 11072025, 11236863, 11403329, 11571431, 11741177,
-  11912575,
-#endif
-  /*N=5, K=5...176:*/
-  321, 681, 1289, 2241, 3649, 5641, 8361, 11969, 16641, 22569, 29961, 39041,
-  50049, 63241, 78889, 97281, 118721, 143529, 172041, 204609, 241601, 283401,
-  330409, 383041, 441729, 506921, 579081, 658689, 746241, 842249, 947241,
-  1061761, 1186369, 1321641, 1468169, 1626561, 1797441, 1981449, 2179241,
-  2391489, 2618881, 2862121, 3121929, 3399041, 3694209, 4008201, 4341801,
-  4695809, 5071041, 5468329, 5888521, 6332481, 6801089, 7295241, 7815849,
-  8363841, 8940161, 9545769, 10181641, 10848769, 11548161, 12280841, 13047849,
-  13850241, 14689089, 15565481, 16480521, 17435329, 18431041, 19468809,
-  20549801, 21675201, 22846209, 24064041, 25329929, 26645121, 28010881,
-  29428489, 30899241, 32424449, 34005441, 35643561, 37340169, 39096641,
-  40914369, 42794761, 44739241, 46749249, 48826241, 50971689, 53187081,
-  55473921, 57833729, 60268041, 62778409, 65366401, 68033601, 70781609,
-  73612041, 76526529, 79526721, 82614281, 85790889, 89058241, 92418049,
-  95872041, 99421961, 103069569, 106816641, 110664969, 114616361, 118672641,
-  122835649, 127107241, 131489289, 135983681, 140592321, 145317129, 150160041,
-  155123009, 160208001, 165417001, 170752009, 176215041, 181808129, 187533321,
-  193392681, 199388289, 205522241, 211796649, 218213641, 224775361, 231483969,
-  238341641, 245350569, 252512961, 259831041, 267307049, 274943241, 282741889,
-  290705281, 298835721, 307135529, 315607041, 324252609, 333074601, 342075401,
-  351257409, 360623041, 370174729, 379914921, 389846081, 399970689, 410291241,
-  420810249, 431530241, 442453761, 453583369, 464921641, 476471169, 488234561,
-  500214441, 512413449, 524834241, 537479489, 550351881, 563454121, 576788929,
-  590359041, 604167209, 618216201, 632508801,
-#if defined(CWRS_EXTRA_ROWS)
-  /*...208:*/
-  647047809, 661836041, 676876329, 692171521, 707724481, 723538089, 739615241,
-  755958849, 772571841, 789457161, 806617769, 824056641, 841776769, 859781161,
-  878072841, 896654849, 915530241, 934702089, 954173481, 973947521, 994027329,
-  1014416041, 1035116809, 1056132801, 1077467201, 1099123209, 1121104041,
-  1143412929, 1166053121, 1189027881, 1212340489, 1235994241,
-#endif
-  /*N=6, K=6...96:*/
-  1683, 3653, 7183, 13073, 22363, 36365, 56695, 85305, 124515, 177045, 246047,
-  335137, 448427, 590557, 766727, 982729, 1244979, 1560549, 1937199, 2383409,
-  2908411, 3522221, 4235671, 5060441, 6009091, 7095093, 8332863, 9737793,
-  11326283, 13115773, 15124775, 17372905, 19880915, 22670725, 25765455,
-  29189457, 32968347, 37129037, 41699767, 46710137, 52191139, 58175189,
-  64696159, 71789409, 79491819, 87841821, 96879431, 106646281, 117185651,
-  128542501, 140763503, 153897073, 167993403, 183104493, 199284183, 216588185,
-  235074115, 254801525, 275831935, 298228865, 322057867, 347386557, 374284647,
-  402823977, 433078547, 465124549, 499040399, 534906769, 572806619, 612825229,
-  655050231, 699571641, 746481891, 795875861, 847850911, 902506913, 959946283,
-  1020274013, 1083597703, 1150027593, 1219676595, 1292660325, 1369097135,
-  1449108145, 1532817275, 1620351277, 1711839767, 1807415257, 1907213187,
-  2011371957, 2120032959,
-#if defined(CWRS_EXTRA_ROWS)
-  /*...109:*/
-  2233340609U, 2351442379U, 2474488829U, 2602633639U, 2736033641U, 2874848851U,
-  3019242501U, 3169381071U, 3325434321U, 3487575323U, 3655980493U, 3830829623U,
-  4012305913U,
-#endif
-  /*N=7, K=7...54*/
-  8989, 19825, 40081, 75517, 134245, 227305, 369305, 579125, 880685, 1303777,
-  1884961, 2668525, 3707509, 5064793, 6814249, 9041957, 11847485, 15345233,
-  19665841, 24957661, 31388293, 39146185, 48442297, 59511829, 72616013,
-  88043969, 106114625, 127178701, 151620757, 179861305, 212358985, 249612805,
-  292164445, 340600625, 395555537, 457713341, 527810725, 606639529, 695049433,
-  793950709, 904317037, 1027188385, 1163673953, 1314955181, 1482288821,
-  1667010073, 1870535785, 2094367717,
-#if defined(CWRS_EXTRA_ROWS)
-  /*...60:*/
-  2340095869U, 2609401873U, 2904062449U, 3225952925U, 3577050821U, 3959439497U,
-#endif
-  /*N=8, K=8...37*/
-  48639, 108545, 224143, 433905, 795455, 1392065, 2340495, 3800305, 5984767,
-  9173505, 13726991, 20103025, 28875327, 40754369, 56610575, 77500017,
-  104692735, 139703809, 184327311, 240673265, 311207743, 398796225, 506750351,
-  638878193, 799538175, 993696769, 1226990095, 1505789553, 1837271615,
-  2229491905U,
-#if defined(CWRS_EXTRA_ROWS)
-  /*...40:*/
-  2691463695U, 3233240945U, 3866006015U,
-#endif
-  /*N=9, K=9...28:*/
-  265729, 598417, 1256465, 2485825, 4673345, 8405905, 14546705, 24331777,
-  39490049, 62390545, 96220561, 145198913, 214828609, 312193553, 446304145,
-  628496897, 872893441, 1196924561, 1621925137, 2173806145U,
-#if defined(CWRS_EXTRA_ROWS)
-  /*...29:*/
-  2883810113U,
-#endif
-  /*N=10, K=10...24:*/
-  1462563, 3317445, 7059735, 14218905, 27298155, 50250765, 89129247, 152951073,
-  254831667, 413442773, 654862247, 1014889769, 1541911931, 2300409629U,
-  3375210671U,
-  /*N=11, K=11...19:*/
-  8097453, 18474633, 39753273, 81270333, 158819253, 298199265, 540279585,
-  948062325, 1616336765,
-#if defined(CWRS_EXTRA_ROWS)
-  /*...20:*/
-  2684641785U,
-#endif
-  /*N=12, K=12...18:*/
-  45046719, 103274625, 224298231, 464387817, 921406335, 1759885185,
-  3248227095U,
-  /*N=13, K=13...16:*/
-  251595969, 579168825, 1267854873, 2653649025U,
-  /*N=14, K=14:*/
-  1409933619
+# if defined(CWRS_EXTRA_ROWS)
+static const oac_uint32 CELT_PVQ_U_DATA[1488] = {
+# else
+static const oac_uint32 CELT_PVQ_U_DATA[1272] = {
+# endif
+    /*N=0, K=0...176:*/
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+# if defined(CWRS_EXTRA_ROWS)
+    /*...208:*/
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0,
+# endif
+    /*N=1, K=1...176:*/
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+# if defined(CWRS_EXTRA_ROWS)
+    /*...208:*/
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1,
+# endif
+    /*N=2, K=2...176:*/
+    3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31, 33, 35, 37, 39, 41,
+    43, 45, 47, 49, 51, 53, 55, 57, 59, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79,
+    81, 83, 85, 87, 89, 91, 93, 95, 97, 99, 101, 103, 105, 107, 109, 111, 113,
+    115, 117, 119, 121, 123, 125, 127, 129, 131, 133, 135, 137, 139, 141, 143,
+    145, 147, 149, 151, 153, 155, 157, 159, 161, 163, 165, 167, 169, 171, 173,
+    175, 177, 179, 181, 183, 185, 187, 189, 191, 193, 195, 197, 199, 201, 203,
+    205, 207, 209, 211, 213, 215, 217, 219, 221, 223, 225, 227, 229, 231, 233,
+    235, 237, 239, 241, 243, 245, 247, 249, 251, 253, 255, 257, 259, 261, 263,
+    265, 267, 269, 271, 273, 275, 277, 279, 281, 283, 285, 287, 289, 291, 293,
+    295, 297, 299, 301, 303, 305, 307, 309, 311, 313, 315, 317, 319, 321, 323,
+    325, 327, 329, 331, 333, 335, 337, 339, 341, 343, 345, 347, 349, 351,
+# if defined(CWRS_EXTRA_ROWS)
+    /*...208:*/
+    353, 355, 357, 359, 361, 363, 365, 367, 369, 371, 373, 375, 377, 379, 381,
+    383, 385, 387, 389, 391, 393, 395, 397, 399, 401, 403, 405, 407, 409, 411,
+    413, 415,
+# endif
+    /*N=3, K=3...176:*/
+    13, 25, 41, 61, 85, 113, 145, 181, 221, 265, 313, 365, 421, 481, 545, 613,
+    685, 761, 841, 925, 1013, 1105, 1201, 1301, 1405, 1513, 1625, 1741, 1861,
+    1985, 2113, 2245, 2381, 2521, 2665, 2813, 2965, 3121, 3281, 3445, 3613, 3785,
+    3961, 4141, 4325, 4513, 4705, 4901, 5101, 5305, 5513, 5725, 5941, 6161, 6385,
+    6613, 6845, 7081, 7321, 7565, 7813, 8065, 8321, 8581, 8845, 9113, 9385, 9661,
+    9941, 10225, 10513, 10805, 11101, 11401, 11705, 12013, 12325, 12641, 12961,
+    13285, 13613, 13945, 14281, 14621, 14965, 15313, 15665, 16021, 16381, 16745,
+    17113, 17485, 17861, 18241, 18625, 19013, 19405, 19801, 20201, 20605, 21013,
+    21425, 21841, 22261, 22685, 23113, 23545, 23981, 24421, 24865, 25313, 25765,
+    26221, 26681, 27145, 27613, 28085, 28561, 29041, 29525, 30013, 30505, 31001,
+    31501, 32005, 32513, 33025, 33541, 34061, 34585, 35113, 35645, 36181, 36721,
+    37265, 37813, 38365, 38921, 39481, 40045, 40613, 41185, 41761, 42341, 42925,
+    43513, 44105, 44701, 45301, 45905, 46513, 47125, 47741, 48361, 48985, 49613,
+    50245, 50881, 51521, 52165, 52813, 53465, 54121, 54781, 55445, 56113, 56785,
+    57461, 58141, 58825, 59513, 60205, 60901, 61601,
+# if defined(CWRS_EXTRA_ROWS)
+    /*...208:*/
+    62305, 63013, 63725, 64441, 65161, 65885, 66613, 67345, 68081, 68821, 69565,
+    70313, 71065, 71821, 72581, 73345, 74113, 74885, 75661, 76441, 77225, 78013,
+    78805, 79601, 80401, 81205, 82013, 82825, 83641, 84461, 85285, 86113,
+# endif
+    /*N=4, K=4...176:*/
+    63, 129, 231, 377, 575, 833, 1159, 1561, 2047, 2625, 3303, 4089, 4991, 6017,
+    7175, 8473, 9919, 11521, 13287, 15225, 17343, 19649, 22151, 24857, 27775,
+    30913, 34279, 37881, 41727, 45825, 50183, 54809, 59711, 64897, 70375, 76153,
+    82239, 88641, 95367, 102425, 109823, 117569, 125671, 134137, 142975, 152193,
+    161799, 171801, 182207, 193025, 204263, 215929, 228031, 240577, 253575,
+    267033, 280959, 295361, 310247, 325625, 341503, 357889, 374791, 392217,
+    410175, 428673, 447719, 467321, 487487, 508225, 529543, 551449, 573951,
+    597057, 620775, 645113, 670079, 695681, 721927, 748825, 776383, 804609,
+    833511, 863097, 893375, 924353, 956039, 988441, 1021567, 1055425, 1090023,
+    1125369, 1161471, 1198337, 1235975, 1274393, 1313599, 1353601, 1394407,
+    1436025, 1478463, 1521729, 1565831, 1610777, 1656575, 1703233, 1750759,
+    1799161, 1848447, 1898625, 1949703, 2001689, 2054591, 2108417, 2163175,
+    2218873, 2275519, 2333121, 2391687, 2451225, 2511743, 2573249, 2635751,
+    2699257, 2763775, 2829313, 2895879, 2963481, 3032127, 3101825, 3172583,
+    3244409, 3317311, 3391297, 3466375, 3542553, 3619839, 3698241, 3777767,
+    3858425, 3940223, 4023169, 4107271, 4192537, 4278975, 4366593, 4455399,
+    4545401, 4636607, 4729025, 4822663, 4917529, 5013631, 5110977, 5209575,
+    5309433, 5410559, 5512961, 5616647, 5721625, 5827903, 5935489, 6044391,
+    6154617, 6266175, 6379073, 6493319, 6608921, 6725887, 6844225, 6963943,
+    7085049, 7207551,
+# if defined(CWRS_EXTRA_ROWS)
+    /*...208:*/
+    7331457, 7456775, 7583513, 7711679, 7841281, 7972327, 8104825, 8238783,
+    8374209, 8511111, 8649497, 8789375, 8930753, 9073639, 9218041, 9363967,
+    9511425, 9660423, 9810969, 9963071, 10116737, 10271975, 10428793, 10587199,
+    10747201, 10908807, 11072025, 11236863, 11403329, 11571431, 11741177,
+    11912575,
+# endif
+    /*N=5, K=5...176:*/
+    321, 681, 1289, 2241, 3649, 5641, 8361, 11969, 16641, 22569, 29961, 39041,
+    50049, 63241, 78889, 97281, 118721, 143529, 172041, 204609, 241601, 283401,
+    330409, 383041, 441729, 506921, 579081, 658689, 746241, 842249, 947241,
+    1061761, 1186369, 1321641, 1468169, 1626561, 1797441, 1981449, 2179241,
+    2391489, 2618881, 2862121, 3121929, 3399041, 3694209, 4008201, 4341801,
+    4695809, 5071041, 5468329, 5888521, 6332481, 6801089, 7295241, 7815849,
+    8363841, 8940161, 9545769, 10181641, 10848769, 11548161, 12280841, 13047849,
+    13850241, 14689089, 15565481, 16480521, 17435329, 18431041, 19468809,
+    20549801, 21675201, 22846209, 24064041, 25329929, 26645121, 28010881,
+    29428489, 30899241, 32424449, 34005441, 35643561, 37340169, 39096641,
+    40914369, 42794761, 44739241, 46749249, 48826241, 50971689, 53187081,
+    55473921, 57833729, 60268041, 62778409, 65366401, 68033601, 70781609,
+    73612041, 76526529, 79526721, 82614281, 85790889, 89058241, 92418049,
+    95872041, 99421961, 103069569, 106816641, 110664969, 114616361, 118672641,
+    122835649, 127107241, 131489289, 135983681, 140592321, 145317129, 150160041,
+    155123009, 160208001, 165417001, 170752009, 176215041, 181808129, 187533321,
+    193392681, 199388289, 205522241, 211796649, 218213641, 224775361, 231483969,
+    238341641, 245350569, 252512961, 259831041, 267307049, 274943241, 282741889,
+    290705281, 298835721, 307135529, 315607041, 324252609, 333074601, 342075401,
+    351257409, 360623041, 370174729, 379914921, 389846081, 399970689, 410291241,
+    420810249, 431530241, 442453761, 453583369, 464921641, 476471169, 488234561,
+    500214441, 512413449, 524834241, 537479489, 550351881, 563454121, 576788929,
+    590359041, 604167209, 618216201, 632508801,
+# if defined(CWRS_EXTRA_ROWS)
+    /*...208:*/
+    647047809, 661836041, 676876329, 692171521, 707724481, 723538089, 739615241,
+    755958849, 772571841, 789457161, 806617769, 824056641, 841776769, 859781161,
+    878072841, 896654849, 915530241, 934702089, 954173481, 973947521, 994027329,
+    1014416041, 1035116809, 1056132801, 1077467201, 1099123209, 1121104041,
+    1143412929, 1166053121, 1189027881, 1212340489, 1235994241,
+# endif
+    /*N=6, K=6...96:*/
+    1683, 3653, 7183, 13073, 22363, 36365, 56695, 85305, 124515, 177045, 246047,
+    335137, 448427, 590557, 766727, 982729, 1244979, 1560549, 1937199, 2383409,
+    2908411, 3522221, 4235671, 5060441, 6009091, 7095093, 8332863, 9737793,
+    11326283, 13115773, 15124775, 17372905, 19880915, 22670725, 25765455,
+    29189457, 32968347, 37129037, 41699767, 46710137, 52191139, 58175189,
+    64696159, 71789409, 79491819, 87841821, 96879431, 106646281, 117185651,
+    128542501, 140763503, 153897073, 167993403, 183104493, 199284183, 216588185,
+    235074115, 254801525, 275831935, 298228865, 322057867, 347386557, 374284647,
+    402823977, 433078547, 465124549, 499040399, 534906769, 572806619, 612825229,
+    655050231, 699571641, 746481891, 795875861, 847850911, 902506913, 959946283,
+    1020274013, 1083597703, 1150027593, 1219676595, 1292660325, 1369097135,
+    1449108145, 1532817275, 1620351277, 1711839767, 1807415257, 1907213187,
+    2011371957, 2120032959,
+# if defined(CWRS_EXTRA_ROWS)
+    /*...109:*/
+    2233340609U, 2351442379U, 2474488829U, 2602633639U, 2736033641U, 2874848851U,
+    3019242501U, 3169381071U, 3325434321U, 3487575323U, 3655980493U, 3830829623U,
+    4012305913U,
+# endif
+    /*N=7, K=7...54*/
+    8989, 19825, 40081, 75517, 134245, 227305, 369305, 579125, 880685, 1303777,
+    1884961, 2668525, 3707509, 5064793, 6814249, 9041957, 11847485, 15345233,
+    19665841, 24957661, 31388293, 39146185, 48442297, 59511829, 72616013,
+    88043969, 106114625, 127178701, 151620757, 179861305, 212358985, 249612805,
+    292164445, 340600625, 395555537, 457713341, 527810725, 606639529, 695049433,
+    793950709, 904317037, 1027188385, 1163673953, 1314955181, 1482288821,
+    1667010073, 1870535785, 2094367717,
+# if defined(CWRS_EXTRA_ROWS)
+    /*...60:*/
+    2340095869U, 2609401873U, 2904062449U, 3225952925U, 3577050821U, 3959439497U,
+# endif
+    /*N=8, K=8...37*/
+    48639, 108545, 224143, 433905, 795455, 1392065, 2340495, 3800305, 5984767,
+    9173505, 13726991, 20103025, 28875327, 40754369, 56610575, 77500017,
+    104692735, 139703809, 184327311, 240673265, 311207743, 398796225, 506750351,
+    638878193, 799538175, 993696769, 1226990095, 1505789553, 1837271615,
+    2229491905U,
+# if defined(CWRS_EXTRA_ROWS)
+    /*...40:*/
+    2691463695U, 3233240945U, 3866006015U,
+# endif
+    /*N=9, K=9...28:*/
+    265729, 598417, 1256465, 2485825, 4673345, 8405905, 14546705, 24331777,
+    39490049, 62390545, 96220561, 145198913, 214828609, 312193553, 446304145,
+    628496897, 872893441, 1196924561, 1621925137, 2173806145U,
+# if defined(CWRS_EXTRA_ROWS)
+    /*...29:*/
+    2883810113U,
+# endif
+    /*N=10, K=10...24:*/
+    1462563, 3317445, 7059735, 14218905, 27298155, 50250765, 89129247, 152951073,
+    254831667, 413442773, 654862247, 1014889769, 1541911931, 2300409629U,
+    3375210671U,
+    /*N=11, K=11...19:*/
+    8097453, 18474633, 39753273, 81270333, 158819253, 298199265, 540279585,
+    948062325, 1616336765,
+# if defined(CWRS_EXTRA_ROWS)
+    /*...20:*/
+    2684641785U,
+# endif
+    /*N=12, K=12...18:*/
+    45046719, 103274625, 224298231, 464387817, 921406335, 1759885185,
+    3248227095U,
+    /*N=13, K=13...16:*/
+    251595969, 579168825, 1267854873, 2653649025U,
+    /*N=14, K=14:*/
+    1409933619
 };
 
-#if defined(CWRS_EXTRA_ROWS)
-static const oac_uint32 *const CELT_PVQ_U_ROW[15]={
-  CELT_PVQ_U_DATA+   0,CELT_PVQ_U_DATA+ 208,CELT_PVQ_U_DATA+ 415,
-  CELT_PVQ_U_DATA+ 621,CELT_PVQ_U_DATA+ 826,CELT_PVQ_U_DATA+1030,
-  CELT_PVQ_U_DATA+1233,CELT_PVQ_U_DATA+1336,CELT_PVQ_U_DATA+1389,
-  CELT_PVQ_U_DATA+1421,CELT_PVQ_U_DATA+1441,CELT_PVQ_U_DATA+1455,
-  CELT_PVQ_U_DATA+1464,CELT_PVQ_U_DATA+1470,CELT_PVQ_U_DATA+1473
+# if defined(CWRS_EXTRA_ROWS)
+static const oac_uint32 *const CELT_PVQ_U_ROW[15] = {
+    CELT_PVQ_U_DATA +   0, CELT_PVQ_U_DATA + 208, CELT_PVQ_U_DATA + 415,
+    CELT_PVQ_U_DATA + 621, CELT_PVQ_U_DATA + 826, CELT_PVQ_U_DATA + 1030,
+    CELT_PVQ_U_DATA + 1233, CELT_PVQ_U_DATA + 1336, CELT_PVQ_U_DATA + 1389,
+    CELT_PVQ_U_DATA + 1421, CELT_PVQ_U_DATA + 1441, CELT_PVQ_U_DATA + 1455,
+    CELT_PVQ_U_DATA + 1464, CELT_PVQ_U_DATA + 1470, CELT_PVQ_U_DATA + 1473
 };
-#else
-static const oac_uint32 *const CELT_PVQ_U_ROW[15]={
-  CELT_PVQ_U_DATA+   0,CELT_PVQ_U_DATA+ 176,CELT_PVQ_U_DATA+ 351,
-  CELT_PVQ_U_DATA+ 525,CELT_PVQ_U_DATA+ 698,CELT_PVQ_U_DATA+ 870,
-  CELT_PVQ_U_DATA+1041,CELT_PVQ_U_DATA+1131,CELT_PVQ_U_DATA+1178,
-  CELT_PVQ_U_DATA+1207,CELT_PVQ_U_DATA+1226,CELT_PVQ_U_DATA+1240,
-  CELT_PVQ_U_DATA+1248,CELT_PVQ_U_DATA+1254,CELT_PVQ_U_DATA+1257
+# else
+static const oac_uint32 *const CELT_PVQ_U_ROW[15] = {
+    CELT_PVQ_U_DATA +   0, CELT_PVQ_U_DATA + 176, CELT_PVQ_U_DATA + 351,
+    CELT_PVQ_U_DATA + 525, CELT_PVQ_U_DATA + 698, CELT_PVQ_U_DATA + 870,
+    CELT_PVQ_U_DATA + 1041, CELT_PVQ_U_DATA + 1131, CELT_PVQ_U_DATA + 1178,
+    CELT_PVQ_U_DATA + 1207, CELT_PVQ_U_DATA + 1226, CELT_PVQ_U_DATA + 1240,
+    CELT_PVQ_U_DATA + 1248, CELT_PVQ_U_DATA + 1254, CELT_PVQ_U_DATA + 1257
 };
-#endif
-
-#if defined(CUSTOM_MODES)
-void get_required_bits(oac_int16 *_bits,int _n,int _maxk,int _frac){
-  int k;
-  /*_maxk==0 => there's nothing to do.*/
-  celt_assert(_maxk>0);
-  _bits[0]=0;
-  for(k=1;k<=_maxk;k++)_bits[k]=log2_frac(CELT_PVQ_V(_n,k),_frac);
+# endif
+
+# if defined(CUSTOM_MODES)
+void get_required_bits(oac_int16 *_bits, int _n, int _maxk, int _frac) {
+    int k;
+    /*_maxk==0 => there's nothing to do.*/
+    celt_assert(_maxk > 0);
+    _bits[0] = 0;
+    for (k = 1; k <= _maxk; k++) _bits[k] = log2_frac(CELT_PVQ_V(_n, k), _frac);
 }
-#endif
-
-static oac_uint32 icwrs(int _n,const int *_y){
-  oac_uint32 i;
-  int         j;
-  int         k;
-  celt_assert(_n>=2);
-  j=_n-1;
-  i=_y[j]<0;
-  k=abs(_y[j]);
-  do{
-    j--;
-    i+=CELT_PVQ_U(_n-j,k);
-    k+=abs(_y[j]);
-    if(_y[j]<0)i+=CELT_PVQ_U(_n-j,k+1);
-  }
-  while(j>0);
-  return i;
+# endif
+
+static oac_uint32 icwrs(int _n, const int *_y) {
+    oac_uint32 i;
+    int j;
+    int k;
+    celt_assert(_n >= 2);
+    j = _n - 1;
+    i = _y[j] < 0;
+    k = abs(_y[j]);
+    do {
+        j--;
+        i += CELT_PVQ_U(_n - j, k);
+        k += abs(_y[j]);
+        if (_y[j] < 0) i += CELT_PVQ_U(_n - j, k + 1);
+    } while (j > 0);
+    return i;
 }
 
-void encode_pulses(const int *_y,int _n,int _k,ec_enc *_enc){
-  celt_assert(_k>0);
-  ec_enc_uint(_enc,icwrs(_n,_y),CELT_PVQ_V(_n,_k));
+void encode_pulses(const int *_y, int _n, int _k, ec_enc *_enc) {
+    celt_assert(_k > 0);
+    ec_enc_uint(_enc, icwrs(_n, _y), CELT_PVQ_V(_n, _k));
 }
 
-static oac_val32 cwrsi(int _n,int _k,oac_uint32 _i,int *_y){
-  oac_uint32 p;
-  int         s;
-  int         k0;
-  oac_int16  val;
-  oac_val32  yy=0;
-  celt_assert(_k>0);
-  celt_assert(_n>1);
-  while(_n>2){
-    oac_uint32 q;
-    /*Lots of pulses case:*/
-    if(_k>=_n){
-      const oac_uint32 *row;
-      row=CELT_PVQ_U_ROW[_n];
-      /*Are the pulses in this dimension negative?*/
-      p=row[_k+1];
-      s=-(_i>=p);
-      _i-=p&s;
-      /*Count how many pulses were placed in this dimension.*/
-      k0=_k;
-      q=row[_n];
-      if(q>_i){
-        celt_sig_assert(p>q);
-        _k=_n;
-        do p=CELT_PVQ_U_ROW[--_k][_n];
-        while(p>_i);
-      }
-      else for(p=row[_k];p>_i;p=row[_k])_k--;
-      _i-=p;
-      val=(k0-_k+s)^s;
-      *_y++=val;
-      yy=MAC16_16(yy,val,val);
-    }
-    /*Lots of dimensions case:*/
-    else{
-      /*Are there any pulses in this dimension at all?*/
-      p=CELT_PVQ_U_ROW[_k][_n];
-      q=CELT_PVQ_U_ROW[_k+1][_n];
-      if(p<=_i&&_i<q){
-        _i-=p;
-        *_y++=0;
-      }
-      else{
-        /*Are the pulses in this dimension negative?*/
-        s=-(_i>=q);
-        _i-=q&s;
-        /*Count how many pulses were placed in this dimension.*/
-        k0=_k;
-        do p=CELT_PVQ_U_ROW[--_k][_n];
-        while(p>_i);
-        _i-=p;
-        val=(k0-_k+s)^s;
-        *_y++=val;
-        yy=MAC16_16(yy,val,val);
-      }
+static oac_val32 cwrsi(int _n, int _k, oac_uint32 _i, int *_y) {
+    oac_uint32 p;
+    int s;
+    int k0;
+    oac_int16 val;
+    oac_val32 yy = 0;
+    celt_assert(_k > 0);
+    celt_assert(_n > 1);
+    while (_n > 2) {
+        oac_uint32 q;
+        /*Lots of pulses case:*/
+        if (_k >= _n) {
+            const oac_uint32 *row;
+            row = CELT_PVQ_U_ROW[_n];
+            /*Are the pulses in this dimension negative?*/
+            p = row[_k + 1];
+            s = -(_i >= p);
+            _i -= p&s;
+            /*Count how many pulses were placed in this dimension.*/
+            k0 = _k;
+            q = row[_n];
+            if (q > _i) {
+                celt_sig_assert(p > q);
+                _k = _n;
+                do p = CELT_PVQ_U_ROW[--_k][_n];
+                while (p > _i);
+            } else for (p = row[_k]; p > _i; p = row[_k]) _k--;
+            _i -= p;
+            val = (k0 - _k + s)^s;
+            *_y++ = val;
+            yy = MAC16_16(yy, val, val);
+        }
+        /*Lots of dimensions case:*/
+        else {
+            /*Are there any pulses in this dimension at all?*/
+            p = CELT_PVQ_U_ROW[_k][_n];
+            q = CELT_PVQ_U_ROW[_k + 1][_n];
+            if (p <= _i && _i < q) {
+                _i -= p;
+                *_y++ = 0;
+            } else   {
+                /*Are the pulses in this dimension negative?*/
+                s = -(_i >= q);
+                _i -= q&s;
+                /*Count how many pulses were placed in this dimension.*/
+                k0 = _k;
+                do p = CELT_PVQ_U_ROW[--_k][_n];
+                while (p > _i);
+                _i -= p;
+                val = (k0 - _k + s)^s;
+                *_y++ = val;
+                yy = MAC16_16(yy, val, val);
+            }
+        }
+        _n--;
     }
-    _n--;
-  }
-  /*_n==2*/
-  p=2*_k+1;
-  s=-(_i>=p);
-  _i-=p&s;
-  k0=_k;
-  _k=(_i+1)>>1;
-  if(_k)_i-=2*_k-1;
-  val=(k0-_k+s)^s;
-  *_y++=val;
-  yy=MAC16_16(yy,val,val);
-  /*_n==1*/
-  s=-(int)_i;
-  val=(_k+s)^s;
-  *_y=val;
-  yy=MAC16_16(yy,val,val);
-  return yy;
+    /*_n==2*/
+    p = 2*_k + 1;
+    s = -(_i >= p);
+    _i -= p&s;
+    k0 = _k;
+    _k = (_i + 1)>>1;
+    if (_k) _i -= 2*_k - 1;
+    val = (k0 - _k + s)^s;
+    *_y++ = val;
+    yy = MAC16_16(yy, val, val);
+    /*_n==1*/
+    s = -(int)_i;
+    val = (_k + s)^s;
+    *_y = val;
+    yy = MAC16_16(yy, val, val);
+    return yy;
 }
 
-oac_val32 decode_pulses(int *_y,int _n,int _k,ec_dec *_dec){
-  return cwrsi(_n,_k,ec_dec_uint(_dec,CELT_PVQ_V(_n,_k)),_y);
+oac_val32 decode_pulses(int *_y, int _n, int _k, ec_dec *_dec) {
+    return cwrsi(_n, _k, ec_dec_uint(_dec, CELT_PVQ_V(_n, _k)), _y);
 }
 
 #else /* SMALL_FOOTPRINT */
 
 /*Computes the next row/column of any recurrence that obeys the relation
    u[i][j]=u[i-1][j]+u[i][j-1]+u[i-1][j-1].
-  _ui0 is the base case for the new row/column.*/
-static OAC_INLINE void unext(oac_uint32 *_ui,unsigned _len,oac_uint32 _ui0){
-  oac_uint32 ui1;
-  unsigned      j;
-  /*This do-while will overrun the array if we don't have storage for at least
-     2 values.*/
-  j=1; do {
-    ui1=UADD32(UADD32(_ui[j],_ui[j-1]),_ui0);
-    _ui[j-1]=_ui0;
-    _ui0=ui1;
-  } while (++j<_len);
-  _ui[j-1]=_ui0;
+   _ui0 is the base case for the new row/column.*/
+static OAC_INLINE void unext(oac_uint32 *_ui, unsigned _len, oac_uint32 _ui0) {
+    oac_uint32 ui1;
+    unsigned j;
+    /*This do-while will overrun the array if we don't have storage for at least
+       2 values.*/
+    j = 1; do {
+        ui1 = UADD32(UADD32(_ui[j], _ui[j - 1]), _ui0);
+        _ui[j - 1] = _ui0;
+        _ui0 = ui1;
+    } while (++j < _len);
+    _ui[j - 1] = _ui0;
 }
 
 /*Computes the previous row/column of any recurrence that obeys the relation
    u[i-1][j]=u[i][j]-u[i][j-1]-u[i-1][j-1].
-  _ui0 is the base case for the new row/column.*/
-static OAC_INLINE void uprev(oac_uint32 *_ui,unsigned _n,oac_uint32 _ui0){
-  oac_uint32 ui1;
-  unsigned      j;
-  /*This do-while will overrun the array if we don't have storage for at least
-     2 values.*/
-  j=1; do {
-    ui1=USUB32(USUB32(_ui[j],_ui[j-1]),_ui0);
-    _ui[j-1]=_ui0;
-    _ui0=ui1;
-  } while (++j<_n);
-  _ui[j-1]=_ui0;
+   _ui0 is the base case for the new row/column.*/
+static OAC_INLINE void uprev(oac_uint32 *_ui, unsigned _n, oac_uint32 _ui0) {
+    oac_uint32 ui1;
+    unsigned j;
+    /*This do-while will overrun the array if we don't have storage for at least
+       2 values.*/
+    j = 1; do {
+        ui1 = USUB32(USUB32(_ui[j], _ui[j - 1]), _ui0);
+        _ui[j - 1] = _ui0;
+        _ui0 = ui1;
+    } while (++j < _n);
+    _ui[j - 1] = _ui0;
 }
 
 /*Compute V(_n,_k), as well as U(_n,0..._k+1).
-  _u: On exit, _u[i] contains U(_n,i) for i in [0..._k+1].*/
-static oac_uint32 ncwrs_urow(unsigned _n,unsigned _k,oac_uint32 *_u){
-  oac_uint32 um2;
-  unsigned      len;
-  unsigned      k;
-  len=_k+2;
-  /*We require storage at least 3 values (e.g., _k>0).*/
-  celt_assert(len>=3);
-  _u[0]=0;
-  _u[1]=um2=1;
-  /*If _n==0, _u[0] should be 1 and the rest should be 0.*/
-  /*If _n==1, _u[i] should be 1 for i>1.*/
-  celt_assert(_n>=2);
-  /*If _k==0, the following do-while loop will overflow the buffer.*/
-  celt_assert(_k>0);
-  k=2;
-  do _u[k]=(k<<1)-1;
-  while(++k<len);
-  for(k=2;k<_n;k++)unext(_u+1,_k+1,1);
-  return _u[_k]+_u[_k+1];
+   _u: On exit, _u[i] contains U(_n,i) for i in [0..._k+1].*/
+static oac_uint32 ncwrs_urow(unsigned _n, unsigned _k, oac_uint32 *_u) {
+    oac_uint32 um2;
+    unsigned len;
+    unsigned k;
+    len = _k + 2;
+    /*We require storage at least 3 values (e.g., _k>0).*/
+    celt_assert(len >= 3);
+    _u[0] = 0;
+    _u[1] = um2 = 1;
+    /*If _n==0, _u[0] should be 1 and the rest should be 0.*/
+    /*If _n==1, _u[i] should be 1 for i>1.*/
+    celt_assert(_n >= 2);
+    /*If _k==0, the following do-while loop will overflow the buffer.*/
+    celt_assert(_k > 0);
+    k = 2;
+    do _u[k] = (k<<1) - 1;
+    while (++k < len);
+    for (k = 2; k < _n; k++) unext(_u + 1, _k + 1, 1);
+    return _u[_k] + _u[_k + 1];
 }
 
 /*Returns the _i'th combination of _k elements chosen from a set of size _n
    with associated sign bits.
-  _y: Returns the vector of pulses.
-  _u: Must contain entries [0..._k+1] of row _n of U() on input.
+   _y: Returns the vector of pulses.
+   _u: Must contain entries [0..._k+1] of row _n of U() on input.
       Its contents will be destructively modified.*/
-static oac_val32 cwrsi(int _n,int _k,oac_uint32 _i,int *_y,oac_uint32 *_u){
-  int j;
-  oac_int16 val;
-  oac_val32 yy=0;
-  celt_assert(_n>0);
-  j=0;
-  do{
-    oac_uint32 p;
-    int           s;
-    int           yj;
-    p=_u[_k+1];
-    s=-(_i>=p);
-    _i-=p&s;
-    yj=_k;
-    p=_u[_k];
-    while(p>_i)p=_u[--_k];
-    _i-=p;
-    yj-=_k;
-    val=(yj+s)^s;
-    _y[j]=val;
-    yy=MAC16_16(yy,val,val);
-    uprev(_u,_k+2,0);
-  }
-  while(++j<_n);
-  return yy;
+static oac_val32 cwrsi(int _n, int _k, oac_uint32 _i, int *_y, oac_uint32 *_u) {
+    int j;
+    oac_int16 val;
+    oac_val32 yy = 0;
+    celt_assert(_n > 0);
+    j = 0;
+    do {
+        oac_uint32 p;
+        int s;
+        int yj;
+        p = _u[_k + 1];
+        s = -(_i >= p);
+        _i -= p&s;
+        yj = _k;
+        p = _u[_k];
+        while (p > _i) p = _u[--_k];
+        _i -= p;
+        yj -= _k;
+        val = (yj + s)^s;
+        _y[j] = val;
+        yy = MAC16_16(yy, val, val);
+        uprev(_u, _k + 2, 0);
+    } while (++j < _n);
+    return yy;
 }
 
 /*Returns the index of the given combination of K elements chosen from a set
    of size 1 with associated sign bits.
-  _y: The vector of pulses, whose sum of absolute values is K.
-  _k: Returns K.*/
-static OAC_INLINE oac_uint32 icwrs1(const int *_y,int *_k){
-  *_k=abs(_y[0]);
-  return _y[0]<0;
+   _y: The vector of pulses, whose sum of absolute values is K.
+   _k: Returns K.*/
+static OAC_INLINE oac_uint32 icwrs1(const int *_y, int *_k) {
+    *_k = abs(_y[0]);
+    return _y[0] < 0;
 }
 
 /*Returns the index of the given combination of K elements chosen from a set
    of size _n with associated sign bits.
-  _y:  The vector of pulses, whose sum of absolute values must be _k.
-  _nc: Returns V(_n,_k).*/
-static OAC_INLINE oac_uint32 icwrs(int _n,int _k,oac_uint32 *_nc,const int *_y,
- oac_uint32 *_u){
-  oac_uint32 i;
-  int         j;
-  int         k;
-  /*We can't unroll the first two iterations of the loop unless _n>=2.*/
-  celt_assert(_n>=2);
-  _u[0]=0;
-  for(k=1;k<=_k+1;k++)_u[k]=(k<<1)-1;
-  i=icwrs1(_y+_n-1,&k);
-  j=_n-2;
-  i+=_u[k];
-  k+=abs(_y[j]);
-  if(_y[j]<0)i+=_u[k+1];
-  while(j-->0){
-    unext(_u,_k+2,0);
-    i+=_u[k];
-    k+=abs(_y[j]);
-    if(_y[j]<0)i+=_u[k+1];
-  }
-  *_nc=_u[k]+_u[k+1];
-  return i;
+   _y:  The vector of pulses, whose sum of absolute values must be _k.
+   _nc: Returns V(_n,_k).*/
+static OAC_INLINE oac_uint32 icwrs(int _n, int _k, oac_uint32 *_nc, const int *_y,
+                                   oac_uint32 *_u) {
+    oac_uint32 i;
+    int j;
+    int k;
+    /*We can't unroll the first two iterations of the loop unless _n>=2.*/
+    celt_assert(_n >= 2);
+    _u[0] = 0;
+    for (k = 1; k <= _k + 1; k++) _u[k] = (k<<1) - 1;
+    i = icwrs1(_y + _n - 1, &k);
+    j = _n - 2;
+    i += _u[k];
+    k += abs(_y[j]);
+    if (_y[j] < 0) i += _u[k + 1];
+    while (j-- > 0) {
+        unext(_u, _k + 2, 0);
+        i += _u[k];
+        k += abs(_y[j]);
+        if (_y[j] < 0) i += _u[k + 1];
+    }
+    *_nc = _u[k] + _u[k + 1];
+    return i;
 }
 
-#if defined(CUSTOM_MODES)
-void get_required_bits(oac_int16 *_bits,int _n,int _maxk,int _frac){
-  int k;
-  /*_maxk==0 => there's nothing to do.*/
-  celt_assert(_maxk>0);
-  _bits[0]=0;
-  if (_n==1)
-  {
-    for (k=1;k<=_maxk;k++)
-      _bits[k] = 1<<_frac;
-  }
-  else {
-    VARDECL(oac_uint32,u);
+# if defined(CUSTOM_MODES)
+void get_required_bits(oac_int16 *_bits, int _n, int _maxk, int _frac) {
+    int k;
+    /*_maxk==0 => there's nothing to do.*/
+    celt_assert(_maxk > 0);
+    _bits[0] = 0;
+    if (_n == 1) {
+        for (k = 1; k <= _maxk; k++)
+            _bits[k] = 1<<_frac;
+    } else   {
+        VARDECL(oac_uint32, u);
+        SAVE_STACK;
+        ALLOC(u, _maxk + 2U, oac_uint32);
+        ncwrs_urow(_n, _maxk, u);
+        for (k = 1; k <= _maxk; k++)
+            _bits[k] = log2_frac(u[k] + u[k + 1], _frac);
+        RESTORE_STACK;
+    }
+}
+# endif /* CUSTOM_MODES */
+
+void encode_pulses(const int *_y, int _n, int _k, ec_enc *_enc) {
+    oac_uint32 i;
+    VARDECL(oac_uint32, u);
+    oac_uint32 nc;
     SAVE_STACK;
-    ALLOC(u,_maxk+2U,oac_uint32);
-    ncwrs_urow(_n,_maxk,u);
-    for(k=1;k<=_maxk;k++)
-      _bits[k]=log2_frac(u[k]+u[k+1],_frac);
+    celt_assert(_k > 0);
+    ALLOC(u, _k + 2U, oac_uint32);
+    i = icwrs(_n, _k, &nc, _y, u);
+    ec_enc_uint(_enc, i, nc);
     RESTORE_STACK;
-  }
-}
-#endif /* CUSTOM_MODES */
-
-void encode_pulses(const int *_y,int _n,int _k,ec_enc *_enc){
-  oac_uint32 i;
-  VARDECL(oac_uint32,u);
-  oac_uint32 nc;
-  SAVE_STACK;
-  celt_assert(_k>0);
-  ALLOC(u,_k+2U,oac_uint32);
-  i=icwrs(_n,_k,&nc,_y,u);
-  ec_enc_uint(_enc,i,nc);
-  RESTORE_STACK;
 }
 
-oac_val32 decode_pulses(int *_y,int _n,int _k,ec_dec *_dec){
-  VARDECL(oac_uint32,u);
-  int ret;
-  SAVE_STACK;
-  celt_assert(_k>0);
-  ALLOC(u,_k+2U,oac_uint32);
-  ret = cwrsi(_n,_k,ec_dec_uint(_dec,ncwrs_urow(_n,_k,u)),_y,u);
-  RESTORE_STACK;
-  return ret;
+oac_val32 decode_pulses(int *_y, int _n, int _k, ec_dec *_dec) {
+    VARDECL(oac_uint32, u);
+    int ret;
+    SAVE_STACK;
+    celt_assert(_k > 0);
+    ALLOC(u, _k + 2U, oac_uint32);
+    ret = cwrsi(_n, _k, ec_dec_uint(_dec, ncwrs_urow(_n, _k, u)), _y, u);
+    RESTORE_STACK;
+    return ret;
 }
 
 #endif /* SMALL_FOOTPRINT */
diff --git a/celt/cwrs.h b/celt/cwrs.h
index b7322fa17..d1792433f 100644
--- a/celt/cwrs.h
+++ b/celt/cwrs.h
@@ -25,7 +25,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef CWRS_H
 #define CWRS_H
diff --git a/celt/dump_modes/dump_modes.c b/celt/dump_modes/dump_modes.c
index a61fb0958..772188a60 100644
--- a/celt/dump_modes/dump_modes.c
+++ b/celt/dump_modes/dump_modes.c
@@ -24,10 +24,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdlib.h>
@@ -42,321 +42,307 @@
 #define FLOAT "%#0.8gf"
 
 #ifdef FIXED_POINT
-#define WORD16 INT16
-#define WORD32 INT32
+# define WORD16 INT16
+# define WORD32 INT32
 #else
-#define WORD16 FLOAT
-#define WORD32 FLOAT
+# define WORD16 FLOAT
+# define WORD32 FLOAT
 #endif
 
-#define COEF16(x, a) ((oac_int16)SATURATE(((oac_int64)(x)+(1<<(a)>>1))>>(a), 32767))
+#define COEF16(x, a) ((oac_int16)SATURATE(((oac_int64)(x) + (1<<(a)>>1))>>(a), 32767))
 int oac_select_arch(void) {
-   return 0;
+    return 0;
 }
 
-void dump_modes(FILE *file, CELTMode **modes, int nb_modes)
-{
-   int i, j, k;
-   int mdct_twiddles_size;
-   fprintf(file, "/* The contents of this file was automatically generated by dump_modes.c\n");
-   fprintf(file, "   with arguments:");
-   for (i=0;i<nb_modes;i++)
-   {
-      CELTMode *mode = modes[i];
-      fprintf(file, " %d %d",mode->Fs,mode->shortMdctSize*mode->nbShortMdcts);
-   }
-   fprintf(file, "\n   It contains static definitions for some pre-defined modes. */\n");
-   fprintf(file, "#include \"modes.h\"\n");
-   fprintf(file, "#include \"rate.h\"\n");
-   fprintf(file, "\n#ifdef HAVE_ARM_NE10\n");
-   fprintf(file, "#define OVERRIDE_FFT 1\n");
-   fprintf(file, "#include \"%s\"\n", ARM_NE10_ARCH_FILE_NAME);
-   fprintf(file, "#endif\n");
-
-   fprintf(file, "\n");
-
-   for (i=0;i<nb_modes;i++)
-   {
-      CELTMode *mode = modes[i];
-      int mdctSize;
-      int standard, framerate;
-
-      mdctSize = mode->shortMdctSize*mode->nbShortMdcts;
-      standard = (mode->Fs == 400*(oac_int32)mode->shortMdctSize);
-      framerate = mode->Fs/mode->shortMdctSize;
-
-      if (!standard)
-      {
-         fprintf(file, "#ifndef DEF_EBANDS%d_%d\n", mode->Fs, mdctSize);
-         fprintf(file, "#define DEF_EBANDS%d_%d\n", mode->Fs, mdctSize);
-         fprintf (file, "static const oac_int16 eBands%d_%d[%d] = {\n", mode->Fs, mdctSize, mode->nbEBands+2);
-         for (j=0;j<mode->nbEBands+2;j++)
-            fprintf (file, "%d, ", mode->eBands[j]);
-         fprintf (file, "};\n");
-         fprintf(file, "#endif\n");
-         fprintf(file, "\n");
-      }
-
-      fprintf(file, "#ifndef DEF_WINDOW%d\n", mode->overlap);
-      fprintf(file, "#define DEF_WINDOW%d\n", mode->overlap);
-      fprintf (file, "static const celt_coef window%d[%d] = {\n", mode->overlap, mode->overlap);
-      for (j=0;j<mode->overlap;j++)
-         fprintf (file, WORD32 ",%c", mode->window[j],(j+6)%5==0?'\n':' ');
-      fprintf (file, "};\n");
-      fprintf(file, "#endif\n");
-      fprintf(file, "\n");
-
-      if (!standard)
-      {
-         fprintf(file, "#ifndef DEF_ALLOC_VECTORS%d_%d\n", mode->Fs, mdctSize);
-         fprintf(file, "#define DEF_ALLOC_VECTORS%d_%d\n", mode->Fs, mdctSize);
-         fprintf (file, "static const unsigned char allocVectors%d_%d[%d] = {\n", mode->Fs, mdctSize, mode->nbEBands*mode->nbAllocVectors);
-         for (j=0;j<mode->nbAllocVectors;j++)
-         {
-            for (k=0;k<mode->nbEBands;k++)
-               fprintf (file, "%2d, ", mode->allocVectors[j*mode->nbEBands+k]);
-            fprintf (file, "\n");
-         }
-         fprintf (file, "};\n");
-         fprintf(file, "#endif\n");
-         fprintf(file, "\n");
-      }
-
-      fprintf(file, "#ifndef DEF_LOGN%d\n", framerate);
-      fprintf(file, "#define DEF_LOGN%d\n", framerate);
-      fprintf (file, "static const oac_int16 logN%d[%d] = {\n", framerate, mode->nbEBands);
-      for (j=0;j<mode->nbEBands;j++)
-         fprintf (file, "%d, ", mode->logN[j]);
-      fprintf (file, "};\n");
-      fprintf(file, "#endif\n");
-      fprintf(file, "\n");
-
-      /* Pulse cache */
-      fprintf(file, "#ifndef DEF_PULSE_CACHE%d\n", mode->Fs/mdctSize);
-      fprintf(file, "#define DEF_PULSE_CACHE%d\n", mode->Fs/mdctSize);
-      fprintf (file, "static const oac_int16 cache_index%d[%d] = {\n", mode->Fs/mdctSize, (mode->maxLM+2)*mode->nbEBands);
-      for (j=0;j<mode->nbEBands*(mode->maxLM+2);j++)
-         fprintf (file, "%d,%c", mode->cache.index[j],(j+16)%15==0?'\n':' ');
-      fprintf (file, "};\n");
-      fprintf (file, "static const unsigned char cache_bits%d[%d] = {\n", mode->Fs/mdctSize, mode->cache.size);
-      for (j=0;j<mode->cache.size;j++)
-         fprintf (file, "%d,%c", mode->cache.bits[j],(j+16)%15==0?'\n':' ');
-      fprintf (file, "};\n");
-      fprintf (file, "static const unsigned char cache_caps%d[%d] = {\n", mode->Fs/mdctSize, (mode->maxLM+1)*2*mode->nbEBands);
-      for (j=0;j<(mode->maxLM+1)*2*mode->nbEBands;j++)
-         fprintf (file, "%d,%c", mode->cache.caps[j],(j+16)%15==0?'\n':' ');
-      fprintf (file, "};\n");
-
-      fprintf(file, "#endif\n");
-      fprintf(file, "\n");
-
-      /* FFT twiddles */
-      fprintf(file, "#ifndef FFT_TWIDDLES%d_%d\n", mode->Fs, mdctSize);
-      fprintf(file, "#define FFT_TWIDDLES%d_%d\n", mode->Fs, mdctSize);
-
-      fprintf (file, "static const kiss_twiddle_cpx fft_twiddles%d_%d[%d] = {\n",
+void dump_modes(FILE *file, CELTMode **modes, int nb_modes) {
+    int i, j, k;
+    int mdct_twiddles_size;
+    fprintf(file, "/* The contents of this file was automatically generated by dump_modes.c\n");
+    fprintf(file, "   with arguments:");
+    for (i = 0; i < nb_modes; i++) {
+        CELTMode *mode = modes[i];
+        fprintf(file, " %d %d", mode->Fs, mode->shortMdctSize*mode->nbShortMdcts);
+    }
+    fprintf(file, "\n   It contains static definitions for some pre-defined modes. */\n");
+    fprintf(file, "#include \"modes.h\"\n");
+    fprintf(file, "#include \"rate.h\"\n");
+    fprintf(file, "\n#ifdef HAVE_ARM_NE10\n");
+    fprintf(file, "#define OVERRIDE_FFT 1\n");
+    fprintf(file, "#include \"%s\"\n", ARM_NE10_ARCH_FILE_NAME);
+    fprintf(file, "#endif\n");
+
+    fprintf(file, "\n");
+
+    for (i = 0; i < nb_modes; i++) {
+        CELTMode *mode = modes[i];
+        int mdctSize;
+        int standard, framerate;
+
+        mdctSize = mode->shortMdctSize*mode->nbShortMdcts;
+        standard = (mode->Fs == 400*(oac_int32)mode->shortMdctSize);
+        framerate = mode->Fs/mode->shortMdctSize;
+
+        if (!standard) {
+            fprintf(file, "#ifndef DEF_EBANDS%d_%d\n", mode->Fs, mdctSize);
+            fprintf(file, "#define DEF_EBANDS%d_%d\n", mode->Fs, mdctSize);
+            fprintf (file, "static const oac_int16 eBands%d_%d[%d] = {\n", mode->Fs, mdctSize, mode->nbEBands + 2);
+            for (j = 0; j < mode->nbEBands + 2; j++)
+                fprintf (file, "%d, ", mode->eBands[j]);
+            fprintf (file, "};\n");
+            fprintf(file, "#endif\n");
+            fprintf(file, "\n");
+        }
+
+        fprintf(file, "#ifndef DEF_WINDOW%d\n", mode->overlap);
+        fprintf(file, "#define DEF_WINDOW%d\n", mode->overlap);
+        fprintf (file, "static const celt_coef window%d[%d] = {\n", mode->overlap, mode->overlap);
+        for (j = 0; j < mode->overlap; j++)
+            fprintf (file, WORD32 ",%c", mode->window[j], (j + 6)%5 == 0?'\n':' ');
+        fprintf (file, "};\n");
+        fprintf(file, "#endif\n");
+        fprintf(file, "\n");
+
+        if (!standard) {
+            fprintf(file, "#ifndef DEF_ALLOC_VECTORS%d_%d\n", mode->Fs, mdctSize);
+            fprintf(file, "#define DEF_ALLOC_VECTORS%d_%d\n", mode->Fs, mdctSize);
+            fprintf (file, "static const unsigned char allocVectors%d_%d[%d] = {\n", mode->Fs, mdctSize,
+            mode->nbEBands*mode->nbAllocVectors);
+            for (j = 0; j < mode->nbAllocVectors; j++) {
+                for (k = 0; k < mode->nbEBands; k++)
+                    fprintf (file, "%2d, ", mode->allocVectors[j*mode->nbEBands + k]);
+                fprintf (file, "\n");
+            }
+            fprintf (file, "};\n");
+            fprintf(file, "#endif\n");
+            fprintf(file, "\n");
+        }
+
+        fprintf(file, "#ifndef DEF_LOGN%d\n", framerate);
+        fprintf(file, "#define DEF_LOGN%d\n", framerate);
+        fprintf (file, "static const oac_int16 logN%d[%d] = {\n", framerate, mode->nbEBands);
+        for (j = 0; j < mode->nbEBands; j++)
+            fprintf (file, "%d, ", mode->logN[j]);
+        fprintf (file, "};\n");
+        fprintf(file, "#endif\n");
+        fprintf(file, "\n");
+
+        /* Pulse cache */
+        fprintf(file, "#ifndef DEF_PULSE_CACHE%d\n", mode->Fs/mdctSize);
+        fprintf(file, "#define DEF_PULSE_CACHE%d\n", mode->Fs/mdctSize);
+        fprintf (file, "static const oac_int16 cache_index%d[%d] = {\n", mode->Fs/mdctSize,
+            (mode->maxLM + 2)*mode->nbEBands);
+        for (j = 0; j < mode->nbEBands*(mode->maxLM + 2); j++)
+            fprintf (file, "%d,%c", mode->cache.index[j], (j + 16)%15 == 0?'\n':' ');
+        fprintf (file, "};\n");
+        fprintf (file, "static const unsigned char cache_bits%d[%d] = {\n", mode->Fs/mdctSize, mode->cache.size);
+        for (j = 0; j < mode->cache.size; j++)
+            fprintf (file, "%d,%c", mode->cache.bits[j], (j + 16)%15 == 0?'\n':' ');
+        fprintf (file, "};\n");
+        fprintf (file, "static const unsigned char cache_caps%d[%d] = {\n", mode->Fs/mdctSize,
+            (mode->maxLM + 1)*2*mode->nbEBands);
+        for (j = 0; j < (mode->maxLM + 1)*2*mode->nbEBands; j++)
+            fprintf (file, "%d,%c", mode->cache.caps[j], (j + 16)%15 == 0?'\n':' ');
+        fprintf (file, "};\n");
+
+        fprintf(file, "#endif\n");
+        fprintf(file, "\n");
+
+        /* FFT twiddles */
+        fprintf(file, "#ifndef FFT_TWIDDLES%d_%d\n", mode->Fs, mdctSize);
+        fprintf(file, "#define FFT_TWIDDLES%d_%d\n", mode->Fs, mdctSize);
+
+        fprintf (file, "static const kiss_twiddle_cpx fft_twiddles%d_%d[%d] = {\n",
             mode->Fs, mdctSize, mode->mdct.kfft[0]->nfft);
-      for (j=0;j<mode->mdct.kfft[0]->nfft;j++)
-         fprintf (file, "{" WORD32 ", " WORD32 "},%c", mode->mdct.kfft[0]->twiddles[j].r, mode->mdct.kfft[0]->twiddles[j].i,(j+3)%2==0?'\n':' ');
-      fprintf (file, "};\n");
+        for (j = 0; j < mode->mdct.kfft[0]->nfft; j++)
+            fprintf (file, "{" WORD32 ", " WORD32 "},%c", mode->mdct.kfft[0]->twiddles[j].r,
+            mode->mdct.kfft[0]->twiddles[j].i, (j + 3)%2 == 0?'\n':' ');
+        fprintf (file, "};\n");
 
 #ifdef OVERRIDE_FFT
-      dump_mode_arch(mode);
+        dump_mode_arch(mode);
 #endif
-      /* FFT Bitrev tables */
-      for (k=0;k<=mode->mdct.maxshift;k++)
-      {
-         fprintf(file, "#ifndef FFT_BITREV%d\n", mode->mdct.kfft[k]->nfft);
-         fprintf(file, "#define FFT_BITREV%d\n", mode->mdct.kfft[k]->nfft);
-         fprintf (file, "static const oac_int16 fft_bitrev%d[%d] = {\n",
+        /* FFT Bitrev tables */
+        for (k = 0; k <= mode->mdct.maxshift; k++) {
+            fprintf(file, "#ifndef FFT_BITREV%d\n", mode->mdct.kfft[k]->nfft);
+            fprintf(file, "#define FFT_BITREV%d\n", mode->mdct.kfft[k]->nfft);
+            fprintf (file, "static const oac_int16 fft_bitrev%d[%d] = {\n",
                mode->mdct.kfft[k]->nfft, mode->mdct.kfft[k]->nfft);
-         for (j=0;j<mode->mdct.kfft[k]->nfft;j++)
-            fprintf (file, "%d,%c", mode->mdct.kfft[k]->bitrev[j],(j+16)%15==0?'\n':' ');
-         fprintf (file, "};\n");
-
-         fprintf(file, "#endif\n");
-         fprintf(file, "\n");
-      }
-
-      /* FFT States */
-      for (k=0;k<=mode->mdct.maxshift;k++)
-      {
-         fprintf(file, "#ifndef FFT_STATE%d_%d_%d\n", mode->Fs, mdctSize, k);
-         fprintf(file, "#define FFT_STATE%d_%d_%d\n", mode->Fs, mdctSize, k);
-         fprintf (file, "static const kiss_fft_state fft_state%d_%d_%d = {\n",
+            for (j = 0; j < mode->mdct.kfft[k]->nfft; j++)
+                fprintf (file, "%d,%c", mode->mdct.kfft[k]->bitrev[j], (j + 16)%15 == 0?'\n':' ');
+            fprintf (file, "};\n");
+
+            fprintf(file, "#endif\n");
+            fprintf(file, "\n");
+        }
+
+        /* FFT States */
+        for (k = 0; k <= mode->mdct.maxshift; k++) {
+            fprintf(file, "#ifndef FFT_STATE%d_%d_%d\n", mode->Fs, mdctSize, k);
+            fprintf(file, "#define FFT_STATE%d_%d_%d\n", mode->Fs, mdctSize, k);
+            fprintf (file, "static const kiss_fft_state fft_state%d_%d_%d = {\n",
                mode->Fs, mdctSize, k);
-         fprintf (file, "%d,    /* nfft */\n", mode->mdct.kfft[k]->nfft);
+            fprintf (file, "%d,    /* nfft */\n", mode->mdct.kfft[k]->nfft);
 
-         fprintf (file, WORD32 ",    /* scale */\n", mode->mdct.kfft[k]->scale);
+            fprintf (file, WORD32 ",    /* scale */\n", mode->mdct.kfft[k]->scale);
 #ifdef FIXED_POINT
-         fprintf (file, "%d,    /* scale_shift */\n", mode->mdct.kfft[k]->scale_shift);
+            fprintf (file, "%d,    /* scale_shift */\n", mode->mdct.kfft[k]->scale_shift);
 #endif
-         fprintf (file, "%d,    /* shift */\n", mode->mdct.kfft[k]->shift);
-         fprintf (file, "{");
-         for (j=0;j<2*MAXFACTORS;j++)
-            fprintf (file, "%d, ", mode->mdct.kfft[k]->factors[j]);
-         fprintf (file, "},    /* factors */\n");
-         fprintf (file, "fft_bitrev%d,    /* bitrev */\n", mode->mdct.kfft[k]->nfft);
-         fprintf (file, "fft_twiddles%d_%d,    /* bitrev */\n", mode->Fs, mdctSize);
-
-         fprintf (file, "#ifdef OVERRIDE_FFT\n");
-         fprintf (file, "(arch_fft_state *)&cfg_arch_%d,\n", mode->mdct.kfft[k]->nfft);
-         fprintf (file, "#else\n");
-         fprintf (file, "NULL,\n");
-         fprintf(file, "#endif\n");
-
-         fprintf (file, "};\n");
-
-         fprintf(file, "#endif\n");
-         fprintf(file, "\n");
-      }
-
-      fprintf(file, "#endif\n");
-      fprintf(file, "\n");
-
-      /* MDCT twiddles */
-      mdct_twiddles_size = mode->mdct.n-(mode->mdct.n/2>>mode->mdct.maxshift);
-      fprintf(file, "#ifndef MDCT_TWIDDLES%d\n", mdctSize);
-      fprintf(file, "#define MDCT_TWIDDLES%d\n", mdctSize);
-      fprintf (file, "static const celt_coef mdct_twiddles%d[%d] = {\n",
+            fprintf (file, "%d,    /* shift */\n", mode->mdct.kfft[k]->shift);
+            fprintf (file, "{");
+            for (j = 0; j < 2*MAXFACTORS; j++)
+                fprintf (file, "%d, ", mode->mdct.kfft[k]->factors[j]);
+            fprintf (file, "},    /* factors */\n");
+            fprintf (file, "fft_bitrev%d,    /* bitrev */\n", mode->mdct.kfft[k]->nfft);
+            fprintf (file, "fft_twiddles%d_%d,    /* bitrev */\n", mode->Fs, mdctSize);
+
+            fprintf (file, "#ifdef OVERRIDE_FFT\n");
+            fprintf (file, "(arch_fft_state *)&cfg_arch_%d,\n", mode->mdct.kfft[k]->nfft);
+            fprintf (file, "#else\n");
+            fprintf (file, "NULL,\n");
+            fprintf(file, "#endif\n");
+
+            fprintf (file, "};\n");
+
+            fprintf(file, "#endif\n");
+            fprintf(file, "\n");
+        }
+
+        fprintf(file, "#endif\n");
+        fprintf(file, "\n");
+
+        /* MDCT twiddles */
+        mdct_twiddles_size = mode->mdct.n - (mode->mdct.n/2>>mode->mdct.maxshift);
+        fprintf(file, "#ifndef MDCT_TWIDDLES%d\n", mdctSize);
+        fprintf(file, "#define MDCT_TWIDDLES%d\n", mdctSize);
+        fprintf (file, "static const celt_coef mdct_twiddles%d[%d] = {\n",
             mdctSize, mdct_twiddles_size);
 
-      for (j=0;j<mdct_twiddles_size;j++)
-         fprintf (file, WORD32 ",%c", mode->mdct.trig[j],(j+6)%5==0?'\n':' ');
-
-      fprintf (file, "};\n");
-
-      fprintf(file, "#endif\n");
-      fprintf(file, "\n");
-
-
-      /* Print the actual mode data */
-      fprintf(file, "static const CELTMode mode%d_%d_%d = {\n", mode->Fs, mdctSize, mode->overlap);
-      fprintf(file, INT32 ",    /* Fs */\n", mode->Fs);
-      fprintf(file, "%d,    /* overlap */\n", mode->overlap);
-      fprintf(file, "%d,    /* nbEBands */\n", mode->nbEBands);
-      fprintf(file, "%d,    /* effEBands */\n", mode->effEBands);
-      fprintf(file, "{");
-      for (j=0;j<4;j++)
-         fprintf(file, WORD16 ", ", mode->preemph[j]);
-      fprintf(file, "},    /* preemph */\n");
-      if (standard)
-         fprintf(file, "eband5ms,    /* eBands */\n");
-      else
-         fprintf(file, "eBands%d_%d,    /* eBands */\n", mode->Fs, mdctSize);
-
-      fprintf(file, "%d,    /* maxLM */\n", mode->maxLM);
-      fprintf(file, "%d,    /* nbShortMdcts */\n", mode->nbShortMdcts);
-      fprintf(file, "%d,    /* shortMdctSize */\n", mode->shortMdctSize);
-
-      fprintf(file, "%d,    /* nbAllocVectors */\n", mode->nbAllocVectors);
-      if (standard)
-         fprintf(file, "band_allocation,    /* allocVectors */\n");
-      else
-         fprintf(file, "allocVectors%d_%d,    /* allocVectors */\n", mode->Fs, mdctSize);
-
-      fprintf(file, "logN%d,    /* logN */\n", framerate);
-      fprintf(file, "window%d,    /* window */\n", mode->overlap);
-      fprintf(file, "{%d, %d, {", mode->mdct.n, mode->mdct.maxshift);
-      for (k=0;k<=mode->mdct.maxshift;k++)
-         fprintf(file, "&fft_state%d_%d_%d, ", mode->Fs, mdctSize, k);
-      fprintf (file, "}, mdct_twiddles%d},    /* mdct */\n", mdctSize);
-
-      fprintf(file, "{%d, cache_index%d, cache_bits%d, cache_caps%d},    /* cache */\n",
+        for (j = 0; j < mdct_twiddles_size; j++)
+            fprintf (file, WORD32 ",%c", mode->mdct.trig[j], (j + 6)%5 == 0?'\n':' ');
+
+        fprintf (file, "};\n");
+
+        fprintf(file, "#endif\n");
+        fprintf(file, "\n");
+
+
+        /* Print the actual mode data */
+        fprintf(file, "static const CELTMode mode%d_%d_%d = {\n", mode->Fs, mdctSize, mode->overlap);
+        fprintf(file, INT32 ",    /* Fs */\n", mode->Fs);
+        fprintf(file, "%d,    /* overlap */\n", mode->overlap);
+        fprintf(file, "%d,    /* nbEBands */\n", mode->nbEBands);
+        fprintf(file, "%d,    /* effEBands */\n", mode->effEBands);
+        fprintf(file, "{");
+        for (j = 0; j < 4; j++)
+            fprintf(file, WORD16 ", ", mode->preemph[j]);
+        fprintf(file, "},    /* preemph */\n");
+        if (standard)
+            fprintf(file, "eband5ms,    /* eBands */\n");
+        else
+            fprintf(file, "eBands%d_%d,    /* eBands */\n", mode->Fs, mdctSize);
+
+        fprintf(file, "%d,    /* maxLM */\n", mode->maxLM);
+        fprintf(file, "%d,    /* nbShortMdcts */\n", mode->nbShortMdcts);
+        fprintf(file, "%d,    /* shortMdctSize */\n", mode->shortMdctSize);
+
+        fprintf(file, "%d,    /* nbAllocVectors */\n", mode->nbAllocVectors);
+        if (standard)
+            fprintf(file, "band_allocation,    /* allocVectors */\n");
+        else
+            fprintf(file, "allocVectors%d_%d,    /* allocVectors */\n", mode->Fs, mdctSize);
+
+        fprintf(file, "logN%d,    /* logN */\n", framerate);
+        fprintf(file, "window%d,    /* window */\n", mode->overlap);
+        fprintf(file, "{%d, %d, {", mode->mdct.n, mode->mdct.maxshift);
+        for (k = 0; k <= mode->mdct.maxshift; k++)
+            fprintf(file, "&fft_state%d_%d_%d, ", mode->Fs, mdctSize, k);
+        fprintf (file, "}, mdct_twiddles%d},    /* mdct */\n", mdctSize);
+
+        fprintf(file, "{%d, cache_index%d, cache_bits%d, cache_caps%d},    /* cache */\n",
             mode->cache.size, mode->Fs/mdctSize, mode->Fs/mdctSize, mode->Fs/mdctSize);
-      fprintf(file, "};\n");
-   }
-   fprintf(file, "\n");
-   fprintf(file, "/* List of all the available modes */\n");
-   fprintf(file, "#define TOTAL_MODES %d\n", nb_modes);
-   fprintf(file, "static const CELTMode * const static_mode_list[TOTAL_MODES] = {\n");
-   for (i=0;i<nb_modes;i++)
-   {
-      CELTMode *mode = modes[i];
-      int mdctSize;
-      mdctSize = mode->shortMdctSize*mode->nbShortMdcts;
-      fprintf(file, "&mode%d_%d_%d,\n", mode->Fs, mdctSize, mode->overlap);
-   }
-   fprintf(file, "};\n");
+        fprintf(file, "};\n");
+    }
+    fprintf(file, "\n");
+    fprintf(file, "/* List of all the available modes */\n");
+    fprintf(file, "#define TOTAL_MODES %d\n", nb_modes);
+    fprintf(file, "static const CELTMode * const static_mode_list[TOTAL_MODES] = {\n");
+    for (i = 0; i < nb_modes; i++) {
+        CELTMode *mode = modes[i];
+        int mdctSize;
+        mdctSize = mode->shortMdctSize*mode->nbShortMdcts;
+        fprintf(file, "&mode%d_%d_%d,\n", mode->Fs, mdctSize, mode->overlap);
+    }
+    fprintf(file, "};\n");
 }
 
-void dump_header(FILE *file, CELTMode **modes, int nb_modes)
-{
-   int i;
-   int channels = 0;
-   int frame_size = 0;
-   int overlap = 0;
-   fprintf (file, "/* This header file is generated automatically*/\n");
-   for (i=0;i<nb_modes;i++)
-   {
-      CELTMode *mode = modes[i];
-      if (frame_size==0)
-         frame_size = mode->shortMdctSize*mode->nbShortMdcts;
-      else if (frame_size != mode->shortMdctSize*mode->nbShortMdcts)
-         frame_size = -1;
-      if (overlap==0)
-         overlap = mode->overlap;
-      else if (overlap != mode->overlap)
-         overlap = -1;
-   }
-   if (channels>0)
-   {
-      fprintf (file, "#define CHANNELS(mode) %d\n", channels);
-      if (channels==1)
-         fprintf (file, "#define DISABLE_STEREO\n");
-   }
-   if (frame_size>0)
-   {
-      fprintf (file, "#define FRAMESIZE(mode) %d\n", frame_size);
-   }
-   if (overlap>0)
-   {
-      fprintf (file, "#define OVERLAP(mode) %d\n", overlap);
-   }
+void dump_header(FILE *file, CELTMode **modes, int nb_modes) {
+    int i;
+    int channels = 0;
+    int frame_size = 0;
+    int overlap = 0;
+    fprintf (file, "/* This header file is generated automatically*/\n");
+    for (i = 0; i < nb_modes; i++) {
+        CELTMode *mode = modes[i];
+        if (frame_size == 0)
+            frame_size = mode->shortMdctSize*mode->nbShortMdcts;
+        else if (frame_size != mode->shortMdctSize*mode->nbShortMdcts)
+            frame_size = -1;
+        if (overlap == 0)
+            overlap = mode->overlap;
+        else if (overlap != mode->overlap)
+            overlap = -1;
+    }
+    if (channels > 0) {
+        fprintf (file, "#define CHANNELS(mode) %d\n", channels);
+        if (channels == 1)
+            fprintf (file, "#define DISABLE_STEREO\n");
+    }
+    if (frame_size > 0) {
+        fprintf (file, "#define FRAMESIZE(mode) %d\n", frame_size);
+    }
+    if (overlap > 0) {
+        fprintf (file, "#define OVERLAP(mode) %d\n", overlap);
+    }
 }
 
 #ifdef FIXED_POINT
-#define BASENAME "static_modes_fixed"
+# define BASENAME "static_modes_fixed"
 #else
-#define BASENAME "static_modes_float"
+# define BASENAME "static_modes_float"
 #endif
 
-int main(int argc, char **argv)
-{
-   int i, nb;
-   FILE *file;
-   CELTMode **m;
-   if (argc%2 != 1 || argc<3)
-   {
-      fprintf (stderr, "Usage: %s rate frame_size [rate frame_size] [rate frame_size]...\n",argv[0]);
-      return 1;
-   }
-   nb = (argc-1)/2;
-   m = malloc(nb*sizeof(CELTMode*));
-   for (i=0;i<nb;i++)
-   {
-      int Fs, frame;
-      Fs      = atoi(argv[2*i+1]);
-      frame   = atoi(argv[2*i+2]);
-      m[i] = oac_custom_mode_create(Fs, frame, NULL);
-      if (m[i]==NULL)
-      {
-         fprintf(stderr,"Error creating mode with Fs=%s, frame_size=%s\n",
-               argv[2*i+1],argv[2*i+2]);
-         return EXIT_FAILURE;
-      }
-   }
-   file = fopen(BASENAME ".h", "w");
+int main(int argc, char **argv) {
+    int i, nb;
+    FILE *file;
+    CELTMode **m;
+    if (argc%2 != 1 || argc < 3) {
+        fprintf (stderr, "Usage: %s rate frame_size [rate frame_size] [rate frame_size]...\n", argv[0]);
+        return 1;
+    }
+    nb = (argc - 1)/2;
+    m = malloc(nb*sizeof(CELTMode*));
+    for (i = 0; i < nb; i++) {
+        int Fs, frame;
+        Fs      = atoi(argv[2*i + 1]);
+        frame   = atoi(argv[2*i + 2]);
+        m[i] = oac_custom_mode_create(Fs, frame, NULL);
+        if (m[i] == NULL) {
+            fprintf(stderr, "Error creating mode with Fs=%s, frame_size=%s\n",
+               argv[2*i + 1], argv[2*i + 2]);
+            return EXIT_FAILURE;
+        }
+    }
+    file = fopen(BASENAME ".h", "w");
 #ifdef OVERRIDE_FFT
-   dump_modes_arch_init(m, nb);
+    dump_modes_arch_init(m, nb);
 #endif
-   dump_modes(file, m, nb);
-   fclose(file);
+    dump_modes(file, m, nb);
+    fclose(file);
 #ifdef OVERRIDE_FFT
-   dump_modes_arch_finalize();
+    dump_modes_arch_finalize();
 #endif
-   for (i=0;i<nb;i++)
-      oac_custom_mode_destroy(m[i]);
-   free(m);
-   return 0;
+    for (i = 0; i < nb; i++)
+        oac_custom_mode_destroy(m[i]);
+    free(m);
+    return 0;
 }
diff --git a/celt/dump_modes/dump_modes_arch.h b/celt/dump_modes/dump_modes_arch.h
index cc0d4be1e..c460769d5 100644
--- a/celt/dump_modes/dump_modes_arch.h
+++ b/celt/dump_modes/dump_modes_arch.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef DUMP_MODE_ARCH_H
 #define DUMP_MODE_ARCH_H
@@ -33,13 +33,13 @@ void dump_mode_arch(CELTMode *mode);
 void dump_modes_arch_finalize();
 
 #if !defined(FIXED_POINT)
-#define ARM_NE10_ARCH_FILE_NAME "static_modes_float_arm_ne10.h"
+# define ARM_NE10_ARCH_FILE_NAME "static_modes_float_arm_ne10.h"
 #else
-#define ARM_NE10_ARCH_FILE_NAME "static_modes_fixed_arm_ne10.h"
+# define ARM_NE10_ARCH_FILE_NAME "static_modes_fixed_arm_ne10.h"
 #endif
 
 #if defined(HAVE_ARM_NE10)
-#define OVERRIDE_FFT (1)
+# define OVERRIDE_FFT (1)
 #endif
 
 #endif
diff --git a/celt/dump_modes/dump_modes_arm_ne10.c b/celt/dump_modes/dump_modes_arm_ne10.c
index 828e7b9ff..428d910bd 100644
--- a/celt/dump_modes/dump_modes_arm_ne10.c
+++ b/celt/dump_modes/dump_modes_arm_ne10.c
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #if defined(HAVE_CONFIG_H)
 # include "config.h"
@@ -47,106 +47,102 @@
 
 static FILE *file;
 
-void dump_modes_arch_init(CELTMode **modes, int nb_modes)
-{
-   int i;
-
-   file = fopen(ARM_NE10_ARCH_FILE_NAME, "w");
-   fprintf(file, "/* The contents of this file was automatically generated by\n");
-   fprintf(file, " * dump_mode_arm_ne10.c with arguments:");
-   for (i=0;i<nb_modes;i++)
-   {
-      CELTMode *mode = modes[i];
-      fprintf(file, " %d %d",mode->Fs,mode->shortMdctSize*mode->nbShortMdcts);
-   }
-   fprintf(file, "\n * It contains static definitions for some pre-defined modes. */\n");
-   fprintf(file, "#include <NE10_types.h>\n\n");
+void dump_modes_arch_init(CELTMode **modes, int nb_modes) {
+    int i;
+
+    file = fopen(ARM_NE10_ARCH_FILE_NAME, "w");
+    fprintf(file, "/* The contents of this file was automatically generated by\n");
+    fprintf(file, " * dump_mode_arm_ne10.c with arguments:");
+    for (i = 0; i < nb_modes; i++) {
+        CELTMode *mode = modes[i];
+        fprintf(file, " %d %d", mode->Fs, mode->shortMdctSize*mode->nbShortMdcts);
+    }
+    fprintf(file, "\n * It contains static definitions for some pre-defined modes. */\n");
+    fprintf(file, "#include <NE10_types.h>\n\n");
 }
 
-void dump_modes_arch_finalize()
-{
-   fclose(file);
+void dump_modes_arch_finalize() {
+    fclose(file);
 }
 
-void dump_mode_arch(CELTMode *mode)
-{
-   int k, j;
-   int mdctSize;
-
-   mdctSize = mode->shortMdctSize*mode->nbShortMdcts;
-
-   fprintf(file, "#ifndef NE10_FFT_PARAMS%d_%d\n", mode->Fs, mdctSize);
-   fprintf(file, "#define NE10_FFT_PARAMS%d_%d\n", mode->Fs, mdctSize);
-   /* cfg->factors */
-   for(k=0;k<=mode->mdct.maxshift;k++) {
-      NE10_FFT_CFG_TYPE_T cfg;
-      cfg = (NE10_FFT_CFG_TYPE_T)mode->mdct.kfft[k]->arch_fft->priv;
-      if (!cfg)
-         continue;
-      fprintf(file, "static const ne10_int32_t ne10_factors_%d[%d] = {\n",
-              mode->mdct.kfft[k]->nfft, (NE10_MAXFACTORS * 2));
-      for(j=0;j<(NE10_MAXFACTORS * 2);j++) {
-         fprintf(file, "%d,%c", cfg->factors[j],(j+16)%15==0?'\n':' ');
-      }
-      fprintf (file, "};\n");
-   }
-
-   /* cfg->twiddles */
-   for(k=0;k<=mode->mdct.maxshift;k++) {
-      NE10_FFT_CFG_TYPE_T cfg;
-      cfg = (NE10_FFT_CFG_TYPE_T)mode->mdct.kfft[k]->arch_fft->priv;
-      if (!cfg)
-         continue;
-      fprintf(file, "static const %s ne10_twiddles_%d[%d] = {\n",
+void dump_mode_arch(CELTMode *mode) {
+    int k, j;
+    int mdctSize;
+
+    mdctSize = mode->shortMdctSize*mode->nbShortMdcts;
+
+    fprintf(file, "#ifndef NE10_FFT_PARAMS%d_%d\n", mode->Fs, mdctSize);
+    fprintf(file, "#define NE10_FFT_PARAMS%d_%d\n", mode->Fs, mdctSize);
+    /* cfg->factors */
+    for (k = 0; k <= mode->mdct.maxshift; k++) {
+        NE10_FFT_CFG_TYPE_T cfg;
+        cfg = (NE10_FFT_CFG_TYPE_T)mode->mdct.kfft[k]->arch_fft->priv;
+        if (!cfg)
+            continue;
+        fprintf(file, "static const ne10_int32_t ne10_factors_%d[%d] = {\n",
+              mode->mdct.kfft[k]->nfft, (NE10_MAXFACTORS*2));
+        for (j = 0; j < (NE10_MAXFACTORS*2); j++) {
+            fprintf(file, "%d,%c", cfg->factors[j], (j + 16)%15 == 0?'\n':' ');
+        }
+        fprintf (file, "};\n");
+    }
+
+    /* cfg->twiddles */
+    for (k = 0; k <= mode->mdct.maxshift; k++) {
+        NE10_FFT_CFG_TYPE_T cfg;
+        cfg = (NE10_FFT_CFG_TYPE_T)mode->mdct.kfft[k]->arch_fft->priv;
+        if (!cfg)
+            continue;
+        fprintf(file, "static const %s ne10_twiddles_%d[%d] = {\n",
               NE10_FFT_CPX_TYPE_T_STR, mode->mdct.kfft[k]->nfft,
               mode->mdct.kfft[k]->nfft);
-      for(j=0;j<mode->mdct.kfft[k]->nfft;j++) {
+        for (j = 0; j < mode->mdct.kfft[k]->nfft; j++) {
 #if !defined(FIXED_POINT)
-         fprintf(file, "{%#0.8gf,%#0.8gf},%c",
-                 cfg->twiddles[j].r, cfg->twiddles[j].i,(j+4)%3==0?'\n':' ');
+            fprintf(file, "{%#0.8gf,%#0.8gf},%c",
+                 cfg->twiddles[j].r, cfg->twiddles[j].i, (j + 4)%3 == 0?'\n':' ');
 #else
-         fprintf(file, "{%d,%d},%c",
-                 cfg->twiddles[j].r, cfg->twiddles[j].i,(j+4)%3==0?'\n':' ');
+            fprintf(file, "{%d,%d},%c",
+                 cfg->twiddles[j].r, cfg->twiddles[j].i, (j + 4)%3 == 0?'\n':' ');
 #endif
-      }
-      fprintf (file, "};\n");
-   }
-
-   for(k=0;k<=mode->mdct.maxshift;k++) {
-      NE10_FFT_CFG_TYPE_T cfg;
-      cfg = (NE10_FFT_CFG_TYPE_T)mode->mdct.kfft[k]->arch_fft->priv;
-      if (!cfg) {
-         fprintf(file, "/* Ne10 does not support scaled FFT for length = %d */\n",
+        }
+        fprintf (file, "};\n");
+    }
+
+    for (k = 0; k <= mode->mdct.maxshift; k++) {
+        NE10_FFT_CFG_TYPE_T cfg;
+        cfg = (NE10_FFT_CFG_TYPE_T)mode->mdct.kfft[k]->arch_fft->priv;
+        if (!cfg) {
+            fprintf(file, "/* Ne10 does not support scaled FFT for length = %d */\n",
                  mode->mdct.kfft[k]->nfft);
-         fprintf(file, "static const arch_fft_state cfg_arch_%d = {\n", mode->mdct.kfft[k]->nfft);
-         fprintf(file, "0,\n");
-         fprintf(file, "NULL\n");
-         fprintf(file, "};\n");
-         continue;
-      }
-      fprintf(file, "static const %s %s_%d = {\n", NE10_FFT_STATE_TYPE_T_STR,
+            fprintf(file, "static const arch_fft_state cfg_arch_%d = {\n", mode->mdct.kfft[k]->nfft);
+            fprintf(file, "0,\n");
+            fprintf(file, "NULL\n");
+            fprintf(file, "};\n");
+            continue;
+        }
+        fprintf(file, "static const %s %s_%d = {\n", NE10_FFT_STATE_TYPE_T_STR,
               NE10_FFT_STATE_TYPE_T_STR, mode->mdct.kfft[k]->nfft);
-      fprintf(file, "%d,\n", cfg->nfft);
-      fprintf(file, "(ne10_int32_t *)ne10_factors_%d,\n", mode->mdct.kfft[k]->nfft);
-      fprintf(file, "(%s *)ne10_twiddles_%d,\n",
+        fprintf(file, "%d,\n", cfg->nfft);
+        fprintf(file, "(ne10_int32_t *)ne10_factors_%d,\n", mode->mdct.kfft[k]->nfft);
+        fprintf(file, "(%s *)ne10_twiddles_%d,\n",
               NE10_FFT_CPX_TYPE_T_STR, mode->mdct.kfft[k]->nfft);
-      fprintf(file, "NULL,\n");  /* buffer */
-      fprintf(file, "(%s *)&ne10_twiddles_%d[%d],\n",
+        fprintf(file, "NULL,\n"); /* buffer */
+        fprintf(file, "(%s *)&ne10_twiddles_%d[%d],\n",
               NE10_FFT_CPX_TYPE_T_STR, mode->mdct.kfft[k]->nfft, cfg->nfft);
 #if !defined(FIXED_POINT)
-      fprintf(file, "/* is_forward_scaled = true */\n");
-      fprintf(file, "(ne10_int32_t) 1,\n");
-      fprintf(file, "/* is_backward_scaled = false */\n");
-      fprintf(file, "(ne10_int32_t) 0,\n");
+        fprintf(file, "/* is_forward_scaled = true */\n");
+        fprintf(file, "(ne10_int32_t) 1,\n");
+        fprintf(file, "/* is_backward_scaled = false */\n");
+        fprintf(file, "(ne10_int32_t) 0,\n");
 #endif
-      fprintf(file, "};\n");
+        fprintf(file, "};\n");
 
-      fprintf(file, "static const arch_fft_state cfg_arch_%d = {\n",
+        fprintf(file, "static const arch_fft_state cfg_arch_%d = {\n",
               mode->mdct.kfft[k]->nfft);
-      fprintf(file, "1,\n");
-      fprintf(file, "(void *)&%s_%d,\n",
+        fprintf(file, "1,\n");
+        fprintf(file, "(void *)&%s_%d,\n",
               NE10_FFT_STATE_TYPE_T_STR, mode->mdct.kfft[k]->nfft);
-      fprintf(file, "};\n\n");
-   }
-   fprintf(file, "#endif  /* end NE10_FFT_PARAMS%d_%d */\n", mode->Fs, mdctSize);
+        fprintf(file, "};\n\n");
+    }
+    fprintf(file, "#endif  /* end NE10_FFT_PARAMS%d_%d */\n", mode->Fs, mdctSize);
 }
diff --git a/celt/ecintrin.h b/celt/ecintrin.h
index 02b43f5d0..649d9e3f5 100644
--- a/celt/ecintrin.h
+++ b/celt/ecintrin.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 /*Some common macros for potential platform-specific optimization.*/
 #include "oac_types.h"
@@ -35,57 +35,57 @@
 
 /*Some specific platforms may have optimized intrinsic or OAC_INLINE assembly
    versions of these functions which can substantially improve performance.
-  We define macros for them to allow easy incorporation of these non-ANSI
+   We define macros for them to allow easy incorporation of these non-ANSI
    features.*/
 
 /*Modern gcc (4.x) can compile the naive versions of min and max with cmov if
    given an appropriate architecture, but the branchless bit-twiddling versions
    are just as fast, and do not require any special target architecture.
-  Earlier gcc versions (3.x) compiled both code to the same assembly
+   Earlier gcc versions (3.x) compiled both code to the same assembly
    instructions, because of the way they represented ((_b)>(_a)) internally.*/
-# define EC_MINI(_a,_b)      ((_a)+(((_b)-(_a))&-((_b)<(_a))))
+# define EC_MINI(_a, _b)      ((_a) + (((_b) - (_a))& -((_b) < (_a))))
 
 /*Count leading zeros.
-  This macro should only be used for implementing ec_ilog(), if it is defined.
-  All other code should use EC_ILOG() instead.*/
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
-#if defined(_MSC_VER) && (_MSC_VER >= 1910)
-# include <intrin0.h> /* Improve compiler throughput. */
-#else
-# include <intrin.h>
-#endif
+   This macro should only be used for implementing ec_ilog(), if it is defined.
+   All other code should use EC_ILOG() instead.*/
+# if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#  if defined(_MSC_VER) && (_MSC_VER >= 1910)
+#   include <intrin0.h> /* Improve compiler throughput. */
+#  else
+#   include <intrin.h>
+#  endif
 /*In _DEBUG mode this is not an intrinsic by default.*/
-# pragma intrinsic(_BitScanReverse)
+#  pragma intrinsic(_BitScanReverse)
 
-static __inline int ec_bsr(unsigned long _x){
-  unsigned long ret;
-  _BitScanReverse(&ret,_x);
-  return (int)ret;
+static __inline int ec_bsr(unsigned long _x) {
+    unsigned long ret;
+    _BitScanReverse(&ret, _x);
+    return (int)ret;
 }
-# define EC_CLZ0    (1)
-# define EC_CLZ(_x) (-ec_bsr(_x))
-#elif defined(ENABLE_TI_DSPLIB)
-# include "dsplib.h"
-# define EC_CLZ0    (31)
-# define EC_CLZ(_x) (_lnorm(_x))
-#elif __GNUC_PREREQ(3,4)
-# if INT_MAX>=2147483647
-#  define EC_CLZ0    ((int)sizeof(unsigned)*CHAR_BIT)
-#  define EC_CLZ(_x) (__builtin_clz(_x))
-# elif LONG_MAX>=2147483647L
-#  define EC_CLZ0    ((int)sizeof(unsigned long)*CHAR_BIT)
-#  define EC_CLZ(_x) (__builtin_clzl(_x))
+#  define EC_CLZ0    (1)
+#  define EC_CLZ(_x) (-ec_bsr(_x))
+# elif defined(ENABLE_TI_DSPLIB)
+#  include "dsplib.h"
+#  define EC_CLZ0    (31)
+#  define EC_CLZ(_x) (_lnorm(_x))
+# elif __GNUC_PREREQ(3, 4)
+#  if INT_MAX >= 2147483647
+#   define EC_CLZ0    ((int)sizeof(unsigned)*CHAR_BIT)
+#   define EC_CLZ(_x) (__builtin_clz(_x))
+#  elif LONG_MAX >= 2147483647L
+#   define EC_CLZ0    ((int)sizeof(unsigned long)*CHAR_BIT)
+#   define EC_CLZ(_x) (__builtin_clzl(_x))
+#  endif
 # endif
-#endif
 
-#if defined(EC_CLZ)
+# if defined(EC_CLZ)
 /*Note that __builtin_clz is not defined when _x==0, according to the gcc
    documentation (and that of the BSR instruction that implements it on x86).
-  The majority of the time we can never pass it zero.
-  When we need to, it can be special cased.*/
-# define EC_ILOG(_x) (EC_CLZ0-EC_CLZ(_x))
-#else
+   The majority of the time we can never pass it zero.
+   When we need to, it can be special cased.*/
+#  define EC_ILOG(_x) (EC_CLZ0 - EC_CLZ(_x))
+# else
 int ec_ilog(oac_uint32 _v);
-# define EC_ILOG(_x) (ec_ilog(_x))
-#endif
+#  define EC_ILOG(_x) (ec_ilog(_x))
+# endif
 #endif
diff --git a/celt/entcode.c b/celt/entcode.c
index 3939dc6d3..e52c8ebcf 100644
--- a/celt/entcode.c
+++ b/celt/entcode.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2001-2011 Timothy B. Terriberry
-*/
+ */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "entcode.h"
@@ -35,30 +35,30 @@
 #if !defined(EC_CLZ)
 /*This is a fallback for systems where we don't know how to access
    a BSR or CLZ instruction (see ecintrin.h).
-  If you are optimizing Oac on a new platform and it has a native CLZ or
+   If you are optimizing Oac on a new platform and it has a native CLZ or
    BZR (e.g. cell, MIPS, x86, etc) then making it available to Oac will be
    an easy performance win.*/
-int ec_ilog(oac_uint32 _v){
-  /*On a Pentium M, this branchless version tested as the fastest on
-     1,000,000,000 random 32-bit integers, edging out a similar version with
-     branches, and a 256-entry LUT version.*/
-  int ret;
-  int m;
-  ret=!!_v;
-  m=!!(_v&0xFFFF0000)<<4;
-  _v>>=m;
-  ret|=m;
-  m=!!(_v&0xFF00)<<3;
-  _v>>=m;
-  ret|=m;
-  m=!!(_v&0xF0)<<2;
-  _v>>=m;
-  ret|=m;
-  m=!!(_v&0xC)<<1;
-  _v>>=m;
-  ret|=m;
-  ret+=!!(_v&0x2);
-  return ret;
+int ec_ilog(oac_uint32 _v) {
+    /*On a Pentium M, this branchless version tested as the fastest on
+       1,000,000,000 random 32-bit integers, edging out a similar version with
+       branches, and a 256-entry LUT version.*/
+    int ret;
+    int m;
+    ret = !!_v;
+    m = !!(_v&0xFFFF0000)<<4;
+    _v >>= m;
+    ret |= m;
+    m = !!(_v&0xFF00)<<3;
+    _v >>= m;
+    ret |= m;
+    m = !!(_v&0xF0)<<2;
+    _v >>= m;
+    ret |= m;
+    m = !!(_v&0xC)<<1;
+    _v >>= m;
+    ret |= m;
+    ret += !!(_v&0x2);
+    return ret;
 }
 #endif
 
@@ -66,88 +66,88 @@ int ec_ilog(oac_uint32 _v){
 /* This is a faster version of ec_tell_frac() that takes advantage
    of the low (1/8 bit) resolution to use just a linear function
    followed by a lookup to determine the exact transition thresholds. */
-oac_uint32 ec_tell_frac(ec_ctx *_this){
-  static const unsigned correction[8] =
+oac_uint32 ec_tell_frac(ec_ctx *_this) {
+    static const unsigned correction[8] =
     {35733, 38967, 42495, 46340,
      50535, 55109, 60097, 65535};
-  oac_uint32 nbits;
-  oac_uint32 r;
-  int         l;
-  unsigned    b;
-  nbits=_this->nbits_total<<BITRES;
-  l=EC_ILOG(_this->rng);
-  r=_this->rng>>(l-16);
-  b = (r>>12)-8;
-  b += r>correction[b];
-  l = (l<<3)+b;
-  return nbits-l;
+    oac_uint32 nbits;
+    oac_uint32 r;
+    int l;
+    unsigned b;
+    nbits = _this->nbits_total<<BITRES;
+    l = EC_ILOG(_this->rng);
+    r = _this->rng>>(l - 16);
+    b = (r>>12) - 8;
+    b += r > correction[b];
+    l = (l<<3) + b;
+    return nbits - l;
 }
 #else
-oac_uint32 ec_tell_frac(ec_ctx *_this){
-  oac_uint32 nbits;
-  oac_uint32 r;
-  int         l;
-  int         i;
-  /*To handle the non-integral number of bits still left in the encoder/decoder
-     state, we compute the worst-case number of bits of val that must be
-     encoded to ensure that the value is inside the range for any possible
-     subsequent bits.
-    The computation here is independent of val itself (the decoder does not
-     even track that value), even though the real number of bits used after
-     ec_enc_done() may be 1 smaller if rng is a power of two and the
-     corresponding trailing bits of val are all zeros.
-    If we did try to track that special case, then coding a value with a
-     probability of 1/(1<<n) might sometimes appear to use more than n bits.
-    This may help explain the surprising result that a newly initialized
-     encoder or decoder claims to have used 1 bit.*/
-  nbits=_this->nbits_total<<BITRES;
-  l=EC_ILOG(_this->rng);
-  r=_this->rng>>(l-16);
-  for(i=BITRES;i-->0;){
-    int b;
-    r=r*r>>15;
-    b=(int)(r>>16);
-    l=l<<1|b;
-    r>>=b;
-  }
-  return nbits-l;
+oac_uint32 ec_tell_frac(ec_ctx *_this) {
+    oac_uint32 nbits;
+    oac_uint32 r;
+    int l;
+    int i;
+    /*To handle the non-integral number of bits still left in the encoder/decoder
+       state, we compute the worst-case number of bits of val that must be
+       encoded to ensure that the value is inside the range for any possible
+       subsequent bits.
+       The computation here is independent of val itself (the decoder does not
+       even track that value), even though the real number of bits used after
+       ec_enc_done() may be 1 smaller if rng is a power of two and the
+       corresponding trailing bits of val are all zeros.
+       If we did try to track that special case, then coding a value with a
+       probability of 1/(1<<n) might sometimes appear to use more than n bits.
+       This may help explain the surprising result that a newly initialized
+       encoder or decoder claims to have used 1 bit.*/
+    nbits = _this->nbits_total<<BITRES;
+    l = EC_ILOG(_this->rng);
+    r = _this->rng>>(l - 16);
+    for (i = BITRES; i-- > 0;) {
+        int b;
+        r = r*r>>15;
+        b = (int)(r>>16);
+        l = l<<1|b;
+        r >>= b;
+    }
+    return nbits - l;
 }
 #endif
 
 #ifdef USE_SMALL_DIV_TABLE
 /* Result of 2^32/(2*i+1), except for i=0. */
 const oac_uint32 SMALL_DIV_TABLE[129] = {
-   0xFFFFFFFF, 0x55555555, 0x33333333, 0x24924924,
-   0x1C71C71C, 0x1745D174, 0x13B13B13, 0x11111111,
-   0x0F0F0F0F, 0x0D79435E, 0x0C30C30C, 0x0B21642C,
-   0x0A3D70A3, 0x097B425E, 0x08D3DCB0, 0x08421084,
-   0x07C1F07C, 0x07507507, 0x06EB3E45, 0x06906906,
-   0x063E7063, 0x05F417D0, 0x05B05B05, 0x0572620A,
-   0x05397829, 0x05050505, 0x04D4873E, 0x04A7904A,
-   0x047DC11F, 0x0456C797, 0x04325C53, 0x04104104,
-   0x03F03F03, 0x03D22635, 0x03B5CC0E, 0x039B0AD1,
-   0x0381C0E0, 0x0369D036, 0x03531DEC, 0x033D91D2,
-   0x0329161F, 0x03159721, 0x03030303, 0x02F14990,
-   0x02E05C0B, 0x02D02D02, 0x02C0B02C, 0x02B1DA46,
-   0x02A3A0FD, 0x0295FAD4, 0x0288DF0C, 0x027C4597,
-   0x02702702, 0x02647C69, 0x02593F69, 0x024E6A17,
-   0x0243F6F0, 0x0239E0D5, 0x02302302, 0x0226B902,
-   0x021D9EAD, 0x0214D021, 0x020C49BA, 0x02040810,
-   0x01FC07F0, 0x01F44659, 0x01ECC07B, 0x01E573AC,
-   0x01DE5D6E, 0x01D77B65, 0x01D0CB58, 0x01CA4B30,
-   0x01C3F8F0, 0x01BDD2B8, 0x01B7D6C3, 0x01B20364,
-   0x01AC5701, 0x01A6D01A, 0x01A16D3F, 0x019C2D14,
-   0x01970E4F, 0x01920FB4, 0x018D3018, 0x01886E5F,
-   0x0183C977, 0x017F405F, 0x017AD220, 0x01767DCE,
-   0x01724287, 0x016E1F76, 0x016A13CD, 0x01661EC6,
-   0x01623FA7, 0x015E75BB, 0x015AC056, 0x01571ED3,
-   0x01539094, 0x01501501, 0x014CAB88, 0x0149539E,
-   0x01460CBC, 0x0142D662, 0x013FB013, 0x013C995A,
-   0x013991C2, 0x013698DF, 0x0133AE45, 0x0130D190,
-   0x012E025C, 0x012B404A, 0x01288B01, 0x0125E227,
-   0x01234567, 0x0120B470, 0x011E2EF3, 0x011BB4A4,
-   0x01194538, 0x0116E068, 0x011485F0, 0x0112358E,
-   0x010FEF01, 0x010DB20A, 0x010B7E6E, 0x010953F3,
-   0x01073260, 0x0105197F, 0x0103091B, 0x01010101
+    0xFFFFFFFF, 0x55555555, 0x33333333, 0x24924924,
+    0x1C71C71C, 0x1745D174, 0x13B13B13, 0x11111111,
+    0x0F0F0F0F, 0x0D79435E, 0x0C30C30C, 0x0B21642C,
+    0x0A3D70A3, 0x097B425E, 0x08D3DCB0, 0x08421084,
+    0x07C1F07C, 0x07507507, 0x06EB3E45, 0x06906906,
+    0x063E7063, 0x05F417D0, 0x05B05B05, 0x0572620A,
+    0x05397829, 0x05050505, 0x04D4873E, 0x04A7904A,
+    0x047DC11F, 0x0456C797, 0x04325C53, 0x04104104,
+    0x03F03F03, 0x03D22635, 0x03B5CC0E, 0x039B0AD1,
+    0x0381C0E0, 0x0369D036, 0x03531DEC, 0x033D91D2,
+    0x0329161F, 0x03159721, 0x03030303, 0x02F14990,
+    0x02E05C0B, 0x02D02D02, 0x02C0B02C, 0x02B1DA46,
+    0x02A3A0FD, 0x0295FAD4, 0x0288DF0C, 0x027C4597,
+    0x02702702, 0x02647C69, 0x02593F69, 0x024E6A17,
+    0x0243F6F0, 0x0239E0D5, 0x02302302, 0x0226B902,
+    0x021D9EAD, 0x0214D021, 0x020C49BA, 0x02040810,
+    0x01FC07F0, 0x01F44659, 0x01ECC07B, 0x01E573AC,
+    0x01DE5D6E, 0x01D77B65, 0x01D0CB58, 0x01CA4B30,
+    0x01C3F8F0, 0x01BDD2B8, 0x01B7D6C3, 0x01B20364,
+    0x01AC5701, 0x01A6D01A, 0x01A16D3F, 0x019C2D14,
+    0x01970E4F, 0x01920FB4, 0x018D3018, 0x01886E5F,
+    0x0183C977, 0x017F405F, 0x017AD220, 0x01767DCE,
+    0x01724287, 0x016E1F76, 0x016A13CD, 0x01661EC6,
+    0x01623FA7, 0x015E75BB, 0x015AC056, 0x01571ED3,
+    0x01539094, 0x01501501, 0x014CAB88, 0x0149539E,
+    0x01460CBC, 0x0142D662, 0x013FB013, 0x013C995A,
+    0x013991C2, 0x013698DF, 0x0133AE45, 0x0130D190,
+    0x012E025C, 0x012B404A, 0x01288B01, 0x0125E227,
+    0x01234567, 0x0120B470, 0x011E2EF3, 0x011BB4A4,
+    0x01194538, 0x0116E068, 0x011485F0, 0x0112358E,
+    0x010FEF01, 0x010DB20A, 0x010B7E6E, 0x010953F3,
+    0x01073260, 0x0105197F, 0x0103091B, 0x01010101
 };
 #endif
diff --git a/celt/entcode.h b/celt/entcode.h
index 3c6de5432..96b7b669f 100644
--- a/celt/entcode.h
+++ b/celt/entcode.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #include "oac_types.h"
 #include "oac_defines.h"
@@ -36,16 +36,16 @@
 
 extern const oac_uint32 SMALL_DIV_TABLE[129];
 
-#ifdef OAC_ARM_ASM
-#define USE_SMALL_DIV_TABLE
-#endif
+# ifdef OAC_ARM_ASM
+#  define USE_SMALL_DIV_TABLE
+# endif
 
 /*OPT: ec_window must be at least 32 bits, but if you have fast arithmetic on a
    larger type, you can speed up the decoder by using it here.*/
-typedef oac_uint32           ec_window;
-typedef struct ec_ctx         ec_ctx;
-typedef struct ec_ctx         ec_enc;
-typedef struct ec_ctx         ec_dec;
+typedef oac_uint32 ec_window;
+typedef struct ec_ctx ec_ctx;
+typedef struct ec_ctx ec_enc;
+typedef struct ec_ctx ec_dec;
 
 # define EC_WINDOW_SIZE ((int)sizeof(ec_window)*CHAR_BIT)
 
@@ -57,96 +57,96 @@ typedef struct ec_ctx         ec_dec;
 # define BITRES 3
 
 /*The entropy encoder/decoder context.
-  We use the same structure for both, so that common functions like ec_tell()
+   We use the same structure for both, so that common functions like ec_tell()
    can be used on either one.*/
-struct ec_ctx{
-   /*Buffered input/output.*/
-   unsigned char *buf;
-   /*The size of the buffer.*/
-   oac_uint32    storage;
-   /*The offset at which the last byte containing raw bits was read/written.*/
-   oac_uint32    end_offs;
-   /*Bits that will be read from/written at the end.*/
-   ec_window      end_window;
-   /*Number of valid bits in end_window.*/
-   int            nend_bits;
-   /*The total number of whole bits read/written.
-     This does not include partial bits currently in the range coder.*/
-   int            nbits_total;
-   /*The offset at which the next range coder byte will be read/written.*/
-   oac_uint32    offs;
-   /*The number of values in the current range.*/
-   oac_uint32    rng;
-   /*In the decoder: the difference between the top of the current range and
-      the input value, minus one.
-     In the encoder: the low end of the current range.*/
-   oac_uint32    val;
-   /*In the decoder: the saved normalization factor from ec_decode().
-     In the encoder: the number of outstanding carry propagating symbols.*/
-   oac_uint32    ext;
-   /*A buffered input/output symbol, awaiting carry propagation.*/
-   int            rem;
-   /*Nonzero if an error occurred.*/
-   int            error;
+struct ec_ctx {
+    /*Buffered input/output.*/
+    unsigned char *buf;
+    /*The size of the buffer.*/
+    oac_uint32 storage;
+    /*The offset at which the last byte containing raw bits was read/written.*/
+    oac_uint32 end_offs;
+    /*Bits that will be read from/written at the end.*/
+    ec_window end_window;
+    /*Number of valid bits in end_window.*/
+    int nend_bits;
+    /*The total number of whole bits read/written.
+       This does not include partial bits currently in the range coder.*/
+    int nbits_total;
+    /*The offset at which the next range coder byte will be read/written.*/
+    oac_uint32 offs;
+    /*The number of values in the current range.*/
+    oac_uint32 rng;
+    /*In the decoder: the difference between the top of the current range and
+       the input value, minus one.
+       In the encoder: the low end of the current range.*/
+    oac_uint32 val;
+    /*In the decoder: the saved normalization factor from ec_decode().
+       In the encoder: the number of outstanding carry propagating symbols.*/
+    oac_uint32 ext;
+    /*A buffered input/output symbol, awaiting carry propagation.*/
+    int rem;
+    /*Nonzero if an error occurred.*/
+    int error;
 };
 
-static OAC_INLINE oac_uint32 ec_range_bytes(ec_ctx *_this){
-  return _this->offs;
+static OAC_INLINE oac_uint32 ec_range_bytes(ec_ctx *_this) {
+    return _this->offs;
 }
 
-static OAC_INLINE unsigned char *ec_get_buffer(ec_ctx *_this){
-  return _this->buf;
+static OAC_INLINE unsigned char *ec_get_buffer(ec_ctx *_this) {
+    return _this->buf;
 }
 
-static OAC_INLINE int ec_get_error(ec_ctx *_this){
-  return _this->error;
+static OAC_INLINE int ec_get_error(ec_ctx *_this) {
+    return _this->error;
 }
 
 /*Returns the number of bits "used" by the encoded or decoded symbols so far.
-  This same number can be computed in either the encoder or the decoder, and is
+   This same number can be computed in either the encoder or the decoder, and is
    suitable for making coding decisions.
-  Return: The number of bits.
+   Return: The number of bits.
           This will always be slightly larger than the exact value (e.g., all
            rounding error is in the positive direction).*/
-static OAC_INLINE int ec_tell(ec_ctx *_this){
-  return _this->nbits_total-EC_ILOG(_this->rng);
+static OAC_INLINE int ec_tell(ec_ctx *_this) {
+    return _this->nbits_total - EC_ILOG(_this->rng);
 }
 
 /*Returns the number of bits "used" by the encoded or decoded symbols so far.
-  This same number can be computed in either the encoder or the decoder, and is
+   This same number can be computed in either the encoder or the decoder, and is
    suitable for making coding decisions.
-  Return: The number of bits scaled by 2**BITRES.
+   Return: The number of bits scaled by 2**BITRES.
           This will always be slightly larger than the exact value (e.g., all
            rounding error is in the positive direction).*/
 oac_uint32 ec_tell_frac(ec_ctx *_this);
 
 /* Tested exhaustively for all n and for 1<=d<=256 */
 static OAC_INLINE oac_uint32 celt_udiv(oac_uint32 n, oac_uint32 d) {
-   celt_sig_assert(d>0);
-#ifdef USE_SMALL_DIV_TABLE
-   if (d>256)
-      return n/d;
-   else {
-      oac_uint32 t, q;
-      t = EC_ILOG(d&-d);
-      q = (oac_uint64)SMALL_DIV_TABLE[d>>t]*(n>>(t-1))>>32;
-      return q+(n-q*d >= d);
-   }
-#else
-   return n/d;
-#endif
+    celt_sig_assert(d > 0);
+# ifdef USE_SMALL_DIV_TABLE
+    if (d > 256)
+        return n/d;
+    else {
+        oac_uint32 t, q;
+        t = EC_ILOG(d& -d);
+        q = (oac_uint64)SMALL_DIV_TABLE[d>>t]*(n>>(t - 1))>>32;
+        return q + (n - q*d >= d);
+    }
+# else
+    return n/d;
+# endif
 }
 
 static OAC_INLINE oac_int32 celt_sudiv(oac_int32 n, oac_int32 d) {
-   celt_sig_assert(d>0);
-#ifdef USE_SMALL_DIV_TABLE
-   if (n<0)
-      return -(oac_int32)celt_udiv(-n, d);
-   else
-      return celt_udiv(n, d);
-#else
-   return n/d;
-#endif
+    celt_sig_assert(d > 0);
+# ifdef USE_SMALL_DIV_TABLE
+    if (n < 0)
+        return -(oac_int32)celt_udiv(-n, d);
+    else
+        return celt_udiv(n, d);
+# else
+    return n/d;
+# endif
 }
 
 #endif
diff --git a/celt/entdec.c b/celt/entdec.c
index b3da1a0ed..b86dec455 100644
--- a/celt/entdec.c
+++ b/celt/entdec.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stddef.h>
@@ -36,38 +36,38 @@
 #include "mfrngcod.h"
 
 /*A range decoder.
-  This is an entropy decoder based upon \cite{Mar79}, which is itself a
+   This is an entropy decoder based upon \cite{Mar79}, which is itself a
    rediscovery of the FIFO arithmetic code introduced by \cite{Pas76}.
-  It is very similar to arithmetic encoding, except that encoding is done with
+   It is very similar to arithmetic encoding, except that encoding is done with
    digits in any base, instead of with bits, and so it is faster when using
    larger bases (i.e.: a byte).
-  The author claims an average waste of $\frac{1}{2}\log_b(2b)$ bits, where $b$
+   The author claims an average waste of $\frac{1}{2}\log_b(2b)$ bits, where $b$
    is the base, longer than the theoretical optimum, but to my knowledge there
    is no published justification for this claim.
-  This only seems true when using near-infinite precision arithmetic so that
+   This only seems true when using near-infinite precision arithmetic so that
    the process is carried out with no rounding errors.
 
-  An excellent description of implementation details is available at
+   An excellent description of implementation details is available at
    http://www.arturocampos.com/ac_range.html
-  A recent work \cite{MNW98} which proposes several changes to arithmetic
+   A recent work \cite{MNW98} which proposes several changes to arithmetic
    encoding for efficiency actually re-discovers many of the principles
    behind range encoding, and presents a good theoretical analysis of them.
 
-  End of stream is handled by writing out the smallest number of bits that
+   End of stream is handled by writing out the smallest number of bits that
    ensures that the stream will be correctly decoded regardless of the value of
    any subsequent bits.
-  ec_tell() can be used to determine how many bits were needed to decode
+   ec_tell() can be used to determine how many bits were needed to decode
    all the symbols thus far; other data can be packed in the remaining bits of
    the input buffer.
-  @PHDTHESIS{Pas76,
+   @PHDTHESIS{Pas76,
     author="Richard Clark Pasco",
     title="Source coding algorithms for fast data compression",
     school="Dept. of Electrical Engineering, Stanford University",
     address="Stanford, CA",
     month=May,
     year=1976
-  }
-  @INPROCEEDINGS{Mar79,
+   }
+   @INPROCEEDINGS{Mar79,
    author="Martin, G.N.N.",
    title="Range encoding: an algorithm for removing redundancy from a digitised
     message",
@@ -75,8 +75,8 @@
    year=1979,
    address="Southampton",
    month=Jul
-  }
-  @ARTICLE{MNW98,
+   }
+   @ARTICLE{MNW98,
    author="Alistair Moffat and Radford Neal and Ian H. Witten",
    title="Arithmetic Coding Revisited",
    journal="{ACM} Transactions on Information Systems",
@@ -86,181 +86,177 @@
    pages="256--294",
    month=Jul,
    URL="http://www.stanford.edu/class/ee398a/handouts/papers/Moffat98ArithmCoding.pdf"
-  }*/
+   }*/
 
-static int ec_read_byte(ec_dec *_this){
-  return _this->offs<_this->storage?_this->buf[_this->offs++]:0;
+static int ec_read_byte(ec_dec *_this) {
+    return _this->offs < _this->storage?_this->buf[_this->offs++]:0;
 }
 
-static int ec_read_byte_from_end(ec_dec *_this){
-  return _this->end_offs<_this->storage?
-   _this->buf[_this->storage-++(_this->end_offs)]:0;
+static int ec_read_byte_from_end(ec_dec *_this) {
+    return _this->end_offs < _this->storage?
+           _this->buf[_this->storage - ++(_this->end_offs)]:0;
 }
 
 /*Normalizes the contents of val and rng so that rng lies entirely in the
    high-order symbol.*/
-static void ec_dec_normalize(ec_dec *_this){
-  /*If the range is too small, rescale it and input some bits.*/
-  while(_this->rng<=EC_CODE_BOT){
-    int sym;
-    _this->nbits_total+=EC_SYM_BITS;
-    _this->rng<<=EC_SYM_BITS;
-    /*Use up the remaining bits from our last symbol.*/
-    sym=_this->rem;
-    /*Read the next value from the input.*/
-    _this->rem=ec_read_byte(_this);
-    /*Take the rest of the bits we need from this new symbol.*/
-    sym=(sym<<EC_SYM_BITS|_this->rem)>>(EC_SYM_BITS-EC_CODE_EXTRA);
-    /*And subtract them from val, capped to be less than EC_CODE_TOP.*/
-    _this->val=((_this->val<<EC_SYM_BITS)+(EC_SYM_MAX&~sym))&(EC_CODE_TOP-1);
-  }
+static void ec_dec_normalize(ec_dec *_this) {
+    /*If the range is too small, rescale it and input some bits.*/
+    while (_this->rng <= EC_CODE_BOT) {
+        int sym;
+        _this->nbits_total += EC_SYM_BITS;
+        _this->rng <<= EC_SYM_BITS;
+        /*Use up the remaining bits from our last symbol.*/
+        sym = _this->rem;
+        /*Read the next value from the input.*/
+        _this->rem = ec_read_byte(_this);
+        /*Take the rest of the bits we need from this new symbol.*/
+        sym = (sym<<EC_SYM_BITS|_this->rem)>>(EC_SYM_BITS - EC_CODE_EXTRA);
+        /*And subtract them from val, capped to be less than EC_CODE_TOP.*/
+        _this->val = ((_this->val<<EC_SYM_BITS) + (EC_SYM_MAX&~sym))&(EC_CODE_TOP - 1);
+    }
 }
 
-void ec_dec_init(ec_dec *_this,unsigned char *_buf,oac_uint32 _storage){
-  _this->buf=_buf;
-  _this->storage=_storage;
-  _this->end_offs=0;
-  _this->end_window=0;
-  _this->nend_bits=0;
-  /*This is the offset from which ec_tell() will subtract partial bits.
-    The final value after the ec_dec_normalize() call will be the same as in
-     the encoder, but we have to compensate for the bits that are added there.*/
-  _this->nbits_total=EC_CODE_BITS+1
-   -((EC_CODE_BITS-EC_CODE_EXTRA)/EC_SYM_BITS)*EC_SYM_BITS;
-  _this->offs=0;
-  _this->rng=1U<<EC_CODE_EXTRA;
-  _this->rem=ec_read_byte(_this);
-  _this->val=_this->rng-1-(_this->rem>>(EC_SYM_BITS-EC_CODE_EXTRA));
-  _this->error=0;
-  /*Normalize the interval.*/
-  ec_dec_normalize(_this);
+void ec_dec_init(ec_dec *_this, unsigned char *_buf, oac_uint32 _storage) {
+    _this->buf = _buf;
+    _this->storage = _storage;
+    _this->end_offs = 0;
+    _this->end_window = 0;
+    _this->nend_bits = 0;
+    /*This is the offset from which ec_tell() will subtract partial bits.
+       The final value after the ec_dec_normalize() call will be the same as in
+       the encoder, but we have to compensate for the bits that are added there.*/
+    _this->nbits_total = EC_CODE_BITS + 1
+                         - ((EC_CODE_BITS - EC_CODE_EXTRA)/EC_SYM_BITS)*EC_SYM_BITS;
+    _this->offs = 0;
+    _this->rng = 1U<<EC_CODE_EXTRA;
+    _this->rem = ec_read_byte(_this);
+    _this->val = _this->rng - 1 - (_this->rem>>(EC_SYM_BITS - EC_CODE_EXTRA));
+    _this->error = 0;
+    /*Normalize the interval.*/
+    ec_dec_normalize(_this);
 }
 
-unsigned ec_decode(ec_dec *_this,unsigned _ft){
-  unsigned s;
-  _this->ext=celt_udiv(_this->rng,_ft);
-  s=(unsigned)(_this->val/_this->ext);
-  return _ft-EC_MINI(s+1,_ft);
+unsigned ec_decode(ec_dec *_this, unsigned _ft) {
+    unsigned s;
+    _this->ext = celt_udiv(_this->rng, _ft);
+    s = (unsigned)(_this->val/_this->ext);
+    return _ft - EC_MINI(s + 1, _ft);
 }
 
-unsigned ec_decode_bin(ec_dec *_this,unsigned _bits){
-   unsigned s;
-   _this->ext=_this->rng>>_bits;
-   s=(unsigned)(_this->val/_this->ext);
-   return (1U<<_bits)-EC_MINI(s+1U,1U<<_bits);
+unsigned ec_decode_bin(ec_dec *_this, unsigned _bits) {
+    unsigned s;
+    _this->ext = _this->rng>>_bits;
+    s = (unsigned)(_this->val/_this->ext);
+    return (1U<<_bits) - EC_MINI(s + 1U, 1U<<_bits);
 }
 
-void ec_dec_update(ec_dec *_this,unsigned _fl,unsigned _fh,unsigned _ft){
-  oac_uint32 s;
-  s=IMUL32(_this->ext,_ft-_fh);
-  _this->val-=s;
-  _this->rng=_fl>0?IMUL32(_this->ext,_fh-_fl):_this->rng-s;
-  ec_dec_normalize(_this);
+void ec_dec_update(ec_dec *_this, unsigned _fl, unsigned _fh, unsigned _ft) {
+    oac_uint32 s;
+    s = IMUL32(_this->ext, _ft - _fh);
+    _this->val -= s;
+    _this->rng = _fl > 0?IMUL32(_this->ext, _fh - _fl):_this->rng - s;
+    ec_dec_normalize(_this);
 }
 
 /*The probability of having a "one" is 1/(1<<_logp).*/
-int ec_dec_bit_logp(ec_dec *_this,unsigned _logp){
-  oac_uint32 r;
-  oac_uint32 d;
-  oac_uint32 s;
-  int         ret;
-  r=_this->rng;
-  d=_this->val;
-  s=r>>_logp;
-  ret=d<s;
-  if(!ret)_this->val=d-s;
-  _this->rng=ret?s:r-s;
-  ec_dec_normalize(_this);
-  return ret;
+int ec_dec_bit_logp(ec_dec *_this, unsigned _logp) {
+    oac_uint32 r;
+    oac_uint32 d;
+    oac_uint32 s;
+    int ret;
+    r = _this->rng;
+    d = _this->val;
+    s = r>>_logp;
+    ret = d < s;
+    if (!ret) _this->val = d - s;
+    _this->rng = ret?s:r - s;
+    ec_dec_normalize(_this);
+    return ret;
 }
 
-int ec_dec_icdf(ec_dec *_this,const unsigned char *_icdf,unsigned _ftb){
-  oac_uint32 r;
-  oac_uint32 d;
-  oac_uint32 s;
-  oac_uint32 t;
-  int         ret;
-  s=_this->rng;
-  d=_this->val;
-  r=s>>_ftb;
-  ret=-1;
-  do{
-    t=s;
-    s=IMUL32(r,_icdf[++ret]);
-  }
-  while(d<s);
-  _this->val=d-s;
-  _this->rng=t-s;
-  ec_dec_normalize(_this);
-  return ret;
+int ec_dec_icdf(ec_dec *_this, const unsigned char *_icdf, unsigned _ftb) {
+    oac_uint32 r;
+    oac_uint32 d;
+    oac_uint32 s;
+    oac_uint32 t;
+    int ret;
+    s = _this->rng;
+    d = _this->val;
+    r = s>>_ftb;
+    ret = -1;
+    do {
+        t = s;
+        s = IMUL32(r, _icdf[++ret]);
+    } while (d < s);
+    _this->val = d - s;
+    _this->rng = t - s;
+    ec_dec_normalize(_this);
+    return ret;
 }
 
-int ec_dec_icdf16(ec_dec *_this,const oac_uint16 *_icdf,unsigned _ftb){
-  oac_uint32 r;
-  oac_uint32 d;
-  oac_uint32 s;
-  oac_uint32 t;
-  int         ret;
-  s=_this->rng;
-  d=_this->val;
-  r=s>>_ftb;
-  ret=-1;
-  do{
-    t=s;
-    s=IMUL32(r,_icdf[++ret]);
-  }
-  while(d<s);
-  _this->val=d-s;
-  _this->rng=t-s;
-  ec_dec_normalize(_this);
-  return ret;
+int ec_dec_icdf16(ec_dec *_this, const oac_uint16 *_icdf, unsigned _ftb) {
+    oac_uint32 r;
+    oac_uint32 d;
+    oac_uint32 s;
+    oac_uint32 t;
+    int ret;
+    s = _this->rng;
+    d = _this->val;
+    r = s>>_ftb;
+    ret = -1;
+    do {
+        t = s;
+        s = IMUL32(r, _icdf[++ret]);
+    } while (d < s);
+    _this->val = d - s;
+    _this->rng = t - s;
+    ec_dec_normalize(_this);
+    return ret;
 }
 
-oac_uint32 ec_dec_uint(ec_dec *_this,oac_uint32 _ft){
-  unsigned ft;
-  unsigned s;
-  int      ftb;
-  /*In order to optimize EC_ILOG(), it is undefined for the value 0.*/
-  celt_assert(_ft>1);
-  _ft--;
-  ftb=EC_ILOG(_ft);
-  if(ftb>EC_UINT_BITS){
-    oac_uint32 t;
-    ftb-=EC_UINT_BITS;
-    ft=(unsigned)(_ft>>ftb)+1;
-    s=ec_decode(_this,ft);
-    ec_dec_update(_this,s,s+1,ft);
-    t=(oac_uint32)s<<ftb|ec_dec_bits(_this,ftb);
-    if(t<=_ft)return t;
-    _this->error=1;
-    return _ft;
-  }
-  else{
-    _ft++;
-    s=ec_decode(_this,(unsigned)_ft);
-    ec_dec_update(_this,s,s+1,(unsigned)_ft);
-    return s;
-  }
+oac_uint32 ec_dec_uint(ec_dec *_this, oac_uint32 _ft) {
+    unsigned ft;
+    unsigned s;
+    int ftb;
+    /*In order to optimize EC_ILOG(), it is undefined for the value 0.*/
+    celt_assert(_ft > 1);
+    _ft--;
+    ftb = EC_ILOG(_ft);
+    if (ftb > EC_UINT_BITS) {
+        oac_uint32 t;
+        ftb -= EC_UINT_BITS;
+        ft = (unsigned)(_ft>>ftb) + 1;
+        s = ec_decode(_this, ft);
+        ec_dec_update(_this, s, s + 1, ft);
+        t = (oac_uint32)s<<ftb|ec_dec_bits(_this, ftb);
+        if (t <= _ft) return t;
+        _this->error = 1;
+        return _ft;
+    } else   {
+        _ft++;
+        s = ec_decode(_this, (unsigned)_ft);
+        ec_dec_update(_this, s, s + 1, (unsigned)_ft);
+        return s;
+    }
 }
 
-oac_uint32 ec_dec_bits(ec_dec *_this,unsigned _bits){
-  ec_window   window;
-  int         available;
-  oac_uint32 ret;
-  window=_this->end_window;
-  available=_this->nend_bits;
-  if((unsigned)available<_bits){
-    do{
-      window|=(ec_window)ec_read_byte_from_end(_this)<<available;
-      available+=EC_SYM_BITS;
+oac_uint32 ec_dec_bits(ec_dec *_this, unsigned _bits) {
+    ec_window window;
+    int available;
+    oac_uint32 ret;
+    window = _this->end_window;
+    available = _this->nend_bits;
+    if ((unsigned)available < _bits) {
+        do {
+            window |= (ec_window)ec_read_byte_from_end(_this)<<available;
+            available += EC_SYM_BITS;
+        } while (available <= EC_WINDOW_SIZE - EC_SYM_BITS);
     }
-    while(available<=EC_WINDOW_SIZE-EC_SYM_BITS);
-  }
-  ret=(oac_uint32)window&(((oac_uint32)1<<_bits)-1U);
-  window>>=_bits;
-  available-=_bits;
-  _this->end_window=window;
-  _this->nend_bits=available;
-  _this->nbits_total+=_bits;
-  return ret;
+    ret = (oac_uint32)window&(((oac_uint32)1<<_bits) - 1U);
+    window >>= _bits;
+    available -= _bits;
+    _this->end_window = window;
+    _this->nend_bits = available;
+    _this->nbits_total += _bits;
+    return ret;
 }
diff --git a/celt/entdec.h b/celt/entdec.h
index beceab235..df095a932 100644
--- a/celt/entdec.h
+++ b/celt/entdec.h
@@ -23,88 +23,88 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #if !defined(_entdec_H)
-# define _entdec_H (1)
-# include <limits.h>
-# include "entcode.h"
+#define _entdec_H (1)
+#include <limits.h>
+#include "entcode.h"
 
 /*Initializes the decoder.
-  _buf: The input buffer to use.
-  Return: 0 on success, or a negative value on error.*/
-void ec_dec_init(ec_dec *_this,unsigned char *_buf,oac_uint32 _storage);
+   _buf: The input buffer to use.
+   Return: 0 on success, or a negative value on error.*/
+void ec_dec_init(ec_dec *_this, unsigned char *_buf, oac_uint32 _storage);
 
 /*Calculates the cumulative frequency for the next symbol.
-  This can then be fed into the probability model to determine what that
+   This can then be fed into the probability model to determine what that
    symbol is, and the additional frequency information required to advance to
    the next symbol.
-  This function cannot be called more than once without a corresponding call to
+   This function cannot be called more than once without a corresponding call to
    ec_dec_update(), or decoding will not proceed correctly.
-  _ft: The total frequency of the symbols in the alphabet the next symbol was
+   _ft: The total frequency of the symbols in the alphabet the next symbol was
         encoded with.
-  Return: A cumulative frequency representing the encoded symbol.
+   Return: A cumulative frequency representing the encoded symbol.
           If the cumulative frequency of all the symbols before the one that
            was encoded was fl, and the cumulative frequency of all the symbols
            up to and including the one encoded is fh, then the returned value
            will fall in the range [fl,fh).*/
-unsigned ec_decode(ec_dec *_this,unsigned _ft);
+unsigned ec_decode(ec_dec *_this, unsigned _ft);
 
 /*Equivalent to ec_decode() with _ft==1<<_bits.*/
-unsigned ec_decode_bin(ec_dec *_this,unsigned _bits);
+unsigned ec_decode_bin(ec_dec *_this, unsigned _bits);
 
 /*Advance the decoder past the next symbol using the frequency information the
    symbol was encoded with.
-  Exactly one call to ec_decode() must have been made so that all necessary
+   Exactly one call to ec_decode() must have been made so that all necessary
    intermediate calculations are performed.
-  _fl:  The cumulative frequency of all symbols that come before the symbol
+   _fl:  The cumulative frequency of all symbols that come before the symbol
          decoded.
-  _fh:  The cumulative frequency of all symbols up to and including the symbol
+   _fh:  The cumulative frequency of all symbols up to and including the symbol
          decoded.
         Together with _fl, this defines the range [_fl,_fh) in which the value
          returned above must fall.
-  _ft:  The total frequency of the symbols in the alphabet the symbol decoded
+   _ft:  The total frequency of the symbols in the alphabet the symbol decoded
          was encoded in.
         This must be the same as passed to the preceding call to ec_decode().*/
-void ec_dec_update(ec_dec *_this,unsigned _fl,unsigned _fh,unsigned _ft);
+void ec_dec_update(ec_dec *_this, unsigned _fl, unsigned _fh, unsigned _ft);
 
 /* Decode a bit that has a 1/(1<<_logp) probability of being a one */
-int ec_dec_bit_logp(ec_dec *_this,unsigned _logp);
+int ec_dec_bit_logp(ec_dec *_this, unsigned _logp);
 
 /*Decodes a symbol given an "inverse" CDF table.
-  No call to ec_dec_update() is necessary after this call.
-  _icdf: The "inverse" CDF, such that symbol s falls in the range
+   No call to ec_dec_update() is necessary after this call.
+   _icdf: The "inverse" CDF, such that symbol s falls in the range
           [s>0?ft-_icdf[s-1]:0,ft-_icdf[s]), where ft=1<<_ftb.
          The values must be monotonically non-increasing, and the last value
           must be 0.
-  _ftb: The number of bits of precision in the cumulative distribution.
-  Return: The decoded symbol s.*/
-int ec_dec_icdf(ec_dec *_this,const unsigned char *_icdf,unsigned _ftb);
+   _ftb: The number of bits of precision in the cumulative distribution.
+   Return: The decoded symbol s.*/
+int ec_dec_icdf(ec_dec *_this, const unsigned char *_icdf, unsigned _ftb);
 
 /*Decodes a symbol given an "inverse" CDF table.
-  No call to ec_dec_update() is necessary after this call.
-  _icdf: The "inverse" CDF, such that symbol s falls in the range
+   No call to ec_dec_update() is necessary after this call.
+   _icdf: The "inverse" CDF, such that symbol s falls in the range
           [s>0?ft-_icdf[s-1]:0,ft-_icdf[s]), where ft=1<<_ftb.
          The values must be monotonically non-increasing, and the last value
           must be 0.
-  _ftb: The number of bits of precision in the cumulative distribution.
-  Return: The decoded symbol s.*/
-int ec_dec_icdf16(ec_dec *_this,const oac_uint16 *_icdf,unsigned _ftb);
+   _ftb: The number of bits of precision in the cumulative distribution.
+   Return: The decoded symbol s.*/
+int ec_dec_icdf16(ec_dec *_this, const oac_uint16 *_icdf, unsigned _ftb);
 
 /*Extracts a raw unsigned integer with a non-power-of-2 range from the stream.
-  The bits must have been encoded with ec_enc_uint().
-  No call to ec_dec_update() is necessary after this call.
-  _ft: The number of integers that can be decoded (one more than the max).
+   The bits must have been encoded with ec_enc_uint().
+   No call to ec_dec_update() is necessary after this call.
+   _ft: The number of integers that can be decoded (one more than the max).
        This must be at least 2, and no more than 2**32-1.
-  Return: The decoded bits.*/
-oac_uint32 ec_dec_uint(ec_dec *_this,oac_uint32 _ft);
+   Return: The decoded bits.*/
+oac_uint32 ec_dec_uint(ec_dec *_this, oac_uint32 _ft);
 
 /*Extracts a sequence of raw bits from the stream.
-  The bits must have been encoded with ec_enc_bits().
-  No call to ec_dec_update() is necessary after this call.
-  _ftb: The number of bits to extract.
+   The bits must have been encoded with ec_enc_bits().
+   No call to ec_dec_update() is necessary after this call.
+   _ftb: The number of bits to extract.
         This must be between 0 and 25, inclusive.
-  Return: The decoded bits.*/
-oac_uint32 ec_dec_bits(ec_dec *_this,unsigned _ftb);
+   Return: The decoded bits.*/
+oac_uint32 ec_dec_bits(ec_dec *_this, unsigned _ftb);
 
 #endif
diff --git a/celt/entenc.c b/celt/entenc.c
index da69c3c0b..ef48761ab 100644
--- a/celt/entenc.c
+++ b/celt/entenc.c
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #if defined(HAVE_CONFIG_H)
 # include "config.h"
@@ -34,9 +34,9 @@
 #include "mfrngcod.h"
 
 /*A range encoder.
-  See entdec.c and the references for implementation details \cite{Mar79,MNW98}.
+   See entdec.c and the references for implementation details \cite{Mar79,MNW98}.
 
-  @INPROCEEDINGS{Mar79,
+   @INPROCEEDINGS{Mar79,
    author="Martin, G.N.N.",
    title="Range encoding: an algorithm for removing redundancy from a digitised
     message",
@@ -44,8 +44,8 @@
    year=1979,
    address="Southampton",
    month=Jul
-  }
-  @ARTICLE{MNW98,
+   }
+   @ARTICLE{MNW98,
    author="Alistair Moffat and Radford Neal and Ian H. Witten",
    title="Arithmetic Coding Revisited",
    journal="{ACM} Transactions on Information Systems",
@@ -55,251 +55,242 @@
    pages="256--294",
    month=Jul,
    URL="http://www.stanford.edu/class/ee398/handouts/papers/Moffat98ArithmCoding.pdf"
-  }*/
+   }*/
 
-static int ec_write_byte(ec_enc *_this,unsigned _value){
-  if(_this->offs+_this->end_offs>=_this->storage)return -1;
-  _this->buf[_this->offs++]=(unsigned char)_value;
-  return 0;
+static int ec_write_byte(ec_enc *_this, unsigned _value) {
+    if (_this->offs + _this->end_offs >= _this->storage) return -1;
+    _this->buf[_this->offs++] = (unsigned char)_value;
+    return 0;
 }
 
-static int ec_write_byte_at_end(ec_enc *_this,unsigned _value){
-  if(_this->offs+_this->end_offs>=_this->storage)return -1;
-  _this->buf[_this->storage-++(_this->end_offs)]=(unsigned char)_value;
-  return 0;
+static int ec_write_byte_at_end(ec_enc *_this, unsigned _value) {
+    if (_this->offs + _this->end_offs >= _this->storage) return -1;
+    _this->buf[_this->storage - ++(_this->end_offs)] = (unsigned char)_value;
+    return 0;
 }
 
 /*Outputs a symbol, with a carry bit.
-  If there is a potential to propagate a carry over several symbols, they are
+   If there is a potential to propagate a carry over several symbols, they are
    buffered until it can be determined whether or not an actual carry will
    occur.
-  If the counter for the buffered symbols overflows, then the stream becomes
+   If the counter for the buffered symbols overflows, then the stream becomes
    undecodable.
-  This gives a theoretical limit of a few billion symbols in a single packet on
+   This gives a theoretical limit of a few billion symbols in a single packet on
    32-bit systems.
-  The alternative is to truncate the range in order to force a carry, but
+   The alternative is to truncate the range in order to force a carry, but
    requires similar carry tracking in the decoder, needlessly slowing it down.*/
-static void ec_enc_carry_out(ec_enc *_this,int _c){
-  if(_c!=EC_SYM_MAX){
-    /*No further carry propagation possible, flush buffer.*/
-    int carry;
-    carry=_c>>EC_SYM_BITS;
-    /*Don't output a byte on the first write.
-      This compare should be taken care of by branch-prediction thereafter.*/
-    if(_this->rem>=0)_this->error|=ec_write_byte(_this,_this->rem+carry);
-    if(_this->ext>0){
-      unsigned sym;
-      sym=(EC_SYM_MAX+carry)&EC_SYM_MAX;
-      do _this->error|=ec_write_byte(_this,sym);
-      while(--(_this->ext)>0);
-    }
-    _this->rem=_c&EC_SYM_MAX;
-  }
-  else _this->ext++;
+static void ec_enc_carry_out(ec_enc *_this, int _c) {
+    if (_c != EC_SYM_MAX) {
+        /*No further carry propagation possible, flush buffer.*/
+        int carry;
+        carry = _c>>EC_SYM_BITS;
+        /*Don't output a byte on the first write.
+           This compare should be taken care of by branch-prediction thereafter.*/
+        if (_this->rem >= 0) _this->error |= ec_write_byte(_this, _this->rem + carry);
+        if (_this->ext > 0) {
+            unsigned sym;
+            sym = (EC_SYM_MAX + carry)&EC_SYM_MAX;
+            do _this->error |= ec_write_byte(_this, sym);
+            while (--(_this->ext) > 0);
+        }
+        _this->rem = _c&EC_SYM_MAX;
+    } else _this->ext++;
 }
 
-static OAC_INLINE void ec_enc_normalize(ec_enc *_this){
-  /*If the range is too small, output some bits and rescale it.*/
-  while(_this->rng<=EC_CODE_BOT){
-    ec_enc_carry_out(_this,(int)(_this->val>>EC_CODE_SHIFT));
-    /*Move the next-to-high-order symbol into the high-order position.*/
-    _this->val=(_this->val<<EC_SYM_BITS)&(EC_CODE_TOP-1);
-    _this->rng<<=EC_SYM_BITS;
-    _this->nbits_total+=EC_SYM_BITS;
-  }
+static OAC_INLINE void ec_enc_normalize(ec_enc *_this) {
+    /*If the range is too small, output some bits and rescale it.*/
+    while (_this->rng <= EC_CODE_BOT) {
+        ec_enc_carry_out(_this, (int)(_this->val>>EC_CODE_SHIFT));
+        /*Move the next-to-high-order symbol into the high-order position.*/
+        _this->val = (_this->val<<EC_SYM_BITS)&(EC_CODE_TOP - 1);
+        _this->rng <<= EC_SYM_BITS;
+        _this->nbits_total += EC_SYM_BITS;
+    }
 }
 
-void ec_enc_init(ec_enc *_this,unsigned char *_buf,oac_uint32 _size){
-  _this->buf=_buf;
-  _this->end_offs=0;
-  _this->end_window=0;
-  _this->nend_bits=0;
-  /*This is the offset from which ec_tell() will subtract partial bits.*/
-  _this->nbits_total=EC_CODE_BITS+1;
-  _this->offs=0;
-  _this->rng=EC_CODE_TOP;
-  _this->rem=-1;
-  _this->val=0;
-  _this->ext=0;
-  _this->storage=_size;
-  _this->error=0;
+void ec_enc_init(ec_enc *_this, unsigned char *_buf, oac_uint32 _size) {
+    _this->buf = _buf;
+    _this->end_offs = 0;
+    _this->end_window = 0;
+    _this->nend_bits = 0;
+    /*This is the offset from which ec_tell() will subtract partial bits.*/
+    _this->nbits_total = EC_CODE_BITS + 1;
+    _this->offs = 0;
+    _this->rng = EC_CODE_TOP;
+    _this->rem = -1;
+    _this->val = 0;
+    _this->ext = 0;
+    _this->storage = _size;
+    _this->error = 0;
 }
 
-void ec_encode(ec_enc *_this,unsigned _fl,unsigned _fh,unsigned _ft){
-  oac_uint32 r;
-  r=celt_udiv(_this->rng,_ft);
-  if(_fl>0){
-    _this->val+=_this->rng-IMUL32(r,(_ft-_fl));
-    _this->rng=IMUL32(r,(_fh-_fl));
-  }
-  else _this->rng-=IMUL32(r,(_ft-_fh));
-  ec_enc_normalize(_this);
+void ec_encode(ec_enc *_this, unsigned _fl, unsigned _fh, unsigned _ft) {
+    oac_uint32 r;
+    r = celt_udiv(_this->rng, _ft);
+    if (_fl > 0) {
+        _this->val += _this->rng - IMUL32(r, (_ft - _fl));
+        _this->rng = IMUL32(r, (_fh - _fl));
+    } else _this->rng -= IMUL32(r, (_ft - _fh));
+    ec_enc_normalize(_this);
 }
 
-void ec_encode_bin(ec_enc *_this,unsigned _fl,unsigned _fh,unsigned _bits){
-  oac_uint32 r;
-  r=_this->rng>>_bits;
-  if(_fl>0){
-    _this->val+=_this->rng-IMUL32(r,((1U<<_bits)-_fl));
-    _this->rng=IMUL32(r,(_fh-_fl));
-  }
-  else _this->rng-=IMUL32(r,((1U<<_bits)-_fh));
-  ec_enc_normalize(_this);
+void ec_encode_bin(ec_enc *_this, unsigned _fl, unsigned _fh, unsigned _bits) {
+    oac_uint32 r;
+    r = _this->rng>>_bits;
+    if (_fl > 0) {
+        _this->val += _this->rng - IMUL32(r, ((1U<<_bits) - _fl));
+        _this->rng = IMUL32(r, (_fh - _fl));
+    } else _this->rng -= IMUL32(r, ((1U<<_bits) - _fh));
+    ec_enc_normalize(_this);
 }
 
 /*The probability of having a "one" is 1/(1<<_logp).*/
-void ec_enc_bit_logp(ec_enc *_this,int _val,unsigned _logp){
-  oac_uint32 r;
-  oac_uint32 s;
-  oac_uint32 l;
-  r=_this->rng;
-  l=_this->val;
-  s=r>>_logp;
-  r-=s;
-  if(_val)_this->val=l+r;
-  _this->rng=_val?s:r;
-  ec_enc_normalize(_this);
+void ec_enc_bit_logp(ec_enc *_this, int _val, unsigned _logp) {
+    oac_uint32 r;
+    oac_uint32 s;
+    oac_uint32 l;
+    r = _this->rng;
+    l = _this->val;
+    s = r>>_logp;
+    r -= s;
+    if (_val) _this->val = l + r;
+    _this->rng = _val?s:r;
+    ec_enc_normalize(_this);
 }
 
-void ec_enc_icdf(ec_enc *_this,int _s,const unsigned char *_icdf,unsigned _ftb){
-  oac_uint32 r;
-  r=_this->rng>>_ftb;
-  if(_s>0){
-    _this->val+=_this->rng-IMUL32(r,_icdf[_s-1]);
-    _this->rng=IMUL32(r,_icdf[_s-1]-_icdf[_s]);
-  }
-  else _this->rng-=IMUL32(r,_icdf[_s]);
-  ec_enc_normalize(_this);
+void ec_enc_icdf(ec_enc *_this, int _s, const unsigned char *_icdf, unsigned _ftb) {
+    oac_uint32 r;
+    r = _this->rng>>_ftb;
+    if (_s > 0) {
+        _this->val += _this->rng - IMUL32(r, _icdf[_s - 1]);
+        _this->rng = IMUL32(r, _icdf[_s - 1] - _icdf[_s]);
+    } else _this->rng -= IMUL32(r, _icdf[_s]);
+    ec_enc_normalize(_this);
 }
 
-void ec_enc_icdf16(ec_enc *_this,int _s,const oac_uint16 *_icdf,unsigned _ftb){
-  oac_uint32 r;
-  r=_this->rng>>_ftb;
-  if(_s>0){
-    _this->val+=_this->rng-IMUL32(r,_icdf[_s-1]);
-    _this->rng=IMUL32(r,_icdf[_s-1]-_icdf[_s]);
-  }
-  else _this->rng-=IMUL32(r,_icdf[_s]);
-  ec_enc_normalize(_this);
+void ec_enc_icdf16(ec_enc *_this, int _s, const oac_uint16 *_icdf, unsigned _ftb) {
+    oac_uint32 r;
+    r = _this->rng>>_ftb;
+    if (_s > 0) {
+        _this->val += _this->rng - IMUL32(r, _icdf[_s - 1]);
+        _this->rng = IMUL32(r, _icdf[_s - 1] - _icdf[_s]);
+    } else _this->rng -= IMUL32(r, _icdf[_s]);
+    ec_enc_normalize(_this);
 }
 
-void ec_enc_uint(ec_enc *_this,oac_uint32 _fl,oac_uint32 _ft){
-  unsigned  ft;
-  unsigned  fl;
-  int       ftb;
-  /*In order to optimize EC_ILOG(), it is undefined for the value 0.*/
-  celt_assert(_ft>1);
-  _ft--;
-  ftb=EC_ILOG(_ft);
-  if(ftb>EC_UINT_BITS){
-    ftb-=EC_UINT_BITS;
-    ft=(_ft>>ftb)+1;
-    fl=(unsigned)(_fl>>ftb);
-    ec_encode(_this,fl,fl+1,ft);
-    ec_enc_bits(_this,_fl&(((oac_uint32)1<<ftb)-1U),ftb);
-  }
-  else ec_encode(_this,_fl,_fl+1,_ft+1);
+void ec_enc_uint(ec_enc *_this, oac_uint32 _fl, oac_uint32 _ft) {
+    unsigned ft;
+    unsigned fl;
+    int ftb;
+    /*In order to optimize EC_ILOG(), it is undefined for the value 0.*/
+    celt_assert(_ft > 1);
+    _ft--;
+    ftb = EC_ILOG(_ft);
+    if (ftb > EC_UINT_BITS) {
+        ftb -= EC_UINT_BITS;
+        ft = (_ft>>ftb) + 1;
+        fl = (unsigned)(_fl>>ftb);
+        ec_encode(_this, fl, fl + 1, ft);
+        ec_enc_bits(_this, _fl&(((oac_uint32)1<<ftb) - 1U), ftb);
+    } else ec_encode(_this, _fl, _fl + 1, _ft + 1);
 }
 
-void ec_enc_bits(ec_enc *_this,oac_uint32 _fl,unsigned _bits){
-  ec_window window;
-  int       used;
-  window=_this->end_window;
-  used=_this->nend_bits;
-  celt_assert(_bits>0);
-  if(used+_bits>EC_WINDOW_SIZE){
-    do{
-      _this->error|=ec_write_byte_at_end(_this,(unsigned)window&EC_SYM_MAX);
-      window>>=EC_SYM_BITS;
-      used-=EC_SYM_BITS;
+void ec_enc_bits(ec_enc *_this, oac_uint32 _fl, unsigned _bits) {
+    ec_window window;
+    int used;
+    window = _this->end_window;
+    used = _this->nend_bits;
+    celt_assert(_bits > 0);
+    if (used + _bits > EC_WINDOW_SIZE) {
+        do {
+            _this->error |= ec_write_byte_at_end(_this, (unsigned)window&EC_SYM_MAX);
+            window >>= EC_SYM_BITS;
+            used -= EC_SYM_BITS;
+        } while (used >= EC_SYM_BITS);
     }
-    while(used>=EC_SYM_BITS);
-  }
-  window|=(ec_window)_fl<<used;
-  used+=_bits;
-  _this->end_window=window;
-  _this->nend_bits=used;
-  _this->nbits_total+=_bits;
+    window |= (ec_window)_fl<<used;
+    used += _bits;
+    _this->end_window = window;
+    _this->nend_bits = used;
+    _this->nbits_total += _bits;
 }
 
-void ec_enc_patch_initial_bits(ec_enc *_this,unsigned _val,unsigned _nbits){
-  int      shift;
-  unsigned mask;
-  celt_assert(_nbits<=EC_SYM_BITS);
-  shift=EC_SYM_BITS-_nbits;
-  mask=((1<<_nbits)-1)<<shift;
-  if(_this->offs>0){
-    /*The first byte has been finalized.*/
-    _this->buf[0]=(unsigned char)((_this->buf[0]&~mask)|_val<<shift);
-  }
-  else if(_this->rem>=0){
-    /*The first byte is still awaiting carry propagation.*/
-    _this->rem=(_this->rem&~mask)|_val<<shift;
-  }
-  else if(_this->rng<=(EC_CODE_TOP>>_nbits)){
-    /*The renormalization loop has never been run.*/
-    _this->val=(_this->val&~((oac_uint32)mask<<EC_CODE_SHIFT))|
-     (oac_uint32)_val<<(EC_CODE_SHIFT+shift);
-  }
-  /*The encoder hasn't even encoded _nbits of data yet.*/
-  else _this->error=-1;
+void ec_enc_patch_initial_bits(ec_enc *_this, unsigned _val, unsigned _nbits) {
+    int shift;
+    unsigned mask;
+    celt_assert(_nbits <= EC_SYM_BITS);
+    shift = EC_SYM_BITS - _nbits;
+    mask = ((1<<_nbits) - 1)<<shift;
+    if (_this->offs > 0) {
+        /*The first byte has been finalized.*/
+        _this->buf[0] = (unsigned char)((_this->buf[0]&~mask)|_val<<shift);
+    } else if (_this->rem >= 0)      {
+        /*The first byte is still awaiting carry propagation.*/
+        _this->rem = (_this->rem&~mask)|_val<<shift;
+    } else if (_this->rng <= (EC_CODE_TOP>>_nbits))      {
+        /*The renormalization loop has never been run.*/
+        _this->val = (_this->val&~((oac_uint32)mask<<EC_CODE_SHIFT))
+                     |(oac_uint32)_val<<(EC_CODE_SHIFT + shift);
+    }
+    /*The encoder hasn't even encoded _nbits of data yet.*/
+    else _this->error = -1;
 }
 
-void ec_enc_shrink(ec_enc *_this,oac_uint32 _size){
-  celt_assert(_this->offs+_this->end_offs<=_size);
-  OAC_MOVE(_this->buf+_size-_this->end_offs,
-   _this->buf+_this->storage-_this->end_offs,_this->end_offs);
-  _this->storage=_size;
+void ec_enc_shrink(ec_enc *_this, oac_uint32 _size) {
+    celt_assert(_this->offs + _this->end_offs <= _size);
+    OAC_MOVE(_this->buf + _size - _this->end_offs,
+   _this->buf + _this->storage - _this->end_offs, _this->end_offs);
+    _this->storage = _size;
 }
 
-void ec_enc_done(ec_enc *_this){
-  ec_window   window;
-  int         used;
-  oac_uint32 msk;
-  oac_uint32 end;
-  int         l;
-  /*We output the minimum number of bits that ensures that the symbols encoded
-     thus far will be decoded correctly regardless of the bits that follow.*/
-  l=EC_CODE_BITS-EC_ILOG(_this->rng);
-  msk=(EC_CODE_TOP-1)>>l;
-  end=(_this->val+msk)&~msk;
-  if((end|msk)>=_this->val+_this->rng){
-    l++;
-    msk>>=1;
-    end=(_this->val+msk)&~msk;
-  }
-  while(l>0){
-    ec_enc_carry_out(_this,(int)(end>>EC_CODE_SHIFT));
-    end=(end<<EC_SYM_BITS)&(EC_CODE_TOP-1);
-    l-=EC_SYM_BITS;
-  }
-  /*If we have a buffered byte flush it into the output buffer.*/
-  if(_this->rem>=0||_this->ext>0)ec_enc_carry_out(_this,0);
-  /*If we have buffered extra bits, flush them as well.*/
-  window=_this->end_window;
-  used=_this->nend_bits;
-  while(used>=EC_SYM_BITS){
-    _this->error|=ec_write_byte_at_end(_this,(unsigned)window&EC_SYM_MAX);
-    window>>=EC_SYM_BITS;
-    used-=EC_SYM_BITS;
-  }
-  /*Clear any excess space and add any remaining extra bits to the last byte.*/
-  if(!_this->error){
-    if (_this->buf) OAC_CLEAR(_this->buf+_this->offs,
-     _this->storage-_this->offs-_this->end_offs);
-    if(used>0){
-      /*If there's no range coder data at all, give up.*/
-      if(_this->end_offs>=_this->storage)_this->error=-1;
-      else{
-        l=-l;
-        /*If we've busted, don't add too many extra bits to the last byte; it
-           would corrupt the range coder data, and that's more important.*/
-        if(_this->offs+_this->end_offs>=_this->storage&&l<used){
-          window&=(1<<l)-1;
-          _this->error=-1;
+void ec_enc_done(ec_enc *_this) {
+    ec_window window;
+    int used;
+    oac_uint32 msk;
+    oac_uint32 end;
+    int l;
+    /*We output the minimum number of bits that ensures that the symbols encoded
+       thus far will be decoded correctly regardless of the bits that follow.*/
+    l = EC_CODE_BITS - EC_ILOG(_this->rng);
+    msk = (EC_CODE_TOP - 1)>>l;
+    end = (_this->val + msk)&~msk;
+    if ((end|msk) >= _this->val + _this->rng) {
+        l++;
+        msk >>= 1;
+        end = (_this->val + msk)&~msk;
+    }
+    while (l > 0) {
+        ec_enc_carry_out(_this, (int)(end>>EC_CODE_SHIFT));
+        end = (end<<EC_SYM_BITS)&(EC_CODE_TOP - 1);
+        l -= EC_SYM_BITS;
+    }
+    /*If we have a buffered byte flush it into the output buffer.*/
+    if (_this->rem >= 0 || _this->ext > 0) ec_enc_carry_out(_this, 0);
+    /*If we have buffered extra bits, flush them as well.*/
+    window = _this->end_window;
+    used = _this->nend_bits;
+    while (used >= EC_SYM_BITS) {
+        _this->error |= ec_write_byte_at_end(_this, (unsigned)window&EC_SYM_MAX);
+        window >>= EC_SYM_BITS;
+        used -= EC_SYM_BITS;
+    }
+    /*Clear any excess space and add any remaining extra bits to the last byte.*/
+    if (!_this->error) {
+        if (_this->buf) OAC_CLEAR(_this->buf + _this->offs,
+     _this->storage - _this->offs - _this->end_offs);
+        if (used > 0) {
+            /*If there's no range coder data at all, give up.*/
+            if (_this->end_offs >= _this->storage) _this->error = -1;
+            else {
+                l = -l;
+                /*If we've busted, don't add too many extra bits to the last byte; it
+                   would corrupt the range coder data, and that's more important.*/
+                if (_this->offs + _this->end_offs >= _this->storage && l < used) {
+                    window &= (1<<l) - 1;
+                    _this->error = -1;
+                }
+                _this->buf[_this->storage - _this->end_offs - 1] |= (unsigned char)window;
+            }
         }
-        _this->buf[_this->storage-_this->end_offs-1]|=(unsigned char)window;
-      }
     }
-  }
 }
diff --git a/celt/entenc.h b/celt/entenc.h
index 2937e63d5..60a13e4a0 100644
--- a/celt/entenc.h
+++ b/celt/entenc.h
@@ -23,97 +23,97 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #if !defined(_entenc_H)
-# define _entenc_H (1)
-# include <stddef.h>
-# include "entcode.h"
+#define _entenc_H (1)
+#include <stddef.h>
+#include "entcode.h"
 
 /*Initializes the encoder.
-  _buf:  The buffer to store output bytes in.
-  _size: The size of the buffer, in chars.*/
-void ec_enc_init(ec_enc *_this,unsigned char *_buf,oac_uint32 _size);
+   _buf:  The buffer to store output bytes in.
+   _size: The size of the buffer, in chars.*/
+void ec_enc_init(ec_enc *_this, unsigned char *_buf, oac_uint32 _size);
 /*Encodes a symbol given its frequency information.
-  The frequency information must be discernible by the decoder, assuming it
+   The frequency information must be discernible by the decoder, assuming it
    has read only the previous symbols from the stream.
-  It is allowable to change the frequency information, or even the entire
+   It is allowable to change the frequency information, or even the entire
    source alphabet, so long as the decoder can tell from the context of the
    previously encoded information that it is supposed to do so as well.
-  _fl: The cumulative frequency of all symbols that come before the one to be
+   _fl: The cumulative frequency of all symbols that come before the one to be
         encoded.
-  _fh: The cumulative frequency of all symbols up to and including the one to
+   _fh: The cumulative frequency of all symbols up to and including the one to
         be encoded.
        Together with _fl, this defines the range [_fl,_fh) in which the
         decoded value will fall.
-  _ft: The sum of the frequencies of all the symbols*/
-void ec_encode(ec_enc *_this,unsigned _fl,unsigned _fh,unsigned _ft);
+   _ft: The sum of the frequencies of all the symbols*/
+void ec_encode(ec_enc *_this, unsigned _fl, unsigned _fh, unsigned _ft);
 
 /*Equivalent to ec_encode() with _ft==1<<_bits.*/
-void ec_encode_bin(ec_enc *_this,unsigned _fl,unsigned _fh,unsigned _bits);
+void ec_encode_bin(ec_enc *_this, unsigned _fl, unsigned _fh, unsigned _bits);
 
 /* Encode a bit that has a 1/(1<<_logp) probability of being a one */
-void ec_enc_bit_logp(ec_enc *_this,int _val,unsigned _logp);
+void ec_enc_bit_logp(ec_enc *_this, int _val, unsigned _logp);
 
 /*Encodes a symbol given an "inverse" CDF table.
-  _s:    The index of the symbol to encode.
-  _icdf: The "inverse" CDF, such that symbol _s falls in the range
+   _s:    The index of the symbol to encode.
+   _icdf: The "inverse" CDF, such that symbol _s falls in the range
           [_s>0?ft-_icdf[_s-1]:0,ft-_icdf[_s]), where ft=1<<_ftb.
          The values must be monotonically non-increasing, and the last value
           must be 0.
-  _ftb: The number of bits of precision in the cumulative distribution.*/
-void ec_enc_icdf(ec_enc *_this,int _s,const unsigned char *_icdf,unsigned _ftb);
+   _ftb: The number of bits of precision in the cumulative distribution.*/
+void ec_enc_icdf(ec_enc *_this, int _s, const unsigned char *_icdf, unsigned _ftb);
 
 /*Encodes a symbol given an "inverse" CDF table.
-  _s:    The index of the symbol to encode.
-  _icdf: The "inverse" CDF, such that symbol _s falls in the range
+   _s:    The index of the symbol to encode.
+   _icdf: The "inverse" CDF, such that symbol _s falls in the range
           [_s>0?ft-_icdf[_s-1]:0,ft-_icdf[_s]), where ft=1<<_ftb.
          The values must be monotonically non-increasing, and the last value
           must be 0.
-  _ftb: The number of bits of precision in the cumulative distribution.*/
-void ec_enc_icdf16(ec_enc *_this,int _s,const oac_uint16 *_icdf,unsigned _ftb);
+   _ftb: The number of bits of precision in the cumulative distribution.*/
+void ec_enc_icdf16(ec_enc *_this, int _s, const oac_uint16 *_icdf, unsigned _ftb);
 
 /*Encodes a raw unsigned integer in the stream.
-  _fl: The integer to encode.
-  _ft: The number of integers that can be encoded (one more than the max).
+   _fl: The integer to encode.
+   _ft: The number of integers that can be encoded (one more than the max).
        This must be at least 2, and no more than 2**32-1.*/
-void ec_enc_uint(ec_enc *_this,oac_uint32 _fl,oac_uint32 _ft);
+void ec_enc_uint(ec_enc *_this, oac_uint32 _fl, oac_uint32 _ft);
 
 /*Encodes a sequence of raw bits in the stream.
-  _fl:  The bits to encode.
-  _ftb: The number of bits to encode.
+   _fl:  The bits to encode.
+   _ftb: The number of bits to encode.
         This must be between 1 and 25, inclusive.*/
-void ec_enc_bits(ec_enc *_this,oac_uint32 _fl,unsigned _ftb);
+void ec_enc_bits(ec_enc *_this, oac_uint32 _fl, unsigned _ftb);
 
 /*Overwrites a few bits at the very start of an existing stream, after they
    have already been encoded.
-  This makes it possible to have a few flags up front, where it is easy for
+   This makes it possible to have a few flags up front, where it is easy for
    decoders to access them without parsing the whole stream, even if their
    values are not determined until late in the encoding process, without having
    to buffer all the intermediate symbols in the encoder.
-  In order for this to work, at least _nbits bits must have already been
+   In order for this to work, at least _nbits bits must have already been
    encoded using probabilities that are an exact power of two.
-  The encoder can verify the number of encoded bits is sufficient, but cannot
+   The encoder can verify the number of encoded bits is sufficient, but cannot
    check this latter condition.
-  _val:   The bits to encode (in the least _nbits significant bits).
+   _val:   The bits to encode (in the least _nbits significant bits).
           They will be decoded in order from most-significant to least.
-  _nbits: The number of bits to overwrite.
+   _nbits: The number of bits to overwrite.
           This must be no more than 8.*/
-void ec_enc_patch_initial_bits(ec_enc *_this,unsigned _val,unsigned _nbits);
+void ec_enc_patch_initial_bits(ec_enc *_this, unsigned _val, unsigned _nbits);
 
 /*Compacts the data to fit in the target size.
-  This moves up the raw bits at the end of the current buffer so they are at
+   This moves up the raw bits at the end of the current buffer so they are at
    the end of the new buffer size.
-  The caller must ensure that the amount of data that's already been written
+   The caller must ensure that the amount of data that's already been written
    will fit in the new size.
-  _size: The number of bytes in the new buffer.
+   _size: The number of bytes in the new buffer.
          This must be large enough to contain the bits already written, and
           must be no larger than the existing size.*/
-void ec_enc_shrink(ec_enc *_this,oac_uint32 _size);
+void ec_enc_shrink(ec_enc *_this, oac_uint32 _size);
 
 /*Indicates that there are no more symbols to encode.
-  All remaining output bytes are flushed to the output buffer.
-  ec_enc_init() must be called before the encoder can be used again.*/
+   All remaining output bytes are flushed to the output buffer.
+   ec_enc_init() must be called before the encoder can be used again.*/
 void ec_enc_done(ec_enc *_this);
 
 #endif
diff --git a/celt/fixed_c5x.h b/celt/fixed_c5x.h
index a7df95866..b4787e944 100644
--- a/celt/fixed_c5x.h
+++ b/celt/fixed_c5x.h
@@ -2,7 +2,7 @@
 /**
    @file fixed_c5x.h
    @brief Fixed-point operations for the TI C5x DSP family
-*/
+ */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
@@ -26,7 +26,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef FIXED_C5X_H
 #define FIXED_C5X_H
@@ -34,46 +34,45 @@
 #include "dsplib.h"
 
 #undef IMUL32
-static OAC_INLINE long IMUL32(long i, long j)
-{
-   long ac0, ac1;
-   ac0 = _lmpy(i>>16,j);
-   ac1 = ac0 + _lmpy(i,j>>16);
-   return _lmpyu(i,j) + (ac1<<16);
+static OAC_INLINE long IMUL32(long i, long j) {
+    long ac0, ac1;
+    ac0 = _lmpy(i>>16, j);
+    ac1 = ac0 + _lmpy(i, j>>16);
+    return _lmpyu(i, j) + (ac1<<16);
 }
 
 #undef MAX16
-#define MAX16(a,b) _max(a,b)
+#define MAX16(a, b) _max(a, b)
 
 #undef MIN16
-#define MIN16(a,b) _min(a,b)
+#define MIN16(a, b) _min(a, b)
 
 #undef MAX32
-#define MAX32(a,b) _lmax(a,b)
+#define MAX32(a, b) _lmax(a, b)
 
 #undef MIN32
-#define MIN32(a,b) _lmin(a,b)
+#define MIN32(a, b) _lmin(a, b)
 
 #undef VSHR32
-#define VSHR32(a, shift) _lshl(a,-(shift))
+#define VSHR32(a, shift) _lshl(a, -(shift))
 
 #undef MULT16_16_Q15
-#define MULT16_16_Q15(a,b) (_smpy(a,b))
+#define MULT16_16_Q15(a, b) (_smpy(a, b))
 
 #undef MULT16_16SU
-#define MULT16_16SU(a,b) _lmpysu(a,b)
+#define MULT16_16SU(a, b) _lmpysu(a, b)
 
 #undef MULT_16_16
-#define MULT_16_16(a,b) _lmpy(a,b)
+#define MULT_16_16(a, b) _lmpy(a, b)
 
 /* FIXME: This is technically incorrect and is bound to cause problems. Is there any cleaner solution? */
 #undef MULT16_32_Q15
-#define MULT16_32_Q15(a,b) ADD32(SHL(MULT16_16((a),SHR((b),16)),1), SHR(MULT16_16SU((a),(b)),15))
+#define MULT16_32_Q15(a, b) ADD32(SHL(MULT16_16((a), SHR((b), 16)), 1), SHR(MULT16_16SU((a), (b)), 15))
 
 #define celt_ilog2(x) (30 - _lnorm(x))
 #define OVERRIDE_CELT_ILOG2
 
-#define celt_maxabs16(x, len) MAX32(EXTEND32(maxval((DATA *)x, len)),-EXTEND32(minval((DATA *)x, len)))
+#define celt_maxabs16(x, len) MAX32(EXTEND32(maxval((DATA *)x, len)), -EXTEND32(minval((DATA *)x, len)))
 #define OVERRIDE_CELT_MAXABS16
 
 #endif /* FIXED_C5X_H */
diff --git a/celt/fixed_c6x.h b/celt/fixed_c6x.h
index bb6ad9278..c77b974a4 100644
--- a/celt/fixed_c6x.h
+++ b/celt/fixed_c6x.h
@@ -2,7 +2,7 @@
 /**
    @file fixed_c6x.h
    @brief Fixed-point operations for the TI C6x DSP family
-*/
+ */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
@@ -26,45 +26,45 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef FIXED_C6X_H
-#define FIXED_C6X_H
+# define FIXED_C6X_H
 
-#undef MULT16_16SU
-#define MULT16_16SU(a,b) _mpysu(a,b)
+# undef MULT16_16SU
+# define MULT16_16SU(a, b) _mpysu(a, b)
 
-#undef MULT_16_16
-#define MULT_16_16(a,b) _mpy(a,b)
+# undef MULT_16_16
+# define MULT_16_16(a, b) _mpy(a, b)
 
-#define celt_ilog2(x) (30 - _norm(x))
-#define OVERRIDE_CELT_ILOG2
+# define celt_ilog2(x) (30 - _norm(x))
+# define OVERRIDE_CELT_ILOG2
 
-#undef MULT16_32_Q15
-#define MULT16_32_Q15(a,b) (_mpylill(a, b) >> 15)
+# undef MULT16_32_Q15
+# define MULT16_32_Q15(a, b) (_mpylill(a, b)>>15)
 
-#if 0
-#include "dsplib.h"
+# if 0
+#  include "dsplib.h"
 
-#undef MAX16
-#define MAX16(a,b) _max(a,b)
+#  undef MAX16
+#  define MAX16(a, b) _max(a, b)
 
-#undef MIN16
-#define MIN16(a,b) _min(a,b)
+#  undef MIN16
+#  define MIN16(a, b) _min(a, b)
 
-#undef MAX32
-#define MAX32(a,b) _lmax(a,b)
+#  undef MAX32
+#  define MAX32(a, b) _lmax(a, b)
 
-#undef MIN32
-#define MIN32(a,b) _lmin(a,b)
+#  undef MIN32
+#  define MIN32(a, b) _lmin(a, b)
 
-#undef VSHR32
-#define VSHR32(a, shift) _lshl(a,-(shift))
+#  undef VSHR32
+#  define VSHR32(a, shift) _lshl(a, -(shift))
 
-#undef MULT16_16_Q15
-#define MULT16_16_Q15(a,b) (_smpy(a,b))
+#  undef MULT16_16_Q15
+#  define MULT16_16_Q15(a, b) (_smpy(a, b))
 
-#define celt_maxabs16(x, len) MAX32(EXTEND32(maxval((DATA *)x, len)),-EXTEND32(minval((DATA *)x, len)))
-#define OVERRIDE_CELT_MAXABS16
+#  define celt_maxabs16(x, len) MAX32(EXTEND32(maxval((DATA *)x, len)), -EXTEND32(minval((DATA *)x, len)))
+#  define OVERRIDE_CELT_MAXABS16
 
-#endif /* FIXED_C6X_H */
+# endif /* FIXED_C6X_H */
diff --git a/celt/fixed_debug.h b/celt/fixed_debug.h
index d2861549e..491fd3176 100644
--- a/celt/fixed_debug.h
+++ b/celt/fixed_debug.h
@@ -3,7 +3,7 @@
 /**
    @file fixed_debug.h
    @brief Fixed-point operations with debugging
-*/
+ */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
@@ -27,7 +27,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef FIXED_DEBUG_H
 #define FIXED_DEBUG_H
@@ -36,813 +36,739 @@
 #include "oac_defines.h"
 
 #ifdef CELT_C
-OAC_EXPORT oac_int64 celt_mips=0;
+OAC_EXPORT oac_int64 celt_mips = 0;
 #else
 extern oac_int64 celt_mips;
 #endif
 
-#define MULT16_16U(a,b) ((oac_uint32)(a)*(oac_uint32)(b))
-#define MULT16_16SU(a,b) ((oac_val32)(oac_val16)(a)*(oac_val32)(oac_uint16)(b))
-#define MULT32_32_Q31(a,b) ADD32(ADD32(SHL32(MULT16_16(SHR32((a),16),SHR((b),16)),1), SHR32(MULT16_16SU(SHR32((a),16),((b)&0x0000ffff)),15)), SHR32(MULT16_16SU(SHR32((b),16),((a)&0x0000ffff)),15))
-#define MULT32_32_P31(a,b) ADD32(SHL32(MULT16_16(SHR((a),16),SHR((b),16)),1), SHR32(128+(oac_int32)(MULT16_16U(((a)&0x0000ffff),((b)&0x0000ffff))>>(16+7)) + SHR32(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),7) + SHR32(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),7), 8) )
-#define MULT32_32_P31_ovflw(a,b) ADD32_ovflw(SHL32(MULT16_16(SHR((a),16),SHR((b),16)),1), SHR32(128+(oac_int32)(MULT16_16U(((a)&0x0000ffff),((b)&0x0000ffff))>>(16+7)) + SHR32(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),7) + SHR32(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),7), 8) )
-#define MULT32_32_Q32(a,b) ADD32(ADD32(MULT16_16(SHR((a),16),SHR((b),16)), SHR(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),16)), SHR(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),16))
+#define MULT16_16U(a, b) ((oac_uint32)(a)*(oac_uint32)(b))
+#define MULT16_16SU(a, b) ((oac_val32)(oac_val16)(a)*(oac_val32)(oac_uint16)(b))
+#define MULT32_32_Q31(a, \
+                      b) ADD32(ADD32(SHL32(MULT16_16(SHR32((a), 16), SHR((b), 16)), 1), \
+    SHR32(MULT16_16SU(SHR32((a), 16), ((b)&0x0000ffff)), 15)), SHR32(MULT16_16SU(SHR32((b), 16), ((a)&0x0000ffff)), 15))
+#define MULT32_32_P31(a, b) ADD32(SHL32(MULT16_16(SHR((a), 16), SHR((b), 16)), 1), \
+    SHR32(128 + (oac_int32)(MULT16_16U(((a)&0x0000ffff), ((b)&0x0000ffff))>>(16 + 7)) + SHR32(MULT16_16SU(SHR((a), 16), \
+    ((b)&0x0000ffff)), 7) + SHR32(MULT16_16SU(SHR((b), 16), ((a)&0x0000ffff)), 7), 8))
+#define MULT32_32_P31_ovflw(a, b) ADD32_ovflw(SHL32(MULT16_16(SHR((a), 16), SHR((b), 16)), 1), \
+    SHR32(128 + (oac_int32)(MULT16_16U(((a)&0x0000ffff), ((b)&0x0000ffff))>>(16 + 7)) + SHR32(MULT16_16SU(SHR((a), 16), \
+    ((b)&0x0000ffff)), 7) + SHR32(MULT16_16SU(SHR((b), 16), ((a)&0x0000ffff)), 7), 8))
+#define MULT32_32_Q32(a, \
+                      b) ADD32(ADD32(MULT16_16(SHR((a), 16), SHR((b), 16)), \
+    SHR(MULT16_16SU(SHR((a), 16), ((b)&0x0000ffff)), 16)), SHR(MULT16_16SU(SHR((b), 16), ((a)&0x0000ffff)), 16))
 
 /** 16x32 multiplication, followed by a 16-bit shift right. Results fits in 32 bits */
-#define MULT16_32_Q16(a,b) ADD32(MULT16_16((a),SHR32((b),16)), SHR32(MULT16_16SU((a),((b)&0x0000ffff)),16))
+#define MULT16_32_Q16(a, b) ADD32(MULT16_16((a), SHR32((b), 16)), SHR32(MULT16_16SU((a), ((b)&0x0000ffff)), 16))
 
-#define MULT16_32_P16(a,b) MULT16_32_PX(a,b,16)
+#define MULT16_32_P16(a, b) MULT16_32_PX(a, b, 16)
 
-#define QCONST16(x,bits) ((oac_val16)(.5+(x)*(((oac_val32)1)<<(bits))))
-#define QCONST32(x,bits) ((oac_val32)(.5+(x)*(((oac_val64)1)<<(bits))))
-#define GCONST2(x,bits) ((celt_glog)(.5+(x)*(((celt_glog)1)<<(bits))))
-#define GCONST(x) GCONST2((x),DB_SHIFT)
+#define QCONST16(x, bits) ((oac_val16)(.5 + (x)*(((oac_val32)1)<<(bits))))
+#define QCONST32(x, bits) ((oac_val32)(.5 + (x)*(((oac_val64)1)<<(bits))))
+#define GCONST2(x, bits) ((celt_glog)(.5 + (x)*(((celt_glog)1)<<(bits))))
+#define GCONST(x) GCONST2((x), DB_SHIFT)
 
-#define VERIFY_SHORT(x) ((x)<=32767&&(x)>=-32768)
-#define VERIFY_INT(x) ((x)<=2147483647LL&&(x)>=-2147483648LL)
-#define VERIFY_UINT(x) ((x)<=(2147483647LLU<<1))
+#define VERIFY_SHORT(x) ((x) <= 32767 && (x) >= -32768)
+#define VERIFY_INT(x) ((x) <= 2147483647LL && (x) >= -2147483648LL)
+#define VERIFY_UINT(x) ((x) <= (2147483647LLU<<1))
 
-#define SHR(a,b) SHR32(a,b)
-#define PSHR(a,b) PSHR32(a,b)
+#define SHR(a, b) SHR32(a, b)
+#define PSHR(a, b) PSHR32(a, b)
 
 /** Add two 32-bit values, ignore any overflows */
-#define ADD32_ovflw(a,b) (celt_mips+=2,(oac_val32)((oac_uint32)(a)+(oac_uint32)(b)))
+#define ADD32_ovflw(a, b) (celt_mips += 2, (oac_val32)((oac_uint32)(a) + (oac_uint32)(b)))
 /** Subtract two 32-bit values, ignore any overflows */
-#define SUB32_ovflw(a,b) (celt_mips+=2,(oac_val32)((oac_uint32)(a)-(oac_uint32)(b)))
+#define SUB32_ovflw(a, b) (celt_mips += 2, (oac_val32)((oac_uint32)(a) - (oac_uint32)(b)))
 /* Avoid MSVC warning C4146: unary minus operator applied to unsigned type */
 /** Negate 32-bit value, ignore any overflows */
-#define NEG32_ovflw(a) (celt_mips+=2,(oac_val32)(0-(oac_uint32)(a)))
+#define NEG32_ovflw(a) (celt_mips += 2, (oac_val32)(0 - (oac_uint32)(a)))
 /** 32-bit shift left, ignoring overflows */
-#define SHL32_ovflw(a,shift) ((oac_int32)((oac_uint32)(a)<<(shift)))
+#define SHL32_ovflw(a, shift) ((oac_int32)((oac_uint32)(a)<<(shift)))
 /** 32-bit arithmetic shift right with rounding-to-nearest, ignoring overflows */
-#define PSHR32_ovflw(a,shift) (SHR32(ADD32_ovflw(a, (EXTEND32(1)<<(shift)>>1)),shift))
+#define PSHR32_ovflw(a, shift) (SHR32(ADD32_ovflw(a, (EXTEND32(1)<<(shift)>>1)), shift))
 
-static OAC_INLINE short NEG16(int x)
-{
-   int res;
-   if (!VERIFY_SHORT(x))
-   {
-      fprintf (stderr, "NEG16: input is not short: %d\n", (int)x);
+static OAC_INLINE short NEG16(int x) {
+    int res;
+    if (!VERIFY_SHORT(x)) {
+        fprintf (stderr, "NEG16: input is not short: %d\n", (int)x);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = -x;
-   if (!VERIFY_SHORT(res))
-   {
-      fprintf (stderr, "NEG16: output is not short: %d\n", (int)res);
+    }
+    res = -x;
+    if (!VERIFY_SHORT(res)) {
+        fprintf (stderr, "NEG16: output is not short: %d\n", (int)res);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   celt_mips++;
-   return res;
+    }
+    celt_mips++;
+    return res;
 }
-static OAC_INLINE int NEG32(oac_int64 x)
-{
-   oac_int64 res;
-   if (!VERIFY_INT(x))
-   {
-      fprintf (stderr, "NEG16: input is not int: %d\n", (int)x);
+static OAC_INLINE int NEG32(oac_int64 x) {
+    oac_int64 res;
+    if (!VERIFY_INT(x)) {
+        fprintf (stderr, "NEG16: input is not int: %d\n", (int)x);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = -x;
-   if (!VERIFY_INT(res))
-   {
-      fprintf (stderr, "NEG16: output is not int: %d\n", (int)res);
+    }
+    res = -x;
+    if (!VERIFY_INT(res)) {
+        fprintf (stderr, "NEG16: output is not int: %d\n", (int)res);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   celt_mips+=2;
-   return res;
+    }
+    celt_mips += 2;
+    return res;
 }
 
 #define EXTRACT16(x) EXTRACT16_(x, __FILE__, __LINE__)
-static OAC_INLINE short EXTRACT16_(int x, char *file, int line)
-{
-   int res;
-   if (!VERIFY_SHORT(x))
-   {
-      fprintf (stderr, "EXTRACT16: input is not short: %d in %s: line %d\n", x, file, line);
+static OAC_INLINE short EXTRACT16_(int x, char *file, int line) {
+    int res;
+    if (!VERIFY_SHORT(x)) {
+        fprintf (stderr, "EXTRACT16: input is not short: %d in %s: line %d\n", x, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = x;
-   celt_mips++;
-   return res;
+    }
+    res = x;
+    celt_mips++;
+    return res;
 }
 
 #define EXTEND32(x) EXTEND32_(x, __FILE__, __LINE__)
-static OAC_INLINE int EXTEND32_(int x, char *file, int line)
-{
-   int res;
-   if (!VERIFY_SHORT(x))
-   {
-      fprintf (stderr, "EXTEND32: input is not short: %d in %s: line %d\n", x, file, line);
+static OAC_INLINE int EXTEND32_(int x, char *file, int line) {
+    int res;
+    if (!VERIFY_SHORT(x)) {
+        fprintf (stderr, "EXTEND32: input is not short: %d in %s: line %d\n", x, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = x;
-   celt_mips++;
-   return res;
+    }
+    res = x;
+    celt_mips++;
+    return res;
 }
 
 #define SHR16(a, shift) SHR16_(a, shift, __FILE__, __LINE__)
-static OAC_INLINE short SHR16_(int a, int shift, char *file, int line)
-{
-   int res;
-   if (!VERIFY_SHORT(a) || !VERIFY_SHORT(shift))
-   {
-      fprintf (stderr, "SHR16: inputs are not short: %d >> %d in %s: line %d\n", a, shift, file, line);
+static OAC_INLINE short SHR16_(int a, int shift, char *file, int line) {
+    int res;
+    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(shift)) {
+        fprintf (stderr, "SHR16: inputs are not short: %d >> %d in %s: line %d\n", a, shift, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = a>>shift;
-   if (!VERIFY_SHORT(res))
-   {
-      fprintf (stderr, "SHR16: output is not short: %d in %s: line %d\n", res, file, line);
+    }
+    res = a>>shift;
+    if (!VERIFY_SHORT(res)) {
+        fprintf (stderr, "SHR16: output is not short: %d in %s: line %d\n", res, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   celt_mips++;
-   return res;
+    }
+    celt_mips++;
+    return res;
 }
 #define SHL16(a, shift) SHL16_(a, shift, __FILE__, __LINE__)
-static OAC_INLINE short SHL16_(int a, int shift, char *file, int line)
-{
-   oac_int32 res;
-   if (!VERIFY_SHORT(a) || !VERIFY_SHORT(shift))
-   {
-      fprintf (stderr, "SHL16: inputs are not short: %d %d in %s: line %d\n", a, shift, file, line);
+static OAC_INLINE short SHL16_(int a, int shift, char *file, int line) {
+    oac_int32 res;
+    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(shift)) {
+        fprintf (stderr, "SHL16: inputs are not short: %d %d in %s: line %d\n", a, shift, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = (oac_int32)((oac_uint32)a<<shift);
-   if (!VERIFY_SHORT(res))
-   {
-      fprintf (stderr, "SHL16: output is not short: %d in %s: line %d\n", res, file, line);
+    }
+    res = (oac_int32)((oac_uint32)a<<shift);
+    if (!VERIFY_SHORT(res)) {
+        fprintf (stderr, "SHL16: output is not short: %d in %s: line %d\n", res, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   celt_mips++;
-   return res;
+    }
+    celt_mips++;
+    return res;
 }
 
-static OAC_INLINE int SHR32(oac_int64 a, int shift)
-{
-   oac_int64  res;
-   if (!VERIFY_INT(a) || !VERIFY_SHORT(shift))
-   {
-      fprintf (stderr, "SHR32: inputs are not int: %d %d\n", (int)a, shift);
+static OAC_INLINE int SHR32(oac_int64 a, int shift) {
+    oac_int64 res;
+    if (!VERIFY_INT(a) || !VERIFY_SHORT(shift)) {
+        fprintf (stderr, "SHR32: inputs are not int: %d %d\n", (int)a, shift);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = a>>shift;
-   if (!VERIFY_INT(res))
-   {
-      fprintf (stderr, "SHR32: output is not int: %d\n", (int)res);
+    }
+    res = a>>shift;
+    if (!VERIFY_INT(res)) {
+        fprintf (stderr, "SHR32: output is not int: %d\n", (int)res);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   celt_mips+=2;
-   return res;
+    }
+    celt_mips += 2;
+    return res;
 }
 #define SHL32(a, shift) SHL32_(a, shift, __FILE__, __LINE__)
-static OAC_INLINE int SHL32_(oac_int64 a, int shift, char *file, int line)
-{
-   oac_int64  res;
-   if (!VERIFY_INT(a) || !VERIFY_SHORT(shift))
-   {
-      fprintf (stderr, "SHL32: inputs are not int: %lld %d in %s: line %d\n", (long long)a, shift, file, line);
+static OAC_INLINE int SHL32_(oac_int64 a, int shift, char *file, int line) {
+    oac_int64 res;
+    if (!VERIFY_INT(a) || !VERIFY_SHORT(shift)) {
+        fprintf (stderr, "SHL32: inputs are not int: %lld %d in %s: line %d\n", (long long)a, shift, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = (oac_int64)((oac_uint64)a<<shift);
-   if (!VERIFY_INT(res))
-   {
-      fprintf (stderr, "SHL32: output is not int: %lld<<%d = %lld in %s: line %d\n", (long long)a, shift, (long long)res, file, line);
+    }
+    res = (oac_int64)((oac_uint64)a<<shift);
+    if (!VERIFY_INT(res)) {
+        fprintf (stderr, "SHL32: output is not int: %lld<<%d = %lld in %s: line %d\n", (long long)a, shift,
+            (long long)res, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   celt_mips+=2;
-   return res;
+    }
+    celt_mips += 2;
+    return res;
 }
 
-#define PSHR32(a,shift) (celt_mips--,SHR32(ADD32((a),(((oac_val32)(1)<<((shift))>>1))),shift))
-#define VSHR32(a, shift) (((shift)>0) ? SHR32(a, shift) : SHL32(a, -(shift)))
+#define PSHR32(a, shift) (celt_mips--, SHR32(ADD32((a), (((oac_val32)(1)<<((shift))>>1))), shift))
+#define VSHR32(a, shift) (((shift) > 0) ? SHR32(a, shift) : SHL32(a, -(shift)))
 
-#define SHR64(a,shift) (celt_mips++,(a) >> (shift))
+#define SHR64(a, shift) (celt_mips++, (a)>>(shift))
 
-#define ROUND16(x,a) (celt_mips--,EXTRACT16(PSHR32((x),(a))))
-#define SROUND16(x,a) (celt_mips--,EXTRACT16(SATURATE(PSHR32(x,a), 32767)));
+#define ROUND16(x, a) (celt_mips--, EXTRACT16(PSHR32((x), (a))))
+#define SROUND16(x, a) (celt_mips--, EXTRACT16(SATURATE(PSHR32(x, a), 32767)));
 
-#define HALF16(x)  (SHR16(x,1))
-#define HALF32(x)  (SHR32(x,1))
+#define HALF16(x)  (SHR16(x, 1))
+#define HALF32(x)  (SHR32(x, 1))
 
 #define ADD16(a, b) ADD16_(a, b, __FILE__, __LINE__)
-static OAC_INLINE short ADD16_(int a, int b, char *file, int line)
-{
-   int res;
-   if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
-   {
-      fprintf (stderr, "ADD16: inputs are not short: %d %d in %s: line %d\n", a, b, file, line);
+static OAC_INLINE short ADD16_(int a, int b, char *file, int line) {
+    int res;
+    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b)) {
+        fprintf (stderr, "ADD16: inputs are not short: %d %d in %s: line %d\n", a, b, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = a+b;
-   if (!VERIFY_SHORT(res))
-   {
-      fprintf (stderr, "ADD16: output is not short: %d+%d=%d in %s: line %d\n", a,b,res, file, line);
+    }
+    res = a + b;
+    if (!VERIFY_SHORT(res)) {
+        fprintf (stderr, "ADD16: output is not short: %d+%d=%d in %s: line %d\n", a, b, res, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   celt_mips++;
-   return res;
+    }
+    celt_mips++;
+    return res;
 }
 
 #define SUB16(a, b) SUB16_(a, b, __FILE__, __LINE__)
-static OAC_INLINE short SUB16_(int a, int b, char *file, int line)
-{
-   int res;
-   if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
-   {
-      fprintf (stderr, "SUB16: inputs are not short: %d %d in %s: line %d\n", a, b, file, line);
+static OAC_INLINE short SUB16_(int a, int b, char *file, int line) {
+    int res;
+    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b)) {
+        fprintf (stderr, "SUB16: inputs are not short: %d %d in %s: line %d\n", a, b, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = a-b;
-   if (!VERIFY_SHORT(res))
-   {
-      fprintf (stderr, "SUB16: output is not short: %d in %s: line %d\n", res, file, line);
+    }
+    res = a - b;
+    if (!VERIFY_SHORT(res)) {
+        fprintf (stderr, "SUB16: output is not short: %d in %s: line %d\n", res, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   celt_mips++;
-   return res;
+    }
+    celt_mips++;
+    return res;
 }
 
 #define ADD32(a, b) ADD32_(a, b, __FILE__, __LINE__)
-static OAC_INLINE int ADD32_(oac_int64 a, oac_int64 b, char *file, int line)
-{
-   oac_int64 res;
-   if (!VERIFY_INT(a) || !VERIFY_INT(b))
-   {
-      fprintf (stderr, "ADD32: inputs are not int: %d %d in %s: line %d\n", (int)a, (int)b, file, line);
+static OAC_INLINE int ADD32_(oac_int64 a, oac_int64 b, char *file, int line) {
+    oac_int64 res;
+    if (!VERIFY_INT(a) || !VERIFY_INT(b)) {
+        fprintf (stderr, "ADD32: inputs are not int: %d %d in %s: line %d\n", (int)a, (int)b, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = a+b;
-   if (!VERIFY_INT(res))
-   {
-      fprintf (stderr, "ADD32: output is not int: %d in %s: line %d\n", (int)res, file, line);
+    }
+    res = a + b;
+    if (!VERIFY_INT(res)) {
+        fprintf (stderr, "ADD32: output is not int: %d in %s: line %d\n", (int)res, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   celt_mips+=2;
-   return res;
+    }
+    celt_mips += 2;
+    return res;
 }
 
 #define SUB32(a, b) SUB32_(a, b, __FILE__, __LINE__)
-static OAC_INLINE int SUB32_(oac_int64 a, oac_int64 b, char *file, int line)
-{
-   oac_int64 res;
-   if (!VERIFY_INT(a) || !VERIFY_INT(b))
-   {
-      fprintf (stderr, "SUB32: inputs are not int: %d %d in %s: line %d\n", (int)a, (int)b, file, line);
+static OAC_INLINE int SUB32_(oac_int64 a, oac_int64 b, char *file, int line) {
+    oac_int64 res;
+    if (!VERIFY_INT(a) || !VERIFY_INT(b)) {
+        fprintf (stderr, "SUB32: inputs are not int: %d %d in %s: line %d\n", (int)a, (int)b, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = a-b;
-   if (!VERIFY_INT(res))
-   {
-      fprintf (stderr, "SUB32: output is not int: %d in %s: line %d\n", (int)res, file, line);
+    }
+    res = a - b;
+    if (!VERIFY_INT(res)) {
+        fprintf (stderr, "SUB32: output is not int: %d in %s: line %d\n", (int)res, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   celt_mips+=2;
-   return res;
+    }
+    celt_mips += 2;
+    return res;
 }
 
 #undef UADD32
 #define UADD32(a, b) UADD32_(a, b, __FILE__, __LINE__)
-static OAC_INLINE unsigned int UADD32_(oac_uint64 a, oac_uint64 b, char *file, int line)
-{
-   oac_uint64 res;
-   if (!VERIFY_UINT(a) || !VERIFY_UINT(b))
-   {
-      fprintf (stderr, "UADD32: inputs are not uint32: %llu %llu in %s: line %d\n", (unsigned long long)a, (unsigned long long)b, file, line);
+static OAC_INLINE unsigned int UADD32_(oac_uint64 a, oac_uint64 b, char *file, int line) {
+    oac_uint64 res;
+    if (!VERIFY_UINT(a) || !VERIFY_UINT(b)) {
+        fprintf (stderr, "UADD32: inputs are not uint32: %llu %llu in %s: line %d\n", (unsigned long long)a,
+            (unsigned long long)b, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = a+b;
-   if (!VERIFY_UINT(res))
-   {
-      fprintf (stderr, "UADD32: output is not uint32: %llu in %s: line %d\n", (unsigned long long)res, file, line);
+    }
+    res = a + b;
+    if (!VERIFY_UINT(res)) {
+        fprintf (stderr, "UADD32: output is not uint32: %llu in %s: line %d\n", (unsigned long long)res, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   celt_mips+=2;
-   return res;
+    }
+    celt_mips += 2;
+    return res;
 }
 
 #undef USUB32
 #define USUB32(a, b) USUB32_(a, b, __FILE__, __LINE__)
-static OAC_INLINE unsigned int USUB32_(oac_uint64 a, oac_uint64 b, char *file, int line)
-{
-   oac_uint64 res;
-   if (!VERIFY_UINT(a) || !VERIFY_UINT(b))
-   {
-      fprintf (stderr, "USUB32: inputs are not uint32: %llu %llu in %s: line %d\n", (unsigned long long)a, (unsigned long long)b, file, line);
+static OAC_INLINE unsigned int USUB32_(oac_uint64 a, oac_uint64 b, char *file, int line) {
+    oac_uint64 res;
+    if (!VERIFY_UINT(a) || !VERIFY_UINT(b)) {
+        fprintf (stderr, "USUB32: inputs are not uint32: %llu %llu in %s: line %d\n", (unsigned long long)a,
+            (unsigned long long)b, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   if (a<b)
-   {
-      fprintf (stderr, "USUB32: inputs underflow: %llu < %llu in %s: line %d\n", (unsigned long long)a, (unsigned long long)b, file, line);
+    }
+    if (a < b) {
+        fprintf (stderr, "USUB32: inputs underflow: %llu < %llu in %s: line %d\n", (unsigned long long)a,
+            (unsigned long long)b, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = a-b;
-   if (!VERIFY_UINT(res))
-   {
-      fprintf (stderr, "USUB32: output is not uint32: %llu - %llu = %llu in %s: line %d\n", (unsigned long long)a, (unsigned long long)b, (unsigned long long)res, file, line);
+    }
+    res = a - b;
+    if (!VERIFY_UINT(res)) {
+        fprintf (stderr, "USUB32: output is not uint32: %llu - %llu = %llu in %s: line %d\n", (unsigned long long)a,
+            (unsigned long long)b, (unsigned long long)res, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   celt_mips+=2;
-   return res;
+    }
+    celt_mips += 2;
+    return res;
 }
 
 /* result fits in 16 bits */
-static OAC_INLINE short MULT16_16_16(int a, int b)
-{
-   int res;
-   if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
-   {
-      fprintf (stderr, "MULT16_16_16: inputs are not short: %d %d\n", a, b);
+static OAC_INLINE short MULT16_16_16(int a, int b) {
+    int res;
+    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b)) {
+        fprintf (stderr, "MULT16_16_16: inputs are not short: %d %d\n", a, b);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = a*b;
-   if (!VERIFY_SHORT(res))
-   {
-      fprintf (stderr, "MULT16_16_16: output is not short: %d\n", res);
+    }
+    res = a*b;
+    if (!VERIFY_SHORT(res)) {
+        fprintf (stderr, "MULT16_16_16: output is not short: %d\n", res);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   celt_mips++;
-   return res;
+    }
+    celt_mips++;
+    return res;
 }
 
 /* result fits in 32 bits */
-static OAC_INLINE int MULT32_32_32(oac_int64 a, oac_int64 b)
-{
-   oac_int64 res;
-   if (!VERIFY_INT(a) || !VERIFY_INT(b))
-   {
-      fprintf (stderr, "MULT32_32_32: inputs are not int: %lld %lld\n", (long long)a, (long long)b);
+static OAC_INLINE int MULT32_32_32(oac_int64 a, oac_int64 b) {
+    oac_int64 res;
+    if (!VERIFY_INT(a) || !VERIFY_INT(b)) {
+        fprintf (stderr, "MULT32_32_32: inputs are not int: %lld %lld\n", (long long)a, (long long)b);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = a*b;
-   if (!VERIFY_INT(res))
-   {
-      fprintf (stderr, "MULT32_32_32: output is not int: %lld\n", (long long)res);
+    }
+    res = a*b;
+    if (!VERIFY_INT(res)) {
+        fprintf (stderr, "MULT32_32_32: output is not int: %lld\n", (long long)res);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   celt_mips+=5;
-   return res;
+    }
+    celt_mips += 5;
+    return res;
 }
 
-static OAC_INLINE int MULT32_32_Q16(oac_int64 a, oac_int64 b)
-{
-   oac_int64 res;
-   if (!VERIFY_INT(a) || !VERIFY_INT(b))
-   {
-      fprintf (stderr, "MULT32_32_Q16: inputs are not int: %lld %lld\n", (long long)a, (long long)b);
+static OAC_INLINE int MULT32_32_Q16(oac_int64 a, oac_int64 b) {
+    oac_int64 res;
+    if (!VERIFY_INT(a) || !VERIFY_INT(b)) {
+        fprintf (stderr, "MULT32_32_Q16: inputs are not int: %lld %lld\n", (long long)a, (long long)b);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = ((oac_int64)(a)*(oac_int64)(b)) >> 16;
-   if (!VERIFY_INT(res))
-   {
-      fprintf (stderr, "MULT32_32_Q16: output is not int: %lld*%lld=%lld\n", (long long)a, (long long)b, (long long)res);
+    }
+    res = ((oac_int64)(a)*(oac_int64)(b))>>16;
+    if (!VERIFY_INT(res)) {
+        fprintf (stderr, "MULT32_32_Q16: output is not int: %lld*%lld=%lld\n", (long long)a, (long long)b,
+            (long long)res);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   celt_mips+=5;
-   return res;
+    }
+    celt_mips += 5;
+    return res;
 }
 
 #define MULT16_16(a, b) MULT16_16_(a, b, __FILE__, __LINE__)
-static OAC_INLINE int MULT16_16_(int a, int b, char *file, int line)
-{
-   oac_int64 res;
-   if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
-   {
-      fprintf (stderr, "MULT16_16: inputs are not short: %d %d in %s: line %d\n", a, b, file, line);
+static OAC_INLINE int MULT16_16_(int a, int b, char *file, int line) {
+    oac_int64 res;
+    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b)) {
+        fprintf (stderr, "MULT16_16: inputs are not short: %d %d in %s: line %d\n", a, b, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = ((oac_int64)a)*b;
-   if (!VERIFY_INT(res))
-   {
-      fprintf (stderr, "MULT16_16: output is not int: %d in %s: line %d\n", (int)res, file, line);
+    }
+    res = ((oac_int64)a)*b;
+    if (!VERIFY_INT(res)) {
+        fprintf (stderr, "MULT16_16: output is not int: %d in %s: line %d\n", (int)res, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   celt_mips++;
-   return res;
+    }
+    celt_mips++;
+    return res;
 }
 
-#define MAC16_16(c,a,b)     (celt_mips-=2,ADD32((c),MULT16_16((a),(b))))
+#define MAC16_16(c, a, b)     (celt_mips -= 2, ADD32((c), MULT16_16((a), (b))))
 
 #define MULT16_32_QX(a, b, Q) MULT16_32_QX_(a, b, Q, __FILE__, __LINE__)
-static OAC_INLINE int MULT16_32_QX_(int a, oac_int64 b, int Q, char *file, int line)
-{
-   oac_int64 res;
-   if (!VERIFY_SHORT(a) || !VERIFY_INT(b))
-   {
-      fprintf (stderr, "MULT16_32_Q%d: inputs are not short+int: %d %d in %s: line %d\n", Q, (int)a, (int)b, file, line);
+static OAC_INLINE int MULT16_32_QX_(int a, oac_int64 b, int Q, char *file, int line) {
+    oac_int64 res;
+    if (!VERIFY_SHORT(a) || !VERIFY_INT(b)) {
+        fprintf (stderr, "MULT16_32_Q%d: inputs are not short+int: %d %d in %s: line %d\n", Q, (int)a, (int)b, file,
+        line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   if (ABS32(b)>=((oac_int64)(1)<<(16+Q)))
-   {
-      fprintf (stderr, "MULT16_32_Q%d: second operand too large: %d %d in %s: line %d\n", Q, (int)a, (int)b, file, line);
+    }
+    if (ABS32(b) >= ((oac_int64)(1)<<(16 + Q))) {
+        fprintf (stderr, "MULT16_32_Q%d: second operand too large: %d %d in %s: line %d\n", Q, (int)a, (int)b, file,
+        line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = (((oac_int64)a)*(oac_int64)b) >> Q;
-   if (!VERIFY_INT(res))
-   {
-      fprintf (stderr, "MULT16_32_Q%d: output is not int: %d*%d=%d in %s: line %d\n", Q, (int)a, (int)b,(int)res, file, line);
+    }
+    res = (((oac_int64)a)*(oac_int64)b)>>Q;
+    if (!VERIFY_INT(res)) {
+        fprintf (stderr, "MULT16_32_Q%d: output is not int: %d*%d=%d in %s: line %d\n", Q, (int)a, (int)b, (int)res,
+        file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   if (Q==15)
-      celt_mips+=3;
-   else
-      celt_mips+=4;
-   return res;
+    }
+    if (Q == 15)
+        celt_mips += 3;
+    else
+        celt_mips += 4;
+    return res;
 }
 
 #define MULT16_32_PX(a, b, Q) MULT16_32_PX_(a, b, Q, __FILE__, __LINE__)
-static OAC_INLINE int MULT16_32_PX_(int a, oac_int64 b, int Q, char *file, int line)
-{
-   oac_int64 res;
-   if (!VERIFY_SHORT(a) || !VERIFY_INT(b))
-   {
-      fprintf (stderr, "MULT16_32_P%d: inputs are not short+int: %d %d in %s: line %d\n\n", Q, (int)a, (int)b, file, line);
-#ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
-#endif
-   }
-   if (ABS32(b)>=((oac_int64)(1)<<(16+Q)))
-   {
-      fprintf (stderr, "MULT16_32_Q%d: second operand too large: %d %d in %s: line %d\n\n", Q, (int)a, (int)b,file, line);
-#ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
-#endif
-   }
-   res = ((((oac_int64)a)*(oac_int64)b) + (((oac_val32)(1)<<Q)>>1))>> Q;
-   if (!VERIFY_INT(res))
-   {
-      fprintf (stderr, "MULT16_32_P%d: output is not int: %d*%d=%d in %s: line %d\n\n", Q, (int)a, (int)b,(int)res, file, line);
-#ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
-#endif
-   }
-   if (Q==15)
-      celt_mips+=4;
-   else
-      celt_mips+=5;
-   return res;
-}
-
-#define MULT16_32_Q15(a,b) MULT16_32_QX(a,b,15)
-#define MAC16_32_Q15(c,a,b) (celt_mips-=2,ADD32((c),MULT16_32_Q15((a),(b))))
-#define MAC16_32_Q16(c,a,b) (celt_mips-=2,ADD32((c),MULT16_32_Q16((a),(b))))
-
-static OAC_INLINE int SATURATE(int a, int b)
-{
-   if (a>b)
-      a=b;
-   if (a<-b)
-      a = -b;
-   celt_mips+=3;
-   return a;
-}
-
-static OAC_INLINE oac_int16 SATURATE16(oac_int32 a)
-{
-   celt_mips+=3;
-   if (a>32767)
-      return 32767;
-   else if (a<-32768)
-      return -32768;
-   else return a;
-}
-
-static OAC_INLINE int MULT16_16_Q11_32(int a, int b)
-{
-   oac_int64 res;
-   if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
-   {
-      fprintf (stderr, "MULT16_16_Q11: inputs are not short: %d %d\n", a, b);
-#ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
-#endif
-   }
-   res = ((oac_int64)a)*b;
-   res >>= 11;
-   if (!VERIFY_INT(res))
-   {
-      fprintf (stderr, "MULT16_16_Q11: output is not short: %d*%d=%d\n", (int)a, (int)b, (int)res);
-#ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
-#endif
-   }
-   celt_mips+=3;
-   return res;
-}
-static OAC_INLINE short MULT16_16_Q13(int a, int b)
-{
-   oac_int64 res;
-   if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
-   {
-      fprintf (stderr, "MULT16_16_Q13: inputs are not short: %d %d\n", a, b);
-#ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
-#endif
-   }
-   res = ((oac_int64)a)*b;
-   res >>= 13;
-   if (!VERIFY_SHORT(res))
-   {
-      fprintf (stderr, "MULT16_16_Q13: output is not short: %d*%d=%d\n", a, b, (int)res);
-#ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
-#endif
-   }
-   celt_mips+=3;
-   return res;
-}
-static OAC_INLINE short MULT16_16_Q14(int a, int b)
-{
-   oac_int64 res;
-   if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
-   {
-      fprintf (stderr, "MULT16_16_Q14: inputs are not short: %d %d\n", a, b);
+static OAC_INLINE int MULT16_32_PX_(int a, oac_int64 b, int Q, char *file, int line) {
+    oac_int64 res;
+    if (!VERIFY_SHORT(a) || !VERIFY_INT(b)) {
+        fprintf (stderr, "MULT16_32_P%d: inputs are not short+int: %d %d in %s: line %d\n\n", Q, (int)a, (int)b, file,
+        line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = ((oac_int64)a)*b;
-   res >>= 14;
-   if (!VERIFY_SHORT(res))
-   {
-      fprintf (stderr, "MULT16_16_Q14: output is not short: %d\n", (int)res);
-#ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
-#endif
-   }
-   celt_mips+=3;
-   return res;
+    }
+    if (ABS32(b) >= ((oac_int64)(1)<<(16 + Q))) {
+        fprintf (stderr, "MULT16_32_Q%d: second operand too large: %d %d in %s: line %d\n\n", Q, (int)a, (int)b, file,
+        line);
+#ifdef FIXED_DEBUG_ASSERT
+        celt_assert(0);
+#endif
+    }
+    res = ((((oac_int64)a)*(oac_int64)b) + (((oac_val32)(1)<<Q)>>1))>>Q;
+    if (!VERIFY_INT(res)) {
+        fprintf (stderr, "MULT16_32_P%d: output is not int: %d*%d=%d in %s: line %d\n\n", Q, (int)a, (int)b, (int)res,
+        file, line);
+#ifdef FIXED_DEBUG_ASSERT
+        celt_assert(0);
+#endif
+    }
+    if (Q == 15)
+        celt_mips += 4;
+    else
+        celt_mips += 5;
+    return res;
+}
+
+#define MULT16_32_Q15(a, b) MULT16_32_QX(a, b, 15)
+#define MAC16_32_Q15(c, a, b) (celt_mips -= 2, ADD32((c), MULT16_32_Q15((a), (b))))
+#define MAC16_32_Q16(c, a, b) (celt_mips -= 2, ADD32((c), MULT16_32_Q16((a), (b))))
+
+static OAC_INLINE int SATURATE(int a, int b) {
+    if (a > b)
+        a = b;
+    if (a < -b)
+        a = -b;
+    celt_mips += 3;
+    return a;
+}
+
+static OAC_INLINE oac_int16 SATURATE16(oac_int32 a) {
+    celt_mips += 3;
+    if (a > 32767)
+        return 32767;
+    else if (a < -32768)
+        return -32768;
+    else return a;
+}
+
+static OAC_INLINE int MULT16_16_Q11_32(int a, int b) {
+    oac_int64 res;
+    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b)) {
+        fprintf (stderr, "MULT16_16_Q11: inputs are not short: %d %d\n", a, b);
+#ifdef FIXED_DEBUG_ASSERT
+        celt_assert(0);
+#endif
+    }
+    res = ((oac_int64)a)*b;
+    res >>= 11;
+    if (!VERIFY_INT(res)) {
+        fprintf (stderr, "MULT16_16_Q11: output is not short: %d*%d=%d\n", (int)a, (int)b, (int)res);
+#ifdef FIXED_DEBUG_ASSERT
+        celt_assert(0);
+#endif
+    }
+    celt_mips += 3;
+    return res;
+}
+static OAC_INLINE short MULT16_16_Q13(int a, int b) {
+    oac_int64 res;
+    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b)) {
+        fprintf (stderr, "MULT16_16_Q13: inputs are not short: %d %d\n", a, b);
+#ifdef FIXED_DEBUG_ASSERT
+        celt_assert(0);
+#endif
+    }
+    res = ((oac_int64)a)*b;
+    res >>= 13;
+    if (!VERIFY_SHORT(res)) {
+        fprintf (stderr, "MULT16_16_Q13: output is not short: %d*%d=%d\n", a, b, (int)res);
+#ifdef FIXED_DEBUG_ASSERT
+        celt_assert(0);
+#endif
+    }
+    celt_mips += 3;
+    return res;
+}
+static OAC_INLINE short MULT16_16_Q14(int a, int b) {
+    oac_int64 res;
+    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b)) {
+        fprintf (stderr, "MULT16_16_Q14: inputs are not short: %d %d\n", a, b);
+#ifdef FIXED_DEBUG_ASSERT
+        celt_assert(0);
+#endif
+    }
+    res = ((oac_int64)a)*b;
+    res >>= 14;
+    if (!VERIFY_SHORT(res)) {
+        fprintf (stderr, "MULT16_16_Q14: output is not short: %d\n", (int)res);
+#ifdef FIXED_DEBUG_ASSERT
+        celt_assert(0);
+#endif
+    }
+    celt_mips += 3;
+    return res;
 }
 
 #define MULT16_16_Q15(a, b) MULT16_16_Q15_(a, b, __FILE__, __LINE__)
-static OAC_INLINE short MULT16_16_Q15_(int a, int b, char *file, int line)
-{
-   oac_int64 res;
-   if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
-   {
-      fprintf (stderr, "MULT16_16_Q15: inputs are not short: %d %d in %s: line %d\n", a, b, file, line);
-#ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
-#endif
-   }
-   res = ((oac_int64)a)*b;
-   res >>= 15;
-   if (!VERIFY_SHORT(res))
-   {
-      fprintf (stderr, "MULT16_16_Q15: output is not short: %d in %s: line %d\n", (int)res, file, line);
+static OAC_INLINE short MULT16_16_Q15_(int a, int b, char *file, int line) {
+    oac_int64 res;
+    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b)) {
+        fprintf (stderr, "MULT16_16_Q15: inputs are not short: %d %d in %s: line %d\n", a, b, file, line);
+#ifdef FIXED_DEBUG_ASSERT
+        celt_assert(0);
+#endif
+    }
+    res = ((oac_int64)a)*b;
+    res >>= 15;
+    if (!VERIFY_SHORT(res)) {
+        fprintf (stderr, "MULT16_16_Q15: output is not short: %d in %s: line %d\n", (int)res, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   celt_mips+=1;
-   return res;
+    }
+    celt_mips += 1;
+    return res;
 }
 
-static OAC_INLINE short MULT16_16_P13(int a, int b)
-{
-   oac_int64 res;
-   if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
-   {
-      fprintf (stderr, "MULT16_16_P13: inputs are not short: %d %d\n", a, b);
+static OAC_INLINE short MULT16_16_P13(int a, int b) {
+    oac_int64 res;
+    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b)) {
+        fprintf (stderr, "MULT16_16_P13: inputs are not short: %d %d\n", a, b);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = ((oac_int64)a)*b;
-   res += 4096;
-   if (!VERIFY_INT(res))
-   {
-      fprintf (stderr, "MULT16_16_P13: overflow: %d*%d=%d\n", a, b, (int)res);
+    }
+    res = ((oac_int64)a)*b;
+    res += 4096;
+    if (!VERIFY_INT(res)) {
+        fprintf (stderr, "MULT16_16_P13: overflow: %d*%d=%d\n", a, b, (int)res);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res >>= 13;
-   if (!VERIFY_SHORT(res))
-   {
-      fprintf (stderr, "MULT16_16_P13: output is not short: %d*%d=%d\n", a, b, (int)res);
+    }
+    res >>= 13;
+    if (!VERIFY_SHORT(res)) {
+        fprintf (stderr, "MULT16_16_P13: output is not short: %d*%d=%d\n", a, b, (int)res);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   celt_mips+=4;
-   return res;
+    }
+    celt_mips += 4;
+    return res;
 }
-static OAC_INLINE short MULT16_16_P14(int a, int b)
-{
-   oac_int64 res;
-   if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
-   {
-      fprintf (stderr, "MULT16_16_P14: inputs are not short: %d %d\n", a, b);
+static OAC_INLINE short MULT16_16_P14(int a, int b) {
+    oac_int64 res;
+    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b)) {
+        fprintf (stderr, "MULT16_16_P14: inputs are not short: %d %d\n", a, b);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = ((oac_int64)a)*b;
-   res += 8192;
-   if (!VERIFY_INT(res))
-   {
-      fprintf (stderr, "MULT16_16_P14: overflow: %d*%d=%d\n", a, b, (int)res);
+    }
+    res = ((oac_int64)a)*b;
+    res += 8192;
+    if (!VERIFY_INT(res)) {
+        fprintf (stderr, "MULT16_16_P14: overflow: %d*%d=%d\n", a, b, (int)res);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res >>= 14;
-   if (!VERIFY_SHORT(res))
-   {
-      fprintf (stderr, "MULT16_16_P14: output is not short: %d*%d=%d\n", a, b, (int)res);
+    }
+    res >>= 14;
+    if (!VERIFY_SHORT(res)) {
+        fprintf (stderr, "MULT16_16_P14: output is not short: %d*%d=%d\n", a, b, (int)res);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   celt_mips+=4;
-   return res;
+    }
+    celt_mips += 4;
+    return res;
 }
-static OAC_INLINE short MULT16_16_P15(int a, int b)
-{
-   oac_int64 res;
-   if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
-   {
-      fprintf (stderr, "MULT16_16_P15: inputs are not short: %d %d\n", a, b);
+static OAC_INLINE short MULT16_16_P15(int a, int b) {
+    oac_int64 res;
+    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b)) {
+        fprintf (stderr, "MULT16_16_P15: inputs are not short: %d %d\n", a, b);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = ((oac_int64)a)*b;
-   res += 16384;
-   if (!VERIFY_INT(res))
-   {
-      fprintf (stderr, "MULT16_16_P15: overflow: %d*%d=%d\n", a, b, (int)res);
+    }
+    res = ((oac_int64)a)*b;
+    res += 16384;
+    if (!VERIFY_INT(res)) {
+        fprintf (stderr, "MULT16_16_P15: overflow: %d*%d=%d\n", a, b, (int)res);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res >>= 15;
-   if (!VERIFY_SHORT(res))
-   {
-      fprintf (stderr, "MULT16_16_P15: output is not short: %d*%d=%d\n", a, b, (int)res);
+    }
+    res >>= 15;
+    if (!VERIFY_SHORT(res)) {
+        fprintf (stderr, "MULT16_16_P15: output is not short: %d*%d=%d\n", a, b, (int)res);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   celt_mips+=2;
-   return res;
+    }
+    celt_mips += 2;
+    return res;
 }
 
 #define DIV32_16(a, b) DIV32_16_(a, b, __FILE__, __LINE__)
 
-static OAC_INLINE int DIV32_16_(oac_int64 a, oac_int64 b, char *file, int line)
-{
-   oac_int64 res;
-   if (b==0)
-   {
-      fprintf(stderr, "DIV32_16: divide by zero: %d/%d in %s: line %d\n", (int)a, (int)b, file, line);
+static OAC_INLINE int DIV32_16_(oac_int64 a, oac_int64 b, char *file, int line) {
+    oac_int64 res;
+    if (b == 0) {
+        fprintf(stderr, "DIV32_16: divide by zero: %d/%d in %s: line %d\n", (int)a, (int)b, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-      return 0;
-   }
-   if (!VERIFY_INT(a) || !VERIFY_SHORT(b))
-   {
-      fprintf (stderr, "DIV32_16: inputs are not int/short: %d %d in %s: line %d\n", (int)a, (int)b, file, line);
+        return 0;
+    }
+    if (!VERIFY_INT(a) || !VERIFY_SHORT(b)) {
+        fprintf (stderr, "DIV32_16: inputs are not int/short: %d %d in %s: line %d\n", (int)a, (int)b, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = a/b;
-   if (!VERIFY_SHORT(res))
-   {
-      fprintf (stderr, "DIV32_16: output is not short: %d / %d = %d in %s: line %d\n", (int)a,(int)b,(int)res, file, line);
-      if (res>32767)
-         res = 32767;
-      if (res<-32768)
-         res = -32768;
+    }
+    res = a/b;
+    if (!VERIFY_SHORT(res)) {
+        fprintf (stderr, "DIV32_16: output is not short: %d / %d = %d in %s: line %d\n", (int)a, (int)b, (int)res, file,
+        line);
+        if (res > 32767)
+            res = 32767;
+        if (res < -32768)
+            res = -32768;
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   celt_mips+=35;
-   return res;
+    }
+    celt_mips += 35;
+    return res;
 }
 
 #define DIV32(a, b) DIV32_(a, b, __FILE__, __LINE__)
-static OAC_INLINE int DIV32_(oac_int64 a, oac_int64 b, char *file, int line)
-{
-   oac_int64 res;
-   if (b==0)
-   {
-      fprintf(stderr, "DIV32: divide by zero: %d/%d in %s: line %d\n", (int)a, (int)b, file, line);
+static OAC_INLINE int DIV32_(oac_int64 a, oac_int64 b, char *file, int line) {
+    oac_int64 res;
+    if (b == 0) {
+        fprintf(stderr, "DIV32: divide by zero: %d/%d in %s: line %d\n", (int)a, (int)b, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-      return 0;
-   }
+        return 0;
+    }
 
-   if (!VERIFY_INT(a) || !VERIFY_INT(b))
-   {
-      fprintf (stderr, "DIV32: inputs are not int/short: %d %d in %s: line %d\n", (int)a, (int)b, file, line);
+    if (!VERIFY_INT(a) || !VERIFY_INT(b)) {
+        fprintf (stderr, "DIV32: inputs are not int/short: %d %d in %s: line %d\n", (int)a, (int)b, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   res = a/b;
-   if (!VERIFY_INT(res))
-   {
-      fprintf (stderr, "DIV32: output is not int: %d in %s: line %d\n", (int)res, file, line);
+    }
+    res = a/b;
+    if (!VERIFY_INT(res)) {
+        fprintf (stderr, "DIV32: output is not int: %d in %s: line %d\n", (int)res, file, line);
 #ifdef FIXED_DEBUG_ASSERT
-      celt_assert(0);
+        celt_assert(0);
 #endif
-   }
-   celt_mips+=70;
-   return res;
+    }
+    celt_mips += 70;
+    return res;
 }
 
-static OAC_INLINE oac_val16 SIG2WORD16_generic(celt_sig x)
-{
-   x = PSHR32(x, SIG_SHIFT);
-   x = MAX32(x, -32768);
-   x = MIN32(x, 32767);
-   return EXTRACT16(x);
+static OAC_INLINE oac_val16 SIG2WORD16_generic(celt_sig x) {
+    x = PSHR32(x, SIG_SHIFT);
+    x = MAX32(x, -32768);
+    x = MIN32(x, 32767);
+    return EXTRACT16(x);
 }
 #define SIG2WORD16(x) (SIG2WORD16_generic(x))
 
 
 #undef PRINT_MIPS
-#define PRINT_MIPS(file) do {fprintf (file, "total complexity = %llu MIPS\n", (unsigned long long)celt_mips);} while (0);
+#define PRINT_MIPS(file) do {fprintf (file, "total complexity = %llu MIPS\n", (unsigned long long)celt_mips); \
+} while (0);
 
 #endif
diff --git a/celt/fixed_generic.h b/celt/fixed_generic.h
index 7b6616abe..3167f53c8 100644
--- a/celt/fixed_generic.h
+++ b/celt/fixed_generic.h
@@ -4,7 +4,7 @@
 /**
    @file fixed_generic.h
    @brief Generic fixed-point operations
-*/
+ */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
@@ -28,77 +28,91 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef FIXED_GENERIC_H
 #define FIXED_GENERIC_H
 
 /** Multiply a 16-bit signed value by a 16-bit unsigned value. The result is a 32-bit signed value */
-#define MULT16_16SU(a,b) ((oac_val32)(oac_val16)(a)*(oac_val32)(oac_uint16)(b))
+#define MULT16_16SU(a, b) ((oac_val32)(oac_val16)(a)*(oac_val32)(oac_uint16)(b))
 
 /** 16x32 multiplication, followed by a 16-bit shift right. Results fits in 32 bits */
 #if OAC_FAST_INT64
-#define MULT16_32_Q16(a,b) ((oac_val32)SHR((oac_int64)((oac_val16)(a))*(b),16))
+# define MULT16_32_Q16(a, b) ((oac_val32)SHR((oac_int64)((oac_val16)(a))*(b), 16))
 #else
-#define MULT16_32_Q16(a,b) ADD32(MULT16_16((a),SHR((b),16)), SHR(MULT16_16SU((a),((b)&0x0000ffff)),16))
+# define MULT16_32_Q16(a, b) ADD32(MULT16_16((a), SHR((b), 16)), SHR(MULT16_16SU((a), ((b)&0x0000ffff)), 16))
 #endif
 
 /** 16x32 multiplication, followed by a 16-bit shift right (round-to-nearest). Results fits in 32 bits */
 #if OAC_FAST_INT64
-#define MULT16_32_P16(a,b) ((oac_val32)PSHR((oac_int64)((oac_val16)(a))*(b),16))
+# define MULT16_32_P16(a, b) ((oac_val32)PSHR((oac_int64)((oac_val16)(a))*(b), 16))
 #else
-#define MULT16_32_P16(a,b) ADD32(MULT16_16((a),SHR((b),16)), PSHR(MULT16_16SU((a),((b)&0x0000ffff)),16))
+# define MULT16_32_P16(a, b) ADD32(MULT16_16((a), SHR((b), 16)), PSHR(MULT16_16SU((a), ((b)&0x0000ffff)), 16))
 #endif
 
 /** 16x32 multiplication, followed by a 15-bit shift right. Results fits in 32 bits */
 #if OAC_FAST_INT64
-#define MULT16_32_Q15(a,b) ((oac_val32)SHR((oac_int64)((oac_val16)(a))*(b),15))
+# define MULT16_32_Q15(a, b) ((oac_val32)SHR((oac_int64)((oac_val16)(a))*(b), 15))
 #else
-#define MULT16_32_Q15(a,b) ADD32(SHL(MULT16_16((a),SHR((b),16)),1), SHR(MULT16_16SU((a),((b)&0x0000ffff)),15))
+# define MULT16_32_Q15(a, b) ADD32(SHL(MULT16_16((a), SHR((b), 16)), 1), SHR(MULT16_16SU((a), ((b)&0x0000ffff)), 15))
 #endif
 
 /** 32x32 multiplication, followed by a 16-bit shift right. Results fits in 32 bits */
 #if OAC_FAST_INT64
-#define MULT32_32_Q16(a,b) ((oac_val32)SHR((oac_int64)(a)*(oac_int64)(b),16))
+# define MULT32_32_Q16(a, b) ((oac_val32)SHR((oac_int64)(a)*(oac_int64)(b), 16))
 #else
-#define MULT32_32_Q16(a,b) (ADD32(ADD32(ADD32((oac_val32)(SHR32(((oac_uint32)((a)&0x0000ffff)*(oac_uint32)((b)&0x0000ffff)),16)), MULT16_16SU(SHR32(a,16),((b)&0x0000ffff))), MULT16_16SU(SHR32(b,16),((a)&0x0000ffff))), SHL32(MULT16_16(SHR32(a,16),SHR32(b,16)),16)))
+# define MULT32_32_Q16(a, \
+                       b) (ADD32(ADD32(ADD32((oac_val32)(SHR32(((oac_uint32)((a)&0x0000ffff) \
+                                                                *(oac_uint32)((b)&0x0000ffff)), 16)), \
+    MULT16_16SU(SHR32(a, 16), ((b)&0x0000ffff))), MULT16_16SU(SHR32(b, 16), ((a)&0x0000ffff))), \
+    SHL32(MULT16_16(SHR32(a, 16), SHR32(b, 16)), 16)))
 #endif
 
 /** 32x32 multiplication, followed by a 31-bit shift right. Results fits in 32 bits */
 #if OAC_FAST_INT64
-#define MULT32_32_Q31(a,b) ((oac_val32)SHR((oac_int64)(a)*(oac_int64)(b),31))
+# define MULT32_32_Q31(a, b) ((oac_val32)SHR((oac_int64)(a)*(oac_int64)(b), 31))
 #else
-#define MULT32_32_Q31(a,b) ADD32(ADD32(SHL(MULT16_16(SHR((a),16),SHR((b),16)),1), SHR(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),15)), SHR(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),15))
+# define MULT32_32_Q31(a, \
+                       b) ADD32(ADD32(SHL(MULT16_16(SHR((a), 16), SHR((b), 16)), 1), \
+    SHR(MULT16_16SU(SHR((a), 16), ((b)&0x0000ffff)), 15)), SHR(MULT16_16SU(SHR((b), 16), ((a)&0x0000ffff)), 15))
 #endif
 
 /** 32x32 multiplication, followed by a 31-bit shift right (with rounding). Results fits in 32 bits */
 #if OAC_FAST_INT64
-#define MULT32_32_P31(a,b) ((oac_val32)SHR(1073741824+(oac_int64)(a)*(oac_int64)(b),31))
-#define MULT32_32_P31_ovflw(a,b) MULT32_32_P31(a,b)
+# define MULT32_32_P31(a, b) ((oac_val32)SHR(1073741824 + (oac_int64)(a)*(oac_int64)(b), 31))
+# define MULT32_32_P31_ovflw(a, b) MULT32_32_P31(a, b)
 #else
-#define MULT16_16U(a,b) ((oac_uint32)(a)*(oac_uint32)(b))
-#define MULT32_32_P31(a,b) ADD32(SHL(MULT16_16(SHR((a),16),SHR((b),16)),1), SHR32(128+(oac_int32)SHR(MULT16_16U(((a)&0x0000ffff),((b)&0x0000ffff)),16+7) + SHR32(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),7) + SHR32(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),7), 8) )
-#define MULT32_32_P31_ovflw(a,b) ADD32_ovflw(SHL(MULT16_16(SHR((a),16),SHR((b),16)),1), SHR32(128+(oac_int32)SHR(MULT16_16U(((a)&0x0000ffff),((b)&0x0000ffff)),16+7) + SHR32(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),7) + SHR32(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),7), 8) )
+# define MULT16_16U(a, b) ((oac_uint32)(a)*(oac_uint32)(b))
+# define MULT32_32_P31(a, b) ADD32(SHL(MULT16_16(SHR((a), 16), SHR((b), 16)), 1), \
+    SHR32(128 + (oac_int32)SHR(MULT16_16U(((a)&0x0000ffff), ((b)&0x0000ffff)), \
+    16 + 7) + SHR32(MULT16_16SU(SHR((a), 16), ((b)&0x0000ffff)), 7) + SHR32(MULT16_16SU(SHR((b), 16), ((a)&0x0000ffff)), \
+    7), 8))
+# define MULT32_32_P31_ovflw(a, b) ADD32_ovflw(SHL(MULT16_16(SHR((a), 16), SHR((b), 16)), 1), \
+    SHR32(128 + (oac_int32)SHR(MULT16_16U(((a)&0x0000ffff), ((b)&0x0000ffff)), \
+    16 + 7) + SHR32(MULT16_16SU(SHR((a), 16), ((b)&0x0000ffff)), 7) + SHR32(MULT16_16SU(SHR((b), 16), ((a)&0x0000ffff)), \
+    7), 8))
 #endif
 
 /** 32x32 multiplication, followed by a 32-bit shift right. Results fits in 32 bits */
 #if OAC_FAST_INT64
-#define MULT32_32_Q32(a,b) ((oac_val32)SHR((oac_int64)(a)*(oac_int64)(b),32))
+# define MULT32_32_Q32(a, b) ((oac_val32)SHR((oac_int64)(a)*(oac_int64)(b), 32))
 #else
-#define MULT32_32_Q32(a,b) ADD32(ADD32(MULT16_16(SHR((a),16),SHR((b),16)), SHR(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),16)), SHR(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),16))
+# define MULT32_32_Q32(a, \
+                       b) ADD32(ADD32(MULT16_16(SHR((a), 16), SHR((b), 16)), \
+    SHR(MULT16_16SU(SHR((a), 16), ((b)&0x0000ffff)), 16)), SHR(MULT16_16SU(SHR((b), 16), ((a)&0x0000ffff)), 16))
 #endif
 
 /** Compile-time conversion of float constant to 16-bit value */
-#define QCONST16(x,bits) ((oac_val16)(.5+(x)*(((oac_val32)1)<<(bits))))
+#define QCONST16(x, bits) ((oac_val16)(.5 + (x)*(((oac_val32)1)<<(bits))))
 
 /** Compile-time conversion of float constant to 32-bit value */
-#define QCONST32(x,bits) ((oac_val32)(.5+(x)*(((oac_int64)1)<<(bits))))
+#define QCONST32(x, bits) ((oac_val32)(.5 + (x)*(((oac_int64)1)<<(bits))))
 
 /** Compile-time conversion of float constant to log gain value */
-#define GCONST2(x,bits) ((celt_glog)(.5+(x)*(((celt_glog)1)<<(bits))))
+#define GCONST2(x, bits) ((celt_glog)(.5 + (x)*(((celt_glog)1)<<(bits))))
 
 /** Compile-time conversion of float constant to DB_SHIFT log gain value */
-#define GCONST(x) GCONST2((x),DB_SHIFT)
+#define GCONST(x) GCONST2((x), DB_SHIFT)
 
 /** Negate a 16-bit value */
 #define NEG16(x) (-(x))
@@ -111,107 +125,107 @@
 #define EXTEND32(x) ((oac_val32)(x))
 
 /** Arithmetic shift-right of a 16-bit value */
-#define SHR16(a,shift) ((a) >> (shift))
+#define SHR16(a, shift) ((a)>>(shift))
 /** Arithmetic shift-left of a 16-bit value */
-#define SHL16(a,shift) ((oac_int16)((oac_uint16)(a)<<(shift)))
+#define SHL16(a, shift) ((oac_int16)((oac_uint16)(a)<<(shift)))
 /** Arithmetic shift-right of a 32-bit value */
-#define SHR32(a,shift) ((a) >> (shift))
+#define SHR32(a, shift) ((a)>>(shift))
 /** Arithmetic shift-left of a 32-bit value */
-#define SHL32(a,shift) ((oac_int32)((oac_uint32)(a)<<(shift)))
+#define SHL32(a, shift) ((oac_int32)((oac_uint32)(a)<<(shift)))
 
 /** 32-bit arithmetic shift right with rounding-to-nearest instead of rounding down */
-#define PSHR32(a,shift) (SHR32((a)+((EXTEND32(1)<<((shift))>>1)),shift))
+#define PSHR32(a, shift) (SHR32((a) + ((EXTEND32(1)<<((shift))>>1)), shift))
 /** 32-bit arithmetic shift right where the argument can be negative */
-#define VSHR32(a, shift) (((shift)>0) ? SHR32(a, shift) : SHL32(a, -(shift)))
+#define VSHR32(a, shift) (((shift) > 0) ? SHR32(a, shift) : SHL32(a, -(shift)))
 
 /** Arithmetic shift-right of a 64-bit value */
-#define SHR64(a,shift) ((a) >> (shift))
+#define SHR64(a, shift) ((a)>>(shift))
 
 /** "RAW" macros, should not be used outside of this header file */
-#define SHR(a,shift) ((a) >> (shift))
-#define SHL(a,shift) SHL32(a,shift)
-#define PSHR(a,shift) (SHR((a)+((EXTEND32(1)<<((shift))>>1)),shift))
-#define SATURATE(x,a) (((x)>(a) ? (a) : (x)<-(a) ? -(a) : (x)))
+#define SHR(a, shift) ((a)>>(shift))
+#define SHL(a, shift) SHL32(a, shift)
+#define PSHR(a, shift) (SHR((a) + ((EXTEND32(1)<<((shift))>>1)), shift))
+#define SATURATE(x, a) (((x) > (a) ? (a) : (x) < -(a) ? -(a) : (x)))
 
-#define SATURATE16(x) (EXTRACT16((x)>32767 ? 32767 : (x)<-32768 ? -32768 : (x)))
+#define SATURATE16(x) (EXTRACT16((x) > 32767 ? 32767 : (x) < -32768 ? -32768 : (x)))
 
 /** Shift by a and round-to-nearest 32-bit value. Result is a 16-bit value */
-#define ROUND16(x,a) (EXTRACT16(PSHR32((x),(a))))
+#define ROUND16(x, a) (EXTRACT16(PSHR32((x), (a))))
 /** Shift by a and round-to-nearest 32-bit value. Result is a saturated 16-bit value */
-#define SROUND16(x,a) EXTRACT16(SATURATE(PSHR32(x,a), 32767));
+#define SROUND16(x, a) EXTRACT16(SATURATE(PSHR32(x, a), 32767));
 
 /** Divide by two */
-#define HALF16(x)  (SHR16(x,1))
-#define HALF32(x)  (SHR32(x,1))
+#define HALF16(x)  (SHR16(x, 1))
+#define HALF32(x)  (SHR32(x, 1))
 
 /** Add two 16-bit values */
-#define ADD16(a,b) ((oac_val16)((oac_val16)(a)+(oac_val16)(b)))
+#define ADD16(a, b) ((oac_val16)((oac_val16)(a) + (oac_val16)(b)))
 /** Subtract two 16-bit values */
-#define SUB16(a,b) ((oac_val16)(a)-(oac_val16)(b))
+#define SUB16(a, b) ((oac_val16)(a) - (oac_val16)(b))
 /** Add two 32-bit values */
-#define ADD32(a,b) ((oac_val32)(a)+(oac_val32)(b))
+#define ADD32(a, b) ((oac_val32)(a) + (oac_val32)(b))
 /** Subtract two 32-bit values */
-#define SUB32(a,b) ((oac_val32)(a)-(oac_val32)(b))
+#define SUB32(a, b) ((oac_val32)(a) - (oac_val32)(b))
 
 /** Add two 32-bit values, ignore any overflows */
-#define ADD32_ovflw(a,b) ((oac_val32)((oac_uint32)(a)+(oac_uint32)(b)))
+#define ADD32_ovflw(a, b) ((oac_val32)((oac_uint32)(a) + (oac_uint32)(b)))
 /** Subtract two 32-bit values, ignore any overflows */
-#define SUB32_ovflw(a,b) ((oac_val32)((oac_uint32)(a)-(oac_uint32)(b)))
+#define SUB32_ovflw(a, b) ((oac_val32)((oac_uint32)(a) - (oac_uint32)(b)))
 /* Avoid MSVC warning C4146: unary minus operator applied to unsigned type */
 /** Negate 32-bit value, ignore any overflows */
-#define NEG32_ovflw(a) ((oac_val32)(0-(oac_uint32)(a)))
+#define NEG32_ovflw(a) ((oac_val32)(0 - (oac_uint32)(a)))
 /** 32-bit shift left, ignoring overflows */
-#define SHL32_ovflw(a,shift) SHL32(a,shift)
+#define SHL32_ovflw(a, shift) SHL32(a, shift)
 /** 32-bit arithmetic shift right with rounding-to-nearest, ignoring overflows */
-#define PSHR32_ovflw(a,shift) (SHR32(ADD32_ovflw(a, (EXTEND32(1)<<(shift)>>1)),shift))
+#define PSHR32_ovflw(a, shift) (SHR32(ADD32_ovflw(a, (EXTEND32(1)<<(shift)>>1)), shift))
 
 /** 16x16 multiplication where the result fits in 16 bits */
-#define MULT16_16_16(a,b)     ((((oac_val16)(a))*((oac_val16)(b))))
+#define MULT16_16_16(a, b)     ((((oac_val16)(a))*((oac_val16)(b))))
 
 /** 32x32 multiplication where the result fits in 32 bits */
-#define MULT32_32_32(a,b)     ((((oac_val32)(a))*((oac_val32)(b))))
+#define MULT32_32_32(a, b)     ((((oac_val32)(a))*((oac_val32)(b))))
 
 /* (oac_val32)(oac_val16) gives TI compiler a hint that it's 16x16->32 multiply */
 /** 16x16 multiplication where the result fits in 32 bits */
-#define MULT16_16(a,b)     (((oac_val32)(oac_val16)(a))*((oac_val32)(oac_val16)(b)))
+#define MULT16_16(a, b)     (((oac_val32)(oac_val16)(a))*((oac_val32)(oac_val16)(b)))
 
 /** 16x16 multiply-add where the result fits in 32 bits */
-#define MAC16_16(c,a,b) (ADD32((c),MULT16_16((a),(b))))
+#define MAC16_16(c, a, b) (ADD32((c), MULT16_16((a), (b))))
 /** 16x32 multiply, followed by a 15-bit shift right and 32-bit add.
     b must fit in 31 bits.
     Result fits in 32 bits. */
-#define MAC16_32_Q15(c,a,b) ADD32((c),ADD32(MULT16_16((a),SHR((b),15)), SHR(MULT16_16((a),((b)&0x00007fff)),15)))
+#define MAC16_32_Q15(c, a, b) ADD32((c), ADD32(MULT16_16((a), SHR((b), 15)), SHR(MULT16_16((a), ((b)&0x00007fff)), 15)))
 
 /** 16x32 multiplication, followed by a 16-bit shift right and 32-bit add.
     Results fits in 32 bits */
-#define MAC16_32_Q16(c,a,b) ADD32((c),ADD32(MULT16_16((a),SHR((b),16)), SHR(MULT16_16SU((a),((b)&0x0000ffff)),16)))
+#define MAC16_32_Q16(c, a, b) ADD32((c), \
+    ADD32(MULT16_16((a), SHR((b), 16)), SHR(MULT16_16SU((a), ((b)&0x0000ffff)), 16)))
 
-#define MULT16_16_Q11_32(a,b) (SHR(MULT16_16((a),(b)),11))
-#define MULT16_16_Q11(a,b) (SHR(MULT16_16((a),(b)),11))
-#define MULT16_16_Q13(a,b) (SHR(MULT16_16((a),(b)),13))
-#define MULT16_16_Q14(a,b) (SHR(MULT16_16((a),(b)),14))
-#define MULT16_16_Q15(a,b) (SHR(MULT16_16((a),(b)),15))
+#define MULT16_16_Q11_32(a, b) (SHR(MULT16_16((a), (b)), 11))
+#define MULT16_16_Q11(a, b) (SHR(MULT16_16((a), (b)), 11))
+#define MULT16_16_Q13(a, b) (SHR(MULT16_16((a), (b)), 13))
+#define MULT16_16_Q14(a, b) (SHR(MULT16_16((a), (b)), 14))
+#define MULT16_16_Q15(a, b) (SHR(MULT16_16((a), (b)), 15))
 
-#define MULT16_16_P13(a,b) (SHR(ADD32(4096,MULT16_16((a),(b))),13))
-#define MULT16_16_P14(a,b) (SHR(ADD32(8192,MULT16_16((a),(b))),14))
-#define MULT16_16_P15(a,b) (SHR(ADD32(16384,MULT16_16((a),(b))),15))
+#define MULT16_16_P13(a, b) (SHR(ADD32(4096, MULT16_16((a), (b))), 13))
+#define MULT16_16_P14(a, b) (SHR(ADD32(8192, MULT16_16((a), (b))), 14))
+#define MULT16_16_P15(a, b) (SHR(ADD32(16384, MULT16_16((a), (b))), 15))
 
 /** Divide a 32-bit value by a 16-bit value. Result fits in 16 bits */
-#define DIV32_16(a,b) ((oac_val16)(((oac_val32)(a))/((oac_val16)(b))))
+#define DIV32_16(a, b) ((oac_val16)(((oac_val32)(a))/((oac_val16)(b))))
 
 /** Divide a 32-bit value by a 32-bit value. Result fits in 32 bits */
-#define DIV32(a,b) (((oac_val32)(a))/((oac_val32)(b)))
+#define DIV32(a, b) (((oac_val32)(a))/((oac_val32)(b)))
 
 #if defined(__mips)
-#include "mips/fixed_generic_mipsr1.h"
+# include "mips/fixed_generic_mipsr1.h"
 #endif
 
-static OAC_INLINE oac_val16 SIG2WORD16_generic(celt_sig x)
-{
-   x = PSHR32(x, SIG_SHIFT);
-   x = MAX32(x, -32768);
-   x = MIN32(x, 32767);
-   return EXTRACT16(x);
+static OAC_INLINE oac_val16 SIG2WORD16_generic(celt_sig x) {
+    x = PSHR32(x, SIG_SHIFT);
+    x = MAX32(x, -32768);
+    x = MIN32(x, 32767);
+    return EXTRACT16(x);
 }
 #define SIG2WORD16(x) (SIG2WORD16_generic(x))
 
diff --git a/celt/float_cast.h b/celt/float_cast.h
index c94a0f27f..ba159654b 100644
--- a/celt/float_cast.h
+++ b/celt/float_cast.h
@@ -22,7 +22,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 /* Version 1.1 */
 
@@ -64,47 +64,46 @@
 /* With GCC, when SSE is available, the fastest conversion is cvtss2si. */
 #if defined(__GNUC__) && defined(__SSE__)
 
-#include <xmmintrin.h>
-static OAC_INLINE oac_int32 float2int(float x) {return _mm_cvt_ss2si(_mm_set_ss(x));}
+# include <xmmintrin.h>
+static OAC_INLINE oac_int32 float2int(float x) {
+    return _mm_cvt_ss2si(_mm_set_ss(x));
+}
 
 #elif (defined(_MSC_VER) && _MSC_VER >= 1400) && (defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP >= 1))
 
-        #include <xmmintrin.h>
-        static OAC_INLINE oac_int32 float2int(float value)
-        {
-                /* _mm_load_ss will generate same code as _mm_set_ss
-                ** in _MSC_VER >= 1914 /02 so keep __mm_load__ss
-                ** for backward compatibility.
-                */
-                return _mm_cvtss_si32(_mm_load_ss(&value));
-        }
+# include <xmmintrin.h>
+static OAC_INLINE oac_int32 float2int(float value) {
+    /* _mm_load_ss will generate same code as _mm_set_ss
+    ** in _MSC_VER >= 1914 /02 so keep __mm_load__ss
+    ** for backward compatibility.
+    */
+    return _mm_cvtss_si32(_mm_load_ss(&value));
+}
 
 #elif (defined(_MSC_VER) && _MSC_VER >= 1400) && defined (_M_IX86)
 
-        #include <math.h>
+# include <math.h>
 
-        /*      Win32 doesn't seem to have these functions.
-        **      Therefore implement OAC_INLINE versions of these functions here.
-        */
+/*      Win32 doesn't seem to have these functions.
+**      Therefore implement OAC_INLINE versions of these functions here.
+*/
 
-        static OAC_INLINE oac_int32
-        float2int (float flt)
-        {       int intgr;
+static OAC_INLINE oac_int32 float2int (float flt)                             {
+    int intgr;
 
-                _asm
-                {       fld flt
-                        fistp intgr
-                } ;
+    _asm
+    {       fld flt
+            fistp intgr
+    };
 
-                return intgr ;
-        }
+    return intgr;
+}
 #elif defined(__aarch64__)
 
-        #include <arm_neon.h>
-        static OAC_INLINE oac_int32 float2int(float flt)
-        {
-                return vcvtns_s32_f32(flt);
-        }
+# include <arm_neon.h>
+static OAC_INLINE oac_int32 float2int(float flt) {
+    return vcvtns_s32_f32(flt);
+}
 
 #elif defined(HAVE_LRINTF) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
@@ -115,62 +114,59 @@ static OAC_INLINE oac_int32 float2int(float x) {return _mm_cvt_ss2si(_mm_set_ss(
 **      maths library using -lm.
 */
 
-#define _ISOC9X_SOURCE 1
-#define _ISOC99_SOURCE 1
+# define _ISOC9X_SOURCE 1
+# define _ISOC99_SOURCE 1
 
-#define __USE_ISOC9X 1
-#define __USE_ISOC99 1
+# define __USE_ISOC9X 1
+# define __USE_ISOC99 1
 
-#include <math.h>
-#define float2int(x) lrintf(x)
+# include <math.h>
+# define float2int(x) lrintf(x)
 
 #elif defined(HAVE_LRINT) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
-#define _ISOC9X_SOURCE 1
-#define _ISOC99_SOURCE 1
+# define _ISOC9X_SOURCE 1
+# define _ISOC99_SOURCE 1
 
-#define __USE_ISOC9X 1
-#define __USE_ISOC99 1
+# define __USE_ISOC9X 1
+# define __USE_ISOC99 1
 
-#include <math.h>
-#define float2int(x) lrint(x)
+# include <math.h>
+# define float2int(x) lrint(x)
 
 #else
 
-#if (defined(__GNUC__) && defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L)
-        /* supported by gcc in C99 mode, but not by all other compilers */
-        #warning "Don't have the functions lrint() and lrintf ()."
-        #warning "Replacing these functions with a standard C cast."
-#endif /* __STDC_VERSION__ >= 199901L */
-        #include <math.h>
-        #define float2int(flt) ((int)(floor(.5+flt)))
+# if (defined(__GNUC__) && defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L)
+/* supported by gcc in C99 mode, but not by all other compilers */
+#  warning "Don't have the functions lrint() and lrintf ()."
+#  warning "Replacing these functions with a standard C cast."
+# endif /* __STDC_VERSION__ >= 199901L */
+# include <math.h>
+# define float2int(flt) ((int)(floor(.5 + flt)))
 #endif
 
 #ifndef DISABLE_FLOAT_API
-static OAC_INLINE oac_int16 FLOAT2INT16(float x)
-{
-   x = x*CELT_SIG_SCALE;
-   x = MAX32(x, -32768);
-   x = MIN32(x, 32767);
-   return (oac_int16)float2int(x);
+static OAC_INLINE oac_int16 FLOAT2INT16(float x) {
+    x = x*CELT_SIG_SCALE;
+    x = MAX32(x, -32768);
+    x = MIN32(x, 32767);
+    return (oac_int16)float2int(x);
 }
 
-static OAC_INLINE oac_int32 FLOAT2INT24(float x)
-{
-   x = x*(CELT_SIG_SCALE*256.f);
-   x = MAX32(x, -16777216);
-   x = MIN32(x, 16777216);
-   return float2int(x);
+static OAC_INLINE oac_int32 FLOAT2INT24(float x) {
+    x = x*(CELT_SIG_SCALE*256.f);
+    x = MAX32(x, -16777216);
+    x = MIN32(x, 16777216);
+    return float2int(x);
 }
-#ifdef FIXED_POINT
-static OAC_INLINE oac_int32 FLOAT2SIG(float x)
-{
-   x = x*((oac_int32)32768<<SIG_SHIFT);
-   x = MAX32(x, -(65536<<SIG_SHIFT));
-   x = MIN32(x, 65536<<SIG_SHIFT);
-   return float2int(x);
+# ifdef FIXED_POINT
+static OAC_INLINE oac_int32 FLOAT2SIG(float x) {
+    x = x*((oac_int32)32768<<SIG_SHIFT);
+    x = MAX32(x, -(65536<<SIG_SHIFT));
+    x = MIN32(x, 65536<<SIG_SHIFT);
+    return float2int(x);
 }
-#endif
+# endif
 #endif /* DISABLE_FLOAT_API */
 
 #endif /* FLOAT_CAST_H */
diff --git a/celt/kiss_fft.c b/celt/kiss_fft.c
index 7c7470be4..a78feedb7 100644
--- a/celt/kiss_fft.c
+++ b/celt/kiss_fft.c
@@ -1,38 +1,38 @@
 /*Copyright (c) 2003-2004, Mark Borgerding
-  Lots of modifications by Jean-Marc Valin
-  Copyright (c) 2005-2007, Xiph.Org Foundation
-  Copyright (c) 2008,      Xiph.Org Foundation, CSIRO
+   Lots of modifications by Jean-Marc Valin
+   Copyright (c) 2005-2007, Xiph.Org Foundation
+   Copyright (c) 2008,      Xiph.Org Foundation, CSIRO
 
-  All rights reserved.
+   All rights reserved.
 
-  Redistribution and use in source and binary forms, with or without
+   Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright notice,
+ * Redistributions of source code must retain the above copyright notice,
        this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
+ * Redistributions in binary form must reproduce the above copyright notice,
        this list of conditions and the following disclaimer in the
        documentation and/or other materials provided with the distribution.
 
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGE.*/
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.*/
 
 /* This code is originally from Mark Borgerding's KISS-FFT but has been
    heavily modified to better suit Oac */
 
 #ifndef SKIP_CONFIG_H
-#  ifdef HAVE_CONFIG_H
-#    include "config.h"
-#  endif
+# ifdef HAVE_CONFIG_H
+#  include "config.h"
+# endif
 #endif
 
 #include "_kiss_fft_guts.h"
@@ -42,275 +42,260 @@
 #include "stack_alloc.h"
 
 #ifndef M_PI
-#define M_PI 3.141592653
+# define M_PI 3.141592653
 #endif
 
 /* The guts header contains all the multiplication and addition macros that are defined for
    complex numbers.  It also declares the kf_ internal functions.
-*/
+ */
 
 static void kf_bfly2(
-                     kiss_fft_cpx * Fout,
-                     int m,
-                     int N
-                    )
-{
-   kiss_fft_cpx * Fout2;
-   int i;
-   (void)m;
+    kiss_fft_cpx * Fout,
+    int m,
+    int N) {
+    kiss_fft_cpx * Fout2;
+    int i;
+    (void)m;
 #ifdef CUSTOM_MODES
-   if (m==1)
-   {
-      celt_assert(m==1);
-      for (i=0;i<N;i++)
-      {
-         kiss_fft_cpx t;
-         Fout2 = Fout + 1;
-         t = *Fout2;
-         C_SUB( *Fout2 ,  *Fout , t );
-         C_ADDTO( *Fout ,  t );
-         Fout += 2;
-      }
-   } else
+    if (m == 1) {
+        celt_assert(m == 1);
+        for (i = 0; i < N; i++) {
+            kiss_fft_cpx t;
+            Fout2 = Fout + 1;
+            t = *Fout2;
+            C_SUB( *Fout2,  *Fout, t );
+            C_ADDTO( *Fout,  t );
+            Fout += 2;
+        }
+    } else
 #endif
-   {
-      celt_coef tw;
-      tw = QCONST32(0.7071067812f, COEF_SHIFT-1);
-      /* We know that m==4 here because the radix-2 is just after a radix-4 */
-      celt_assert(m==4);
-      for (i=0;i<N;i++)
-      {
-         kiss_fft_cpx t;
-         Fout2 = Fout + 4;
-         t = Fout2[0];
-         C_SUB( Fout2[0] ,  Fout[0] , t );
-         C_ADDTO( Fout[0] ,  t );
-
-         t.r = S_MUL(ADD32_ovflw(Fout2[1].r, Fout2[1].i), tw);
-         t.i = S_MUL(SUB32_ovflw(Fout2[1].i, Fout2[1].r), tw);
-         C_SUB( Fout2[1] ,  Fout[1] , t );
-         C_ADDTO( Fout[1] ,  t );
-
-         t.r = Fout2[2].i;
-         t.i = NEG32_ovflw(Fout2[2].r);
-         C_SUB( Fout2[2] ,  Fout[2] , t );
-         C_ADDTO( Fout[2] ,  t );
-
-         t.r = S_MUL(SUB32_ovflw(Fout2[3].i, Fout2[3].r), tw);
-         t.i = S_MUL(NEG32_ovflw(ADD32_ovflw(Fout2[3].i, Fout2[3].r)), tw);
-         C_SUB( Fout2[3] ,  Fout[3] , t );
-         C_ADDTO( Fout[3] ,  t );
-         Fout += 8;
-      }
-   }
+    {
+        celt_coef tw;
+        tw = QCONST32(0.7071067812f, COEF_SHIFT - 1);
+        /* We know that m==4 here because the radix-2 is just after a radix-4 */
+        celt_assert(m == 4);
+        for (i = 0; i < N; i++) {
+            kiss_fft_cpx t;
+            Fout2 = Fout + 4;
+            t = Fout2[0];
+            C_SUB( Fout2[0],  Fout[0], t );
+            C_ADDTO( Fout[0],  t );
+
+            t.r = S_MUL(ADD32_ovflw(Fout2[1].r, Fout2[1].i), tw);
+            t.i = S_MUL(SUB32_ovflw(Fout2[1].i, Fout2[1].r), tw);
+            C_SUB( Fout2[1],  Fout[1], t );
+            C_ADDTO( Fout[1],  t );
+
+            t.r = Fout2[2].i;
+            t.i = NEG32_ovflw(Fout2[2].r);
+            C_SUB( Fout2[2],  Fout[2], t );
+            C_ADDTO( Fout[2],  t );
+
+            t.r = S_MUL(SUB32_ovflw(Fout2[3].i, Fout2[3].r), tw);
+            t.i = S_MUL(NEG32_ovflw(ADD32_ovflw(Fout2[3].i, Fout2[3].r)), tw);
+            C_SUB( Fout2[3],  Fout[3], t );
+            C_ADDTO( Fout[3],  t );
+            Fout += 8;
+        }
+    }
 }
 
 static void kf_bfly4(
-                     kiss_fft_cpx * Fout,
-                     const size_t fstride,
-                     const kiss_fft_state *st,
-                     int m,
-                     int N,
-                     int mm
-                    )
-{
-   int i;
-
-   if (m==1)
-   {
-      /* Degenerate case where all the twiddles are 1. */
-      for (i=0;i<N;i++)
-      {
-         kiss_fft_cpx scratch0, scratch1;
-
-         C_SUB( scratch0 , *Fout, Fout[2] );
-         C_ADDTO(*Fout, Fout[2]);
-         C_ADD( scratch1 , Fout[1] , Fout[3] );
-         C_SUB( Fout[2], *Fout, scratch1 );
-         C_ADDTO( *Fout , scratch1 );
-         C_SUB( scratch1 , Fout[1] , Fout[3] );
-
-         Fout[1].r = ADD32_ovflw(scratch0.r, scratch1.i);
-         Fout[1].i = SUB32_ovflw(scratch0.i, scratch1.r);
-         Fout[3].r = SUB32_ovflw(scratch0.r, scratch1.i);
-         Fout[3].i = ADD32_ovflw(scratch0.i, scratch1.r);
-         Fout+=4;
-      }
-   } else {
-      int j;
-      kiss_fft_cpx scratch[6];
-      const kiss_twiddle_cpx *tw1,*tw2,*tw3;
-      const int m2=2*m;
-      const int m3=3*m;
-      kiss_fft_cpx * Fout_beg = Fout;
-      for (i=0;i<N;i++)
-      {
-         Fout = Fout_beg + i*mm;
-         tw3 = tw2 = tw1 = st->twiddles;
-         /* m is guaranteed to be a multiple of 4. */
-         for (j=0;j<m;j++)
-         {
-            C_MUL(scratch[0],Fout[m] , *tw1 );
-            C_MUL(scratch[1],Fout[m2] , *tw2 );
-            C_MUL(scratch[2],Fout[m3] , *tw3 );
-
-            C_SUB( scratch[5] , *Fout, scratch[1] );
-            C_ADDTO(*Fout, scratch[1]);
-            C_ADD( scratch[3] , scratch[0] , scratch[2] );
-            C_SUB( scratch[4] , scratch[0] , scratch[2] );
-            C_SUB( Fout[m2], *Fout, scratch[3] );
-            tw1 += fstride;
-            tw2 += fstride*2;
-            tw3 += fstride*3;
-            C_ADDTO( *Fout , scratch[3] );
+    kiss_fft_cpx * Fout,
+    const size_t fstride,
+    const kiss_fft_state *st,
+    int m,
+    int N,
+    int mm) {
+    int i;
 
-            Fout[m].r = ADD32_ovflw(scratch[5].r, scratch[4].i);
-            Fout[m].i = SUB32_ovflw(scratch[5].i, scratch[4].r);
-            Fout[m3].r = SUB32_ovflw(scratch[5].r, scratch[4].i);
-            Fout[m3].i = ADD32_ovflw(scratch[5].i, scratch[4].r);
-            ++Fout;
-         }
-      }
-   }
+    if (m == 1) {
+        /* Degenerate case where all the twiddles are 1. */
+        for (i = 0; i < N; i++) {
+            kiss_fft_cpx scratch0, scratch1;
+
+            C_SUB( scratch0, *Fout, Fout[2] );
+            C_ADDTO(*Fout, Fout[2]);
+            C_ADD( scratch1, Fout[1], Fout[3] );
+            C_SUB( Fout[2], *Fout, scratch1 );
+            C_ADDTO( *Fout, scratch1 );
+            C_SUB( scratch1, Fout[1], Fout[3] );
+
+            Fout[1].r = ADD32_ovflw(scratch0.r, scratch1.i);
+            Fout[1].i = SUB32_ovflw(scratch0.i, scratch1.r);
+            Fout[3].r = SUB32_ovflw(scratch0.r, scratch1.i);
+            Fout[3].i = ADD32_ovflw(scratch0.i, scratch1.r);
+            Fout += 4;
+        }
+    } else {
+        int j;
+        kiss_fft_cpx scratch[6];
+        const kiss_twiddle_cpx *tw1, *tw2, *tw3;
+        const int m2 = 2*m;
+        const int m3 = 3*m;
+        kiss_fft_cpx * Fout_beg = Fout;
+        for (i = 0; i < N; i++) {
+            Fout = Fout_beg + i*mm;
+            tw3 = tw2 = tw1 = st->twiddles;
+            /* m is guaranteed to be a multiple of 4. */
+            for (j = 0; j < m; j++) {
+                C_MUL(scratch[0], Fout[m], *tw1 );
+                C_MUL(scratch[1], Fout[m2], *tw2 );
+                C_MUL(scratch[2], Fout[m3], *tw3 );
+
+                C_SUB( scratch[5], *Fout, scratch[1] );
+                C_ADDTO(*Fout, scratch[1]);
+                C_ADD( scratch[3], scratch[0], scratch[2] );
+                C_SUB( scratch[4], scratch[0], scratch[2] );
+                C_SUB( Fout[m2], *Fout, scratch[3] );
+                tw1 += fstride;
+                tw2 += fstride*2;
+                tw3 += fstride*3;
+                C_ADDTO( *Fout, scratch[3] );
+
+                Fout[m].r = ADD32_ovflw(scratch[5].r, scratch[4].i);
+                Fout[m].i = SUB32_ovflw(scratch[5].i, scratch[4].r);
+                Fout[m3].r = SUB32_ovflw(scratch[5].r, scratch[4].i);
+                Fout[m3].i = ADD32_ovflw(scratch[5].i, scratch[4].r);
+                ++Fout;
+            }
+        }
+    }
 }
 
 
 #ifndef RADIX_TWO_ONLY
 
 static void kf_bfly3(
-                     kiss_fft_cpx * Fout,
-                     const size_t fstride,
-                     const kiss_fft_state *st,
-                     int m,
-                     int N,
-                     int mm
-                    )
-{
-   int i;
-   size_t k;
-   const size_t m2 = 2*m;
-   const kiss_twiddle_cpx *tw1,*tw2;
-   kiss_fft_cpx scratch[5];
-   kiss_twiddle_cpx epi3;
-
-   kiss_fft_cpx * Fout_beg = Fout;
-#ifdef FIXED_POINT
-   /*epi3.r = -16384;*/ /* Unused */
-   epi3.i = -QCONST32(0.86602540f, COEF_SHIFT-1);
-#else
-   epi3 = st->twiddles[fstride*m];
-#endif
-   for (i=0;i<N;i++)
-   {
-      Fout = Fout_beg + i*mm;
-      tw1=tw2=st->twiddles;
-      /* For non-custom modes, m is guaranteed to be a multiple of 4. */
-      k=m;
-      do {
-
-         C_MUL(scratch[1],Fout[m] , *tw1);
-         C_MUL(scratch[2],Fout[m2] , *tw2);
-
-         C_ADD(scratch[3],scratch[1],scratch[2]);
-         C_SUB(scratch[0],scratch[1],scratch[2]);
-         tw1 += fstride;
-         tw2 += fstride*2;
+    kiss_fft_cpx * Fout,
+    const size_t fstride,
+    const kiss_fft_state *st,
+    int m,
+    int N,
+    int mm) {
+    int i;
+    size_t k;
+    const size_t m2 = 2*m;
+    const kiss_twiddle_cpx *tw1, *tw2;
+    kiss_fft_cpx scratch[5];
+    kiss_twiddle_cpx epi3;
+
+    kiss_fft_cpx * Fout_beg = Fout;
+# ifdef FIXED_POINT
+    /*epi3.r = -16384;*/ /* Unused */
+    epi3.i = -QCONST32(0.86602540f, COEF_SHIFT - 1);
+# else
+    epi3 = st->twiddles[fstride*m];
+# endif
+    for (i = 0; i < N; i++) {
+        Fout = Fout_beg + i*mm;
+        tw1 = tw2 = st->twiddles;
+        /* For non-custom modes, m is guaranteed to be a multiple of 4. */
+        k = m;
+        do {
+
+            C_MUL(scratch[1], Fout[m], *tw1);
+            C_MUL(scratch[2], Fout[m2], *tw2);
+
+            C_ADD(scratch[3], scratch[1], scratch[2]);
+            C_SUB(scratch[0], scratch[1], scratch[2]);
+            tw1 += fstride;
+            tw2 += fstride*2;
 
-         Fout[m].r = SUB32_ovflw(Fout->r, HALF_OF(scratch[3].r));
-         Fout[m].i = SUB32_ovflw(Fout->i, HALF_OF(scratch[3].i));
+            Fout[m].r = SUB32_ovflw(Fout->r, HALF_OF(scratch[3].r));
+            Fout[m].i = SUB32_ovflw(Fout->i, HALF_OF(scratch[3].i));
 
-         C_MULBYSCALAR( scratch[0] , epi3.i );
+            C_MULBYSCALAR( scratch[0], epi3.i );
 
-         C_ADDTO(*Fout,scratch[3]);
+            C_ADDTO(*Fout, scratch[3]);
 
-         Fout[m2].r = ADD32_ovflw(Fout[m].r, scratch[0].i);
-         Fout[m2].i = SUB32_ovflw(Fout[m].i, scratch[0].r);
+            Fout[m2].r = ADD32_ovflw(Fout[m].r, scratch[0].i);
+            Fout[m2].i = SUB32_ovflw(Fout[m].i, scratch[0].r);
 
-         Fout[m].r = SUB32_ovflw(Fout[m].r, scratch[0].i);
-         Fout[m].i = ADD32_ovflw(Fout[m].i, scratch[0].r);
+            Fout[m].r = SUB32_ovflw(Fout[m].r, scratch[0].i);
+            Fout[m].i = ADD32_ovflw(Fout[m].i, scratch[0].r);
 
-         ++Fout;
-      } while(--k);
-   }
+            ++Fout;
+        } while (--k);
+    }
 }
 
 
-#ifndef OVERRIDE_kf_bfly5
+# ifndef OVERRIDE_kf_bfly5
 static void kf_bfly5(
-                     kiss_fft_cpx * Fout,
-                     const size_t fstride,
-                     const kiss_fft_state *st,
-                     int m,
-                     int N,
-                     int mm
-                    )
-{
-   kiss_fft_cpx *Fout0,*Fout1,*Fout2,*Fout3,*Fout4;
-   int i, u;
-   kiss_fft_cpx scratch[13];
-   const kiss_twiddle_cpx *tw;
-   kiss_twiddle_cpx ya,yb;
-   kiss_fft_cpx * Fout_beg = Fout;
+    kiss_fft_cpx * Fout,
+    const size_t fstride,
+    const kiss_fft_state *st,
+    int m,
+    int N,
+    int mm) {
+    kiss_fft_cpx *Fout0, *Fout1, *Fout2, *Fout3, *Fout4;
+    int i, u;
+    kiss_fft_cpx scratch[13];
+    const kiss_twiddle_cpx *tw;
+    kiss_twiddle_cpx ya, yb;
+    kiss_fft_cpx * Fout_beg = Fout;
+
+#  ifdef FIXED_POINT
+    ya.r = QCONST32(0.30901699f, COEF_SHIFT - 1);
+    ya.i = -QCONST32(0.95105652f, COEF_SHIFT - 1);
+    yb.r = -QCONST32(0.80901699f, COEF_SHIFT - 1);
+    yb.i = -QCONST32(0.58778525f, COEF_SHIFT - 1);
+#  else
+    ya = st->twiddles[fstride*m];
+    yb = st->twiddles[fstride*2*m];
+#  endif
+    tw = st->twiddles;
 
-#ifdef FIXED_POINT
-   ya.r = QCONST32(0.30901699f, COEF_SHIFT-1);
-   ya.i = -QCONST32(0.95105652f, COEF_SHIFT-1);
-   yb.r = -QCONST32(0.80901699f, COEF_SHIFT-1);
-   yb.i = -QCONST32(0.58778525f, COEF_SHIFT-1);
-#else
-   ya = st->twiddles[fstride*m];
-   yb = st->twiddles[fstride*2*m];
-#endif
-   tw=st->twiddles;
-
-   for (i=0;i<N;i++)
-   {
-      Fout = Fout_beg + i*mm;
-      Fout0=Fout;
-      Fout1=Fout0+m;
-      Fout2=Fout0+2*m;
-      Fout3=Fout0+3*m;
-      Fout4=Fout0+4*m;
-
-      /* For non-custom modes, m is guaranteed to be a multiple of 4. */
-      for ( u=0; u<m; ++u ) {
-         scratch[0] = *Fout0;
-
-         C_MUL(scratch[1] ,*Fout1, tw[u*fstride]);
-         C_MUL(scratch[2] ,*Fout2, tw[2*u*fstride]);
-         C_MUL(scratch[3] ,*Fout3, tw[3*u*fstride]);
-         C_MUL(scratch[4] ,*Fout4, tw[4*u*fstride]);
-
-         C_ADD( scratch[7],scratch[1],scratch[4]);
-         C_SUB( scratch[10],scratch[1],scratch[4]);
-         C_ADD( scratch[8],scratch[2],scratch[3]);
-         C_SUB( scratch[9],scratch[2],scratch[3]);
-
-         Fout0->r = ADD32_ovflw(Fout0->r, ADD32_ovflw(scratch[7].r, scratch[8].r));
-         Fout0->i = ADD32_ovflw(Fout0->i, ADD32_ovflw(scratch[7].i, scratch[8].i));
-
-         scratch[5].r = ADD32_ovflw(scratch[0].r, ADD32_ovflw(S_MUL(scratch[7].r,ya.r), S_MUL(scratch[8].r,yb.r)));
-         scratch[5].i = ADD32_ovflw(scratch[0].i, ADD32_ovflw(S_MUL(scratch[7].i,ya.r), S_MUL(scratch[8].i,yb.r)));
-
-         scratch[6].r =  ADD32_ovflw(S_MUL(scratch[10].i,ya.i), S_MUL(scratch[9].i,yb.i));
-         scratch[6].i = NEG32_ovflw(ADD32_ovflw(S_MUL(scratch[10].r,ya.i), S_MUL(scratch[9].r,yb.i)));
-
-         C_SUB(*Fout1,scratch[5],scratch[6]);
-         C_ADD(*Fout4,scratch[5],scratch[6]);
-
-         scratch[11].r = ADD32_ovflw(scratch[0].r, ADD32_ovflw(S_MUL(scratch[7].r,yb.r), S_MUL(scratch[8].r,ya.r)));
-         scratch[11].i = ADD32_ovflw(scratch[0].i, ADD32_ovflw(S_MUL(scratch[7].i,yb.r), S_MUL(scratch[8].i,ya.r)));
-         scratch[12].r = SUB32_ovflw(S_MUL(scratch[9].i,ya.i), S_MUL(scratch[10].i,yb.i));
-         scratch[12].i = SUB32_ovflw(S_MUL(scratch[10].r,yb.i), S_MUL(scratch[9].r,ya.i));
-
-         C_ADD(*Fout2,scratch[11],scratch[12]);
-         C_SUB(*Fout3,scratch[11],scratch[12]);
-
-         ++Fout0;++Fout1;++Fout2;++Fout3;++Fout4;
-      }
-   }
+    for (i = 0; i < N; i++) {
+        Fout = Fout_beg + i*mm;
+        Fout0 = Fout;
+        Fout1 = Fout0 + m;
+        Fout2 = Fout0 + 2*m;
+        Fout3 = Fout0 + 3*m;
+        Fout4 = Fout0 + 4*m;
+
+        /* For non-custom modes, m is guaranteed to be a multiple of 4. */
+        for (u = 0; u < m; ++u) {
+            scratch[0] = *Fout0;
+
+            C_MUL(scratch[1], *Fout1, tw[u*fstride]);
+            C_MUL(scratch[2], *Fout2, tw[2*u*fstride]);
+            C_MUL(scratch[3], *Fout3, tw[3*u*fstride]);
+            C_MUL(scratch[4], *Fout4, tw[4*u*fstride]);
+
+            C_ADD( scratch[7], scratch[1], scratch[4]);
+            C_SUB( scratch[10], scratch[1], scratch[4]);
+            C_ADD( scratch[8], scratch[2], scratch[3]);
+            C_SUB( scratch[9], scratch[2], scratch[3]);
+
+            Fout0->r = ADD32_ovflw(Fout0->r, ADD32_ovflw(scratch[7].r, scratch[8].r));
+            Fout0->i = ADD32_ovflw(Fout0->i, ADD32_ovflw(scratch[7].i, scratch[8].i));
+
+            scratch[5].r = ADD32_ovflw(scratch[0].r, ADD32_ovflw(S_MUL(scratch[7].r, ya.r), S_MUL(scratch[8].r, yb.r)));
+            scratch[5].i = ADD32_ovflw(scratch[0].i, ADD32_ovflw(S_MUL(scratch[7].i, ya.r), S_MUL(scratch[8].i, yb.r)));
+
+            scratch[6].r =  ADD32_ovflw(S_MUL(scratch[10].i, ya.i), S_MUL(scratch[9].i, yb.i));
+            scratch[6].i = NEG32_ovflw(ADD32_ovflw(S_MUL(scratch[10].r, ya.i), S_MUL(scratch[9].r, yb.i)));
+
+            C_SUB(*Fout1, scratch[5], scratch[6]);
+            C_ADD(*Fout4, scratch[5], scratch[6]);
+
+            scratch[11].r = ADD32_ovflw(scratch[0].r,
+            ADD32_ovflw(S_MUL(scratch[7].r, yb.r), S_MUL(scratch[8].r, ya.r)));
+            scratch[11].i = ADD32_ovflw(scratch[0].i,
+            ADD32_ovflw(S_MUL(scratch[7].i, yb.r), S_MUL(scratch[8].i, ya.r)));
+            scratch[12].r = SUB32_ovflw(S_MUL(scratch[9].i, ya.i), S_MUL(scratch[10].i, yb.i));
+            scratch[12].i = SUB32_ovflw(S_MUL(scratch[10].r, yb.i), S_MUL(scratch[9].r, ya.i));
+
+            C_ADD(*Fout2, scratch[11], scratch[12]);
+            C_SUB(*Fout3, scratch[11], scratch[12]);
+
+            ++Fout0; ++Fout1; ++Fout2; ++Fout3; ++Fout4;
+        }
+    }
 }
-#endif /* OVERRIDE_kf_bfly5 */
+# endif /* OVERRIDE_kf_bfly5 */
 
 
 #endif
@@ -320,35 +305,30 @@ static void kf_bfly5(
 
 static
 void compute_bitrev_table(
-         int Fout,
-         oac_int16 *f,
-         const size_t fstride,
-         int in_stride,
-         oac_int16 * factors,
-         const kiss_fft_state *st
-            )
-{
-   const int p=*factors++; /* the radix  */
-   const int m=*factors++; /* stage's fft length/p */
+    int Fout,
+    oac_int16 *f,
+    const size_t fstride,
+    int in_stride,
+    oac_int16 * factors,
+    const kiss_fft_state *st) {
+    const int p = *factors++; /* the radix  */
+    const int m = *factors++; /* stage's fft length/p */
 
     /*printf ("fft %d %d %d %d %d %d\n", p*m, m, p, s2, fstride*in_stride, N);*/
-   if (m==1)
-   {
-      int j;
-      for (j=0;j<p;j++)
-      {
-         *f = Fout+j;
-         f += fstride*in_stride;
-      }
-   } else {
-      int j;
-      for (j=0;j<p;j++)
-      {
-         compute_bitrev_table( Fout , f, fstride*p, in_stride, factors,st);
-         f += fstride*in_stride;
-         Fout += m;
-      }
-   }
+    if (m == 1) {
+        int j;
+        for (j = 0; j < p; j++) {
+            *f = Fout + j;
+            f += fstride*in_stride;
+        }
+    } else {
+        int j;
+        for (j = 0; j < p; j++) {
+            compute_bitrev_table( Fout, f, fstride*p, in_stride, factors, st);
+            f += fstride*in_stride;
+            Fout += m;
+        }
+    }
 }
 
 /*  facbuf is populated by p1,m1,p2,m2, ...
@@ -356,38 +336,36 @@ void compute_bitrev_table(
     p[i] * m[i] = m[i-1]
     m0 = n                  */
 static
-int kf_factor(int n,oac_int16 * facbuf)
-{
-    int p=4;
+int kf_factor(int n, oac_int16 * facbuf) {
+    int p = 4;
     int i;
-    int stages=0;
+    int stages = 0;
     int nbak = n;
 
     /*factor out powers of 4, powers of 2, then any remaining primes */
     do {
-        while (n % p) {
+        while (n%p) {
             switch (p) {
                 case 4: p = 2; break;
                 case 2: p = 3; break;
                 default: p += 2; break;
             }
-            if (p>32000 || (oac_int32)p*(oac_int32)p > n)
+            if (p > 32000 || (oac_int32)p*(oac_int32)p > n)
                 p = n;          /* no more factors, skip to end */
         }
         n /= p;
-#ifdef RADIX_TWO_ONLY
-        if (p!=2 && p != 4)
-#else
-        if (p>5)
-#endif
+# ifdef RADIX_TWO_ONLY
+        if (p != 2 && p != 4)
+# else
+        if (p > 5)
+# endif
         {
-           return 0;
+            return 0;
         }
         facbuf[2*stages] = p;
-        if (p==2 && stages > 1)
-        {
-           facbuf[2*stages] = 4;
-           facbuf[2] = 2;
+        if (p == 2 && stages > 1) {
+            facbuf[2*stages] = 4;
+            facbuf[2] = 2;
         }
         stages++;
     } while (n > 1);
@@ -395,42 +373,39 @@ int kf_factor(int n,oac_int16 * facbuf)
     /* Reverse the order to get the radix 4 at the end, so we can use the
        fast degenerate case. It turns out that reversing the order also
        improves the noise behaviour. */
-    for (i=0;i<stages/2;i++)
-    {
-       int tmp;
-       tmp = facbuf[2*i];
-       facbuf[2*i] = facbuf[2*(stages-i-1)];
-       facbuf[2*(stages-i-1)] = tmp;
+    for (i = 0; i < stages/2; i++) {
+        int tmp;
+        tmp = facbuf[2*i];
+        facbuf[2*i] = facbuf[2*(stages - i - 1)];
+        facbuf[2*(stages - i - 1)] = tmp;
     }
-    for (i=0;i<stages;i++)
-    {
+    for (i = 0; i < stages; i++) {
         n /= facbuf[2*i];
-        facbuf[2*i+1] = n;
+        facbuf[2*i + 1] = n;
     }
     return 1;
 }
 
-static void compute_twiddles(kiss_twiddle_cpx *twiddles, int nfft)
-{
-   int i;
-#ifdef FIXED_POINT
-   for (i=0;i<nfft;++i) {
-      oac_val32 phase = -i;
-      twiddles[i].r = (int)MIN32(2147483647, floor(.5+2147483648*cos((2*M_PI/nfft)*phase)));
-      twiddles[i].i = (int)MIN32(2147483647, floor(.5+2147483648*sin((2*M_PI/nfft)*phase)));
-   }
-#else
-   for (i=0;i<nfft;++i) {
-      const double pi=3.14159265358979323846264338327;
-      double phase = ( -2*pi /nfft ) * i;
-      kf_cexp(twiddles+i, phase );
-   }
-#endif
+static void compute_twiddles(kiss_twiddle_cpx *twiddles, int nfft) {
+    int i;
+# ifdef FIXED_POINT
+    for (i = 0; i < nfft; ++i) {
+        oac_val32 phase = -i;
+        twiddles[i].r = (int)MIN32(2147483647, floor(.5 + 2147483648*cos((2*M_PI/nfft)*phase)));
+        twiddles[i].i = (int)MIN32(2147483647, floor(.5 + 2147483648*sin((2*M_PI/nfft)*phase)));
+    }
+# else
+    for (i = 0; i < nfft; ++i) {
+        const double pi = 3.14159265358979323846264338327;
+        double phase = (-2*pi/nfft)*i;
+        kf_cexp(twiddles + i, phase );
+    }
+# endif
 }
 
 int oac_fft_alloc_arch_c(kiss_fft_state *st) {
-   (void)st;
-   return 0;
+    (void)st;
+    return 0;
 }
 
 /*
@@ -439,15 +414,14 @@ int oac_fft_alloc_arch_c(kiss_fft_state *st) {
  * The return value is a contiguous block of memory.  As such,
  * It can be freed with free().
  * */
-kiss_fft_state *oac_fft_alloc_twiddles(int nfft,void * mem,size_t * lenmem,
-                                        const kiss_fft_state *base, int arch)
-{
-    kiss_fft_state *st=NULL;
+kiss_fft_state *oac_fft_alloc_twiddles(int nfft, void * mem, size_t * lenmem,
+                                       const kiss_fft_state *base, int arch) {
+    kiss_fft_state *st = NULL;
     size_t memneeded = sizeof(struct kiss_fft_state); /* twiddle factors*/
 
-    if ( lenmem==NULL ) {
+    if (lenmem == NULL) {
         st = ( kiss_fft_state*)KISS_FFT_MALLOC( memneeded );
-    }else{
+    } else {
         if (mem != NULL && *lenmem >= memneeded)
             st = (kiss_fft_state*)mem;
         *lenmem = memneeded;
@@ -456,39 +430,37 @@ kiss_fft_state *oac_fft_alloc_twiddles(int nfft,void * mem,size_t * lenmem,
         oac_int16 *bitrev;
         kiss_twiddle_cpx *twiddles;
 
-        st->nfft=nfft;
-#ifdef FIXED_POINT
+        st->nfft = nfft;
+# ifdef FIXED_POINT
         st->scale_shift = celt_ilog2(st->nfft);
         if (st->nfft == 1<<st->scale_shift)
-           st->scale = QCONST32(1.0f, 30);
+            st->scale = QCONST32(1.0f, 30);
         else
-           st->scale = (((oac_int64)1073741824<<st->scale_shift)+st->nfft/2)/st->nfft;
-#else
+            st->scale = (((oac_int64)1073741824<<st->scale_shift) + st->nfft/2)/st->nfft;
+# else
         st->scale = 1.f/nfft;
-#endif
-        if (base != NULL)
-        {
-           st->twiddles = base->twiddles;
-           st->shift = 0;
-           while (st->shift < 32 && nfft<<st->shift != base->nfft)
-              st->shift++;
-           if (st->shift>=32)
-              goto fail;
+# endif
+        if (base != NULL) {
+            st->twiddles = base->twiddles;
+            st->shift = 0;
+            while (st->shift < 32 && nfft<<st->shift != base->nfft)
+                st->shift++;
+            if (st->shift >= 32)
+                goto fail;
         } else {
-           st->twiddles = twiddles = (kiss_twiddle_cpx*)KISS_FFT_MALLOC(sizeof(kiss_twiddle_cpx)*nfft);
-           compute_twiddles(twiddles, nfft);
-           st->shift = -1;
+            st->twiddles = twiddles = (kiss_twiddle_cpx*)KISS_FFT_MALLOC(sizeof(kiss_twiddle_cpx)*nfft);
+            compute_twiddles(twiddles, nfft);
+            st->shift = -1;
         }
-        if (!kf_factor(nfft,st->factors))
-        {
-           goto fail;
+        if (!kf_factor(nfft, st->factors)) {
+            goto fail;
         }
 
         /* bitrev */
         st->bitrev = bitrev = (oac_int16*)KISS_FFT_MALLOC(sizeof(oac_int16)*nfft);
-        if (st->bitrev==NULL)
+        if (st->bitrev == NULL)
             goto fail;
-        compute_bitrev_table(0, bitrev, 1,1, st->factors,st);
+        compute_bitrev_table(0, bitrev, 1, 1, st->factors, st);
 
         /* Initialize architecture specific fft parameters */
         if (oac_fft_alloc_arch(st, arch))
@@ -500,56 +472,52 @@ kiss_fft_state *oac_fft_alloc_twiddles(int nfft,void * mem,size_t * lenmem,
     return NULL;
 }
 
-kiss_fft_state *oac_fft_alloc(int nfft,void * mem,size_t * lenmem, int arch)
-{
-   return oac_fft_alloc_twiddles(nfft, mem, lenmem, NULL, arch);
+kiss_fft_state *oac_fft_alloc(int nfft, void * mem, size_t * lenmem, int arch) {
+    return oac_fft_alloc_twiddles(nfft, mem, lenmem, NULL, arch);
 }
 
 void oac_fft_free_arch_c(kiss_fft_state *st) {
-   (void)st;
+    (void)st;
 }
 
-void oac_fft_free(const kiss_fft_state *cfg, int arch)
-{
-   if (cfg)
-   {
-      oac_fft_free_arch((kiss_fft_state *)cfg, arch);
-      oac_free((oac_int16*)cfg->bitrev);
-      if (cfg->shift < 0)
-         oac_free((kiss_twiddle_cpx*)cfg->twiddles);
-      oac_free((kiss_fft_state*)cfg);
-   }
+void oac_fft_free(const kiss_fft_state *cfg, int arch) {
+    if (cfg) {
+        oac_fft_free_arch((kiss_fft_state *)cfg, arch);
+        oac_free((oac_int16*)cfg->bitrev);
+        if (cfg->shift < 0)
+            oac_free((kiss_twiddle_cpx*)cfg->twiddles);
+        oac_free((kiss_fft_state*)cfg);
+    }
 }
 
 #endif /* CUSTOM_MODES */
 
 #ifdef FIXED_POINT
-#ifndef OVERRIDE_fft_downshift
+# ifndef OVERRIDE_fft_downshift
 static void fft_downshift(kiss_fft_cpx *x, int N, int *total, int step) {
-   int shift;
-   shift = IMIN(step, *total);
-   *total -= shift;
-   if (shift == 1) {
-      int i;
-      for (i=0;i<N;i++) {
-         x[i].r = SHR32(x[i].r, 1);
-         x[i].i = SHR32(x[i].i, 1);
-      }
-   } else if (shift>0) {
-      int i;
-      for (i=0;i<N;i++) {
-         x[i].r = PSHR32(x[i].r, shift);
-         x[i].i = PSHR32(x[i].i, shift);
-      }
-   }
+    int shift;
+    shift = IMIN(step, *total);
+    *total -= shift;
+    if (shift == 1) {
+        int i;
+        for (i = 0; i < N; i++) {
+            x[i].r = SHR32(x[i].r, 1);
+            x[i].i = SHR32(x[i].i, 1);
+        }
+    } else if (shift > 0) {
+        int i;
+        for (i = 0; i < N; i++) {
+            x[i].r = PSHR32(x[i].r, shift);
+            x[i].i = PSHR32(x[i].i, shift);
+        }
+    }
 }
-#endif /* OVERRIDE_fft_downshift */
+# endif /* OVERRIDE_fft_downshift */
 #else
-#define fft_downshift(x, N, total, step)
+# define fft_downshift(x, N, total, step)
 #endif
 
-void oac_fft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout ARG_FIXED(int downshift))
-{
+void oac_fft_impl(const kiss_fft_state *st, kiss_fft_cpx *fout ARG_FIXED(int downshift)) {
     int m2, m;
     int p;
     int L;
@@ -558,82 +526,77 @@ void oac_fft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout ARG_FIXED(int down
     int shift;
 
     /* st->shift can be -1 */
-    shift = st->shift>0 ? st->shift : 0;
+    shift = st->shift > 0 ? st->shift : 0;
 
     fstride[0] = 1;
-    L=0;
+    L = 0;
     do {
-       p = st->factors[2*L];
-       m = st->factors[2*L+1];
-       fstride[L+1] = fstride[L]*p;
-       L++;
-    } while(m!=1);
-    m = st->factors[2*L-1];
-    for (i=L-1;i>=0;i--)
-    {
-       if (i!=0)
-          m2 = st->factors[2*i-1];
-       else
-          m2 = 1;
-       switch (st->factors[2*i])
-       {
-       case 2:
-          fft_downshift(fout, st->nfft, &downshift, 1);
-          kf_bfly2(fout, m, fstride[i]);
-          break;
-       case 4:
-          fft_downshift(fout, st->nfft, &downshift, 2);
-          kf_bfly4(fout,fstride[i]<<shift,st,m, fstride[i], m2);
-          break;
- #ifndef RADIX_TWO_ONLY
-       case 3:
-          fft_downshift(fout, st->nfft, &downshift, 2);
-          kf_bfly3(fout,fstride[i]<<shift,st,m, fstride[i], m2);
-          break;
-       case 5:
-          fft_downshift(fout, st->nfft, &downshift, 3);
-          kf_bfly5(fout,fstride[i]<<shift,st,m, fstride[i], m2);
-          break;
- #endif
-       }
-       m = m2;
+        p = st->factors[2*L];
+        m = st->factors[2*L + 1];
+        fstride[L + 1] = fstride[L]*p;
+        L++;
+    } while (m != 1);
+    m = st->factors[2*L - 1];
+    for (i = L - 1; i >= 0; i--) {
+        if (i != 0)
+            m2 = st->factors[2*i - 1];
+        else
+            m2 = 1;
+        switch (st->factors[2*i]) {
+            case 2:
+                fft_downshift(fout, st->nfft, &downshift, 1);
+                kf_bfly2(fout, m, fstride[i]);
+                break;
+            case 4:
+                fft_downshift(fout, st->nfft, &downshift, 2);
+                kf_bfly4(fout, fstride[i]<<shift, st, m, fstride[i], m2);
+                break;
+#ifndef RADIX_TWO_ONLY
+            case 3:
+                fft_downshift(fout, st->nfft, &downshift, 2);
+                kf_bfly3(fout, fstride[i]<<shift, st, m, fstride[i], m2);
+                break;
+            case 5:
+                fft_downshift(fout, st->nfft, &downshift, 3);
+                kf_bfly5(fout, fstride[i]<<shift, st, m, fstride[i], m2);
+                break;
+#endif
+        }
+        m = m2;
     }
     fft_downshift(fout, st->nfft, &downshift, downshift);
 }
 
-void oac_fft_c(const kiss_fft_state *st,const kiss_fft_cpx *fin,kiss_fft_cpx *fout)
-{
-   int i;
-   celt_coef scale;
+void oac_fft_c(const kiss_fft_state *st, const kiss_fft_cpx *fin, kiss_fft_cpx *fout) {
+    int i;
+    celt_coef scale;
 #ifdef FIXED_POINT
-   /* Allows us to scale with MULT16_32_Q16(), which is faster than
-      MULT16_32_Q15() on ARM. */
-   int scale_shift = st->scale_shift-1;
+    /* Allows us to scale with MULT16_32_Q16(), which is faster than
+       MULT16_32_Q15() on ARM. */
+    int scale_shift = st->scale_shift - 1;
 #endif
-   scale = st->scale;
-
-   celt_assert2 (fin != fout, "In-place FFT not supported");
-   /* Bit-reverse the input */
-   for (i=0;i<st->nfft;i++)
-   {
-      kiss_fft_cpx x = fin[i];
-      fout[st->bitrev[i]].r = S_MUL2(x.r, scale);
-      fout[st->bitrev[i]].i = S_MUL2(x.i, scale);
-   }
-   oac_fft_impl(st, fout ARG_FIXED(scale_shift));
+    scale = st->scale;
+
+    celt_assert2 (fin != fout, "In-place FFT not supported");
+    /* Bit-reverse the input */
+    for (i = 0; i < st->nfft; i++) {
+        kiss_fft_cpx x = fin[i];
+        fout[st->bitrev[i]].r = S_MUL2(x.r, scale);
+        fout[st->bitrev[i]].i = S_MUL2(x.i, scale);
+    }
+    oac_fft_impl(st, fout ARG_FIXED(scale_shift));
 }
 
 
-void oac_ifft_c(const kiss_fft_state *st,const kiss_fft_cpx *fin,kiss_fft_cpx *fout)
-{
-   int i;
-   celt_assert2 (fin != fout, "In-place FFT not supported");
-   /* Bit-reverse the input */
-   for (i=0;i<st->nfft;i++)
-      fout[st->bitrev[i]] = fin[i];
-   for (i=0;i<st->nfft;i++)
-      fout[i].i = -fout[i].i;
-   oac_fft_impl(st, fout ARG_FIXED(0));
-   for (i=0;i<st->nfft;i++)
-      fout[i].i = -fout[i].i;
+void oac_ifft_c(const kiss_fft_state *st, const kiss_fft_cpx *fin, kiss_fft_cpx *fout) {
+    int i;
+    celt_assert2 (fin != fout, "In-place FFT not supported");
+    /* Bit-reverse the input */
+    for (i = 0; i < st->nfft; i++)
+        fout[st->bitrev[i]] = fin[i];
+    for (i = 0; i < st->nfft; i++)
+        fout[i].i = -fout[i].i;
+    oac_fft_impl(st, fout ARG_FIXED(0));
+    for (i = 0; i < st->nfft; i++)
+        fout[i].i = -fout[i].i;
 }
diff --git a/celt/kiss_fft.h b/celt/kiss_fft.h
index 27c733d98..307ad5dbe 100644
--- a/celt/kiss_fft.h
+++ b/celt/kiss_fft.h
@@ -1,30 +1,30 @@
 /*Copyright (c) 2003-2004, Mark Borgerding
-  Lots of modifications by Jean-Marc Valin
-  Copyright (c) 2005-2007, Xiph.Org Foundation
-  Copyright (c) 2008,      Xiph.Org Foundation, CSIRO
+   Lots of modifications by Jean-Marc Valin
+   Copyright (c) 2005-2007, Xiph.Org Foundation
+   Copyright (c) 2008,      Xiph.Org Foundation, CSIRO
 
-  All rights reserved.
+   All rights reserved.
 
-  Redistribution and use in source and binary forms, with or without
+   Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright notice,
+ * Redistributions of source code must retain the above copyright notice,
        this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
+ * Redistributions in binary form must reproduce the above copyright notice,
        this list of conditions and the following disclaimer in the
        documentation and/or other materials provided with the distribution.
 
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGE.*/
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.*/
 
 #ifndef KISS_FFT_H
 #define KISS_FFT_H
@@ -37,38 +37,38 @@
 #ifdef USE_SIMD
 # include <xmmintrin.h>
 # define kiss_fft_scalar __m128
-#define KISS_FFT_MALLOC(nbytes) memalign(16,nbytes)
+# define KISS_FFT_MALLOC(nbytes) memalign(16, nbytes)
 #else
-#define KISS_FFT_MALLOC oac_alloc
+# define KISS_FFT_MALLOC oac_alloc
 #endif
 
 #ifdef FIXED_POINT
-#include "arch.h"
+# include "arch.h"
 
-#  define kiss_fft_scalar oac_int32
-#  define COEF_SHIFT 32
+# define kiss_fft_scalar oac_int32
+# define COEF_SHIFT 32
 
-#  define kiss_twiddle_scalar celt_coef
+# define kiss_twiddle_scalar celt_coef
 
 /* Some 32-bit CPUs would load/store a kiss_twiddle_cpx with a single memory
  * access, and could benefit from additional alignment.
  */
-#  define KISS_TWIDDLE_CPX_ALIGNMENT (sizeof(oac_int32))
+# define KISS_TWIDDLE_CPX_ALIGNMENT (sizeof(oac_int32))
 
 #else
 
 # ifndef kiss_fft_scalar
 /*  default is float */
-#   define kiss_fft_scalar float
-#   define kiss_twiddle_scalar float
-#   define KF_SUFFIX _celt_single
+#  define kiss_fft_scalar float
+#  define kiss_twiddle_scalar float
+#  define KF_SUFFIX _celt_single
 # endif
 #endif
 
 #if defined(__GNUC__) && defined(KISS_TWIDDLE_CPX_ALIGNMENT)
-#define KISS_TWIDDLE_CPX_ALIGNED __attribute__((aligned(KISS_TWIDDLE_CPX_ALIGNMENT)))
+# define KISS_TWIDDLE_CPX_ALIGNED __attribute__((aligned(KISS_TWIDDLE_CPX_ALIGNMENT)))
 #else
-#define KISS_TWIDDLE_CPX_ALIGNED
+# define KISS_TWIDDLE_CPX_ALIGNED
 #endif
 
 typedef struct {
@@ -77,22 +77,22 @@ typedef struct {
 }kiss_fft_cpx;
 
 typedef struct {
-   kiss_twiddle_scalar r;
-   kiss_twiddle_scalar i;
+    kiss_twiddle_scalar r;
+    kiss_twiddle_scalar i;
 } KISS_TWIDDLE_CPX_ALIGNED kiss_twiddle_cpx;
 
 #define MAXFACTORS 8
 /* e.g. an fft of length 128 has 4 factors
- as far as kissfft is concerned
- 4*4*4*2
+   as far as kissfft is concerned
+   4*4*4*2
  */
 
-typedef struct arch_fft_state{
-   int is_supported;
-   void *priv;
+typedef struct arch_fft_state {
+    int is_supported;
+    void *priv;
 } arch_fft_state;
 
-typedef struct kiss_fft_state{
+typedef struct kiss_fft_state {
     int nfft;
     celt_coef scale;
 #ifdef FIXED_POINT
@@ -106,7 +106,7 @@ typedef struct kiss_fft_state{
 } kiss_fft_state;
 
 #if defined(HAVE_ARM_NE10)
-#include "arm/fft_arm.h"
+# include "arm/fft_arm.h"
 #endif
 
 /*typedef struct kiss_fft_state* kiss_fft_cfg;*/
@@ -134,9 +134,9 @@ typedef struct kiss_fft_state{
  *      buffer size in *lenmem.
  * */
 
-kiss_fft_state *oac_fft_alloc_twiddles(int nfft,void * mem,size_t * lenmem, const kiss_fft_state *base, int arch);
+kiss_fft_state *oac_fft_alloc_twiddles(int nfft, void * mem, size_t * lenmem, const kiss_fft_state *base, int arch);
 
-kiss_fft_state *oac_fft_alloc(int nfft,void * mem,size_t * lenmem, int arch);
+kiss_fft_state *oac_fft_alloc(int nfft, void * mem, size_t * lenmem, int arch);
 
 /**
  * oac_fft(cfg,in_out_buf)
@@ -148,11 +148,11 @@ kiss_fft_state *oac_fft_alloc(int nfft,void * mem,size_t * lenmem, int arch);
  * Note that each element is complex and can be accessed like
     f[k].r and f[k].i
  * */
-void oac_fft_c(const kiss_fft_state *cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout);
-void oac_ifft_c(const kiss_fft_state *cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout);
+void oac_fft_c(const kiss_fft_state *cfg, const kiss_fft_cpx *fin, kiss_fft_cpx *fout);
+void oac_ifft_c(const kiss_fft_state *cfg, const kiss_fft_cpx *fin, kiss_fft_cpx *fout);
 
-void oac_fft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout ARG_FIXED(int downshift));
-void oac_ifft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout);
+void oac_fft_impl(const kiss_fft_state*st, kiss_fft_cpx*fout ARG_FIXED(int downshift));
+void oac_ifft_impl(const kiss_fft_state *st, kiss_fft_cpx *fout);
 
 void oac_fft_free(const kiss_fft_state *cfg, int arch);
 
@@ -162,44 +162,44 @@ int oac_fft_alloc_arch_c(kiss_fft_state *st);
 
 #if !defined(OVERRIDE_OAC_FFT)
 /* Is run-time CPU detection enabled on this platform? */
-#if defined(OAC_HAVE_RTCD) && (defined(HAVE_ARM_NE10))
+# if defined(OAC_HAVE_RTCD) && (defined(HAVE_ARM_NE10))
 
-extern int (*const OAC_FFT_ALLOC_ARCH_IMPL[OAC_ARCHMASK+1])(
+extern int (*const OAC_FFT_ALLOC_ARCH_IMPL[OAC_ARCHMASK + 1])(
  kiss_fft_state *st);
 
-#define oac_fft_alloc_arch(_st, arch) \
-         ((*OAC_FFT_ALLOC_ARCH_IMPL[(arch)&OAC_ARCHMASK])(_st))
+#  define oac_fft_alloc_arch(_st, arch) \
+        ((*OAC_FFT_ALLOC_ARCH_IMPL[(arch)&OAC_ARCHMASK])(_st))
 
-extern void (*const OAC_FFT_FREE_ARCH_IMPL[OAC_ARCHMASK+1])(
+extern void (*const OAC_FFT_FREE_ARCH_IMPL[OAC_ARCHMASK + 1])(
  kiss_fft_state *st);
-#define oac_fft_free_arch(_st, arch) \
-         ((*OAC_FFT_FREE_ARCH_IMPL[(arch)&OAC_ARCHMASK])(_st))
+#  define oac_fft_free_arch(_st, arch) \
+        ((*OAC_FFT_FREE_ARCH_IMPL[(arch)&OAC_ARCHMASK])(_st))
 
-extern void (*const OAC_FFT[OAC_ARCHMASK+1])(const kiss_fft_state *cfg,
+extern void (*const OAC_FFT[OAC_ARCHMASK + 1])(const kiss_fft_state *cfg,
  const kiss_fft_cpx *fin, kiss_fft_cpx *fout);
-#define oac_fft(_cfg, _fin, _fout, arch) \
-   ((*OAC_FFT[(arch)&OAC_ARCHMASK])(_cfg, _fin, _fout))
+#  define oac_fft(_cfg, _fin, _fout, arch) \
+        ((*OAC_FFT[(arch)&OAC_ARCHMASK])(_cfg, _fin, _fout))
 
-extern void (*const OAC_IFFT[OAC_ARCHMASK+1])(const kiss_fft_state *cfg,
+extern void (*const OAC_IFFT[OAC_ARCHMASK + 1])(const kiss_fft_state *cfg,
  const kiss_fft_cpx *fin, kiss_fft_cpx *fout);
-#define oac_ifft(_cfg, _fin, _fout, arch) \
-   ((*OAC_IFFT[(arch)&OAC_ARCHMASK])(_cfg, _fin, _fout))
+#  define oac_ifft(_cfg, _fin, _fout, arch) \
+        ((*OAC_IFFT[(arch)&OAC_ARCHMASK])(_cfg, _fin, _fout))
 
-#else /* else for if defined(OAC_HAVE_RTCD) && (defined(HAVE_ARM_NE10)) */
+# else /* else for if defined(OAC_HAVE_RTCD) && (defined(HAVE_ARM_NE10)) */
 
-#define oac_fft_alloc_arch(_st, arch) \
-         ((void)(arch), oac_fft_alloc_arch_c(_st))
+#  define oac_fft_alloc_arch(_st, arch) \
+        ((void)(arch), oac_fft_alloc_arch_c(_st))
 
-#define oac_fft_free_arch(_st, arch) \
-         ((void)(arch), oac_fft_free_arch_c(_st))
+#  define oac_fft_free_arch(_st, arch) \
+        ((void)(arch), oac_fft_free_arch_c(_st))
 
-#define oac_fft(_cfg, _fin, _fout, arch) \
-         ((void)(arch), oac_fft_c(_cfg, _fin, _fout))
+#  define oac_fft(_cfg, _fin, _fout, arch) \
+        ((void)(arch), oac_fft_c(_cfg, _fin, _fout))
 
-#define oac_ifft(_cfg, _fin, _fout, arch) \
-         ((void)(arch), oac_ifft_c(_cfg, _fin, _fout))
+#  define oac_ifft(_cfg, _fin, _fout, arch) \
+        ((void)(arch), oac_ifft_c(_cfg, _fin, _fout))
 
-#endif /* end if defined(OAC_HAVE_RTCD) && (defined(HAVE_ARM_NE10)) */
+# endif /* end if defined(OAC_HAVE_RTCD) && (defined(HAVE_ARM_NE10)) */
 #endif /* end if !defined(OVERRIDE_OAC_FFT) */
 
 #endif
diff --git a/celt/laplace.c b/celt/laplace.c
index 0bca53779..b2ee022df 100644
--- a/celt/laplace.c
+++ b/celt/laplace.c
@@ -24,10 +24,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "laplace.h"
@@ -41,195 +41,178 @@
 #define LAPLACE_NMIN (16)
 
 /* When called, decay is positive and at most 11456. */
-static unsigned ec_laplace_get_freq1(unsigned fs0, int decay)
-{
-   unsigned ft;
-   ft = 32768 - LAPLACE_MINP*(2*LAPLACE_NMIN) - fs0;
-   return ft*(oac_int32)(16384-decay)>>15;
+static unsigned ec_laplace_get_freq1(unsigned fs0, int decay) {
+    unsigned ft;
+    ft = 32768 - LAPLACE_MINP*(2*LAPLACE_NMIN) - fs0;
+    return ft*(oac_int32)(16384 - decay)>>15;
 }
 
-void ec_laplace_encode(ec_enc *enc, int *value, unsigned fs, int decay)
-{
-   unsigned fl;
-   int val = *value;
-   fl = 0;
-   if (val)
-   {
-      int s;
-      int i;
-      s = -(val<0);
-      val = (val+s)^s;
-      fl = fs;
-      fs = ec_laplace_get_freq1(fs, decay);
-      /* Search the decaying part of the PDF.*/
-      for (i=1; fs > 0 && i < val; i++)
-      {
-         fs *= 2;
-         fl += fs+2*LAPLACE_MINP;
-         fs = (fs*(oac_int32)decay)>>15;
-      }
-      /* Everything beyond that has probability LAPLACE_MINP. */
-      if (!fs)
-      {
-         int di;
-         int ndi_max;
-         ndi_max = (32768-fl+LAPLACE_MINP-1)>>LAPLACE_LOG_MINP;
-         ndi_max = (ndi_max-s)>>1;
-         di = IMIN(val - i, ndi_max - 1);
-         fl += (2*di+1+s)*LAPLACE_MINP;
-         fs = IMIN(LAPLACE_MINP, 32768-fl);
-         *value = (i+di+s)^s;
-      }
-      else
-      {
-         fs += LAPLACE_MINP;
-         fl += fs&~s;
-      }
-      celt_assert(fl+fs<=32768);
-      celt_assert(fs>0);
-   }
-   ec_encode_bin(enc, fl, fl+fs, 15);
+void ec_laplace_encode(ec_enc *enc, int *value, unsigned fs, int decay) {
+    unsigned fl;
+    int val = *value;
+    fl = 0;
+    if (val) {
+        int s;
+        int i;
+        s = -(val < 0);
+        val = (val + s)^s;
+        fl = fs;
+        fs = ec_laplace_get_freq1(fs, decay);
+        /* Search the decaying part of the PDF.*/
+        for (i = 1; fs > 0 && i < val; i++) {
+            fs *= 2;
+            fl += fs + 2*LAPLACE_MINP;
+            fs = (fs*(oac_int32)decay)>>15;
+        }
+        /* Everything beyond that has probability LAPLACE_MINP. */
+        if (!fs) {
+            int di;
+            int ndi_max;
+            ndi_max = (32768 - fl + LAPLACE_MINP - 1)>>LAPLACE_LOG_MINP;
+            ndi_max = (ndi_max - s)>>1;
+            di = IMIN(val - i, ndi_max - 1);
+            fl += (2*di + 1 + s)*LAPLACE_MINP;
+            fs = IMIN(LAPLACE_MINP, 32768 - fl);
+            *value = (i + di + s)^s;
+        } else   {
+            fs += LAPLACE_MINP;
+            fl += fs&~s;
+        }
+        celt_assert(fl + fs <= 32768);
+        celt_assert(fs > 0);
+    }
+    ec_encode_bin(enc, fl, fl + fs, 15);
 }
 
-int ec_laplace_decode(ec_dec *dec, unsigned fs, int decay)
-{
-   int val=0;
-   unsigned fl;
-   unsigned fm;
-   fm = ec_decode_bin(dec, 15);
-   fl = 0;
-   if (fm >= fs)
-   {
-      val++;
-      fl = fs;
-      fs = ec_laplace_get_freq1(fs, decay)+LAPLACE_MINP;
-      /* Search the decaying part of the PDF.*/
-      while(fs > LAPLACE_MINP && fm >= fl+2*fs)
-      {
-         fs *= 2;
-         fl += fs;
-         fs = ((fs-2*LAPLACE_MINP)*(oac_int32)decay)>>15;
-         fs += LAPLACE_MINP;
-         val++;
-      }
-      /* Everything beyond that has probability LAPLACE_MINP. */
-      if (fs <= LAPLACE_MINP)
-      {
-         int di;
-         di = (fm-fl)>>(LAPLACE_LOG_MINP+1);
-         val += di;
-         fl += 2*di*LAPLACE_MINP;
-      }
-      if (fm < fl+fs)
-         val = -val;
-      else
-         fl += fs;
-   }
-   celt_assert(fl<32768);
-   celt_assert(fs>0);
-   celt_assert(fl<=fm);
-   celt_assert(fm<IMIN(fl+fs,32768));
-   ec_dec_update(dec, fl, IMIN(fl+fs,32768), 32768);
-   return val;
+int ec_laplace_decode(ec_dec *dec, unsigned fs, int decay) {
+    int val = 0;
+    unsigned fl;
+    unsigned fm;
+    fm = ec_decode_bin(dec, 15);
+    fl = 0;
+    if (fm >= fs) {
+        val++;
+        fl = fs;
+        fs = ec_laplace_get_freq1(fs, decay) + LAPLACE_MINP;
+        /* Search the decaying part of the PDF.*/
+        while (fs > LAPLACE_MINP && fm >= fl + 2*fs) {
+            fs *= 2;
+            fl += fs;
+            fs = ((fs - 2*LAPLACE_MINP)*(oac_int32)decay)>>15;
+            fs += LAPLACE_MINP;
+            val++;
+        }
+        /* Everything beyond that has probability LAPLACE_MINP. */
+        if (fs <= LAPLACE_MINP) {
+            int di;
+            di = (fm - fl)>>(LAPLACE_LOG_MINP + 1);
+            val += di;
+            fl += 2*di*LAPLACE_MINP;
+        }
+        if (fm < fl + fs)
+            val = -val;
+        else
+            fl += fs;
+    }
+    celt_assert(fl < 32768);
+    celt_assert(fs > 0);
+    celt_assert(fl <= fm);
+    celt_assert(fm < IMIN(fl + fs, 32768));
+    ec_dec_update(dec, fl, IMIN(fl + fs, 32768), 32768);
+    return val;
 }
 
-void ec_laplace_encode_p0(ec_enc *enc, int value, oac_uint16 p0, oac_uint16 decay)
-{
-   int s;
-   oac_uint16 sign_icdf[3];
-   sign_icdf[0] = 32768-p0;
-   sign_icdf[1] = sign_icdf[0]/2;
-   sign_icdf[2] = 0;
-   s = value == 0 ? 0 : (value > 0 ? 1 : 2);
-   ec_enc_icdf16(enc, s, sign_icdf, 15);
-   value = abs(value);
-   if (value)
-   {
-      int i;
-      oac_uint16 icdf[8];
-      icdf[0] = IMAX(7, decay);
-      for (i=1;i<7;i++)
-      {
-         icdf[i] = IMAX(7-i, (icdf[i-1] * (oac_int32)decay) >> 15);
-      }
-      icdf[7] = 0;
-      value--;
-      do {
-         ec_enc_icdf16(enc, IMIN(value, 7), icdf, 15);
-         value -= 7;
-      } while (value >= 0);
-   }
+void ec_laplace_encode_p0(ec_enc *enc, int value, oac_uint16 p0, oac_uint16 decay) {
+    int s;
+    oac_uint16 sign_icdf[3];
+    sign_icdf[0] = 32768 - p0;
+    sign_icdf[1] = sign_icdf[0]/2;
+    sign_icdf[2] = 0;
+    s = value == 0 ? 0 : (value > 0 ? 1 : 2);
+    ec_enc_icdf16(enc, s, sign_icdf, 15);
+    value = abs(value);
+    if (value) {
+        int i;
+        oac_uint16 icdf[8];
+        icdf[0] = IMAX(7, decay);
+        for (i = 1; i < 7; i++) {
+            icdf[i] = IMAX(7 - i, (icdf[i - 1]*(oac_int32)decay)>>15);
+        }
+        icdf[7] = 0;
+        value--;
+        do {
+            ec_enc_icdf16(enc, IMIN(value, 7), icdf, 15);
+            value -= 7;
+        } while (value >= 0);
+    }
 }
 
-int ec_laplace_decode_p0(ec_dec *dec, oac_uint16 p0, oac_uint16 decay)
-{
-   int s;
-   int value;
-   oac_uint16 sign_icdf[3];
-   sign_icdf[0] = 32768-p0;
-   sign_icdf[1] = sign_icdf[0]/2;
-   sign_icdf[2] = 0;
-   s = ec_dec_icdf16(dec, sign_icdf, 15);
-   if (s==2) s = -1;
-   if (s != 0)
-   {
-      int i;
-      int v;
-      oac_uint16 icdf[8];
-      icdf[0] = IMAX(7, decay);
-      for (i=1;i<7;i++)
-      {
-         icdf[i] = IMAX(7-i, (icdf[i-1] * (oac_int32)decay) >> 15);
-      }
-      icdf[7] = 0;
-      value = 1;
-      do {
-         v = ec_dec_icdf16(dec, icdf, 15);
-         value += v;
-      } while (v == 7);
-      return s*value;
-   } else return 0;
+int ec_laplace_decode_p0(ec_dec *dec, oac_uint16 p0, oac_uint16 decay) {
+    int s;
+    int value;
+    oac_uint16 sign_icdf[3];
+    sign_icdf[0] = 32768 - p0;
+    sign_icdf[1] = sign_icdf[0]/2;
+    sign_icdf[2] = 0;
+    s = ec_dec_icdf16(dec, sign_icdf, 15);
+    if (s == 2) s = -1;
+    if (s != 0) {
+        int i;
+        int v;
+        oac_uint16 icdf[8];
+        icdf[0] = IMAX(7, decay);
+        for (i = 1; i < 7; i++) {
+            icdf[i] = IMAX(7 - i, (icdf[i - 1]*(oac_int32)decay)>>15);
+        }
+        icdf[7] = 0;
+        value = 1;
+        do {
+            v = ec_dec_icdf16(dec, icdf, 15);
+            value += v;
+        } while (v == 7);
+        return s*value;
+    } else return 0;
 }
 
 #if 0
 
-#include <stdio.h>
-#define NB_VALS 10
-#define DATA_SIZE 10000
+# include <stdio.h>
+# define NB_VALS 10
+# define DATA_SIZE 10000
 int main() {
-   ec_enc enc;
-   ec_dec dec;
-   unsigned char *ptr;
-   int i;
-   int decay, p0;
-   int val[NB_VALS] = {6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-   /*for (i=0;i<NB_VALS;i++) {
-      val[i] = -log(rand()/(float)RAND_MAX);
-      if (rand()%2) val[i] = -val[i];
-   }*/
-   p0 = 16000;
-   decay = 16000;
-   ptr = (unsigned char *)malloc(DATA_SIZE);
-   ec_enc_init(&enc,ptr,DATA_SIZE);
-   for (i=0;i<NB_VALS;i++) {
-      printf("%d ", val[i]);
-   }
-   printf("\n");
-   for (i=0;i<NB_VALS;i++) {
-      ec_laplace_encode_p0(&enc, val[i], p0, decay);
-   }
-
-   ec_enc_done(&enc);
-
-   ec_dec_init(&dec,ec_get_buffer(&enc),ec_range_bytes(&enc));
-
-   for (i=0;i<NB_VALS;i++) {
-      val[i] = ec_laplace_decode_p0(&dec, p0, decay);
-   }
-   for (i=0;i<NB_VALS;i++) {
-      printf("%d ", val[i]);
-   }
-   printf("\n");
+    ec_enc enc;
+    ec_dec dec;
+    unsigned char *ptr;
+    int i;
+    int decay, p0;
+    int val[NB_VALS] = {6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
+    /*for (i=0;i<NB_VALS;i++) {
+       val[i] = -log(rand()/(float)RAND_MAX);
+       if (rand()%2) val[i] = -val[i];
+       }*/
+    p0 = 16000;
+    decay = 16000;
+    ptr = (unsigned char *)malloc(DATA_SIZE);
+    ec_enc_init(&enc, ptr, DATA_SIZE);
+    for (i = 0; i < NB_VALS; i++) {
+        printf("%d ", val[i]);
+    }
+    printf("\n");
+    for (i = 0; i < NB_VALS; i++) {
+        ec_laplace_encode_p0(&enc, val[i], p0, decay);
+    }
+
+    ec_enc_done(&enc);
+
+    ec_dec_init(&dec, ec_get_buffer(&enc), ec_range_bytes(&enc));
+
+    for (i = 0; i < NB_VALS; i++) {
+        val[i] = ec_laplace_decode_p0(&dec, p0, decay);
+    }
+    for (i = 0; i < NB_VALS; i++) {
+        printf("%d ", val[i]);
+    }
+    printf("\n");
 }
 
 #endif
diff --git a/celt/laplace.h b/celt/laplace.h
index 3245a00aa..a651064d2 100644
--- a/celt/laplace.h
+++ b/celt/laplace.h
@@ -24,7 +24,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef LAPLACE_H
 #define LAPLACE_H
@@ -34,19 +34,19 @@
 
 /** Encode a value that is assumed to be the realisation of a
     Laplace-distributed random process
- @param enc Entropy encoder state
- @param value Value to encode
- @param fs Probability of 0, multiplied by 32768
- @param decay Probability of the value +/- 1, multiplied by 16384
-*/
+   @param enc Entropy encoder state
+   @param value Value to encode
+   @param fs Probability of 0, multiplied by 32768
+   @param decay Probability of the value +/- 1, multiplied by 16384
+ */
 void ec_laplace_encode(ec_enc *enc, int *value, unsigned fs, int decay);
 
 /** Decode a value that is assumed to be the realisation of a
     Laplace-distributed random process
- @param dec Entropy decoder state
- @param fs Probability of 0, multiplied by 32768
- @param decay Probability of the value +/- 1, multiplied by 16384
- @return Value decoded
+   @param dec Entropy decoder state
+   @param fs Probability of 0, multiplied by 32768
+   @param decay Probability of the value +/- 1, multiplied by 16384
+   @return Value decoded
  */
 int ec_laplace_decode(ec_dec *dec, unsigned fs, int decay);
 
diff --git a/celt/mathops.c b/celt/mathops.c
index 5d23b3988..9ea7166fc 100644
--- a/celt/mathops.c
+++ b/celt/mathops.c
@@ -6,7 +6,7 @@
 /**
    @file mathops.h
    @brief Various math functions
-*/
+ */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
@@ -30,307 +30,289 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "float_cast.h"
 #include "mathops.h"
 
 /*Compute floor(sqrt(_val)) with exact arithmetic.
-  _val must be greater than 0.
-  This has been tested on all possible 32-bit inputs greater than 0.*/
-unsigned isqrt32(oac_uint32 _val){
-  unsigned b;
-  unsigned g;
-  int      bshift;
-  /*Uses the second method from
-     http://www.azillionmonkeys.com/qed/sqroot.html
-    The main idea is to search for the largest binary digit b such that
-     (g+b)*(g+b) <= _val, and add it to the solution g.*/
-  g=0;
-  bshift=(EC_ILOG(_val)-1)>>1;
-  b=1U<<bshift;
-  do{
-    oac_uint32 t;
-    t=(((oac_uint32)g<<1)+b)<<bshift;
-    if(t<=_val){
-      g+=b;
-      _val-=t;
-    }
-    b>>=1;
-    bshift--;
-  }
-  while(bshift>=0);
-  return g;
+   _val must be greater than 0.
+   This has been tested on all possible 32-bit inputs greater than 0.*/
+unsigned isqrt32(oac_uint32 _val) {
+    unsigned b;
+    unsigned g;
+    int bshift;
+    /*Uses the second method from
+       http://www.azillionmonkeys.com/qed/sqroot.html
+       The main idea is to search for the largest binary digit b such that
+       (g+b)*(g+b) <= _val, and add it to the solution g.*/
+    g = 0;
+    bshift = (EC_ILOG(_val) - 1)>>1;
+    b = 1U<<bshift;
+    do {
+        oac_uint32 t;
+        t = (((oac_uint32)g<<1) + b)<<bshift;
+        if (t <= _val) {
+            g += b;
+            _val -= t;
+        }
+        b >>= 1;
+        bshift--;
+    } while (bshift >= 0);
+    return g;
 }
 
 #ifdef FIXED_POINT
 
-oac_val32 frac_div32_q29(oac_val32 a, oac_val32 b)
-{
-   oac_val16 rcp;
-   oac_val32 result, rem;
-   int shift = celt_ilog2(b)-29;
-   a = VSHR32(a,shift);
-   b = VSHR32(b,shift);
-   /* 16-bit reciprocal */
-   rcp = ROUND16(celt_rcp(ROUND16(b,16)),3);
-   result = MULT16_32_Q15(rcp, a);
-   rem = PSHR32(a,2)-MULT32_32_Q31(result, b);
-   result = ADD32(result, SHL32(MULT16_32_Q15(rcp, rem),2));
-   return result;
+oac_val32 frac_div32_q29(oac_val32 a, oac_val32 b) {
+    oac_val16 rcp;
+    oac_val32 result, rem;
+    int shift = celt_ilog2(b) - 29;
+    a = VSHR32(a, shift);
+    b = VSHR32(b, shift);
+    /* 16-bit reciprocal */
+    rcp = ROUND16(celt_rcp(ROUND16(b, 16)), 3);
+    result = MULT16_32_Q15(rcp, a);
+    rem = PSHR32(a, 2) - MULT32_32_Q31(result, b);
+    result = ADD32(result, SHL32(MULT16_32_Q15(rcp, rem), 2));
+    return result;
 }
 
 oac_val32 frac_div32(oac_val32 a, oac_val32 b) {
-   oac_val32 result = frac_div32_q29(a,b);
-   if (result >= 536870912)       /*  2^29 */
-      return 2147483647;          /*  2^31 - 1 */
-   else if (result <= -536870912) /* -2^29 */
-      return -2147483647;         /* -2^31 */
-   else
-      return SHL32(result, 2);
+    oac_val32 result = frac_div32_q29(a, b);
+    if (result >= 536870912)      /*  2^29 */
+        return 2147483647;        /*  2^31 - 1 */
+    else if (result <= -536870912) /* -2^29 */
+        return -2147483647;       /* -2^31 */
+    else
+        return SHL32(result, 2);
 }
 
 /** Reciprocal sqrt approximation in the range [0.25,1) (Q16 in, Q14 out) */
-oac_val16 celt_rsqrt_norm(oac_val32 x)
-{
-   oac_val16 n;
-   oac_val16 r;
-   oac_val16 r2;
-   oac_val16 y;
-   /* Range of n is [-16384,32767] ([-0.5,1) in Q15). */
-   n = x-32768;
-   /* Get a rough initial guess for the root.
-      The optimal minimax quadratic approximation (using relative error) is
-       r = 1.437799046117536+n*(-0.823394375837328+n*0.4096419668459485).
-      Coefficients here, and the final result r, are Q14.*/
-   r = ADD16(23557, MULT16_16_Q15(n, ADD16(-13490, MULT16_16_Q15(n, 6713))));
-   /* We want y = x*r*r-1 in Q15, but x is 32-bit Q16 and r is Q14.
-      We can compute the result from n and r using Q15 multiplies with some
-       adjustment, carefully done to avoid overflow.
-      Range of y is [-1564,1594]. */
-   r2 = MULT16_16_Q15(r, r);
-   y = SHL16(SUB16(ADD16(MULT16_16_Q15(r2, n), r2), 16384), 1);
-   /* Apply a 2nd-order Householder iteration: r += r*y*(y*0.375-0.5).
-      This yields the Q14 reciprocal square root of the Q16 x, with a maximum
-       relative error of 1.04956E-4, a (relative) RMSE of 2.80979E-5, and a
-       peak absolute error of 2.26591/16384. */
-   return ADD16(r, MULT16_16_Q15(r, MULT16_16_Q15(y,
+oac_val16 celt_rsqrt_norm(oac_val32 x) {
+    oac_val16 n;
+    oac_val16 r;
+    oac_val16 r2;
+    oac_val16 y;
+    /* Range of n is [-16384,32767] ([-0.5,1) in Q15). */
+    n = x - 32768;
+    /* Get a rough initial guess for the root.
+       The optimal minimax quadratic approximation (using relative error) is
+        r = 1.437799046117536+n*(-0.823394375837328+n*0.4096419668459485).
+       Coefficients here, and the final result r, are Q14.*/
+    r = ADD16(23557, MULT16_16_Q15(n, ADD16(-13490, MULT16_16_Q15(n, 6713))));
+    /* We want y = x*r*r-1 in Q15, but x is 32-bit Q16 and r is Q14.
+       We can compute the result from n and r using Q15 multiplies with some
+        adjustment, carefully done to avoid overflow.
+       Range of y is [-1564,1594]. */
+    r2 = MULT16_16_Q15(r, r);
+    y = SHL16(SUB16(ADD16(MULT16_16_Q15(r2, n), r2), 16384), 1);
+    /* Apply a 2nd-order Householder iteration: r += r*y*(y*0.375-0.5).
+       This yields the Q14 reciprocal square root of the Q16 x, with a maximum
+        relative error of 1.04956E-4, a (relative) RMSE of 2.80979E-5, and a
+        peak absolute error of 2.26591/16384. */
+    return ADD16(r, MULT16_16_Q15(r, MULT16_16_Q15(y,
               SUB16(MULT16_16_Q15(y, 12288), 16384))));
 }
 
 /** Reciprocal sqrt approximation in the range [0.25,1) (Q31 in, Q29 out) */
-oac_val32 celt_rsqrt_norm32(oac_val32 x)
-{
-   oac_int32 tmp;
-   /* Use the first-order Newton-Raphson method to refine the root estimate.
-    * r = r * (1.5 - 0.5*x*r*r) */
-   oac_int32 r_q29 = SHL32(celt_rsqrt_norm(SHR32(x, 31-16)), 15);
-   /* Split evaluation in steps to avoid exploding macro expansion. */
-   tmp = MULT32_32_Q31(r_q29, r_q29);
-   tmp = MULT32_32_Q31(1073741824 /* Q31 */, tmp);
-   tmp = MULT32_32_Q31(x, tmp);
-   return SHL32(MULT32_32_Q31(r_q29, SUB32(201326592 /* Q27 */, tmp)), 4);
+oac_val32 celt_rsqrt_norm32(oac_val32 x) {
+    oac_int32 tmp;
+    /* Use the first-order Newton-Raphson method to refine the root estimate.
+     * r = r * (1.5 - 0.5*x*r*r) */
+    oac_int32 r_q29 = SHL32(celt_rsqrt_norm(SHR32(x, 31 - 16)), 15);
+    /* Split evaluation in steps to avoid exploding macro expansion. */
+    tmp = MULT32_32_Q31(r_q29, r_q29);
+    tmp = MULT32_32_Q31(1073741824 /* Q31 */, tmp);
+    tmp = MULT32_32_Q31(x, tmp);
+    return SHL32(MULT32_32_Q31(r_q29, SUB32(201326592 /* Q27 */, tmp)), 4);
 }
 
 /** Sqrt approximation (QX input, QX/2 output) */
-oac_val32 celt_sqrt(oac_val32 x)
-{
-   int k;
-   oac_val16 n;
-   oac_val32 rt;
-   /* These coeffs are optimized in fixed-point to minimize both RMS and max error
-      of sqrt(x) over .25<x<1 without exceeding 32767.
-      The RMS error is 3.4e-5 and the max is 8.2e-5. */
-   static const oac_val16 C[6] = {23171, 11574, -2901, 1592, -1002, 336};
-   if (x==0)
-      return 0;
-   else if (x>=1073741824)
-      return 32767;
-   k = (celt_ilog2(x)>>1)-7;
-   x = VSHR32(x, 2*k);
-   n = x-32768;
-   rt = ADD32(C[0], MULT16_16_Q15(n, ADD16(C[1], MULT16_16_Q15(n, ADD16(C[2],
+oac_val32 celt_sqrt(oac_val32 x) {
+    int k;
+    oac_val16 n;
+    oac_val32 rt;
+    /* These coeffs are optimized in fixed-point to minimize both RMS and max error
+       of sqrt(x) over .25<x<1 without exceeding 32767.
+       The RMS error is 3.4e-5 and the max is 8.2e-5. */
+    static const oac_val16 C[6] = {23171, 11574, -2901, 1592, -1002, 336};
+    if (x == 0)
+        return 0;
+    else if (x >= 1073741824)
+        return 32767;
+    k = (celt_ilog2(x)>>1) - 7;
+    x = VSHR32(x, 2*k);
+    n = x - 32768;
+    rt = ADD32(C[0], MULT16_16_Q15(n, ADD16(C[1], MULT16_16_Q15(n, ADD16(C[2],
               MULT16_16_Q15(n, ADD16(C[3], MULT16_16_Q15(n, ADD16(C[4], MULT16_16_Q15(n, (C[5])))))))))));
-   rt = VSHR32(rt,7-k);
-   return rt;
+    rt = VSHR32(rt, 7 - k);
+    return rt;
 }
 
 /* Perform fixed-point arithmetic to approximate the square root. When the input
  * is in Qx format, the output will be in Q(x/2 + 16) format. */
-oac_val32 celt_sqrt32(oac_val32 x)
-{
-   int k;
-   oac_int32 x_frac;
-   if (x==0)
-      return 0;
-   else if (x>=1073741824)
-      return 2147483647; /* 2^31 -1 */
-   k = (celt_ilog2(x)>>1);
-   x_frac = VSHR32(x, 2*(k-14)-1);
-   x_frac = MULT32_32_Q31(celt_rsqrt_norm32(x_frac), x_frac);
-   if (k < 12) return PSHR32(x_frac, 12-k);
-   else return SHL32(x_frac, k-12);
+oac_val32 celt_sqrt32(oac_val32 x) {
+    int k;
+    oac_int32 x_frac;
+    if (x == 0)
+        return 0;
+    else if (x >= 1073741824)
+        return 2147483647; /* 2^31 -1 */
+    k = (celt_ilog2(x)>>1);
+    x_frac = VSHR32(x, 2*(k - 14) - 1);
+    x_frac = MULT32_32_Q31(celt_rsqrt_norm32(x_frac), x_frac);
+    if (k < 12) return PSHR32(x_frac, 12 - k);
+    else return SHL32(x_frac, k - 12);
 }
 
-#define L1 32767
-#define L2 -7651
-#define L3 8277
-#define L4 -626
+# define L1 32767
+# define L2 -7651
+# define L3 8277
+# define L4 -626
 
-static OAC_INLINE oac_val16 _celt_cos_pi_2(oac_val16 x)
-{
-   oac_val16 x2;
+static OAC_INLINE oac_val16 _celt_cos_pi_2(oac_val16 x) {
+    oac_val16 x2;
 
-   x2 = MULT16_16_P15(x,x);
-   return ADD16(1,MIN16(32766,ADD32(SUB16(L1,x2), MULT16_16_P15(x2, ADD32(L2, MULT16_16_P15(x2, ADD32(L3, MULT16_16_P15(L4, x2
-                                                                                ))))))));
+    x2 = MULT16_16_P15(x, x);
+    return ADD16(1,
+    MIN16(32766, ADD32(SUB16(L1, x2), MULT16_16_P15(x2, ADD32(L2, MULT16_16_P15(x2, ADD32(L3, MULT16_16_P15(L4, x2
+            ))))))));
 }
 
-#undef L1
-#undef L2
-#undef L3
-#undef L4
+# undef L1
+# undef L2
+# undef L3
+# undef L4
 
-oac_val16 celt_cos_norm(oac_val32 x)
-{
-   x = x&0x0001ffff;
-   if (x>SHL32(EXTEND32(1), 16))
-      x = SUB32(SHL32(EXTEND32(1), 17),x);
-   if (x&0x00007fff)
-   {
-      if (x<SHL32(EXTEND32(1), 15))
-      {
-         return _celt_cos_pi_2(EXTRACT16(x));
-      } else {
-         return NEG16(_celt_cos_pi_2(EXTRACT16(65536-x)));
-      }
-   } else {
-      if (x&0x0000ffff)
-         return 0;
-      else if (x&0x0001ffff)
-         return -32767;
-      else
-         return 32767;
-   }
+oac_val16 celt_cos_norm(oac_val32 x) {
+    x = x&0x0001ffff;
+    if (x > SHL32(EXTEND32(1), 16))
+        x = SUB32(SHL32(EXTEND32(1), 17), x);
+    if (x&0x00007fff) {
+        if (x < SHL32(EXTEND32(1), 15)) {
+            return _celt_cos_pi_2(EXTRACT16(x));
+        } else {
+            return NEG16(_celt_cos_pi_2(EXTRACT16(65536 - x)));
+        }
+    } else {
+        if (x&0x0000ffff)
+            return 0;
+        else if (x&0x0001ffff)
+            return -32767;
+        else
+            return 32767;
+    }
 }
 
 /* Calculates the cosine of (PI*0.5*x) where the input x ranges from -1 to 1 and
  * is in Q30 format. The output will also be in Q31 format. */
-oac_val32 celt_cos_norm32(oac_val32 x)
-{
-   static const oac_val32 COS_NORM_COEFF_A0 = 134217720;   /* Q27 */
-   static const oac_val32 COS_NORM_COEFF_A1 = -662336704;  /* Q29 */
-   static const oac_val32 COS_NORM_COEFF_A2 = 544710848;   /* Q31 */
-   static const oac_val32 COS_NORM_COEFF_A3 = -178761936;  /* Q33 */
-   static const oac_val32 COS_NORM_COEFF_A4 = 29487206;    /* Q35 */
-   oac_int32 x_sq_q29, tmp;
-   /* The expected x is in the range of [-1.0f, 1.0f] */
-   celt_sig_assert((x >= -1073741824) && (x <= 1073741824));
-   /* Make cos(+/- pi/2) exactly zero. */
-   if (ABS32(x) == 1<<30) return 0;
-   x_sq_q29 = MULT32_32_Q31(x, x);
-   /* Split evaluation in steps to avoid exploding macro expansion. */
-   tmp = ADD32(COS_NORM_COEFF_A3, MULT32_32_Q31(x_sq_q29, COS_NORM_COEFF_A4));
-   tmp = ADD32(COS_NORM_COEFF_A2, MULT32_32_Q31(x_sq_q29, tmp));
-   tmp = ADD32(COS_NORM_COEFF_A1, MULT32_32_Q31(x_sq_q29, tmp));
-   return SHL32(ADD32(COS_NORM_COEFF_A0, MULT32_32_Q31(x_sq_q29, tmp)), 4);
+oac_val32 celt_cos_norm32(oac_val32 x) {
+    static const oac_val32 COS_NORM_COEFF_A0 = 134217720;  /* Q27 */
+    static const oac_val32 COS_NORM_COEFF_A1 = -662336704; /* Q29 */
+    static const oac_val32 COS_NORM_COEFF_A2 = 544710848;  /* Q31 */
+    static const oac_val32 COS_NORM_COEFF_A3 = -178761936; /* Q33 */
+    static const oac_val32 COS_NORM_COEFF_A4 = 29487206;   /* Q35 */
+    oac_int32 x_sq_q29, tmp;
+    /* The expected x is in the range of [-1.0f, 1.0f] */
+    celt_sig_assert((x >= -1073741824) && (x <= 1073741824));
+    /* Make cos(+/- pi/2) exactly zero. */
+    if (ABS32(x) == 1<<30) return 0;
+    x_sq_q29 = MULT32_32_Q31(x, x);
+    /* Split evaluation in steps to avoid exploding macro expansion. */
+    tmp = ADD32(COS_NORM_COEFF_A3, MULT32_32_Q31(x_sq_q29, COS_NORM_COEFF_A4));
+    tmp = ADD32(COS_NORM_COEFF_A2, MULT32_32_Q31(x_sq_q29, tmp));
+    tmp = ADD32(COS_NORM_COEFF_A1, MULT32_32_Q31(x_sq_q29, tmp));
+    return SHL32(ADD32(COS_NORM_COEFF_A0, MULT32_32_Q31(x_sq_q29, tmp)), 4);
 }
 
 /* Computes a 16 bit approximate reciprocal (1/x) for a normalized Q15 input,
  * resulting in a Q15 output. */
-oac_val16 celt_rcp_norm16(oac_val16 x)
-{
-   oac_val16 r;
-   /* Start with a linear approximation:
-      r = 1.8823529411764706-0.9411764705882353*n.
-      The coefficients and the result are Q14 in the range [15420,30840].*/
-   r = ADD16(30840, MULT16_16_Q15(-15420, x));
-   /* Perform two Newton iterations:
-      r -= r*((r*n)+(r-1.Q15))
-         = r*((r*n)+(r-1.Q15)). */
-   r = SUB16(r, MULT16_16_Q15(r,
+oac_val16 celt_rcp_norm16(oac_val16 x) {
+    oac_val16 r;
+    /* Start with a linear approximation:
+       r = 1.8823529411764706-0.9411764705882353*n.
+       The coefficients and the result are Q14 in the range [15420,30840].*/
+    r = ADD16(30840, MULT16_16_Q15(-15420, x));
+    /* Perform two Newton iterations:
+       r -= r*((r*n)+(r-1.Q15))
+          = r*((r*n)+(r-1.Q15)). */
+    r = SUB16(r, MULT16_16_Q15(r,
              ADD16(MULT16_16_Q15(r, x), ADD16(r, -32768))));
-   /* We subtract an extra 1 in the second iteration to avoid overflow; it also
-       neatly compensates for truncation error in the rest of the process. */
-   return SUB16(r, ADD16(1, MULT16_16_Q15(r,
+    /* We subtract an extra 1 in the second iteration to avoid overflow; it also
+        neatly compensates for truncation error in the rest of the process. */
+    return SUB16(r, ADD16(1, MULT16_16_Q15(r,
                 ADD16(MULT16_16_Q15(r, x), ADD16(r, -32768)))));
 }
 
 /* Computes a 32 bit approximated reciprocal (1/x) for a normalized Q31 input,
  * resulting in a Q30 output. The expected input range is [0.5f, 1.0f) in Q31
  * and the expected output range is [1.0f, 2.0f) in Q30. */
-oac_val32 celt_rcp_norm32(oac_val32 x)
-{
-   oac_val32 r_q30;
-   celt_sig_assert(x >= 1073741824);
-   r_q30 = SHL32(EXTEND32(celt_rcp_norm16(SHR32(x, 15)-32768)), 16);
-   /* Solving f(y) = a - 1/y using the Newton Method
-    * Note: f(y)' = 1/y^2
-    * r = r - f(r)/f(r)' = r - (x * r*r - r)
-    *   = r - r*(r*x - 1)
-    * where
-    *   - r means 1/y's approximation.
-    *   - x means a, the input of function.
-    * Please note that:
-    *   - It adds 1 to avoid overflow
-    *   - -1.0f in Q30 is -1073741824. */
-   return SUB32(r_q30, ADD32(SHL32(
+oac_val32 celt_rcp_norm32(oac_val32 x) {
+    oac_val32 r_q30;
+    celt_sig_assert(x >= 1073741824);
+    r_q30 = SHL32(EXTEND32(celt_rcp_norm16(SHR32(x, 15) - 32768)), 16);
+    /* Solving f(y) = a - 1/y using the Newton Method
+     * Note: f(y)' = 1/y^2
+     * r = r - f(r)/f(r)' = r - (x * r*r - r)
+     *   = r - r*(r*x - 1)
+     * where
+     *   - r means 1/y's approximation.
+     *   - x means a, the input of function.
+     * Please note that:
+     *   - It adds 1 to avoid overflow
+     *   - -1.0f in Q30 is -1073741824. */
+    return SUB32(r_q30, ADD32(SHL32(
                 MULT32_32_Q31(ADD32(MULT32_32_Q31(r_q30, x), -1073741824),
                               r_q30), 1), 1));
 }
 
 /** Reciprocal approximation (Q15 input, Q16 output) */
-oac_val32 celt_rcp(oac_val32 x)
-{
-   int i;
-   oac_val16 r;
-   celt_sig_assert(x>0);
-   i = celt_ilog2(x);
+oac_val32 celt_rcp(oac_val32 x) {
+    int i;
+    oac_val16 r;
+    celt_sig_assert(x > 0);
+    i = celt_ilog2(x);
 
-   /* Compute the reciprocal of a Q15 number in the range [0, 1). */
-   r = celt_rcp_norm16(VSHR32(x,i-15)-32768);
+    /* Compute the reciprocal of a Q15 number in the range [0, 1). */
+    r = celt_rcp_norm16(VSHR32(x, i - 15) - 32768);
 
-   /* r is now the Q15 solution to 2/(n+1), with a maximum relative error
-       of 7.05346E-5, a (relative) RMSE of 2.14418E-5, and a peak absolute
-       error of 1.24665/32768. */
-   return VSHR32(EXTEND32(r),i-16);
+    /* r is now the Q15 solution to 2/(n+1), with a maximum relative error
+        of 7.05346E-5, a (relative) RMSE of 2.14418E-5, and a peak absolute
+        error of 1.24665/32768. */
+    return VSHR32(EXTEND32(r), i - 16);
 }
 
 #endif
 
 #ifndef DISABLE_FLOAT_API
 
-void celt_float2int16_c(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt)
-{
-   int i;
-   for (i = 0; i < cnt; i++)
-   {
-      out[i] = FLOAT2INT16(in[i]);
-   }
+void celt_float2int16_c(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt) {
+    int i;
+    for (i = 0; i < cnt; i++) {
+        out[i] = FLOAT2INT16(in[i]);
+    }
 }
 
-int oac_limit2_checkwithin1_c(float * samples, int cnt)
-{
-   int i;
-   if (cnt <= 0)
-   {
-      return 1;
-   }
+int oac_limit2_checkwithin1_c(float * samples, int cnt) {
+    int i;
+    if (cnt <= 0) {
+        return 1;
+    }
 
-   for (i = 0; i < cnt; i++)
-   {
-      float clippedVal = samples[i];
-      clippedVal = FMAX(-2.0f, clippedVal);
-      clippedVal = FMIN(2.0f, clippedVal);
-      samples[i] = clippedVal;
-   }
+    for (i = 0; i < cnt; i++) {
+        float clippedVal = samples[i];
+        clippedVal = FMAX(-2.0f, clippedVal);
+        clippedVal = FMIN(2.0f, clippedVal);
+        samples[i] = clippedVal;
+    }
 
-   /* C implementation can't provide quick hint. Assume it might exceed -1/+1. */
-   return 0;
+    /* C implementation can't provide quick hint. Assume it might exceed -1/+1. */
+    return 0;
 }
 
 #endif /* DISABLE_FLOAT_API */
diff --git a/celt/mathops.h b/celt/mathops.h
index f1e0ae629..9e981ce49 100644
--- a/celt/mathops.h
+++ b/celt/mathops.h
@@ -6,7 +6,7 @@
 /**
    @file mathops.h
    @brief Various math functions
-*/
+ */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
@@ -30,7 +30,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef MATHOPS_H
 #define MATHOPS_H
@@ -41,199 +41,187 @@
 
 
 #if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
-#include "arm/mathops_arm.h"
+# include "arm/mathops_arm.h"
 #endif
 
 #define PI 3.1415926535897931
 
 /* Multiplies two 16-bit fractional values. Bit-exactness of this macro is important */
-#define FRAC_MUL16(a,b) ((16384+((oac_int32)(oac_int16)(a)*(oac_int16)(b)))>>15)
+#define FRAC_MUL16(a, b) ((16384 + ((oac_int32)(oac_int16)(a)*(oac_int16)(b)))>>15)
 
 unsigned isqrt32(oac_uint32 _val);
 
 /* CELT doesn't need it for fixed-point, by analysis.c does. */
 #if !defined(FIXED_POINT) || defined(ANALYSIS_C)
-#define cA 0.43157974f
-#define cB 0.67848403f
-#define cC 0.08595542f
-#define cE ((float)PI/2)
+# define cA 0.43157974f
+# define cB 0.67848403f
+# define cC 0.08595542f
+# define cE ((float)PI/2)
 static OAC_INLINE float fast_atan2f(float y, float x) {
-   float x2, y2;
-   x2 = x*x;
-   y2 = y*y;
-   /* For very small values, we don't care about the answer, so
-      we can just return 0. */
-   if (x2 + y2 < 1e-18f)
-   {
-      return 0;
-   }
-   if(x2<y2){
-      float den = (y2 + cB*x2) * (y2 + cC*x2);
-      return -x*y*(y2 + cA*x2) / den + (y<0 ? -cE : cE);
-   }else{
-      float den = (x2 + cB*y2) * (x2 + cC*y2);
-      return  x*y*(x2 + cA*y2) / den + (y<0 ? -cE : cE) - (x*y<0 ? -cE : cE);
-   }
+    float x2, y2;
+    x2 = x*x;
+    y2 = y*y;
+    /* For very small values, we don't care about the answer, so
+       we can just return 0. */
+    if (x2 + y2 < 1e-18f) {
+        return 0;
+    }
+    if (x2 < y2) {
+        float den = (y2 + cB*x2)*(y2 + cC*x2);
+        return -x*y*(y2 + cA*x2)/den + (y < 0 ? -cE : cE);
+    } else {
+        float den = (x2 + cB*y2)*(x2 + cC*y2);
+        return x*y*(x2 + cA*y2)/den + (y < 0 ? -cE : cE) - (x*y < 0 ? -cE : cE);
+    }
 }
-#undef cA
-#undef cB
-#undef cC
-#undef cE
+# undef cA
+# undef cB
+# undef cC
+# undef cE
 #endif
 
 
 #ifndef OVERRIDE_CELT_MAXABS16
-static OAC_INLINE oac_val32 celt_maxabs16(const oac_val16 *x, int len)
-{
-   int i;
-   oac_val16 maxval = 0;
-   oac_val16 minval = 0;
-   for (i=0;i<len;i++)
-   {
-      maxval = MAX16(maxval, x[i]);
-      minval = MIN16(minval, x[i]);
-   }
-   return MAX32(EXTEND32(maxval),-EXTEND32(minval));
+static OAC_INLINE oac_val32 celt_maxabs16(const oac_val16 *x, int len) {
+    int i;
+    oac_val16 maxval = 0;
+    oac_val16 minval = 0;
+    for (i = 0; i < len; i++) {
+        maxval = MAX16(maxval, x[i]);
+        minval = MIN16(minval, x[i]);
+    }
+    return MAX32(EXTEND32(maxval), -EXTEND32(minval));
 }
 #endif
 
 #if defined(FIXED_POINT)
-static OAC_INLINE oac_res celt_maxabs_res(const oac_res *x, int len)
-{
-   int i;
-   oac_res maxval = 0;
-   oac_res minval = 0;
-   for (i=0;i<len;i++)
-   {
-      maxval = MAX32(maxval, x[i]);
-      minval = MIN32(minval, x[i]);
-   }
-   /* oac_res should never reach such amplitude, so we should be safe. */
-   celt_sig_assert(minval != -2147483648);
-   return MAX32(maxval,-minval);
+static OAC_INLINE oac_res celt_maxabs_res(const oac_res *x, int len) {
+    int i;
+    oac_res maxval = 0;
+    oac_res minval = 0;
+    for (i = 0; i < len; i++) {
+        maxval = MAX32(maxval, x[i]);
+        minval = MIN32(minval, x[i]);
+    }
+    /* oac_res should never reach such amplitude, so we should be safe. */
+    celt_sig_assert(minval != -2147483648);
+    return MAX32(maxval, -minval);
 }
 #else
-#define celt_maxabs_res celt_maxabs16
+# define celt_maxabs_res celt_maxabs16
 #endif
 
 
 #ifndef OVERRIDE_CELT_MAXABS32
-#ifdef FIXED_POINT
-static OAC_INLINE oac_val32 celt_maxabs32(const oac_val32 *x, int len)
-{
-   int i;
-   oac_val32 maxval = 0;
-   oac_val32 minval = 0;
-   for (i=0;i<len;i++)
-   {
-      maxval = MAX32(maxval, x[i]);
-      minval = MIN32(minval, x[i]);
-   }
-   return MAX32(maxval, -minval);
+# ifdef FIXED_POINT
+static OAC_INLINE oac_val32 celt_maxabs32(const oac_val32 *x, int len) {
+    int i;
+    oac_val32 maxval = 0;
+    oac_val32 minval = 0;
+    for (i = 0; i < len; i++) {
+        maxval = MAX32(maxval, x[i]);
+        minval = MIN32(minval, x[i]);
+    }
+    return MAX32(maxval, -minval);
 }
-#else
-#define celt_maxabs32(x,len) celt_maxabs16(x,len)
-#endif
+# else
+#  define celt_maxabs32(x, len) celt_maxabs16(x, len)
+# endif
 #endif
 
 #ifndef FIXED_POINT
 /* Calculates the arctangent of x using a Remez approximation of order 15,
  * incorporating only odd-powered terms. */
-static OAC_INLINE float celt_atan_norm(float x)
-{
-   #define ATAN2_2_OVER_PI 0.636619772367581f
-   float x_sq = x * x;
-
-   /* Polynomial coefficients approximated in the [0, 1] range.
-    * Lolremez command: lolremez --degree 6 --range "0:1"
-    *                   "(atan(sqrt(x))-sqrt(x))/(x*sqrt(x))" "1/(sqrt(x)*x)"
-    * Please note that ATAN2_COEFF_A01 is fixed to 1.0f. */
-   #define ATAN2_COEFF_A03 -3.3331659436225891113281250000e-01f
-   #define ATAN2_COEFF_A05 1.99627041816711425781250000000e-01f
-   #define ATAN2_COEFF_A07 -1.3976582884788513183593750000e-01f
-   #define ATAN2_COEFF_A09 9.79423448443412780761718750000e-02f
-   #define ATAN2_COEFF_A11 -5.7773590087890625000000000000e-02f
-   #define ATAN2_COEFF_A13 2.30401363223791122436523437500e-02f
-   #define ATAN2_COEFF_A15 -4.3554059229791164398193359375e-03f
-   return ATAN2_2_OVER_PI * (x + x * x_sq * (ATAN2_COEFF_A03
-                + x_sq * (ATAN2_COEFF_A05
-                + x_sq * (ATAN2_COEFF_A07
-                + x_sq * (ATAN2_COEFF_A09
-                + x_sq * (ATAN2_COEFF_A11
-                + x_sq * (ATAN2_COEFF_A13
-                + x_sq * (ATAN2_COEFF_A15))))))));
+static OAC_INLINE float celt_atan_norm(float x) {
+# define ATAN2_2_OVER_PI 0.636619772367581f
+    float x_sq = x*x;
+
+    /* Polynomial coefficients approximated in the [0, 1] range.
+     * Lolremez command: lolremez --degree 6 --range "0:1"
+     *                   "(atan(sqrt(x))-sqrt(x))/(x*sqrt(x))" "1/(sqrt(x)*x)"
+     * Please note that ATAN2_COEFF_A01 is fixed to 1.0f. */
+# define ATAN2_COEFF_A03 -3.3331659436225891113281250000e-01f
+# define ATAN2_COEFF_A05 1.99627041816711425781250000000e-01f
+# define ATAN2_COEFF_A07 -1.3976582884788513183593750000e-01f
+# define ATAN2_COEFF_A09 9.79423448443412780761718750000e-02f
+# define ATAN2_COEFF_A11 -5.7773590087890625000000000000e-02f
+# define ATAN2_COEFF_A13 2.30401363223791122436523437500e-02f
+# define ATAN2_COEFF_A15 -4.3554059229791164398193359375e-03f
+    return ATAN2_2_OVER_PI*(x + x*x_sq*(ATAN2_COEFF_A03
+                                        + x_sq*(ATAN2_COEFF_A05
+                                                + x_sq*(ATAN2_COEFF_A07
+                                                        + x_sq*(ATAN2_COEFF_A09
+                                                                + x_sq*(ATAN2_COEFF_A11
+                                                                        + x_sq*(ATAN2_COEFF_A13
+                                                                                + x_sq*(ATAN2_COEFF_A15))))))));
 }
 
 /* Calculates the arctangent of y/x, returning an approximate value in radians.
  * Please refer to the linked wiki page (https://en.wikipedia.org/wiki/Atan2)
  * to learn how atan2 results are computed. */
-static OAC_INLINE float celt_atan2p_norm(float y, float x)
-{
-   celt_sig_assert(x>=0 && y>=0);
-
-   /* For very small values, we don't care about the answer. */
-   if ((x*x + y*y) < 1e-18f)
-   {
-      return 0;
-   }
-
-   if (y < x)
-   {
-      return celt_atan_norm(y / x);
-   } else {
-      return 1.f - celt_atan_norm(x / y);
-   }
+static OAC_INLINE float celt_atan2p_norm(float y, float x) {
+    celt_sig_assert(x >= 0 && y >= 0);
+
+    /* For very small values, we don't care about the answer. */
+    if ((x*x + y*y) < 1e-18f) {
+        return 0;
+    }
+
+    if (y < x) {
+        return celt_atan_norm(y/x);
+    } else {
+        return 1.f - celt_atan_norm(x/y);
+    }
 }
 #endif
 
 #if !defined(FIXED_POINT)
 /* Computes estimated cosine values for (PI/2 * x) using only terms with even
  * exponents. */
-static OAC_INLINE float celt_cos_norm2(float x)
-{
-   float x_norm_sq;
-   int output_sign;
-   /* Restrict x to [-1, 3]. */
-   x -= 4*floor(.25*(x+1));
-   /* Negative sign for [1, 3]. */
-   output_sign = 1 - 2*(x>1);
-   /* Restrict to [-1, 1]. */
-   x -= 2*(x>1);
-
-   /* The cosine function, cos(x), has a Taylor series representation consisting
-    * exclusively of even-powered polynomial terms. */
-   x_norm_sq = x * x;
-
-   /* Polynomial coefficients approximated in the [0, 1] range using only terms
+static OAC_INLINE float celt_cos_norm2(float x) {
+    float x_norm_sq;
+    int output_sign;
+    /* Restrict x to [-1, 3]. */
+    x -= 4*floor(.25*(x + 1));
+    /* Negative sign for [1, 3]. */
+    output_sign = 1 - 2*(x > 1);
+    /* Restrict to [-1, 1]. */
+    x -= 2*(x > 1);
+
+    /* The cosine function, cos(x), has a Taylor series representation consisting
+     * exclusively of even-powered polynomial terms. */
+    x_norm_sq = x*x;
+
+    /* Polynomial coefficients approximated in the [0, 1] range using only terms
     * with even exponents.
     * Lolremez command: lolremez --degree 4 --range 0:1 "cos(sqrt(x)*pi*0.5)" */
-   #define COS_COEFF_A0 9.999999403953552246093750000000e-01f
-   #define COS_COEFF_A2 -1.233698248863220214843750000000000f
-   #define COS_COEFF_A4 2.536507546901702880859375000000e-01f
-   #define COS_COEFF_A6 -2.08106283098459243774414062500e-02f
-   #define COS_COEFF_A8 8.581906440667808055877685546875e-04f
-   return output_sign * (COS_COEFF_A0 + x_norm_sq * (COS_COEFF_A2 +
-                               x_norm_sq * (COS_COEFF_A4 +
-                               x_norm_sq * (COS_COEFF_A6 +
-                               x_norm_sq * (COS_COEFF_A8)))));
+# define COS_COEFF_A0 9.999999403953552246093750000000e-01f
+# define COS_COEFF_A2 -1.233698248863220214843750000000000f
+# define COS_COEFF_A4 2.536507546901702880859375000000e-01f
+# define COS_COEFF_A6 -2.08106283098459243774414062500e-02f
+# define COS_COEFF_A8 8.581906440667808055877685546875e-04f
+    return output_sign*(COS_COEFF_A0 + x_norm_sq*(COS_COEFF_A2
+                                                  + x_norm_sq*(COS_COEFF_A4
+                                                               + x_norm_sq*(COS_COEFF_A6
+                                                                            + x_norm_sq*(COS_COEFF_A8)))));
 }
 
 #endif
 
 #ifndef FIXED_POINT
 
-#define celt_sqrt(x) ((float)sqrt(x))
-#define celt_sqrt32(x) ((float)sqrt(x))
-#define celt_rsqrt(x) (1.f/celt_sqrt(x))
-#define celt_rsqrt_norm(x) (celt_rsqrt(x))
-#define celt_rsqrt_norm32(x) (celt_rsqrt(x))
-#define celt_cos_norm(x) ((float)cos((.5f*PI)*(x)))
-#define celt_rcp(x) (1.f/(x))
-#define celt_div(a,b) ((a)/(b))
-#define frac_div32(a,b) ((float)(a)/(b))
-#define frac_div32_q29(a,b) frac_div32(a,b)
-
-#ifdef FLOAT_APPROX
+# define celt_sqrt(x) ((float)sqrt(x))
+# define celt_sqrt32(x) ((float)sqrt(x))
+# define celt_rsqrt(x) (1.f/celt_sqrt(x))
+# define celt_rsqrt_norm(x) (celt_rsqrt(x))
+# define celt_rsqrt_norm32(x) (celt_rsqrt(x))
+# define celt_cos_norm(x) ((float)cos((.5f*PI)*(x)))
+# define celt_rcp(x) (1.f/(x))
+# define celt_div(a, b) ((a)/(b))
+# define frac_div32(a, b) ((float)(a)/(b))
+# define frac_div32_q29(a, b) frac_div32(a, b)
+
+# ifdef FLOAT_APPROX
 /* Calculates the base-2 logarithm (log2(x)) of a number. It is designed for
  * systems using radix-2 floating-point representation, with the exponent
  * located at bits 23 to 30 and an offset of 127. Note that special cases like
@@ -250,10 +238,10 @@ static OAC_INLINE float celt_cos_norm2(float x)
  *    6.666666666666666e-01, 6.153846153846154e-01,
  *    5.714285714285714e-01, 5.333333333333333e-01} */
 static const float log2_x_norm_coeff[8] = {
-   1.000000000000000000000000000f, 8.88888895511627197265625e-01f,
-   8.00000000000000000000000e-01f, 7.27272748947143554687500e-01f,
-   6.66666686534881591796875e-01f, 6.15384638309478759765625e-01f,
-   5.71428596973419189453125e-01f, 5.33333361148834228515625e-01f};
+    1.000000000000000000000000000f, 8.88888895511627197265625e-01f,
+    8.00000000000000000000000e-01f, 7.27272748947143554687500e-01f,
+    6.66666686534881591796875e-01f, 6.15384638309478759765625e-01f,
+    5.71428596973419189453125e-01f, 5.33333361148834228515625e-01f};
 
 /* Log2 y normalization single precision coefficients calculated by
  * log2(1 + 0.125 * index).
@@ -264,45 +252,44 @@ static const float log2_x_norm_coeff[8] = {
  *    5.849625007211562e-01, 7.004397181410922e-01,
  *    8.073549220576041e-01, 9.068905956085185e-01}; */
 static const float log2_y_norm_coeff[8] = {
-   0.0000000000000000000000000000f, 1.699250042438507080078125e-01f,
-   3.219280838966369628906250e-01f, 4.594316184520721435546875e-01f,
-   5.849624872207641601562500e-01f, 7.004396915435791015625000e-01f,
-   8.073549270629882812500000e-01f, 9.068905711174011230468750e-01f};
-
-static OAC_INLINE float celt_log2(float x)
-{
-   oac_int32 integer;
-   oac_int32 range_idx;
-   union {
-      float f;
-      oac_uint32 i;
-   } in;
-   in.f = x;
-   integer = (oac_int32)(in.i>>23)-127;
-   in.i = (oac_int32)in.i - (oac_int32)((oac_uint32)integer<<23);
-
-   /* Normalize the mantissa range from [1, 2] to [1,1.125], and then shift x
-    * by 1.0625 to [-0.0625, 0.0625]. */
-   range_idx = (in.i >> 20) & 0x7;
-   in.f = in.f * log2_x_norm_coeff[range_idx] - 1.0625f;
-
-   /* Polynomial coefficients approximated in the [1, 1.125] range.
-    * Lolremez command: lolremez --degree 4 --range -0.0625:0.0625
-    *                   "log(x+1.0625)/log(2)"
-    * Coefficients in Double Precision
-    * A0: 8.7462840624502679e-2    A1: 1.3578296070972002
-    * A2: -6.3897703690210047e-1   A3: 4.0197125617419959e-1
-    * A4: -2.8415445877832832e-1 */
-   #define LOG2_COEFF_A0 8.74628424644470214843750000e-02f
-   #define LOG2_COEFF_A1 1.357829570770263671875000000000f
-   #define LOG2_COEFF_A2 -6.3897705078125000000000000e-01f
-   #define LOG2_COEFF_A3 4.01971250772476196289062500e-01f
-   #define LOG2_COEFF_A4 -2.8415444493293762207031250e-01f
-   in.f = LOG2_COEFF_A0 + in.f * (LOG2_COEFF_A1
-               + in.f * (LOG2_COEFF_A2
-               + in.f * (LOG2_COEFF_A3
-               + in.f * (LOG2_COEFF_A4))));
-   return integer + in.f + log2_y_norm_coeff[range_idx];
+    0.0000000000000000000000000000f, 1.699250042438507080078125e-01f,
+    3.219280838966369628906250e-01f, 4.594316184520721435546875e-01f,
+    5.849624872207641601562500e-01f, 7.004396915435791015625000e-01f,
+    8.073549270629882812500000e-01f, 9.068905711174011230468750e-01f};
+
+static OAC_INLINE float celt_log2(float x) {
+    oac_int32 integer;
+    oac_int32 range_idx;
+    union {
+        float f;
+        oac_uint32 i;
+    } in;
+    in.f = x;
+    integer = (oac_int32)(in.i>>23) - 127;
+    in.i = (oac_int32)in.i - (oac_int32)((oac_uint32)integer<<23);
+
+    /* Normalize the mantissa range from [1, 2] to [1,1.125], and then shift x
+     * by 1.0625 to [-0.0625, 0.0625]. */
+    range_idx = (in.i>>20)&0x7;
+    in.f = in.f*log2_x_norm_coeff[range_idx] - 1.0625f;
+
+    /* Polynomial coefficients approximated in the [1, 1.125] range.
+     * Lolremez command: lolremez --degree 4 --range -0.0625:0.0625
+     *                   "log(x+1.0625)/log(2)"
+     * Coefficients in Double Precision
+     * A0: 8.7462840624502679e-2    A1: 1.3578296070972002
+     * A2: -6.3897703690210047e-1   A3: 4.0197125617419959e-1
+     * A4: -2.8415445877832832e-1 */
+#  define LOG2_COEFF_A0 8.74628424644470214843750000e-02f
+#  define LOG2_COEFF_A1 1.357829570770263671875000000000f
+#  define LOG2_COEFF_A2 -6.3897705078125000000000000e-01f
+#  define LOG2_COEFF_A3 4.01971250772476196289062500e-01f
+#  define LOG2_COEFF_A4 -2.8415444493293762207031250e-01f
+    in.f = LOG2_COEFF_A0 + in.f*(LOG2_COEFF_A1
+                                 + in.f*(LOG2_COEFF_A2
+                                         + in.f*(LOG2_COEFF_A3
+                                                 + in.f*(LOG2_COEFF_A4))));
+    return integer + in.f + log2_y_norm_coeff[range_idx];
 }
 
 /* Calculates an approximation of 2^x. The approximation was achieved by
@@ -310,70 +297,67 @@ static OAC_INLINE float celt_log2(float x)
  * of order 5, ensuring a controlled relative error.
  * exp2(x) = exp2(integer + fraction)
  *         = exp2(integer) * exp2(fraction) */
-static OAC_INLINE float celt_exp2(float x)
-{
-   oac_int32 integer;
-   float frac;
-   union {
-      float f;
-      oac_uint32 i;
-   } res;
-   integer = (int)floor(x);
-   if (integer < -50)
-      return 0;
-   frac = x-integer;
-
-   /* Polynomial coefficients approximated in the [0, 1] range.
-    * Lolremez command: lolremez --degree 5 --range 0:1
-    *                   "exp(x*0.693147180559945)" "exp(x*0.693147180559945)"
-    * NOTE: log(2) ~ 0.693147180559945 */
-   #define EXP2_COEFF_A0 9.999999403953552246093750000000e-01f
-   #define EXP2_COEFF_A1 6.931530833244323730468750000000e-01f
-   #define EXP2_COEFF_A2 2.401536107063293457031250000000e-01f
-   #define EXP2_COEFF_A3 5.582631751894950866699218750000e-02f
-   #define EXP2_COEFF_A4 8.989339694380760192871093750000e-03f
-   #define EXP2_COEFF_A5 1.877576694823801517486572265625e-03f
-   res.f = EXP2_COEFF_A0 + frac * (EXP2_COEFF_A1
-               + frac * (EXP2_COEFF_A2
-               + frac * (EXP2_COEFF_A3
-               + frac * (EXP2_COEFF_A4
-               + frac * (EXP2_COEFF_A5)))));
-   res.i = (oac_uint32)((oac_int32)res.i + (oac_int32)((oac_uint32)integer<<23)) & 0x7fffffff;
-   return res.f;
+static OAC_INLINE float celt_exp2(float x) {
+    oac_int32 integer;
+    float frac;
+    union {
+        float f;
+        oac_uint32 i;
+    } res;
+    integer = (int)floor(x);
+    if (integer < -50)
+        return 0;
+    frac = x - integer;
+
+    /* Polynomial coefficients approximated in the [0, 1] range.
+     * Lolremez command: lolremez --degree 5 --range 0:1
+     *                   "exp(x*0.693147180559945)" "exp(x*0.693147180559945)"
+     * NOTE: log(2) ~ 0.693147180559945 */
+#  define EXP2_COEFF_A0 9.999999403953552246093750000000e-01f
+#  define EXP2_COEFF_A1 6.931530833244323730468750000000e-01f
+#  define EXP2_COEFF_A2 2.401536107063293457031250000000e-01f
+#  define EXP2_COEFF_A3 5.582631751894950866699218750000e-02f
+#  define EXP2_COEFF_A4 8.989339694380760192871093750000e-03f
+#  define EXP2_COEFF_A5 1.877576694823801517486572265625e-03f
+    res.f = EXP2_COEFF_A0 + frac*(EXP2_COEFF_A1
+                                  + frac*(EXP2_COEFF_A2
+                                          + frac*(EXP2_COEFF_A3
+                                                  + frac*(EXP2_COEFF_A4
+                                                          + frac*(EXP2_COEFF_A5)))));
+    res.i = (oac_uint32)((oac_int32)res.i + (oac_int32)((oac_uint32)integer<<23))&0x7fffffff;
+    return res.f;
 }
 
-#else
-#define celt_log2(x) ((float)(1.442695040888963387*log(x)))
-#define celt_exp2(x) ((float)exp(0.6931471805599453094*(x)))
-#endif
+# else
+#  define celt_log2(x) ((float)(1.442695040888963387*log(x)))
+#  define celt_exp2(x) ((float)exp(0.6931471805599453094*(x)))
+# endif
 
-#define celt_exp2_db celt_exp2
-#define celt_log2_db celt_log2
+# define celt_exp2_db celt_exp2
+# define celt_log2_db celt_log2
 
-#define celt_sin(x) celt_cos_norm2((0.5f*PI) * (x) - 1.0f)
-#define celt_log(x) (celt_log2(x) * 0.6931471805599453f)
-#define celt_exp(x) (celt_exp2((x) * 1.4426950408889634f))
+# define celt_sin(x) celt_cos_norm2((0.5f*PI)*(x) - 1.0f)
+# define celt_log(x) (celt_log2(x)*0.6931471805599453f)
+# define celt_exp(x) (celt_exp2((x)*1.4426950408889634f))
 
 #endif
 
 #ifdef FIXED_POINT
 
-#include "os_support.h"
+# include "os_support.h"
 
-#ifndef OVERRIDE_CELT_ILOG2
+# ifndef OVERRIDE_CELT_ILOG2
 /** Integer log in base2. Undefined for zero and negative numbers */
-static OAC_INLINE oac_int16 celt_ilog2(oac_int32 x)
-{
-   celt_sig_assert(x>0);
-   return EC_ILOG(x)-1;
+static OAC_INLINE oac_int16 celt_ilog2(oac_int32 x) {
+    celt_sig_assert(x > 0);
+    return EC_ILOG(x) - 1;
 }
-#endif
+# endif
 
 
 /** Integer log in base2. Defined for zero, but not for negative numbers */
-static OAC_INLINE oac_int16 celt_zlog2(oac_val32 x)
-{
-   return x <= 0 ? 0 : celt_ilog2(x);
+static OAC_INLINE oac_int16 celt_zlog2(oac_val32 x) {
+    return x <= 0 ? 0 : celt_ilog2(x);
 }
 
 oac_val16 celt_rsqrt_norm(oac_val32 x);
@@ -389,138 +373,135 @@ oac_val16 celt_cos_norm(oac_val32 x);
 oac_val32 celt_cos_norm32(oac_val32 x);
 
 /** Base-2 logarithm approximation (log2(x)). (Q14 input, Q10 output) */
-static OAC_INLINE oac_val16 celt_log2(oac_val32 x)
-{
-   int i;
-   oac_val16 n, frac;
-   /* -0.41509302963303146, 0.9609890551383969, -0.31836011537636605,
-       0.15530808010959576, -0.08556153059057618 */
-   static const oac_val16 C[5] = {-6801+(1<<(13-10)), 15746, -5217, 2545, -1401};
-   if (x==0)
-      return -32767;
-   i = celt_ilog2(x);
-   n = VSHR32(x,i-15)-32768-16384;
-   frac = ADD16(C[0], MULT16_16_Q15(n, ADD16(C[1], MULT16_16_Q15(n, ADD16(C[2], MULT16_16_Q15(n, ADD16(C[3], MULT16_16_Q15(n, C[4]))))))));
-   return SHL32(i-13,10)+SHR32(frac,14-10);
+static OAC_INLINE oac_val16 celt_log2(oac_val32 x) {
+    int i;
+    oac_val16 n, frac;
+    /* -0.41509302963303146, 0.9609890551383969, -0.31836011537636605,
+        0.15530808010959576, -0.08556153059057618 */
+    static const oac_val16 C[5] = {-6801 + (1<<(13 - 10)), 15746, -5217, 2545, -1401};
+    if (x == 0)
+        return -32767;
+    i = celt_ilog2(x);
+    n = VSHR32(x, i - 15) - 32768 - 16384;
+    frac = ADD16(C[0],
+    MULT16_16_Q15(n,
+    ADD16(C[1], MULT16_16_Q15(n, ADD16(C[2], MULT16_16_Q15(n, ADD16(C[3], MULT16_16_Q15(n, C[4]))))))));
+    return SHL32(i - 13, 10) + SHR32(frac, 14 - 10);
 }
 
 /*
- K0 = 1
- K1 = log(2)
- K2 = 3-4*log(2)
- K3 = 3*log(2) - 2
-*/
-#define D0 16383
-#define D1 22804
-#define D2 14819
-#define D3 10204
-
-static OAC_INLINE oac_val32 celt_exp2_frac(oac_val16 x)
-{
-   oac_val16 frac;
-   frac = SHL16(x, 4);
-   return ADD16(D0, MULT16_16_Q15(frac, ADD16(D1, MULT16_16_Q15(frac, ADD16(D2 , MULT16_16_Q15(D3,frac))))));
+   K0 = 1
+   K1 = log(2)
+   K2 = 3-4*log(2)
+   K3 = 3*log(2) - 2
+ */
+# define D0 16383
+# define D1 22804
+# define D2 14819
+# define D3 10204
+
+static OAC_INLINE oac_val32 celt_exp2_frac(oac_val16 x) {
+    oac_val16 frac;
+    frac = SHL16(x, 4);
+    return ADD16(D0, MULT16_16_Q15(frac, ADD16(D1, MULT16_16_Q15(frac, ADD16(D2, MULT16_16_Q15(D3, frac))))));
 }
 
-#undef D0
-#undef D1
-#undef D2
-#undef D3
+# undef D0
+# undef D1
+# undef D2
+# undef D3
 
 /** Base-2 exponential approximation (2^x). (Q10 input, Q16 output) */
-static OAC_INLINE oac_val32 celt_exp2(oac_val16 x)
-{
-   int integer;
-   oac_val16 frac;
-   integer = SHR16(x,10);
-   if (integer>14)
-      return 0x7f000000;
-   else if (integer < -15)
-      return 0;
-   frac = celt_exp2_frac(x-SHL16(integer,10));
-   return VSHR32(EXTEND32(frac), -integer-2);
+static OAC_INLINE oac_val32 celt_exp2(oac_val16 x) {
+    int integer;
+    oac_val16 frac;
+    integer = SHR16(x, 10);
+    if (integer > 14)
+        return 0x7f000000;
+    else if (integer < -15)
+        return 0;
+    frac = celt_exp2_frac(x - SHL16(integer, 10));
+    return VSHR32(EXTEND32(frac), -integer - 2);
 }
 
 /* Calculates the base-2 logarithm of a Q14 input value. The result is returned
  * in Q(DB_SHIFT). If the input value is 0, the function will output -32.0f. */
 static OAC_INLINE oac_val32 celt_log2_db(oac_val32 x) {
-   /* Q30 */
-   static const oac_val32 log2_x_norm_coeff[8] = {
-      1073741824, 954437184, 858993472, 780903168,
-      715827904,  660764224, 613566784, 572662336};
-   /* Q24 */
-   static const oac_val32 log2_y_norm_coeff[8] = {
-      0,       2850868,  5401057,  7707983,
-      9814042, 11751428, 13545168, 15215099};
-   static const oac_val32 LOG2_COEFF_A0 = 1467383;     /* Q24 */
-   static const oac_val32 LOG2_COEFF_A1 = 182244800;   /* Q27 */
-   static const oac_val32 LOG2_COEFF_A2 = -21440512;   /* Q25 */
-   static const oac_val32 LOG2_COEFF_A3 = 107903336;   /* Q28 */
-   static const oac_val32 LOG2_COEFF_A4 = -610217024;  /* Q31 */
-
-   oac_int32 integer, norm_coeff_idx, tmp;
-   oac_val32 mantissa;
-   if (x==0) {
-      return -536870912; /* -32.0f */
-   }
-   integer =  SUB32(celt_ilog2(x), 14);  /* Q0 */
-   mantissa = VSHR32(x, integer + 14 - 29);  /* Q29 */
-   norm_coeff_idx = SHR32(mantissa, 29 - 3) & 0x7;
-   /* mantissa is in Q28 (29 + Q_NORM_CONST - 31 where Q_NORM_CONST is Q30)
-    * 285212672 (Q28) is 1.0625f. */
-   mantissa = SUB32(MULT32_32_Q31(mantissa, log2_x_norm_coeff[norm_coeff_idx]),
+    /* Q30 */
+    static const oac_val32 log2_x_norm_coeff[8] = {
+        1073741824, 954437184, 858993472, 780903168,
+        715827904,  660764224, 613566784, 572662336};
+    /* Q24 */
+    static const oac_val32 log2_y_norm_coeff[8] = {
+        0,       2850868,  5401057,  7707983,
+        9814042, 11751428, 13545168, 15215099};
+    static const oac_val32 LOG2_COEFF_A0 = 1467383;    /* Q24 */
+    static const oac_val32 LOG2_COEFF_A1 = 182244800;  /* Q27 */
+    static const oac_val32 LOG2_COEFF_A2 = -21440512;  /* Q25 */
+    static const oac_val32 LOG2_COEFF_A3 = 107903336;  /* Q28 */
+    static const oac_val32 LOG2_COEFF_A4 = -610217024; /* Q31 */
+
+    oac_int32 integer, norm_coeff_idx, tmp;
+    oac_val32 mantissa;
+    if (x == 0) {
+        return -536870912; /* -32.0f */
+    }
+    integer =  SUB32(celt_ilog2(x), 14); /* Q0 */
+    mantissa = VSHR32(x, integer + 14 - 29); /* Q29 */
+    norm_coeff_idx = SHR32(mantissa, 29 - 3)&0x7;
+    /* mantissa is in Q28 (29 + Q_NORM_CONST - 31 where Q_NORM_CONST is Q30)
+     * 285212672 (Q28) is 1.0625f. */
+    mantissa = SUB32(MULT32_32_Q31(mantissa, log2_x_norm_coeff[norm_coeff_idx]),
                     285212672);
 
-   /* q_a3(Q28): q_mantissa + q_a4 - 31
-    * q_a2(Q25): q_mantissa + q_a3 - 31
-    * q_a1(Q27): q_mantissa + q_a2 - 31 + 5
-    * q_a0(Q24): q_mantissa + q_a1 - 31
-    * where  q_mantissa is Q28 */
-   /* Split evaluation in steps to avoid exploding macro expansion. */
-   tmp = MULT32_32_Q31(mantissa, LOG2_COEFF_A4);
-   tmp = MULT32_32_Q31(mantissa, ADD32(LOG2_COEFF_A3, tmp));
-   tmp = SHL32(MULT32_32_Q31(mantissa, ADD32(LOG2_COEFF_A2, tmp)), 5 /* SHL32 for LOG2_COEFF_A1 */);
-   tmp = MULT32_32_Q31(mantissa, ADD32(LOG2_COEFF_A1, tmp));
-   return ADD32(log2_y_norm_coeff[norm_coeff_idx],
+    /* q_a3(Q28): q_mantissa + q_a4 - 31
+     * q_a2(Q25): q_mantissa + q_a3 - 31
+     * q_a1(Q27): q_mantissa + q_a2 - 31 + 5
+     * q_a0(Q24): q_mantissa + q_a1 - 31
+     * where  q_mantissa is Q28 */
+    /* Split evaluation in steps to avoid exploding macro expansion. */
+    tmp = MULT32_32_Q31(mantissa, LOG2_COEFF_A4);
+    tmp = MULT32_32_Q31(mantissa, ADD32(LOG2_COEFF_A3, tmp));
+    tmp = SHL32(MULT32_32_Q31(mantissa, ADD32(LOG2_COEFF_A2, tmp)), 5 /* SHL32 for LOG2_COEFF_A1 */);
+    tmp = MULT32_32_Q31(mantissa, ADD32(LOG2_COEFF_A1, tmp));
+    return ADD32(log2_y_norm_coeff[norm_coeff_idx],
           ADD32(SHL32(integer, DB_SHIFT),
           ADD32(LOG2_COEFF_A0, tmp)));
 }
 
 /* Calculates exp2 for Q28 within a specific range (0 to 1.0) using fixed-point
  * arithmetic. The input number must be adjusted for Q DB_SHIFT. */
-static OAC_INLINE oac_val32 celt_exp2_db_frac(oac_val32 x)
-{
-   /* Approximation constants. */
-   static const oac_int32 EXP2_COEFF_A0 = 268435440;   /* Q28 */
-   static const oac_int32 EXP2_COEFF_A1 = 744267456;   /* Q30 */
-   static const oac_int32 EXP2_COEFF_A2 = 1031451904;  /* Q32 */
-   static const oac_int32 EXP2_COEFF_A3 = 959088832;   /* Q34 */
-   static const oac_int32 EXP2_COEFF_A4 = 617742720;   /* Q36 */
-   static const oac_int32 EXP2_COEFF_A5 = 516104352;   /* Q38 */
-   oac_int32 tmp;
-   /* Converts input value from Q24 to Q29. */
-   oac_val32 x_q29 = SHL32(x, 29 - 24);
-   /* Split evaluation in steps to avoid exploding macro expansion. */
-   tmp = ADD32(EXP2_COEFF_A4, MULT32_32_Q31(x_q29, EXP2_COEFF_A5));
-   tmp = ADD32(EXP2_COEFF_A3, MULT32_32_Q31(x_q29, tmp));
-   tmp = ADD32(EXP2_COEFF_A2, MULT32_32_Q31(x_q29, tmp));
-   tmp = ADD32(EXP2_COEFF_A1, MULT32_32_Q31(x_q29, tmp));
-   return ADD32(EXP2_COEFF_A0, MULT32_32_Q31(x_q29, tmp));
+static OAC_INLINE oac_val32 celt_exp2_db_frac(oac_val32 x) {
+    /* Approximation constants. */
+    static const oac_int32 EXP2_COEFF_A0 = 268435440;  /* Q28 */
+    static const oac_int32 EXP2_COEFF_A1 = 744267456;  /* Q30 */
+    static const oac_int32 EXP2_COEFF_A2 = 1031451904; /* Q32 */
+    static const oac_int32 EXP2_COEFF_A3 = 959088832;  /* Q34 */
+    static const oac_int32 EXP2_COEFF_A4 = 617742720;  /* Q36 */
+    static const oac_int32 EXP2_COEFF_A5 = 516104352;  /* Q38 */
+    oac_int32 tmp;
+    /* Converts input value from Q24 to Q29. */
+    oac_val32 x_q29 = SHL32(x, 29 - 24);
+    /* Split evaluation in steps to avoid exploding macro expansion. */
+    tmp = ADD32(EXP2_COEFF_A4, MULT32_32_Q31(x_q29, EXP2_COEFF_A5));
+    tmp = ADD32(EXP2_COEFF_A3, MULT32_32_Q31(x_q29, tmp));
+    tmp = ADD32(EXP2_COEFF_A2, MULT32_32_Q31(x_q29, tmp));
+    tmp = ADD32(EXP2_COEFF_A1, MULT32_32_Q31(x_q29, tmp));
+    return ADD32(EXP2_COEFF_A0, MULT32_32_Q31(x_q29, tmp));
 }
 
 /* Calculates exp2 for Q16 using fixed-point arithmetic. The input number must
  * be adjusted for Q DB_SHIFT. */
-static OAC_INLINE oac_val32 celt_exp2_db(oac_val32 x)
-{
-   int integer;
-   oac_val32 frac;
-   integer = SHR32(x,DB_SHIFT);
-   if (integer>14)
-      return 0x7f000000;
-   else if (integer <= -17)
-      return 0;
-   frac = celt_exp2_db_frac(x-SHL32(integer, DB_SHIFT));  /* Q28 */
-   return VSHR32(frac, -integer + 28 - 16);  /* Q16 */
+static OAC_INLINE oac_val32 celt_exp2_db(oac_val32 x) {
+    int integer;
+    oac_val32 frac;
+    integer = SHR32(x, DB_SHIFT);
+    if (integer > 14)
+        return 0x7f000000;
+    else if (integer <= -17)
+        return 0;
+    frac = celt_exp2_db_frac(x - SHL32(integer, DB_SHIFT)); /* Q28 */
+    return VSHR32(frac, -integer + 28 - 16); /* Q16 */
 }
 
 
@@ -528,7 +509,7 @@ static OAC_INLINE oac_val32 celt_exp2_db(oac_val32 x)
 oac_val32 celt_rcp(oac_val32 x);
 oac_val32 celt_rcp_norm32(oac_val32 x);
 
-#define celt_div(a,b) MULT32_32_Q31((oac_val32)(a),celt_rcp(b))
+# define celt_div(a, b) MULT32_32_Q31((oac_val32)(a), celt_rcp(b))
 
 oac_val32 frac_div32_q29(oac_val32 a, oac_val32 b);
 oac_val32 frac_div32(oac_val32 a, oac_val32 b);
@@ -536,101 +517,94 @@ oac_val32 frac_div32(oac_val32 a, oac_val32 b);
 /* Computes atan(x) multiplied by 2/PI. The input value (x) should be within the
  * range of -1 to 1 and represented in Q30 format. The function will return the
  * result in Q30 format. */
-static OAC_INLINE oac_val32 celt_atan_norm(oac_val32 x)
-{
-   /* Approximation constants. */
-   static const oac_int32 ATAN_2_OVER_PI = 1367130551;   /* Q31 */
-   static const oac_int32 ATAN_COEFF_A03 = -715791936;   /* Q31 */
-   static const oac_int32 ATAN_COEFF_A05 = 857391616;    /* Q32 */
-   static const oac_int32 ATAN_COEFF_A07 = -1200579328;  /* Q33 */
-   static const oac_int32 ATAN_COEFF_A09 = 1682636672;   /* Q34 */
-   static const oac_int32 ATAN_COEFF_A11 = -1985085440;  /* Q35 */
-   static const oac_int32 ATAN_COEFF_A13 = 1583306112;   /* Q36 */
-   static const oac_int32 ATAN_COEFF_A15 = -598602432;   /* Q37 */
-   oac_int32 x_sq_q30;
-   oac_int32 x_q31;
-   oac_int32 tmp;
-   /* The expected x is in the range of [-1.0f, 1.0f] */
-   celt_sig_assert((x <= 1073741824) && (x >= -1073741824));
-
-   /* If x = 1.0f, returns 0.5f */
-   if (x == 1073741824)
-   {
-      return 536870912; /* 0.5f (Q30) */
-   }
-   /* If x = 1.0f, returns 0.5f */
-   if (x == -1073741824)
-   {
-      return -536870912; /* -0.5f (Q30) */
-   }
-   x_q31 = SHL32(x, 1);
-   x_sq_q30 = MULT32_32_Q31(x_q31, x);
-   /* Split evaluation in steps to avoid exploding macro expansion. */
-   tmp = MULT32_32_Q31(x_sq_q30, ATAN_COEFF_A15);
-   tmp = MULT32_32_Q31(x_sq_q30, ADD32(ATAN_COEFF_A13, tmp));
-   tmp = MULT32_32_Q31(x_sq_q30, ADD32(ATAN_COEFF_A11, tmp));
-   tmp = MULT32_32_Q31(x_sq_q30, ADD32(ATAN_COEFF_A09, tmp));
-   tmp = MULT32_32_Q31(x_sq_q30, ADD32(ATAN_COEFF_A07, tmp));
-   tmp = MULT32_32_Q31(x_sq_q30, ADD32(ATAN_COEFF_A05, tmp));
-   tmp = MULT32_32_Q31(x_sq_q30, ADD32(ATAN_COEFF_A03, tmp));
-   tmp = ADD32(x, MULT32_32_Q31(x_q31, tmp));
-   return MULT32_32_Q31(ATAN_2_OVER_PI, tmp);
+static OAC_INLINE oac_val32 celt_atan_norm(oac_val32 x) {
+    /* Approximation constants. */
+    static const oac_int32 ATAN_2_OVER_PI = 1367130551;  /* Q31 */
+    static const oac_int32 ATAN_COEFF_A03 = -715791936;  /* Q31 */
+    static const oac_int32 ATAN_COEFF_A05 = 857391616;   /* Q32 */
+    static const oac_int32 ATAN_COEFF_A07 = -1200579328; /* Q33 */
+    static const oac_int32 ATAN_COEFF_A09 = 1682636672;  /* Q34 */
+    static const oac_int32 ATAN_COEFF_A11 = -1985085440; /* Q35 */
+    static const oac_int32 ATAN_COEFF_A13 = 1583306112;  /* Q36 */
+    static const oac_int32 ATAN_COEFF_A15 = -598602432;  /* Q37 */
+    oac_int32 x_sq_q30;
+    oac_int32 x_q31;
+    oac_int32 tmp;
+    /* The expected x is in the range of [-1.0f, 1.0f] */
+    celt_sig_assert((x <= 1073741824) && (x >= -1073741824));
+
+    /* If x = 1.0f, returns 0.5f */
+    if (x == 1073741824) {
+        return 536870912; /* 0.5f (Q30) */
+    }
+    /* If x = 1.0f, returns 0.5f */
+    if (x == -1073741824) {
+        return -536870912; /* -0.5f (Q30) */
+    }
+    x_q31 = SHL32(x, 1);
+    x_sq_q30 = MULT32_32_Q31(x_q31, x);
+    /* Split evaluation in steps to avoid exploding macro expansion. */
+    tmp = MULT32_32_Q31(x_sq_q30, ATAN_COEFF_A15);
+    tmp = MULT32_32_Q31(x_sq_q30, ADD32(ATAN_COEFF_A13, tmp));
+    tmp = MULT32_32_Q31(x_sq_q30, ADD32(ATAN_COEFF_A11, tmp));
+    tmp = MULT32_32_Q31(x_sq_q30, ADD32(ATAN_COEFF_A09, tmp));
+    tmp = MULT32_32_Q31(x_sq_q30, ADD32(ATAN_COEFF_A07, tmp));
+    tmp = MULT32_32_Q31(x_sq_q30, ADD32(ATAN_COEFF_A05, tmp));
+    tmp = MULT32_32_Q31(x_sq_q30, ADD32(ATAN_COEFF_A03, tmp));
+    tmp = ADD32(x, MULT32_32_Q31(x_q31, tmp));
+    return MULT32_32_Q31(ATAN_2_OVER_PI, tmp);
 }
 
 /* Calculates the arctangent of y/x, multiplies the result by 2/pi, and returns
  * the value in Q30 format. Both input values (x and y) must be within the range
  * of 0 to 1 and represented in Q30 format. Inputs must be zero or greater, and
  * at least one input must be non-zero. */
-static OAC_INLINE oac_val32 celt_atan2p_norm(oac_val32 y, oac_val32 x)
-{
-   celt_sig_assert(x>=0 && y>=0);
-   if (y==0 && x==0) {
-      return 0;
-   } else if (y < x) {
-      return celt_atan_norm(SHR32(frac_div32(y, x), 1));
-   } else {
-      celt_sig_assert(y > 0);
-      return 1073741824 /* 1.0f Q30 */ -
-             celt_atan_norm(SHR32(frac_div32(x, y), 1));
-   }
+static OAC_INLINE oac_val32 celt_atan2p_norm(oac_val32 y, oac_val32 x) {
+    celt_sig_assert(x >= 0 && y >= 0);
+    if (y == 0 && x == 0) {
+        return 0;
+    } else if (y < x) {
+        return celt_atan_norm(SHR32(frac_div32(y, x), 1));
+    } else {
+        celt_sig_assert(y > 0);
+        return 1073741824 /* 1.0f Q30 */
+               - celt_atan_norm(SHR32(frac_div32(x, y), 1));
+    }
 }
 
-#define M1 32767
-#define M2 -21
-#define M3 -11943
-#define M4 4936
+# define M1 32767
+# define M2 -21
+# define M3 -11943
+# define M4 4936
 
 /* Atan approximation using a 4th order polynomial. Input is in Q15 format
    and normalized by pi/4. Output is in Q15 format */
-static OAC_INLINE oac_val16 celt_atan01(oac_val16 x)
-{
-   return MULT16_16_P15(x, ADD32(M1, MULT16_16_P15(x, ADD32(M2, MULT16_16_P15(x, ADD32(M3, MULT16_16_P15(M4, x)))))));
+static OAC_INLINE oac_val16 celt_atan01(oac_val16 x) {
+    return MULT16_16_P15(x, ADD32(M1, MULT16_16_P15(x, ADD32(M2, MULT16_16_P15(x, ADD32(M3, MULT16_16_P15(M4, x)))))));
 }
 
-#undef M1
-#undef M2
-#undef M3
-#undef M4
+# undef M1
+# undef M2
+# undef M3
+# undef M4
 
 /* atan2() approximation valid for positive input values */
-static OAC_INLINE oac_val16 celt_atan2p(oac_val16 y, oac_val16 x)
-{
-   if (x==0 && y==0) {
-      return 0;
-   } else if (y < x)
-   {
-      oac_val32 arg;
-      arg = celt_div(SHL32(EXTEND32(y),15),x);
-      if (arg >= 32767)
-         arg = 32767;
-      return SHR16(celt_atan01(EXTRACT16(arg)),1);
-   } else {
-      oac_val32 arg;
-      arg = celt_div(SHL32(EXTEND32(x),15),y);
-      if (arg >= 32767)
-         arg = 32767;
-      return 25736-SHR16(celt_atan01(EXTRACT16(arg)),1);
-   }
+static OAC_INLINE oac_val16 celt_atan2p(oac_val16 y, oac_val16 x) {
+    if (x == 0 && y == 0) {
+        return 0;
+    } else if (y < x) {
+        oac_val32 arg;
+        arg = celt_div(SHL32(EXTEND32(y), 15), x);
+        if (arg >= 32767)
+            arg = 32767;
+        return SHR16(celt_atan01(EXTRACT16(arg)), 1);
+    } else {
+        oac_val32 arg;
+        arg = celt_div(SHL32(EXTEND32(x), 15), y);
+        if (arg >= 32767)
+            arg = 32767;
+        return 25736 - SHR16(celt_atan01(EXTRACT16(arg)), 1);
+    }
 }
 
 #endif /* FIXED_POINT */
@@ -639,15 +613,15 @@ static OAC_INLINE oac_val16 celt_atan2p(oac_val16 y, oac_val16 x)
 
 void celt_float2int16_c(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt);
 
-#ifndef OVERRIDE_FLOAT2INT16
-#define celt_float2int16(in, out, cnt, arch) ((void)(arch), celt_float2int16_c(in, out, cnt))
-#endif
+# ifndef OVERRIDE_FLOAT2INT16
+#  define celt_float2int16(in, out, cnt, arch) ((void)(arch), celt_float2int16_c(in, out, cnt))
+# endif
 
 int oac_limit2_checkwithin1_c(float *samples, int cnt);
 
-#ifndef OVERRIDE_LIMIT2_CHECKWITHIN1
-#define oac_limit2_checkwithin1(samples, cnt, arch) ((void)(arch), oac_limit2_checkwithin1_c(samples, cnt))
-#endif
+# ifndef OVERRIDE_LIMIT2_CHECKWITHIN1
+#  define oac_limit2_checkwithin1(samples, cnt, arch) ((void)(arch), oac_limit2_checkwithin1_c(samples, cnt))
+# endif
 
 #endif /* DISABLE_FLOAT_API */
 
diff --git a/celt/mdct.c b/celt/mdct.c
index dd8a1ed9d..1ce1608cc 100644
--- a/celt/mdct.c
+++ b/celt/mdct.c
@@ -24,7 +24,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 /* This is a simple MDCT implementation that uses a N/4 complex FFT
    to do most of the work. It should be relatively straightforward to
@@ -37,12 +37,12 @@
    The algorithm is similar to (and inspired from) Fabrice Bellard's
    MDCT implementation in FFMPEG, but has differences in signs, ordering
    and scaling in many places.
-*/
+ */
 
 #ifndef SKIP_CONFIG_H
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+# ifdef HAVE_CONFIG_H
+#  include "config.h"
+# endif
 #endif
 
 #include "mdct.h"
@@ -54,60 +54,57 @@
 #include "stack_alloc.h"
 
 #if defined(FIXED_POINT) && defined(__mips) && __mips == 32
-#include "mips/mdct_mipsr1.h"
+# include "mips/mdct_mipsr1.h"
 #endif
 
 #ifndef M_PI
-#define M_PI 3.141592653
+# define M_PI 3.141592653
 #endif
 
 #ifdef CUSTOM_MODES
 
-int clt_mdct_init(mdct_lookup *l,int N, int maxshift, int arch)
-{
-   int i;
-   kiss_twiddle_scalar *trig;
-   int shift;
-   int N2=N>>1;
-   l->n = N;
-   l->maxshift = maxshift;
-   for (i=0;i<=maxshift;i++)
-   {
-      if (i==0)
-         l->kfft[i] = oac_fft_alloc(N>>2>>i, 0, 0, arch);
-      else
-         l->kfft[i] = oac_fft_alloc_twiddles(N>>2>>i, 0, 0, l->kfft[0], arch);
-#ifndef ENABLE_TI_DSPLIB55
-      if (l->kfft[i]==NULL)
-         return 0;
-#endif
-   }
-   l->trig = trig = (kiss_twiddle_scalar*)oac_alloc((N-(N2>>maxshift))*sizeof(kiss_twiddle_scalar));
-   if (l->trig==NULL)
-     return 0;
-   for (shift=0;shift<=maxshift;shift++)
-   {
-      /* We have enough points that sine isn't necessary */
-#if defined(FIXED_POINT)
-      for (i=0;i<N2;i++)
-         trig[i] = (kiss_twiddle_scalar)MAX32(-2147483647,MIN32(2147483647,floor(.5+2147483648*cos(2*M_PI*(i+.125)/N))));
-#else
-      for (i=0;i<N2;i++)
-         trig[i] = (kiss_twiddle_scalar)cos(2*PI*(i+.125)/N);
-#endif
-      trig += N2;
-      N2 >>= 1;
-      N >>= 1;
-   }
-   return 1;
+int clt_mdct_init(mdct_lookup *l, int N, int maxshift, int arch) {
+    int i;
+    kiss_twiddle_scalar *trig;
+    int shift;
+    int N2 = N>>1;
+    l->n = N;
+    l->maxshift = maxshift;
+    for (i = 0; i <= maxshift; i++) {
+        if (i == 0)
+            l->kfft[i] = oac_fft_alloc(N>>2>>i, 0, 0, arch);
+        else
+            l->kfft[i] = oac_fft_alloc_twiddles(N>>2>>i, 0, 0, l->kfft[0], arch);
+# ifndef ENABLE_TI_DSPLIB55
+        if (l->kfft[i] == NULL)
+            return 0;
+# endif
+    }
+    l->trig = trig = (kiss_twiddle_scalar*)oac_alloc((N - (N2>>maxshift))*sizeof(kiss_twiddle_scalar));
+    if (l->trig == NULL)
+        return 0;
+    for (shift = 0; shift <= maxshift; shift++) {
+        /* We have enough points that sine isn't necessary */
+# if defined(FIXED_POINT)
+        for (i = 0; i < N2; i++)
+            trig[i] = (kiss_twiddle_scalar)MAX32(-2147483647,
+            MIN32(2147483647, floor(.5 + 2147483648*cos(2*M_PI*(i + .125)/N))));
+# else
+        for (i = 0; i < N2; i++)
+            trig[i] = (kiss_twiddle_scalar)cos(2*PI*(i + .125)/N);
+# endif
+        trig += N2;
+        N2 >>= 1;
+        N >>= 1;
+    }
+    return 1;
 }
 
-void clt_mdct_clear(mdct_lookup *l, int arch)
-{
-   int i;
-   for (i=0;i<=l->maxshift;i++)
-      oac_fft_free(l->kfft[i], arch);
-   oac_free((kiss_twiddle_scalar*)l->trig);
+void clt_mdct_clear(mdct_lookup *l, int arch) {
+    int i;
+    for (i = 0; i <= l->maxshift; i++)
+        oac_fft_free(l->kfft[i], arch);
+    oac_free((kiss_twiddle_scalar*)l->trig);
 }
 
 #endif /* CUSTOM_MODES */
@@ -115,259 +112,247 @@ void clt_mdct_clear(mdct_lookup *l, int arch)
 /* Forward MDCT trashes the input array */
 #ifndef OVERRIDE_clt_mdct_forward
 void clt_mdct_forward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * OAC_RESTRICT out,
-      const celt_coef *window, int overlap, int shift, int stride, int arch)
-{
-   int i;
-   int N, N2, N4;
-   VARDECL(kiss_fft_scalar, f);
-   VARDECL(kiss_fft_cpx, f2);
-   const kiss_fft_state *st = l->kfft[shift];
-   const kiss_twiddle_scalar *trig;
-   celt_coef scale;
-#ifdef FIXED_POINT
-   /* Allows us to scale with MULT16_32_Q16(), which is faster than
-      MULT16_32_Q15() on ARM. */
-   int scale_shift = st->scale_shift-1;
-   int headroom;
-#endif
-   SAVE_STACK;
-   (void)arch;
-   scale = st->scale;
+                        const celt_coef *window, int overlap, int shift, int stride, int arch) {
+    int i;
+    int N, N2, N4;
+    VARDECL(kiss_fft_scalar, f);
+    VARDECL(kiss_fft_cpx, f2);
+    const kiss_fft_state *st = l->kfft[shift];
+    const kiss_twiddle_scalar *trig;
+    celt_coef scale;
+# ifdef FIXED_POINT
+    /* Allows us to scale with MULT16_32_Q16(), which is faster than
+       MULT16_32_Q15() on ARM. */
+    int scale_shift = st->scale_shift - 1;
+    int headroom;
+# endif
+    SAVE_STACK;
+    (void)arch;
+    scale = st->scale;
 
-   N = l->n;
-   trig = l->trig;
-   for (i=0;i<shift;i++)
-   {
-      N >>= 1;
-      trig += N;
-   }
-   N2 = N>>1;
-   N4 = N>>2;
+    N = l->n;
+    trig = l->trig;
+    for (i = 0; i < shift; i++) {
+        N >>= 1;
+        trig += N;
+    }
+    N2 = N>>1;
+    N4 = N>>2;
 
-   ALLOC(f, N2, kiss_fft_scalar);
-   ALLOC(f2, N4, kiss_fft_cpx);
+    ALLOC(f, N2, kiss_fft_scalar);
+    ALLOC(f2, N4, kiss_fft_cpx);
 
-   /* Consider the input to be composed of four blocks: [a, b, c, d] */
-   /* Window, shuffle, fold */
-   {
-      /* Temp pointers to make it really clear to the compiler what we're doing */
-      const kiss_fft_scalar * OAC_RESTRICT xp1 = in+(overlap>>1);
-      const kiss_fft_scalar * OAC_RESTRICT xp2 = in+N2-1+(overlap>>1);
-      kiss_fft_scalar * OAC_RESTRICT yp = f;
-      const celt_coef * OAC_RESTRICT wp1 = window+(overlap>>1);
-      const celt_coef * OAC_RESTRICT wp2 = window+(overlap>>1)-1;
-      for(i=0;i<((overlap+3)>>2);i++)
-      {
-         /* Real part arranged as -d-cR, Imag part arranged as -b+aR*/
-         *yp++ = S_MUL(xp1[N2], *wp2) + S_MUL(*xp2, *wp1);
-         *yp++ = S_MUL(*xp1, *wp1)    - S_MUL(xp2[-N2], *wp2);
-         xp1+=2;
-         xp2-=2;
-         wp1+=2;
-         wp2-=2;
-      }
-      wp1 = window;
-      wp2 = window+overlap-1;
-      for(;i<N4-((overlap+3)>>2);i++)
-      {
-         /* Real part arranged as a-bR, Imag part arranged as -c-dR */
-         *yp++ = *xp2;
-         *yp++ = *xp1;
-         xp1+=2;
-         xp2-=2;
-      }
-      for(;i<N4;i++)
-      {
-         /* Real part arranged as a-bR, Imag part arranged as -c-dR */
-         *yp++ =  -S_MUL(xp1[-N2], *wp1) + S_MUL(*xp2, *wp2);
-         *yp++ = S_MUL(*xp1, *wp2)     + S_MUL(xp2[N2], *wp1);
-         xp1+=2;
-         xp2-=2;
-         wp1+=2;
-         wp2-=2;
-      }
-   }
-   /* Pre-rotation */
-   {
-      kiss_fft_scalar * OAC_RESTRICT yp = f;
-      const kiss_twiddle_scalar *t = &trig[0];
-#ifdef FIXED_POINT
-      oac_val32 maxval=1;
-#endif
-      for(i=0;i<N4;i++)
-      {
-         kiss_fft_cpx yc;
-         kiss_twiddle_scalar t0, t1;
-         kiss_fft_scalar re, im, yr, yi;
-         t0 = t[i];
-         t1 = t[N4+i];
-         re = *yp++;
-         im = *yp++;
-         yr = S_MUL(re,t0)  -  S_MUL(im,t1);
-         yi = S_MUL(im,t0)  +  S_MUL(re,t1);
-         yc.r = yr;
-         yc.i = yi;
-#ifdef FIXED_POINT
-         maxval = MAX32(maxval, MAX32(ABS32(yc.r), ABS32(yc.i)));
-#endif
-         f2[st->bitrev[i]] = yc;
-      }
-#ifdef FIXED_POINT
-      headroom = IMAX(0, IMIN(scale_shift, 28-celt_ilog2(maxval)));
-#endif
-   }
+    /* Consider the input to be composed of four blocks: [a, b, c, d] */
+    /* Window, shuffle, fold */
+    {
+        /* Temp pointers to make it really clear to the compiler what we're doing */
+        const kiss_fft_scalar * OAC_RESTRICT xp1 = in + (overlap>>1);
+        const kiss_fft_scalar * OAC_RESTRICT xp2 = in + N2 - 1 + (overlap>>1);
+        kiss_fft_scalar * OAC_RESTRICT yp = f;
+        const celt_coef * OAC_RESTRICT wp1 = window + (overlap>>1);
+        const celt_coef * OAC_RESTRICT wp2 = window + (overlap>>1) - 1;
+        for (i = 0; i < ((overlap + 3)>>2); i++) {
+            /* Real part arranged as -d-cR, Imag part arranged as -b+aR*/
+            *yp++ = S_MUL(xp1[N2], *wp2) + S_MUL(*xp2, *wp1);
+            *yp++ = S_MUL(*xp1, *wp1)    - S_MUL(xp2[-N2], *wp2);
+            xp1 += 2;
+            xp2 -= 2;
+            wp1 += 2;
+            wp2 -= 2;
+        }
+        wp1 = window;
+        wp2 = window + overlap - 1;
+        for (; i < N4 - ((overlap + 3)>>2); i++) {
+            /* Real part arranged as a-bR, Imag part arranged as -c-dR */
+            *yp++ = *xp2;
+            *yp++ = *xp1;
+            xp1 += 2;
+            xp2 -= 2;
+        }
+        for (; i < N4; i++) {
+            /* Real part arranged as a-bR, Imag part arranged as -c-dR */
+            *yp++ =  -S_MUL(xp1[-N2], *wp1) + S_MUL(*xp2, *wp2);
+            *yp++ = S_MUL(*xp1, *wp2)     + S_MUL(xp2[N2], *wp1);
+            xp1 += 2;
+            xp2 -= 2;
+            wp1 += 2;
+            wp2 -= 2;
+        }
+    }
+    /* Pre-rotation */
+    {
+        kiss_fft_scalar * OAC_RESTRICT yp = f;
+        const kiss_twiddle_scalar *t = &trig[0];
+# ifdef FIXED_POINT
+        oac_val32 maxval = 1;
+# endif
+        for (i = 0; i < N4; i++) {
+            kiss_fft_cpx yc;
+            kiss_twiddle_scalar t0, t1;
+            kiss_fft_scalar re, im, yr, yi;
+            t0 = t[i];
+            t1 = t[N4 + i];
+            re = *yp++;
+            im = *yp++;
+            yr = S_MUL(re, t0)  -  S_MUL(im, t1);
+            yi = S_MUL(im, t0)  +  S_MUL(re, t1);
+            yc.r = yr;
+            yc.i = yi;
+# ifdef FIXED_POINT
+            maxval = MAX32(maxval, MAX32(ABS32(yc.r), ABS32(yc.i)));
+# endif
+            f2[st->bitrev[i]] = yc;
+        }
+# ifdef FIXED_POINT
+        headroom = IMAX(0, IMIN(scale_shift, 28 - celt_ilog2(maxval)));
+# endif
+    }
 
-   /* N/4 complex FFT, does not downscale anymore */
-   oac_fft_impl(st, f2 ARG_FIXED(scale_shift-headroom));
+    /* N/4 complex FFT, does not downscale anymore */
+    oac_fft_impl(st, f2 ARG_FIXED(scale_shift - headroom));
 
-   /* Post-rotate */
-   {
-      /* Temp pointers to make it really clear to the compiler what we're doing */
-      const kiss_fft_cpx * OAC_RESTRICT fp = f2;
-      kiss_fft_scalar * OAC_RESTRICT yp1 = out;
-      kiss_fft_scalar * OAC_RESTRICT yp2 = out+stride*(N2-1);
-      const kiss_twiddle_scalar *t = &trig[0];
-      /* Temp pointers to make it really clear to the compiler what we're doing */
-      for(i=0;i<N4;i++)
-      {
-         kiss_fft_scalar yr, yi;
-         kiss_fft_scalar t0, t1;
-         t0 = S_MUL2(t[i], scale);
-         t1 = S_MUL2(t[N4+i], scale);
-         yr = PSHR32(S_MUL(fp->i,t1) - S_MUL(fp->r,t0), headroom);
-         yi = PSHR32(S_MUL(fp->r,t1) + S_MUL(fp->i,t0), headroom);
-         *yp1 = yr;
-         *yp2 = yi;
-         fp++;
-         yp1 += 2*stride;
-         yp2 -= 2*stride;
-      }
-   }
-   RESTORE_STACK;
+    /* Post-rotate */
+    {
+        /* Temp pointers to make it really clear to the compiler what we're doing */
+        const kiss_fft_cpx * OAC_RESTRICT fp = f2;
+        kiss_fft_scalar * OAC_RESTRICT yp1 = out;
+        kiss_fft_scalar * OAC_RESTRICT yp2 = out + stride*(N2 - 1);
+        const kiss_twiddle_scalar *t = &trig[0];
+        /* Temp pointers to make it really clear to the compiler what we're doing */
+        for (i = 0; i < N4; i++) {
+            kiss_fft_scalar yr, yi;
+            kiss_fft_scalar t0, t1;
+            t0 = S_MUL2(t[i], scale);
+            t1 = S_MUL2(t[N4 + i], scale);
+            yr = PSHR32(S_MUL(fp->i, t1) - S_MUL(fp->r, t0), headroom);
+            yi = PSHR32(S_MUL(fp->r, t1) + S_MUL(fp->i, t0), headroom);
+            *yp1 = yr;
+            *yp2 = yi;
+            fp++;
+            yp1 += 2*stride;
+            yp2 -= 2*stride;
+        }
+    }
+    RESTORE_STACK;
 }
 #endif /* OVERRIDE_clt_mdct_forward */
 
 #ifndef OVERRIDE_clt_mdct_backward
 void clt_mdct_backward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * OAC_RESTRICT out,
-      const celt_coef * OAC_RESTRICT window, int overlap, int shift, int stride, int arch)
-{
-   int i;
-   int N, N2, N4;
-   const kiss_twiddle_scalar *trig;
-#ifdef FIXED_POINT
-   int pre_shift, post_shift, fft_shift;
-#endif
-   (void) arch;
+                         const celt_coef * OAC_RESTRICT window, int overlap, int shift, int stride, int arch) {
+    int i;
+    int N, N2, N4;
+    const kiss_twiddle_scalar *trig;
+# ifdef FIXED_POINT
+    int pre_shift, post_shift, fft_shift;
+# endif
+    (void) arch;
 
-   N = l->n;
-   trig = l->trig;
-   for (i=0;i<shift;i++)
-   {
-      N >>= 1;
-      trig += N;
-   }
-   N2 = N>>1;
-   N4 = N>>2;
+    N = l->n;
+    trig = l->trig;
+    for (i = 0; i < shift; i++) {
+        N >>= 1;
+        trig += N;
+    }
+    N2 = N>>1;
+    N4 = N>>2;
 
-#ifdef FIXED_POINT
-   {
-      oac_val32 sumval=N2;
-      oac_val32 maxval=0;
-      for (i=0;i<N2;i++) {
-         maxval = MAX32(maxval, ABS32(in[i*stride]));
-         sumval = ADD32_ovflw(sumval, ABS32(SHR32(in[i*stride],11)));
-      }
-      pre_shift = IMAX(0, 29-celt_zlog2(1+maxval));
-      /* Worst-case where all the energy goes to a single sample. */
-      post_shift = IMAX(0, 19-celt_ilog2(ABS32(sumval)));
-      post_shift = IMIN(post_shift, pre_shift);
-      fft_shift = pre_shift - post_shift;
-   }
-#endif
-   /* Pre-rotate */
-   {
-      /* Temp pointers to make it really clear to the compiler what we're doing */
-      const kiss_fft_scalar * OAC_RESTRICT xp1 = in;
-      const kiss_fft_scalar * OAC_RESTRICT xp2 = in+stride*(N2-1);
-      kiss_fft_scalar * OAC_RESTRICT yp = out+(overlap>>1);
-      const kiss_twiddle_scalar * OAC_RESTRICT t = &trig[0];
-      const oac_int16 * OAC_RESTRICT bitrev = l->kfft[shift]->bitrev;
-      for(i=0;i<N4;i++)
-      {
-         int rev;
-         kiss_fft_scalar yr, yi;
-         oac_val32 x1, x2;
-         rev = *bitrev++;
-         x1 = SHL32_ovflw(*xp1, pre_shift);
-         x2 = SHL32_ovflw(*xp2, pre_shift);
-         yr = ADD32_ovflw(S_MUL(x2, t[i]), S_MUL(x1, t[N4+i]));
-         yi = SUB32_ovflw(S_MUL(x1, t[i]), S_MUL(x2, t[N4+i]));
-         /* We swap real and imag because we use an FFT instead of an IFFT. */
-         yp[2*rev+1] = yr;
-         yp[2*rev] = yi;
-         /* Storing the pre-rotation directly in the bitrev order. */
-         xp1+=2*stride;
-         xp2-=2*stride;
-      }
-   }
+# ifdef FIXED_POINT
+    {
+        oac_val32 sumval = N2;
+        oac_val32 maxval = 0;
+        for (i = 0; i < N2; i++) {
+            maxval = MAX32(maxval, ABS32(in[i*stride]));
+            sumval = ADD32_ovflw(sumval, ABS32(SHR32(in[i*stride], 11)));
+        }
+        pre_shift = IMAX(0, 29 - celt_zlog2(1 + maxval));
+        /* Worst-case where all the energy goes to a single sample. */
+        post_shift = IMAX(0, 19 - celt_ilog2(ABS32(sumval)));
+        post_shift = IMIN(post_shift, pre_shift);
+        fft_shift = pre_shift - post_shift;
+    }
+# endif
+    /* Pre-rotate */
+    {
+        /* Temp pointers to make it really clear to the compiler what we're doing */
+        const kiss_fft_scalar * OAC_RESTRICT xp1 = in;
+        const kiss_fft_scalar * OAC_RESTRICT xp2 = in + stride*(N2 - 1);
+        kiss_fft_scalar * OAC_RESTRICT yp = out + (overlap>>1);
+        const kiss_twiddle_scalar * OAC_RESTRICT t = &trig[0];
+        const oac_int16 * OAC_RESTRICT bitrev = l->kfft[shift]->bitrev;
+        for (i = 0; i < N4; i++) {
+            int rev;
+            kiss_fft_scalar yr, yi;
+            oac_val32 x1, x2;
+            rev = *bitrev++;
+            x1 = SHL32_ovflw(*xp1, pre_shift);
+            x2 = SHL32_ovflw(*xp2, pre_shift);
+            yr = ADD32_ovflw(S_MUL(x2, t[i]), S_MUL(x1, t[N4 + i]));
+            yi = SUB32_ovflw(S_MUL(x1, t[i]), S_MUL(x2, t[N4 + i]));
+            /* We swap real and imag because we use an FFT instead of an IFFT. */
+            yp[2*rev + 1] = yr;
+            yp[2*rev] = yi;
+            /* Storing the pre-rotation directly in the bitrev order. */
+            xp1 += 2*stride;
+            xp2 -= 2*stride;
+        }
+    }
 
-   oac_fft_impl(l->kfft[shift], (kiss_fft_cpx*)(out+(overlap>>1)) ARG_FIXED(fft_shift));
+    oac_fft_impl(l->kfft[shift], (kiss_fft_cpx*)(out + (overlap>>1))ARG_FIXED(fft_shift));
 
-   /* Post-rotate and de-shuffle from both ends of the buffer at once to make
-      it in-place. */
-   {
-      kiss_fft_scalar * yp0 = out+(overlap>>1);
-      kiss_fft_scalar * yp1 = out+(overlap>>1)+N2-2;
-      const kiss_twiddle_scalar *t = &trig[0];
-      /* Loop to (N4+1)>>1 to handle odd N4. When N4 is odd, the
-         middle pair will be computed twice. */
-      for(i=0;i<(N4+1)>>1;i++)
-      {
-         kiss_fft_scalar re, im, yr, yi;
-         kiss_twiddle_scalar t0, t1;
-         /* We swap real and imag because we're using an FFT instead of an IFFT. */
-         re = yp0[1];
-         im = yp0[0];
-         t0 = t[i];
-         t1 = t[N4+i];
-         /* We'd scale up by 2 here, but instead it's done when mixing the windows */
-         yr = PSHR32_ovflw(ADD32_ovflw(S_MUL(re,t0), S_MUL(im,t1)), post_shift);
-         yi = PSHR32_ovflw(SUB32_ovflw(S_MUL(re,t1), S_MUL(im,t0)), post_shift);
-         /* We swap real and imag because we're using an FFT instead of an IFFT. */
-         re = yp1[1];
-         im = yp1[0];
-         yp0[0] = yr;
-         yp1[1] = yi;
+    /* Post-rotate and de-shuffle from both ends of the buffer at once to make
+       it in-place. */
+    {
+        kiss_fft_scalar * yp0 = out + (overlap>>1);
+        kiss_fft_scalar * yp1 = out + (overlap>>1) + N2 - 2;
+        const kiss_twiddle_scalar *t = &trig[0];
+        /* Loop to (N4+1)>>1 to handle odd N4. When N4 is odd, the
+           middle pair will be computed twice. */
+        for (i = 0; i < (N4 + 1)>>1; i++) {
+            kiss_fft_scalar re, im, yr, yi;
+            kiss_twiddle_scalar t0, t1;
+            /* We swap real and imag because we're using an FFT instead of an IFFT. */
+            re = yp0[1];
+            im = yp0[0];
+            t0 = t[i];
+            t1 = t[N4 + i];
+            /* We'd scale up by 2 here, but instead it's done when mixing the windows */
+            yr = PSHR32_ovflw(ADD32_ovflw(S_MUL(re, t0), S_MUL(im, t1)), post_shift);
+            yi = PSHR32_ovflw(SUB32_ovflw(S_MUL(re, t1), S_MUL(im, t0)), post_shift);
+            /* We swap real and imag because we're using an FFT instead of an IFFT. */
+            re = yp1[1];
+            im = yp1[0];
+            yp0[0] = yr;
+            yp1[1] = yi;
 
-         t0 = t[(N4-i-1)];
-         t1 = t[(N2-i-1)];
-         /* We'd scale up by 2 here, but instead it's done when mixing the windows */
-         yr = PSHR32_ovflw(ADD32_ovflw(S_MUL(re,t0), S_MUL(im,t1)), post_shift);
-         yi = PSHR32_ovflw(SUB32_ovflw(S_MUL(re,t1), S_MUL(im,t0)), post_shift);
-         yp1[0] = yr;
-         yp0[1] = yi;
-         yp0 += 2;
-         yp1 -= 2;
-      }
-   }
+            t0 = t[(N4 - i - 1)];
+            t1 = t[(N2 - i - 1)];
+            /* We'd scale up by 2 here, but instead it's done when mixing the windows */
+            yr = PSHR32_ovflw(ADD32_ovflw(S_MUL(re, t0), S_MUL(im, t1)), post_shift);
+            yi = PSHR32_ovflw(SUB32_ovflw(S_MUL(re, t1), S_MUL(im, t0)), post_shift);
+            yp1[0] = yr;
+            yp0[1] = yi;
+            yp0 += 2;
+            yp1 -= 2;
+        }
+    }
 
-   /* Mirror on both sides for TDAC */
-   {
-      kiss_fft_scalar * OAC_RESTRICT xp1 = out+overlap-1;
-      kiss_fft_scalar * OAC_RESTRICT yp1 = out;
-      const celt_coef * OAC_RESTRICT wp1 = window;
-      const celt_coef * OAC_RESTRICT wp2 = window+overlap-1;
+    /* Mirror on both sides for TDAC */
+    {
+        kiss_fft_scalar * OAC_RESTRICT xp1 = out + overlap - 1;
+        kiss_fft_scalar * OAC_RESTRICT yp1 = out;
+        const celt_coef * OAC_RESTRICT wp1 = window;
+        const celt_coef * OAC_RESTRICT wp2 = window + overlap - 1;
 
-      for(i = 0; i < overlap/2; i++)
-      {
-         kiss_fft_scalar x1, x2;
-         x1 = *xp1;
-         x2 = *yp1;
-         *yp1++ = SUB32_ovflw(S_MUL(x2, *wp2), S_MUL(x1, *wp1));
-         *xp1-- = ADD32_ovflw(S_MUL(x2, *wp1), S_MUL(x1, *wp2));
-         wp1++;
-         wp2--;
-      }
-   }
+        for (i = 0; i < overlap/2; i++) {
+            kiss_fft_scalar x1, x2;
+            x1 = *xp1;
+            x2 = *yp1;
+            *yp1++ = SUB32_ovflw(S_MUL(x2, *wp2), S_MUL(x1, *wp1));
+            *xp1-- = ADD32_ovflw(S_MUL(x2, *wp1), S_MUL(x1, *wp2));
+            wp1++;
+            wp2--;
+        }
+    }
 }
 #endif /* OVERRIDE_clt_mdct_backward */
diff --git a/celt/mdct.h b/celt/mdct.h
index 1d9f6a2e6..37bc4ea9d 100644
--- a/celt/mdct.h
+++ b/celt/mdct.h
@@ -24,7 +24,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 /* This is a simple MDCT implementation that uses a N/4 complex FFT
    to do most of the work. It should be relatively straightforward to
@@ -37,7 +37,7 @@
    The algorithm is similar to (and inspired from) Fabrice Bellard's
    MDCT implementation in FFMPEG, but has differences in signs, ordering
    and scaling in many places.
-*/
+ */
 
 #ifndef MDCT_H
 #define MDCT_H
@@ -47,65 +47,65 @@
 #include "arch.h"
 
 typedef struct {
-   int n;
-   int maxshift;
-   const kiss_fft_state *kfft[4];
-   const kiss_twiddle_scalar * OAC_RESTRICT trig;
+    int n;
+    int maxshift;
+    const kiss_fft_state *kfft[4];
+    const kiss_twiddle_scalar * OAC_RESTRICT trig;
 } mdct_lookup;
 
 #if defined(HAVE_ARM_NE10)
-#include "arm/mdct_arm.h"
+# include "arm/mdct_arm.h"
 #endif
 
-int clt_mdct_init(mdct_lookup *l,int N, int maxshift, int arch);
+int clt_mdct_init(mdct_lookup *l, int N, int maxshift, int arch);
 void clt_mdct_clear(mdct_lookup *l, int arch);
 
 /** Compute a forward MDCT and scale by 4/N, trashes the input array */
 void clt_mdct_forward_c(const mdct_lookup *l, kiss_fft_scalar *in,
-                        kiss_fft_scalar * OAC_RESTRICT out,
-                        const celt_coef *window, int overlap,
-                        int shift, int stride, int arch);
+    kiss_fft_scalar * OAC_RESTRICT out,
+    const celt_coef *window, int overlap,
+    int shift, int stride, int arch);
 
 /** Compute a backward MDCT (no scaling) and performs weighted overlap-add
     (scales implicitly by 1/2) */
 void clt_mdct_backward_c(const mdct_lookup *l, kiss_fft_scalar *in,
-      kiss_fft_scalar * OAC_RESTRICT out,
-      const celt_coef * OAC_RESTRICT window,
-      int overlap, int shift, int stride, int arch);
+    kiss_fft_scalar * OAC_RESTRICT out,
+    const celt_coef * OAC_RESTRICT window,
+    int overlap, int shift, int stride, int arch);
 
 #if !defined(OVERRIDE_OAC_MDCT)
 /* Is run-time CPU detection enabled on this platform? */
-#if defined(OAC_HAVE_RTCD) && defined(HAVE_ARM_NE10)
+# if defined(OAC_HAVE_RTCD) && defined(HAVE_ARM_NE10)
 
-extern void (*const CLT_MDCT_FORWARD_IMPL[OAC_ARCHMASK+1])(
+extern void (*const CLT_MDCT_FORWARD_IMPL[OAC_ARCHMASK + 1])(
       const mdct_lookup *l, kiss_fft_scalar *in,
       kiss_fft_scalar * OAC_RESTRICT out, const celt_coef *window,
       int overlap, int shift, int stride, int arch);
 
-#define clt_mdct_forward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
-   ((*CLT_MDCT_FORWARD_IMPL[(arch)&OAC_ARCHMASK])(_l, _in, _out, \
-                                                   _window, _overlap, _shift, \
-                                                   _stride, _arch))
+#  define clt_mdct_forward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
+        ((*CLT_MDCT_FORWARD_IMPL[(arch)&OAC_ARCHMASK])(_l, _in, _out, \
+                                                       _window, _overlap, _shift, \
+                                                       _stride, _arch))
 
-extern void (*const CLT_MDCT_BACKWARD_IMPL[OAC_ARCHMASK+1])(
+extern void (*const CLT_MDCT_BACKWARD_IMPL[OAC_ARCHMASK + 1])(
       const mdct_lookup *l, kiss_fft_scalar *in,
       kiss_fft_scalar * OAC_RESTRICT out, const celt_coef *window,
       int overlap, int shift, int stride, int arch);
 
-#define clt_mdct_backward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
-   (*CLT_MDCT_BACKWARD_IMPL[(arch)&OAC_ARCHMASK])(_l, _in, _out, \
-                                                   _window, _overlap, _shift, \
-                                                   _stride, _arch)
+#  define clt_mdct_backward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
+        (*CLT_MDCT_BACKWARD_IMPL[(arch)&OAC_ARCHMASK])(_l, _in, _out, \
+                                                       _window, _overlap, _shift, \
+                                                       _stride, _arch)
 
-#else /* if defined(OAC_HAVE_RTCD) && defined(HAVE_ARM_NE10) */
+# else /* if defined(OAC_HAVE_RTCD) && defined(HAVE_ARM_NE10) */
 
-#define clt_mdct_forward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
-   clt_mdct_forward_c(_l, _in, _out, _window, _overlap, _shift, _stride, _arch)
+#  define clt_mdct_forward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
+        clt_mdct_forward_c(_l, _in, _out, _window, _overlap, _shift, _stride, _arch)
 
-#define clt_mdct_backward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
-   clt_mdct_backward_c(_l, _in, _out, _window, _overlap, _shift, _stride, _arch)
+#  define clt_mdct_backward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
+        clt_mdct_backward_c(_l, _in, _out, _window, _overlap, _shift, _stride, _arch)
 
-#endif /* end if defined(OAC_HAVE_RTCD) && defined(HAVE_ARM_NE10) && !defined(FIXED_POINT) */
+# endif /* end if defined(OAC_HAVE_RTCD) && defined(HAVE_ARM_NE10) && !defined(FIXED_POINT) */
 #endif /* end if !defined(OVERRIDE_OAC_MDCT) */
 
 #endif
diff --git a/celt/mfrngcod.h b/celt/mfrngcod.h
index 2b4918dfe..51770d88c 100644
--- a/celt/mfrngcod.h
+++ b/celt/mfrngcod.h
@@ -23,26 +23,26 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #if !defined(_mfrngcode_H)
-# define _mfrngcode_H (1)
-# include "entcode.h"
+#define _mfrngcode_H (1)
+#include "entcode.h"
 
 /*Constants used by the entropy encoder/decoder.*/
 
 /*The number of bits to output at a time.*/
-# define EC_SYM_BITS   (8)
+#define EC_SYM_BITS   (8)
 /*The total number of bits in each of the state registers.*/
-# define EC_CODE_BITS  (32)
+#define EC_CODE_BITS  (32)
 /*The maximum symbol value.*/
-# define EC_SYM_MAX    ((1U<<EC_SYM_BITS)-1)
+#define EC_SYM_MAX    ((1U<<EC_SYM_BITS) - 1)
 /*Bits to shift by to move a symbol into the high-order position.*/
-# define EC_CODE_SHIFT (EC_CODE_BITS-EC_SYM_BITS-1)
+#define EC_CODE_SHIFT (EC_CODE_BITS - EC_SYM_BITS - 1)
 /*Carry bit of the high-order range symbol.*/
-# define EC_CODE_TOP   (((oac_uint32)1U)<<(EC_CODE_BITS-1))
+#define EC_CODE_TOP   (((oac_uint32)1U)<<(EC_CODE_BITS - 1))
 /*Low-order bit of the high-order range symbol.*/
-# define EC_CODE_BOT   (EC_CODE_TOP>>EC_SYM_BITS)
+#define EC_CODE_BOT   (EC_CODE_TOP>>EC_SYM_BITS)
 /*The number of bits available for the last, partial symbol in the code field.*/
-# define EC_CODE_EXTRA ((EC_CODE_BITS-2)%EC_SYM_BITS+1)
+#define EC_CODE_EXTRA ((EC_CODE_BITS - 2)%EC_SYM_BITS + 1)
 #endif
diff --git a/celt/mini_kfft.c b/celt/mini_kfft.c
index b2b92504b..290568773 100644
--- a/celt/mini_kfft.c
+++ b/celt/mini_kfft.c
@@ -25,11 +25,11 @@ typedef struct mini_kiss_fft_state* mini_kiss_fft_cfg;
 
 #define MINI_MAXFACTORS 32
 /* e.g. an fft of length 128 has 4 factors
- as far as kissfft is concerned
- 4*4*4*2
+   as far as kissfft is concerned
+   4*4*4*2
  */
 
-typedef struct mini_kiss_fft_state{
+typedef struct mini_kiss_fft_state {
     int nfft;
     int inverse;
     int factors[2*MINI_MAXFACTORS];
@@ -37,7 +37,7 @@ typedef struct mini_kiss_fft_state{
 } mini_kiss_fft_state;
 
 /*
-  Explanation of macros dealing with complex math:
+   Explanation of macros dealing with complex math:
 
    C_MUL(m,a,b)         : m = a*b
    C_FIXDIV( c , div )  : if a fixed point impl., c /= div. noop otherwise
@@ -46,274 +46,264 @@ typedef struct mini_kiss_fft_state{
    C_ADDTO( res , a)    : res += a
  * */
 
-#   define S_MUL(a,b) ( (a)*(b) )
-#define C_MUL(m,a,b) \
-    do{ (m).r = (a).r*(b).r - (a).i*(b).i;\
-        (m).i = (a).r*(b).i + (a).i*(b).r; }while(0)
-#   define C_FIXDIV(c,div) /* NOOP */
-#   define C_MULBYSCALAR( c, s ) \
-    do{ (c).r *= (s);\
-        (c).i *= (s); }while(0)
-
-
-#define CHECK_OVERFLOW_OP(a,op,b) /* noop */
-
-#define  C_ADD( res, a,b)\
-    do { \
-        CHECK_OVERFLOW_OP((a).r,+,(b).r)\
-        CHECK_OVERFLOW_OP((a).i,+,(b).i)\
-        (res).r=(a).r+(b).r;  (res).i=(a).i+(b).i; \
-    }while(0)
-#define  C_SUB( res, a,b)\
-    do { \
-        CHECK_OVERFLOW_OP((a).r,-,(b).r)\
-        CHECK_OVERFLOW_OP((a).i,-,(b).i)\
-        (res).r=(a).r-(b).r;  (res).i=(a).i-(b).i; \
-    }while(0)
-#define C_ADDTO( res , a)\
-    do { \
-        CHECK_OVERFLOW_OP((res).r,+,(a).r)\
-        CHECK_OVERFLOW_OP((res).i,+,(a).i)\
-        (res).r += (a).r;  (res).i += (a).i;\
-    }while(0)
-
-#define C_SUBFROM( res , a)\
-    do {\
-        CHECK_OVERFLOW_OP((res).r,-,(a).r)\
-        CHECK_OVERFLOW_OP((res).i,-,(a).i)\
-        (res).r -= (a).r;  (res).i -= (a).i; \
-    }while(0)
-
-
-#  define MINI_KISS_FFT_COS(phase) (mini_kiss_fft_scalar) cos(phase)
-#  define MINI_KISS_FFT_SIN(phase) (mini_kiss_fft_scalar) sin(phase)
-#  define MINI_HALF_OF(x) ((x)*((mini_kiss_fft_scalar).5))
-
-#define  mini_kf_cexp(x,phase) \
-    do{ \
-        (x)->r = MINI_KISS_FFT_COS(phase);\
-        (x)->i = MINI_KISS_FFT_SIN(phase);\
-    }while(0)
+#define S_MUL(a, b) ((a)*(b))
+#define C_MUL(m, a, b) \
+        do { (m).r = (a).r*(b).r - (a).i*(b).i; \
+             (m).i = (a).r*(b).i + (a).i*(b).r; } while (0)
+#define C_FIXDIV(c, div)   /* NOOP */
+#define C_MULBYSCALAR( c, s ) \
+        do { (c).r *= (s); \
+             (c).i *= (s); } while (0)
+
+
+#define CHECK_OVERFLOW_OP(a, op, b) /* noop */
+
+#define  C_ADD( res, a, b) \
+        do { \
+            CHECK_OVERFLOW_OP((a).r, +, (b).r) \
+            CHECK_OVERFLOW_OP((a).i, +, (b).i) \
+            (res).r = (a).r + (b).r;  (res).i = (a).i + (b).i; \
+        } while (0)
+#define  C_SUB( res, a, b) \
+        do { \
+            CHECK_OVERFLOW_OP((a).r, -, (b).r) \
+            CHECK_OVERFLOW_OP((a).i, -, (b).i) \
+            (res).r = (a).r - (b).r;  (res).i = (a).i - (b).i; \
+        } while (0)
+#define C_ADDTO( res, a) \
+        do { \
+            CHECK_OVERFLOW_OP((res).r, +, (a).r) \
+            CHECK_OVERFLOW_OP((res).i, +, (a).i) \
+            (res).r += (a).r;  (res).i += (a).i; \
+        } while (0)
+
+#define C_SUBFROM( res, a) \
+        do { \
+            CHECK_OVERFLOW_OP((res).r, -, (a).r) \
+            CHECK_OVERFLOW_OP((res).i, -, (a).i) \
+            (res).r -= (a).r;  (res).i -= (a).i; \
+        } while (0)
+
+
+#define MINI_KISS_FFT_COS(phase) (mini_kiss_fft_scalar) cos(phase)
+#define MINI_KISS_FFT_SIN(phase) (mini_kiss_fft_scalar) sin(phase)
+#define MINI_HALF_OF(x) ((x)*((mini_kiss_fft_scalar).5))
+
+#define  mini_kf_cexp(x, phase) \
+        do { \
+            (x)->r = MINI_KISS_FFT_COS(phase); \
+            (x)->i = MINI_KISS_FFT_SIN(phase); \
+        } while (0)
 
 
 
 
 static void kf_bfly2(
-        mini_kiss_fft_cpx * Fout,
-        const size_t fstride,
-        const mini_kiss_fft_cfg st,
-        int m
-        )
-{
+    mini_kiss_fft_cpx * Fout,
+    const size_t fstride,
+    const mini_kiss_fft_cfg st,
+    int m)      {
     mini_kiss_fft_cpx * Fout2;
     mini_kiss_fft_cpx * tw1 = st->twiddles;
     mini_kiss_fft_cpx t;
     Fout2 = Fout + m;
-    do{
-        C_FIXDIV(*Fout,2); C_FIXDIV(*Fout2,2);
+    do {
+        C_FIXDIV(*Fout, 2); C_FIXDIV(*Fout2, 2);
 
-        C_MUL (t,  *Fout2 , *tw1);
+        C_MUL (t,  *Fout2, *tw1);
         tw1 += fstride;
-        C_SUB( *Fout2 ,  *Fout , t );
-        C_ADDTO( *Fout ,  t );
+        C_SUB( *Fout2,  *Fout, t );
+        C_ADDTO( *Fout,  t );
         ++Fout2;
         ++Fout;
-    }while (--m);
+    } while (--m);
 }
 
 static void kf_bfly4(
-        mini_kiss_fft_cpx * Fout,
-        const size_t fstride,
-        const mini_kiss_fft_cfg st,
-        const size_t m
-        )
-{
-    mini_kiss_fft_cpx *tw1,*tw2,*tw3;
+    mini_kiss_fft_cpx * Fout,
+    const size_t fstride,
+    const mini_kiss_fft_cfg st,
+    const size_t m)               {
+    mini_kiss_fft_cpx *tw1, *tw2, *tw3;
     mini_kiss_fft_cpx scratch[6];
-    size_t k=m;
-    const size_t m2=2*m;
-    const size_t m3=3*m;
+    size_t k = m;
+    const size_t m2 = 2*m;
+    const size_t m3 = 3*m;
 
 
     tw3 = tw2 = tw1 = st->twiddles;
 
     do {
-        C_FIXDIV(*Fout,4); C_FIXDIV(Fout[m],4); C_FIXDIV(Fout[m2],4); C_FIXDIV(Fout[m3],4);
+        C_FIXDIV(*Fout, 4); C_FIXDIV(Fout[m], 4); C_FIXDIV(Fout[m2], 4); C_FIXDIV(Fout[m3], 4);
 
-        C_MUL(scratch[0],Fout[m] , *tw1 );
-        C_MUL(scratch[1],Fout[m2] , *tw2 );
-        C_MUL(scratch[2],Fout[m3] , *tw3 );
+        C_MUL(scratch[0], Fout[m], *tw1 );
+        C_MUL(scratch[1], Fout[m2], *tw2 );
+        C_MUL(scratch[2], Fout[m3], *tw3 );
 
-        C_SUB( scratch[5] , *Fout, scratch[1] );
+        C_SUB( scratch[5], *Fout, scratch[1] );
         C_ADDTO(*Fout, scratch[1]);
-        C_ADD( scratch[3] , scratch[0] , scratch[2] );
-        C_SUB( scratch[4] , scratch[0] , scratch[2] );
+        C_ADD( scratch[3], scratch[0], scratch[2] );
+        C_SUB( scratch[4], scratch[0], scratch[2] );
         C_SUB( Fout[m2], *Fout, scratch[3] );
         tw1 += fstride;
         tw2 += fstride*2;
         tw3 += fstride*3;
-        C_ADDTO( *Fout , scratch[3] );
+        C_ADDTO( *Fout, scratch[3] );
 
-        if(st->inverse) {
+        if (st->inverse) {
             Fout[m].r = scratch[5].r - scratch[4].i;
             Fout[m].i = scratch[5].i + scratch[4].r;
             Fout[m3].r = scratch[5].r + scratch[4].i;
             Fout[m3].i = scratch[5].i - scratch[4].r;
-        }else{
+        } else  {
             Fout[m].r = scratch[5].r + scratch[4].i;
             Fout[m].i = scratch[5].i - scratch[4].r;
             Fout[m3].r = scratch[5].r - scratch[4].i;
             Fout[m3].i = scratch[5].i + scratch[4].r;
         }
         ++Fout;
-    }while(--k);
+    } while (--k);
 }
 
 static void kf_bfly3(
-         mini_kiss_fft_cpx * Fout,
-         const size_t fstride,
-         const mini_kiss_fft_cfg st,
-         size_t m
-         )
-{
-     size_t k=m;
-     const size_t m2 = 2*m;
-     mini_kiss_fft_cpx *tw1,*tw2;
-     mini_kiss_fft_cpx scratch[5];
-     mini_kiss_fft_cpx epi3;
-     epi3 = st->twiddles[fstride*m];
-
-     tw1=tw2=st->twiddles;
+    mini_kiss_fft_cpx * Fout,
+    const size_t fstride,
+    const mini_kiss_fft_cfg st,
+    size_t m)         {
+    size_t k = m;
+    const size_t m2 = 2*m;
+    mini_kiss_fft_cpx *tw1, *tw2;
+    mini_kiss_fft_cpx scratch[5];
+    mini_kiss_fft_cpx epi3;
+    epi3 = st->twiddles[fstride*m];
+
+    tw1 = tw2 = st->twiddles;
 
-     do{
-         C_FIXDIV(*Fout,3); C_FIXDIV(Fout[m],3); C_FIXDIV(Fout[m2],3);
+    do {
+        C_FIXDIV(*Fout, 3); C_FIXDIV(Fout[m], 3); C_FIXDIV(Fout[m2], 3);
 
-         C_MUL(scratch[1],Fout[m] , *tw1);
-         C_MUL(scratch[2],Fout[m2] , *tw2);
+        C_MUL(scratch[1], Fout[m], *tw1);
+        C_MUL(scratch[2], Fout[m2], *tw2);
 
-         C_ADD(scratch[3],scratch[1],scratch[2]);
-         C_SUB(scratch[0],scratch[1],scratch[2]);
-         tw1 += fstride;
-         tw2 += fstride*2;
+        C_ADD(scratch[3], scratch[1], scratch[2]);
+        C_SUB(scratch[0], scratch[1], scratch[2]);
+        tw1 += fstride;
+        tw2 += fstride*2;
 
-         Fout[m].r = Fout->r - MINI_HALF_OF(scratch[3].r);
-         Fout[m].i = Fout->i - MINI_HALF_OF(scratch[3].i);
+        Fout[m].r = Fout->r - MINI_HALF_OF(scratch[3].r);
+        Fout[m].i = Fout->i - MINI_HALF_OF(scratch[3].i);
 
-         C_MULBYSCALAR( scratch[0] , epi3.i );
+        C_MULBYSCALAR( scratch[0], epi3.i );
 
-         C_ADDTO(*Fout,scratch[3]);
+        C_ADDTO(*Fout, scratch[3]);
 
-         Fout[m2].r = Fout[m].r + scratch[0].i;
-         Fout[m2].i = Fout[m].i - scratch[0].r;
+        Fout[m2].r = Fout[m].r + scratch[0].i;
+        Fout[m2].i = Fout[m].i - scratch[0].r;
 
-         Fout[m].r -= scratch[0].i;
-         Fout[m].i += scratch[0].r;
+        Fout[m].r -= scratch[0].i;
+        Fout[m].i += scratch[0].r;
 
-         ++Fout;
-     }while(--k);
+        ++Fout;
+    } while (--k);
 }
 
 static void kf_bfly5(
-        mini_kiss_fft_cpx * Fout,
-        const size_t fstride,
-        const mini_kiss_fft_cfg st,
-        int m
-        )
-{
-    mini_kiss_fft_cpx *Fout0,*Fout1,*Fout2,*Fout3,*Fout4;
+    mini_kiss_fft_cpx * Fout,
+    const size_t fstride,
+    const mini_kiss_fft_cfg st,
+    int m)      {
+    mini_kiss_fft_cpx *Fout0, *Fout1, *Fout2, *Fout3, *Fout4;
     int u;
     mini_kiss_fft_cpx scratch[13];
     mini_kiss_fft_cpx * twiddles = st->twiddles;
     mini_kiss_fft_cpx *tw;
-    mini_kiss_fft_cpx ya,yb;
+    mini_kiss_fft_cpx ya, yb;
     ya = twiddles[fstride*m];
     yb = twiddles[fstride*2*m];
 
-    Fout0=Fout;
-    Fout1=Fout0+m;
-    Fout2=Fout0+2*m;
-    Fout3=Fout0+3*m;
-    Fout4=Fout0+4*m;
+    Fout0 = Fout;
+    Fout1 = Fout0 + m;
+    Fout2 = Fout0 + 2*m;
+    Fout3 = Fout0 + 3*m;
+    Fout4 = Fout0 + 4*m;
 
-    tw=st->twiddles;
-    for ( u=0; u<m; ++u ) {
-        C_FIXDIV( *Fout0,5); C_FIXDIV( *Fout1,5); C_FIXDIV( *Fout2,5); C_FIXDIV( *Fout3,5); C_FIXDIV( *Fout4,5);
+    tw = st->twiddles;
+    for (u = 0; u < m; ++u) {
+        C_FIXDIV( *Fout0, 5); C_FIXDIV( *Fout1, 5); C_FIXDIV( *Fout2, 5); C_FIXDIV( *Fout3, 5); C_FIXDIV( *Fout4, 5);
         scratch[0] = *Fout0;
 
-        C_MUL(scratch[1] ,*Fout1, tw[u*fstride]);
-        C_MUL(scratch[2] ,*Fout2, tw[2*u*fstride]);
-        C_MUL(scratch[3] ,*Fout3, tw[3*u*fstride]);
-        C_MUL(scratch[4] ,*Fout4, tw[4*u*fstride]);
+        C_MUL(scratch[1], *Fout1, tw[u*fstride]);
+        C_MUL(scratch[2], *Fout2, tw[2*u*fstride]);
+        C_MUL(scratch[3], *Fout3, tw[3*u*fstride]);
+        C_MUL(scratch[4], *Fout4, tw[4*u*fstride]);
 
-        C_ADD( scratch[7],scratch[1],scratch[4]);
-        C_SUB( scratch[10],scratch[1],scratch[4]);
-        C_ADD( scratch[8],scratch[2],scratch[3]);
-        C_SUB( scratch[9],scratch[2],scratch[3]);
+        C_ADD( scratch[7], scratch[1], scratch[4]);
+        C_SUB( scratch[10], scratch[1], scratch[4]);
+        C_ADD( scratch[8], scratch[2], scratch[3]);
+        C_SUB( scratch[9], scratch[2], scratch[3]);
 
         Fout0->r += scratch[7].r + scratch[8].r;
         Fout0->i += scratch[7].i + scratch[8].i;
 
-        scratch[5].r = scratch[0].r + S_MUL(scratch[7].r,ya.r) + S_MUL(scratch[8].r,yb.r);
-        scratch[5].i = scratch[0].i + S_MUL(scratch[7].i,ya.r) + S_MUL(scratch[8].i,yb.r);
+        scratch[5].r = scratch[0].r + S_MUL(scratch[7].r, ya.r) + S_MUL(scratch[8].r, yb.r);
+        scratch[5].i = scratch[0].i + S_MUL(scratch[7].i, ya.r) + S_MUL(scratch[8].i, yb.r);
 
-        scratch[6].r =  S_MUL(scratch[10].i,ya.i) + S_MUL(scratch[9].i,yb.i);
-        scratch[6].i = -S_MUL(scratch[10].r,ya.i) - S_MUL(scratch[9].r,yb.i);
+        scratch[6].r =  S_MUL(scratch[10].i, ya.i) + S_MUL(scratch[9].i, yb.i);
+        scratch[6].i = -S_MUL(scratch[10].r, ya.i) - S_MUL(scratch[9].r, yb.i);
 
-        C_SUB(*Fout1,scratch[5],scratch[6]);
-        C_ADD(*Fout4,scratch[5],scratch[6]);
+        C_SUB(*Fout1, scratch[5], scratch[6]);
+        C_ADD(*Fout4, scratch[5], scratch[6]);
 
-        scratch[11].r = scratch[0].r + S_MUL(scratch[7].r,yb.r) + S_MUL(scratch[8].r,ya.r);
-        scratch[11].i = scratch[0].i + S_MUL(scratch[7].i,yb.r) + S_MUL(scratch[8].i,ya.r);
-        scratch[12].r = - S_MUL(scratch[10].i,yb.i) + S_MUL(scratch[9].i,ya.i);
-        scratch[12].i = S_MUL(scratch[10].r,yb.i) - S_MUL(scratch[9].r,ya.i);
+        scratch[11].r = scratch[0].r + S_MUL(scratch[7].r, yb.r) + S_MUL(scratch[8].r, ya.r);
+        scratch[11].i = scratch[0].i + S_MUL(scratch[7].i, yb.r) + S_MUL(scratch[8].i, ya.r);
+        scratch[12].r = -S_MUL(scratch[10].i, yb.i) + S_MUL(scratch[9].i, ya.i);
+        scratch[12].i = S_MUL(scratch[10].r, yb.i) - S_MUL(scratch[9].r, ya.i);
 
-        C_ADD(*Fout2,scratch[11],scratch[12]);
-        C_SUB(*Fout3,scratch[11],scratch[12]);
+        C_ADD(*Fout2, scratch[11], scratch[12]);
+        C_SUB(*Fout3, scratch[11], scratch[12]);
 
-        ++Fout0;++Fout1;++Fout2;++Fout3;++Fout4;
+        ++Fout0; ++Fout1; ++Fout2; ++Fout3; ++Fout4;
     }
 }
 
 
 static
 void kf_work(
-        mini_kiss_fft_cpx * Fout,
-        const mini_kiss_fft_cpx * f,
-        const size_t fstride,
-        int in_stride,
-        int * factors,
-        const mini_kiss_fft_cfg st
-        )
-{
-    mini_kiss_fft_cpx * Fout_beg=Fout;
-    const int p=*factors++; /* the radix  */
-    const int m=*factors++; /* stage's fft length/p */
+    mini_kiss_fft_cpx * Fout,
+    const mini_kiss_fft_cpx * f,
+    const size_t fstride,
+    int in_stride,
+    int * factors,
+    const mini_kiss_fft_cfg st)                           {
+    mini_kiss_fft_cpx * Fout_beg = Fout;
+    const int p = *factors++; /* the radix  */
+    const int m = *factors++; /* stage's fft length/p */
     const mini_kiss_fft_cpx * Fout_end = Fout + p*m;
 
-    if (m==1) {
-        do{
+    if (m == 1) {
+        do {
             *Fout = *f;
             f += fstride*in_stride;
-        }while(++Fout != Fout_end );
-    }else{
-        do{
+        } while (++Fout != Fout_end);
+    } else  {
+        do {
             /* recursive call:
                DFT of size m*p performed by doing
                p instances of smaller DFTs of size m,
                each one takes a decimated version of the input */
-            kf_work( Fout , f, fstride*p, in_stride, factors,st);
+            kf_work( Fout, f, fstride*p, in_stride, factors, st);
             f += fstride*in_stride;
-        }while( (Fout += m) != Fout_end );
+        } while ((Fout += m) != Fout_end);
     }
 
-    Fout=Fout_beg;
+    Fout = Fout_beg;
 
     /* recombine the p smaller DFTs*/
     switch (p) {
-        case 2: kf_bfly2(Fout,fstride,st,m); break;
-        case 3: kf_bfly3(Fout,fstride,st,m); break;
-        case 4: kf_bfly4(Fout,fstride,st,m); break;
-        case 5: kf_bfly5(Fout,fstride,st,m); break;
+        case 2: kf_bfly2(Fout, fstride, st, m); break;
+        case 3: kf_bfly3(Fout, fstride, st, m); break;
+        case 4: kf_bfly4(Fout, fstride, st, m); break;
+        case 5: kf_bfly5(Fout, fstride, st, m); break;
         default: assert(0);
     }
 }
@@ -323,15 +313,14 @@ void kf_work(
     p[i] * m[i] = m[i-1]
     m0 = n                  */
 static
-void kf_factor(int n,int * facbuf)
-{
-    int p=4;
+void kf_factor(int n, int * facbuf) {
+    int p = 4;
     double floor_sqrt;
-    floor_sqrt = floor( sqrt((double)n) );
+    floor_sqrt = floor( sqrt((double)n));
 
     /*factor out powers of 4, powers of 2, then any remaining primes */
     do {
-        while (n % p) {
+        while (n%p) {
             switch (p) {
                 case 4: p = 2; break;
                 case 2: p = 3; break;
@@ -353,71 +342,67 @@ void kf_factor(int n,int * facbuf)
  * The return value is a contiguous block of memory, allocated with malloc.  As such,
  * It can be freed with free(), rather than a kiss_fft-specific function.
  * */
-mini_kiss_fft_cfg mini_kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem )
-{
+mini_kiss_fft_cfg mini_kiss_fft_alloc(int nfft, int inverse_fft, void * mem, size_t * lenmem ) {
 
-    mini_kiss_fft_cfg st=NULL;
+    mini_kiss_fft_cfg st = NULL;
     size_t memneeded = (sizeof(struct mini_kiss_fft_state)
-        + sizeof(mini_kiss_fft_cpx)*(nfft-1)); /* twiddle factors*/
+                        + sizeof(mini_kiss_fft_cpx)*(nfft - 1)); /* twiddle factors*/
 
-    if ( lenmem==NULL ) {
+    if (lenmem == NULL) {
         st = ( mini_kiss_fft_cfg)malloc( memneeded );
-    }else{
+    } else  {
         if (mem != NULL && *lenmem >= memneeded)
             st = (mini_kiss_fft_cfg)mem;
         *lenmem = memneeded;
     }
     if (st) {
         int i;
-        st->nfft=nfft;
+        st->nfft = nfft;
         st->inverse = inverse_fft;
 
-        for (i=0;i<nfft;++i) {
-            const double pi=3.141592653589793238462643383279502884197169399375105820974944;
-            double phase = -2*pi*i / nfft;
+        for (i = 0; i < nfft; ++i) {
+            const double pi = 3.141592653589793238462643383279502884197169399375105820974944;
+            double phase = -2*pi*i/nfft;
             if (st->inverse)
                 phase *= -1;
-            mini_kf_cexp(st->twiddles+i, phase );
+            mini_kf_cexp(st->twiddles + i, phase );
         }
 
-        kf_factor(nfft,st->factors);
+        kf_factor(nfft, st->factors);
     }
     return st;
 }
 
 
-void mini_kiss_fft_stride(mini_kiss_fft_cfg st,const mini_kiss_fft_cpx *fin,mini_kiss_fft_cpx *fout,int in_stride)
-{
+void mini_kiss_fft_stride(mini_kiss_fft_cfg st, const mini_kiss_fft_cpx *fin, mini_kiss_fft_cpx *fout, int in_stride) {
     assert(fin != fout);
-    kf_work( fout, fin, 1,in_stride, st->factors,st );
+    kf_work( fout, fin, 1, in_stride, st->factors, st );
 }
 
-void mini_kiss_fft(mini_kiss_fft_cfg cfg,const mini_kiss_fft_cpx *fin,mini_kiss_fft_cpx *fout)
-{
-    mini_kiss_fft_stride(cfg,fin,fout,1);
+void mini_kiss_fft(mini_kiss_fft_cfg cfg, const mini_kiss_fft_cpx *fin, mini_kiss_fft_cpx *fout) {
+    mini_kiss_fft_stride(cfg, fin, fout, 1);
 }
 
 
 typedef struct mini_kiss_fftr_state *mini_kiss_fftr_cfg;
 
-typedef struct mini_kiss_fftr_state{
+typedef struct mini_kiss_fftr_state {
     mini_kiss_fft_cfg substate;
     mini_kiss_fft_cpx * tmpbuf;
     mini_kiss_fft_cpx * super_twiddles;
 } mini_kiss_fftr_state;
 
-mini_kiss_fftr_cfg mini_kiss_fftr_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem)
-{
+mini_kiss_fftr_cfg mini_kiss_fftr_alloc(int nfft, int inverse_fft, void * mem, size_t * lenmem) {
 
     int i;
     mini_kiss_fftr_cfg st = NULL;
     size_t subsize = 0, memneeded;
 
-    assert ((nfft & 1) == 0);
+    assert ((nfft&1) == 0);
     nfft >>= 1;
 
     mini_kiss_fft_alloc (nfft, inverse_fft, NULL, &subsize);
-    memneeded = sizeof(struct mini_kiss_fftr_state) + subsize + sizeof(mini_kiss_fft_cpx) * ( nfft * 3 / 2);
+    memneeded = sizeof(struct mini_kiss_fftr_state) + subsize + sizeof(mini_kiss_fft_cpx)*(nfft*3/2);
 
     if (lenmem == NULL) {
         st = (mini_kiss_fftr_cfg) malloc(memneeded);
@@ -436,26 +421,25 @@ mini_kiss_fftr_cfg mini_kiss_fftr_alloc(int nfft,int inverse_fft,void * mem,size
 
     for (i = 0; i < nfft/2; ++i) {
         double phase =
-            -3.14159265358979323846264338327 * ((double) (i+1) / nfft + .5);
+            -3.14159265358979323846264338327*((double) (i + 1)/nfft + .5);
         if (inverse_fft)
             phase *= -1;
-        mini_kf_cexp (st->super_twiddles+i,phase);
+        mini_kf_cexp (st->super_twiddles + i, phase);
     }
     return st;
 }
 
-void mini_kiss_fftr(mini_kiss_fftr_cfg st,const mini_kiss_fft_scalar *timedata,mini_kiss_fft_cpx *freqdata)
-{
+void mini_kiss_fftr(mini_kiss_fftr_cfg st, const mini_kiss_fft_scalar *timedata, mini_kiss_fft_cpx *freqdata) {
     /* input buffer timedata is stored row-wise */
-    int k,ncfft;
-    mini_kiss_fft_cpx fpnk,fpk,f1k,f2k,tw,tdc;
+    int k, ncfft;
+    mini_kiss_fft_cpx fpnk, fpk, f1k, f2k, tw, tdc;
 
     assert ( !st->substate->inverse);
 
     ncfft = st->substate->nfft;
 
     /*perform the parallel fft of two real signals packed in real,imag*/
-    mini_kiss_fft( st->substate , (const mini_kiss_fft_cpx*)timedata, st->tmpbuf );
+    mini_kiss_fft( st->substate, (const mini_kiss_fft_cpx*)timedata, st->tmpbuf );
     /* The real part of the DC element of the frequency spectrum in st->tmpbuf
      * contains the sum of the even-numbered elements of the input time sequence
      * The imag part is the sum of the odd-numbered elements
@@ -468,27 +452,27 @@ void mini_kiss_fftr(mini_kiss_fftr_cfg st,const mini_kiss_fft_scalar *timedata,m
 
     tdc.r = st->tmpbuf[0].r;
     tdc.i = st->tmpbuf[0].i;
-    C_FIXDIV(tdc,2);
-    CHECK_OVERFLOW_OP(tdc.r ,+, tdc.i);
-    CHECK_OVERFLOW_OP(tdc.r ,-, tdc.i);
+    C_FIXDIV(tdc, 2);
+    CHECK_OVERFLOW_OP(tdc.r, +, tdc.i);
+    CHECK_OVERFLOW_OP(tdc.r, -, tdc.i);
     freqdata[0].r = tdc.r + tdc.i;
     freqdata[ncfft].r = tdc.r - tdc.i;
     freqdata[ncfft].i = freqdata[0].i = 0;
 
-    for ( k=1;k <= ncfft/2 ; ++k ) {
+    for (k = 1; k <= ncfft/2 ; ++k) {
         fpk    = st->tmpbuf[k];
-        fpnk.r =   st->tmpbuf[ncfft-k].r;
-        fpnk.i = - st->tmpbuf[ncfft-k].i;
-        C_FIXDIV(fpk,2);
-        C_FIXDIV(fpnk,2);
+        fpnk.r =   st->tmpbuf[ncfft - k].r;
+        fpnk.i = -st->tmpbuf[ncfft - k].i;
+        C_FIXDIV(fpk, 2);
+        C_FIXDIV(fpnk, 2);
 
-        C_ADD( f1k, fpk , fpnk );
-        C_SUB( f2k, fpk , fpnk );
-        C_MUL( tw , f2k , st->super_twiddles[k-1]);
+        C_ADD( f1k, fpk, fpnk );
+        C_SUB( f2k, fpk, fpnk );
+        C_MUL( tw, f2k, st->super_twiddles[k - 1]);
 
         freqdata[k].r = MINI_HALF_OF(f1k.r + tw.r);
         freqdata[k].i = MINI_HALF_OF(f1k.i + tw.i);
-        freqdata[ncfft-k].r = MINI_HALF_OF(f1k.r - tw.r);
-        freqdata[ncfft-k].i = MINI_HALF_OF(tw.i - f1k.i);
+        freqdata[ncfft - k].r = MINI_HALF_OF(f1k.r - tw.r);
+        freqdata[ncfft - k].i = MINI_HALF_OF(tw.i - f1k.i);
     }
 }
diff --git a/celt/mips/celt_mipsr1.h b/celt/mips/celt_mipsr1.h
index 01635544a..608b6d75a 100644
--- a/celt/mips/celt_mipsr1.h
+++ b/celt/mips/celt_mipsr1.h
@@ -25,25 +25,25 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef CELT_MIPSR1_H__
 #define CELT_MIPSR1_H__
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #define CELT_C
 
 #if defined (__mips_dsp) && __mips == 32
 
-#define OVERRIDE_COMB_FILTER_CONST
-#define OVERRIDE_comb_filter
+# define OVERRIDE_COMB_FILTER_CONST
+# define OVERRIDE_comb_filter
 #elif defined(__mips_isa_rev) && __mips_isa_rev < 6
 
-#define OVERRIDE_COMB_FILTER_CONST
-#define OVERRIDE_comb_filter
+# define OVERRIDE_COMB_FILTER_CONST
+# define OVERRIDE_comb_filter
 #endif
 
 #include "os_support.h"
@@ -65,9 +65,9 @@
 
 #if defined (__mips_dsp) && __mips == 32
 
-#define MIPS_MULT __builtin_mips_mult
-#define MIPS_MADD __builtin_mips_madd
-#define MIPS_EXTR __builtin_mips_extr_w
+# define MIPS_MULT __builtin_mips_mult
+# define MIPS_MADD __builtin_mips_madd
+# define MIPS_EXTR __builtin_mips_extr_w
 
 #elif defined(__mips_isa_rev) && __mips_isa_rev < 6
 
@@ -75,123 +75,118 @@ static inline long long MIPS_MULT(int a, int b) {
     long long acc;
 
     asm volatile (
-            "mult %[a], %[b]  \n"
-        : [acc] "=x"(acc)
-        : [a] "r"(a), [b] "r"(b)
+        "mult %[a], %[b]  \n"
+        : [acc] "=x" (acc)
+        : [a] "r" (a), [b] "r" (b)
         :
-    );
+        );
     return acc;
 }
 
 static inline long long MIPS_MADD(long long acc, int a, int b) {
     asm volatile (
-            "madd %[a], %[b]  \n"
-        : [acc] "+x"(acc)
-        : [a] "r"(a), [b] "r"(b)
+        "madd %[a], %[b]  \n"
+        : [acc] "+x" (acc)
+        : [a] "r" (a), [b] "r" (b)
         :
-    );
+        );
     return acc;
 }
 
 static inline oac_val32 MIPS_EXTR(long long acc, int shift) {
-    return (oac_val32)(acc >> shift);
+    return (oac_val32)(acc>>shift);
 }
 
 #endif
 
 #if defined (OVERRIDE_comb_filter)
 void comb_filter(oac_val32 *y, oac_val32 *x, int T0, int T1, int N,
-      oac_val16 g0, oac_val16 g1, int tapset0, int tapset1,
-      const oac_val16 *window, int overlap, int arch)
-{
-   int i;
-   oac_val32 x0, x1, x2, x3, x4;
-
-   (void)arch;
-
-   /* printf ("%d %d %f %f\n", T0, T1, g0, g1); */
-   oac_val16 g00, g01, g02, g10, g11, g12;
-   static const oac_val16 gains[3][3] = {
-         {QCONST16(0.3066406250f, 15), QCONST16(0.2170410156f, 15), QCONST16(0.1296386719f, 15)},
-         {QCONST16(0.4638671875f, 15), QCONST16(0.2680664062f, 15), QCONST16(0.f, 15)},
-         {QCONST16(0.7998046875f, 15), QCONST16(0.1000976562f, 15), QCONST16(0.f, 15)}};
-
-   if (g0==0 && g1==0)
-   {
-      /* OPT: Happens to work without the OAC_MOVE(), but only because the current encoder already copies x to y */
-      if (x!=y)
-         OAC_MOVE(y, x, N);
-      return;
-   }
-
-   g00 = MULT16_16_P15(g0, gains[tapset0][0]);
-   g01 = MULT16_16_P15(g0, gains[tapset0][1]);
-   g02 = MULT16_16_P15(g0, gains[tapset0][2]);
-   g10 = MULT16_16_P15(g1, gains[tapset1][0]);
-   g11 = MULT16_16_P15(g1, gains[tapset1][1]);
-   g12 = MULT16_16_P15(g1, gains[tapset1][2]);
-   x1 = x[-T1+1];
-   x2 = x[-T1  ];
-   x3 = x[-T1-1];
-   x4 = x[-T1-2];
-   /* If the filter didn't change, we don't need the overlap */
-   if (g0==g1 && T0==T1 && tapset0==tapset1)
-      overlap=0;
-
-   for (i=0;i<overlap;i++)
-   {
-      oac_val16 f;
-      oac_val32 res;
-      long long acc;
-      f = MULT16_16_Q15(window[i],window[i]);
-      x0= x[i-T1+2];
-
-      acc = MIPS_MULT((int)MULT16_16_Q15((Q15ONE-f),g00), (int)x[i-T0]);
-      acc = MIPS_MADD(acc, (int)MULT16_16_Q15((Q15ONE-f),g01), (int)ADD32(x[i-T0-1],x[i-T0+1]));
-      acc = MIPS_MADD(acc, (int)MULT16_16_Q15((Q15ONE-f),g02), (int)ADD32(x[i-T0-2],x[i-T0+2]));
-      acc = MIPS_MADD(acc, (int)MULT16_16_Q15(f,g10), (int)x2);
-      acc = MIPS_MADD(acc, (int)MULT16_16_Q15(f,g11), (int)ADD32(x3,x1));
-      acc = MIPS_MADD(acc, (int)MULT16_16_Q15(f,g12), (int)ADD32(x4,x0));
-      res = MIPS_EXTR(acc, 15);
-
-      y[i] = x[i] + res;
-
-      x4=x3;
-      x3=x2;
-      x2=x1;
-      x1=x0;
-   }
-
-   x4 = x[i-T1-2];
-   x3 = x[i-T1-1];
-   x2 = x[i-T1];
-   x1 = x[i-T1+1];
-
-   if (g1==0)
-   {
-      /* OPT: Happens to work without the OAC_MOVE(), but only because the current encoder already copies x to y */
-      if (x!=y)
-         OAC_MOVE(y+overlap, x+overlap, N-overlap);
-      return;
-   }
-
-   for (i=overlap;i<N;i++)
-   {
-      oac_val32 res;
-      long long acc;
-      x0=x[i-T1+2];
-
-      acc = MIPS_MULT((int)g10, (int)x2);
-      acc = MIPS_MADD(acc, (int)g11, (int)ADD32(x3,x1));
-      acc = MIPS_MADD(acc, (int)g12, (int)ADD32(x4,x0));
-      res = MIPS_EXTR(acc, 15);
-
-      y[i] = x[i] + res;
-      x4=x3;
-      x3=x2;
-      x2=x1;
-      x1=x0;
-   }
+                 oac_val16 g0, oac_val16 g1, int tapset0, int tapset1,
+                 const oac_val16 *window, int overlap, int arch) {
+    int i;
+    oac_val32 x0, x1, x2, x3, x4;
+
+    (void)arch;
+
+    /* printf ("%d %d %f %f\n", T0, T1, g0, g1); */
+    oac_val16 g00, g01, g02, g10, g11, g12;
+    static const oac_val16 gains[3][3] = {
+        {QCONST16(0.3066406250f, 15), QCONST16(0.2170410156f, 15), QCONST16(0.1296386719f, 15)},
+        {QCONST16(0.4638671875f, 15), QCONST16(0.2680664062f, 15), QCONST16(0.f, 15)},
+        {QCONST16(0.7998046875f, 15), QCONST16(0.1000976562f, 15), QCONST16(0.f, 15)}};
+
+    if (g0 == 0 && g1 == 0) {
+        /* OPT: Happens to work without the OAC_MOVE(), but only because the current encoder already copies x to y */
+        if (x != y)
+            OAC_MOVE(y, x, N);
+        return;
+    }
+
+    g00 = MULT16_16_P15(g0, gains[tapset0][0]);
+    g01 = MULT16_16_P15(g0, gains[tapset0][1]);
+    g02 = MULT16_16_P15(g0, gains[tapset0][2]);
+    g10 = MULT16_16_P15(g1, gains[tapset1][0]);
+    g11 = MULT16_16_P15(g1, gains[tapset1][1]);
+    g12 = MULT16_16_P15(g1, gains[tapset1][2]);
+    x1 = x[-T1 + 1];
+    x2 = x[-T1  ];
+    x3 = x[-T1 - 1];
+    x4 = x[-T1 - 2];
+    /* If the filter didn't change, we don't need the overlap */
+    if (g0 == g1 && T0 == T1 && tapset0 == tapset1)
+        overlap = 0;
+
+    for (i = 0; i < overlap; i++) {
+        oac_val16 f;
+        oac_val32 res;
+        long long acc;
+        f = MULT16_16_Q15(window[i], window[i]);
+        x0 = x[i - T1 + 2];
+
+        acc = MIPS_MULT((int)MULT16_16_Q15((Q15ONE - f), g00), (int)x[i - T0]);
+        acc = MIPS_MADD(acc, (int)MULT16_16_Q15((Q15ONE - f), g01), (int)ADD32(x[i - T0 - 1], x[i - T0 + 1]));
+        acc = MIPS_MADD(acc, (int)MULT16_16_Q15((Q15ONE - f), g02), (int)ADD32(x[i - T0 - 2], x[i - T0 + 2]));
+        acc = MIPS_MADD(acc, (int)MULT16_16_Q15(f, g10), (int)x2);
+        acc = MIPS_MADD(acc, (int)MULT16_16_Q15(f, g11), (int)ADD32(x3, x1));
+        acc = MIPS_MADD(acc, (int)MULT16_16_Q15(f, g12), (int)ADD32(x4, x0));
+        res = MIPS_EXTR(acc, 15);
+
+        y[i] = x[i] + res;
+
+        x4 = x3;
+        x3 = x2;
+        x2 = x1;
+        x1 = x0;
+    }
+
+    x4 = x[i - T1 - 2];
+    x3 = x[i - T1 - 1];
+    x2 = x[i - T1];
+    x1 = x[i - T1 + 1];
+
+    if (g1 == 0) {
+        /* OPT: Happens to work without the OAC_MOVE(), but only because the current encoder already copies x to y */
+        if (x != y)
+            OAC_MOVE(y + overlap, x + overlap, N - overlap);
+        return;
+    }
+
+    for (i = overlap; i < N; i++) {
+        oac_val32 res;
+        long long acc;
+        x0 = x[i - T1 + 2];
+
+        acc = MIPS_MULT((int)g10, (int)x2);
+        acc = MIPS_MADD(acc, (int)g11, (int)ADD32(x3, x1));
+        acc = MIPS_MADD(acc, (int)g12, (int)ADD32(x4, x0));
+        res = MIPS_EXTR(acc, 15);
+
+        y[i] = x[i] + res;
+        x4 = x3;
+        x3 = x2;
+        x2 = x1;
+        x1 = x0;
+    }
 }
 #endif /* OVERRIDE_comb_filter */
 
diff --git a/celt/mips/fixed_generic_mipsr1.h b/celt/mips/fixed_generic_mipsr1.h
index 0f421a3c8..fac6f15ee 100644
--- a/celt/mips/fixed_generic_mipsr1.h
+++ b/celt/mips/fixed_generic_mipsr1.h
@@ -4,7 +4,7 @@
 /**
    @file fixed_generic.h
    @brief Generic fixed-point operations
-*/
+ */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
@@ -28,7 +28,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef CELT_FIXED_GENERIC_MIPSR1_H
 #define CELT_FIXED_GENERIC_MIPSR1_H
@@ -36,122 +36,114 @@
 #if defined (__mips_dsp) && __mips == 32
 
 typedef short v2i16 __attribute__((vector_size(4)));
-typedef char  v2i8  __attribute__((vector_size(4)));
+typedef char v2i8 __attribute__((vector_size(4)));
 
-#undef MULT16_32_Q16
-static inline int MULT16_32_Q16(int a, int b)
-{
+# undef MULT16_32_Q16
+static inline int MULT16_32_Q16(int a, int b) {
     long long acc = __builtin_mips_mult(a, b);
     return __builtin_mips_extr_w(acc, 16);
 }
 
-#undef MULT16_32_P16
-static inline int MULT16_32_P16(int a, int b)
-{
+# undef MULT16_32_P16
+static inline int MULT16_32_P16(int a, int b) {
     long long acc = __builtin_mips_mult(a, b);
     return __builtin_mips_extr_r_w(acc, 16);
 }
 
-#undef MULT16_32_Q15
-static inline int MULT16_32_Q15(int a, int b)
-{
+# undef MULT16_32_Q15
+static inline int MULT16_32_Q15(int a, int b) {
     long long acc = __builtin_mips_mult(a, b);
     return __builtin_mips_extr_w(acc, 15);
 }
 
-#undef MULT32_32_Q31
-static inline int MULT32_32_Q31(int a, int b)
-{
+# undef MULT32_32_Q31
+static inline int MULT32_32_Q31(int a, int b) {
     long long acc = __builtin_mips_mult(a, b);
     return __builtin_mips_extr_w(acc, 31);
 }
 
-#undef PSHR32
-static inline int PSHR32(int a, int shift)
-{
+# undef PSHR32
+static inline int PSHR32(int a, int shift) {
     return __builtin_mips_shra_r_w(a, shift);
 }
 
-#undef MULT16_16_P15
-static inline int MULT16_16_P15(int a, int b)
-{
-    int r = a * b;
+# undef MULT16_16_P15
+static inline int MULT16_16_P15(int a, int b) {
+    int r = a*b;
     return __builtin_mips_shra_r_w(r, 15);
 }
 
-#define OVERRIDE_CELT_MAXABS16
-static OAC_INLINE oac_val32 celt_maxabs16(const oac_val16 *x, int len)
-{
-   int i;
-   v2i16 v2max = (v2i16){ 0, 0 };
-   v2i16 x01, x23;
-   const v2i16 *x2;
-   oac_val16 maxlo, maxhi;
-   int loops;
-
-   if ((long)x & 2 && len > 0) {
-      v2max = (v2i16){ 0, ABS16(*x) };
-      x++;
-      len--;
-   }
-   x2 = __builtin_assume_aligned(x, 4);
-   loops = len / 4;
-
-   for (i = 0; i < loops; i++)
-   {
-       x01 = *x2++;
-       x23 = *x2++;
-       x01 = __builtin_mips_absq_s_ph(x01);
-       x23 = __builtin_mips_absq_s_ph(x23);
-       __builtin_mips_cmp_lt_ph(v2max, x01);
-       v2max = __builtin_mips_pick_ph(x01, v2max);
-       __builtin_mips_cmp_lt_ph(v2max, x23);
-       v2max = __builtin_mips_pick_ph(x23, v2max);
-   }
-
-   switch (len & 3) {
-   case 3:
-       x01 = __builtin_mips_absq_s_ph(*x2);
-       __builtin_mips_cmp_lt_ph(v2max, x01);
-       v2max = __builtin_mips_pick_ph(x01, v2max);
-       maxlo = EXTRACT16((oac_val32)v2max);
-       maxhi = EXTRACT16((oac_val32)v2max >> 16);
-       maxlo = MAX16(MAX16(maxlo, maxhi), ABS16(x[len - 1]));
-       break;
-   case 2:
-       x01 = __builtin_mips_absq_s_ph(*x2);
-       __builtin_mips_cmp_lt_ph(v2max, x01);
-       v2max = __builtin_mips_pick_ph(x01, v2max);
-       maxlo = EXTRACT16((oac_val32)v2max);
-       maxhi = EXTRACT16((oac_val32)v2max >> 16);
-       maxlo = MAX16(maxlo, maxhi);
-       break;
-   case 1:
-       maxlo = EXTRACT16((oac_val32)v2max);
-       maxhi = EXTRACT16((oac_val32)v2max >> 16);
-       return MAX16(MAX16(maxlo, maxhi), ABS16(x[len - 1]));
-       break;
-   case 0:
-       maxlo = EXTRACT16((oac_val32)v2max);
-       maxhi = EXTRACT16((oac_val32)v2max >> 16);
-       maxlo = MAX16(maxlo, maxhi);
-       break;
-   default:
-       __builtin_unreachable();
-   }
-   /* C version might return 0x8000, this one can't
-    * because abs is saturated here. Since result
-    * used only for determine dynamic range
-    * in ilog2-like context it's worth to add 1
-    * for proper magnitude whether saturated
-    */
-   return (oac_val32)maxlo + 1;
+# define OVERRIDE_CELT_MAXABS16
+static OAC_INLINE oac_val32 celt_maxabs16(const oac_val16 *x, int len) {
+    int i;
+    v2i16 v2max = (v2i16) { 0, 0 };
+    v2i16 x01, x23;
+    const v2i16 *x2;
+    oac_val16 maxlo, maxhi;
+    int loops;
+
+    if ((long)x&2 && len > 0) {
+        v2max = (v2i16) { 0, ABS16(*x) };
+        x++;
+        len--;
+    }
+    x2 = __builtin_assume_aligned(x, 4);
+    loops = len/4;
+
+    for (i = 0; i < loops; i++) {
+        x01 = *x2++;
+        x23 = *x2++;
+        x01 = __builtin_mips_absq_s_ph(x01);
+        x23 = __builtin_mips_absq_s_ph(x23);
+        __builtin_mips_cmp_lt_ph(v2max, x01);
+        v2max = __builtin_mips_pick_ph(x01, v2max);
+        __builtin_mips_cmp_lt_ph(v2max, x23);
+        v2max = __builtin_mips_pick_ph(x23, v2max);
+    }
+
+    switch (len&3) {
+        case 3:
+            x01 = __builtin_mips_absq_s_ph(*x2);
+            __builtin_mips_cmp_lt_ph(v2max, x01);
+            v2max = __builtin_mips_pick_ph(x01, v2max);
+            maxlo = EXTRACT16((oac_val32)v2max);
+            maxhi = EXTRACT16((oac_val32)v2max>>16);
+            maxlo = MAX16(MAX16(maxlo, maxhi), ABS16(x[len - 1]));
+            break;
+        case 2:
+            x01 = __builtin_mips_absq_s_ph(*x2);
+            __builtin_mips_cmp_lt_ph(v2max, x01);
+            v2max = __builtin_mips_pick_ph(x01, v2max);
+            maxlo = EXTRACT16((oac_val32)v2max);
+            maxhi = EXTRACT16((oac_val32)v2max>>16);
+            maxlo = MAX16(maxlo, maxhi);
+            break;
+        case 1:
+            maxlo = EXTRACT16((oac_val32)v2max);
+            maxhi = EXTRACT16((oac_val32)v2max>>16);
+            return MAX16(MAX16(maxlo, maxhi), ABS16(x[len - 1]));
+            break;
+        case 0:
+            maxlo = EXTRACT16((oac_val32)v2max);
+            maxhi = EXTRACT16((oac_val32)v2max>>16);
+            maxlo = MAX16(maxlo, maxhi);
+            break;
+        default:
+            __builtin_unreachable();
+    }
+    /* C version might return 0x8000, this one can't
+     * because abs is saturated here. Since result
+     * used only for determine dynamic range
+     * in ilog2-like context it's worth to add 1
+     * for proper magnitude whether saturated
+     */
+    return (oac_val32)maxlo + 1;
 }
 
 #elif __mips == 32
 
-#undef MULT16_32_Q16
-#define MULT16_32_Q16(a,b) ((oac_val32)SHR((oac_int64)(SHL32((a), 16))*(b),32))
+# undef MULT16_32_Q16
+# define MULT16_32_Q16(a, b) ((oac_val32)SHR((oac_int64)(SHL32((a), 16))*(b), 32))
 
 #endif
 
diff --git a/celt/mips/kiss_fft_mipsr1.h b/celt/mips/kiss_fft_mipsr1.h
index 215dd0d3c..4b47ff407 100644
--- a/celt/mips/kiss_fft_mipsr1.h
+++ b/celt/mips/kiss_fft_mipsr1.h
@@ -1,38 +1,38 @@
 /*Copyright (c) 2013, Xiph.Org Foundation and contributors.
 
-  All rights reserved.
+   All rights reserved.
 
-  Redistribution and use in source and binary forms, with or without
+   Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright notice,
+ * Redistributions of source code must retain the above copyright notice,
        this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
+ * Redistributions in binary form must reproduce the above copyright notice,
        this list of conditions and the following disclaimer in the
        documentation and/or other materials provided with the distribution.
 
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGE.*/
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.*/
 
 #ifndef KISS_FFT_MIPSR1_H
 #define KISS_FFT_MIPSR1_H
 
 #if !defined(KISS_FFT_GUTS_H)
-#error "This file should only be included from _kiss_fft_guts.h"
+# error "This file should only be included from _kiss_fft_guts.h"
 #endif
 
 #ifdef FIXED_POINT
 
-#if __mips == 32 && defined (__mips_dsp)
+# if __mips == 32 && defined (__mips_dsp)
 
 static inline int S_MUL_ADD(int a, int b, int c, int d) {
     long long acc = __builtin_mips_mult(a, b);
@@ -46,8 +46,8 @@ static inline int S_MUL_SUB(int a, int b, int c, int d) {
     return __builtin_mips_extr_w(acc, 15);
 }
 
-#undef C_MUL
-#   define C_MUL(m,a,b) (m=C_MUL_fun(a,b))
+#  undef C_MUL
+#  define C_MUL(m, a, b) (m = C_MUL_fun(a, b))
 static inline kiss_fft_cpx C_MUL_fun(kiss_fft_cpx a, kiss_twiddle_cpx b) {
     kiss_fft_cpx m;
 
@@ -59,8 +59,8 @@ static inline kiss_fft_cpx C_MUL_fun(kiss_fft_cpx a, kiss_twiddle_cpx b) {
     m.i = __builtin_mips_extr_w(acc2, 15);
     return m;
 }
-#undef C_MULC
-#   define C_MULC(m,a,b) (m=C_MULC_fun(a,b))
+#  undef C_MULC
+#  define C_MULC(m, a, b) (m = C_MULC_fun(a, b))
 static inline kiss_fft_cpx C_MULC_fun(kiss_fft_cpx a, kiss_twiddle_cpx b) {
     kiss_fft_cpx m;
 
@@ -73,38 +73,38 @@ static inline kiss_fft_cpx C_MULC_fun(kiss_fft_cpx a, kiss_twiddle_cpx b) {
     return m;
 }
 
-#define OVERRIDE_kf_bfly5
+#  define OVERRIDE_kf_bfly5
 
-#elif __mips == 32 && defined(__mips_isa_rev) && __mips_isa_rev < 6
+# elif __mips == 32 && defined(__mips_isa_rev) && __mips_isa_rev < 6
 
 static inline int S_MUL_ADD(int a, int b, int c, int d) {
     long long acc;
 
     asm volatile (
-            "mult %[a], %[b]  \n"
-            "madd %[c], %[d]  \n"
-        : [acc] "=x"(acc)
-        : [a] "r"(a), [b] "r"(b), [c] "r"(c), [d] "r"(d)
+        "mult %[a], %[b]  \n"
+        "madd %[c], %[d]  \n"
+        : [acc] "=x" (acc)
+        : [a] "r" (a), [b] "r" (b), [c] "r" (c), [d] "r" (d)
         :
-    );
-    return (int)(acc >> 15);
+        );
+    return (int)(acc>>15);
 }
 
 static inline int S_MUL_SUB(int a, int b, int c, int d) {
     long long acc;
 
     asm volatile (
-            "mult %[a], %[b]  \n"
-            "msub %[c], %[d]  \n"
-        : [acc] "=x"(acc)
-        : [a] "r"(a), [b] "r"(b), [c] "r"(c), [d] "r"(d)
+        "mult %[a], %[b]  \n"
+        "msub %[c], %[d]  \n"
+        : [acc] "=x" (acc)
+        : [a] "r" (a), [b] "r" (b), [c] "r" (c), [d] "r" (d)
         :
-    );
-    return (int)(acc >> 15);
+        );
+    return (int)(acc>>15);
 }
 
-#undef C_MUL
-#   define C_MUL(m,a,b) (m=C_MUL_fun(a,b))
+#  undef C_MUL
+#  define C_MUL(m, a, b) (m = C_MUL_fun(a, b))
 static inline kiss_fft_cpx C_MUL_fun(kiss_fft_cpx a, kiss_twiddle_cpx b) {
     kiss_fft_cpx m;
 
@@ -114,8 +114,8 @@ static inline kiss_fft_cpx C_MUL_fun(kiss_fft_cpx a, kiss_twiddle_cpx b) {
     return m;
 }
 
-#undef C_MULC
-#   define C_MULC(m,a,b) (m=C_MULC_fun(a,b))
+#  undef C_MULC
+#  define C_MULC(m, a, b) (m = C_MULC_fun(a, b))
 static inline kiss_fft_cpx C_MULC_fun(kiss_fft_cpx a, kiss_twiddle_cpx b) {
     kiss_fft_cpx m;
 
@@ -125,90 +125,87 @@ static inline kiss_fft_cpx C_MULC_fun(kiss_fft_cpx a, kiss_twiddle_cpx b) {
     return m;
 }
 
-#define OVERRIDE_kf_bfly5
+#  define OVERRIDE_kf_bfly5
 
-#endif
+# endif
 
 #endif /* FIXED_POINT */
 
 #if defined(OVERRIDE_kf_bfly5)
 
 static void kf_bfly5(
-                     kiss_fft_cpx * Fout,
-                     const size_t fstride,
-                     const kiss_fft_state *st,
-                     int m,
-                     int N,
-                     int mm
-                    )
-{
-   kiss_fft_cpx *Fout0,*Fout1,*Fout2,*Fout3,*Fout4;
-   int i, u;
-   kiss_fft_cpx scratch[13];
-
-   const kiss_twiddle_cpx *tw;
-   kiss_twiddle_cpx ya,yb;
-   kiss_fft_cpx * Fout_beg = Fout;
-
-#ifdef FIXED_POINT
-   ya.r = 10126;
-   ya.i = -31164;
-   yb.r = -26510;
-   yb.i = -19261;
-#else
-   ya = st->twiddles[fstride*m];
-   yb = st->twiddles[fstride*2*m];
-#endif
-
-   tw=st->twiddles;
-
-   for (i=0;i<N;i++)
-   {
-      Fout = Fout_beg + i*mm;
-      Fout0=Fout;
-      Fout1=Fout0+m;
-      Fout2=Fout0+2*m;
-      Fout3=Fout0+3*m;
-      Fout4=Fout0+4*m;
-
-      /* For non-custom modes, m is guaranteed to be a multiple of 4. */
-      for ( u=0; u<m; ++u ) {
-         scratch[0] = *Fout0;
-
-
-         C_MUL(scratch[1] ,*Fout1, tw[u*fstride]);
-         C_MUL(scratch[2] ,*Fout2, tw[2*u*fstride]);
-         C_MUL(scratch[3] ,*Fout3, tw[3*u*fstride]);
-         C_MUL(scratch[4] ,*Fout4, tw[4*u*fstride]);
-
-         C_ADD( scratch[7],scratch[1],scratch[4]);
-         C_SUB( scratch[10],scratch[1],scratch[4]);
-         C_ADD( scratch[8],scratch[2],scratch[3]);
-         C_SUB( scratch[9],scratch[2],scratch[3]);
-
-         Fout0->r += scratch[7].r + scratch[8].r;
-         Fout0->i += scratch[7].i + scratch[8].i;
-         scratch[5].r = scratch[0].r + S_MUL_ADD(scratch[7].r,ya.r,scratch[8].r,yb.r);
-         scratch[5].i = scratch[0].i + S_MUL_ADD(scratch[7].i,ya.r,scratch[8].i,yb.r);
-
-         scratch[6].r =  S_MUL_ADD(scratch[10].i,ya.i,scratch[9].i,yb.i);
-         scratch[6].i =  -S_MUL_ADD(scratch[10].r,ya.i,scratch[9].r,yb.i);
-
-         C_SUB(*Fout1,scratch[5],scratch[6]);
-         C_ADD(*Fout4,scratch[5],scratch[6]);
-
-         scratch[11].r = scratch[0].r + S_MUL_ADD(scratch[7].r,yb.r,scratch[8].r,ya.r);
-         scratch[11].i = scratch[0].i + S_MUL_ADD(scratch[7].i,yb.r,scratch[8].i,ya.r);
-
-         scratch[12].r =  S_MUL_SUB(scratch[9].i,ya.i,scratch[10].i,yb.i);
-         scratch[12].i =  S_MUL_SUB(scratch[10].r,yb.i,scratch[9].r,ya.i);
-
-         C_ADD(*Fout2,scratch[11],scratch[12]);
-         C_SUB(*Fout3,scratch[11],scratch[12]);
-
-         ++Fout0;++Fout1;++Fout2;++Fout3;++Fout4;
-      }
-   }
+    kiss_fft_cpx * Fout,
+    const size_t fstride,
+    const kiss_fft_state *st,
+    int m,
+    int N,
+    int mm)        {
+    kiss_fft_cpx *Fout0, *Fout1, *Fout2, *Fout3, *Fout4;
+    int i, u;
+    kiss_fft_cpx scratch[13];
+
+    const kiss_twiddle_cpx *tw;
+    kiss_twiddle_cpx ya, yb;
+    kiss_fft_cpx * Fout_beg = Fout;
+
+# ifdef FIXED_POINT
+    ya.r = 10126;
+    ya.i = -31164;
+    yb.r = -26510;
+    yb.i = -19261;
+# else
+    ya = st->twiddles[fstride*m];
+    yb = st->twiddles[fstride*2*m];
+# endif
+
+    tw = st->twiddles;
+
+    for (i = 0; i < N; i++) {
+        Fout = Fout_beg + i*mm;
+        Fout0 = Fout;
+        Fout1 = Fout0 + m;
+        Fout2 = Fout0 + 2*m;
+        Fout3 = Fout0 + 3*m;
+        Fout4 = Fout0 + 4*m;
+
+        /* For non-custom modes, m is guaranteed to be a multiple of 4. */
+        for (u = 0; u < m; ++u) {
+            scratch[0] = *Fout0;
+
+
+            C_MUL(scratch[1], *Fout1, tw[u*fstride]);
+            C_MUL(scratch[2], *Fout2, tw[2*u*fstride]);
+            C_MUL(scratch[3], *Fout3, tw[3*u*fstride]);
+            C_MUL(scratch[4], *Fout4, tw[4*u*fstride]);
+
+            C_ADD( scratch[7], scratch[1], scratch[4]);
+            C_SUB( scratch[10], scratch[1], scratch[4]);
+            C_ADD( scratch[8], scratch[2], scratch[3]);
+            C_SUB( scratch[9], scratch[2], scratch[3]);
+
+            Fout0->r += scratch[7].r + scratch[8].r;
+            Fout0->i += scratch[7].i + scratch[8].i;
+            scratch[5].r = scratch[0].r + S_MUL_ADD(scratch[7].r, ya.r, scratch[8].r, yb.r);
+            scratch[5].i = scratch[0].i + S_MUL_ADD(scratch[7].i, ya.r, scratch[8].i, yb.r);
+
+            scratch[6].r =  S_MUL_ADD(scratch[10].i, ya.i, scratch[9].i, yb.i);
+            scratch[6].i =  -S_MUL_ADD(scratch[10].r, ya.i, scratch[9].r, yb.i);
+
+            C_SUB(*Fout1, scratch[5], scratch[6]);
+            C_ADD(*Fout4, scratch[5], scratch[6]);
+
+            scratch[11].r = scratch[0].r + S_MUL_ADD(scratch[7].r, yb.r, scratch[8].r, ya.r);
+            scratch[11].i = scratch[0].i + S_MUL_ADD(scratch[7].i, yb.r, scratch[8].i, ya.r);
+
+            scratch[12].r =  S_MUL_SUB(scratch[9].i, ya.i, scratch[10].i, yb.i);
+            scratch[12].i =  S_MUL_SUB(scratch[10].r, yb.i, scratch[9].r, ya.i);
+
+            C_ADD(*Fout2, scratch[11], scratch[12]);
+            C_SUB(*Fout3, scratch[11], scratch[12]);
+
+            ++Fout0; ++Fout1; ++Fout2; ++Fout3; ++Fout4;
+        }
+    }
 }
 
 #endif /* defined(OVERRIDE_kf_bfly5) */
@@ -224,10 +221,10 @@ static void fft_downshift(kiss_fft_cpx *x, int N, int *total, int step) {
         for (i = 0; i < N - 1; i += 2) {
             x[i].r   = SHR32(x[i].r,   1);
             x[i].i   = SHR32(x[i].i,   1);
-            x[i+1].r = SHR32(x[i+1].r, 1);
-            x[i+1].i = SHR32(x[i+1].i, 1);
+            x[i + 1].r = SHR32(x[i + 1].r, 1);
+            x[i + 1].i = SHR32(x[i + 1].i, 1);
         }
-        if (N & 1) {
+        if (N&1) {
             x[i].r = SHR32(x[i].r, 1);
             x[i].i = SHR32(x[i].i, 1);
         }
@@ -236,34 +233,34 @@ static void fft_downshift(kiss_fft_cpx *x, int N, int *total, int step) {
         for (i = 0; i < N - 3; i += 4) {
             x[i].r   = PSHR32(x[i].r,   shift);
             x[i].i   = PSHR32(x[i].i,   shift);
-            x[i+1].r = PSHR32(x[i+1].r, shift);
-            x[i+1].i = PSHR32(x[i+1].i, shift);
-            x[i+2].r = PSHR32(x[i+2].r, shift);
-            x[i+2].i = PSHR32(x[i+2].i, shift);
-            x[i+3].r = PSHR32(x[i+3].r, shift);
-            x[i+3].i = PSHR32(x[i+3].i, shift);
+            x[i + 1].r = PSHR32(x[i + 1].r, shift);
+            x[i + 1].i = PSHR32(x[i + 1].i, shift);
+            x[i + 2].r = PSHR32(x[i + 2].r, shift);
+            x[i + 2].i = PSHR32(x[i + 2].i, shift);
+            x[i + 3].r = PSHR32(x[i + 3].r, shift);
+            x[i + 3].i = PSHR32(x[i + 3].i, shift);
         }
-        switch (N & 3) {
-        case 3:
-            x[i].r   = PSHR32(x[i].r,   shift);
-            x[i].i   = PSHR32(x[i].i,   shift);
-            x[i+1].r = PSHR32(x[i+1].r, shift);
-            x[i+1].i = PSHR32(x[i+1].i, shift);
-            x[i+2].r = PSHR32(x[i+2].r, shift);
-            x[i+2].i = PSHR32(x[i+2].i, shift);
-            break;
-        case 2:
-            x[i].r   = PSHR32(x[i].r,   shift);
-            x[i].i   = PSHR32(x[i].i,   shift);
-            x[i+1].r = PSHR32(x[i+1].r, shift);
-            x[i+1].i = PSHR32(x[i+1].i, shift);
-            break;
-        case 1:
-            x[i].r   = PSHR32(x[i].r,   shift);
-            x[i].i   = PSHR32(x[i].i,   shift);
-            break;
-        case 0:
-            break;
+        switch (N&3) {
+            case 3:
+                x[i].r   = PSHR32(x[i].r,   shift);
+                x[i].i   = PSHR32(x[i].i,   shift);
+                x[i + 1].r = PSHR32(x[i + 1].r, shift);
+                x[i + 1].i = PSHR32(x[i + 1].i, shift);
+                x[i + 2].r = PSHR32(x[i + 2].r, shift);
+                x[i + 2].i = PSHR32(x[i + 2].i, shift);
+                break;
+            case 2:
+                x[i].r   = PSHR32(x[i].r,   shift);
+                x[i].i   = PSHR32(x[i].i,   shift);
+                x[i + 1].r = PSHR32(x[i + 1].r, shift);
+                x[i + 1].i = PSHR32(x[i + 1].i, shift);
+                break;
+            case 1:
+                x[i].r   = PSHR32(x[i].r,   shift);
+                x[i].i   = PSHR32(x[i].i,   shift);
+                break;
+            case 0:
+                break;
         }
     }
 }
diff --git a/celt/mips/mdct_mipsr1.h b/celt/mips/mdct_mipsr1.h
index 790c64f72..0b0040432 100644
--- a/celt/mips/mdct_mipsr1.h
+++ b/celt/mips/mdct_mipsr1.h
@@ -24,7 +24,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 /* This is a simple MDCT implementation that uses a N/4 complex FFT
    to do most of the work. It should be relatively straightforward to
@@ -37,14 +37,14 @@
    The algorithm is similar to (and inspired from) Fabrice Bellard's
    MDCT implementation in FFMPEG, but has differences in signs, ordering
    and scaling in many places.
-*/
+ */
 #ifndef MDCT_MIPSR1_H__
 #define MDCT_MIPSR1_H__
 
 #ifndef SKIP_CONFIG_H
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+# ifdef HAVE_CONFIG_H
+#  include "config.h"
+# endif
 #endif
 
 #include "mdct.h"
@@ -59,17 +59,17 @@
 static inline int S_MUL_ADD_PSR(int a, int b, int c, int d, int shift) {
     long long acc = __builtin_mips_mult(a, b);
     acc = __builtin_mips_madd(acc, c, d);
-    return __builtin_mips_extr_w(acc, 15+shift);
+    return __builtin_mips_extr_w(acc, 15 + shift);
 }
 
 static inline int S_MUL_SUB_PSR(int a, int b, int c, int d, int shift) {
     long long acc = __builtin_mips_mult(a, b);
     acc = __builtin_mips_msub(acc, c, d);
-    return __builtin_mips_extr_w(acc, 15+shift);
+    return __builtin_mips_extr_w(acc, 15 + shift);
 }
 
-#define OVERRIDE_clt_mdct_forward
-#define OVERRIDE_clt_mdct_backward
+# define OVERRIDE_clt_mdct_forward
+# define OVERRIDE_clt_mdct_backward
 
 #elif defined(__mips_isa_rev) && __mips_isa_rev < 6
 
@@ -77,30 +77,30 @@ static inline int S_MUL_ADD_PSR(int a, int b, int c, int d, int shift) {
     long long acc;
 
     asm volatile (
-            "mult %[a], %[b]  \n"
-            "madd %[c], %[d]  \n"
-        : [acc] "=x"(acc)
-        : [a] "r"(a), [b] "r"(b), [c] "r"(c), [d] "r"(d)
+        "mult %[a], %[b]  \n"
+        "madd %[c], %[d]  \n"
+        : [acc] "=x" (acc)
+        : [a] "r" (a), [b] "r" (b), [c] "r" (c), [d] "r" (d)
         :
-    );
-    return (int)(acc >> (15 + shift));
+        );
+    return (int)(acc>>(15 + shift));
 }
 
 static inline int S_MUL_SUB_PSR(int a, int b, int c, int d, int shift) {
     long long acc;
 
     asm volatile (
-            "mult %[a], %[b]  \n"
-            "msub %[c], %[d]  \n"
-        : [acc] "=x"(acc)
-        : [a] "r"(a), [b] "r"(b), [c] "r"(c), [d] "r"(d)
+        "mult %[a], %[b]  \n"
+        "msub %[c], %[d]  \n"
+        : [acc] "=x" (acc)
+        : [a] "r" (a), [b] "r" (b), [c] "r" (c), [d] "r" (d)
         :
-    );
-    return (int)(acc >> (15 + shift));
+        );
+    return (int)(acc>>(15 + shift));
 }
 
-#define OVERRIDE_clt_mdct_forward
-#define OVERRIDE_clt_mdct_backward
+# define OVERRIDE_clt_mdct_forward
+# define OVERRIDE_clt_mdct_backward
 
 #endif
 
@@ -108,147 +108,140 @@ static inline int S_MUL_SUB_PSR(int a, int b, int c, int d, int shift) {
 
 /* Forward MDCT trashes the input array */
 void clt_mdct_forward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * OAC_RESTRICT out,
-      const celt_coef *window, int overlap, int shift, int stride, int arch)
-{
-   int i;
-   int N, N2, N4;
-   VARDECL(kiss_fft_scalar, f);
-   VARDECL(kiss_fft_cpx, f2);
-   const kiss_fft_state *st = l->kfft[shift];
-   const kiss_twiddle_scalar *trig;
-   celt_coef scale;
-#ifdef FIXED_POINT
-   /* Allows us to scale with MULT16_32_Q16(), which is faster than
-      MULT16_32_Q15() on ARM. */
-   int scale_shift = st->scale_shift-1;
-   int headroom;
-#endif
-   SAVE_STACK;
-   (void)arch;
-   scale = st->scale;
-
-   N = l->n;
-   trig = l->trig;
-   for (i=0;i<shift;i++)
-   {
-      N >>= 1;
-      trig += N;
-   }
-   N2 = N>>1;
-   N4 = N>>2;
-
-   ALLOC(f, N2, kiss_fft_scalar);
-   ALLOC(f2, N4, kiss_fft_cpx);
-
-   /* Consider the input to be composed of four blocks: [a, b, c, d] */
-   /* Window, shuffle, fold */
-   {
-      /* Temp pointers to make it really clear to the compiler what we're doing */
-      const kiss_fft_scalar * OAC_RESTRICT xp1 = in+(overlap>>1);
-      const kiss_fft_scalar * OAC_RESTRICT xp2 = in+N2-1+(overlap>>1);
-      kiss_fft_scalar * OAC_RESTRICT yp = f;
-      const celt_coef * OAC_RESTRICT wp1 = window+(overlap>>1);
-      const celt_coef * OAC_RESTRICT wp2 = window+(overlap>>1)-1;
-      for(i=0;i<((overlap+3)>>2);i++)
-      {
-         /* Real part arranged as -d-cR, Imag part arranged as -b+aR*/
-          *yp++ = S_MUL_ADD(*wp2, xp1[N2],*wp1,*xp2);
-          *yp++ = S_MUL_SUB(*wp1, *xp1,*wp2, xp2[-N2]);
-         xp1+=2;
-         xp2-=2;
-         wp1+=2;
-         wp2-=2;
-      }
-      wp1 = window;
-      wp2 = window+overlap-1;
-      for(;i<N4-((overlap+3)>>2);i++)
-      {
-         /* Real part arranged as a-bR, Imag part arranged as -c-dR */
-         *yp++ = *xp2;
-         *yp++ = *xp1;
-         xp1+=2;
-         xp2-=2;
-      }
-      for(;i<N4;i++)
-      {
-         /* Real part arranged as a-bR, Imag part arranged as -c-dR */
-          *yp++ = S_MUL_SUB(*wp2, *xp2, *wp1, xp1[-N2]);
-          *yp++ = S_MUL_ADD(*wp2, *xp1, *wp1, xp2[N2]);
-         xp1+=2;
-         xp2-=2;
-         wp1+=2;
-         wp2-=2;
-      }
-   }
-   /* Pre-rotation */
-   {
-      kiss_fft_scalar * OAC_RESTRICT yp = f;
-      const kiss_twiddle_scalar *t = &trig[0];
-#ifdef FIXED_POINT
-      oac_val32 maxval=1;
-#endif
-      for(i=0;i<N4;i++)
-      {
-         kiss_fft_cpx yc;
-         kiss_twiddle_scalar t0, t1;
-         kiss_fft_scalar re, im, yr, yi;
-         t0 = t[i];
-         t1 = t[N4+i];
-         re = *yp++;
-         im = *yp++;
-         yr = S_MUL_SUB(re,t0,im,t1);
-         yi = S_MUL_ADD(im,t0,re,t1);
-         /* For QEXT, it's best to scale before the FFT, but otherwise it's best to scale after.
-            For floating-point it doesn't matter. */
-#ifdef ENABLE_QEXT
-         yc.r = yr;
-         yc.i = yi;
-#else
-         yc.r = S_MUL2(yr, scale);
-         yc.i = S_MUL2(yi, scale);
-#endif
-#ifdef FIXED_POINT
-         maxval = MAX32(maxval, MAX32(ABS32(yc.r), ABS32(yc.i)));
-#endif
-         f2[st->bitrev[i]] = yc;
-      }
-#ifdef FIXED_POINT
-      headroom = IMAX(0, IMIN(scale_shift, 28-celt_ilog2(maxval)));
-#endif
-   }
-
-   /* N/4 complex FFT, does not downscale anymore */
-   oac_fft_impl(st, f2 ARG_FIXED(scale_shift-headroom));
-
-   /* Post-rotate */
-   {
-      /* Temp pointers to make it really clear to the compiler what we're doing */
-      const kiss_fft_cpx * OAC_RESTRICT fp = f2;
-      kiss_fft_scalar * OAC_RESTRICT yp1 = out;
-      kiss_fft_scalar * OAC_RESTRICT yp2 = out+stride*(N2-1);
-      const kiss_twiddle_scalar *t = &trig[0];
-      /* Temp pointers to make it really clear to the compiler what we're doing */
-      for(i=0;i<N4;i++)
-      {
-         kiss_fft_scalar yr, yi;
-         kiss_fft_scalar t0, t1;
-#ifdef ENABLE_QEXT
-         t0 = S_MUL2(t[i], scale);
-         t1 = S_MUL2(t[N4+i], scale);
-#else
-         t0 = t[i];
-         t1 = t[N4+i];
-#endif
-         yr = S_MUL_SUB_PSR(fp->i,t1 , fp->r,t0, headroom);
-         yi = S_MUL_ADD_PSR(fp->r,t1 , fp->i,t0, headroom);
-         *yp1 = yr;
-         *yp2 = yi;
-         fp++;
-         yp1 += 2*stride;
-         yp2 -= 2*stride;
-      }
-   }
-   RESTORE_STACK;
+                      const celt_coef *window, int overlap, int shift, int stride, int arch) {
+    int i;
+    int N, N2, N4;
+    VARDECL(kiss_fft_scalar, f);
+    VARDECL(kiss_fft_cpx, f2);
+    const kiss_fft_state *st = l->kfft[shift];
+    const kiss_twiddle_scalar *trig;
+    celt_coef scale;
+# ifdef FIXED_POINT
+    /* Allows us to scale with MULT16_32_Q16(), which is faster than
+       MULT16_32_Q15() on ARM. */
+    int scale_shift = st->scale_shift - 1;
+    int headroom;
+# endif
+    SAVE_STACK;
+    (void)arch;
+    scale = st->scale;
+
+    N = l->n;
+    trig = l->trig;
+    for (i = 0; i < shift; i++) {
+        N >>= 1;
+        trig += N;
+    }
+    N2 = N>>1;
+    N4 = N>>2;
+
+    ALLOC(f, N2, kiss_fft_scalar);
+    ALLOC(f2, N4, kiss_fft_cpx);
+
+    /* Consider the input to be composed of four blocks: [a, b, c, d] */
+    /* Window, shuffle, fold */
+    {
+        /* Temp pointers to make it really clear to the compiler what we're doing */
+        const kiss_fft_scalar * OAC_RESTRICT xp1 = in + (overlap>>1);
+        const kiss_fft_scalar * OAC_RESTRICT xp2 = in + N2 - 1 + (overlap>>1);
+        kiss_fft_scalar * OAC_RESTRICT yp = f;
+        const celt_coef * OAC_RESTRICT wp1 = window + (overlap>>1);
+        const celt_coef * OAC_RESTRICT wp2 = window + (overlap>>1) - 1;
+        for (i = 0; i < ((overlap + 3)>>2); i++) {
+            /* Real part arranged as -d-cR, Imag part arranged as -b+aR*/
+            *yp++ = S_MUL_ADD(*wp2, xp1[N2], *wp1, *xp2);
+            *yp++ = S_MUL_SUB(*wp1, *xp1, *wp2, xp2[-N2]);
+            xp1 += 2;
+            xp2 -= 2;
+            wp1 += 2;
+            wp2 -= 2;
+        }
+        wp1 = window;
+        wp2 = window + overlap - 1;
+        for (; i < N4 - ((overlap + 3)>>2); i++) {
+            /* Real part arranged as a-bR, Imag part arranged as -c-dR */
+            *yp++ = *xp2;
+            *yp++ = *xp1;
+            xp1 += 2;
+            xp2 -= 2;
+        }
+        for (; i < N4; i++) {
+            /* Real part arranged as a-bR, Imag part arranged as -c-dR */
+            *yp++ = S_MUL_SUB(*wp2, *xp2, *wp1, xp1[-N2]);
+            *yp++ = S_MUL_ADD(*wp2, *xp1, *wp1, xp2[N2]);
+            xp1 += 2;
+            xp2 -= 2;
+            wp1 += 2;
+            wp2 -= 2;
+        }
+    }
+    /* Pre-rotation */
+    {
+        kiss_fft_scalar * OAC_RESTRICT yp = f;
+        const kiss_twiddle_scalar *t = &trig[0];
+# ifdef FIXED_POINT
+        oac_val32 maxval = 1;
+# endif
+        for (i = 0; i < N4; i++) {
+            kiss_fft_cpx yc;
+            kiss_twiddle_scalar t0, t1;
+            kiss_fft_scalar re, im, yr, yi;
+            t0 = t[i];
+            t1 = t[N4 + i];
+            re = *yp++;
+            im = *yp++;
+            yr = S_MUL_SUB(re, t0, im, t1);
+            yi = S_MUL_ADD(im, t0, re, t1);
+            /* For QEXT, it's best to scale before the FFT, but otherwise it's best to scale after.
+               For floating-point it doesn't matter. */
+# ifdef ENABLE_QEXT
+            yc.r = yr;
+            yc.i = yi;
+# else
+            yc.r = S_MUL2(yr, scale);
+            yc.i = S_MUL2(yi, scale);
+# endif
+# ifdef FIXED_POINT
+            maxval = MAX32(maxval, MAX32(ABS32(yc.r), ABS32(yc.i)));
+# endif
+            f2[st->bitrev[i]] = yc;
+        }
+# ifdef FIXED_POINT
+        headroom = IMAX(0, IMIN(scale_shift, 28 - celt_ilog2(maxval)));
+# endif
+    }
+
+    /* N/4 complex FFT, does not downscale anymore */
+    oac_fft_impl(st, f2 ARG_FIXED(scale_shift - headroom));
+
+    /* Post-rotate */
+    {
+        /* Temp pointers to make it really clear to the compiler what we're doing */
+        const kiss_fft_cpx * OAC_RESTRICT fp = f2;
+        kiss_fft_scalar * OAC_RESTRICT yp1 = out;
+        kiss_fft_scalar * OAC_RESTRICT yp2 = out + stride*(N2 - 1);
+        const kiss_twiddle_scalar *t = &trig[0];
+        /* Temp pointers to make it really clear to the compiler what we're doing */
+        for (i = 0; i < N4; i++) {
+            kiss_fft_scalar yr, yi;
+            kiss_fft_scalar t0, t1;
+# ifdef ENABLE_QEXT
+            t0 = S_MUL2(t[i], scale);
+            t1 = S_MUL2(t[N4 + i], scale);
+# else
+            t0 = t[i];
+            t1 = t[N4 + i];
+# endif
+            yr = S_MUL_SUB_PSR(fp->i, t1, fp->r, t0, headroom);
+            yi = S_MUL_ADD_PSR(fp->r, t1, fp->i, t0, headroom);
+            *yp1 = yr;
+            *yp2 = yi;
+            fp++;
+            yp1 += 2*stride;
+            yp2 -= 2*stride;
+        }
+    }
+    RESTORE_STACK;
 }
 
 #endif /* OVERRIDE_clt_mdct_forward */
@@ -256,126 +249,121 @@ void clt_mdct_forward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar
 #if defined(OVERRIDE_clt_mdct_backward)
 
 void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * OAC_RESTRICT out,
-      const celt_coef * OAC_RESTRICT window, int overlap, int shift, int stride, int arch)
-{
-   int i;
-   int N, N2, N4;
-   const kiss_twiddle_scalar *trig;
-#ifdef FIXED_POINT
-   int pre_shift, post_shift, fft_shift;
-#endif
-   (void) arch;
-
-   N = l->n;
-   trig = l->trig;
-   for (i=0;i<shift;i++)
-   {
-      N >>= 1;
-      trig += N;
-   }
-   N2 = N>>1;
-   N4 = N>>2;
-
-#ifdef FIXED_POINT
-   {
-      oac_val32 sumval=N2;
-      oac_val32 maxval=0;
-      for (i=0;i<N2;i++) {
-         maxval = MAX32(maxval, ABS32(in[i*stride]));
-         sumval = ADD32_ovflw(sumval, ABS32(SHR32(in[i*stride],11)));
-      }
-      pre_shift = IMAX(0, 29-celt_zlog2(1+maxval));
-      /* Worst-case where all the energy goes to a single sample. */
-      post_shift = IMAX(0, 19-celt_ilog2(ABS32(sumval)));
-      post_shift = IMIN(post_shift, pre_shift);
-      fft_shift = pre_shift - post_shift;
-   }
-#endif
-   /* Pre-rotate */
-   {
-      /* Temp pointers to make it really clear to the compiler what we're doing */
-      const kiss_fft_scalar * OAC_RESTRICT xp1 = in;
-      const kiss_fft_scalar * OAC_RESTRICT xp2 = in+stride*(N2-1);
-      kiss_fft_scalar * OAC_RESTRICT yp = out+(overlap>>1);
-      const kiss_twiddle_scalar * OAC_RESTRICT t = &trig[0];
-      const oac_int16 * OAC_RESTRICT bitrev = l->kfft[shift]->bitrev;
-      for(i=0;i<N4;i++)
-      {
-         int rev;
-         kiss_fft_scalar yr, yi;
-         oac_val32 x1, x2;
-         rev = *bitrev++;
-         x1 = SHL32_ovflw(*xp1, pre_shift);
-         x2 = SHL32_ovflw(*xp2, pre_shift);
-         yr = S_MUL_ADD(x2,t[i] , x1,t[N4+i]);
-         yi = S_MUL_SUB(x1,t[i] , x2,t[N4+i]);
-         /* We swap real and imag because we use an FFT instead of an IFFT. */
-         yp[2*rev+1] = yr;
-         yp[2*rev] = yi;
-         /* Storing the pre-rotation directly in the bitrev order. */
-         xp1+=2*stride;
-         xp2-=2*stride;
-      }
-   }
-
-   oac_fft_impl(l->kfft[shift], (kiss_fft_cpx*)(out+(overlap>>1)) ARG_FIXED(fft_shift));
-
-   /* Post-rotate and de-shuffle from both ends of the buffer at once to make
-      it in-place. */
-   {
-      kiss_fft_scalar * yp0 = out+(overlap>>1);
-      kiss_fft_scalar * yp1 = out+(overlap>>1)+N2-2;
-      const kiss_twiddle_scalar *t = &trig[0];
-      /* Loop to (N4+1)>>1 to handle odd N4. When N4 is odd, the
-         middle pair will be computed twice. */
-      for(i=0;i<(N4+1)>>1;i++)
-      {
-         kiss_fft_scalar re, im, yr, yi;
-         kiss_twiddle_scalar t0, t1;
-         /* We swap real and imag because we're using an FFT instead of an IFFT. */
-         re = yp0[1];
-         im = yp0[0];
-         t0 = t[i];
-         t1 = t[N4+i];
-         /* We'd scale up by 2 here, but instead it's done when mixing the windows */
-         yr = S_MUL_ADD_PSR(re,t0 , im,t1, post_shift);
-         yi = S_MUL_SUB_PSR(re,t1 , im,t0, post_shift);
-         /* We swap real and imag because we're using an FFT instead of an IFFT. */
-         re = yp1[1];
-         im = yp1[0];
-         yp0[0] = yr;
-         yp1[1] = yi;
-
-         t0 = t[(N4-i-1)];
-         t1 = t[(N2-i-1)];
-         /* We'd scale up by 2 here, but instead it's done when mixing the windows */
-         yr = S_MUL_ADD_PSR(re,t0,im,t1, post_shift);
-         yi = S_MUL_SUB_PSR(re,t1,im,t0, post_shift);
-         yp1[0] = yr;
-         yp0[1] = yi;
-         yp0 += 2;
-         yp1 -= 2;
-      }
-   }
-
-   /* Mirror on both sides for TDAC */
-   {
-      kiss_fft_scalar * OAC_RESTRICT xp1 = out+overlap-1;
-      kiss_fft_scalar * OAC_RESTRICT yp1 = out;
-      const celt_coef * OAC_RESTRICT wp1 = window;
-      const celt_coef * OAC_RESTRICT wp2 = window+overlap-1;
-
-      for(i = 0; i < overlap/2; i++)
-      {
-         kiss_fft_scalar x1, x2;
-         x1 = *xp1;
-         x2 = *yp1;
-         *yp1++ = S_MUL_SUB(x2, *wp2, x1, *wp1);
-         *xp1-- = S_MUL_ADD(x2, *wp1, x1, *wp2);
-         wp1++;
-         wp2--;
-      }
-   }
+                       const celt_coef * OAC_RESTRICT window, int overlap, int shift, int stride, int arch) {
+    int i;
+    int N, N2, N4;
+    const kiss_twiddle_scalar *trig;
+# ifdef FIXED_POINT
+    int pre_shift, post_shift, fft_shift;
+# endif
+    (void) arch;
+
+    N = l->n;
+    trig = l->trig;
+    for (i = 0; i < shift; i++) {
+        N >>= 1;
+        trig += N;
+    }
+    N2 = N>>1;
+    N4 = N>>2;
+
+# ifdef FIXED_POINT
+    {
+        oac_val32 sumval = N2;
+        oac_val32 maxval = 0;
+        for (i = 0; i < N2; i++) {
+            maxval = MAX32(maxval, ABS32(in[i*stride]));
+            sumval = ADD32_ovflw(sumval, ABS32(SHR32(in[i*stride], 11)));
+        }
+        pre_shift = IMAX(0, 29 - celt_zlog2(1 + maxval));
+        /* Worst-case where all the energy goes to a single sample. */
+        post_shift = IMAX(0, 19 - celt_ilog2(ABS32(sumval)));
+        post_shift = IMIN(post_shift, pre_shift);
+        fft_shift = pre_shift - post_shift;
+    }
+# endif
+    /* Pre-rotate */
+    {
+        /* Temp pointers to make it really clear to the compiler what we're doing */
+        const kiss_fft_scalar * OAC_RESTRICT xp1 = in;
+        const kiss_fft_scalar * OAC_RESTRICT xp2 = in + stride*(N2 - 1);
+        kiss_fft_scalar * OAC_RESTRICT yp = out + (overlap>>1);
+        const kiss_twiddle_scalar * OAC_RESTRICT t = &trig[0];
+        const oac_int16 * OAC_RESTRICT bitrev = l->kfft[shift]->bitrev;
+        for (i = 0; i < N4; i++) {
+            int rev;
+            kiss_fft_scalar yr, yi;
+            oac_val32 x1, x2;
+            rev = *bitrev++;
+            x1 = SHL32_ovflw(*xp1, pre_shift);
+            x2 = SHL32_ovflw(*xp2, pre_shift);
+            yr = S_MUL_ADD(x2, t[i], x1, t[N4 + i]);
+            yi = S_MUL_SUB(x1, t[i], x2, t[N4 + i]);
+            /* We swap real and imag because we use an FFT instead of an IFFT. */
+            yp[2*rev + 1] = yr;
+            yp[2*rev] = yi;
+            /* Storing the pre-rotation directly in the bitrev order. */
+            xp1 += 2*stride;
+            xp2 -= 2*stride;
+        }
+    }
+
+    oac_fft_impl(l->kfft[shift], (kiss_fft_cpx*)(out + (overlap>>1))ARG_FIXED(fft_shift));
+
+    /* Post-rotate and de-shuffle from both ends of the buffer at once to make
+       it in-place. */
+    {
+        kiss_fft_scalar * yp0 = out + (overlap>>1);
+        kiss_fft_scalar * yp1 = out + (overlap>>1) + N2 - 2;
+        const kiss_twiddle_scalar *t = &trig[0];
+        /* Loop to (N4+1)>>1 to handle odd N4. When N4 is odd, the
+           middle pair will be computed twice. */
+        for (i = 0; i < (N4 + 1)>>1; i++) {
+            kiss_fft_scalar re, im, yr, yi;
+            kiss_twiddle_scalar t0, t1;
+            /* We swap real and imag because we're using an FFT instead of an IFFT. */
+            re = yp0[1];
+            im = yp0[0];
+            t0 = t[i];
+            t1 = t[N4 + i];
+            /* We'd scale up by 2 here, but instead it's done when mixing the windows */
+            yr = S_MUL_ADD_PSR(re, t0, im, t1, post_shift);
+            yi = S_MUL_SUB_PSR(re, t1, im, t0, post_shift);
+            /* We swap real and imag because we're using an FFT instead of an IFFT. */
+            re = yp1[1];
+            im = yp1[0];
+            yp0[0] = yr;
+            yp1[1] = yi;
+
+            t0 = t[(N4 - i - 1)];
+            t1 = t[(N2 - i - 1)];
+            /* We'd scale up by 2 here, but instead it's done when mixing the windows */
+            yr = S_MUL_ADD_PSR(re, t0, im, t1, post_shift);
+            yi = S_MUL_SUB_PSR(re, t1, im, t0, post_shift);
+            yp1[0] = yr;
+            yp0[1] = yi;
+            yp0 += 2;
+            yp1 -= 2;
+        }
+    }
+
+    /* Mirror on both sides for TDAC */
+    {
+        kiss_fft_scalar * OAC_RESTRICT xp1 = out + overlap - 1;
+        kiss_fft_scalar * OAC_RESTRICT yp1 = out;
+        const celt_coef * OAC_RESTRICT wp1 = window;
+        const celt_coef * OAC_RESTRICT wp2 = window + overlap - 1;
+
+        for (i = 0; i < overlap/2; i++) {
+            kiss_fft_scalar x1, x2;
+            x1 = *xp1;
+            x2 = *yp1;
+            *yp1++ = S_MUL_SUB(x2, *wp2, x1, *wp1);
+            *xp1-- = S_MUL_ADD(x2, *wp1, x1, *wp2);
+            wp1++;
+            wp2--;
+        }
+    }
 }
 
 #endif /* OVERRIDE_clt_mdct_backward */
diff --git a/celt/mips/pitch_mipsr1.h b/celt/mips/pitch_mipsr1.h
index f0bae2b58..648cf1de1 100644
--- a/celt/mips/pitch_mipsr1.h
+++ b/celt/mips/pitch_mipsr1.h
@@ -29,7 +29,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef PITCH_MIPSR1_H
 #define PITCH_MIPSR1_H
@@ -38,26 +38,26 @@
 
 #if defined (__mips_dsp) && __mips == 32
 
-#define accumulator_t oac_int64
-#define MIPS_MAC(acc,a,b) \
-    __builtin_mips_madd((acc), (int)(a), (int)(b))
+# define accumulator_t oac_int64
+# define MIPS_MAC(acc, a, b) \
+        __builtin_mips_madd((acc), (int)(a), (int)(b))
 
-#define MIPS_MAC16x16_2X(acc,a2x,b2x) \
-    __builtin_mips_dpaq_s_w_ph((acc), (a2x), (b2x))
+# define MIPS_MAC16x16_2X(acc, a2x, b2x) \
+        __builtin_mips_dpaq_s_w_ph((acc), (a2x), (b2x))
 
-#define OVERRIDE_CELT_INNER_PROD
-#define OVERRIDE_DUAL_INNER_PROD
-#define OVERRIDE_XCORR_KERNEL
+# define OVERRIDE_CELT_INNER_PROD
+# define OVERRIDE_DUAL_INNER_PROD
+# define OVERRIDE_XCORR_KERNEL
 
 #else /* any other MIPS */
 
 /* using madd is slower due to single accumulator */
-#define accumulator_t oac_int32
-#define MIPS_MAC MAC16_16
+# define accumulator_t oac_int32
+# define MIPS_MAC MAC16_16
 
-#define OVERRIDE_CELT_INNER_PROD
-#define OVERRIDE_DUAL_INNER_PROD
-#define OVERRIDE_XCORR_KERNEL
+# define OVERRIDE_CELT_INNER_PROD
+# define OVERRIDE_DUAL_INNER_PROD
+# define OVERRIDE_XCORR_KERNEL
 
 #endif /* any other MIPS */
 
@@ -65,198 +65,191 @@
 #if defined(OVERRIDE_CELT_INNER_PROD)
 
 static OAC_INLINE oac_val32 celt_inner_prod(const oac_val16 *x,
-      const oac_val16 *y, int N, int arch)
-{
-   int j;
-   accumulator_t acc = 0;
-
-#if defined (MIPS_MAC16x16_2X)
-   const v2i16 *x2x;
-   const v2i16 *y2x;
-   int loops;
-
-   /* misaligned */
-   if (((long)x | (long)y) & 3)
-       goto fallback;
-
-   x2x = __builtin_assume_aligned(x, 4);
-   y2x = __builtin_assume_aligned(y, 4);
-   loops = N / 8;
-   for (j = 0; j < loops; j++)
-   {
-      acc = MIPS_MAC16x16_2X(acc, x2x[0], y2x[0]);
-      acc = MIPS_MAC16x16_2X(acc, x2x[1], y2x[1]);
-      acc = MIPS_MAC16x16_2X(acc, x2x[2], y2x[2]);
-      acc = MIPS_MAC16x16_2X(acc, x2x[3], y2x[3]);
-      x2x += 4; y2x += 4;
-   }
-
-   switch (N & 7) {
-   case 7:
-      acc = MIPS_MAC16x16_2X(acc, x2x[0], y2x[0]);
-      acc = MIPS_MAC16x16_2X(acc, x2x[1], y2x[1]);
-      acc = MIPS_MAC16x16_2X(acc, x2x[2], y2x[2]);
-      acc = MIPS_MAC(acc, x[N-1], y[N-1]);
-      break;
-   case 6:
-      acc = MIPS_MAC16x16_2X(acc, x2x[0], y2x[0]);
-      acc = MIPS_MAC16x16_2X(acc, x2x[1], y2x[1]);
-      acc = MIPS_MAC16x16_2X(acc, x2x[2], y2x[2]);
-      break;
-   case 5:
-      acc = MIPS_MAC16x16_2X(acc, x2x[0], y2x[0]);
-      acc = MIPS_MAC16x16_2X(acc, x2x[1], y2x[1]);
-      acc = MIPS_MAC(acc, x[N-1], y[N-1]);
-      break;
-   case 4:
-      acc = MIPS_MAC16x16_2X(acc, x2x[0], y2x[0]);
-      acc = MIPS_MAC16x16_2X(acc, x2x[1], y2x[1]);
-      break;
-   case 3:
-      acc = MIPS_MAC16x16_2X(acc, x2x[0], y2x[0]);
-      acc = MIPS_MAC(acc, x[N-1], y[N-1]);
-      break;
-   case 2:
-      acc = MIPS_MAC16x16_2X(acc, x2x[0], y2x[0]);
-      break;
-   case 1:
-      acc = MIPS_MAC(acc, x[N-1], y[N-1]);
-      break;
-   case 0:
-      break;
-   }
-   return __builtin_mips_extr_w(acc, 1);
+                                            const oac_val16 *y, int N, int arch) {
+    int j;
+    accumulator_t acc = 0;
+
+# if defined (MIPS_MAC16x16_2X)
+    const v2i16 *x2x;
+    const v2i16 *y2x;
+    int loops;
+
+    /* misaligned */
+    if (((long)x|(long)y)&3)
+        goto fallback;
+
+    x2x = __builtin_assume_aligned(x, 4);
+    y2x = __builtin_assume_aligned(y, 4);
+    loops = N/8;
+    for (j = 0; j < loops; j++) {
+        acc = MIPS_MAC16x16_2X(acc, x2x[0], y2x[0]);
+        acc = MIPS_MAC16x16_2X(acc, x2x[1], y2x[1]);
+        acc = MIPS_MAC16x16_2X(acc, x2x[2], y2x[2]);
+        acc = MIPS_MAC16x16_2X(acc, x2x[3], y2x[3]);
+        x2x += 4; y2x += 4;
+    }
+
+    switch (N&7) {
+        case 7:
+            acc = MIPS_MAC16x16_2X(acc, x2x[0], y2x[0]);
+            acc = MIPS_MAC16x16_2X(acc, x2x[1], y2x[1]);
+            acc = MIPS_MAC16x16_2X(acc, x2x[2], y2x[2]);
+            acc = MIPS_MAC(acc, x[N - 1], y[N - 1]);
+            break;
+        case 6:
+            acc = MIPS_MAC16x16_2X(acc, x2x[0], y2x[0]);
+            acc = MIPS_MAC16x16_2X(acc, x2x[1], y2x[1]);
+            acc = MIPS_MAC16x16_2X(acc, x2x[2], y2x[2]);
+            break;
+        case 5:
+            acc = MIPS_MAC16x16_2X(acc, x2x[0], y2x[0]);
+            acc = MIPS_MAC16x16_2X(acc, x2x[1], y2x[1]);
+            acc = MIPS_MAC(acc, x[N - 1], y[N - 1]);
+            break;
+        case 4:
+            acc = MIPS_MAC16x16_2X(acc, x2x[0], y2x[0]);
+            acc = MIPS_MAC16x16_2X(acc, x2x[1], y2x[1]);
+            break;
+        case 3:
+            acc = MIPS_MAC16x16_2X(acc, x2x[0], y2x[0]);
+            acc = MIPS_MAC(acc, x[N - 1], y[N - 1]);
+            break;
+        case 2:
+            acc = MIPS_MAC16x16_2X(acc, x2x[0], y2x[0]);
+            break;
+        case 1:
+            acc = MIPS_MAC(acc, x[N - 1], y[N - 1]);
+            break;
+        case 0:
+            break;
+    }
+    return __builtin_mips_extr_w(acc, 1);
 
 fallback:
-#endif
-   for (j = 0; j < N - 3; j += 4)
-   {
-      acc = MIPS_MAC(acc, x[j],   y[j]);
-      acc = MIPS_MAC(acc, x[j+1], y[j+1]);
-      acc = MIPS_MAC(acc, x[j+2], y[j+2]);
-      acc = MIPS_MAC(acc, x[j+3], y[j+3]);
-   }
-
-   switch (N & 3) {
-   case 3:
-      acc = MIPS_MAC(acc, x[j],   y[j]);
-      acc = MIPS_MAC(acc, x[j+1], y[j+1]);
-      acc = MIPS_MAC(acc, x[j+2], y[j+2]);
-      break;
-   case 2:
-      acc = MIPS_MAC(acc, x[j],   y[j]);
-      acc = MIPS_MAC(acc, x[j+1], y[j+1]);
-      break;
-   case 1:
-      acc = MIPS_MAC(acc, x[j],   y[j]);
-      break;
-   case 0:
-      break;
-   }
-
-   (void)arch;
-
-   return (oac_val32)acc;
+# endif
+    for (j = 0; j < N - 3; j += 4) {
+        acc = MIPS_MAC(acc, x[j],   y[j]);
+        acc = MIPS_MAC(acc, x[j + 1], y[j + 1]);
+        acc = MIPS_MAC(acc, x[j + 2], y[j + 2]);
+        acc = MIPS_MAC(acc, x[j + 3], y[j + 3]);
+    }
+
+    switch (N&3) {
+        case 3:
+            acc = MIPS_MAC(acc, x[j],   y[j]);
+            acc = MIPS_MAC(acc, x[j + 1], y[j + 1]);
+            acc = MIPS_MAC(acc, x[j + 2], y[j + 2]);
+            break;
+        case 2:
+            acc = MIPS_MAC(acc, x[j],   y[j]);
+            acc = MIPS_MAC(acc, x[j + 1], y[j + 1]);
+            break;
+        case 1:
+            acc = MIPS_MAC(acc, x[j],   y[j]);
+            break;
+        case 0:
+            break;
+    }
+
+    (void)arch;
+
+    return (oac_val32)acc;
 }
 #endif /* OVERRIDE_CELT_INNER_PROD */
 
 #if defined(OVERRIDE_DUAL_INNER_PROD)
 static inline void dual_inner_prod(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
-      int N, oac_val32 *xy1, oac_val32 *xy2, int arch)
-{
-   int j;
-   accumulator_t acc1 = 0;
-   accumulator_t acc2 = 0;
-
-#if defined (MIPS_MAC16x16_2X)
-   const v2i16 *x2x;
-   const v2i16 *y01_2x;
-   const v2i16 *y02_2x;
-
-   /* misaligned */
-   if (((long)x | (long)y01 | (long)y02) & 3)
-       goto fallback;
-
-   x2x = __builtin_assume_aligned(x, 4);
-   y01_2x = __builtin_assume_aligned(y01, 4);
-   y02_2x = __builtin_assume_aligned(y02, 4);
-   N /= 2;
-
-   for (j = 0; j < N - 3; j += 4)
-   {
-      acc1 = MIPS_MAC16x16_2X(acc1, x2x[j],   y01_2x[j]);
-      acc2 = MIPS_MAC16x16_2X(acc2, x2x[j],   y02_2x[j]);
-      acc1 = MIPS_MAC16x16_2X(acc1, x2x[j+1], y01_2x[j+1]);
-      acc2 = MIPS_MAC16x16_2X(acc2, x2x[j+1], y02_2x[j+1]);
-      acc1 = MIPS_MAC16x16_2X(acc1, x2x[j+2], y01_2x[j+2]);
-      acc2 = MIPS_MAC16x16_2X(acc2, x2x[j+2], y02_2x[j+2]);
-      acc1 = MIPS_MAC16x16_2X(acc1, x2x[j+3], y01_2x[j+3]);
-      acc2 = MIPS_MAC16x16_2X(acc2, x2x[j+3], y02_2x[j+3]);
-   }
-
-   switch (N & 3) {
-   case 3:
-      acc1 = MIPS_MAC16x16_2X(acc1, x2x[j],   y01_2x[j]);
-      acc2 = MIPS_MAC16x16_2X(acc2, x2x[j],   y02_2x[j]);
-      acc1 = MIPS_MAC16x16_2X(acc1, x2x[j+1], y01_2x[j+1]);
-      acc2 = MIPS_MAC16x16_2X(acc2, x2x[j+1], y02_2x[j+1]);
-      acc1 = MIPS_MAC16x16_2X(acc1, x2x[j+2], y01_2x[j+2]);
-      acc2 = MIPS_MAC16x16_2X(acc2, x2x[j+2], y02_2x[j+2]);
-      break;
-   case 2:
-      acc1 = MIPS_MAC16x16_2X(acc1, x2x[j],   y01_2x[j]);
-      acc2 = MIPS_MAC16x16_2X(acc2, x2x[j],   y02_2x[j]);
-      acc1 = MIPS_MAC16x16_2X(acc1, x2x[j+1], y01_2x[j+1]);
-      acc2 = MIPS_MAC16x16_2X(acc2, x2x[j+1], y02_2x[j+1]);
-      break;
-   case 1:
-      acc1 = MIPS_MAC16x16_2X(acc1, x2x[j],   y01_2x[j]);
-      acc2 = MIPS_MAC16x16_2X(acc2, x2x[j],   y02_2x[j]);
-      break;
-   case 0:
-      break;
-   }
-
-   *xy1 = __builtin_mips_extr_w(acc1, 1);
-   *xy2 = __builtin_mips_extr_w(acc2, 1);
-   return;
+                                   int N, oac_val32 *xy1, oac_val32 *xy2, int arch) {
+    int j;
+    accumulator_t acc1 = 0;
+    accumulator_t acc2 = 0;
+
+# if defined (MIPS_MAC16x16_2X)
+    const v2i16 *x2x;
+    const v2i16 *y01_2x;
+    const v2i16 *y02_2x;
+
+    /* misaligned */
+    if (((long)x|(long)y01|(long)y02)&3)
+        goto fallback;
+
+    x2x = __builtin_assume_aligned(x, 4);
+    y01_2x = __builtin_assume_aligned(y01, 4);
+    y02_2x = __builtin_assume_aligned(y02, 4);
+    N /= 2;
+
+    for (j = 0; j < N - 3; j += 4) {
+        acc1 = MIPS_MAC16x16_2X(acc1, x2x[j],   y01_2x[j]);
+        acc2 = MIPS_MAC16x16_2X(acc2, x2x[j],   y02_2x[j]);
+        acc1 = MIPS_MAC16x16_2X(acc1, x2x[j + 1], y01_2x[j + 1]);
+        acc2 = MIPS_MAC16x16_2X(acc2, x2x[j + 1], y02_2x[j + 1]);
+        acc1 = MIPS_MAC16x16_2X(acc1, x2x[j + 2], y01_2x[j + 2]);
+        acc2 = MIPS_MAC16x16_2X(acc2, x2x[j + 2], y02_2x[j + 2]);
+        acc1 = MIPS_MAC16x16_2X(acc1, x2x[j + 3], y01_2x[j + 3]);
+        acc2 = MIPS_MAC16x16_2X(acc2, x2x[j + 3], y02_2x[j + 3]);
+    }
+
+    switch (N&3) {
+        case 3:
+            acc1 = MIPS_MAC16x16_2X(acc1, x2x[j],   y01_2x[j]);
+            acc2 = MIPS_MAC16x16_2X(acc2, x2x[j],   y02_2x[j]);
+            acc1 = MIPS_MAC16x16_2X(acc1, x2x[j + 1], y01_2x[j + 1]);
+            acc2 = MIPS_MAC16x16_2X(acc2, x2x[j + 1], y02_2x[j + 1]);
+            acc1 = MIPS_MAC16x16_2X(acc1, x2x[j + 2], y01_2x[j + 2]);
+            acc2 = MIPS_MAC16x16_2X(acc2, x2x[j + 2], y02_2x[j + 2]);
+            break;
+        case 2:
+            acc1 = MIPS_MAC16x16_2X(acc1, x2x[j],   y01_2x[j]);
+            acc2 = MIPS_MAC16x16_2X(acc2, x2x[j],   y02_2x[j]);
+            acc1 = MIPS_MAC16x16_2X(acc1, x2x[j + 1], y01_2x[j + 1]);
+            acc2 = MIPS_MAC16x16_2X(acc2, x2x[j + 1], y02_2x[j + 1]);
+            break;
+        case 1:
+            acc1 = MIPS_MAC16x16_2X(acc1, x2x[j],   y01_2x[j]);
+            acc2 = MIPS_MAC16x16_2X(acc2, x2x[j],   y02_2x[j]);
+            break;
+        case 0:
+            break;
+    }
+
+    *xy1 = __builtin_mips_extr_w(acc1, 1);
+    *xy2 = __builtin_mips_extr_w(acc2, 1);
+    return;
 
 fallback:
-#endif
-   /* Compute the norm of X+Y and X-Y as |X|^2 + |Y|^2 +/- sum(xy) */
-   for (j = 0; j < N - 3; j += 4)
-   {
-      acc1 = MIPS_MAC(acc1, x[j],   y01[j]);
-      acc2 = MIPS_MAC(acc2, x[j],   y02[j]);
-      acc1 = MIPS_MAC(acc1, x[j+1], y01[j+1]);
-      acc2 = MIPS_MAC(acc2, x[j+1], y02[j+1]);
-      acc1 = MIPS_MAC(acc1, x[j+2], y01[j+2]);
-      acc2 = MIPS_MAC(acc2, x[j+2], y02[j+2]);
-      acc1 = MIPS_MAC(acc1, x[j+3], y01[j+3]);
-      acc2 = MIPS_MAC(acc2, x[j+3], y02[j+3]);
-   }
-
-   if (j < N) {
-      acc1 = MIPS_MAC(acc1, x[j],   y01[j]);
-      acc2 = MIPS_MAC(acc2, x[j],   y02[j]);
-      acc1 = MIPS_MAC(acc1, x[j+1], y01[j+1]);
-      acc2 = MIPS_MAC(acc2, x[j+1], y02[j+1]);
-   }
-
-   (void)arch;
-
-   *xy1 = (oac_val32)acc1;
-   *xy2 = (oac_val32)acc2;
+# endif
+    /* Compute the norm of X+Y and X-Y as |X|^2 + |Y|^2 +/- sum(xy) */
+    for (j = 0; j < N - 3; j += 4) {
+        acc1 = MIPS_MAC(acc1, x[j],   y01[j]);
+        acc2 = MIPS_MAC(acc2, x[j],   y02[j]);
+        acc1 = MIPS_MAC(acc1, x[j + 1], y01[j + 1]);
+        acc2 = MIPS_MAC(acc2, x[j + 1], y02[j + 1]);
+        acc1 = MIPS_MAC(acc1, x[j + 2], y01[j + 2]);
+        acc2 = MIPS_MAC(acc2, x[j + 2], y02[j + 2]);
+        acc1 = MIPS_MAC(acc1, x[j + 3], y01[j + 3]);
+        acc2 = MIPS_MAC(acc2, x[j + 3], y02[j + 3]);
+    }
+
+    if (j < N) {
+        acc1 = MIPS_MAC(acc1, x[j],   y01[j]);
+        acc2 = MIPS_MAC(acc2, x[j],   y02[j]);
+        acc1 = MIPS_MAC(acc1, x[j + 1], y01[j + 1]);
+        acc2 = MIPS_MAC(acc2, x[j + 1], y02[j + 1]);
+    }
+
+    (void)arch;
+
+    *xy1 = (oac_val32)acc1;
+    *xy2 = (oac_val32)acc2;
 }
 #endif /* OVERRIDE_DUAL_INNER_PROD */
 
 #if defined(OVERRIDE_XCORR_KERNEL)
 
 static inline void xcorr_kernel_mips(const oac_val16 * x,
-      const oac_val16 * y, oac_val32 sum[4], int len)
-{
-   int j;
-   oac_val16 y_0, y_1, y_2, y_3;
+                                     const oac_val16 * y, oac_val32 sum[4], int len) {
+    int j;
+    oac_val16 y_0, y_1, y_2, y_3;
 
     accumulator_t sum_0, sum_1, sum_2, sum_3;
     sum_0 =  (accumulator_t)sum[0];
@@ -264,95 +257,94 @@ static inline void xcorr_kernel_mips(const oac_val16 * x,
     sum_2 =  (accumulator_t)sum[2];
     sum_3 =  (accumulator_t)sum[3];
 
-    y_0=*y++;
-    y_1=*y++;
-    y_2=*y++;
-    for (j=0;j<len-3;j+=4)
-    {
+    y_0 = *y++;
+    y_1 = *y++;
+    y_2 = *y++;
+    for (j = 0; j < len - 3; j += 4) {
         oac_val16 tmp;
         tmp = *x++;
-        y_3=*y++;
+        y_3 = *y++;
 
         sum_0 = MIPS_MAC(sum_0, tmp, y_0);
         sum_1 = MIPS_MAC(sum_1, tmp, y_1);
         sum_2 = MIPS_MAC(sum_2, tmp, y_2);
         sum_3 = MIPS_MAC(sum_3, tmp, y_3);
 
-        tmp=*x++;
-        y_0=*y++;
+        tmp = *x++;
+        y_0 = *y++;
 
         sum_0 = MIPS_MAC(sum_0, tmp, y_1);
         sum_1 = MIPS_MAC(sum_1, tmp, y_2);
         sum_2 = MIPS_MAC(sum_2, tmp, y_3);
         sum_3 = MIPS_MAC(sum_3, tmp, y_0);
 
-       tmp=*x++;
-       y_1=*y++;
-
-       sum_0 = MIPS_MAC(sum_0, tmp, y_2);
-       sum_1 = MIPS_MAC(sum_1, tmp, y_3);
-       sum_2 = MIPS_MAC(sum_2, tmp, y_0);
-       sum_3 = MIPS_MAC(sum_3, tmp, y_1);
-
-
-      tmp=*x++;
-      y_2=*y++;
-
-      sum_0 = MIPS_MAC(sum_0, tmp, y_3);
-      sum_1 = MIPS_MAC(sum_1, tmp, y_0);
-      sum_2 = MIPS_MAC(sum_2, tmp, y_1);
-      sum_3 = MIPS_MAC(sum_3, tmp, y_2);
-   }
-
-   switch (len & 3) {
-   case 3:
-      sum_0 = MIPS_MAC(sum_0, x[2], y_2);
-      sum_1 = MIPS_MAC(sum_1, x[2], y[0]);
-      sum_2 = MIPS_MAC(sum_2, x[2], y[1]);
-      sum_3 = MIPS_MAC(sum_3, x[2], y[2]);
-
-      sum_0 = MIPS_MAC(sum_0, x[1], y_1);
-      sum_1 = MIPS_MAC(sum_1, x[1], y_2);
-      sum_2 = MIPS_MAC(sum_2, x[1], y[0]);
-      sum_3 = MIPS_MAC(sum_3, x[1], y[1]);
-
-      sum_0 = MIPS_MAC(sum_0, x[0], y_0);
-      sum_1 = MIPS_MAC(sum_1, x[0], y_1);
-      sum_2 = MIPS_MAC(sum_2, x[0], y_2);
-      sum_3 = MIPS_MAC(sum_3, x[0], y[0]);
-      break;
-   case 2:
-      sum_0 = MIPS_MAC(sum_0, x[1], y_1);
-      sum_1 = MIPS_MAC(sum_1, x[1], y_2);
-      sum_2 = MIPS_MAC(sum_2, x[1], y[0]);
-      sum_3 = MIPS_MAC(sum_3, x[1], y[1]);
-
-      sum_0 = MIPS_MAC(sum_0, x[0], y_0);
-      sum_1 = MIPS_MAC(sum_1, x[0], y_1);
-      sum_2 = MIPS_MAC(sum_2, x[0], y_2);
-      sum_3 = MIPS_MAC(sum_3, x[0], y[0]);
-      break;
-   case 1:
-      sum_0 = MIPS_MAC(sum_0, x[0], y_0);
-      sum_1 = MIPS_MAC(sum_1, x[0], y_1);
-      sum_2 = MIPS_MAC(sum_2, x[0], y_2);
-      sum_3 = MIPS_MAC(sum_3, x[0], y[0]);
-      break;
-   case 0:
-      break;
-   }
-
-   sum[0] = (oac_val32)sum_0;
-   sum[1] = (oac_val32)sum_1;
-   sum[2] = (oac_val32)sum_2;
-   sum[3] = (oac_val32)sum_3;
+        tmp = *x++;
+        y_1 = *y++;
+
+        sum_0 = MIPS_MAC(sum_0, tmp, y_2);
+        sum_1 = MIPS_MAC(sum_1, tmp, y_3);
+        sum_2 = MIPS_MAC(sum_2, tmp, y_0);
+        sum_3 = MIPS_MAC(sum_3, tmp, y_1);
+
+
+        tmp = *x++;
+        y_2 = *y++;
+
+        sum_0 = MIPS_MAC(sum_0, tmp, y_3);
+        sum_1 = MIPS_MAC(sum_1, tmp, y_0);
+        sum_2 = MIPS_MAC(sum_2, tmp, y_1);
+        sum_3 = MIPS_MAC(sum_3, tmp, y_2);
+    }
+
+    switch (len&3) {
+        case 3:
+            sum_0 = MIPS_MAC(sum_0, x[2], y_2);
+            sum_1 = MIPS_MAC(sum_1, x[2], y[0]);
+            sum_2 = MIPS_MAC(sum_2, x[2], y[1]);
+            sum_3 = MIPS_MAC(sum_3, x[2], y[2]);
+
+            sum_0 = MIPS_MAC(sum_0, x[1], y_1);
+            sum_1 = MIPS_MAC(sum_1, x[1], y_2);
+            sum_2 = MIPS_MAC(sum_2, x[1], y[0]);
+            sum_3 = MIPS_MAC(sum_3, x[1], y[1]);
+
+            sum_0 = MIPS_MAC(sum_0, x[0], y_0);
+            sum_1 = MIPS_MAC(sum_1, x[0], y_1);
+            sum_2 = MIPS_MAC(sum_2, x[0], y_2);
+            sum_3 = MIPS_MAC(sum_3, x[0], y[0]);
+            break;
+        case 2:
+            sum_0 = MIPS_MAC(sum_0, x[1], y_1);
+            sum_1 = MIPS_MAC(sum_1, x[1], y_2);
+            sum_2 = MIPS_MAC(sum_2, x[1], y[0]);
+            sum_3 = MIPS_MAC(sum_3, x[1], y[1]);
+
+            sum_0 = MIPS_MAC(sum_0, x[0], y_0);
+            sum_1 = MIPS_MAC(sum_1, x[0], y_1);
+            sum_2 = MIPS_MAC(sum_2, x[0], y_2);
+            sum_3 = MIPS_MAC(sum_3, x[0], y[0]);
+            break;
+        case 1:
+            sum_0 = MIPS_MAC(sum_0, x[0], y_0);
+            sum_1 = MIPS_MAC(sum_1, x[0], y_1);
+            sum_2 = MIPS_MAC(sum_2, x[0], y_2);
+            sum_3 = MIPS_MAC(sum_3, x[0], y[0]);
+            break;
+        case 0:
+            break;
+    }
+
+    sum[0] = (oac_val32)sum_0;
+    sum[1] = (oac_val32)sum_1;
+    sum[2] = (oac_val32)sum_2;
+    sum[3] = (oac_val32)sum_3;
 }
 
-#define xcorr_kernel(x, y, sum, len, arch) \
-    ((void)(arch), xcorr_kernel_mips(x, y, sum, len))
+# define xcorr_kernel(x, y, sum, len, arch) \
+        ((void)(arch), xcorr_kernel_mips(x, y, sum, len))
 
-#undef accumulator_t
-#undef MIPS_MAC
+# undef accumulator_t
+# undef MIPS_MAC
 
 #endif /* OVERRIDE_XCORR_KERNEL */
 
diff --git a/celt/modes.c b/celt/modes.c
index 9cc911145..5a06ecd29 100644
--- a/celt/modes.c
+++ b/celt/modes.c
@@ -25,10 +25,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "celt.h"
@@ -41,7 +41,7 @@
 
 static const oac_int16 eband5ms[] = {
 /*0  200 400 600 800  1k 1.2 1.4 1.6  2k 2.4 2.8 3.2  4k 4.8 5.6 6.8  8k 9.6 12k 15.6 */
-  0,  1,  2,  3,  4,  5,  6,  7,  8, 10, 12, 14, 16, 20, 24, 28, 34, 40, 48, 60, 78, 100
+    0,  1,  2,  3,  4,  5,  6,  7,  8, 10, 12, 14, 16, 20, 24, 28, 34, 40, 48, 60, 78, 100
 };
 
 /* Alternate tuning (partially derived from Vorbis) */
@@ -49,415 +49,386 @@ static const oac_int16 eband5ms[] = {
 /* Bit allocation table in units of 1/32 bit/sample (0.1875 dB SNR) */
 static const unsigned char band_allocation[] = {
 /*0  200 400 600 800  1k 1.2 1.4 1.6  2k 2.4 2.8 3.2  4k 4.8 5.6 6.8  8k 9.6 12k 15.6 */
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 90, 80, 75, 69, 63, 56, 49, 40, 34, 29, 20, 18, 10,  0,  0,  0,  0,  0,  0,  0,  0,
-110,100, 90, 84, 78, 71, 65, 58, 51, 45, 39, 32, 26, 20, 12,  0,  0,  0,  0,  0,  0,
-118,110,103, 93, 86, 80, 75, 70, 65, 59, 53, 47, 40, 31, 23, 15,  4,  0,  0,  0,  0,
-126,119,112,104, 95, 89, 83, 78, 72, 66, 60, 54, 47, 39, 32, 25, 17, 12,  1,  0,  0,
-134,127,120,114,103, 97, 91, 85, 78, 72, 66, 60, 54, 47, 41, 35, 29, 23, 16, 10,  1,
-144,137,130,124,113,107,101, 95, 88, 82, 76, 70, 64, 57, 51, 45, 39, 33, 26, 15,  1,
-152,145,138,132,123,117,111,105, 98, 92, 86, 80, 74, 67, 61, 55, 49, 43, 36, 20,  1,
-162,155,148,142,133,127,121,115,108,102, 96, 90, 84, 77, 71, 65, 59, 53, 46, 30,  1,
-172,165,158,152,143,137,131,125,118,112,106,100, 94, 87, 81, 75, 69, 63, 56, 45, 20,
-200,200,200,200,200,200,200,200,198,193,188,183,178,173,168,163,158,153,148,129,104,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    90, 80, 75, 69, 63, 56, 49, 40, 34, 29, 20, 18, 10,  0,  0,  0,  0,  0,  0,  0,  0,
+    110, 100, 90, 84, 78, 71, 65, 58, 51, 45, 39, 32, 26, 20, 12,  0,  0,  0,  0,  0,  0,
+    118, 110, 103, 93, 86, 80, 75, 70, 65, 59, 53, 47, 40, 31, 23, 15,  4,  0,  0,  0,  0,
+    126, 119, 112, 104, 95, 89, 83, 78, 72, 66, 60, 54, 47, 39, 32, 25, 17, 12,  1,  0,  0,
+    134, 127, 120, 114, 103, 97, 91, 85, 78, 72, 66, 60, 54, 47, 41, 35, 29, 23, 16, 10,  1,
+    144, 137, 130, 124, 113, 107, 101, 95, 88, 82, 76, 70, 64, 57, 51, 45, 39, 33, 26, 15,  1,
+    152, 145, 138, 132, 123, 117, 111, 105, 98, 92, 86, 80, 74, 67, 61, 55, 49, 43, 36, 20,  1,
+    162, 155, 148, 142, 133, 127, 121, 115, 108, 102, 96, 90, 84, 77, 71, 65, 59, 53, 46, 30,  1,
+    172, 165, 158, 152, 143, 137, 131, 125, 118, 112, 106, 100, 94, 87, 81, 75, 69, 63, 56, 45, 20,
+    200, 200, 200, 200, 200, 200, 200, 200, 198, 193, 188, 183, 178, 173, 168, 163, 158, 153, 148, 129, 104,
 };
 
 #ifndef CUSTOM_MODES_ONLY
- #ifdef FIXED_POINT
-  #include "static_modes_fixed.h"
- #else
-  #include "static_modes_float.h"
- #endif
+# ifdef FIXED_POINT
+#  include "static_modes_fixed.h"
+# else
+#  include "static_modes_float.h"
+# endif
 #endif /* CUSTOM_MODES_ONLY */
 
 #ifndef M_PI
-#define M_PI 3.1415926535897931
+# define M_PI 3.1415926535897931
 #endif
 
 #ifdef CUSTOM_MODES
 
 /* Defining 25 critical bands for the full 0-20 kHz audio bandwidth
    Taken from http://ccrma.stanford.edu/~jos/bbt/Bark_Frequency_Scale.html */
-#define BARK_BANDS 25
-static const oac_int16 bark_freq[BARK_BANDS+1] = {
-      0,   100,   200,   300,   400,
+# define BARK_BANDS 25
+static const oac_int16 bark_freq[BARK_BANDS + 1] = {
+    0,   100,   200,   300,   400,
     510,   630,   770,   920,  1080,
-   1270,  1480,  1720,  2000,  2320,
-   2700,  3150,  3700,  4400,  5300,
-   6400,  7700,  9500, 12000, 15500,
-  20000};
-
-static oac_int16 *compute_ebands(oac_int32 Fs, int frame_size, int res, int *nbEBands)
-{
-   oac_int16 *eBands;
-   int i, j, lin, low, high, nBark, offset=0;
-
-   /* All modes that have 2.5 ms short blocks use the same definition */
-   if (Fs == 400*(oac_int32)frame_size)
-   {
-      *nbEBands = sizeof(eband5ms)/sizeof(eband5ms[0])-1;
-      eBands = oac_alloc(sizeof(oac_int16)*(*nbEBands+1));
-      for (i=0;i<*nbEBands+1;i++)
-         eBands[i] = eband5ms[i];
-      return eBands;
-   }
-   /* Find the number of critical bands supported by our sampling rate */
-   for (nBark=1;nBark<BARK_BANDS;nBark++)
-    if (bark_freq[nBark+1]*2 >= Fs)
-       break;
-
-   /* Find where the linear part ends (i.e. where the spacing is more than min_width */
-   for (lin=0;lin<nBark;lin++)
-      if (bark_freq[lin+1]-bark_freq[lin] >= res)
-         break;
-
-   low = (bark_freq[lin]+res/2)/res;
-   high = nBark-lin;
-   *nbEBands = low+high;
-   eBands = oac_alloc(sizeof(oac_int16)*(*nbEBands+2));
-
-   if (eBands==NULL)
-      return NULL;
-
-   /* Linear spacing (min_width) */
-   for (i=0;i<low;i++)
-      eBands[i] = i;
-   if (low>0)
-      offset = eBands[low-1]*res - bark_freq[lin-1];
-   /* Spacing follows critical bands */
-   for (i=0;i<high;i++)
-   {
-      int target = bark_freq[lin+i];
-      /* Round to an even value */
-      eBands[i+low] = (target+offset/2+res)/(2*res)*2;
-      offset = eBands[i+low]*res - target;
-   }
-   /* Enforce the minimum spacing at the boundary */
-   for (i=0;i<*nbEBands;i++)
-      if (eBands[i] < i)
-         eBands[i] = i;
-   /* Round to an even value */
-   eBands[*nbEBands] = (bark_freq[nBark]+res)/(2*res)*2;
-   if (eBands[*nbEBands] > frame_size)
-      eBands[*nbEBands] = frame_size;
-   for (i=1;i<*nbEBands-1;i++)
-   {
-      if (eBands[i+1]-eBands[i] < eBands[i]-eBands[i-1])
-      {
-         eBands[i] -= (2*eBands[i]-eBands[i-1]-eBands[i+1])/2;
-      }
-   }
-   /* Remove any empty bands. */
-   for (i=j=0;i<*nbEBands;i++)
-      if(eBands[i+1]>eBands[j])
-         eBands[++j]=eBands[i+1];
-   *nbEBands=j;
-
-   for (i=1;i<*nbEBands;i++)
-   {
-      /* Every band must be smaller than the last band. */
-      celt_assert(eBands[i]-eBands[i-1]<=eBands[*nbEBands]-eBands[*nbEBands-1]);
-      /* Each band must be no larger than twice the size of the previous one. */
-      celt_assert(eBands[i+1]-eBands[i]<=2*(eBands[i]-eBands[i-1]));
-   }
-
-   return eBands;
+    1270,  1480,  1720,  2000,  2320,
+    2700,  3150,  3700,  4400,  5300,
+    6400,  7700,  9500, 12000, 15500,
+    20000
+};
+
+static oac_int16 *compute_ebands(oac_int32 Fs, int frame_size, int res, int *nbEBands) {
+    oac_int16 *eBands;
+    int i, j, lin, low, high, nBark, offset = 0;
+
+    /* All modes that have 2.5 ms short blocks use the same definition */
+    if (Fs == 400*(oac_int32)frame_size) {
+        *nbEBands = sizeof(eband5ms)/sizeof(eband5ms[0]) - 1;
+        eBands = oac_alloc(sizeof(oac_int16)*(*nbEBands + 1));
+        for (i = 0; i < *nbEBands + 1; i++)
+            eBands[i] = eband5ms[i];
+        return eBands;
+    }
+    /* Find the number of critical bands supported by our sampling rate */
+    for (nBark = 1; nBark < BARK_BANDS; nBark++)
+        if (bark_freq[nBark + 1]*2 >= Fs)
+            break;
+
+    /* Find where the linear part ends (i.e. where the spacing is more than min_width */
+    for (lin = 0; lin < nBark; lin++)
+        if (bark_freq[lin + 1] - bark_freq[lin] >= res)
+            break;
+
+    low = (bark_freq[lin] + res/2)/res;
+    high = nBark - lin;
+    *nbEBands = low + high;
+    eBands = oac_alloc(sizeof(oac_int16)*(*nbEBands + 2));
+
+    if (eBands == NULL)
+        return NULL;
+
+    /* Linear spacing (min_width) */
+    for (i = 0; i < low; i++)
+        eBands[i] = i;
+    if (low > 0)
+        offset = eBands[low - 1]*res - bark_freq[lin - 1];
+    /* Spacing follows critical bands */
+    for (i = 0; i < high; i++) {
+        int target = bark_freq[lin + i];
+        /* Round to an even value */
+        eBands[i + low] = (target + offset/2 + res)/(2*res)*2;
+        offset = eBands[i + low]*res - target;
+    }
+    /* Enforce the minimum spacing at the boundary */
+    for (i = 0; i < *nbEBands; i++)
+        if (eBands[i] < i)
+            eBands[i] = i;
+    /* Round to an even value */
+    eBands[*nbEBands] = (bark_freq[nBark] + res)/(2*res)*2;
+    if (eBands[*nbEBands] > frame_size)
+        eBands[*nbEBands] = frame_size;
+    for (i = 1; i < *nbEBands - 1; i++) {
+        if (eBands[i + 1] - eBands[i] < eBands[i] - eBands[i - 1]) {
+            eBands[i] -= (2*eBands[i] - eBands[i - 1] - eBands[i + 1])/2;
+        }
+    }
+    /* Remove any empty bands. */
+    for (i = j = 0; i < *nbEBands; i++)
+        if (eBands[i + 1] > eBands[j])
+            eBands[++j] = eBands[i + 1];
+    *nbEBands = j;
+
+    for (i = 1; i < *nbEBands; i++) {
+        /* Every band must be smaller than the last band. */
+        celt_assert(eBands[i] - eBands[i - 1] <= eBands[*nbEBands] - eBands[*nbEBands - 1]);
+        /* Each band must be no larger than twice the size of the previous one. */
+        celt_assert(eBands[i + 1] - eBands[i] <= 2*(eBands[i] - eBands[i - 1]));
+    }
+
+    return eBands;
 }
 
-static void compute_allocation_table(CELTMode *mode)
-{
-   int i, j;
-   unsigned char *allocVectors;
-   int maxBands = sizeof(eband5ms)/sizeof(eband5ms[0])-1;
-
-   mode->nbAllocVectors = BITALLOC_SIZE;
-   allocVectors = oac_alloc(sizeof(unsigned char)*(BITALLOC_SIZE*mode->nbEBands));
-   if (allocVectors==NULL)
-   {
-      mode->allocVectors = NULL;
-      return;
-   }
-
-   /* Check for standard mode */
-   if (mode->Fs == 400*(oac_int32)mode->shortMdctSize)
-   {
-      for (i=0;i<BITALLOC_SIZE*mode->nbEBands;i++)
-         allocVectors[i] = band_allocation[i];
-      mode->allocVectors = allocVectors;
-      return;
-   }
-   /* If not the standard mode, interpolate */
-   /* Compute per-codec-band allocation from per-critical-band matrix */
-   for (i=0;i<BITALLOC_SIZE;i++)
-   {
-      for (j=0;j<mode->nbEBands;j++)
-      {
-         int k;
-         for (k=0;k<maxBands;k++)
-         {
-            if (400*(oac_int32)eband5ms[k] > mode->eBands[j]*(oac_int32)mode->Fs/mode->shortMdctSize)
-               break;
-         }
-         if (k>maxBands-1)
-            allocVectors[i*mode->nbEBands+j] = band_allocation[i*maxBands + maxBands-1];
-         else {
-            oac_int32 a0, a1;
-            a1 = mode->eBands[j]*(oac_int32)mode->Fs/mode->shortMdctSize - 400*(oac_int32)eband5ms[k-1];
-            a0 = 400*(oac_int32)eband5ms[k] - mode->eBands[j]*(oac_int32)mode->Fs/mode->shortMdctSize;
-            allocVectors[i*mode->nbEBands+j] = (a0*band_allocation[i*maxBands+k-1]
-                                             + a1*band_allocation[i*maxBands+k])/(a0+a1);
-         }
-      }
-   }
-
-   /*printf ("\n");
-   for (i=0;i<BITALLOC_SIZE;i++)
-   {
-      for (j=0;j<mode->nbEBands;j++)
-         printf ("%d ", allocVectors[i*mode->nbEBands+j]);
-      printf ("\n");
-   }
-   exit(0);*/
-
-   mode->allocVectors = allocVectors;
+static void compute_allocation_table(CELTMode *mode) {
+    int i, j;
+    unsigned char *allocVectors;
+    int maxBands = sizeof(eband5ms)/sizeof(eband5ms[0]) - 1;
+
+    mode->nbAllocVectors = BITALLOC_SIZE;
+    allocVectors = oac_alloc(sizeof(unsigned char)*(BITALLOC_SIZE*mode->nbEBands));
+    if (allocVectors == NULL) {
+        mode->allocVectors = NULL;
+        return;
+    }
+
+    /* Check for standard mode */
+    if (mode->Fs == 400*(oac_int32)mode->shortMdctSize) {
+        for (i = 0; i < BITALLOC_SIZE*mode->nbEBands; i++)
+            allocVectors[i] = band_allocation[i];
+        mode->allocVectors = allocVectors;
+        return;
+    }
+    /* If not the standard mode, interpolate */
+    /* Compute per-codec-band allocation from per-critical-band matrix */
+    for (i = 0; i < BITALLOC_SIZE; i++) {
+        for (j = 0; j < mode->nbEBands; j++) {
+            int k;
+            for (k = 0; k < maxBands; k++) {
+                if (400*(oac_int32)eband5ms[k] > mode->eBands[j]*(oac_int32)mode->Fs/mode->shortMdctSize)
+                    break;
+            }
+            if (k > maxBands - 1)
+                allocVectors[i*mode->nbEBands + j] = band_allocation[i*maxBands + maxBands - 1];
+            else {
+                oac_int32 a0, a1;
+                a1 = mode->eBands[j]*(oac_int32)mode->Fs/mode->shortMdctSize - 400*(oac_int32)eband5ms[k - 1];
+                a0 = 400*(oac_int32)eband5ms[k] - mode->eBands[j]*(oac_int32)mode->Fs/mode->shortMdctSize;
+                allocVectors[i*mode->nbEBands + j] = (a0*band_allocation[i*maxBands + k - 1]
+                                                      + a1*band_allocation[i*maxBands + k])/(a0 + a1);
+            }
+        }
+    }
+
+    /*printf ("\n");
+       for (i=0;i<BITALLOC_SIZE;i++)
+       {
+       for (j=0;j<mode->nbEBands;j++)
+          printf ("%d ", allocVectors[i*mode->nbEBands+j]);
+       printf ("\n");
+       }
+       exit(0);*/
+
+    mode->allocVectors = allocVectors;
 }
 
 #endif /* CUSTOM_MODES */
 
-CELTMode *oac_custom_mode_create(oac_int32 Fs, int frame_size, int *error)
-{
-   int i;
+CELTMode *oac_custom_mode_create(oac_int32 Fs, int frame_size, int *error) {
+    int i;
 #ifdef CUSTOM_MODES
-   CELTMode *mode=NULL;
-   int res;
-   celt_coef *window;
-   oac_int16 *logN;
-   int LM;
-   int arch = oac_select_arch();
-   ALLOC_STACK;
-#if !defined(VAR_ARRAYS) && !defined(USE_ALLOCA)
-   if (global_stack==NULL)
-      goto failure;
-#endif
+    CELTMode *mode = NULL;
+    int res;
+    celt_coef *window;
+    oac_int16 *logN;
+    int LM;
+    int arch = oac_select_arch();
+    ALLOC_STACK;
+# if !defined(VAR_ARRAYS) && !defined(USE_ALLOCA)
+    if (global_stack == NULL)
+        goto failure;
+# endif
 #endif
 
 #ifndef CUSTOM_MODES_ONLY
-   for (i=0;i<TOTAL_MODES;i++)
-   {
-      int j;
-      for (j=0;j<4;j++)
-      {
-         if (Fs == static_mode_list[i]->Fs &&
-               (frame_size<<j) == static_mode_list[i]->shortMdctSize*static_mode_list[i]->nbShortMdcts)
-         {
-            if (error)
-               *error = OAC_OK;
-            return (CELTMode*)static_mode_list[i];
-         }
-      }
-   }
+    for (i = 0; i < TOTAL_MODES; i++) {
+        int j;
+        for (j = 0; j < 4; j++) {
+            if (Fs == static_mode_list[i]->Fs
+                && (frame_size<<j) == static_mode_list[i]->shortMdctSize*static_mode_list[i]->nbShortMdcts) {
+                if (error)
+                    *error = OAC_OK;
+                return (CELTMode*)static_mode_list[i];
+            }
+        }
+    }
 #endif /* CUSTOM_MODES_ONLY */
 
 #ifndef CUSTOM_MODES
-   if (error)
-      *error = OAC_BAD_ARG;
-   return NULL;
-#else
-
-   /* The good thing here is that permutation of the arguments will automatically be invalid */
-
-   if (Fs < 8000 || Fs > 96000)
-   {
-      if (error)
-         *error = OAC_BAD_ARG;
-      return NULL;
-   }
-#ifdef ENABLE_QEXT
-   if (frame_size < 40 || frame_size > 2048 || frame_size%2!=0)
+    if (error)
+        *error = OAC_BAD_ARG;
+    return NULL;
 #else
-   if (frame_size < 40 || frame_size > 1024 || frame_size%2!=0)
-#endif
-   {
-      if (error)
-         *error = OAC_BAD_ARG;
-      return NULL;
-   }
-   /* Frames of less than 1ms are not supported. */
-   if ((oac_int32)frame_size*1000 < Fs)
-   {
-      if (error)
-         *error = OAC_BAD_ARG;
-      return NULL;
-   }
-
-   if ((oac_int32)frame_size*75 >= Fs && (frame_size%16)==0)
-   {
-     LM = 3;
-   } else if ((oac_int32)frame_size*150 >= Fs && (frame_size%8)==0)
-   {
-     LM = 2;
-   } else if ((oac_int32)frame_size*300 >= Fs && (frame_size%4)==0)
-   {
-     LM = 1;
-   } else
-   {
-     LM = 0;
-   }
-
-   /* Shorts longer than 3.3ms are not supported. */
-   if ((oac_int32)(frame_size>>LM)*300 > Fs)
-   {
-      if (error)
-         *error = OAC_BAD_ARG;
-      return NULL;
-   }
-
-   mode = oac_alloc(sizeof(CELTMode));
-   if (mode==NULL)
-      goto failure;
-   mode->Fs = Fs;
-
-   /* Pre/de-emphasis depends on sampling rate. The "standard" pre-emphasis
-      is defined as A(z) = 1 - 0.85*z^-1 at 48 kHz. Other rates should
-      approximate that. */
-#ifdef ENABLE_QEXT
-   if(Fs == 96000) /* 96 kHz */
-   {
-      mode->preemph[0] =  QCONST16(0.9230041504f, 15);
-      mode->preemph[1] =  QCONST16(0.2200012207f, 15);
-      mode->preemph[2] =  QCONST16(1.5128347184f, SIG_SHIFT); /* exact 1/preemph[3] */
-      mode->preemph[3] =  QCONST16(0.6610107422f, 13);
-   } else
-#endif
-   if(Fs < 12000) /* 8 kHz */
-   {
-      mode->preemph[0] =  QCONST16(0.3500061035f, 15);
-      mode->preemph[1] = -QCONST16(0.1799926758f, 15);
-      mode->preemph[2] =  QCONST16(0.2719968125f, SIG_SHIFT); /* exact 1/preemph[3] */
-      mode->preemph[3] =  QCONST16(3.6765136719f, 13);
-   } else if(Fs < 24000) /* 16 kHz */
-   {
-      mode->preemph[0] =  QCONST16(0.6000061035f, 15);
-      mode->preemph[1] = -QCONST16(0.1799926758f, 15);
-      mode->preemph[2] =  QCONST16(0.4424998650f, SIG_SHIFT); /* exact 1/preemph[3] */
-      mode->preemph[3] =  QCONST16(2.2598876953f, 13);
-   } else if(Fs < 40000) /* 32 kHz */
-   {
-      mode->preemph[0] =  QCONST16(0.7799987793f, 15);
-      mode->preemph[1] = -QCONST16(0.1000061035f, 15);
-      mode->preemph[2] =  QCONST16(0.7499771125f, SIG_SHIFT); /* exact 1/preemph[3] */
-      mode->preemph[3] =  QCONST16(1.3333740234f, 13);
-   } else /* 48 kHz */
-   {
-      mode->preemph[0] =  QCONST16(0.8500061035f, 15);
-      mode->preemph[1] =  QCONST16(0.0f, 15);
-      mode->preemph[2] =  QCONST16(1.f, SIG_SHIFT);
-      mode->preemph[3] =  QCONST16(1.f, 13);
-   }
-
-   mode->maxLM = LM;
-   mode->nbShortMdcts = 1<<LM;
-   mode->shortMdctSize = frame_size/mode->nbShortMdcts;
-   res = (mode->Fs+mode->shortMdctSize)/(2*mode->shortMdctSize);
-
-   mode->eBands = compute_ebands(Fs, mode->shortMdctSize, res, &mode->nbEBands);
-   if (mode->eBands==NULL)
-      goto failure;
-#if !defined(SMALL_FOOTPRINT)
-   /* Make sure we don't allocate a band larger than our PVQ table.
-      208 should be enough, but let's be paranoid. */
-   if ((mode->eBands[mode->nbEBands] - mode->eBands[mode->nbEBands-1])<<LM >
-    208) {
-       goto failure;
-   }
-#endif
-
-   mode->effEBands = mode->nbEBands;
-   while (mode->eBands[mode->effEBands] > mode->shortMdctSize)
-      mode->effEBands--;
-
-   /* Overlap must be divisible by 4 */
-   mode->overlap = ((mode->shortMdctSize>>2)<<2);
-
-   compute_allocation_table(mode);
-   if (mode->allocVectors==NULL)
-      goto failure;
-
-   window = (celt_coef*)oac_alloc(mode->overlap*sizeof(*window));
-   if (window==NULL)
-      goto failure;
 
-#ifndef FIXED_POINT
-   for (i=0;i<mode->overlap;i++)
-      window[i] = Q15ONE*sin(.5*M_PI* sin(.5*M_PI*(i+.5)/mode->overlap) * sin(.5*M_PI*(i+.5)/mode->overlap));
-#else
-   for (i=0;i<mode->overlap;i++)
-      window[i] = MIN32(2147483647, 2147483648*sin(.5*M_PI* sin(.5*M_PI*(i+.5)/mode->overlap) * sin(.5*M_PI*(i+.5)/mode->overlap)));
-#endif
-   mode->window = window;
-
-   logN = (oac_int16*)oac_alloc(mode->nbEBands*sizeof(oac_int16));
-   if (logN==NULL)
-      goto failure;
-
-   for (i=0;i<mode->nbEBands;i++)
-      logN[i] = log2_frac(mode->eBands[i+1]-mode->eBands[i], BITRES);
-   mode->logN = logN;
-
-   compute_pulse_cache(mode, mode->maxLM);
-
-   if (clt_mdct_init(&mode->mdct, 2*mode->shortMdctSize*mode->nbShortMdcts,
+    /* The good thing here is that permutation of the arguments will automatically be invalid */
+
+    if (Fs < 8000 || Fs > 96000) {
+        if (error)
+            *error = OAC_BAD_ARG;
+        return NULL;
+    }
+# ifdef ENABLE_QEXT
+    if (frame_size < 40 || frame_size > 2048 || frame_size%2 != 0)
+# else
+    if (frame_size < 40 || frame_size > 1024 || frame_size%2 != 0)
+# endif
+    {
+        if (error)
+            *error = OAC_BAD_ARG;
+        return NULL;
+    }
+    /* Frames of less than 1ms are not supported. */
+    if ((oac_int32)frame_size*1000 < Fs) {
+        if (error)
+            *error = OAC_BAD_ARG;
+        return NULL;
+    }
+
+    if ((oac_int32)frame_size*75 >= Fs && (frame_size%16) == 0) {
+        LM = 3;
+    } else if ((oac_int32)frame_size*150 >= Fs && (frame_size%8) == 0) {
+        LM = 2;
+    } else if ((oac_int32)frame_size*300 >= Fs && (frame_size%4) == 0) {
+        LM = 1;
+    } else {
+        LM = 0;
+    }
+
+    /* Shorts longer than 3.3ms are not supported. */
+    if ((oac_int32)(frame_size>>LM)*300 > Fs) {
+        if (error)
+            *error = OAC_BAD_ARG;
+        return NULL;
+    }
+
+    mode = oac_alloc(sizeof(CELTMode));
+    if (mode == NULL)
+        goto failure;
+    mode->Fs = Fs;
+
+    /* Pre/de-emphasis depends on sampling rate. The "standard" pre-emphasis
+       is defined as A(z) = 1 - 0.85*z^-1 at 48 kHz. Other rates should
+       approximate that. */
+# ifdef ENABLE_QEXT
+    if (Fs == 96000) { /* 96 kHz */
+        mode->preemph[0] =  QCONST16(0.9230041504f, 15);
+        mode->preemph[1] =  QCONST16(0.2200012207f, 15);
+        mode->preemph[2] =  QCONST16(1.5128347184f, SIG_SHIFT);/* exact 1/preemph[3] */
+        mode->preemph[3] =  QCONST16(0.6610107422f, 13);
+    } else
+# endif
+    if (Fs < 12000) { /* 8 kHz */
+        mode->preemph[0] =  QCONST16(0.3500061035f, 15);
+        mode->preemph[1] = -QCONST16(0.1799926758f, 15);
+        mode->preemph[2] =  QCONST16(0.2719968125f, SIG_SHIFT);/* exact 1/preemph[3] */
+        mode->preemph[3] =  QCONST16(3.6765136719f, 13);
+    } else if (Fs < 24000) { /* 16 kHz */
+        mode->preemph[0] =  QCONST16(0.6000061035f, 15);
+        mode->preemph[1] = -QCONST16(0.1799926758f, 15);
+        mode->preemph[2] =  QCONST16(0.4424998650f, SIG_SHIFT);/* exact 1/preemph[3] */
+        mode->preemph[3] =  QCONST16(2.2598876953f, 13);
+    } else if (Fs < 40000) { /* 32 kHz */
+        mode->preemph[0] =  QCONST16(0.7799987793f, 15);
+        mode->preemph[1] = -QCONST16(0.1000061035f, 15);
+        mode->preemph[2] =  QCONST16(0.7499771125f, SIG_SHIFT);/* exact 1/preemph[3] */
+        mode->preemph[3] =  QCONST16(1.3333740234f, 13);
+    } else { /* 48 kHz */
+        mode->preemph[0] =  QCONST16(0.8500061035f, 15);
+        mode->preemph[1] =  QCONST16(0.0f, 15);
+        mode->preemph[2] =  QCONST16(1.f, SIG_SHIFT);
+        mode->preemph[3] =  QCONST16(1.f, 13);
+    }
+
+    mode->maxLM = LM;
+    mode->nbShortMdcts = 1<<LM;
+    mode->shortMdctSize = frame_size/mode->nbShortMdcts;
+    res = (mode->Fs + mode->shortMdctSize)/(2*mode->shortMdctSize);
+
+    mode->eBands = compute_ebands(Fs, mode->shortMdctSize, res, &mode->nbEBands);
+    if (mode->eBands == NULL)
+        goto failure;
+# if !defined(SMALL_FOOTPRINT)
+    /* Make sure we don't allocate a band larger than our PVQ table.
+       208 should be enough, but let's be paranoid. */
+    if ((mode->eBands[mode->nbEBands] - mode->eBands[mode->nbEBands - 1])<<LM >
+        208) {
+        goto failure;
+    }
+# endif
+
+    mode->effEBands = mode->nbEBands;
+    while (mode->eBands[mode->effEBands] > mode->shortMdctSize)
+        mode->effEBands--;
+
+    /* Overlap must be divisible by 4 */
+    mode->overlap = ((mode->shortMdctSize>>2)<<2);
+
+    compute_allocation_table(mode);
+    if (mode->allocVectors == NULL)
+        goto failure;
+
+    window = (celt_coef*)oac_alloc(mode->overlap*sizeof(*window));
+    if (window == NULL)
+        goto failure;
+
+# ifndef FIXED_POINT
+    for (i = 0; i < mode->overlap; i++)
+        window[i] = Q15ONE*sin(.5*M_PI*sin(.5*M_PI*(i + .5)/mode->overlap)*sin(.5*M_PI*(i + .5)/mode->overlap));
+# else
+    for (i = 0; i < mode->overlap; i++)
+        window[i] = MIN32(2147483647,
+        2147483648*sin(.5*M_PI*sin(.5*M_PI*(i + .5)/mode->overlap)*sin(.5*M_PI*(i + .5)/mode->overlap)));
+# endif
+    mode->window = window;
+
+    logN = (oac_int16*)oac_alloc(mode->nbEBands*sizeof(oac_int16));
+    if (logN == NULL)
+        goto failure;
+
+    for (i = 0; i < mode->nbEBands; i++)
+        logN[i] = log2_frac(mode->eBands[i + 1] - mode->eBands[i], BITRES);
+    mode->logN = logN;
+
+    compute_pulse_cache(mode, mode->maxLM);
+
+    if (clt_mdct_init(&mode->mdct, 2*mode->shortMdctSize*mode->nbShortMdcts,
            mode->maxLM, arch) == 0)
-      goto failure;
+        goto failure;
 
-   if (error)
-      *error = OAC_OK;
+    if (error)
+        *error = OAC_OK;
 
-   return mode;
+    return mode;
 failure:
-   if (error)
-      *error = OAC_ALLOC_FAIL;
-   if (mode!=NULL)
-      oac_custom_mode_destroy(mode);
-   return NULL;
+    if (error)
+        *error = OAC_ALLOC_FAIL;
+    if (mode != NULL)
+        oac_custom_mode_destroy(mode);
+    return NULL;
 #endif /* !CUSTOM_MODES */
 }
 
 #if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
-void oac_custom_mode_destroy(CELTMode *mode)
-{
-   int arch = oac_select_arch();
-
-   if (mode == NULL)
-      return;
-#ifndef CUSTOM_MODES_ONLY
-   {
-     int i;
-     for (i=0;i<TOTAL_MODES;i++)
-     {
-        if (mode == static_mode_list[i])
-        {
-           return;
+void oac_custom_mode_destroy(CELTMode *mode) {
+    int arch = oac_select_arch();
+
+    if (mode == NULL)
+        return;
+# ifndef CUSTOM_MODES_ONLY
+    {
+        int i;
+        for (i = 0; i < TOTAL_MODES; i++) {
+            if (mode == static_mode_list[i]) {
+                return;
+            }
         }
-     }
-   }
-#endif /* CUSTOM_MODES_ONLY */
-#ifdef CUSTOM_MODES
-   oac_free((oac_int16*)mode->eBands);
-   oac_free((unsigned char*)mode->allocVectors);
-
-   oac_free((oac_val16*)mode->window);
-   oac_free((oac_int16*)mode->logN);
-
-   oac_free((oac_int16*)mode->cache.index);
-   oac_free((unsigned char*)mode->cache.bits);
-   oac_free((unsigned char*)mode->cache.caps);
-   clt_mdct_clear(&mode->mdct, arch);
-
-   oac_free((CELTMode *)mode);
-#else
-   (void)arch;
-   celt_assert(0);
-#endif
+    }
+# endif /* CUSTOM_MODES_ONLY */
+# ifdef CUSTOM_MODES
+    oac_free((oac_int16*)mode->eBands);
+    oac_free((unsigned char*)mode->allocVectors);
+
+    oac_free((oac_val16*)mode->window);
+    oac_free((oac_int16*)mode->logN);
+
+    oac_free((oac_int16*)mode->cache.index);
+    oac_free((unsigned char*)mode->cache.bits);
+    oac_free((unsigned char*)mode->cache.caps);
+    clt_mdct_clear(&mode->mdct, arch);
+
+    oac_free((CELTMode *)mode);
+# else
+    (void)arch;
+    celt_assert(0);
+# endif
 }
 #endif
diff --git a/celt/modes.h b/celt/modes.h
index 8c45f72dd..a8dd5f9c8 100644
--- a/celt/modes.h
+++ b/celt/modes.h
@@ -25,7 +25,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef MODES_H
 #define MODES_H
@@ -42,35 +42,35 @@
 #define DEC_PITCH_BUF_SIZE 2048
 
 typedef struct {
-   int size;
-   const oac_int16 *index;
-   const unsigned char *bits;
-   const unsigned char *caps;
+    int size;
+    const oac_int16 *index;
+    const unsigned char *bits;
+    const unsigned char *caps;
 } PulseCache;
 
 /** Mode definition (opaque)
- @brief Mode definition
+   @brief Mode definition
  */
 struct OacCustomMode {
-   oac_int32 Fs;
-   int          overlap;
+    oac_int32 Fs;
+    int overlap;
 
-   int          nbEBands;
-   int          effEBands;
-   oac_val16    preemph[4];
-   const oac_int16   *eBands;   /**< Definition for each "pseudo-critical band" */
+    int nbEBands;
+    int effEBands;
+    oac_val16 preemph[4];
+    const oac_int16   *eBands;  /**< Definition for each "pseudo-critical band" */
 
-   int         maxLM;
-   int         nbShortMdcts;
-   int         shortMdctSize;
+    int maxLM;
+    int nbShortMdcts;
+    int shortMdctSize;
 
-   int          nbAllocVectors; /**< Number of lines in the matrix below */
-   const unsigned char   *allocVectors;   /**< Number of bits in each band for several rates */
-   const oac_int16 *logN;
+    int nbAllocVectors;         /**< Number of lines in the matrix below */
+    const unsigned char   *allocVectors;  /**< Number of bits in each band for several rates */
+    const oac_int16 *logN;
 
-   const celt_coef *window;
-   mdct_lookup mdct;
-   PulseCache cache;
+    const celt_coef *window;
+    mdct_lookup mdct;
+    PulseCache cache;
 };
 
 
diff --git a/celt/oac_custom_demo.c b/celt/oac_custom_demo.c
index e1a14459e..f50dd660a 100644
--- a/celt/oac_custom_demo.c
+++ b/celt/oac_custom_demo.c
@@ -24,10 +24,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "oac_custom.h"
@@ -40,48 +40,49 @@
 
 #define MAX_PACKET 1275
 
-static OAC_INLINE void _oac_ctl_failed(const char *file, int line)
-{
-   fprintf(stderr, "\n ***************************************************\n");
-   fprintf(stderr, " ***         A fatal error was detected.         ***\n");
-   fprintf(stderr, " ***************************************************\n");
-   fprintf(stderr, "En/decoder ctl function %s failed at %d for %s.\n",
+static OAC_INLINE void _oac_ctl_failed(const char *file, int line) {
+    fprintf(stderr, "\n ***************************************************\n");
+    fprintf(stderr, " ***         A fatal error was detected.         ***\n");
+    fprintf(stderr, " ***************************************************\n");
+    fprintf(stderr, "En/decoder ctl function %s failed at %d for %s.\n",
            file, line, oac_get_version_string());
 }
 
 #define oac_ctl_failed() _oac_ctl_failed(__FILE__, __LINE__);
 
 static void print_usage(char **argv) {
-   fprintf (stderr, "Usage: %s [-e | -d] <rate> <channels> <frame size> "
+    fprintf (stderr, "Usage: %s [-e | -d] <rate> <channels> <frame size> "
                   " [<bytes per packet>] [options] "
                   "<input> <output>\n", argv[0]);
-   fprintf (stderr, "     -e encode only (default is encode and decode)\n");
-   fprintf (stderr, "     -d decode only (default is encode and decode)\n");
-   fprintf (stderr, "     <bytes per packet>: required only when encoding\n");
-   fprintf (stderr, "options:\n");
-   fprintf (stderr, "     -16                      format is 16-bit little-endian (default)\n");
-   fprintf (stderr, "     -24                      format is 24-bit little-endian\n");
-   fprintf (stderr, "     -f32                     format is 32-bit float little-endian\n");
-   fprintf (stderr, "     -complexity <0-10>       optional only when encoding\n");
-   fprintf (stderr, "     -loss <percentage>       encoding (robsutness setting) and decoding (simulating loss)\n");
+    fprintf (stderr, "     -e encode only (default is encode and decode)\n");
+    fprintf (stderr, "     -d decode only (default is encode and decode)\n");
+    fprintf (stderr, "     <bytes per packet>: required only when encoding\n");
+    fprintf (stderr, "options:\n");
+    fprintf (stderr, "     -16                      format is 16-bit little-endian (default)\n");
+    fprintf (stderr, "     -24                      format is 24-bit little-endian\n");
+    fprintf (stderr, "     -f32                     format is 32-bit float little-endian\n");
+    fprintf (stderr, "     -complexity <0-10>       optional only when encoding\n");
+    fprintf (stderr, "     -loss <percentage>       encoding (robsutness setting) and decoding (simulating loss)\n");
 }
 
-static void int_to_char(oac_uint32 i, unsigned char ch[4])
-{
+static void int_to_char(oac_uint32 i, unsigned char ch[4]) {
     ch[0] = i>>24;
     ch[1] = (i>>16)&0xFF;
     ch[2] = (i>>8)&0xFF;
     ch[3] = i&0xFF;
 }
 
-static oac_uint32 char_to_int(unsigned char ch[4])
-{
-    return ((oac_uint32)ch[0]<<24) | ((oac_uint32)ch[1]<<16)
-         | ((oac_uint32)ch[2]<< 8) |  (oac_uint32)ch[3];
+static oac_uint32 char_to_int(unsigned char ch[4]) {
+    return ((oac_uint32)ch[0]<<24)|((oac_uint32)ch[1]<<16)
+           |((oac_uint32)ch[2]<<8)|(oac_uint32)ch[3];
 }
 
-#define check_encoder_option(decode_only, opt) do {if (decode_only) {fprintf(stderr, "option %s is only for encoding\n", opt); goto failure;}} while(0)
-#define check_decoder_option(encode_only, opt) do {if (encode_only) {fprintf(stderr, "option %s is only for decoding\n", opt); goto failure;}} while(0)
+#define check_encoder_option(decode_only, \
+                             opt) do {if (decode_only) {fprintf(stderr, "option %s is only for encoding\n", opt); \
+                                                        goto failure;}} while (0)
+#define check_decoder_option(encode_only, \
+                             opt) do {if (encode_only) {fprintf(stderr, "option %s is only for decoding\n", opt); \
+                                                        goto failure;}} while (0)
 
 #define FORMAT_S16_LE 0
 #define FORMAT_S24_LE 1
@@ -95,397 +96,364 @@ typedef union {
 } float_bits;
 
 
-int main(int argc, char *argv[])
-{
-   int err;
-   int ret=1;
-   int args;
-   oac_uint32 enc_final_range;
-   oac_uint32 dec_final_range;
-   int encode_only=0, decode_only=0;
-   char *inFile, *outFile;
-   FILE *fin=NULL, *fout=NULL;
-   OacCustomMode *mode=NULL;
-   OacCustomEncoder *enc=NULL;
-   OacCustomDecoder *dec=NULL;
-   int len;
-   oac_int32 frame_size, channels, rate;
-   int format=FORMAT_S16_LE;
-   int bytes_per_packet=0;
-   unsigned char data[MAX_PACKET];
-   int complexity=-1;
-   float percent_loss = -1;
-   int i;
+int main(int argc, char *argv[]) {
+    int err;
+    int ret = 1;
+    int args;
+    oac_uint32 enc_final_range;
+    oac_uint32 dec_final_range;
+    int encode_only = 0, decode_only = 0;
+    char *inFile, *outFile;
+    FILE *fin = NULL, *fout = NULL;
+    OacCustomMode *mode = NULL;
+    OacCustomEncoder *enc = NULL;
+    OacCustomDecoder *dec = NULL;
+    int len;
+    oac_int32 frame_size, channels, rate;
+    int format = FORMAT_S16_LE;
+    int bytes_per_packet = 0;
+    unsigned char data[MAX_PACKET];
+    int complexity = -1;
+    float percent_loss = -1;
+    int i;
 #if !(defined (FIXED_POINT) && !defined(CUSTOM_MODES)) && defined(RESYNTH)
-   double rmsd = 0;
+    double rmsd = 0;
 #endif
-   int count = 0;
-   oac_int32 skip;
-   oac_int32 *in=NULL, *out=NULL;
-   unsigned char *fbytes=NULL;
-   args = 1;
-   if (argc < 7)
-   {
-      print_usage(argv);
-      goto failure;
-   }
-   if (strcmp(argv[args], "-e")==0)
-   {
-      encode_only = 1;
-      args++;
-   } else if (strcmp(argv[args], "-d")==0)
-   {
-      decode_only = 1;
-      args++;
-   }
+    int count = 0;
+    oac_int32 skip;
+    oac_int32 *in = NULL, *out = NULL;
+    unsigned char *fbytes = NULL;
+    args = 1;
+    if (argc < 7) {
+        print_usage(argv);
+        goto failure;
+    }
+    if (strcmp(argv[args], "-e") == 0) {
+        encode_only = 1;
+        args++;
+    } else if (strcmp(argv[args], "-d") == 0) {
+        decode_only = 1;
+        args++;
+    }
 
-   rate = (oac_int32)atol(argv[args]);
-   args++;
+    rate = (oac_int32)atol(argv[args]);
+    args++;
 
-   if (rate != 8000 && rate != 12000
-    && rate != 16000 && rate != 24000
-    && rate != 48000
+    if (rate != 8000 && rate != 12000
+        && rate != 16000 && rate != 24000
+        && rate != 48000
 #ifdef ENABLE_QEXT
-    && rate != 96000
+        && rate != 96000
 #endif
-    )
-   {
-       fprintf(stderr, "Supported sampling rates are 8000, 12000, 16000, 24000"
+        ) {
+        fprintf(stderr, "Supported sampling rates are 8000, 12000, 16000, 24000"
 #ifdef ENABLE_QEXT
                ", 48000 and 96000.\n");
 #else
                " and 48000.\n");
 #endif
-       goto failure;
-   }
+        goto failure;
+    }
 
-   channels = atoi(argv[args]);
-   args++;
+    channels = atoi(argv[args]);
+    args++;
 
-   if (channels < 1 || channels > 2)
-   {
-       fprintf(stderr, "Oac_demo supports only 1 or 2 channels.\n");
-       goto failure;
-   }
+    if (channels < 1 || channels > 2) {
+        fprintf(stderr, "Oac_demo supports only 1 or 2 channels.\n");
+        goto failure;
+    }
 
-   frame_size = atoi(argv[args]);
-   args++;
+    frame_size = atoi(argv[args]);
+    args++;
 
-   if (!decode_only)
-   {
-      bytes_per_packet = (oac_int32)atol(argv[args]);
-      args++;
-      if (bytes_per_packet < 0 || bytes_per_packet > MAX_PACKET)
-      {
-         fprintf (stderr, "bytes per packet must be between 0 and %d\n",
+    if (!decode_only) {
+        bytes_per_packet = (oac_int32)atol(argv[args]);
+        args++;
+        if (bytes_per_packet < 0 || bytes_per_packet > MAX_PACKET) {
+            fprintf (stderr, "bytes per packet must be between 0 and %d\n",
                            MAX_PACKET);
-         goto failure;
-      }
-   }
+            goto failure;
+        }
+    }
 
-   mode = oac_custom_mode_create(rate, frame_size, NULL);
-   if (mode == NULL)
-   {
-      fprintf(stderr, "failed to create a mode\n");
-      goto failure;
-   }
-   while( args < argc - 2 ) {
-       /* process command line options */
-       if( strcmp( argv[ args ], "-complexity" ) == 0 ) {
-           check_encoder_option(decode_only, "-complexity");
-           args++;
-           complexity=atoi(argv[args]);
-           args++;
-       } else if( strcmp( argv[ args ], "-loss" ) == 0 ) {
-          args++;
-          percent_loss = atof(argv[args]);
-          args++;
-       } else if( strcmp( argv[ args ], "-16" ) == 0 ) {
-          format = FORMAT_S16_LE;
-          args++;
-       } else if( strcmp( argv[ args ], "-24" ) == 0 ) {
-          format = FORMAT_S24_LE;
-          args++;
-       } else if( strcmp( argv[ args ], "-f32" ) == 0 ) {
-          format = FORMAT_F32_LE;
-          args++;
-       } else {
-          printf( "Error: unrecognized setting: %s\n\n", argv[ args ] );
-          print_usage( argv );
-          goto failure;
-      }
-   }
-   if (!decode_only) {
-      enc = oac_custom_encoder_create(mode, channels, &err);
-      if (err != 0)
-      {
-         fprintf(stderr, "Failed to create the encoder: %s\n", oac_strerror(err));
-         goto failure;
-      }
-      if (complexity >= 0)
-      {
-         if(oac_custom_encoder_ctl(
-                  enc, OAC_SET_COMPLEXITY(complexity)) != OAC_OK) {
-            oac_ctl_failed();
+    mode = oac_custom_mode_create(rate, frame_size, NULL);
+    if (mode == NULL) {
+        fprintf(stderr, "failed to create a mode\n");
+        goto failure;
+    }
+    while (args < argc - 2) {
+        /* process command line options */
+        if (strcmp( argv[ args ], "-complexity" ) == 0) {
+            check_encoder_option(decode_only, "-complexity");
+            args++;
+            complexity = atoi(argv[args]);
+            args++;
+        } else if (strcmp( argv[ args ], "-loss" ) == 0) {
+            args++;
+            percent_loss = atof(argv[args]);
+            args++;
+        } else if (strcmp( argv[ args ], "-16" ) == 0) {
+            format = FORMAT_S16_LE;
+            args++;
+        } else if (strcmp( argv[ args ], "-24" ) == 0) {
+            format = FORMAT_S24_LE;
+            args++;
+        } else if (strcmp( argv[ args ], "-f32" ) == 0) {
+            format = FORMAT_F32_LE;
+            args++;
+        } else {
+            printf( "Error: unrecognized setting: %s\n\n", argv[ args ] );
+            print_usage( argv );
             goto failure;
-         }
-      }
-      if (percent_loss >= 0) {
-         if(oac_custom_encoder_ctl(
+        }
+    }
+    if (!decode_only) {
+        enc = oac_custom_encoder_create(mode, channels, &err);
+        if (err != 0) {
+            fprintf(stderr, "Failed to create the encoder: %s\n", oac_strerror(err));
+            goto failure;
+        }
+        if (complexity >= 0) {
+            if (oac_custom_encoder_ctl(
+                  enc, OAC_SET_COMPLEXITY(complexity)) != OAC_OK) {
+                oac_ctl_failed();
+                goto failure;
+            }
+        }
+        if (percent_loss >= 0) {
+            if (oac_custom_encoder_ctl(
                   enc, OAC_SET_PACKET_LOSS_PERC((int)percent_loss)) !=
-                        OAC_OK) {
+                OAC_OK) {
+                oac_ctl_failed();
+                goto failure;
+            }
+        }
+    }
+    if (!encode_only) {
+        dec = oac_custom_decoder_create(mode, channels, &err);
+        if (err != 0) {
+            fprintf(stderr, "Failed to create the decoder: %s\n", oac_strerror(err));
+            goto failure;
+        }
+        if (oac_custom_decoder_ctl(dec, OAC_GET_LOOKAHEAD(&skip)) != OAC_OK) {
             oac_ctl_failed();
             goto failure;
-         }
-      }
-   }
-   if (!encode_only) {
-      dec = oac_custom_decoder_create(mode, channels, &err);
-      if (err != 0)
-      {
-         fprintf(stderr, "Failed to create the decoder: %s\n", oac_strerror(err));
-         goto failure;
-      }
-      if(oac_custom_decoder_ctl(dec, OAC_GET_LOOKAHEAD(&skip)) != OAC_OK) {
-         oac_ctl_failed();
-         goto failure;
-      }
-   }
-   if (argc-args != 2)
-   {
-      print_usage(argv);
-      goto failure;
-   }
-   inFile = argv[argc-2];
-   fin = fopen(inFile, "rb");
-   if (!fin)
-   {
-      fprintf (stderr, "Could not open input file %s\n", argv[argc-2]);
-      goto failure;
-   }
-   outFile = argv[argc-1];
-   fout = fopen(outFile, "wb+");
-   if (!fout)
-   {
-      fprintf (stderr, "Could not open output file %s\n", argv[argc-1]);
-      goto failure;
-   }
-   in = (oac_int32*)malloc(frame_size*channels*sizeof(oac_int32));
-   out = (oac_int32*)malloc(frame_size*channels*sizeof(oac_int32));
-   fbytes = (unsigned char*)malloc(frame_size*channels*4);
+        }
+    }
+    if (argc - args != 2) {
+        print_usage(argv);
+        goto failure;
+    }
+    inFile = argv[argc - 2];
+    fin = fopen(inFile, "rb");
+    if (!fin) {
+        fprintf (stderr, "Could not open input file %s\n", argv[argc - 2]);
+        goto failure;
+    }
+    outFile = argv[argc - 1];
+    fout = fopen(outFile, "wb+");
+    if (!fout) {
+        fprintf (stderr, "Could not open output file %s\n", argv[argc - 1]);
+        goto failure;
+    }
+    in = (oac_int32*)malloc(frame_size*channels*sizeof(oac_int32));
+    out = (oac_int32*)malloc(frame_size*channels*sizeof(oac_int32));
+    fbytes = (unsigned char*)malloc(frame_size*channels*4);
 
-   while (!feof(fin))
-   {
-      int lost = 0;
-      if (decode_only)
-      {
-          unsigned char ch[4];
-          size_t num_read = fread(ch, 1, 4, fin);
-          if (num_read!=4)
-              break;
-          len = char_to_int(ch);
-          if (len>MAX_PACKET || len<0)
-          {
-              fprintf(stderr, "Invalid payload length: %d\n",len);
-              break;
-          }
-          num_read = fread(ch, 1, 4, fin);
-          if (num_read!=4)
-              break;
-          enc_final_range = char_to_int(ch);
-          num_read = fread(data, 1, len, fin);
-          if (num_read!=(size_t)len)
-          {
-              fprintf(stderr, "Ran out of input, "
-                              "expecting %d bytes got %d\n",
-                              len,(int)num_read);
-              break;
-          }
-      } else {
-         err = fread(fbytes, format_size[format], frame_size*channels, fin);
-         if (feof(fin))
-            break;
-         if (format == FORMAT_S16_LE) {
-            for(i=0;i<frame_size*channels;i++)
-            {
-               oac_int32 s;
-               s=fbytes[2*i+1]<<8|fbytes[2*i];
-               s=((s&0xFFFF)^0x8000)-0x8000;
-               in[i]=s*256;
+    while (!feof(fin)) {
+        int lost = 0;
+        if (decode_only) {
+            unsigned char ch[4];
+            size_t num_read = fread(ch, 1, 4, fin);
+            if (num_read != 4)
+                break;
+            len = char_to_int(ch);
+            if (len > MAX_PACKET || len < 0) {
+                fprintf(stderr, "Invalid payload length: %d\n", len);
+                break;
             }
-         } else if (format == FORMAT_S24_LE) {
-            for(i=0;i<frame_size*channels;i++)
-            {
-               oac_int32 s;
-               s=fbytes[3*i+2]<<16|fbytes[3*i+1]<<8|fbytes[3*i];
-               s=((s&0xFFFFFF)^0x800000)-0x800000;
-               in[i]=s;
+            num_read = fread(ch, 1, 4, fin);
+            if (num_read != 4)
+                break;
+            enc_final_range = char_to_int(ch);
+            num_read = fread(data, 1, len, fin);
+            if (num_read != (size_t)len) {
+                fprintf(stderr, "Ran out of input, "
+                              "expecting %d bytes got %d\n",
+                              len, (int)num_read);
+                break;
             }
-         } else if (format == FORMAT_F32_LE) {
-            for(i=0;i<frame_size*channels;i++)
-            {
-               float_bits s;
-               s.i=(unsigned)fbytes[4*i+3]<<24|fbytes[4*i+2]<<16|fbytes[4*i+1]<<8|fbytes[4*i];
-               in[i]=(int)floor(.5 + s.f*8388608);
+        } else {
+            err = fread(fbytes, format_size[format], frame_size*channels, fin);
+            if (feof(fin))
+                break;
+            if (format == FORMAT_S16_LE) {
+                for (i = 0; i < frame_size*channels; i++) {
+                    oac_int32 s;
+                    s = fbytes[2*i + 1]<<8|fbytes[2*i];
+                    s = ((s&0xFFFF)^0x8000) - 0x8000;
+                    in[i] = s*256;
+                }
+            } else if (format == FORMAT_S24_LE) {
+                for (i = 0; i < frame_size*channels; i++) {
+                    oac_int32 s;
+                    s = fbytes[3*i + 2]<<16|fbytes[3*i + 1]<<8|fbytes[3*i];
+                    s = ((s&0xFFFFFF)^0x800000) - 0x800000;
+                    in[i] = s;
+                }
+            } else if (format == FORMAT_F32_LE) {
+                for (i = 0; i < frame_size*channels; i++) {
+                    float_bits s;
+                    s.i = (unsigned)fbytes[4*i + 3]<<24|fbytes[4*i + 2]<<16|fbytes[4*i + 1]<<8|fbytes[4*i];
+                    in[i] = (int)floor(.5 + s.f*8388608);
+                }
             }
-         }
-         len = oac_custom_encode24(enc, in, frame_size, data, bytes_per_packet);
-         if (oac_custom_encoder_ctl(
+            len = oac_custom_encode24(enc, in, frame_size, data, bytes_per_packet);
+            if (oac_custom_encoder_ctl(
                    enc, OAC_GET_FINAL_RANGE(&enc_final_range)) != OAC_OK) {
-            oac_ctl_failed();
-            goto failure;
-         }
-         if (len <= 0)
-            fprintf (stderr, "oac_custom_encode() failed: %s\n", oac_strerror(len));
-      }
+                oac_ctl_failed();
+                goto failure;
+            }
+            if (len <= 0)
+                fprintf (stderr, "oac_custom_encode() failed: %s\n", oac_strerror(len));
+        }
 
-      if (encode_only)
-      {
-          unsigned char int_field[4];
-          int_to_char(len, int_field);
-          if (fwrite(int_field, 1, 4, fout) != 4) {
-             fprintf(stderr, "Error writing.\n");
-             goto failure;
-          }
-          int_to_char(enc_final_range, int_field);
-          if (fwrite(int_field, 1, 4, fout) != 4) {
-             fprintf(stderr, "Error writing.\n");
-             goto failure;
-          }
-          if (fwrite(data, 1, len, fout) != (unsigned)len) {
-             fprintf(stderr, "Error writing.\n");
-             goto failure;
-          }
-      } else {
-         /* This is for simulating bit errors */
+        if (encode_only) {
+            unsigned char int_field[4];
+            int_to_char(len, int_field);
+            if (fwrite(int_field, 1, 4, fout) != 4) {
+                fprintf(stderr, "Error writing.\n");
+                goto failure;
+            }
+            int_to_char(enc_final_range, int_field);
+            if (fwrite(int_field, 1, 4, fout) != 4) {
+                fprintf(stderr, "Error writing.\n");
+                goto failure;
+            }
+            if (fwrite(data, 1, len, fout) != (unsigned)len) {
+                fprintf(stderr, "Error writing.\n");
+                goto failure;
+            }
+        } else {
+            /* This is for simulating bit errors */
 #if 0
-         int errors = 0;
-         int eid = 0;
-         /* This simulates random bit error */
-         for (i=0;i<len*8;i++)
-         {
-            if (rand()%atoi(argv[8])==0)
-            {
-               if (i<64)
-               {
-                  errors++;
-                  eid = i;
-               }
-               data[i/8] ^= 1<<(7-(i%8));
+            int errors = 0;
+            int eid = 0;
+            /* This simulates random bit error */
+            for (i = 0; i < len*8; i++) {
+                if (rand()%atoi(argv[8]) == 0) {
+                    if (i < 64) {
+                        errors++;
+                        eid = i;
+                    }
+                    data[i/8] ^= 1<<(7 - (i%8));
+                }
             }
-         }
-         if (errors == 1)
-            data[eid/8] ^= 1<<(7-(eid%8));
-         else if (errors%2 == 1)
-            data[rand()%8] ^= 1<<rand()%8;
+            if (errors == 1)
+                data[eid/8] ^= 1<<(7 - (eid%8));
+            else if (errors%2 == 1)
+                data[rand()%8] ^= 1<<rand()%8;
 #endif
 
 #if 1 /* Set to zero to use the encoder's output instead */
-         /* This is to simulate packet loss */
-         lost = percent_loss != 0 && (float)rand()/(float)RAND_MAX<.01*percent_loss;
-         if (lost)
-            /*if (errors && (errors%2==0))*/
-            ret = oac_custom_decode24(dec, NULL, len, out, frame_size);
-         else
-            ret = oac_custom_decode24(dec, data, len, out, frame_size);
-         if(oac_custom_decoder_ctl(
+            /* This is to simulate packet loss */
+            lost = percent_loss != 0 && (float)rand()/(float)RAND_MAX < .01*percent_loss;
+            if (lost)
+                /*if (errors && (errors%2==0))*/
+                ret = oac_custom_decode24(dec, NULL, len, out, frame_size);
+            else
+                ret = oac_custom_decode24(dec, data, len, out, frame_size);
+            if (oac_custom_decoder_ctl(
                   dec, OAC_GET_FINAL_RANGE(&dec_final_range)) != OAC_OK) {
-            oac_ctl_failed();
-            goto failure;
-         }
-         if (ret < 0)
-            fprintf(stderr, "oac_custom_decode() failed: %s\n", oac_strerror(ret));
+                oac_ctl_failed();
+                goto failure;
+            }
+            if (ret < 0)
+                fprintf(stderr, "oac_custom_decode() failed: %s\n", oac_strerror(ret));
 #else
-         for (i=0;i<ret*channels;i++)
-            out[i] = in[i];
+            for (i = 0; i < ret*channels; i++)
+                out[i] = in[i];
 #endif
 #if !(defined (FIXED_POINT) && !defined(CUSTOM_MODES)) && defined(RESYNTH)
-         if (!encode_only && !decode_only)
-         {
-            for (i=0;i<ret*channels;i++)
-            {
-               rmsd += (in[i]-out[i])*1.0*(in[i]-out[i]);
-               /*out[i] -= in[i];*/
+            if (!encode_only && !decode_only) {
+                for (i = 0; i < ret*channels; i++) {
+                    rmsd += (in[i] - out[i])*1.0*(in[i] - out[i]);
+                    /*out[i] -= in[i];*/
+                }
             }
-         }
 #endif
-         if (format == FORMAT_S16_LE) {
-            for(i=0;i<(ret-skip)*channels;i++)
-            {
-               oac_int32 s;
-               s=out[i+(skip*channels)];
-               if (s > 0x007fff00) s = 0x007fff00;
-               if (s < -0x007fff00) s = -0x007fff00;
-               s=(s+128)>>8;
-               fbytes[2*i]=s&0xFF;
-               fbytes[2*i+1]=(s>>8)&0xFF;
-            }
-         } else if (format == FORMAT_S24_LE) {
-            for(i=0;i<(ret-skip)*channels;i++)
-            {
-               oac_int32 s;
-               s=out[i+(skip*channels)];
-               if (s > 0x007fffff) s = 0x007fffff;
-               if (s < -0x007fffff) s = -0x007fffff;
-               fbytes[3*i]=s&0xFF;
-               fbytes[3*i+1]=(s>>8)&0xFF;
-               fbytes[3*i+2]=(s>>16)&0xFF;
+            if (format == FORMAT_S16_LE) {
+                for (i = 0; i < (ret - skip)*channels; i++) {
+                    oac_int32 s;
+                    s = out[i + (skip*channels)];
+                    if (s > 0x007fff00) s = 0x007fff00;
+                    if (s < -0x007fff00) s = -0x007fff00;
+                    s = (s + 128)>>8;
+                    fbytes[2*i] = s&0xFF;
+                    fbytes[2*i + 1] = (s>>8)&0xFF;
+                }
+            } else if (format == FORMAT_S24_LE) {
+                for (i = 0; i < (ret - skip)*channels; i++) {
+                    oac_int32 s;
+                    s = out[i + (skip*channels)];
+                    if (s > 0x007fffff) s = 0x007fffff;
+                    if (s < -0x007fffff) s = -0x007fffff;
+                    fbytes[3*i] = s&0xFF;
+                    fbytes[3*i + 1] = (s>>8)&0xFF;
+                    fbytes[3*i + 2] = (s>>16)&0xFF;
+                }
+            } else if (format == FORMAT_F32_LE) {
+                for (i = 0; i < (ret - skip)*channels; i++) {
+                    float_bits s;
+                    s.f = out[i + (skip*channels)]*(1.f/8388608.f);
+                    fbytes[4*i] = s.i&0xFF;
+                    fbytes[4*i + 1] = (s.i>>8)&0xFF;
+                    fbytes[4*i + 2] = (s.i>>16)&0xFF;
+                    fbytes[4*i + 3] = (s.i>>24)&0xFF;
+                }
             }
-         } else if (format == FORMAT_F32_LE) {
-            for(i=0;i<(ret-skip)*channels;i++)
-            {
-               float_bits s;
-               s.f=out[i+(skip*channels)]*(1.f/8388608.f);
-               fbytes[4*i]=s.i&0xFF;
-               fbytes[4*i+1]=(s.i>>8)&0xFF;
-               fbytes[4*i+2]=(s.i>>16)&0xFF;
-               fbytes[4*i+3]=(s.i>>24)&0xFF;
-            }
-         }
-         fwrite(fbytes, format_size[format], (ret-skip)*channels, fout);
-      }
+            fwrite(fbytes, format_size[format], (ret - skip)*channels, fout);
+        }
 
-      /* compare final range encoder rng values of encoder and decoder */
-      if( enc_final_range!=0  && !encode_only
-       && !lost
-       && dec_final_range != enc_final_range ) {
-          fprintf (stderr, "Error: Range coder state mismatch "
+        /* compare final range encoder rng values of encoder and decoder */
+        if (enc_final_range != 0  && !encode_only
+            && !lost
+            && dec_final_range != enc_final_range) {
+            fprintf (stderr, "Error: Range coder state mismatch "
                            "between encoder and decoder "
                            "in frame %ld: 0x%8lx vs 0x%8lx\n",
-                       (long)count,
-                       (unsigned long)enc_final_range,
-                       (unsigned long)dec_final_range);
-          goto failure;
-      }
+                (long)count,
+                (unsigned long)enc_final_range,
+                (unsigned long)dec_final_range);
+            goto failure;
+        }
 
-      count++;
-      skip = 0;
-   }
-   PRINT_MIPS(stderr);
-   ret = EXIT_SUCCESS;
+        count++;
+        skip = 0;
+    }
+    PRINT_MIPS(stderr);
+    ret = EXIT_SUCCESS;
 #if !(defined (FIXED_POINT) && !defined(CUSTOM_MODES)) && defined(RESYNTH)
-   if (!encode_only && !decode_only)
-   {
-      if (rmsd > 0)
-      {
-         rmsd = sqrt(rmsd/(1.0*frame_size*channels*count));
-         fprintf (stderr, "Error: encoder doesn't match decoder\n");
-         fprintf (stderr, "RMS mismatch is %f\n", rmsd);
-         ret = 1;
-      } else {
-         fprintf (stderr, "Encoder matches decoder!!\n");
-      }
-   }
+    if (!encode_only && !decode_only) {
+        if (rmsd > 0) {
+            rmsd = sqrt(rmsd/(1.0*frame_size*channels*count));
+            fprintf (stderr, "Error: encoder doesn't match decoder\n");
+            fprintf (stderr, "RMS mismatch is %f\n", rmsd);
+            ret = 1;
+        } else {
+            fprintf (stderr, "Encoder matches decoder!!\n");
+        }
+    }
 #endif
 failure:
-   /* Cleanup after ourselves. */
-   if (enc) oac_custom_encoder_destroy(enc);
-   if (dec) oac_custom_decoder_destroy(dec);
-   if (fin) fclose(fin);
-   if (fout) fclose(fout);
-   if (mode) oac_custom_mode_destroy(mode);
-   if (in) free(in);
-   if (out) free(out);
-   if (fbytes) free(fbytes);
-   return ret;
+    /* Cleanup after ourselves. */
+    if (enc) oac_custom_encoder_destroy(enc);
+    if (dec) oac_custom_decoder_destroy(dec);
+    if (fin) fclose(fin);
+    if (fout) fclose(fout);
+    if (mode) oac_custom_mode_destroy(mode);
+    if (in) free(in);
+    if (out) free(out);
+    if (fbytes) free(fbytes);
+    return ret;
 }
diff --git a/celt/os_support.h b/celt/os_support.h
index c86bbfb0e..56699f041 100644
--- a/celt/os_support.h
+++ b/celt/os_support.h
@@ -26,13 +26,13 @@
    STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
    ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
    POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef OS_SUPPORT_H
 #define OS_SUPPORT_H
 
 #ifdef CUSTOM_SUPPORT
-#  include "custom_support.h"
+# include "custom_support.h"
 #endif
 
 #include "oac_types.h"
@@ -43,56 +43,52 @@
 
 /** Oac wrapper for malloc(). To do your own dynamic allocation replace this function, oac_realloc, and oac_free */
 #ifndef OVERRIDE_OAC_ALLOC
-static OAC_INLINE void *oac_alloc (size_t size)
-{
-   return malloc(size);
+static OAC_INLINE void *oac_alloc (size_t size) {
+    return malloc(size);
 }
 #endif
 
 #ifndef OVERRIDE_OAC_REALLOC
-static OAC_INLINE void *oac_realloc (void *ptr, size_t size)
-{
-   return realloc(ptr, size);
+static OAC_INLINE void *oac_realloc (void *ptr, size_t size) {
+    return realloc(ptr, size);
 }
 #endif
 
 /** Used only for non-threadsafe pseudostack.
     If desired, this can always return the same area of memory rather than allocating a new one every time. */
 #ifndef OVERRIDE_OAC_ALLOC_SCRATCH
-static OAC_INLINE void *oac_alloc_scratch (size_t size)
-{
-   /* Scratch space doesn't need to be cleared */
-   return oac_alloc(size);
+static OAC_INLINE void *oac_alloc_scratch (size_t size) {
+    /* Scratch space doesn't need to be cleared */
+    return oac_alloc(size);
 }
 #endif
 
 /** Oac wrapper for free(). To do your own dynamic allocation replace this function, oac_realloc, and oac_free */
 #ifndef OVERRIDE_OAC_FREE
-static OAC_INLINE void oac_free (void *ptr)
-{
-   free(ptr);
+static OAC_INLINE void oac_free (void *ptr) {
+    free(ptr);
 }
 #endif
 
 /** Copy n elements from src to dst. The 0* term provides compile-time type checking  */
 #ifndef OVERRIDE_OAC_COPY
-#define OAC_COPY(dst, src, n) (memcpy((dst), (src), (n)*sizeof(*(dst)) + 0*((dst)-(src)) ))
+# define OAC_COPY(dst, src, n) (memcpy((dst), (src), (n)*sizeof(*(dst)) + 0*((dst) - (src))))
 #endif
 
 /** Copy n elements from src to dst, allowing overlapping regions. The 0* term
     provides compile-time type checking */
 #ifndef OVERRIDE_OAC_MOVE
-#define OAC_MOVE(dst, src, n) (memmove((dst), (src), (n)*sizeof(*(dst)) + 0*((dst)-(src)) ))
+# define OAC_MOVE(dst, src, n) (memmove((dst), (src), (n)*sizeof(*(dst)) + 0*((dst) - (src))))
 #endif
 
 /** Set n elements of dst to zero */
 #ifndef OVERRIDE_OAC_CLEAR
-#define OAC_CLEAR(dst, n) (memset((dst), 0, (n)*sizeof(*(dst))))
+# define OAC_CLEAR(dst, n) (memset((dst), 0, (n)*sizeof(*(dst))))
 #endif
 
 /*#ifdef __GNUC__
-#pragma GCC poison printf sprintf
-#pragma GCC poison malloc free realloc calloc
-#endif*/
+ #pragma GCC poison printf sprintf
+ #pragma GCC poison malloc free realloc calloc
+ #endif*/
 
 #endif /* OS_SUPPORT_H */
diff --git a/celt/pitch.c b/celt/pitch.c
index 0fa83b338..142b5f3e9 100644
--- a/celt/pitch.c
+++ b/celt/pitch.c
@@ -29,10 +29,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "pitch.h"
@@ -47,178 +47,167 @@ static void find_best_pitch(oac_val32 *xcorr, oac_val16 *y, int len,
 #ifdef FIXED_POINT
                             , int yshift, oac_val32 maxcorr
 #endif
-                            )
-{
-   int i, j;
-   oac_val32 Syy=1;
-   oac_val16 best_num[2];
-   oac_val32 best_den[2];
+                            ) {
+    int i, j;
+    oac_val32 Syy = 1;
+    oac_val16 best_num[2];
+    oac_val32 best_den[2];
 #ifdef FIXED_POINT
-   int xshift;
+    int xshift;
 
-   xshift = celt_ilog2(maxcorr)-14;
+    xshift = celt_ilog2(maxcorr) - 14;
 #endif
 
-   best_num[0] = -1;
-   best_num[1] = -1;
-   best_den[0] = 0;
-   best_den[1] = 0;
-   best_pitch[0] = 0;
-   best_pitch[1] = 1;
-   for (j=0;j<len;j++)
-      Syy = ADD32(Syy, SHR32(MULT16_16(y[j],y[j]), yshift));
-   for (i=0;i<max_pitch;i++)
-   {
-      if (xcorr[i]>0)
-      {
-         oac_val16 num;
-         oac_val32 xcorr16;
-         xcorr16 = EXTRACT16(VSHR32(xcorr[i], xshift));
+    best_num[0] = -1;
+    best_num[1] = -1;
+    best_den[0] = 0;
+    best_den[1] = 0;
+    best_pitch[0] = 0;
+    best_pitch[1] = 1;
+    for (j = 0; j < len; j++)
+        Syy = ADD32(Syy, SHR32(MULT16_16(y[j], y[j]), yshift));
+    for (i = 0; i < max_pitch; i++) {
+        if (xcorr[i] > 0) {
+            oac_val16 num;
+            oac_val32 xcorr16;
+            xcorr16 = EXTRACT16(VSHR32(xcorr[i], xshift));
 #ifndef FIXED_POINT
-         /* Considering the range of xcorr16, this should avoid both underflows
-            and overflows (inf) when squaring xcorr16 */
-         xcorr16 *= 1e-12f;
+            /* Considering the range of xcorr16, this should avoid both underflows
+               and overflows (inf) when squaring xcorr16 */
+            xcorr16 *= 1e-12f;
 #endif
-         num = MULT16_16_Q15(xcorr16,xcorr16);
-         if (MULT16_32_Q15(num,best_den[1]) > MULT16_32_Q15(best_num[1],Syy))
-         {
-            if (MULT16_32_Q15(num,best_den[0]) > MULT16_32_Q15(best_num[0],Syy))
-            {
-               best_num[1] = best_num[0];
-               best_den[1] = best_den[0];
-               best_pitch[1] = best_pitch[0];
-               best_num[0] = num;
-               best_den[0] = Syy;
-               best_pitch[0] = i;
-            } else {
-               best_num[1] = num;
-               best_den[1] = Syy;
-               best_pitch[1] = i;
+            num = MULT16_16_Q15(xcorr16, xcorr16);
+            if (MULT16_32_Q15(num, best_den[1]) > MULT16_32_Q15(best_num[1], Syy)) {
+                if (MULT16_32_Q15(num, best_den[0]) > MULT16_32_Q15(best_num[0], Syy)) {
+                    best_num[1] = best_num[0];
+                    best_den[1] = best_den[0];
+                    best_pitch[1] = best_pitch[0];
+                    best_num[0] = num;
+                    best_den[0] = Syy;
+                    best_pitch[0] = i;
+                } else {
+                    best_num[1] = num;
+                    best_den[1] = Syy;
+                    best_pitch[1] = i;
+                }
             }
-         }
-      }
-      Syy += SHR32(MULT16_16(y[i+len],y[i+len]),yshift) - SHR32(MULT16_16(y[i],y[i]),yshift);
-      Syy = MAX32(1, Syy);
-   }
+        }
+        Syy += SHR32(MULT16_16(y[i + len], y[i + len]), yshift) - SHR32(MULT16_16(y[i], y[i]), yshift);
+        Syy = MAX32(1, Syy);
+    }
 }
 
 static void celt_fir5(oac_val16 *x,
-         const oac_val16 *num,
-         int N)
-{
-   int i;
-   oac_val16 num0, num1, num2, num3, num4;
-   oac_val32 mem0, mem1, mem2, mem3, mem4;
-   num0=num[0];
-   num1=num[1];
-   num2=num[2];
-   num3=num[3];
-   num4=num[4];
-   mem0=0;
-   mem1=0;
-   mem2=0;
-   mem3=0;
-   mem4=0;
-   for (i=0;i<N;i++)
-   {
-      oac_val32 sum = SHL32(EXTEND32(x[i]), SIG_SHIFT);
-      sum = MAC16_16(sum,num0,mem0);
-      sum = MAC16_16(sum,num1,mem1);
-      sum = MAC16_16(sum,num2,mem2);
-      sum = MAC16_16(sum,num3,mem3);
-      sum = MAC16_16(sum,num4,mem4);
-      mem4 = mem3;
-      mem3 = mem2;
-      mem2 = mem1;
-      mem1 = mem0;
-      mem0 = x[i];
-      x[i] = ROUND16(sum, SIG_SHIFT);
-   }
+                      const oac_val16 *num,
+                      int N) {
+    int i;
+    oac_val16 num0, num1, num2, num3, num4;
+    oac_val32 mem0, mem1, mem2, mem3, mem4;
+    num0 = num[0];
+    num1 = num[1];
+    num2 = num[2];
+    num3 = num[3];
+    num4 = num[4];
+    mem0 = 0;
+    mem1 = 0;
+    mem2 = 0;
+    mem3 = 0;
+    mem4 = 0;
+    for (i = 0; i < N; i++) {
+        oac_val32 sum = SHL32(EXTEND32(x[i]), SIG_SHIFT);
+        sum = MAC16_16(sum, num0, mem0);
+        sum = MAC16_16(sum, num1, mem1);
+        sum = MAC16_16(sum, num2, mem2);
+        sum = MAC16_16(sum, num3, mem3);
+        sum = MAC16_16(sum, num4, mem4);
+        mem4 = mem3;
+        mem3 = mem2;
+        mem2 = mem1;
+        mem1 = mem0;
+        mem0 = x[i];
+        x[i] = ROUND16(sum, SIG_SHIFT);
+    }
 }
 
 
 void pitch_downsample(celt_sig * OAC_RESTRICT x[], oac_val16 * OAC_RESTRICT x_lp,
-      int len, int C, int factor, int arch)
-{
-   int i;
-   oac_val32 ac[5];
-   oac_val16 tmp=Q15ONE;
-   oac_val16 lpc[4];
-   oac_val16 lpc2[5];
-   oac_val16 c1 = QCONST16(.8f,15);
-   int offset;
+                      int len, int C, int factor, int arch) {
+    int i;
+    oac_val32 ac[5];
+    oac_val16 tmp = Q15ONE;
+    oac_val16 lpc[4];
+    oac_val16 lpc2[5];
+    oac_val16 c1 = QCONST16(.8f, 15);
+    int offset;
 #ifdef FIXED_POINT
-   int shift;
-   oac_val32 maxabs;
+    int shift;
+    oac_val32 maxabs;
 #endif
-   offset = factor/2;
+    offset = factor/2;
 #ifdef FIXED_POINT
-   maxabs = celt_maxabs32(x[0], len*factor);
-   if (C==2)
-   {
-      oac_val32 maxabs_1 = celt_maxabs32(x[1], len*factor);
-      maxabs = MAX32(maxabs, maxabs_1);
-   }
-   if (maxabs<1)
-      maxabs=1;
-   shift = celt_ilog2(maxabs)-10;
-   if (shift<0)
-      shift=0;
-   if (C==2)
-      shift++;
-   for (i=1;i<len;i++)
-      x_lp[i] = SHR32(x[0][(factor*i-offset)], shift+2) + SHR32(x[0][(factor*i+offset)], shift+2) + SHR32(x[0][factor*i], shift+1);
-   x_lp[0] = SHR32(x[0][offset], shift+2) + SHR32(x[0][0], shift+1);
-   if (C==2)
-   {
-      for (i=1;i<len;i++)
-         x_lp[i] += SHR32(x[1][(factor*i-offset)], shift+2) + SHR32(x[1][(factor*i+offset)], shift+2) + SHR32(x[1][factor*i], shift+1);
-      x_lp[0] += SHR32(x[1][offset], shift+2) + SHR32(x[1][0], shift+1);
-   }
+    maxabs = celt_maxabs32(x[0], len*factor);
+    if (C == 2) {
+        oac_val32 maxabs_1 = celt_maxabs32(x[1], len*factor);
+        maxabs = MAX32(maxabs, maxabs_1);
+    }
+    if (maxabs < 1)
+        maxabs = 1;
+    shift = celt_ilog2(maxabs) - 10;
+    if (shift < 0)
+        shift = 0;
+    if (C == 2)
+        shift++;
+    for (i = 1; i < len; i++)
+        x_lp[i] = SHR32(x[0][(factor*i - offset)], shift + 2) + SHR32(x[0][(factor*i + offset)],
+        shift + 2) + SHR32(x[0][factor*i], shift + 1);
+    x_lp[0] = SHR32(x[0][offset], shift + 2) + SHR32(x[0][0], shift + 1);
+    if (C == 2) {
+        for (i = 1; i < len; i++)
+            x_lp[i] += SHR32(x[1][(factor*i - offset)], shift + 2) + SHR32(x[1][(factor*i + offset)],
+            shift + 2) + SHR32(x[1][factor*i], shift + 1);
+        x_lp[0] += SHR32(x[1][offset], shift + 2) + SHR32(x[1][0], shift + 1);
+    }
 #else
-   for (i=1;i<len;i++)
-      x_lp[i] = .25f*x[0][(factor*i-offset)] + .25f*x[0][(factor*i+offset)] + .5f*x[0][factor*i];
-   x_lp[0] = .25f*x[0][offset] + .5f*x[0][0];
-   if (C==2)
-   {
-      for (i=1;i<len;i++)
-         x_lp[i] += .25f*x[1][(factor*i-offset)] + .25f*x[1][(factor*i+offset)] + .5f*x[1][factor*i];
-      x_lp[0] += .25f*x[1][offset] + .5f*x[1][0];
-   }
+    for (i = 1; i < len; i++)
+        x_lp[i] = .25f*x[0][(factor*i - offset)] + .25f*x[0][(factor*i + offset)] + .5f*x[0][factor*i];
+    x_lp[0] = .25f*x[0][offset] + .5f*x[0][0];
+    if (C == 2) {
+        for (i = 1; i < len; i++)
+            x_lp[i] += .25f*x[1][(factor*i - offset)] + .25f*x[1][(factor*i + offset)] + .5f*x[1][factor*i];
+        x_lp[0] += .25f*x[1][offset] + .5f*x[1][0];
+    }
 #endif
-   _celt_autocorr(x_lp, ac, NULL, 0,
+    _celt_autocorr(x_lp, ac, NULL, 0,
                   4, len, arch);
 
-   /* Noise floor -40 dB */
+    /* Noise floor -40 dB */
 #ifdef FIXED_POINT
-   ac[0] += SHR32(ac[0],13);
+    ac[0] += SHR32(ac[0], 13);
 #else
-   ac[0] *= 1.0001f;
+    ac[0] *= 1.0001f;
 #endif
-   /* Lag windowing */
-   for (i=1;i<=4;i++)
-   {
-      /*ac[i] *= exp(-.5*(2*M_PI*.002*i)*(2*M_PI*.002*i));*/
+    /* Lag windowing */
+    for (i = 1; i <= 4; i++) {
+        /*ac[i] *= exp(-.5*(2*M_PI*.002*i)*(2*M_PI*.002*i));*/
 #ifdef FIXED_POINT
-      ac[i] -= MULT16_32_Q15(2*i*i, ac[i]);
+        ac[i] -= MULT16_32_Q15(2*i*i, ac[i]);
 #else
-      ac[i] -= ac[i]*(.008f*i)*(.008f*i);
+        ac[i] -= ac[i]*(.008f*i)*(.008f*i);
 #endif
-   }
-
-   _celt_lpc(lpc, ac, 4);
-   for (i=0;i<4;i++)
-   {
-      tmp = MULT16_16_Q15(QCONST16(.9f,15), tmp);
-      lpc[i] = MULT16_16_Q15(lpc[i], tmp);
-   }
-   /* Add a zero */
-   lpc2[0] = lpc[0] + QCONST16(.8f,SIG_SHIFT);
-   lpc2[1] = lpc[1] + MULT16_16_Q15(c1,lpc[0]);
-   lpc2[2] = lpc[2] + MULT16_16_Q15(c1,lpc[1]);
-   lpc2[3] = lpc[3] + MULT16_16_Q15(c1,lpc[2]);
-   lpc2[4] = MULT16_16_Q15(c1,lpc[3]);
-   celt_fir5(x_lp, lpc2, len);
+    }
+
+    _celt_lpc(lpc, ac, 4);
+    for (i = 0; i < 4; i++) {
+        tmp = MULT16_16_Q15(QCONST16(.9f, 15), tmp);
+        lpc[i] = MULT16_16_Q15(lpc[i], tmp);
+    }
+    /* Add a zero */
+    lpc2[0] = lpc[0] + QCONST16(.8f, SIG_SHIFT);
+    lpc2[1] = lpc[1] + MULT16_16_Q15(c1, lpc[0]);
+    lpc2[2] = lpc[2] + MULT16_16_Q15(c1, lpc[1]);
+    lpc2[3] = lpc[3] + MULT16_16_Q15(c1, lpc[2]);
+    lpc2[4] = MULT16_16_Q15(c1, lpc[3]);
+    celt_fir5(x_lp, lpc2, len);
 }
 
 /* Pure C implementation. */
@@ -228,333 +217,316 @@ oac_val32
 void
 #endif
 celt_pitch_xcorr_c(const oac_val16 *_x, const oac_val16 *_y,
-      oac_val32 *xcorr, int len, int max_pitch, int arch)
-{
+                   oac_val32 *xcorr, int len, int max_pitch, int arch) {
 
 #if 0 /* This is a simple version of the pitch correlation that should work
          well on DSPs like Blackfin and TI C5x/C6x */
-   int i, j;
-#ifdef FIXED_POINT
-   oac_val32 maxcorr=1;
-#endif
-#if !defined(OVERRIDE_PITCH_XCORR)
-   (void)arch;
-#endif
-   for (i=0;i<max_pitch;i++)
-   {
-      oac_val32 sum = 0;
-      for (j=0;j<len;j++)
-         sum = MAC16_16(sum, _x[j], _y[i+j]);
-      xcorr[i] = sum;
-#ifdef FIXED_POINT
-      maxcorr = MAX32(maxcorr, sum);
-#endif
-   }
-#ifdef FIXED_POINT
-   return maxcorr;
-#endif
+    int i, j;
+# ifdef FIXED_POINT
+    oac_val32 maxcorr = 1;
+# endif
+# if !defined(OVERRIDE_PITCH_XCORR)
+    (void)arch;
+# endif
+    for (i = 0; i < max_pitch; i++) {
+        oac_val32 sum = 0;
+        for (j = 0; j < len; j++)
+            sum = MAC16_16(sum, _x[j], _y[i + j]);
+        xcorr[i] = sum;
+# ifdef FIXED_POINT
+        maxcorr = MAX32(maxcorr, sum);
+# endif
+    }
+# ifdef FIXED_POINT
+    return maxcorr;
+# endif
 
 #else /* Unrolled version of the pitch correlation -- runs faster on x86 and ARM */
-   int i;
-   /*The EDSP version requires that max_pitch is at least 1, and that _x is
-      32-bit aligned.
-     Since it's hard to put asserts in assembly, put them here.*/
-#ifdef FIXED_POINT
-   oac_val32 maxcorr=1;
-#endif
-   celt_assert(max_pitch>0);
-   celt_sig_assert(((size_t)_x&3)==0);
-   for (i=0;i<max_pitch-3;i+=4)
-   {
-      oac_val32 sum[4]={0,0,0,0};
-#if defined(OAC_CHECK_ASM) && defined(FIXED_POINT)
-      {
-         oac_val32 sum_c[4]={0,0,0,0};
-         xcorr_kernel_c(_x, _y+i, sum_c, len);
-#endif
-         xcorr_kernel(_x, _y+i, sum, len, arch);
-#if defined(OAC_CHECK_ASM) && defined(FIXED_POINT)
-         celt_assert(memcmp(sum, sum_c, sizeof(sum)) == 0);
-      }
-#endif
-      xcorr[i]=sum[0];
-      xcorr[i+1]=sum[1];
-      xcorr[i+2]=sum[2];
-      xcorr[i+3]=sum[3];
-#ifdef FIXED_POINT
-      sum[0] = MAX32(sum[0], sum[1]);
-      sum[2] = MAX32(sum[2], sum[3]);
-      sum[0] = MAX32(sum[0], sum[2]);
-      maxcorr = MAX32(maxcorr, sum[0]);
-#endif
-   }
-   /* In case max_pitch isn't a multiple of 4, do non-unrolled version. */
-   for (;i<max_pitch;i++)
-   {
-      oac_val32 sum;
-      sum = celt_inner_prod(_x, _y+i, len, arch);
-      xcorr[i] = sum;
-#ifdef FIXED_POINT
-      maxcorr = MAX32(maxcorr, sum);
-#endif
-   }
-#ifdef FIXED_POINT
-   return maxcorr;
-#endif
+    int i;
+    /*The EDSP version requires that max_pitch is at least 1, and that _x is
+       32-bit aligned.
+       Since it's hard to put asserts in assembly, put them here.*/
+# ifdef FIXED_POINT
+    oac_val32 maxcorr = 1;
+# endif
+    celt_assert(max_pitch > 0);
+    celt_sig_assert(((size_t)_x&3) == 0);
+    for (i = 0; i < max_pitch - 3; i += 4) {
+        oac_val32 sum[4] = {0, 0, 0, 0};
+# if defined(OAC_CHECK_ASM) && defined(FIXED_POINT)
+        {
+            oac_val32 sum_c[4] = {0, 0, 0, 0};
+            xcorr_kernel_c(_x, _y + i, sum_c, len);
+# endif
+        xcorr_kernel(_x, _y + i, sum, len, arch);
+# if defined(OAC_CHECK_ASM) && defined(FIXED_POINT)
+        celt_assert(memcmp(sum, sum_c, sizeof(sum)) == 0);
+    }
+# endif
+        xcorr[i] = sum[0];
+        xcorr[i + 1] = sum[1];
+        xcorr[i + 2] = sum[2];
+        xcorr[i + 3] = sum[3];
+# ifdef FIXED_POINT
+        sum[0] = MAX32(sum[0], sum[1]);
+        sum[2] = MAX32(sum[2], sum[3]);
+        sum[0] = MAX32(sum[0], sum[2]);
+        maxcorr = MAX32(maxcorr, sum[0]);
+# endif
+    }
+    /* In case max_pitch isn't a multiple of 4, do non-unrolled version. */
+    for (; i < max_pitch; i++) {
+        oac_val32 sum;
+        sum = celt_inner_prod(_x, _y + i, len, arch);
+        xcorr[i] = sum;
+# ifdef FIXED_POINT
+        maxcorr = MAX32(maxcorr, sum);
+# endif
+    }
+# ifdef FIXED_POINT
+    return maxcorr;
+# endif
 #endif
 }
 
 void pitch_search(const oac_val16 * OAC_RESTRICT x_lp, oac_val16 * OAC_RESTRICT y,
-                  int len, int max_pitch, int *pitch, int arch)
-{
-   int i, j;
-   int lag;
-   int best_pitch[2]={0,0};
-   VARDECL(oac_val16, x_lp4);
-   VARDECL(oac_val16, y_lp4);
-   VARDECL(oac_val32, xcorr);
+                  int len, int max_pitch, int *pitch, int arch) {
+    int i, j;
+    int lag;
+    int best_pitch[2] = {0, 0};
+    VARDECL(oac_val16, x_lp4);
+    VARDECL(oac_val16, y_lp4);
+    VARDECL(oac_val32, xcorr);
 #ifdef FIXED_POINT
-   oac_val32 maxcorr;
-   oac_val32 xmax, ymax;
-   int shift=0;
+    oac_val32 maxcorr;
+    oac_val32 xmax, ymax;
+    int shift = 0;
 #endif
-   int offset;
+    int offset;
 
-   SAVE_STACK;
+    SAVE_STACK;
 
-   celt_assert(len>0);
-   celt_assert(max_pitch>0);
-   lag = len+max_pitch;
+    celt_assert(len > 0);
+    celt_assert(max_pitch > 0);
+    lag = len + max_pitch;
 
-   ALLOC(x_lp4, len>>2, oac_val16);
-   ALLOC(y_lp4, lag>>2, oac_val16);
-   ALLOC(xcorr, max_pitch>>1, oac_val32);
+    ALLOC(x_lp4, len>>2, oac_val16);
+    ALLOC(y_lp4, lag>>2, oac_val16);
+    ALLOC(xcorr, max_pitch>>1, oac_val32);
 
-   /* Downsample by 2 again */
-   for (j=0;j<len>>2;j++)
-      x_lp4[j] = x_lp[2*j];
-   for (j=0;j<lag>>2;j++)
-      y_lp4[j] = y[2*j];
+    /* Downsample by 2 again */
+    for (j = 0; j < len>>2; j++)
+        x_lp4[j] = x_lp[2*j];
+    for (j = 0; j < lag>>2; j++)
+        y_lp4[j] = y[2*j];
 
 #ifdef FIXED_POINT
-   xmax = celt_maxabs16(x_lp4, len>>2);
-   ymax = celt_maxabs16(y_lp4, lag>>2);
-   shift = celt_ilog2(MAX32(1, MAX32(xmax, ymax))) - 14 + celt_ilog2(len)/2;
-   if (shift>0)
-   {
-      for (j=0;j<len>>2;j++)
-         x_lp4[j] = SHR16(x_lp4[j], shift);
-      for (j=0;j<lag>>2;j++)
-         y_lp4[j] = SHR16(y_lp4[j], shift);
-      /* Use double the shift for a MAC */
-      shift *= 2;
-   } else {
-      shift = 0;
-   }
+    xmax = celt_maxabs16(x_lp4, len>>2);
+    ymax = celt_maxabs16(y_lp4, lag>>2);
+    shift = celt_ilog2(MAX32(1, MAX32(xmax, ymax))) - 14 + celt_ilog2(len)/2;
+    if (shift > 0) {
+        for (j = 0; j < len>>2; j++)
+            x_lp4[j] = SHR16(x_lp4[j], shift);
+        for (j = 0; j < lag>>2; j++)
+            y_lp4[j] = SHR16(y_lp4[j], shift);
+        /* Use double the shift for a MAC */
+        shift *= 2;
+    } else {
+        shift = 0;
+    }
 #endif
 
-   /* Coarse search with 4x decimation */
+    /* Coarse search with 4x decimation */
 
 #ifdef FIXED_POINT
-   maxcorr =
+    maxcorr =
 #endif
-   celt_pitch_xcorr(x_lp4, y_lp4, xcorr, len>>2, max_pitch>>2, arch);
+    celt_pitch_xcorr(x_lp4, y_lp4, xcorr, len>>2, max_pitch>>2, arch);
 
-   find_best_pitch(xcorr, y_lp4, len>>2, max_pitch>>2, best_pitch
+    find_best_pitch(xcorr, y_lp4, len>>2, max_pitch>>2, best_pitch
 #ifdef FIXED_POINT
-                   , 0, maxcorr
+        , 0, maxcorr
 #endif
-                   );
+        );
 
-   /* Finer search with 2x decimation */
+    /* Finer search with 2x decimation */
 #ifdef FIXED_POINT
-   maxcorr=1;
+    maxcorr = 1;
 #endif
-   for (i=0;i<max_pitch>>1;i++)
-   {
-      oac_val32 sum;
-      xcorr[i] = 0;
-      if (abs(i-2*best_pitch[0])>2 && abs(i-2*best_pitch[1])>2)
-         continue;
+    for (i = 0; i < max_pitch>>1; i++) {
+        oac_val32 sum;
+        xcorr[i] = 0;
+        if (abs(i - 2*best_pitch[0]) > 2 && abs(i - 2*best_pitch[1]) > 2)
+            continue;
 #ifdef FIXED_POINT
-      sum = 0;
-      for (j=0;j<len>>1;j++)
-         sum += SHR32(MULT16_16(x_lp[j],y[i+j]), shift);
+        sum = 0;
+        for (j = 0; j < len>>1; j++)
+            sum += SHR32(MULT16_16(x_lp[j], y[i + j]), shift);
 #else
-      sum = celt_inner_prod(x_lp, y+i, len>>1, arch);
+        sum = celt_inner_prod(x_lp, y + i, len>>1, arch);
 #endif
-      xcorr[i] = MAX32(-1, sum);
+        xcorr[i] = MAX32(-1, sum);
 #ifdef FIXED_POINT
-      maxcorr = MAX32(maxcorr, sum);
+        maxcorr = MAX32(maxcorr, sum);
 #endif
-   }
-   find_best_pitch(xcorr, y, len>>1, max_pitch>>1, best_pitch
+    }
+    find_best_pitch(xcorr, y, len>>1, max_pitch>>1, best_pitch
 #ifdef FIXED_POINT
-                   , shift+1, maxcorr
+        , shift + 1, maxcorr
 #endif
-                   );
-
-   /* Refine by pseudo-interpolation */
-   if (best_pitch[0]>0 && best_pitch[0]<(max_pitch>>1)-1)
-   {
-      oac_val32 a, b, c;
-      a = xcorr[best_pitch[0]-1];
-      b = xcorr[best_pitch[0]];
-      c = xcorr[best_pitch[0]+1];
-      if ((c-a) > MULT16_32_Q15(QCONST16(.7f,15),b-a))
-         offset = 1;
-      else if ((a-c) > MULT16_32_Q15(QCONST16(.7f,15),b-c))
-         offset = -1;
-      else
-         offset = 0;
-   } else {
-      offset = 0;
-   }
-   *pitch = 2*best_pitch[0]-offset;
-
-   RESTORE_STACK;
+        );
+
+    /* Refine by pseudo-interpolation */
+    if (best_pitch[0] > 0 && best_pitch[0] < (max_pitch>>1) - 1) {
+        oac_val32 a, b, c;
+        a = xcorr[best_pitch[0] - 1];
+        b = xcorr[best_pitch[0]];
+        c = xcorr[best_pitch[0] + 1];
+        if ((c - a) > MULT16_32_Q15(QCONST16(.7f, 15), b - a))
+            offset = 1;
+        else if ((a - c) > MULT16_32_Q15(QCONST16(.7f, 15), b - c))
+            offset = -1;
+        else
+            offset = 0;
+    } else {
+        offset = 0;
+    }
+    *pitch = 2*best_pitch[0] - offset;
+
+    RESTORE_STACK;
 }
 
 #ifdef FIXED_POINT
-static oac_val16 compute_pitch_gain(oac_val32 xy, oac_val32 xx, oac_val32 yy)
-{
-   oac_val32 x2y2;
-   int sx, sy, shift;
-   oac_val32 g;
-   oac_val16 den;
-   if (xy == 0 || xx == 0 || yy == 0)
-      return 0;
-   sx = celt_ilog2(xx)-14;
-   sy = celt_ilog2(yy)-14;
-   shift = sx + sy;
-   x2y2 = SHR32(MULT16_16(VSHR32(xx, sx), VSHR32(yy, sy)), 14);
-   if (shift & 1) {
-      if (x2y2 < 32768)
-      {
-         x2y2 <<= 1;
-         shift--;
-      } else {
-         x2y2 >>= 1;
-         shift++;
-      }
-   }
-   den = celt_rsqrt_norm(x2y2);
-   g = MULT16_32_Q15(den, xy);
-   g = VSHR32(g, (shift>>1)-1);
-   return EXTRACT16(MAX32(-Q15ONE, MIN32(g, Q15ONE)));
+static oac_val16 compute_pitch_gain(oac_val32 xy, oac_val32 xx, oac_val32 yy) {
+    oac_val32 x2y2;
+    int sx, sy, shift;
+    oac_val32 g;
+    oac_val16 den;
+    if (xy == 0 || xx == 0 || yy == 0)
+        return 0;
+    sx = celt_ilog2(xx) - 14;
+    sy = celt_ilog2(yy) - 14;
+    shift = sx + sy;
+    x2y2 = SHR32(MULT16_16(VSHR32(xx, sx), VSHR32(yy, sy)), 14);
+    if (shift&1) {
+        if (x2y2 < 32768) {
+            x2y2 <<= 1;
+            shift--;
+        } else {
+            x2y2 >>= 1;
+            shift++;
+        }
+    }
+    den = celt_rsqrt_norm(x2y2);
+    g = MULT16_32_Q15(den, xy);
+    g = VSHR32(g, (shift>>1) - 1);
+    return EXTRACT16(MAX32(-Q15ONE, MIN32(g, Q15ONE)));
 }
 #else
-static oac_val16 compute_pitch_gain(oac_val32 xy, oac_val32 xx, oac_val32 yy)
-{
-   return xy/celt_sqrt(1+xx*yy);
+static oac_val16 compute_pitch_gain(oac_val32 xy, oac_val32 xx, oac_val32 yy) {
+    return xy/celt_sqrt(1 + xx*yy);
 }
 #endif
 
 static const int second_check[16] = {0, 0, 3, 2, 3, 2, 5, 2, 3, 2, 3, 2, 5, 2, 3, 2};
 oac_val16 remove_doubling(oac_val16 *x, int maxperiod, int minperiod,
-      int N, int *T0_, int prev_period, oac_val16 prev_gain, int arch)
-{
-   int k, i, T, T0;
-   oac_val16 g, g0;
-   oac_val16 pg;
-   oac_val32 xy,xx,yy,xy2;
-   oac_val32 xcorr[3];
-   oac_val32 best_xy, best_yy;
-   int offset;
-   int minperiod0;
-   VARDECL(oac_val32, yy_lookup);
-   SAVE_STACK;
-
-   minperiod0 = minperiod;
-   maxperiod /= 2;
-   minperiod /= 2;
-   *T0_ /= 2;
-   prev_period /= 2;
-   N /= 2;
-   x += maxperiod;
-   if (*T0_>=maxperiod)
-      *T0_=maxperiod-1;
-
-   T = T0 = *T0_;
-   ALLOC(yy_lookup, maxperiod+1, oac_val32);
-   dual_inner_prod(x, x, x-T0, N, &xx, &xy, arch);
-   yy_lookup[0] = xx;
-   yy=xx;
-   for (i=1;i<=maxperiod;i++)
-   {
-      yy = yy+MULT16_16(x[-i],x[-i])-MULT16_16(x[N-i],x[N-i]);
-      yy_lookup[i] = MAX32(0, yy);
-   }
-   yy = yy_lookup[T0];
-   best_xy = xy;
-   best_yy = yy;
-   g = g0 = compute_pitch_gain(xy, xx, yy);
-   /* Look for any pitch at T/k */
-   for (k=2;k<=15;k++)
-   {
-      int T1, T1b;
-      oac_val16 g1;
-      oac_val16 cont=0;
-      oac_val16 thresh;
-      T1 = celt_udiv(2*T0+k, 2*k);
-      if (T1 < minperiod)
-         break;
-      /* Look for another strong correlation at T1b */
-      if (k==2)
-      {
-         if (T1+T0>maxperiod)
-            T1b = T0;
-         else
-            T1b = T0+T1;
-      } else
-      {
-         T1b = celt_udiv(2*second_check[k]*T0+k, 2*k);
-      }
-      dual_inner_prod(x, &x[-T1], &x[-T1b], N, &xy, &xy2, arch);
-      xy = HALF32(xy + xy2);
-      yy = HALF32(yy_lookup[T1] + yy_lookup[T1b]);
-      g1 = compute_pitch_gain(xy, xx, yy);
-      if (abs(T1-prev_period)<=1)
-         cont = prev_gain;
-      else if (abs(T1-prev_period)<=2 && 5*k*k < T0)
-         cont = HALF16(prev_gain);
-      else
-         cont = 0;
-      thresh = MAX16(QCONST16(.3f,15), MULT16_16_Q15(QCONST16(.7f,15),g0)-cont);
-      /* Bias against very high pitch (very short period) to avoid false-positives
-         due to short-term correlation */
-      if (T1<3*minperiod)
-         thresh = MAX16(QCONST16(.4f,15), MULT16_16_Q15(QCONST16(.85f,15),g0)-cont);
-      else if (T1<2*minperiod)
-         thresh = MAX16(QCONST16(.5f,15), MULT16_16_Q15(QCONST16(.9f,15),g0)-cont);
-      if (g1 > thresh)
-      {
-         best_xy = xy;
-         best_yy = yy;
-         T = T1;
-         g = g1;
-      }
-   }
-   best_xy = MAX32(0, best_xy);
-   if (best_yy <= best_xy)
-      pg = Q15ONE;
-   else
-      pg = SHR32(frac_div32(best_xy,best_yy+1),16);
-
-   for (k=0;k<3;k++)
-      xcorr[k] = celt_inner_prod(x, x-(T+k-1), N, arch);
-   if ((xcorr[2]-xcorr[0]) > MULT16_32_Q15(QCONST16(.7f,15),xcorr[1]-xcorr[0]))
-      offset = 1;
-   else if ((xcorr[0]-xcorr[2]) > MULT16_32_Q15(QCONST16(.7f,15),xcorr[1]-xcorr[2]))
-      offset = -1;
-   else
-      offset = 0;
-   if (pg > g)
-      pg = g;
-   *T0_ = 2*T+offset;
-
-   if (*T0_<minperiod0)
-      *T0_=minperiod0;
-   RESTORE_STACK;
-   return pg;
+                          int N, int *T0_, int prev_period, oac_val16 prev_gain, int arch) {
+    int k, i, T, T0;
+    oac_val16 g, g0;
+    oac_val16 pg;
+    oac_val32 xy, xx, yy, xy2;
+    oac_val32 xcorr[3];
+    oac_val32 best_xy, best_yy;
+    int offset;
+    int minperiod0;
+    VARDECL(oac_val32, yy_lookup);
+    SAVE_STACK;
+
+    minperiod0 = minperiod;
+    maxperiod /= 2;
+    minperiod /= 2;
+    *T0_ /= 2;
+    prev_period /= 2;
+    N /= 2;
+    x += maxperiod;
+    if (*T0_ >= maxperiod)
+        *T0_ = maxperiod - 1;
+
+    T = T0 = *T0_;
+    ALLOC(yy_lookup, maxperiod + 1, oac_val32);
+    dual_inner_prod(x, x, x - T0, N, &xx, &xy, arch);
+    yy_lookup[0] = xx;
+    yy = xx;
+    for (i = 1; i <= maxperiod; i++) {
+        yy = yy + MULT16_16(x[-i], x[-i]) - MULT16_16(x[N - i], x[N - i]);
+        yy_lookup[i] = MAX32(0, yy);
+    }
+    yy = yy_lookup[T0];
+    best_xy = xy;
+    best_yy = yy;
+    g = g0 = compute_pitch_gain(xy, xx, yy);
+    /* Look for any pitch at T/k */
+    for (k = 2; k <= 15; k++) {
+        int T1, T1b;
+        oac_val16 g1;
+        oac_val16 cont = 0;
+        oac_val16 thresh;
+        T1 = celt_udiv(2*T0 + k, 2*k);
+        if (T1 < minperiod)
+            break;
+        /* Look for another strong correlation at T1b */
+        if (k == 2) {
+            if (T1 + T0 > maxperiod)
+                T1b = T0;
+            else
+                T1b = T0 + T1;
+        } else {
+            T1b = celt_udiv(2*second_check[k]*T0 + k, 2*k);
+        }
+        dual_inner_prod(x, &x[-T1], &x[-T1b], N, &xy, &xy2, arch);
+        xy = HALF32(xy + xy2);
+        yy = HALF32(yy_lookup[T1] + yy_lookup[T1b]);
+        g1 = compute_pitch_gain(xy, xx, yy);
+        if (abs(T1 - prev_period) <= 1)
+            cont = prev_gain;
+        else if (abs(T1 - prev_period) <= 2 && 5*k*k < T0)
+            cont = HALF16(prev_gain);
+        else
+            cont = 0;
+        thresh = MAX16(QCONST16(.3f, 15), MULT16_16_Q15(QCONST16(.7f, 15), g0) - cont);
+        /* Bias against very high pitch (very short period) to avoid false-positives
+           due to short-term correlation */
+        if (T1 < 3*minperiod)
+            thresh = MAX16(QCONST16(.4f, 15), MULT16_16_Q15(QCONST16(.85f, 15), g0) - cont);
+        else if (T1 < 2*minperiod)
+            thresh = MAX16(QCONST16(.5f, 15), MULT16_16_Q15(QCONST16(.9f, 15), g0) - cont);
+        if (g1 > thresh) {
+            best_xy = xy;
+            best_yy = yy;
+            T = T1;
+            g = g1;
+        }
+    }
+    best_xy = MAX32(0, best_xy);
+    if (best_yy <= best_xy)
+        pg = Q15ONE;
+    else
+        pg = SHR32(frac_div32(best_xy, best_yy + 1), 16);
+
+    for (k = 0; k < 3; k++)
+        xcorr[k] = celt_inner_prod(x, x - (T + k - 1), N, arch);
+    if ((xcorr[2] - xcorr[0]) > MULT16_32_Q15(QCONST16(.7f, 15), xcorr[1] - xcorr[0]))
+        offset = 1;
+    else if ((xcorr[0] - xcorr[2]) > MULT16_32_Q15(QCONST16(.7f, 15), xcorr[1] - xcorr[2]))
+        offset = -1;
+    else
+        offset = 0;
+    if (pg > g)
+        pg = g;
+    *T0_ = 2*T + offset;
+
+    if (*T0_ < minperiod0)
+        *T0_ = minperiod0;
+    RESTORE_STACK;
+    return pg;
 }
diff --git a/celt/pitch.h b/celt/pitch.h
index 5a7966057..94bb9b0f4 100644
--- a/celt/pitch.h
+++ b/celt/pitch.h
@@ -29,7 +29,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef PITCH_H
 #define PITCH_H
@@ -38,12 +38,12 @@
 #include "cpu_support.h"
 
 #if (defined(OAC_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)) \
-  || ((defined(OAC_X86_MAY_HAVE_SSE4_1) || defined(OAC_X86_MAY_HAVE_SSE2)) && defined(FIXED_POINT))
-#include "x86/pitch_sse.h"
+    || ((defined(OAC_X86_MAY_HAVE_SSE4_1) || defined(OAC_X86_MAY_HAVE_SSE2)) && defined(FIXED_POINT))
+# include "x86/pitch_sse.h"
 #endif
 
 #if defined(FIXED_POINT) && defined(__mips)
-#include "mips/pitch_mipsr1.h"
+# include "mips/pitch_mipsr1.h"
 #endif
 
 #if (defined(OAC_ARM_ASM) || defined(OAC_ARM_MAY_HAVE_NEON_INTR))
@@ -51,129 +51,121 @@
 #endif
 
 void pitch_downsample(celt_sig * OAC_RESTRICT x[], oac_val16 * OAC_RESTRICT x_lp,
-      int len, int C, int factor, int arch);
+    int len, int C, int factor, int arch);
 
 void pitch_search(const oac_val16 * OAC_RESTRICT x_lp, oac_val16 * OAC_RESTRICT y,
-                  int len, int max_pitch, int *pitch, int arch);
+    int len, int max_pitch, int *pitch, int arch);
 
 oac_val16 remove_doubling(oac_val16 *x, int maxperiod, int minperiod,
-      int N, int *T0, int prev_period, oac_val16 prev_gain, int arch);
+    int N, int *T0, int prev_period, oac_val16 prev_gain, int arch);
 
 
 /* OPT: This is the kernel you really want to optimize. It gets used a lot
    by the prefilter and by the PLC. */
-static OAC_INLINE void xcorr_kernel_c(const oac_val16 * x, const oac_val16 * y, oac_val32 sum[4], int len)
-{
-   int j;
-   oac_val16 y_0, y_1, y_2, y_3;
-   celt_assert(len>=3);
-   y_3=0; /* gcc doesn't realize that y_3 can't be used uninitialized */
-   y_0=*y++;
-   y_1=*y++;
-   y_2=*y++;
-   for (j=0;j<len-3;j+=4)
-   {
-      oac_val16 tmp;
-      tmp = *x++;
-      y_3=*y++;
-      sum[0] = MAC16_16(sum[0],tmp,y_0);
-      sum[1] = MAC16_16(sum[1],tmp,y_1);
-      sum[2] = MAC16_16(sum[2],tmp,y_2);
-      sum[3] = MAC16_16(sum[3],tmp,y_3);
-      tmp=*x++;
-      y_0=*y++;
-      sum[0] = MAC16_16(sum[0],tmp,y_1);
-      sum[1] = MAC16_16(sum[1],tmp,y_2);
-      sum[2] = MAC16_16(sum[2],tmp,y_3);
-      sum[3] = MAC16_16(sum[3],tmp,y_0);
-      tmp=*x++;
-      y_1=*y++;
-      sum[0] = MAC16_16(sum[0],tmp,y_2);
-      sum[1] = MAC16_16(sum[1],tmp,y_3);
-      sum[2] = MAC16_16(sum[2],tmp,y_0);
-      sum[3] = MAC16_16(sum[3],tmp,y_1);
-      tmp=*x++;
-      y_2=*y++;
-      sum[0] = MAC16_16(sum[0],tmp,y_3);
-      sum[1] = MAC16_16(sum[1],tmp,y_0);
-      sum[2] = MAC16_16(sum[2],tmp,y_1);
-      sum[3] = MAC16_16(sum[3],tmp,y_2);
-   }
-   if (j++<len)
-   {
-      oac_val16 tmp = *x++;
-      y_3=*y++;
-      sum[0] = MAC16_16(sum[0],tmp,y_0);
-      sum[1] = MAC16_16(sum[1],tmp,y_1);
-      sum[2] = MAC16_16(sum[2],tmp,y_2);
-      sum[3] = MAC16_16(sum[3],tmp,y_3);
-   }
-   if (j++<len)
-   {
-      oac_val16 tmp=*x++;
-      y_0=*y++;
-      sum[0] = MAC16_16(sum[0],tmp,y_1);
-      sum[1] = MAC16_16(sum[1],tmp,y_2);
-      sum[2] = MAC16_16(sum[2],tmp,y_3);
-      sum[3] = MAC16_16(sum[3],tmp,y_0);
-   }
-   if (j<len)
-   {
-      oac_val16 tmp=*x++;
-      y_1=*y++;
-      sum[0] = MAC16_16(sum[0],tmp,y_2);
-      sum[1] = MAC16_16(sum[1],tmp,y_3);
-      sum[2] = MAC16_16(sum[2],tmp,y_0);
-      sum[3] = MAC16_16(sum[3],tmp,y_1);
-   }
+static OAC_INLINE void xcorr_kernel_c(const oac_val16 * x, const oac_val16 * y, oac_val32 sum[4], int len) {
+    int j;
+    oac_val16 y_0, y_1, y_2, y_3;
+    celt_assert(len >= 3);
+    y_3 = 0; /* gcc doesn't realize that y_3 can't be used uninitialized */
+    y_0 = *y++;
+    y_1 = *y++;
+    y_2 = *y++;
+    for (j = 0; j < len - 3; j += 4) {
+        oac_val16 tmp;
+        tmp = *x++;
+        y_3 = *y++;
+        sum[0] = MAC16_16(sum[0], tmp, y_0);
+        sum[1] = MAC16_16(sum[1], tmp, y_1);
+        sum[2] = MAC16_16(sum[2], tmp, y_2);
+        sum[3] = MAC16_16(sum[3], tmp, y_3);
+        tmp = *x++;
+        y_0 = *y++;
+        sum[0] = MAC16_16(sum[0], tmp, y_1);
+        sum[1] = MAC16_16(sum[1], tmp, y_2);
+        sum[2] = MAC16_16(sum[2], tmp, y_3);
+        sum[3] = MAC16_16(sum[3], tmp, y_0);
+        tmp = *x++;
+        y_1 = *y++;
+        sum[0] = MAC16_16(sum[0], tmp, y_2);
+        sum[1] = MAC16_16(sum[1], tmp, y_3);
+        sum[2] = MAC16_16(sum[2], tmp, y_0);
+        sum[3] = MAC16_16(sum[3], tmp, y_1);
+        tmp = *x++;
+        y_2 = *y++;
+        sum[0] = MAC16_16(sum[0], tmp, y_3);
+        sum[1] = MAC16_16(sum[1], tmp, y_0);
+        sum[2] = MAC16_16(sum[2], tmp, y_1);
+        sum[3] = MAC16_16(sum[3], tmp, y_2);
+    }
+    if (j++ < len) {
+        oac_val16 tmp = *x++;
+        y_3 = *y++;
+        sum[0] = MAC16_16(sum[0], tmp, y_0);
+        sum[1] = MAC16_16(sum[1], tmp, y_1);
+        sum[2] = MAC16_16(sum[2], tmp, y_2);
+        sum[3] = MAC16_16(sum[3], tmp, y_3);
+    }
+    if (j++ < len) {
+        oac_val16 tmp = *x++;
+        y_0 = *y++;
+        sum[0] = MAC16_16(sum[0], tmp, y_1);
+        sum[1] = MAC16_16(sum[1], tmp, y_2);
+        sum[2] = MAC16_16(sum[2], tmp, y_3);
+        sum[3] = MAC16_16(sum[3], tmp, y_0);
+    }
+    if (j < len) {
+        oac_val16 tmp = *x++;
+        y_1 = *y++;
+        sum[0] = MAC16_16(sum[0], tmp, y_2);
+        sum[1] = MAC16_16(sum[1], tmp, y_3);
+        sum[2] = MAC16_16(sum[2], tmp, y_0);
+        sum[3] = MAC16_16(sum[3], tmp, y_1);
+    }
 }
 
 #ifndef OVERRIDE_XCORR_KERNEL
-#define xcorr_kernel(x, y, sum, len, arch) \
-    ((void)(arch),xcorr_kernel_c(x, y, sum, len))
+# define xcorr_kernel(x, y, sum, len, arch) \
+        ((void)(arch), xcorr_kernel_c(x, y, sum, len))
 #endif /* OVERRIDE_XCORR_KERNEL */
 
 
 static OAC_INLINE void dual_inner_prod_c(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
-      int N, oac_val32 *xy1, oac_val32 *xy2)
-{
-   int i;
-   oac_val32 xy01=0;
-   oac_val32 xy02=0;
-   for (i=0;i<N;i++)
-   {
-      xy01 = MAC16_16(xy01, x[i], y01[i]);
-      xy02 = MAC16_16(xy02, x[i], y02[i]);
-   }
-   *xy1 = xy01;
-   *xy2 = xy02;
+                                         int N, oac_val32 *xy1, oac_val32 *xy2) {
+    int i;
+    oac_val32 xy01 = 0;
+    oac_val32 xy02 = 0;
+    for (i = 0; i < N; i++) {
+        xy01 = MAC16_16(xy01, x[i], y01[i]);
+        xy02 = MAC16_16(xy02, x[i], y02[i]);
+    }
+    *xy1 = xy01;
+    *xy2 = xy02;
 }
 
 #ifndef OVERRIDE_DUAL_INNER_PROD
 # define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) \
-    ((void)(arch),dual_inner_prod_c(x, y01, y02, N, xy1, xy2))
+        ((void)(arch), dual_inner_prod_c(x, y01, y02, N, xy1, xy2))
 #endif
 
 /*We make sure a C version is always available for cases where the overhead of
-  vectorization and passing around an arch flag aren't worth it.*/
+   vectorization and passing around an arch flag aren't worth it.*/
 static OAC_INLINE oac_val32 celt_inner_prod_c(const oac_val16 *x,
-      const oac_val16 *y, int N)
-{
-   int i;
-   oac_val32 xy=0;
-   for (i=0;i<N;i++)
-      xy = MAC16_16(xy, x[i], y[i]);
-   return xy;
+                                              const oac_val16 *y, int N) {
+    int i;
+    oac_val32 xy = 0;
+    for (i = 0; i < N; i++)
+        xy = MAC16_16(xy, x[i], y[i]);
+    return xy;
 }
 
 #if !defined(OVERRIDE_CELT_INNER_PROD)
 # define celt_inner_prod(x, y, N, arch) \
-    ((void)(arch),celt_inner_prod_c(x, y, N))
+        ((void)(arch), celt_inner_prod_c(x, y, N))
 #endif
 
 #ifdef NON_STATIC_COMB_FILTER_CONST_C
 void comb_filter_const_c(oac_val32 *y, oac_val32 *x, int T, int N,
-     oac_val16 g10, oac_val16 g11, oac_val16 g12);
+    oac_val16 g10, oac_val16 g11, oac_val16 g12);
 #endif
 
 
@@ -183,7 +175,7 @@ oac_val32
 void
 #endif
 celt_pitch_xcorr_c(const oac_val16 *_x, const oac_val16 *_y,
-      oac_val32 *xcorr, int len, int max_pitch, int arch);
+    oac_val32 *xcorr, int len, int max_pitch, int arch);
 
 #ifndef OVERRIDE_PITCH_XCORR
 # define celt_pitch_xcorr celt_pitch_xcorr_c
@@ -191,12 +183,12 @@ celt_pitch_xcorr_c(const oac_val16 *_x, const oac_val16 *_y,
 
 #ifdef NON_STATIC_COMB_FILTER_CONST_C
 void comb_filter_const_c(oac_val32 *y, oac_val32 *x, int T, int N,
-                         oac_val16 g10, oac_val16 g11, oac_val16 g12);
+    oac_val16 g10, oac_val16 g11, oac_val16 g12);
 #endif
 
 #ifndef OVERRIDE_COMB_FILTER_CONST
 # define comb_filter_const(y, x, T, N, g10, g11, g12, arch) \
-    ((void)(arch),comb_filter_const_c(y, x, T, N, g10, g11, g12))
+        ((void)(arch), comb_filter_const_c(y, x, T, N, g10, g11, g12))
 #endif
 
 
diff --git a/celt/quant_bands.c b/celt/quant_bands.c
index 0be2b3b22..4b9417153 100644
--- a/celt/quant_bands.c
+++ b/celt/quant_bands.c
@@ -24,10 +24,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "quant_bands.h"
@@ -42,20 +42,20 @@
 #ifdef FIXED_POINT
 /* Mean energy in each band quantized in Q4 */
 const signed char eMeans[25] = {
-      103,100, 92, 85, 81,
-       77, 72, 70, 78, 75,
-       73, 71, 78, 74, 69,
-       72, 70, 74, 76, 71,
-       60, 60, 60, 60, 60
+    103, 100, 92, 85, 81,
+    77, 72, 70, 78, 75,
+    73, 71, 78, 74, 69,
+    72, 70, 74, 76, 71,
+    60, 60, 60, 60, 60
 };
 #else
 /* Mean energy in each band quantized in Q4 and converted back to float */
 const oac_val16 eMeans[25] = {
-      6.437500f, 6.250000f, 5.750000f, 5.312500f, 5.062500f,
-      4.812500f, 4.500000f, 4.375000f, 4.875000f, 4.687500f,
-      4.562500f, 4.437500f, 4.875000f, 4.625000f, 4.312500f,
-      4.500000f, 4.375000f, 4.625000f, 4.750000f, 4.437500f,
-      3.750000f, 3.750000f, 3.750000f, 3.750000f, 3.750000f
+    6.437500f, 6.250000f, 5.750000f, 5.312500f, 5.062500f,
+    4.812500f, 4.500000f, 4.375000f, 4.875000f, 4.687500f,
+    4.562500f, 4.437500f, 4.875000f, 4.625000f, 4.312500f,
+    4.500000f, 4.375000f, 4.625000f, 4.750000f, 4.437500f,
+    3.750000f, 3.750000f, 3.750000f, 3.750000f, 3.750000f
 };
 #endif
 /* prediction coefficients: 0.9, 0.8, 0.65, 0.5 */
@@ -70,503 +70,471 @@ static const oac_val16 beta_intra = 4915/32768.;
 #endif
 
 /*Parameters of the Laplace-like probability models used for the coarse energy.
-  There is one pair of parameters for each frame size, prediction type
+   There is one pair of parameters for each frame size, prediction type
    (inter/intra), and band number.
-  The first number of each pair is the probability of 0, and the second is the
+   The first number of each pair is the probability of 0, and the second is the
    decay rate, both in Q8 precision.*/
 static const unsigned char e_prob_model[4][2][42] = {
-   /*120 sample frames.*/
-   {
-      /*Inter*/
-      {
-          72, 127,  65, 129,  66, 128,  65, 128,  64, 128,  62, 128,  64, 128,
-          64, 128,  92,  78,  92,  79,  92,  78,  90,  79, 116,  41, 115,  40,
-         114,  40, 132,  26, 132,  26, 145,  17, 161,  12, 176,  10, 177,  11
-      },
-      /*Intra*/
-      {
-          24, 179,  48, 138,  54, 135,  54, 132,  53, 134,  56, 133,  55, 132,
-          55, 132,  61, 114,  70,  96,  74,  88,  75,  88,  87,  74,  89,  66,
-          91,  67, 100,  59, 108,  50, 120,  40, 122,  37,  97,  43,  78,  50
-      }
-   },
-   /*240 sample frames.*/
-   {
-      /*Inter*/
-      {
-          83,  78,  84,  81,  88,  75,  86,  74,  87,  71,  90,  73,  93,  74,
-          93,  74, 109,  40, 114,  36, 117,  34, 117,  34, 143,  17, 145,  18,
-         146,  19, 162,  12, 165,  10, 178,   7, 189,   6, 190,   8, 177,   9
-      },
-      /*Intra*/
-      {
-          23, 178,  54, 115,  63, 102,  66,  98,  69,  99,  74,  89,  71,  91,
-          73,  91,  78,  89,  86,  80,  92,  66,  93,  64, 102,  59, 103,  60,
-         104,  60, 117,  52, 123,  44, 138,  35, 133,  31,  97,  38,  77,  45
-      }
-   },
-   /*480 sample frames.*/
-   {
-      /*Inter*/
-      {
-          61,  90,  93,  60, 105,  42, 107,  41, 110,  45, 116,  38, 113,  38,
-         112,  38, 124,  26, 132,  27, 136,  19, 140,  20, 155,  14, 159,  16,
-         158,  18, 170,  13, 177,  10, 187,   8, 192,   6, 175,   9, 159,  10
-      },
-      /*Intra*/
-      {
-          21, 178,  59, 110,  71,  86,  75,  85,  84,  83,  91,  66,  88,  73,
-          87,  72,  92,  75,  98,  72, 105,  58, 107,  54, 115,  52, 114,  55,
-         112,  56, 129,  51, 132,  40, 150,  33, 140,  29,  98,  35,  77,  42
-      }
-   },
-   /*960 sample frames.*/
-   {
-      /*Inter*/
-      {
-          42, 121,  96,  66, 108,  43, 111,  40, 117,  44, 123,  32, 120,  36,
-         119,  33, 127,  33, 134,  34, 139,  21, 147,  23, 152,  20, 158,  25,
-         154,  26, 166,  21, 173,  16, 184,  13, 184,  10, 150,  13, 139,  15
-      },
-      /*Intra*/
-      {
-          22, 178,  63, 114,  74,  82,  84,  83,  92,  82, 103,  62,  96,  72,
-          96,  67, 101,  73, 107,  72, 113,  55, 118,  52, 125,  52, 118,  52,
-         117,  55, 135,  49, 137,  39, 157,  32, 145,  29,  97,  33,  77,  40
-      }
-   }
+    /*120 sample frames.*/
+    {
+        /*Inter*/
+        {
+            72, 127,  65, 129,  66, 128,  65, 128,  64, 128,  62, 128,  64, 128,
+            64, 128,  92,  78,  92,  79,  92,  78,  90,  79, 116,  41, 115,  40,
+            114,  40, 132,  26, 132,  26, 145,  17, 161,  12, 176,  10, 177,  11
+        },
+        /*Intra*/
+        {
+            24, 179,  48, 138,  54, 135,  54, 132,  53, 134,  56, 133,  55, 132,
+            55, 132,  61, 114,  70,  96,  74,  88,  75,  88,  87,  74,  89,  66,
+            91,  67, 100,  59, 108,  50, 120,  40, 122,  37,  97,  43,  78,  50
+        }
+    },
+    /*240 sample frames.*/
+    {
+        /*Inter*/
+        {
+            83,  78,  84,  81,  88,  75,  86,  74,  87,  71,  90,  73,  93,  74,
+            93,  74, 109,  40, 114,  36, 117,  34, 117,  34, 143,  17, 145,  18,
+            146,  19, 162,  12, 165,  10, 178,   7, 189,   6, 190,   8, 177,   9
+        },
+        /*Intra*/
+        {
+            23, 178,  54, 115,  63, 102,  66,  98,  69,  99,  74,  89,  71,  91,
+            73,  91,  78,  89,  86,  80,  92,  66,  93,  64, 102,  59, 103,  60,
+            104,  60, 117,  52, 123,  44, 138,  35, 133,  31,  97,  38,  77,  45
+        }
+    },
+    /*480 sample frames.*/
+    {
+        /*Inter*/
+        {
+            61,  90,  93,  60, 105,  42, 107,  41, 110,  45, 116,  38, 113,  38,
+            112,  38, 124,  26, 132,  27, 136,  19, 140,  20, 155,  14, 159,  16,
+            158,  18, 170,  13, 177,  10, 187,   8, 192,   6, 175,   9, 159,  10
+        },
+        /*Intra*/
+        {
+            21, 178,  59, 110,  71,  86,  75,  85,  84,  83,  91,  66,  88,  73,
+            87,  72,  92,  75,  98,  72, 105,  58, 107,  54, 115,  52, 114,  55,
+            112,  56, 129,  51, 132,  40, 150,  33, 140,  29,  98,  35,  77,  42
+        }
+    },
+    /*960 sample frames.*/
+    {
+        /*Inter*/
+        {
+            42, 121,  96,  66, 108,  43, 111,  40, 117,  44, 123,  32, 120,  36,
+            119,  33, 127,  33, 134,  34, 139,  21, 147,  23, 152,  20, 158,  25,
+            154,  26, 166,  21, 173,  16, 184,  13, 184,  10, 150,  13, 139,  15
+        },
+        /*Intra*/
+        {
+            22, 178,  63, 114,  74,  82,  84,  83,  92,  82, 103,  62,  96,  72,
+            96,  67, 101,  73, 107,  72, 113,  55, 118,  52, 125,  52, 118,  52,
+            117,  55, 135,  49, 137,  39, 157,  32, 145,  29,  97,  33,  77,  40
+        }
+    }
 };
 
-static const unsigned char small_energy_icdf[3]={2,1,0};
-
-static oac_val32 loss_distortion(const celt_glog *eBands, celt_glog *oldEBands, int start, int end, int len, int C)
-{
-   int c, i;
-   oac_val32 dist = 0;
-   c=0; do {
-      for (i=start;i<end;i++)
-      {
-         celt_glog d = PSHR32(SUB32(eBands[i+c*len], oldEBands[i+c*len]), DB_SHIFT-7);
-         dist = MAC16_16(dist, d,d);
-      }
-   } while (++c<C);
-   return MIN32(200,SHR32(dist,14));
+static const unsigned char small_energy_icdf[3] = {2, 1, 0};
+
+static oac_val32 loss_distortion(const celt_glog *eBands, celt_glog *oldEBands, int start, int end, int len, int C) {
+    int c, i;
+    oac_val32 dist = 0;
+    c = 0; do {
+        for (i = start; i < end; i++) {
+            celt_glog d = PSHR32(SUB32(eBands[i + c*len], oldEBands[i + c*len]), DB_SHIFT - 7);
+            dist = MAC16_16(dist, d, d);
+        }
+    } while (++c < C);
+    return MIN32(200, SHR32(dist, 14));
 }
 
 static int quant_coarse_energy_impl(const CELTMode *m, int start, int end,
-      const celt_glog *eBands, celt_glog *oldEBands,
-      oac_int32 budget, oac_int32 tell,
-      const unsigned char *prob_model, celt_glog *error, ec_enc *enc,
-      int C, int LM, int intra, celt_glog max_decay, int lfe)
-{
-   int i, c;
-   int badness = 0;
-   oac_val32 prev[2] = {0,0};
-   oac_val16 coef;
-   oac_val16 beta;
-
-   if (tell+3 <= budget)
-      ec_enc_bit_logp(enc, intra, 3);
-   if (intra)
-   {
-      coef = 0;
-      beta = beta_intra;
-   } else {
-      beta = beta_coef[LM];
-      coef = pred_coef[LM];
-   }
-
-   /* Encode at a fixed coarse resolution */
-   for (i=start;i<end;i++)
-   {
-      c=0;
-      do {
-         int bits_left;
-         int qi, qi0;
-         oac_val32 q;
-         celt_glog x;
-         oac_val32 f, tmp;
-         celt_glog oldE;
-         celt_glog decay_bound;
-         x = eBands[i+c*m->nbEBands];
-         oldE = MAXG(-GCONST(9.f), oldEBands[i+c*m->nbEBands]);
+                                    const celt_glog *eBands, celt_glog *oldEBands,
+                                    oac_int32 budget, oac_int32 tell,
+                                    const unsigned char *prob_model, celt_glog *error, ec_enc *enc,
+                                    int C, int LM, int intra, celt_glog max_decay, int lfe) {
+    int i, c;
+    int badness = 0;
+    oac_val32 prev[2] = {0, 0};
+    oac_val16 coef;
+    oac_val16 beta;
+
+    if (tell + 3 <= budget)
+        ec_enc_bit_logp(enc, intra, 3);
+    if (intra) {
+        coef = 0;
+        beta = beta_intra;
+    } else {
+        beta = beta_coef[LM];
+        coef = pred_coef[LM];
+    }
+
+    /* Encode at a fixed coarse resolution */
+    for (i = start; i < end; i++) {
+        c = 0;
+        do {
+            int bits_left;
+            int qi, qi0;
+            oac_val32 q;
+            celt_glog x;
+            oac_val32 f, tmp;
+            celt_glog oldE;
+            celt_glog decay_bound;
+            x = eBands[i + c*m->nbEBands];
+            oldE = MAXG(-GCONST(9.f), oldEBands[i + c*m->nbEBands]);
 #ifdef FIXED_POINT
-         f = x - MULT16_32_Q15(coef,oldE) - prev[c];
-         /* Rounding to nearest integer here is really important! */
-         qi = (f+QCONST32(.5f,DB_SHIFT))>>DB_SHIFT;
-         decay_bound = MAXG(-GCONST(28.f), SUB32((oac_val32)oldEBands[i+c*m->nbEBands],max_decay));
+            f = x - MULT16_32_Q15(coef, oldE) - prev[c];
+            /* Rounding to nearest integer here is really important! */
+            qi = (f + QCONST32(.5f, DB_SHIFT))>>DB_SHIFT;
+            decay_bound = MAXG(-GCONST(28.f), SUB32((oac_val32)oldEBands[i + c*m->nbEBands], max_decay));
 #else
-         f = x-coef*oldE-prev[c];
-         /* Rounding to nearest integer here is really important! */
-         qi = (int)floor(.5f+f);
-         decay_bound = MAXG(-GCONST(28.f), oldEBands[i+c*m->nbEBands]) - max_decay;
+            f = x - coef*oldE - prev[c];
+            /* Rounding to nearest integer here is really important! */
+            qi = (int)floor(.5f + f);
+            decay_bound = MAXG(-GCONST(28.f), oldEBands[i + c*m->nbEBands]) - max_decay;
 #endif
-         /* Prevent the energy from going down too quickly (e.g. for bands
-            that have just one bin) */
-         if (qi < 0 && x < decay_bound)
-         {
-            qi += (int)SHR32(SUB32(decay_bound,x), DB_SHIFT);
-            if (qi > 0)
-               qi = 0;
-         }
-         qi0 = qi;
-         /* If we don't have enough bits to encode all the energy, just assume
-             something safe. */
-         tell = ec_tell(enc);
-         bits_left = budget-tell-3*C*(end-i);
-         if (i!=start && bits_left < 30)
-         {
-            if (bits_left < 24)
-               qi = IMIN(1, qi);
-            if (bits_left < 16)
-               qi = IMAX(-1, qi);
-         }
-         if (lfe && i>=2)
-            qi = IMIN(qi, 0);
-         if (budget-tell >= 15)
-         {
-            int pi;
-            pi = 2*IMIN(i,20);
-            ec_laplace_encode(enc, &qi,
-                  prob_model[pi]<<7, prob_model[pi+1]<<6);
-         }
-         else if(budget-tell >= 2)
-         {
-            qi = IMAX(-1, IMIN(qi, 1));
-            ec_enc_icdf(enc, 2*qi^-(qi<0), small_energy_icdf, 2);
-         }
-         else if(budget-tell >= 1)
-         {
-            qi = IMIN(0, qi);
-            ec_enc_bit_logp(enc, -qi, 1);
-         }
-         else
-            qi = -1;
-         error[i+c*m->nbEBands] = f - SHL32(qi,DB_SHIFT);
-         badness += abs(qi0-qi);
-         q = (oac_val32)SHL32(EXTEND32(qi),DB_SHIFT);
-
-         tmp = MULT16_32_Q15(coef,oldE) + prev[c] + q;
+            /* Prevent the energy from going down too quickly (e.g. for bands
+               that have just one bin) */
+            if (qi < 0 && x < decay_bound) {
+                qi += (int)SHR32(SUB32(decay_bound, x), DB_SHIFT);
+                if (qi > 0)
+                    qi = 0;
+            }
+            qi0 = qi;
+            /* If we don't have enough bits to encode all the energy, just assume
+                something safe. */
+            tell = ec_tell(enc);
+            bits_left = budget - tell - 3*C*(end - i);
+            if (i != start && bits_left < 30) {
+                if (bits_left < 24)
+                    qi = IMIN(1, qi);
+                if (bits_left < 16)
+                    qi = IMAX(-1, qi);
+            }
+            if (lfe && i >= 2)
+                qi = IMIN(qi, 0);
+            if (budget - tell >= 15) {
+                int pi;
+                pi = 2*IMIN(i, 20);
+                ec_laplace_encode(enc, &qi,
+                  prob_model[pi]<<7, prob_model[pi + 1]<<6);
+            } else if (budget - tell >= 2) {
+                qi = IMAX(-1, IMIN(qi, 1));
+                ec_enc_icdf(enc, 2*qi^-(qi < 0), small_energy_icdf, 2);
+            } else if (budget - tell >= 1) {
+                qi = IMIN(0, qi);
+                ec_enc_bit_logp(enc, -qi, 1);
+            } else
+                qi = -1;
+            error[i + c*m->nbEBands] = f - SHL32(qi, DB_SHIFT);
+            badness += abs(qi0 - qi);
+            q = (oac_val32)SHL32(EXTEND32(qi), DB_SHIFT);
+
+            tmp = MULT16_32_Q15(coef, oldE) + prev[c] + q;
 #ifdef FIXED_POINT
-         tmp = MAX32(-GCONST(28.f), tmp);
+            tmp = MAX32(-GCONST(28.f), tmp);
 #endif
-         oldEBands[i+c*m->nbEBands] = tmp;
-         prev[c] = prev[c] + q - MULT16_32_Q15(beta,q);
-      } while (++c < C);
-   }
-   return lfe ? 0 : badness;
+            oldEBands[i + c*m->nbEBands] = tmp;
+            prev[c] = prev[c] + q - MULT16_32_Q15(beta, q);
+        } while (++c < C);
+    }
+    return lfe ? 0 : badness;
 }
 
 void quant_coarse_energy(const CELTMode *m, int start, int end, int effEnd,
-      const celt_glog *eBands, celt_glog *oldEBands, oac_uint32 budget,
-      celt_glog *error, ec_enc *enc, int C, int LM, int nbAvailableBytes,
-      int force_intra, oac_val32 *delayedIntra, int two_pass, int loss_rate, int lfe)
-{
-   int intra;
-   celt_glog max_decay;
-   VARDECL(celt_glog, oldEBands_intra);
-   VARDECL(celt_glog, error_intra);
-   ec_enc enc_start_state;
-   oac_uint32 tell;
-   int badness1=0;
-   oac_int32 intra_bias;
-   oac_val32 new_distortion;
-   SAVE_STACK;
-
-   intra = force_intra || (!two_pass && *delayedIntra>2*C*(end-start) && nbAvailableBytes > (end-start)*C);
-   intra_bias = (oac_int32)((budget**delayedIntra*loss_rate)/(C*512));
-   new_distortion = loss_distortion(eBands, oldEBands, start, effEnd, m->nbEBands, C);
-
-   tell = ec_tell(enc);
-   if (tell+3 > budget)
-      two_pass = intra = 0;
-
-   max_decay = GCONST(16.f);
-   if (end-start>10)
-   {
+                         const celt_glog *eBands, celt_glog *oldEBands, oac_uint32 budget,
+                         celt_glog *error, ec_enc *enc, int C, int LM, int nbAvailableBytes,
+                         int force_intra, oac_val32 *delayedIntra, int two_pass, int loss_rate, int lfe) {
+    int intra;
+    celt_glog max_decay;
+    VARDECL(celt_glog, oldEBands_intra);
+    VARDECL(celt_glog, error_intra);
+    ec_enc enc_start_state;
+    oac_uint32 tell;
+    int badness1 = 0;
+    oac_int32 intra_bias;
+    oac_val32 new_distortion;
+    SAVE_STACK;
+
+    intra = force_intra || (!two_pass && *delayedIntra > 2*C*(end - start) && nbAvailableBytes > (end - start)*C);
+    intra_bias = (oac_int32)((budget**delayedIntra*loss_rate)/(C*512));
+    new_distortion = loss_distortion(eBands, oldEBands, start, effEnd, m->nbEBands, C);
+
+    tell = ec_tell(enc);
+    if (tell + 3 > budget)
+        two_pass = intra = 0;
+
+    max_decay = GCONST(16.f);
+    if (end - start > 10) {
 #ifdef FIXED_POINT
-      max_decay = SHL32(MIN32(SHR32(max_decay,DB_SHIFT-3), EXTEND32(nbAvailableBytes)),DB_SHIFT-3);
+        max_decay = SHL32(MIN32(SHR32(max_decay, DB_SHIFT - 3), EXTEND32(nbAvailableBytes)), DB_SHIFT - 3);
 #else
-      max_decay = MIN32(max_decay, .125f*nbAvailableBytes);
+        max_decay = MIN32(max_decay, .125f*nbAvailableBytes);
 #endif
-   }
-   if (lfe)
-      max_decay = GCONST(3.f);
-   enc_start_state = *enc;
-
-   ALLOC(oldEBands_intra, C*m->nbEBands, celt_glog);
-   ALLOC(error_intra, C*m->nbEBands, celt_glog);
-   OAC_COPY(oldEBands_intra, oldEBands, C*m->nbEBands);
-
-   if (two_pass || intra)
-   {
-      badness1 = quant_coarse_energy_impl(m, start, end, eBands, oldEBands_intra, budget,
+    }
+    if (lfe)
+        max_decay = GCONST(3.f);
+    enc_start_state = *enc;
+
+    ALLOC(oldEBands_intra, C*m->nbEBands, celt_glog);
+    ALLOC(error_intra, C*m->nbEBands, celt_glog);
+    OAC_COPY(oldEBands_intra, oldEBands, C*m->nbEBands);
+
+    if (two_pass || intra) {
+        badness1 = quant_coarse_energy_impl(m, start, end, eBands, oldEBands_intra, budget,
             tell, e_prob_model[LM][1], error_intra, enc, C, LM, 1, max_decay, lfe);
-   }
-
-   if (!intra)
-   {
-      unsigned char *intra_buf;
-      ec_enc enc_intra_state;
-      oac_int32 tell_intra;
-      oac_uint32 nstart_bytes;
-      oac_uint32 nintra_bytes;
-      oac_uint32 save_bytes;
-      int badness2;
-      VARDECL(unsigned char, intra_bits);
-
-      tell_intra = ec_tell_frac(enc);
-
-      enc_intra_state = *enc;
-
-      nstart_bytes = ec_range_bytes(&enc_start_state);
-      nintra_bytes = ec_range_bytes(&enc_intra_state);
-      intra_buf = ec_get_buffer(&enc_intra_state) + nstart_bytes;
-      save_bytes = nintra_bytes-nstart_bytes;
-      if (save_bytes == 0)
-         save_bytes = ALLOC_NONE;
-      ALLOC(intra_bits, save_bytes, unsigned char);
-      /* Copy bits from intra bit-stream */
-      OAC_COPY(intra_bits, intra_buf, nintra_bytes - nstart_bytes);
-
-      *enc = enc_start_state;
-
-      badness2 = quant_coarse_energy_impl(m, start, end, eBands, oldEBands, budget,
+    }
+
+    if (!intra) {
+        unsigned char *intra_buf;
+        ec_enc enc_intra_state;
+        oac_int32 tell_intra;
+        oac_uint32 nstart_bytes;
+        oac_uint32 nintra_bytes;
+        oac_uint32 save_bytes;
+        int badness2;
+        VARDECL(unsigned char, intra_bits);
+
+        tell_intra = ec_tell_frac(enc);
+
+        enc_intra_state = *enc;
+
+        nstart_bytes = ec_range_bytes(&enc_start_state);
+        nintra_bytes = ec_range_bytes(&enc_intra_state);
+        intra_buf = ec_get_buffer(&enc_intra_state) + nstart_bytes;
+        save_bytes = nintra_bytes - nstart_bytes;
+        if (save_bytes == 0)
+            save_bytes = ALLOC_NONE;
+        ALLOC(intra_bits, save_bytes, unsigned char);
+        /* Copy bits from intra bit-stream */
+        OAC_COPY(intra_bits, intra_buf, nintra_bytes - nstart_bytes);
+
+        *enc = enc_start_state;
+
+        badness2 = quant_coarse_energy_impl(m, start, end, eBands, oldEBands, budget,
             tell, e_prob_model[LM][intra], error, enc, C, LM, 0, max_decay, lfe);
 
-      if (two_pass && (badness1 < badness2 || (badness1 == badness2 && ((oac_int32)ec_tell_frac(enc))+intra_bias > tell_intra)))
-      {
-         *enc = enc_intra_state;
-         /* Copy intra bits to bit-stream */
-         OAC_COPY(intra_buf, intra_bits, nintra_bytes - nstart_bytes);
-         OAC_COPY(oldEBands, oldEBands_intra, C*m->nbEBands);
-         OAC_COPY(error, error_intra, C*m->nbEBands);
-         intra = 1;
-      }
-   } else {
-      OAC_COPY(oldEBands, oldEBands_intra, C*m->nbEBands);
-      OAC_COPY(error, error_intra, C*m->nbEBands);
-   }
-
-   if (intra)
-      *delayedIntra = new_distortion;
-   else
-      *delayedIntra = ADD32(MULT16_32_Q15(MULT16_16_Q15(pred_coef[LM], pred_coef[LM]),*delayedIntra),
+        if (two_pass
+            && (badness1 < badness2
+                || (badness1 == badness2 && ((oac_int32)ec_tell_frac(enc)) + intra_bias > tell_intra))) {
+            *enc = enc_intra_state;
+            /* Copy intra bits to bit-stream */
+            OAC_COPY(intra_buf, intra_bits, nintra_bytes - nstart_bytes);
+            OAC_COPY(oldEBands, oldEBands_intra, C*m->nbEBands);
+            OAC_COPY(error, error_intra, C*m->nbEBands);
+            intra = 1;
+        }
+    } else {
+        OAC_COPY(oldEBands, oldEBands_intra, C*m->nbEBands);
+        OAC_COPY(error, error_intra, C*m->nbEBands);
+    }
+
+    if (intra)
+        *delayedIntra = new_distortion;
+    else
+        *delayedIntra = ADD32(MULT16_32_Q15(MULT16_16_Q15(pred_coef[LM], pred_coef[LM]), *delayedIntra),
             new_distortion);
 
-   RESTORE_STACK;
+    RESTORE_STACK;
 }
 
-void quant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, celt_glog *error, int *prev_quant, int *extra_quant, ec_enc *enc, int C)
-{
-   int i, c;
-   /* Encode finer resolution */
-   for (i=start;i<end;i++)
-   {
-      oac_int16 extra, prev;
-      extra = 1<<extra_quant[i];
-      if (extra_quant[i] <= 0)
-         continue;
-      if (ec_tell(enc)+C*extra_quant[i] > (oac_int32)enc->storage*8) continue;
-      prev = (prev_quant!=NULL) ? prev_quant[i] : 0;
-      c=0;
-      do {
-         int q2;
-         celt_glog offset;
+void quant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, celt_glog *error, int *prev_quant,
+                       int *extra_quant, ec_enc *enc, int C) {
+    int i, c;
+    /* Encode finer resolution */
+    for (i = start; i < end; i++) {
+        oac_int16 extra, prev;
+        extra = 1<<extra_quant[i];
+        if (extra_quant[i] <= 0)
+            continue;
+        if (ec_tell(enc) + C*extra_quant[i] > (oac_int32)enc->storage*8) continue;
+        prev = (prev_quant != NULL) ? prev_quant[i] : 0;
+        c = 0;
+        do {
+            int q2;
+            celt_glog offset;
 #ifdef FIXED_POINT
-         /* Has to be without rounding */
-         q2 = VSHR32(ADD32(error[i+c*m->nbEBands], SHR32(GCONST(.5f), prev)), DB_SHIFT-extra_quant[i]-prev);
+            /* Has to be without rounding */
+            q2 = VSHR32(ADD32(error[i + c*m->nbEBands], SHR32(GCONST(.5f), prev)), DB_SHIFT - extra_quant[i] - prev);
 #else
-         q2 = (int)floor((error[i+c*m->nbEBands]*(1<<prev)+.5f)*extra);
+            q2 = (int)floor((error[i + c*m->nbEBands]*(1<<prev) + .5f)*extra);
 #endif
-         if (q2 > extra-1)
-            q2 = extra-1;
-         if (q2<0)
-            q2 = 0;
-         ec_enc_bits(enc, q2, extra_quant[i]);
+            if (q2 > extra - 1)
+                q2 = extra - 1;
+            if (q2 < 0)
+                q2 = 0;
+            ec_enc_bits(enc, q2, extra_quant[i]);
 #ifdef FIXED_POINT
-         offset = SUB32(VSHR32(2*q2+1, extra_quant[i]-DB_SHIFT+1), GCONST(.5f));
-         offset = SHR32(offset, prev);
+            offset = SUB32(VSHR32(2*q2 + 1, extra_quant[i] - DB_SHIFT + 1), GCONST(.5f));
+            offset = SHR32(offset, prev);
 #else
-         offset = (q2+.5f)*(1<<(14-extra_quant[i]))*(1.f/16384) - .5f;
-         offset *= (1<<(14-prev))*(1.f/16384);
+            offset = (q2 + .5f)*(1<<(14 - extra_quant[i]))*(1.f/16384) - .5f;
+            offset *= (1<<(14 - prev))*(1.f/16384);
 #endif
-         oldEBands[i+c*m->nbEBands] += offset;
-         error[i+c*m->nbEBands] -= offset;
-         /*printf ("%f ", error[i] - offset);*/
-      } while (++c < C);
-   }
+            oldEBands[i + c*m->nbEBands] += offset;
+            error[i + c*m->nbEBands] -= offset;
+            /*printf ("%f ", error[i] - offset);*/
+        } while (++c < C);
+    }
 }
 
-void quant_energy_finalise(const CELTMode *m, int start, int end, celt_glog *oldEBands, celt_glog *error, int *fine_quant, int *fine_priority, int bits_left, ec_enc *enc, int C)
-{
-   int i, prio, c;
-
-   /* Use up the remaining bits */
-   for (prio=0;prio<2;prio++)
-   {
-      for (i=start;i<end && bits_left>=C ;i++)
-      {
-         if (fine_quant[i] >= MAX_FINE_BITS || fine_priority[i]!=prio)
-            continue;
-         c=0;
-         do {
-            int q2;
-            celt_glog offset;
-            q2 = error[i+c*m->nbEBands]<0 ? 0 : 1;
-            ec_enc_bits(enc, q2, 1);
+void quant_energy_finalise(const CELTMode *m, int start, int end, celt_glog *oldEBands, celt_glog *error,
+                           int *fine_quant, int *fine_priority, int bits_left, ec_enc *enc, int C) {
+    int i, prio, c;
+
+    /* Use up the remaining bits */
+    for (prio = 0; prio < 2; prio++) {
+        for (i = start; i < end && bits_left >= C ; i++) {
+            if (fine_quant[i] >= MAX_FINE_BITS || fine_priority[i] != prio)
+                continue;
+            c = 0;
+            do {
+                int q2;
+                celt_glog offset;
+                q2 = error[i + c*m->nbEBands] < 0 ? 0 : 1;
+                ec_enc_bits(enc, q2, 1);
 #ifdef FIXED_POINT
-            offset = SHR32(SHL32(q2,DB_SHIFT)-GCONST(.5f),fine_quant[i]+1);
+                offset = SHR32(SHL32(q2, DB_SHIFT) - GCONST(.5f), fine_quant[i] + 1);
 #else
-            offset = (q2-.5f)*(1<<(14-fine_quant[i]-1))*(1.f/16384);
+                offset = (q2 - .5f)*(1<<(14 - fine_quant[i] - 1))*(1.f/16384);
 #endif
-            if (oldEBands != NULL) oldEBands[i+c*m->nbEBands] += offset;
-            error[i+c*m->nbEBands] -= offset;
-            bits_left--;
-         } while (++c < C);
-      }
-   }
+                if (oldEBands != NULL) oldEBands[i + c*m->nbEBands] += offset;
+                error[i + c*m->nbEBands] -= offset;
+                bits_left--;
+            } while (++c < C);
+        }
+    }
 }
 
-void unquant_coarse_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, int intra, ec_dec *dec, int C, int LM)
-{
-   const unsigned char *prob_model = e_prob_model[LM][intra];
-   int i, c;
-   oac_val64 prev[2] = {0, 0};
-   oac_val16 coef;
-   oac_val16 beta;
-   oac_int32 budget;
-   oac_int32 tell;
-
-   if (intra)
-   {
-      coef = 0;
-      beta = beta_intra;
-   } else {
-      beta = beta_coef[LM];
-      coef = pred_coef[LM];
-   }
-
-   budget = dec->storage*8;
-
-   /* Decode at a fixed coarse resolution */
-   for (i=start;i<end;i++)
-   {
-      c=0;
-      do {
-         int qi;
-         oac_val32 q;
-         oac_val32 tmp;
-         /* It would be better to express this invariant as a
-            test on C at function entry, but that isn't enough
-            to make the static analyzer happy. */
-         celt_sig_assert(c<2);
-         tell = ec_tell(dec);
-         if(budget-tell>=15)
-         {
-            int pi;
-            pi = 2*IMIN(i,20);
-            qi = ec_laplace_decode(dec,
-                  prob_model[pi]<<7, prob_model[pi+1]<<6);
-         }
-         else if(budget-tell>=2)
-         {
-            qi = ec_dec_icdf(dec, small_energy_icdf, 2);
-            qi = (qi>>1)^-(qi&1);
-         }
-         else if(budget-tell>=1)
-         {
-            qi = -ec_dec_bit_logp(dec, 1);
-         }
-         else
-            qi = -1;
-         q = (oac_val32)SHL32(EXTEND32(qi),DB_SHIFT);
-
-         oldEBands[i+c*m->nbEBands] = MAXG(-GCONST(9.f), oldEBands[i+c*m->nbEBands]);
-         tmp = MULT16_32_Q15(coef,oldEBands[i+c*m->nbEBands]) + prev[c] + q;
+void unquant_coarse_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, int intra, ec_dec *dec, int C,
+                           int LM) {
+    const unsigned char *prob_model = e_prob_model[LM][intra];
+    int i, c;
+    oac_val64 prev[2] = {0, 0};
+    oac_val16 coef;
+    oac_val16 beta;
+    oac_int32 budget;
+    oac_int32 tell;
+
+    if (intra) {
+        coef = 0;
+        beta = beta_intra;
+    } else {
+        beta = beta_coef[LM];
+        coef = pred_coef[LM];
+    }
+
+    budget = dec->storage*8;
+
+    /* Decode at a fixed coarse resolution */
+    for (i = start; i < end; i++) {
+        c = 0;
+        do {
+            int qi;
+            oac_val32 q;
+            oac_val32 tmp;
+            /* It would be better to express this invariant as a
+               test on C at function entry, but that isn't enough
+               to make the static analyzer happy. */
+            celt_sig_assert(c < 2);
+            tell = ec_tell(dec);
+            if (budget - tell >= 15) {
+                int pi;
+                pi = 2*IMIN(i, 20);
+                qi = ec_laplace_decode(dec,
+                  prob_model[pi]<<7, prob_model[pi + 1]<<6);
+            } else if (budget - tell >= 2) {
+                qi = ec_dec_icdf(dec, small_energy_icdf, 2);
+                qi = (qi>>1)^-(qi&1);
+            } else if (budget - tell >= 1) {
+                qi = -ec_dec_bit_logp(dec, 1);
+            } else
+                qi = -1;
+            q = (oac_val32)SHL32(EXTEND32(qi), DB_SHIFT);
+
+            oldEBands[i + c*m->nbEBands] = MAXG(-GCONST(9.f), oldEBands[i + c*m->nbEBands]);
+            tmp = MULT16_32_Q15(coef, oldEBands[i + c*m->nbEBands]) + prev[c] + q;
 #ifdef FIXED_POINT
-         tmp = MIN32(GCONST(28.f), MAX32(-GCONST(28.f), tmp));
+            tmp = MIN32(GCONST(28.f), MAX32(-GCONST(28.f), tmp));
 #endif
-         oldEBands[i+c*m->nbEBands] = tmp;
-         prev[c] = prev[c] + q - MULT16_32_Q15(beta,q);
-      } while (++c < C);
-   }
+            oldEBands[i + c*m->nbEBands] = tmp;
+            prev[c] = prev[c] + q - MULT16_32_Q15(beta, q);
+        } while (++c < C);
+    }
 }
 
-void unquant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, int *prev_quant, int *extra_quant, ec_dec *dec, int C)
-{
-   int i, c;
-   /* Decode finer resolution */
-   for (i=start;i<end;i++)
-   {
-      oac_int16 extra, prev;
-      extra = extra_quant[i];
-      if (extra_quant[i] <= 0)
-         continue;
-      if (ec_tell(dec)+C*extra_quant[i] > (oac_int32)dec->storage*8) continue;
-      prev = (prev_quant!=NULL) ? prev_quant[i] : 0;
-      c=0;
-      do {
-         int q2;
-         celt_glog offset;
-         q2 = ec_dec_bits(dec, extra);
+void unquant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, int *prev_quant, int *extra_quant,
+                         ec_dec *dec, int C) {
+    int i, c;
+    /* Decode finer resolution */
+    for (i = start; i < end; i++) {
+        oac_int16 extra, prev;
+        extra = extra_quant[i];
+        if (extra_quant[i] <= 0)
+            continue;
+        if (ec_tell(dec) + C*extra_quant[i] > (oac_int32)dec->storage*8) continue;
+        prev = (prev_quant != NULL) ? prev_quant[i] : 0;
+        c = 0;
+        do {
+            int q2;
+            celt_glog offset;
+            q2 = ec_dec_bits(dec, extra);
 #ifdef FIXED_POINT
-         offset = SUB32(VSHR32(2*q2+1, extra-DB_SHIFT+1), GCONST(.5f));
-         offset = SHR32(offset, prev);
+            offset = SUB32(VSHR32(2*q2 + 1, extra - DB_SHIFT + 1), GCONST(.5f));
+            offset = SHR32(offset, prev);
 #else
-         offset = (q2+.5f)*(1<<(14-extra))*(1.f/16384) - .5f;
-         offset *= (1<<(14-prev))*(1.f/16384);
+            offset = (q2 + .5f)*(1<<(14 - extra))*(1.f/16384) - .5f;
+            offset *= (1<<(14 - prev))*(1.f/16384);
 #endif
-         oldEBands[i+c*m->nbEBands] += offset;
-      } while (++c < C);
-   }
+            oldEBands[i + c*m->nbEBands] += offset;
+        } while (++c < C);
+    }
 }
 
-void unquant_energy_finalise(const CELTMode *m, int start, int end, celt_glog *oldEBands, int *fine_quant,  int *fine_priority, int bits_left, ec_dec *dec, int C)
-{
-   int i, prio, c;
-
-   /* Use up the remaining bits */
-   for (prio=0;prio<2;prio++)
-   {
-      for (i=start;i<end && bits_left>=C ;i++)
-      {
-         if (fine_quant[i] >= MAX_FINE_BITS || fine_priority[i]!=prio)
-            continue;
-         c=0;
-         do {
-            int q2;
-            celt_glog offset;
-            q2 = ec_dec_bits(dec, 1);
+void unquant_energy_finalise(const CELTMode *m, int start, int end, celt_glog *oldEBands, int *fine_quant,
+                             int *fine_priority, int bits_left, ec_dec *dec, int C) {
+    int i, prio, c;
+
+    /* Use up the remaining bits */
+    for (prio = 0; prio < 2; prio++) {
+        for (i = start; i < end && bits_left >= C ; i++) {
+            if (fine_quant[i] >= MAX_FINE_BITS || fine_priority[i] != prio)
+                continue;
+            c = 0;
+            do {
+                int q2;
+                celt_glog offset;
+                q2 = ec_dec_bits(dec, 1);
 #ifdef FIXED_POINT
-            offset = SHR32(SHL32(q2,DB_SHIFT)-GCONST(.5f),fine_quant[i]+1);
+                offset = SHR32(SHL32(q2, DB_SHIFT) - GCONST(.5f), fine_quant[i] + 1);
 #else
-            offset = (q2-.5f)*(1<<(14-fine_quant[i]-1))*(1.f/16384);
+                offset = (q2 - .5f)*(1<<(14 - fine_quant[i] - 1))*(1.f/16384);
 #endif
-            if (oldEBands != NULL) oldEBands[i+c*m->nbEBands] += offset;
-            bits_left--;
-         } while (++c < C);
-      }
-   }
+                if (oldEBands != NULL) oldEBands[i + c*m->nbEBands] += offset;
+                bits_left--;
+            } while (++c < C);
+        }
+    }
 }
 
 void amp2Log2(const CELTMode *m, int effEnd, int end,
-      celt_ener *bandE, celt_glog *bandLogE, int C)
-{
-   int c, i;
-   c=0;
-   do {
-      for (i=0;i<effEnd;i++)
-      {
-         bandLogE[i+c*m->nbEBands] =
-               celt_log2_db(bandE[i+c*m->nbEBands])
-               - SHL32((celt_glog)eMeans[i],DB_SHIFT-4);
+              celt_ener *bandE, celt_glog *bandLogE, int C) {
+    int c, i;
+    c = 0;
+    do {
+        for (i = 0; i < effEnd; i++) {
+            bandLogE[i + c*m->nbEBands] =
+                celt_log2_db(bandE[i + c*m->nbEBands])
+                - SHL32((celt_glog)eMeans[i], DB_SHIFT - 4);
 #ifdef FIXED_POINT
-         /* Compensate for bandE[] being Q12 but celt_log2() taking a Q14 input. */
-         bandLogE[i+c*m->nbEBands] += GCONST(2.f);
+            /* Compensate for bandE[] being Q12 but celt_log2() taking a Q14 input. */
+            bandLogE[i + c*m->nbEBands] += GCONST(2.f);
 #endif
-      }
-      for (i=effEnd;i<end;i++)
-         bandLogE[c*m->nbEBands+i] = -GCONST(14.f);
-   } while (++c < C);
+        }
+        for (i = effEnd; i < end; i++)
+            bandLogE[c*m->nbEBands + i] = -GCONST(14.f);
+    } while (++c < C);
 }
diff --git a/celt/quant_bands.h b/celt/quant_bands.h
index d61ca501c..528fa29b4 100644
--- a/celt/quant_bands.h
+++ b/celt/quant_bands.h
@@ -24,7 +24,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef QUANT_BANDS
 #define QUANT_BANDS
@@ -42,25 +42,30 @@ extern const oac_val16 eMeans[25];
 #endif
 
 void amp2Log2(const CELTMode *m, int effEnd, int end,
-      celt_ener *bandE, celt_glog *bandLogE, int C);
+    celt_ener *bandE, celt_glog *bandLogE, int C);
 
 void log2Amp(const CELTMode *m, int start, int end,
-      celt_ener *eBands, const celt_glog *oldEBands, int C);
+    celt_ener *eBands, const celt_glog *oldEBands, int C);
 
 void quant_coarse_energy(const CELTMode *m, int start, int end, int effEnd,
-      const celt_glog *eBands, celt_glog *oldEBands, oac_uint32 budget,
-      celt_glog *error, ec_enc *enc, int C, int LM,
-      int nbAvailableBytes, int force_intra, oac_val32 *delayedIntra,
-      int two_pass, int loss_rate, int lfe);
+    const celt_glog *eBands, celt_glog *oldEBands, oac_uint32 budget,
+    celt_glog *error, ec_enc *enc, int C, int LM,
+    int nbAvailableBytes, int force_intra, oac_val32 *delayedIntra,
+    int two_pass, int loss_rate, int lfe);
 
-void quant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, celt_glog *error, int *fine_quant, int *extra_quant, ec_enc *enc, int C);
+void quant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, celt_glog *error, int *fine_quant,
+    int *extra_quant, ec_enc *enc, int C);
 
-void quant_energy_finalise(const CELTMode *m, int start, int end, celt_glog *oldEBands, celt_glog *error, int *fine_quant, int *fine_priority, int bits_left, ec_enc *enc, int C);
+void quant_energy_finalise(const CELTMode *m, int start, int end, celt_glog *oldEBands, celt_glog *error,
+    int *fine_quant, int *fine_priority, int bits_left, ec_enc *enc, int C);
 
-void unquant_coarse_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, int intra, ec_dec *dec, int C, int LM);
+void unquant_coarse_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, int intra, ec_dec *dec, int C,
+    int LM);
 
-void unquant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, int *fine_quant, int *extra_quant, ec_dec *dec, int C);
+void unquant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, int *fine_quant, int *extra_quant,
+    ec_dec *dec, int C);
 
-void unquant_energy_finalise(const CELTMode *m, int start, int end, celt_glog *oldEBands, int *fine_quant, int *fine_priority, int bits_left, ec_dec *dec, int C);
+void unquant_energy_finalise(const CELTMode *m, int start, int end, celt_glog *oldEBands, int *fine_quant,
+    int *fine_priority, int bits_left, ec_dec *dec, int C);
 
 #endif /* QUANT_BANDS */
diff --git a/celt/rate.c b/celt/rate.c
index 269483921..28d17b38d 100644
--- a/celt/rate.c
+++ b/celt/rate.c
@@ -24,10 +24,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <math.h>
@@ -39,206 +39,191 @@
 #include "entcode.h"
 #include "rate.h"
 
-static const unsigned char LOG2_FRAC_TABLE[24]={
-   0,
-   8,13,
-  16,19,21,23,
-  24,26,27,28,29,30,31,32,
-  32,33,34,34,35,36,36,37,37
+static const unsigned char LOG2_FRAC_TABLE[24] = {
+    0,
+    8, 13,
+    16, 19, 21, 23,
+    24, 26, 27, 28, 29, 30, 31, 32,
+    32, 33, 34, 34, 35, 36, 36, 37, 37
 };
 
 #if defined(CUSTOM_MODES)
 
 /*Determines if V(N,K) fits in a 32-bit unsigned integer.
-  N and K are themselves limited to 15 bits.*/
-static int fits_in32(int _n, int _k)
-{
-   static const oac_int16 maxN[15] = {
-      32767, 32767, 32767, 1476, 283, 109,  60,  40,
-       29,  24,  20,  18,  16,  14,  13};
-   static const oac_int16 maxK[15] = {
-      32767, 32767, 32767, 32767, 1172, 238,  95,  53,
-       36,  27,  22,  18,  16,  15,  13};
-   if (_n>=14)
-   {
-      if (_k>=14)
-         return 0;
-      else
-         return _n <= maxN[_k];
-   } else {
-      return _k <= maxK[_n];
-   }
+   N and K are themselves limited to 15 bits.*/
+static int fits_in32(int _n, int _k) {
+    static const oac_int16 maxN[15] = {
+        32767, 32767, 32767, 1476, 283, 109,  60,  40,
+        29,  24,  20,  18,  16,  14,  13
+    };
+    static const oac_int16 maxK[15] = {
+        32767, 32767, 32767, 32767, 1172, 238,  95,  53,
+        36,  27,  22,  18,  16,  15,  13
+    };
+    if (_n >= 14) {
+        if (_k >= 14)
+            return 0;
+        else
+            return _n <= maxN[_k];
+    } else {
+        return _k <= maxK[_n];
+    }
 }
 
-void compute_pulse_cache(CELTMode *m, int LM)
-{
-   int C;
-   int i;
-   int j;
-   int curr=0;
-   int nbEntries=0;
-   int entryN[100], entryK[100], entryI[100];
-   const oac_int16 *eBands = m->eBands;
-   PulseCache *cache = &m->cache;
-   oac_int16 *cindex;
-   unsigned char *bits;
-   unsigned char *cap;
-
-   cindex = (oac_int16 *)oac_alloc(sizeof(cache->index[0])*m->nbEBands*(LM+2));
-   cache->index = cindex;
-
-   /* Scan for all unique band sizes */
-   for (i=0;i<=LM+1;i++)
-   {
-      for (j=0;j<m->nbEBands;j++)
-      {
-         int k;
-         int N = (eBands[j+1]-eBands[j])<<i>>1;
-         cindex[i*m->nbEBands+j] = -1;
-         /* Find other bands that have the same size */
-         for (k=0;k<=i;k++)
-         {
-            int n;
-            for (n=0;n<m->nbEBands && (k!=i || n<j);n++)
-            {
-               if (N == (eBands[n+1]-eBands[n])<<k>>1)
-               {
-                  cindex[i*m->nbEBands+j] = cindex[k*m->nbEBands+n];
-                  break;
-               }
+void compute_pulse_cache(CELTMode *m, int LM) {
+    int C;
+    int i;
+    int j;
+    int curr = 0;
+    int nbEntries = 0;
+    int entryN[100], entryK[100], entryI[100];
+    const oac_int16 *eBands = m->eBands;
+    PulseCache *cache = &m->cache;
+    oac_int16 *cindex;
+    unsigned char *bits;
+    unsigned char *cap;
+
+    cindex = (oac_int16 *)oac_alloc(sizeof(cache->index[0])*m->nbEBands*(LM + 2));
+    cache->index = cindex;
+
+    /* Scan for all unique band sizes */
+    for (i = 0; i <= LM + 1; i++) {
+        for (j = 0; j < m->nbEBands; j++) {
+            int k;
+            int N = (eBands[j + 1] - eBands[j])<<i>>1;
+            cindex[i*m->nbEBands + j] = -1;
+            /* Find other bands that have the same size */
+            for (k = 0; k <= i; k++) {
+                int n;
+                for (n = 0; n < m->nbEBands && (k != i || n < j); n++) {
+                    if (N == (eBands[n + 1] - eBands[n])<<k>>1) {
+                        cindex[i*m->nbEBands + j] = cindex[k*m->nbEBands + n];
+                        break;
+                    }
+                }
             }
-         }
-         if (cache->index[i*m->nbEBands+j] == -1 && N!=0)
-         {
-            int K;
-            entryN[nbEntries] = N;
-            K = 0;
-            while (fits_in32(N,get_pulses(K+1)) && K<MAX_PSEUDO)
-               K++;
-            entryK[nbEntries] = K;
-            cindex[i*m->nbEBands+j] = curr;
-            entryI[nbEntries] = curr;
-
-            curr += K+1;
-            nbEntries++;
-         }
-      }
-   }
-   bits = (unsigned char *)oac_alloc(sizeof(unsigned char)*curr);
-   cache->bits = bits;
-   cache->size = curr;
-   /* Compute the cache for all unique sizes */
-   for (i=0;i<nbEntries;i++)
-   {
-      unsigned char *ptr = bits+entryI[i];
-      oac_int16 tmp[CELT_MAX_PULSES+1];
-      get_required_bits(tmp, entryN[i], get_pulses(entryK[i]), BITRES);
-      for (j=1;j<=entryK[i];j++)
-         ptr[j] = tmp[get_pulses(j)]-1;
-      ptr[0] = entryK[i];
-   }
-
-   /* Compute the maximum rate for each band at which we'll reliably use as
-       many bits as we ask for. */
-   cache->caps = cap = (unsigned char *)oac_alloc(sizeof(cache->caps[0])*(LM+1)*2*m->nbEBands);
-   for (i=0;i<=LM;i++)
-   {
-      for (C=1;C<=2;C++)
-      {
-         for (j=0;j<m->nbEBands;j++)
-         {
-            int N0;
-            int max_bits;
-            N0 = m->eBands[j+1]-m->eBands[j];
-            /* N=1 bands only have a sign bit and fine bits. */
-            if (N0<<i == 1)
-               max_bits = C*(1+MAX_FINE_BITS)<<BITRES;
-            else
-            {
-               const unsigned char *pcache;
-               oac_int32           num;
-               oac_int32           den;
-               int                  LM0;
-               int                  N;
-               int                  offset;
-               int                  ndof;
-               int                  qb;
-               int                  k;
-               LM0 = 0;
-               /* Even-sized bands bigger than N=2 can be split one more time.
-                  As of commit 44203907 all bands >1 are even, including custom modes.*/
-               if (N0 > 2)
-               {
-                  N0>>=1;
-                  LM0--;
-               }
-               /* N0=1 bands can't be split down to N<2. */
-               else if (N0 <= 1)
-               {
-                  LM0=IMIN(i,1);
-                  N0<<=LM0;
-               }
-               /* Compute the cost for the lowest-level PVQ of a fully split
-                   band. */
-               pcache = bits + cindex[(LM0+1)*m->nbEBands+j];
-               max_bits = pcache[pcache[0]]+1;
-               /* Add in the cost of coding regular splits. */
-               N = N0;
-               for(k=0;k<i-LM0;k++){
-                  max_bits <<= 1;
-                  /* Offset the number of qtheta bits by log2(N)/2
-                      + QTHETA_OFFSET compared to their "fair share" of
-                      total/N */
-                  offset = ((m->logN[j]+(oac_int32)((oac_uint32)(LM0+k)<<BITRES))>>1)-QTHETA_OFFSET;
-                  /* The number of qtheta bits we'll allocate if the remainder
-                      is to be max_bits.
-                     The average measured cost for theta is 0.89701 times qb,
-                      approximated here as 459/512. */
-                  num=459*(oac_int32)((2*N-1)*offset+max_bits);
-                  den=((oac_int32)(2*N-1)<<9)-459;
-                  qb = IMIN((num+(den>>1))/den, 57);
-                  celt_assert(qb >= 0);
-                  max_bits += qb;
-                  N <<= 1;
-               }
-               /* Add in the cost of a stereo split, if necessary. */
-               if (C==2)
-               {
-                  max_bits <<= 1;
-                  offset = ((m->logN[j]+(i<<BITRES))>>1)-(N==2?QTHETA_OFFSET_TWOPHASE:QTHETA_OFFSET);
-                  ndof = 2*N-1-(N==2);
-                  /* The average measured cost for theta with the step PDF is
-                      0.95164 times qb, approximated here as 487/512. */
-                  num = (N==2?512:487)*(oac_int32)(max_bits+ndof*offset);
-                  den = ((oac_int32)ndof<<9)-(N==2?512:487);
-                  qb = IMIN((num+(den>>1))/den, (N==2?64:61));
-                  celt_assert(qb >= 0);
-                  max_bits += qb;
-               }
-               /* Add the fine bits we'll use. */
-               /* Compensate for the extra DoF in stereo */
-               ndof = C*N + ((C==2 && N>2) ? 1 : 0);
-               /* Offset the number of fine bits by log2(N)/2 + FINE_OFFSET
-                   compared to their "fair share" of total/N */
-               offset = ((m->logN[j] + (i<<BITRES))>>1)-FINE_OFFSET;
-               /* N=2 is the only point that doesn't match the curve */
-               if (N==2)
-                  offset += 1<<BITRES>>2;
-               /* The number of fine bits we'll allocate if the remainder is
-                   to be max_bits. */
-               num = max_bits+ndof*offset;
-               den = (ndof-1)<<BITRES;
-               qb = IMIN((num+(den>>1))/den, MAX_FINE_BITS);
-               celt_assert(qb >= 0);
-               max_bits += C*qb<<BITRES;
+            if (cache->index[i*m->nbEBands + j] == -1 && N != 0) {
+                int K;
+                entryN[nbEntries] = N;
+                K = 0;
+                while (fits_in32(N, get_pulses(K + 1)) && K < MAX_PSEUDO)
+                    K++;
+                entryK[nbEntries] = K;
+                cindex[i*m->nbEBands + j] = curr;
+                entryI[nbEntries] = curr;
+
+                curr += K + 1;
+                nbEntries++;
+            }
+        }
+    }
+    bits = (unsigned char *)oac_alloc(sizeof(unsigned char)*curr);
+    cache->bits = bits;
+    cache->size = curr;
+    /* Compute the cache for all unique sizes */
+    for (i = 0; i < nbEntries; i++) {
+        unsigned char *ptr = bits + entryI[i];
+        oac_int16 tmp[CELT_MAX_PULSES + 1];
+        get_required_bits(tmp, entryN[i], get_pulses(entryK[i]), BITRES);
+        for (j = 1; j <= entryK[i]; j++)
+            ptr[j] = tmp[get_pulses(j)] - 1;
+        ptr[0] = entryK[i];
+    }
+
+    /* Compute the maximum rate for each band at which we'll reliably use as
+        many bits as we ask for. */
+    cache->caps = cap = (unsigned char *)oac_alloc(sizeof(cache->caps[0])*(LM + 1)*2*m->nbEBands);
+    for (i = 0; i <= LM; i++) {
+        for (C = 1; C <= 2; C++) {
+            for (j = 0; j < m->nbEBands; j++) {
+                int N0;
+                int max_bits;
+                N0 = m->eBands[j + 1] - m->eBands[j];
+                /* N=1 bands only have a sign bit and fine bits. */
+                if (N0<<i == 1)
+                    max_bits = C*(1 + MAX_FINE_BITS)<<BITRES;
+                else {
+                    const unsigned char *pcache;
+                    oac_int32 num;
+                    oac_int32 den;
+                    int LM0;
+                    int N;
+                    int offset;
+                    int ndof;
+                    int qb;
+                    int k;
+                    LM0 = 0;
+                    /* Even-sized bands bigger than N=2 can be split one more time.
+                       As of commit 44203907 all bands >1 are even, including custom modes.*/
+                    if (N0 > 2) {
+                        N0 >>= 1;
+                        LM0--;
+                    }
+                    /* N0=1 bands can't be split down to N<2. */
+                    else if (N0 <= 1) {
+                        LM0 = IMIN(i, 1);
+                        N0 <<= LM0;
+                    }
+                    /* Compute the cost for the lowest-level PVQ of a fully split
+                        band. */
+                    pcache = bits + cindex[(LM0 + 1)*m->nbEBands + j];
+                    max_bits = pcache[pcache[0]] + 1;
+                    /* Add in the cost of coding regular splits. */
+                    N = N0;
+                    for (k = 0; k < i - LM0; k++) {
+                        max_bits <<= 1;
+                        /* Offset the number of qtheta bits by log2(N)/2
+                         + QTHETA_OFFSET compared to their "fair share" of
+                            total/N */
+                        offset = ((m->logN[j] + (oac_int32)((oac_uint32)(LM0 + k)<<BITRES))>>1) - QTHETA_OFFSET;
+                        /* The number of qtheta bits we'll allocate if the remainder
+                            is to be max_bits.
+                           The average measured cost for theta is 0.89701 times qb,
+                            approximated here as 459/512. */
+                        num = 459*(oac_int32)((2*N - 1)*offset + max_bits);
+                        den = ((oac_int32)(2*N - 1)<<9) - 459;
+                        qb = IMIN((num + (den>>1))/den, 57);
+                        celt_assert(qb >= 0);
+                        max_bits += qb;
+                        N <<= 1;
+                    }
+                    /* Add in the cost of a stereo split, if necessary. */
+                    if (C == 2) {
+                        max_bits <<= 1;
+                        offset = ((m->logN[j] + (i<<BITRES))>>1) - (N == 2?QTHETA_OFFSET_TWOPHASE:QTHETA_OFFSET);
+                        ndof = 2*N - 1 - (N == 2);
+                        /* The average measured cost for theta with the step PDF is
+                            0.95164 times qb, approximated here as 487/512. */
+                        num = (N == 2?512:487)*(oac_int32)(max_bits + ndof*offset);
+                        den = ((oac_int32)ndof<<9) - (N == 2?512:487);
+                        qb = IMIN((num + (den>>1))/den, (N == 2?64:61));
+                        celt_assert(qb >= 0);
+                        max_bits += qb;
+                    }
+                    /* Add the fine bits we'll use. */
+                    /* Compensate for the extra DoF in stereo */
+                    ndof = C*N + ((C == 2 && N > 2) ? 1 : 0);
+                    /* Offset the number of fine bits by log2(N)/2 + FINE_OFFSET
+                        compared to their "fair share" of total/N */
+                    offset = ((m->logN[j] + (i<<BITRES))>>1) - FINE_OFFSET;
+                    /* N=2 is the only point that doesn't match the curve */
+                    if (N == 2)
+                        offset += 1<<BITRES>>2;
+                    /* The number of fine bits we'll allocate if the remainder is
+                        to be max_bits. */
+                    num = max_bits + ndof*offset;
+                    den = (ndof - 1)<<BITRES;
+                    qb = IMIN((num + (den>>1))/den, MAX_FINE_BITS);
+                    celt_assert(qb >= 0);
+                    max_bits += C*qb<<BITRES;
+                }
+                max_bits = (4*max_bits/(C*((m->eBands[j + 1] - m->eBands[j])<<i))) - 64;
+                celt_assert(max_bits >= 0);
+                celt_assert(max_bits < 256);
+                *cap++ = (unsigned char)max_bits;
             }
-            max_bits = (4*max_bits/(C*((m->eBands[j+1]-m->eBands[j])<<i)))-64;
-            celt_assert(max_bits >= 0);
-            celt_assert(max_bits < 256);
-            *cap++ = (unsigned char)max_bits;
-         }
-      }
-   }
+        }
+    }
 }
 
 #endif /* CUSTOM_MODES */
@@ -246,400 +231,374 @@ void compute_pulse_cache(CELTMode *m, int LM)
 #define ALLOC_STEPS 6
 
 static OAC_INLINE int interp_bits2pulses(const CELTMode *m, int start, int end, int skip_start,
-      const int *bits1, const int *bits2, const int *thresh, const int *cap, oac_int32 total, oac_int32 *_balance,
-      int skip_rsv, int *intensity, int intensity_rsv, int *dual_stereo, int dual_stereo_rsv, int *bits,
-      int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec, int encode, int prev, int signalBandwidth)
-{
-   oac_int32 psum;
-   int lo, hi;
-   int i, j;
-   int logM;
-   int stereo;
-   int codedBands=-1;
-   int alloc_floor;
-   oac_int32 left, percoeff;
-   int done;
-   oac_int32 balance;
-   SAVE_STACK;
-
-   alloc_floor = C<<BITRES;
-   stereo = C>1;
-
-   logM = LM<<BITRES;
-   lo = 0;
-   hi = 1<<ALLOC_STEPS;
-   for (i=0;i<ALLOC_STEPS;i++)
-   {
-      int mid = (lo+hi)>>1;
-      psum = 0;
-      done = 0;
-      for (j=end;j-->start;)
-      {
-         int tmp = bits1[j] + (mid*(oac_int32)bits2[j]>>ALLOC_STEPS);
-         if (tmp >= thresh[j] || done)
-         {
-            done = 1;
-            /* Don't allocate more than we can actually use */
-            psum += IMIN(tmp, cap[j]);
-         } else {
+                                         const int *bits1, const int *bits2, const int *thresh, const int *cap,
+                                         oac_int32 total, oac_int32 *_balance,
+                                         int skip_rsv, int *intensity, int intensity_rsv, int *dual_stereo,
+                                         int dual_stereo_rsv, int *bits,
+                                         int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec, int encode,
+                                         int prev, int signalBandwidth) {
+    oac_int32 psum;
+    int lo, hi;
+    int i, j;
+    int logM;
+    int stereo;
+    int codedBands = -1;
+    int alloc_floor;
+    oac_int32 left, percoeff;
+    int done;
+    oac_int32 balance;
+    SAVE_STACK;
+
+    alloc_floor = C<<BITRES;
+    stereo = C > 1;
+
+    logM = LM<<BITRES;
+    lo = 0;
+    hi = 1<<ALLOC_STEPS;
+    for (i = 0; i < ALLOC_STEPS; i++) {
+        int mid = (lo + hi)>>1;
+        psum = 0;
+        done = 0;
+        for (j = end; j-- > start;) {
+            int tmp = bits1[j] + (mid*(oac_int32)bits2[j]>>ALLOC_STEPS);
+            if (tmp >= thresh[j] || done) {
+                done = 1;
+                /* Don't allocate more than we can actually use */
+                psum += IMIN(tmp, cap[j]);
+            } else {
+                if (tmp >= alloc_floor)
+                    psum += alloc_floor;
+            }
+        }
+        if (psum > total)
+            hi = mid;
+        else
+            lo = mid;
+    }
+    psum = 0;
+    /*printf ("interp bisection gave %d\n", lo);*/
+    done = 0;
+    for (j = end; j-- > start;) {
+        int tmp = bits1[j] + ((oac_int32)lo*bits2[j]>>ALLOC_STEPS);
+        if (tmp < thresh[j] && !done) {
             if (tmp >= alloc_floor)
-               psum += alloc_floor;
-         }
-      }
-      if (psum > total)
-         hi = mid;
-      else
-         lo = mid;
-   }
-   psum = 0;
-   /*printf ("interp bisection gave %d\n", lo);*/
-   done = 0;
-   for (j=end;j-->start;)
-   {
-      int tmp = bits1[j] + ((oac_int32)lo*bits2[j]>>ALLOC_STEPS);
-      if (tmp < thresh[j] && !done)
-      {
-         if (tmp >= alloc_floor)
-            tmp = alloc_floor;
-         else
-            tmp = 0;
-      } else
-         done = 1;
-      /* Don't allocate more than we can actually use */
-      tmp = IMIN(tmp, cap[j]);
-      bits[j] = tmp;
-      psum += tmp;
-   }
-
-   /* Decide which bands to skip, working backwards from the end. */
-   for (codedBands=end;;codedBands--)
-   {
-      int band_width;
-      int band_bits;
-      int rem;
-      j = codedBands-1;
-      /* Never skip the first band, nor a band that has been boosted by
-          dynalloc.
-         In the first case, we'd be coding a bit to signal we're going to waste
-          all the other bits.
-         In the second case, we'd be coding a bit to redistribute all the bits
-          we just signaled should be concentrated in this band. */
-      if (j<=skip_start)
-      {
-         /* Give the bit we reserved to end skipping back. */
-         total += skip_rsv;
-         break;
-      }
-      /*Figure out how many left-over bits we would be adding to this band.
-        This can include bits we've stolen back from higher, skipped bands.*/
-      left = total-psum;
-      percoeff = celt_udiv(left, m->eBands[codedBands]-m->eBands[start]);
-      left -= (m->eBands[codedBands]-m->eBands[start])*percoeff;
-      rem = IMAX(left-(m->eBands[j]-m->eBands[start]),0);
-      band_width = m->eBands[codedBands]-m->eBands[j];
-      band_bits = (int)(bits[j] + percoeff*band_width + rem);
-      /*Only code a skip decision if we're above the threshold for this band.
-        Otherwise it is force-skipped.
-        This ensures that we have enough bits to code the skip flag.*/
-      if (band_bits >= IMAX(thresh[j], alloc_floor+(1<<BITRES)))
-      {
-         if (encode)
-         {
-            /*This if() block is the only part of the allocation function that
-               is not a mandatory part of the bitstream: any bands we choose to
-               skip here must be explicitly signaled.*/
-            int depth_threshold;
-            /*We choose a threshold with some hysteresis to keep bands from
-               fluctuating in and out, but we try not to fold below a certain point. */
-            if (codedBands > 17)
-               depth_threshold = j<prev ? 7 : 9;
+                tmp = alloc_floor;
             else
-               depth_threshold = 0;
+                tmp = 0;
+        } else
+            done = 1;
+        /* Don't allocate more than we can actually use */
+        tmp = IMIN(tmp, cap[j]);
+        bits[j] = tmp;
+        psum += tmp;
+    }
+
+    /* Decide which bands to skip, working backwards from the end. */
+    for (codedBands = end;; codedBands--) {
+        int band_width;
+        int band_bits;
+        int rem;
+        j = codedBands - 1;
+        /* Never skip the first band, nor a band that has been boosted by
+            dynalloc.
+           In the first case, we'd be coding a bit to signal we're going to waste
+            all the other bits.
+           In the second case, we'd be coding a bit to redistribute all the bits
+            we just signaled should be concentrated in this band. */
+        if (j <= skip_start) {
+            /* Give the bit we reserved to end skipping back. */
+            total += skip_rsv;
+            break;
+        }
+        /*Figure out how many left-over bits we would be adding to this band.
+           This can include bits we've stolen back from higher, skipped bands.*/
+        left = total - psum;
+        percoeff = celt_udiv(left, m->eBands[codedBands] - m->eBands[start]);
+        left -= (m->eBands[codedBands] - m->eBands[start])*percoeff;
+        rem = IMAX(left - (m->eBands[j] - m->eBands[start]), 0);
+        band_width = m->eBands[codedBands] - m->eBands[j];
+        band_bits = (int)(bits[j] + percoeff*band_width + rem);
+        /*Only code a skip decision if we're above the threshold for this band.
+           Otherwise it is force-skipped.
+           This ensures that we have enough bits to code the skip flag.*/
+        if (band_bits >= IMAX(thresh[j], alloc_floor + (1<<BITRES))) {
+            if (encode) {
+                /*This if() block is the only part of the allocation function that
+                   is not a mandatory part of the bitstream: any bands we choose to
+                   skip here must be explicitly signaled.*/
+                int depth_threshold;
+                /*We choose a threshold with some hysteresis to keep bands from
+                   fluctuating in and out, but we try not to fold below a certain point. */
+                if (codedBands > 17)
+                    depth_threshold = j < prev ? 7 : 9;
+                else
+                    depth_threshold = 0;
 #ifdef FUZZING
-            (void)signalBandwidth;
-            (void)depth_threshold;
-            if ((rand()&0x1) == 0)
+                (void)signalBandwidth;
+                (void)depth_threshold;
+                if ((rand()&0x1) == 0)
 #else
-            if (codedBands<=start+2 || (band_bits > (depth_threshold*band_width<<LM<<BITRES)>>4 && j<=signalBandwidth))
+                if (codedBands <= start + 2
+                    || (band_bits > (depth_threshold*band_width<<LM<<BITRES)>>4 && j <= signalBandwidth))
 #endif
-            {
-               ec_enc_bit_logp(ec, 1, 1);
-               break;
+                {
+                    ec_enc_bit_logp(ec, 1, 1);
+                    break;
+                }
+                ec_enc_bit_logp(ec, 0, 1);
+            } else if (ec_dec_bit_logp(ec, 1)) {
+                break;
             }
-            ec_enc_bit_logp(ec, 0, 1);
-         } else if (ec_dec_bit_logp(ec, 1)) {
-            break;
-         }
-         /*We used a bit to skip this band.*/
-         psum += 1<<BITRES;
-         band_bits -= 1<<BITRES;
-      }
-      /*Reclaim the bits originally allocated to this band.*/
-      psum -= bits[j]+intensity_rsv;
-      if (intensity_rsv > 0)
-         intensity_rsv = LOG2_FRAC_TABLE[j-start];
-      psum += intensity_rsv;
-      if (band_bits >= alloc_floor)
-      {
-         /*If we have enough for a fine energy bit per channel, use it.*/
-         psum += alloc_floor;
-         bits[j] = alloc_floor;
-      } else {
-         /*Otherwise this band gets nothing at all.*/
-         bits[j] = 0;
-      }
-   }
-
-   celt_assert(codedBands > start);
-   /* Code the intensity and dual stereo parameters. */
-   if (intensity_rsv > 0)
-   {
-      if (encode)
-      {
-         *intensity = IMIN(*intensity, codedBands);
-         ec_enc_uint(ec, *intensity-start, codedBands+1-start);
-      }
-      else
-         *intensity = start+ec_dec_uint(ec, codedBands+1-start);
-   }
-   else
-      *intensity = 0;
-   if (*intensity <= start)
-   {
-      total += dual_stereo_rsv;
-      dual_stereo_rsv = 0;
-   }
-   if (dual_stereo_rsv > 0)
-   {
-      if (encode)
-         ec_enc_bit_logp(ec, *dual_stereo, 1);
-      else
-         *dual_stereo = ec_dec_bit_logp(ec, 1);
-   }
-   else
-      *dual_stereo = 0;
-
-   /* Allocate the remaining bits */
-   left = total-psum;
-   percoeff = celt_udiv(left, m->eBands[codedBands]-m->eBands[start]);
-   left -= (m->eBands[codedBands]-m->eBands[start])*percoeff;
-   for (j=start;j<codedBands;j++)
-      bits[j] += ((int)percoeff*(m->eBands[j+1]-m->eBands[j]));
-   for (j=start;j<codedBands;j++)
-   {
-      int tmp = (int)IMIN(left, m->eBands[j+1]-m->eBands[j]);
-      bits[j] += tmp;
-      left -= tmp;
-   }
-   /*for (j=0;j<end;j++)printf("%d ", bits[j]);printf("\n");*/
-
-   balance = 0;
-   for (j=start;j<codedBands;j++)
-   {
-      int N0, N, den;
-      int offset;
-      int NClogN;
-      oac_int32 excess, bit;
-
-      celt_assert(bits[j] >= 0);
-      N0 = m->eBands[j+1]-m->eBands[j];
-      N=N0<<LM;
-      bit = (oac_int32)bits[j]+balance;
-
-      if (N>1)
-      {
-         excess = MAX32(bit-cap[j],0);
-         bits[j] = bit-excess;
-
-         /* Compensate for the extra DoF in stereo */
-         den=(C*N+ ((C==2 && N>2 && !*dual_stereo && j<*intensity) ? 1 : 0));
-
-         NClogN = den*(m->logN[j] + logM);
-
-         /* Offset for the number of fine bits by log2(N)/2 + FINE_OFFSET
-            compared to their "fair share" of total/N */
-         offset = (NClogN>>1)-den*FINE_OFFSET;
-
-         /* N=2 is the only point that doesn't match the curve */
-         if (N==2)
-            offset += den<<BITRES>>2;
-
-         /* Changing the offset for allocating the second and third
-             fine energy bit */
-         if (bits[j] + offset < den*2<<BITRES)
-            offset += NClogN>>2;
-         else if (bits[j] + offset < den*3<<BITRES)
-            offset += NClogN>>3;
-
-         /* Divide with rounding */
-         ebits[j] = IMAX(0, (bits[j] + offset + (den<<(BITRES-1))));
-         ebits[j] = celt_udiv(ebits[j], den)>>BITRES;
-
-         /* Make sure not to bust */
-         if (C*ebits[j] > (bits[j]>>BITRES))
-            ebits[j] = bits[j] >> stereo >> BITRES;
-
-         /* More than that is useless because that's about as far as PVQ can go */
-         ebits[j] = IMIN(ebits[j], MAX_FINE_BITS);
-
-         /* If we rounded down or capped this band, make it a candidate for the
-             final fine energy pass */
-         fine_priority[j] = ebits[j]*(den<<BITRES) >= bits[j]+offset;
-
-         /* Remove the allocated fine bits; the rest are assigned to PVQ */
-         bits[j] -= C*ebits[j]<<BITRES;
-
-      } else {
-         /* For N=1, all bits go to fine energy except for a single sign bit */
-         excess = MAX32(0,bit-(C<<BITRES));
-         bits[j] = bit-excess;
-         ebits[j] = 0;
-         fine_priority[j] = 1;
-      }
-
-      /* Fine energy can't take advantage of the re-balancing in
-          quant_all_bands().
-         Instead, do the re-balancing here.*/
-      if(excess > 0)
-      {
-         int extra_fine;
-         int extra_bits;
-         extra_fine = IMIN(excess>>(stereo+BITRES),MAX_FINE_BITS-ebits[j]);
-         ebits[j] += extra_fine;
-         extra_bits = extra_fine*C<<BITRES;
-         fine_priority[j] = extra_bits >= excess-balance;
-         excess -= extra_bits;
-      }
-      balance = excess;
-
-      celt_assert(bits[j] >= 0);
-      celt_assert(ebits[j] >= 0);
-   }
-   /* Save any remaining bits over the cap for the rebalancing in
-       quant_all_bands(). */
-   *_balance = balance;
-
-   /* The skipped bands use all their bits for fine energy. */
-   for (;j<end;j++)
-   {
-      ebits[j] = bits[j] >> stereo >> BITRES;
-      celt_assert(C*ebits[j]<<BITRES == bits[j]);
-      bits[j] = 0;
-      fine_priority[j] = ebits[j]<1;
-   }
-   RESTORE_STACK;
-   return codedBands;
+            /*We used a bit to skip this band.*/
+            psum += 1<<BITRES;
+            band_bits -= 1<<BITRES;
+        }
+        /*Reclaim the bits originally allocated to this band.*/
+        psum -= bits[j] + intensity_rsv;
+        if (intensity_rsv > 0)
+            intensity_rsv = LOG2_FRAC_TABLE[j - start];
+        psum += intensity_rsv;
+        if (band_bits >= alloc_floor) {
+            /*If we have enough for a fine energy bit per channel, use it.*/
+            psum += alloc_floor;
+            bits[j] = alloc_floor;
+        } else {
+            /*Otherwise this band gets nothing at all.*/
+            bits[j] = 0;
+        }
+    }
+
+    celt_assert(codedBands > start);
+    /* Code the intensity and dual stereo parameters. */
+    if (intensity_rsv > 0) {
+        if (encode) {
+            *intensity = IMIN(*intensity, codedBands);
+            ec_enc_uint(ec, *intensity - start, codedBands + 1 - start);
+        } else
+            *intensity = start + ec_dec_uint(ec, codedBands + 1 - start);
+    } else
+        *intensity = 0;
+    if (*intensity <= start) {
+        total += dual_stereo_rsv;
+        dual_stereo_rsv = 0;
+    }
+    if (dual_stereo_rsv > 0) {
+        if (encode)
+            ec_enc_bit_logp(ec, *dual_stereo, 1);
+        else
+            *dual_stereo = ec_dec_bit_logp(ec, 1);
+    } else
+        *dual_stereo = 0;
+
+    /* Allocate the remaining bits */
+    left = total - psum;
+    percoeff = celt_udiv(left, m->eBands[codedBands] - m->eBands[start]);
+    left -= (m->eBands[codedBands] - m->eBands[start])*percoeff;
+    for (j = start; j < codedBands; j++)
+        bits[j] += ((int)percoeff*(m->eBands[j + 1] - m->eBands[j]));
+    for (j = start; j < codedBands; j++) {
+        int tmp = (int)IMIN(left, m->eBands[j + 1] - m->eBands[j]);
+        bits[j] += tmp;
+        left -= tmp;
+    }
+    /*for (j=0;j<end;j++)printf("%d ", bits[j]);printf("\n");*/
+
+    balance = 0;
+    for (j = start; j < codedBands; j++) {
+        int N0, N, den;
+        int offset;
+        int NClogN;
+        oac_int32 excess, bit;
+
+        celt_assert(bits[j] >= 0);
+        N0 = m->eBands[j + 1] - m->eBands[j];
+        N = N0<<LM;
+        bit = (oac_int32)bits[j] + balance;
+
+        if (N > 1) {
+            excess = MAX32(bit - cap[j], 0);
+            bits[j] = bit - excess;
+
+            /* Compensate for the extra DoF in stereo */
+            den = (C*N + ((C == 2 && N > 2 && !*dual_stereo && j < *intensity) ? 1 : 0));
+
+            NClogN = den*(m->logN[j] + logM);
+
+            /* Offset for the number of fine bits by log2(N)/2 + FINE_OFFSET
+               compared to their "fair share" of total/N */
+            offset = (NClogN>>1) - den*FINE_OFFSET;
+
+            /* N=2 is the only point that doesn't match the curve */
+            if (N == 2)
+                offset += den<<BITRES>>2;
+
+            /* Changing the offset for allocating the second and third
+                fine energy bit */
+            if (bits[j] + offset < den*2<<BITRES)
+                offset += NClogN>>2;
+            else if (bits[j] + offset < den*3<<BITRES)
+                offset += NClogN>>3;
+
+            /* Divide with rounding */
+            ebits[j] = IMAX(0, (bits[j] + offset + (den<<(BITRES - 1))));
+            ebits[j] = celt_udiv(ebits[j], den)>>BITRES;
+
+            /* Make sure not to bust */
+            if (C*ebits[j] > (bits[j]>>BITRES))
+                ebits[j] = bits[j]>>stereo>>BITRES;
+
+            /* More than that is useless because that's about as far as PVQ can go */
+            ebits[j] = IMIN(ebits[j], MAX_FINE_BITS);
+
+            /* If we rounded down or capped this band, make it a candidate for the
+                final fine energy pass */
+            fine_priority[j] = ebits[j]*(den<<BITRES) >= bits[j] + offset;
+
+            /* Remove the allocated fine bits; the rest are assigned to PVQ */
+            bits[j] -= C*ebits[j]<<BITRES;
+
+        } else {
+            /* For N=1, all bits go to fine energy except for a single sign bit */
+            excess = MAX32(0, bit - (C<<BITRES));
+            bits[j] = bit - excess;
+            ebits[j] = 0;
+            fine_priority[j] = 1;
+        }
+
+        /* Fine energy can't take advantage of the re-balancing in
+            quant_all_bands().
+           Instead, do the re-balancing here.*/
+        if (excess > 0) {
+            int extra_fine;
+            int extra_bits;
+            extra_fine = IMIN(excess>>(stereo + BITRES), MAX_FINE_BITS - ebits[j]);
+            ebits[j] += extra_fine;
+            extra_bits = extra_fine*C<<BITRES;
+            fine_priority[j] = extra_bits >= excess - balance;
+            excess -= extra_bits;
+        }
+        balance = excess;
+
+        celt_assert(bits[j] >= 0);
+        celt_assert(ebits[j] >= 0);
+    }
+    /* Save any remaining bits over the cap for the rebalancing in
+        quant_all_bands(). */
+    *_balance = balance;
+
+    /* The skipped bands use all their bits for fine energy. */
+    for (; j < end; j++) {
+        ebits[j] = bits[j]>>stereo>>BITRES;
+        celt_assert(C*ebits[j]<<BITRES == bits[j]);
+        bits[j] = 0;
+        fine_priority[j] = ebits[j] < 1;
+    }
+    RESTORE_STACK;
+    return codedBands;
 }
 
-int clt_compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim, int *intensity, int *dual_stereo,
-      oac_int32 total, oac_int32 *balance, int *pulses, int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec, int encode, int prev, int signalBandwidth)
-{
-   int lo, hi, len, j;
-   int codedBands;
-   int skip_start;
-   int skip_rsv;
-   int intensity_rsv;
-   int dual_stereo_rsv;
-   VARDECL(int, bits1);
-   VARDECL(int, bits2);
-   VARDECL(int, thresh);
-   VARDECL(int, trim_offset);
-   SAVE_STACK;
-
-   total = IMAX(total, 0);
-   len = m->nbEBands;
-   skip_start = start;
-   /* Reserve a bit to signal the end of manually skipped bands. */
-   skip_rsv = total >= 1<<BITRES ? 1<<BITRES : 0;
-   total -= skip_rsv;
-   /* Reserve bits for the intensity and dual stereo parameters. */
-   intensity_rsv = dual_stereo_rsv = 0;
-   if (C==2)
-   {
-      intensity_rsv = LOG2_FRAC_TABLE[end-start];
-      if (intensity_rsv>total)
-         intensity_rsv = 0;
-      else
-      {
-         total -= intensity_rsv;
-         dual_stereo_rsv = total>=1<<BITRES ? 1<<BITRES : 0;
-         total -= dual_stereo_rsv;
-      }
-   }
-   ALLOC(bits1, len, int);
-   ALLOC(bits2, len, int);
-   ALLOC(thresh, len, int);
-   ALLOC(trim_offset, len, int);
-
-   for (j=start;j<end;j++)
-   {
-      /* Below this threshold, we're sure not to allocate any PVQ bits */
-      thresh[j] = IMAX((C)<<BITRES, (3*(m->eBands[j+1]-m->eBands[j])<<LM<<BITRES)>>4);
-      /* Tilt of the allocation curve */
-      trim_offset[j] = C*(m->eBands[j+1]-m->eBands[j])*(alloc_trim-5-LM)*(end-j-1)
-            *(1<<(LM+BITRES))>>6;
-      /* Giving less resolution to single-coefficient bands because they get
-         more benefit from having one coarse value per coefficient*/
-      if ((m->eBands[j+1]-m->eBands[j])<<LM==1)
-         trim_offset[j] -= C<<BITRES;
-   }
-   lo = 1;
-   hi = m->nbAllocVectors - 1;
-   do
-   {
-      int done = 0;
-      int psum = 0;
-      int mid = (lo+hi) >> 1;
-      for (j=end;j-->start;)
-      {
-         int bitsj;
-         int N = m->eBands[j+1]-m->eBands[j];
-         bitsj = C*N*m->allocVectors[mid*len+j]<<LM>>2;
-         if (bitsj > 0)
-            bitsj = IMAX(0, bitsj + trim_offset[j]);
-         bitsj += offsets[j];
-         if (bitsj >= thresh[j] || done)
-         {
-            done = 1;
-            /* Don't allocate more than we can actually use */
-            psum += IMIN(bitsj, cap[j]);
-         } else {
-            if (bitsj >= C<<BITRES)
-               psum += C<<BITRES;
-         }
-      }
-      if (psum > total)
-         hi = mid - 1;
-      else
-         lo = mid + 1;
-      /*printf ("lo = %d, hi = %d\n", lo, hi);*/
-   }
-   while (lo <= hi);
-   hi = lo--;
-   /*printf ("interp between %d and %d\n", lo, hi);*/
-   for (j=start;j<end;j++)
-   {
-      int bits1j, bits2j;
-      int N = m->eBands[j+1]-m->eBands[j];
-      bits1j = C*N*m->allocVectors[lo*len+j]<<LM>>2;
-      bits2j = hi>=m->nbAllocVectors ?
-            cap[j] : C*N*m->allocVectors[hi*len+j]<<LM>>2;
-      if (bits1j > 0)
-         bits1j = IMAX(0, bits1j + trim_offset[j]);
-      if (bits2j > 0)
-         bits2j = IMAX(0, bits2j + trim_offset[j]);
-      if (lo > 0)
-         bits1j += offsets[j];
-      bits2j += offsets[j];
-      if (offsets[j]>0)
-         skip_start = j;
-      bits2j = IMAX(0,bits2j-bits1j);
-      bits1[j] = bits1j;
-      bits2[j] = bits2j;
-   }
-   codedBands = interp_bits2pulses(m, start, end, skip_start, bits1, bits2, thresh, cap,
+int clt_compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim,
+                           int *intensity, int *dual_stereo,
+                           oac_int32 total, oac_int32 *balance, int *pulses, int *ebits, int *fine_priority, int C,
+                           int LM, ec_ctx *ec, int encode, int prev, int signalBandwidth) {
+    int lo, hi, len, j;
+    int codedBands;
+    int skip_start;
+    int skip_rsv;
+    int intensity_rsv;
+    int dual_stereo_rsv;
+    VARDECL(int, bits1);
+    VARDECL(int, bits2);
+    VARDECL(int, thresh);
+    VARDECL(int, trim_offset);
+    SAVE_STACK;
+
+    total = IMAX(total, 0);
+    len = m->nbEBands;
+    skip_start = start;
+    /* Reserve a bit to signal the end of manually skipped bands. */
+    skip_rsv = total >= 1<<BITRES ? 1<<BITRES : 0;
+    total -= skip_rsv;
+    /* Reserve bits for the intensity and dual stereo parameters. */
+    intensity_rsv = dual_stereo_rsv = 0;
+    if (C == 2) {
+        intensity_rsv = LOG2_FRAC_TABLE[end - start];
+        if (intensity_rsv > total)
+            intensity_rsv = 0;
+        else {
+            total -= intensity_rsv;
+            dual_stereo_rsv = total >= 1<<BITRES ? 1<<BITRES : 0;
+            total -= dual_stereo_rsv;
+        }
+    }
+    ALLOC(bits1, len, int);
+    ALLOC(bits2, len, int);
+    ALLOC(thresh, len, int);
+    ALLOC(trim_offset, len, int);
+
+    for (j = start; j < end; j++) {
+        /* Below this threshold, we're sure not to allocate any PVQ bits */
+        thresh[j] = IMAX((C)<<BITRES, (3*(m->eBands[j + 1] - m->eBands[j])<<LM<<BITRES)>>4);
+        /* Tilt of the allocation curve */
+        trim_offset[j] = C*(m->eBands[j + 1] - m->eBands[j])*(alloc_trim - 5 - LM)*(end - j - 1)
+                         *(1<<(LM + BITRES))>>6;
+        /* Giving less resolution to single-coefficient bands because they get
+           more benefit from having one coarse value per coefficient*/
+        if ((m->eBands[j + 1] - m->eBands[j])<<LM == 1)
+            trim_offset[j] -= C<<BITRES;
+    }
+    lo = 1;
+    hi = m->nbAllocVectors - 1;
+    do {
+        int done = 0;
+        int psum = 0;
+        int mid = (lo + hi)>>1;
+        for (j = end; j-- > start;) {
+            int bitsj;
+            int N = m->eBands[j + 1] - m->eBands[j];
+            bitsj = C*N*m->allocVectors[mid*len + j]<<LM>>2;
+            if (bitsj > 0)
+                bitsj = IMAX(0, bitsj + trim_offset[j]);
+            bitsj += offsets[j];
+            if (bitsj >= thresh[j] || done) {
+                done = 1;
+                /* Don't allocate more than we can actually use */
+                psum += IMIN(bitsj, cap[j]);
+            } else {
+                if (bitsj >= C<<BITRES)
+                    psum += C<<BITRES;
+            }
+        }
+        if (psum > total)
+            hi = mid - 1;
+        else
+            lo = mid + 1;
+        /*printf ("lo = %d, hi = %d\n", lo, hi);*/
+    } while (lo <= hi);
+    hi = lo--;
+    /*printf ("interp between %d and %d\n", lo, hi);*/
+    for (j = start; j < end; j++) {
+        int bits1j, bits2j;
+        int N = m->eBands[j + 1] - m->eBands[j];
+        bits1j = C*N*m->allocVectors[lo*len + j]<<LM>>2;
+        bits2j = hi >= m->nbAllocVectors ?
+                 cap[j] : C*N*m->allocVectors[hi*len + j]<<LM>>2;
+        if (bits1j > 0)
+            bits1j = IMAX(0, bits1j + trim_offset[j]);
+        if (bits2j > 0)
+            bits2j = IMAX(0, bits2j + trim_offset[j]);
+        if (lo > 0)
+            bits1j += offsets[j];
+        bits2j += offsets[j];
+        if (offsets[j] > 0)
+            skip_start = j;
+        bits2j = IMAX(0, bits2j - bits1j);
+        bits1[j] = bits1j;
+        bits2[j] = bits2j;
+    }
+    codedBands = interp_bits2pulses(m, start, end, skip_start, bits1, bits2, thresh, cap,
          total, balance, skip_rsv, intensity, intensity_rsv, dual_stereo, dual_stereo_rsv,
          pulses, ebits, fine_priority, C, LM, ec, encode, prev, signalBandwidth);
-   RESTORE_STACK;
-   return codedBands;
+    RESTORE_STACK;
+    return codedBands;
 }
diff --git a/celt/rate.h b/celt/rate.h
index cac780a75..b122fe83c 100644
--- a/celt/rate.h
+++ b/celt/rate.h
@@ -24,7 +24,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef RATE_H
 #define RATE_H
@@ -45,57 +45,55 @@
 
 void compute_pulse_cache(CELTMode *m, int LM);
 
-static OAC_INLINE int get_pulses(int i)
-{
-   return i<8 ? i : (8 + (i&7)) << ((i>>3)-1);
+static OAC_INLINE int get_pulses(int i) {
+    return i < 8 ? i : (8 + (i&7))<<((i>>3) - 1);
 }
 
-static OAC_INLINE int bits2pulses(const CELTMode *m, int band, int LM, int bits)
-{
-   int i;
-   int lo, hi;
-   const unsigned char *cache;
-
-   LM++;
-   cache = m->cache.bits + m->cache.index[LM*m->nbEBands+band];
-
-   lo = 0;
-   hi = cache[0];
-   bits--;
-   for (i=0;i<LOG_MAX_PSEUDO;i++)
-   {
-      int mid = (lo+hi+1)>>1;
-      /* OPT: Make sure this is implemented with a conditional move */
-      if ((int)cache[mid] >= bits)
-         hi = mid;
-      else
-         lo = mid;
-   }
-   if (bits- (lo == 0 ? -1 : (int)cache[lo]) <= (int)cache[hi]-bits)
-      return lo;
-   else
-      return hi;
+static OAC_INLINE int bits2pulses(const CELTMode *m, int band, int LM, int bits) {
+    int i;
+    int lo, hi;
+    const unsigned char *cache;
+
+    LM++;
+    cache = m->cache.bits + m->cache.index[LM*m->nbEBands + band];
+
+    lo = 0;
+    hi = cache[0];
+    bits--;
+    for (i = 0; i < LOG_MAX_PSEUDO; i++) {
+        int mid = (lo + hi + 1)>>1;
+        /* OPT: Make sure this is implemented with a conditional move */
+        if ((int)cache[mid] >= bits)
+            hi = mid;
+        else
+            lo = mid;
+    }
+    if (bits - (lo == 0 ? -1 : (int)cache[lo]) <= (int)cache[hi] - bits)
+        return lo;
+    else
+        return hi;
 }
 
-static OAC_INLINE int pulses2bits(const CELTMode *m, int band, int LM, int pulses)
-{
-   const unsigned char *cache;
+static OAC_INLINE int pulses2bits(const CELTMode *m, int band, int LM, int pulses) {
+    const unsigned char *cache;
 
-   LM++;
-   cache = m->cache.bits + m->cache.index[LM*m->nbEBands+band];
-   return pulses == 0 ? 0 : cache[pulses]+1;
+    LM++;
+    cache = m->cache.bits + m->cache.index[LM*m->nbEBands + band];
+    return pulses == 0 ? 0 : cache[pulses] + 1;
 }
 
 /** Compute the pulse allocation, i.e. how many pulses will go in each
-  * band.
- @param m mode
- @param offsets Requested increase or decrease in the number of bits for
+ * band.
+   @param m mode
+   @param offsets Requested increase or decrease in the number of bits for
                 each band
- @param total Number of bands
- @param pulses Number of pulses per band (returned)
- @return Total number of bits allocated
-*/
-int clt_compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim, int *intensity, int *dual_stereo,
-      oac_int32 total, oac_int32 *balance, int *pulses, int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec, int encode, int prev, int signalBandwidth);
+   @param total Number of bands
+   @param pulses Number of pulses per band (returned)
+   @return Total number of bits allocated
+ */
+int clt_compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim,
+    int *intensity, int *dual_stereo,
+    oac_int32 total, oac_int32 *balance, int *pulses, int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec,
+    int encode, int prev, int signalBandwidth);
 
 #endif
diff --git a/celt/stack_alloc.h b/celt/stack_alloc.h
index 82443d41e..bbf14a13e 100644
--- a/celt/stack_alloc.h
+++ b/celt/stack_alloc.h
@@ -3,7 +3,7 @@
 /**
    @file stack_alloc.h
    @brief Temporary memory allocation on stack
-*/
+ */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
@@ -27,7 +27,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef STACK_ALLOC_H
 #define STACK_ALLOC_H
@@ -36,7 +36,8 @@
 #include "oac_defines.h"
 
 #if (!defined (VAR_ARRAYS) && !defined (USE_ALLOCA) && !defined (NONTHREADSAFE_PSEUDOSTACK))
-#error "Oac requires one of VAR_ARRAYS, USE_ALLOCA, or NONTHREADSAFE_PSEUDOSTACK be defined to select the temporary allocation mode."
+# error \
+    "Oac requires one of VAR_ARRAYS, USE_ALLOCA, or NONTHREADSAFE_PSEUDOSTACK be defined to select the temporary allocation mode."
 #endif
 
 #ifdef USE_ALLOCA
@@ -90,17 +91,17 @@
 
 #if defined(VAR_ARRAYS)
 
-#define VARDECL(type, var)
-#define ALLOC(var, size, type) type var[size]
-#define SAVE_STACK
-#define RESTORE_STACK
-#define ALLOC_STACK
+# define VARDECL(type, var)
+# define ALLOC(var, size, type) type var[size]
+# define SAVE_STACK
+# define RESTORE_STACK
+# define ALLOC_STACK
 /* C99 does not allow VLAs of size zero */
-#define ALLOC_NONE 1
+# define ALLOC_NONE 1
 
 #elif defined(USE_ALLOCA)
 
-#define VARDECL(type, var) type *var
+# define VARDECL(type, var) type *var
 
 # ifdef _WIN32
 #  define ALLOC(var, size, type) var = ((type*)_alloca(sizeof(type)*(size)))
@@ -108,100 +109,121 @@
 #  define ALLOC(var, size, type) var = ((type*)alloca(sizeof(type)*(size)))
 # endif
 
-#define SAVE_STACK
-#define RESTORE_STACK
-#define ALLOC_STACK
-#define ALLOC_NONE 0
+# define SAVE_STACK
+# define RESTORE_STACK
+# define ALLOC_STACK
+# define ALLOC_NONE 0
 
 #else
 
-#ifdef CELT_C
-char *scratch_ptr=0;
-char *global_stack=0;
-#else
+# ifdef CELT_C
+char *scratch_ptr = 0;
+char *global_stack = 0;
+# else
 extern char *global_stack;
 extern char *scratch_ptr;
-#endif /* CELT_C */
+# endif /* CELT_C */
 
-#if __STDC_VERSION__ >= 201112L
+# if __STDC_VERSION__ >= 201112L
 #  include <stdalign.h>
 #  define ALIGNOF(T) alignof(T)
-#elif defined(__GNUC__) || defined(__clang__)
+# elif defined(__GNUC__) || defined(__clang__)
 #  define ALIGNOF(T) __alignof__(T)
-#else
-# include <stddef.h>
-# ifdef __cplusplus
+# else
+#  include <stddef.h>
+#  ifdef __cplusplus
 template <typename T>
 struct alignment_helper {
     char c;
     T member;
 };
-# define ALIGNOF(T) (offsetof(alignment_helper<T>, member))
-# else
-# define ALIGNOF(T) (offsetof(struct { char c; T member; }, member))
+#   define ALIGNOF(T) (offsetof(alignment_helper<T>, member))
+#  else
+#   define ALIGNOF(T) (offsetof(struct { char c; T member; }, member))
+#  endif
 # endif
-#endif
 
-#ifdef ENABLE_VALGRIND
+# ifdef ENABLE_VALGRIND
 
-#include <valgrind/memcheck.h>
+#  include <valgrind/memcheck.h>
 
-#ifdef CELT_C
-char *global_stack_top=0;
-#else
+#  ifdef CELT_C
+char *global_stack_top = 0;
+#  else
 extern char *global_stack_top;
-#endif /* CELT_C */
-
-#define ALIGN(stack, size) ((stack) += ((size) - (long)(stack)) & ((size) - 1))
-#define PUSH(stack, size, type) (VALGRIND_MAKE_MEM_NOACCESS(stack, global_stack_top-stack),ALIGN((stack),ALIGNOF(type)),VALGRIND_MAKE_MEM_UNDEFINED(stack, ((size)*sizeof(type)/sizeof(char))),(stack)+=(2*(size)*sizeof(type)/sizeof(char)),(type*)((stack)-(2*(size)*sizeof(type)/sizeof(char))))
-#define RESTORE_STACK ((global_stack = _saved_stack),VALGRIND_MAKE_MEM_NOACCESS(global_stack, global_stack_top-global_stack))
-#define ALLOC_STACK char *_saved_stack; ((global_stack = (global_stack==0) ? ((global_stack_top=(char*)oac_alloc_scratch(GLOBAL_STACK_SIZE*2)+(GLOBAL_STACK_SIZE*2))-(GLOBAL_STACK_SIZE*2)) : global_stack),VALGRIND_MAKE_MEM_NOACCESS(global_stack, global_stack_top-global_stack)); _saved_stack = global_stack;
+#  endif /* CELT_C */
+
+#  define ALIGN(stack, size) ((stack) += ((size) - (long)(stack))&((size) - 1))
+#  define PUSH(stack, size, type) (VALGRIND_MAKE_MEM_NOACCESS(stack, global_stack_top - stack), \
+                                   ALIGN((stack), ALIGNOF(type)), \
+                                   VALGRIND_MAKE_MEM_UNDEFINED(stack, ((size)*sizeof(type)/sizeof(char))), \
+                                   (stack) += (2*(size)*sizeof(type)/sizeof(char)), \
+                                   (type*)((stack) - (2*(size)*sizeof(type)/sizeof(char))))
+#  define RESTORE_STACK ((global_stack = _saved_stack), \
+                         VALGRIND_MAKE_MEM_NOACCESS(global_stack, global_stack_top - global_stack))
+#  define ALLOC_STACK char *_saved_stack; \
+        ((global_stack = (global_stack == \
+                          0) ? ((global_stack_top = (char*)oac_alloc_scratch(GLOBAL_STACK_SIZE*2) \
+                                                    + (GLOBAL_STACK_SIZE*2)) - (GLOBAL_STACK_SIZE*2)) : global_stack), \
+         VALGRIND_MAKE_MEM_NOACCESS(global_stack, global_stack_top - global_stack)); _saved_stack = global_stack;
 
-#else
+# else
 
-#define ALIGN(stack, size) ((stack) += ((size) - (long)(stack)) & ((size) - 1))
-#ifdef ENABLE_HARDENING
-#include "arch.h"
-#define PUSH(stack, size, type) (ALIGN((stack),ALIGNOF(type)),(void)(((int)((size)*(sizeof(type)/(sizeof(char)))) <= (scratch_ptr)+GLOBAL_STACK_SIZE-(stack))?0:CELT_FATAL("pseudostack overflow")),(stack)+=(size)*(sizeof(type)/(sizeof(char))),(type*)(void*)((stack)-(size)*(sizeof(type)/(sizeof(char)))))
-#else
-#define PUSH(stack, size, type) (ALIGN((stack),ALIGNOF(type)),(stack)+=(size)*(sizeof(type)/(sizeof(char))),(type*)(void*)((stack)-(size)*(sizeof(type)/(sizeof(char)))))
-#endif
+#  define ALIGN(stack, size) ((stack) += ((size) - (long)(stack))&((size) - 1))
+#  ifdef ENABLE_HARDENING
+#   include "arch.h"
+#   define PUSH(stack, size, type) (ALIGN((stack), ALIGNOF(type)), \
+                                    (void)(((int)((size)*(sizeof(type)/(sizeof(char)))) <= \
+                                            (scratch_ptr) + GLOBAL_STACK_SIZE \
+                                            - (stack))?0:CELT_FATAL("pseudostack overflow")), \
+                                    (stack) += (size)*(sizeof(type)/(sizeof(char))), \
+                                    (type*)(void*)((stack) - (size)*(sizeof(type)/(sizeof(char)))))
+#  else
+#   define PUSH(stack, size, type) (ALIGN((stack), ALIGNOF(type)), (stack) += (size)*(sizeof(type)/(sizeof(char))), \
+                                    (type*)(void*)((stack) - (size)*(sizeof(type)/(sizeof(char)))))
+#  endif
 
-#if 0 /* Set this to 1 to instrument pseudostack usage */
-#define RESTORE_STACK (printf("%ld %s:%d\n", global_stack-scratch_ptr, __FILE__, __LINE__),global_stack = _saved_stack)
-#else
-#define RESTORE_STACK (global_stack = _saved_stack)
-#endif
-#define ALLOC_STACK char *_saved_stack; (global_stack = (global_stack==0) ? (scratch_ptr=(char*)oac_alloc_scratch(GLOBAL_STACK_SIZE)) : global_stack); _saved_stack = global_stack;
+#  if 0 /* Set this to 1 to instrument pseudostack usage */
+#   define RESTORE_STACK (printf("%ld %s:%d\n", global_stack - scratch_ptr, __FILE__, __LINE__), \
+                          global_stack = _saved_stack)
+#  else
+#   define RESTORE_STACK (global_stack = _saved_stack)
+#  endif
+#  define ALLOC_STACK char *_saved_stack; \
+        (global_stack = (global_stack == \
+                         0) ? (scratch_ptr = (char*)oac_alloc_scratch(GLOBAL_STACK_SIZE)) : global_stack); \
+        _saved_stack = global_stack;
 
-#endif /* ENABLE_VALGRIND */
+# endif /* ENABLE_VALGRIND */
 
-#include "os_support.h"
-#define VARDECL(type, var) type *var
-#define ALLOC(var, size, type) var = PUSH(global_stack, size, type)
-#define SAVE_STACK char *_saved_stack = global_stack;
-#define ALLOC_NONE 0
+# include "os_support.h"
+# define VARDECL(type, var) type *var
+# define ALLOC(var, size, type) var = PUSH(global_stack, size, type)
+# define SAVE_STACK char *_saved_stack = global_stack;
+# define ALLOC_NONE 0
 
 #endif /* VAR_ARRAYS */
 
 
 #ifdef ENABLE_VALGRIND
 
-#include <valgrind/memcheck.h>
-#define OAC_CHECK_ARRAY(ptr, len) VALGRIND_CHECK_MEM_IS_DEFINED(ptr, len*sizeof(*ptr))
-#define OAC_CHECK_VALUE(value) VALGRIND_CHECK_VALUE_IS_DEFINED(value)
-#define OAC_CHECK_ARRAY_COND(ptr, len) VALGRIND_CHECK_MEM_IS_DEFINED(ptr, len*sizeof(*ptr))
-#define OAC_CHECK_VALUE_COND(value) VALGRIND_CHECK_VALUE_IS_DEFINED(value)
-#define OAC_PRINT_INT(value) do {fprintf(stderr, #value " = %d at %s:%d\n", value, __FILE__, __LINE__);}while(0)
-#define OAC_FPRINTF fprintf
+# include <valgrind/memcheck.h>
+# define OAC_CHECK_ARRAY(ptr, len) VALGRIND_CHECK_MEM_IS_DEFINED(ptr, len*sizeof(*ptr))
+# define OAC_CHECK_VALUE(value) VALGRIND_CHECK_VALUE_IS_DEFINED(value)
+# define OAC_CHECK_ARRAY_COND(ptr, len) VALGRIND_CHECK_MEM_IS_DEFINED(ptr, len*sizeof(*ptr))
+# define OAC_CHECK_VALUE_COND(value) VALGRIND_CHECK_VALUE_IS_DEFINED(value)
+# define OAC_PRINT_INT(value) do {fprintf(stderr, #value " = %d at %s:%d\n", value, __FILE__, __LINE__);} while (0)
+# define OAC_FPRINTF fprintf
 
 #else
 
-static OAC_INLINE int _oac_false(void) {return 0;}
-#define OAC_CHECK_ARRAY(ptr, len) _oac_false()
-#define OAC_CHECK_VALUE(value) _oac_false()
-#define OAC_PRINT_INT(value) do{}while(0)
-#define OAC_FPRINTF (void)
+static OAC_INLINE int _oac_false(void) {
+    return 0;
+}
+# define OAC_CHECK_ARRAY(ptr, len) _oac_false()
+# define OAC_CHECK_VALUE(value) _oac_false()
+# define OAC_PRINT_INT(value) do {} while (0)
+# define OAC_FPRINTF (void)
 
 #endif
 
diff --git a/celt/static_modes_fixed.h b/celt/static_modes_fixed.h
index 30144a3ba..301a68aba 100644
--- a/celt/static_modes_fixed.h
+++ b/celt/static_modes_fixed.h
@@ -5,2458 +5,2460 @@
 #include "rate.h"
 
 #ifdef HAVE_ARM_NE10
-#define OVERRIDE_FFT 1
-#include "static_modes_fixed_arm_ne10.h"
+# define OVERRIDE_FFT 1
+# include "static_modes_fixed_arm_ne10.h"
 #endif
 
 #ifndef DEF_WINDOW120
-#define DEF_WINDOW120
+# define DEF_WINDOW120
 static const celt_coef window120[120] = {
-144497, 1300330, 3611201, 7075520, 11690888,
-17454086, 24361057, 32406886, 41585775, 51891010,
-63314937, 75848919, 89483305, 104207389, 120009370,
-136876310, 154794092, 173747379, 193719571, 214692768,
-236647730, 259563841, 283419077, 308189974, 333851611,
-360377579, 387739975, 415909390, 444854905, 474544098,
-504943052, 536016380, 567727246, 600037405, 632907246,
-666295842, 700161014, 734459402, 769146541, 804176950,
-839504226, 875081152, 910859802, 946791664, 982827767,
-1018918807, 1055015290, 1091067670, 1127026498, 1162842573,
-1198467087, 1233851789, 1268949131, 1303712428, 1338096006,
-1372055358, 1405547288, 1438530058, 1470963524, 1502809271,
-1534030739, 1564593342, 1594464577, 1623614128, 1652013956,
-1679638382, 1706464158, 1732470524, 1757639263, 1781954729,
-1805403879, 1827976282, 1849664120, 1870462177, 1890367816,
-1909380946, 1927503971, 1944741741, 1961101475, 1976592692,
-1991227121, 2005018607, 2017983004, 2030138067, 2041503335,
-2052100006, 2061950806, 2071079861, 2079512553, 2087275384,
-2094395835, 2100902218, 2106823532, 2112189321, 2117029527,
-2121374347, 2125254092, 2128699049, 2131739343, 2134404804,
-2136724838, 2138728301, 2140443380, 2141897478, 2143117097,
-2144127740, 2144953807, 2145618502, 2146143741, 2146550077,
-2146856618, 2147080958, 2147239113, 2147345467, 2147412716,
-2147451825, 2147471991, 2147480611, 2147483254, 2147483643,
+    144497, 1300330, 3611201, 7075520, 11690888,
+    17454086, 24361057, 32406886, 41585775, 51891010,
+    63314937, 75848919, 89483305, 104207389, 120009370,
+    136876310, 154794092, 173747379, 193719571, 214692768,
+    236647730, 259563841, 283419077, 308189974, 333851611,
+    360377579, 387739975, 415909390, 444854905, 474544098,
+    504943052, 536016380, 567727246, 600037405, 632907246,
+    666295842, 700161014, 734459402, 769146541, 804176950,
+    839504226, 875081152, 910859802, 946791664, 982827767,
+    1018918807, 1055015290, 1091067670, 1127026498, 1162842573,
+    1198467087, 1233851789, 1268949131, 1303712428, 1338096006,
+    1372055358, 1405547288, 1438530058, 1470963524, 1502809271,
+    1534030739, 1564593342, 1594464577, 1623614128, 1652013956,
+    1679638382, 1706464158, 1732470524, 1757639263, 1781954729,
+    1805403879, 1827976282, 1849664120, 1870462177, 1890367816,
+    1909380946, 1927503971, 1944741741, 1961101475, 1976592692,
+    1991227121, 2005018607, 2017983004, 2030138067, 2041503335,
+    2052100006, 2061950806, 2071079861, 2079512553, 2087275384,
+    2094395835, 2100902218, 2106823532, 2112189321, 2117029527,
+    2121374347, 2125254092, 2128699049, 2131739343, 2134404804,
+    2136724838, 2138728301, 2140443380, 2141897478, 2143117097,
+    2144127740, 2144953807, 2145618502, 2146143741, 2146550077,
+    2146856618, 2147080958, 2147239113, 2147345467, 2147412716,
+    2147451825, 2147471991, 2147480611, 2147483254, 2147483643,
 };
 #endif
 
 #ifndef DEF_LOGN400
-#define DEF_LOGN400
+# define DEF_LOGN400
 static const oac_int16 logN400[21] = {
-0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 16, 16, 16, 21, 21, 24, 29, 34, 36, };
+    0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 16, 16, 16, 21, 21, 24, 29, 34, 36, };
 #endif
 
 #ifndef DEF_PULSE_CACHE50
-#define DEF_PULSE_CACHE50
+# define DEF_PULSE_CACHE50
 static const oac_int16 cache_index50[105] = {
--1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 41, 41, 41,
-82, 82, 123, 164, 200, 222, 0, 0, 0, 0, 0, 0, 0, 0, 41,
-41, 41, 41, 123, 123, 123, 164, 164, 240, 266, 283, 295, 41, 41, 41,
-41, 41, 41, 41, 41, 123, 123, 123, 123, 240, 240, 240, 266, 266, 305,
-318, 328, 336, 123, 123, 123, 123, 123, 123, 123, 123, 240, 240, 240, 240,
-305, 305, 305, 318, 318, 343, 351, 358, 364, 240, 240, 240, 240, 240, 240,
-240, 240, 305, 305, 305, 305, 343, 343, 343, 351, 351, 370, 376, 382, 387,
+    -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 41, 41, 41,
+    82, 82, 123, 164, 200, 222, 0, 0, 0, 0, 0, 0, 0, 0, 41,
+    41, 41, 41, 123, 123, 123, 164, 164, 240, 266, 283, 295, 41, 41, 41,
+    41, 41, 41, 41, 41, 123, 123, 123, 123, 240, 240, 240, 266, 266, 305,
+    318, 328, 336, 123, 123, 123, 123, 123, 123, 123, 123, 240, 240, 240, 240,
+    305, 305, 305, 318, 318, 343, 351, 358, 364, 240, 240, 240, 240, 240, 240,
+    240, 240, 305, 305, 305, 305, 343, 343, 343, 351, 351, 370, 376, 382, 387,
 };
 static const unsigned char cache_bits50[392] = {
-40, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 40, 15, 23, 28,
-31, 34, 36, 38, 39, 41, 42, 43, 44, 45, 46, 47, 47, 49, 50,
-51, 52, 53, 54, 55, 55, 57, 58, 59, 60, 61, 62, 63, 63, 65,
-66, 67, 68, 69, 70, 71, 71, 40, 20, 33, 41, 48, 53, 57, 61,
-64, 66, 69, 71, 73, 75, 76, 78, 80, 82, 85, 87, 89, 91, 92,
-94, 96, 98, 101, 103, 105, 107, 108, 110, 112, 114, 117, 119, 121, 123,
-124, 126, 128, 40, 23, 39, 51, 60, 67, 73, 79, 83, 87, 91, 94,
-97, 100, 102, 105, 107, 111, 115, 118, 121, 124, 126, 129, 131, 135, 139,
-142, 145, 148, 150, 153, 155, 159, 163, 166, 169, 172, 174, 177, 179, 35,
-28, 49, 65, 78, 89, 99, 107, 114, 120, 126, 132, 136, 141, 145, 149,
-153, 159, 165, 171, 176, 180, 185, 189, 192, 199, 205, 211, 216, 220, 225,
-229, 232, 239, 245, 251, 21, 33, 58, 79, 97, 112, 125, 137, 148, 157,
-166, 174, 182, 189, 195, 201, 207, 217, 227, 235, 243, 251, 17, 35, 63,
-86, 106, 123, 139, 152, 165, 177, 187, 197, 206, 214, 222, 230, 237, 250,
-25, 31, 55, 75, 91, 105, 117, 128, 138, 146, 154, 161, 168, 174, 180,
-185, 190, 200, 208, 215, 222, 229, 235, 240, 245, 255, 16, 36, 65, 89,
-110, 128, 144, 159, 173, 185, 196, 207, 217, 226, 234, 242, 250, 11, 41,
-74, 103, 128, 151, 172, 191, 209, 225, 241, 255, 9, 43, 79, 110, 138,
-163, 186, 207, 227, 246, 12, 39, 71, 99, 123, 144, 164, 182, 198, 214,
-228, 241, 253, 9, 44, 81, 113, 142, 168, 192, 214, 235, 255, 7, 49,
-90, 127, 160, 191, 220, 247, 6, 51, 95, 134, 170, 203, 234, 7, 47,
-87, 123, 155, 184, 212, 237, 6, 52, 97, 137, 174, 208, 240, 5, 57,
-106, 151, 192, 231, 5, 59, 111, 158, 202, 243, 5, 55, 103, 147, 187,
-224, 5, 60, 113, 161, 206, 248, 4, 65, 122, 175, 224, 4, 67, 127,
-182, 234, };
+    40, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 40, 15, 23, 28,
+    31, 34, 36, 38, 39, 41, 42, 43, 44, 45, 46, 47, 47, 49, 50,
+    51, 52, 53, 54, 55, 55, 57, 58, 59, 60, 61, 62, 63, 63, 65,
+    66, 67, 68, 69, 70, 71, 71, 40, 20, 33, 41, 48, 53, 57, 61,
+    64, 66, 69, 71, 73, 75, 76, 78, 80, 82, 85, 87, 89, 91, 92,
+    94, 96, 98, 101, 103, 105, 107, 108, 110, 112, 114, 117, 119, 121, 123,
+    124, 126, 128, 40, 23, 39, 51, 60, 67, 73, 79, 83, 87, 91, 94,
+    97, 100, 102, 105, 107, 111, 115, 118, 121, 124, 126, 129, 131, 135, 139,
+    142, 145, 148, 150, 153, 155, 159, 163, 166, 169, 172, 174, 177, 179, 35,
+    28, 49, 65, 78, 89, 99, 107, 114, 120, 126, 132, 136, 141, 145, 149,
+    153, 159, 165, 171, 176, 180, 185, 189, 192, 199, 205, 211, 216, 220, 225,
+    229, 232, 239, 245, 251, 21, 33, 58, 79, 97, 112, 125, 137, 148, 157,
+    166, 174, 182, 189, 195, 201, 207, 217, 227, 235, 243, 251, 17, 35, 63,
+    86, 106, 123, 139, 152, 165, 177, 187, 197, 206, 214, 222, 230, 237, 250,
+    25, 31, 55, 75, 91, 105, 117, 128, 138, 146, 154, 161, 168, 174, 180,
+    185, 190, 200, 208, 215, 222, 229, 235, 240, 245, 255, 16, 36, 65, 89,
+    110, 128, 144, 159, 173, 185, 196, 207, 217, 226, 234, 242, 250, 11, 41,
+    74, 103, 128, 151, 172, 191, 209, 225, 241, 255, 9, 43, 79, 110, 138,
+    163, 186, 207, 227, 246, 12, 39, 71, 99, 123, 144, 164, 182, 198, 214,
+    228, 241, 253, 9, 44, 81, 113, 142, 168, 192, 214, 235, 255, 7, 49,
+    90, 127, 160, 191, 220, 247, 6, 51, 95, 134, 170, 203, 234, 7, 47,
+    87, 123, 155, 184, 212, 237, 6, 52, 97, 137, 174, 208, 240, 5, 57,
+    106, 151, 192, 231, 5, 59, 111, 158, 202, 243, 5, 55, 103, 147, 187,
+    224, 5, 60, 113, 161, 206, 248, 4, 65, 122, 175, 224, 4, 67, 127,
+    182, 234, };
 static const unsigned char cache_caps50[168] = {
-224, 224, 224, 224, 224, 224, 224, 224, 160, 160, 160, 160, 185, 185, 185,
-178, 178, 168, 134, 61, 37, 224, 224, 224, 224, 224, 224, 224, 224, 240,
-240, 240, 240, 207, 207, 207, 198, 198, 183, 144, 66, 40, 160, 160, 160,
-160, 160, 160, 160, 160, 185, 185, 185, 185, 193, 193, 193, 183, 183, 172,
-138, 64, 38, 240, 240, 240, 240, 240, 240, 240, 240, 207, 207, 207, 207,
-204, 204, 204, 193, 193, 180, 143, 66, 40, 185, 185, 185, 185, 185, 185,
-185, 185, 193, 193, 193, 193, 193, 193, 193, 183, 183, 172, 138, 65, 39,
-207, 207, 207, 207, 207, 207, 207, 207, 204, 204, 204, 204, 201, 201, 201,
-188, 188, 176, 141, 66, 40, 193, 193, 193, 193, 193, 193, 193, 193, 193,
-193, 193, 193, 194, 194, 194, 184, 184, 173, 139, 65, 39, 204, 204, 204,
-204, 204, 204, 204, 204, 201, 201, 201, 201, 198, 198, 198, 187, 187, 175,
-140, 66, 40, };
+    224, 224, 224, 224, 224, 224, 224, 224, 160, 160, 160, 160, 185, 185, 185,
+    178, 178, 168, 134, 61, 37, 224, 224, 224, 224, 224, 224, 224, 224, 240,
+    240, 240, 240, 207, 207, 207, 198, 198, 183, 144, 66, 40, 160, 160, 160,
+    160, 160, 160, 160, 160, 185, 185, 185, 185, 193, 193, 193, 183, 183, 172,
+    138, 64, 38, 240, 240, 240, 240, 240, 240, 240, 240, 207, 207, 207, 207,
+    204, 204, 204, 193, 193, 180, 143, 66, 40, 185, 185, 185, 185, 185, 185,
+    185, 185, 193, 193, 193, 193, 193, 193, 193, 183, 183, 172, 138, 65, 39,
+    207, 207, 207, 207, 207, 207, 207, 207, 204, 204, 204, 204, 201, 201, 201,
+    188, 188, 176, 141, 66, 40, 193, 193, 193, 193, 193, 193, 193, 193, 193,
+    193, 193, 193, 194, 194, 194, 184, 184, 173, 139, 65, 39, 204, 204, 204,
+    204, 204, 204, 204, 204, 201, 201, 201, 201, 198, 198, 198, 187, 187, 175,
+    140, 66, 40, };
 #endif
 
 #ifndef FFT_TWIDDLES48000_960
-#define FFT_TWIDDLES48000_960
+# define FFT_TWIDDLES48000_960
 static const kiss_twiddle_cpx fft_twiddles48000_960[480] = {
-{2147483647, 0}, {2147299668, -28109692},
-{2146747759, -56214568}, {2145828016, -84309812},
-{2144540596, -112390610}, {2142885721, -140452151},
-{2140863673, -168489625}, {2138474799, -196498230},
-{2135719508, -224473166}, {2132598273, -252409639},
-{2129111628, -280302863}, {2125260170, -308148059},
-{2121044561, -335940456}, {2116465521, -363675290},
-{2111523836, -391347811}, {2106220352, -418953276},
-{2100555978, -446486956}, {2094531684, -473944133},
-{2088148504, -501320102}, {2081407530, -528610172},
-{2074309917, -555809667}, {2066856882, -582913927},
-{2059049702, -609918309}, {2050889714, -636818183},
-{2042378317, -663608942}, {2033516969, -690285996},
-{2024307188, -716844772}, {2014750553, -743280720},
-{2004848700, -769589312}, {1994603327, -795766038},
-{1984016189, -821806413}, {1973089100, -847705977},
-{1961823932, -873460290}, {1950222616, -899064940},
-{1938287139, -924515541}, {1926019547, -949807730},
-{1913421941, -974937175}, {1900496480, -999899569},
-{1887245379, -1024690635}, {1873670908, -1049306126},
-{1859775393, -1073741824}, {1845561216, -1097993542},
-{1831030811, -1122057124}, {1816186668, -1145928447},
-{1801031331, -1169603422}, {1785567396, -1193077991},
-{1769797514, -1216348132}, {1753724386, -1239409858},
-{1737350766, -1262259218}, {1720679461, -1284892296},
-{1703713325, -1307305214}, {1686455268, -1329494133},
-{1668908244, -1351455249}, {1651075262, -1373184801},
-{1632959377, -1394679064}, {1614563692, -1415934356},
-{1595891361, -1436947036}, {1576945581, -1457713501},
-{1557729600, -1478230195}, {1538246711, -1498493602},
-{1518500250, -1518500250}, {1498493602, -1538246711},
-{1478230195, -1557729600}, {1457713501, -1576945581},
-{1436947036, -1595891361}, {1415934356, -1614563692},
-{1394679064, -1632959377}, {1373184801, -1651075262},
-{1351455249, -1668908244}, {1329494133, -1686455268},
-{1307305214, -1703713325}, {1284892296, -1720679461},
-{1262259218, -1737350766}, {1239409858, -1753724386},
-{1216348132, -1769797514}, {1193077991, -1785567396},
-{1169603422, -1801031331}, {1145928447, -1816186668},
-{1122057124, -1831030811}, {1097993542, -1845561216},
-{1073741824, -1859775393}, {1049306126, -1873670908},
-{1024690635, -1887245379}, {999899569, -1900496480},
-{974937175, -1913421941}, {949807730, -1926019547},
-{924515541, -1938287139}, {899064940, -1950222616},
-{873460290, -1961823932}, {847705977, -1973089100},
-{821806413, -1984016189}, {795766038, -1994603327},
-{769589312, -2004848700}, {743280720, -2014750553},
-{716844772, -2024307188}, {690285996, -2033516969},
-{663608942, -2042378317}, {636818183, -2050889714},
-{609918309, -2059049702}, {582913927, -2066856882},
-{555809667, -2074309917}, {528610172, -2081407530},
-{501320102, -2088148504}, {473944133, -2094531684},
-{446486956, -2100555978}, {418953276, -2106220352},
-{391347811, -2111523836}, {363675290, -2116465521},
-{335940456, -2121044561}, {308148059, -2125260170},
-{280302863, -2129111628}, {252409639, -2132598273},
-{224473166, -2135719508}, {196498230, -2138474799},
-{168489625, -2140863673}, {140452151, -2142885721},
-{112390610, -2144540596}, {84309812, -2145828016},
-{56214568, -2146747759}, {28109692, -2147299668},
-{0, -2147483648}, {-28109692, -2147299668},
-{-56214568, -2146747759}, {-84309812, -2145828016},
-{-112390610, -2144540596}, {-140452151, -2142885721},
-{-168489625, -2140863673}, {-196498230, -2138474799},
-{-224473166, -2135719508}, {-252409639, -2132598273},
-{-280302863, -2129111628}, {-308148059, -2125260170},
-{-335940456, -2121044561}, {-363675290, -2116465521},
-{-391347811, -2111523836}, {-418953276, -2106220352},
-{-446486956, -2100555978}, {-473944133, -2094531684},
-{-501320102, -2088148504}, {-528610172, -2081407530},
-{-555809667, -2074309917}, {-582913927, -2066856882},
-{-609918309, -2059049702}, {-636818183, -2050889714},
-{-663608942, -2042378317}, {-690285996, -2033516969},
-{-716844772, -2024307188}, {-743280720, -2014750553},
-{-769589312, -2004848700}, {-795766038, -1994603327},
-{-821806413, -1984016189}, {-847705977, -1973089100},
-{-873460290, -1961823932}, {-899064940, -1950222616},
-{-924515541, -1938287139}, {-949807730, -1926019547},
-{-974937175, -1913421941}, {-999899569, -1900496480},
-{-1024690635, -1887245379}, {-1049306126, -1873670908},
-{-1073741824, -1859775393}, {-1097993542, -1845561216},
-{-1122057124, -1831030811}, {-1145928447, -1816186668},
-{-1169603422, -1801031331}, {-1193077991, -1785567396},
-{-1216348132, -1769797514}, {-1239409858, -1753724386},
-{-1262259218, -1737350766}, {-1284892296, -1720679461},
-{-1307305214, -1703713325}, {-1329494133, -1686455268},
-{-1351455249, -1668908244}, {-1373184801, -1651075262},
-{-1394679064, -1632959377}, {-1415934356, -1614563692},
-{-1436947036, -1595891361}, {-1457713501, -1576945581},
-{-1478230195, -1557729600}, {-1498493602, -1538246711},
-{-1518500250, -1518500250}, {-1538246711, -1498493602},
-{-1557729600, -1478230195}, {-1576945581, -1457713501},
-{-1595891361, -1436947036}, {-1614563692, -1415934356},
-{-1632959377, -1394679064}, {-1651075262, -1373184801},
-{-1668908244, -1351455249}, {-1686455268, -1329494133},
-{-1703713325, -1307305214}, {-1720679461, -1284892296},
-{-1737350766, -1262259218}, {-1753724386, -1239409858},
-{-1769797514, -1216348132}, {-1785567396, -1193077991},
-{-1801031331, -1169603422}, {-1816186668, -1145928447},
-{-1831030811, -1122057124}, {-1845561216, -1097993542},
-{-1859775393, -1073741824}, {-1873670908, -1049306126},
-{-1887245379, -1024690635}, {-1900496480, -999899569},
-{-1913421941, -974937175}, {-1926019547, -949807730},
-{-1938287139, -924515541}, {-1950222616, -899064940},
-{-1961823932, -873460290}, {-1973089100, -847705977},
-{-1984016189, -821806413}, {-1994603327, -795766038},
-{-2004848700, -769589312}, {-2014750553, -743280720},
-{-2024307188, -716844772}, {-2033516969, -690285996},
-{-2042378317, -663608942}, {-2050889714, -636818183},
-{-2059049702, -609918309}, {-2066856882, -582913927},
-{-2074309917, -555809667}, {-2081407530, -528610172},
-{-2088148504, -501320102}, {-2094531684, -473944133},
-{-2100555978, -446486956}, {-2106220352, -418953276},
-{-2111523836, -391347811}, {-2116465521, -363675290},
-{-2121044561, -335940456}, {-2125260170, -308148059},
-{-2129111628, -280302863}, {-2132598273, -252409639},
-{-2135719508, -224473166}, {-2138474799, -196498230},
-{-2140863673, -168489625}, {-2142885721, -140452151},
-{-2144540596, -112390610}, {-2145828016, -84309812},
-{-2146747759, -56214568}, {-2147299668, -28109692},
-{-2147483648, 0}, {-2147299668, 28109692},
-{-2146747759, 56214568}, {-2145828016, 84309812},
-{-2144540596, 112390610}, {-2142885721, 140452151},
-{-2140863673, 168489625}, {-2138474799, 196498230},
-{-2135719508, 224473166}, {-2132598273, 252409639},
-{-2129111628, 280302863}, {-2125260170, 308148059},
-{-2121044561, 335940456}, {-2116465521, 363675290},
-{-2111523836, 391347811}, {-2106220352, 418953276},
-{-2100555978, 446486956}, {-2094531684, 473944133},
-{-2088148504, 501320102}, {-2081407530, 528610172},
-{-2074309917, 555809667}, {-2066856882, 582913927},
-{-2059049702, 609918309}, {-2050889714, 636818183},
-{-2042378317, 663608942}, {-2033516969, 690285996},
-{-2024307188, 716844772}, {-2014750553, 743280720},
-{-2004848700, 769589312}, {-1994603327, 795766038},
-{-1984016189, 821806413}, {-1973089100, 847705977},
-{-1961823932, 873460290}, {-1950222616, 899064940},
-{-1938287139, 924515541}, {-1926019547, 949807730},
-{-1913421941, 974937175}, {-1900496480, 999899569},
-{-1887245379, 1024690635}, {-1873670908, 1049306126},
-{-1859775393, 1073741824}, {-1845561216, 1097993542},
-{-1831030811, 1122057124}, {-1816186668, 1145928447},
-{-1801031331, 1169603422}, {-1785567396, 1193077991},
-{-1769797514, 1216348132}, {-1753724386, 1239409858},
-{-1737350766, 1262259218}, {-1720679461, 1284892296},
-{-1703713325, 1307305214}, {-1686455268, 1329494133},
-{-1668908244, 1351455249}, {-1651075262, 1373184801},
-{-1632959377, 1394679064}, {-1614563692, 1415934356},
-{-1595891361, 1436947036}, {-1576945581, 1457713501},
-{-1557729600, 1478230195}, {-1538246711, 1498493602},
-{-1518500250, 1518500250}, {-1498493602, 1538246711},
-{-1478230195, 1557729600}, {-1457713501, 1576945581},
-{-1436947036, 1595891361}, {-1415934356, 1614563692},
-{-1394679064, 1632959377}, {-1373184801, 1651075262},
-{-1351455249, 1668908244}, {-1329494133, 1686455268},
-{-1307305214, 1703713325}, {-1284892296, 1720679461},
-{-1262259218, 1737350766}, {-1239409858, 1753724386},
-{-1216348132, 1769797514}, {-1193077991, 1785567396},
-{-1169603422, 1801031331}, {-1145928447, 1816186668},
-{-1122057124, 1831030811}, {-1097993542, 1845561216},
-{-1073741824, 1859775393}, {-1049306126, 1873670908},
-{-1024690635, 1887245379}, {-999899569, 1900496480},
-{-974937175, 1913421941}, {-949807730, 1926019547},
-{-924515541, 1938287139}, {-899064940, 1950222616},
-{-873460290, 1961823932}, {-847705977, 1973089100},
-{-821806413, 1984016189}, {-795766038, 1994603327},
-{-769589312, 2004848700}, {-743280720, 2014750553},
-{-716844772, 2024307188}, {-690285996, 2033516969},
-{-663608942, 2042378317}, {-636818183, 2050889714},
-{-609918309, 2059049702}, {-582913927, 2066856882},
-{-555809667, 2074309917}, {-528610172, 2081407530},
-{-501320102, 2088148504}, {-473944133, 2094531684},
-{-446486956, 2100555978}, {-418953276, 2106220352},
-{-391347811, 2111523836}, {-363675290, 2116465521},
-{-335940456, 2121044561}, {-308148059, 2125260170},
-{-280302863, 2129111628}, {-252409639, 2132598273},
-{-224473166, 2135719508}, {-196498230, 2138474799},
-{-168489625, 2140863673}, {-140452151, 2142885721},
-{-112390610, 2144540596}, {-84309812, 2145828016},
-{-56214568, 2146747759}, {-28109692, 2147299668},
-{0, 2147483647}, {28109692, 2147299668},
-{56214568, 2146747759}, {84309812, 2145828016},
-{112390610, 2144540596}, {140452151, 2142885721},
-{168489625, 2140863673}, {196498230, 2138474799},
-{224473166, 2135719508}, {252409639, 2132598273},
-{280302863, 2129111628}, {308148059, 2125260170},
-{335940456, 2121044561}, {363675290, 2116465521},
-{391347811, 2111523836}, {418953276, 2106220352},
-{446486956, 2100555978}, {473944133, 2094531684},
-{501320102, 2088148504}, {528610172, 2081407530},
-{555809667, 2074309917}, {582913927, 2066856882},
-{609918309, 2059049702}, {636818183, 2050889714},
-{663608942, 2042378317}, {690285996, 2033516969},
-{716844772, 2024307188}, {743280720, 2014750553},
-{769589312, 2004848700}, {795766038, 1994603327},
-{821806413, 1984016189}, {847705977, 1973089100},
-{873460290, 1961823932}, {899064940, 1950222616},
-{924515541, 1938287139}, {949807730, 1926019547},
-{974937175, 1913421941}, {999899569, 1900496480},
-{1024690635, 1887245379}, {1049306126, 1873670908},
-{1073741824, 1859775393}, {1097993542, 1845561216},
-{1122057124, 1831030811}, {1145928447, 1816186668},
-{1169603422, 1801031331}, {1193077991, 1785567396},
-{1216348132, 1769797514}, {1239409858, 1753724386},
-{1262259218, 1737350766}, {1284892296, 1720679461},
-{1307305214, 1703713325}, {1329494133, 1686455268},
-{1351455249, 1668908244}, {1373184801, 1651075262},
-{1394679064, 1632959377}, {1415934356, 1614563692},
-{1436947036, 1595891361}, {1457713501, 1576945581},
-{1478230195, 1557729600}, {1498493602, 1538246711},
-{1518500250, 1518500250}, {1538246711, 1498493602},
-{1557729600, 1478230195}, {1576945581, 1457713501},
-{1595891361, 1436947036}, {1614563692, 1415934356},
-{1632959377, 1394679064}, {1651075262, 1373184801},
-{1668908244, 1351455249}, {1686455268, 1329494133},
-{1703713325, 1307305214}, {1720679461, 1284892296},
-{1737350766, 1262259218}, {1753724386, 1239409858},
-{1769797514, 1216348132}, {1785567396, 1193077991},
-{1801031331, 1169603422}, {1816186668, 1145928447},
-{1831030811, 1122057124}, {1845561216, 1097993542},
-{1859775393, 1073741824}, {1873670908, 1049306126},
-{1887245379, 1024690635}, {1900496480, 999899569},
-{1913421941, 974937175}, {1926019547, 949807730},
-{1938287139, 924515541}, {1950222616, 899064940},
-{1961823932, 873460290}, {1973089100, 847705977},
-{1984016189, 821806413}, {1994603327, 795766038},
-{2004848700, 769589312}, {2014750553, 743280720},
-{2024307188, 716844772}, {2033516969, 690285996},
-{2042378317, 663608942}, {2050889714, 636818183},
-{2059049702, 609918309}, {2066856882, 582913927},
-{2074309917, 555809667}, {2081407530, 528610172},
-{2088148504, 501320102}, {2094531684, 473944133},
-{2100555978, 446486956}, {2106220352, 418953276},
-{2111523836, 391347811}, {2116465521, 363675290},
-{2121044561, 335940456}, {2125260170, 308148059},
-{2129111628, 280302863}, {2132598273, 252409639},
-{2135719508, 224473166}, {2138474799, 196498230},
-{2140863673, 168489625}, {2142885721, 140452151},
-{2144540596, 112390610}, {2145828016, 84309812},
-{2146747759, 56214568}, {2147299668, 28109692},
+    {2147483647, 0}, {2147299668, -28109692},
+    {2146747759, -56214568}, {2145828016, -84309812},
+    {2144540596, -112390610}, {2142885721, -140452151},
+    {2140863673, -168489625}, {2138474799, -196498230},
+    {2135719508, -224473166}, {2132598273, -252409639},
+    {2129111628, -280302863}, {2125260170, -308148059},
+    {2121044561, -335940456}, {2116465521, -363675290},
+    {2111523836, -391347811}, {2106220352, -418953276},
+    {2100555978, -446486956}, {2094531684, -473944133},
+    {2088148504, -501320102}, {2081407530, -528610172},
+    {2074309917, -555809667}, {2066856882, -582913927},
+    {2059049702, -609918309}, {2050889714, -636818183},
+    {2042378317, -663608942}, {2033516969, -690285996},
+    {2024307188, -716844772}, {2014750553, -743280720},
+    {2004848700, -769589312}, {1994603327, -795766038},
+    {1984016189, -821806413}, {1973089100, -847705977},
+    {1961823932, -873460290}, {1950222616, -899064940},
+    {1938287139, -924515541}, {1926019547, -949807730},
+    {1913421941, -974937175}, {1900496480, -999899569},
+    {1887245379, -1024690635}, {1873670908, -1049306126},
+    {1859775393, -1073741824}, {1845561216, -1097993542},
+    {1831030811, -1122057124}, {1816186668, -1145928447},
+    {1801031331, -1169603422}, {1785567396, -1193077991},
+    {1769797514, -1216348132}, {1753724386, -1239409858},
+    {1737350766, -1262259218}, {1720679461, -1284892296},
+    {1703713325, -1307305214}, {1686455268, -1329494133},
+    {1668908244, -1351455249}, {1651075262, -1373184801},
+    {1632959377, -1394679064}, {1614563692, -1415934356},
+    {1595891361, -1436947036}, {1576945581, -1457713501},
+    {1557729600, -1478230195}, {1538246711, -1498493602},
+    {1518500250, -1518500250}, {1498493602, -1538246711},
+    {1478230195, -1557729600}, {1457713501, -1576945581},
+    {1436947036, -1595891361}, {1415934356, -1614563692},
+    {1394679064, -1632959377}, {1373184801, -1651075262},
+    {1351455249, -1668908244}, {1329494133, -1686455268},
+    {1307305214, -1703713325}, {1284892296, -1720679461},
+    {1262259218, -1737350766}, {1239409858, -1753724386},
+    {1216348132, -1769797514}, {1193077991, -1785567396},
+    {1169603422, -1801031331}, {1145928447, -1816186668},
+    {1122057124, -1831030811}, {1097993542, -1845561216},
+    {1073741824, -1859775393}, {1049306126, -1873670908},
+    {1024690635, -1887245379}, {999899569, -1900496480},
+    {974937175, -1913421941}, {949807730, -1926019547},
+    {924515541, -1938287139}, {899064940, -1950222616},
+    {873460290, -1961823932}, {847705977, -1973089100},
+    {821806413, -1984016189}, {795766038, -1994603327},
+    {769589312, -2004848700}, {743280720, -2014750553},
+    {716844772, -2024307188}, {690285996, -2033516969},
+    {663608942, -2042378317}, {636818183, -2050889714},
+    {609918309, -2059049702}, {582913927, -2066856882},
+    {555809667, -2074309917}, {528610172, -2081407530},
+    {501320102, -2088148504}, {473944133, -2094531684},
+    {446486956, -2100555978}, {418953276, -2106220352},
+    {391347811, -2111523836}, {363675290, -2116465521},
+    {335940456, -2121044561}, {308148059, -2125260170},
+    {280302863, -2129111628}, {252409639, -2132598273},
+    {224473166, -2135719508}, {196498230, -2138474799},
+    {168489625, -2140863673}, {140452151, -2142885721},
+    {112390610, -2144540596}, {84309812, -2145828016},
+    {56214568, -2146747759}, {28109692, -2147299668},
+    {0, -2147483648}, {-28109692, -2147299668},
+    {-56214568, -2146747759}, {-84309812, -2145828016},
+    {-112390610, -2144540596}, {-140452151, -2142885721},
+    {-168489625, -2140863673}, {-196498230, -2138474799},
+    {-224473166, -2135719508}, {-252409639, -2132598273},
+    {-280302863, -2129111628}, {-308148059, -2125260170},
+    {-335940456, -2121044561}, {-363675290, -2116465521},
+    {-391347811, -2111523836}, {-418953276, -2106220352},
+    {-446486956, -2100555978}, {-473944133, -2094531684},
+    {-501320102, -2088148504}, {-528610172, -2081407530},
+    {-555809667, -2074309917}, {-582913927, -2066856882},
+    {-609918309, -2059049702}, {-636818183, -2050889714},
+    {-663608942, -2042378317}, {-690285996, -2033516969},
+    {-716844772, -2024307188}, {-743280720, -2014750553},
+    {-769589312, -2004848700}, {-795766038, -1994603327},
+    {-821806413, -1984016189}, {-847705977, -1973089100},
+    {-873460290, -1961823932}, {-899064940, -1950222616},
+    {-924515541, -1938287139}, {-949807730, -1926019547},
+    {-974937175, -1913421941}, {-999899569, -1900496480},
+    {-1024690635, -1887245379}, {-1049306126, -1873670908},
+    {-1073741824, -1859775393}, {-1097993542, -1845561216},
+    {-1122057124, -1831030811}, {-1145928447, -1816186668},
+    {-1169603422, -1801031331}, {-1193077991, -1785567396},
+    {-1216348132, -1769797514}, {-1239409858, -1753724386},
+    {-1262259218, -1737350766}, {-1284892296, -1720679461},
+    {-1307305214, -1703713325}, {-1329494133, -1686455268},
+    {-1351455249, -1668908244}, {-1373184801, -1651075262},
+    {-1394679064, -1632959377}, {-1415934356, -1614563692},
+    {-1436947036, -1595891361}, {-1457713501, -1576945581},
+    {-1478230195, -1557729600}, {-1498493602, -1538246711},
+    {-1518500250, -1518500250}, {-1538246711, -1498493602},
+    {-1557729600, -1478230195}, {-1576945581, -1457713501},
+    {-1595891361, -1436947036}, {-1614563692, -1415934356},
+    {-1632959377, -1394679064}, {-1651075262, -1373184801},
+    {-1668908244, -1351455249}, {-1686455268, -1329494133},
+    {-1703713325, -1307305214}, {-1720679461, -1284892296},
+    {-1737350766, -1262259218}, {-1753724386, -1239409858},
+    {-1769797514, -1216348132}, {-1785567396, -1193077991},
+    {-1801031331, -1169603422}, {-1816186668, -1145928447},
+    {-1831030811, -1122057124}, {-1845561216, -1097993542},
+    {-1859775393, -1073741824}, {-1873670908, -1049306126},
+    {-1887245379, -1024690635}, {-1900496480, -999899569},
+    {-1913421941, -974937175}, {-1926019547, -949807730},
+    {-1938287139, -924515541}, {-1950222616, -899064940},
+    {-1961823932, -873460290}, {-1973089100, -847705977},
+    {-1984016189, -821806413}, {-1994603327, -795766038},
+    {-2004848700, -769589312}, {-2014750553, -743280720},
+    {-2024307188, -716844772}, {-2033516969, -690285996},
+    {-2042378317, -663608942}, {-2050889714, -636818183},
+    {-2059049702, -609918309}, {-2066856882, -582913927},
+    {-2074309917, -555809667}, {-2081407530, -528610172},
+    {-2088148504, -501320102}, {-2094531684, -473944133},
+    {-2100555978, -446486956}, {-2106220352, -418953276},
+    {-2111523836, -391347811}, {-2116465521, -363675290},
+    {-2121044561, -335940456}, {-2125260170, -308148059},
+    {-2129111628, -280302863}, {-2132598273, -252409639},
+    {-2135719508, -224473166}, {-2138474799, -196498230},
+    {-2140863673, -168489625}, {-2142885721, -140452151},
+    {-2144540596, -112390610}, {-2145828016, -84309812},
+    {-2146747759, -56214568}, {-2147299668, -28109692},
+    {-2147483648, 0}, {-2147299668, 28109692},
+    {-2146747759, 56214568}, {-2145828016, 84309812},
+    {-2144540596, 112390610}, {-2142885721, 140452151},
+    {-2140863673, 168489625}, {-2138474799, 196498230},
+    {-2135719508, 224473166}, {-2132598273, 252409639},
+    {-2129111628, 280302863}, {-2125260170, 308148059},
+    {-2121044561, 335940456}, {-2116465521, 363675290},
+    {-2111523836, 391347811}, {-2106220352, 418953276},
+    {-2100555978, 446486956}, {-2094531684, 473944133},
+    {-2088148504, 501320102}, {-2081407530, 528610172},
+    {-2074309917, 555809667}, {-2066856882, 582913927},
+    {-2059049702, 609918309}, {-2050889714, 636818183},
+    {-2042378317, 663608942}, {-2033516969, 690285996},
+    {-2024307188, 716844772}, {-2014750553, 743280720},
+    {-2004848700, 769589312}, {-1994603327, 795766038},
+    {-1984016189, 821806413}, {-1973089100, 847705977},
+    {-1961823932, 873460290}, {-1950222616, 899064940},
+    {-1938287139, 924515541}, {-1926019547, 949807730},
+    {-1913421941, 974937175}, {-1900496480, 999899569},
+    {-1887245379, 1024690635}, {-1873670908, 1049306126},
+    {-1859775393, 1073741824}, {-1845561216, 1097993542},
+    {-1831030811, 1122057124}, {-1816186668, 1145928447},
+    {-1801031331, 1169603422}, {-1785567396, 1193077991},
+    {-1769797514, 1216348132}, {-1753724386, 1239409858},
+    {-1737350766, 1262259218}, {-1720679461, 1284892296},
+    {-1703713325, 1307305214}, {-1686455268, 1329494133},
+    {-1668908244, 1351455249}, {-1651075262, 1373184801},
+    {-1632959377, 1394679064}, {-1614563692, 1415934356},
+    {-1595891361, 1436947036}, {-1576945581, 1457713501},
+    {-1557729600, 1478230195}, {-1538246711, 1498493602},
+    {-1518500250, 1518500250}, {-1498493602, 1538246711},
+    {-1478230195, 1557729600}, {-1457713501, 1576945581},
+    {-1436947036, 1595891361}, {-1415934356, 1614563692},
+    {-1394679064, 1632959377}, {-1373184801, 1651075262},
+    {-1351455249, 1668908244}, {-1329494133, 1686455268},
+    {-1307305214, 1703713325}, {-1284892296, 1720679461},
+    {-1262259218, 1737350766}, {-1239409858, 1753724386},
+    {-1216348132, 1769797514}, {-1193077991, 1785567396},
+    {-1169603422, 1801031331}, {-1145928447, 1816186668},
+    {-1122057124, 1831030811}, {-1097993542, 1845561216},
+    {-1073741824, 1859775393}, {-1049306126, 1873670908},
+    {-1024690635, 1887245379}, {-999899569, 1900496480},
+    {-974937175, 1913421941}, {-949807730, 1926019547},
+    {-924515541, 1938287139}, {-899064940, 1950222616},
+    {-873460290, 1961823932}, {-847705977, 1973089100},
+    {-821806413, 1984016189}, {-795766038, 1994603327},
+    {-769589312, 2004848700}, {-743280720, 2014750553},
+    {-716844772, 2024307188}, {-690285996, 2033516969},
+    {-663608942, 2042378317}, {-636818183, 2050889714},
+    {-609918309, 2059049702}, {-582913927, 2066856882},
+    {-555809667, 2074309917}, {-528610172, 2081407530},
+    {-501320102, 2088148504}, {-473944133, 2094531684},
+    {-446486956, 2100555978}, {-418953276, 2106220352},
+    {-391347811, 2111523836}, {-363675290, 2116465521},
+    {-335940456, 2121044561}, {-308148059, 2125260170},
+    {-280302863, 2129111628}, {-252409639, 2132598273},
+    {-224473166, 2135719508}, {-196498230, 2138474799},
+    {-168489625, 2140863673}, {-140452151, 2142885721},
+    {-112390610, 2144540596}, {-84309812, 2145828016},
+    {-56214568, 2146747759}, {-28109692, 2147299668},
+    {0, 2147483647}, {28109692, 2147299668},
+    {56214568, 2146747759}, {84309812, 2145828016},
+    {112390610, 2144540596}, {140452151, 2142885721},
+    {168489625, 2140863673}, {196498230, 2138474799},
+    {224473166, 2135719508}, {252409639, 2132598273},
+    {280302863, 2129111628}, {308148059, 2125260170},
+    {335940456, 2121044561}, {363675290, 2116465521},
+    {391347811, 2111523836}, {418953276, 2106220352},
+    {446486956, 2100555978}, {473944133, 2094531684},
+    {501320102, 2088148504}, {528610172, 2081407530},
+    {555809667, 2074309917}, {582913927, 2066856882},
+    {609918309, 2059049702}, {636818183, 2050889714},
+    {663608942, 2042378317}, {690285996, 2033516969},
+    {716844772, 2024307188}, {743280720, 2014750553},
+    {769589312, 2004848700}, {795766038, 1994603327},
+    {821806413, 1984016189}, {847705977, 1973089100},
+    {873460290, 1961823932}, {899064940, 1950222616},
+    {924515541, 1938287139}, {949807730, 1926019547},
+    {974937175, 1913421941}, {999899569, 1900496480},
+    {1024690635, 1887245379}, {1049306126, 1873670908},
+    {1073741824, 1859775393}, {1097993542, 1845561216},
+    {1122057124, 1831030811}, {1145928447, 1816186668},
+    {1169603422, 1801031331}, {1193077991, 1785567396},
+    {1216348132, 1769797514}, {1239409858, 1753724386},
+    {1262259218, 1737350766}, {1284892296, 1720679461},
+    {1307305214, 1703713325}, {1329494133, 1686455268},
+    {1351455249, 1668908244}, {1373184801, 1651075262},
+    {1394679064, 1632959377}, {1415934356, 1614563692},
+    {1436947036, 1595891361}, {1457713501, 1576945581},
+    {1478230195, 1557729600}, {1498493602, 1538246711},
+    {1518500250, 1518500250}, {1538246711, 1498493602},
+    {1557729600, 1478230195}, {1576945581, 1457713501},
+    {1595891361, 1436947036}, {1614563692, 1415934356},
+    {1632959377, 1394679064}, {1651075262, 1373184801},
+    {1668908244, 1351455249}, {1686455268, 1329494133},
+    {1703713325, 1307305214}, {1720679461, 1284892296},
+    {1737350766, 1262259218}, {1753724386, 1239409858},
+    {1769797514, 1216348132}, {1785567396, 1193077991},
+    {1801031331, 1169603422}, {1816186668, 1145928447},
+    {1831030811, 1122057124}, {1845561216, 1097993542},
+    {1859775393, 1073741824}, {1873670908, 1049306126},
+    {1887245379, 1024690635}, {1900496480, 999899569},
+    {1913421941, 974937175}, {1926019547, 949807730},
+    {1938287139, 924515541}, {1950222616, 899064940},
+    {1961823932, 873460290}, {1973089100, 847705977},
+    {1984016189, 821806413}, {1994603327, 795766038},
+    {2004848700, 769589312}, {2014750553, 743280720},
+    {2024307188, 716844772}, {2033516969, 690285996},
+    {2042378317, 663608942}, {2050889714, 636818183},
+    {2059049702, 609918309}, {2066856882, 582913927},
+    {2074309917, 555809667}, {2081407530, 528610172},
+    {2088148504, 501320102}, {2094531684, 473944133},
+    {2100555978, 446486956}, {2106220352, 418953276},
+    {2111523836, 391347811}, {2116465521, 363675290},
+    {2121044561, 335940456}, {2125260170, 308148059},
+    {2129111628, 280302863}, {2132598273, 252409639},
+    {2135719508, 224473166}, {2138474799, 196498230},
+    {2140863673, 168489625}, {2142885721, 140452151},
+    {2144540596, 112390610}, {2145828016, 84309812},
+    {2146747759, 56214568}, {2147299668, 28109692},
 };
-#ifndef FFT_BITREV480
-#define FFT_BITREV480
+# ifndef FFT_BITREV480
+#  define FFT_BITREV480
 static const oac_int16 fft_bitrev480[480] = {
-0, 96, 192, 288, 384, 32, 128, 224, 320, 416, 64, 160, 256, 352, 448,
-8, 104, 200, 296, 392, 40, 136, 232, 328, 424, 72, 168, 264, 360, 456,
-16, 112, 208, 304, 400, 48, 144, 240, 336, 432, 80, 176, 272, 368, 464,
-24, 120, 216, 312, 408, 56, 152, 248, 344, 440, 88, 184, 280, 376, 472,
-4, 100, 196, 292, 388, 36, 132, 228, 324, 420, 68, 164, 260, 356, 452,
-12, 108, 204, 300, 396, 44, 140, 236, 332, 428, 76, 172, 268, 364, 460,
-20, 116, 212, 308, 404, 52, 148, 244, 340, 436, 84, 180, 276, 372, 468,
-28, 124, 220, 316, 412, 60, 156, 252, 348, 444, 92, 188, 284, 380, 476,
-1, 97, 193, 289, 385, 33, 129, 225, 321, 417, 65, 161, 257, 353, 449,
-9, 105, 201, 297, 393, 41, 137, 233, 329, 425, 73, 169, 265, 361, 457,
-17, 113, 209, 305, 401, 49, 145, 241, 337, 433, 81, 177, 273, 369, 465,
-25, 121, 217, 313, 409, 57, 153, 249, 345, 441, 89, 185, 281, 377, 473,
-5, 101, 197, 293, 389, 37, 133, 229, 325, 421, 69, 165, 261, 357, 453,
-13, 109, 205, 301, 397, 45, 141, 237, 333, 429, 77, 173, 269, 365, 461,
-21, 117, 213, 309, 405, 53, 149, 245, 341, 437, 85, 181, 277, 373, 469,
-29, 125, 221, 317, 413, 61, 157, 253, 349, 445, 93, 189, 285, 381, 477,
-2, 98, 194, 290, 386, 34, 130, 226, 322, 418, 66, 162, 258, 354, 450,
-10, 106, 202, 298, 394, 42, 138, 234, 330, 426, 74, 170, 266, 362, 458,
-18, 114, 210, 306, 402, 50, 146, 242, 338, 434, 82, 178, 274, 370, 466,
-26, 122, 218, 314, 410, 58, 154, 250, 346, 442, 90, 186, 282, 378, 474,
-6, 102, 198, 294, 390, 38, 134, 230, 326, 422, 70, 166, 262, 358, 454,
-14, 110, 206, 302, 398, 46, 142, 238, 334, 430, 78, 174, 270, 366, 462,
-22, 118, 214, 310, 406, 54, 150, 246, 342, 438, 86, 182, 278, 374, 470,
-30, 126, 222, 318, 414, 62, 158, 254, 350, 446, 94, 190, 286, 382, 478,
-3, 99, 195, 291, 387, 35, 131, 227, 323, 419, 67, 163, 259, 355, 451,
-11, 107, 203, 299, 395, 43, 139, 235, 331, 427, 75, 171, 267, 363, 459,
-19, 115, 211, 307, 403, 51, 147, 243, 339, 435, 83, 179, 275, 371, 467,
-27, 123, 219, 315, 411, 59, 155, 251, 347, 443, 91, 187, 283, 379, 475,
-7, 103, 199, 295, 391, 39, 135, 231, 327, 423, 71, 167, 263, 359, 455,
-15, 111, 207, 303, 399, 47, 143, 239, 335, 431, 79, 175, 271, 367, 463,
-23, 119, 215, 311, 407, 55, 151, 247, 343, 439, 87, 183, 279, 375, 471,
-31, 127, 223, 319, 415, 63, 159, 255, 351, 447, 95, 191, 287, 383, 479,
+    0, 96, 192, 288, 384, 32, 128, 224, 320, 416, 64, 160, 256, 352, 448,
+    8, 104, 200, 296, 392, 40, 136, 232, 328, 424, 72, 168, 264, 360, 456,
+    16, 112, 208, 304, 400, 48, 144, 240, 336, 432, 80, 176, 272, 368, 464,
+    24, 120, 216, 312, 408, 56, 152, 248, 344, 440, 88, 184, 280, 376, 472,
+    4, 100, 196, 292, 388, 36, 132, 228, 324, 420, 68, 164, 260, 356, 452,
+    12, 108, 204, 300, 396, 44, 140, 236, 332, 428, 76, 172, 268, 364, 460,
+    20, 116, 212, 308, 404, 52, 148, 244, 340, 436, 84, 180, 276, 372, 468,
+    28, 124, 220, 316, 412, 60, 156, 252, 348, 444, 92, 188, 284, 380, 476,
+    1, 97, 193, 289, 385, 33, 129, 225, 321, 417, 65, 161, 257, 353, 449,
+    9, 105, 201, 297, 393, 41, 137, 233, 329, 425, 73, 169, 265, 361, 457,
+    17, 113, 209, 305, 401, 49, 145, 241, 337, 433, 81, 177, 273, 369, 465,
+    25, 121, 217, 313, 409, 57, 153, 249, 345, 441, 89, 185, 281, 377, 473,
+    5, 101, 197, 293, 389, 37, 133, 229, 325, 421, 69, 165, 261, 357, 453,
+    13, 109, 205, 301, 397, 45, 141, 237, 333, 429, 77, 173, 269, 365, 461,
+    21, 117, 213, 309, 405, 53, 149, 245, 341, 437, 85, 181, 277, 373, 469,
+    29, 125, 221, 317, 413, 61, 157, 253, 349, 445, 93, 189, 285, 381, 477,
+    2, 98, 194, 290, 386, 34, 130, 226, 322, 418, 66, 162, 258, 354, 450,
+    10, 106, 202, 298, 394, 42, 138, 234, 330, 426, 74, 170, 266, 362, 458,
+    18, 114, 210, 306, 402, 50, 146, 242, 338, 434, 82, 178, 274, 370, 466,
+    26, 122, 218, 314, 410, 58, 154, 250, 346, 442, 90, 186, 282, 378, 474,
+    6, 102, 198, 294, 390, 38, 134, 230, 326, 422, 70, 166, 262, 358, 454,
+    14, 110, 206, 302, 398, 46, 142, 238, 334, 430, 78, 174, 270, 366, 462,
+    22, 118, 214, 310, 406, 54, 150, 246, 342, 438, 86, 182, 278, 374, 470,
+    30, 126, 222, 318, 414, 62, 158, 254, 350, 446, 94, 190, 286, 382, 478,
+    3, 99, 195, 291, 387, 35, 131, 227, 323, 419, 67, 163, 259, 355, 451,
+    11, 107, 203, 299, 395, 43, 139, 235, 331, 427, 75, 171, 267, 363, 459,
+    19, 115, 211, 307, 403, 51, 147, 243, 339, 435, 83, 179, 275, 371, 467,
+    27, 123, 219, 315, 411, 59, 155, 251, 347, 443, 91, 187, 283, 379, 475,
+    7, 103, 199, 295, 391, 39, 135, 231, 327, 423, 71, 167, 263, 359, 455,
+    15, 111, 207, 303, 399, 47, 143, 239, 335, 431, 79, 175, 271, 367, 463,
+    23, 119, 215, 311, 407, 55, 151, 247, 343, 439, 87, 183, 279, 375, 471,
+    31, 127, 223, 319, 415, 63, 159, 255, 351, 447, 95, 191, 287, 383, 479,
 };
-#endif
+# endif
 
-#ifndef FFT_BITREV240
-#define FFT_BITREV240
+# ifndef FFT_BITREV240
+#  define FFT_BITREV240
 static const oac_int16 fft_bitrev240[240] = {
-0, 48, 96, 144, 192, 16, 64, 112, 160, 208, 32, 80, 128, 176, 224,
-4, 52, 100, 148, 196, 20, 68, 116, 164, 212, 36, 84, 132, 180, 228,
-8, 56, 104, 152, 200, 24, 72, 120, 168, 216, 40, 88, 136, 184, 232,
-12, 60, 108, 156, 204, 28, 76, 124, 172, 220, 44, 92, 140, 188, 236,
-1, 49, 97, 145, 193, 17, 65, 113, 161, 209, 33, 81, 129, 177, 225,
-5, 53, 101, 149, 197, 21, 69, 117, 165, 213, 37, 85, 133, 181, 229,
-9, 57, 105, 153, 201, 25, 73, 121, 169, 217, 41, 89, 137, 185, 233,
-13, 61, 109, 157, 205, 29, 77, 125, 173, 221, 45, 93, 141, 189, 237,
-2, 50, 98, 146, 194, 18, 66, 114, 162, 210, 34, 82, 130, 178, 226,
-6, 54, 102, 150, 198, 22, 70, 118, 166, 214, 38, 86, 134, 182, 230,
-10, 58, 106, 154, 202, 26, 74, 122, 170, 218, 42, 90, 138, 186, 234,
-14, 62, 110, 158, 206, 30, 78, 126, 174, 222, 46, 94, 142, 190, 238,
-3, 51, 99, 147, 195, 19, 67, 115, 163, 211, 35, 83, 131, 179, 227,
-7, 55, 103, 151, 199, 23, 71, 119, 167, 215, 39, 87, 135, 183, 231,
-11, 59, 107, 155, 203, 27, 75, 123, 171, 219, 43, 91, 139, 187, 235,
-15, 63, 111, 159, 207, 31, 79, 127, 175, 223, 47, 95, 143, 191, 239,
+    0, 48, 96, 144, 192, 16, 64, 112, 160, 208, 32, 80, 128, 176, 224,
+    4, 52, 100, 148, 196, 20, 68, 116, 164, 212, 36, 84, 132, 180, 228,
+    8, 56, 104, 152, 200, 24, 72, 120, 168, 216, 40, 88, 136, 184, 232,
+    12, 60, 108, 156, 204, 28, 76, 124, 172, 220, 44, 92, 140, 188, 236,
+    1, 49, 97, 145, 193, 17, 65, 113, 161, 209, 33, 81, 129, 177, 225,
+    5, 53, 101, 149, 197, 21, 69, 117, 165, 213, 37, 85, 133, 181, 229,
+    9, 57, 105, 153, 201, 25, 73, 121, 169, 217, 41, 89, 137, 185, 233,
+    13, 61, 109, 157, 205, 29, 77, 125, 173, 221, 45, 93, 141, 189, 237,
+    2, 50, 98, 146, 194, 18, 66, 114, 162, 210, 34, 82, 130, 178, 226,
+    6, 54, 102, 150, 198, 22, 70, 118, 166, 214, 38, 86, 134, 182, 230,
+    10, 58, 106, 154, 202, 26, 74, 122, 170, 218, 42, 90, 138, 186, 234,
+    14, 62, 110, 158, 206, 30, 78, 126, 174, 222, 46, 94, 142, 190, 238,
+    3, 51, 99, 147, 195, 19, 67, 115, 163, 211, 35, 83, 131, 179, 227,
+    7, 55, 103, 151, 199, 23, 71, 119, 167, 215, 39, 87, 135, 183, 231,
+    11, 59, 107, 155, 203, 27, 75, 123, 171, 219, 43, 91, 139, 187, 235,
+    15, 63, 111, 159, 207, 31, 79, 127, 175, 223, 47, 95, 143, 191, 239,
 };
-#endif
+# endif
 
-#ifndef FFT_BITREV120
-#define FFT_BITREV120
+# ifndef FFT_BITREV120
+#  define FFT_BITREV120
 static const oac_int16 fft_bitrev120[120] = {
-0, 24, 48, 72, 96, 8, 32, 56, 80, 104, 16, 40, 64, 88, 112,
-4, 28, 52, 76, 100, 12, 36, 60, 84, 108, 20, 44, 68, 92, 116,
-1, 25, 49, 73, 97, 9, 33, 57, 81, 105, 17, 41, 65, 89, 113,
-5, 29, 53, 77, 101, 13, 37, 61, 85, 109, 21, 45, 69, 93, 117,
-2, 26, 50, 74, 98, 10, 34, 58, 82, 106, 18, 42, 66, 90, 114,
-6, 30, 54, 78, 102, 14, 38, 62, 86, 110, 22, 46, 70, 94, 118,
-3, 27, 51, 75, 99, 11, 35, 59, 83, 107, 19, 43, 67, 91, 115,
-7, 31, 55, 79, 103, 15, 39, 63, 87, 111, 23, 47, 71, 95, 119,
+    0, 24, 48, 72, 96, 8, 32, 56, 80, 104, 16, 40, 64, 88, 112,
+    4, 28, 52, 76, 100, 12, 36, 60, 84, 108, 20, 44, 68, 92, 116,
+    1, 25, 49, 73, 97, 9, 33, 57, 81, 105, 17, 41, 65, 89, 113,
+    5, 29, 53, 77, 101, 13, 37, 61, 85, 109, 21, 45, 69, 93, 117,
+    2, 26, 50, 74, 98, 10, 34, 58, 82, 106, 18, 42, 66, 90, 114,
+    6, 30, 54, 78, 102, 14, 38, 62, 86, 110, 22, 46, 70, 94, 118,
+    3, 27, 51, 75, 99, 11, 35, 59, 83, 107, 19, 43, 67, 91, 115,
+    7, 31, 55, 79, 103, 15, 39, 63, 87, 111, 23, 47, 71, 95, 119,
 };
-#endif
+# endif
 
-#ifndef FFT_BITREV60
-#define FFT_BITREV60
+# ifndef FFT_BITREV60
+#  define FFT_BITREV60
 static const oac_int16 fft_bitrev60[60] = {
-0, 12, 24, 36, 48, 4, 16, 28, 40, 52, 8, 20, 32, 44, 56,
-1, 13, 25, 37, 49, 5, 17, 29, 41, 53, 9, 21, 33, 45, 57,
-2, 14, 26, 38, 50, 6, 18, 30, 42, 54, 10, 22, 34, 46, 58,
-3, 15, 27, 39, 51, 7, 19, 31, 43, 55, 11, 23, 35, 47, 59,
+    0, 12, 24, 36, 48, 4, 16, 28, 40, 52, 8, 20, 32, 44, 56,
+    1, 13, 25, 37, 49, 5, 17, 29, 41, 53, 9, 21, 33, 45, 57,
+    2, 14, 26, 38, 50, 6, 18, 30, 42, 54, 10, 22, 34, 46, 58,
+    3, 15, 27, 39, 51, 7, 19, 31, 43, 55, 11, 23, 35, 47, 59,
 };
-#endif
+# endif
 
-#ifndef FFT_STATE48000_960_0
-#define FFT_STATE48000_960_0
+# ifndef FFT_STATE48000_960_0
+#  define FFT_STATE48000_960_0
 static const kiss_fft_state fft_state48000_960_0 = {
-480,    /* nfft */
-572662306,    /* scale */
-8,    /* scale_shift */
--1,    /* shift */
-{5, 96, 3, 32, 4, 8, 2, 4, 4, 1, 0, 0, 0, 0, 0, 0, },    /* factors */
-fft_bitrev480,    /* bitrev */
-fft_twiddles48000_960,    /* bitrev */
-#ifdef OVERRIDE_FFT
-(arch_fft_state *)&cfg_arch_480,
-#else
-NULL,
-#endif
+    480, /* nfft */
+    572662306, /* scale */
+    8, /* scale_shift */
+    -1, /* shift */
+    {5, 96, 3, 32, 4, 8, 2, 4, 4, 1, 0, 0, 0, 0, 0, 0, }, /* factors */
+    fft_bitrev480, /* bitrev */
+    fft_twiddles48000_960, /* bitrev */
+#  ifdef OVERRIDE_FFT
+    (arch_fft_state *)&cfg_arch_480,
+#  else
+    NULL,
+#  endif
 };
-#endif
+# endif
 
-#ifndef FFT_STATE48000_960_1
-#define FFT_STATE48000_960_1
+# ifndef FFT_STATE48000_960_1
+#  define FFT_STATE48000_960_1
 static const kiss_fft_state fft_state48000_960_1 = {
-240,    /* nfft */
-572662306,    /* scale */
-7,    /* scale_shift */
-1,    /* shift */
-{5, 48, 3, 16, 4, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, },    /* factors */
-fft_bitrev240,    /* bitrev */
-fft_twiddles48000_960,    /* bitrev */
-#ifdef OVERRIDE_FFT
-(arch_fft_state *)&cfg_arch_240,
-#else
-NULL,
-#endif
+    240, /* nfft */
+    572662306, /* scale */
+    7, /* scale_shift */
+    1, /* shift */
+    {5, 48, 3, 16, 4, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, }, /* factors */
+    fft_bitrev240, /* bitrev */
+    fft_twiddles48000_960, /* bitrev */
+#  ifdef OVERRIDE_FFT
+    (arch_fft_state *)&cfg_arch_240,
+#  else
+    NULL,
+#  endif
 };
-#endif
+# endif
 
-#ifndef FFT_STATE48000_960_2
-#define FFT_STATE48000_960_2
+# ifndef FFT_STATE48000_960_2
+#  define FFT_STATE48000_960_2
 static const kiss_fft_state fft_state48000_960_2 = {
-120,    /* nfft */
-572662306,    /* scale */
-6,    /* scale_shift */
-2,    /* shift */
-{5, 24, 3, 8, 2, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, },    /* factors */
-fft_bitrev120,    /* bitrev */
-fft_twiddles48000_960,    /* bitrev */
-#ifdef OVERRIDE_FFT
-(arch_fft_state *)&cfg_arch_120,
-#else
-NULL,
-#endif
+    120, /* nfft */
+    572662306, /* scale */
+    6, /* scale_shift */
+    2, /* shift */
+    {5, 24, 3, 8, 2, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, }, /* factors */
+    fft_bitrev120, /* bitrev */
+    fft_twiddles48000_960, /* bitrev */
+#  ifdef OVERRIDE_FFT
+    (arch_fft_state *)&cfg_arch_120,
+#  else
+    NULL,
+#  endif
 };
-#endif
+# endif
 
-#ifndef FFT_STATE48000_960_3
-#define FFT_STATE48000_960_3
+# ifndef FFT_STATE48000_960_3
+#  define FFT_STATE48000_960_3
 static const kiss_fft_state fft_state48000_960_3 = {
-60,    /* nfft */
-572662306,    /* scale */
-5,    /* scale_shift */
-3,    /* shift */
-{5, 12, 3, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },    /* factors */
-fft_bitrev60,    /* bitrev */
-fft_twiddles48000_960,    /* bitrev */
-#ifdef OVERRIDE_FFT
-(arch_fft_state *)&cfg_arch_60,
-#else
-NULL,
-#endif
+    60, /* nfft */
+    572662306, /* scale */
+    5, /* scale_shift */
+    3, /* shift */
+    {5, 12, 3, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, /* factors */
+    fft_bitrev60, /* bitrev */
+    fft_twiddles48000_960, /* bitrev */
+#  ifdef OVERRIDE_FFT
+    (arch_fft_state *)&cfg_arch_60,
+#  else
+    NULL,
+#  endif
 };
-#endif
+# endif
 
 #endif
 
 #ifndef MDCT_TWIDDLES960
-#define MDCT_TWIDDLES960
+# define MDCT_TWIDDLES960
 static const celt_coef mdct_twiddles960[1800] = {
-2147483468, 2147469095, 2147431723, 2147371355, 2147287990,
-2147181629, 2147052273, 2146899924, 2146724584, 2146526254,
-2146304937, 2146060634, 2145793349, 2145503083, 2145189842,
-2144853627, 2144494442, 2144112292, 2143707180, 2143279110,
-2142828088, 2142354118, 2141857204, 2141337354, 2140794571,
-2140228862, 2139640233, 2139028690, 2138394240, 2137736889,
-2137056645, 2136353515, 2135627506, 2134878626, 2134106884,
-2133312286, 2132494843, 2131654563, 2130791454, 2129905526,
-2128996788, 2128065251, 2127110924, 2126133817, 2125133941,
-2124111307, 2123065925, 2121997806, 2120906963, 2119793407,
-2118657149, 2117498202, 2116316578, 2115112291, 2113885352,
-2112635775, 2111363574, 2110068761, 2108751352, 2107411359,
-2106048798, 2104663683, 2103256028, 2101825849, 2100373162,
-2098897981, 2097400322, 2095880202, 2094337637, 2092772643,
-2091185237, 2089575437, 2087943258, 2086288720, 2084611839,
-2082912633, 2081191122, 2079447322, 2077681253, 2075892934,
-2074082383, 2072249621, 2070394667, 2068517540, 2066618262,
-2064696851, 2062753329, 2060787717, 2058800036, 2056790306,
-2054758550, 2052704789, 2050629045, 2048531340, 2046411698,
-2044270140, 2042106689, 2039921369, 2037714204, 2035485216,
-2033234429, 2030961869, 2028667558, 2026351522, 2024013785,
-2021654373, 2019273310, 2016870623, 2014446336, 2012000477,
-2009533071, 2007044144, 2004533723, 2002001835, 1999448508,
-1996873768, 1994277643, 1991660161, 1989021350, 1986361238,
-1983679853, 1980977226, 1978253383, 1975508355, 1972742171,
-1969954860, 1967146453, 1964316979, 1961466469, 1958594953,
-1955702462, 1952789027, 1949854680, 1946899451, 1943923372,
-1940926475, 1937908793, 1934870357, 1931811201, 1928731356,
-1925630856, 1922509734, 1919368023, 1916205758, 1913022972,
-1909819698, 1906595972, 1903351828, 1900087301, 1896802425,
-1893497236, 1890171769, 1886826060, 1883460144, 1880074058,
-1876667838, 1873241521, 1869795142, 1866328740, 1862842350,
-1859336011, 1855809760, 1852263635, 1848697674, 1845111914,
-1841506395, 1837881155, 1834236233, 1830571667, 1826887497,
-1823183763, 1819460504, 1815717761, 1811955572, 1808173978,
-1804373021, 1800552740, 1796713177, 1792854372, 1788976368,
-1785079205, 1781162925, 1777227570, 1773273182, 1769299805,
-1765307479, 1761296249, 1757266156, 1753217244, 1749149557,
-1745063138, 1740958031, 1736834279, 1732691928, 1728531020,
-1724351602, 1720153717, 1715937410, 1711702727, 1707449714,
-1703178415, 1698888876, 1694581143, 1690255263, 1685911282,
-1681549245, 1677169201, 1672771196, 1668355276, 1663921490,
-1659469885, 1655000508, 1650513407, 1646008631, 1641486227,
-1636946244, 1632388731, 1627813736, 1623221309, 1618611498,
-1613984353, 1609339924, 1604678260, 1599999411, 1595303428,
-1590590360, 1585860258, 1581113173, 1576349155, 1571568256,
-1566770527, 1561956018, 1557124783, 1552276872, 1547412337,
-1542531231, 1537633606, 1532719513, 1527789007, 1522842139,
-1517878963, 1512899531, 1507903898, 1502892116, 1497864239,
-1492820322, 1487760417, 1482684580, 1477592864, 1472485325,
-1467362016, 1462222994, 1457068312, 1451898025, 1446712191,
-1441510863, 1436294098, 1431061951, 1425814478, 1420551737,
-1415273782, 1409980671, 1404672460, 1399349206, 1394010966,
-1388657798, 1383289758, 1377906904, 1372509294, 1367096986,
-1361670037, 1356228505, 1350772450, 1345301929, 1339817000,
-1334317724, 1328804158, 1323276361, 1317734393, 1312178313,
-1306608181, 1301024057, 1295425999, 1289814068, 1284188325,
-1278548828, 1272895640, 1267228820, 1261548429, 1255854528,
-1250147177, 1244426439, 1238692373, 1232945043, 1227184508,
-1221410831, 1215624074, 1209824299, 1204011567, 1198185941,
-1192347484, 1186496258, 1180632325, 1174755748, 1168866591,
-1162964917, 1157050787, 1151124267, 1145185419, 1139234307,
-1133270995, 1127295547, 1121308026, 1115308496, 1109297023,
-1103273670, 1097238502, 1091191583, 1085132978, 1079062753,
-1072980972, 1066887699, 1060783002, 1054666944, 1048539592,
-1042401010, 1036251266, 1030090423, 1023918550, 1017735711,
-1011541973, 1005337402, 999122065, 992896028, 986659358,
-980412122, 974154386, 967886217, 961607684, 955318852,
-949019790, 942710564, 936391243, 930061894, 923722585,
-917373383, 911014357, 904645574, 898267104, 891879014,
-885481373, 879074249, 872657710, 866231826, 859796666,
-853352298, 846898791, 840436214, 833964638, 827484130,
-820994760, 814496598, 807989714, 801474176, 794950056,
-788417422, 781876345, 775326894, 768769141, 762203154,
-755629005, 749046764, 742456501, 735858287, 729252193,
-722638289, 716016646, 709387335, 702750427, 696105993,
-689454104, 682794832, 676128248, 669454423, 662773428,
-656085336, 649390218, 642688145, 635979190, 629263424,
-622540918, 615811746, 609075979, 602333690, 595584950,
-588829831, 582068407, 575300749, 568526931, 561747023,
-554961100, 548169234, 541371497, 534567963, 527758704,
-520943793, 514123303, 507297307, 500465878, 493629090,
-486787016, 479939728, 473087301, 466229807, 459367320,
-452499914, 445627662, 438750638, 431868915, 424982567,
-418091668, 411196291, 404296511, 397392401, 390484035,
-383571488, 376654833, 369734144, 362809495, 355880961,
-348948616, 342012534, 335072790, 328129457, 321182610,
-314232323, 307278671, 300321729, 293361570, 286398270,
-279431902, 272462542, 265490265, 258515144, 251537254,
-244556671, 237573469, 230587722, 223599506, 216608896,
-209615966, 202620791, 195623446, 188624006, 181622546,
-174619141, 167613866, 160606796, 153598006, 146587571,
-139575567, 132562067, 125547148, 118530885, 111513352,
-104494625, 97474778, 90453888, 83432030, 76409277,
-69385707, 62361393, 55336412, 48310838, 41284746,
-34258213, 27231312, 20204120, 13176712, 6149162,
--878453, -7906059, -14933580, -21960942, -28988068,
--36014884, -43041314, -50067283, -57092716, -64117537,
--71141672, -78165045, -85187581, -92209205, -99229841,
--106249414, -113267850, -120285073, -127301007, -134315578,
--141328711, -148340330, -155350361, -162358728, -169365356,
--176370170, -183373096, -190374058, -197372981, -204369791,
--211364411, -218356769, -225346788, -232334393, -239319511,
--246302065, -253281982, -260259186, -267233603, -274205159,
--281173778, -288139385, -295101907, -302061269, -309017396,
--315970213, -322919647, -329865622, -336808065, -343746901,
--350682056, -357613455, -364541025, -371464690, -378384377,
--385300013, -392211522, -399118830, -406021865, -412920551,
--419814815, -426704583, -433589782, -440470337, -447346176,
--454217223, -461083406, -467944652, -474800886, -481652035,
--488498026, -495338786, -502174241, -509004318, -515828944,
--522648046, -529461551, -536269386, -543071478, -549867754,
--556658141, -563442567, -570220959, -576993244, -583759350,
--590519205, -597272736, -604019870, -610760536, -617494660,
--624222173, -630943000, -637657070, -644364312, -651064652,
--657758021, -664444345, -671123554, -677795576, -684460338,
--691117771, -697767803, -704410362, -711045377, -717672778,
--724292493, -730904451, -737508582, -744104815, -750693079,
--757273304, -763845419, -770409354, -776965038, -783512402,
--790051375, -796581887, -803103868, -809617249, -816121959,
--822617929, -829105090, -835583372, -842052705, -848513021,
--854964249, -861406322, -867839170, -874262724, -880676915,
--887081675, -893476935, -899862626, -906238681, -912605031,
--918961607, -925308342, -931645168, -937972016, -944288820,
--950595511, -956892022, -963178285, -969454234, -975719800,
--981974918, -988219519, -994453537, -1000676905, -1006889557,
--1013091426, -1019282445, -1025462549, -1031631671, -1037789745,
--1043936705, -1050072485, -1056197020, -1062310244, -1068412091,
--1074502497, -1080581395, -1086648722, -1092704411, -1098748398,
--1104780618, -1110801008, -1116809501, -1122806034, -1128790543,
--1134762964, -1140723232, -1146671283, -1152607055, -1158530484,
--1164441505, -1170340057, -1176226074, -1182099496, -1187960258,
--1193808298, -1199643553, -1205465961, -1211275460, -1217071986,
--1222855479, -1228625876, -1234383115, -1240127136, -1245857875,
--1251575272, -1257279266, -1262969796, -1268646800, -1274310217,
--1279959989, -1285596052, -1291218348, -1296826816, -1302421396,
--1308002029, -1313568653, -1319121210, -1324659641, -1330183885,
--1335693885, -1341189580, -1346670912, -1352137822, -1357590252,
--1363028143, -1368451438, -1373860077, -1379254004, -1384633159,
--1389997487, -1395346928, -1400681427, -1406000925, -1411305366,
--1416594694, -1421868850, -1427127780, -1432371426, -1437599733,
--1442812644, -1448010104, -1453192057, -1458358447, -1463509220,
--1468644319, -1473763690, -1478867279, -1483955030, -1489026889,
--1494082802, -1499122714, -1504146572, -1509154322, -1514145910,
--1519121283, -1524080387, -1529023170, -1533949577, -1538859558,
--1543753058, -1548630027, -1553490410, -1558334157, -1563161216,
--1567971534, -1572765060, -1577541744, -1582301533, -1587044377,
--1591770225, -1596479027, -1601170732, -1605845289, -1610502649,
--1615142762, -1619765578, -1624371047, -1628959121, -1633529750,
--1638082885, -1642618478, -1647136479, -1651636841, -1656119516,
--1660584454, -1665031609, -1669460933, -1673872378, -1678265898,
--1682641444, -1686998971, -1691338432, -1695659779, -1699962968,
--1704247951, -1708514683, -1712763118, -1716993211, -1721204917,
--1725398189, -1729572984, -1733729257, -1737866963, -1741986057,
--1746086497, -1750168237, -1754231234, -1758275445, -1762300826,
--1766307335, -1770294927, -1774263561, -1778213194, -1782143784,
--1786055289, -1789947667, -1793820875, -1797674873, -1801509620,
--1805325074, -1809121194, -1812897940, -1816655271, -1820393147,
--1824111529, -1827810376, -1831489648, -1835149306, -1838789312,
--1842409625, -1846010208, -1849591022, -1853152028, -1856693188,
--1860214464, -1863715819, -1867197215, -1870658615, -1874099982,
--1877521279, -1880922469, -1884303515, -1887664383, -1891005035,
--1894325435, -1897625550, -1900905342, -1904164776, -1907403819,
--1910622435, -1913820590, -1916998250, -1920155379, -1923291946,
--1926407915, -1929503255, -1932577931, -1935631910, -1938665161,
--1941677650, -1944669345, -1947640214, -1950590226, -1953519348,
--1956427550, -1959314800, -1962181067, -1965026321, -1967850531,
--1970653667, -1973435699, -1976196596, -1978936331, -1981654873,
--1984352192, -1987028261, -1989683050, -1992316532, -1994928677,
--1997519459, -2000088848, -2002636818, -2005163342, -2007668391,
--2010151941, -2012613963, -2015054432, -2017473321, -2019870604,
--2022246257, -2024600252, -2026932566, -2029243173, -2031532049,
--2033799168, -2036044507, -2038268042, -2040469748, -2042649603,
--2044807583, -2046943664, -2049057824, -2051150040, -2053220291,
--2055268553, -2057294804, -2059299024, -2061281190, -2063241282,
--2065179277, -2067095157, -2068988899, -2070860485, -2072709893,
--2074537104, -2076342098, -2078124857, -2079885360, -2081623590,
--2083339527, -2085033153, -2086704450, -2088353400, -2089979985,
--2091584189, -2093165993, -2094725382, -2096262337, -2097776843,
--2099268884, -2100738443, -2102185505, -2103610054, -2105012075,
--2106391553, -2107748474, -2109082822, -2110394584, -2111683744,
--2112950291, -2114194210, -2115415487, -2116614110, -2117790065,
--2118943341, -2120073924, -2121181804, -2122266967, -2123329402,
--2124369098, -2125386044, -2126380229, -2127351642, -2128300272,
--2129226111, -2130129147, -2131009371, -2131866773, -2132701345,
--2133513078, -2134301962, -2135067990, -2135811153, -2136531442,
--2137228852, -2137903373, -2138555000, -2139183723, -2139789539,
--2140372438, -2140932416, -2141469466, -2141983583, -2142474761,
--2142942995, -2143388280, -2143810610, -2144209982, -2144586392,
--2144939834, -2145270306, -2145577804, -2145862324, -2146123864,
--2146362421, -2146577992, -2146770575, -2146940167, -2147086768,
--2147210375, -2147310987, -2147388603, -2147443222, -2147474844,
-2147482929, 2147425435, 2147275952, 2147034487, 2146701050,
-2146275656, 2145758322, 2145149071, 2144447929, 2143654926,
-2142770096, 2141793477, 2140725111, 2139565043, 2138313323,
-2136970005, 2135535146, 2134008809, 2132391057, 2130681961,
-2128881593, 2126990031, 2125007356, 2122933653, 2120769010,
-2118513521, 2116167282, 2113730393, 2111202959, 2108585087,
-2105876892, 2103078487, 2100189994, 2097211535, 2094143239,
-2090985237, 2087737664, 2084400659, 2080974365, 2077458929,
-2073854502, 2070161238, 2066379295, 2062508835, 2058550025,
-2054503033, 2050368032, 2046145201, 2041834720, 2037436773,
-2032951550, 2028379241, 2023720043, 2018974156, 2014141783,
-2009223131, 2004218410, 1999127836, 1993951625, 1988690000,
-1983343186, 1977911412, 1972394912, 1966793920, 1961108677,
-1955339428, 1949486417, 1943549898, 1937530123, 1931427351,
-1925241843, 1918973864, 1912623682, 1906191570, 1899677803,
-1893082661, 1886406424, 1879649381, 1872811820, 1865894033,
-1858896318, 1851818974, 1844662304, 1837426615, 1830112217,
-1822719423, 1815248550, 1807699917, 1800073849, 1792370671,
-1784590714, 1776734311, 1768801799, 1760793518, 1752709809,
-1744551021, 1736317502, 1728009604, 1719627685, 1711172102,
-1702643219, 1694041400, 1685367013, 1676620432, 1667802029,
-1658912184, 1649951276, 1640919689, 1631817811, 1622646032,
-1613404744, 1604094343, 1594715227, 1585267800, 1575752465,
-1566169630, 1556519705, 1546803104, 1537020244, 1527171542,
-1517257422, 1507278307, 1497234626, 1487126808, 1476955286,
-1466720497, 1456422878, 1446062871, 1435640919, 1425157469,
-1414612971, 1404007875, 1393342636, 1382617710, 1371833558,
-1360990642, 1350089425, 1339130374, 1328113960, 1317040654,
-1305910930, 1294725265, 1283484138, 1272188032, 1260837429,
-1249432816, 1237974681, 1226463516, 1214899813, 1203284068,
-1191616778, 1179898443, 1168129565, 1156310649, 1144442200,
-1132524727, 1120558740, 1108544752, 1096483278, 1084374834,
-1072219940, 1060019115, 1047772882, 1035481766, 1023146293,
-1010766993, 998344394, 985879030, 973371434, 960822142,
-948231691, 935600622, 922929474, 910218791, 897469118,
-884680999, 871854984, 858991622, 846091463, 833155061,
-820182969, 807175743, 794133941, 781058120, 767948841,
-754806666, 741632158, 728425880, 715188400, 701920283,
-688622098, 675294414, 661937804, 648552838, 635140090,
-621700135, 608233549, 594740907, 581222789, 567679774,
-554112440, 540521371, 526907147, 513270353, 499611571,
-485931388, 472230390, 458509162, 444768294, 431008373,
-417229989, 403433732, 389620194, 375789965, 361943639,
-348081809, 334205068, 320314011, 306409232, 292491328,
-278560894, 264618528, 250664827, 236700388, 222725809,
-208741690, 194748629, 180747225, 166738079, 152721790,
-138698959, 124670187, 110636075, 96597223, 82554233,
-68507707, 54458246, 40406452, 26352928, 12298274,
--1756906, -15812011, -29866438, -43919586, -57970853,
--72019637, -86065335, -100107347, -114145071, -128177904,
--142205248, -156226499, -170241059, -184248325, -198247699,
--212238581, -226220372, -240192472, -254154282, -268105206,
--282044645, -295972002, -309886680, -323788084, -337675619,
--351548688, -365406698, -379249055, -393075166, -406884440,
--420676284, -434450107, -448205320, -461941333, -475657559,
--489353409, -503028296, -516681636, -530312842, -543921332,
--557506522, -571067830, -584604676, -598116479, -611602660,
--625062643, -638495850, -651901706, -665279637, -678629069,
--691949432, -705240153, -718500664, -731730397, -744928785,
--758095263, -771229267, -784330234, -797397602, -810430813,
--823429308, -836392529, -849319923, -862210934, -875065011,
--887881603, -900660162, -913400139, -926100989, -938762167,
--951383133, -963963344, -976502263, -988999351, -1001454074,
--1013865898, -1026234291, -1038558724, -1050838668, -1063073598,
--1075262990, -1087406320, -1099503070, -1111552721, -1123554757,
--1135508663, -1147413928, -1159270041, -1171076495, -1182832785,
--1194538405, -1206192856, -1217795637, -1229346252, -1240844206,
--1252289006, -1263680162, -1275017186, -1286299593, -1297526899,
--1308698624, -1319814288, -1330873416, -1341875533, -1352820169,
--1363706855, -1374535124, -1385304512, -1396014559, -1406664805,
--1417254794, -1427784073, -1438252190, -1448658697, -1459003149,
--1469285102, -1479504115, -1489659751, -1499751576, -1509779156,
--1519742062, -1529639867, -1539472148, -1549238483, -1558938453,
--1568571644, -1578137643, -1587636039, -1597066426, -1606428400,
--1615721561, -1624945509, -1634099849, -1643184191, -1652198144,
--1661141322, -1670013342, -1678813825, -1687542393, -1696198672,
--1704782292, -1713292884, -1721730085, -1730093532, -1738382868,
--1746597738, -1754737789, -1762802673, -1770792044, -1778705561,
--1786542883, -1794303676, -1801987607, -1809594347, -1817123570,
--1824574954, -1831948179, -1839242929, -1846458892, -1853595759,
--1860653224, -1867630985, -1874528743, -1881346202, -1888083070,
--1894739060, -1901313885, -1907807264, -1914218919, -1920548575,
--1926795962, -1932960811, -1939042858, -1945041843, -1950957509,
--1956789602, -1962537873, -1968202076, -1973781967, -1979277308,
--1984687864, -1990013401, -1995253694, -2000408516, -2005477648,
--2010460871, -2015357973, -2020168744, -2024892978, -2029530472,
--2034081027, -2038544449, -2042920547, -2047209133, -2051410023,
--2055523038, -2059548001, -2063484740, -2067333086, -2071092874,
--2074763944, -2078346137, -2081839301, -2085243286, -2088557947,
--2091783140, -2094918728, -2097964577, -2100920556, -2103786539,
--2106562402, -2109248028, -2111843300, -2114348108, -2116762344,
--2119085905, -2121318692, -2123460608, -2125511562, -2127471467,
--2129340237, -2131117794, -2132804061, -2134398966, -2135902440,
--2137314419, -2138634843, -2139863654, -2141000801, -2142046235,
--2142999911, -2143861787, -2144631828, -2145310000, -2145896274,
--2146390624, -2146793031, -2147103476, -2147321946, -2147448433,
-2147480773, 2147250799, 2146652904, 2145687192, 2144353827,
-2142653038, 2140585116, 2138150417, 2135349356, 2132182414,
-2128650133, 2124753120, 2120492040, 2115867626, 2110880668,
-2105532022, 2099822604, 2093753392, 2087325426, 2080539807,
-2073397699, 2065900325, 2058048970, 2049844978, 2041289756,
-2032384769, 2023131544, 2013531666, 2003586779, 1993298588,
-1982668856, 1971699403, 1960392110, 1948748914, 1936771810,
-1924462850, 1911824143, 1898857855, 1885566207, 1871951478,
-1858015999, 1843762158, 1829192399, 1814309216, 1799115162,
-1783612838, 1767804901, 1751694060, 1735283075, 1718574758,
-1701571972, 1684277631, 1666694698, 1648826185, 1630675154,
-1612244715, 1593538026, 1574558293, 1555308768, 1535792748,
-1516013578, 1495974647, 1475679389, 1455131280, 1434333842,
-1413290638, 1392005275, 1370481398, 1348722696, 1326732898,
-1304515771, 1282075122, 1259414796, 1236538675, 1213450681,
-1190154767, 1166654927, 1142955186, 1119059606, 1094972281,
-1070697338, 1046238936, 1021601267, 996788551, 971805042,
-946655018, 921342790, 895872694, 870249095, 844476384,
-818558976, 792501312, 766307857, 739983099, 713531549,
-686957739, 660266222, 633461572, 606548381, 579531262,
-552414843, 525203770, 497902707, 470516330, 443049333,
-415506422, 387892316, 360211746, 332469456, 304670200,
-276818739, 248919847, 220978304, 192998897, 164986421,
-136945676, 108881465, 80798598, 52701887, 24596146,
--3513810, -31623164, -59727099, -87820801, -115899455,
--143958250, -171992378, -199997036, -227967426, -255898755,
--283786237, -311625094, -339410555, -367137861, -394802258,
--422399009, -449923384, -477370666, -504736154, -532015158,
--559203003, -586295032, -613286603, -640173090, -666949886,
--693612404, -720156076, -746576352, -772868706, -799028633,
--825051651, -850933300, -876669146, -902254780, -927685817,
--952957899, -978066697, -1003007909, -1027777260, -1052370507,
--1076783436, -1101011863, -1125051638, -1148898640, -1172548785,
--1195998020, -1219242327, -1242277723, -1265100260, -1287706030,
--1310091157, -1332251808, -1354184184, -1375884527, -1397349119,
--1418574283, -1439556382, -1460291820, -1480777044, -1501008545,
--1520982856, -1540696555, -1560146263, -1579328647, -1598240423,
--1616878347, -1635239228, -1653319919, -1671117323, -1688628389,
--1705850117, -1722779556, -1739413807, -1755750017, -1771785389,
--1787517174, -1802942678, -1818059257, -1832864320, -1847355332,
--1861529809, -1875385322, -1888919498, -1902130017, -1915014616,
--1927571087, -1939797279, -1951691096, -1963250501, -1974473513,
--1985358210, -1995902725, -2006105253, -2015964045, -2025477412,
--2034643724, -2043461410, -2051928960, -2060044922, -2067807906,
--2075216581, -2082269679, -2088965991, -2095304370, -2101283728,
--2106903043, -2112161350, -2117057750, -2121591402, -2125761531,
--2129567422, -2133008422, -2136083942, -2138793455, -2141136497,
--2143112666, -2144721624, -2145963095, -2146836866, -2147342788,
-2147472149, 2146552303, 2144161316, 2140300829, 2134973487,
-2128182940, 2119933843, 2110231849, 2099083608, 2086496759,
-2072479930, 2057042727, 2040195730, 2021950484, 2002319494,
-1981316215, 1958955040, 1935251296, 1910221227, 1883881987,
-1856251629, 1827349089, 1797194176, 1765807555, 1733210737,
-1699426064, 1664476689, 1628386565, 1591180426, 1552883771,
-1513522847, 1473124631, 1431716808, 1389327759, 1345986533,
-1301722835, 1256567002, 1210549980, 1163703308, 1116059092,
-1067649985, 1018509163, 968670307, 918167572, 867035571,
-815309347, 763024350, 710216415, 656921734, 603176830,
-549018540, 494483979, 439610524, 384435782, 328997567,
-273333873, 217482850, 161482775, 105372028, 49189064,
--7027611, -63239471, -119407989, -175494670, -231461077,
--287268852, -342879747, -398255649, -453358607, -508150855,
--562594842, -616653255, -670289044, -723465451, -776146031,
--828294679, -879875655, -930853609, -981193602, -1030861133,
--1079822164, -1128043139, -1175491010, -1222133257, -1267937916,
--1312873593, -1356909492, -1400015434, -1442161874, -1483319929,
--1523461391, -1562558748, -1600585205, -1637514702, -1673321927,
--1707982341, -1741472190, -1773768520, -1804849198, -1834692923,
--1863279241, -1890588560, -1916602164, -1941302225, -1964671814,
--1986694916, -2007356435, -2026642214, -2044539032, -2061034626,
--2076117690, -2089777886, -2102005853, -2112793210, -2122132564,
--2130017514, -2136442657, -2141403589, -2144896910, -2146920225,
+    2147483468, 2147469095, 2147431723, 2147371355, 2147287990,
+    2147181629, 2147052273, 2146899924, 2146724584, 2146526254,
+    2146304937, 2146060634, 2145793349, 2145503083, 2145189842,
+    2144853627, 2144494442, 2144112292, 2143707180, 2143279110,
+    2142828088, 2142354118, 2141857204, 2141337354, 2140794571,
+    2140228862, 2139640233, 2139028690, 2138394240, 2137736889,
+    2137056645, 2136353515, 2135627506, 2134878626, 2134106884,
+    2133312286, 2132494843, 2131654563, 2130791454, 2129905526,
+    2128996788, 2128065251, 2127110924, 2126133817, 2125133941,
+    2124111307, 2123065925, 2121997806, 2120906963, 2119793407,
+    2118657149, 2117498202, 2116316578, 2115112291, 2113885352,
+    2112635775, 2111363574, 2110068761, 2108751352, 2107411359,
+    2106048798, 2104663683, 2103256028, 2101825849, 2100373162,
+    2098897981, 2097400322, 2095880202, 2094337637, 2092772643,
+    2091185237, 2089575437, 2087943258, 2086288720, 2084611839,
+    2082912633, 2081191122, 2079447322, 2077681253, 2075892934,
+    2074082383, 2072249621, 2070394667, 2068517540, 2066618262,
+    2064696851, 2062753329, 2060787717, 2058800036, 2056790306,
+    2054758550, 2052704789, 2050629045, 2048531340, 2046411698,
+    2044270140, 2042106689, 2039921369, 2037714204, 2035485216,
+    2033234429, 2030961869, 2028667558, 2026351522, 2024013785,
+    2021654373, 2019273310, 2016870623, 2014446336, 2012000477,
+    2009533071, 2007044144, 2004533723, 2002001835, 1999448508,
+    1996873768, 1994277643, 1991660161, 1989021350, 1986361238,
+    1983679853, 1980977226, 1978253383, 1975508355, 1972742171,
+    1969954860, 1967146453, 1964316979, 1961466469, 1958594953,
+    1955702462, 1952789027, 1949854680, 1946899451, 1943923372,
+    1940926475, 1937908793, 1934870357, 1931811201, 1928731356,
+    1925630856, 1922509734, 1919368023, 1916205758, 1913022972,
+    1909819698, 1906595972, 1903351828, 1900087301, 1896802425,
+    1893497236, 1890171769, 1886826060, 1883460144, 1880074058,
+    1876667838, 1873241521, 1869795142, 1866328740, 1862842350,
+    1859336011, 1855809760, 1852263635, 1848697674, 1845111914,
+    1841506395, 1837881155, 1834236233, 1830571667, 1826887497,
+    1823183763, 1819460504, 1815717761, 1811955572, 1808173978,
+    1804373021, 1800552740, 1796713177, 1792854372, 1788976368,
+    1785079205, 1781162925, 1777227570, 1773273182, 1769299805,
+    1765307479, 1761296249, 1757266156, 1753217244, 1749149557,
+    1745063138, 1740958031, 1736834279, 1732691928, 1728531020,
+    1724351602, 1720153717, 1715937410, 1711702727, 1707449714,
+    1703178415, 1698888876, 1694581143, 1690255263, 1685911282,
+    1681549245, 1677169201, 1672771196, 1668355276, 1663921490,
+    1659469885, 1655000508, 1650513407, 1646008631, 1641486227,
+    1636946244, 1632388731, 1627813736, 1623221309, 1618611498,
+    1613984353, 1609339924, 1604678260, 1599999411, 1595303428,
+    1590590360, 1585860258, 1581113173, 1576349155, 1571568256,
+    1566770527, 1561956018, 1557124783, 1552276872, 1547412337,
+    1542531231, 1537633606, 1532719513, 1527789007, 1522842139,
+    1517878963, 1512899531, 1507903898, 1502892116, 1497864239,
+    1492820322, 1487760417, 1482684580, 1477592864, 1472485325,
+    1467362016, 1462222994, 1457068312, 1451898025, 1446712191,
+    1441510863, 1436294098, 1431061951, 1425814478, 1420551737,
+    1415273782, 1409980671, 1404672460, 1399349206, 1394010966,
+    1388657798, 1383289758, 1377906904, 1372509294, 1367096986,
+    1361670037, 1356228505, 1350772450, 1345301929, 1339817000,
+    1334317724, 1328804158, 1323276361, 1317734393, 1312178313,
+    1306608181, 1301024057, 1295425999, 1289814068, 1284188325,
+    1278548828, 1272895640, 1267228820, 1261548429, 1255854528,
+    1250147177, 1244426439, 1238692373, 1232945043, 1227184508,
+    1221410831, 1215624074, 1209824299, 1204011567, 1198185941,
+    1192347484, 1186496258, 1180632325, 1174755748, 1168866591,
+    1162964917, 1157050787, 1151124267, 1145185419, 1139234307,
+    1133270995, 1127295547, 1121308026, 1115308496, 1109297023,
+    1103273670, 1097238502, 1091191583, 1085132978, 1079062753,
+    1072980972, 1066887699, 1060783002, 1054666944, 1048539592,
+    1042401010, 1036251266, 1030090423, 1023918550, 1017735711,
+    1011541973, 1005337402, 999122065, 992896028, 986659358,
+    980412122, 974154386, 967886217, 961607684, 955318852,
+    949019790, 942710564, 936391243, 930061894, 923722585,
+    917373383, 911014357, 904645574, 898267104, 891879014,
+    885481373, 879074249, 872657710, 866231826, 859796666,
+    853352298, 846898791, 840436214, 833964638, 827484130,
+    820994760, 814496598, 807989714, 801474176, 794950056,
+    788417422, 781876345, 775326894, 768769141, 762203154,
+    755629005, 749046764, 742456501, 735858287, 729252193,
+    722638289, 716016646, 709387335, 702750427, 696105993,
+    689454104, 682794832, 676128248, 669454423, 662773428,
+    656085336, 649390218, 642688145, 635979190, 629263424,
+    622540918, 615811746, 609075979, 602333690, 595584950,
+    588829831, 582068407, 575300749, 568526931, 561747023,
+    554961100, 548169234, 541371497, 534567963, 527758704,
+    520943793, 514123303, 507297307, 500465878, 493629090,
+    486787016, 479939728, 473087301, 466229807, 459367320,
+    452499914, 445627662, 438750638, 431868915, 424982567,
+    418091668, 411196291, 404296511, 397392401, 390484035,
+    383571488, 376654833, 369734144, 362809495, 355880961,
+    348948616, 342012534, 335072790, 328129457, 321182610,
+    314232323, 307278671, 300321729, 293361570, 286398270,
+    279431902, 272462542, 265490265, 258515144, 251537254,
+    244556671, 237573469, 230587722, 223599506, 216608896,
+    209615966, 202620791, 195623446, 188624006, 181622546,
+    174619141, 167613866, 160606796, 153598006, 146587571,
+    139575567, 132562067, 125547148, 118530885, 111513352,
+    104494625, 97474778, 90453888, 83432030, 76409277,
+    69385707, 62361393, 55336412, 48310838, 41284746,
+    34258213, 27231312, 20204120, 13176712, 6149162,
+    -878453, -7906059, -14933580, -21960942, -28988068,
+    -36014884, -43041314, -50067283, -57092716, -64117537,
+    -71141672, -78165045, -85187581, -92209205, -99229841,
+    -106249414, -113267850, -120285073, -127301007, -134315578,
+    -141328711, -148340330, -155350361, -162358728, -169365356,
+    -176370170, -183373096, -190374058, -197372981, -204369791,
+    -211364411, -218356769, -225346788, -232334393, -239319511,
+    -246302065, -253281982, -260259186, -267233603, -274205159,
+    -281173778, -288139385, -295101907, -302061269, -309017396,
+    -315970213, -322919647, -329865622, -336808065, -343746901,
+    -350682056, -357613455, -364541025, -371464690, -378384377,
+    -385300013, -392211522, -399118830, -406021865, -412920551,
+    -419814815, -426704583, -433589782, -440470337, -447346176,
+    -454217223, -461083406, -467944652, -474800886, -481652035,
+    -488498026, -495338786, -502174241, -509004318, -515828944,
+    -522648046, -529461551, -536269386, -543071478, -549867754,
+    -556658141, -563442567, -570220959, -576993244, -583759350,
+    -590519205, -597272736, -604019870, -610760536, -617494660,
+    -624222173, -630943000, -637657070, -644364312, -651064652,
+    -657758021, -664444345, -671123554, -677795576, -684460338,
+    -691117771, -697767803, -704410362, -711045377, -717672778,
+    -724292493, -730904451, -737508582, -744104815, -750693079,
+    -757273304, -763845419, -770409354, -776965038, -783512402,
+    -790051375, -796581887, -803103868, -809617249, -816121959,
+    -822617929, -829105090, -835583372, -842052705, -848513021,
+    -854964249, -861406322, -867839170, -874262724, -880676915,
+    -887081675, -893476935, -899862626, -906238681, -912605031,
+    -918961607, -925308342, -931645168, -937972016, -944288820,
+    -950595511, -956892022, -963178285, -969454234, -975719800,
+    -981974918, -988219519, -994453537, -1000676905, -1006889557,
+    -1013091426, -1019282445, -1025462549, -1031631671, -1037789745,
+    -1043936705, -1050072485, -1056197020, -1062310244, -1068412091,
+    -1074502497, -1080581395, -1086648722, -1092704411, -1098748398,
+    -1104780618, -1110801008, -1116809501, -1122806034, -1128790543,
+    -1134762964, -1140723232, -1146671283, -1152607055, -1158530484,
+    -1164441505, -1170340057, -1176226074, -1182099496, -1187960258,
+    -1193808298, -1199643553, -1205465961, -1211275460, -1217071986,
+    -1222855479, -1228625876, -1234383115, -1240127136, -1245857875,
+    -1251575272, -1257279266, -1262969796, -1268646800, -1274310217,
+    -1279959989, -1285596052, -1291218348, -1296826816, -1302421396,
+    -1308002029, -1313568653, -1319121210, -1324659641, -1330183885,
+    -1335693885, -1341189580, -1346670912, -1352137822, -1357590252,
+    -1363028143, -1368451438, -1373860077, -1379254004, -1384633159,
+    -1389997487, -1395346928, -1400681427, -1406000925, -1411305366,
+    -1416594694, -1421868850, -1427127780, -1432371426, -1437599733,
+    -1442812644, -1448010104, -1453192057, -1458358447, -1463509220,
+    -1468644319, -1473763690, -1478867279, -1483955030, -1489026889,
+    -1494082802, -1499122714, -1504146572, -1509154322, -1514145910,
+    -1519121283, -1524080387, -1529023170, -1533949577, -1538859558,
+    -1543753058, -1548630027, -1553490410, -1558334157, -1563161216,
+    -1567971534, -1572765060, -1577541744, -1582301533, -1587044377,
+    -1591770225, -1596479027, -1601170732, -1605845289, -1610502649,
+    -1615142762, -1619765578, -1624371047, -1628959121, -1633529750,
+    -1638082885, -1642618478, -1647136479, -1651636841, -1656119516,
+    -1660584454, -1665031609, -1669460933, -1673872378, -1678265898,
+    -1682641444, -1686998971, -1691338432, -1695659779, -1699962968,
+    -1704247951, -1708514683, -1712763118, -1716993211, -1721204917,
+    -1725398189, -1729572984, -1733729257, -1737866963, -1741986057,
+    -1746086497, -1750168237, -1754231234, -1758275445, -1762300826,
+    -1766307335, -1770294927, -1774263561, -1778213194, -1782143784,
+    -1786055289, -1789947667, -1793820875, -1797674873, -1801509620,
+    -1805325074, -1809121194, -1812897940, -1816655271, -1820393147,
+    -1824111529, -1827810376, -1831489648, -1835149306, -1838789312,
+    -1842409625, -1846010208, -1849591022, -1853152028, -1856693188,
+    -1860214464, -1863715819, -1867197215, -1870658615, -1874099982,
+    -1877521279, -1880922469, -1884303515, -1887664383, -1891005035,
+    -1894325435, -1897625550, -1900905342, -1904164776, -1907403819,
+    -1910622435, -1913820590, -1916998250, -1920155379, -1923291946,
+    -1926407915, -1929503255, -1932577931, -1935631910, -1938665161,
+    -1941677650, -1944669345, -1947640214, -1950590226, -1953519348,
+    -1956427550, -1959314800, -1962181067, -1965026321, -1967850531,
+    -1970653667, -1973435699, -1976196596, -1978936331, -1981654873,
+    -1984352192, -1987028261, -1989683050, -1992316532, -1994928677,
+    -1997519459, -2000088848, -2002636818, -2005163342, -2007668391,
+    -2010151941, -2012613963, -2015054432, -2017473321, -2019870604,
+    -2022246257, -2024600252, -2026932566, -2029243173, -2031532049,
+    -2033799168, -2036044507, -2038268042, -2040469748, -2042649603,
+    -2044807583, -2046943664, -2049057824, -2051150040, -2053220291,
+    -2055268553, -2057294804, -2059299024, -2061281190, -2063241282,
+    -2065179277, -2067095157, -2068988899, -2070860485, -2072709893,
+    -2074537104, -2076342098, -2078124857, -2079885360, -2081623590,
+    -2083339527, -2085033153, -2086704450, -2088353400, -2089979985,
+    -2091584189, -2093165993, -2094725382, -2096262337, -2097776843,
+    -2099268884, -2100738443, -2102185505, -2103610054, -2105012075,
+    -2106391553, -2107748474, -2109082822, -2110394584, -2111683744,
+    -2112950291, -2114194210, -2115415487, -2116614110, -2117790065,
+    -2118943341, -2120073924, -2121181804, -2122266967, -2123329402,
+    -2124369098, -2125386044, -2126380229, -2127351642, -2128300272,
+    -2129226111, -2130129147, -2131009371, -2131866773, -2132701345,
+    -2133513078, -2134301962, -2135067990, -2135811153, -2136531442,
+    -2137228852, -2137903373, -2138555000, -2139183723, -2139789539,
+    -2140372438, -2140932416, -2141469466, -2141983583, -2142474761,
+    -2142942995, -2143388280, -2143810610, -2144209982, -2144586392,
+    -2144939834, -2145270306, -2145577804, -2145862324, -2146123864,
+    -2146362421, -2146577992, -2146770575, -2146940167, -2147086768,
+    -2147210375, -2147310987, -2147388603, -2147443222, -2147474844,
+    2147482929, 2147425435, 2147275952, 2147034487, 2146701050,
+    2146275656, 2145758322, 2145149071, 2144447929, 2143654926,
+    2142770096, 2141793477, 2140725111, 2139565043, 2138313323,
+    2136970005, 2135535146, 2134008809, 2132391057, 2130681961,
+    2128881593, 2126990031, 2125007356, 2122933653, 2120769010,
+    2118513521, 2116167282, 2113730393, 2111202959, 2108585087,
+    2105876892, 2103078487, 2100189994, 2097211535, 2094143239,
+    2090985237, 2087737664, 2084400659, 2080974365, 2077458929,
+    2073854502, 2070161238, 2066379295, 2062508835, 2058550025,
+    2054503033, 2050368032, 2046145201, 2041834720, 2037436773,
+    2032951550, 2028379241, 2023720043, 2018974156, 2014141783,
+    2009223131, 2004218410, 1999127836, 1993951625, 1988690000,
+    1983343186, 1977911412, 1972394912, 1966793920, 1961108677,
+    1955339428, 1949486417, 1943549898, 1937530123, 1931427351,
+    1925241843, 1918973864, 1912623682, 1906191570, 1899677803,
+    1893082661, 1886406424, 1879649381, 1872811820, 1865894033,
+    1858896318, 1851818974, 1844662304, 1837426615, 1830112217,
+    1822719423, 1815248550, 1807699917, 1800073849, 1792370671,
+    1784590714, 1776734311, 1768801799, 1760793518, 1752709809,
+    1744551021, 1736317502, 1728009604, 1719627685, 1711172102,
+    1702643219, 1694041400, 1685367013, 1676620432, 1667802029,
+    1658912184, 1649951276, 1640919689, 1631817811, 1622646032,
+    1613404744, 1604094343, 1594715227, 1585267800, 1575752465,
+    1566169630, 1556519705, 1546803104, 1537020244, 1527171542,
+    1517257422, 1507278307, 1497234626, 1487126808, 1476955286,
+    1466720497, 1456422878, 1446062871, 1435640919, 1425157469,
+    1414612971, 1404007875, 1393342636, 1382617710, 1371833558,
+    1360990642, 1350089425, 1339130374, 1328113960, 1317040654,
+    1305910930, 1294725265, 1283484138, 1272188032, 1260837429,
+    1249432816, 1237974681, 1226463516, 1214899813, 1203284068,
+    1191616778, 1179898443, 1168129565, 1156310649, 1144442200,
+    1132524727, 1120558740, 1108544752, 1096483278, 1084374834,
+    1072219940, 1060019115, 1047772882, 1035481766, 1023146293,
+    1010766993, 998344394, 985879030, 973371434, 960822142,
+    948231691, 935600622, 922929474, 910218791, 897469118,
+    884680999, 871854984, 858991622, 846091463, 833155061,
+    820182969, 807175743, 794133941, 781058120, 767948841,
+    754806666, 741632158, 728425880, 715188400, 701920283,
+    688622098, 675294414, 661937804, 648552838, 635140090,
+    621700135, 608233549, 594740907, 581222789, 567679774,
+    554112440, 540521371, 526907147, 513270353, 499611571,
+    485931388, 472230390, 458509162, 444768294, 431008373,
+    417229989, 403433732, 389620194, 375789965, 361943639,
+    348081809, 334205068, 320314011, 306409232, 292491328,
+    278560894, 264618528, 250664827, 236700388, 222725809,
+    208741690, 194748629, 180747225, 166738079, 152721790,
+    138698959, 124670187, 110636075, 96597223, 82554233,
+    68507707, 54458246, 40406452, 26352928, 12298274,
+    -1756906, -15812011, -29866438, -43919586, -57970853,
+    -72019637, -86065335, -100107347, -114145071, -128177904,
+    -142205248, -156226499, -170241059, -184248325, -198247699,
+    -212238581, -226220372, -240192472, -254154282, -268105206,
+    -282044645, -295972002, -309886680, -323788084, -337675619,
+    -351548688, -365406698, -379249055, -393075166, -406884440,
+    -420676284, -434450107, -448205320, -461941333, -475657559,
+    -489353409, -503028296, -516681636, -530312842, -543921332,
+    -557506522, -571067830, -584604676, -598116479, -611602660,
+    -625062643, -638495850, -651901706, -665279637, -678629069,
+    -691949432, -705240153, -718500664, -731730397, -744928785,
+    -758095263, -771229267, -784330234, -797397602, -810430813,
+    -823429308, -836392529, -849319923, -862210934, -875065011,
+    -887881603, -900660162, -913400139, -926100989, -938762167,
+    -951383133, -963963344, -976502263, -988999351, -1001454074,
+    -1013865898, -1026234291, -1038558724, -1050838668, -1063073598,
+    -1075262990, -1087406320, -1099503070, -1111552721, -1123554757,
+    -1135508663, -1147413928, -1159270041, -1171076495, -1182832785,
+    -1194538405, -1206192856, -1217795637, -1229346252, -1240844206,
+    -1252289006, -1263680162, -1275017186, -1286299593, -1297526899,
+    -1308698624, -1319814288, -1330873416, -1341875533, -1352820169,
+    -1363706855, -1374535124, -1385304512, -1396014559, -1406664805,
+    -1417254794, -1427784073, -1438252190, -1448658697, -1459003149,
+    -1469285102, -1479504115, -1489659751, -1499751576, -1509779156,
+    -1519742062, -1529639867, -1539472148, -1549238483, -1558938453,
+    -1568571644, -1578137643, -1587636039, -1597066426, -1606428400,
+    -1615721561, -1624945509, -1634099849, -1643184191, -1652198144,
+    -1661141322, -1670013342, -1678813825, -1687542393, -1696198672,
+    -1704782292, -1713292884, -1721730085, -1730093532, -1738382868,
+    -1746597738, -1754737789, -1762802673, -1770792044, -1778705561,
+    -1786542883, -1794303676, -1801987607, -1809594347, -1817123570,
+    -1824574954, -1831948179, -1839242929, -1846458892, -1853595759,
+    -1860653224, -1867630985, -1874528743, -1881346202, -1888083070,
+    -1894739060, -1901313885, -1907807264, -1914218919, -1920548575,
+    -1926795962, -1932960811, -1939042858, -1945041843, -1950957509,
+    -1956789602, -1962537873, -1968202076, -1973781967, -1979277308,
+    -1984687864, -1990013401, -1995253694, -2000408516, -2005477648,
+    -2010460871, -2015357973, -2020168744, -2024892978, -2029530472,
+    -2034081027, -2038544449, -2042920547, -2047209133, -2051410023,
+    -2055523038, -2059548001, -2063484740, -2067333086, -2071092874,
+    -2074763944, -2078346137, -2081839301, -2085243286, -2088557947,
+    -2091783140, -2094918728, -2097964577, -2100920556, -2103786539,
+    -2106562402, -2109248028, -2111843300, -2114348108, -2116762344,
+    -2119085905, -2121318692, -2123460608, -2125511562, -2127471467,
+    -2129340237, -2131117794, -2132804061, -2134398966, -2135902440,
+    -2137314419, -2138634843, -2139863654, -2141000801, -2142046235,
+    -2142999911, -2143861787, -2144631828, -2145310000, -2145896274,
+    -2146390624, -2146793031, -2147103476, -2147321946, -2147448433,
+    2147480773, 2147250799, 2146652904, 2145687192, 2144353827,
+    2142653038, 2140585116, 2138150417, 2135349356, 2132182414,
+    2128650133, 2124753120, 2120492040, 2115867626, 2110880668,
+    2105532022, 2099822604, 2093753392, 2087325426, 2080539807,
+    2073397699, 2065900325, 2058048970, 2049844978, 2041289756,
+    2032384769, 2023131544, 2013531666, 2003586779, 1993298588,
+    1982668856, 1971699403, 1960392110, 1948748914, 1936771810,
+    1924462850, 1911824143, 1898857855, 1885566207, 1871951478,
+    1858015999, 1843762158, 1829192399, 1814309216, 1799115162,
+    1783612838, 1767804901, 1751694060, 1735283075, 1718574758,
+    1701571972, 1684277631, 1666694698, 1648826185, 1630675154,
+    1612244715, 1593538026, 1574558293, 1555308768, 1535792748,
+    1516013578, 1495974647, 1475679389, 1455131280, 1434333842,
+    1413290638, 1392005275, 1370481398, 1348722696, 1326732898,
+    1304515771, 1282075122, 1259414796, 1236538675, 1213450681,
+    1190154767, 1166654927, 1142955186, 1119059606, 1094972281,
+    1070697338, 1046238936, 1021601267, 996788551, 971805042,
+    946655018, 921342790, 895872694, 870249095, 844476384,
+    818558976, 792501312, 766307857, 739983099, 713531549,
+    686957739, 660266222, 633461572, 606548381, 579531262,
+    552414843, 525203770, 497902707, 470516330, 443049333,
+    415506422, 387892316, 360211746, 332469456, 304670200,
+    276818739, 248919847, 220978304, 192998897, 164986421,
+    136945676, 108881465, 80798598, 52701887, 24596146,
+    -3513810, -31623164, -59727099, -87820801, -115899455,
+    -143958250, -171992378, -199997036, -227967426, -255898755,
+    -283786237, -311625094, -339410555, -367137861, -394802258,
+    -422399009, -449923384, -477370666, -504736154, -532015158,
+    -559203003, -586295032, -613286603, -640173090, -666949886,
+    -693612404, -720156076, -746576352, -772868706, -799028633,
+    -825051651, -850933300, -876669146, -902254780, -927685817,
+    -952957899, -978066697, -1003007909, -1027777260, -1052370507,
+    -1076783436, -1101011863, -1125051638, -1148898640, -1172548785,
+    -1195998020, -1219242327, -1242277723, -1265100260, -1287706030,
+    -1310091157, -1332251808, -1354184184, -1375884527, -1397349119,
+    -1418574283, -1439556382, -1460291820, -1480777044, -1501008545,
+    -1520982856, -1540696555, -1560146263, -1579328647, -1598240423,
+    -1616878347, -1635239228, -1653319919, -1671117323, -1688628389,
+    -1705850117, -1722779556, -1739413807, -1755750017, -1771785389,
+    -1787517174, -1802942678, -1818059257, -1832864320, -1847355332,
+    -1861529809, -1875385322, -1888919498, -1902130017, -1915014616,
+    -1927571087, -1939797279, -1951691096, -1963250501, -1974473513,
+    -1985358210, -1995902725, -2006105253, -2015964045, -2025477412,
+    -2034643724, -2043461410, -2051928960, -2060044922, -2067807906,
+    -2075216581, -2082269679, -2088965991, -2095304370, -2101283728,
+    -2106903043, -2112161350, -2117057750, -2121591402, -2125761531,
+    -2129567422, -2133008422, -2136083942, -2138793455, -2141136497,
+    -2143112666, -2144721624, -2145963095, -2146836866, -2147342788,
+    2147472149, 2146552303, 2144161316, 2140300829, 2134973487,
+    2128182940, 2119933843, 2110231849, 2099083608, 2086496759,
+    2072479930, 2057042727, 2040195730, 2021950484, 2002319494,
+    1981316215, 1958955040, 1935251296, 1910221227, 1883881987,
+    1856251629, 1827349089, 1797194176, 1765807555, 1733210737,
+    1699426064, 1664476689, 1628386565, 1591180426, 1552883771,
+    1513522847, 1473124631, 1431716808, 1389327759, 1345986533,
+    1301722835, 1256567002, 1210549980, 1163703308, 1116059092,
+    1067649985, 1018509163, 968670307, 918167572, 867035571,
+    815309347, 763024350, 710216415, 656921734, 603176830,
+    549018540, 494483979, 439610524, 384435782, 328997567,
+    273333873, 217482850, 161482775, 105372028, 49189064,
+    -7027611, -63239471, -119407989, -175494670, -231461077,
+    -287268852, -342879747, -398255649, -453358607, -508150855,
+    -562594842, -616653255, -670289044, -723465451, -776146031,
+    -828294679, -879875655, -930853609, -981193602, -1030861133,
+    -1079822164, -1128043139, -1175491010, -1222133257, -1267937916,
+    -1312873593, -1356909492, -1400015434, -1442161874, -1483319929,
+    -1523461391, -1562558748, -1600585205, -1637514702, -1673321927,
+    -1707982341, -1741472190, -1773768520, -1804849198, -1834692923,
+    -1863279241, -1890588560, -1916602164, -1941302225, -1964671814,
+    -1986694916, -2007356435, -2026642214, -2044539032, -2061034626,
+    -2076117690, -2089777886, -2102005853, -2112793210, -2122132564,
+    -2130017514, -2136442657, -2141403589, -2144896910, -2146920225,
 };
 #endif
 
 static const CELTMode mode48000_960_120 = {
-48000,    /* Fs */
-120,    /* overlap */
-21,    /* nbEBands */
-21,    /* effEBands */
-{27853, 0, 4096, 8192, },    /* preemph */
-eband5ms,    /* eBands */
-3,    /* maxLM */
-8,    /* nbShortMdcts */
-120,    /* shortMdctSize */
-11,    /* nbAllocVectors */
-band_allocation,    /* allocVectors */
-logN400,    /* logN */
-window120,    /* window */
-{1920, 3, {&fft_state48000_960_0, &fft_state48000_960_1, &fft_state48000_960_2, &fft_state48000_960_3, }, mdct_twiddles960},    /* mdct */
-{392, cache_index50, cache_bits50, cache_caps50},    /* cache */
+    48000, /* Fs */
+    120, /* overlap */
+    21, /* nbEBands */
+    21, /* effEBands */
+    {27853, 0, 4096, 8192, }, /* preemph */
+    eband5ms, /* eBands */
+    3, /* maxLM */
+    8, /* nbShortMdcts */
+    120, /* shortMdctSize */
+    11, /* nbAllocVectors */
+    band_allocation, /* allocVectors */
+    logN400, /* logN */
+    window120, /* window */
+    {1920, 3, {&fft_state48000_960_0, &fft_state48000_960_1, &fft_state48000_960_2, &fft_state48000_960_3, },
+     mdct_twiddles960},                                                                                                         /* mdct */
+    {392, cache_index50, cache_bits50, cache_caps50}, /* cache */
 };
 
 #ifdef ENABLE_QEXT
-#ifndef DEF_WINDOW240
-#define DEF_WINDOW240
+# ifndef DEF_WINDOW240
+#  define DEF_WINDOW240
 static const celt_coef window240[240] = {
-36124, 325113, 903042, 1769811, 2925272,
-4369225, 6101422, 8121563, 10429297, 13024223,
-15905885, 19073777, 22527339, 26265958, 30288963,
-34595631, 39185180, 44056771, 49209509, 54642435,
-60354533, 66344724, 72611866, 79154752, 85972112,
-93062609, 100424835, 108057317, 115958510, 124126796,
-132560487, 141257817, 150216948, 159435962, 168912864,
-178645581, 188631957, 198869754, 209356654, 220090250,
-231068053, 242287487, 253745886, 265440499, 277368483,
-289526906, 301912744, 314522883, 327354113, 340403136,
-353666556, 367140886, 380822544, 394707853, 408793044,
-423074251, 437547515, 452208783, 467053909, 482078654,
-497278684, 512649576, 528186815, 543885797, 559741828,
-575750127, 591905825, 608203972, 624639532, 641207388,
-657902345, 674719130, 691652394, 708696716, 725846605,
-743096501, 760440782, 777873759, 795389689, 812982769,
-830647145, 848376914, 866166126, 884008788, 901898872,
-919830310, 937797006, 955792839, 973811661, 991847308,
-1009893601, 1027944353, 1045993369, 1064034454, 1082061416,
-1100068075, 1118048258, 1135995815, 1153904614, 1171768555,
-1189581567, 1207337616, 1225030710, 1242654904, 1260204305,
-1277673075, 1295055437, 1312345681, 1329538165, 1346627326,
-1363607677, 1380473817, 1397220435, 1413842311, 1430334323,
-1446691453, 1462908786, 1478981520, 1494904965, 1510674550,
-1526285825, 1541734465, 1557016274, 1572127189, 1587063280,
-1601820758, 1616395971, 1630785416, 1644985731, 1658993707,
-1672806283, 1686420553, 1699833765, 1713043324, 1726046792,
-1738841892, 1751426506, 1763798678, 1775956615, 1787898686,
-1799623424, 1811129525, 1822415848, 1833481417, 1844325418,
-1854947198, 1865346267, 1875522297, 1885475119, 1895204720,
-1904711247, 1913995001, 1923056438, 1931896164, 1940514936,
-1948913657, 1957093375, 1965055281, 1972800706, 1980331118,
-1987648116, 1994753433, 2001648928, 2008336584, 2014818504,
-2021096911, 2027174137, 2033052626, 2038734929, 2044223696,
-2049521676, 2054631712, 2059556735, 2064299763, 2068863893,
-2073252301, 2077468232, 2081515002, 2085395988, 2089114627,
-2092674410, 2096078878, 2099331616, 2102436251, 2105396446,
-2108215896, 2110898322, 2113447469, 2115867100, 2118160991,
-2120332927, 2122386699, 2124326098, 2126154912, 2127876920,
-2129495889, 2131015570, 2132439692, 2133771963, 2135016059,
-2136175624, 2137254268, 2138255559, 2139183022, 2140040133,
-2140830320, 2141556955, 2142223351, 2142832762, 2143388377,
-2143893317, 2144350634, 2144763305, 2145134231, 2145466235,
-2145762059, 2146024357, 2146255701, 2146458570, 2146635355,
-2146788350, 2146919756, 2147031676, 2147126111, 2147204964,
-2147270033, 2147323012, 2147365487, 2147398940, 2147424741,
-2147444152, 2147458322, 2147468290, 2147474980, 2147479203,
-2147481655, 2147482918, 2147483458, 2147483623, 2147483647,
+    36124, 325113, 903042, 1769811, 2925272,
+    4369225, 6101422, 8121563, 10429297, 13024223,
+    15905885, 19073777, 22527339, 26265958, 30288963,
+    34595631, 39185180, 44056771, 49209509, 54642435,
+    60354533, 66344724, 72611866, 79154752, 85972112,
+    93062609, 100424835, 108057317, 115958510, 124126796,
+    132560487, 141257817, 150216948, 159435962, 168912864,
+    178645581, 188631957, 198869754, 209356654, 220090250,
+    231068053, 242287487, 253745886, 265440499, 277368483,
+    289526906, 301912744, 314522883, 327354113, 340403136,
+    353666556, 367140886, 380822544, 394707853, 408793044,
+    423074251, 437547515, 452208783, 467053909, 482078654,
+    497278684, 512649576, 528186815, 543885797, 559741828,
+    575750127, 591905825, 608203972, 624639532, 641207388,
+    657902345, 674719130, 691652394, 708696716, 725846605,
+    743096501, 760440782, 777873759, 795389689, 812982769,
+    830647145, 848376914, 866166126, 884008788, 901898872,
+    919830310, 937797006, 955792839, 973811661, 991847308,
+    1009893601, 1027944353, 1045993369, 1064034454, 1082061416,
+    1100068075, 1118048258, 1135995815, 1153904614, 1171768555,
+    1189581567, 1207337616, 1225030710, 1242654904, 1260204305,
+    1277673075, 1295055437, 1312345681, 1329538165, 1346627326,
+    1363607677, 1380473817, 1397220435, 1413842311, 1430334323,
+    1446691453, 1462908786, 1478981520, 1494904965, 1510674550,
+    1526285825, 1541734465, 1557016274, 1572127189, 1587063280,
+    1601820758, 1616395971, 1630785416, 1644985731, 1658993707,
+    1672806283, 1686420553, 1699833765, 1713043324, 1726046792,
+    1738841892, 1751426506, 1763798678, 1775956615, 1787898686,
+    1799623424, 1811129525, 1822415848, 1833481417, 1844325418,
+    1854947198, 1865346267, 1875522297, 1885475119, 1895204720,
+    1904711247, 1913995001, 1923056438, 1931896164, 1940514936,
+    1948913657, 1957093375, 1965055281, 1972800706, 1980331118,
+    1987648116, 1994753433, 2001648928, 2008336584, 2014818504,
+    2021096911, 2027174137, 2033052626, 2038734929, 2044223696,
+    2049521676, 2054631712, 2059556735, 2064299763, 2068863893,
+    2073252301, 2077468232, 2081515002, 2085395988, 2089114627,
+    2092674410, 2096078878, 2099331616, 2102436251, 2105396446,
+    2108215896, 2110898322, 2113447469, 2115867100, 2118160991,
+    2120332927, 2122386699, 2124326098, 2126154912, 2127876920,
+    2129495889, 2131015570, 2132439692, 2133771963, 2135016059,
+    2136175624, 2137254268, 2138255559, 2139183022, 2140040133,
+    2140830320, 2141556955, 2142223351, 2142832762, 2143388377,
+    2143893317, 2144350634, 2144763305, 2145134231, 2145466235,
+    2145762059, 2146024357, 2146255701, 2146458570, 2146635355,
+    2146788350, 2146919756, 2147031676, 2147126111, 2147204964,
+    2147270033, 2147323012, 2147365487, 2147398940, 2147424741,
+    2147444152, 2147458322, 2147468290, 2147474980, 2147479203,
+    2147481655, 2147482918, 2147483458, 2147483623, 2147483647,
 };
-#endif
+# endif
 
-#ifndef DEF_LOGN400
-#define DEF_LOGN400
+# ifndef DEF_LOGN400
+#  define DEF_LOGN400
 static const oac_int16 logN400[21] = {
-0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 16, 16, 16, 21, 21, 24, 29, 34, 36, };
-#endif
+    0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 16, 16, 16, 21, 21, 24, 29, 34, 36, };
+# endif
 
-#ifndef DEF_PULSE_CACHE50
-#define DEF_PULSE_CACHE50
+# ifndef DEF_PULSE_CACHE50
+#  define DEF_PULSE_CACHE50
 static const oac_int16 cache_index50[105] = {
--1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 41, 41, 41,
-82, 82, 123, 164, 200, 222, 0, 0, 0, 0, 0, 0, 0, 0, 41,
-41, 41, 41, 123, 123, 123, 164, 164, 240, 266, 283, 295, 41, 41, 41,
-41, 41, 41, 41, 41, 123, 123, 123, 123, 240, 240, 240, 266, 266, 305,
-318, 328, 336, 123, 123, 123, 123, 123, 123, 123, 123, 240, 240, 240, 240,
-305, 305, 305, 318, 318, 343, 351, 358, 364, 240, 240, 240, 240, 240, 240,
-240, 240, 305, 305, 305, 305, 343, 343, 343, 351, 351, 370, 376, 382, 387,
+    -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 41, 41, 41,
+    82, 82, 123, 164, 200, 222, 0, 0, 0, 0, 0, 0, 0, 0, 41,
+    41, 41, 41, 123, 123, 123, 164, 164, 240, 266, 283, 295, 41, 41, 41,
+    41, 41, 41, 41, 41, 123, 123, 123, 123, 240, 240, 240, 266, 266, 305,
+    318, 328, 336, 123, 123, 123, 123, 123, 123, 123, 123, 240, 240, 240, 240,
+    305, 305, 305, 318, 318, 343, 351, 358, 364, 240, 240, 240, 240, 240, 240,
+    240, 240, 305, 305, 305, 305, 343, 343, 343, 351, 351, 370, 376, 382, 387,
 };
 static const unsigned char cache_bits50[392] = {
-40, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 40, 15, 23, 28,
-31, 34, 36, 38, 39, 41, 42, 43, 44, 45, 46, 47, 47, 49, 50,
-51, 52, 53, 54, 55, 55, 57, 58, 59, 60, 61, 62, 63, 63, 65,
-66, 67, 68, 69, 70, 71, 71, 40, 20, 33, 41, 48, 53, 57, 61,
-64, 66, 69, 71, 73, 75, 76, 78, 80, 82, 85, 87, 89, 91, 92,
-94, 96, 98, 101, 103, 105, 107, 108, 110, 112, 114, 117, 119, 121, 123,
-124, 126, 128, 40, 23, 39, 51, 60, 67, 73, 79, 83, 87, 91, 94,
-97, 100, 102, 105, 107, 111, 115, 118, 121, 124, 126, 129, 131, 135, 139,
-142, 145, 148, 150, 153, 155, 159, 163, 166, 169, 172, 174, 177, 179, 35,
-28, 49, 65, 78, 89, 99, 107, 114, 120, 126, 132, 136, 141, 145, 149,
-153, 159, 165, 171, 176, 180, 185, 189, 192, 199, 205, 211, 216, 220, 225,
-229, 232, 239, 245, 251, 21, 33, 58, 79, 97, 112, 125, 137, 148, 157,
-166, 174, 182, 189, 195, 201, 207, 217, 227, 235, 243, 251, 17, 35, 63,
-86, 106, 123, 139, 152, 165, 177, 187, 197, 206, 214, 222, 230, 237, 250,
-25, 31, 55, 75, 91, 105, 117, 128, 138, 146, 154, 161, 168, 174, 180,
-185, 190, 200, 208, 215, 222, 229, 235, 240, 245, 255, 16, 36, 65, 89,
-110, 128, 144, 159, 173, 185, 196, 207, 217, 226, 234, 242, 250, 11, 41,
-74, 103, 128, 151, 172, 191, 209, 225, 241, 255, 9, 43, 79, 110, 138,
-163, 186, 207, 227, 246, 12, 39, 71, 99, 123, 144, 164, 182, 198, 214,
-228, 241, 253, 9, 44, 81, 113, 142, 168, 192, 214, 235, 255, 7, 49,
-90, 127, 160, 191, 220, 247, 6, 51, 95, 134, 170, 203, 234, 7, 47,
-87, 123, 155, 184, 212, 237, 6, 52, 97, 137, 174, 208, 240, 5, 57,
-106, 151, 192, 231, 5, 59, 111, 158, 202, 243, 5, 55, 103, 147, 187,
-224, 5, 60, 113, 161, 206, 248, 4, 65, 122, 175, 224, 4, 67, 127,
-182, 234, };
+    40, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 40, 15, 23, 28,
+    31, 34, 36, 38, 39, 41, 42, 43, 44, 45, 46, 47, 47, 49, 50,
+    51, 52, 53, 54, 55, 55, 57, 58, 59, 60, 61, 62, 63, 63, 65,
+    66, 67, 68, 69, 70, 71, 71, 40, 20, 33, 41, 48, 53, 57, 61,
+    64, 66, 69, 71, 73, 75, 76, 78, 80, 82, 85, 87, 89, 91, 92,
+    94, 96, 98, 101, 103, 105, 107, 108, 110, 112, 114, 117, 119, 121, 123,
+    124, 126, 128, 40, 23, 39, 51, 60, 67, 73, 79, 83, 87, 91, 94,
+    97, 100, 102, 105, 107, 111, 115, 118, 121, 124, 126, 129, 131, 135, 139,
+    142, 145, 148, 150, 153, 155, 159, 163, 166, 169, 172, 174, 177, 179, 35,
+    28, 49, 65, 78, 89, 99, 107, 114, 120, 126, 132, 136, 141, 145, 149,
+    153, 159, 165, 171, 176, 180, 185, 189, 192, 199, 205, 211, 216, 220, 225,
+    229, 232, 239, 245, 251, 21, 33, 58, 79, 97, 112, 125, 137, 148, 157,
+    166, 174, 182, 189, 195, 201, 207, 217, 227, 235, 243, 251, 17, 35, 63,
+    86, 106, 123, 139, 152, 165, 177, 187, 197, 206, 214, 222, 230, 237, 250,
+    25, 31, 55, 75, 91, 105, 117, 128, 138, 146, 154, 161, 168, 174, 180,
+    185, 190, 200, 208, 215, 222, 229, 235, 240, 245, 255, 16, 36, 65, 89,
+    110, 128, 144, 159, 173, 185, 196, 207, 217, 226, 234, 242, 250, 11, 41,
+    74, 103, 128, 151, 172, 191, 209, 225, 241, 255, 9, 43, 79, 110, 138,
+    163, 186, 207, 227, 246, 12, 39, 71, 99, 123, 144, 164, 182, 198, 214,
+    228, 241, 253, 9, 44, 81, 113, 142, 168, 192, 214, 235, 255, 7, 49,
+    90, 127, 160, 191, 220, 247, 6, 51, 95, 134, 170, 203, 234, 7, 47,
+    87, 123, 155, 184, 212, 237, 6, 52, 97, 137, 174, 208, 240, 5, 57,
+    106, 151, 192, 231, 5, 59, 111, 158, 202, 243, 5, 55, 103, 147, 187,
+    224, 5, 60, 113, 161, 206, 248, 4, 65, 122, 175, 224, 4, 67, 127,
+    182, 234, };
 static const unsigned char cache_caps50[168] = {
-224, 224, 224, 224, 224, 224, 224, 224, 160, 160, 160, 160, 185, 185, 185,
-178, 178, 168, 134, 61, 37, 224, 224, 224, 224, 224, 224, 224, 224, 240,
-240, 240, 240, 207, 207, 207, 198, 198, 183, 144, 66, 40, 160, 160, 160,
-160, 160, 160, 160, 160, 185, 185, 185, 185, 193, 193, 193, 183, 183, 172,
-138, 64, 38, 240, 240, 240, 240, 240, 240, 240, 240, 207, 207, 207, 207,
-204, 204, 204, 193, 193, 180, 143, 66, 40, 185, 185, 185, 185, 185, 185,
-185, 185, 193, 193, 193, 193, 193, 193, 193, 183, 183, 172, 138, 65, 39,
-207, 207, 207, 207, 207, 207, 207, 207, 204, 204, 204, 204, 201, 201, 201,
-188, 188, 176, 141, 66, 40, 193, 193, 193, 193, 193, 193, 193, 193, 193,
-193, 193, 193, 194, 194, 194, 184, 184, 173, 139, 65, 39, 204, 204, 204,
-204, 204, 204, 204, 204, 201, 201, 201, 201, 198, 198, 198, 187, 187, 175,
-140, 66, 40, };
-#endif
+    224, 224, 224, 224, 224, 224, 224, 224, 160, 160, 160, 160, 185, 185, 185,
+    178, 178, 168, 134, 61, 37, 224, 224, 224, 224, 224, 224, 224, 224, 240,
+    240, 240, 240, 207, 207, 207, 198, 198, 183, 144, 66, 40, 160, 160, 160,
+    160, 160, 160, 160, 160, 185, 185, 185, 185, 193, 193, 193, 183, 183, 172,
+    138, 64, 38, 240, 240, 240, 240, 240, 240, 240, 240, 207, 207, 207, 207,
+    204, 204, 204, 193, 193, 180, 143, 66, 40, 185, 185, 185, 185, 185, 185,
+    185, 185, 193, 193, 193, 193, 193, 193, 193, 183, 183, 172, 138, 65, 39,
+    207, 207, 207, 207, 207, 207, 207, 207, 204, 204, 204, 204, 201, 201, 201,
+    188, 188, 176, 141, 66, 40, 193, 193, 193, 193, 193, 193, 193, 193, 193,
+    193, 193, 193, 194, 194, 194, 184, 184, 173, 139, 65, 39, 204, 204, 204,
+    204, 204, 204, 204, 204, 201, 201, 201, 201, 198, 198, 198, 187, 187, 175,
+    140, 66, 40, };
+# endif
 
-#ifndef FFT_TWIDDLES96000_1920
-#define FFT_TWIDDLES96000_1920
+# ifndef FFT_TWIDDLES96000_1920
+#  define FFT_TWIDDLES96000_1920
 static const kiss_twiddle_cpx fft_twiddles96000_1920[960] = {
-{2147483647, 0}, {2147437652, -14055147},
-{2147299668, -28109692}, {2147069700, -42163034},
-{2146747759, -56214568}, {2146333858, -70263695},
-{2145828016, -84309812}, {2145230253, -98352318},
-{2144540596, -112390610}, {2143759074, -126424088},
-{2142885721, -140452151}, {2141920573, -154474196},
-{2140863673, -168489625}, {2139715065, -182497836},
-{2138474799, -196498230}, {2137142927, -210490206},
-{2135719508, -224473166}, {2134204601, -238446509},
-{2132598273, -252409639}, {2130900591, -266361956},
-{2129111628, -280302863}, {2127231461, -294231763},
-{2125260170, -308148059}, {2123197841, -322051155},
-{2121044561, -335940456}, {2118800422, -349815365},
-{2116465521, -363675290}, {2114039958, -377519637},
-{2111523836, -391347811}, {2108917263, -405159222},
-{2106220352, -418953276}, {2103433217, -432729385},
-{2100555978, -446486956}, {2097588758, -460225402},
-{2094531684, -473944133}, {2091384888, -487642562},
-{2088148504, -501320102}, {2084822670, -514976167},
-{2081407530, -528610172}, {2077903229, -542221533},
-{2074309917, -555809667}, {2070627749, -569373992},
-{2066856882, -582913927}, {2062997478, -596428893},
-{2059049702, -609918309}, {2055013723, -623381598},
-{2050889714, -636818183}, {2046677852, -650227490},
-{2042378317, -663608942}, {2037991293, -676961968},
-{2033516969, -690285996}, {2028955535, -703580453},
-{2024307188, -716844772}, {2019572126, -730078383},
-{2014750553, -743280720}, {2009842674, -756451218},
-{2004848700, -769589312}, {1999768845, -782694439},
-{1994603327, -795766038}, {1989352366, -808803549},
-{1984016189, -821806413}, {1978595022, -834774075},
-{1973089100, -847705977}, {1967498656, -860601566},
-{1961823932, -873460290}, {1956065170, -886281598},
-{1950222616, -899064940}, {1944296521, -911809770},
-{1938287139, -924515541}, {1932194727, -937181708},
-{1926019547, -949807730}, {1919761862, -962393065},
-{1913421941, -974937175}, {1907000055, -987439521},
-{1900496480, -999899569}, {1893911494, -1012316784},
-{1887245379, -1024690635}, {1880498421, -1037020592},
-{1873670908, -1049306126}, {1866763134, -1061546712},
-{1859775393, -1073741824}, {1852707986, -1085890941},
-{1845561216, -1097993542}, {1838335387, -1110049108},
-{1831030811, -1122057124}, {1823647799, -1134017074},
-{1816186668, -1145928447}, {1808647737, -1157790732},
-{1801031331, -1169603422}, {1793337774, -1181366009},
-{1785567396, -1193077991}, {1777720531, -1204738865},
-{1769797514, -1216348132}, {1761798685, -1227905295},
-{1753724386, -1239409858}, {1745574963, -1250861329},
-{1737350766, -1262259218}, {1729052147, -1273603035},
-{1720679461, -1284892296}, {1712233066, -1296126516},
-{1703713325, -1307305214}, {1695120603, -1318427912},
-{1686455268, -1329494133}, {1677717690, -1340503402},
-{1668908244, -1351455249}, {1660027308, -1362349204},
-{1651075262, -1373184801}, {1642052490, -1383961574},
-{1632959377, -1394679064}, {1623796314, -1405336810},
-{1614563692, -1415934356}, {1605261909, -1426471249},
-{1595891361, -1436947036}, {1586452450, -1447361268},
-{1576945581, -1457713501}, {1567371161, -1468003290},
-{1557729600, -1478230195}, {1548021312, -1488393778},
-{1538246711, -1498493602}, {1528406216, -1508529236},
-{1518500250, -1518500250}, {1508529236, -1528406216},
-{1498493602, -1538246711}, {1488393778, -1548021312},
-{1478230195, -1557729600}, {1468003290, -1567371161},
-{1457713501, -1576945581}, {1447361268, -1586452450},
-{1436947036, -1595891361}, {1426471249, -1605261909},
-{1415934356, -1614563692}, {1405336810, -1623796314},
-{1394679064, -1632959377}, {1383961574, -1642052490},
-{1373184801, -1651075262}, {1362349204, -1660027308},
-{1351455249, -1668908244}, {1340503402, -1677717690},
-{1329494133, -1686455268}, {1318427912, -1695120603},
-{1307305214, -1703713325}, {1296126516, -1712233066},
-{1284892296, -1720679461}, {1273603035, -1729052147},
-{1262259218, -1737350766}, {1250861329, -1745574963},
-{1239409858, -1753724386}, {1227905295, -1761798685},
-{1216348132, -1769797514}, {1204738865, -1777720531},
-{1193077991, -1785567396}, {1181366009, -1793337774},
-{1169603422, -1801031331}, {1157790732, -1808647737},
-{1145928447, -1816186668}, {1134017074, -1823647799},
-{1122057124, -1831030811}, {1110049108, -1838335387},
-{1097993542, -1845561216}, {1085890941, -1852707986},
-{1073741824, -1859775393}, {1061546712, -1866763134},
-{1049306126, -1873670908}, {1037020592, -1880498421},
-{1024690635, -1887245379}, {1012316784, -1893911494},
-{999899569, -1900496480}, {987439521, -1907000055},
-{974937175, -1913421941}, {962393065, -1919761862},
-{949807730, -1926019547}, {937181708, -1932194727},
-{924515541, -1938287139}, {911809770, -1944296521},
-{899064940, -1950222616}, {886281598, -1956065170},
-{873460290, -1961823932}, {860601566, -1967498656},
-{847705977, -1973089100}, {834774075, -1978595022},
-{821806413, -1984016189}, {808803549, -1989352366},
-{795766038, -1994603327}, {782694439, -1999768845},
-{769589312, -2004848700}, {756451218, -2009842674},
-{743280720, -2014750553}, {730078383, -2019572126},
-{716844772, -2024307188}, {703580453, -2028955535},
-{690285996, -2033516969}, {676961968, -2037991293},
-{663608942, -2042378317}, {650227490, -2046677852},
-{636818183, -2050889714}, {623381598, -2055013723},
-{609918309, -2059049702}, {596428893, -2062997478},
-{582913927, -2066856882}, {569373992, -2070627749},
-{555809667, -2074309917}, {542221533, -2077903229},
-{528610172, -2081407530}, {514976167, -2084822670},
-{501320102, -2088148504}, {487642562, -2091384888},
-{473944133, -2094531684}, {460225402, -2097588758},
-{446486956, -2100555978}, {432729385, -2103433217},
-{418953276, -2106220352}, {405159222, -2108917263},
-{391347811, -2111523836}, {377519637, -2114039958},
-{363675290, -2116465521}, {349815365, -2118800422},
-{335940456, -2121044561}, {322051155, -2123197841},
-{308148059, -2125260170}, {294231763, -2127231461},
-{280302863, -2129111628}, {266361956, -2130900591},
-{252409639, -2132598273}, {238446509, -2134204601},
-{224473166, -2135719508}, {210490206, -2137142927},
-{196498230, -2138474799}, {182497836, -2139715065},
-{168489625, -2140863673}, {154474196, -2141920573},
-{140452151, -2142885721}, {126424088, -2143759074},
-{112390610, -2144540596}, {98352318, -2145230253},
-{84309812, -2145828016}, {70263695, -2146333858},
-{56214568, -2146747759}, {42163034, -2147069700},
-{28109692, -2147299668}, {14055147, -2147437652},
-{0, -2147483648}, {-14055147, -2147437652},
-{-28109692, -2147299668}, {-42163034, -2147069700},
-{-56214568, -2146747759}, {-70263695, -2146333858},
-{-84309812, -2145828016}, {-98352318, -2145230253},
-{-112390610, -2144540596}, {-126424088, -2143759074},
-{-140452151, -2142885721}, {-154474196, -2141920573},
-{-168489625, -2140863673}, {-182497836, -2139715065},
-{-196498230, -2138474799}, {-210490206, -2137142927},
-{-224473166, -2135719508}, {-238446509, -2134204601},
-{-252409639, -2132598273}, {-266361956, -2130900591},
-{-280302863, -2129111628}, {-294231763, -2127231461},
-{-308148059, -2125260170}, {-322051155, -2123197841},
-{-335940456, -2121044561}, {-349815365, -2118800422},
-{-363675290, -2116465521}, {-377519637, -2114039958},
-{-391347811, -2111523836}, {-405159222, -2108917263},
-{-418953276, -2106220352}, {-432729385, -2103433217},
-{-446486956, -2100555978}, {-460225402, -2097588758},
-{-473944133, -2094531684}, {-487642562, -2091384888},
-{-501320102, -2088148504}, {-514976167, -2084822670},
-{-528610172, -2081407530}, {-542221533, -2077903229},
-{-555809667, -2074309917}, {-569373992, -2070627749},
-{-582913927, -2066856882}, {-596428893, -2062997478},
-{-609918309, -2059049702}, {-623381598, -2055013723},
-{-636818183, -2050889714}, {-650227490, -2046677852},
-{-663608942, -2042378317}, {-676961968, -2037991293},
-{-690285996, -2033516969}, {-703580453, -2028955535},
-{-716844772, -2024307188}, {-730078383, -2019572126},
-{-743280720, -2014750553}, {-756451218, -2009842674},
-{-769589312, -2004848700}, {-782694439, -1999768845},
-{-795766038, -1994603327}, {-808803549, -1989352366},
-{-821806413, -1984016189}, {-834774075, -1978595022},
-{-847705977, -1973089100}, {-860601566, -1967498656},
-{-873460290, -1961823932}, {-886281598, -1956065170},
-{-899064940, -1950222616}, {-911809770, -1944296521},
-{-924515541, -1938287139}, {-937181708, -1932194727},
-{-949807730, -1926019547}, {-962393065, -1919761862},
-{-974937175, -1913421941}, {-987439521, -1907000055},
-{-999899569, -1900496480}, {-1012316784, -1893911494},
-{-1024690635, -1887245379}, {-1037020592, -1880498421},
-{-1049306126, -1873670908}, {-1061546712, -1866763134},
-{-1073741824, -1859775393}, {-1085890941, -1852707986},
-{-1097993542, -1845561216}, {-1110049108, -1838335387},
-{-1122057124, -1831030811}, {-1134017074, -1823647799},
-{-1145928447, -1816186668}, {-1157790732, -1808647737},
-{-1169603422, -1801031331}, {-1181366009, -1793337774},
-{-1193077991, -1785567396}, {-1204738865, -1777720531},
-{-1216348132, -1769797514}, {-1227905295, -1761798685},
-{-1239409858, -1753724386}, {-1250861329, -1745574963},
-{-1262259218, -1737350766}, {-1273603035, -1729052147},
-{-1284892296, -1720679461}, {-1296126516, -1712233066},
-{-1307305214, -1703713325}, {-1318427912, -1695120603},
-{-1329494133, -1686455268}, {-1340503402, -1677717690},
-{-1351455249, -1668908244}, {-1362349204, -1660027308},
-{-1373184801, -1651075262}, {-1383961574, -1642052490},
-{-1394679064, -1632959377}, {-1405336810, -1623796314},
-{-1415934356, -1614563692}, {-1426471249, -1605261909},
-{-1436947036, -1595891361}, {-1447361268, -1586452450},
-{-1457713501, -1576945581}, {-1468003290, -1567371161},
-{-1478230195, -1557729600}, {-1488393778, -1548021312},
-{-1498493602, -1538246711}, {-1508529236, -1528406216},
-{-1518500250, -1518500250}, {-1528406216, -1508529236},
-{-1538246711, -1498493602}, {-1548021312, -1488393778},
-{-1557729600, -1478230195}, {-1567371161, -1468003290},
-{-1576945581, -1457713501}, {-1586452450, -1447361268},
-{-1595891361, -1436947036}, {-1605261909, -1426471249},
-{-1614563692, -1415934356}, {-1623796314, -1405336810},
-{-1632959377, -1394679064}, {-1642052490, -1383961574},
-{-1651075262, -1373184801}, {-1660027308, -1362349204},
-{-1668908244, -1351455249}, {-1677717690, -1340503402},
-{-1686455268, -1329494133}, {-1695120603, -1318427912},
-{-1703713325, -1307305214}, {-1712233066, -1296126516},
-{-1720679461, -1284892296}, {-1729052147, -1273603035},
-{-1737350766, -1262259218}, {-1745574963, -1250861329},
-{-1753724386, -1239409858}, {-1761798685, -1227905295},
-{-1769797514, -1216348132}, {-1777720531, -1204738865},
-{-1785567396, -1193077991}, {-1793337774, -1181366009},
-{-1801031331, -1169603422}, {-1808647737, -1157790732},
-{-1816186668, -1145928447}, {-1823647799, -1134017074},
-{-1831030811, -1122057124}, {-1838335387, -1110049108},
-{-1845561216, -1097993542}, {-1852707986, -1085890941},
-{-1859775393, -1073741824}, {-1866763134, -1061546712},
-{-1873670908, -1049306126}, {-1880498421, -1037020592},
-{-1887245379, -1024690635}, {-1893911494, -1012316784},
-{-1900496480, -999899569}, {-1907000055, -987439521},
-{-1913421941, -974937175}, {-1919761862, -962393065},
-{-1926019547, -949807730}, {-1932194727, -937181708},
-{-1938287139, -924515541}, {-1944296521, -911809770},
-{-1950222616, -899064940}, {-1956065170, -886281598},
-{-1961823932, -873460290}, {-1967498656, -860601566},
-{-1973089100, -847705977}, {-1978595022, -834774075},
-{-1984016189, -821806413}, {-1989352366, -808803549},
-{-1994603327, -795766038}, {-1999768845, -782694439},
-{-2004848700, -769589312}, {-2009842674, -756451218},
-{-2014750553, -743280720}, {-2019572126, -730078383},
-{-2024307188, -716844772}, {-2028955535, -703580453},
-{-2033516969, -690285996}, {-2037991293, -676961968},
-{-2042378317, -663608942}, {-2046677852, -650227490},
-{-2050889714, -636818183}, {-2055013723, -623381598},
-{-2059049702, -609918309}, {-2062997478, -596428893},
-{-2066856882, -582913927}, {-2070627749, -569373992},
-{-2074309917, -555809667}, {-2077903229, -542221533},
-{-2081407530, -528610172}, {-2084822670, -514976167},
-{-2088148504, -501320102}, {-2091384888, -487642562},
-{-2094531684, -473944133}, {-2097588758, -460225402},
-{-2100555978, -446486956}, {-2103433217, -432729385},
-{-2106220352, -418953276}, {-2108917263, -405159222},
-{-2111523836, -391347811}, {-2114039958, -377519637},
-{-2116465521, -363675290}, {-2118800422, -349815365},
-{-2121044561, -335940456}, {-2123197841, -322051155},
-{-2125260170, -308148059}, {-2127231461, -294231763},
-{-2129111628, -280302863}, {-2130900591, -266361956},
-{-2132598273, -252409639}, {-2134204601, -238446509},
-{-2135719508, -224473166}, {-2137142927, -210490206},
-{-2138474799, -196498230}, {-2139715065, -182497836},
-{-2140863673, -168489625}, {-2141920573, -154474196},
-{-2142885721, -140452151}, {-2143759074, -126424088},
-{-2144540596, -112390610}, {-2145230253, -98352318},
-{-2145828016, -84309812}, {-2146333858, -70263695},
-{-2146747759, -56214568}, {-2147069700, -42163034},
-{-2147299668, -28109692}, {-2147437652, -14055147},
-{-2147483648, 0}, {-2147437652, 14055147},
-{-2147299668, 28109692}, {-2147069700, 42163034},
-{-2146747759, 56214568}, {-2146333858, 70263695},
-{-2145828016, 84309812}, {-2145230253, 98352318},
-{-2144540596, 112390610}, {-2143759074, 126424088},
-{-2142885721, 140452151}, {-2141920573, 154474196},
-{-2140863673, 168489625}, {-2139715065, 182497836},
-{-2138474799, 196498230}, {-2137142927, 210490206},
-{-2135719508, 224473166}, {-2134204601, 238446509},
-{-2132598273, 252409639}, {-2130900591, 266361956},
-{-2129111628, 280302863}, {-2127231461, 294231763},
-{-2125260170, 308148059}, {-2123197841, 322051155},
-{-2121044561, 335940456}, {-2118800422, 349815365},
-{-2116465521, 363675290}, {-2114039958, 377519637},
-{-2111523836, 391347811}, {-2108917263, 405159222},
-{-2106220352, 418953276}, {-2103433217, 432729385},
-{-2100555978, 446486956}, {-2097588758, 460225402},
-{-2094531684, 473944133}, {-2091384888, 487642562},
-{-2088148504, 501320102}, {-2084822670, 514976167},
-{-2081407530, 528610172}, {-2077903229, 542221533},
-{-2074309917, 555809667}, {-2070627749, 569373992},
-{-2066856882, 582913927}, {-2062997478, 596428893},
-{-2059049702, 609918309}, {-2055013723, 623381598},
-{-2050889714, 636818183}, {-2046677852, 650227490},
-{-2042378317, 663608942}, {-2037991293, 676961968},
-{-2033516969, 690285996}, {-2028955535, 703580453},
-{-2024307188, 716844772}, {-2019572126, 730078383},
-{-2014750553, 743280720}, {-2009842674, 756451218},
-{-2004848700, 769589312}, {-1999768845, 782694439},
-{-1994603327, 795766038}, {-1989352366, 808803549},
-{-1984016189, 821806413}, {-1978595022, 834774075},
-{-1973089100, 847705977}, {-1967498656, 860601566},
-{-1961823932, 873460290}, {-1956065170, 886281598},
-{-1950222616, 899064940}, {-1944296521, 911809770},
-{-1938287139, 924515541}, {-1932194727, 937181708},
-{-1926019547, 949807730}, {-1919761862, 962393065},
-{-1913421941, 974937175}, {-1907000055, 987439521},
-{-1900496480, 999899569}, {-1893911494, 1012316784},
-{-1887245379, 1024690635}, {-1880498421, 1037020592},
-{-1873670908, 1049306126}, {-1866763134, 1061546712},
-{-1859775393, 1073741824}, {-1852707986, 1085890941},
-{-1845561216, 1097993542}, {-1838335387, 1110049108},
-{-1831030811, 1122057124}, {-1823647799, 1134017074},
-{-1816186668, 1145928447}, {-1808647737, 1157790732},
-{-1801031331, 1169603422}, {-1793337774, 1181366009},
-{-1785567396, 1193077991}, {-1777720531, 1204738865},
-{-1769797514, 1216348132}, {-1761798685, 1227905295},
-{-1753724386, 1239409858}, {-1745574963, 1250861329},
-{-1737350766, 1262259218}, {-1729052147, 1273603035},
-{-1720679461, 1284892296}, {-1712233066, 1296126516},
-{-1703713325, 1307305214}, {-1695120603, 1318427912},
-{-1686455268, 1329494133}, {-1677717690, 1340503402},
-{-1668908244, 1351455249}, {-1660027308, 1362349204},
-{-1651075262, 1373184801}, {-1642052490, 1383961574},
-{-1632959377, 1394679064}, {-1623796314, 1405336810},
-{-1614563692, 1415934356}, {-1605261909, 1426471249},
-{-1595891361, 1436947036}, {-1586452450, 1447361268},
-{-1576945581, 1457713501}, {-1567371161, 1468003290},
-{-1557729600, 1478230195}, {-1548021312, 1488393778},
-{-1538246711, 1498493602}, {-1528406216, 1508529236},
-{-1518500250, 1518500250}, {-1508529236, 1528406216},
-{-1498493602, 1538246711}, {-1488393778, 1548021312},
-{-1478230195, 1557729600}, {-1468003290, 1567371161},
-{-1457713501, 1576945581}, {-1447361268, 1586452450},
-{-1436947036, 1595891361}, {-1426471249, 1605261909},
-{-1415934356, 1614563692}, {-1405336810, 1623796314},
-{-1394679064, 1632959377}, {-1383961574, 1642052490},
-{-1373184801, 1651075262}, {-1362349204, 1660027308},
-{-1351455249, 1668908244}, {-1340503402, 1677717690},
-{-1329494133, 1686455268}, {-1318427912, 1695120603},
-{-1307305214, 1703713325}, {-1296126516, 1712233066},
-{-1284892296, 1720679461}, {-1273603035, 1729052147},
-{-1262259218, 1737350766}, {-1250861329, 1745574963},
-{-1239409858, 1753724386}, {-1227905295, 1761798685},
-{-1216348132, 1769797514}, {-1204738865, 1777720531},
-{-1193077991, 1785567396}, {-1181366009, 1793337774},
-{-1169603422, 1801031331}, {-1157790732, 1808647737},
-{-1145928447, 1816186668}, {-1134017074, 1823647799},
-{-1122057124, 1831030811}, {-1110049108, 1838335387},
-{-1097993542, 1845561216}, {-1085890941, 1852707986},
-{-1073741824, 1859775393}, {-1061546712, 1866763134},
-{-1049306126, 1873670908}, {-1037020592, 1880498421},
-{-1024690635, 1887245379}, {-1012316784, 1893911494},
-{-999899569, 1900496480}, {-987439521, 1907000055},
-{-974937175, 1913421941}, {-962393065, 1919761862},
-{-949807730, 1926019547}, {-937181708, 1932194727},
-{-924515541, 1938287139}, {-911809770, 1944296521},
-{-899064940, 1950222616}, {-886281598, 1956065170},
-{-873460290, 1961823932}, {-860601566, 1967498656},
-{-847705977, 1973089100}, {-834774075, 1978595022},
-{-821806413, 1984016189}, {-808803549, 1989352366},
-{-795766038, 1994603327}, {-782694439, 1999768845},
-{-769589312, 2004848700}, {-756451218, 2009842674},
-{-743280720, 2014750553}, {-730078383, 2019572126},
-{-716844772, 2024307188}, {-703580453, 2028955535},
-{-690285996, 2033516969}, {-676961968, 2037991293},
-{-663608942, 2042378317}, {-650227490, 2046677852},
-{-636818183, 2050889714}, {-623381598, 2055013723},
-{-609918309, 2059049702}, {-596428893, 2062997478},
-{-582913927, 2066856882}, {-569373992, 2070627749},
-{-555809667, 2074309917}, {-542221533, 2077903229},
-{-528610172, 2081407530}, {-514976167, 2084822670},
-{-501320102, 2088148504}, {-487642562, 2091384888},
-{-473944133, 2094531684}, {-460225402, 2097588758},
-{-446486956, 2100555978}, {-432729385, 2103433217},
-{-418953276, 2106220352}, {-405159222, 2108917263},
-{-391347811, 2111523836}, {-377519637, 2114039958},
-{-363675290, 2116465521}, {-349815365, 2118800422},
-{-335940456, 2121044561}, {-322051155, 2123197841},
-{-308148059, 2125260170}, {-294231763, 2127231461},
-{-280302863, 2129111628}, {-266361956, 2130900591},
-{-252409639, 2132598273}, {-238446509, 2134204601},
-{-224473166, 2135719508}, {-210490206, 2137142927},
-{-196498230, 2138474799}, {-182497836, 2139715065},
-{-168489625, 2140863673}, {-154474196, 2141920573},
-{-140452151, 2142885721}, {-126424088, 2143759074},
-{-112390610, 2144540596}, {-98352318, 2145230253},
-{-84309812, 2145828016}, {-70263695, 2146333858},
-{-56214568, 2146747759}, {-42163034, 2147069700},
-{-28109692, 2147299668}, {-14055147, 2147437652},
-{0, 2147483647}, {14055147, 2147437652},
-{28109692, 2147299668}, {42163034, 2147069700},
-{56214568, 2146747759}, {70263695, 2146333858},
-{84309812, 2145828016}, {98352318, 2145230253},
-{112390610, 2144540596}, {126424088, 2143759074},
-{140452151, 2142885721}, {154474196, 2141920573},
-{168489625, 2140863673}, {182497836, 2139715065},
-{196498230, 2138474799}, {210490206, 2137142927},
-{224473166, 2135719508}, {238446509, 2134204601},
-{252409639, 2132598273}, {266361956, 2130900591},
-{280302863, 2129111628}, {294231763, 2127231461},
-{308148059, 2125260170}, {322051155, 2123197841},
-{335940456, 2121044561}, {349815365, 2118800422},
-{363675290, 2116465521}, {377519637, 2114039958},
-{391347811, 2111523836}, {405159222, 2108917263},
-{418953276, 2106220352}, {432729385, 2103433217},
-{446486956, 2100555978}, {460225402, 2097588758},
-{473944133, 2094531684}, {487642562, 2091384888},
-{501320102, 2088148504}, {514976167, 2084822670},
-{528610172, 2081407530}, {542221533, 2077903229},
-{555809667, 2074309917}, {569373992, 2070627749},
-{582913927, 2066856882}, {596428893, 2062997478},
-{609918309, 2059049702}, {623381598, 2055013723},
-{636818183, 2050889714}, {650227490, 2046677852},
-{663608942, 2042378317}, {676961968, 2037991293},
-{690285996, 2033516969}, {703580453, 2028955535},
-{716844772, 2024307188}, {730078383, 2019572126},
-{743280720, 2014750553}, {756451218, 2009842674},
-{769589312, 2004848700}, {782694439, 1999768845},
-{795766038, 1994603327}, {808803549, 1989352366},
-{821806413, 1984016189}, {834774075, 1978595022},
-{847705977, 1973089100}, {860601566, 1967498656},
-{873460290, 1961823932}, {886281598, 1956065170},
-{899064940, 1950222616}, {911809770, 1944296521},
-{924515541, 1938287139}, {937181708, 1932194727},
-{949807730, 1926019547}, {962393065, 1919761862},
-{974937175, 1913421941}, {987439521, 1907000055},
-{999899569, 1900496480}, {1012316784, 1893911494},
-{1024690635, 1887245379}, {1037020592, 1880498421},
-{1049306126, 1873670908}, {1061546712, 1866763134},
-{1073741824, 1859775393}, {1085890941, 1852707986},
-{1097993542, 1845561216}, {1110049108, 1838335387},
-{1122057124, 1831030811}, {1134017074, 1823647799},
-{1145928447, 1816186668}, {1157790732, 1808647737},
-{1169603422, 1801031331}, {1181366009, 1793337774},
-{1193077991, 1785567396}, {1204738865, 1777720531},
-{1216348132, 1769797514}, {1227905295, 1761798685},
-{1239409858, 1753724386}, {1250861329, 1745574963},
-{1262259218, 1737350766}, {1273603035, 1729052147},
-{1284892296, 1720679461}, {1296126516, 1712233066},
-{1307305214, 1703713325}, {1318427912, 1695120603},
-{1329494133, 1686455268}, {1340503402, 1677717690},
-{1351455249, 1668908244}, {1362349204, 1660027308},
-{1373184801, 1651075262}, {1383961574, 1642052490},
-{1394679064, 1632959377}, {1405336810, 1623796314},
-{1415934356, 1614563692}, {1426471249, 1605261909},
-{1436947036, 1595891361}, {1447361268, 1586452450},
-{1457713501, 1576945581}, {1468003290, 1567371161},
-{1478230195, 1557729600}, {1488393778, 1548021312},
-{1498493602, 1538246711}, {1508529236, 1528406216},
-{1518500250, 1518500250}, {1528406216, 1508529236},
-{1538246711, 1498493602}, {1548021312, 1488393778},
-{1557729600, 1478230195}, {1567371161, 1468003290},
-{1576945581, 1457713501}, {1586452450, 1447361268},
-{1595891361, 1436947036}, {1605261909, 1426471249},
-{1614563692, 1415934356}, {1623796314, 1405336810},
-{1632959377, 1394679064}, {1642052490, 1383961574},
-{1651075262, 1373184801}, {1660027308, 1362349204},
-{1668908244, 1351455249}, {1677717690, 1340503402},
-{1686455268, 1329494133}, {1695120603, 1318427912},
-{1703713325, 1307305214}, {1712233066, 1296126516},
-{1720679461, 1284892296}, {1729052147, 1273603035},
-{1737350766, 1262259218}, {1745574963, 1250861329},
-{1753724386, 1239409858}, {1761798685, 1227905295},
-{1769797514, 1216348132}, {1777720531, 1204738865},
-{1785567396, 1193077991}, {1793337774, 1181366009},
-{1801031331, 1169603422}, {1808647737, 1157790732},
-{1816186668, 1145928447}, {1823647799, 1134017074},
-{1831030811, 1122057124}, {1838335387, 1110049108},
-{1845561216, 1097993542}, {1852707986, 1085890941},
-{1859775393, 1073741824}, {1866763134, 1061546712},
-{1873670908, 1049306126}, {1880498421, 1037020592},
-{1887245379, 1024690635}, {1893911494, 1012316784},
-{1900496480, 999899569}, {1907000055, 987439521},
-{1913421941, 974937175}, {1919761862, 962393065},
-{1926019547, 949807730}, {1932194727, 937181708},
-{1938287139, 924515541}, {1944296521, 911809770},
-{1950222616, 899064940}, {1956065170, 886281598},
-{1961823932, 873460290}, {1967498656, 860601566},
-{1973089100, 847705977}, {1978595022, 834774075},
-{1984016189, 821806413}, {1989352366, 808803549},
-{1994603327, 795766038}, {1999768845, 782694439},
-{2004848700, 769589312}, {2009842674, 756451218},
-{2014750553, 743280720}, {2019572126, 730078383},
-{2024307188, 716844772}, {2028955535, 703580453},
-{2033516969, 690285996}, {2037991293, 676961968},
-{2042378317, 663608942}, {2046677852, 650227490},
-{2050889714, 636818183}, {2055013723, 623381598},
-{2059049702, 609918309}, {2062997478, 596428893},
-{2066856882, 582913927}, {2070627749, 569373992},
-{2074309917, 555809667}, {2077903229, 542221533},
-{2081407530, 528610172}, {2084822670, 514976167},
-{2088148504, 501320102}, {2091384888, 487642562},
-{2094531684, 473944133}, {2097588758, 460225402},
-{2100555978, 446486956}, {2103433217, 432729385},
-{2106220352, 418953276}, {2108917263, 405159222},
-{2111523836, 391347811}, {2114039958, 377519637},
-{2116465521, 363675290}, {2118800422, 349815365},
-{2121044561, 335940456}, {2123197841, 322051155},
-{2125260170, 308148059}, {2127231461, 294231763},
-{2129111628, 280302863}, {2130900591, 266361956},
-{2132598273, 252409639}, {2134204601, 238446509},
-{2135719508, 224473166}, {2137142927, 210490206},
-{2138474799, 196498230}, {2139715065, 182497836},
-{2140863673, 168489625}, {2141920573, 154474196},
-{2142885721, 140452151}, {2143759074, 126424088},
-{2144540596, 112390610}, {2145230253, 98352318},
-{2145828016, 84309812}, {2146333858, 70263695},
-{2146747759, 56214568}, {2147069700, 42163034},
-{2147299668, 28109692}, {2147437652, 14055147},
+    {2147483647, 0}, {2147437652, -14055147},
+    {2147299668, -28109692}, {2147069700, -42163034},
+    {2146747759, -56214568}, {2146333858, -70263695},
+    {2145828016, -84309812}, {2145230253, -98352318},
+    {2144540596, -112390610}, {2143759074, -126424088},
+    {2142885721, -140452151}, {2141920573, -154474196},
+    {2140863673, -168489625}, {2139715065, -182497836},
+    {2138474799, -196498230}, {2137142927, -210490206},
+    {2135719508, -224473166}, {2134204601, -238446509},
+    {2132598273, -252409639}, {2130900591, -266361956},
+    {2129111628, -280302863}, {2127231461, -294231763},
+    {2125260170, -308148059}, {2123197841, -322051155},
+    {2121044561, -335940456}, {2118800422, -349815365},
+    {2116465521, -363675290}, {2114039958, -377519637},
+    {2111523836, -391347811}, {2108917263, -405159222},
+    {2106220352, -418953276}, {2103433217, -432729385},
+    {2100555978, -446486956}, {2097588758, -460225402},
+    {2094531684, -473944133}, {2091384888, -487642562},
+    {2088148504, -501320102}, {2084822670, -514976167},
+    {2081407530, -528610172}, {2077903229, -542221533},
+    {2074309917, -555809667}, {2070627749, -569373992},
+    {2066856882, -582913927}, {2062997478, -596428893},
+    {2059049702, -609918309}, {2055013723, -623381598},
+    {2050889714, -636818183}, {2046677852, -650227490},
+    {2042378317, -663608942}, {2037991293, -676961968},
+    {2033516969, -690285996}, {2028955535, -703580453},
+    {2024307188, -716844772}, {2019572126, -730078383},
+    {2014750553, -743280720}, {2009842674, -756451218},
+    {2004848700, -769589312}, {1999768845, -782694439},
+    {1994603327, -795766038}, {1989352366, -808803549},
+    {1984016189, -821806413}, {1978595022, -834774075},
+    {1973089100, -847705977}, {1967498656, -860601566},
+    {1961823932, -873460290}, {1956065170, -886281598},
+    {1950222616, -899064940}, {1944296521, -911809770},
+    {1938287139, -924515541}, {1932194727, -937181708},
+    {1926019547, -949807730}, {1919761862, -962393065},
+    {1913421941, -974937175}, {1907000055, -987439521},
+    {1900496480, -999899569}, {1893911494, -1012316784},
+    {1887245379, -1024690635}, {1880498421, -1037020592},
+    {1873670908, -1049306126}, {1866763134, -1061546712},
+    {1859775393, -1073741824}, {1852707986, -1085890941},
+    {1845561216, -1097993542}, {1838335387, -1110049108},
+    {1831030811, -1122057124}, {1823647799, -1134017074},
+    {1816186668, -1145928447}, {1808647737, -1157790732},
+    {1801031331, -1169603422}, {1793337774, -1181366009},
+    {1785567396, -1193077991}, {1777720531, -1204738865},
+    {1769797514, -1216348132}, {1761798685, -1227905295},
+    {1753724386, -1239409858}, {1745574963, -1250861329},
+    {1737350766, -1262259218}, {1729052147, -1273603035},
+    {1720679461, -1284892296}, {1712233066, -1296126516},
+    {1703713325, -1307305214}, {1695120603, -1318427912},
+    {1686455268, -1329494133}, {1677717690, -1340503402},
+    {1668908244, -1351455249}, {1660027308, -1362349204},
+    {1651075262, -1373184801}, {1642052490, -1383961574},
+    {1632959377, -1394679064}, {1623796314, -1405336810},
+    {1614563692, -1415934356}, {1605261909, -1426471249},
+    {1595891361, -1436947036}, {1586452450, -1447361268},
+    {1576945581, -1457713501}, {1567371161, -1468003290},
+    {1557729600, -1478230195}, {1548021312, -1488393778},
+    {1538246711, -1498493602}, {1528406216, -1508529236},
+    {1518500250, -1518500250}, {1508529236, -1528406216},
+    {1498493602, -1538246711}, {1488393778, -1548021312},
+    {1478230195, -1557729600}, {1468003290, -1567371161},
+    {1457713501, -1576945581}, {1447361268, -1586452450},
+    {1436947036, -1595891361}, {1426471249, -1605261909},
+    {1415934356, -1614563692}, {1405336810, -1623796314},
+    {1394679064, -1632959377}, {1383961574, -1642052490},
+    {1373184801, -1651075262}, {1362349204, -1660027308},
+    {1351455249, -1668908244}, {1340503402, -1677717690},
+    {1329494133, -1686455268}, {1318427912, -1695120603},
+    {1307305214, -1703713325}, {1296126516, -1712233066},
+    {1284892296, -1720679461}, {1273603035, -1729052147},
+    {1262259218, -1737350766}, {1250861329, -1745574963},
+    {1239409858, -1753724386}, {1227905295, -1761798685},
+    {1216348132, -1769797514}, {1204738865, -1777720531},
+    {1193077991, -1785567396}, {1181366009, -1793337774},
+    {1169603422, -1801031331}, {1157790732, -1808647737},
+    {1145928447, -1816186668}, {1134017074, -1823647799},
+    {1122057124, -1831030811}, {1110049108, -1838335387},
+    {1097993542, -1845561216}, {1085890941, -1852707986},
+    {1073741824, -1859775393}, {1061546712, -1866763134},
+    {1049306126, -1873670908}, {1037020592, -1880498421},
+    {1024690635, -1887245379}, {1012316784, -1893911494},
+    {999899569, -1900496480}, {987439521, -1907000055},
+    {974937175, -1913421941}, {962393065, -1919761862},
+    {949807730, -1926019547}, {937181708, -1932194727},
+    {924515541, -1938287139}, {911809770, -1944296521},
+    {899064940, -1950222616}, {886281598, -1956065170},
+    {873460290, -1961823932}, {860601566, -1967498656},
+    {847705977, -1973089100}, {834774075, -1978595022},
+    {821806413, -1984016189}, {808803549, -1989352366},
+    {795766038, -1994603327}, {782694439, -1999768845},
+    {769589312, -2004848700}, {756451218, -2009842674},
+    {743280720, -2014750553}, {730078383, -2019572126},
+    {716844772, -2024307188}, {703580453, -2028955535},
+    {690285996, -2033516969}, {676961968, -2037991293},
+    {663608942, -2042378317}, {650227490, -2046677852},
+    {636818183, -2050889714}, {623381598, -2055013723},
+    {609918309, -2059049702}, {596428893, -2062997478},
+    {582913927, -2066856882}, {569373992, -2070627749},
+    {555809667, -2074309917}, {542221533, -2077903229},
+    {528610172, -2081407530}, {514976167, -2084822670},
+    {501320102, -2088148504}, {487642562, -2091384888},
+    {473944133, -2094531684}, {460225402, -2097588758},
+    {446486956, -2100555978}, {432729385, -2103433217},
+    {418953276, -2106220352}, {405159222, -2108917263},
+    {391347811, -2111523836}, {377519637, -2114039958},
+    {363675290, -2116465521}, {349815365, -2118800422},
+    {335940456, -2121044561}, {322051155, -2123197841},
+    {308148059, -2125260170}, {294231763, -2127231461},
+    {280302863, -2129111628}, {266361956, -2130900591},
+    {252409639, -2132598273}, {238446509, -2134204601},
+    {224473166, -2135719508}, {210490206, -2137142927},
+    {196498230, -2138474799}, {182497836, -2139715065},
+    {168489625, -2140863673}, {154474196, -2141920573},
+    {140452151, -2142885721}, {126424088, -2143759074},
+    {112390610, -2144540596}, {98352318, -2145230253},
+    {84309812, -2145828016}, {70263695, -2146333858},
+    {56214568, -2146747759}, {42163034, -2147069700},
+    {28109692, -2147299668}, {14055147, -2147437652},
+    {0, -2147483648}, {-14055147, -2147437652},
+    {-28109692, -2147299668}, {-42163034, -2147069700},
+    {-56214568, -2146747759}, {-70263695, -2146333858},
+    {-84309812, -2145828016}, {-98352318, -2145230253},
+    {-112390610, -2144540596}, {-126424088, -2143759074},
+    {-140452151, -2142885721}, {-154474196, -2141920573},
+    {-168489625, -2140863673}, {-182497836, -2139715065},
+    {-196498230, -2138474799}, {-210490206, -2137142927},
+    {-224473166, -2135719508}, {-238446509, -2134204601},
+    {-252409639, -2132598273}, {-266361956, -2130900591},
+    {-280302863, -2129111628}, {-294231763, -2127231461},
+    {-308148059, -2125260170}, {-322051155, -2123197841},
+    {-335940456, -2121044561}, {-349815365, -2118800422},
+    {-363675290, -2116465521}, {-377519637, -2114039958},
+    {-391347811, -2111523836}, {-405159222, -2108917263},
+    {-418953276, -2106220352}, {-432729385, -2103433217},
+    {-446486956, -2100555978}, {-460225402, -2097588758},
+    {-473944133, -2094531684}, {-487642562, -2091384888},
+    {-501320102, -2088148504}, {-514976167, -2084822670},
+    {-528610172, -2081407530}, {-542221533, -2077903229},
+    {-555809667, -2074309917}, {-569373992, -2070627749},
+    {-582913927, -2066856882}, {-596428893, -2062997478},
+    {-609918309, -2059049702}, {-623381598, -2055013723},
+    {-636818183, -2050889714}, {-650227490, -2046677852},
+    {-663608942, -2042378317}, {-676961968, -2037991293},
+    {-690285996, -2033516969}, {-703580453, -2028955535},
+    {-716844772, -2024307188}, {-730078383, -2019572126},
+    {-743280720, -2014750553}, {-756451218, -2009842674},
+    {-769589312, -2004848700}, {-782694439, -1999768845},
+    {-795766038, -1994603327}, {-808803549, -1989352366},
+    {-821806413, -1984016189}, {-834774075, -1978595022},
+    {-847705977, -1973089100}, {-860601566, -1967498656},
+    {-873460290, -1961823932}, {-886281598, -1956065170},
+    {-899064940, -1950222616}, {-911809770, -1944296521},
+    {-924515541, -1938287139}, {-937181708, -1932194727},
+    {-949807730, -1926019547}, {-962393065, -1919761862},
+    {-974937175, -1913421941}, {-987439521, -1907000055},
+    {-999899569, -1900496480}, {-1012316784, -1893911494},
+    {-1024690635, -1887245379}, {-1037020592, -1880498421},
+    {-1049306126, -1873670908}, {-1061546712, -1866763134},
+    {-1073741824, -1859775393}, {-1085890941, -1852707986},
+    {-1097993542, -1845561216}, {-1110049108, -1838335387},
+    {-1122057124, -1831030811}, {-1134017074, -1823647799},
+    {-1145928447, -1816186668}, {-1157790732, -1808647737},
+    {-1169603422, -1801031331}, {-1181366009, -1793337774},
+    {-1193077991, -1785567396}, {-1204738865, -1777720531},
+    {-1216348132, -1769797514}, {-1227905295, -1761798685},
+    {-1239409858, -1753724386}, {-1250861329, -1745574963},
+    {-1262259218, -1737350766}, {-1273603035, -1729052147},
+    {-1284892296, -1720679461}, {-1296126516, -1712233066},
+    {-1307305214, -1703713325}, {-1318427912, -1695120603},
+    {-1329494133, -1686455268}, {-1340503402, -1677717690},
+    {-1351455249, -1668908244}, {-1362349204, -1660027308},
+    {-1373184801, -1651075262}, {-1383961574, -1642052490},
+    {-1394679064, -1632959377}, {-1405336810, -1623796314},
+    {-1415934356, -1614563692}, {-1426471249, -1605261909},
+    {-1436947036, -1595891361}, {-1447361268, -1586452450},
+    {-1457713501, -1576945581}, {-1468003290, -1567371161},
+    {-1478230195, -1557729600}, {-1488393778, -1548021312},
+    {-1498493602, -1538246711}, {-1508529236, -1528406216},
+    {-1518500250, -1518500250}, {-1528406216, -1508529236},
+    {-1538246711, -1498493602}, {-1548021312, -1488393778},
+    {-1557729600, -1478230195}, {-1567371161, -1468003290},
+    {-1576945581, -1457713501}, {-1586452450, -1447361268},
+    {-1595891361, -1436947036}, {-1605261909, -1426471249},
+    {-1614563692, -1415934356}, {-1623796314, -1405336810},
+    {-1632959377, -1394679064}, {-1642052490, -1383961574},
+    {-1651075262, -1373184801}, {-1660027308, -1362349204},
+    {-1668908244, -1351455249}, {-1677717690, -1340503402},
+    {-1686455268, -1329494133}, {-1695120603, -1318427912},
+    {-1703713325, -1307305214}, {-1712233066, -1296126516},
+    {-1720679461, -1284892296}, {-1729052147, -1273603035},
+    {-1737350766, -1262259218}, {-1745574963, -1250861329},
+    {-1753724386, -1239409858}, {-1761798685, -1227905295},
+    {-1769797514, -1216348132}, {-1777720531, -1204738865},
+    {-1785567396, -1193077991}, {-1793337774, -1181366009},
+    {-1801031331, -1169603422}, {-1808647737, -1157790732},
+    {-1816186668, -1145928447}, {-1823647799, -1134017074},
+    {-1831030811, -1122057124}, {-1838335387, -1110049108},
+    {-1845561216, -1097993542}, {-1852707986, -1085890941},
+    {-1859775393, -1073741824}, {-1866763134, -1061546712},
+    {-1873670908, -1049306126}, {-1880498421, -1037020592},
+    {-1887245379, -1024690635}, {-1893911494, -1012316784},
+    {-1900496480, -999899569}, {-1907000055, -987439521},
+    {-1913421941, -974937175}, {-1919761862, -962393065},
+    {-1926019547, -949807730}, {-1932194727, -937181708},
+    {-1938287139, -924515541}, {-1944296521, -911809770},
+    {-1950222616, -899064940}, {-1956065170, -886281598},
+    {-1961823932, -873460290}, {-1967498656, -860601566},
+    {-1973089100, -847705977}, {-1978595022, -834774075},
+    {-1984016189, -821806413}, {-1989352366, -808803549},
+    {-1994603327, -795766038}, {-1999768845, -782694439},
+    {-2004848700, -769589312}, {-2009842674, -756451218},
+    {-2014750553, -743280720}, {-2019572126, -730078383},
+    {-2024307188, -716844772}, {-2028955535, -703580453},
+    {-2033516969, -690285996}, {-2037991293, -676961968},
+    {-2042378317, -663608942}, {-2046677852, -650227490},
+    {-2050889714, -636818183}, {-2055013723, -623381598},
+    {-2059049702, -609918309}, {-2062997478, -596428893},
+    {-2066856882, -582913927}, {-2070627749, -569373992},
+    {-2074309917, -555809667}, {-2077903229, -542221533},
+    {-2081407530, -528610172}, {-2084822670, -514976167},
+    {-2088148504, -501320102}, {-2091384888, -487642562},
+    {-2094531684, -473944133}, {-2097588758, -460225402},
+    {-2100555978, -446486956}, {-2103433217, -432729385},
+    {-2106220352, -418953276}, {-2108917263, -405159222},
+    {-2111523836, -391347811}, {-2114039958, -377519637},
+    {-2116465521, -363675290}, {-2118800422, -349815365},
+    {-2121044561, -335940456}, {-2123197841, -322051155},
+    {-2125260170, -308148059}, {-2127231461, -294231763},
+    {-2129111628, -280302863}, {-2130900591, -266361956},
+    {-2132598273, -252409639}, {-2134204601, -238446509},
+    {-2135719508, -224473166}, {-2137142927, -210490206},
+    {-2138474799, -196498230}, {-2139715065, -182497836},
+    {-2140863673, -168489625}, {-2141920573, -154474196},
+    {-2142885721, -140452151}, {-2143759074, -126424088},
+    {-2144540596, -112390610}, {-2145230253, -98352318},
+    {-2145828016, -84309812}, {-2146333858, -70263695},
+    {-2146747759, -56214568}, {-2147069700, -42163034},
+    {-2147299668, -28109692}, {-2147437652, -14055147},
+    {-2147483648, 0}, {-2147437652, 14055147},
+    {-2147299668, 28109692}, {-2147069700, 42163034},
+    {-2146747759, 56214568}, {-2146333858, 70263695},
+    {-2145828016, 84309812}, {-2145230253, 98352318},
+    {-2144540596, 112390610}, {-2143759074, 126424088},
+    {-2142885721, 140452151}, {-2141920573, 154474196},
+    {-2140863673, 168489625}, {-2139715065, 182497836},
+    {-2138474799, 196498230}, {-2137142927, 210490206},
+    {-2135719508, 224473166}, {-2134204601, 238446509},
+    {-2132598273, 252409639}, {-2130900591, 266361956},
+    {-2129111628, 280302863}, {-2127231461, 294231763},
+    {-2125260170, 308148059}, {-2123197841, 322051155},
+    {-2121044561, 335940456}, {-2118800422, 349815365},
+    {-2116465521, 363675290}, {-2114039958, 377519637},
+    {-2111523836, 391347811}, {-2108917263, 405159222},
+    {-2106220352, 418953276}, {-2103433217, 432729385},
+    {-2100555978, 446486956}, {-2097588758, 460225402},
+    {-2094531684, 473944133}, {-2091384888, 487642562},
+    {-2088148504, 501320102}, {-2084822670, 514976167},
+    {-2081407530, 528610172}, {-2077903229, 542221533},
+    {-2074309917, 555809667}, {-2070627749, 569373992},
+    {-2066856882, 582913927}, {-2062997478, 596428893},
+    {-2059049702, 609918309}, {-2055013723, 623381598},
+    {-2050889714, 636818183}, {-2046677852, 650227490},
+    {-2042378317, 663608942}, {-2037991293, 676961968},
+    {-2033516969, 690285996}, {-2028955535, 703580453},
+    {-2024307188, 716844772}, {-2019572126, 730078383},
+    {-2014750553, 743280720}, {-2009842674, 756451218},
+    {-2004848700, 769589312}, {-1999768845, 782694439},
+    {-1994603327, 795766038}, {-1989352366, 808803549},
+    {-1984016189, 821806413}, {-1978595022, 834774075},
+    {-1973089100, 847705977}, {-1967498656, 860601566},
+    {-1961823932, 873460290}, {-1956065170, 886281598},
+    {-1950222616, 899064940}, {-1944296521, 911809770},
+    {-1938287139, 924515541}, {-1932194727, 937181708},
+    {-1926019547, 949807730}, {-1919761862, 962393065},
+    {-1913421941, 974937175}, {-1907000055, 987439521},
+    {-1900496480, 999899569}, {-1893911494, 1012316784},
+    {-1887245379, 1024690635}, {-1880498421, 1037020592},
+    {-1873670908, 1049306126}, {-1866763134, 1061546712},
+    {-1859775393, 1073741824}, {-1852707986, 1085890941},
+    {-1845561216, 1097993542}, {-1838335387, 1110049108},
+    {-1831030811, 1122057124}, {-1823647799, 1134017074},
+    {-1816186668, 1145928447}, {-1808647737, 1157790732},
+    {-1801031331, 1169603422}, {-1793337774, 1181366009},
+    {-1785567396, 1193077991}, {-1777720531, 1204738865},
+    {-1769797514, 1216348132}, {-1761798685, 1227905295},
+    {-1753724386, 1239409858}, {-1745574963, 1250861329},
+    {-1737350766, 1262259218}, {-1729052147, 1273603035},
+    {-1720679461, 1284892296}, {-1712233066, 1296126516},
+    {-1703713325, 1307305214}, {-1695120603, 1318427912},
+    {-1686455268, 1329494133}, {-1677717690, 1340503402},
+    {-1668908244, 1351455249}, {-1660027308, 1362349204},
+    {-1651075262, 1373184801}, {-1642052490, 1383961574},
+    {-1632959377, 1394679064}, {-1623796314, 1405336810},
+    {-1614563692, 1415934356}, {-1605261909, 1426471249},
+    {-1595891361, 1436947036}, {-1586452450, 1447361268},
+    {-1576945581, 1457713501}, {-1567371161, 1468003290},
+    {-1557729600, 1478230195}, {-1548021312, 1488393778},
+    {-1538246711, 1498493602}, {-1528406216, 1508529236},
+    {-1518500250, 1518500250}, {-1508529236, 1528406216},
+    {-1498493602, 1538246711}, {-1488393778, 1548021312},
+    {-1478230195, 1557729600}, {-1468003290, 1567371161},
+    {-1457713501, 1576945581}, {-1447361268, 1586452450},
+    {-1436947036, 1595891361}, {-1426471249, 1605261909},
+    {-1415934356, 1614563692}, {-1405336810, 1623796314},
+    {-1394679064, 1632959377}, {-1383961574, 1642052490},
+    {-1373184801, 1651075262}, {-1362349204, 1660027308},
+    {-1351455249, 1668908244}, {-1340503402, 1677717690},
+    {-1329494133, 1686455268}, {-1318427912, 1695120603},
+    {-1307305214, 1703713325}, {-1296126516, 1712233066},
+    {-1284892296, 1720679461}, {-1273603035, 1729052147},
+    {-1262259218, 1737350766}, {-1250861329, 1745574963},
+    {-1239409858, 1753724386}, {-1227905295, 1761798685},
+    {-1216348132, 1769797514}, {-1204738865, 1777720531},
+    {-1193077991, 1785567396}, {-1181366009, 1793337774},
+    {-1169603422, 1801031331}, {-1157790732, 1808647737},
+    {-1145928447, 1816186668}, {-1134017074, 1823647799},
+    {-1122057124, 1831030811}, {-1110049108, 1838335387},
+    {-1097993542, 1845561216}, {-1085890941, 1852707986},
+    {-1073741824, 1859775393}, {-1061546712, 1866763134},
+    {-1049306126, 1873670908}, {-1037020592, 1880498421},
+    {-1024690635, 1887245379}, {-1012316784, 1893911494},
+    {-999899569, 1900496480}, {-987439521, 1907000055},
+    {-974937175, 1913421941}, {-962393065, 1919761862},
+    {-949807730, 1926019547}, {-937181708, 1932194727},
+    {-924515541, 1938287139}, {-911809770, 1944296521},
+    {-899064940, 1950222616}, {-886281598, 1956065170},
+    {-873460290, 1961823932}, {-860601566, 1967498656},
+    {-847705977, 1973089100}, {-834774075, 1978595022},
+    {-821806413, 1984016189}, {-808803549, 1989352366},
+    {-795766038, 1994603327}, {-782694439, 1999768845},
+    {-769589312, 2004848700}, {-756451218, 2009842674},
+    {-743280720, 2014750553}, {-730078383, 2019572126},
+    {-716844772, 2024307188}, {-703580453, 2028955535},
+    {-690285996, 2033516969}, {-676961968, 2037991293},
+    {-663608942, 2042378317}, {-650227490, 2046677852},
+    {-636818183, 2050889714}, {-623381598, 2055013723},
+    {-609918309, 2059049702}, {-596428893, 2062997478},
+    {-582913927, 2066856882}, {-569373992, 2070627749},
+    {-555809667, 2074309917}, {-542221533, 2077903229},
+    {-528610172, 2081407530}, {-514976167, 2084822670},
+    {-501320102, 2088148504}, {-487642562, 2091384888},
+    {-473944133, 2094531684}, {-460225402, 2097588758},
+    {-446486956, 2100555978}, {-432729385, 2103433217},
+    {-418953276, 2106220352}, {-405159222, 2108917263},
+    {-391347811, 2111523836}, {-377519637, 2114039958},
+    {-363675290, 2116465521}, {-349815365, 2118800422},
+    {-335940456, 2121044561}, {-322051155, 2123197841},
+    {-308148059, 2125260170}, {-294231763, 2127231461},
+    {-280302863, 2129111628}, {-266361956, 2130900591},
+    {-252409639, 2132598273}, {-238446509, 2134204601},
+    {-224473166, 2135719508}, {-210490206, 2137142927},
+    {-196498230, 2138474799}, {-182497836, 2139715065},
+    {-168489625, 2140863673}, {-154474196, 2141920573},
+    {-140452151, 2142885721}, {-126424088, 2143759074},
+    {-112390610, 2144540596}, {-98352318, 2145230253},
+    {-84309812, 2145828016}, {-70263695, 2146333858},
+    {-56214568, 2146747759}, {-42163034, 2147069700},
+    {-28109692, 2147299668}, {-14055147, 2147437652},
+    {0, 2147483647}, {14055147, 2147437652},
+    {28109692, 2147299668}, {42163034, 2147069700},
+    {56214568, 2146747759}, {70263695, 2146333858},
+    {84309812, 2145828016}, {98352318, 2145230253},
+    {112390610, 2144540596}, {126424088, 2143759074},
+    {140452151, 2142885721}, {154474196, 2141920573},
+    {168489625, 2140863673}, {182497836, 2139715065},
+    {196498230, 2138474799}, {210490206, 2137142927},
+    {224473166, 2135719508}, {238446509, 2134204601},
+    {252409639, 2132598273}, {266361956, 2130900591},
+    {280302863, 2129111628}, {294231763, 2127231461},
+    {308148059, 2125260170}, {322051155, 2123197841},
+    {335940456, 2121044561}, {349815365, 2118800422},
+    {363675290, 2116465521}, {377519637, 2114039958},
+    {391347811, 2111523836}, {405159222, 2108917263},
+    {418953276, 2106220352}, {432729385, 2103433217},
+    {446486956, 2100555978}, {460225402, 2097588758},
+    {473944133, 2094531684}, {487642562, 2091384888},
+    {501320102, 2088148504}, {514976167, 2084822670},
+    {528610172, 2081407530}, {542221533, 2077903229},
+    {555809667, 2074309917}, {569373992, 2070627749},
+    {582913927, 2066856882}, {596428893, 2062997478},
+    {609918309, 2059049702}, {623381598, 2055013723},
+    {636818183, 2050889714}, {650227490, 2046677852},
+    {663608942, 2042378317}, {676961968, 2037991293},
+    {690285996, 2033516969}, {703580453, 2028955535},
+    {716844772, 2024307188}, {730078383, 2019572126},
+    {743280720, 2014750553}, {756451218, 2009842674},
+    {769589312, 2004848700}, {782694439, 1999768845},
+    {795766038, 1994603327}, {808803549, 1989352366},
+    {821806413, 1984016189}, {834774075, 1978595022},
+    {847705977, 1973089100}, {860601566, 1967498656},
+    {873460290, 1961823932}, {886281598, 1956065170},
+    {899064940, 1950222616}, {911809770, 1944296521},
+    {924515541, 1938287139}, {937181708, 1932194727},
+    {949807730, 1926019547}, {962393065, 1919761862},
+    {974937175, 1913421941}, {987439521, 1907000055},
+    {999899569, 1900496480}, {1012316784, 1893911494},
+    {1024690635, 1887245379}, {1037020592, 1880498421},
+    {1049306126, 1873670908}, {1061546712, 1866763134},
+    {1073741824, 1859775393}, {1085890941, 1852707986},
+    {1097993542, 1845561216}, {1110049108, 1838335387},
+    {1122057124, 1831030811}, {1134017074, 1823647799},
+    {1145928447, 1816186668}, {1157790732, 1808647737},
+    {1169603422, 1801031331}, {1181366009, 1793337774},
+    {1193077991, 1785567396}, {1204738865, 1777720531},
+    {1216348132, 1769797514}, {1227905295, 1761798685},
+    {1239409858, 1753724386}, {1250861329, 1745574963},
+    {1262259218, 1737350766}, {1273603035, 1729052147},
+    {1284892296, 1720679461}, {1296126516, 1712233066},
+    {1307305214, 1703713325}, {1318427912, 1695120603},
+    {1329494133, 1686455268}, {1340503402, 1677717690},
+    {1351455249, 1668908244}, {1362349204, 1660027308},
+    {1373184801, 1651075262}, {1383961574, 1642052490},
+    {1394679064, 1632959377}, {1405336810, 1623796314},
+    {1415934356, 1614563692}, {1426471249, 1605261909},
+    {1436947036, 1595891361}, {1447361268, 1586452450},
+    {1457713501, 1576945581}, {1468003290, 1567371161},
+    {1478230195, 1557729600}, {1488393778, 1548021312},
+    {1498493602, 1538246711}, {1508529236, 1528406216},
+    {1518500250, 1518500250}, {1528406216, 1508529236},
+    {1538246711, 1498493602}, {1548021312, 1488393778},
+    {1557729600, 1478230195}, {1567371161, 1468003290},
+    {1576945581, 1457713501}, {1586452450, 1447361268},
+    {1595891361, 1436947036}, {1605261909, 1426471249},
+    {1614563692, 1415934356}, {1623796314, 1405336810},
+    {1632959377, 1394679064}, {1642052490, 1383961574},
+    {1651075262, 1373184801}, {1660027308, 1362349204},
+    {1668908244, 1351455249}, {1677717690, 1340503402},
+    {1686455268, 1329494133}, {1695120603, 1318427912},
+    {1703713325, 1307305214}, {1712233066, 1296126516},
+    {1720679461, 1284892296}, {1729052147, 1273603035},
+    {1737350766, 1262259218}, {1745574963, 1250861329},
+    {1753724386, 1239409858}, {1761798685, 1227905295},
+    {1769797514, 1216348132}, {1777720531, 1204738865},
+    {1785567396, 1193077991}, {1793337774, 1181366009},
+    {1801031331, 1169603422}, {1808647737, 1157790732},
+    {1816186668, 1145928447}, {1823647799, 1134017074},
+    {1831030811, 1122057124}, {1838335387, 1110049108},
+    {1845561216, 1097993542}, {1852707986, 1085890941},
+    {1859775393, 1073741824}, {1866763134, 1061546712},
+    {1873670908, 1049306126}, {1880498421, 1037020592},
+    {1887245379, 1024690635}, {1893911494, 1012316784},
+    {1900496480, 999899569}, {1907000055, 987439521},
+    {1913421941, 974937175}, {1919761862, 962393065},
+    {1926019547, 949807730}, {1932194727, 937181708},
+    {1938287139, 924515541}, {1944296521, 911809770},
+    {1950222616, 899064940}, {1956065170, 886281598},
+    {1961823932, 873460290}, {1967498656, 860601566},
+    {1973089100, 847705977}, {1978595022, 834774075},
+    {1984016189, 821806413}, {1989352366, 808803549},
+    {1994603327, 795766038}, {1999768845, 782694439},
+    {2004848700, 769589312}, {2009842674, 756451218},
+    {2014750553, 743280720}, {2019572126, 730078383},
+    {2024307188, 716844772}, {2028955535, 703580453},
+    {2033516969, 690285996}, {2037991293, 676961968},
+    {2042378317, 663608942}, {2046677852, 650227490},
+    {2050889714, 636818183}, {2055013723, 623381598},
+    {2059049702, 609918309}, {2062997478, 596428893},
+    {2066856882, 582913927}, {2070627749, 569373992},
+    {2074309917, 555809667}, {2077903229, 542221533},
+    {2081407530, 528610172}, {2084822670, 514976167},
+    {2088148504, 501320102}, {2091384888, 487642562},
+    {2094531684, 473944133}, {2097588758, 460225402},
+    {2100555978, 446486956}, {2103433217, 432729385},
+    {2106220352, 418953276}, {2108917263, 405159222},
+    {2111523836, 391347811}, {2114039958, 377519637},
+    {2116465521, 363675290}, {2118800422, 349815365},
+    {2121044561, 335940456}, {2123197841, 322051155},
+    {2125260170, 308148059}, {2127231461, 294231763},
+    {2129111628, 280302863}, {2130900591, 266361956},
+    {2132598273, 252409639}, {2134204601, 238446509},
+    {2135719508, 224473166}, {2137142927, 210490206},
+    {2138474799, 196498230}, {2139715065, 182497836},
+    {2140863673, 168489625}, {2141920573, 154474196},
+    {2142885721, 140452151}, {2143759074, 126424088},
+    {2144540596, 112390610}, {2145230253, 98352318},
+    {2145828016, 84309812}, {2146333858, 70263695},
+    {2146747759, 56214568}, {2147069700, 42163034},
+    {2147299668, 28109692}, {2147437652, 14055147},
 };
-#ifndef FFT_BITREV960
-#define FFT_BITREV960
+#  ifndef FFT_BITREV960
+#   define FFT_BITREV960
 static const oac_int16 fft_bitrev960[960] = {
-0, 192, 384, 576, 768, 64, 256, 448, 640, 832, 128, 320, 512, 704, 896,
-16, 208, 400, 592, 784, 80, 272, 464, 656, 848, 144, 336, 528, 720, 912,
-32, 224, 416, 608, 800, 96, 288, 480, 672, 864, 160, 352, 544, 736, 928,
-48, 240, 432, 624, 816, 112, 304, 496, 688, 880, 176, 368, 560, 752, 944,
-4, 196, 388, 580, 772, 68, 260, 452, 644, 836, 132, 324, 516, 708, 900,
-20, 212, 404, 596, 788, 84, 276, 468, 660, 852, 148, 340, 532, 724, 916,
-36, 228, 420, 612, 804, 100, 292, 484, 676, 868, 164, 356, 548, 740, 932,
-52, 244, 436, 628, 820, 116, 308, 500, 692, 884, 180, 372, 564, 756, 948,
-8, 200, 392, 584, 776, 72, 264, 456, 648, 840, 136, 328, 520, 712, 904,
-24, 216, 408, 600, 792, 88, 280, 472, 664, 856, 152, 344, 536, 728, 920,
-40, 232, 424, 616, 808, 104, 296, 488, 680, 872, 168, 360, 552, 744, 936,
-56, 248, 440, 632, 824, 120, 312, 504, 696, 888, 184, 376, 568, 760, 952,
-12, 204, 396, 588, 780, 76, 268, 460, 652, 844, 140, 332, 524, 716, 908,
-28, 220, 412, 604, 796, 92, 284, 476, 668, 860, 156, 348, 540, 732, 924,
-44, 236, 428, 620, 812, 108, 300, 492, 684, 876, 172, 364, 556, 748, 940,
-60, 252, 444, 636, 828, 124, 316, 508, 700, 892, 188, 380, 572, 764, 956,
-1, 193, 385, 577, 769, 65, 257, 449, 641, 833, 129, 321, 513, 705, 897,
-17, 209, 401, 593, 785, 81, 273, 465, 657, 849, 145, 337, 529, 721, 913,
-33, 225, 417, 609, 801, 97, 289, 481, 673, 865, 161, 353, 545, 737, 929,
-49, 241, 433, 625, 817, 113, 305, 497, 689, 881, 177, 369, 561, 753, 945,
-5, 197, 389, 581, 773, 69, 261, 453, 645, 837, 133, 325, 517, 709, 901,
-21, 213, 405, 597, 789, 85, 277, 469, 661, 853, 149, 341, 533, 725, 917,
-37, 229, 421, 613, 805, 101, 293, 485, 677, 869, 165, 357, 549, 741, 933,
-53, 245, 437, 629, 821, 117, 309, 501, 693, 885, 181, 373, 565, 757, 949,
-9, 201, 393, 585, 777, 73, 265, 457, 649, 841, 137, 329, 521, 713, 905,
-25, 217, 409, 601, 793, 89, 281, 473, 665, 857, 153, 345, 537, 729, 921,
-41, 233, 425, 617, 809, 105, 297, 489, 681, 873, 169, 361, 553, 745, 937,
-57, 249, 441, 633, 825, 121, 313, 505, 697, 889, 185, 377, 569, 761, 953,
-13, 205, 397, 589, 781, 77, 269, 461, 653, 845, 141, 333, 525, 717, 909,
-29, 221, 413, 605, 797, 93, 285, 477, 669, 861, 157, 349, 541, 733, 925,
-45, 237, 429, 621, 813, 109, 301, 493, 685, 877, 173, 365, 557, 749, 941,
-61, 253, 445, 637, 829, 125, 317, 509, 701, 893, 189, 381, 573, 765, 957,
-2, 194, 386, 578, 770, 66, 258, 450, 642, 834, 130, 322, 514, 706, 898,
-18, 210, 402, 594, 786, 82, 274, 466, 658, 850, 146, 338, 530, 722, 914,
-34, 226, 418, 610, 802, 98, 290, 482, 674, 866, 162, 354, 546, 738, 930,
-50, 242, 434, 626, 818, 114, 306, 498, 690, 882, 178, 370, 562, 754, 946,
-6, 198, 390, 582, 774, 70, 262, 454, 646, 838, 134, 326, 518, 710, 902,
-22, 214, 406, 598, 790, 86, 278, 470, 662, 854, 150, 342, 534, 726, 918,
-38, 230, 422, 614, 806, 102, 294, 486, 678, 870, 166, 358, 550, 742, 934,
-54, 246, 438, 630, 822, 118, 310, 502, 694, 886, 182, 374, 566, 758, 950,
-10, 202, 394, 586, 778, 74, 266, 458, 650, 842, 138, 330, 522, 714, 906,
-26, 218, 410, 602, 794, 90, 282, 474, 666, 858, 154, 346, 538, 730, 922,
-42, 234, 426, 618, 810, 106, 298, 490, 682, 874, 170, 362, 554, 746, 938,
-58, 250, 442, 634, 826, 122, 314, 506, 698, 890, 186, 378, 570, 762, 954,
-14, 206, 398, 590, 782, 78, 270, 462, 654, 846, 142, 334, 526, 718, 910,
-30, 222, 414, 606, 798, 94, 286, 478, 670, 862, 158, 350, 542, 734, 926,
-46, 238, 430, 622, 814, 110, 302, 494, 686, 878, 174, 366, 558, 750, 942,
-62, 254, 446, 638, 830, 126, 318, 510, 702, 894, 190, 382, 574, 766, 958,
-3, 195, 387, 579, 771, 67, 259, 451, 643, 835, 131, 323, 515, 707, 899,
-19, 211, 403, 595, 787, 83, 275, 467, 659, 851, 147, 339, 531, 723, 915,
-35, 227, 419, 611, 803, 99, 291, 483, 675, 867, 163, 355, 547, 739, 931,
-51, 243, 435, 627, 819, 115, 307, 499, 691, 883, 179, 371, 563, 755, 947,
-7, 199, 391, 583, 775, 71, 263, 455, 647, 839, 135, 327, 519, 711, 903,
-23, 215, 407, 599, 791, 87, 279, 471, 663, 855, 151, 343, 535, 727, 919,
-39, 231, 423, 615, 807, 103, 295, 487, 679, 871, 167, 359, 551, 743, 935,
-55, 247, 439, 631, 823, 119, 311, 503, 695, 887, 183, 375, 567, 759, 951,
-11, 203, 395, 587, 779, 75, 267, 459, 651, 843, 139, 331, 523, 715, 907,
-27, 219, 411, 603, 795, 91, 283, 475, 667, 859, 155, 347, 539, 731, 923,
-43, 235, 427, 619, 811, 107, 299, 491, 683, 875, 171, 363, 555, 747, 939,
-59, 251, 443, 635, 827, 123, 315, 507, 699, 891, 187, 379, 571, 763, 955,
-15, 207, 399, 591, 783, 79, 271, 463, 655, 847, 143, 335, 527, 719, 911,
-31, 223, 415, 607, 799, 95, 287, 479, 671, 863, 159, 351, 543, 735, 927,
-47, 239, 431, 623, 815, 111, 303, 495, 687, 879, 175, 367, 559, 751, 943,
-63, 255, 447, 639, 831, 127, 319, 511, 703, 895, 191, 383, 575, 767, 959,
+    0, 192, 384, 576, 768, 64, 256, 448, 640, 832, 128, 320, 512, 704, 896,
+    16, 208, 400, 592, 784, 80, 272, 464, 656, 848, 144, 336, 528, 720, 912,
+    32, 224, 416, 608, 800, 96, 288, 480, 672, 864, 160, 352, 544, 736, 928,
+    48, 240, 432, 624, 816, 112, 304, 496, 688, 880, 176, 368, 560, 752, 944,
+    4, 196, 388, 580, 772, 68, 260, 452, 644, 836, 132, 324, 516, 708, 900,
+    20, 212, 404, 596, 788, 84, 276, 468, 660, 852, 148, 340, 532, 724, 916,
+    36, 228, 420, 612, 804, 100, 292, 484, 676, 868, 164, 356, 548, 740, 932,
+    52, 244, 436, 628, 820, 116, 308, 500, 692, 884, 180, 372, 564, 756, 948,
+    8, 200, 392, 584, 776, 72, 264, 456, 648, 840, 136, 328, 520, 712, 904,
+    24, 216, 408, 600, 792, 88, 280, 472, 664, 856, 152, 344, 536, 728, 920,
+    40, 232, 424, 616, 808, 104, 296, 488, 680, 872, 168, 360, 552, 744, 936,
+    56, 248, 440, 632, 824, 120, 312, 504, 696, 888, 184, 376, 568, 760, 952,
+    12, 204, 396, 588, 780, 76, 268, 460, 652, 844, 140, 332, 524, 716, 908,
+    28, 220, 412, 604, 796, 92, 284, 476, 668, 860, 156, 348, 540, 732, 924,
+    44, 236, 428, 620, 812, 108, 300, 492, 684, 876, 172, 364, 556, 748, 940,
+    60, 252, 444, 636, 828, 124, 316, 508, 700, 892, 188, 380, 572, 764, 956,
+    1, 193, 385, 577, 769, 65, 257, 449, 641, 833, 129, 321, 513, 705, 897,
+    17, 209, 401, 593, 785, 81, 273, 465, 657, 849, 145, 337, 529, 721, 913,
+    33, 225, 417, 609, 801, 97, 289, 481, 673, 865, 161, 353, 545, 737, 929,
+    49, 241, 433, 625, 817, 113, 305, 497, 689, 881, 177, 369, 561, 753, 945,
+    5, 197, 389, 581, 773, 69, 261, 453, 645, 837, 133, 325, 517, 709, 901,
+    21, 213, 405, 597, 789, 85, 277, 469, 661, 853, 149, 341, 533, 725, 917,
+    37, 229, 421, 613, 805, 101, 293, 485, 677, 869, 165, 357, 549, 741, 933,
+    53, 245, 437, 629, 821, 117, 309, 501, 693, 885, 181, 373, 565, 757, 949,
+    9, 201, 393, 585, 777, 73, 265, 457, 649, 841, 137, 329, 521, 713, 905,
+    25, 217, 409, 601, 793, 89, 281, 473, 665, 857, 153, 345, 537, 729, 921,
+    41, 233, 425, 617, 809, 105, 297, 489, 681, 873, 169, 361, 553, 745, 937,
+    57, 249, 441, 633, 825, 121, 313, 505, 697, 889, 185, 377, 569, 761, 953,
+    13, 205, 397, 589, 781, 77, 269, 461, 653, 845, 141, 333, 525, 717, 909,
+    29, 221, 413, 605, 797, 93, 285, 477, 669, 861, 157, 349, 541, 733, 925,
+    45, 237, 429, 621, 813, 109, 301, 493, 685, 877, 173, 365, 557, 749, 941,
+    61, 253, 445, 637, 829, 125, 317, 509, 701, 893, 189, 381, 573, 765, 957,
+    2, 194, 386, 578, 770, 66, 258, 450, 642, 834, 130, 322, 514, 706, 898,
+    18, 210, 402, 594, 786, 82, 274, 466, 658, 850, 146, 338, 530, 722, 914,
+    34, 226, 418, 610, 802, 98, 290, 482, 674, 866, 162, 354, 546, 738, 930,
+    50, 242, 434, 626, 818, 114, 306, 498, 690, 882, 178, 370, 562, 754, 946,
+    6, 198, 390, 582, 774, 70, 262, 454, 646, 838, 134, 326, 518, 710, 902,
+    22, 214, 406, 598, 790, 86, 278, 470, 662, 854, 150, 342, 534, 726, 918,
+    38, 230, 422, 614, 806, 102, 294, 486, 678, 870, 166, 358, 550, 742, 934,
+    54, 246, 438, 630, 822, 118, 310, 502, 694, 886, 182, 374, 566, 758, 950,
+    10, 202, 394, 586, 778, 74, 266, 458, 650, 842, 138, 330, 522, 714, 906,
+    26, 218, 410, 602, 794, 90, 282, 474, 666, 858, 154, 346, 538, 730, 922,
+    42, 234, 426, 618, 810, 106, 298, 490, 682, 874, 170, 362, 554, 746, 938,
+    58, 250, 442, 634, 826, 122, 314, 506, 698, 890, 186, 378, 570, 762, 954,
+    14, 206, 398, 590, 782, 78, 270, 462, 654, 846, 142, 334, 526, 718, 910,
+    30, 222, 414, 606, 798, 94, 286, 478, 670, 862, 158, 350, 542, 734, 926,
+    46, 238, 430, 622, 814, 110, 302, 494, 686, 878, 174, 366, 558, 750, 942,
+    62, 254, 446, 638, 830, 126, 318, 510, 702, 894, 190, 382, 574, 766, 958,
+    3, 195, 387, 579, 771, 67, 259, 451, 643, 835, 131, 323, 515, 707, 899,
+    19, 211, 403, 595, 787, 83, 275, 467, 659, 851, 147, 339, 531, 723, 915,
+    35, 227, 419, 611, 803, 99, 291, 483, 675, 867, 163, 355, 547, 739, 931,
+    51, 243, 435, 627, 819, 115, 307, 499, 691, 883, 179, 371, 563, 755, 947,
+    7, 199, 391, 583, 775, 71, 263, 455, 647, 839, 135, 327, 519, 711, 903,
+    23, 215, 407, 599, 791, 87, 279, 471, 663, 855, 151, 343, 535, 727, 919,
+    39, 231, 423, 615, 807, 103, 295, 487, 679, 871, 167, 359, 551, 743, 935,
+    55, 247, 439, 631, 823, 119, 311, 503, 695, 887, 183, 375, 567, 759, 951,
+    11, 203, 395, 587, 779, 75, 267, 459, 651, 843, 139, 331, 523, 715, 907,
+    27, 219, 411, 603, 795, 91, 283, 475, 667, 859, 155, 347, 539, 731, 923,
+    43, 235, 427, 619, 811, 107, 299, 491, 683, 875, 171, 363, 555, 747, 939,
+    59, 251, 443, 635, 827, 123, 315, 507, 699, 891, 187, 379, 571, 763, 955,
+    15, 207, 399, 591, 783, 79, 271, 463, 655, 847, 143, 335, 527, 719, 911,
+    31, 223, 415, 607, 799, 95, 287, 479, 671, 863, 159, 351, 543, 735, 927,
+    47, 239, 431, 623, 815, 111, 303, 495, 687, 879, 175, 367, 559, 751, 943,
+    63, 255, 447, 639, 831, 127, 319, 511, 703, 895, 191, 383, 575, 767, 959,
 };
-#endif
+#  endif
 
-#ifndef FFT_BITREV480
-#define FFT_BITREV480
+#  ifndef FFT_BITREV480
+#   define FFT_BITREV480
 static const oac_int16 fft_bitrev480[480] = {
-0, 96, 192, 288, 384, 32, 128, 224, 320, 416, 64, 160, 256, 352, 448,
-8, 104, 200, 296, 392, 40, 136, 232, 328, 424, 72, 168, 264, 360, 456,
-16, 112, 208, 304, 400, 48, 144, 240, 336, 432, 80, 176, 272, 368, 464,
-24, 120, 216, 312, 408, 56, 152, 248, 344, 440, 88, 184, 280, 376, 472,
-4, 100, 196, 292, 388, 36, 132, 228, 324, 420, 68, 164, 260, 356, 452,
-12, 108, 204, 300, 396, 44, 140, 236, 332, 428, 76, 172, 268, 364, 460,
-20, 116, 212, 308, 404, 52, 148, 244, 340, 436, 84, 180, 276, 372, 468,
-28, 124, 220, 316, 412, 60, 156, 252, 348, 444, 92, 188, 284, 380, 476,
-1, 97, 193, 289, 385, 33, 129, 225, 321, 417, 65, 161, 257, 353, 449,
-9, 105, 201, 297, 393, 41, 137, 233, 329, 425, 73, 169, 265, 361, 457,
-17, 113, 209, 305, 401, 49, 145, 241, 337, 433, 81, 177, 273, 369, 465,
-25, 121, 217, 313, 409, 57, 153, 249, 345, 441, 89, 185, 281, 377, 473,
-5, 101, 197, 293, 389, 37, 133, 229, 325, 421, 69, 165, 261, 357, 453,
-13, 109, 205, 301, 397, 45, 141, 237, 333, 429, 77, 173, 269, 365, 461,
-21, 117, 213, 309, 405, 53, 149, 245, 341, 437, 85, 181, 277, 373, 469,
-29, 125, 221, 317, 413, 61, 157, 253, 349, 445, 93, 189, 285, 381, 477,
-2, 98, 194, 290, 386, 34, 130, 226, 322, 418, 66, 162, 258, 354, 450,
-10, 106, 202, 298, 394, 42, 138, 234, 330, 426, 74, 170, 266, 362, 458,
-18, 114, 210, 306, 402, 50, 146, 242, 338, 434, 82, 178, 274, 370, 466,
-26, 122, 218, 314, 410, 58, 154, 250, 346, 442, 90, 186, 282, 378, 474,
-6, 102, 198, 294, 390, 38, 134, 230, 326, 422, 70, 166, 262, 358, 454,
-14, 110, 206, 302, 398, 46, 142, 238, 334, 430, 78, 174, 270, 366, 462,
-22, 118, 214, 310, 406, 54, 150, 246, 342, 438, 86, 182, 278, 374, 470,
-30, 126, 222, 318, 414, 62, 158, 254, 350, 446, 94, 190, 286, 382, 478,
-3, 99, 195, 291, 387, 35, 131, 227, 323, 419, 67, 163, 259, 355, 451,
-11, 107, 203, 299, 395, 43, 139, 235, 331, 427, 75, 171, 267, 363, 459,
-19, 115, 211, 307, 403, 51, 147, 243, 339, 435, 83, 179, 275, 371, 467,
-27, 123, 219, 315, 411, 59, 155, 251, 347, 443, 91, 187, 283, 379, 475,
-7, 103, 199, 295, 391, 39, 135, 231, 327, 423, 71, 167, 263, 359, 455,
-15, 111, 207, 303, 399, 47, 143, 239, 335, 431, 79, 175, 271, 367, 463,
-23, 119, 215, 311, 407, 55, 151, 247, 343, 439, 87, 183, 279, 375, 471,
-31, 127, 223, 319, 415, 63, 159, 255, 351, 447, 95, 191, 287, 383, 479,
+    0, 96, 192, 288, 384, 32, 128, 224, 320, 416, 64, 160, 256, 352, 448,
+    8, 104, 200, 296, 392, 40, 136, 232, 328, 424, 72, 168, 264, 360, 456,
+    16, 112, 208, 304, 400, 48, 144, 240, 336, 432, 80, 176, 272, 368, 464,
+    24, 120, 216, 312, 408, 56, 152, 248, 344, 440, 88, 184, 280, 376, 472,
+    4, 100, 196, 292, 388, 36, 132, 228, 324, 420, 68, 164, 260, 356, 452,
+    12, 108, 204, 300, 396, 44, 140, 236, 332, 428, 76, 172, 268, 364, 460,
+    20, 116, 212, 308, 404, 52, 148, 244, 340, 436, 84, 180, 276, 372, 468,
+    28, 124, 220, 316, 412, 60, 156, 252, 348, 444, 92, 188, 284, 380, 476,
+    1, 97, 193, 289, 385, 33, 129, 225, 321, 417, 65, 161, 257, 353, 449,
+    9, 105, 201, 297, 393, 41, 137, 233, 329, 425, 73, 169, 265, 361, 457,
+    17, 113, 209, 305, 401, 49, 145, 241, 337, 433, 81, 177, 273, 369, 465,
+    25, 121, 217, 313, 409, 57, 153, 249, 345, 441, 89, 185, 281, 377, 473,
+    5, 101, 197, 293, 389, 37, 133, 229, 325, 421, 69, 165, 261, 357, 453,
+    13, 109, 205, 301, 397, 45, 141, 237, 333, 429, 77, 173, 269, 365, 461,
+    21, 117, 213, 309, 405, 53, 149, 245, 341, 437, 85, 181, 277, 373, 469,
+    29, 125, 221, 317, 413, 61, 157, 253, 349, 445, 93, 189, 285, 381, 477,
+    2, 98, 194, 290, 386, 34, 130, 226, 322, 418, 66, 162, 258, 354, 450,
+    10, 106, 202, 298, 394, 42, 138, 234, 330, 426, 74, 170, 266, 362, 458,
+    18, 114, 210, 306, 402, 50, 146, 242, 338, 434, 82, 178, 274, 370, 466,
+    26, 122, 218, 314, 410, 58, 154, 250, 346, 442, 90, 186, 282, 378, 474,
+    6, 102, 198, 294, 390, 38, 134, 230, 326, 422, 70, 166, 262, 358, 454,
+    14, 110, 206, 302, 398, 46, 142, 238, 334, 430, 78, 174, 270, 366, 462,
+    22, 118, 214, 310, 406, 54, 150, 246, 342, 438, 86, 182, 278, 374, 470,
+    30, 126, 222, 318, 414, 62, 158, 254, 350, 446, 94, 190, 286, 382, 478,
+    3, 99, 195, 291, 387, 35, 131, 227, 323, 419, 67, 163, 259, 355, 451,
+    11, 107, 203, 299, 395, 43, 139, 235, 331, 427, 75, 171, 267, 363, 459,
+    19, 115, 211, 307, 403, 51, 147, 243, 339, 435, 83, 179, 275, 371, 467,
+    27, 123, 219, 315, 411, 59, 155, 251, 347, 443, 91, 187, 283, 379, 475,
+    7, 103, 199, 295, 391, 39, 135, 231, 327, 423, 71, 167, 263, 359, 455,
+    15, 111, 207, 303, 399, 47, 143, 239, 335, 431, 79, 175, 271, 367, 463,
+    23, 119, 215, 311, 407, 55, 151, 247, 343, 439, 87, 183, 279, 375, 471,
+    31, 127, 223, 319, 415, 63, 159, 255, 351, 447, 95, 191, 287, 383, 479,
 };
-#endif
+#  endif
 
-#ifndef FFT_BITREV240
-#define FFT_BITREV240
+#  ifndef FFT_BITREV240
+#   define FFT_BITREV240
 static const oac_int16 fft_bitrev240[240] = {
-0, 48, 96, 144, 192, 16, 64, 112, 160, 208, 32, 80, 128, 176, 224,
-4, 52, 100, 148, 196, 20, 68, 116, 164, 212, 36, 84, 132, 180, 228,
-8, 56, 104, 152, 200, 24, 72, 120, 168, 216, 40, 88, 136, 184, 232,
-12, 60, 108, 156, 204, 28, 76, 124, 172, 220, 44, 92, 140, 188, 236,
-1, 49, 97, 145, 193, 17, 65, 113, 161, 209, 33, 81, 129, 177, 225,
-5, 53, 101, 149, 197, 21, 69, 117, 165, 213, 37, 85, 133, 181, 229,
-9, 57, 105, 153, 201, 25, 73, 121, 169, 217, 41, 89, 137, 185, 233,
-13, 61, 109, 157, 205, 29, 77, 125, 173, 221, 45, 93, 141, 189, 237,
-2, 50, 98, 146, 194, 18, 66, 114, 162, 210, 34, 82, 130, 178, 226,
-6, 54, 102, 150, 198, 22, 70, 118, 166, 214, 38, 86, 134, 182, 230,
-10, 58, 106, 154, 202, 26, 74, 122, 170, 218, 42, 90, 138, 186, 234,
-14, 62, 110, 158, 206, 30, 78, 126, 174, 222, 46, 94, 142, 190, 238,
-3, 51, 99, 147, 195, 19, 67, 115, 163, 211, 35, 83, 131, 179, 227,
-7, 55, 103, 151, 199, 23, 71, 119, 167, 215, 39, 87, 135, 183, 231,
-11, 59, 107, 155, 203, 27, 75, 123, 171, 219, 43, 91, 139, 187, 235,
-15, 63, 111, 159, 207, 31, 79, 127, 175, 223, 47, 95, 143, 191, 239,
+    0, 48, 96, 144, 192, 16, 64, 112, 160, 208, 32, 80, 128, 176, 224,
+    4, 52, 100, 148, 196, 20, 68, 116, 164, 212, 36, 84, 132, 180, 228,
+    8, 56, 104, 152, 200, 24, 72, 120, 168, 216, 40, 88, 136, 184, 232,
+    12, 60, 108, 156, 204, 28, 76, 124, 172, 220, 44, 92, 140, 188, 236,
+    1, 49, 97, 145, 193, 17, 65, 113, 161, 209, 33, 81, 129, 177, 225,
+    5, 53, 101, 149, 197, 21, 69, 117, 165, 213, 37, 85, 133, 181, 229,
+    9, 57, 105, 153, 201, 25, 73, 121, 169, 217, 41, 89, 137, 185, 233,
+    13, 61, 109, 157, 205, 29, 77, 125, 173, 221, 45, 93, 141, 189, 237,
+    2, 50, 98, 146, 194, 18, 66, 114, 162, 210, 34, 82, 130, 178, 226,
+    6, 54, 102, 150, 198, 22, 70, 118, 166, 214, 38, 86, 134, 182, 230,
+    10, 58, 106, 154, 202, 26, 74, 122, 170, 218, 42, 90, 138, 186, 234,
+    14, 62, 110, 158, 206, 30, 78, 126, 174, 222, 46, 94, 142, 190, 238,
+    3, 51, 99, 147, 195, 19, 67, 115, 163, 211, 35, 83, 131, 179, 227,
+    7, 55, 103, 151, 199, 23, 71, 119, 167, 215, 39, 87, 135, 183, 231,
+    11, 59, 107, 155, 203, 27, 75, 123, 171, 219, 43, 91, 139, 187, 235,
+    15, 63, 111, 159, 207, 31, 79, 127, 175, 223, 47, 95, 143, 191, 239,
 };
-#endif
+#  endif
 
-#ifndef FFT_BITREV120
-#define FFT_BITREV120
+#  ifndef FFT_BITREV120
+#   define FFT_BITREV120
 static const oac_int16 fft_bitrev120[120] = {
-0, 24, 48, 72, 96, 8, 32, 56, 80, 104, 16, 40, 64, 88, 112,
-4, 28, 52, 76, 100, 12, 36, 60, 84, 108, 20, 44, 68, 92, 116,
-1, 25, 49, 73, 97, 9, 33, 57, 81, 105, 17, 41, 65, 89, 113,
-5, 29, 53, 77, 101, 13, 37, 61, 85, 109, 21, 45, 69, 93, 117,
-2, 26, 50, 74, 98, 10, 34, 58, 82, 106, 18, 42, 66, 90, 114,
-6, 30, 54, 78, 102, 14, 38, 62, 86, 110, 22, 46, 70, 94, 118,
-3, 27, 51, 75, 99, 11, 35, 59, 83, 107, 19, 43, 67, 91, 115,
-7, 31, 55, 79, 103, 15, 39, 63, 87, 111, 23, 47, 71, 95, 119,
+    0, 24, 48, 72, 96, 8, 32, 56, 80, 104, 16, 40, 64, 88, 112,
+    4, 28, 52, 76, 100, 12, 36, 60, 84, 108, 20, 44, 68, 92, 116,
+    1, 25, 49, 73, 97, 9, 33, 57, 81, 105, 17, 41, 65, 89, 113,
+    5, 29, 53, 77, 101, 13, 37, 61, 85, 109, 21, 45, 69, 93, 117,
+    2, 26, 50, 74, 98, 10, 34, 58, 82, 106, 18, 42, 66, 90, 114,
+    6, 30, 54, 78, 102, 14, 38, 62, 86, 110, 22, 46, 70, 94, 118,
+    3, 27, 51, 75, 99, 11, 35, 59, 83, 107, 19, 43, 67, 91, 115,
+    7, 31, 55, 79, 103, 15, 39, 63, 87, 111, 23, 47, 71, 95, 119,
 };
-#endif
+#  endif
 
-#ifndef FFT_STATE96000_1920_0
-#define FFT_STATE96000_1920_0
+#  ifndef FFT_STATE96000_1920_0
+#   define FFT_STATE96000_1920_0
 static const kiss_fft_state fft_state96000_1920_0 = {
-960,    /* nfft */
-572662306,    /* scale */
-9,    /* scale_shift */
--1,    /* shift */
-{5, 192, 3, 64, 4, 16, 4, 4, 4, 1, 0, 0, 0, 0, 0, 0, },    /* factors */
-fft_bitrev960,    /* bitrev */
-fft_twiddles96000_1920,    /* bitrev */
-#ifdef OVERRIDE_FFT
-(arch_fft_state *)&cfg_arch_960,
-#else
-NULL,
-#endif
+    960, /* nfft */
+    572662306, /* scale */
+    9, /* scale_shift */
+    -1, /* shift */
+    {5, 192, 3, 64, 4, 16, 4, 4, 4, 1, 0, 0, 0, 0, 0, 0, }, /* factors */
+    fft_bitrev960, /* bitrev */
+    fft_twiddles96000_1920, /* bitrev */
+#   ifdef OVERRIDE_FFT
+    (arch_fft_state *)&cfg_arch_960,
+#   else
+    NULL,
+#   endif
 };
-#endif
+#  endif
 
-#ifndef FFT_STATE96000_1920_1
-#define FFT_STATE96000_1920_1
+#  ifndef FFT_STATE96000_1920_1
+#   define FFT_STATE96000_1920_1
 static const kiss_fft_state fft_state96000_1920_1 = {
-480,    /* nfft */
-572662306,    /* scale */
-8,    /* scale_shift */
-1,    /* shift */
-{5, 96, 3, 32, 4, 8, 2, 4, 4, 1, 0, 0, 0, 0, 0, 0, },    /* factors */
-fft_bitrev480,    /* bitrev */
-fft_twiddles96000_1920,    /* bitrev */
-#ifdef OVERRIDE_FFT
-(arch_fft_state *)&cfg_arch_480,
-#else
-NULL,
-#endif
+    480, /* nfft */
+    572662306, /* scale */
+    8, /* scale_shift */
+    1, /* shift */
+    {5, 96, 3, 32, 4, 8, 2, 4, 4, 1, 0, 0, 0, 0, 0, 0, }, /* factors */
+    fft_bitrev480, /* bitrev */
+    fft_twiddles96000_1920, /* bitrev */
+#   ifdef OVERRIDE_FFT
+    (arch_fft_state *)&cfg_arch_480,
+#   else
+    NULL,
+#   endif
 };
-#endif
+#  endif
 
-#ifndef FFT_STATE96000_1920_2
-#define FFT_STATE96000_1920_2
+#  ifndef FFT_STATE96000_1920_2
+#   define FFT_STATE96000_1920_2
 static const kiss_fft_state fft_state96000_1920_2 = {
-240,    /* nfft */
-572662306,    /* scale */
-7,    /* scale_shift */
-2,    /* shift */
-{5, 48, 3, 16, 4, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, },    /* factors */
-fft_bitrev240,    /* bitrev */
-fft_twiddles96000_1920,    /* bitrev */
-#ifdef OVERRIDE_FFT
-(arch_fft_state *)&cfg_arch_240,
-#else
-NULL,
-#endif
+    240, /* nfft */
+    572662306, /* scale */
+    7, /* scale_shift */
+    2, /* shift */
+    {5, 48, 3, 16, 4, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, }, /* factors */
+    fft_bitrev240, /* bitrev */
+    fft_twiddles96000_1920, /* bitrev */
+#   ifdef OVERRIDE_FFT
+    (arch_fft_state *)&cfg_arch_240,
+#   else
+    NULL,
+#   endif
 };
-#endif
+#  endif
 
-#ifndef FFT_STATE96000_1920_3
-#define FFT_STATE96000_1920_3
+#  ifndef FFT_STATE96000_1920_3
+#   define FFT_STATE96000_1920_3
 static const kiss_fft_state fft_state96000_1920_3 = {
-120,    /* nfft */
-572662306,    /* scale */
-6,    /* scale_shift */
-3,    /* shift */
-{5, 24, 3, 8, 2, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, },    /* factors */
-fft_bitrev120,    /* bitrev */
-fft_twiddles96000_1920,    /* bitrev */
-#ifdef OVERRIDE_FFT
-(arch_fft_state *)&cfg_arch_120,
-#else
-NULL,
-#endif
+    120, /* nfft */
+    572662306, /* scale */
+    6, /* scale_shift */
+    3, /* shift */
+    {5, 24, 3, 8, 2, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, }, /* factors */
+    fft_bitrev120, /* bitrev */
+    fft_twiddles96000_1920, /* bitrev */
+#   ifdef OVERRIDE_FFT
+    (arch_fft_state *)&cfg_arch_120,
+#   else
+    NULL,
+#   endif
 };
-#endif
+#  endif
 
-#endif
+# endif
 
-#ifndef MDCT_TWIDDLES1920
-#define MDCT_TWIDDLES1920
+# ifndef MDCT_TWIDDLES1920
+#  define MDCT_TWIDDLES1920
 static const celt_coef mdct_twiddles1920[3600] = {
-2147483603, 2147480010, 2147470667, 2147455575, 2147434733,
-2147408142, 2147375802, 2147337712, 2147293874, 2147244286,
-2147188950, 2147127865, 2147061032, 2146988450, 2146910120,
-2146826042, 2146736216, 2146640643, 2146539323, 2146432256,
-2146319442, 2146200882, 2146076576, 2145946524, 2145810727,
-2145669185, 2145521898, 2145368867, 2145210092, 2145045574,
-2144875313, 2144699310, 2144517564, 2144330077, 2144136849,
-2143937880, 2143733172, 2143522724, 2143306537, 2143084612,
-2142856949, 2142623549, 2142384413, 2142139541, 2141888933,
-2141632592, 2141370516, 2141102708, 2140829167, 2140549894,
-2140264890, 2139974157, 2139677694, 2139375502, 2139067583,
-2138753936, 2138434564, 2138109466, 2137778644, 2137442099,
-2137099831, 2136751841, 2136398131, 2136038701, 2135673552,
-2135302685, 2134926101, 2134543801, 2134155787, 2133762059,
-2133362618, 2132957466, 2132546603, 2132130030, 2131707749,
-2131279761, 2130846067, 2130406668, 2129961565, 2129510759,
-2129054253, 2128592046, 2128124140, 2127650537, 2127171237,
-2126686242, 2126195553, 2125699172, 2125197100, 2124689338,
-2124175888, 2123656750, 2123131927, 2122601420, 2122065230,
-2121523358, 2120975806, 2120422576, 2119863669, 2119299086,
-2118728830, 2118152901, 2117571301, 2116984031, 2116391094,
-2115792491, 2115188222, 2114578291, 2113962699, 2113341447,
-2112714537, 2112081970, 2111443749, 2110799875, 2110150349,
-2109495174, 2108834352, 2108167883, 2107495770, 2106818015,
-2106134619, 2105445584, 2104750913, 2104050606, 2103344666,
-2102633095, 2101915895, 2101193067, 2100464614, 2099730537,
-2098990838, 2098245520, 2097494584, 2096738032, 2095975867,
-2095208091, 2094434705, 2093655711, 2092871112, 2092080910,
-2091285107, 2090483704, 2089676705, 2088864111, 2088045925,
-2087222148, 2086392783, 2085557833, 2084717298, 2083871182,
-2083019487, 2082162216, 2081299369, 2080430950, 2079556962,
-2078677406, 2077792284, 2076901600, 2076005355, 2075103552,
-2074196194, 2073283282, 2072364819, 2071440808, 2070511251,
-2069576151, 2068635510, 2067689330, 2066737615, 2065780367,
-2064817587, 2063849280, 2062875447, 2061896091, 2060911215,
-2059920821, 2058924912, 2057923491, 2056916560, 2055904122,
-2054886179, 2053862736, 2052833793, 2051799354, 2050759422,
-2049714000, 2048663090, 2047606695, 2046544818, 2045477461,
-2044404629, 2043326323, 2042242546, 2041153301, 2040058592,
-2038958421, 2037852791, 2036741705, 2035625166, 2034503177,
-2033375742, 2032242862, 2031104541, 2029960782, 2028811589,
-2027656964, 2026496910, 2025331431, 2024160529, 2022984208,
-2021802471, 2020615320, 2019422760, 2018224794, 2017021424,
-2015812654, 2014598487, 2013378926, 2012153975, 2010923636,
-2009687914, 2008446811, 2007200332, 2005948478, 2004691253,
-2003428662, 2002160707, 2000887391, 1999608718, 1998324692,
-1997035316, 1995740593, 1994440527, 1993135121, 1991824379,
-1990508304, 1989186900, 1987860170, 1986528118, 1985190748,
-1983848063, 1982500066, 1981146762, 1979788153, 1978424244,
-1977055038, 1975680539, 1974300751, 1972915676, 1971525320,
-1970129685, 1968728776, 1967322596, 1965911148, 1964494438,
-1963072467, 1961645241, 1960212764, 1958775038, 1957332067,
-1955883857, 1954430410, 1952971730, 1951507822, 1950038689,
-1948564335, 1947084764, 1945599980, 1944109987, 1942614790,
-1941114391, 1939608795, 1938098007, 1936582029, 1935060867,
-1933534524, 1932003004, 1930466312, 1928924452, 1927377427,
-1925825242, 1924267900, 1922705408, 1921137767, 1919564983,
-1917987059, 1916404001, 1914815812, 1913222496, 1911624058,
-1910020502, 1908411833, 1906798054, 1905179170, 1903555185,
-1901926103, 1900291930, 1898652669, 1897008325, 1895358902,
-1893704404, 1892044837, 1890380204, 1888710510, 1887035759,
-1885355956, 1883671105, 1881981211, 1880286279, 1878586312,
-1876881316, 1875171295, 1873456254, 1871736196, 1870011128,
-1868281053, 1866545976, 1864805901, 1863060834, 1861310779,
-1859555741, 1857795724, 1856030734, 1854260774, 1852485850,
-1850705966, 1848921127, 1847131338, 1845336604, 1843536929,
-1841732318, 1839922777, 1838108310, 1836288921, 1834464616,
-1832635400, 1830801277, 1828962253, 1827118332, 1825269519,
-1823415819, 1821557238, 1819693779, 1817825449, 1815952252,
-1814074193, 1812191278, 1810303510, 1808410896, 1806513440,
-1804611147, 1802704023, 1800792073, 1798875302, 1796953714,
-1795027315, 1793096111, 1791160105, 1789219305, 1787273714,
-1785323338, 1783368182, 1781408251, 1779443552, 1777474088,
-1775499865, 1773520888, 1771537164, 1769548696, 1767555491,
-1765557554, 1763554889, 1761547504, 1759535401, 1757518588,
-1755497070, 1753470852, 1751439939, 1749404337, 1747364051,
-1745319087, 1743269451, 1741215147, 1739156181, 1737092559,
-1735024287, 1732951369, 1730873811, 1728791620, 1726704800,
-1724613357, 1722517297, 1720416625, 1718311347, 1716201468,
-1714086995, 1711967933, 1709844287, 1707716063, 1705583268,
-1703445906, 1701303983, 1699157505, 1697006479, 1694850909,
-1692690801, 1690526161, 1688356996, 1686183310, 1684005110,
-1681822401, 1679635189, 1677443481, 1675247281, 1673046596,
-1670841433, 1668631795, 1666417691, 1664199124, 1661976103,
-1659748631, 1657516716, 1655280364, 1653039579, 1650794369,
-1648544739, 1646290696, 1644032245, 1641769393, 1639502145,
-1637230507, 1634954486, 1632674088, 1630389319, 1628100184,
-1625806691, 1623508845, 1621206653, 1618900119, 1616589252,
-1614274057, 1611954539, 1609630706, 1607302564, 1604970118,
-1602633375, 1600292342, 1597947024, 1595597428, 1593243560,
-1590885426, 1588523033, 1586156387, 1583785495, 1581410362,
-1579030995, 1576647401, 1574259586, 1571867556, 1569471317,
-1567070877, 1564666241, 1562257416, 1559844408, 1557427224,
-1555005871, 1552580354, 1550150681, 1547716857, 1545278889,
-1542836785, 1540390550, 1537940190, 1535485713, 1533027126,
-1530564434, 1528097644, 1525626762, 1523151797, 1520672753,
-1518189638, 1515702459, 1513211221, 1510715932, 1508216599,
-1505713227, 1503205824, 1500694397, 1498178952, 1495659496,
-1493136035, 1490608577, 1488077129, 1485541696, 1483002286,
-1480458905, 1477911561, 1475360260, 1472805009, 1470245815,
-1467682684, 1465115624, 1462544642, 1459969744, 1457390937,
-1454808228, 1452221624, 1449631133, 1447036760, 1444438513,
-1441836399, 1439230424, 1436620597, 1434006923, 1431389409,
-1428768064, 1426142893, 1423513904, 1420881104, 1418244500,
-1415604099, 1412959907, 1410311933, 1407660183, 1405004664,
-1402345384, 1399682349, 1397015567, 1394345044, 1391670789,
-1388992807, 1386311107, 1383625695, 1380936579, 1378243766,
-1375547262, 1372847076, 1370143215, 1367435685, 1364724494,
-1362009649, 1359291158, 1356569027, 1353843265, 1351113878,
-1348380873, 1345644259, 1342904042, 1340160229, 1337412829,
-1334661848, 1331907293, 1329149173, 1326387494, 1323622264,
-1320853490, 1318081180, 1315305341, 1312525981, 1309743106,
-1306956725, 1304166845, 1301373473, 1298576617, 1295776285,
-1292972483, 1290165219, 1287354501, 1284540337, 1281722734,
-1278901699, 1276077240, 1273249364, 1270418080, 1267583394,
-1264745315, 1261903850, 1259059006, 1256210791, 1253359213,
-1250504279, 1247645998, 1244784376, 1241919421, 1239051142,
-1236179545, 1233304638, 1230426430, 1227544927, 1224660138,
-1221772070, 1218880731, 1215986128, 1213088271, 1210187165,
-1207282819, 1204375241, 1201464439, 1198550419, 1195633191,
-1192712762, 1189789140, 1186862332, 1183932347, 1180999192,
-1178062875, 1175123404, 1172180786, 1169235031, 1166286145,
-1163334137, 1160379014, 1157420784, 1154459456, 1151495036,
-1148527534, 1145556957, 1142583313, 1139606610, 1136626856,
-1133644058, 1130658226, 1127669367, 1124677488, 1121682598,
-1118684705, 1115683818, 1112679943, 1109673089, 1106663264,
-1103650476, 1100634734, 1097616045, 1094594417, 1091569858,
-1088542378, 1085511982, 1082478681, 1079442481, 1076403392,
-1073361420, 1070316575, 1067268864, 1064218296, 1061164879,
-1058108621, 1055049529, 1051987613, 1048922881, 1045855340,
-1042784999, 1039711867, 1036635950, 1033557259, 1030475800,
-1027391582, 1024304614, 1021214903, 1018122458, 1015027288,
-1011929400, 1008828802, 1005725504, 1002619513, 999510838,
-996399486, 993285468, 990168789, 987049460, 983927488,
-980802882, 977675650, 974545800, 971413342, 968278282,
-965140630, 962000395, 958857583, 955712205, 952564267,
-949413780, 946260750, 943105188, 939947100, 936786495,
-933623383, 930457771, 927289668, 924119082, 920946022,
-917770497, 914592514, 911412082, 908229211, 905043908,
-901856182, 898666041, 895473494, 892278550, 889081217,
-885881504, 882679419, 879474970, 876268167, 873059018,
-869847532, 866633717, 863417581, 860199134, 856978384,
-853755339, 850530009, 847302402, 844072526, 840840390,
-837606003, 834369373, 831130510, 827889422, 824646117,
-821400604, 818152892, 814902989, 811650905, 808396648,
-805140227, 801881649, 798620925, 795358063, 792093072,
-788825960, 785556735, 782285408, 779011986, 775736479,
-772458895, 769179242, 765897531, 762613768, 759327964,
-756040127, 752750266, 749458390, 746164507, 742868626,
-739570757, 736270907, 732969086, 729665303, 726359567,
-723051885, 719742268, 716430724, 713117261, 709801890,
-706484618, 703165455, 699844409, 696521489, 693196705,
-689870064, 686541577, 683211252, 679879097, 676545122,
-673209336, 669871748, 666532366, 663191199, 659848257,
-656503549, 653157082, 649808867, 646458913, 643107227,
-639753820, 636398700, 633041876, 629683357, 626323153,
-622961271, 619597722, 616232514, 612865656, 609497157,
-606127026, 602755273, 599381905, 596006934, 592630366,
-589252212, 585872480, 582491179, 579108320, 575723909,
-572337957, 568950473, 565561466, 562170945, 558778918,
-555385395, 551990386, 548593898, 545195942, 541796526,
-538395660, 534993352, 531589612, 528184449, 524777871,
-521369889, 517960510, 514549745, 511137603, 507724092,
-504309221, 500893000, 497475439, 494056545, 490636329,
-487214799, 483791965, 480367835, 476942419, 473515727,
-470087766, 466658548, 463228079, 459796371, 456363431,
-452929270, 449493896, 446057319, 442619547, 439180590,
-435740458, 432299159, 428856702, 425413098, 421968354,
-418522481, 415075487, 411627382, 408178175, 404727875,
-401276491, 397824033, 394370510, 390915931, 387460306,
-384003643, 380545952, 377087242, 373627523, 370166803,
-366705093, 363242400, 359778735, 356314107, 352848525,
-349381998, 345914536, 342446148, 338976842, 335506630,
-332035519, 328563519, 325090639, 321616889, 318142278,
-314666815, 311190510, 307713372, 304235410, 300756633,
-297277051, 293796673, 290315508, 286833567, 283350857,
-279867389, 276383171, 272898214, 269412525, 265926116,
-262438995, 258951170, 255462653, 251973452, 248483576,
-244993035, 241501838, 238009994, 234517513, 231024404,
-227530677, 224036341, 220541404, 217045878, 213549770,
-210053090, 206555848, 203058053, 199559715, 196060842,
-192561444, 189061531, 185561111, 182060195, 178558791,
-175056909, 171554559, 168051749, 164548489, 161044789,
-157540658, 154036105, 150531139, 147025770, 143520008,
-140013862, 136507340, 133000453, 129493210, 125985621,
-122477694, 118969439, 115460866, 111951983, 108442801,
-104933329, 101423575, 97913550, 94403263, 90892723,
-87381940, 83870923, 80359681, 76848224, 73336562,
-69824703, 66312657, 62800433, 59288042, 55775491,
-52262792, 48749952, 45236982, 41723891, 38210688,
-34697383, 31183985, 27670503, 24156947, 20643327,
-17129651, 13615930, 10102172, 6588387, 3074584,
--439226, -3953036, -7466835, -10980614, -14494364,
--18008075, -21521738, -25035343, -28548881, -32062342,
--35575718, -39088999, -42602174, -46115236, -49628175,
--53140980, -56653643, -60166155, -63678505, -67190685,
--70702685, -74214496, -77726108, -81237512, -84748698,
--88259658, -91770381, -95280859, -98791081, -102301039,
--105810723, -109320124, -112829232, -116338038, -119846533,
--123354707, -126862550, -130370054, -133877209, -137384005,
--140890434, -144396485, -147902150, -151407418, -154912282,
--158416730, -161920755, -165424346, -168927494, -172430190,
--175932424, -179434187, -182935470, -186436263, -189936557,
--193436342, -196935610, -200434350, -203932553, -207430211,
--210927313, -214423851, -217919814, -221415194, -224909981,
--228404166, -231897740, -235390693, -238883015, -242374698,
--245865732, -249356108, -252845816, -256334847, -259823192,
--263310841, -266797785, -270284015, -273769522, -277254295,
--280738326, -284221606, -287704124, -291185873, -294666841,
--298147021, -301626403, -305104977, -308582734, -312059665,
--315535760, -319011011, -322485408, -325958941, -329431602,
--332903380, -336374268, -339844254, -343313331, -346781489,
--350248718, -353715010, -357180354, -360644742, -364108165,
--367570613, -371032077, -374492547, -377952015, -381410471,
--384867905, -388324310, -391779674, -395233990, -398687248,
--402139438, -405590552, -409040579, -412489512, -415937340,
--419384055, -422829646, -426274106, -429717424, -433159592,
--436600601, -440040440, -443479101, -446916575, -450352853,
--453787924, -457221781, -460654414, -464085813, -467515970,
--470944875, -474372519, -477798893, -481223988, -484647795,
--488070304, -491491506, -494911393, -498329954, -501747182,
--505163066, -508577597, -511990767, -515402566, -518812985,
--522222016, -525629648, -529035873, -532440681, -535844064,
--539246012, -542646517, -546045568, -549443158, -552839277,
--556233916, -559627065, -563018716, -566408860, -569797488,
--573184589, -576570157, -579954180, -583336651, -586717560,
--590096899, -593474657, -596850827, -600225398, -603598363,
--606969711, -610339435, -613707524, -617073971, -620438765,
--623801898, -627163361, -630523145, -633881241, -637237640,
--640592333, -643945310, -647296564, -650646085, -653993863,
--657339891, -660684159, -664026658, -667367379, -670706313,
--674043452, -677378786, -680712307, -684044005, -687373872,
--690701898, -694028075, -697352394, -700674846, -703995422,
--707314114, -710630911, -713945806, -717258790, -720569853,
--723878987, -727186183, -730491433, -733794726, -737096055,
--740395410, -743692783, -746988165, -750281547, -753572921,
--756862277, -760149606, -763434901, -766718151, -769999349,
--773278485, -776555551, -779830538, -783103437, -786374239,
--789642936, -792909519, -796173979, -799436307, -802696495,
--805954534, -809210416, -812464130, -815715670, -818965026,
--822212189, -825457150, -828699902, -831940435, -835178741,
--838414810, -841648635, -844880207, -848109516, -851336555,
--854561315, -857783787, -861003962, -864221832, -867437388,
--870650622, -873861525, -877070088, -880276304, -883480162,
--886681655, -889880774, -893077511, -896271856, -899463802,
--902653340, -905840461, -909025157, -912207419, -915387239,
--918564609, -921739519, -924911961, -928081927, -931249408,
--934414396, -937576882, -940736858, -943894315, -947049246,
--950201640, -953351491, -956498790, -959643527, -962785695,
--965925286, -969062291, -972196701, -975328508, -978457704,
--981584280, -984708228, -987829540, -990948208, -994064222,
--997177575, -1000288258, -1003396263, -1006501581, -1009604205,
--1012704126, -1015801336, -1018895826, -1021987588, -1025076613,
--1028162895, -1031246424, -1034327191, -1037405190, -1040480411,
--1043552847, -1046622488, -1049689328, -1052753357, -1055814567,
--1058872951, -1061928500, -1064981206, -1068031060, -1071078055,
--1074122183, -1077163435, -1080201802, -1083237278, -1086269854,
--1089299521, -1092326272, -1095350099, -1098370993, -1101388946,
--1104403951, -1107415998, -1110425081, -1113431191, -1116434320,
--1119434460, -1122431603, -1125425740, -1128416865, -1131404968,
--1134390043, -1137372080, -1140351072, -1143327011, -1146299889,
--1149269698, -1152236431, -1155200078, -1158160632, -1161118086,
--1164072431, -1167023660, -1169971764, -1172916735, -1175858567,
--1178797250, -1181732777, -1184665141, -1187594332, -1190520344,
--1193443169, -1196362799, -1199279225, -1202192441, -1205102438,
--1208009209, -1210912745, -1213813040, -1216710085, -1219603872,
--1222494394, -1225381643, -1228265611, -1231146291, -1234023675,
--1236897754, -1239768523, -1242635972, -1245500094, -1248360882,
--1251218327, -1254072422, -1256923160, -1259770533, -1262614533,
--1265455153, -1268292384, -1271126220, -1273956653, -1276783675,
--1279607279, -1282427457, -1285244201, -1288057504, -1290867359,
--1293673758, -1296476693, -1299276157, -1302072143, -1304864643,
--1307653649, -1310439154, -1313221151, -1315999631, -1318774589,
--1321546016, -1324313904, -1327078247, -1329839037, -1332596266,
--1335349928, -1338100015, -1340846519, -1343589433, -1346328751,
--1349064463, -1351796564, -1354525046, -1357249901, -1359971122,
--1362688702, -1365402634, -1368112911, -1370819524, -1373522468,
--1376221734, -1378917315, -1381609205, -1384297396, -1386981880,
--1389662652, -1392339702, -1395013025, -1397682613, -1400348459,
--1403010556, -1405668897, -1408323474, -1410974281, -1413621310,
--1416264555, -1418904007, -1421539661, -1424171509, -1426799544,
--1429423759, -1432044147, -1434660701, -1437273414, -1439882279,
--1442487289, -1445088437, -1447685717, -1450279120, -1452868640,
--1455454271, -1458036005, -1460613835, -1463187755, -1465757757,
--1468323835, -1470885982, -1473444191, -1475998456, -1478548768,
--1481095122, -1483637511, -1486175927, -1488710365, -1491240816,
--1493767276, -1496289736, -1498808190, -1501322631, -1503833053,
--1506339448, -1508841811, -1511340134, -1513834411, -1516324634,
--1518810798, -1521292896, -1523770921, -1526244866, -1528714725,
--1531180491, -1533642158, -1536099718, -1538553166, -1541002495,
--1543447698, -1545888769, -1548325701, -1550758488, -1553187123,
--1555611600, -1558031911, -1560448052, -1562860014, -1565267793,
--1567671380, -1570070771, -1572465958, -1574856935, -1577243696,
--1579626234, -1582004542, -1584378616, -1586748447, -1589114030,
--1591475359, -1593832427, -1596185227, -1598533754, -1600878002,
--1603217963, -1605553632, -1607885003, -1610212069, -1612534823,
--1614853261, -1617167375, -1619477159, -1621782608, -1624083714,
--1626380473, -1628672877, -1630960921, -1633244598, -1635523902,
--1637798828, -1640069368, -1642335518, -1644597271, -1646854620,
--1649107561, -1651356086, -1653600190, -1655839867, -1658075111,
--1660305916, -1662532275, -1664754184, -1666971635, -1669184624,
--1671393143, -1673597188, -1675796752, -1677991829, -1680182414,
--1682368500, -1684550083, -1686727155, -1688899711, -1691067746,
--1693231253, -1695390227, -1697544662, -1699694551, -1701839891,
--1703980674, -1706116895, -1708248548, -1710375628, -1712498128,
--1714616044, -1716729369, -1718838098, -1720942225, -1723041744,
--1725136651, -1727226938, -1729312602, -1731393635, -1733470033,
--1735541790, -1737608901, -1739671359, -1741729160, -1743782298,
--1745830767, -1747874561, -1749913677, -1751948107, -1753977847,
--1756002891, -1758023233, -1760038869, -1762049792, -1764055998,
--1766057481, -1768054236, -1770046258, -1772033540, -1774016078,
--1775993866, -1777966900, -1779935173, -1781898681, -1783857419,
--1785811380, -1787760560, -1789704954, -1791644556, -1793579362,
--1795509366, -1797434562, -1799354946, -1801270513, -1803181257,
--1805087174, -1806988258, -1808884503, -1810775906, -1812662462,
--1814544164, -1816421007, -1818292988, -1820160101, -1822022340,
--1823879702, -1825732180, -1827579771, -1829422468, -1831260267,
--1833093164, -1834921153, -1836744229, -1838562388, -1840375624,
--1842183933, -1843987310, -1845785751, -1847579249, -1849367801,
--1851151401, -1852930046, -1854703729, -1856472447, -1858236195,
--1859994968, -1861748761, -1863497569, -1865241388, -1866980214,
--1868714041, -1870442864, -1872166681, -1873885484, -1875599271,
--1877308036, -1879011776, -1880710484, -1882404157, -1884092791,
--1885776380, -1887454920, -1889128407, -1890796837, -1892460204,
--1894118504, -1895771734, -1897419887, -1899062961, -1900700951,
--1902333851, -1903961659, -1905584369, -1907201977, -1908814479,
--1910421871, -1912024148, -1913621306, -1915213340, -1916800247,
--1918382022, -1919958661, -1921530159, -1923096514, -1924657719,
--1926213771, -1927764667, -1929310401, -1930850970, -1932386369,
--1933916595, -1935441643, -1936961510, -1938476190, -1939985681,
--1941489978, -1942989077, -1944482974, -1945971664, -1947455145,
--1948933412, -1950406461, -1951874289, -1953336890, -1954794262,
--1956246401, -1957693301, -1959134961, -1960571375, -1962002540,
--1963428453, -1964849109, -1966264504, -1967674635, -1969079498,
--1970479089, -1971873404, -1973262440, -1974646194, -1976024660,
--1977397836, -1978765718, -1980128302, -1981485585, -1982837563,
--1984184232, -1985525589, -1986861630, -1988192351, -1989517750,
--1990837822, -1992152564, -1993461973, -1994766044, -1996064775,
--1997358161, -1998646200, -1999928888, -2001206222, -2002478198,
--2003744813, -2005006063, -2006261945, -2007512455, -2008757591,
--2009997349, -2011231726, -2012460718, -2013684322, -2014902534,
--2016115352, -2017322773, -2018524792, -2019721407, -2020912615,
--2022098413, -2023278796, -2024453763, -2025623309, -2026787432,
--2027946129, -2029099397, -2030247232, -2031389631, -2032526592,
--2033658111, -2034784185, -2035904812, -2037019988, -2038129710,
--2039233976, -2040332782, -2041426125, -2042514003, -2043596412,
--2044673350, -2045744814, -2046810801, -2047871308, -2048926332,
--2049975870, -2051019920, -2052058479, -2053091544, -2054119112,
--2055141181, -2056157747, -2057168809, -2058174363, -2059174406,
--2060168936, -2061157951, -2062141448, -2063119423, -2064091875,
--2065058800, -2066020197, -2066976063, -2067926394, -2068871190,
--2069810446, -2070744160, -2071672331, -2072594955, -2073512030,
--2074423554, -2075329524, -2076229937, -2077124792, -2078014086,
--2078897817, -2079775981, -2080648577, -2081515603, -2082377056,
--2083232934, -2084083234, -2084927955, -2085767094, -2086600648,
--2087428616, -2088250996, -2089067784, -2089878979, -2090684580,
--2091484582, -2092278986, -2093067787, -2093850985, -2094628577,
--2095400561, -2096166935, -2096927697, -2097682844, -2098432376,
--2099176290, -2099914583, -2100647254, -2101374302, -2102095723,
--2102811516, -2103521679, -2104226211, -2104925109, -2105618372,
--2106305997, -2106987983, -2107664327, -2108335029, -2109000087,
--2109659498, -2110313260, -2110961373, -2111603834, -2112240642,
--2112871795, -2113497290, -2114117128, -2114731305, -2115339820,
--2115942673, -2116539860, -2117131380, -2117717232, -2118297415,
--2118871926, -2119440764, -2120003928, -2120561416, -2121113227,
--2121659358, -2122199810, -2122734579, -2123263666, -2123787068,
--2124304784, -2124816812, -2125323152, -2125823801, -2126318759,
--2126808025, -2127291596, -2127769472, -2128241651, -2128708132,
--2129168914, -2129623995, -2130073375, -2130517052, -2130955025,
--2131387293, -2131813854, -2132234708, -2132649854, -2133059289,
--2133463014, -2133861027, -2134253326, -2134639912, -2135020783,
--2135395937, -2135765375, -2136129094, -2136487095, -2136839375,
--2137185934, -2137526772, -2137861886, -2138191277, -2138514944,
--2138832885, -2139145099, -2139451587, -2139752346, -2140047377,
--2140336678, -2140620249, -2140898089, -2141170197, -2141436573,
--2141697215, -2141952123, -2142201296, -2142444735, -2142682437,
--2142914403, -2143140631, -2143361122, -2143575874, -2143784887,
--2143988161, -2144185694, -2144377487, -2144563539, -2144743849,
--2144918417, -2145087242, -2145250325, -2145407663, -2145559258,
--2145705109, -2145845215, -2145979576, -2146108191, -2146231061,
--2146348185, -2146459562, -2146565192, -2146665076, -2146759212,
--2146847600, -2146930241, -2147007134, -2147078279, -2147143675,
--2147203323, -2147257222, -2147305372, -2147347773, -2147384426,
--2147415329, -2147440482, -2147459887, -2147473542, -2147481447,
-2147483468, 2147469095, 2147431723, 2147371355, 2147287990,
-2147181629, 2147052273, 2146899924, 2146724584, 2146526254,
-2146304937, 2146060634, 2145793349, 2145503083, 2145189842,
-2144853627, 2144494442, 2144112292, 2143707180, 2143279110,
-2142828088, 2142354118, 2141857204, 2141337354, 2140794571,
-2140228862, 2139640233, 2139028690, 2138394240, 2137736889,
-2137056645, 2136353515, 2135627506, 2134878626, 2134106884,
-2133312286, 2132494843, 2131654563, 2130791454, 2129905526,
-2128996788, 2128065251, 2127110924, 2126133817, 2125133941,
-2124111307, 2123065925, 2121997806, 2120906963, 2119793407,
-2118657149, 2117498202, 2116316578, 2115112291, 2113885352,
-2112635775, 2111363574, 2110068761, 2108751352, 2107411359,
-2106048798, 2104663683, 2103256028, 2101825849, 2100373162,
-2098897981, 2097400322, 2095880202, 2094337637, 2092772643,
-2091185237, 2089575437, 2087943258, 2086288720, 2084611839,
-2082912633, 2081191122, 2079447322, 2077681253, 2075892934,
-2074082383, 2072249621, 2070394667, 2068517540, 2066618262,
-2064696851, 2062753329, 2060787717, 2058800036, 2056790306,
-2054758550, 2052704789, 2050629045, 2048531340, 2046411698,
-2044270140, 2042106689, 2039921369, 2037714204, 2035485216,
-2033234429, 2030961869, 2028667558, 2026351522, 2024013785,
-2021654373, 2019273310, 2016870623, 2014446336, 2012000477,
-2009533071, 2007044144, 2004533723, 2002001835, 1999448508,
-1996873768, 1994277643, 1991660161, 1989021350, 1986361238,
-1983679853, 1980977226, 1978253383, 1975508355, 1972742171,
-1969954860, 1967146453, 1964316979, 1961466469, 1958594953,
-1955702462, 1952789027, 1949854680, 1946899451, 1943923372,
-1940926475, 1937908793, 1934870357, 1931811201, 1928731356,
-1925630856, 1922509734, 1919368023, 1916205758, 1913022972,
-1909819698, 1906595972, 1903351828, 1900087301, 1896802425,
-1893497236, 1890171769, 1886826060, 1883460144, 1880074058,
-1876667838, 1873241521, 1869795142, 1866328740, 1862842350,
-1859336011, 1855809760, 1852263635, 1848697674, 1845111914,
-1841506395, 1837881155, 1834236233, 1830571667, 1826887497,
-1823183763, 1819460504, 1815717761, 1811955572, 1808173978,
-1804373021, 1800552740, 1796713177, 1792854372, 1788976368,
-1785079205, 1781162925, 1777227570, 1773273182, 1769299805,
-1765307479, 1761296249, 1757266156, 1753217244, 1749149557,
-1745063138, 1740958031, 1736834279, 1732691928, 1728531020,
-1724351602, 1720153717, 1715937410, 1711702727, 1707449714,
-1703178415, 1698888876, 1694581143, 1690255263, 1685911282,
-1681549245, 1677169201, 1672771196, 1668355276, 1663921490,
-1659469885, 1655000508, 1650513407, 1646008631, 1641486227,
-1636946244, 1632388731, 1627813736, 1623221309, 1618611498,
-1613984353, 1609339924, 1604678260, 1599999411, 1595303428,
-1590590360, 1585860258, 1581113173, 1576349155, 1571568256,
-1566770527, 1561956018, 1557124783, 1552276872, 1547412337,
-1542531231, 1537633606, 1532719513, 1527789007, 1522842139,
-1517878963, 1512899531, 1507903898, 1502892116, 1497864239,
-1492820322, 1487760417, 1482684580, 1477592864, 1472485325,
-1467362016, 1462222994, 1457068312, 1451898025, 1446712191,
-1441510863, 1436294098, 1431061951, 1425814478, 1420551737,
-1415273782, 1409980671, 1404672460, 1399349206, 1394010966,
-1388657798, 1383289758, 1377906904, 1372509294, 1367096986,
-1361670037, 1356228505, 1350772450, 1345301929, 1339817000,
-1334317724, 1328804158, 1323276361, 1317734393, 1312178313,
-1306608181, 1301024057, 1295425999, 1289814068, 1284188325,
-1278548828, 1272895640, 1267228820, 1261548429, 1255854528,
-1250147177, 1244426439, 1238692373, 1232945043, 1227184508,
-1221410831, 1215624074, 1209824299, 1204011567, 1198185941,
-1192347484, 1186496258, 1180632325, 1174755748, 1168866591,
-1162964917, 1157050787, 1151124267, 1145185419, 1139234307,
-1133270995, 1127295547, 1121308026, 1115308496, 1109297023,
-1103273670, 1097238502, 1091191583, 1085132978, 1079062753,
-1072980972, 1066887699, 1060783002, 1054666944, 1048539592,
-1042401010, 1036251266, 1030090423, 1023918550, 1017735711,
-1011541973, 1005337402, 999122065, 992896028, 986659358,
-980412122, 974154386, 967886217, 961607684, 955318852,
-949019790, 942710564, 936391243, 930061894, 923722585,
-917373383, 911014357, 904645574, 898267104, 891879014,
-885481373, 879074249, 872657710, 866231826, 859796666,
-853352298, 846898791, 840436214, 833964638, 827484130,
-820994760, 814496598, 807989714, 801474176, 794950056,
-788417422, 781876345, 775326894, 768769141, 762203154,
-755629005, 749046764, 742456501, 735858287, 729252193,
-722638289, 716016646, 709387335, 702750427, 696105993,
-689454104, 682794832, 676128248, 669454423, 662773428,
-656085336, 649390218, 642688145, 635979190, 629263424,
-622540918, 615811746, 609075979, 602333690, 595584950,
-588829831, 582068407, 575300749, 568526931, 561747023,
-554961100, 548169234, 541371497, 534567963, 527758704,
-520943793, 514123303, 507297307, 500465878, 493629090,
-486787016, 479939728, 473087301, 466229807, 459367320,
-452499914, 445627662, 438750638, 431868915, 424982567,
-418091668, 411196291, 404296511, 397392401, 390484035,
-383571488, 376654833, 369734144, 362809495, 355880961,
-348948616, 342012534, 335072790, 328129457, 321182610,
-314232323, 307278671, 300321729, 293361570, 286398270,
-279431902, 272462542, 265490265, 258515144, 251537254,
-244556671, 237573469, 230587722, 223599506, 216608896,
-209615966, 202620791, 195623446, 188624006, 181622546,
-174619141, 167613866, 160606796, 153598006, 146587571,
-139575567, 132562067, 125547148, 118530885, 111513352,
-104494625, 97474778, 90453888, 83432030, 76409277,
-69385707, 62361393, 55336412, 48310838, 41284746,
-34258213, 27231312, 20204120, 13176712, 6149162,
--878453, -7906059, -14933580, -21960942, -28988068,
--36014884, -43041314, -50067283, -57092716, -64117537,
--71141672, -78165045, -85187581, -92209205, -99229841,
--106249414, -113267850, -120285073, -127301007, -134315578,
--141328711, -148340330, -155350361, -162358728, -169365356,
--176370170, -183373096, -190374058, -197372981, -204369791,
--211364411, -218356769, -225346788, -232334393, -239319511,
--246302065, -253281982, -260259186, -267233603, -274205159,
--281173778, -288139385, -295101907, -302061269, -309017396,
--315970213, -322919647, -329865622, -336808065, -343746901,
--350682056, -357613455, -364541025, -371464690, -378384377,
--385300013, -392211522, -399118830, -406021865, -412920551,
--419814815, -426704583, -433589782, -440470337, -447346176,
--454217223, -461083406, -467944652, -474800886, -481652035,
--488498026, -495338786, -502174241, -509004318, -515828944,
--522648046, -529461551, -536269386, -543071478, -549867754,
--556658141, -563442567, -570220959, -576993244, -583759350,
--590519205, -597272736, -604019870, -610760536, -617494660,
--624222173, -630943000, -637657070, -644364312, -651064652,
--657758021, -664444345, -671123554, -677795576, -684460338,
--691117771, -697767803, -704410362, -711045377, -717672778,
--724292493, -730904451, -737508582, -744104815, -750693079,
--757273304, -763845419, -770409354, -776965038, -783512402,
--790051375, -796581887, -803103868, -809617249, -816121959,
--822617929, -829105090, -835583372, -842052705, -848513021,
--854964249, -861406322, -867839170, -874262724, -880676915,
--887081675, -893476935, -899862626, -906238681, -912605031,
--918961607, -925308342, -931645168, -937972016, -944288820,
--950595511, -956892022, -963178285, -969454234, -975719800,
--981974918, -988219519, -994453537, -1000676905, -1006889557,
--1013091426, -1019282445, -1025462549, -1031631671, -1037789745,
--1043936705, -1050072485, -1056197020, -1062310244, -1068412091,
--1074502497, -1080581395, -1086648722, -1092704411, -1098748398,
--1104780618, -1110801008, -1116809501, -1122806034, -1128790543,
--1134762964, -1140723232, -1146671283, -1152607055, -1158530484,
--1164441505, -1170340057, -1176226074, -1182099496, -1187960258,
--1193808298, -1199643553, -1205465961, -1211275460, -1217071986,
--1222855479, -1228625876, -1234383115, -1240127136, -1245857875,
--1251575272, -1257279266, -1262969796, -1268646800, -1274310217,
--1279959989, -1285596052, -1291218348, -1296826816, -1302421396,
--1308002029, -1313568653, -1319121210, -1324659641, -1330183885,
--1335693885, -1341189580, -1346670912, -1352137822, -1357590252,
--1363028143, -1368451438, -1373860077, -1379254004, -1384633159,
--1389997487, -1395346928, -1400681427, -1406000925, -1411305366,
--1416594694, -1421868850, -1427127780, -1432371426, -1437599733,
--1442812644, -1448010104, -1453192057, -1458358447, -1463509220,
--1468644319, -1473763690, -1478867279, -1483955030, -1489026889,
--1494082802, -1499122714, -1504146572, -1509154322, -1514145910,
--1519121283, -1524080387, -1529023170, -1533949577, -1538859558,
--1543753058, -1548630027, -1553490410, -1558334157, -1563161216,
--1567971534, -1572765060, -1577541744, -1582301533, -1587044377,
--1591770225, -1596479027, -1601170732, -1605845289, -1610502649,
--1615142762, -1619765578, -1624371047, -1628959121, -1633529750,
--1638082885, -1642618478, -1647136479, -1651636841, -1656119516,
--1660584454, -1665031609, -1669460933, -1673872378, -1678265898,
--1682641444, -1686998971, -1691338432, -1695659779, -1699962968,
--1704247951, -1708514683, -1712763118, -1716993211, -1721204917,
--1725398189, -1729572984, -1733729257, -1737866963, -1741986057,
--1746086497, -1750168237, -1754231234, -1758275445, -1762300826,
--1766307335, -1770294927, -1774263561, -1778213194, -1782143784,
--1786055289, -1789947667, -1793820875, -1797674873, -1801509620,
--1805325074, -1809121194, -1812897940, -1816655271, -1820393147,
--1824111529, -1827810376, -1831489648, -1835149306, -1838789312,
--1842409625, -1846010208, -1849591022, -1853152028, -1856693188,
--1860214464, -1863715819, -1867197215, -1870658615, -1874099982,
--1877521279, -1880922469, -1884303515, -1887664383, -1891005035,
--1894325435, -1897625550, -1900905342, -1904164776, -1907403819,
--1910622435, -1913820590, -1916998250, -1920155379, -1923291946,
--1926407915, -1929503255, -1932577931, -1935631910, -1938665161,
--1941677650, -1944669345, -1947640214, -1950590226, -1953519348,
--1956427550, -1959314800, -1962181067, -1965026321, -1967850531,
--1970653667, -1973435699, -1976196596, -1978936331, -1981654873,
--1984352192, -1987028261, -1989683050, -1992316532, -1994928677,
--1997519459, -2000088848, -2002636818, -2005163342, -2007668391,
--2010151941, -2012613963, -2015054432, -2017473321, -2019870604,
--2022246257, -2024600252, -2026932566, -2029243173, -2031532049,
--2033799168, -2036044507, -2038268042, -2040469748, -2042649603,
--2044807583, -2046943664, -2049057824, -2051150040, -2053220291,
--2055268553, -2057294804, -2059299024, -2061281190, -2063241282,
--2065179277, -2067095157, -2068988899, -2070860485, -2072709893,
--2074537104, -2076342098, -2078124857, -2079885360, -2081623590,
--2083339527, -2085033153, -2086704450, -2088353400, -2089979985,
--2091584189, -2093165993, -2094725382, -2096262337, -2097776843,
--2099268884, -2100738443, -2102185505, -2103610054, -2105012075,
--2106391553, -2107748474, -2109082822, -2110394584, -2111683744,
--2112950291, -2114194210, -2115415487, -2116614110, -2117790065,
--2118943341, -2120073924, -2121181804, -2122266967, -2123329402,
--2124369098, -2125386044, -2126380229, -2127351642, -2128300272,
--2129226111, -2130129147, -2131009371, -2131866773, -2132701345,
--2133513078, -2134301962, -2135067990, -2135811153, -2136531442,
--2137228852, -2137903373, -2138555000, -2139183723, -2139789539,
--2140372438, -2140932416, -2141469466, -2141983583, -2142474761,
--2142942995, -2143388280, -2143810610, -2144209982, -2144586392,
--2144939834, -2145270306, -2145577804, -2145862324, -2146123864,
--2146362421, -2146577992, -2146770575, -2146940167, -2147086768,
--2147210375, -2147310987, -2147388603, -2147443222, -2147474844,
-2147482929, 2147425435, 2147275952, 2147034487, 2146701050,
-2146275656, 2145758322, 2145149071, 2144447929, 2143654926,
-2142770096, 2141793477, 2140725111, 2139565043, 2138313323,
-2136970005, 2135535146, 2134008809, 2132391057, 2130681961,
-2128881593, 2126990031, 2125007356, 2122933653, 2120769010,
-2118513521, 2116167282, 2113730393, 2111202959, 2108585087,
-2105876892, 2103078487, 2100189994, 2097211535, 2094143239,
-2090985237, 2087737664, 2084400659, 2080974365, 2077458929,
-2073854502, 2070161238, 2066379295, 2062508835, 2058550025,
-2054503033, 2050368032, 2046145201, 2041834720, 2037436773,
-2032951550, 2028379241, 2023720043, 2018974156, 2014141783,
-2009223131, 2004218410, 1999127836, 1993951625, 1988690000,
-1983343186, 1977911412, 1972394912, 1966793920, 1961108677,
-1955339428, 1949486417, 1943549898, 1937530123, 1931427351,
-1925241843, 1918973864, 1912623682, 1906191570, 1899677803,
-1893082661, 1886406424, 1879649381, 1872811820, 1865894033,
-1858896318, 1851818974, 1844662304, 1837426615, 1830112217,
-1822719423, 1815248550, 1807699917, 1800073849, 1792370671,
-1784590714, 1776734311, 1768801799, 1760793518, 1752709809,
-1744551021, 1736317502, 1728009604, 1719627685, 1711172102,
-1702643219, 1694041400, 1685367013, 1676620432, 1667802029,
-1658912184, 1649951276, 1640919689, 1631817811, 1622646032,
-1613404744, 1604094343, 1594715227, 1585267800, 1575752465,
-1566169630, 1556519705, 1546803104, 1537020244, 1527171542,
-1517257422, 1507278307, 1497234626, 1487126808, 1476955286,
-1466720497, 1456422878, 1446062871, 1435640919, 1425157469,
-1414612971, 1404007875, 1393342636, 1382617710, 1371833558,
-1360990642, 1350089425, 1339130374, 1328113960, 1317040654,
-1305910930, 1294725265, 1283484138, 1272188032, 1260837429,
-1249432816, 1237974681, 1226463516, 1214899813, 1203284068,
-1191616778, 1179898443, 1168129565, 1156310649, 1144442200,
-1132524727, 1120558740, 1108544752, 1096483278, 1084374834,
-1072219940, 1060019115, 1047772882, 1035481766, 1023146293,
-1010766993, 998344394, 985879030, 973371434, 960822142,
-948231691, 935600622, 922929474, 910218791, 897469118,
-884680999, 871854984, 858991622, 846091463, 833155061,
-820182969, 807175743, 794133941, 781058120, 767948841,
-754806666, 741632158, 728425880, 715188400, 701920283,
-688622098, 675294414, 661937804, 648552838, 635140090,
-621700135, 608233549, 594740907, 581222789, 567679774,
-554112440, 540521371, 526907147, 513270353, 499611571,
-485931388, 472230390, 458509162, 444768294, 431008373,
-417229989, 403433732, 389620194, 375789965, 361943639,
-348081809, 334205068, 320314011, 306409232, 292491328,
-278560894, 264618528, 250664827, 236700388, 222725809,
-208741690, 194748629, 180747225, 166738079, 152721790,
-138698959, 124670187, 110636075, 96597223, 82554233,
-68507707, 54458246, 40406452, 26352928, 12298274,
--1756906, -15812011, -29866438, -43919586, -57970853,
--72019637, -86065335, -100107347, -114145071, -128177904,
--142205248, -156226499, -170241059, -184248325, -198247699,
--212238581, -226220372, -240192472, -254154282, -268105206,
--282044645, -295972002, -309886680, -323788084, -337675619,
--351548688, -365406698, -379249055, -393075166, -406884440,
--420676284, -434450107, -448205320, -461941333, -475657559,
--489353409, -503028296, -516681636, -530312842, -543921332,
--557506522, -571067830, -584604676, -598116479, -611602660,
--625062643, -638495850, -651901706, -665279637, -678629069,
--691949432, -705240153, -718500664, -731730397, -744928785,
--758095263, -771229267, -784330234, -797397602, -810430813,
--823429308, -836392529, -849319923, -862210934, -875065011,
--887881603, -900660162, -913400139, -926100989, -938762167,
--951383133, -963963344, -976502263, -988999351, -1001454074,
--1013865898, -1026234291, -1038558724, -1050838668, -1063073598,
--1075262990, -1087406320, -1099503070, -1111552721, -1123554757,
--1135508663, -1147413928, -1159270041, -1171076495, -1182832785,
--1194538405, -1206192856, -1217795637, -1229346252, -1240844206,
--1252289006, -1263680162, -1275017186, -1286299593, -1297526899,
--1308698624, -1319814288, -1330873416, -1341875533, -1352820169,
--1363706855, -1374535124, -1385304512, -1396014559, -1406664805,
--1417254794, -1427784073, -1438252190, -1448658697, -1459003149,
--1469285102, -1479504115, -1489659751, -1499751576, -1509779156,
--1519742062, -1529639867, -1539472148, -1549238483, -1558938453,
--1568571644, -1578137643, -1587636039, -1597066426, -1606428400,
--1615721561, -1624945509, -1634099849, -1643184191, -1652198144,
--1661141322, -1670013342, -1678813825, -1687542393, -1696198672,
--1704782292, -1713292884, -1721730085, -1730093532, -1738382868,
--1746597738, -1754737789, -1762802673, -1770792044, -1778705561,
--1786542883, -1794303676, -1801987607, -1809594347, -1817123570,
--1824574954, -1831948179, -1839242929, -1846458892, -1853595759,
--1860653224, -1867630985, -1874528743, -1881346202, -1888083070,
--1894739060, -1901313885, -1907807264, -1914218919, -1920548575,
--1926795962, -1932960811, -1939042858, -1945041843, -1950957509,
--1956789602, -1962537873, -1968202076, -1973781967, -1979277308,
--1984687864, -1990013401, -1995253694, -2000408516, -2005477648,
--2010460871, -2015357973, -2020168744, -2024892978, -2029530472,
--2034081027, -2038544449, -2042920547, -2047209133, -2051410023,
--2055523038, -2059548001, -2063484740, -2067333086, -2071092874,
--2074763944, -2078346137, -2081839301, -2085243286, -2088557947,
--2091783140, -2094918728, -2097964577, -2100920556, -2103786539,
--2106562402, -2109248028, -2111843300, -2114348108, -2116762344,
--2119085905, -2121318692, -2123460608, -2125511562, -2127471467,
--2129340237, -2131117794, -2132804061, -2134398966, -2135902440,
--2137314419, -2138634843, -2139863654, -2141000801, -2142046235,
--2142999911, -2143861787, -2144631828, -2145310000, -2145896274,
--2146390624, -2146793031, -2147103476, -2147321946, -2147448433,
-2147480773, 2147250799, 2146652904, 2145687192, 2144353827,
-2142653038, 2140585116, 2138150417, 2135349356, 2132182414,
-2128650133, 2124753120, 2120492040, 2115867626, 2110880668,
-2105532022, 2099822604, 2093753392, 2087325426, 2080539807,
-2073397699, 2065900325, 2058048970, 2049844978, 2041289756,
-2032384769, 2023131544, 2013531666, 2003586779, 1993298588,
-1982668856, 1971699403, 1960392110, 1948748914, 1936771810,
-1924462850, 1911824143, 1898857855, 1885566207, 1871951478,
-1858015999, 1843762158, 1829192399, 1814309216, 1799115162,
-1783612838, 1767804901, 1751694060, 1735283075, 1718574758,
-1701571972, 1684277631, 1666694698, 1648826185, 1630675154,
-1612244715, 1593538026, 1574558293, 1555308768, 1535792748,
-1516013578, 1495974647, 1475679389, 1455131280, 1434333842,
-1413290638, 1392005275, 1370481398, 1348722696, 1326732898,
-1304515771, 1282075122, 1259414796, 1236538675, 1213450681,
-1190154767, 1166654927, 1142955186, 1119059606, 1094972281,
-1070697338, 1046238936, 1021601267, 996788551, 971805042,
-946655018, 921342790, 895872694, 870249095, 844476384,
-818558976, 792501312, 766307857, 739983099, 713531549,
-686957739, 660266222, 633461572, 606548381, 579531262,
-552414843, 525203770, 497902707, 470516330, 443049333,
-415506422, 387892316, 360211746, 332469456, 304670200,
-276818739, 248919847, 220978304, 192998897, 164986421,
-136945676, 108881465, 80798598, 52701887, 24596146,
--3513810, -31623164, -59727099, -87820801, -115899455,
--143958250, -171992378, -199997036, -227967426, -255898755,
--283786237, -311625094, -339410555, -367137861, -394802258,
--422399009, -449923384, -477370666, -504736154, -532015158,
--559203003, -586295032, -613286603, -640173090, -666949886,
--693612404, -720156076, -746576352, -772868706, -799028633,
--825051651, -850933300, -876669146, -902254780, -927685817,
--952957899, -978066697, -1003007909, -1027777260, -1052370507,
--1076783436, -1101011863, -1125051638, -1148898640, -1172548785,
--1195998020, -1219242327, -1242277723, -1265100260, -1287706030,
--1310091157, -1332251808, -1354184184, -1375884527, -1397349119,
--1418574283, -1439556382, -1460291820, -1480777044, -1501008545,
--1520982856, -1540696555, -1560146263, -1579328647, -1598240423,
--1616878347, -1635239228, -1653319919, -1671117323, -1688628389,
--1705850117, -1722779556, -1739413807, -1755750017, -1771785389,
--1787517174, -1802942678, -1818059257, -1832864320, -1847355332,
--1861529809, -1875385322, -1888919498, -1902130017, -1915014616,
--1927571087, -1939797279, -1951691096, -1963250501, -1974473513,
--1985358210, -1995902725, -2006105253, -2015964045, -2025477412,
--2034643724, -2043461410, -2051928960, -2060044922, -2067807906,
--2075216581, -2082269679, -2088965991, -2095304370, -2101283728,
--2106903043, -2112161350, -2117057750, -2121591402, -2125761531,
--2129567422, -2133008422, -2136083942, -2138793455, -2141136497,
--2143112666, -2144721624, -2145963095, -2146836866, -2147342788,
+    2147483603, 2147480010, 2147470667, 2147455575, 2147434733,
+    2147408142, 2147375802, 2147337712, 2147293874, 2147244286,
+    2147188950, 2147127865, 2147061032, 2146988450, 2146910120,
+    2146826042, 2146736216, 2146640643, 2146539323, 2146432256,
+    2146319442, 2146200882, 2146076576, 2145946524, 2145810727,
+    2145669185, 2145521898, 2145368867, 2145210092, 2145045574,
+    2144875313, 2144699310, 2144517564, 2144330077, 2144136849,
+    2143937880, 2143733172, 2143522724, 2143306537, 2143084612,
+    2142856949, 2142623549, 2142384413, 2142139541, 2141888933,
+    2141632592, 2141370516, 2141102708, 2140829167, 2140549894,
+    2140264890, 2139974157, 2139677694, 2139375502, 2139067583,
+    2138753936, 2138434564, 2138109466, 2137778644, 2137442099,
+    2137099831, 2136751841, 2136398131, 2136038701, 2135673552,
+    2135302685, 2134926101, 2134543801, 2134155787, 2133762059,
+    2133362618, 2132957466, 2132546603, 2132130030, 2131707749,
+    2131279761, 2130846067, 2130406668, 2129961565, 2129510759,
+    2129054253, 2128592046, 2128124140, 2127650537, 2127171237,
+    2126686242, 2126195553, 2125699172, 2125197100, 2124689338,
+    2124175888, 2123656750, 2123131927, 2122601420, 2122065230,
+    2121523358, 2120975806, 2120422576, 2119863669, 2119299086,
+    2118728830, 2118152901, 2117571301, 2116984031, 2116391094,
+    2115792491, 2115188222, 2114578291, 2113962699, 2113341447,
+    2112714537, 2112081970, 2111443749, 2110799875, 2110150349,
+    2109495174, 2108834352, 2108167883, 2107495770, 2106818015,
+    2106134619, 2105445584, 2104750913, 2104050606, 2103344666,
+    2102633095, 2101915895, 2101193067, 2100464614, 2099730537,
+    2098990838, 2098245520, 2097494584, 2096738032, 2095975867,
+    2095208091, 2094434705, 2093655711, 2092871112, 2092080910,
+    2091285107, 2090483704, 2089676705, 2088864111, 2088045925,
+    2087222148, 2086392783, 2085557833, 2084717298, 2083871182,
+    2083019487, 2082162216, 2081299369, 2080430950, 2079556962,
+    2078677406, 2077792284, 2076901600, 2076005355, 2075103552,
+    2074196194, 2073283282, 2072364819, 2071440808, 2070511251,
+    2069576151, 2068635510, 2067689330, 2066737615, 2065780367,
+    2064817587, 2063849280, 2062875447, 2061896091, 2060911215,
+    2059920821, 2058924912, 2057923491, 2056916560, 2055904122,
+    2054886179, 2053862736, 2052833793, 2051799354, 2050759422,
+    2049714000, 2048663090, 2047606695, 2046544818, 2045477461,
+    2044404629, 2043326323, 2042242546, 2041153301, 2040058592,
+    2038958421, 2037852791, 2036741705, 2035625166, 2034503177,
+    2033375742, 2032242862, 2031104541, 2029960782, 2028811589,
+    2027656964, 2026496910, 2025331431, 2024160529, 2022984208,
+    2021802471, 2020615320, 2019422760, 2018224794, 2017021424,
+    2015812654, 2014598487, 2013378926, 2012153975, 2010923636,
+    2009687914, 2008446811, 2007200332, 2005948478, 2004691253,
+    2003428662, 2002160707, 2000887391, 1999608718, 1998324692,
+    1997035316, 1995740593, 1994440527, 1993135121, 1991824379,
+    1990508304, 1989186900, 1987860170, 1986528118, 1985190748,
+    1983848063, 1982500066, 1981146762, 1979788153, 1978424244,
+    1977055038, 1975680539, 1974300751, 1972915676, 1971525320,
+    1970129685, 1968728776, 1967322596, 1965911148, 1964494438,
+    1963072467, 1961645241, 1960212764, 1958775038, 1957332067,
+    1955883857, 1954430410, 1952971730, 1951507822, 1950038689,
+    1948564335, 1947084764, 1945599980, 1944109987, 1942614790,
+    1941114391, 1939608795, 1938098007, 1936582029, 1935060867,
+    1933534524, 1932003004, 1930466312, 1928924452, 1927377427,
+    1925825242, 1924267900, 1922705408, 1921137767, 1919564983,
+    1917987059, 1916404001, 1914815812, 1913222496, 1911624058,
+    1910020502, 1908411833, 1906798054, 1905179170, 1903555185,
+    1901926103, 1900291930, 1898652669, 1897008325, 1895358902,
+    1893704404, 1892044837, 1890380204, 1888710510, 1887035759,
+    1885355956, 1883671105, 1881981211, 1880286279, 1878586312,
+    1876881316, 1875171295, 1873456254, 1871736196, 1870011128,
+    1868281053, 1866545976, 1864805901, 1863060834, 1861310779,
+    1859555741, 1857795724, 1856030734, 1854260774, 1852485850,
+    1850705966, 1848921127, 1847131338, 1845336604, 1843536929,
+    1841732318, 1839922777, 1838108310, 1836288921, 1834464616,
+    1832635400, 1830801277, 1828962253, 1827118332, 1825269519,
+    1823415819, 1821557238, 1819693779, 1817825449, 1815952252,
+    1814074193, 1812191278, 1810303510, 1808410896, 1806513440,
+    1804611147, 1802704023, 1800792073, 1798875302, 1796953714,
+    1795027315, 1793096111, 1791160105, 1789219305, 1787273714,
+    1785323338, 1783368182, 1781408251, 1779443552, 1777474088,
+    1775499865, 1773520888, 1771537164, 1769548696, 1767555491,
+    1765557554, 1763554889, 1761547504, 1759535401, 1757518588,
+    1755497070, 1753470852, 1751439939, 1749404337, 1747364051,
+    1745319087, 1743269451, 1741215147, 1739156181, 1737092559,
+    1735024287, 1732951369, 1730873811, 1728791620, 1726704800,
+    1724613357, 1722517297, 1720416625, 1718311347, 1716201468,
+    1714086995, 1711967933, 1709844287, 1707716063, 1705583268,
+    1703445906, 1701303983, 1699157505, 1697006479, 1694850909,
+    1692690801, 1690526161, 1688356996, 1686183310, 1684005110,
+    1681822401, 1679635189, 1677443481, 1675247281, 1673046596,
+    1670841433, 1668631795, 1666417691, 1664199124, 1661976103,
+    1659748631, 1657516716, 1655280364, 1653039579, 1650794369,
+    1648544739, 1646290696, 1644032245, 1641769393, 1639502145,
+    1637230507, 1634954486, 1632674088, 1630389319, 1628100184,
+    1625806691, 1623508845, 1621206653, 1618900119, 1616589252,
+    1614274057, 1611954539, 1609630706, 1607302564, 1604970118,
+    1602633375, 1600292342, 1597947024, 1595597428, 1593243560,
+    1590885426, 1588523033, 1586156387, 1583785495, 1581410362,
+    1579030995, 1576647401, 1574259586, 1571867556, 1569471317,
+    1567070877, 1564666241, 1562257416, 1559844408, 1557427224,
+    1555005871, 1552580354, 1550150681, 1547716857, 1545278889,
+    1542836785, 1540390550, 1537940190, 1535485713, 1533027126,
+    1530564434, 1528097644, 1525626762, 1523151797, 1520672753,
+    1518189638, 1515702459, 1513211221, 1510715932, 1508216599,
+    1505713227, 1503205824, 1500694397, 1498178952, 1495659496,
+    1493136035, 1490608577, 1488077129, 1485541696, 1483002286,
+    1480458905, 1477911561, 1475360260, 1472805009, 1470245815,
+    1467682684, 1465115624, 1462544642, 1459969744, 1457390937,
+    1454808228, 1452221624, 1449631133, 1447036760, 1444438513,
+    1441836399, 1439230424, 1436620597, 1434006923, 1431389409,
+    1428768064, 1426142893, 1423513904, 1420881104, 1418244500,
+    1415604099, 1412959907, 1410311933, 1407660183, 1405004664,
+    1402345384, 1399682349, 1397015567, 1394345044, 1391670789,
+    1388992807, 1386311107, 1383625695, 1380936579, 1378243766,
+    1375547262, 1372847076, 1370143215, 1367435685, 1364724494,
+    1362009649, 1359291158, 1356569027, 1353843265, 1351113878,
+    1348380873, 1345644259, 1342904042, 1340160229, 1337412829,
+    1334661848, 1331907293, 1329149173, 1326387494, 1323622264,
+    1320853490, 1318081180, 1315305341, 1312525981, 1309743106,
+    1306956725, 1304166845, 1301373473, 1298576617, 1295776285,
+    1292972483, 1290165219, 1287354501, 1284540337, 1281722734,
+    1278901699, 1276077240, 1273249364, 1270418080, 1267583394,
+    1264745315, 1261903850, 1259059006, 1256210791, 1253359213,
+    1250504279, 1247645998, 1244784376, 1241919421, 1239051142,
+    1236179545, 1233304638, 1230426430, 1227544927, 1224660138,
+    1221772070, 1218880731, 1215986128, 1213088271, 1210187165,
+    1207282819, 1204375241, 1201464439, 1198550419, 1195633191,
+    1192712762, 1189789140, 1186862332, 1183932347, 1180999192,
+    1178062875, 1175123404, 1172180786, 1169235031, 1166286145,
+    1163334137, 1160379014, 1157420784, 1154459456, 1151495036,
+    1148527534, 1145556957, 1142583313, 1139606610, 1136626856,
+    1133644058, 1130658226, 1127669367, 1124677488, 1121682598,
+    1118684705, 1115683818, 1112679943, 1109673089, 1106663264,
+    1103650476, 1100634734, 1097616045, 1094594417, 1091569858,
+    1088542378, 1085511982, 1082478681, 1079442481, 1076403392,
+    1073361420, 1070316575, 1067268864, 1064218296, 1061164879,
+    1058108621, 1055049529, 1051987613, 1048922881, 1045855340,
+    1042784999, 1039711867, 1036635950, 1033557259, 1030475800,
+    1027391582, 1024304614, 1021214903, 1018122458, 1015027288,
+    1011929400, 1008828802, 1005725504, 1002619513, 999510838,
+    996399486, 993285468, 990168789, 987049460, 983927488,
+    980802882, 977675650, 974545800, 971413342, 968278282,
+    965140630, 962000395, 958857583, 955712205, 952564267,
+    949413780, 946260750, 943105188, 939947100, 936786495,
+    933623383, 930457771, 927289668, 924119082, 920946022,
+    917770497, 914592514, 911412082, 908229211, 905043908,
+    901856182, 898666041, 895473494, 892278550, 889081217,
+    885881504, 882679419, 879474970, 876268167, 873059018,
+    869847532, 866633717, 863417581, 860199134, 856978384,
+    853755339, 850530009, 847302402, 844072526, 840840390,
+    837606003, 834369373, 831130510, 827889422, 824646117,
+    821400604, 818152892, 814902989, 811650905, 808396648,
+    805140227, 801881649, 798620925, 795358063, 792093072,
+    788825960, 785556735, 782285408, 779011986, 775736479,
+    772458895, 769179242, 765897531, 762613768, 759327964,
+    756040127, 752750266, 749458390, 746164507, 742868626,
+    739570757, 736270907, 732969086, 729665303, 726359567,
+    723051885, 719742268, 716430724, 713117261, 709801890,
+    706484618, 703165455, 699844409, 696521489, 693196705,
+    689870064, 686541577, 683211252, 679879097, 676545122,
+    673209336, 669871748, 666532366, 663191199, 659848257,
+    656503549, 653157082, 649808867, 646458913, 643107227,
+    639753820, 636398700, 633041876, 629683357, 626323153,
+    622961271, 619597722, 616232514, 612865656, 609497157,
+    606127026, 602755273, 599381905, 596006934, 592630366,
+    589252212, 585872480, 582491179, 579108320, 575723909,
+    572337957, 568950473, 565561466, 562170945, 558778918,
+    555385395, 551990386, 548593898, 545195942, 541796526,
+    538395660, 534993352, 531589612, 528184449, 524777871,
+    521369889, 517960510, 514549745, 511137603, 507724092,
+    504309221, 500893000, 497475439, 494056545, 490636329,
+    487214799, 483791965, 480367835, 476942419, 473515727,
+    470087766, 466658548, 463228079, 459796371, 456363431,
+    452929270, 449493896, 446057319, 442619547, 439180590,
+    435740458, 432299159, 428856702, 425413098, 421968354,
+    418522481, 415075487, 411627382, 408178175, 404727875,
+    401276491, 397824033, 394370510, 390915931, 387460306,
+    384003643, 380545952, 377087242, 373627523, 370166803,
+    366705093, 363242400, 359778735, 356314107, 352848525,
+    349381998, 345914536, 342446148, 338976842, 335506630,
+    332035519, 328563519, 325090639, 321616889, 318142278,
+    314666815, 311190510, 307713372, 304235410, 300756633,
+    297277051, 293796673, 290315508, 286833567, 283350857,
+    279867389, 276383171, 272898214, 269412525, 265926116,
+    262438995, 258951170, 255462653, 251973452, 248483576,
+    244993035, 241501838, 238009994, 234517513, 231024404,
+    227530677, 224036341, 220541404, 217045878, 213549770,
+    210053090, 206555848, 203058053, 199559715, 196060842,
+    192561444, 189061531, 185561111, 182060195, 178558791,
+    175056909, 171554559, 168051749, 164548489, 161044789,
+    157540658, 154036105, 150531139, 147025770, 143520008,
+    140013862, 136507340, 133000453, 129493210, 125985621,
+    122477694, 118969439, 115460866, 111951983, 108442801,
+    104933329, 101423575, 97913550, 94403263, 90892723,
+    87381940, 83870923, 80359681, 76848224, 73336562,
+    69824703, 66312657, 62800433, 59288042, 55775491,
+    52262792, 48749952, 45236982, 41723891, 38210688,
+    34697383, 31183985, 27670503, 24156947, 20643327,
+    17129651, 13615930, 10102172, 6588387, 3074584,
+    -439226, -3953036, -7466835, -10980614, -14494364,
+    -18008075, -21521738, -25035343, -28548881, -32062342,
+    -35575718, -39088999, -42602174, -46115236, -49628175,
+    -53140980, -56653643, -60166155, -63678505, -67190685,
+    -70702685, -74214496, -77726108, -81237512, -84748698,
+    -88259658, -91770381, -95280859, -98791081, -102301039,
+    -105810723, -109320124, -112829232, -116338038, -119846533,
+    -123354707, -126862550, -130370054, -133877209, -137384005,
+    -140890434, -144396485, -147902150, -151407418, -154912282,
+    -158416730, -161920755, -165424346, -168927494, -172430190,
+    -175932424, -179434187, -182935470, -186436263, -189936557,
+    -193436342, -196935610, -200434350, -203932553, -207430211,
+    -210927313, -214423851, -217919814, -221415194, -224909981,
+    -228404166, -231897740, -235390693, -238883015, -242374698,
+    -245865732, -249356108, -252845816, -256334847, -259823192,
+    -263310841, -266797785, -270284015, -273769522, -277254295,
+    -280738326, -284221606, -287704124, -291185873, -294666841,
+    -298147021, -301626403, -305104977, -308582734, -312059665,
+    -315535760, -319011011, -322485408, -325958941, -329431602,
+    -332903380, -336374268, -339844254, -343313331, -346781489,
+    -350248718, -353715010, -357180354, -360644742, -364108165,
+    -367570613, -371032077, -374492547, -377952015, -381410471,
+    -384867905, -388324310, -391779674, -395233990, -398687248,
+    -402139438, -405590552, -409040579, -412489512, -415937340,
+    -419384055, -422829646, -426274106, -429717424, -433159592,
+    -436600601, -440040440, -443479101, -446916575, -450352853,
+    -453787924, -457221781, -460654414, -464085813, -467515970,
+    -470944875, -474372519, -477798893, -481223988, -484647795,
+    -488070304, -491491506, -494911393, -498329954, -501747182,
+    -505163066, -508577597, -511990767, -515402566, -518812985,
+    -522222016, -525629648, -529035873, -532440681, -535844064,
+    -539246012, -542646517, -546045568, -549443158, -552839277,
+    -556233916, -559627065, -563018716, -566408860, -569797488,
+    -573184589, -576570157, -579954180, -583336651, -586717560,
+    -590096899, -593474657, -596850827, -600225398, -603598363,
+    -606969711, -610339435, -613707524, -617073971, -620438765,
+    -623801898, -627163361, -630523145, -633881241, -637237640,
+    -640592333, -643945310, -647296564, -650646085, -653993863,
+    -657339891, -660684159, -664026658, -667367379, -670706313,
+    -674043452, -677378786, -680712307, -684044005, -687373872,
+    -690701898, -694028075, -697352394, -700674846, -703995422,
+    -707314114, -710630911, -713945806, -717258790, -720569853,
+    -723878987, -727186183, -730491433, -733794726, -737096055,
+    -740395410, -743692783, -746988165, -750281547, -753572921,
+    -756862277, -760149606, -763434901, -766718151, -769999349,
+    -773278485, -776555551, -779830538, -783103437, -786374239,
+    -789642936, -792909519, -796173979, -799436307, -802696495,
+    -805954534, -809210416, -812464130, -815715670, -818965026,
+    -822212189, -825457150, -828699902, -831940435, -835178741,
+    -838414810, -841648635, -844880207, -848109516, -851336555,
+    -854561315, -857783787, -861003962, -864221832, -867437388,
+    -870650622, -873861525, -877070088, -880276304, -883480162,
+    -886681655, -889880774, -893077511, -896271856, -899463802,
+    -902653340, -905840461, -909025157, -912207419, -915387239,
+    -918564609, -921739519, -924911961, -928081927, -931249408,
+    -934414396, -937576882, -940736858, -943894315, -947049246,
+    -950201640, -953351491, -956498790, -959643527, -962785695,
+    -965925286, -969062291, -972196701, -975328508, -978457704,
+    -981584280, -984708228, -987829540, -990948208, -994064222,
+    -997177575, -1000288258, -1003396263, -1006501581, -1009604205,
+    -1012704126, -1015801336, -1018895826, -1021987588, -1025076613,
+    -1028162895, -1031246424, -1034327191, -1037405190, -1040480411,
+    -1043552847, -1046622488, -1049689328, -1052753357, -1055814567,
+    -1058872951, -1061928500, -1064981206, -1068031060, -1071078055,
+    -1074122183, -1077163435, -1080201802, -1083237278, -1086269854,
+    -1089299521, -1092326272, -1095350099, -1098370993, -1101388946,
+    -1104403951, -1107415998, -1110425081, -1113431191, -1116434320,
+    -1119434460, -1122431603, -1125425740, -1128416865, -1131404968,
+    -1134390043, -1137372080, -1140351072, -1143327011, -1146299889,
+    -1149269698, -1152236431, -1155200078, -1158160632, -1161118086,
+    -1164072431, -1167023660, -1169971764, -1172916735, -1175858567,
+    -1178797250, -1181732777, -1184665141, -1187594332, -1190520344,
+    -1193443169, -1196362799, -1199279225, -1202192441, -1205102438,
+    -1208009209, -1210912745, -1213813040, -1216710085, -1219603872,
+    -1222494394, -1225381643, -1228265611, -1231146291, -1234023675,
+    -1236897754, -1239768523, -1242635972, -1245500094, -1248360882,
+    -1251218327, -1254072422, -1256923160, -1259770533, -1262614533,
+    -1265455153, -1268292384, -1271126220, -1273956653, -1276783675,
+    -1279607279, -1282427457, -1285244201, -1288057504, -1290867359,
+    -1293673758, -1296476693, -1299276157, -1302072143, -1304864643,
+    -1307653649, -1310439154, -1313221151, -1315999631, -1318774589,
+    -1321546016, -1324313904, -1327078247, -1329839037, -1332596266,
+    -1335349928, -1338100015, -1340846519, -1343589433, -1346328751,
+    -1349064463, -1351796564, -1354525046, -1357249901, -1359971122,
+    -1362688702, -1365402634, -1368112911, -1370819524, -1373522468,
+    -1376221734, -1378917315, -1381609205, -1384297396, -1386981880,
+    -1389662652, -1392339702, -1395013025, -1397682613, -1400348459,
+    -1403010556, -1405668897, -1408323474, -1410974281, -1413621310,
+    -1416264555, -1418904007, -1421539661, -1424171509, -1426799544,
+    -1429423759, -1432044147, -1434660701, -1437273414, -1439882279,
+    -1442487289, -1445088437, -1447685717, -1450279120, -1452868640,
+    -1455454271, -1458036005, -1460613835, -1463187755, -1465757757,
+    -1468323835, -1470885982, -1473444191, -1475998456, -1478548768,
+    -1481095122, -1483637511, -1486175927, -1488710365, -1491240816,
+    -1493767276, -1496289736, -1498808190, -1501322631, -1503833053,
+    -1506339448, -1508841811, -1511340134, -1513834411, -1516324634,
+    -1518810798, -1521292896, -1523770921, -1526244866, -1528714725,
+    -1531180491, -1533642158, -1536099718, -1538553166, -1541002495,
+    -1543447698, -1545888769, -1548325701, -1550758488, -1553187123,
+    -1555611600, -1558031911, -1560448052, -1562860014, -1565267793,
+    -1567671380, -1570070771, -1572465958, -1574856935, -1577243696,
+    -1579626234, -1582004542, -1584378616, -1586748447, -1589114030,
+    -1591475359, -1593832427, -1596185227, -1598533754, -1600878002,
+    -1603217963, -1605553632, -1607885003, -1610212069, -1612534823,
+    -1614853261, -1617167375, -1619477159, -1621782608, -1624083714,
+    -1626380473, -1628672877, -1630960921, -1633244598, -1635523902,
+    -1637798828, -1640069368, -1642335518, -1644597271, -1646854620,
+    -1649107561, -1651356086, -1653600190, -1655839867, -1658075111,
+    -1660305916, -1662532275, -1664754184, -1666971635, -1669184624,
+    -1671393143, -1673597188, -1675796752, -1677991829, -1680182414,
+    -1682368500, -1684550083, -1686727155, -1688899711, -1691067746,
+    -1693231253, -1695390227, -1697544662, -1699694551, -1701839891,
+    -1703980674, -1706116895, -1708248548, -1710375628, -1712498128,
+    -1714616044, -1716729369, -1718838098, -1720942225, -1723041744,
+    -1725136651, -1727226938, -1729312602, -1731393635, -1733470033,
+    -1735541790, -1737608901, -1739671359, -1741729160, -1743782298,
+    -1745830767, -1747874561, -1749913677, -1751948107, -1753977847,
+    -1756002891, -1758023233, -1760038869, -1762049792, -1764055998,
+    -1766057481, -1768054236, -1770046258, -1772033540, -1774016078,
+    -1775993866, -1777966900, -1779935173, -1781898681, -1783857419,
+    -1785811380, -1787760560, -1789704954, -1791644556, -1793579362,
+    -1795509366, -1797434562, -1799354946, -1801270513, -1803181257,
+    -1805087174, -1806988258, -1808884503, -1810775906, -1812662462,
+    -1814544164, -1816421007, -1818292988, -1820160101, -1822022340,
+    -1823879702, -1825732180, -1827579771, -1829422468, -1831260267,
+    -1833093164, -1834921153, -1836744229, -1838562388, -1840375624,
+    -1842183933, -1843987310, -1845785751, -1847579249, -1849367801,
+    -1851151401, -1852930046, -1854703729, -1856472447, -1858236195,
+    -1859994968, -1861748761, -1863497569, -1865241388, -1866980214,
+    -1868714041, -1870442864, -1872166681, -1873885484, -1875599271,
+    -1877308036, -1879011776, -1880710484, -1882404157, -1884092791,
+    -1885776380, -1887454920, -1889128407, -1890796837, -1892460204,
+    -1894118504, -1895771734, -1897419887, -1899062961, -1900700951,
+    -1902333851, -1903961659, -1905584369, -1907201977, -1908814479,
+    -1910421871, -1912024148, -1913621306, -1915213340, -1916800247,
+    -1918382022, -1919958661, -1921530159, -1923096514, -1924657719,
+    -1926213771, -1927764667, -1929310401, -1930850970, -1932386369,
+    -1933916595, -1935441643, -1936961510, -1938476190, -1939985681,
+    -1941489978, -1942989077, -1944482974, -1945971664, -1947455145,
+    -1948933412, -1950406461, -1951874289, -1953336890, -1954794262,
+    -1956246401, -1957693301, -1959134961, -1960571375, -1962002540,
+    -1963428453, -1964849109, -1966264504, -1967674635, -1969079498,
+    -1970479089, -1971873404, -1973262440, -1974646194, -1976024660,
+    -1977397836, -1978765718, -1980128302, -1981485585, -1982837563,
+    -1984184232, -1985525589, -1986861630, -1988192351, -1989517750,
+    -1990837822, -1992152564, -1993461973, -1994766044, -1996064775,
+    -1997358161, -1998646200, -1999928888, -2001206222, -2002478198,
+    -2003744813, -2005006063, -2006261945, -2007512455, -2008757591,
+    -2009997349, -2011231726, -2012460718, -2013684322, -2014902534,
+    -2016115352, -2017322773, -2018524792, -2019721407, -2020912615,
+    -2022098413, -2023278796, -2024453763, -2025623309, -2026787432,
+    -2027946129, -2029099397, -2030247232, -2031389631, -2032526592,
+    -2033658111, -2034784185, -2035904812, -2037019988, -2038129710,
+    -2039233976, -2040332782, -2041426125, -2042514003, -2043596412,
+    -2044673350, -2045744814, -2046810801, -2047871308, -2048926332,
+    -2049975870, -2051019920, -2052058479, -2053091544, -2054119112,
+    -2055141181, -2056157747, -2057168809, -2058174363, -2059174406,
+    -2060168936, -2061157951, -2062141448, -2063119423, -2064091875,
+    -2065058800, -2066020197, -2066976063, -2067926394, -2068871190,
+    -2069810446, -2070744160, -2071672331, -2072594955, -2073512030,
+    -2074423554, -2075329524, -2076229937, -2077124792, -2078014086,
+    -2078897817, -2079775981, -2080648577, -2081515603, -2082377056,
+    -2083232934, -2084083234, -2084927955, -2085767094, -2086600648,
+    -2087428616, -2088250996, -2089067784, -2089878979, -2090684580,
+    -2091484582, -2092278986, -2093067787, -2093850985, -2094628577,
+    -2095400561, -2096166935, -2096927697, -2097682844, -2098432376,
+    -2099176290, -2099914583, -2100647254, -2101374302, -2102095723,
+    -2102811516, -2103521679, -2104226211, -2104925109, -2105618372,
+    -2106305997, -2106987983, -2107664327, -2108335029, -2109000087,
+    -2109659498, -2110313260, -2110961373, -2111603834, -2112240642,
+    -2112871795, -2113497290, -2114117128, -2114731305, -2115339820,
+    -2115942673, -2116539860, -2117131380, -2117717232, -2118297415,
+    -2118871926, -2119440764, -2120003928, -2120561416, -2121113227,
+    -2121659358, -2122199810, -2122734579, -2123263666, -2123787068,
+    -2124304784, -2124816812, -2125323152, -2125823801, -2126318759,
+    -2126808025, -2127291596, -2127769472, -2128241651, -2128708132,
+    -2129168914, -2129623995, -2130073375, -2130517052, -2130955025,
+    -2131387293, -2131813854, -2132234708, -2132649854, -2133059289,
+    -2133463014, -2133861027, -2134253326, -2134639912, -2135020783,
+    -2135395937, -2135765375, -2136129094, -2136487095, -2136839375,
+    -2137185934, -2137526772, -2137861886, -2138191277, -2138514944,
+    -2138832885, -2139145099, -2139451587, -2139752346, -2140047377,
+    -2140336678, -2140620249, -2140898089, -2141170197, -2141436573,
+    -2141697215, -2141952123, -2142201296, -2142444735, -2142682437,
+    -2142914403, -2143140631, -2143361122, -2143575874, -2143784887,
+    -2143988161, -2144185694, -2144377487, -2144563539, -2144743849,
+    -2144918417, -2145087242, -2145250325, -2145407663, -2145559258,
+    -2145705109, -2145845215, -2145979576, -2146108191, -2146231061,
+    -2146348185, -2146459562, -2146565192, -2146665076, -2146759212,
+    -2146847600, -2146930241, -2147007134, -2147078279, -2147143675,
+    -2147203323, -2147257222, -2147305372, -2147347773, -2147384426,
+    -2147415329, -2147440482, -2147459887, -2147473542, -2147481447,
+    2147483468, 2147469095, 2147431723, 2147371355, 2147287990,
+    2147181629, 2147052273, 2146899924, 2146724584, 2146526254,
+    2146304937, 2146060634, 2145793349, 2145503083, 2145189842,
+    2144853627, 2144494442, 2144112292, 2143707180, 2143279110,
+    2142828088, 2142354118, 2141857204, 2141337354, 2140794571,
+    2140228862, 2139640233, 2139028690, 2138394240, 2137736889,
+    2137056645, 2136353515, 2135627506, 2134878626, 2134106884,
+    2133312286, 2132494843, 2131654563, 2130791454, 2129905526,
+    2128996788, 2128065251, 2127110924, 2126133817, 2125133941,
+    2124111307, 2123065925, 2121997806, 2120906963, 2119793407,
+    2118657149, 2117498202, 2116316578, 2115112291, 2113885352,
+    2112635775, 2111363574, 2110068761, 2108751352, 2107411359,
+    2106048798, 2104663683, 2103256028, 2101825849, 2100373162,
+    2098897981, 2097400322, 2095880202, 2094337637, 2092772643,
+    2091185237, 2089575437, 2087943258, 2086288720, 2084611839,
+    2082912633, 2081191122, 2079447322, 2077681253, 2075892934,
+    2074082383, 2072249621, 2070394667, 2068517540, 2066618262,
+    2064696851, 2062753329, 2060787717, 2058800036, 2056790306,
+    2054758550, 2052704789, 2050629045, 2048531340, 2046411698,
+    2044270140, 2042106689, 2039921369, 2037714204, 2035485216,
+    2033234429, 2030961869, 2028667558, 2026351522, 2024013785,
+    2021654373, 2019273310, 2016870623, 2014446336, 2012000477,
+    2009533071, 2007044144, 2004533723, 2002001835, 1999448508,
+    1996873768, 1994277643, 1991660161, 1989021350, 1986361238,
+    1983679853, 1980977226, 1978253383, 1975508355, 1972742171,
+    1969954860, 1967146453, 1964316979, 1961466469, 1958594953,
+    1955702462, 1952789027, 1949854680, 1946899451, 1943923372,
+    1940926475, 1937908793, 1934870357, 1931811201, 1928731356,
+    1925630856, 1922509734, 1919368023, 1916205758, 1913022972,
+    1909819698, 1906595972, 1903351828, 1900087301, 1896802425,
+    1893497236, 1890171769, 1886826060, 1883460144, 1880074058,
+    1876667838, 1873241521, 1869795142, 1866328740, 1862842350,
+    1859336011, 1855809760, 1852263635, 1848697674, 1845111914,
+    1841506395, 1837881155, 1834236233, 1830571667, 1826887497,
+    1823183763, 1819460504, 1815717761, 1811955572, 1808173978,
+    1804373021, 1800552740, 1796713177, 1792854372, 1788976368,
+    1785079205, 1781162925, 1777227570, 1773273182, 1769299805,
+    1765307479, 1761296249, 1757266156, 1753217244, 1749149557,
+    1745063138, 1740958031, 1736834279, 1732691928, 1728531020,
+    1724351602, 1720153717, 1715937410, 1711702727, 1707449714,
+    1703178415, 1698888876, 1694581143, 1690255263, 1685911282,
+    1681549245, 1677169201, 1672771196, 1668355276, 1663921490,
+    1659469885, 1655000508, 1650513407, 1646008631, 1641486227,
+    1636946244, 1632388731, 1627813736, 1623221309, 1618611498,
+    1613984353, 1609339924, 1604678260, 1599999411, 1595303428,
+    1590590360, 1585860258, 1581113173, 1576349155, 1571568256,
+    1566770527, 1561956018, 1557124783, 1552276872, 1547412337,
+    1542531231, 1537633606, 1532719513, 1527789007, 1522842139,
+    1517878963, 1512899531, 1507903898, 1502892116, 1497864239,
+    1492820322, 1487760417, 1482684580, 1477592864, 1472485325,
+    1467362016, 1462222994, 1457068312, 1451898025, 1446712191,
+    1441510863, 1436294098, 1431061951, 1425814478, 1420551737,
+    1415273782, 1409980671, 1404672460, 1399349206, 1394010966,
+    1388657798, 1383289758, 1377906904, 1372509294, 1367096986,
+    1361670037, 1356228505, 1350772450, 1345301929, 1339817000,
+    1334317724, 1328804158, 1323276361, 1317734393, 1312178313,
+    1306608181, 1301024057, 1295425999, 1289814068, 1284188325,
+    1278548828, 1272895640, 1267228820, 1261548429, 1255854528,
+    1250147177, 1244426439, 1238692373, 1232945043, 1227184508,
+    1221410831, 1215624074, 1209824299, 1204011567, 1198185941,
+    1192347484, 1186496258, 1180632325, 1174755748, 1168866591,
+    1162964917, 1157050787, 1151124267, 1145185419, 1139234307,
+    1133270995, 1127295547, 1121308026, 1115308496, 1109297023,
+    1103273670, 1097238502, 1091191583, 1085132978, 1079062753,
+    1072980972, 1066887699, 1060783002, 1054666944, 1048539592,
+    1042401010, 1036251266, 1030090423, 1023918550, 1017735711,
+    1011541973, 1005337402, 999122065, 992896028, 986659358,
+    980412122, 974154386, 967886217, 961607684, 955318852,
+    949019790, 942710564, 936391243, 930061894, 923722585,
+    917373383, 911014357, 904645574, 898267104, 891879014,
+    885481373, 879074249, 872657710, 866231826, 859796666,
+    853352298, 846898791, 840436214, 833964638, 827484130,
+    820994760, 814496598, 807989714, 801474176, 794950056,
+    788417422, 781876345, 775326894, 768769141, 762203154,
+    755629005, 749046764, 742456501, 735858287, 729252193,
+    722638289, 716016646, 709387335, 702750427, 696105993,
+    689454104, 682794832, 676128248, 669454423, 662773428,
+    656085336, 649390218, 642688145, 635979190, 629263424,
+    622540918, 615811746, 609075979, 602333690, 595584950,
+    588829831, 582068407, 575300749, 568526931, 561747023,
+    554961100, 548169234, 541371497, 534567963, 527758704,
+    520943793, 514123303, 507297307, 500465878, 493629090,
+    486787016, 479939728, 473087301, 466229807, 459367320,
+    452499914, 445627662, 438750638, 431868915, 424982567,
+    418091668, 411196291, 404296511, 397392401, 390484035,
+    383571488, 376654833, 369734144, 362809495, 355880961,
+    348948616, 342012534, 335072790, 328129457, 321182610,
+    314232323, 307278671, 300321729, 293361570, 286398270,
+    279431902, 272462542, 265490265, 258515144, 251537254,
+    244556671, 237573469, 230587722, 223599506, 216608896,
+    209615966, 202620791, 195623446, 188624006, 181622546,
+    174619141, 167613866, 160606796, 153598006, 146587571,
+    139575567, 132562067, 125547148, 118530885, 111513352,
+    104494625, 97474778, 90453888, 83432030, 76409277,
+    69385707, 62361393, 55336412, 48310838, 41284746,
+    34258213, 27231312, 20204120, 13176712, 6149162,
+    -878453, -7906059, -14933580, -21960942, -28988068,
+    -36014884, -43041314, -50067283, -57092716, -64117537,
+    -71141672, -78165045, -85187581, -92209205, -99229841,
+    -106249414, -113267850, -120285073, -127301007, -134315578,
+    -141328711, -148340330, -155350361, -162358728, -169365356,
+    -176370170, -183373096, -190374058, -197372981, -204369791,
+    -211364411, -218356769, -225346788, -232334393, -239319511,
+    -246302065, -253281982, -260259186, -267233603, -274205159,
+    -281173778, -288139385, -295101907, -302061269, -309017396,
+    -315970213, -322919647, -329865622, -336808065, -343746901,
+    -350682056, -357613455, -364541025, -371464690, -378384377,
+    -385300013, -392211522, -399118830, -406021865, -412920551,
+    -419814815, -426704583, -433589782, -440470337, -447346176,
+    -454217223, -461083406, -467944652, -474800886, -481652035,
+    -488498026, -495338786, -502174241, -509004318, -515828944,
+    -522648046, -529461551, -536269386, -543071478, -549867754,
+    -556658141, -563442567, -570220959, -576993244, -583759350,
+    -590519205, -597272736, -604019870, -610760536, -617494660,
+    -624222173, -630943000, -637657070, -644364312, -651064652,
+    -657758021, -664444345, -671123554, -677795576, -684460338,
+    -691117771, -697767803, -704410362, -711045377, -717672778,
+    -724292493, -730904451, -737508582, -744104815, -750693079,
+    -757273304, -763845419, -770409354, -776965038, -783512402,
+    -790051375, -796581887, -803103868, -809617249, -816121959,
+    -822617929, -829105090, -835583372, -842052705, -848513021,
+    -854964249, -861406322, -867839170, -874262724, -880676915,
+    -887081675, -893476935, -899862626, -906238681, -912605031,
+    -918961607, -925308342, -931645168, -937972016, -944288820,
+    -950595511, -956892022, -963178285, -969454234, -975719800,
+    -981974918, -988219519, -994453537, -1000676905, -1006889557,
+    -1013091426, -1019282445, -1025462549, -1031631671, -1037789745,
+    -1043936705, -1050072485, -1056197020, -1062310244, -1068412091,
+    -1074502497, -1080581395, -1086648722, -1092704411, -1098748398,
+    -1104780618, -1110801008, -1116809501, -1122806034, -1128790543,
+    -1134762964, -1140723232, -1146671283, -1152607055, -1158530484,
+    -1164441505, -1170340057, -1176226074, -1182099496, -1187960258,
+    -1193808298, -1199643553, -1205465961, -1211275460, -1217071986,
+    -1222855479, -1228625876, -1234383115, -1240127136, -1245857875,
+    -1251575272, -1257279266, -1262969796, -1268646800, -1274310217,
+    -1279959989, -1285596052, -1291218348, -1296826816, -1302421396,
+    -1308002029, -1313568653, -1319121210, -1324659641, -1330183885,
+    -1335693885, -1341189580, -1346670912, -1352137822, -1357590252,
+    -1363028143, -1368451438, -1373860077, -1379254004, -1384633159,
+    -1389997487, -1395346928, -1400681427, -1406000925, -1411305366,
+    -1416594694, -1421868850, -1427127780, -1432371426, -1437599733,
+    -1442812644, -1448010104, -1453192057, -1458358447, -1463509220,
+    -1468644319, -1473763690, -1478867279, -1483955030, -1489026889,
+    -1494082802, -1499122714, -1504146572, -1509154322, -1514145910,
+    -1519121283, -1524080387, -1529023170, -1533949577, -1538859558,
+    -1543753058, -1548630027, -1553490410, -1558334157, -1563161216,
+    -1567971534, -1572765060, -1577541744, -1582301533, -1587044377,
+    -1591770225, -1596479027, -1601170732, -1605845289, -1610502649,
+    -1615142762, -1619765578, -1624371047, -1628959121, -1633529750,
+    -1638082885, -1642618478, -1647136479, -1651636841, -1656119516,
+    -1660584454, -1665031609, -1669460933, -1673872378, -1678265898,
+    -1682641444, -1686998971, -1691338432, -1695659779, -1699962968,
+    -1704247951, -1708514683, -1712763118, -1716993211, -1721204917,
+    -1725398189, -1729572984, -1733729257, -1737866963, -1741986057,
+    -1746086497, -1750168237, -1754231234, -1758275445, -1762300826,
+    -1766307335, -1770294927, -1774263561, -1778213194, -1782143784,
+    -1786055289, -1789947667, -1793820875, -1797674873, -1801509620,
+    -1805325074, -1809121194, -1812897940, -1816655271, -1820393147,
+    -1824111529, -1827810376, -1831489648, -1835149306, -1838789312,
+    -1842409625, -1846010208, -1849591022, -1853152028, -1856693188,
+    -1860214464, -1863715819, -1867197215, -1870658615, -1874099982,
+    -1877521279, -1880922469, -1884303515, -1887664383, -1891005035,
+    -1894325435, -1897625550, -1900905342, -1904164776, -1907403819,
+    -1910622435, -1913820590, -1916998250, -1920155379, -1923291946,
+    -1926407915, -1929503255, -1932577931, -1935631910, -1938665161,
+    -1941677650, -1944669345, -1947640214, -1950590226, -1953519348,
+    -1956427550, -1959314800, -1962181067, -1965026321, -1967850531,
+    -1970653667, -1973435699, -1976196596, -1978936331, -1981654873,
+    -1984352192, -1987028261, -1989683050, -1992316532, -1994928677,
+    -1997519459, -2000088848, -2002636818, -2005163342, -2007668391,
+    -2010151941, -2012613963, -2015054432, -2017473321, -2019870604,
+    -2022246257, -2024600252, -2026932566, -2029243173, -2031532049,
+    -2033799168, -2036044507, -2038268042, -2040469748, -2042649603,
+    -2044807583, -2046943664, -2049057824, -2051150040, -2053220291,
+    -2055268553, -2057294804, -2059299024, -2061281190, -2063241282,
+    -2065179277, -2067095157, -2068988899, -2070860485, -2072709893,
+    -2074537104, -2076342098, -2078124857, -2079885360, -2081623590,
+    -2083339527, -2085033153, -2086704450, -2088353400, -2089979985,
+    -2091584189, -2093165993, -2094725382, -2096262337, -2097776843,
+    -2099268884, -2100738443, -2102185505, -2103610054, -2105012075,
+    -2106391553, -2107748474, -2109082822, -2110394584, -2111683744,
+    -2112950291, -2114194210, -2115415487, -2116614110, -2117790065,
+    -2118943341, -2120073924, -2121181804, -2122266967, -2123329402,
+    -2124369098, -2125386044, -2126380229, -2127351642, -2128300272,
+    -2129226111, -2130129147, -2131009371, -2131866773, -2132701345,
+    -2133513078, -2134301962, -2135067990, -2135811153, -2136531442,
+    -2137228852, -2137903373, -2138555000, -2139183723, -2139789539,
+    -2140372438, -2140932416, -2141469466, -2141983583, -2142474761,
+    -2142942995, -2143388280, -2143810610, -2144209982, -2144586392,
+    -2144939834, -2145270306, -2145577804, -2145862324, -2146123864,
+    -2146362421, -2146577992, -2146770575, -2146940167, -2147086768,
+    -2147210375, -2147310987, -2147388603, -2147443222, -2147474844,
+    2147482929, 2147425435, 2147275952, 2147034487, 2146701050,
+    2146275656, 2145758322, 2145149071, 2144447929, 2143654926,
+    2142770096, 2141793477, 2140725111, 2139565043, 2138313323,
+    2136970005, 2135535146, 2134008809, 2132391057, 2130681961,
+    2128881593, 2126990031, 2125007356, 2122933653, 2120769010,
+    2118513521, 2116167282, 2113730393, 2111202959, 2108585087,
+    2105876892, 2103078487, 2100189994, 2097211535, 2094143239,
+    2090985237, 2087737664, 2084400659, 2080974365, 2077458929,
+    2073854502, 2070161238, 2066379295, 2062508835, 2058550025,
+    2054503033, 2050368032, 2046145201, 2041834720, 2037436773,
+    2032951550, 2028379241, 2023720043, 2018974156, 2014141783,
+    2009223131, 2004218410, 1999127836, 1993951625, 1988690000,
+    1983343186, 1977911412, 1972394912, 1966793920, 1961108677,
+    1955339428, 1949486417, 1943549898, 1937530123, 1931427351,
+    1925241843, 1918973864, 1912623682, 1906191570, 1899677803,
+    1893082661, 1886406424, 1879649381, 1872811820, 1865894033,
+    1858896318, 1851818974, 1844662304, 1837426615, 1830112217,
+    1822719423, 1815248550, 1807699917, 1800073849, 1792370671,
+    1784590714, 1776734311, 1768801799, 1760793518, 1752709809,
+    1744551021, 1736317502, 1728009604, 1719627685, 1711172102,
+    1702643219, 1694041400, 1685367013, 1676620432, 1667802029,
+    1658912184, 1649951276, 1640919689, 1631817811, 1622646032,
+    1613404744, 1604094343, 1594715227, 1585267800, 1575752465,
+    1566169630, 1556519705, 1546803104, 1537020244, 1527171542,
+    1517257422, 1507278307, 1497234626, 1487126808, 1476955286,
+    1466720497, 1456422878, 1446062871, 1435640919, 1425157469,
+    1414612971, 1404007875, 1393342636, 1382617710, 1371833558,
+    1360990642, 1350089425, 1339130374, 1328113960, 1317040654,
+    1305910930, 1294725265, 1283484138, 1272188032, 1260837429,
+    1249432816, 1237974681, 1226463516, 1214899813, 1203284068,
+    1191616778, 1179898443, 1168129565, 1156310649, 1144442200,
+    1132524727, 1120558740, 1108544752, 1096483278, 1084374834,
+    1072219940, 1060019115, 1047772882, 1035481766, 1023146293,
+    1010766993, 998344394, 985879030, 973371434, 960822142,
+    948231691, 935600622, 922929474, 910218791, 897469118,
+    884680999, 871854984, 858991622, 846091463, 833155061,
+    820182969, 807175743, 794133941, 781058120, 767948841,
+    754806666, 741632158, 728425880, 715188400, 701920283,
+    688622098, 675294414, 661937804, 648552838, 635140090,
+    621700135, 608233549, 594740907, 581222789, 567679774,
+    554112440, 540521371, 526907147, 513270353, 499611571,
+    485931388, 472230390, 458509162, 444768294, 431008373,
+    417229989, 403433732, 389620194, 375789965, 361943639,
+    348081809, 334205068, 320314011, 306409232, 292491328,
+    278560894, 264618528, 250664827, 236700388, 222725809,
+    208741690, 194748629, 180747225, 166738079, 152721790,
+    138698959, 124670187, 110636075, 96597223, 82554233,
+    68507707, 54458246, 40406452, 26352928, 12298274,
+    -1756906, -15812011, -29866438, -43919586, -57970853,
+    -72019637, -86065335, -100107347, -114145071, -128177904,
+    -142205248, -156226499, -170241059, -184248325, -198247699,
+    -212238581, -226220372, -240192472, -254154282, -268105206,
+    -282044645, -295972002, -309886680, -323788084, -337675619,
+    -351548688, -365406698, -379249055, -393075166, -406884440,
+    -420676284, -434450107, -448205320, -461941333, -475657559,
+    -489353409, -503028296, -516681636, -530312842, -543921332,
+    -557506522, -571067830, -584604676, -598116479, -611602660,
+    -625062643, -638495850, -651901706, -665279637, -678629069,
+    -691949432, -705240153, -718500664, -731730397, -744928785,
+    -758095263, -771229267, -784330234, -797397602, -810430813,
+    -823429308, -836392529, -849319923, -862210934, -875065011,
+    -887881603, -900660162, -913400139, -926100989, -938762167,
+    -951383133, -963963344, -976502263, -988999351, -1001454074,
+    -1013865898, -1026234291, -1038558724, -1050838668, -1063073598,
+    -1075262990, -1087406320, -1099503070, -1111552721, -1123554757,
+    -1135508663, -1147413928, -1159270041, -1171076495, -1182832785,
+    -1194538405, -1206192856, -1217795637, -1229346252, -1240844206,
+    -1252289006, -1263680162, -1275017186, -1286299593, -1297526899,
+    -1308698624, -1319814288, -1330873416, -1341875533, -1352820169,
+    -1363706855, -1374535124, -1385304512, -1396014559, -1406664805,
+    -1417254794, -1427784073, -1438252190, -1448658697, -1459003149,
+    -1469285102, -1479504115, -1489659751, -1499751576, -1509779156,
+    -1519742062, -1529639867, -1539472148, -1549238483, -1558938453,
+    -1568571644, -1578137643, -1587636039, -1597066426, -1606428400,
+    -1615721561, -1624945509, -1634099849, -1643184191, -1652198144,
+    -1661141322, -1670013342, -1678813825, -1687542393, -1696198672,
+    -1704782292, -1713292884, -1721730085, -1730093532, -1738382868,
+    -1746597738, -1754737789, -1762802673, -1770792044, -1778705561,
+    -1786542883, -1794303676, -1801987607, -1809594347, -1817123570,
+    -1824574954, -1831948179, -1839242929, -1846458892, -1853595759,
+    -1860653224, -1867630985, -1874528743, -1881346202, -1888083070,
+    -1894739060, -1901313885, -1907807264, -1914218919, -1920548575,
+    -1926795962, -1932960811, -1939042858, -1945041843, -1950957509,
+    -1956789602, -1962537873, -1968202076, -1973781967, -1979277308,
+    -1984687864, -1990013401, -1995253694, -2000408516, -2005477648,
+    -2010460871, -2015357973, -2020168744, -2024892978, -2029530472,
+    -2034081027, -2038544449, -2042920547, -2047209133, -2051410023,
+    -2055523038, -2059548001, -2063484740, -2067333086, -2071092874,
+    -2074763944, -2078346137, -2081839301, -2085243286, -2088557947,
+    -2091783140, -2094918728, -2097964577, -2100920556, -2103786539,
+    -2106562402, -2109248028, -2111843300, -2114348108, -2116762344,
+    -2119085905, -2121318692, -2123460608, -2125511562, -2127471467,
+    -2129340237, -2131117794, -2132804061, -2134398966, -2135902440,
+    -2137314419, -2138634843, -2139863654, -2141000801, -2142046235,
+    -2142999911, -2143861787, -2144631828, -2145310000, -2145896274,
+    -2146390624, -2146793031, -2147103476, -2147321946, -2147448433,
+    2147480773, 2147250799, 2146652904, 2145687192, 2144353827,
+    2142653038, 2140585116, 2138150417, 2135349356, 2132182414,
+    2128650133, 2124753120, 2120492040, 2115867626, 2110880668,
+    2105532022, 2099822604, 2093753392, 2087325426, 2080539807,
+    2073397699, 2065900325, 2058048970, 2049844978, 2041289756,
+    2032384769, 2023131544, 2013531666, 2003586779, 1993298588,
+    1982668856, 1971699403, 1960392110, 1948748914, 1936771810,
+    1924462850, 1911824143, 1898857855, 1885566207, 1871951478,
+    1858015999, 1843762158, 1829192399, 1814309216, 1799115162,
+    1783612838, 1767804901, 1751694060, 1735283075, 1718574758,
+    1701571972, 1684277631, 1666694698, 1648826185, 1630675154,
+    1612244715, 1593538026, 1574558293, 1555308768, 1535792748,
+    1516013578, 1495974647, 1475679389, 1455131280, 1434333842,
+    1413290638, 1392005275, 1370481398, 1348722696, 1326732898,
+    1304515771, 1282075122, 1259414796, 1236538675, 1213450681,
+    1190154767, 1166654927, 1142955186, 1119059606, 1094972281,
+    1070697338, 1046238936, 1021601267, 996788551, 971805042,
+    946655018, 921342790, 895872694, 870249095, 844476384,
+    818558976, 792501312, 766307857, 739983099, 713531549,
+    686957739, 660266222, 633461572, 606548381, 579531262,
+    552414843, 525203770, 497902707, 470516330, 443049333,
+    415506422, 387892316, 360211746, 332469456, 304670200,
+    276818739, 248919847, 220978304, 192998897, 164986421,
+    136945676, 108881465, 80798598, 52701887, 24596146,
+    -3513810, -31623164, -59727099, -87820801, -115899455,
+    -143958250, -171992378, -199997036, -227967426, -255898755,
+    -283786237, -311625094, -339410555, -367137861, -394802258,
+    -422399009, -449923384, -477370666, -504736154, -532015158,
+    -559203003, -586295032, -613286603, -640173090, -666949886,
+    -693612404, -720156076, -746576352, -772868706, -799028633,
+    -825051651, -850933300, -876669146, -902254780, -927685817,
+    -952957899, -978066697, -1003007909, -1027777260, -1052370507,
+    -1076783436, -1101011863, -1125051638, -1148898640, -1172548785,
+    -1195998020, -1219242327, -1242277723, -1265100260, -1287706030,
+    -1310091157, -1332251808, -1354184184, -1375884527, -1397349119,
+    -1418574283, -1439556382, -1460291820, -1480777044, -1501008545,
+    -1520982856, -1540696555, -1560146263, -1579328647, -1598240423,
+    -1616878347, -1635239228, -1653319919, -1671117323, -1688628389,
+    -1705850117, -1722779556, -1739413807, -1755750017, -1771785389,
+    -1787517174, -1802942678, -1818059257, -1832864320, -1847355332,
+    -1861529809, -1875385322, -1888919498, -1902130017, -1915014616,
+    -1927571087, -1939797279, -1951691096, -1963250501, -1974473513,
+    -1985358210, -1995902725, -2006105253, -2015964045, -2025477412,
+    -2034643724, -2043461410, -2051928960, -2060044922, -2067807906,
+    -2075216581, -2082269679, -2088965991, -2095304370, -2101283728,
+    -2106903043, -2112161350, -2117057750, -2121591402, -2125761531,
+    -2129567422, -2133008422, -2136083942, -2138793455, -2141136497,
+    -2143112666, -2144721624, -2145963095, -2146836866, -2147342788,
 };
-#endif
+# endif
 
 static const CELTMode mode96000_1920_240 = {
-96000,    /* Fs */
-240,    /* overlap */
-21,    /* nbEBands */
-21,    /* effEBands */
-{30245, 7209, 6197, 5415, },    /* preemph */
-eband5ms,    /* eBands */
-3,    /* maxLM */
-8,    /* nbShortMdcts */
-240,    /* shortMdctSize */
-11,    /* nbAllocVectors */
-band_allocation,    /* allocVectors */
-logN400,    /* logN */
-window240,    /* window */
-{3840, 3, {&fft_state96000_1920_0, &fft_state96000_1920_1, &fft_state96000_1920_2, &fft_state96000_1920_3, }, mdct_twiddles1920},    /* mdct */
-{392, cache_index50, cache_bits50, cache_caps50},    /* cache */
+    96000, /* Fs */
+    240, /* overlap */
+    21, /* nbEBands */
+    21, /* effEBands */
+    {30245, 7209, 6197, 5415, }, /* preemph */
+    eband5ms, /* eBands */
+    3, /* maxLM */
+    8, /* nbShortMdcts */
+    240, /* shortMdctSize */
+    11, /* nbAllocVectors */
+    band_allocation, /* allocVectors */
+    logN400, /* logN */
+    window240, /* window */
+    {3840, 3, {&fft_state96000_1920_0, &fft_state96000_1920_1, &fft_state96000_1920_2, &fft_state96000_1920_3, },
+     mdct_twiddles1920},                                                                                                             /* mdct */
+    {392, cache_index50, cache_bits50, cache_caps50}, /* cache */
 };
 #endif /* ENABLE_QEXT */
 
 /* List of all the available modes */
 #ifdef ENABLE_QEXT
-#define TOTAL_MODES 2
+# define TOTAL_MODES 2
 static const CELTMode * const static_mode_list[TOTAL_MODES] = {
-&mode48000_960_120,
-&mode96000_1920_240,
+    &mode48000_960_120,
+    &mode96000_1920_240,
 };
 #else
-#define TOTAL_MODES 1
+# define TOTAL_MODES 1
 static const CELTMode * const static_mode_list[TOTAL_MODES] = {
-&mode48000_960_120,
+    &mode48000_960_120,
 };
 #endif
diff --git a/celt/static_modes_fixed_arm_ne10.h b/celt/static_modes_fixed_arm_ne10.h
index 762309219..dccb8386b 100644
--- a/celt/static_modes_fixed_arm_ne10.h
+++ b/celt/static_modes_fixed_arm_ne10.h
@@ -4,385 +4,385 @@
 #include <NE10_types.h>
 
 #ifndef NE10_FFT_PARAMS48000_960
-#define NE10_FFT_PARAMS48000_960
+# define NE10_FFT_PARAMS48000_960
 static const ne10_int32_t ne10_factors_480[64] = {
-4, 40, 4, 30, 2, 15, 5, 3, 3, 1, 1, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, };
+    4, 40, 4, 30, 2, 15, 5, 3, 3, 1, 1, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, };
 static const ne10_int32_t ne10_factors_240[64] = {
-3, 20, 4, 15, 5, 3, 3, 1, 1, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, };
+    3, 20, 4, 15, 5, 3, 3, 1, 1, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, };
 static const ne10_int32_t ne10_factors_120[64] = {
-3, 10, 2, 15, 5, 3, 3, 1, 1, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, };
+    3, 10, 2, 15, 5, 3, 3, 1, 1, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, };
 static const ne10_int32_t ne10_factors_60[64] = {
-2, 5, 5, 3, 3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, };
+    2, 5, 5, 3, 3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, };
 static const ne10_fft_cpx_int32_t ne10_twiddles_480[480] = {
-{0,0}, {2147483647,0}, {2147483647,0},
-{2147483647,0}, {1961823921,-873460313}, {1436946998,-1595891394},
-{2147483647,0}, {1436946998,-1595891394}, {-224473265,-2135719496},
-{2147483647,0}, {663608871,-2042378339}, {-1737350854,-1262259096},
-{2147483647,0}, {-224473265,-2135719496}, {-2100555935,446487152},
-{2147483647,0}, {2100555974,-446486968}, {1961823921,-873460313},
-{1737350743,-1262259248}, {1436946998,-1595891394}, {1073741769,-1859775424},
-{663608871,-2042378339}, {224473078,-2135719516}, {-224473265,-2135719496},
-{-663609049,-2042378281}, {-1073741932,-1859775330}, {-1436947137,-1595891268},
-{-1737350854,-1262259096}, {-1961823997,-873460141}, {-2100556013,-446486785},
-{2147483647,0}, {2144540595,-112390613}, {2135719506,-224473172},
-{2121044558,-335940465}, {2100555974,-446486968}, {2074309912,-555809682},
-{2042378310,-663608960}, {2004848691,-769589332}, {1961823921,-873460313},
-{1913421927,-974937199}, {1859775377,-1073741851}, {1801031311,-1169603450},
-{1737350743,-1262259248}, {1668908218,-1351455280}, {1595891331,-1436947067},
-{1518500216,-1518500282}, {1436946998,-1595891394}, {1351455207,-1668908277},
-{1262259172,-1737350799}, {1169603371,-1801031362}, {1073741769,-1859775424},
-{974937230,-1913421912}, {873460227,-1961823959}, {769589125,-2004848771},
-{663608871,-2042378339}, {555809715,-2074309903}, {446486876,-2100555994},
-{335940246,-2121044593}, {224473078,-2135719516}, {112390647,-2144540593},
-{2147483647,0}, {2135719506,-224473172}, {2100555974,-446486968},
-{2042378310,-663608960}, {1961823921,-873460313}, {1859775377,-1073741851},
-{1737350743,-1262259248}, {1595891331,-1436947067}, {1436946998,-1595891394},
-{1262259172,-1737350799}, {1073741769,-1859775424}, {873460227,-1961823959},
-{663608871,-2042378339}, {446486876,-2100555994}, {224473078,-2135719516},
-{-94,-2147483647}, {-224473265,-2135719496}, {-446487060,-2100555955},
-{-663609049,-2042378281}, {-873460398,-1961823883}, {-1073741932,-1859775330},
-{-1262259116,-1737350839}, {-1436947137,-1595891268}, {-1595891628,-1436946738},
-{-1737350854,-1262259096}, {-1859775343,-1073741910}, {-1961823997,-873460141},
-{-2042378447,-663608538}, {-2100556013,-446486785}, {-2135719499,-224473240},
-{2147483647,0}, {2121044558,-335940465}, {2042378310,-663608960},
-{1913421927,-974937199}, {1737350743,-1262259248}, {1518500216,-1518500282},
-{1262259172,-1737350799}, {974937230,-1913421912}, {663608871,-2042378339},
-{335940246,-2121044593}, {-94,-2147483647}, {-335940431,-2121044564},
-{-663609049,-2042378281}, {-974937397,-1913421827}, {-1262259116,-1737350839},
-{-1518500258,-1518500240}, {-1737350854,-1262259096}, {-1913422071,-974936918},
-{-2042378447,-663608538}, {-2121044568,-335940406}, {-2147483647,188},
-{-2121044509,335940777}, {-2042378331,663608895}, {-1913421900,974937252},
-{-1737350633,1262259400}, {-1518499993,1518500506}, {-1262258813,1737351059},
-{-974936606,1913422229}, {-663609179,2042378239}, {-335940566,2121044542},
-{2147483647,0}, {2147299667,-28109693}, {2146747758,-56214570},
-{2145828015,-84309815}, {2144540595,-112390613}, {2142885719,-140452154},
-{2140863671,-168489630}, {2138474797,-196498235}, {2135719506,-224473172},
-{2132598271,-252409646}, {2129111626,-280302871}, {2125260168,-308148068},
-{2121044558,-335940465}, {2116465518,-363675300}, {2111523833,-391347822},
-{2106220349,-418953288}, {2100555974,-446486968}, {2094531681,-473944146},
-{2088148500,-501320115}, {2081407525,-528610186}, {2074309912,-555809682},
-{2066856885,-582913912}, {2059049696,-609918325}, {2050889698,-636818231},
-{2042378310,-663608960}, {2033516972,-690285983}, {2024307180,-716844791},
-{2014750533,-743280770}, {2004848691,-769589332}, {1994603329,-795766029},
-{1984016179,-821806435}, {1973089077,-847706028}, {1961823921,-873460313},
-{1950222618,-899064934}, {1938287127,-924515564}, {1926019520,-949807783},
-{1913421927,-974937199}, {1900496481,-999899565}, {1887245364,-1024690661},
-{1873670877,-1049306180}, {1859775377,-1073741851}, {1845561215,-1097993541},
-{1831030826,-1122057097}, {1816186632,-1145928502}, {1801031311,-1169603450},
-{1785567394,-1193077993}, {1769797456,-1216348214}, {1753724345,-1239409914},
-{1737350743,-1262259248}, {1720679456,-1284892300}, {1703713340,-1307305194},
-{1686455222,-1329494189}, {1668908218,-1351455280}, {1651075255,-1373184807},
-{1632959307,-1394679144}, {1614563642,-1415934412}, {1595891331,-1436947067},
-{1576945572,-1457713510}, {1557729613,-1478230181}, {1538246655,-1498493658},
-{1518500216,-1518500282}, {1498493590,-1538246721}, {1478230113,-1557729677},
-{1457713441,-1576945636}, {1436946998,-1595891394}, {1415934341,-1614563704},
-{1394679073,-1632959368}, {1373184735,-1651075315}, {1351455207,-1668908277},
-{1329494115,-1686455280}, {1307305120,-1703713397}, {1284892225,-1720679512},
-{1262259172,-1737350799}, {1239409837,-1753724400}, {1216348136,-1769797510},
-{1193077915,-1785567446}, {1169603371,-1801031362}, {1145928423,-1816186682},
-{1122057017,-1831030875}, {1097993571,-1845561197}, {1073741769,-1859775424},
-{1049305987,-1873670985}, {1024690635,-1887245378}, {999899482,-1900496524},
-{974937230,-1913421912}, {949807699,-1926019561}, {924515422,-1938287195},
-{899064965,-1950222603}, {873460227,-1961823959}, {847705824,-1973089164},
-{821806407,-1984016190}, {795765941,-1994603364}, {769589125,-2004848771},
-{743280682,-2014750566}, {716844642,-2024307233}, {690286016,-2033516961},
-{663608871,-2042378339}, {636818019,-2050889764}, {609918296,-2059049705},
-{582913822,-2066856911}, {555809715,-2074309903}, {528610126,-2081407540},
-{501319962,-2088148536}, {473944148,-2094531680}, {446486876,-2100555994},
-{418953102,-2106220386}, {391347792,-2111523838}, {363675176,-2116465540},
-{335940246,-2121044593}, {308148006,-2125260177}, {280302715,-2129111646},
-{252409648,-2132598271}, {224473078,-2135719516}, {196498046,-2138474814},
-{168489600,-2140863674}, {140452029,-2142885728}, {112390647,-2144540593},
-{84309753,-2145828017}, {56214412,-2146747762}, {28109695,-2147299667},
-{2147483647,0}, {2146747758,-56214570}, {2144540595,-112390613},
-{2140863671,-168489630}, {2135719506,-224473172}, {2129111626,-280302871},
-{2121044558,-335940465}, {2111523833,-391347822}, {2100555974,-446486968},
-{2088148500,-501320115}, {2074309912,-555809682}, {2059049696,-609918325},
-{2042378310,-663608960}, {2024307180,-716844791}, {2004848691,-769589332},
-{1984016179,-821806435}, {1961823921,-873460313}, {1938287127,-924515564},
-{1913421927,-974937199}, {1887245364,-1024690661}, {1859775377,-1073741851},
-{1831030826,-1122057097}, {1801031311,-1169603450}, {1769797456,-1216348214},
-{1737350743,-1262259248}, {1703713340,-1307305194}, {1668908218,-1351455280},
-{1632959307,-1394679144}, {1595891331,-1436947067}, {1557729613,-1478230181},
-{1518500216,-1518500282}, {1478230113,-1557729677}, {1436946998,-1595891394},
-{1394679073,-1632959368}, {1351455207,-1668908277}, {1307305120,-1703713397},
-{1262259172,-1737350799}, {1216348136,-1769797510}, {1169603371,-1801031362},
-{1122057017,-1831030875}, {1073741769,-1859775424}, {1024690635,-1887245378},
-{974937230,-1913421912}, {924515422,-1938287195}, {873460227,-1961823959},
-{821806407,-1984016190}, {769589125,-2004848771}, {716844642,-2024307233},
-{663608871,-2042378339}, {609918296,-2059049705}, {555809715,-2074309903},
-{501319962,-2088148536}, {446486876,-2100555994}, {391347792,-2111523838},
-{335940246,-2121044593}, {280302715,-2129111646}, {224473078,-2135719516},
-{168489600,-2140863674}, {112390647,-2144540593}, {56214412,-2146747762},
-{-94,-2147483647}, {-56214600,-2146747757}, {-112390835,-2144540584},
-{-168489787,-2140863659}, {-224473265,-2135719496}, {-280302901,-2129111622},
-{-335940431,-2121044564}, {-391347977,-2111523804}, {-446487060,-2100555955},
-{-501320144,-2088148493}, {-555809896,-2074309855}, {-609918476,-2059049651},
-{-663609049,-2042378281}, {-716844819,-2024307170}, {-769589300,-2004848703},
-{-821806581,-1984016118}, {-873460398,-1961823883}, {-924515591,-1938287114},
-{-974937397,-1913421827}, {-1024690575,-1887245411}, {-1073741932,-1859775330},
-{-1122057395,-1831030643}, {-1169603421,-1801031330}, {-1216348291,-1769797403},
-{-1262259116,-1737350839}, {-1307305268,-1703713283}, {-1351455453,-1668908078},
-{-1394679021,-1632959413}, {-1436947137,-1595891268}, {-1478230435,-1557729372},
-{-1518500258,-1518500240}, {-1557729742,-1478230045}, {-1595891628,-1436946738},
-{-1632959429,-1394679001}, {-1668908417,-1351455035}, {-1703713298,-1307305248},
-{-1737350854,-1262259096}, {-1769797708,-1216347848}, {-1801031344,-1169603400},
-{-1831030924,-1122056937}, {-1859775343,-1073741910}, {-1887245423,-1024690552},
-{-1913422071,-974936918}, {-1938287125,-924515568}, {-1961823997,-873460141},
-{-1984016324,-821806084}, {-2004848713,-769589276}, {-2024307264,-716844553},
-{-2042378447,-663608538}, {-2059049731,-609918206}, {-2074309994,-555809377},
-{-2088148499,-501320119}, {-2100556013,-446486785}, {-2111523902,-391347448},
-{-2121044568,-335940406}, {-2129111659,-280302621}, {-2135719499,-224473240},
-{-2140863681,-168489506}, {-2144540612,-112390298}, {-2146747758,-56214574},
-{2147483647,0}, {2145828015,-84309815}, {2140863671,-168489630},
-{2132598271,-252409646}, {2121044558,-335940465}, {2106220349,-418953288},
-{2088148500,-501320115}, {2066856885,-582913912}, {2042378310,-663608960},
-{2014750533,-743280770}, {1984016179,-821806435}, {1950222618,-899064934},
-{1913421927,-974937199}, {1873670877,-1049306180}, {1831030826,-1122057097},
-{1785567394,-1193077993}, {1737350743,-1262259248}, {1686455222,-1329494189},
-{1632959307,-1394679144}, {1576945572,-1457713510}, {1518500216,-1518500282},
-{1457713441,-1576945636}, {1394679073,-1632959368}, {1329494115,-1686455280},
-{1262259172,-1737350799}, {1193077915,-1785567446}, {1122057017,-1831030875},
-{1049305987,-1873670985}, {974937230,-1913421912}, {899064965,-1950222603},
-{821806407,-1984016190}, {743280682,-2014750566}, {663608871,-2042378339},
-{582913822,-2066856911}, {501319962,-2088148536}, {418953102,-2106220386},
-{335940246,-2121044593}, {252409648,-2132598271}, {168489600,-2140863674},
-{84309753,-2145828017}, {-94,-2147483647}, {-84309940,-2145828010},
-{-168489787,-2140863659}, {-252409834,-2132598249}, {-335940431,-2121044564},
-{-418953286,-2106220349}, {-501320144,-2088148493}, {-582914003,-2066856860},
-{-663609049,-2042378281}, {-743280858,-2014750501}, {-821806581,-1984016118},
-{-899065136,-1950222525}, {-974937397,-1913421827}, {-1049306374,-1873670768},
-{-1122057395,-1831030643}, {-1193078284,-1785567199}, {-1262259116,-1737350839},
-{-1329494061,-1686455323}, {-1394679021,-1632959413}, {-1457713485,-1576945595},
-{-1518500258,-1518500240}, {-1576945613,-1457713466}, {-1632959429,-1394679001},
-{-1686455338,-1329494041}, {-1737350854,-1262259096}, {-1785567498,-1193077837},
-{-1831030924,-1122056937}, {-1873671031,-1049305905}, {-1913422071,-974936918},
-{-1950222750,-899064648}, {-1984016324,-821806084}, {-2014750687,-743280354},
-{-2042378447,-663608538}, {-2066856867,-582913978}, {-2088148499,-501320119},
-{-2106220354,-418953261}, {-2121044568,-335940406}, {-2132598282,-252409555},
-{-2140863681,-168489506}, {-2145828021,-84309659}, {-2147483647,188},
-{-2145828006,84310034}, {-2140863651,168489881}, {-2132598237,252409928},
-{-2121044509,335940777}, {-2106220281,418953629}, {-2088148411,501320484},
-{-2066856765,582914339}, {-2042378331,663608895}, {-2014750557,743280706},
-{-1984016181,821806431}, {-1950222593,899064989}, {-1913421900,974937252},
-{-1873670848,1049306232}, {-1831030728,1122057257}, {-1785567289,1193078149},
-{-1737350633,1262259400}, {-1686455106,1329494336}, {-1632959185,1394679287},
-{-1576945358,1457713742}, {-1518499993,1518500506}, {-1457713209,1576945850},
-{-1394678735,1632959656}, {-1329493766,1686455555}, {-1262258813,1737351059},
-{-1193077546,1785567692}, {-1122056638,1831031107}, {-1049305599,1873671202},
-{-974936606,1913422229}, {-899064330,1950222896}, {-821805761,1984016458},
-{-743280025,2014750808}, {-663609179,2042378239}, {-582914134,2066856823},
-{-501320277,2088148461}, {-418953420,2106220322}, {-335940566,2121044542},
-{-252409716,2132598263}, {-168489668,2140863668}, {-84309821,2145828015},
+    {0, 0}, {2147483647, 0}, {2147483647, 0},
+    {2147483647, 0}, {1961823921, -873460313}, {1436946998, -1595891394},
+    {2147483647, 0}, {1436946998, -1595891394}, {-224473265, -2135719496},
+    {2147483647, 0}, {663608871, -2042378339}, {-1737350854, -1262259096},
+    {2147483647, 0}, {-224473265, -2135719496}, {-2100555935, 446487152},
+    {2147483647, 0}, {2100555974, -446486968}, {1961823921, -873460313},
+    {1737350743, -1262259248}, {1436946998, -1595891394}, {1073741769, -1859775424},
+    {663608871, -2042378339}, {224473078, -2135719516}, {-224473265, -2135719496},
+    {-663609049, -2042378281}, {-1073741932, -1859775330}, {-1436947137, -1595891268},
+    {-1737350854, -1262259096}, {-1961823997, -873460141}, {-2100556013, -446486785},
+    {2147483647, 0}, {2144540595, -112390613}, {2135719506, -224473172},
+    {2121044558, -335940465}, {2100555974, -446486968}, {2074309912, -555809682},
+    {2042378310, -663608960}, {2004848691, -769589332}, {1961823921, -873460313},
+    {1913421927, -974937199}, {1859775377, -1073741851}, {1801031311, -1169603450},
+    {1737350743, -1262259248}, {1668908218, -1351455280}, {1595891331, -1436947067},
+    {1518500216, -1518500282}, {1436946998, -1595891394}, {1351455207, -1668908277},
+    {1262259172, -1737350799}, {1169603371, -1801031362}, {1073741769, -1859775424},
+    {974937230, -1913421912}, {873460227, -1961823959}, {769589125, -2004848771},
+    {663608871, -2042378339}, {555809715, -2074309903}, {446486876, -2100555994},
+    {335940246, -2121044593}, {224473078, -2135719516}, {112390647, -2144540593},
+    {2147483647, 0}, {2135719506, -224473172}, {2100555974, -446486968},
+    {2042378310, -663608960}, {1961823921, -873460313}, {1859775377, -1073741851},
+    {1737350743, -1262259248}, {1595891331, -1436947067}, {1436946998, -1595891394},
+    {1262259172, -1737350799}, {1073741769, -1859775424}, {873460227, -1961823959},
+    {663608871, -2042378339}, {446486876, -2100555994}, {224473078, -2135719516},
+    {-94, -2147483647}, {-224473265, -2135719496}, {-446487060, -2100555955},
+    {-663609049, -2042378281}, {-873460398, -1961823883}, {-1073741932, -1859775330},
+    {-1262259116, -1737350839}, {-1436947137, -1595891268}, {-1595891628, -1436946738},
+    {-1737350854, -1262259096}, {-1859775343, -1073741910}, {-1961823997, -873460141},
+    {-2042378447, -663608538}, {-2100556013, -446486785}, {-2135719499, -224473240},
+    {2147483647, 0}, {2121044558, -335940465}, {2042378310, -663608960},
+    {1913421927, -974937199}, {1737350743, -1262259248}, {1518500216, -1518500282},
+    {1262259172, -1737350799}, {974937230, -1913421912}, {663608871, -2042378339},
+    {335940246, -2121044593}, {-94, -2147483647}, {-335940431, -2121044564},
+    {-663609049, -2042378281}, {-974937397, -1913421827}, {-1262259116, -1737350839},
+    {-1518500258, -1518500240}, {-1737350854, -1262259096}, {-1913422071, -974936918},
+    {-2042378447, -663608538}, {-2121044568, -335940406}, {-2147483647, 188},
+    {-2121044509, 335940777}, {-2042378331, 663608895}, {-1913421900, 974937252},
+    {-1737350633, 1262259400}, {-1518499993, 1518500506}, {-1262258813, 1737351059},
+    {-974936606, 1913422229}, {-663609179, 2042378239}, {-335940566, 2121044542},
+    {2147483647, 0}, {2147299667, -28109693}, {2146747758, -56214570},
+    {2145828015, -84309815}, {2144540595, -112390613}, {2142885719, -140452154},
+    {2140863671, -168489630}, {2138474797, -196498235}, {2135719506, -224473172},
+    {2132598271, -252409646}, {2129111626, -280302871}, {2125260168, -308148068},
+    {2121044558, -335940465}, {2116465518, -363675300}, {2111523833, -391347822},
+    {2106220349, -418953288}, {2100555974, -446486968}, {2094531681, -473944146},
+    {2088148500, -501320115}, {2081407525, -528610186}, {2074309912, -555809682},
+    {2066856885, -582913912}, {2059049696, -609918325}, {2050889698, -636818231},
+    {2042378310, -663608960}, {2033516972, -690285983}, {2024307180, -716844791},
+    {2014750533, -743280770}, {2004848691, -769589332}, {1994603329, -795766029},
+    {1984016179, -821806435}, {1973089077, -847706028}, {1961823921, -873460313},
+    {1950222618, -899064934}, {1938287127, -924515564}, {1926019520, -949807783},
+    {1913421927, -974937199}, {1900496481, -999899565}, {1887245364, -1024690661},
+    {1873670877, -1049306180}, {1859775377, -1073741851}, {1845561215, -1097993541},
+    {1831030826, -1122057097}, {1816186632, -1145928502}, {1801031311, -1169603450},
+    {1785567394, -1193077993}, {1769797456, -1216348214}, {1753724345, -1239409914},
+    {1737350743, -1262259248}, {1720679456, -1284892300}, {1703713340, -1307305194},
+    {1686455222, -1329494189}, {1668908218, -1351455280}, {1651075255, -1373184807},
+    {1632959307, -1394679144}, {1614563642, -1415934412}, {1595891331, -1436947067},
+    {1576945572, -1457713510}, {1557729613, -1478230181}, {1538246655, -1498493658},
+    {1518500216, -1518500282}, {1498493590, -1538246721}, {1478230113, -1557729677},
+    {1457713441, -1576945636}, {1436946998, -1595891394}, {1415934341, -1614563704},
+    {1394679073, -1632959368}, {1373184735, -1651075315}, {1351455207, -1668908277},
+    {1329494115, -1686455280}, {1307305120, -1703713397}, {1284892225, -1720679512},
+    {1262259172, -1737350799}, {1239409837, -1753724400}, {1216348136, -1769797510},
+    {1193077915, -1785567446}, {1169603371, -1801031362}, {1145928423, -1816186682},
+    {1122057017, -1831030875}, {1097993571, -1845561197}, {1073741769, -1859775424},
+    {1049305987, -1873670985}, {1024690635, -1887245378}, {999899482, -1900496524},
+    {974937230, -1913421912}, {949807699, -1926019561}, {924515422, -1938287195},
+    {899064965, -1950222603}, {873460227, -1961823959}, {847705824, -1973089164},
+    {821806407, -1984016190}, {795765941, -1994603364}, {769589125, -2004848771},
+    {743280682, -2014750566}, {716844642, -2024307233}, {690286016, -2033516961},
+    {663608871, -2042378339}, {636818019, -2050889764}, {609918296, -2059049705},
+    {582913822, -2066856911}, {555809715, -2074309903}, {528610126, -2081407540},
+    {501319962, -2088148536}, {473944148, -2094531680}, {446486876, -2100555994},
+    {418953102, -2106220386}, {391347792, -2111523838}, {363675176, -2116465540},
+    {335940246, -2121044593}, {308148006, -2125260177}, {280302715, -2129111646},
+    {252409648, -2132598271}, {224473078, -2135719516}, {196498046, -2138474814},
+    {168489600, -2140863674}, {140452029, -2142885728}, {112390647, -2144540593},
+    {84309753, -2145828017}, {56214412, -2146747762}, {28109695, -2147299667},
+    {2147483647, 0}, {2146747758, -56214570}, {2144540595, -112390613},
+    {2140863671, -168489630}, {2135719506, -224473172}, {2129111626, -280302871},
+    {2121044558, -335940465}, {2111523833, -391347822}, {2100555974, -446486968},
+    {2088148500, -501320115}, {2074309912, -555809682}, {2059049696, -609918325},
+    {2042378310, -663608960}, {2024307180, -716844791}, {2004848691, -769589332},
+    {1984016179, -821806435}, {1961823921, -873460313}, {1938287127, -924515564},
+    {1913421927, -974937199}, {1887245364, -1024690661}, {1859775377, -1073741851},
+    {1831030826, -1122057097}, {1801031311, -1169603450}, {1769797456, -1216348214},
+    {1737350743, -1262259248}, {1703713340, -1307305194}, {1668908218, -1351455280},
+    {1632959307, -1394679144}, {1595891331, -1436947067}, {1557729613, -1478230181},
+    {1518500216, -1518500282}, {1478230113, -1557729677}, {1436946998, -1595891394},
+    {1394679073, -1632959368}, {1351455207, -1668908277}, {1307305120, -1703713397},
+    {1262259172, -1737350799}, {1216348136, -1769797510}, {1169603371, -1801031362},
+    {1122057017, -1831030875}, {1073741769, -1859775424}, {1024690635, -1887245378},
+    {974937230, -1913421912}, {924515422, -1938287195}, {873460227, -1961823959},
+    {821806407, -1984016190}, {769589125, -2004848771}, {716844642, -2024307233},
+    {663608871, -2042378339}, {609918296, -2059049705}, {555809715, -2074309903},
+    {501319962, -2088148536}, {446486876, -2100555994}, {391347792, -2111523838},
+    {335940246, -2121044593}, {280302715, -2129111646}, {224473078, -2135719516},
+    {168489600, -2140863674}, {112390647, -2144540593}, {56214412, -2146747762},
+    {-94, -2147483647}, {-56214600, -2146747757}, {-112390835, -2144540584},
+    {-168489787, -2140863659}, {-224473265, -2135719496}, {-280302901, -2129111622},
+    {-335940431, -2121044564}, {-391347977, -2111523804}, {-446487060, -2100555955},
+    {-501320144, -2088148493}, {-555809896, -2074309855}, {-609918476, -2059049651},
+    {-663609049, -2042378281}, {-716844819, -2024307170}, {-769589300, -2004848703},
+    {-821806581, -1984016118}, {-873460398, -1961823883}, {-924515591, -1938287114},
+    {-974937397, -1913421827}, {-1024690575, -1887245411}, {-1073741932, -1859775330},
+    {-1122057395, -1831030643}, {-1169603421, -1801031330}, {-1216348291, -1769797403},
+    {-1262259116, -1737350839}, {-1307305268, -1703713283}, {-1351455453, -1668908078},
+    {-1394679021, -1632959413}, {-1436947137, -1595891268}, {-1478230435, -1557729372},
+    {-1518500258, -1518500240}, {-1557729742, -1478230045}, {-1595891628, -1436946738},
+    {-1632959429, -1394679001}, {-1668908417, -1351455035}, {-1703713298, -1307305248},
+    {-1737350854, -1262259096}, {-1769797708, -1216347848}, {-1801031344, -1169603400},
+    {-1831030924, -1122056937}, {-1859775343, -1073741910}, {-1887245423, -1024690552},
+    {-1913422071, -974936918}, {-1938287125, -924515568}, {-1961823997, -873460141},
+    {-1984016324, -821806084}, {-2004848713, -769589276}, {-2024307264, -716844553},
+    {-2042378447, -663608538}, {-2059049731, -609918206}, {-2074309994, -555809377},
+    {-2088148499, -501320119}, {-2100556013, -446486785}, {-2111523902, -391347448},
+    {-2121044568, -335940406}, {-2129111659, -280302621}, {-2135719499, -224473240},
+    {-2140863681, -168489506}, {-2144540612, -112390298}, {-2146747758, -56214574},
+    {2147483647, 0}, {2145828015, -84309815}, {2140863671, -168489630},
+    {2132598271, -252409646}, {2121044558, -335940465}, {2106220349, -418953288},
+    {2088148500, -501320115}, {2066856885, -582913912}, {2042378310, -663608960},
+    {2014750533, -743280770}, {1984016179, -821806435}, {1950222618, -899064934},
+    {1913421927, -974937199}, {1873670877, -1049306180}, {1831030826, -1122057097},
+    {1785567394, -1193077993}, {1737350743, -1262259248}, {1686455222, -1329494189},
+    {1632959307, -1394679144}, {1576945572, -1457713510}, {1518500216, -1518500282},
+    {1457713441, -1576945636}, {1394679073, -1632959368}, {1329494115, -1686455280},
+    {1262259172, -1737350799}, {1193077915, -1785567446}, {1122057017, -1831030875},
+    {1049305987, -1873670985}, {974937230, -1913421912}, {899064965, -1950222603},
+    {821806407, -1984016190}, {743280682, -2014750566}, {663608871, -2042378339},
+    {582913822, -2066856911}, {501319962, -2088148536}, {418953102, -2106220386},
+    {335940246, -2121044593}, {252409648, -2132598271}, {168489600, -2140863674},
+    {84309753, -2145828017}, {-94, -2147483647}, {-84309940, -2145828010},
+    {-168489787, -2140863659}, {-252409834, -2132598249}, {-335940431, -2121044564},
+    {-418953286, -2106220349}, {-501320144, -2088148493}, {-582914003, -2066856860},
+    {-663609049, -2042378281}, {-743280858, -2014750501}, {-821806581, -1984016118},
+    {-899065136, -1950222525}, {-974937397, -1913421827}, {-1049306374, -1873670768},
+    {-1122057395, -1831030643}, {-1193078284, -1785567199}, {-1262259116, -1737350839},
+    {-1329494061, -1686455323}, {-1394679021, -1632959413}, {-1457713485, -1576945595},
+    {-1518500258, -1518500240}, {-1576945613, -1457713466}, {-1632959429, -1394679001},
+    {-1686455338, -1329494041}, {-1737350854, -1262259096}, {-1785567498, -1193077837},
+    {-1831030924, -1122056937}, {-1873671031, -1049305905}, {-1913422071, -974936918},
+    {-1950222750, -899064648}, {-1984016324, -821806084}, {-2014750687, -743280354},
+    {-2042378447, -663608538}, {-2066856867, -582913978}, {-2088148499, -501320119},
+    {-2106220354, -418953261}, {-2121044568, -335940406}, {-2132598282, -252409555},
+    {-2140863681, -168489506}, {-2145828021, -84309659}, {-2147483647, 188},
+    {-2145828006, 84310034}, {-2140863651, 168489881}, {-2132598237, 252409928},
+    {-2121044509, 335940777}, {-2106220281, 418953629}, {-2088148411, 501320484},
+    {-2066856765, 582914339}, {-2042378331, 663608895}, {-2014750557, 743280706},
+    {-1984016181, 821806431}, {-1950222593, 899064989}, {-1913421900, 974937252},
+    {-1873670848, 1049306232}, {-1831030728, 1122057257}, {-1785567289, 1193078149},
+    {-1737350633, 1262259400}, {-1686455106, 1329494336}, {-1632959185, 1394679287},
+    {-1576945358, 1457713742}, {-1518499993, 1518500506}, {-1457713209, 1576945850},
+    {-1394678735, 1632959656}, {-1329493766, 1686455555}, {-1262258813, 1737351059},
+    {-1193077546, 1785567692}, {-1122056638, 1831031107}, {-1049305599, 1873671202},
+    {-974936606, 1913422229}, {-899064330, 1950222896}, {-821805761, 1984016458},
+    {-743280025, 2014750808}, {-663609179, 2042378239}, {-582914134, 2066856823},
+    {-501320277, 2088148461}, {-418953420, 2106220322}, {-335940566, 2121044542},
+    {-252409716, 2132598263}, {-168489668, 2140863668}, {-84309821, 2145828015},
 };
 static const ne10_fft_cpx_int32_t ne10_twiddles_240[240] = {
-{0,0}, {2147483647,0}, {2147483647,0},
-{2147483647,0}, {1961823921,-873460313}, {1436946998,-1595891394},
-{2147483647,0}, {1436946998,-1595891394}, {-224473265,-2135719496},
-{2147483647,0}, {663608871,-2042378339}, {-1737350854,-1262259096},
-{2147483647,0}, {-224473265,-2135719496}, {-2100555935,446487152},
-{2147483647,0}, {2135719506,-224473172}, {2100555974,-446486968},
-{2042378310,-663608960}, {1961823921,-873460313}, {1859775377,-1073741851},
-{1737350743,-1262259248}, {1595891331,-1436947067}, {1436946998,-1595891394},
-{1262259172,-1737350799}, {1073741769,-1859775424}, {873460227,-1961823959},
-{663608871,-2042378339}, {446486876,-2100555994}, {224473078,-2135719516},
-{2147483647,0}, {2100555974,-446486968}, {1961823921,-873460313},
-{1737350743,-1262259248}, {1436946998,-1595891394}, {1073741769,-1859775424},
-{663608871,-2042378339}, {224473078,-2135719516}, {-224473265,-2135719496},
-{-663609049,-2042378281}, {-1073741932,-1859775330}, {-1436947137,-1595891268},
-{-1737350854,-1262259096}, {-1961823997,-873460141}, {-2100556013,-446486785},
-{2147483647,0}, {2042378310,-663608960}, {1737350743,-1262259248},
-{1262259172,-1737350799}, {663608871,-2042378339}, {-94,-2147483647},
-{-663609049,-2042378281}, {-1262259116,-1737350839}, {-1737350854,-1262259096},
-{-2042378447,-663608538}, {-2147483647,188}, {-2042378331,663608895},
-{-1737350633,1262259400}, {-1262258813,1737351059}, {-663609179,2042378239},
-{2147483647,0}, {2146747758,-56214570}, {2144540595,-112390613},
-{2140863671,-168489630}, {2135719506,-224473172}, {2129111626,-280302871},
-{2121044558,-335940465}, {2111523833,-391347822}, {2100555974,-446486968},
-{2088148500,-501320115}, {2074309912,-555809682}, {2059049696,-609918325},
-{2042378310,-663608960}, {2024307180,-716844791}, {2004848691,-769589332},
-{1984016179,-821806435}, {1961823921,-873460313}, {1938287127,-924515564},
-{1913421927,-974937199}, {1887245364,-1024690661}, {1859775377,-1073741851},
-{1831030826,-1122057097}, {1801031311,-1169603450}, {1769797456,-1216348214},
-{1737350743,-1262259248}, {1703713340,-1307305194}, {1668908218,-1351455280},
-{1632959307,-1394679144}, {1595891331,-1436947067}, {1557729613,-1478230181},
-{1518500216,-1518500282}, {1478230113,-1557729677}, {1436946998,-1595891394},
-{1394679073,-1632959368}, {1351455207,-1668908277}, {1307305120,-1703713397},
-{1262259172,-1737350799}, {1216348136,-1769797510}, {1169603371,-1801031362},
-{1122057017,-1831030875}, {1073741769,-1859775424}, {1024690635,-1887245378},
-{974937230,-1913421912}, {924515422,-1938287195}, {873460227,-1961823959},
-{821806407,-1984016190}, {769589125,-2004848771}, {716844642,-2024307233},
-{663608871,-2042378339}, {609918296,-2059049705}, {555809715,-2074309903},
-{501319962,-2088148536}, {446486876,-2100555994}, {391347792,-2111523838},
-{335940246,-2121044593}, {280302715,-2129111646}, {224473078,-2135719516},
-{168489600,-2140863674}, {112390647,-2144540593}, {56214412,-2146747762},
-{2147483647,0}, {2144540595,-112390613}, {2135719506,-224473172},
-{2121044558,-335940465}, {2100555974,-446486968}, {2074309912,-555809682},
-{2042378310,-663608960}, {2004848691,-769589332}, {1961823921,-873460313},
-{1913421927,-974937199}, {1859775377,-1073741851}, {1801031311,-1169603450},
-{1737350743,-1262259248}, {1668908218,-1351455280}, {1595891331,-1436947067},
-{1518500216,-1518500282}, {1436946998,-1595891394}, {1351455207,-1668908277},
-{1262259172,-1737350799}, {1169603371,-1801031362}, {1073741769,-1859775424},
-{974937230,-1913421912}, {873460227,-1961823959}, {769589125,-2004848771},
-{663608871,-2042378339}, {555809715,-2074309903}, {446486876,-2100555994},
-{335940246,-2121044593}, {224473078,-2135719516}, {112390647,-2144540593},
-{-94,-2147483647}, {-112390835,-2144540584}, {-224473265,-2135719496},
-{-335940431,-2121044564}, {-446487060,-2100555955}, {-555809896,-2074309855},
-{-663609049,-2042378281}, {-769589300,-2004848703}, {-873460398,-1961823883},
-{-974937397,-1913421827}, {-1073741932,-1859775330}, {-1169603421,-1801031330},
-{-1262259116,-1737350839}, {-1351455453,-1668908078}, {-1436947137,-1595891268},
-{-1518500258,-1518500240}, {-1595891628,-1436946738}, {-1668908417,-1351455035},
-{-1737350854,-1262259096}, {-1801031344,-1169603400}, {-1859775343,-1073741910},
-{-1913422071,-974936918}, {-1961823997,-873460141}, {-2004848713,-769589276},
-{-2042378447,-663608538}, {-2074309994,-555809377}, {-2100556013,-446486785},
-{-2121044568,-335940406}, {-2135719499,-224473240}, {-2144540612,-112390298},
-{2147483647,0}, {2140863671,-168489630}, {2121044558,-335940465},
-{2088148500,-501320115}, {2042378310,-663608960}, {1984016179,-821806435},
-{1913421927,-974937199}, {1831030826,-1122057097}, {1737350743,-1262259248},
-{1632959307,-1394679144}, {1518500216,-1518500282}, {1394679073,-1632959368},
-{1262259172,-1737350799}, {1122057017,-1831030875}, {974937230,-1913421912},
-{821806407,-1984016190}, {663608871,-2042378339}, {501319962,-2088148536},
-{335940246,-2121044593}, {168489600,-2140863674}, {-94,-2147483647},
-{-168489787,-2140863659}, {-335940431,-2121044564}, {-501320144,-2088148493},
-{-663609049,-2042378281}, {-821806581,-1984016118}, {-974937397,-1913421827},
-{-1122057395,-1831030643}, {-1262259116,-1737350839}, {-1394679021,-1632959413},
-{-1518500258,-1518500240}, {-1632959429,-1394679001}, {-1737350854,-1262259096},
-{-1831030924,-1122056937}, {-1913422071,-974936918}, {-1984016324,-821806084},
-{-2042378447,-663608538}, {-2088148499,-501320119}, {-2121044568,-335940406},
-{-2140863681,-168489506}, {-2147483647,188}, {-2140863651,168489881},
-{-2121044509,335940777}, {-2088148411,501320484}, {-2042378331,663608895},
-{-1984016181,821806431}, {-1913421900,974937252}, {-1831030728,1122057257},
-{-1737350633,1262259400}, {-1632959185,1394679287}, {-1518499993,1518500506},
-{-1394678735,1632959656}, {-1262258813,1737351059}, {-1122056638,1831031107},
-{-974936606,1913422229}, {-821805761,1984016458}, {-663609179,2042378239},
-{-501320277,2088148461}, {-335940566,2121044542}, {-168489668,2140863668},
+    {0, 0}, {2147483647, 0}, {2147483647, 0},
+    {2147483647, 0}, {1961823921, -873460313}, {1436946998, -1595891394},
+    {2147483647, 0}, {1436946998, -1595891394}, {-224473265, -2135719496},
+    {2147483647, 0}, {663608871, -2042378339}, {-1737350854, -1262259096},
+    {2147483647, 0}, {-224473265, -2135719496}, {-2100555935, 446487152},
+    {2147483647, 0}, {2135719506, -224473172}, {2100555974, -446486968},
+    {2042378310, -663608960}, {1961823921, -873460313}, {1859775377, -1073741851},
+    {1737350743, -1262259248}, {1595891331, -1436947067}, {1436946998, -1595891394},
+    {1262259172, -1737350799}, {1073741769, -1859775424}, {873460227, -1961823959},
+    {663608871, -2042378339}, {446486876, -2100555994}, {224473078, -2135719516},
+    {2147483647, 0}, {2100555974, -446486968}, {1961823921, -873460313},
+    {1737350743, -1262259248}, {1436946998, -1595891394}, {1073741769, -1859775424},
+    {663608871, -2042378339}, {224473078, -2135719516}, {-224473265, -2135719496},
+    {-663609049, -2042378281}, {-1073741932, -1859775330}, {-1436947137, -1595891268},
+    {-1737350854, -1262259096}, {-1961823997, -873460141}, {-2100556013, -446486785},
+    {2147483647, 0}, {2042378310, -663608960}, {1737350743, -1262259248},
+    {1262259172, -1737350799}, {663608871, -2042378339}, {-94, -2147483647},
+    {-663609049, -2042378281}, {-1262259116, -1737350839}, {-1737350854, -1262259096},
+    {-2042378447, -663608538}, {-2147483647, 188}, {-2042378331, 663608895},
+    {-1737350633, 1262259400}, {-1262258813, 1737351059}, {-663609179, 2042378239},
+    {2147483647, 0}, {2146747758, -56214570}, {2144540595, -112390613},
+    {2140863671, -168489630}, {2135719506, -224473172}, {2129111626, -280302871},
+    {2121044558, -335940465}, {2111523833, -391347822}, {2100555974, -446486968},
+    {2088148500, -501320115}, {2074309912, -555809682}, {2059049696, -609918325},
+    {2042378310, -663608960}, {2024307180, -716844791}, {2004848691, -769589332},
+    {1984016179, -821806435}, {1961823921, -873460313}, {1938287127, -924515564},
+    {1913421927, -974937199}, {1887245364, -1024690661}, {1859775377, -1073741851},
+    {1831030826, -1122057097}, {1801031311, -1169603450}, {1769797456, -1216348214},
+    {1737350743, -1262259248}, {1703713340, -1307305194}, {1668908218, -1351455280},
+    {1632959307, -1394679144}, {1595891331, -1436947067}, {1557729613, -1478230181},
+    {1518500216, -1518500282}, {1478230113, -1557729677}, {1436946998, -1595891394},
+    {1394679073, -1632959368}, {1351455207, -1668908277}, {1307305120, -1703713397},
+    {1262259172, -1737350799}, {1216348136, -1769797510}, {1169603371, -1801031362},
+    {1122057017, -1831030875}, {1073741769, -1859775424}, {1024690635, -1887245378},
+    {974937230, -1913421912}, {924515422, -1938287195}, {873460227, -1961823959},
+    {821806407, -1984016190}, {769589125, -2004848771}, {716844642, -2024307233},
+    {663608871, -2042378339}, {609918296, -2059049705}, {555809715, -2074309903},
+    {501319962, -2088148536}, {446486876, -2100555994}, {391347792, -2111523838},
+    {335940246, -2121044593}, {280302715, -2129111646}, {224473078, -2135719516},
+    {168489600, -2140863674}, {112390647, -2144540593}, {56214412, -2146747762},
+    {2147483647, 0}, {2144540595, -112390613}, {2135719506, -224473172},
+    {2121044558, -335940465}, {2100555974, -446486968}, {2074309912, -555809682},
+    {2042378310, -663608960}, {2004848691, -769589332}, {1961823921, -873460313},
+    {1913421927, -974937199}, {1859775377, -1073741851}, {1801031311, -1169603450},
+    {1737350743, -1262259248}, {1668908218, -1351455280}, {1595891331, -1436947067},
+    {1518500216, -1518500282}, {1436946998, -1595891394}, {1351455207, -1668908277},
+    {1262259172, -1737350799}, {1169603371, -1801031362}, {1073741769, -1859775424},
+    {974937230, -1913421912}, {873460227, -1961823959}, {769589125, -2004848771},
+    {663608871, -2042378339}, {555809715, -2074309903}, {446486876, -2100555994},
+    {335940246, -2121044593}, {224473078, -2135719516}, {112390647, -2144540593},
+    {-94, -2147483647}, {-112390835, -2144540584}, {-224473265, -2135719496},
+    {-335940431, -2121044564}, {-446487060, -2100555955}, {-555809896, -2074309855},
+    {-663609049, -2042378281}, {-769589300, -2004848703}, {-873460398, -1961823883},
+    {-974937397, -1913421827}, {-1073741932, -1859775330}, {-1169603421, -1801031330},
+    {-1262259116, -1737350839}, {-1351455453, -1668908078}, {-1436947137, -1595891268},
+    {-1518500258, -1518500240}, {-1595891628, -1436946738}, {-1668908417, -1351455035},
+    {-1737350854, -1262259096}, {-1801031344, -1169603400}, {-1859775343, -1073741910},
+    {-1913422071, -974936918}, {-1961823997, -873460141}, {-2004848713, -769589276},
+    {-2042378447, -663608538}, {-2074309994, -555809377}, {-2100556013, -446486785},
+    {-2121044568, -335940406}, {-2135719499, -224473240}, {-2144540612, -112390298},
+    {2147483647, 0}, {2140863671, -168489630}, {2121044558, -335940465},
+    {2088148500, -501320115}, {2042378310, -663608960}, {1984016179, -821806435},
+    {1913421927, -974937199}, {1831030826, -1122057097}, {1737350743, -1262259248},
+    {1632959307, -1394679144}, {1518500216, -1518500282}, {1394679073, -1632959368},
+    {1262259172, -1737350799}, {1122057017, -1831030875}, {974937230, -1913421912},
+    {821806407, -1984016190}, {663608871, -2042378339}, {501319962, -2088148536},
+    {335940246, -2121044593}, {168489600, -2140863674}, {-94, -2147483647},
+    {-168489787, -2140863659}, {-335940431, -2121044564}, {-501320144, -2088148493},
+    {-663609049, -2042378281}, {-821806581, -1984016118}, {-974937397, -1913421827},
+    {-1122057395, -1831030643}, {-1262259116, -1737350839}, {-1394679021, -1632959413},
+    {-1518500258, -1518500240}, {-1632959429, -1394679001}, {-1737350854, -1262259096},
+    {-1831030924, -1122056937}, {-1913422071, -974936918}, {-1984016324, -821806084},
+    {-2042378447, -663608538}, {-2088148499, -501320119}, {-2121044568, -335940406},
+    {-2140863681, -168489506}, {-2147483647, 188}, {-2140863651, 168489881},
+    {-2121044509, 335940777}, {-2088148411, 501320484}, {-2042378331, 663608895},
+    {-1984016181, 821806431}, {-1913421900, 974937252}, {-1831030728, 1122057257},
+    {-1737350633, 1262259400}, {-1632959185, 1394679287}, {-1518499993, 1518500506},
+    {-1394678735, 1632959656}, {-1262258813, 1737351059}, {-1122056638, 1831031107},
+    {-974936606, 1913422229}, {-821805761, 1984016458}, {-663609179, 2042378239},
+    {-501320277, 2088148461}, {-335940566, 2121044542}, {-168489668, 2140863668},
 };
 static const ne10_fft_cpx_int32_t ne10_twiddles_120[120] = {
-{0,0}, {2147483647,0}, {2147483647,0},
-{2147483647,0}, {1961823921,-873460313}, {1436946998,-1595891394},
-{2147483647,0}, {1436946998,-1595891394}, {-224473265,-2135719496},
-{2147483647,0}, {663608871,-2042378339}, {-1737350854,-1262259096},
-{2147483647,0}, {-224473265,-2135719496}, {-2100555935,446487152},
-{2147483647,0}, {2100555974,-446486968}, {1961823921,-873460313},
-{1737350743,-1262259248}, {1436946998,-1595891394}, {1073741769,-1859775424},
-{663608871,-2042378339}, {224473078,-2135719516}, {-224473265,-2135719496},
-{-663609049,-2042378281}, {-1073741932,-1859775330}, {-1436947137,-1595891268},
-{-1737350854,-1262259096}, {-1961823997,-873460141}, {-2100556013,-446486785},
-{2147483647,0}, {2144540595,-112390613}, {2135719506,-224473172},
-{2121044558,-335940465}, {2100555974,-446486968}, {2074309912,-555809682},
-{2042378310,-663608960}, {2004848691,-769589332}, {1961823921,-873460313},
-{1913421927,-974937199}, {1859775377,-1073741851}, {1801031311,-1169603450},
-{1737350743,-1262259248}, {1668908218,-1351455280}, {1595891331,-1436947067},
-{1518500216,-1518500282}, {1436946998,-1595891394}, {1351455207,-1668908277},
-{1262259172,-1737350799}, {1169603371,-1801031362}, {1073741769,-1859775424},
-{974937230,-1913421912}, {873460227,-1961823959}, {769589125,-2004848771},
-{663608871,-2042378339}, {555809715,-2074309903}, {446486876,-2100555994},
-{335940246,-2121044593}, {224473078,-2135719516}, {112390647,-2144540593},
-{2147483647,0}, {2135719506,-224473172}, {2100555974,-446486968},
-{2042378310,-663608960}, {1961823921,-873460313}, {1859775377,-1073741851},
-{1737350743,-1262259248}, {1595891331,-1436947067}, {1436946998,-1595891394},
-{1262259172,-1737350799}, {1073741769,-1859775424}, {873460227,-1961823959},
-{663608871,-2042378339}, {446486876,-2100555994}, {224473078,-2135719516},
-{-94,-2147483647}, {-224473265,-2135719496}, {-446487060,-2100555955},
-{-663609049,-2042378281}, {-873460398,-1961823883}, {-1073741932,-1859775330},
-{-1262259116,-1737350839}, {-1436947137,-1595891268}, {-1595891628,-1436946738},
-{-1737350854,-1262259096}, {-1859775343,-1073741910}, {-1961823997,-873460141},
-{-2042378447,-663608538}, {-2100556013,-446486785}, {-2135719499,-224473240},
-{2147483647,0}, {2121044558,-335940465}, {2042378310,-663608960},
-{1913421927,-974937199}, {1737350743,-1262259248}, {1518500216,-1518500282},
-{1262259172,-1737350799}, {974937230,-1913421912}, {663608871,-2042378339},
-{335940246,-2121044593}, {-94,-2147483647}, {-335940431,-2121044564},
-{-663609049,-2042378281}, {-974937397,-1913421827}, {-1262259116,-1737350839},
-{-1518500258,-1518500240}, {-1737350854,-1262259096}, {-1913422071,-974936918},
-{-2042378447,-663608538}, {-2121044568,-335940406}, {-2147483647,188},
-{-2121044509,335940777}, {-2042378331,663608895}, {-1913421900,974937252},
-{-1737350633,1262259400}, {-1518499993,1518500506}, {-1262258813,1737351059},
-{-974936606,1913422229}, {-663609179,2042378239}, {-335940566,2121044542},
+    {0, 0}, {2147483647, 0}, {2147483647, 0},
+    {2147483647, 0}, {1961823921, -873460313}, {1436946998, -1595891394},
+    {2147483647, 0}, {1436946998, -1595891394}, {-224473265, -2135719496},
+    {2147483647, 0}, {663608871, -2042378339}, {-1737350854, -1262259096},
+    {2147483647, 0}, {-224473265, -2135719496}, {-2100555935, 446487152},
+    {2147483647, 0}, {2100555974, -446486968}, {1961823921, -873460313},
+    {1737350743, -1262259248}, {1436946998, -1595891394}, {1073741769, -1859775424},
+    {663608871, -2042378339}, {224473078, -2135719516}, {-224473265, -2135719496},
+    {-663609049, -2042378281}, {-1073741932, -1859775330}, {-1436947137, -1595891268},
+    {-1737350854, -1262259096}, {-1961823997, -873460141}, {-2100556013, -446486785},
+    {2147483647, 0}, {2144540595, -112390613}, {2135719506, -224473172},
+    {2121044558, -335940465}, {2100555974, -446486968}, {2074309912, -555809682},
+    {2042378310, -663608960}, {2004848691, -769589332}, {1961823921, -873460313},
+    {1913421927, -974937199}, {1859775377, -1073741851}, {1801031311, -1169603450},
+    {1737350743, -1262259248}, {1668908218, -1351455280}, {1595891331, -1436947067},
+    {1518500216, -1518500282}, {1436946998, -1595891394}, {1351455207, -1668908277},
+    {1262259172, -1737350799}, {1169603371, -1801031362}, {1073741769, -1859775424},
+    {974937230, -1913421912}, {873460227, -1961823959}, {769589125, -2004848771},
+    {663608871, -2042378339}, {555809715, -2074309903}, {446486876, -2100555994},
+    {335940246, -2121044593}, {224473078, -2135719516}, {112390647, -2144540593},
+    {2147483647, 0}, {2135719506, -224473172}, {2100555974, -446486968},
+    {2042378310, -663608960}, {1961823921, -873460313}, {1859775377, -1073741851},
+    {1737350743, -1262259248}, {1595891331, -1436947067}, {1436946998, -1595891394},
+    {1262259172, -1737350799}, {1073741769, -1859775424}, {873460227, -1961823959},
+    {663608871, -2042378339}, {446486876, -2100555994}, {224473078, -2135719516},
+    {-94, -2147483647}, {-224473265, -2135719496}, {-446487060, -2100555955},
+    {-663609049, -2042378281}, {-873460398, -1961823883}, {-1073741932, -1859775330},
+    {-1262259116, -1737350839}, {-1436947137, -1595891268}, {-1595891628, -1436946738},
+    {-1737350854, -1262259096}, {-1859775343, -1073741910}, {-1961823997, -873460141},
+    {-2042378447, -663608538}, {-2100556013, -446486785}, {-2135719499, -224473240},
+    {2147483647, 0}, {2121044558, -335940465}, {2042378310, -663608960},
+    {1913421927, -974937199}, {1737350743, -1262259248}, {1518500216, -1518500282},
+    {1262259172, -1737350799}, {974937230, -1913421912}, {663608871, -2042378339},
+    {335940246, -2121044593}, {-94, -2147483647}, {-335940431, -2121044564},
+    {-663609049, -2042378281}, {-974937397, -1913421827}, {-1262259116, -1737350839},
+    {-1518500258, -1518500240}, {-1737350854, -1262259096}, {-1913422071, -974936918},
+    {-2042378447, -663608538}, {-2121044568, -335940406}, {-2147483647, 188},
+    {-2121044509, 335940777}, {-2042378331, 663608895}, {-1913421900, 974937252},
+    {-1737350633, 1262259400}, {-1518499993, 1518500506}, {-1262258813, 1737351059},
+    {-974936606, 1913422229}, {-663609179, 2042378239}, {-335940566, 2121044542},
 };
 static const ne10_fft_cpx_int32_t ne10_twiddles_60[60] = {
-{0,0}, {2147483647,0}, {2147483647,0},
-{2147483647,0}, {1961823921,-873460313}, {1436946998,-1595891394},
-{2147483647,0}, {1436946998,-1595891394}, {-224473265,-2135719496},
-{2147483647,0}, {663608871,-2042378339}, {-1737350854,-1262259096},
-{2147483647,0}, {-224473265,-2135719496}, {-2100555935,446487152},
-{2147483647,0}, {2135719506,-224473172}, {2100555974,-446486968},
-{2042378310,-663608960}, {1961823921,-873460313}, {1859775377,-1073741851},
-{1737350743,-1262259248}, {1595891331,-1436947067}, {1436946998,-1595891394},
-{1262259172,-1737350799}, {1073741769,-1859775424}, {873460227,-1961823959},
-{663608871,-2042378339}, {446486876,-2100555994}, {224473078,-2135719516},
-{2147483647,0}, {2100555974,-446486968}, {1961823921,-873460313},
-{1737350743,-1262259248}, {1436946998,-1595891394}, {1073741769,-1859775424},
-{663608871,-2042378339}, {224473078,-2135719516}, {-224473265,-2135719496},
-{-663609049,-2042378281}, {-1073741932,-1859775330}, {-1436947137,-1595891268},
-{-1737350854,-1262259096}, {-1961823997,-873460141}, {-2100556013,-446486785},
-{2147483647,0}, {2042378310,-663608960}, {1737350743,-1262259248},
-{1262259172,-1737350799}, {663608871,-2042378339}, {-94,-2147483647},
-{-663609049,-2042378281}, {-1262259116,-1737350839}, {-1737350854,-1262259096},
-{-2042378447,-663608538}, {-2147483647,188}, {-2042378331,663608895},
-{-1737350633,1262259400}, {-1262258813,1737351059}, {-663609179,2042378239},
+    {0, 0}, {2147483647, 0}, {2147483647, 0},
+    {2147483647, 0}, {1961823921, -873460313}, {1436946998, -1595891394},
+    {2147483647, 0}, {1436946998, -1595891394}, {-224473265, -2135719496},
+    {2147483647, 0}, {663608871, -2042378339}, {-1737350854, -1262259096},
+    {2147483647, 0}, {-224473265, -2135719496}, {-2100555935, 446487152},
+    {2147483647, 0}, {2135719506, -224473172}, {2100555974, -446486968},
+    {2042378310, -663608960}, {1961823921, -873460313}, {1859775377, -1073741851},
+    {1737350743, -1262259248}, {1595891331, -1436947067}, {1436946998, -1595891394},
+    {1262259172, -1737350799}, {1073741769, -1859775424}, {873460227, -1961823959},
+    {663608871, -2042378339}, {446486876, -2100555994}, {224473078, -2135719516},
+    {2147483647, 0}, {2100555974, -446486968}, {1961823921, -873460313},
+    {1737350743, -1262259248}, {1436946998, -1595891394}, {1073741769, -1859775424},
+    {663608871, -2042378339}, {224473078, -2135719516}, {-224473265, -2135719496},
+    {-663609049, -2042378281}, {-1073741932, -1859775330}, {-1436947137, -1595891268},
+    {-1737350854, -1262259096}, {-1961823997, -873460141}, {-2100556013, -446486785},
+    {2147483647, 0}, {2042378310, -663608960}, {1737350743, -1262259248},
+    {1262259172, -1737350799}, {663608871, -2042378339}, {-94, -2147483647},
+    {-663609049, -2042378281}, {-1262259116, -1737350839}, {-1737350854, -1262259096},
+    {-2042378447, -663608538}, {-2147483647, 188}, {-2042378331, 663608895},
+    {-1737350633, 1262259400}, {-1262258813, 1737351059}, {-663609179, 2042378239},
 };
 static const ne10_fft_state_int32_t ne10_fft_state_int32_t_480 = {
-120,
-(ne10_int32_t *)ne10_factors_480,
-(ne10_fft_cpx_int32_t *)ne10_twiddles_480,
-NULL,
-(ne10_fft_cpx_int32_t *)&ne10_twiddles_480[120],
+    120,
+    (ne10_int32_t *)ne10_factors_480,
+    (ne10_fft_cpx_int32_t *)ne10_twiddles_480,
+    NULL,
+    (ne10_fft_cpx_int32_t *)&ne10_twiddles_480[120],
 };
 static const arch_fft_state cfg_arch_480 = {
-1,
-(void *)&ne10_fft_state_int32_t_480,
+    1,
+    (void *)&ne10_fft_state_int32_t_480,
 };
 
 static const ne10_fft_state_int32_t ne10_fft_state_int32_t_240 = {
-60,
-(ne10_int32_t *)ne10_factors_240,
-(ne10_fft_cpx_int32_t *)ne10_twiddles_240,
-NULL,
-(ne10_fft_cpx_int32_t *)&ne10_twiddles_240[60],
+    60,
+    (ne10_int32_t *)ne10_factors_240,
+    (ne10_fft_cpx_int32_t *)ne10_twiddles_240,
+    NULL,
+    (ne10_fft_cpx_int32_t *)&ne10_twiddles_240[60],
 };
 static const arch_fft_state cfg_arch_240 = {
-1,
-(void *)&ne10_fft_state_int32_t_240,
+    1,
+    (void *)&ne10_fft_state_int32_t_240,
 };
 
 static const ne10_fft_state_int32_t ne10_fft_state_int32_t_120 = {
-30,
-(ne10_int32_t *)ne10_factors_120,
-(ne10_fft_cpx_int32_t *)ne10_twiddles_120,
-NULL,
-(ne10_fft_cpx_int32_t *)&ne10_twiddles_120[30],
+    30,
+    (ne10_int32_t *)ne10_factors_120,
+    (ne10_fft_cpx_int32_t *)ne10_twiddles_120,
+    NULL,
+    (ne10_fft_cpx_int32_t *)&ne10_twiddles_120[30],
 };
 static const arch_fft_state cfg_arch_120 = {
-1,
-(void *)&ne10_fft_state_int32_t_120,
+    1,
+    (void *)&ne10_fft_state_int32_t_120,
 };
 
 static const ne10_fft_state_int32_t ne10_fft_state_int32_t_60 = {
-15,
-(ne10_int32_t *)ne10_factors_60,
-(ne10_fft_cpx_int32_t *)ne10_twiddles_60,
-NULL,
-(ne10_fft_cpx_int32_t *)&ne10_twiddles_60[15],
+    15,
+    (ne10_int32_t *)ne10_factors_60,
+    (ne10_fft_cpx_int32_t *)ne10_twiddles_60,
+    NULL,
+    (ne10_fft_cpx_int32_t *)&ne10_twiddles_60[15],
 };
 static const arch_fft_state cfg_arch_60 = {
-1,
-(void *)&ne10_fft_state_int32_t_60,
+    1,
+    (void *)&ne10_fft_state_int32_t_60,
 };
 
 #endif  /* end NE10_FFT_PARAMS48000_960 */
diff --git a/celt/static_modes_float.h b/celt/static_modes_float.h
index eb32cad99..88600e18c 100644
--- a/celt/static_modes_float.h
+++ b/celt/static_modes_float.h
@@ -5,2450 +5,2452 @@
 #include "rate.h"
 
 #ifdef HAVE_ARM_NE10
-#define OVERRIDE_FFT 1
-#include "static_modes_float_arm_ne10.h"
+# define OVERRIDE_FFT 1
+# include "static_modes_float_arm_ne10.h"
 #endif
 
 #ifndef DEF_WINDOW120
-#define DEF_WINDOW120
+# define DEF_WINDOW120
 static const celt_coef window120[120] = {
-6.7286966e-05f, 0.00060551348f, 0.0016815970f, 0.0032947962f, 0.0054439943f,
-0.0081276923f, 0.011344001f, 0.015090633f, 0.019364886f, 0.024163635f,
-0.029483315f, 0.035319905f, 0.041668911f, 0.048525347f, 0.055883718f,
-0.063737999f, 0.072081616f, 0.080907428f, 0.090207705f, 0.099974111f,
-0.11019769f, 0.12086883f, 0.13197729f, 0.14351214f, 0.15546177f,
-0.16781389f, 0.18055550f, 0.19367290f, 0.20715171f, 0.22097682f,
-0.23513243f, 0.24960208f, 0.26436860f, 0.27941419f, 0.29472040f,
-0.31026818f, 0.32603788f, 0.34200931f, 0.35816177f, 0.37447407f,
-0.39092462f, 0.40749142f, 0.42415215f, 0.44088423f, 0.45766484f,
-0.47447104f, 0.49127978f, 0.50806798f, 0.52481261f, 0.54149077f,
-0.55807973f, 0.57455701f, 0.59090049f, 0.60708841f, 0.62309951f,
-0.63891306f, 0.65450896f, 0.66986776f, 0.68497077f, 0.69980010f,
-0.71433873f, 0.72857055f, 0.74248043f, 0.75605425f, 0.76927895f,
-0.78214257f, 0.79463430f, 0.80674445f, 0.81846456f, 0.82978733f,
-0.84070669f, 0.85121779f, 0.86131698f, 0.87100183f, 0.88027111f,
-0.88912479f, 0.89756398f, 0.90559094f, 0.91320904f, 0.92042270f,
-0.92723738f, 0.93365955f, 0.93969656f, 0.94535671f, 0.95064907f,
-0.95558353f, 0.96017067f, 0.96442171f, 0.96834849f, 0.97196334f,
-0.97527906f, 0.97830883f, 0.98106616f, 0.98356480f, 0.98581869f,
-0.98784191f, 0.98964856f, 0.99125274f, 0.99266849f, 0.99390969f,
-0.99499004f, 0.99592297f, 0.99672162f, 0.99739874f, 0.99796667f,
-0.99843728f, 0.99882195f, 0.99913147f, 0.99937606f, 0.99956527f,
-0.99970802f, 0.99981248f, 0.99988613f, 0.99993565f, 0.99996697f,
-0.99998518f, 0.99999457f, 0.99999859f, 0.99999982f, 1.0000000f,
+    6.7286966e-05f, 0.00060551348f, 0.0016815970f, 0.0032947962f, 0.0054439943f,
+    0.0081276923f, 0.011344001f, 0.015090633f, 0.019364886f, 0.024163635f,
+    0.029483315f, 0.035319905f, 0.041668911f, 0.048525347f, 0.055883718f,
+    0.063737999f, 0.072081616f, 0.080907428f, 0.090207705f, 0.099974111f,
+    0.11019769f, 0.12086883f, 0.13197729f, 0.14351214f, 0.15546177f,
+    0.16781389f, 0.18055550f, 0.19367290f, 0.20715171f, 0.22097682f,
+    0.23513243f, 0.24960208f, 0.26436860f, 0.27941419f, 0.29472040f,
+    0.31026818f, 0.32603788f, 0.34200931f, 0.35816177f, 0.37447407f,
+    0.39092462f, 0.40749142f, 0.42415215f, 0.44088423f, 0.45766484f,
+    0.47447104f, 0.49127978f, 0.50806798f, 0.52481261f, 0.54149077f,
+    0.55807973f, 0.57455701f, 0.59090049f, 0.60708841f, 0.62309951f,
+    0.63891306f, 0.65450896f, 0.66986776f, 0.68497077f, 0.69980010f,
+    0.71433873f, 0.72857055f, 0.74248043f, 0.75605425f, 0.76927895f,
+    0.78214257f, 0.79463430f, 0.80674445f, 0.81846456f, 0.82978733f,
+    0.84070669f, 0.85121779f, 0.86131698f, 0.87100183f, 0.88027111f,
+    0.88912479f, 0.89756398f, 0.90559094f, 0.91320904f, 0.92042270f,
+    0.92723738f, 0.93365955f, 0.93969656f, 0.94535671f, 0.95064907f,
+    0.95558353f, 0.96017067f, 0.96442171f, 0.96834849f, 0.97196334f,
+    0.97527906f, 0.97830883f, 0.98106616f, 0.98356480f, 0.98581869f,
+    0.98784191f, 0.98964856f, 0.99125274f, 0.99266849f, 0.99390969f,
+    0.99499004f, 0.99592297f, 0.99672162f, 0.99739874f, 0.99796667f,
+    0.99843728f, 0.99882195f, 0.99913147f, 0.99937606f, 0.99956527f,
+    0.99970802f, 0.99981248f, 0.99988613f, 0.99993565f, 0.99996697f,
+    0.99998518f, 0.99999457f, 0.99999859f, 0.99999982f, 1.0000000f,
 };
 #endif
 
 #ifndef DEF_LOGN400
-#define DEF_LOGN400
+# define DEF_LOGN400
 static const oac_int16 logN400[21] = {
-0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 16, 16, 16, 21, 21, 24, 29, 34, 36, };
+    0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 16, 16, 16, 21, 21, 24, 29, 34, 36, };
 #endif
 
 #ifndef DEF_PULSE_CACHE50
-#define DEF_PULSE_CACHE50
+# define DEF_PULSE_CACHE50
 static const oac_int16 cache_index50[105] = {
--1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 41, 41, 41,
-82, 82, 123, 164, 200, 222, 0, 0, 0, 0, 0, 0, 0, 0, 41,
-41, 41, 41, 123, 123, 123, 164, 164, 240, 266, 283, 295, 41, 41, 41,
-41, 41, 41, 41, 41, 123, 123, 123, 123, 240, 240, 240, 266, 266, 305,
-318, 328, 336, 123, 123, 123, 123, 123, 123, 123, 123, 240, 240, 240, 240,
-305, 305, 305, 318, 318, 343, 351, 358, 364, 240, 240, 240, 240, 240, 240,
-240, 240, 305, 305, 305, 305, 343, 343, 343, 351, 351, 370, 376, 382, 387,
+    -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 41, 41, 41,
+    82, 82, 123, 164, 200, 222, 0, 0, 0, 0, 0, 0, 0, 0, 41,
+    41, 41, 41, 123, 123, 123, 164, 164, 240, 266, 283, 295, 41, 41, 41,
+    41, 41, 41, 41, 41, 123, 123, 123, 123, 240, 240, 240, 266, 266, 305,
+    318, 328, 336, 123, 123, 123, 123, 123, 123, 123, 123, 240, 240, 240, 240,
+    305, 305, 305, 318, 318, 343, 351, 358, 364, 240, 240, 240, 240, 240, 240,
+    240, 240, 305, 305, 305, 305, 343, 343, 343, 351, 351, 370, 376, 382, 387,
 };
 static const unsigned char cache_bits50[392] = {
-40, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 40, 15, 23, 28,
-31, 34, 36, 38, 39, 41, 42, 43, 44, 45, 46, 47, 47, 49, 50,
-51, 52, 53, 54, 55, 55, 57, 58, 59, 60, 61, 62, 63, 63, 65,
-66, 67, 68, 69, 70, 71, 71, 40, 20, 33, 41, 48, 53, 57, 61,
-64, 66, 69, 71, 73, 75, 76, 78, 80, 82, 85, 87, 89, 91, 92,
-94, 96, 98, 101, 103, 105, 107, 108, 110, 112, 114, 117, 119, 121, 123,
-124, 126, 128, 40, 23, 39, 51, 60, 67, 73, 79, 83, 87, 91, 94,
-97, 100, 102, 105, 107, 111, 115, 118, 121, 124, 126, 129, 131, 135, 139,
-142, 145, 148, 150, 153, 155, 159, 163, 166, 169, 172, 174, 177, 179, 35,
-28, 49, 65, 78, 89, 99, 107, 114, 120, 126, 132, 136, 141, 145, 149,
-153, 159, 165, 171, 176, 180, 185, 189, 192, 199, 205, 211, 216, 220, 225,
-229, 232, 239, 245, 251, 21, 33, 58, 79, 97, 112, 125, 137, 148, 157,
-166, 174, 182, 189, 195, 201, 207, 217, 227, 235, 243, 251, 17, 35, 63,
-86, 106, 123, 139, 152, 165, 177, 187, 197, 206, 214, 222, 230, 237, 250,
-25, 31, 55, 75, 91, 105, 117, 128, 138, 146, 154, 161, 168, 174, 180,
-185, 190, 200, 208, 215, 222, 229, 235, 240, 245, 255, 16, 36, 65, 89,
-110, 128, 144, 159, 173, 185, 196, 207, 217, 226, 234, 242, 250, 11, 41,
-74, 103, 128, 151, 172, 191, 209, 225, 241, 255, 9, 43, 79, 110, 138,
-163, 186, 207, 227, 246, 12, 39, 71, 99, 123, 144, 164, 182, 198, 214,
-228, 241, 253, 9, 44, 81, 113, 142, 168, 192, 214, 235, 255, 7, 49,
-90, 127, 160, 191, 220, 247, 6, 51, 95, 134, 170, 203, 234, 7, 47,
-87, 123, 155, 184, 212, 237, 6, 52, 97, 137, 174, 208, 240, 5, 57,
-106, 151, 192, 231, 5, 59, 111, 158, 202, 243, 5, 55, 103, 147, 187,
-224, 5, 60, 113, 161, 206, 248, 4, 65, 122, 175, 224, 4, 67, 127,
-182, 234, };
+    40, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 40, 15, 23, 28,
+    31, 34, 36, 38, 39, 41, 42, 43, 44, 45, 46, 47, 47, 49, 50,
+    51, 52, 53, 54, 55, 55, 57, 58, 59, 60, 61, 62, 63, 63, 65,
+    66, 67, 68, 69, 70, 71, 71, 40, 20, 33, 41, 48, 53, 57, 61,
+    64, 66, 69, 71, 73, 75, 76, 78, 80, 82, 85, 87, 89, 91, 92,
+    94, 96, 98, 101, 103, 105, 107, 108, 110, 112, 114, 117, 119, 121, 123,
+    124, 126, 128, 40, 23, 39, 51, 60, 67, 73, 79, 83, 87, 91, 94,
+    97, 100, 102, 105, 107, 111, 115, 118, 121, 124, 126, 129, 131, 135, 139,
+    142, 145, 148, 150, 153, 155, 159, 163, 166, 169, 172, 174, 177, 179, 35,
+    28, 49, 65, 78, 89, 99, 107, 114, 120, 126, 132, 136, 141, 145, 149,
+    153, 159, 165, 171, 176, 180, 185, 189, 192, 199, 205, 211, 216, 220, 225,
+    229, 232, 239, 245, 251, 21, 33, 58, 79, 97, 112, 125, 137, 148, 157,
+    166, 174, 182, 189, 195, 201, 207, 217, 227, 235, 243, 251, 17, 35, 63,
+    86, 106, 123, 139, 152, 165, 177, 187, 197, 206, 214, 222, 230, 237, 250,
+    25, 31, 55, 75, 91, 105, 117, 128, 138, 146, 154, 161, 168, 174, 180,
+    185, 190, 200, 208, 215, 222, 229, 235, 240, 245, 255, 16, 36, 65, 89,
+    110, 128, 144, 159, 173, 185, 196, 207, 217, 226, 234, 242, 250, 11, 41,
+    74, 103, 128, 151, 172, 191, 209, 225, 241, 255, 9, 43, 79, 110, 138,
+    163, 186, 207, 227, 246, 12, 39, 71, 99, 123, 144, 164, 182, 198, 214,
+    228, 241, 253, 9, 44, 81, 113, 142, 168, 192, 214, 235, 255, 7, 49,
+    90, 127, 160, 191, 220, 247, 6, 51, 95, 134, 170, 203, 234, 7, 47,
+    87, 123, 155, 184, 212, 237, 6, 52, 97, 137, 174, 208, 240, 5, 57,
+    106, 151, 192, 231, 5, 59, 111, 158, 202, 243, 5, 55, 103, 147, 187,
+    224, 5, 60, 113, 161, 206, 248, 4, 65, 122, 175, 224, 4, 67, 127,
+    182, 234, };
 static const unsigned char cache_caps50[168] = {
-224, 224, 224, 224, 224, 224, 224, 224, 160, 160, 160, 160, 185, 185, 185,
-178, 178, 168, 134, 61, 37, 224, 224, 224, 224, 224, 224, 224, 224, 240,
-240, 240, 240, 207, 207, 207, 198, 198, 183, 144, 66, 40, 160, 160, 160,
-160, 160, 160, 160, 160, 185, 185, 185, 185, 193, 193, 193, 183, 183, 172,
-138, 64, 38, 240, 240, 240, 240, 240, 240, 240, 240, 207, 207, 207, 207,
-204, 204, 204, 193, 193, 180, 143, 66, 40, 185, 185, 185, 185, 185, 185,
-185, 185, 193, 193, 193, 193, 193, 193, 193, 183, 183, 172, 138, 65, 39,
-207, 207, 207, 207, 207, 207, 207, 207, 204, 204, 204, 204, 201, 201, 201,
-188, 188, 176, 141, 66, 40, 193, 193, 193, 193, 193, 193, 193, 193, 193,
-193, 193, 193, 194, 194, 194, 184, 184, 173, 139, 65, 39, 204, 204, 204,
-204, 204, 204, 204, 204, 201, 201, 201, 201, 198, 198, 198, 187, 187, 175,
-140, 66, 40, };
+    224, 224, 224, 224, 224, 224, 224, 224, 160, 160, 160, 160, 185, 185, 185,
+    178, 178, 168, 134, 61, 37, 224, 224, 224, 224, 224, 224, 224, 224, 240,
+    240, 240, 240, 207, 207, 207, 198, 198, 183, 144, 66, 40, 160, 160, 160,
+    160, 160, 160, 160, 160, 185, 185, 185, 185, 193, 193, 193, 183, 183, 172,
+    138, 64, 38, 240, 240, 240, 240, 240, 240, 240, 240, 207, 207, 207, 207,
+    204, 204, 204, 193, 193, 180, 143, 66, 40, 185, 185, 185, 185, 185, 185,
+    185, 185, 193, 193, 193, 193, 193, 193, 193, 183, 183, 172, 138, 65, 39,
+    207, 207, 207, 207, 207, 207, 207, 207, 204, 204, 204, 204, 201, 201, 201,
+    188, 188, 176, 141, 66, 40, 193, 193, 193, 193, 193, 193, 193, 193, 193,
+    193, 193, 193, 194, 194, 194, 184, 184, 173, 139, 65, 39, 204, 204, 204,
+    204, 204, 204, 204, 204, 201, 201, 201, 201, 198, 198, 198, 187, 187, 175,
+    140, 66, 40, };
 #endif
 
 #ifndef FFT_TWIDDLES48000_960
-#define FFT_TWIDDLES48000_960
+# define FFT_TWIDDLES48000_960
 static const kiss_twiddle_cpx fft_twiddles48000_960[480] = {
-{1.0000000f, -0.0000000f}, {0.99991433f, -0.013089596f},
-{0.99965732f, -0.026176948f}, {0.99922904f, -0.039259816f},
-{0.99862953f, -0.052335956f}, {0.99785892f, -0.065403129f},
-{0.99691733f, -0.078459096f}, {0.99580493f, -0.091501619f},
-{0.99452190f, -0.10452846f}, {0.99306846f, -0.11753740f},
-{0.99144486f, -0.13052619f}, {0.98965139f, -0.14349262f},
-{0.98768834f, -0.15643447f}, {0.98555606f, -0.16934950f},
-{0.98325491f, -0.18223553f}, {0.98078528f, -0.19509032f},
-{0.97814760f, -0.20791169f}, {0.97534232f, -0.22069744f},
-{0.97236992f, -0.23344536f}, {0.96923091f, -0.24615329f},
-{0.96592583f, -0.25881905f}, {0.96245524f, -0.27144045f},
-{0.95881973f, -0.28401534f}, {0.95501994f, -0.29654157f},
-{0.95105652f, -0.30901699f}, {0.94693013f, -0.32143947f},
-{0.94264149f, -0.33380686f}, {0.93819134f, -0.34611706f},
-{0.93358043f, -0.35836795f}, {0.92880955f, -0.37055744f},
-{0.92387953f, -0.38268343f}, {0.91879121f, -0.39474386f},
-{0.91354546f, -0.40673664f}, {0.90814317f, -0.41865974f},
-{0.90258528f, -0.43051110f}, {0.89687274f, -0.44228869f},
-{0.89100652f, -0.45399050f}, {0.88498764f, -0.46561452f},
-{0.87881711f, -0.47715876f}, {0.87249601f, -0.48862124f},
-{0.86602540f, -0.50000000f}, {0.85940641f, -0.51129309f},
-{0.85264016f, -0.52249856f}, {0.84572782f, -0.53361452f},
-{0.83867057f, -0.54463904f}, {0.83146961f, -0.55557023f},
-{0.82412619f, -0.56640624f}, {0.81664156f, -0.57714519f},
-{0.80901699f, -0.58778525f}, {0.80125381f, -0.59832460f},
-{0.79335334f, -0.60876143f}, {0.78531693f, -0.61909395f},
-{0.77714596f, -0.62932039f}, {0.76884183f, -0.63943900f},
-{0.76040597f, -0.64944805f}, {0.75183981f, -0.65934582f},
-{0.74314483f, -0.66913061f}, {0.73432251f, -0.67880075f},
-{0.72537437f, -0.68835458f}, {0.71630194f, -0.69779046f},
-{0.70710678f, -0.70710678f}, {0.69779046f, -0.71630194f},
-{0.68835458f, -0.72537437f}, {0.67880075f, -0.73432251f},
-{0.66913061f, -0.74314483f}, {0.65934582f, -0.75183981f},
-{0.64944805f, -0.76040597f}, {0.63943900f, -0.76884183f},
-{0.62932039f, -0.77714596f}, {0.61909395f, -0.78531693f},
-{0.60876143f, -0.79335334f}, {0.59832460f, -0.80125381f},
-{0.58778525f, -0.80901699f}, {0.57714519f, -0.81664156f},
-{0.56640624f, -0.82412619f}, {0.55557023f, -0.83146961f},
-{0.54463904f, -0.83867057f}, {0.53361452f, -0.84572782f},
-{0.52249856f, -0.85264016f}, {0.51129309f, -0.85940641f},
-{0.50000000f, -0.86602540f}, {0.48862124f, -0.87249601f},
-{0.47715876f, -0.87881711f}, {0.46561452f, -0.88498764f},
-{0.45399050f, -0.89100652f}, {0.44228869f, -0.89687274f},
-{0.43051110f, -0.90258528f}, {0.41865974f, -0.90814317f},
-{0.40673664f, -0.91354546f}, {0.39474386f, -0.91879121f},
-{0.38268343f, -0.92387953f}, {0.37055744f, -0.92880955f},
-{0.35836795f, -0.93358043f}, {0.34611706f, -0.93819134f},
-{0.33380686f, -0.94264149f}, {0.32143947f, -0.94693013f},
-{0.30901699f, -0.95105652f}, {0.29654157f, -0.95501994f},
-{0.28401534f, -0.95881973f}, {0.27144045f, -0.96245524f},
-{0.25881905f, -0.96592583f}, {0.24615329f, -0.96923091f},
-{0.23344536f, -0.97236992f}, {0.22069744f, -0.97534232f},
-{0.20791169f, -0.97814760f}, {0.19509032f, -0.98078528f},
-{0.18223553f, -0.98325491f}, {0.16934950f, -0.98555606f},
-{0.15643447f, -0.98768834f}, {0.14349262f, -0.98965139f},
-{0.13052619f, -0.99144486f}, {0.11753740f, -0.99306846f},
-{0.10452846f, -0.99452190f}, {0.091501619f, -0.99580493f},
-{0.078459096f, -0.99691733f}, {0.065403129f, -0.99785892f},
-{0.052335956f, -0.99862953f}, {0.039259816f, -0.99922904f},
-{0.026176948f, -0.99965732f}, {0.013089596f, -0.99991433f},
-{6.1232340e-17f, -1.0000000f}, {-0.013089596f, -0.99991433f},
-{-0.026176948f, -0.99965732f}, {-0.039259816f, -0.99922904f},
-{-0.052335956f, -0.99862953f}, {-0.065403129f, -0.99785892f},
-{-0.078459096f, -0.99691733f}, {-0.091501619f, -0.99580493f},
-{-0.10452846f, -0.99452190f}, {-0.11753740f, -0.99306846f},
-{-0.13052619f, -0.99144486f}, {-0.14349262f, -0.98965139f},
-{-0.15643447f, -0.98768834f}, {-0.16934950f, -0.98555606f},
-{-0.18223553f, -0.98325491f}, {-0.19509032f, -0.98078528f},
-{-0.20791169f, -0.97814760f}, {-0.22069744f, -0.97534232f},
-{-0.23344536f, -0.97236992f}, {-0.24615329f, -0.96923091f},
-{-0.25881905f, -0.96592583f}, {-0.27144045f, -0.96245524f},
-{-0.28401534f, -0.95881973f}, {-0.29654157f, -0.95501994f},
-{-0.30901699f, -0.95105652f}, {-0.32143947f, -0.94693013f},
-{-0.33380686f, -0.94264149f}, {-0.34611706f, -0.93819134f},
-{-0.35836795f, -0.93358043f}, {-0.37055744f, -0.92880955f},
-{-0.38268343f, -0.92387953f}, {-0.39474386f, -0.91879121f},
-{-0.40673664f, -0.91354546f}, {-0.41865974f, -0.90814317f},
-{-0.43051110f, -0.90258528f}, {-0.44228869f, -0.89687274f},
-{-0.45399050f, -0.89100652f}, {-0.46561452f, -0.88498764f},
-{-0.47715876f, -0.87881711f}, {-0.48862124f, -0.87249601f},
-{-0.50000000f, -0.86602540f}, {-0.51129309f, -0.85940641f},
-{-0.52249856f, -0.85264016f}, {-0.53361452f, -0.84572782f},
-{-0.54463904f, -0.83867057f}, {-0.55557023f, -0.83146961f},
-{-0.56640624f, -0.82412619f}, {-0.57714519f, -0.81664156f},
-{-0.58778525f, -0.80901699f}, {-0.59832460f, -0.80125381f},
-{-0.60876143f, -0.79335334f}, {-0.61909395f, -0.78531693f},
-{-0.62932039f, -0.77714596f}, {-0.63943900f, -0.76884183f},
-{-0.64944805f, -0.76040597f}, {-0.65934582f, -0.75183981f},
-{-0.66913061f, -0.74314483f}, {-0.67880075f, -0.73432251f},
-{-0.68835458f, -0.72537437f}, {-0.69779046f, -0.71630194f},
-{-0.70710678f, -0.70710678f}, {-0.71630194f, -0.69779046f},
-{-0.72537437f, -0.68835458f}, {-0.73432251f, -0.67880075f},
-{-0.74314483f, -0.66913061f}, {-0.75183981f, -0.65934582f},
-{-0.76040597f, -0.64944805f}, {-0.76884183f, -0.63943900f},
-{-0.77714596f, -0.62932039f}, {-0.78531693f, -0.61909395f},
-{-0.79335334f, -0.60876143f}, {-0.80125381f, -0.59832460f},
-{-0.80901699f, -0.58778525f}, {-0.81664156f, -0.57714519f},
-{-0.82412619f, -0.56640624f}, {-0.83146961f, -0.55557023f},
-{-0.83867057f, -0.54463904f}, {-0.84572782f, -0.53361452f},
-{-0.85264016f, -0.52249856f}, {-0.85940641f, -0.51129309f},
-{-0.86602540f, -0.50000000f}, {-0.87249601f, -0.48862124f},
-{-0.87881711f, -0.47715876f}, {-0.88498764f, -0.46561452f},
-{-0.89100652f, -0.45399050f}, {-0.89687274f, -0.44228869f},
-{-0.90258528f, -0.43051110f}, {-0.90814317f, -0.41865974f},
-{-0.91354546f, -0.40673664f}, {-0.91879121f, -0.39474386f},
-{-0.92387953f, -0.38268343f}, {-0.92880955f, -0.37055744f},
-{-0.93358043f, -0.35836795f}, {-0.93819134f, -0.34611706f},
-{-0.94264149f, -0.33380686f}, {-0.94693013f, -0.32143947f},
-{-0.95105652f, -0.30901699f}, {-0.95501994f, -0.29654157f},
-{-0.95881973f, -0.28401534f}, {-0.96245524f, -0.27144045f},
-{-0.96592583f, -0.25881905f}, {-0.96923091f, -0.24615329f},
-{-0.97236992f, -0.23344536f}, {-0.97534232f, -0.22069744f},
-{-0.97814760f, -0.20791169f}, {-0.98078528f, -0.19509032f},
-{-0.98325491f, -0.18223553f}, {-0.98555606f, -0.16934950f},
-{-0.98768834f, -0.15643447f}, {-0.98965139f, -0.14349262f},
-{-0.99144486f, -0.13052619f}, {-0.99306846f, -0.11753740f},
-{-0.99452190f, -0.10452846f}, {-0.99580493f, -0.091501619f},
-{-0.99691733f, -0.078459096f}, {-0.99785892f, -0.065403129f},
-{-0.99862953f, -0.052335956f}, {-0.99922904f, -0.039259816f},
-{-0.99965732f, -0.026176948f}, {-0.99991433f, -0.013089596f},
-{-1.0000000f, -1.2246468e-16f}, {-0.99991433f, 0.013089596f},
-{-0.99965732f, 0.026176948f}, {-0.99922904f, 0.039259816f},
-{-0.99862953f, 0.052335956f}, {-0.99785892f, 0.065403129f},
-{-0.99691733f, 0.078459096f}, {-0.99580493f, 0.091501619f},
-{-0.99452190f, 0.10452846f}, {-0.99306846f, 0.11753740f},
-{-0.99144486f, 0.13052619f}, {-0.98965139f, 0.14349262f},
-{-0.98768834f, 0.15643447f}, {-0.98555606f, 0.16934950f},
-{-0.98325491f, 0.18223553f}, {-0.98078528f, 0.19509032f},
-{-0.97814760f, 0.20791169f}, {-0.97534232f, 0.22069744f},
-{-0.97236992f, 0.23344536f}, {-0.96923091f, 0.24615329f},
-{-0.96592583f, 0.25881905f}, {-0.96245524f, 0.27144045f},
-{-0.95881973f, 0.28401534f}, {-0.95501994f, 0.29654157f},
-{-0.95105652f, 0.30901699f}, {-0.94693013f, 0.32143947f},
-{-0.94264149f, 0.33380686f}, {-0.93819134f, 0.34611706f},
-{-0.93358043f, 0.35836795f}, {-0.92880955f, 0.37055744f},
-{-0.92387953f, 0.38268343f}, {-0.91879121f, 0.39474386f},
-{-0.91354546f, 0.40673664f}, {-0.90814317f, 0.41865974f},
-{-0.90258528f, 0.43051110f}, {-0.89687274f, 0.44228869f},
-{-0.89100652f, 0.45399050f}, {-0.88498764f, 0.46561452f},
-{-0.87881711f, 0.47715876f}, {-0.87249601f, 0.48862124f},
-{-0.86602540f, 0.50000000f}, {-0.85940641f, 0.51129309f},
-{-0.85264016f, 0.52249856f}, {-0.84572782f, 0.53361452f},
-{-0.83867057f, 0.54463904f}, {-0.83146961f, 0.55557023f},
-{-0.82412619f, 0.56640624f}, {-0.81664156f, 0.57714519f},
-{-0.80901699f, 0.58778525f}, {-0.80125381f, 0.59832460f},
-{-0.79335334f, 0.60876143f}, {-0.78531693f, 0.61909395f},
-{-0.77714596f, 0.62932039f}, {-0.76884183f, 0.63943900f},
-{-0.76040597f, 0.64944805f}, {-0.75183981f, 0.65934582f},
-{-0.74314483f, 0.66913061f}, {-0.73432251f, 0.67880075f},
-{-0.72537437f, 0.68835458f}, {-0.71630194f, 0.69779046f},
-{-0.70710678f, 0.70710678f}, {-0.69779046f, 0.71630194f},
-{-0.68835458f, 0.72537437f}, {-0.67880075f, 0.73432251f},
-{-0.66913061f, 0.74314483f}, {-0.65934582f, 0.75183981f},
-{-0.64944805f, 0.76040597f}, {-0.63943900f, 0.76884183f},
-{-0.62932039f, 0.77714596f}, {-0.61909395f, 0.78531693f},
-{-0.60876143f, 0.79335334f}, {-0.59832460f, 0.80125381f},
-{-0.58778525f, 0.80901699f}, {-0.57714519f, 0.81664156f},
-{-0.56640624f, 0.82412619f}, {-0.55557023f, 0.83146961f},
-{-0.54463904f, 0.83867057f}, {-0.53361452f, 0.84572782f},
-{-0.52249856f, 0.85264016f}, {-0.51129309f, 0.85940641f},
-{-0.50000000f, 0.86602540f}, {-0.48862124f, 0.87249601f},
-{-0.47715876f, 0.87881711f}, {-0.46561452f, 0.88498764f},
-{-0.45399050f, 0.89100652f}, {-0.44228869f, 0.89687274f},
-{-0.43051110f, 0.90258528f}, {-0.41865974f, 0.90814317f},
-{-0.40673664f, 0.91354546f}, {-0.39474386f, 0.91879121f},
-{-0.38268343f, 0.92387953f}, {-0.37055744f, 0.92880955f},
-{-0.35836795f, 0.93358043f}, {-0.34611706f, 0.93819134f},
-{-0.33380686f, 0.94264149f}, {-0.32143947f, 0.94693013f},
-{-0.30901699f, 0.95105652f}, {-0.29654157f, 0.95501994f},
-{-0.28401534f, 0.95881973f}, {-0.27144045f, 0.96245524f},
-{-0.25881905f, 0.96592583f}, {-0.24615329f, 0.96923091f},
-{-0.23344536f, 0.97236992f}, {-0.22069744f, 0.97534232f},
-{-0.20791169f, 0.97814760f}, {-0.19509032f, 0.98078528f},
-{-0.18223553f, 0.98325491f}, {-0.16934950f, 0.98555606f},
-{-0.15643447f, 0.98768834f}, {-0.14349262f, 0.98965139f},
-{-0.13052619f, 0.99144486f}, {-0.11753740f, 0.99306846f},
-{-0.10452846f, 0.99452190f}, {-0.091501619f, 0.99580493f},
-{-0.078459096f, 0.99691733f}, {-0.065403129f, 0.99785892f},
-{-0.052335956f, 0.99862953f}, {-0.039259816f, 0.99922904f},
-{-0.026176948f, 0.99965732f}, {-0.013089596f, 0.99991433f},
-{-1.8369702e-16f, 1.0000000f}, {0.013089596f, 0.99991433f},
-{0.026176948f, 0.99965732f}, {0.039259816f, 0.99922904f},
-{0.052335956f, 0.99862953f}, {0.065403129f, 0.99785892f},
-{0.078459096f, 0.99691733f}, {0.091501619f, 0.99580493f},
-{0.10452846f, 0.99452190f}, {0.11753740f, 0.99306846f},
-{0.13052619f, 0.99144486f}, {0.14349262f, 0.98965139f},
-{0.15643447f, 0.98768834f}, {0.16934950f, 0.98555606f},
-{0.18223553f, 0.98325491f}, {0.19509032f, 0.98078528f},
-{0.20791169f, 0.97814760f}, {0.22069744f, 0.97534232f},
-{0.23344536f, 0.97236992f}, {0.24615329f, 0.96923091f},
-{0.25881905f, 0.96592583f}, {0.27144045f, 0.96245524f},
-{0.28401534f, 0.95881973f}, {0.29654157f, 0.95501994f},
-{0.30901699f, 0.95105652f}, {0.32143947f, 0.94693013f},
-{0.33380686f, 0.94264149f}, {0.34611706f, 0.93819134f},
-{0.35836795f, 0.93358043f}, {0.37055744f, 0.92880955f},
-{0.38268343f, 0.92387953f}, {0.39474386f, 0.91879121f},
-{0.40673664f, 0.91354546f}, {0.41865974f, 0.90814317f},
-{0.43051110f, 0.90258528f}, {0.44228869f, 0.89687274f},
-{0.45399050f, 0.89100652f}, {0.46561452f, 0.88498764f},
-{0.47715876f, 0.87881711f}, {0.48862124f, 0.87249601f},
-{0.50000000f, 0.86602540f}, {0.51129309f, 0.85940641f},
-{0.52249856f, 0.85264016f}, {0.53361452f, 0.84572782f},
-{0.54463904f, 0.83867057f}, {0.55557023f, 0.83146961f},
-{0.56640624f, 0.82412619f}, {0.57714519f, 0.81664156f},
-{0.58778525f, 0.80901699f}, {0.59832460f, 0.80125381f},
-{0.60876143f, 0.79335334f}, {0.61909395f, 0.78531693f},
-{0.62932039f, 0.77714596f}, {0.63943900f, 0.76884183f},
-{0.64944805f, 0.76040597f}, {0.65934582f, 0.75183981f},
-{0.66913061f, 0.74314483f}, {0.67880075f, 0.73432251f},
-{0.68835458f, 0.72537437f}, {0.69779046f, 0.71630194f},
-{0.70710678f, 0.70710678f}, {0.71630194f, 0.69779046f},
-{0.72537437f, 0.68835458f}, {0.73432251f, 0.67880075f},
-{0.74314483f, 0.66913061f}, {0.75183981f, 0.65934582f},
-{0.76040597f, 0.64944805f}, {0.76884183f, 0.63943900f},
-{0.77714596f, 0.62932039f}, {0.78531693f, 0.61909395f},
-{0.79335334f, 0.60876143f}, {0.80125381f, 0.59832460f},
-{0.80901699f, 0.58778525f}, {0.81664156f, 0.57714519f},
-{0.82412619f, 0.56640624f}, {0.83146961f, 0.55557023f},
-{0.83867057f, 0.54463904f}, {0.84572782f, 0.53361452f},
-{0.85264016f, 0.52249856f}, {0.85940641f, 0.51129309f},
-{0.86602540f, 0.50000000f}, {0.87249601f, 0.48862124f},
-{0.87881711f, 0.47715876f}, {0.88498764f, 0.46561452f},
-{0.89100652f, 0.45399050f}, {0.89687274f, 0.44228869f},
-{0.90258528f, 0.43051110f}, {0.90814317f, 0.41865974f},
-{0.91354546f, 0.40673664f}, {0.91879121f, 0.39474386f},
-{0.92387953f, 0.38268343f}, {0.92880955f, 0.37055744f},
-{0.93358043f, 0.35836795f}, {0.93819134f, 0.34611706f},
-{0.94264149f, 0.33380686f}, {0.94693013f, 0.32143947f},
-{0.95105652f, 0.30901699f}, {0.95501994f, 0.29654157f},
-{0.95881973f, 0.28401534f}, {0.96245524f, 0.27144045f},
-{0.96592583f, 0.25881905f}, {0.96923091f, 0.24615329f},
-{0.97236992f, 0.23344536f}, {0.97534232f, 0.22069744f},
-{0.97814760f, 0.20791169f}, {0.98078528f, 0.19509032f},
-{0.98325491f, 0.18223553f}, {0.98555606f, 0.16934950f},
-{0.98768834f, 0.15643447f}, {0.98965139f, 0.14349262f},
-{0.99144486f, 0.13052619f}, {0.99306846f, 0.11753740f},
-{0.99452190f, 0.10452846f}, {0.99580493f, 0.091501619f},
-{0.99691733f, 0.078459096f}, {0.99785892f, 0.065403129f},
-{0.99862953f, 0.052335956f}, {0.99922904f, 0.039259816f},
-{0.99965732f, 0.026176948f}, {0.99991433f, 0.013089596f},
+    {1.0000000f, -0.0000000f}, {0.99991433f, -0.013089596f},
+    {0.99965732f, -0.026176948f}, {0.99922904f, -0.039259816f},
+    {0.99862953f, -0.052335956f}, {0.99785892f, -0.065403129f},
+    {0.99691733f, -0.078459096f}, {0.99580493f, -0.091501619f},
+    {0.99452190f, -0.10452846f}, {0.99306846f, -0.11753740f},
+    {0.99144486f, -0.13052619f}, {0.98965139f, -0.14349262f},
+    {0.98768834f, -0.15643447f}, {0.98555606f, -0.16934950f},
+    {0.98325491f, -0.18223553f}, {0.98078528f, -0.19509032f},
+    {0.97814760f, -0.20791169f}, {0.97534232f, -0.22069744f},
+    {0.97236992f, -0.23344536f}, {0.96923091f, -0.24615329f},
+    {0.96592583f, -0.25881905f}, {0.96245524f, -0.27144045f},
+    {0.95881973f, -0.28401534f}, {0.95501994f, -0.29654157f},
+    {0.95105652f, -0.30901699f}, {0.94693013f, -0.32143947f},
+    {0.94264149f, -0.33380686f}, {0.93819134f, -0.34611706f},
+    {0.93358043f, -0.35836795f}, {0.92880955f, -0.37055744f},
+    {0.92387953f, -0.38268343f}, {0.91879121f, -0.39474386f},
+    {0.91354546f, -0.40673664f}, {0.90814317f, -0.41865974f},
+    {0.90258528f, -0.43051110f}, {0.89687274f, -0.44228869f},
+    {0.89100652f, -0.45399050f}, {0.88498764f, -0.46561452f},
+    {0.87881711f, -0.47715876f}, {0.87249601f, -0.48862124f},
+    {0.86602540f, -0.50000000f}, {0.85940641f, -0.51129309f},
+    {0.85264016f, -0.52249856f}, {0.84572782f, -0.53361452f},
+    {0.83867057f, -0.54463904f}, {0.83146961f, -0.55557023f},
+    {0.82412619f, -0.56640624f}, {0.81664156f, -0.57714519f},
+    {0.80901699f, -0.58778525f}, {0.80125381f, -0.59832460f},
+    {0.79335334f, -0.60876143f}, {0.78531693f, -0.61909395f},
+    {0.77714596f, -0.62932039f}, {0.76884183f, -0.63943900f},
+    {0.76040597f, -0.64944805f}, {0.75183981f, -0.65934582f},
+    {0.74314483f, -0.66913061f}, {0.73432251f, -0.67880075f},
+    {0.72537437f, -0.68835458f}, {0.71630194f, -0.69779046f},
+    {0.70710678f, -0.70710678f}, {0.69779046f, -0.71630194f},
+    {0.68835458f, -0.72537437f}, {0.67880075f, -0.73432251f},
+    {0.66913061f, -0.74314483f}, {0.65934582f, -0.75183981f},
+    {0.64944805f, -0.76040597f}, {0.63943900f, -0.76884183f},
+    {0.62932039f, -0.77714596f}, {0.61909395f, -0.78531693f},
+    {0.60876143f, -0.79335334f}, {0.59832460f, -0.80125381f},
+    {0.58778525f, -0.80901699f}, {0.57714519f, -0.81664156f},
+    {0.56640624f, -0.82412619f}, {0.55557023f, -0.83146961f},
+    {0.54463904f, -0.83867057f}, {0.53361452f, -0.84572782f},
+    {0.52249856f, -0.85264016f}, {0.51129309f, -0.85940641f},
+    {0.50000000f, -0.86602540f}, {0.48862124f, -0.87249601f},
+    {0.47715876f, -0.87881711f}, {0.46561452f, -0.88498764f},
+    {0.45399050f, -0.89100652f}, {0.44228869f, -0.89687274f},
+    {0.43051110f, -0.90258528f}, {0.41865974f, -0.90814317f},
+    {0.40673664f, -0.91354546f}, {0.39474386f, -0.91879121f},
+    {0.38268343f, -0.92387953f}, {0.37055744f, -0.92880955f},
+    {0.35836795f, -0.93358043f}, {0.34611706f, -0.93819134f},
+    {0.33380686f, -0.94264149f}, {0.32143947f, -0.94693013f},
+    {0.30901699f, -0.95105652f}, {0.29654157f, -0.95501994f},
+    {0.28401534f, -0.95881973f}, {0.27144045f, -0.96245524f},
+    {0.25881905f, -0.96592583f}, {0.24615329f, -0.96923091f},
+    {0.23344536f, -0.97236992f}, {0.22069744f, -0.97534232f},
+    {0.20791169f, -0.97814760f}, {0.19509032f, -0.98078528f},
+    {0.18223553f, -0.98325491f}, {0.16934950f, -0.98555606f},
+    {0.15643447f, -0.98768834f}, {0.14349262f, -0.98965139f},
+    {0.13052619f, -0.99144486f}, {0.11753740f, -0.99306846f},
+    {0.10452846f, -0.99452190f}, {0.091501619f, -0.99580493f},
+    {0.078459096f, -0.99691733f}, {0.065403129f, -0.99785892f},
+    {0.052335956f, -0.99862953f}, {0.039259816f, -0.99922904f},
+    {0.026176948f, -0.99965732f}, {0.013089596f, -0.99991433f},
+    {6.1232340e-17f, -1.0000000f}, {-0.013089596f, -0.99991433f},
+    {-0.026176948f, -0.99965732f}, {-0.039259816f, -0.99922904f},
+    {-0.052335956f, -0.99862953f}, {-0.065403129f, -0.99785892f},
+    {-0.078459096f, -0.99691733f}, {-0.091501619f, -0.99580493f},
+    {-0.10452846f, -0.99452190f}, {-0.11753740f, -0.99306846f},
+    {-0.13052619f, -0.99144486f}, {-0.14349262f, -0.98965139f},
+    {-0.15643447f, -0.98768834f}, {-0.16934950f, -0.98555606f},
+    {-0.18223553f, -0.98325491f}, {-0.19509032f, -0.98078528f},
+    {-0.20791169f, -0.97814760f}, {-0.22069744f, -0.97534232f},
+    {-0.23344536f, -0.97236992f}, {-0.24615329f, -0.96923091f},
+    {-0.25881905f, -0.96592583f}, {-0.27144045f, -0.96245524f},
+    {-0.28401534f, -0.95881973f}, {-0.29654157f, -0.95501994f},
+    {-0.30901699f, -0.95105652f}, {-0.32143947f, -0.94693013f},
+    {-0.33380686f, -0.94264149f}, {-0.34611706f, -0.93819134f},
+    {-0.35836795f, -0.93358043f}, {-0.37055744f, -0.92880955f},
+    {-0.38268343f, -0.92387953f}, {-0.39474386f, -0.91879121f},
+    {-0.40673664f, -0.91354546f}, {-0.41865974f, -0.90814317f},
+    {-0.43051110f, -0.90258528f}, {-0.44228869f, -0.89687274f},
+    {-0.45399050f, -0.89100652f}, {-0.46561452f, -0.88498764f},
+    {-0.47715876f, -0.87881711f}, {-0.48862124f, -0.87249601f},
+    {-0.50000000f, -0.86602540f}, {-0.51129309f, -0.85940641f},
+    {-0.52249856f, -0.85264016f}, {-0.53361452f, -0.84572782f},
+    {-0.54463904f, -0.83867057f}, {-0.55557023f, -0.83146961f},
+    {-0.56640624f, -0.82412619f}, {-0.57714519f, -0.81664156f},
+    {-0.58778525f, -0.80901699f}, {-0.59832460f, -0.80125381f},
+    {-0.60876143f, -0.79335334f}, {-0.61909395f, -0.78531693f},
+    {-0.62932039f, -0.77714596f}, {-0.63943900f, -0.76884183f},
+    {-0.64944805f, -0.76040597f}, {-0.65934582f, -0.75183981f},
+    {-0.66913061f, -0.74314483f}, {-0.67880075f, -0.73432251f},
+    {-0.68835458f, -0.72537437f}, {-0.69779046f, -0.71630194f},
+    {-0.70710678f, -0.70710678f}, {-0.71630194f, -0.69779046f},
+    {-0.72537437f, -0.68835458f}, {-0.73432251f, -0.67880075f},
+    {-0.74314483f, -0.66913061f}, {-0.75183981f, -0.65934582f},
+    {-0.76040597f, -0.64944805f}, {-0.76884183f, -0.63943900f},
+    {-0.77714596f, -0.62932039f}, {-0.78531693f, -0.61909395f},
+    {-0.79335334f, -0.60876143f}, {-0.80125381f, -0.59832460f},
+    {-0.80901699f, -0.58778525f}, {-0.81664156f, -0.57714519f},
+    {-0.82412619f, -0.56640624f}, {-0.83146961f, -0.55557023f},
+    {-0.83867057f, -0.54463904f}, {-0.84572782f, -0.53361452f},
+    {-0.85264016f, -0.52249856f}, {-0.85940641f, -0.51129309f},
+    {-0.86602540f, -0.50000000f}, {-0.87249601f, -0.48862124f},
+    {-0.87881711f, -0.47715876f}, {-0.88498764f, -0.46561452f},
+    {-0.89100652f, -0.45399050f}, {-0.89687274f, -0.44228869f},
+    {-0.90258528f, -0.43051110f}, {-0.90814317f, -0.41865974f},
+    {-0.91354546f, -0.40673664f}, {-0.91879121f, -0.39474386f},
+    {-0.92387953f, -0.38268343f}, {-0.92880955f, -0.37055744f},
+    {-0.93358043f, -0.35836795f}, {-0.93819134f, -0.34611706f},
+    {-0.94264149f, -0.33380686f}, {-0.94693013f, -0.32143947f},
+    {-0.95105652f, -0.30901699f}, {-0.95501994f, -0.29654157f},
+    {-0.95881973f, -0.28401534f}, {-0.96245524f, -0.27144045f},
+    {-0.96592583f, -0.25881905f}, {-0.96923091f, -0.24615329f},
+    {-0.97236992f, -0.23344536f}, {-0.97534232f, -0.22069744f},
+    {-0.97814760f, -0.20791169f}, {-0.98078528f, -0.19509032f},
+    {-0.98325491f, -0.18223553f}, {-0.98555606f, -0.16934950f},
+    {-0.98768834f, -0.15643447f}, {-0.98965139f, -0.14349262f},
+    {-0.99144486f, -0.13052619f}, {-0.99306846f, -0.11753740f},
+    {-0.99452190f, -0.10452846f}, {-0.99580493f, -0.091501619f},
+    {-0.99691733f, -0.078459096f}, {-0.99785892f, -0.065403129f},
+    {-0.99862953f, -0.052335956f}, {-0.99922904f, -0.039259816f},
+    {-0.99965732f, -0.026176948f}, {-0.99991433f, -0.013089596f},
+    {-1.0000000f, -1.2246468e-16f}, {-0.99991433f, 0.013089596f},
+    {-0.99965732f, 0.026176948f}, {-0.99922904f, 0.039259816f},
+    {-0.99862953f, 0.052335956f}, {-0.99785892f, 0.065403129f},
+    {-0.99691733f, 0.078459096f}, {-0.99580493f, 0.091501619f},
+    {-0.99452190f, 0.10452846f}, {-0.99306846f, 0.11753740f},
+    {-0.99144486f, 0.13052619f}, {-0.98965139f, 0.14349262f},
+    {-0.98768834f, 0.15643447f}, {-0.98555606f, 0.16934950f},
+    {-0.98325491f, 0.18223553f}, {-0.98078528f, 0.19509032f},
+    {-0.97814760f, 0.20791169f}, {-0.97534232f, 0.22069744f},
+    {-0.97236992f, 0.23344536f}, {-0.96923091f, 0.24615329f},
+    {-0.96592583f, 0.25881905f}, {-0.96245524f, 0.27144045f},
+    {-0.95881973f, 0.28401534f}, {-0.95501994f, 0.29654157f},
+    {-0.95105652f, 0.30901699f}, {-0.94693013f, 0.32143947f},
+    {-0.94264149f, 0.33380686f}, {-0.93819134f, 0.34611706f},
+    {-0.93358043f, 0.35836795f}, {-0.92880955f, 0.37055744f},
+    {-0.92387953f, 0.38268343f}, {-0.91879121f, 0.39474386f},
+    {-0.91354546f, 0.40673664f}, {-0.90814317f, 0.41865974f},
+    {-0.90258528f, 0.43051110f}, {-0.89687274f, 0.44228869f},
+    {-0.89100652f, 0.45399050f}, {-0.88498764f, 0.46561452f},
+    {-0.87881711f, 0.47715876f}, {-0.87249601f, 0.48862124f},
+    {-0.86602540f, 0.50000000f}, {-0.85940641f, 0.51129309f},
+    {-0.85264016f, 0.52249856f}, {-0.84572782f, 0.53361452f},
+    {-0.83867057f, 0.54463904f}, {-0.83146961f, 0.55557023f},
+    {-0.82412619f, 0.56640624f}, {-0.81664156f, 0.57714519f},
+    {-0.80901699f, 0.58778525f}, {-0.80125381f, 0.59832460f},
+    {-0.79335334f, 0.60876143f}, {-0.78531693f, 0.61909395f},
+    {-0.77714596f, 0.62932039f}, {-0.76884183f, 0.63943900f},
+    {-0.76040597f, 0.64944805f}, {-0.75183981f, 0.65934582f},
+    {-0.74314483f, 0.66913061f}, {-0.73432251f, 0.67880075f},
+    {-0.72537437f, 0.68835458f}, {-0.71630194f, 0.69779046f},
+    {-0.70710678f, 0.70710678f}, {-0.69779046f, 0.71630194f},
+    {-0.68835458f, 0.72537437f}, {-0.67880075f, 0.73432251f},
+    {-0.66913061f, 0.74314483f}, {-0.65934582f, 0.75183981f},
+    {-0.64944805f, 0.76040597f}, {-0.63943900f, 0.76884183f},
+    {-0.62932039f, 0.77714596f}, {-0.61909395f, 0.78531693f},
+    {-0.60876143f, 0.79335334f}, {-0.59832460f, 0.80125381f},
+    {-0.58778525f, 0.80901699f}, {-0.57714519f, 0.81664156f},
+    {-0.56640624f, 0.82412619f}, {-0.55557023f, 0.83146961f},
+    {-0.54463904f, 0.83867057f}, {-0.53361452f, 0.84572782f},
+    {-0.52249856f, 0.85264016f}, {-0.51129309f, 0.85940641f},
+    {-0.50000000f, 0.86602540f}, {-0.48862124f, 0.87249601f},
+    {-0.47715876f, 0.87881711f}, {-0.46561452f, 0.88498764f},
+    {-0.45399050f, 0.89100652f}, {-0.44228869f, 0.89687274f},
+    {-0.43051110f, 0.90258528f}, {-0.41865974f, 0.90814317f},
+    {-0.40673664f, 0.91354546f}, {-0.39474386f, 0.91879121f},
+    {-0.38268343f, 0.92387953f}, {-0.37055744f, 0.92880955f},
+    {-0.35836795f, 0.93358043f}, {-0.34611706f, 0.93819134f},
+    {-0.33380686f, 0.94264149f}, {-0.32143947f, 0.94693013f},
+    {-0.30901699f, 0.95105652f}, {-0.29654157f, 0.95501994f},
+    {-0.28401534f, 0.95881973f}, {-0.27144045f, 0.96245524f},
+    {-0.25881905f, 0.96592583f}, {-0.24615329f, 0.96923091f},
+    {-0.23344536f, 0.97236992f}, {-0.22069744f, 0.97534232f},
+    {-0.20791169f, 0.97814760f}, {-0.19509032f, 0.98078528f},
+    {-0.18223553f, 0.98325491f}, {-0.16934950f, 0.98555606f},
+    {-0.15643447f, 0.98768834f}, {-0.14349262f, 0.98965139f},
+    {-0.13052619f, 0.99144486f}, {-0.11753740f, 0.99306846f},
+    {-0.10452846f, 0.99452190f}, {-0.091501619f, 0.99580493f},
+    {-0.078459096f, 0.99691733f}, {-0.065403129f, 0.99785892f},
+    {-0.052335956f, 0.99862953f}, {-0.039259816f, 0.99922904f},
+    {-0.026176948f, 0.99965732f}, {-0.013089596f, 0.99991433f},
+    {-1.8369702e-16f, 1.0000000f}, {0.013089596f, 0.99991433f},
+    {0.026176948f, 0.99965732f}, {0.039259816f, 0.99922904f},
+    {0.052335956f, 0.99862953f}, {0.065403129f, 0.99785892f},
+    {0.078459096f, 0.99691733f}, {0.091501619f, 0.99580493f},
+    {0.10452846f, 0.99452190f}, {0.11753740f, 0.99306846f},
+    {0.13052619f, 0.99144486f}, {0.14349262f, 0.98965139f},
+    {0.15643447f, 0.98768834f}, {0.16934950f, 0.98555606f},
+    {0.18223553f, 0.98325491f}, {0.19509032f, 0.98078528f},
+    {0.20791169f, 0.97814760f}, {0.22069744f, 0.97534232f},
+    {0.23344536f, 0.97236992f}, {0.24615329f, 0.96923091f},
+    {0.25881905f, 0.96592583f}, {0.27144045f, 0.96245524f},
+    {0.28401534f, 0.95881973f}, {0.29654157f, 0.95501994f},
+    {0.30901699f, 0.95105652f}, {0.32143947f, 0.94693013f},
+    {0.33380686f, 0.94264149f}, {0.34611706f, 0.93819134f},
+    {0.35836795f, 0.93358043f}, {0.37055744f, 0.92880955f},
+    {0.38268343f, 0.92387953f}, {0.39474386f, 0.91879121f},
+    {0.40673664f, 0.91354546f}, {0.41865974f, 0.90814317f},
+    {0.43051110f, 0.90258528f}, {0.44228869f, 0.89687274f},
+    {0.45399050f, 0.89100652f}, {0.46561452f, 0.88498764f},
+    {0.47715876f, 0.87881711f}, {0.48862124f, 0.87249601f},
+    {0.50000000f, 0.86602540f}, {0.51129309f, 0.85940641f},
+    {0.52249856f, 0.85264016f}, {0.53361452f, 0.84572782f},
+    {0.54463904f, 0.83867057f}, {0.55557023f, 0.83146961f},
+    {0.56640624f, 0.82412619f}, {0.57714519f, 0.81664156f},
+    {0.58778525f, 0.80901699f}, {0.59832460f, 0.80125381f},
+    {0.60876143f, 0.79335334f}, {0.61909395f, 0.78531693f},
+    {0.62932039f, 0.77714596f}, {0.63943900f, 0.76884183f},
+    {0.64944805f, 0.76040597f}, {0.65934582f, 0.75183981f},
+    {0.66913061f, 0.74314483f}, {0.67880075f, 0.73432251f},
+    {0.68835458f, 0.72537437f}, {0.69779046f, 0.71630194f},
+    {0.70710678f, 0.70710678f}, {0.71630194f, 0.69779046f},
+    {0.72537437f, 0.68835458f}, {0.73432251f, 0.67880075f},
+    {0.74314483f, 0.66913061f}, {0.75183981f, 0.65934582f},
+    {0.76040597f, 0.64944805f}, {0.76884183f, 0.63943900f},
+    {0.77714596f, 0.62932039f}, {0.78531693f, 0.61909395f},
+    {0.79335334f, 0.60876143f}, {0.80125381f, 0.59832460f},
+    {0.80901699f, 0.58778525f}, {0.81664156f, 0.57714519f},
+    {0.82412619f, 0.56640624f}, {0.83146961f, 0.55557023f},
+    {0.83867057f, 0.54463904f}, {0.84572782f, 0.53361452f},
+    {0.85264016f, 0.52249856f}, {0.85940641f, 0.51129309f},
+    {0.86602540f, 0.50000000f}, {0.87249601f, 0.48862124f},
+    {0.87881711f, 0.47715876f}, {0.88498764f, 0.46561452f},
+    {0.89100652f, 0.45399050f}, {0.89687274f, 0.44228869f},
+    {0.90258528f, 0.43051110f}, {0.90814317f, 0.41865974f},
+    {0.91354546f, 0.40673664f}, {0.91879121f, 0.39474386f},
+    {0.92387953f, 0.38268343f}, {0.92880955f, 0.37055744f},
+    {0.93358043f, 0.35836795f}, {0.93819134f, 0.34611706f},
+    {0.94264149f, 0.33380686f}, {0.94693013f, 0.32143947f},
+    {0.95105652f, 0.30901699f}, {0.95501994f, 0.29654157f},
+    {0.95881973f, 0.28401534f}, {0.96245524f, 0.27144045f},
+    {0.96592583f, 0.25881905f}, {0.96923091f, 0.24615329f},
+    {0.97236992f, 0.23344536f}, {0.97534232f, 0.22069744f},
+    {0.97814760f, 0.20791169f}, {0.98078528f, 0.19509032f},
+    {0.98325491f, 0.18223553f}, {0.98555606f, 0.16934950f},
+    {0.98768834f, 0.15643447f}, {0.98965139f, 0.14349262f},
+    {0.99144486f, 0.13052619f}, {0.99306846f, 0.11753740f},
+    {0.99452190f, 0.10452846f}, {0.99580493f, 0.091501619f},
+    {0.99691733f, 0.078459096f}, {0.99785892f, 0.065403129f},
+    {0.99862953f, 0.052335956f}, {0.99922904f, 0.039259816f},
+    {0.99965732f, 0.026176948f}, {0.99991433f, 0.013089596f},
 };
-#ifndef FFT_BITREV480
-#define FFT_BITREV480
+# ifndef FFT_BITREV480
+#  define FFT_BITREV480
 static const oac_int16 fft_bitrev480[480] = {
-0, 96, 192, 288, 384, 32, 128, 224, 320, 416, 64, 160, 256, 352, 448,
-8, 104, 200, 296, 392, 40, 136, 232, 328, 424, 72, 168, 264, 360, 456,
-16, 112, 208, 304, 400, 48, 144, 240, 336, 432, 80, 176, 272, 368, 464,
-24, 120, 216, 312, 408, 56, 152, 248, 344, 440, 88, 184, 280, 376, 472,
-4, 100, 196, 292, 388, 36, 132, 228, 324, 420, 68, 164, 260, 356, 452,
-12, 108, 204, 300, 396, 44, 140, 236, 332, 428, 76, 172, 268, 364, 460,
-20, 116, 212, 308, 404, 52, 148, 244, 340, 436, 84, 180, 276, 372, 468,
-28, 124, 220, 316, 412, 60, 156, 252, 348, 444, 92, 188, 284, 380, 476,
-1, 97, 193, 289, 385, 33, 129, 225, 321, 417, 65, 161, 257, 353, 449,
-9, 105, 201, 297, 393, 41, 137, 233, 329, 425, 73, 169, 265, 361, 457,
-17, 113, 209, 305, 401, 49, 145, 241, 337, 433, 81, 177, 273, 369, 465,
-25, 121, 217, 313, 409, 57, 153, 249, 345, 441, 89, 185, 281, 377, 473,
-5, 101, 197, 293, 389, 37, 133, 229, 325, 421, 69, 165, 261, 357, 453,
-13, 109, 205, 301, 397, 45, 141, 237, 333, 429, 77, 173, 269, 365, 461,
-21, 117, 213, 309, 405, 53, 149, 245, 341, 437, 85, 181, 277, 373, 469,
-29, 125, 221, 317, 413, 61, 157, 253, 349, 445, 93, 189, 285, 381, 477,
-2, 98, 194, 290, 386, 34, 130, 226, 322, 418, 66, 162, 258, 354, 450,
-10, 106, 202, 298, 394, 42, 138, 234, 330, 426, 74, 170, 266, 362, 458,
-18, 114, 210, 306, 402, 50, 146, 242, 338, 434, 82, 178, 274, 370, 466,
-26, 122, 218, 314, 410, 58, 154, 250, 346, 442, 90, 186, 282, 378, 474,
-6, 102, 198, 294, 390, 38, 134, 230, 326, 422, 70, 166, 262, 358, 454,
-14, 110, 206, 302, 398, 46, 142, 238, 334, 430, 78, 174, 270, 366, 462,
-22, 118, 214, 310, 406, 54, 150, 246, 342, 438, 86, 182, 278, 374, 470,
-30, 126, 222, 318, 414, 62, 158, 254, 350, 446, 94, 190, 286, 382, 478,
-3, 99, 195, 291, 387, 35, 131, 227, 323, 419, 67, 163, 259, 355, 451,
-11, 107, 203, 299, 395, 43, 139, 235, 331, 427, 75, 171, 267, 363, 459,
-19, 115, 211, 307, 403, 51, 147, 243, 339, 435, 83, 179, 275, 371, 467,
-27, 123, 219, 315, 411, 59, 155, 251, 347, 443, 91, 187, 283, 379, 475,
-7, 103, 199, 295, 391, 39, 135, 231, 327, 423, 71, 167, 263, 359, 455,
-15, 111, 207, 303, 399, 47, 143, 239, 335, 431, 79, 175, 271, 367, 463,
-23, 119, 215, 311, 407, 55, 151, 247, 343, 439, 87, 183, 279, 375, 471,
-31, 127, 223, 319, 415, 63, 159, 255, 351, 447, 95, 191, 287, 383, 479,
+    0, 96, 192, 288, 384, 32, 128, 224, 320, 416, 64, 160, 256, 352, 448,
+    8, 104, 200, 296, 392, 40, 136, 232, 328, 424, 72, 168, 264, 360, 456,
+    16, 112, 208, 304, 400, 48, 144, 240, 336, 432, 80, 176, 272, 368, 464,
+    24, 120, 216, 312, 408, 56, 152, 248, 344, 440, 88, 184, 280, 376, 472,
+    4, 100, 196, 292, 388, 36, 132, 228, 324, 420, 68, 164, 260, 356, 452,
+    12, 108, 204, 300, 396, 44, 140, 236, 332, 428, 76, 172, 268, 364, 460,
+    20, 116, 212, 308, 404, 52, 148, 244, 340, 436, 84, 180, 276, 372, 468,
+    28, 124, 220, 316, 412, 60, 156, 252, 348, 444, 92, 188, 284, 380, 476,
+    1, 97, 193, 289, 385, 33, 129, 225, 321, 417, 65, 161, 257, 353, 449,
+    9, 105, 201, 297, 393, 41, 137, 233, 329, 425, 73, 169, 265, 361, 457,
+    17, 113, 209, 305, 401, 49, 145, 241, 337, 433, 81, 177, 273, 369, 465,
+    25, 121, 217, 313, 409, 57, 153, 249, 345, 441, 89, 185, 281, 377, 473,
+    5, 101, 197, 293, 389, 37, 133, 229, 325, 421, 69, 165, 261, 357, 453,
+    13, 109, 205, 301, 397, 45, 141, 237, 333, 429, 77, 173, 269, 365, 461,
+    21, 117, 213, 309, 405, 53, 149, 245, 341, 437, 85, 181, 277, 373, 469,
+    29, 125, 221, 317, 413, 61, 157, 253, 349, 445, 93, 189, 285, 381, 477,
+    2, 98, 194, 290, 386, 34, 130, 226, 322, 418, 66, 162, 258, 354, 450,
+    10, 106, 202, 298, 394, 42, 138, 234, 330, 426, 74, 170, 266, 362, 458,
+    18, 114, 210, 306, 402, 50, 146, 242, 338, 434, 82, 178, 274, 370, 466,
+    26, 122, 218, 314, 410, 58, 154, 250, 346, 442, 90, 186, 282, 378, 474,
+    6, 102, 198, 294, 390, 38, 134, 230, 326, 422, 70, 166, 262, 358, 454,
+    14, 110, 206, 302, 398, 46, 142, 238, 334, 430, 78, 174, 270, 366, 462,
+    22, 118, 214, 310, 406, 54, 150, 246, 342, 438, 86, 182, 278, 374, 470,
+    30, 126, 222, 318, 414, 62, 158, 254, 350, 446, 94, 190, 286, 382, 478,
+    3, 99, 195, 291, 387, 35, 131, 227, 323, 419, 67, 163, 259, 355, 451,
+    11, 107, 203, 299, 395, 43, 139, 235, 331, 427, 75, 171, 267, 363, 459,
+    19, 115, 211, 307, 403, 51, 147, 243, 339, 435, 83, 179, 275, 371, 467,
+    27, 123, 219, 315, 411, 59, 155, 251, 347, 443, 91, 187, 283, 379, 475,
+    7, 103, 199, 295, 391, 39, 135, 231, 327, 423, 71, 167, 263, 359, 455,
+    15, 111, 207, 303, 399, 47, 143, 239, 335, 431, 79, 175, 271, 367, 463,
+    23, 119, 215, 311, 407, 55, 151, 247, 343, 439, 87, 183, 279, 375, 471,
+    31, 127, 223, 319, 415, 63, 159, 255, 351, 447, 95, 191, 287, 383, 479,
 };
-#endif
+# endif
 
-#ifndef FFT_BITREV240
-#define FFT_BITREV240
+# ifndef FFT_BITREV240
+#  define FFT_BITREV240
 static const oac_int16 fft_bitrev240[240] = {
-0, 48, 96, 144, 192, 16, 64, 112, 160, 208, 32, 80, 128, 176, 224,
-4, 52, 100, 148, 196, 20, 68, 116, 164, 212, 36, 84, 132, 180, 228,
-8, 56, 104, 152, 200, 24, 72, 120, 168, 216, 40, 88, 136, 184, 232,
-12, 60, 108, 156, 204, 28, 76, 124, 172, 220, 44, 92, 140, 188, 236,
-1, 49, 97, 145, 193, 17, 65, 113, 161, 209, 33, 81, 129, 177, 225,
-5, 53, 101, 149, 197, 21, 69, 117, 165, 213, 37, 85, 133, 181, 229,
-9, 57, 105, 153, 201, 25, 73, 121, 169, 217, 41, 89, 137, 185, 233,
-13, 61, 109, 157, 205, 29, 77, 125, 173, 221, 45, 93, 141, 189, 237,
-2, 50, 98, 146, 194, 18, 66, 114, 162, 210, 34, 82, 130, 178, 226,
-6, 54, 102, 150, 198, 22, 70, 118, 166, 214, 38, 86, 134, 182, 230,
-10, 58, 106, 154, 202, 26, 74, 122, 170, 218, 42, 90, 138, 186, 234,
-14, 62, 110, 158, 206, 30, 78, 126, 174, 222, 46, 94, 142, 190, 238,
-3, 51, 99, 147, 195, 19, 67, 115, 163, 211, 35, 83, 131, 179, 227,
-7, 55, 103, 151, 199, 23, 71, 119, 167, 215, 39, 87, 135, 183, 231,
-11, 59, 107, 155, 203, 27, 75, 123, 171, 219, 43, 91, 139, 187, 235,
-15, 63, 111, 159, 207, 31, 79, 127, 175, 223, 47, 95, 143, 191, 239,
+    0, 48, 96, 144, 192, 16, 64, 112, 160, 208, 32, 80, 128, 176, 224,
+    4, 52, 100, 148, 196, 20, 68, 116, 164, 212, 36, 84, 132, 180, 228,
+    8, 56, 104, 152, 200, 24, 72, 120, 168, 216, 40, 88, 136, 184, 232,
+    12, 60, 108, 156, 204, 28, 76, 124, 172, 220, 44, 92, 140, 188, 236,
+    1, 49, 97, 145, 193, 17, 65, 113, 161, 209, 33, 81, 129, 177, 225,
+    5, 53, 101, 149, 197, 21, 69, 117, 165, 213, 37, 85, 133, 181, 229,
+    9, 57, 105, 153, 201, 25, 73, 121, 169, 217, 41, 89, 137, 185, 233,
+    13, 61, 109, 157, 205, 29, 77, 125, 173, 221, 45, 93, 141, 189, 237,
+    2, 50, 98, 146, 194, 18, 66, 114, 162, 210, 34, 82, 130, 178, 226,
+    6, 54, 102, 150, 198, 22, 70, 118, 166, 214, 38, 86, 134, 182, 230,
+    10, 58, 106, 154, 202, 26, 74, 122, 170, 218, 42, 90, 138, 186, 234,
+    14, 62, 110, 158, 206, 30, 78, 126, 174, 222, 46, 94, 142, 190, 238,
+    3, 51, 99, 147, 195, 19, 67, 115, 163, 211, 35, 83, 131, 179, 227,
+    7, 55, 103, 151, 199, 23, 71, 119, 167, 215, 39, 87, 135, 183, 231,
+    11, 59, 107, 155, 203, 27, 75, 123, 171, 219, 43, 91, 139, 187, 235,
+    15, 63, 111, 159, 207, 31, 79, 127, 175, 223, 47, 95, 143, 191, 239,
 };
-#endif
+# endif
 
-#ifndef FFT_BITREV120
-#define FFT_BITREV120
+# ifndef FFT_BITREV120
+#  define FFT_BITREV120
 static const oac_int16 fft_bitrev120[120] = {
-0, 24, 48, 72, 96, 8, 32, 56, 80, 104, 16, 40, 64, 88, 112,
-4, 28, 52, 76, 100, 12, 36, 60, 84, 108, 20, 44, 68, 92, 116,
-1, 25, 49, 73, 97, 9, 33, 57, 81, 105, 17, 41, 65, 89, 113,
-5, 29, 53, 77, 101, 13, 37, 61, 85, 109, 21, 45, 69, 93, 117,
-2, 26, 50, 74, 98, 10, 34, 58, 82, 106, 18, 42, 66, 90, 114,
-6, 30, 54, 78, 102, 14, 38, 62, 86, 110, 22, 46, 70, 94, 118,
-3, 27, 51, 75, 99, 11, 35, 59, 83, 107, 19, 43, 67, 91, 115,
-7, 31, 55, 79, 103, 15, 39, 63, 87, 111, 23, 47, 71, 95, 119,
+    0, 24, 48, 72, 96, 8, 32, 56, 80, 104, 16, 40, 64, 88, 112,
+    4, 28, 52, 76, 100, 12, 36, 60, 84, 108, 20, 44, 68, 92, 116,
+    1, 25, 49, 73, 97, 9, 33, 57, 81, 105, 17, 41, 65, 89, 113,
+    5, 29, 53, 77, 101, 13, 37, 61, 85, 109, 21, 45, 69, 93, 117,
+    2, 26, 50, 74, 98, 10, 34, 58, 82, 106, 18, 42, 66, 90, 114,
+    6, 30, 54, 78, 102, 14, 38, 62, 86, 110, 22, 46, 70, 94, 118,
+    3, 27, 51, 75, 99, 11, 35, 59, 83, 107, 19, 43, 67, 91, 115,
+    7, 31, 55, 79, 103, 15, 39, 63, 87, 111, 23, 47, 71, 95, 119,
 };
-#endif
+# endif
 
-#ifndef FFT_BITREV60
-#define FFT_BITREV60
+# ifndef FFT_BITREV60
+#  define FFT_BITREV60
 static const oac_int16 fft_bitrev60[60] = {
-0, 12, 24, 36, 48, 4, 16, 28, 40, 52, 8, 20, 32, 44, 56,
-1, 13, 25, 37, 49, 5, 17, 29, 41, 53, 9, 21, 33, 45, 57,
-2, 14, 26, 38, 50, 6, 18, 30, 42, 54, 10, 22, 34, 46, 58,
-3, 15, 27, 39, 51, 7, 19, 31, 43, 55, 11, 23, 35, 47, 59,
+    0, 12, 24, 36, 48, 4, 16, 28, 40, 52, 8, 20, 32, 44, 56,
+    1, 13, 25, 37, 49, 5, 17, 29, 41, 53, 9, 21, 33, 45, 57,
+    2, 14, 26, 38, 50, 6, 18, 30, 42, 54, 10, 22, 34, 46, 58,
+    3, 15, 27, 39, 51, 7, 19, 31, 43, 55, 11, 23, 35, 47, 59,
 };
-#endif
+# endif
 
-#ifndef FFT_STATE48000_960_0
-#define FFT_STATE48000_960_0
+# ifndef FFT_STATE48000_960_0
+#  define FFT_STATE48000_960_0
 static const kiss_fft_state fft_state48000_960_0 = {
-480,    /* nfft */
-0.0020833334f,    /* scale */
--1,    /* shift */
-{5, 96, 3, 32, 4, 8, 2, 4, 4, 1, 0, 0, 0, 0, 0, 0, },    /* factors */
-fft_bitrev480,    /* bitrev */
-fft_twiddles48000_960,    /* bitrev */
-#ifdef OVERRIDE_FFT
-(arch_fft_state *)&cfg_arch_480,
-#else
-NULL,
-#endif
+    480, /* nfft */
+    0.0020833334f, /* scale */
+    -1, /* shift */
+    {5, 96, 3, 32, 4, 8, 2, 4, 4, 1, 0, 0, 0, 0, 0, 0, }, /* factors */
+    fft_bitrev480, /* bitrev */
+    fft_twiddles48000_960, /* bitrev */
+#  ifdef OVERRIDE_FFT
+    (arch_fft_state *)&cfg_arch_480,
+#  else
+    NULL,
+#  endif
 };
-#endif
+# endif
 
-#ifndef FFT_STATE48000_960_1
-#define FFT_STATE48000_960_1
+# ifndef FFT_STATE48000_960_1
+#  define FFT_STATE48000_960_1
 static const kiss_fft_state fft_state48000_960_1 = {
-240,    /* nfft */
-0.0041666669f,    /* scale */
-1,    /* shift */
-{5, 48, 3, 16, 4, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, },    /* factors */
-fft_bitrev240,    /* bitrev */
-fft_twiddles48000_960,    /* bitrev */
-#ifdef OVERRIDE_FFT
-(arch_fft_state *)&cfg_arch_240,
-#else
-NULL,
-#endif
+    240, /* nfft */
+    0.0041666669f, /* scale */
+    1, /* shift */
+    {5, 48, 3, 16, 4, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, }, /* factors */
+    fft_bitrev240, /* bitrev */
+    fft_twiddles48000_960, /* bitrev */
+#  ifdef OVERRIDE_FFT
+    (arch_fft_state *)&cfg_arch_240,
+#  else
+    NULL,
+#  endif
 };
-#endif
+# endif
 
-#ifndef FFT_STATE48000_960_2
-#define FFT_STATE48000_960_2
+# ifndef FFT_STATE48000_960_2
+#  define FFT_STATE48000_960_2
 static const kiss_fft_state fft_state48000_960_2 = {
-120,    /* nfft */
-0.0083333338f,    /* scale */
-2,    /* shift */
-{5, 24, 3, 8, 2, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, },    /* factors */
-fft_bitrev120,    /* bitrev */
-fft_twiddles48000_960,    /* bitrev */
-#ifdef OVERRIDE_FFT
-(arch_fft_state *)&cfg_arch_120,
-#else
-NULL,
-#endif
+    120, /* nfft */
+    0.0083333338f, /* scale */
+    2, /* shift */
+    {5, 24, 3, 8, 2, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, }, /* factors */
+    fft_bitrev120, /* bitrev */
+    fft_twiddles48000_960, /* bitrev */
+#  ifdef OVERRIDE_FFT
+    (arch_fft_state *)&cfg_arch_120,
+#  else
+    NULL,
+#  endif
 };
-#endif
+# endif
 
-#ifndef FFT_STATE48000_960_3
-#define FFT_STATE48000_960_3
+# ifndef FFT_STATE48000_960_3
+#  define FFT_STATE48000_960_3
 static const kiss_fft_state fft_state48000_960_3 = {
-60,    /* nfft */
-0.016666668f,    /* scale */
-3,    /* shift */
-{5, 12, 3, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },    /* factors */
-fft_bitrev60,    /* bitrev */
-fft_twiddles48000_960,    /* bitrev */
-#ifdef OVERRIDE_FFT
-(arch_fft_state *)&cfg_arch_60,
-#else
-NULL,
-#endif
+    60, /* nfft */
+    0.016666668f, /* scale */
+    3, /* shift */
+    {5, 12, 3, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, /* factors */
+    fft_bitrev60, /* bitrev */
+    fft_twiddles48000_960, /* bitrev */
+#  ifdef OVERRIDE_FFT
+    (arch_fft_state *)&cfg_arch_60,
+#  else
+    NULL,
+#  endif
 };
-#endif
+# endif
 
 #endif
 
 #ifndef MDCT_TWIDDLES960
-#define MDCT_TWIDDLES960
+# define MDCT_TWIDDLES960
 static const celt_coef mdct_twiddles960[1800] = {
-0.99999992f, 0.99999322f, 0.99997582f, 0.99994771f, 0.99990889f,
-0.99985936f, 0.99979913f, 0.99972818f, 0.99964653f, 0.99955418f,
-0.99945112f, 0.99933736f, 0.99921289f, 0.99907773f, 0.99893186f,
-0.99877530f, 0.99860804f, 0.99843009f, 0.99824144f, 0.99804211f,
-0.99783209f, 0.99761138f, 0.99737998f, 0.99713791f, 0.99688516f,
-0.99662173f, 0.99634763f, 0.99606285f, 0.99576741f, 0.99546131f,
-0.99514455f, 0.99481713f, 0.99447905f, 0.99413033f, 0.99377096f,
-0.99340095f, 0.99302029f, 0.99262901f, 0.99222709f, 0.99181455f,
-0.99139139f, 0.99095760f, 0.99051321f, 0.99005821f, 0.98959261f,
-0.98911641f, 0.98862961f, 0.98813223f, 0.98762427f, 0.98710573f,
-0.98657662f, 0.98603694f, 0.98548670f, 0.98492591f, 0.98435457f,
-0.98377269f, 0.98318028f, 0.98257734f, 0.98196387f, 0.98133989f,
-0.98070539f, 0.98006040f, 0.97940491f, 0.97873893f, 0.97806247f,
-0.97737554f, 0.97667813f, 0.97597027f, 0.97525196f, 0.97452320f,
-0.97378401f, 0.97303439f, 0.97227435f, 0.97150389f, 0.97072303f,
-0.96993178f, 0.96913014f, 0.96831812f, 0.96749573f, 0.96666298f,
-0.96581987f, 0.96496643f, 0.96410265f, 0.96322854f, 0.96234412f,
-0.96144939f, 0.96054437f, 0.95962906f, 0.95870347f, 0.95776762f,
-0.95682151f, 0.95586515f, 0.95489856f, 0.95392174f, 0.95293471f,
-0.95193746f, 0.95093003f, 0.94991241f, 0.94888462f, 0.94784667f,
-0.94679856f, 0.94574032f, 0.94467195f, 0.94359346f, 0.94250486f,
-0.94140618f, 0.94029741f, 0.93917857f, 0.93804967f, 0.93691073f,
-0.93576176f, 0.93460276f, 0.93343375f, 0.93225475f, 0.93106577f,
-0.92986681f, 0.92865789f, 0.92743903f, 0.92621024f, 0.92497153f,
-0.92372291f, 0.92246440f, 0.92119602f, 0.91991776f, 0.91862966f,
-0.91733172f, 0.91602395f, 0.91470637f, 0.91337900f, 0.91204185f,
-0.91069493f, 0.90933825f, 0.90797184f, 0.90659570f, 0.90520986f,
-0.90381432f, 0.90240910f, 0.90099422f, 0.89956969f, 0.89813553f,
-0.89669174f, 0.89523836f, 0.89377538f, 0.89230284f, 0.89082074f,
-0.88932910f, 0.88782793f, 0.88631726f, 0.88479710f, 0.88326746f,
-0.88172836f, 0.88017982f, 0.87862185f, 0.87705448f, 0.87547771f,
-0.87389156f, 0.87229606f, 0.87069121f, 0.86907704f, 0.86745357f,
-0.86582080f, 0.86417876f, 0.86252747f, 0.86086694f, 0.85919719f,
-0.85751824f, 0.85583010f, 0.85413281f, 0.85242636f, 0.85071078f,
-0.84898610f, 0.84725232f, 0.84550947f, 0.84375756f, 0.84199662f,
-0.84022666f, 0.83844771f, 0.83665977f, 0.83486287f, 0.83305704f,
-0.83124228f, 0.82941862f, 0.82758608f, 0.82574467f, 0.82389442f,
-0.82203535f, 0.82016748f, 0.81829082f, 0.81640540f, 0.81451123f,
-0.81260835f, 0.81069676f, 0.80877649f, 0.80684755f, 0.80490998f,
-0.80296379f, 0.80100899f, 0.79904562f, 0.79707370f, 0.79509323f,
-0.79310425f, 0.79110678f, 0.78910084f, 0.78708644f, 0.78506362f,
-0.78303239f, 0.78099277f, 0.77894479f, 0.77688847f, 0.77482382f,
-0.77275088f, 0.77066967f, 0.76858020f, 0.76648250f, 0.76437659f,
-0.76226250f, 0.76014024f, 0.75800984f, 0.75587132f, 0.75372471f,
-0.75157003f, 0.74940730f, 0.74723654f, 0.74505779f, 0.74287105f,
-0.74067635f, 0.73847373f, 0.73626320f, 0.73404478f, 0.73181850f,
-0.72958438f, 0.72734245f, 0.72509273f, 0.72283525f, 0.72057002f,
-0.71829708f, 0.71601644f, 0.71372814f, 0.71143220f, 0.70912863f,
-0.70681747f, 0.70449874f, 0.70217247f, 0.69983868f, 0.69749739f,
-0.69514863f, 0.69279243f, 0.69042881f, 0.68805780f, 0.68567941f,
-0.68329369f, 0.68090064f, 0.67850031f, 0.67609270f, 0.67367786f,
-0.67125580f, 0.66882656f, 0.66639015f, 0.66394661f, 0.66149595f,
-0.65903821f, 0.65657341f, 0.65410159f, 0.65162275f, 0.64913694f,
-0.64664418f, 0.64414449f, 0.64163790f, 0.63912444f, 0.63660414f,
-0.63407702f, 0.63154311f, 0.62900244f, 0.62645503f, 0.62390091f,
-0.62134011f, 0.61877265f, 0.61619857f, 0.61361789f, 0.61103064f,
-0.60843685f, 0.60583654f, 0.60322974f, 0.60061648f, 0.59799679f,
-0.59537069f, 0.59273822f, 0.59009940f, 0.58745427f, 0.58480284f,
-0.58214514f, 0.57948122f, 0.57681109f, 0.57413478f, 0.57145232f,
-0.56876374f, 0.56606907f, 0.56336834f, 0.56066158f, 0.55794881f,
-0.55523006f, 0.55250537f, 0.54977477f, 0.54703827f, 0.54429592f,
-0.54154774f, 0.53879376f, 0.53603401f, 0.53326852f, 0.53049731f,
-0.52772043f, 0.52493790f, 0.52214974f, 0.51935599f, 0.51655668f,
-0.51375184f, 0.51094149f, 0.50812568f, 0.50530442f, 0.50247775f,
-0.49964570f, 0.49680830f, 0.49396558f, 0.49111757f, 0.48826430f,
-0.48540580f, 0.48254210f, 0.47967323f, 0.47679923f, 0.47392012f,
-0.47103594f, 0.46814671f, 0.46525247f, 0.46235324f, 0.45944907f,
-0.45653997f, 0.45362599f, 0.45070714f, 0.44778347f, 0.44485501f,
-0.44192178f, 0.43898381f, 0.43604115f, 0.43309382f, 0.43014185f,
-0.42718527f, 0.42422412f, 0.42125842f, 0.41828822f, 0.41531353f,
-0.41233440f, 0.40935085f, 0.40636291f, 0.40337063f, 0.40037402f,
-0.39737313f, 0.39436798f, 0.39135861f, 0.38834505f, 0.38532733f,
-0.38230548f, 0.37927953f, 0.37624953f, 0.37321550f, 0.37017747f,
-0.36713547f, 0.36408955f, 0.36103972f, 0.35798603f, 0.35492850f,
-0.35186718f, 0.34880208f, 0.34573325f, 0.34266072f, 0.33958451f,
-0.33650468f, 0.33342123f, 0.33033422f, 0.32724367f, 0.32414961f,
-0.32105209f, 0.31795112f, 0.31484675f, 0.31173901f, 0.30862793f,
-0.30551354f, 0.30239588f, 0.29927499f, 0.29615089f, 0.29302362f,
-0.28989321f, 0.28675969f, 0.28362310f, 0.28048348f, 0.27734085f,
-0.27419526f, 0.27104672f, 0.26789529f, 0.26474098f, 0.26158384f,
-0.25842390f, 0.25526119f, 0.25209575f, 0.24892761f, 0.24575680f,
-0.24258336f, 0.23940732f, 0.23622872f, 0.23304759f, 0.22986396f,
-0.22667787f, 0.22348935f, 0.22029844f, 0.21710517f, 0.21390958f,
-0.21071169f, 0.20751155f, 0.20430919f, 0.20110463f, 0.19789793f,
-0.19468910f, 0.19147819f, 0.18826523f, 0.18505026f, 0.18183330f,
-0.17861439f, 0.17539357f, 0.17217088f, 0.16894634f, 0.16571999f,
-0.16249186f, 0.15926200f, 0.15603043f, 0.15279719f, 0.14956231f,
-0.14632583f, 0.14308778f, 0.13984820f, 0.13660713f, 0.13336459f,
-0.13012062f, 0.12687526f, 0.12362854f, 0.12038049f, 0.11713116f,
-0.11388057f, 0.11062877f, 0.10737578f, 0.10412163f, 0.10086638f,
-0.097610040f, 0.094352658f, 0.091094266f, 0.087834897f, 0.084574589f,
-0.081313374f, 0.078051289f, 0.074788367f, 0.071524645f, 0.068260157f,
-0.064994938f, 0.061729023f, 0.058462447f, 0.055195244f, 0.051927451f,
-0.048659101f, 0.045390231f, 0.042120874f, 0.038851066f, 0.035580842f,
-0.032310238f, 0.029039287f, 0.025768025f, 0.022496487f, 0.019224708f,
-0.015952723f, 0.012680568f, 0.0094082767f, 0.0061358846f, 0.0028634269f,
--0.00040906153f, -0.0036815456f, -0.0069539902f, -0.010226360f, -0.013498621f,
--0.016770737f, -0.020042673f, -0.023314395f, -0.026585867f, -0.029857055f,
--0.033127923f, -0.036398436f, -0.039668559f, -0.042938257f, -0.046207495f,
--0.049476239f, -0.052744453f, -0.056012102f, -0.059279151f, -0.062545565f,
--0.065811309f, -0.069076349f, -0.072340649f, -0.075604174f, -0.078866890f,
--0.082128761f, -0.085389752f, -0.088649829f, -0.091908956f, -0.095167100f,
--0.098424224f, -0.10168029f, -0.10493528f, -0.10818913f, -0.11144183f,
--0.11469334f, -0.11794361f, -0.12119263f, -0.12444034f, -0.12768673f,
--0.13093174f, -0.13417536f, -0.13741753f, -0.14065824f, -0.14389744f,
--0.14713510f, -0.15037118f, -0.15360565f, -0.15683848f, -0.16006962f,
--0.16329906f, -0.16652674f, -0.16975264f, -0.17297673f, -0.17619896f,
--0.17941930f, -0.18263772f, -0.18585419f, -0.18906866f, -0.19228112f,
--0.19549151f, -0.19869981f, -0.20190598f, -0.20510998f, -0.20831180f,
--0.21151138f, -0.21470869f, -0.21790371f, -0.22109639f, -0.22428671f,
--0.22747462f, -0.23066010f, -0.23384310f, -0.23702361f, -0.24020157f,
--0.24337696f, -0.24654975f, -0.24971989f, -0.25288736f, -0.25605213f,
--0.25921415f, -0.26237339f, -0.26552983f, -0.26868342f, -0.27183413f,
--0.27498193f, -0.27812679f, -0.28126867f, -0.28440754f, -0.28754336f,
--0.29067610f, -0.29380573f, -0.29693221f, -0.30005551f, -0.30317560f,
--0.30629245f, -0.30940601f, -0.31251626f, -0.31562316f, -0.31872668f,
--0.32182679f, -0.32492345f, -0.32801664f, -0.33110631f, -0.33419243f,
--0.33727497f, -0.34035391f, -0.34342920f, -0.34650081f, -0.34956871f,
--0.35263286f, -0.35569324f, -0.35874981f, -0.36180254f, -0.36485139f,
--0.36789634f, -0.37093735f, -0.37397438f, -0.37700741f, -0.38003640f,
--0.38306132f, -0.38608214f, -0.38909883f, -0.39211135f, -0.39511967f,
--0.39812375f, -0.40112358f, -0.40411910f, -0.40711031f, -0.41009715f,
--0.41307959f, -0.41605762f, -0.41903119f, -0.42200027f, -0.42496483f,
--0.42792484f, -0.43088027f, -0.43383109f, -0.43677726f, -0.43971875f,
--0.44265553f, -0.44558757f, -0.44851484f, -0.45143731f, -0.45435494f,
--0.45726770f, -0.46017557f, -0.46307851f, -0.46597650f, -0.46886949f,
--0.47175746f, -0.47464038f, -0.47751821f, -0.48039093f, -0.48325851f,
--0.48612091f, -0.48897811f, -0.49183006f, -0.49467676f, -0.49751815f,
--0.50035422f, -0.50318492f, -0.50601024f, -0.50883014f, -0.51164459f,
--0.51445356f, -0.51725703f, -0.52005495f, -0.52284730f, -0.52563406f,
--0.52841518f, -0.53119065f, -0.53396043f, -0.53672449f, -0.53948280f,
--0.54223533f, -0.54498206f, -0.54772295f, -0.55045797f, -0.55318710f,
--0.55591031f, -0.55862756f, -0.56133883f, -0.56404409f, -0.56674331f,
--0.56943646f, -0.57212351f, -0.57480443f, -0.57747920f, -0.58014778f,
--0.58281015f, -0.58546628f, -0.58811614f, -0.59075970f, -0.59339694f,
--0.59602782f, -0.59865231f, -0.60127040f, -0.60388204f, -0.60648722f,
--0.60908591f, -0.61167807f, -0.61426368f, -0.61684271f, -0.61941514f,
--0.62198093f, -0.62454007f, -0.62709251f, -0.62963824f, -0.63217722f,
--0.63470944f, -0.63723486f, -0.63975345f, -0.64226519f, -0.64477006f,
--0.64726802f, -0.64975905f, -0.65224312f, -0.65472020f, -0.65719027f,
--0.65965331f, -0.66210928f, -0.66455816f, -0.66699992f, -0.66943454f,
--0.67186199f, -0.67428225f, -0.67669528f, -0.67910107f, -0.68149959f,
--0.68389080f, -0.68627470f, -0.68865124f, -0.69102041f, -0.69338218f,
--0.69573652f, -0.69808341f, -0.70042283f, -0.70275474f, -0.70507913f,
--0.70739597f, -0.70970524f, -0.71200690f, -0.71430093f, -0.71658732f,
--0.71886604f, -0.72113705f, -0.72340034f, -0.72565589f, -0.72790366f,
--0.73014364f, -0.73237580f, -0.73460012f, -0.73681657f, -0.73902513f,
--0.74122577f, -0.74341848f, -0.74560322f, -0.74777998f, -0.74994874f,
--0.75210946f, -0.75426212f, -0.75640671f, -0.75854320f, -0.76067157f,
--0.76279178f, -0.76490383f, -0.76700769f, -0.76910334f, -0.77119075f,
--0.77326989f, -0.77534076f, -0.77740333f, -0.77945757f, -0.78150346f,
--0.78354098f, -0.78557011f, -0.78759083f, -0.78960312f, -0.79160694f,
--0.79360229f, -0.79558915f, -0.79756748f, -0.79953727f, -0.80149850f,
--0.80345114f, -0.80539518f, -0.80733060f, -0.80925737f, -0.81117547f,
--0.81308489f, -0.81498559f, -0.81687757f, -0.81876081f, -0.82063527f,
--0.82250095f, -0.82435781f, -0.82620585f, -0.82804505f, -0.82987537f,
--0.83169681f, -0.83350933f, -0.83531294f, -0.83710760f, -0.83889329f,
--0.84067000f, -0.84243770f, -0.84419639f, -0.84594603f, -0.84768662f,
--0.84941812f, -0.85114053f, -0.85285383f, -0.85455799f, -0.85625300f,
--0.85793884f, -0.85961549f, -0.86128294f, -0.86294116f, -0.86459014f,
--0.86622986f, -0.86786031f, -0.86948146f, -0.87109330f, -0.87269581f,
--0.87428898f, -0.87587278f, -0.87744720f, -0.87901223f, -0.88056784f,
--0.88211402f, -0.88365076f, -0.88517803f, -0.88669582f, -0.88820412f,
--0.88970290f, -0.89119216f, -0.89267187f, -0.89414203f, -0.89560260f,
--0.89705359f, -0.89849497f, -0.89992673f, -0.90134885f, -0.90276131f,
--0.90416411f, -0.90555723f, -0.90694065f, -0.90831436f, -0.90967833f,
--0.91103257f, -0.91237705f, -0.91371176f, -0.91503669f, -0.91635181f,
--0.91765712f, -0.91895261f, -0.92023825f, -0.92151404f, -0.92277996f,
--0.92403600f, -0.92528214f, -0.92651837f, -0.92774468f, -0.92896106f,
--0.93016748f, -0.93136395f, -0.93255044f, -0.93372694f, -0.93489345f,
--0.93604994f, -0.93719641f, -0.93833284f, -0.93945922f, -0.94057555f,
--0.94168180f, -0.94277796f, -0.94386403f, -0.94493999f, -0.94600583f,
--0.94706154f, -0.94810711f, -0.94914252f, -0.95016777f, -0.95118284f,
--0.95218773f, -0.95318242f, -0.95416690f, -0.95514117f, -0.95610520f,
--0.95705900f, -0.95800255f, -0.95893583f, -0.95985885f, -0.96077159f,
--0.96167404f, -0.96256619f, -0.96344803f, -0.96431956f, -0.96518076f,
--0.96603162f, -0.96687213f, -0.96770230f, -0.96852209f, -0.96933152f,
--0.97013057f, -0.97091922f, -0.97169748f, -0.97246533f, -0.97322277f,
--0.97396979f, -0.97470637f, -0.97543252f, -0.97614822f, -0.97685347f,
--0.97754825f, -0.97823257f, -0.97890641f, -0.97956977f, -0.98022263f,
--0.98086500f, -0.98149687f, -0.98211822f, -0.98272906f, -0.98332937f,
--0.98391915f, -0.98449840f, -0.98506710f, -0.98562525f, -0.98617285f,
--0.98670988f, -0.98723635f, -0.98775225f, -0.98825757f, -0.98875230f,
--0.98923645f, -0.98971000f, -0.99017295f, -0.99062530f, -0.99106704f,
--0.99149817f, -0.99191868f, -0.99232857f, -0.99272783f, -0.99311645f,
--0.99349445f, -0.99386180f, -0.99421851f, -0.99456457f, -0.99489998f,
--0.99522474f, -0.99553884f, -0.99584227f, -0.99613505f, -0.99641715f,
--0.99668858f, -0.99694934f, -0.99719943f, -0.99743883f, -0.99766756f,
--0.99788559f, -0.99809295f, -0.99828961f, -0.99847558f, -0.99865086f,
--0.99881544f, -0.99896933f, -0.99911252f, -0.99924501f, -0.99936680f,
--0.99947789f, -0.99957827f, -0.99966795f, -0.99974692f, -0.99981519f,
--0.99987275f, -0.99991960f, -0.99995574f, -0.99998118f, -0.99999590f,
-0.99999967f, 0.99997289f, 0.99990328f, 0.99979084f, 0.99963557f,
-0.99943748f, 0.99919658f, 0.99891288f, 0.99858638f, 0.99821711f,
-0.99780508f, 0.99735031f, 0.99685281f, 0.99631261f, 0.99572973f,
-0.99510420f, 0.99443605f, 0.99372529f, 0.99297196f, 0.99217610f,
-0.99133774f, 0.99045692f, 0.98953366f, 0.98856802f, 0.98756003f,
-0.98650973f, 0.98541718f, 0.98428242f, 0.98310549f, 0.98188645f,
-0.98062534f, 0.97932224f, 0.97797718f, 0.97659022f, 0.97516144f,
-0.97369088f, 0.97217861f, 0.97062469f, 0.96902920f, 0.96739220f,
-0.96571376f, 0.96399395f, 0.96223284f, 0.96043052f, 0.95858705f,
-0.95670253f, 0.95477702f, 0.95281061f, 0.95080338f, 0.94875543f,
-0.94666684f, 0.94453769f, 0.94236808f, 0.94015810f, 0.93790786f,
-0.93561743f, 0.93328693f, 0.93091644f, 0.92850608f, 0.92605595f,
-0.92356614f, 0.92103677f, 0.91846795f, 0.91585979f, 0.91321239f,
-0.91052587f, 0.90780035f, 0.90503595f, 0.90223277f, 0.89939095f,
-0.89651059f, 0.89359184f, 0.89063481f, 0.88763962f, 0.88460641f,
-0.88153531f, 0.87842644f, 0.87527995f, 0.87209596f, 0.86887462f,
-0.86561605f, 0.86232041f, 0.85898782f, 0.85561844f, 0.85221241f,
-0.84876987f, 0.84529098f, 0.84177587f, 0.83822471f, 0.83463763f,
-0.83101481f, 0.82735639f, 0.82366252f, 0.81993338f, 0.81616911f,
-0.81236987f, 0.80853584f, 0.80466718f, 0.80076404f, 0.79682660f,
-0.79285503f, 0.78884950f, 0.78481017f, 0.78073723f, 0.77663084f,
-0.77249118f, 0.76831844f, 0.76411277f, 0.75987438f, 0.75560344f,
-0.75130013f, 0.74696464f, 0.74259715f, 0.73819784f, 0.73376692f,
-0.72930457f, 0.72481097f, 0.72028632f, 0.71573083f, 0.71114467f,
-0.70652804f, 0.70188116f, 0.69720420f, 0.69249738f, 0.68776090f,
-0.68299495f, 0.67819975f, 0.67337550f, 0.66852240f, 0.66364066f,
-0.65873050f, 0.65379211f, 0.64882573f, 0.64383154f, 0.63880978f,
-0.63376065f, 0.62868438f, 0.62358117f, 0.61845126f, 0.61329485f,
-0.60811216f, 0.60290343f, 0.59766888f, 0.59240872f, 0.58712318f,
-0.58181249f, 0.57647688f, 0.57111658f, 0.56573181f, 0.56032281f,
-0.55488980f, 0.54943303f, 0.54395272f, 0.53844911f, 0.53292243f,
-0.52737292f, 0.52180083f, 0.51620638f, 0.51058981f, 0.50495138f,
-0.49929132f, 0.49360987f, 0.48790727f, 0.48218377f, 0.47643962f,
-0.47067506f, 0.46489034f, 0.45908570f, 0.45326139f, 0.44741768f,
-0.44155479f, 0.43567299f, 0.42977253f, 0.42385365f, 0.41791662f,
-0.41196169f, 0.40598911f, 0.39999914f, 0.39399204f, 0.38796806f,
-0.38192746f, 0.37587050f, 0.36979743f, 0.36370853f, 0.35760405f,
-0.35148424f, 0.34534939f, 0.33919973f, 0.33303555f, 0.32685710f,
-0.32066465f, 0.31445847f, 0.30823881f, 0.30200595f, 0.29576015f,
-0.28950169f, 0.28323082f, 0.27694782f, 0.27065295f, 0.26434649f,
-0.25802871f, 0.25169988f, 0.24536026f, 0.23901013f, 0.23264977f,
-0.22627944f, 0.21989941f, 0.21350997f, 0.20711138f, 0.20070391f,
-0.19428785f, 0.18786347f, 0.18143104f, 0.17499084f, 0.16854314f,
-0.16208822f, 0.15562636f, 0.14915783f, 0.14268292f, 0.13620189f,
-0.12971502f, 0.12322260f, 0.11672491f, 0.11022221f, 0.10371479f,
-0.097202924f, 0.090686897f, 0.084166986f, 0.077643468f, 0.071116625f,
-0.064586736f, 0.058054080f, 0.051518937f, 0.044981587f, 0.038442310f,
-0.031901387f, 0.025359097f, 0.018815721f, 0.012271538f, 0.0057268303f,
--0.00081812300f, -0.0073630412f, -0.013907644f, -0.020451651f, -0.026994782f,
--0.033536757f, -0.040077295f, -0.046616116f, -0.053152941f, -0.059687488f,
--0.066219479f, -0.072748633f, -0.079274670f, -0.085797312f, -0.092316279f,
--0.098831291f, -0.10534207f, -0.11184834f, -0.11834981f, -0.12484622f,
--0.13133727f, -0.13782270f, -0.14430223f, -0.15077558f, -0.15724246f,
--0.16370261f, -0.17015575f, -0.17660160f, -0.18303989f, -0.18947033f,
--0.19589266f, -0.20230660f, -0.20871187f, -0.21510820f, -0.22149531f,
--0.22787294f, -0.23424080f, -0.24059864f, -0.24694616f, -0.25328311f,
--0.25960920f, -0.26592418f, -0.27222777f, -0.27851969f, -0.28479968f,
--0.29106748f, -0.29732280f, -0.30356539f, -0.30979497f, -0.31601129f,
--0.32221406f, -0.32840304f, -0.33457794f, -0.34073852f, -0.34688450f,
--0.35301562f, -0.35913161f, -0.36523223f, -0.37131719f, -0.37738626f,
--0.38343915f, -0.38947562f, -0.39549541f, -0.40149825f, -0.40748390f,
--0.41345209f, -0.41940257f, -0.42533508f, -0.43124938f, -0.43714520f,
--0.44302229f, -0.44888041f, -0.45471930f, -0.46053871f, -0.46633839f,
--0.47211810f, -0.47787758f, -0.48361659f, -0.48933489f, -0.49503222f,
--0.50070835f, -0.50636303f, -0.51199602f, -0.51760707f, -0.52319595f,
--0.52876243f, -0.53430625f, -0.53982718f, -0.54532499f, -0.55079944f,
--0.55625029f, -0.56167732f, -0.56708028f, -0.57245896f, -0.57781311f,
--0.58314251f, -0.58844693f, -0.59372614f, -0.59897992f, -0.60420805f,
--0.60941029f, -0.61458642f, -0.61973623f, -0.62485949f, -0.62995598f,
--0.63502549f, -0.64006780f, -0.64508268f, -0.65006994f, -0.65502934f,
--0.65996069f, -0.66486377f, -0.66973837f, -0.67458427f, -0.67940128f,
--0.68418919f, -0.68894779f, -0.69367688f, -0.69837625f, -0.70304571f,
--0.70768504f, -0.71229407f, -0.71687258f, -0.72142039f, -0.72593729f,
--0.73042309f, -0.73487761f, -0.73930064f, -0.74369201f, -0.74805152f,
--0.75237898f, -0.75667422f, -0.76093704f, -0.76516727f, -0.76936471f,
--0.77352921f, -0.77766056f, -0.78175861f, -0.78582316f, -0.78985406f,
--0.79385112f, -0.79781417f, -0.80174305f, -0.80563758f, -0.80949760f,
--0.81332295f, -0.81711346f, -0.82086896f, -0.82458930f, -0.82827432f,
--0.83192386f, -0.83553776f, -0.83911587f, -0.84265803f, -0.84616410f,
--0.84963392f, -0.85306735f, -0.85646423f, -0.85982442f, -0.86314779f,
--0.86643418f, -0.86968345f, -0.87289547f, -0.87607009f, -0.87920719f,
--0.88230663f, -0.88536827f, -0.88839199f, -0.89137765f, -0.89432512f,
--0.89723429f, -0.90010502f, -0.90293719f, -0.90573069f, -0.90848539f,
--0.91120117f, -0.91387791f, -0.91651551f, -0.91911385f, -0.92167282f,
--0.92419231f, -0.92667220f, -0.92911240f, -0.93151280f, -0.93387330f,
--0.93619380f, -0.93847419f, -0.94071438f, -0.94291427f, -0.94507377f,
--0.94719279f, -0.94927123f, -0.95130901f, -0.95330604f, -0.95526223f,
--0.95717750f, -0.95905177f, -0.96088496f, -0.96267699f, -0.96442777f,
--0.96613725f, -0.96780534f, -0.96943197f, -0.97101707f, -0.97256058f,
--0.97406243f, -0.97552255f, -0.97694089f, -0.97831737f, -0.97965195f,
--0.98094456f, -0.98219515f, -0.98340367f, -0.98457006f, -0.98569428f,
--0.98677627f, -0.98781599f, -0.98881340f, -0.98976845f, -0.99068110f,
--0.99155132f, -0.99237906f, -0.99316428f, -0.99390697f, -0.99460708f,
--0.99526458f, -0.99587945f, -0.99645166f, -0.99698119f, -0.99746801f,
--0.99791210f, -0.99831344f, -0.99867202f, -0.99898782f, -0.99926082f,
--0.99949102f, -0.99967841f, -0.99982297f, -0.99992470f, -0.99998360f,
-0.99999866f, 0.99989157f, 0.99961315f, 0.99916346f, 0.99854256f,
-0.99775057f, 0.99678762f, 0.99565388f, 0.99434953f, 0.99287481f,
-0.99122996f, 0.98941527f, 0.98743105f, 0.98527764f, 0.98295541f,
-0.98046475f, 0.97780610f, 0.97497990f, 0.97198664f, 0.96882685f,
-0.96550104f, 0.96200980f, 0.95835373f, 0.95453345f, 0.95054962f,
-0.94640291f, 0.94209404f, 0.93762375f, 0.93299280f, 0.92820199f,
-0.92325213f, 0.91814408f, 0.91287871f, 0.90745693f, 0.90187965f,
-0.89614785f, 0.89026249f, 0.88422459f, 0.87803519f, 0.87169533f,
-0.86520612f, 0.85856866f, 0.85178409f, 0.84485357f, 0.83777828f,
-0.83055945f, 0.82319831f, 0.81569611f, 0.80805415f, 0.80027373f,
-0.79235620f, 0.78430289f, 0.77611520f, 0.76779452f, 0.75934229f,
-0.75075995f, 0.74204897f, 0.73321084f, 0.72424708f, 0.71515923f,
-0.70594883f, 0.69661748f, 0.68716676f, 0.67759830f, 0.66791374f,
-0.65811474f, 0.64820297f, 0.63818013f, 0.62804795f, 0.61780815f,
-0.60746249f, 0.59701275f, 0.58646072f, 0.57580819f, 0.56505701f,
-0.55420900f, 0.54326604f, 0.53222998f, 0.52110274f, 0.50988620f,
-0.49858230f, 0.48719297f, 0.47572016f, 0.46416584f, 0.45253199f,
-0.44082059f, 0.42903367f, 0.41717323f, 0.40524131f, 0.39323996f,
-0.38117123f, 0.36903718f, 0.35683990f, 0.34458148f, 0.33226402f,
-0.31988962f, 0.30746042f, 0.29497853f, 0.28244610f, 0.26986527f,
-0.25723821f, 0.24456706f, 0.23185402f, 0.21910124f, 0.20631092f,
-0.19348526f, 0.18062644f, 0.16773667f, 0.15481816f, 0.14187312f,
-0.12890377f, 0.11591234f, 0.10290104f, 0.089872115f, 0.076827789f,
-0.063770300f, 0.050701883f, 0.037624779f, 0.024541229f, 0.011453473f,
--0.0016362454f, -0.014725683f, -0.027812598f, -0.040894747f, -0.053969889f,
--0.067035784f, -0.080090192f, -0.093130877f, -0.10615561f, -0.11916214f,
--0.13214826f, -0.14511174f, -0.15805036f, -0.17096189f, -0.18384413f,
--0.19669487f, -0.20951190f, -0.22229304f, -0.23503609f, -0.24773886f,
--0.26039919f, -0.27301490f, -0.28558383f, -0.29810383f, -0.31057274f,
--0.32298845f, -0.33534881f, -0.34765171f, -0.35989504f, -0.37207670f,
--0.38419461f, -0.39624670f, -0.40823088f, -0.42014512f, -0.43198737f,
--0.44375560f, -0.45544780f, -0.46706195f, -0.47859608f, -0.49004821f,
--0.50141636f, -0.51269860f, -0.52389299f, -0.53499762f, -0.54601058f,
--0.55692998f, -0.56775395f, -0.57848064f, -0.58910822f, -0.59963485f,
--0.61005873f, -0.62037809f, -0.63059115f, -0.64069616f, -0.65069139f,
--0.66057513f, -0.67034568f, -0.68000137f, -0.68954054f, -0.69896157f,
--0.70826283f, -0.71744274f, -0.72649972f, -0.73543221f, -0.74423869f,
--0.75291765f, -0.76146760f, -0.76988708f, -0.77817464f, -0.78632887f,
--0.79434836f, -0.80223175f, -0.80997767f, -0.81758481f, -0.82505187f,
--0.83237755f, -0.83956061f, -0.84659981f, -0.85349396f, -0.86024186f,
--0.86684237f, -0.87329434f, -0.87959669f, -0.88574831f, -0.89174817f,
--0.89759523f, -0.90328850f, -0.90882699f, -0.91420976f, -0.91943588f,
--0.92450446f, -0.92941463f, -0.93416555f, -0.93875641f, -0.94318642f,
--0.94745482f, -0.95156087f, -0.95550388f, -0.95928317f, -0.96289809f,
--0.96634802f, -0.96963238f, -0.97275059f, -0.97570213f, -0.97848649f,
--0.98110318f, -0.98355177f, -0.98583184f, -0.98794298f, -0.98988485f,
--0.99165711f, -0.99325945f, -0.99469160f, -0.99595331f, -0.99704438f,
--0.99796460f, -0.99871383f, -0.99929194f, -0.99969882f, -0.99993441f,
-0.99999465f, 0.99956631f, 0.99845292f, 0.99665524f, 0.99417450f,
-0.99101241f, 0.98717112f, 0.98265328f, 0.97746197f, 0.97160077f,
-0.96507367f, 0.95788516f, 0.95004017f, 0.94154407f, 0.93240267f,
-0.92262226f, 0.91220953f, 0.90117161f, 0.88951608f, 0.87725091f,
-0.86438452f, 0.85092573f, 0.83688375f, 0.82226822f, 0.80708914f,
-0.79135693f, 0.77508236f, 0.75827658f, 0.74095113f, 0.72311786f,
-0.70478900f, 0.68597711f, 0.66669509f, 0.64695615f, 0.62677382f,
-0.60616193f, 0.58513461f, 0.56370626f, 0.54189158f, 0.51970551f,
-0.49716327f, 0.47428029f, 0.45107226f, 0.42755509f, 0.40374490f,
-0.37965800f, 0.35531090f, 0.33072029f, 0.30590302f, 0.28087610f,
-0.25565668f, 0.23026205f, 0.20470960f, 0.17901686f, 0.15320143f,
-0.12728100f, 0.10127334f, 0.075196277f, 0.049067674f, 0.022905443f,
--0.0032724865f, -0.029448173f, -0.055603678f, -0.081721074f, -0.10778246f,
--0.13376998f, -0.15966582f, -0.18545224f, -0.21111155f, -0.23662618f,
--0.26197864f, -0.28715155f, -0.31212766f, -0.33688985f, -0.36142116f,
--0.38570477f, -0.40972403f, -0.43346249f, -0.45690388f, -0.48003212f,
--0.50283138f, -0.52528602f, -0.54738066f, -0.56910015f, -0.59042960f,
--0.61135441f, -0.63186022f, -0.65193299f, -0.67155895f, -0.69072467f,
--0.70941699f, -0.72762312f, -0.74533057f, -0.76252720f, -0.77920124f,
--0.79534126f, -0.81093618f, -0.82597533f, -0.84044840f, -0.85434547f,
--0.86765701f, -0.88037390f, -0.89248743f, -0.90398929f, -0.91487161f,
--0.92512691f, -0.93474818f, -0.94372882f, -0.95206268f, -0.95974404f,
--0.96676764f, -0.97312866f, -0.97882275f, -0.98384601f, -0.98819498f,
--0.99186670f, -0.99485864f, -0.99716875f, -0.99879546f, -0.99973764f,
+    0.99999992f, 0.99999322f, 0.99997582f, 0.99994771f, 0.99990889f,
+    0.99985936f, 0.99979913f, 0.99972818f, 0.99964653f, 0.99955418f,
+    0.99945112f, 0.99933736f, 0.99921289f, 0.99907773f, 0.99893186f,
+    0.99877530f, 0.99860804f, 0.99843009f, 0.99824144f, 0.99804211f,
+    0.99783209f, 0.99761138f, 0.99737998f, 0.99713791f, 0.99688516f,
+    0.99662173f, 0.99634763f, 0.99606285f, 0.99576741f, 0.99546131f,
+    0.99514455f, 0.99481713f, 0.99447905f, 0.99413033f, 0.99377096f,
+    0.99340095f, 0.99302029f, 0.99262901f, 0.99222709f, 0.99181455f,
+    0.99139139f, 0.99095760f, 0.99051321f, 0.99005821f, 0.98959261f,
+    0.98911641f, 0.98862961f, 0.98813223f, 0.98762427f, 0.98710573f,
+    0.98657662f, 0.98603694f, 0.98548670f, 0.98492591f, 0.98435457f,
+    0.98377269f, 0.98318028f, 0.98257734f, 0.98196387f, 0.98133989f,
+    0.98070539f, 0.98006040f, 0.97940491f, 0.97873893f, 0.97806247f,
+    0.97737554f, 0.97667813f, 0.97597027f, 0.97525196f, 0.97452320f,
+    0.97378401f, 0.97303439f, 0.97227435f, 0.97150389f, 0.97072303f,
+    0.96993178f, 0.96913014f, 0.96831812f, 0.96749573f, 0.96666298f,
+    0.96581987f, 0.96496643f, 0.96410265f, 0.96322854f, 0.96234412f,
+    0.96144939f, 0.96054437f, 0.95962906f, 0.95870347f, 0.95776762f,
+    0.95682151f, 0.95586515f, 0.95489856f, 0.95392174f, 0.95293471f,
+    0.95193746f, 0.95093003f, 0.94991241f, 0.94888462f, 0.94784667f,
+    0.94679856f, 0.94574032f, 0.94467195f, 0.94359346f, 0.94250486f,
+    0.94140618f, 0.94029741f, 0.93917857f, 0.93804967f, 0.93691073f,
+    0.93576176f, 0.93460276f, 0.93343375f, 0.93225475f, 0.93106577f,
+    0.92986681f, 0.92865789f, 0.92743903f, 0.92621024f, 0.92497153f,
+    0.92372291f, 0.92246440f, 0.92119602f, 0.91991776f, 0.91862966f,
+    0.91733172f, 0.91602395f, 0.91470637f, 0.91337900f, 0.91204185f,
+    0.91069493f, 0.90933825f, 0.90797184f, 0.90659570f, 0.90520986f,
+    0.90381432f, 0.90240910f, 0.90099422f, 0.89956969f, 0.89813553f,
+    0.89669174f, 0.89523836f, 0.89377538f, 0.89230284f, 0.89082074f,
+    0.88932910f, 0.88782793f, 0.88631726f, 0.88479710f, 0.88326746f,
+    0.88172836f, 0.88017982f, 0.87862185f, 0.87705448f, 0.87547771f,
+    0.87389156f, 0.87229606f, 0.87069121f, 0.86907704f, 0.86745357f,
+    0.86582080f, 0.86417876f, 0.86252747f, 0.86086694f, 0.85919719f,
+    0.85751824f, 0.85583010f, 0.85413281f, 0.85242636f, 0.85071078f,
+    0.84898610f, 0.84725232f, 0.84550947f, 0.84375756f, 0.84199662f,
+    0.84022666f, 0.83844771f, 0.83665977f, 0.83486287f, 0.83305704f,
+    0.83124228f, 0.82941862f, 0.82758608f, 0.82574467f, 0.82389442f,
+    0.82203535f, 0.82016748f, 0.81829082f, 0.81640540f, 0.81451123f,
+    0.81260835f, 0.81069676f, 0.80877649f, 0.80684755f, 0.80490998f,
+    0.80296379f, 0.80100899f, 0.79904562f, 0.79707370f, 0.79509323f,
+    0.79310425f, 0.79110678f, 0.78910084f, 0.78708644f, 0.78506362f,
+    0.78303239f, 0.78099277f, 0.77894479f, 0.77688847f, 0.77482382f,
+    0.77275088f, 0.77066967f, 0.76858020f, 0.76648250f, 0.76437659f,
+    0.76226250f, 0.76014024f, 0.75800984f, 0.75587132f, 0.75372471f,
+    0.75157003f, 0.74940730f, 0.74723654f, 0.74505779f, 0.74287105f,
+    0.74067635f, 0.73847373f, 0.73626320f, 0.73404478f, 0.73181850f,
+    0.72958438f, 0.72734245f, 0.72509273f, 0.72283525f, 0.72057002f,
+    0.71829708f, 0.71601644f, 0.71372814f, 0.71143220f, 0.70912863f,
+    0.70681747f, 0.70449874f, 0.70217247f, 0.69983868f, 0.69749739f,
+    0.69514863f, 0.69279243f, 0.69042881f, 0.68805780f, 0.68567941f,
+    0.68329369f, 0.68090064f, 0.67850031f, 0.67609270f, 0.67367786f,
+    0.67125580f, 0.66882656f, 0.66639015f, 0.66394661f, 0.66149595f,
+    0.65903821f, 0.65657341f, 0.65410159f, 0.65162275f, 0.64913694f,
+    0.64664418f, 0.64414449f, 0.64163790f, 0.63912444f, 0.63660414f,
+    0.63407702f, 0.63154311f, 0.62900244f, 0.62645503f, 0.62390091f,
+    0.62134011f, 0.61877265f, 0.61619857f, 0.61361789f, 0.61103064f,
+    0.60843685f, 0.60583654f, 0.60322974f, 0.60061648f, 0.59799679f,
+    0.59537069f, 0.59273822f, 0.59009940f, 0.58745427f, 0.58480284f,
+    0.58214514f, 0.57948122f, 0.57681109f, 0.57413478f, 0.57145232f,
+    0.56876374f, 0.56606907f, 0.56336834f, 0.56066158f, 0.55794881f,
+    0.55523006f, 0.55250537f, 0.54977477f, 0.54703827f, 0.54429592f,
+    0.54154774f, 0.53879376f, 0.53603401f, 0.53326852f, 0.53049731f,
+    0.52772043f, 0.52493790f, 0.52214974f, 0.51935599f, 0.51655668f,
+    0.51375184f, 0.51094149f, 0.50812568f, 0.50530442f, 0.50247775f,
+    0.49964570f, 0.49680830f, 0.49396558f, 0.49111757f, 0.48826430f,
+    0.48540580f, 0.48254210f, 0.47967323f, 0.47679923f, 0.47392012f,
+    0.47103594f, 0.46814671f, 0.46525247f, 0.46235324f, 0.45944907f,
+    0.45653997f, 0.45362599f, 0.45070714f, 0.44778347f, 0.44485501f,
+    0.44192178f, 0.43898381f, 0.43604115f, 0.43309382f, 0.43014185f,
+    0.42718527f, 0.42422412f, 0.42125842f, 0.41828822f, 0.41531353f,
+    0.41233440f, 0.40935085f, 0.40636291f, 0.40337063f, 0.40037402f,
+    0.39737313f, 0.39436798f, 0.39135861f, 0.38834505f, 0.38532733f,
+    0.38230548f, 0.37927953f, 0.37624953f, 0.37321550f, 0.37017747f,
+    0.36713547f, 0.36408955f, 0.36103972f, 0.35798603f, 0.35492850f,
+    0.35186718f, 0.34880208f, 0.34573325f, 0.34266072f, 0.33958451f,
+    0.33650468f, 0.33342123f, 0.33033422f, 0.32724367f, 0.32414961f,
+    0.32105209f, 0.31795112f, 0.31484675f, 0.31173901f, 0.30862793f,
+    0.30551354f, 0.30239588f, 0.29927499f, 0.29615089f, 0.29302362f,
+    0.28989321f, 0.28675969f, 0.28362310f, 0.28048348f, 0.27734085f,
+    0.27419526f, 0.27104672f, 0.26789529f, 0.26474098f, 0.26158384f,
+    0.25842390f, 0.25526119f, 0.25209575f, 0.24892761f, 0.24575680f,
+    0.24258336f, 0.23940732f, 0.23622872f, 0.23304759f, 0.22986396f,
+    0.22667787f, 0.22348935f, 0.22029844f, 0.21710517f, 0.21390958f,
+    0.21071169f, 0.20751155f, 0.20430919f, 0.20110463f, 0.19789793f,
+    0.19468910f, 0.19147819f, 0.18826523f, 0.18505026f, 0.18183330f,
+    0.17861439f, 0.17539357f, 0.17217088f, 0.16894634f, 0.16571999f,
+    0.16249186f, 0.15926200f, 0.15603043f, 0.15279719f, 0.14956231f,
+    0.14632583f, 0.14308778f, 0.13984820f, 0.13660713f, 0.13336459f,
+    0.13012062f, 0.12687526f, 0.12362854f, 0.12038049f, 0.11713116f,
+    0.11388057f, 0.11062877f, 0.10737578f, 0.10412163f, 0.10086638f,
+    0.097610040f, 0.094352658f, 0.091094266f, 0.087834897f, 0.084574589f,
+    0.081313374f, 0.078051289f, 0.074788367f, 0.071524645f, 0.068260157f,
+    0.064994938f, 0.061729023f, 0.058462447f, 0.055195244f, 0.051927451f,
+    0.048659101f, 0.045390231f, 0.042120874f, 0.038851066f, 0.035580842f,
+    0.032310238f, 0.029039287f, 0.025768025f, 0.022496487f, 0.019224708f,
+    0.015952723f, 0.012680568f, 0.0094082767f, 0.0061358846f, 0.0028634269f,
+    -0.00040906153f, -0.0036815456f, -0.0069539902f, -0.010226360f, -0.013498621f,
+    -0.016770737f, -0.020042673f, -0.023314395f, -0.026585867f, -0.029857055f,
+    -0.033127923f, -0.036398436f, -0.039668559f, -0.042938257f, -0.046207495f,
+    -0.049476239f, -0.052744453f, -0.056012102f, -0.059279151f, -0.062545565f,
+    -0.065811309f, -0.069076349f, -0.072340649f, -0.075604174f, -0.078866890f,
+    -0.082128761f, -0.085389752f, -0.088649829f, -0.091908956f, -0.095167100f,
+    -0.098424224f, -0.10168029f, -0.10493528f, -0.10818913f, -0.11144183f,
+    -0.11469334f, -0.11794361f, -0.12119263f, -0.12444034f, -0.12768673f,
+    -0.13093174f, -0.13417536f, -0.13741753f, -0.14065824f, -0.14389744f,
+    -0.14713510f, -0.15037118f, -0.15360565f, -0.15683848f, -0.16006962f,
+    -0.16329906f, -0.16652674f, -0.16975264f, -0.17297673f, -0.17619896f,
+    -0.17941930f, -0.18263772f, -0.18585419f, -0.18906866f, -0.19228112f,
+    -0.19549151f, -0.19869981f, -0.20190598f, -0.20510998f, -0.20831180f,
+    -0.21151138f, -0.21470869f, -0.21790371f, -0.22109639f, -0.22428671f,
+    -0.22747462f, -0.23066010f, -0.23384310f, -0.23702361f, -0.24020157f,
+    -0.24337696f, -0.24654975f, -0.24971989f, -0.25288736f, -0.25605213f,
+    -0.25921415f, -0.26237339f, -0.26552983f, -0.26868342f, -0.27183413f,
+    -0.27498193f, -0.27812679f, -0.28126867f, -0.28440754f, -0.28754336f,
+    -0.29067610f, -0.29380573f, -0.29693221f, -0.30005551f, -0.30317560f,
+    -0.30629245f, -0.30940601f, -0.31251626f, -0.31562316f, -0.31872668f,
+    -0.32182679f, -0.32492345f, -0.32801664f, -0.33110631f, -0.33419243f,
+    -0.33727497f, -0.34035391f, -0.34342920f, -0.34650081f, -0.34956871f,
+    -0.35263286f, -0.35569324f, -0.35874981f, -0.36180254f, -0.36485139f,
+    -0.36789634f, -0.37093735f, -0.37397438f, -0.37700741f, -0.38003640f,
+    -0.38306132f, -0.38608214f, -0.38909883f, -0.39211135f, -0.39511967f,
+    -0.39812375f, -0.40112358f, -0.40411910f, -0.40711031f, -0.41009715f,
+    -0.41307959f, -0.41605762f, -0.41903119f, -0.42200027f, -0.42496483f,
+    -0.42792484f, -0.43088027f, -0.43383109f, -0.43677726f, -0.43971875f,
+    -0.44265553f, -0.44558757f, -0.44851484f, -0.45143731f, -0.45435494f,
+    -0.45726770f, -0.46017557f, -0.46307851f, -0.46597650f, -0.46886949f,
+    -0.47175746f, -0.47464038f, -0.47751821f, -0.48039093f, -0.48325851f,
+    -0.48612091f, -0.48897811f, -0.49183006f, -0.49467676f, -0.49751815f,
+    -0.50035422f, -0.50318492f, -0.50601024f, -0.50883014f, -0.51164459f,
+    -0.51445356f, -0.51725703f, -0.52005495f, -0.52284730f, -0.52563406f,
+    -0.52841518f, -0.53119065f, -0.53396043f, -0.53672449f, -0.53948280f,
+    -0.54223533f, -0.54498206f, -0.54772295f, -0.55045797f, -0.55318710f,
+    -0.55591031f, -0.55862756f, -0.56133883f, -0.56404409f, -0.56674331f,
+    -0.56943646f, -0.57212351f, -0.57480443f, -0.57747920f, -0.58014778f,
+    -0.58281015f, -0.58546628f, -0.58811614f, -0.59075970f, -0.59339694f,
+    -0.59602782f, -0.59865231f, -0.60127040f, -0.60388204f, -0.60648722f,
+    -0.60908591f, -0.61167807f, -0.61426368f, -0.61684271f, -0.61941514f,
+    -0.62198093f, -0.62454007f, -0.62709251f, -0.62963824f, -0.63217722f,
+    -0.63470944f, -0.63723486f, -0.63975345f, -0.64226519f, -0.64477006f,
+    -0.64726802f, -0.64975905f, -0.65224312f, -0.65472020f, -0.65719027f,
+    -0.65965331f, -0.66210928f, -0.66455816f, -0.66699992f, -0.66943454f,
+    -0.67186199f, -0.67428225f, -0.67669528f, -0.67910107f, -0.68149959f,
+    -0.68389080f, -0.68627470f, -0.68865124f, -0.69102041f, -0.69338218f,
+    -0.69573652f, -0.69808341f, -0.70042283f, -0.70275474f, -0.70507913f,
+    -0.70739597f, -0.70970524f, -0.71200690f, -0.71430093f, -0.71658732f,
+    -0.71886604f, -0.72113705f, -0.72340034f, -0.72565589f, -0.72790366f,
+    -0.73014364f, -0.73237580f, -0.73460012f, -0.73681657f, -0.73902513f,
+    -0.74122577f, -0.74341848f, -0.74560322f, -0.74777998f, -0.74994874f,
+    -0.75210946f, -0.75426212f, -0.75640671f, -0.75854320f, -0.76067157f,
+    -0.76279178f, -0.76490383f, -0.76700769f, -0.76910334f, -0.77119075f,
+    -0.77326989f, -0.77534076f, -0.77740333f, -0.77945757f, -0.78150346f,
+    -0.78354098f, -0.78557011f, -0.78759083f, -0.78960312f, -0.79160694f,
+    -0.79360229f, -0.79558915f, -0.79756748f, -0.79953727f, -0.80149850f,
+    -0.80345114f, -0.80539518f, -0.80733060f, -0.80925737f, -0.81117547f,
+    -0.81308489f, -0.81498559f, -0.81687757f, -0.81876081f, -0.82063527f,
+    -0.82250095f, -0.82435781f, -0.82620585f, -0.82804505f, -0.82987537f,
+    -0.83169681f, -0.83350933f, -0.83531294f, -0.83710760f, -0.83889329f,
+    -0.84067000f, -0.84243770f, -0.84419639f, -0.84594603f, -0.84768662f,
+    -0.84941812f, -0.85114053f, -0.85285383f, -0.85455799f, -0.85625300f,
+    -0.85793884f, -0.85961549f, -0.86128294f, -0.86294116f, -0.86459014f,
+    -0.86622986f, -0.86786031f, -0.86948146f, -0.87109330f, -0.87269581f,
+    -0.87428898f, -0.87587278f, -0.87744720f, -0.87901223f, -0.88056784f,
+    -0.88211402f, -0.88365076f, -0.88517803f, -0.88669582f, -0.88820412f,
+    -0.88970290f, -0.89119216f, -0.89267187f, -0.89414203f, -0.89560260f,
+    -0.89705359f, -0.89849497f, -0.89992673f, -0.90134885f, -0.90276131f,
+    -0.90416411f, -0.90555723f, -0.90694065f, -0.90831436f, -0.90967833f,
+    -0.91103257f, -0.91237705f, -0.91371176f, -0.91503669f, -0.91635181f,
+    -0.91765712f, -0.91895261f, -0.92023825f, -0.92151404f, -0.92277996f,
+    -0.92403600f, -0.92528214f, -0.92651837f, -0.92774468f, -0.92896106f,
+    -0.93016748f, -0.93136395f, -0.93255044f, -0.93372694f, -0.93489345f,
+    -0.93604994f, -0.93719641f, -0.93833284f, -0.93945922f, -0.94057555f,
+    -0.94168180f, -0.94277796f, -0.94386403f, -0.94493999f, -0.94600583f,
+    -0.94706154f, -0.94810711f, -0.94914252f, -0.95016777f, -0.95118284f,
+    -0.95218773f, -0.95318242f, -0.95416690f, -0.95514117f, -0.95610520f,
+    -0.95705900f, -0.95800255f, -0.95893583f, -0.95985885f, -0.96077159f,
+    -0.96167404f, -0.96256619f, -0.96344803f, -0.96431956f, -0.96518076f,
+    -0.96603162f, -0.96687213f, -0.96770230f, -0.96852209f, -0.96933152f,
+    -0.97013057f, -0.97091922f, -0.97169748f, -0.97246533f, -0.97322277f,
+    -0.97396979f, -0.97470637f, -0.97543252f, -0.97614822f, -0.97685347f,
+    -0.97754825f, -0.97823257f, -0.97890641f, -0.97956977f, -0.98022263f,
+    -0.98086500f, -0.98149687f, -0.98211822f, -0.98272906f, -0.98332937f,
+    -0.98391915f, -0.98449840f, -0.98506710f, -0.98562525f, -0.98617285f,
+    -0.98670988f, -0.98723635f, -0.98775225f, -0.98825757f, -0.98875230f,
+    -0.98923645f, -0.98971000f, -0.99017295f, -0.99062530f, -0.99106704f,
+    -0.99149817f, -0.99191868f, -0.99232857f, -0.99272783f, -0.99311645f,
+    -0.99349445f, -0.99386180f, -0.99421851f, -0.99456457f, -0.99489998f,
+    -0.99522474f, -0.99553884f, -0.99584227f, -0.99613505f, -0.99641715f,
+    -0.99668858f, -0.99694934f, -0.99719943f, -0.99743883f, -0.99766756f,
+    -0.99788559f, -0.99809295f, -0.99828961f, -0.99847558f, -0.99865086f,
+    -0.99881544f, -0.99896933f, -0.99911252f, -0.99924501f, -0.99936680f,
+    -0.99947789f, -0.99957827f, -0.99966795f, -0.99974692f, -0.99981519f,
+    -0.99987275f, -0.99991960f, -0.99995574f, -0.99998118f, -0.99999590f,
+    0.99999967f, 0.99997289f, 0.99990328f, 0.99979084f, 0.99963557f,
+    0.99943748f, 0.99919658f, 0.99891288f, 0.99858638f, 0.99821711f,
+    0.99780508f, 0.99735031f, 0.99685281f, 0.99631261f, 0.99572973f,
+    0.99510420f, 0.99443605f, 0.99372529f, 0.99297196f, 0.99217610f,
+    0.99133774f, 0.99045692f, 0.98953366f, 0.98856802f, 0.98756003f,
+    0.98650973f, 0.98541718f, 0.98428242f, 0.98310549f, 0.98188645f,
+    0.98062534f, 0.97932224f, 0.97797718f, 0.97659022f, 0.97516144f,
+    0.97369088f, 0.97217861f, 0.97062469f, 0.96902920f, 0.96739220f,
+    0.96571376f, 0.96399395f, 0.96223284f, 0.96043052f, 0.95858705f,
+    0.95670253f, 0.95477702f, 0.95281061f, 0.95080338f, 0.94875543f,
+    0.94666684f, 0.94453769f, 0.94236808f, 0.94015810f, 0.93790786f,
+    0.93561743f, 0.93328693f, 0.93091644f, 0.92850608f, 0.92605595f,
+    0.92356614f, 0.92103677f, 0.91846795f, 0.91585979f, 0.91321239f,
+    0.91052587f, 0.90780035f, 0.90503595f, 0.90223277f, 0.89939095f,
+    0.89651059f, 0.89359184f, 0.89063481f, 0.88763962f, 0.88460641f,
+    0.88153531f, 0.87842644f, 0.87527995f, 0.87209596f, 0.86887462f,
+    0.86561605f, 0.86232041f, 0.85898782f, 0.85561844f, 0.85221241f,
+    0.84876987f, 0.84529098f, 0.84177587f, 0.83822471f, 0.83463763f,
+    0.83101481f, 0.82735639f, 0.82366252f, 0.81993338f, 0.81616911f,
+    0.81236987f, 0.80853584f, 0.80466718f, 0.80076404f, 0.79682660f,
+    0.79285503f, 0.78884950f, 0.78481017f, 0.78073723f, 0.77663084f,
+    0.77249118f, 0.76831844f, 0.76411277f, 0.75987438f, 0.75560344f,
+    0.75130013f, 0.74696464f, 0.74259715f, 0.73819784f, 0.73376692f,
+    0.72930457f, 0.72481097f, 0.72028632f, 0.71573083f, 0.71114467f,
+    0.70652804f, 0.70188116f, 0.69720420f, 0.69249738f, 0.68776090f,
+    0.68299495f, 0.67819975f, 0.67337550f, 0.66852240f, 0.66364066f,
+    0.65873050f, 0.65379211f, 0.64882573f, 0.64383154f, 0.63880978f,
+    0.63376065f, 0.62868438f, 0.62358117f, 0.61845126f, 0.61329485f,
+    0.60811216f, 0.60290343f, 0.59766888f, 0.59240872f, 0.58712318f,
+    0.58181249f, 0.57647688f, 0.57111658f, 0.56573181f, 0.56032281f,
+    0.55488980f, 0.54943303f, 0.54395272f, 0.53844911f, 0.53292243f,
+    0.52737292f, 0.52180083f, 0.51620638f, 0.51058981f, 0.50495138f,
+    0.49929132f, 0.49360987f, 0.48790727f, 0.48218377f, 0.47643962f,
+    0.47067506f, 0.46489034f, 0.45908570f, 0.45326139f, 0.44741768f,
+    0.44155479f, 0.43567299f, 0.42977253f, 0.42385365f, 0.41791662f,
+    0.41196169f, 0.40598911f, 0.39999914f, 0.39399204f, 0.38796806f,
+    0.38192746f, 0.37587050f, 0.36979743f, 0.36370853f, 0.35760405f,
+    0.35148424f, 0.34534939f, 0.33919973f, 0.33303555f, 0.32685710f,
+    0.32066465f, 0.31445847f, 0.30823881f, 0.30200595f, 0.29576015f,
+    0.28950169f, 0.28323082f, 0.27694782f, 0.27065295f, 0.26434649f,
+    0.25802871f, 0.25169988f, 0.24536026f, 0.23901013f, 0.23264977f,
+    0.22627944f, 0.21989941f, 0.21350997f, 0.20711138f, 0.20070391f,
+    0.19428785f, 0.18786347f, 0.18143104f, 0.17499084f, 0.16854314f,
+    0.16208822f, 0.15562636f, 0.14915783f, 0.14268292f, 0.13620189f,
+    0.12971502f, 0.12322260f, 0.11672491f, 0.11022221f, 0.10371479f,
+    0.097202924f, 0.090686897f, 0.084166986f, 0.077643468f, 0.071116625f,
+    0.064586736f, 0.058054080f, 0.051518937f, 0.044981587f, 0.038442310f,
+    0.031901387f, 0.025359097f, 0.018815721f, 0.012271538f, 0.0057268303f,
+    -0.00081812300f, -0.0073630412f, -0.013907644f, -0.020451651f, -0.026994782f,
+    -0.033536757f, -0.040077295f, -0.046616116f, -0.053152941f, -0.059687488f,
+    -0.066219479f, -0.072748633f, -0.079274670f, -0.085797312f, -0.092316279f,
+    -0.098831291f, -0.10534207f, -0.11184834f, -0.11834981f, -0.12484622f,
+    -0.13133727f, -0.13782270f, -0.14430223f, -0.15077558f, -0.15724246f,
+    -0.16370261f, -0.17015575f, -0.17660160f, -0.18303989f, -0.18947033f,
+    -0.19589266f, -0.20230660f, -0.20871187f, -0.21510820f, -0.22149531f,
+    -0.22787294f, -0.23424080f, -0.24059864f, -0.24694616f, -0.25328311f,
+    -0.25960920f, -0.26592418f, -0.27222777f, -0.27851969f, -0.28479968f,
+    -0.29106748f, -0.29732280f, -0.30356539f, -0.30979497f, -0.31601129f,
+    -0.32221406f, -0.32840304f, -0.33457794f, -0.34073852f, -0.34688450f,
+    -0.35301562f, -0.35913161f, -0.36523223f, -0.37131719f, -0.37738626f,
+    -0.38343915f, -0.38947562f, -0.39549541f, -0.40149825f, -0.40748390f,
+    -0.41345209f, -0.41940257f, -0.42533508f, -0.43124938f, -0.43714520f,
+    -0.44302229f, -0.44888041f, -0.45471930f, -0.46053871f, -0.46633839f,
+    -0.47211810f, -0.47787758f, -0.48361659f, -0.48933489f, -0.49503222f,
+    -0.50070835f, -0.50636303f, -0.51199602f, -0.51760707f, -0.52319595f,
+    -0.52876243f, -0.53430625f, -0.53982718f, -0.54532499f, -0.55079944f,
+    -0.55625029f, -0.56167732f, -0.56708028f, -0.57245896f, -0.57781311f,
+    -0.58314251f, -0.58844693f, -0.59372614f, -0.59897992f, -0.60420805f,
+    -0.60941029f, -0.61458642f, -0.61973623f, -0.62485949f, -0.62995598f,
+    -0.63502549f, -0.64006780f, -0.64508268f, -0.65006994f, -0.65502934f,
+    -0.65996069f, -0.66486377f, -0.66973837f, -0.67458427f, -0.67940128f,
+    -0.68418919f, -0.68894779f, -0.69367688f, -0.69837625f, -0.70304571f,
+    -0.70768504f, -0.71229407f, -0.71687258f, -0.72142039f, -0.72593729f,
+    -0.73042309f, -0.73487761f, -0.73930064f, -0.74369201f, -0.74805152f,
+    -0.75237898f, -0.75667422f, -0.76093704f, -0.76516727f, -0.76936471f,
+    -0.77352921f, -0.77766056f, -0.78175861f, -0.78582316f, -0.78985406f,
+    -0.79385112f, -0.79781417f, -0.80174305f, -0.80563758f, -0.80949760f,
+    -0.81332295f, -0.81711346f, -0.82086896f, -0.82458930f, -0.82827432f,
+    -0.83192386f, -0.83553776f, -0.83911587f, -0.84265803f, -0.84616410f,
+    -0.84963392f, -0.85306735f, -0.85646423f, -0.85982442f, -0.86314779f,
+    -0.86643418f, -0.86968345f, -0.87289547f, -0.87607009f, -0.87920719f,
+    -0.88230663f, -0.88536827f, -0.88839199f, -0.89137765f, -0.89432512f,
+    -0.89723429f, -0.90010502f, -0.90293719f, -0.90573069f, -0.90848539f,
+    -0.91120117f, -0.91387791f, -0.91651551f, -0.91911385f, -0.92167282f,
+    -0.92419231f, -0.92667220f, -0.92911240f, -0.93151280f, -0.93387330f,
+    -0.93619380f, -0.93847419f, -0.94071438f, -0.94291427f, -0.94507377f,
+    -0.94719279f, -0.94927123f, -0.95130901f, -0.95330604f, -0.95526223f,
+    -0.95717750f, -0.95905177f, -0.96088496f, -0.96267699f, -0.96442777f,
+    -0.96613725f, -0.96780534f, -0.96943197f, -0.97101707f, -0.97256058f,
+    -0.97406243f, -0.97552255f, -0.97694089f, -0.97831737f, -0.97965195f,
+    -0.98094456f, -0.98219515f, -0.98340367f, -0.98457006f, -0.98569428f,
+    -0.98677627f, -0.98781599f, -0.98881340f, -0.98976845f, -0.99068110f,
+    -0.99155132f, -0.99237906f, -0.99316428f, -0.99390697f, -0.99460708f,
+    -0.99526458f, -0.99587945f, -0.99645166f, -0.99698119f, -0.99746801f,
+    -0.99791210f, -0.99831344f, -0.99867202f, -0.99898782f, -0.99926082f,
+    -0.99949102f, -0.99967841f, -0.99982297f, -0.99992470f, -0.99998360f,
+    0.99999866f, 0.99989157f, 0.99961315f, 0.99916346f, 0.99854256f,
+    0.99775057f, 0.99678762f, 0.99565388f, 0.99434953f, 0.99287481f,
+    0.99122996f, 0.98941527f, 0.98743105f, 0.98527764f, 0.98295541f,
+    0.98046475f, 0.97780610f, 0.97497990f, 0.97198664f, 0.96882685f,
+    0.96550104f, 0.96200980f, 0.95835373f, 0.95453345f, 0.95054962f,
+    0.94640291f, 0.94209404f, 0.93762375f, 0.93299280f, 0.92820199f,
+    0.92325213f, 0.91814408f, 0.91287871f, 0.90745693f, 0.90187965f,
+    0.89614785f, 0.89026249f, 0.88422459f, 0.87803519f, 0.87169533f,
+    0.86520612f, 0.85856866f, 0.85178409f, 0.84485357f, 0.83777828f,
+    0.83055945f, 0.82319831f, 0.81569611f, 0.80805415f, 0.80027373f,
+    0.79235620f, 0.78430289f, 0.77611520f, 0.76779452f, 0.75934229f,
+    0.75075995f, 0.74204897f, 0.73321084f, 0.72424708f, 0.71515923f,
+    0.70594883f, 0.69661748f, 0.68716676f, 0.67759830f, 0.66791374f,
+    0.65811474f, 0.64820297f, 0.63818013f, 0.62804795f, 0.61780815f,
+    0.60746249f, 0.59701275f, 0.58646072f, 0.57580819f, 0.56505701f,
+    0.55420900f, 0.54326604f, 0.53222998f, 0.52110274f, 0.50988620f,
+    0.49858230f, 0.48719297f, 0.47572016f, 0.46416584f, 0.45253199f,
+    0.44082059f, 0.42903367f, 0.41717323f, 0.40524131f, 0.39323996f,
+    0.38117123f, 0.36903718f, 0.35683990f, 0.34458148f, 0.33226402f,
+    0.31988962f, 0.30746042f, 0.29497853f, 0.28244610f, 0.26986527f,
+    0.25723821f, 0.24456706f, 0.23185402f, 0.21910124f, 0.20631092f,
+    0.19348526f, 0.18062644f, 0.16773667f, 0.15481816f, 0.14187312f,
+    0.12890377f, 0.11591234f, 0.10290104f, 0.089872115f, 0.076827789f,
+    0.063770300f, 0.050701883f, 0.037624779f, 0.024541229f, 0.011453473f,
+    -0.0016362454f, -0.014725683f, -0.027812598f, -0.040894747f, -0.053969889f,
+    -0.067035784f, -0.080090192f, -0.093130877f, -0.10615561f, -0.11916214f,
+    -0.13214826f, -0.14511174f, -0.15805036f, -0.17096189f, -0.18384413f,
+    -0.19669487f, -0.20951190f, -0.22229304f, -0.23503609f, -0.24773886f,
+    -0.26039919f, -0.27301490f, -0.28558383f, -0.29810383f, -0.31057274f,
+    -0.32298845f, -0.33534881f, -0.34765171f, -0.35989504f, -0.37207670f,
+    -0.38419461f, -0.39624670f, -0.40823088f, -0.42014512f, -0.43198737f,
+    -0.44375560f, -0.45544780f, -0.46706195f, -0.47859608f, -0.49004821f,
+    -0.50141636f, -0.51269860f, -0.52389299f, -0.53499762f, -0.54601058f,
+    -0.55692998f, -0.56775395f, -0.57848064f, -0.58910822f, -0.59963485f,
+    -0.61005873f, -0.62037809f, -0.63059115f, -0.64069616f, -0.65069139f,
+    -0.66057513f, -0.67034568f, -0.68000137f, -0.68954054f, -0.69896157f,
+    -0.70826283f, -0.71744274f, -0.72649972f, -0.73543221f, -0.74423869f,
+    -0.75291765f, -0.76146760f, -0.76988708f, -0.77817464f, -0.78632887f,
+    -0.79434836f, -0.80223175f, -0.80997767f, -0.81758481f, -0.82505187f,
+    -0.83237755f, -0.83956061f, -0.84659981f, -0.85349396f, -0.86024186f,
+    -0.86684237f, -0.87329434f, -0.87959669f, -0.88574831f, -0.89174817f,
+    -0.89759523f, -0.90328850f, -0.90882699f, -0.91420976f, -0.91943588f,
+    -0.92450446f, -0.92941463f, -0.93416555f, -0.93875641f, -0.94318642f,
+    -0.94745482f, -0.95156087f, -0.95550388f, -0.95928317f, -0.96289809f,
+    -0.96634802f, -0.96963238f, -0.97275059f, -0.97570213f, -0.97848649f,
+    -0.98110318f, -0.98355177f, -0.98583184f, -0.98794298f, -0.98988485f,
+    -0.99165711f, -0.99325945f, -0.99469160f, -0.99595331f, -0.99704438f,
+    -0.99796460f, -0.99871383f, -0.99929194f, -0.99969882f, -0.99993441f,
+    0.99999465f, 0.99956631f, 0.99845292f, 0.99665524f, 0.99417450f,
+    0.99101241f, 0.98717112f, 0.98265328f, 0.97746197f, 0.97160077f,
+    0.96507367f, 0.95788516f, 0.95004017f, 0.94154407f, 0.93240267f,
+    0.92262226f, 0.91220953f, 0.90117161f, 0.88951608f, 0.87725091f,
+    0.86438452f, 0.85092573f, 0.83688375f, 0.82226822f, 0.80708914f,
+    0.79135693f, 0.77508236f, 0.75827658f, 0.74095113f, 0.72311786f,
+    0.70478900f, 0.68597711f, 0.66669509f, 0.64695615f, 0.62677382f,
+    0.60616193f, 0.58513461f, 0.56370626f, 0.54189158f, 0.51970551f,
+    0.49716327f, 0.47428029f, 0.45107226f, 0.42755509f, 0.40374490f,
+    0.37965800f, 0.35531090f, 0.33072029f, 0.30590302f, 0.28087610f,
+    0.25565668f, 0.23026205f, 0.20470960f, 0.17901686f, 0.15320143f,
+    0.12728100f, 0.10127334f, 0.075196277f, 0.049067674f, 0.022905443f,
+    -0.0032724865f, -0.029448173f, -0.055603678f, -0.081721074f, -0.10778246f,
+    -0.13376998f, -0.15966582f, -0.18545224f, -0.21111155f, -0.23662618f,
+    -0.26197864f, -0.28715155f, -0.31212766f, -0.33688985f, -0.36142116f,
+    -0.38570477f, -0.40972403f, -0.43346249f, -0.45690388f, -0.48003212f,
+    -0.50283138f, -0.52528602f, -0.54738066f, -0.56910015f, -0.59042960f,
+    -0.61135441f, -0.63186022f, -0.65193299f, -0.67155895f, -0.69072467f,
+    -0.70941699f, -0.72762312f, -0.74533057f, -0.76252720f, -0.77920124f,
+    -0.79534126f, -0.81093618f, -0.82597533f, -0.84044840f, -0.85434547f,
+    -0.86765701f, -0.88037390f, -0.89248743f, -0.90398929f, -0.91487161f,
+    -0.92512691f, -0.93474818f, -0.94372882f, -0.95206268f, -0.95974404f,
+    -0.96676764f, -0.97312866f, -0.97882275f, -0.98384601f, -0.98819498f,
+    -0.99186670f, -0.99485864f, -0.99716875f, -0.99879546f, -0.99973764f,
 };
 #endif
 
 static const CELTMode mode48000_960_120 = {
-48000,    /* Fs */
-120,    /* overlap */
-21,    /* nbEBands */
-21,    /* effEBands */
-{0.85000610f, 0.0000000f, 1.0000000f, 1.0000000f, },    /* preemph */
-eband5ms,    /* eBands */
-3,    /* maxLM */
-8,    /* nbShortMdcts */
-120,    /* shortMdctSize */
-11,    /* nbAllocVectors */
-band_allocation,    /* allocVectors */
-logN400,    /* logN */
-window120,    /* window */
-{1920, 3, {&fft_state48000_960_0, &fft_state48000_960_1, &fft_state48000_960_2, &fft_state48000_960_3, }, mdct_twiddles960},    /* mdct */
-{392, cache_index50, cache_bits50, cache_caps50},    /* cache */
+    48000, /* Fs */
+    120, /* overlap */
+    21, /* nbEBands */
+    21, /* effEBands */
+    {0.85000610f, 0.0000000f, 1.0000000f, 1.0000000f, }, /* preemph */
+    eband5ms, /* eBands */
+    3, /* maxLM */
+    8, /* nbShortMdcts */
+    120, /* shortMdctSize */
+    11, /* nbAllocVectors */
+    band_allocation, /* allocVectors */
+    logN400, /* logN */
+    window120, /* window */
+    {1920, 3, {&fft_state48000_960_0, &fft_state48000_960_1, &fft_state48000_960_2, &fft_state48000_960_3, },
+     mdct_twiddles960},                                                                                                         /* mdct */
+    {392, cache_index50, cache_bits50, cache_caps50}, /* cache */
 };
 
 #ifdef ENABLE_QEXT
-#ifndef DEF_WINDOW240
-#define DEF_WINDOW240
+# ifndef DEF_WINDOW240
+#  define DEF_WINDOW240
 static const celt_coef window240[240] = {
-1.6821922e-05f, 0.00015139297f, 0.00042051200f, 0.00082413284f, 0.0013621862f,
-0.0020345793f, 0.0028411964f, 0.0037818978f, 0.0048565203f, 0.0060648765f,
-0.0074067550f, 0.0088819198f, 0.010490110f, 0.012231040f, 0.014104398f,
-0.016109846f, 0.018247021f, 0.020515533f, 0.022914963f, 0.025444867f,
-0.028104770f, 0.030894170f, 0.033812535f, 0.036859304f, 0.040033885f,
-0.043335654f, 0.046763958f, 0.050318110f, 0.053997389f, 0.057801044f,
-0.061728287f, 0.065778297f, 0.069950217f, 0.074243155f, 0.078656182f,
-0.083188331f, 0.087838600f, 0.092605946f, 0.097489289f, 0.10248751f,
-0.10759945f, 0.11282390f, 0.11815964f, 0.12360536f, 0.12915977f,
-0.13482147f, 0.14058908f, 0.14646113f, 0.15243614f, 0.15851256f,
-0.16468882f, 0.17096330f, 0.17733432f, 0.18380017f, 0.19035910f,
-0.19700930f, 0.20374894f, 0.21057612f, 0.21748892f, 0.22448537f,
-0.23156343f, 0.23872106f, 0.24595615f, 0.25326656f, 0.26065010f,
-0.26810455f, 0.27562763f, 0.28321704f, 0.29087045f, 0.29858546f,
-0.30635965f, 0.31419058f, 0.32207574f, 0.33001263f, 0.33799866f,
-0.34603127f, 0.35410783f, 0.36222570f, 0.37038219f, 0.37857460f,
-0.38680022f, 0.39505629f, 0.40334003f, 0.41164867f, 0.41997939f,
-0.42832937f, 0.43669576f, 0.44507572f, 0.45346639f, 0.46186489f,
-0.47026835f, 0.47867389f, 0.48707862f, 0.49547965f, 0.50387411f,
-0.51225912f, 0.52063179f, 0.52898927f, 0.53732871f, 0.54564725f,
-0.55394208f, 0.56221039f, 0.57044938f, 0.57865628f, 0.58682836f,
-0.59496289f, 0.60305718f, 0.61110858f, 0.61911445f, 0.62707221f,
-0.63497931f, 0.64283322f, 0.65063147f, 0.65837163f, 0.66605132f,
-0.67366820f, 0.68121999f, 0.68870444f, 0.69611937f, 0.70346266f,
-0.71073222f, 0.71792606f, 0.72504220f, 0.73207877f, 0.73903393f,
-0.74590592f, 0.75269303f, 0.75939364f, 0.76600617f, 0.77252915f,
-0.77896113f, 0.78530077f, 0.79154678f, 0.79769796f, 0.80375317f,
-0.80971135f, 0.81557152f, 0.82133276f, 0.82699424f, 0.83255520f,
-0.83801496f, 0.84337291f, 0.84862851f, 0.85378132f, 0.85883095f,
-0.86377710f, 0.86861954f, 0.87335813f, 0.87799277f, 0.88252347f,
-0.88695029f, 0.89127338f, 0.89549294f, 0.89960926f, 0.90362268f,
-0.90753364f, 0.91134262f, 0.91505017f, 0.91865692f, 0.92216354f,
-0.92557078f, 0.92887945f, 0.93209042f, 0.93520460f, 0.93822298f,
-0.94114659f, 0.94397652f, 0.94671390f, 0.94935993f, 0.95191584f,
-0.95438290f, 0.95676245f, 0.95905584f, 0.96126449f, 0.96338982f,
-0.96543334f, 0.96739653f, 0.96928096f, 0.97108818f, 0.97281981f,
-0.97447746f, 0.97606279f, 0.97757746f, 0.97902317f, 0.98040162f,
-0.98171453f, 0.98296363f, 0.98415067f, 0.98527740f, 0.98634557f,
-0.98735696f, 0.98831332f, 0.98921643f, 0.99006803f, 0.99086991f,
-0.99162380f, 0.99233145f, 0.99299461f, 0.99361500f, 0.99419433f,
-0.99473429f, 0.99523657f, 0.99570284f, 0.99613472f, 0.99653384f,
-0.99690180f, 0.99724017f, 0.99755048f, 0.99783426f, 0.99809299f,
-0.99832812f, 0.99854108f, 0.99873324f, 0.99890597f, 0.99906057f,
-0.99919832f, 0.99932046f, 0.99942819f, 0.99952266f, 0.99960498f,
-0.99967623f, 0.99973742f, 0.99978953f, 0.99983351f, 0.99987023f,
-0.99990053f, 0.99992520f, 0.99994498f, 0.99996055f, 0.99997257f,
-0.99998161f, 0.99998821f, 0.99999285f, 0.99999596f, 0.99999793f,
-0.99999907f, 0.99999966f, 0.99999991f, 0.99999999f, 1.0000000f,
+    1.6821922e-05f, 0.00015139297f, 0.00042051200f, 0.00082413284f, 0.0013621862f,
+    0.0020345793f, 0.0028411964f, 0.0037818978f, 0.0048565203f, 0.0060648765f,
+    0.0074067550f, 0.0088819198f, 0.010490110f, 0.012231040f, 0.014104398f,
+    0.016109846f, 0.018247021f, 0.020515533f, 0.022914963f, 0.025444867f,
+    0.028104770f, 0.030894170f, 0.033812535f, 0.036859304f, 0.040033885f,
+    0.043335654f, 0.046763958f, 0.050318110f, 0.053997389f, 0.057801044f,
+    0.061728287f, 0.065778297f, 0.069950217f, 0.074243155f, 0.078656182f,
+    0.083188331f, 0.087838600f, 0.092605946f, 0.097489289f, 0.10248751f,
+    0.10759945f, 0.11282390f, 0.11815964f, 0.12360536f, 0.12915977f,
+    0.13482147f, 0.14058908f, 0.14646113f, 0.15243614f, 0.15851256f,
+    0.16468882f, 0.17096330f, 0.17733432f, 0.18380017f, 0.19035910f,
+    0.19700930f, 0.20374894f, 0.21057612f, 0.21748892f, 0.22448537f,
+    0.23156343f, 0.23872106f, 0.24595615f, 0.25326656f, 0.26065010f,
+    0.26810455f, 0.27562763f, 0.28321704f, 0.29087045f, 0.29858546f,
+    0.30635965f, 0.31419058f, 0.32207574f, 0.33001263f, 0.33799866f,
+    0.34603127f, 0.35410783f, 0.36222570f, 0.37038219f, 0.37857460f,
+    0.38680022f, 0.39505629f, 0.40334003f, 0.41164867f, 0.41997939f,
+    0.42832937f, 0.43669576f, 0.44507572f, 0.45346639f, 0.46186489f,
+    0.47026835f, 0.47867389f, 0.48707862f, 0.49547965f, 0.50387411f,
+    0.51225912f, 0.52063179f, 0.52898927f, 0.53732871f, 0.54564725f,
+    0.55394208f, 0.56221039f, 0.57044938f, 0.57865628f, 0.58682836f,
+    0.59496289f, 0.60305718f, 0.61110858f, 0.61911445f, 0.62707221f,
+    0.63497931f, 0.64283322f, 0.65063147f, 0.65837163f, 0.66605132f,
+    0.67366820f, 0.68121999f, 0.68870444f, 0.69611937f, 0.70346266f,
+    0.71073222f, 0.71792606f, 0.72504220f, 0.73207877f, 0.73903393f,
+    0.74590592f, 0.75269303f, 0.75939364f, 0.76600617f, 0.77252915f,
+    0.77896113f, 0.78530077f, 0.79154678f, 0.79769796f, 0.80375317f,
+    0.80971135f, 0.81557152f, 0.82133276f, 0.82699424f, 0.83255520f,
+    0.83801496f, 0.84337291f, 0.84862851f, 0.85378132f, 0.85883095f,
+    0.86377710f, 0.86861954f, 0.87335813f, 0.87799277f, 0.88252347f,
+    0.88695029f, 0.89127338f, 0.89549294f, 0.89960926f, 0.90362268f,
+    0.90753364f, 0.91134262f, 0.91505017f, 0.91865692f, 0.92216354f,
+    0.92557078f, 0.92887945f, 0.93209042f, 0.93520460f, 0.93822298f,
+    0.94114659f, 0.94397652f, 0.94671390f, 0.94935993f, 0.95191584f,
+    0.95438290f, 0.95676245f, 0.95905584f, 0.96126449f, 0.96338982f,
+    0.96543334f, 0.96739653f, 0.96928096f, 0.97108818f, 0.97281981f,
+    0.97447746f, 0.97606279f, 0.97757746f, 0.97902317f, 0.98040162f,
+    0.98171453f, 0.98296363f, 0.98415067f, 0.98527740f, 0.98634557f,
+    0.98735696f, 0.98831332f, 0.98921643f, 0.99006803f, 0.99086991f,
+    0.99162380f, 0.99233145f, 0.99299461f, 0.99361500f, 0.99419433f,
+    0.99473429f, 0.99523657f, 0.99570284f, 0.99613472f, 0.99653384f,
+    0.99690180f, 0.99724017f, 0.99755048f, 0.99783426f, 0.99809299f,
+    0.99832812f, 0.99854108f, 0.99873324f, 0.99890597f, 0.99906057f,
+    0.99919832f, 0.99932046f, 0.99942819f, 0.99952266f, 0.99960498f,
+    0.99967623f, 0.99973742f, 0.99978953f, 0.99983351f, 0.99987023f,
+    0.99990053f, 0.99992520f, 0.99994498f, 0.99996055f, 0.99997257f,
+    0.99998161f, 0.99998821f, 0.99999285f, 0.99999596f, 0.99999793f,
+    0.99999907f, 0.99999966f, 0.99999991f, 0.99999999f, 1.0000000f,
 };
-#endif
+# endif
 
-#ifndef DEF_LOGN400
-#define DEF_LOGN400
+# ifndef DEF_LOGN400
+#  define DEF_LOGN400
 static const oac_int16 logN400[21] = {
-0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 16, 16, 16, 21, 21, 24, 29, 34, 36, };
-#endif
+    0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 16, 16, 16, 21, 21, 24, 29, 34, 36, };
+# endif
 
-#ifndef DEF_PULSE_CACHE50
-#define DEF_PULSE_CACHE50
+# ifndef DEF_PULSE_CACHE50
+#  define DEF_PULSE_CACHE50
 static const oac_int16 cache_index50[105] = {
--1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 41, 41, 41,
-82, 82, 123, 164, 200, 222, 0, 0, 0, 0, 0, 0, 0, 0, 41,
-41, 41, 41, 123, 123, 123, 164, 164, 240, 266, 283, 295, 41, 41, 41,
-41, 41, 41, 41, 41, 123, 123, 123, 123, 240, 240, 240, 266, 266, 305,
-318, 328, 336, 123, 123, 123, 123, 123, 123, 123, 123, 240, 240, 240, 240,
-305, 305, 305, 318, 318, 343, 351, 358, 364, 240, 240, 240, 240, 240, 240,
-240, 240, 305, 305, 305, 305, 343, 343, 343, 351, 351, 370, 376, 382, 387,
+    -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 41, 41, 41,
+    82, 82, 123, 164, 200, 222, 0, 0, 0, 0, 0, 0, 0, 0, 41,
+    41, 41, 41, 123, 123, 123, 164, 164, 240, 266, 283, 295, 41, 41, 41,
+    41, 41, 41, 41, 41, 123, 123, 123, 123, 240, 240, 240, 266, 266, 305,
+    318, 328, 336, 123, 123, 123, 123, 123, 123, 123, 123, 240, 240, 240, 240,
+    305, 305, 305, 318, 318, 343, 351, 358, 364, 240, 240, 240, 240, 240, 240,
+    240, 240, 305, 305, 305, 305, 343, 343, 343, 351, 351, 370, 376, 382, 387,
 };
 static const unsigned char cache_bits50[392] = {
-40, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 40, 15, 23, 28,
-31, 34, 36, 38, 39, 41, 42, 43, 44, 45, 46, 47, 47, 49, 50,
-51, 52, 53, 54, 55, 55, 57, 58, 59, 60, 61, 62, 63, 63, 65,
-66, 67, 68, 69, 70, 71, 71, 40, 20, 33, 41, 48, 53, 57, 61,
-64, 66, 69, 71, 73, 75, 76, 78, 80, 82, 85, 87, 89, 91, 92,
-94, 96, 98, 101, 103, 105, 107, 108, 110, 112, 114, 117, 119, 121, 123,
-124, 126, 128, 40, 23, 39, 51, 60, 67, 73, 79, 83, 87, 91, 94,
-97, 100, 102, 105, 107, 111, 115, 118, 121, 124, 126, 129, 131, 135, 139,
-142, 145, 148, 150, 153, 155, 159, 163, 166, 169, 172, 174, 177, 179, 35,
-28, 49, 65, 78, 89, 99, 107, 114, 120, 126, 132, 136, 141, 145, 149,
-153, 159, 165, 171, 176, 180, 185, 189, 192, 199, 205, 211, 216, 220, 225,
-229, 232, 239, 245, 251, 21, 33, 58, 79, 97, 112, 125, 137, 148, 157,
-166, 174, 182, 189, 195, 201, 207, 217, 227, 235, 243, 251, 17, 35, 63,
-86, 106, 123, 139, 152, 165, 177, 187, 197, 206, 214, 222, 230, 237, 250,
-25, 31, 55, 75, 91, 105, 117, 128, 138, 146, 154, 161, 168, 174, 180,
-185, 190, 200, 208, 215, 222, 229, 235, 240, 245, 255, 16, 36, 65, 89,
-110, 128, 144, 159, 173, 185, 196, 207, 217, 226, 234, 242, 250, 11, 41,
-74, 103, 128, 151, 172, 191, 209, 225, 241, 255, 9, 43, 79, 110, 138,
-163, 186, 207, 227, 246, 12, 39, 71, 99, 123, 144, 164, 182, 198, 214,
-228, 241, 253, 9, 44, 81, 113, 142, 168, 192, 214, 235, 255, 7, 49,
-90, 127, 160, 191, 220, 247, 6, 51, 95, 134, 170, 203, 234, 7, 47,
-87, 123, 155, 184, 212, 237, 6, 52, 97, 137, 174, 208, 240, 5, 57,
-106, 151, 192, 231, 5, 59, 111, 158, 202, 243, 5, 55, 103, 147, 187,
-224, 5, 60, 113, 161, 206, 248, 4, 65, 122, 175, 224, 4, 67, 127,
-182, 234, };
+    40, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 40, 15, 23, 28,
+    31, 34, 36, 38, 39, 41, 42, 43, 44, 45, 46, 47, 47, 49, 50,
+    51, 52, 53, 54, 55, 55, 57, 58, 59, 60, 61, 62, 63, 63, 65,
+    66, 67, 68, 69, 70, 71, 71, 40, 20, 33, 41, 48, 53, 57, 61,
+    64, 66, 69, 71, 73, 75, 76, 78, 80, 82, 85, 87, 89, 91, 92,
+    94, 96, 98, 101, 103, 105, 107, 108, 110, 112, 114, 117, 119, 121, 123,
+    124, 126, 128, 40, 23, 39, 51, 60, 67, 73, 79, 83, 87, 91, 94,
+    97, 100, 102, 105, 107, 111, 115, 118, 121, 124, 126, 129, 131, 135, 139,
+    142, 145, 148, 150, 153, 155, 159, 163, 166, 169, 172, 174, 177, 179, 35,
+    28, 49, 65, 78, 89, 99, 107, 114, 120, 126, 132, 136, 141, 145, 149,
+    153, 159, 165, 171, 176, 180, 185, 189, 192, 199, 205, 211, 216, 220, 225,
+    229, 232, 239, 245, 251, 21, 33, 58, 79, 97, 112, 125, 137, 148, 157,
+    166, 174, 182, 189, 195, 201, 207, 217, 227, 235, 243, 251, 17, 35, 63,
+    86, 106, 123, 139, 152, 165, 177, 187, 197, 206, 214, 222, 230, 237, 250,
+    25, 31, 55, 75, 91, 105, 117, 128, 138, 146, 154, 161, 168, 174, 180,
+    185, 190, 200, 208, 215, 222, 229, 235, 240, 245, 255, 16, 36, 65, 89,
+    110, 128, 144, 159, 173, 185, 196, 207, 217, 226, 234, 242, 250, 11, 41,
+    74, 103, 128, 151, 172, 191, 209, 225, 241, 255, 9, 43, 79, 110, 138,
+    163, 186, 207, 227, 246, 12, 39, 71, 99, 123, 144, 164, 182, 198, 214,
+    228, 241, 253, 9, 44, 81, 113, 142, 168, 192, 214, 235, 255, 7, 49,
+    90, 127, 160, 191, 220, 247, 6, 51, 95, 134, 170, 203, 234, 7, 47,
+    87, 123, 155, 184, 212, 237, 6, 52, 97, 137, 174, 208, 240, 5, 57,
+    106, 151, 192, 231, 5, 59, 111, 158, 202, 243, 5, 55, 103, 147, 187,
+    224, 5, 60, 113, 161, 206, 248, 4, 65, 122, 175, 224, 4, 67, 127,
+    182, 234, };
 static const unsigned char cache_caps50[168] = {
-224, 224, 224, 224, 224, 224, 224, 224, 160, 160, 160, 160, 185, 185, 185,
-178, 178, 168, 134, 61, 37, 224, 224, 224, 224, 224, 224, 224, 224, 240,
-240, 240, 240, 207, 207, 207, 198, 198, 183, 144, 66, 40, 160, 160, 160,
-160, 160, 160, 160, 160, 185, 185, 185, 185, 193, 193, 193, 183, 183, 172,
-138, 64, 38, 240, 240, 240, 240, 240, 240, 240, 240, 207, 207, 207, 207,
-204, 204, 204, 193, 193, 180, 143, 66, 40, 185, 185, 185, 185, 185, 185,
-185, 185, 193, 193, 193, 193, 193, 193, 193, 183, 183, 172, 138, 65, 39,
-207, 207, 207, 207, 207, 207, 207, 207, 204, 204, 204, 204, 201, 201, 201,
-188, 188, 176, 141, 66, 40, 193, 193, 193, 193, 193, 193, 193, 193, 193,
-193, 193, 193, 194, 194, 194, 184, 184, 173, 139, 65, 39, 204, 204, 204,
-204, 204, 204, 204, 204, 201, 201, 201, 201, 198, 198, 198, 187, 187, 175,
-140, 66, 40, };
-#endif
+    224, 224, 224, 224, 224, 224, 224, 224, 160, 160, 160, 160, 185, 185, 185,
+    178, 178, 168, 134, 61, 37, 224, 224, 224, 224, 224, 224, 224, 224, 240,
+    240, 240, 240, 207, 207, 207, 198, 198, 183, 144, 66, 40, 160, 160, 160,
+    160, 160, 160, 160, 160, 185, 185, 185, 185, 193, 193, 193, 183, 183, 172,
+    138, 64, 38, 240, 240, 240, 240, 240, 240, 240, 240, 207, 207, 207, 207,
+    204, 204, 204, 193, 193, 180, 143, 66, 40, 185, 185, 185, 185, 185, 185,
+    185, 185, 193, 193, 193, 193, 193, 193, 193, 183, 183, 172, 138, 65, 39,
+    207, 207, 207, 207, 207, 207, 207, 207, 204, 204, 204, 204, 201, 201, 201,
+    188, 188, 176, 141, 66, 40, 193, 193, 193, 193, 193, 193, 193, 193, 193,
+    193, 193, 193, 194, 194, 194, 184, 184, 173, 139, 65, 39, 204, 204, 204,
+    204, 204, 204, 204, 204, 201, 201, 201, 201, 198, 198, 198, 187, 187, 175,
+    140, 66, 40, };
+# endif
 
-#ifndef FFT_TWIDDLES96000_1920
-#define FFT_TWIDDLES96000_1920
+# ifndef FFT_TWIDDLES96000_1920
+#  define FFT_TWIDDLES96000_1920
 static const kiss_twiddle_cpx fft_twiddles96000_1920[960] = {
-{1.0000000f, -0.0000000f}, {0.99997858f, -0.0065449380f},
-{0.99991433f, -0.013089596f}, {0.99980724f, -0.019633692f},
-{0.99965732f, -0.026176948f}, {0.99946459f, -0.032719083f},
-{0.99922904f, -0.039259816f}, {0.99895068f, -0.045798867f},
-{0.99862953f, -0.052335956f}, {0.99826561f, -0.058870804f},
-{0.99785892f, -0.065403129f}, {0.99740949f, -0.071932653f},
-{0.99691733f, -0.078459096f}, {0.99638247f, -0.084982177f},
-{0.99580493f, -0.091501619f}, {0.99518473f, -0.098017140f},
-{0.99452190f, -0.10452846f}, {0.99381646f, -0.11103531f},
-{0.99306846f, -0.11753740f}, {0.99227791f, -0.12403445f},
-{0.99144486f, -0.13052619f}, {0.99056934f, -0.13701234f},
-{0.98965139f, -0.14349262f}, {0.98869104f, -0.14996676f},
-{0.98768834f, -0.15643447f}, {0.98664333f, -0.16289547f},
-{0.98555606f, -0.16934950f}, {0.98442657f, -0.17579628f},
-{0.98325491f, -0.18223553f}, {0.98204113f, -0.18866696f},
-{0.98078528f, -0.19509032f}, {0.97948742f, -0.20150532f},
-{0.97814760f, -0.20791169f}, {0.97676588f, -0.21430915f},
-{0.97534232f, -0.22069744f}, {0.97387698f, -0.22707626f},
-{0.97236992f, -0.23344536f}, {0.97082121f, -0.23980446f},
-{0.96923091f, -0.24615329f}, {0.96759909f, -0.25249158f},
-{0.96592583f, -0.25881905f}, {0.96421118f, -0.26513543f},
-{0.96245524f, -0.27144045f}, {0.96065806f, -0.27773385f},
-{0.95881973f, -0.28401534f}, {0.95694034f, -0.29028468f},
-{0.95501994f, -0.29654157f}, {0.95305864f, -0.30278577f},
-{0.95105652f, -0.30901699f}, {0.94901365f, -0.31523498f},
-{0.94693013f, -0.32143947f}, {0.94480605f, -0.32763018f},
-{0.94264149f, -0.33380686f}, {0.94043656f, -0.33996924f},
-{0.93819134f, -0.34611706f}, {0.93590593f, -0.35225005f},
-{0.93358043f, -0.35836795f}, {0.93121493f, -0.36447050f},
-{0.92880955f, -0.37055744f}, {0.92636438f, -0.37662850f},
-{0.92387953f, -0.38268343f}, {0.92135511f, -0.38872197f},
-{0.91879121f, -0.39474386f}, {0.91618796f, -0.40074883f},
-{0.91354546f, -0.40673664f}, {0.91086382f, -0.41270703f},
-{0.90814317f, -0.41865974f}, {0.90538362f, -0.42459451f},
-{0.90258528f, -0.43051110f}, {0.89974828f, -0.43640924f},
-{0.89687274f, -0.44228869f}, {0.89395878f, -0.44814919f},
-{0.89100652f, -0.45399050f}, {0.88801610f, -0.45981236f},
-{0.88498764f, -0.46561452f}, {0.88192126f, -0.47139674f},
-{0.87881711f, -0.47715876f}, {0.87567532f, -0.48290034f},
-{0.87249601f, -0.48862124f}, {0.86927932f, -0.49432121f},
-{0.86602540f, -0.50000000f}, {0.86273439f, -0.50565737f},
-{0.85940641f, -0.51129309f}, {0.85604162f, -0.51690690f},
-{0.85264016f, -0.52249856f}, {0.84920218f, -0.52806785f},
-{0.84572782f, -0.53361452f}, {0.84221723f, -0.53913832f},
-{0.83867057f, -0.54463904f}, {0.83508798f, -0.55011642f},
-{0.83146961f, -0.55557023f}, {0.82781563f, -0.56100025f},
-{0.82412619f, -0.56640624f}, {0.82040144f, -0.57178796f},
-{0.81664156f, -0.57714519f}, {0.81284668f, -0.58247770f},
-{0.80901699f, -0.58778525f}, {0.80515265f, -0.59306763f},
-{0.80125381f, -0.59832460f}, {0.79732065f, -0.60355594f},
-{0.79335334f, -0.60876143f}, {0.78935204f, -0.61394084f},
-{0.78531693f, -0.61909395f}, {0.78124818f, -0.62422054f},
-{0.77714596f, -0.62932039f}, {0.77301045f, -0.63439328f},
-{0.76884183f, -0.63943900f}, {0.76464028f, -0.64445733f},
-{0.76040597f, -0.64944805f}, {0.75613908f, -0.65441095f},
-{0.75183981f, -0.65934582f}, {0.74750833f, -0.66425244f},
-{0.74314483f, -0.66913061f}, {0.73874949f, -0.67398011f},
-{0.73432251f, -0.67880075f}, {0.72986407f, -0.68359230f},
-{0.72537437f, -0.68835458f}, {0.72085360f, -0.69308736f},
-{0.71630194f, -0.69779046f}, {0.71171961f, -0.70246367f},
-{0.70710678f, -0.70710678f}, {0.70246367f, -0.71171961f},
-{0.69779046f, -0.71630194f}, {0.69308736f, -0.72085360f},
-{0.68835458f, -0.72537437f}, {0.68359230f, -0.72986407f},
-{0.67880075f, -0.73432251f}, {0.67398011f, -0.73874949f},
-{0.66913061f, -0.74314483f}, {0.66425244f, -0.74750833f},
-{0.65934582f, -0.75183981f}, {0.65441095f, -0.75613908f},
-{0.64944805f, -0.76040597f}, {0.64445733f, -0.76464028f},
-{0.63943900f, -0.76884183f}, {0.63439328f, -0.77301045f},
-{0.62932039f, -0.77714596f}, {0.62422054f, -0.78124818f},
-{0.61909395f, -0.78531693f}, {0.61394084f, -0.78935204f},
-{0.60876143f, -0.79335334f}, {0.60355594f, -0.79732065f},
-{0.59832460f, -0.80125381f}, {0.59306763f, -0.80515265f},
-{0.58778525f, -0.80901699f}, {0.58247770f, -0.81284668f},
-{0.57714519f, -0.81664156f}, {0.57178796f, -0.82040144f},
-{0.56640624f, -0.82412619f}, {0.56100025f, -0.82781563f},
-{0.55557023f, -0.83146961f}, {0.55011642f, -0.83508798f},
-{0.54463904f, -0.83867057f}, {0.53913832f, -0.84221723f},
-{0.53361452f, -0.84572782f}, {0.52806785f, -0.84920218f},
-{0.52249856f, -0.85264016f}, {0.51690690f, -0.85604162f},
-{0.51129309f, -0.85940641f}, {0.50565737f, -0.86273439f},
-{0.50000000f, -0.86602540f}, {0.49432121f, -0.86927932f},
-{0.48862124f, -0.87249601f}, {0.48290034f, -0.87567532f},
-{0.47715876f, -0.87881711f}, {0.47139674f, -0.88192126f},
-{0.46561452f, -0.88498764f}, {0.45981236f, -0.88801610f},
-{0.45399050f, -0.89100652f}, {0.44814919f, -0.89395878f},
-{0.44228869f, -0.89687274f}, {0.43640924f, -0.89974828f},
-{0.43051110f, -0.90258528f}, {0.42459451f, -0.90538362f},
-{0.41865974f, -0.90814317f}, {0.41270703f, -0.91086382f},
-{0.40673664f, -0.91354546f}, {0.40074883f, -0.91618796f},
-{0.39474386f, -0.91879121f}, {0.38872197f, -0.92135511f},
-{0.38268343f, -0.92387953f}, {0.37662850f, -0.92636438f},
-{0.37055744f, -0.92880955f}, {0.36447050f, -0.93121493f},
-{0.35836795f, -0.93358043f}, {0.35225005f, -0.93590593f},
-{0.34611706f, -0.93819134f}, {0.33996924f, -0.94043656f},
-{0.33380686f, -0.94264149f}, {0.32763018f, -0.94480605f},
-{0.32143947f, -0.94693013f}, {0.31523498f, -0.94901365f},
-{0.30901699f, -0.95105652f}, {0.30278577f, -0.95305864f},
-{0.29654157f, -0.95501994f}, {0.29028468f, -0.95694034f},
-{0.28401534f, -0.95881973f}, {0.27773385f, -0.96065806f},
-{0.27144045f, -0.96245524f}, {0.26513543f, -0.96421118f},
-{0.25881905f, -0.96592583f}, {0.25249158f, -0.96759909f},
-{0.24615329f, -0.96923091f}, {0.23980446f, -0.97082121f},
-{0.23344536f, -0.97236992f}, {0.22707626f, -0.97387698f},
-{0.22069744f, -0.97534232f}, {0.21430915f, -0.97676588f},
-{0.20791169f, -0.97814760f}, {0.20150532f, -0.97948742f},
-{0.19509032f, -0.98078528f}, {0.18866696f, -0.98204113f},
-{0.18223553f, -0.98325491f}, {0.17579628f, -0.98442657f},
-{0.16934950f, -0.98555606f}, {0.16289547f, -0.98664333f},
-{0.15643447f, -0.98768834f}, {0.14996676f, -0.98869104f},
-{0.14349262f, -0.98965139f}, {0.13701234f, -0.99056934f},
-{0.13052619f, -0.99144486f}, {0.12403445f, -0.99227791f},
-{0.11753740f, -0.99306846f}, {0.11103531f, -0.99381646f},
-{0.10452846f, -0.99452190f}, {0.098017140f, -0.99518473f},
-{0.091501619f, -0.99580493f}, {0.084982177f, -0.99638247f},
-{0.078459096f, -0.99691733f}, {0.071932653f, -0.99740949f},
-{0.065403129f, -0.99785892f}, {0.058870804f, -0.99826561f},
-{0.052335956f, -0.99862953f}, {0.045798867f, -0.99895068f},
-{0.039259816f, -0.99922904f}, {0.032719083f, -0.99946459f},
-{0.026176948f, -0.99965732f}, {0.019633692f, -0.99980724f},
-{0.013089596f, -0.99991433f}, {0.0065449380f, -0.99997858f},
-{6.1232340e-17f, -1.0000000f}, {-0.0065449380f, -0.99997858f},
-{-0.013089596f, -0.99991433f}, {-0.019633692f, -0.99980724f},
-{-0.026176948f, -0.99965732f}, {-0.032719083f, -0.99946459f},
-{-0.039259816f, -0.99922904f}, {-0.045798867f, -0.99895068f},
-{-0.052335956f, -0.99862953f}, {-0.058870804f, -0.99826561f},
-{-0.065403129f, -0.99785892f}, {-0.071932653f, -0.99740949f},
-{-0.078459096f, -0.99691733f}, {-0.084982177f, -0.99638247f},
-{-0.091501619f, -0.99580493f}, {-0.098017140f, -0.99518473f},
-{-0.10452846f, -0.99452190f}, {-0.11103531f, -0.99381646f},
-{-0.11753740f, -0.99306846f}, {-0.12403445f, -0.99227791f},
-{-0.13052619f, -0.99144486f}, {-0.13701234f, -0.99056934f},
-{-0.14349262f, -0.98965139f}, {-0.14996676f, -0.98869104f},
-{-0.15643447f, -0.98768834f}, {-0.16289547f, -0.98664333f},
-{-0.16934950f, -0.98555606f}, {-0.17579628f, -0.98442657f},
-{-0.18223553f, -0.98325491f}, {-0.18866696f, -0.98204113f},
-{-0.19509032f, -0.98078528f}, {-0.20150532f, -0.97948742f},
-{-0.20791169f, -0.97814760f}, {-0.21430915f, -0.97676588f},
-{-0.22069744f, -0.97534232f}, {-0.22707626f, -0.97387698f},
-{-0.23344536f, -0.97236992f}, {-0.23980446f, -0.97082121f},
-{-0.24615329f, -0.96923091f}, {-0.25249158f, -0.96759909f},
-{-0.25881905f, -0.96592583f}, {-0.26513543f, -0.96421118f},
-{-0.27144045f, -0.96245524f}, {-0.27773385f, -0.96065806f},
-{-0.28401534f, -0.95881973f}, {-0.29028468f, -0.95694034f},
-{-0.29654157f, -0.95501994f}, {-0.30278577f, -0.95305864f},
-{-0.30901699f, -0.95105652f}, {-0.31523498f, -0.94901365f},
-{-0.32143947f, -0.94693013f}, {-0.32763018f, -0.94480605f},
-{-0.33380686f, -0.94264149f}, {-0.33996924f, -0.94043656f},
-{-0.34611706f, -0.93819134f}, {-0.35225005f, -0.93590593f},
-{-0.35836795f, -0.93358043f}, {-0.36447050f, -0.93121493f},
-{-0.37055744f, -0.92880955f}, {-0.37662850f, -0.92636438f},
-{-0.38268343f, -0.92387953f}, {-0.38872197f, -0.92135511f},
-{-0.39474386f, -0.91879121f}, {-0.40074883f, -0.91618796f},
-{-0.40673664f, -0.91354546f}, {-0.41270703f, -0.91086382f},
-{-0.41865974f, -0.90814317f}, {-0.42459451f, -0.90538362f},
-{-0.43051110f, -0.90258528f}, {-0.43640924f, -0.89974828f},
-{-0.44228869f, -0.89687274f}, {-0.44814919f, -0.89395878f},
-{-0.45399050f, -0.89100652f}, {-0.45981236f, -0.88801610f},
-{-0.46561452f, -0.88498764f}, {-0.47139674f, -0.88192126f},
-{-0.47715876f, -0.87881711f}, {-0.48290034f, -0.87567532f},
-{-0.48862124f, -0.87249601f}, {-0.49432121f, -0.86927932f},
-{-0.50000000f, -0.86602540f}, {-0.50565737f, -0.86273439f},
-{-0.51129309f, -0.85940641f}, {-0.51690690f, -0.85604162f},
-{-0.52249856f, -0.85264016f}, {-0.52806785f, -0.84920218f},
-{-0.53361452f, -0.84572782f}, {-0.53913832f, -0.84221723f},
-{-0.54463904f, -0.83867057f}, {-0.55011642f, -0.83508798f},
-{-0.55557023f, -0.83146961f}, {-0.56100025f, -0.82781563f},
-{-0.56640624f, -0.82412619f}, {-0.57178796f, -0.82040144f},
-{-0.57714519f, -0.81664156f}, {-0.58247770f, -0.81284668f},
-{-0.58778525f, -0.80901699f}, {-0.59306763f, -0.80515265f},
-{-0.59832460f, -0.80125381f}, {-0.60355594f, -0.79732065f},
-{-0.60876143f, -0.79335334f}, {-0.61394084f, -0.78935204f},
-{-0.61909395f, -0.78531693f}, {-0.62422054f, -0.78124818f},
-{-0.62932039f, -0.77714596f}, {-0.63439328f, -0.77301045f},
-{-0.63943900f, -0.76884183f}, {-0.64445733f, -0.76464028f},
-{-0.64944805f, -0.76040597f}, {-0.65441095f, -0.75613908f},
-{-0.65934582f, -0.75183981f}, {-0.66425244f, -0.74750833f},
-{-0.66913061f, -0.74314483f}, {-0.67398011f, -0.73874949f},
-{-0.67880075f, -0.73432251f}, {-0.68359230f, -0.72986407f},
-{-0.68835458f, -0.72537437f}, {-0.69308736f, -0.72085360f},
-{-0.69779046f, -0.71630194f}, {-0.70246367f, -0.71171961f},
-{-0.70710678f, -0.70710678f}, {-0.71171961f, -0.70246367f},
-{-0.71630194f, -0.69779046f}, {-0.72085360f, -0.69308736f},
-{-0.72537437f, -0.68835458f}, {-0.72986407f, -0.68359230f},
-{-0.73432251f, -0.67880075f}, {-0.73874949f, -0.67398011f},
-{-0.74314483f, -0.66913061f}, {-0.74750833f, -0.66425244f},
-{-0.75183981f, -0.65934582f}, {-0.75613908f, -0.65441095f},
-{-0.76040597f, -0.64944805f}, {-0.76464028f, -0.64445733f},
-{-0.76884183f, -0.63943900f}, {-0.77301045f, -0.63439328f},
-{-0.77714596f, -0.62932039f}, {-0.78124818f, -0.62422054f},
-{-0.78531693f, -0.61909395f}, {-0.78935204f, -0.61394084f},
-{-0.79335334f, -0.60876143f}, {-0.79732065f, -0.60355594f},
-{-0.80125381f, -0.59832460f}, {-0.80515265f, -0.59306763f},
-{-0.80901699f, -0.58778525f}, {-0.81284668f, -0.58247770f},
-{-0.81664156f, -0.57714519f}, {-0.82040144f, -0.57178796f},
-{-0.82412619f, -0.56640624f}, {-0.82781563f, -0.56100025f},
-{-0.83146961f, -0.55557023f}, {-0.83508798f, -0.55011642f},
-{-0.83867057f, -0.54463904f}, {-0.84221723f, -0.53913832f},
-{-0.84572782f, -0.53361452f}, {-0.84920218f, -0.52806785f},
-{-0.85264016f, -0.52249856f}, {-0.85604162f, -0.51690690f},
-{-0.85940641f, -0.51129309f}, {-0.86273439f, -0.50565737f},
-{-0.86602540f, -0.50000000f}, {-0.86927932f, -0.49432121f},
-{-0.87249601f, -0.48862124f}, {-0.87567532f, -0.48290034f},
-{-0.87881711f, -0.47715876f}, {-0.88192126f, -0.47139674f},
-{-0.88498764f, -0.46561452f}, {-0.88801610f, -0.45981236f},
-{-0.89100652f, -0.45399050f}, {-0.89395878f, -0.44814919f},
-{-0.89687274f, -0.44228869f}, {-0.89974828f, -0.43640924f},
-{-0.90258528f, -0.43051110f}, {-0.90538362f, -0.42459451f},
-{-0.90814317f, -0.41865974f}, {-0.91086382f, -0.41270703f},
-{-0.91354546f, -0.40673664f}, {-0.91618796f, -0.40074883f},
-{-0.91879121f, -0.39474386f}, {-0.92135511f, -0.38872197f},
-{-0.92387953f, -0.38268343f}, {-0.92636438f, -0.37662850f},
-{-0.92880955f, -0.37055744f}, {-0.93121493f, -0.36447050f},
-{-0.93358043f, -0.35836795f}, {-0.93590593f, -0.35225005f},
-{-0.93819134f, -0.34611706f}, {-0.94043656f, -0.33996924f},
-{-0.94264149f, -0.33380686f}, {-0.94480605f, -0.32763018f},
-{-0.94693013f, -0.32143947f}, {-0.94901365f, -0.31523498f},
-{-0.95105652f, -0.30901699f}, {-0.95305864f, -0.30278577f},
-{-0.95501994f, -0.29654157f}, {-0.95694034f, -0.29028468f},
-{-0.95881973f, -0.28401534f}, {-0.96065806f, -0.27773385f},
-{-0.96245524f, -0.27144045f}, {-0.96421118f, -0.26513543f},
-{-0.96592583f, -0.25881905f}, {-0.96759909f, -0.25249158f},
-{-0.96923091f, -0.24615329f}, {-0.97082121f, -0.23980446f},
-{-0.97236992f, -0.23344536f}, {-0.97387698f, -0.22707626f},
-{-0.97534232f, -0.22069744f}, {-0.97676588f, -0.21430915f},
-{-0.97814760f, -0.20791169f}, {-0.97948742f, -0.20150532f},
-{-0.98078528f, -0.19509032f}, {-0.98204113f, -0.18866696f},
-{-0.98325491f, -0.18223553f}, {-0.98442657f, -0.17579628f},
-{-0.98555606f, -0.16934950f}, {-0.98664333f, -0.16289547f},
-{-0.98768834f, -0.15643447f}, {-0.98869104f, -0.14996676f},
-{-0.98965139f, -0.14349262f}, {-0.99056934f, -0.13701234f},
-{-0.99144486f, -0.13052619f}, {-0.99227791f, -0.12403445f},
-{-0.99306846f, -0.11753740f}, {-0.99381646f, -0.11103531f},
-{-0.99452190f, -0.10452846f}, {-0.99518473f, -0.098017140f},
-{-0.99580493f, -0.091501619f}, {-0.99638247f, -0.084982177f},
-{-0.99691733f, -0.078459096f}, {-0.99740949f, -0.071932653f},
-{-0.99785892f, -0.065403129f}, {-0.99826561f, -0.058870804f},
-{-0.99862953f, -0.052335956f}, {-0.99895068f, -0.045798867f},
-{-0.99922904f, -0.039259816f}, {-0.99946459f, -0.032719083f},
-{-0.99965732f, -0.026176948f}, {-0.99980724f, -0.019633692f},
-{-0.99991433f, -0.013089596f}, {-0.99997858f, -0.0065449380f},
-{-1.0000000f, -1.2246468e-16f}, {-0.99997858f, 0.0065449380f},
-{-0.99991433f, 0.013089596f}, {-0.99980724f, 0.019633692f},
-{-0.99965732f, 0.026176948f}, {-0.99946459f, 0.032719083f},
-{-0.99922904f, 0.039259816f}, {-0.99895068f, 0.045798867f},
-{-0.99862953f, 0.052335956f}, {-0.99826561f, 0.058870804f},
-{-0.99785892f, 0.065403129f}, {-0.99740949f, 0.071932653f},
-{-0.99691733f, 0.078459096f}, {-0.99638247f, 0.084982177f},
-{-0.99580493f, 0.091501619f}, {-0.99518473f, 0.098017140f},
-{-0.99452190f, 0.10452846f}, {-0.99381646f, 0.11103531f},
-{-0.99306846f, 0.11753740f}, {-0.99227791f, 0.12403445f},
-{-0.99144486f, 0.13052619f}, {-0.99056934f, 0.13701234f},
-{-0.98965139f, 0.14349262f}, {-0.98869104f, 0.14996676f},
-{-0.98768834f, 0.15643447f}, {-0.98664333f, 0.16289547f},
-{-0.98555606f, 0.16934950f}, {-0.98442657f, 0.17579628f},
-{-0.98325491f, 0.18223553f}, {-0.98204113f, 0.18866696f},
-{-0.98078528f, 0.19509032f}, {-0.97948742f, 0.20150532f},
-{-0.97814760f, 0.20791169f}, {-0.97676588f, 0.21430915f},
-{-0.97534232f, 0.22069744f}, {-0.97387698f, 0.22707626f},
-{-0.97236992f, 0.23344536f}, {-0.97082121f, 0.23980446f},
-{-0.96923091f, 0.24615329f}, {-0.96759909f, 0.25249158f},
-{-0.96592583f, 0.25881905f}, {-0.96421118f, 0.26513543f},
-{-0.96245524f, 0.27144045f}, {-0.96065806f, 0.27773385f},
-{-0.95881973f, 0.28401534f}, {-0.95694034f, 0.29028468f},
-{-0.95501994f, 0.29654157f}, {-0.95305864f, 0.30278577f},
-{-0.95105652f, 0.30901699f}, {-0.94901365f, 0.31523498f},
-{-0.94693013f, 0.32143947f}, {-0.94480605f, 0.32763018f},
-{-0.94264149f, 0.33380686f}, {-0.94043656f, 0.33996924f},
-{-0.93819134f, 0.34611706f}, {-0.93590593f, 0.35225005f},
-{-0.93358043f, 0.35836795f}, {-0.93121493f, 0.36447050f},
-{-0.92880955f, 0.37055744f}, {-0.92636438f, 0.37662850f},
-{-0.92387953f, 0.38268343f}, {-0.92135511f, 0.38872197f},
-{-0.91879121f, 0.39474386f}, {-0.91618796f, 0.40074883f},
-{-0.91354546f, 0.40673664f}, {-0.91086382f, 0.41270703f},
-{-0.90814317f, 0.41865974f}, {-0.90538362f, 0.42459451f},
-{-0.90258528f, 0.43051110f}, {-0.89974828f, 0.43640924f},
-{-0.89687274f, 0.44228869f}, {-0.89395878f, 0.44814919f},
-{-0.89100652f, 0.45399050f}, {-0.88801610f, 0.45981236f},
-{-0.88498764f, 0.46561452f}, {-0.88192126f, 0.47139674f},
-{-0.87881711f, 0.47715876f}, {-0.87567532f, 0.48290034f},
-{-0.87249601f, 0.48862124f}, {-0.86927932f, 0.49432121f},
-{-0.86602540f, 0.50000000f}, {-0.86273439f, 0.50565737f},
-{-0.85940641f, 0.51129309f}, {-0.85604162f, 0.51690690f},
-{-0.85264016f, 0.52249856f}, {-0.84920218f, 0.52806785f},
-{-0.84572782f, 0.53361452f}, {-0.84221723f, 0.53913832f},
-{-0.83867057f, 0.54463904f}, {-0.83508798f, 0.55011642f},
-{-0.83146961f, 0.55557023f}, {-0.82781563f, 0.56100025f},
-{-0.82412619f, 0.56640624f}, {-0.82040144f, 0.57178796f},
-{-0.81664156f, 0.57714519f}, {-0.81284668f, 0.58247770f},
-{-0.80901699f, 0.58778525f}, {-0.80515265f, 0.59306763f},
-{-0.80125381f, 0.59832460f}, {-0.79732065f, 0.60355594f},
-{-0.79335334f, 0.60876143f}, {-0.78935204f, 0.61394084f},
-{-0.78531693f, 0.61909395f}, {-0.78124818f, 0.62422054f},
-{-0.77714596f, 0.62932039f}, {-0.77301045f, 0.63439328f},
-{-0.76884183f, 0.63943900f}, {-0.76464028f, 0.64445733f},
-{-0.76040597f, 0.64944805f}, {-0.75613908f, 0.65441095f},
-{-0.75183981f, 0.65934582f}, {-0.74750833f, 0.66425244f},
-{-0.74314483f, 0.66913061f}, {-0.73874949f, 0.67398011f},
-{-0.73432251f, 0.67880075f}, {-0.72986407f, 0.68359230f},
-{-0.72537437f, 0.68835458f}, {-0.72085360f, 0.69308736f},
-{-0.71630194f, 0.69779046f}, {-0.71171961f, 0.70246367f},
-{-0.70710678f, 0.70710678f}, {-0.70246367f, 0.71171961f},
-{-0.69779046f, 0.71630194f}, {-0.69308736f, 0.72085360f},
-{-0.68835458f, 0.72537437f}, {-0.68359230f, 0.72986407f},
-{-0.67880075f, 0.73432251f}, {-0.67398011f, 0.73874949f},
-{-0.66913061f, 0.74314483f}, {-0.66425244f, 0.74750833f},
-{-0.65934582f, 0.75183981f}, {-0.65441095f, 0.75613908f},
-{-0.64944805f, 0.76040597f}, {-0.64445733f, 0.76464028f},
-{-0.63943900f, 0.76884183f}, {-0.63439328f, 0.77301045f},
-{-0.62932039f, 0.77714596f}, {-0.62422054f, 0.78124818f},
-{-0.61909395f, 0.78531693f}, {-0.61394084f, 0.78935204f},
-{-0.60876143f, 0.79335334f}, {-0.60355594f, 0.79732065f},
-{-0.59832460f, 0.80125381f}, {-0.59306763f, 0.80515265f},
-{-0.58778525f, 0.80901699f}, {-0.58247770f, 0.81284668f},
-{-0.57714519f, 0.81664156f}, {-0.57178796f, 0.82040144f},
-{-0.56640624f, 0.82412619f}, {-0.56100025f, 0.82781563f},
-{-0.55557023f, 0.83146961f}, {-0.55011642f, 0.83508798f},
-{-0.54463904f, 0.83867057f}, {-0.53913832f, 0.84221723f},
-{-0.53361452f, 0.84572782f}, {-0.52806785f, 0.84920218f},
-{-0.52249856f, 0.85264016f}, {-0.51690690f, 0.85604162f},
-{-0.51129309f, 0.85940641f}, {-0.50565737f, 0.86273439f},
-{-0.50000000f, 0.86602540f}, {-0.49432121f, 0.86927932f},
-{-0.48862124f, 0.87249601f}, {-0.48290034f, 0.87567532f},
-{-0.47715876f, 0.87881711f}, {-0.47139674f, 0.88192126f},
-{-0.46561452f, 0.88498764f}, {-0.45981236f, 0.88801610f},
-{-0.45399050f, 0.89100652f}, {-0.44814919f, 0.89395878f},
-{-0.44228869f, 0.89687274f}, {-0.43640924f, 0.89974828f},
-{-0.43051110f, 0.90258528f}, {-0.42459451f, 0.90538362f},
-{-0.41865974f, 0.90814317f}, {-0.41270703f, 0.91086382f},
-{-0.40673664f, 0.91354546f}, {-0.40074883f, 0.91618796f},
-{-0.39474386f, 0.91879121f}, {-0.38872197f, 0.92135511f},
-{-0.38268343f, 0.92387953f}, {-0.37662850f, 0.92636438f},
-{-0.37055744f, 0.92880955f}, {-0.36447050f, 0.93121493f},
-{-0.35836795f, 0.93358043f}, {-0.35225005f, 0.93590593f},
-{-0.34611706f, 0.93819134f}, {-0.33996924f, 0.94043656f},
-{-0.33380686f, 0.94264149f}, {-0.32763018f, 0.94480605f},
-{-0.32143947f, 0.94693013f}, {-0.31523498f, 0.94901365f},
-{-0.30901699f, 0.95105652f}, {-0.30278577f, 0.95305864f},
-{-0.29654157f, 0.95501994f}, {-0.29028468f, 0.95694034f},
-{-0.28401534f, 0.95881973f}, {-0.27773385f, 0.96065806f},
-{-0.27144045f, 0.96245524f}, {-0.26513543f, 0.96421118f},
-{-0.25881905f, 0.96592583f}, {-0.25249158f, 0.96759909f},
-{-0.24615329f, 0.96923091f}, {-0.23980446f, 0.97082121f},
-{-0.23344536f, 0.97236992f}, {-0.22707626f, 0.97387698f},
-{-0.22069744f, 0.97534232f}, {-0.21430915f, 0.97676588f},
-{-0.20791169f, 0.97814760f}, {-0.20150532f, 0.97948742f},
-{-0.19509032f, 0.98078528f}, {-0.18866696f, 0.98204113f},
-{-0.18223553f, 0.98325491f}, {-0.17579628f, 0.98442657f},
-{-0.16934950f, 0.98555606f}, {-0.16289547f, 0.98664333f},
-{-0.15643447f, 0.98768834f}, {-0.14996676f, 0.98869104f},
-{-0.14349262f, 0.98965139f}, {-0.13701234f, 0.99056934f},
-{-0.13052619f, 0.99144486f}, {-0.12403445f, 0.99227791f},
-{-0.11753740f, 0.99306846f}, {-0.11103531f, 0.99381646f},
-{-0.10452846f, 0.99452190f}, {-0.098017140f, 0.99518473f},
-{-0.091501619f, 0.99580493f}, {-0.084982177f, 0.99638247f},
-{-0.078459096f, 0.99691733f}, {-0.071932653f, 0.99740949f},
-{-0.065403129f, 0.99785892f}, {-0.058870804f, 0.99826561f},
-{-0.052335956f, 0.99862953f}, {-0.045798867f, 0.99895068f},
-{-0.039259816f, 0.99922904f}, {-0.032719083f, 0.99946459f},
-{-0.026176948f, 0.99965732f}, {-0.019633692f, 0.99980724f},
-{-0.013089596f, 0.99991433f}, {-0.0065449380f, 0.99997858f},
-{-1.8369702e-16f, 1.0000000f}, {0.0065449380f, 0.99997858f},
-{0.013089596f, 0.99991433f}, {0.019633692f, 0.99980724f},
-{0.026176948f, 0.99965732f}, {0.032719083f, 0.99946459f},
-{0.039259816f, 0.99922904f}, {0.045798867f, 0.99895068f},
-{0.052335956f, 0.99862953f}, {0.058870804f, 0.99826561f},
-{0.065403129f, 0.99785892f}, {0.071932653f, 0.99740949f},
-{0.078459096f, 0.99691733f}, {0.084982177f, 0.99638247f},
-{0.091501619f, 0.99580493f}, {0.098017140f, 0.99518473f},
-{0.10452846f, 0.99452190f}, {0.11103531f, 0.99381646f},
-{0.11753740f, 0.99306846f}, {0.12403445f, 0.99227791f},
-{0.13052619f, 0.99144486f}, {0.13701234f, 0.99056934f},
-{0.14349262f, 0.98965139f}, {0.14996676f, 0.98869104f},
-{0.15643447f, 0.98768834f}, {0.16289547f, 0.98664333f},
-{0.16934950f, 0.98555606f}, {0.17579628f, 0.98442657f},
-{0.18223553f, 0.98325491f}, {0.18866696f, 0.98204113f},
-{0.19509032f, 0.98078528f}, {0.20150532f, 0.97948742f},
-{0.20791169f, 0.97814760f}, {0.21430915f, 0.97676588f},
-{0.22069744f, 0.97534232f}, {0.22707626f, 0.97387698f},
-{0.23344536f, 0.97236992f}, {0.23980446f, 0.97082121f},
-{0.24615329f, 0.96923091f}, {0.25249158f, 0.96759909f},
-{0.25881905f, 0.96592583f}, {0.26513543f, 0.96421118f},
-{0.27144045f, 0.96245524f}, {0.27773385f, 0.96065806f},
-{0.28401534f, 0.95881973f}, {0.29028468f, 0.95694034f},
-{0.29654157f, 0.95501994f}, {0.30278577f, 0.95305864f},
-{0.30901699f, 0.95105652f}, {0.31523498f, 0.94901365f},
-{0.32143947f, 0.94693013f}, {0.32763018f, 0.94480605f},
-{0.33380686f, 0.94264149f}, {0.33996924f, 0.94043656f},
-{0.34611706f, 0.93819134f}, {0.35225005f, 0.93590593f},
-{0.35836795f, 0.93358043f}, {0.36447050f, 0.93121493f},
-{0.37055744f, 0.92880955f}, {0.37662850f, 0.92636438f},
-{0.38268343f, 0.92387953f}, {0.38872197f, 0.92135511f},
-{0.39474386f, 0.91879121f}, {0.40074883f, 0.91618796f},
-{0.40673664f, 0.91354546f}, {0.41270703f, 0.91086382f},
-{0.41865974f, 0.90814317f}, {0.42459451f, 0.90538362f},
-{0.43051110f, 0.90258528f}, {0.43640924f, 0.89974828f},
-{0.44228869f, 0.89687274f}, {0.44814919f, 0.89395878f},
-{0.45399050f, 0.89100652f}, {0.45981236f, 0.88801610f},
-{0.46561452f, 0.88498764f}, {0.47139674f, 0.88192126f},
-{0.47715876f, 0.87881711f}, {0.48290034f, 0.87567532f},
-{0.48862124f, 0.87249601f}, {0.49432121f, 0.86927932f},
-{0.50000000f, 0.86602540f}, {0.50565737f, 0.86273439f},
-{0.51129309f, 0.85940641f}, {0.51690690f, 0.85604162f},
-{0.52249856f, 0.85264016f}, {0.52806785f, 0.84920218f},
-{0.53361452f, 0.84572782f}, {0.53913832f, 0.84221723f},
-{0.54463904f, 0.83867057f}, {0.55011642f, 0.83508798f},
-{0.55557023f, 0.83146961f}, {0.56100025f, 0.82781563f},
-{0.56640624f, 0.82412619f}, {0.57178796f, 0.82040144f},
-{0.57714519f, 0.81664156f}, {0.58247770f, 0.81284668f},
-{0.58778525f, 0.80901699f}, {0.59306763f, 0.80515265f},
-{0.59832460f, 0.80125381f}, {0.60355594f, 0.79732065f},
-{0.60876143f, 0.79335334f}, {0.61394084f, 0.78935204f},
-{0.61909395f, 0.78531693f}, {0.62422054f, 0.78124818f},
-{0.62932039f, 0.77714596f}, {0.63439328f, 0.77301045f},
-{0.63943900f, 0.76884183f}, {0.64445733f, 0.76464028f},
-{0.64944805f, 0.76040597f}, {0.65441095f, 0.75613908f},
-{0.65934582f, 0.75183981f}, {0.66425244f, 0.74750833f},
-{0.66913061f, 0.74314483f}, {0.67398011f, 0.73874949f},
-{0.67880075f, 0.73432251f}, {0.68359230f, 0.72986407f},
-{0.68835458f, 0.72537437f}, {0.69308736f, 0.72085360f},
-{0.69779046f, 0.71630194f}, {0.70246367f, 0.71171961f},
-{0.70710678f, 0.70710678f}, {0.71171961f, 0.70246367f},
-{0.71630194f, 0.69779046f}, {0.72085360f, 0.69308736f},
-{0.72537437f, 0.68835458f}, {0.72986407f, 0.68359230f},
-{0.73432251f, 0.67880075f}, {0.73874949f, 0.67398011f},
-{0.74314483f, 0.66913061f}, {0.74750833f, 0.66425244f},
-{0.75183981f, 0.65934582f}, {0.75613908f, 0.65441095f},
-{0.76040597f, 0.64944805f}, {0.76464028f, 0.64445733f},
-{0.76884183f, 0.63943900f}, {0.77301045f, 0.63439328f},
-{0.77714596f, 0.62932039f}, {0.78124818f, 0.62422054f},
-{0.78531693f, 0.61909395f}, {0.78935204f, 0.61394084f},
-{0.79335334f, 0.60876143f}, {0.79732065f, 0.60355594f},
-{0.80125381f, 0.59832460f}, {0.80515265f, 0.59306763f},
-{0.80901699f, 0.58778525f}, {0.81284668f, 0.58247770f},
-{0.81664156f, 0.57714519f}, {0.82040144f, 0.57178796f},
-{0.82412619f, 0.56640624f}, {0.82781563f, 0.56100025f},
-{0.83146961f, 0.55557023f}, {0.83508798f, 0.55011642f},
-{0.83867057f, 0.54463904f}, {0.84221723f, 0.53913832f},
-{0.84572782f, 0.53361452f}, {0.84920218f, 0.52806785f},
-{0.85264016f, 0.52249856f}, {0.85604162f, 0.51690690f},
-{0.85940641f, 0.51129309f}, {0.86273439f, 0.50565737f},
-{0.86602540f, 0.50000000f}, {0.86927932f, 0.49432121f},
-{0.87249601f, 0.48862124f}, {0.87567532f, 0.48290034f},
-{0.87881711f, 0.47715876f}, {0.88192126f, 0.47139674f},
-{0.88498764f, 0.46561452f}, {0.88801610f, 0.45981236f},
-{0.89100652f, 0.45399050f}, {0.89395878f, 0.44814919f},
-{0.89687274f, 0.44228869f}, {0.89974828f, 0.43640924f},
-{0.90258528f, 0.43051110f}, {0.90538362f, 0.42459451f},
-{0.90814317f, 0.41865974f}, {0.91086382f, 0.41270703f},
-{0.91354546f, 0.40673664f}, {0.91618796f, 0.40074883f},
-{0.91879121f, 0.39474386f}, {0.92135511f, 0.38872197f},
-{0.92387953f, 0.38268343f}, {0.92636438f, 0.37662850f},
-{0.92880955f, 0.37055744f}, {0.93121493f, 0.36447050f},
-{0.93358043f, 0.35836795f}, {0.93590593f, 0.35225005f},
-{0.93819134f, 0.34611706f}, {0.94043656f, 0.33996924f},
-{0.94264149f, 0.33380686f}, {0.94480605f, 0.32763018f},
-{0.94693013f, 0.32143947f}, {0.94901365f, 0.31523498f},
-{0.95105652f, 0.30901699f}, {0.95305864f, 0.30278577f},
-{0.95501994f, 0.29654157f}, {0.95694034f, 0.29028468f},
-{0.95881973f, 0.28401534f}, {0.96065806f, 0.27773385f},
-{0.96245524f, 0.27144045f}, {0.96421118f, 0.26513543f},
-{0.96592583f, 0.25881905f}, {0.96759909f, 0.25249158f},
-{0.96923091f, 0.24615329f}, {0.97082121f, 0.23980446f},
-{0.97236992f, 0.23344536f}, {0.97387698f, 0.22707626f},
-{0.97534232f, 0.22069744f}, {0.97676588f, 0.21430915f},
-{0.97814760f, 0.20791169f}, {0.97948742f, 0.20150532f},
-{0.98078528f, 0.19509032f}, {0.98204113f, 0.18866696f},
-{0.98325491f, 0.18223553f}, {0.98442657f, 0.17579628f},
-{0.98555606f, 0.16934950f}, {0.98664333f, 0.16289547f},
-{0.98768834f, 0.15643447f}, {0.98869104f, 0.14996676f},
-{0.98965139f, 0.14349262f}, {0.99056934f, 0.13701234f},
-{0.99144486f, 0.13052619f}, {0.99227791f, 0.12403445f},
-{0.99306846f, 0.11753740f}, {0.99381646f, 0.11103531f},
-{0.99452190f, 0.10452846f}, {0.99518473f, 0.098017140f},
-{0.99580493f, 0.091501619f}, {0.99638247f, 0.084982177f},
-{0.99691733f, 0.078459096f}, {0.99740949f, 0.071932653f},
-{0.99785892f, 0.065403129f}, {0.99826561f, 0.058870804f},
-{0.99862953f, 0.052335956f}, {0.99895068f, 0.045798867f},
-{0.99922904f, 0.039259816f}, {0.99946459f, 0.032719083f},
-{0.99965732f, 0.026176948f}, {0.99980724f, 0.019633692f},
-{0.99991433f, 0.013089596f}, {0.99997858f, 0.0065449380f},
+    {1.0000000f, -0.0000000f}, {0.99997858f, -0.0065449380f},
+    {0.99991433f, -0.013089596f}, {0.99980724f, -0.019633692f},
+    {0.99965732f, -0.026176948f}, {0.99946459f, -0.032719083f},
+    {0.99922904f, -0.039259816f}, {0.99895068f, -0.045798867f},
+    {0.99862953f, -0.052335956f}, {0.99826561f, -0.058870804f},
+    {0.99785892f, -0.065403129f}, {0.99740949f, -0.071932653f},
+    {0.99691733f, -0.078459096f}, {0.99638247f, -0.084982177f},
+    {0.99580493f, -0.091501619f}, {0.99518473f, -0.098017140f},
+    {0.99452190f, -0.10452846f}, {0.99381646f, -0.11103531f},
+    {0.99306846f, -0.11753740f}, {0.99227791f, -0.12403445f},
+    {0.99144486f, -0.13052619f}, {0.99056934f, -0.13701234f},
+    {0.98965139f, -0.14349262f}, {0.98869104f, -0.14996676f},
+    {0.98768834f, -0.15643447f}, {0.98664333f, -0.16289547f},
+    {0.98555606f, -0.16934950f}, {0.98442657f, -0.17579628f},
+    {0.98325491f, -0.18223553f}, {0.98204113f, -0.18866696f},
+    {0.98078528f, -0.19509032f}, {0.97948742f, -0.20150532f},
+    {0.97814760f, -0.20791169f}, {0.97676588f, -0.21430915f},
+    {0.97534232f, -0.22069744f}, {0.97387698f, -0.22707626f},
+    {0.97236992f, -0.23344536f}, {0.97082121f, -0.23980446f},
+    {0.96923091f, -0.24615329f}, {0.96759909f, -0.25249158f},
+    {0.96592583f, -0.25881905f}, {0.96421118f, -0.26513543f},
+    {0.96245524f, -0.27144045f}, {0.96065806f, -0.27773385f},
+    {0.95881973f, -0.28401534f}, {0.95694034f, -0.29028468f},
+    {0.95501994f, -0.29654157f}, {0.95305864f, -0.30278577f},
+    {0.95105652f, -0.30901699f}, {0.94901365f, -0.31523498f},
+    {0.94693013f, -0.32143947f}, {0.94480605f, -0.32763018f},
+    {0.94264149f, -0.33380686f}, {0.94043656f, -0.33996924f},
+    {0.93819134f, -0.34611706f}, {0.93590593f, -0.35225005f},
+    {0.93358043f, -0.35836795f}, {0.93121493f, -0.36447050f},
+    {0.92880955f, -0.37055744f}, {0.92636438f, -0.37662850f},
+    {0.92387953f, -0.38268343f}, {0.92135511f, -0.38872197f},
+    {0.91879121f, -0.39474386f}, {0.91618796f, -0.40074883f},
+    {0.91354546f, -0.40673664f}, {0.91086382f, -0.41270703f},
+    {0.90814317f, -0.41865974f}, {0.90538362f, -0.42459451f},
+    {0.90258528f, -0.43051110f}, {0.89974828f, -0.43640924f},
+    {0.89687274f, -0.44228869f}, {0.89395878f, -0.44814919f},
+    {0.89100652f, -0.45399050f}, {0.88801610f, -0.45981236f},
+    {0.88498764f, -0.46561452f}, {0.88192126f, -0.47139674f},
+    {0.87881711f, -0.47715876f}, {0.87567532f, -0.48290034f},
+    {0.87249601f, -0.48862124f}, {0.86927932f, -0.49432121f},
+    {0.86602540f, -0.50000000f}, {0.86273439f, -0.50565737f},
+    {0.85940641f, -0.51129309f}, {0.85604162f, -0.51690690f},
+    {0.85264016f, -0.52249856f}, {0.84920218f, -0.52806785f},
+    {0.84572782f, -0.53361452f}, {0.84221723f, -0.53913832f},
+    {0.83867057f, -0.54463904f}, {0.83508798f, -0.55011642f},
+    {0.83146961f, -0.55557023f}, {0.82781563f, -0.56100025f},
+    {0.82412619f, -0.56640624f}, {0.82040144f, -0.57178796f},
+    {0.81664156f, -0.57714519f}, {0.81284668f, -0.58247770f},
+    {0.80901699f, -0.58778525f}, {0.80515265f, -0.59306763f},
+    {0.80125381f, -0.59832460f}, {0.79732065f, -0.60355594f},
+    {0.79335334f, -0.60876143f}, {0.78935204f, -0.61394084f},
+    {0.78531693f, -0.61909395f}, {0.78124818f, -0.62422054f},
+    {0.77714596f, -0.62932039f}, {0.77301045f, -0.63439328f},
+    {0.76884183f, -0.63943900f}, {0.76464028f, -0.64445733f},
+    {0.76040597f, -0.64944805f}, {0.75613908f, -0.65441095f},
+    {0.75183981f, -0.65934582f}, {0.74750833f, -0.66425244f},
+    {0.74314483f, -0.66913061f}, {0.73874949f, -0.67398011f},
+    {0.73432251f, -0.67880075f}, {0.72986407f, -0.68359230f},
+    {0.72537437f, -0.68835458f}, {0.72085360f, -0.69308736f},
+    {0.71630194f, -0.69779046f}, {0.71171961f, -0.70246367f},
+    {0.70710678f, -0.70710678f}, {0.70246367f, -0.71171961f},
+    {0.69779046f, -0.71630194f}, {0.69308736f, -0.72085360f},
+    {0.68835458f, -0.72537437f}, {0.68359230f, -0.72986407f},
+    {0.67880075f, -0.73432251f}, {0.67398011f, -0.73874949f},
+    {0.66913061f, -0.74314483f}, {0.66425244f, -0.74750833f},
+    {0.65934582f, -0.75183981f}, {0.65441095f, -0.75613908f},
+    {0.64944805f, -0.76040597f}, {0.64445733f, -0.76464028f},
+    {0.63943900f, -0.76884183f}, {0.63439328f, -0.77301045f},
+    {0.62932039f, -0.77714596f}, {0.62422054f, -0.78124818f},
+    {0.61909395f, -0.78531693f}, {0.61394084f, -0.78935204f},
+    {0.60876143f, -0.79335334f}, {0.60355594f, -0.79732065f},
+    {0.59832460f, -0.80125381f}, {0.59306763f, -0.80515265f},
+    {0.58778525f, -0.80901699f}, {0.58247770f, -0.81284668f},
+    {0.57714519f, -0.81664156f}, {0.57178796f, -0.82040144f},
+    {0.56640624f, -0.82412619f}, {0.56100025f, -0.82781563f},
+    {0.55557023f, -0.83146961f}, {0.55011642f, -0.83508798f},
+    {0.54463904f, -0.83867057f}, {0.53913832f, -0.84221723f},
+    {0.53361452f, -0.84572782f}, {0.52806785f, -0.84920218f},
+    {0.52249856f, -0.85264016f}, {0.51690690f, -0.85604162f},
+    {0.51129309f, -0.85940641f}, {0.50565737f, -0.86273439f},
+    {0.50000000f, -0.86602540f}, {0.49432121f, -0.86927932f},
+    {0.48862124f, -0.87249601f}, {0.48290034f, -0.87567532f},
+    {0.47715876f, -0.87881711f}, {0.47139674f, -0.88192126f},
+    {0.46561452f, -0.88498764f}, {0.45981236f, -0.88801610f},
+    {0.45399050f, -0.89100652f}, {0.44814919f, -0.89395878f},
+    {0.44228869f, -0.89687274f}, {0.43640924f, -0.89974828f},
+    {0.43051110f, -0.90258528f}, {0.42459451f, -0.90538362f},
+    {0.41865974f, -0.90814317f}, {0.41270703f, -0.91086382f},
+    {0.40673664f, -0.91354546f}, {0.40074883f, -0.91618796f},
+    {0.39474386f, -0.91879121f}, {0.38872197f, -0.92135511f},
+    {0.38268343f, -0.92387953f}, {0.37662850f, -0.92636438f},
+    {0.37055744f, -0.92880955f}, {0.36447050f, -0.93121493f},
+    {0.35836795f, -0.93358043f}, {0.35225005f, -0.93590593f},
+    {0.34611706f, -0.93819134f}, {0.33996924f, -0.94043656f},
+    {0.33380686f, -0.94264149f}, {0.32763018f, -0.94480605f},
+    {0.32143947f, -0.94693013f}, {0.31523498f, -0.94901365f},
+    {0.30901699f, -0.95105652f}, {0.30278577f, -0.95305864f},
+    {0.29654157f, -0.95501994f}, {0.29028468f, -0.95694034f},
+    {0.28401534f, -0.95881973f}, {0.27773385f, -0.96065806f},
+    {0.27144045f, -0.96245524f}, {0.26513543f, -0.96421118f},
+    {0.25881905f, -0.96592583f}, {0.25249158f, -0.96759909f},
+    {0.24615329f, -0.96923091f}, {0.23980446f, -0.97082121f},
+    {0.23344536f, -0.97236992f}, {0.22707626f, -0.97387698f},
+    {0.22069744f, -0.97534232f}, {0.21430915f, -0.97676588f},
+    {0.20791169f, -0.97814760f}, {0.20150532f, -0.97948742f},
+    {0.19509032f, -0.98078528f}, {0.18866696f, -0.98204113f},
+    {0.18223553f, -0.98325491f}, {0.17579628f, -0.98442657f},
+    {0.16934950f, -0.98555606f}, {0.16289547f, -0.98664333f},
+    {0.15643447f, -0.98768834f}, {0.14996676f, -0.98869104f},
+    {0.14349262f, -0.98965139f}, {0.13701234f, -0.99056934f},
+    {0.13052619f, -0.99144486f}, {0.12403445f, -0.99227791f},
+    {0.11753740f, -0.99306846f}, {0.11103531f, -0.99381646f},
+    {0.10452846f, -0.99452190f}, {0.098017140f, -0.99518473f},
+    {0.091501619f, -0.99580493f}, {0.084982177f, -0.99638247f},
+    {0.078459096f, -0.99691733f}, {0.071932653f, -0.99740949f},
+    {0.065403129f, -0.99785892f}, {0.058870804f, -0.99826561f},
+    {0.052335956f, -0.99862953f}, {0.045798867f, -0.99895068f},
+    {0.039259816f, -0.99922904f}, {0.032719083f, -0.99946459f},
+    {0.026176948f, -0.99965732f}, {0.019633692f, -0.99980724f},
+    {0.013089596f, -0.99991433f}, {0.0065449380f, -0.99997858f},
+    {6.1232340e-17f, -1.0000000f}, {-0.0065449380f, -0.99997858f},
+    {-0.013089596f, -0.99991433f}, {-0.019633692f, -0.99980724f},
+    {-0.026176948f, -0.99965732f}, {-0.032719083f, -0.99946459f},
+    {-0.039259816f, -0.99922904f}, {-0.045798867f, -0.99895068f},
+    {-0.052335956f, -0.99862953f}, {-0.058870804f, -0.99826561f},
+    {-0.065403129f, -0.99785892f}, {-0.071932653f, -0.99740949f},
+    {-0.078459096f, -0.99691733f}, {-0.084982177f, -0.99638247f},
+    {-0.091501619f, -0.99580493f}, {-0.098017140f, -0.99518473f},
+    {-0.10452846f, -0.99452190f}, {-0.11103531f, -0.99381646f},
+    {-0.11753740f, -0.99306846f}, {-0.12403445f, -0.99227791f},
+    {-0.13052619f, -0.99144486f}, {-0.13701234f, -0.99056934f},
+    {-0.14349262f, -0.98965139f}, {-0.14996676f, -0.98869104f},
+    {-0.15643447f, -0.98768834f}, {-0.16289547f, -0.98664333f},
+    {-0.16934950f, -0.98555606f}, {-0.17579628f, -0.98442657f},
+    {-0.18223553f, -0.98325491f}, {-0.18866696f, -0.98204113f},
+    {-0.19509032f, -0.98078528f}, {-0.20150532f, -0.97948742f},
+    {-0.20791169f, -0.97814760f}, {-0.21430915f, -0.97676588f},
+    {-0.22069744f, -0.97534232f}, {-0.22707626f, -0.97387698f},
+    {-0.23344536f, -0.97236992f}, {-0.23980446f, -0.97082121f},
+    {-0.24615329f, -0.96923091f}, {-0.25249158f, -0.96759909f},
+    {-0.25881905f, -0.96592583f}, {-0.26513543f, -0.96421118f},
+    {-0.27144045f, -0.96245524f}, {-0.27773385f, -0.96065806f},
+    {-0.28401534f, -0.95881973f}, {-0.29028468f, -0.95694034f},
+    {-0.29654157f, -0.95501994f}, {-0.30278577f, -0.95305864f},
+    {-0.30901699f, -0.95105652f}, {-0.31523498f, -0.94901365f},
+    {-0.32143947f, -0.94693013f}, {-0.32763018f, -0.94480605f},
+    {-0.33380686f, -0.94264149f}, {-0.33996924f, -0.94043656f},
+    {-0.34611706f, -0.93819134f}, {-0.35225005f, -0.93590593f},
+    {-0.35836795f, -0.93358043f}, {-0.36447050f, -0.93121493f},
+    {-0.37055744f, -0.92880955f}, {-0.37662850f, -0.92636438f},
+    {-0.38268343f, -0.92387953f}, {-0.38872197f, -0.92135511f},
+    {-0.39474386f, -0.91879121f}, {-0.40074883f, -0.91618796f},
+    {-0.40673664f, -0.91354546f}, {-0.41270703f, -0.91086382f},
+    {-0.41865974f, -0.90814317f}, {-0.42459451f, -0.90538362f},
+    {-0.43051110f, -0.90258528f}, {-0.43640924f, -0.89974828f},
+    {-0.44228869f, -0.89687274f}, {-0.44814919f, -0.89395878f},
+    {-0.45399050f, -0.89100652f}, {-0.45981236f, -0.88801610f},
+    {-0.46561452f, -0.88498764f}, {-0.47139674f, -0.88192126f},
+    {-0.47715876f, -0.87881711f}, {-0.48290034f, -0.87567532f},
+    {-0.48862124f, -0.87249601f}, {-0.49432121f, -0.86927932f},
+    {-0.50000000f, -0.86602540f}, {-0.50565737f, -0.86273439f},
+    {-0.51129309f, -0.85940641f}, {-0.51690690f, -0.85604162f},
+    {-0.52249856f, -0.85264016f}, {-0.52806785f, -0.84920218f},
+    {-0.53361452f, -0.84572782f}, {-0.53913832f, -0.84221723f},
+    {-0.54463904f, -0.83867057f}, {-0.55011642f, -0.83508798f},
+    {-0.55557023f, -0.83146961f}, {-0.56100025f, -0.82781563f},
+    {-0.56640624f, -0.82412619f}, {-0.57178796f, -0.82040144f},
+    {-0.57714519f, -0.81664156f}, {-0.58247770f, -0.81284668f},
+    {-0.58778525f, -0.80901699f}, {-0.59306763f, -0.80515265f},
+    {-0.59832460f, -0.80125381f}, {-0.60355594f, -0.79732065f},
+    {-0.60876143f, -0.79335334f}, {-0.61394084f, -0.78935204f},
+    {-0.61909395f, -0.78531693f}, {-0.62422054f, -0.78124818f},
+    {-0.62932039f, -0.77714596f}, {-0.63439328f, -0.77301045f},
+    {-0.63943900f, -0.76884183f}, {-0.64445733f, -0.76464028f},
+    {-0.64944805f, -0.76040597f}, {-0.65441095f, -0.75613908f},
+    {-0.65934582f, -0.75183981f}, {-0.66425244f, -0.74750833f},
+    {-0.66913061f, -0.74314483f}, {-0.67398011f, -0.73874949f},
+    {-0.67880075f, -0.73432251f}, {-0.68359230f, -0.72986407f},
+    {-0.68835458f, -0.72537437f}, {-0.69308736f, -0.72085360f},
+    {-0.69779046f, -0.71630194f}, {-0.70246367f, -0.71171961f},
+    {-0.70710678f, -0.70710678f}, {-0.71171961f, -0.70246367f},
+    {-0.71630194f, -0.69779046f}, {-0.72085360f, -0.69308736f},
+    {-0.72537437f, -0.68835458f}, {-0.72986407f, -0.68359230f},
+    {-0.73432251f, -0.67880075f}, {-0.73874949f, -0.67398011f},
+    {-0.74314483f, -0.66913061f}, {-0.74750833f, -0.66425244f},
+    {-0.75183981f, -0.65934582f}, {-0.75613908f, -0.65441095f},
+    {-0.76040597f, -0.64944805f}, {-0.76464028f, -0.64445733f},
+    {-0.76884183f, -0.63943900f}, {-0.77301045f, -0.63439328f},
+    {-0.77714596f, -0.62932039f}, {-0.78124818f, -0.62422054f},
+    {-0.78531693f, -0.61909395f}, {-0.78935204f, -0.61394084f},
+    {-0.79335334f, -0.60876143f}, {-0.79732065f, -0.60355594f},
+    {-0.80125381f, -0.59832460f}, {-0.80515265f, -0.59306763f},
+    {-0.80901699f, -0.58778525f}, {-0.81284668f, -0.58247770f},
+    {-0.81664156f, -0.57714519f}, {-0.82040144f, -0.57178796f},
+    {-0.82412619f, -0.56640624f}, {-0.82781563f, -0.56100025f},
+    {-0.83146961f, -0.55557023f}, {-0.83508798f, -0.55011642f},
+    {-0.83867057f, -0.54463904f}, {-0.84221723f, -0.53913832f},
+    {-0.84572782f, -0.53361452f}, {-0.84920218f, -0.52806785f},
+    {-0.85264016f, -0.52249856f}, {-0.85604162f, -0.51690690f},
+    {-0.85940641f, -0.51129309f}, {-0.86273439f, -0.50565737f},
+    {-0.86602540f, -0.50000000f}, {-0.86927932f, -0.49432121f},
+    {-0.87249601f, -0.48862124f}, {-0.87567532f, -0.48290034f},
+    {-0.87881711f, -0.47715876f}, {-0.88192126f, -0.47139674f},
+    {-0.88498764f, -0.46561452f}, {-0.88801610f, -0.45981236f},
+    {-0.89100652f, -0.45399050f}, {-0.89395878f, -0.44814919f},
+    {-0.89687274f, -0.44228869f}, {-0.89974828f, -0.43640924f},
+    {-0.90258528f, -0.43051110f}, {-0.90538362f, -0.42459451f},
+    {-0.90814317f, -0.41865974f}, {-0.91086382f, -0.41270703f},
+    {-0.91354546f, -0.40673664f}, {-0.91618796f, -0.40074883f},
+    {-0.91879121f, -0.39474386f}, {-0.92135511f, -0.38872197f},
+    {-0.92387953f, -0.38268343f}, {-0.92636438f, -0.37662850f},
+    {-0.92880955f, -0.37055744f}, {-0.93121493f, -0.36447050f},
+    {-0.93358043f, -0.35836795f}, {-0.93590593f, -0.35225005f},
+    {-0.93819134f, -0.34611706f}, {-0.94043656f, -0.33996924f},
+    {-0.94264149f, -0.33380686f}, {-0.94480605f, -0.32763018f},
+    {-0.94693013f, -0.32143947f}, {-0.94901365f, -0.31523498f},
+    {-0.95105652f, -0.30901699f}, {-0.95305864f, -0.30278577f},
+    {-0.95501994f, -0.29654157f}, {-0.95694034f, -0.29028468f},
+    {-0.95881973f, -0.28401534f}, {-0.96065806f, -0.27773385f},
+    {-0.96245524f, -0.27144045f}, {-0.96421118f, -0.26513543f},
+    {-0.96592583f, -0.25881905f}, {-0.96759909f, -0.25249158f},
+    {-0.96923091f, -0.24615329f}, {-0.97082121f, -0.23980446f},
+    {-0.97236992f, -0.23344536f}, {-0.97387698f, -0.22707626f},
+    {-0.97534232f, -0.22069744f}, {-0.97676588f, -0.21430915f},
+    {-0.97814760f, -0.20791169f}, {-0.97948742f, -0.20150532f},
+    {-0.98078528f, -0.19509032f}, {-0.98204113f, -0.18866696f},
+    {-0.98325491f, -0.18223553f}, {-0.98442657f, -0.17579628f},
+    {-0.98555606f, -0.16934950f}, {-0.98664333f, -0.16289547f},
+    {-0.98768834f, -0.15643447f}, {-0.98869104f, -0.14996676f},
+    {-0.98965139f, -0.14349262f}, {-0.99056934f, -0.13701234f},
+    {-0.99144486f, -0.13052619f}, {-0.99227791f, -0.12403445f},
+    {-0.99306846f, -0.11753740f}, {-0.99381646f, -0.11103531f},
+    {-0.99452190f, -0.10452846f}, {-0.99518473f, -0.098017140f},
+    {-0.99580493f, -0.091501619f}, {-0.99638247f, -0.084982177f},
+    {-0.99691733f, -0.078459096f}, {-0.99740949f, -0.071932653f},
+    {-0.99785892f, -0.065403129f}, {-0.99826561f, -0.058870804f},
+    {-0.99862953f, -0.052335956f}, {-0.99895068f, -0.045798867f},
+    {-0.99922904f, -0.039259816f}, {-0.99946459f, -0.032719083f},
+    {-0.99965732f, -0.026176948f}, {-0.99980724f, -0.019633692f},
+    {-0.99991433f, -0.013089596f}, {-0.99997858f, -0.0065449380f},
+    {-1.0000000f, -1.2246468e-16f}, {-0.99997858f, 0.0065449380f},
+    {-0.99991433f, 0.013089596f}, {-0.99980724f, 0.019633692f},
+    {-0.99965732f, 0.026176948f}, {-0.99946459f, 0.032719083f},
+    {-0.99922904f, 0.039259816f}, {-0.99895068f, 0.045798867f},
+    {-0.99862953f, 0.052335956f}, {-0.99826561f, 0.058870804f},
+    {-0.99785892f, 0.065403129f}, {-0.99740949f, 0.071932653f},
+    {-0.99691733f, 0.078459096f}, {-0.99638247f, 0.084982177f},
+    {-0.99580493f, 0.091501619f}, {-0.99518473f, 0.098017140f},
+    {-0.99452190f, 0.10452846f}, {-0.99381646f, 0.11103531f},
+    {-0.99306846f, 0.11753740f}, {-0.99227791f, 0.12403445f},
+    {-0.99144486f, 0.13052619f}, {-0.99056934f, 0.13701234f},
+    {-0.98965139f, 0.14349262f}, {-0.98869104f, 0.14996676f},
+    {-0.98768834f, 0.15643447f}, {-0.98664333f, 0.16289547f},
+    {-0.98555606f, 0.16934950f}, {-0.98442657f, 0.17579628f},
+    {-0.98325491f, 0.18223553f}, {-0.98204113f, 0.18866696f},
+    {-0.98078528f, 0.19509032f}, {-0.97948742f, 0.20150532f},
+    {-0.97814760f, 0.20791169f}, {-0.97676588f, 0.21430915f},
+    {-0.97534232f, 0.22069744f}, {-0.97387698f, 0.22707626f},
+    {-0.97236992f, 0.23344536f}, {-0.97082121f, 0.23980446f},
+    {-0.96923091f, 0.24615329f}, {-0.96759909f, 0.25249158f},
+    {-0.96592583f, 0.25881905f}, {-0.96421118f, 0.26513543f},
+    {-0.96245524f, 0.27144045f}, {-0.96065806f, 0.27773385f},
+    {-0.95881973f, 0.28401534f}, {-0.95694034f, 0.29028468f},
+    {-0.95501994f, 0.29654157f}, {-0.95305864f, 0.30278577f},
+    {-0.95105652f, 0.30901699f}, {-0.94901365f, 0.31523498f},
+    {-0.94693013f, 0.32143947f}, {-0.94480605f, 0.32763018f},
+    {-0.94264149f, 0.33380686f}, {-0.94043656f, 0.33996924f},
+    {-0.93819134f, 0.34611706f}, {-0.93590593f, 0.35225005f},
+    {-0.93358043f, 0.35836795f}, {-0.93121493f, 0.36447050f},
+    {-0.92880955f, 0.37055744f}, {-0.92636438f, 0.37662850f},
+    {-0.92387953f, 0.38268343f}, {-0.92135511f, 0.38872197f},
+    {-0.91879121f, 0.39474386f}, {-0.91618796f, 0.40074883f},
+    {-0.91354546f, 0.40673664f}, {-0.91086382f, 0.41270703f},
+    {-0.90814317f, 0.41865974f}, {-0.90538362f, 0.42459451f},
+    {-0.90258528f, 0.43051110f}, {-0.89974828f, 0.43640924f},
+    {-0.89687274f, 0.44228869f}, {-0.89395878f, 0.44814919f},
+    {-0.89100652f, 0.45399050f}, {-0.88801610f, 0.45981236f},
+    {-0.88498764f, 0.46561452f}, {-0.88192126f, 0.47139674f},
+    {-0.87881711f, 0.47715876f}, {-0.87567532f, 0.48290034f},
+    {-0.87249601f, 0.48862124f}, {-0.86927932f, 0.49432121f},
+    {-0.86602540f, 0.50000000f}, {-0.86273439f, 0.50565737f},
+    {-0.85940641f, 0.51129309f}, {-0.85604162f, 0.51690690f},
+    {-0.85264016f, 0.52249856f}, {-0.84920218f, 0.52806785f},
+    {-0.84572782f, 0.53361452f}, {-0.84221723f, 0.53913832f},
+    {-0.83867057f, 0.54463904f}, {-0.83508798f, 0.55011642f},
+    {-0.83146961f, 0.55557023f}, {-0.82781563f, 0.56100025f},
+    {-0.82412619f, 0.56640624f}, {-0.82040144f, 0.57178796f},
+    {-0.81664156f, 0.57714519f}, {-0.81284668f, 0.58247770f},
+    {-0.80901699f, 0.58778525f}, {-0.80515265f, 0.59306763f},
+    {-0.80125381f, 0.59832460f}, {-0.79732065f, 0.60355594f},
+    {-0.79335334f, 0.60876143f}, {-0.78935204f, 0.61394084f},
+    {-0.78531693f, 0.61909395f}, {-0.78124818f, 0.62422054f},
+    {-0.77714596f, 0.62932039f}, {-0.77301045f, 0.63439328f},
+    {-0.76884183f, 0.63943900f}, {-0.76464028f, 0.64445733f},
+    {-0.76040597f, 0.64944805f}, {-0.75613908f, 0.65441095f},
+    {-0.75183981f, 0.65934582f}, {-0.74750833f, 0.66425244f},
+    {-0.74314483f, 0.66913061f}, {-0.73874949f, 0.67398011f},
+    {-0.73432251f, 0.67880075f}, {-0.72986407f, 0.68359230f},
+    {-0.72537437f, 0.68835458f}, {-0.72085360f, 0.69308736f},
+    {-0.71630194f, 0.69779046f}, {-0.71171961f, 0.70246367f},
+    {-0.70710678f, 0.70710678f}, {-0.70246367f, 0.71171961f},
+    {-0.69779046f, 0.71630194f}, {-0.69308736f, 0.72085360f},
+    {-0.68835458f, 0.72537437f}, {-0.68359230f, 0.72986407f},
+    {-0.67880075f, 0.73432251f}, {-0.67398011f, 0.73874949f},
+    {-0.66913061f, 0.74314483f}, {-0.66425244f, 0.74750833f},
+    {-0.65934582f, 0.75183981f}, {-0.65441095f, 0.75613908f},
+    {-0.64944805f, 0.76040597f}, {-0.64445733f, 0.76464028f},
+    {-0.63943900f, 0.76884183f}, {-0.63439328f, 0.77301045f},
+    {-0.62932039f, 0.77714596f}, {-0.62422054f, 0.78124818f},
+    {-0.61909395f, 0.78531693f}, {-0.61394084f, 0.78935204f},
+    {-0.60876143f, 0.79335334f}, {-0.60355594f, 0.79732065f},
+    {-0.59832460f, 0.80125381f}, {-0.59306763f, 0.80515265f},
+    {-0.58778525f, 0.80901699f}, {-0.58247770f, 0.81284668f},
+    {-0.57714519f, 0.81664156f}, {-0.57178796f, 0.82040144f},
+    {-0.56640624f, 0.82412619f}, {-0.56100025f, 0.82781563f},
+    {-0.55557023f, 0.83146961f}, {-0.55011642f, 0.83508798f},
+    {-0.54463904f, 0.83867057f}, {-0.53913832f, 0.84221723f},
+    {-0.53361452f, 0.84572782f}, {-0.52806785f, 0.84920218f},
+    {-0.52249856f, 0.85264016f}, {-0.51690690f, 0.85604162f},
+    {-0.51129309f, 0.85940641f}, {-0.50565737f, 0.86273439f},
+    {-0.50000000f, 0.86602540f}, {-0.49432121f, 0.86927932f},
+    {-0.48862124f, 0.87249601f}, {-0.48290034f, 0.87567532f},
+    {-0.47715876f, 0.87881711f}, {-0.47139674f, 0.88192126f},
+    {-0.46561452f, 0.88498764f}, {-0.45981236f, 0.88801610f},
+    {-0.45399050f, 0.89100652f}, {-0.44814919f, 0.89395878f},
+    {-0.44228869f, 0.89687274f}, {-0.43640924f, 0.89974828f},
+    {-0.43051110f, 0.90258528f}, {-0.42459451f, 0.90538362f},
+    {-0.41865974f, 0.90814317f}, {-0.41270703f, 0.91086382f},
+    {-0.40673664f, 0.91354546f}, {-0.40074883f, 0.91618796f},
+    {-0.39474386f, 0.91879121f}, {-0.38872197f, 0.92135511f},
+    {-0.38268343f, 0.92387953f}, {-0.37662850f, 0.92636438f},
+    {-0.37055744f, 0.92880955f}, {-0.36447050f, 0.93121493f},
+    {-0.35836795f, 0.93358043f}, {-0.35225005f, 0.93590593f},
+    {-0.34611706f, 0.93819134f}, {-0.33996924f, 0.94043656f},
+    {-0.33380686f, 0.94264149f}, {-0.32763018f, 0.94480605f},
+    {-0.32143947f, 0.94693013f}, {-0.31523498f, 0.94901365f},
+    {-0.30901699f, 0.95105652f}, {-0.30278577f, 0.95305864f},
+    {-0.29654157f, 0.95501994f}, {-0.29028468f, 0.95694034f},
+    {-0.28401534f, 0.95881973f}, {-0.27773385f, 0.96065806f},
+    {-0.27144045f, 0.96245524f}, {-0.26513543f, 0.96421118f},
+    {-0.25881905f, 0.96592583f}, {-0.25249158f, 0.96759909f},
+    {-0.24615329f, 0.96923091f}, {-0.23980446f, 0.97082121f},
+    {-0.23344536f, 0.97236992f}, {-0.22707626f, 0.97387698f},
+    {-0.22069744f, 0.97534232f}, {-0.21430915f, 0.97676588f},
+    {-0.20791169f, 0.97814760f}, {-0.20150532f, 0.97948742f},
+    {-0.19509032f, 0.98078528f}, {-0.18866696f, 0.98204113f},
+    {-0.18223553f, 0.98325491f}, {-0.17579628f, 0.98442657f},
+    {-0.16934950f, 0.98555606f}, {-0.16289547f, 0.98664333f},
+    {-0.15643447f, 0.98768834f}, {-0.14996676f, 0.98869104f},
+    {-0.14349262f, 0.98965139f}, {-0.13701234f, 0.99056934f},
+    {-0.13052619f, 0.99144486f}, {-0.12403445f, 0.99227791f},
+    {-0.11753740f, 0.99306846f}, {-0.11103531f, 0.99381646f},
+    {-0.10452846f, 0.99452190f}, {-0.098017140f, 0.99518473f},
+    {-0.091501619f, 0.99580493f}, {-0.084982177f, 0.99638247f},
+    {-0.078459096f, 0.99691733f}, {-0.071932653f, 0.99740949f},
+    {-0.065403129f, 0.99785892f}, {-0.058870804f, 0.99826561f},
+    {-0.052335956f, 0.99862953f}, {-0.045798867f, 0.99895068f},
+    {-0.039259816f, 0.99922904f}, {-0.032719083f, 0.99946459f},
+    {-0.026176948f, 0.99965732f}, {-0.019633692f, 0.99980724f},
+    {-0.013089596f, 0.99991433f}, {-0.0065449380f, 0.99997858f},
+    {-1.8369702e-16f, 1.0000000f}, {0.0065449380f, 0.99997858f},
+    {0.013089596f, 0.99991433f}, {0.019633692f, 0.99980724f},
+    {0.026176948f, 0.99965732f}, {0.032719083f, 0.99946459f},
+    {0.039259816f, 0.99922904f}, {0.045798867f, 0.99895068f},
+    {0.052335956f, 0.99862953f}, {0.058870804f, 0.99826561f},
+    {0.065403129f, 0.99785892f}, {0.071932653f, 0.99740949f},
+    {0.078459096f, 0.99691733f}, {0.084982177f, 0.99638247f},
+    {0.091501619f, 0.99580493f}, {0.098017140f, 0.99518473f},
+    {0.10452846f, 0.99452190f}, {0.11103531f, 0.99381646f},
+    {0.11753740f, 0.99306846f}, {0.12403445f, 0.99227791f},
+    {0.13052619f, 0.99144486f}, {0.13701234f, 0.99056934f},
+    {0.14349262f, 0.98965139f}, {0.14996676f, 0.98869104f},
+    {0.15643447f, 0.98768834f}, {0.16289547f, 0.98664333f},
+    {0.16934950f, 0.98555606f}, {0.17579628f, 0.98442657f},
+    {0.18223553f, 0.98325491f}, {0.18866696f, 0.98204113f},
+    {0.19509032f, 0.98078528f}, {0.20150532f, 0.97948742f},
+    {0.20791169f, 0.97814760f}, {0.21430915f, 0.97676588f},
+    {0.22069744f, 0.97534232f}, {0.22707626f, 0.97387698f},
+    {0.23344536f, 0.97236992f}, {0.23980446f, 0.97082121f},
+    {0.24615329f, 0.96923091f}, {0.25249158f, 0.96759909f},
+    {0.25881905f, 0.96592583f}, {0.26513543f, 0.96421118f},
+    {0.27144045f, 0.96245524f}, {0.27773385f, 0.96065806f},
+    {0.28401534f, 0.95881973f}, {0.29028468f, 0.95694034f},
+    {0.29654157f, 0.95501994f}, {0.30278577f, 0.95305864f},
+    {0.30901699f, 0.95105652f}, {0.31523498f, 0.94901365f},
+    {0.32143947f, 0.94693013f}, {0.32763018f, 0.94480605f},
+    {0.33380686f, 0.94264149f}, {0.33996924f, 0.94043656f},
+    {0.34611706f, 0.93819134f}, {0.35225005f, 0.93590593f},
+    {0.35836795f, 0.93358043f}, {0.36447050f, 0.93121493f},
+    {0.37055744f, 0.92880955f}, {0.37662850f, 0.92636438f},
+    {0.38268343f, 0.92387953f}, {0.38872197f, 0.92135511f},
+    {0.39474386f, 0.91879121f}, {0.40074883f, 0.91618796f},
+    {0.40673664f, 0.91354546f}, {0.41270703f, 0.91086382f},
+    {0.41865974f, 0.90814317f}, {0.42459451f, 0.90538362f},
+    {0.43051110f, 0.90258528f}, {0.43640924f, 0.89974828f},
+    {0.44228869f, 0.89687274f}, {0.44814919f, 0.89395878f},
+    {0.45399050f, 0.89100652f}, {0.45981236f, 0.88801610f},
+    {0.46561452f, 0.88498764f}, {0.47139674f, 0.88192126f},
+    {0.47715876f, 0.87881711f}, {0.48290034f, 0.87567532f},
+    {0.48862124f, 0.87249601f}, {0.49432121f, 0.86927932f},
+    {0.50000000f, 0.86602540f}, {0.50565737f, 0.86273439f},
+    {0.51129309f, 0.85940641f}, {0.51690690f, 0.85604162f},
+    {0.52249856f, 0.85264016f}, {0.52806785f, 0.84920218f},
+    {0.53361452f, 0.84572782f}, {0.53913832f, 0.84221723f},
+    {0.54463904f, 0.83867057f}, {0.55011642f, 0.83508798f},
+    {0.55557023f, 0.83146961f}, {0.56100025f, 0.82781563f},
+    {0.56640624f, 0.82412619f}, {0.57178796f, 0.82040144f},
+    {0.57714519f, 0.81664156f}, {0.58247770f, 0.81284668f},
+    {0.58778525f, 0.80901699f}, {0.59306763f, 0.80515265f},
+    {0.59832460f, 0.80125381f}, {0.60355594f, 0.79732065f},
+    {0.60876143f, 0.79335334f}, {0.61394084f, 0.78935204f},
+    {0.61909395f, 0.78531693f}, {0.62422054f, 0.78124818f},
+    {0.62932039f, 0.77714596f}, {0.63439328f, 0.77301045f},
+    {0.63943900f, 0.76884183f}, {0.64445733f, 0.76464028f},
+    {0.64944805f, 0.76040597f}, {0.65441095f, 0.75613908f},
+    {0.65934582f, 0.75183981f}, {0.66425244f, 0.74750833f},
+    {0.66913061f, 0.74314483f}, {0.67398011f, 0.73874949f},
+    {0.67880075f, 0.73432251f}, {0.68359230f, 0.72986407f},
+    {0.68835458f, 0.72537437f}, {0.69308736f, 0.72085360f},
+    {0.69779046f, 0.71630194f}, {0.70246367f, 0.71171961f},
+    {0.70710678f, 0.70710678f}, {0.71171961f, 0.70246367f},
+    {0.71630194f, 0.69779046f}, {0.72085360f, 0.69308736f},
+    {0.72537437f, 0.68835458f}, {0.72986407f, 0.68359230f},
+    {0.73432251f, 0.67880075f}, {0.73874949f, 0.67398011f},
+    {0.74314483f, 0.66913061f}, {0.74750833f, 0.66425244f},
+    {0.75183981f, 0.65934582f}, {0.75613908f, 0.65441095f},
+    {0.76040597f, 0.64944805f}, {0.76464028f, 0.64445733f},
+    {0.76884183f, 0.63943900f}, {0.77301045f, 0.63439328f},
+    {0.77714596f, 0.62932039f}, {0.78124818f, 0.62422054f},
+    {0.78531693f, 0.61909395f}, {0.78935204f, 0.61394084f},
+    {0.79335334f, 0.60876143f}, {0.79732065f, 0.60355594f},
+    {0.80125381f, 0.59832460f}, {0.80515265f, 0.59306763f},
+    {0.80901699f, 0.58778525f}, {0.81284668f, 0.58247770f},
+    {0.81664156f, 0.57714519f}, {0.82040144f, 0.57178796f},
+    {0.82412619f, 0.56640624f}, {0.82781563f, 0.56100025f},
+    {0.83146961f, 0.55557023f}, {0.83508798f, 0.55011642f},
+    {0.83867057f, 0.54463904f}, {0.84221723f, 0.53913832f},
+    {0.84572782f, 0.53361452f}, {0.84920218f, 0.52806785f},
+    {0.85264016f, 0.52249856f}, {0.85604162f, 0.51690690f},
+    {0.85940641f, 0.51129309f}, {0.86273439f, 0.50565737f},
+    {0.86602540f, 0.50000000f}, {0.86927932f, 0.49432121f},
+    {0.87249601f, 0.48862124f}, {0.87567532f, 0.48290034f},
+    {0.87881711f, 0.47715876f}, {0.88192126f, 0.47139674f},
+    {0.88498764f, 0.46561452f}, {0.88801610f, 0.45981236f},
+    {0.89100652f, 0.45399050f}, {0.89395878f, 0.44814919f},
+    {0.89687274f, 0.44228869f}, {0.89974828f, 0.43640924f},
+    {0.90258528f, 0.43051110f}, {0.90538362f, 0.42459451f},
+    {0.90814317f, 0.41865974f}, {0.91086382f, 0.41270703f},
+    {0.91354546f, 0.40673664f}, {0.91618796f, 0.40074883f},
+    {0.91879121f, 0.39474386f}, {0.92135511f, 0.38872197f},
+    {0.92387953f, 0.38268343f}, {0.92636438f, 0.37662850f},
+    {0.92880955f, 0.37055744f}, {0.93121493f, 0.36447050f},
+    {0.93358043f, 0.35836795f}, {0.93590593f, 0.35225005f},
+    {0.93819134f, 0.34611706f}, {0.94043656f, 0.33996924f},
+    {0.94264149f, 0.33380686f}, {0.94480605f, 0.32763018f},
+    {0.94693013f, 0.32143947f}, {0.94901365f, 0.31523498f},
+    {0.95105652f, 0.30901699f}, {0.95305864f, 0.30278577f},
+    {0.95501994f, 0.29654157f}, {0.95694034f, 0.29028468f},
+    {0.95881973f, 0.28401534f}, {0.96065806f, 0.27773385f},
+    {0.96245524f, 0.27144045f}, {0.96421118f, 0.26513543f},
+    {0.96592583f, 0.25881905f}, {0.96759909f, 0.25249158f},
+    {0.96923091f, 0.24615329f}, {0.97082121f, 0.23980446f},
+    {0.97236992f, 0.23344536f}, {0.97387698f, 0.22707626f},
+    {0.97534232f, 0.22069744f}, {0.97676588f, 0.21430915f},
+    {0.97814760f, 0.20791169f}, {0.97948742f, 0.20150532f},
+    {0.98078528f, 0.19509032f}, {0.98204113f, 0.18866696f},
+    {0.98325491f, 0.18223553f}, {0.98442657f, 0.17579628f},
+    {0.98555606f, 0.16934950f}, {0.98664333f, 0.16289547f},
+    {0.98768834f, 0.15643447f}, {0.98869104f, 0.14996676f},
+    {0.98965139f, 0.14349262f}, {0.99056934f, 0.13701234f},
+    {0.99144486f, 0.13052619f}, {0.99227791f, 0.12403445f},
+    {0.99306846f, 0.11753740f}, {0.99381646f, 0.11103531f},
+    {0.99452190f, 0.10452846f}, {0.99518473f, 0.098017140f},
+    {0.99580493f, 0.091501619f}, {0.99638247f, 0.084982177f},
+    {0.99691733f, 0.078459096f}, {0.99740949f, 0.071932653f},
+    {0.99785892f, 0.065403129f}, {0.99826561f, 0.058870804f},
+    {0.99862953f, 0.052335956f}, {0.99895068f, 0.045798867f},
+    {0.99922904f, 0.039259816f}, {0.99946459f, 0.032719083f},
+    {0.99965732f, 0.026176948f}, {0.99980724f, 0.019633692f},
+    {0.99991433f, 0.013089596f}, {0.99997858f, 0.0065449380f},
 };
-#ifndef FFT_BITREV960
-#define FFT_BITREV960
+#  ifndef FFT_BITREV960
+#   define FFT_BITREV960
 static const oac_int16 fft_bitrev960[960] = {
-0, 192, 384, 576, 768, 64, 256, 448, 640, 832, 128, 320, 512, 704, 896,
-16, 208, 400, 592, 784, 80, 272, 464, 656, 848, 144, 336, 528, 720, 912,
-32, 224, 416, 608, 800, 96, 288, 480, 672, 864, 160, 352, 544, 736, 928,
-48, 240, 432, 624, 816, 112, 304, 496, 688, 880, 176, 368, 560, 752, 944,
-4, 196, 388, 580, 772, 68, 260, 452, 644, 836, 132, 324, 516, 708, 900,
-20, 212, 404, 596, 788, 84, 276, 468, 660, 852, 148, 340, 532, 724, 916,
-36, 228, 420, 612, 804, 100, 292, 484, 676, 868, 164, 356, 548, 740, 932,
-52, 244, 436, 628, 820, 116, 308, 500, 692, 884, 180, 372, 564, 756, 948,
-8, 200, 392, 584, 776, 72, 264, 456, 648, 840, 136, 328, 520, 712, 904,
-24, 216, 408, 600, 792, 88, 280, 472, 664, 856, 152, 344, 536, 728, 920,
-40, 232, 424, 616, 808, 104, 296, 488, 680, 872, 168, 360, 552, 744, 936,
-56, 248, 440, 632, 824, 120, 312, 504, 696, 888, 184, 376, 568, 760, 952,
-12, 204, 396, 588, 780, 76, 268, 460, 652, 844, 140, 332, 524, 716, 908,
-28, 220, 412, 604, 796, 92, 284, 476, 668, 860, 156, 348, 540, 732, 924,
-44, 236, 428, 620, 812, 108, 300, 492, 684, 876, 172, 364, 556, 748, 940,
-60, 252, 444, 636, 828, 124, 316, 508, 700, 892, 188, 380, 572, 764, 956,
-1, 193, 385, 577, 769, 65, 257, 449, 641, 833, 129, 321, 513, 705, 897,
-17, 209, 401, 593, 785, 81, 273, 465, 657, 849, 145, 337, 529, 721, 913,
-33, 225, 417, 609, 801, 97, 289, 481, 673, 865, 161, 353, 545, 737, 929,
-49, 241, 433, 625, 817, 113, 305, 497, 689, 881, 177, 369, 561, 753, 945,
-5, 197, 389, 581, 773, 69, 261, 453, 645, 837, 133, 325, 517, 709, 901,
-21, 213, 405, 597, 789, 85, 277, 469, 661, 853, 149, 341, 533, 725, 917,
-37, 229, 421, 613, 805, 101, 293, 485, 677, 869, 165, 357, 549, 741, 933,
-53, 245, 437, 629, 821, 117, 309, 501, 693, 885, 181, 373, 565, 757, 949,
-9, 201, 393, 585, 777, 73, 265, 457, 649, 841, 137, 329, 521, 713, 905,
-25, 217, 409, 601, 793, 89, 281, 473, 665, 857, 153, 345, 537, 729, 921,
-41, 233, 425, 617, 809, 105, 297, 489, 681, 873, 169, 361, 553, 745, 937,
-57, 249, 441, 633, 825, 121, 313, 505, 697, 889, 185, 377, 569, 761, 953,
-13, 205, 397, 589, 781, 77, 269, 461, 653, 845, 141, 333, 525, 717, 909,
-29, 221, 413, 605, 797, 93, 285, 477, 669, 861, 157, 349, 541, 733, 925,
-45, 237, 429, 621, 813, 109, 301, 493, 685, 877, 173, 365, 557, 749, 941,
-61, 253, 445, 637, 829, 125, 317, 509, 701, 893, 189, 381, 573, 765, 957,
-2, 194, 386, 578, 770, 66, 258, 450, 642, 834, 130, 322, 514, 706, 898,
-18, 210, 402, 594, 786, 82, 274, 466, 658, 850, 146, 338, 530, 722, 914,
-34, 226, 418, 610, 802, 98, 290, 482, 674, 866, 162, 354, 546, 738, 930,
-50, 242, 434, 626, 818, 114, 306, 498, 690, 882, 178, 370, 562, 754, 946,
-6, 198, 390, 582, 774, 70, 262, 454, 646, 838, 134, 326, 518, 710, 902,
-22, 214, 406, 598, 790, 86, 278, 470, 662, 854, 150, 342, 534, 726, 918,
-38, 230, 422, 614, 806, 102, 294, 486, 678, 870, 166, 358, 550, 742, 934,
-54, 246, 438, 630, 822, 118, 310, 502, 694, 886, 182, 374, 566, 758, 950,
-10, 202, 394, 586, 778, 74, 266, 458, 650, 842, 138, 330, 522, 714, 906,
-26, 218, 410, 602, 794, 90, 282, 474, 666, 858, 154, 346, 538, 730, 922,
-42, 234, 426, 618, 810, 106, 298, 490, 682, 874, 170, 362, 554, 746, 938,
-58, 250, 442, 634, 826, 122, 314, 506, 698, 890, 186, 378, 570, 762, 954,
-14, 206, 398, 590, 782, 78, 270, 462, 654, 846, 142, 334, 526, 718, 910,
-30, 222, 414, 606, 798, 94, 286, 478, 670, 862, 158, 350, 542, 734, 926,
-46, 238, 430, 622, 814, 110, 302, 494, 686, 878, 174, 366, 558, 750, 942,
-62, 254, 446, 638, 830, 126, 318, 510, 702, 894, 190, 382, 574, 766, 958,
-3, 195, 387, 579, 771, 67, 259, 451, 643, 835, 131, 323, 515, 707, 899,
-19, 211, 403, 595, 787, 83, 275, 467, 659, 851, 147, 339, 531, 723, 915,
-35, 227, 419, 611, 803, 99, 291, 483, 675, 867, 163, 355, 547, 739, 931,
-51, 243, 435, 627, 819, 115, 307, 499, 691, 883, 179, 371, 563, 755, 947,
-7, 199, 391, 583, 775, 71, 263, 455, 647, 839, 135, 327, 519, 711, 903,
-23, 215, 407, 599, 791, 87, 279, 471, 663, 855, 151, 343, 535, 727, 919,
-39, 231, 423, 615, 807, 103, 295, 487, 679, 871, 167, 359, 551, 743, 935,
-55, 247, 439, 631, 823, 119, 311, 503, 695, 887, 183, 375, 567, 759, 951,
-11, 203, 395, 587, 779, 75, 267, 459, 651, 843, 139, 331, 523, 715, 907,
-27, 219, 411, 603, 795, 91, 283, 475, 667, 859, 155, 347, 539, 731, 923,
-43, 235, 427, 619, 811, 107, 299, 491, 683, 875, 171, 363, 555, 747, 939,
-59, 251, 443, 635, 827, 123, 315, 507, 699, 891, 187, 379, 571, 763, 955,
-15, 207, 399, 591, 783, 79, 271, 463, 655, 847, 143, 335, 527, 719, 911,
-31, 223, 415, 607, 799, 95, 287, 479, 671, 863, 159, 351, 543, 735, 927,
-47, 239, 431, 623, 815, 111, 303, 495, 687, 879, 175, 367, 559, 751, 943,
-63, 255, 447, 639, 831, 127, 319, 511, 703, 895, 191, 383, 575, 767, 959,
+    0, 192, 384, 576, 768, 64, 256, 448, 640, 832, 128, 320, 512, 704, 896,
+    16, 208, 400, 592, 784, 80, 272, 464, 656, 848, 144, 336, 528, 720, 912,
+    32, 224, 416, 608, 800, 96, 288, 480, 672, 864, 160, 352, 544, 736, 928,
+    48, 240, 432, 624, 816, 112, 304, 496, 688, 880, 176, 368, 560, 752, 944,
+    4, 196, 388, 580, 772, 68, 260, 452, 644, 836, 132, 324, 516, 708, 900,
+    20, 212, 404, 596, 788, 84, 276, 468, 660, 852, 148, 340, 532, 724, 916,
+    36, 228, 420, 612, 804, 100, 292, 484, 676, 868, 164, 356, 548, 740, 932,
+    52, 244, 436, 628, 820, 116, 308, 500, 692, 884, 180, 372, 564, 756, 948,
+    8, 200, 392, 584, 776, 72, 264, 456, 648, 840, 136, 328, 520, 712, 904,
+    24, 216, 408, 600, 792, 88, 280, 472, 664, 856, 152, 344, 536, 728, 920,
+    40, 232, 424, 616, 808, 104, 296, 488, 680, 872, 168, 360, 552, 744, 936,
+    56, 248, 440, 632, 824, 120, 312, 504, 696, 888, 184, 376, 568, 760, 952,
+    12, 204, 396, 588, 780, 76, 268, 460, 652, 844, 140, 332, 524, 716, 908,
+    28, 220, 412, 604, 796, 92, 284, 476, 668, 860, 156, 348, 540, 732, 924,
+    44, 236, 428, 620, 812, 108, 300, 492, 684, 876, 172, 364, 556, 748, 940,
+    60, 252, 444, 636, 828, 124, 316, 508, 700, 892, 188, 380, 572, 764, 956,
+    1, 193, 385, 577, 769, 65, 257, 449, 641, 833, 129, 321, 513, 705, 897,
+    17, 209, 401, 593, 785, 81, 273, 465, 657, 849, 145, 337, 529, 721, 913,
+    33, 225, 417, 609, 801, 97, 289, 481, 673, 865, 161, 353, 545, 737, 929,
+    49, 241, 433, 625, 817, 113, 305, 497, 689, 881, 177, 369, 561, 753, 945,
+    5, 197, 389, 581, 773, 69, 261, 453, 645, 837, 133, 325, 517, 709, 901,
+    21, 213, 405, 597, 789, 85, 277, 469, 661, 853, 149, 341, 533, 725, 917,
+    37, 229, 421, 613, 805, 101, 293, 485, 677, 869, 165, 357, 549, 741, 933,
+    53, 245, 437, 629, 821, 117, 309, 501, 693, 885, 181, 373, 565, 757, 949,
+    9, 201, 393, 585, 777, 73, 265, 457, 649, 841, 137, 329, 521, 713, 905,
+    25, 217, 409, 601, 793, 89, 281, 473, 665, 857, 153, 345, 537, 729, 921,
+    41, 233, 425, 617, 809, 105, 297, 489, 681, 873, 169, 361, 553, 745, 937,
+    57, 249, 441, 633, 825, 121, 313, 505, 697, 889, 185, 377, 569, 761, 953,
+    13, 205, 397, 589, 781, 77, 269, 461, 653, 845, 141, 333, 525, 717, 909,
+    29, 221, 413, 605, 797, 93, 285, 477, 669, 861, 157, 349, 541, 733, 925,
+    45, 237, 429, 621, 813, 109, 301, 493, 685, 877, 173, 365, 557, 749, 941,
+    61, 253, 445, 637, 829, 125, 317, 509, 701, 893, 189, 381, 573, 765, 957,
+    2, 194, 386, 578, 770, 66, 258, 450, 642, 834, 130, 322, 514, 706, 898,
+    18, 210, 402, 594, 786, 82, 274, 466, 658, 850, 146, 338, 530, 722, 914,
+    34, 226, 418, 610, 802, 98, 290, 482, 674, 866, 162, 354, 546, 738, 930,
+    50, 242, 434, 626, 818, 114, 306, 498, 690, 882, 178, 370, 562, 754, 946,
+    6, 198, 390, 582, 774, 70, 262, 454, 646, 838, 134, 326, 518, 710, 902,
+    22, 214, 406, 598, 790, 86, 278, 470, 662, 854, 150, 342, 534, 726, 918,
+    38, 230, 422, 614, 806, 102, 294, 486, 678, 870, 166, 358, 550, 742, 934,
+    54, 246, 438, 630, 822, 118, 310, 502, 694, 886, 182, 374, 566, 758, 950,
+    10, 202, 394, 586, 778, 74, 266, 458, 650, 842, 138, 330, 522, 714, 906,
+    26, 218, 410, 602, 794, 90, 282, 474, 666, 858, 154, 346, 538, 730, 922,
+    42, 234, 426, 618, 810, 106, 298, 490, 682, 874, 170, 362, 554, 746, 938,
+    58, 250, 442, 634, 826, 122, 314, 506, 698, 890, 186, 378, 570, 762, 954,
+    14, 206, 398, 590, 782, 78, 270, 462, 654, 846, 142, 334, 526, 718, 910,
+    30, 222, 414, 606, 798, 94, 286, 478, 670, 862, 158, 350, 542, 734, 926,
+    46, 238, 430, 622, 814, 110, 302, 494, 686, 878, 174, 366, 558, 750, 942,
+    62, 254, 446, 638, 830, 126, 318, 510, 702, 894, 190, 382, 574, 766, 958,
+    3, 195, 387, 579, 771, 67, 259, 451, 643, 835, 131, 323, 515, 707, 899,
+    19, 211, 403, 595, 787, 83, 275, 467, 659, 851, 147, 339, 531, 723, 915,
+    35, 227, 419, 611, 803, 99, 291, 483, 675, 867, 163, 355, 547, 739, 931,
+    51, 243, 435, 627, 819, 115, 307, 499, 691, 883, 179, 371, 563, 755, 947,
+    7, 199, 391, 583, 775, 71, 263, 455, 647, 839, 135, 327, 519, 711, 903,
+    23, 215, 407, 599, 791, 87, 279, 471, 663, 855, 151, 343, 535, 727, 919,
+    39, 231, 423, 615, 807, 103, 295, 487, 679, 871, 167, 359, 551, 743, 935,
+    55, 247, 439, 631, 823, 119, 311, 503, 695, 887, 183, 375, 567, 759, 951,
+    11, 203, 395, 587, 779, 75, 267, 459, 651, 843, 139, 331, 523, 715, 907,
+    27, 219, 411, 603, 795, 91, 283, 475, 667, 859, 155, 347, 539, 731, 923,
+    43, 235, 427, 619, 811, 107, 299, 491, 683, 875, 171, 363, 555, 747, 939,
+    59, 251, 443, 635, 827, 123, 315, 507, 699, 891, 187, 379, 571, 763, 955,
+    15, 207, 399, 591, 783, 79, 271, 463, 655, 847, 143, 335, 527, 719, 911,
+    31, 223, 415, 607, 799, 95, 287, 479, 671, 863, 159, 351, 543, 735, 927,
+    47, 239, 431, 623, 815, 111, 303, 495, 687, 879, 175, 367, 559, 751, 943,
+    63, 255, 447, 639, 831, 127, 319, 511, 703, 895, 191, 383, 575, 767, 959,
 };
-#endif
+#  endif
 
-#ifndef FFT_BITREV480
-#define FFT_BITREV480
+#  ifndef FFT_BITREV480
+#   define FFT_BITREV480
 static const oac_int16 fft_bitrev480[480] = {
-0, 96, 192, 288, 384, 32, 128, 224, 320, 416, 64, 160, 256, 352, 448,
-8, 104, 200, 296, 392, 40, 136, 232, 328, 424, 72, 168, 264, 360, 456,
-16, 112, 208, 304, 400, 48, 144, 240, 336, 432, 80, 176, 272, 368, 464,
-24, 120, 216, 312, 408, 56, 152, 248, 344, 440, 88, 184, 280, 376, 472,
-4, 100, 196, 292, 388, 36, 132, 228, 324, 420, 68, 164, 260, 356, 452,
-12, 108, 204, 300, 396, 44, 140, 236, 332, 428, 76, 172, 268, 364, 460,
-20, 116, 212, 308, 404, 52, 148, 244, 340, 436, 84, 180, 276, 372, 468,
-28, 124, 220, 316, 412, 60, 156, 252, 348, 444, 92, 188, 284, 380, 476,
-1, 97, 193, 289, 385, 33, 129, 225, 321, 417, 65, 161, 257, 353, 449,
-9, 105, 201, 297, 393, 41, 137, 233, 329, 425, 73, 169, 265, 361, 457,
-17, 113, 209, 305, 401, 49, 145, 241, 337, 433, 81, 177, 273, 369, 465,
-25, 121, 217, 313, 409, 57, 153, 249, 345, 441, 89, 185, 281, 377, 473,
-5, 101, 197, 293, 389, 37, 133, 229, 325, 421, 69, 165, 261, 357, 453,
-13, 109, 205, 301, 397, 45, 141, 237, 333, 429, 77, 173, 269, 365, 461,
-21, 117, 213, 309, 405, 53, 149, 245, 341, 437, 85, 181, 277, 373, 469,
-29, 125, 221, 317, 413, 61, 157, 253, 349, 445, 93, 189, 285, 381, 477,
-2, 98, 194, 290, 386, 34, 130, 226, 322, 418, 66, 162, 258, 354, 450,
-10, 106, 202, 298, 394, 42, 138, 234, 330, 426, 74, 170, 266, 362, 458,
-18, 114, 210, 306, 402, 50, 146, 242, 338, 434, 82, 178, 274, 370, 466,
-26, 122, 218, 314, 410, 58, 154, 250, 346, 442, 90, 186, 282, 378, 474,
-6, 102, 198, 294, 390, 38, 134, 230, 326, 422, 70, 166, 262, 358, 454,
-14, 110, 206, 302, 398, 46, 142, 238, 334, 430, 78, 174, 270, 366, 462,
-22, 118, 214, 310, 406, 54, 150, 246, 342, 438, 86, 182, 278, 374, 470,
-30, 126, 222, 318, 414, 62, 158, 254, 350, 446, 94, 190, 286, 382, 478,
-3, 99, 195, 291, 387, 35, 131, 227, 323, 419, 67, 163, 259, 355, 451,
-11, 107, 203, 299, 395, 43, 139, 235, 331, 427, 75, 171, 267, 363, 459,
-19, 115, 211, 307, 403, 51, 147, 243, 339, 435, 83, 179, 275, 371, 467,
-27, 123, 219, 315, 411, 59, 155, 251, 347, 443, 91, 187, 283, 379, 475,
-7, 103, 199, 295, 391, 39, 135, 231, 327, 423, 71, 167, 263, 359, 455,
-15, 111, 207, 303, 399, 47, 143, 239, 335, 431, 79, 175, 271, 367, 463,
-23, 119, 215, 311, 407, 55, 151, 247, 343, 439, 87, 183, 279, 375, 471,
-31, 127, 223, 319, 415, 63, 159, 255, 351, 447, 95, 191, 287, 383, 479,
+    0, 96, 192, 288, 384, 32, 128, 224, 320, 416, 64, 160, 256, 352, 448,
+    8, 104, 200, 296, 392, 40, 136, 232, 328, 424, 72, 168, 264, 360, 456,
+    16, 112, 208, 304, 400, 48, 144, 240, 336, 432, 80, 176, 272, 368, 464,
+    24, 120, 216, 312, 408, 56, 152, 248, 344, 440, 88, 184, 280, 376, 472,
+    4, 100, 196, 292, 388, 36, 132, 228, 324, 420, 68, 164, 260, 356, 452,
+    12, 108, 204, 300, 396, 44, 140, 236, 332, 428, 76, 172, 268, 364, 460,
+    20, 116, 212, 308, 404, 52, 148, 244, 340, 436, 84, 180, 276, 372, 468,
+    28, 124, 220, 316, 412, 60, 156, 252, 348, 444, 92, 188, 284, 380, 476,
+    1, 97, 193, 289, 385, 33, 129, 225, 321, 417, 65, 161, 257, 353, 449,
+    9, 105, 201, 297, 393, 41, 137, 233, 329, 425, 73, 169, 265, 361, 457,
+    17, 113, 209, 305, 401, 49, 145, 241, 337, 433, 81, 177, 273, 369, 465,
+    25, 121, 217, 313, 409, 57, 153, 249, 345, 441, 89, 185, 281, 377, 473,
+    5, 101, 197, 293, 389, 37, 133, 229, 325, 421, 69, 165, 261, 357, 453,
+    13, 109, 205, 301, 397, 45, 141, 237, 333, 429, 77, 173, 269, 365, 461,
+    21, 117, 213, 309, 405, 53, 149, 245, 341, 437, 85, 181, 277, 373, 469,
+    29, 125, 221, 317, 413, 61, 157, 253, 349, 445, 93, 189, 285, 381, 477,
+    2, 98, 194, 290, 386, 34, 130, 226, 322, 418, 66, 162, 258, 354, 450,
+    10, 106, 202, 298, 394, 42, 138, 234, 330, 426, 74, 170, 266, 362, 458,
+    18, 114, 210, 306, 402, 50, 146, 242, 338, 434, 82, 178, 274, 370, 466,
+    26, 122, 218, 314, 410, 58, 154, 250, 346, 442, 90, 186, 282, 378, 474,
+    6, 102, 198, 294, 390, 38, 134, 230, 326, 422, 70, 166, 262, 358, 454,
+    14, 110, 206, 302, 398, 46, 142, 238, 334, 430, 78, 174, 270, 366, 462,
+    22, 118, 214, 310, 406, 54, 150, 246, 342, 438, 86, 182, 278, 374, 470,
+    30, 126, 222, 318, 414, 62, 158, 254, 350, 446, 94, 190, 286, 382, 478,
+    3, 99, 195, 291, 387, 35, 131, 227, 323, 419, 67, 163, 259, 355, 451,
+    11, 107, 203, 299, 395, 43, 139, 235, 331, 427, 75, 171, 267, 363, 459,
+    19, 115, 211, 307, 403, 51, 147, 243, 339, 435, 83, 179, 275, 371, 467,
+    27, 123, 219, 315, 411, 59, 155, 251, 347, 443, 91, 187, 283, 379, 475,
+    7, 103, 199, 295, 391, 39, 135, 231, 327, 423, 71, 167, 263, 359, 455,
+    15, 111, 207, 303, 399, 47, 143, 239, 335, 431, 79, 175, 271, 367, 463,
+    23, 119, 215, 311, 407, 55, 151, 247, 343, 439, 87, 183, 279, 375, 471,
+    31, 127, 223, 319, 415, 63, 159, 255, 351, 447, 95, 191, 287, 383, 479,
 };
-#endif
+#  endif
 
-#ifndef FFT_BITREV240
-#define FFT_BITREV240
+#  ifndef FFT_BITREV240
+#   define FFT_BITREV240
 static const oac_int16 fft_bitrev240[240] = {
-0, 48, 96, 144, 192, 16, 64, 112, 160, 208, 32, 80, 128, 176, 224,
-4, 52, 100, 148, 196, 20, 68, 116, 164, 212, 36, 84, 132, 180, 228,
-8, 56, 104, 152, 200, 24, 72, 120, 168, 216, 40, 88, 136, 184, 232,
-12, 60, 108, 156, 204, 28, 76, 124, 172, 220, 44, 92, 140, 188, 236,
-1, 49, 97, 145, 193, 17, 65, 113, 161, 209, 33, 81, 129, 177, 225,
-5, 53, 101, 149, 197, 21, 69, 117, 165, 213, 37, 85, 133, 181, 229,
-9, 57, 105, 153, 201, 25, 73, 121, 169, 217, 41, 89, 137, 185, 233,
-13, 61, 109, 157, 205, 29, 77, 125, 173, 221, 45, 93, 141, 189, 237,
-2, 50, 98, 146, 194, 18, 66, 114, 162, 210, 34, 82, 130, 178, 226,
-6, 54, 102, 150, 198, 22, 70, 118, 166, 214, 38, 86, 134, 182, 230,
-10, 58, 106, 154, 202, 26, 74, 122, 170, 218, 42, 90, 138, 186, 234,
-14, 62, 110, 158, 206, 30, 78, 126, 174, 222, 46, 94, 142, 190, 238,
-3, 51, 99, 147, 195, 19, 67, 115, 163, 211, 35, 83, 131, 179, 227,
-7, 55, 103, 151, 199, 23, 71, 119, 167, 215, 39, 87, 135, 183, 231,
-11, 59, 107, 155, 203, 27, 75, 123, 171, 219, 43, 91, 139, 187, 235,
-15, 63, 111, 159, 207, 31, 79, 127, 175, 223, 47, 95, 143, 191, 239,
+    0, 48, 96, 144, 192, 16, 64, 112, 160, 208, 32, 80, 128, 176, 224,
+    4, 52, 100, 148, 196, 20, 68, 116, 164, 212, 36, 84, 132, 180, 228,
+    8, 56, 104, 152, 200, 24, 72, 120, 168, 216, 40, 88, 136, 184, 232,
+    12, 60, 108, 156, 204, 28, 76, 124, 172, 220, 44, 92, 140, 188, 236,
+    1, 49, 97, 145, 193, 17, 65, 113, 161, 209, 33, 81, 129, 177, 225,
+    5, 53, 101, 149, 197, 21, 69, 117, 165, 213, 37, 85, 133, 181, 229,
+    9, 57, 105, 153, 201, 25, 73, 121, 169, 217, 41, 89, 137, 185, 233,
+    13, 61, 109, 157, 205, 29, 77, 125, 173, 221, 45, 93, 141, 189, 237,
+    2, 50, 98, 146, 194, 18, 66, 114, 162, 210, 34, 82, 130, 178, 226,
+    6, 54, 102, 150, 198, 22, 70, 118, 166, 214, 38, 86, 134, 182, 230,
+    10, 58, 106, 154, 202, 26, 74, 122, 170, 218, 42, 90, 138, 186, 234,
+    14, 62, 110, 158, 206, 30, 78, 126, 174, 222, 46, 94, 142, 190, 238,
+    3, 51, 99, 147, 195, 19, 67, 115, 163, 211, 35, 83, 131, 179, 227,
+    7, 55, 103, 151, 199, 23, 71, 119, 167, 215, 39, 87, 135, 183, 231,
+    11, 59, 107, 155, 203, 27, 75, 123, 171, 219, 43, 91, 139, 187, 235,
+    15, 63, 111, 159, 207, 31, 79, 127, 175, 223, 47, 95, 143, 191, 239,
 };
-#endif
+#  endif
 
-#ifndef FFT_BITREV120
-#define FFT_BITREV120
+#  ifndef FFT_BITREV120
+#   define FFT_BITREV120
 static const oac_int16 fft_bitrev120[120] = {
-0, 24, 48, 72, 96, 8, 32, 56, 80, 104, 16, 40, 64, 88, 112,
-4, 28, 52, 76, 100, 12, 36, 60, 84, 108, 20, 44, 68, 92, 116,
-1, 25, 49, 73, 97, 9, 33, 57, 81, 105, 17, 41, 65, 89, 113,
-5, 29, 53, 77, 101, 13, 37, 61, 85, 109, 21, 45, 69, 93, 117,
-2, 26, 50, 74, 98, 10, 34, 58, 82, 106, 18, 42, 66, 90, 114,
-6, 30, 54, 78, 102, 14, 38, 62, 86, 110, 22, 46, 70, 94, 118,
-3, 27, 51, 75, 99, 11, 35, 59, 83, 107, 19, 43, 67, 91, 115,
-7, 31, 55, 79, 103, 15, 39, 63, 87, 111, 23, 47, 71, 95, 119,
+    0, 24, 48, 72, 96, 8, 32, 56, 80, 104, 16, 40, 64, 88, 112,
+    4, 28, 52, 76, 100, 12, 36, 60, 84, 108, 20, 44, 68, 92, 116,
+    1, 25, 49, 73, 97, 9, 33, 57, 81, 105, 17, 41, 65, 89, 113,
+    5, 29, 53, 77, 101, 13, 37, 61, 85, 109, 21, 45, 69, 93, 117,
+    2, 26, 50, 74, 98, 10, 34, 58, 82, 106, 18, 42, 66, 90, 114,
+    6, 30, 54, 78, 102, 14, 38, 62, 86, 110, 22, 46, 70, 94, 118,
+    3, 27, 51, 75, 99, 11, 35, 59, 83, 107, 19, 43, 67, 91, 115,
+    7, 31, 55, 79, 103, 15, 39, 63, 87, 111, 23, 47, 71, 95, 119,
 };
-#endif
+#  endif
 
-#ifndef FFT_STATE96000_1920_0
-#define FFT_STATE96000_1920_0
+#  ifndef FFT_STATE96000_1920_0
+#   define FFT_STATE96000_1920_0
 static const kiss_fft_state fft_state96000_1920_0 = {
-960,    /* nfft */
-0.0010416667f,    /* scale */
--1,    /* shift */
-{5, 192, 3, 64, 4, 16, 4, 4, 4, 1, 0, 0, 0, 0, 0, 0, },    /* factors */
-fft_bitrev960,    /* bitrev */
-fft_twiddles96000_1920,    /* bitrev */
-#ifdef OVERRIDE_FFT
-(arch_fft_state *)&cfg_arch_960,
-#else
-NULL,
-#endif
+    960, /* nfft */
+    0.0010416667f, /* scale */
+    -1, /* shift */
+    {5, 192, 3, 64, 4, 16, 4, 4, 4, 1, 0, 0, 0, 0, 0, 0, }, /* factors */
+    fft_bitrev960, /* bitrev */
+    fft_twiddles96000_1920, /* bitrev */
+#   ifdef OVERRIDE_FFT
+    (arch_fft_state *)&cfg_arch_960,
+#   else
+    NULL,
+#   endif
 };
-#endif
+#  endif
 
-#ifndef FFT_STATE96000_1920_1
-#define FFT_STATE96000_1920_1
+#  ifndef FFT_STATE96000_1920_1
+#   define FFT_STATE96000_1920_1
 static const kiss_fft_state fft_state96000_1920_1 = {
-480,    /* nfft */
-0.0020833334f,    /* scale */
-1,    /* shift */
-{5, 96, 3, 32, 4, 8, 2, 4, 4, 1, 0, 0, 0, 0, 0, 0, },    /* factors */
-fft_bitrev480,    /* bitrev */
-fft_twiddles96000_1920,    /* bitrev */
-#ifdef OVERRIDE_FFT
-(arch_fft_state *)&cfg_arch_480,
-#else
-NULL,
-#endif
+    480, /* nfft */
+    0.0020833334f, /* scale */
+    1, /* shift */
+    {5, 96, 3, 32, 4, 8, 2, 4, 4, 1, 0, 0, 0, 0, 0, 0, }, /* factors */
+    fft_bitrev480, /* bitrev */
+    fft_twiddles96000_1920, /* bitrev */
+#   ifdef OVERRIDE_FFT
+    (arch_fft_state *)&cfg_arch_480,
+#   else
+    NULL,
+#   endif
 };
-#endif
+#  endif
 
-#ifndef FFT_STATE96000_1920_2
-#define FFT_STATE96000_1920_2
+#  ifndef FFT_STATE96000_1920_2
+#   define FFT_STATE96000_1920_2
 static const kiss_fft_state fft_state96000_1920_2 = {
-240,    /* nfft */
-0.0041666669f,    /* scale */
-2,    /* shift */
-{5, 48, 3, 16, 4, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, },    /* factors */
-fft_bitrev240,    /* bitrev */
-fft_twiddles96000_1920,    /* bitrev */
-#ifdef OVERRIDE_FFT
-(arch_fft_state *)&cfg_arch_240,
-#else
-NULL,
-#endif
+    240, /* nfft */
+    0.0041666669f, /* scale */
+    2, /* shift */
+    {5, 48, 3, 16, 4, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, }, /* factors */
+    fft_bitrev240, /* bitrev */
+    fft_twiddles96000_1920, /* bitrev */
+#   ifdef OVERRIDE_FFT
+    (arch_fft_state *)&cfg_arch_240,
+#   else
+    NULL,
+#   endif
 };
-#endif
+#  endif
 
-#ifndef FFT_STATE96000_1920_3
-#define FFT_STATE96000_1920_3
+#  ifndef FFT_STATE96000_1920_3
+#   define FFT_STATE96000_1920_3
 static const kiss_fft_state fft_state96000_1920_3 = {
-120,    /* nfft */
-0.0083333338f,    /* scale */
-3,    /* shift */
-{5, 24, 3, 8, 2, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, },    /* factors */
-fft_bitrev120,    /* bitrev */
-fft_twiddles96000_1920,    /* bitrev */
-#ifdef OVERRIDE_FFT
-(arch_fft_state *)&cfg_arch_120,
-#else
-NULL,
-#endif
+    120, /* nfft */
+    0.0083333338f, /* scale */
+    3, /* shift */
+    {5, 24, 3, 8, 2, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, }, /* factors */
+    fft_bitrev120, /* bitrev */
+    fft_twiddles96000_1920, /* bitrev */
+#   ifdef OVERRIDE_FFT
+    (arch_fft_state *)&cfg_arch_120,
+#   else
+    NULL,
+#   endif
 };
-#endif
+#  endif
 
-#endif
+# endif
 
-#ifndef MDCT_TWIDDLES1920
-#define MDCT_TWIDDLES1920
+# ifndef MDCT_TWIDDLES1920
+#  define MDCT_TWIDDLES1920
 static const celt_coef mdct_twiddles1920[3600] = {
-0.99999998f, 0.99999831f, 0.99999396f, 0.99998693f, 0.99997722f,
-0.99996484f, 0.99994978f, 0.99993204f, 0.99991163f, 0.99988854f,
-0.99986277f, 0.99983433f, 0.99980320f, 0.99976941f, 0.99973293f,
-0.99969378f, 0.99965195f, 0.99960745f, 0.99956026f, 0.99951041f,
-0.99945787f, 0.99940267f, 0.99934478f, 0.99928422f, 0.99922099f,
-0.99915507f, 0.99908649f, 0.99901523f, 0.99894129f, 0.99886468f,
-0.99878540f, 0.99870344f, 0.99861881f, 0.99853150f, 0.99844153f,
-0.99834887f, 0.99825355f, 0.99815555f, 0.99805488f, 0.99795154f,
-0.99784553f, 0.99773684f, 0.99762548f, 0.99751146f, 0.99739476f,
-0.99727539f, 0.99715335f, 0.99702864f, 0.99690127f, 0.99677122f,
-0.99663850f, 0.99650312f, 0.99636507f, 0.99622435f, 0.99608096f,
-0.99593491f, 0.99578619f, 0.99563481f, 0.99548076f, 0.99532404f,
-0.99516466f, 0.99500261f, 0.99483790f, 0.99467053f, 0.99450050f,
-0.99432780f, 0.99415244f, 0.99397441f, 0.99379373f, 0.99361039f,
-0.99342438f, 0.99323572f, 0.99304440f, 0.99285041f, 0.99265377f,
-0.99245448f, 0.99225252f, 0.99204791f, 0.99184064f, 0.99163072f,
-0.99141814f, 0.99120291f, 0.99098503f, 0.99076449f, 0.99054130f,
-0.99031545f, 0.99008696f, 0.98985581f, 0.98962202f, 0.98938557f,
-0.98914648f, 0.98890474f, 0.98866035f, 0.98841331f, 0.98816363f,
-0.98791130f, 0.98765632f, 0.98739871f, 0.98713845f, 0.98687554f,
-0.98660999f, 0.98634181f, 0.98607098f, 0.98579751f, 0.98552140f,
-0.98524265f, 0.98496127f, 0.98467725f, 0.98439059f, 0.98410130f,
-0.98380937f, 0.98351481f, 0.98321761f, 0.98291779f, 0.98261533f,
-0.98231024f, 0.98200252f, 0.98169217f, 0.98137919f, 0.98106359f,
-0.98074536f, 0.98042450f, 0.98010102f, 0.97977491f, 0.97944619f,
-0.97911483f, 0.97878086f, 0.97844427f, 0.97810506f, 0.97776322f,
-0.97741878f, 0.97707171f, 0.97672203f, 0.97636973f, 0.97601482f,
-0.97565730f, 0.97529716f, 0.97493441f, 0.97456906f, 0.97420109f,
-0.97383051f, 0.97345733f, 0.97308154f, 0.97270315f, 0.97232215f,
-0.97193855f, 0.97155235f, 0.97116355f, 0.97077214f, 0.97037814f,
-0.96998154f, 0.96958234f, 0.96918054f, 0.96877615f, 0.96836917f,
-0.96795960f, 0.96754743f, 0.96713267f, 0.96671533f, 0.96629539f,
-0.96587287f, 0.96544776f, 0.96502007f, 0.96458979f, 0.96415693f,
-0.96372149f, 0.96328347f, 0.96284288f, 0.96239970f, 0.96195394f,
-0.96150562f, 0.96105471f, 0.96060124f, 0.96014519f, 0.95968657f,
-0.95922538f, 0.95876162f, 0.95829530f, 0.95782641f, 0.95735496f,
-0.95688094f, 0.95640437f, 0.95592523f, 0.95544353f, 0.95495927f,
-0.95447246f, 0.95398309f, 0.95349117f, 0.95299669f, 0.95249967f,
-0.95200009f, 0.95149797f, 0.95099329f, 0.95048607f, 0.94997631f,
-0.94946400f, 0.94894915f, 0.94843176f, 0.94791184f, 0.94738937f,
-0.94686437f, 0.94633683f, 0.94580676f, 0.94527415f, 0.94473902f,
-0.94420135f, 0.94366116f, 0.94311844f, 0.94257320f, 0.94202543f,
-0.94147514f, 0.94092233f, 0.94036700f, 0.93980916f, 0.93924879f,
-0.93868592f, 0.93812052f, 0.93755262f, 0.93698221f, 0.93640929f,
-0.93583386f, 0.93525593f, 0.93467549f, 0.93409255f, 0.93350711f,
-0.93291917f, 0.93232873f, 0.93173580f, 0.93114037f, 0.93054245f,
-0.92994204f, 0.92933913f, 0.92873374f, 0.92812587f, 0.92751550f,
-0.92690266f, 0.92628733f, 0.92566953f, 0.92504924f, 0.92442648f,
-0.92380124f, 0.92317353f, 0.92254335f, 0.92191070f, 0.92127558f,
-0.92063799f, 0.91999794f, 0.91935543f, 0.91871045f, 0.91806302f,
-0.91741313f, 0.91676078f, 0.91610597f, 0.91544872f, 0.91478901f,
-0.91412685f, 0.91346225f, 0.91279520f, 0.91212571f, 0.91145377f,
-0.91077939f, 0.91010258f, 0.90942333f, 0.90874164f, 0.90805753f,
-0.90737098f, 0.90668200f, 0.90599059f, 0.90529676f, 0.90460050f,
-0.90390183f, 0.90320073f, 0.90249721f, 0.90179128f, 0.90108293f,
-0.90037218f, 0.89965901f, 0.89894343f, 0.89822544f, 0.89750505f,
-0.89678226f, 0.89605707f, 0.89532948f, 0.89459949f, 0.89386710f,
-0.89313232f, 0.89239515f, 0.89165560f, 0.89091365f, 0.89016932f,
-0.88942261f, 0.88867351f, 0.88792204f, 0.88716818f, 0.88641196f,
-0.88565336f, 0.88489239f, 0.88412905f, 0.88336334f, 0.88259527f,
-0.88182483f, 0.88105203f, 0.88027688f, 0.87949937f, 0.87871950f,
-0.87793728f, 0.87715271f, 0.87636579f, 0.87557653f, 0.87478492f,
-0.87399097f, 0.87319468f, 0.87239605f, 0.87159509f, 0.87079179f,
-0.86998616f, 0.86917820f, 0.86836792f, 0.86755531f, 0.86674037f,
-0.86592312f, 0.86510355f, 0.86428166f, 0.86345746f, 0.86263095f,
-0.86180212f, 0.86097099f, 0.86013756f, 0.85930182f, 0.85846378f,
-0.85762344f, 0.85678081f, 0.85593588f, 0.85508866f, 0.85423915f,
-0.85338736f, 0.85253328f, 0.85167692f, 0.85081827f, 0.84995735f,
-0.84909416f, 0.84822869f, 0.84736095f, 0.84649094f, 0.84561866f,
-0.84474412f, 0.84386732f, 0.84298826f, 0.84210695f, 0.84122337f,
-0.84033755f, 0.83944948f, 0.83855915f, 0.83766659f, 0.83677178f,
-0.83587473f, 0.83497544f, 0.83407392f, 0.83317016f, 0.83226418f,
-0.83135596f, 0.83044552f, 0.82953286f, 0.82861797f, 0.82770087f,
-0.82678155f, 0.82586002f, 0.82493628f, 0.82401032f, 0.82308217f,
-0.82215180f, 0.82121924f, 0.82028448f, 0.81934752f, 0.81840837f,
-0.81746703f, 0.81652349f, 0.81557778f, 0.81462988f, 0.81367979f,
-0.81272753f, 0.81177310f, 0.81081649f, 0.80985771f, 0.80889676f,
-0.80793364f, 0.80696837f, 0.80600093f, 0.80503133f, 0.80405958f,
-0.80308568f, 0.80210962f, 0.80113142f, 0.80015107f, 0.79916858f,
-0.79818396f, 0.79719719f, 0.79620829f, 0.79521726f, 0.79422410f,
-0.79322881f, 0.79223140f, 0.79123187f, 0.79023022f, 0.78922646f,
-0.78822058f, 0.78721259f, 0.78620249f, 0.78519029f, 0.78417599f,
-0.78315958f, 0.78214108f, 0.78112049f, 0.78009781f, 0.77907303f,
-0.77804617f, 0.77701723f, 0.77598621f, 0.77495311f, 0.77391793f,
-0.77288068f, 0.77184137f, 0.77079998f, 0.76975654f, 0.76871103f,
-0.76766347f, 0.76661384f, 0.76556217f, 0.76450845f, 0.76345268f,
-0.76239487f, 0.76133501f, 0.76027312f, 0.75920919f, 0.75814323f,
-0.75707524f, 0.75600522f, 0.75493318f, 0.75385911f, 0.75278303f,
-0.75170494f, 0.75062483f, 0.74954271f, 0.74845858f, 0.74737245f,
-0.74628432f, 0.74519419f, 0.74410207f, 0.74300795f, 0.74191185f,
-0.74081376f, 0.73971368f, 0.73861163f, 0.73750759f, 0.73640158f,
-0.73529361f, 0.73418366f, 0.73307175f, 0.73195787f, 0.73084203f,
-0.72972424f, 0.72860450f, 0.72748280f, 0.72635916f, 0.72523357f,
-0.72410604f, 0.72297657f, 0.72184516f, 0.72071182f, 0.71957656f,
-0.71843936f, 0.71730025f, 0.71615921f, 0.71501625f, 0.71387138f,
-0.71272460f, 0.71157592f, 0.71042532f, 0.70927283f, 0.70811843f,
-0.70696214f, 0.70580396f, 0.70464389f, 0.70348193f, 0.70231808f,
-0.70115236f, 0.69998476f, 0.69881528f, 0.69764394f, 0.69647073f,
-0.69529565f, 0.69411871f, 0.69293991f, 0.69175926f, 0.69057675f,
-0.68939240f, 0.68820620f, 0.68701816f, 0.68582828f, 0.68463656f,
-0.68344301f, 0.68224763f, 0.68105042f, 0.67985139f, 0.67865054f,
-0.67744787f, 0.67624339f, 0.67503710f, 0.67382900f, 0.67261910f,
-0.67140739f, 0.67019389f, 0.66897860f, 0.66776151f, 0.66654264f,
-0.66532198f, 0.66409954f, 0.66287532f, 0.66164932f, 0.66042156f,
-0.65919203f, 0.65796073f, 0.65672767f, 0.65549285f, 0.65425628f,
-0.65301796f, 0.65177788f, 0.65053607f, 0.64929251f, 0.64804721f,
-0.64680018f, 0.64555141f, 0.64430092f, 0.64304871f, 0.64179477f,
-0.64053911f, 0.63928174f, 0.63802265f, 0.63676186f, 0.63549936f,
-0.63423517f, 0.63296927f, 0.63170168f, 0.63043240f, 0.62916143f,
-0.62788877f, 0.62661444f, 0.62533842f, 0.62406074f, 0.62278138f,
-0.62150035f, 0.62021766f, 0.61893331f, 0.61764731f, 0.61635965f,
-0.61507034f, 0.61377938f, 0.61248678f, 0.61119254f, 0.60989666f,
-0.60859915f, 0.60730001f, 0.60599925f, 0.60469686f, 0.60339285f,
-0.60208723f, 0.60078000f, 0.59947115f, 0.59816071f, 0.59684866f,
-0.59553501f, 0.59421977f, 0.59290294f, 0.59158452f, 0.59026452f,
-0.58894293f, 0.58761977f, 0.58629504f, 0.58496873f, 0.58364086f,
-0.58231143f, 0.58098044f, 0.57964789f, 0.57831380f, 0.57697815f,
-0.57564096f, 0.57430223f, 0.57296196f, 0.57162015f, 0.57027682f,
-0.56893195f, 0.56758557f, 0.56623767f, 0.56488825f, 0.56353731f,
-0.56218487f, 0.56083093f, 0.55947548f, 0.55811853f, 0.55676009f,
-0.55540016f, 0.55403874f, 0.55267584f, 0.55131146f, 0.54994560f,
-0.54857827f, 0.54720948f, 0.54583921f, 0.54446749f, 0.54309431f,
-0.54171967f, 0.54034359f, 0.53896605f, 0.53758708f, 0.53620666f,
-0.53482481f, 0.53344153f, 0.53205682f, 0.53067068f, 0.52928312f,
-0.52789415f, 0.52650377f, 0.52511197f, 0.52371877f, 0.52232416f,
-0.52092816f, 0.51953076f, 0.51813197f, 0.51673180f, 0.51533024f,
-0.51392730f, 0.51252299f, 0.51111730f, 0.50971025f, 0.50830183f,
-0.50689204f, 0.50548091f, 0.50406842f, 0.50265458f, 0.50123939f,
-0.49982286f, 0.49840499f, 0.49698579f, 0.49556526f, 0.49414340f,
-0.49272022f, 0.49129572f, 0.48986991f, 0.48844278f, 0.48701434f,
-0.48558461f, 0.48415357f, 0.48272123f, 0.48128760f, 0.47985269f,
-0.47841649f, 0.47697901f, 0.47554025f, 0.47410021f, 0.47265891f,
-0.47121635f, 0.46977252f, 0.46832743f, 0.46688109f, 0.46543350f,
-0.46398467f, 0.46253459f, 0.46108327f, 0.45963072f, 0.45817694f,
-0.45672193f, 0.45526570f, 0.45380825f, 0.45234959f, 0.45088971f,
-0.44942863f, 0.44796634f, 0.44650286f, 0.44503818f, 0.44357230f,
-0.44210524f, 0.44063700f, 0.43916758f, 0.43769698f, 0.43622521f,
-0.43475227f, 0.43327816f, 0.43180290f, 0.43032648f, 0.42884891f,
-0.42737019f, 0.42589033f, 0.42440932f, 0.42292718f, 0.42144391f,
-0.41995951f, 0.41847399f, 0.41698734f, 0.41549958f, 0.41401070f,
-0.41252072f, 0.41102963f, 0.40953745f, 0.40804416f, 0.40654979f,
-0.40505432f, 0.40355777f, 0.40206014f, 0.40056144f, 0.39906166f,
-0.39756081f, 0.39605890f, 0.39455593f, 0.39305190f, 0.39154682f,
-0.39004069f, 0.38853352f, 0.38702530f, 0.38551605f, 0.38400577f,
-0.38249446f, 0.38098213f, 0.37946878f, 0.37795441f, 0.37643902f,
-0.37492263f, 0.37340524f, 0.37188685f, 0.37036746f, 0.36884708f,
-0.36732571f, 0.36580336f, 0.36428003f, 0.36275572f, 0.36123045f,
-0.35970420f, 0.35817700f, 0.35664883f, 0.35511971f, 0.35358964f,
-0.35205862f, 0.35052666f, 0.34899376f, 0.34745992f, 0.34592516f,
-0.34438947f, 0.34285286f, 0.34131533f, 0.33977688f, 0.33823753f,
-0.33669727f, 0.33515611f, 0.33361405f, 0.33207110f, 0.33052726f,
-0.32898254f, 0.32743693f, 0.32589045f, 0.32434309f, 0.32279487f,
-0.32124578f, 0.31969583f, 0.31814503f, 0.31659338f, 0.31504087f,
-0.31348753f, 0.31193334f, 0.31037832f, 0.30882247f, 0.30726579f,
-0.30570829f, 0.30414997f, 0.30259083f, 0.30103089f, 0.29947014f,
-0.29790859f, 0.29634624f, 0.29478309f, 0.29321916f, 0.29165445f,
-0.29008895f, 0.28852267f, 0.28695563f, 0.28538781f, 0.28381923f,
-0.28224989f, 0.28067980f, 0.27910895f, 0.27753736f, 0.27596502f,
-0.27439194f, 0.27281813f, 0.27124359f, 0.26966833f, 0.26809234f,
-0.26651563f, 0.26493821f, 0.26336008f, 0.26178125f, 0.26020171f,
-0.25862148f, 0.25704055f, 0.25545894f, 0.25387664f, 0.25229367f,
-0.25071002f, 0.24912569f, 0.24754070f, 0.24595505f, 0.24436874f,
-0.24278177f, 0.24119416f, 0.23960590f, 0.23801699f, 0.23642745f,
-0.23483728f, 0.23324648f, 0.23165505f, 0.23006301f, 0.22847034f,
-0.22687707f, 0.22528319f, 0.22368870f, 0.22209362f, 0.22049794f,
-0.21890167f, 0.21730482f, 0.21570738f, 0.21410937f, 0.21251078f,
-0.21091163f, 0.20931191f, 0.20771163f, 0.20611079f, 0.20450940f,
-0.20290746f, 0.20130498f, 0.19970196f, 0.19809841f, 0.19649433f,
-0.19488972f, 0.19328459f, 0.19167894f, 0.19007277f, 0.18846610f,
-0.18685893f, 0.18525125f, 0.18364308f, 0.18203442f, 0.18042526f,
-0.17881563f, 0.17720552f, 0.17559493f, 0.17398387f, 0.17237235f,
-0.17076037f, 0.16914792f, 0.16753503f, 0.16592169f, 0.16430790f,
-0.16269367f, 0.16107901f, 0.15946391f, 0.15784839f, 0.15623245f,
-0.15461609f, 0.15299931f, 0.15138213f, 0.14976453f, 0.14814654f,
-0.14652815f, 0.14490937f, 0.14329020f, 0.14167065f, 0.14005072f,
-0.13843041f, 0.13680974f, 0.13518869f, 0.13356729f, 0.13194552f,
-0.13032341f, 0.12870094f, 0.12707813f, 0.12545498f, 0.12383150f,
-0.12220768f, 0.12058354f, 0.11895907f, 0.11733428f, 0.11570918f,
-0.11408377f, 0.11245806f, 0.11083204f, 0.10920573f, 0.10757912f,
-0.10595223f, 0.10432505f, 0.10269759f, 0.10106986f, 0.099441861f,
-0.097813592f, 0.096185062f, 0.094556275f, 0.092927234f, 0.091297944f,
-0.089668410f, 0.088038636f, 0.086408626f, 0.084778385f, 0.083147917f,
-0.081517226f, 0.079886317f, 0.078255194f, 0.076623861f, 0.074992324f,
-0.073360585f, 0.071728651f, 0.070096524f, 0.068464209f, 0.066831712f,
-0.065199035f, 0.063566184f, 0.061933162f, 0.060299975f, 0.058666626f,
-0.057033121f, 0.055399462f, 0.053765655f, 0.052131705f, 0.050497614f,
-0.048863389f, 0.047229033f, 0.045594550f, 0.043959945f, 0.042325222f,
-0.040690387f, 0.039055442f, 0.037420393f, 0.035785243f, 0.034149998f,
-0.032514661f, 0.030879237f, 0.029243731f, 0.027608146f, 0.025972487f,
-0.024336759f, 0.022700965f, 0.021065111f, 0.019429201f, 0.017793238f,
-0.016157228f, 0.014521174f, 0.012885082f, 0.011248955f, 0.0096127982f,
-0.0079766155f, 0.0063404114f, 0.0047041904f, 0.0030679568f, 0.0014317149f,
--0.00020453077f, -0.0018407759f, -0.0034770161f, -0.0051132470f, -0.0067494642f,
--0.0083856634f, -0.010021840f, -0.011657990f, -0.013294109f, -0.014930192f,
--0.016566235f, -0.018202233f, -0.019838183f, -0.021474080f, -0.023109920f,
--0.024745697f, -0.026381408f, -0.028017049f, -0.029652615f, -0.031288101f,
--0.032923503f, -0.034558818f, -0.036194040f, -0.037829164f, -0.039464188f,
--0.041099106f, -0.042733914f, -0.044368607f, -0.046003182f, -0.047637634f,
--0.049271958f, -0.050906150f, -0.052540206f, -0.054174121f, -0.055807891f,
--0.057441512f, -0.059074978f, -0.060708287f, -0.062341433f, -0.063974413f,
--0.065607221f, -0.067239853f, -0.068872305f, -0.070504573f, -0.072136653f,
--0.073768539f, -0.075400227f, -0.077031714f, -0.078662994f, -0.080294064f,
--0.081924919f, -0.083555555f, -0.085185966f, -0.086816150f, -0.088446102f,
--0.090075816f, -0.091705289f, -0.093334517f, -0.094963495f, -0.096592219f,
--0.098220684f, -0.099848886f, -0.10147682f, -0.10310448f, -0.10473187f,
--0.10635898f, -0.10798580f, -0.10961233f, -0.11123857f, -0.11286451f,
--0.11449015f, -0.11611549f, -0.11774051f, -0.11936521f, -0.12098960f,
--0.12261367f, -0.12423740f, -0.12586080f, -0.12748387f, -0.12910659f,
--0.13072897f, -0.13235100f, -0.13397267f, -0.13559399f, -0.13721494f,
--0.13883553f, -0.14045574f, -0.14207558f, -0.14369503f, -0.14531411f,
--0.14693279f, -0.14855108f, -0.15016897f, -0.15178646f, -0.15340354f,
--0.15502022f, -0.15663647f, -0.15825231f, -0.15986773f, -0.16148271f,
--0.16309727f, -0.16471139f, -0.16632506f, -0.16793829f, -0.16955108f,
--0.17116340f, -0.17277527f, -0.17438668f, -0.17599762f, -0.17760809f,
--0.17921808f, -0.18082760f, -0.18243663f, -0.18404517f, -0.18565322f,
--0.18726077f, -0.18886782f, -0.19047436f, -0.19208040f, -0.19368592f,
--0.19529092f, -0.19689540f, -0.19849935f, -0.20010277f, -0.20170565f,
--0.20330800f, -0.20490980f, -0.20651105f, -0.20811175f, -0.20971189f,
--0.21131147f, -0.21291048f, -0.21450893f, -0.21610680f, -0.21770409f,
--0.21930080f, -0.22089692f, -0.22249245f, -0.22408738f, -0.22568172f,
--0.22727545f, -0.22886857f, -0.23046108f, -0.23205297f, -0.23364424f,
--0.23523488f, -0.23682490f, -0.23841428f, -0.24000302f, -0.24159112f,
--0.24317858f, -0.24476538f, -0.24635153f, -0.24793701f, -0.24952184f,
--0.25110599f, -0.25268948f, -0.25427228f, -0.25585441f, -0.25743585f,
--0.25901660f, -0.26059666f, -0.26217602f, -0.26375468f, -0.26533263f,
--0.26690987f, -0.26848640f, -0.27006221f, -0.27163730f, -0.27321165f,
--0.27478528f, -0.27635817f, -0.27793032f, -0.27950173f, -0.28107239f,
--0.28264230f, -0.28421145f, -0.28577984f, -0.28734746f, -0.28891431f,
--0.29048039f, -0.29204570f, -0.29361022f, -0.29517395f, -0.29673690f,
--0.29829905f, -0.29986040f, -0.30142095f, -0.30298069f, -0.30453962f,
--0.30609774f, -0.30765504f, -0.30921151f, -0.31076715f, -0.31232197f,
--0.31387594f, -0.31542908f, -0.31698137f, -0.31853281f, -0.32008340f,
--0.32163313f, -0.32318201f, -0.32473001f, -0.32627715f, -0.32782341f,
--0.32936880f, -0.33091330f, -0.33245692f, -0.33399965f, -0.33554149f,
--0.33708242f, -0.33862245f, -0.34016158f, -0.34169980f, -0.34323710f,
--0.34477348f, -0.34630894f, -0.34784347f, -0.34937707f, -0.35090974f,
--0.35244146f, -0.35397224f, -0.35550208f, -0.35703096f, -0.35855889f,
--0.36008585f, -0.36161186f, -0.36313689f, -0.36466095f, -0.36618404f,
--0.36770615f, -0.36922727f, -0.37074740f, -0.37226654f, -0.37378468f,
--0.37530183f, -0.37681796f, -0.37833309f, -0.37984721f, -0.38136031f,
--0.38287239f, -0.38438344f, -0.38589346f, -0.38740245f, -0.38891041f,
--0.39041732f, -0.39192319f, -0.39342800f, -0.39493177f, -0.39643448f,
--0.39793612f, -0.39943670f, -0.40093621f, -0.40243465f, -0.40393201f,
--0.40542829f, -0.40692348f, -0.40841759f, -0.40991060f, -0.41140251f,
--0.41289332f, -0.41438303f, -0.41587162f, -0.41735911f, -0.41884547f,
--0.42033072f, -0.42181484f, -0.42329782f, -0.42477968f, -0.42626040f,
--0.42773998f, -0.42921841f, -0.43069569f, -0.43217182f, -0.43364680f,
--0.43512061f, -0.43659326f, -0.43806474f, -0.43953504f, -0.44100417f,
--0.44247212f, -0.44393888f, -0.44540446f, -0.44686884f, -0.44833203f,
--0.44979401f, -0.45125479f, -0.45271437f, -0.45417273f, -0.45562987f,
--0.45708580f, -0.45854050f, -0.45999398f, -0.46144622f, -0.46289723f,
--0.46434699f, -0.46579552f, -0.46724280f, -0.46868882f, -0.47013359f,
--0.47157711f, -0.47301936f, -0.47446034f, -0.47590006f, -0.47733850f,
--0.47877566f, -0.48021154f, -0.48164613f, -0.48307944f, -0.48451145f,
--0.48594216f, -0.48737158f, -0.48879968f, -0.49022648f, -0.49165197f,
--0.49307614f, -0.49449899f, -0.49592052f, -0.49734072f, -0.49875959f,
--0.50017712f, -0.50159331f, -0.50300816f, -0.50442167f, -0.50583382f,
--0.50724462f, -0.50865406f, -0.51006214f, -0.51146885f, -0.51287419f,
--0.51427817f, -0.51568076f, -0.51708197f, -0.51848180f, -0.51988024f,
--0.52127729f, -0.52267294f, -0.52406720f, -0.52546005f, -0.52685149f,
--0.52824153f, -0.52963015f, -0.53101735f, -0.53240313f, -0.53378748f,
--0.53517041f, -0.53655190f, -0.53793196f, -0.53931057f, -0.54068774f,
--0.54206347f, -0.54343774f, -0.54481056f, -0.54618192f, -0.54755181f,
--0.54892024f, -0.55028721f, -0.55165269f, -0.55301671f, -0.55437924f,
--0.55574028f, -0.55709984f, -0.55845791f, -0.55981448f, -0.56116955f,
--0.56252312f, -0.56387519f, -0.56522574f, -0.56657478f, -0.56792231f,
--0.56926831f, -0.57061279f, -0.57195575f, -0.57329717f, -0.57463705f,
--0.57597540f, -0.57731221f, -0.57864747f, -0.57998118f, -0.58131334f,
--0.58264394f, -0.58397298f, -0.58530046f, -0.58662637f, -0.58795071f,
--0.58927348f, -0.59059466f, -0.59191427f, -0.59323230f, -0.59454873f,
--0.59586357f, -0.59717682f, -0.59848847f, -0.59979852f, -0.60110696f,
--0.60241379f, -0.60371901f, -0.60502261f, -0.60632459f, -0.60762495f,
--0.60892368f, -0.61022078f, -0.61151625f, -0.61281008f, -0.61410227f,
--0.61539282f, -0.61668172f, -0.61796896f, -0.61925456f, -0.62053849f,
--0.62182077f, -0.62310138f, -0.62438032f, -0.62565759f, -0.62693318f,
--0.62820709f, -0.62947933f, -0.63074988f, -0.63201874f, -0.63328590f,
--0.63455138f, -0.63581515f, -0.63707722f, -0.63833758f, -0.63959624f,
--0.64085318f, -0.64210841f, -0.64336192f, -0.64461371f, -0.64586377f,
--0.64711210f, -0.64835870f, -0.64960356f, -0.65084668f, -0.65208807f,
--0.65332770f, -0.65456559f, -0.65580172f, -0.65703610f, -0.65826872f,
--0.65949958f, -0.66072867f, -0.66195599f, -0.66318154f, -0.66440531f,
--0.66562731f, -0.66684752f, -0.66806595f, -0.66928259f, -0.67049744f,
--0.67171049f, -0.67292174f, -0.67413119f, -0.67533884f, -0.67654468f,
--0.67774871f, -0.67895092f, -0.68015132f, -0.68134989f, -0.68254664f,
--0.68374157f, -0.68493466f, -0.68612592f, -0.68731534f, -0.68850292f,
--0.68968866f, -0.69087255f, -0.69205460f, -0.69323478f, -0.69441312f,
--0.69558959f, -0.69676420f, -0.69793695f, -0.69910783f, -0.70027684f,
--0.70144397f, -0.70260922f, -0.70377259f, -0.70493408f, -0.70609368f,
--0.70725139f, -0.70840721f, -0.70956113f, -0.71071315f, -0.71186327f,
--0.71301148f, -0.71415778f, -0.71530217f, -0.71644465f, -0.71758521f,
--0.71872384f, -0.71986055f, -0.72099534f, -0.72212819f, -0.72325912f,
--0.72438810f, -0.72551515f, -0.72664025f, -0.72776341f, -0.72888462f,
--0.73000387f, -0.73112118f, -0.73223652f, -0.73334991f, -0.73446133f,
--0.73557079f, -0.73667827f, -0.73778379f, -0.73888732f, -0.73998888f,
--0.74108846f, -0.74218606f, -0.74328167f, -0.74437529f, -0.74546691f,
--0.74655654f, -0.74764417f, -0.74872980f, -0.74981342f, -0.75089504f,
--0.75197465f, -0.75305224f, -0.75412782f, -0.75520138f, -0.75627291f,
--0.75734242f, -0.75840991f, -0.75947536f, -0.76053878f, -0.76160017f,
--0.76265951f, -0.76371681f, -0.76477207f, -0.76582528f, -0.76687644f,
--0.76792555f, -0.76897260f, -0.77001759f, -0.77106052f, -0.77210139f,
--0.77314019f, -0.77417692f, -0.77521158f, -0.77624416f, -0.77727466f,
--0.77830308f, -0.77932942f, -0.78035367f, -0.78137584f, -0.78239591f,
--0.78341388f, -0.78442976f, -0.78544354f, -0.78645521f, -0.78746478f,
--0.78847224f, -0.78947760f, -0.79048083f, -0.79148195f, -0.79248095f,
--0.79347783f, -0.79447259f, -0.79546522f, -0.79645572f, -0.79744408f,
--0.79843031f, -0.79941441f, -0.80039636f, -0.80137617f, -0.80235384f,
--0.80332935f, -0.80430272f, -0.80527393f, -0.80624299f, -0.80720989f,
--0.80817462f, -0.80913720f, -0.81009760f, -0.81105584f, -0.81201191f,
--0.81296580f, -0.81391752f, -0.81486706f, -0.81581441f, -0.81675958f,
--0.81770257f, -0.81864336f, -0.81958197f, -0.82051837f, -0.82145259f,
--0.82238460f, -0.82331441f, -0.82424202f, -0.82516742f, -0.82609061f,
--0.82701159f, -0.82793036f, -0.82884690f, -0.82976123f, -0.83067334f,
--0.83158323f, -0.83249088f, -0.83339631f, -0.83429951f, -0.83520047f,
--0.83609920f, -0.83699569f, -0.83788994f, -0.83878195f, -0.83967171f,
--0.84055922f, -0.84144448f, -0.84232749f, -0.84320824f, -0.84408674f,
--0.84496297f, -0.84583694f, -0.84670865f, -0.84757810f, -0.84844527f,
--0.84931017f, -0.85017280f, -0.85103315f, -0.85189122f, -0.85274701f,
--0.85360052f, -0.85445175f, -0.85530068f, -0.85614733f, -0.85699168f,
--0.85783374f, -0.85867350f, -0.85951097f, -0.86034613f, -0.86117899f,
--0.86200954f, -0.86283779f, -0.86366373f, -0.86448735f, -0.86530866f,
--0.86612765f, -0.86694432f, -0.86775868f, -0.86857071f, -0.86938041f,
--0.87018779f, -0.87099283f, -0.87179555f, -0.87259593f, -0.87339397f,
--0.87418968f, -0.87498304f, -0.87577407f, -0.87656274f, -0.87734907f,
--0.87813306f, -0.87891469f, -0.87969397f, -0.88047089f, -0.88124545f,
--0.88201766f, -0.88278751f, -0.88355499f, -0.88432010f, -0.88508285f,
--0.88584323f, -0.88660124f, -0.88735687f, -0.88811013f, -0.88886101f,
--0.88960951f, -0.89035563f, -0.89109936f, -0.89184071f, -0.89257967f,
--0.89331624f, -0.89405042f, -0.89478221f, -0.89551160f, -0.89623859f,
--0.89696318f, -0.89768538f, -0.89840516f, -0.89912255f, -0.89983752f,
--0.90055009f, -0.90126025f, -0.90196799f, -0.90267332f, -0.90337623f,
--0.90407672f, -0.90477479f, -0.90547044f, -0.90616367f, -0.90685447f,
--0.90754284f, -0.90822878f, -0.90891229f, -0.90959337f, -0.91027201f,
--0.91094822f, -0.91162198f, -0.91229331f, -0.91296219f, -0.91362863f,
--0.91429262f, -0.91495417f, -0.91561326f, -0.91626990f, -0.91692409f,
--0.91757583f, -0.91822511f, -0.91887193f, -0.91951629f, -0.92015819f,
--0.92079762f, -0.92143459f, -0.92206909f, -0.92270113f, -0.92333069f,
--0.92395778f, -0.92458240f, -0.92520454f, -0.92582421f, -0.92644140f,
--0.92705610f, -0.92766833f, -0.92827807f, -0.92888532f, -0.92949009f,
--0.93009237f, -0.93069216f, -0.93128946f, -0.93188427f, -0.93247658f,
--0.93306639f, -0.93365370f, -0.93423852f, -0.93482083f, -0.93540065f,
--0.93597795f, -0.93655275f, -0.93712505f, -0.93769483f, -0.93826211f,
--0.93882687f, -0.93938912f, -0.93994885f, -0.94050607f, -0.94106077f,
--0.94161295f, -0.94216261f, -0.94270975f, -0.94325436f, -0.94379644f,
--0.94433601f, -0.94487304f, -0.94540754f, -0.94593951f, -0.94646895f,
--0.94699585f, -0.94752022f, -0.94804206f, -0.94856135f, -0.94907810f,
--0.94959232f, -0.95010399f, -0.95061312f, -0.95111970f, -0.95162374f,
--0.95212522f, -0.95262416f, -0.95312055f, -0.95361439f, -0.95410567f,
--0.95459440f, -0.95508058f, -0.95556419f, -0.95604525f, -0.95652375f,
--0.95699969f, -0.95747306f, -0.95794388f, -0.95841212f, -0.95887780f,
--0.95934092f, -0.95980146f, -0.96025944f, -0.96071485f, -0.96116768f,
--0.96161794f, -0.96206562f, -0.96251073f, -0.96295327f, -0.96339322f,
--0.96383060f, -0.96426539f, -0.96469760f, -0.96512723f, -0.96555428f,
--0.96597874f, -0.96640062f, -0.96681991f, -0.96723660f, -0.96765071f,
--0.96806223f, -0.96847116f, -0.96887749f, -0.96928124f, -0.96968238f,
--0.97008093f, -0.97047688f, -0.97087024f, -0.97126099f, -0.97164914f,
--0.97203470f, -0.97241765f, -0.97279799f, -0.97317574f, -0.97355087f,
--0.97392340f, -0.97429333f, -0.97466064f, -0.97502535f, -0.97538744f,
--0.97574692f, -0.97610379f, -0.97645805f, -0.97680969f, -0.97715872f,
--0.97750513f, -0.97784893f, -0.97819010f, -0.97852866f, -0.97886460f,
--0.97919792f, -0.97952861f, -0.97985669f, -0.98018214f, -0.98050496f,
--0.98082516f, -0.98114274f, -0.98145768f, -0.98177000f, -0.98207970f,
--0.98238676f, -0.98269119f, -0.98299299f, -0.98329216f, -0.98358870f,
--0.98388260f, -0.98417387f, -0.98446250f, -0.98474850f, -0.98503186f,
--0.98531259f, -0.98559068f, -0.98586612f, -0.98613893f, -0.98640910f,
--0.98667663f, -0.98694151f, -0.98720376f, -0.98746336f, -0.98772032f,
--0.98797463f, -0.98822630f, -0.98847532f, -0.98872169f, -0.98896542f,
--0.98920650f, -0.98944493f, -0.98968071f, -0.98991385f, -0.99014433f,
--0.99037216f, -0.99059734f, -0.99081987f, -0.99103975f, -0.99125697f,
--0.99147154f, -0.99168345f, -0.99189271f, -0.99209931f, -0.99230326f,
--0.99250455f, -0.99270318f, -0.99289916f, -0.99309248f, -0.99328313f,
--0.99347113f, -0.99365647f, -0.99383915f, -0.99401917f, -0.99419653f,
--0.99437122f, -0.99454325f, -0.99471262f, -0.99487933f, -0.99504337f,
--0.99520475f, -0.99536347f, -0.99551952f, -0.99567290f, -0.99582362f,
--0.99597167f, -0.99611706f, -0.99625978f, -0.99639983f, -0.99653722f,
--0.99667193f, -0.99680398f, -0.99693336f, -0.99706007f, -0.99718411f,
--0.99730548f, -0.99742418f, -0.99754021f, -0.99765357f, -0.99776426f,
--0.99787228f, -0.99797763f, -0.99808030f, -0.99818030f, -0.99827763f,
--0.99837229f, -0.99846427f, -0.99855358f, -0.99864022f, -0.99872418f,
--0.99880547f, -0.99888409f, -0.99896003f, -0.99903329f, -0.99910389f,
--0.99917180f, -0.99923705f, -0.99929961f, -0.99935950f, -0.99941672f,
--0.99947126f, -0.99952312f, -0.99957231f, -0.99961882f, -0.99966266f,
--0.99970382f, -0.99974230f, -0.99977811f, -0.99981124f, -0.99984169f,
--0.99986946f, -0.99989456f, -0.99991698f, -0.99993673f, -0.99995380f,
--0.99996819f, -0.99997990f, -0.99998894f, -0.99999529f, -0.99999898f,
-0.99999992f, 0.99999322f, 0.99997582f, 0.99994771f, 0.99990889f,
-0.99985936f, 0.99979913f, 0.99972818f, 0.99964653f, 0.99955418f,
-0.99945112f, 0.99933736f, 0.99921289f, 0.99907773f, 0.99893186f,
-0.99877530f, 0.99860804f, 0.99843009f, 0.99824144f, 0.99804211f,
-0.99783209f, 0.99761138f, 0.99737998f, 0.99713791f, 0.99688516f,
-0.99662173f, 0.99634763f, 0.99606285f, 0.99576741f, 0.99546131f,
-0.99514455f, 0.99481713f, 0.99447905f, 0.99413033f, 0.99377096f,
-0.99340095f, 0.99302029f, 0.99262901f, 0.99222709f, 0.99181455f,
-0.99139139f, 0.99095760f, 0.99051321f, 0.99005821f, 0.98959261f,
-0.98911641f, 0.98862961f, 0.98813223f, 0.98762427f, 0.98710573f,
-0.98657662f, 0.98603694f, 0.98548670f, 0.98492591f, 0.98435457f,
-0.98377269f, 0.98318028f, 0.98257734f, 0.98196387f, 0.98133989f,
-0.98070539f, 0.98006040f, 0.97940491f, 0.97873893f, 0.97806247f,
-0.97737554f, 0.97667813f, 0.97597027f, 0.97525196f, 0.97452320f,
-0.97378401f, 0.97303439f, 0.97227435f, 0.97150389f, 0.97072303f,
-0.96993178f, 0.96913014f, 0.96831812f, 0.96749573f, 0.96666298f,
-0.96581987f, 0.96496643f, 0.96410265f, 0.96322854f, 0.96234412f,
-0.96144939f, 0.96054437f, 0.95962906f, 0.95870347f, 0.95776762f,
-0.95682151f, 0.95586515f, 0.95489856f, 0.95392174f, 0.95293471f,
-0.95193746f, 0.95093003f, 0.94991241f, 0.94888462f, 0.94784667f,
-0.94679856f, 0.94574032f, 0.94467195f, 0.94359346f, 0.94250486f,
-0.94140618f, 0.94029741f, 0.93917857f, 0.93804967f, 0.93691073f,
-0.93576176f, 0.93460276f, 0.93343375f, 0.93225475f, 0.93106577f,
-0.92986681f, 0.92865789f, 0.92743903f, 0.92621024f, 0.92497153f,
-0.92372291f, 0.92246440f, 0.92119602f, 0.91991776f, 0.91862966f,
-0.91733172f, 0.91602395f, 0.91470637f, 0.91337900f, 0.91204185f,
-0.91069493f, 0.90933825f, 0.90797184f, 0.90659570f, 0.90520986f,
-0.90381432f, 0.90240910f, 0.90099422f, 0.89956969f, 0.89813553f,
-0.89669174f, 0.89523836f, 0.89377538f, 0.89230284f, 0.89082074f,
-0.88932910f, 0.88782793f, 0.88631726f, 0.88479710f, 0.88326746f,
-0.88172836f, 0.88017982f, 0.87862185f, 0.87705448f, 0.87547771f,
-0.87389156f, 0.87229606f, 0.87069121f, 0.86907704f, 0.86745357f,
-0.86582080f, 0.86417876f, 0.86252747f, 0.86086694f, 0.85919719f,
-0.85751824f, 0.85583010f, 0.85413281f, 0.85242636f, 0.85071078f,
-0.84898610f, 0.84725232f, 0.84550947f, 0.84375756f, 0.84199662f,
-0.84022666f, 0.83844771f, 0.83665977f, 0.83486287f, 0.83305704f,
-0.83124228f, 0.82941862f, 0.82758608f, 0.82574467f, 0.82389442f,
-0.82203535f, 0.82016748f, 0.81829082f, 0.81640540f, 0.81451123f,
-0.81260835f, 0.81069676f, 0.80877649f, 0.80684755f, 0.80490998f,
-0.80296379f, 0.80100899f, 0.79904562f, 0.79707370f, 0.79509323f,
-0.79310425f, 0.79110678f, 0.78910084f, 0.78708644f, 0.78506362f,
-0.78303239f, 0.78099277f, 0.77894479f, 0.77688847f, 0.77482382f,
-0.77275088f, 0.77066967f, 0.76858020f, 0.76648250f, 0.76437659f,
-0.76226250f, 0.76014024f, 0.75800984f, 0.75587132f, 0.75372471f,
-0.75157003f, 0.74940730f, 0.74723654f, 0.74505779f, 0.74287105f,
-0.74067635f, 0.73847373f, 0.73626320f, 0.73404478f, 0.73181850f,
-0.72958438f, 0.72734245f, 0.72509273f, 0.72283525f, 0.72057002f,
-0.71829708f, 0.71601644f, 0.71372814f, 0.71143220f, 0.70912863f,
-0.70681747f, 0.70449874f, 0.70217247f, 0.69983868f, 0.69749739f,
-0.69514863f, 0.69279243f, 0.69042881f, 0.68805780f, 0.68567941f,
-0.68329369f, 0.68090064f, 0.67850031f, 0.67609270f, 0.67367786f,
-0.67125580f, 0.66882656f, 0.66639015f, 0.66394661f, 0.66149595f,
-0.65903821f, 0.65657341f, 0.65410159f, 0.65162275f, 0.64913694f,
-0.64664418f, 0.64414449f, 0.64163790f, 0.63912444f, 0.63660414f,
-0.63407702f, 0.63154311f, 0.62900244f, 0.62645503f, 0.62390091f,
-0.62134011f, 0.61877265f, 0.61619857f, 0.61361789f, 0.61103064f,
-0.60843685f, 0.60583654f, 0.60322974f, 0.60061648f, 0.59799679f,
-0.59537069f, 0.59273822f, 0.59009940f, 0.58745427f, 0.58480284f,
-0.58214514f, 0.57948122f, 0.57681109f, 0.57413478f, 0.57145232f,
-0.56876374f, 0.56606907f, 0.56336834f, 0.56066158f, 0.55794881f,
-0.55523006f, 0.55250537f, 0.54977477f, 0.54703827f, 0.54429592f,
-0.54154774f, 0.53879376f, 0.53603401f, 0.53326852f, 0.53049731f,
-0.52772043f, 0.52493790f, 0.52214974f, 0.51935599f, 0.51655668f,
-0.51375184f, 0.51094149f, 0.50812568f, 0.50530442f, 0.50247775f,
-0.49964570f, 0.49680830f, 0.49396558f, 0.49111757f, 0.48826430f,
-0.48540580f, 0.48254210f, 0.47967323f, 0.47679923f, 0.47392012f,
-0.47103594f, 0.46814671f, 0.46525247f, 0.46235324f, 0.45944907f,
-0.45653997f, 0.45362599f, 0.45070714f, 0.44778347f, 0.44485501f,
-0.44192178f, 0.43898381f, 0.43604115f, 0.43309382f, 0.43014185f,
-0.42718527f, 0.42422412f, 0.42125842f, 0.41828822f, 0.41531353f,
-0.41233440f, 0.40935085f, 0.40636291f, 0.40337063f, 0.40037402f,
-0.39737313f, 0.39436798f, 0.39135861f, 0.38834505f, 0.38532733f,
-0.38230548f, 0.37927953f, 0.37624953f, 0.37321550f, 0.37017747f,
-0.36713547f, 0.36408955f, 0.36103972f, 0.35798603f, 0.35492850f,
-0.35186718f, 0.34880208f, 0.34573325f, 0.34266072f, 0.33958451f,
-0.33650468f, 0.33342123f, 0.33033422f, 0.32724367f, 0.32414961f,
-0.32105209f, 0.31795112f, 0.31484675f, 0.31173901f, 0.30862793f,
-0.30551354f, 0.30239588f, 0.29927499f, 0.29615089f, 0.29302362f,
-0.28989321f, 0.28675969f, 0.28362310f, 0.28048348f, 0.27734085f,
-0.27419526f, 0.27104672f, 0.26789529f, 0.26474098f, 0.26158384f,
-0.25842390f, 0.25526119f, 0.25209575f, 0.24892761f, 0.24575680f,
-0.24258336f, 0.23940732f, 0.23622872f, 0.23304759f, 0.22986396f,
-0.22667787f, 0.22348935f, 0.22029844f, 0.21710517f, 0.21390958f,
-0.21071169f, 0.20751155f, 0.20430919f, 0.20110463f, 0.19789793f,
-0.19468910f, 0.19147819f, 0.18826523f, 0.18505026f, 0.18183330f,
-0.17861439f, 0.17539357f, 0.17217088f, 0.16894634f, 0.16571999f,
-0.16249186f, 0.15926200f, 0.15603043f, 0.15279719f, 0.14956231f,
-0.14632583f, 0.14308778f, 0.13984820f, 0.13660713f, 0.13336459f,
-0.13012062f, 0.12687526f, 0.12362854f, 0.12038049f, 0.11713116f,
-0.11388057f, 0.11062877f, 0.10737578f, 0.10412163f, 0.10086638f,
-0.097610040f, 0.094352658f, 0.091094266f, 0.087834897f, 0.084574589f,
-0.081313374f, 0.078051289f, 0.074788367f, 0.071524645f, 0.068260157f,
-0.064994938f, 0.061729023f, 0.058462447f, 0.055195244f, 0.051927451f,
-0.048659101f, 0.045390231f, 0.042120874f, 0.038851066f, 0.035580842f,
-0.032310238f, 0.029039287f, 0.025768025f, 0.022496487f, 0.019224708f,
-0.015952723f, 0.012680568f, 0.0094082767f, 0.0061358846f, 0.0028634269f,
--0.00040906153f, -0.0036815456f, -0.0069539902f, -0.010226360f, -0.013498621f,
--0.016770737f, -0.020042673f, -0.023314395f, -0.026585867f, -0.029857055f,
--0.033127923f, -0.036398436f, -0.039668559f, -0.042938257f, -0.046207495f,
--0.049476239f, -0.052744453f, -0.056012102f, -0.059279151f, -0.062545565f,
--0.065811309f, -0.069076349f, -0.072340649f, -0.075604174f, -0.078866890f,
--0.082128761f, -0.085389752f, -0.088649829f, -0.091908956f, -0.095167100f,
--0.098424224f, -0.10168029f, -0.10493528f, -0.10818913f, -0.11144183f,
--0.11469334f, -0.11794361f, -0.12119263f, -0.12444034f, -0.12768673f,
--0.13093174f, -0.13417536f, -0.13741753f, -0.14065824f, -0.14389744f,
--0.14713510f, -0.15037118f, -0.15360565f, -0.15683848f, -0.16006962f,
--0.16329906f, -0.16652674f, -0.16975264f, -0.17297673f, -0.17619896f,
--0.17941930f, -0.18263772f, -0.18585419f, -0.18906866f, -0.19228112f,
--0.19549151f, -0.19869981f, -0.20190598f, -0.20510998f, -0.20831180f,
--0.21151138f, -0.21470869f, -0.21790371f, -0.22109639f, -0.22428671f,
--0.22747462f, -0.23066010f, -0.23384310f, -0.23702361f, -0.24020157f,
--0.24337696f, -0.24654975f, -0.24971989f, -0.25288736f, -0.25605213f,
--0.25921415f, -0.26237339f, -0.26552983f, -0.26868342f, -0.27183413f,
--0.27498193f, -0.27812679f, -0.28126867f, -0.28440754f, -0.28754336f,
--0.29067610f, -0.29380573f, -0.29693221f, -0.30005551f, -0.30317560f,
--0.30629245f, -0.30940601f, -0.31251626f, -0.31562316f, -0.31872668f,
--0.32182679f, -0.32492345f, -0.32801664f, -0.33110631f, -0.33419243f,
--0.33727497f, -0.34035391f, -0.34342920f, -0.34650081f, -0.34956871f,
--0.35263286f, -0.35569324f, -0.35874981f, -0.36180254f, -0.36485139f,
--0.36789634f, -0.37093735f, -0.37397438f, -0.37700741f, -0.38003640f,
--0.38306132f, -0.38608214f, -0.38909883f, -0.39211135f, -0.39511967f,
--0.39812375f, -0.40112358f, -0.40411910f, -0.40711031f, -0.41009715f,
--0.41307959f, -0.41605762f, -0.41903119f, -0.42200027f, -0.42496483f,
--0.42792484f, -0.43088027f, -0.43383109f, -0.43677726f, -0.43971875f,
--0.44265553f, -0.44558757f, -0.44851484f, -0.45143731f, -0.45435494f,
--0.45726770f, -0.46017557f, -0.46307851f, -0.46597650f, -0.46886949f,
--0.47175746f, -0.47464038f, -0.47751821f, -0.48039093f, -0.48325851f,
--0.48612091f, -0.48897811f, -0.49183006f, -0.49467676f, -0.49751815f,
--0.50035422f, -0.50318492f, -0.50601024f, -0.50883014f, -0.51164459f,
--0.51445356f, -0.51725703f, -0.52005495f, -0.52284730f, -0.52563406f,
--0.52841518f, -0.53119065f, -0.53396043f, -0.53672449f, -0.53948280f,
--0.54223533f, -0.54498206f, -0.54772295f, -0.55045797f, -0.55318710f,
--0.55591031f, -0.55862756f, -0.56133883f, -0.56404409f, -0.56674331f,
--0.56943646f, -0.57212351f, -0.57480443f, -0.57747920f, -0.58014778f,
--0.58281015f, -0.58546628f, -0.58811614f, -0.59075970f, -0.59339694f,
--0.59602782f, -0.59865231f, -0.60127040f, -0.60388204f, -0.60648722f,
--0.60908591f, -0.61167807f, -0.61426368f, -0.61684271f, -0.61941514f,
--0.62198093f, -0.62454007f, -0.62709251f, -0.62963824f, -0.63217722f,
--0.63470944f, -0.63723486f, -0.63975345f, -0.64226519f, -0.64477006f,
--0.64726802f, -0.64975905f, -0.65224312f, -0.65472020f, -0.65719027f,
--0.65965331f, -0.66210928f, -0.66455816f, -0.66699992f, -0.66943454f,
--0.67186199f, -0.67428225f, -0.67669528f, -0.67910107f, -0.68149959f,
--0.68389080f, -0.68627470f, -0.68865124f, -0.69102041f, -0.69338218f,
--0.69573652f, -0.69808341f, -0.70042283f, -0.70275474f, -0.70507913f,
--0.70739597f, -0.70970524f, -0.71200690f, -0.71430093f, -0.71658732f,
--0.71886604f, -0.72113705f, -0.72340034f, -0.72565589f, -0.72790366f,
--0.73014364f, -0.73237580f, -0.73460012f, -0.73681657f, -0.73902513f,
--0.74122577f, -0.74341848f, -0.74560322f, -0.74777998f, -0.74994874f,
--0.75210946f, -0.75426212f, -0.75640671f, -0.75854320f, -0.76067157f,
--0.76279178f, -0.76490383f, -0.76700769f, -0.76910334f, -0.77119075f,
--0.77326989f, -0.77534076f, -0.77740333f, -0.77945757f, -0.78150346f,
--0.78354098f, -0.78557011f, -0.78759083f, -0.78960312f, -0.79160694f,
--0.79360229f, -0.79558915f, -0.79756748f, -0.79953727f, -0.80149850f,
--0.80345114f, -0.80539518f, -0.80733060f, -0.80925737f, -0.81117547f,
--0.81308489f, -0.81498559f, -0.81687757f, -0.81876081f, -0.82063527f,
--0.82250095f, -0.82435781f, -0.82620585f, -0.82804505f, -0.82987537f,
--0.83169681f, -0.83350933f, -0.83531294f, -0.83710760f, -0.83889329f,
--0.84067000f, -0.84243770f, -0.84419639f, -0.84594603f, -0.84768662f,
--0.84941812f, -0.85114053f, -0.85285383f, -0.85455799f, -0.85625300f,
--0.85793884f, -0.85961549f, -0.86128294f, -0.86294116f, -0.86459014f,
--0.86622986f, -0.86786031f, -0.86948146f, -0.87109330f, -0.87269581f,
--0.87428898f, -0.87587278f, -0.87744720f, -0.87901223f, -0.88056784f,
--0.88211402f, -0.88365076f, -0.88517803f, -0.88669582f, -0.88820412f,
--0.88970290f, -0.89119216f, -0.89267187f, -0.89414203f, -0.89560260f,
--0.89705359f, -0.89849497f, -0.89992673f, -0.90134885f, -0.90276131f,
--0.90416411f, -0.90555723f, -0.90694065f, -0.90831436f, -0.90967833f,
--0.91103257f, -0.91237705f, -0.91371176f, -0.91503669f, -0.91635181f,
--0.91765712f, -0.91895261f, -0.92023825f, -0.92151404f, -0.92277996f,
--0.92403600f, -0.92528214f, -0.92651837f, -0.92774468f, -0.92896106f,
--0.93016748f, -0.93136395f, -0.93255044f, -0.93372694f, -0.93489345f,
--0.93604994f, -0.93719641f, -0.93833284f, -0.93945922f, -0.94057555f,
--0.94168180f, -0.94277796f, -0.94386403f, -0.94493999f, -0.94600583f,
--0.94706154f, -0.94810711f, -0.94914252f, -0.95016777f, -0.95118284f,
--0.95218773f, -0.95318242f, -0.95416690f, -0.95514117f, -0.95610520f,
--0.95705900f, -0.95800255f, -0.95893583f, -0.95985885f, -0.96077159f,
--0.96167404f, -0.96256619f, -0.96344803f, -0.96431956f, -0.96518076f,
--0.96603162f, -0.96687213f, -0.96770230f, -0.96852209f, -0.96933152f,
--0.97013057f, -0.97091922f, -0.97169748f, -0.97246533f, -0.97322277f,
--0.97396979f, -0.97470637f, -0.97543252f, -0.97614822f, -0.97685347f,
--0.97754825f, -0.97823257f, -0.97890641f, -0.97956977f, -0.98022263f,
--0.98086500f, -0.98149687f, -0.98211822f, -0.98272906f, -0.98332937f,
--0.98391915f, -0.98449840f, -0.98506710f, -0.98562525f, -0.98617285f,
--0.98670988f, -0.98723635f, -0.98775225f, -0.98825757f, -0.98875230f,
--0.98923645f, -0.98971000f, -0.99017295f, -0.99062530f, -0.99106704f,
--0.99149817f, -0.99191868f, -0.99232857f, -0.99272783f, -0.99311645f,
--0.99349445f, -0.99386180f, -0.99421851f, -0.99456457f, -0.99489998f,
--0.99522474f, -0.99553884f, -0.99584227f, -0.99613505f, -0.99641715f,
--0.99668858f, -0.99694934f, -0.99719943f, -0.99743883f, -0.99766756f,
--0.99788559f, -0.99809295f, -0.99828961f, -0.99847558f, -0.99865086f,
--0.99881544f, -0.99896933f, -0.99911252f, -0.99924501f, -0.99936680f,
--0.99947789f, -0.99957827f, -0.99966795f, -0.99974692f, -0.99981519f,
--0.99987275f, -0.99991960f, -0.99995574f, -0.99998118f, -0.99999590f,
-0.99999967f, 0.99997289f, 0.99990328f, 0.99979084f, 0.99963557f,
-0.99943748f, 0.99919658f, 0.99891288f, 0.99858638f, 0.99821711f,
-0.99780508f, 0.99735031f, 0.99685281f, 0.99631261f, 0.99572973f,
-0.99510420f, 0.99443605f, 0.99372529f, 0.99297196f, 0.99217610f,
-0.99133774f, 0.99045692f, 0.98953366f, 0.98856802f, 0.98756003f,
-0.98650973f, 0.98541718f, 0.98428242f, 0.98310549f, 0.98188645f,
-0.98062534f, 0.97932224f, 0.97797718f, 0.97659022f, 0.97516144f,
-0.97369088f, 0.97217861f, 0.97062469f, 0.96902920f, 0.96739220f,
-0.96571376f, 0.96399395f, 0.96223284f, 0.96043052f, 0.95858705f,
-0.95670253f, 0.95477702f, 0.95281061f, 0.95080338f, 0.94875543f,
-0.94666684f, 0.94453769f, 0.94236808f, 0.94015810f, 0.93790786f,
-0.93561743f, 0.93328693f, 0.93091644f, 0.92850608f, 0.92605595f,
-0.92356614f, 0.92103677f, 0.91846795f, 0.91585979f, 0.91321239f,
-0.91052587f, 0.90780035f, 0.90503595f, 0.90223277f, 0.89939095f,
-0.89651059f, 0.89359184f, 0.89063481f, 0.88763962f, 0.88460641f,
-0.88153531f, 0.87842644f, 0.87527995f, 0.87209596f, 0.86887462f,
-0.86561605f, 0.86232041f, 0.85898782f, 0.85561844f, 0.85221241f,
-0.84876987f, 0.84529098f, 0.84177587f, 0.83822471f, 0.83463763f,
-0.83101481f, 0.82735639f, 0.82366252f, 0.81993338f, 0.81616911f,
-0.81236987f, 0.80853584f, 0.80466718f, 0.80076404f, 0.79682660f,
-0.79285503f, 0.78884950f, 0.78481017f, 0.78073723f, 0.77663084f,
-0.77249118f, 0.76831844f, 0.76411277f, 0.75987438f, 0.75560344f,
-0.75130013f, 0.74696464f, 0.74259715f, 0.73819784f, 0.73376692f,
-0.72930457f, 0.72481097f, 0.72028632f, 0.71573083f, 0.71114467f,
-0.70652804f, 0.70188116f, 0.69720420f, 0.69249738f, 0.68776090f,
-0.68299495f, 0.67819975f, 0.67337550f, 0.66852240f, 0.66364066f,
-0.65873050f, 0.65379211f, 0.64882573f, 0.64383154f, 0.63880978f,
-0.63376065f, 0.62868438f, 0.62358117f, 0.61845126f, 0.61329485f,
-0.60811216f, 0.60290343f, 0.59766888f, 0.59240872f, 0.58712318f,
-0.58181249f, 0.57647688f, 0.57111658f, 0.56573181f, 0.56032281f,
-0.55488980f, 0.54943303f, 0.54395272f, 0.53844911f, 0.53292243f,
-0.52737292f, 0.52180083f, 0.51620638f, 0.51058981f, 0.50495138f,
-0.49929132f, 0.49360987f, 0.48790727f, 0.48218377f, 0.47643962f,
-0.47067506f, 0.46489034f, 0.45908570f, 0.45326139f, 0.44741768f,
-0.44155479f, 0.43567299f, 0.42977253f, 0.42385365f, 0.41791662f,
-0.41196169f, 0.40598911f, 0.39999914f, 0.39399204f, 0.38796806f,
-0.38192746f, 0.37587050f, 0.36979743f, 0.36370853f, 0.35760405f,
-0.35148424f, 0.34534939f, 0.33919973f, 0.33303555f, 0.32685710f,
-0.32066465f, 0.31445847f, 0.30823881f, 0.30200595f, 0.29576015f,
-0.28950169f, 0.28323082f, 0.27694782f, 0.27065295f, 0.26434649f,
-0.25802871f, 0.25169988f, 0.24536026f, 0.23901013f, 0.23264977f,
-0.22627944f, 0.21989941f, 0.21350997f, 0.20711138f, 0.20070391f,
-0.19428785f, 0.18786347f, 0.18143104f, 0.17499084f, 0.16854314f,
-0.16208822f, 0.15562636f, 0.14915783f, 0.14268292f, 0.13620189f,
-0.12971502f, 0.12322260f, 0.11672491f, 0.11022221f, 0.10371479f,
-0.097202924f, 0.090686897f, 0.084166986f, 0.077643468f, 0.071116625f,
-0.064586736f, 0.058054080f, 0.051518937f, 0.044981587f, 0.038442310f,
-0.031901387f, 0.025359097f, 0.018815721f, 0.012271538f, 0.0057268303f,
--0.00081812300f, -0.0073630412f, -0.013907644f, -0.020451651f, -0.026994782f,
--0.033536757f, -0.040077295f, -0.046616116f, -0.053152941f, -0.059687488f,
--0.066219479f, -0.072748633f, -0.079274670f, -0.085797312f, -0.092316279f,
--0.098831291f, -0.10534207f, -0.11184834f, -0.11834981f, -0.12484622f,
--0.13133727f, -0.13782270f, -0.14430223f, -0.15077558f, -0.15724246f,
--0.16370261f, -0.17015575f, -0.17660160f, -0.18303989f, -0.18947033f,
--0.19589266f, -0.20230660f, -0.20871187f, -0.21510820f, -0.22149531f,
--0.22787294f, -0.23424080f, -0.24059864f, -0.24694616f, -0.25328311f,
--0.25960920f, -0.26592418f, -0.27222777f, -0.27851969f, -0.28479968f,
--0.29106748f, -0.29732280f, -0.30356539f, -0.30979497f, -0.31601129f,
--0.32221406f, -0.32840304f, -0.33457794f, -0.34073852f, -0.34688450f,
--0.35301562f, -0.35913161f, -0.36523223f, -0.37131719f, -0.37738626f,
--0.38343915f, -0.38947562f, -0.39549541f, -0.40149825f, -0.40748390f,
--0.41345209f, -0.41940257f, -0.42533508f, -0.43124938f, -0.43714520f,
--0.44302229f, -0.44888041f, -0.45471930f, -0.46053871f, -0.46633839f,
--0.47211810f, -0.47787758f, -0.48361659f, -0.48933489f, -0.49503222f,
--0.50070835f, -0.50636303f, -0.51199602f, -0.51760707f, -0.52319595f,
--0.52876243f, -0.53430625f, -0.53982718f, -0.54532499f, -0.55079944f,
--0.55625029f, -0.56167732f, -0.56708028f, -0.57245896f, -0.57781311f,
--0.58314251f, -0.58844693f, -0.59372614f, -0.59897992f, -0.60420805f,
--0.60941029f, -0.61458642f, -0.61973623f, -0.62485949f, -0.62995598f,
--0.63502549f, -0.64006780f, -0.64508268f, -0.65006994f, -0.65502934f,
--0.65996069f, -0.66486377f, -0.66973837f, -0.67458427f, -0.67940128f,
--0.68418919f, -0.68894779f, -0.69367688f, -0.69837625f, -0.70304571f,
--0.70768504f, -0.71229407f, -0.71687258f, -0.72142039f, -0.72593729f,
--0.73042309f, -0.73487761f, -0.73930064f, -0.74369201f, -0.74805152f,
--0.75237898f, -0.75667422f, -0.76093704f, -0.76516727f, -0.76936471f,
--0.77352921f, -0.77766056f, -0.78175861f, -0.78582316f, -0.78985406f,
--0.79385112f, -0.79781417f, -0.80174305f, -0.80563758f, -0.80949760f,
--0.81332295f, -0.81711346f, -0.82086896f, -0.82458930f, -0.82827432f,
--0.83192386f, -0.83553776f, -0.83911587f, -0.84265803f, -0.84616410f,
--0.84963392f, -0.85306735f, -0.85646423f, -0.85982442f, -0.86314779f,
--0.86643418f, -0.86968345f, -0.87289547f, -0.87607009f, -0.87920719f,
--0.88230663f, -0.88536827f, -0.88839199f, -0.89137765f, -0.89432512f,
--0.89723429f, -0.90010502f, -0.90293719f, -0.90573069f, -0.90848539f,
--0.91120117f, -0.91387791f, -0.91651551f, -0.91911385f, -0.92167282f,
--0.92419231f, -0.92667220f, -0.92911240f, -0.93151280f, -0.93387330f,
--0.93619380f, -0.93847419f, -0.94071438f, -0.94291427f, -0.94507377f,
--0.94719279f, -0.94927123f, -0.95130901f, -0.95330604f, -0.95526223f,
--0.95717750f, -0.95905177f, -0.96088496f, -0.96267699f, -0.96442777f,
--0.96613725f, -0.96780534f, -0.96943197f, -0.97101707f, -0.97256058f,
--0.97406243f, -0.97552255f, -0.97694089f, -0.97831737f, -0.97965195f,
--0.98094456f, -0.98219515f, -0.98340367f, -0.98457006f, -0.98569428f,
--0.98677627f, -0.98781599f, -0.98881340f, -0.98976845f, -0.99068110f,
--0.99155132f, -0.99237906f, -0.99316428f, -0.99390697f, -0.99460708f,
--0.99526458f, -0.99587945f, -0.99645166f, -0.99698119f, -0.99746801f,
--0.99791210f, -0.99831344f, -0.99867202f, -0.99898782f, -0.99926082f,
--0.99949102f, -0.99967841f, -0.99982297f, -0.99992470f, -0.99998360f,
-0.99999866f, 0.99989157f, 0.99961315f, 0.99916346f, 0.99854256f,
-0.99775057f, 0.99678762f, 0.99565388f, 0.99434953f, 0.99287481f,
-0.99122996f, 0.98941527f, 0.98743105f, 0.98527764f, 0.98295541f,
-0.98046475f, 0.97780610f, 0.97497990f, 0.97198664f, 0.96882685f,
-0.96550104f, 0.96200980f, 0.95835373f, 0.95453345f, 0.95054962f,
-0.94640291f, 0.94209404f, 0.93762375f, 0.93299280f, 0.92820199f,
-0.92325213f, 0.91814408f, 0.91287871f, 0.90745693f, 0.90187965f,
-0.89614785f, 0.89026249f, 0.88422459f, 0.87803519f, 0.87169533f,
-0.86520612f, 0.85856866f, 0.85178409f, 0.84485357f, 0.83777828f,
-0.83055945f, 0.82319831f, 0.81569611f, 0.80805415f, 0.80027373f,
-0.79235620f, 0.78430289f, 0.77611520f, 0.76779452f, 0.75934229f,
-0.75075995f, 0.74204897f, 0.73321084f, 0.72424708f, 0.71515923f,
-0.70594883f, 0.69661748f, 0.68716676f, 0.67759830f, 0.66791374f,
-0.65811474f, 0.64820297f, 0.63818013f, 0.62804795f, 0.61780815f,
-0.60746249f, 0.59701275f, 0.58646072f, 0.57580819f, 0.56505701f,
-0.55420900f, 0.54326604f, 0.53222998f, 0.52110274f, 0.50988620f,
-0.49858230f, 0.48719297f, 0.47572016f, 0.46416584f, 0.45253199f,
-0.44082059f, 0.42903367f, 0.41717323f, 0.40524131f, 0.39323996f,
-0.38117123f, 0.36903718f, 0.35683990f, 0.34458148f, 0.33226402f,
-0.31988962f, 0.30746042f, 0.29497853f, 0.28244610f, 0.26986527f,
-0.25723821f, 0.24456706f, 0.23185402f, 0.21910124f, 0.20631092f,
-0.19348526f, 0.18062644f, 0.16773667f, 0.15481816f, 0.14187312f,
-0.12890377f, 0.11591234f, 0.10290104f, 0.089872115f, 0.076827789f,
-0.063770300f, 0.050701883f, 0.037624779f, 0.024541229f, 0.011453473f,
--0.0016362454f, -0.014725683f, -0.027812598f, -0.040894747f, -0.053969889f,
--0.067035784f, -0.080090192f, -0.093130877f, -0.10615561f, -0.11916214f,
--0.13214826f, -0.14511174f, -0.15805036f, -0.17096189f, -0.18384413f,
--0.19669487f, -0.20951190f, -0.22229304f, -0.23503609f, -0.24773886f,
--0.26039919f, -0.27301490f, -0.28558383f, -0.29810383f, -0.31057274f,
--0.32298845f, -0.33534881f, -0.34765171f, -0.35989504f, -0.37207670f,
--0.38419461f, -0.39624670f, -0.40823088f, -0.42014512f, -0.43198737f,
--0.44375560f, -0.45544780f, -0.46706195f, -0.47859608f, -0.49004821f,
--0.50141636f, -0.51269860f, -0.52389299f, -0.53499762f, -0.54601058f,
--0.55692998f, -0.56775395f, -0.57848064f, -0.58910822f, -0.59963485f,
--0.61005873f, -0.62037809f, -0.63059115f, -0.64069616f, -0.65069139f,
--0.66057513f, -0.67034568f, -0.68000137f, -0.68954054f, -0.69896157f,
--0.70826283f, -0.71744274f, -0.72649972f, -0.73543221f, -0.74423869f,
--0.75291765f, -0.76146760f, -0.76988708f, -0.77817464f, -0.78632887f,
--0.79434836f, -0.80223175f, -0.80997767f, -0.81758481f, -0.82505187f,
--0.83237755f, -0.83956061f, -0.84659981f, -0.85349396f, -0.86024186f,
--0.86684237f, -0.87329434f, -0.87959669f, -0.88574831f, -0.89174817f,
--0.89759523f, -0.90328850f, -0.90882699f, -0.91420976f, -0.91943588f,
--0.92450446f, -0.92941463f, -0.93416555f, -0.93875641f, -0.94318642f,
--0.94745482f, -0.95156087f, -0.95550388f, -0.95928317f, -0.96289809f,
--0.96634802f, -0.96963238f, -0.97275059f, -0.97570213f, -0.97848649f,
--0.98110318f, -0.98355177f, -0.98583184f, -0.98794298f, -0.98988485f,
--0.99165711f, -0.99325945f, -0.99469160f, -0.99595331f, -0.99704438f,
--0.99796460f, -0.99871383f, -0.99929194f, -0.99969882f, -0.99993441f,
+    0.99999998f, 0.99999831f, 0.99999396f, 0.99998693f, 0.99997722f,
+    0.99996484f, 0.99994978f, 0.99993204f, 0.99991163f, 0.99988854f,
+    0.99986277f, 0.99983433f, 0.99980320f, 0.99976941f, 0.99973293f,
+    0.99969378f, 0.99965195f, 0.99960745f, 0.99956026f, 0.99951041f,
+    0.99945787f, 0.99940267f, 0.99934478f, 0.99928422f, 0.99922099f,
+    0.99915507f, 0.99908649f, 0.99901523f, 0.99894129f, 0.99886468f,
+    0.99878540f, 0.99870344f, 0.99861881f, 0.99853150f, 0.99844153f,
+    0.99834887f, 0.99825355f, 0.99815555f, 0.99805488f, 0.99795154f,
+    0.99784553f, 0.99773684f, 0.99762548f, 0.99751146f, 0.99739476f,
+    0.99727539f, 0.99715335f, 0.99702864f, 0.99690127f, 0.99677122f,
+    0.99663850f, 0.99650312f, 0.99636507f, 0.99622435f, 0.99608096f,
+    0.99593491f, 0.99578619f, 0.99563481f, 0.99548076f, 0.99532404f,
+    0.99516466f, 0.99500261f, 0.99483790f, 0.99467053f, 0.99450050f,
+    0.99432780f, 0.99415244f, 0.99397441f, 0.99379373f, 0.99361039f,
+    0.99342438f, 0.99323572f, 0.99304440f, 0.99285041f, 0.99265377f,
+    0.99245448f, 0.99225252f, 0.99204791f, 0.99184064f, 0.99163072f,
+    0.99141814f, 0.99120291f, 0.99098503f, 0.99076449f, 0.99054130f,
+    0.99031545f, 0.99008696f, 0.98985581f, 0.98962202f, 0.98938557f,
+    0.98914648f, 0.98890474f, 0.98866035f, 0.98841331f, 0.98816363f,
+    0.98791130f, 0.98765632f, 0.98739871f, 0.98713845f, 0.98687554f,
+    0.98660999f, 0.98634181f, 0.98607098f, 0.98579751f, 0.98552140f,
+    0.98524265f, 0.98496127f, 0.98467725f, 0.98439059f, 0.98410130f,
+    0.98380937f, 0.98351481f, 0.98321761f, 0.98291779f, 0.98261533f,
+    0.98231024f, 0.98200252f, 0.98169217f, 0.98137919f, 0.98106359f,
+    0.98074536f, 0.98042450f, 0.98010102f, 0.97977491f, 0.97944619f,
+    0.97911483f, 0.97878086f, 0.97844427f, 0.97810506f, 0.97776322f,
+    0.97741878f, 0.97707171f, 0.97672203f, 0.97636973f, 0.97601482f,
+    0.97565730f, 0.97529716f, 0.97493441f, 0.97456906f, 0.97420109f,
+    0.97383051f, 0.97345733f, 0.97308154f, 0.97270315f, 0.97232215f,
+    0.97193855f, 0.97155235f, 0.97116355f, 0.97077214f, 0.97037814f,
+    0.96998154f, 0.96958234f, 0.96918054f, 0.96877615f, 0.96836917f,
+    0.96795960f, 0.96754743f, 0.96713267f, 0.96671533f, 0.96629539f,
+    0.96587287f, 0.96544776f, 0.96502007f, 0.96458979f, 0.96415693f,
+    0.96372149f, 0.96328347f, 0.96284288f, 0.96239970f, 0.96195394f,
+    0.96150562f, 0.96105471f, 0.96060124f, 0.96014519f, 0.95968657f,
+    0.95922538f, 0.95876162f, 0.95829530f, 0.95782641f, 0.95735496f,
+    0.95688094f, 0.95640437f, 0.95592523f, 0.95544353f, 0.95495927f,
+    0.95447246f, 0.95398309f, 0.95349117f, 0.95299669f, 0.95249967f,
+    0.95200009f, 0.95149797f, 0.95099329f, 0.95048607f, 0.94997631f,
+    0.94946400f, 0.94894915f, 0.94843176f, 0.94791184f, 0.94738937f,
+    0.94686437f, 0.94633683f, 0.94580676f, 0.94527415f, 0.94473902f,
+    0.94420135f, 0.94366116f, 0.94311844f, 0.94257320f, 0.94202543f,
+    0.94147514f, 0.94092233f, 0.94036700f, 0.93980916f, 0.93924879f,
+    0.93868592f, 0.93812052f, 0.93755262f, 0.93698221f, 0.93640929f,
+    0.93583386f, 0.93525593f, 0.93467549f, 0.93409255f, 0.93350711f,
+    0.93291917f, 0.93232873f, 0.93173580f, 0.93114037f, 0.93054245f,
+    0.92994204f, 0.92933913f, 0.92873374f, 0.92812587f, 0.92751550f,
+    0.92690266f, 0.92628733f, 0.92566953f, 0.92504924f, 0.92442648f,
+    0.92380124f, 0.92317353f, 0.92254335f, 0.92191070f, 0.92127558f,
+    0.92063799f, 0.91999794f, 0.91935543f, 0.91871045f, 0.91806302f,
+    0.91741313f, 0.91676078f, 0.91610597f, 0.91544872f, 0.91478901f,
+    0.91412685f, 0.91346225f, 0.91279520f, 0.91212571f, 0.91145377f,
+    0.91077939f, 0.91010258f, 0.90942333f, 0.90874164f, 0.90805753f,
+    0.90737098f, 0.90668200f, 0.90599059f, 0.90529676f, 0.90460050f,
+    0.90390183f, 0.90320073f, 0.90249721f, 0.90179128f, 0.90108293f,
+    0.90037218f, 0.89965901f, 0.89894343f, 0.89822544f, 0.89750505f,
+    0.89678226f, 0.89605707f, 0.89532948f, 0.89459949f, 0.89386710f,
+    0.89313232f, 0.89239515f, 0.89165560f, 0.89091365f, 0.89016932f,
+    0.88942261f, 0.88867351f, 0.88792204f, 0.88716818f, 0.88641196f,
+    0.88565336f, 0.88489239f, 0.88412905f, 0.88336334f, 0.88259527f,
+    0.88182483f, 0.88105203f, 0.88027688f, 0.87949937f, 0.87871950f,
+    0.87793728f, 0.87715271f, 0.87636579f, 0.87557653f, 0.87478492f,
+    0.87399097f, 0.87319468f, 0.87239605f, 0.87159509f, 0.87079179f,
+    0.86998616f, 0.86917820f, 0.86836792f, 0.86755531f, 0.86674037f,
+    0.86592312f, 0.86510355f, 0.86428166f, 0.86345746f, 0.86263095f,
+    0.86180212f, 0.86097099f, 0.86013756f, 0.85930182f, 0.85846378f,
+    0.85762344f, 0.85678081f, 0.85593588f, 0.85508866f, 0.85423915f,
+    0.85338736f, 0.85253328f, 0.85167692f, 0.85081827f, 0.84995735f,
+    0.84909416f, 0.84822869f, 0.84736095f, 0.84649094f, 0.84561866f,
+    0.84474412f, 0.84386732f, 0.84298826f, 0.84210695f, 0.84122337f,
+    0.84033755f, 0.83944948f, 0.83855915f, 0.83766659f, 0.83677178f,
+    0.83587473f, 0.83497544f, 0.83407392f, 0.83317016f, 0.83226418f,
+    0.83135596f, 0.83044552f, 0.82953286f, 0.82861797f, 0.82770087f,
+    0.82678155f, 0.82586002f, 0.82493628f, 0.82401032f, 0.82308217f,
+    0.82215180f, 0.82121924f, 0.82028448f, 0.81934752f, 0.81840837f,
+    0.81746703f, 0.81652349f, 0.81557778f, 0.81462988f, 0.81367979f,
+    0.81272753f, 0.81177310f, 0.81081649f, 0.80985771f, 0.80889676f,
+    0.80793364f, 0.80696837f, 0.80600093f, 0.80503133f, 0.80405958f,
+    0.80308568f, 0.80210962f, 0.80113142f, 0.80015107f, 0.79916858f,
+    0.79818396f, 0.79719719f, 0.79620829f, 0.79521726f, 0.79422410f,
+    0.79322881f, 0.79223140f, 0.79123187f, 0.79023022f, 0.78922646f,
+    0.78822058f, 0.78721259f, 0.78620249f, 0.78519029f, 0.78417599f,
+    0.78315958f, 0.78214108f, 0.78112049f, 0.78009781f, 0.77907303f,
+    0.77804617f, 0.77701723f, 0.77598621f, 0.77495311f, 0.77391793f,
+    0.77288068f, 0.77184137f, 0.77079998f, 0.76975654f, 0.76871103f,
+    0.76766347f, 0.76661384f, 0.76556217f, 0.76450845f, 0.76345268f,
+    0.76239487f, 0.76133501f, 0.76027312f, 0.75920919f, 0.75814323f,
+    0.75707524f, 0.75600522f, 0.75493318f, 0.75385911f, 0.75278303f,
+    0.75170494f, 0.75062483f, 0.74954271f, 0.74845858f, 0.74737245f,
+    0.74628432f, 0.74519419f, 0.74410207f, 0.74300795f, 0.74191185f,
+    0.74081376f, 0.73971368f, 0.73861163f, 0.73750759f, 0.73640158f,
+    0.73529361f, 0.73418366f, 0.73307175f, 0.73195787f, 0.73084203f,
+    0.72972424f, 0.72860450f, 0.72748280f, 0.72635916f, 0.72523357f,
+    0.72410604f, 0.72297657f, 0.72184516f, 0.72071182f, 0.71957656f,
+    0.71843936f, 0.71730025f, 0.71615921f, 0.71501625f, 0.71387138f,
+    0.71272460f, 0.71157592f, 0.71042532f, 0.70927283f, 0.70811843f,
+    0.70696214f, 0.70580396f, 0.70464389f, 0.70348193f, 0.70231808f,
+    0.70115236f, 0.69998476f, 0.69881528f, 0.69764394f, 0.69647073f,
+    0.69529565f, 0.69411871f, 0.69293991f, 0.69175926f, 0.69057675f,
+    0.68939240f, 0.68820620f, 0.68701816f, 0.68582828f, 0.68463656f,
+    0.68344301f, 0.68224763f, 0.68105042f, 0.67985139f, 0.67865054f,
+    0.67744787f, 0.67624339f, 0.67503710f, 0.67382900f, 0.67261910f,
+    0.67140739f, 0.67019389f, 0.66897860f, 0.66776151f, 0.66654264f,
+    0.66532198f, 0.66409954f, 0.66287532f, 0.66164932f, 0.66042156f,
+    0.65919203f, 0.65796073f, 0.65672767f, 0.65549285f, 0.65425628f,
+    0.65301796f, 0.65177788f, 0.65053607f, 0.64929251f, 0.64804721f,
+    0.64680018f, 0.64555141f, 0.64430092f, 0.64304871f, 0.64179477f,
+    0.64053911f, 0.63928174f, 0.63802265f, 0.63676186f, 0.63549936f,
+    0.63423517f, 0.63296927f, 0.63170168f, 0.63043240f, 0.62916143f,
+    0.62788877f, 0.62661444f, 0.62533842f, 0.62406074f, 0.62278138f,
+    0.62150035f, 0.62021766f, 0.61893331f, 0.61764731f, 0.61635965f,
+    0.61507034f, 0.61377938f, 0.61248678f, 0.61119254f, 0.60989666f,
+    0.60859915f, 0.60730001f, 0.60599925f, 0.60469686f, 0.60339285f,
+    0.60208723f, 0.60078000f, 0.59947115f, 0.59816071f, 0.59684866f,
+    0.59553501f, 0.59421977f, 0.59290294f, 0.59158452f, 0.59026452f,
+    0.58894293f, 0.58761977f, 0.58629504f, 0.58496873f, 0.58364086f,
+    0.58231143f, 0.58098044f, 0.57964789f, 0.57831380f, 0.57697815f,
+    0.57564096f, 0.57430223f, 0.57296196f, 0.57162015f, 0.57027682f,
+    0.56893195f, 0.56758557f, 0.56623767f, 0.56488825f, 0.56353731f,
+    0.56218487f, 0.56083093f, 0.55947548f, 0.55811853f, 0.55676009f,
+    0.55540016f, 0.55403874f, 0.55267584f, 0.55131146f, 0.54994560f,
+    0.54857827f, 0.54720948f, 0.54583921f, 0.54446749f, 0.54309431f,
+    0.54171967f, 0.54034359f, 0.53896605f, 0.53758708f, 0.53620666f,
+    0.53482481f, 0.53344153f, 0.53205682f, 0.53067068f, 0.52928312f,
+    0.52789415f, 0.52650377f, 0.52511197f, 0.52371877f, 0.52232416f,
+    0.52092816f, 0.51953076f, 0.51813197f, 0.51673180f, 0.51533024f,
+    0.51392730f, 0.51252299f, 0.51111730f, 0.50971025f, 0.50830183f,
+    0.50689204f, 0.50548091f, 0.50406842f, 0.50265458f, 0.50123939f,
+    0.49982286f, 0.49840499f, 0.49698579f, 0.49556526f, 0.49414340f,
+    0.49272022f, 0.49129572f, 0.48986991f, 0.48844278f, 0.48701434f,
+    0.48558461f, 0.48415357f, 0.48272123f, 0.48128760f, 0.47985269f,
+    0.47841649f, 0.47697901f, 0.47554025f, 0.47410021f, 0.47265891f,
+    0.47121635f, 0.46977252f, 0.46832743f, 0.46688109f, 0.46543350f,
+    0.46398467f, 0.46253459f, 0.46108327f, 0.45963072f, 0.45817694f,
+    0.45672193f, 0.45526570f, 0.45380825f, 0.45234959f, 0.45088971f,
+    0.44942863f, 0.44796634f, 0.44650286f, 0.44503818f, 0.44357230f,
+    0.44210524f, 0.44063700f, 0.43916758f, 0.43769698f, 0.43622521f,
+    0.43475227f, 0.43327816f, 0.43180290f, 0.43032648f, 0.42884891f,
+    0.42737019f, 0.42589033f, 0.42440932f, 0.42292718f, 0.42144391f,
+    0.41995951f, 0.41847399f, 0.41698734f, 0.41549958f, 0.41401070f,
+    0.41252072f, 0.41102963f, 0.40953745f, 0.40804416f, 0.40654979f,
+    0.40505432f, 0.40355777f, 0.40206014f, 0.40056144f, 0.39906166f,
+    0.39756081f, 0.39605890f, 0.39455593f, 0.39305190f, 0.39154682f,
+    0.39004069f, 0.38853352f, 0.38702530f, 0.38551605f, 0.38400577f,
+    0.38249446f, 0.38098213f, 0.37946878f, 0.37795441f, 0.37643902f,
+    0.37492263f, 0.37340524f, 0.37188685f, 0.37036746f, 0.36884708f,
+    0.36732571f, 0.36580336f, 0.36428003f, 0.36275572f, 0.36123045f,
+    0.35970420f, 0.35817700f, 0.35664883f, 0.35511971f, 0.35358964f,
+    0.35205862f, 0.35052666f, 0.34899376f, 0.34745992f, 0.34592516f,
+    0.34438947f, 0.34285286f, 0.34131533f, 0.33977688f, 0.33823753f,
+    0.33669727f, 0.33515611f, 0.33361405f, 0.33207110f, 0.33052726f,
+    0.32898254f, 0.32743693f, 0.32589045f, 0.32434309f, 0.32279487f,
+    0.32124578f, 0.31969583f, 0.31814503f, 0.31659338f, 0.31504087f,
+    0.31348753f, 0.31193334f, 0.31037832f, 0.30882247f, 0.30726579f,
+    0.30570829f, 0.30414997f, 0.30259083f, 0.30103089f, 0.29947014f,
+    0.29790859f, 0.29634624f, 0.29478309f, 0.29321916f, 0.29165445f,
+    0.29008895f, 0.28852267f, 0.28695563f, 0.28538781f, 0.28381923f,
+    0.28224989f, 0.28067980f, 0.27910895f, 0.27753736f, 0.27596502f,
+    0.27439194f, 0.27281813f, 0.27124359f, 0.26966833f, 0.26809234f,
+    0.26651563f, 0.26493821f, 0.26336008f, 0.26178125f, 0.26020171f,
+    0.25862148f, 0.25704055f, 0.25545894f, 0.25387664f, 0.25229367f,
+    0.25071002f, 0.24912569f, 0.24754070f, 0.24595505f, 0.24436874f,
+    0.24278177f, 0.24119416f, 0.23960590f, 0.23801699f, 0.23642745f,
+    0.23483728f, 0.23324648f, 0.23165505f, 0.23006301f, 0.22847034f,
+    0.22687707f, 0.22528319f, 0.22368870f, 0.22209362f, 0.22049794f,
+    0.21890167f, 0.21730482f, 0.21570738f, 0.21410937f, 0.21251078f,
+    0.21091163f, 0.20931191f, 0.20771163f, 0.20611079f, 0.20450940f,
+    0.20290746f, 0.20130498f, 0.19970196f, 0.19809841f, 0.19649433f,
+    0.19488972f, 0.19328459f, 0.19167894f, 0.19007277f, 0.18846610f,
+    0.18685893f, 0.18525125f, 0.18364308f, 0.18203442f, 0.18042526f,
+    0.17881563f, 0.17720552f, 0.17559493f, 0.17398387f, 0.17237235f,
+    0.17076037f, 0.16914792f, 0.16753503f, 0.16592169f, 0.16430790f,
+    0.16269367f, 0.16107901f, 0.15946391f, 0.15784839f, 0.15623245f,
+    0.15461609f, 0.15299931f, 0.15138213f, 0.14976453f, 0.14814654f,
+    0.14652815f, 0.14490937f, 0.14329020f, 0.14167065f, 0.14005072f,
+    0.13843041f, 0.13680974f, 0.13518869f, 0.13356729f, 0.13194552f,
+    0.13032341f, 0.12870094f, 0.12707813f, 0.12545498f, 0.12383150f,
+    0.12220768f, 0.12058354f, 0.11895907f, 0.11733428f, 0.11570918f,
+    0.11408377f, 0.11245806f, 0.11083204f, 0.10920573f, 0.10757912f,
+    0.10595223f, 0.10432505f, 0.10269759f, 0.10106986f, 0.099441861f,
+    0.097813592f, 0.096185062f, 0.094556275f, 0.092927234f, 0.091297944f,
+    0.089668410f, 0.088038636f, 0.086408626f, 0.084778385f, 0.083147917f,
+    0.081517226f, 0.079886317f, 0.078255194f, 0.076623861f, 0.074992324f,
+    0.073360585f, 0.071728651f, 0.070096524f, 0.068464209f, 0.066831712f,
+    0.065199035f, 0.063566184f, 0.061933162f, 0.060299975f, 0.058666626f,
+    0.057033121f, 0.055399462f, 0.053765655f, 0.052131705f, 0.050497614f,
+    0.048863389f, 0.047229033f, 0.045594550f, 0.043959945f, 0.042325222f,
+    0.040690387f, 0.039055442f, 0.037420393f, 0.035785243f, 0.034149998f,
+    0.032514661f, 0.030879237f, 0.029243731f, 0.027608146f, 0.025972487f,
+    0.024336759f, 0.022700965f, 0.021065111f, 0.019429201f, 0.017793238f,
+    0.016157228f, 0.014521174f, 0.012885082f, 0.011248955f, 0.0096127982f,
+    0.0079766155f, 0.0063404114f, 0.0047041904f, 0.0030679568f, 0.0014317149f,
+    -0.00020453077f, -0.0018407759f, -0.0034770161f, -0.0051132470f, -0.0067494642f,
+    -0.0083856634f, -0.010021840f, -0.011657990f, -0.013294109f, -0.014930192f,
+    -0.016566235f, -0.018202233f, -0.019838183f, -0.021474080f, -0.023109920f,
+    -0.024745697f, -0.026381408f, -0.028017049f, -0.029652615f, -0.031288101f,
+    -0.032923503f, -0.034558818f, -0.036194040f, -0.037829164f, -0.039464188f,
+    -0.041099106f, -0.042733914f, -0.044368607f, -0.046003182f, -0.047637634f,
+    -0.049271958f, -0.050906150f, -0.052540206f, -0.054174121f, -0.055807891f,
+    -0.057441512f, -0.059074978f, -0.060708287f, -0.062341433f, -0.063974413f,
+    -0.065607221f, -0.067239853f, -0.068872305f, -0.070504573f, -0.072136653f,
+    -0.073768539f, -0.075400227f, -0.077031714f, -0.078662994f, -0.080294064f,
+    -0.081924919f, -0.083555555f, -0.085185966f, -0.086816150f, -0.088446102f,
+    -0.090075816f, -0.091705289f, -0.093334517f, -0.094963495f, -0.096592219f,
+    -0.098220684f, -0.099848886f, -0.10147682f, -0.10310448f, -0.10473187f,
+    -0.10635898f, -0.10798580f, -0.10961233f, -0.11123857f, -0.11286451f,
+    -0.11449015f, -0.11611549f, -0.11774051f, -0.11936521f, -0.12098960f,
+    -0.12261367f, -0.12423740f, -0.12586080f, -0.12748387f, -0.12910659f,
+    -0.13072897f, -0.13235100f, -0.13397267f, -0.13559399f, -0.13721494f,
+    -0.13883553f, -0.14045574f, -0.14207558f, -0.14369503f, -0.14531411f,
+    -0.14693279f, -0.14855108f, -0.15016897f, -0.15178646f, -0.15340354f,
+    -0.15502022f, -0.15663647f, -0.15825231f, -0.15986773f, -0.16148271f,
+    -0.16309727f, -0.16471139f, -0.16632506f, -0.16793829f, -0.16955108f,
+    -0.17116340f, -0.17277527f, -0.17438668f, -0.17599762f, -0.17760809f,
+    -0.17921808f, -0.18082760f, -0.18243663f, -0.18404517f, -0.18565322f,
+    -0.18726077f, -0.18886782f, -0.19047436f, -0.19208040f, -0.19368592f,
+    -0.19529092f, -0.19689540f, -0.19849935f, -0.20010277f, -0.20170565f,
+    -0.20330800f, -0.20490980f, -0.20651105f, -0.20811175f, -0.20971189f,
+    -0.21131147f, -0.21291048f, -0.21450893f, -0.21610680f, -0.21770409f,
+    -0.21930080f, -0.22089692f, -0.22249245f, -0.22408738f, -0.22568172f,
+    -0.22727545f, -0.22886857f, -0.23046108f, -0.23205297f, -0.23364424f,
+    -0.23523488f, -0.23682490f, -0.23841428f, -0.24000302f, -0.24159112f,
+    -0.24317858f, -0.24476538f, -0.24635153f, -0.24793701f, -0.24952184f,
+    -0.25110599f, -0.25268948f, -0.25427228f, -0.25585441f, -0.25743585f,
+    -0.25901660f, -0.26059666f, -0.26217602f, -0.26375468f, -0.26533263f,
+    -0.26690987f, -0.26848640f, -0.27006221f, -0.27163730f, -0.27321165f,
+    -0.27478528f, -0.27635817f, -0.27793032f, -0.27950173f, -0.28107239f,
+    -0.28264230f, -0.28421145f, -0.28577984f, -0.28734746f, -0.28891431f,
+    -0.29048039f, -0.29204570f, -0.29361022f, -0.29517395f, -0.29673690f,
+    -0.29829905f, -0.29986040f, -0.30142095f, -0.30298069f, -0.30453962f,
+    -0.30609774f, -0.30765504f, -0.30921151f, -0.31076715f, -0.31232197f,
+    -0.31387594f, -0.31542908f, -0.31698137f, -0.31853281f, -0.32008340f,
+    -0.32163313f, -0.32318201f, -0.32473001f, -0.32627715f, -0.32782341f,
+    -0.32936880f, -0.33091330f, -0.33245692f, -0.33399965f, -0.33554149f,
+    -0.33708242f, -0.33862245f, -0.34016158f, -0.34169980f, -0.34323710f,
+    -0.34477348f, -0.34630894f, -0.34784347f, -0.34937707f, -0.35090974f,
+    -0.35244146f, -0.35397224f, -0.35550208f, -0.35703096f, -0.35855889f,
+    -0.36008585f, -0.36161186f, -0.36313689f, -0.36466095f, -0.36618404f,
+    -0.36770615f, -0.36922727f, -0.37074740f, -0.37226654f, -0.37378468f,
+    -0.37530183f, -0.37681796f, -0.37833309f, -0.37984721f, -0.38136031f,
+    -0.38287239f, -0.38438344f, -0.38589346f, -0.38740245f, -0.38891041f,
+    -0.39041732f, -0.39192319f, -0.39342800f, -0.39493177f, -0.39643448f,
+    -0.39793612f, -0.39943670f, -0.40093621f, -0.40243465f, -0.40393201f,
+    -0.40542829f, -0.40692348f, -0.40841759f, -0.40991060f, -0.41140251f,
+    -0.41289332f, -0.41438303f, -0.41587162f, -0.41735911f, -0.41884547f,
+    -0.42033072f, -0.42181484f, -0.42329782f, -0.42477968f, -0.42626040f,
+    -0.42773998f, -0.42921841f, -0.43069569f, -0.43217182f, -0.43364680f,
+    -0.43512061f, -0.43659326f, -0.43806474f, -0.43953504f, -0.44100417f,
+    -0.44247212f, -0.44393888f, -0.44540446f, -0.44686884f, -0.44833203f,
+    -0.44979401f, -0.45125479f, -0.45271437f, -0.45417273f, -0.45562987f,
+    -0.45708580f, -0.45854050f, -0.45999398f, -0.46144622f, -0.46289723f,
+    -0.46434699f, -0.46579552f, -0.46724280f, -0.46868882f, -0.47013359f,
+    -0.47157711f, -0.47301936f, -0.47446034f, -0.47590006f, -0.47733850f,
+    -0.47877566f, -0.48021154f, -0.48164613f, -0.48307944f, -0.48451145f,
+    -0.48594216f, -0.48737158f, -0.48879968f, -0.49022648f, -0.49165197f,
+    -0.49307614f, -0.49449899f, -0.49592052f, -0.49734072f, -0.49875959f,
+    -0.50017712f, -0.50159331f, -0.50300816f, -0.50442167f, -0.50583382f,
+    -0.50724462f, -0.50865406f, -0.51006214f, -0.51146885f, -0.51287419f,
+    -0.51427817f, -0.51568076f, -0.51708197f, -0.51848180f, -0.51988024f,
+    -0.52127729f, -0.52267294f, -0.52406720f, -0.52546005f, -0.52685149f,
+    -0.52824153f, -0.52963015f, -0.53101735f, -0.53240313f, -0.53378748f,
+    -0.53517041f, -0.53655190f, -0.53793196f, -0.53931057f, -0.54068774f,
+    -0.54206347f, -0.54343774f, -0.54481056f, -0.54618192f, -0.54755181f,
+    -0.54892024f, -0.55028721f, -0.55165269f, -0.55301671f, -0.55437924f,
+    -0.55574028f, -0.55709984f, -0.55845791f, -0.55981448f, -0.56116955f,
+    -0.56252312f, -0.56387519f, -0.56522574f, -0.56657478f, -0.56792231f,
+    -0.56926831f, -0.57061279f, -0.57195575f, -0.57329717f, -0.57463705f,
+    -0.57597540f, -0.57731221f, -0.57864747f, -0.57998118f, -0.58131334f,
+    -0.58264394f, -0.58397298f, -0.58530046f, -0.58662637f, -0.58795071f,
+    -0.58927348f, -0.59059466f, -0.59191427f, -0.59323230f, -0.59454873f,
+    -0.59586357f, -0.59717682f, -0.59848847f, -0.59979852f, -0.60110696f,
+    -0.60241379f, -0.60371901f, -0.60502261f, -0.60632459f, -0.60762495f,
+    -0.60892368f, -0.61022078f, -0.61151625f, -0.61281008f, -0.61410227f,
+    -0.61539282f, -0.61668172f, -0.61796896f, -0.61925456f, -0.62053849f,
+    -0.62182077f, -0.62310138f, -0.62438032f, -0.62565759f, -0.62693318f,
+    -0.62820709f, -0.62947933f, -0.63074988f, -0.63201874f, -0.63328590f,
+    -0.63455138f, -0.63581515f, -0.63707722f, -0.63833758f, -0.63959624f,
+    -0.64085318f, -0.64210841f, -0.64336192f, -0.64461371f, -0.64586377f,
+    -0.64711210f, -0.64835870f, -0.64960356f, -0.65084668f, -0.65208807f,
+    -0.65332770f, -0.65456559f, -0.65580172f, -0.65703610f, -0.65826872f,
+    -0.65949958f, -0.66072867f, -0.66195599f, -0.66318154f, -0.66440531f,
+    -0.66562731f, -0.66684752f, -0.66806595f, -0.66928259f, -0.67049744f,
+    -0.67171049f, -0.67292174f, -0.67413119f, -0.67533884f, -0.67654468f,
+    -0.67774871f, -0.67895092f, -0.68015132f, -0.68134989f, -0.68254664f,
+    -0.68374157f, -0.68493466f, -0.68612592f, -0.68731534f, -0.68850292f,
+    -0.68968866f, -0.69087255f, -0.69205460f, -0.69323478f, -0.69441312f,
+    -0.69558959f, -0.69676420f, -0.69793695f, -0.69910783f, -0.70027684f,
+    -0.70144397f, -0.70260922f, -0.70377259f, -0.70493408f, -0.70609368f,
+    -0.70725139f, -0.70840721f, -0.70956113f, -0.71071315f, -0.71186327f,
+    -0.71301148f, -0.71415778f, -0.71530217f, -0.71644465f, -0.71758521f,
+    -0.71872384f, -0.71986055f, -0.72099534f, -0.72212819f, -0.72325912f,
+    -0.72438810f, -0.72551515f, -0.72664025f, -0.72776341f, -0.72888462f,
+    -0.73000387f, -0.73112118f, -0.73223652f, -0.73334991f, -0.73446133f,
+    -0.73557079f, -0.73667827f, -0.73778379f, -0.73888732f, -0.73998888f,
+    -0.74108846f, -0.74218606f, -0.74328167f, -0.74437529f, -0.74546691f,
+    -0.74655654f, -0.74764417f, -0.74872980f, -0.74981342f, -0.75089504f,
+    -0.75197465f, -0.75305224f, -0.75412782f, -0.75520138f, -0.75627291f,
+    -0.75734242f, -0.75840991f, -0.75947536f, -0.76053878f, -0.76160017f,
+    -0.76265951f, -0.76371681f, -0.76477207f, -0.76582528f, -0.76687644f,
+    -0.76792555f, -0.76897260f, -0.77001759f, -0.77106052f, -0.77210139f,
+    -0.77314019f, -0.77417692f, -0.77521158f, -0.77624416f, -0.77727466f,
+    -0.77830308f, -0.77932942f, -0.78035367f, -0.78137584f, -0.78239591f,
+    -0.78341388f, -0.78442976f, -0.78544354f, -0.78645521f, -0.78746478f,
+    -0.78847224f, -0.78947760f, -0.79048083f, -0.79148195f, -0.79248095f,
+    -0.79347783f, -0.79447259f, -0.79546522f, -0.79645572f, -0.79744408f,
+    -0.79843031f, -0.79941441f, -0.80039636f, -0.80137617f, -0.80235384f,
+    -0.80332935f, -0.80430272f, -0.80527393f, -0.80624299f, -0.80720989f,
+    -0.80817462f, -0.80913720f, -0.81009760f, -0.81105584f, -0.81201191f,
+    -0.81296580f, -0.81391752f, -0.81486706f, -0.81581441f, -0.81675958f,
+    -0.81770257f, -0.81864336f, -0.81958197f, -0.82051837f, -0.82145259f,
+    -0.82238460f, -0.82331441f, -0.82424202f, -0.82516742f, -0.82609061f,
+    -0.82701159f, -0.82793036f, -0.82884690f, -0.82976123f, -0.83067334f,
+    -0.83158323f, -0.83249088f, -0.83339631f, -0.83429951f, -0.83520047f,
+    -0.83609920f, -0.83699569f, -0.83788994f, -0.83878195f, -0.83967171f,
+    -0.84055922f, -0.84144448f, -0.84232749f, -0.84320824f, -0.84408674f,
+    -0.84496297f, -0.84583694f, -0.84670865f, -0.84757810f, -0.84844527f,
+    -0.84931017f, -0.85017280f, -0.85103315f, -0.85189122f, -0.85274701f,
+    -0.85360052f, -0.85445175f, -0.85530068f, -0.85614733f, -0.85699168f,
+    -0.85783374f, -0.85867350f, -0.85951097f, -0.86034613f, -0.86117899f,
+    -0.86200954f, -0.86283779f, -0.86366373f, -0.86448735f, -0.86530866f,
+    -0.86612765f, -0.86694432f, -0.86775868f, -0.86857071f, -0.86938041f,
+    -0.87018779f, -0.87099283f, -0.87179555f, -0.87259593f, -0.87339397f,
+    -0.87418968f, -0.87498304f, -0.87577407f, -0.87656274f, -0.87734907f,
+    -0.87813306f, -0.87891469f, -0.87969397f, -0.88047089f, -0.88124545f,
+    -0.88201766f, -0.88278751f, -0.88355499f, -0.88432010f, -0.88508285f,
+    -0.88584323f, -0.88660124f, -0.88735687f, -0.88811013f, -0.88886101f,
+    -0.88960951f, -0.89035563f, -0.89109936f, -0.89184071f, -0.89257967f,
+    -0.89331624f, -0.89405042f, -0.89478221f, -0.89551160f, -0.89623859f,
+    -0.89696318f, -0.89768538f, -0.89840516f, -0.89912255f, -0.89983752f,
+    -0.90055009f, -0.90126025f, -0.90196799f, -0.90267332f, -0.90337623f,
+    -0.90407672f, -0.90477479f, -0.90547044f, -0.90616367f, -0.90685447f,
+    -0.90754284f, -0.90822878f, -0.90891229f, -0.90959337f, -0.91027201f,
+    -0.91094822f, -0.91162198f, -0.91229331f, -0.91296219f, -0.91362863f,
+    -0.91429262f, -0.91495417f, -0.91561326f, -0.91626990f, -0.91692409f,
+    -0.91757583f, -0.91822511f, -0.91887193f, -0.91951629f, -0.92015819f,
+    -0.92079762f, -0.92143459f, -0.92206909f, -0.92270113f, -0.92333069f,
+    -0.92395778f, -0.92458240f, -0.92520454f, -0.92582421f, -0.92644140f,
+    -0.92705610f, -0.92766833f, -0.92827807f, -0.92888532f, -0.92949009f,
+    -0.93009237f, -0.93069216f, -0.93128946f, -0.93188427f, -0.93247658f,
+    -0.93306639f, -0.93365370f, -0.93423852f, -0.93482083f, -0.93540065f,
+    -0.93597795f, -0.93655275f, -0.93712505f, -0.93769483f, -0.93826211f,
+    -0.93882687f, -0.93938912f, -0.93994885f, -0.94050607f, -0.94106077f,
+    -0.94161295f, -0.94216261f, -0.94270975f, -0.94325436f, -0.94379644f,
+    -0.94433601f, -0.94487304f, -0.94540754f, -0.94593951f, -0.94646895f,
+    -0.94699585f, -0.94752022f, -0.94804206f, -0.94856135f, -0.94907810f,
+    -0.94959232f, -0.95010399f, -0.95061312f, -0.95111970f, -0.95162374f,
+    -0.95212522f, -0.95262416f, -0.95312055f, -0.95361439f, -0.95410567f,
+    -0.95459440f, -0.95508058f, -0.95556419f, -0.95604525f, -0.95652375f,
+    -0.95699969f, -0.95747306f, -0.95794388f, -0.95841212f, -0.95887780f,
+    -0.95934092f, -0.95980146f, -0.96025944f, -0.96071485f, -0.96116768f,
+    -0.96161794f, -0.96206562f, -0.96251073f, -0.96295327f, -0.96339322f,
+    -0.96383060f, -0.96426539f, -0.96469760f, -0.96512723f, -0.96555428f,
+    -0.96597874f, -0.96640062f, -0.96681991f, -0.96723660f, -0.96765071f,
+    -0.96806223f, -0.96847116f, -0.96887749f, -0.96928124f, -0.96968238f,
+    -0.97008093f, -0.97047688f, -0.97087024f, -0.97126099f, -0.97164914f,
+    -0.97203470f, -0.97241765f, -0.97279799f, -0.97317574f, -0.97355087f,
+    -0.97392340f, -0.97429333f, -0.97466064f, -0.97502535f, -0.97538744f,
+    -0.97574692f, -0.97610379f, -0.97645805f, -0.97680969f, -0.97715872f,
+    -0.97750513f, -0.97784893f, -0.97819010f, -0.97852866f, -0.97886460f,
+    -0.97919792f, -0.97952861f, -0.97985669f, -0.98018214f, -0.98050496f,
+    -0.98082516f, -0.98114274f, -0.98145768f, -0.98177000f, -0.98207970f,
+    -0.98238676f, -0.98269119f, -0.98299299f, -0.98329216f, -0.98358870f,
+    -0.98388260f, -0.98417387f, -0.98446250f, -0.98474850f, -0.98503186f,
+    -0.98531259f, -0.98559068f, -0.98586612f, -0.98613893f, -0.98640910f,
+    -0.98667663f, -0.98694151f, -0.98720376f, -0.98746336f, -0.98772032f,
+    -0.98797463f, -0.98822630f, -0.98847532f, -0.98872169f, -0.98896542f,
+    -0.98920650f, -0.98944493f, -0.98968071f, -0.98991385f, -0.99014433f,
+    -0.99037216f, -0.99059734f, -0.99081987f, -0.99103975f, -0.99125697f,
+    -0.99147154f, -0.99168345f, -0.99189271f, -0.99209931f, -0.99230326f,
+    -0.99250455f, -0.99270318f, -0.99289916f, -0.99309248f, -0.99328313f,
+    -0.99347113f, -0.99365647f, -0.99383915f, -0.99401917f, -0.99419653f,
+    -0.99437122f, -0.99454325f, -0.99471262f, -0.99487933f, -0.99504337f,
+    -0.99520475f, -0.99536347f, -0.99551952f, -0.99567290f, -0.99582362f,
+    -0.99597167f, -0.99611706f, -0.99625978f, -0.99639983f, -0.99653722f,
+    -0.99667193f, -0.99680398f, -0.99693336f, -0.99706007f, -0.99718411f,
+    -0.99730548f, -0.99742418f, -0.99754021f, -0.99765357f, -0.99776426f,
+    -0.99787228f, -0.99797763f, -0.99808030f, -0.99818030f, -0.99827763f,
+    -0.99837229f, -0.99846427f, -0.99855358f, -0.99864022f, -0.99872418f,
+    -0.99880547f, -0.99888409f, -0.99896003f, -0.99903329f, -0.99910389f,
+    -0.99917180f, -0.99923705f, -0.99929961f, -0.99935950f, -0.99941672f,
+    -0.99947126f, -0.99952312f, -0.99957231f, -0.99961882f, -0.99966266f,
+    -0.99970382f, -0.99974230f, -0.99977811f, -0.99981124f, -0.99984169f,
+    -0.99986946f, -0.99989456f, -0.99991698f, -0.99993673f, -0.99995380f,
+    -0.99996819f, -0.99997990f, -0.99998894f, -0.99999529f, -0.99999898f,
+    0.99999992f, 0.99999322f, 0.99997582f, 0.99994771f, 0.99990889f,
+    0.99985936f, 0.99979913f, 0.99972818f, 0.99964653f, 0.99955418f,
+    0.99945112f, 0.99933736f, 0.99921289f, 0.99907773f, 0.99893186f,
+    0.99877530f, 0.99860804f, 0.99843009f, 0.99824144f, 0.99804211f,
+    0.99783209f, 0.99761138f, 0.99737998f, 0.99713791f, 0.99688516f,
+    0.99662173f, 0.99634763f, 0.99606285f, 0.99576741f, 0.99546131f,
+    0.99514455f, 0.99481713f, 0.99447905f, 0.99413033f, 0.99377096f,
+    0.99340095f, 0.99302029f, 0.99262901f, 0.99222709f, 0.99181455f,
+    0.99139139f, 0.99095760f, 0.99051321f, 0.99005821f, 0.98959261f,
+    0.98911641f, 0.98862961f, 0.98813223f, 0.98762427f, 0.98710573f,
+    0.98657662f, 0.98603694f, 0.98548670f, 0.98492591f, 0.98435457f,
+    0.98377269f, 0.98318028f, 0.98257734f, 0.98196387f, 0.98133989f,
+    0.98070539f, 0.98006040f, 0.97940491f, 0.97873893f, 0.97806247f,
+    0.97737554f, 0.97667813f, 0.97597027f, 0.97525196f, 0.97452320f,
+    0.97378401f, 0.97303439f, 0.97227435f, 0.97150389f, 0.97072303f,
+    0.96993178f, 0.96913014f, 0.96831812f, 0.96749573f, 0.96666298f,
+    0.96581987f, 0.96496643f, 0.96410265f, 0.96322854f, 0.96234412f,
+    0.96144939f, 0.96054437f, 0.95962906f, 0.95870347f, 0.95776762f,
+    0.95682151f, 0.95586515f, 0.95489856f, 0.95392174f, 0.95293471f,
+    0.95193746f, 0.95093003f, 0.94991241f, 0.94888462f, 0.94784667f,
+    0.94679856f, 0.94574032f, 0.94467195f, 0.94359346f, 0.94250486f,
+    0.94140618f, 0.94029741f, 0.93917857f, 0.93804967f, 0.93691073f,
+    0.93576176f, 0.93460276f, 0.93343375f, 0.93225475f, 0.93106577f,
+    0.92986681f, 0.92865789f, 0.92743903f, 0.92621024f, 0.92497153f,
+    0.92372291f, 0.92246440f, 0.92119602f, 0.91991776f, 0.91862966f,
+    0.91733172f, 0.91602395f, 0.91470637f, 0.91337900f, 0.91204185f,
+    0.91069493f, 0.90933825f, 0.90797184f, 0.90659570f, 0.90520986f,
+    0.90381432f, 0.90240910f, 0.90099422f, 0.89956969f, 0.89813553f,
+    0.89669174f, 0.89523836f, 0.89377538f, 0.89230284f, 0.89082074f,
+    0.88932910f, 0.88782793f, 0.88631726f, 0.88479710f, 0.88326746f,
+    0.88172836f, 0.88017982f, 0.87862185f, 0.87705448f, 0.87547771f,
+    0.87389156f, 0.87229606f, 0.87069121f, 0.86907704f, 0.86745357f,
+    0.86582080f, 0.86417876f, 0.86252747f, 0.86086694f, 0.85919719f,
+    0.85751824f, 0.85583010f, 0.85413281f, 0.85242636f, 0.85071078f,
+    0.84898610f, 0.84725232f, 0.84550947f, 0.84375756f, 0.84199662f,
+    0.84022666f, 0.83844771f, 0.83665977f, 0.83486287f, 0.83305704f,
+    0.83124228f, 0.82941862f, 0.82758608f, 0.82574467f, 0.82389442f,
+    0.82203535f, 0.82016748f, 0.81829082f, 0.81640540f, 0.81451123f,
+    0.81260835f, 0.81069676f, 0.80877649f, 0.80684755f, 0.80490998f,
+    0.80296379f, 0.80100899f, 0.79904562f, 0.79707370f, 0.79509323f,
+    0.79310425f, 0.79110678f, 0.78910084f, 0.78708644f, 0.78506362f,
+    0.78303239f, 0.78099277f, 0.77894479f, 0.77688847f, 0.77482382f,
+    0.77275088f, 0.77066967f, 0.76858020f, 0.76648250f, 0.76437659f,
+    0.76226250f, 0.76014024f, 0.75800984f, 0.75587132f, 0.75372471f,
+    0.75157003f, 0.74940730f, 0.74723654f, 0.74505779f, 0.74287105f,
+    0.74067635f, 0.73847373f, 0.73626320f, 0.73404478f, 0.73181850f,
+    0.72958438f, 0.72734245f, 0.72509273f, 0.72283525f, 0.72057002f,
+    0.71829708f, 0.71601644f, 0.71372814f, 0.71143220f, 0.70912863f,
+    0.70681747f, 0.70449874f, 0.70217247f, 0.69983868f, 0.69749739f,
+    0.69514863f, 0.69279243f, 0.69042881f, 0.68805780f, 0.68567941f,
+    0.68329369f, 0.68090064f, 0.67850031f, 0.67609270f, 0.67367786f,
+    0.67125580f, 0.66882656f, 0.66639015f, 0.66394661f, 0.66149595f,
+    0.65903821f, 0.65657341f, 0.65410159f, 0.65162275f, 0.64913694f,
+    0.64664418f, 0.64414449f, 0.64163790f, 0.63912444f, 0.63660414f,
+    0.63407702f, 0.63154311f, 0.62900244f, 0.62645503f, 0.62390091f,
+    0.62134011f, 0.61877265f, 0.61619857f, 0.61361789f, 0.61103064f,
+    0.60843685f, 0.60583654f, 0.60322974f, 0.60061648f, 0.59799679f,
+    0.59537069f, 0.59273822f, 0.59009940f, 0.58745427f, 0.58480284f,
+    0.58214514f, 0.57948122f, 0.57681109f, 0.57413478f, 0.57145232f,
+    0.56876374f, 0.56606907f, 0.56336834f, 0.56066158f, 0.55794881f,
+    0.55523006f, 0.55250537f, 0.54977477f, 0.54703827f, 0.54429592f,
+    0.54154774f, 0.53879376f, 0.53603401f, 0.53326852f, 0.53049731f,
+    0.52772043f, 0.52493790f, 0.52214974f, 0.51935599f, 0.51655668f,
+    0.51375184f, 0.51094149f, 0.50812568f, 0.50530442f, 0.50247775f,
+    0.49964570f, 0.49680830f, 0.49396558f, 0.49111757f, 0.48826430f,
+    0.48540580f, 0.48254210f, 0.47967323f, 0.47679923f, 0.47392012f,
+    0.47103594f, 0.46814671f, 0.46525247f, 0.46235324f, 0.45944907f,
+    0.45653997f, 0.45362599f, 0.45070714f, 0.44778347f, 0.44485501f,
+    0.44192178f, 0.43898381f, 0.43604115f, 0.43309382f, 0.43014185f,
+    0.42718527f, 0.42422412f, 0.42125842f, 0.41828822f, 0.41531353f,
+    0.41233440f, 0.40935085f, 0.40636291f, 0.40337063f, 0.40037402f,
+    0.39737313f, 0.39436798f, 0.39135861f, 0.38834505f, 0.38532733f,
+    0.38230548f, 0.37927953f, 0.37624953f, 0.37321550f, 0.37017747f,
+    0.36713547f, 0.36408955f, 0.36103972f, 0.35798603f, 0.35492850f,
+    0.35186718f, 0.34880208f, 0.34573325f, 0.34266072f, 0.33958451f,
+    0.33650468f, 0.33342123f, 0.33033422f, 0.32724367f, 0.32414961f,
+    0.32105209f, 0.31795112f, 0.31484675f, 0.31173901f, 0.30862793f,
+    0.30551354f, 0.30239588f, 0.29927499f, 0.29615089f, 0.29302362f,
+    0.28989321f, 0.28675969f, 0.28362310f, 0.28048348f, 0.27734085f,
+    0.27419526f, 0.27104672f, 0.26789529f, 0.26474098f, 0.26158384f,
+    0.25842390f, 0.25526119f, 0.25209575f, 0.24892761f, 0.24575680f,
+    0.24258336f, 0.23940732f, 0.23622872f, 0.23304759f, 0.22986396f,
+    0.22667787f, 0.22348935f, 0.22029844f, 0.21710517f, 0.21390958f,
+    0.21071169f, 0.20751155f, 0.20430919f, 0.20110463f, 0.19789793f,
+    0.19468910f, 0.19147819f, 0.18826523f, 0.18505026f, 0.18183330f,
+    0.17861439f, 0.17539357f, 0.17217088f, 0.16894634f, 0.16571999f,
+    0.16249186f, 0.15926200f, 0.15603043f, 0.15279719f, 0.14956231f,
+    0.14632583f, 0.14308778f, 0.13984820f, 0.13660713f, 0.13336459f,
+    0.13012062f, 0.12687526f, 0.12362854f, 0.12038049f, 0.11713116f,
+    0.11388057f, 0.11062877f, 0.10737578f, 0.10412163f, 0.10086638f,
+    0.097610040f, 0.094352658f, 0.091094266f, 0.087834897f, 0.084574589f,
+    0.081313374f, 0.078051289f, 0.074788367f, 0.071524645f, 0.068260157f,
+    0.064994938f, 0.061729023f, 0.058462447f, 0.055195244f, 0.051927451f,
+    0.048659101f, 0.045390231f, 0.042120874f, 0.038851066f, 0.035580842f,
+    0.032310238f, 0.029039287f, 0.025768025f, 0.022496487f, 0.019224708f,
+    0.015952723f, 0.012680568f, 0.0094082767f, 0.0061358846f, 0.0028634269f,
+    -0.00040906153f, -0.0036815456f, -0.0069539902f, -0.010226360f, -0.013498621f,
+    -0.016770737f, -0.020042673f, -0.023314395f, -0.026585867f, -0.029857055f,
+    -0.033127923f, -0.036398436f, -0.039668559f, -0.042938257f, -0.046207495f,
+    -0.049476239f, -0.052744453f, -0.056012102f, -0.059279151f, -0.062545565f,
+    -0.065811309f, -0.069076349f, -0.072340649f, -0.075604174f, -0.078866890f,
+    -0.082128761f, -0.085389752f, -0.088649829f, -0.091908956f, -0.095167100f,
+    -0.098424224f, -0.10168029f, -0.10493528f, -0.10818913f, -0.11144183f,
+    -0.11469334f, -0.11794361f, -0.12119263f, -0.12444034f, -0.12768673f,
+    -0.13093174f, -0.13417536f, -0.13741753f, -0.14065824f, -0.14389744f,
+    -0.14713510f, -0.15037118f, -0.15360565f, -0.15683848f, -0.16006962f,
+    -0.16329906f, -0.16652674f, -0.16975264f, -0.17297673f, -0.17619896f,
+    -0.17941930f, -0.18263772f, -0.18585419f, -0.18906866f, -0.19228112f,
+    -0.19549151f, -0.19869981f, -0.20190598f, -0.20510998f, -0.20831180f,
+    -0.21151138f, -0.21470869f, -0.21790371f, -0.22109639f, -0.22428671f,
+    -0.22747462f, -0.23066010f, -0.23384310f, -0.23702361f, -0.24020157f,
+    -0.24337696f, -0.24654975f, -0.24971989f, -0.25288736f, -0.25605213f,
+    -0.25921415f, -0.26237339f, -0.26552983f, -0.26868342f, -0.27183413f,
+    -0.27498193f, -0.27812679f, -0.28126867f, -0.28440754f, -0.28754336f,
+    -0.29067610f, -0.29380573f, -0.29693221f, -0.30005551f, -0.30317560f,
+    -0.30629245f, -0.30940601f, -0.31251626f, -0.31562316f, -0.31872668f,
+    -0.32182679f, -0.32492345f, -0.32801664f, -0.33110631f, -0.33419243f,
+    -0.33727497f, -0.34035391f, -0.34342920f, -0.34650081f, -0.34956871f,
+    -0.35263286f, -0.35569324f, -0.35874981f, -0.36180254f, -0.36485139f,
+    -0.36789634f, -0.37093735f, -0.37397438f, -0.37700741f, -0.38003640f,
+    -0.38306132f, -0.38608214f, -0.38909883f, -0.39211135f, -0.39511967f,
+    -0.39812375f, -0.40112358f, -0.40411910f, -0.40711031f, -0.41009715f,
+    -0.41307959f, -0.41605762f, -0.41903119f, -0.42200027f, -0.42496483f,
+    -0.42792484f, -0.43088027f, -0.43383109f, -0.43677726f, -0.43971875f,
+    -0.44265553f, -0.44558757f, -0.44851484f, -0.45143731f, -0.45435494f,
+    -0.45726770f, -0.46017557f, -0.46307851f, -0.46597650f, -0.46886949f,
+    -0.47175746f, -0.47464038f, -0.47751821f, -0.48039093f, -0.48325851f,
+    -0.48612091f, -0.48897811f, -0.49183006f, -0.49467676f, -0.49751815f,
+    -0.50035422f, -0.50318492f, -0.50601024f, -0.50883014f, -0.51164459f,
+    -0.51445356f, -0.51725703f, -0.52005495f, -0.52284730f, -0.52563406f,
+    -0.52841518f, -0.53119065f, -0.53396043f, -0.53672449f, -0.53948280f,
+    -0.54223533f, -0.54498206f, -0.54772295f, -0.55045797f, -0.55318710f,
+    -0.55591031f, -0.55862756f, -0.56133883f, -0.56404409f, -0.56674331f,
+    -0.56943646f, -0.57212351f, -0.57480443f, -0.57747920f, -0.58014778f,
+    -0.58281015f, -0.58546628f, -0.58811614f, -0.59075970f, -0.59339694f,
+    -0.59602782f, -0.59865231f, -0.60127040f, -0.60388204f, -0.60648722f,
+    -0.60908591f, -0.61167807f, -0.61426368f, -0.61684271f, -0.61941514f,
+    -0.62198093f, -0.62454007f, -0.62709251f, -0.62963824f, -0.63217722f,
+    -0.63470944f, -0.63723486f, -0.63975345f, -0.64226519f, -0.64477006f,
+    -0.64726802f, -0.64975905f, -0.65224312f, -0.65472020f, -0.65719027f,
+    -0.65965331f, -0.66210928f, -0.66455816f, -0.66699992f, -0.66943454f,
+    -0.67186199f, -0.67428225f, -0.67669528f, -0.67910107f, -0.68149959f,
+    -0.68389080f, -0.68627470f, -0.68865124f, -0.69102041f, -0.69338218f,
+    -0.69573652f, -0.69808341f, -0.70042283f, -0.70275474f, -0.70507913f,
+    -0.70739597f, -0.70970524f, -0.71200690f, -0.71430093f, -0.71658732f,
+    -0.71886604f, -0.72113705f, -0.72340034f, -0.72565589f, -0.72790366f,
+    -0.73014364f, -0.73237580f, -0.73460012f, -0.73681657f, -0.73902513f,
+    -0.74122577f, -0.74341848f, -0.74560322f, -0.74777998f, -0.74994874f,
+    -0.75210946f, -0.75426212f, -0.75640671f, -0.75854320f, -0.76067157f,
+    -0.76279178f, -0.76490383f, -0.76700769f, -0.76910334f, -0.77119075f,
+    -0.77326989f, -0.77534076f, -0.77740333f, -0.77945757f, -0.78150346f,
+    -0.78354098f, -0.78557011f, -0.78759083f, -0.78960312f, -0.79160694f,
+    -0.79360229f, -0.79558915f, -0.79756748f, -0.79953727f, -0.80149850f,
+    -0.80345114f, -0.80539518f, -0.80733060f, -0.80925737f, -0.81117547f,
+    -0.81308489f, -0.81498559f, -0.81687757f, -0.81876081f, -0.82063527f,
+    -0.82250095f, -0.82435781f, -0.82620585f, -0.82804505f, -0.82987537f,
+    -0.83169681f, -0.83350933f, -0.83531294f, -0.83710760f, -0.83889329f,
+    -0.84067000f, -0.84243770f, -0.84419639f, -0.84594603f, -0.84768662f,
+    -0.84941812f, -0.85114053f, -0.85285383f, -0.85455799f, -0.85625300f,
+    -0.85793884f, -0.85961549f, -0.86128294f, -0.86294116f, -0.86459014f,
+    -0.86622986f, -0.86786031f, -0.86948146f, -0.87109330f, -0.87269581f,
+    -0.87428898f, -0.87587278f, -0.87744720f, -0.87901223f, -0.88056784f,
+    -0.88211402f, -0.88365076f, -0.88517803f, -0.88669582f, -0.88820412f,
+    -0.88970290f, -0.89119216f, -0.89267187f, -0.89414203f, -0.89560260f,
+    -0.89705359f, -0.89849497f, -0.89992673f, -0.90134885f, -0.90276131f,
+    -0.90416411f, -0.90555723f, -0.90694065f, -0.90831436f, -0.90967833f,
+    -0.91103257f, -0.91237705f, -0.91371176f, -0.91503669f, -0.91635181f,
+    -0.91765712f, -0.91895261f, -0.92023825f, -0.92151404f, -0.92277996f,
+    -0.92403600f, -0.92528214f, -0.92651837f, -0.92774468f, -0.92896106f,
+    -0.93016748f, -0.93136395f, -0.93255044f, -0.93372694f, -0.93489345f,
+    -0.93604994f, -0.93719641f, -0.93833284f, -0.93945922f, -0.94057555f,
+    -0.94168180f, -0.94277796f, -0.94386403f, -0.94493999f, -0.94600583f,
+    -0.94706154f, -0.94810711f, -0.94914252f, -0.95016777f, -0.95118284f,
+    -0.95218773f, -0.95318242f, -0.95416690f, -0.95514117f, -0.95610520f,
+    -0.95705900f, -0.95800255f, -0.95893583f, -0.95985885f, -0.96077159f,
+    -0.96167404f, -0.96256619f, -0.96344803f, -0.96431956f, -0.96518076f,
+    -0.96603162f, -0.96687213f, -0.96770230f, -0.96852209f, -0.96933152f,
+    -0.97013057f, -0.97091922f, -0.97169748f, -0.97246533f, -0.97322277f,
+    -0.97396979f, -0.97470637f, -0.97543252f, -0.97614822f, -0.97685347f,
+    -0.97754825f, -0.97823257f, -0.97890641f, -0.97956977f, -0.98022263f,
+    -0.98086500f, -0.98149687f, -0.98211822f, -0.98272906f, -0.98332937f,
+    -0.98391915f, -0.98449840f, -0.98506710f, -0.98562525f, -0.98617285f,
+    -0.98670988f, -0.98723635f, -0.98775225f, -0.98825757f, -0.98875230f,
+    -0.98923645f, -0.98971000f, -0.99017295f, -0.99062530f, -0.99106704f,
+    -0.99149817f, -0.99191868f, -0.99232857f, -0.99272783f, -0.99311645f,
+    -0.99349445f, -0.99386180f, -0.99421851f, -0.99456457f, -0.99489998f,
+    -0.99522474f, -0.99553884f, -0.99584227f, -0.99613505f, -0.99641715f,
+    -0.99668858f, -0.99694934f, -0.99719943f, -0.99743883f, -0.99766756f,
+    -0.99788559f, -0.99809295f, -0.99828961f, -0.99847558f, -0.99865086f,
+    -0.99881544f, -0.99896933f, -0.99911252f, -0.99924501f, -0.99936680f,
+    -0.99947789f, -0.99957827f, -0.99966795f, -0.99974692f, -0.99981519f,
+    -0.99987275f, -0.99991960f, -0.99995574f, -0.99998118f, -0.99999590f,
+    0.99999967f, 0.99997289f, 0.99990328f, 0.99979084f, 0.99963557f,
+    0.99943748f, 0.99919658f, 0.99891288f, 0.99858638f, 0.99821711f,
+    0.99780508f, 0.99735031f, 0.99685281f, 0.99631261f, 0.99572973f,
+    0.99510420f, 0.99443605f, 0.99372529f, 0.99297196f, 0.99217610f,
+    0.99133774f, 0.99045692f, 0.98953366f, 0.98856802f, 0.98756003f,
+    0.98650973f, 0.98541718f, 0.98428242f, 0.98310549f, 0.98188645f,
+    0.98062534f, 0.97932224f, 0.97797718f, 0.97659022f, 0.97516144f,
+    0.97369088f, 0.97217861f, 0.97062469f, 0.96902920f, 0.96739220f,
+    0.96571376f, 0.96399395f, 0.96223284f, 0.96043052f, 0.95858705f,
+    0.95670253f, 0.95477702f, 0.95281061f, 0.95080338f, 0.94875543f,
+    0.94666684f, 0.94453769f, 0.94236808f, 0.94015810f, 0.93790786f,
+    0.93561743f, 0.93328693f, 0.93091644f, 0.92850608f, 0.92605595f,
+    0.92356614f, 0.92103677f, 0.91846795f, 0.91585979f, 0.91321239f,
+    0.91052587f, 0.90780035f, 0.90503595f, 0.90223277f, 0.89939095f,
+    0.89651059f, 0.89359184f, 0.89063481f, 0.88763962f, 0.88460641f,
+    0.88153531f, 0.87842644f, 0.87527995f, 0.87209596f, 0.86887462f,
+    0.86561605f, 0.86232041f, 0.85898782f, 0.85561844f, 0.85221241f,
+    0.84876987f, 0.84529098f, 0.84177587f, 0.83822471f, 0.83463763f,
+    0.83101481f, 0.82735639f, 0.82366252f, 0.81993338f, 0.81616911f,
+    0.81236987f, 0.80853584f, 0.80466718f, 0.80076404f, 0.79682660f,
+    0.79285503f, 0.78884950f, 0.78481017f, 0.78073723f, 0.77663084f,
+    0.77249118f, 0.76831844f, 0.76411277f, 0.75987438f, 0.75560344f,
+    0.75130013f, 0.74696464f, 0.74259715f, 0.73819784f, 0.73376692f,
+    0.72930457f, 0.72481097f, 0.72028632f, 0.71573083f, 0.71114467f,
+    0.70652804f, 0.70188116f, 0.69720420f, 0.69249738f, 0.68776090f,
+    0.68299495f, 0.67819975f, 0.67337550f, 0.66852240f, 0.66364066f,
+    0.65873050f, 0.65379211f, 0.64882573f, 0.64383154f, 0.63880978f,
+    0.63376065f, 0.62868438f, 0.62358117f, 0.61845126f, 0.61329485f,
+    0.60811216f, 0.60290343f, 0.59766888f, 0.59240872f, 0.58712318f,
+    0.58181249f, 0.57647688f, 0.57111658f, 0.56573181f, 0.56032281f,
+    0.55488980f, 0.54943303f, 0.54395272f, 0.53844911f, 0.53292243f,
+    0.52737292f, 0.52180083f, 0.51620638f, 0.51058981f, 0.50495138f,
+    0.49929132f, 0.49360987f, 0.48790727f, 0.48218377f, 0.47643962f,
+    0.47067506f, 0.46489034f, 0.45908570f, 0.45326139f, 0.44741768f,
+    0.44155479f, 0.43567299f, 0.42977253f, 0.42385365f, 0.41791662f,
+    0.41196169f, 0.40598911f, 0.39999914f, 0.39399204f, 0.38796806f,
+    0.38192746f, 0.37587050f, 0.36979743f, 0.36370853f, 0.35760405f,
+    0.35148424f, 0.34534939f, 0.33919973f, 0.33303555f, 0.32685710f,
+    0.32066465f, 0.31445847f, 0.30823881f, 0.30200595f, 0.29576015f,
+    0.28950169f, 0.28323082f, 0.27694782f, 0.27065295f, 0.26434649f,
+    0.25802871f, 0.25169988f, 0.24536026f, 0.23901013f, 0.23264977f,
+    0.22627944f, 0.21989941f, 0.21350997f, 0.20711138f, 0.20070391f,
+    0.19428785f, 0.18786347f, 0.18143104f, 0.17499084f, 0.16854314f,
+    0.16208822f, 0.15562636f, 0.14915783f, 0.14268292f, 0.13620189f,
+    0.12971502f, 0.12322260f, 0.11672491f, 0.11022221f, 0.10371479f,
+    0.097202924f, 0.090686897f, 0.084166986f, 0.077643468f, 0.071116625f,
+    0.064586736f, 0.058054080f, 0.051518937f, 0.044981587f, 0.038442310f,
+    0.031901387f, 0.025359097f, 0.018815721f, 0.012271538f, 0.0057268303f,
+    -0.00081812300f, -0.0073630412f, -0.013907644f, -0.020451651f, -0.026994782f,
+    -0.033536757f, -0.040077295f, -0.046616116f, -0.053152941f, -0.059687488f,
+    -0.066219479f, -0.072748633f, -0.079274670f, -0.085797312f, -0.092316279f,
+    -0.098831291f, -0.10534207f, -0.11184834f, -0.11834981f, -0.12484622f,
+    -0.13133727f, -0.13782270f, -0.14430223f, -0.15077558f, -0.15724246f,
+    -0.16370261f, -0.17015575f, -0.17660160f, -0.18303989f, -0.18947033f,
+    -0.19589266f, -0.20230660f, -0.20871187f, -0.21510820f, -0.22149531f,
+    -0.22787294f, -0.23424080f, -0.24059864f, -0.24694616f, -0.25328311f,
+    -0.25960920f, -0.26592418f, -0.27222777f, -0.27851969f, -0.28479968f,
+    -0.29106748f, -0.29732280f, -0.30356539f, -0.30979497f, -0.31601129f,
+    -0.32221406f, -0.32840304f, -0.33457794f, -0.34073852f, -0.34688450f,
+    -0.35301562f, -0.35913161f, -0.36523223f, -0.37131719f, -0.37738626f,
+    -0.38343915f, -0.38947562f, -0.39549541f, -0.40149825f, -0.40748390f,
+    -0.41345209f, -0.41940257f, -0.42533508f, -0.43124938f, -0.43714520f,
+    -0.44302229f, -0.44888041f, -0.45471930f, -0.46053871f, -0.46633839f,
+    -0.47211810f, -0.47787758f, -0.48361659f, -0.48933489f, -0.49503222f,
+    -0.50070835f, -0.50636303f, -0.51199602f, -0.51760707f, -0.52319595f,
+    -0.52876243f, -0.53430625f, -0.53982718f, -0.54532499f, -0.55079944f,
+    -0.55625029f, -0.56167732f, -0.56708028f, -0.57245896f, -0.57781311f,
+    -0.58314251f, -0.58844693f, -0.59372614f, -0.59897992f, -0.60420805f,
+    -0.60941029f, -0.61458642f, -0.61973623f, -0.62485949f, -0.62995598f,
+    -0.63502549f, -0.64006780f, -0.64508268f, -0.65006994f, -0.65502934f,
+    -0.65996069f, -0.66486377f, -0.66973837f, -0.67458427f, -0.67940128f,
+    -0.68418919f, -0.68894779f, -0.69367688f, -0.69837625f, -0.70304571f,
+    -0.70768504f, -0.71229407f, -0.71687258f, -0.72142039f, -0.72593729f,
+    -0.73042309f, -0.73487761f, -0.73930064f, -0.74369201f, -0.74805152f,
+    -0.75237898f, -0.75667422f, -0.76093704f, -0.76516727f, -0.76936471f,
+    -0.77352921f, -0.77766056f, -0.78175861f, -0.78582316f, -0.78985406f,
+    -0.79385112f, -0.79781417f, -0.80174305f, -0.80563758f, -0.80949760f,
+    -0.81332295f, -0.81711346f, -0.82086896f, -0.82458930f, -0.82827432f,
+    -0.83192386f, -0.83553776f, -0.83911587f, -0.84265803f, -0.84616410f,
+    -0.84963392f, -0.85306735f, -0.85646423f, -0.85982442f, -0.86314779f,
+    -0.86643418f, -0.86968345f, -0.87289547f, -0.87607009f, -0.87920719f,
+    -0.88230663f, -0.88536827f, -0.88839199f, -0.89137765f, -0.89432512f,
+    -0.89723429f, -0.90010502f, -0.90293719f, -0.90573069f, -0.90848539f,
+    -0.91120117f, -0.91387791f, -0.91651551f, -0.91911385f, -0.92167282f,
+    -0.92419231f, -0.92667220f, -0.92911240f, -0.93151280f, -0.93387330f,
+    -0.93619380f, -0.93847419f, -0.94071438f, -0.94291427f, -0.94507377f,
+    -0.94719279f, -0.94927123f, -0.95130901f, -0.95330604f, -0.95526223f,
+    -0.95717750f, -0.95905177f, -0.96088496f, -0.96267699f, -0.96442777f,
+    -0.96613725f, -0.96780534f, -0.96943197f, -0.97101707f, -0.97256058f,
+    -0.97406243f, -0.97552255f, -0.97694089f, -0.97831737f, -0.97965195f,
+    -0.98094456f, -0.98219515f, -0.98340367f, -0.98457006f, -0.98569428f,
+    -0.98677627f, -0.98781599f, -0.98881340f, -0.98976845f, -0.99068110f,
+    -0.99155132f, -0.99237906f, -0.99316428f, -0.99390697f, -0.99460708f,
+    -0.99526458f, -0.99587945f, -0.99645166f, -0.99698119f, -0.99746801f,
+    -0.99791210f, -0.99831344f, -0.99867202f, -0.99898782f, -0.99926082f,
+    -0.99949102f, -0.99967841f, -0.99982297f, -0.99992470f, -0.99998360f,
+    0.99999866f, 0.99989157f, 0.99961315f, 0.99916346f, 0.99854256f,
+    0.99775057f, 0.99678762f, 0.99565388f, 0.99434953f, 0.99287481f,
+    0.99122996f, 0.98941527f, 0.98743105f, 0.98527764f, 0.98295541f,
+    0.98046475f, 0.97780610f, 0.97497990f, 0.97198664f, 0.96882685f,
+    0.96550104f, 0.96200980f, 0.95835373f, 0.95453345f, 0.95054962f,
+    0.94640291f, 0.94209404f, 0.93762375f, 0.93299280f, 0.92820199f,
+    0.92325213f, 0.91814408f, 0.91287871f, 0.90745693f, 0.90187965f,
+    0.89614785f, 0.89026249f, 0.88422459f, 0.87803519f, 0.87169533f,
+    0.86520612f, 0.85856866f, 0.85178409f, 0.84485357f, 0.83777828f,
+    0.83055945f, 0.82319831f, 0.81569611f, 0.80805415f, 0.80027373f,
+    0.79235620f, 0.78430289f, 0.77611520f, 0.76779452f, 0.75934229f,
+    0.75075995f, 0.74204897f, 0.73321084f, 0.72424708f, 0.71515923f,
+    0.70594883f, 0.69661748f, 0.68716676f, 0.67759830f, 0.66791374f,
+    0.65811474f, 0.64820297f, 0.63818013f, 0.62804795f, 0.61780815f,
+    0.60746249f, 0.59701275f, 0.58646072f, 0.57580819f, 0.56505701f,
+    0.55420900f, 0.54326604f, 0.53222998f, 0.52110274f, 0.50988620f,
+    0.49858230f, 0.48719297f, 0.47572016f, 0.46416584f, 0.45253199f,
+    0.44082059f, 0.42903367f, 0.41717323f, 0.40524131f, 0.39323996f,
+    0.38117123f, 0.36903718f, 0.35683990f, 0.34458148f, 0.33226402f,
+    0.31988962f, 0.30746042f, 0.29497853f, 0.28244610f, 0.26986527f,
+    0.25723821f, 0.24456706f, 0.23185402f, 0.21910124f, 0.20631092f,
+    0.19348526f, 0.18062644f, 0.16773667f, 0.15481816f, 0.14187312f,
+    0.12890377f, 0.11591234f, 0.10290104f, 0.089872115f, 0.076827789f,
+    0.063770300f, 0.050701883f, 0.037624779f, 0.024541229f, 0.011453473f,
+    -0.0016362454f, -0.014725683f, -0.027812598f, -0.040894747f, -0.053969889f,
+    -0.067035784f, -0.080090192f, -0.093130877f, -0.10615561f, -0.11916214f,
+    -0.13214826f, -0.14511174f, -0.15805036f, -0.17096189f, -0.18384413f,
+    -0.19669487f, -0.20951190f, -0.22229304f, -0.23503609f, -0.24773886f,
+    -0.26039919f, -0.27301490f, -0.28558383f, -0.29810383f, -0.31057274f,
+    -0.32298845f, -0.33534881f, -0.34765171f, -0.35989504f, -0.37207670f,
+    -0.38419461f, -0.39624670f, -0.40823088f, -0.42014512f, -0.43198737f,
+    -0.44375560f, -0.45544780f, -0.46706195f, -0.47859608f, -0.49004821f,
+    -0.50141636f, -0.51269860f, -0.52389299f, -0.53499762f, -0.54601058f,
+    -0.55692998f, -0.56775395f, -0.57848064f, -0.58910822f, -0.59963485f,
+    -0.61005873f, -0.62037809f, -0.63059115f, -0.64069616f, -0.65069139f,
+    -0.66057513f, -0.67034568f, -0.68000137f, -0.68954054f, -0.69896157f,
+    -0.70826283f, -0.71744274f, -0.72649972f, -0.73543221f, -0.74423869f,
+    -0.75291765f, -0.76146760f, -0.76988708f, -0.77817464f, -0.78632887f,
+    -0.79434836f, -0.80223175f, -0.80997767f, -0.81758481f, -0.82505187f,
+    -0.83237755f, -0.83956061f, -0.84659981f, -0.85349396f, -0.86024186f,
+    -0.86684237f, -0.87329434f, -0.87959669f, -0.88574831f, -0.89174817f,
+    -0.89759523f, -0.90328850f, -0.90882699f, -0.91420976f, -0.91943588f,
+    -0.92450446f, -0.92941463f, -0.93416555f, -0.93875641f, -0.94318642f,
+    -0.94745482f, -0.95156087f, -0.95550388f, -0.95928317f, -0.96289809f,
+    -0.96634802f, -0.96963238f, -0.97275059f, -0.97570213f, -0.97848649f,
+    -0.98110318f, -0.98355177f, -0.98583184f, -0.98794298f, -0.98988485f,
+    -0.99165711f, -0.99325945f, -0.99469160f, -0.99595331f, -0.99704438f,
+    -0.99796460f, -0.99871383f, -0.99929194f, -0.99969882f, -0.99993441f,
 };
-#endif
+# endif
 
 static const CELTMode mode96000_1920_240 = {
-96000,    /* Fs */
-240,    /* overlap */
-21,    /* nbEBands */
-21,    /* effEBands */
-{0.92300415f, 0.22000122f, 1.5128347f, 0.66101074f, },    /* preemph */
-eband5ms,    /* eBands */
-3,    /* maxLM */
-8,    /* nbShortMdcts */
-240,    /* shortMdctSize */
-11,    /* nbAllocVectors */
-band_allocation,    /* allocVectors */
-logN400,    /* logN */
-window240,    /* window */
-{3840, 3, {&fft_state96000_1920_0, &fft_state96000_1920_1, &fft_state96000_1920_2, &fft_state96000_1920_3, }, mdct_twiddles1920},    /* mdct */
-{392, cache_index50, cache_bits50, cache_caps50},    /* cache */
+    96000, /* Fs */
+    240, /* overlap */
+    21, /* nbEBands */
+    21, /* effEBands */
+    {0.92300415f, 0.22000122f, 1.5128347f, 0.66101074f, }, /* preemph */
+    eband5ms, /* eBands */
+    3, /* maxLM */
+    8, /* nbShortMdcts */
+    240, /* shortMdctSize */
+    11, /* nbAllocVectors */
+    band_allocation, /* allocVectors */
+    logN400, /* logN */
+    window240, /* window */
+    {3840, 3, {&fft_state96000_1920_0, &fft_state96000_1920_1, &fft_state96000_1920_2, &fft_state96000_1920_3, },
+     mdct_twiddles1920},                                                                                                             /* mdct */
+    {392, cache_index50, cache_bits50, cache_caps50}, /* cache */
 };
 #endif /* ENABLE_QEXT */
 
 /* List of all the available modes */
 #ifdef ENABLE_QEXT
-#define TOTAL_MODES 2
+# define TOTAL_MODES 2
 static const CELTMode * const static_mode_list[TOTAL_MODES] = {
-&mode48000_960_120,
-&mode96000_1920_240,
+    &mode48000_960_120,
+    &mode96000_1920_240,
 };
 #else
-#define TOTAL_MODES 1
+# define TOTAL_MODES 1
 static const CELTMode * const static_mode_list[TOTAL_MODES] = {
-&mode48000_960_120,
+    &mode48000_960_120,
 };
 #endif
diff --git a/celt/static_modes_float_arm_ne10.h b/celt/static_modes_float_arm_ne10.h
index 66e1abb10..6b9b7241a 100644
--- a/celt/static_modes_float_arm_ne10.h
+++ b/celt/static_modes_float_arm_ne10.h
@@ -4,401 +4,401 @@
 #include <NE10_types.h>
 
 #ifndef NE10_FFT_PARAMS48000_960
-#define NE10_FFT_PARAMS48000_960
+# define NE10_FFT_PARAMS48000_960
 static const ne10_int32_t ne10_factors_480[64] = {
-4, 40, 4, 30, 2, 15, 5, 3, 3, 1, 1, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, };
+    4, 40, 4, 30, 2, 15, 5, 3, 3, 1, 1, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, };
 static const ne10_int32_t ne10_factors_240[64] = {
-3, 20, 4, 15, 5, 3, 3, 1, 1, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, };
+    3, 20, 4, 15, 5, 3, 3, 1, 1, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, };
 static const ne10_int32_t ne10_factors_120[64] = {
-3, 10, 2, 15, 5, 3, 3, 1, 1, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, };
+    3, 10, 2, 15, 5, 3, 3, 1, 1, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, };
 static const ne10_int32_t ne10_factors_60[64] = {
-2, 5, 5, 3, 3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, };
+    2, 5, 5, 3, 3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, };
 static const ne10_fft_cpx_float32_t ne10_twiddles_480[480] = {
-{1.0000000f,0.0000000f}, {1.0000000f,-0.0000000f}, {1.0000000f,-0.0000000f},
-{1.0000000f,-0.0000000f}, {0.91354543f,-0.40673664f}, {0.66913056f,-0.74314487f},
-{1.0000000f,-0.0000000f}, {0.66913056f,-0.74314487f}, {-0.10452851f,-0.99452192f},
-{1.0000000f,-0.0000000f}, {0.30901697f,-0.95105654f}, {-0.80901700f,-0.58778518f},
-{1.0000000f,-0.0000000f}, {-0.10452851f,-0.99452192f}, {-0.97814757f,0.20791179f},
-{1.0000000f,-0.0000000f}, {0.97814763f,-0.20791170f}, {0.91354543f,-0.40673664f},
-{0.80901700f,-0.58778524f}, {0.66913056f,-0.74314487f}, {0.49999997f,-0.86602545f},
-{0.30901697f,-0.95105654f}, {0.10452842f,-0.99452192f}, {-0.10452851f,-0.99452192f},
-{-0.30901703f,-0.95105648f}, {-0.50000006f,-0.86602533f}, {-0.66913068f,-0.74314475f},
-{-0.80901700f,-0.58778518f}, {-0.91354549f,-0.40673658f}, {-0.97814763f,-0.20791161f},
-{1.0000000f,-0.0000000f}, {0.99862951f,-0.052335959f}, {0.99452192f,-0.10452846f},
-{0.98768836f,-0.15643448f}, {0.97814763f,-0.20791170f}, {0.96592581f,-0.25881904f},
-{0.95105648f,-0.30901700f}, {0.93358040f,-0.35836795f}, {0.91354543f,-0.40673664f},
-{0.89100653f,-0.45399052f}, {0.86602545f,-0.50000000f}, {0.83867055f,-0.54463905f},
-{0.80901700f,-0.58778524f}, {0.77714598f,-0.62932038f}, {0.74314475f,-0.66913062f},
-{0.70710677f,-0.70710683f}, {0.66913056f,-0.74314487f}, {0.62932038f,-0.77714598f},
-{0.58778524f,-0.80901700f}, {0.54463899f,-0.83867055f}, {0.49999997f,-0.86602545f},
-{0.45399052f,-0.89100653f}, {0.40673661f,-0.91354549f}, {0.35836786f,-0.93358046f},
-{0.30901697f,-0.95105654f}, {0.25881907f,-0.96592581f}, {0.20791166f,-0.97814763f},
-{0.15643437f,-0.98768836f}, {0.10452842f,-0.99452192f}, {0.052335974f,-0.99862951f},
-{1.0000000f,-0.0000000f}, {0.99452192f,-0.10452846f}, {0.97814763f,-0.20791170f},
-{0.95105648f,-0.30901700f}, {0.91354543f,-0.40673664f}, {0.86602545f,-0.50000000f},
-{0.80901700f,-0.58778524f}, {0.74314475f,-0.66913062f}, {0.66913056f,-0.74314487f},
-{0.58778524f,-0.80901700f}, {0.49999997f,-0.86602545f}, {0.40673661f,-0.91354549f},
-{0.30901697f,-0.95105654f}, {0.20791166f,-0.97814763f}, {0.10452842f,-0.99452192f},
-{-4.3711388e-08f,-1.0000000f}, {-0.10452851f,-0.99452192f}, {-0.20791174f,-0.97814757f},
-{-0.30901703f,-0.95105648f}, {-0.40673670f,-0.91354543f}, {-0.50000006f,-0.86602533f},
-{-0.58778518f,-0.80901700f}, {-0.66913068f,-0.74314475f}, {-0.74314493f,-0.66913044f},
-{-0.80901700f,-0.58778518f}, {-0.86602539f,-0.50000006f}, {-0.91354549f,-0.40673658f},
-{-0.95105654f,-0.30901679f}, {-0.97814763f,-0.20791161f}, {-0.99452192f,-0.10452849f},
-{1.0000000f,-0.0000000f}, {0.98768836f,-0.15643448f}, {0.95105648f,-0.30901700f},
-{0.89100653f,-0.45399052f}, {0.80901700f,-0.58778524f}, {0.70710677f,-0.70710683f},
-{0.58778524f,-0.80901700f}, {0.45399052f,-0.89100653f}, {0.30901697f,-0.95105654f},
-{0.15643437f,-0.98768836f}, {-4.3711388e-08f,-1.0000000f}, {-0.15643445f,-0.98768836f},
-{-0.30901703f,-0.95105648f}, {-0.45399061f,-0.89100647f}, {-0.58778518f,-0.80901700f},
-{-0.70710677f,-0.70710677f}, {-0.80901700f,-0.58778518f}, {-0.89100659f,-0.45399037f},
-{-0.95105654f,-0.30901679f}, {-0.98768836f,-0.15643445f}, {-1.0000000f,8.7422777e-08f},
-{-0.98768830f,0.15643461f}, {-0.95105654f,0.30901697f}, {-0.89100653f,0.45399055f},
-{-0.80901694f,0.58778536f}, {-0.70710665f,0.70710689f}, {-0.58778507f,0.80901712f},
-{-0.45399022f,0.89100665f}, {-0.30901709f,0.95105648f}, {-0.15643452f,0.98768830f},
-{1.0000000f,-0.0000000f}, {0.99991435f,-0.013089596f}, {0.99965733f,-0.026176950f},
-{0.99922901f,-0.039259817f}, {0.99862951f,-0.052335959f}, {0.99785894f,-0.065403134f},
-{0.99691731f,-0.078459099f}, {0.99580491f,-0.091501623f}, {0.99452192f,-0.10452846f},
-{0.99306846f,-0.11753740f}, {0.99144489f,-0.13052620f}, {0.98965138f,-0.14349262f},
-{0.98768836f,-0.15643448f}, {0.98555607f,-0.16934951f}, {0.98325491f,-0.18223552f},
-{0.98078525f,-0.19509032f}, {0.97814763f,-0.20791170f}, {0.97534233f,-0.22069745f},
-{0.97236991f,-0.23344538f}, {0.96923089f,-0.24615330f}, {0.96592581f,-0.25881904f},
-{0.96245521f,-0.27144045f}, {0.95881975f,-0.28401536f}, {0.95501995f,-0.29654160f},
-{0.95105648f,-0.30901700f}, {0.94693011f,-0.32143945f}, {0.94264150f,-0.33380687f},
-{0.93819129f,-0.34611708f}, {0.93358040f,-0.35836795f}, {0.92880952f,-0.37055743f},
-{0.92387956f,-0.38268346f}, {0.91879117f,-0.39474389f}, {0.91354543f,-0.40673664f},
-{0.90814316f,-0.41865975f}, {0.90258527f,-0.43051112f}, {0.89687270f,-0.44228873f},
-{0.89100653f,-0.45399052f}, {0.88498765f,-0.46561453f}, {0.87881708f,-0.47715878f},
-{0.87249601f,-0.48862126f}, {0.86602545f,-0.50000000f}, {0.85940641f,-0.51129311f},
-{0.85264015f,-0.52249855f}, {0.84572786f,-0.53361452f}, {0.83867055f,-0.54463905f},
-{0.83146960f,-0.55557024f}, {0.82412618f,-0.56640625f}, {0.81664151f,-0.57714522f},
-{0.80901700f,-0.58778524f}, {0.80125380f,-0.59832460f}, {0.79335332f,-0.60876143f},
-{0.78531694f,-0.61909395f}, {0.77714598f,-0.62932038f}, {0.76884180f,-0.63943899f},
-{0.76040596f,-0.64944810f}, {0.75183982f,-0.65934587f}, {0.74314475f,-0.66913062f},
-{0.73432249f,-0.67880076f}, {0.72537434f,-0.68835455f}, {0.71630192f,-0.69779050f},
-{0.70710677f,-0.70710683f}, {0.69779044f,-0.71630198f}, {0.68835455f,-0.72537440f},
-{0.67880070f,-0.73432255f}, {0.66913056f,-0.74314487f}, {0.65934581f,-0.75183982f},
-{0.64944804f,-0.76040596f}, {0.63943899f,-0.76884186f}, {0.62932038f,-0.77714598f},
-{0.61909395f,-0.78531694f}, {0.60876137f,-0.79335338f}, {0.59832460f,-0.80125386f},
-{0.58778524f,-0.80901700f}, {0.57714516f,-0.81664151f}, {0.56640625f,-0.82412618f},
-{0.55557019f,-0.83146960f}, {0.54463899f,-0.83867055f}, {0.53361452f,-0.84572786f},
-{0.52249849f,-0.85264015f}, {0.51129311f,-0.85940641f}, {0.49999997f,-0.86602545f},
-{0.48862118f,-0.87249601f}, {0.47715876f,-0.87881708f}, {0.46561447f,-0.88498765f},
-{0.45399052f,-0.89100653f}, {0.44228867f,-0.89687276f}, {0.43051103f,-0.90258533f},
-{0.41865975f,-0.90814316f}, {0.40673661f,-0.91354549f}, {0.39474380f,-0.91879129f},
-{0.38268343f,-0.92387956f}, {0.37055740f,-0.92880958f}, {0.35836786f,-0.93358046f},
-{0.34611705f,-0.93819135f}, {0.33380681f,-0.94264150f}, {0.32143947f,-0.94693011f},
-{0.30901697f,-0.95105654f}, {0.29654151f,-0.95501995f}, {0.28401533f,-0.95881975f},
-{0.27144039f,-0.96245527f}, {0.25881907f,-0.96592581f}, {0.24615327f,-0.96923089f},
-{0.23344530f,-0.97236991f}, {0.22069745f,-0.97534233f}, {0.20791166f,-0.97814763f},
-{0.19509023f,-0.98078531f}, {0.18223552f,-0.98325491f}, {0.16934945f,-0.98555607f},
-{0.15643437f,-0.98768836f}, {0.14349259f,-0.98965138f}, {0.13052613f,-0.99144489f},
-{0.11753740f,-0.99306846f}, {0.10452842f,-0.99452192f}, {0.091501534f,-0.99580491f},
-{0.078459084f,-0.99691731f}, {0.065403074f,-0.99785894f}, {0.052335974f,-0.99862951f},
-{0.039259788f,-0.99922901f}, {0.026176875f,-0.99965733f}, {0.013089597f,-0.99991435f},
-{1.0000000f,-0.0000000f}, {0.99965733f,-0.026176950f}, {0.99862951f,-0.052335959f},
-{0.99691731f,-0.078459099f}, {0.99452192f,-0.10452846f}, {0.99144489f,-0.13052620f},
-{0.98768836f,-0.15643448f}, {0.98325491f,-0.18223552f}, {0.97814763f,-0.20791170f},
-{0.97236991f,-0.23344538f}, {0.96592581f,-0.25881904f}, {0.95881975f,-0.28401536f},
-{0.95105648f,-0.30901700f}, {0.94264150f,-0.33380687f}, {0.93358040f,-0.35836795f},
-{0.92387956f,-0.38268346f}, {0.91354543f,-0.40673664f}, {0.90258527f,-0.43051112f},
-{0.89100653f,-0.45399052f}, {0.87881708f,-0.47715878f}, {0.86602545f,-0.50000000f},
-{0.85264015f,-0.52249855f}, {0.83867055f,-0.54463905f}, {0.82412618f,-0.56640625f},
-{0.80901700f,-0.58778524f}, {0.79335332f,-0.60876143f}, {0.77714598f,-0.62932038f},
-{0.76040596f,-0.64944810f}, {0.74314475f,-0.66913062f}, {0.72537434f,-0.68835455f},
-{0.70710677f,-0.70710683f}, {0.68835455f,-0.72537440f}, {0.66913056f,-0.74314487f},
-{0.64944804f,-0.76040596f}, {0.62932038f,-0.77714598f}, {0.60876137f,-0.79335338f},
-{0.58778524f,-0.80901700f}, {0.56640625f,-0.82412618f}, {0.54463899f,-0.83867055f},
-{0.52249849f,-0.85264015f}, {0.49999997f,-0.86602545f}, {0.47715876f,-0.87881708f},
-{0.45399052f,-0.89100653f}, {0.43051103f,-0.90258533f}, {0.40673661f,-0.91354549f},
-{0.38268343f,-0.92387956f}, {0.35836786f,-0.93358046f}, {0.33380681f,-0.94264150f},
-{0.30901697f,-0.95105654f}, {0.28401533f,-0.95881975f}, {0.25881907f,-0.96592581f},
-{0.23344530f,-0.97236991f}, {0.20791166f,-0.97814763f}, {0.18223552f,-0.98325491f},
-{0.15643437f,-0.98768836f}, {0.13052613f,-0.99144489f}, {0.10452842f,-0.99452192f},
-{0.078459084f,-0.99691731f}, {0.052335974f,-0.99862951f}, {0.026176875f,-0.99965733f},
-{-4.3711388e-08f,-1.0000000f}, {-0.026176963f,-0.99965733f}, {-0.052336060f,-0.99862951f},
-{-0.078459173f,-0.99691731f}, {-0.10452851f,-0.99452192f}, {-0.13052621f,-0.99144489f},
-{-0.15643445f,-0.98768836f}, {-0.18223560f,-0.98325491f}, {-0.20791174f,-0.97814757f},
-{-0.23344538f,-0.97236991f}, {-0.25881916f,-0.96592581f}, {-0.28401542f,-0.95881969f},
-{-0.30901703f,-0.95105648f}, {-0.33380687f,-0.94264150f}, {-0.35836795f,-0.93358040f},
-{-0.38268352f,-0.92387950f}, {-0.40673670f,-0.91354543f}, {-0.43051112f,-0.90258527f},
-{-0.45399061f,-0.89100647f}, {-0.47715873f,-0.87881708f}, {-0.50000006f,-0.86602533f},
-{-0.52249867f,-0.85264009f}, {-0.54463905f,-0.83867055f}, {-0.56640631f,-0.82412612f},
-{-0.58778518f,-0.80901700f}, {-0.60876143f,-0.79335332f}, {-0.62932050f,-0.77714586f},
-{-0.64944804f,-0.76040596f}, {-0.66913068f,-0.74314475f}, {-0.68835467f,-0.72537428f},
-{-0.70710677f,-0.70710677f}, {-0.72537446f,-0.68835449f}, {-0.74314493f,-0.66913044f},
-{-0.76040596f,-0.64944804f}, {-0.77714604f,-0.62932026f}, {-0.79335332f,-0.60876143f},
-{-0.80901700f,-0.58778518f}, {-0.82412624f,-0.56640613f}, {-0.83867055f,-0.54463899f},
-{-0.85264021f,-0.52249849f}, {-0.86602539f,-0.50000006f}, {-0.87881714f,-0.47715873f},
-{-0.89100659f,-0.45399037f}, {-0.90258527f,-0.43051112f}, {-0.91354549f,-0.40673658f},
-{-0.92387956f,-0.38268328f}, {-0.93358040f,-0.35836792f}, {-0.94264150f,-0.33380675f},
-{-0.95105654f,-0.30901679f}, {-0.95881975f,-0.28401530f}, {-0.96592587f,-0.25881892f},
-{-0.97236991f,-0.23344538f}, {-0.97814763f,-0.20791161f}, {-0.98325491f,-0.18223536f},
-{-0.98768836f,-0.15643445f}, {-0.99144489f,-0.13052608f}, {-0.99452192f,-0.10452849f},
-{-0.99691737f,-0.078459039f}, {-0.99862957f,-0.052335810f}, {-0.99965733f,-0.026176952f},
-{1.0000000f,-0.0000000f}, {0.99922901f,-0.039259817f}, {0.99691731f,-0.078459099f},
-{0.99306846f,-0.11753740f}, {0.98768836f,-0.15643448f}, {0.98078525f,-0.19509032f},
-{0.97236991f,-0.23344538f}, {0.96245521f,-0.27144045f}, {0.95105648f,-0.30901700f},
-{0.93819129f,-0.34611708f}, {0.92387956f,-0.38268346f}, {0.90814316f,-0.41865975f},
-{0.89100653f,-0.45399052f}, {0.87249601f,-0.48862126f}, {0.85264015f,-0.52249855f},
-{0.83146960f,-0.55557024f}, {0.80901700f,-0.58778524f}, {0.78531694f,-0.61909395f},
-{0.76040596f,-0.64944810f}, {0.73432249f,-0.67880076f}, {0.70710677f,-0.70710683f},
-{0.67880070f,-0.73432255f}, {0.64944804f,-0.76040596f}, {0.61909395f,-0.78531694f},
-{0.58778524f,-0.80901700f}, {0.55557019f,-0.83146960f}, {0.52249849f,-0.85264015f},
-{0.48862118f,-0.87249601f}, {0.45399052f,-0.89100653f}, {0.41865975f,-0.90814316f},
-{0.38268343f,-0.92387956f}, {0.34611705f,-0.93819135f}, {0.30901697f,-0.95105654f},
-{0.27144039f,-0.96245527f}, {0.23344530f,-0.97236991f}, {0.19509023f,-0.98078531f},
-{0.15643437f,-0.98768836f}, {0.11753740f,-0.99306846f}, {0.078459084f,-0.99691731f},
-{0.039259788f,-0.99922901f}, {-4.3711388e-08f,-1.0000000f}, {-0.039259877f,-0.99922901f},
-{-0.078459173f,-0.99691731f}, {-0.11753749f,-0.99306846f}, {-0.15643445f,-0.98768836f},
-{-0.19509032f,-0.98078525f}, {-0.23344538f,-0.97236991f}, {-0.27144048f,-0.96245521f},
-{-0.30901703f,-0.95105648f}, {-0.34611711f,-0.93819129f}, {-0.38268352f,-0.92387950f},
-{-0.41865984f,-0.90814310f}, {-0.45399061f,-0.89100647f}, {-0.48862135f,-0.87249595f},
-{-0.52249867f,-0.85264009f}, {-0.55557036f,-0.83146954f}, {-0.58778518f,-0.80901700f},
-{-0.61909389f,-0.78531694f}, {-0.64944804f,-0.76040596f}, {-0.67880076f,-0.73432249f},
-{-0.70710677f,-0.70710677f}, {-0.73432249f,-0.67880070f}, {-0.76040596f,-0.64944804f},
-{-0.78531694f,-0.61909389f}, {-0.80901700f,-0.58778518f}, {-0.83146966f,-0.55557019f},
-{-0.85264021f,-0.52249849f}, {-0.87249607f,-0.48862115f}, {-0.89100659f,-0.45399037f},
-{-0.90814322f,-0.41865960f}, {-0.92387956f,-0.38268328f}, {-0.93819135f,-0.34611690f},
-{-0.95105654f,-0.30901679f}, {-0.96245521f,-0.27144048f}, {-0.97236991f,-0.23344538f},
-{-0.98078531f,-0.19509031f}, {-0.98768836f,-0.15643445f}, {-0.99306846f,-0.11753736f},
-{-0.99691737f,-0.078459039f}, {-0.99922901f,-0.039259743f}, {-1.0000000f,8.7422777e-08f},
-{-0.99922901f,0.039259918f}, {-0.99691731f,0.078459218f}, {-0.99306846f,0.11753753f},
-{-0.98768830f,0.15643461f}, {-0.98078525f,0.19509049f}, {-0.97236985f,0.23344554f},
-{-0.96245515f,0.27144065f}, {-0.95105654f,0.30901697f}, {-0.93819135f,0.34611705f},
-{-0.92387956f,0.38268346f}, {-0.90814316f,0.41865975f}, {-0.89100653f,0.45399055f},
-{-0.87249601f,0.48862129f}, {-0.85264015f,0.52249861f}, {-0.83146960f,0.55557030f},
-{-0.80901694f,0.58778536f}, {-0.78531688f,0.61909401f}, {-0.76040590f,0.64944816f},
-{-0.73432243f,0.67880082f}, {-0.70710665f,0.70710689f}, {-0.67880058f,0.73432261f},
-{-0.64944792f,0.76040608f}, {-0.61909378f,0.78531706f}, {-0.58778507f,0.80901712f},
-{-0.55557001f,0.83146977f}, {-0.52249837f,0.85264033f}, {-0.48862100f,0.87249613f},
-{-0.45399022f,0.89100665f}, {-0.41865945f,0.90814328f}, {-0.38268313f,0.92387968f},
-{-0.34611672f,0.93819147f}, {-0.30901709f,0.95105648f}, {-0.27144054f,0.96245521f},
-{-0.23344545f,0.97236991f}, {-0.19509038f,0.98078525f}, {-0.15643452f,0.98768830f},
-{-0.11753743f,0.99306846f}, {-0.078459114f,0.99691731f}, {-0.039259821f,0.99922901f},
+    {1.0000000f, 0.0000000f}, {1.0000000f, -0.0000000f}, {1.0000000f, -0.0000000f},
+    {1.0000000f, -0.0000000f}, {0.91354543f, -0.40673664f}, {0.66913056f, -0.74314487f},
+    {1.0000000f, -0.0000000f}, {0.66913056f, -0.74314487f}, {-0.10452851f, -0.99452192f},
+    {1.0000000f, -0.0000000f}, {0.30901697f, -0.95105654f}, {-0.80901700f, -0.58778518f},
+    {1.0000000f, -0.0000000f}, {-0.10452851f, -0.99452192f}, {-0.97814757f, 0.20791179f},
+    {1.0000000f, -0.0000000f}, {0.97814763f, -0.20791170f}, {0.91354543f, -0.40673664f},
+    {0.80901700f, -0.58778524f}, {0.66913056f, -0.74314487f}, {0.49999997f, -0.86602545f},
+    {0.30901697f, -0.95105654f}, {0.10452842f, -0.99452192f}, {-0.10452851f, -0.99452192f},
+    {-0.30901703f, -0.95105648f}, {-0.50000006f, -0.86602533f}, {-0.66913068f, -0.74314475f},
+    {-0.80901700f, -0.58778518f}, {-0.91354549f, -0.40673658f}, {-0.97814763f, -0.20791161f},
+    {1.0000000f, -0.0000000f}, {0.99862951f, -0.052335959f}, {0.99452192f, -0.10452846f},
+    {0.98768836f, -0.15643448f}, {0.97814763f, -0.20791170f}, {0.96592581f, -0.25881904f},
+    {0.95105648f, -0.30901700f}, {0.93358040f, -0.35836795f}, {0.91354543f, -0.40673664f},
+    {0.89100653f, -0.45399052f}, {0.86602545f, -0.50000000f}, {0.83867055f, -0.54463905f},
+    {0.80901700f, -0.58778524f}, {0.77714598f, -0.62932038f}, {0.74314475f, -0.66913062f},
+    {0.70710677f, -0.70710683f}, {0.66913056f, -0.74314487f}, {0.62932038f, -0.77714598f},
+    {0.58778524f, -0.80901700f}, {0.54463899f, -0.83867055f}, {0.49999997f, -0.86602545f},
+    {0.45399052f, -0.89100653f}, {0.40673661f, -0.91354549f}, {0.35836786f, -0.93358046f},
+    {0.30901697f, -0.95105654f}, {0.25881907f, -0.96592581f}, {0.20791166f, -0.97814763f},
+    {0.15643437f, -0.98768836f}, {0.10452842f, -0.99452192f}, {0.052335974f, -0.99862951f},
+    {1.0000000f, -0.0000000f}, {0.99452192f, -0.10452846f}, {0.97814763f, -0.20791170f},
+    {0.95105648f, -0.30901700f}, {0.91354543f, -0.40673664f}, {0.86602545f, -0.50000000f},
+    {0.80901700f, -0.58778524f}, {0.74314475f, -0.66913062f}, {0.66913056f, -0.74314487f},
+    {0.58778524f, -0.80901700f}, {0.49999997f, -0.86602545f}, {0.40673661f, -0.91354549f},
+    {0.30901697f, -0.95105654f}, {0.20791166f, -0.97814763f}, {0.10452842f, -0.99452192f},
+    {-4.3711388e-08f, -1.0000000f}, {-0.10452851f, -0.99452192f}, {-0.20791174f, -0.97814757f},
+    {-0.30901703f, -0.95105648f}, {-0.40673670f, -0.91354543f}, {-0.50000006f, -0.86602533f},
+    {-0.58778518f, -0.80901700f}, {-0.66913068f, -0.74314475f}, {-0.74314493f, -0.66913044f},
+    {-0.80901700f, -0.58778518f}, {-0.86602539f, -0.50000006f}, {-0.91354549f, -0.40673658f},
+    {-0.95105654f, -0.30901679f}, {-0.97814763f, -0.20791161f}, {-0.99452192f, -0.10452849f},
+    {1.0000000f, -0.0000000f}, {0.98768836f, -0.15643448f}, {0.95105648f, -0.30901700f},
+    {0.89100653f, -0.45399052f}, {0.80901700f, -0.58778524f}, {0.70710677f, -0.70710683f},
+    {0.58778524f, -0.80901700f}, {0.45399052f, -0.89100653f}, {0.30901697f, -0.95105654f},
+    {0.15643437f, -0.98768836f}, {-4.3711388e-08f, -1.0000000f}, {-0.15643445f, -0.98768836f},
+    {-0.30901703f, -0.95105648f}, {-0.45399061f, -0.89100647f}, {-0.58778518f, -0.80901700f},
+    {-0.70710677f, -0.70710677f}, {-0.80901700f, -0.58778518f}, {-0.89100659f, -0.45399037f},
+    {-0.95105654f, -0.30901679f}, {-0.98768836f, -0.15643445f}, {-1.0000000f, 8.7422777e-08f},
+    {-0.98768830f, 0.15643461f}, {-0.95105654f, 0.30901697f}, {-0.89100653f, 0.45399055f},
+    {-0.80901694f, 0.58778536f}, {-0.70710665f, 0.70710689f}, {-0.58778507f, 0.80901712f},
+    {-0.45399022f, 0.89100665f}, {-0.30901709f, 0.95105648f}, {-0.15643452f, 0.98768830f},
+    {1.0000000f, -0.0000000f}, {0.99991435f, -0.013089596f}, {0.99965733f, -0.026176950f},
+    {0.99922901f, -0.039259817f}, {0.99862951f, -0.052335959f}, {0.99785894f, -0.065403134f},
+    {0.99691731f, -0.078459099f}, {0.99580491f, -0.091501623f}, {0.99452192f, -0.10452846f},
+    {0.99306846f, -0.11753740f}, {0.99144489f, -0.13052620f}, {0.98965138f, -0.14349262f},
+    {0.98768836f, -0.15643448f}, {0.98555607f, -0.16934951f}, {0.98325491f, -0.18223552f},
+    {0.98078525f, -0.19509032f}, {0.97814763f, -0.20791170f}, {0.97534233f, -0.22069745f},
+    {0.97236991f, -0.23344538f}, {0.96923089f, -0.24615330f}, {0.96592581f, -0.25881904f},
+    {0.96245521f, -0.27144045f}, {0.95881975f, -0.28401536f}, {0.95501995f, -0.29654160f},
+    {0.95105648f, -0.30901700f}, {0.94693011f, -0.32143945f}, {0.94264150f, -0.33380687f},
+    {0.93819129f, -0.34611708f}, {0.93358040f, -0.35836795f}, {0.92880952f, -0.37055743f},
+    {0.92387956f, -0.38268346f}, {0.91879117f, -0.39474389f}, {0.91354543f, -0.40673664f},
+    {0.90814316f, -0.41865975f}, {0.90258527f, -0.43051112f}, {0.89687270f, -0.44228873f},
+    {0.89100653f, -0.45399052f}, {0.88498765f, -0.46561453f}, {0.87881708f, -0.47715878f},
+    {0.87249601f, -0.48862126f}, {0.86602545f, -0.50000000f}, {0.85940641f, -0.51129311f},
+    {0.85264015f, -0.52249855f}, {0.84572786f, -0.53361452f}, {0.83867055f, -0.54463905f},
+    {0.83146960f, -0.55557024f}, {0.82412618f, -0.56640625f}, {0.81664151f, -0.57714522f},
+    {0.80901700f, -0.58778524f}, {0.80125380f, -0.59832460f}, {0.79335332f, -0.60876143f},
+    {0.78531694f, -0.61909395f}, {0.77714598f, -0.62932038f}, {0.76884180f, -0.63943899f},
+    {0.76040596f, -0.64944810f}, {0.75183982f, -0.65934587f}, {0.74314475f, -0.66913062f},
+    {0.73432249f, -0.67880076f}, {0.72537434f, -0.68835455f}, {0.71630192f, -0.69779050f},
+    {0.70710677f, -0.70710683f}, {0.69779044f, -0.71630198f}, {0.68835455f, -0.72537440f},
+    {0.67880070f, -0.73432255f}, {0.66913056f, -0.74314487f}, {0.65934581f, -0.75183982f},
+    {0.64944804f, -0.76040596f}, {0.63943899f, -0.76884186f}, {0.62932038f, -0.77714598f},
+    {0.61909395f, -0.78531694f}, {0.60876137f, -0.79335338f}, {0.59832460f, -0.80125386f},
+    {0.58778524f, -0.80901700f}, {0.57714516f, -0.81664151f}, {0.56640625f, -0.82412618f},
+    {0.55557019f, -0.83146960f}, {0.54463899f, -0.83867055f}, {0.53361452f, -0.84572786f},
+    {0.52249849f, -0.85264015f}, {0.51129311f, -0.85940641f}, {0.49999997f, -0.86602545f},
+    {0.48862118f, -0.87249601f}, {0.47715876f, -0.87881708f}, {0.46561447f, -0.88498765f},
+    {0.45399052f, -0.89100653f}, {0.44228867f, -0.89687276f}, {0.43051103f, -0.90258533f},
+    {0.41865975f, -0.90814316f}, {0.40673661f, -0.91354549f}, {0.39474380f, -0.91879129f},
+    {0.38268343f, -0.92387956f}, {0.37055740f, -0.92880958f}, {0.35836786f, -0.93358046f},
+    {0.34611705f, -0.93819135f}, {0.33380681f, -0.94264150f}, {0.32143947f, -0.94693011f},
+    {0.30901697f, -0.95105654f}, {0.29654151f, -0.95501995f}, {0.28401533f, -0.95881975f},
+    {0.27144039f, -0.96245527f}, {0.25881907f, -0.96592581f}, {0.24615327f, -0.96923089f},
+    {0.23344530f, -0.97236991f}, {0.22069745f, -0.97534233f}, {0.20791166f, -0.97814763f},
+    {0.19509023f, -0.98078531f}, {0.18223552f, -0.98325491f}, {0.16934945f, -0.98555607f},
+    {0.15643437f, -0.98768836f}, {0.14349259f, -0.98965138f}, {0.13052613f, -0.99144489f},
+    {0.11753740f, -0.99306846f}, {0.10452842f, -0.99452192f}, {0.091501534f, -0.99580491f},
+    {0.078459084f, -0.99691731f}, {0.065403074f, -0.99785894f}, {0.052335974f, -0.99862951f},
+    {0.039259788f, -0.99922901f}, {0.026176875f, -0.99965733f}, {0.013089597f, -0.99991435f},
+    {1.0000000f, -0.0000000f}, {0.99965733f, -0.026176950f}, {0.99862951f, -0.052335959f},
+    {0.99691731f, -0.078459099f}, {0.99452192f, -0.10452846f}, {0.99144489f, -0.13052620f},
+    {0.98768836f, -0.15643448f}, {0.98325491f, -0.18223552f}, {0.97814763f, -0.20791170f},
+    {0.97236991f, -0.23344538f}, {0.96592581f, -0.25881904f}, {0.95881975f, -0.28401536f},
+    {0.95105648f, -0.30901700f}, {0.94264150f, -0.33380687f}, {0.93358040f, -0.35836795f},
+    {0.92387956f, -0.38268346f}, {0.91354543f, -0.40673664f}, {0.90258527f, -0.43051112f},
+    {0.89100653f, -0.45399052f}, {0.87881708f, -0.47715878f}, {0.86602545f, -0.50000000f},
+    {0.85264015f, -0.52249855f}, {0.83867055f, -0.54463905f}, {0.82412618f, -0.56640625f},
+    {0.80901700f, -0.58778524f}, {0.79335332f, -0.60876143f}, {0.77714598f, -0.62932038f},
+    {0.76040596f, -0.64944810f}, {0.74314475f, -0.66913062f}, {0.72537434f, -0.68835455f},
+    {0.70710677f, -0.70710683f}, {0.68835455f, -0.72537440f}, {0.66913056f, -0.74314487f},
+    {0.64944804f, -0.76040596f}, {0.62932038f, -0.77714598f}, {0.60876137f, -0.79335338f},
+    {0.58778524f, -0.80901700f}, {0.56640625f, -0.82412618f}, {0.54463899f, -0.83867055f},
+    {0.52249849f, -0.85264015f}, {0.49999997f, -0.86602545f}, {0.47715876f, -0.87881708f},
+    {0.45399052f, -0.89100653f}, {0.43051103f, -0.90258533f}, {0.40673661f, -0.91354549f},
+    {0.38268343f, -0.92387956f}, {0.35836786f, -0.93358046f}, {0.33380681f, -0.94264150f},
+    {0.30901697f, -0.95105654f}, {0.28401533f, -0.95881975f}, {0.25881907f, -0.96592581f},
+    {0.23344530f, -0.97236991f}, {0.20791166f, -0.97814763f}, {0.18223552f, -0.98325491f},
+    {0.15643437f, -0.98768836f}, {0.13052613f, -0.99144489f}, {0.10452842f, -0.99452192f},
+    {0.078459084f, -0.99691731f}, {0.052335974f, -0.99862951f}, {0.026176875f, -0.99965733f},
+    {-4.3711388e-08f, -1.0000000f}, {-0.026176963f, -0.99965733f}, {-0.052336060f, -0.99862951f},
+    {-0.078459173f, -0.99691731f}, {-0.10452851f, -0.99452192f}, {-0.13052621f, -0.99144489f},
+    {-0.15643445f, -0.98768836f}, {-0.18223560f, -0.98325491f}, {-0.20791174f, -0.97814757f},
+    {-0.23344538f, -0.97236991f}, {-0.25881916f, -0.96592581f}, {-0.28401542f, -0.95881969f},
+    {-0.30901703f, -0.95105648f}, {-0.33380687f, -0.94264150f}, {-0.35836795f, -0.93358040f},
+    {-0.38268352f, -0.92387950f}, {-0.40673670f, -0.91354543f}, {-0.43051112f, -0.90258527f},
+    {-0.45399061f, -0.89100647f}, {-0.47715873f, -0.87881708f}, {-0.50000006f, -0.86602533f},
+    {-0.52249867f, -0.85264009f}, {-0.54463905f, -0.83867055f}, {-0.56640631f, -0.82412612f},
+    {-0.58778518f, -0.80901700f}, {-0.60876143f, -0.79335332f}, {-0.62932050f, -0.77714586f},
+    {-0.64944804f, -0.76040596f}, {-0.66913068f, -0.74314475f}, {-0.68835467f, -0.72537428f},
+    {-0.70710677f, -0.70710677f}, {-0.72537446f, -0.68835449f}, {-0.74314493f, -0.66913044f},
+    {-0.76040596f, -0.64944804f}, {-0.77714604f, -0.62932026f}, {-0.79335332f, -0.60876143f},
+    {-0.80901700f, -0.58778518f}, {-0.82412624f, -0.56640613f}, {-0.83867055f, -0.54463899f},
+    {-0.85264021f, -0.52249849f}, {-0.86602539f, -0.50000006f}, {-0.87881714f, -0.47715873f},
+    {-0.89100659f, -0.45399037f}, {-0.90258527f, -0.43051112f}, {-0.91354549f, -0.40673658f},
+    {-0.92387956f, -0.38268328f}, {-0.93358040f, -0.35836792f}, {-0.94264150f, -0.33380675f},
+    {-0.95105654f, -0.30901679f}, {-0.95881975f, -0.28401530f}, {-0.96592587f, -0.25881892f},
+    {-0.97236991f, -0.23344538f}, {-0.97814763f, -0.20791161f}, {-0.98325491f, -0.18223536f},
+    {-0.98768836f, -0.15643445f}, {-0.99144489f, -0.13052608f}, {-0.99452192f, -0.10452849f},
+    {-0.99691737f, -0.078459039f}, {-0.99862957f, -0.052335810f}, {-0.99965733f, -0.026176952f},
+    {1.0000000f, -0.0000000f}, {0.99922901f, -0.039259817f}, {0.99691731f, -0.078459099f},
+    {0.99306846f, -0.11753740f}, {0.98768836f, -0.15643448f}, {0.98078525f, -0.19509032f},
+    {0.97236991f, -0.23344538f}, {0.96245521f, -0.27144045f}, {0.95105648f, -0.30901700f},
+    {0.93819129f, -0.34611708f}, {0.92387956f, -0.38268346f}, {0.90814316f, -0.41865975f},
+    {0.89100653f, -0.45399052f}, {0.87249601f, -0.48862126f}, {0.85264015f, -0.52249855f},
+    {0.83146960f, -0.55557024f}, {0.80901700f, -0.58778524f}, {0.78531694f, -0.61909395f},
+    {0.76040596f, -0.64944810f}, {0.73432249f, -0.67880076f}, {0.70710677f, -0.70710683f},
+    {0.67880070f, -0.73432255f}, {0.64944804f, -0.76040596f}, {0.61909395f, -0.78531694f},
+    {0.58778524f, -0.80901700f}, {0.55557019f, -0.83146960f}, {0.52249849f, -0.85264015f},
+    {0.48862118f, -0.87249601f}, {0.45399052f, -0.89100653f}, {0.41865975f, -0.90814316f},
+    {0.38268343f, -0.92387956f}, {0.34611705f, -0.93819135f}, {0.30901697f, -0.95105654f},
+    {0.27144039f, -0.96245527f}, {0.23344530f, -0.97236991f}, {0.19509023f, -0.98078531f},
+    {0.15643437f, -0.98768836f}, {0.11753740f, -0.99306846f}, {0.078459084f, -0.99691731f},
+    {0.039259788f, -0.99922901f}, {-4.3711388e-08f, -1.0000000f}, {-0.039259877f, -0.99922901f},
+    {-0.078459173f, -0.99691731f}, {-0.11753749f, -0.99306846f}, {-0.15643445f, -0.98768836f},
+    {-0.19509032f, -0.98078525f}, {-0.23344538f, -0.97236991f}, {-0.27144048f, -0.96245521f},
+    {-0.30901703f, -0.95105648f}, {-0.34611711f, -0.93819129f}, {-0.38268352f, -0.92387950f},
+    {-0.41865984f, -0.90814310f}, {-0.45399061f, -0.89100647f}, {-0.48862135f, -0.87249595f},
+    {-0.52249867f, -0.85264009f}, {-0.55557036f, -0.83146954f}, {-0.58778518f, -0.80901700f},
+    {-0.61909389f, -0.78531694f}, {-0.64944804f, -0.76040596f}, {-0.67880076f, -0.73432249f},
+    {-0.70710677f, -0.70710677f}, {-0.73432249f, -0.67880070f}, {-0.76040596f, -0.64944804f},
+    {-0.78531694f, -0.61909389f}, {-0.80901700f, -0.58778518f}, {-0.83146966f, -0.55557019f},
+    {-0.85264021f, -0.52249849f}, {-0.87249607f, -0.48862115f}, {-0.89100659f, -0.45399037f},
+    {-0.90814322f, -0.41865960f}, {-0.92387956f, -0.38268328f}, {-0.93819135f, -0.34611690f},
+    {-0.95105654f, -0.30901679f}, {-0.96245521f, -0.27144048f}, {-0.97236991f, -0.23344538f},
+    {-0.98078531f, -0.19509031f}, {-0.98768836f, -0.15643445f}, {-0.99306846f, -0.11753736f},
+    {-0.99691737f, -0.078459039f}, {-0.99922901f, -0.039259743f}, {-1.0000000f, 8.7422777e-08f},
+    {-0.99922901f, 0.039259918f}, {-0.99691731f, 0.078459218f}, {-0.99306846f, 0.11753753f},
+    {-0.98768830f, 0.15643461f}, {-0.98078525f, 0.19509049f}, {-0.97236985f, 0.23344554f},
+    {-0.96245515f, 0.27144065f}, {-0.95105654f, 0.30901697f}, {-0.93819135f, 0.34611705f},
+    {-0.92387956f, 0.38268346f}, {-0.90814316f, 0.41865975f}, {-0.89100653f, 0.45399055f},
+    {-0.87249601f, 0.48862129f}, {-0.85264015f, 0.52249861f}, {-0.83146960f, 0.55557030f},
+    {-0.80901694f, 0.58778536f}, {-0.78531688f, 0.61909401f}, {-0.76040590f, 0.64944816f},
+    {-0.73432243f, 0.67880082f}, {-0.70710665f, 0.70710689f}, {-0.67880058f, 0.73432261f},
+    {-0.64944792f, 0.76040608f}, {-0.61909378f, 0.78531706f}, {-0.58778507f, 0.80901712f},
+    {-0.55557001f, 0.83146977f}, {-0.52249837f, 0.85264033f}, {-0.48862100f, 0.87249613f},
+    {-0.45399022f, 0.89100665f}, {-0.41865945f, 0.90814328f}, {-0.38268313f, 0.92387968f},
+    {-0.34611672f, 0.93819147f}, {-0.30901709f, 0.95105648f}, {-0.27144054f, 0.96245521f},
+    {-0.23344545f, 0.97236991f}, {-0.19509038f, 0.98078525f}, {-0.15643452f, 0.98768830f},
+    {-0.11753743f, 0.99306846f}, {-0.078459114f, 0.99691731f}, {-0.039259821f, 0.99922901f},
 };
 static const ne10_fft_cpx_float32_t ne10_twiddles_240[240] = {
-{1.0000000f,0.0000000f}, {1.0000000f,-0.0000000f}, {1.0000000f,-0.0000000f},
-{1.0000000f,-0.0000000f}, {0.91354543f,-0.40673664f}, {0.66913056f,-0.74314487f},
-{1.0000000f,-0.0000000f}, {0.66913056f,-0.74314487f}, {-0.10452851f,-0.99452192f},
-{1.0000000f,-0.0000000f}, {0.30901697f,-0.95105654f}, {-0.80901700f,-0.58778518f},
-{1.0000000f,-0.0000000f}, {-0.10452851f,-0.99452192f}, {-0.97814757f,0.20791179f},
-{1.0000000f,-0.0000000f}, {0.99452192f,-0.10452846f}, {0.97814763f,-0.20791170f},
-{0.95105648f,-0.30901700f}, {0.91354543f,-0.40673664f}, {0.86602545f,-0.50000000f},
-{0.80901700f,-0.58778524f}, {0.74314475f,-0.66913062f}, {0.66913056f,-0.74314487f},
-{0.58778524f,-0.80901700f}, {0.49999997f,-0.86602545f}, {0.40673661f,-0.91354549f},
-{0.30901697f,-0.95105654f}, {0.20791166f,-0.97814763f}, {0.10452842f,-0.99452192f},
-{1.0000000f,-0.0000000f}, {0.97814763f,-0.20791170f}, {0.91354543f,-0.40673664f},
-{0.80901700f,-0.58778524f}, {0.66913056f,-0.74314487f}, {0.49999997f,-0.86602545f},
-{0.30901697f,-0.95105654f}, {0.10452842f,-0.99452192f}, {-0.10452851f,-0.99452192f},
-{-0.30901703f,-0.95105648f}, {-0.50000006f,-0.86602533f}, {-0.66913068f,-0.74314475f},
-{-0.80901700f,-0.58778518f}, {-0.91354549f,-0.40673658f}, {-0.97814763f,-0.20791161f},
-{1.0000000f,-0.0000000f}, {0.95105648f,-0.30901700f}, {0.80901700f,-0.58778524f},
-{0.58778524f,-0.80901700f}, {0.30901697f,-0.95105654f}, {-4.3711388e-08f,-1.0000000f},
-{-0.30901703f,-0.95105648f}, {-0.58778518f,-0.80901700f}, {-0.80901700f,-0.58778518f},
-{-0.95105654f,-0.30901679f}, {-1.0000000f,8.7422777e-08f}, {-0.95105654f,0.30901697f},
-{-0.80901694f,0.58778536f}, {-0.58778507f,0.80901712f}, {-0.30901709f,0.95105648f},
-{1.0000000f,-0.0000000f}, {0.99965733f,-0.026176950f}, {0.99862951f,-0.052335959f},
-{0.99691731f,-0.078459099f}, {0.99452192f,-0.10452846f}, {0.99144489f,-0.13052620f},
-{0.98768836f,-0.15643448f}, {0.98325491f,-0.18223552f}, {0.97814763f,-0.20791170f},
-{0.97236991f,-0.23344538f}, {0.96592581f,-0.25881904f}, {0.95881975f,-0.28401536f},
-{0.95105648f,-0.30901700f}, {0.94264150f,-0.33380687f}, {0.93358040f,-0.35836795f},
-{0.92387956f,-0.38268346f}, {0.91354543f,-0.40673664f}, {0.90258527f,-0.43051112f},
-{0.89100653f,-0.45399052f}, {0.87881708f,-0.47715878f}, {0.86602545f,-0.50000000f},
-{0.85264015f,-0.52249855f}, {0.83867055f,-0.54463905f}, {0.82412618f,-0.56640625f},
-{0.80901700f,-0.58778524f}, {0.79335332f,-0.60876143f}, {0.77714598f,-0.62932038f},
-{0.76040596f,-0.64944810f}, {0.74314475f,-0.66913062f}, {0.72537434f,-0.68835455f},
-{0.70710677f,-0.70710683f}, {0.68835455f,-0.72537440f}, {0.66913056f,-0.74314487f},
-{0.64944804f,-0.76040596f}, {0.62932038f,-0.77714598f}, {0.60876137f,-0.79335338f},
-{0.58778524f,-0.80901700f}, {0.56640625f,-0.82412618f}, {0.54463899f,-0.83867055f},
-{0.52249849f,-0.85264015f}, {0.49999997f,-0.86602545f}, {0.47715876f,-0.87881708f},
-{0.45399052f,-0.89100653f}, {0.43051103f,-0.90258533f}, {0.40673661f,-0.91354549f},
-{0.38268343f,-0.92387956f}, {0.35836786f,-0.93358046f}, {0.33380681f,-0.94264150f},
-{0.30901697f,-0.95105654f}, {0.28401533f,-0.95881975f}, {0.25881907f,-0.96592581f},
-{0.23344530f,-0.97236991f}, {0.20791166f,-0.97814763f}, {0.18223552f,-0.98325491f},
-{0.15643437f,-0.98768836f}, {0.13052613f,-0.99144489f}, {0.10452842f,-0.99452192f},
-{0.078459084f,-0.99691731f}, {0.052335974f,-0.99862951f}, {0.026176875f,-0.99965733f},
-{1.0000000f,-0.0000000f}, {0.99862951f,-0.052335959f}, {0.99452192f,-0.10452846f},
-{0.98768836f,-0.15643448f}, {0.97814763f,-0.20791170f}, {0.96592581f,-0.25881904f},
-{0.95105648f,-0.30901700f}, {0.93358040f,-0.35836795f}, {0.91354543f,-0.40673664f},
-{0.89100653f,-0.45399052f}, {0.86602545f,-0.50000000f}, {0.83867055f,-0.54463905f},
-{0.80901700f,-0.58778524f}, {0.77714598f,-0.62932038f}, {0.74314475f,-0.66913062f},
-{0.70710677f,-0.70710683f}, {0.66913056f,-0.74314487f}, {0.62932038f,-0.77714598f},
-{0.58778524f,-0.80901700f}, {0.54463899f,-0.83867055f}, {0.49999997f,-0.86602545f},
-{0.45399052f,-0.89100653f}, {0.40673661f,-0.91354549f}, {0.35836786f,-0.93358046f},
-{0.30901697f,-0.95105654f}, {0.25881907f,-0.96592581f}, {0.20791166f,-0.97814763f},
-{0.15643437f,-0.98768836f}, {0.10452842f,-0.99452192f}, {0.052335974f,-0.99862951f},
-{-4.3711388e-08f,-1.0000000f}, {-0.052336060f,-0.99862951f}, {-0.10452851f,-0.99452192f},
-{-0.15643445f,-0.98768836f}, {-0.20791174f,-0.97814757f}, {-0.25881916f,-0.96592581f},
-{-0.30901703f,-0.95105648f}, {-0.35836795f,-0.93358040f}, {-0.40673670f,-0.91354543f},
-{-0.45399061f,-0.89100647f}, {-0.50000006f,-0.86602533f}, {-0.54463905f,-0.83867055f},
-{-0.58778518f,-0.80901700f}, {-0.62932050f,-0.77714586f}, {-0.66913068f,-0.74314475f},
-{-0.70710677f,-0.70710677f}, {-0.74314493f,-0.66913044f}, {-0.77714604f,-0.62932026f},
-{-0.80901700f,-0.58778518f}, {-0.83867055f,-0.54463899f}, {-0.86602539f,-0.50000006f},
-{-0.89100659f,-0.45399037f}, {-0.91354549f,-0.40673658f}, {-0.93358040f,-0.35836792f},
-{-0.95105654f,-0.30901679f}, {-0.96592587f,-0.25881892f}, {-0.97814763f,-0.20791161f},
-{-0.98768836f,-0.15643445f}, {-0.99452192f,-0.10452849f}, {-0.99862957f,-0.052335810f},
-{1.0000000f,-0.0000000f}, {0.99691731f,-0.078459099f}, {0.98768836f,-0.15643448f},
-{0.97236991f,-0.23344538f}, {0.95105648f,-0.30901700f}, {0.92387956f,-0.38268346f},
-{0.89100653f,-0.45399052f}, {0.85264015f,-0.52249855f}, {0.80901700f,-0.58778524f},
-{0.76040596f,-0.64944810f}, {0.70710677f,-0.70710683f}, {0.64944804f,-0.76040596f},
-{0.58778524f,-0.80901700f}, {0.52249849f,-0.85264015f}, {0.45399052f,-0.89100653f},
-{0.38268343f,-0.92387956f}, {0.30901697f,-0.95105654f}, {0.23344530f,-0.97236991f},
-{0.15643437f,-0.98768836f}, {0.078459084f,-0.99691731f}, {-4.3711388e-08f,-1.0000000f},
-{-0.078459173f,-0.99691731f}, {-0.15643445f,-0.98768836f}, {-0.23344538f,-0.97236991f},
-{-0.30901703f,-0.95105648f}, {-0.38268352f,-0.92387950f}, {-0.45399061f,-0.89100647f},
-{-0.52249867f,-0.85264009f}, {-0.58778518f,-0.80901700f}, {-0.64944804f,-0.76040596f},
-{-0.70710677f,-0.70710677f}, {-0.76040596f,-0.64944804f}, {-0.80901700f,-0.58778518f},
-{-0.85264021f,-0.52249849f}, {-0.89100659f,-0.45399037f}, {-0.92387956f,-0.38268328f},
-{-0.95105654f,-0.30901679f}, {-0.97236991f,-0.23344538f}, {-0.98768836f,-0.15643445f},
-{-0.99691737f,-0.078459039f}, {-1.0000000f,8.7422777e-08f}, {-0.99691731f,0.078459218f},
-{-0.98768830f,0.15643461f}, {-0.97236985f,0.23344554f}, {-0.95105654f,0.30901697f},
-{-0.92387956f,0.38268346f}, {-0.89100653f,0.45399055f}, {-0.85264015f,0.52249861f},
-{-0.80901694f,0.58778536f}, {-0.76040590f,0.64944816f}, {-0.70710665f,0.70710689f},
-{-0.64944792f,0.76040608f}, {-0.58778507f,0.80901712f}, {-0.52249837f,0.85264033f},
-{-0.45399022f,0.89100665f}, {-0.38268313f,0.92387968f}, {-0.30901709f,0.95105648f},
-{-0.23344545f,0.97236991f}, {-0.15643452f,0.98768830f}, {-0.078459114f,0.99691731f},
+    {1.0000000f, 0.0000000f}, {1.0000000f, -0.0000000f}, {1.0000000f, -0.0000000f},
+    {1.0000000f, -0.0000000f}, {0.91354543f, -0.40673664f}, {0.66913056f, -0.74314487f},
+    {1.0000000f, -0.0000000f}, {0.66913056f, -0.74314487f}, {-0.10452851f, -0.99452192f},
+    {1.0000000f, -0.0000000f}, {0.30901697f, -0.95105654f}, {-0.80901700f, -0.58778518f},
+    {1.0000000f, -0.0000000f}, {-0.10452851f, -0.99452192f}, {-0.97814757f, 0.20791179f},
+    {1.0000000f, -0.0000000f}, {0.99452192f, -0.10452846f}, {0.97814763f, -0.20791170f},
+    {0.95105648f, -0.30901700f}, {0.91354543f, -0.40673664f}, {0.86602545f, -0.50000000f},
+    {0.80901700f, -0.58778524f}, {0.74314475f, -0.66913062f}, {0.66913056f, -0.74314487f},
+    {0.58778524f, -0.80901700f}, {0.49999997f, -0.86602545f}, {0.40673661f, -0.91354549f},
+    {0.30901697f, -0.95105654f}, {0.20791166f, -0.97814763f}, {0.10452842f, -0.99452192f},
+    {1.0000000f, -0.0000000f}, {0.97814763f, -0.20791170f}, {0.91354543f, -0.40673664f},
+    {0.80901700f, -0.58778524f}, {0.66913056f, -0.74314487f}, {0.49999997f, -0.86602545f},
+    {0.30901697f, -0.95105654f}, {0.10452842f, -0.99452192f}, {-0.10452851f, -0.99452192f},
+    {-0.30901703f, -0.95105648f}, {-0.50000006f, -0.86602533f}, {-0.66913068f, -0.74314475f},
+    {-0.80901700f, -0.58778518f}, {-0.91354549f, -0.40673658f}, {-0.97814763f, -0.20791161f},
+    {1.0000000f, -0.0000000f}, {0.95105648f, -0.30901700f}, {0.80901700f, -0.58778524f},
+    {0.58778524f, -0.80901700f}, {0.30901697f, -0.95105654f}, {-4.3711388e-08f, -1.0000000f},
+    {-0.30901703f, -0.95105648f}, {-0.58778518f, -0.80901700f}, {-0.80901700f, -0.58778518f},
+    {-0.95105654f, -0.30901679f}, {-1.0000000f, 8.7422777e-08f}, {-0.95105654f, 0.30901697f},
+    {-0.80901694f, 0.58778536f}, {-0.58778507f, 0.80901712f}, {-0.30901709f, 0.95105648f},
+    {1.0000000f, -0.0000000f}, {0.99965733f, -0.026176950f}, {0.99862951f, -0.052335959f},
+    {0.99691731f, -0.078459099f}, {0.99452192f, -0.10452846f}, {0.99144489f, -0.13052620f},
+    {0.98768836f, -0.15643448f}, {0.98325491f, -0.18223552f}, {0.97814763f, -0.20791170f},
+    {0.97236991f, -0.23344538f}, {0.96592581f, -0.25881904f}, {0.95881975f, -0.28401536f},
+    {0.95105648f, -0.30901700f}, {0.94264150f, -0.33380687f}, {0.93358040f, -0.35836795f},
+    {0.92387956f, -0.38268346f}, {0.91354543f, -0.40673664f}, {0.90258527f, -0.43051112f},
+    {0.89100653f, -0.45399052f}, {0.87881708f, -0.47715878f}, {0.86602545f, -0.50000000f},
+    {0.85264015f, -0.52249855f}, {0.83867055f, -0.54463905f}, {0.82412618f, -0.56640625f},
+    {0.80901700f, -0.58778524f}, {0.79335332f, -0.60876143f}, {0.77714598f, -0.62932038f},
+    {0.76040596f, -0.64944810f}, {0.74314475f, -0.66913062f}, {0.72537434f, -0.68835455f},
+    {0.70710677f, -0.70710683f}, {0.68835455f, -0.72537440f}, {0.66913056f, -0.74314487f},
+    {0.64944804f, -0.76040596f}, {0.62932038f, -0.77714598f}, {0.60876137f, -0.79335338f},
+    {0.58778524f, -0.80901700f}, {0.56640625f, -0.82412618f}, {0.54463899f, -0.83867055f},
+    {0.52249849f, -0.85264015f}, {0.49999997f, -0.86602545f}, {0.47715876f, -0.87881708f},
+    {0.45399052f, -0.89100653f}, {0.43051103f, -0.90258533f}, {0.40673661f, -0.91354549f},
+    {0.38268343f, -0.92387956f}, {0.35836786f, -0.93358046f}, {0.33380681f, -0.94264150f},
+    {0.30901697f, -0.95105654f}, {0.28401533f, -0.95881975f}, {0.25881907f, -0.96592581f},
+    {0.23344530f, -0.97236991f}, {0.20791166f, -0.97814763f}, {0.18223552f, -0.98325491f},
+    {0.15643437f, -0.98768836f}, {0.13052613f, -0.99144489f}, {0.10452842f, -0.99452192f},
+    {0.078459084f, -0.99691731f}, {0.052335974f, -0.99862951f}, {0.026176875f, -0.99965733f},
+    {1.0000000f, -0.0000000f}, {0.99862951f, -0.052335959f}, {0.99452192f, -0.10452846f},
+    {0.98768836f, -0.15643448f}, {0.97814763f, -0.20791170f}, {0.96592581f, -0.25881904f},
+    {0.95105648f, -0.30901700f}, {0.93358040f, -0.35836795f}, {0.91354543f, -0.40673664f},
+    {0.89100653f, -0.45399052f}, {0.86602545f, -0.50000000f}, {0.83867055f, -0.54463905f},
+    {0.80901700f, -0.58778524f}, {0.77714598f, -0.62932038f}, {0.74314475f, -0.66913062f},
+    {0.70710677f, -0.70710683f}, {0.66913056f, -0.74314487f}, {0.62932038f, -0.77714598f},
+    {0.58778524f, -0.80901700f}, {0.54463899f, -0.83867055f}, {0.49999997f, -0.86602545f},
+    {0.45399052f, -0.89100653f}, {0.40673661f, -0.91354549f}, {0.35836786f, -0.93358046f},
+    {0.30901697f, -0.95105654f}, {0.25881907f, -0.96592581f}, {0.20791166f, -0.97814763f},
+    {0.15643437f, -0.98768836f}, {0.10452842f, -0.99452192f}, {0.052335974f, -0.99862951f},
+    {-4.3711388e-08f, -1.0000000f}, {-0.052336060f, -0.99862951f}, {-0.10452851f, -0.99452192f},
+    {-0.15643445f, -0.98768836f}, {-0.20791174f, -0.97814757f}, {-0.25881916f, -0.96592581f},
+    {-0.30901703f, -0.95105648f}, {-0.35836795f, -0.93358040f}, {-0.40673670f, -0.91354543f},
+    {-0.45399061f, -0.89100647f}, {-0.50000006f, -0.86602533f}, {-0.54463905f, -0.83867055f},
+    {-0.58778518f, -0.80901700f}, {-0.62932050f, -0.77714586f}, {-0.66913068f, -0.74314475f},
+    {-0.70710677f, -0.70710677f}, {-0.74314493f, -0.66913044f}, {-0.77714604f, -0.62932026f},
+    {-0.80901700f, -0.58778518f}, {-0.83867055f, -0.54463899f}, {-0.86602539f, -0.50000006f},
+    {-0.89100659f, -0.45399037f}, {-0.91354549f, -0.40673658f}, {-0.93358040f, -0.35836792f},
+    {-0.95105654f, -0.30901679f}, {-0.96592587f, -0.25881892f}, {-0.97814763f, -0.20791161f},
+    {-0.98768836f, -0.15643445f}, {-0.99452192f, -0.10452849f}, {-0.99862957f, -0.052335810f},
+    {1.0000000f, -0.0000000f}, {0.99691731f, -0.078459099f}, {0.98768836f, -0.15643448f},
+    {0.97236991f, -0.23344538f}, {0.95105648f, -0.30901700f}, {0.92387956f, -0.38268346f},
+    {0.89100653f, -0.45399052f}, {0.85264015f, -0.52249855f}, {0.80901700f, -0.58778524f},
+    {0.76040596f, -0.64944810f}, {0.70710677f, -0.70710683f}, {0.64944804f, -0.76040596f},
+    {0.58778524f, -0.80901700f}, {0.52249849f, -0.85264015f}, {0.45399052f, -0.89100653f},
+    {0.38268343f, -0.92387956f}, {0.30901697f, -0.95105654f}, {0.23344530f, -0.97236991f},
+    {0.15643437f, -0.98768836f}, {0.078459084f, -0.99691731f}, {-4.3711388e-08f, -1.0000000f},
+    {-0.078459173f, -0.99691731f}, {-0.15643445f, -0.98768836f}, {-0.23344538f, -0.97236991f},
+    {-0.30901703f, -0.95105648f}, {-0.38268352f, -0.92387950f}, {-0.45399061f, -0.89100647f},
+    {-0.52249867f, -0.85264009f}, {-0.58778518f, -0.80901700f}, {-0.64944804f, -0.76040596f},
+    {-0.70710677f, -0.70710677f}, {-0.76040596f, -0.64944804f}, {-0.80901700f, -0.58778518f},
+    {-0.85264021f, -0.52249849f}, {-0.89100659f, -0.45399037f}, {-0.92387956f, -0.38268328f},
+    {-0.95105654f, -0.30901679f}, {-0.97236991f, -0.23344538f}, {-0.98768836f, -0.15643445f},
+    {-0.99691737f, -0.078459039f}, {-1.0000000f, 8.7422777e-08f}, {-0.99691731f, 0.078459218f},
+    {-0.98768830f, 0.15643461f}, {-0.97236985f, 0.23344554f}, {-0.95105654f, 0.30901697f},
+    {-0.92387956f, 0.38268346f}, {-0.89100653f, 0.45399055f}, {-0.85264015f, 0.52249861f},
+    {-0.80901694f, 0.58778536f}, {-0.76040590f, 0.64944816f}, {-0.70710665f, 0.70710689f},
+    {-0.64944792f, 0.76040608f}, {-0.58778507f, 0.80901712f}, {-0.52249837f, 0.85264033f},
+    {-0.45399022f, 0.89100665f}, {-0.38268313f, 0.92387968f}, {-0.30901709f, 0.95105648f},
+    {-0.23344545f, 0.97236991f}, {-0.15643452f, 0.98768830f}, {-0.078459114f, 0.99691731f},
 };
 static const ne10_fft_cpx_float32_t ne10_twiddles_120[120] = {
-{1.0000000f,0.0000000f}, {1.0000000f,-0.0000000f}, {1.0000000f,-0.0000000f},
-{1.0000000f,-0.0000000f}, {0.91354543f,-0.40673664f}, {0.66913056f,-0.74314487f},
-{1.0000000f,-0.0000000f}, {0.66913056f,-0.74314487f}, {-0.10452851f,-0.99452192f},
-{1.0000000f,-0.0000000f}, {0.30901697f,-0.95105654f}, {-0.80901700f,-0.58778518f},
-{1.0000000f,-0.0000000f}, {-0.10452851f,-0.99452192f}, {-0.97814757f,0.20791179f},
-{1.0000000f,-0.0000000f}, {0.97814763f,-0.20791170f}, {0.91354543f,-0.40673664f},
-{0.80901700f,-0.58778524f}, {0.66913056f,-0.74314487f}, {0.49999997f,-0.86602545f},
-{0.30901697f,-0.95105654f}, {0.10452842f,-0.99452192f}, {-0.10452851f,-0.99452192f},
-{-0.30901703f,-0.95105648f}, {-0.50000006f,-0.86602533f}, {-0.66913068f,-0.74314475f},
-{-0.80901700f,-0.58778518f}, {-0.91354549f,-0.40673658f}, {-0.97814763f,-0.20791161f},
-{1.0000000f,-0.0000000f}, {0.99862951f,-0.052335959f}, {0.99452192f,-0.10452846f},
-{0.98768836f,-0.15643448f}, {0.97814763f,-0.20791170f}, {0.96592581f,-0.25881904f},
-{0.95105648f,-0.30901700f}, {0.93358040f,-0.35836795f}, {0.91354543f,-0.40673664f},
-{0.89100653f,-0.45399052f}, {0.86602545f,-0.50000000f}, {0.83867055f,-0.54463905f},
-{0.80901700f,-0.58778524f}, {0.77714598f,-0.62932038f}, {0.74314475f,-0.66913062f},
-{0.70710677f,-0.70710683f}, {0.66913056f,-0.74314487f}, {0.62932038f,-0.77714598f},
-{0.58778524f,-0.80901700f}, {0.54463899f,-0.83867055f}, {0.49999997f,-0.86602545f},
-{0.45399052f,-0.89100653f}, {0.40673661f,-0.91354549f}, {0.35836786f,-0.93358046f},
-{0.30901697f,-0.95105654f}, {0.25881907f,-0.96592581f}, {0.20791166f,-0.97814763f},
-{0.15643437f,-0.98768836f}, {0.10452842f,-0.99452192f}, {0.052335974f,-0.99862951f},
-{1.0000000f,-0.0000000f}, {0.99452192f,-0.10452846f}, {0.97814763f,-0.20791170f},
-{0.95105648f,-0.30901700f}, {0.91354543f,-0.40673664f}, {0.86602545f,-0.50000000f},
-{0.80901700f,-0.58778524f}, {0.74314475f,-0.66913062f}, {0.66913056f,-0.74314487f},
-{0.58778524f,-0.80901700f}, {0.49999997f,-0.86602545f}, {0.40673661f,-0.91354549f},
-{0.30901697f,-0.95105654f}, {0.20791166f,-0.97814763f}, {0.10452842f,-0.99452192f},
-{-4.3711388e-08f,-1.0000000f}, {-0.10452851f,-0.99452192f}, {-0.20791174f,-0.97814757f},
-{-0.30901703f,-0.95105648f}, {-0.40673670f,-0.91354543f}, {-0.50000006f,-0.86602533f},
-{-0.58778518f,-0.80901700f}, {-0.66913068f,-0.74314475f}, {-0.74314493f,-0.66913044f},
-{-0.80901700f,-0.58778518f}, {-0.86602539f,-0.50000006f}, {-0.91354549f,-0.40673658f},
-{-0.95105654f,-0.30901679f}, {-0.97814763f,-0.20791161f}, {-0.99452192f,-0.10452849f},
-{1.0000000f,-0.0000000f}, {0.98768836f,-0.15643448f}, {0.95105648f,-0.30901700f},
-{0.89100653f,-0.45399052f}, {0.80901700f,-0.58778524f}, {0.70710677f,-0.70710683f},
-{0.58778524f,-0.80901700f}, {0.45399052f,-0.89100653f}, {0.30901697f,-0.95105654f},
-{0.15643437f,-0.98768836f}, {-4.3711388e-08f,-1.0000000f}, {-0.15643445f,-0.98768836f},
-{-0.30901703f,-0.95105648f}, {-0.45399061f,-0.89100647f}, {-0.58778518f,-0.80901700f},
-{-0.70710677f,-0.70710677f}, {-0.80901700f,-0.58778518f}, {-0.89100659f,-0.45399037f},
-{-0.95105654f,-0.30901679f}, {-0.98768836f,-0.15643445f}, {-1.0000000f,8.7422777e-08f},
-{-0.98768830f,0.15643461f}, {-0.95105654f,0.30901697f}, {-0.89100653f,0.45399055f},
-{-0.80901694f,0.58778536f}, {-0.70710665f,0.70710689f}, {-0.58778507f,0.80901712f},
-{-0.45399022f,0.89100665f}, {-0.30901709f,0.95105648f}, {-0.15643452f,0.98768830f},
+    {1.0000000f, 0.0000000f}, {1.0000000f, -0.0000000f}, {1.0000000f, -0.0000000f},
+    {1.0000000f, -0.0000000f}, {0.91354543f, -0.40673664f}, {0.66913056f, -0.74314487f},
+    {1.0000000f, -0.0000000f}, {0.66913056f, -0.74314487f}, {-0.10452851f, -0.99452192f},
+    {1.0000000f, -0.0000000f}, {0.30901697f, -0.95105654f}, {-0.80901700f, -0.58778518f},
+    {1.0000000f, -0.0000000f}, {-0.10452851f, -0.99452192f}, {-0.97814757f, 0.20791179f},
+    {1.0000000f, -0.0000000f}, {0.97814763f, -0.20791170f}, {0.91354543f, -0.40673664f},
+    {0.80901700f, -0.58778524f}, {0.66913056f, -0.74314487f}, {0.49999997f, -0.86602545f},
+    {0.30901697f, -0.95105654f}, {0.10452842f, -0.99452192f}, {-0.10452851f, -0.99452192f},
+    {-0.30901703f, -0.95105648f}, {-0.50000006f, -0.86602533f}, {-0.66913068f, -0.74314475f},
+    {-0.80901700f, -0.58778518f}, {-0.91354549f, -0.40673658f}, {-0.97814763f, -0.20791161f},
+    {1.0000000f, -0.0000000f}, {0.99862951f, -0.052335959f}, {0.99452192f, -0.10452846f},
+    {0.98768836f, -0.15643448f}, {0.97814763f, -0.20791170f}, {0.96592581f, -0.25881904f},
+    {0.95105648f, -0.30901700f}, {0.93358040f, -0.35836795f}, {0.91354543f, -0.40673664f},
+    {0.89100653f, -0.45399052f}, {0.86602545f, -0.50000000f}, {0.83867055f, -0.54463905f},
+    {0.80901700f, -0.58778524f}, {0.77714598f, -0.62932038f}, {0.74314475f, -0.66913062f},
+    {0.70710677f, -0.70710683f}, {0.66913056f, -0.74314487f}, {0.62932038f, -0.77714598f},
+    {0.58778524f, -0.80901700f}, {0.54463899f, -0.83867055f}, {0.49999997f, -0.86602545f},
+    {0.45399052f, -0.89100653f}, {0.40673661f, -0.91354549f}, {0.35836786f, -0.93358046f},
+    {0.30901697f, -0.95105654f}, {0.25881907f, -0.96592581f}, {0.20791166f, -0.97814763f},
+    {0.15643437f, -0.98768836f}, {0.10452842f, -0.99452192f}, {0.052335974f, -0.99862951f},
+    {1.0000000f, -0.0000000f}, {0.99452192f, -0.10452846f}, {0.97814763f, -0.20791170f},
+    {0.95105648f, -0.30901700f}, {0.91354543f, -0.40673664f}, {0.86602545f, -0.50000000f},
+    {0.80901700f, -0.58778524f}, {0.74314475f, -0.66913062f}, {0.66913056f, -0.74314487f},
+    {0.58778524f, -0.80901700f}, {0.49999997f, -0.86602545f}, {0.40673661f, -0.91354549f},
+    {0.30901697f, -0.95105654f}, {0.20791166f, -0.97814763f}, {0.10452842f, -0.99452192f},
+    {-4.3711388e-08f, -1.0000000f}, {-0.10452851f, -0.99452192f}, {-0.20791174f, -0.97814757f},
+    {-0.30901703f, -0.95105648f}, {-0.40673670f, -0.91354543f}, {-0.50000006f, -0.86602533f},
+    {-0.58778518f, -0.80901700f}, {-0.66913068f, -0.74314475f}, {-0.74314493f, -0.66913044f},
+    {-0.80901700f, -0.58778518f}, {-0.86602539f, -0.50000006f}, {-0.91354549f, -0.40673658f},
+    {-0.95105654f, -0.30901679f}, {-0.97814763f, -0.20791161f}, {-0.99452192f, -0.10452849f},
+    {1.0000000f, -0.0000000f}, {0.98768836f, -0.15643448f}, {0.95105648f, -0.30901700f},
+    {0.89100653f, -0.45399052f}, {0.80901700f, -0.58778524f}, {0.70710677f, -0.70710683f},
+    {0.58778524f, -0.80901700f}, {0.45399052f, -0.89100653f}, {0.30901697f, -0.95105654f},
+    {0.15643437f, -0.98768836f}, {-4.3711388e-08f, -1.0000000f}, {-0.15643445f, -0.98768836f},
+    {-0.30901703f, -0.95105648f}, {-0.45399061f, -0.89100647f}, {-0.58778518f, -0.80901700f},
+    {-0.70710677f, -0.70710677f}, {-0.80901700f, -0.58778518f}, {-0.89100659f, -0.45399037f},
+    {-0.95105654f, -0.30901679f}, {-0.98768836f, -0.15643445f}, {-1.0000000f, 8.7422777e-08f},
+    {-0.98768830f, 0.15643461f}, {-0.95105654f, 0.30901697f}, {-0.89100653f, 0.45399055f},
+    {-0.80901694f, 0.58778536f}, {-0.70710665f, 0.70710689f}, {-0.58778507f, 0.80901712f},
+    {-0.45399022f, 0.89100665f}, {-0.30901709f, 0.95105648f}, {-0.15643452f, 0.98768830f},
 };
 static const ne10_fft_cpx_float32_t ne10_twiddles_60[60] = {
-{1.0000000f,0.0000000f}, {1.0000000f,-0.0000000f}, {1.0000000f,-0.0000000f},
-{1.0000000f,-0.0000000f}, {0.91354543f,-0.40673664f}, {0.66913056f,-0.74314487f},
-{1.0000000f,-0.0000000f}, {0.66913056f,-0.74314487f}, {-0.10452851f,-0.99452192f},
-{1.0000000f,-0.0000000f}, {0.30901697f,-0.95105654f}, {-0.80901700f,-0.58778518f},
-{1.0000000f,-0.0000000f}, {-0.10452851f,-0.99452192f}, {-0.97814757f,0.20791179f},
-{1.0000000f,-0.0000000f}, {0.99452192f,-0.10452846f}, {0.97814763f,-0.20791170f},
-{0.95105648f,-0.30901700f}, {0.91354543f,-0.40673664f}, {0.86602545f,-0.50000000f},
-{0.80901700f,-0.58778524f}, {0.74314475f,-0.66913062f}, {0.66913056f,-0.74314487f},
-{0.58778524f,-0.80901700f}, {0.49999997f,-0.86602545f}, {0.40673661f,-0.91354549f},
-{0.30901697f,-0.95105654f}, {0.20791166f,-0.97814763f}, {0.10452842f,-0.99452192f},
-{1.0000000f,-0.0000000f}, {0.97814763f,-0.20791170f}, {0.91354543f,-0.40673664f},
-{0.80901700f,-0.58778524f}, {0.66913056f,-0.74314487f}, {0.49999997f,-0.86602545f},
-{0.30901697f,-0.95105654f}, {0.10452842f,-0.99452192f}, {-0.10452851f,-0.99452192f},
-{-0.30901703f,-0.95105648f}, {-0.50000006f,-0.86602533f}, {-0.66913068f,-0.74314475f},
-{-0.80901700f,-0.58778518f}, {-0.91354549f,-0.40673658f}, {-0.97814763f,-0.20791161f},
-{1.0000000f,-0.0000000f}, {0.95105648f,-0.30901700f}, {0.80901700f,-0.58778524f},
-{0.58778524f,-0.80901700f}, {0.30901697f,-0.95105654f}, {-4.3711388e-08f,-1.0000000f},
-{-0.30901703f,-0.95105648f}, {-0.58778518f,-0.80901700f}, {-0.80901700f,-0.58778518f},
-{-0.95105654f,-0.30901679f}, {-1.0000000f,8.7422777e-08f}, {-0.95105654f,0.30901697f},
-{-0.80901694f,0.58778536f}, {-0.58778507f,0.80901712f}, {-0.30901709f,0.95105648f},
+    {1.0000000f, 0.0000000f}, {1.0000000f, -0.0000000f}, {1.0000000f, -0.0000000f},
+    {1.0000000f, -0.0000000f}, {0.91354543f, -0.40673664f}, {0.66913056f, -0.74314487f},
+    {1.0000000f, -0.0000000f}, {0.66913056f, -0.74314487f}, {-0.10452851f, -0.99452192f},
+    {1.0000000f, -0.0000000f}, {0.30901697f, -0.95105654f}, {-0.80901700f, -0.58778518f},
+    {1.0000000f, -0.0000000f}, {-0.10452851f, -0.99452192f}, {-0.97814757f, 0.20791179f},
+    {1.0000000f, -0.0000000f}, {0.99452192f, -0.10452846f}, {0.97814763f, -0.20791170f},
+    {0.95105648f, -0.30901700f}, {0.91354543f, -0.40673664f}, {0.86602545f, -0.50000000f},
+    {0.80901700f, -0.58778524f}, {0.74314475f, -0.66913062f}, {0.66913056f, -0.74314487f},
+    {0.58778524f, -0.80901700f}, {0.49999997f, -0.86602545f}, {0.40673661f, -0.91354549f},
+    {0.30901697f, -0.95105654f}, {0.20791166f, -0.97814763f}, {0.10452842f, -0.99452192f},
+    {1.0000000f, -0.0000000f}, {0.97814763f, -0.20791170f}, {0.91354543f, -0.40673664f},
+    {0.80901700f, -0.58778524f}, {0.66913056f, -0.74314487f}, {0.49999997f, -0.86602545f},
+    {0.30901697f, -0.95105654f}, {0.10452842f, -0.99452192f}, {-0.10452851f, -0.99452192f},
+    {-0.30901703f, -0.95105648f}, {-0.50000006f, -0.86602533f}, {-0.66913068f, -0.74314475f},
+    {-0.80901700f, -0.58778518f}, {-0.91354549f, -0.40673658f}, {-0.97814763f, -0.20791161f},
+    {1.0000000f, -0.0000000f}, {0.95105648f, -0.30901700f}, {0.80901700f, -0.58778524f},
+    {0.58778524f, -0.80901700f}, {0.30901697f, -0.95105654f}, {-4.3711388e-08f, -1.0000000f},
+    {-0.30901703f, -0.95105648f}, {-0.58778518f, -0.80901700f}, {-0.80901700f, -0.58778518f},
+    {-0.95105654f, -0.30901679f}, {-1.0000000f, 8.7422777e-08f}, {-0.95105654f, 0.30901697f},
+    {-0.80901694f, 0.58778536f}, {-0.58778507f, 0.80901712f}, {-0.30901709f, 0.95105648f},
 };
 static const ne10_fft_state_float32_t ne10_fft_state_float32_t_480 = {
-120,
-(ne10_int32_t *)ne10_factors_480,
-(ne10_fft_cpx_float32_t *)ne10_twiddles_480,
-NULL,
-(ne10_fft_cpx_float32_t *)&ne10_twiddles_480[120],
+    120,
+    (ne10_int32_t *)ne10_factors_480,
+    (ne10_fft_cpx_float32_t *)ne10_twiddles_480,
+    NULL,
+    (ne10_fft_cpx_float32_t *)&ne10_twiddles_480[120],
 /* is_forward_scaled = true */
-(ne10_int32_t) 1,
+    (ne10_int32_t) 1,
 /* is_backward_scaled = false */
-(ne10_int32_t) 0,
+    (ne10_int32_t) 0,
 };
 static const arch_fft_state cfg_arch_480 = {
-1,
-(void *)&ne10_fft_state_float32_t_480,
+    1,
+    (void *)&ne10_fft_state_float32_t_480,
 };
 
 static const ne10_fft_state_float32_t ne10_fft_state_float32_t_240 = {
-60,
-(ne10_int32_t *)ne10_factors_240,
-(ne10_fft_cpx_float32_t *)ne10_twiddles_240,
-NULL,
-(ne10_fft_cpx_float32_t *)&ne10_twiddles_240[60],
+    60,
+    (ne10_int32_t *)ne10_factors_240,
+    (ne10_fft_cpx_float32_t *)ne10_twiddles_240,
+    NULL,
+    (ne10_fft_cpx_float32_t *)&ne10_twiddles_240[60],
 /* is_forward_scaled = true */
-(ne10_int32_t) 1,
+    (ne10_int32_t) 1,
 /* is_backward_scaled = false */
-(ne10_int32_t) 0,
+    (ne10_int32_t) 0,
 };
 static const arch_fft_state cfg_arch_240 = {
-1,
-(void *)&ne10_fft_state_float32_t_240,
+    1,
+    (void *)&ne10_fft_state_float32_t_240,
 };
 
 static const ne10_fft_state_float32_t ne10_fft_state_float32_t_120 = {
-30,
-(ne10_int32_t *)ne10_factors_120,
-(ne10_fft_cpx_float32_t *)ne10_twiddles_120,
-NULL,
-(ne10_fft_cpx_float32_t *)&ne10_twiddles_120[30],
+    30,
+    (ne10_int32_t *)ne10_factors_120,
+    (ne10_fft_cpx_float32_t *)ne10_twiddles_120,
+    NULL,
+    (ne10_fft_cpx_float32_t *)&ne10_twiddles_120[30],
 /* is_forward_scaled = true */
-(ne10_int32_t) 1,
+    (ne10_int32_t) 1,
 /* is_backward_scaled = false */
-(ne10_int32_t) 0,
+    (ne10_int32_t) 0,
 };
 static const arch_fft_state cfg_arch_120 = {
-1,
-(void *)&ne10_fft_state_float32_t_120,
+    1,
+    (void *)&ne10_fft_state_float32_t_120,
 };
 
 static const ne10_fft_state_float32_t ne10_fft_state_float32_t_60 = {
-15,
-(ne10_int32_t *)ne10_factors_60,
-(ne10_fft_cpx_float32_t *)ne10_twiddles_60,
-NULL,
-(ne10_fft_cpx_float32_t *)&ne10_twiddles_60[15],
+    15,
+    (ne10_int32_t *)ne10_factors_60,
+    (ne10_fft_cpx_float32_t *)ne10_twiddles_60,
+    NULL,
+    (ne10_fft_cpx_float32_t *)&ne10_twiddles_60[15],
 /* is_forward_scaled = true */
-(ne10_int32_t) 1,
+    (ne10_int32_t) 1,
 /* is_backward_scaled = false */
-(ne10_int32_t) 0,
+    (ne10_int32_t) 0,
 };
 static const arch_fft_state cfg_arch_60 = {
-1,
-(void *)&ne10_fft_state_float32_t_60,
+    1,
+    (void *)&ne10_fft_state_float32_t_60,
 };
 
 #endif  /* end NE10_FFT_PARAMS48000_960 */
diff --git a/celt/tests/test_unit_cwrs32.c b/celt/tests/test_unit_cwrs32.c
index 57a1eecce..0173124f2 100644
--- a/celt/tests/test_unit_cwrs32.c
+++ b/celt/tests/test_unit_cwrs32.c
@@ -24,19 +24,19 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdio.h>
 #include <string.h>
 
 #ifndef CUSTOM_MODES
-#define CUSTOM_MODES
+# define CUSTOM_MODES
 #else
-#define TEST_CUSTOM_MODES
+# define TEST_CUSTOM_MODES
 #endif
 
 #define CELT_C
@@ -53,110 +53,109 @@
 
 #ifdef TEST_CUSTOM_MODES
 
-#define NDIMS (44)
-static const int pn[NDIMS]={
-   2,   3,   4,   5,   6,   7,   8,   9,  10,
-  11,  12,  13,  14,  15,  16,  18,  20,  22,
-  24,  26,  28,  30,  32,  36,  40,  44,  48,
-  52,  56,  60,  64,  72,  80,  88,  96, 104,
- 112, 120, 128, 144, 160, 176, 192, 208
+# define NDIMS (44)
+static const int pn[NDIMS] = {
+    2,   3,   4,   5,   6,   7,   8,   9,  10,
+    11,  12,  13,  14,  15,  16,  18,  20,  22,
+    24,  26,  28,  30,  32,  36,  40,  44,  48,
+    52,  56,  60,  64,  72,  80,  88,  96, 104,
+    112, 120, 128, 144, 160, 176, 192, 208
 };
-static const int pkmax[NDIMS]={
- 128, 128, 128, 128,  88,  52,  36,  26,  22,
-  18,  16,  15,  13,  12,  12,  11,  10,   9,
-   9,   8,   8,   7,   7,   7,   7,   6,   6,
-   6,   6,   6,   5,   5,   5,   5,   5,   5,
-   4,   4,   4,   4,   4,   4,   4,   4
+static const int pkmax[NDIMS] = {
+    128, 128, 128, 128,  88,  52,  36,  26,  22,
+    18,  16,  15,  13,  12,  12,  11,  10,   9,
+    9,   8,   8,   7,   7,   7,   7,   6,   6,
+    6,   6,   6,   5,   5,   5,   5,   5,   5,
+    4,   4,   4,   4,   4,   4,   4,   4
 };
 
 #else /* TEST_CUSTOM_MODES */
 
-#define NDIMS (22)
-static const int pn[NDIMS]={
-   2,   3,   4,   6,   8,   9,  11,  12,  16,
-  18,  22,  24,  32,  36,  44,  48,  64,  72,
-  88,  96, 144, 176
+# define NDIMS (22)
+static const int pn[NDIMS] = {
+    2,   3,   4,   6,   8,   9,  11,  12,  16,
+    18,  22,  24,  32,  36,  44,  48,  64,  72,
+    88,  96, 144, 176
 };
-static const int pkmax[NDIMS]={
- 128, 128, 128,  88,  36,  26,  18,  16,  12,
-  11,   9,   9,   7,   7,   6,   6,   5,   5,
-   5,   5,   4,   4
+static const int pkmax[NDIMS] = {
+    128, 128, 128,  88,  36,  26,  18,  16,  12,
+    11,   9,   9,   7,   7,   6,   6,   5,   5,
+    5,   5,   4,   4
 };
 
 #endif
 
-int main(void){
-  int t;
-  int n;
-  ALLOC_STACK;
-  for(t=0;t<NDIMS;t++){
-    int pseudo;
-    n=pn[t];
-    for(pseudo=1;pseudo<41;pseudo++)
-    {
-      int k;
+int main(void) {
+    int t;
+    int n;
+    ALLOC_STACK;
+    for (t = 0; t < NDIMS; t++) {
+        int pseudo;
+        n = pn[t];
+        for (pseudo = 1; pseudo < 41; pseudo++) {
+            int k;
 #if defined(SMALL_FOOTPRINT)
-      oac_uint32 uu[KMAX+2U];
+            oac_uint32 uu[KMAX + 2U];
 #endif
-      oac_uint32 inc;
-      oac_uint32 nc;
-      oac_uint32 i;
-      k=get_pulses(pseudo);
-      if (k>pkmax[t])break;
-      printf("Testing CWRS with N=%i, K=%i...\n",n,k);
+            oac_uint32 inc;
+            oac_uint32 nc;
+            oac_uint32 i;
+            k = get_pulses(pseudo);
+            if (k > pkmax[t]) break;
+            printf("Testing CWRS with N=%i, K=%i...\n", n, k);
 #if defined(SMALL_FOOTPRINT)
-      nc=ncwrs_urow(n,k,uu);
+            nc = ncwrs_urow(n, k, uu);
 #else
-      nc=CELT_PVQ_V(n,k);
+            nc = CELT_PVQ_V(n, k);
 #endif
-      inc=nc/20000;
-      if(inc<1)inc=1;
-      for(i=0;i<nc;i+=inc){
+            inc = nc/20000;
+            if (inc < 1) inc = 1;
+            for (i = 0; i < nc; i += inc) {
 #if defined(SMALL_FOOTPRINT)
-        oac_uint32 u[KMAX+2U];
+                oac_uint32 u[KMAX + 2U];
 #endif
-        int         y[NMAX];
-        int         sy;
-        oac_uint32 v;
-        oac_uint32 ii;
-        int         j;
+                int y[NMAX];
+                int sy;
+                oac_uint32 v;
+                oac_uint32 ii;
+                int j;
 #if defined(SMALL_FOOTPRINT)
-        memcpy(u,uu,(k+2U)*sizeof(*u));
-        cwrsi(n,k,i,y,u);
+                memcpy(u, uu, (k + 2U)*sizeof(*u));
+                cwrsi(n, k, i, y, u);
 #else
-        cwrsi(n,k,i,y);
+                cwrsi(n, k, i, y);
 #endif
-        sy=0;
-        for(j=0;j<n;j++)sy+=abs(y[j]);
-        if(sy!=k){
-          fprintf(stderr,"N=%d Pulse count mismatch in cwrsi (%d!=%d).\n",
-           n,sy,k);
-          return 99;
-        }
-        /*printf("%6u of %u:",i,nc);
-        for(j=0;j<n;j++)printf(" %+3i",y[j]);
-        printf(" ->");*/
+                sy = 0;
+                for (j = 0; j < n; j++) sy += abs(y[j]);
+                if (sy != k) {
+                    fprintf(stderr, "N=%d Pulse count mismatch in cwrsi (%d!=%d).\n",
+           n, sy, k);
+                    return 99;
+                }
+                /*printf("%6u of %u:",i,nc);
+                   for(j=0;j<n;j++)printf(" %+3i",y[j]);
+                   printf(" ->");*/
 #if defined(SMALL_FOOTPRINT)
-        ii=icwrs(n,k,&v,y,u);
+                ii = icwrs(n, k, &v, y, u);
 #else
-        ii=icwrs(n,y);
-        v=CELT_PVQ_V(n,k);
+                ii = icwrs(n, y);
+                v = CELT_PVQ_V(n, k);
 #endif
-        if(ii!=i){
-          fprintf(stderr,"Combination-index mismatch (%lu!=%lu).\n",
-           (long)ii,(long)i);
-          return 1;
-        }
-        if(v!=nc){
-          fprintf(stderr,"Combination count mismatch (%lu!=%lu).\n",
-           (long)v,(long)nc);
-          return 2;
+                if (ii != i) {
+                    fprintf(stderr, "Combination-index mismatch (%lu!=%lu).\n",
+                        (long)ii, (long)i);
+                    return 1;
+                }
+                if (v != nc) {
+                    fprintf(stderr, "Combination count mismatch (%lu!=%lu).\n",
+                        (long)v, (long)nc);
+                    return 2;
+                }
+                /*printf(" %6u\n",i);*/
+            }
+            /*printf("\n");*/
         }
-        /*printf(" %6u\n",i);*/
-      }
-      /*printf("\n");*/
     }
-  }
-  RESTORE_STACK;
-  return 0;
+    RESTORE_STACK;
+    return 0;
 }
diff --git a/celt/tests/test_unit_dft.c b/celt/tests/test_unit_dft.c
index 575d30f4e..919ad3da3 100644
--- a/celt/tests/test_unit_dft.c
+++ b/celt/tests/test_unit_dft.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdio.h>
@@ -37,60 +37,57 @@
 #include "modes.h"
 
 #ifndef M_PI
-#define M_PI 3.141592653
+# define M_PI 3.141592653
 #endif
 
 int ret = 0;
 
-void check(kiss_fft_cpx  * in,kiss_fft_cpx  * out,int nfft,int isinverse)
-{
-    int bin,k;
-    double errpow=0,sigpow=0, snr;
+void check(kiss_fft_cpx  * in, kiss_fft_cpx  * out, int nfft, int isinverse) {
+    int bin, k;
+    double errpow = 0, sigpow = 0, snr;
 
-    for (bin=0;bin<nfft;++bin) {
+    for (bin = 0; bin < nfft; ++bin) {
         double ansr = 0;
         double ansi = 0;
         double difr;
         double difi;
 
-        for (k=0;k<nfft;++k) {
+        for (k = 0; k < nfft; ++k) {
             double phase = -2*M_PI*bin*k/nfft;
             double re = cos(phase);
             double im = sin(phase);
             if (isinverse)
                 im = -im;
 
-            if (!isinverse)
-            {
-               re /= nfft;
-               im /= nfft;
+            if (!isinverse) {
+                re /= nfft;
+                im /= nfft;
             }
 
-            ansr += in[k].r * re - in[k].i * im;
-            ansi += in[k].r * im + in[k].i * re;
+            ansr += in[k].r*re - in[k].i*im;
+            ansi += in[k].r*im + in[k].i*re;
         }
         /*printf ("%d %d ", (int)ansr, (int)ansi);*/
         difr = ansr - out[bin].r;
         difi = ansi - out[bin].i;
         errpow += difr*difr + difi*difi;
-        sigpow += ansr*ansr+ansi*ansi;
+        sigpow += ansr*ansr + ansi*ansi;
     }
     snr = 10*log10(sigpow/errpow);
-    printf("nfft=%d inverse=%d,snr = %f\n",nfft,isinverse,snr );
-    if (snr<60) {
-       printf( "** poor snr: %f ** \n", snr);
-       ret = 1;
+    printf("nfft=%d inverse=%d,snr = %f\n", nfft, isinverse, snr );
+    if (snr < 60) {
+        printf( "** poor snr: %f ** \n", snr);
+        ret = 1;
     }
 }
 
-void test1d(int nfft,int isinverse,int arch)
-{
+void test1d(int nfft, int isinverse, int arch) {
     size_t buflen = sizeof(kiss_fft_cpx)*nfft;
     kiss_fft_cpx *in;
     kiss_fft_cpx *out;
     int k;
 #ifdef CUSTOM_MODES
-    kiss_fft_state *cfg = oac_fft_alloc(nfft,0,0,arch);
+    kiss_fft_state *cfg = oac_fft_alloc(nfft, 0, 0, arch);
 #else
     int id;
     const kiss_fft_state *cfg;
@@ -106,34 +103,33 @@ void test1d(int nfft,int isinverse,int arch)
     in = (kiss_fft_cpx*)malloc(buflen);
     out = (kiss_fft_cpx*)malloc(buflen);
 
-    for (k=0;k<nfft;++k) {
-        in[k].r = (rand() % 32767) - 16384;
-        in[k].i = (rand() % 32767) - 16384;
+    for (k = 0; k < nfft; ++k) {
+        in[k].r = (rand()%32767) - 16384;
+        in[k].i = (rand()%32767) - 16384;
     }
 
-    for (k=0;k<nfft;++k) {
-       in[k].r *= 32768;
-       in[k].i *= 32768;
+    for (k = 0; k < nfft; ++k) {
+        in[k].r *= 32768;
+        in[k].i *= 32768;
     }
 
-    if (isinverse)
-    {
-       for (k=0;k<nfft;++k) {
-          in[k].r /= nfft;
-          in[k].i /= nfft;
-       }
+    if (isinverse) {
+        for (k = 0; k < nfft; ++k) {
+            in[k].r /= nfft;
+            in[k].i /= nfft;
+        }
     }
 
     /*for (k=0;k<nfft;++k) printf("%d %d ", in[k].r, in[k].i);printf("\n");*/
 
     if (isinverse)
-       oac_ifft(cfg,in,out, arch);
+        oac_ifft(cfg, in, out, arch);
     else
-       oac_fft(cfg,in,out, arch);
+        oac_fft(cfg, in, out, arch);
 
     /*for (k=0;k<nfft;++k) printf("%d %d ", out[k].r, out[k].i);printf("\n");*/
 
-    check(in,out,nfft,isinverse);
+    check(in, out, nfft, isinverse);
 
     free(in);
     free(out);
@@ -142,38 +138,37 @@ void test1d(int nfft,int isinverse,int arch)
 #endif
 }
 
-int main(int argc,char ** argv)
-{
+int main(int argc, char ** argv) {
     int arch;
     ALLOC_STACK;
     arch = oac_select_arch();
 
-    if (argc>1) {
+    if (argc > 1) {
         int k;
-        for (k=1;k<argc;++k) {
-            test1d(atoi(argv[k]),0,arch);
-            test1d(atoi(argv[k]),1,arch);
+        for (k = 1; k < argc; ++k) {
+            test1d(atoi(argv[k]), 0, arch);
+            test1d(atoi(argv[k]), 1, arch);
         }
-    }else{
-        test1d(32,0,arch);
-        test1d(32,1,arch);
-        test1d(128,0,arch);
-        test1d(128,1,arch);
-        test1d(256,0,arch);
-        test1d(256,1,arch);
+    } else  {
+        test1d(32, 0, arch);
+        test1d(32, 1, arch);
+        test1d(128, 0, arch);
+        test1d(128, 1, arch);
+        test1d(256, 0, arch);
+        test1d(256, 1, arch);
 #ifndef RADIX_TWO_ONLY
-        test1d(36,0,arch);
-        test1d(36,1,arch);
-        test1d(50,0,arch);
-        test1d(50,1,arch);
-        test1d(60,0,arch);
-        test1d(60,1,arch);
-        test1d(120,0,arch);
-        test1d(120,1,arch);
-        test1d(240,0,arch);
-        test1d(240,1,arch);
-        test1d(480,0,arch);
-        test1d(480,1,arch);
+        test1d(36, 0, arch);
+        test1d(36, 1, arch);
+        test1d(50, 0, arch);
+        test1d(50, 1, arch);
+        test1d(60, 0, arch);
+        test1d(60, 1, arch);
+        test1d(120, 0, arch);
+        test1d(120, 1, arch);
+        test1d(240, 0, arch);
+        test1d(240, 1, arch);
+        test1d(480, 0, arch);
+        test1d(480, 1, arch);
 #endif
     }
     RESTORE_STACK;
diff --git a/celt/tests/test_unit_entropy.c b/celt/tests/test_unit_entropy.c
index b1619b74d..681d9be92 100644
--- a/celt/tests/test_unit_entropy.c
+++ b/celt/tests/test_unit_entropy.c
@@ -24,10 +24,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdlib.h>
@@ -50,334 +50,333 @@
 #define DATA_SIZE 10000000
 #define DATA_SIZE2 10000
 
-int main(int _argc,char **_argv){
-  ec_enc         enc;
-  ec_dec         dec;
-  long           nbits;
-  long           nbits2;
-  double         entropy;
-  int            ft;
-  int            ftb;
-  int            sz;
-  int            i;
-  int            ret;
-  unsigned int   sym;
-  unsigned int   seed;
-  unsigned char *ptr;
-  const char    *env_seed;
-  ret=0;
-  entropy=0;
-  if (_argc > 2) {
-    fprintf(stderr, "Usage: %s [<seed>]\n", _argv[0]);
-    return 1;
-  }
-  env_seed = getenv("SEED");
-  if (_argc > 1)
-    seed = atoi(_argv[1]);
-  else if (env_seed)
-    seed = atoi(env_seed);
-  else
-    seed = time(NULL);
-  /*Testing encoding of raw bit values.*/
-  ptr = (unsigned char *)malloc(DATA_SIZE);
-  ec_enc_init(&enc,ptr, DATA_SIZE);
-  for(ft=2;ft<1024;ft++){
-    for(i=0;i<ft;i++){
-      entropy+=log(ft)*M_LOG2E;
-      ec_enc_uint(&enc,i,ft);
+int main(int _argc, char **_argv) {
+    ec_enc enc;
+    ec_dec dec;
+    long nbits;
+    long nbits2;
+    double entropy;
+    int ft;
+    int ftb;
+    int sz;
+    int i;
+    int ret;
+    unsigned int sym;
+    unsigned int seed;
+    unsigned char *ptr;
+    const char    *env_seed;
+    ret = 0;
+    entropy = 0;
+    if (_argc > 2) {
+        fprintf(stderr, "Usage: %s [<seed>]\n", _argv[0]);
+        return 1;
     }
-  }
-  /*Testing encoding of raw bit values.*/
-  for(ftb=1;ftb<16;ftb++){
-    for(i=0;i<(1<<ftb);i++){
-      entropy+=ftb;
-      nbits=ec_tell(&enc);
-      ec_enc_bits(&enc,i,ftb);
-      nbits2=ec_tell(&enc);
-      if(nbits2-nbits!=ftb){
-        fprintf(stderr,"Used %li bits to encode %i bits directly.\n",
-         nbits2-nbits,ftb);
-        ret=-1;
-      }
+    env_seed = getenv("SEED");
+    if (_argc > 1)
+        seed = atoi(_argv[1]);
+    else if (env_seed)
+        seed = atoi(env_seed);
+    else
+        seed = time(NULL);
+    /*Testing encoding of raw bit values.*/
+    ptr = (unsigned char *)malloc(DATA_SIZE);
+    ec_enc_init(&enc, ptr, DATA_SIZE);
+    for (ft = 2; ft < 1024; ft++) {
+        for (i = 0; i < ft; i++) {
+            entropy += log(ft)*M_LOG2E;
+            ec_enc_uint(&enc, i, ft);
+        }
     }
-  }
-  nbits=ec_tell_frac(&enc);
-  ec_enc_done(&enc);
-  fprintf(stderr,
+    /*Testing encoding of raw bit values.*/
+    for (ftb = 1; ftb < 16; ftb++) {
+        for (i = 0; i < (1<<ftb); i++) {
+            entropy += ftb;
+            nbits = ec_tell(&enc);
+            ec_enc_bits(&enc, i, ftb);
+            nbits2 = ec_tell(&enc);
+            if (nbits2 - nbits != ftb) {
+                fprintf(stderr, "Used %li bits to encode %i bits directly.\n",
+         nbits2 - nbits, ftb);
+                ret = -1;
+            }
+        }
+    }
+    nbits = ec_tell_frac(&enc);
+    ec_enc_done(&enc);
+    fprintf(stderr,
    "Encoded %0.2f bits of entropy to %0.2f bits (%0.3f%% wasted).\n",
-   entropy,ldexp(nbits,-3),100*(nbits-ldexp(entropy,3))/nbits);
-  fprintf(stderr,"Packed to %li bytes.\n",(long)ec_range_bytes(&enc));
-  ec_dec_init(&dec,ptr,DATA_SIZE);
-  for(ft=2;ft<1024;ft++){
-    for(i=0;i<ft;i++){
-      sym=ec_dec_uint(&dec,ft);
-      if(sym!=(unsigned)i){
-        fprintf(stderr,"Decoded %i instead of %i with ft of %i.\n",sym,i,ft);
-        ret=-1;
-      }
+   entropy, ldexp(nbits, -3), 100*(nbits - ldexp(entropy, 3))/nbits);
+    fprintf(stderr, "Packed to %li bytes.\n", (long)ec_range_bytes(&enc));
+    ec_dec_init(&dec, ptr, DATA_SIZE);
+    for (ft = 2; ft < 1024; ft++) {
+        for (i = 0; i < ft; i++) {
+            sym = ec_dec_uint(&dec, ft);
+            if (sym != (unsigned)i) {
+                fprintf(stderr, "Decoded %i instead of %i with ft of %i.\n", sym, i, ft);
+                ret = -1;
+            }
+        }
     }
-  }
-  for(ftb=1;ftb<16;ftb++){
-    for(i=0;i<(1<<ftb);i++){
-      sym=ec_dec_bits(&dec,ftb);
-      if(sym!=(unsigned)i){
-        fprintf(stderr,"Decoded %i instead of %i with ftb of %i.\n",sym,i,ftb);
-        ret=-1;
-      }
+    for (ftb = 1; ftb < 16; ftb++) {
+        for (i = 0; i < (1<<ftb); i++) {
+            sym = ec_dec_bits(&dec, ftb);
+            if (sym != (unsigned)i) {
+                fprintf(stderr, "Decoded %i instead of %i with ftb of %i.\n", sym, i, ftb);
+                ret = -1;
+            }
+        }
     }
-  }
-  nbits2=ec_tell_frac(&dec);
-  if(nbits!=nbits2){
-    fprintf(stderr,
+    nbits2 = ec_tell_frac(&dec);
+    if (nbits != nbits2) {
+        fprintf(stderr,
      "Reported number of bits used was %0.2f, should be %0.2f.\n",
-     ldexp(nbits2,-3),ldexp(nbits,-3));
-    ret=-1;
-  }
-  /*Testing an encoder bust prefers range coder data over raw bits.
-    This isn't a general guarantee, will only work for data that is buffered in
-     the encoder state and not yet stored in the user buffer, and should never
-     get used in practice.
-    It's mostly here for code coverage completeness.*/
-  /*Start with a 16-bit buffer.*/
-  ec_enc_init(&enc,ptr,2);
-  /*Write 7 raw bits.*/
-  ec_enc_bits(&enc,0x55,7);
-  /*Write 12.3 bits of range coder data.*/
-  ec_enc_uint(&enc,1,2);
-  ec_enc_uint(&enc,1,3);
-  ec_enc_uint(&enc,1,4);
-  ec_enc_uint(&enc,1,5);
-  ec_enc_uint(&enc,2,6);
-  ec_enc_uint(&enc,6,7);
-  ec_enc_done(&enc);
-  ec_dec_init(&dec,ptr,2);
-  if(!enc.error
-   /*The raw bits should have been overwritten by the range coder data.*/
-   ||ec_dec_bits(&dec,7)!=0x05
-   /*And all the range coder data should have been encoded correctly.*/
-   ||ec_dec_uint(&dec,2)!=1
-   ||ec_dec_uint(&dec,3)!=1
-   ||ec_dec_uint(&dec,4)!=1
-   ||ec_dec_uint(&dec,5)!=1
-   ||ec_dec_uint(&dec,6)!=2
-   ||ec_dec_uint(&dec,7)!=6){
-    fprintf(stderr,"Encoder bust overwrote range coder data with raw bits.\n");
-    ret=-1;
-  }
-  srand(seed);
-  fprintf(stderr,"Testing random streams... Random seed: %u (%.4X)\n", seed, rand() % 65536);
-  for(i=0;i<409600;i++){
-    unsigned *data;
-    unsigned *tell;
-    unsigned tell_bits;
-    int       j;
-    int zeros;
-    ft=rand()/((RAND_MAX>>(rand()%11U))+1U)+10;
-    sz=rand()/((RAND_MAX>>(rand()%9U))+1U);
-    data=(unsigned *)malloc(sz*sizeof(*data));
-    tell=(unsigned *)malloc((sz+1)*sizeof(*tell));
-    ec_enc_init(&enc,ptr,DATA_SIZE2);
-    zeros = rand()%13==0;
-    tell[0]=ec_tell_frac(&enc);
-    for(j=0;j<sz;j++){
-      if (zeros)
-        data[j]=0;
-      else
-        data[j]=rand()%ft;
-      ec_enc_uint(&enc,data[j],ft);
-      tell[j+1]=ec_tell_frac(&enc);
+     ldexp(nbits2, -3), ldexp(nbits, -3));
+        ret = -1;
     }
-    if (rand()%2==0)
-      while(ec_tell(&enc)%8 != 0)
-        ec_enc_uint(&enc, rand()%2, 2);
-    tell_bits = ec_tell(&enc);
+    /*Testing an encoder bust prefers range coder data over raw bits.
+       This isn't a general guarantee, will only work for data that is buffered in
+       the encoder state and not yet stored in the user buffer, and should never
+       get used in practice.
+       It's mostly here for code coverage completeness.*/
+    /*Start with a 16-bit buffer.*/
+    ec_enc_init(&enc, ptr, 2);
+    /*Write 7 raw bits.*/
+    ec_enc_bits(&enc, 0x55, 7);
+    /*Write 12.3 bits of range coder data.*/
+    ec_enc_uint(&enc, 1, 2);
+    ec_enc_uint(&enc, 1, 3);
+    ec_enc_uint(&enc, 1, 4);
+    ec_enc_uint(&enc, 1, 5);
+    ec_enc_uint(&enc, 2, 6);
+    ec_enc_uint(&enc, 6, 7);
     ec_enc_done(&enc);
-    if(tell_bits!=(unsigned)ec_tell(&enc)){
-      fprintf(stderr,"ec_tell() changed after ec_enc_done(): %i instead of %i (Random seed: %u)\n",
-       ec_tell(&enc),tell_bits,seed);
-      ret=-1;
-    }
-    if ((tell_bits+7)/8 < ec_range_bytes(&enc))
-    {
-      fprintf (stderr, "ec_tell() lied, there's %i bytes instead of %d (Random seed: %u)\n",
-               ec_range_bytes(&enc), (tell_bits+7)/8,seed);
-      ret=-1;
+    ec_dec_init(&dec, ptr, 2);
+    if (!enc.error
+        /*The raw bits should have been overwritten by the range coder data.*/
+        || ec_dec_bits(&dec, 7) != 0x05
+        /*And all the range coder data should have been encoded correctly.*/
+        || ec_dec_uint(&dec, 2) != 1
+        || ec_dec_uint(&dec, 3) != 1
+        || ec_dec_uint(&dec, 4) != 1
+        || ec_dec_uint(&dec, 5) != 1
+        || ec_dec_uint(&dec, 6) != 2
+        || ec_dec_uint(&dec, 7) != 6) {
+        fprintf(stderr, "Encoder bust overwrote range coder data with raw bits.\n");
+        ret = -1;
     }
-    ec_dec_init(&dec,ptr,DATA_SIZE2);
-    if(ec_tell_frac(&dec)!=tell[0]){
-      fprintf(stderr,
+    srand(seed);
+    fprintf(stderr, "Testing random streams... Random seed: %u (%.4X)\n", seed, rand()%65536);
+    for (i = 0; i < 409600; i++) {
+        unsigned *data;
+        unsigned *tell;
+        unsigned tell_bits;
+        int j;
+        int zeros;
+        ft = rand()/((RAND_MAX>>(rand()%11U)) + 1U) + 10;
+        sz = rand()/((RAND_MAX>>(rand()%9U)) + 1U);
+        data = (unsigned *)malloc(sz*sizeof(*data));
+        tell = (unsigned *)malloc((sz + 1)*sizeof(*tell));
+        ec_enc_init(&enc, ptr, DATA_SIZE2);
+        zeros = rand()%13 == 0;
+        tell[0] = ec_tell_frac(&enc);
+        for (j = 0; j < sz; j++) {
+            if (zeros)
+                data[j] = 0;
+            else
+                data[j] = rand()%ft;
+            ec_enc_uint(&enc, data[j], ft);
+            tell[j + 1] = ec_tell_frac(&enc);
+        }
+        if (rand()%2 == 0)
+            while (ec_tell(&enc)%8 != 0)
+                ec_enc_uint(&enc, rand()%2, 2);
+        tell_bits = ec_tell(&enc);
+        ec_enc_done(&enc);
+        if (tell_bits != (unsigned)ec_tell(&enc)) {
+            fprintf(stderr, "ec_tell() changed after ec_enc_done(): %i instead of %i (Random seed: %u)\n",
+       ec_tell(&enc), tell_bits, seed);
+            ret = -1;
+        }
+        if ((tell_bits + 7)/8 < ec_range_bytes(&enc)) {
+            fprintf (stderr, "ec_tell() lied, there's %i bytes instead of %d (Random seed: %u)\n",
+               ec_range_bytes(&enc), (tell_bits + 7)/8, seed);
+            ret = -1;
+        }
+        ec_dec_init(&dec, ptr, DATA_SIZE2);
+        if (ec_tell_frac(&dec) != tell[0]) {
+            fprintf(stderr,
        "Tell mismatch between encoder and decoder at symbol %i: %i instead of %i (Random seed: %u).\n",
-       0,ec_tell_frac(&dec),tell[0],seed);
-    }
-    for(j=0;j<sz;j++){
-      sym=ec_dec_uint(&dec,ft);
-      if(sym!=data[j]){
-        fprintf(stderr,
+       0, ec_tell_frac(&dec), tell[0], seed);
+        }
+        for (j = 0; j < sz; j++) {
+            sym = ec_dec_uint(&dec, ft);
+            if (sym != data[j]) {
+                fprintf(stderr,
          "Decoded %i instead of %i with ft of %i at position %i of %i (Random seed: %u).\n",
-         sym,data[j],ft,j,sz,seed);
-        ret=-1;
-      }
-      if(ec_tell_frac(&dec)!=tell[j+1]){
-        fprintf(stderr,
+         sym, data[j], ft, j, sz, seed);
+                ret = -1;
+            }
+            if (ec_tell_frac(&dec) != tell[j + 1]) {
+                fprintf(stderr,
+         "Tell mismatch between encoder and decoder at symbol %i: %i instead of %i (Random seed: %u).\n",
+         j + 1, ec_tell_frac(&dec), tell[j + 1], seed);
+            }
+        }
+        free(tell);
+        free(data);
+    }
+    /*Test compatibility between multiple different encode/decode routines.*/
+    for (i = 0; i < 409600; i++) {
+        unsigned *logp1;
+        unsigned *data;
+        unsigned *tell;
+        unsigned *enc_method;
+        int j;
+        sz = rand()/((RAND_MAX>>(rand()%9U)) + 1U);
+        logp1 = (unsigned *)malloc(sz*sizeof(*logp1));
+        data = (unsigned *)malloc(sz*sizeof(*data));
+        tell = (unsigned *)malloc((sz + 1)*sizeof(*tell));
+        enc_method = (unsigned *)malloc(sz*sizeof(*enc_method));
+        ec_enc_init(&enc, ptr, DATA_SIZE2);
+        tell[0] = ec_tell_frac(&enc);
+        for (j = 0; j < sz; j++) {
+            data[j] = rand()/((RAND_MAX>>1) + 1);
+            logp1[j] = (rand()%15) + 1;
+            enc_method[j] = rand()/((RAND_MAX>>2) + 1);
+            switch (enc_method[j]) {
+                case 0: {
+                    ec_encode(&enc, data[j]?(1<<logp1[j]) - 1:0,
+                        (1<<logp1[j]) - (data[j]?0:1), 1<<logp1[j]);
+                } break;
+                case 1: {
+                    ec_encode_bin(&enc, data[j]?(1<<logp1[j]) - 1:0,
+                        (1<<logp1[j]) - (data[j]?0:1), logp1[j]);
+                } break;
+                case 2: {
+                    ec_enc_bit_logp(&enc, data[j], logp1[j]);
+                } break;
+                case 3: {
+                    unsigned char icdf[2];
+                    icdf[0] = 1;
+                    icdf[1] = 0;
+                    ec_enc_icdf(&enc, data[j], icdf, logp1[j]);
+                } break;
+            }
+            tell[j + 1] = ec_tell_frac(&enc);
+        }
+        ec_enc_done(&enc);
+        if ((ec_tell(&enc) + 7U)/8U < ec_range_bytes(&enc)) {
+            fprintf(stderr, "tell() lied, there's %i bytes instead of %d (Random seed: %u)\n",
+       ec_range_bytes(&enc), (ec_tell(&enc) + 7)/8, seed);
+            ret = -1;
+        }
+        ec_dec_init(&dec, ptr, DATA_SIZE2);
+        if (ec_tell_frac(&dec) != tell[0]) {
+            fprintf(stderr,
+       "Tell mismatch between encoder and decoder at symbol %i: %i instead of %i (Random seed: %u).\n",
+       0, ec_tell_frac(&dec), tell[0], seed);
+        }
+        for (j = 0; j < sz; j++) {
+            int fs;
+            int dec_method;
+            dec_method = rand()/((RAND_MAX>>2) + 1);
+            switch (dec_method) {
+                case 0: {
+                    fs = ec_decode(&dec, 1<<logp1[j]);
+                    sym = fs >= (1<<logp1[j]) - 1;
+                    ec_dec_update(&dec, sym?(1<<logp1[j]) - 1:0,
+                        (1<<logp1[j]) - (sym?0:1), 1<<logp1[j]);
+                } break;
+                case 1: {
+                    fs = ec_decode_bin(&dec, logp1[j]);
+                    sym = fs >= (1<<logp1[j]) - 1;
+                    ec_dec_update(&dec, sym?(1<<logp1[j]) - 1:0,
+                        (1<<logp1[j]) - (sym?0:1), 1<<logp1[j]);
+                } break;
+                case 2: {
+                    sym = ec_dec_bit_logp(&dec, logp1[j]);
+                } break;
+                case 3: {
+                    unsigned char icdf[2];
+                    icdf[0] = 1;
+                    icdf[1] = 0;
+                    sym = ec_dec_icdf(&dec, icdf, logp1[j]);
+                } break;
+            }
+            if (sym != data[j]) {
+                fprintf(stderr,
+         "Decoded %i instead of %i with logp1 of %i at position %i of %i (Random seed: %u).\n",
+         sym, data[j], logp1[j], j, sz, seed);
+                fprintf(stderr, "Encoding method: %i, decoding method: %i\n",
+         enc_method[j], dec_method);
+                ret = -1;
+            }
+            if (ec_tell_frac(&dec) != tell[j + 1]) {
+                fprintf(stderr,
          "Tell mismatch between encoder and decoder at symbol %i: %i instead of %i (Random seed: %u).\n",
-         j+1,ec_tell_frac(&dec),tell[j+1],seed);
-      }
+         j + 1, ec_tell_frac(&dec), tell[j + 1], seed);
+            }
+        }
+        free(enc_method);
+        free(tell);
+        free(data);
+        free(logp1);
     }
-    free(tell);
-    free(data);
-  }
-  /*Test compatibility between multiple different encode/decode routines.*/
-  for(i=0;i<409600;i++){
-    unsigned *logp1;
-    unsigned *data;
-    unsigned *tell;
-    unsigned *enc_method;
-    int       j;
-    sz=rand()/((RAND_MAX>>(rand()%9U))+1U);
-    logp1=(unsigned *)malloc(sz*sizeof(*logp1));
-    data=(unsigned *)malloc(sz*sizeof(*data));
-    tell=(unsigned *)malloc((sz+1)*sizeof(*tell));
-    enc_method=(unsigned *)malloc(sz*sizeof(*enc_method));
-    ec_enc_init(&enc,ptr,DATA_SIZE2);
-    tell[0]=ec_tell_frac(&enc);
-    for(j=0;j<sz;j++){
-      data[j]=rand()/((RAND_MAX>>1)+1);
-      logp1[j]=(rand()%15)+1;
-      enc_method[j]=rand()/((RAND_MAX>>2)+1);
-      switch(enc_method[j]){
-        case 0:{
-          ec_encode(&enc,data[j]?(1<<logp1[j])-1:0,
-           (1<<logp1[j])-(data[j]?0:1),1<<logp1[j]);
-        }break;
-        case 1:{
-          ec_encode_bin(&enc,data[j]?(1<<logp1[j])-1:0,
-           (1<<logp1[j])-(data[j]?0:1),logp1[j]);
-        }break;
-        case 2:{
-          ec_enc_bit_logp(&enc,data[j],logp1[j]);
-        }break;
-        case 3:{
-          unsigned char icdf[2];
-          icdf[0]=1;
-          icdf[1]=0;
-          ec_enc_icdf(&enc,data[j],icdf,logp1[j]);
-        }break;
-      }
-      tell[j+1]=ec_tell_frac(&enc);
+    ec_enc_init(&enc, ptr, DATA_SIZE2);
+    ec_enc_bit_logp(&enc, 0, 1);
+    ec_enc_bit_logp(&enc, 0, 1);
+    ec_enc_bit_logp(&enc, 0, 1);
+    ec_enc_bit_logp(&enc, 0, 1);
+    ec_enc_bit_logp(&enc, 0, 2);
+    ec_enc_patch_initial_bits(&enc, 3, 2);
+    if (enc.error) {
+        fprintf(stderr, "patch_initial_bits failed");
+        ret = -1;
+    }
+    ec_enc_patch_initial_bits(&enc, 0, 5);
+    if (!enc.error) {
+        fprintf(stderr, "patch_initial_bits didn't fail when it should have");
+        ret = -1;
     }
     ec_enc_done(&enc);
-    if((ec_tell(&enc)+7U)/8U<ec_range_bytes(&enc)){
-      fprintf(stderr,"tell() lied, there's %i bytes instead of %d (Random seed: %u)\n",
-       ec_range_bytes(&enc),(ec_tell(&enc)+7)/8,seed);
-      ret=-1;
+    if (ec_range_bytes(&enc) != 1 || ptr[0] != 192) {
+        fprintf(stderr, "Got %d when expecting 192 for patch_initial_bits", ptr[0]);
+        ret = -1;
     }
-    ec_dec_init(&dec,ptr,DATA_SIZE2);
-    if(ec_tell_frac(&dec)!=tell[0]){
-      fprintf(stderr,
-       "Tell mismatch between encoder and decoder at symbol %i: %i instead of %i (Random seed: %u).\n",
-       0,ec_tell_frac(&dec),tell[0],seed);
+    ec_enc_init(&enc, ptr, DATA_SIZE2);
+    ec_enc_bit_logp(&enc, 0, 1);
+    ec_enc_bit_logp(&enc, 0, 1);
+    ec_enc_bit_logp(&enc, 1, 6);
+    ec_enc_bit_logp(&enc, 0, 2);
+    ec_enc_patch_initial_bits(&enc, 0, 2);
+    if (enc.error) {
+        fprintf(stderr, "patch_initial_bits failed");
+        ret = -1;
     }
-    for(j=0;j<sz;j++){
-      int fs;
-      int dec_method;
-      dec_method=rand()/((RAND_MAX>>2)+1);
-      switch(dec_method){
-        case 0:{
-          fs=ec_decode(&dec,1<<logp1[j]);
-          sym=fs>=(1<<logp1[j])-1;
-          ec_dec_update(&dec,sym?(1<<logp1[j])-1:0,
-           (1<<logp1[j])-(sym?0:1),1<<logp1[j]);
-        }break;
-        case 1:{
-          fs=ec_decode_bin(&dec,logp1[j]);
-          sym=fs>=(1<<logp1[j])-1;
-          ec_dec_update(&dec,sym?(1<<logp1[j])-1:0,
-           (1<<logp1[j])-(sym?0:1),1<<logp1[j]);
-        }break;
-        case 2:{
-          sym=ec_dec_bit_logp(&dec,logp1[j]);
-        }break;
-        case 3:{
-          unsigned char icdf[2];
-          icdf[0]=1;
-          icdf[1]=0;
-          sym=ec_dec_icdf(&dec,icdf,logp1[j]);
-        }break;
-      }
-      if(sym!=data[j]){
-        fprintf(stderr,
-         "Decoded %i instead of %i with logp1 of %i at position %i of %i (Random seed: %u).\n",
-         sym,data[j],logp1[j],j,sz,seed);
-        fprintf(stderr,"Encoding method: %i, decoding method: %i\n",
-         enc_method[j],dec_method);
-        ret=-1;
-      }
-      if(ec_tell_frac(&dec)!=tell[j+1]){
-        fprintf(stderr,
-         "Tell mismatch between encoder and decoder at symbol %i: %i instead of %i (Random seed: %u).\n",
-         j+1,ec_tell_frac(&dec),tell[j+1],seed);
-      }
+    ec_enc_done(&enc);
+    if (ec_range_bytes(&enc) != 2 || ptr[0] != 63) {
+        fprintf(stderr, "Got %d when expecting 63 for patch_initial_bits", ptr[0]);
+        ret = -1;
+    }
+    ec_enc_init(&enc, ptr, 2);
+    ec_enc_bit_logp(&enc, 0, 2);
+    for (i = 0; i < 48; i++) {
+        ec_enc_bits(&enc, 0, 1);
+    }
+    ec_enc_done(&enc);
+    if (!enc.error) {
+        fprintf(stderr, "Raw bits overfill didn't fail when it should have");
+        ret = -1;
+    }
+    ec_enc_init(&enc, ptr, 2);
+    for (i = 0; i < 17; i++) {
+        ec_enc_bits(&enc, 0, 1);
+    }
+    ec_enc_done(&enc);
+    if (!enc.error) {
+        fprintf(stderr, "17 raw bits encoded in two bytes");
+        ret = -1;
     }
-    free(enc_method);
-    free(tell);
-    free(data);
-    free(logp1);
-  }
-  ec_enc_init(&enc,ptr,DATA_SIZE2);
-  ec_enc_bit_logp(&enc,0,1);
-  ec_enc_bit_logp(&enc,0,1);
-  ec_enc_bit_logp(&enc,0,1);
-  ec_enc_bit_logp(&enc,0,1);
-  ec_enc_bit_logp(&enc,0,2);
-  ec_enc_patch_initial_bits(&enc,3,2);
-  if(enc.error){
-    fprintf(stderr,"patch_initial_bits failed");
-    ret=-1;
-  }
-  ec_enc_patch_initial_bits(&enc,0,5);
-  if(!enc.error){
-    fprintf(stderr,"patch_initial_bits didn't fail when it should have");
-    ret=-1;
-  }
-  ec_enc_done(&enc);
-  if(ec_range_bytes(&enc)!=1||ptr[0]!=192){
-    fprintf(stderr,"Got %d when expecting 192 for patch_initial_bits",ptr[0]);
-    ret=-1;
-  }
-  ec_enc_init(&enc,ptr,DATA_SIZE2);
-  ec_enc_bit_logp(&enc,0,1);
-  ec_enc_bit_logp(&enc,0,1);
-  ec_enc_bit_logp(&enc,1,6);
-  ec_enc_bit_logp(&enc,0,2);
-  ec_enc_patch_initial_bits(&enc,0,2);
-  if(enc.error){
-    fprintf(stderr,"patch_initial_bits failed");
-    ret=-1;
-  }
-  ec_enc_done(&enc);
-  if(ec_range_bytes(&enc)!=2||ptr[0]!=63){
-    fprintf(stderr,"Got %d when expecting 63 for patch_initial_bits",ptr[0]);
-    ret=-1;
-  }
-  ec_enc_init(&enc,ptr,2);
-  ec_enc_bit_logp(&enc,0,2);
-  for(i=0;i<48;i++){
-    ec_enc_bits(&enc,0,1);
-  }
-  ec_enc_done(&enc);
-  if(!enc.error){
-    fprintf(stderr,"Raw bits overfill didn't fail when it should have");
-    ret=-1;
-  }
-  ec_enc_init(&enc,ptr,2);
-  for(i=0;i<17;i++){
-    ec_enc_bits(&enc,0,1);
-  }
-  ec_enc_done(&enc);
-  if(!enc.error){
-    fprintf(stderr,"17 raw bits encoded in two bytes");
-    ret=-1;
-  }
-  free(ptr);
-  return ret;
+    free(ptr);
+    return ret;
 }
diff --git a/celt/tests/test_unit_laplace.c b/celt/tests/test_unit_laplace.c
index c46bf9fe0..185fd5091 100644
--- a/celt/tests/test_unit_laplace.c
+++ b/celt/tests/test_unit_laplace.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdio.h>
@@ -42,53 +42,48 @@
 
 #define DATA_SIZE 40000
 
-int ec_laplace_get_start_freq(int decay)
-{
-   oac_uint32 ft = 32768 - LAPLACE_MINP*(2*LAPLACE_NMIN+1);
-   int fs = (ft*(16384-decay))/(16384+decay);
-   return fs+LAPLACE_MINP;
+int ec_laplace_get_start_freq(int decay) {
+    oac_uint32 ft = 32768 - LAPLACE_MINP*(2*LAPLACE_NMIN + 1);
+    int fs = (ft*(16384 - decay))/(16384 + decay);
+    return fs + LAPLACE_MINP;
 }
 
-int main(void)
-{
-   int i;
-   int ret = 0;
-   ec_enc enc;
-   ec_dec dec;
-   unsigned char *ptr;
-   int val[10000], decay[10000];
-   ALLOC_STACK;
-   ptr = (unsigned char *)malloc(DATA_SIZE);
-   ec_enc_init(&enc,ptr,DATA_SIZE);
+int main(void) {
+    int i;
+    int ret = 0;
+    ec_enc enc;
+    ec_dec dec;
+    unsigned char *ptr;
+    int val[10000], decay[10000];
+    ALLOC_STACK;
+    ptr = (unsigned char *)malloc(DATA_SIZE);
+    ec_enc_init(&enc, ptr, DATA_SIZE);
 
-   val[0] = 3; decay[0] = 6000;
-   val[1] = 0; decay[1] = 5800;
-   val[2] = -1; decay[2] = 5600;
-   for (i=3;i<10000;i++)
-   {
-      val[i] = rand()%15-7;
-      decay[i] = rand()%11000+5000;
-   }
-   for (i=0;i<10000;i++)
-      ec_laplace_encode(&enc, &val[i],
+    val[0] = 3; decay[0] = 6000;
+    val[1] = 0; decay[1] = 5800;
+    val[2] = -1; decay[2] = 5600;
+    for (i = 3; i < 10000; i++) {
+        val[i] = rand()%15 - 7;
+        decay[i] = rand()%11000 + 5000;
+    }
+    for (i = 0; i < 10000; i++)
+        ec_laplace_encode(&enc, &val[i],
             ec_laplace_get_start_freq(decay[i]), decay[i]);
 
-   ec_enc_done(&enc);
+    ec_enc_done(&enc);
 
-   ec_dec_init(&dec,ec_get_buffer(&enc),ec_range_bytes(&enc));
+    ec_dec_init(&dec, ec_get_buffer(&enc), ec_range_bytes(&enc));
 
-   for (i=0;i<10000;i++)
-   {
-      int d = ec_laplace_decode(&dec,
+    for (i = 0; i < 10000; i++) {
+        int d = ec_laplace_decode(&dec,
             ec_laplace_get_start_freq(decay[i]), decay[i]);
-      if (d != val[i])
-      {
-         fprintf (stderr, "Got %d instead of %d\n", d, val[i]);
-         ret = 1;
-      }
-   }
+        if (d != val[i]) {
+            fprintf (stderr, "Got %d instead of %d\n", d, val[i]);
+            ret = 1;
+        }
+    }
 
-   free(ptr);
-   RESTORE_STACK;
-   return ret;
+    free(ptr);
+    RESTORE_STACK;
+    return ret;
 }
diff --git a/celt/tests/test_unit_mathops.c b/celt/tests/test_unit_mathops.c
index 49ef771d6..dded70a3e 100644
--- a/celt/tests/test_unit_mathops.c
+++ b/celt/tests/test_unit_mathops.c
@@ -26,14 +26,14 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #ifndef CUSTOM_MODES
-#define CUSTOM_MODES
+# define CUSTOM_MODES
 #endif
 
 #include <stdio.h>
@@ -44,765 +44,681 @@
 #include "mathops.h"
 
 #ifdef FIXED_POINT
-#define WORD "%d"
-#define FIX_INT_TO_DOUBLE(x,q) (ldexp((double)(x), -(q)))
-#define DOUBLE_TO_FIX_INT(x,q) (ldexp((double)(x), (q)))
+# define WORD "%d"
+# define FIX_INT_TO_DOUBLE(x, q) (ldexp((double)(x), -(q)))
+# define DOUBLE_TO_FIX_INT(x, q) (ldexp((double)(x), (q)))
 #else
-#define WORD "%f"
+# define WORD "%f"
 #endif
 
 int ret = 0;
 
-void testdiv(void)
-{
-   oac_int32 i;
-   for (i=1;i<=327670;i++)
-   {
-      double prod;
-      oac_val32 val;
-      val = celt_rcp(i);
+void testdiv(void) {
+    oac_int32 i;
+    for (i = 1; i <= 327670; i++) {
+        double prod;
+        oac_val32 val;
+        val = celt_rcp(i);
 #ifdef FIXED_POINT
-      prod = (1./32768./65526.)*val*i;
+        prod = (1./32768./65526.)*val*i;
 #else
-      prod = val*i;
+        prod = val*i;
 #endif
-      if (fabs(prod-1) > .00025)
-      {
-         fprintf (stderr, "div failed: 1/%d=" WORD " (product = %f)\n", i, val, prod);
-         ret = 1;
-      }
-   }
+        if (fabs(prod - 1) > .00025) {
+            fprintf (stderr, "div failed: 1/%d=" WORD " (product = %f)\n", i, val, prod);
+            ret = 1;
+        }
+    }
 }
 
-void testsqrt(void)
-{
-   oac_int32 i;
-   for (i=1;i<=1000000000;i++)
-   {
-      double ratio;
-      oac_val16 val;
-      val = celt_sqrt(i);
-      ratio = val/sqrt(i);
-      if (fabs(ratio - 1) > .0005 && fabs(val-sqrt(i)) > 2)
-      {
-         fprintf (stderr, "sqrt failed: sqrt(%d)=" WORD " (ratio = %f)\n", i, val, ratio);
-         ret = 1;
-      }
-      i+= i>>10;
-   }
+void testsqrt(void) {
+    oac_int32 i;
+    for (i = 1; i <= 1000000000; i++) {
+        double ratio;
+        oac_val16 val;
+        val = celt_sqrt(i);
+        ratio = val/sqrt(i);
+        if (fabs(ratio - 1) > .0005 && fabs(val - sqrt(i)) > 2) {
+            fprintf (stderr, "sqrt failed: sqrt(%d)=" WORD " (ratio = %f)\n", i, val, ratio);
+            ret = 1;
+        }
+        i += i>>10;
+    }
 }
 
-void testbitexactcos(void)
-{
-   int i;
-   oac_int32 min_d,max_d,last,chk;
-   chk=max_d=0;
-   last=min_d=32767;
-   for(i=64;i<=16320;i++)
-   {
-      oac_int32 d;
-      oac_int32 q=bitexact_cos(i);
-      chk ^= q*i;
-      d = last - q;
-      if (d>max_d)max_d=d;
-      if (d<min_d)min_d=d;
-      last = q;
-   }
-   if ((chk!=89408644)||(max_d!=5)||(min_d!=0)||(bitexact_cos(64)!=32767)||
-       (bitexact_cos(16320)!=200)||(bitexact_cos(8192)!=23171))
-   {
-      fprintf (stderr, "bitexact_cos failed\n");
-      ret = 1;
-   }
+void testbitexactcos(void) {
+    int i;
+    oac_int32 min_d, max_d, last, chk;
+    chk = max_d = 0;
+    last = min_d = 32767;
+    for (i = 64; i <= 16320; i++) {
+        oac_int32 d;
+        oac_int32 q = bitexact_cos(i);
+        chk ^= q*i;
+        d = last - q;
+        if (d > max_d) max_d = d;
+        if (d < min_d) min_d = d;
+        last = q;
+    }
+    if ((chk != 89408644) || (max_d != 5) || (min_d != 0) || (bitexact_cos(64) != 32767)
+        || (bitexact_cos(16320) != 200) || (bitexact_cos(8192) != 23171)) {
+        fprintf (stderr, "bitexact_cos failed\n");
+        ret = 1;
+    }
 }
 
-void testbitexactlog2tan(void)
-{
-   int i,fail;
-   oac_int32 min_d,max_d,last,chk;
-   fail=chk=max_d=0;
-   last=min_d=15059;
-   for(i=64;i<8193;i++)
-   {
-      oac_int32 d;
-      oac_int32 mid=bitexact_cos(i);
-      oac_int32 side=bitexact_cos(16384-i);
-      oac_int32 q=bitexact_log2tan(mid,side);
-      chk ^= q*i;
-      d = last - q;
-      if (q!=-1*bitexact_log2tan(side,mid))
-        fail = 1;
-      if (d>max_d)max_d=d;
-      if (d<min_d)min_d=d;
-      last = q;
-   }
-   if ((chk!=15821257)||(max_d!=61)||(min_d!=-2)||fail||
-       (bitexact_log2tan(32767,200)!=15059)||(bitexact_log2tan(30274,12540)!=2611)||
-       (bitexact_log2tan(23171,23171)!=0))
-   {
-      fprintf (stderr, "bitexact_log2tan failed\n");
-      ret = 1;
-   }
+void testbitexactlog2tan(void) {
+    int i, fail;
+    oac_int32 min_d, max_d, last, chk;
+    fail = chk = max_d = 0;
+    last = min_d = 15059;
+    for (i = 64; i < 8193; i++) {
+        oac_int32 d;
+        oac_int32 mid = bitexact_cos(i);
+        oac_int32 side = bitexact_cos(16384 - i);
+        oac_int32 q = bitexact_log2tan(mid, side);
+        chk ^= q*i;
+        d = last - q;
+        if (q != -1*bitexact_log2tan(side, mid))
+            fail = 1;
+        if (d > max_d) max_d = d;
+        if (d < min_d) min_d = d;
+        last = q;
+    }
+    if ((chk != 15821257) || (max_d != 61) || (min_d != -2) || fail
+        || (bitexact_log2tan(32767, 200) != 15059) || (bitexact_log2tan(30274, 12540) != 2611)
+        || (bitexact_log2tan(23171, 23171) != 0)) {
+        fprintf (stderr, "bitexact_log2tan failed\n");
+        ret = 1;
+    }
 }
 
 #ifndef FIXED_POINT
-void testlog2(void)
-{
-   float x;
-   float error_threshold = 2.2e-06;
-   float max_error = 0;
-   for (x=0.001f;x<1677700.0;x+=(x/8.0))
-   {
-      float error = fabs((1.442695040888963387*log(x))-celt_log2(x));
-      if (max_error < error)
-      {
-         max_error = error;
-      }
-
-      if (error > error_threshold)
-      {
-         fprintf (stderr,
+void testlog2(void) {
+    float x;
+    float error_threshold = 2.2e-06;
+    float max_error = 0;
+    for (x = 0.001f; x < 1677700.0; x += (x/8.0)) {
+        float error = fabs((1.442695040888963387*log(x)) - celt_log2(x));
+        if (max_error < error) {
+            max_error = error;
+        }
+
+        if (error > error_threshold) {
+            fprintf (stderr,
                   "celt_log2 failed: "
                   "fabs((1.442695040888963387*log(x))-celt_log2(x))>%15.25e "
                   "(x = %f, error = %15.25e)\n", error_threshold, x, error);
-         ret = 1;
-      }
-   }
-   fprintf (stdout, "celt_log2 max_error: %15.25e\n", max_error);
+            ret = 1;
+        }
+    }
+    fprintf (stdout, "celt_log2 max_error: %15.25e\n", max_error);
 }
 
-void testexp2(void)
-{
-   float x;
-   float error_threshold = 2.3e-07;
-   float max_error = 0;
-   for (x=-11.0;x<24.0;x+=0.0007f)
-   {
-      float error = fabs(x-(1.442695040888963387*log((double)celt_exp2(x))));
-      if (max_error < error)
-      {
-         max_error = error;
-      }
-
-      if (error > error_threshold)
-      {
-         fprintf (stderr,
+void testexp2(void) {
+    float x;
+    float error_threshold = 2.3e-07;
+    float max_error = 0;
+    for (x = -11.0; x < 24.0; x += 0.0007f) {
+        float error = fabs(x - (1.442695040888963387*log((double)celt_exp2(x))));
+        if (max_error < error) {
+            max_error = error;
+        }
+
+        if (error > error_threshold) {
+            fprintf (stderr,
                   "celt_exp2 failed: "
                   "fabs(x-(1.442695040888963387*log(celt_exp2(x))))>%15.25e "
                   "(x = %f, error = %15.25e)\n", error_threshold, x, error);
-         ret = 1;
-      }
-   }
-   fprintf (stdout, "celt_exp2 max_error: %15.25e\n", max_error);
+            ret = 1;
+        }
+    }
+    fprintf (stdout, "celt_exp2 max_error: %15.25e\n", max_error);
 }
 
-void testexp2log2(void)
-{
-   float x;
-   float error_threshold = 2.0e-06;
-   float max_error = 0;
-   for (x=-11.0;x<24.0;x+=0.0007f)
-   {
-      float error = fabs(x-(celt_log2(celt_exp2(x))));
-      if (max_error < error)
-      {
-         max_error = error;
-      }
-
-      if (error > error_threshold)
-      {
-         fprintf (stderr,
+void testexp2log2(void) {
+    float x;
+    float error_threshold = 2.0e-06;
+    float max_error = 0;
+    for (x = -11.0; x < 24.0; x += 0.0007f) {
+        float error = fabs(x - (celt_log2(celt_exp2(x))));
+        if (max_error < error) {
+            max_error = error;
+        }
+
+        if (error > error_threshold) {
+            fprintf (stderr,
                   "celt_log2/celt_exp2 failed: "
                   "fabs(x-(celt_log2(celt_exp2(x))))>%15.25e "
                   "(x = %f, error = %15.25e)\n", error_threshold, x, error);
-         ret = 1;
-      }
-   }
-   fprintf (stdout, "celt_exp2, celt_log2 max_error: %15.25e\n", max_error);
+            ret = 1;
+        }
+    }
+    fprintf (stdout, "celt_exp2, celt_log2 max_error: %15.25e\n", max_error);
 }
 
-void test_cos(void)
-{
-   float x;
-   float error_threshold = 6.0e-07;
-   float max_error = 0;
-   for (x = -4.0f; x < 4.0f; x += 0.0007f)
-   {
-      float error = fabs((float)cos((.5f*PI)*(x)) - celt_cos_norm2(x));
-      if (max_error < error)
-      {
-         max_error = error;
-      }
-
-      if (error > error_threshold)
-      {
-         fprintf (stderr,
+void test_cos(void) {
+    float x;
+    float error_threshold = 6.0e-07;
+    float max_error = 0;
+    for (x = -4.0f; x < 4.0f; x += 0.0007f) {
+        float error = fabs((float)cos((.5f*PI)*(x)) - celt_cos_norm2(x));
+        if (max_error < error) {
+            max_error = error;
+        }
+
+        if (error > error_threshold) {
+            fprintf (stderr,
                   "celt_cos_norm2 failed: "
                   "fabs(ref_x-(celt_cos_norm2(x)))>%15.25e "
                   "(x = %f, error = %15.25e)\n", error_threshold, x, error);
-         ret = 1;
-      }
-   }
-   fprintf (stdout, "celt_cos_norm2 max_error: %15.25e\n", max_error);
+            ret = 1;
+        }
+    }
+    fprintf (stdout, "celt_cos_norm2 max_error: %15.25e\n", max_error);
 }
 
 void test_atan2(void) {
-   float x, y;
-   float error_threshold = 1.5e-07;
-   float max_error = 0;
-   for (x = 0.0f; x < 1.0f; x += 0.007f)
-   {
-      for (y = 0.0f; y <1.0f; y += 0.007f)
-      {
-         if (x==0 && y==0)
-         {
-            /* atan2(0,0) is undefined behavior. */
-            continue;
-         }
-         float error = fabs(0.636619772367581f*(float)atan2((double)y, (double)x) - celt_atan2p_norm(y, x));
-         if (max_error < error)
-         {
-            max_error = error;
-         }
-
-         if (error > error_threshold)
-         {
-            fprintf (stderr,
+    float x, y;
+    float error_threshold = 1.5e-07;
+    float max_error = 0;
+    for (x = 0.0f; x < 1.0f; x += 0.007f) {
+        for (y = 0.0f; y < 1.0f; y += 0.007f) {
+            if (x == 0 && y == 0) {
+                /* atan2(0,0) is undefined behavior. */
+                continue;
+            }
+            float error = fabs(0.636619772367581f*(float)atan2((double)y, (double)x) - celt_atan2p_norm(y, x));
+            if (max_error < error) {
+                max_error = error;
+            }
+
+            if (error > error_threshold) {
+                fprintf (stderr,
                      "celt_atan2p_norm failed: "
                      "(fabs)(2/pi*atan2(y,x) - celt_atan2p_norm(y,x))>%15.25e "
                      "(x = %f, y = %f, error = %15.25e)\n",
                      error_threshold, x, y, error);
-            ret = 1;
-         }
-      }
-   }
-   fprintf (stdout, "celt_atan2p_norm max_error: %15.25e\n", max_error);
+                ret = 1;
+            }
+        }
+    }
+    fprintf (stdout, "celt_atan2p_norm max_error: %15.25e\n", max_error);
 }
 
 #else
 
-void testlog2_db(void)
-{
-   /* celt_log2_db test */
-   float error = -1;
-   float max_error = -2;
-   float error_threshold = 2.e-07;
-   oac_int32 x = 0;
-   int q_input = 14;
-   for (x = 8; x < 1073741824; x += (x >> 3))
-   {
-      error = fabs((1.442695040888963387*log(FIX_INT_TO_DOUBLE(x, q_input))) -
-                   FIX_INT_TO_DOUBLE(celt_log2_db(x), DB_SHIFT));
-      if (error > max_error)
-      {
-         max_error = error;
-      }
-      if (error > error_threshold)
-      {
-         fprintf(stderr, "celt_log2_db failed: error: [%.5e > %.5e] (x = %f)\n",
+void testlog2_db(void) {
+    /* celt_log2_db test */
+    float error = -1;
+    float max_error = -2;
+    float error_threshold = 2.e-07;
+    oac_int32 x = 0;
+    int q_input = 14;
+    for (x = 8; x < 1073741824; x += (x>>3)) {
+        error = fabs((1.442695040888963387*log(FIX_INT_TO_DOUBLE(x, q_input)))
+            - FIX_INT_TO_DOUBLE(celt_log2_db(x), DB_SHIFT));
+        if (error > max_error) {
+            max_error = error;
+        }
+        if (error > error_threshold) {
+            fprintf(stderr, "celt_log2_db failed: error: [%.5e > %.5e] (x = %f)\n",
                  error, error_threshold, FIX_INT_TO_DOUBLE(x, DB_SHIFT));
-         ret = 1;
-      }
-   }
-   fprintf(stdout, "celt_log2_db max_error: %.7e\n", max_error);
+            ret = 1;
+        }
+    }
+    fprintf(stdout, "celt_log2_db max_error: %.7e\n", max_error);
 }
 
-void testlog2(void)
-{
-   oac_val32 x;
-   for (x=8;x<1073741824;x+=(x>>3))
-   {
-      float error = fabs((1.442695040888963387*log(x/16384.0))-celt_log2(x)/1024.0);
-      if (error>0.003)
-      {
-         fprintf (stderr, "celt_log2 failed: x = %ld, error = %f\n", (long)x,error);
-         ret = 1;
-      }
-   }
+void testlog2(void) {
+    oac_val32 x;
+    for (x = 8; x < 1073741824; x += (x>>3)) {
+        float error = fabs((1.442695040888963387*log(x/16384.0)) - celt_log2(x)/1024.0);
+        if (error > 0.003) {
+            fprintf (stderr, "celt_log2 failed: x = %ld, error = %f\n", (long)x, error);
+            ret = 1;
+        }
+    }
 }
 
-void testexp2(void)
-{
-   oac_val16 x;
-   for (x=-32768;x<15360;x++)
-   {
-      float error1 = fabs(x/1024.0-(1.442695040888963387*log(celt_exp2(x)/65536.0)));
-      float error2 = fabs(exp(0.6931471805599453094*x/1024.0)-celt_exp2(x)/65536.0);
-      if (error1>0.0002&&error2>0.00004)
-      {
-         fprintf (stderr, "celt_exp2 failed: x = " WORD ", error1 = %f, error2 = %f\n", x,error1,error2);
-         ret = 1;
-      }
-   }
+void testexp2(void) {
+    oac_val16 x;
+    for (x = -32768; x < 15360; x++) {
+        float error1 = fabs(x/1024.0 - (1.442695040888963387*log(celt_exp2(x)/65536.0)));
+        float error2 = fabs(exp(0.6931471805599453094*x/1024.0) - celt_exp2(x)/65536.0);
+        if (error1 > 0.0002 && error2 > 0.00004) {
+            fprintf (stderr, "celt_exp2 failed: x = " WORD ", error1 = %f, error2 = %f\n", x, error1, error2);
+            ret = 1;
+        }
+    }
 }
 
-void testexp2_db(void)
-{
-   float absolute_error = -1;
-   float absolute_error_threshold = FIX_INT_TO_DOUBLE(2, 16);
-   float relative_error_threshold = -2;
-   float fx;
-   float quantized_fx;
-   oac_val32 x_32;
-
-   for (fx = -32.0; fx < 15.0; fx += 0.0007)
-   {
-      double ground_truth;
-      x_32 = DOUBLE_TO_FIX_INT(fx, DB_SHIFT);
-      quantized_fx = FIX_INT_TO_DOUBLE(x_32, DB_SHIFT);
-
-      ground_truth = (exp(0.6931471805599453094 * quantized_fx));
-      absolute_error = fabs(ground_truth -
-                            FIX_INT_TO_DOUBLE(celt_exp2_db(x_32), 16));
-
-      relative_error_threshold = 1.24e-7 * ground_truth;
-      if (absolute_error > absolute_error_threshold &&
-          absolute_error > relative_error_threshold)
-      {
-         fprintf(stderr,
+void testexp2_db(void) {
+    float absolute_error = -1;
+    float absolute_error_threshold = FIX_INT_TO_DOUBLE(2, 16);
+    float relative_error_threshold = -2;
+    float fx;
+    float quantized_fx;
+    oac_val32 x_32;
+
+    for (fx = -32.0; fx < 15.0; fx += 0.0007) {
+        double ground_truth;
+        x_32 = DOUBLE_TO_FIX_INT(fx, DB_SHIFT);
+        quantized_fx = FIX_INT_TO_DOUBLE(x_32, DB_SHIFT);
+
+        ground_truth = (exp(0.6931471805599453094*quantized_fx));
+        absolute_error = fabs(ground_truth
+            - FIX_INT_TO_DOUBLE(celt_exp2_db(x_32), 16));
+
+        relative_error_threshold = 1.24e-7*ground_truth;
+        if (absolute_error > absolute_error_threshold
+            && absolute_error > relative_error_threshold) {
+            fprintf(stderr,
                  "celt_exp2_db failed: "
                  "absolute_error: [%.5e > %.5e] "
                  "relative_error: [%.5e > %.5e] (x = %f)\n",
                  absolute_error, absolute_error_threshold,
                  absolute_error, relative_error_threshold, quantized_fx);
-         ret = 1;
-      }
-   }
+            ret = 1;
+        }
+    }
 }
 
-void testexp2log2(void)
-{
-   oac_val32 x;
-   for (x=8;x<65536;x+=(x>>3))
-   {
-      float error = fabs(x-0.25*celt_exp2(celt_log2(x)))/16384;
-      if (error>0.004)
-      {
-         fprintf (stderr, "celt_log2/celt_exp2 failed: fabs(x-(celt_exp2(celt_log2(x))))>0.001 (x = %ld, error = %f)\n", (long)x,error);
-         ret = 1;
-      }
-   }
+void testexp2log2(void) {
+    oac_val32 x;
+    for (x = 8; x < 65536; x += (x>>3)) {
+        float error = fabs(x - 0.25*celt_exp2(celt_log2(x)))/16384;
+        if (error > 0.004) {
+            fprintf (stderr,
+            "celt_log2/celt_exp2 failed: fabs(x-(celt_exp2(celt_log2(x))))>0.001 (x = %ld, error = %f)\n", (long)x,
+            error);
+            ret = 1;
+        }
+    }
 }
 
-void testilog2(void)
-{
-   oac_val32 x;
-   for (x=1;x<=268435455;x+=127)
-   {
-      oac_val32 lg;
-      oac_val32 y;
-
-      lg = celt_ilog2(x);
-      if (lg<0 || lg>=31)
-      {
-         printf("celt_ilog2 failed: 0<=celt_ilog2(x)<31 (x = %d, celt_ilog2(x) = %d)\n",x,lg);
-         ret = 1;
-      }
-      y = 1<<lg;
-
-      if (x<y || (x>>1)>=y)
-      {
-         printf("celt_ilog2 failed: 2**celt_ilog2(x)<=x<2**(celt_ilog2(x)+1) (x = %d, 2**celt_ilog2(x) = %d)\n",x,y);
-         ret = 1;
-      }
-   }
+void testilog2(void) {
+    oac_val32 x;
+    for (x = 1; x <= 268435455; x += 127) {
+        oac_val32 lg;
+        oac_val32 y;
+
+        lg = celt_ilog2(x);
+        if (lg < 0 || lg >= 31) {
+            printf("celt_ilog2 failed: 0<=celt_ilog2(x)<31 (x = %d, celt_ilog2(x) = %d)\n", x, lg);
+            ret = 1;
+        }
+        y = 1<<lg;
+
+        if (x < y || (x>>1) >= y) {
+            printf("celt_ilog2 failed: 2**celt_ilog2(x)<=x<2**(celt_ilog2(x)+1) (x = %d, 2**celt_ilog2(x) = %d)\n", x,
+            y);
+            ret = 1;
+        }
+    }
 }
 
-void testrsqrt(void)
-{
-   float error_threshold = 6.e-08;
-   float error = 0;
-   float max_error = 0;
-   float fx = 0;
-   float quantized_fx;
-   oac_int32 x;
-   for (fx = 0.25; fx < 1.0f; fx += 0.007f)
-   {
-      x = DOUBLE_TO_FIX_INT(fx, 31);
-      quantized_fx = FIX_INT_TO_DOUBLE(x, 31);
-      error = fabs(FIX_INT_TO_DOUBLE(celt_rsqrt_norm32(x), 29) -
-                   1/sqrt((double)quantized_fx));
-      if (max_error < error)
-      {
-         max_error = error;
-      }
-      if (error > error_threshold)
-      {
-         fprintf (stderr,
+void testrsqrt(void) {
+    float error_threshold = 6.e-08;
+    float error = 0;
+    float max_error = 0;
+    float fx = 0;
+    float quantized_fx;
+    oac_int32 x;
+    for (fx = 0.25; fx < 1.0f; fx += 0.007f) {
+        x = DOUBLE_TO_FIX_INT(fx, 31);
+        quantized_fx = FIX_INT_TO_DOUBLE(x, 31);
+        error = fabs(FIX_INT_TO_DOUBLE(celt_rsqrt_norm32(x), 29)
+            - 1/sqrt((double)quantized_fx));
+        if (max_error < error) {
+            max_error = error;
+        }
+        if (error > error_threshold) {
+            fprintf (stderr,
                   "celt_rsqrt_norm32 failed: "
                   "fabs((1/sqrt(x))-celt_rsqrt_norm32(x))>%15.25e "
                   "(x = %f, error = %15.25e)\n",
                   error_threshold, quantized_fx, error);
-         ret = 1;
-      }
-   }
-   fprintf (stdout, "celt_rsqrt_norm32 max_error: %.7e\n", max_error);
+            ret = 1;
+        }
+    }
+    fprintf (stdout, "celt_rsqrt_norm32 max_error: %.7e\n", max_error);
 }
 
-void testsqrt32(void)
-{
-   oac_int32 i;
-   float absolute_error;
-   float two_LSBs = FIX_INT_TO_DOUBLE(2, 16);
-   float relative_error_threshold;
-   for (i = 0; i <= 1073741824+64; i++)
-   {
-      absolute_error = fabs(sqrt(i) - FIX_INT_TO_DOUBLE(celt_sqrt32(i), 16));
-      relative_error_threshold = 8e-8 * sqrt(i);
-      if (absolute_error > two_LSBs &&
-          absolute_error > relative_error_threshold)
-      {
-         fprintf(stderr,
+void testsqrt32(void) {
+    oac_int32 i;
+    float absolute_error;
+    float two_LSBs = FIX_INT_TO_DOUBLE(2, 16);
+    float relative_error_threshold;
+    for (i = 0; i <= 1073741824 + 64; i++) {
+        absolute_error = fabs(sqrt(i) - FIX_INT_TO_DOUBLE(celt_sqrt32(i), 16));
+        relative_error_threshold = 8e-8*sqrt(i);
+        if (absolute_error > two_LSBs
+            && absolute_error > relative_error_threshold) {
+            fprintf(stderr,
                  "celt_sqrt32 failed: "
                  "absolute_error: [%.5e > %.5e] "
                  "relative_error: [%.5e > %.5e] (x = %d)\n",
                  absolute_error, two_LSBs,
                  absolute_error, relative_error_threshold, i);
-         ret = 1;
-      }
-      i+= i>>25;
-   }
+            ret = 1;
+        }
+        i += i>>25;
+    }
 }
 
-void testatan_norm(void)
-{
-   float error = -1;
-   float max_error = -2;
-   float error_threshold = 5.97e-08;
-   float fx = 0;
-   oac_int32 x = 0;
-   int q_input = 30;
-   int q_output = 30;
-   #define ATAN2_2_OVER_PI 0.636619772367581f
-   for (fx = -1.0f; fx <= 1.0f; fx += 0.007f)
-   {
-      x = DOUBLE_TO_FIX_INT(fx, q_input);
-      error = fabs(atan(FIX_INT_TO_DOUBLE(x, q_input)) * ATAN2_2_OVER_PI -
-                   FIX_INT_TO_DOUBLE(celt_atan_norm(x), q_output));
-      if (error > max_error)
-      {
-         max_error = error;
-      }
-      if (error > error_threshold)
-      {
-         fprintf(stderr,
+void testatan_norm(void) {
+    float error = -1;
+    float max_error = -2;
+    float error_threshold = 5.97e-08;
+    float fx = 0;
+    oac_int32 x = 0;
+    int q_input = 30;
+    int q_output = 30;
+# define ATAN2_2_OVER_PI 0.636619772367581f
+    for (fx = -1.0f; fx <= 1.0f; fx += 0.007f) {
+        x = DOUBLE_TO_FIX_INT(fx, q_input);
+        error = fabs(atan(FIX_INT_TO_DOUBLE(x, q_input))*ATAN2_2_OVER_PI
+            - FIX_INT_TO_DOUBLE(celt_atan_norm(x), q_output));
+        if (error > max_error) {
+            max_error = error;
+        }
+        if (error > error_threshold) {
+            fprintf(stderr,
                  "celt_atan_norm failed: error: [%.5e > %.5e] (x = %f)\n",
                  error, error_threshold, FIX_INT_TO_DOUBLE(x, DB_SHIFT));
-         ret = 1;
-      }
-   }
-   fprintf(stdout, "celt_atan_norm max_error: %.7e\n", max_error);
+            ret = 1;
+        }
+    }
+    fprintf(stdout, "celt_atan_norm max_error: %.7e\n", max_error);
 }
 
-void testatan2p_norm(void)
-{
-   float error = -1;
-   float max_error = -2;
-   float error_threshold = 1.2e-07;
-   float fx = 0;
-   float fy = 0;
-   oac_int32 x = 0;
-   oac_int32 y = 0;
-   int q_input = 30;
-   int q_output = 30;
-   #define ATAN2_2_OVER_PI 0.636619772367581f
-   for (fx = 0.0f; fx <= 1.0f; fx += 0.007f)
-   {
-      x = DOUBLE_TO_FIX_INT(fx, q_input);
-      for (fy = 0.0f; fy <= 1.0f; fy += 0.007f)
-      {
-         y = DOUBLE_TO_FIX_INT(fy, q_input);
-         if (x == 0 && x == 0)
-            continue;
-
-         error = fabs(atan2(FIX_INT_TO_DOUBLE(y, q_input),
-                            FIX_INT_TO_DOUBLE(x, q_input)) * ATAN2_2_OVER_PI -
-                      FIX_INT_TO_DOUBLE(celt_atan2p_norm(y, x), q_output));
-         if (error > max_error)
-         {
-            max_error = error;
-         }
-         if (error > error_threshold)
-         {
-            fprintf(stderr,
+void testatan2p_norm(void) {
+    float error = -1;
+    float max_error = -2;
+    float error_threshold = 1.2e-07;
+    float fx = 0;
+    float fy = 0;
+    oac_int32 x = 0;
+    oac_int32 y = 0;
+    int q_input = 30;
+    int q_output = 30;
+# define ATAN2_2_OVER_PI 0.636619772367581f
+    for (fx = 0.0f; fx <= 1.0f; fx += 0.007f) {
+        x = DOUBLE_TO_FIX_INT(fx, q_input);
+        for (fy = 0.0f; fy <= 1.0f; fy += 0.007f) {
+            y = DOUBLE_TO_FIX_INT(fy, q_input);
+            if (x == 0 && x == 0)
+                continue;
+
+            error = fabs(atan2(FIX_INT_TO_DOUBLE(y, q_input),
+                            FIX_INT_TO_DOUBLE(x, q_input))*ATAN2_2_OVER_PI
+                - FIX_INT_TO_DOUBLE(celt_atan2p_norm(y, x), q_output));
+            if (error > max_error) {
+                max_error = error;
+            }
+            if (error > error_threshold) {
+                fprintf(stderr,
                   "celt_atan2p_norm failed: error: [%.5e > %.5e] (x = %f)\n",
                   error, error_threshold, FIX_INT_TO_DOUBLE(x, DB_SHIFT));
-            ret = 1;
-         }
-      }
-   }
-   fprintf(stdout, "celt_atan2p_norm max_error: %.7e\n", max_error);
+                ret = 1;
+            }
+        }
+    }
+    fprintf(stdout, "celt_atan2p_norm max_error: %.7e\n", max_error);
 }
 
-void testatan(void)
-{
-   testatan_norm();
-   testatan2p_norm();
+void testatan(void) {
+    testatan_norm();
+    testatan2p_norm();
 }
 
-void test_cos_norm32(void)
-{
-   float error = -1;
-   float max_error = -2;
-   float error_threshold = 1e-07;
-   float fx = 0;
-   oac_int32 x = 0;
-   int q_input = 30;
-   int q_output = 31;
-   for (fx = -1.0f; fx <= 1.0f; fx += 0.007f)
-   {
-      x = DOUBLE_TO_FIX_INT(fx, q_input);
-      error = fabs(cos(1.5707963267948966 * FIX_INT_TO_DOUBLE(x, q_input)) -
-                   FIX_INT_TO_DOUBLE(celt_cos_norm32(x), q_output));
-      if (error > max_error)
-      {
-         max_error = error;
-      }
-      if (error > error_threshold)
-      {
-         fprintf(stderr,
+void test_cos_norm32(void) {
+    float error = -1;
+    float max_error = -2;
+    float error_threshold = 1e-07;
+    float fx = 0;
+    oac_int32 x = 0;
+    int q_input = 30;
+    int q_output = 31;
+    for (fx = -1.0f; fx <= 1.0f; fx += 0.007f) {
+        x = DOUBLE_TO_FIX_INT(fx, q_input);
+        error = fabs(cos(1.5707963267948966*FIX_INT_TO_DOUBLE(x, q_input))
+            - FIX_INT_TO_DOUBLE(celt_cos_norm32(x), q_output));
+        if (error > max_error) {
+            max_error = error;
+        }
+        if (error > error_threshold) {
+            fprintf(stderr,
                  "celt_cos_norm32 failed: error: [%.5e > %.5e] (x = %f)\n",
                  error, error_threshold, FIX_INT_TO_DOUBLE(x, DB_SHIFT));
-         ret = 1;
-      }
-   }
-   fprintf(stdout, "celt_cos_norm32 max_error: %.7e\n", max_error);
+            ret = 1;
+        }
+    }
+    fprintf(stdout, "celt_cos_norm32 max_error: %.7e\n", max_error);
 }
 
-void test_cos(void)
-{
-   test_cos_norm32();
+void test_cos(void) {
+    test_cos_norm32();
 }
 
-void test_rcp_norm32(void)
-{
-   double ground_truth;
-   float absolute_error = -1;
-   float relative_error = -1;
-   float two_LSBs = FIX_INT_TO_DOUBLE(2, 29); /* absolute error threshold */
-   float relative_error_threshold = 6.51e-08;
-   float max_relative_error = -1;
-   float fx;
-   float quantized_fx;
-   oac_val32 x;
-   int q_input = 31;
-
-   for (fx = 0.5; fx <= 1.0; fx += 0.0000007)
-   {
-      x = DOUBLE_TO_FIX_INT(fx, q_input);
-      quantized_fx = FIX_INT_TO_DOUBLE(x, q_input);
-      ground_truth = 1 / quantized_fx;
-      absolute_error = fabs(ground_truth -
-                            FIX_INT_TO_DOUBLE(celt_rcp_norm32(x), 30));
-      relative_error = absolute_error/ground_truth;
-      if (max_relative_error < relative_error) {
-         max_relative_error = relative_error;
-      }
-      if (absolute_error > two_LSBs &&
-          absolute_error > relative_error_threshold * ground_truth) {
-         fprintf(stderr,
+void test_rcp_norm32(void) {
+    double ground_truth;
+    float absolute_error = -1;
+    float relative_error = -1;
+    float two_LSBs = FIX_INT_TO_DOUBLE(2, 29); /* absolute error threshold */
+    float relative_error_threshold = 6.51e-08;
+    float max_relative_error = -1;
+    float fx;
+    float quantized_fx;
+    oac_val32 x;
+    int q_input = 31;
+
+    for (fx = 0.5; fx <= 1.0; fx += 0.0000007) {
+        x = DOUBLE_TO_FIX_INT(fx, q_input);
+        quantized_fx = FIX_INT_TO_DOUBLE(x, q_input);
+        ground_truth = 1/quantized_fx;
+        absolute_error = fabs(ground_truth
+            - FIX_INT_TO_DOUBLE(celt_rcp_norm32(x), 30));
+        relative_error = absolute_error/ground_truth;
+        if (max_relative_error < relative_error) {
+            max_relative_error = relative_error;
+        }
+        if (absolute_error > two_LSBs
+            && absolute_error > relative_error_threshold*ground_truth) {
+            fprintf(stderr,
                  "celt_rcp_norm32 failed: "
                  "absolute_error: [%.5e > %.5e] "
                  "relative_error: [%.5e > %.5e] (x = %f)\n",
                  absolute_error, two_LSBs,
                  relative_error, relative_error_threshold, quantized_fx);
-         ret = 1;
-      }
-   }
-   fprintf(stdout, "celt_rcp_norm32 max_rel_error: %.7e\n", max_relative_error);
+            ret = 1;
+        }
+    }
+    fprintf(stdout, "celt_rcp_norm32 max_rel_error: %.7e\n", max_relative_error);
 }
 #endif
 
 
 #ifndef DISABLE_FLOAT_API
 
-void testcelt_float2int16(int use_ref_impl, int buffer_size)
-{
-
-#define MAX_BUFFER_SIZE 2080
-   int i, cnt;
-   float floatsToConvert[MAX_BUFFER_SIZE];
-   short results[MAX_BUFFER_SIZE] = { 0 };
-   float scaleInt16RangeTo01;
-
-   celt_assert(buffer_size <= MAX_BUFFER_SIZE);
-
-   scaleInt16RangeTo01 = 1.f / 32768.f;
-   cnt = 0;
-
-   while (cnt + 15 < buffer_size && cnt < buffer_size / 2)
-   {
-      floatsToConvert[cnt++] = 77777.0f * scaleInt16RangeTo01;
-      floatsToConvert[cnt++] = 33000.0f * scaleInt16RangeTo01;
-      floatsToConvert[cnt++] = 32768.0f * scaleInt16RangeTo01;
-      floatsToConvert[cnt++] = 32767.4f * scaleInt16RangeTo01;
-      floatsToConvert[cnt++] = 32766.6f * scaleInt16RangeTo01;
-      floatsToConvert[cnt++] = .501 * scaleInt16RangeTo01;
-      floatsToConvert[cnt++] = .499f * scaleInt16RangeTo01;
-      floatsToConvert[cnt++] = .0f;
-      floatsToConvert[cnt++] = -.499f * scaleInt16RangeTo01;
-      floatsToConvert[cnt++] = -.501f * scaleInt16RangeTo01;
-      floatsToConvert[cnt++] = -32767.6f * scaleInt16RangeTo01;
-      floatsToConvert[cnt++] = -32768.4f * scaleInt16RangeTo01;
-      floatsToConvert[cnt++] = -32769.0f * scaleInt16RangeTo01;
-      floatsToConvert[cnt++] = -33000.0f * scaleInt16RangeTo01;
-      floatsToConvert[cnt++] = -77777.0f * scaleInt16RangeTo01;
-
-      celt_assert(cnt < buffer_size);
-   }
-
-   while (cnt < buffer_size)
-   {
-      float inInt16Range = cnt * 7 + .5;
-      inInt16Range += (cnt & 0x01) ? .1 : -.1;
-      inInt16Range *= (cnt & 0x02) ? 1 : -1;
-      floatsToConvert[cnt++] = inInt16Range * scaleInt16RangeTo01;
-   }
-
-   for (i = 0; i < MAX_BUFFER_SIZE; ++i)
-   {
-      results[i] = 42;
-   }
-
-   if (use_ref_impl)
-   {
-      celt_float2int16_c(floatsToConvert, results, cnt);
-   } else {
-      celt_float2int16(floatsToConvert, results, cnt, oac_select_arch());
-   }
-
-   for (i = 0; i < cnt; ++i)
-   {
-      const float expected = FLOAT2INT16(floatsToConvert[i]);
-      if (results[i] != expected)
-      {
-         fprintf (stderr, "testcelt_float2int16 failed: celt_float2int16 converted %f (index: %d) to %d (x*32768=%f, expected: %d, cnt: %d, ref: %d)\n",
-               floatsToConvert[i], i, (int)results[i], floatsToConvert[i] * 32768.0f, (int)expected, buffer_size, use_ref_impl);
-         ret = 1;
-      }
-   }
-
-   for (i = cnt; i < MAX_BUFFER_SIZE; ++i)
-   {
-      if (results[i] != 42)
-      {
-         fprintf (stderr, "testcelt_float2int16 failed: buffer overflow (cnt: %d, ref: %d)\n", buffer_size, use_ref_impl);
-         ret = 1;
-         break;
-      }
-   }
-#undef MAX_BUFFER_SIZE
+void testcelt_float2int16(int use_ref_impl, int buffer_size) {
+
+# define MAX_BUFFER_SIZE 2080
+    int i, cnt;
+    float floatsToConvert[MAX_BUFFER_SIZE];
+    short results[MAX_BUFFER_SIZE] = { 0 };
+    float scaleInt16RangeTo01;
+
+    celt_assert(buffer_size <= MAX_BUFFER_SIZE);
+
+    scaleInt16RangeTo01 = 1.f/32768.f;
+    cnt = 0;
+
+    while (cnt + 15 < buffer_size && cnt < buffer_size/2) {
+        floatsToConvert[cnt++] = 77777.0f*scaleInt16RangeTo01;
+        floatsToConvert[cnt++] = 33000.0f*scaleInt16RangeTo01;
+        floatsToConvert[cnt++] = 32768.0f*scaleInt16RangeTo01;
+        floatsToConvert[cnt++] = 32767.4f*scaleInt16RangeTo01;
+        floatsToConvert[cnt++] = 32766.6f*scaleInt16RangeTo01;
+        floatsToConvert[cnt++] = .501*scaleInt16RangeTo01;
+        floatsToConvert[cnt++] = .499f*scaleInt16RangeTo01;
+        floatsToConvert[cnt++] = .0f;
+        floatsToConvert[cnt++] = -.499f*scaleInt16RangeTo01;
+        floatsToConvert[cnt++] = -.501f*scaleInt16RangeTo01;
+        floatsToConvert[cnt++] = -32767.6f*scaleInt16RangeTo01;
+        floatsToConvert[cnt++] = -32768.4f*scaleInt16RangeTo01;
+        floatsToConvert[cnt++] = -32769.0f*scaleInt16RangeTo01;
+        floatsToConvert[cnt++] = -33000.0f*scaleInt16RangeTo01;
+        floatsToConvert[cnt++] = -77777.0f*scaleInt16RangeTo01;
+
+        celt_assert(cnt < buffer_size);
+    }
+
+    while (cnt < buffer_size) {
+        float inInt16Range = cnt*7 + .5;
+        inInt16Range += (cnt&0x01) ? .1 : -.1;
+        inInt16Range *= (cnt&0x02) ? 1 : -1;
+        floatsToConvert[cnt++] = inInt16Range*scaleInt16RangeTo01;
+    }
+
+    for (i = 0; i < MAX_BUFFER_SIZE; ++i) {
+        results[i] = 42;
+    }
+
+    if (use_ref_impl) {
+        celt_float2int16_c(floatsToConvert, results, cnt);
+    } else {
+        celt_float2int16(floatsToConvert, results, cnt, oac_select_arch());
+    }
+
+    for (i = 0; i < cnt; ++i) {
+        const float expected = FLOAT2INT16(floatsToConvert[i]);
+        if (results[i] != expected) {
+            fprintf (stderr,
+            "testcelt_float2int16 failed: celt_float2int16 converted %f (index: %d) to %d (x*32768=%f, expected: %d, cnt: %d, ref: %d)\n",
+               floatsToConvert[i], i, (int)results[i], floatsToConvert[i]*32768.0f, (int)expected, buffer_size,
+            use_ref_impl);
+            ret = 1;
+        }
+    }
+
+    for (i = cnt; i < MAX_BUFFER_SIZE; ++i) {
+        if (results[i] != 42) {
+            fprintf (stderr, "testcelt_float2int16 failed: buffer overflow (cnt: %d, ref: %d)\n", buffer_size,
+            use_ref_impl);
+            ret = 1;
+            break;
+        }
+    }
+# undef MAX_BUFFER_SIZE
 }
 
-void testoac_limit2_checkwithin1(int use_ref_impl)
-{
-#define BUFFER_SIZE 37 /* strange float count to trigger residue loop of SIMD implementation */
-#define BYTE_COUNT (BUFFER_SIZE * sizeof(float))
-   int i, within1;
-   const int arch = oac_select_arch();
-
-   float pattern[BUFFER_SIZE], buffer[BUFFER_SIZE];
-
-   for (i = 0; i < BUFFER_SIZE; ++i)
-   {
-      pattern[i] = i % 2 ? -1.f : 1.f;
-   }
-
-   /* All values within -1..1:
-   Nothing changed. Return value is implementation-dependent (not expected to recognise nothing exceeds -1..1) */
-   memcpy(buffer, pattern, BYTE_COUNT);
-   within1 = use_ref_impl ? oac_limit2_checkwithin1_c(buffer, BUFFER_SIZE) : oac_limit2_checkwithin1(buffer, BUFFER_SIZE, arch);
-   if (memcmp(buffer, pattern, BYTE_COUNT) != 0)
-   {
-      fprintf (stderr, "oac_limit2_checkwithin1() modified values not exceeding -1..1 (ref=%d)\n", use_ref_impl);
-      ret = 1;
-   }
-
-   /* One value exceeds -1..1, within -2..2:
-   Values unchanged. Return value says not all values are within -1..1 */
-   for (i = 0; i < BUFFER_SIZE; ++i)
-   {
-      const float replace_value = pattern[i] * 1.001f;
-
-      memcpy(buffer, pattern, BYTE_COUNT);
-      buffer[i] = replace_value;
-      within1 = use_ref_impl ? oac_limit2_checkwithin1_c(buffer, BUFFER_SIZE) : oac_limit2_checkwithin1(buffer, BUFFER_SIZE, arch);
-      if (within1 || buffer[i] != replace_value)
-      {
-         fprintf (stderr, "oac_limit2_checkwithin1() handled value exceeding -1..1 erroneously (ref=%d, i=%d)\n", use_ref_impl, i);
-         ret = 1;
-      }
-      buffer[i] = pattern[i];
-      if (memcmp(buffer, pattern, BYTE_COUNT) != 0)
-      {
-         fprintf (stderr, "oac_limit2_checkwithin1() modified value within -2..2  (ref=%d, i=%d)\n", use_ref_impl, i);
-         ret = 1;
-      }
-   }
-
-   /* One value exceeds -2..2:
-   One value is hardclipped, others are unchanged. Return value says not all values are within -1..1 */
-   for (i = 0; i < BUFFER_SIZE; ++i)
-   {
-      const float replace_value = pattern[i] * 2.1;
-
-      memcpy(buffer, pattern, BYTE_COUNT);
-      buffer[i] = replace_value;
-      within1 = use_ref_impl ? oac_limit2_checkwithin1_c(buffer, BUFFER_SIZE) : oac_limit2_checkwithin1(buffer, BUFFER_SIZE, arch);
-      if (within1 || buffer[i] != (replace_value > 0.f ? 2.f : -2.f))
-      {
-         fprintf (stderr, "oac_limit2_checkwithin1() handled value exceeding -2..2 erroneously (ref=%d, i=%d)\n", use_ref_impl, i);
-         ret = 1;
-      }
-      buffer[i] = pattern[i];
-      if (memcmp(buffer, pattern, BYTE_COUNT) != 0)
-      {
-         fprintf (stderr, "oac_limit2_checkwithin1() modified value within -2..2  (ref=%d, i=%d)\n", use_ref_impl, i);
-         ret = 1;
-      }
-   }
-#undef BUFFER_SIZE
-#undef BYTE_COUNT
+void testoac_limit2_checkwithin1(int use_ref_impl) {
+# define BUFFER_SIZE 37 /* strange float count to trigger residue loop of SIMD implementation */
+# define BYTE_COUNT (BUFFER_SIZE*sizeof(float))
+    int i, within1;
+    const int arch = oac_select_arch();
+
+    float pattern[BUFFER_SIZE], buffer[BUFFER_SIZE];
+
+    for (i = 0; i < BUFFER_SIZE; ++i) {
+        pattern[i] = i%2 ? -1.f : 1.f;
+    }
+
+    /* All values within -1..1:
+       Nothing changed. Return value is implementation-dependent (not expected to recognise nothing exceeds -1..1) */
+    memcpy(buffer, pattern, BYTE_COUNT);
+    within1 = use_ref_impl ? oac_limit2_checkwithin1_c(buffer, BUFFER_SIZE) : oac_limit2_checkwithin1(buffer,
+    BUFFER_SIZE, arch);
+    if (memcmp(buffer, pattern, BYTE_COUNT) != 0) {
+        fprintf (stderr, "oac_limit2_checkwithin1() modified values not exceeding -1..1 (ref=%d)\n", use_ref_impl);
+        ret = 1;
+    }
+
+    /* One value exceeds -1..1, within -2..2:
+       Values unchanged. Return value says not all values are within -1..1 */
+    for (i = 0; i < BUFFER_SIZE; ++i) {
+        const float replace_value = pattern[i]*1.001f;
+
+        memcpy(buffer, pattern, BYTE_COUNT);
+        buffer[i] = replace_value;
+        within1 = use_ref_impl ? oac_limit2_checkwithin1_c(buffer, BUFFER_SIZE) : oac_limit2_checkwithin1(buffer,
+        BUFFER_SIZE, arch);
+        if (within1 || buffer[i] != replace_value) {
+            fprintf (stderr, "oac_limit2_checkwithin1() handled value exceeding -1..1 erroneously (ref=%d, i=%d)\n",
+            use_ref_impl, i);
+            ret = 1;
+        }
+        buffer[i] = pattern[i];
+        if (memcmp(buffer, pattern, BYTE_COUNT) != 0) {
+            fprintf (stderr, "oac_limit2_checkwithin1() modified value within -2..2  (ref=%d, i=%d)\n", use_ref_impl,
+            i);
+            ret = 1;
+        }
+    }
+
+    /* One value exceeds -2..2:
+       One value is hardclipped, others are unchanged. Return value says not all values are within -1..1 */
+    for (i = 0; i < BUFFER_SIZE; ++i) {
+        const float replace_value = pattern[i]*2.1;
+
+        memcpy(buffer, pattern, BYTE_COUNT);
+        buffer[i] = replace_value;
+        within1 = use_ref_impl ? oac_limit2_checkwithin1_c(buffer, BUFFER_SIZE) : oac_limit2_checkwithin1(buffer,
+        BUFFER_SIZE, arch);
+        if (within1 || buffer[i] != (replace_value > 0.f ? 2.f : -2.f)) {
+            fprintf (stderr, "oac_limit2_checkwithin1() handled value exceeding -2..2 erroneously (ref=%d, i=%d)\n",
+            use_ref_impl, i);
+            ret = 1;
+        }
+        buffer[i] = pattern[i];
+        if (memcmp(buffer, pattern, BYTE_COUNT) != 0) {
+            fprintf (stderr, "oac_limit2_checkwithin1() modified value within -2..2  (ref=%d, i=%d)\n", use_ref_impl,
+            i);
+            ret = 1;
+        }
+    }
+# undef BUFFER_SIZE
+# undef BYTE_COUNT
 }
 
 #endif
 
-int main(void)
-{
-   int i;
-   int use_ref_impl[2] = { 0, 1 };
-
-   testbitexactcos();
-   testbitexactlog2tan();
-   testdiv();
-   testsqrt();
-   testlog2();
-   testexp2();
-   testexp2log2();
-   test_cos();
+int main(void) {
+    int i;
+    int use_ref_impl[2] = { 0, 1 };
+
+    testbitexactcos();
+    testbitexactlog2tan();
+    testdiv();
+    testsqrt();
+    testlog2();
+    testexp2();
+    testexp2log2();
+    test_cos();
 #ifdef FIXED_POINT
-   testilog2();
-   testlog2_db();
-   testexp2_db();
-   testrsqrt();
-   testsqrt32();
-   testatan();
-   test_rcp_norm32();
+    testilog2();
+    testlog2_db();
+    testexp2_db();
+    testrsqrt();
+    testsqrt32();
+    testatan();
+    test_rcp_norm32();
 #else
-   test_atan2();
+    test_atan2();
 #endif
 #ifndef DISABLE_FLOAT_API
-   for (i = 0; i <= 1; ++i)
-   {
-      testcelt_float2int16(use_ref_impl[i], 1);
-      testcelt_float2int16(use_ref_impl[i], 32);
-      testcelt_float2int16(use_ref_impl[i], 127);
-      testcelt_float2int16(use_ref_impl[i], 1031);
-      testoac_limit2_checkwithin1(use_ref_impl[i]);
-   }
+    for (i = 0; i <= 1; ++i) {
+        testcelt_float2int16(use_ref_impl[i], 1);
+        testcelt_float2int16(use_ref_impl[i], 32);
+        testcelt_float2int16(use_ref_impl[i], 127);
+        testcelt_float2int16(use_ref_impl[i], 1031);
+        testoac_limit2_checkwithin1(use_ref_impl[i]);
+    }
 #else
-   (void)i;
-   (void)use_ref_impl;
+    (void)i;
+    (void)use_ref_impl;
 #endif
-   return ret;
+    return ret;
 }
diff --git a/celt/tests/test_unit_mdct.c b/celt/tests/test_unit_mdct.c
index 0928510f4..77b4aae3d 100644
--- a/celt/tests/test_unit_mdct.c
+++ b/celt/tests/test_unit_mdct.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdio.h>
@@ -38,26 +38,25 @@
 #include "modes.h"
 
 #ifndef M_PI
-#define M_PI 3.141592653
+# define M_PI 3.141592653
 #endif
 
 int ret = 0;
-void check(kiss_fft_scalar  * in,kiss_fft_scalar  * out,int nfft,int isinverse)
-{
-    int bin,k;
-    double errpow=0,sigpow=0;
+void check(kiss_fft_scalar  * in, kiss_fft_scalar  * out, int nfft, int isinverse) {
+    int bin, k;
+    double errpow = 0, sigpow = 0;
     double snr;
-    for (bin=0;bin<nfft/2;++bin) {
+    for (bin = 0; bin < nfft/2; ++bin) {
         double ansr = 0;
         double difr;
 
-        for (k=0;k<nfft;++k) {
-           double phase = 2*M_PI*(k+.5+.25*nfft)*(bin+.5)/nfft;
-           double re = cos(phase);
+        for (k = 0; k < nfft; ++k) {
+            double phase = 2*M_PI*(k + .5 + .25*nfft)*(bin + .5)/nfft;
+            double re = cos(phase);
 
-           re /= nfft/4;
+            re /= nfft/4;
 
-           ansr += in[k] * re;
+            ansr += in[k]*re;
         }
         /*printf ("%f %f\n", ansr, out[bin]);*/
         difr = ansr - out[bin];
@@ -65,46 +64,44 @@ void check(kiss_fft_scalar  * in,kiss_fft_scalar  * out,int nfft,int isinverse)
         sigpow += ansr*ansr;
     }
     snr = 10*log10(sigpow/errpow);
-    printf("nfft=%d inverse=%d,snr = %f\n",nfft,isinverse,snr );
-    if (snr<60) {
-       printf( "** poor snr: %f **\n", snr);
-       ret = 1;
+    printf("nfft=%d inverse=%d,snr = %f\n", nfft, isinverse, snr );
+    if (snr < 60) {
+        printf( "** poor snr: %f **\n", snr);
+        ret = 1;
     }
 }
 
-void check_inv(kiss_fft_scalar  * in,kiss_fft_scalar  * out,int nfft,int isinverse)
-{
-   int bin,k;
-   double errpow=0,sigpow=0;
-   double snr;
-   for (bin=0;bin<nfft;++bin) {
-      double ansr = 0;
-      double difr;
-
-      for (k=0;k<nfft/2;++k) {
-         double phase = 2*M_PI*(bin+.5+.25*nfft)*(k+.5)/nfft;
-         double re = cos(phase);
-
-         /*re *= 2;*/
-
-         ansr += in[k] * re;
-      }
-      /*printf ("%f %f\n", ansr, out[bin]);*/
-      difr = ansr - out[bin];
-      errpow += difr*difr;
-      sigpow += ansr*ansr;
-   }
-   snr = 10*log10(sigpow/errpow);
-   printf("nfft=%d inverse=%d,snr = %f\n",nfft,isinverse,snr );
-   if (snr<60) {
-      printf( "** poor snr: %f **\n", snr);
-      ret = 1;
-   }
+void check_inv(kiss_fft_scalar  * in, kiss_fft_scalar  * out, int nfft, int isinverse) {
+    int bin, k;
+    double errpow = 0, sigpow = 0;
+    double snr;
+    for (bin = 0; bin < nfft; ++bin) {
+        double ansr = 0;
+        double difr;
+
+        for (k = 0; k < nfft/2; ++k) {
+            double phase = 2*M_PI*(bin + .5 + .25*nfft)*(k + .5)/nfft;
+            double re = cos(phase);
+
+            /*re *= 2;*/
+
+            ansr += in[k]*re;
+        }
+        /*printf ("%f %f\n", ansr, out[bin]);*/
+        difr = ansr - out[bin];
+        errpow += difr*difr;
+        sigpow += ansr*ansr;
+    }
+    snr = 10*log10(sigpow/errpow);
+    printf("nfft=%d inverse=%d,snr = %f\n", nfft, isinverse, snr );
+    if (snr < 60) {
+        printf( "** poor snr: %f **\n", snr);
+        ret = 1;
+    }
 }
 
 
-void test1d(int nfft,int isinverse,int arch)
-{
+void test1d(int nfft, int isinverse, int arch) {
     size_t buflen = sizeof(kiss_fft_scalar)*nfft;
     kiss_fft_scalar *in;
     kiss_fft_scalar *in_copy;
@@ -135,40 +132,38 @@ void test1d(int nfft,int isinverse,int arch)
     out = (kiss_fft_scalar*)malloc(buflen);
     window = (celt_coef*)malloc(sizeof(*window)*nfft/2);
 
-    for (k=0;k<nfft;++k) {
-        in[k] = (rand() % 32768) - 16384;
+    for (k = 0; k < nfft; ++k) {
+        in[k] = (rand()%32768) - 16384;
     }
 
-    for (k=0;k<nfft/2;++k) {
-       window[k] = Q31ONE;
+    for (k = 0; k < nfft/2; ++k) {
+        window[k] = Q31ONE;
     }
-    for (k=0;k<nfft;++k) {
-       in[k] *= 32768;
+    for (k = 0; k < nfft; ++k) {
+        in[k] *= 32768;
     }
 
-    if (isinverse)
-    {
-       for (k=0;k<nfft;++k) {
-          in[k] /= nfft;
-       }
+    if (isinverse) {
+        for (k = 0; k < nfft; ++k) {
+            in[k] /= nfft;
+        }
     }
 
-    for (k=0;k<nfft;++k)
-       in_copy[k] = in[k];
+    for (k = 0; k < nfft; ++k)
+        in_copy[k] = in[k];
     /*for (k=0;k<nfft;++k) printf("%d %d ", in[k].r, in[k].i);printf("\n");*/
 
-    if (isinverse)
-    {
-       for (k=0;k<nfft;++k)
-          out[k] = 0;
-       clt_mdct_backward(cfg,in,out, window, nfft/2, shift, 1, arch);
-       /* apply TDAC because clt_mdct_backward() no longer does that */
-       for (k=0;k<nfft/4;++k)
-          out[nfft-k-1] = out[nfft/2+k];
-       check_inv(in,out,nfft,isinverse);
+    if (isinverse) {
+        for (k = 0; k < nfft; ++k)
+            out[k] = 0;
+        clt_mdct_backward(cfg, in, out, window, nfft/2, shift, 1, arch);
+        /* apply TDAC because clt_mdct_backward() no longer does that */
+        for (k = 0; k < nfft/4; ++k)
+            out[nfft - k - 1] = out[nfft/2 + k];
+        check_inv(in, out, nfft, isinverse);
     } else {
-       clt_mdct_forward(cfg,in,out,window, nfft/2, shift, 1, arch);
-       check(in_copy,out,nfft,isinverse);
+        clt_mdct_forward(cfg, in, out, window, nfft/2, shift, 1, arch);
+        check(in_copy, out, nfft, isinverse);
     }
     /*for (k=0;k<nfft;++k) printf("%d %d ", out[k].r, out[k].i);printf("\n");*/
 
@@ -182,46 +177,45 @@ void test1d(int nfft,int isinverse,int arch)
 #endif
 }
 
-int main(int argc,char ** argv)
-{
+int main(int argc, char ** argv) {
     int arch;
     ALLOC_STACK;
     arch = oac_select_arch();
 
-    if (argc>1) {
+    if (argc > 1) {
         int k;
-        for (k=1;k<argc;++k) {
-            test1d(atoi(argv[k]),0,arch);
-            test1d(atoi(argv[k]),1,arch);
+        for (k = 1; k < argc; ++k) {
+            test1d(atoi(argv[k]), 0, arch);
+            test1d(atoi(argv[k]), 1, arch);
         }
-    }else{
-        test1d(32,0,arch);
-        test1d(32,1,arch);
-        test1d(256,0,arch);
-        test1d(256,1,arch);
-        test1d(512,0,arch);
-        test1d(512,1,arch);
-        test1d(1024,0,arch);
-        test1d(1024,1,arch);
-        test1d(2048,0,arch);
-        test1d(2048,1,arch);
+    } else  {
+        test1d(32, 0, arch);
+        test1d(32, 1, arch);
+        test1d(256, 0, arch);
+        test1d(256, 1, arch);
+        test1d(512, 0, arch);
+        test1d(512, 1, arch);
+        test1d(1024, 0, arch);
+        test1d(1024, 1, arch);
+        test1d(2048, 0, arch);
+        test1d(2048, 1, arch);
 #ifndef RADIX_TWO_ONLY
-        test1d(36,0,arch);
-        test1d(36,1,arch);
-        test1d(40,0,arch);
-        test1d(40,1,arch);
-        test1d(60,0,arch);
-        test1d(60,1,arch);
-        test1d(120,0,arch);
-        test1d(120,1,arch);
-        test1d(240,0,arch);
-        test1d(240,1,arch);
-        test1d(480,0,arch);
-        test1d(480,1,arch);
-        test1d(960,0,arch);
-        test1d(960,1,arch);
-        test1d(1920,0,arch);
-        test1d(1920,1,arch);
+        test1d(36, 0, arch);
+        test1d(36, 1, arch);
+        test1d(40, 0, arch);
+        test1d(40, 1, arch);
+        test1d(60, 0, arch);
+        test1d(60, 1, arch);
+        test1d(120, 0, arch);
+        test1d(120, 1, arch);
+        test1d(240, 0, arch);
+        test1d(240, 1, arch);
+        test1d(480, 0, arch);
+        test1d(480, 1, arch);
+        test1d(960, 0, arch);
+        test1d(960, 1, arch);
+        test1d(1920, 0, arch);
+        test1d(1920, 1, arch);
 #endif
     }
     RESTORE_STACK;
diff --git a/celt/tests/test_unit_mini_kfft.c b/celt/tests/test_unit_mini_kfft.c
index aca99ea6a..094155e5b 100644
--- a/celt/tests/test_unit_mini_kfft.c
+++ b/celt/tests/test_unit_mini_kfft.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdio.h>
@@ -34,94 +34,90 @@
 #include "mini_kfft.c"
 
 #ifndef M_PI
-#define M_PI 3.141592653
+# define M_PI 3.141592653
 #endif
 
 int ret = 0;
 
-void check(mini_kiss_fft_cpx  * in,mini_kiss_fft_cpx  * out,int nfft,int isinverse)
-{
-    int bin,k;
-    double errpow=0,sigpow=0, snr;
+void check(mini_kiss_fft_cpx  * in, mini_kiss_fft_cpx  * out, int nfft, int isinverse) {
+    int bin, k;
+    double errpow = 0, sigpow = 0, snr;
 
-    for (bin=0;bin<nfft;++bin) {
+    for (bin = 0; bin < nfft; ++bin) {
         double ansr = 0;
         double ansi = 0;
         double difr;
         double difi;
 
-        for (k=0;k<nfft;++k) {
+        for (k = 0; k < nfft; ++k) {
             double phase = -2*M_PI*bin*k/nfft;
             double re = cos(phase);
             double im = sin(phase);
             if (isinverse)
                 im = -im;
 
-            if (0&&isinverse)
-            {
-               re /= nfft;
-               im /= nfft;
+            if (0 && isinverse) {
+                re /= nfft;
+                im /= nfft;
             }
 
-            ansr += in[k].r * re - in[k].i * im;
-            ansi += in[k].r * im + in[k].i * re;
+            ansr += in[k].r*re - in[k].i*im;
+            ansi += in[k].r*im + in[k].i*re;
         }
         /*printf ("%d %d ", (int)ansr, (int)ansi);*/
         difr = ansr - out[bin].r;
         difi = ansi - out[bin].i;
         errpow += difr*difr + difi*difi;
-        sigpow += ansr*ansr+ansi*ansi;
+        sigpow += ansr*ansr + ansi*ansi;
     }
     snr = 10*log10(sigpow/errpow);
-    printf("nfft=%d inverse=%d,snr = %f\n",nfft,isinverse,snr );
-    if (snr<60) {
-       printf( "** poor snr: %f ** \n", snr);
-       ret = 1;
+    printf("nfft=%d inverse=%d,snr = %f\n", nfft, isinverse, snr );
+    if (snr < 60) {
+        printf( "** poor snr: %f ** \n", snr);
+        ret = 1;
     }
 }
 
-void test1d(int nfft,int isinverse)
-{
+void test1d(int nfft, int isinverse) {
     size_t buflen = sizeof(mini_kiss_fft_cpx)*nfft;
     mini_kiss_fft_cpx *in;
     mini_kiss_fft_cpx *out;
     int k;
     mini_kiss_fft_state *fft;
     mini_kiss_fft_state *ifft;
-    fft = mini_kiss_fft_alloc(nfft,0,NULL,NULL);
-    ifft = mini_kiss_fft_alloc(nfft,1,NULL,NULL);
+    fft = mini_kiss_fft_alloc(nfft, 0, NULL, NULL);
+    ifft = mini_kiss_fft_alloc(nfft, 1, NULL, NULL);
 
     in = (mini_kiss_fft_cpx*)malloc(buflen);
     out = (mini_kiss_fft_cpx*)malloc(buflen);
 
-    for (k=0;k<nfft;++k) {
-        in[k].r = (rand() % 32767) - 16384;
-        in[k].i = (rand() % 32767) - 16384;
+    for (k = 0; k < nfft; ++k) {
+        in[k].r = (rand()%32767) - 16384;
+        in[k].i = (rand()%32767) - 16384;
     }
 
-    for (k=0;k<nfft;++k) {
-       in[k].r *= 32768;
-       in[k].i *= 32768;
+    for (k = 0; k < nfft; ++k) {
+        in[k].r *= 32768;
+        in[k].i *= 32768;
     }
 
-    if (isinverse)
-    {
-       for (k=0;k<nfft;++k) {
-          in[k].r /= nfft;
-          in[k].i /= nfft;
-       }
+    if (isinverse) {
+        for (k = 0; k < nfft; ++k) {
+            in[k].r /= nfft;
+            in[k].i /= nfft;
+        }
     }
 
     /*for (k=0;k<nfft;++k) printf("%d %d ", in[k].r, in[k].i);printf("\n");*/
 
     if (isinverse)
-       mini_kiss_fft(ifft,in,out);
+        mini_kiss_fft(ifft, in, out);
     else
-       mini_kiss_fft(fft,in,out);
+        mini_kiss_fft(fft, in, out);
 
     /*for (k=0;k<nfft;++k) printf("%d %d ", out[k].r, out[k].i);printf("\n");*/
 
-    check(in,out,nfft,isinverse);
+    check(in, out, nfft, isinverse);
 
     free(in);
     free(out);
@@ -129,33 +125,32 @@ void test1d(int nfft,int isinverse)
     free(ifft);
 }
 
-int main(int argc,char ** argv)
-{
-    if (argc>1) {
+int main(int argc, char ** argv) {
+    if (argc > 1) {
         int k;
-        for (k=1;k<argc;++k) {
-            test1d(atoi(argv[k]),0);
-            test1d(atoi(argv[k]),1);
+        for (k = 1; k < argc; ++k) {
+            test1d(atoi(argv[k]), 0);
+            test1d(atoi(argv[k]), 1);
         }
-    }else{
-        test1d(32,0);
-        test1d(32,1);
-        test1d(128,0);
-        test1d(128,1);
-        test1d(256,0);
-        test1d(256,1);
-        test1d(36,0);
-        test1d(36,1);
-        test1d(50,0);
-        test1d(50,1);
-        test1d(60,0);
-        test1d(60,1);
-        test1d(120,0);
-        test1d(120,1);
-        test1d(240,0);
-        test1d(240,1);
-        test1d(480,0);
-        test1d(480,1);
+    } else  {
+        test1d(32, 0);
+        test1d(32, 1);
+        test1d(128, 0);
+        test1d(128, 1);
+        test1d(256, 0);
+        test1d(256, 1);
+        test1d(36, 0);
+        test1d(36, 1);
+        test1d(50, 0);
+        test1d(50, 1);
+        test1d(60, 0);
+        test1d(60, 1);
+        test1d(120, 0);
+        test1d(120, 1);
+        test1d(240, 0);
+        test1d(240, 1);
+        test1d(480, 0);
+        test1d(480, 1);
     }
     return ret;
 }
diff --git a/celt/tests/test_unit_rotation.c b/celt/tests/test_unit_rotation.c
index ef124c70d..e4ab76a48 100644
--- a/celt/tests/test_unit_rotation.c
+++ b/celt/tests/test_unit_rotation.c
@@ -23,14 +23,14 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #ifndef CUSTOM_MODES
-#define CUSTOM_MODES
+# define CUSTOM_MODES
 #endif
 
 #include <stdio.h>
@@ -43,45 +43,40 @@
 
 #define MAX_SIZE 100
 
-int ret=0;
-void test_rotation(int N, int K)
-{
-   int i;
-   double err = 0, ener = 0, snr, snr0;
-   celt_norm x0[MAX_SIZE];
-   celt_norm x1[MAX_SIZE];
-   for (i=0;i<N;i++)
-      x1[i] = x0[i] = rand()%16777215-8388608;
-   exp_rotation(x1, N, 1, 1, K, SPREAD_NORMAL);
-   for (i=0;i<N;i++)
-   {
-      err += (x0[i]-(double)x1[i])*(x0[i]-(double)x1[i]);
-      ener += x0[i]*(double)x0[i];
-   }
-   snr0 = 20*log10(ener/err);
-   err = ener = 0;
-   exp_rotation(x1, N, -1, 1, K, SPREAD_NORMAL);
-   for (i=0;i<N;i++)
-   {
-      err += (x0[i]-(double)x1[i])*(x0[i]-(double)x1[i]);
-      ener += x0[i]*(double)x0[i];
-   }
-   snr = 20*log10(ener/err);
-   printf ("SNR for size %d (%d pulses) is %f (was %f without inverse)\n", N, K, snr, snr0);
-   if (snr < 60 || snr0 > 20)
-   {
-      fprintf(stderr, "FAIL!\n");
-      ret = 1;
-   }
+int ret = 0;
+void test_rotation(int N, int K) {
+    int i;
+    double err = 0, ener = 0, snr, snr0;
+    celt_norm x0[MAX_SIZE];
+    celt_norm x1[MAX_SIZE];
+    for (i = 0; i < N; i++)
+        x1[i] = x0[i] = rand()%16777215 - 8388608;
+    exp_rotation(x1, N, 1, 1, K, SPREAD_NORMAL);
+    for (i = 0; i < N; i++) {
+        err += (x0[i] - (double)x1[i])*(x0[i] - (double)x1[i]);
+        ener += x0[i]*(double)x0[i];
+    }
+    snr0 = 20*log10(ener/err);
+    err = ener = 0;
+    exp_rotation(x1, N, -1, 1, K, SPREAD_NORMAL);
+    for (i = 0; i < N; i++) {
+        err += (x0[i] - (double)x1[i])*(x0[i] - (double)x1[i]);
+        ener += x0[i]*(double)x0[i];
+    }
+    snr = 20*log10(ener/err);
+    printf ("SNR for size %d (%d pulses) is %f (was %f without inverse)\n", N, K, snr, snr0);
+    if (snr < 60 || snr0 > 20) {
+        fprintf(stderr, "FAIL!\n");
+        ret = 1;
+    }
 }
 
-int main(void)
-{
-   ALLOC_STACK;
-   test_rotation(15, 3);
-   test_rotation(23, 5);
-   test_rotation(50, 3);
-   test_rotation(80, 1);
-   RESTORE_STACK;
-   return ret;
+int main(void) {
+    ALLOC_STACK;
+    test_rotation(15, 3);
+    test_rotation(23, 5);
+    test_rotation(50, 3);
+    test_rotation(80, 1);
+    RESTORE_STACK;
+    return ret;
 }
diff --git a/celt/tests/test_unit_types.c b/celt/tests/test_unit_types.c
index 8660be47a..ba28fa25d 100644
--- a/celt/tests/test_unit_types.c
+++ b/celt/tests/test_unit_types.c
@@ -23,28 +23,25 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "oac_types.h"
 #include <stdio.h>
 
-int main(void)
-{
-   oac_int16 i = 1;
-   i <<= 14;
-   if (i>>14 != 1)
-   {
-      fprintf(stderr, "oac_int16 isn't 16 bits\n");
-      return 1;
-   }
-   if (sizeof(oac_int16)*2 != sizeof(oac_int32))
-   {
-      fprintf(stderr, "16*2 != 32\n");
-      return 1;
-   }
-   return 0;
+int main(void) {
+    oac_int16 i = 1;
+    i <<= 14;
+    if (i>>14 != 1) {
+        fprintf(stderr, "oac_int16 isn't 16 bits\n");
+        return 1;
+    }
+    if (sizeof(oac_int16)*2 != sizeof(oac_int32)) {
+        fprintf(stderr, "16*2 != 32\n");
+        return 1;
+    }
+    return 0;
 }
diff --git a/celt/vq.c b/celt/vq.c
index c3c18b409..60bcfb2ce 100644
--- a/celt/vq.c
+++ b/celt/vq.c
@@ -24,10 +24,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "mathops.h"
@@ -41,560 +41,539 @@
 
 #if defined(FIXED_POINT)
 void norm_scaleup(celt_norm *X, int N, int shift) {
-   int i;
-   celt_assert(shift >= 0);
-   if (shift <= 0) return;
-   for (i=0;i<N;i++) X[i] = SHL32(X[i], shift);
+    int i;
+    celt_assert(shift >= 0);
+    if (shift <= 0) return;
+    for (i = 0; i < N; i++) X[i] = SHL32(X[i], shift);
 }
 
 void norm_scaledown(celt_norm *X, int N, int shift) {
-   int i;
-   celt_assert(shift >= 0);
-   if (shift <= 0) return;
-   for (i=0;i<N;i++) X[i] = PSHR32(X[i], shift);
+    int i;
+    celt_assert(shift >= 0);
+    if (shift <= 0) return;
+    for (i = 0; i < N; i++) X[i] = PSHR32(X[i], shift);
 }
 
 oac_val32 celt_inner_prod_norm(const celt_norm *x, const celt_norm *y, int len, int arch) {
-   int i;
-   oac_val32 sum = 0;
-   (void)arch;
-   for (i=0;i<len;i++) sum += x[i]*y[i];
-   return sum;
+    int i;
+    oac_val32 sum = 0;
+    (void)arch;
+    for (i = 0; i < len; i++) sum += x[i]*y[i];
+    return sum;
 }
 oac_val32 celt_inner_prod_norm_shift(const celt_norm *x, const celt_norm *y, int len, int arch) {
-   int i;
-   oac_val64 sum = 0;
-   (void)arch;
-   for (i=0;i<len;i++) sum += x[i]*(oac_val64)y[i];
-   return sum>>2*(NORM_SHIFT-14);
+    int i;
+    oac_val64 sum = 0;
+    (void)arch;
+    for (i = 0; i < len; i++) sum += x[i]*(oac_val64)y[i];
+    return sum>>2*(NORM_SHIFT - 14);
 }
 #endif
 
 #ifndef OVERRIDE_vq_exp_rotation1
-static void exp_rotation1(celt_norm *X, int len, int stride, oac_val16 c, oac_val16 s)
-{
-   int i;
-   oac_val16 ms;
-   celt_norm *Xptr;
-   Xptr = X;
-   ms = NEG16(s);
-   norm_scaledown(X, len, NORM_SHIFT-14);
-   for (i=0;i<len-stride;i++)
-   {
-      celt_norm x1, x2;
-      x1 = Xptr[0];
-      x2 = Xptr[stride];
-      Xptr[stride] = EXTRACT16(PSHR32(MAC16_16(MULT16_16(c, x2),  s, x1), 15));
-      *Xptr++      = EXTRACT16(PSHR32(MAC16_16(MULT16_16(c, x1), ms, x2), 15));
-   }
-   Xptr = &X[len-2*stride-1];
-   for (i=len-2*stride-1;i>=0;i--)
-   {
-      celt_norm x1, x2;
-      x1 = Xptr[0];
-      x2 = Xptr[stride];
-      Xptr[stride] = EXTRACT16(PSHR32(MAC16_16(MULT16_16(c, x2),  s, x1), 15));
-      *Xptr--      = EXTRACT16(PSHR32(MAC16_16(MULT16_16(c, x1), ms, x2), 15));
-   }
-   norm_scaleup(X, len, NORM_SHIFT-14);
+static void exp_rotation1(celt_norm *X, int len, int stride, oac_val16 c, oac_val16 s) {
+    int i;
+    oac_val16 ms;
+    celt_norm *Xptr;
+    Xptr = X;
+    ms = NEG16(s);
+    norm_scaledown(X, len, NORM_SHIFT - 14);
+    for (i = 0; i < len - stride; i++) {
+        celt_norm x1, x2;
+        x1 = Xptr[0];
+        x2 = Xptr[stride];
+        Xptr[stride] = EXTRACT16(PSHR32(MAC16_16(MULT16_16(c, x2),  s, x1), 15));
+        *Xptr++      = EXTRACT16(PSHR32(MAC16_16(MULT16_16(c, x1), ms, x2), 15));
+    }
+    Xptr = &X[len - 2*stride - 1];
+    for (i = len - 2*stride - 1; i >= 0; i--) {
+        celt_norm x1, x2;
+        x1 = Xptr[0];
+        x2 = Xptr[stride];
+        Xptr[stride] = EXTRACT16(PSHR32(MAC16_16(MULT16_16(c, x2),  s, x1), 15));
+        *Xptr--      = EXTRACT16(PSHR32(MAC16_16(MULT16_16(c, x1), ms, x2), 15));
+    }
+    norm_scaleup(X, len, NORM_SHIFT - 14);
 }
 #endif /* OVERRIDE_vq_exp_rotation1 */
 
-void exp_rotation(celt_norm *X, int len, int dir, int stride, int K, int spread)
-{
-   static const int SPREAD_FACTOR[3]={15,10,5};
-   int i;
-   oac_val16 c, s;
-   oac_val16 gain, theta;
-   int stride2=0;
-   int factor;
-
-   if (2*K>=len || spread==SPREAD_NONE)
-      return;
-   factor = SPREAD_FACTOR[spread-1];
-
-   gain = celt_div((oac_val32)MULT16_16(Q15_ONE,len),(oac_val32)(len+factor*K));
-   theta = HALF16(MULT16_16_Q15(gain,gain));
-
-   c = celt_cos_norm(EXTEND32(theta));
-   s = celt_cos_norm(EXTEND32(SUB16(Q15ONE,theta))); /*  sin(theta) */
-
-   if (len>=8*stride)
-   {
-      stride2 = 1;
-      /* This is just a simple (equivalent) way of computing sqrt(len/stride) with rounding.
-         It's basically incrementing long as (stride2+0.5)^2 < len/stride. */
-      while ((stride2*stride2+stride2)*stride + (stride>>2) < len)
-         stride2++;
-   }
-   /*NOTE: As a minor optimization, we could be passing around log2(B), not B, for both this and for
-      extract_collapse_mask().*/
-   len = celt_udiv(len, stride);
-   for (i=0;i<stride;i++)
-   {
-      if (dir < 0)
-      {
-         if (stride2)
-            exp_rotation1(X+i*len, len, stride2, s, c);
-         exp_rotation1(X+i*len, len, 1, c, s);
-      } else {
-         exp_rotation1(X+i*len, len, 1, c, -s);
-         if (stride2)
-            exp_rotation1(X+i*len, len, stride2, s, -c);
-      }
-   }
+void exp_rotation(celt_norm *X, int len, int dir, int stride, int K, int spread) {
+    static const int SPREAD_FACTOR[3] = {15, 10, 5};
+    int i;
+    oac_val16 c, s;
+    oac_val16 gain, theta;
+    int stride2 = 0;
+    int factor;
+
+    if (2*K >= len || spread == SPREAD_NONE)
+        return;
+    factor = SPREAD_FACTOR[spread - 1];
+
+    gain = celt_div((oac_val32)MULT16_16(Q15_ONE, len), (oac_val32)(len + factor*K));
+    theta = HALF16(MULT16_16_Q15(gain, gain));
+
+    c = celt_cos_norm(EXTEND32(theta));
+    s = celt_cos_norm(EXTEND32(SUB16(Q15ONE, theta))); /*  sin(theta) */
+
+    if (len >= 8*stride) {
+        stride2 = 1;
+        /* This is just a simple (equivalent) way of computing sqrt(len/stride) with rounding.
+           It's basically incrementing long as (stride2+0.5)^2 < len/stride. */
+        while ((stride2*stride2 + stride2)*stride + (stride>>2) < len)
+            stride2++;
+    }
+    /*NOTE: As a minor optimization, we could be passing around log2(B), not B, for both this and for
+       extract_collapse_mask().*/
+    len = celt_udiv(len, stride);
+    for (i = 0; i < stride; i++) {
+        if (dir < 0) {
+            if (stride2)
+                exp_rotation1(X + i*len, len, stride2, s, c);
+            exp_rotation1(X + i*len, len, 1, c, s);
+        } else {
+            exp_rotation1(X + i*len, len, 1, c, -s);
+            if (stride2)
+                exp_rotation1(X + i*len, len, stride2, s, -c);
+        }
+    }
 }
 
 /** Normalizes the decoded integer pvq codeword to unit norm. */
 static void normalise_residual(int * OAC_RESTRICT iy, celt_norm * OAC_RESTRICT X,
-      int N, oac_val32 Ryy, oac_val32 gain, int shift)
-{
-   int i;
+                               int N, oac_val32 Ryy, oac_val32 gain, int shift) {
+    int i;
 #ifdef FIXED_POINT
-   int k;
+    int k;
 #endif
-   oac_val32 t;
-   oac_val32 g;
+    oac_val32 t;
+    oac_val32 g;
 
 #ifdef FIXED_POINT
-   k = celt_ilog2(Ryy)>>1;
+    k = celt_ilog2(Ryy)>>1;
 #endif
-   t = VSHR32(Ryy, 2*(k-7)-15);
-   g = MULT32_32_Q31(celt_rsqrt_norm32(t),gain);
-   i=0;
-   (void)shift;
+    t = VSHR32(Ryy, 2*(k - 7) - 15);
+    g = MULT32_32_Q31(celt_rsqrt_norm32(t), gain);
+    i = 0;
+    (void)shift;
 #if defined(FIXED_POINT)
-   if (shift>0) {
-      int tot_shift = NORM_SHIFT+1-k-shift;
-      if (tot_shift >= 0) {
-         do X[i] = MULT32_32_Q31(g, SHL32(iy[i], tot_shift));
-         while (++i < N);
-      } else {
-         do X[i] = MULT32_32_Q31(g, PSHR32(iy[i], -tot_shift));
-         while (++i < N);
-      }
-   } else
+    if (shift > 0) {
+        int tot_shift = NORM_SHIFT + 1 - k - shift;
+        if (tot_shift >= 0) {
+            do X[i] = MULT32_32_Q31(g, SHL32(iy[i], tot_shift));
+            while (++i < N);
+        } else {
+            do X[i] = MULT32_32_Q31(g, PSHR32(iy[i], -tot_shift));
+            while (++i < N);
+        }
+    } else
 #endif
-   do X[i] = VSHR32(MULT16_32_Q15(iy[i], g), k+15-NORM_SHIFT);
-   while (++i < N);
+    do X[i] = VSHR32(MULT16_32_Q15(iy[i], g), k + 15 - NORM_SHIFT);
+    while (++i < N);
 }
 
-static unsigned extract_collapse_mask(int *iy, int N, int B)
-{
-   unsigned collapse_mask;
-   int N0;
-   int i;
-   if (B<=1)
-      return 1;
-   /*NOTE: As a minor optimization, we could be passing around log2(B), not B, for both this and for
-      exp_rotation().*/
-   N0 = celt_udiv(N, B);
-   collapse_mask = 0;
-   i=0; do {
-      int j;
-      unsigned tmp=0;
-      j=0; do {
-         tmp |= iy[i*N0+j];
-      } while (++j<N0);
-      collapse_mask |= (tmp!=0)<<i;
-   } while (++i<B);
-   return collapse_mask;
+static unsigned extract_collapse_mask(int *iy, int N, int B) {
+    unsigned collapse_mask;
+    int N0;
+    int i;
+    if (B <= 1)
+        return 1;
+    /*NOTE: As a minor optimization, we could be passing around log2(B), not B, for both this and for
+       exp_rotation().*/
+    N0 = celt_udiv(N, B);
+    collapse_mask = 0;
+    i = 0; do {
+        int j;
+        unsigned tmp = 0;
+        j = 0; do {
+            tmp |= iy[i*N0 + j];
+        } while (++j < N0);
+        collapse_mask |= (tmp != 0)<<i;
+    } while (++i < B);
+    return collapse_mask;
 }
 
-oac_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch)
-{
-   VARDECL(celt_norm, y);
-   VARDECL(int, signx);
-   int i, j;
-   int pulsesLeft;
-   oac_val32 sum;
-   oac_val32 xy;
-   oac_val16 yy;
-   SAVE_STACK;
-
-   (void)arch;
-   ALLOC(y, N, celt_norm);
-   ALLOC(signx, N, int);
+oac_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch) {
+    VARDECL(celt_norm, y);
+    VARDECL(int, signx);
+    int i, j;
+    int pulsesLeft;
+    oac_val32 sum;
+    oac_val32 xy;
+    oac_val16 yy;
+    SAVE_STACK;
+
+    (void)arch;
+    ALLOC(y, N, celt_norm);
+    ALLOC(signx, N, int);
 #ifdef FIXED_POINT
-   {
-      int shift = (celt_ilog2(1+celt_inner_prod_norm_shift(X, X, N, arch))+1)/2;
-      shift = IMAX(0, shift+(NORM_SHIFT-14)-14);
-      norm_scaledown(X, N, shift);
-   }
+    {
+        int shift = (celt_ilog2(1 + celt_inner_prod_norm_shift(X, X, N, arch)) + 1)/2;
+        shift = IMAX(0, shift + (NORM_SHIFT - 14) - 14);
+        norm_scaledown(X, N, shift);
+    }
 #endif
-   /* Get rid of the sign */
-   sum = 0;
-   j=0; do {
-      signx[j] = X[j]<0;
-      /* OPT: Make sure the compiler doesn't use a branch on ABS16(). */
-      X[j] = ABS16(X[j]);
-      iy[j] = 0;
-      y[j] = 0;
-   } while (++j<N);
-
-   xy = yy = 0;
-
-   pulsesLeft = K;
-
-   /* Do a pre-search by projecting on the pyramid */
-   if (K > (N>>1))
-   {
-      oac_val16 rcp;
-      j=0; do {
-         sum += X[j];
-      }  while (++j<N);
-
-      /* If X is too small, just replace it with a pulse at 0 */
+    /* Get rid of the sign */
+    sum = 0;
+    j = 0; do {
+        signx[j] = X[j] < 0;
+        /* OPT: Make sure the compiler doesn't use a branch on ABS16(). */
+        X[j] = ABS16(X[j]);
+        iy[j] = 0;
+        y[j] = 0;
+    } while (++j < N);
+
+    xy = yy = 0;
+
+    pulsesLeft = K;
+
+    /* Do a pre-search by projecting on the pyramid */
+    if (K > (N>>1)) {
+        oac_val16 rcp;
+        j = 0; do {
+            sum += X[j];
+        }  while (++j < N);
+
+        /* If X is too small, just replace it with a pulse at 0 */
 #ifdef FIXED_POINT
-      if (sum <= K)
+        if (sum <= K)
 #else
-      /* Prevents infinities and NaNs from causing too many pulses
-         to be allocated. 64 is an approximation of infinity here. */
-      if (!(sum > EPSILON && sum < 64))
+        /* Prevents infinities and NaNs from causing too many pulses
+           to be allocated. 64 is an approximation of infinity here. */
+        if (!(sum > EPSILON && sum < 64))
 #endif
-      {
-         X[0] = QCONST16(1.f,14);
-         j=1; do
-            X[j]=0;
-         while (++j<N);
-         sum = QCONST16(1.f,14);
-      }
+        {
+            X[0] = QCONST16(1.f, 14);
+            j = 1; do
+                X[j] = 0;
+            while (++j < N);
+            sum = QCONST16(1.f, 14);
+        }
 #ifdef FIXED_POINT
-      rcp = EXTRACT16(MULT16_32_Q16(K, celt_rcp(sum)));
+        rcp = EXTRACT16(MULT16_32_Q16(K, celt_rcp(sum)));
 #else
-      /* Using K+e with e < 1 guarantees we cannot get more than K pulses. */
-      rcp = EXTRACT16(MULT16_32_Q16(K+0.8f, celt_rcp(sum)));
+        /* Using K+e with e < 1 guarantees we cannot get more than K pulses. */
+        rcp = EXTRACT16(MULT16_32_Q16(K + 0.8f, celt_rcp(sum)));
 #endif
-      j=0; do {
+        j = 0; do {
 #ifdef FIXED_POINT
-         /* It's really important to round *towards zero* here */
-         iy[j] = MULT16_16_Q15(X[j],rcp);
+            /* It's really important to round *towards zero* here */
+            iy[j] = MULT16_16_Q15(X[j], rcp);
 #else
-         iy[j] = (int)floor(rcp*X[j]);
+            iy[j] = (int)floor(rcp*X[j]);
 #endif
-         y[j] = (celt_norm)iy[j];
-         yy = MAC16_16(yy, y[j],y[j]);
-         xy = MAC16_16(xy, X[j],y[j]);
-         y[j] *= 2;
-         pulsesLeft -= iy[j];
-      }  while (++j<N);
-   }
-   celt_sig_assert(pulsesLeft>=0);
-
-   /* This should never happen, but just in case it does (e.g. on silence)
-      we fill the first bin with pulses. */
+            y[j] = (celt_norm)iy[j];
+            yy = MAC16_16(yy, y[j], y[j]);
+            xy = MAC16_16(xy, X[j], y[j]);
+            y[j] *= 2;
+            pulsesLeft -= iy[j];
+        }  while (++j < N);
+    }
+    celt_sig_assert(pulsesLeft >= 0);
+
+    /* This should never happen, but just in case it does (e.g. on silence)
+       we fill the first bin with pulses. */
 #ifdef FIXED_POINT_DEBUG
-   celt_sig_assert(pulsesLeft<=N+3);
+    celt_sig_assert(pulsesLeft <= N + 3);
 #endif
-   if (pulsesLeft > N+3)
-   {
-      oac_val16 tmp = (oac_val16)pulsesLeft;
-      yy = MAC16_16(yy, tmp, tmp);
-      yy = MAC16_16(yy, tmp, y[0]);
-      iy[0] += pulsesLeft;
-      pulsesLeft=0;
-   }
-
-   for (i=0;i<pulsesLeft;i++)
-   {
-      oac_val16 Rxy, Ryy;
-      int best_id;
-      oac_val32 best_num;
-      oac_val16 best_den;
+    if (pulsesLeft > N + 3) {
+        oac_val16 tmp = (oac_val16)pulsesLeft;
+        yy = MAC16_16(yy, tmp, tmp);
+        yy = MAC16_16(yy, tmp, y[0]);
+        iy[0] += pulsesLeft;
+        pulsesLeft = 0;
+    }
+
+    for (i = 0; i < pulsesLeft; i++) {
+        oac_val16 Rxy, Ryy;
+        int best_id;
+        oac_val32 best_num;
+        oac_val16 best_den;
 #ifdef FIXED_POINT
-      int rshift;
+        int rshift;
 #endif
 #ifdef FIXED_POINT
-      rshift = 1+celt_ilog2(K-pulsesLeft+i+1);
+        rshift = 1 + celt_ilog2(K - pulsesLeft + i + 1);
 #endif
-      best_id = 0;
-      /* The squared magnitude term gets added anyway, so we might as well
-         add it outside the loop */
-      yy = ADD16(yy, 1);
-
-      /* Calculations for position 0 are out of the loop, in part to reduce
-         mispredicted branches (since the if condition is usually false)
-         in the loop. */
-      /* Temporary sums of the new pulse(s) */
-      Rxy = EXTRACT16(SHR32(ADD32(xy, EXTEND32(X[0])),rshift));
-      /* We're multiplying y[j] by two so we don't have to do it here */
-      Ryy = ADD16(yy, y[0]);
-
-      /* Approximate score: we maximise Rxy/sqrt(Ryy) (we're guaranteed that
-         Rxy is positive because the sign is pre-computed) */
-      Rxy = MULT16_16_Q15(Rxy,Rxy);
-      best_den = Ryy;
-      best_num = Rxy;
-      j=1;
-      do {
-         /* Temporary sums of the new pulse(s) */
-         Rxy = EXTRACT16(SHR32(ADD32(xy, EXTEND32(X[j])),rshift));
-         /* We're multiplying y[j] by two so we don't have to do it here */
-         Ryy = ADD16(yy, y[j]);
-
-         /* Approximate score: we maximise Rxy/sqrt(Ryy) (we're guaranteed that
-            Rxy is positive because the sign is pre-computed) */
-         Rxy = MULT16_16_Q15(Rxy,Rxy);
-         /* The idea is to check for num/den >= best_num/best_den, but that way
-            we can do it without any division */
-         /* OPT: It's not clear whether a cmov is faster than a branch here
-            since the condition is more often false than true and using
-            a cmov introduces data dependencies across iterations. The optimal
-            choice may be architecture-dependent. */
-         if (oac_unlikely(MULT16_16(best_den, Rxy) > MULT16_16(Ryy, best_num)))
-         {
-            best_den = Ryy;
-            best_num = Rxy;
-            best_id = j;
-         }
-      } while (++j<N);
-
-      /* Updating the sums of the new pulse(s) */
-      xy = ADD32(xy, EXTEND32(X[best_id]));
-      /* We're multiplying y[j] by two so we don't have to do it here */
-      yy = ADD16(yy, y[best_id]);
-
-      /* Only now that we've made the final choice, update y/iy */
-      /* Multiplying y[j] by 2 so we don't have to do it everywhere else */
-      y[best_id] += 2;
-      iy[best_id]++;
-   }
-
-   /* Put the original sign back */
-   j=0;
-   do {
-      /*iy[j] = signx[j] ? -iy[j] : iy[j];*/
-      /* OPT: The is more likely to be compiled without a branch than the code above
-         but has the same performance otherwise. */
-      iy[j] = (iy[j]^-signx[j]) + signx[j];
-   } while (++j<N);
-   RESTORE_STACK;
-   return yy;
+        best_id = 0;
+        /* The squared magnitude term gets added anyway, so we might as well
+           add it outside the loop */
+        yy = ADD16(yy, 1);
+
+        /* Calculations for position 0 are out of the loop, in part to reduce
+           mispredicted branches (since the if condition is usually false)
+           in the loop. */
+        /* Temporary sums of the new pulse(s) */
+        Rxy = EXTRACT16(SHR32(ADD32(xy, EXTEND32(X[0])), rshift));
+        /* We're multiplying y[j] by two so we don't have to do it here */
+        Ryy = ADD16(yy, y[0]);
+
+        /* Approximate score: we maximise Rxy/sqrt(Ryy) (we're guaranteed that
+           Rxy is positive because the sign is pre-computed) */
+        Rxy = MULT16_16_Q15(Rxy, Rxy);
+        best_den = Ryy;
+        best_num = Rxy;
+        j = 1;
+        do {
+            /* Temporary sums of the new pulse(s) */
+            Rxy = EXTRACT16(SHR32(ADD32(xy, EXTEND32(X[j])), rshift));
+            /* We're multiplying y[j] by two so we don't have to do it here */
+            Ryy = ADD16(yy, y[j]);
+
+            /* Approximate score: we maximise Rxy/sqrt(Ryy) (we're guaranteed that
+               Rxy is positive because the sign is pre-computed) */
+            Rxy = MULT16_16_Q15(Rxy, Rxy);
+            /* The idea is to check for num/den >= best_num/best_den, but that way
+               we can do it without any division */
+            /* OPT: It's not clear whether a cmov is faster than a branch here
+               since the condition is more often false than true and using
+               a cmov introduces data dependencies across iterations. The optimal
+               choice may be architecture-dependent. */
+            if (oac_unlikely(MULT16_16(best_den, Rxy) > MULT16_16(Ryy, best_num))) {
+                best_den = Ryy;
+                best_num = Rxy;
+                best_id = j;
+            }
+        } while (++j < N);
+
+        /* Updating the sums of the new pulse(s) */
+        xy = ADD32(xy, EXTEND32(X[best_id]));
+        /* We're multiplying y[j] by two so we don't have to do it here */
+        yy = ADD16(yy, y[best_id]);
+
+        /* Only now that we've made the final choice, update y/iy */
+        /* Multiplying y[j] by 2 so we don't have to do it everywhere else */
+        y[best_id] += 2;
+        iy[best_id]++;
+    }
+
+    /* Put the original sign back */
+    j = 0;
+    do {
+        /*iy[j] = signx[j] ? -iy[j] : iy[j];*/
+        /* OPT: The is more likely to be compiled without a branch than the code above
+           but has the same performance otherwise. */
+        iy[j] = (iy[j]^-signx[j]) + signx[j];
+    } while (++j < N);
+    RESTORE_STACK;
+    return yy;
 }
 
-      RESTORE_STACK;
-   RESTORE_STACK;
-   RESTORE_STACK;
+RESTORE_STACK;
+RESTORE_STACK;
+RESTORE_STACK;
 unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
-      oac_val32 gain, int resynth, int arch)
-{
-   VARDECL(int, iy);
-   oac_val32 yy;
-   unsigned collapse_mask;
-   SAVE_STACK;
+                   oac_val32 gain, int resynth, int arch) {
+    VARDECL(int, iy);
+    oac_val32 yy;
+    unsigned collapse_mask;
+    SAVE_STACK;
 
-   celt_assert2(K>0, "alg_quant() needs at least one pulse");
-   celt_assert2(N>1, "alg_quant() needs at least two dimensions");
+    celt_assert2(K > 0, "alg_quant() needs at least one pulse");
+    celt_assert2(N > 1, "alg_quant() needs at least two dimensions");
 
-   /* Covers vectorization by up to 4. */
-   ALLOC(iy, N+3, int);
+    /* Covers vectorization by up to 4. */
+    ALLOC(iy, N + 3, int);
 
-   exp_rotation(X, N, 1, B, K, spread);
+    exp_rotation(X, N, 1, B, K, spread);
 
-   yy = op_pvq_search(X, iy, K, N, arch);
-   collapse_mask = extract_collapse_mask(iy, N, B);
-   encode_pulses(iy, N, K, enc);
-   if (resynth) normalise_residual(iy, X, N, yy, gain, 0);
+    yy = op_pvq_search(X, iy, K, N, arch);
+    collapse_mask = extract_collapse_mask(iy, N, B);
+    encode_pulses(iy, N, K, enc);
+    if (resynth) normalise_residual(iy, X, N, yy, gain, 0);
 
-   if (resynth)
-      exp_rotation(X, N, -1, B, K, spread);
+    if (resynth)
+        exp_rotation(X, N, -1, B, K, spread);
 
-   RESTORE_STACK;
-   return collapse_mask;
+    RESTORE_STACK;
+    return collapse_mask;
 }
 
 /** Decode pulse vector and combine the result with the pitch vector to produce
     the final normalised signal in the current band. */
 unsigned alg_unquant(celt_norm *X, int N, int K, int spread, int B,
-      ec_dec *dec, oac_val32 gain)
-{
-   oac_val32 Ryy;
-   unsigned collapse_mask;
-   VARDECL(int, iy);
-   int yy_shift=0;
-   SAVE_STACK;
-
-   celt_assert2(K>0, "alg_unquant() needs at least one pulse");
-   celt_assert2(N>1, "alg_unquant() needs at least two dimensions");
-   ALLOC(iy, N, int);
-   Ryy = decode_pulses(iy, N, K, dec);
-   normalise_residual(iy, X, N, Ryy, gain, yy_shift);
-   exp_rotation(X, N, -1, B, K, spread);
-   collapse_mask = extract_collapse_mask(iy, N, B);
-   RESTORE_STACK;
-   return collapse_mask;
+                     ec_dec *dec, oac_val32 gain) {
+    oac_val32 Ryy;
+    unsigned collapse_mask;
+    VARDECL(int, iy);
+    int yy_shift = 0;
+    SAVE_STACK;
+
+    celt_assert2(K > 0, "alg_unquant() needs at least one pulse");
+    celt_assert2(N > 1, "alg_unquant() needs at least two dimensions");
+    ALLOC(iy, N, int);
+    Ryy = decode_pulses(iy, N, K, dec);
+    normalise_residual(iy, X, N, Ryy, gain, yy_shift);
+    exp_rotation(X, N, -1, B, K, spread);
+    collapse_mask = extract_collapse_mask(iy, N, B);
+    RESTORE_STACK;
+    return collapse_mask;
 }
 
 #ifndef OVERRIDE_renormalise_vector
-void renormalise_vector(celt_norm *X, int N, oac_val32 gain, int arch)
-{
-   int i;
-#ifdef FIXED_POINT
-   int k;
-#endif
-   oac_val32 E;
-   oac_val16 g;
-   oac_val32 t;
-   celt_norm *xptr;
-   norm_scaledown(X, N, NORM_SHIFT-14);
-   E = EPSILON + celt_inner_prod_norm(X, X, N, arch);
-#ifdef FIXED_POINT
-   k = celt_ilog2(E)>>1;
-#endif
-   t = VSHR32(E, 2*(k-7));
-   g = MULT32_32_Q31(celt_rsqrt_norm(t),gain);
-
-   xptr = X;
-   for (i=0;i<N;i++)
-   {
-      *xptr = EXTRACT16(PSHR32(MULT16_16(g, *xptr), k+15-14));
-      xptr++;
-   }
-   norm_scaleup(X, N, NORM_SHIFT-14);
-   /*return celt_sqrt(E);*/
+void renormalise_vector(celt_norm *X, int N, oac_val32 gain, int arch) {
+    int i;
+# ifdef FIXED_POINT
+    int k;
+# endif
+    oac_val32 E;
+    oac_val16 g;
+    oac_val32 t;
+    celt_norm *xptr;
+    norm_scaledown(X, N, NORM_SHIFT - 14);
+    E = EPSILON + celt_inner_prod_norm(X, X, N, arch);
+# ifdef FIXED_POINT
+    k = celt_ilog2(E)>>1;
+# endif
+    t = VSHR32(E, 2*(k - 7));
+    g = MULT32_32_Q31(celt_rsqrt_norm(t), gain);
+
+    xptr = X;
+    for (i = 0; i < N; i++) {
+        *xptr = EXTRACT16(PSHR32(MULT16_16(g, *xptr), k + 15 - 14));
+        xptr++;
+    }
+    norm_scaleup(X, N, NORM_SHIFT - 14);
+    /*return celt_sqrt(E);*/
 }
 #endif /* OVERRIDE_renormalise_vector */
 
-oac_int32 stereo_itheta(const celt_norm *X, const celt_norm *Y, int stereo, int N, int arch)
-{
-   int i;
-   int itheta;
-   oac_val32 mid, side;
-   oac_val32 Emid, Eside;
-
-   Emid = Eside = 0;
-   if (stereo)
-   {
-      for (i=0;i<N;i++)
-      {
-         celt_norm m, s;
-         m = PSHR32(ADD32(X[i], Y[i]), NORM_SHIFT-13);
-         s = PSHR32(SUB32(X[i], Y[i]), NORM_SHIFT-13);
-         Emid = MAC16_16(Emid, m, m);
-         Eside = MAC16_16(Eside, s, s);
-      }
-   } else {
-      Emid += celt_inner_prod_norm_shift(X, X, N, arch);
-      Eside += celt_inner_prod_norm_shift(Y, Y, N, arch);
-   }
-   mid = celt_sqrt32(Emid);
-   side = celt_sqrt32(Eside);
+oac_int32 stereo_itheta(const celt_norm *X, const celt_norm *Y, int stereo, int N, int arch) {
+    int i;
+    int itheta;
+    oac_val32 mid, side;
+    oac_val32 Emid, Eside;
+
+    Emid = Eside = 0;
+    if (stereo) {
+        for (i = 0; i < N; i++) {
+            celt_norm m, s;
+            m = PSHR32(ADD32(X[i], Y[i]), NORM_SHIFT - 13);
+            s = PSHR32(SUB32(X[i], Y[i]), NORM_SHIFT - 13);
+            Emid = MAC16_16(Emid, m, m);
+            Eside = MAC16_16(Eside, s, s);
+        }
+    } else {
+        Emid += celt_inner_prod_norm_shift(X, X, N, arch);
+        Eside += celt_inner_prod_norm_shift(Y, Y, N, arch);
+    }
+    mid = celt_sqrt32(Emid);
+    side = celt_sqrt32(Eside);
 #if defined(FIXED_POINT)
-   itheta = celt_atan2p_norm(side, mid);
+    itheta = celt_atan2p_norm(side, mid);
 #else
-   itheta = (int)floor(.5f+65536.f*16384*celt_atan2p_norm(side,mid));
+    itheta = (int)floor(.5f + 65536.f*16384*celt_atan2p_norm(side, mid));
 #endif
 
-   return itheta;
+    return itheta;
 }
 
 static void cubic_synthesis(celt_norm *X, int *iy, int N, int K, int face, int sign, oac_val32 gain) {
-   int i;
-   oac_val32 sum=0;
-   oac_val32 mag;
+    int i;
+    oac_val32 sum = 0;
+    oac_val32 mag;
 #ifdef FIXED_POINT
-   int sum_shift;
-   int shift = IMAX(celt_ilog2(K) + celt_ilog2(N)/2 - 13, 0);
+    int sum_shift;
+    int shift = IMAX(celt_ilog2(K) + celt_ilog2(N)/2 - 13, 0);
 #endif
-   for (i=0;i<N;i++) {
-      X[i] = (1+2*iy[i])-K;
-   }
-   X[face] = sign ? -K : K;
-   for (i=0;i<N;i++) {
-      sum += PSHR32(MULT16_16(X[i],X[i]), 2*shift);
-   }
+    for (i = 0; i < N; i++) {
+        X[i] = (1 + 2*iy[i]) - K;
+    }
+    X[face] = sign ? -K : K;
+    for (i = 0; i < N; i++) {
+        sum += PSHR32(MULT16_16(X[i], X[i]), 2*shift);
+    }
 #ifdef FIXED_POINT
-   sum_shift = (29-celt_ilog2(sum))>>1;
-   mag = celt_rsqrt_norm32(SHL32(sum, 2*sum_shift+1));
-   for (i=0;i<N;i++) {
-      X[i] = VSHR32(MULT16_32_Q15(X[i],MULT32_32_Q31(mag,gain)), shift-sum_shift+29-NORM_SHIFT);
-   }
+    sum_shift = (29 - celt_ilog2(sum))>>1;
+    mag = celt_rsqrt_norm32(SHL32(sum, 2*sum_shift + 1));
+    for (i = 0; i < N; i++) {
+        X[i] = VSHR32(MULT16_32_Q15(X[i], MULT32_32_Q31(mag, gain)), shift - sum_shift + 29 - NORM_SHIFT);
+    }
 #else
-   mag = 1.f/sqrt(sum);
-   for (i=0;i<N;i++) {
-      X[i] *= mag*gain;
-   }
+    mag = 1.f/sqrt(sum);
+    for (i = 0; i < N; i++) {
+        X[i] *= mag*gain;
+    }
 #endif
 }
 
 unsigned cubic_quant(celt_norm *X, int N, int res, int B, ec_enc *enc, oac_val32 gain, int resynth) {
-   int i;
-   int face=0;
-   int K;
-   VARDECL(int, iy);
-   celt_norm faceval=-1;
-   oac_val32 norm;
-   int sign;
-   SAVE_STACK;
-   ALLOC(iy, N, int);
-   K = 1<<res;
-   /* Using odd K on transients to avoid adding pre-echo. */
-   if (B!=1) K=IMAX(1, K-1);
-   if (K==1) {
-      if (resynth) OAC_CLEAR(X, N);
-      RESTORE_STACK;
-      return 0;
-   }
-   for (i=0;i<N;i++) {
-      if (ABS32(X[i]) > faceval) {
-         faceval = ABS32(X[i]);
-         face = i;
-      }
-   }
-   sign = X[face]<0;
-   ec_enc_uint(enc, face, N);
-   ec_enc_bits(enc, sign, 1);
+    int i;
+    int face = 0;
+    int K;
+    VARDECL(int, iy);
+    celt_norm faceval = -1;
+    oac_val32 norm;
+    int sign;
+    SAVE_STACK;
+    ALLOC(iy, N, int);
+    K = 1<<res;
+    /* Using odd K on transients to avoid adding pre-echo. */
+    if (B != 1) K = IMAX(1, K - 1);
+    if (K == 1) {
+        if (resynth) OAC_CLEAR(X, N);
+        RESTORE_STACK;
+        return 0;
+    }
+    for (i = 0; i < N; i++) {
+        if (ABS32(X[i]) > faceval) {
+            faceval = ABS32(X[i]);
+            face = i;
+        }
+    }
+    sign = X[face] < 0;
+    ec_enc_uint(enc, face, N);
+    ec_enc_bits(enc, sign, 1);
 #ifdef FIXED_POINT
-   if (faceval != 0) {
-      int face_shift = 30-celt_ilog2(faceval);
-      norm = celt_rcp_norm32(SHL32(faceval, face_shift));
-      norm = MULT16_32_Q15(K, norm);
-      for (i=0;i<N;i++) {
-         /* By computing X[i]+faceval inside the shift, the result is guaranteed non-negative. */
-         iy[i] = IMIN(K-1, (MULT32_32_Q31(SHL32(X[i]+faceval, face_shift-1), norm)) >> 15);
-      }
-   } else {
-      OAC_CLEAR(iy, N);
-   }
+    if (faceval != 0) {
+        int face_shift = 30 - celt_ilog2(faceval);
+        norm = celt_rcp_norm32(SHL32(faceval, face_shift));
+        norm = MULT16_32_Q15(K, norm);
+        for (i = 0; i < N; i++) {
+            /* By computing X[i]+faceval inside the shift, the result is guaranteed non-negative. */
+            iy[i] = IMIN(K - 1, (MULT32_32_Q31(SHL32(X[i] + faceval, face_shift - 1), norm))>>15);
+        }
+    } else {
+        OAC_CLEAR(iy, N);
+    }
 #else
-   norm = .5f*K/(faceval+EPSILON);
-   for (i=0;i<N;i++) {
-      iy[i] = IMIN(K-1, (int)floor((X[i]+faceval)*norm));
-   }
+    norm = .5f*K/(faceval + EPSILON);
+    for (i = 0; i < N; i++) {
+        iy[i] = IMIN(K - 1, (int)floor((X[i] + faceval)*norm));
+    }
 #endif
-   for (i=0;i<N;i++) {
-      if (i != face) ec_enc_bits(enc, iy[i], res);
-   }
-   if (resynth) {
-      cubic_synthesis(X, iy, N, K, face, sign, gain);
-   }
-   RESTORE_STACK;
-   return (1<<B)-1;
+    for (i = 0; i < N; i++) {
+        if (i != face) ec_enc_bits(enc, iy[i], res);
+    }
+    if (resynth) {
+        cubic_synthesis(X, iy, N, K, face, sign, gain);
+    }
+    RESTORE_STACK;
+    return (1<<B) - 1;
 }
 
 unsigned cubic_unquant(celt_norm *X, int N, int res, int B, ec_dec *dec, oac_val32 gain) {
-   int i;
-   int face;
-   int sign;
-   int K;
-   VARDECL(int, iy);
-   SAVE_STACK;
-   ALLOC(iy, N, int);
-   K = 1<<res;
-   /* Using odd K on transients to avoid adding pre-echo. */
-   if (B!=1) K=IMAX(1, K-1);
-   if (K==1) {
-      OAC_CLEAR(X, N);
-      RESTORE_STACK;
-      return 0;
-   }
-   face = ec_dec_uint(dec, N);
-   sign = ec_dec_bits(dec, 1);
-   for (i=0;i<N;i++) {
-      if (i != face) iy[i] = ec_dec_bits(dec, res);
-   }
-   iy[face]=0;
-   cubic_synthesis(X, iy, N, K, face, sign, gain);
-   RESTORE_STACK;
-   return (1<<B)-1;
+    int i;
+    int face;
+    int sign;
+    int K;
+    VARDECL(int, iy);
+    SAVE_STACK;
+    ALLOC(iy, N, int);
+    K = 1<<res;
+    /* Using odd K on transients to avoid adding pre-echo. */
+    if (B != 1) K = IMAX(1, K - 1);
+    if (K == 1) {
+        OAC_CLEAR(X, N);
+        RESTORE_STACK;
+        return 0;
+    }
+    face = ec_dec_uint(dec, N);
+    sign = ec_dec_bits(dec, 1);
+    for (i = 0; i < N; i++) {
+        if (i != face) iy[i] = ec_dec_bits(dec, res);
+    }
+    iy[face] = 0;
+    cubic_synthesis(X, iy, N, K, face, sign, gain);
+    RESTORE_STACK;
+    return (1<<B) - 1;
 }
diff --git a/celt/vq.h b/celt/vq.h
index 5c316e1dc..55d1bc369 100644
--- a/celt/vq.h
+++ b/celt/vq.h
@@ -28,7 +28,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef VQ_H
 #define VQ_H
@@ -38,7 +38,7 @@
 #include "modes.h"
 
 #if (defined(OAC_X86_MAY_HAVE_SSE2) && !defined(FIXED_POINT))
-#include "x86/vq_sse.h"
+# include "x86/vq_sse.h"
 #endif
 
 #if defined(FIXED_POINT)
@@ -49,10 +49,10 @@ void norm_scaleup(celt_norm *X, int N, int shift);
 void norm_scaledown(celt_norm *X, int N, int shift);
 
 #else
-#define celt_inner_prod_norm celt_inner_prod
-#define celt_inner_prod_norm_shift celt_inner_prod
-#define norm_scaleup(X, N, shift)
-#define norm_scaledown(X, N, shift)
+# define celt_inner_prod_norm celt_inner_prod
+# define celt_inner_prod_norm_shift celt_inner_prod
+# define norm_scaleup(X, N, shift)
+# define norm_scaledown(X, N, shift)
 #endif
 
 void exp_rotation(celt_norm *X, int len, int dir, int stride, int K, int spread);
@@ -60,21 +60,21 @@ void exp_rotation(celt_norm *X, int len, int dir, int stride, int K, int spread)
 oac_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch);
 
 #if !defined(OVERRIDE_OP_PVQ_SEARCH)
-#define op_pvq_search(x, iy, K, N, arch) \
-    (op_pvq_search_c(x, iy, K, N, arch))
+# define op_pvq_search(x, iy, K, N, arch) \
+        (op_pvq_search_c(x, iy, K, N, arch))
 #endif
 
 /** Algebraic pulse-vector quantiser. The signal x is replaced by the sum of
-  * the pitch and a combination of pulses such that its norm is still equal
-  * to 1. This is the function that will typically require the most CPU.
+ * the pitch and a combination of pulses such that its norm is still equal
+ * to 1. This is the function that will typically require the most CPU.
  * @param X Residual signal to quantise/encode (returns quantised version)
  * @param N Number of samples to encode
  * @param K Number of pulses to use
  * @param enc Entropy encoder state
  * @ret A mask indicating which blocks in the band received pulses
-*/
+ */
 unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
-      oac_val32 gain, int resynth, int arch);
+    oac_val32 gain, int resynth, int arch);
 
 /** Algebraic pulse decoder
  * @param X Decoded normalised spectrum (returned)
@@ -84,7 +84,7 @@ unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
  * @ret A mask indicating which blocks in the band received pulses
  */
 unsigned alg_unquant(celt_norm *X, int N, int K, int spread, int B,
-      ec_dec *dec, oac_val32 gain);
+    ec_dec *dec, oac_val32 gain);
 
 void renormalise_vector(celt_norm *X, int N, oac_val32 gain, int arch);
 
diff --git a/celt/x86/celt_lpc_sse.h b/celt/x86/celt_lpc_sse.h
index 676ff4f1e..4eac33018 100644
--- a/celt/x86/celt_lpc_sse.h
+++ b/celt/x86/celt_lpc_sse.h
@@ -23,31 +23,31 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef CELT_LPC_SSE_H
 #define CELT_LPC_SSE_H
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #if defined(OAC_X86_MAY_HAVE_SSE4_1) && defined(FIXED_POINT)
 
 void celt_fir_sse4_1(
-         const oac_val16 *x,
-         const oac_val16 *num,
-         oac_val16 *y,
-         int N,
-         int ord,
-         int arch);
+    const oac_val16 *x,
+    const oac_val16 *num,
+    oac_val16 *y,
+    int N,
+    int ord,
+    int arch);
 
-#if defined(OAC_X86_PRESUME_SSE4_1)
-#define OVERRIDE_CELT_FIR
-#define celt_fir(x, num, y, N, ord, arch) \
-    ((void)arch, celt_fir_sse4_1(x, num, y, N, ord, arch))
+# if defined(OAC_X86_PRESUME_SSE4_1)
+#  define OVERRIDE_CELT_FIR
+#  define celt_fir(x, num, y, N, ord, arch) \
+        ((void)arch, celt_fir_sse4_1(x, num, y, N, ord, arch))
 
-#elif defined(OAC_HAVE_RTCD)
+# elif defined(OAC_HAVE_RTCD)
 
 extern void (*const CELT_FIR_IMPL[OAC_ARCHMASK + 1])(
          const oac_val16 *x,
@@ -57,11 +57,11 @@ extern void (*const CELT_FIR_IMPL[OAC_ARCHMASK + 1])(
          int ord,
          int arch);
 
-#define OVERRIDE_CELT_FIR
+#  define OVERRIDE_CELT_FIR
 #  define celt_fir(x, num, y, N, ord, arch) \
-    ((*CELT_FIR_IMPL[(arch) & OAC_ARCHMASK])(x, num, y, N, ord, arch))
+        ((*CELT_FIR_IMPL[(arch)&OAC_ARCHMASK])(x, num, y, N, ord, arch))
 
-#endif
+# endif
 #endif
 
 #endif
diff --git a/celt/x86/celt_lpc_sse4_1.c b/celt/x86/celt_lpc_sse4_1.c
index d08ca8ae3..851e6f4ec 100644
--- a/celt/x86/celt_lpc_sse4_1.c
+++ b/celt/x86/celt_lpc_sse4_1.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <xmmintrin.h>
@@ -41,56 +41,53 @@
 #if defined(FIXED_POINT)
 
 void celt_fir_sse4_1(const oac_val16 *x,
-         const oac_val16 *num,
-         oac_val16 *y,
-         int N,
-         int ord,
-         int arch)
-{
-    int i,j;
+                     const oac_val16 *num,
+                     oac_val16 *y,
+                     int N,
+                     int ord,
+                     int arch) {
+    int i, j;
     VARDECL(oac_val16, rnum);
 
     __m128i vecNoA;
-    oac_int32 noA ;
+    oac_int32 noA;
     SAVE_STACK;
 
-   ALLOC(rnum, ord, oac_val16);
-   for(i=0;i<ord;i++)
-      rnum[i] = num[ord-i-1];
-   noA = EXTEND32(1) << SIG_SHIFT >> 1;
-   vecNoA = _mm_set_epi32(noA, noA, noA, noA);
+    ALLOC(rnum, ord, oac_val16);
+    for (i = 0; i < ord; i++)
+        rnum[i] = num[ord - i - 1];
+    noA = EXTEND32(1)<<SIG_SHIFT>>1;
+    vecNoA = _mm_set_epi32(noA, noA, noA, noA);
 
-   for (i=0;i<N-3;i+=4)
-   {
-      oac_val32 sums[4] = {0};
-      __m128i vecSum, vecX;
-#if defined(OAC_CHECK_ASM)
-      {
-         oac_val32 sums_c[4] = {0};
-         xcorr_kernel_c(rnum, x+i-ord, sums_c, ord);
-#endif
-         xcorr_kernel(rnum, x+i-ord, sums, ord, arch);
-#if defined(OAC_CHECK_ASM)
-         celt_assert(memcmp(sums, sums_c, sizeof(sums)) == 0);
-      }
-#endif
-      vecSum = _mm_loadu_si128((__m128i *)(void*)sums);
-      vecSum = _mm_add_epi32(vecSum, vecNoA);
-      vecSum = _mm_srai_epi32(vecSum, SIG_SHIFT);
-      vecX = OP_CVTEPI16_EPI32_M64(x + i);
-      vecSum = _mm_add_epi32(vecSum, vecX);
-      vecSum = _mm_packs_epi32(vecSum, vecSum);
-      _mm_storel_epi64((__m128i *)(void *)(y + i), vecSum);
-   }
-   for (;i<N;i++)
-   {
-      oac_val32 sum = 0;
-      for (j=0;j<ord;j++)
-         sum = MAC16_16(sum, rnum[j], x[i+j-ord]);
-      y[i] = SATURATE16(ADD32(EXTEND32(x[i]), PSHR32(sum, SIG_SHIFT)));
-   }
+    for (i = 0; i < N - 3; i += 4) {
+        oac_val32 sums[4] = {0};
+        __m128i vecSum, vecX;
+# if defined(OAC_CHECK_ASM)
+        {
+            oac_val32 sums_c[4] = {0};
+            xcorr_kernel_c(rnum, x + i - ord, sums_c, ord);
+# endif
+        xcorr_kernel(rnum, x + i - ord, sums, ord, arch);
+# if defined(OAC_CHECK_ASM)
+        celt_assert(memcmp(sums, sums_c, sizeof(sums)) == 0);
+    }
+# endif
+        vecSum = _mm_loadu_si128((__m128i *)(void*)sums);
+        vecSum = _mm_add_epi32(vecSum, vecNoA);
+        vecSum = _mm_srai_epi32(vecSum, SIG_SHIFT);
+        vecX = OP_CVTEPI16_EPI32_M64(x + i);
+        vecSum = _mm_add_epi32(vecSum, vecX);
+        vecSum = _mm_packs_epi32(vecSum, vecSum);
+        _mm_storel_epi64((__m128i *)(void *)(y + i), vecSum);
+    }
+    for (; i < N; i++) {
+        oac_val32 sum = 0;
+        for (j = 0; j < ord; j++)
+            sum = MAC16_16(sum, rnum[j], x[i + j - ord]);
+        y[i] = SATURATE16(ADD32(EXTEND32(x[i]), PSHR32(sum, SIG_SHIFT)));
+    }
 
-   RESTORE_STACK;
+    RESTORE_STACK;
 }
 
 #endif
diff --git a/celt/x86/pitch_avx.c b/celt/x86/pitch_avx.c
index c772d4905..672d842e0 100644
--- a/celt/x86/pitch_avx.c
+++ b/celt/x86/pitch_avx.c
@@ -22,10 +22,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 
@@ -36,45 +36,43 @@
 #if defined(OAC_X86_MAY_HAVE_AVX2) && !defined(FIXED_POINT)
 
 /* Like the "regular" xcorr_kernel(), but computes 8 results at a time. */
-static void xcorr_kernel_avx(const float *x, const float *y, float sum[8], int len)
-{
+static void xcorr_kernel_avx(const float *x, const float *y, float sum[8], int len) {
     __m256 xsum0, xsum1, xsum2, xsum3, xsum4, xsum5, xsum6, xsum7;
     xsum7 = xsum6 = xsum5 = xsum4 = xsum3 = xsum2 = xsum1 = xsum0 = _mm256_setzero_ps();
     int i;
     __m256 x0;
     /* Compute 8 inner products using partial sums. */
-    for (i=0;i<len-7;i+=8)
-    {
-        x0 = _mm256_loadu_ps(x+i);
-        xsum0 = _mm256_fmadd_ps(x0, _mm256_loadu_ps(y+i  ), xsum0);
-        xsum1 = _mm256_fmadd_ps(x0, _mm256_loadu_ps(y+i+1), xsum1);
-        xsum2 = _mm256_fmadd_ps(x0, _mm256_loadu_ps(y+i+2), xsum2);
-        xsum3 = _mm256_fmadd_ps(x0, _mm256_loadu_ps(y+i+3), xsum3);
-        xsum4 = _mm256_fmadd_ps(x0, _mm256_loadu_ps(y+i+4), xsum4);
-        xsum5 = _mm256_fmadd_ps(x0, _mm256_loadu_ps(y+i+5), xsum5);
-        xsum6 = _mm256_fmadd_ps(x0, _mm256_loadu_ps(y+i+6), xsum6);
-        xsum7 = _mm256_fmadd_ps(x0, _mm256_loadu_ps(y+i+7), xsum7);
+    for (i = 0; i < len - 7; i += 8) {
+        x0 = _mm256_loadu_ps(x + i);
+        xsum0 = _mm256_fmadd_ps(x0, _mm256_loadu_ps(y + i  ), xsum0);
+        xsum1 = _mm256_fmadd_ps(x0, _mm256_loadu_ps(y + i + 1), xsum1);
+        xsum2 = _mm256_fmadd_ps(x0, _mm256_loadu_ps(y + i + 2), xsum2);
+        xsum3 = _mm256_fmadd_ps(x0, _mm256_loadu_ps(y + i + 3), xsum3);
+        xsum4 = _mm256_fmadd_ps(x0, _mm256_loadu_ps(y + i + 4), xsum4);
+        xsum5 = _mm256_fmadd_ps(x0, _mm256_loadu_ps(y + i + 5), xsum5);
+        xsum6 = _mm256_fmadd_ps(x0, _mm256_loadu_ps(y + i + 6), xsum6);
+        xsum7 = _mm256_fmadd_ps(x0, _mm256_loadu_ps(y + i + 7), xsum7);
     }
     if (i != len) {
         static const int mask[15] = {-1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0};
         __m256i m;
-        m = _mm256_loadu_si256((__m256i*)(void*)(mask + 7+i-len));
-        x0 = _mm256_maskload_ps(x+i, m);
-        xsum0 = _mm256_fmadd_ps(x0, _mm256_maskload_ps(y+i  , m), xsum0);
-        xsum1 = _mm256_fmadd_ps(x0, _mm256_maskload_ps(y+i+1, m), xsum1);
-        xsum2 = _mm256_fmadd_ps(x0, _mm256_maskload_ps(y+i+2, m), xsum2);
-        xsum3 = _mm256_fmadd_ps(x0, _mm256_maskload_ps(y+i+3, m), xsum3);
-        xsum4 = _mm256_fmadd_ps(x0, _mm256_maskload_ps(y+i+4, m), xsum4);
-        xsum5 = _mm256_fmadd_ps(x0, _mm256_maskload_ps(y+i+5, m), xsum5);
-        xsum6 = _mm256_fmadd_ps(x0, _mm256_maskload_ps(y+i+6, m), xsum6);
-        xsum7 = _mm256_fmadd_ps(x0, _mm256_maskload_ps(y+i+7, m), xsum7);
+        m = _mm256_loadu_si256((__m256i*)(void*)(mask + 7 + i - len));
+        x0 = _mm256_maskload_ps(x + i, m);
+        xsum0 = _mm256_fmadd_ps(x0, _mm256_maskload_ps(y + i, m), xsum0);
+        xsum1 = _mm256_fmadd_ps(x0, _mm256_maskload_ps(y + i + 1, m), xsum1);
+        xsum2 = _mm256_fmadd_ps(x0, _mm256_maskload_ps(y + i + 2, m), xsum2);
+        xsum3 = _mm256_fmadd_ps(x0, _mm256_maskload_ps(y + i + 3, m), xsum3);
+        xsum4 = _mm256_fmadd_ps(x0, _mm256_maskload_ps(y + i + 4, m), xsum4);
+        xsum5 = _mm256_fmadd_ps(x0, _mm256_maskload_ps(y + i + 5, m), xsum5);
+        xsum6 = _mm256_fmadd_ps(x0, _mm256_maskload_ps(y + i + 6, m), xsum6);
+        xsum7 = _mm256_fmadd_ps(x0, _mm256_maskload_ps(y + i + 7, m), xsum7);
     }
     /* 8 horizontal adds. */
     /* Compute [0 4] [1 5] [2 6] [3 7] */
-    xsum0 = _mm256_add_ps(_mm256_permute2f128_ps(xsum0, xsum4, 2<<4), _mm256_permute2f128_ps(xsum0, xsum4, 1 | (3<<4)));
-    xsum1 = _mm256_add_ps(_mm256_permute2f128_ps(xsum1, xsum5, 2<<4), _mm256_permute2f128_ps(xsum1, xsum5, 1 | (3<<4)));
-    xsum2 = _mm256_add_ps(_mm256_permute2f128_ps(xsum2, xsum6, 2<<4), _mm256_permute2f128_ps(xsum2, xsum6, 1 | (3<<4)));
-    xsum3 = _mm256_add_ps(_mm256_permute2f128_ps(xsum3, xsum7, 2<<4), _mm256_permute2f128_ps(xsum3, xsum7, 1 | (3<<4)));
+    xsum0 = _mm256_add_ps(_mm256_permute2f128_ps(xsum0, xsum4, 2<<4), _mm256_permute2f128_ps(xsum0, xsum4, 1|(3<<4)));
+    xsum1 = _mm256_add_ps(_mm256_permute2f128_ps(xsum1, xsum5, 2<<4), _mm256_permute2f128_ps(xsum1, xsum5, 1|(3<<4)));
+    xsum2 = _mm256_add_ps(_mm256_permute2f128_ps(xsum2, xsum6, 2<<4), _mm256_permute2f128_ps(xsum2, xsum6, 1|(3<<4)));
+    xsum3 = _mm256_add_ps(_mm256_permute2f128_ps(xsum3, xsum7, 2<<4), _mm256_permute2f128_ps(xsum3, xsum7, 1|(3<<4)));
     /* Compute [0 1 4 5] [2 3 6 7] */
     xsum0 = _mm256_hadd_ps(xsum0, xsum1);
     xsum1 = _mm256_hadd_ps(xsum2, xsum3);
@@ -83,19 +81,16 @@ static void xcorr_kernel_avx(const float *x, const float *y, float sum[8], int l
     _mm256_storeu_ps(sum, xsum0);
 }
 
-void celt_pitch_xcorr_avx2(const float *_x, const float *_y, float *xcorr, int len, int max_pitch, int arch)
-{
-   int i;
-   celt_assert(max_pitch>0);
-   (void)arch;
-   for (i=0;i<max_pitch-7;i+=8)
-   {
-      xcorr_kernel_avx(_x, _y+i, &xcorr[i], len);
-   }
-   for (;i<max_pitch;i++)
-   {
-      xcorr[i] = celt_inner_prod(_x, _y+i, len, arch);
-   }
+void celt_pitch_xcorr_avx2(const float *_x, const float *_y, float *xcorr, int len, int max_pitch, int arch) {
+    int i;
+    celt_assert(max_pitch > 0);
+    (void)arch;
+    for (i = 0; i < max_pitch - 7; i += 8) {
+        xcorr_kernel_avx(_x, _y + i, &xcorr[i], len);
+    }
+    for (; i < max_pitch; i++) {
+        xcorr[i] = celt_inner_prod(_x, _y + i, len, arch);
+    }
 }
 
 #endif
diff --git a/celt/x86/pitch_sse.c b/celt/x86/pitch_sse.c
index 379364440..8fa47d330 100644
--- a/celt/x86/pitch_sse.c
+++ b/celt/x86/pitch_sse.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "macros.h"
@@ -37,148 +37,134 @@
 
 #if defined(OAC_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)
 
-#include <xmmintrin.h>
-#include "arch.h"
-
-void xcorr_kernel_sse(const oac_val16 *x, const oac_val16 *y, oac_val32 sum[4], int len)
-{
-   int j;
-   __m128 xsum1, xsum2;
-   xsum1 = _mm_loadu_ps(sum);
-   xsum2 = _mm_setzero_ps();
-
-   for (j = 0; j < len-3; j += 4)
-   {
-      __m128 x0 = _mm_loadu_ps(x+j);
-      __m128 yj = _mm_loadu_ps(y+j);
-      __m128 y3 = _mm_loadu_ps(y+j+3);
-
-      xsum1 = _mm_add_ps(xsum1,_mm_mul_ps(_mm_shuffle_ps(x0,x0,0x00),yj));
-      xsum2 = _mm_add_ps(xsum2,_mm_mul_ps(_mm_shuffle_ps(x0,x0,0x55),
-                                          _mm_shuffle_ps(yj,y3,0x49)));
-      xsum1 = _mm_add_ps(xsum1,_mm_mul_ps(_mm_shuffle_ps(x0,x0,0xaa),
-                                          _mm_shuffle_ps(yj,y3,0x9e)));
-      xsum2 = _mm_add_ps(xsum2,_mm_mul_ps(_mm_shuffle_ps(x0,x0,0xff),y3));
-   }
-   if (j < len)
-   {
-      xsum1 = _mm_add_ps(xsum1,_mm_mul_ps(_mm_load1_ps(x+j),_mm_loadu_ps(y+j)));
-      if (++j < len)
-      {
-         xsum2 = _mm_add_ps(xsum2,_mm_mul_ps(_mm_load1_ps(x+j),_mm_loadu_ps(y+j)));
-         if (++j < len)
-         {
-            xsum1 = _mm_add_ps(xsum1,_mm_mul_ps(_mm_load1_ps(x+j),_mm_loadu_ps(y+j)));
-         }
-      }
-   }
-   _mm_storeu_ps(sum,_mm_add_ps(xsum1,xsum2));
+# include <xmmintrin.h>
+# include "arch.h"
+
+void xcorr_kernel_sse(const oac_val16 *x, const oac_val16 *y, oac_val32 sum[4], int len) {
+    int j;
+    __m128 xsum1, xsum2;
+    xsum1 = _mm_loadu_ps(sum);
+    xsum2 = _mm_setzero_ps();
+
+    for (j = 0; j < len - 3; j += 4) {
+        __m128 x0 = _mm_loadu_ps(x + j);
+        __m128 yj = _mm_loadu_ps(y + j);
+        __m128 y3 = _mm_loadu_ps(y + j + 3);
+
+        xsum1 = _mm_add_ps(xsum1, _mm_mul_ps(_mm_shuffle_ps(x0, x0, 0x00), yj));
+        xsum2 = _mm_add_ps(xsum2, _mm_mul_ps(_mm_shuffle_ps(x0, x0, 0x55),
+                                          _mm_shuffle_ps(yj, y3, 0x49)));
+        xsum1 = _mm_add_ps(xsum1, _mm_mul_ps(_mm_shuffle_ps(x0, x0, 0xaa),
+                                          _mm_shuffle_ps(yj, y3, 0x9e)));
+        xsum2 = _mm_add_ps(xsum2, _mm_mul_ps(_mm_shuffle_ps(x0, x0, 0xff), y3));
+    }
+    if (j < len) {
+        xsum1 = _mm_add_ps(xsum1, _mm_mul_ps(_mm_load1_ps(x + j), _mm_loadu_ps(y + j)));
+        if (++j < len) {
+            xsum2 = _mm_add_ps(xsum2, _mm_mul_ps(_mm_load1_ps(x + j), _mm_loadu_ps(y + j)));
+            if (++j < len) {
+                xsum1 = _mm_add_ps(xsum1, _mm_mul_ps(_mm_load1_ps(x + j), _mm_loadu_ps(y + j)));
+            }
+        }
+    }
+    _mm_storeu_ps(sum, _mm_add_ps(xsum1, xsum2));
 }
 
 
 void dual_inner_prod_sse(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
-      int N, oac_val32 *xy1, oac_val32 *xy2)
-{
-   int i;
-   __m128 xsum1, xsum2;
-   xsum1 = _mm_setzero_ps();
-   xsum2 = _mm_setzero_ps();
-   for (i=0;i<N-3;i+=4)
-   {
-      __m128 xi = _mm_loadu_ps(x+i);
-      __m128 y1i = _mm_loadu_ps(y01+i);
-      __m128 y2i = _mm_loadu_ps(y02+i);
-      xsum1 = _mm_add_ps(xsum1,_mm_mul_ps(xi, y1i));
-      xsum2 = _mm_add_ps(xsum2,_mm_mul_ps(xi, y2i));
-   }
-   /* Horizontal sum */
-   xsum1 = _mm_add_ps(xsum1, _mm_movehl_ps(xsum1, xsum1));
-   xsum1 = _mm_add_ss(xsum1, _mm_shuffle_ps(xsum1, xsum1, 0x55));
-   _mm_store_ss(xy1, xsum1);
-   xsum2 = _mm_add_ps(xsum2, _mm_movehl_ps(xsum2, xsum2));
-   xsum2 = _mm_add_ss(xsum2, _mm_shuffle_ps(xsum2, xsum2, 0x55));
-   _mm_store_ss(xy2, xsum2);
-   for (;i<N;i++)
-   {
-      *xy1 = MAC16_16(*xy1, x[i], y01[i]);
-      *xy2 = MAC16_16(*xy2, x[i], y02[i]);
-   }
+                         int N, oac_val32 *xy1, oac_val32 *xy2) {
+    int i;
+    __m128 xsum1, xsum2;
+    xsum1 = _mm_setzero_ps();
+    xsum2 = _mm_setzero_ps();
+    for (i = 0; i < N - 3; i += 4) {
+        __m128 xi = _mm_loadu_ps(x + i);
+        __m128 y1i = _mm_loadu_ps(y01 + i);
+        __m128 y2i = _mm_loadu_ps(y02 + i);
+        xsum1 = _mm_add_ps(xsum1, _mm_mul_ps(xi, y1i));
+        xsum2 = _mm_add_ps(xsum2, _mm_mul_ps(xi, y2i));
+    }
+    /* Horizontal sum */
+    xsum1 = _mm_add_ps(xsum1, _mm_movehl_ps(xsum1, xsum1));
+    xsum1 = _mm_add_ss(xsum1, _mm_shuffle_ps(xsum1, xsum1, 0x55));
+    _mm_store_ss(xy1, xsum1);
+    xsum2 = _mm_add_ps(xsum2, _mm_movehl_ps(xsum2, xsum2));
+    xsum2 = _mm_add_ss(xsum2, _mm_shuffle_ps(xsum2, xsum2, 0x55));
+    _mm_store_ss(xy2, xsum2);
+    for (; i < N; i++) {
+        *xy1 = MAC16_16(*xy1, x[i], y01[i]);
+        *xy2 = MAC16_16(*xy2, x[i], y02[i]);
+    }
 }
 
 oac_val32 celt_inner_prod_sse(const oac_val16 *x, const oac_val16 *y,
-      int N)
-{
-   int i;
-   float xy;
-   __m128 sum;
-   sum = _mm_setzero_ps();
-   /* FIXME: We should probably go 8-way and use 2 sums. */
-   for (i=0;i<N-3;i+=4)
-   {
-      __m128 xi = _mm_loadu_ps(x+i);
-      __m128 yi = _mm_loadu_ps(y+i);
-      sum = _mm_add_ps(sum,_mm_mul_ps(xi, yi));
-   }
-   /* Horizontal sum */
-   sum = _mm_add_ps(sum, _mm_movehl_ps(sum, sum));
-   sum = _mm_add_ss(sum, _mm_shuffle_ps(sum, sum, 0x55));
-   _mm_store_ss(&xy, sum);
-   for (;i<N;i++)
-   {
-      xy = MAC16_16(xy, x[i], y[i]);
-   }
-   return xy;
+                              int N) {
+    int i;
+    float xy;
+    __m128 sum;
+    sum = _mm_setzero_ps();
+    /* FIXME: We should probably go 8-way and use 2 sums. */
+    for (i = 0; i < N - 3; i += 4) {
+        __m128 xi = _mm_loadu_ps(x + i);
+        __m128 yi = _mm_loadu_ps(y + i);
+        sum = _mm_add_ps(sum, _mm_mul_ps(xi, yi));
+    }
+    /* Horizontal sum */
+    sum = _mm_add_ps(sum, _mm_movehl_ps(sum, sum));
+    sum = _mm_add_ss(sum, _mm_shuffle_ps(sum, sum, 0x55));
+    _mm_store_ss(&xy, sum);
+    for (; i < N; i++) {
+        xy = MAC16_16(xy, x[i], y[i]);
+    }
+    return xy;
 }
 
 void comb_filter_const_sse(oac_val32 *y, oac_val32 *x, int T, int N,
-      oac_val16 g10, oac_val16 g11, oac_val16 g12)
-{
-   int i;
-   __m128 x0v;
-   __m128 g10v, g11v, g12v;
-   g10v = _mm_load1_ps(&g10);
-   g11v = _mm_load1_ps(&g11);
-   g12v = _mm_load1_ps(&g12);
-   x0v = _mm_loadu_ps(&x[-T-2]);
-   for (i=0;i<N-3;i+=4)
-   {
-      __m128 yi, yi2, x1v, x2v, x3v, x4v;
-      const oac_val32 *xp = &x[i-T-2];
-      yi = _mm_loadu_ps(x+i);
-      x4v = _mm_loadu_ps(xp+4);
-#if 0
-      /* Slower version with all loads */
-      x1v = _mm_loadu_ps(xp+1);
-      x2v = _mm_loadu_ps(xp+2);
-      x3v = _mm_loadu_ps(xp+3);
-#else
-      x2v = _mm_shuffle_ps(x0v, x4v, 0x4e);
-      x1v = _mm_shuffle_ps(x0v, x2v, 0x99);
-      x3v = _mm_shuffle_ps(x2v, x4v, 0x99);
-#endif
-
-      yi = _mm_add_ps(yi, _mm_mul_ps(g10v,x2v));
-#if 0 /* Set to 1 to make it bit-exact with the non-SSE version */
-      yi = _mm_add_ps(yi, _mm_mul_ps(g11v,_mm_add_ps(x3v,x1v)));
-      yi = _mm_add_ps(yi, _mm_mul_ps(g12v,_mm_add_ps(x4v,x0v)));
-#else
-      /* Use partial sums */
-      yi2 = _mm_add_ps(_mm_mul_ps(g11v,_mm_add_ps(x3v,x1v)),
-                       _mm_mul_ps(g12v,_mm_add_ps(x4v,x0v)));
-      yi = _mm_add_ps(yi, yi2);
-#endif
-      x0v=x4v;
-      _mm_storeu_ps(y+i, yi);
-   }
-#ifdef CUSTOM_MODES
-   for (;i<N;i++)
-   {
-      y[i] = x[i]
-               + MULT16_32_Q15(g10,x[i-T])
-               + MULT16_32_Q15(g11,ADD32(x[i-T+1],x[i-T-1]))
-               + MULT16_32_Q15(g12,ADD32(x[i-T+2],x[i-T-2]));
-   }
-#endif
+                           oac_val16 g10, oac_val16 g11, oac_val16 g12) {
+    int i;
+    __m128 x0v;
+    __m128 g10v, g11v, g12v;
+    g10v = _mm_load1_ps(&g10);
+    g11v = _mm_load1_ps(&g11);
+    g12v = _mm_load1_ps(&g12);
+    x0v = _mm_loadu_ps(&x[-T - 2]);
+    for (i = 0; i < N - 3; i += 4) {
+        __m128 yi, yi2, x1v, x2v, x3v, x4v;
+        const oac_val32 *xp = &x[i - T - 2];
+        yi = _mm_loadu_ps(x + i);
+        x4v = _mm_loadu_ps(xp + 4);
+# if 0
+        /* Slower version with all loads */
+        x1v = _mm_loadu_ps(xp + 1);
+        x2v = _mm_loadu_ps(xp + 2);
+        x3v = _mm_loadu_ps(xp + 3);
+# else
+        x2v = _mm_shuffle_ps(x0v, x4v, 0x4e);
+        x1v = _mm_shuffle_ps(x0v, x2v, 0x99);
+        x3v = _mm_shuffle_ps(x2v, x4v, 0x99);
+# endif
+
+        yi = _mm_add_ps(yi, _mm_mul_ps(g10v, x2v));
+# if 0 /* Set to 1 to make it bit-exact with the non-SSE version */
+        yi = _mm_add_ps(yi, _mm_mul_ps(g11v, _mm_add_ps(x3v, x1v)));
+        yi = _mm_add_ps(yi, _mm_mul_ps(g12v, _mm_add_ps(x4v, x0v)));
+# else
+        /* Use partial sums */
+        yi2 = _mm_add_ps(_mm_mul_ps(g11v, _mm_add_ps(x3v, x1v)),
+                       _mm_mul_ps(g12v, _mm_add_ps(x4v, x0v)));
+        yi = _mm_add_ps(yi, yi2);
+# endif
+        x0v = x4v;
+        _mm_storeu_ps(y + i, yi);
+    }
+# ifdef CUSTOM_MODES
+    for (; i < N; i++) {
+        y[i] = x[i]
+               + MULT16_32_Q15(g10, x[i - T])
+               + MULT16_32_Q15(g11, ADD32(x[i - T + 1], x[i - T - 1]))
+               + MULT16_32_Q15(g12, ADD32(x[i - T + 2], x[i - T - 2]));
+    }
+# endif
 }
 
 
diff --git a/celt/x86/pitch_sse.h b/celt/x86/pitch_sse.h
index f028dc4aa..da0988dd4 100644
--- a/celt/x86/pitch_sse.h
+++ b/celt/x86/pitch_sse.h
@@ -28,52 +28,53 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef PITCH_SSE_H
 #define PITCH_SSE_H
 
 #if defined(HAVE_CONFIG_H)
-#include "config.h"
+# include "config.h"
 #endif
 
 #if defined(OAC_X86_MAY_HAVE_SSE4_1) && defined(FIXED_POINT)
 void xcorr_kernel_sse4_1(
-                    const oac_int16 *x,
-                    const oac_int16 *y,
-                    oac_val32       sum[4],
-                    int              len);
+    const oac_int16 *x,
+    const oac_int16 *y,
+    oac_val32 sum[4],
+    int len);
 #endif
 
 #if defined(OAC_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)
 void xcorr_kernel_sse(
-                    const oac_val16 *x,
-                    const oac_val16 *y,
-                    oac_val32       sum[4],
-                    int              len);
+    const oac_val16 *x,
+    const oac_val16 *y,
+    oac_val32 sum[4],
+    int len);
 #endif
 
 #if defined(OAC_X86_PRESUME_SSE4_1) && defined(FIXED_POINT)
-#define OVERRIDE_XCORR_KERNEL
-#define xcorr_kernel(x, y, sum, len, arch) \
-    ((void)arch, xcorr_kernel_sse4_1(x, y, sum, len))
+# define OVERRIDE_XCORR_KERNEL
+# define xcorr_kernel(x, y, sum, len, arch) \
+        ((void)arch, xcorr_kernel_sse4_1(x, y, sum, len))
 
 #elif defined(OAC_X86_PRESUME_SSE) && !defined(FIXED_POINT)
-#define OVERRIDE_XCORR_KERNEL
-#define xcorr_kernel(x, y, sum, len, arch) \
-    ((void)arch, xcorr_kernel_sse(x, y, sum, len))
+# define OVERRIDE_XCORR_KERNEL
+# define xcorr_kernel(x, y, sum, len, arch) \
+        ((void)arch, xcorr_kernel_sse(x, y, sum, len))
 
-#elif defined(OAC_HAVE_RTCD) &&  ((defined(OAC_X86_MAY_HAVE_SSE4_1) && defined(FIXED_POINT)) || (defined(OAC_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)))
+#elif defined(OAC_HAVE_RTCD) &&  ((defined(OAC_X86_MAY_HAVE_SSE4_1) && defined(FIXED_POINT)) \
+    || (defined(OAC_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)))
 
 extern void (*const XCORR_KERNEL_IMPL[OAC_ARCHMASK + 1])(
                     const oac_val16 *x,
                     const oac_val16 *y,
-                    oac_val32       sum[4],
-                    int              len);
+                    oac_val32 sum[4],
+                    int len);
 
-#define OVERRIDE_XCORR_KERNEL
-#define xcorr_kernel(x, y, sum, len, arch) \
-    ((*XCORR_KERNEL_IMPL[(arch) & OAC_ARCHMASK])(x, y, sum, len))
+# define OVERRIDE_XCORR_KERNEL
+# define xcorr_kernel(x, y, sum, len, arch) \
+        ((*XCORR_KERNEL_IMPL[(arch)&OAC_ARCHMASK])(x, y, sum, len))
 
 #endif
 
@@ -81,51 +82,52 @@ extern void (*const XCORR_KERNEL_IMPL[OAC_ARCHMASK + 1])(
 oac_val32 celt_inner_prod_sse4_1(
     const oac_int16 *x,
     const oac_int16 *y,
-    int               N);
+    int N);
 #endif
 
 #if defined(OAC_X86_MAY_HAVE_SSE2) && defined(FIXED_POINT)
 oac_val32 celt_inner_prod_sse2(
     const oac_int16 *x,
     const oac_int16 *y,
-    int               N);
+    int N);
 #endif
 
 #if defined(OAC_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)
 oac_val32 celt_inner_prod_sse(
     const oac_val16 *x,
     const oac_val16 *y,
-    int               N);
+    int N);
 #endif
 
 
 #if defined(OAC_X86_PRESUME_SSE4_1) && defined(FIXED_POINT)
-#define OVERRIDE_CELT_INNER_PROD
-#define celt_inner_prod(x, y, N, arch) \
-    ((void)arch, celt_inner_prod_sse4_1(x, y, N))
+# define OVERRIDE_CELT_INNER_PROD
+# define celt_inner_prod(x, y, N, arch) \
+        ((void)arch, celt_inner_prod_sse4_1(x, y, N))
 
 #elif defined(OAC_X86_PRESUME_SSE2) && defined(FIXED_POINT) && !defined(OAC_X86_MAY_HAVE_SSE4_1)
-#define OVERRIDE_CELT_INNER_PROD
-#define celt_inner_prod(x, y, N, arch) \
-    ((void)arch, celt_inner_prod_sse2(x, y, N))
+# define OVERRIDE_CELT_INNER_PROD
+# define celt_inner_prod(x, y, N, arch) \
+        ((void)arch, celt_inner_prod_sse2(x, y, N))
 
 #elif defined(OAC_X86_PRESUME_SSE) && !defined(FIXED_POINT)
-#define OVERRIDE_CELT_INNER_PROD
-#define celt_inner_prod(x, y, N, arch) \
-    ((void)arch, celt_inner_prod_sse(x, y, N))
+# define OVERRIDE_CELT_INNER_PROD
+# define celt_inner_prod(x, y, N, arch) \
+        ((void)arch, celt_inner_prod_sse(x, y, N))
 
 
-#elif defined(OAC_HAVE_RTCD) && (((defined(OAC_X86_MAY_HAVE_SSE4_1) || defined(OAC_X86_MAY_HAVE_SSE2)) && defined(FIXED_POINT)) || \
+#elif defined(OAC_HAVE_RTCD) && (((defined(OAC_X86_MAY_HAVE_SSE4_1) || defined(OAC_X86_MAY_HAVE_SSE2)) \
+    && defined(FIXED_POINT)) || \
     (defined(OAC_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)))
 
 extern oac_val32 (*const CELT_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(
                     const oac_val16 *x,
                     const oac_val16 *y,
-                    int               N);
+                    int N);
 
-#define OVERRIDE_CELT_INNER_PROD
-#define celt_inner_prod(x, y, N, arch) \
-    ((*CELT_INNER_PROD_IMPL[(arch) & OAC_ARCHMASK])(x, y, N))
+# define OVERRIDE_CELT_INNER_PROD
+# define celt_inner_prod(x, y, N, arch) \
+        ((*CELT_INNER_PROD_IMPL[(arch)&OAC_ARCHMASK])(x, y, N))
 
 #endif
 
@@ -134,68 +136,68 @@ extern oac_val32 (*const CELT_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(
 void dual_inner_prod_sse(const oac_val16 *x,
     const oac_val16 *y01,
     const oac_val16 *y02,
-    int               N,
+    int N,
     oac_val32       *xy1,
     oac_val32       *xy2);
 
 void comb_filter_const_sse(oac_val32 *y,
     oac_val32 *x,
-    int         T,
-    int         N,
-    oac_val16  g10,
-    oac_val16  g11,
-    oac_val16  g12);
+    int T,
+    int N,
+    oac_val16 g10,
+    oac_val16 g11,
+    oac_val16 g12);
 
 
-#if defined(OAC_X86_PRESUME_SSE)
-#define OVERRIDE_DUAL_INNER_PROD
-#define OVERRIDE_COMB_FILTER_CONST
-# define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) \
-    ((void)(arch),dual_inner_prod_sse(x, y01, y02, N, xy1, xy2))
+# if defined(OAC_X86_PRESUME_SSE)
+#  define OVERRIDE_DUAL_INNER_PROD
+#  define OVERRIDE_COMB_FILTER_CONST
+#  define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) \
+        ((void)(arch), dual_inner_prod_sse(x, y01, y02, N, xy1, xy2))
 
-# define comb_filter_const(y, x, T, N, g10, g11, g12, arch) \
-    ((void)(arch),comb_filter_const_sse(y, x, T, N, g10, g11, g12))
-#elif defined(OAC_HAVE_RTCD)
+#  define comb_filter_const(y, x, T, N, g10, g11, g12, arch) \
+        ((void)(arch), comb_filter_const_sse(y, x, T, N, g10, g11, g12))
+# elif defined(OAC_HAVE_RTCD)
 
-#define OVERRIDE_DUAL_INNER_PROD
-#define OVERRIDE_COMB_FILTER_CONST
+#  define OVERRIDE_DUAL_INNER_PROD
+#  define OVERRIDE_COMB_FILTER_CONST
 extern void (*const DUAL_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(
               const oac_val16 *x,
               const oac_val16 *y01,
               const oac_val16 *y02,
-              int               N,
+              int N,
               oac_val32       *xy1,
               oac_val32       *xy2);
 
-#define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) \
-    ((*DUAL_INNER_PROD_IMPL[(arch) & OAC_ARCHMASK])(x, y01, y02, N, xy1, xy2))
+#  define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) \
+        ((*DUAL_INNER_PROD_IMPL[(arch)&OAC_ARCHMASK])(x, y01, y02, N, xy1, xy2))
 
 extern void (*const COMB_FILTER_CONST_IMPL[OAC_ARCHMASK + 1])(
               oac_val32 *y,
               oac_val32 *x,
-              int         T,
-              int         N,
-              oac_val16  g10,
-              oac_val16  g11,
-              oac_val16  g12);
+              int T,
+              int N,
+              oac_val16 g10,
+              oac_val16 g11,
+              oac_val16 g12);
 
-#define comb_filter_const(y, x, T, N, g10, g11, g12, arch) \
-    ((*COMB_FILTER_CONST_IMPL[(arch) & OAC_ARCHMASK])(y, x, T, N, g10, g11, g12))
+#  define comb_filter_const(y, x, T, N, g10, g11, g12, arch) \
+        ((*COMB_FILTER_CONST_IMPL[(arch)&OAC_ARCHMASK])(y, x, T, N, g10, g11, g12))
 
-#define NON_STATIC_COMB_FILTER_CONST_C
+#  define NON_STATIC_COMB_FILTER_CONST_C
 
-#endif
+# endif
 
 void celt_pitch_xcorr_avx2(const float *_x, const float *_y, float *xcorr, int len, int max_pitch, int arch);
 
-#if defined(OAC_X86_PRESUME_AVX2)
+# if defined(OAC_X86_PRESUME_AVX2)
 
-#define OVERRIDE_PITCH_XCORR
-# define celt_pitch_xcorr celt_pitch_xcorr_avx2
+#  define OVERRIDE_PITCH_XCORR
+#  define celt_pitch_xcorr celt_pitch_xcorr_avx2
 
-#elif defined(OAC_HAVE_RTCD) && defined(OAC_X86_MAY_HAVE_AVX2)
+# elif defined(OAC_HAVE_RTCD) && defined(OAC_X86_MAY_HAVE_AVX2)
 
-#define OVERRIDE_PITCH_XCORR
+#  define OVERRIDE_PITCH_XCORR
 extern void (*const PITCH_XCORR_IMPL[OAC_ARCHMASK + 1])(
               const float *_x,
               const float *_y,
@@ -203,13 +205,13 @@ extern void (*const PITCH_XCORR_IMPL[OAC_ARCHMASK + 1])(
               int len,
               int max_pitch,
               int arch
-              );
+    );
 
-#define celt_pitch_xcorr(_x, _y, xcorr, len, max_pitch, arch) \
-    ((*PITCH_XCORR_IMPL[(arch) & OAC_ARCHMASK])(_x, _y, xcorr, len, max_pitch, arch))
+#  define celt_pitch_xcorr(_x, _y, xcorr, len, max_pitch, arch) \
+        ((*PITCH_XCORR_IMPL[(arch)&OAC_ARCHMASK])(_x, _y, xcorr, len, max_pitch, arch))
 
 
-#endif /* OAC_X86_PRESUME_AVX2 && !OAC_HAVE_RTCD */
+# endif /* OAC_X86_PRESUME_AVX2 && !OAC_HAVE_RTCD */
 
 #endif /* OAC_X86_MAY_HAVE_SSE && !FIXED_POINT */
 
diff --git a/celt/x86/pitch_sse2.c b/celt/x86/pitch_sse2.c
index 946d53ea5..800d15e92 100644
--- a/celt/x86/pitch_sse2.c
+++ b/celt/x86/pitch_sse2.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <xmmintrin.h>
@@ -40,22 +40,20 @@
 
 #if defined(OAC_X86_MAY_HAVE_SSE2) && defined(FIXED_POINT)
 oac_val32 celt_inner_prod_sse2(const oac_val16 *x, const oac_val16 *y,
-      int N)
-{
-    oac_int  i, dataSize16;
+                               int N) {
+    oac_int i, dataSize16;
     oac_int32 sum;
 
     __m128i inVec1_76543210, inVec1_FEDCBA98, acc1;
     __m128i inVec2_76543210, inVec2_FEDCBA98, acc2;
 
     sum = 0;
-    dataSize16 = N & ~15;
+    dataSize16 = N&~15;
 
     acc1 = _mm_setzero_si128();
     acc2 = _mm_setzero_si128();
 
-    for (i=0;i<dataSize16;i+=16)
-    {
+    for (i = 0; i < dataSize16; i += 16) {
         inVec1_76543210 = _mm_loadu_si128((__m128i *)(void*)(&x[i + 0]));
         inVec2_76543210 = _mm_loadu_si128((__m128i *)(void*)(&y[i + 0]));
 
@@ -71,8 +69,7 @@ oac_val32 celt_inner_prod_sse2(const oac_val16 *x, const oac_val16 *y,
 
     acc1 = _mm_add_epi32( acc1, acc2 );
 
-    if (N - i >= 8)
-    {
+    if (N - i >= 8) {
         inVec1_76543210 = _mm_loadu_si128((__m128i *)(void*)(&x[i + 0]));
         inVec2_76543210 = _mm_loadu_si128((__m128i *)(void*)(&y[i + 0]));
 
@@ -86,7 +83,7 @@ oac_val32 celt_inner_prod_sse2(const oac_val16 *x, const oac_val16 *y,
     acc1 = _mm_add_epi32(acc1, _mm_shufflelo_epi16( acc1, 0x0E));
     sum += _mm_cvtsi128_si32(acc1);
 
-    for (;i<N;i++) {
+    for (; i < N; i++) {
         sum = silk_SMLABB(sum, x[i], y[i]);
     }
 
diff --git a/celt/x86/pitch_sse4_1.c b/celt/x86/pitch_sse4_1.c
index efb9cd4ee..5d03705f2 100644
--- a/celt/x86/pitch_sse4_1.c
+++ b/celt/x86/pitch_sse4_1.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <xmmintrin.h>
@@ -39,25 +39,24 @@
 #include "pitch.h"
 
 #if defined(OAC_X86_MAY_HAVE_SSE4_1) && defined(FIXED_POINT)
-#include <smmintrin.h>
-#include "x86cpu.h"
+# include <smmintrin.h>
+# include "x86cpu.h"
 
 oac_val32 celt_inner_prod_sse4_1(const oac_val16 *x, const oac_val16 *y,
-      int N)
-{
-    oac_int  i, dataSize16;
+                                 int N) {
+    oac_int i, dataSize16;
     oac_int32 sum;
     __m128i inVec1_76543210, inVec1_FEDCBA98, acc1;
     __m128i inVec2_76543210, inVec2_FEDCBA98, acc2;
     __m128i inVec1_3210, inVec2_3210;
 
     sum = 0;
-    dataSize16 = N & ~15;
+    dataSize16 = N&~15;
 
     acc1 = _mm_setzero_si128();
     acc2 = _mm_setzero_si128();
 
-    for (i=0;i<dataSize16;i+=16) {
+    for (i = 0; i < dataSize16; i += 16) {
         inVec1_76543210 = _mm_loadu_si128((__m128i *)(void*)(&x[i + 0]));
         inVec2_76543210 = _mm_loadu_si128((__m128i *)(void*)(&y[i + 0]));
 
@@ -73,8 +72,7 @@ oac_val32 celt_inner_prod_sse4_1(const oac_val16 *x, const oac_val16 *y,
 
     acc1 = _mm_add_epi32(acc1, acc2);
 
-    if (N - i >= 8)
-    {
+    if (N - i >= 8) {
         inVec1_76543210 = _mm_loadu_si128((__m128i *)(void*)(&x[i + 0]));
         inVec2_76543210 = _mm_loadu_si128((__m128i *)(void*)(&y[i + 0]));
 
@@ -84,8 +82,7 @@ oac_val32 celt_inner_prod_sse4_1(const oac_val16 *x, const oac_val16 *y,
         i += 8;
     }
 
-    if (N - i >= 4)
-    {
+    if (N - i >= 4) {
         inVec1_3210 = OP_CVTEPI16_EPI32_M64(&x[i + 0]);
         inVec2_3210 = OP_CVTEPI16_EPI32_M64(&y[i + 0]);
 
@@ -100,16 +97,14 @@ oac_val32 celt_inner_prod_sse4_1(const oac_val16 *x, const oac_val16 *y,
 
     sum += _mm_cvtsi128_si32(acc1);
 
-    for (;i<N;i++)
-    {
+    for (; i < N; i++) {
         sum = silk_SMLABB(sum, x[i], y[i]);
     }
 
     return sum;
 }
 
-void xcorr_kernel_sse4_1(const oac_val16 * x, const oac_val16 * y, oac_val32 sum[ 4 ], int len)
-{
+void xcorr_kernel_sse4_1(const oac_val16 * x, const oac_val16 * y, oac_val32 sum[ 4 ], int len) {
     int j;
 
     __m128i vecX, vecX0, vecX1, vecX2, vecX3;
@@ -117,13 +112,13 @@ void xcorr_kernel_sse4_1(const oac_val16 * x, const oac_val16 * y, oac_val32 sum
     __m128i sum0, sum1, sum2, sum3, vecSum;
     __m128i initSum;
 
-#ifdef OAC_CHECK_ASM
+# ifdef OAC_CHECK_ASM
     oac_val32 sum_c[4];
-    for (j=0;j<4;j++) {
-      sum_c[j] = sum[j];
+    for (j = 0; j < 4; j++) {
+        sum_c[j] = sum[j];
     }
     xcorr_kernel_c(x, y, sum_c, len);
-#endif
+# endif
 
     celt_assert(len >= 3);
 
@@ -132,8 +127,7 @@ void xcorr_kernel_sse4_1(const oac_val16 * x, const oac_val16 * y, oac_val32 sum
     sum2 = _mm_setzero_si128();
     sum3 = _mm_setzero_si128();
 
-    for (j=0;j<(len-7);j+=8)
-    {
+    for (j = 0; j < (len - 7); j += 8) {
         vecX = _mm_loadu_si128((__m128i *)(void*)(&x[j + 0]));
         vecY0 = _mm_loadu_si128((__m128i *)(void*)(&y[j + 0]));
         vecY1 = _mm_loadu_si128((__m128i *)(void*)(&y[j + 1]));
@@ -161,8 +155,7 @@ void xcorr_kernel_sse4_1(const oac_val16 * x, const oac_val16 * y, oac_val32 sum
     vecSum = _mm_unpacklo_epi64(_mm_unpacklo_epi32(sum0, sum1),
           _mm_unpacklo_epi32(sum2, sum3));
 
-    for (;j<(len-3);j+=4)
-    {
+    for (; j < (len - 3); j += 4) {
         vecX = OP_CVTEPI16_EPI32_M64(&x[j + 0]);
         vecX0 = _mm_shuffle_epi32(vecX, 0x00);
         vecX1 = _mm_shuffle_epi32(vecX, 0x55);
@@ -186,8 +179,7 @@ void xcorr_kernel_sse4_1(const oac_val16 * x, const oac_val16 * y, oac_val32 sum
     }
 
     vecX = OP_CVTEPI16_EPI32_M64(&x[len - 4]);
-    if (len - j == 3)
-    {
+    if (len - j == 3) {
         vecX0 = _mm_shuffle_epi32(vecX, 0x55);
         vecX1 = _mm_shuffle_epi32(vecX, 0xaa);
         vecX2 = _mm_shuffle_epi32(vecX, 0xff);
@@ -203,9 +195,7 @@ void xcorr_kernel_sse4_1(const oac_val16 * x, const oac_val16 * y, oac_val32 sum
         vecSum = _mm_add_epi32(vecSum, sum0);
         vecSum = _mm_add_epi32(vecSum, sum1);
         vecSum = _mm_add_epi32(vecSum, sum2);
-    }
-    else if (len - j == 2)
-    {
+    } else if (len - j == 2)   {
         vecX0 = _mm_shuffle_epi32(vecX, 0xaa);
         vecX1 = _mm_shuffle_epi32(vecX, 0xff);
 
@@ -217,9 +207,7 @@ void xcorr_kernel_sse4_1(const oac_val16 * x, const oac_val16 * y, oac_val32 sum
 
         vecSum = _mm_add_epi32(vecSum, sum0);
         vecSum = _mm_add_epi32(vecSum, sum1);
-    }
-    else if (len - j == 1)
-    {
+    } else if (len - j == 1)   {
         vecX0 = _mm_shuffle_epi32(vecX, 0xff);
 
         vecY0 = OP_CVTEPI16_EPI32_M64(&y[j + 0]);
@@ -233,8 +221,8 @@ void xcorr_kernel_sse4_1(const oac_val16 * x, const oac_val16 * y, oac_val32 sum
     initSum = _mm_add_epi32(initSum, vecSum);
     _mm_storeu_si128((__m128i *)(void*)sum, initSum);
 
-#ifdef OAC_CHECK_ASM
+# ifdef OAC_CHECK_ASM
     celt_assert(!memcmp(sum_c, sum, sizeof(sum_c)));
-#endif
+# endif
 }
 #endif
diff --git a/celt/x86/vq_sse.h b/celt/x86/vq_sse.h
index 77ef472c4..343c95115 100644
--- a/celt/x86/vq_sse.h
+++ b/celt/x86/vq_sse.h
@@ -22,7 +22,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef VQ_SSE_H
 #define VQ_SSE_H
@@ -31,22 +31,22 @@
 
 oac_val16 op_pvq_search_sse2(celt_norm *_X, int *iy, int K, int N, int arch);
 
-#if defined(OAC_X86_PRESUME_SSE2)
+# if defined(OAC_X86_PRESUME_SSE2)
 
-#define OVERRIDE_OP_PVQ_SEARCH
-#define op_pvq_search(x, iy, K, N, arch) \
-    (op_pvq_search_sse2(x, iy, K, N, arch))
+#  define OVERRIDE_OP_PVQ_SEARCH
+#  define op_pvq_search(x, iy, K, N, arch) \
+        (op_pvq_search_sse2(x, iy, K, N, arch))
 
-#elif defined(OAC_HAVE_RTCD)
+# elif defined(OAC_HAVE_RTCD)
 
-#define OVERRIDE_OP_PVQ_SEARCH
+#  define OVERRIDE_OP_PVQ_SEARCH
 extern oac_val16 (*const OP_PVQ_SEARCH_IMPL[OAC_ARCHMASK + 1])(
       celt_norm *_X, int *iy, int K, int N, int arch);
 
 #  define op_pvq_search(X, iy, K, N, arch) \
-    ((*OP_PVQ_SEARCH_IMPL[(arch) & OAC_ARCHMASK])(X, iy, K, N, arch))
+        ((*OP_PVQ_SEARCH_IMPL[(arch)&OAC_ARCHMASK])(X, iy, K, N, arch))
 
-#endif
+# endif
 #endif
 
 #endif
diff --git a/celt/x86/vq_sse2.c b/celt/x86/vq_sse2.c
index 0209a9e3e..c1b6018f1 100644
--- a/celt/x86/vq_sse2.c
+++ b/celt/x86/vq_sse2.c
@@ -24,10 +24,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <xmmintrin.h>
@@ -41,177 +41,168 @@
 
 #ifndef FIXED_POINT
 
-oac_val16 op_pvq_search_sse2(celt_norm *_X, int *iy, int K, int N, int arch)
-{
-   int i, j;
-   int pulsesLeft;
-   float xy, yy;
-   VARDECL(celt_norm, y);
-   VARDECL(celt_norm, X);
-   VARDECL(float, signy);
-   __m128 signmask;
-   __m128 sums;
-   __m128i fours;
-   SAVE_STACK;
-
-   (void)arch;
-   /* All bits set to zero, except for the sign bit. */
-   signmask = _mm_set_ps1(-0.f);
-   fours = _mm_set_epi32(4, 4, 4, 4);
-   ALLOC(y, N+3, celt_norm);
-   ALLOC(X, N+3, celt_norm);
-   ALLOC(signy, N+3, float);
-
-   OAC_COPY(X, _X, N);
-   X[N] = X[N+1] = X[N+2] = 0;
-   sums = _mm_setzero_ps();
-   for (j=0;j<N;j+=4)
-   {
-      __m128 x4, s4;
-      x4 = _mm_loadu_ps(&X[j]);
-      s4 = _mm_cmplt_ps(x4, _mm_setzero_ps());
-      /* Get rid of the sign */
-      x4 = _mm_andnot_ps(signmask, x4);
-      sums = _mm_add_ps(sums, x4);
-      /* Clear y and iy in case we don't do the projection. */
-      _mm_storeu_ps(&y[j], _mm_setzero_ps());
-      _mm_storeu_si128((__m128i*)(void*)&iy[j], _mm_setzero_si128());
-      _mm_storeu_ps(&X[j], x4);
-      _mm_storeu_ps(&signy[j], s4);
-   }
-   sums = _mm_add_ps(sums, _mm_shuffle_ps(sums, sums, _MM_SHUFFLE(1, 0, 3, 2)));
-   sums = _mm_add_ps(sums, _mm_shuffle_ps(sums, sums, _MM_SHUFFLE(2, 3, 0, 1)));
-
-   xy = yy = 0;
-
-   pulsesLeft = K;
-
-   /* Do a pre-search by projecting on the pyramid */
-   if (K > (N>>1))
-   {
-      __m128i pulses_sum;
-      __m128 yy4, xy4;
-      __m128 rcp4;
-      oac_val32 sum = _mm_cvtss_f32(sums);
-      /* If X is too small, just replace it with a pulse at 0 */
-      /* Prevents infinities and NaNs from causing too many pulses
-         to be allocated. 64 is an approximation of infinity here. */
-      if (!(sum > EPSILON && sum < 64))
-      {
-         X[0] = QCONST16(1.f,14);
-         j=1; do
-            X[j]=0;
-         while (++j<N);
-         sums = _mm_set_ps1(1.f);
-      }
-      /* Using K+e with e < 1 guarantees we cannot get more than K pulses. */
-      rcp4 = _mm_mul_ps(_mm_set_ps1((float)(K+.8)), _mm_rcp_ps(sums));
-      xy4 = yy4 = _mm_setzero_ps();
-      pulses_sum = _mm_setzero_si128();
-      for (j=0;j<N;j+=4)
-      {
-         __m128 rx4, x4, y4;
-         __m128i iy4;
-         x4 = _mm_loadu_ps(&X[j]);
-         rx4 = _mm_mul_ps(x4, rcp4);
-         iy4 = _mm_cvttps_epi32(rx4);
-         pulses_sum = _mm_add_epi32(pulses_sum, iy4);
-         _mm_storeu_si128((__m128i*)(void*)&iy[j], iy4);
-         y4 = _mm_cvtepi32_ps(iy4);
-         xy4 = _mm_add_ps(xy4, _mm_mul_ps(x4, y4));
-         yy4 = _mm_add_ps(yy4, _mm_mul_ps(y4, y4));
-         /* double the y[] vector so we don't have to do it in the search loop. */
-         _mm_storeu_ps(&y[j], _mm_add_ps(y4, y4));
-      }
-      pulses_sum = _mm_add_epi32(pulses_sum, _mm_shuffle_epi32(pulses_sum, _MM_SHUFFLE(1, 0, 3, 2)));
-      pulses_sum = _mm_add_epi32(pulses_sum, _mm_shuffle_epi32(pulses_sum, _MM_SHUFFLE(2, 3, 0, 1)));
-      pulsesLeft -= _mm_cvtsi128_si32(pulses_sum);
-      xy4 = _mm_add_ps(xy4, _mm_shuffle_ps(xy4, xy4, _MM_SHUFFLE(1, 0, 3, 2)));
-      xy4 = _mm_add_ps(xy4, _mm_shuffle_ps(xy4, xy4, _MM_SHUFFLE(2, 3, 0, 1)));
-      xy = _mm_cvtss_f32(xy4);
-      yy4 = _mm_add_ps(yy4, _mm_shuffle_ps(yy4, yy4, _MM_SHUFFLE(1, 0, 3, 2)));
-      yy4 = _mm_add_ps(yy4, _mm_shuffle_ps(yy4, yy4, _MM_SHUFFLE(2, 3, 0, 1)));
-      yy = _mm_cvtss_f32(yy4);
-   }
-   X[N] = X[N+1] = X[N+2] = -100;
-   y[N] = y[N+1] = y[N+2] = 100;
-   celt_sig_assert(pulsesLeft>=0);
-
-   /* This should never happen, but just in case it does (e.g. on silence)
-      we fill the first bin with pulses. */
-   if (pulsesLeft > N+3)
-   {
-      oac_val16 tmp = (oac_val16)pulsesLeft;
-      yy = MAC16_16(yy, tmp, tmp);
-      yy = MAC16_16(yy, tmp, y[0]);
-      iy[0] += pulsesLeft;
-      pulsesLeft=0;
-   }
-
-   for (i=0;i<pulsesLeft;i++)
-   {
-      int best_id;
-      __m128 xy4, yy4;
-      __m128 max, max2;
-      __m128i count;
-      __m128i pos;
-      /* The squared magnitude term gets added anyway, so we might as well
-         add it outside the loop */
-      yy = ADD16(yy, 1);
-      xy4 = _mm_load1_ps(&xy);
-      yy4 = _mm_load1_ps(&yy);
-      max = _mm_setzero_ps();
-      pos = _mm_setzero_si128();
-      count = _mm_set_epi32(3, 2, 1, 0);
-      for (j=0;j<N;j+=4)
-      {
-         __m128 x4, y4, r4;
-         x4 = _mm_loadu_ps(&X[j]);
-         y4 = _mm_loadu_ps(&y[j]);
-         x4 = _mm_add_ps(x4, xy4);
-         y4 = _mm_add_ps(y4, yy4);
-         y4 = _mm_rsqrt_ps(y4);
-         r4 = _mm_mul_ps(x4, y4);
-         /* Update the index of the max. */
-         pos = _mm_max_epi16(pos, _mm_and_si128(count, _mm_castps_si128(_mm_cmpgt_ps(r4, max))));
-         /* Update the max. */
-         max = _mm_max_ps(max, r4);
-         /* Update the indices (+4) */
-         count = _mm_add_epi32(count, fours);
-      }
-      /* Horizontal max */
-      max2 = _mm_max_ps(max, _mm_shuffle_ps(max, max, _MM_SHUFFLE(1, 0, 3, 2)));
-      max2 = _mm_max_ps(max2, _mm_shuffle_ps(max2, max2, _MM_SHUFFLE(2, 3, 0, 1)));
-      /* Now that max2 contains the max at all positions, look at which value(s) of the
-         partial max is equal to the global max. */
-      pos = _mm_and_si128(pos, _mm_castps_si128(_mm_cmpeq_ps(max, max2)));
-      pos = _mm_max_epi16(pos, _mm_unpackhi_epi64(pos, pos));
-      pos = _mm_max_epi16(pos, _mm_shufflelo_epi16(pos, _MM_SHUFFLE(1, 0, 3, 2)));
-      best_id = _mm_cvtsi128_si32(pos);
-
-      /* Updating the sums of the new pulse(s) */
-      xy = ADD32(xy, EXTEND32(X[best_id]));
-      /* We're multiplying y[j] by two so we don't have to do it here */
-      yy = ADD16(yy, y[best_id]);
-
-      /* Only now that we've made the final choice, update y/iy */
-      /* Multiplying y[j] by 2 so we don't have to do it everywhere else */
-      y[best_id] += 2;
-      iy[best_id]++;
-   }
-
-   /* Put the original sign back */
-   for (j=0;j<N;j+=4)
-   {
-      __m128i y4;
-      __m128i s4;
-      y4 = _mm_loadu_si128((__m128i*)(void*)&iy[j]);
-      s4 = _mm_castps_si128(_mm_loadu_ps(&signy[j]));
-      y4 = _mm_xor_si128(_mm_add_epi32(y4, s4), s4);
-      _mm_storeu_si128((__m128i*)(void*)&iy[j], y4);
-   }
-   RESTORE_STACK;
-   return yy;
+oac_val16 op_pvq_search_sse2(celt_norm *_X, int *iy, int K, int N, int arch) {
+    int i, j;
+    int pulsesLeft;
+    float xy, yy;
+    VARDECL(celt_norm, y);
+    VARDECL(celt_norm, X);
+    VARDECL(float, signy);
+    __m128 signmask;
+    __m128 sums;
+    __m128i fours;
+    SAVE_STACK;
+
+    (void)arch;
+    /* All bits set to zero, except for the sign bit. */
+    signmask = _mm_set_ps1(-0.f);
+    fours = _mm_set_epi32(4, 4, 4, 4);
+    ALLOC(y, N + 3, celt_norm);
+    ALLOC(X, N + 3, celt_norm);
+    ALLOC(signy, N + 3, float);
+
+    OAC_COPY(X, _X, N);
+    X[N] = X[N + 1] = X[N + 2] = 0;
+    sums = _mm_setzero_ps();
+    for (j = 0; j < N; j += 4) {
+        __m128 x4, s4;
+        x4 = _mm_loadu_ps(&X[j]);
+        s4 = _mm_cmplt_ps(x4, _mm_setzero_ps());
+        /* Get rid of the sign */
+        x4 = _mm_andnot_ps(signmask, x4);
+        sums = _mm_add_ps(sums, x4);
+        /* Clear y and iy in case we don't do the projection. */
+        _mm_storeu_ps(&y[j], _mm_setzero_ps());
+        _mm_storeu_si128((__m128i*)(void*)&iy[j], _mm_setzero_si128());
+        _mm_storeu_ps(&X[j], x4);
+        _mm_storeu_ps(&signy[j], s4);
+    }
+    sums = _mm_add_ps(sums, _mm_shuffle_ps(sums, sums, _MM_SHUFFLE(1, 0, 3, 2)));
+    sums = _mm_add_ps(sums, _mm_shuffle_ps(sums, sums, _MM_SHUFFLE(2, 3, 0, 1)));
+
+    xy = yy = 0;
+
+    pulsesLeft = K;
+
+    /* Do a pre-search by projecting on the pyramid */
+    if (K > (N>>1)) {
+        __m128i pulses_sum;
+        __m128 yy4, xy4;
+        __m128 rcp4;
+        oac_val32 sum = _mm_cvtss_f32(sums);
+        /* If X is too small, just replace it with a pulse at 0 */
+        /* Prevents infinities and NaNs from causing too many pulses
+           to be allocated. 64 is an approximation of infinity here. */
+        if (!(sum > EPSILON && sum < 64)) {
+            X[0] = QCONST16(1.f, 14);
+            j = 1; do
+                X[j] = 0;
+            while (++j < N);
+            sums = _mm_set_ps1(1.f);
+        }
+        /* Using K+e with e < 1 guarantees we cannot get more than K pulses. */
+        rcp4 = _mm_mul_ps(_mm_set_ps1((float)(K + .8)), _mm_rcp_ps(sums));
+        xy4 = yy4 = _mm_setzero_ps();
+        pulses_sum = _mm_setzero_si128();
+        for (j = 0; j < N; j += 4) {
+            __m128 rx4, x4, y4;
+            __m128i iy4;
+            x4 = _mm_loadu_ps(&X[j]);
+            rx4 = _mm_mul_ps(x4, rcp4);
+            iy4 = _mm_cvttps_epi32(rx4);
+            pulses_sum = _mm_add_epi32(pulses_sum, iy4);
+            _mm_storeu_si128((__m128i*)(void*)&iy[j], iy4);
+            y4 = _mm_cvtepi32_ps(iy4);
+            xy4 = _mm_add_ps(xy4, _mm_mul_ps(x4, y4));
+            yy4 = _mm_add_ps(yy4, _mm_mul_ps(y4, y4));
+            /* double the y[] vector so we don't have to do it in the search loop. */
+            _mm_storeu_ps(&y[j], _mm_add_ps(y4, y4));
+        }
+        pulses_sum = _mm_add_epi32(pulses_sum, _mm_shuffle_epi32(pulses_sum, _MM_SHUFFLE(1, 0, 3, 2)));
+        pulses_sum = _mm_add_epi32(pulses_sum, _mm_shuffle_epi32(pulses_sum, _MM_SHUFFLE(2, 3, 0, 1)));
+        pulsesLeft -= _mm_cvtsi128_si32(pulses_sum);
+        xy4 = _mm_add_ps(xy4, _mm_shuffle_ps(xy4, xy4, _MM_SHUFFLE(1, 0, 3, 2)));
+        xy4 = _mm_add_ps(xy4, _mm_shuffle_ps(xy4, xy4, _MM_SHUFFLE(2, 3, 0, 1)));
+        xy = _mm_cvtss_f32(xy4);
+        yy4 = _mm_add_ps(yy4, _mm_shuffle_ps(yy4, yy4, _MM_SHUFFLE(1, 0, 3, 2)));
+        yy4 = _mm_add_ps(yy4, _mm_shuffle_ps(yy4, yy4, _MM_SHUFFLE(2, 3, 0, 1)));
+        yy = _mm_cvtss_f32(yy4);
+    }
+    X[N] = X[N + 1] = X[N + 2] = -100;
+    y[N] = y[N + 1] = y[N + 2] = 100;
+    celt_sig_assert(pulsesLeft >= 0);
+
+    /* This should never happen, but just in case it does (e.g. on silence)
+       we fill the first bin with pulses. */
+    if (pulsesLeft > N + 3) {
+        oac_val16 tmp = (oac_val16)pulsesLeft;
+        yy = MAC16_16(yy, tmp, tmp);
+        yy = MAC16_16(yy, tmp, y[0]);
+        iy[0] += pulsesLeft;
+        pulsesLeft = 0;
+    }
+
+    for (i = 0; i < pulsesLeft; i++) {
+        int best_id;
+        __m128 xy4, yy4;
+        __m128 max, max2;
+        __m128i count;
+        __m128i pos;
+        /* The squared magnitude term gets added anyway, so we might as well
+           add it outside the loop */
+        yy = ADD16(yy, 1);
+        xy4 = _mm_load1_ps(&xy);
+        yy4 = _mm_load1_ps(&yy);
+        max = _mm_setzero_ps();
+        pos = _mm_setzero_si128();
+        count = _mm_set_epi32(3, 2, 1, 0);
+        for (j = 0; j < N; j += 4) {
+            __m128 x4, y4, r4;
+            x4 = _mm_loadu_ps(&X[j]);
+            y4 = _mm_loadu_ps(&y[j]);
+            x4 = _mm_add_ps(x4, xy4);
+            y4 = _mm_add_ps(y4, yy4);
+            y4 = _mm_rsqrt_ps(y4);
+            r4 = _mm_mul_ps(x4, y4);
+            /* Update the index of the max. */
+            pos = _mm_max_epi16(pos, _mm_and_si128(count, _mm_castps_si128(_mm_cmpgt_ps(r4, max))));
+            /* Update the max. */
+            max = _mm_max_ps(max, r4);
+            /* Update the indices (+4) */
+            count = _mm_add_epi32(count, fours);
+        }
+        /* Horizontal max */
+        max2 = _mm_max_ps(max, _mm_shuffle_ps(max, max, _MM_SHUFFLE(1, 0, 3, 2)));
+        max2 = _mm_max_ps(max2, _mm_shuffle_ps(max2, max2, _MM_SHUFFLE(2, 3, 0, 1)));
+        /* Now that max2 contains the max at all positions, look at which value(s) of the
+           partial max is equal to the global max. */
+        pos = _mm_and_si128(pos, _mm_castps_si128(_mm_cmpeq_ps(max, max2)));
+        pos = _mm_max_epi16(pos, _mm_unpackhi_epi64(pos, pos));
+        pos = _mm_max_epi16(pos, _mm_shufflelo_epi16(pos, _MM_SHUFFLE(1, 0, 3, 2)));
+        best_id = _mm_cvtsi128_si32(pos);
+
+        /* Updating the sums of the new pulse(s) */
+        xy = ADD32(xy, EXTEND32(X[best_id]));
+        /* We're multiplying y[j] by two so we don't have to do it here */
+        yy = ADD16(yy, y[best_id]);
+
+        /* Only now that we've made the final choice, update y/iy */
+        /* Multiplying y[j] by 2 so we don't have to do it everywhere else */
+        y[best_id] += 2;
+        iy[best_id]++;
+    }
+
+    /* Put the original sign back */
+    for (j = 0; j < N; j += 4) {
+        __m128i y4;
+        __m128i s4;
+        y4 = _mm_loadu_si128((__m128i*)(void*)&iy[j]);
+        s4 = _mm_castps_si128(_mm_loadu_ps(&signy[j]));
+        y4 = _mm_xor_si128(_mm_add_epi32(y4, s4), s4);
+        _mm_storeu_si128((__m128i*)(void*)&iy[j], y4);
+    }
+    RESTORE_STACK;
+    return yy;
 }
 
 #endif
diff --git a/celt/x86/x86_arch_macros.h b/celt/x86/x86_arch_macros.h
index 343d63e5e..3d9bd181b 100644
--- a/celt/x86/x86_arch_macros.h
+++ b/celt/x86/x86_arch_macros.h
@@ -22,26 +22,26 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef _MSC_VER
 
-# ifdef OAC_X86_MAY_HAVE_SSE
-#  ifndef __SSE__
-#   define __SSE__
-#  endif
+#ifdef OAC_X86_MAY_HAVE_SSE
+# ifndef __SSE__
+#  define __SSE__
 # endif
+#endif
 
-# ifdef OAC_X86_MAY_HAVE_SSE2
-#  ifndef __SSE2__
-#   define __SSE2__
-#  endif
+#ifdef OAC_X86_MAY_HAVE_SSE2
+# ifndef __SSE2__
+#  define __SSE2__
 # endif
+#endif
 
-# ifdef OAC_X86_MAY_HAVE_SSE4_1
-#  ifndef __SSE4_1__
-#   define __SSE4_1__
-#  endif
+#ifdef OAC_X86_MAY_HAVE_SSE4_1
+# ifndef __SSE4_1__
+#  define __SSE4_1__
 # endif
+#endif
 
 #endif
diff --git a/celt/x86/x86_celt_map.c b/celt/x86/x86_celt_map.c
index f1e8e7646..10b11f8c3 100644
--- a/celt/x86/x86_celt_map.c
+++ b/celt/x86/x86_celt_map.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #if defined(HAVE_CONFIG_H)
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "x86/x86cpu.h"
@@ -39,58 +39,58 @@
 
 # if defined(FIXED_POINT)
 
-#if defined(OAC_X86_MAY_HAVE_SSE4_1) && !defined(OAC_X86_PRESUME_SSE4_1)
+#  if defined(OAC_X86_MAY_HAVE_SSE4_1) && !defined(OAC_X86_PRESUME_SSE4_1)
 
 void (*const CELT_FIR_IMPL[OAC_ARCHMASK + 1])(
          const oac_val16 *x,
          const oac_val16 *num,
          oac_val16       *y,
-         int              N,
-         int              ord,
-         int              arch
-) = {
-  celt_fir_c,                /* non-sse */
-  celt_fir_c,
-  celt_fir_c,
-  MAY_HAVE_SSE4_1(celt_fir), /* sse4.1  */
-  MAY_HAVE_SSE4_1(celt_fir)  /* avx  */
+         int N,
+         int ord,
+         int arch
+    ) = {
+    celt_fir_c,              /* non-sse */
+    celt_fir_c,
+    celt_fir_c,
+    MAY_HAVE_SSE4_1(celt_fir), /* sse4.1  */
+    MAY_HAVE_SSE4_1(celt_fir) /* avx  */
 };
 
 void (*const XCORR_KERNEL_IMPL[OAC_ARCHMASK + 1])(
          const oac_val16 *x,
          const oac_val16 *y,
-         oac_val32       sum[4],
-         int              len
-) = {
-  xcorr_kernel_c,                /* non-sse */
-  xcorr_kernel_c,
-  xcorr_kernel_c,
-  MAY_HAVE_SSE4_1(xcorr_kernel), /* sse4.1  */
-  MAY_HAVE_SSE4_1(xcorr_kernel)  /* avx  */
+         oac_val32 sum[4],
+         int len
+    ) = {
+    xcorr_kernel_c,              /* non-sse */
+    xcorr_kernel_c,
+    xcorr_kernel_c,
+    MAY_HAVE_SSE4_1(xcorr_kernel), /* sse4.1  */
+    MAY_HAVE_SSE4_1(xcorr_kernel) /* avx  */
 };
 
-#endif
+#  endif
 
-#if (defined(OAC_X86_MAY_HAVE_SSE4_1) && !defined(OAC_X86_PRESUME_SSE4_1)) ||  \
- (!defined(OAC_X86_MAY_HAVE_SSE_4_1) && defined(OAC_X86_MAY_HAVE_SSE2) && !defined(OAC_X86_PRESUME_SSE2))
+#  if (defined(OAC_X86_MAY_HAVE_SSE4_1) && !defined(OAC_X86_PRESUME_SSE4_1)) ||  \
+    (!defined(OAC_X86_MAY_HAVE_SSE_4_1) && defined(OAC_X86_MAY_HAVE_SSE2) && !defined(OAC_X86_PRESUME_SSE2))
 
 oac_val32 (*const CELT_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(
          const oac_val16 *x,
          const oac_val16 *y,
-         int              N
-) = {
-  celt_inner_prod_c,                /* non-sse */
-  celt_inner_prod_c,
-  MAY_HAVE_SSE2(celt_inner_prod),
-  MAY_HAVE_SSE4_1(celt_inner_prod), /* sse4.1  */
-  MAY_HAVE_SSE4_1(celt_inner_prod)  /* avx  */
+         int N
+    ) = {
+    celt_inner_prod_c,              /* non-sse */
+    celt_inner_prod_c,
+    MAY_HAVE_SSE2(celt_inner_prod),
+    MAY_HAVE_SSE4_1(celt_inner_prod), /* sse4.1  */
+    MAY_HAVE_SSE4_1(celt_inner_prod) /* avx  */
 };
 
-#endif
+#  endif
 
 # else
 
-#if defined(OAC_X86_MAY_HAVE_AVX2) && !defined(OAC_X86_PRESUME_AVX2)
+#  if defined(OAC_X86_MAY_HAVE_AVX2) && !defined(OAC_X86_PRESUME_AVX2)
 
 void (*const PITCH_XCORR_IMPL[OAC_ARCHMASK + 1])(
          const float *_x,
@@ -99,89 +99,89 @@ void (*const PITCH_XCORR_IMPL[OAC_ARCHMASK + 1])(
          int len,
          int max_pitch,
          int arch
-) = {
-  celt_pitch_xcorr_c,                /* non-sse */
-  celt_pitch_xcorr_c,
-  celt_pitch_xcorr_c,
-  celt_pitch_xcorr_c,
-  MAY_HAVE_AVX2(celt_pitch_xcorr)
+    ) = {
+    celt_pitch_xcorr_c,              /* non-sse */
+    celt_pitch_xcorr_c,
+    celt_pitch_xcorr_c,
+    celt_pitch_xcorr_c,
+    MAY_HAVE_AVX2(celt_pitch_xcorr)
 };
 
-#endif
+#  endif
 
 
-#if defined(OAC_X86_MAY_HAVE_SSE) && !defined(OAC_X86_PRESUME_SSE)
+#  if defined(OAC_X86_MAY_HAVE_SSE) && !defined(OAC_X86_PRESUME_SSE)
 
 void (*const XCORR_KERNEL_IMPL[OAC_ARCHMASK + 1])(
          const oac_val16 *x,
          const oac_val16 *y,
-         oac_val32       sum[4],
-         int              len
-) = {
-  xcorr_kernel_c,                /* non-sse */
-  MAY_HAVE_SSE(xcorr_kernel),
-  MAY_HAVE_SSE(xcorr_kernel),
-  MAY_HAVE_SSE(xcorr_kernel),
-  MAY_HAVE_SSE(xcorr_kernel)
+         oac_val32 sum[4],
+         int len
+    ) = {
+    xcorr_kernel_c,              /* non-sse */
+    MAY_HAVE_SSE(xcorr_kernel),
+    MAY_HAVE_SSE(xcorr_kernel),
+    MAY_HAVE_SSE(xcorr_kernel),
+    MAY_HAVE_SSE(xcorr_kernel)
 };
 
 oac_val32 (*const CELT_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(
          const oac_val16 *x,
          const oac_val16 *y,
-         int              N
-) = {
-  celt_inner_prod_c,                /* non-sse */
-  MAY_HAVE_SSE(celt_inner_prod),
-  MAY_HAVE_SSE(celt_inner_prod),
-  MAY_HAVE_SSE(celt_inner_prod),
-  MAY_HAVE_SSE(celt_inner_prod)
+         int N
+    ) = {
+    celt_inner_prod_c,              /* non-sse */
+    MAY_HAVE_SSE(celt_inner_prod),
+    MAY_HAVE_SSE(celt_inner_prod),
+    MAY_HAVE_SSE(celt_inner_prod),
+    MAY_HAVE_SSE(celt_inner_prod)
 };
 
 void (*const DUAL_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(
                     const oac_val16 *x,
                     const oac_val16 *y01,
                     const oac_val16 *y02,
-                    int               N,
+                    int N,
                     oac_val32       *xy1,
                     oac_val32       *xy2
-) = {
-  dual_inner_prod_c,                /* non-sse */
-  MAY_HAVE_SSE(dual_inner_prod),
-  MAY_HAVE_SSE(dual_inner_prod),
-  MAY_HAVE_SSE(dual_inner_prod),
-  MAY_HAVE_SSE(dual_inner_prod)
+    ) = {
+    dual_inner_prod_c,              /* non-sse */
+    MAY_HAVE_SSE(dual_inner_prod),
+    MAY_HAVE_SSE(dual_inner_prod),
+    MAY_HAVE_SSE(dual_inner_prod),
+    MAY_HAVE_SSE(dual_inner_prod)
 };
 
 void (*const COMB_FILTER_CONST_IMPL[OAC_ARCHMASK + 1])(
               oac_val32 *y,
               oac_val32 *x,
-              int         T,
-              int         N,
-              oac_val16  g10,
-              oac_val16  g11,
-              oac_val16  g12
-) = {
-  comb_filter_const_c,                /* non-sse */
-  MAY_HAVE_SSE(comb_filter_const),
-  MAY_HAVE_SSE(comb_filter_const),
-  MAY_HAVE_SSE(comb_filter_const),
-  MAY_HAVE_SSE(comb_filter_const)
+              int T,
+              int N,
+              oac_val16 g10,
+              oac_val16 g11,
+              oac_val16 g12
+    ) = {
+    comb_filter_const_c,              /* non-sse */
+    MAY_HAVE_SSE(comb_filter_const),
+    MAY_HAVE_SSE(comb_filter_const),
+    MAY_HAVE_SSE(comb_filter_const),
+    MAY_HAVE_SSE(comb_filter_const)
 };
 
 
-#endif
+#  endif
 
-#if defined(OAC_X86_MAY_HAVE_SSE2) && !defined(OAC_X86_PRESUME_SSE2)
+#  if defined(OAC_X86_MAY_HAVE_SSE2) && !defined(OAC_X86_PRESUME_SSE2)
 oac_val16 (*const OP_PVQ_SEARCH_IMPL[OAC_ARCHMASK + 1])(
       celt_norm *_X, int *iy, int K, int N, int arch
-) = {
-  op_pvq_search_c,                /* non-sse */
-  op_pvq_search_c,
-  MAY_HAVE_SSE2(op_pvq_search),
-  MAY_HAVE_SSE2(op_pvq_search),
-  MAY_HAVE_SSE2(op_pvq_search)
+    ) = {
+    op_pvq_search_c,              /* non-sse */
+    op_pvq_search_c,
+    MAY_HAVE_SSE2(op_pvq_search),
+    MAY_HAVE_SSE2(op_pvq_search),
+    MAY_HAVE_SSE2(op_pvq_search)
 };
-#endif
+#  endif
 
-#endif
+# endif
 #endif
diff --git a/celt/x86/x86cpu.c b/celt/x86/x86cpu.c
index 664ba6f27..4016c3cf0 100644
--- a/celt/x86/x86cpu.c
+++ b/celt/x86/x86cpu.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "cpu_support.h"
@@ -36,53 +36,51 @@
 #include "x86cpu.h"
 
 #if defined(OAC_HAVE_RTCD) && \
-  ((defined(OAC_X86_MAY_HAVE_SSE) && !defined(OAC_X86_PRESUME_SSE)) || \
-  (defined(OAC_X86_MAY_HAVE_SSE2) && !defined(OAC_X86_PRESUME_SSE2)) || \
-  (defined(OAC_X86_MAY_HAVE_SSE4_1) && !defined(OAC_X86_PRESUME_SSE4_1)) || \
-  (defined(OAC_X86_MAY_HAVE_AVX2) && !defined(OAC_X86_PRESUME_AVX2)))
+    ((defined(OAC_X86_MAY_HAVE_SSE) && !defined(OAC_X86_PRESUME_SSE)) || \
+    (defined(OAC_X86_MAY_HAVE_SSE2) && !defined(OAC_X86_PRESUME_SSE2)) || \
+    (defined(OAC_X86_MAY_HAVE_SSE4_1) && !defined(OAC_X86_PRESUME_SSE4_1)) || \
+    (defined(OAC_X86_MAY_HAVE_AVX2) && !defined(OAC_X86_PRESUME_AVX2)))
 
-#if defined(_MSC_VER)
+# if defined(_MSC_VER)
 
-#include <intrin.h>
-static _inline void cpuid(unsigned int CPUInfo[4], unsigned int InfoType)
-{
+#  include <intrin.h>
+static _inline void cpuid(unsigned int CPUInfo[4], unsigned int InfoType) {
     __cpuid((int*)CPUInfo, InfoType);
 }
 
-#else
+# else
 
-#if defined(CPU_INFO_BY_C)
-#include <cpuid.h>
-#endif
+#  if defined(CPU_INFO_BY_C)
+#   include <cpuid.h>
+#  endif
 
-static void cpuid(unsigned int CPUInfo[4], unsigned int InfoType)
-{
-#if defined(CPU_INFO_BY_ASM)
-#if defined(__i386__) && defined(__PIC__)
+static void cpuid(unsigned int CPUInfo[4], unsigned int InfoType) {
+#  if defined(CPU_INFO_BY_ASM)
+#   if defined(__i386__) && defined(__PIC__)
 /* %ebx is PIC register in 32-bit, so mustn't clobber it. */
     __asm__ __volatile__ (
         "xchg %%ebx, %1\n"
         "cpuid\n"
-        "xchg %%ebx, %1\n":
+        "xchg %%ebx, %1\n" :
         "=a" (CPUInfo[0]),
         "=r" (CPUInfo[1]),
         "=c" (CPUInfo[2]),
         "=d" (CPUInfo[3]) :
         /* We clear ECX to avoid a valgrind false-positive prior to v3.17.0. */
         "0" (InfoType), "2" (0)
-    );
-#else
+        );
+#   else
     __asm__ __volatile__ (
-        "cpuid":
+        "cpuid" :
         "=a" (CPUInfo[0]),
         "=b" (CPUInfo[1]),
         "=c" (CPUInfo[2]),
         "=d" (CPUInfo[3]) :
         /* We clear ECX to avoid a valgrind false-positive prior to v3.17.0. */
         "0" (InfoType), "2" (0)
-    );
-#endif
-#elif defined(CPU_INFO_BY_C)
+        );
+#   endif
+#  elif defined(CPU_INFO_BY_C)
     /* We use __get_cpuid_count to clear ECX to avoid a valgrind false-positive
         prior to v3.17.0.*/
     if (!__get_cpuid_count(InfoType, 0, &(CPUInfo[0]), &(CPUInfo[1]), &(CPUInfo[2]), &(CPUInfo[3]))) {
@@ -91,15 +89,15 @@ static void cpuid(unsigned int CPUInfo[4], unsigned int InfoType)
             what we want on CPUs that don't support CPUID. */
         CPUInfo[3] = CPUInfo[2] = CPUInfo[1] = CPUInfo[0] = 0;
     }
-#else
-# error "Configured to use x86 RTCD, but no CPU detection method available. " \
- "Reconfigure with --disable-rtcd (or send patches)."
-#endif
+#  else
+#   error "Configured to use x86 RTCD, but no CPU detection method available. " \
+    "Reconfigure with --disable-rtcd (or send patches)."
+#  endif
 }
 
-#endif
+# endif
 
-typedef struct CPU_Feature{
+typedef struct CPU_Feature {
     /*  SIMD: 128-bit */
     int HW_SSE;
     int HW_SSE2;
@@ -108,28 +106,26 @@ typedef struct CPU_Feature{
     int HW_AVX2;
 } CPU_Feature;
 
-static void oac_cpu_feature_check(CPU_Feature *cpu_feature)
-{
+static void oac_cpu_feature_check(CPU_Feature *cpu_feature) {
     unsigned int info[4];
     unsigned int nIds = 0;
 
     cpuid(info, 0);
     nIds = info[0];
 
-    if (nIds >= 1){
+    if (nIds >= 1) {
         cpuid(info, 1);
-        cpu_feature->HW_SSE = (info[3] & (1 << 25)) != 0;
-        cpu_feature->HW_SSE2 = (info[3] & (1 << 26)) != 0;
-        cpu_feature->HW_SSE41 = (info[2] & (1 << 19)) != 0;
-        cpu_feature->HW_AVX2 = (info[2] & (1 << 28)) != 0 && (info[2] & (1 << 12)) != 0;
+        cpu_feature->HW_SSE = (info[3]&(1<<25)) != 0;
+        cpu_feature->HW_SSE2 = (info[3]&(1<<26)) != 0;
+        cpu_feature->HW_SSE41 = (info[2]&(1<<19)) != 0;
+        cpu_feature->HW_AVX2 = (info[2]&(1<<28)) != 0 && (info[2]&(1<<12)) != 0;
         if (cpu_feature->HW_AVX2 && nIds >= 7) {
             cpuid(info, 7);
-            cpu_feature->HW_AVX2 = cpu_feature->HW_AVX2 && (info[1] & (1 << 5)) != 0;
+            cpu_feature->HW_AVX2 = cpu_feature->HW_AVX2 && (info[1]&(1<<5)) != 0;
         } else {
             cpu_feature->HW_AVX2 = 0;
         }
-    }
-    else {
+    } else   {
         cpu_feature->HW_SSE = 0;
         cpu_feature->HW_SSE2 = 0;
         cpu_feature->HW_SSE41 = 0;
@@ -137,34 +133,29 @@ static void oac_cpu_feature_check(CPU_Feature *cpu_feature)
     }
 }
 
-static int oac_select_arch_impl(void)
-{
+static int oac_select_arch_impl(void) {
     CPU_Feature cpu_feature;
     int arch;
 
     oac_cpu_feature_check(&cpu_feature);
 
     arch = 0;
-    if (!cpu_feature.HW_SSE)
-    {
-       return arch;
+    if (!cpu_feature.HW_SSE) {
+        return arch;
     }
     arch++;
 
-    if (!cpu_feature.HW_SSE2)
-    {
-       return arch;
+    if (!cpu_feature.HW_SSE2) {
+        return arch;
     }
     arch++;
 
-    if (!cpu_feature.HW_SSE41)
-    {
+    if (!cpu_feature.HW_SSE41) {
         return arch;
     }
     arch++;
 
-    if (!cpu_feature.HW_AVX2)
-    {
+    if (!cpu_feature.HW_AVX2) {
         return arch;
     }
     arch++;
@@ -174,10 +165,10 @@ static int oac_select_arch_impl(void)
 
 int oac_select_arch(void) {
     int arch = oac_select_arch_impl();
-#ifdef FUZZING
+# ifdef FUZZING
     /* Randomly downgrade the architecture. */
-    arch = rand()%(arch+1);
-#endif
+    arch = rand()%(arch + 1);
+# endif
     return arch;
 }
 
diff --git a/celt/x86/x86cpu.h b/celt/x86/x86cpu.h
index 29c5115da..f37b6bdf8 100644
--- a/celt/x86/x86cpu.h
+++ b/celt/x86/x86cpu.h
@@ -23,90 +23,90 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #if !defined(X86CPU_H)
-# define X86CPU_H
+#define X86CPU_H
 
-# if defined(OAC_X86_MAY_HAVE_SSE)
-#  define MAY_HAVE_SSE(name) name ## _sse
-# else
-#  define MAY_HAVE_SSE(name) name ## _c
-# endif
+#if defined(OAC_X86_MAY_HAVE_SSE)
+# define MAY_HAVE_SSE(name) name ## _sse
+#else
+# define MAY_HAVE_SSE(name) name ## _c
+#endif
 
-# if defined(OAC_X86_MAY_HAVE_SSE2)
-#  define MAY_HAVE_SSE2(name) name ## _sse2
-# else
-#  define MAY_HAVE_SSE2(name) name ## _c
-# endif
+#if defined(OAC_X86_MAY_HAVE_SSE2)
+# define MAY_HAVE_SSE2(name) name ## _sse2
+#else
+# define MAY_HAVE_SSE2(name) name ## _c
+#endif
 
-# if defined(OAC_X86_MAY_HAVE_SSE4_1)
-#  define MAY_HAVE_SSE4_1(name) name ## _sse4_1
-# else
-#  define MAY_HAVE_SSE4_1(name) name ## _c
-# endif
+#if defined(OAC_X86_MAY_HAVE_SSE4_1)
+# define MAY_HAVE_SSE4_1(name) name ## _sse4_1
+#else
+# define MAY_HAVE_SSE4_1(name) name ## _c
+#endif
 
-# if defined(OAC_X86_MAY_HAVE_AVX2)
-#  define MAY_HAVE_AVX2(name) name ## _avx2
-# else
-#  define MAY_HAVE_AVX2(name) name ## _c
-# endif
+#if defined(OAC_X86_MAY_HAVE_AVX2)
+# define MAY_HAVE_AVX2(name) name ## _avx2
+#else
+# define MAY_HAVE_AVX2(name) name ## _c
+#endif
 
-# if defined(OAC_HAVE_RTCD) && \
-  ((defined(OAC_X86_MAY_HAVE_SSE) && !defined(OAC_X86_PRESUME_SSE)) || \
-  (defined(OAC_X86_MAY_HAVE_SSE2) && !defined(OAC_X86_PRESUME_SSE2)) || \
-  (defined(OAC_X86_MAY_HAVE_SSE4_1) && !defined(OAC_X86_PRESUME_SSE4_1)) || \
-  (defined(OAC_X86_MAY_HAVE_AVX2) && !defined(OAC_X86_PRESUME_AVX2)))
+#if defined(OAC_HAVE_RTCD) && \
+    ((defined(OAC_X86_MAY_HAVE_SSE) && !defined(OAC_X86_PRESUME_SSE)) || \
+    (defined(OAC_X86_MAY_HAVE_SSE2) && !defined(OAC_X86_PRESUME_SSE2)) || \
+    (defined(OAC_X86_MAY_HAVE_SSE4_1) && !defined(OAC_X86_PRESUME_SSE4_1)) || \
+    (defined(OAC_X86_MAY_HAVE_AVX2) && !defined(OAC_X86_PRESUME_AVX2)))
 int oac_select_arch(void);
-# endif
+#endif
 
-# if defined(OAC_X86_MAY_HAVE_SSE2)
-#  include "oac_defines.h"
+#if defined(OAC_X86_MAY_HAVE_SSE2)
+# include "oac_defines.h"
 
 /*MOVD should not impose any alignment restrictions, but the C standard does,
    and UBSan will report errors if we actually make unaligned accesses.
-  Use this to work around those restrictions (which should hopefully all get
+   Use this to work around those restrictions (which should hopefully all get
    optimized to a single MOVD instruction).
-  GCC implemented _mm_loadu_si32() since GCC 11; HOWEVER, there is a bug!
-  https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99754
-  LLVM implemented _mm_loadu_si32() since Clang 8.0, however the
+   GCC implemented _mm_loadu_si32() since GCC 11; HOWEVER, there is a bug!
+   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99754
+   LLVM implemented _mm_loadu_si32() since Clang 8.0, however the
    __clang_major__ version number macro is unreliable, as vendors
    (specifically, Apple) will use different numbering schemes than upstream.
-  Clang's advice is "use feature detection", but they do not provide feature
+   Clang's advice is "use feature detection", but they do not provide feature
    detection support for specific SIMD functions.
-  We follow the approach from the SIMDe project and instead detect unrelated
+   We follow the approach from the SIMDe project and instead detect unrelated
    features that should be available in the version we want (see
    <https://github.com/simd-everywhere/simde/blob/master/simde/simde-detect-clang.h>).*/
-#  if defined(__clang__)
-#   if __has_warning("-Wextra-semi-stmt") || \
- __has_builtin(__builtin_rotateleft32)
-#    define OAC_CLANG_8 (1)
-#   endif
+# if defined(__clang__)
+#  if __has_warning("-Wextra-semi-stmt") || \
+    __has_builtin(__builtin_rotateleft32)
+#   define OAC_CLANG_8 (1)
+#  endif
+# endif
+# if !defined(_MSC_VER) && !OAC_GNUC_PREREQ(11, 3) && !defined(OAC_CLANG_8)
+#  include <string.h>
+#  include <emmintrin.h>
+
+#  ifdef _mm_loadu_si32
+#   undef _mm_loadu_si32
 #  endif
-#  if !defined(_MSC_VER) && !OAC_GNUC_PREREQ(11,3) && !defined(OAC_CLANG_8)
-#   include <string.h>
-#   include <emmintrin.h>
-
-#   ifdef _mm_loadu_si32
-#    undef _mm_loadu_si32
-#   endif
-#   define _mm_loadu_si32 WORKAROUND_mm_loadu_si32
+#  define _mm_loadu_si32 WORKAROUND_mm_loadu_si32
 static inline __m128i WORKAROUND_mm_loadu_si32(void const* mem_addr) {
-  int val;
-  memcpy(&val, mem_addr, sizeof(val));
-  return _mm_cvtsi32_si128(val);
+    int val;
+    memcpy(&val, mem_addr, sizeof(val));
+    return _mm_cvtsi32_si128(val);
 }
-#  elif defined(_MSC_VER)
-    /* MSVC needs this for _mm_loadu_si32 */
-#   include <immintrin.h>
-#  endif
+# elif defined(_MSC_VER)
+/* MSVC needs this for _mm_loadu_si32 */
+#  include <immintrin.h>
+# endif
 
-#  define OP_CVTEPI8_EPI32_M32(x) \
- (_mm_cvtepi8_epi32(_mm_loadu_si32(x)))
+# define OP_CVTEPI8_EPI32_M32(x) \
+        (_mm_cvtepi8_epi32(_mm_loadu_si32(x)))
 
-#  define OP_CVTEPI16_EPI32_M64(x) \
- (_mm_cvtepi16_epi32(_mm_loadl_epi64((__m128i *)(void*)(x))))
+# define OP_CVTEPI16_EPI32_M64(x) \
+        (_mm_cvtepi16_epi32(_mm_loadl_epi64((__m128i *)(void*)(x))))
 
-# endif
+#endif
 
 #endif
diff --git a/cmake/cpu_info_by_asm.c b/cmake/cpu_info_by_asm.c
index 1a70a815a..11bcda50c 100644
--- a/cmake/cpu_info_by_asm.c
+++ b/cmake/cpu_info_by_asm.c
@@ -10,22 +10,22 @@ int main() {
     __asm__ __volatile__ (
         "xchg %%ebx, %1\n"
         "cpuid\n"
-        "xchg %%ebx, %1\n":
+        "xchg %%ebx, %1\n" :
         "=a" (CPUInfo0),
         "=r" (CPUInfo1),
         "=c" (CPUInfo2),
         "=d" (CPUInfo3) :
         "0" (InfoType), "2" (0)
-    );
+        );
 #else
     __asm__ __volatile__ (
-        "cpuid":
+        "cpuid" :
         "=a" (CPUInfo0),
         "=b" (CPUInfo1),
         "=c" (CPUInfo2),
         "=d" (CPUInfo3) :
         "0" (InfoType), "2" (0)
-    );
+        );
 #endif
     return 0;
 }
diff --git a/dnn/adaconvtest.c b/dnn/adaconvtest.c
index 722e4affd..55751e12a 100644
--- a/dnn/adaconvtest.c
+++ b/dnn/adaconvtest.c
@@ -27,9 +27,7 @@ void adaconv_compare(
     int left_padding,
     float filter_gain_a,
     float filter_gain_b,
-    float shape_gain
-)
-{
+    float shape_gain) {
     char feature_file[256];
     char x_in_file[256];
     char x_out_file[256];
@@ -50,8 +48,7 @@ void adaconv_compare(
     strcpy(feature_file, prefix);
     strcat(feature_file, "_features.f32");
     f_features = fopen(feature_file, "r");
-    if (f_features == NULL)
-    {
+    if (f_features == NULL) {
         sprintf(message, "could not open file %s", feature_file);
         perror(message);
         exit(1);
@@ -60,8 +57,7 @@ void adaconv_compare(
     strcpy(x_in_file, prefix);
     strcat(x_in_file, "_x_in.f32");
     f_x_in = fopen(x_in_file, "r");
-    if (f_x_in == NULL)
-    {
+    if (f_x_in == NULL) {
         sprintf(message, "could not open file %s", x_in_file);
         perror(message);
         exit(1);
@@ -70,29 +66,24 @@ void adaconv_compare(
     strcpy(x_out_file, prefix);
     strcat(x_out_file, "_x_out.f32");
     f_x_out = fopen(x_out_file, "r");
-    if (f_x_out == NULL)
-    {
+    if (f_x_out == NULL) {
         sprintf(message, "could not open file %s", x_out_file);
         perror(message);
         exit(1);
     }
 
-    for (i_frame = 0; i_frame < num_frames; i_frame ++)
-    {
-        if (fread(features, sizeof(float), feature_dim, f_features) != feature_dim)
-        {
+    for (i_frame = 0; i_frame < num_frames; i_frame++) {
+        if (fread(features, sizeof(float), feature_dim, f_features) != feature_dim) {
             fprintf(stderr, "could not read frame %d from %s\n", i_frame, feature_file);
             exit(1);
         }
 
-        if (fread(x_in, sizeof(float), frame_size * in_channels, f_x_in) != frame_size * in_channels)
-        {
+        if (fread(x_in, sizeof(float), frame_size*in_channels, f_x_in) != frame_size*in_channels) {
             fprintf(stderr, "could not read frame %d from %s\n", i_frame, x_in_file);
             exit(1);
         }
 
-        if (fread(x_out_ref, sizeof(float), frame_size * out_channels, f_x_out) != frame_size * out_channels)
-        {
+        if (fread(x_out_ref, sizeof(float), frame_size*out_channels, f_x_out) != frame_size*out_channels) {
             fprintf(stderr, "could not read frame %d from %s\n", i_frame, x_out_file);
             exit(1);
         }
@@ -102,11 +93,10 @@ void adaconv_compare(
             filter_gain_a, filter_gain_b, shape_gain, window, 0);
 
         mse = 0;
-        for (i_sample = 0; i_sample < frame_size * out_channels; i_sample ++)
-        {
+        for (i_sample = 0; i_sample < frame_size*out_channels; i_sample++) {
             mse += pow(x_out_ref[i_sample] - x_out[i_sample], 2);
         }
-        mse = sqrt(mse / (frame_size * out_channels));
+        mse = sqrt(mse/(frame_size*out_channels));
         printf("rmse[%d] %f\n", i_frame, mse);
 
     }
@@ -127,9 +117,7 @@ void adacomb_compare(
     int left_padding,
     float filter_gain_a,
     float filter_gain_b,
-    float log_gain_limit
-)
-{
+    float log_gain_limit) {
     char feature_file[256];
     char x_in_file[256];
     char p_in_file[256];
@@ -152,8 +140,7 @@ void adacomb_compare(
     strcpy(feature_file, prefix);
     strcat(feature_file, "_features.f32");
     f_features = fopen(feature_file, "r");
-    if (f_features == NULL)
-    {
+    if (f_features == NULL) {
         sprintf(message, "could not open file %s", feature_file);
         perror(message);
         exit(1);
@@ -162,8 +149,7 @@ void adacomb_compare(
     strcpy(x_in_file, prefix);
     strcat(x_in_file, "_x_in.f32");
     f_x_in = fopen(x_in_file, "r");
-    if (f_x_in == NULL)
-    {
+    if (f_x_in == NULL) {
         sprintf(message, "could not open file %s", x_in_file);
         perror(message);
         exit(1);
@@ -172,8 +158,7 @@ void adacomb_compare(
     strcpy(p_in_file, prefix);
     strcat(p_in_file, "_p_in.s32");
     f_p_in = fopen(p_in_file, "r");
-    if (f_p_in == NULL)
-    {
+    if (f_p_in == NULL) {
         sprintf(message, "could not open file %s", p_in_file);
         perror(message);
         exit(1);
@@ -182,49 +167,43 @@ void adacomb_compare(
     strcpy(x_out_file, prefix);
     strcat(x_out_file, "_x_out.f32");
     f_x_out = fopen(x_out_file, "r");
-    if (f_x_out == NULL)
-    {
+    if (f_x_out == NULL) {
         sprintf(message, "could not open file %s", x_out_file);
         perror(message);
         exit(1);
     }
 
-    for (i_frame = 0; i_frame < num_frames; i_frame ++)
-    {
-        if (fread(features, sizeof(float), feature_dim, f_features) != feature_dim)
-        {
+    for (i_frame = 0; i_frame < num_frames; i_frame++) {
+        if (fread(features, sizeof(float), feature_dim, f_features) != feature_dim) {
             fprintf(stderr, "could not read frame %d from %s\n", i_frame, feature_file);
             exit(1);
         }
 
-        if (fread(x_in, sizeof(float), frame_size, f_x_in) != frame_size)
-        {
+        if (fread(x_in, sizeof(float), frame_size, f_x_in) != frame_size) {
             fprintf(stderr, "could not read frame %d from %s\n", i_frame, x_in_file);
             exit(1);
         }
 
-        if (fread(&pitch_lag, sizeof(int), 1, f_p_in) != 1)
-        {
+        if (fread(&pitch_lag, sizeof(int), 1, f_p_in) != 1) {
             fprintf(stderr, "could not read frame %d from %s\n", i_frame, p_in_file);
             exit(1);
         }
 
-        if (fread(x_out_ref, sizeof(float), frame_size, f_x_out) != frame_size)
-        {
+        if (fread(x_out_ref, sizeof(float), frame_size, f_x_out) != frame_size) {
             fprintf(stderr, "could not read frame %d from %s\n", i_frame, x_out_file);
             exit(1);
         }
 
         adacomb_process_frame(hAdaComb, x_out, x_in, features, kernel_layer, gain_layer, global_gain_layer,
-            pitch_lag, feature_dim, frame_size, overlap_size, kernel_size, left_padding, filter_gain_a, filter_gain_b, log_gain_limit, window, 0);
+            pitch_lag, feature_dim, frame_size, overlap_size, kernel_size, left_padding, filter_gain_a, filter_gain_b,
+        log_gain_limit, window, 0);
 
 
         mse = 0;
-        for (i_sample = 0; i_sample < frame_size; i_sample ++)
-        {
+        for (i_sample = 0; i_sample < frame_size; i_sample++) {
             mse += pow(x_out_ref[i_sample] - x_out[i_sample], 2);
         }
-        mse = sqrt(mse / (frame_size));
+        mse = sqrt(mse/(frame_size));
         printf("rmse[%d] %f\n", i_frame, mse);
 
     }
@@ -238,9 +217,7 @@ void adashape_compare(
     LinearLayer *alpha2,
     int feature_dim,
     int frame_size,
-    int avg_pool_k
-)
-{
+    int avg_pool_k) {
     char feature_file[256];
     char x_in_file[256];
     char x_out_file[256];
@@ -259,8 +236,7 @@ void adashape_compare(
     strcpy(feature_file, prefix);
     strcat(feature_file, "_features.f32");
     f_features = fopen(feature_file, "r");
-    if (f_features == NULL)
-    {
+    if (f_features == NULL) {
         sprintf(message, "could not open file %s", feature_file);
         perror(message);
         exit(1);
@@ -269,8 +245,7 @@ void adashape_compare(
     strcpy(x_in_file, prefix);
     strcat(x_in_file, "_x_in.f32");
     f_x_in = fopen(x_in_file, "r");
-    if (f_x_in == NULL)
-    {
+    if (f_x_in == NULL) {
         sprintf(message, "could not open file %s", x_in_file);
         perror(message);
         exit(1);
@@ -279,29 +254,24 @@ void adashape_compare(
     strcpy(x_out_file, prefix);
     strcat(x_out_file, "_x_out.f32");
     f_x_out = fopen(x_out_file, "r");
-    if (f_x_out == NULL)
-    {
+    if (f_x_out == NULL) {
         sprintf(message, "could not open file %s", x_out_file);
         perror(message);
         exit(1);
     }
 
-    for (i_frame = 0; i_frame < num_frames; i_frame ++)
-    {
-        if (fread(features, sizeof(float), feature_dim, f_features) != feature_dim)
-        {
+    for (i_frame = 0; i_frame < num_frames; i_frame++) {
+        if (fread(features, sizeof(float), feature_dim, f_features) != feature_dim) {
             fprintf(stderr, "could not read frame %d from %s\n", i_frame, feature_file);
             exit(1);
         }
 
-        if (fread(x_in, sizeof(float), frame_size, f_x_in) != frame_size)
-        {
+        if (fread(x_in, sizeof(float), frame_size, f_x_in) != frame_size) {
             fprintf(stderr, "could not read frame %d from %s\n", i_frame, x_in_file);
             exit(1);
         }
 
-        if (fread(x_out_ref, sizeof(float), frame_size, f_x_out) != frame_size)
-        {
+        if (fread(x_out_ref, sizeof(float), frame_size, f_x_out) != frame_size) {
             fprintf(stderr, "could not read frame %d from %s\n", i_frame, x_out_file);
             exit(1);
         }
@@ -310,19 +280,17 @@ void adashape_compare(
             frame_size, avg_pool_k, 0);
 
         mse = 0;
-        for (i_sample = 0; i_sample < frame_size; i_sample ++)
-        {
+        for (i_sample = 0; i_sample < frame_size; i_sample++) {
             mse += pow(x_out_ref[i_sample] - x_out[i_sample], 2);
         }
-        mse = sqrt(mse / (frame_size));
+        mse = sqrt(mse/(frame_size));
         printf("rmse[%d] %f\n", i_frame, mse);
 
     }
 }
 
 
-int main()
-{
+int main() {
     LACELayers hLACE;
     NOLACELayers hNoLACE;
 
@@ -352,7 +320,7 @@ int main()
         LACE_AF1_FILTER_GAIN_A,
         LACE_AF1_FILTER_GAIN_B,
         LACE_AF1_SHAPE_GAIN
-    );
+        );
 
 
     printf("\ntesting nolace.af1 (1 in, 2 out)...\n");
@@ -372,7 +340,7 @@ int main()
         NOLACE_AF1_FILTER_GAIN_A,
         NOLACE_AF1_FILTER_GAIN_B,
         NOLACE_AF1_SHAPE_GAIN
-    );
+        );
 
 
     printf("testing nolace.af4 (2 in, 1 out)...\n");
@@ -392,7 +360,7 @@ int main()
         NOLACE_AF4_FILTER_GAIN_A,
         NOLACE_AF4_FILTER_GAIN_B,
         NOLACE_AF4_SHAPE_GAIN
-    );
+        );
 
     printf("\ntesting nolace.af2 (2 in, 2 out)...\n");
     adaconv_compare(
@@ -411,7 +379,7 @@ int main()
         NOLACE_AF2_FILTER_GAIN_A,
         NOLACE_AF2_FILTER_GAIN_B,
         NOLACE_AF2_SHAPE_GAIN
-    );
+        );
 
     printf("\ntesting lace.cf1...\n");
     adacomb_compare(
@@ -429,7 +397,7 @@ int main()
         LACE_CF1_FILTER_GAIN_A,
         LACE_CF1_FILTER_GAIN_B,
         LACE_CF1_LOG_GAIN_LIMIT
-    );
+        );
 
     printf("\ntesting nolace.tdshape1...\n");
     adashape_compare(
@@ -441,7 +409,7 @@ int main()
         NOLACE_TDSHAPE1_FEATURE_DIM,
         NOLACE_TDSHAPE1_FRAME_SIZE,
         NOLACE_TDSHAPE1_AVG_POOL_K
-    );
+        );
 
     return 0;
 }
diff --git a/dnn/arm/arm_dnn_map.c b/dnn/arm/arm_dnn_map.c
index 13806f6f9..5a4e5edca 100644
--- a/dnn/arm/arm_dnn_map.c
+++ b/dnn/arm/arm_dnn_map.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "arm/armcpu.h"
@@ -34,30 +34,30 @@
 
 #if defined(OAC_HAVE_RTCD)
 
-#if (defined(OAC_ARM_MAY_HAVE_DOTPROD) && !defined(OAC_ARM_PRESUME_DOTPROD))
+# if (defined(OAC_ARM_MAY_HAVE_DOTPROD) && !defined(OAC_ARM_PRESUME_DOTPROD))
 
 void (*const DNN_COMPUTE_LINEAR_IMPL[OAC_ARCHMASK + 1])(
          const LinearLayer *linear,
          float *out,
          const float *in
-) = {
-  compute_linear_c,                /* default */
-  compute_linear_c,
-  compute_linear_c,
-  MAY_HAVE_NEON(compute_linear),   /* neon  */
-  MAY_HAVE_DOTPROD(compute_linear) /* dotprod  */
+    ) = {
+    compute_linear_c,              /* default */
+    compute_linear_c,
+    compute_linear_c,
+    MAY_HAVE_NEON(compute_linear), /* neon  */
+    MAY_HAVE_DOTPROD(compute_linear) /* dotprod  */
 };
 
-#endif
+# endif
 
-#if (defined(OAC_ARM_MAY_HAVE_DOTPROD) || defined(OAC_ARM_MAY_HAVE_NEON)) && !defined(OAC_ARM_PRESUME_NEON)
+# if (defined(OAC_ARM_MAY_HAVE_DOTPROD) || defined(OAC_ARM_MAY_HAVE_NEON)) && !defined(OAC_ARM_PRESUME_NEON)
 
 void (*const DNN_COMPUTE_ACTIVATION_IMPL[OAC_ARCHMASK + 1])(
          float *output,
          const float *input,
          int N,
          int activation
-) = {
+    ) = {
     compute_activation_c,                /* default */
     compute_activation_c,
     compute_activation_c,
@@ -73,7 +73,7 @@ void (*const DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
          int height,
          int hstride,
          int activation
-) = {
+    ) = {
     compute_conv2d_c,                /* default */
     compute_conv2d_c,
     compute_conv2d_c,
@@ -82,7 +82,7 @@ void (*const DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
 };
 
 
-#endif
+# endif
 
 
 #endif
diff --git a/dnn/arm/dnn_arm.h b/dnn/arm/dnn_arm.h
index a2fe59743..3d28d7677 100644
--- a/dnn/arm/dnn_arm.h
+++ b/dnn/arm/dnn_arm.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef DNN_ARM_H
 #define DNN_ARM_H
@@ -37,18 +37,20 @@ void compute_linear_neon(const LinearLayer *linear, float *out, const float *in)
 void compute_activation_neon(float *output, const float *input, int N, int activation);
 void compute_activation_dotprod(float *output, const float *input, int N, int activation);
 
-void compute_conv2d_neon(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride, int activation);
-void compute_conv2d_dotprod(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride, int activation);
+void compute_conv2d_neon(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride,
+    int activation);
+void compute_conv2d_dotprod(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride,
+    int activation);
 
 #if defined(OAC_ARM_PRESUME_DOTPROD)
 
-#define OVERRIDE_COMPUTE_LINEAR
-#define compute_linear(linear, out, in, arch) ((void)(arch),compute_linear_dotprod(linear, out, in))
+# define OVERRIDE_COMPUTE_LINEAR
+# define compute_linear(linear, out, in, arch) ((void)(arch), compute_linear_dotprod(linear, out, in))
 
 #elif defined(OAC_ARM_PRESUME_NEON_INTR) && !defined(OAC_ARM_MAY_HAVE_DOTPROD)
 
-#define OVERRIDE_COMPUTE_LINEAR
-#define compute_linear(linear, out, in, arch) ((void)(arch),compute_linear_neon(linear, out, in))
+# define OVERRIDE_COMPUTE_LINEAR
+# define compute_linear(linear, out, in, arch) ((void)(arch), compute_linear_neon(linear, out, in))
 
 #elif defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_DOTPROD) || defined(OAC_ARM_MAY_HAVE_NEON))
 
@@ -56,20 +58,23 @@ extern void (*const DNN_COMPUTE_LINEAR_IMPL[OAC_ARCHMASK + 1])(
                     const LinearLayer *linear,
                     float *out,
                     const float *in
-                    );
-#define OVERRIDE_COMPUTE_LINEAR
-#define compute_linear(linear, out, in, arch) \
-    ((*DNN_COMPUTE_LINEAR_IMPL[(arch) & OAC_ARCHMASK])(linear, out, in))
+    );
+# define OVERRIDE_COMPUTE_LINEAR
+# define compute_linear(linear, out, in, arch) \
+        ((*DNN_COMPUTE_LINEAR_IMPL[(arch)&OAC_ARCHMASK])(linear, out, in))
 
 
 #endif
 
 #if defined(OAC_ARM_PRESUME_NEON)
 
-#define OVERRIDE_COMPUTE_ACTIVATION
-#define compute_activation(output, input, N, activation, arch) ((void)(arch),compute_activation_neon(output, input, N, activation))
-#define OVERRIDE_COMPUTE_CONV2D
-#define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch),compute_conv2d_neon(conv, out, mem, in, height, hstride, activation))
+# define OVERRIDE_COMPUTE_ACTIVATION
+# define compute_activation(output, input, N, activation, arch) ((void)(arch), \
+                                                                 compute_activation_neon(output, input, N, activation))
+# define OVERRIDE_COMPUTE_CONV2D
+# define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch), \
+                                                                                compute_conv2d_neon(conv, out, mem, in, \
+    height, hstride, activation))
 
 #elif defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_DOTPROD) || defined(OAC_ARM_MAY_HAVE_NEON))
 
@@ -78,10 +83,10 @@ extern void (*const DNN_COMPUTE_ACTIVATION_IMPL[OAC_ARCHMASK + 1])(
                     const float *input,
                     int N,
                     int activation
-                    );
-#define OVERRIDE_COMPUTE_ACTIVATION
-#define compute_activation(output, input, N, activation, arch) \
-    ((*DNN_COMPUTE_ACTIVATION_IMPL[(arch) & OAC_ARCHMASK])(output, input, N, activation))
+    );
+# define OVERRIDE_COMPUTE_ACTIVATION
+# define compute_activation(output, input, N, activation, arch) \
+        ((*DNN_COMPUTE_ACTIVATION_IMPL[(arch)&OAC_ARCHMASK])(output, input, N, activation))
 
 
 extern void (*const DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
@@ -92,10 +97,10 @@ extern void (*const DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
                     int height,
                     int hstride,
                     int activation
-                    );
-#define OVERRIDE_COMPUTE_CONV2D
-#define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) \
-    ((*DNN_COMPUTE_CONV2D_IMPL[(arch) & OAC_ARCHMASK])(conv, out, mem, in, height, hstride, activation))
+    );
+# define OVERRIDE_COMPUTE_CONV2D
+# define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) \
+        ((*DNN_COMPUTE_CONV2D_IMPL[(arch)&OAC_ARCHMASK])(conv, out, mem, in, height, hstride, activation))
 
 
 #endif
diff --git a/dnn/arm/nnet_dotprod.c b/dnn/arm/nnet_dotprod.c
index 1354ed334..b10e01714 100644
--- a/dnn/arm/nnet_dotprod.c
+++ b/dnn/arm/nnet_dotprod.c
@@ -23,14 +23,14 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #ifndef __ARM_FEATURE_DOTPROD
-#error nnet_dotprod.c is being compiled without DOTPROD enabled
+# error nnet_dotprod.c is being compiled without DOTPROD enabled
 #endif
 
 #define RTCD_ARCH dotprod
diff --git a/dnn/arm/nnet_neon.c b/dnn/arm/nnet_neon.c
index fb636f85b..6ad29641c 100644
--- a/dnn/arm/nnet_neon.c
+++ b/dnn/arm/nnet_neon.c
@@ -23,14 +23,14 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #if !(defined(__ARM_NEON__) || defined(__ARM_NEON))
-#error nnet_neon.c is being compiled without Neon enabled
+# error nnet_neon.c is being compiled without Neon enabled
 #endif
 
 #define RTCD_ARCH neon
diff --git a/dnn/burg.c b/dnn/burg.c
index 3d6b23b03..ffb2f371d 100644
--- a/dnn/burg.c
+++ b/dnn/burg.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <math.h>
@@ -43,24 +43,22 @@ POSSIBILITY OF SUCH DAMAGE.
 /* sum of squares of a silk_float array, with result as double */
 static double silk_energy_FLP(
     const float    *data,
-    int            dataSize
-)
-{
+    int dataSize)                            {
     int i;
-    double   result;
+    double result;
 
     /* 4x unrolled loop */
     result = 0.0;
-    for( i = 0; i < dataSize - 3; i += 4 ) {
-        result += data[ i + 0 ] * (double)data[ i + 0 ] +
-                  data[ i + 1 ] * (double)data[ i + 1 ] +
-                  data[ i + 2 ] * (double)data[ i + 2 ] +
-                  data[ i + 3 ] * (double)data[ i + 3 ];
+    for (i = 0; i < dataSize - 3; i += 4) {
+        result += data[ i + 0 ]*(double)data[ i + 0 ]
+                  + data[ i + 1 ]*(double)data[ i + 1 ]
+                  + data[ i + 2 ]*(double)data[ i + 2 ]
+                  + data[ i + 3 ]*(double)data[ i + 3 ];
     }
 
     /* add any remaining products */
-    for( ; i < dataSize; i++ ) {
-        result += data[ i ] * (double)data[ i ];
+    for ( ; i < dataSize; i++) {
+        result += data[ i ]*(double)data[ i ];
     }
 
     assert( result >= 0.0 );
@@ -71,24 +69,22 @@ static double silk_energy_FLP(
 static double silk_inner_product_FLP(
     const float    *data1,
     const float    *data2,
-    int            dataSize
-)
-{
+    int dataSize)                            {
     int i;
-    double   result;
+    double result;
 
     /* 4x unrolled loop */
     result = 0.0;
-    for( i = 0; i < dataSize - 3; i += 4 ) {
-        result += data1[ i + 0 ] * (double)data2[ i + 0 ] +
-                  data1[ i + 1 ] * (double)data2[ i + 1 ] +
-                  data1[ i + 2 ] * (double)data2[ i + 2 ] +
-                  data1[ i + 3 ] * (double)data2[ i + 3 ];
+    for (i = 0; i < dataSize - 3; i += 4) {
+        result += data1[ i + 0 ]*(double)data2[ i + 0 ]
+                  + data1[ i + 1 ]*(double)data2[ i + 1 ]
+                  + data1[ i + 2 ]*(double)data2[ i + 2 ]
+                  + data1[ i + 3 ]*(double)data2[ i + 3 ];
     }
 
     /* add any remaining products */
-    for( ; i < dataSize; i++ ) {
-        result += data1[ i ] * (double)data2[ i ];
+    for ( ; i < dataSize; i++) {
+        result += data1[ i ]*(double)data2[ i ];
     }
 
     return result;
@@ -97,65 +93,64 @@ static double silk_inner_product_FLP(
 
 /* Compute reflection coefficients from input signal */
 float silk_burg_analysis(              /* O    returns residual energy                                     */
-    float          A[],                /* O    prediction coefficients (length order)                      */
-    const float    x[],                /* I    input signal, length: nb_subfr*(D+L_sub)                    */
-    const float    minInvGain,         /* I    minimum inverse prediction gain                             */
-    const int      subfr_length,       /* I    input signal subframe length (incl. D preceding samples)    */
-    const int      nb_subfr,           /* I    number of subframes stacked in x                            */
-    const int      D                   /* I    order                                                       */
-)
-{
-    int         k, n, s, reached_max_gain;
-    double           C0, invGain, num, nrg_f, nrg_b, rc, Atmp, tmp1, tmp2;
+    float A[],                         /* O    prediction coefficients (length order)                      */
+    const float x[],                   /* I    input signal, length: nb_subfr*(D+L_sub)                    */
+    const float minInvGain,            /* I    minimum inverse prediction gain                             */
+    const int subfr_length,            /* I    input signal subframe length (incl. D preceding samples)    */
+    const int nb_subfr,                /* I    number of subframes stacked in x                            */
+    const int D                        /* I    order                                                       */
+    ) {
+    int k, n, s, reached_max_gain;
+    double C0, invGain, num, nrg_f, nrg_b, rc, Atmp, tmp1, tmp2;
     const float *x_ptr;
-    double           C_first_row[ SILK_MAX_ORDER_LPC ], C_last_row[ SILK_MAX_ORDER_LPC ];
-    double           CAf[ SILK_MAX_ORDER_LPC + 1 ], CAb[ SILK_MAX_ORDER_LPC + 1 ];
-    double           Af[ SILK_MAX_ORDER_LPC ];
+    double C_first_row[ SILK_MAX_ORDER_LPC ], C_last_row[ SILK_MAX_ORDER_LPC ];
+    double CAf[ SILK_MAX_ORDER_LPC + 1 ], CAb[ SILK_MAX_ORDER_LPC + 1 ];
+    double Af[ SILK_MAX_ORDER_LPC ];
 
-    assert( subfr_length * nb_subfr <= MAX_FRAME_SIZE );
+    assert( subfr_length*nb_subfr <= MAX_FRAME_SIZE );
 
     /* Compute autocorrelations, added over subframes */
-    C0 = silk_energy_FLP( x, nb_subfr * subfr_length );
-    memset( C_first_row, 0, SILK_MAX_ORDER_LPC * sizeof( double ) );
-    for( s = 0; s < nb_subfr; s++ ) {
-        x_ptr = x + s * subfr_length;
-        for( n = 1; n < D + 1; n++ ) {
+    C0 = silk_energy_FLP( x, nb_subfr*subfr_length );
+    memset( C_first_row, 0, SILK_MAX_ORDER_LPC*sizeof(double));
+    for (s = 0; s < nb_subfr; s++) {
+        x_ptr = x + s*subfr_length;
+        for (n = 1; n < D + 1; n++) {
             C_first_row[ n - 1 ] += silk_inner_product_FLP( x_ptr, x_ptr + n, subfr_length - n );
         }
     }
-    memcpy( C_last_row, C_first_row, SILK_MAX_ORDER_LPC * sizeof( double ) );
+    memcpy( C_last_row, C_first_row, SILK_MAX_ORDER_LPC*sizeof(double));
 
     /* Initialize */
-    CAb[ 0 ] = CAf[ 0 ] = C0 + FIND_LPC_COND_FAC * C0 + 1e-9f;
+    CAb[ 0 ] = CAf[ 0 ] = C0 + FIND_LPC_COND_FAC*C0 + 1e-9f;
     invGain = 1.0f;
     reached_max_gain = 0;
-    for( n = 0; n < D; n++ ) {
+    for (n = 0; n < D; n++) {
         /* Update first row of correlation matrix (without first element) */
         /* Update last row of correlation matrix (without last element, stored in reversed order) */
         /* Update C * Af */
         /* Update C * flipud(Af) (stored in reversed order) */
-        for( s = 0; s < nb_subfr; s++ ) {
-            x_ptr = x + s * subfr_length;
+        for (s = 0; s < nb_subfr; s++) {
+            x_ptr = x + s*subfr_length;
             tmp1 = x_ptr[ n ];
             tmp2 = x_ptr[ subfr_length - n - 1 ];
-            for( k = 0; k < n; k++ ) {
-                C_first_row[ k ] -= x_ptr[ n ] * x_ptr[ n - k - 1 ];
-                C_last_row[ k ]  -= x_ptr[ subfr_length - n - 1 ] * x_ptr[ subfr_length - n + k ];
+            for (k = 0; k < n; k++) {
+                C_first_row[ k ] -= x_ptr[ n ]*x_ptr[ n - k - 1 ];
+                C_last_row[ k ]  -= x_ptr[ subfr_length - n - 1 ]*x_ptr[ subfr_length - n + k ];
                 Atmp = Af[ k ];
-                tmp1 += x_ptr[ n - k - 1 ] * Atmp;
-                tmp2 += x_ptr[ subfr_length - n + k ] * Atmp;
+                tmp1 += x_ptr[ n - k - 1 ]*Atmp;
+                tmp2 += x_ptr[ subfr_length - n + k ]*Atmp;
             }
-            for( k = 0; k <= n; k++ ) {
-                CAf[ k ] -= tmp1 * x_ptr[ n - k ];
-                CAb[ k ] -= tmp2 * x_ptr[ subfr_length - n + k - 1 ];
+            for (k = 0; k <= n; k++) {
+                CAf[ k ] -= tmp1*x_ptr[ n - k ];
+                CAb[ k ] -= tmp2*x_ptr[ subfr_length - n + k - 1 ];
             }
         }
         tmp1 = C_first_row[ n ];
         tmp2 = C_last_row[ n ];
-        for( k = 0; k < n; k++ ) {
+        for (k = 0; k < n; k++) {
             Atmp = Af[ k ];
-            tmp1 += C_last_row[  n - k - 1 ] * Atmp;
-            tmp2 += C_first_row[ n - k - 1 ] * Atmp;
+            tmp1 += C_last_row[  n - k - 1 ]*Atmp;
+            tmp2 += C_first_row[ n - k - 1 ]*Atmp;
         }
         CAf[ n + 1 ] = tmp1;
         CAb[ n + 1 ] = tmp2;
@@ -164,25 +159,25 @@ float silk_burg_analysis(              /* O    returns residual energy
         num = CAb[ n + 1 ];
         nrg_b = CAb[ 0 ];
         nrg_f = CAf[ 0 ];
-        for( k = 0; k < n; k++ ) {
+        for (k = 0; k < n; k++) {
             Atmp = Af[ k ];
-            num   += CAb[ n - k ] * Atmp;
-            nrg_b += CAb[ k + 1 ] * Atmp;
-            nrg_f += CAf[ k + 1 ] * Atmp;
+            num   += CAb[ n - k ]*Atmp;
+            nrg_b += CAb[ k + 1 ]*Atmp;
+            nrg_f += CAf[ k + 1 ]*Atmp;
         }
         assert( nrg_f > 0.0 );
         assert( nrg_b > 0.0 );
 
         /* Calculate the next order reflection (parcor) coefficient */
-        rc = -2.0 * num / ( nrg_f + nrg_b );
+        rc = -2.0*num/(nrg_f + nrg_b);
         assert( rc > -1.0 && rc < 1.0 );
 
         /* Update inverse prediction gain */
-        tmp1 = invGain * ( 1.0 - rc * rc );
-        if( tmp1 <= minInvGain ) {
+        tmp1 = invGain*(1.0 - rc*rc);
+        if (tmp1 <= minInvGain) {
             /* Max prediction gain exceeded; set reflection coefficient such that max prediction gain is exactly hit */
-            rc = sqrt( 1.0 - minInvGain / invGain );
-            if( num > 0 ) {
+            rc = sqrt( 1.0 - minInvGain/invGain );
+            if (num > 0) {
                 /* Ensure adjusted reflection coefficients has the original sign */
                 rc = -rc;
             }
@@ -193,52 +188,52 @@ float silk_burg_analysis(              /* O    returns residual energy
         }
 
         /* Update the AR coefficients */
-        for( k = 0; k < (n + 1) >> 1; k++ ) {
+        for (k = 0; k < (n + 1)>>1; k++) {
             tmp1 = Af[ k ];
             tmp2 = Af[ n - k - 1 ];
-            Af[ k ]         = tmp1 + rc * tmp2;
-            Af[ n - k - 1 ] = tmp2 + rc * tmp1;
+            Af[ k ]         = tmp1 + rc*tmp2;
+            Af[ n - k - 1 ] = tmp2 + rc*tmp1;
         }
         Af[ n ] = rc;
 
-        if( reached_max_gain ) {
+        if (reached_max_gain) {
             /* Reached max prediction gain; set remaining coefficients to zero and exit loop */
-            for( k = n + 1; k < D; k++ ) {
+            for (k = n + 1; k < D; k++) {
                 Af[ k ] = 0.0;
             }
             break;
         }
 
         /* Update C * Af and C * Ab */
-        for( k = 0; k <= n + 1; k++ ) {
+        for (k = 0; k <= n + 1; k++) {
             tmp1 = CAf[ k ];
-            CAf[ k ]          += rc * CAb[ n - k + 1 ];
-            CAb[ n - k + 1  ] += rc * tmp1;
+            CAf[ k ]          += rc*CAb[ n - k + 1 ];
+            CAb[ n - k + 1  ] += rc*tmp1;
         }
     }
 
-    if( reached_max_gain ) {
+    if (reached_max_gain) {
         /* Convert to float */
-        for( k = 0; k < D; k++ ) {
-            A[ k ] = (float)( -Af[ k ] );
+        for (k = 0; k < D; k++) {
+            A[ k ] = (float)(-Af[ k ]);
         }
         /* Subtract energy of preceding samples from C0 */
-        for( s = 0; s < nb_subfr; s++ ) {
-            C0 -= silk_energy_FLP( x + s * subfr_length, D );
+        for (s = 0; s < nb_subfr; s++) {
+            C0 -= silk_energy_FLP( x + s*subfr_length, D );
         }
         /* Approximate residual energy */
-        nrg_f = C0 * invGain;
+        nrg_f = C0*invGain;
     } else {
         /* Compute residual energy and store coefficients as float */
         nrg_f = CAf[ 0 ];
         tmp1 = 1.0;
-        for( k = 0; k < D; k++ ) {
+        for (k = 0; k < D; k++) {
             Atmp = Af[ k ];
-            nrg_f += CAf[ k + 1 ] * Atmp;
-            tmp1  += Atmp * Atmp;
+            nrg_f += CAf[ k + 1 ]*Atmp;
+            tmp1  += Atmp*Atmp;
             A[ k ] = (float)(-Atmp);
         }
-        nrg_f -= FIND_LPC_COND_FAC * C0 * tmp1;
+        nrg_f -= FIND_LPC_COND_FAC*C0*tmp1;
     }
 
     /* Return residual energy */
diff --git a/dnn/burg.h b/dnn/burg.h
index f5998d2f7..0af32fe88 100644
--- a/dnn/burg.h
+++ b/dnn/burg.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef BURG_H
@@ -30,12 +30,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
 
 float silk_burg_analysis(              /* O    returns residual energy                                     */
-    float          A[],                /* O    prediction coefficients (length order)                      */
-    const float    x[],                /* I    input signal, length: nb_subfr*(D+L_sub)                    */
-    const float    minInvGain,         /* I    minimum inverse prediction gain                             */
-    const int      subfr_length,       /* I    input signal subframe length (incl. D preceding samples)    */
-    const int      nb_subfr,           /* I    number of subframes stacked in x                            */
-    const int      D                   /* I    order                                                       */
-);
+    float A[],                         /* O    prediction coefficients (length order)                      */
+    const float x[],                   /* I    input signal, length: nb_subfr*(D+L_sub)                    */
+    const float minInvGain,            /* I    minimum inverse prediction gain                             */
+    const int subfr_length,            /* I    input signal subframe length (incl. D preceding samples)    */
+    const int nb_subfr,                /* I    number of subframes stacked in x                            */
+    const int D                        /* I    order                                                       */
+    );
 
 #endif
diff --git a/dnn/bwe_demo.c b/dnn/bwe_demo.c
index 8241a0a1e..d8bbcc196 100644
--- a/dnn/bwe_demo.c
+++ b/dnn/bwe_demo.c
@@ -22,10 +22,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <math.h>
@@ -76,10 +76,10 @@ int main(int argc, char **argv) {
     }
 
     int16_t x_in[BWE_FRAME_SIZE];
-    int16_t x_out[3 * BWE_FRAME_SIZE];
+    int16_t x_out[3*BWE_FRAME_SIZE];
 
 
-    while(fread(x_in, sizeof(x_in[0]), BWE_FRAME_SIZE, fin) == BWE_FRAME_SIZE) {
+    while (fread(x_in, sizeof(x_in[0]), BWE_FRAME_SIZE, fin) == BWE_FRAME_SIZE) {
         osce_bwe(
             osce,
             hOSCEBWE,
@@ -87,9 +87,9 @@ int main(int argc, char **argv) {
             x_in,
             BWE_FRAME_SIZE,
             arch
-        );
+            );
 
-        fwrite(x_out, sizeof(x_out[0]), 3 * BWE_FRAME_SIZE, fout);
+        fwrite(x_out, sizeof(x_out[0]), 3*BWE_FRAME_SIZE, fout);
     }
 
     free(hOSCEBWE);
diff --git a/dnn/common.h b/dnn/common.h
index 3a1f7027d..4995af38d 100644
--- a/dnn/common.h
+++ b/dnn/common.h
@@ -9,42 +9,39 @@
 #include "oac_defines.h"
 
 #define LOG256 5.5451774445f
-static OAC_INLINE float log2_approx(float x)
-{
-   int integer;
-   float frac;
-   union {
-      float f;
-      int i;
-   } in;
-   in.f = x;
-   integer = (in.i>>23)-127;
-   in.i -= integer<<23;
-   frac = in.f - 1.5f;
-   frac = -0.41445418f + frac*(0.95909232f
-          + frac*(-0.33951290f + frac*0.16541097f));
-   return 1+integer+frac;
+static OAC_INLINE float log2_approx(float x) {
+    int integer;
+    float frac;
+    union {
+        float f;
+        int i;
+    } in;
+    in.f = x;
+    integer = (in.i>>23) - 127;
+    in.i -= integer<<23;
+    frac = in.f - 1.5f;
+    frac = -0.41445418f + frac*(0.95909232f
+                                + frac*(-0.33951290f + frac*0.16541097f));
+    return 1 + integer + frac;
 }
 
 #define log_approx(x) (0.69315f*log2_approx(x))
 
-static OAC_INLINE float ulaw2lin(float u)
-{
+static OAC_INLINE float ulaw2lin(float u) {
     float s;
     float scale_1 = 32768.f/255.f;
     u = u - 128.f;
     s = u >= 0.f ? 1.f : -1.f;
     u = fabs(u);
-    return s*scale_1*(exp(u/128.*LOG256)-1);
+    return s*scale_1*(exp(u/128.*LOG256) - 1);
 }
 
-static OAC_INLINE int lin2ulaw(float x)
-{
+static OAC_INLINE int lin2ulaw(float x) {
     float u;
     float scale = 255.f/32768.f;
     int s = x >= 0 ? 1 : -1;
     x = fabs(x);
-    u = (s*(128*log_approx(1+scale*x)/LOG256));
+    u = (s*(128*log_approx(1 + scale*x)/LOG256));
     u = 128 + u;
     if (u < 0) u = 0;
     if (u > 255) u = 255;
diff --git a/dnn/dred_coding.c b/dnn/dred_coding.c
index 669ddc413..3c6a90fc3 100644
--- a/dnn/dred_coding.c
+++ b/dnn/dred_coding.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <math.h>
@@ -37,8 +37,8 @@
 #include "dred_coding.h"
 
 int compute_quantizer(int q0, int dQ, int qmax, int i) {
-  int quant;
-  static const int dQ_table[8] = {0, 2, 3, 4, 6, 8, 12, 16};
-  quant = q0 + (dQ_table[dQ]*i + 8)/16;
-  return quant > qmax ? qmax : quant;
+    int quant;
+    static const int dQ_table[8] = {0, 2, 3, 4, 6, 8, 12, 16};
+    quant = q0 + (dQ_table[dQ]*i + 8)/16;
+    return quant > qmax ? qmax : quant;
 }
diff --git a/dnn/dred_coding.h b/dnn/dred_coding.h
index bb57cacbe..1ab87b352 100644
--- a/dnn/dred_coding.h
+++ b/dnn/dred_coding.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef DRED_CODING_H
 #define DRED_CODING_H
diff --git a/dnn/dred_compare.c b/dnn/dred_compare.c
index f3e16e64c..48f37b4fd 100644
--- a/dnn/dred_compare.c
+++ b/dnn/dred_compare.c
@@ -1,29 +1,29 @@
 /* Copyright (c) 2011-2012 Xiph.Org Foundation, Mozilla Corporation
    Written by Jean-Marc Valin and Timothy B. Terriberry */
 /*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,26 +31,26 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string.h>
 #include "mini_kfft.c"
 
-#define MAX(a,b) ((a)>(b) ? (a) : (b))
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
 #define OAC_PI (3.14159265F)
 
 #define OAC_COSF(_x)        ((float)cos(_x))
 #define OAC_SINF(_x)        ((float)sin(_x))
 
-static void *check_alloc(void *_ptr){
-  if(_ptr==NULL){
-    fprintf(stderr,"Out of memory.\n");
-    exit(EXIT_FAILURE);
-  }
-  return _ptr;
+static void *check_alloc(void *_ptr) {
+    if (_ptr == NULL) {
+        fprintf(stderr, "Out of memory.\n");
+        exit(EXIT_FAILURE);
+    }
+    return _ptr;
 }
 
-static void *oac_malloc(size_t _size){
-  return check_alloc(malloc(_size));
+static void *oac_malloc(size_t _size) {
+    return check_alloc(malloc(_size));
 }
 
-static void *oac_realloc(void *_ptr,size_t _size){
-  return check_alloc(realloc(_ptr,_size));
+static void *oac_realloc(void *_ptr, size_t _size) {
+    return check_alloc(realloc(_ptr, _size));
 }
 
 #define FORMAT_S16_LE 0
@@ -70,182 +70,180 @@ typedef union {
 
 static void biquad(float *y, float mem[2], const float *x,
                    const float *b, const float *a, int N) {
-  int i;
-  for (i=0;i<N;i++) {
-    float xi, yi;
-    xi = x[i];
-    yi = x[i] + mem[0];
-    mem[0] = mem[1] + (b[0]*(double)xi - a[0]*(double)yi);
-    mem[1] = (b[1]*(double)xi - a[1]*(double)yi);
-    y[i] = yi;
-  }
+    int i;
+    for (i = 0; i < N; i++) {
+        float xi, yi;
+        xi = x[i];
+        yi = x[i] + mem[0];
+        mem[0] = mem[1] + (b[0]*(double)xi - a[0]*(double)yi);
+        mem[1] = (b[1]*(double)xi - a[1]*(double)yi);
+        y[i] = yi;
+    }
 }
 
 static void buf_to_float(const unsigned char *buf, float *x, int len) {
-   float_bits s;
-   int i;
-   for (i=0;i<len;i++) {
-      s.i=(unsigned)buf[4*i+3]<<24
-            |buf[4*i+2]<<16
-            |buf[4*i+1]<<8
-            |buf[4*i];
-      x[i] = s.f;
-   }
+    float_bits s;
+    int i;
+    for (i = 0; i < len; i++) {
+        s.i = (unsigned)buf[4*i + 3]<<24
+              |buf[4*i + 2]<<16
+              |buf[4*i + 1]<<8
+              |buf[4*i];
+        x[i] = s.f;
+    }
 }
 
-static size_t read_pcm(float **_samples,FILE *_fin,int _nchannels,
-                       int format){
-  unsigned char  buf[1024];
-  float         *samples;
-  size_t         nsamples;
-  size_t         csamples;
-  size_t         xi;
-  size_t         nread;
-  static const float a_hp[2] = {-1.97354f, 0.97417f};
-  static const float b_hp[2] = {-2.f, 1.f};
-  float mem[2] = {0};
-  samples=NULL;
-  nsamples=csamples=0;
-  int size = format_size[format];
-
-  for(;;){
-    nread=fread(buf,size*_nchannels,1024/(size*_nchannels),_fin);
-    if(nread<=0)break;
-    if(nsamples+nread>csamples){
-      do csamples=csamples<<1|1;
-      while(nsamples+nread>csamples);
-      samples=(float *)oac_realloc(samples,
+static size_t read_pcm(float **_samples, FILE *_fin, int _nchannels,
+                       int format) {
+    unsigned char buf[1024];
+    float         *samples;
+    size_t nsamples;
+    size_t csamples;
+    size_t xi;
+    size_t nread;
+    static const float a_hp[2] = {-1.97354f, 0.97417f};
+    static const float b_hp[2] = {-2.f, 1.f};
+    float mem[2] = {0};
+    samples = NULL;
+    nsamples = csamples = 0;
+    int size = format_size[format];
+
+    for (;;) {
+        nread = fread(buf, size*_nchannels, 1024/(size*_nchannels), _fin);
+        if (nread <= 0) break;
+        if (nsamples + nread > csamples) {
+            do csamples = csamples<<1|1;
+            while (nsamples + nread > csamples);
+            samples = (float *)oac_realloc(samples,
        _nchannels*csamples*sizeof(*samples));
-    }
-    if (format==FORMAT_S16_LE) {
-      for(xi=0;xi<nread;xi++){
-        int ci;
-        for(ci=0;ci<_nchannels;ci++){
-          int s;
-          s=buf[2*(xi*_nchannels+ci)+1]<<8|buf[2*(xi*_nchannels+ci)];
-          s=((s&0xFFFF)^0x8000)-0x8000;
-          samples[(nsamples+xi)*_nchannels+ci]=s;
         }
-      }
-    } else if (format==FORMAT_S24_LE) {
-       for(xi=0;xi<nread;xi++){
-         int ci;
-         for(ci=0;ci<_nchannels;ci++){
-           int s;
-           s=buf[3*(xi*_nchannels+ci)+2]<<16
-            |buf[3*(xi*_nchannels+ci)+1]<<8
-            |buf[3*(xi*_nchannels+ci)];
-           s=((s&0xFFFFFF)^0x800000)-0x800000;
-           samples[(nsamples+xi)*_nchannels+ci]=(1.f/256.f)*s;
-         }
-       }
-     } else if (format==FORMAT_F32_LE) {
-        for(xi=0;xi<nread;xi++){
-          int ci;
-          for(ci=0;ci<_nchannels;ci++){
-            float_bits s;
-            s.i=(unsigned)buf[4*(xi*_nchannels+ci)+3]<<24
-               |buf[4*(xi*_nchannels+ci)+2]<<16
-               |buf[4*(xi*_nchannels+ci)+1]<<8
-               |buf[4*(xi*_nchannels+ci)];
-            samples[(nsamples+xi)*_nchannels+ci] = s.f*32768;
-          }
+        if (format == FORMAT_S16_LE) {
+            for (xi = 0; xi < nread; xi++) {
+                int ci;
+                for (ci = 0; ci < _nchannels; ci++) {
+                    int s;
+                    s = buf[2*(xi*_nchannels + ci) + 1]<<8|buf[2*(xi*_nchannels + ci)];
+                    s = ((s&0xFFFF)^0x8000) - 0x8000;
+                    samples[(nsamples + xi)*_nchannels + ci] = s;
+                }
+            }
+        } else if (format == FORMAT_S24_LE) {
+            for (xi = 0; xi < nread; xi++) {
+                int ci;
+                for (ci = 0; ci < _nchannels; ci++) {
+                    int s;
+                    s = buf[3*(xi*_nchannels + ci) + 2]<<16
+                        |buf[3*(xi*_nchannels + ci) + 1]<<8
+                        |buf[3*(xi*_nchannels + ci)];
+                    s = ((s&0xFFFFFF)^0x800000) - 0x800000;
+                    samples[(nsamples + xi)*_nchannels + ci] = (1.f/256.f)*s;
+                }
+            }
+        } else if (format == FORMAT_F32_LE) {
+            for (xi = 0; xi < nread; xi++) {
+                int ci;
+                for (ci = 0; ci < _nchannels; ci++) {
+                    float_bits s;
+                    s.i = (unsigned)buf[4*(xi*_nchannels + ci) + 3]<<24
+                          |buf[4*(xi*_nchannels + ci) + 2]<<16
+                          |buf[4*(xi*_nchannels + ci) + 1]<<8
+                          |buf[4*(xi*_nchannels + ci)];
+                    samples[(nsamples + xi)*_nchannels + ci] = s.f*32768;
+                }
+            }
+        } else {
+            exit(1);
         }
-      } else {
-        exit(1);
-      }
-    nsamples+=nread;
-  }
-  *_samples=(float *)oac_realloc(samples,
+        nsamples += nread;
+    }
+    *_samples = (float *)oac_realloc(samples,
    _nchannels*nsamples*sizeof(*samples));
-  biquad(*_samples, mem, *_samples, b_hp, a_hp, nsamples);
-  return nsamples;
+    biquad(*_samples, mem, *_samples, b_hp, a_hp, nsamples);
+    return nsamples;
 }
 
-static void spectrum(float *_ps,const int *_bands, int _nbands,
-                     const float *_in,int _nchannels, size_t _nframes,
-                     int _window_sz, int _step, int _downsample){
-  float window[TEST_WIN_SIZE];
-  float x[TEST_WIN_SIZE];
-  size_t xi;
-  int    xj;
-  int    ps_sz;
-  mini_kiss_fft_cpx X[2][NFREQS+1];
-  mini_kiss_fftr_cfg kfft;
-  ps_sz=_window_sz/2;
-  /* Blackman-Harris window. */
-  for(xj=0;xj<_window_sz;xj++){
-    double n = (xj+.5)/_window_sz;
-    window[xj]=0.35875 - 0.48829*cos(2*OAC_PI*n)
-             + 0.14128*cos(4*OAC_PI*n) - 0.01168*cos(6*OAC_PI*n);
-  }
-  kfft = mini_kiss_fftr_alloc(_window_sz, 0, NULL, NULL);
-  for(xi=0;xi<_nframes;xi++){
-    int ci;
-    int xk;
-    int bi;
-    for(ci=0;ci<_nchannels;ci++){
-      for(xk=0;xk<_window_sz;xk++){
-        x[xk]=window[xk]*_in[(xi*_step+xk)*_nchannels+ci];
-      }
-      mini_kiss_fftr(kfft, x, X[ci]);
-    }
-    for(bi=xj=0;bi<_nbands;bi++){
-      float p[2]={0};
-      for(;xj<_bands[bi+1];xj++){
-        for(ci=0;ci<_nchannels;ci++){
-          float re;
-          float im;
-          re = X[ci][xj].r*_downsample;
-          im = X[ci][xj].i*_downsample;
-          _ps[(xi*ps_sz+xj)*_nchannels+ci]=re*re+im*im+.1;
-          p[ci]+=_ps[(xi*ps_sz+xj)*_nchannels+ci];
+static void spectrum(float *_ps, const int *_bands, int _nbands,
+                     const float *_in, int _nchannels, size_t _nframes,
+                     int _window_sz, int _step, int _downsample) {
+    float window[TEST_WIN_SIZE];
+    float x[TEST_WIN_SIZE];
+    size_t xi;
+    int xj;
+    int ps_sz;
+    mini_kiss_fft_cpx X[2][NFREQS + 1];
+    mini_kiss_fftr_cfg kfft;
+    ps_sz = _window_sz/2;
+    /* Blackman-Harris window. */
+    for (xj = 0; xj < _window_sz; xj++) {
+        double n = (xj + .5)/_window_sz;
+        window[xj] = 0.35875 - 0.48829*cos(2*OAC_PI*n)
+                     + 0.14128*cos(4*OAC_PI*n) - 0.01168*cos(6*OAC_PI*n);
+    }
+    kfft = mini_kiss_fftr_alloc(_window_sz, 0, NULL, NULL);
+    for (xi = 0; xi < _nframes; xi++) {
+        int ci;
+        int xk;
+        int bi;
+        for (ci = 0; ci < _nchannels; ci++) {
+            for (xk = 0; xk < _window_sz; xk++) {
+                x[xk] = window[xk]*_in[(xi*_step + xk)*_nchannels + ci];
+            }
+            mini_kiss_fftr(kfft, x, X[ci]);
+        }
+        for (bi = xj = 0; bi < _nbands; bi++) {
+            float p[2] = {0};
+            for (; xj < _bands[bi + 1]; xj++) {
+                for (ci = 0; ci < _nchannels; ci++) {
+                    float re;
+                    float im;
+                    re = X[ci][xj].r*_downsample;
+                    im = X[ci][xj].i*_downsample;
+                    _ps[(xi*ps_sz + xj)*_nchannels + ci] = re*re + im*im + .1;
+                    p[ci] += _ps[(xi*ps_sz + xj)*_nchannels + ci];
+                }
+            }
         }
-      }
     }
-  }
-  free(kfft);
+    free(kfft);
 }
 
 
 /*Bands on which we compute the pseudo-NMR (Bark-derived
-  CELT bands).*/
-static const int BANDS[NBANDS+1]={
-  0,8,16,24,32,40,48,56,64,80,96,112,128,160,192,224,272,320
+   CELT bands).*/
+static const int BANDS[NBANDS + 1] = {
+    0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 272, 320
 };
 
 
 void usage(const char *_argv0) {
-  fprintf(stderr,"Usage: %s -audio [-s16|-s24|-f32]"
+    fprintf(stderr, "Usage: %s -audio [-s16|-s24|-f32]"
   " [-thresholds err4 err16 pitch]"
   " <file1> <file2>\n", _argv0);
-  fprintf(stderr,"       %s -features"
+    fprintf(stderr, "       %s -features"
   " [-thresholds tot max pitch]"
   " <file1.f32> <file2.f32>\n", _argv0);
 
 }
 
 /* Taken from ancient CELT code */
-void psydecay_init(float *decayL, float *decayR, int len, int Fs)
-{
-   int i;
-   for (i=0;i<len;i++)
-   {
-      float f;
-      float deriv;
-      /* Real frequency (in Hz) */
-      f = Fs*i*(1/(2.f*len));
-      /* This is the derivative of the Vorbis freq->Bark function. */
-      deriv = (8.288e-8 * f)/(3.4225e-16 *f*f*f*f + 1)
-            + .009694/(5.476e-7 *f*f + 1) + 1e-4;
-      /* Back to FFT bin units */
-      deriv *= Fs*(1/(2.f*len));
-      /* decay corresponding to -10dB/Bark */
-      decayR[i] = pow(.1f, deriv);
-      /* decay corresponding to -25dB/Bark */
-      decayL[i] = pow(0.0031623f, deriv);
-      /*printf ("%f %f\n", decayL[i], decayR[i]);*/
-   }
+void psydecay_init(float *decayL, float *decayR, int len, int Fs) {
+    int i;
+    for (i = 0; i < len; i++) {
+        float f;
+        float deriv;
+        /* Real frequency (in Hz) */
+        f = Fs*i*(1/(2.f*len));
+        /* This is the derivative of the Vorbis freq->Bark function. */
+        deriv = (8.288e-8*f)/(3.4225e-16*f*f*f*f + 1)
+                + .009694/(5.476e-7*f*f + 1) + 1e-4;
+        /* Back to FFT bin units */
+        deriv *= Fs*(1/(2.f*len));
+        /* decay corresponding to -10dB/Bark */
+        decayR[i] = pow(.1f, deriv);
+        /* decay corresponding to -25dB/Bark */
+        decayL[i] = pow(0.0031623f, deriv);
+        /*printf ("%f %f\n", decayL[i], decayR[i]);*/
+    }
 }
 
 #define PITCH_MIN 32
@@ -253,402 +251,402 @@ void psydecay_init(float *decayL, float *decayR, int len, int Fs)
 #define PITCH_FRAME 320
 
 static float inner_prod(const float *x, const float *y, int len) {
-  float sum=0;
-  int i;
-  for (i=0;i<len;i++) sum += x[i]*y[i];
-  return sum;
+    float sum = 0;
+    int i;
+    for (i = 0; i < len; i++) sum += x[i]*y[i];
+    return sum;
 }
 
 static void compute_xcorr(const float *x, float *xcorr) {
-  int i;
-  float xx;
-  float filtered[PITCH_FRAME+PITCH_MAX];
-  for (i=0;i<PITCH_FRAME+PITCH_MAX;i++) {
-    filtered[i] = x[i-PITCH_MAX] - .8*x[i-PITCH_MAX-1];
-  }
-  xx = inner_prod(&filtered[PITCH_MAX],
+    int i;
+    float xx;
+    float filtered[PITCH_FRAME + PITCH_MAX];
+    for (i = 0; i < PITCH_FRAME + PITCH_MAX; i++) {
+        filtered[i] = x[i - PITCH_MAX] - .8*x[i - PITCH_MAX - 1];
+    }
+    xx = inner_prod(&filtered[PITCH_MAX],
                   &filtered[PITCH_MAX], PITCH_FRAME);
-  for (i=0;i<=PITCH_MAX;i++) {
-    float xy, yy;
-    xy = inner_prod(&filtered[PITCH_MAX],
-                    &filtered[PITCH_MAX-i], PITCH_FRAME);
-    yy = inner_prod(&filtered[PITCH_MAX-i],
-                    &filtered[PITCH_MAX-i], PITCH_FRAME);
-    xcorr[i] = xy/sqrt(xx*yy+PITCH_FRAME);
-  }
+    for (i = 0; i <= PITCH_MAX; i++) {
+        float xy, yy;
+        xy = inner_prod(&filtered[PITCH_MAX],
+                    &filtered[PITCH_MAX - i], PITCH_FRAME);
+        yy = inner_prod(&filtered[PITCH_MAX - i],
+                    &filtered[PITCH_MAX - i], PITCH_FRAME);
+        xcorr[i] = xy/sqrt(xx*yy + PITCH_FRAME);
+    }
 }
 
 #define LOUDNESS 0.2f
-int compare_audio(int _argc,const char **_argv, const char *argv0){
-  FILE    *fin1;
-  FILE    *fin2;
-  float   *x;
-  float   *y;
-  float   *X;
-  float   *Y;
-  double    err4;
-  double    err16;
-  double    T2;
-  size_t   xlength;
-  size_t   ylength;
-  size_t   nframes;
-  size_t   xi;
-  int      ci;
-  int      xj;
-  int      bi;
-  int      nchannels;
-  int      downsample;
-  int      nbands;
-  int      ybands;
-  int      nfreqs;
-  int      yfreqs;
-  size_t   test_win_size;
-  size_t   test_win_step;
-  int      max_compare;
-  int      format;
-  int      skip=0;
-  double err4_threshold=-1, err16_threshold=-1, pitch_threshold=-1;
-  int compare_thresholds=0;
-  float decayL[NFREQS], decayR[NFREQS];
-  float norm[NFREQS];
-  float pitch_error=0;
-  int pitch_count=0;
-  psydecay_init(decayL, decayR, NFREQS, 16000);
-  if(_argc<3){
-    usage(argv0);
-    return EXIT_FAILURE;
-  }
-  nchannels=1;
-  ybands=nbands=NBANDS;
-  nfreqs=NFREQS;
-  test_win_size=TEST_WIN_SIZE;
-  test_win_step=TEST_WIN_STEP;
-  downsample=1;
-  format=FORMAT_S16_LE;
-  while (_argc > 3) {
-    if(strcmp(_argv[1],"-s16")==0){
-      format=FORMAT_S16_LE;
-      _argv++;
-      _argc--;
-    } else if(strcmp(_argv[1],"-s24")==0){
-      format=FORMAT_S24_LE;
-      _argv++;
-      _argc--;
-    } else if(strcmp(_argv[1],"-f32")==0){
-      format=FORMAT_F32_LE;
-      _argv++;
-      _argc--;
-    } else if(strcmp(_argv[1],"-skip")==0){
-      skip=atoi(_argv[2]);
-      _argv+=2;
-      _argc-=2;
-    } else if(strcmp(_argv[1],"-thresholds")==0){
-      if (_argc < 7) {
+int compare_audio(int _argc, const char **_argv, const char *argv0) {
+    FILE    *fin1;
+    FILE    *fin2;
+    float   *x;
+    float   *y;
+    float   *X;
+    float   *Y;
+    double err4;
+    double err16;
+    double T2;
+    size_t xlength;
+    size_t ylength;
+    size_t nframes;
+    size_t xi;
+    int ci;
+    int xj;
+    int bi;
+    int nchannels;
+    int downsample;
+    int nbands;
+    int ybands;
+    int nfreqs;
+    int yfreqs;
+    size_t test_win_size;
+    size_t test_win_step;
+    int max_compare;
+    int format;
+    int skip = 0;
+    double err4_threshold = -1, err16_threshold = -1, pitch_threshold = -1;
+    int compare_thresholds = 0;
+    float decayL[NFREQS], decayR[NFREQS];
+    float norm[NFREQS];
+    float pitch_error = 0;
+    int pitch_count = 0;
+    psydecay_init(decayL, decayR, NFREQS, 16000);
+    if (_argc < 3) {
         usage(argv0);
         return EXIT_FAILURE;
-      }
-      err4_threshold=atof(_argv[2]);
-      err16_threshold=atof(_argv[3]);
-      pitch_threshold=atof(_argv[4]);
-      compare_thresholds=1;
-      _argv+=4;
-      _argc-=4;
-    } else {
-      usage(argv0);
-      return EXIT_FAILURE;
     }
-  }
-  if(_argc!=3){
-    usage(argv0);
-    return EXIT_FAILURE;
-  }
-  downsample=1;
-  yfreqs=nfreqs/downsample;
-  fin1=fopen(_argv[1],"rb");
-  if(fin1==NULL){
-    fprintf(stderr,"Error opening '%s'.\n",_argv[1]);
-    return EXIT_FAILURE;
-  }
-  fin2=fopen(_argv[2],"rb");
-  if(fin2==NULL){
-    fprintf(stderr,"Error opening '%s'.\n",_argv[2]);
+    nchannels = 1;
+    ybands = nbands = NBANDS;
+    nfreqs = NFREQS;
+    test_win_size = TEST_WIN_SIZE;
+    test_win_step = TEST_WIN_STEP;
+    downsample = 1;
+    format = FORMAT_S16_LE;
+    while (_argc > 3) {
+        if (strcmp(_argv[1], "-s16") == 0) {
+            format = FORMAT_S16_LE;
+            _argv++;
+            _argc--;
+        } else if (strcmp(_argv[1], "-s24") == 0) {
+            format = FORMAT_S24_LE;
+            _argv++;
+            _argc--;
+        } else if (strcmp(_argv[1], "-f32") == 0) {
+            format = FORMAT_F32_LE;
+            _argv++;
+            _argc--;
+        } else if (strcmp(_argv[1], "-skip") == 0) {
+            skip = atoi(_argv[2]);
+            _argv += 2;
+            _argc -= 2;
+        } else if (strcmp(_argv[1], "-thresholds") == 0) {
+            if (_argc < 7) {
+                usage(argv0);
+                return EXIT_FAILURE;
+            }
+            err4_threshold = atof(_argv[2]);
+            err16_threshold = atof(_argv[3]);
+            pitch_threshold = atof(_argv[4]);
+            compare_thresholds = 1;
+            _argv += 4;
+            _argc -= 4;
+        } else {
+            usage(argv0);
+            return EXIT_FAILURE;
+        }
+    }
+    if (_argc != 3) {
+        usage(argv0);
+        return EXIT_FAILURE;
+    }
+    downsample = 1;
+    yfreqs = nfreqs/downsample;
+    fin1 = fopen(_argv[1], "rb");
+    if (fin1 == NULL) {
+        fprintf(stderr, "Error opening '%s'.\n", _argv[1]);
+        return EXIT_FAILURE;
+    }
+    fin2 = fopen(_argv[2], "rb");
+    if (fin2 == NULL) {
+        fprintf(stderr, "Error opening '%s'.\n", _argv[2]);
+        fclose(fin1);
+        return EXIT_FAILURE;
+    }
+    /*Read in the data and allocate scratch space.*/
+    xlength = read_pcm(&x, fin1, 1, format);
     fclose(fin1);
-    return EXIT_FAILURE;
-  }
-  /*Read in the data and allocate scratch space.*/
-  xlength=read_pcm(&x,fin1,1,format);
-  fclose(fin1);
-  ylength=read_pcm(&y,fin2,nchannels,format);
-  fclose(fin2);
-  skip *= nchannels;
-  y += skip/downsample;
-  ylength -= skip/downsample;
-  if (ylength*downsample > xlength) ylength = xlength/downsample;
-  if(xlength!=ylength*downsample){
-    fprintf(stderr,"Sample counts do not match (%lu!=%lu).\n",
-     (unsigned long)xlength,(unsigned long)ylength*downsample);
-    return EXIT_FAILURE;
-  }
-  if(xlength<test_win_size){
-    fprintf(stderr,"Insufficient sample data (%lu<%lu).\n",
-     (unsigned long)xlength,(unsigned long)test_win_size);
-    return EXIT_FAILURE;
-  }
-  nframes=(xlength-test_win_size+test_win_step)/test_win_step;
-  X=(float *)oac_malloc(nframes*nfreqs*nchannels*sizeof(*X));
-  Y=(float *)oac_malloc(nframes*yfreqs*nchannels*sizeof(*Y));
+    ylength = read_pcm(&y, fin2, nchannels, format);
+    fclose(fin2);
+    skip *= nchannels;
+    y += skip/downsample;
+    ylength -= skip/downsample;
+    if (ylength*downsample > xlength) ylength = xlength/downsample;
+    if (xlength != ylength*downsample) {
+        fprintf(stderr, "Sample counts do not match (%lu!=%lu).\n",
+            (unsigned long)xlength, (unsigned long)ylength*downsample);
+        return EXIT_FAILURE;
+    }
+    if (xlength < test_win_size) {
+        fprintf(stderr, "Insufficient sample data (%lu<%lu).\n",
+            (unsigned long)xlength, (unsigned long)test_win_size);
+        return EXIT_FAILURE;
+    }
+    nframes = (xlength - test_win_size + test_win_step)/test_win_step;
+    X = (float *)oac_malloc(nframes*nfreqs*nchannels*sizeof(*X));
+    Y = (float *)oac_malloc(nframes*yfreqs*nchannels*sizeof(*Y));
+
+    for (xi = 2; xi < nframes - 2; xi++) {
+        float xcorr[PITCH_MAX + 1], ycorr[PITCH_MAX + 1];
+        int i;
+        float maxcorr = -1;
+        int pitch = 0;
+        compute_xcorr(&x[xi*TEST_WIN_STEP], xcorr);
+        compute_xcorr(&y[xi*TEST_WIN_STEP], ycorr);
+        for (i = PITCH_MIN; i <= PITCH_MAX; i++) {
+            if (xcorr[i] > maxcorr) {
+                maxcorr = xcorr[i];
+                pitch = i;
+            }
+        }
+        if (xcorr[pitch] > .7) {
+            pitch_error += fabs(xcorr[pitch] - ycorr[pitch]);
+            pitch_count++;
+        }
+    }
+    pitch_error /= pitch_count;
+
+    /*Compute the per-band spectral energy of the original signal
+       and the error.*/
+    spectrum(X, BANDS, nbands, x, nchannels, nframes,
+        test_win_size, test_win_step, 1);
+    free(x);
+    spectrum(Y, BANDS, ybands, y, nchannels, nframes,
+        test_win_size/downsample, test_win_step/downsample, downsample);
+    free(y - skip/downsample);
+
+    norm[0] = 1;
+    for (xj = 1; xj < NFREQS; xj++) {
+        norm[xj] = 1 + decayR[xj]*norm[xj - 1];
+    }
+    for (xj = NFREQS - 2; xj >= 0; xj--) {
+        norm[xj] = norm[xj] + decayL[xj]*norm[xj + 1];
+    }
+    for (xj = 0; xj < NFREQS; xj++) norm[xj] = 1.f/norm[xj];
+    for (xi = 0; xi < nframes; xi++) {
+        for (xj = 1; xj < NFREQS; xj++) {
+            X[xi*nfreqs + xj] = X[xi*nfreqs + xj] + decayR[xj]*X[xi*nfreqs + xj - 1];
+            Y[xi*nfreqs + xj] = Y[xi*nfreqs + xj] + decayR[xj]*Y[xi*nfreqs + xj - 1];
+        }
+        for (xj = NFREQS - 2; xj >= 0; xj--) {
+            X[xi*nfreqs + xj] = X[xi*nfreqs + xj] + decayL[xj]*X[xi*nfreqs + xj + 1];
+            Y[xi*nfreqs + xj] = Y[xi*nfreqs + xj] + decayL[xj]*Y[xi*nfreqs + xj + 1];
+        }
+        for (xj = 0; xj < NFREQS; xj++) {
+            X[xi*nfreqs + xj] *= norm[xj];
+            Y[xi*nfreqs + xj] *= norm[xj];
+        }
+    }
 
-  for(xi=2;xi<nframes-2;xi++){
-    float xcorr[PITCH_MAX+1], ycorr[PITCH_MAX+1];
-    int i;
-    float maxcorr=-1;
-    int pitch=0;
-    compute_xcorr(&x[xi*TEST_WIN_STEP], xcorr);
-    compute_xcorr(&y[xi*TEST_WIN_STEP], ycorr);
-    for (i=PITCH_MIN;i<=PITCH_MAX;i++) {
-      if (xcorr[i] > maxcorr) {
-        maxcorr = xcorr[i];
-        pitch = i;
-      }
-    }
-    if (xcorr[pitch] > .7) {
-      pitch_error += fabs(xcorr[pitch]-ycorr[pitch]);
-      pitch_count++;
-    }
-  }
-  pitch_error /= pitch_count;
-
-  /*Compute the per-band spectral energy of the original signal
-     and the error.*/
-  spectrum(X,BANDS,nbands,x,nchannels,nframes,
-        test_win_size,test_win_step,1);
-  free(x);
-  spectrum(Y,BANDS,ybands,y,nchannels,nframes,
-        test_win_size/downsample,test_win_step/downsample,downsample);
-  free(y-skip/downsample);
-
-  norm[0]=1;
-  for(xj=1;xj<NFREQS;xj++){
-    norm[xj] = 1 + decayR[xj]*norm[xj-1];
-  }
-  for(xj=NFREQS-2;xj>=0;xj--){
-    norm[xj] = norm[xj] + decayL[xj]*norm[xj+1];
-  }
-  for(xj=0;xj<NFREQS;xj++) norm[xj] = 1.f/norm[xj];
-  for(xi=0;xi<nframes;xi++){
-    for(xj=1;xj<NFREQS;xj++){
-      X[xi*nfreqs+xj] = X[xi*nfreqs+xj]+decayR[xj]*X[xi*nfreqs+xj-1];
-      Y[xi*nfreqs+xj] = Y[xi*nfreqs+xj]+decayR[xj]*Y[xi*nfreqs+xj-1];
-    }
-    for(xj=NFREQS-2;xj>=0;xj--){
-      X[xi*nfreqs+xj] = X[xi*nfreqs+xj]+decayL[xj]*X[xi*nfreqs+xj+1];
-      Y[xi*nfreqs+xj] = Y[xi*nfreqs+xj]+decayL[xj]*Y[xi*nfreqs+xj+1];
-    }
-    for(xj=0;xj<NFREQS;xj++){
-      X[xi*nfreqs+xj] *= norm[xj];
-      Y[xi*nfreqs+xj] *= norm[xj];
-    }
-  }
-
-  for(xi=0;xi<nframes;xi++){
-    float maxE=0;
-    for(xj=0;xj<NFREQS;xj++){
-      maxE = MAX(maxE, X[xi*nfreqs+xj]);
-    }
-    /* Allow for up to 80 dB instantaneous dynamic range. */
-    for(xj=0;xj<NFREQS;xj++){
-      X[xi*nfreqs+xj] = MAX(1e-8*maxE, X[xi*nfreqs+xj]);
-      Y[xi*nfreqs+xj] = MAX(1e-8*maxE, Y[xi*nfreqs+xj]);
-    }
-    /* Forward temporal masking: -3 dB/2.5ms slope.*/
-    if(xi>0){
-      for(xj=0;xj<NFREQS;xj++){
-        X[xi*nfreqs+xj] += .5f*X[(xi-1)*nfreqs+xj];
-        Y[xi*nfreqs+xj] += .5f*Y[(xi-1)*nfreqs+xj];
-      }
-    }
-  }
-
-  /*Backward temporal masking: -10 dB/2.5ms slope.*/
-  for(xi=nframes-2;xi-->0;){
-    for(xj=0;xj<NFREQS;xj++){
-      X[xi*nfreqs+xj] += .1f*X[(xi+1)*nfreqs+xj];
-      Y[xi*nfreqs+xj] += .1f*Y[(xi+1)*nfreqs+xj];
-    }
-  }
-
-  max_compare=BANDS[nbands];
-  err4=0;
-  err16=0;
-  T2=0;
-  for(xi=0;xi<nframes;xi++){
-    double Ef2, Ef4, Tf2;
-    Ef2=0;
-    Ef4=0;
-    Tf2=0;
-    for(bi=0;bi<ybands;bi++){
-      double Eb2, Eb4, Tb2;
-      double w;
-      Tb2=Eb2=Eb4=0;
-      w = 1.f/(BANDS[bi+1]-BANDS[bi]);
-      for(xj=BANDS[bi];xj<BANDS[bi+1]&&xj<max_compare;xj++){
-        float f, thresh;
-        f = xj*OAC_PI/960;
-        /* Shape the lower threshold similar to 1/(1 - 0.85*z^-1)
-           deemphasis filter at 48 kHz. */
-        thresh = .1/(.15*.15 + f*f);
-        for(ci=0;ci<nchannels;ci++){
-          float re;
-          float im;
-          re = pow(Y[(xi*yfreqs+xj)*nchannels+ci]+thresh,LOUDNESS)
-             - pow(X[(xi*nfreqs+xj)*nchannels+ci]+thresh,LOUDNESS);
-          im = re*re;
-          Tb2 += w*pow(X[(xi*nfreqs+xj)*nchannels+ci]+thresh,
+    for (xi = 0; xi < nframes; xi++) {
+        float maxE = 0;
+        for (xj = 0; xj < NFREQS; xj++) {
+            maxE = MAX(maxE, X[xi*nfreqs + xj]);
+        }
+        /* Allow for up to 80 dB instantaneous dynamic range. */
+        for (xj = 0; xj < NFREQS; xj++) {
+            X[xi*nfreqs + xj] = MAX(1e-8*maxE, X[xi*nfreqs + xj]);
+            Y[xi*nfreqs + xj] = MAX(1e-8*maxE, Y[xi*nfreqs + xj]);
+        }
+        /* Forward temporal masking: -3 dB/2.5ms slope.*/
+        if (xi > 0) {
+            for (xj = 0; xj < NFREQS; xj++) {
+                X[xi*nfreqs + xj] += .5f*X[(xi - 1)*nfreqs + xj];
+                Y[xi*nfreqs + xj] += .5f*Y[(xi - 1)*nfreqs + xj];
+            }
+        }
+    }
+
+    /*Backward temporal masking: -10 dB/2.5ms slope.*/
+    for (xi = nframes - 2; xi-- > 0;) {
+        for (xj = 0; xj < NFREQS; xj++) {
+            X[xi*nfreqs + xj] += .1f*X[(xi + 1)*nfreqs + xj];
+            Y[xi*nfreqs + xj] += .1f*Y[(xi + 1)*nfreqs + xj];
+        }
+    }
+
+    max_compare = BANDS[nbands];
+    err4 = 0;
+    err16 = 0;
+    T2 = 0;
+    for (xi = 0; xi < nframes; xi++) {
+        double Ef2, Ef4, Tf2;
+        Ef2 = 0;
+        Ef4 = 0;
+        Tf2 = 0;
+        for (bi = 0; bi < ybands; bi++) {
+            double Eb2, Eb4, Tb2;
+            double w;
+            Tb2 = Eb2 = Eb4 = 0;
+            w = 1.f/(BANDS[bi + 1] - BANDS[bi]);
+            for (xj = BANDS[bi]; xj < BANDS[bi + 1] && xj < max_compare; xj++) {
+                float f, thresh;
+                f = xj*OAC_PI/960;
+                /* Shape the lower threshold similar to 1/(1 - 0.85*z^-1)
+                   deemphasis filter at 48 kHz. */
+                thresh = .1/(.15*.15 + f*f);
+                for (ci = 0; ci < nchannels; ci++) {
+                    float re;
+                    float im;
+                    re = pow(Y[(xi*yfreqs + xj)*nchannels + ci] + thresh, LOUDNESS)
+                         - pow(X[(xi*nfreqs + xj)*nchannels + ci] + thresh, LOUDNESS);
+                    im = re*re;
+                    Tb2 += w*pow(X[(xi*nfreqs + xj)*nchannels + ci] + thresh,
                      2*LOUDNESS);
-          /* Per-band error weighting. */
-          im *= w;
-          Eb2+=im;
-          /* Same for 4th power, but make it less sensitive to
-             very low energies. */
-          re = pow(Y[(xi*yfreqs+xj)*nchannels+ci]+10*thresh,LOUDNESS)
-             - pow(X[(xi*nfreqs+xj)*nchannels+ci]+10*thresh,LOUDNESS);
-          im = re*re;
-          /* Per-band error weighting. */
-          im *= w;
-          Eb4+=im;
+                    /* Per-band error weighting. */
+                    im *= w;
+                    Eb2 += im;
+                    /* Same for 4th power, but make it less sensitive to
+                       very low energies. */
+                    re = pow(Y[(xi*yfreqs + xj)*nchannels + ci] + 10*thresh, LOUDNESS)
+                         - pow(X[(xi*nfreqs + xj)*nchannels + ci] + 10*thresh, LOUDNESS);
+                    im = re*re;
+                    /* Per-band error weighting. */
+                    im *= w;
+                    Eb4 += im;
+                }
+            }
+            Eb2 /= (BANDS[bi + 1] - BANDS[bi])*nchannels;
+            Eb4 /= (BANDS[bi + 1] - BANDS[bi])*nchannels;
+            Tb2 /= (BANDS[bi + 1] - BANDS[bi])*nchannels;
+            Ef2 += Eb2;
+            Ef4 += Eb4*Eb4;
+            Tf2 += Tb2;
         }
-      }
-      Eb2 /= (BANDS[bi+1]-BANDS[bi])*nchannels;
-      Eb4 /= (BANDS[bi+1]-BANDS[bi])*nchannels;
-      Tb2 /= (BANDS[bi+1]-BANDS[bi])*nchannels;
-      Ef2 += Eb2;
-      Ef4 += Eb4*Eb4;
-      Tf2 += Tb2;
-    }
-    Ef2/=nbands;
-    Ef4/=nbands;
-    Ef4*=Ef4;
-    Tf2/=nbands;
-    err4+=Ef2*Ef2;
-    err16+=Ef4*Ef4;
-    T2 += Tf2;
-  }
-  free(X);
-  free(Y);
-  err4=100*pow(err4/nframes,1.0/4)/sqrt(T2);
-  err16=100*pow(err16/nframes,1.0/16)/sqrt(T2);
-  fprintf(stderr, "err4 = %f, err16 = %f, pitch = %f\n",
+        Ef2 /= nbands;
+        Ef4 /= nbands;
+        Ef4 *= Ef4;
+        Tf2 /= nbands;
+        err4 += Ef2*Ef2;
+        err16 += Ef4*Ef4;
+        T2 += Tf2;
+    }
+    free(X);
+    free(Y);
+    err4 = 100*pow(err4/nframes, 1.0/4)/sqrt(T2);
+    err16 = 100*pow(err16/nframes, 1.0/16)/sqrt(T2);
+    fprintf(stderr, "err4 = %f, err16 = %f, pitch = %f\n",
           err4, err16, pitch_error);
-  if (compare_thresholds) {
-    if (err4 <= err4_threshold && err16 <= err16_threshold && pitch_error <= pitch_threshold) {
-      fprintf(stderr, "Comparison PASSED\n");
-    } else {
-      fprintf(stderr, "*** Comparison FAILED ***"
+    if (compare_thresholds) {
+        if (err4 <= err4_threshold && err16 <= err16_threshold && pitch_error <= pitch_threshold) {
+            fprintf(stderr, "Comparison PASSED\n");
+        } else {
+            fprintf(stderr, "*** Comparison FAILED ***"
       " (thresholds were %f %f %f)\n", err4_threshold, err16_threshold, pitch_threshold);
-      return EXIT_FAILURE;
+            return EXIT_FAILURE;
+        }
     }
-  }
-  return EXIT_SUCCESS;
+    return EXIT_SUCCESS;
 }
 
 #define NB_FEATURES 20
 
-int compare_features(int _argc,const char **_argv, const char *argv0){
-   FILE    *fin1=NULL;
-   FILE    *fin2=NULL;
-   int i;
-   float mse[NB_FEATURES]={0};
-   int count=0;
-   int pitch_count=0;
-   float pitch_error=0;
-   float tot_error=0, max_error=0;
-   float tot_threshold=-1, max_threshold=-1, pitch_threshold=-1;
-   int compare_thresholds=0;
-   if(strcmp(_argv[1],"-thresholds")==0){
-     if (_argc < 7) {
-       usage(argv0);
-       return EXIT_FAILURE;
-     }
-     tot_threshold=atof(_argv[2]);
-     max_threshold=atof(_argv[3]);
-     pitch_threshold=atof(_argv[4]);
-     compare_thresholds=1;
-     _argv+=4;
-     _argc-=4;
-   }
-   if(_argc!=3) {
-      usage(argv0);
-      return EXIT_FAILURE;
-   }
-   fin1=fopen(_argv[1],"rb");
-   if(fin1==NULL){
-     fprintf(stderr,"Error opening '%s'.\n",_argv[1]);
-     return EXIT_FAILURE;
-   }
-   fin2=fopen(_argv[2],"rb");
-   if(fin2==NULL){
-     fprintf(stderr,"Error opening '%s'.\n",_argv[2]);
-     fclose(fin1);
-     return EXIT_FAILURE;
-   }
-   while (1) {
-      int ret;
-      float x[NB_FEATURES], y[NB_FEATURES];
-      unsigned char buf[NB_FEATURES*4];
-      ret = fread(buf, NB_FEATURES*4, 1, fin1);
-      if (ret != 1) break;
-      buf_to_float(buf, x, NB_FEATURES);
-      ret = fread(buf, NB_FEATURES*4, 1, fin2);
-      if (ret != 1) {
-         fprintf(stderr, "Error: truncated test file\n");
-         return EXIT_FAILURE;
-      }
-      buf_to_float(buf, y, NB_FEATURES);
-      for (i=0;i<NB_FEATURES;i++) {
-         float e = (x[i]-y[i]);
-         mse[i] += e*e;
-      }
-      if (x[NB_FEATURES-1] > .2) {
-         pitch_error += fabs(x[NB_FEATURES-2]-y[NB_FEATURES-2]);
-         pitch_count++;
-      }
-      count++;
-   }
-   pitch_error /= pitch_count;
-   for(i=0;i<NB_FEATURES;i++) {
-      mse[i] /= count;
-      if (i != NB_FEATURES-2) {
-         tot_error += mse[i];
-         max_error = MAX(max_error, mse[i]);
-      }
-   }
-   tot_error = sqrt(tot_error);
-   max_error = sqrt(max_error);
-   fprintf(stderr, "total = %f, max = %f, pitch = %f\n", tot_error, max_error, pitch_error);
-   if (compare_thresholds) {
-     if (tot_error <= tot_threshold && max_error <= max_threshold && pitch_error <= pitch_threshold) {
-       fprintf(stderr, "Comparison PASSED\n");
-     } else {
-       fprintf(stderr, "*** Comparison FAILED ***"
+int compare_features(int _argc, const char **_argv, const char *argv0) {
+    FILE    *fin1 = NULL;
+    FILE    *fin2 = NULL;
+    int i;
+    float mse[NB_FEATURES] = {0};
+    int count = 0;
+    int pitch_count = 0;
+    float pitch_error = 0;
+    float tot_error = 0, max_error = 0;
+    float tot_threshold = -1, max_threshold = -1, pitch_threshold = -1;
+    int compare_thresholds = 0;
+    if (strcmp(_argv[1], "-thresholds") == 0) {
+        if (_argc < 7) {
+            usage(argv0);
+            return EXIT_FAILURE;
+        }
+        tot_threshold = atof(_argv[2]);
+        max_threshold = atof(_argv[3]);
+        pitch_threshold = atof(_argv[4]);
+        compare_thresholds = 1;
+        _argv += 4;
+        _argc -= 4;
+    }
+    if (_argc != 3) {
+        usage(argv0);
+        return EXIT_FAILURE;
+    }
+    fin1 = fopen(_argv[1], "rb");
+    if (fin1 == NULL) {
+        fprintf(stderr, "Error opening '%s'.\n", _argv[1]);
+        return EXIT_FAILURE;
+    }
+    fin2 = fopen(_argv[2], "rb");
+    if (fin2 == NULL) {
+        fprintf(stderr, "Error opening '%s'.\n", _argv[2]);
+        fclose(fin1);
+        return EXIT_FAILURE;
+    }
+    while (1) {
+        int ret;
+        float x[NB_FEATURES], y[NB_FEATURES];
+        unsigned char buf[NB_FEATURES*4];
+        ret = fread(buf, NB_FEATURES*4, 1, fin1);
+        if (ret != 1) break;
+        buf_to_float(buf, x, NB_FEATURES);
+        ret = fread(buf, NB_FEATURES*4, 1, fin2);
+        if (ret != 1) {
+            fprintf(stderr, "Error: truncated test file\n");
+            return EXIT_FAILURE;
+        }
+        buf_to_float(buf, y, NB_FEATURES);
+        for (i = 0; i < NB_FEATURES; i++) {
+            float e = (x[i] - y[i]);
+            mse[i] += e*e;
+        }
+        if (x[NB_FEATURES - 1] > .2) {
+            pitch_error += fabs(x[NB_FEATURES - 2] - y[NB_FEATURES - 2]);
+            pitch_count++;
+        }
+        count++;
+    }
+    pitch_error /= pitch_count;
+    for (i = 0; i < NB_FEATURES; i++) {
+        mse[i] /= count;
+        if (i != NB_FEATURES - 2) {
+            tot_error += mse[i];
+            max_error = MAX(max_error, mse[i]);
+        }
+    }
+    tot_error = sqrt(tot_error);
+    max_error = sqrt(max_error);
+    fprintf(stderr, "total = %f, max = %f, pitch = %f\n", tot_error, max_error, pitch_error);
+    if (compare_thresholds) {
+        if (tot_error <= tot_threshold && max_error <= max_threshold && pitch_error <= pitch_threshold) {
+            fprintf(stderr, "Comparison PASSED\n");
+        } else {
+            fprintf(stderr, "*** Comparison FAILED ***"
        " (thresholds were %f %f %f)\n", tot_threshold, max_threshold, pitch_threshold);
-       return EXIT_FAILURE;
-     }
-   }
-   if (fin1) fclose(fin1);
-   if (fin2) fclose(fin2);
-   return EXIT_SUCCESS;
+            return EXIT_FAILURE;
+        }
+    }
+    if (fin1) fclose(fin1);
+    if (fin2) fclose(fin2);
+    return EXIT_SUCCESS;
 }
 
-int main(int _argc,const char **_argv){
-  if (_argc<3) {
-     usage(_argv[0]);
-  } else if (strcmp(_argv[1], "-audio")==0) {
-     return compare_audio(_argc-1, _argv+1, _argv[0]);
-  } else if (strcmp(_argv[1], "-features")==0) {
-     return compare_features(_argc-1, _argv+1, _argv[0]);
-  } else {
-     fprintf(stderr, "%s: First argument must be either -audio or -features\n\n", _argv[0]);
-     usage(_argv[0]);
-  }
-  return EXIT_FAILURE;
+int main(int _argc, const char **_argv) {
+    if (_argc < 3) {
+        usage(_argv[0]);
+    } else if (strcmp(_argv[1], "-audio") == 0) {
+        return compare_audio(_argc - 1, _argv + 1, _argv[0]);
+    } else if (strcmp(_argv[1], "-features") == 0) {
+        return compare_features(_argc - 1, _argv + 1, _argv[0]);
+    } else {
+        fprintf(stderr, "%s: First argument must be either -audio or -features\n\n", _argv[0]);
+        usage(_argv[0]);
+    }
+    return EXIT_FAILURE;
 }
diff --git a/dnn/dred_config.h b/dnn/dred_config.h
index d84f89658..000e728f0 100644
--- a/dnn/dred_config.h
+++ b/dnn/dred_config.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef DRED_CONFIG_H
 #define DRED_CONFIG_H
@@ -39,9 +39,9 @@
 #define DRED_MIN_BYTES 8
 
 /* these are inpart duplicates to the values defined in dred_rdovae_constants.h */
-#define DRED_SILK_ENCODER_DELAY (79+12-80)
+#define DRED_SILK_ENCODER_DELAY (79 + 12 - 80)
 #define DRED_FRAME_SIZE 160
-#define DRED_DFRAME_SIZE (2 * (DRED_FRAME_SIZE))
+#define DRED_DFRAME_SIZE (2*(DRED_FRAME_SIZE))
 #define DRED_MAX_DATA_SIZE 1000
 #define DRED_ENC_Q0 6
 #define DRED_ENC_Q1 15
diff --git a/dnn/dred_decoder.c b/dnn/dred_decoder.c
index 19360315e..003462e5c 100644
--- a/dnn/dred_decoder.c
+++ b/dnn/dred_decoder.c
@@ -23,12 +23,12 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #include <string.h>
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "os_support.h"
@@ -39,9 +39,10 @@
 #include "dred_rdovae_stats_data.h"
 #include "dred_rdovae_constants.h"
 
-void dred_decode_latents(ec_dec *dec, float *x, const oac_uint8 *scale, const oac_uint8 *r, const oac_uint8 *p0, int dim) {
+void dred_decode_latents(ec_dec *dec, float *x, const oac_uint8 *scale, const oac_uint8 *r, const oac_uint8 *p0,
+                         int dim) {
     int i;
-    for (i=0;i<dim;i++) {
+    for (i = 0; i < dim; i++) {
         int q;
         if (r[i] == 0 || p0[i] == 255) q = 0;
         else q = ec_laplace_decode_p0(dec, p0[i]<<7, r[i]<<7);
@@ -49,54 +50,52 @@ void dred_decode_latents(ec_dec *dec, float *x, const oac_uint8 *scale, const oa
     }
 }
 
-int dred_ec_decode(OacDRED *dec, const oac_uint8 *bytes, int num_bytes, int min_feature_frames, int dred_frame_offset)
-{
-  ec_dec ec;
-  int q_level;
-  int i;
-  int offset;
-  int q0;
-  int dQ;
-  int qmax;
-  int state_qoffset;
-  int extra_offset;
+int dred_ec_decode(OacDRED *dec, const oac_uint8 *bytes, int num_bytes, int min_feature_frames, int dred_frame_offset) {
+    ec_dec ec;
+    int q_level;
+    int i;
+    int offset;
+    int q0;
+    int dQ;
+    int qmax;
+    int state_qoffset;
+    int extra_offset;
 
-  /* since features are decoded in quadruples, it makes no sense to go with an uneven number of redundancy frames */
-  celt_assert(DRED_NUM_REDUNDANCY_FRAMES % 2 == 0);
+    /* since features are decoded in quadruples, it makes no sense to go with an uneven number of redundancy frames */
+    celt_assert(DRED_NUM_REDUNDANCY_FRAMES%2 == 0);
 
-  /* decode initial state and initialize RDOVAE decoder */
-  ec_dec_init(&ec, (unsigned char*)bytes, num_bytes);
-  q0 = ec_dec_uint(&ec, 16);
-  dQ = ec_dec_uint(&ec, 8);
-  if (ec_dec_uint(&ec, 2)) extra_offset = 32*ec_dec_uint(&ec, 256);
-  else extra_offset = 0;
-  /* Compute total offset, including DRED position in a multiframe packet. */
-  dec->dred_offset = 16 - ec_dec_uint(&ec, 32) - extra_offset + dred_frame_offset;
-  /*printf("%d %d %d\n", dred_offset, q0, dQ);*/
-  qmax = 15;
-  if (q0 < 14 && dQ > 0) {
-    int nvals;
-    int ft;
-    int s;
-    /* The distribution for the dQmax symbol is split evenly between zero
-        (which implies qmax == 15) and larger values, with the probability of
-        all larger values being uniform.
-       This is equivalent to coding 1 bit to decide if the maximum is less than
-        15 followed by a uint to decide the actual value if it is less than
-        15, but combined into a single symbol. */
-    nvals = 15 - (q0 + 1);
-    ft = 2*nvals;
-    s = ec_decode(&ec, ft);
-    if (s >= nvals) {
-      qmax = q0 + (s - nvals) + 1;
-      ec_dec_update(&ec, s, s + 1, ft);
-    }
-    else {
-      ec_dec_update(&ec, 0, nvals, ft);
+    /* decode initial state and initialize RDOVAE decoder */
+    ec_dec_init(&ec, (unsigned char*)bytes, num_bytes);
+    q0 = ec_dec_uint(&ec, 16);
+    dQ = ec_dec_uint(&ec, 8);
+    if (ec_dec_uint(&ec, 2)) extra_offset = 32*ec_dec_uint(&ec, 256);
+    else extra_offset = 0;
+    /* Compute total offset, including DRED position in a multiframe packet. */
+    dec->dred_offset = 16 - ec_dec_uint(&ec, 32) - extra_offset + dred_frame_offset;
+    /*printf("%d %d %d\n", dred_offset, q0, dQ);*/
+    qmax = 15;
+    if (q0 < 14 && dQ > 0) {
+        int nvals;
+        int ft;
+        int s;
+        /* The distribution for the dQmax symbol is split evenly between zero
+            (which implies qmax == 15) and larger values, with the probability of
+            all larger values being uniform.
+           This is equivalent to coding 1 bit to decide if the maximum is less than
+            15 followed by a uint to decide the actual value if it is less than
+            15, but combined into a single symbol. */
+        nvals = 15 - (q0 + 1);
+        ft = 2*nvals;
+        s = ec_decode(&ec, ft);
+        if (s >= nvals) {
+            qmax = q0 + (s - nvals) + 1;
+            ec_dec_update(&ec, s, s + 1, ft);
+        } else {
+            ec_dec_update(&ec, 0, nvals, ft);
+        }
     }
-  }
-  state_qoffset = q0*DRED_STATE_DIM;
-  dred_decode_latents(
+    state_qoffset = q0*DRED_STATE_DIM;
+    dred_decode_latents(
       &ec,
       dec->state,
       dred_state_quant_scales_q8 + state_qoffset,
@@ -104,26 +103,25 @@ int dred_ec_decode(OacDRED *dec, const oac_uint8 *bytes, int num_bytes, int min_
       dred_state_p0_q8 + state_qoffset,
       DRED_STATE_DIM);
 
-  /* decode newest to oldest and store oldest to newest */
-  for (i = 0; i < IMIN(DRED_NUM_REDUNDANCY_FRAMES, (min_feature_frames+1)/2); i += 2)
-  {
-      /* FIXME: Figure out how to avoid missing a last frame that would take up < 8 bits. */
-      if (8*num_bytes - ec_tell(&ec) <= 7)
-         break;
-      q_level = compute_quantizer(q0, dQ, qmax, i/2);
-      offset = q_level*DRED_LATENT_DIM;
-      dred_decode_latents(
+    /* decode newest to oldest and store oldest to newest */
+    for (i = 0; i < IMIN(DRED_NUM_REDUNDANCY_FRAMES, (min_feature_frames + 1)/2); i += 2) {
+        /* FIXME: Figure out how to avoid missing a last frame that would take up < 8 bits. */
+        if (8*num_bytes - ec_tell(&ec) <= 7)
+            break;
+        q_level = compute_quantizer(q0, dQ, qmax, i/2);
+        offset = q_level*DRED_LATENT_DIM;
+        dred_decode_latents(
           &ec,
-          &dec->latents[(i/2)*(DRED_LATENT_DIM+1)],
+          &dec->latents[(i/2)*(DRED_LATENT_DIM + 1)],
           dred_latent_quant_scales_q8 + offset,
           dred_latent_r_q8 + offset,
           dred_latent_p0_q8 + offset,
           DRED_LATENT_DIM
-          );
-      dec->latents[(i/2)*(DRED_LATENT_DIM+1)+DRED_LATENT_DIM] = q_level*.125-1;
-      offset = 2 * i * DRED_NUM_FEATURES;
-  }
-  dec->process_stage = 1;
-  dec->nb_latents = i/2;
-  return i/2;
+            );
+        dec->latents[(i/2)*(DRED_LATENT_DIM + 1) + DRED_LATENT_DIM] = q_level*.125 - 1;
+        offset = 2*i*DRED_NUM_FEATURES;
+    }
+    dec->process_stage = 1;
+    dec->nb_latents = i/2;
+    return i/2;
 }
diff --git a/dnn/dred_decoder.h b/dnn/dred_decoder.h
index dda3247cc..f7b77d651 100644
--- a/dnn/dred_decoder.h
+++ b/dnn/dred_decoder.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef DRED_DECODER_H
 #define DRED_DECODER_H
@@ -35,12 +35,12 @@
 #include "dred_rdovae_constants.h"
 
 struct OacDRED {
-    float        fec_features[2*DRED_NUM_REDUNDANCY_FRAMES*DRED_NUM_FEATURES];
-    float        state[DRED_STATE_DIM];
-    float        latents[(DRED_NUM_REDUNDANCY_FRAMES/2)*(DRED_LATENT_DIM+1)];
-    int          nb_latents;
-    int          process_stage;
-    int          dred_offset;
+    float fec_features[2*DRED_NUM_REDUNDANCY_FRAMES*DRED_NUM_FEATURES];
+    float state[DRED_STATE_DIM];
+    float latents[(DRED_NUM_REDUNDANCY_FRAMES/2)*(DRED_LATENT_DIM + 1)];
+    int nb_latents;
+    int process_stage;
+    int dred_offset;
 };
 
 
diff --git a/dnn/dred_encoder.c b/dnn/dred_encoder.c
index 5281b3422..30a5e6d65 100644
--- a/dnn/dred_encoder.c
+++ b/dnn/dred_encoder.c
@@ -23,17 +23,17 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <string.h>
 
 #if 0
-#include <stdio.h>
-#include <math.h>
+# include <stdio.h>
+# include <math.h>
 #endif
 
 #include "dred_encoder.h"
@@ -47,37 +47,33 @@
 #include "dred_rdovae_stats_data.h"
 
 
-static void DRED_rdovae_init_encoder(RDOVAEEncState *enc_state)
-{
+static void DRED_rdovae_init_encoder(RDOVAEEncState *enc_state) {
     memset(enc_state, 0, sizeof(*enc_state));
 }
 
-int dred_encoder_load_model(DREDEnc* enc, const void *data, int len)
-{
+int dred_encoder_load_model(DREDEnc* enc, const void *data, int len) {
     WeightArray *list;
     int ret;
     parse_weights(&list, data, len);
     ret = init_rdovaeenc(&enc->model, list);
     oac_free(list);
     if (ret == 0) {
-      ret = lpcnet_encoder_load_model(&enc->lpcnet_enc_state, data, len);
+        ret = lpcnet_encoder_load_model(&enc->lpcnet_enc_state, data, len);
     }
     if (ret == 0) enc->loaded = 1;
     return (ret == 0) ? OAC_OK : OAC_BAD_ARG;
 }
 
-void dred_encoder_reset(DREDEnc* enc)
-{
+void dred_encoder_reset(DREDEnc* enc) {
     OAC_CLEAR((char*)&enc->DREDENC_RESET_START,
-              sizeof(DREDEnc)-
-              ((char*)&enc->DREDENC_RESET_START - (char*)enc));
+              sizeof(DREDEnc)
+        - ((char*)&enc->DREDENC_RESET_START - (char*)enc));
     enc->input_buffer_fill = DRED_SILK_ENCODER_DELAY;
     lpcnet_encoder_init(&enc->lpcnet_enc_state);
     DRED_rdovae_init_encoder(&enc->rdovae_enc);
 }
 
-void dred_encoder_init(DREDEnc* enc, oac_int32 Fs, int channels)
-{
+void dred_encoder_init(DREDEnc* enc, oac_int32 Fs, int channels) {
     enc->Fs = Fs;
     enc->channels = channels;
     enc->loaded = 0;
@@ -87,41 +83,41 @@ void dred_encoder_init(DREDEnc* enc, oac_int32 Fs, int channels)
     dred_encoder_reset(enc);
 }
 
-static void dred_process_frame(DREDEnc *enc, int arch)
-{
-    float feature_buffer[2 * 36];
+static void dred_process_frame(DREDEnc *enc, int arch) {
+    float feature_buffer[2*36];
     float input_buffer[2*DRED_NUM_FEATURES] = {0};
 
     celt_assert(enc->loaded);
     /* shift latents buffer */
-    OAC_MOVE(enc->latents_buffer + DRED_LATENT_DIM, enc->latents_buffer, (DRED_MAX_FRAMES - 1) * DRED_LATENT_DIM);
-    OAC_MOVE(enc->state_buffer + DRED_STATE_DIM, enc->state_buffer, (DRED_MAX_FRAMES - 1) * DRED_STATE_DIM);
+    OAC_MOVE(enc->latents_buffer + DRED_LATENT_DIM, enc->latents_buffer, (DRED_MAX_FRAMES - 1)*DRED_LATENT_DIM);
+    OAC_MOVE(enc->state_buffer + DRED_STATE_DIM, enc->state_buffer, (DRED_MAX_FRAMES - 1)*DRED_STATE_DIM);
 
     /* calculate LPCNet features */
     lpcnet_compute_single_frame_features_float(&enc->lpcnet_enc_state, enc->input_buffer, feature_buffer, arch);
-    lpcnet_compute_single_frame_features_float(&enc->lpcnet_enc_state, enc->input_buffer + DRED_FRAME_SIZE, feature_buffer + 36, arch);
+    lpcnet_compute_single_frame_features_float(&enc->lpcnet_enc_state, enc->input_buffer + DRED_FRAME_SIZE,
+    feature_buffer + 36, arch);
 
     /* prepare input buffer (discard LPC coefficients) */
     OAC_COPY(input_buffer, feature_buffer, DRED_NUM_FEATURES);
     OAC_COPY(input_buffer + DRED_NUM_FEATURES, feature_buffer + 36, DRED_NUM_FEATURES);
 
     /* run RDOVAE encoder */
-    dred_rdovae_encode_dframe(&enc->rdovae_enc, &enc->model, enc->latents_buffer, enc->state_buffer, input_buffer, arch);
-    enc->latents_buffer_fill = IMIN(enc->latents_buffer_fill+1, DRED_NUM_REDUNDANCY_FRAMES);
+    dred_rdovae_encode_dframe(&enc->rdovae_enc, &enc->model, enc->latents_buffer, enc->state_buffer, input_buffer,
+    arch);
+    enc->latents_buffer_fill = IMIN(enc->latents_buffer_fill + 1, DRED_NUM_REDUNDANCY_FRAMES);
 }
 
-void filter_df2t(const float *in, float *out, int len, float b0, const float *b, const float *a, int order, float *mem)
-{
+void filter_df2t(const float *in, float *out, int len, float b0, const float *b, const float *a, int order,
+                 float *mem) {
     int i;
-    for (i=0;i<len;i++) {
+    for (i = 0; i < len; i++) {
         int j;
         float xi, yi, nyi;
         xi = in[i];
         yi = xi*b0 + mem[0];
         nyi = -yi;
-        for (j=0;j<order;j++)
-        {
-           mem[j] = mem[j+1] + b[j]*xi + a[j]*nyi;
+        for (j = 0; j < order; j++) {
+            mem[j] = mem[j + 1] + b[j]*xi + a[j]*nyi;
         }
         out[i] = yi;
         /*fprintf(stdout, "%f\n", out[i]);*/
@@ -129,18 +125,17 @@ void filter_df2t(const float *in, float *out, int len, float b0, const float *b,
 }
 
 #ifdef ENABLE_QEXT
-#define MAX_DOWNMIX_BUFFER (1920*2)
+# define MAX_DOWNMIX_BUFFER (1920*2)
 #else
-#define MAX_DOWNMIX_BUFFER (960*2)
+# define MAX_DOWNMIX_BUFFER (960*2)
 #endif
-static void dred_convert_to_16k(DREDEnc *enc, const float *in, int in_len, float *out, int out_len)
-{
+static void dred_convert_to_16k(DREDEnc *enc, const float *in, int in_len, float *out, int out_len) {
     float downmix[MAX_DOWNMIX_BUFFER];
     int i;
     int up;
     celt_assert(enc->channels*in_len <= MAX_DOWNMIX_BUFFER);
-    celt_assert(in_len * (oac_int32)16000 == out_len * enc->Fs);
-    switch(enc->Fs) {
+    celt_assert(in_len*(oac_int32)16000 == out_len*enc->Fs);
+    switch (enc->Fs) {
         case 8000:
             up = 2;
             break;
@@ -167,64 +162,70 @@ static void dred_convert_to_16k(DREDEnc *enc, const float *in, int in_len, float
     celt_assert(up*in_len <= MAX_DOWNMIX_BUFFER);
     OAC_CLEAR(downmix, up*in_len);
     if (enc->channels == 1) {
-        for (i=0;i<in_len;i++) downmix[up*i] = FLOAT2INT16(up*in[i])+VERY_SMALL;
+        for (i = 0; i < in_len; i++)downmix[up*i] = FLOAT2INT16(up*in[i]) + VERY_SMALL;
     } else {
-        for (i=0;i<in_len;i++) downmix[up*i] = FLOAT2INT16(.5*up*(in[2*i]+in[2*i+1]))+VERY_SMALL;
+        for (i = 0; i < in_len; i++)downmix[up*i] = FLOAT2INT16(.5*up*(in[2*i] + in[2*i + 1])) + VERY_SMALL;
     }
     if (enc->Fs == 16000) {
         OAC_COPY(out, downmix, out_len);
     } else if (enc->Fs == 48000 || enc->Fs == 24000) {
         /* ellip(7, .2, 70, 7750/24000) */
 
-        static const float filter_b[8] = { 0.005873358047f,  0.012980854831f, 0.014531340042f,  0.014531340042f, 0.012980854831f,  0.005873358047f, 0.004523418224f, 0.f};
-        static const float filter_a[8] = {-3.878718597768f, 7.748834257468f, -9.653651699533f, 8.007342726666f, -4.379450178552f, 1.463182111810f, -0.231720677804f, 0.f};
+        static const float filter_b[8] = { 0.005873358047f,  0.012980854831f, 0.014531340042f,  0.014531340042f,
+                                           0.012980854831f,  0.005873358047f, 0.004523418224f, 0.f};
+        static const float filter_a[8] = {-3.878718597768f, 7.748834257468f, -9.653651699533f, 8.007342726666f,
+                                          -4.379450178552f, 1.463182111810f, -0.231720677804f, 0.f};
         float b0 = 0.004523418224f;
         filter_df2t(downmix, downmix, up*in_len, b0, filter_b, filter_a, RESAMPLING_ORDER, enc->resample_mem);
-        for (i=0;i<out_len;i++) out[i] = downmix[3*i];
+        for (i = 0; i < out_len; i++)out[i] = downmix[3*i];
     } else if (enc->Fs == 12000) {
         /* ellip(7, .2, 70, 5800/24000) */
-        static const float filter_b[8] = {-0.001017101081f,  0.003673127243f,   0.001009165267f,  0.001009165267f,  0.003673127243f, -0.001017101081f,  0.002033596776f, 0.f};
-        static const float filter_a[8] = {-4.930414411612f, 11.291643096504f, -15.322037343815f, 13.216403930898f, -7.220409219553f,  2.310550142771f, -0.334338618782f, 0.f};
+        static const float filter_b[8] = {-0.001017101081f,  0.003673127243f,   0.001009165267f,  0.001009165267f,
+                                          0.003673127243f, -0.001017101081f,  0.002033596776f, 0.f};
+        static const float filter_a[8] = {-4.930414411612f, 11.291643096504f, -15.322037343815f, 13.216403930898f,
+                                          -7.220409219553f,  2.310550142771f, -0.334338618782f, 0.f};
         float b0 = 0.002033596776f;
         filter_df2t(downmix, downmix, up*in_len, b0, filter_b, filter_a, RESAMPLING_ORDER, enc->resample_mem);
-        for (i=0;i<out_len;i++) out[i] = downmix[3*i];
+        for (i = 0; i < out_len; i++)out[i] = downmix[3*i];
     } else if (enc->Fs == 8000) {
         /* ellip(7, .2, 70, 3900/8000) */
-        static const float filter_b[8] = { 0.081670120929f, 0.180401598565f,  0.259391051971f, 0.259391051971f,  0.180401598565f, 0.081670120929f,  0.020109185709f, 0.f};
-        static const float filter_a[8] = {-1.393651933659f, 2.609789872676f, -2.403541968806f, 2.056814957331f, -1.148908574570f, 0.473001413788f, -0.110359852412f, 0.f};
+        static const float filter_b[8] = { 0.081670120929f, 0.180401598565f,  0.259391051971f, 0.259391051971f,
+                                           0.180401598565f, 0.081670120929f,  0.020109185709f, 0.f};
+        static const float filter_a[8] = {-1.393651933659f, 2.609789872676f, -2.403541968806f, 2.056814957331f,
+                                          -1.148908574570f, 0.473001413788f, -0.110359852412f, 0.f};
         float b0 = 0.020109185709f;
         filter_df2t(downmix, out, out_len, b0, filter_b, filter_a, RESAMPLING_ORDER, enc->resample_mem);
 #ifdef ENABLE_QEXT
     } else if (enc->Fs == 96000) {
         /* ellip(7, .2, 70, 7750/48000) */
-        static const float filter_b[8] = { -0.002160290245f, 0.002887088080f, -0.001214921271f, -0.001214921271f, 0.002887088080f, -0.002160290245f, 0.000880286074f, 0.f};
-        static const float filter_a[8] = {-5.813483928050f, 14.932091805554f, -21.900933283269f, 19.774128964756f, -10.978028462771f, 3.467650469467f, -0.480641240411f, 0.f};
+        static const float filter_b[8] = { -0.002160290245f, 0.002887088080f, -0.001214921271f, -0.001214921271f,
+                                           0.002887088080f, -0.002160290245f, 0.000880286074f, 0.f};
+        static const float filter_a[8] = {-5.813483928050f, 14.932091805554f, -21.900933283269f, 19.774128964756f,
+                                          -10.978028462771f, 3.467650469467f, -0.480641240411f, 0.f};
         float b0 = 0.000880286074f;
         filter_df2t(downmix, downmix, up*in_len, b0, filter_b, filter_a, RESAMPLING_ORDER, enc->resample_mem);
-        for (i=0;i<out_len;i++) out[i] = downmix[6*i];
+        for (i = 0; i < out_len; i++)out[i] = downmix[6*i];
 #endif
     } else {
         celt_assert(0);
     }
 }
 
-void dred_compute_latents(DREDEnc *enc, const float *pcm, int frame_size, int extra_delay, int arch)
-{
+void dred_compute_latents(DREDEnc *enc, const float *pcm, int frame_size, int extra_delay, int arch) {
     int curr_offset16k;
-    int frame_size16k = frame_size * 16000 / enc->Fs;
+    int frame_size16k = frame_size*16000/enc->Fs;
     celt_assert(enc->loaded);
     curr_offset16k = 40 + extra_delay*16000/enc->Fs - enc->input_buffer_fill;
-    enc->dred_offset = (int)floor((curr_offset16k+20.f)/40.f);
+    enc->dred_offset = (int)floor((curr_offset16k + 20.f)/40.f);
     enc->latent_offset = 0;
     while (frame_size16k > 0) {
         int process_size16k;
         int process_size;
         process_size16k = IMIN(2*DRED_FRAME_SIZE, frame_size16k);
-        process_size = process_size16k * enc->Fs / 16000;
+        process_size = process_size16k*enc->Fs/16000;
         dred_convert_to_16k(enc, pcm, process_size, &enc->input_buffer[enc->input_buffer_fill], process_size16k);
         enc->input_buffer_fill += process_size16k;
-        if (enc->input_buffer_fill >= 2*DRED_FRAME_SIZE)
-        {
+        if (enc->input_buffer_fill >= 2*DRED_FRAME_SIZE) {
             curr_offset16k += 320;
             dred_process_frame(enc, arch);
             enc->input_buffer_fill -= 2*DRED_FRAME_SIZE;
@@ -242,26 +243,27 @@ void dred_compute_latents(DREDEnc *enc, const float *pcm, int frame_size, int ex
     }
 }
 
-static void dred_encode_latents(ec_enc *enc, const float *x, const oac_uint8 *scale, const oac_uint8 *dzone, const oac_uint8 *r, const oac_uint8 *p0, int dim, int arch) {
+static void dred_encode_latents(ec_enc *enc, const float *x, const oac_uint8 *scale, const oac_uint8 *dzone,
+                                const oac_uint8 *r, const oac_uint8 *p0, int dim, int arch) {
     int i;
-    int q[IMAX(DRED_LATENT_DIM,DRED_STATE_DIM)];
-    float xq[IMAX(DRED_LATENT_DIM,DRED_STATE_DIM)];
-    float delta[IMAX(DRED_LATENT_DIM,DRED_STATE_DIM)];
-    float deadzone[IMAX(DRED_LATENT_DIM,DRED_STATE_DIM)];
+    int q[IMAX(DRED_LATENT_DIM, DRED_STATE_DIM)];
+    float xq[IMAX(DRED_LATENT_DIM, DRED_STATE_DIM)];
+    float delta[IMAX(DRED_LATENT_DIM, DRED_STATE_DIM)];
+    float deadzone[IMAX(DRED_LATENT_DIM, DRED_STATE_DIM)];
     float eps = .1f;
     /* This is split into multiple loops (with temporary arrays) so that the compiler
        can vectorize all of it, and so we can call the vector tanh(). */
-    for (i=0;i<dim;i++) {
+    for (i = 0; i < dim; i++) {
         delta[i] = dzone[i]*(1.f/256.f);
         xq[i] = x[i]*scale[i]*(1.f/256.f);
-        deadzone[i] = xq[i]/(delta[i]+eps);
+        deadzone[i] = xq[i]/(delta[i] + eps);
     }
     compute_activation(deadzone, deadzone, dim, ACTIVATION_TANH, arch);
-    for (i=0;i<dim;i++) {
+    for (i = 0; i < dim; i++) {
         xq[i] = xq[i] - delta[i]*deadzone[i];
-        q[i] = (int)floor(.5f+xq[i]);
+        q[i] = (int)floor(.5f + xq[i]);
     }
-    for (i=0;i<dim;i++) {
+    for (i = 0; i < dim; i++) {
         /* Make the impossible actually impossible. */
         if (r[i] == 0 || p0[i] == 255) q[i] = 0;
         else ec_laplace_encode_p0(enc, q[i], p0[i]<<7, r[i]<<7);
@@ -270,13 +272,14 @@ static void dred_encode_latents(ec_enc *enc, const float *x, const oac_uint8 *sc
 
 static int dred_voice_active(const unsigned char *activity_mem, int offset) {
     int i;
-    for (i=0;i<16;i++) {
+    for (i = 0; i < 16; i++) {
         if (activity_mem[8*offset + i] == 1) return 1;
     }
     return 0;
 }
 
-int dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks, int max_bytes, int q0, int dQ, int qmax, unsigned char *activity_mem, int arch) {
+int dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks, int max_bytes, int q0, int dQ, int qmax,
+                           unsigned char *activity_mem, int arch) {
     ec_enc ec_encoder;
 
     int q_level;
@@ -285,24 +288,24 @@ int dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks, int
     int ec_buffer_fill;
     int state_qoffset;
     ec_enc ec_bak;
-    int prev_active=0;
+    int prev_active = 0;
     int latent_offset;
-    int extra_dred_offset=0;
-    int dred_encoded=0;
-    int delayed_dred=0;
+    int extra_dred_offset = 0;
+    int dred_encoded = 0;
+    int delayed_dred = 0;
     int total_offset;
 
     latent_offset = enc->latent_offset;
     /* Delaying new DRED data when just out of silence because we already have the
        main Oac payload for that frame. */
-    if (activity_mem[0] && enc->last_extra_dred_offset>0) {
+    if (activity_mem[0] && enc->last_extra_dred_offset > 0) {
         latent_offset = enc->last_extra_dred_offset;
         delayed_dred = 1;
         enc->last_extra_dred_offset = 0;
     }
     while (latent_offset < enc->latents_buffer_fill && !dred_voice_active(activity_mem, latent_offset)) {
-       latent_offset++;
-       extra_dred_offset++;
+        latent_offset++;
+        extra_dred_offset++;
     }
     if (!delayed_dred) enc->last_extra_dred_offset = extra_dred_offset;
 
@@ -311,22 +314,22 @@ int dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks, int
     ec_enc_uint(&ec_encoder, q0, 16);
     ec_enc_uint(&ec_encoder, dQ, 8);
     total_offset = 16 - (enc->dred_offset - extra_dred_offset*8);
-    celt_assert(total_offset>=0);
+    celt_assert(total_offset >= 0);
     if (total_offset > 31) {
-       ec_enc_uint(&ec_encoder, 1, 2);
-       ec_enc_uint(&ec_encoder, total_offset>>5, 256);
-       ec_enc_uint(&ec_encoder, total_offset&31, 32);
+        ec_enc_uint(&ec_encoder, 1, 2);
+        ec_enc_uint(&ec_encoder, total_offset>>5, 256);
+        ec_enc_uint(&ec_encoder, total_offset&31, 32);
     } else {
-       ec_enc_uint(&ec_encoder, 0, 2);
-       ec_enc_uint(&ec_encoder, total_offset, 32);
+        ec_enc_uint(&ec_encoder, 0, 2);
+        ec_enc_uint(&ec_encoder, total_offset, 32);
     }
     celt_assert(qmax >= q0);
     if (q0 < 14 && dQ > 0) {
-      int nvals;
-      /* If you want to use qmax == q0, you should have set dQ = 0. */
-      celt_assert(qmax > q0);
-      nvals = 15 - (q0 + 1);
-      ec_encode(&ec_encoder, qmax >= 15 ? 0 : nvals + qmax - (q0 + 1),
+        int nvals;
+        /* If you want to use qmax == q0, you should have set dQ = 0. */
+        celt_assert(qmax > q0);
+        nvals = 15 - (q0 + 1);
+        ec_encode(&ec_encoder, qmax >= 15 ? 0 : nvals + qmax - (q0 + 1),
         qmax >= 15 ? nvals : nvals + qmax - q0, 2*nvals);
     }
     state_qoffset = q0*DRED_STATE_DIM;
@@ -340,42 +343,41 @@ int dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks, int
         DRED_STATE_DIM,
         arch);
     if (ec_tell(&ec_encoder) > 8*max_bytes) {
-      return 0;
+        return 0;
     }
     ec_bak = ec_encoder;
-    for (i = 0; i < IMIN(2*max_chunks, enc->latents_buffer_fill-latent_offset-1); i += 2)
-    {
+    for (i = 0; i < IMIN(2*max_chunks, enc->latents_buffer_fill - latent_offset - 1); i += 2) {
         int active;
         q_level = compute_quantizer(q0, dQ, qmax, i/2);
-        offset = q_level * DRED_LATENT_DIM;
+        offset = q_level*DRED_LATENT_DIM;
 
         dred_encode_latents(
             &ec_encoder,
-            enc->latents_buffer + (i+latent_offset) * DRED_LATENT_DIM,
+            enc->latents_buffer + (i + latent_offset)*DRED_LATENT_DIM,
             dred_latent_quant_scales_q8 + offset,
             dred_latent_dead_zone_q8 + offset,
             dred_latent_r_q8 + offset,
             dred_latent_p0_q8 + offset,
             DRED_LATENT_DIM,
             arch
-        );
+            );
         if (ec_tell(&ec_encoder) > 8*max_bytes) {
-          /* If we haven't been able to code one chunk, give up on DRED completely. */
-          if (i==0) return 0;
-          break;
+            /* If we haven't been able to code one chunk, give up on DRED completely. */
+            if (i == 0) return 0;
+            break;
         }
-        active = dred_voice_active(activity_mem, i+latent_offset);
+        active = dred_voice_active(activity_mem, i + latent_offset);
         if (active || prev_active) {
-           ec_bak = ec_encoder;
-           dred_encoded = i+2;
+            ec_bak = ec_encoder;
+            dred_encoded = i + 2;
         }
         prev_active = active;
     }
     /* Avoid sending empty DRED packets. */
-    if (dred_encoded==0 || (dred_encoded<=2 && extra_dred_offset)) return 0;
+    if (dred_encoded == 0 || (dred_encoded <= 2 && extra_dred_offset))return 0;
     ec_encoder = ec_bak;
 
-    ec_buffer_fill = (ec_tell(&ec_encoder)+7)/8;
+    ec_buffer_fill = (ec_tell(&ec_encoder) + 7)/8;
     ec_enc_shrink(&ec_encoder, ec_buffer_fill);
     ec_enc_done(&ec_encoder);
     return ec_buffer_fill;
diff --git a/dnn/dred_encoder.h b/dnn/dred_encoder.h
index f34e7b5ac..bf3dd531d 100644
--- a/dnn/dred_encoder.h
+++ b/dnn/dred_encoder.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef DRED_ENCODER_H
 #define DRED_ENCODER_H
@@ -52,9 +52,9 @@ typedef struct {
     int dred_offset;
     int latent_offset;
     int last_extra_dred_offset;
-    float latents_buffer[DRED_MAX_FRAMES * DRED_LATENT_DIM];
+    float latents_buffer[DRED_MAX_FRAMES*DRED_LATENT_DIM];
     int latents_buffer_fill;
-    float state_buffer[DRED_MAX_FRAMES * DRED_STATE_DIM];
+    float state_buffer[DRED_MAX_FRAMES*DRED_STATE_DIM];
     float resample_mem[RESAMPLING_ORDER + 1];
 } DREDEnc;
 
@@ -66,6 +66,7 @@ void dred_deinit_encoder(DREDEnc *enc);
 
 void dred_compute_latents(DREDEnc *enc, const float *pcm, int frame_size, int extra_delay, int arch);
 
-int dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks, int max_bytes, int q0, int dQ, int qmax, unsigned char *activity_mem, int arch);
+int dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks, int max_bytes, int q0, int dQ, int qmax,
+    unsigned char *activity_mem, int arch);
 
 #endif
diff --git a/dnn/dred_rdovae.h b/dnn/dred_rdovae.h
index 0edbc54d4..e3e5523b9 100644
--- a/dnn/dred_rdovae.h
+++ b/dnn/dred_rdovae.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef DRED_RDOVAE_H
 #define DRED_RDOVAE_H
diff --git a/dnn/dred_rdovae_dec.c b/dnn/dred_rdovae_dec.c
index b986f3bef..8efc3ef73 100644
--- a/dnn/dred_rdovae_dec.c
+++ b/dnn/dred_rdovae_dec.c
@@ -23,38 +23,36 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "dred_rdovae_dec.h"
 #include "dred_rdovae_constants.h"
 #include "os_support.h"
 
-static void conv1_cond_init(float *mem, int len, int dilation, int *init)
-{
+static void conv1_cond_init(float *mem, int len, int dilation, int *init) {
     if (!*init) {
         int i;
-        for (i=0;i<dilation;i++) OAC_CLEAR(&mem[i*len], len);
+        for (i = 0; i < dilation; i++)OAC_CLEAR(&mem[i*len], len);
     }
     *init = 1;
 }
 
-void DRED_rdovae_decode_all(const RDOVAEDec *model, float *features, const float *state, const float *latents, int nb_latents, int arch)
-{
+void DRED_rdovae_decode_all(const RDOVAEDec *model, float *features, const float *state, const float *latents,
+                            int nb_latents, int arch) {
     int i;
     RDOVAEDecState dec;
     memset(&dec, 0, sizeof(dec));
     dred_rdovae_dec_init_states(&dec, model, state, arch);
-    for (i = 0; i < 2*nb_latents; i += 2)
-    {
+    for (i = 0; i < 2*nb_latents; i += 2) {
         dred_rdovae_decode_qframe(
             &dec,
             model,
             &features[2*i*DRED_NUM_FEATURES],
-            &latents[(i/2)*(DRED_LATENT_DIM+1)],
+            &latents[(i/2)*(DRED_LATENT_DIM + 1)],
             arch);
     }
 }
@@ -63,12 +61,11 @@ void dred_rdovae_dec_init_states(
     RDOVAEDecState *h,            /* io: state buffer handle */
     const RDOVAEDec *model,
     const float *initial_state,  /* i: initial state */
-    int arch
-    )
-{
+    int arch) {
     float hidden[DEC_HIDDEN_INIT_OUT_SIZE];
-    float state_init[DEC_GRU1_STATE_SIZE+DEC_GRU2_STATE_SIZE+DEC_GRU3_STATE_SIZE+DEC_GRU4_STATE_SIZE+DEC_GRU5_STATE_SIZE];
-    int counter=0;
+    float state_init[DEC_GRU1_STATE_SIZE + DEC_GRU2_STATE_SIZE + DEC_GRU3_STATE_SIZE + DEC_GRU4_STATE_SIZE
+                     + DEC_GRU5_STATE_SIZE];
+    int counter = 0;
     compute_generic_dense(&model->dec_hidden_init, hidden, initial_state, ACTIVATION_TANH, arch);
     compute_generic_dense(&model->dec_gru_init, state_init, hidden, ACTIVATION_TANH, arch);
     OAC_COPY(h->gru1_state, state_init, DEC_GRU1_STATE_SIZE);
@@ -89,11 +86,11 @@ void dred_rdovae_decode_qframe(
     const RDOVAEDec *model,
     float *qframe,              /* o: quadruple feature frame (four concatenated frames in reverse order) */
     const float *input,          /* i: latent vector */
-    int arch
-    )
-{
-    float buffer[DEC_DENSE1_OUT_SIZE + DEC_GRU1_OUT_SIZE + DEC_GRU2_OUT_SIZE + DEC_GRU3_OUT_SIZE + DEC_GRU4_OUT_SIZE + DEC_GRU5_OUT_SIZE
-                 + DEC_CONV1_OUT_SIZE + DEC_CONV2_OUT_SIZE + DEC_CONV3_OUT_SIZE + DEC_CONV4_OUT_SIZE + DEC_CONV5_OUT_SIZE];
+    int arch) {
+    float buffer[DEC_DENSE1_OUT_SIZE + DEC_GRU1_OUT_SIZE + DEC_GRU2_OUT_SIZE + DEC_GRU3_OUT_SIZE + DEC_GRU4_OUT_SIZE
+                 + DEC_GRU5_OUT_SIZE
+                 + DEC_CONV1_OUT_SIZE + DEC_CONV2_OUT_SIZE + DEC_CONV3_OUT_SIZE + DEC_CONV4_OUT_SIZE
+                 + DEC_CONV5_OUT_SIZE];
     float conv_tmp[DRED_MAX_CONV_INPUTS];
     int output_index = 0;
 
@@ -106,7 +103,8 @@ void dred_rdovae_decode_qframe(
     output_index += DEC_GRU1_OUT_SIZE;
     conv1_cond_init(dec_state->conv1_state, DEC_CONV1_IN_SIZE, 1, &dec_state->initialized);
     compute_generic_dense(&model->dec_conv_dense1, conv_tmp, buffer, ACTIVATION_TANH, arch);
-    compute_generic_conv1d(&model->dec_conv1, &buffer[output_index], dec_state->conv1_state, conv_tmp, DEC_CONV1_OUT_SIZE, ACTIVATION_TANH, arch);
+    compute_generic_conv1d(&model->dec_conv1, &buffer[output_index], dec_state->conv1_state, conv_tmp,
+    DEC_CONV1_OUT_SIZE, ACTIVATION_TANH, arch);
     output_index += DEC_CONV1_OUT_SIZE;
 
     compute_generic_gru(&model->dec_gru2_input, &model->dec_gru2_recurrent, dec_state->gru2_state, buffer, arch);
@@ -114,7 +112,8 @@ void dred_rdovae_decode_qframe(
     output_index += DEC_GRU2_OUT_SIZE;
     conv1_cond_init(dec_state->conv2_state, DEC_CONV2_IN_SIZE, 1, &dec_state->initialized);
     compute_generic_dense(&model->dec_conv_dense2, conv_tmp, buffer, ACTIVATION_TANH, arch);
-    compute_generic_conv1d(&model->dec_conv2, &buffer[output_index], dec_state->conv2_state, conv_tmp, DEC_CONV2_OUT_SIZE, ACTIVATION_TANH, arch);
+    compute_generic_conv1d(&model->dec_conv2, &buffer[output_index], dec_state->conv2_state, conv_tmp,
+    DEC_CONV2_OUT_SIZE, ACTIVATION_TANH, arch);
     output_index += DEC_CONV2_OUT_SIZE;
 
     compute_generic_gru(&model->dec_gru3_input, &model->dec_gru3_recurrent, dec_state->gru3_state, buffer, arch);
@@ -122,7 +121,8 @@ void dred_rdovae_decode_qframe(
     output_index += DEC_GRU3_OUT_SIZE;
     conv1_cond_init(dec_state->conv3_state, DEC_CONV3_IN_SIZE, 1, &dec_state->initialized);
     compute_generic_dense(&model->dec_conv_dense3, conv_tmp, buffer, ACTIVATION_TANH, arch);
-    compute_generic_conv1d(&model->dec_conv3, &buffer[output_index], dec_state->conv3_state, conv_tmp, DEC_CONV3_OUT_SIZE, ACTIVATION_TANH, arch);
+    compute_generic_conv1d(&model->dec_conv3, &buffer[output_index], dec_state->conv3_state, conv_tmp,
+    DEC_CONV3_OUT_SIZE, ACTIVATION_TANH, arch);
     output_index += DEC_CONV3_OUT_SIZE;
 
     compute_generic_gru(&model->dec_gru4_input, &model->dec_gru4_recurrent, dec_state->gru4_state, buffer, arch);
@@ -130,7 +130,8 @@ void dred_rdovae_decode_qframe(
     output_index += DEC_GRU4_OUT_SIZE;
     conv1_cond_init(dec_state->conv4_state, DEC_CONV4_IN_SIZE, 1, &dec_state->initialized);
     compute_generic_dense(&model->dec_conv_dense4, conv_tmp, buffer, ACTIVATION_TANH, arch);
-    compute_generic_conv1d(&model->dec_conv4, &buffer[output_index], dec_state->conv4_state, conv_tmp, DEC_CONV4_OUT_SIZE, ACTIVATION_TANH, arch);
+    compute_generic_conv1d(&model->dec_conv4, &buffer[output_index], dec_state->conv4_state, conv_tmp,
+    DEC_CONV4_OUT_SIZE, ACTIVATION_TANH, arch);
     output_index += DEC_CONV4_OUT_SIZE;
 
     compute_generic_gru(&model->dec_gru5_input, &model->dec_gru5_recurrent, dec_state->gru5_state, buffer, arch);
@@ -138,7 +139,8 @@ void dred_rdovae_decode_qframe(
     output_index += DEC_GRU5_OUT_SIZE;
     conv1_cond_init(dec_state->conv5_state, DEC_CONV5_IN_SIZE, 1, &dec_state->initialized);
     compute_generic_dense(&model->dec_conv_dense5, conv_tmp, buffer, ACTIVATION_TANH, arch);
-    compute_generic_conv1d(&model->dec_conv5, &buffer[output_index], dec_state->conv5_state, conv_tmp, DEC_CONV5_OUT_SIZE, ACTIVATION_TANH, arch);
+    compute_generic_conv1d(&model->dec_conv5, &buffer[output_index], dec_state->conv5_state, conv_tmp,
+    DEC_CONV5_OUT_SIZE, ACTIVATION_TANH, arch);
     output_index += DEC_CONV5_OUT_SIZE;
 
     compute_generic_dense(&model->dec_output, qframe, buffer, ACTIVATION_LINEAR, arch);
diff --git a/dnn/dred_rdovae_dec.h b/dnn/dred_rdovae_dec.h
index 4e66911c6..546c6990d 100644
--- a/dnn/dred_rdovae_dec.h
+++ b/dnn/dred_rdovae_dec.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef DRED_RDOVAE_DEC_H
 #define DRED_RDOVAE_DEC_H
@@ -33,21 +33,22 @@
 #include "dred_rdovae_stats_data.h"
 
 struct RDOVAEDecStruct {
-  int initialized;
-  float gru1_state[DEC_GRU1_STATE_SIZE];
-  float gru2_state[DEC_GRU2_STATE_SIZE];
-  float gru3_state[DEC_GRU3_STATE_SIZE];
-  float gru4_state[DEC_GRU4_STATE_SIZE];
-  float gru5_state[DEC_GRU5_STATE_SIZE];
-  float conv1_state[DEC_CONV1_STATE_SIZE];
-  float conv2_state[DEC_CONV2_STATE_SIZE];
-  float conv3_state[DEC_CONV3_STATE_SIZE];
-  float conv4_state[DEC_CONV4_STATE_SIZE];
-  float conv5_state[DEC_CONV5_STATE_SIZE];
+    int initialized;
+    float gru1_state[DEC_GRU1_STATE_SIZE];
+    float gru2_state[DEC_GRU2_STATE_SIZE];
+    float gru3_state[DEC_GRU3_STATE_SIZE];
+    float gru4_state[DEC_GRU4_STATE_SIZE];
+    float gru5_state[DEC_GRU5_STATE_SIZE];
+    float conv1_state[DEC_CONV1_STATE_SIZE];
+    float conv2_state[DEC_CONV2_STATE_SIZE];
+    float conv3_state[DEC_CONV3_STATE_SIZE];
+    float conv4_state[DEC_CONV4_STATE_SIZE];
+    float conv5_state[DEC_CONV5_STATE_SIZE];
 };
 
 void dred_rdovae_dec_init_states(RDOVAEDecState *h, const RDOVAEDec *model, const float * initial_state, int arch);
 void dred_rdovae_decode_qframe(RDOVAEDecState *h, const RDOVAEDec *model, float *qframe, const float * z, int arch);
-void DRED_rdovae_decode_all(const RDOVAEDec *model, float *features, const float *state, const float *latents, int nb_latents, int arch);
+void DRED_rdovae_decode_all(const RDOVAEDec *model, float *features, const float *state, const float *latents,
+    int nb_latents, int arch);
 
 #endif
diff --git a/dnn/dred_rdovae_enc.c b/dnn/dred_rdovae_enc.c
index af49ad858..1db172c23 100644
--- a/dnn/dred_rdovae_enc.c
+++ b/dnn/dred_rdovae_enc.c
@@ -23,12 +23,12 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #include <math.h>
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 
@@ -36,11 +36,10 @@
 #include "os_support.h"
 #include "dred_rdovae_constants.h"
 
-static void conv1_cond_init(float *mem, int len, int dilation, int *init)
-{
+static void conv1_cond_init(float *mem, int len, int dilation, int *init) {
     if (!*init) {
         int i;
-        for (i=0;i<dilation;i++) OAC_CLEAR(&mem[i*len], len);
+        for (i = 0; i < dilation; i++)OAC_CLEAR(&mem[i*len], len);
     }
     *init = 1;
 }
@@ -51,13 +50,13 @@ void dred_rdovae_encode_dframe(
     float *latents,                 /* o: latent vector */
     float *initial_state,           /* o: initial state */
     const float *input,              /* i: double feature frame (concatenated) */
-    int arch
-    )
-{
+    int arch) {
     float padded_latents[DRED_PADDED_LATENT_DIM];
     float padded_state[DRED_PADDED_STATE_DIM];
-    float buffer[ENC_DENSE1_OUT_SIZE + ENC_GRU1_OUT_SIZE + ENC_GRU2_OUT_SIZE + ENC_GRU3_OUT_SIZE + ENC_GRU4_OUT_SIZE + ENC_GRU5_OUT_SIZE
-               + ENC_CONV1_OUT_SIZE + ENC_CONV2_OUT_SIZE + ENC_CONV3_OUT_SIZE + ENC_CONV4_OUT_SIZE + ENC_CONV5_OUT_SIZE];
+    float buffer[ENC_DENSE1_OUT_SIZE + ENC_GRU1_OUT_SIZE + ENC_GRU2_OUT_SIZE + ENC_GRU3_OUT_SIZE + ENC_GRU4_OUT_SIZE
+                 + ENC_GRU5_OUT_SIZE
+                 + ENC_CONV1_OUT_SIZE + ENC_CONV2_OUT_SIZE + ENC_CONV3_OUT_SIZE + ENC_CONV4_OUT_SIZE
+                 + ENC_CONV5_OUT_SIZE];
     float state_hidden[GDENSE1_OUT_SIZE];
     float conv_tmp[DRED_MAX_CONV_INPUTS];
     int output_index = 0;
@@ -71,7 +70,8 @@ void dred_rdovae_encode_dframe(
     output_index += ENC_GRU1_OUT_SIZE;
     conv1_cond_init(enc_state->conv1_state, ENC_CONV1_IN_SIZE, 1, &enc_state->initialized);
     compute_generic_dense(&model->enc_conv_dense1, conv_tmp, buffer, ACTIVATION_TANH, arch);
-    compute_generic_conv1d(&model->enc_conv1, &buffer[output_index], enc_state->conv1_state, conv_tmp, ENC_CONV1_OUT_SIZE, ACTIVATION_TANH, arch);
+    compute_generic_conv1d(&model->enc_conv1, &buffer[output_index], enc_state->conv1_state, conv_tmp,
+    ENC_CONV1_OUT_SIZE, ACTIVATION_TANH, arch);
     output_index += ENC_CONV1_OUT_SIZE;
 
     compute_generic_gru(&model->enc_gru2_input, &model->enc_gru2_recurrent, enc_state->gru2_state, buffer, arch);
@@ -79,7 +79,8 @@ void dred_rdovae_encode_dframe(
     output_index += ENC_GRU2_OUT_SIZE;
     conv1_cond_init(enc_state->conv2_state, ENC_CONV2_IN_SIZE, 2, &enc_state->initialized);
     compute_generic_dense(&model->enc_conv_dense2, conv_tmp, buffer, ACTIVATION_TANH, arch);
-    compute_generic_conv1d_dilation(&model->enc_conv2, &buffer[output_index], enc_state->conv2_state, conv_tmp, ENC_CONV2_OUT_SIZE, 2, ACTIVATION_TANH, arch);
+    compute_generic_conv1d_dilation(&model->enc_conv2, &buffer[output_index], enc_state->conv2_state, conv_tmp,
+    ENC_CONV2_OUT_SIZE, 2, ACTIVATION_TANH, arch);
     output_index += ENC_CONV2_OUT_SIZE;
 
     compute_generic_gru(&model->enc_gru3_input, &model->enc_gru3_recurrent, enc_state->gru3_state, buffer, arch);
@@ -87,7 +88,8 @@ void dred_rdovae_encode_dframe(
     output_index += ENC_GRU3_OUT_SIZE;
     conv1_cond_init(enc_state->conv3_state, ENC_CONV3_IN_SIZE, 2, &enc_state->initialized);
     compute_generic_dense(&model->enc_conv_dense3, conv_tmp, buffer, ACTIVATION_TANH, arch);
-    compute_generic_conv1d_dilation(&model->enc_conv3, &buffer[output_index], enc_state->conv3_state, conv_tmp, ENC_CONV3_OUT_SIZE, 2, ACTIVATION_TANH, arch);
+    compute_generic_conv1d_dilation(&model->enc_conv3, &buffer[output_index], enc_state->conv3_state, conv_tmp,
+    ENC_CONV3_OUT_SIZE, 2, ACTIVATION_TANH, arch);
     output_index += ENC_CONV3_OUT_SIZE;
 
     compute_generic_gru(&model->enc_gru4_input, &model->enc_gru4_recurrent, enc_state->gru4_state, buffer, arch);
@@ -95,7 +97,8 @@ void dred_rdovae_encode_dframe(
     output_index += ENC_GRU4_OUT_SIZE;
     conv1_cond_init(enc_state->conv4_state, ENC_CONV4_IN_SIZE, 2, &enc_state->initialized);
     compute_generic_dense(&model->enc_conv_dense4, conv_tmp, buffer, ACTIVATION_TANH, arch);
-    compute_generic_conv1d_dilation(&model->enc_conv4, &buffer[output_index], enc_state->conv4_state, conv_tmp, ENC_CONV4_OUT_SIZE, 2, ACTIVATION_TANH, arch);
+    compute_generic_conv1d_dilation(&model->enc_conv4, &buffer[output_index], enc_state->conv4_state, conv_tmp,
+    ENC_CONV4_OUT_SIZE, 2, ACTIVATION_TANH, arch);
     output_index += ENC_CONV4_OUT_SIZE;
 
     compute_generic_gru(&model->enc_gru5_input, &model->enc_gru5_recurrent, enc_state->gru5_state, buffer, arch);
@@ -103,7 +106,8 @@ void dred_rdovae_encode_dframe(
     output_index += ENC_GRU5_OUT_SIZE;
     conv1_cond_init(enc_state->conv5_state, ENC_CONV5_IN_SIZE, 2, &enc_state->initialized);
     compute_generic_dense(&model->enc_conv_dense5, conv_tmp, buffer, ACTIVATION_TANH, arch);
-    compute_generic_conv1d_dilation(&model->enc_conv5, &buffer[output_index], enc_state->conv5_state, conv_tmp, ENC_CONV5_OUT_SIZE, 2, ACTIVATION_TANH, arch);
+    compute_generic_conv1d_dilation(&model->enc_conv5, &buffer[output_index], enc_state->conv5_state, conv_tmp,
+    ENC_CONV5_OUT_SIZE, 2, ACTIVATION_TANH, arch);
     output_index += ENC_CONV5_OUT_SIZE;
 
     compute_generic_dense(&model->enc_zdense, padded_latents, buffer, ACTIVATION_LINEAR, arch);
diff --git a/dnn/dred_rdovae_enc.h b/dnn/dred_rdovae_enc.h
index 6fe537ee7..ebb777c39 100644
--- a/dnn/dred_rdovae_enc.h
+++ b/dnn/dred_rdovae_enc.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef DRED_RDOVAE_ENC_H
 #define DRED_RDOVAE_ENC_H
@@ -46,7 +46,8 @@ struct RDOVAEEncStruct {
     float conv5_state[2*ENC_CONV5_STATE_SIZE];
 };
 
-void dred_rdovae_encode_dframe(RDOVAEEncState *enc_state, const RDOVAEEnc *model, float *latents, float *initial_state, const float *input, int arch);
+void dred_rdovae_encode_dframe(RDOVAEEncState *enc_state, const RDOVAEEnc *model, float *latents, float *initial_state,
+    const float *input, int arch);
 
 
 #endif
diff --git a/dnn/dump_data.c b/dnn/dump_data.c
index 5d987eb92..d035e240d 100644
--- a/dnn/dump_data.c
+++ b/dnn/dump_data.c
@@ -22,10 +22,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdlib.h>
@@ -47,7 +47,7 @@
 #include "mini_kfft.c"
 
 #ifndef M_PI
-#define M_PI 3.141592653589793f
+# define M_PI 3.141592653589793f
 #endif
 
 #define SEQUENCE_LENGTH 2000
@@ -57,173 +57,171 @@
 
 #ifdef ENABLE_RIR
 
-#define RIR_FFT_SIZE 32000
-#define RIR_MAX_DURATION (RIR_FFT_SIZE/2)
-#define FILENAME_MAX_SIZE 1000
+# define RIR_FFT_SIZE 32000
+# define RIR_MAX_DURATION (RIR_FFT_SIZE/2)
+# define FILENAME_MAX_SIZE 1000
 
 struct rir_list {
-  int nb_rirs;
-  int block_size;
-  mini_kiss_fft_state *fft;
-  mini_kiss_fft_state *ifft;
-  mini_kiss_fft_cpx **rir;
-  mini_kiss_fft_cpx **early;
+    int nb_rirs;
+    int block_size;
+    mini_kiss_fft_state *fft;
+    mini_kiss_fft_state *ifft;
+    mini_kiss_fft_cpx **rir;
+    mini_kiss_fft_cpx **early;
 };
 
 mini_kiss_fft_cpx *load_rir(const char *rir_file, mini_kiss_fft_state *fft, int early) {
-  mini_kiss_fft_cpx *x, *X;
-  float rir[RIR_MAX_DURATION];
-  int len;
-  int i;
-  FILE *f;
-  f = fopen(rir_file, "rb");
-  if (f==NULL) {
-    fprintf(stderr, "cannot open RIR file %s: %s\n", rir_file, strerror(errno));
-    exit(1);
-  }
-  x = (mini_kiss_fft_cpx*)calloc(fft->nfft, sizeof(*x));
-  X = (mini_kiss_fft_cpx*)calloc(fft->nfft, sizeof(*X));
-  len = fread(rir, sizeof(*rir), RIR_MAX_DURATION, f);
-  if (early) {
-    for (i=0;i<240;i++) {
-      rir[480+i] *= (1 - i/240.f);
+    mini_kiss_fft_cpx *x, *X;
+    float rir[RIR_MAX_DURATION];
+    int len;
+    int i;
+    FILE *f;
+    f = fopen(rir_file, "rb");
+    if (f == NULL) {
+        fprintf(stderr, "cannot open RIR file %s: %s\n", rir_file, strerror(errno));
+        exit(1);
+    }
+    x = (mini_kiss_fft_cpx*)calloc(fft->nfft, sizeof(*x));
+    X = (mini_kiss_fft_cpx*)calloc(fft->nfft, sizeof(*X));
+    len = fread(rir, sizeof(*rir), RIR_MAX_DURATION, f);
+    if (early) {
+        for (i = 0; i < 240; i++) {
+            rir[480 + i] *= (1 - i/240.f);
+        }
+        OAC_CLEAR(&rir[240 + 480], RIR_MAX_DURATION - 240 - 480);
     }
-    OAC_CLEAR(&rir[240+480], RIR_MAX_DURATION-240-480);
-  }
-  for (i=0;i<len;i++) x[i].r = rir[i];
-  mini_kiss_fft(fft, x, X);
-  free(x);
-  fclose(f);
-  return X;
+    for (i = 0; i < len; i++) x[i].r = rir[i];
+    mini_kiss_fft(fft, x, X);
+    free(x);
+    fclose(f);
+    return X;
 }
 
 void load_rir_list(const char *list_file, struct rir_list *rirs) {
-  int allocated;
-  char rir_filename[FILENAME_MAX_SIZE];
-  FILE *f;
-  f = fopen(list_file, "rb");
-  if (f==NULL) {
-    fprintf(stderr, "cannot open %s: %s\n", list_file, strerror(errno));
-    exit(1);
-  }
-  rirs->nb_rirs = 0;
-  allocated = 2;
-  rirs->fft = mini_kiss_fft_alloc(RIR_FFT_SIZE, 0, NULL, NULL);
-  rirs->ifft = mini_kiss_fft_alloc(RIR_FFT_SIZE, 1, NULL, NULL);
-  rirs->rir = (mini_kiss_fft_cpx**)malloc(allocated*sizeof(rirs->rir[0]));
-  rirs->early = (mini_kiss_fft_cpx**)malloc(allocated*sizeof(rirs->early[0]));
-  while (fgets(rir_filename, FILENAME_MAX_SIZE, f) != NULL) {
-    /* Chop trailing newline. */
-    rir_filename[strcspn(rir_filename, "\n")] = 0;
-    if (rirs->nb_rirs+1 > allocated) {
-      allocated *= 2;
-      rirs->rir = (mini_kiss_fft_cpx**)realloc(rirs->rir, allocated*sizeof(rirs->rir[0]));
-      rirs->early = (mini_kiss_fft_cpx**)realloc(rirs->early, allocated*sizeof(rirs->early[0]));
+    int allocated;
+    char rir_filename[FILENAME_MAX_SIZE];
+    FILE *f;
+    f = fopen(list_file, "rb");
+    if (f == NULL) {
+        fprintf(stderr, "cannot open %s: %s\n", list_file, strerror(errno));
+        exit(1);
     }
-    rirs->rir[rirs->nb_rirs] = load_rir(rir_filename, rirs->fft, 0);
-    rirs->early[rirs->nb_rirs] = load_rir(rir_filename, rirs->fft, 1);
-    rirs->nb_rirs++;
-  }
-  fclose(f);
+    rirs->nb_rirs = 0;
+    allocated = 2;
+    rirs->fft = mini_kiss_fft_alloc(RIR_FFT_SIZE, 0, NULL, NULL);
+    rirs->ifft = mini_kiss_fft_alloc(RIR_FFT_SIZE, 1, NULL, NULL);
+    rirs->rir = (mini_kiss_fft_cpx**)malloc(allocated*sizeof(rirs->rir[0]));
+    rirs->early = (mini_kiss_fft_cpx**)malloc(allocated*sizeof(rirs->early[0]));
+    while (fgets(rir_filename, FILENAME_MAX_SIZE, f) != NULL) {
+        /* Chop trailing newline. */
+        rir_filename[strcspn(rir_filename, "\n")] = 0;
+        if (rirs->nb_rirs + 1 > allocated) {
+            allocated *= 2;
+            rirs->rir = (mini_kiss_fft_cpx**)realloc(rirs->rir, allocated*sizeof(rirs->rir[0]));
+            rirs->early = (mini_kiss_fft_cpx**)realloc(rirs->early, allocated*sizeof(rirs->early[0]));
+        }
+        rirs->rir[rirs->nb_rirs] = load_rir(rir_filename, rirs->fft, 0);
+        rirs->early[rirs->nb_rirs] = load_rir(rir_filename, rirs->fft, 1);
+        rirs->nb_rirs++;
+    }
+    fclose(f);
 }
 
 void rir_filter_sequence(const struct rir_list *rirs, float *audio, int rir_id, int early) {
-  int i;
-  mini_kiss_fft_cpx x[RIR_FFT_SIZE] = {{0,0}};
-  mini_kiss_fft_cpx y[RIR_FFT_SIZE] = {{0,0}};
-  mini_kiss_fft_cpx X[RIR_FFT_SIZE] = {{0,0}};
-  const mini_kiss_fft_cpx *Y;
-  if (early) Y = rirs->early[rir_id];
-  else Y = rirs->rir[rir_id];
-  i=0;
-  while (i<SEQUENCE_SAMPLES) {
-    int j;
-    OAC_COPY(&x[0], &x[RIR_FFT_SIZE/2], RIR_FFT_SIZE/2);
-    for (j=0;j<IMIN(SEQUENCE_SAMPLES-i, RIR_FFT_SIZE/2);j++) x[RIR_FFT_SIZE/2+j].r = audio[i+j];
-    for (;j<RIR_FFT_SIZE/2;j++) x[RIR_FFT_SIZE/2+j].r = 0;
-    mini_kiss_fft(rirs->fft, x, X);
-    for (j=0;j<RIR_FFT_SIZE;j++) {
-      mini_kiss_fft_cpx tmp;
-      C_MUL(tmp, X[j], Y[j]);
-      X[j].r = tmp.r*(1.f/(2.f*RIR_FFT_SIZE));
-      X[j].i = tmp.i*(1.f/(2.f*RIR_FFT_SIZE));
+    int i;
+    mini_kiss_fft_cpx x[RIR_FFT_SIZE] = {{0, 0}};
+    mini_kiss_fft_cpx y[RIR_FFT_SIZE] = {{0, 0}};
+    mini_kiss_fft_cpx X[RIR_FFT_SIZE] = {{0, 0}};
+    const mini_kiss_fft_cpx *Y;
+    if (early) Y = rirs->early[rir_id];
+    else Y = rirs->rir[rir_id];
+    i = 0;
+    while (i < SEQUENCE_SAMPLES) {
+        int j;
+        OAC_COPY(&x[0], &x[RIR_FFT_SIZE/2], RIR_FFT_SIZE/2);
+        for (j = 0; j < IMIN(SEQUENCE_SAMPLES - i, RIR_FFT_SIZE/2); j++) x[RIR_FFT_SIZE/2 + j].r = audio[i + j];
+        for (; j < RIR_FFT_SIZE/2; j++) x[RIR_FFT_SIZE/2 + j].r = 0;
+        mini_kiss_fft(rirs->fft, x, X);
+        for (j = 0; j < RIR_FFT_SIZE; j++) {
+            mini_kiss_fft_cpx tmp;
+            C_MUL(tmp, X[j], Y[j]);
+            X[j].r = tmp.r*(1.f/(2.f*RIR_FFT_SIZE));
+            X[j].i = tmp.i*(1.f/(2.f*RIR_FFT_SIZE));
+        }
+        mini_kiss_fft(rirs->ifft, X, y);
+        for (j = 0; j < IMIN(SEQUENCE_SAMPLES - i, RIR_FFT_SIZE/2); j++) audio[i + j] = y[RIR_FFT_SIZE/2 + j].r;
+        i += RIR_FFT_SIZE/2;
     }
-    mini_kiss_fft(rirs->ifft, X, y);
-    for (j=0;j<IMIN(SEQUENCE_SAMPLES-i, RIR_FFT_SIZE/2);j++) audio[i+j] = y[RIR_FFT_SIZE/2+j].r;
-    i += RIR_FFT_SIZE/2;
-  }
 }
 #endif
 
 
 static unsigned rand_lcg(unsigned *seed) {
-  *seed = 1664525**seed + 1013904223;
-  return *seed;
+    *seed = 1664525**seed + 1013904223;
+    return *seed;
 }
 
 static float randf(float f) {
-  return f*rand()/(double)RAND_MAX;
+    return f*rand()/(double)RAND_MAX;
 }
 
 static void biquad(float *y, float mem[2], const float *x, const float *b, const float *a, int N) {
-  int i;
-  for (i=0;i<N;i++) {
-    float xi, yi;
-    xi = x[i];
-    yi = x[i] + mem[0];
-    mem[0] = mem[1] + (b[0]*(double)xi - a[0]*(double)yi);
-    mem[1] = (b[1]*(double)xi - a[1]*(double)yi);
-    y[i] = yi;
-  }
+    int i;
+    for (i = 0; i < N; i++) {
+        float xi, yi;
+        xi = x[i];
+        yi = x[i] + mem[0];
+        mem[0] = mem[1] + (b[0]*(double)xi - a[0]*(double)yi);
+        mem[1] = (b[1]*(double)xi - a[1]*(double)yi);
+        y[i] = yi;
+    }
 }
 
 static float uni_rand(void) {
-  return rand()/(double)RAND_MAX-.5;
+    return rand()/(double)RAND_MAX - .5;
 }
 
 static void rand_filt(float *a) {
-  if (rand()%3!=0) {
-    a[0] = a[1] = 0;
-  }
-  else if (uni_rand()>0) {
-    float r, theta;
-    r = rand()/(double)RAND_MAX;
-    r = .7*r*r;
-    theta = rand()/(double)RAND_MAX;
-    theta = M_PI*theta*theta;
-    a[0] = -2*r*cos(theta);
-    a[1] = r*r;
-  } else {
-    float r0,r1;
-    r0 = 1.4*uni_rand();
-    r1 = 1.4*uni_rand();
-    a[0] = -r0-r1;
-    a[1] = r0*r1;
-  }
+    if (rand()%3 != 0) {
+        a[0] = a[1] = 0;
+    } else if (uni_rand() > 0) {
+        float r, theta;
+        r = rand()/(double)RAND_MAX;
+        r = .7*r*r;
+        theta = rand()/(double)RAND_MAX;
+        theta = M_PI*theta*theta;
+        a[0] = -2*r*cos(theta);
+        a[1] = r*r;
+    } else {
+        float r0, r1;
+        r0 = 1.4*uni_rand();
+        r1 = 1.4*uni_rand();
+        a[0] = -r0 - r1;
+        a[1] = r0*r1;
+    }
 }
 
 static void rand_resp(float *a, float *b) {
-  rand_filt(a);
-  rand_filt(b);
+    rand_filt(a);
+    rand_filt(b);
 }
 
-static oac_int16 float2short(float x)
-{
-  int i;
-  i = (int)floor(.5+x);
-  return IMAX(-32767, IMIN(32767, i));
+static oac_int16 float2short(float x) {
+    int i;
+    i = (int)floor(.5 + x);
+    return IMAX(-32767, IMIN(32767, i));
 }
 
 static float weighted_rms(float *x) {
-  int i;
-  float tmp[SEQUENCE_SAMPLES];
-  float weighting_b[2] = {-2.f, 1.f};
-  float weighting_a[2] = {-1.89f, .895f};
-  float mem[2] = {0};
-  float mse = 1e-15f;
-  biquad(tmp, mem, x, weighting_b, weighting_a, SEQUENCE_SAMPLES);
-  for (i=0;i<SEQUENCE_SAMPLES;i++) mse += tmp[i]*tmp[i];
-  return 0.9506*sqrt(mse/SEQUENCE_SAMPLES);
+    int i;
+    float tmp[SEQUENCE_SAMPLES];
+    float weighting_b[2] = {-2.f, 1.f};
+    float weighting_a[2] = {-1.89f, .895f};
+    float mem[2] = {0};
+    float mse = 1e-15f;
+    biquad(tmp, mem, x, weighting_b, weighting_a, SEQUENCE_SAMPLES);
+    for (i = 0; i < SEQUENCE_SAMPLES; i++) mse += tmp[i]*tmp[i];
+    return 0.9506*sqrt(mse/SEQUENCE_SAMPLES);
 }
 
 
@@ -235,253 +233,250 @@ float xn[SEQUENCE_LENGTH*FRAME_SIZE];
 
 
 int main(int argc, char **argv) {
-  int i, j;
-  const char *argv0;
-  const char *noise_filename=NULL;
-  const char *rir_filename=NULL;
-  int count=0;
-  static const float a_hp[2] = {-1.99599, 0.99600};
-  static const float b_hp[2] = {-2, 1};
-  float a_noise[2] = {0};
-  float b_noise[2] = {0};
-  float a_sig[2] = {0};
-  float b_sig[2] = {0};
-  float mem_preemph=0;
-  FILE *f1, *f2=NULL;
-  FILE *ffeat;
-  FILE *fpcm=NULL;
-  oac_int16 pcm[FRAME_SIZE]={0};
-  float speech_gain=1;
-  LPCNetEncState *st;
-  int training = -1;
-  int burg = 0;
-  int pitch = 0;
-  float noise_gain = 0;
-  int arch;
-  long speech_length, noise_length=0;
-  int maxCount;
-  unsigned seed;
+    int i, j;
+    const char *argv0;
+    const char *noise_filename = NULL;
+    const char *rir_filename = NULL;
+    int count = 0;
+    static const float a_hp[2] = {-1.99599, 0.99600};
+    static const float b_hp[2] = {-2, 1};
+    float a_noise[2] = {0};
+    float b_noise[2] = {0};
+    float a_sig[2] = {0};
+    float b_sig[2] = {0};
+    float mem_preemph = 0;
+    FILE *f1, *f2 = NULL;
+    FILE *ffeat;
+    FILE *fpcm = NULL;
+    oac_int16 pcm[FRAME_SIZE] = {0};
+    float speech_gain = 1;
+    LPCNetEncState *st;
+    int training = -1;
+    int burg = 0;
+    int pitch = 0;
+    float noise_gain = 0;
+    int arch;
+    long speech_length, noise_length = 0;
+    int maxCount;
+    unsigned seed;
 #ifdef ENABLE_RIR
-  struct rir_list rirs;
+    struct rir_list rirs;
 #endif
-  srand(getpid());
-  arch = oac_select_arch();
-  st = lpcnet_encoder_create();
-  argv0=argv[0];
-  if (argc == 5 && strcmp(argv[1], "-btrain")==0) {
-      burg = 1;
-      training = 1;
-  }
-  else if (argc == 4 && strcmp(argv[1], "-btest")==0) {
-      burg = 1;
-      training = 0;
-  }
-  else if (argc == 5 && strcmp(argv[1], "-ptrain")==0) {
-      pitch = 1;
-      training = 1;
-      noise_filename = argv[2];
-      argv++;
-  }
-  else if (argc == 4 && strcmp(argv[1], "-ptest")==0) {
-      pitch = 1;
-      training = 0;
-  }
-  else if (argc == 7 && strcmp(argv[1], "-train")==0) {
-     training = 1;
-     noise_filename = argv[2];
-     rir_filename = argv[3];
-     argv+=2;
-  } else if (argc == 4 && strcmp(argv[1], "-test")==0) training = 0;
-  if (training == -1) {
-    fprintf(stderr, "usage: %s -train <noise> <rir_list> <speech> <features out> <pcm out>\n", argv0);
-    fprintf(stderr, "       %s -ptrain <noise> <speech> <features out>\n", argv0);
-    fprintf(stderr, "       %s -test <speech> <features out>\n", argv0);
-    return 1;
-  }
-  f1 = fopen(argv[2], "r");
-  if (f1 == NULL) {
-    fprintf(stderr,"Error opening input .s16 16kHz speech input file: %s\n", argv[2]);
-    exit(1);
-  }
-  if (noise_filename != NULL) {
-     f2 = fopen(noise_filename, "r");
-     if (f2 == NULL) {
-        fprintf(stderr,"Error opening input .s16 16kHz speech input file: %s\n", noise_filename);
+    srand(getpid());
+    arch = oac_select_arch();
+    st = lpcnet_encoder_create();
+    argv0 = argv[0];
+    if (argc == 5 && strcmp(argv[1], "-btrain") == 0) {
+        burg = 1;
+        training = 1;
+    } else if (argc == 4 && strcmp(argv[1], "-btest") == 0) {
+        burg = 1;
+        training = 0;
+    } else if (argc == 5 && strcmp(argv[1], "-ptrain") == 0) {
+        pitch = 1;
+        training = 1;
+        noise_filename = argv[2];
+        argv++;
+    } else if (argc == 4 && strcmp(argv[1], "-ptest") == 0) {
+        pitch = 1;
+        training = 0;
+    } else if (argc == 7 && strcmp(argv[1], "-train") == 0) {
+        training = 1;
+        noise_filename = argv[2];
+        rir_filename = argv[3];
+        argv += 2;
+    } else if (argc == 4 && strcmp(argv[1], "-test") == 0) training = 0;
+    if (training == -1) {
+        fprintf(stderr, "usage: %s -train <noise> <rir_list> <speech> <features out> <pcm out>\n", argv0);
+        fprintf(stderr, "       %s -ptrain <noise> <speech> <features out>\n", argv0);
+        fprintf(stderr, "       %s -test <speech> <features out>\n", argv0);
+        return 1;
+    }
+    f1 = fopen(argv[2], "r");
+    if (f1 == NULL) {
+        fprintf(stderr, "Error opening input .s16 16kHz speech input file: %s\n", argv[2]);
+        exit(1);
+    }
+    if (noise_filename != NULL) {
+        f2 = fopen(noise_filename, "r");
+        if (f2 == NULL) {
+            fprintf(stderr, "Error opening input .s16 16kHz speech input file: %s\n", noise_filename);
+            exit(1);
+        }
+        fseek(f2, 0, SEEK_END);
+        noise_length = ftell(f2);
+        fseek(f2, 0, SEEK_SET);
+    }
+    ffeat = fopen(argv[3], "wb");
+    if (ffeat == NULL) {
+        fprintf(stderr, "Error opening output feature file: %s\n", argv[3]);
         exit(1);
-     }
-     fseek(f2, 0, SEEK_END);
-     noise_length = ftell(f2);
-     fseek(f2, 0, SEEK_SET);
-  }
-  ffeat = fopen(argv[3], "wb");
-  if (ffeat == NULL) {
-    fprintf(stderr,"Error opening output feature file: %s\n", argv[3]);
-    exit(1);
-  }
-  if (training && !pitch) {
-    fpcm = fopen(argv[4], "wb");
-    if (fpcm == NULL) {
-      fprintf(stderr,"Error opening output PCM file: %s\n", argv[4]);
-      exit(1);
     }
-  }
+    if (training && !pitch) {
+        fpcm = fopen(argv[4], "wb");
+        if (fpcm == NULL) {
+            fprintf(stderr, "Error opening output PCM file: %s\n", argv[4]);
+            exit(1);
+        }
+    }
 #ifdef ENABLE_RIR
-  if (rir_filename != NULL) {
-     load_rir_list(rir_filename, &rirs);
-  }
+    if (rir_filename != NULL) {
+        load_rir_list(rir_filename, &rirs);
+    }
 #endif
 
-  seed = getpid();
-  srand(seed);
+    seed = getpid();
+    srand(seed);
 
-  fseek(f1, 0, SEEK_END);
-  speech_length = ftell(f1);
-  fseek(f1, 0, SEEK_SET);
+    fseek(f1, 0, SEEK_END);
+    speech_length = ftell(f1);
+    fseek(f1, 0, SEEK_SET);
 #ifndef ENABLE_RIR
-  fprintf(stderr, "WARNING: dump_data was built without RIR support\n");
+    fprintf(stderr, "WARNING: dump_data was built without RIR support\n");
 #endif
 
-  maxCount = 20000;
-  for (count=0;count<maxCount;count++) {
-    int rir_id;
-    int sequence_length;
-    long speech_pos, noise_pos;
-    int start_pos=0;
-    float E[SEQUENCE_LENGTH] = {0};
-    float mem[2]={0};
-    int frame;
-    float speech_rms, noise_rms;
-    int ret;
-    if ((count%1000)==0) fprintf(stderr, "%d\r", count);
-    speech_pos = (rand_lcg(&seed)*2.3283e-10)*speech_length;
-    if (speech_pos > speech_length-(long)sizeof(speech16)) speech_pos = speech_length-sizeof(speech16);
-    speech_pos -= speech_pos&1;
-    fseek(f1, speech_pos, SEEK_SET);
-    ret = fread(speech16, sizeof(speech16), 1, f1);
-    if (ret != 1) {
-       fprintf(stderr, "reading speech failed\n");
-       return 1;
-    }
-    if (f2!=NULL) {
-       noise_pos = (rand_lcg(&seed)*2.3283e-10)*noise_length;
-       if (noise_pos > noise_length-(long)sizeof(noise16)) noise_pos = noise_length-sizeof(noise16);
-       noise_pos -= noise_pos&1;
-       fseek(f2, noise_pos, SEEK_SET);
-       ret = fread(noise16, sizeof(noise16), 1, f2);
-       if (ret != 1) {
-          fprintf(stderr, "reading noise failed\n");
-          return 1;
-       }
-    }
-    if (rand()%4) start_pos = 0;
-    else start_pos = -(int)(1000*log(rand()/(float)RAND_MAX));
-    start_pos = IMIN(start_pos, SEQUENCE_LENGTH*FRAME_SIZE);
-
-    speech_gain = pow(10., (-30+(rand()%40))/20.);
-    if (rand()&1) speech_gain = -speech_gain;
-    if (rand()%20==0) speech_gain *= .01;
-    if (!pitch && rand()%100==0) speech_gain = 0;
-
-    noise_gain = pow(10., (-40+randf(25.f)+randf(15.f))/20.);
-    if (rand()%2!=0) noise_gain = 0;
-    if (rand()%12==0) {
-      noise_gain *= 0.03;
-    }
-    noise_gain *= speech_gain;
-    rand_resp(a_noise, b_noise);
-    rand_resp(a_sig, b_sig);
-
-    for (frame=0;frame<SEQUENCE_LENGTH;frame++) {
-      E[frame] = 0;
-      for(j=0;j<FRAME_SIZE;j++) {
-        float s = speech16[frame*FRAME_SIZE+j];
-        E[frame] += s*s;
-        x[frame*FRAME_SIZE+j] = speech16[frame*FRAME_SIZE+j];
-        n[frame*FRAME_SIZE+j] = noise16[frame*FRAME_SIZE+j];
-      }
-    }
-
-    OAC_CLEAR(mem, 2);
-    biquad(x, mem, x, b_hp, a_hp, SEQUENCE_LENGTH*FRAME_SIZE);
-    OAC_CLEAR(mem, 2);
-    biquad(x, mem, x, b_sig, a_sig, SEQUENCE_LENGTH*FRAME_SIZE);
-    OAC_CLEAR(mem, 2);
-    biquad(n, mem, n, b_hp, a_hp, SEQUENCE_LENGTH*FRAME_SIZE);
-    OAC_CLEAR(mem, 2);
-    biquad(n, mem, n, b_noise, a_noise, SEQUENCE_LENGTH*FRAME_SIZE);
-
-    speech_rms = weighted_rms(x);
-    noise_rms = weighted_rms(n);
-
-    speech_gain *= 3000.f/(1+speech_rms);
-    noise_gain *= 3000.f/(1+noise_rms);
-    for (j=0;j<SEQUENCE_SAMPLES;j++) {
-      x[j] *= speech_gain;
-      n[j] *= noise_gain;
-      xn[j] = x[j] + n[j];
-    }
+    maxCount = 20000;
+    for (count = 0; count < maxCount; count++) {
+        int rir_id;
+        int sequence_length;
+        long speech_pos, noise_pos;
+        int start_pos = 0;
+        float E[SEQUENCE_LENGTH] = {0};
+        float mem[2] = {0};
+        int frame;
+        float speech_rms, noise_rms;
+        int ret;
+        if ((count%1000) == 0) fprintf(stderr, "%d\r", count);
+        speech_pos = (rand_lcg(&seed)*2.3283e-10)*speech_length;
+        if (speech_pos > speech_length - (long)sizeof(speech16)) speech_pos = speech_length - sizeof(speech16);
+        speech_pos -= speech_pos&1;
+        fseek(f1, speech_pos, SEEK_SET);
+        ret = fread(speech16, sizeof(speech16), 1, f1);
+        if (ret != 1) {
+            fprintf(stderr, "reading speech failed\n");
+            return 1;
+        }
+        if (f2 != NULL) {
+            noise_pos = (rand_lcg(&seed)*2.3283e-10)*noise_length;
+            if (noise_pos > noise_length - (long)sizeof(noise16)) noise_pos = noise_length - sizeof(noise16);
+            noise_pos -= noise_pos&1;
+            fseek(f2, noise_pos, SEEK_SET);
+            ret = fread(noise16, sizeof(noise16), 1, f2);
+            if (ret != 1) {
+                fprintf(stderr, "reading noise failed\n");
+                return 1;
+            }
+        }
+        if (rand()%4) start_pos = 0;
+        else start_pos = -(int)(1000*log(rand()/(float)RAND_MAX));
+        start_pos = IMIN(start_pos, SEQUENCE_LENGTH*FRAME_SIZE);
+
+        speech_gain = pow(10., (-30 + (rand()%40))/20.);
+        if (rand()&1) speech_gain = -speech_gain;
+        if (rand()%20 == 0) speech_gain *= .01;
+        if (!pitch && rand()%100 == 0) speech_gain = 0;
+
+        noise_gain = pow(10., (-40 + randf(25.f) + randf(15.f))/20.);
+        if (rand()%2 != 0) noise_gain = 0;
+        if (rand()%12 == 0) {
+            noise_gain *= 0.03;
+        }
+        noise_gain *= speech_gain;
+        rand_resp(a_noise, b_noise);
+        rand_resp(a_sig, b_sig);
+
+        for (frame = 0; frame < SEQUENCE_LENGTH; frame++) {
+            E[frame] = 0;
+            for (j = 0; j < FRAME_SIZE; j++) {
+                float s = speech16[frame*FRAME_SIZE + j];
+                E[frame] += s*s;
+                x[frame*FRAME_SIZE + j] = speech16[frame*FRAME_SIZE + j];
+                n[frame*FRAME_SIZE + j] = noise16[frame*FRAME_SIZE + j];
+            }
+        }
+
+        OAC_CLEAR(mem, 2);
+        biquad(x, mem, x, b_hp, a_hp, SEQUENCE_LENGTH*FRAME_SIZE);
+        OAC_CLEAR(mem, 2);
+        biquad(x, mem, x, b_sig, a_sig, SEQUENCE_LENGTH*FRAME_SIZE);
+        OAC_CLEAR(mem, 2);
+        biquad(n, mem, n, b_hp, a_hp, SEQUENCE_LENGTH*FRAME_SIZE);
+        OAC_CLEAR(mem, 2);
+        biquad(n, mem, n, b_noise, a_noise, SEQUENCE_LENGTH*FRAME_SIZE);
+
+        speech_rms = weighted_rms(x);
+        noise_rms = weighted_rms(n);
+
+        speech_gain *= 3000.f/(1 + speech_rms);
+        noise_gain *= 3000.f/(1 + noise_rms);
+        for (j = 0; j < SEQUENCE_SAMPLES; j++) {
+            x[j] *= speech_gain;
+            n[j] *= noise_gain;
+            xn[j] = x[j] + n[j];
+        }
 #ifdef ENABLE_RIR
-    if (rir_filename!=NULL && rand()%3==0) {
-      rir_id = rand()%rirs.nb_rirs;
-      rir_filter_sequence(&rirs, x, rir_id, 1);
-      rir_filter_sequence(&rirs, xn, rir_id, 0);
-    }
+        if (rir_filename != NULL && rand()%3 == 0) {
+            rir_id = rand()%rirs.nb_rirs;
+            rir_filter_sequence(&rirs, x, rir_id, 1);
+            rir_filter_sequence(&rirs, xn, rir_id, 0);
+        }
 #endif
-    if (rand()%4==0) {
-      /* Apply input clipping to 0 dBFS (don't clip target). */
-      for (j=0;j<SEQUENCE_SAMPLES;j++) {
-        xn[j] = MIN16(32767.f, MAX16(-32767.f, xn[j]));
-      }
-    }
-    if (rand()%2==0) {
-      /* Apply 16-bit quantization. */
-      for (j=0;j<SEQUENCE_SAMPLES;j++) {
-        xn[j] = floor(.5f + xn[j]);
-      }
-    }
+        if (rand()%4 == 0) {
+            /* Apply input clipping to 0 dBFS (don't clip target). */
+            for (j = 0; j < SEQUENCE_SAMPLES; j++) {
+                xn[j] = MIN16(32767.f, MAX16(-32767.f, xn[j]));
+            }
+        }
+        if (rand()%2 == 0) {
+            /* Apply 16-bit quantization. */
+            for (j = 0; j < SEQUENCE_SAMPLES; j++) {
+                xn[j] = floor(.5f + xn[j]);
+            }
+        }
 #if 0
-    for (frame=0;frame<SEQUENCE_LENGTH;frame++) {
-       short tmp[FRAME_SIZE];
-       for (j=0;j<FRAME_SIZE;j++) tmp[j] = MIN16(32767, MAX16(-32767, xn[frame*FRAME_SIZE+j]));
-       fwrite(tmp, FRAME_SIZE, 2, fout);
-    }
+        for (frame = 0; frame < SEQUENCE_LENGTH; frame++) {
+            short tmp[FRAME_SIZE];
+            for (j = 0; j < FRAME_SIZE; j++) tmp[j] = MIN16(32767, MAX16(-32767, xn[frame*FRAME_SIZE + j]));
+            fwrite(tmp, FRAME_SIZE, 2, fout);
+        }
 #endif
 
-    sequence_length = IMIN(SEQUENCE_LENGTH, SEQUENCE_LENGTH/2 + rand()%(SEQUENCE_LENGTH/2+1));
-    for (frame=0;frame<sequence_length;frame++) {
-       float *xf = &xn[frame*FRAME_SIZE];
-       if (burg) {
-         float ceps[2*NB_BANDS];
-         burg_cepstral_analysis(ceps, xf);
-         fwrite(ceps, sizeof(float), 2*NB_BANDS, ffeat);
-       }
-       preemphasis(xf, &mem_preemph, xf, PREEMPHASIS, FRAME_SIZE);
-       /* PCM is delayed by 1/2 frame to make the features centered on the frames. */
-       for (i=0;i<FRAME_SIZE-TRAINING_OFFSET;i++) pcm[i+TRAINING_OFFSET] = float2short(xf[i]);
-       compute_frame_features(st, xf, arch);
-
-       if (pitch) {
-         signed char pitch_features[PITCH_MAX_PERIOD-PITCH_MIN_PERIOD+PITCH_IF_FEATURES];
-         for (i=0;i<PITCH_MAX_PERIOD-PITCH_MIN_PERIOD;i++) {
-           pitch_features[i] = (int)floor(.5f + 127.f*st->xcorr_features[i]);
-         }
-         for (i=0;i<PITCH_IF_FEATURES;i++) {
-           pitch_features[i+PITCH_MAX_PERIOD-PITCH_MIN_PERIOD] = (int)floor(.5f + 127.f*st->if_features[i]);
-         }
-         fwrite(pitch_features, PITCH_MAX_PERIOD-PITCH_MIN_PERIOD+PITCH_IF_FEATURES, 1, ffeat);
-       } else {
-         fwrite(st->features, sizeof(float), NB_TOTAL_FEATURES, ffeat);
-       }
-       /*if(pitch) fwrite(pcm, FRAME_SIZE, 2, stdout);*/
-       if (fpcm) fwrite(pcm, FRAME_SIZE, 2, fpcm);
-       for (i=0;i<TRAINING_OFFSET;i++) pcm[i] = float2short(xf[i+FRAME_SIZE-TRAINING_OFFSET]);
+        sequence_length = IMIN(SEQUENCE_LENGTH, SEQUENCE_LENGTH/2 + rand()%(SEQUENCE_LENGTH/2 + 1));
+        for (frame = 0; frame < sequence_length; frame++) {
+            float *xf = &xn[frame*FRAME_SIZE];
+            if (burg) {
+                float ceps[2*NB_BANDS];
+                burg_cepstral_analysis(ceps, xf);
+                fwrite(ceps, sizeof(float), 2*NB_BANDS, ffeat);
+            }
+            preemphasis(xf, &mem_preemph, xf, PREEMPHASIS, FRAME_SIZE);
+            /* PCM is delayed by 1/2 frame to make the features centered on the frames. */
+            for (i = 0; i < FRAME_SIZE - TRAINING_OFFSET; i++) pcm[i + TRAINING_OFFSET] = float2short(xf[i]);
+            compute_frame_features(st, xf, arch);
+
+            if (pitch) {
+                signed char pitch_features[PITCH_MAX_PERIOD - PITCH_MIN_PERIOD + PITCH_IF_FEATURES];
+                for (i = 0; i < PITCH_MAX_PERIOD - PITCH_MIN_PERIOD; i++) {
+                    pitch_features[i] = (int)floor(.5f + 127.f*st->xcorr_features[i]);
+                }
+                for (i = 0; i < PITCH_IF_FEATURES; i++) {
+                    pitch_features[i + PITCH_MAX_PERIOD - PITCH_MIN_PERIOD] = (int)floor(.5f + 127.f
+                        *st->if_features[i]);
+                }
+                fwrite(pitch_features, PITCH_MAX_PERIOD - PITCH_MIN_PERIOD + PITCH_IF_FEATURES, 1, ffeat);
+            } else {
+                fwrite(st->features, sizeof(float), NB_TOTAL_FEATURES, ffeat);
+            }
+            /*if(pitch) fwrite(pcm, FRAME_SIZE, 2, stdout);*/
+            if (fpcm) fwrite(pcm, FRAME_SIZE, 2, fpcm);
+            for (i = 0; i < TRAINING_OFFSET; i++) pcm[i] = float2short(xf[i + FRAME_SIZE - TRAINING_OFFSET]);
+        }
     }
-  }
-
-  fclose(f1);
-  fclose(f2);
-  fclose(ffeat);
-  if (fpcm) fclose(fpcm);
-  lpcnet_encoder_destroy(st);
-  return 0;
+
+    fclose(f1);
+    fclose(f2);
+    fclose(ffeat);
+    if (fpcm) fclose(fpcm);
+    lpcnet_encoder_destroy(st);
+    return 0;
 }
diff --git a/dnn/dump_lpcnet_tables.c b/dnn/dump_lpcnet_tables.c
index 4b5e52fe0..7c9555ff7 100644
--- a/dnn/dump_lpcnet_tables.c
+++ b/dnn/dump_lpcnet_tables.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <math.h>
@@ -36,69 +36,69 @@
 
 
 int main(void) {
-  int i;
-  FILE *file;
-  kiss_fft_state *kfft;
-  float half_window[OVERLAP_SIZE];
-  float dct_table[NB_BANDS*NB_BANDS];
-
-  file=fopen("lpcnet_tables.c", "wb");
-  fprintf(file, "/* The contents of this file was automatically generated by dump_lpcnet_tables.c*/\n\n");
-  fprintf(file, "#ifdef HAVE_CONFIG_H\n");
-  fprintf(file, "#include \"config.h\"\n");
-  fprintf(file, "#endif\n");
-
-  fprintf(file, "#include \"kiss_fft.h\"\n\n");
-
-  kfft = oac_fft_alloc_twiddles(WINDOW_SIZE, NULL, NULL, NULL, 0);
-
-  fprintf(file, "static const arch_fft_state arch_fft = {0, NULL};\n\n");
-
-  fprintf (file, "static const oac_int16 fft_bitrev[%d] = {\n", kfft->nfft);
-  for (i=0;i<kfft->nfft;i++)
-    fprintf (file, "%d,%c", kfft->bitrev[i],(i+16)%15==0?'\n':' ');
-  fprintf (file, "};\n\n");
-
-  fprintf (file, "static const kiss_twiddle_cpx fft_twiddles[%d] = {\n", kfft->nfft);
-  for (i=0;i<kfft->nfft;i++)
-    fprintf (file, "{%#0.9gf, %#0.9gf},%c", kfft->twiddles[i].r, kfft->twiddles[i].i,(i+3)%2==0?'\n':' ');
-  fprintf (file, "};\n\n");
-
-
-  fprintf(file, "const kiss_fft_state kfft = {\n");
-  fprintf(file, "%d, /* nfft */\n", kfft->nfft);
-  fprintf(file, "%#0.8gf, /* scale */\n", kfft->scale);
-  fprintf(file, "%d, /* shift */\n", kfft->shift);
-  fprintf(file, "{");
-  for (i=0;i<2*MAXFACTORS;i++) {
-    fprintf(file, "%d, ", kfft->factors[i]);
-  }
-  fprintf(file, "}, /* factors */\n");
-  fprintf(file, "fft_bitrev, /* bitrev*/\n");
-  fprintf(file, "fft_twiddles, /* twiddles*/\n");
-  fprintf(file, "(arch_fft_state *)&arch_fft, /* arch_fft*/\n");
-
-  fprintf(file, "};\n\n");
-
-  for (i=0;i<OVERLAP_SIZE;i++)
-    half_window[i] = sin(.5*M_PI*sin(.5*M_PI*(i+.5)/OVERLAP_SIZE) * sin(.5*M_PI*(i+.5)/OVERLAP_SIZE));
-  fprintf(file, "const float half_window[] = {\n");
-  for (i=0;i<OVERLAP_SIZE;i++)
-    fprintf (file, "%#0.9gf,%c", half_window[i],(i+6)%5==0?'\n':' ');
-  fprintf(file, "};\n\n");
-
-  for (i=0;i<NB_BANDS;i++) {
-    int j;
-    for (j=0;j<NB_BANDS;j++) {
-      dct_table[i*NB_BANDS + j] = cos((i+.5)*j*M_PI/NB_BANDS);
-      if (j==0) dct_table[i*NB_BANDS + j] *= sqrt(.5);
+    int i;
+    FILE *file;
+    kiss_fft_state *kfft;
+    float half_window[OVERLAP_SIZE];
+    float dct_table[NB_BANDS*NB_BANDS];
+
+    file = fopen("lpcnet_tables.c", "wb");
+    fprintf(file, "/* The contents of this file was automatically generated by dump_lpcnet_tables.c*/\n\n");
+    fprintf(file, "#ifdef HAVE_CONFIG_H\n");
+    fprintf(file, "#include \"config.h\"\n");
+    fprintf(file, "#endif\n");
+
+    fprintf(file, "#include \"kiss_fft.h\"\n\n");
+
+    kfft = oac_fft_alloc_twiddles(WINDOW_SIZE, NULL, NULL, NULL, 0);
+
+    fprintf(file, "static const arch_fft_state arch_fft = {0, NULL};\n\n");
+
+    fprintf (file, "static const oac_int16 fft_bitrev[%d] = {\n", kfft->nfft);
+    for (i = 0; i < kfft->nfft; i++)
+        fprintf (file, "%d,%c", kfft->bitrev[i], (i + 16)%15 == 0?'\n':' ');
+    fprintf (file, "};\n\n");
+
+    fprintf (file, "static const kiss_twiddle_cpx fft_twiddles[%d] = {\n", kfft->nfft);
+    for (i = 0; i < kfft->nfft; i++)
+        fprintf (file, "{%#0.9gf, %#0.9gf},%c", kfft->twiddles[i].r, kfft->twiddles[i].i, (i + 3)%2 == 0?'\n':' ');
+    fprintf (file, "};\n\n");
+
+
+    fprintf(file, "const kiss_fft_state kfft = {\n");
+    fprintf(file, "%d, /* nfft */\n", kfft->nfft);
+    fprintf(file, "%#0.8gf, /* scale */\n", kfft->scale);
+    fprintf(file, "%d, /* shift */\n", kfft->shift);
+    fprintf(file, "{");
+    for (i = 0; i < 2*MAXFACTORS; i++) {
+        fprintf(file, "%d, ", kfft->factors[i]);
     }
-  }
-  fprintf(file, "const float dct_table[] = {\n");
-  for (i=0;i<NB_BANDS*NB_BANDS;i++)
-    fprintf (file, "%#0.9gf,%c", dct_table[i],(i+6)%5==0?'\n':' ');
-  fprintf(file, "};\n");
-
-  fclose(file);
-  return 0;
+    fprintf(file, "}, /* factors */\n");
+    fprintf(file, "fft_bitrev, /* bitrev*/\n");
+    fprintf(file, "fft_twiddles, /* twiddles*/\n");
+    fprintf(file, "(arch_fft_state *)&arch_fft, /* arch_fft*/\n");
+
+    fprintf(file, "};\n\n");
+
+    for (i = 0; i < OVERLAP_SIZE; i++)
+        half_window[i] = sin(.5*M_PI*sin(.5*M_PI*(i + .5)/OVERLAP_SIZE)*sin(.5*M_PI*(i + .5)/OVERLAP_SIZE));
+    fprintf(file, "const float half_window[] = {\n");
+    for (i = 0; i < OVERLAP_SIZE; i++)
+        fprintf (file, "%#0.9gf,%c", half_window[i], (i + 6)%5 == 0?'\n':' ');
+    fprintf(file, "};\n\n");
+
+    for (i = 0; i < NB_BANDS; i++) {
+        int j;
+        for (j = 0; j < NB_BANDS; j++) {
+            dct_table[i*NB_BANDS + j] = cos((i + .5)*j*M_PI/NB_BANDS);
+            if (j == 0) dct_table[i*NB_BANDS + j] *= sqrt(.5);
+        }
+    }
+    fprintf(file, "const float dct_table[] = {\n");
+    for (i = 0; i < NB_BANDS*NB_BANDS; i++)
+        fprintf (file, "%#0.9gf,%c", dct_table[i], (i + 6)%5 == 0?'\n':' ');
+    fprintf(file, "};\n");
+
+    fclose(file);
+    return 0;
 }
diff --git a/dnn/fargan.c b/dnn/fargan.c
index 04cfd859c..70bd2a39d 100644
--- a/dnn/fargan.c
+++ b/dnn/fargan.c
@@ -22,10 +22,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "fargan.h"
@@ -40,186 +40,190 @@
 
 #define FARGAN_FEATURES (NB_FEATURES)
 
-static void compute_fargan_cond(FARGANState *st, float *cond, const float *features, int period)
-{
-  FARGAN *model;
-  float dense_in[NB_FEATURES+COND_NET_PEMBED_OUT_SIZE];
-  float conv1_in[COND_NET_FCONV1_IN_SIZE];
-  float fdense2_in[COND_NET_FCONV1_OUT_SIZE];
-  model = &st->model;
-  celt_assert(FARGAN_FEATURES+COND_NET_PEMBED_OUT_SIZE == model->cond_net_fdense1.nb_inputs);
-  celt_assert(COND_NET_FCONV1_IN_SIZE == model->cond_net_fdense1.nb_outputs);
-  celt_assert(COND_NET_FCONV1_OUT_SIZE == model->cond_net_fconv1.nb_outputs);
-  OAC_COPY(&dense_in[NB_FEATURES], &model->cond_net_pembed.float_weights[IMAX(0,IMIN(period-32, 223))*COND_NET_PEMBED_OUT_SIZE], COND_NET_PEMBED_OUT_SIZE);
-  OAC_COPY(dense_in, features, NB_FEATURES);
-
-  compute_generic_dense(&model->cond_net_fdense1, conv1_in, dense_in, ACTIVATION_TANH, st->arch);
-  compute_generic_conv1d(&model->cond_net_fconv1, fdense2_in, st->cond_conv1_state, conv1_in, COND_NET_FCONV1_IN_SIZE, ACTIVATION_TANH, st->arch);
-  compute_generic_dense(&model->cond_net_fdense2, cond, fdense2_in, ACTIVATION_TANH, st->arch);
+static void compute_fargan_cond(FARGANState *st, float *cond, const float *features, int period) {
+    FARGAN *model;
+    float dense_in[NB_FEATURES + COND_NET_PEMBED_OUT_SIZE];
+    float conv1_in[COND_NET_FCONV1_IN_SIZE];
+    float fdense2_in[COND_NET_FCONV1_OUT_SIZE];
+    model = &st->model;
+    celt_assert(FARGAN_FEATURES + COND_NET_PEMBED_OUT_SIZE == model->cond_net_fdense1.nb_inputs);
+    celt_assert(COND_NET_FCONV1_IN_SIZE == model->cond_net_fdense1.nb_outputs);
+    celt_assert(COND_NET_FCONV1_OUT_SIZE == model->cond_net_fconv1.nb_outputs);
+    OAC_COPY(&dense_in[NB_FEATURES],
+    &model->cond_net_pembed.float_weights[IMAX(0, IMIN(period - 32, 223))*COND_NET_PEMBED_OUT_SIZE],
+    COND_NET_PEMBED_OUT_SIZE);
+    OAC_COPY(dense_in, features, NB_FEATURES);
+
+    compute_generic_dense(&model->cond_net_fdense1, conv1_in, dense_in, ACTIVATION_TANH, st->arch);
+    compute_generic_conv1d(&model->cond_net_fconv1, fdense2_in, st->cond_conv1_state, conv1_in, COND_NET_FCONV1_IN_SIZE,
+    ACTIVATION_TANH, st->arch);
+    compute_generic_dense(&model->cond_net_fdense2, cond, fdense2_in, ACTIVATION_TANH, st->arch);
 }
 
 static void fargan_deemphasis(float *pcm, float *deemph_mem) {
-  int i;
-  for (i=0;i<FARGAN_SUBFRAME_SIZE;i++) {
-    pcm[i] += FARGAN_DEEMPHASIS * *deemph_mem;
-    *deemph_mem = pcm[i];
-  }
+    int i;
+    for (i = 0; i < FARGAN_SUBFRAME_SIZE; i++) {
+        pcm[i] += FARGAN_DEEMPHASIS**deemph_mem;
+        *deemph_mem = pcm[i];
+    }
 }
 
-static void run_fargan_subframe(FARGANState *st, float *pcm, const float *cond, int period)
-{
-  int i, pos;
-  float fwc0_in[SIG_NET_INPUT_SIZE];
-  float gru1_in[SIG_NET_FWC0_CONV_OUT_SIZE+2*FARGAN_SUBFRAME_SIZE];
-  float gru2_in[SIG_NET_GRU1_OUT_SIZE+2*FARGAN_SUBFRAME_SIZE];
-  float gru3_in[SIG_NET_GRU2_OUT_SIZE+2*FARGAN_SUBFRAME_SIZE];
-  float pred[FARGAN_SUBFRAME_SIZE+4];
-  float prev[FARGAN_SUBFRAME_SIZE];
-  float pitch_gate[4];
-  float gain;
-  float gain_1;
-  float skip_cat[10000];
-  float skip_out[SIG_NET_SKIP_DENSE_OUT_SIZE];
-  FARGAN *model;
-
-  celt_assert(st->cont_initialized);
-  model = &st->model;
-
-  compute_generic_dense(&model->sig_net_cond_gain_dense, &gain, cond, ACTIVATION_LINEAR, st->arch);
-  gain = exp(gain);
-  gain_1 = 1.f/(1e-5f + gain);
-
-  pos = PITCH_MAX_PERIOD-period-2;
-  for (i=0;i<FARGAN_SUBFRAME_SIZE+4;i++) {
-    pred[i] = MIN32(1.f, MAX32(-1.f, gain_1*st->pitch_buf[IMAX(0, pos)]));
-    pos++;
-    if (pos == PITCH_MAX_PERIOD) pos -= period;
-  }
-  for (i=0;i<FARGAN_SUBFRAME_SIZE;i++) prev[i] = MAX32(-1.f, MIN16(1.f, gain_1*st->pitch_buf[PITCH_MAX_PERIOD-FARGAN_SUBFRAME_SIZE+i]));
-
-  OAC_COPY(&fwc0_in[0], &cond[0], FARGAN_COND_SIZE);
-  OAC_COPY(&fwc0_in[FARGAN_COND_SIZE], pred, FARGAN_SUBFRAME_SIZE+4);
-  OAC_COPY(&fwc0_in[FARGAN_COND_SIZE+FARGAN_SUBFRAME_SIZE+4], prev, FARGAN_SUBFRAME_SIZE);
-
-  compute_generic_conv1d(&model->sig_net_fwc0_conv, gru1_in, st->fwc0_mem, fwc0_in, SIG_NET_INPUT_SIZE, ACTIVATION_TANH, st->arch);
-  celt_assert(SIG_NET_FWC0_GLU_GATE_OUT_SIZE == model->sig_net_fwc0_glu_gate.nb_outputs);
-  compute_glu(&model->sig_net_fwc0_glu_gate, gru1_in, gru1_in, st->arch);
-
-  compute_generic_dense(&model->sig_net_gain_dense_out, pitch_gate, gru1_in, ACTIVATION_SIGMOID, st->arch);
-
-  for (i=0;i<FARGAN_SUBFRAME_SIZE;i++) gru1_in[SIG_NET_FWC0_GLU_GATE_OUT_SIZE+i] = pitch_gate[0]*pred[i+2];
-  OAC_COPY(&gru1_in[SIG_NET_FWC0_GLU_GATE_OUT_SIZE+FARGAN_SUBFRAME_SIZE], prev, FARGAN_SUBFRAME_SIZE);
-  compute_generic_gru(&model->sig_net_gru1_input, &model->sig_net_gru1_recurrent, st->gru1_state, gru1_in, st->arch);
-  compute_glu(&model->sig_net_gru1_glu_gate, gru2_in, st->gru1_state, st->arch);
-
-  for (i=0;i<FARGAN_SUBFRAME_SIZE;i++) gru2_in[SIG_NET_GRU1_OUT_SIZE+i] = pitch_gate[1]*pred[i+2];
-  OAC_COPY(&gru2_in[SIG_NET_GRU1_OUT_SIZE+FARGAN_SUBFRAME_SIZE], prev, FARGAN_SUBFRAME_SIZE);
-  compute_generic_gru(&model->sig_net_gru2_input, &model->sig_net_gru2_recurrent, st->gru2_state, gru2_in, st->arch);
-  compute_glu(&model->sig_net_gru2_glu_gate, gru3_in, st->gru2_state, st->arch);
-
-  for (i=0;i<FARGAN_SUBFRAME_SIZE;i++) gru3_in[SIG_NET_GRU2_OUT_SIZE+i] = pitch_gate[2]*pred[i+2];
-  OAC_COPY(&gru3_in[SIG_NET_GRU2_OUT_SIZE+FARGAN_SUBFRAME_SIZE], prev, FARGAN_SUBFRAME_SIZE);
-  compute_generic_gru(&model->sig_net_gru3_input, &model->sig_net_gru3_recurrent, st->gru3_state, gru3_in, st->arch);
-  compute_glu(&model->sig_net_gru3_glu_gate, &skip_cat[SIG_NET_GRU1_OUT_SIZE+SIG_NET_GRU2_OUT_SIZE], st->gru3_state, st->arch);
-
-  OAC_COPY(skip_cat, gru2_in, SIG_NET_GRU1_OUT_SIZE);
-  OAC_COPY(&skip_cat[SIG_NET_GRU1_OUT_SIZE], gru3_in, SIG_NET_GRU2_OUT_SIZE);
-  OAC_COPY(&skip_cat[SIG_NET_GRU1_OUT_SIZE+SIG_NET_GRU2_OUT_SIZE+SIG_NET_GRU3_OUT_SIZE], gru1_in, SIG_NET_FWC0_CONV_OUT_SIZE);
-  for (i=0;i<FARGAN_SUBFRAME_SIZE;i++) skip_cat[SIG_NET_GRU1_OUT_SIZE+SIG_NET_GRU2_OUT_SIZE+SIG_NET_GRU3_OUT_SIZE+SIG_NET_FWC0_CONV_OUT_SIZE+i] = pitch_gate[3]*pred[i+2];
-  OAC_COPY(&skip_cat[SIG_NET_GRU1_OUT_SIZE+SIG_NET_GRU2_OUT_SIZE+SIG_NET_GRU3_OUT_SIZE+SIG_NET_FWC0_CONV_OUT_SIZE+FARGAN_SUBFRAME_SIZE], prev, FARGAN_SUBFRAME_SIZE);
-
-  compute_generic_dense(&model->sig_net_skip_dense, skip_out, skip_cat, ACTIVATION_TANH, st->arch);
-  compute_glu(&model->sig_net_skip_glu_gate, skip_out, skip_out, st->arch);
-
-  compute_generic_dense(&model->sig_net_sig_dense_out, pcm, skip_out, ACTIVATION_TANH, st->arch);
-  for (i=0;i<FARGAN_SUBFRAME_SIZE;i++) pcm[i] *= gain;
-
-  OAC_MOVE(st->pitch_buf, &st->pitch_buf[FARGAN_SUBFRAME_SIZE], PITCH_MAX_PERIOD-FARGAN_SUBFRAME_SIZE);
-  OAC_COPY(&st->pitch_buf[PITCH_MAX_PERIOD-FARGAN_SUBFRAME_SIZE], pcm, FARGAN_SUBFRAME_SIZE);
-  fargan_deemphasis(pcm, &st->deemph_mem);
+static void run_fargan_subframe(FARGANState *st, float *pcm, const float *cond, int period) {
+    int i, pos;
+    float fwc0_in[SIG_NET_INPUT_SIZE];
+    float gru1_in[SIG_NET_FWC0_CONV_OUT_SIZE + 2*FARGAN_SUBFRAME_SIZE];
+    float gru2_in[SIG_NET_GRU1_OUT_SIZE + 2*FARGAN_SUBFRAME_SIZE];
+    float gru3_in[SIG_NET_GRU2_OUT_SIZE + 2*FARGAN_SUBFRAME_SIZE];
+    float pred[FARGAN_SUBFRAME_SIZE + 4];
+    float prev[FARGAN_SUBFRAME_SIZE];
+    float pitch_gate[4];
+    float gain;
+    float gain_1;
+    float skip_cat[10000];
+    float skip_out[SIG_NET_SKIP_DENSE_OUT_SIZE];
+    FARGAN *model;
+
+    celt_assert(st->cont_initialized);
+    model = &st->model;
+
+    compute_generic_dense(&model->sig_net_cond_gain_dense, &gain, cond, ACTIVATION_LINEAR, st->arch);
+    gain = exp(gain);
+    gain_1 = 1.f/(1e-5f + gain);
+
+    pos = PITCH_MAX_PERIOD - period - 2;
+    for (i = 0; i < FARGAN_SUBFRAME_SIZE + 4; i++) {
+        pred[i] = MIN32(1.f, MAX32(-1.f, gain_1*st->pitch_buf[IMAX(0, pos)]));
+        pos++;
+        if (pos == PITCH_MAX_PERIOD) pos -= period;
+    }
+    for (i = 0; i < FARGAN_SUBFRAME_SIZE;
+         i++) prev[i] = MAX32(-1.f, MIN16(1.f, gain_1*st->pitch_buf[PITCH_MAX_PERIOD - FARGAN_SUBFRAME_SIZE + i]));
+
+    OAC_COPY(&fwc0_in[0], &cond[0], FARGAN_COND_SIZE);
+    OAC_COPY(&fwc0_in[FARGAN_COND_SIZE], pred, FARGAN_SUBFRAME_SIZE + 4);
+    OAC_COPY(&fwc0_in[FARGAN_COND_SIZE + FARGAN_SUBFRAME_SIZE + 4], prev, FARGAN_SUBFRAME_SIZE);
+
+    compute_generic_conv1d(&model->sig_net_fwc0_conv, gru1_in, st->fwc0_mem, fwc0_in, SIG_NET_INPUT_SIZE,
+    ACTIVATION_TANH, st->arch);
+    celt_assert(SIG_NET_FWC0_GLU_GATE_OUT_SIZE == model->sig_net_fwc0_glu_gate.nb_outputs);
+    compute_glu(&model->sig_net_fwc0_glu_gate, gru1_in, gru1_in, st->arch);
+
+    compute_generic_dense(&model->sig_net_gain_dense_out, pitch_gate, gru1_in, ACTIVATION_SIGMOID, st->arch);
+
+    for (i = 0; i < FARGAN_SUBFRAME_SIZE; i++) gru1_in[SIG_NET_FWC0_GLU_GATE_OUT_SIZE + i] = pitch_gate[0]*pred[i + 2];
+    OAC_COPY(&gru1_in[SIG_NET_FWC0_GLU_GATE_OUT_SIZE + FARGAN_SUBFRAME_SIZE], prev, FARGAN_SUBFRAME_SIZE);
+    compute_generic_gru(&model->sig_net_gru1_input, &model->sig_net_gru1_recurrent, st->gru1_state, gru1_in, st->arch);
+    compute_glu(&model->sig_net_gru1_glu_gate, gru2_in, st->gru1_state, st->arch);
+
+    for (i = 0; i < FARGAN_SUBFRAME_SIZE; i++) gru2_in[SIG_NET_GRU1_OUT_SIZE + i] = pitch_gate[1]*pred[i + 2];
+    OAC_COPY(&gru2_in[SIG_NET_GRU1_OUT_SIZE + FARGAN_SUBFRAME_SIZE], prev, FARGAN_SUBFRAME_SIZE);
+    compute_generic_gru(&model->sig_net_gru2_input, &model->sig_net_gru2_recurrent, st->gru2_state, gru2_in, st->arch);
+    compute_glu(&model->sig_net_gru2_glu_gate, gru3_in, st->gru2_state, st->arch);
+
+    for (i = 0; i < FARGAN_SUBFRAME_SIZE; i++) gru3_in[SIG_NET_GRU2_OUT_SIZE + i] = pitch_gate[2]*pred[i + 2];
+    OAC_COPY(&gru3_in[SIG_NET_GRU2_OUT_SIZE + FARGAN_SUBFRAME_SIZE], prev, FARGAN_SUBFRAME_SIZE);
+    compute_generic_gru(&model->sig_net_gru3_input, &model->sig_net_gru3_recurrent, st->gru3_state, gru3_in, st->arch);
+    compute_glu(&model->sig_net_gru3_glu_gate, &skip_cat[SIG_NET_GRU1_OUT_SIZE + SIG_NET_GRU2_OUT_SIZE], st->gru3_state,
+    st->arch);
+
+    OAC_COPY(skip_cat, gru2_in, SIG_NET_GRU1_OUT_SIZE);
+    OAC_COPY(&skip_cat[SIG_NET_GRU1_OUT_SIZE], gru3_in, SIG_NET_GRU2_OUT_SIZE);
+    OAC_COPY(&skip_cat[SIG_NET_GRU1_OUT_SIZE + SIG_NET_GRU2_OUT_SIZE + SIG_NET_GRU3_OUT_SIZE], gru1_in,
+    SIG_NET_FWC0_CONV_OUT_SIZE);
+    for (i = 0; i < FARGAN_SUBFRAME_SIZE;
+         i++) skip_cat[SIG_NET_GRU1_OUT_SIZE + SIG_NET_GRU2_OUT_SIZE + SIG_NET_GRU3_OUT_SIZE
+                       + SIG_NET_FWC0_CONV_OUT_SIZE + i] = pitch_gate[3]*pred[i + 2];
+    OAC_COPY(&skip_cat[SIG_NET_GRU1_OUT_SIZE + SIG_NET_GRU2_OUT_SIZE + SIG_NET_GRU3_OUT_SIZE
+                       + SIG_NET_FWC0_CONV_OUT_SIZE + FARGAN_SUBFRAME_SIZE], prev, FARGAN_SUBFRAME_SIZE);
+
+    compute_generic_dense(&model->sig_net_skip_dense, skip_out, skip_cat, ACTIVATION_TANH, st->arch);
+    compute_glu(&model->sig_net_skip_glu_gate, skip_out, skip_out, st->arch);
+
+    compute_generic_dense(&model->sig_net_sig_dense_out, pcm, skip_out, ACTIVATION_TANH, st->arch);
+    for (i = 0; i < FARGAN_SUBFRAME_SIZE; i++) pcm[i] *= gain;
+
+    OAC_MOVE(st->pitch_buf, &st->pitch_buf[FARGAN_SUBFRAME_SIZE], PITCH_MAX_PERIOD - FARGAN_SUBFRAME_SIZE);
+    OAC_COPY(&st->pitch_buf[PITCH_MAX_PERIOD - FARGAN_SUBFRAME_SIZE], pcm, FARGAN_SUBFRAME_SIZE);
+    fargan_deemphasis(pcm, &st->deemph_mem);
 }
 
-void fargan_cont(FARGANState *st, const float *pcm0, const float *features0)
-{
-  int i;
-  float cond[COND_NET_FDENSE2_OUT_SIZE];
-  float x0[FARGAN_CONT_SAMPLES];
-  float dummy[FARGAN_SUBFRAME_SIZE];
-  int period=0;
-
-  /* Pre-load features. */
-  for (i=0;i<5;i++) {
-    const float *features = &features0[i*NB_FEATURES];
-    st->last_period = period;
-    period = (int)floor(.5+256./pow(2.f,((1./60.)*((features[NB_BANDS]+1.5)*60))));
-    compute_fargan_cond(st, cond, features, period);
-  }
-
-  x0[0] = 0;
-  for (i=1;i<FARGAN_CONT_SAMPLES;i++) {
-    x0[i] = pcm0[i] - FARGAN_DEEMPHASIS*pcm0[i-1];
-  }
-
-  OAC_COPY(&st->pitch_buf[PITCH_MAX_PERIOD-FARGAN_FRAME_SIZE], x0, FARGAN_FRAME_SIZE);
-  st->cont_initialized = 1;
-
-  for (i=0;i<FARGAN_NB_SUBFRAMES;i++) {
-    run_fargan_subframe(st, dummy, &cond[i*FARGAN_COND_SIZE], st->last_period);
-    OAC_COPY(&st->pitch_buf[PITCH_MAX_PERIOD-FARGAN_SUBFRAME_SIZE], &x0[FARGAN_FRAME_SIZE+i*FARGAN_SUBFRAME_SIZE], FARGAN_SUBFRAME_SIZE);
-  }
-  st->deemph_mem = pcm0[FARGAN_CONT_SAMPLES-1];
+void fargan_cont(FARGANState *st, const float *pcm0, const float *features0) {
+    int i;
+    float cond[COND_NET_FDENSE2_OUT_SIZE];
+    float x0[FARGAN_CONT_SAMPLES];
+    float dummy[FARGAN_SUBFRAME_SIZE];
+    int period = 0;
+
+    /* Pre-load features. */
+    for (i = 0; i < 5; i++) {
+        const float *features = &features0[i*NB_FEATURES];
+        st->last_period = period;
+        period = (int)floor(.5 + 256./pow(2.f, ((1./60.)*((features[NB_BANDS] + 1.5)*60))));
+        compute_fargan_cond(st, cond, features, period);
+    }
+
+    x0[0] = 0;
+    for (i = 1; i < FARGAN_CONT_SAMPLES; i++) {
+        x0[i] = pcm0[i] - FARGAN_DEEMPHASIS*pcm0[i - 1];
+    }
+
+    OAC_COPY(&st->pitch_buf[PITCH_MAX_PERIOD - FARGAN_FRAME_SIZE], x0, FARGAN_FRAME_SIZE);
+    st->cont_initialized = 1;
+
+    for (i = 0; i < FARGAN_NB_SUBFRAMES; i++) {
+        run_fargan_subframe(st, dummy, &cond[i*FARGAN_COND_SIZE], st->last_period);
+        OAC_COPY(&st->pitch_buf[PITCH_MAX_PERIOD - FARGAN_SUBFRAME_SIZE],
+        &x0[FARGAN_FRAME_SIZE + i*FARGAN_SUBFRAME_SIZE], FARGAN_SUBFRAME_SIZE);
+    }
+    st->deemph_mem = pcm0[FARGAN_CONT_SAMPLES - 1];
 }
 
 
-void fargan_init(FARGANState *st)
-{
-  int ret;
-  OAC_CLEAR(st, 1);
-  st->arch = oac_select_arch();
+void fargan_init(FARGANState *st) {
+    int ret;
+    OAC_CLEAR(st, 1);
+    st->arch = oac_select_arch();
 #ifndef USE_WEIGHTS_FILE
-  ret = init_fargan(&st->model, fargan_arrays);
+    ret = init_fargan(&st->model, fargan_arrays);
 #else
-  ret = 0;
+    ret = 0;
 #endif
-  celt_assert(ret == 0);
+    celt_assert(ret == 0);
 }
 
 int fargan_load_model(FARGANState *st, const void *data, int len) {
-  WeightArray *list;
-  int ret;
-  parse_weights(&list, data, len);
-  ret = init_fargan(&st->model, list);
-  oac_free(list);
-  if (ret == 0) return 0;
-  else return -1;
+    WeightArray *list;
+    int ret;
+    parse_weights(&list, data, len);
+    ret = init_fargan(&st->model, list);
+    oac_free(list);
+    if (ret == 0) return 0;
+    else return -1;
 }
 
-static void fargan_synthesize_impl(FARGANState *st, float *pcm, const float *features)
-{
-  int subframe;
-  float cond[COND_NET_FDENSE2_OUT_SIZE];
-  int period;
-  celt_assert(st->cont_initialized);
-
-  period = (int)floor(.5+256./pow(2.f,((1./60.)*((features[NB_BANDS]+1.5)*60))));
-  compute_fargan_cond(st, cond, features, period);
-  for (subframe=0;subframe<FARGAN_NB_SUBFRAMES;subframe++) {
-    float *sub_cond;
-    sub_cond = &cond[subframe*FARGAN_COND_SIZE];
-    run_fargan_subframe(st, &pcm[subframe*FARGAN_SUBFRAME_SIZE], sub_cond, st->last_period);
-  }
-  st->last_period = period;
+static void fargan_synthesize_impl(FARGANState *st, float *pcm, const float *features) {
+    int subframe;
+    float cond[COND_NET_FDENSE2_OUT_SIZE];
+    int period;
+    celt_assert(st->cont_initialized);
+
+    period = (int)floor(.5 + 256./pow(2.f, ((1./60.)*((features[NB_BANDS] + 1.5)*60))));
+    compute_fargan_cond(st, cond, features, period);
+    for (subframe = 0; subframe < FARGAN_NB_SUBFRAMES; subframe++) {
+        float *sub_cond;
+        sub_cond = &cond[subframe*FARGAN_COND_SIZE];
+        run_fargan_subframe(st, &pcm[subframe*FARGAN_SUBFRAME_SIZE], sub_cond, st->last_period);
+    }
+    st->last_period = period;
 }
 
-void fargan_synthesize(FARGANState *st, float *pcm, const float *features)
-{
-  fargan_synthesize_impl(st, pcm, features);
+void fargan_synthesize(FARGANState *st, float *pcm, const float *features) {
+    fargan_synthesize_impl(st, pcm, features);
 }
 
-void fargan_synthesize_int(FARGANState *st, oac_int16 *pcm, const float *features)
-{
-  int i;
-  float fpcm[FARGAN_FRAME_SIZE];
-  fargan_synthesize(st, fpcm, features);
-  for (i=0;i<LPCNET_FRAME_SIZE;i++) pcm[i] = (int)floor(.5 + MIN32(32767, MAX32(-32767, 32768.f*fpcm[i])));
+void fargan_synthesize_int(FARGANState *st, oac_int16 *pcm, const float *features) {
+    int i;
+    float fpcm[FARGAN_FRAME_SIZE];
+    fargan_synthesize(st, fpcm, features);
+    for (i = 0; i < LPCNET_FRAME_SIZE; i++) pcm[i] = (int)floor(.5 + MIN32(32767, MAX32(-32767, 32768.f*fpcm[i])));
 }
diff --git a/dnn/fargan.h b/dnn/fargan.h
index bc1557282..d0dc3655f 100644
--- a/dnn/fargan.h
+++ b/dnn/fargan.h
@@ -22,7 +22,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef FARGAN_H
 #define FARGAN_H
@@ -38,22 +38,22 @@
 #define FARGAN_COND_SIZE (COND_NET_FDENSE2_OUT_SIZE/FARGAN_NB_SUBFRAMES)
 #define FARGAN_DEEMPHASIS 0.85f
 
-#define SIG_NET_INPUT_SIZE (FARGAN_COND_SIZE+2*FARGAN_SUBFRAME_SIZE+4)
+#define SIG_NET_INPUT_SIZE (FARGAN_COND_SIZE + 2*FARGAN_SUBFRAME_SIZE + 4)
 #define SIG_NET_FWC0_STATE_SIZE (2*SIG_NET_INPUT_SIZE)
 
 #define FARGAN_MAX_RNN_NEURONS SIG_NET_GRU1_OUT_SIZE
 typedef struct {
-  FARGAN model;
-  int arch;
-  int cont_initialized;
-  float deemph_mem;
-  float pitch_buf[PITCH_MAX_PERIOD];
-  float cond_conv1_state[COND_NET_FCONV1_STATE_SIZE];
-  float fwc0_mem[SIG_NET_FWC0_STATE_SIZE];
-  float gru1_state[SIG_NET_GRU1_STATE_SIZE];
-  float gru2_state[SIG_NET_GRU2_STATE_SIZE];
-  float gru3_state[SIG_NET_GRU3_STATE_SIZE];
-  int last_period;
+    FARGAN model;
+    int arch;
+    int cont_initialized;
+    float deemph_mem;
+    float pitch_buf[PITCH_MAX_PERIOD];
+    float cond_conv1_state[COND_NET_FCONV1_STATE_SIZE];
+    float fwc0_mem[SIG_NET_FWC0_STATE_SIZE];
+    float gru1_state[SIG_NET_GRU1_STATE_SIZE];
+    float gru2_state[SIG_NET_GRU2_STATE_SIZE];
+    float gru3_state[SIG_NET_GRU3_STATE_SIZE];
+    int last_period;
 } FARGANState;
 
 void fargan_init(FARGANState *st);
diff --git a/dnn/fargan_demo.c b/dnn/fargan_demo.c
index ddb2da31f..9c9b75047 100644
--- a/dnn/fargan_demo.c
+++ b/dnn/fargan_demo.c
@@ -22,10 +22,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <math.h>
@@ -53,59 +53,58 @@
    better resource utilization, especially if multiple processes are using the same
    file (mapping will be shared in cache). */
 void *load_blob(const char *filename, int *len) {
-  int fd;
-  void *data;
-  struct stat st;
-  if (stat(filename, &st)) {
-     *len = 0;
-     return NULL;
-  }
-  *len = st.st_size;
-  fd = open(filename, O_RDONLY);
-  if (fd<0) {
-     *len = 0;
-     return NULL;
-  }
-  data = mmap(NULL, *len, PROT_READ, MAP_SHARED, fd, 0);
-  if (data == MAP_FAILED) {
-     *len = 0;
-     data = NULL;
-  }
-  close(fd);
-  return data;
+    int fd;
+    void *data;
+    struct stat st;
+    if (stat(filename, &st)) {
+        *len = 0;
+        return NULL;
+    }
+    *len = st.st_size;
+    fd = open(filename, O_RDONLY);
+    if (fd < 0) {
+        *len = 0;
+        return NULL;
+    }
+    data = mmap(NULL, *len, PROT_READ, MAP_SHARED, fd, 0);
+    if (data == MAP_FAILED) {
+        *len = 0;
+        data = NULL;
+    }
+    close(fd);
+    return data;
 }
 void free_blob(void *blob, int len) {
-  if (blob) munmap(blob, len);
+    if (blob) munmap(blob, len);
 }
 # else
 void *load_blob(const char *filename, int *len) {
-  FILE *file;
-  void *data;
-  file = fopen(filename, "r");
-  if (file == NULL)
-  {
-    perror("could not open blob file");
-    *len = 0;
-    return NULL;
-  }
-  fseek(file, 0L, SEEK_END);
-  *len = ftell(file);
-  fseek(file, 0L, SEEK_SET);
-  if (*len <= 0) {
-     *len = 0;
-     return NULL;
-  }
-  data = malloc(*len);
-  if (!data) {
-     *len = 0;
-     return NULL;
-  }
-  *len = fread(data, 1, *len, file);
-  return data;
+    FILE *file;
+    void *data;
+    file = fopen(filename, "r");
+    if (file == NULL) {
+        perror("could not open blob file");
+        *len = 0;
+        return NULL;
+    }
+    fseek(file, 0L, SEEK_END);
+    *len = ftell(file);
+    fseek(file, 0L, SEEK_SET);
+    if (*len <= 0) {
+        *len = 0;
+        return NULL;
+    }
+    data = malloc(*len);
+    if (!data) {
+        *len = 0;
+        return NULL;
+    }
+    *len = fread(data, 1, *len, file);
+    return data;
 }
 void free_blob(void *blob, int len) {
-  free(blob);
-  (void)len;
+    free(blob);
+    (void)len;
 }
 # endif
 #endif
@@ -131,17 +130,17 @@ void usage(void) {
 }
 
 #ifdef ENABLE_DRED
-void dred_decode_latents(ec_dec *dec, float *x, const oac_uint8 *scale, const oac_uint8 *r, const oac_uint8 *p0, int dim);
+void dred_decode_latents(ec_dec *dec, float *x, const oac_uint8 *scale, const oac_uint8 *r, const oac_uint8 *p0,
+    int dim);
 
-static oac_uint32 char_to_int(unsigned char ch[4])
-{
-    return ((oac_uint32)ch[0]<<24) | ((oac_uint32)ch[1]<<16)
-         | ((oac_uint32)ch[2]<< 8) |  (oac_uint32)ch[3];
+static oac_uint32 char_to_int(unsigned char ch[4]) {
+    return ((oac_uint32)ch[0]<<24)|((oac_uint32)ch[1]<<16)
+           |((oac_uint32)ch[2]<<8)|(oac_uint32)ch[3];
 }
 #endif
 
 int main(int argc, char **argv) {
-    int mode=0;
+    int mode = 0;
     int arch;
     FILE *fin, *fout;
 #ifdef USE_WEIGHTS_FILE
@@ -151,10 +150,10 @@ int main(int argc, char **argv) {
 #endif
     arch = oac_select_arch();
     if (argc < 4) usage();
-    if (strcmp(argv[1], "-features") == 0) mode=MODE_FEATURES;
-    else if (strcmp(argv[1], "-fargan-synthesis") == 0) mode=MODE_FARGAN_SYNTHESIS;
+    if (strcmp(argv[1], "-features") == 0) mode = MODE_FEATURES;
+    else if (strcmp(argv[1], "-fargan-synthesis") == 0) mode = MODE_FARGAN_SYNTHESIS;
     else if (strcmp(argv[1], "-dred-decoding") == 0) {
-       mode=MODE_DRED_DECODING;
+        mode = MODE_DRED_DECODING;
     } else {
         usage();
     }
@@ -172,9 +171,9 @@ int main(int argc, char **argv) {
     }
 #ifdef USE_WEIGHTS_FILE
     data = load_blob(filename, &len);
-    if (data==NULL) {
+    if (data == NULL) {
         fprintf(stderr, "Can't open blob file %s\n", filename);
-	exit(1);
+        exit(1);
     }
 #endif
     if (mode == MODE_FEATURES) {
@@ -194,7 +193,7 @@ int main(int argc, char **argv) {
         FARGANState fargan;
         size_t ret, i;
         int skip = LPCNET_FRAME_SIZE/2;
-        int stop=0;
+        int stop = 0;
         float in_features[5*NB_FEATURES];
         float zeros[320] = {0};
         fargan_init(&fargan);
@@ -203,8 +202,8 @@ int main(int argc, char **argv) {
 #endif
         /* uncomment the following to align with Python code */
         ret = fread(&in_features[0], sizeof(in_features[0]), NB_FEATURES, fin);
-        for (i=1;i<5;i++) {
-           OAC_COPY(&in_features[i*NB_FEATURES], &in_features[0], NB_FEATURES);
+        for (i = 1; i < 5; i++) {
+            OAC_COPY(&in_features[i*NB_FEATURES], &in_features[0], NB_FEATURES);
         }
         fargan_cont(&fargan, zeros, in_features);
         while (1) {
@@ -213,62 +212,62 @@ int main(int argc, char **argv) {
             oac_int16 pcm[LPCNET_FRAME_SIZE];
             ret = fread(in_features, sizeof(features[0]), NB_FEATURES, fin);
             if (stop || feof(fin) || ret != NB_FEATURES) {
-               stop++;
+                stop++;
             } else {
-               OAC_COPY(features, in_features, NB_FEATURES);
+                OAC_COPY(features, in_features, NB_FEATURES);
             }
             fargan_synthesize(&fargan, fpcm, features);
-            for (i=0;i<LPCNET_FRAME_SIZE;i++) pcm[i] = (int)floor(.5 + MIN32(32767, MAX32(-32767, 32768.f*fpcm[i])));
-            if (stop==2) {
-               fwrite(pcm+skip, sizeof(pcm[0]), LPCNET_FRAME_SIZE/2, fout);
-               break;
+            for (i = 0; i < LPCNET_FRAME_SIZE; i++)pcm[i] = (int)floor(.5 + MIN32(32767, MAX32(-32767, 32768.f*fpcm[i])));
+            if (stop == 2) {
+                fwrite(pcm + skip, sizeof(pcm[0]), LPCNET_FRAME_SIZE/2, fout);
+                break;
             }
-            fwrite(pcm+skip, sizeof(pcm[0]), LPCNET_FRAME_SIZE-skip, fout);
-            skip=0;
+            fwrite(pcm + skip, sizeof(pcm[0]), LPCNET_FRAME_SIZE - skip, fout);
+            skip = 0;
         }
 #ifdef ENABLE_DRED
     } else if (mode == MODE_DRED_DECODING) {
         size_t ret;
         int i;
         float features[2*DRED_CHUNKS*DRED_NUM_FEATURES];
-        float latents[DRED_CHUNKS*(DRED_LATENT_DIM+1)];
+        float latents[DRED_CHUNKS*(DRED_LATENT_DIM + 1)];
         float initial_state[DRED_STATE_DIM];
         ec_dec dec;
         unsigned char bits[MAX_DRED_PACKET];
         RDOVAEDecState rdovae_dec;
         RDOVAEDec rdovae_dec_model;
-        int q0=-1;
-#ifdef USE_WEIGHTS_FILE
+        int q0 = -1;
+# ifdef USE_WEIGHTS_FILE
         WeightArray *rdovaedec_arrays;
         parse_weights(&rdovaedec_arrays, data, len);
-#endif
+# endif
         init_rdovaedec(&rdovae_dec_model, rdovaedec_arrays);
         while (1) {
-           unsigned char ch[4];
-           int nb_bytes;
-           int nb_chunks;
-           int state_qoffset;
-           ret = fread(ch, 4, 1, fin);
-           if (feof(fin) || ret != 1) break;
-           q0 = char_to_int(ch);
-           state_qoffset = q0*DRED_STATE_DIM;
-           ret = fread(ch, 4, 1, fin);
-           if (feof(fin) || ret != 1) break;
-           nb_chunks = char_to_int(ch);
-           ret = fread(ch, 4, 1, fin);
-           if (feof(fin) || ret != 1) break;
-           nb_bytes = char_to_int(ch);
-           if (nb_bytes > MAX_DRED_PACKET) {
-              fprintf(stderr, "packet too big: %d\n", nb_bytes);
-              exit(1);
-           }
+            unsigned char ch[4];
+            int nb_bytes;
+            int nb_chunks;
+            int state_qoffset;
+            ret = fread(ch, 4, 1, fin);
+            if (feof(fin) || ret != 1) break;
+            q0 = char_to_int(ch);
+            state_qoffset = q0*DRED_STATE_DIM;
+            ret = fread(ch, 4, 1, fin);
+            if (feof(fin) || ret != 1) break;
+            nb_chunks = char_to_int(ch);
+            ret = fread(ch, 4, 1, fin);
+            if (feof(fin) || ret != 1) break;
+            nb_bytes = char_to_int(ch);
+            if (nb_bytes > MAX_DRED_PACKET) {
+                fprintf(stderr, "packet too big: %d\n", nb_bytes);
+                exit(1);
+            }
 
-           ret = fread(bits, 1, nb_bytes, fin);
-           if (feof(fin) || (int)ret != nb_bytes) break;
+            ret = fread(bits, 1, nb_bytes, fin);
+            if (feof(fin) || (int)ret != nb_bytes) break;
 
-           ec_dec_init(&dec,  bits, nb_bytes);
-           memset(&rdovae_dec, 0, sizeof(rdovae_dec));
-           dred_decode_latents(
+            ec_dec_init(&dec,  bits, nb_bytes);
+            memset(&rdovae_dec, 0, sizeof(rdovae_dec));
+            dred_decode_latents(
                  &dec,
                  initial_state,
                  dred_state_quant_scales_q8 + state_qoffset,
@@ -276,36 +275,37 @@ int main(int argc, char **argv) {
                  dred_state_p0_q8 + state_qoffset,
                  DRED_STATE_DIM);
 
-           dred_rdovae_dec_init_states(&rdovae_dec, &rdovae_dec_model, initial_state, arch);
-           for (i=nb_chunks-1;i>=0;i-=2) {
-              int k;
-              float dec_tmp[4*DRED_NUM_FEATURES];
-              int offset = q0 * DRED_LATENT_DIM;
+            dred_rdovae_dec_init_states(&rdovae_dec, &rdovae_dec_model, initial_state, arch);
+            for (i = nb_chunks - 1; i >= 0; i -= 2) {
+                int k;
+                float dec_tmp[4*DRED_NUM_FEATURES];
+                int offset = q0*DRED_LATENT_DIM;
 
-              dred_decode_latents(
+                dred_decode_latents(
                     &dec,
-                    &latents[i*(DRED_LATENT_DIM+1)],
+                    &latents[i*(DRED_LATENT_DIM + 1)],
                     dred_latent_quant_scales_q8 + offset,
                     dred_latent_r_q8 + offset,
                     dred_latent_p0_q8 + offset,
                     DRED_LATENT_DIM
-              );
-              latents[i*(DRED_LATENT_DIM+1)+DRED_LATENT_DIM] = q0*.125-1;
+                    );
+                latents[i*(DRED_LATENT_DIM + 1) + DRED_LATENT_DIM] = q0*.125 - 1;
 
-              dred_rdovae_decode_qframe(
+                dred_rdovae_decode_qframe(
                     &rdovae_dec,
                     &rdovae_dec_model,
                     dec_tmp,
-                    &latents[i*(DRED_LATENT_DIM+1)],
+                    &latents[i*(DRED_LATENT_DIM + 1)],
                     arch);
-              for (k=0;k<4;k++) {
-                 OAC_COPY(&features[(2*i-2+k)*DRED_NUM_FEATURES], &dec_tmp[(3-k)*DRED_NUM_FEATURES], DRED_NUM_FEATURES);
-              }
-           }
-           for (i=0;i<nb_chunks;i++) {
-              fwrite(&features[2*i*DRED_NUM_FEATURES], sizeof(float), NB_FEATURES, fout);
-              fwrite(&features[(2*i+1)*DRED_NUM_FEATURES], sizeof(float), NB_FEATURES, fout);
-           }
+                for (k = 0; k < 4; k++) {
+                    OAC_COPY(&features[(2*i - 2 + k)*DRED_NUM_FEATURES], &dec_tmp[(3 - k)*DRED_NUM_FEATURES],
+                    DRED_NUM_FEATURES);
+                }
+            }
+            for (i = 0; i < nb_chunks; i++) {
+                fwrite(&features[2*i*DRED_NUM_FEATURES], sizeof(float), NB_FEATURES, fout);
+                fwrite(&features[(2*i + 1)*DRED_NUM_FEATURES], sizeof(float), NB_FEATURES, fout);
+            }
         }
 #endif
     } else {
diff --git a/dnn/freq.c b/dnn/freq.c
index 9687f2784..7f89c3e41 100644
--- a/dnn/freq.c
+++ b/dnn/freq.c
@@ -22,10 +22,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdlib.h>
@@ -44,280 +44,268 @@
 
 static const oac_int16 eband5ms[] = {
 /*0  200 400 600 800  1k 1.2 1.4 1.6  2k 2.4 2.8 3.2  4k 4.8 5.6 6.8  8k*/
-  0,  1,  2,  3,  4,  5,  6,  7,  8, 10, 12, 14, 16, 20, 24, 28, 34, 40
+    0,  1,  2,  3,  4,  5,  6,  7,  8, 10, 12, 14, 16, 20, 24, 28, 34, 40
 };
 
 static const float compensation[] = {
-    0.8f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 0.666667f, 0.5f, 0.5f, 0.5f, 0.333333f, 0.25f, 0.25f, 0.2f, 0.166667f, 0.173913f
+    0.8f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 0.666667f, 0.5f, 0.5f, 0.5f, 0.333333f, 0.25f, 0.25f, 0.2f, 0.166667f,
+    0.173913f
 };
 
 
 static void compute_band_energy_inverse(float *bandE, const kiss_fft_cpx *X) {
-  int i;
-  float sum[NB_BANDS] = {0};
-  for (i=0;i<NB_BANDS-1;i++)
-  {
-    int j;
-    int band_size;
-    band_size = (eband5ms[i+1]-eband5ms[i])*WINDOW_SIZE_5MS;
-    for (j=0;j<band_size;j++) {
-      float tmp;
-      float frac = (float)j/band_size;
-      tmp = SQUARE(X[(eband5ms[i]*WINDOW_SIZE_5MS) + j].r);
-      tmp += SQUARE(X[(eband5ms[i]*WINDOW_SIZE_5MS) + j].i);
-      tmp = 1.f/(tmp + 1e-9);
-      sum[i] += (1-frac)*tmp;
-      sum[i+1] += frac*tmp;
+    int i;
+    float sum[NB_BANDS] = {0};
+    for (i = 0; i < NB_BANDS - 1; i++) {
+        int j;
+        int band_size;
+        band_size = (eband5ms[i + 1] - eband5ms[i])*WINDOW_SIZE_5MS;
+        for (j = 0; j < band_size; j++) {
+            float tmp;
+            float frac = (float)j/band_size;
+            tmp = SQUARE(X[(eband5ms[i]*WINDOW_SIZE_5MS) + j].r);
+            tmp += SQUARE(X[(eband5ms[i]*WINDOW_SIZE_5MS) + j].i);
+            tmp = 1.f/(tmp + 1e-9);
+            sum[i] += (1 - frac)*tmp;
+            sum[i + 1] += frac*tmp;
+        }
+    }
+    sum[0] *= 2;
+    sum[NB_BANDS - 1] *= 2;
+    for (i = 0; i < NB_BANDS; i++) {
+        bandE[i] = sum[i];
     }
-  }
-  sum[0] *= 2;
-  sum[NB_BANDS-1] *= 2;
-  for (i=0;i<NB_BANDS;i++)
-  {
-    bandE[i] = sum[i];
-  }
 }
 
 static float lpcn_lpc(
-      oac_val16 *lpc, /* out: [0...p-1] LPC coefficients      */
-      oac_val16 *rc,
-const oac_val32 *ac,  /* in:  [0...p] autocorrelation values  */
-int          p
-)
-{
-   int i, j;
-   oac_val32 r;
-   oac_val32 error = ac[0];
+    oac_val16 *lpc,   /* out: [0...p-1] LPC coefficients      */
+    oac_val16 *rc,
+    const oac_val32 *ac, /* in:  [0...p] autocorrelation values  */
+    int p) {
+    int i, j;
+    oac_val32 r;
+    oac_val32 error = ac[0];
 
-   OAC_CLEAR(lpc, p);
-   OAC_CLEAR(rc, p);
-   if (ac[0] != 0)
-   {
-      for (i = 0; i < p; i++) {
-         /* Sum up this iteration's reflection coefficient */
-         oac_val32 rr = 0;
-         for (j = 0; j < i; j++)
-            rr += MULT32_32_Q31(lpc[j],ac[i - j]);
-         rr += SHR32(ac[i + 1],3);
-         r = -SHL32(rr,3)/error;
-         rc[i] = r;
-         /*  Update LPC coefficients and total error */
-         lpc[i] = SHR32(r,3);
-         for (j = 0; j < (i+1)>>1; j++)
-         {
-            oac_val32 tmp1, tmp2;
-            tmp1 = lpc[j];
-            tmp2 = lpc[i-1-j];
-            lpc[j]     = tmp1 + MULT32_32_Q31(r,tmp2);
-            lpc[i-1-j] = tmp2 + MULT32_32_Q31(r,tmp1);
-         }
+    OAC_CLEAR(lpc, p);
+    OAC_CLEAR(rc, p);
+    if (ac[0] != 0) {
+        for (i = 0; i < p; i++) {
+            /* Sum up this iteration's reflection coefficient */
+            oac_val32 rr = 0;
+            for (j = 0; j < i; j++)
+                rr += MULT32_32_Q31(lpc[j], ac[i - j]);
+            rr += SHR32(ac[i + 1], 3);
+            r = -SHL32(rr, 3)/error;
+            rc[i] = r;
+            /*  Update LPC coefficients and total error */
+            lpc[i] = SHR32(r, 3);
+            for (j = 0; j < (i + 1)>>1; j++) {
+                oac_val32 tmp1, tmp2;
+                tmp1 = lpc[j];
+                tmp2 = lpc[i - 1 - j];
+                lpc[j]     = tmp1 + MULT32_32_Q31(r, tmp2);
+                lpc[i - 1 - j] = tmp2 + MULT32_32_Q31(r, tmp1);
+            }
 
-         error = error - MULT32_32_Q31(MULT32_32_Q31(r,r),error);
-         /* Bail out once we get 30 dB gain */
-         if (error<.001f*ac[0])
-            break;
-      }
-   }
-   return error;
+            error = error - MULT32_32_Q31(MULT32_32_Q31(r, r), error);
+            /* Bail out once we get 30 dB gain */
+            if (error < .001f*ac[0])
+                break;
+        }
+    }
+    return error;
 }
 
 
 
 void lpcn_compute_band_energy(float *bandE, const kiss_fft_cpx *X) {
-  int i;
-  float sum[NB_BANDS] = {0};
-  for (i=0;i<NB_BANDS-1;i++)
-  {
-    int j;
-    int band_size;
-    band_size = (eband5ms[i+1]-eband5ms[i])*WINDOW_SIZE_5MS;
-    for (j=0;j<band_size;j++) {
-      float tmp;
-      float frac = (float)j/band_size;
-      tmp = SQUARE(X[(eband5ms[i]*WINDOW_SIZE_5MS) + j].r);
-      tmp += SQUARE(X[(eband5ms[i]*WINDOW_SIZE_5MS) + j].i);
-      sum[i] += (1-frac)*tmp;
-      sum[i+1] += frac*tmp;
+    int i;
+    float sum[NB_BANDS] = {0};
+    for (i = 0; i < NB_BANDS - 1; i++) {
+        int j;
+        int band_size;
+        band_size = (eband5ms[i + 1] - eband5ms[i])*WINDOW_SIZE_5MS;
+        for (j = 0; j < band_size; j++) {
+            float tmp;
+            float frac = (float)j/band_size;
+            tmp = SQUARE(X[(eband5ms[i]*WINDOW_SIZE_5MS) + j].r);
+            tmp += SQUARE(X[(eband5ms[i]*WINDOW_SIZE_5MS) + j].i);
+            sum[i] += (1 - frac)*tmp;
+            sum[i + 1] += frac*tmp;
+        }
+    }
+    sum[0] *= 2;
+    sum[NB_BANDS - 1] *= 2;
+    for (i = 0; i < NB_BANDS; i++) {
+        bandE[i] = sum[i];
     }
-  }
-  sum[0] *= 2;
-  sum[NB_BANDS-1] *= 2;
-  for (i=0;i<NB_BANDS;i++)
-  {
-    bandE[i] = sum[i];
-  }
 }
 
 static void compute_burg_cepstrum(const float *pcm, float *burg_cepstrum, int len, int order) {
-  int i;
-  float burg_in[FRAME_SIZE];
-  float burg_lpc[LPC_ORDER];
-  float x[WINDOW_SIZE];
-  float Eburg[NB_BANDS];
-  float g;
-  kiss_fft_cpx LPC[FREQ_SIZE];
-  float Ly[NB_BANDS];
-  float logMax = -2;
-  float follow = -2;
-  assert(order <= LPC_ORDER);
-  assert(len <= FRAME_SIZE);
-  for (i=0;i<len-1;i++) burg_in[i] = pcm[i+1] - PREEMPHASIS*pcm[i];
-  g = silk_burg_analysis(burg_lpc, burg_in, 1e-3, len-1, 1, order);
-  g /= len - 2*(order-1);
-  OAC_CLEAR(x, WINDOW_SIZE);
-  x[0] = 1;
-  for (i=0;i<order;i++) x[i+1] = -burg_lpc[i]*pow(.995, i+1);
-  forward_transform(LPC, x);
-  compute_band_energy_inverse(Eburg, LPC);
-  for (i=0;i<NB_BANDS;i++) Eburg[i] *= .45*g*(1.f/((float)WINDOW_SIZE*WINDOW_SIZE*WINDOW_SIZE));
-  for (i=0;i<NB_BANDS;i++) {
-    Ly[i] = log10(1e-2+Eburg[i]);
-    Ly[i] = MAX16(logMax-8, MAX16(follow-2.5, Ly[i]));
-    logMax = MAX16(logMax, Ly[i]);
-    follow = MAX16(follow-2.5, Ly[i]);
-  }
-  dct(burg_cepstrum, Ly);
-  burg_cepstrum[0] += - 4;
+    int i;
+    float burg_in[FRAME_SIZE];
+    float burg_lpc[LPC_ORDER];
+    float x[WINDOW_SIZE];
+    float Eburg[NB_BANDS];
+    float g;
+    kiss_fft_cpx LPC[FREQ_SIZE];
+    float Ly[NB_BANDS];
+    float logMax = -2;
+    float follow = -2;
+    assert(order <= LPC_ORDER);
+    assert(len <= FRAME_SIZE);
+    for (i = 0; i < len - 1; i++) burg_in[i] = pcm[i + 1] - PREEMPHASIS*pcm[i];
+    g = silk_burg_analysis(burg_lpc, burg_in, 1e-3, len - 1, 1, order);
+    g /= len - 2*(order - 1);
+    OAC_CLEAR(x, WINDOW_SIZE);
+    x[0] = 1;
+    for (i = 0; i < order; i++) x[i + 1] = -burg_lpc[i]*pow(.995, i + 1);
+    forward_transform(LPC, x);
+    compute_band_energy_inverse(Eburg, LPC);
+    for (i = 0; i < NB_BANDS; i++) Eburg[i] *= .45*g*(1.f/((float)WINDOW_SIZE*WINDOW_SIZE*WINDOW_SIZE));
+    for (i = 0; i < NB_BANDS; i++) {
+        Ly[i] = log10(1e-2 + Eburg[i]);
+        Ly[i] = MAX16(logMax - 8, MAX16(follow - 2.5, Ly[i]));
+        logMax = MAX16(logMax, Ly[i]);
+        follow = MAX16(follow - 2.5, Ly[i]);
+    }
+    dct(burg_cepstrum, Ly);
+    burg_cepstrum[0] += -4;
 }
 
 void burg_cepstral_analysis(float *ceps, const float *x) {
-  int i;
-  compute_burg_cepstrum(x,                &ceps[0       ], FRAME_SIZE/2, LPC_ORDER);
-  compute_burg_cepstrum(&x[FRAME_SIZE/2], &ceps[NB_BANDS], FRAME_SIZE/2, LPC_ORDER);
-  for (i=0;i<NB_BANDS;i++) {
-    float c0, c1;
-    c0 = ceps[i];
-    c1 = ceps[NB_BANDS+i];
-    ceps[i         ] = .5*(c0+c1);
-    ceps[NB_BANDS+i] = (c0-c1);
-  }
+    int i;
+    compute_burg_cepstrum(x,                &ceps[0       ], FRAME_SIZE/2, LPC_ORDER);
+    compute_burg_cepstrum(&x[FRAME_SIZE/2], &ceps[NB_BANDS], FRAME_SIZE/2, LPC_ORDER);
+    for (i = 0; i < NB_BANDS; i++) {
+        float c0, c1;
+        c0 = ceps[i];
+        c1 = ceps[NB_BANDS + i];
+        ceps[i         ] = .5*(c0 + c1);
+        ceps[NB_BANDS + i] = (c0 - c1);
+    }
 }
 
 
 static void interp_band_gain(float *g, const float *bandE) {
-  int i;
-  memset(g, 0, FREQ_SIZE);
-  for (i=0;i<NB_BANDS-1;i++)
-  {
-    int j;
-    int band_size;
-    band_size = (eband5ms[i+1]-eband5ms[i])*WINDOW_SIZE_5MS;
-    for (j=0;j<band_size;j++) {
-      float frac = (float)j/band_size;
-      g[(eband5ms[i]*WINDOW_SIZE_5MS) + j] = (1-frac)*bandE[i] + frac*bandE[i+1];
+    int i;
+    memset(g, 0, FREQ_SIZE);
+    for (i = 0; i < NB_BANDS - 1; i++) {
+        int j;
+        int band_size;
+        band_size = (eband5ms[i + 1] - eband5ms[i])*WINDOW_SIZE_5MS;
+        for (j = 0; j < band_size; j++) {
+            float frac = (float)j/band_size;
+            g[(eband5ms[i]*WINDOW_SIZE_5MS) + j] = (1 - frac)*bandE[i] + frac*bandE[i + 1];
+        }
     }
-  }
 }
 
 
 void dct(float *out, const float *in) {
-  int i;
-  for (i=0;i<NB_BANDS;i++) {
-    int j;
-    float sum = 0;
-    for (j=0;j<NB_BANDS;j++) {
-      sum += in[j] * dct_table[j*NB_BANDS + i];
+    int i;
+    for (i = 0; i < NB_BANDS; i++) {
+        int j;
+        float sum = 0;
+        for (j = 0; j < NB_BANDS; j++) {
+            sum += in[j]*dct_table[j*NB_BANDS + i];
+        }
+        out[i] = sum*sqrt(2./NB_BANDS);
     }
-    out[i] = sum*sqrt(2./NB_BANDS);
-  }
 }
 
 static void idct(float *out, const float *in) {
-  int i;
-  for (i=0;i<NB_BANDS;i++) {
-    int j;
-    float sum = 0;
-    for (j=0;j<NB_BANDS;j++) {
-      sum += in[j] * dct_table[i*NB_BANDS + j];
+    int i;
+    for (i = 0; i < NB_BANDS; i++) {
+        int j;
+        float sum = 0;
+        for (j = 0; j < NB_BANDS; j++) {
+            sum += in[j]*dct_table[i*NB_BANDS + j];
+        }
+        out[i] = sum*sqrt(2./NB_BANDS);
     }
-    out[i] = sum*sqrt(2./NB_BANDS);
-  }
 }
 
 void forward_transform(kiss_fft_cpx *out, const float *in) {
-  int i;
-  kiss_fft_cpx x[WINDOW_SIZE];
-  kiss_fft_cpx y[WINDOW_SIZE];
-  for (i=0;i<WINDOW_SIZE;i++) {
-    x[i].r = in[i];
-    x[i].i = 0;
-  }
-  oac_fft(&kfft, x, y, 0);
-  for (i=0;i<FREQ_SIZE;i++) {
-    out[i] = y[i];
-  }
+    int i;
+    kiss_fft_cpx x[WINDOW_SIZE];
+    kiss_fft_cpx y[WINDOW_SIZE];
+    for (i = 0; i < WINDOW_SIZE; i++) {
+        x[i].r = in[i];
+        x[i].i = 0;
+    }
+    oac_fft(&kfft, x, y, 0);
+    for (i = 0; i < FREQ_SIZE; i++) {
+        out[i] = y[i];
+    }
 }
 
 static void inverse_transform(float *out, const kiss_fft_cpx *in) {
-  int i;
-  kiss_fft_cpx x[WINDOW_SIZE];
-  kiss_fft_cpx y[WINDOW_SIZE];
-  for (i=0;i<FREQ_SIZE;i++) {
-    x[i] = in[i];
-  }
-  for (;i<WINDOW_SIZE;i++) {
-    x[i].r = x[WINDOW_SIZE - i].r;
-    x[i].i = -x[WINDOW_SIZE - i].i;
-  }
-  oac_fft(&kfft, x, y, 0);
-  /* output in reverse order for IFFT. */
-  out[0] = WINDOW_SIZE*y[0].r;
-  for (i=1;i<WINDOW_SIZE;i++) {
-    out[i] = WINDOW_SIZE*y[WINDOW_SIZE - i].r;
-  }
+    int i;
+    kiss_fft_cpx x[WINDOW_SIZE];
+    kiss_fft_cpx y[WINDOW_SIZE];
+    for (i = 0; i < FREQ_SIZE; i++) {
+        x[i] = in[i];
+    }
+    for (; i < WINDOW_SIZE; i++) {
+        x[i].r = x[WINDOW_SIZE - i].r;
+        x[i].i = -x[WINDOW_SIZE - i].i;
+    }
+    oac_fft(&kfft, x, y, 0);
+    /* output in reverse order for IFFT. */
+    out[0] = WINDOW_SIZE*y[0].r;
+    for (i = 1; i < WINDOW_SIZE; i++) {
+        out[i] = WINDOW_SIZE*y[WINDOW_SIZE - i].r;
+    }
 }
 
-static float lpc_from_bands(float *lpc, const float *Ex)
-{
-   int i;
-   float e;
-   float ac[LPC_ORDER+1];
-   float rc[LPC_ORDER];
-   float Xr[FREQ_SIZE];
-   kiss_fft_cpx X_auto[FREQ_SIZE];
-   float x_auto[WINDOW_SIZE];
-   interp_band_gain(Xr, Ex);
-   Xr[FREQ_SIZE-1] = 0;
-   OAC_CLEAR(X_auto, FREQ_SIZE);
-   for (i=0;i<FREQ_SIZE;i++) X_auto[i].r = Xr[i];
-   inverse_transform(x_auto, X_auto);
-   for (i=0;i<LPC_ORDER+1;i++) ac[i] = x_auto[i];
+static float lpc_from_bands(float *lpc, const float *Ex) {
+    int i;
+    float e;
+    float ac[LPC_ORDER + 1];
+    float rc[LPC_ORDER];
+    float Xr[FREQ_SIZE];
+    kiss_fft_cpx X_auto[FREQ_SIZE];
+    float x_auto[WINDOW_SIZE];
+    interp_band_gain(Xr, Ex);
+    Xr[FREQ_SIZE - 1] = 0;
+    OAC_CLEAR(X_auto, FREQ_SIZE);
+    for (i = 0; i < FREQ_SIZE; i++) X_auto[i].r = Xr[i];
+    inverse_transform(x_auto, X_auto);
+    for (i = 0; i < LPC_ORDER + 1; i++) ac[i] = x_auto[i];
 
-   /* -40 dB noise floor. */
-   ac[0] += ac[0]*1e-4 + 320/12/38.;
-   /* Lag windowing. */
-   for (i=1;i<LPC_ORDER+1;i++) ac[i] *= (1 - 6e-5*i*i);
-   e = lpcn_lpc(lpc, rc, ac, LPC_ORDER);
-   return e;
+    /* -40 dB noise floor. */
+    ac[0] += ac[0]*1e-4 + 320/12/38.;
+    /* Lag windowing. */
+    for (i = 1; i < LPC_ORDER + 1; i++) ac[i] *= (1 - 6e-5*i*i);
+    e = lpcn_lpc(lpc, rc, ac, LPC_ORDER);
+    return e;
 }
 
-void lpc_weighting(float *lpc, float gamma)
-{
-  int i;
-  float gamma_i = gamma;
-  for (i = 0; i < LPC_ORDER; i++)
-  {
-    lpc[i] *= gamma_i;
-    gamma_i *= gamma;
-  }
+void lpc_weighting(float *lpc, float gamma) {
+    int i;
+    float gamma_i = gamma;
+    for (i = 0; i < LPC_ORDER; i++) {
+        lpc[i] *= gamma_i;
+        gamma_i *= gamma;
+    }
 }
 
-float lpc_from_cepstrum(float *lpc, const float *cepstrum)
-{
-   int i;
-   float Ex[NB_BANDS];
-   float tmp[NB_BANDS];
-   OAC_COPY(tmp, cepstrum, NB_BANDS);
-   tmp[0] += 4;
-   idct(Ex, tmp);
-   for (i=0;i<NB_BANDS;i++) Ex[i] = pow(10.f, Ex[i])*compensation[i];
-   return lpc_from_bands(lpc, Ex);
+float lpc_from_cepstrum(float *lpc, const float *cepstrum) {
+    int i;
+    float Ex[NB_BANDS];
+    float tmp[NB_BANDS];
+    OAC_COPY(tmp, cepstrum, NB_BANDS);
+    tmp[0] += 4;
+    idct(Ex, tmp);
+    for (i = 0; i < NB_BANDS; i++) Ex[i] = pow(10.f, Ex[i])*compensation[i];
+    return lpc_from_bands(lpc, Ex);
 }
 
 void apply_window(float *x) {
-  int i;
-  for (i=0;i<OVERLAP_SIZE;i++) {
-    x[i] *= half_window[i];
-    x[WINDOW_SIZE - 1 - i] *= half_window[i];
-  }
+    int i;
+    for (i = 0; i < OVERLAP_SIZE; i++) {
+        x[i] *= half_window[i];
+        x[WINDOW_SIZE - 1 - i] *= half_window[i];
+    }
 }
diff --git a/dnn/freq.h b/dnn/freq.h
index d6d28d2f1..f3209fe0a 100644
--- a/dnn/freq.h
+++ b/dnn/freq.h
@@ -22,7 +22,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef FREQ_H
 #define FREQ_H
diff --git a/dnn/fwgan.c b/dnn/fwgan.c
index e558478fa..590039a1a 100644
--- a/dnn/fwgan.c
+++ b/dnn/fwgan.c
@@ -22,10 +22,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "fwgan.h"
@@ -39,284 +39,279 @@
 
 #define FEAT_IN_SIZE (BFCC_WITH_CORR_UPSAMPLER_FC_OUT_SIZE/4 + FWGAN_FRAME_SIZE/2)
 
-#define FWGAN_FEATURES (NB_FEATURES-1)
+#define FWGAN_FEATURES (NB_FEATURES - 1)
 
 static void pitch_embeddings(float *pembed, float *phase, double w0) {
-  int i;
-  float wreal, wimag;
+    int i;
+    float wreal, wimag;
 #if 1
-  /* This Taylor expansion should be good enough since w0 is always small. */
-  float w2 = w0*w0;
-  wreal = 1 - .5*w2*(1.f - 0.083333333f*w2);
-  wimag = w0*(1 - 0.166666667f*w2*(1.f - 0.05f*w2));
+    /* This Taylor expansion should be good enough since w0 is always small. */
+    float w2 = w0*w0;
+    wreal = 1 - .5*w2*(1.f - 0.083333333f*w2);
+    wimag = w0*(1 - 0.166666667f*w2*(1.f - 0.05f*w2));
 #else
-  wreal = cos(w0);
-  wimag = sin(w0);
+    wreal = cos(w0);
+    wimag = sin(w0);
 #endif
-  /* Speed-up phase reference by making phase a unit-norm complex value and rotating it
-     by exp(-i*w0) each sample.  */
-  for (i=0;i<SUBFRAME_SIZE;i++) {
-    float tmp;
-    tmp = phase[0]*wreal - phase[1]*wimag;
-    phase[1] = phase[0]*wimag + phase[1]*wreal;
-    phase[0] = tmp;
-    pembed[i] = phase[1];
-    pembed[SUBFRAME_SIZE+i] = phase[0];
-  }
-  /* Renormalize once per sub-frame, though we could probably do it even less frequently. */
-  {
-    float r = 1.f/sqrt(phase[0]*phase[0] + phase[1]*phase[1]);
-    phase[0] *= r;
-    phase[1] *= r;
-  }
+    /* Speed-up phase reference by making phase a unit-norm complex value and rotating it
+       by exp(-i*w0) each sample.  */
+    for (i = 0; i < SUBFRAME_SIZE; i++) {
+        float tmp;
+        tmp = phase[0]*wreal - phase[1]*wimag;
+        phase[1] = phase[0]*wimag + phase[1]*wreal;
+        phase[0] = tmp;
+        pembed[i] = phase[1];
+        pembed[SUBFRAME_SIZE + i] = phase[0];
+    }
+    /* Renormalize once per sub-frame, though we could probably do it even less frequently. */
+    {
+        float r = 1.f/sqrt(phase[0]*phase[0] + phase[1]*phase[1]);
+        phase[0] *= r;
+        phase[1] *= r;
+    }
 }
 
 static void compute_wlpc(float lpc[LPC_ORDER], const float *features) {
-  float lpc_weight;
-  int i;
-  lpc_from_cepstrum(lpc, features);
-  lpc_weight = 1.f;
-  for (i=0;i<LPC_ORDER;i++) {
-    lpc_weight *= FWGAN_GAMMA;
-    lpc[i] *= lpc_weight;
-  }
+    float lpc_weight;
+    int i;
+    lpc_from_cepstrum(lpc, features);
+    lpc_weight = 1.f;
+    for (i = 0; i < LPC_ORDER; i++) {
+        lpc_weight *= FWGAN_GAMMA;
+        lpc[i] *= lpc_weight;
+    }
 }
 
-static void run_fwgan_upsampler(FWGANState *st, float *cond, const float *features)
-{
-  FWGAN *model;
-  model = &st->model;
-  celt_assert(FWGAN_FEATURES == model->bfcc_with_corr_upsampler_fc.nb_inputs);
-  celt_assert(BFCC_WITH_CORR_UPSAMPLER_FC_OUT_SIZE == model->bfcc_with_corr_upsampler_fc.nb_outputs);
-  compute_generic_dense(&model->bfcc_with_corr_upsampler_fc, cond, features, ACTIVATION_TANH);
+static void run_fwgan_upsampler(FWGANState *st, float *cond, const float *features) {
+    FWGAN *model;
+    model = &st->model;
+    celt_assert(FWGAN_FEATURES == model->bfcc_with_corr_upsampler_fc.nb_inputs);
+    celt_assert(BFCC_WITH_CORR_UPSAMPLER_FC_OUT_SIZE == model->bfcc_with_corr_upsampler_fc.nb_outputs);
+    compute_generic_dense(&model->bfcc_with_corr_upsampler_fc, cond, features, ACTIVATION_TANH);
 }
 
 static void fwgan_synthesize_impl(FWGANState *st, float *pcm, const float *lpc, const float *features);
-void fwgan_cont(FWGANState *st, const float *pcm0, const float *features0)
-{
-  int i;
-  float norm2, norm_1;
-  float wpcm0[CONT_PCM_INPUTS];
-  float cont_inputs[CONT_PCM_INPUTS+1];
-  float tmp1[MAX_CONT_SIZE];
-  float tmp2[MAX_CONT_SIZE];
-  float lpc[LPC_ORDER];
-  float new_pcm[FWGAN_FRAME_SIZE];
-  FWGAN *model;
-  st->embed_phase[0] = 1;
-  model = &st->model;
-  compute_wlpc(lpc, features0);
-  /* Deemphasis memory is just the last continuation sample. */
-  st->deemph_mem = pcm0[CONT_PCM_INPUTS-1];
-
-  /* Apply analysis filter, considering that the preemphasis and deemphasis filter
-     cancel each other in this case since the LPC filter is constant across that boundary.
+void fwgan_cont(FWGANState *st, const float *pcm0, const float *features0) {
+    int i;
+    float norm2, norm_1;
+    float wpcm0[CONT_PCM_INPUTS];
+    float cont_inputs[CONT_PCM_INPUTS + 1];
+    float tmp1[MAX_CONT_SIZE];
+    float tmp2[MAX_CONT_SIZE];
+    float lpc[LPC_ORDER];
+    float new_pcm[FWGAN_FRAME_SIZE];
+    FWGAN *model;
+    st->embed_phase[0] = 1;
+    model = &st->model;
+    compute_wlpc(lpc, features0);
+    /* Deemphasis memory is just the last continuation sample. */
+    st->deemph_mem = pcm0[CONT_PCM_INPUTS - 1];
+
+    /* Apply analysis filter, considering that the preemphasis and deemphasis filter
+       cancel each other in this case since the LPC filter is constant across that boundary.
      */
-  for (i=LPC_ORDER;i<CONT_PCM_INPUTS;i++) {
-    int j;
-    wpcm0[i] = pcm0[i];
-    for (j=0;j<LPC_ORDER;j++) wpcm0[i] += lpc[j]*pcm0[i-j-1];
-  }
-  /* FIXME: Make this less stupid. */
-  for (i=0;i<LPC_ORDER;i++) wpcm0[i] = wpcm0[LPC_ORDER];
-
-  /* The memory of the pre-empahsis is the last sample of the weighted signal
-     (ignoring preemphasis+deemphasis combination). */
-  st->preemph_mem = wpcm0[CONT_PCM_INPUTS-1];
-  /* The memory of the synthesis filter is the pre-emphasized continuation. */
-  for (i=0;i<LPC_ORDER;i++) st->syn_mem[i] = pcm0[CONT_PCM_INPUTS-1-i] - FWGAN_DEEMPHASIS*pcm0[CONT_PCM_INPUTS-2-i];
-
-  norm2 = celt_inner_prod(wpcm0, wpcm0, CONT_PCM_INPUTS, st->arch);
-  norm_1 = 1.f/sqrt(1e-8f + norm2);
-  for (i=0;i<CONT_PCM_INPUTS;i++) cont_inputs[i+1] = norm_1*wpcm0[i];
-  cont_inputs[0] = log(sqrt(norm2) + 1e-7f);
-
-  /* Continuation network */
-  compute_generic_dense(&model->cont_net_0, tmp1, cont_inputs, ACTIVATION_TANH);
-  compute_generic_dense(&model->cont_net_2, tmp2, tmp1, ACTIVATION_TANH);
-  compute_generic_dense(&model->cont_net_4, tmp1, tmp2, ACTIVATION_TANH);
-  compute_generic_dense(&model->cont_net_6, tmp2, tmp1, ACTIVATION_TANH);
-  compute_generic_dense(&model->cont_net_8, tmp1, tmp2, ACTIVATION_TANH);
-  celt_assert(CONT_NET_10_OUT_SIZE == model->cont_net_10.nb_outputs);
-  compute_generic_dense(&model->cont_net_10, st->cont, tmp1, ACTIVATION_TANH);
-
-  /* Computing continuation for each layer. */
-  celt_assert(RNN_GRU_STATE_SIZE == model->rnn_cont_fc_0.nb_outputs);
-  compute_generic_dense(&model->rnn_cont_fc_0, st->rnn_state, st->cont, ACTIVATION_TANH);
-
-  celt_assert(FWC1_STATE_SIZE == model->fwc1_cont_fc_0.nb_outputs);
-  compute_generic_dense(&model->fwc1_cont_fc_0, st->fwc1_state, st->cont, ACTIVATION_TANH);
-  celt_assert(FWC2_STATE_SIZE == model->fwc2_cont_fc_0.nb_outputs);
-  compute_generic_dense(&model->fwc2_cont_fc_0, st->fwc2_state, st->cont, ACTIVATION_TANH);
-  celt_assert(FWC3_STATE_SIZE == model->fwc3_cont_fc_0.nb_outputs);
-  compute_generic_dense(&model->fwc3_cont_fc_0, st->fwc3_state, st->cont, ACTIVATION_TANH);
-  celt_assert(FWC4_STATE_SIZE == model->fwc4_cont_fc_0.nb_outputs);
-  compute_generic_dense(&model->fwc4_cont_fc_0, st->fwc4_state, st->cont, ACTIVATION_TANH);
-  celt_assert(FWC5_STATE_SIZE == model->fwc5_cont_fc_0.nb_outputs);
-  compute_generic_dense(&model->fwc5_cont_fc_0, st->fwc5_state, st->cont, ACTIVATION_TANH);
-  celt_assert(FWC6_STATE_SIZE == model->fwc6_cont_fc_0.nb_outputs);
-  compute_generic_dense(&model->fwc6_cont_fc_0, st->fwc6_state, st->cont, ACTIVATION_TANH);
-  celt_assert(FWC7_STATE_SIZE == model->fwc7_cont_fc_0.nb_outputs);
-  compute_generic_dense(&model->fwc7_cont_fc_0, st->fwc7_state, st->cont, ACTIVATION_TANH);
-
-  st->cont_initialized = 1;
-  /* Process the first frame, discard the first subframe, and keep the rest for the first
-     synthesis call. */
-  fwgan_synthesize_impl(st, new_pcm, lpc, features0);
-  OAC_COPY(st->pcm_buf, &new_pcm[SUBFRAME_SIZE], FWGAN_FRAME_SIZE-SUBFRAME_SIZE);
+    for (i = LPC_ORDER; i < CONT_PCM_INPUTS; i++) {
+        int j;
+        wpcm0[i] = pcm0[i];
+        for (j = 0; j < LPC_ORDER; j++) wpcm0[i] += lpc[j]*pcm0[i - j - 1];
+    }
+    /* FIXME: Make this less stupid. */
+    for (i = 0; i < LPC_ORDER; i++) wpcm0[i] = wpcm0[LPC_ORDER];
+
+    /* The memory of the pre-empahsis is the last sample of the weighted signal
+       (ignoring preemphasis+deemphasis combination). */
+    st->preemph_mem = wpcm0[CONT_PCM_INPUTS - 1];
+    /* The memory of the synthesis filter is the pre-emphasized continuation. */
+    for (i = 0; i < LPC_ORDER;
+         i++) st->syn_mem[i] = pcm0[CONT_PCM_INPUTS - 1 - i] - FWGAN_DEEMPHASIS*pcm0[CONT_PCM_INPUTS - 2 - i];
+
+    norm2 = celt_inner_prod(wpcm0, wpcm0, CONT_PCM_INPUTS, st->arch);
+    norm_1 = 1.f/sqrt(1e-8f + norm2);
+    for (i = 0; i < CONT_PCM_INPUTS; i++) cont_inputs[i + 1] = norm_1*wpcm0[i];
+    cont_inputs[0] = log(sqrt(norm2) + 1e-7f);
+
+    /* Continuation network */
+    compute_generic_dense(&model->cont_net_0, tmp1, cont_inputs, ACTIVATION_TANH);
+    compute_generic_dense(&model->cont_net_2, tmp2, tmp1, ACTIVATION_TANH);
+    compute_generic_dense(&model->cont_net_4, tmp1, tmp2, ACTIVATION_TANH);
+    compute_generic_dense(&model->cont_net_6, tmp2, tmp1, ACTIVATION_TANH);
+    compute_generic_dense(&model->cont_net_8, tmp1, tmp2, ACTIVATION_TANH);
+    celt_assert(CONT_NET_10_OUT_SIZE == model->cont_net_10.nb_outputs);
+    compute_generic_dense(&model->cont_net_10, st->cont, tmp1, ACTIVATION_TANH);
+
+    /* Computing continuation for each layer. */
+    celt_assert(RNN_GRU_STATE_SIZE == model->rnn_cont_fc_0.nb_outputs);
+    compute_generic_dense(&model->rnn_cont_fc_0, st->rnn_state, st->cont, ACTIVATION_TANH);
+
+    celt_assert(FWC1_STATE_SIZE == model->fwc1_cont_fc_0.nb_outputs);
+    compute_generic_dense(&model->fwc1_cont_fc_0, st->fwc1_state, st->cont, ACTIVATION_TANH);
+    celt_assert(FWC2_STATE_SIZE == model->fwc2_cont_fc_0.nb_outputs);
+    compute_generic_dense(&model->fwc2_cont_fc_0, st->fwc2_state, st->cont, ACTIVATION_TANH);
+    celt_assert(FWC3_STATE_SIZE == model->fwc3_cont_fc_0.nb_outputs);
+    compute_generic_dense(&model->fwc3_cont_fc_0, st->fwc3_state, st->cont, ACTIVATION_TANH);
+    celt_assert(FWC4_STATE_SIZE == model->fwc4_cont_fc_0.nb_outputs);
+    compute_generic_dense(&model->fwc4_cont_fc_0, st->fwc4_state, st->cont, ACTIVATION_TANH);
+    celt_assert(FWC5_STATE_SIZE == model->fwc5_cont_fc_0.nb_outputs);
+    compute_generic_dense(&model->fwc5_cont_fc_0, st->fwc5_state, st->cont, ACTIVATION_TANH);
+    celt_assert(FWC6_STATE_SIZE == model->fwc6_cont_fc_0.nb_outputs);
+    compute_generic_dense(&model->fwc6_cont_fc_0, st->fwc6_state, st->cont, ACTIVATION_TANH);
+    celt_assert(FWC7_STATE_SIZE == model->fwc7_cont_fc_0.nb_outputs);
+    compute_generic_dense(&model->fwc7_cont_fc_0, st->fwc7_state, st->cont, ACTIVATION_TANH);
+
+    st->cont_initialized = 1;
+    /* Process the first frame, discard the first subframe, and keep the rest for the first
+       synthesis call. */
+    fwgan_synthesize_impl(st, new_pcm, lpc, features0);
+    OAC_COPY(st->pcm_buf, &new_pcm[SUBFRAME_SIZE], FWGAN_FRAME_SIZE - SUBFRAME_SIZE);
 }
 
 static void apply_gain(float *pcm, float c0, float *last_gain) {
-  int i;
-  float gain = pow(10.f, (0.5f*c0/sqrt(18.f)));
-  for (i=0;i<SUBFRAME_SIZE;i++) pcm[i] *= *last_gain;
-  *last_gain = gain;
+    int i;
+    float gain = pow(10.f, (0.5f*c0/sqrt(18.f)));
+    for (i = 0; i < SUBFRAME_SIZE; i++) pcm[i] *= *last_gain;
+    *last_gain = gain;
 }
 
 static void fwgan_lpc_syn(float *pcm, float *mem, const float *lpc, float last_lpc[LPC_ORDER]) {
-  int i;
-  for (i=0;i<SUBFRAME_SIZE;i++) {
-    int j;
-    for (j=0;j<LPC_ORDER;j++) pcm[i] -= mem[j]*last_lpc[j];
-    OAC_MOVE(&mem[1], &mem[0], LPC_ORDER-1);
-    mem[0] = pcm[i];
-  }
-  OAC_COPY(last_lpc, lpc, LPC_ORDER);
+    int i;
+    for (i = 0; i < SUBFRAME_SIZE; i++) {
+        int j;
+        for (j = 0; j < LPC_ORDER; j++) pcm[i] -= mem[j]*last_lpc[j];
+        OAC_MOVE(&mem[1], &mem[0], LPC_ORDER - 1);
+        mem[0] = pcm[i];
+    }
+    OAC_COPY(last_lpc, lpc, LPC_ORDER);
 }
 
 static void fwgan_preemphasis(float *pcm, float *preemph_mem) {
-  int i;
-  for (i=0;i<SUBFRAME_SIZE;i++) {
-    float tmp = pcm[i];
-    pcm[i] -= FWGAN_DEEMPHASIS * *preemph_mem;
-    *preemph_mem = tmp;
-  }
+    int i;
+    for (i = 0; i < SUBFRAME_SIZE; i++) {
+        float tmp = pcm[i];
+        pcm[i] -= FWGAN_DEEMPHASIS**preemph_mem;
+        *preemph_mem = tmp;
+    }
 }
 
 static void fwgan_deemphasis(float *pcm, float *deemph_mem) {
-  int i;
-  for (i=0;i<SUBFRAME_SIZE;i++) {
-    pcm[i] += FWGAN_DEEMPHASIS * *deemph_mem;
-    *deemph_mem = pcm[i];
-  }
+    int i;
+    for (i = 0; i < SUBFRAME_SIZE; i++) {
+        pcm[i] += FWGAN_DEEMPHASIS**deemph_mem;
+        *deemph_mem = pcm[i];
+    }
 }
 
-static void run_fwgan_subframe(FWGANState *st, float *pcm, const float *cond, double w0, const float *lpc, float c0)
-{
-  float tmp1[FWC1_FC_0_OUT_SIZE];
-  float tmp2[IMAX(RNN_GRU_STATE_SIZE, FWC2_FC_0_OUT_SIZE)];
-  float feat_in[FEAT_IN_SIZE];
-  float rnn_in[FEAT_IN_CONV1_CONV_OUT_SIZE];
-  float pembed[FWGAN_FRAME_SIZE/2];
-  FWGAN *model;
-  model = &st->model;
-
-  pitch_embeddings(pembed, st->embed_phase, w0);
-  /* Interleave bfcc_cond and pembed for each subframe in feat_in. */
-  OAC_COPY(&feat_in[BFCC_WITH_CORR_UPSAMPLER_FC_OUT_SIZE/4], &cond[0], BFCC_WITH_CORR_UPSAMPLER_FC_OUT_SIZE/4);
-  OAC_COPY(&feat_in[0], &pembed[0], FWGAN_FRAME_SIZE/2);
-
-  compute_generic_conv1d(&model->feat_in_conv1_conv, rnn_in, st->cont_conv1_mem, feat_in, FEAT_IN_CONV1_CONV_IN_SIZE, ACTIVATION_LINEAR);
-  celt_assert(FEAT_IN_NL1_GATE_OUT_SIZE == model->feat_in_nl1_gate.nb_outputs);
-  compute_gated_activation(&model->feat_in_nl1_gate, rnn_in, rnn_in, ACTIVATION_TANH);
-
-  if (st->cont_initialized == 1) {
-    /* On the very first subframe we stop here. We only want to run the feat_in layer since the
-       others are initialized via the continuation network. */
-    OAC_CLEAR(pcm, SUBFRAME_SIZE);
-    st->cont_initialized = 2;
-    apply_gain(pcm, c0, &st->last_gain);
-    OAC_COPY(st->last_lpc, lpc, LPC_ORDER);
-    return;
-  }
+static void run_fwgan_subframe(FWGANState *st, float *pcm, const float *cond, double w0, const float *lpc, float c0) {
+    float tmp1[FWC1_FC_0_OUT_SIZE];
+    float tmp2[IMAX(RNN_GRU_STATE_SIZE, FWC2_FC_0_OUT_SIZE)];
+    float feat_in[FEAT_IN_SIZE];
+    float rnn_in[FEAT_IN_CONV1_CONV_OUT_SIZE];
+    float pembed[FWGAN_FRAME_SIZE/2];
+    FWGAN *model;
+    model = &st->model;
+
+    pitch_embeddings(pembed, st->embed_phase, w0);
+    /* Interleave bfcc_cond and pembed for each subframe in feat_in. */
+    OAC_COPY(&feat_in[BFCC_WITH_CORR_UPSAMPLER_FC_OUT_SIZE/4], &cond[0], BFCC_WITH_CORR_UPSAMPLER_FC_OUT_SIZE/4);
+    OAC_COPY(&feat_in[0], &pembed[0], FWGAN_FRAME_SIZE/2);
+
+    compute_generic_conv1d(&model->feat_in_conv1_conv, rnn_in, st->cont_conv1_mem, feat_in, FEAT_IN_CONV1_CONV_IN_SIZE,
+    ACTIVATION_LINEAR);
+    celt_assert(FEAT_IN_NL1_GATE_OUT_SIZE == model->feat_in_nl1_gate.nb_outputs);
+    compute_gated_activation(&model->feat_in_nl1_gate, rnn_in, rnn_in, ACTIVATION_TANH);
 
-  compute_generic_gru(&model->rnn_gru_input, &model->rnn_gru_recurrent, st->rnn_state, rnn_in);
-  celt_assert(IMAX(RNN_GRU_STATE_SIZE, FWC2_FC_0_OUT_SIZE) >= model->rnn_nl_gate.nb_outputs);
-  compute_gated_activation(&model->rnn_nl_gate, tmp2, st->rnn_state, ACTIVATION_TANH);
+    if (st->cont_initialized == 1) {
+        /* On the very first subframe we stop here. We only want to run the feat_in layer since the
+           others are initialized via the continuation network. */
+        OAC_CLEAR(pcm, SUBFRAME_SIZE);
+        st->cont_initialized = 2;
+        apply_gain(pcm, c0, &st->last_gain);
+        OAC_COPY(st->last_lpc, lpc, LPC_ORDER);
+        return;
+    }
 
-  compute_generic_conv1d(&model->fwc1_fc_0, tmp1, st->fwc1_state, tmp2, RNN_GRU_STATE_SIZE, ACTIVATION_LINEAR);
-  compute_gated_activation(&model->fwc1_fc_1_gate, tmp1, tmp1, ACTIVATION_TANH);
+    compute_generic_gru(&model->rnn_gru_input, &model->rnn_gru_recurrent, st->rnn_state, rnn_in);
+    celt_assert(IMAX(RNN_GRU_STATE_SIZE, FWC2_FC_0_OUT_SIZE) >= model->rnn_nl_gate.nb_outputs);
+    compute_gated_activation(&model->rnn_nl_gate, tmp2, st->rnn_state, ACTIVATION_TANH);
 
-  compute_generic_conv1d(&model->fwc2_fc_0, tmp2, st->fwc2_state, tmp1, FWC1_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
-  compute_gated_activation(&model->fwc2_fc_1_gate, tmp2, tmp2, ACTIVATION_TANH);
+    compute_generic_conv1d(&model->fwc1_fc_0, tmp1, st->fwc1_state, tmp2, RNN_GRU_STATE_SIZE, ACTIVATION_LINEAR);
+    compute_gated_activation(&model->fwc1_fc_1_gate, tmp1, tmp1, ACTIVATION_TANH);
 
-  compute_generic_conv1d(&model->fwc3_fc_0, tmp1, st->fwc3_state, tmp2, FWC2_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
-  compute_gated_activation(&model->fwc3_fc_1_gate, tmp1, tmp1, ACTIVATION_TANH);
+    compute_generic_conv1d(&model->fwc2_fc_0, tmp2, st->fwc2_state, tmp1, FWC1_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
+    compute_gated_activation(&model->fwc2_fc_1_gate, tmp2, tmp2, ACTIVATION_TANH);
 
-  compute_generic_conv1d(&model->fwc4_fc_0, tmp2, st->fwc4_state, tmp1, FWC3_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
-  compute_gated_activation(&model->fwc4_fc_1_gate, tmp2, tmp2, ACTIVATION_TANH);
+    compute_generic_conv1d(&model->fwc3_fc_0, tmp1, st->fwc3_state, tmp2, FWC2_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
+    compute_gated_activation(&model->fwc3_fc_1_gate, tmp1, tmp1, ACTIVATION_TANH);
 
-  compute_generic_conv1d(&model->fwc5_fc_0, tmp1, st->fwc5_state, tmp2, FWC4_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
-  compute_gated_activation(&model->fwc5_fc_1_gate, tmp1, tmp1, ACTIVATION_TANH);
+    compute_generic_conv1d(&model->fwc4_fc_0, tmp2, st->fwc4_state, tmp1, FWC3_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
+    compute_gated_activation(&model->fwc4_fc_1_gate, tmp2, tmp2, ACTIVATION_TANH);
 
-  compute_generic_conv1d(&model->fwc6_fc_0, tmp2, st->fwc6_state, tmp1, FWC5_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
-  compute_gated_activation(&model->fwc6_fc_1_gate, tmp2, tmp2, ACTIVATION_TANH);
+    compute_generic_conv1d(&model->fwc5_fc_0, tmp1, st->fwc5_state, tmp2, FWC4_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
+    compute_gated_activation(&model->fwc5_fc_1_gate, tmp1, tmp1, ACTIVATION_TANH);
 
-  compute_generic_conv1d(&model->fwc7_fc_0, tmp1, st->fwc7_state, tmp2, FWC6_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
-  compute_gated_activation(&model->fwc7_fc_1_gate, pcm, tmp1, ACTIVATION_TANH);
+    compute_generic_conv1d(&model->fwc6_fc_0, tmp2, st->fwc6_state, tmp1, FWC5_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
+    compute_gated_activation(&model->fwc6_fc_1_gate, tmp2, tmp2, ACTIVATION_TANH);
 
-  apply_gain(pcm, c0, &st->last_gain);
-  fwgan_preemphasis(pcm, &st->preemph_mem);
-  fwgan_lpc_syn(pcm, st->syn_mem, lpc, st->last_lpc);
-  fwgan_deemphasis(pcm, &st->deemph_mem);
+    compute_generic_conv1d(&model->fwc7_fc_0, tmp1, st->fwc7_state, tmp2, FWC6_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
+    compute_gated_activation(&model->fwc7_fc_1_gate, pcm, tmp1, ACTIVATION_TANH);
+
+    apply_gain(pcm, c0, &st->last_gain);
+    fwgan_preemphasis(pcm, &st->preemph_mem);
+    fwgan_lpc_syn(pcm, st->syn_mem, lpc, st->last_lpc);
+    fwgan_deemphasis(pcm, &st->deemph_mem);
 }
 
-void fwgan_init(FWGANState *st)
-{
-  int ret;
-  OAC_CLEAR(st, 1);
-  ret = init_fwgan(&st->model, fwgan_arrays);
-  celt_assert(ret == 0);
-  /* FIXME: perform arch detection. */
+void fwgan_init(FWGANState *st) {
+    int ret;
+    OAC_CLEAR(st, 1);
+    ret = init_fwgan(&st->model, fwgan_arrays);
+    celt_assert(ret == 0);
+    /* FIXME: perform arch detection. */
 }
 
 int fwgan_load_model(FWGANState *st, const unsigned char *data, int len) {
-  WeightArray *list;
-  int ret;
-  parse_weights(&list, data, len);
-  ret = init_fwgan(&st->model, list);
-  oac_free(list);
-  if (ret == 0) return 0;
-  else return -1;
+    WeightArray *list;
+    int ret;
+    parse_weights(&list, data, len);
+    ret = init_fwgan(&st->model, list);
+    oac_free(list);
+    if (ret == 0) return 0;
+    else return -1;
 }
 
-static void fwgan_synthesize_impl(FWGANState *st, float *pcm, const float *lpc, const float *features)
-{
-  int subframe;
-  float cond[BFCC_WITH_CORR_UPSAMPLER_FC_OUT_SIZE];
-  double w0;
-  int period;
-  float fwgan_features[NB_FEATURES-1];
-  celt_assert(st->cont_initialized);
-  OAC_COPY(fwgan_features, features, NB_FEATURES-2);
-  fwgan_features[NB_FEATURES-2] = features[NB_FEATURES-1]+.5;
-
-  period = (int)floor(.1 + 50*features[NB_BANDS]+100);
-  w0 = 2*M_PI/period;
-  run_fwgan_upsampler(st, cond, fwgan_features);
-  for (subframe=0;subframe<NB_SUBFRAMES;subframe++) {
-    float *sub_cond;
-    sub_cond = &cond[subframe*BFCC_WITH_CORR_UPSAMPLER_FC_OUT_SIZE/4];
-    run_fwgan_subframe(st, &pcm[subframe*SUBFRAME_SIZE], sub_cond, w0, lpc, features[0]);
-  }
+static void fwgan_synthesize_impl(FWGANState *st, float *pcm, const float *lpc, const float *features) {
+    int subframe;
+    float cond[BFCC_WITH_CORR_UPSAMPLER_FC_OUT_SIZE];
+    double w0;
+    int period;
+    float fwgan_features[NB_FEATURES - 1];
+    celt_assert(st->cont_initialized);
+    OAC_COPY(fwgan_features, features, NB_FEATURES - 2);
+    fwgan_features[NB_FEATURES - 2] = features[NB_FEATURES - 1] + .5;
+
+    period = (int)floor(.1 + 50*features[NB_BANDS] + 100);
+    w0 = 2*M_PI/period;
+    run_fwgan_upsampler(st, cond, fwgan_features);
+    for (subframe = 0; subframe < NB_SUBFRAMES; subframe++) {
+        float *sub_cond;
+        sub_cond = &cond[subframe*BFCC_WITH_CORR_UPSAMPLER_FC_OUT_SIZE/4];
+        run_fwgan_subframe(st, &pcm[subframe*SUBFRAME_SIZE], sub_cond, w0, lpc, features[0]);
+    }
 }
 
-void fwgan_synthesize(FWGANState *st, float *pcm, const float *features)
-{
-  float lpc[LPC_ORDER];
-  float new_pcm[FWGAN_FRAME_SIZE];
-  compute_wlpc(lpc, features);
-  fwgan_synthesize_impl(st, new_pcm, lpc, features);
-  /* Handle buffering. */
-  OAC_COPY(pcm, st->pcm_buf, FWGAN_FRAME_SIZE-SUBFRAME_SIZE);
-  OAC_COPY(&pcm[FWGAN_FRAME_SIZE-SUBFRAME_SIZE], new_pcm, SUBFRAME_SIZE);
-  OAC_COPY(st->pcm_buf, &new_pcm[SUBFRAME_SIZE], FWGAN_FRAME_SIZE-SUBFRAME_SIZE);
+void fwgan_synthesize(FWGANState *st, float *pcm, const float *features) {
+    float lpc[LPC_ORDER];
+    float new_pcm[FWGAN_FRAME_SIZE];
+    compute_wlpc(lpc, features);
+    fwgan_synthesize_impl(st, new_pcm, lpc, features);
+    /* Handle buffering. */
+    OAC_COPY(pcm, st->pcm_buf, FWGAN_FRAME_SIZE - SUBFRAME_SIZE);
+    OAC_COPY(&pcm[FWGAN_FRAME_SIZE - SUBFRAME_SIZE], new_pcm, SUBFRAME_SIZE);
+    OAC_COPY(st->pcm_buf, &new_pcm[SUBFRAME_SIZE], FWGAN_FRAME_SIZE - SUBFRAME_SIZE);
 }
 
-void fwgan_synthesize_int(FWGANState *st, oac_int16 *pcm, const float *features)
-{
-  int i;
-  float fpcm[FWGAN_FRAME_SIZE];
-  fwgan_synthesize(st, fpcm, features);
-  for (i=0;i<LPCNET_FRAME_SIZE;i++) pcm[i] = (int)floor(.5 + MIN32(32767, MAX32(-32767, 32768.f*fpcm[i])));
+void fwgan_synthesize_int(FWGANState *st, oac_int16 *pcm, const float *features) {
+    int i;
+    float fpcm[FWGAN_FRAME_SIZE];
+    fwgan_synthesize(st, fpcm, features);
+    for (i = 0; i < LPCNET_FRAME_SIZE; i++) pcm[i] = (int)floor(.5 + MIN32(32767, MAX32(-32767, 32768.f*fpcm[i])));
 }
diff --git a/dnn/fwgan.h b/dnn/fwgan.h
index 6c6358a73..bbb2abd84 100644
--- a/dnn/fwgan.h
+++ b/dnn/fwgan.h
@@ -22,7 +22,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef FWGAN_H
 #define FWGAN_H
@@ -49,26 +49,26 @@
 #define FWC7_STATE_SIZE 80
 
 typedef struct {
-  FWGAN model;
-  int arch;
-  int cont_initialized;
-  float embed_phase[2];
-  float last_gain;
-  float last_lpc[LPC_ORDER];
-  float syn_mem[LPC_ORDER];
-  float preemph_mem;
-  float deemph_mem;
-  float pcm_buf[FWGAN_FRAME_SIZE];
-  float cont[CONT_NET_10_OUT_SIZE];
-  float cont_conv1_mem[FEAT_IN_CONV1_CONV_STATE_SIZE];
-  float rnn_state[RNN_GRU_STATE_SIZE];
-  float fwc1_state[FWC1_STATE_SIZE];
-  float fwc2_state[FWC2_STATE_SIZE];
-  float fwc3_state[FWC3_STATE_SIZE];
-  float fwc4_state[FWC4_STATE_SIZE];
-  float fwc5_state[FWC5_STATE_SIZE];
-  float fwc6_state[FWC6_STATE_SIZE];
-  float fwc7_state[FWC7_STATE_SIZE];
+    FWGAN model;
+    int arch;
+    int cont_initialized;
+    float embed_phase[2];
+    float last_gain;
+    float last_lpc[LPC_ORDER];
+    float syn_mem[LPC_ORDER];
+    float preemph_mem;
+    float deemph_mem;
+    float pcm_buf[FWGAN_FRAME_SIZE];
+    float cont[CONT_NET_10_OUT_SIZE];
+    float cont_conv1_mem[FEAT_IN_CONV1_CONV_STATE_SIZE];
+    float rnn_state[RNN_GRU_STATE_SIZE];
+    float fwc1_state[FWC1_STATE_SIZE];
+    float fwc2_state[FWC2_STATE_SIZE];
+    float fwc3_state[FWC3_STATE_SIZE];
+    float fwc4_state[FWC4_STATE_SIZE];
+    float fwc5_state[FWC5_STATE_SIZE];
+    float fwc6_state[FWC6_STATE_SIZE];
+    float fwc7_state[FWC7_STATE_SIZE];
 } FWGANState;
 
 void fwgan_init(FWGANState *st);
diff --git a/dnn/kiss99.c b/dnn/kiss99.c
index 325918f85..22d9ca734 100644
--- a/dnn/kiss99.c
+++ b/dnn/kiss99.c
@@ -1,81 +1,81 @@
 /*Daala video codec
-Copyright (c) 2012 Daala project contributors.  All rights reserved.
-Author: Timothy B. Terriberry
+   Copyright (c) 2012 Daala project contributors.  All rights reserved.
+   Author: Timothy B. Terriberry
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
 
-- Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
+   - Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
 
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
+   - Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS”
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS”
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+   DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+   CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "kiss99.h"
 
-void kiss99_srand(kiss99_ctx *_this,const unsigned char *_data,int _ndata){
-  int i;
-  _this->z=362436069;
-  _this->w=521288629;
-  _this->jsr=123456789;
-  _this->jcong=380116160;
-  for(i=3;i<_ndata;i+=4){
-    _this->z^=_data[i-3];
-    _this->w^=_data[i-2];
-    _this->jsr^=_data[i-1];
-    _this->jcong^=_data[i];
-    kiss99_rand(_this);
-  }
-  if(i-3<_ndata)_this->z^=_data[i-3];
-  if(i-2<_ndata)_this->w^=_data[i-2];
-  if(i-1<_ndata)_this->jsr^=_data[i-1];
-  /*Fix any potential short cycles that show up.
-    These are not too likely, given the way we initialize the state, but they
-     are technically possible, so let us go ahead and eliminate that
-     possibility.
-    See Gregory G. Rose: "KISS: A Bit Too Simple", Cryptographic Communications
-     No. 10, pp. 123---137, 2018.*/
-  if(_this->z==0||_this->z==0x9068FFFF)_this->z++;
-  if(_this->w==0||_this->w==0x464FFFFF)_this->w++;
-  if(_this->jsr==0)_this->jsr++;
+void kiss99_srand(kiss99_ctx *_this, const unsigned char *_data, int _ndata) {
+    int i;
+    _this->z = 362436069;
+    _this->w = 521288629;
+    _this->jsr = 123456789;
+    _this->jcong = 380116160;
+    for (i = 3; i < _ndata; i += 4) {
+        _this->z ^= _data[i - 3];
+        _this->w ^= _data[i - 2];
+        _this->jsr ^= _data[i - 1];
+        _this->jcong ^= _data[i];
+        kiss99_rand(_this);
+    }
+    if (i - 3 < _ndata) _this->z ^= _data[i - 3];
+    if (i - 2 < _ndata) _this->w ^= _data[i - 2];
+    if (i - 1 < _ndata) _this->jsr ^= _data[i - 1];
+    /*Fix any potential short cycles that show up.
+       These are not too likely, given the way we initialize the state, but they
+       are technically possible, so let us go ahead and eliminate that
+       possibility.
+       See Gregory G. Rose: "KISS: A Bit Too Simple", Cryptographic Communications
+       No. 10, pp. 123---137, 2018.*/
+    if (_this->z == 0 || _this->z == 0x9068FFFF) _this->z++;
+    if (_this->w == 0 || _this->w == 0x464FFFFF) _this->w++;
+    if (_this->jsr == 0) _this->jsr++;
 }
 
-uint32_t kiss99_rand(kiss99_ctx *_this){
-  uint32_t znew;
-  uint32_t wnew;
-  uint32_t mwc;
-  uint32_t shr3;
-  uint32_t cong;
-  znew=36969*(_this->z&0xFFFF)+(_this->z>>16);
-  wnew=18000*(_this->w&0xFFFF)+(_this->w>>16);
-  mwc=(znew<<16)+wnew;
-  /*We swap the 13 and 17 from the original 1999 algorithm to produce a single
-     cycle of maximal length, matching KISS11.
-    We are not actually using KISS11 because of the impractically large (16 MB)
-     internal state of the full algorithm.*/
-  shr3=_this->jsr^(_this->jsr<<13);
-  shr3^=shr3>>17;
-  shr3^=shr3<<5;
-  cong=69069*_this->jcong+1234567;
-  _this->z=znew;
-  _this->w=wnew;
-  _this->jsr=shr3;
-  _this->jcong=cong;
-  return (mwc^cong)+shr3;
+uint32_t kiss99_rand(kiss99_ctx *_this) {
+    uint32_t znew;
+    uint32_t wnew;
+    uint32_t mwc;
+    uint32_t shr3;
+    uint32_t cong;
+    znew = 36969*(_this->z&0xFFFF) + (_this->z>>16);
+    wnew = 18000*(_this->w&0xFFFF) + (_this->w>>16);
+    mwc = (znew<<16) + wnew;
+    /*We swap the 13 and 17 from the original 1999 algorithm to produce a single
+       cycle of maximal length, matching KISS11.
+       We are not actually using KISS11 because of the impractically large (16 MB)
+       internal state of the full algorithm.*/
+    shr3 = _this->jsr^(_this->jsr<<13);
+    shr3 ^= shr3>>17;
+    shr3 ^= shr3<<5;
+    cong = 69069*_this->jcong + 1234567;
+    _this->z = znew;
+    _this->w = wnew;
+    _this->jsr = shr3;
+    _this->jcong = cong;
+    return (mwc^cong) + shr3;
 }
diff --git a/dnn/kiss99.h b/dnn/kiss99.h
index c1416d109..33862b022 100644
--- a/dnn/kiss99.h
+++ b/dnn/kiss99.h
@@ -1,46 +1,46 @@
 /*Daala video codec
-Copyright (c) 2012 Daala project contributors.  All rights reserved.
-Author: Timothy B. Terriberry
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS”
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/
+   Copyright (c) 2012 Daala project contributors.  All rights reserved.
+   Author: Timothy B. Terriberry
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+   - Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS”
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+   DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+   CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/
 
 #if !defined(_kiss99_H)
-# define _kiss99_H (1)
-# include <stdint.h>
+#define _kiss99_H (1)
+#include <stdint.h>
 
 /*KISS PRNG from George Marsaglia (1999 version).
-  See https://en.wikipedia.org/wiki/KISS_(algorithm) for details.
-  This is suitable for simulations, but not for use in cryptographic contexts.*/
+   See https://en.wikipedia.org/wiki/KISS_(algorithm) for details.
+   This is suitable for simulations, but not for use in cryptographic contexts.*/
 
 typedef struct kiss99_ctx kiss99_ctx;
 
-struct kiss99_ctx{
-  uint32_t z;
-  uint32_t w;
-  uint32_t jsr;
-  uint32_t jcong;
+struct kiss99_ctx {
+    uint32_t z;
+    uint32_t w;
+    uint32_t jsr;
+    uint32_t jcong;
 };
 
-void kiss99_srand(kiss99_ctx *_this,const unsigned char *_data,int _ndata);
+void kiss99_srand(kiss99_ctx *_this, const unsigned char *_data, int _ndata);
 uint32_t kiss99_rand(kiss99_ctx *_this);
 
 #endif
diff --git a/dnn/lossgen.c b/dnn/lossgen.c
index e7292d0c1..ecdbb9b71 100644
--- a/dnn/lossgen.c
+++ b/dnn/lossgen.c
@@ -22,7 +22,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 /* This packet loss simulator can be used independently of the Oac codebase.
    To do that, you need to compile the following files:
@@ -45,10 +45,10 @@
 
    Additionally, the code in dnn/lossgen_demo.c can be used to generate losses from
    the command line.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "arch.h"
@@ -74,119 +74,118 @@
 #undef compute_activation
 
 /* Force the C version since the SIMD versions may be hidden. */
-#define compute_linear(linear, out, in, arch) ((void)(arch),compute_linear_c(linear, out, in))
-#define compute_activation(output, input, N, activation, arch) ((void)(arch),compute_activation_c(output, input, N, activation))
+#define compute_linear(linear, out, in, arch) ((void)(arch), compute_linear_c(linear, out, in))
+#define compute_activation(output, input, N, activation, arch) ((void)(arch), \
+                                                                compute_activation_c(output, input, N, activation))
 
 #define MAX_RNN_NEURONS_ALL IMAX(LOSSGEN_GRU1_STATE_SIZE, LOSSGEN_GRU2_STATE_SIZE)
 
 /* These two functions are copied from nnet.c to make sure we don't have linking issues. */
-void compute_generic_gru_lossgen(const LinearLayer *input_weights, const LinearLayer *recurrent_weights, float *state, const float *in, int arch)
-{
-  int i;
-  int N;
-  float zrh[3*MAX_RNN_NEURONS_ALL];
-  float recur[3*MAX_RNN_NEURONS_ALL];
-  float *z;
-  float *r;
-  float *h;
-  celt_assert(3*recurrent_weights->nb_inputs == recurrent_weights->nb_outputs);
-  celt_assert(input_weights->nb_outputs == recurrent_weights->nb_outputs);
-  N = recurrent_weights->nb_inputs;
-  z = zrh;
-  r = &zrh[N];
-  h = &zrh[2*N];
-  celt_assert(recurrent_weights->nb_outputs <= 3*MAX_RNN_NEURONS_ALL);
-  celt_assert(in != state);
-  compute_linear(input_weights, zrh, in, arch);
-  compute_linear(recurrent_weights, recur, state, arch);
-  for (i=0;i<2*N;i++)
-     zrh[i] += recur[i];
-  compute_activation(zrh, zrh, 2*N, ACTIVATION_SIGMOID, arch);
-  for (i=0;i<N;i++)
-     h[i] += recur[2*N+i]*r[i];
-  compute_activation(h, h, N, ACTIVATION_TANH, arch);
-  for (i=0;i<N;i++)
-     h[i] = z[i]*state[i] + (1-z[i])*h[i];
-  for (i=0;i<N;i++)
-     state[i] = h[i];
+void compute_generic_gru_lossgen(const LinearLayer *input_weights, const LinearLayer *recurrent_weights, float *state,
+                                 const float *in, int arch) {
+    int i;
+    int N;
+    float zrh[3*MAX_RNN_NEURONS_ALL];
+    float recur[3*MAX_RNN_NEURONS_ALL];
+    float *z;
+    float *r;
+    float *h;
+    celt_assert(3*recurrent_weights->nb_inputs == recurrent_weights->nb_outputs);
+    celt_assert(input_weights->nb_outputs == recurrent_weights->nb_outputs);
+    N = recurrent_weights->nb_inputs;
+    z = zrh;
+    r = &zrh[N];
+    h = &zrh[2*N];
+    celt_assert(recurrent_weights->nb_outputs <= 3*MAX_RNN_NEURONS_ALL);
+    celt_assert(in != state);
+    compute_linear(input_weights, zrh, in, arch);
+    compute_linear(recurrent_weights, recur, state, arch);
+    for (i = 0; i < 2*N; i++)
+        zrh[i] += recur[i];
+    compute_activation(zrh, zrh, 2*N, ACTIVATION_SIGMOID, arch);
+    for (i = 0; i < N; i++)
+        h[i] += recur[2*N + i]*r[i];
+    compute_activation(h, h, N, ACTIVATION_TANH, arch);
+    for (i = 0; i < N; i++)
+        h[i] = z[i]*state[i] + (1 - z[i])*h[i];
+    for (i = 0; i < N; i++)
+        state[i] = h[i];
 }
 
 
-void compute_generic_dense_lossgen(const LinearLayer *layer, float *output, const float *input, int activation, int arch)
-{
-   compute_linear(layer, output, input, arch);
-   compute_activation(output, output, layer->nb_outputs, activation, arch);
+void compute_generic_dense_lossgen(const LinearLayer *layer, float *output, const float *input, int activation,
+                                   int arch) {
+    compute_linear(layer, output, input, arch);
+    compute_activation(output, output, layer->nb_outputs, activation, arch);
 }
 
 
 static int sample_loss_impl(
     LossGenState *st,
-    float percent_loss)
-{
-  float input[2];
-  float tmp[LOSSGEN_DENSE_IN_OUT_SIZE];
-  float out;
-  int loss;
-  LossGen *model = &st->model;
-  input[0] = st->last_loss;
-  input[1] = percent_loss;
-  compute_generic_dense_lossgen(&model->lossgen_dense_in, tmp, input, ACTIVATION_TANH, 0);
-  compute_generic_gru_lossgen(&model->lossgen_gru1_input, &model->lossgen_gru1_recurrent, st->gru1_state, tmp, 0);
-  compute_generic_gru_lossgen(&model->lossgen_gru2_input, &model->lossgen_gru2_recurrent, st->gru2_state, st->gru1_state, 0);
-  compute_generic_dense_lossgen(&model->lossgen_dense_out, &out, st->gru2_state, ACTIVATION_SIGMOID, 0);
-  loss = (float)rand()/(float)RAND_MAX < out;
-  st->last_loss = loss;
-  return loss;
+    float percent_loss) {
+    float input[2];
+    float tmp[LOSSGEN_DENSE_IN_OUT_SIZE];
+    float out;
+    int loss;
+    LossGen *model = &st->model;
+    input[0] = st->last_loss;
+    input[1] = percent_loss;
+    compute_generic_dense_lossgen(&model->lossgen_dense_in, tmp, input, ACTIVATION_TANH, 0);
+    compute_generic_gru_lossgen(&model->lossgen_gru1_input, &model->lossgen_gru1_recurrent, st->gru1_state, tmp, 0);
+    compute_generic_gru_lossgen(&model->lossgen_gru2_input, &model->lossgen_gru2_recurrent, st->gru2_state,
+    st->gru1_state, 0);
+    compute_generic_dense_lossgen(&model->lossgen_dense_out, &out, st->gru2_state, ACTIVATION_SIGMOID, 0);
+    loss = (float)rand()/(float)RAND_MAX < out;
+    st->last_loss = loss;
+    return loss;
 }
 
 int sample_loss(
     LossGenState *st,
-    float percent_loss)
-{
-   /* Due to GRU being initialized with zeros, the first packets aren't quite random,
-      so we skip them. */
-   if (!st->used) {
-      int i;
-      for (i=0;i<1000;i++) sample_loss_impl(st, percent_loss);
-      st->used = 1;
-   }
-   return sample_loss_impl(st, percent_loss);
+    float percent_loss) {
+    /* Due to GRU being initialized with zeros, the first packets aren't quite random,
+       so we skip them. */
+    if (!st->used) {
+        int i;
+        for (i = 0; i < 1000; i++) sample_loss_impl(st, percent_loss);
+        st->used = 1;
+    }
+    return sample_loss_impl(st, percent_loss);
 }
 
-void lossgen_init(LossGenState *st)
-{
-  int ret;
-  OAC_CLEAR(st, 1);
-  ret = init_lossgen(&st->model, lossgen_arrays);
-  celt_assert(ret == 0);
-  (void)ret;
+void lossgen_init(LossGenState *st) {
+    int ret;
+    OAC_CLEAR(st, 1);
+    ret = init_lossgen(&st->model, lossgen_arrays);
+    celt_assert(ret == 0);
+    (void)ret;
 }
 
 int lossgen_load_model(LossGenState *st, const void *data, int len) {
-  WeightArray *list;
-  int ret;
-  parse_weights(&list, data, len);
-  ret = init_lossgen(&st->model, list);
-  oac_free(list);
-  if (ret == 0) return 0;
-  else return -1;
+    WeightArray *list;
+    int ret;
+    parse_weights(&list, data, len);
+    ret = init_lossgen(&st->model, list);
+    oac_free(list);
+    if (ret == 0) return 0;
+    else return -1;
 }
 
 #if 0
-#include <stdio.h>
+# include <stdio.h>
 int main(int argc, char **argv) {
-  int i, N;
-  float p;
-  LossGenState st;
-  if (argc!=3) {
-    fprintf(stderr, "usage: lossgen <percentage> <length>\n");
-    return 1;
-  }
-  lossgen_init(&st);
-  p = atof(argv[1]);
-  N = atoi(argv[2]);
-  for (i=0;i<N;i++) {
-    printf("%d\n", sample_loss(&st, p));
-  }
+    int i, N;
+    float p;
+    LossGenState st;
+    if (argc != 3) {
+        fprintf(stderr, "usage: lossgen <percentage> <length>\n");
+        return 1;
+    }
+    lossgen_init(&st);
+    p = atof(argv[1]);
+    N = atoi(argv[2]);
+    for (i = 0; i < N; i++) {
+        printf("%d\n", sample_loss(&st, p));
+    }
 }
 #endif
diff --git a/dnn/lossgen.h b/dnn/lossgen.h
index 78253e688..60c35d9bd 100644
--- a/dnn/lossgen.h
+++ b/dnn/lossgen.h
@@ -22,7 +22,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef LOSSGEN_H
 #define LOSSGEN_H
@@ -34,15 +34,15 @@
 #define PITCH_MIN_PERIOD 32
 #define PITCH_MAX_PERIOD 256
 
-#define NB_XCORR_FEATURES (PITCH_MAX_PERIOD-PITCH_MIN_PERIOD)
+#define NB_XCORR_FEATURES (PITCH_MAX_PERIOD - PITCH_MIN_PERIOD)
 
 
 typedef struct {
-  LossGen model;
-  float gru1_state[LOSSGEN_GRU1_STATE_SIZE];
-  float gru2_state[LOSSGEN_GRU2_STATE_SIZE];
-  int last_loss;
-  int used;
+    LossGen model;
+    float gru1_state[LOSSGEN_GRU1_STATE_SIZE];
+    float gru2_state[LOSSGEN_GRU2_STATE_SIZE];
+    int last_loss;
+    int used;
 } LossGenState;
 
 
diff --git a/dnn/lossgen_demo.c b/dnn/lossgen_demo.c
index bad7bdc32..97a25dd8c 100644
--- a/dnn/lossgen_demo.c
+++ b/dnn/lossgen_demo.c
@@ -1,22 +1,21 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "lossgen.h"
-int main(int argc, char **argv)
-{
-   LossGenState st;
-   long num_packets;
-   long i;
-   float percent;
-   if (argc != 3) {
-      fprintf(stderr, "usage: %s <percent_loss> <nb packets>\n", argv[0]);
-      return 1;
-   }
-   lossgen_init(&st);
-   percent = atof(argv[1]);
-   num_packets = atol(argv[2]);
-   /*printf("loss: %f %d\n", percent, num_packets);*/
-   for (i=0;i<num_packets;i++) {
-      printf("%d\n", sample_loss(&st, percent*0.01f));
-   }
-   return 0;
+int main(int argc, char **argv) {
+    LossGenState st;
+    long num_packets;
+    long i;
+    float percent;
+    if (argc != 3) {
+        fprintf(stderr, "usage: %s <percent_loss> <nb packets>\n", argv[0]);
+        return 1;
+    }
+    lossgen_init(&st);
+    percent = atof(argv[1]);
+    num_packets = atol(argv[2]);
+    /*printf("loss: %f %d\n", percent, num_packets);*/
+    for (i = 0; i < num_packets; i++) {
+        printf("%d\n", sample_loss(&st, percent*0.01f));
+    }
+    return 0;
 }
diff --git a/dnn/lpcnet.c b/dnn/lpcnet.c
index eed998453..4f3e0775a 100644
--- a/dnn/lpcnet.c
+++ b/dnn/lpcnet.c
@@ -22,10 +22,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <math.h>
@@ -46,42 +46,36 @@
 
 
 #if 0
-static void print_vector(float *x, int N)
-{
+static void print_vector(float *x, int N) {
     int i;
-    for (i=0;i<N;i++) printf("%f ", x[i]);
+    for (i = 0; i < N; i++)printf("%f ", x[i]);
     printf("\n");
 }
 #endif
 
 #ifdef END2END
-void rc2lpc(float *lpc, const float *rc)
-{
-  int i, j, k;
-  float tmp[LPC_ORDER];
-  float ntmp[LPC_ORDER] = {0.0};
-  OAC_COPY(tmp, rc, LPC_ORDER);
-  for(i = 0; i < LPC_ORDER ; i++)
-    {
-        for(j = 0; j <= i-1; j++)
-        {
+void rc2lpc(float *lpc, const float *rc) {
+    int i, j, k;
+    float tmp[LPC_ORDER];
+    float ntmp[LPC_ORDER] = {0.0};
+    OAC_COPY(tmp, rc, LPC_ORDER);
+    for (i = 0; i < LPC_ORDER ; i++) {
+        for (j = 0; j <= i - 1; j++) {
             ntmp[j] = tmp[j] + tmp[i]*tmp[i - j - 1];
         }
-        for(k = 0; k <= i-1; k++)
-        {
+        for (k = 0; k <= i - 1; k++) {
             tmp[k] = ntmp[k];
         }
     }
-  for(i = 0; i < LPC_ORDER ; i++)
-  {
-    lpc[i] = tmp[i];
-  }
+    for (i = 0; i < LPC_ORDER ; i++) {
+        lpc[i] = tmp[i];
+    }
 }
 
 #endif
 
-void run_frame_network(LPCNetState *lpcnet, float *gru_a_condition, float *gru_b_condition, float *lpc, const float *features)
-{
+void run_frame_network(LPCNetState *lpcnet, float *gru_a_condition, float *gru_b_condition, float *lpc,
+                       const float *features) {
     NNetState *net;
     float condition[FEATURE_DENSE2_OUT_SIZE];
     float in[FRAME_INPUT_SIZE];
@@ -91,7 +85,7 @@ void run_frame_network(LPCNetState *lpcnet, float *gru_a_condition, float *gru_b
     int pitch;
     float rc[LPC_ORDER];
     /* Matches the Python code -- the 0.1 avoids rounding issues. */
-    pitch = (int)floor(.1 + 50*features[NB_BANDS]+100);
+    pitch = (int)floor(.1 + 50*features[NB_BANDS] + 100);
     pitch = IMIN(255, IMAX(33, pitch));
     net = &lpcnet->nnet;
     OAC_COPY(in, features, NB_FEATURES);
@@ -107,9 +101,9 @@ void run_frame_network(LPCNetState *lpcnet, float *gru_a_condition, float *gru_b
     _lpcnet_compute_dense(&lpcnet->model.gru_b_dense_feature, gru_b_condition, condition);
 #ifdef END2END
     rc2lpc(lpc, rc);
-#elif FEATURES_DELAY>0
-    memcpy(lpc, lpcnet->old_lpc[FEATURES_DELAY-1], LPC_ORDER*sizeof(lpc[0]));
-    memmove(lpcnet->old_lpc[1], lpcnet->old_lpc[0], (FEATURES_DELAY-1)*LPC_ORDER*sizeof(lpc[0]));
+#elif FEATURES_DELAY > 0
+    memcpy(lpc, lpcnet->old_lpc[FEATURES_DELAY - 1], LPC_ORDER*sizeof(lpc[0]));
+    memmove(lpcnet->old_lpc[1], lpcnet->old_lpc[0], (FEATURES_DELAY - 1)*LPC_ORDER*sizeof(lpc[0]));
     lpc_from_cepstrum(lpcnet->old_lpc[0], features);
 #else
     lpc_from_cepstrum(lpc, features);
@@ -120,22 +114,20 @@ void run_frame_network(LPCNetState *lpcnet, float *gru_a_condition, float *gru_b
     if (lpcnet->frame_count < 1000) lpcnet->frame_count++;
 }
 
-void run_frame_network_deferred(LPCNetState *lpcnet, const float *features)
-{
+void run_frame_network_deferred(LPCNetState *lpcnet, const float *features) {
     int max_buffer_size = lpcnet->model.feature_conv1.kernel_size + lpcnet->model.feature_conv2.kernel_size - 2;
     celt_assert(max_buffer_size <= MAX_FEATURE_BUFFER_SIZE);
     if (lpcnet->feature_buffer_fill == max_buffer_size) {
-        OAC_MOVE(lpcnet->feature_buffer, &lpcnet->feature_buffer[NB_FEATURES],  (max_buffer_size-1)*NB_FEATURES);
+        OAC_MOVE(lpcnet->feature_buffer, &lpcnet->feature_buffer[NB_FEATURES],  (max_buffer_size - 1)*NB_FEATURES);
     } else {
-      lpcnet->feature_buffer_fill++;
+        lpcnet->feature_buffer_fill++;
     }
-    OAC_COPY(&lpcnet->feature_buffer[(lpcnet->feature_buffer_fill-1)*NB_FEATURES], features, NB_FEATURES);
+    OAC_COPY(&lpcnet->feature_buffer[(lpcnet->feature_buffer_fill - 1)*NB_FEATURES], features, NB_FEATURES);
 }
 
-void run_frame_network_flush(LPCNetState *lpcnet)
-{
+void run_frame_network_flush(LPCNetState *lpcnet) {
     int i;
-    for (i=0;i<lpcnet->feature_buffer_fill;i++) {
+    for (i = 0; i < lpcnet->feature_buffer_fill; i++) {
         float lpc[LPC_ORDER];
         float gru_a_condition[3*GRU_A_STATE_SIZE];
         float gru_b_condition[3*GRU_B_STATE_SIZE];
@@ -144,15 +136,16 @@ void run_frame_network_flush(LPCNetState *lpcnet)
     lpcnet->feature_buffer_fill = 0;
 }
 
-int run_sample_network(LPCNetState *lpcnet, const float *gru_a_condition, const float *gru_b_condition, int last_exc, int last_sig, int pred, const float *sampling_logit_table, kiss99_ctx *rng)
-{
+int run_sample_network(LPCNetState *lpcnet, const float *gru_a_condition, const float *gru_b_condition, int last_exc,
+                       int last_sig, int pred, const float *sampling_logit_table, kiss99_ctx *rng) {
     NNetState *net;
     float gru_a_input[3*GRU_A_STATE_SIZE];
-    float in_b[GRU_A_STATE_SIZE+FEATURE_DENSE2_OUT_SIZE];
+    float in_b[GRU_A_STATE_SIZE + FEATURE_DENSE2_OUT_SIZE];
     float gru_b_input[3*GRU_B_STATE_SIZE];
     net = &lpcnet->nnet;
 #if 1
-    compute_gru_a_input(gru_a_input, gru_a_condition, GRU_A_STATE_SIZE, &lpcnet->model.gru_a_embed_sig, last_sig, &lpcnet->model.gru_a_embed_pred, pred, &lpcnet->model.gru_a_embed_exc, last_exc);
+    compute_gru_a_input(gru_a_input, gru_a_condition, GRU_A_STATE_SIZE, &lpcnet->model.gru_a_embed_sig, last_sig,
+    &lpcnet->model.gru_a_embed_pred, pred, &lpcnet->model.gru_a_embed_exc, last_exc);
 #else
     OAC_COPY(gru_a_input, gru_a_condition, 3*GRU_A_STATE_SIZE);
     accum_embedding(&lpcnet->model.gru_a_embed_sig, gru_a_input, last_sig);
@@ -167,28 +160,25 @@ int run_sample_network(LPCNetState *lpcnet, const float *gru_a_condition, const
     return sample_mdense(&lpcnet->model.dual_fc, net->gru_b_state, sampling_logit_table, rng);
 }
 
-int lpcnet_get_size()
-{
+int lpcnet_get_size() {
     return sizeof(LPCNetState);
 }
 
-void lpcnet_reset(LPCNetState *lpcnet)
-{
-    const char* rng_string="LPCNet";
+void lpcnet_reset(LPCNetState *lpcnet) {
+    const char* rng_string = "LPCNet";
     OAC_CLEAR((char*)&lpcnet->LPCNET_RESET_START,
-            sizeof(LPCNetState)-
-            ((char*)&lpcnet->LPCNET_RESET_START - (char*)lpcnet));
+            sizeof(LPCNetState)
+        - ((char*)&lpcnet->LPCNET_RESET_START - (char*)lpcnet));
     lpcnet->last_exc = lin2ulaw(0.f);
     kiss99_srand(&lpcnet->rng, (const unsigned char *)rng_string, strlen(rng_string));
 }
 
-int lpcnet_init(LPCNetState *lpcnet)
-{
+int lpcnet_init(LPCNetState *lpcnet) {
     int i;
     int ret;
-    for (i=0;i<256;i++) {
-        float prob = .025f+.95f*i/255.f;
-        lpcnet->sampling_logit_table[i] = -log((1-prob)/prob);
+    for (i = 0; i < 256; i++) {
+        float prob = .025f + .95f*i/255.f;
+        lpcnet->sampling_logit_table[i] = -log((1 - prob)/prob);
     }
 #ifndef USE_WEIGHTS_FILE
     ret = init_lpcnet_model(&lpcnet->model, lpcnet_arrays);
@@ -201,18 +191,17 @@ int lpcnet_init(LPCNetState *lpcnet)
 }
 
 int lpcnet_load_model(LPCNetState *st, const unsigned char *data, int len) {
-  WeightArray *list;
-  int ret;
-  parse_weights(&list, data, len);
-  ret = init_lpcnet_model(&st->model, list);
-  oac_free(list);
-  if (ret == 0) return 0;
-  else return -1;
+    WeightArray *list;
+    int ret;
+    parse_weights(&list, data, len);
+    ret = init_lpcnet_model(&st->model, list);
+    oac_free(list);
+    if (ret == 0) return 0;
+    else return -1;
 }
 
 
-LPCNetState *lpcnet_create()
-{
+LPCNetState *lpcnet_create() {
     LPCNetState *lpcnet;
     lpcnet = (LPCNetState *)oac_alloc(lpcnet_get_size(), 1);
     OAC_CLEAR(lpcnet, 1);
@@ -220,13 +209,11 @@ LPCNetState *lpcnet_create()
     return lpcnet;
 }
 
-void lpcnet_destroy(LPCNetState *lpcnet)
-{
+void lpcnet_destroy(LPCNetState *lpcnet) {
     oac_free(lpcnet);
 }
 
-void lpcnet_reset_signal(LPCNetState *lpcnet)
-{
+void lpcnet_reset_signal(LPCNetState *lpcnet) {
     lpcnet->deemph_mem = 0;
     lpcnet->last_exc = lin2ulaw(0.f);
     OAC_CLEAR(lpcnet->last_sig, LPC_ORDER);
@@ -234,46 +221,43 @@ void lpcnet_reset_signal(LPCNetState *lpcnet)
     OAC_CLEAR(lpcnet->nnet.gru_b_state, GRU_B_STATE_SIZE);
 }
 
-void lpcnet_synthesize_tail_impl(LPCNetState *lpcnet, oac_int16 *output, int N, int preload)
-{
+void lpcnet_synthesize_tail_impl(LPCNetState *lpcnet, oac_int16 *output, int N, int preload) {
     int i;
 
-    if (lpcnet->frame_count <= FEATURES_DELAY)
-    {
+    if (lpcnet->frame_count <= FEATURES_DELAY) {
         OAC_CLEAR(output, N);
         return;
     }
-    for (i=0;i<N;i++)
-    {
+    for (i = 0; i < N; i++) {
         int j;
         float pcm;
         int exc;
         int last_sig_ulaw;
         int pred_ulaw;
         float pred = 0;
-        for (j=0;j<LPC_ORDER;j++) pred -= lpcnet->last_sig[j]*lpcnet->lpc[j];
+        for (j = 0; j < LPC_ORDER; j++)pred -= lpcnet->last_sig[j]*lpcnet->lpc[j];
         last_sig_ulaw = lin2ulaw(lpcnet->last_sig[0]);
         pred_ulaw = lin2ulaw(pred);
-        exc = run_sample_network(lpcnet, lpcnet->gru_a_condition, lpcnet->gru_b_condition, lpcnet->last_exc, last_sig_ulaw, pred_ulaw, lpcnet->sampling_logit_table, &lpcnet->rng);
+        exc = run_sample_network(lpcnet, lpcnet->gru_a_condition, lpcnet->gru_b_condition, lpcnet->last_exc,
+        last_sig_ulaw, pred_ulaw, lpcnet->sampling_logit_table, &lpcnet->rng);
         if (i < preload) {
-          exc = lin2ulaw(output[i]-PREEMPH*lpcnet->deemph_mem - pred);
-          pcm = output[i]-PREEMPH*lpcnet->deemph_mem;
+            exc = lin2ulaw(output[i] - PREEMPH*lpcnet->deemph_mem - pred);
+            pcm = output[i] - PREEMPH*lpcnet->deemph_mem;
         } else {
-          pcm = pred + ulaw2lin(exc);
+            pcm = pred + ulaw2lin(exc);
         }
-        OAC_MOVE(&lpcnet->last_sig[1], &lpcnet->last_sig[0], LPC_ORDER-1);
+        OAC_MOVE(&lpcnet->last_sig[1], &lpcnet->last_sig[0], LPC_ORDER - 1);
         lpcnet->last_sig[0] = pcm;
         lpcnet->last_exc = exc;
         pcm += PREEMPH*lpcnet->deemph_mem;
         lpcnet->deemph_mem = pcm;
-        if (pcm<-32767) pcm = -32767;
-        if (pcm>32767) pcm = 32767;
+        if (pcm < -32767)pcm = -32767;
+        if (pcm > 32767)pcm = 32767;
         if (i >= preload) output[i] = (int)floor(.5 + pcm);
     }
 }
 
-void lpcnet_synthesize_impl(LPCNetState *lpcnet, const float *features, oac_int16 *output, int N, int preload)
-{
+void lpcnet_synthesize_impl(LPCNetState *lpcnet, const float *features, oac_int16 *output, int N, int preload) {
     run_frame_network(lpcnet, lpcnet->gru_a_condition, lpcnet->gru_b_condition, lpcnet->lpc, features);
     lpcnet_synthesize_tail_impl(lpcnet, output, N, preload);
 }
diff --git a/dnn/lpcnet.h b/dnn/lpcnet.h
index 0cbf13ec7..c0c86211c 100644
--- a/dnn/lpcnet.h
+++ b/dnn/lpcnet.h
@@ -22,7 +22,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef LPCNET_H_
 #define LPCNET_H_
@@ -45,123 +45,125 @@ typedef struct LPCNetPLCState LPCNetPLCState;
 
 
 /** Gets the size of an <code>LPCNetDecState</code> structure.
-  * @returns The size in bytes.
-  */
+ * @returns The size in bytes.
+ */
 int lpcnet_decoder_get_size(void);
 
 /** Initializes a previously allocated decoder state
-  * The memory pointed to by st must be at least the size returned by lpcnet_decoder_get_size().
-  * This is intended for applications which use their own allocator instead of malloc.
-  * @see lpcnet_decoder_create(),lpcnet_decoder_get_size()
-  * @param [in] st <tt>LPCNetDecState*</tt>: Decoder state
-  * @retval 0 Success
-  */
+ * The memory pointed to by st must be at least the size returned by lpcnet_decoder_get_size().
+ * This is intended for applications which use their own allocator instead of malloc.
+ * @see lpcnet_decoder_create(),lpcnet_decoder_get_size()
+ * @param [in] st <tt>LPCNetDecState*</tt>: Decoder state
+ * @retval 0 Success
+ */
 int lpcnet_decoder_init(LPCNetDecState *st);
 
 void lpcnet_reset(LPCNetState *lpcnet);
 
 /** Allocates and initializes a decoder state.
-  *  @returns The newly created state
-  */
+ *  @returns The newly created state
+ */
 LPCNetDecState *lpcnet_decoder_create(void);
 
 /** Frees an <code>LPCNetDecState</code> allocated by lpcnet_decoder_create().
-  * @param[in] st <tt>LPCNetDecState*</tt>: State to be freed.
-  */
+ * @param[in] st <tt>LPCNetDecState*</tt>: State to be freed.
+ */
 void lpcnet_decoder_destroy(LPCNetDecState *st);
 
 /** Decodes a packet of LPCNET_COMPRESSED_SIZE bytes (currently 8) into LPCNET_PACKET_SAMPLES samples (currently 640).
-  * @param [in] st <tt>LPCNetDecState*</tt>: Decoder state
-  * @param [in] buf <tt>const unsigned char *</tt>: Compressed packet
-  * @param [out] pcm <tt>oac_int16 *</tt>: Decoded audio
-  * @retval 0 Success
-  */
+ * @param [in] st <tt>LPCNetDecState*</tt>: Decoder state
+ * @param [in] buf <tt>const unsigned char *</tt>: Compressed packet
+ * @param [out] pcm <tt>oac_int16 *</tt>: Decoded audio
+ * @retval 0 Success
+ */
 int lpcnet_decode(LPCNetDecState *st, const unsigned char *buf, oac_int16 *pcm);
 
 
 
 /** Gets the size of an <code>LPCNetEncState</code> structure.
-  * @returns The size in bytes.
-  */
+ * @returns The size in bytes.
+ */
 int lpcnet_encoder_get_size(void);
 
 /** Initializes a previously allocated encoder state
-  * The memory pointed to by st must be at least the size returned by lpcnet_encoder_get_size().
-  * This is intended for applications which use their own allocator instead of malloc.
-  * @see lpcnet_encoder_create(),lpcnet_encoder_get_size()
-  * @param [in] st <tt>LPCNetEncState*</tt>: Encoder state
-  * @retval 0 Success
-  */
+ * The memory pointed to by st must be at least the size returned by lpcnet_encoder_get_size().
+ * This is intended for applications which use their own allocator instead of malloc.
+ * @see lpcnet_encoder_create(),lpcnet_encoder_get_size()
+ * @param [in] st <tt>LPCNetEncState*</tt>: Encoder state
+ * @retval 0 Success
+ */
 int lpcnet_encoder_init(LPCNetEncState *st);
 
 int lpcnet_encoder_load_model(LPCNetEncState *st, const void *data, int len);
 
 /** Allocates and initializes an encoder state.
-  *  @returns The newly created state
-  */
+ *  @returns The newly created state
+ */
 LPCNetEncState *lpcnet_encoder_create(void);
 
 /** Frees an <code>LPCNetEncState</code> allocated by lpcnet_encoder_create().
-  * @param[in] st <tt>LPCNetEncState*</tt>: State to be freed.
-  */
+ * @param[in] st <tt>LPCNetEncState*</tt>: State to be freed.
+ */
 void lpcnet_encoder_destroy(LPCNetEncState *st);
 
 /** Encodes LPCNET_PACKET_SAMPLES speech samples (currently 640) into a packet of LPCNET_COMPRESSED_SIZE bytes (currently 8).
-  * @param [in] st <tt>LPCNetDecState*</tt>: Encoder state
-  * @param [in] pcm <tt>oac_int16 *</tt>: Input speech to be encoded
-  * @param [out] buf <tt>const unsigned char *</tt>: Compressed packet
-  * @retval 0 Success
-  */
+ * @param [in] st <tt>LPCNetDecState*</tt>: Encoder state
+ * @param [in] pcm <tt>oac_int16 *</tt>: Input speech to be encoded
+ * @param [out] buf <tt>const unsigned char *</tt>: Compressed packet
+ * @retval 0 Success
+ */
 int lpcnet_encode(LPCNetEncState *st, const oac_int16 *pcm, unsigned char *buf);
 
 /** Compute features on LPCNET_FRAME_SIZE speech samples (currently 160) and output features for one 10-ms frame.
-  * @param [in] st <tt>LPCNetDecState*</tt>: Encoder state
-  * @param [in] pcm <tt>oac_int16 *</tt>: Input speech to be analyzed
-  * @param [out] features <tt>float[NB_TOTAL_FEATURES]</tt>: Four feature vectors
-  * @retval 0 Success
-  */
-int lpcnet_compute_single_frame_features(LPCNetEncState *st, const oac_int16 *pcm, float features[NB_TOTAL_FEATURES], int arch);
+ * @param [in] st <tt>LPCNetDecState*</tt>: Encoder state
+ * @param [in] pcm <tt>oac_int16 *</tt>: Input speech to be analyzed
+ * @param [out] features <tt>float[NB_TOTAL_FEATURES]</tt>: Four feature vectors
+ * @retval 0 Success
+ */
+int lpcnet_compute_single_frame_features(LPCNetEncState *st, const oac_int16 *pcm, float features[NB_TOTAL_FEATURES],
+    int arch);
 
 
 /** Compute features on LPCNET_FRAME_SIZE speech samples (currently 160) and output features for one 10-ms frame.
-  * @param [in] st <tt>LPCNetDecState*</tt>: Encoder state
-  * @param [in] pcm <tt>float *</tt>: Input speech to be analyzed
-  * @param [out] features <tt>float[NB_TOTAL_FEATURES]</tt>: Four feature vectors
-  * @retval 0 Success
-  */
-int lpcnet_compute_single_frame_features_float(LPCNetEncState *st, const float *pcm, float features[NB_TOTAL_FEATURES], int arch);
+ * @param [in] st <tt>LPCNetDecState*</tt>: Encoder state
+ * @param [in] pcm <tt>float *</tt>: Input speech to be analyzed
+ * @param [out] features <tt>float[NB_TOTAL_FEATURES]</tt>: Four feature vectors
+ * @retval 0 Success
+ */
+int lpcnet_compute_single_frame_features_float(LPCNetEncState *st, const float *pcm, float features[NB_TOTAL_FEATURES],
+    int arch);
 
 /** Gets the size of an <code>LPCNetState</code> structure.
-  * @returns The size in bytes.
-  */
+ * @returns The size in bytes.
+ */
 int lpcnet_get_size(void);
 
 /** Initializes a previously allocated synthesis state
-  * The memory pointed to by st must be at least the size returned by lpcnet_get_size().
-  * This is intended for applications which use their own allocator instead of malloc.
-  * @see lpcnet_create(),lpcnet_get_size()
-  * @param [in] st <tt>LPCNetState*</tt>: Synthesis state
-  * @retval 0 Success
-  */
+ * The memory pointed to by st must be at least the size returned by lpcnet_get_size().
+ * This is intended for applications which use their own allocator instead of malloc.
+ * @see lpcnet_create(),lpcnet_get_size()
+ * @param [in] st <tt>LPCNetState*</tt>: Synthesis state
+ * @retval 0 Success
+ */
 int lpcnet_init(LPCNetState *st);
 
 /** Allocates and initializes a synthesis state.
-  *  @returns The newly created state
-  */
+ *  @returns The newly created state
+ */
 LPCNetState *lpcnet_create(void);
 
 /** Frees an <code>LPCNetState</code> allocated by lpcnet_create().
-  * @param[in] st <tt>LPCNetState*</tt>: State to be freed.
-  */
+ * @param[in] st <tt>LPCNetState*</tt>: State to be freed.
+ */
 void lpcnet_destroy(LPCNetState *st);
 
 /** Synthesizes speech from an LPCNet feature vector.
-  * @param [in] st <tt>LPCNetState*</tt>: Synthesis state
-  * @param [in] features <tt>const float *</tt>: Compressed packet
-  * @param [out] output <tt>oac_int16 **</tt>: Synthesized speech
-  * @param [in] N <tt>int</tt>: Number of samples to generate
-  * @retval 0 Success
-  */
+ * @param [in] st <tt>LPCNetState*</tt>: Synthesis state
+ * @param [in] features <tt>const float *</tt>: Compressed packet
+ * @param [out] output <tt>oac_int16 **</tt>: Synthesized speech
+ * @param [in] N <tt>int</tt>: Number of samples to generate
+ * @retval 0 Success
+ */
 void lpcnet_synthesize(LPCNetState *st, const float *features, oac_int16 *output, int N);
 
 
diff --git a/dnn/lpcnet_enc.c b/dnn/lpcnet_enc.c
index 862f2a081..4b687e27d 100644
--- a/dnn/lpcnet_enc.c
+++ b/dnn/lpcnet_enc.c
@@ -22,10 +22,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdlib.h>
@@ -47,184 +47,189 @@
 
 
 int lpcnet_encoder_get_size(void) {
-  return sizeof(LPCNetEncState);
+    return sizeof(LPCNetEncState);
 }
 
 int lpcnet_encoder_init(LPCNetEncState *st) {
-  memset(st, 0, sizeof(*st));
-  pitchdnn_init(&st->pitchdnn);
-  return 0;
+    memset(st, 0, sizeof(*st));
+    pitchdnn_init(&st->pitchdnn);
+    return 0;
 }
 
 int lpcnet_encoder_load_model(LPCNetEncState *st, const void *data, int len) {
-  return pitchdnn_load_model(&st->pitchdnn, data, len);
+    return pitchdnn_load_model(&st->pitchdnn, data, len);
 }
 
 LPCNetEncState *lpcnet_encoder_create(void) {
-  LPCNetEncState *st;
-  st = (LPCNetEncState*)oac_alloc(lpcnet_encoder_get_size());
-  lpcnet_encoder_init(st);
-  return st;
+    LPCNetEncState *st;
+    st = (LPCNetEncState*)oac_alloc(lpcnet_encoder_get_size());
+    lpcnet_encoder_init(st);
+    return st;
 }
 
 void lpcnet_encoder_destroy(LPCNetEncState *st) {
-  oac_free(st);
+    oac_free(st);
 }
 
 static void frame_analysis(LPCNetEncState *st, kiss_fft_cpx *X, float *Ex, const float *in) {
-  float x[WINDOW_SIZE];
-  OAC_COPY(x, st->analysis_mem, OVERLAP_SIZE);
-  OAC_COPY(&x[OVERLAP_SIZE], in, FRAME_SIZE);
-  OAC_COPY(st->analysis_mem, &in[FRAME_SIZE-OVERLAP_SIZE], OVERLAP_SIZE);
-  apply_window(x);
-  forward_transform(X, x);
-  lpcn_compute_band_energy(Ex, X);
+    float x[WINDOW_SIZE];
+    OAC_COPY(x, st->analysis_mem, OVERLAP_SIZE);
+    OAC_COPY(&x[OVERLAP_SIZE], in, FRAME_SIZE);
+    OAC_COPY(st->analysis_mem, &in[FRAME_SIZE - OVERLAP_SIZE], OVERLAP_SIZE);
+    apply_window(x);
+    forward_transform(X, x);
+    lpcn_compute_band_energy(Ex, X);
 }
 
 static void biquad(float *y, float mem[2], const float *x, const float *b, const float *a, int N) {
-  int i;
-  float mem0, mem1;
-  mem0 = mem[0];
-  mem1 = mem[1];
-  for (i=0;i<N;i++) {
-    float xi, yi, mem00;
-    xi = x[i];
-    yi = x[i] + mem0;
-    mem00 = mem0;
-    /* Original code:
-    mem0 = mem1 + (b[0]*xi - a[0]*yi);
-    mem1 = (b[1]*xi - a[1]*yi);
-    Modified to reduce dependency chains: (the +1e-30f forces the ordering and has no effect on the output)
-    */
-    mem0 = (b[0]-a[0])*xi + mem1 - a[0]*mem0;
-    mem1 = (b[1]-a[1])*xi + 1e-30f - a[1]*mem00;
-    y[i] = yi;
-  }
-  mem[0] = mem0;
-  mem[1] = mem1;
+    int i;
+    float mem0, mem1;
+    mem0 = mem[0];
+    mem1 = mem[1];
+    for (i = 0; i < N; i++) {
+        float xi, yi, mem00;
+        xi = x[i];
+        yi = x[i] + mem0;
+        mem00 = mem0;
+        /* Original code:
+           mem0 = mem1 + (b[0]*xi - a[0]*yi);
+           mem1 = (b[1]*xi - a[1]*yi);
+           Modified to reduce dependency chains: (the +1e-30f forces the ordering and has no effect on the output)
+         */
+        mem0 = (b[0] - a[0])*xi + mem1 - a[0]*mem0;
+        mem1 = (b[1] - a[1])*xi + 1e-30f - a[1]*mem00;
+        y[i] = yi;
+    }
+    mem[0] = mem0;
+    mem[1] = mem1;
 }
 
 #define celt_log10(x) (0.3010299957f*celt_log2(x))
 
 void compute_frame_features(LPCNetEncState *st, const float *in, int arch) {
-  float aligned_in[FRAME_SIZE];
-  int i;
-  float Ly[NB_BANDS];
-  float follow, logMax;
-  kiss_fft_cpx X[FREQ_SIZE];
-  float Ex[NB_BANDS];
-  float xcorr[PITCH_MAX_PERIOD];
-  float ener0;
-  float ener;
-  float x[FRAME_SIZE+LPC_ORDER];
-  float frame_corr;
-  float xy, xx, yy;
-  int pitch;
-  float ener_norm[PITCH_MAX_PERIOD - PITCH_MIN_PERIOD];
-  /* [b,a]=ellip(2, 2, 20, 1200/8000); */
-  static const float lp_b[2] = {-0.84946f, 1.f};
-  static const float lp_a[2] = {-1.54220f, 0.70781f};
-  OAC_COPY(aligned_in, &st->analysis_mem[OVERLAP_SIZE-TRAINING_OFFSET], TRAINING_OFFSET);
-  frame_analysis(st, X, Ex, in);
-  st->if_features[0] = MAX16(-1.f, MIN16(1.f, (1.f/64)*(10.f*celt_log10(1e-15f + X[0].r*X[0].r)-6.f)));
-  for (i=1;i<PITCH_IF_MAX_FREQ;i++) {
-    kiss_fft_cpx prod;
-    float norm_1;
-    C_MULC(prod, X[i], st->prev_if[i]);
-    norm_1 = 1.f/sqrt(1e-15f + prod.r*prod.r + prod.i*prod.i);
-    C_MULBYSCALAR(prod, norm_1);
-    st->if_features[3*i-2] = prod.r;
-    st->if_features[3*i-1] = prod.i;
-    st->if_features[3*i] = MAX16(-1.f, MIN16(1.f, (1.f/64)*(10.f*celt_log10(1e-15f + X[i].r*X[i].r + X[i].i*X[i].i)-6.f)));
-  }
-  OAC_COPY(st->prev_if, X, PITCH_IF_MAX_FREQ);
-  /*for (i=0;i<88;i++) printf("%f ", st->if_features[i]);printf("\n");*/
-  logMax = -2;
-  follow = -2;
-  for (i=0;i<NB_BANDS;i++) {
-    Ly[i] = celt_log10(1e-2f+Ex[i]);
-    Ly[i] = MAX16(logMax-8, MAX16(follow-2.5f, Ly[i]));
-    logMax = MAX16(logMax, Ly[i]);
-    follow = MAX16(follow-2.5f, Ly[i]);
-  }
-  dct(st->features, Ly);
-  st->features[0] -= 4;
-  lpc_from_cepstrum(st->lpc, st->features);
-  for (i=0;i<LPC_ORDER;i++) st->features[NB_BANDS+2+i] = st->lpc[i];
-  OAC_MOVE(st->exc_buf, &st->exc_buf[FRAME_SIZE], PITCH_MAX_PERIOD);
-  OAC_MOVE(st->lp_buf, &st->lp_buf[FRAME_SIZE], PITCH_MAX_PERIOD);
-  OAC_COPY(&aligned_in[TRAINING_OFFSET], in, FRAME_SIZE-TRAINING_OFFSET);
-  OAC_COPY(&x[0], st->pitch_mem, LPC_ORDER);
-  OAC_COPY(&x[LPC_ORDER], aligned_in, FRAME_SIZE);
-  OAC_COPY(st->pitch_mem, &aligned_in[FRAME_SIZE-LPC_ORDER], LPC_ORDER);
-  celt_fir(&x[LPC_ORDER], st->lpc, &st->lp_buf[PITCH_MAX_PERIOD], FRAME_SIZE, LPC_ORDER, arch);
-  for (i=0;i<FRAME_SIZE;i++) {
-    st->exc_buf[PITCH_MAX_PERIOD+i] = st->lp_buf[PITCH_MAX_PERIOD+i] + .7f*st->pitch_filt;
-    st->pitch_filt = st->lp_buf[PITCH_MAX_PERIOD+i];
-    /*printf("%f\n", st->exc_buf[PITCH_MAX_PERIOD+i]);*/
-  }
-  biquad(&st->lp_buf[PITCH_MAX_PERIOD], st->lp_mem, &st->lp_buf[PITCH_MAX_PERIOD], lp_b, lp_a, FRAME_SIZE);
-  {
-    double ener1;
-    float *buf = st->exc_buf;
-    celt_pitch_xcorr(&buf[PITCH_MAX_PERIOD], buf, xcorr, FRAME_SIZE, PITCH_MAX_PERIOD-PITCH_MIN_PERIOD, arch);
-    ener0 = celt_inner_prod(&buf[PITCH_MAX_PERIOD], &buf[PITCH_MAX_PERIOD], FRAME_SIZE, arch);
-    ener1 = celt_inner_prod(&buf[0], &buf[0], FRAME_SIZE, arch);
-    /*printf("%f\n", st->frame_weight[sub]);*/
-    for (i=0;i<PITCH_MAX_PERIOD-PITCH_MIN_PERIOD;i++) {
-      ener = 1 + ener0 + ener1;
-      st->xcorr_features[i] = 2*xcorr[i];
-      ener_norm[i] = ener;
-      ener1 += buf[i+FRAME_SIZE]*(double)buf[i+FRAME_SIZE] - buf[i]*(double)buf[i];
-      /*printf("%f ", st->xcorr_features[i]);*/
+    float aligned_in[FRAME_SIZE];
+    int i;
+    float Ly[NB_BANDS];
+    float follow, logMax;
+    kiss_fft_cpx X[FREQ_SIZE];
+    float Ex[NB_BANDS];
+    float xcorr[PITCH_MAX_PERIOD];
+    float ener0;
+    float ener;
+    float x[FRAME_SIZE + LPC_ORDER];
+    float frame_corr;
+    float xy, xx, yy;
+    int pitch;
+    float ener_norm[PITCH_MAX_PERIOD - PITCH_MIN_PERIOD];
+    /* [b,a]=ellip(2, 2, 20, 1200/8000); */
+    static const float lp_b[2] = {-0.84946f, 1.f};
+    static const float lp_a[2] = {-1.54220f, 0.70781f};
+    OAC_COPY(aligned_in, &st->analysis_mem[OVERLAP_SIZE - TRAINING_OFFSET], TRAINING_OFFSET);
+    frame_analysis(st, X, Ex, in);
+    st->if_features[0] = MAX16(-1.f, MIN16(1.f, (1.f/64)*(10.f*celt_log10(1e-15f + X[0].r*X[0].r) - 6.f)));
+    for (i = 1; i < PITCH_IF_MAX_FREQ; i++) {
+        kiss_fft_cpx prod;
+        float norm_1;
+        C_MULC(prod, X[i], st->prev_if[i]);
+        norm_1 = 1.f/sqrt(1e-15f + prod.r*prod.r + prod.i*prod.i);
+        C_MULBYSCALAR(prod, norm_1);
+        st->if_features[3*i - 2] = prod.r;
+        st->if_features[3*i - 1] = prod.i;
+        st->if_features[3*i] = MAX16(-1.f,
+        MIN16(1.f, (1.f/64)*(10.f*celt_log10(1e-15f + X[i].r*X[i].r + X[i].i*X[i].i) - 6.f)));
+    }
+    OAC_COPY(st->prev_if, X, PITCH_IF_MAX_FREQ);
+    /*for (i=0;i<88;i++) printf("%f ", st->if_features[i]);printf("\n");*/
+    logMax = -2;
+    follow = -2;
+    for (i = 0; i < NB_BANDS; i++) {
+        Ly[i] = celt_log10(1e-2f + Ex[i]);
+        Ly[i] = MAX16(logMax - 8, MAX16(follow - 2.5f, Ly[i]));
+        logMax = MAX16(logMax, Ly[i]);
+        follow = MAX16(follow - 2.5f, Ly[i]);
     }
-    /* Split in a separate loop so the compiler can vectorize it */
-    for (i=0;i<PITCH_MAX_PERIOD-PITCH_MIN_PERIOD;i++) {
-      st->xcorr_features[i] /= ener_norm[i];
+    dct(st->features, Ly);
+    st->features[0] -= 4;
+    lpc_from_cepstrum(st->lpc, st->features);
+    for (i = 0; i < LPC_ORDER; i++) st->features[NB_BANDS + 2 + i] = st->lpc[i];
+    OAC_MOVE(st->exc_buf, &st->exc_buf[FRAME_SIZE], PITCH_MAX_PERIOD);
+    OAC_MOVE(st->lp_buf, &st->lp_buf[FRAME_SIZE], PITCH_MAX_PERIOD);
+    OAC_COPY(&aligned_in[TRAINING_OFFSET], in, FRAME_SIZE - TRAINING_OFFSET);
+    OAC_COPY(&x[0], st->pitch_mem, LPC_ORDER);
+    OAC_COPY(&x[LPC_ORDER], aligned_in, FRAME_SIZE);
+    OAC_COPY(st->pitch_mem, &aligned_in[FRAME_SIZE - LPC_ORDER], LPC_ORDER);
+    celt_fir(&x[LPC_ORDER], st->lpc, &st->lp_buf[PITCH_MAX_PERIOD], FRAME_SIZE, LPC_ORDER, arch);
+    for (i = 0; i < FRAME_SIZE; i++) {
+        st->exc_buf[PITCH_MAX_PERIOD + i] = st->lp_buf[PITCH_MAX_PERIOD + i] + .7f*st->pitch_filt;
+        st->pitch_filt = st->lp_buf[PITCH_MAX_PERIOD + i];
+        /*printf("%f\n", st->exc_buf[PITCH_MAX_PERIOD+i]);*/
     }
-    /*printf("\n");*/
-  }
-  st->dnn_pitch = compute_pitchdnn(&st->pitchdnn, st->if_features, st->xcorr_features, arch);
-  pitch = (int)floor(.5+256./pow(2.f,((1./60.)*((st->dnn_pitch+1.5)*60))));
-  xx = celt_inner_prod(&st->lp_buf[PITCH_MAX_PERIOD], &st->lp_buf[PITCH_MAX_PERIOD], FRAME_SIZE, arch);
-  yy = celt_inner_prod(&st->lp_buf[PITCH_MAX_PERIOD-pitch], &st->lp_buf[PITCH_MAX_PERIOD-pitch], FRAME_SIZE, arch);
-  xy = celt_inner_prod(&st->lp_buf[PITCH_MAX_PERIOD], &st->lp_buf[PITCH_MAX_PERIOD-pitch], FRAME_SIZE, arch);
-  /*printf("%f %f\n", frame_corr, xy/sqrt(1e-15+xx*yy));*/
-  frame_corr = xy/sqrt(1+xx*yy);
-  frame_corr = log(1.f+exp(5.f*frame_corr))/log(1+exp(5.f));
-  st->features[NB_BANDS] = st->dnn_pitch;
-  st->features[NB_BANDS + 1] = frame_corr-.5f;
+    biquad(&st->lp_buf[PITCH_MAX_PERIOD], st->lp_mem, &st->lp_buf[PITCH_MAX_PERIOD], lp_b, lp_a, FRAME_SIZE);
+    {
+        double ener1;
+        float *buf = st->exc_buf;
+        celt_pitch_xcorr(&buf[PITCH_MAX_PERIOD], buf, xcorr, FRAME_SIZE, PITCH_MAX_PERIOD - PITCH_MIN_PERIOD, arch);
+        ener0 = celt_inner_prod(&buf[PITCH_MAX_PERIOD], &buf[PITCH_MAX_PERIOD], FRAME_SIZE, arch);
+        ener1 = celt_inner_prod(&buf[0], &buf[0], FRAME_SIZE, arch);
+        /*printf("%f\n", st->frame_weight[sub]);*/
+        for (i = 0; i < PITCH_MAX_PERIOD - PITCH_MIN_PERIOD; i++) {
+            ener = 1 + ener0 + ener1;
+            st->xcorr_features[i] = 2*xcorr[i];
+            ener_norm[i] = ener;
+            ener1 += buf[i + FRAME_SIZE]*(double)buf[i + FRAME_SIZE] - buf[i]*(double)buf[i];
+            /*printf("%f ", st->xcorr_features[i]);*/
+        }
+        /* Split in a separate loop so the compiler can vectorize it */
+        for (i = 0; i < PITCH_MAX_PERIOD - PITCH_MIN_PERIOD; i++) {
+            st->xcorr_features[i] /= ener_norm[i];
+        }
+        /*printf("\n");*/
+    }
+    st->dnn_pitch = compute_pitchdnn(&st->pitchdnn, st->if_features, st->xcorr_features, arch);
+    pitch = (int)floor(.5 + 256./pow(2.f, ((1./60.)*((st->dnn_pitch + 1.5)*60))));
+    xx = celt_inner_prod(&st->lp_buf[PITCH_MAX_PERIOD], &st->lp_buf[PITCH_MAX_PERIOD], FRAME_SIZE, arch);
+    yy = celt_inner_prod(&st->lp_buf[PITCH_MAX_PERIOD - pitch], &st->lp_buf[PITCH_MAX_PERIOD - pitch], FRAME_SIZE,
+    arch);
+    xy = celt_inner_prod(&st->lp_buf[PITCH_MAX_PERIOD], &st->lp_buf[PITCH_MAX_PERIOD - pitch], FRAME_SIZE, arch);
+    /*printf("%f %f\n", frame_corr, xy/sqrt(1e-15+xx*yy));*/
+    frame_corr = xy/sqrt(1 + xx*yy);
+    frame_corr = log(1.f + exp(5.f*frame_corr))/log(1 + exp(5.f));
+    st->features[NB_BANDS] = st->dnn_pitch;
+    st->features[NB_BANDS + 1] = frame_corr - .5f;
 }
 
 void preemphasis(float *y, float *mem, const float *x, float coef, int N) {
-  int i;
-  for (i=0;i<N;i++) {
-    float yi;
-    yi = x[i] + *mem;
-    *mem = -coef*x[i];
-    y[i] = yi;
-  }
+    int i;
+    for (i = 0; i < N; i++) {
+        float yi;
+        yi = x[i] + *mem;
+        *mem = -coef*x[i];
+        y[i] = yi;
+    }
 }
 
-static int lpcnet_compute_single_frame_features_impl(LPCNetEncState *st, float *x, float features[NB_TOTAL_FEATURES], int arch) {
-  preemphasis(x, &st->mem_preemph, x, PREEMPHASIS, FRAME_SIZE);
-  compute_frame_features(st, x, arch);
-  OAC_COPY(features, &st->features[0], NB_TOTAL_FEATURES);
-  return 0;
+static int lpcnet_compute_single_frame_features_impl(LPCNetEncState *st, float *x, float features[NB_TOTAL_FEATURES],
+                                                     int arch) {
+    preemphasis(x, &st->mem_preemph, x, PREEMPHASIS, FRAME_SIZE);
+    compute_frame_features(st, x, arch);
+    OAC_COPY(features, &st->features[0], NB_TOTAL_FEATURES);
+    return 0;
 }
 
-int lpcnet_compute_single_frame_features(LPCNetEncState *st, const oac_int16 *pcm, float features[NB_TOTAL_FEATURES], int arch) {
-  int i;
-  float x[FRAME_SIZE];
-  for (i=0;i<FRAME_SIZE;i++) x[i] = pcm[i];
-  lpcnet_compute_single_frame_features_impl(st, x, features, arch);
-  return 0;
+int lpcnet_compute_single_frame_features(LPCNetEncState *st, const oac_int16 *pcm, float features[NB_TOTAL_FEATURES],
+                                         int arch) {
+    int i;
+    float x[FRAME_SIZE];
+    for (i = 0; i < FRAME_SIZE; i++) x[i] = pcm[i];
+    lpcnet_compute_single_frame_features_impl(st, x, features, arch);
+    return 0;
 }
 
-int lpcnet_compute_single_frame_features_float(LPCNetEncState *st, const float *pcm, float features[NB_TOTAL_FEATURES], int arch) {
-  int i;
-  float x[FRAME_SIZE];
-  for (i=0;i<FRAME_SIZE;i++) x[i] = pcm[i];
-  lpcnet_compute_single_frame_features_impl(st, x, features, arch);
-  return 0;
+int lpcnet_compute_single_frame_features_float(LPCNetEncState *st, const float *pcm, float features[NB_TOTAL_FEATURES],
+                                               int arch) {
+    int i;
+    float x[FRAME_SIZE];
+    for (i = 0; i < FRAME_SIZE; i++) x[i] = pcm[i];
+    lpcnet_compute_single_frame_features_impl(st, x, features, arch);
+    return 0;
 }
diff --git a/dnn/lpcnet_plc.c b/dnn/lpcnet_plc.c
index 39afaa097..4b8e9d30d 100644
--- a/dnn/lpcnet_plc.c
+++ b/dnn/lpcnet_plc.c
@@ -22,10 +22,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "lpcnet_private.h"
@@ -36,172 +36,172 @@
 #include "cpu_support.h"
 
 #ifndef M_PI
-#define M_PI 3.141592653
+# define M_PI 3.141592653
 #endif
 
 /* Comment this out to have LPCNet update its state on every good packet (slow). */
 #define PLC_SKIP_UPDATES
 
 void lpcnet_plc_reset(LPCNetPLCState *st) {
-  OAC_CLEAR((char*)&st->LPCNET_PLC_RESET_START,
-          sizeof(LPCNetPLCState)-
-          ((char*)&st->LPCNET_PLC_RESET_START - (char*)st));
-  lpcnet_encoder_init(&st->enc);
-  OAC_CLEAR(st->pcm, PLC_BUF_SIZE);
-  st->blend = 0;
-  st->loss_count = 0;
-  st->analysis_gap = 1;
-  st->analysis_pos = PLC_BUF_SIZE;
-  st->predict_pos = PLC_BUF_SIZE;
+    OAC_CLEAR((char*)&st->LPCNET_PLC_RESET_START,
+          sizeof(LPCNetPLCState)
+        - ((char*)&st->LPCNET_PLC_RESET_START - (char*)st));
+    lpcnet_encoder_init(&st->enc);
+    OAC_CLEAR(st->pcm, PLC_BUF_SIZE);
+    st->blend = 0;
+    st->loss_count = 0;
+    st->analysis_gap = 1;
+    st->analysis_pos = PLC_BUF_SIZE;
+    st->predict_pos = PLC_BUF_SIZE;
 }
 
 int lpcnet_plc_init(LPCNetPLCState *st) {
-  int ret;
-  st->arch = oac_select_arch();
-  fargan_init(&st->fargan);
-  lpcnet_encoder_init(&st->enc);
-  st->loaded = 0;
+    int ret;
+    st->arch = oac_select_arch();
+    fargan_init(&st->fargan);
+    lpcnet_encoder_init(&st->enc);
+    st->loaded = 0;
 #ifndef USE_WEIGHTS_FILE
-  ret = init_plcmodel(&st->model, plcmodel_arrays);
-  if (ret == 0) st->loaded = 1;
+    ret = init_plcmodel(&st->model, plcmodel_arrays);
+    if (ret == 0) st->loaded = 1;
 #else
-  ret = 0;
+    ret = 0;
 #endif
-  celt_assert(ret == 0);
-  lpcnet_plc_reset(st);
-  return ret;
+    celt_assert(ret == 0);
+    lpcnet_plc_reset(st);
+    return ret;
 }
 
 int lpcnet_plc_load_model(LPCNetPLCState *st, const void *data, int len) {
-  WeightArray *list;
-  int ret;
-  parse_weights(&list, data, len);
-  ret = init_plcmodel(&st->model, list);
-  oac_free(list);
-  if (ret == 0) {
-    ret = lpcnet_encoder_load_model(&st->enc, data, len);
-  }
-  if (ret == 0) {
-    ret = fargan_load_model(&st->fargan, data, len);
-  }
-  if (ret == 0) st->loaded = 1;
-  return ret;
+    WeightArray *list;
+    int ret;
+    parse_weights(&list, data, len);
+    ret = init_plcmodel(&st->model, list);
+    oac_free(list);
+    if (ret == 0) {
+        ret = lpcnet_encoder_load_model(&st->enc, data, len);
+    }
+    if (ret == 0) {
+        ret = fargan_load_model(&st->fargan, data, len);
+    }
+    if (ret == 0) st->loaded = 1;
+    return ret;
 }
 
 void lpcnet_plc_fec_add(LPCNetPLCState *st, const float *features) {
-  if (features == NULL) {
-    st->fec_skip++;
-    return;
-  }
-  celt_assert(st->fec_fill_pos < PLC_MAX_FEC);
-  OAC_COPY(&st->fec[st->fec_fill_pos][0], features, NB_FEATURES);
-  st->fec_fill_pos++;
+    if (features == NULL) {
+        st->fec_skip++;
+        return;
+    }
+    celt_assert(st->fec_fill_pos < PLC_MAX_FEC);
+    OAC_COPY(&st->fec[st->fec_fill_pos][0], features, NB_FEATURES);
+    st->fec_fill_pos++;
 }
 
 void lpcnet_plc_fec_clear(LPCNetPLCState *st) {
-  st->fec_read_pos = st->fec_fill_pos = st->fec_skip = 0;
+    st->fec_read_pos = st->fec_fill_pos = st->fec_skip = 0;
 }
 
 
 static void compute_plc_pred(LPCNetPLCState *st, float *out, const float *in) {
-  float tmp[PLC_DENSE_IN_OUT_SIZE];
-  PLCModel *model = &st->model;
-  PLCNetState *net = &st->plc_net;
-  celt_assert(st->loaded);
-  compute_generic_dense(&model->plc_dense_in, tmp, in, ACTIVATION_TANH, st->arch);
-  compute_generic_gru(&model->plc_gru1_input, &model->plc_gru1_recurrent, net->gru1_state, tmp, st->arch);
-  compute_generic_gru(&model->plc_gru2_input, &model->plc_gru2_recurrent, net->gru2_state, net->gru1_state, st->arch);
-  compute_generic_dense(&model->plc_dense_out, out, net->gru2_state, ACTIVATION_LINEAR, st->arch);
+    float tmp[PLC_DENSE_IN_OUT_SIZE];
+    PLCModel *model = &st->model;
+    PLCNetState *net = &st->plc_net;
+    celt_assert(st->loaded);
+    compute_generic_dense(&model->plc_dense_in, tmp, in, ACTIVATION_TANH, st->arch);
+    compute_generic_gru(&model->plc_gru1_input, &model->plc_gru1_recurrent, net->gru1_state, tmp, st->arch);
+    compute_generic_gru(&model->plc_gru2_input, &model->plc_gru2_recurrent, net->gru2_state, net->gru1_state, st->arch);
+    compute_generic_dense(&model->plc_dense_out, out, net->gru2_state, ACTIVATION_LINEAR, st->arch);
 }
 
 static int get_fec_or_pred(LPCNetPLCState *st, float *out) {
-  if (st->fec_read_pos != st->fec_fill_pos && st->fec_skip==0) {
-    float plc_features[2*NB_BANDS+NB_FEATURES+1] = {0};
-    float discard[NB_FEATURES];
-    OAC_COPY(out, &st->fec[st->fec_read_pos][0], NB_FEATURES);
-    st->fec_read_pos++;
-    /* Update PLC state using FEC, so without Burg features. */
-    OAC_COPY(&plc_features[2*NB_BANDS], out, NB_FEATURES);
-    plc_features[2*NB_BANDS+NB_FEATURES] = -1;
-    compute_plc_pred(st, discard, plc_features);
-    return 1;
-  } else {
-    float zeros[2*NB_BANDS+NB_FEATURES+1] = {0};
-    compute_plc_pred(st, out, zeros);
-    if (st->fec_skip > 0) st->fec_skip--;
-    return 0;
-  }
+    if (st->fec_read_pos != st->fec_fill_pos && st->fec_skip == 0) {
+        float plc_features[2*NB_BANDS + NB_FEATURES + 1] = {0};
+        float discard[NB_FEATURES];
+        OAC_COPY(out, &st->fec[st->fec_read_pos][0], NB_FEATURES);
+        st->fec_read_pos++;
+        /* Update PLC state using FEC, so without Burg features. */
+        OAC_COPY(&plc_features[2*NB_BANDS], out, NB_FEATURES);
+        plc_features[2*NB_BANDS + NB_FEATURES] = -1;
+        compute_plc_pred(st, discard, plc_features);
+        return 1;
+    } else {
+        float zeros[2*NB_BANDS + NB_FEATURES + 1] = {0};
+        compute_plc_pred(st, out, zeros);
+        if (st->fec_skip > 0) st->fec_skip--;
+        return 0;
+    }
 }
 
 static void queue_features(LPCNetPLCState *st, const float *features) {
-  OAC_MOVE(&st->cont_features[0], &st->cont_features[NB_FEATURES], (CONT_VECTORS-1)*NB_FEATURES);
-  OAC_COPY(&st->cont_features[(CONT_VECTORS-1)*NB_FEATURES], features, NB_FEATURES);
+    OAC_MOVE(&st->cont_features[0], &st->cont_features[NB_FEATURES], (CONT_VECTORS - 1)*NB_FEATURES);
+    OAC_COPY(&st->cont_features[(CONT_VECTORS - 1)*NB_FEATURES], features, NB_FEATURES);
 }
 
 /* In this causal version of the code, the DNN model implemented by compute_plc_pred()
    needs to generate two feature vectors to conceal the first lost packet.*/
 
 int lpcnet_plc_update(LPCNetPLCState *st, oac_int16 *pcm) {
-  int i;
-  if (st->analysis_pos - FRAME_SIZE >= 0) st->analysis_pos -= FRAME_SIZE;
-  else st->analysis_gap = 1;
-  if (st->predict_pos - FRAME_SIZE >= 0) st->predict_pos -= FRAME_SIZE;
-  OAC_MOVE(st->pcm, &st->pcm[FRAME_SIZE], PLC_BUF_SIZE-FRAME_SIZE);
-  for (i=0;i<FRAME_SIZE;i++) st->pcm[PLC_BUF_SIZE-FRAME_SIZE+i] = (1.f/32768.f)*pcm[i];
-  st->loss_count = 0;
-  st->blend = 0;
-  return 0;
+    int i;
+    if (st->analysis_pos - FRAME_SIZE >= 0) st->analysis_pos -= FRAME_SIZE;
+    else st->analysis_gap = 1;
+    if (st->predict_pos - FRAME_SIZE >= 0) st->predict_pos -= FRAME_SIZE;
+    OAC_MOVE(st->pcm, &st->pcm[FRAME_SIZE], PLC_BUF_SIZE - FRAME_SIZE);
+    for (i = 0; i < FRAME_SIZE; i++) st->pcm[PLC_BUF_SIZE - FRAME_SIZE + i] = (1.f/32768.f)*pcm[i];
+    st->loss_count = 0;
+    st->blend = 0;
+    return 0;
 }
 
 static const float att_table[10] = {0, 0,  -.2, -.2,  -.4, -.4,  -.8, -.8, -1.6, -1.6};
 int lpcnet_plc_conceal(LPCNetPLCState *st, oac_int16 *pcm) {
-  int i;
-  celt_assert(st->loaded);
-  if (st->blend == 0) {
-    int count = 0;
-    st->plc_net = st->plc_bak[0];
-    while (st->analysis_pos + FRAME_SIZE <= PLC_BUF_SIZE) {
-      float x[FRAME_SIZE];
-      float plc_features[2*NB_BANDS+NB_FEATURES+1];
-      celt_assert(st->analysis_pos >= 0);
-      for (i=0;i<FRAME_SIZE;i++) x[i] = 32768.f*st->pcm[st->analysis_pos+i];
-      burg_cepstral_analysis(plc_features, x);
-      lpcnet_compute_single_frame_features_float(&st->enc, x, st->features, st->arch);
-      if ((!st->analysis_gap || count>0) && st->analysis_pos >= st->predict_pos) {
+    int i;
+    celt_assert(st->loaded);
+    if (st->blend == 0) {
+        int count = 0;
+        st->plc_net = st->plc_bak[0];
+        while (st->analysis_pos + FRAME_SIZE <= PLC_BUF_SIZE) {
+            float x[FRAME_SIZE];
+            float plc_features[2*NB_BANDS + NB_FEATURES + 1];
+            celt_assert(st->analysis_pos >= 0);
+            for (i = 0; i < FRAME_SIZE; i++) x[i] = 32768.f*st->pcm[st->analysis_pos + i];
+            burg_cepstral_analysis(plc_features, x);
+            lpcnet_compute_single_frame_features_float(&st->enc, x, st->features, st->arch);
+            if ((!st->analysis_gap || count > 0) && st->analysis_pos >= st->predict_pos) {
+                queue_features(st, st->features);
+                OAC_COPY(&plc_features[2*NB_BANDS], st->features, NB_FEATURES);
+                plc_features[2*NB_BANDS + NB_FEATURES] = 1;
+                st->plc_bak[0] = st->plc_bak[1];
+                st->plc_bak[1] = st->plc_net;
+                compute_plc_pred(st, st->features, plc_features);
+            }
+            st->analysis_pos += FRAME_SIZE;
+            count++;
+        }
+        st->plc_bak[0] = st->plc_bak[1];
+        st->plc_bak[1] = st->plc_net;
+        get_fec_or_pred(st, st->features);
         queue_features(st, st->features);
-        OAC_COPY(&plc_features[2*NB_BANDS], st->features, NB_FEATURES);
-        plc_features[2*NB_BANDS+NB_FEATURES] = 1;
         st->plc_bak[0] = st->plc_bak[1];
         st->plc_bak[1] = st->plc_net;
-        compute_plc_pred(st, st->features, plc_features);
-      }
-      st->analysis_pos += FRAME_SIZE;
-      count++;
+        get_fec_or_pred(st, st->features);
+        queue_features(st, st->features);
+        fargan_cont(&st->fargan, &st->pcm[PLC_BUF_SIZE - FARGAN_CONT_SAMPLES], st->cont_features);
+        st->analysis_gap = 0;
     }
     st->plc_bak[0] = st->plc_bak[1];
     st->plc_bak[1] = st->plc_net;
-    get_fec_or_pred(st, st->features);
-    queue_features(st, st->features);
-    st->plc_bak[0] = st->plc_bak[1];
-    st->plc_bak[1] = st->plc_net;
-    get_fec_or_pred(st, st->features);
+    if (get_fec_or_pred(st, st->features)) st->loss_count = 0;
+    else st->loss_count++;
+    if (st->loss_count >= 10) st->features[0] = MAX16(-15, st->features[0] + att_table[9] - 2*(st->loss_count - 9));
+    else st->features[0] = MAX16(-15, st->features[0] + att_table[st->loss_count]);
+    fargan_synthesize_int(&st->fargan, pcm, &st->features[0]);
     queue_features(st, st->features);
-    fargan_cont(&st->fargan, &st->pcm[PLC_BUF_SIZE-FARGAN_CONT_SAMPLES], st->cont_features);
-    st->analysis_gap = 0;
-  }
-  st->plc_bak[0] = st->plc_bak[1];
-  st->plc_bak[1] = st->plc_net;
-  if (get_fec_or_pred(st, st->features)) st->loss_count = 0;
-  else st->loss_count++;
-  if (st->loss_count >= 10) st->features[0] = MAX16(-15, st->features[0]+att_table[9] - 2*(st->loss_count-9));
-  else st->features[0] = MAX16(-15, st->features[0]+att_table[st->loss_count]);
-  fargan_synthesize_int(&st->fargan, pcm, &st->features[0]);
-  queue_features(st, st->features);
-  if (st->analysis_pos - FRAME_SIZE >= 0) st->analysis_pos -= FRAME_SIZE;
-  else st->analysis_gap = 1;
-  st->predict_pos = PLC_BUF_SIZE;
-  OAC_MOVE(st->pcm, &st->pcm[FRAME_SIZE], PLC_BUF_SIZE-FRAME_SIZE);
-  for (i=0;i<FRAME_SIZE;i++) st->pcm[PLC_BUF_SIZE-FRAME_SIZE+i] = (1.f/32768.f)*pcm[i];
-  st->blend = 1;
-  return 0;
+    if (st->analysis_pos - FRAME_SIZE >= 0) st->analysis_pos -= FRAME_SIZE;
+    else st->analysis_gap = 1;
+    st->predict_pos = PLC_BUF_SIZE;
+    OAC_MOVE(st->pcm, &st->pcm[FRAME_SIZE], PLC_BUF_SIZE - FRAME_SIZE);
+    for (i = 0; i < FRAME_SIZE; i++) st->pcm[PLC_BUF_SIZE - FRAME_SIZE + i] = (1.f/32768.f)*pcm[i];
+    st->blend = 1;
+    return 0;
 }
diff --git a/dnn/lpcnet_private.h b/dnn/lpcnet_private.h
index 904162e9c..0af48d3cc 100644
--- a/dnn/lpcnet_private.h
+++ b/dnn/lpcnet_private.h
@@ -10,7 +10,7 @@
 
 
 #define PITCH_FRAME_SIZE 320
-#define PITCH_BUF_SIZE (PITCH_MAX_PERIOD+PITCH_FRAME_SIZE)
+#define PITCH_BUF_SIZE (PITCH_MAX_PERIOD + PITCH_FRAME_SIZE)
 
 #define PLC_MAX_FEC 104
 #define MAX_FEATURE_BUFFER_SIZE 4
@@ -22,53 +22,53 @@
 
 #define FEATURES_DELAY 1
 
-struct LPCNetEncState{
-  PitchDNNState pitchdnn;
-  float analysis_mem[OVERLAP_SIZE];
-  float mem_preemph;
-  kiss_fft_cpx prev_if[PITCH_IF_MAX_FREQ];
-  float if_features[PITCH_IF_FEATURES];
-  float xcorr_features[PITCH_MAX_PERIOD - PITCH_MIN_PERIOD];
-  float dnn_pitch;
-  float pitch_mem[LPC_ORDER];
-  float pitch_filt;
-  float exc_buf[PITCH_BUF_SIZE];
-  float lp_buf[PITCH_BUF_SIZE];
-  float lp_mem[4];
-  float lpc[LPC_ORDER];
-  float features[NB_TOTAL_FEATURES];
-  float sig_mem[LPC_ORDER];
-  float burg_cepstrum[2*NB_BANDS];
+struct LPCNetEncState {
+    PitchDNNState pitchdnn;
+    float analysis_mem[OVERLAP_SIZE];
+    float mem_preemph;
+    kiss_fft_cpx prev_if[PITCH_IF_MAX_FREQ];
+    float if_features[PITCH_IF_FEATURES];
+    float xcorr_features[PITCH_MAX_PERIOD - PITCH_MIN_PERIOD];
+    float dnn_pitch;
+    float pitch_mem[LPC_ORDER];
+    float pitch_filt;
+    float exc_buf[PITCH_BUF_SIZE];
+    float lp_buf[PITCH_BUF_SIZE];
+    float lp_mem[4];
+    float lpc[LPC_ORDER];
+    float features[NB_TOTAL_FEATURES];
+    float sig_mem[LPC_ORDER];
+    float burg_cepstrum[2*NB_BANDS];
 };
 
 typedef struct {
-  float gru1_state[PLC_GRU1_STATE_SIZE];
-  float gru2_state[PLC_GRU2_STATE_SIZE];
+    float gru1_state[PLC_GRU1_STATE_SIZE];
+    float gru2_state[PLC_GRU2_STATE_SIZE];
 } PLCNetState;
 
-#define PLC_BUF_SIZE ((CONT_VECTORS+10)*FRAME_SIZE)
+#define PLC_BUF_SIZE ((CONT_VECTORS + 10)*FRAME_SIZE)
 struct LPCNetPLCState {
-  PLCModel model;
-  FARGANState fargan;
-  LPCNetEncState enc;
-  int loaded;
-  int arch;
+    PLCModel model;
+    FARGANState fargan;
+    LPCNetEncState enc;
+    int loaded;
+    int arch;
 
 #define LPCNET_PLC_RESET_START fec
-  float fec[PLC_MAX_FEC][NB_FEATURES];
-  int analysis_gap;
-  int fec_read_pos;
-  int fec_fill_pos;
-  int fec_skip;
-  int analysis_pos;
-  int predict_pos;
-  float pcm[PLC_BUF_SIZE];
-  int blend;
-  float features[NB_TOTAL_FEATURES];
-  float cont_features[CONT_VECTORS*NB_FEATURES];
-  int loss_count;
-  PLCNetState plc_net;
-  PLCNetState plc_bak[2];
+    float fec[PLC_MAX_FEC][NB_FEATURES];
+    int analysis_gap;
+    int fec_read_pos;
+    int fec_fill_pos;
+    int fec_skip;
+    int analysis_pos;
+    int predict_pos;
+    float pcm[PLC_BUF_SIZE];
+    int blend;
+    float features[NB_TOTAL_FEATURES];
+    float cont_features[CONT_VECTORS*NB_FEATURES];
+    int loss_count;
+    PLCNetState plc_net;
+    PLCNetState plc_bak[2];
 };
 
 void preemphasis(float *y, float *mem, const float *x, float coef, int N);
@@ -76,7 +76,8 @@ void preemphasis(float *y, float *mem, const float *x, float coef, int N);
 void compute_frame_features(LPCNetEncState *st, const float *in, int arch);
 
 void lpcnet_reset_signal(LPCNetState *lpcnet);
-void run_frame_network(LPCNetState *lpcnet, float *gru_a_condition, float *gru_b_condition, float *lpc, const float *features);
+void run_frame_network(LPCNetState *lpcnet, float *gru_a_condition, float *gru_b_condition, float *lpc,
+    const float *features);
 void run_frame_network_deferred(LPCNetState *lpcnet, const float *features);
 void run_frame_network_flush(LPCNetState *lpcnet);
 
@@ -85,6 +86,7 @@ void lpcnet_synthesize_tail_impl(LPCNetState *lpcnet, oac_int16 *output, int N,
 void lpcnet_synthesize_impl(LPCNetState *lpcnet, const float *features, oac_int16 *output, int N, int preload);
 void lpcnet_synthesize_blend_impl(LPCNetState *lpcnet, const oac_int16 *pcm_in, oac_int16 *output, int N);
 
-void run_frame_network(LPCNetState *lpcnet, float *gru_a_condition, float *gru_b_condition, float *lpc, const float *features);
+void run_frame_network(LPCNetState *lpcnet, float *gru_a_condition, float *gru_b_condition, float *lpc,
+    const float *features);
 
 #endif
diff --git a/dnn/lpcnet_tables.c b/dnn/lpcnet_tables.c
index 32b08a975..239223474 100644
--- a/dnn/lpcnet_tables.c
+++ b/dnn/lpcnet_tables.c
@@ -1,7 +1,7 @@
 /* The contents of this file was automatically generated by dump_lpcnet_tables.c*/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 #include "kiss_fft.h"
 #include "freq.h"
@@ -9,300 +9,302 @@
 static const arch_fft_state arch_fft = {0, NULL};
 
 static const oac_int16 fft_bitrev[320] = {
-0, 64, 128, 192, 256, 16, 80, 144, 208, 272, 32, 96, 160, 224, 288,
-48, 112, 176, 240, 304, 4, 68, 132, 196, 260, 20, 84, 148, 212, 276,
-36, 100, 164, 228, 292, 52, 116, 180, 244, 308, 8, 72, 136, 200, 264,
-24, 88, 152, 216, 280, 40, 104, 168, 232, 296, 56, 120, 184, 248, 312,
-12, 76, 140, 204, 268, 28, 92, 156, 220, 284, 44, 108, 172, 236, 300,
-60, 124, 188, 252, 316, 1, 65, 129, 193, 257, 17, 81, 145, 209, 273,
-33, 97, 161, 225, 289, 49, 113, 177, 241, 305, 5, 69, 133, 197, 261,
-21, 85, 149, 213, 277, 37, 101, 165, 229, 293, 53, 117, 181, 245, 309,
-9, 73, 137, 201, 265, 25, 89, 153, 217, 281, 41, 105, 169, 233, 297,
-57, 121, 185, 249, 313, 13, 77, 141, 205, 269, 29, 93, 157, 221, 285,
-45, 109, 173, 237, 301, 61, 125, 189, 253, 317, 2, 66, 130, 194, 258,
-18, 82, 146, 210, 274, 34, 98, 162, 226, 290, 50, 114, 178, 242, 306,
-6, 70, 134, 198, 262, 22, 86, 150, 214, 278, 38, 102, 166, 230, 294,
-54, 118, 182, 246, 310, 10, 74, 138, 202, 266, 26, 90, 154, 218, 282,
-42, 106, 170, 234, 298, 58, 122, 186, 250, 314, 14, 78, 142, 206, 270,
-30, 94, 158, 222, 286, 46, 110, 174, 238, 302, 62, 126, 190, 254, 318,
-3, 67, 131, 195, 259, 19, 83, 147, 211, 275, 35, 99, 163, 227, 291,
-51, 115, 179, 243, 307, 7, 71, 135, 199, 263, 23, 87, 151, 215, 279,
-39, 103, 167, 231, 295, 55, 119, 183, 247, 311, 11, 75, 139, 203, 267,
-27, 91, 155, 219, 283, 43, 107, 171, 235, 299, 59, 123, 187, 251, 315,
-15, 79, 143, 207, 271, 31, 95, 159, 223, 287, 47, 111, 175, 239, 303,
-63, 127, 191, 255, 319, };
+    0, 64, 128, 192, 256, 16, 80, 144, 208, 272, 32, 96, 160, 224, 288,
+    48, 112, 176, 240, 304, 4, 68, 132, 196, 260, 20, 84, 148, 212, 276,
+    36, 100, 164, 228, 292, 52, 116, 180, 244, 308, 8, 72, 136, 200, 264,
+    24, 88, 152, 216, 280, 40, 104, 168, 232, 296, 56, 120, 184, 248, 312,
+    12, 76, 140, 204, 268, 28, 92, 156, 220, 284, 44, 108, 172, 236, 300,
+    60, 124, 188, 252, 316, 1, 65, 129, 193, 257, 17, 81, 145, 209, 273,
+    33, 97, 161, 225, 289, 49, 113, 177, 241, 305, 5, 69, 133, 197, 261,
+    21, 85, 149, 213, 277, 37, 101, 165, 229, 293, 53, 117, 181, 245, 309,
+    9, 73, 137, 201, 265, 25, 89, 153, 217, 281, 41, 105, 169, 233, 297,
+    57, 121, 185, 249, 313, 13, 77, 141, 205, 269, 29, 93, 157, 221, 285,
+    45, 109, 173, 237, 301, 61, 125, 189, 253, 317, 2, 66, 130, 194, 258,
+    18, 82, 146, 210, 274, 34, 98, 162, 226, 290, 50, 114, 178, 242, 306,
+    6, 70, 134, 198, 262, 22, 86, 150, 214, 278, 38, 102, 166, 230, 294,
+    54, 118, 182, 246, 310, 10, 74, 138, 202, 266, 26, 90, 154, 218, 282,
+    42, 106, 170, 234, 298, 58, 122, 186, 250, 314, 14, 78, 142, 206, 270,
+    30, 94, 158, 222, 286, 46, 110, 174, 238, 302, 62, 126, 190, 254, 318,
+    3, 67, 131, 195, 259, 19, 83, 147, 211, 275, 35, 99, 163, 227, 291,
+    51, 115, 179, 243, 307, 7, 71, 135, 199, 263, 23, 87, 151, 215, 279,
+    39, 103, 167, 231, 295, 55, 119, 183, 247, 311, 11, 75, 139, 203, 267,
+    27, 91, 155, 219, 283, 43, 107, 171, 235, 299, 59, 123, 187, 251, 315,
+    15, 79, 143, 207, 271, 31, 95, 159, 223, 287, 47, 111, 175, 239, 303,
+    63, 127, 191, 255, 319,
+};
 
 static const kiss_twiddle_cpx fft_twiddles[320] = {
-{1.00000000f, -0.00000000f}, {0.999807239f, -0.0196336918f},
-{0.999229014f, -0.0392598175f}, {0.998265624f, -0.0588708036f},
-{0.996917307f, -0.0784590989f}, {0.995184720f, -0.0980171412f},
-{0.993068457f, -0.117537394f}, {0.990569353f, -0.137012348f},
-{0.987688363f, -0.156434461f}, {0.984426558f, -0.175796285f},
-{0.980785251f, -0.195090324f}, {0.976765871f, -0.214309156f},
-{0.972369909f, -0.233445361f}, {0.967599094f, -0.252491564f},
-{0.962455213f, -0.271440446f}, {0.956940353f, -0.290284663f},
-{0.951056540f, -0.309017003f}, {0.944806039f, -0.327630192f},
-{0.938191354f, -0.346117049f}, {0.931214929f, -0.364470512f},
-{0.923879504f, -0.382683426f}, {0.916187942f, -0.400748819f},
-{0.908143163f, -0.418659747f}, {0.899748266f, -0.436409235f},
-{0.891006529f, -0.453990489f}, {0.881921291f, -0.471396744f},
-{0.872496009f, -0.488621235f}, {0.862734377f, -0.505657375f},
-{0.852640152f, -0.522498548f}, {0.842217207f, -0.539138317f},
-{0.831469595f, -0.555570245f}, {0.820401430f, -0.571787953f},
-{0.809017003f, -0.587785244f}, {0.797320664f, -0.603555918f},
-{0.785316944f, -0.619093955f}, {0.773010433f, -0.634393275f},
-{0.760405958f, -0.649448037f}, {0.747508347f, -0.664252460f},
-{0.734322488f, -0.678800762f}, {0.720853567f, -0.693087339f},
-{0.707106769f, -0.707106769f}, {0.693087339f, -0.720853567f},
-{0.678800762f, -0.734322488f}, {0.664252460f, -0.747508347f},
-{0.649448037f, -0.760405958f}, {0.634393275f, -0.773010433f},
-{0.619093955f, -0.785316944f}, {0.603555918f, -0.797320664f},
-{0.587785244f, -0.809017003f}, {0.571787953f, -0.820401430f},
-{0.555570245f, -0.831469595f}, {0.539138317f, -0.842217207f},
-{0.522498548f, -0.852640152f}, {0.505657375f, -0.862734377f},
-{0.488621235f, -0.872496009f}, {0.471396744f, -0.881921291f},
-{0.453990489f, -0.891006529f}, {0.436409235f, -0.899748266f},
-{0.418659747f, -0.908143163f}, {0.400748819f, -0.916187942f},
-{0.382683426f, -0.923879504f}, {0.364470512f, -0.931214929f},
-{0.346117049f, -0.938191354f}, {0.327630192f, -0.944806039f},
-{0.309017003f, -0.951056540f}, {0.290284663f, -0.956940353f},
-{0.271440446f, -0.962455213f}, {0.252491564f, -0.967599094f},
-{0.233445361f, -0.972369909f}, {0.214309156f, -0.976765871f},
-{0.195090324f, -0.980785251f}, {0.175796285f, -0.984426558f},
-{0.156434461f, -0.987688363f}, {0.137012348f, -0.990569353f},
-{0.117537394f, -0.993068457f}, {0.0980171412f, -0.995184720f},
-{0.0784590989f, -0.996917307f}, {0.0588708036f, -0.998265624f},
-{0.0392598175f, -0.999229014f}, {0.0196336918f, -0.999807239f},
-{6.12323426e-17f, -1.00000000f}, {-0.0196336918f, -0.999807239f},
-{-0.0392598175f, -0.999229014f}, {-0.0588708036f, -0.998265624f},
-{-0.0784590989f, -0.996917307f}, {-0.0980171412f, -0.995184720f},
-{-0.117537394f, -0.993068457f}, {-0.137012348f, -0.990569353f},
-{-0.156434461f, -0.987688363f}, {-0.175796285f, -0.984426558f},
-{-0.195090324f, -0.980785251f}, {-0.214309156f, -0.976765871f},
-{-0.233445361f, -0.972369909f}, {-0.252491564f, -0.967599094f},
-{-0.271440446f, -0.962455213f}, {-0.290284663f, -0.956940353f},
-{-0.309017003f, -0.951056540f}, {-0.327630192f, -0.944806039f},
-{-0.346117049f, -0.938191354f}, {-0.364470512f, -0.931214929f},
-{-0.382683426f, -0.923879504f}, {-0.400748819f, -0.916187942f},
-{-0.418659747f, -0.908143163f}, {-0.436409235f, -0.899748266f},
-{-0.453990489f, -0.891006529f}, {-0.471396744f, -0.881921291f},
-{-0.488621235f, -0.872496009f}, {-0.505657375f, -0.862734377f},
-{-0.522498548f, -0.852640152f}, {-0.539138317f, -0.842217207f},
-{-0.555570245f, -0.831469595f}, {-0.571787953f, -0.820401430f},
-{-0.587785244f, -0.809017003f}, {-0.603555918f, -0.797320664f},
-{-0.619093955f, -0.785316944f}, {-0.634393275f, -0.773010433f},
-{-0.649448037f, -0.760405958f}, {-0.664252460f, -0.747508347f},
-{-0.678800762f, -0.734322488f}, {-0.693087339f, -0.720853567f},
-{-0.707106769f, -0.707106769f}, {-0.720853567f, -0.693087339f},
-{-0.734322488f, -0.678800762f}, {-0.747508347f, -0.664252460f},
-{-0.760405958f, -0.649448037f}, {-0.773010433f, -0.634393275f},
-{-0.785316944f, -0.619093955f}, {-0.797320664f, -0.603555918f},
-{-0.809017003f, -0.587785244f}, {-0.820401430f, -0.571787953f},
-{-0.831469595f, -0.555570245f}, {-0.842217207f, -0.539138317f},
-{-0.852640152f, -0.522498548f}, {-0.862734377f, -0.505657375f},
-{-0.872496009f, -0.488621235f}, {-0.881921291f, -0.471396744f},
-{-0.891006529f, -0.453990489f}, {-0.899748266f, -0.436409235f},
-{-0.908143163f, -0.418659747f}, {-0.916187942f, -0.400748819f},
-{-0.923879504f, -0.382683426f}, {-0.931214929f, -0.364470512f},
-{-0.938191354f, -0.346117049f}, {-0.944806039f, -0.327630192f},
-{-0.951056540f, -0.309017003f}, {-0.956940353f, -0.290284663f},
-{-0.962455213f, -0.271440446f}, {-0.967599094f, -0.252491564f},
-{-0.972369909f, -0.233445361f}, {-0.976765871f, -0.214309156f},
-{-0.980785251f, -0.195090324f}, {-0.984426558f, -0.175796285f},
-{-0.987688363f, -0.156434461f}, {-0.990569353f, -0.137012348f},
-{-0.993068457f, -0.117537394f}, {-0.995184720f, -0.0980171412f},
-{-0.996917307f, -0.0784590989f}, {-0.998265624f, -0.0588708036f},
-{-0.999229014f, -0.0392598175f}, {-0.999807239f, -0.0196336918f},
-{-1.00000000f, -1.22464685e-16f}, {-0.999807239f, 0.0196336918f},
-{-0.999229014f, 0.0392598175f}, {-0.998265624f, 0.0588708036f},
-{-0.996917307f, 0.0784590989f}, {-0.995184720f, 0.0980171412f},
-{-0.993068457f, 0.117537394f}, {-0.990569353f, 0.137012348f},
-{-0.987688363f, 0.156434461f}, {-0.984426558f, 0.175796285f},
-{-0.980785251f, 0.195090324f}, {-0.976765871f, 0.214309156f},
-{-0.972369909f, 0.233445361f}, {-0.967599094f, 0.252491564f},
-{-0.962455213f, 0.271440446f}, {-0.956940353f, 0.290284663f},
-{-0.951056540f, 0.309017003f}, {-0.944806039f, 0.327630192f},
-{-0.938191354f, 0.346117049f}, {-0.931214929f, 0.364470512f},
-{-0.923879504f, 0.382683426f}, {-0.916187942f, 0.400748819f},
-{-0.908143163f, 0.418659747f}, {-0.899748266f, 0.436409235f},
-{-0.891006529f, 0.453990489f}, {-0.881921291f, 0.471396744f},
-{-0.872496009f, 0.488621235f}, {-0.862734377f, 0.505657375f},
-{-0.852640152f, 0.522498548f}, {-0.842217207f, 0.539138317f},
-{-0.831469595f, 0.555570245f}, {-0.820401430f, 0.571787953f},
-{-0.809017003f, 0.587785244f}, {-0.797320664f, 0.603555918f},
-{-0.785316944f, 0.619093955f}, {-0.773010433f, 0.634393275f},
-{-0.760405958f, 0.649448037f}, {-0.747508347f, 0.664252460f},
-{-0.734322488f, 0.678800762f}, {-0.720853567f, 0.693087339f},
-{-0.707106769f, 0.707106769f}, {-0.693087339f, 0.720853567f},
-{-0.678800762f, 0.734322488f}, {-0.664252460f, 0.747508347f},
-{-0.649448037f, 0.760405958f}, {-0.634393275f, 0.773010433f},
-{-0.619093955f, 0.785316944f}, {-0.603555918f, 0.797320664f},
-{-0.587785244f, 0.809017003f}, {-0.571787953f, 0.820401430f},
-{-0.555570245f, 0.831469595f}, {-0.539138317f, 0.842217207f},
-{-0.522498548f, 0.852640152f}, {-0.505657375f, 0.862734377f},
-{-0.488621235f, 0.872496009f}, {-0.471396744f, 0.881921291f},
-{-0.453990489f, 0.891006529f}, {-0.436409235f, 0.899748266f},
-{-0.418659747f, 0.908143163f}, {-0.400748819f, 0.916187942f},
-{-0.382683426f, 0.923879504f}, {-0.364470512f, 0.931214929f},
-{-0.346117049f, 0.938191354f}, {-0.327630192f, 0.944806039f},
-{-0.309017003f, 0.951056540f}, {-0.290284663f, 0.956940353f},
-{-0.271440446f, 0.962455213f}, {-0.252491564f, 0.967599094f},
-{-0.233445361f, 0.972369909f}, {-0.214309156f, 0.976765871f},
-{-0.195090324f, 0.980785251f}, {-0.175796285f, 0.984426558f},
-{-0.156434461f, 0.987688363f}, {-0.137012348f, 0.990569353f},
-{-0.117537394f, 0.993068457f}, {-0.0980171412f, 0.995184720f},
-{-0.0784590989f, 0.996917307f}, {-0.0588708036f, 0.998265624f},
-{-0.0392598175f, 0.999229014f}, {-0.0196336918f, 0.999807239f},
-{-1.83697015e-16f, 1.00000000f}, {0.0196336918f, 0.999807239f},
-{0.0392598175f, 0.999229014f}, {0.0588708036f, 0.998265624f},
-{0.0784590989f, 0.996917307f}, {0.0980171412f, 0.995184720f},
-{0.117537394f, 0.993068457f}, {0.137012348f, 0.990569353f},
-{0.156434461f, 0.987688363f}, {0.175796285f, 0.984426558f},
-{0.195090324f, 0.980785251f}, {0.214309156f, 0.976765871f},
-{0.233445361f, 0.972369909f}, {0.252491564f, 0.967599094f},
-{0.271440446f, 0.962455213f}, {0.290284663f, 0.956940353f},
-{0.309017003f, 0.951056540f}, {0.327630192f, 0.944806039f},
-{0.346117049f, 0.938191354f}, {0.364470512f, 0.931214929f},
-{0.382683426f, 0.923879504f}, {0.400748819f, 0.916187942f},
-{0.418659747f, 0.908143163f}, {0.436409235f, 0.899748266f},
-{0.453990489f, 0.891006529f}, {0.471396744f, 0.881921291f},
-{0.488621235f, 0.872496009f}, {0.505657375f, 0.862734377f},
-{0.522498548f, 0.852640152f}, {0.539138317f, 0.842217207f},
-{0.555570245f, 0.831469595f}, {0.571787953f, 0.820401430f},
-{0.587785244f, 0.809017003f}, {0.603555918f, 0.797320664f},
-{0.619093955f, 0.785316944f}, {0.634393275f, 0.773010433f},
-{0.649448037f, 0.760405958f}, {0.664252460f, 0.747508347f},
-{0.678800762f, 0.734322488f}, {0.693087339f, 0.720853567f},
-{0.707106769f, 0.707106769f}, {0.720853567f, 0.693087339f},
-{0.734322488f, 0.678800762f}, {0.747508347f, 0.664252460f},
-{0.760405958f, 0.649448037f}, {0.773010433f, 0.634393275f},
-{0.785316944f, 0.619093955f}, {0.797320664f, 0.603555918f},
-{0.809017003f, 0.587785244f}, {0.820401430f, 0.571787953f},
-{0.831469595f, 0.555570245f}, {0.842217207f, 0.539138317f},
-{0.852640152f, 0.522498548f}, {0.862734377f, 0.505657375f},
-{0.872496009f, 0.488621235f}, {0.881921291f, 0.471396744f},
-{0.891006529f, 0.453990489f}, {0.899748266f, 0.436409235f},
-{0.908143163f, 0.418659747f}, {0.916187942f, 0.400748819f},
-{0.923879504f, 0.382683426f}, {0.931214929f, 0.364470512f},
-{0.938191354f, 0.346117049f}, {0.944806039f, 0.327630192f},
-{0.951056540f, 0.309017003f}, {0.956940353f, 0.290284663f},
-{0.962455213f, 0.271440446f}, {0.967599094f, 0.252491564f},
-{0.972369909f, 0.233445361f}, {0.976765871f, 0.214309156f},
-{0.980785251f, 0.195090324f}, {0.984426558f, 0.175796285f},
-{0.987688363f, 0.156434461f}, {0.990569353f, 0.137012348f},
-{0.993068457f, 0.117537394f}, {0.995184720f, 0.0980171412f},
-{0.996917307f, 0.0784590989f}, {0.998265624f, 0.0588708036f},
-{0.999229014f, 0.0392598175f}, {0.999807239f, 0.0196336918f},
+    {1.00000000f, -0.00000000f}, {0.999807239f, -0.0196336918f},
+    {0.999229014f, -0.0392598175f}, {0.998265624f, -0.0588708036f},
+    {0.996917307f, -0.0784590989f}, {0.995184720f, -0.0980171412f},
+    {0.993068457f, -0.117537394f}, {0.990569353f, -0.137012348f},
+    {0.987688363f, -0.156434461f}, {0.984426558f, -0.175796285f},
+    {0.980785251f, -0.195090324f}, {0.976765871f, -0.214309156f},
+    {0.972369909f, -0.233445361f}, {0.967599094f, -0.252491564f},
+    {0.962455213f, -0.271440446f}, {0.956940353f, -0.290284663f},
+    {0.951056540f, -0.309017003f}, {0.944806039f, -0.327630192f},
+    {0.938191354f, -0.346117049f}, {0.931214929f, -0.364470512f},
+    {0.923879504f, -0.382683426f}, {0.916187942f, -0.400748819f},
+    {0.908143163f, -0.418659747f}, {0.899748266f, -0.436409235f},
+    {0.891006529f, -0.453990489f}, {0.881921291f, -0.471396744f},
+    {0.872496009f, -0.488621235f}, {0.862734377f, -0.505657375f},
+    {0.852640152f, -0.522498548f}, {0.842217207f, -0.539138317f},
+    {0.831469595f, -0.555570245f}, {0.820401430f, -0.571787953f},
+    {0.809017003f, -0.587785244f}, {0.797320664f, -0.603555918f},
+    {0.785316944f, -0.619093955f}, {0.773010433f, -0.634393275f},
+    {0.760405958f, -0.649448037f}, {0.747508347f, -0.664252460f},
+    {0.734322488f, -0.678800762f}, {0.720853567f, -0.693087339f},
+    {0.707106769f, -0.707106769f}, {0.693087339f, -0.720853567f},
+    {0.678800762f, -0.734322488f}, {0.664252460f, -0.747508347f},
+    {0.649448037f, -0.760405958f}, {0.634393275f, -0.773010433f},
+    {0.619093955f, -0.785316944f}, {0.603555918f, -0.797320664f},
+    {0.587785244f, -0.809017003f}, {0.571787953f, -0.820401430f},
+    {0.555570245f, -0.831469595f}, {0.539138317f, -0.842217207f},
+    {0.522498548f, -0.852640152f}, {0.505657375f, -0.862734377f},
+    {0.488621235f, -0.872496009f}, {0.471396744f, -0.881921291f},
+    {0.453990489f, -0.891006529f}, {0.436409235f, -0.899748266f},
+    {0.418659747f, -0.908143163f}, {0.400748819f, -0.916187942f},
+    {0.382683426f, -0.923879504f}, {0.364470512f, -0.931214929f},
+    {0.346117049f, -0.938191354f}, {0.327630192f, -0.944806039f},
+    {0.309017003f, -0.951056540f}, {0.290284663f, -0.956940353f},
+    {0.271440446f, -0.962455213f}, {0.252491564f, -0.967599094f},
+    {0.233445361f, -0.972369909f}, {0.214309156f, -0.976765871f},
+    {0.195090324f, -0.980785251f}, {0.175796285f, -0.984426558f},
+    {0.156434461f, -0.987688363f}, {0.137012348f, -0.990569353f},
+    {0.117537394f, -0.993068457f}, {0.0980171412f, -0.995184720f},
+    {0.0784590989f, -0.996917307f}, {0.0588708036f, -0.998265624f},
+    {0.0392598175f, -0.999229014f}, {0.0196336918f, -0.999807239f},
+    {6.12323426e-17f, -1.00000000f}, {-0.0196336918f, -0.999807239f},
+    {-0.0392598175f, -0.999229014f}, {-0.0588708036f, -0.998265624f},
+    {-0.0784590989f, -0.996917307f}, {-0.0980171412f, -0.995184720f},
+    {-0.117537394f, -0.993068457f}, {-0.137012348f, -0.990569353f},
+    {-0.156434461f, -0.987688363f}, {-0.175796285f, -0.984426558f},
+    {-0.195090324f, -0.980785251f}, {-0.214309156f, -0.976765871f},
+    {-0.233445361f, -0.972369909f}, {-0.252491564f, -0.967599094f},
+    {-0.271440446f, -0.962455213f}, {-0.290284663f, -0.956940353f},
+    {-0.309017003f, -0.951056540f}, {-0.327630192f, -0.944806039f},
+    {-0.346117049f, -0.938191354f}, {-0.364470512f, -0.931214929f},
+    {-0.382683426f, -0.923879504f}, {-0.400748819f, -0.916187942f},
+    {-0.418659747f, -0.908143163f}, {-0.436409235f, -0.899748266f},
+    {-0.453990489f, -0.891006529f}, {-0.471396744f, -0.881921291f},
+    {-0.488621235f, -0.872496009f}, {-0.505657375f, -0.862734377f},
+    {-0.522498548f, -0.852640152f}, {-0.539138317f, -0.842217207f},
+    {-0.555570245f, -0.831469595f}, {-0.571787953f, -0.820401430f},
+    {-0.587785244f, -0.809017003f}, {-0.603555918f, -0.797320664f},
+    {-0.619093955f, -0.785316944f}, {-0.634393275f, -0.773010433f},
+    {-0.649448037f, -0.760405958f}, {-0.664252460f, -0.747508347f},
+    {-0.678800762f, -0.734322488f}, {-0.693087339f, -0.720853567f},
+    {-0.707106769f, -0.707106769f}, {-0.720853567f, -0.693087339f},
+    {-0.734322488f, -0.678800762f}, {-0.747508347f, -0.664252460f},
+    {-0.760405958f, -0.649448037f}, {-0.773010433f, -0.634393275f},
+    {-0.785316944f, -0.619093955f}, {-0.797320664f, -0.603555918f},
+    {-0.809017003f, -0.587785244f}, {-0.820401430f, -0.571787953f},
+    {-0.831469595f, -0.555570245f}, {-0.842217207f, -0.539138317f},
+    {-0.852640152f, -0.522498548f}, {-0.862734377f, -0.505657375f},
+    {-0.872496009f, -0.488621235f}, {-0.881921291f, -0.471396744f},
+    {-0.891006529f, -0.453990489f}, {-0.899748266f, -0.436409235f},
+    {-0.908143163f, -0.418659747f}, {-0.916187942f, -0.400748819f},
+    {-0.923879504f, -0.382683426f}, {-0.931214929f, -0.364470512f},
+    {-0.938191354f, -0.346117049f}, {-0.944806039f, -0.327630192f},
+    {-0.951056540f, -0.309017003f}, {-0.956940353f, -0.290284663f},
+    {-0.962455213f, -0.271440446f}, {-0.967599094f, -0.252491564f},
+    {-0.972369909f, -0.233445361f}, {-0.976765871f, -0.214309156f},
+    {-0.980785251f, -0.195090324f}, {-0.984426558f, -0.175796285f},
+    {-0.987688363f, -0.156434461f}, {-0.990569353f, -0.137012348f},
+    {-0.993068457f, -0.117537394f}, {-0.995184720f, -0.0980171412f},
+    {-0.996917307f, -0.0784590989f}, {-0.998265624f, -0.0588708036f},
+    {-0.999229014f, -0.0392598175f}, {-0.999807239f, -0.0196336918f},
+    {-1.00000000f, -1.22464685e-16f}, {-0.999807239f, 0.0196336918f},
+    {-0.999229014f, 0.0392598175f}, {-0.998265624f, 0.0588708036f},
+    {-0.996917307f, 0.0784590989f}, {-0.995184720f, 0.0980171412f},
+    {-0.993068457f, 0.117537394f}, {-0.990569353f, 0.137012348f},
+    {-0.987688363f, 0.156434461f}, {-0.984426558f, 0.175796285f},
+    {-0.980785251f, 0.195090324f}, {-0.976765871f, 0.214309156f},
+    {-0.972369909f, 0.233445361f}, {-0.967599094f, 0.252491564f},
+    {-0.962455213f, 0.271440446f}, {-0.956940353f, 0.290284663f},
+    {-0.951056540f, 0.309017003f}, {-0.944806039f, 0.327630192f},
+    {-0.938191354f, 0.346117049f}, {-0.931214929f, 0.364470512f},
+    {-0.923879504f, 0.382683426f}, {-0.916187942f, 0.400748819f},
+    {-0.908143163f, 0.418659747f}, {-0.899748266f, 0.436409235f},
+    {-0.891006529f, 0.453990489f}, {-0.881921291f, 0.471396744f},
+    {-0.872496009f, 0.488621235f}, {-0.862734377f, 0.505657375f},
+    {-0.852640152f, 0.522498548f}, {-0.842217207f, 0.539138317f},
+    {-0.831469595f, 0.555570245f}, {-0.820401430f, 0.571787953f},
+    {-0.809017003f, 0.587785244f}, {-0.797320664f, 0.603555918f},
+    {-0.785316944f, 0.619093955f}, {-0.773010433f, 0.634393275f},
+    {-0.760405958f, 0.649448037f}, {-0.747508347f, 0.664252460f},
+    {-0.734322488f, 0.678800762f}, {-0.720853567f, 0.693087339f},
+    {-0.707106769f, 0.707106769f}, {-0.693087339f, 0.720853567f},
+    {-0.678800762f, 0.734322488f}, {-0.664252460f, 0.747508347f},
+    {-0.649448037f, 0.760405958f}, {-0.634393275f, 0.773010433f},
+    {-0.619093955f, 0.785316944f}, {-0.603555918f, 0.797320664f},
+    {-0.587785244f, 0.809017003f}, {-0.571787953f, 0.820401430f},
+    {-0.555570245f, 0.831469595f}, {-0.539138317f, 0.842217207f},
+    {-0.522498548f, 0.852640152f}, {-0.505657375f, 0.862734377f},
+    {-0.488621235f, 0.872496009f}, {-0.471396744f, 0.881921291f},
+    {-0.453990489f, 0.891006529f}, {-0.436409235f, 0.899748266f},
+    {-0.418659747f, 0.908143163f}, {-0.400748819f, 0.916187942f},
+    {-0.382683426f, 0.923879504f}, {-0.364470512f, 0.931214929f},
+    {-0.346117049f, 0.938191354f}, {-0.327630192f, 0.944806039f},
+    {-0.309017003f, 0.951056540f}, {-0.290284663f, 0.956940353f},
+    {-0.271440446f, 0.962455213f}, {-0.252491564f, 0.967599094f},
+    {-0.233445361f, 0.972369909f}, {-0.214309156f, 0.976765871f},
+    {-0.195090324f, 0.980785251f}, {-0.175796285f, 0.984426558f},
+    {-0.156434461f, 0.987688363f}, {-0.137012348f, 0.990569353f},
+    {-0.117537394f, 0.993068457f}, {-0.0980171412f, 0.995184720f},
+    {-0.0784590989f, 0.996917307f}, {-0.0588708036f, 0.998265624f},
+    {-0.0392598175f, 0.999229014f}, {-0.0196336918f, 0.999807239f},
+    {-1.83697015e-16f, 1.00000000f}, {0.0196336918f, 0.999807239f},
+    {0.0392598175f, 0.999229014f}, {0.0588708036f, 0.998265624f},
+    {0.0784590989f, 0.996917307f}, {0.0980171412f, 0.995184720f},
+    {0.117537394f, 0.993068457f}, {0.137012348f, 0.990569353f},
+    {0.156434461f, 0.987688363f}, {0.175796285f, 0.984426558f},
+    {0.195090324f, 0.980785251f}, {0.214309156f, 0.976765871f},
+    {0.233445361f, 0.972369909f}, {0.252491564f, 0.967599094f},
+    {0.271440446f, 0.962455213f}, {0.290284663f, 0.956940353f},
+    {0.309017003f, 0.951056540f}, {0.327630192f, 0.944806039f},
+    {0.346117049f, 0.938191354f}, {0.364470512f, 0.931214929f},
+    {0.382683426f, 0.923879504f}, {0.400748819f, 0.916187942f},
+    {0.418659747f, 0.908143163f}, {0.436409235f, 0.899748266f},
+    {0.453990489f, 0.891006529f}, {0.471396744f, 0.881921291f},
+    {0.488621235f, 0.872496009f}, {0.505657375f, 0.862734377f},
+    {0.522498548f, 0.852640152f}, {0.539138317f, 0.842217207f},
+    {0.555570245f, 0.831469595f}, {0.571787953f, 0.820401430f},
+    {0.587785244f, 0.809017003f}, {0.603555918f, 0.797320664f},
+    {0.619093955f, 0.785316944f}, {0.634393275f, 0.773010433f},
+    {0.649448037f, 0.760405958f}, {0.664252460f, 0.747508347f},
+    {0.678800762f, 0.734322488f}, {0.693087339f, 0.720853567f},
+    {0.707106769f, 0.707106769f}, {0.720853567f, 0.693087339f},
+    {0.734322488f, 0.678800762f}, {0.747508347f, 0.664252460f},
+    {0.760405958f, 0.649448037f}, {0.773010433f, 0.634393275f},
+    {0.785316944f, 0.619093955f}, {0.797320664f, 0.603555918f},
+    {0.809017003f, 0.587785244f}, {0.820401430f, 0.571787953f},
+    {0.831469595f, 0.555570245f}, {0.842217207f, 0.539138317f},
+    {0.852640152f, 0.522498548f}, {0.862734377f, 0.505657375f},
+    {0.872496009f, 0.488621235f}, {0.881921291f, 0.471396744f},
+    {0.891006529f, 0.453990489f}, {0.899748266f, 0.436409235f},
+    {0.908143163f, 0.418659747f}, {0.916187942f, 0.400748819f},
+    {0.923879504f, 0.382683426f}, {0.931214929f, 0.364470512f},
+    {0.938191354f, 0.346117049f}, {0.944806039f, 0.327630192f},
+    {0.951056540f, 0.309017003f}, {0.956940353f, 0.290284663f},
+    {0.962455213f, 0.271440446f}, {0.967599094f, 0.252491564f},
+    {0.972369909f, 0.233445361f}, {0.976765871f, 0.214309156f},
+    {0.980785251f, 0.195090324f}, {0.984426558f, 0.175796285f},
+    {0.987688363f, 0.156434461f}, {0.990569353f, 0.137012348f},
+    {0.993068457f, 0.117537394f}, {0.995184720f, 0.0980171412f},
+    {0.996917307f, 0.0784590989f}, {0.998265624f, 0.0588708036f},
+    {0.999229014f, 0.0392598175f}, {0.999807239f, 0.0196336918f},
 };
 
 const kiss_fft_state kfft = {
-320, /* nfft */
-0.0031250000f, /* scale */
--1, /* shift */
-{5, 64, 4, 16, 4, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, }, /* factors */
-fft_bitrev, /* bitrev*/
-fft_twiddles, /* twiddles*/
-(arch_fft_state *)&arch_fft, /* arch_fft*/
+    320, /* nfft */
+    0.0031250000f, /* scale */
+    -1, /* shift */
+    {5, 64, 4, 16, 4, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, }, /* factors */
+    fft_bitrev, /* bitrev*/
+    fft_twiddles, /* twiddles*/
+    (arch_fft_state *)&arch_fft, /* arch_fft*/
 };
 
 const float half_window[] = {
-3.78491532e-05f, 0.000340620492f, 0.000946046319f, 0.00185389258f, 0.00306380726f,
-0.00457531959f, 0.00638783723f, 0.00850064680f, 0.0109129101f, 0.0136236614f,
-0.0166318044f, 0.0199361145f, 0.0235352255f, 0.0274276342f, 0.0316116922f,
-0.0360856056f, 0.0408474281f, 0.0458950549f, 0.0512262285f, 0.0568385124f,
-0.0627293140f, 0.0688958541f, 0.0753351897f, 0.0820441842f, 0.0890194997f,
-0.0962576419f, 0.103754878f, 0.111507311f, 0.119510807f, 0.127761051f,
-0.136253506f, 0.144983411f, 0.153945804f, 0.163135484f, 0.172547072f,
-0.182174906f, 0.192013159f, 0.202055752f, 0.212296382f, 0.222728521f,
-0.233345464f, 0.244140238f, 0.255105674f, 0.266234398f, 0.277518868f,
-0.288951218f, 0.300523549f, 0.312227666f, 0.324055225f, 0.335997701f,
-0.348046392f, 0.360192508f, 0.372427016f, 0.384740859f, 0.397124738f,
-0.409569323f, 0.422065198f, 0.434602767f, 0.447172493f, 0.459764689f,
-0.472369671f, 0.484977663f, 0.497579008f, 0.510163903f, 0.522722721f,
-0.535245717f, 0.547723293f, 0.560145974f, 0.572504222f, 0.584788740f,
-0.596990347f, 0.609099925f, 0.621108532f, 0.633007407f, 0.644788086f,
-0.656442165f, 0.667961538f, 0.679338276f, 0.690564752f, 0.701633692f,
-0.712537885f, 0.723270535f, 0.733825266f, 0.744195819f, 0.754376352f,
-0.764361382f, 0.774145722f, 0.783724606f, 0.793093503f, 0.802248418f,
-0.811185598f, 0.819901764f, 0.828393936f, 0.836659551f, 0.844696403f,
-0.852502763f, 0.860077202f, 0.867418647f, 0.874526560f, 0.881400526f,
-0.888040781f, 0.894447744f, 0.900622249f, 0.906565487f, 0.912279010f,
-0.917764664f, 0.923024654f, 0.928061485f, 0.932878017f, 0.937477291f,
-0.941862822f, 0.946038187f, 0.950007319f, 0.953774393f, 0.957343817f,
-0.960720181f, 0.963908315f, 0.966913164f, 0.969739914f, 0.972393870f,
-0.974880517f, 0.977205336f, 0.979374051f, 0.981392324f, 0.983266115f,
-0.985001266f, 0.986603677f, 0.988079309f, 0.989434063f, 0.990674019f,
-0.991804957f, 0.992832899f, 0.993763626f, 0.994602919f, 0.995356441f,
-0.996029854f, 0.996628702f, 0.997158289f, 0.997623861f, 0.998030603f,
-0.998383403f, 0.998687088f, 0.998946249f, 0.999165416f, 0.999348700f,
-0.999500215f, 0.999623775f, 0.999723017f, 0.999801278f, 0.999861658f,
-0.999907196f, 0.999940455f, 0.999963880f, 0.999979615f, 0.999989510f,
-0.999995291f, 0.999998271f, 0.999999523f, 0.999999940f, 1.00000000f,
+    3.78491532e-05f, 0.000340620492f, 0.000946046319f, 0.00185389258f, 0.00306380726f,
+    0.00457531959f, 0.00638783723f, 0.00850064680f, 0.0109129101f, 0.0136236614f,
+    0.0166318044f, 0.0199361145f, 0.0235352255f, 0.0274276342f, 0.0316116922f,
+    0.0360856056f, 0.0408474281f, 0.0458950549f, 0.0512262285f, 0.0568385124f,
+    0.0627293140f, 0.0688958541f, 0.0753351897f, 0.0820441842f, 0.0890194997f,
+    0.0962576419f, 0.103754878f, 0.111507311f, 0.119510807f, 0.127761051f,
+    0.136253506f, 0.144983411f, 0.153945804f, 0.163135484f, 0.172547072f,
+    0.182174906f, 0.192013159f, 0.202055752f, 0.212296382f, 0.222728521f,
+    0.233345464f, 0.244140238f, 0.255105674f, 0.266234398f, 0.277518868f,
+    0.288951218f, 0.300523549f, 0.312227666f, 0.324055225f, 0.335997701f,
+    0.348046392f, 0.360192508f, 0.372427016f, 0.384740859f, 0.397124738f,
+    0.409569323f, 0.422065198f, 0.434602767f, 0.447172493f, 0.459764689f,
+    0.472369671f, 0.484977663f, 0.497579008f, 0.510163903f, 0.522722721f,
+    0.535245717f, 0.547723293f, 0.560145974f, 0.572504222f, 0.584788740f,
+    0.596990347f, 0.609099925f, 0.621108532f, 0.633007407f, 0.644788086f,
+    0.656442165f, 0.667961538f, 0.679338276f, 0.690564752f, 0.701633692f,
+    0.712537885f, 0.723270535f, 0.733825266f, 0.744195819f, 0.754376352f,
+    0.764361382f, 0.774145722f, 0.783724606f, 0.793093503f, 0.802248418f,
+    0.811185598f, 0.819901764f, 0.828393936f, 0.836659551f, 0.844696403f,
+    0.852502763f, 0.860077202f, 0.867418647f, 0.874526560f, 0.881400526f,
+    0.888040781f, 0.894447744f, 0.900622249f, 0.906565487f, 0.912279010f,
+    0.917764664f, 0.923024654f, 0.928061485f, 0.932878017f, 0.937477291f,
+    0.941862822f, 0.946038187f, 0.950007319f, 0.953774393f, 0.957343817f,
+    0.960720181f, 0.963908315f, 0.966913164f, 0.969739914f, 0.972393870f,
+    0.974880517f, 0.977205336f, 0.979374051f, 0.981392324f, 0.983266115f,
+    0.985001266f, 0.986603677f, 0.988079309f, 0.989434063f, 0.990674019f,
+    0.991804957f, 0.992832899f, 0.993763626f, 0.994602919f, 0.995356441f,
+    0.996029854f, 0.996628702f, 0.997158289f, 0.997623861f, 0.998030603f,
+    0.998383403f, 0.998687088f, 0.998946249f, 0.999165416f, 0.999348700f,
+    0.999500215f, 0.999623775f, 0.999723017f, 0.999801278f, 0.999861658f,
+    0.999907196f, 0.999940455f, 0.999963880f, 0.999979615f, 0.999989510f,
+    0.999995291f, 0.999998271f, 0.999999523f, 0.999999940f, 1.00000000f,
 };
 
 const float dct_table[] = {
-0.707106769f, 0.996194720f, 0.984807730f, 0.965925813f, 0.939692616f,
-0.906307817f, 0.866025388f, 0.819152057f, 0.766044438f, 0.707106769f,
-0.642787635f, 0.573576450f, 0.500000000f, 0.422618270f, 0.342020154f,
-0.258819044f, 0.173648179f, 0.0871557444f, 0.707106769f, 0.965925813f,
-0.866025388f, 0.707106769f, 0.500000000f, 0.258819044f, 6.12323426e-17f,
--0.258819044f, -0.500000000f, -0.707106769f, -0.866025388f, -0.965925813f,
--1.00000000f, -0.965925813f, -0.866025388f, -0.707106769f, -0.500000000f,
--0.258819044f, 0.707106769f, 0.906307817f, 0.642787635f, 0.258819044f,
--0.173648179f, -0.573576450f, -0.866025388f, -0.996194720f, -0.939692616f,
--0.707106769f, -0.342020154f, 0.0871557444f, 0.500000000f, 0.819152057f,
-0.984807730f, 0.965925813f, 0.766044438f, 0.422618270f, 0.707106769f,
-0.819152057f, 0.342020154f, -0.258819044f, -0.766044438f, -0.996194720f,
--0.866025388f, -0.422618270f, 0.173648179f, 0.707106769f, 0.984807730f,
-0.906307817f, 0.500000000f, -0.0871557444f, -0.642787635f, -0.965925813f,
--0.939692616f, -0.573576450f, 0.707106769f, 0.707106769f, 6.12323426e-17f,
--0.707106769f, -1.00000000f, -0.707106769f, -1.83697015e-16f, 0.707106769f,
-1.00000000f, 0.707106769f, 3.06161700e-16f, -0.707106769f, -1.00000000f,
--0.707106769f, -4.28626385e-16f, 0.707106769f, 1.00000000f, 0.707106769f,
-0.707106769f, 0.573576450f, -0.342020154f, -0.965925813f, -0.766044438f,
-0.0871557444f, 0.866025388f, 0.906307817f, 0.173648179f, -0.707106769f,
--0.984807730f, -0.422618270f, 0.500000000f, 0.996194720f, 0.642787635f,
--0.258819044f, -0.939692616f, -0.819152057f, 0.707106769f, 0.422618270f,
--0.642787635f, -0.965925813f, -0.173648179f, 0.819152057f, 0.866025388f,
--0.0871557444f, -0.939692616f, -0.707106769f, 0.342020154f, 0.996194720f,
-0.500000000f, -0.573576450f, -0.984807730f, -0.258819044f, 0.766044438f,
-0.906307817f, 0.707106769f, 0.258819044f, -0.866025388f, -0.707106769f,
-0.500000000f, 0.965925813f, 3.06161700e-16f, -0.965925813f, -0.500000000f,
-0.707106769f, 0.866025388f, -0.258819044f, -1.00000000f, -0.258819044f,
-0.866025388f, 0.707106769f, -0.500000000f, -0.965925813f, 0.707106769f,
-0.0871557444f, -0.984807730f, -0.258819044f, 0.939692616f, 0.422618270f,
--0.866025388f, -0.573576450f, 0.766044438f, 0.707106769f, -0.642787635f,
--0.819152057f, 0.500000000f, 0.906307817f, -0.342020154f, -0.965925813f,
-0.173648179f, 0.996194720f, 0.707106769f, -0.0871557444f, -0.984807730f,
-0.258819044f, 0.939692616f, -0.422618270f, -0.866025388f, 0.573576450f,
-0.766044438f, -0.707106769f, -0.642787635f, 0.819152057f, 0.500000000f,
--0.906307817f, -0.342020154f, 0.965925813f, 0.173648179f, -0.996194720f,
-0.707106769f, -0.258819044f, -0.866025388f, 0.707106769f, 0.500000000f,
--0.965925813f, -4.28626385e-16f, 0.965925813f, -0.500000000f, -0.707106769f,
-0.866025388f, 0.258819044f, -1.00000000f, 0.258819044f, 0.866025388f,
--0.707106769f, -0.500000000f, 0.965925813f, 0.707106769f, -0.422618270f,
--0.642787635f, 0.965925813f, -0.173648179f, -0.819152057f, 0.866025388f,
-0.0871557444f, -0.939692616f, 0.707106769f, 0.342020154f, -0.996194720f,
-0.500000000f, 0.573576450f, -0.984807730f, 0.258819044f, 0.766044438f,
--0.906307817f, 0.707106769f, -0.573576450f, -0.342020154f, 0.965925813f,
--0.766044438f, -0.0871557444f, 0.866025388f, -0.906307817f, 0.173648179f,
-0.707106769f, -0.984807730f, 0.422618270f, 0.500000000f, -0.996194720f,
-0.642787635f, 0.258819044f, -0.939692616f, 0.819152057f, 0.707106769f,
--0.707106769f, -1.83697015e-16f, 0.707106769f, -1.00000000f, 0.707106769f,
-5.51091070e-16f, -0.707106769f, 1.00000000f, -0.707106769f, -2.69484189e-15f,
-0.707106769f, -1.00000000f, 0.707106769f, -4.90477710e-16f, -0.707106769f,
-1.00000000f, -0.707106769f, 0.707106769f, -0.819152057f, 0.342020154f,
-0.258819044f, -0.766044438f, 0.996194720f, -0.866025388f, 0.422618270f,
-0.173648179f, -0.707106769f, 0.984807730f, -0.906307817f, 0.500000000f,
-0.0871557444f, -0.642787635f, 0.965925813f, -0.939692616f, 0.573576450f,
-0.707106769f, -0.906307817f, 0.642787635f, -0.258819044f, -0.173648179f,
-0.573576450f, -0.866025388f, 0.996194720f, -0.939692616f, 0.707106769f,
--0.342020154f, -0.0871557444f, 0.500000000f, -0.819152057f, 0.984807730f,
--0.965925813f, 0.766044438f, -0.422618270f, 0.707106769f, -0.965925813f,
-0.866025388f, -0.707106769f, 0.500000000f, -0.258819044f, 1.10280111e-15f,
-0.258819044f, -0.500000000f, 0.707106769f, -0.866025388f, 0.965925813f,
--1.00000000f, 0.965925813f, -0.866025388f, 0.707106769f, -0.500000000f,
-0.258819044f, 0.707106769f, -0.996194720f, 0.984807730f, -0.965925813f,
-0.939692616f, -0.906307817f, 0.866025388f, -0.819152057f, 0.766044438f,
--0.707106769f, 0.642787635f, -0.573576450f, 0.500000000f, -0.422618270f,
-0.342020154f, -0.258819044f, 0.173648179f, -0.0871557444f, };
+    0.707106769f, 0.996194720f, 0.984807730f, 0.965925813f, 0.939692616f,
+    0.906307817f, 0.866025388f, 0.819152057f, 0.766044438f, 0.707106769f,
+    0.642787635f, 0.573576450f, 0.500000000f, 0.422618270f, 0.342020154f,
+    0.258819044f, 0.173648179f, 0.0871557444f, 0.707106769f, 0.965925813f,
+    0.866025388f, 0.707106769f, 0.500000000f, 0.258819044f, 6.12323426e-17f,
+    -0.258819044f, -0.500000000f, -0.707106769f, -0.866025388f, -0.965925813f,
+    -1.00000000f, -0.965925813f, -0.866025388f, -0.707106769f, -0.500000000f,
+    -0.258819044f, 0.707106769f, 0.906307817f, 0.642787635f, 0.258819044f,
+    -0.173648179f, -0.573576450f, -0.866025388f, -0.996194720f, -0.939692616f,
+    -0.707106769f, -0.342020154f, 0.0871557444f, 0.500000000f, 0.819152057f,
+    0.984807730f, 0.965925813f, 0.766044438f, 0.422618270f, 0.707106769f,
+    0.819152057f, 0.342020154f, -0.258819044f, -0.766044438f, -0.996194720f,
+    -0.866025388f, -0.422618270f, 0.173648179f, 0.707106769f, 0.984807730f,
+    0.906307817f, 0.500000000f, -0.0871557444f, -0.642787635f, -0.965925813f,
+    -0.939692616f, -0.573576450f, 0.707106769f, 0.707106769f, 6.12323426e-17f,
+    -0.707106769f, -1.00000000f, -0.707106769f, -1.83697015e-16f, 0.707106769f,
+    1.00000000f, 0.707106769f, 3.06161700e-16f, -0.707106769f, -1.00000000f,
+    -0.707106769f, -4.28626385e-16f, 0.707106769f, 1.00000000f, 0.707106769f,
+    0.707106769f, 0.573576450f, -0.342020154f, -0.965925813f, -0.766044438f,
+    0.0871557444f, 0.866025388f, 0.906307817f, 0.173648179f, -0.707106769f,
+    -0.984807730f, -0.422618270f, 0.500000000f, 0.996194720f, 0.642787635f,
+    -0.258819044f, -0.939692616f, -0.819152057f, 0.707106769f, 0.422618270f,
+    -0.642787635f, -0.965925813f, -0.173648179f, 0.819152057f, 0.866025388f,
+    -0.0871557444f, -0.939692616f, -0.707106769f, 0.342020154f, 0.996194720f,
+    0.500000000f, -0.573576450f, -0.984807730f, -0.258819044f, 0.766044438f,
+    0.906307817f, 0.707106769f, 0.258819044f, -0.866025388f, -0.707106769f,
+    0.500000000f, 0.965925813f, 3.06161700e-16f, -0.965925813f, -0.500000000f,
+    0.707106769f, 0.866025388f, -0.258819044f, -1.00000000f, -0.258819044f,
+    0.866025388f, 0.707106769f, -0.500000000f, -0.965925813f, 0.707106769f,
+    0.0871557444f, -0.984807730f, -0.258819044f, 0.939692616f, 0.422618270f,
+    -0.866025388f, -0.573576450f, 0.766044438f, 0.707106769f, -0.642787635f,
+    -0.819152057f, 0.500000000f, 0.906307817f, -0.342020154f, -0.965925813f,
+    0.173648179f, 0.996194720f, 0.707106769f, -0.0871557444f, -0.984807730f,
+    0.258819044f, 0.939692616f, -0.422618270f, -0.866025388f, 0.573576450f,
+    0.766044438f, -0.707106769f, -0.642787635f, 0.819152057f, 0.500000000f,
+    -0.906307817f, -0.342020154f, 0.965925813f, 0.173648179f, -0.996194720f,
+    0.707106769f, -0.258819044f, -0.866025388f, 0.707106769f, 0.500000000f,
+    -0.965925813f, -4.28626385e-16f, 0.965925813f, -0.500000000f, -0.707106769f,
+    0.866025388f, 0.258819044f, -1.00000000f, 0.258819044f, 0.866025388f,
+    -0.707106769f, -0.500000000f, 0.965925813f, 0.707106769f, -0.422618270f,
+    -0.642787635f, 0.965925813f, -0.173648179f, -0.819152057f, 0.866025388f,
+    0.0871557444f, -0.939692616f, 0.707106769f, 0.342020154f, -0.996194720f,
+    0.500000000f, 0.573576450f, -0.984807730f, 0.258819044f, 0.766044438f,
+    -0.906307817f, 0.707106769f, -0.573576450f, -0.342020154f, 0.965925813f,
+    -0.766044438f, -0.0871557444f, 0.866025388f, -0.906307817f, 0.173648179f,
+    0.707106769f, -0.984807730f, 0.422618270f, 0.500000000f, -0.996194720f,
+    0.642787635f, 0.258819044f, -0.939692616f, 0.819152057f, 0.707106769f,
+    -0.707106769f, -1.83697015e-16f, 0.707106769f, -1.00000000f, 0.707106769f,
+    5.51091070e-16f, -0.707106769f, 1.00000000f, -0.707106769f, -2.69484189e-15f,
+    0.707106769f, -1.00000000f, 0.707106769f, -4.90477710e-16f, -0.707106769f,
+    1.00000000f, -0.707106769f, 0.707106769f, -0.819152057f, 0.342020154f,
+    0.258819044f, -0.766044438f, 0.996194720f, -0.866025388f, 0.422618270f,
+    0.173648179f, -0.707106769f, 0.984807730f, -0.906307817f, 0.500000000f,
+    0.0871557444f, -0.642787635f, 0.965925813f, -0.939692616f, 0.573576450f,
+    0.707106769f, -0.906307817f, 0.642787635f, -0.258819044f, -0.173648179f,
+    0.573576450f, -0.866025388f, 0.996194720f, -0.939692616f, 0.707106769f,
+    -0.342020154f, -0.0871557444f, 0.500000000f, -0.819152057f, 0.984807730f,
+    -0.965925813f, 0.766044438f, -0.422618270f, 0.707106769f, -0.965925813f,
+    0.866025388f, -0.707106769f, 0.500000000f, -0.258819044f, 1.10280111e-15f,
+    0.258819044f, -0.500000000f, 0.707106769f, -0.866025388f, 0.965925813f,
+    -1.00000000f, 0.965925813f, -0.866025388f, 0.707106769f, -0.500000000f,
+    0.258819044f, 0.707106769f, -0.996194720f, 0.984807730f, -0.965925813f,
+    0.939692616f, -0.906307817f, 0.866025388f, -0.819152057f, 0.766044438f,
+    -0.707106769f, 0.642787635f, -0.573576450f, 0.500000000f, -0.422618270f,
+    0.342020154f, -0.258819044f, 0.173648179f, -0.0871557444f,
+};
diff --git a/dnn/nndsp.c b/dnn/nndsp.c
index 86a711959..9989a5f9a 100644
--- a/dnn/nndsp.c
+++ b/dnn/nndsp.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 
@@ -40,40 +40,34 @@
 #include <math.h>
 
 #ifndef M_PI
-#define M_PI 3.141592653589793f
+# define M_PI 3.141592653589793f
 #endif
 
-#define KERNEL_INDEX(i_out_channels, i_in_channels, i_kernel) ((((i_out_channels) * in_channels) + (i_in_channels)) * kernel_size + (i_kernel))
+#define KERNEL_INDEX(i_out_channels, i_in_channels, \
+                     i_kernel) ((((i_out_channels)*in_channels) + (i_in_channels))*kernel_size + (i_kernel))
 
-void init_adaconv_state(AdaConvState *hAdaConv)
-{
+void init_adaconv_state(AdaConvState *hAdaConv) {
     OAC_CLEAR(hAdaConv, 1);
 }
 
-void init_adacomb_state(AdaCombState *hAdaComb)
-{
+void init_adacomb_state(AdaCombState *hAdaComb) {
     OAC_CLEAR(hAdaComb, 1);
 }
 
-void init_adashape_state(AdaShapeState *hAdaShape)
-{
+void init_adashape_state(AdaShapeState *hAdaShape) {
     OAC_CLEAR(hAdaShape, 1);
 }
 
-void compute_overlap_window(float *window, int overlap_size)
-{
+void compute_overlap_window(float *window, int overlap_size) {
     int i_sample;
-    for (i_sample=0; i_sample < overlap_size; i_sample++)
-    {
-        window[i_sample] = 0.5f + 0.5f * cos(M_PI * (i_sample + 0.5f) / overlap_size);
+    for (i_sample = 0; i_sample < overlap_size; i_sample++) {
+        window[i_sample] = 0.5f + 0.5f*cos(M_PI*(i_sample + 0.5f)/overlap_size);
     }
 }
 
 #ifdef DEBUG_NNDSP
-void print_float_vector(const char* name, const float *vec, int length)
-{
-    for (int i = 0; i < length; i ++)
-    {
+void print_float_vector(const char* name, const float *vec, int length) {
+    for (int i = 0; i < length; i++) {
         printf("%s[%d]: %f\n", name, i, vec[i]);
     }
 }
@@ -84,33 +78,27 @@ static void scale_kernel(
     int in_channels,
     int out_channels,
     int kernel_size,
-    float *gain
-)
+    float *gain) {
 /* normalizes (p-norm) kernel over input channel and kernel dimension */
-{
     float norm;
     int i_in_channels, i_out_channels, i_kernel;
 
-    for (i_out_channels = 0; i_out_channels < out_channels; i_out_channels++)
-    {
+    for (i_out_channels = 0; i_out_channels < out_channels; i_out_channels++) {
         norm = 0;
-        for (i_in_channels = 0; i_in_channels < in_channels; i_in_channels ++)
-        {
-            for (i_kernel = 0; i_kernel < kernel_size; i_kernel++)
-            {
-                norm += kernel[KERNEL_INDEX(i_out_channels, i_in_channels, i_kernel)] * kernel[KERNEL_INDEX(i_out_channels, i_in_channels, i_kernel)];
+        for (i_in_channels = 0; i_in_channels < in_channels; i_in_channels++) {
+            for (i_kernel = 0; i_kernel < kernel_size; i_kernel++) {
+                norm += kernel[KERNEL_INDEX(i_out_channels, i_in_channels,
+                i_kernel)]*kernel[KERNEL_INDEX(i_out_channels, i_in_channels, i_kernel)];
             }
         }
 #ifdef DEBUG_NNDSP
         printf("kernel norm: %f, %f\n", norm, sqrt(norm));
 #endif
-        norm = 1.f / (1e-6f + sqrt(norm));
-        for (i_in_channels = 0; i_in_channels < in_channels; i_in_channels++)
-        {
-            for (i_kernel = 0; i_kernel < kernel_size; i_kernel++)
-            {
+        norm = 1.f/(1e-6f + sqrt(norm));
+        for (i_in_channels = 0; i_in_channels < in_channels; i_in_channels++) {
+            for (i_kernel = 0; i_kernel < kernel_size; i_kernel++) {
 
-                kernel[KERNEL_INDEX(i_out_channels, i_in_channels, i_kernel)] *= norm * gain[i_out_channels];
+                kernel[KERNEL_INDEX(i_out_channels, i_in_channels, i_kernel)] *= norm*gain[i_out_channels];
             }
         }
     }
@@ -120,13 +108,10 @@ static void transform_gains(
     float *gains,
     int num_gains,
     float filter_gain_a,
-    float filter_gain_b
-)
-{
+    float filter_gain_b) {
     int i;
-    for (i = 0; i < num_gains; i++)
-    {
-        gains[i] = exp(filter_gain_a * gains[i] + filter_gain_b);
+    for (i = 0; i < num_gains; i++) {
+        gains[i] = exp(filter_gain_a*gains[i] + filter_gain_b);
     }
 }
 
@@ -148,12 +133,10 @@ void adaconv_process_frame(
     float filter_gain_b,
     float shape_gain,
     float *window,
-    int arch
-)
-{
-    float output_buffer[ADACONV_MAX_FRAME_SIZE * ADACONV_MAX_OUTPUT_CHANNELS];
-    float kernel_buffer[ADACONV_MAX_KERNEL_SIZE * ADACONV_MAX_INPUT_CHANNELS * ADACONV_MAX_OUTPUT_CHANNELS];
-    float input_buffer[ADACONV_MAX_INPUT_CHANNELS * (ADACONV_MAX_FRAME_SIZE + ADACONV_MAX_KERNEL_SIZE)];
+    int arch) {
+    float output_buffer[ADACONV_MAX_FRAME_SIZE*ADACONV_MAX_OUTPUT_CHANNELS];
+    float kernel_buffer[ADACONV_MAX_KERNEL_SIZE*ADACONV_MAX_INPUT_CHANNELS*ADACONV_MAX_OUTPUT_CHANNELS];
+    float input_buffer[ADACONV_MAX_INPUT_CHANNELS*(ADACONV_MAX_FRAME_SIZE + ADACONV_MAX_KERNEL_SIZE)];
     float kernel0[ADACONV_MAX_KERNEL_SIZE];
     float kernel1[ADACONV_MAX_KERNEL_SIZE];
     float channel_buffer0[ADACONV_MAX_OVERLAP_SIZE];
@@ -168,19 +151,20 @@ void adaconv_process_frame(
     celt_assert(left_padding == kernel_size - 1); /* currently only supports causal version. Non-causal version not difficult to implement but will require third loop */
     celt_assert(kernel_size < frame_size);
 
-    OAC_CLEAR(output_buffer, ADACONV_MAX_FRAME_SIZE * ADACONV_MAX_OUTPUT_CHANNELS);
-    OAC_CLEAR(kernel_buffer, ADACONV_MAX_KERNEL_SIZE * ADACONV_MAX_INPUT_CHANNELS * ADACONV_MAX_OUTPUT_CHANNELS);
-    OAC_CLEAR(input_buffer, ADACONV_MAX_INPUT_CHANNELS * (ADACONV_MAX_FRAME_SIZE + ADACONV_MAX_KERNEL_SIZE));
+    OAC_CLEAR(output_buffer, ADACONV_MAX_FRAME_SIZE*ADACONV_MAX_OUTPUT_CHANNELS);
+    OAC_CLEAR(kernel_buffer, ADACONV_MAX_KERNEL_SIZE*ADACONV_MAX_INPUT_CHANNELS*ADACONV_MAX_OUTPUT_CHANNELS);
+    OAC_CLEAR(input_buffer, ADACONV_MAX_INPUT_CHANNELS*(ADACONV_MAX_FRAME_SIZE + ADACONV_MAX_KERNEL_SIZE));
 
 #ifdef DEBUG_NNDSP
-    print_float_vector("x_in", x_in, in_channels * frame_size);
+    print_float_vector("x_in", x_in, in_channels*frame_size);
 #endif
 
     /* prepare input */
-    for (i_in_channels=0; i_in_channels < in_channels; i_in_channels ++)
-    {
-        OAC_COPY(input_buffer + i_in_channels * (kernel_size + frame_size), hAdaConv->history + i_in_channels * kernel_size, kernel_size);
-        OAC_COPY(input_buffer + kernel_size + i_in_channels * (kernel_size + frame_size), x_in + frame_size * i_in_channels, frame_size);
+    for (i_in_channels = 0; i_in_channels < in_channels; i_in_channels++) {
+        OAC_COPY(input_buffer + i_in_channels*(kernel_size + frame_size), hAdaConv->history + i_in_channels*kernel_size,
+        kernel_size);
+        OAC_COPY(input_buffer + kernel_size + i_in_channels*(kernel_size + frame_size), x_in + frame_size*i_in_channels,
+        frame_size);
     }
     p_input = input_buffer + kernel_size;
 
@@ -190,54 +174,53 @@ void adaconv_process_frame(
     compute_generic_dense(gain_layer, gain_buffer, features, ACTIVATION_TANH, arch);
 #ifdef DEBUG_NNDSP
     print_float_vector("features", features, feature_dim);
-    print_float_vector("adaconv_kernel_raw", kernel_buffer, in_channels * out_channels * kernel_size);
+    print_float_vector("adaconv_kernel_raw", kernel_buffer, in_channels*out_channels*kernel_size);
     print_float_vector("adaconv_gain_raw", gain_buffer, out_channels);
 #endif
     transform_gains(gain_buffer, out_channels, filter_gain_a, filter_gain_b);
     scale_kernel(kernel_buffer, in_channels, out_channels, kernel_size, gain_buffer);
 
 #ifdef DEBUG_NNDSP
-    print_float_vector("adaconv_kernel", kernel_buffer, in_channels * out_channels * kernel_size);
+    print_float_vector("adaconv_kernel", kernel_buffer, in_channels*out_channels*kernel_size);
     print_float_vector("adaconv_gain", gain_buffer, out_channels);
 #endif
 
     /* calculate overlapping part using kernel from last frame */
 
-    for (i_out_channels = 0; i_out_channels < out_channels; i_out_channels++)
-    {
-        for (i_in_channels = 0; i_in_channels < in_channels; i_in_channels++)
-        {
+    for (i_out_channels = 0; i_out_channels < out_channels; i_out_channels++) {
+        for (i_in_channels = 0; i_in_channels < in_channels; i_in_channels++) {
             OAC_CLEAR(kernel0, ADACONV_MAX_KERNEL_SIZE);
             OAC_CLEAR(kernel1, ADACONV_MAX_KERNEL_SIZE);
 
             OAC_COPY(kernel0, hAdaConv->last_kernel + KERNEL_INDEX(i_out_channels, i_in_channels, 0), kernel_size);
             OAC_COPY(kernel1, kernel_buffer + KERNEL_INDEX(i_out_channels, i_in_channels, 0), kernel_size);
-            celt_pitch_xcorr(kernel0, p_input + i_in_channels * (frame_size + kernel_size) - left_padding, channel_buffer0, ADACONV_MAX_KERNEL_SIZE, overlap_size, arch);
-            celt_pitch_xcorr(kernel1, p_input + i_in_channels * (frame_size + kernel_size) - left_padding, channel_buffer1, ADACONV_MAX_KERNEL_SIZE, frame_size, arch);
-            for (i_sample = 0; i_sample < overlap_size; i_sample++)
-            {
-                output_buffer[i_sample + i_out_channels * frame_size] +=  window[i_sample] * channel_buffer0[i_sample];
-                output_buffer[i_sample + i_out_channels * frame_size] += (1.f - window[i_sample]) * channel_buffer1[i_sample];
+            celt_pitch_xcorr(kernel0, p_input + i_in_channels*(frame_size + kernel_size) - left_padding,
+            channel_buffer0, ADACONV_MAX_KERNEL_SIZE, overlap_size, arch);
+            celt_pitch_xcorr(kernel1, p_input + i_in_channels*(frame_size + kernel_size) - left_padding,
+            channel_buffer1, ADACONV_MAX_KERNEL_SIZE, frame_size, arch);
+            for (i_sample = 0; i_sample < overlap_size; i_sample++) {
+                output_buffer[i_sample + i_out_channels*frame_size] +=  window[i_sample]*channel_buffer0[i_sample];
+                output_buffer[i_sample + i_out_channels*frame_size] += (1.f - window[i_sample])
+                                                                       *channel_buffer1[i_sample];
             }
-            for (i_sample = overlap_size; i_sample < frame_size; i_sample++)
-            {
-                output_buffer[i_sample + i_out_channels * frame_size] += channel_buffer1[i_sample];
+            for (i_sample = overlap_size; i_sample < frame_size; i_sample++) {
+                output_buffer[i_sample + i_out_channels*frame_size] += channel_buffer1[i_sample];
             }
         }
     }
 
-    OAC_COPY(x_out, output_buffer, out_channels * frame_size);
+    OAC_COPY(x_out, output_buffer, out_channels*frame_size);
 
 #ifdef DEBUG_NNDSP
-    print_float_vector("x_out", x_out, out_channels * frame_size);
+    print_float_vector("x_out", x_out, out_channels*frame_size);
 #endif
 
     /* buffer update */
-    for (i_in_channels=0; i_in_channels < in_channels; i_in_channels ++)
-    {
-        OAC_COPY(hAdaConv->history + i_in_channels * kernel_size, p_input + i_in_channels * (frame_size + kernel_size) + frame_size - kernel_size, kernel_size);
+    for (i_in_channels = 0; i_in_channels < in_channels; i_in_channels++) {
+        OAC_COPY(hAdaConv->history + i_in_channels*kernel_size,
+        p_input + i_in_channels*(frame_size + kernel_size) + frame_size - kernel_size, kernel_size);
     }
-    OAC_COPY(hAdaConv->last_kernel, kernel_buffer, kernel_size * in_channels * out_channels);
+    OAC_COPY(hAdaConv->last_kernel, kernel_buffer, kernel_size*in_channels*out_channels);
 }
 
 void adacomb_process_frame(
@@ -258,9 +241,7 @@ void adacomb_process_frame(
     float filter_gain_b,
     float log_gain_limit,
     float *window,
-    int arch
-)
-{
+    int arch) {
     float output_buffer[ADACOMB_MAX_FRAME_SIZE];
     float output_buffer_last[ADACOMB_MAX_FRAME_SIZE];
     float kernel_buffer[ADACOMB_MAX_KERNEL_SIZE];
@@ -292,7 +273,7 @@ void adacomb_process_frame(
     print_float_vector("adacomb_global_gain_raw", &global_gain, 1);
 #endif
     gain = exp(log_gain_limit - gain);
-    global_gain = exp(filter_gain_a * global_gain + filter_gain_b);
+    global_gain = exp(filter_gain_a*global_gain + filter_gain_b);
     scale_kernel(kernel_buffer, 1, 1, kernel_size, &gain);
 
 #ifdef DEBUG_NNDSP
@@ -305,22 +286,23 @@ void adacomb_process_frame(
     OAC_COPY(kernel, kernel_buffer, kernel_size);
     OAC_COPY(last_kernel, hAdaComb->last_kernel, kernel_size);
 
-    celt_pitch_xcorr(last_kernel, &p_input[- left_padding - hAdaComb->last_pitch_lag], output_buffer_last, ADACOMB_MAX_KERNEL_SIZE, overlap_size, arch);
+    celt_pitch_xcorr(last_kernel, &p_input[-left_padding - hAdaComb->last_pitch_lag], output_buffer_last,
+    ADACOMB_MAX_KERNEL_SIZE, overlap_size, arch);
 
-    celt_pitch_xcorr(kernel, &p_input[- left_padding - pitch_lag], output_buffer, ADACOMB_MAX_KERNEL_SIZE, frame_size, arch);
-    for (i_sample = 0; i_sample < overlap_size; i_sample++)
-    {
-      output_buffer[i_sample] = hAdaComb->last_global_gain * window[i_sample] * output_buffer_last[i_sample] + global_gain * (1.f - window[i_sample]) * output_buffer[i_sample];
+    celt_pitch_xcorr(kernel, &p_input[-left_padding - pitch_lag], output_buffer, ADACOMB_MAX_KERNEL_SIZE, frame_size,
+    arch);
+    for (i_sample = 0; i_sample < overlap_size; i_sample++) {
+        output_buffer[i_sample] = hAdaComb->last_global_gain*window[i_sample]*output_buffer_last[i_sample]
+                                  + global_gain*(1.f - window[i_sample])*output_buffer[i_sample];
     }
 
-    for (i_sample = 0; i_sample < overlap_size; i_sample++)
-    {
-      output_buffer[i_sample] += (window[i_sample] * hAdaComb->last_global_gain + (1.f - window[i_sample]) * global_gain) * p_input[i_sample];
+    for (i_sample = 0; i_sample < overlap_size; i_sample++) {
+        output_buffer[i_sample] += (window[i_sample]*hAdaComb->last_global_gain + (1.f - window[i_sample])*global_gain)
+                                   *p_input[i_sample];
     }
 
-    for (i_sample = overlap_size; i_sample < frame_size; i_sample++)
-    {
-      output_buffer[i_sample] = global_gain * (output_buffer[i_sample] + p_input[i_sample]);
+    for (i_sample = overlap_size; i_sample < frame_size; i_sample++) {
+        output_buffer[i_sample] = global_gain*(output_buffer[i_sample] + p_input[i_sample]);
     }
     OAC_COPY(x_out, output_buffer, frame_size);
 
@@ -348,24 +330,22 @@ void adashape_process_frame(
     int frame_size,
     int avg_pool_k,
     int interpolate_k,
-    int arch
-)
-{
+    int arch) {
     float in_buffer[ADASHAPE_MAX_INPUT_DIM + ADASHAPE_MAX_FRAME_SIZE];
     float out_buffer[ADASHAPE_MAX_FRAME_SIZE];
     float tmp_buffer[ADASHAPE_MAX_FRAME_SIZE];
     int i, k;
     int tenv_size;
-    int hidden_dim = frame_size / interpolate_k;
+    int hidden_dim = frame_size/interpolate_k;
     float mean;
     float *tenv;
-    float f = 1.0f / avg_pool_k;
+    float f = 1.0f/avg_pool_k;
 
-    celt_assert(frame_size % avg_pool_k == 0);
-    celt_assert(frame_size % interpolate_k == 0);
-    celt_assert(feature_dim + frame_size / avg_pool_k + 1 < ADASHAPE_MAX_INPUT_DIM);
+    celt_assert(frame_size%avg_pool_k == 0);
+    celt_assert(frame_size%interpolate_k == 0);
+    celt_assert(feature_dim + frame_size/avg_pool_k + 1 < ADASHAPE_MAX_INPUT_DIM);
 
-    tenv_size = frame_size / avg_pool_k;
+    tenv_size = frame_size/avg_pool_k;
     tenv = in_buffer + feature_dim;
     OAC_CLEAR(tenv, tenv_size + 1);
 
@@ -373,18 +353,15 @@ void adashape_process_frame(
 
     /* calculate temporal envelope */
     mean = 0;
-    for (i = 0; i < tenv_size; i++)
-    {
-        for (k = 0; k < avg_pool_k; k++)
-        {
-            tenv[i] += fabs(x_in[i * avg_pool_k + k]);
+    for (i = 0; i < tenv_size; i++) {
+        for (k = 0; k < avg_pool_k; k++) {
+            tenv[i] += fabs(x_in[i*avg_pool_k + k]);
         }
-        tenv[i] = celt_log(tenv[i] * f + 1.52587890625e-05f);
+        tenv[i] = celt_log(tenv[i]*f + 1.52587890625e-05f);
         mean += tenv[i];
     }
     mean /= tenv_size;
-    for (i = 0; i < tenv_size; i++)
-    {
+    for (i = 0; i < tenv_size; i++) {
         tenv[i] -= mean;
     }
     tenv[tenv_size] = mean;
@@ -396,33 +373,33 @@ void adashape_process_frame(
 #ifdef DEBUG_NNDSP
     print_float_vector("alpha1_in", in_buffer, feature_dim + tenv_size + 1);
 #endif
-    compute_generic_conv1d(alpha1f, out_buffer, hAdaShape->conv_alpha1f_state, in_buffer, feature_dim, ACTIVATION_LINEAR, arch);
-    compute_generic_conv1d(alpha1t, tmp_buffer, hAdaShape->conv_alpha1t_state, tenv, tenv_size + 1, ACTIVATION_LINEAR, arch);
+    compute_generic_conv1d(alpha1f, out_buffer, hAdaShape->conv_alpha1f_state, in_buffer, feature_dim,
+    ACTIVATION_LINEAR, arch);
+    compute_generic_conv1d(alpha1t, tmp_buffer, hAdaShape->conv_alpha1t_state, tenv, tenv_size + 1, ACTIVATION_LINEAR,
+    arch);
 #ifdef DEBUG_NNDSP
     print_float_vector("alpha1_out", out_buffer, frame_size);
 #endif
     /* compute leaky ReLU by hand. */
-    for (i = 0; i < hidden_dim; i ++)
-    {
+    for (i = 0; i < hidden_dim; i++) {
         float tmp = out_buffer[i] + tmp_buffer[i];
-        in_buffer[i] = tmp >= 0 ? tmp : 0.2 * tmp;
+        in_buffer[i] = tmp >= 0 ? tmp : 0.2*tmp;
     }
 #ifdef DEBUG_NNDSP
     print_float_vector("post_alpha1", in_buffer, frame_size);
 #endif
-    compute_generic_conv1d(alpha2, tmp_buffer, hAdaShape->conv_alpha2_state, in_buffer, hidden_dim, ACTIVATION_LINEAR, arch);
+    compute_generic_conv1d(alpha2, tmp_buffer, hAdaShape->conv_alpha2_state, in_buffer, hidden_dim, ACTIVATION_LINEAR,
+    arch);
 
 #ifdef DEBUG_NNDSP
     print_float_vector("alpha2_out", tmp_buffer, hidden_dim);
 #endif
 
     /* upsampling by linear interpolation */
-    for (i = 0; i < hidden_dim; i ++)
-    {
-        for (k = 0; k < interpolate_k; k++)
-        {
-            float alpha = (float) (k + 1) / interpolate_k;
-            out_buffer[i * interpolate_k + k] = alpha * tmp_buffer[i] + (1.f - alpha) * hAdaShape->interpolate_state[0];
+    for (i = 0; i < hidden_dim; i++) {
+        for (k = 0; k < interpolate_k; k++) {
+            float alpha = (float) (k + 1)/interpolate_k;
+            out_buffer[i*interpolate_k + k] = alpha*tmp_buffer[i] + (1.f - alpha)*hAdaShape->interpolate_state[0];
         }
         hAdaShape->interpolate_state[0] = tmp_buffer[i];
     }
@@ -433,9 +410,8 @@ void adashape_process_frame(
 
     compute_activation(out_buffer, out_buffer, frame_size, ACTIVATION_EXP, arch);
     /* shape signal */
-    for (i = 0; i < frame_size; i ++)
-    {
-        x_out[i] = out_buffer[i] * x_in[i];
+    for (i = 0; i < frame_size; i++) {
+        x_out[i] = out_buffer[i]*x_in[i];
     }
 
 }
diff --git a/dnn/nndsp.h b/dnn/nndsp.h
index 6bb85a4c3..4fadc4d52 100644
--- a/dnn/nndsp.h
+++ b/dnn/nndsp.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef NNDSP_H
 #define NNDSP_H
@@ -49,15 +49,15 @@
 
 /*#define DEBUG_NNDSP*/
 #ifdef DEBUG_NNDSP
-#include <stdio.h>
+# include <stdio.h>
 #endif
 
 
 void print_float_vector(const char* name, const float *vec, int length);
 
 typedef struct {
-    float history[ADACONV_MAX_KERNEL_SIZE * ADACONV_MAX_INPUT_CHANNELS];
-    float last_kernel[ADACONV_MAX_KERNEL_SIZE * ADACONV_MAX_INPUT_CHANNELS * ADACONV_MAX_OUTPUT_CHANNELS];
+    float history[ADACONV_MAX_KERNEL_SIZE*ADACONV_MAX_INPUT_CHANNELS];
+    float last_kernel[ADACONV_MAX_KERNEL_SIZE*ADACONV_MAX_INPUT_CHANNELS*ADACONV_MAX_OUTPUT_CHANNELS];
     float last_gain;
 } AdaConvState;
 
@@ -103,8 +103,7 @@ void adaconv_process_frame(
     float filter_gain_b,
     float shape_gain,
     float *window,
-    int arch
-);
+    int arch);
 
 void adacomb_process_frame(
     AdaCombState* hAdaComb,
@@ -124,8 +123,7 @@ void adacomb_process_frame(
     float filter_gain_b,
     float log_gain_limit,
     float *window,
-    int arch
-);
+    int arch);
 
 void adashape_process_frame(
     AdaShapeState *hAdaShape,
@@ -139,7 +137,6 @@ void adashape_process_frame(
     int frame_size,
     int avg_pool_k,
     int interpolate_k,
-    int arch
-);
+    int arch);
 
 #endif
diff --git a/dnn/nnet.c b/dnn/nnet.c
index 88f8a0369..d32723f00 100644
--- a/dnn/nnet.c
+++ b/dnn/nnet.c
@@ -24,10 +24,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdlib.h>
@@ -42,112 +42,112 @@
 #include "vec.h"
 
 #ifdef ENABLE_OSCE
-#include "osce.h"
+# include "osce.h"
 #endif
 
 #ifdef NO_OPTIMIZATIONS
-#if defined(_MSC_VER)
-#pragma message ("Compiling without any vectorization. This code will be very slow")
-#else
-#warning Compiling without any vectorization. This code will be very slow
-#endif
+# if defined(_MSC_VER)
+#  pragma message ("Compiling without any vectorization. This code will be very slow")
+# else
+#  warning Compiling without any vectorization. This code will be very slow
+# endif
 #endif
 
 
 #define SOFTMAX_HACK
 
 
-void compute_generic_dense(const LinearLayer *layer, float *output, const float *input, int activation, int arch)
-{
-   compute_linear(layer, output, input, arch);
-   compute_activation(output, output, layer->nb_outputs, activation, arch);
+void compute_generic_dense(const LinearLayer *layer, float *output, const float *input, int activation, int arch) {
+    compute_linear(layer, output, input, arch);
+    compute_activation(output, output, layer->nb_outputs, activation, arch);
 }
 
 #ifdef ENABLE_OSCE
-#ifdef ENABLE_OSCE_BWE
-#define MAX_RNN_NEURONS_ALL IMAX(IMAX(IMAX(IMAX(FARGAN_MAX_RNN_NEURONS, PLC_MAX_RNN_UNITS), DRED_MAX_RNN_NEURONS), OSCE_MAX_RNN_NEURONS), OSCE_BWE_MAX_RNN_NEURONS)
-#else
-#define MAX_RNN_NEURONS_ALL IMAX(IMAX(IMAX(FARGAN_MAX_RNN_NEURONS, PLC_MAX_RNN_UNITS), DRED_MAX_RNN_NEURONS), OSCE_MAX_RNN_NEURONS)
-#endif
+# ifdef ENABLE_OSCE_BWE
+#  define MAX_RNN_NEURONS_ALL IMAX(IMAX(IMAX(IMAX(FARGAN_MAX_RNN_NEURONS, PLC_MAX_RNN_UNITS), DRED_MAX_RNN_NEURONS), \
+    OSCE_MAX_RNN_NEURONS), OSCE_BWE_MAX_RNN_NEURONS)
+# else
+#  define MAX_RNN_NEURONS_ALL IMAX(IMAX(IMAX(FARGAN_MAX_RNN_NEURONS, PLC_MAX_RNN_UNITS), DRED_MAX_RNN_NEURONS), \
+    OSCE_MAX_RNN_NEURONS)
+# endif
 #else
-#define MAX_RNN_NEURONS_ALL IMAX(IMAX(FARGAN_MAX_RNN_NEURONS, PLC_MAX_RNN_UNITS), DRED_MAX_RNN_NEURONS)
+# define MAX_RNN_NEURONS_ALL IMAX(IMAX(FARGAN_MAX_RNN_NEURONS, PLC_MAX_RNN_UNITS), DRED_MAX_RNN_NEURONS)
 #endif
 
-void compute_generic_gru(const LinearLayer *input_weights, const LinearLayer *recurrent_weights, float *state, const float *in, int arch)
-{
-  int i;
-  int N;
-  float zrh[3*MAX_RNN_NEURONS_ALL];
-  float recur[3*MAX_RNN_NEURONS_ALL];
-  float *z;
-  float *r;
-  float *h;
-  celt_assert(3*recurrent_weights->nb_inputs == recurrent_weights->nb_outputs);
-  celt_assert(input_weights->nb_outputs == recurrent_weights->nb_outputs);
-  N = recurrent_weights->nb_inputs;
-  z = zrh;
-  r = &zrh[N];
-  h = &zrh[2*N];
-  celt_assert(recurrent_weights->nb_outputs <= 3*MAX_RNN_NEURONS_ALL);
-  celt_assert(in != state);
-  compute_linear(input_weights, zrh, in, arch);
-  compute_linear(recurrent_weights, recur, state, arch);
-  for (i=0;i<2*N;i++)
-     zrh[i] += recur[i];
-  compute_activation(zrh, zrh, 2*N, ACTIVATION_SIGMOID, arch);
-  for (i=0;i<N;i++)
-     h[i] += recur[2*N+i]*r[i];
-  compute_activation(h, h, N, ACTIVATION_TANH, arch);
-  for (i=0;i<N;i++)
-     h[i] = z[i]*state[i] + (1-z[i])*h[i];
-  for (i=0;i<N;i++)
-     state[i] = h[i];
+void compute_generic_gru(const LinearLayer *input_weights, const LinearLayer *recurrent_weights, float *state,
+                         const float *in, int arch) {
+    int i;
+    int N;
+    float zrh[3*MAX_RNN_NEURONS_ALL];
+    float recur[3*MAX_RNN_NEURONS_ALL];
+    float *z;
+    float *r;
+    float *h;
+    celt_assert(3*recurrent_weights->nb_inputs == recurrent_weights->nb_outputs);
+    celt_assert(input_weights->nb_outputs == recurrent_weights->nb_outputs);
+    N = recurrent_weights->nb_inputs;
+    z = zrh;
+    r = &zrh[N];
+    h = &zrh[2*N];
+    celt_assert(recurrent_weights->nb_outputs <= 3*MAX_RNN_NEURONS_ALL);
+    celt_assert(in != state);
+    compute_linear(input_weights, zrh, in, arch);
+    compute_linear(recurrent_weights, recur, state, arch);
+    for (i = 0; i < 2*N; i++)
+        zrh[i] += recur[i];
+    compute_activation(zrh, zrh, 2*N, ACTIVATION_SIGMOID, arch);
+    for (i = 0; i < N; i++)
+        h[i] += recur[2*N + i]*r[i];
+    compute_activation(h, h, N, ACTIVATION_TANH, arch);
+    for (i = 0; i < N; i++)
+        h[i] = z[i]*state[i] + (1 - z[i])*h[i];
+    for (i = 0; i < N; i++)
+        state[i] = h[i];
 }
 
-void compute_glu(const LinearLayer *layer, float *output, const float *input, int arch)
-{
-   int i;
-   float act2[MAX_INPUTS];
-   celt_assert(layer->nb_inputs == layer->nb_outputs);
-   compute_linear(layer, act2, input, arch);
-   compute_activation(act2, act2, layer->nb_outputs, ACTIVATION_SIGMOID, arch);
-   if (input == output) {
-     /* Give a vectorization hint to the compiler for the in-place case. */
-     for (i=0;i<layer->nb_outputs;i++) output[i] = output[i]*act2[i];
-   } else {
-     for (i=0;i<layer->nb_outputs;i++) output[i] = input[i]*act2[i];
-   }
+void compute_glu(const LinearLayer *layer, float *output, const float *input, int arch) {
+    int i;
+    float act2[MAX_INPUTS];
+    celt_assert(layer->nb_inputs == layer->nb_outputs);
+    compute_linear(layer, act2, input, arch);
+    compute_activation(act2, act2, layer->nb_outputs, ACTIVATION_SIGMOID, arch);
+    if (input == output) {
+        /* Give a vectorization hint to the compiler for the in-place case. */
+        for (i = 0; i < layer->nb_outputs; i++) output[i] = output[i]*act2[i];
+    } else {
+        for (i = 0; i < layer->nb_outputs; i++) output[i] = input[i]*act2[i];
+    }
 }
 
 #define MAX_CONV_INPUTS_ALL IMAX(DRED_MAX_CONV_INPUTS, 1024)
 
-void compute_generic_conv1d(const LinearLayer *layer, float *output, float *mem, const float *input, int input_size, int activation, int arch)
-{
-   float tmp[MAX_CONV_INPUTS_ALL];
-   celt_assert(input != output);
-   celt_assert(layer->nb_inputs <= MAX_CONV_INPUTS_ALL);
-   if (layer->nb_inputs!=input_size) OAC_COPY(tmp, mem, layer->nb_inputs-input_size);
-   OAC_COPY(&tmp[layer->nb_inputs-input_size], input, input_size);
-   compute_linear(layer, output, tmp, arch);
-   compute_activation(output, output, layer->nb_outputs, activation, arch);
-   if (layer->nb_inputs!=input_size) OAC_COPY(mem, &tmp[input_size], layer->nb_inputs-input_size);
+void compute_generic_conv1d(const LinearLayer *layer, float *output, float *mem, const float *input, int input_size,
+                            int activation, int arch) {
+    float tmp[MAX_CONV_INPUTS_ALL];
+    celt_assert(input != output);
+    celt_assert(layer->nb_inputs <= MAX_CONV_INPUTS_ALL);
+    if (layer->nb_inputs != input_size) OAC_COPY(tmp, mem, layer->nb_inputs - input_size);
+    OAC_COPY(&tmp[layer->nb_inputs - input_size], input, input_size);
+    compute_linear(layer, output, tmp, arch);
+    compute_activation(output, output, layer->nb_outputs, activation, arch);
+    if (layer->nb_inputs != input_size) OAC_COPY(mem, &tmp[input_size], layer->nb_inputs - input_size);
 }
 
-void compute_generic_conv1d_dilation(const LinearLayer *layer, float *output, float *mem, const float *input, int input_size, int dilation, int activation, int arch)
-{
-   float tmp[MAX_CONV_INPUTS_ALL];
-   int ksize = layer->nb_inputs/input_size;
-   int i;
-   celt_assert(input != output);
-   celt_assert(layer->nb_inputs <= MAX_CONV_INPUTS_ALL);
-   if (dilation==1) OAC_COPY(tmp, mem, layer->nb_inputs-input_size);
-   else for (i=0;i<ksize-1;i++) OAC_COPY(&tmp[i*input_size], &mem[i*input_size*dilation], input_size);
-   OAC_COPY(&tmp[layer->nb_inputs-input_size], input, input_size);
-   compute_linear(layer, output, tmp, arch);
-   compute_activation(output, output, layer->nb_outputs, activation, arch);
-   if (dilation==1) OAC_COPY(mem, &tmp[input_size], layer->nb_inputs-input_size);
-   else {
-     OAC_COPY(mem, &mem[input_size], input_size*dilation*(ksize-1)-input_size);
-     OAC_COPY(&mem[input_size*dilation*(ksize-1)-input_size], input, input_size);
-   }
+void compute_generic_conv1d_dilation(const LinearLayer *layer, float *output, float *mem, const float *input,
+                                     int input_size, int dilation, int activation, int arch) {
+    float tmp[MAX_CONV_INPUTS_ALL];
+    int ksize = layer->nb_inputs/input_size;
+    int i;
+    celt_assert(input != output);
+    celt_assert(layer->nb_inputs <= MAX_CONV_INPUTS_ALL);
+    if (dilation == 1) OAC_COPY(tmp, mem, layer->nb_inputs - input_size);
+    else for (i = 0; i < ksize - 1; i++) OAC_COPY(&tmp[i*input_size], &mem[i*input_size*dilation], input_size);
+    OAC_COPY(&tmp[layer->nb_inputs - input_size], input, input_size);
+    compute_linear(layer, output, tmp, arch);
+    compute_activation(output, output, layer->nb_outputs, activation, arch);
+    if (dilation == 1) OAC_COPY(mem, &tmp[input_size], layer->nb_inputs - input_size);
+    else {
+        OAC_COPY(mem, &mem[input_size], input_size*dilation*(ksize - 1) - input_size);
+        OAC_COPY(&mem[input_size*dilation*(ksize - 1) - input_size], input, input_size);
+    }
 }
diff --git a/dnn/nnet.h b/dnn/nnet.h
index 680871b90..f8e085a65 100644
--- a/dnn/nnet.h
+++ b/dnn/nnet.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef NNET_H_
 #define NNET_H_
@@ -42,10 +42,10 @@
 #define WEIGHT_BLOB_VERSION 0
 #define WEIGHT_BLOCK_SIZE 64
 typedef struct {
-  const char *name;
-  int type;
-  int size;
-  const void *data;
+    const char *name;
+    int type;
+    int size;
+    const void *data;
 } WeightArray;
 
 #define WEIGHT_TYPE_float 0
@@ -54,42 +54,45 @@ typedef struct {
 #define WEIGHT_TYPE_int8 3
 
 typedef struct {
-  char head[4];
-  int version;
-  int type;
-  int size;
-  int block_size;
-  char name[44];
+    char head[4];
+    int version;
+    int type;
+    int size;
+    int block_size;
+    char name[44];
 } WeightHead;
 
 /* Generic sparse affine transformation. */
 typedef struct {
-  const float *bias;
-  const float *subias;
-  const oac_int8 *weights;
-  const float *float_weights;
-  const int *weights_idx;
-  const float *diag;
-  const float *scale;
-  int nb_inputs;
-  int nb_outputs;
+    const float *bias;
+    const float *subias;
+    const oac_int8 *weights;
+    const float *float_weights;
+    const int *weights_idx;
+    const float *diag;
+    const float *scale;
+    int nb_inputs;
+    int nb_outputs;
 } LinearLayer;
 
 /* Generic sparse affine transformation. */
 typedef struct {
-  const float *bias;
-  const float *float_weights;
-  int in_channels;
-  int out_channels;
-  int ktime;
-  int kheight;
+    const float *bias;
+    const float *float_weights;
+    int in_channels;
+    int out_channels;
+    int ktime;
+    int kheight;
 } Conv2dLayer;
 
 
 void compute_generic_dense(const LinearLayer *layer, float *output, const float *input, int activation, int arch);
-void compute_generic_gru(const LinearLayer *input_weights, const LinearLayer *recurrent_weights, float *state, const float *in, int arch);
-void compute_generic_conv1d(const LinearLayer *layer, float *output, float *mem, const float *input, int input_size, int activation, int arch);
-void compute_generic_conv1d_dilation(const LinearLayer *layer, float *output, float *mem, const float *input, int input_size, int dilation, int activation, int arch);
+void compute_generic_gru(const LinearLayer *input_weights, const LinearLayer *recurrent_weights, float *state,
+    const float *in, int arch);
+void compute_generic_conv1d(const LinearLayer *layer, float *output, float *mem, const float *input, int input_size,
+    int activation, int arch);
+void compute_generic_conv1d_dilation(const LinearLayer *layer, float *output, float *mem, const float *input,
+    int input_size, int dilation, int activation, int arch);
 void compute_glu(const LinearLayer *layer, float *output, const float *input, int arch);
 void compute_gated_activation(const LinearLayer *layer, float *output, const float *input, int activation, int arch);
 
@@ -110,56 +113,63 @@ extern const WeightArray nolacelayers_arrays[];
 extern const WeightArray bbwenetlayers_arrays[];
 
 int linear_init(LinearLayer *layer, const WeightArray *arrays,
-  const char *bias,
-  const char *subias,
-  const char *weights,
-  const char *float_weights,
-  const char *weights_idx,
-  const char *diag,
-  const char *scale,
-  int nb_inputs,
-  int nb_outputs);
+    const char *bias,
+    const char *subias,
+    const char *weights,
+    const char *float_weights,
+    const char *weights_idx,
+    const char *diag,
+    const char *scale,
+    int nb_inputs,
+    int nb_outputs);
 
 int conv2d_init(Conv2dLayer *layer, const WeightArray *arrays,
-  const char *bias,
-  const char *float_weights,
-  int in_channels,
-  int out_channels,
-  int ktime,
-  int kheight);
+    const char *bias,
+    const char *float_weights,
+    int in_channels,
+    int out_channels,
+    int ktime,
+    int kheight);
 
 
 void compute_linear_c(const LinearLayer *linear, float *out, const float *in);
 void compute_activation_c(float *output, const float *input, int N, int activation);
-void compute_conv2d_c(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride, int activation);
+void compute_conv2d_c(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride,
+    int activation);
 
 
 #if defined(OAC_ARM_MAY_HAVE_DOTPROD) || defined(OAC_ARM_MAY_HAVE_NEON_INTR)
-#include "arm/dnn_arm.h"
+# include "arm/dnn_arm.h"
 #endif
 
 #if defined(OAC_X86_MAY_HAVE_SSE2)
-#include "x86/dnn_x86.h"
+# include "x86/dnn_x86.h"
 #endif
 
 #ifndef OVERRIDE_COMPUTE_LINEAR
-#define compute_linear(linear, out, in, arch) ((void)(arch),compute_linear_c(linear, out, in))
+# define compute_linear(linear, out, in, arch) ((void)(arch), compute_linear_c(linear, out, in))
 #endif
 
 #ifndef OVERRIDE_COMPUTE_ACTIVATION
-#define compute_activation(output, input, N, activation, arch) ((void)(arch),compute_activation_c(output, input, N, activation))
+# define compute_activation(output, input, N, activation, arch) ((void)(arch), \
+                                                                 compute_activation_c(output, input, N, activation))
 #endif
 
 #ifndef OVERRIDE_COMPUTE_CONV2D
-#define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch),compute_conv2d_c(conv, out, mem, in, height, hstride, activation))
+# define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch), \
+                                                                                compute_conv2d_c(conv, out, mem, in, \
+    height, hstride, activation))
 #endif
 
-#if defined(__x86_64__) && !defined(OAC_X86_MAY_HAVE_SSE4_1) && !defined(OAC_X86_MAY_HAVE_AVX2) &&!defined(SUPPRESS_PERF_WARNINGS)
-#if defined(_MSC_VER)
-#pragma message ("Only SSE and SSE2 are available. On newer machines, enable SSSE3/AVX/AVX2 to get better performance")
-#else
-#warning "Only SSE and SSE2 are available. On newer machines, enable SSSE3/AVX/AVX2 using -march= to get better performance"
-#endif
+#if defined(__x86_64__) && !defined(OAC_X86_MAY_HAVE_SSE4_1) && !defined(OAC_X86_MAY_HAVE_AVX2) \
+    && !defined(SUPPRESS_PERF_WARNINGS)
+# if defined(_MSC_VER)
+#  pragma \
+    message ("Only SSE and SSE2 are available. On newer machines, enable SSSE3/AVX/AVX2 to get better performance")
+# else
+#  warning \
+    "Only SSE and SSE2 are available. On newer machines, enable SSSE3/AVX/AVX2 using -march= to get better performance"
+# endif
 #endif
 
 
diff --git a/dnn/nnet_arch.h b/dnn/nnet_arch.h
index a2a40c3b0..e9f7f3b1a 100644
--- a/dnn/nnet_arch.h
+++ b/dnn/nnet_arch.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef NNET_ARCH_H
 #define NNET_ARCH_H
@@ -33,35 +33,33 @@
 #include "os_support.h"
 #include "vec.h"
 
-#define CAT_SUFFIX2(a,b) a ## b
-#define CAT_SUFFIX(a,b) CAT_SUFFIX2(a, b)
+#define CAT_SUFFIX2(a, b) a ## b
+#define CAT_SUFFIX(a, b) CAT_SUFFIX2(a, b)
 
 #define RTCD_SUF(name) CAT_SUFFIX(name, RTCD_ARCH)
 
 /* Force vectorization on for DNN code because some of the loops rely on
    compiler vectorization rather than explicitly using intrinsics. */
-#if OAC_GNUC_PREREQ(5,1)
-#define GCC_POP_OPTIONS
-#pragma GCC push_options
-#pragma GCC optimize("tree-vectorize")
+#if OAC_GNUC_PREREQ(5, 1)
+# define GCC_POP_OPTIONS
+# pragma GCC push_options
+# pragma GCC optimize("tree-vectorize")
 #endif
 
 
 #define MAX_ACTIVATIONS (4096)
 
-static OAC_INLINE void vec_swish(float *y, const float *x, int N)
-{
-   int i;
-   float tmp[MAX_ACTIVATIONS];
-   celt_assert(N <= MAX_ACTIVATIONS);
-   vec_sigmoid(tmp, x, N);
-   for (i=0;i<N;i++)
-      y[i] = x[i]*tmp[i];
+static OAC_INLINE void vec_swish(float *y, const float *x, int N) {
+    int i;
+    float tmp[MAX_ACTIVATIONS];
+    celt_assert(N <= MAX_ACTIVATIONS);
+    vec_sigmoid(tmp, x, N);
+    for (i = 0; i < N; i++)
+        y[i] = x[i]*tmp[i];
 }
 
-static OAC_INLINE float relu(float x)
-{
-   return x < 0 ? 0 : x;
+static OAC_INLINE float relu(float x) {
+    return x < 0 ? 0 : x;
 }
 
 /*#define HIGH_ACCURACY */
@@ -71,50 +69,48 @@ void RTCD_SUF(compute_activation_)(float *output, const float *input, int N, int
    int i;
    if (activation == ACTIVATION_SIGMOID) {
 #ifdef HIGH_ACCURACY
-      for (int n=0; n<N; n++)
-      {
-         output[n] = 1.f  / (1 + exp(-input[n]));
-      }
+        for (int n = 0; n < N; n++) {
+            output[n] = 1.f/(1 + exp(-input[n]));
+        }
 #else
-      vec_sigmoid(output, input, N);
+        vec_sigmoid(output, input, N);
 #endif
    } else if (activation == ACTIVATION_TANH) {
 #ifdef HIGH_ACCURACY
-      for (int n=0; n<N; n++)
-      {
-         output[n] = tanh(input[n]);
-      }
+        for (int n = 0; n < N; n++) {
+            output[n] = tanh(input[n]);
+        }
 #else
-      vec_tanh(output, input, N);
+        vec_tanh(output, input, N);
 #endif
    } else if (activation == ACTIVATION_SWISH) {
-      vec_swish(output, input, N);
+        vec_swish(output, input, N);
    } else if (activation == ACTIVATION_RELU) {
-      for (i=0;i<N;i++)
-         output[i] = relu(input[i]);
+        for (i = 0; i < N; i++)
+            output[i] = relu(input[i]);
    } else if (activation == ACTIVATION_SOFTMAX) {
 #ifdef SOFTMAX_HACK
-      OAC_COPY(output, input, N);
-      /*for (i=0;i<N;i++)
-         output[i] = input[i];*/
+        OAC_COPY(output, input, N);
+        /*for (i=0;i<N;i++)
+           output[i] = input[i];*/
 #else
-      float sum = 0;
-      softmax(output, input, N);
-      for (i=0;i<N;i++) {
-         sum += output[i];
-      }
-      sum = 1.f/(sum+1e-30);
-      for (i=0;i<N;i++)
-         output[i] = sum*output[i];
+        float sum = 0;
+        softmax(output, input, N);
+        for (i = 0; i < N; i++) {
+            sum += output[i];
+        }
+        sum = 1.f/(sum + 1e-30);
+        for (i = 0; i < N; i++)
+            output[i] = sum*output[i];
 #endif
    } else if (activation == ACTIVATION_EXP) {
-      softmax(output, input, N);
+        softmax(output, input, N);
    } else {
-      celt_assert(activation == ACTIVATION_LINEAR);
-      if (input != output) {
-         for (i=0;i<N;i++)
-            output[i] = input[i];
-      }
+        celt_assert(activation == ACTIVATION_LINEAR);
+        if (input != output) {
+            for (i = 0; i < N; i++)
+                output[i] = input[i];
+        }
    }
 }
 
@@ -128,28 +124,28 @@ void RTCD_SUF(compute_linear_) (const LinearLayer *linear, float *out, const flo
    M = linear->nb_inputs;
    N = linear->nb_outputs;
    if (linear->float_weights != NULL) {
-     if (linear->weights_idx != NULL) sparse_sgemv8x4(out, linear->float_weights, linear->weights_idx, N, in);
-     else sgemv(out, linear->float_weights, N, M, N, in);
+        if (linear->weights_idx != NULL) sparse_sgemv8x4(out, linear->float_weights, linear->weights_idx, N, in);
+        else sgemv(out, linear->float_weights, N, M, N, in);
    } else if (linear->weights != NULL) {
-     if (linear->weights_idx != NULL) sparse_cgemv8x4(out, linear->weights, linear->weights_idx, linear->scale, N, M, in);
-     else cgemv8x4(out, linear->weights, linear->scale, N, M, in);
-     /* Only use SU biases on for integer matrices on SU archs. */
+        if (linear->weights_idx != NULL) sparse_cgemv8x4(out, linear->weights, linear->weights_idx, linear->scale, N, M,
+            in);
+        else cgemv8x4(out, linear->weights, linear->scale, N, M, in);
+        /* Only use SU biases on for integer matrices on SU archs. */
 #ifdef USE_SU_BIAS
-     bias = linear->subias;
+        bias = linear->subias;
 #endif
-   }
-   else OAC_CLEAR(out, N);
+   } else OAC_CLEAR(out, N);
    if (bias != NULL) {
-      for (i=0;i<N;i++) out[i] += bias[i];
+        for (i = 0; i < N; i++) out[i] += bias[i];
    }
    if (linear->diag) {
-      /* Diag is only used for GRU recurrent weights. */
-      celt_assert(3*M == N);
-      for (i=0;i<M;i++) {
-         out[i] += linear->diag[i]*in[i];
-         out[i+M] += linear->diag[i+M]*in[i];
-         out[i+2*M] += linear->diag[i+2*M]*in[i];
-      }
+        /* Diag is only used for GRU recurrent weights. */
+        celt_assert(3*M == N);
+        for (i = 0; i < M; i++) {
+            out[i] += linear->diag[i]*in[i];
+            out[i + M] += linear->diag[i + M]*in[i];
+            out[i + 2*M] += linear->diag[i + 2*M]*in[i];
+        }
    }
 }
 
@@ -158,92 +154,103 @@ void RTCD_SUF(compute_linear_) (const LinearLayer *linear, float *out, const flo
    storing the output as [ out_channels x len2 ].
    We assume that the output dimension along the ksize1 axis is 1,
    i.e. processing one frame at a time. */
-static void conv2d_float(float *out, const float *weights, int in_channels, int out_channels, int ktime, int kheight, const float *in, int height, int hstride)
-{
-   int i;
-   int in_stride;
-   in_stride = height+kheight-1;
-   for (i=0;i<out_channels;i++) {
-      int m;
-      OAC_CLEAR(&out[i*hstride], height);
-      for (m=0;m<in_channels;m++) {
-         int t;
-         for (t=0;t<ktime;t++) {
-            int h;
-            for (h=0;h<kheight;h++) {
-               int j;
-               for (j=0;j<height;j++) {
-                  out[i*hstride + j] += weights[i*in_channels*ktime*kheight + m*ktime*kheight + t*kheight + h] *
-                                     in[t*in_channels*in_stride + m*in_stride + j + h];
-               }
+static void conv2d_float(float *out, const float *weights, int in_channels, int out_channels, int ktime, int kheight,
+                         const float *in, int height, int hstride) {
+    int i;
+    int in_stride;
+    in_stride = height + kheight - 1;
+    for (i = 0; i < out_channels; i++) {
+        int m;
+        OAC_CLEAR(&out[i*hstride], height);
+        for (m = 0; m < in_channels; m++) {
+            int t;
+            for (t = 0; t < ktime; t++) {
+                int h;
+                for (h = 0; h < kheight; h++) {
+                    int j;
+                    for (j = 0; j < height; j++) {
+                        out[i*hstride + j] += weights[i*in_channels*ktime*kheight + m*ktime*kheight + t*kheight + h]
+                                              *in[t*in_channels*in_stride + m*in_stride + j + h];
+                    }
+                }
             }
-         }
-      }
-   }
+        }
+    }
 }
 
 /* There's no intrinsics in this function (or the one above) because the gcc (and hopefully other compiler) auto-vectorizer is smart enough to
    produce the right code by itself based on the compile flags. */
-static void conv2d_3x3_float(float *out, const float *weights, int in_channels, int out_channels, const float *in, int height, int hstride)
-{
-   int i;
-   int in_stride;
-   int kheight, ktime;
-   kheight = ktime = 3;
-   in_stride = height+kheight-1;
-   for (i=0;i<out_channels;i++) {
-      int m;
-      OAC_CLEAR(&out[i*hstride], height);
-      for (m=0;m<in_channels;m++) {
-         int j;
-         for (j=0;j<height;j++) {
-            /* Unrolled version of previous function -- compiler will figure out the indexing simplifications. */
-            out[i*hstride + j] += weights[i*in_channels*ktime*kheight + m*ktime*kheight + 0*kheight + 0]*in[0*in_channels*in_stride + m*in_stride + j + 0]
-                                + weights[i*in_channels*ktime*kheight + m*ktime*kheight + 0*kheight + 1]*in[0*in_channels*in_stride + m*in_stride + j + 1]
-                                + weights[i*in_channels*ktime*kheight + m*ktime*kheight + 0*kheight + 2]*in[0*in_channels*in_stride + m*in_stride + j + 2]
-                                + weights[i*in_channels*ktime*kheight + m*ktime*kheight + 1*kheight + 0]*in[1*in_channels*in_stride + m*in_stride + j + 0]
-                                + weights[i*in_channels*ktime*kheight + m*ktime*kheight + 1*kheight + 1]*in[1*in_channels*in_stride + m*in_stride + j + 1]
-                                + weights[i*in_channels*ktime*kheight + m*ktime*kheight + 1*kheight + 2]*in[1*in_channels*in_stride + m*in_stride + j + 2]
-                                + weights[i*in_channels*ktime*kheight + m*ktime*kheight + 2*kheight + 0]*in[2*in_channels*in_stride + m*in_stride + j + 0]
-                                + weights[i*in_channels*ktime*kheight + m*ktime*kheight + 2*kheight + 1]*in[2*in_channels*in_stride + m*in_stride + j + 1]
-                                + weights[i*in_channels*ktime*kheight + m*ktime*kheight + 2*kheight + 2]*in[2*in_channels*in_stride + m*in_stride + j + 2];
-               }
-      }
-   }
+static void conv2d_3x3_float(float *out, const float *weights, int in_channels, int out_channels, const float *in,
+                             int height, int hstride) {
+    int i;
+    int in_stride;
+    int kheight, ktime;
+    kheight = ktime = 3;
+    in_stride = height + kheight - 1;
+    for (i = 0; i < out_channels; i++) {
+        int m;
+        OAC_CLEAR(&out[i*hstride], height);
+        for (m = 0; m < in_channels; m++) {
+            int j;
+            for (j = 0; j < height; j++) {
+                /* Unrolled version of previous function -- compiler will figure out the indexing simplifications. */
+                out[i*hstride + j] += weights[i*in_channels*ktime*kheight + m*ktime*kheight + 0*kheight + 0]
+                                      *in[0*in_channels*in_stride + m*in_stride + j + 0]
+                                      + weights[i*in_channels*ktime*kheight + m*ktime*kheight + 0*kheight + 1]
+                                      *in[0*in_channels*in_stride + m*in_stride + j + 1]
+                                      + weights[i*in_channels*ktime*kheight + m*ktime*kheight + 0*kheight + 2]
+                                      *in[0*in_channels*in_stride + m*in_stride + j + 2]
+                                      + weights[i*in_channels*ktime*kheight + m*ktime*kheight + 1*kheight + 0]
+                                      *in[1*in_channels*in_stride + m*in_stride + j + 0]
+                                      + weights[i*in_channels*ktime*kheight + m*ktime*kheight + 1*kheight + 1]
+                                      *in[1*in_channels*in_stride + m*in_stride + j + 1]
+                                      + weights[i*in_channels*ktime*kheight + m*ktime*kheight + 1*kheight + 2]
+                                      *in[1*in_channels*in_stride + m*in_stride + j + 2]
+                                      + weights[i*in_channels*ktime*kheight + m*ktime*kheight + 2*kheight + 0]
+                                      *in[2*in_channels*in_stride + m*in_stride + j + 0]
+                                      + weights[i*in_channels*ktime*kheight + m*ktime*kheight + 2*kheight + 1]
+                                      *in[2*in_channels*in_stride + m*in_stride + j + 1]
+                                      + weights[i*in_channels*ktime*kheight + m*ktime*kheight + 2*kheight + 2]
+                                      *in[2*in_channels*in_stride + m*in_stride + j + 2];
+            }
+        }
+    }
 }
 
 #define MAX_CONV2D_INPUTS 8192
 
-void RTCD_SUF(compute_conv2d_)(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride, int activation)
+void RTCD_SUF(compute_conv2d_)(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height,
+int hstride, int activation)
 {
    int i;
    const float *bias;
    float in_buf[MAX_CONV2D_INPUTS];
    int time_stride;
    celt_assert(in != out);
-   time_stride = conv->in_channels*(height+conv->kheight-1);
+   time_stride = conv->in_channels*(height + conv->kheight - 1);
    celt_assert(conv->ktime*time_stride <= MAX_CONV2D_INPUTS);
-   OAC_COPY(in_buf, mem, (conv->ktime-1)*time_stride);
-   OAC_COPY(&in_buf[(conv->ktime-1)*time_stride], in, time_stride);
-   OAC_COPY(mem, &in_buf[time_stride], (conv->ktime-1)*time_stride);
+   OAC_COPY(in_buf, mem, (conv->ktime - 1)*time_stride);
+   OAC_COPY(&in_buf[(conv->ktime - 1)*time_stride], in, time_stride);
+   OAC_COPY(mem, &in_buf[time_stride], (conv->ktime - 1)*time_stride);
    bias = conv->bias;
    if (conv->kheight == 3 && conv->ktime == 3)
-     conv2d_3x3_float(out, conv->float_weights, conv->in_channels, conv->out_channels, in_buf, height, hstride);
+        conv2d_3x3_float(out, conv->float_weights, conv->in_channels, conv->out_channels, in_buf, height, hstride);
    else
-     conv2d_float(out, conv->float_weights, conv->in_channels, conv->out_channels, conv->ktime, conv->kheight, in_buf, height, hstride);
+        conv2d_float(out, conv->float_weights, conv->in_channels, conv->out_channels, conv->ktime, conv->kheight,
+        in_buf, height, hstride);
    if (bias != NULL) {
-     for (i=0;i<conv->out_channels;i++) {
-       int j;
-       for (j=0;j<height;j++) out[i*hstride+j] += bias[i];
-     }
+        for (i = 0; i < conv->out_channels; i++) {
+            int j;
+            for (j = 0; j < height; j++) out[i*hstride + j] += bias[i];
+        }
    }
-   for (i=0;i<conv->out_channels;i++) {
-     RTCD_SUF(compute_activation_)(&out[i*hstride], &out[i*hstride], height, activation);
+   for (i = 0; i < conv->out_channels; i++) {
+        RTCD_SUF(compute_activation_)(&out[i*hstride], &out[i*hstride], height, activation);
    }
 }
 
 #ifdef GCC_POP_OPTIONS
-#pragma GCC pop_options
+# pragma GCC pop_options
 #endif
 
 #endif
diff --git a/dnn/nnet_default.c b/dnn/nnet_default.c
index 4316f0fba..cb7180a44 100644
--- a/dnn/nnet_default.c
+++ b/dnn/nnet_default.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 
diff --git a/dnn/osce.c b/dnn/osce.c
index 56a9a3adb..7dfea712d 100644
--- a/dnn/osce.c
+++ b/dnn/osce.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 
@@ -40,73 +40,82 @@
 #include "mathops.h"
 /*#define OSCE_DEBUG*/
 #ifdef OSCE_DEBUG
-#include <stdio.h>
+# include <stdio.h>
 /*#define WRITE_FEATURES*/
 /*#define DEBUG_LACE*/
 /*#define DEBUG_NOLACE*/
-#define DEBUG_BBWENET
-#define FINIT(fid, name, mode) do{if (fid == NULL) {fid = fopen(name, mode);}} while(0)
+# define DEBUG_BBWENET
+# define FINIT(fid, name, mode) do {if (fid == NULL) {fid = fopen(name, mode);}} while (0)
 #endif
 
 #if 0
-#include <stdio.h>
-static void print_float_array(FILE *fid, const char  *name, const float *array, int n)
-{
+# include <stdio.h>
+static void print_float_array(FILE *fid, const char  *name, const float *array, int n) {
     int i;
-    for (i = 0; i < n; i++)
-    {
+    for (i = 0; i < n; i++) {
         fprintf(fid, "%s[%d]: %f\n", name, i, array[i]);
     }
 }
 
-static void print_int_array(FILE *fid, const char  *name, const int *array, int n)
-{
+static void print_int_array(FILE *fid, const char  *name, const int *array, int n) {
     int i;
-    for (i = 0; i < n; i++)
-    {
+    for (i = 0; i < n; i++) {
         fprintf(fid, "%s[%d]: %d\n", name, i, array[i]);
     }
 }
 
-static void print_int8_array(FILE *fid, const char  *name, const oac_int8 *array, int n)
-{
+static void print_int8_array(FILE *fid, const char  *name, const oac_int8 *array, int n) {
     int i;
-    for (i = 0; i < n; i++)
-    {
+    for (i = 0; i < n; i++) {
         fprintf(fid, "%s[%d]: %d\n", name, i, array[i]);
     }
 }
 
-static void print_linear_layer(FILE *fid, const char *name, LinearLayer *layer)
-{
+static void print_linear_layer(FILE *fid, const char *name, LinearLayer *layer) {
     int i, n_in, n_out, n_total;
     char tmp[256];
 
     n_in = layer->nb_inputs;
     n_out = layer->nb_outputs;
-    n_total = n_in * n_out;
+    n_total = n_in*n_out;
 
     fprintf(fid, "\nprinting layer %s...\n", name);
     fprintf(fid, "%s.nb_inputs: %d\n%s.nb_outputs: %d\n", name, n_in, name, n_out);
 
-    if (layer->bias !=NULL){}
-    if (layer->subias !=NULL){}
-    if (layer->weights !=NULL){}
-    if (layer->float_weights !=NULL){}
+    if (layer->bias != NULL) {
+    }
+    if (layer->subias != NULL) {
+    }
+    if (layer->weights != NULL) {
+    }
+    if (layer->float_weights != NULL) {
+    }
 
-    if (layer->bias != NULL) {sprintf(tmp, "%s.bias", name); print_float_array(fid, tmp, layer->bias, n_out);}
-    if (layer->subias != NULL) {sprintf(tmp, "%s.subias", name); print_float_array(fid, tmp, layer->subias, n_out);}
-    if (layer->weights != NULL) {sprintf(tmp, "%s.weights", name); print_int8_array(fid, tmp, layer->weights, n_total);}
-    if (layer->float_weights != NULL) {sprintf(tmp, "%s.float_weights", name); print_float_array(fid, tmp, layer->float_weights, n_total);}
+    if (layer->bias != NULL) {
+        sprintf(tmp, "%s.bias", name); print_float_array(fid, tmp, layer->bias, n_out);
+    }
+    if (layer->subias != NULL) {
+        sprintf(tmp, "%s.subias", name); print_float_array(fid, tmp, layer->subias, n_out);
+    }
+    if (layer->weights != NULL) {
+        sprintf(tmp, "%s.weights", name); print_int8_array(fid, tmp, layer->weights, n_total);
+    }
+    if (layer->float_weights != NULL) {
+        sprintf(tmp, "%s.float_weights", name); print_float_array(fid, tmp, layer->float_weights, n_total);
+    }
     /*if (layer->weights_idx != NULL) {sprintf(tmp, "%s.weights_idx", name); print_float_array(fid, tmp, layer->weights_idx, n_total);}*/
-    if (layer->diag != NULL) {sprintf(tmp, "%s.diag", name); print_float_array(fid, tmp, layer->diag, n_in);}
-    if (layer->scale != NULL) {sprintf(tmp, "%s.scale", name); print_float_array(fid, tmp, layer->scale, n_out);}
+    if (layer->diag != NULL) {
+        sprintf(tmp, "%s.diag", name); print_float_array(fid, tmp, layer->diag, n_in);
+    }
+    if (layer->scale != NULL) {
+        sprintf(tmp, "%s.scale", name); print_float_array(fid, tmp, layer->scale, n_out);
+    }
 
 }
 #endif
 
 #ifdef ENABLE_OSCE_TRAINING_DATA
-#include <stdio.h>
+# include <stdio.h>
 #endif
 
 #define CLIP(a, min, max) (((a) < (min) ? (min) : (a)) > (max) ? (max) : (a))
@@ -119,27 +128,26 @@ extern const WeightArray bbwenetlayers_arrays[];
 
 #ifndef DISABLE_LACE
 
-static void compute_lace_numbits_embedding(float *emb, float numbits, int dim, float min_val, float max_val, int logscale)
-{
+static void compute_lace_numbits_embedding(float *emb, float numbits, int dim, float min_val, float max_val,
+                                           int logscale) {
     float x;
     (void) dim;
 
     numbits = logscale ? log(numbits) : numbits;
-    x = CLIP(numbits, min_val, max_val) - (max_val + min_val) / 2;
-
-    emb[0] = sin(x * LACE_NUMBITS_SCALE_0 - 0.5f);
-    emb[1] = sin(x * LACE_NUMBITS_SCALE_1 - 0.5f);
-    emb[2] = sin(x * LACE_NUMBITS_SCALE_2 - 0.5f);
-    emb[3] = sin(x * LACE_NUMBITS_SCALE_3 - 0.5f);
-    emb[4] = sin(x * LACE_NUMBITS_SCALE_4 - 0.5f);
-    emb[5] = sin(x * LACE_NUMBITS_SCALE_5 - 0.5f);
-    emb[6] = sin(x * LACE_NUMBITS_SCALE_6 - 0.5f);
-    emb[7] = sin(x * LACE_NUMBITS_SCALE_7 - 0.5f);
+    x = CLIP(numbits, min_val, max_val) - (max_val + min_val)/2;
+
+    emb[0] = sin(x*LACE_NUMBITS_SCALE_0 - 0.5f);
+    emb[1] = sin(x*LACE_NUMBITS_SCALE_1 - 0.5f);
+    emb[2] = sin(x*LACE_NUMBITS_SCALE_2 - 0.5f);
+    emb[3] = sin(x*LACE_NUMBITS_SCALE_3 - 0.5f);
+    emb[4] = sin(x*LACE_NUMBITS_SCALE_4 - 0.5f);
+    emb[5] = sin(x*LACE_NUMBITS_SCALE_5 - 0.5f);
+    emb[6] = sin(x*LACE_NUMBITS_SCALE_6 - 0.5f);
+    emb[7] = sin(x*LACE_NUMBITS_SCALE_7 - 0.5f);
 }
 
 
-static int init_lace(LACE *hLACE, const WeightArray *weights)
-{
+static int init_lace(LACE *hLACE, const WeightArray *weights) {
     int ret = 0;
     OAC_CLEAR(hLACE, 1);
     celt_assert(weights != NULL);
@@ -151,8 +159,7 @@ static int init_lace(LACE *hLACE, const WeightArray *weights)
     return ret;
 }
 
-static void reset_lace_state(LACEState *state)
-{
+static void reset_lace_state(LACEState *state) {
     OAC_CLEAR(state, 1);
 
     init_adacomb_state(&state->cf1_state);
@@ -167,70 +174,71 @@ static void lace_feature_net(
     const float *features,
     const float *numbits,
     const int *periods,
-    int arch
-)
-{
-    float input_buffer[IMAX(4 * IMAX(LACE_COND_DIM, LACE_HIDDEN_FEATURE_DIM), LACE_NUM_FEATURES + LACE_PITCH_EMBEDDING_DIM + 2*LACE_NUMBITS_EMBEDDING_DIM)];
-    float output_buffer[4 * IMAX(LACE_COND_DIM, LACE_HIDDEN_FEATURE_DIM)];
-    float numbits_embedded[2 * LACE_NUMBITS_EMBEDDING_DIM];
+    int arch) {
+    float input_buffer[IMAX(4*IMAX(LACE_COND_DIM, LACE_HIDDEN_FEATURE_DIM),
+    LACE_NUM_FEATURES + LACE_PITCH_EMBEDDING_DIM + 2*LACE_NUMBITS_EMBEDDING_DIM)];
+    float output_buffer[4*IMAX(LACE_COND_DIM, LACE_HIDDEN_FEATURE_DIM)];
+    float numbits_embedded[2*LACE_NUMBITS_EMBEDDING_DIM];
     int i_subframe;
 
     compute_lace_numbits_embedding(numbits_embedded, numbits[0], LACE_NUMBITS_EMBEDDING_DIM,
         log(LACE_NUMBITS_RANGE_LOW), log(LACE_NUMBITS_RANGE_HIGH), 1);
-    compute_lace_numbits_embedding(numbits_embedded + LACE_NUMBITS_EMBEDDING_DIM, numbits[1], LACE_NUMBITS_EMBEDDING_DIM,
+    compute_lace_numbits_embedding(numbits_embedded + LACE_NUMBITS_EMBEDDING_DIM, numbits[1],
+    LACE_NUMBITS_EMBEDDING_DIM,
         log(LACE_NUMBITS_RANGE_LOW), log(LACE_NUMBITS_RANGE_HIGH), 1);
 
     /* scaling and dimensionality reduction */
-    for (i_subframe = 0; i_subframe < 4; i_subframe ++)
-    {
-        OAC_COPY(input_buffer, features + i_subframe * LACE_NUM_FEATURES, LACE_NUM_FEATURES);
-        OAC_COPY(input_buffer + LACE_NUM_FEATURES, hLACE->layers.lace_pitch_embedding.float_weights + periods[i_subframe] * LACE_PITCH_EMBEDDING_DIM, LACE_PITCH_EMBEDDING_DIM);
-        OAC_COPY(input_buffer + LACE_NUM_FEATURES + LACE_PITCH_EMBEDDING_DIM, numbits_embedded, 2 * LACE_NUMBITS_EMBEDDING_DIM);
+    for (i_subframe = 0; i_subframe < 4; i_subframe++) {
+        OAC_COPY(input_buffer, features + i_subframe*LACE_NUM_FEATURES, LACE_NUM_FEATURES);
+        OAC_COPY(input_buffer + LACE_NUM_FEATURES,
+        hLACE->layers.lace_pitch_embedding.float_weights + periods[i_subframe]*LACE_PITCH_EMBEDDING_DIM,
+        LACE_PITCH_EMBEDDING_DIM);
+        OAC_COPY(input_buffer + LACE_NUM_FEATURES + LACE_PITCH_EMBEDDING_DIM, numbits_embedded,
+        2*LACE_NUMBITS_EMBEDDING_DIM);
 
         compute_generic_conv1d(
             &hLACE->layers.lace_fnet_conv1,
-            output_buffer + i_subframe * LACE_HIDDEN_FEATURE_DIM,
+            output_buffer + i_subframe*LACE_HIDDEN_FEATURE_DIM,
             NULL,
             input_buffer,
-            LACE_NUM_FEATURES + LACE_PITCH_EMBEDDING_DIM + 2 * LACE_NUMBITS_EMBEDDING_DIM,
+            LACE_NUM_FEATURES + LACE_PITCH_EMBEDDING_DIM + 2*LACE_NUMBITS_EMBEDDING_DIM,
             ACTIVATION_TANH,
             arch);
     }
 
     /* subframe accumulation */
-    OAC_COPY(input_buffer, output_buffer, 4 * LACE_HIDDEN_FEATURE_DIM);
+    OAC_COPY(input_buffer, output_buffer, 4*LACE_HIDDEN_FEATURE_DIM);
     compute_generic_conv1d(
         &hLACE->layers.lace_fnet_conv2,
         output_buffer,
         state->feature_net_conv2_state,
         input_buffer,
-        4 * LACE_HIDDEN_FEATURE_DIM,
+        4*LACE_HIDDEN_FEATURE_DIM,
         ACTIVATION_TANH,
         arch
-    );
+        );
 
     /* tconv upsampling */
-    OAC_COPY(input_buffer, output_buffer, 4 * LACE_COND_DIM);
+    OAC_COPY(input_buffer, output_buffer, 4*LACE_COND_DIM);
     compute_generic_dense(
         &hLACE->layers.lace_fnet_tconv,
         output_buffer,
         input_buffer,
         ACTIVATION_TANH,
         arch
-    );
+        );
 
     /* GRU */
-    OAC_COPY(input_buffer, output_buffer, 4 * LACE_COND_DIM);
-    for (i_subframe = 0; i_subframe < 4; i_subframe++)
-    {
+    OAC_COPY(input_buffer, output_buffer, 4*LACE_COND_DIM);
+    for (i_subframe = 0; i_subframe < 4; i_subframe++) {
         compute_generic_gru(
             &hLACE->layers.lace_fnet_gru_input,
             &hLACE->layers.lace_fnet_gru_recurrent,
             state->feature_net_gru_state,
-            input_buffer + i_subframe * LACE_COND_DIM,
+            input_buffer + i_subframe*LACE_COND_DIM,
             arch
-        );
-        OAC_COPY(output + i_subframe * LACE_COND_DIM, state->feature_net_gru_state, LACE_COND_DIM);
+            );
+        OAC_COPY(output + i_subframe*LACE_COND_DIM, state->feature_net_gru_state, LACE_COND_DIM);
     }
 }
 
@@ -243,16 +251,14 @@ static void lace_process_20ms_frame(
     const float *features,
     const float *numbits,
     const int *periods,
-    int arch
-)
-{
-    float feature_buffer[4 * LACE_COND_DIM];
-    float output_buffer[4 * LACE_FRAME_SIZE];
+    int arch) {
+    float feature_buffer[4*LACE_COND_DIM];
+    float output_buffer[4*LACE_FRAME_SIZE];
     int i_subframe, i_sample;
 
-#ifdef DEBUG_LACE
-    static FILE *f_features=NULL, *f_encfeatures=NULL, *f_xin=NULL, *f_xpreemph=NULL, *f_postcf1=NULL;
-    static FILE *f_postcf2=NULL, *f_postaf1=NULL, *f_xdeemph, *f_numbits, *f_periods;
+# ifdef DEBUG_LACE
+    static FILE *f_features = NULL, *f_encfeatures = NULL, *f_xin = NULL, *f_xpreemph = NULL, *f_postcf1 = NULL;
+    static FILE *f_postcf2 = NULL, *f_postaf1 = NULL, *f_xdeemph, *f_numbits, *f_periods;
 
 
     FINIT(f_features, "debug/c_features.f32", "wb");
@@ -266,34 +272,32 @@ static void lace_process_20ms_frame(
     FINIT(f_numbits, "debug/c_numbits.f32", "wb");
     FINIT(f_periods, "debug/c_periods.s32", "wb");
 
-    fwrite(x_in, sizeof(*x_in), 4 * LACE_FRAME_SIZE, f_xin);
+    fwrite(x_in, sizeof(*x_in), 4*LACE_FRAME_SIZE, f_xin);
     fwrite(numbits, sizeof(*numbits), 2, f_numbits);
     fwrite(periods, sizeof(*periods), 4, f_periods);
-#endif
+# endif
 
     /* pre-emphasis */
-    for (i_sample = 0; i_sample < 4 * LACE_FRAME_SIZE; i_sample ++)
-    {
-        output_buffer[i_sample] = x_in[i_sample] - LACE_PREEMPH * state->preemph_mem;
+    for (i_sample = 0; i_sample < 4*LACE_FRAME_SIZE; i_sample++) {
+        output_buffer[i_sample] = x_in[i_sample] - LACE_PREEMPH*state->preemph_mem;
         state->preemph_mem = x_in[i_sample];
     }
 
     /* run feature encoder */
     lace_feature_net(hLACE, state, feature_buffer, features, numbits, periods, arch);
-#ifdef DEBUG_LACE
-    fwrite(features, sizeof(*features), 4 * LACE_NUM_FEATURES, f_features);
-    fwrite(feature_buffer, sizeof(*feature_buffer), 4 * LACE_COND_DIM, f_encfeatures);
-    fwrite(output_buffer, sizeof(float), 4 * LACE_FRAME_SIZE, f_xpreemph);
-#endif
+# ifdef DEBUG_LACE
+    fwrite(features, sizeof(*features), 4*LACE_NUM_FEATURES, f_features);
+    fwrite(feature_buffer, sizeof(*feature_buffer), 4*LACE_COND_DIM, f_encfeatures);
+    fwrite(output_buffer, sizeof(float), 4*LACE_FRAME_SIZE, f_xpreemph);
+# endif
 
     /* 1st comb filtering stage */
-    for (i_subframe = 0; i_subframe < 4; i_subframe++)
-    {
+    for (i_subframe = 0; i_subframe < 4; i_subframe++) {
         adacomb_process_frame(
             &state->cf1_state,
-            output_buffer + i_subframe * LACE_FRAME_SIZE,
-            output_buffer + i_subframe * LACE_FRAME_SIZE,
-            feature_buffer + i_subframe * LACE_COND_DIM,
+            output_buffer + i_subframe*LACE_FRAME_SIZE,
+            output_buffer + i_subframe*LACE_FRAME_SIZE,
+            feature_buffer + i_subframe*LACE_COND_DIM,
             &hLACE->layers.lace_cf1_kernel,
             &hLACE->layers.lace_cf1_gain,
             &hLACE->layers.lace_cf1_global_gain,
@@ -310,18 +314,17 @@ static void lace_process_20ms_frame(
             arch);
     }
 
-#ifdef DEBUG_LACE
-    fwrite(output_buffer, sizeof(float), 4 * LACE_FRAME_SIZE, f_postcf1);
-#endif
+# ifdef DEBUG_LACE
+    fwrite(output_buffer, sizeof(float), 4*LACE_FRAME_SIZE, f_postcf1);
+# endif
 
     /* 2nd comb filtering stage */
-    for (i_subframe = 0; i_subframe < 4; i_subframe++)
-    {
+    for (i_subframe = 0; i_subframe < 4; i_subframe++) {
         adacomb_process_frame(
             &state->cf2_state,
-            output_buffer + i_subframe * LACE_FRAME_SIZE,
-            output_buffer + i_subframe * LACE_FRAME_SIZE,
-            feature_buffer + i_subframe * LACE_COND_DIM,
+            output_buffer + i_subframe*LACE_FRAME_SIZE,
+            output_buffer + i_subframe*LACE_FRAME_SIZE,
+            feature_buffer + i_subframe*LACE_COND_DIM,
             &hLACE->layers.lace_cf2_kernel,
             &hLACE->layers.lace_cf2_gain,
             &hLACE->layers.lace_cf2_global_gain,
@@ -337,18 +340,17 @@ static void lace_process_20ms_frame(
             hLACE->window,
             arch);
     }
-#ifdef DEBUG_LACE
-    fwrite(output_buffer, sizeof(float), 4 * LACE_FRAME_SIZE, f_postcf2);
-#endif
+# ifdef DEBUG_LACE
+    fwrite(output_buffer, sizeof(float), 4*LACE_FRAME_SIZE, f_postcf2);
+# endif
 
     /* final adaptive filtering stage */
-    for (i_subframe = 0; i_subframe < 4; i_subframe++)
-    {
+    for (i_subframe = 0; i_subframe < 4; i_subframe++) {
         adaconv_process_frame(
             &state->af1_state,
-            output_buffer + i_subframe * LACE_FRAME_SIZE,
-            output_buffer + i_subframe * LACE_FRAME_SIZE,
-            feature_buffer + i_subframe * LACE_COND_DIM,
+            output_buffer + i_subframe*LACE_FRAME_SIZE,
+            output_buffer + i_subframe*LACE_FRAME_SIZE,
+            feature_buffer + i_subframe*LACE_COND_DIM,
             &hLACE->layers.lace_af1_kernel,
             &hLACE->layers.lace_af1_gain,
             LACE_COND_DIM,
@@ -364,19 +366,18 @@ static void lace_process_20ms_frame(
             hLACE->window,
             arch);
     }
-#ifdef DEBUG_LACE
-    fwrite(output_buffer, sizeof(float), 4 * LACE_FRAME_SIZE, f_postaf1);
-#endif
+# ifdef DEBUG_LACE
+    fwrite(output_buffer, sizeof(float), 4*LACE_FRAME_SIZE, f_postaf1);
+# endif
 
     /* de-emphasis */
-    for (i_sample = 0; i_sample < 4 * LACE_FRAME_SIZE; i_sample ++)
-    {
-        x_out[i_sample] = output_buffer[i_sample] + LACE_PREEMPH * state->deemph_mem;
+    for (i_sample = 0; i_sample < 4*LACE_FRAME_SIZE; i_sample++) {
+        x_out[i_sample] = output_buffer[i_sample] + LACE_PREEMPH*state->deemph_mem;
         state->deemph_mem = x_out[i_sample];
     }
-#ifdef DEBUG_LACE
-    fwrite(x_out, sizeof(float), 4 * LACE_FRAME_SIZE, f_xdeemph);
-#endif
+# ifdef DEBUG_LACE
+    fwrite(x_out, sizeof(float), 4*LACE_FRAME_SIZE, f_xdeemph);
+# endif
 }
 
 #endif /* #ifndef DISABLE_LACE */
@@ -385,26 +386,25 @@ static void lace_process_20ms_frame(
 /* NoLACE */
 #ifndef DISABLE_NOLACE
 
-static void compute_nolace_numbits_embedding(float *emb, float numbits, int dim, float min_val, float max_val, int logscale)
-{
+static void compute_nolace_numbits_embedding(float *emb, float numbits, int dim, float min_val, float max_val,
+                                             int logscale) {
     float x;
     (void) dim;
 
     numbits = logscale ? log(numbits) : numbits;
-    x = CLIP(numbits, min_val, max_val) - (max_val + min_val) / 2;
-
-    emb[0] = sin(x * NOLACE_NUMBITS_SCALE_0 - 0.5f);
-    emb[1] = sin(x * NOLACE_NUMBITS_SCALE_1 - 0.5f);
-    emb[2] = sin(x * NOLACE_NUMBITS_SCALE_2 - 0.5f);
-    emb[3] = sin(x * NOLACE_NUMBITS_SCALE_3 - 0.5f);
-    emb[4] = sin(x * NOLACE_NUMBITS_SCALE_4 - 0.5f);
-    emb[5] = sin(x * NOLACE_NUMBITS_SCALE_5 - 0.5f);
-    emb[6] = sin(x * NOLACE_NUMBITS_SCALE_6 - 0.5f);
-    emb[7] = sin(x * NOLACE_NUMBITS_SCALE_7 - 0.5f);
+    x = CLIP(numbits, min_val, max_val) - (max_val + min_val)/2;
+
+    emb[0] = sin(x*NOLACE_NUMBITS_SCALE_0 - 0.5f);
+    emb[1] = sin(x*NOLACE_NUMBITS_SCALE_1 - 0.5f);
+    emb[2] = sin(x*NOLACE_NUMBITS_SCALE_2 - 0.5f);
+    emb[3] = sin(x*NOLACE_NUMBITS_SCALE_3 - 0.5f);
+    emb[4] = sin(x*NOLACE_NUMBITS_SCALE_4 - 0.5f);
+    emb[5] = sin(x*NOLACE_NUMBITS_SCALE_5 - 0.5f);
+    emb[6] = sin(x*NOLACE_NUMBITS_SCALE_6 - 0.5f);
+    emb[7] = sin(x*NOLACE_NUMBITS_SCALE_7 - 0.5f);
 }
 
-static int init_nolace(NoLACE *hNoLACE, const WeightArray *weights)
-{
+static int init_nolace(NoLACE *hNoLACE, const WeightArray *weights) {
     int ret = 0;
     OAC_CLEAR(hNoLACE, 1);
     celt_assert(weights != NULL);
@@ -416,8 +416,7 @@ static int init_nolace(NoLACE *hNoLACE, const WeightArray *weights)
     return ret;
 }
 
-static void reset_nolace_state(NoLACEState *state)
-{
+static void reset_nolace_state(NoLACEState *state) {
     OAC_CLEAR(state, 1);
 
     init_adacomb_state(&state->cf1_state);
@@ -438,70 +437,70 @@ static void nolace_feature_net(
     const float *features,
     const float *numbits,
     const int *periods,
-    int arch
-)
-{
-    float input_buffer[4 * IMAX(NOLACE_COND_DIM, NOLACE_HIDDEN_FEATURE_DIM)];
-    float output_buffer[4 * IMAX(NOLACE_COND_DIM, NOLACE_HIDDEN_FEATURE_DIM)];
-    float numbits_embedded[2 * NOLACE_NUMBITS_EMBEDDING_DIM];
+    int arch) {
+    float input_buffer[4*IMAX(NOLACE_COND_DIM, NOLACE_HIDDEN_FEATURE_DIM)];
+    float output_buffer[4*IMAX(NOLACE_COND_DIM, NOLACE_HIDDEN_FEATURE_DIM)];
+    float numbits_embedded[2*NOLACE_NUMBITS_EMBEDDING_DIM];
     int i_subframe;
 
     compute_nolace_numbits_embedding(numbits_embedded, numbits[0], NOLACE_NUMBITS_EMBEDDING_DIM,
         log(NOLACE_NUMBITS_RANGE_LOW), log(NOLACE_NUMBITS_RANGE_HIGH), 1);
-    compute_nolace_numbits_embedding(numbits_embedded + NOLACE_NUMBITS_EMBEDDING_DIM, numbits[1], NOLACE_NUMBITS_EMBEDDING_DIM,
+    compute_nolace_numbits_embedding(numbits_embedded + NOLACE_NUMBITS_EMBEDDING_DIM, numbits[1],
+    NOLACE_NUMBITS_EMBEDDING_DIM,
         log(NOLACE_NUMBITS_RANGE_LOW), log(NOLACE_NUMBITS_RANGE_HIGH), 1);
 
     /* scaling and dimensionality reduction */
-    for (i_subframe = 0; i_subframe < 4; i_subframe ++)
-    {
-        OAC_COPY(input_buffer, features + i_subframe * NOLACE_NUM_FEATURES, NOLACE_NUM_FEATURES);
-        OAC_COPY(input_buffer + NOLACE_NUM_FEATURES, hNoLACE->layers.nolace_pitch_embedding.float_weights + periods[i_subframe] * NOLACE_PITCH_EMBEDDING_DIM, NOLACE_PITCH_EMBEDDING_DIM);
-        OAC_COPY(input_buffer + NOLACE_NUM_FEATURES + NOLACE_PITCH_EMBEDDING_DIM, numbits_embedded, 2 * NOLACE_NUMBITS_EMBEDDING_DIM);
+    for (i_subframe = 0; i_subframe < 4; i_subframe++) {
+        OAC_COPY(input_buffer, features + i_subframe*NOLACE_NUM_FEATURES, NOLACE_NUM_FEATURES);
+        OAC_COPY(input_buffer + NOLACE_NUM_FEATURES,
+        hNoLACE->layers.nolace_pitch_embedding.float_weights + periods[i_subframe]*NOLACE_PITCH_EMBEDDING_DIM,
+        NOLACE_PITCH_EMBEDDING_DIM);
+        OAC_COPY(input_buffer + NOLACE_NUM_FEATURES + NOLACE_PITCH_EMBEDDING_DIM, numbits_embedded,
+        2*NOLACE_NUMBITS_EMBEDDING_DIM);
 
         compute_generic_conv1d(
             &hNoLACE->layers.nolace_fnet_conv1,
-            output_buffer + i_subframe * NOLACE_HIDDEN_FEATURE_DIM,
+            output_buffer + i_subframe*NOLACE_HIDDEN_FEATURE_DIM,
             NULL,
             input_buffer,
-            NOLACE_NUM_FEATURES + NOLACE_PITCH_EMBEDDING_DIM + 2 * NOLACE_NUMBITS_EMBEDDING_DIM,
+            NOLACE_NUM_FEATURES + NOLACE_PITCH_EMBEDDING_DIM + 2*NOLACE_NUMBITS_EMBEDDING_DIM,
             ACTIVATION_TANH,
             arch);
     }
 
     /* subframe accumulation */
-    OAC_COPY(input_buffer, output_buffer, 4 * NOLACE_HIDDEN_FEATURE_DIM);
+    OAC_COPY(input_buffer, output_buffer, 4*NOLACE_HIDDEN_FEATURE_DIM);
     compute_generic_conv1d(
         &hNoLACE->layers.nolace_fnet_conv2,
         output_buffer,
         state->feature_net_conv2_state,
         input_buffer,
-        4 * NOLACE_HIDDEN_FEATURE_DIM,
+        4*NOLACE_HIDDEN_FEATURE_DIM,
         ACTIVATION_TANH,
         arch
-    );
+        );
 
     /* tconv upsampling */
-    OAC_COPY(input_buffer, output_buffer, 4 * NOLACE_COND_DIM);
+    OAC_COPY(input_buffer, output_buffer, 4*NOLACE_COND_DIM);
     compute_generic_dense(
         &hNoLACE->layers.nolace_fnet_tconv,
         output_buffer,
         input_buffer,
         ACTIVATION_TANH,
         arch
-    );
+        );
 
     /* GRU */
-    OAC_COPY(input_buffer, output_buffer, 4 * NOLACE_COND_DIM);
-    for (i_subframe = 0; i_subframe < 4; i_subframe++)
-    {
+    OAC_COPY(input_buffer, output_buffer, 4*NOLACE_COND_DIM);
+    for (i_subframe = 0; i_subframe < 4; i_subframe++) {
         compute_generic_gru(
             &hNoLACE->layers.nolace_fnet_gru_input,
             &hNoLACE->layers.nolace_fnet_gru_recurrent,
             state->feature_net_gru_state,
-            input_buffer + i_subframe * NOLACE_COND_DIM,
+            input_buffer + i_subframe*NOLACE_COND_DIM,
             arch
-        );
-        OAC_COPY(output + i_subframe * NOLACE_COND_DIM, state->feature_net_gru_state, NOLACE_COND_DIM);
+            );
+        OAC_COPY(output + i_subframe*NOLACE_COND_DIM, state->feature_net_gru_state, NOLACE_COND_DIM);
     }
 }
 
@@ -514,19 +513,17 @@ static void nolace_process_20ms_frame(
     const float *features,
     const float *numbits,
     const int *periods,
-    int arch
-)
-{
-    float feature_buffer[4 * NOLACE_COND_DIM];
-    float feature_transform_buffer[4 * NOLACE_COND_DIM];
-    float x_buffer1[8 * NOLACE_FRAME_SIZE];
-    float x_buffer2[8 * NOLACE_FRAME_SIZE];
+    int arch) {
+    float feature_buffer[4*NOLACE_COND_DIM];
+    float feature_transform_buffer[4*NOLACE_COND_DIM];
+    float x_buffer1[8*NOLACE_FRAME_SIZE];
+    float x_buffer2[8*NOLACE_FRAME_SIZE];
     int i_subframe, i_sample;
     NOLACELayers *layers = &hNoLACE->layers;
 
-#ifdef DEBUG_NOLACE
-    static FILE *f_features=NULL, *f_encfeatures=NULL, *f_xin=NULL, *f_xpreemph=NULL, *f_postcf1=NULL;
-    static FILE *f_postcf2=NULL, *f_postaf1=NULL, *f_xdeemph, *f_numbits, *f_periods;
+# ifdef DEBUG_NOLACE
+    static FILE *f_features = NULL, *f_encfeatures = NULL, *f_xin = NULL, *f_xpreemph = NULL, *f_postcf1 = NULL;
+    static FILE *f_postcf2 = NULL, *f_postaf1 = NULL, *f_xdeemph, *f_numbits, *f_periods;
     static FILE *f_ffpostcf1, *f_fpostcf2, *f_fpostaf1;
 
 
@@ -541,35 +538,33 @@ static void nolace_process_20ms_frame(
     FINIT(f_numbits, "debug/c_numbits.f32", "wb");
     FINIT(f_periods, "debug/c_periods.s32", "wb");
 
-    fwrite(x_in, sizeof(*x_in), 4 * NOLACE_FRAME_SIZE, f_xin);
+    fwrite(x_in, sizeof(*x_in), 4*NOLACE_FRAME_SIZE, f_xin);
     fwrite(numbits, sizeof(*numbits), 2, f_numbits);
     fwrite(periods, sizeof(*periods), 4, f_periods);
-#endif
+# endif
 
     /* pre-emphasis */
-    for (i_sample = 0; i_sample < 4 * NOLACE_FRAME_SIZE; i_sample ++)
-    {
-        x_buffer1[i_sample] = x_in[i_sample] - NOLACE_PREEMPH * state->preemph_mem;
+    for (i_sample = 0; i_sample < 4*NOLACE_FRAME_SIZE; i_sample++) {
+        x_buffer1[i_sample] = x_in[i_sample] - NOLACE_PREEMPH*state->preemph_mem;
         state->preemph_mem = x_in[i_sample];
     }
 
     /* run feature encoder */
     nolace_feature_net(hNoLACE, state, feature_buffer, features, numbits, periods, arch);
-#ifdef DEBUG_NOLACE
-    fwrite(features, sizeof(*features), 4 * NOLACE_NUM_FEATURES, f_features);
-    fwrite(feature_buffer, sizeof(*feature_buffer), 4 * NOLACE_COND_DIM, f_encfeatures);
-    fwrite(output_buffer, sizeof(float), 4 * NOLACE_FRAME_SIZE, f_xpreemph);
-#endif
+# ifdef DEBUG_NOLACE
+    fwrite(features, sizeof(*features), 4*NOLACE_NUM_FEATURES, f_features);
+    fwrite(feature_buffer, sizeof(*feature_buffer), 4*NOLACE_COND_DIM, f_encfeatures);
+    fwrite(output_buffer, sizeof(float), 4*NOLACE_FRAME_SIZE, f_xpreemph);
+# endif
 
     /* 1st comb filtering stage */
-    for (i_subframe = 0; i_subframe < 4; i_subframe++)
-    {
+    for (i_subframe = 0; i_subframe < 4; i_subframe++) {
         /* modifies signal in place */
         adacomb_process_frame(
             &state->cf1_state,
-            x_buffer1 + i_subframe * NOLACE_FRAME_SIZE,
-            x_buffer1 + i_subframe * NOLACE_FRAME_SIZE,
-            feature_buffer + i_subframe * NOLACE_COND_DIM,
+            x_buffer1 + i_subframe*NOLACE_FRAME_SIZE,
+            x_buffer1 + i_subframe*NOLACE_FRAME_SIZE,
+            feature_buffer + i_subframe*NOLACE_COND_DIM,
             &hNoLACE->layers.nolace_cf1_kernel,
             &hNoLACE->layers.nolace_cf1_gain,
             &hNoLACE->layers.nolace_cf1_global_gain,
@@ -587,30 +582,29 @@ static void nolace_process_20ms_frame(
 
         compute_generic_conv1d(
             &layers->nolace_post_cf1,
-            feature_transform_buffer + i_subframe * NOLACE_COND_DIM,
+            feature_transform_buffer + i_subframe*NOLACE_COND_DIM,
             state->post_cf1_state,
-            feature_buffer + i_subframe * NOLACE_COND_DIM,
+            feature_buffer + i_subframe*NOLACE_COND_DIM,
             NOLACE_COND_DIM,
             ACTIVATION_TANH,
             arch);
     }
 
     /* update feature buffer */
-    OAC_COPY(feature_buffer, feature_transform_buffer, 4 * NOLACE_COND_DIM);
+    OAC_COPY(feature_buffer, feature_transform_buffer, 4*NOLACE_COND_DIM);
 
-#ifdef DEBUG_NOLACE
-    fwrite(x_buffer1, sizeof(float), 4 * NOLACE_FRAME_SIZE, f_postcf1);
-#endif
+# ifdef DEBUG_NOLACE
+    fwrite(x_buffer1, sizeof(float), 4*NOLACE_FRAME_SIZE, f_postcf1);
+# endif
 
     /* 2nd comb filtering stage */
-    for (i_subframe = 0; i_subframe < 4; i_subframe++)
-    {
+    for (i_subframe = 0; i_subframe < 4; i_subframe++) {
         /* modifies signal in place */
         adacomb_process_frame(
             &state->cf2_state,
-            x_buffer1 + i_subframe * NOLACE_FRAME_SIZE,
-            x_buffer1 + i_subframe * NOLACE_FRAME_SIZE,
-            feature_buffer + i_subframe * NOLACE_COND_DIM,
+            x_buffer1 + i_subframe*NOLACE_FRAME_SIZE,
+            x_buffer1 + i_subframe*NOLACE_FRAME_SIZE,
+            feature_buffer + i_subframe*NOLACE_COND_DIM,
             &hNoLACE->layers.nolace_cf2_kernel,
             &hNoLACE->layers.nolace_cf2_gain,
             &hNoLACE->layers.nolace_cf2_global_gain,
@@ -628,29 +622,28 @@ static void nolace_process_20ms_frame(
 
         compute_generic_conv1d(
             &layers->nolace_post_cf2,
-            feature_transform_buffer + i_subframe * NOLACE_COND_DIM,
+            feature_transform_buffer + i_subframe*NOLACE_COND_DIM,
             state->post_cf2_state,
-            feature_buffer + i_subframe * NOLACE_COND_DIM,
+            feature_buffer + i_subframe*NOLACE_COND_DIM,
             NOLACE_COND_DIM,
             ACTIVATION_TANH,
             arch);
     }
 
     /* update feature buffer */
-    OAC_COPY(feature_buffer, feature_transform_buffer, 4 * NOLACE_COND_DIM);
+    OAC_COPY(feature_buffer, feature_transform_buffer, 4*NOLACE_COND_DIM);
 
-#ifdef DEBUG_NOLACE
-    fwrite(x_buffer1, sizeof(float), 4 * NOLACE_FRAME_SIZE, f_postcf2);
-#endif
+# ifdef DEBUG_NOLACE
+    fwrite(x_buffer1, sizeof(float), 4*NOLACE_FRAME_SIZE, f_postcf2);
+# endif
 
     /* final adaptive filtering stage */
-    for (i_subframe = 0; i_subframe < 4; i_subframe++)
-    {
+    for (i_subframe = 0; i_subframe < 4; i_subframe++) {
         adaconv_process_frame(
             &state->af1_state,
-            x_buffer2 + i_subframe * NOLACE_FRAME_SIZE * NOLACE_AF1_OUT_CHANNELS,
-            x_buffer1 + i_subframe * NOLACE_FRAME_SIZE,
-            feature_buffer + i_subframe * NOLACE_COND_DIM,
+            x_buffer2 + i_subframe*NOLACE_FRAME_SIZE*NOLACE_AF1_OUT_CHANNELS,
+            x_buffer1 + i_subframe*NOLACE_FRAME_SIZE,
+            feature_buffer + i_subframe*NOLACE_COND_DIM,
             &hNoLACE->layers.nolace_af1_kernel,
             &hNoLACE->layers.nolace_af1_gain,
             NOLACE_COND_DIM,
@@ -668,31 +661,30 @@ static void nolace_process_20ms_frame(
 
         compute_generic_conv1d(
             &layers->nolace_post_af1,
-            feature_transform_buffer + i_subframe * NOLACE_COND_DIM,
+            feature_transform_buffer + i_subframe*NOLACE_COND_DIM,
             state->post_af1_state,
-            feature_buffer + i_subframe * NOLACE_COND_DIM,
+            feature_buffer + i_subframe*NOLACE_COND_DIM,
             NOLACE_COND_DIM,
             ACTIVATION_TANH,
             arch);
     }
 
     /* update feature buffer */
-    OAC_COPY(feature_buffer, feature_transform_buffer, 4 * NOLACE_COND_DIM);
+    OAC_COPY(feature_buffer, feature_transform_buffer, 4*NOLACE_COND_DIM);
 
-#ifdef DEBUG_NOLACE
-    fwrite(x_buffer2, sizeof(float), 4 * NOLACE_FRAME_SIZE * NOLACE_AF1_OUT_CHANNELS, f_postaf1);
-#endif
+# ifdef DEBUG_NOLACE
+    fwrite(x_buffer2, sizeof(float), 4*NOLACE_FRAME_SIZE*NOLACE_AF1_OUT_CHANNELS, f_postaf1);
+# endif
 
     /* first shape-mix round */
-    for (i_subframe = 0; i_subframe < 4; i_subframe++)
-    {
+    for (i_subframe = 0; i_subframe < 4; i_subframe++) {
         celt_assert(NOLACE_AF1_OUT_CHANNELS == 2);
         /* modifies second channel in place */
         adashape_process_frame(
             &state->tdshape1_state,
-            x_buffer2 + i_subframe * NOLACE_AF1_OUT_CHANNELS * NOLACE_FRAME_SIZE + NOLACE_FRAME_SIZE,
-            x_buffer2 + i_subframe * NOLACE_AF1_OUT_CHANNELS * NOLACE_FRAME_SIZE + NOLACE_FRAME_SIZE,
-            feature_buffer + i_subframe * NOLACE_COND_DIM,
+            x_buffer2 + i_subframe*NOLACE_AF1_OUT_CHANNELS*NOLACE_FRAME_SIZE + NOLACE_FRAME_SIZE,
+            x_buffer2 + i_subframe*NOLACE_AF1_OUT_CHANNELS*NOLACE_FRAME_SIZE + NOLACE_FRAME_SIZE,
+            feature_buffer + i_subframe*NOLACE_COND_DIM,
             &layers->nolace_tdshape1_alpha1_f,
             &layers->nolace_tdshape1_alpha1_t,
             &layers->nolace_tdshape1_alpha2,
@@ -701,13 +693,13 @@ static void nolace_process_20ms_frame(
             NOLACE_TDSHAPE1_AVG_POOL_K,
             1,
             arch
-        );
+            );
 
         adaconv_process_frame(
             &state->af2_state,
-            x_buffer1 + i_subframe * NOLACE_FRAME_SIZE * NOLACE_AF2_OUT_CHANNELS,
-            x_buffer2 + i_subframe * NOLACE_FRAME_SIZE * NOLACE_AF2_IN_CHANNELS,
-            feature_buffer + i_subframe * NOLACE_COND_DIM,
+            x_buffer1 + i_subframe*NOLACE_FRAME_SIZE*NOLACE_AF2_OUT_CHANNELS,
+            x_buffer2 + i_subframe*NOLACE_FRAME_SIZE*NOLACE_AF2_IN_CHANNELS,
+            feature_buffer + i_subframe*NOLACE_COND_DIM,
             &hNoLACE->layers.nolace_af2_kernel,
             &hNoLACE->layers.nolace_af2_gain,
             NOLACE_COND_DIM,
@@ -725,31 +717,30 @@ static void nolace_process_20ms_frame(
 
         compute_generic_conv1d(
             &layers->nolace_post_af2,
-            feature_transform_buffer + i_subframe * NOLACE_COND_DIM,
+            feature_transform_buffer + i_subframe*NOLACE_COND_DIM,
             state->post_af2_state,
-            feature_buffer + i_subframe * NOLACE_COND_DIM,
+            feature_buffer + i_subframe*NOLACE_COND_DIM,
             NOLACE_COND_DIM,
             ACTIVATION_TANH,
             arch);
     }
 
     /* update feature buffer */
-    OAC_COPY(feature_buffer, feature_transform_buffer, 4 * NOLACE_COND_DIM);
+    OAC_COPY(feature_buffer, feature_transform_buffer, 4*NOLACE_COND_DIM);
 
-#ifdef DEBUG_NOLACE
-    fwrite(x_buffer1, sizeof(float), 4 * NOLACE_FRAME_SIZE * NOLACE_AF2_OUT_CHANNELS, f_postaf2);
-#endif
+# ifdef DEBUG_NOLACE
+    fwrite(x_buffer1, sizeof(float), 4*NOLACE_FRAME_SIZE*NOLACE_AF2_OUT_CHANNELS, f_postaf2);
+# endif
 
     /* second shape-mix round */
-    for (i_subframe = 0; i_subframe < 4; i_subframe++)
-    {
+    for (i_subframe = 0; i_subframe < 4; i_subframe++) {
         celt_assert(NOLACE_AF2_OUT_CHANNELS == 2);
         /* modifies second channel in place */
         adashape_process_frame(
             &state->tdshape2_state,
-            x_buffer1 + i_subframe * NOLACE_AF2_OUT_CHANNELS * NOLACE_FRAME_SIZE + NOLACE_FRAME_SIZE,
-            x_buffer1 + i_subframe * NOLACE_AF2_OUT_CHANNELS * NOLACE_FRAME_SIZE + NOLACE_FRAME_SIZE,
-            feature_buffer + i_subframe * NOLACE_COND_DIM,
+            x_buffer1 + i_subframe*NOLACE_AF2_OUT_CHANNELS*NOLACE_FRAME_SIZE + NOLACE_FRAME_SIZE,
+            x_buffer1 + i_subframe*NOLACE_AF2_OUT_CHANNELS*NOLACE_FRAME_SIZE + NOLACE_FRAME_SIZE,
+            feature_buffer + i_subframe*NOLACE_COND_DIM,
             &layers->nolace_tdshape2_alpha1_f,
             &layers->nolace_tdshape2_alpha1_t,
             &layers->nolace_tdshape2_alpha2,
@@ -758,13 +749,13 @@ static void nolace_process_20ms_frame(
             NOLACE_TDSHAPE2_AVG_POOL_K,
             1,
             arch
-        );
+            );
 
         adaconv_process_frame(
             &state->af3_state,
-            x_buffer2 + i_subframe * NOLACE_FRAME_SIZE * NOLACE_AF3_OUT_CHANNELS,
-            x_buffer1 + i_subframe * NOLACE_FRAME_SIZE * NOLACE_AF3_IN_CHANNELS,
-            feature_buffer + i_subframe * NOLACE_COND_DIM,
+            x_buffer2 + i_subframe*NOLACE_FRAME_SIZE*NOLACE_AF3_OUT_CHANNELS,
+            x_buffer1 + i_subframe*NOLACE_FRAME_SIZE*NOLACE_AF3_IN_CHANNELS,
+            feature_buffer + i_subframe*NOLACE_COND_DIM,
             &hNoLACE->layers.nolace_af3_kernel,
             &hNoLACE->layers.nolace_af3_gain,
             NOLACE_COND_DIM,
@@ -782,27 +773,26 @@ static void nolace_process_20ms_frame(
 
         compute_generic_conv1d(
             &layers->nolace_post_af3,
-            feature_transform_buffer + i_subframe * NOLACE_COND_DIM,
+            feature_transform_buffer + i_subframe*NOLACE_COND_DIM,
             state->post_af3_state,
-            feature_buffer + i_subframe * NOLACE_COND_DIM,
+            feature_buffer + i_subframe*NOLACE_COND_DIM,
             NOLACE_COND_DIM,
             ACTIVATION_TANH,
             arch);
     }
 
     /* update feature buffer */
-    OAC_COPY(feature_buffer, feature_transform_buffer, 4 * NOLACE_COND_DIM);
+    OAC_COPY(feature_buffer, feature_transform_buffer, 4*NOLACE_COND_DIM);
 
     /* third shape-mix round */
-    for (i_subframe = 0; i_subframe < 4; i_subframe++)
-    {
+    for (i_subframe = 0; i_subframe < 4; i_subframe++) {
         celt_assert(NOLACE_AF3_OUT_CHANNELS == 2);
         /* modifies second channel in place */
         adashape_process_frame(
             &state->tdshape3_state,
-            x_buffer2 + i_subframe * NOLACE_AF3_OUT_CHANNELS * NOLACE_FRAME_SIZE + NOLACE_FRAME_SIZE,
-            x_buffer2 + i_subframe * NOLACE_AF3_OUT_CHANNELS * NOLACE_FRAME_SIZE + NOLACE_FRAME_SIZE,
-            feature_buffer + i_subframe * NOLACE_COND_DIM,
+            x_buffer2 + i_subframe*NOLACE_AF3_OUT_CHANNELS*NOLACE_FRAME_SIZE + NOLACE_FRAME_SIZE,
+            x_buffer2 + i_subframe*NOLACE_AF3_OUT_CHANNELS*NOLACE_FRAME_SIZE + NOLACE_FRAME_SIZE,
+            feature_buffer + i_subframe*NOLACE_COND_DIM,
             &layers->nolace_tdshape3_alpha1_f,
             &layers->nolace_tdshape3_alpha1_t,
             &layers->nolace_tdshape3_alpha2,
@@ -811,13 +801,13 @@ static void nolace_process_20ms_frame(
             NOLACE_TDSHAPE3_AVG_POOL_K,
             1,
             arch
-        );
+            );
 
         adaconv_process_frame(
             &state->af4_state,
-            x_buffer1 + i_subframe * NOLACE_FRAME_SIZE * NOLACE_AF4_OUT_CHANNELS,
-            x_buffer2 + i_subframe * NOLACE_FRAME_SIZE * NOLACE_AF4_IN_CHANNELS,
-            feature_buffer + i_subframe * NOLACE_COND_DIM,
+            x_buffer1 + i_subframe*NOLACE_FRAME_SIZE*NOLACE_AF4_OUT_CHANNELS,
+            x_buffer2 + i_subframe*NOLACE_FRAME_SIZE*NOLACE_AF4_IN_CHANNELS,
+            feature_buffer + i_subframe*NOLACE_COND_DIM,
             &hNoLACE->layers.nolace_af4_kernel,
             &hNoLACE->layers.nolace_af4_gain,
             NOLACE_COND_DIM,
@@ -837,37 +827,34 @@ static void nolace_process_20ms_frame(
 
 
     /* de-emphasis */
-    for (i_sample = 0; i_sample < 4 * NOLACE_FRAME_SIZE; i_sample ++)
-    {
-        x_out[i_sample] = x_buffer1[i_sample] + NOLACE_PREEMPH * state->deemph_mem;
+    for (i_sample = 0; i_sample < 4*NOLACE_FRAME_SIZE; i_sample++) {
+        x_out[i_sample] = x_buffer1[i_sample] + NOLACE_PREEMPH*state->deemph_mem;
         state->deemph_mem = x_out[i_sample];
     }
-#ifdef DEBUG_NOLACE
-    fwrite(x_out, sizeof(float), 4 * NOLACE_FRAME_SIZE, f_xdeemph);
-#endif
+# ifdef DEBUG_NOLACE
+    fwrite(x_out, sizeof(float), 4*NOLACE_FRAME_SIZE, f_xdeemph);
+# endif
 }
 
 #endif /* #ifndef DISABLE_NOLACE */
 
 
 #ifdef ENABLE_OSCE_BWE
-#ifndef DISABLE_BBWENET
+# ifndef DISABLE_BBWENET
 static void bbwe_feature_net(
     BBWENet *hBBWENET,
     BBWENetState *state,
     float *output,
     const float *features,
     int num_frames,
-    int arch
-)
-{
-    float input_buffer[4 * BBWENET_FNET_GRU_STATE_SIZE];
-    float output_buffer[4 * BBWENET_FNET_GRU_STATE_SIZE];
+    int arch) {
+    float input_buffer[4*BBWENET_FNET_GRU_STATE_SIZE];
+    float output_buffer[4*BBWENET_FNET_GRU_STATE_SIZE];
     int i_subframe;
     int i_frame;
 
-#ifdef DEBUG_BBWENET
-    static FILE *f_features=NULL, *f_conv1=NULL, *f_conv2=NULL, *f_tconv=NULL, *f_gru=NULL;
+#  ifdef DEBUG_BBWENET
+    static FILE *f_features = NULL, *f_conv1 = NULL, *f_conv2 = NULL, *f_tconv = NULL, *f_gru = NULL;
 
     FINIT(f_features, "debug/bbwenet_features.f32", "wb");
     FINIT(f_conv1, "debug/bbwenet_conv1.f32", "wb");
@@ -875,8 +862,8 @@ static void bbwe_feature_net(
     FINIT(f_tconv, "debug/bbwenet_tconv.f32", "wb");
     FINIT(f_gru, "debug/bbwenet_gru.f32", "wb");
 
-    fwrite(features, sizeof(*features), num_frames * BBWENET_FEATURE_DIM, f_features);
-#endif
+    fwrite(features, sizeof(*features), num_frames*BBWENET_FEATURE_DIM, f_features);
+#  endif
 
     /* adjust buffer sizes if any of this breaks */
     celt_assert(BBWENET_FNET_GRU_STATE_SIZE == BBWENET_FNET_TCONV_OUT_CHANNELS);
@@ -884,72 +871,72 @@ static void bbwe_feature_net(
     celt_assert(BBWENET_FNET_CONV2_OUT_SIZE == BBWENET_FNET_CONV1_OUT_SIZE);
 
     /* first conv layer */
-    for (i_frame = 0; i_frame < num_frames; i_frame++)
-    {
+    for (i_frame = 0; i_frame < num_frames; i_frame++) {
         compute_generic_conv1d(
             &hBBWENET->layers.bbwenet_fnet_conv1,
-            output_buffer + i_frame * BBWENET_FNET_CONV1_OUT_SIZE,
+            output_buffer + i_frame*BBWENET_FNET_CONV1_OUT_SIZE,
             state->feature_net_conv1_state,
-            features + i_frame * BBWENET_FEATURE_DIM,
+            features + i_frame*BBWENET_FEATURE_DIM,
             BBWENET_FEATURE_DIM,
             ACTIVATION_TANH,
             arch
-        );
-#ifdef DEBUG_BBWENET
-        fwrite(output_buffer + i_frame * BBWENET_FNET_CONV1_OUT_SIZE, sizeof(float), BBWENET_FNET_CONV1_OUT_SIZE, f_conv1);
-#endif
+            );
+#  ifdef DEBUG_BBWENET
+        fwrite(output_buffer + i_frame*BBWENET_FNET_CONV1_OUT_SIZE, sizeof(float), BBWENET_FNET_CONV1_OUT_SIZE,
+        f_conv1);
+#  endif
     }
-    OAC_COPY(input_buffer, output_buffer, num_frames * BBWENET_FNET_CONV1_OUT_SIZE);
+    OAC_COPY(input_buffer, output_buffer, num_frames*BBWENET_FNET_CONV1_OUT_SIZE);
 
     /* second conv layer */
-    for (i_frame = 0; i_frame < num_frames; i_frame++)
-    {
+    for (i_frame = 0; i_frame < num_frames; i_frame++) {
         compute_generic_conv1d(
             &hBBWENET->layers.bbwenet_fnet_conv2,
-            output_buffer + i_frame * BBWENET_FNET_CONV2_OUT_SIZE,
+            output_buffer + i_frame*BBWENET_FNET_CONV2_OUT_SIZE,
             state->feature_net_conv2_state,
-            input_buffer + i_frame * BBWENET_FNET_CONV1_OUT_SIZE,
+            input_buffer + i_frame*BBWENET_FNET_CONV1_OUT_SIZE,
             BBWENET_FNET_CONV1_OUT_SIZE,
             ACTIVATION_TANH,
             arch
-        );
-#ifdef DEBUG_BBWENET
-        fwrite(output_buffer + i_frame * BBWENET_FNET_CONV2_OUT_SIZE, sizeof(float), BBWENET_FNET_CONV2_OUT_SIZE, f_conv2);
-#endif
+            );
+#  ifdef DEBUG_BBWENET
+        fwrite(output_buffer + i_frame*BBWENET_FNET_CONV2_OUT_SIZE, sizeof(float), BBWENET_FNET_CONV2_OUT_SIZE,
+        f_conv2);
+#  endif
     }
-    OAC_COPY(input_buffer, output_buffer, num_frames * BBWENET_FNET_CONV2_OUT_SIZE);
+    OAC_COPY(input_buffer, output_buffer, num_frames*BBWENET_FNET_CONV2_OUT_SIZE);
 
     /* tconv upsampling*/
-    for (i_frame = 0; i_frame < num_frames; i_frame++)
-    {
+    for (i_frame = 0; i_frame < num_frames; i_frame++) {
         compute_generic_dense(
             &hBBWENET->layers.bbwenet_fnet_tconv,
-            output_buffer + i_frame * BBWENET_FNET_TCONV_OUT_CHANNELS * BBWENET_FNET_TCONV_STRIDE,
-            input_buffer + i_frame * BBWENET_FNET_CONV2_OUT_SIZE,
+            output_buffer + i_frame*BBWENET_FNET_TCONV_OUT_CHANNELS*BBWENET_FNET_TCONV_STRIDE,
+            input_buffer + i_frame*BBWENET_FNET_CONV2_OUT_SIZE,
             ACTIVATION_TANH,
             arch
-        );
-#ifdef DEBUG_BBWENET
-        fwrite(output_buffer + i_frame * BBWENET_FNET_TCONV_OUT_CHANNELS * BBWENET_FNET_TCONV_STRIDE, sizeof(float), BBWENET_FNET_TCONV_OUT_CHANNELS * BBWENET_FNET_TCONV_STRIDE, f_tconv);
-#endif
+            );
+#  ifdef DEBUG_BBWENET
+        fwrite(output_buffer + i_frame*BBWENET_FNET_TCONV_OUT_CHANNELS*BBWENET_FNET_TCONV_STRIDE, sizeof(float),
+        BBWENET_FNET_TCONV_OUT_CHANNELS*BBWENET_FNET_TCONV_STRIDE, f_tconv);
+#  endif
     }
-    OAC_COPY(input_buffer, output_buffer, num_frames * BBWENET_FNET_TCONV_OUT_CHANNELS * BBWENET_FNET_TCONV_STRIDE);
+    OAC_COPY(input_buffer, output_buffer, num_frames*BBWENET_FNET_TCONV_OUT_CHANNELS*BBWENET_FNET_TCONV_STRIDE);
 
     /* GRU */
     celt_assert(BBWENET_FNET_TCONV_STRIDE == 2);
-    for (i_subframe = 0; i_subframe < BBWENET_FNET_TCONV_STRIDE * num_frames; i_subframe ++)
-    {
+    for (i_subframe = 0; i_subframe < BBWENET_FNET_TCONV_STRIDE*num_frames; i_subframe++) {
         compute_generic_gru(
             &hBBWENET->layers.bbwenet_fnet_gru_input,
             &hBBWENET->layers.bbwenet_fnet_gru_recurrent,
             state->feature_net_gru_state,
-            input_buffer + i_subframe * BBWENET_FNET_TCONV_OUT_CHANNELS,
+            input_buffer + i_subframe*BBWENET_FNET_TCONV_OUT_CHANNELS,
             arch
-        );
-#ifdef DEBUG_BBWENET
+            );
+#  ifdef DEBUG_BBWENET
         fwrite(state->feature_net_gru_state, sizeof(float), BBWENET_FNET_GRU_STATE_SIZE, f_gru);
-#endif
-        OAC_COPY(output + i_subframe * BBWENET_FNET_GRU_STATE_SIZE, state->feature_net_gru_state, BBWENET_FNET_GRU_STATE_SIZE);
+#  endif
+        OAC_COPY(output + i_subframe*BBWENET_FNET_GRU_STATE_SIZE, state->feature_net_gru_state,
+        BBWENET_FNET_GRU_STATE_SIZE);
     }
 }
 
@@ -968,131 +955,123 @@ static float frac_17_24[8] = {
 
 static float frac_09_24[8] = {
     -0.00146484,  0.02313232, -0.12072754,  0.7315979,
-    0.4621277, -0.12075806,  0.0295105 , -0.00326538
+    0.4621277, -0.12075806,  0.0295105, -0.00326538
 };
 
-static void apply_valin_activation(float *x, int len)
-{
+static void apply_valin_activation(float *x, int len) {
     int i;
-    float y[2 * BBWENET_TDSHAPE2_FRAME_SIZE];
-    celt_assert(len <= 2 * BBWENET_TDSHAPE2_FRAME_SIZE);
-    for (i = 0; i < len; i++)
-    {
+    float y[2*BBWENET_TDSHAPE2_FRAME_SIZE];
+    celt_assert(len <= 2*BBWENET_TDSHAPE2_FRAME_SIZE);
+    for (i = 0; i < len; i++) {
         y[i] = fabs(x[i]) + 1e-6f;
     }
-    for (i = 0; i < len; i++)
-    {
+    for (i = 0; i < len; i++) {
         y[i] = celt_log(y[i]);
     }
-    for (i = 0; i < len; i++)
-    {
+    for (i = 0; i < len; i++) {
         x[i] *= celt_sin(y[i]);
     }
 }
 
 
-#define DELAY_SAMPLES 8 /* ToDo: this probably should be 7, bug in python code? */
-static void interpol_3_2(resamp_state *state, float *x_out, const float *x_in, int num_samples)
-{
+#  define DELAY_SAMPLES 8 /* ToDo: this probably should be 7, bug in python code? */
+static void interpol_3_2(resamp_state *state, float *x_out, const float *x_in, int num_samples) {
     int i_sample, i_out = 0;
-    float buffer[8 * BBWENET_FRAME_SIZE16 + DELAY_SAMPLES];
+    float buffer[8*BBWENET_FRAME_SIZE16 + DELAY_SAMPLES];
 
     celt_assert(num_samples > 1);
-    celt_assert(num_samples < 8 * BBWENET_FRAME_SIZE16);
-    celt_assert(num_samples % 2 == 0);
+    celt_assert(num_samples < 8*BBWENET_FRAME_SIZE16);
+    celt_assert(num_samples%2 == 0);
 
     OAC_COPY(buffer, state->interpol_buffer, DELAY_SAMPLES);
     OAC_COPY(buffer + DELAY_SAMPLES, x_in, num_samples);
 
-    for (i_sample = 0; i_sample < num_samples; i_sample+=2)
-    {
-        x_out[i_out++] = buffer[i_sample + 0] * frac_01_24[0] +
-                         buffer[i_sample + 1] * frac_01_24[1] +
-                         buffer[i_sample + 2] * frac_01_24[2] +
-                         buffer[i_sample + 3] * frac_01_24[3] +
-                         buffer[i_sample + 4] * frac_01_24[4] +
-                         buffer[i_sample + 5] * frac_01_24[5] +
-                         buffer[i_sample + 6] * frac_01_24[6] +
-                         buffer[i_sample + 7] * frac_01_24[7];
-
-        x_out[i_out++] = buffer[i_sample + 0] * frac_17_24[0] +
-                         buffer[i_sample + 1] * frac_17_24[1] +
-                         buffer[i_sample + 2] * frac_17_24[2] +
-                         buffer[i_sample + 3] * frac_17_24[3] +
-                         buffer[i_sample + 4] * frac_17_24[4] +
-                         buffer[i_sample + 5] * frac_17_24[5] +
-                         buffer[i_sample + 6] * frac_17_24[6] +
-                         buffer[i_sample + 7] * frac_17_24[7];
-
-        x_out[i_out++] = buffer[i_sample + 1] * frac_09_24[0] +
-                         buffer[i_sample + 2] * frac_09_24[1] +
-                         buffer[i_sample + 3] * frac_09_24[2] +
-                         buffer[i_sample + 4] * frac_09_24[3] +
-                         buffer[i_sample + 5] * frac_09_24[4] +
-                         buffer[i_sample + 6] * frac_09_24[5] +
-                         buffer[i_sample + 7] * frac_09_24[6] +
-                         buffer[i_sample + 8] * frac_09_24[7];
+    for (i_sample = 0; i_sample < num_samples; i_sample += 2) {
+        x_out[i_out++] = buffer[i_sample + 0]*frac_01_24[0]
+                         + buffer[i_sample + 1]*frac_01_24[1]
+                         + buffer[i_sample + 2]*frac_01_24[2]
+                         + buffer[i_sample + 3]*frac_01_24[3]
+                         + buffer[i_sample + 4]*frac_01_24[4]
+                         + buffer[i_sample + 5]*frac_01_24[5]
+                         + buffer[i_sample + 6]*frac_01_24[6]
+                         + buffer[i_sample + 7]*frac_01_24[7];
+
+        x_out[i_out++] = buffer[i_sample + 0]*frac_17_24[0]
+                         + buffer[i_sample + 1]*frac_17_24[1]
+                         + buffer[i_sample + 2]*frac_17_24[2]
+                         + buffer[i_sample + 3]*frac_17_24[3]
+                         + buffer[i_sample + 4]*frac_17_24[4]
+                         + buffer[i_sample + 5]*frac_17_24[5]
+                         + buffer[i_sample + 6]*frac_17_24[6]
+                         + buffer[i_sample + 7]*frac_17_24[7];
+
+        x_out[i_out++] = buffer[i_sample + 1]*frac_09_24[0]
+                         + buffer[i_sample + 2]*frac_09_24[1]
+                         + buffer[i_sample + 3]*frac_09_24[2]
+                         + buffer[i_sample + 4]*frac_09_24[3]
+                         + buffer[i_sample + 5]*frac_09_24[4]
+                         + buffer[i_sample + 6]*frac_09_24[5]
+                         + buffer[i_sample + 7]*frac_09_24[6]
+                         + buffer[i_sample + 8]*frac_09_24[7];
     }
 
     /* copy last samples to buffer */
     OAC_COPY(state->interpol_buffer, buffer + num_samples, DELAY_SAMPLES);
 }
 
-static void upsamp_2x(resamp_state *state, float *x_out, const float *x_in, int num_samples)
-{
-    float buffer [4 * BBWENET_FRAME_SIZE16];
+static void upsamp_2x(resamp_state *state, float *x_out, const float *x_in, int num_samples) {
+    float buffer[4*BBWENET_FRAME_SIZE16];
     float *S_even = state->upsamp_buffer[0];
     float *S_odd = state->upsamp_buffer[1];
     int k;
     float x, X, Y, tmp1, tmp2, tmp3;
 
     celt_assert(num_samples > 1);
-    celt_assert(num_samples < 4 * BBWENET_FRAME_SIZE16);
+    celt_assert(num_samples < 4*BBWENET_FRAME_SIZE16);
 
     OAC_COPY(buffer, x_in, num_samples);
 
-    for (k = 0; k < num_samples; k++)
-    {
+    for (k = 0; k < num_samples; k++) {
         x = buffer[k];
         /* even sample, first pass, */
         Y = x - S_even[0];
-        X = Y * hq_2x_even[0];
+        X = Y*hq_2x_even[0];
         tmp1 = S_even[0] + X;
         S_even[0] = x + X;
 
         /* ...second pass, */
         Y = tmp1 - S_even[1];
-        X = Y * hq_2x_even[1];
+        X = Y*hq_2x_even[1];
         tmp2 = S_even[1] + X;
         S_even[1] = tmp1 + X;
 
         /* ...third pass */
         Y = tmp2 - S_even[2];
-        X = Y * (1 + hq_2x_even[2]);
+        X = Y*(1 + hq_2x_even[2]);
         tmp3 = S_even[2] + X;
         S_even[2] = tmp2 + X;
 
-        x_out[2 * k] = tmp3;
+        x_out[2*k] = tmp3;
 
         /* odd sample, first pass, */
         Y = x - S_odd[0];
-        X = Y * hq_2x_odd[0];
+        X = Y*hq_2x_odd[0];
         tmp1 = S_odd[0] + X;
         S_odd[0] = x + X;
 
         /* ...second pass, */
         Y = tmp1 - S_odd[1];
-        X = Y * hq_2x_odd[1];
+        X = Y*hq_2x_odd[1];
         tmp2 = S_odd[1] + X;
         S_odd[1] = tmp1 + X;
 
         /* ...third pass */
         Y = tmp2 - S_odd[2];
-        X = Y * (1 + hq_2x_odd[2]);
+        X = Y*(1 + hq_2x_odd[2]);
         tmp3 = S_odd[2] + X;
         S_odd[2] = tmp2 + X;
 
-        x_out[2 * k + 1] = tmp3;
+        x_out[2*k + 1] = tmp3;
     }
 }
 
@@ -1103,22 +1082,20 @@ static void bbwenet_process_frames(
     const float *x_in,
     const float *features,
     int num_frames,
-    int arch
-)
-{
-    float latent_features[4 * BBWENET_COND_DIM];
-    int i_subframe, num_subframes = 2 * num_frames, i_channel;
-    float x_buffer1[3 * 3 * 4 * 3*BBWENET_FRAME_SIZE16] = {0}; /* 3x3 channels, 4 subframes, 48 kHz */
-    float x_buffer2[3 * 3 * 4 * 3*BBWENET_FRAME_SIZE16] = {0};
+    int arch) {
+    float latent_features[4*BBWENET_COND_DIM];
+    int i_subframe, num_subframes = 2*num_frames, i_channel;
+    float x_buffer1[3*3*4*3*BBWENET_FRAME_SIZE16] = {0};       /* 3x3 channels, 4 subframes, 48 kHz */
+    float x_buffer2[3*3*4*3*BBWENET_FRAME_SIZE16] = {0};
     BBWENETLayers *layers = &hBBWENET->layers;
 
-#ifdef DEBUG_BBWENET
-    static FILE *f_latent=NULL, *f_xin=NULL, *f_af1_1=NULL, *f_af1_2=NULL, *f_af1_3=NULL;
-    static FILE *f_up2_1=NULL, *f_up2_2=NULL, *f_up2_3=NULL, *f2_up_shape=NULL, *f2_up_func=NULL;
-    static FILE *f_af2_1=NULL, *f_af2_2=NULL, *f_af2_3=NULL;
-    static FILE *f_up15_1=NULL, *f_up15_2=NULL, *f_up15_3=NULL;
-    static FILE *f_up15_shape=NULL, *f_up15_func=NULL;
-    static FILE *f_af3_1=NULL;
+#  ifdef DEBUG_BBWENET
+    static FILE *f_latent = NULL, *f_xin = NULL, *f_af1_1 = NULL, *f_af1_2 = NULL, *f_af1_3 = NULL;
+    static FILE *f_up2_1 = NULL, *f_up2_2 = NULL, *f_up2_3 = NULL, *f2_up_shape = NULL, *f2_up_func = NULL;
+    static FILE *f_af2_1 = NULL, *f_af2_2 = NULL, *f_af2_3 = NULL;
+    static FILE *f_up15_1 = NULL, *f_up15_2 = NULL, *f_up15_3 = NULL;
+    static FILE *f_up15_shape = NULL, *f_up15_func = NULL;
+    static FILE *f_af3_1 = NULL;
 
     FINIT(f_latent, "dnn/torch/osce/debugdump/feature_net_gru.f32", "rb");
     FINIT(f_xin, "debug/bbwenet_x_in.f32", "wb");
@@ -1139,27 +1116,26 @@ static void bbwenet_process_frames(
     FINIT(f_up15_shape, "debug/bbwenet_up15_shape.f32", "wb");
     FINIT(f_up15_func, "debug/bbwenet_up15_func.f32", "wb");
     FINIT(f_af3_1, "debug/bbwenet_af3_1.f32", "wb");
-    fwrite(x_in, sizeof(*x_in), num_subframes * BBWENET_AF1_FRAME_SIZE, f_xin);
-#endif
+    fwrite(x_in, sizeof(*x_in), num_subframes*BBWENET_AF1_FRAME_SIZE, f_xin);
+#  endif
 
     /* feature net */
     bbwe_feature_net(hBBWENET, state, latent_features, features, num_frames, arch);
-#ifdef DEBUG_BBWENET
-    if (f_latent != NULL){
-        fread(latent_features, sizeof(*latent_features), num_subframes * BBWENET_COND_DIM, f_latent);
+#  ifdef DEBUG_BBWENET
+    if (f_latent != NULL) {
+        fread(latent_features, sizeof(*latent_features), num_subframes*BBWENET_COND_DIM, f_latent);
     }
-#endif
+#  endif
 
 
     /* signal net
      * first adaptive filtering stage, three output channels */
-    for (i_subframe = 0; i_subframe < num_subframes; i_subframe++)
-    {
+    for (i_subframe = 0; i_subframe < num_subframes; i_subframe++) {
         adaconv_process_frame(
             &state->af1_state,
-            x_buffer1 + i_subframe * BBWENET_AF1_FRAME_SIZE * BBWENET_AF1_OUT_CHANNELS,
-            x_in + i_subframe * BBWENET_AF1_FRAME_SIZE,
-            latent_features + i_subframe * BBWENET_COND_DIM,
+            x_buffer1 + i_subframe*BBWENET_AF1_FRAME_SIZE*BBWENET_AF1_OUT_CHANNELS,
+            x_in + i_subframe*BBWENET_AF1_FRAME_SIZE,
+            latent_features + i_subframe*BBWENET_COND_DIM,
             &layers->bbwenet_af1_kernel,
             &layers->bbwenet_af1_gain,
             BBWENET_COND_DIM,
@@ -1175,42 +1151,48 @@ static void bbwenet_process_frames(
             hBBWENET->window16,
             arch);
 
-#ifdef DEBUG_BBWENET
-        fwrite(x_buffer1 + i_subframe * BBWENET_AF1_FRAME_SIZE * BBWENET_AF1_OUT_CHANNELS, sizeof(float), BBWENET_AF1_FRAME_SIZE, f_af1_1);
-        fwrite(x_buffer1 + i_subframe * BBWENET_AF1_FRAME_SIZE * BBWENET_AF1_OUT_CHANNELS + BBWENET_AF1_FRAME_SIZE, sizeof(float), BBWENET_AF1_FRAME_SIZE, f_af1_2);
-        fwrite(x_buffer1 + i_subframe * BBWENET_AF1_FRAME_SIZE * BBWENET_AF1_OUT_CHANNELS + 2 * BBWENET_AF1_FRAME_SIZE, sizeof(float), BBWENET_AF1_FRAME_SIZE, f_af1_3);
-#endif
+#  ifdef DEBUG_BBWENET
+        fwrite(x_buffer1 + i_subframe*BBWENET_AF1_FRAME_SIZE*BBWENET_AF1_OUT_CHANNELS, sizeof(float),
+        BBWENET_AF1_FRAME_SIZE, f_af1_1);
+        fwrite(x_buffer1 + i_subframe*BBWENET_AF1_FRAME_SIZE*BBWENET_AF1_OUT_CHANNELS + BBWENET_AF1_FRAME_SIZE,
+        sizeof(float), BBWENET_AF1_FRAME_SIZE, f_af1_2);
+        fwrite(x_buffer1 + i_subframe*BBWENET_AF1_FRAME_SIZE*BBWENET_AF1_OUT_CHANNELS + 2*BBWENET_AF1_FRAME_SIZE,
+        sizeof(float), BBWENET_AF1_FRAME_SIZE, f_af1_3);
+#  endif
     }
 
     /* 1st round of non-linear extension */
-    for (i_subframe = 0; i_subframe < num_subframes; i_subframe++)
-    {
+    for (i_subframe = 0; i_subframe < num_subframes; i_subframe++) {
 
         /* 2x upsampling on individual channels */
         celt_assert(BBWENET_AF1_OUT_CHANNELS == 3);
-        celt_assert(2 * BBWENET_AF1_FRAME_SIZE == BBWENET_TDSHAPE1_FRAME_SIZE);
-        for (i_channel = 0; i_channel < 3; i_channel ++)
-        {
+        celt_assert(2*BBWENET_AF1_FRAME_SIZE == BBWENET_TDSHAPE1_FRAME_SIZE);
+        for (i_channel = 0; i_channel < 3; i_channel++) {
             upsamp_2x(
                 &state->resampler_state[i_channel],
-                x_buffer2 + i_subframe * BBWENET_TDSHAPE1_FRAME_SIZE * BBWENET_AF1_OUT_CHANNELS + i_channel * BBWENET_TDSHAPE1_FRAME_SIZE,
-                x_buffer1 + i_subframe * BBWENET_AF1_FRAME_SIZE * BBWENET_AF1_OUT_CHANNELS + i_channel * BBWENET_AF1_FRAME_SIZE,
+                x_buffer2 + i_subframe*BBWENET_TDSHAPE1_FRAME_SIZE*BBWENET_AF1_OUT_CHANNELS + i_channel
+                *BBWENET_TDSHAPE1_FRAME_SIZE,
+                x_buffer1 + i_subframe*BBWENET_AF1_FRAME_SIZE*BBWENET_AF1_OUT_CHANNELS + i_channel
+                *BBWENET_AF1_FRAME_SIZE,
                 BBWENET_AF1_FRAME_SIZE
-            );
+                );
         }
 
-#ifdef DEBUG_BBWENET
-        fwrite(x_buffer2 + i_subframe * BBWENET_AF1_OUT_CHANNELS * BBWENET_TDSHAPE1_FRAME_SIZE, sizeof(float), BBWENET_TDSHAPE1_FRAME_SIZE, f_up2_1);
-        fwrite(x_buffer2 + i_subframe * BBWENET_AF1_OUT_CHANNELS * BBWENET_TDSHAPE1_FRAME_SIZE + BBWENET_TDSHAPE1_FRAME_SIZE, sizeof(float), BBWENET_TDSHAPE1_FRAME_SIZE, f_up2_2);
-        fwrite(x_buffer2 + i_subframe * BBWENET_AF1_OUT_CHANNELS * BBWENET_TDSHAPE1_FRAME_SIZE + 2 * BBWENET_TDSHAPE1_FRAME_SIZE, sizeof(float), BBWENET_TDSHAPE1_FRAME_SIZE, f_up2_3);
-#endif
+#  ifdef DEBUG_BBWENET
+        fwrite(x_buffer2 + i_subframe*BBWENET_AF1_OUT_CHANNELS*BBWENET_TDSHAPE1_FRAME_SIZE, sizeof(float),
+        BBWENET_TDSHAPE1_FRAME_SIZE, f_up2_1);
+        fwrite(x_buffer2 + i_subframe*BBWENET_AF1_OUT_CHANNELS*BBWENET_TDSHAPE1_FRAME_SIZE
+            + BBWENET_TDSHAPE1_FRAME_SIZE, sizeof(float), BBWENET_TDSHAPE1_FRAME_SIZE, f_up2_2);
+        fwrite(x_buffer2 + i_subframe*BBWENET_AF1_OUT_CHANNELS*BBWENET_TDSHAPE1_FRAME_SIZE + 2
+            *BBWENET_TDSHAPE1_FRAME_SIZE, sizeof(float), BBWENET_TDSHAPE1_FRAME_SIZE, f_up2_3);
+#  endif
 
         /* tdshape on second channel (in place) */
         adashape_process_frame(
             &state->tdshape1_state,
-            x_buffer2 + i_subframe * BBWENET_AF1_OUT_CHANNELS * BBWENET_TDSHAPE1_FRAME_SIZE + BBWENET_TDSHAPE1_FRAME_SIZE,
-            x_buffer2 + i_subframe * BBWENET_AF1_OUT_CHANNELS * BBWENET_TDSHAPE1_FRAME_SIZE + BBWENET_TDSHAPE1_FRAME_SIZE,
-            latent_features + i_subframe * BBWENET_COND_DIM,
+            x_buffer2 + i_subframe*BBWENET_AF1_OUT_CHANNELS*BBWENET_TDSHAPE1_FRAME_SIZE + BBWENET_TDSHAPE1_FRAME_SIZE,
+            x_buffer2 + i_subframe*BBWENET_AF1_OUT_CHANNELS*BBWENET_TDSHAPE1_FRAME_SIZE + BBWENET_TDSHAPE1_FRAME_SIZE,
+            latent_features + i_subframe*BBWENET_COND_DIM,
             &layers->bbwenet_tdshape1_alpha1_f,
             &layers->bbwenet_tdshape1_alpha1_t,
             &layers->bbwenet_tdshape1_alpha2,
@@ -1219,31 +1201,32 @@ static void bbwenet_process_frames(
             BBWENET_TDSHAPE1_AVG_POOL_K,
             BBWENET_TDSHAPE1_INTERPOLATE_K,
             arch
-        );
+            );
 
-#ifdef DEBUG_BBWENET
-        fwrite(x_buffer2 + i_subframe * BBWENET_AF1_OUT_CHANNELS * BBWENET_TDSHAPE1_FRAME_SIZE + BBWENET_TDSHAPE1_FRAME_SIZE, sizeof(float), BBWENET_TDSHAPE1_FRAME_SIZE, f2_up_shape);
-#endif
+#  ifdef DEBUG_BBWENET
+        fwrite(x_buffer2 + i_subframe*BBWENET_AF1_OUT_CHANNELS*BBWENET_TDSHAPE1_FRAME_SIZE
+            + BBWENET_TDSHAPE1_FRAME_SIZE, sizeof(float), BBWENET_TDSHAPE1_FRAME_SIZE, f2_up_shape);
+#  endif
 
         /* non-linear activation of third channel (in place)*/
         apply_valin_activation(
-            x_buffer2 + i_subframe * BBWENET_AF1_OUT_CHANNELS * BBWENET_TDSHAPE1_FRAME_SIZE + 2 * BBWENET_TDSHAPE1_FRAME_SIZE,
+            x_buffer2 + i_subframe*BBWENET_AF1_OUT_CHANNELS*BBWENET_TDSHAPE1_FRAME_SIZE + 2*BBWENET_TDSHAPE1_FRAME_SIZE,
             BBWENET_TDSHAPE1_FRAME_SIZE
-        );
-#ifdef DEBUG_BBWENET
-        fwrite(x_buffer2 + i_subframe * BBWENET_AF1_OUT_CHANNELS * BBWENET_TDSHAPE1_FRAME_SIZE + 2 * BBWENET_TDSHAPE1_FRAME_SIZE, sizeof(float), BBWENET_TDSHAPE1_FRAME_SIZE, f2_up_func);
-#endif
+            );
+#  ifdef DEBUG_BBWENET
+        fwrite(x_buffer2 + i_subframe*BBWENET_AF1_OUT_CHANNELS*BBWENET_TDSHAPE1_FRAME_SIZE + 2
+            *BBWENET_TDSHAPE1_FRAME_SIZE, sizeof(float), BBWENET_TDSHAPE1_FRAME_SIZE, f2_up_func);
+#  endif
 
     }
 
     /* mixing */
-    for (i_subframe = 0; i_subframe < num_subframes; i_subframe++)
-    {
+    for (i_subframe = 0; i_subframe < num_subframes; i_subframe++) {
         adaconv_process_frame(
             &state->af2_state,
-            x_buffer1 + i_subframe * BBWENET_AF2_FRAME_SIZE * BBWENET_AF2_OUT_CHANNELS,
-            x_buffer2 + i_subframe * BBWENET_AF2_FRAME_SIZE * BBWENET_AF1_OUT_CHANNELS,
-            latent_features + i_subframe * BBWENET_COND_DIM,
+            x_buffer1 + i_subframe*BBWENET_AF2_FRAME_SIZE*BBWENET_AF2_OUT_CHANNELS,
+            x_buffer2 + i_subframe*BBWENET_AF2_FRAME_SIZE*BBWENET_AF1_OUT_CHANNELS,
+            latent_features + i_subframe*BBWENET_COND_DIM,
             &layers->bbwenet_af2_kernel,
             &layers->bbwenet_af2_gain,
             BBWENET_COND_DIM,
@@ -1258,41 +1241,47 @@ static void bbwenet_process_frames(
             BBWENET_AF2_SHAPE_GAIN,
             hBBWENET->window32,
             arch);
-#ifdef DEBUG_BBWENET
-        fwrite(x_buffer1 + i_subframe * BBWENET_AF2_FRAME_SIZE * BBWENET_AF2_OUT_CHANNELS, sizeof(float), BBWENET_AF2_FRAME_SIZE, f_af2_1);
-        fwrite(x_buffer1 + i_subframe * BBWENET_AF2_FRAME_SIZE * BBWENET_AF2_OUT_CHANNELS + BBWENET_AF2_FRAME_SIZE, sizeof(float), BBWENET_AF2_FRAME_SIZE, f_af2_2);
-        fwrite(x_buffer1 + i_subframe * BBWENET_AF2_FRAME_SIZE * BBWENET_AF2_OUT_CHANNELS + 2 * BBWENET_AF2_FRAME_SIZE, sizeof(float), BBWENET_AF2_FRAME_SIZE, f_af2_3);
-#endif
+#  ifdef DEBUG_BBWENET
+        fwrite(x_buffer1 + i_subframe*BBWENET_AF2_FRAME_SIZE*BBWENET_AF2_OUT_CHANNELS, sizeof(float),
+        BBWENET_AF2_FRAME_SIZE, f_af2_1);
+        fwrite(x_buffer1 + i_subframe*BBWENET_AF2_FRAME_SIZE*BBWENET_AF2_OUT_CHANNELS + BBWENET_AF2_FRAME_SIZE,
+        sizeof(float), BBWENET_AF2_FRAME_SIZE, f_af2_2);
+        fwrite(x_buffer1 + i_subframe*BBWENET_AF2_FRAME_SIZE*BBWENET_AF2_OUT_CHANNELS + 2*BBWENET_AF2_FRAME_SIZE,
+        sizeof(float), BBWENET_AF2_FRAME_SIZE, f_af2_3);
+#  endif
     }
 
     /* second round of extension */
-    for (i_subframe = 0; i_subframe < num_subframes; i_subframe++)
-    {
+    for (i_subframe = 0; i_subframe < num_subframes; i_subframe++) {
         /* 1.5x interpolation on individual channels */
         celt_assert(BBWENET_AF2_OUT_CHANNELS == 3);
-        celt_assert(3 * BBWENET_AF2_FRAME_SIZE == 2 * BBWENET_TDSHAPE2_FRAME_SIZE);
-        for (i_channel = 0; i_channel < 3; i_channel ++)
-        {
+        celt_assert(3*BBWENET_AF2_FRAME_SIZE == 2*BBWENET_TDSHAPE2_FRAME_SIZE);
+        for (i_channel = 0; i_channel < 3; i_channel++) {
             interpol_3_2(
                 &state->resampler_state[i_channel],
-                x_buffer2 + i_subframe * BBWENET_AF3_FRAME_SIZE * BBWENET_AF2_OUT_CHANNELS + i_channel * BBWENET_TDSHAPE2_FRAME_SIZE,
-                x_buffer1 + i_subframe * BBWENET_TDSHAPE1_FRAME_SIZE * BBWENET_AF2_OUT_CHANNELS + i_channel * BBWENET_TDSHAPE1_FRAME_SIZE,
+                x_buffer2 + i_subframe*BBWENET_AF3_FRAME_SIZE*BBWENET_AF2_OUT_CHANNELS + i_channel
+                *BBWENET_TDSHAPE2_FRAME_SIZE,
+                x_buffer1 + i_subframe*BBWENET_TDSHAPE1_FRAME_SIZE*BBWENET_AF2_OUT_CHANNELS + i_channel
+                *BBWENET_TDSHAPE1_FRAME_SIZE,
                 BBWENET_TDSHAPE1_FRAME_SIZE
-            );
+                );
         }
 
-#ifdef DEBUG_BBWENET
-        fwrite(x_buffer2 + i_subframe * BBWENET_AF2_OUT_CHANNELS * BBWENET_TDSHAPE2_FRAME_SIZE, sizeof(float), BBWENET_TDSHAPE2_FRAME_SIZE, f_up15_1);
-        fwrite(x_buffer2 + i_subframe * BBWENET_AF2_OUT_CHANNELS * BBWENET_TDSHAPE2_FRAME_SIZE + BBWENET_TDSHAPE2_FRAME_SIZE, sizeof(float), BBWENET_TDSHAPE2_FRAME_SIZE, f_up15_2);
-        fwrite(x_buffer2 + i_subframe * BBWENET_AF2_OUT_CHANNELS * BBWENET_TDSHAPE2_FRAME_SIZE + 2 * BBWENET_TDSHAPE2_FRAME_SIZE, sizeof(float), BBWENET_TDSHAPE2_FRAME_SIZE, f_up15_3);
-#endif
+#  ifdef DEBUG_BBWENET
+        fwrite(x_buffer2 + i_subframe*BBWENET_AF2_OUT_CHANNELS*BBWENET_TDSHAPE2_FRAME_SIZE, sizeof(float),
+        BBWENET_TDSHAPE2_FRAME_SIZE, f_up15_1);
+        fwrite(x_buffer2 + i_subframe*BBWENET_AF2_OUT_CHANNELS*BBWENET_TDSHAPE2_FRAME_SIZE
+            + BBWENET_TDSHAPE2_FRAME_SIZE, sizeof(float), BBWENET_TDSHAPE2_FRAME_SIZE, f_up15_2);
+        fwrite(x_buffer2 + i_subframe*BBWENET_AF2_OUT_CHANNELS*BBWENET_TDSHAPE2_FRAME_SIZE + 2
+            *BBWENET_TDSHAPE2_FRAME_SIZE, sizeof(float), BBWENET_TDSHAPE2_FRAME_SIZE, f_up15_3);
+#  endif
 
         /* tdshape on second channel (in place) */
         adashape_process_frame(
             &state->tdshape2_state,
-            x_buffer2 + i_subframe * BBWENET_AF2_OUT_CHANNELS * BBWENET_TDSHAPE2_FRAME_SIZE + BBWENET_TDSHAPE2_FRAME_SIZE,
-            x_buffer2 + i_subframe * BBWENET_AF2_OUT_CHANNELS * BBWENET_TDSHAPE2_FRAME_SIZE + BBWENET_TDSHAPE2_FRAME_SIZE,
-            latent_features + i_subframe * BBWENET_COND_DIM,
+            x_buffer2 + i_subframe*BBWENET_AF2_OUT_CHANNELS*BBWENET_TDSHAPE2_FRAME_SIZE + BBWENET_TDSHAPE2_FRAME_SIZE,
+            x_buffer2 + i_subframe*BBWENET_AF2_OUT_CHANNELS*BBWENET_TDSHAPE2_FRAME_SIZE + BBWENET_TDSHAPE2_FRAME_SIZE,
+            latent_features + i_subframe*BBWENET_COND_DIM,
             &layers->bbwenet_tdshape2_alpha1_f,
             &layers->bbwenet_tdshape2_alpha1_t,
             &layers->bbwenet_tdshape2_alpha2,
@@ -1301,31 +1290,32 @@ static void bbwenet_process_frames(
             BBWENET_TDSHAPE2_AVG_POOL_K,
             BBWENET_TDSHAPE2_INTERPOLATE_K,
             arch
-        );
+            );
 
-#ifdef DEBUG_BBWENET
-        fwrite(x_buffer2 + i_subframe * BBWENET_AF2_OUT_CHANNELS * BBWENET_TDSHAPE2_FRAME_SIZE + BBWENET_TDSHAPE2_FRAME_SIZE, sizeof(float), BBWENET_TDSHAPE2_FRAME_SIZE, f_up15_shape);
-#endif
+#  ifdef DEBUG_BBWENET
+        fwrite(x_buffer2 + i_subframe*BBWENET_AF2_OUT_CHANNELS*BBWENET_TDSHAPE2_FRAME_SIZE
+            + BBWENET_TDSHAPE2_FRAME_SIZE, sizeof(float), BBWENET_TDSHAPE2_FRAME_SIZE, f_up15_shape);
+#  endif
 
         /* non-linear activation of third channel (in place)*/
         apply_valin_activation(
-            x_buffer2 + i_subframe * BBWENET_AF2_OUT_CHANNELS * BBWENET_TDSHAPE2_FRAME_SIZE + 2 * BBWENET_TDSHAPE2_FRAME_SIZE,
+            x_buffer2 + i_subframe*BBWENET_AF2_OUT_CHANNELS*BBWENET_TDSHAPE2_FRAME_SIZE + 2*BBWENET_TDSHAPE2_FRAME_SIZE,
             BBWENET_TDSHAPE2_FRAME_SIZE
-        );
-#ifdef DEBUG_BBWENET
-        fwrite(x_buffer2 + i_subframe * BBWENET_AF2_OUT_CHANNELS * BBWENET_TDSHAPE2_FRAME_SIZE + 2 * BBWENET_TDSHAPE2_FRAME_SIZE, sizeof(float), BBWENET_TDSHAPE2_FRAME_SIZE, f_up15_func);
-#endif
+            );
+#  ifdef DEBUG_BBWENET
+        fwrite(x_buffer2 + i_subframe*BBWENET_AF2_OUT_CHANNELS*BBWENET_TDSHAPE2_FRAME_SIZE + 2
+            *BBWENET_TDSHAPE2_FRAME_SIZE, sizeof(float), BBWENET_TDSHAPE2_FRAME_SIZE, f_up15_func);
+#  endif
     }
 
     /* final mixing */
     celt_assert(BBWENET_AF3_OUT_CHANNELS == 1);
-    for (i_subframe = 0; i_subframe < num_subframes; i_subframe++)
-    {
+    for (i_subframe = 0; i_subframe < num_subframes; i_subframe++) {
         adaconv_process_frame(
             &state->af3_state,
-            x_out + i_subframe * BBWENET_AF3_FRAME_SIZE,
-            x_buffer2 + i_subframe * BBWENET_TDSHAPE2_FRAME_SIZE * BBWENET_AF2_OUT_CHANNELS,
-            latent_features + i_subframe * BBWENET_COND_DIM,
+            x_out + i_subframe*BBWENET_AF3_FRAME_SIZE,
+            x_buffer2 + i_subframe*BBWENET_TDSHAPE2_FRAME_SIZE*BBWENET_AF2_OUT_CHANNELS,
+            latent_features + i_subframe*BBWENET_COND_DIM,
             &layers->bbwenet_af3_kernel,
             &layers->bbwenet_af3_gain,
             BBWENET_COND_DIM,
@@ -1342,13 +1332,12 @@ static void bbwenet_process_frames(
             arch);
     }
 
-#ifdef DEBUG_BBWENET
-    fwrite(x_out, sizeof(float), num_subframes * BBWENET_AF3_FRAME_SIZE, f_af3_1);
-#endif
+#  ifdef DEBUG_BBWENET
+    fwrite(x_out, sizeof(float), num_subframes*BBWENET_AF3_FRAME_SIZE, f_af3_1);
+#  endif
 }
 
-static void reset_bbwenet_state(BBWENetState *state)
-{
+static void reset_bbwenet_state(BBWENetState *state) {
     OAC_CLEAR(state, 1);
 
     init_adaconv_state(&state->af1_state);
@@ -1358,8 +1347,7 @@ static void reset_bbwenet_state(BBWENetState *state)
     init_adashape_state(&state->tdshape2_state);
 }
 
-static int init_bbwenet(BBWENet *hBBWENET, const WeightArray *weights)
-{
+static int init_bbwenet(BBWENet *hBBWENET, const WeightArray *weights) {
     int ret = 0;
     OAC_CLEAR(hBBWENET, 1);
     celt_assert(weights != NULL);
@@ -1373,19 +1361,17 @@ static int init_bbwenet(BBWENet *hBBWENET, const WeightArray *weights)
     return ret;
 }
 
-#endif
+# endif
 #endif /* ENABLE_OSCE_BWE */
 
 /* API */
 
-void osce_reset(silk_OSCE_struct *hOSCE, int method)
-{
+void osce_reset(silk_OSCE_struct *hOSCE, int method) {
     OSCEState *state = &hOSCE->state;
 
     OAC_CLEAR(&hOSCE->features, 1);
 
-    switch(method)
-    {
+    switch (method) {
         case OSCE_METHOD_NONE:
             break;
 #ifndef DISABLE_LACE
@@ -1407,17 +1393,15 @@ void osce_reset(silk_OSCE_struct *hOSCE, int method)
 
 #ifdef ENABLE_OSCE_BWE
 
-void osce_bwe_reset(silk_OSCE_BWE_struct *hOSCEBWE)
-{
+void osce_bwe_reset(silk_OSCE_BWE_struct *hOSCEBWE) {
     int k;
     OAC_CLEAR(&hOSCEBWE->features, 1);
-#if 1
+# if 1
     /* weird python initialization: Fix eventually! */
-    for (k = 0; k <= OSCE_BWE_MAX_INSTAFREQ_BIN; k ++)
-    {
+    for (k = 0; k <= OSCE_BWE_MAX_INSTAFREQ_BIN; k++) {
         hOSCEBWE->features.last_spec[2*k] = 1e-9;
     }
-#endif
+# endif
     reset_bbwenet_state(&hOSCEBWE->state.bbwenet);
 }
 
@@ -1425,48 +1409,57 @@ void osce_bwe_reset(silk_OSCE_BWE_struct *hOSCEBWE)
 
 
 
-int osce_load_models(OSCEModel *model, const void *data, int len)
-{
+int osce_load_models(OSCEModel *model, const void *data, int len) {
     int ret = 0;
     WeightArray *list;
 
-    if (data != NULL  && len)
-    {
+    if (data != NULL  && len) {
         /* init from buffer */
         parse_weights(&list, data, len);
 
 #ifndef DISABLE_LACE
-        if (ret == 0) {ret = init_lace(&model->lace, list);}
+        if (ret == 0) {
+            ret = init_lace(&model->lace, list);
+        }
 #endif
 
 #ifndef DISABLE_NOLACE
-        if (ret == 0) {ret = init_nolace(&model->nolace, list);}
+        if (ret == 0) {
+            ret = init_nolace(&model->nolace, list);
+        }
 #endif
 
 #ifdef ENABLE_OSCE_BWE
-#ifndef DISABLE_BBWENET
-        if (ret == 0) {ret = init_bbwenet(&model->bbwenet, list);}
-#endif
+# ifndef DISABLE_BBWENET
+        if (ret == 0) {
+            ret = init_bbwenet(&model->bbwenet, list);
+        }
+# endif
 #endif /* ENABLE_OSCE_BWE */
         free(list);
-    } else
-    {
+    } else {
 #ifdef USE_WEIGHTS_FILE
         return -1;
 #else
-#ifndef DISABLE_LACE
-        if (ret == 0) {ret = init_lace(&model->lace, lacelayers_arrays);}
-#endif
+# ifndef DISABLE_LACE
+        if (ret == 0) {
+            ret = init_lace(&model->lace, lacelayers_arrays);
+        }
+# endif
 
-#ifndef DISABLE_NOLACE
-        if (ret == 0) {ret = init_nolace(&model->nolace, nolacelayers_arrays);}
-#endif
+# ifndef DISABLE_NOLACE
+        if (ret == 0) {
+            ret = init_nolace(&model->nolace, nolacelayers_arrays);
+        }
+# endif
 
-#ifdef ENABLE_OSCE_BWE
-#ifndef DISABLE_BBWENET
-        if (ret == 0) {ret = init_bbwenet(&model->bbwenet, bbwenetlayers_arrays);}
-#endif
-#endif /* ENABLE_OSCE_BWE */
+# ifdef ENABLE_OSCE_BWE
+#  ifndef DISABLE_BBWENET
+        if (ret == 0) {
+            ret = init_bbwenet(&model->bbwenet, bbwenetlayers_arrays);
+        }
+#  endif
+# endif /* ENABLE_OSCE_BWE */
 #endif /* USE_WEIGHTS_FILE */
     }
 
@@ -1478,36 +1471,34 @@ int osce_load_models(OSCEModel *model, const void *data, int len)
 void osce_bwe(
     OSCEModel                   *model,                         /* I    OSCE model struct                           */
     silk_OSCE_BWE_struct        *psOSCEBWE,                     /* I/O  OSCE BWE state                              */
-    oac_int16                  xq48[],                         /* O    bandwidth-extended speech                   */
-    oac_int16                  xq16[],                         /* I    Decoded speech                              */
-    oac_int32                  xq16_len,                       /* I    Length of xq16 in samples                   */
-    int                         arch                            /* I    Run-time architecture                       */
- )
- {
+    oac_int16 xq48[],                                          /* O    bandwidth-extended speech                   */
+    oac_int16 xq16[],                                          /* I    Decoded speech                              */
+    oac_int32 xq16_len,                                        /* I    Length of xq16 in samples                   */
+    int arch                                                    /* I    Run-time architecture                       */
+    ) {
     float in_buffer[320];
     float out_buffer[3*320];
-    float features[2 * OSCE_BWE_FEATURE_DIM];
+    float features[2*OSCE_BWE_FEATURE_DIM];
     int num_frames, i;
 
     /* currently restricting to 10 or 20-ms frames */
     celt_assert(xq16_len == 160 || xq16_len == 320);
 
-    num_frames = xq16_len / 160;
+    num_frames = xq16_len/160;
 
     /* scale input */
-    for (i = 0; i < xq16_len; i++)
-    {
-        in_buffer[i] = ((float) xq16[i]) * (1.f/32768.f);
+    for (i = 0; i < xq16_len; i++) {
+        in_buffer[i] = ((float) xq16[i])*(1.f/32768.f);
     }
 
     osce_bwe_calculate_features(&psOSCEBWE->features, features, xq16, xq16_len);
 
-#if 0
+# if 0
     /* just upsampling for now */
     upsamp_2x(&psOSCEBWE->state.bbwenet.resampler_state[0], out_buffer, in_buffer, xq16_len);
-    interpol_3_2(&psOSCEBWE->state.bbwenet.resampler_state[0], out_buffer, out_buffer, 2 * xq16_len);
+    interpol_3_2(&psOSCEBWE->state.bbwenet.resampler_state[0], out_buffer, out_buffer, 2*xq16_len);
 
-#else
+# else
     /* process frames */
     bbwenet_process_frames(
         &model->bbwenet,
@@ -1517,52 +1508,48 @@ void osce_bwe(
         features,
         num_frames,
         arch
-    );
-#endif
+        );
+# endif
 
     /* scale and delay output */
     OAC_COPY(xq48, psOSCEBWE->state.bbwenet.outbut_buffer, OSCE_BWE_OUTPUT_DELAY);
-    for (i = 0; i < 3 * xq16_len - OSCE_BWE_OUTPUT_DELAY; i++)
-    {
-        float tmp = 32768.f * out_buffer[i];
+    for (i = 0; i < 3*xq16_len - OSCE_BWE_OUTPUT_DELAY; i++) {
+        float tmp = 32768.f*out_buffer[i];
         if (tmp > 32767.f) tmp = 32767.f;
         if (tmp < -32767.f) tmp = -32767.f;
         xq48[i + OSCE_BWE_OUTPUT_DELAY] = float2int(tmp);
     }
 
-    for (i = 0; i < OSCE_BWE_OUTPUT_DELAY; i++)
-    {
-        float tmp = 32768.f * out_buffer[3 * xq16_len - OSCE_BWE_OUTPUT_DELAY + i];
+    for (i = 0; i < OSCE_BWE_OUTPUT_DELAY; i++) {
+        float tmp = 32768.f*out_buffer[3*xq16_len - OSCE_BWE_OUTPUT_DELAY + i];
         if (tmp > 32767.f) tmp = 32767.f;
         if (tmp < -32767.f) tmp = -32767.f;
         psOSCEBWE->state.bbwenet.outbut_buffer[i] = float2int(tmp);
     }
 
 
- }
+}
 
- #endif
+#endif
 
 void osce_enhance_frame(
     OSCEModel                   *model,                         /* I    OSCE model struct                           */
     silk_decoder_state          *psDec,                         /* I/O  Decoder state                               */
     silk_decoder_control        *psDecCtrl,                     /* I    Decoder control                             */
-    oac_int16                  xq[],                           /* I/O  Decoded speech                              */
-    oac_int32                  num_bits,                       /* I    Size of SILK payload in bits                */
-    int                         arch                            /* I    Run-time architecture                       */
-)
-{
+    oac_int16 xq[],                                            /* I/O  Decoded speech                              */
+    oac_int32 num_bits,                                        /* I    Size of SILK payload in bits                */
+    int arch                                                    /* I    Run-time architecture                       */
+    ) {
     float in_buffer[320];
     float out_buffer[320];
-    float features[4 * OSCE_FEATURE_DIM];
+    float features[4*OSCE_FEATURE_DIM];
     float numbits[2];
     int periods[4];
     int i;
     int method;
 
     /* enhancement only implemented for 20 ms frame at 16kHz */
-    if (psDec->fs_kHz != 16 || psDec->nb_subfr != 4)
-    {
+    if (psDec->fs_kHz != 16 || psDec->nb_subfr != 4) {
         osce_reset(&psDec->osce, psDec->osce.method);
         return;
     }
@@ -1570,28 +1557,28 @@ void osce_enhance_frame(
     osce_calculate_features(psDec, psDecCtrl, features, numbits, periods, xq, num_bits);
 
     /* scale input */
-    for (i = 0; i < 320; i++)
-    {
-        in_buffer[i] = ((float) xq[i]) * (1.f/32768.f);
+    for (i = 0; i < 320; i++) {
+        in_buffer[i] = ((float) xq[i])*(1.f/32768.f);
     }
 
     if (model->loaded)
         method = psDec->osce.method;
     else
         method = OSCE_METHOD_NONE;
-    switch(method)
-    {
+    switch (method) {
         case OSCE_METHOD_NONE:
             OAC_COPY(out_buffer, in_buffer, 320);
             break;
 #ifndef DISABLE_LACE
         case OSCE_METHOD_LACE:
-            lace_process_20ms_frame(&model->lace, &psDec->osce.state.lace, out_buffer, in_buffer, features, numbits, periods, arch);
+            lace_process_20ms_frame(&model->lace, &psDec->osce.state.lace, out_buffer, in_buffer, features, numbits,
+        periods, arch);
             break;
 #endif
 #ifndef DISABLE_NOLACE
         case OSCE_METHOD_NOLACE:
-            nolace_process_20ms_frame(&model->nolace, &psDec->osce.state.nolace, out_buffer, in_buffer, features, numbits, periods, arch);
+            nolace_process_20ms_frame(&model->nolace, &psDec->osce.state.nolace, out_buffer, in_buffer, features,
+        numbits, periods, arch);
             break;
 #endif
         default:
@@ -1599,7 +1586,7 @@ void osce_enhance_frame(
     }
 
 #ifdef ENABLE_OSCE_TRAINING_DATA
-    int  k;
+    int k;
 
     static FILE *flpc = NULL;
     static FILE *fgain = NULL;
@@ -1609,19 +1596,32 @@ void osce_enhance_frame(
     static FILE* f_numbits = NULL;
     static FILE* f_numbits_smooth = NULL;
 
-    if (flpc == NULL) {flpc = fopen("features_lpc.f32", "wb");}
-    if (fgain == NULL) {fgain = fopen("features_gain.f32", "wb");}
-    if (fltp == NULL) {fltp = fopen("features_ltp.f32", "wb");}
-    if (fperiod == NULL) {fperiod = fopen("features_period.s16", "wb");}
-    if (fnoisy16k == NULL) {fnoisy16k = fopen("noisy_16k.s16", "wb");}
-    if(f_numbits == NULL) {f_numbits = fopen("features_num_bits.s32", "wb");}
-    if (f_numbits_smooth == NULL) {f_numbits_smooth = fopen("features_num_bits_smooth.f32", "wb");}
+    if (flpc == NULL) {
+        flpc = fopen("features_lpc.f32", "wb");
+    }
+    if (fgain == NULL) {
+        fgain = fopen("features_gain.f32", "wb");
+    }
+    if (fltp == NULL) {
+        fltp = fopen("features_ltp.f32", "wb");
+    }
+    if (fperiod == NULL) {
+        fperiod = fopen("features_period.s16", "wb");
+    }
+    if (fnoisy16k == NULL) {
+        fnoisy16k = fopen("noisy_16k.s16", "wb");
+    }
+    if (f_numbits == NULL) {
+        f_numbits = fopen("features_num_bits.s32", "wb");
+    }
+    if (f_numbits_smooth == NULL) {
+        f_numbits_smooth = fopen("features_num_bits_smooth.f32", "wb");
+    }
 
     fwrite(&num_bits, sizeof(num_bits), 1, f_numbits);
     fwrite(&(psDec->osce.features.numbits_smooth), sizeof(psDec->osce.features.numbits_smooth), 1, f_numbits_smooth);
 
-    for (k = 0; k < psDec->nb_subfr; k++)
-    {
+    for (k = 0; k < psDec->nb_subfr; k++) {
         float tmp;
         int16_t itmp;
         float lpc_buffer[16] = {0};
@@ -1631,22 +1631,20 @@ void osce_enhance_frame(
         (void) arch;
 
         /* gain */
-        tmp = (float) psDecCtrl->Gains_Q16[k] / (1UL << 16);
+        tmp = (float) psDecCtrl->Gains_Q16[k]/(1UL<<16);
         fwrite(&tmp, sizeof(tmp), 1, fgain);
 
         /* LPC */
-        A_Q12 = psDecCtrl->PredCoef_Q12[ k >> 1 ];
-        for (i = 0; i < psDec->LPC_order; i++)
-        {
-            lpc_buffer[i] = (float) A_Q12[i] / (1U << 12);
+        A_Q12 = psDecCtrl->PredCoef_Q12[ k>>1 ];
+        for (i = 0; i < psDec->LPC_order; i++) {
+            lpc_buffer[i] = (float) A_Q12[i]/(1U<<12);
         }
         fwrite(lpc_buffer, sizeof(lpc_buffer[0]), 16, flpc);
 
         /* LTP */
-        B_Q14 = &psDecCtrl->LTPCoef_Q14[ k * LTP_ORDER ];
-        for (i = 0; i < 5; i++)
-        {
-            tmp = (float) B_Q14[i] / (1U << 14);
+        B_Q14 = &psDecCtrl->LTPCoef_Q14[ k*LTP_ORDER ];
+        for (i = 0; i < 5; i++) {
+            tmp = (float) B_Q14[i]/(1U<<14);
             fwrite(&tmp, sizeof(tmp), 1, fltp);
         }
 
@@ -1655,24 +1653,20 @@ void osce_enhance_frame(
         fwrite(&itmp, sizeof(itmp), 1, fperiod);
     }
 
-    fwrite(xq, psDec->nb_subfr * psDec->subfr_length, sizeof(xq[0]), fnoisy16k);
+    fwrite(xq, psDec->nb_subfr*psDec->subfr_length, sizeof(xq[0]), fnoisy16k);
 #endif
 
-    if (psDec->osce.features.reset > 1)
-    {
+    if (psDec->osce.features.reset > 1) {
         OAC_COPY(out_buffer, in_buffer, 320);
-        psDec->osce.features.reset --;
-    }
-    else if (psDec->osce.features.reset)
-    {
+        psDec->osce.features.reset--;
+    } else if (psDec->osce.features.reset) {
         osce_cross_fade_10ms(out_buffer, in_buffer, 320);
         psDec->osce.features.reset = 0;
     }
 
     /* scale output */
-    for (i = 0; i < 320; i++)
-    {
-        float tmp = 32768.f * out_buffer[i];
+    for (i = 0; i < 320; i++) {
+        float tmp = 32768.f*out_buffer[i];
         if (tmp > 32767.f) tmp = 32767.f;
         if (tmp < -32767.f) tmp = -32767.f;
         xq[i] = float2int(tmp);
@@ -1683,14 +1677,12 @@ void osce_enhance_frame(
 
 #if 0
 
-#include <stdio.h>
+# include <stdio.h>
 
 void lace_feature_net_compare(
     const char * prefix,
     int num_frames,
-    LACE* hLACE
-)
-{
+    LACE* hLACE) {
     char in_feature_file[256];
     char out_feature_file[256];
     char numbits_file[256];
@@ -1698,9 +1690,9 @@ void lace_feature_net_compare(
     char message[512];
     int i_frame, i_feature;
     float mse;
-    float in_features[4 * LACE_NUM_FEATURES];
-    float out_features[4 * LACE_COND_DIM];
-    float out_features2[4 * LACE_COND_DIM];
+    float in_features[4*LACE_NUM_FEATURES];
+    float out_features[4*LACE_COND_DIM];
+    float out_features2[4*LACE_COND_DIM];
     float numbits[2];
     int periods[4];
 
@@ -1711,8 +1703,7 @@ void lace_feature_net_compare(
     strcpy(in_feature_file, prefix);
     strcat(in_feature_file, "_in_features.f32");
     f_in_features = fopen(in_feature_file, "rb");
-    if (f_in_features == NULL)
-    {
+    if (f_in_features == NULL) {
         sprintf(message, "could not open file %s", in_feature_file);
         perror(message);
         exit(1);
@@ -1721,8 +1712,7 @@ void lace_feature_net_compare(
     strcpy(out_feature_file, prefix);
     strcat(out_feature_file, "_out_features.f32");
     f_out_features = fopen(out_feature_file, "rb");
-    if (f_out_features == NULL)
-    {
+    if (f_out_features == NULL) {
         sprintf(message, "could not open file %s", out_feature_file);
         perror(message);
         exit(1);
@@ -1731,8 +1721,7 @@ void lace_feature_net_compare(
     strcpy(periods_file, prefix);
     strcat(periods_file, "_periods.s32");
     f_periods = fopen(periods_file, "rb");
-    if (f_periods == NULL)
-    {
+    if (f_periods == NULL) {
         sprintf(message, "could not open file %s", periods_file);
         perror(message);
         exit(1);
@@ -1741,32 +1730,26 @@ void lace_feature_net_compare(
     strcpy(numbits_file, prefix);
     strcat(numbits_file, "_numbits.f32");
     f_numbits = fopen(numbits_file, "rb");
-    if (f_numbits == NULL)
-    {
+    if (f_numbits == NULL) {
         sprintf(message, "could not open file %s", numbits_file);
         perror(message);
         exit(1);
     }
 
-    for (i_frame = 0; i_frame < num_frames; i_frame ++)
-    {
-        if(fread(in_features, sizeof(float), 4 * LACE_NUM_FEATURES, f_in_features) != 4 * LACE_NUM_FEATURES)
-        {
+    for (i_frame = 0; i_frame < num_frames; i_frame++) {
+        if (fread(in_features, sizeof(float), 4*LACE_NUM_FEATURES, f_in_features) != 4*LACE_NUM_FEATURES) {
             fprintf(stderr, "could not read frame %d from in_features\n", i_frame);
             exit(1);
         }
-        if(fread(out_features, sizeof(float), 4 * LACE_COND_DIM, f_out_features) != 4 * LACE_COND_DIM)
-        {
+        if (fread(out_features, sizeof(float), 4*LACE_COND_DIM, f_out_features) != 4*LACE_COND_DIM) {
             fprintf(stderr, "could not read frame %d from out_features\n", i_frame);
             exit(1);
         }
-        if(fread(periods, sizeof(int), 4, f_periods) != 4)
-        {
+        if (fread(periods, sizeof(int), 4, f_periods) != 4) {
             fprintf(stderr, "could not read frame %d from periods\n", i_frame);
             exit(1);
         }
-        if(fread(numbits, sizeof(float), 2, f_numbits) != 2)
-        {
+        if (fread(numbits, sizeof(float), 2, f_numbits) != 2) {
             fprintf(stderr, "could not read frame %d from numbits\n", i_frame);
             exit(1);
         }
@@ -1775,11 +1758,10 @@ void lace_feature_net_compare(
         lace_feature_net(hLACE, out_features2, in_features, numbits, periods);
 
         float mse = 0;
-        for (int i = 0; i < 4 * LACE_COND_DIM; i ++)
-        {
+        for (int i = 0; i < 4*LACE_COND_DIM; i++) {
             mse += pow(out_features[i] - out_features2[i], 2);
         }
-        mse /= (4 * LACE_COND_DIM);
+        mse /= (4*LACE_COND_DIM);
         printf("rmse: %f\n", sqrt(mse));
 
     }
@@ -1793,9 +1775,7 @@ void lace_feature_net_compare(
 
 void lace_demo(
     char *prefix,
-    char *output
-)
-{
+    char *output) {
     char feature_file[256];
     char numbits_file[256];
     char periods_file[256];
@@ -1803,12 +1783,12 @@ void lace_demo(
     char message[512];
     int i_frame;
     float mse;
-    float features[4 * LACE_NUM_FEATURES];
+    float features[4*LACE_NUM_FEATURES];
     float numbits[2];
     int periods[4];
-    float x_in[4 * LACE_FRAME_SIZE];
-    int16_t x_out[4 * LACE_FRAME_SIZE];
-    float buffer[4 * LACE_FRAME_SIZE];
+    float x_in[4*LACE_FRAME_SIZE];
+    int16_t x_out[4*LACE_FRAME_SIZE];
+    float buffer[4*LACE_FRAME_SIZE];
     LACE hLACE;
     int frame_counter = 0;
     FILE *f_features, *f_numbits, *f_periods, *f_x_in, *f_x_out;
@@ -1818,8 +1798,7 @@ void lace_demo(
     strcpy(feature_file, prefix);
     strcat(feature_file, "_features.f32");
     f_features = fopen(feature_file, "rb");
-    if (f_features == NULL)
-    {
+    if (f_features == NULL) {
         sprintf(message, "could not open file %s", feature_file);
         perror(message);
         exit(1);
@@ -1828,16 +1807,14 @@ void lace_demo(
     strcpy(x_in_file, prefix);
     strcat(x_in_file, "_x_in.f32");
     f_x_in = fopen(x_in_file, "rb");
-    if (f_x_in == NULL)
-    {
+    if (f_x_in == NULL) {
         sprintf(message, "could not open file %s", x_in_file);
         perror(message);
         exit(1);
     }
 
     f_x_out = fopen(output, "wb");
-    if (f_x_out == NULL)
-    {
+    if (f_x_out == NULL) {
         sprintf(message, "could not open file %s", output);
         perror(message);
         exit(1);
@@ -1846,8 +1823,7 @@ void lace_demo(
     strcpy(periods_file, prefix);
     strcat(periods_file, "_periods.s32");
     f_periods = fopen(periods_file, "rb");
-    if (f_periods == NULL)
-    {
+    if (f_periods == NULL) {
         sprintf(message, "could not open file %s", periods_file);
         perror(message);
         exit(1);
@@ -1856,8 +1832,7 @@ void lace_demo(
     strcpy(numbits_file, prefix);
     strcat(numbits_file, "_numbits.f32");
     f_numbits = fopen(numbits_file, "rb");
-    if (f_numbits == NULL)
-    {
+    if (f_numbits == NULL) {
         sprintf(message, "could not open file %s", numbits_file);
         perror(message);
         exit(1);
@@ -1865,21 +1840,17 @@ void lace_demo(
 
     printf("processing %s\n", prefix);
 
-    while (fread(x_in, sizeof(float), 4 * LACE_FRAME_SIZE, f_x_in) == 4 * LACE_FRAME_SIZE)
-    {
+    while (fread(x_in, sizeof(float), 4*LACE_FRAME_SIZE, f_x_in) == 4*LACE_FRAME_SIZE) {
         printf("\rframe: %d", frame_counter++);
-        if(fread(features, sizeof(float), 4 * LACE_NUM_FEATURES, f_features) != 4 * LACE_NUM_FEATURES)
-        {
+        if (fread(features, sizeof(float), 4*LACE_NUM_FEATURES, f_features) != 4*LACE_NUM_FEATURES) {
             fprintf(stderr, "could not read frame %d from features\n", i_frame);
             exit(1);
         }
-        if(fread(periods, sizeof(int), 4, f_periods) != 4)
-        {
+        if (fread(periods, sizeof(int), 4, f_periods) != 4) {
             fprintf(stderr, "could not read frame %d from periods\n", i_frame);
             exit(1);
         }
-        if(fread(numbits, sizeof(float), 2, f_numbits) != 2)
-        {
+        if (fread(numbits, sizeof(float), 2, f_numbits) != 2) {
             fprintf(stderr, "could not read frame %d from numbits\n", i_frame);
             exit(1);
         }
@@ -1891,16 +1862,15 @@ void lace_demo(
             features,
             numbits,
             periods
-        );
+            );
 
-        for (int n=0; n < 4 * LACE_FRAME_SIZE; n ++)
-        {
-            float tmp = (1UL<<15) * buffer[n];
+        for (int n = 0; n < 4*LACE_FRAME_SIZE; n++) {
+            float tmp = (1UL<<15)*buffer[n];
             tmp = CLIP(tmp, -32768, 32767);
             x_out[n] = (int16_t) round(tmp);
         }
 
-        fwrite(x_out, sizeof(int16_t), 4 * LACE_FRAME_SIZE, f_x_out);
+        fwrite(x_out, sizeof(int16_t), 4*LACE_FRAME_SIZE, f_x_out);
     }
     printf("\ndone!\n");
 
@@ -1913,9 +1883,7 @@ void lace_demo(
 
 void nolace_demo(
     char *prefix,
-    char *output
-)
-{
+    char *output) {
     char feature_file[256];
     char numbits_file[256];
     char periods_file[256];
@@ -1923,12 +1891,12 @@ void nolace_demo(
     char message[512];
     int i_frame;
     float mse;
-    float features[4 * LACE_NUM_FEATURES];
+    float features[4*LACE_NUM_FEATURES];
     float numbits[2];
     int periods[4];
-    float x_in[4 * LACE_FRAME_SIZE];
-    int16_t x_out[4 * LACE_FRAME_SIZE];
-    float buffer[4 * LACE_FRAME_SIZE];
+    float x_in[4*LACE_FRAME_SIZE];
+    int16_t x_out[4*LACE_FRAME_SIZE];
+    float buffer[4*LACE_FRAME_SIZE];
     NoLACE hNoLACE;
     int frame_counter = 0;
     FILE *f_features, *f_numbits, *f_periods, *f_x_in, *f_x_out;
@@ -1938,8 +1906,7 @@ void nolace_demo(
     strcpy(feature_file, prefix);
     strcat(feature_file, "_features.f32");
     f_features = fopen(feature_file, "rb");
-    if (f_features == NULL)
-    {
+    if (f_features == NULL) {
         sprintf(message, "could not open file %s", feature_file);
         perror(message);
         exit(1);
@@ -1948,16 +1915,14 @@ void nolace_demo(
     strcpy(x_in_file, prefix);
     strcat(x_in_file, "_x_in.f32");
     f_x_in = fopen(x_in_file, "rb");
-    if (f_x_in == NULL)
-    {
+    if (f_x_in == NULL) {
         sprintf(message, "could not open file %s", x_in_file);
         perror(message);
         exit(1);
     }
 
     f_x_out = fopen(output, "wb");
-    if (f_x_out == NULL)
-    {
+    if (f_x_out == NULL) {
         sprintf(message, "could not open file %s", output);
         perror(message);
         exit(1);
@@ -1966,8 +1931,7 @@ void nolace_demo(
     strcpy(periods_file, prefix);
     strcat(periods_file, "_periods.s32");
     f_periods = fopen(periods_file, "rb");
-    if (f_periods == NULL)
-    {
+    if (f_periods == NULL) {
         sprintf(message, "could not open file %s", periods_file);
         perror(message);
         exit(1);
@@ -1976,8 +1940,7 @@ void nolace_demo(
     strcpy(numbits_file, prefix);
     strcat(numbits_file, "_numbits.f32");
     f_numbits = fopen(numbits_file, "rb");
-    if (f_numbits == NULL)
-    {
+    if (f_numbits == NULL) {
         sprintf(message, "could not open file %s", numbits_file);
         perror(message);
         exit(1);
@@ -1985,21 +1948,17 @@ void nolace_demo(
 
     printf("processing %s\n", prefix);
 
-    while (fread(x_in, sizeof(float), 4 * LACE_FRAME_SIZE, f_x_in) == 4 * LACE_FRAME_SIZE)
-    {
+    while (fread(x_in, sizeof(float), 4*LACE_FRAME_SIZE, f_x_in) == 4*LACE_FRAME_SIZE) {
         printf("\rframe: %d", frame_counter++);
-        if(fread(features, sizeof(float), 4 * LACE_NUM_FEATURES, f_features) != 4 * LACE_NUM_FEATURES)
-        {
+        if (fread(features, sizeof(float), 4*LACE_NUM_FEATURES, f_features) != 4*LACE_NUM_FEATURES) {
             fprintf(stderr, "could not read frame %d from features\n", i_frame);
             exit(1);
         }
-        if(fread(periods, sizeof(int), 4, f_periods) != 4)
-        {
+        if (fread(periods, sizeof(int), 4, f_periods) != 4) {
             fprintf(stderr, "could not read frame %d from periods\n", i_frame);
             exit(1);
         }
-        if(fread(numbits, sizeof(float), 2, f_numbits) != 2)
-        {
+        if (fread(numbits, sizeof(float), 2, f_numbits) != 2) {
             fprintf(stderr, "could not read frame %d from numbits\n", i_frame);
             exit(1);
         }
@@ -2011,16 +1970,15 @@ void nolace_demo(
             features,
             numbits,
             periods
-        );
+            );
 
-        for (int n=0; n < 4 * LACE_FRAME_SIZE; n ++)
-        {
-            float tmp = (1UL<<15) * buffer[n];
+        for (int n = 0; n < 4*LACE_FRAME_SIZE; n++) {
+            float tmp = (1UL<<15)*buffer[n];
             tmp = CLIP(tmp, -32768, 32767);
             x_out[n] = (int16_t) round(tmp);
         }
 
-        fwrite(x_out, sizeof(int16_t), 4 * LACE_FRAME_SIZE, f_x_out);
+        fwrite(x_out, sizeof(int16_t), 4*LACE_FRAME_SIZE, f_x_out);
     }
     printf("\ndone!\n");
 
@@ -2032,16 +1990,15 @@ void nolace_demo(
 }
 
 
-int main()
-{
-#if 0
+int main() {
+# if 0
     LACE hLACE;
 
     lace_feature_net_compare("testvec2/lace", 5, &hLACE);
 
     lace_demo("testdata/test9", "out_lace_c_9kbps.pcm");
     lace_demo("testdata/test6", "out_lace_c_6kbps.pcm");
-#endif
+# endif
     nolace_demo("testdata/test9", "out_nolace_c_9kbps.pcm");
 
 }
diff --git a/dnn/osce.h b/dnn/osce.h
index 3e05ec861..2449fb90c 100644
--- a/dnn/osce.h
+++ b/dnn/osce.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef OSCE_H
 #define OSCE_H
@@ -32,10 +32,10 @@
 #include "oac_types.h"
 /*#include "osce_config.h"*/
 #ifndef DISABLE_LACE
-#include "lace_data.h"
+# include "lace_data.h"
 #endif
 #ifndef DISABLE_NOLACE
-#include "nolace_data.h"
+# include "nolace_data.h"
 #endif
 #include "nndsp.h"
 #include "nnet.h"
@@ -50,25 +50,25 @@
 
 #define OSCE_METHOD_NONE 0
 #ifndef DISABLE_LACE
-#define OSCE_METHOD_LACE 1
+# define OSCE_METHOD_LACE 1
 #endif
 #ifndef DISABLE_NOLACE
-#define OSCE_METHOD_NOLACE 2
+# define OSCE_METHOD_NOLACE 2
 #endif
 
 #if !defined(DISABLE_NOLACE)
-#define OSCE_DEFAULT_METHOD OSCE_METHOD_NOLACE
-#define OSCE_MAX_RNN_NEURONS NOLACE_FNET_GRU_STATE_SIZE
+# define OSCE_DEFAULT_METHOD OSCE_METHOD_NOLACE
+# define OSCE_MAX_RNN_NEURONS NOLACE_FNET_GRU_STATE_SIZE
 #elif !defined(DISABLE_LACE)
-#define OSCE_DEFAULT_METHOD OSCE_METHOD_LACE
-#define OSCE_MAX_RNN_NEURONS LACE_FNET_GRU_STATE_SIZE
+# define OSCE_DEFAULT_METHOD OSCE_METHOD_LACE
+# define OSCE_MAX_RNN_NEURONS LACE_FNET_GRU_STATE_SIZE
 #else
-#define OSCE_DEFAULT_METHOD OSCE_METHOD_NONE
-#define OSCE_MAX_RNN_NEURONS 0
+# define OSCE_DEFAULT_METHOD OSCE_METHOD_NONE
+# define OSCE_MAX_RNN_NEURONS 0
 #endif
 
 #ifdef ENABLE_OSCE_BWE
-#define OSCE_BWE_MAX_RNN_NEURONS BBWENET_FNET_GRU_STATE_SIZE
+# define OSCE_BWE_MAX_RNN_NEURONS BBWENET_FNET_GRU_STATE_SIZE
 
 #endif
 
@@ -80,10 +80,10 @@ void osce_enhance_frame(
     OSCEModel                   *model,                         /* I    OSCE model struct                           */
     silk_decoder_state          *psDec,                         /* I/O  Decoder state                               */
     silk_decoder_control        *psDecCtrl,                     /* I    Decoder control                             */
-    oac_int16                  xq[],                           /* I/O  Decoded speech                              */
-    oac_int32                  num_bits,                       /* I    Size of SILK payload in bits                */
-    int                         arch                            /* I    Run-time architecture                       */
-);
+    oac_int16 xq[],                                            /* I/O  Decoded speech                              */
+    oac_int32 num_bits,                                        /* I    Size of SILK payload in bits                */
+    int arch                                                    /* I    Run-time architecture                       */
+    );
 
 
 int osce_load_models(OSCEModel *hModel, const void *data, int len);
@@ -91,13 +91,13 @@ void osce_reset(silk_OSCE_struct *hOSCE, int method);
 
 #ifdef ENABLE_OSCE_BWE
 void osce_bwe(
-   OSCEModel                   *model,                         /* I    OSCE model struct                           */
-   silk_OSCE_BWE_struct        *psOSCEBWE,                     /* I/O  OSCE BWE state                              */
-   oac_int16                  xq48[],                         /* O    bandwidth-extended speech                   */
-   oac_int16                  xq16[],                         /* I    Decoded speech                              */
-   oac_int32                  xq16_len,                       /* I    Length of xq16 in samples                   */
-   int                         arch                            /* I    Run-time architecture                       */
-);
+    OSCEModel                   *model,                        /* I    OSCE model struct                           */
+    silk_OSCE_BWE_struct        *psOSCEBWE,                    /* I/O  OSCE BWE state                              */
+    oac_int16 xq48[],                                         /* O    bandwidth-extended speech                   */
+    oac_int16 xq16[],                                         /* I    Decoded speech                              */
+    oac_int32 xq16_len,                                       /* I    Length of xq16 in samples                   */
+    int arch                                                   /* I    Run-time architecture                       */
+    );
 
 void osce_bwe_reset(silk_OSCE_BWE_struct *hOSCEBWE);
 #endif /* ENABLE_OSCE_BWE */
diff --git a/dnn/osce_config.h b/dnn/osce_config.h
index 9374c6980..1917bd99c 100644
--- a/dnn/osce_config.h
+++ b/dnn/osce_config.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef OSCE_CONFIG
 #define OSCE_CONFIG
@@ -58,7 +58,7 @@
 
 #define OSCE_BWE_MAX_INSTAFREQ_BIN 40
 #define OSCE_BWE_HALF_WINDOW_SIZE 160
-#define OSCE_BWE_WINDOW_SIZE (2 * (OSCE_BWE_HALF_WINDOW_SIZE))
+#define OSCE_BWE_WINDOW_SIZE (2*(OSCE_BWE_HALF_WINDOW_SIZE))
 #define OSCE_BWE_NUM_BANDS 32
 #define OSCE_BWE_FEATURE_DIM 114
 #define OSCE_BWE_OUTPUT_DELAY 21
diff --git a/dnn/osce_features.c b/dnn/osce_features.c
index ddaf7d2b7..ec122f604 100644
--- a/dnn/osce_features.c
+++ b/dnn/osce_features.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #define OSCE_SPEC_WINDOW_SIZE 320
@@ -47,59 +47,59 @@
 
 
 #if defined(WRITE_FEATURES) || defined(DEBUG_PRING)
-#include <stdio.h>
-#include <stdlib.h>
+# include <stdio.h>
+# include <stdlib.h>
 #endif
 
 static const int center_bins_clean[64] = {
-      0,      2,      5,      8,     10,     12,     15,     18,
-     20,     22,     25,     28,     30,     33,     35,     38,
-     40,     42,     45,     48,     50,     52,     55,     58,
-     60,     62,     65,     68,     70,     73,     75,     78,
-     80,     82,     85,     88,     90,     92,     95,     98,
+    0,      2,      5,      8,     10,     12,     15,     18,
+    20,     22,     25,     28,     30,     33,     35,     38,
+    40,     42,     45,     48,     50,     52,     55,     58,
+    60,     62,     65,     68,     70,     73,     75,     78,
+    80,     82,     85,     88,     90,     92,     95,     98,
     100,    102,    105,    108,    110,    112,    115,    118,
     120,    122,    125,    128,    130,    132,    135,    138,
     140,    142,    145,    148,    150,    152,    155,    160
 };
 
 static const int center_bins_noisy[18] = {
-      0,      4,      8,     12,     16,     20,     24,     28,
-     32,     40,     48,     56,     64,     80,     96,    112,
+    0,      4,      8,     12,     16,     20,     24,     28,
+    32,     40,     48,     56,     64,     80,     96,    112,
     136,    160
 };
 
 static const int center_bins_bwe[32] = {
-      0,   5,  10,  15,  20,  25,  30,  35,
-     40,  45,  50,  55,  60,  65,  70,  75,
-     80,  85,  90,  95, 100, 105, 110, 115,
+    0,   5,  10,  15,  20,  25,  30,  35,
+    40,  45,  50,  55,  60,  65,  70,  75,
+    80,  85,  90,  95, 100, 105, 110, 115,
     120, 125, 130, 135, 140, 145, 150, 160
 };
 
 static const float band_weights_clean[64] = {
-     0.666666666667f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
-     0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
-     0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
-     0.400000000000f,     0.400000000000f,     0.400000000000f,     0.400000000000f,
-     0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
-     0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
-     0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
-     0.400000000000f,     0.400000000000f,     0.400000000000f,     0.400000000000f,
-     0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
-     0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
-     0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
-     0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
-     0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
-     0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
-     0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
-     0.500000000000f,     0.400000000000f,     0.250000000000f,     0.333333333333f
+    0.666666666667f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
+    0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
+    0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
+    0.400000000000f,     0.400000000000f,     0.400000000000f,     0.400000000000f,
+    0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
+    0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
+    0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
+    0.400000000000f,     0.400000000000f,     0.400000000000f,     0.400000000000f,
+    0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
+    0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
+    0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
+    0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
+    0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
+    0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
+    0.500000000000f,     0.400000000000f,     0.333333333333f,     0.400000000000f,
+    0.500000000000f,     0.400000000000f,     0.250000000000f,     0.333333333333f
 };
 
 static const float band_weights_noisy[18] = {
-     0.400000000000f,     0.250000000000f,     0.250000000000f,     0.250000000000f,
-     0.250000000000f,     0.250000000000f,     0.250000000000f,     0.250000000000f,
-     0.166666666667f,     0.125000000000f,     0.125000000000f,     0.125000000000f,
-     0.083333333333f,     0.062500000000f,     0.062500000000f,     0.050000000000f,
-     0.041666666667f,     0.080000000000f
+    0.400000000000f,     0.250000000000f,     0.250000000000f,     0.250000000000f,
+    0.250000000000f,     0.250000000000f,     0.250000000000f,     0.250000000000f,
+    0.166666666667f,     0.125000000000f,     0.125000000000f,     0.125000000000f,
+    0.083333333333f,     0.062500000000f,     0.062500000000f,     0.050000000000f,
+    0.041666666667f,     0.080000000000f
 };
 
 static const float band_weights_bwe[32] = {
@@ -114,111 +114,106 @@ static const float band_weights_bwe[32] = {
 };
 
 static float osce_window[OSCE_SPEC_WINDOW_SIZE] = {
-     0.004908718808f,     0.014725683311f,     0.024541228523f,     0.034354408400f,     0.044164277127f,
-     0.053969889210f,     0.063770299562f,     0.073564563600f,     0.083351737332f,     0.093130877450f,
-     0.102901041421f,     0.112661287575f,     0.122410675199f,     0.132148264628f,     0.141873117332f,
-     0.151584296010f,     0.161280864678f,     0.170961888760f,     0.180626435180f,     0.190273572448f,
-     0.199902370753f,     0.209511902052f,     0.219101240157f,     0.228669460829f,     0.238215641862f,
-     0.247738863176f,     0.257238206902f,     0.266712757475f,     0.276161601717f,     0.285583828929f,
-     0.294978530977f,     0.304344802381f,     0.313681740399f,     0.322988445118f,     0.332264019538f,
-     0.341507569661f,     0.350718204573f,     0.359895036535f,     0.369037181064f,     0.378143757022f,
-     0.387213886697f,     0.396246695891f,     0.405241314005f,     0.414196874117f,     0.423112513073f,
-     0.431987371563f,     0.440820594212f,     0.449611329655f,     0.458358730621f,     0.467061954019f,
-     0.475720161014f,     0.484332517110f,     0.492898192230f,     0.501416360796f,     0.509886201809f,
-     0.518306898929f,     0.526677640552f,     0.534997619887f,     0.543266035038f,     0.551482089078f,
-     0.559644990127f,     0.567753951426f,     0.575808191418f,     0.583806933818f,     0.591749407690f,
-     0.599634847523f,     0.607462493302f,     0.615231590581f,     0.622941390558f,     0.630591150148f,
-     0.638180132051f,     0.645707604824f,     0.653172842954f,     0.660575126926f,     0.667913743292f,
-     0.675187984742f,     0.682397150168f,     0.689540544737f,     0.696617479953f,     0.703627273726f,
-     0.710569250438f,     0.717442741007f,     0.724247082951f,     0.730981620454f,     0.737645704427f,
-     0.744238692572f,     0.750759949443f,     0.757208846506f,     0.763584762206f,     0.769887082016f,
-     0.776115198508f,     0.782268511401f,     0.788346427627f,     0.794348361383f,     0.800273734191f,
-     0.806121974951f,     0.811892519997f,     0.817584813152f,     0.823198305781f,     0.828732456844f,
-     0.834186732948f,     0.839560608398f,     0.844853565250f,     0.850065093356f,     0.855194690420f,
-     0.860241862039f,     0.865206121757f,     0.870086991109f,     0.874883999665f,     0.879596685080f,
-     0.884224593137f,     0.888767277786f,     0.893224301196f,     0.897595233788f,     0.901879654283f,
-     0.906077149740f,     0.910187315596f,     0.914209755704f,     0.918144082372f,     0.921989916403f,
-     0.925746887127f,     0.929414632439f,     0.932992798835f,     0.936481041442f,     0.939879024058f,
-     0.943186419177f,     0.946402908026f,     0.949528180593f,     0.952561935658f,     0.955503880820f,
-     0.958353732530f,     0.961111216112f,     0.963776065795f,     0.966348024735f,     0.968826845041f,
-     0.971212287799f,     0.973504123096f,     0.975702130039f,     0.977806096779f,     0.979815820533f,
-     0.981731107599f,     0.983551773378f,     0.985277642389f,     0.986908548290f,     0.988444333892f,
-     0.989884851171f,     0.991229961288f,     0.992479534599f,     0.993633450666f,     0.994691598273f,
-     0.995653875433f,     0.996520189401f,     0.997290456679f,     0.997964603026f,     0.998542563469f,
-     0.999024282300f,     0.999409713092f,     0.999698818696f,     0.999891571247f,     0.999987952167f,
-     0.999987952167f,     0.999891571247f,     0.999698818696f,     0.999409713092f,     0.999024282300f,
-     0.998542563469f,     0.997964603026f,     0.997290456679f,     0.996520189401f,     0.995653875433f,
-     0.994691598273f,     0.993633450666f,     0.992479534599f,     0.991229961288f,     0.989884851171f,
-     0.988444333892f,     0.986908548290f,     0.985277642389f,     0.983551773378f,     0.981731107599f,
-     0.979815820533f,     0.977806096779f,     0.975702130039f,     0.973504123096f,     0.971212287799f,
-     0.968826845041f,     0.966348024735f,     0.963776065795f,     0.961111216112f,     0.958353732530f,
-     0.955503880820f,     0.952561935658f,     0.949528180593f,     0.946402908026f,     0.943186419177f,
-     0.939879024058f,     0.936481041442f,     0.932992798835f,     0.929414632439f,     0.925746887127f,
-     0.921989916403f,     0.918144082372f,     0.914209755704f,     0.910187315596f,     0.906077149740f,
-     0.901879654283f,     0.897595233788f,     0.893224301196f,     0.888767277786f,     0.884224593137f,
-     0.879596685080f,     0.874883999665f,     0.870086991109f,     0.865206121757f,     0.860241862039f,
-     0.855194690420f,     0.850065093356f,     0.844853565250f,     0.839560608398f,     0.834186732948f,
-     0.828732456844f,     0.823198305781f,     0.817584813152f,     0.811892519997f,     0.806121974951f,
-     0.800273734191f,     0.794348361383f,     0.788346427627f,     0.782268511401f,     0.776115198508f,
-     0.769887082016f,     0.763584762206f,     0.757208846506f,     0.750759949443f,     0.744238692572f,
-     0.737645704427f,     0.730981620454f,     0.724247082951f,     0.717442741007f,     0.710569250438f,
-     0.703627273726f,     0.696617479953f,     0.689540544737f,     0.682397150168f,     0.675187984742f,
-     0.667913743292f,     0.660575126926f,     0.653172842954f,     0.645707604824f,     0.638180132051f,
-     0.630591150148f,     0.622941390558f,     0.615231590581f,     0.607462493302f,     0.599634847523f,
-     0.591749407690f,     0.583806933818f,     0.575808191418f,     0.567753951426f,     0.559644990127f,
-     0.551482089078f,     0.543266035038f,     0.534997619887f,     0.526677640552f,     0.518306898929f,
-     0.509886201809f,     0.501416360796f,     0.492898192230f,     0.484332517110f,     0.475720161014f,
-     0.467061954019f,     0.458358730621f,     0.449611329655f,     0.440820594212f,     0.431987371563f,
-     0.423112513073f,     0.414196874117f,     0.405241314005f,     0.396246695891f,     0.387213886697f,
-     0.378143757022f,     0.369037181064f,     0.359895036535f,     0.350718204573f,     0.341507569661f,
-     0.332264019538f,     0.322988445118f,     0.313681740399f,     0.304344802381f,     0.294978530977f,
-     0.285583828929f,     0.276161601717f,     0.266712757475f,     0.257238206902f,     0.247738863176f,
-     0.238215641862f,     0.228669460829f,     0.219101240157f,     0.209511902052f,     0.199902370753f,
-     0.190273572448f,     0.180626435180f,     0.170961888760f,     0.161280864678f,     0.151584296010f,
-     0.141873117332f,     0.132148264628f,     0.122410675199f,     0.112661287575f,     0.102901041421f,
-     0.093130877450f,     0.083351737332f,     0.073564563600f,     0.063770299562f,     0.053969889210f,
-     0.044164277127f,     0.034354408400f,     0.024541228523f,     0.014725683311f,     0.004908718808f
+    0.004908718808f,     0.014725683311f,     0.024541228523f,     0.034354408400f,     0.044164277127f,
+    0.053969889210f,     0.063770299562f,     0.073564563600f,     0.083351737332f,     0.093130877450f,
+    0.102901041421f,     0.112661287575f,     0.122410675199f,     0.132148264628f,     0.141873117332f,
+    0.151584296010f,     0.161280864678f,     0.170961888760f,     0.180626435180f,     0.190273572448f,
+    0.199902370753f,     0.209511902052f,     0.219101240157f,     0.228669460829f,     0.238215641862f,
+    0.247738863176f,     0.257238206902f,     0.266712757475f,     0.276161601717f,     0.285583828929f,
+    0.294978530977f,     0.304344802381f,     0.313681740399f,     0.322988445118f,     0.332264019538f,
+    0.341507569661f,     0.350718204573f,     0.359895036535f,     0.369037181064f,     0.378143757022f,
+    0.387213886697f,     0.396246695891f,     0.405241314005f,     0.414196874117f,     0.423112513073f,
+    0.431987371563f,     0.440820594212f,     0.449611329655f,     0.458358730621f,     0.467061954019f,
+    0.475720161014f,     0.484332517110f,     0.492898192230f,     0.501416360796f,     0.509886201809f,
+    0.518306898929f,     0.526677640552f,     0.534997619887f,     0.543266035038f,     0.551482089078f,
+    0.559644990127f,     0.567753951426f,     0.575808191418f,     0.583806933818f,     0.591749407690f,
+    0.599634847523f,     0.607462493302f,     0.615231590581f,     0.622941390558f,     0.630591150148f,
+    0.638180132051f,     0.645707604824f,     0.653172842954f,     0.660575126926f,     0.667913743292f,
+    0.675187984742f,     0.682397150168f,     0.689540544737f,     0.696617479953f,     0.703627273726f,
+    0.710569250438f,     0.717442741007f,     0.724247082951f,     0.730981620454f,     0.737645704427f,
+    0.744238692572f,     0.750759949443f,     0.757208846506f,     0.763584762206f,     0.769887082016f,
+    0.776115198508f,     0.782268511401f,     0.788346427627f,     0.794348361383f,     0.800273734191f,
+    0.806121974951f,     0.811892519997f,     0.817584813152f,     0.823198305781f,     0.828732456844f,
+    0.834186732948f,     0.839560608398f,     0.844853565250f,     0.850065093356f,     0.855194690420f,
+    0.860241862039f,     0.865206121757f,     0.870086991109f,     0.874883999665f,     0.879596685080f,
+    0.884224593137f,     0.888767277786f,     0.893224301196f,     0.897595233788f,     0.901879654283f,
+    0.906077149740f,     0.910187315596f,     0.914209755704f,     0.918144082372f,     0.921989916403f,
+    0.925746887127f,     0.929414632439f,     0.932992798835f,     0.936481041442f,     0.939879024058f,
+    0.943186419177f,     0.946402908026f,     0.949528180593f,     0.952561935658f,     0.955503880820f,
+    0.958353732530f,     0.961111216112f,     0.963776065795f,     0.966348024735f,     0.968826845041f,
+    0.971212287799f,     0.973504123096f,     0.975702130039f,     0.977806096779f,     0.979815820533f,
+    0.981731107599f,     0.983551773378f,     0.985277642389f,     0.986908548290f,     0.988444333892f,
+    0.989884851171f,     0.991229961288f,     0.992479534599f,     0.993633450666f,     0.994691598273f,
+    0.995653875433f,     0.996520189401f,     0.997290456679f,     0.997964603026f,     0.998542563469f,
+    0.999024282300f,     0.999409713092f,     0.999698818696f,     0.999891571247f,     0.999987952167f,
+    0.999987952167f,     0.999891571247f,     0.999698818696f,     0.999409713092f,     0.999024282300f,
+    0.998542563469f,     0.997964603026f,     0.997290456679f,     0.996520189401f,     0.995653875433f,
+    0.994691598273f,     0.993633450666f,     0.992479534599f,     0.991229961288f,     0.989884851171f,
+    0.988444333892f,     0.986908548290f,     0.985277642389f,     0.983551773378f,     0.981731107599f,
+    0.979815820533f,     0.977806096779f,     0.975702130039f,     0.973504123096f,     0.971212287799f,
+    0.968826845041f,     0.966348024735f,     0.963776065795f,     0.961111216112f,     0.958353732530f,
+    0.955503880820f,     0.952561935658f,     0.949528180593f,     0.946402908026f,     0.943186419177f,
+    0.939879024058f,     0.936481041442f,     0.932992798835f,     0.929414632439f,     0.925746887127f,
+    0.921989916403f,     0.918144082372f,     0.914209755704f,     0.910187315596f,     0.906077149740f,
+    0.901879654283f,     0.897595233788f,     0.893224301196f,     0.888767277786f,     0.884224593137f,
+    0.879596685080f,     0.874883999665f,     0.870086991109f,     0.865206121757f,     0.860241862039f,
+    0.855194690420f,     0.850065093356f,     0.844853565250f,     0.839560608398f,     0.834186732948f,
+    0.828732456844f,     0.823198305781f,     0.817584813152f,     0.811892519997f,     0.806121974951f,
+    0.800273734191f,     0.794348361383f,     0.788346427627f,     0.782268511401f,     0.776115198508f,
+    0.769887082016f,     0.763584762206f,     0.757208846506f,     0.750759949443f,     0.744238692572f,
+    0.737645704427f,     0.730981620454f,     0.724247082951f,     0.717442741007f,     0.710569250438f,
+    0.703627273726f,     0.696617479953f,     0.689540544737f,     0.682397150168f,     0.675187984742f,
+    0.667913743292f,     0.660575126926f,     0.653172842954f,     0.645707604824f,     0.638180132051f,
+    0.630591150148f,     0.622941390558f,     0.615231590581f,     0.607462493302f,     0.599634847523f,
+    0.591749407690f,     0.583806933818f,     0.575808191418f,     0.567753951426f,     0.559644990127f,
+    0.551482089078f,     0.543266035038f,     0.534997619887f,     0.526677640552f,     0.518306898929f,
+    0.509886201809f,     0.501416360796f,     0.492898192230f,     0.484332517110f,     0.475720161014f,
+    0.467061954019f,     0.458358730621f,     0.449611329655f,     0.440820594212f,     0.431987371563f,
+    0.423112513073f,     0.414196874117f,     0.405241314005f,     0.396246695891f,     0.387213886697f,
+    0.378143757022f,     0.369037181064f,     0.359895036535f,     0.350718204573f,     0.341507569661f,
+    0.332264019538f,     0.322988445118f,     0.313681740399f,     0.304344802381f,     0.294978530977f,
+    0.285583828929f,     0.276161601717f,     0.266712757475f,     0.257238206902f,     0.247738863176f,
+    0.238215641862f,     0.228669460829f,     0.219101240157f,     0.209511902052f,     0.199902370753f,
+    0.190273572448f,     0.180626435180f,     0.170961888760f,     0.161280864678f,     0.151584296010f,
+    0.141873117332f,     0.132148264628f,     0.122410675199f,     0.112661287575f,     0.102901041421f,
+    0.093130877450f,     0.083351737332f,     0.073564563600f,     0.063770299562f,     0.053969889210f,
+    0.044164277127f,     0.034354408400f,     0.024541228523f,     0.014725683311f,     0.004908718808f
 };
 
-static void apply_filterbank(float *x_out, float *x_in, const int *center_bins, const float* band_weights, int num_bands)
-{
+static void apply_filterbank(float *x_out, float *x_in, const int *center_bins, const float* band_weights,
+                             int num_bands) {
     int b, i;
     float frac;
 
     celt_assert(x_in != x_out);
 
     x_out[0] = 0;
-    for (b = 0; b < num_bands - 1; b++)
-    {
-        x_out[b+1] = 0;
-        for (i = center_bins[b]; i < center_bins[b+1]; i++)
-        {
-            frac = (float) (center_bins[b+1] - i) / (center_bins[b+1] - center_bins[b]);
-            x_out[b]   += band_weights[b] * frac * x_in[i];
-            x_out[b+1] += band_weights[b+1] * (1 - frac) * x_in[i];
+    for (b = 0; b < num_bands - 1; b++) {
+        x_out[b + 1] = 0;
+        for (i = center_bins[b]; i < center_bins[b + 1]; i++) {
+            frac = (float) (center_bins[b + 1] - i)/(center_bins[b + 1] - center_bins[b]);
+            x_out[b]   += band_weights[b]*frac*x_in[i];
+            x_out[b + 1] += band_weights[b + 1]*(1 - frac)*x_in[i];
 
         }
     }
-    x_out[num_bands - 1] += band_weights[num_bands - 1] * x_in[center_bins[num_bands - 1]];
+    x_out[num_bands - 1] += band_weights[num_bands - 1]*x_in[center_bins[num_bands - 1]];
 #ifdef DEBUG_PRINT
-    for (b = 0; b < num_bands; b++)
-    {
+    for (b = 0; b < num_bands; b++) {
         printf("band[%d]: %f\n", b, x_out[b]);
     }
 #endif
 }
 
 
-static void mag_spec_320_onesided(float *out, float *in)
-{
+static void mag_spec_320_onesided(float *out, float *in) {
     celt_assert(OSCE_SPEC_WINDOW_SIZE == 320);
     kiss_fft_cpx buffer[OSCE_SPEC_WINDOW_SIZE];
     int k;
     forward_transform(buffer, in);
 
-    for (k = 0; k < OSCE_SPEC_NUM_FREQS; k++)
-    {
-        out[k] = OSCE_SPEC_WINDOW_SIZE * sqrt(buffer[k].r * buffer[k].r + buffer[k].i * buffer[k].i);
+    for (k = 0; k < OSCE_SPEC_NUM_FREQS; k++) {
+        out[k] = OSCE_SPEC_WINDOW_SIZE*sqrt(buffer[k].r*buffer[k].r + buffer[k].i*buffer[k].i);
 #ifdef DEBUG_PRINT
         printf("magspec[%d]: %f\n", k, out[k]);
 #endif
@@ -226,47 +221,41 @@ static void mag_spec_320_onesided(float *out, float *in)
 }
 
 
-static void calculate_log_spectrum_from_lpc(float *spec, oac_int16 *a_q12, int lpc_order)
-{
+static void calculate_log_spectrum_from_lpc(float *spec, oac_int16 *a_q12, int lpc_order) {
     float buffer[OSCE_SPEC_WINDOW_SIZE] = {0};
     int i;
 
     /* zero expansion */
     buffer[0] = 1;
-    for (i = 0; i < lpc_order; i++)
-    {
-        buffer[i+1] = - (float)a_q12[i] / (1U << 12);
+    for (i = 0; i < lpc_order; i++) {
+        buffer[i + 1] = -(float)a_q12[i]/(1U<<12);
     }
 
     /* calculate and invert magnitude spectrum */
     mag_spec_320_onesided(buffer, buffer);
 
-    for (i = 0; i < OSCE_SPEC_NUM_FREQS; i++)
-    {
-        buffer[i] = 1.f / (buffer[i] + 1e-9f);
+    for (i = 0; i < OSCE_SPEC_NUM_FREQS; i++) {
+        buffer[i] = 1.f/(buffer[i] + 1e-9f);
     }
 
     /* apply filterbank */
     apply_filterbank(spec, buffer, center_bins_clean, band_weights_clean, OSCE_CLEAN_SPEC_NUM_BANDS);
 
     /* log and scaling */
-    for (i = 0; i < OSCE_CLEAN_SPEC_NUM_BANDS; i++)
-    {
-        spec[i] = 0.3f * log(spec[i] + 1e-9f);
+    for (i = 0; i < OSCE_CLEAN_SPEC_NUM_BANDS; i++) {
+        spec[i] = 0.3f*log(spec[i] + 1e-9f);
     }
 }
 
-static void calculate_cepstrum(float *cepstrum, float *signal)
-{
+static void calculate_cepstrum(float *cepstrum, float *signal) {
     float buffer[OSCE_SPEC_WINDOW_SIZE];
     float *spec = &buffer[OSCE_SPEC_NUM_FREQS + 3];
     int n;
 
     celt_assert(cepstrum != signal);
 
-    for (n = 0; n < OSCE_SPEC_WINDOW_SIZE; n++)
-    {
-        buffer[n] = osce_window[n] * signal[n];
+    for (n = 0; n < OSCE_SPEC_WINDOW_SIZE; n++) {
+        buffer[n] = osce_window[n]*signal[n];
     }
 
     /* calculate magnitude spectrum */
@@ -276,8 +265,7 @@ static void calculate_cepstrum(float *cepstrum, float *signal)
     apply_filterbank(spec, buffer, center_bins_noisy, band_weights_noisy, OSCE_NOISY_SPEC_NUM_BANDS);
 
     /* log domain conversion */
-    for (n = 0; n < OSCE_NOISY_SPEC_NUM_BANDS; n++)
-    {
+    for (n = 0; n < OSCE_NOISY_SPEC_NUM_BANDS; n++) {
         spec[n] = log(spec[n] + 1e-9f);
 #ifdef DEBUG_PRINT
         printf("logspec[%d]: %f\n", n, spec[n]);
@@ -289,68 +277,56 @@ static void calculate_cepstrum(float *cepstrum, float *signal)
     dct(cepstrum, spec);
 }
 
-static void calculate_acorr(float *acorr, float *signal, int lag)
-{
+static void calculate_acorr(float *acorr, float *signal, int lag) {
     int n, k;
     celt_assert(acorr != signal);
 
-    for (k = -2; k <= 2; k++)
-    {
-        acorr[k+2] = 0;
+    for (k = -2; k <= 2; k++) {
+        acorr[k + 2] = 0;
         float xx = 0;
         float xy = 0;
         float yy = 0;
-        for (n = 0; n < 80; n++)
-        {
+        for (n = 0; n < 80; n++) {
             /* obviously wasteful -> fix later */
-            xx += signal[n] * signal[n];
-            yy += signal[n - lag + k] * signal[n - lag + k];
-            xy += signal[n] * signal[n - lag + k];
+            xx += signal[n]*signal[n];
+            yy += signal[n - lag + k]*signal[n - lag + k];
+            xy += signal[n]*signal[n - lag + k];
         }
-        acorr[k+2] = xy / sqrt(xx * yy + 1e-9f);
+        acorr[k + 2] = xy/sqrt(xx*yy + 1e-9f);
     }
 }
 
-static int pitch_postprocessing(OSCEFeatureState *psFeatures, int lag, int type)
-{
+static int pitch_postprocessing(OSCEFeatureState *psFeatures, int lag, int type) {
     int new_lag;
     int modulus;
 
 #ifdef OSCE_HANGOVER_BUGFIX
-#define TESTBIT 1
+# define TESTBIT 1
 #else
-#define TESTBIT 0
+# define TESTBIT 0
 #endif
 
     modulus = OSCE_PITCH_HANGOVER;
-    if (modulus == 0) modulus ++;
+    if (modulus == 0) modulus++;
 
     /* hangover is currently disabled to reflect a bug in the python code. ToDo: re-evaluate hangover */
-    if (type != TYPE_VOICED && psFeatures->last_type == TYPE_VOICED && TESTBIT)
-    /* enter hangover */
-    {
+    if (type != TYPE_VOICED && psFeatures->last_type == TYPE_VOICED && TESTBIT) {
+        /* enter hangover */
         new_lag = OSCE_NO_PITCH_VALUE;
-        if (psFeatures->pitch_hangover_count < OSCE_PITCH_HANGOVER)
-        {
+        if (psFeatures->pitch_hangover_count < OSCE_PITCH_HANGOVER) {
             new_lag = psFeatures->last_lag;
-            psFeatures->pitch_hangover_count = (psFeatures->pitch_hangover_count + 1) % modulus;
+            psFeatures->pitch_hangover_count = (psFeatures->pitch_hangover_count + 1)%modulus;
         }
-    }
-    else if (type != TYPE_VOICED && psFeatures->pitch_hangover_count && TESTBIT)
-    /* continue hangover */
-    {
+    } else if (type != TYPE_VOICED && psFeatures->pitch_hangover_count && TESTBIT) {
+        /* continue hangover */
         new_lag = psFeatures->last_lag;
-        psFeatures->pitch_hangover_count = (psFeatures->pitch_hangover_count + 1) % modulus;
-    }
-    else if (type != TYPE_VOICED)
-    /* unvoiced frame after hangover */
-    {
+        psFeatures->pitch_hangover_count = (psFeatures->pitch_hangover_count + 1)%modulus;
+    } else if (type != TYPE_VOICED) {
+        /* unvoiced frame after hangover */
         new_lag = OSCE_NO_PITCH_VALUE;
         psFeatures->pitch_hangover_count = 0;
-    }
-    else
-    /* voiced frame: update last_lag */
-    {
+    } else {
+        /* voiced frame: update last_lag */
         new_lag = lag;
         psFeatures->last_lag = lag;
         psFeatures->pitch_hangover_count = 0;
@@ -371,19 +347,17 @@ void osce_calculate_features(
     float                       *features,                      /* O    input features                              */
     float                       *numbits,                       /* O    numbits and smoothed numbits                */
     int                         *periods,                       /* O    pitch lags on subframe basis                */
-    const oac_int16            xq[],                           /* I    Decoded speech                              */
-    oac_int32                  num_bits                        /* I    Size of SILK payload in bits                */
-)
-{
+    const oac_int16 xq[],                                      /* I    Decoded speech                              */
+    oac_int32 num_bits                                         /* I    Size of SILK payload in bits                */
+    ) {
     int num_subframes, num_samples;
-    float buffer[OSCE_FEATURES_MAX_HISTORY + OSCE_MAX_FEATURE_FRAMES * 80];
+    float buffer[OSCE_FEATURES_MAX_HISTORY + OSCE_MAX_FEATURE_FRAMES*80];
     float *frame, *pfeatures;
     OSCEFeatureState *psFeatures;
     int i, n, k;
 #ifdef WRITE_FEATURES
     static FILE *f_feat = NULL;
-    if (f_feat == NULL)
-    {
+    if (f_feat == NULL) {
         f_feat = fopen("assembled_features.f32", "wb");
     }
 #endif
@@ -392,44 +366,39 @@ void osce_calculate_features(
     memset(buffer, 0, sizeof(buffer));
 
     num_subframes = psDec->nb_subfr;
-    num_samples = num_subframes * 80;
+    num_samples = num_subframes*80;
     psFeatures = &psDec->osce.features;
 
     /* smooth bit count */
-    psFeatures->numbits_smooth = 0.9f * psFeatures->numbits_smooth + 0.1f * num_bits;
+    psFeatures->numbits_smooth = 0.9f*psFeatures->numbits_smooth + 0.1f*num_bits;
     numbits[0] = num_bits;
     numbits[1] = psFeatures->numbits_smooth;
 
-    for (n = 0; n < num_samples; n++)
-    {
-        buffer[OSCE_FEATURES_MAX_HISTORY + n] = (float) xq[n] / (1U<<15);
+    for (n = 0; n < num_samples; n++) {
+        buffer[OSCE_FEATURES_MAX_HISTORY + n] = (float) xq[n]/(1U<<15);
     }
     OAC_COPY(buffer, psFeatures->signal_history, OSCE_FEATURES_MAX_HISTORY);
 
-    for (k = 0; k < num_subframes; k++)
-    {
-        pfeatures = features + k * OSCE_FEATURE_DIM;
-        frame = &buffer[OSCE_FEATURES_MAX_HISTORY + k * 80];
+    for (k = 0; k < num_subframes; k++) {
+        pfeatures = features + k*OSCE_FEATURE_DIM;
+        frame = &buffer[OSCE_FEATURES_MAX_HISTORY + k*80];
         memset(pfeatures, 0, OSCE_FEATURE_DIM); /* precaution */
 
         /* clean spectrum from lpcs (update every other frame) */
-        if (k % 2 == 0)
-        {
-            calculate_log_spectrum_from_lpc(pfeatures + OSCE_CLEAN_SPEC_START, psDecCtrl->PredCoef_Q12[k >> 1], psDec->LPC_order);
-        }
-        else
-        {
-            OAC_COPY(pfeatures + OSCE_CLEAN_SPEC_START, pfeatures + OSCE_CLEAN_SPEC_START - OSCE_FEATURE_DIM, OSCE_CLEAN_SPEC_LENGTH);
+        if (k%2 == 0) {
+            calculate_log_spectrum_from_lpc(pfeatures + OSCE_CLEAN_SPEC_START, psDecCtrl->PredCoef_Q12[k>>1],
+            psDec->LPC_order);
+        } else {
+            OAC_COPY(pfeatures + OSCE_CLEAN_SPEC_START, pfeatures + OSCE_CLEAN_SPEC_START - OSCE_FEATURE_DIM,
+            OSCE_CLEAN_SPEC_LENGTH);
         }
 
         /* noisy cepstrum from signal (update every other frame) */
-        if (k % 2 == 0)
-        {
+        if (k%2 == 0) {
             calculate_cepstrum(pfeatures + OSCE_NOISY_CEPSTRUM_START, frame - 160);
-        }
-        else
-        {
-            OAC_COPY(pfeatures + OSCE_NOISY_CEPSTRUM_START, pfeatures + OSCE_NOISY_CEPSTRUM_START - OSCE_FEATURE_DIM, OSCE_NOISY_CEPSTRUM_LENGTH);
+        } else {
+            OAC_COPY(pfeatures + OSCE_NOISY_CEPSTRUM_START, pfeatures + OSCE_NOISY_CEPSTRUM_START - OSCE_FEATURE_DIM,
+            OSCE_NOISY_CEPSTRUM_LENGTH);
         }
 
         /* pitch hangover and zero value replacement */
@@ -440,13 +409,12 @@ void osce_calculate_features(
 
         /* ltp */
         celt_assert(OSCE_LTP_LENGTH == LTP_ORDER);
-        for (i = 0; i < OSCE_LTP_LENGTH; i++)
-        {
-            pfeatures[OSCE_LTP_START + i] = (float) psDecCtrl->LTPCoef_Q14[k * LTP_ORDER + i] / (1U << 14);
+        for (i = 0; i < OSCE_LTP_LENGTH; i++) {
+            pfeatures[OSCE_LTP_START + i] = (float) psDecCtrl->LTPCoef_Q14[k*LTP_ORDER + i]/(1U<<14);
         }
 
         /* frame gain */
-        pfeatures[OSCE_LOG_GAIN_START] = log((float) psDecCtrl->Gains_Q16[k] / (1UL << 16) + 1e-9f);
+        pfeatures[OSCE_LOG_GAIN_START] = log((float) psDecCtrl->Gains_Q16[k]/(1UL<<16) + 1e-9f);
 
 #ifdef WRITE_FEATURES
         fwrite(pfeatures, sizeof(*pfeatures), 93, f_feat);
@@ -462,43 +430,39 @@ void osce_calculate_features(
 void osce_bwe_calculate_features(
     OSCEBWEFeatureState         *psFeatures,                    /* I/O  BWE feature state                          */
     float                       *features,                      /* O    input features                              */
-    const oac_int16            xq[],                           /* I    Decoded speech                              */
-    int                         num_samples                     /* I    number of input samples                     */
- )
- {
+    const oac_int16 xq[],                                      /* I    Decoded speech                              */
+    int num_samples                                             /* I    number of input samples                     */
+    ) {
     int n, k, num_frames, frame;
     kiss_fft_cpx fft_buffer[OSCE_BWE_WINDOW_SIZE];
-    float spec[2 * OSCE_BWE_MAX_INSTAFREQ_BIN + 2];
+    float spec[2*OSCE_BWE_MAX_INSTAFREQ_BIN + 2];
     float buffer[OSCE_BWE_WINDOW_SIZE];
     float mag_spec[OSCE_SPEC_NUM_FREQS];
     float *lmspec, *instafreq;
 
     /* OSCE_BWE_WINDOW_SIZE == 320 is a hard requirement */
-    celt_assert((num_samples % OSCE_BWE_HALF_WINDOW_SIZE == 0) && (OSCE_BWE_WINDOW_SIZE == 320));
+    celt_assert((num_samples%OSCE_BWE_HALF_WINDOW_SIZE == 0) && (OSCE_BWE_WINDOW_SIZE == 320));
 
-    num_frames = num_samples / OSCE_BWE_HALF_WINDOW_SIZE;
+    num_frames = num_samples/OSCE_BWE_HALF_WINDOW_SIZE;
 
-    for (frame = 0; frame < num_frames; frame++)
-    {
+    for (frame = 0; frame < num_frames; frame++) {
         /* clear features */
-        OAC_CLEAR(features + frame * OSCE_BWE_FEATURE_DIM, OSCE_BWE_FEATURE_DIM);
+        OAC_CLEAR(features + frame*OSCE_BWE_FEATURE_DIM, OSCE_BWE_FEATURE_DIM);
 
-        lmspec = features + frame * OSCE_BWE_FEATURE_DIM;
+        lmspec = features + frame*OSCE_BWE_FEATURE_DIM;
         instafreq = lmspec + OSCE_BWE_NUM_BANDS;
-        const oac_int16 *x = xq + frame * OSCE_BWE_HALF_WINDOW_SIZE;
+        const oac_int16 *x = xq + frame*OSCE_BWE_HALF_WINDOW_SIZE;
 
         OAC_COPY(buffer, psFeatures->signal_history, OSCE_BWE_HALF_WINDOW_SIZE);
-        for (n = 0; n < OSCE_BWE_HALF_WINDOW_SIZE; n++)
-        {
-            buffer[n + OSCE_BWE_HALF_WINDOW_SIZE] = (float) x[n] / (1U<<15);
+        for (n = 0; n < OSCE_BWE_HALF_WINDOW_SIZE; n++) {
+            buffer[n + OSCE_BWE_HALF_WINDOW_SIZE] = (float) x[n]/(1U<<15);
         }
 
         /* update signal history buffer */
         OAC_COPY(psFeatures->signal_history, buffer + OSCE_BWE_HALF_WINDOW_SIZE, OSCE_BWE_HALF_WINDOW_SIZE);
 
         /* apply window */
-        for (n = 0; n < OSCE_BWE_WINDOW_SIZE; n ++)
-        {
+        for (n = 0; n < OSCE_BWE_WINDOW_SIZE; n++) {
             buffer[n] *= osce_window[n];
         }
 
@@ -506,67 +470,60 @@ void osce_bwe_calculate_features(
         forward_transform(fft_buffer, buffer);
 
         /* instafreq */
-        for (k = 0; k <= OSCE_BWE_MAX_INSTAFREQ_BIN; k++)
-        {
+        for (k = 0; k <= OSCE_BWE_MAX_INSTAFREQ_BIN; k++) {
             float aux_r, aux_i, aux_abs;
             float re1, re2, im1, im2;
-            spec[2*k]   = OSCE_BWE_WINDOW_SIZE * fft_buffer[k].r + 1e-9; /* ToDo: remove 1e-9 from python code*/
-            spec[2*k+1] = OSCE_BWE_WINDOW_SIZE * fft_buffer[k].i;
+            spec[2*k]   = OSCE_BWE_WINDOW_SIZE*fft_buffer[k].r + 1e-9;   /* ToDo: remove 1e-9 from python code*/
+            spec[2*k + 1] = OSCE_BWE_WINDOW_SIZE*fft_buffer[k].i;
             re1 = spec[2*k];
-            im1 = spec[2*k+1];
+            im1 = spec[2*k + 1];
             re2 = psFeatures->last_spec[2*k];
-            im2 = psFeatures->last_spec[2*k+1];
-            aux_r = re1 * re2 + im1 * im2;
-            aux_i = im1 * re2 - re1 * im2;
-            aux_abs = sqrt(aux_r * aux_r + aux_i * aux_i);
-            instafreq[k] = aux_r / (aux_abs + 1e-9);
-            instafreq[k + OSCE_BWE_MAX_INSTAFREQ_BIN + 1] = aux_i / (aux_abs + 1e-9);
+            im2 = psFeatures->last_spec[2*k + 1];
+            aux_r = re1*re2 + im1*im2;
+            aux_i = im1*re2 - re1*im2;
+            aux_abs = sqrt(aux_r*aux_r + aux_i*aux_i);
+            instafreq[k] = aux_r/(aux_abs + 1e-9);
+            instafreq[k + OSCE_BWE_MAX_INSTAFREQ_BIN + 1] = aux_i/(aux_abs + 1e-9);
         }
 
         /* erb-scale magnitude spectrogram */
-        for (k = 0; k < OSCE_SPEC_NUM_FREQS; k ++)
-        {
-            mag_spec[k] = OSCE_BWE_WINDOW_SIZE * sqrt(fft_buffer[k].r * fft_buffer[k].r + fft_buffer[k].i * fft_buffer[k].i);
+        for (k = 0; k < OSCE_SPEC_NUM_FREQS; k++) {
+            mag_spec[k] = OSCE_BWE_WINDOW_SIZE*sqrt(fft_buffer[k].r*fft_buffer[k].r + fft_buffer[k].i*fft_buffer[k].i);
         }
 
         apply_filterbank(lmspec, mag_spec, center_bins_bwe, band_weights_bwe, OSCE_BWE_NUM_BANDS);
 
-        for (k = 0; k < OSCE_BWE_NUM_BANDS; k++)
-        {
+        for (k = 0; k < OSCE_BWE_NUM_BANDS; k++) {
             lmspec[k] = log(lmspec[k] + 1e-9);
         }
 
         /* update instafreq buffer */
-        OAC_COPY(psFeatures->last_spec, spec, 2 * OSCE_BWE_MAX_INSTAFREQ_BIN + 2);
+        OAC_COPY(psFeatures->last_spec, spec, 2*OSCE_BWE_MAX_INSTAFREQ_BIN + 2);
     }
 }
 #endif /* ENABLE_OSCE_BWE */
 
-void osce_cross_fade_10ms(float *x_enhanced, float *x_in, int length)
-{
+void osce_cross_fade_10ms(float *x_enhanced, float *x_in, int length) {
     int i;
     celt_assert(length >= 160);
 
-    for (i = 0; i < 160; i++)
-    {
-        x_enhanced[i] = osce_window[i] * x_enhanced[i] + (1.f - osce_window[i]) * x_in[i];
+    for (i = 0; i < 160; i++) {
+        x_enhanced[i] = osce_window[i]*x_enhanced[i] + (1.f - osce_window[i])*x_in[i];
     }
 }
 
 
-void osce_bwe_cross_fade_10ms(oac_int16 *x_fadein, oac_int16 *x_fadeout, int length)
-{
+void osce_bwe_cross_fade_10ms(oac_int16 *x_fadein, oac_int16 *x_fadeout, int length) {
     int i;
     celt_assert(length >= 480);
-    float f = 1.f / 3;
-    for (i = 0; i < 160; i++)
-    {
+    float f = 1.f/3;
+    for (i = 0; i < 160; i++) {
         float diff = i == 159 ? 0.f : osce_window[i + 1] - osce_window[i];
         float w_curr = osce_window[i];
-        x_fadein[3*i + 0] = (int) (w_curr * x_fadein[3*i + 0] + (1.f - w_curr) * x_fadeout[3*i + 0] + 0.5);
-        w_curr += diff * f;
-        x_fadein[3*i + 1] = (int) (w_curr * x_fadein[3*i + 1] + (1.f - w_curr) * x_fadeout[3*i + 1] + 0.5);
-        w_curr += diff * f;
-        x_fadein[3*i + 2] = (int) (w_curr * x_fadein[3*i + 2] + (1.f - w_curr) * x_fadeout[3*i + 2] + 0.5);
+        x_fadein[3*i + 0] = (int) (w_curr*x_fadein[3*i + 0] + (1.f - w_curr)*x_fadeout[3*i + 0] + 0.5);
+        w_curr += diff*f;
+        x_fadein[3*i + 1] = (int) (w_curr*x_fadein[3*i + 1] + (1.f - w_curr)*x_fadeout[3*i + 1] + 0.5);
+        w_curr += diff*f;
+        x_fadein[3*i + 2] = (int) (w_curr*x_fadein[3*i + 2] + (1.f - w_curr)*x_fadeout[3*i + 2] + 0.5);
     }
 }
diff --git a/dnn/osce_features.h b/dnn/osce_features.h
index 024db48c3..b470bf5a2 100644
--- a/dnn/osce_features.h
+++ b/dnn/osce_features.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef OSCE_FEATURES_H
 #define OSCE_FEATURES_H
@@ -40,17 +40,17 @@ void osce_calculate_features(
     float                       *features,                      /* O    input features                              */
     float                       *numbits,                       /* O    numbits and smoothed numbits                */
     int                         *periods,                       /* O    pitch lags on subframe basis                */
-    const oac_int16            xq[],                           /* I    Decoded speech                              */
-    oac_int32                  num_bits                        /* I    Size of SILK payload in bits                */
-);
+    const oac_int16 xq[],                                      /* I    Decoded speech                              */
+    oac_int32 num_bits                                         /* I    Size of SILK payload in bits                */
+    );
 
 #ifdef ENABLE_OSCE_BWE
 void osce_bwe_calculate_features(
-   OSCEBWEFeatureState         *psFeatures,                    /* I/O  BWE feature state                           */
-   float                       *features,                      /* O    input features                              */
-   const oac_int16            xq[],                           /* I    Decoded speech                              */
-   int                         num_samples                     /* I    number of input samples                     */
-);
+    OSCEBWEFeatureState         *psFeatures,                   /* I/O  BWE feature state                           */
+    float                       *features,                     /* O    input features                              */
+    const oac_int16 xq[],                                     /* I    Decoded speech                              */
+    int num_samples                                            /* I    number of input samples                     */
+    );
 #endif
 
 void osce_cross_fade_10ms(float *x_enhanced, float *x_in, int length);
diff --git a/dnn/osce_structs.h b/dnn/osce_structs.h
index a0ea23e0b..7b0474785 100644
--- a/dnn/osce_structs.h
+++ b/dnn/osce_structs.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef OSCE_STRUCTS_H
 #define OSCE_STRUCTS_H
@@ -31,14 +31,14 @@
 #include "oac_types.h"
 #include "osce_config.h"
 #ifndef DISABLE_LACE
-#include "lace_data.h"
+# include "lace_data.h"
 #endif
 #ifndef DISABLE_NOLACE
-#include "nolace_data.h"
+# include "nolace_data.h"
 #endif
 #ifndef DISABLE_BBWENET
-#include "bbwenet_data.h"
-#include "resampler_structs.h"
+# include "bbwenet_data.h"
+# include "resampler_structs.h"
 #endif
 #include "nndsp.h"
 #include "nnet.h"
@@ -46,17 +46,17 @@
 /* feature calculation */
 
 typedef struct {
-    float               numbits_smooth;
-    int                 pitch_hangover_count;
-    int                 last_lag;
-    int                 last_type;
-    float               signal_history[OSCE_FEATURES_MAX_HISTORY];
-    int                 reset;
+    float numbits_smooth;
+    int pitch_hangover_count;
+    int last_lag;
+    int last_type;
+    float signal_history[OSCE_FEATURES_MAX_HISTORY];
+    int reset;
 } OSCEFeatureState;
 
 typedef struct {
     float signal_history[OSCE_BWE_HALF_WINDOW_SIZE];
-    float last_spec[2 * OSCE_BWE_MAX_INSTAFREQ_BIN + 2];
+    float last_spec[2*OSCE_BWE_MAX_INSTAFREQ_BIN + 2];
 } OSCEBWEFeatureState;
 
 #ifndef DISABLE_BBWENET
@@ -100,8 +100,7 @@ typedef struct {
     float deemph_mem;
 } LACEState;
 
-typedef struct
-{
+typedef struct {
     LACELayers layers;
     float window[LACE_OVERLAP_SIZE];
 } LACE;
@@ -141,7 +140,7 @@ typedef struct {
 
 /* OSCEModel */
 typedef struct {
-   int loaded;
+    int loaded;
 #ifndef DISABLE_LACE
     LACE lace;
 #endif
@@ -163,9 +162,9 @@ typedef union {
 } OSCEState;
 
 typedef struct {
-    #ifndef DISABLE_BBWENET
+#ifndef DISABLE_BBWENET
     BBWENetState bbwenet;
-    #endif
+#endif
 } OSCEBWEState;
 
 #endif
diff --git a/dnn/parse_lpcnet_weights.c b/dnn/parse_lpcnet_weights.c
index 287dd8dcc..b339a712d 100644
--- a/dnn/parse_lpcnet_weights.c
+++ b/dnn/parse_lpcnet_weights.c
@@ -22,10 +22,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <string.h>
@@ -36,203 +36,211 @@
 #define SPARSE_BLOCK_SIZE 32
 
 int parse_record(const void **data, int *len, WeightArray *array) {
-  WeightHead *h = (WeightHead *)*data;
-  if (*len < WEIGHT_BLOCK_SIZE) return -1;
-  if (h->block_size < h->size) return -1;
-  if (h->block_size > *len-WEIGHT_BLOCK_SIZE) return -1;
-  if (h->name[sizeof(h->name)-1] != 0) return -1;
-  if (h->size < 0) return -1;
-  array->name = h->name;
-  array->type = h->type;
-  array->size = h->size;
-  array->data = (void*)((unsigned char*)(*data)+WEIGHT_BLOCK_SIZE);
-
-  *data = (void*)((unsigned char*)*data + h->block_size+WEIGHT_BLOCK_SIZE);
-  *len -= h->block_size+WEIGHT_BLOCK_SIZE;
-  return array->size;
+    WeightHead *h = (WeightHead *)*data;
+    if (*len < WEIGHT_BLOCK_SIZE) return -1;
+    if (h->block_size < h->size) return -1;
+    if (h->block_size > *len - WEIGHT_BLOCK_SIZE) return -1;
+    if (h->name[sizeof(h->name) - 1] != 0) return -1;
+    if (h->size < 0) return -1;
+    array->name = h->name;
+    array->type = h->type;
+    array->size = h->size;
+    array->data = (void*)((unsigned char*)(*data) + WEIGHT_BLOCK_SIZE);
+
+    *data = (void*)((unsigned char*)*data + h->block_size + WEIGHT_BLOCK_SIZE);
+    *len -= h->block_size + WEIGHT_BLOCK_SIZE;
+    return array->size;
 }
 
-int parse_weights(WeightArray **list, const void *data, int len)
-{
-  int nb_arrays=0;
-  int capacity=20;
-  *list = (WeightArray*)oac_alloc(capacity*sizeof(WeightArray));
-  while (len > 0) {
-    int ret;
-    WeightArray array = {NULL, 0, 0, 0};
-    ret = parse_record(&data, &len, &array);
-    if (ret > 0) {
-      if (nb_arrays+1 >= capacity) {
-        /* Make sure there's room for the ending NULL element too. */
-        capacity = capacity*3/2;
-        *list = (WeightArray*)oac_realloc(*list, capacity*sizeof(WeightArray));
-      }
-      (*list)[nb_arrays++] = array;
-    } else {
-      oac_free(*list);
-      *list = NULL;
-      return -1;
+int parse_weights(WeightArray **list, const void *data, int len) {
+    int nb_arrays = 0;
+    int capacity = 20;
+    *list = (WeightArray*)oac_alloc(capacity*sizeof(WeightArray));
+    while (len > 0) {
+        int ret;
+        WeightArray array = {NULL, 0, 0, 0};
+        ret = parse_record(&data, &len, &array);
+        if (ret > 0) {
+            if (nb_arrays + 1 >= capacity) {
+                /* Make sure there's room for the ending NULL element too. */
+                capacity = capacity*3/2;
+                *list = (WeightArray*)oac_realloc(*list, capacity*sizeof(WeightArray));
+            }
+            (*list)[nb_arrays++] = array;
+        } else {
+            oac_free(*list);
+            *list = NULL;
+            return -1;
+        }
     }
-  }
-  (*list)[nb_arrays].name=NULL;
-  return nb_arrays;
+    (*list)[nb_arrays].name = NULL;
+    return nb_arrays;
 }
 
 static const WeightArray *find_array_entry(const WeightArray *arrays, const char *name) {
-  while (arrays->name && strcmp(arrays->name, name) != 0) arrays++;
-  return arrays;
+    while (arrays->name && strcmp(arrays->name, name) != 0) arrays++;
+    return arrays;
 }
 
 static const void *find_array_check(const WeightArray *arrays, const char *name, int size) {
-  const WeightArray *a = find_array_entry(arrays, name);
-  if (a->name && a->size == size) return a->data;
-  else return NULL;
+    const WeightArray *a = find_array_entry(arrays, name);
+    if (a->name && a->size == size) return a->data;
+    else return NULL;
 }
 
 static const void *opt_array_check(const WeightArray *arrays, const char *name, int size, int *error) {
-  const WeightArray *a = find_array_entry(arrays, name);
-  *error = (a->name != NULL && a->size != size);
-  if (a->name && a->size == size) return a->data;
-  else return NULL;
+    const WeightArray *a = find_array_entry(arrays, name);
+    *error = (a->name != NULL && a->size != size);
+    if (a->name && a->size == size) return a->data;
+    else return NULL;
 }
 
-static const void *find_idx_check(const WeightArray *arrays, const char *name, int nb_in, int nb_out, int *total_blocks) {
-  int remain;
-  const int *idx;
-  const WeightArray *a = find_array_entry(arrays, name);
-  *total_blocks = 0;
-  if (a == NULL) return NULL;
-  idx = (const int*)a->data;
-  remain = a->size/sizeof(int);
-  while (remain > 0) {
-    int nb_blocks;
-    int i;
-    nb_blocks = *idx++;
-    if (remain < nb_blocks+1) return NULL;
-    for (i=0;i<nb_blocks;i++) {
-      int pos = *idx++;
-      if (pos+3 >= nb_in || (pos&0x3)) return NULL;
+static const void *find_idx_check(const WeightArray *arrays, const char *name, int nb_in, int nb_out,
+                                  int *total_blocks) {
+    int remain;
+    const int *idx;
+    const WeightArray *a = find_array_entry(arrays, name);
+    *total_blocks = 0;
+    if (a == NULL) return NULL;
+    idx = (const int*)a->data;
+    remain = a->size/sizeof(int);
+    while (remain > 0) {
+        int nb_blocks;
+        int i;
+        nb_blocks = *idx++;
+        if (remain < nb_blocks + 1) return NULL;
+        for (i = 0; i < nb_blocks; i++) {
+            int pos = *idx++;
+            if (pos + 3 >= nb_in || (pos&0x3)) return NULL;
+        }
+        nb_out -= 8;
+        remain -= nb_blocks + 1;
+        *total_blocks += nb_blocks;
     }
-    nb_out -= 8;
-    remain -= nb_blocks+1;
-    *total_blocks += nb_blocks;
-  }
-  if (nb_out != 0) return NULL;
-  return a->data;
+    if (nb_out != 0) return NULL;
+    return a->data;
 }
 
 int linear_init(LinearLayer *layer, const WeightArray *arrays,
-  const char *bias,
-  const char *subias,
-  const char *weights,
-  const char *float_weights,
-  const char *weights_idx,
-  const char *diag,
-  const char *scale,
-  int nb_inputs,
-  int nb_outputs)
-{
-  int err;
-  layer->bias = NULL;
-  layer->subias = NULL;
-  layer->weights = NULL;
-  layer->float_weights = NULL;
-  layer->weights_idx = NULL;
-  layer->diag = NULL;
-  layer->scale = NULL;
-  if (bias != NULL) {
-    if ((layer->bias = (const float*)find_array_check(arrays, bias, nb_outputs*sizeof(layer->bias[0]))) == NULL) return 1;
-  }
-  if (subias != NULL) {
-    if ((layer->subias = (const float*)find_array_check(arrays, subias, nb_outputs*sizeof(layer->subias[0]))) == NULL) return 1;
-  }
-  if (weights_idx != NULL) {
-    int total_blocks;
-    if ((layer->weights_idx = (const int*)find_idx_check(arrays, weights_idx, nb_inputs, nb_outputs, &total_blocks)) == NULL) return 1;
-    if (weights != NULL) {
-      if ((layer->weights = (const oac_int8*)find_array_check(arrays, weights, SPARSE_BLOCK_SIZE*total_blocks*sizeof(layer->weights[0]))) == NULL) return 1;
+                const char *bias,
+                const char *subias,
+                const char *weights,
+                const char *float_weights,
+                const char *weights_idx,
+                const char *diag,
+                const char *scale,
+                int nb_inputs,
+                int nb_outputs) {
+    int err;
+    layer->bias = NULL;
+    layer->subias = NULL;
+    layer->weights = NULL;
+    layer->float_weights = NULL;
+    layer->weights_idx = NULL;
+    layer->diag = NULL;
+    layer->scale = NULL;
+    if (bias != NULL) {
+        if ((layer->bias = (const float*)find_array_check(arrays, bias,
+        nb_outputs*sizeof(layer->bias[0]))) == NULL) return 1;
     }
-    if (float_weights != NULL) {
-      layer->float_weights = (const float*)opt_array_check(arrays, float_weights, SPARSE_BLOCK_SIZE*total_blocks*sizeof(layer->float_weights[0]), &err);
-      if (err) return 1;
+    if (subias != NULL) {
+        if ((layer->subias = (const float*)find_array_check(arrays, subias,
+        nb_outputs*sizeof(layer->subias[0]))) == NULL) return 1;
     }
-  } else {
-    if (weights != NULL) {
-      if ((layer->weights = (const oac_int8*)find_array_check(arrays, weights, nb_inputs*nb_outputs*sizeof(layer->weights[0]))) == NULL) return 1;
+    if (weights_idx != NULL) {
+        int total_blocks;
+        if ((layer->weights_idx = (const int*)find_idx_check(arrays, weights_idx, nb_inputs, nb_outputs,
+        &total_blocks)) == NULL) return 1;
+        if (weights != NULL) {
+            if ((layer->weights = (const oac_int8*)find_array_check(arrays, weights,
+            SPARSE_BLOCK_SIZE*total_blocks*sizeof(layer->weights[0]))) == NULL) return 1;
+        }
+        if (float_weights != NULL) {
+            layer->float_weights = (const float*)opt_array_check(arrays, float_weights,
+            SPARSE_BLOCK_SIZE*total_blocks*sizeof(layer->float_weights[0]), &err);
+            if (err) return 1;
+        }
+    } else {
+        if (weights != NULL) {
+            if ((layer->weights = (const oac_int8*)find_array_check(arrays, weights,
+            nb_inputs*nb_outputs*sizeof(layer->weights[0]))) == NULL) return 1;
+        }
+        if (float_weights != NULL) {
+            layer->float_weights = (const float*)opt_array_check(arrays, float_weights,
+            nb_inputs*nb_outputs*sizeof(layer->float_weights[0]), &err);
+            if (err) return 1;
+        }
     }
-    if (float_weights != NULL) {
-      layer->float_weights = (const float*)opt_array_check(arrays, float_weights, nb_inputs*nb_outputs*sizeof(layer->float_weights[0]), &err);
-      if (err) return 1;
+    if (diag != NULL) {
+        if ((layer->diag = (const float*)find_array_check(arrays, diag,
+        nb_outputs*sizeof(layer->diag[0]))) == NULL) return 1;
     }
-  }
-  if (diag != NULL) {
-    if ((layer->diag = (const float*)find_array_check(arrays, diag, nb_outputs*sizeof(layer->diag[0]))) == NULL) return 1;
-  }
-  if (weights != NULL) {
-    if ((layer->scale = (const float*)find_array_check(arrays, scale, nb_outputs*sizeof(layer->scale[0]))) == NULL) return 1;
-  }
-  layer->nb_inputs = nb_inputs;
-  layer->nb_outputs = nb_outputs;
-  return 0;
+    if (weights != NULL) {
+        if ((layer->scale = (const float*)find_array_check(arrays, scale,
+        nb_outputs*sizeof(layer->scale[0]))) == NULL) return 1;
+    }
+    layer->nb_inputs = nb_inputs;
+    layer->nb_outputs = nb_outputs;
+    return 0;
 }
 
 int conv2d_init(Conv2dLayer *layer, const WeightArray *arrays,
-  const char *bias,
-  const char *float_weights,
-  int in_channels,
-  int out_channels,
-  int ktime,
-  int kheight)
-{
-  int err;
-  layer->bias = NULL;
-  layer->float_weights = NULL;
-  if (bias != NULL) {
-    if ((layer->bias = (const float*)find_array_check(arrays, bias, out_channels*sizeof(layer->bias[0]))) == NULL) return 1;
-  }
-  if (float_weights != NULL) {
-    layer->float_weights = (const float*)opt_array_check(arrays, float_weights, in_channels*out_channels*ktime*kheight*sizeof(layer->float_weights[0]), &err);
-    if (err) return 1;
-  }
-  layer->in_channels = in_channels;
-  layer->out_channels = out_channels;
-  layer->ktime = ktime;
-  layer->kheight = kheight;
-  return 0;
+                const char *bias,
+                const char *float_weights,
+                int in_channels,
+                int out_channels,
+                int ktime,
+                int kheight) {
+    int err;
+    layer->bias = NULL;
+    layer->float_weights = NULL;
+    if (bias != NULL) {
+        if ((layer->bias = (const float*)find_array_check(arrays, bias,
+        out_channels*sizeof(layer->bias[0]))) == NULL) return 1;
+    }
+    if (float_weights != NULL) {
+        layer->float_weights = (const float*)opt_array_check(arrays, float_weights,
+        in_channels*out_channels*ktime*kheight*sizeof(layer->float_weights[0]), &err);
+        if (err) return 1;
+    }
+    layer->in_channels = in_channels;
+    layer->out_channels = out_channels;
+    layer->ktime = ktime;
+    layer->kheight = kheight;
+    return 0;
 }
 
 
 
 #if 0
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <stdio.h>
-
-int main()
-{
-  int fd;
-  void *data;
-  int len;
-  int nb_arrays;
-  int i;
-  WeightArray *list;
-  struct stat st;
-  const char *filename = "weights_blob.bin";
-  stat(filename, &st);
-  len = st.st_size;
-  fd = open(filename, O_RDONLY);
-  data = mmap(NULL, len, PROT_READ, MAP_SHARED, fd, 0);
-  printf("size is %d\n", len);
-  nb_arrays = parse_weights(&list, data, len);
-  for (i=0;i<nb_arrays;i++) {
-    printf("found %s: size %d\n", list[i].name, list[i].size);
-  }
-  printf("%p\n", list[i].name);
-  oac_free(list);
-  munmap(data, len);
-  close(fd);
-  return 0;
+# include <fcntl.h>
+# include <sys/mman.h>
+# include <unistd.h>
+# include <sys/stat.h>
+# include <stdio.h>
+
+int main() {
+    int fd;
+    void *data;
+    int len;
+    int nb_arrays;
+    int i;
+    WeightArray *list;
+    struct stat st;
+    const char *filename = "weights_blob.bin";
+    stat(filename, &st);
+    len = st.st_size;
+    fd = open(filename, O_RDONLY);
+    data = mmap(NULL, len, PROT_READ, MAP_SHARED, fd, 0);
+    printf("size is %d\n", len);
+    nb_arrays = parse_weights(&list, data, len);
+    for (i = 0; i < nb_arrays; i++) {
+        printf("found %s: size %d\n", list[i].name, list[i].size);
+    }
+    printf("%p\n", list[i].name);
+    oac_free(list);
+    munmap(data, len);
+    close(fd);
+    return 0;
 }
 #endif
diff --git a/dnn/pitchdnn.c b/dnn/pitchdnn.c
index 056e80aa4..913f01e33 100644
--- a/dnn/pitchdnn.c
+++ b/dnn/pitchdnn.c
@@ -1,5 +1,5 @@
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <math.h>
@@ -13,67 +13,67 @@ float compute_pitchdnn(
     PitchDNNState *st,
     const float *if_features,
     const float *xcorr_features,
-    int arch
-    )
-{
-  float if1_out[DENSE_IF_UPSAMPLER_1_OUT_SIZE];
-  float downsampler_in[NB_XCORR_FEATURES + DENSE_IF_UPSAMPLER_2_OUT_SIZE];
-  float downsampler_out[DENSE_DOWNSAMPLER_OUT_SIZE];
-  float conv1_tmp1[(NB_XCORR_FEATURES + 2)*8] = {0};
-  float conv1_tmp2[(NB_XCORR_FEATURES + 2)*8] = {0};
-  float output[DENSE_FINAL_UPSAMPLER_OUT_SIZE];
-  int i;
-  int pos=0;
-  float maxval=-1;
-  float sum=0;
-  float count=0;
-  PitchDNN *model = &st->model;
-  /* IF */
-  compute_generic_dense(&model->dense_if_upsampler_1, if1_out, if_features, ACTIVATION_TANH, arch);
-  compute_generic_dense(&model->dense_if_upsampler_2, &downsampler_in[NB_XCORR_FEATURES], if1_out, ACTIVATION_TANH, arch);
-  /* xcorr*/
-  OAC_COPY(&conv1_tmp1[1], xcorr_features, NB_XCORR_FEATURES);
-  compute_conv2d(&model->conv2d_1, &conv1_tmp2[1], st->xcorr_mem1, conv1_tmp1, NB_XCORR_FEATURES, NB_XCORR_FEATURES+2, ACTIVATION_TANH, arch);
-  compute_conv2d(&model->conv2d_2, downsampler_in, st->xcorr_mem2, conv1_tmp2, NB_XCORR_FEATURES, NB_XCORR_FEATURES, ACTIVATION_TANH, arch);
+    int arch) {
+    float if1_out[DENSE_IF_UPSAMPLER_1_OUT_SIZE];
+    float downsampler_in[NB_XCORR_FEATURES + DENSE_IF_UPSAMPLER_2_OUT_SIZE];
+    float downsampler_out[DENSE_DOWNSAMPLER_OUT_SIZE];
+    float conv1_tmp1[(NB_XCORR_FEATURES + 2)*8] = {0};
+    float conv1_tmp2[(NB_XCORR_FEATURES + 2)*8] = {0};
+    float output[DENSE_FINAL_UPSAMPLER_OUT_SIZE];
+    int i;
+    int pos = 0;
+    float maxval = -1;
+    float sum = 0;
+    float count = 0;
+    PitchDNN *model = &st->model;
+    /* IF */
+    compute_generic_dense(&model->dense_if_upsampler_1, if1_out, if_features, ACTIVATION_TANH, arch);
+    compute_generic_dense(&model->dense_if_upsampler_2, &downsampler_in[NB_XCORR_FEATURES], if1_out, ACTIVATION_TANH,
+    arch);
+    /* xcorr*/
+    OAC_COPY(&conv1_tmp1[1], xcorr_features, NB_XCORR_FEATURES);
+    compute_conv2d(&model->conv2d_1, &conv1_tmp2[1], st->xcorr_mem1, conv1_tmp1, NB_XCORR_FEATURES,
+    NB_XCORR_FEATURES + 2, ACTIVATION_TANH, arch);
+    compute_conv2d(&model->conv2d_2, downsampler_in, st->xcorr_mem2, conv1_tmp2, NB_XCORR_FEATURES, NB_XCORR_FEATURES,
+    ACTIVATION_TANH, arch);
 
-  compute_generic_dense(&model->dense_downsampler, downsampler_out, downsampler_in, ACTIVATION_TANH, arch);
-  compute_generic_gru(&model->gru_1_input, &model->gru_1_recurrent, st->gru_state, downsampler_out, arch);
-  compute_generic_dense(&model->dense_final_upsampler, output, st->gru_state, ACTIVATION_LINEAR, arch);
-  for (i=0;i<180;i++) {
-    if (output[i] > maxval) {
-      pos = i;
-      maxval = output[i];
+    compute_generic_dense(&model->dense_downsampler, downsampler_out, downsampler_in, ACTIVATION_TANH, arch);
+    compute_generic_gru(&model->gru_1_input, &model->gru_1_recurrent, st->gru_state, downsampler_out, arch);
+    compute_generic_dense(&model->dense_final_upsampler, output, st->gru_state, ACTIVATION_LINEAR, arch);
+    for (i = 0; i < 180; i++) {
+        if (output[i] > maxval) {
+            pos = i;
+            maxval = output[i];
+        }
     }
-  }
-  for (i=IMAX(0, pos-2); i<=IMIN(179, pos+2); i++) {
-    float p = exp(output[i]);
-    sum += p*i;
-    count += p;
-  }
-  /*printf("%d %f\n", pos, sum/count);*/
-  return (1.f/60.f)*(sum/count) - 1.5;
-  /*return 256.f/pow(2.f, (1.f/60.f)*i);*/
+    for (i = IMAX(0, pos - 2); i <= IMIN(179, pos + 2); i++) {
+        float p = exp(output[i]);
+        sum += p*i;
+        count += p;
+    }
+    /*printf("%d %f\n", pos, sum/count);*/
+    return (1.f/60.f)*(sum/count) - 1.5;
+    /*return 256.f/pow(2.f, (1.f/60.f)*i);*/
 }
 
 
-void pitchdnn_init(PitchDNNState *st)
-{
-  int ret;
-  OAC_CLEAR(st, 1);
+void pitchdnn_init(PitchDNNState *st) {
+    int ret;
+    OAC_CLEAR(st, 1);
 #ifndef USE_WEIGHTS_FILE
-  ret = init_pitchdnn(&st->model, pitchdnn_arrays);
+    ret = init_pitchdnn(&st->model, pitchdnn_arrays);
 #else
-  ret = 0;
+    ret = 0;
 #endif
-  celt_assert(ret == 0);
+    celt_assert(ret == 0);
 }
 
 int pitchdnn_load_model(PitchDNNState *st, const void *data, int len) {
-  WeightArray *list;
-  int ret;
-  parse_weights(&list, data, len);
-  ret = init_pitchdnn(&st->model, list);
-  oac_free(list);
-  if (ret == 0) return 0;
-  else return -1;
+    WeightArray *list;
+    int ret;
+    parse_weights(&list, data, len);
+    ret = init_pitchdnn(&st->model, list);
+    oac_free(list);
+    if (ret == 0) return 0;
+    else return -1;
 }
diff --git a/dnn/pitchdnn.h b/dnn/pitchdnn.h
index 25fa3a4b0..108a47db6 100644
--- a/dnn/pitchdnn.h
+++ b/dnn/pitchdnn.h
@@ -9,15 +9,15 @@ typedef struct PitchDNN PitchDNN;
 #define PITCH_MIN_PERIOD 32
 #define PITCH_MAX_PERIOD 256
 
-#define NB_XCORR_FEATURES (PITCH_MAX_PERIOD-PITCH_MIN_PERIOD)
+#define NB_XCORR_FEATURES (PITCH_MAX_PERIOD - PITCH_MIN_PERIOD)
 
 
 typedef struct {
-  PitchDNN model;
-  float gru_state[GRU_1_STATE_SIZE];
-  float xcorr_mem1[(NB_XCORR_FEATURES + 2)*2];
-  float xcorr_mem2[(NB_XCORR_FEATURES + 2)*2*8];
-  float xcorr_mem3[(NB_XCORR_FEATURES + 2)*2*8];
+    PitchDNN model;
+    float gru_state[GRU_1_STATE_SIZE];
+    float xcorr_mem1[(NB_XCORR_FEATURES + 2)*2];
+    float xcorr_mem2[(NB_XCORR_FEATURES + 2)*2*8];
+    float xcorr_mem3[(NB_XCORR_FEATURES + 2)*2*8];
 } PitchDNNState;
 
 
@@ -28,7 +28,6 @@ float compute_pitchdnn(
     PitchDNNState *st,
     const float *if_features,
     const float *xcorr_features,
-    int arch
-    );
+    int arch);
 
 #endif
diff --git a/dnn/tansig_table.h b/dnn/tansig_table.h
index ebec7e3a9..39eb10705 100644
--- a/dnn/tansig_table.h
+++ b/dnn/tansig_table.h
@@ -4,47 +4,47 @@
 #define TANSIG_TABLE_H
 
 static const float tansig_table[201] = {
-0.000000f, 0.039979f, 0.079830f, 0.119427f, 0.158649f,
-0.197375f, 0.235496f, 0.272905f, 0.309507f, 0.345214f,
-0.379949f, 0.413644f, 0.446244f, 0.477700f, 0.507977f,
-0.537050f, 0.564900f, 0.591519f, 0.616909f, 0.641077f,
-0.664037f, 0.685809f, 0.706419f, 0.725897f, 0.744277f,
-0.761594f, 0.777888f, 0.793199f, 0.807569f, 0.821040f,
-0.833655f, 0.845456f, 0.856485f, 0.866784f, 0.876393f,
-0.885352f, 0.893698f, 0.901468f, 0.908698f, 0.915420f,
-0.921669f, 0.927473f, 0.932862f, 0.937863f, 0.942503f,
-0.946806f, 0.950795f, 0.954492f, 0.957917f, 0.961090f,
-0.964028f, 0.966747f, 0.969265f, 0.971594f, 0.973749f,
-0.975743f, 0.977587f, 0.979293f, 0.980869f, 0.982327f,
-0.983675f, 0.984921f, 0.986072f, 0.987136f, 0.988119f,
-0.989027f, 0.989867f, 0.990642f, 0.991359f, 0.992020f,
-0.992631f, 0.993196f, 0.993718f, 0.994199f, 0.994644f,
-0.995055f, 0.995434f, 0.995784f, 0.996108f, 0.996407f,
-0.996682f, 0.996937f, 0.997172f, 0.997389f, 0.997590f,
-0.997775f, 0.997946f, 0.998104f, 0.998249f, 0.998384f,
-0.998508f, 0.998623f, 0.998728f, 0.998826f, 0.998916f,
-0.999000f, 0.999076f, 0.999147f, 0.999213f, 0.999273f,
-0.999329f, 0.999381f, 0.999428f, 0.999472f, 0.999513f,
-0.999550f, 0.999585f, 0.999617f, 0.999646f, 0.999673f,
-0.999699f, 0.999722f, 0.999743f, 0.999763f, 0.999781f,
-0.999798f, 0.999813f, 0.999828f, 0.999841f, 0.999853f,
-0.999865f, 0.999875f, 0.999885f, 0.999893f, 0.999902f,
-0.999909f, 0.999916f, 0.999923f, 0.999929f, 0.999934f,
-0.999939f, 0.999944f, 0.999948f, 0.999952f, 0.999956f,
-0.999959f, 0.999962f, 0.999965f, 0.999968f, 0.999970f,
-0.999973f, 0.999975f, 0.999977f, 0.999978f, 0.999980f,
-0.999982f, 0.999983f, 0.999984f, 0.999986f, 0.999987f,
-0.999988f, 0.999989f, 0.999990f, 0.999990f, 0.999991f,
-0.999992f, 0.999992f, 0.999993f, 0.999994f, 0.999994f,
-0.999994f, 0.999995f, 0.999995f, 0.999996f, 0.999996f,
-0.999996f, 0.999997f, 0.999997f, 0.999997f, 0.999997f,
-0.999997f, 0.999998f, 0.999998f, 0.999998f, 0.999998f,
-0.999998f, 0.999998f, 0.999999f, 0.999999f, 0.999999f,
-0.999999f, 0.999999f, 0.999999f, 0.999999f, 0.999999f,
-0.999999f, 0.999999f, 0.999999f, 0.999999f, 0.999999f,
-1.000000f, 1.000000f, 1.000000f, 1.000000f, 1.000000f,
-1.000000f, 1.000000f, 1.000000f, 1.000000f, 1.000000f,
-1.000000f,
+    0.000000f, 0.039979f, 0.079830f, 0.119427f, 0.158649f,
+    0.197375f, 0.235496f, 0.272905f, 0.309507f, 0.345214f,
+    0.379949f, 0.413644f, 0.446244f, 0.477700f, 0.507977f,
+    0.537050f, 0.564900f, 0.591519f, 0.616909f, 0.641077f,
+    0.664037f, 0.685809f, 0.706419f, 0.725897f, 0.744277f,
+    0.761594f, 0.777888f, 0.793199f, 0.807569f, 0.821040f,
+    0.833655f, 0.845456f, 0.856485f, 0.866784f, 0.876393f,
+    0.885352f, 0.893698f, 0.901468f, 0.908698f, 0.915420f,
+    0.921669f, 0.927473f, 0.932862f, 0.937863f, 0.942503f,
+    0.946806f, 0.950795f, 0.954492f, 0.957917f, 0.961090f,
+    0.964028f, 0.966747f, 0.969265f, 0.971594f, 0.973749f,
+    0.975743f, 0.977587f, 0.979293f, 0.980869f, 0.982327f,
+    0.983675f, 0.984921f, 0.986072f, 0.987136f, 0.988119f,
+    0.989027f, 0.989867f, 0.990642f, 0.991359f, 0.992020f,
+    0.992631f, 0.993196f, 0.993718f, 0.994199f, 0.994644f,
+    0.995055f, 0.995434f, 0.995784f, 0.996108f, 0.996407f,
+    0.996682f, 0.996937f, 0.997172f, 0.997389f, 0.997590f,
+    0.997775f, 0.997946f, 0.998104f, 0.998249f, 0.998384f,
+    0.998508f, 0.998623f, 0.998728f, 0.998826f, 0.998916f,
+    0.999000f, 0.999076f, 0.999147f, 0.999213f, 0.999273f,
+    0.999329f, 0.999381f, 0.999428f, 0.999472f, 0.999513f,
+    0.999550f, 0.999585f, 0.999617f, 0.999646f, 0.999673f,
+    0.999699f, 0.999722f, 0.999743f, 0.999763f, 0.999781f,
+    0.999798f, 0.999813f, 0.999828f, 0.999841f, 0.999853f,
+    0.999865f, 0.999875f, 0.999885f, 0.999893f, 0.999902f,
+    0.999909f, 0.999916f, 0.999923f, 0.999929f, 0.999934f,
+    0.999939f, 0.999944f, 0.999948f, 0.999952f, 0.999956f,
+    0.999959f, 0.999962f, 0.999965f, 0.999968f, 0.999970f,
+    0.999973f, 0.999975f, 0.999977f, 0.999978f, 0.999980f,
+    0.999982f, 0.999983f, 0.999984f, 0.999986f, 0.999987f,
+    0.999988f, 0.999989f, 0.999990f, 0.999990f, 0.999991f,
+    0.999992f, 0.999992f, 0.999993f, 0.999994f, 0.999994f,
+    0.999994f, 0.999995f, 0.999995f, 0.999996f, 0.999996f,
+    0.999996f, 0.999997f, 0.999997f, 0.999997f, 0.999997f,
+    0.999997f, 0.999998f, 0.999998f, 0.999998f, 0.999998f,
+    0.999998f, 0.999998f, 0.999999f, 0.999999f, 0.999999f,
+    0.999999f, 0.999999f, 0.999999f, 0.999999f, 0.999999f,
+    0.999999f, 0.999999f, 0.999999f, 0.999999f, 0.999999f,
+    1.000000f, 1.000000f, 1.000000f, 1.000000f, 1.000000f,
+    1.000000f, 1.000000f, 1.000000f, 1.000000f, 1.000000f,
+    1.000000f,
 };
 
 #endif /*TANSIG_TABLE_H*/
diff --git a/dnn/test_vec.c b/dnn/test_vec.c
index df8f1776b..aaaaadf8e 100644
--- a/dnn/test_vec.c
+++ b/dnn/test_vec.c
@@ -20,17 +20,17 @@
 #define sparse_sgemv_accum16 sparse_sgemv_accum16_fast
 
 #ifdef __AVX__
-#include "vec_avx.h"
-#ifdef __AVX2__
-const char simd[]="AVX2";
-#else
-const char simd[]="AVX";
-#endif
+# include "vec_avx.h"
+# ifdef __AVX2__
+const char simd[] = "AVX2";
+# else
+const char simd[] = "AVX";
+# endif
 #elif __ARM_NEON__
-#include "vec_neon.h"
-const char simd[]="NEON";
+# include "vec_neon.h"
+const char simd[] = "NEON";
 #else
-const char simd[]="none";
+const char simd[] = "none";
 
 #endif
 
@@ -56,30 +56,30 @@ int test_sgemv_accum16() {
     int i;
 
     printf("sgemv_accum16.....................: ");
-    for(i=0; i<ROWS*COLS; i++) {
-	weights[i] = i;
+    for (i = 0; i < ROWS*COLS; i++) {
+        weights[i] = i;
     }
-    for(i=0; i<ROWS; i++) {
-	out[i] = 0;
-	out_fast[i] = 0;
+    for (i = 0; i < ROWS; i++) {
+        out[i] = 0;
+        out_fast[i] = 0;
     }
 
-    for(i=0; i<COLS; i++) {
-	x[i] = i+1;
+    for (i = 0; i < COLS; i++) {
+        x[i] = i + 1;
     }
 
     sgemv_accum16(out, weights, ROWS, COLS, 1, x);
     sgemv_accum16_fast(out_fast, weights, ROWS, COLS, 1, x);
 
-    for(i=0; i<ROWS; i++) {
-	if (out[i] != out_fast[i]) {
-	    printf("fail\n");
-	    for(i=0; i<ROWS; i++) {
-		printf("%d %f %f\n", i, out[i], out_fast[i]);
-		if (out[i] != out_fast[i])
-		    return 1;
-	    }
-	}
+    for (i = 0; i < ROWS; i++) {
+        if (out[i] != out_fast[i]) {
+            printf("fail\n");
+            for (i = 0; i < ROWS; i++) {
+                printf("%d %f %f\n", i, out[i], out_fast[i]);
+                if (out[i] != out_fast[i])
+                    return 1;
+            }
+        }
     }
 
     printf("pass\n");
@@ -89,31 +89,31 @@ int test_sgemv_accum16() {
 
 int test_sparse_sgemv_accum16() {
     int rows = ROW_STEP*ENTRIES;
-    int indx[] = {1,0,2,0,1};
-    float w[ROW_STEP*(1+2)];
-    float x[ENTRIES] = {1,2};
-    float out[ROW_STEP*(1+2)], out_fast[ROW_STEP*(1+2)];
+    int indx[] = {1, 0, 2, 0, 1};
+    float w[ROW_STEP*(1 + 2)];
+    float x[ENTRIES] = {1, 2};
+    float out[ROW_STEP*(1 + 2)], out_fast[ROW_STEP*(1 + 2)];
     int i;
 
     printf("sparse_sgemv_accum16..............: ");
-    for(i=0; i<ROW_STEP*(1+2); i++) {
-	w[i] = i;
-	out[i] = 0;
-	out_fast[i] = 0;
+    for (i = 0; i < ROW_STEP*(1 + 2); i++) {
+        w[i] = i;
+        out[i] = 0;
+        out_fast[i] = 0;
     }
 
     sparse_sgemv_accum16(out, w, rows, indx, x);
     sparse_sgemv_accum16_fast(out_fast, w, rows, indx, x);
 
-    for(i=0; i<ROW_STEP*ENTRIES; i++) {
-	if (out[i] != out_fast[i]) {
-	    printf("fail\n");
-	    for(i=0; i<ROW_STEP*ENTRIES; i++) {
-		printf("%d %f %f\n", i, out[i], out_fast[i]);
-		if (out[i] != out_fast[i])
-		    return 1;
-	    }
-	}
+    for (i = 0; i < ROW_STEP*ENTRIES; i++) {
+        if (out[i] != out_fast[i]) {
+            printf("fail\n");
+            for (i = 0; i < ROW_STEP*ENTRIES; i++) {
+                printf("%d %f %f\n", i, out[i], out_fast[i]);
+                if (out[i] != out_fast[i])
+                    return 1;
+            }
+        }
     }
 
     printf("pass\n");
diff --git a/dnn/torch/rdovae/packets/fec_packets.c b/dnn/torch/rdovae/packets/fec_packets.c
index ee08ba95c..089092549 100644
--- a/dnn/torch/rdovae/packets/fec_packets.c
+++ b/dnn/torch/rdovae/packets/fec_packets.c
@@ -23,15 +23,14 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #include <stdio.h>
 #include <inttypes.h>
 
 #include "fec_packets.h"
 
-int get_fec_frame(const char * const filename, float *features, int packet_index, int subframe_index)
-{
+int get_fec_frame(const char * const filename, float *features, int packet_index, int subframe_index) {
 
     int16_t version;
     int16_t header_size;
@@ -54,14 +53,13 @@ int get_fec_frame(const char * const filename, float *features, int packet_index
     if (fread(&num_features, sizeof(num_features), 1, fid) != 1) goto error;
 
     /* check if indices are valid */
-    if (packet_index >= num_packets || subframe_index >= subframes_per_packet)
-    {
+    if (packet_index >= num_packets || subframe_index >= subframes_per_packet) {
         fprintf(stderr, "get_fec_frame: index out of bounds\n");
         goto error;
     }
 
     /* calculate offset in file (+ 2 is for rate) */
-    offset = header_size + packet_index * packet_size + 2 + subframe_index * subframe_size;
+    offset = header_size + packet_index*packet_size + 2 + subframe_index*subframe_size;
     fseek(fid, offset, SEEK_SET);
 
     /* read features */
@@ -75,8 +73,7 @@ int get_fec_frame(const char * const filename, float *features, int packet_index
     return 1;
 }
 
-int get_fec_rate(const char * const filename, int packet_index)
-{
+int get_fec_rate(const char * const filename, int packet_index) {
     int16_t version;
     int16_t header_size;
     int16_t num_packets;
@@ -99,14 +96,13 @@ int get_fec_rate(const char * const filename, int packet_index)
     if (fread(&num_features, sizeof(num_features), 1, fid) != 1) goto error;
 
     /* check if indices are valid */
-    if (packet_index >= num_packets)
-    {
+    if (packet_index >= num_packets) {
         fprintf(stderr, "get_fec_rate: index out of bounds\n");
         goto error;
     }
 
     /* calculate offset in file (+ 2 is for rate) */
-    offset = header_size + packet_index * packet_size;
+    offset = header_size + packet_index*packet_size;
     fseek(fid, offset, SEEK_SET);
 
     /* read rate */
@@ -121,18 +117,15 @@ int get_fec_rate(const char * const filename, int packet_index)
 }
 
 #if 0
-int main()
-{
+int main() {
     float features[20];
     int i;
 
-    if (get_fec_frame("../test.fec", &features[0], 0, 127))
-    {
+    if (get_fec_frame("../test.fec", &features[0], 0, 127)) {
         return 1;
     }
 
-    for (i = 0; i < 20; i ++)
-    {
+    for (i = 0; i < 20; i++) {
         printf("%d %f\n", i, features[i]);
     }
 
diff --git a/dnn/torch/rdovae/packets/fec_packets.h b/dnn/torch/rdovae/packets/fec_packets.h
index 35d355428..a268c6c3c 100644
--- a/dnn/torch/rdovae/packets/fec_packets.h
+++ b/dnn/torch/rdovae/packets/fec_packets.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef _FEC_PACKETS_H
 #define _FEC_PACKETS_H
diff --git a/dnn/vec.h b/dnn/vec.h
index 9817dd5da..e6c22e26d 100644
--- a/dnn/vec.h
+++ b/dnn/vec.h
@@ -24,7 +24,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef VEC_H
 #define VEC_H
@@ -36,307 +36,284 @@
 
 
 #if defined(__AVX__) || defined(__SSE2__)
-#include "vec_avx.h"
+# include "vec_avx.h"
 #elif (defined(__ARM_NEON__) || defined(__ARM_NEON)) && !defined(DISABLE_NEON)
-#include "vec_neon.h"
+# include "vec_neon.h"
 #else
 
-#include "os_support.h"
+# include "os_support.h"
 
-#define MAX_INPUTS (2048)
+# define MAX_INPUTS (2048)
 
-#define NO_OPTIMIZATIONS
+# define NO_OPTIMIZATIONS
 
-static inline void sgemv16x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x)
-{
-   int i, j;
-   OAC_CLEAR(out, rows);
-   for (i=0;i<rows;i+=16)
-   {
-      for (j=0;j<cols;j++)
-      {
-         const float * restrict w;
-         float * restrict y;
-         float xj;
-         w = &weights[j*col_stride + i];
-         xj = x[j];
-         y = &out[i];
-         y[0] += w[0]*xj;
-         y[1] += w[1]*xj;
-         y[2] += w[2]*xj;
-         y[3] += w[3]*xj;
-         y[4] += w[4]*xj;
-         y[5] += w[5]*xj;
-         y[6] += w[6]*xj;
-         y[7] += w[7]*xj;
-         y[8] += w[8]*xj;
-         y[9] += w[9]*xj;
-         y[10] += w[10]*xj;
-         y[11] += w[11]*xj;
-         y[12] += w[12]*xj;
-         y[13] += w[13]*xj;
-         y[14] += w[14]*xj;
-         y[15] += w[15]*xj;
-      }
-   }
+static inline void sgemv16x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x) {
+    int i, j;
+    OAC_CLEAR(out, rows);
+    for (i = 0; i < rows; i += 16) {
+        for (j = 0; j < cols; j++) {
+            const float * restrict w;
+            float * restrict y;
+            float xj;
+            w = &weights[j*col_stride + i];
+            xj = x[j];
+            y = &out[i];
+            y[0] += w[0]*xj;
+            y[1] += w[1]*xj;
+            y[2] += w[2]*xj;
+            y[3] += w[3]*xj;
+            y[4] += w[4]*xj;
+            y[5] += w[5]*xj;
+            y[6] += w[6]*xj;
+            y[7] += w[7]*xj;
+            y[8] += w[8]*xj;
+            y[9] += w[9]*xj;
+            y[10] += w[10]*xj;
+            y[11] += w[11]*xj;
+            y[12] += w[12]*xj;
+            y[13] += w[13]*xj;
+            y[14] += w[14]*xj;
+            y[15] += w[15]*xj;
+        }
+    }
 }
 
-static inline void sgemv8x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x)
-{
-   int i, j;
-   OAC_CLEAR(out, rows);
-   for (i=0;i<rows;i+=8)
-   {
-      for (j=0;j<cols;j++)
-      {
-         const float * restrict w;
-         float * restrict y;
-         float xj;
-         w = &weights[j*col_stride + i];
-         xj = x[j];
-         y = &out[i];
-         y[0] += w[0]*xj;
-         y[1] += w[1]*xj;
-         y[2] += w[2]*xj;
-         y[3] += w[3]*xj;
-         y[4] += w[4]*xj;
-         y[5] += w[5]*xj;
-         y[6] += w[6]*xj;
-         y[7] += w[7]*xj;
-      }
-   }
+static inline void sgemv8x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x) {
+    int i, j;
+    OAC_CLEAR(out, rows);
+    for (i = 0; i < rows; i += 8) {
+        for (j = 0; j < cols; j++) {
+            const float * restrict w;
+            float * restrict y;
+            float xj;
+            w = &weights[j*col_stride + i];
+            xj = x[j];
+            y = &out[i];
+            y[0] += w[0]*xj;
+            y[1] += w[1]*xj;
+            y[2] += w[2]*xj;
+            y[3] += w[3]*xj;
+            y[4] += w[4]*xj;
+            y[5] += w[5]*xj;
+            y[6] += w[6]*xj;
+            y[7] += w[7]*xj;
+        }
+    }
 }
 
-static inline void sgemv(float *out, const float *weights, int rows, int cols, int col_stride, const float *x)
-{
-   if ((rows&0xf) == 0) sgemv16x1(out, weights, rows, cols, col_stride, x);
-   else if ((rows&0x7) == 0) sgemv8x1(out, weights, rows, cols, col_stride, x);
-   else {
-      int i, j;
-      for (i=0;i<rows;i++)
-      {
-         out[i] = 0;
-         for (j=0;j<cols;j++) out[i] += weights[j*col_stride + i]*x[j];
-      }
-   }
+static inline void sgemv(float *out, const float *weights, int rows, int cols, int col_stride, const float *x) {
+    if ((rows&0xf) == 0) sgemv16x1(out, weights, rows, cols, col_stride, x);
+    else if ((rows&0x7) == 0) sgemv8x1(out, weights, rows, cols, col_stride, x);
+    else {
+        int i, j;
+        for (i = 0; i < rows; i++) {
+            out[i] = 0;
+            for (j = 0; j < cols; j++) out[i] += weights[j*col_stride + i]*x[j];
+        }
+    }
 }
 
-static inline void sparse_sgemv8x4(float *out, const float *w, const int *idx, int rows, const float *x)
-{
-   int i, j;
-   OAC_CLEAR(out, rows);
-   for (i=0;i<rows;i+=8)
-   {
-      int cols;
-      cols = *idx++;
-      for (j=0;j<cols;j++)
-      {
-         int pos;
-         float * restrict y;
-         float xj0, xj1, xj2, xj3;
-         pos = (*idx++);
-         xj0 = x[pos+0];
-         xj1 = x[pos+1];
-         xj2 = x[pos+2];
-         xj3 = x[pos+3];
-         y = &out[i];
-         y[0] += w[0]*xj0;
-         y[1] += w[1]*xj0;
-         y[2] += w[2]*xj0;
-         y[3] += w[3]*xj0;
-         y[4] += w[4]*xj0;
-         y[5] += w[5]*xj0;
-         y[6] += w[6]*xj0;
-         y[7] += w[7]*xj0;
+static inline void sparse_sgemv8x4(float *out, const float *w, const int *idx, int rows, const float *x) {
+    int i, j;
+    OAC_CLEAR(out, rows);
+    for (i = 0; i < rows; i += 8) {
+        int cols;
+        cols = *idx++;
+        for (j = 0; j < cols; j++) {
+            int pos;
+            float * restrict y;
+            float xj0, xj1, xj2, xj3;
+            pos = (*idx++);
+            xj0 = x[pos + 0];
+            xj1 = x[pos + 1];
+            xj2 = x[pos + 2];
+            xj3 = x[pos + 3];
+            y = &out[i];
+            y[0] += w[0]*xj0;
+            y[1] += w[1]*xj0;
+            y[2] += w[2]*xj0;
+            y[3] += w[3]*xj0;
+            y[4] += w[4]*xj0;
+            y[5] += w[5]*xj0;
+            y[6] += w[6]*xj0;
+            y[7] += w[7]*xj0;
 
-         y[0] += w[8]*xj1;
-         y[1] += w[9]*xj1;
-         y[2] += w[10]*xj1;
-         y[3] += w[11]*xj1;
-         y[4] += w[12]*xj1;
-         y[5] += w[13]*xj1;
-         y[6] += w[14]*xj1;
-         y[7] += w[15]*xj1;
+            y[0] += w[8]*xj1;
+            y[1] += w[9]*xj1;
+            y[2] += w[10]*xj1;
+            y[3] += w[11]*xj1;
+            y[4] += w[12]*xj1;
+            y[5] += w[13]*xj1;
+            y[6] += w[14]*xj1;
+            y[7] += w[15]*xj1;
 
-         y[0] += w[16]*xj2;
-         y[1] += w[17]*xj2;
-         y[2] += w[18]*xj2;
-         y[3] += w[19]*xj2;
-         y[4] += w[20]*xj2;
-         y[5] += w[21]*xj2;
-         y[6] += w[22]*xj2;
-         y[7] += w[23]*xj2;
+            y[0] += w[16]*xj2;
+            y[1] += w[17]*xj2;
+            y[2] += w[18]*xj2;
+            y[3] += w[19]*xj2;
+            y[4] += w[20]*xj2;
+            y[5] += w[21]*xj2;
+            y[6] += w[22]*xj2;
+            y[7] += w[23]*xj2;
 
-         y[0] += w[24]*xj3;
-         y[1] += w[25]*xj3;
-         y[2] += w[26]*xj3;
-         y[3] += w[27]*xj3;
-         y[4] += w[28]*xj3;
-         y[5] += w[29]*xj3;
-         y[6] += w[30]*xj3;
-         y[7] += w[31]*xj3;
-         w += 32;
-      }
-   }
+            y[0] += w[24]*xj3;
+            y[1] += w[25]*xj3;
+            y[2] += w[26]*xj3;
+            y[3] += w[27]*xj3;
+            y[4] += w[28]*xj3;
+            y[5] += w[29]*xj3;
+            y[6] += w[30]*xj3;
+            y[7] += w[31]*xj3;
+            w += 32;
+        }
+    }
 }
 
-#ifdef USE_SU_BIAS
-static inline void sparse_cgemv8x4(float *out, const oac_int8 *w, const int *idx, const float *scale, int rows, int cols, const float *_x)
-{
-   int i, j;
-   unsigned char x[MAX_INPUTS];
-   for (i=0;i<rows;i++) out[i] = 0;
-   for (i=0;i<cols;i++) x[i] = 127+floor(.5+127*_x[i]);
-   for (i=0;i<rows;i+=8)
-   {
-      int colblocks;
-      colblocks = *idx++;
-      for (j=0;j<colblocks;j++)
-      {
-         int pos;
-         float * restrict y;
-         int xj0, xj1, xj2, xj3;
-         pos = (*idx++);
-         xj0 = x[pos+0];
-         xj1 = x[pos+1];
-         xj2 = x[pos+2];
-         xj3 = x[pos+3];
-         y = &out[i];
-         y[0] += (w[0]*xj0+w[1]*xj1+w[2]*xj2+w[3]*xj3);
-         y[1] += (w[4]*xj0+w[5]*xj1+w[6]*xj2+w[7]*xj3);
-         y[2] += (w[8]*xj0+w[9]*xj1+w[10]*xj2+w[11]*xj3);
-         y[3] += (w[12]*xj0+w[13]*xj1+w[14]*xj2+w[15]*xj3);
-         y[4] += (w[16]*xj0+w[17]*xj1+w[18]*xj2+w[19]*xj3);
-         y[5] += (w[20]*xj0+w[21]*xj1+w[22]*xj2+w[23]*xj3);
-         y[6] += (w[24]*xj0+w[25]*xj1+w[26]*xj2+w[27]*xj3);
-         y[7] += (w[28]*xj0+w[29]*xj1+w[30]*xj2+w[31]*xj3);
-         w += 32;
-      }
-   }
-   for (i=0;i<rows;i++) out[i] *= scale[i];
+# ifdef USE_SU_BIAS
+static inline void sparse_cgemv8x4(float *out, const oac_int8 *w, const int *idx, const float *scale, int rows,
+                                   int cols, const float *_x) {
+    int i, j;
+    unsigned char x[MAX_INPUTS];
+    for (i = 0; i < rows; i++) out[i] = 0;
+    for (i = 0; i < cols; i++) x[i] = 127 + floor(.5 + 127*_x[i]);
+    for (i = 0; i < rows; i += 8) {
+        int colblocks;
+        colblocks = *idx++;
+        for (j = 0; j < colblocks; j++) {
+            int pos;
+            float * restrict y;
+            int xj0, xj1, xj2, xj3;
+            pos = (*idx++);
+            xj0 = x[pos + 0];
+            xj1 = x[pos + 1];
+            xj2 = x[pos + 2];
+            xj3 = x[pos + 3];
+            y = &out[i];
+            y[0] += (w[0]*xj0 + w[1]*xj1 + w[2]*xj2 + w[3]*xj3);
+            y[1] += (w[4]*xj0 + w[5]*xj1 + w[6]*xj2 + w[7]*xj3);
+            y[2] += (w[8]*xj0 + w[9]*xj1 + w[10]*xj2 + w[11]*xj3);
+            y[3] += (w[12]*xj0 + w[13]*xj1 + w[14]*xj2 + w[15]*xj3);
+            y[4] += (w[16]*xj0 + w[17]*xj1 + w[18]*xj2 + w[19]*xj3);
+            y[5] += (w[20]*xj0 + w[21]*xj1 + w[22]*xj2 + w[23]*xj3);
+            y[6] += (w[24]*xj0 + w[25]*xj1 + w[26]*xj2 + w[27]*xj3);
+            y[7] += (w[28]*xj0 + w[29]*xj1 + w[30]*xj2 + w[31]*xj3);
+            w += 32;
+        }
+    }
+    for (i = 0; i < rows; i++) out[i] *= scale[i];
 }
-static inline void cgemv8x4(float *out, const oac_int8 *w, const float *scale, int rows, int cols, const float *_x)
-{
-   int i, j;
-   unsigned char x[MAX_INPUTS];
-   for (i=0;i<rows;i++) out[i] = 0;
-   for (i=0;i<cols;i++) x[i] = 127+(int)floor(.5+127*_x[i]);
-   for (i=0;i<rows;i+=8)
-   {
-      for (j=0;j<cols;j+=4)
-      {
-         float *y;
-         float xj0, xj1, xj2, xj3;
-         xj0 = x[j+0];
-         xj1 = x[j+1];
-         xj2 = x[j+2];
-         xj3 = x[j+3];
-         y = &out[i];
-         y[0] += (w[0]*xj0+w[1]*xj1+w[2]*xj2+w[3]*xj3);
-         y[1] += (w[4]*xj0+w[5]*xj1+w[6]*xj2+w[7]*xj3);
-         y[2] += (w[8]*xj0+w[9]*xj1+w[10]*xj2+w[11]*xj3);
-         y[3] += (w[12]*xj0+w[13]*xj1+w[14]*xj2+w[15]*xj3);
-         y[4] += (w[16]*xj0+w[17]*xj1+w[18]*xj2+w[19]*xj3);
-         y[5] += (w[20]*xj0+w[21]*xj1+w[22]*xj2+w[23]*xj3);
-         y[6] += (w[24]*xj0+w[25]*xj1+w[26]*xj2+w[27]*xj3);
-         y[7] += (w[28]*xj0+w[29]*xj1+w[30]*xj2+w[31]*xj3);
-         w += 32;
-      }
-   }
-   for (i=0;i<rows;i++) out[i] *= scale[i];
+static inline void cgemv8x4(float *out, const oac_int8 *w, const float *scale, int rows, int cols, const float *_x) {
+    int i, j;
+    unsigned char x[MAX_INPUTS];
+    for (i = 0; i < rows; i++) out[i] = 0;
+    for (i = 0; i < cols; i++) x[i] = 127 + (int)floor(.5 + 127*_x[i]);
+    for (i = 0; i < rows; i += 8) {
+        for (j = 0; j < cols; j += 4) {
+            float *y;
+            float xj0, xj1, xj2, xj3;
+            xj0 = x[j + 0];
+            xj1 = x[j + 1];
+            xj2 = x[j + 2];
+            xj3 = x[j + 3];
+            y = &out[i];
+            y[0] += (w[0]*xj0 + w[1]*xj1 + w[2]*xj2 + w[3]*xj3);
+            y[1] += (w[4]*xj0 + w[5]*xj1 + w[6]*xj2 + w[7]*xj3);
+            y[2] += (w[8]*xj0 + w[9]*xj1 + w[10]*xj2 + w[11]*xj3);
+            y[3] += (w[12]*xj0 + w[13]*xj1 + w[14]*xj2 + w[15]*xj3);
+            y[4] += (w[16]*xj0 + w[17]*xj1 + w[18]*xj2 + w[19]*xj3);
+            y[5] += (w[20]*xj0 + w[21]*xj1 + w[22]*xj2 + w[23]*xj3);
+            y[6] += (w[24]*xj0 + w[25]*xj1 + w[26]*xj2 + w[27]*xj3);
+            y[7] += (w[28]*xj0 + w[29]*xj1 + w[30]*xj2 + w[31]*xj3);
+            w += 32;
+        }
+    }
+    for (i = 0; i < rows; i++) out[i] *= scale[i];
 }
-#else
-static inline void sparse_cgemv8x4(float *out, const oac_int8 *w, const int *idx, const float *scale, int rows, int cols, const float *_x)
-{
-   int i, j;
-   oac_int8 x[MAX_INPUTS];
-   for (i=0;i<rows;i++) out[i] = 0;
-   for (i=0;i<cols;i++) x[i] = (int)floor(.5+127*_x[i]);
-   for (i=0;i<rows;i+=8)
-   {
-      int colblocks;
-      colblocks = *idx++;
-      for (j=0;j<colblocks;j++)
-      {
-         int pos;
-         float * restrict y;
-         int xj0, xj1, xj2, xj3;
-         pos = (*idx++);
-         xj0 = x[pos+0];
-         xj1 = x[pos+1];
-         xj2 = x[pos+2];
-         xj3 = x[pos+3];
-         y = &out[i];
-         y[0] += (w[0]*xj0+w[1]*xj1+w[2]*xj2+w[3]*xj3);
-         y[1] += (w[4]*xj0+w[5]*xj1+w[6]*xj2+w[7]*xj3);
-         y[2] += (w[8]*xj0+w[9]*xj1+w[10]*xj2+w[11]*xj3);
-         y[3] += (w[12]*xj0+w[13]*xj1+w[14]*xj2+w[15]*xj3);
-         y[4] += (w[16]*xj0+w[17]*xj1+w[18]*xj2+w[19]*xj3);
-         y[5] += (w[20]*xj0+w[21]*xj1+w[22]*xj2+w[23]*xj3);
-         y[6] += (w[24]*xj0+w[25]*xj1+w[26]*xj2+w[27]*xj3);
-         y[7] += (w[28]*xj0+w[29]*xj1+w[30]*xj2+w[31]*xj3);
-         w += 32;
-      }
-   }
-   for (i=0;i<rows;i++) out[i] *= scale[i];
+# else
+static inline void sparse_cgemv8x4(float *out, const oac_int8 *w, const int *idx, const float *scale, int rows,
+                                   int cols, const float *_x) {
+    int i, j;
+    oac_int8 x[MAX_INPUTS];
+    for (i = 0; i < rows; i++) out[i] = 0;
+    for (i = 0; i < cols; i++) x[i] = (int)floor(.5 + 127*_x[i]);
+    for (i = 0; i < rows; i += 8) {
+        int colblocks;
+        colblocks = *idx++;
+        for (j = 0; j < colblocks; j++) {
+            int pos;
+            float * restrict y;
+            int xj0, xj1, xj2, xj3;
+            pos = (*idx++);
+            xj0 = x[pos + 0];
+            xj1 = x[pos + 1];
+            xj2 = x[pos + 2];
+            xj3 = x[pos + 3];
+            y = &out[i];
+            y[0] += (w[0]*xj0 + w[1]*xj1 + w[2]*xj2 + w[3]*xj3);
+            y[1] += (w[4]*xj0 + w[5]*xj1 + w[6]*xj2 + w[7]*xj3);
+            y[2] += (w[8]*xj0 + w[9]*xj1 + w[10]*xj2 + w[11]*xj3);
+            y[3] += (w[12]*xj0 + w[13]*xj1 + w[14]*xj2 + w[15]*xj3);
+            y[4] += (w[16]*xj0 + w[17]*xj1 + w[18]*xj2 + w[19]*xj3);
+            y[5] += (w[20]*xj0 + w[21]*xj1 + w[22]*xj2 + w[23]*xj3);
+            y[6] += (w[24]*xj0 + w[25]*xj1 + w[26]*xj2 + w[27]*xj3);
+            y[7] += (w[28]*xj0 + w[29]*xj1 + w[30]*xj2 + w[31]*xj3);
+            w += 32;
+        }
+    }
+    for (i = 0; i < rows; i++) out[i] *= scale[i];
 }
-static inline void cgemv8x4(float *out, const oac_int8 *w, const float *scale, int rows, int cols, const float *_x)
-{
-   int i, j;
-   oac_int8 x[MAX_INPUTS];
-   for (i=0;i<rows;i++) out[i] = 0;
-   for (i=0;i<cols;i++) x[i] = (int)floor(.5+127*_x[i]);
-   for (i=0;i<rows;i+=8)
-   {
-      for (j=0;j<cols;j+=4)
-      {
-         float *y;
-         float xj0, xj1, xj2, xj3;
-         xj0 = x[j+0];
-         xj1 = x[j+1];
-         xj2 = x[j+2];
-         xj3 = x[j+3];
-         y = &out[i];
-         y[0] += (w[0]*xj0+w[1]*xj1+w[2]*xj2+w[3]*xj3);
-         y[1] += (w[4]*xj0+w[5]*xj1+w[6]*xj2+w[7]*xj3);
-         y[2] += (w[8]*xj0+w[9]*xj1+w[10]*xj2+w[11]*xj3);
-         y[3] += (w[12]*xj0+w[13]*xj1+w[14]*xj2+w[15]*xj3);
-         y[4] += (w[16]*xj0+w[17]*xj1+w[18]*xj2+w[19]*xj3);
-         y[5] += (w[20]*xj0+w[21]*xj1+w[22]*xj2+w[23]*xj3);
-         y[6] += (w[24]*xj0+w[25]*xj1+w[26]*xj2+w[27]*xj3);
-         y[7] += (w[28]*xj0+w[29]*xj1+w[30]*xj2+w[31]*xj3);
-         w += 32;
-      }
-   }
-   for (i=0;i<rows;i++) out[i] *= scale[i];
+static inline void cgemv8x4(float *out, const oac_int8 *w, const float *scale, int rows, int cols, const float *_x) {
+    int i, j;
+    oac_int8 x[MAX_INPUTS];
+    for (i = 0; i < rows; i++) out[i] = 0;
+    for (i = 0; i < cols; i++) x[i] = (int)floor(.5 + 127*_x[i]);
+    for (i = 0; i < rows; i += 8) {
+        for (j = 0; j < cols; j += 4) {
+            float *y;
+            float xj0, xj1, xj2, xj3;
+            xj0 = x[j + 0];
+            xj1 = x[j + 1];
+            xj2 = x[j + 2];
+            xj3 = x[j + 3];
+            y = &out[i];
+            y[0] += (w[0]*xj0 + w[1]*xj1 + w[2]*xj2 + w[3]*xj3);
+            y[1] += (w[4]*xj0 + w[5]*xj1 + w[6]*xj2 + w[7]*xj3);
+            y[2] += (w[8]*xj0 + w[9]*xj1 + w[10]*xj2 + w[11]*xj3);
+            y[3] += (w[12]*xj0 + w[13]*xj1 + w[14]*xj2 + w[15]*xj3);
+            y[4] += (w[16]*xj0 + w[17]*xj1 + w[18]*xj2 + w[19]*xj3);
+            y[5] += (w[20]*xj0 + w[21]*xj1 + w[22]*xj2 + w[23]*xj3);
+            y[6] += (w[24]*xj0 + w[25]*xj1 + w[26]*xj2 + w[27]*xj3);
+            y[7] += (w[28]*xj0 + w[29]*xj1 + w[30]*xj2 + w[31]*xj3);
+            w += 32;
+        }
+    }
+    for (i = 0; i < rows; i++) out[i] *= scale[i];
 }
-#endif
+# endif
 
 /* No AVX2/FMA support */
-#ifndef LPCNET_TEST
-static inline float lpcnet_exp2(float x)
-{
-   int integer;
-   float frac;
-   union {
-      float f;
-      oac_uint32 i;
-   } res;
-   integer = floor(x);
-   if (integer < -50)
-      return 0;
-   frac = x-integer;
-   /* K0 = 1, K1 = log(2), K2 = 3-4*log(2), K3 = 3*log(2) - 2 */
-   res.f = 0.99992522f + frac * (0.69583354f
-           + frac * (0.22606716f + 0.078024523f*frac));
-   res.i = (res.i + (integer<<23)) & 0x7fffffff;
-   return res.f;
+# ifndef LPCNET_TEST
+static inline float lpcnet_exp2(float x) {
+    int integer;
+    float frac;
+    union {
+        float f;
+        oac_uint32 i;
+    } res;
+    integer = floor(x);
+    if (integer < -50)
+        return 0;
+    frac = x - integer;
+    /* K0 = 1, K1 = log(2), K2 = 3-4*log(2), K3 = 3*log(2) - 2 */
+    res.f = 0.99992522f + frac*(0.69583354f
+                                + frac*(0.22606716f + 0.078024523f*frac));
+    res.i = (res.i + (integer<<23))&0x7fffffff;
+    return res.f;
 }
-#define lpcnet_exp(x) lpcnet_exp2((x)*1.44269504f)
+#  define lpcnet_exp(x) lpcnet_exp2((x)*1.44269504f)
 
-#define fmadd(a, b, c) ((a)*(b)+(c))
-static OAC_INLINE float tanh_approx(float x)
-{
+#  define fmadd(a, b, c) ((a)*(b) + (c))
+static OAC_INLINE float tanh_approx(float x) {
     const float N0 = 952.52801514f;
     const float N1 = 96.39235687f;
     const float N2 = 0.60863042f;
@@ -351,39 +328,33 @@ static OAC_INLINE float tanh_approx(float x)
     return MAX32(-1.f, MIN32(1.f, num));
 }
 
-static inline float sigmoid_approx(float x)
-{
-   return .5f + .5f*tanh_approx(.5f*x);
+static inline float sigmoid_approx(float x) {
+    return .5f + .5f*tanh_approx(.5f*x);
 }
 
-static inline void softmax(float *y, const float *x, int N)
-{
+static inline void softmax(float *y, const float *x, int N) {
     int i;
-    for (i=0;i<N;i++)
+    for (i = 0; i < N; i++)
         y[i] = lpcnet_exp(x[i]);
 }
 
-static inline void vec_tanh(float *y, const float *x, int N)
-{
+static inline void vec_tanh(float *y, const float *x, int N) {
     int i;
-    for (i=0;i<N;i++)
-    {
+    for (i = 0; i < N; i++) {
         y[i] = tanh_approx(x[i]);
     }
 }
 
-static inline void vec_sigmoid(float *y, const float *x, int N)
-{
+static inline void vec_sigmoid(float *y, const float *x, int N) {
     int i;
-    for (i=0;i<N;i++)
-    {
+    for (i = 0; i < N; i++) {
         y[i] = sigmoid_approx(x[i]);
     }
 }
-#endif
+# endif
 
-#define SCALE (128.f*127.f)
-#define SCALE_1 (1.f/128.f/127.f)
+# define SCALE (128.f*127.f)
+# define SCALE_1 (1.f/128.f/127.f)
 
 #endif /*no optimizations*/
 #endif /*VEC_H*/
diff --git a/dnn/vec_avx.h b/dnn/vec_avx.h
index 74831ab06..6b4867006 100644
--- a/dnn/vec_avx.h
+++ b/dnn/vec_avx.h
@@ -23,11 +23,11 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 /*
-  AVX implementation of vector operations, compile with -mavx
-  AVX2/FMA implementation of vector operations, compile with -mavx2 -mfma
-*/
+   AVX implementation of vector operations, compile with -mavx
+   AVX2/FMA implementation of vector operations, compile with -mavx2 -mfma
+ */
 
 #ifndef VEC_AVX_H
 #define VEC_AVX_H
@@ -42,11 +42,11 @@
 
 #ifndef __SSE_4_1__
 static inline __m128 mm_floor_ps(__m128 x) {
-  __m128 half = _mm_set1_ps(0.5);
-  return _mm_cvtepi32_ps(_mm_cvtps_epi32(_mm_sub_ps(x, half)));
+    __m128 half = _mm_set1_ps(0.5);
+    return _mm_cvtepi32_ps(_mm_cvtps_epi32(_mm_sub_ps(x, half)));
 }
-#undef _mm_floor_ps
-#define _mm_floor_ps(x) mm_floor_ps(x)
+# undef _mm_floor_ps
+# define _mm_floor_ps(x) mm_floor_ps(x)
 #endif
 
 
@@ -54,108 +54,108 @@ static inline __m128 mm_floor_ps(__m128 x) {
 #ifndef __AVX__
 
 typedef struct {
-  __m128 lo;
-  __m128 hi;
+    __m128 lo;
+    __m128 hi;
 } mm256_emu;
-#define __m256 mm256_emu
+# define __m256 mm256_emu
 
 static inline mm256_emu mm256_loadu_ps(const float *src) {
-  mm256_emu ret;
-  ret.lo = _mm_loadu_ps(&src[0]);
-  ret.hi = _mm_loadu_ps(&src[4]);
-  return ret;
+    mm256_emu ret;
+    ret.lo = _mm_loadu_ps(&src[0]);
+    ret.hi = _mm_loadu_ps(&src[4]);
+    return ret;
 }
-#define _mm256_loadu_ps(src) mm256_loadu_ps(src)
+# define _mm256_loadu_ps(src) mm256_loadu_ps(src)
 
 
 static inline void mm256_storeu_ps(float *dst, mm256_emu src) {
-  _mm_storeu_ps(dst, src.lo);
-  _mm_storeu_ps(&dst[4], src.hi);
+    _mm_storeu_ps(dst, src.lo);
+    _mm_storeu_ps(&dst[4], src.hi);
 }
-#define _mm256_storeu_ps(dst, src) mm256_storeu_ps(dst, src)
+# define _mm256_storeu_ps(dst, src) mm256_storeu_ps(dst, src)
 
 
 static inline mm256_emu mm256_setzero_ps(void) {
-  mm256_emu ret;
-  ret.lo = _mm_setzero_ps();
-  ret.hi = ret.lo;
-  return ret;
+    mm256_emu ret;
+    ret.lo = _mm_setzero_ps();
+    ret.hi = ret.lo;
+    return ret;
 }
-#define _mm256_setzero_ps mm256_setzero_ps
+# define _mm256_setzero_ps mm256_setzero_ps
 
 static inline mm256_emu mm256_broadcast_ss(const float *x) {
-  mm256_emu ret;
-  ret.lo = _mm_set1_ps(*x);
-  ret.hi = ret.lo;
-  return ret;
+    mm256_emu ret;
+    ret.lo = _mm_set1_ps(*x);
+    ret.hi = ret.lo;
+    return ret;
 }
-#define _mm256_broadcast_ss(x) mm256_broadcast_ss(x)
+# define _mm256_broadcast_ss(x) mm256_broadcast_ss(x)
 
 static inline mm256_emu mm256_set1_ps(float x) {
-  mm256_emu ret;
-  ret.lo = _mm_set1_ps(x);
-  ret.hi = ret.lo;
-  return ret;
+    mm256_emu ret;
+    ret.lo = _mm_set1_ps(x);
+    ret.hi = ret.lo;
+    return ret;
 }
-#define _mm256_set1_ps(x) mm256_set1_ps(x)
+# define _mm256_set1_ps(x) mm256_set1_ps(x)
 
 
 
 static inline mm256_emu mm256_mul_ps(mm256_emu a, mm256_emu b) {
-  mm256_emu ret;
-  ret.lo = _mm_mul_ps(a.lo, b.lo);
-  ret.hi = _mm_mul_ps(a.hi, b.hi);
-  return ret;
+    mm256_emu ret;
+    ret.lo = _mm_mul_ps(a.lo, b.lo);
+    ret.hi = _mm_mul_ps(a.hi, b.hi);
+    return ret;
 }
-#define _mm256_mul_ps(a,b) mm256_mul_ps(a,b)
+# define _mm256_mul_ps(a, b) mm256_mul_ps(a, b)
 
 static inline mm256_emu mm256_add_ps(mm256_emu a, mm256_emu b) {
-  mm256_emu ret;
-  ret.lo = _mm_add_ps(a.lo, b.lo);
-  ret.hi = _mm_add_ps(a.hi, b.hi);
-  return ret;
+    mm256_emu ret;
+    ret.lo = _mm_add_ps(a.lo, b.lo);
+    ret.hi = _mm_add_ps(a.hi, b.hi);
+    return ret;
 }
-#define _mm256_add_ps(a,b) mm256_add_ps(a,b)
+# define _mm256_add_ps(a, b) mm256_add_ps(a, b)
 
 
 static inline mm256_emu mm256_max_ps(mm256_emu a, mm256_emu b) {
-  mm256_emu ret;
-  ret.lo = _mm_max_ps(a.lo, b.lo);
-  ret.hi = _mm_max_ps(a.hi, b.hi);
-  return ret;
+    mm256_emu ret;
+    ret.lo = _mm_max_ps(a.lo, b.lo);
+    ret.hi = _mm_max_ps(a.hi, b.hi);
+    return ret;
 }
-#define _mm256_max_ps(a,b) mm256_max_ps(a,b)
+# define _mm256_max_ps(a, b) mm256_max_ps(a, b)
 
 static inline mm256_emu mm256_min_ps(mm256_emu a, mm256_emu b) {
-  mm256_emu ret;
-  ret.lo = _mm_min_ps(a.lo, b.lo);
-  ret.hi = _mm_min_ps(a.hi, b.hi);
-  return ret;
+    mm256_emu ret;
+    ret.lo = _mm_min_ps(a.lo, b.lo);
+    ret.hi = _mm_min_ps(a.hi, b.hi);
+    return ret;
 }
-#define _mm256_min_ps(a,b) mm256_min_ps(a,b)
+# define _mm256_min_ps(a, b) mm256_min_ps(a, b)
 
 static inline mm256_emu mm256_rcp_ps(mm256_emu a) {
-  mm256_emu ret;
-  ret.lo = _mm_rcp_ps(a.lo);
-  ret.hi = _mm_rcp_ps(a.hi);
-  return ret;
+    mm256_emu ret;
+    ret.lo = _mm_rcp_ps(a.lo);
+    ret.hi = _mm_rcp_ps(a.hi);
+    return ret;
 }
-#define _mm256_rcp_ps(a) mm256_rcp_ps(a)
+# define _mm256_rcp_ps(a) mm256_rcp_ps(a)
 
 
 static inline __m128 mm256_extractf128_ps(mm256_emu x, int i) {
-    return (i==0) ? x.lo : x.hi;
+    return (i == 0) ? x.lo : x.hi;
 }
-#undef _mm256_extractf128_ps
-#define _mm256_extractf128_ps(x,i) mm256_extractf128_ps(x,i)
+# undef _mm256_extractf128_ps
+# define _mm256_extractf128_ps(x, i) mm256_extractf128_ps(x, i)
 
 static inline mm256_emu mm256_insertf128_ps(mm256_emu dst, __m128 src, int i) {
-    if (i==0) dst.lo = src;
+    if (i == 0)dst.lo = src;
     else dst.hi = src;
     return dst;
 }
-#undef _mm256_insertf128_ps
-#define _mm256_insertf128_ps(dst,src,i) mm256_insertf128_ps(dst,src,i)
+# undef _mm256_insertf128_ps
+# define _mm256_insertf128_ps(dst, src, i) mm256_insertf128_ps(dst, src, i)
 
 #endif /* __AVX__ */
 
@@ -165,222 +165,219 @@ static inline mm256_emu mm256_insertf128_ps(mm256_emu dst, __m128 src, int i) {
 #ifndef __AVX2__
 
 typedef struct {
-  __m128i lo;
-  __m128i hi;
+    __m128i lo;
+    __m128i hi;
 } mm256i_emu;
-#ifdef __AVX__
+# ifdef __AVX__
 typedef __m256i real_m256i;
-#endif
-#define __m256i mm256i_emu
+# endif
+# define __m256i mm256i_emu
 
 static inline mm256i_emu mm256_setzero_si256(void) {
-  mm256i_emu ret;
-  ret.lo = _mm_setzero_si128();
-  ret.hi = ret.lo;
-  return ret;
+    mm256i_emu ret;
+    ret.lo = _mm_setzero_si128();
+    ret.hi = ret.lo;
+    return ret;
 }
-#define _mm256_setzero_si256 mm256_setzero_si256
+# define _mm256_setzero_si256 mm256_setzero_si256
 
 
 static inline mm256i_emu mm256_loadu_si256(const mm256i_emu *src) {
-  mm256i_emu ret;
-  ret.lo = _mm_loadu_si128((const __m128i*)src);
-  ret.hi = _mm_loadu_si128(&((const __m128i*)src)[1]);
-  return ret;
+    mm256i_emu ret;
+    ret.lo = _mm_loadu_si128((const __m128i*)src);
+    ret.hi = _mm_loadu_si128(&((const __m128i*)src)[1]);
+    return ret;
 }
-#define _mm256_loadu_si256(src) mm256_loadu_si256(src)
+# define _mm256_loadu_si256(src) mm256_loadu_si256(src)
 
 
 static inline void mm256_storeu_si256(mm256i_emu *dst, mm256i_emu src) {
-  _mm_storeu_si128((__m128i*)dst, src.lo);
-  _mm_storeu_si128(&((__m128i*)dst)[1], src.hi);
+    _mm_storeu_si128((__m128i*)dst, src.lo);
+    _mm_storeu_si128(&((__m128i*)dst)[1], src.hi);
 }
-#define _mm256_storeu_si256(dst, src) mm256_storeu_si256(dst, src)
+# define _mm256_storeu_si256(dst, src) mm256_storeu_si256(dst, src)
 
 
 static inline mm256i_emu mm256_broadcastd_epi32(__m128i x) {
-  mm256i_emu ret;
-  ret.hi = ret.lo = _mm_shuffle_epi32(x, 0);
-  return ret;
+    mm256i_emu ret;
+    ret.hi = ret.lo = _mm_shuffle_epi32(x, 0);
+    return ret;
 }
-#define _mm256_broadcastd_epi32(x) mm256_broadcastd_epi32(x)
+# define _mm256_broadcastd_epi32(x) mm256_broadcastd_epi32(x)
 
 
 static inline mm256i_emu mm256_set1_epi32(int x) {
-  mm256i_emu ret;
-  ret.lo = _mm_set1_epi32(x);
-  ret.hi = ret.lo;
-  return ret;
+    mm256i_emu ret;
+    ret.lo = _mm_set1_epi32(x);
+    ret.hi = ret.lo;
+    return ret;
 }
-#define _mm256_set1_epi32(x) mm256_set1_epi32(x)
+# define _mm256_set1_epi32(x) mm256_set1_epi32(x)
 
 static inline mm256i_emu mm256_set1_epi16(int x) {
-  mm256i_emu ret;
-  ret.lo = _mm_set1_epi16(x);
-  ret.hi = ret.lo;
-  return ret;
+    mm256i_emu ret;
+    ret.lo = _mm_set1_epi16(x);
+    ret.hi = ret.lo;
+    return ret;
 }
-#define _mm256_set1_epi16(x) mm256_set1_epi16(x)
+# define _mm256_set1_epi16(x) mm256_set1_epi16(x)
 
 
 static inline mm256i_emu mm256_add_epi32(mm256i_emu a, mm256i_emu b) {
-  mm256i_emu ret;
-  ret.lo = _mm_add_epi32(a.lo, b.lo);
-  ret.hi = _mm_add_epi32(a.hi, b.hi);
-  return ret;
+    mm256i_emu ret;
+    ret.lo = _mm_add_epi32(a.lo, b.lo);
+    ret.hi = _mm_add_epi32(a.hi, b.hi);
+    return ret;
 }
-#define _mm256_add_epi32(a,b) mm256_add_epi32(a,b)
+# define _mm256_add_epi32(a, b) mm256_add_epi32(a, b)
 
 static inline mm256i_emu mm256_madd_epi16(mm256i_emu a, mm256i_emu b) {
-  mm256i_emu ret;
-  ret.lo = _mm_madd_epi16(a.lo, b.lo);
-  ret.hi = _mm_madd_epi16(a.hi, b.hi);
-  return ret;
+    mm256i_emu ret;
+    ret.lo = _mm_madd_epi16(a.lo, b.lo);
+    ret.hi = _mm_madd_epi16(a.hi, b.hi);
+    return ret;
 }
-#define _mm256_madd_epi16(a,b) mm256_madd_epi16(a,b)
+# define _mm256_madd_epi16(a, b) mm256_madd_epi16(a, b)
 
 static inline mm256i_emu mm256_maddubs_epi16(mm256i_emu a, mm256i_emu b) {
-  mm256i_emu ret;
-  ret.lo = _mm_maddubs_epi16(a.lo, b.lo);
-  ret.hi = _mm_maddubs_epi16(a.hi, b.hi);
-  return ret;
+    mm256i_emu ret;
+    ret.lo = _mm_maddubs_epi16(a.lo, b.lo);
+    ret.hi = _mm_maddubs_epi16(a.hi, b.hi);
+    return ret;
 }
-#define _mm256_maddubs_epi16(a,b) mm256_maddubs_epi16(a,b)
+# define _mm256_maddubs_epi16(a, b) mm256_maddubs_epi16(a, b)
 
 
 
 /* Emulating the conversion functions is tricky because they use __m256i but are defined in AVX.
    So we need to make a special when only AVX is available. */
-#ifdef __AVX__
+# ifdef __AVX__
 
 typedef union {
-  mm256i_emu fake;
-  real_m256i real;
+    mm256i_emu fake;
+    real_m256i real;
 } mm256_union;
 
 static inline __m256 mm256_cvtepi32_ps(mm256i_emu a) {
-  mm256_union src;
-  src.fake = a;
-  return _mm256_cvtepi32_ps(src.real);
+    mm256_union src;
+    src.fake = a;
+    return _mm256_cvtepi32_ps(src.real);
 }
-#define _mm256_cvtepi32_ps(a) mm256_cvtepi32_ps(a)
+#  define _mm256_cvtepi32_ps(a) mm256_cvtepi32_ps(a)
 
 static inline mm256i_emu mm256_cvtps_epi32(__m256 a) {
-  mm256_union ret;
-  ret.real =   _mm256_cvtps_epi32(a);
-  return ret.fake;
+    mm256_union ret;
+    ret.real =   _mm256_cvtps_epi32(a);
+    return ret.fake;
 }
-#define _mm256_cvtps_epi32(a) mm256_cvtps_epi32(a)
+#  define _mm256_cvtps_epi32(a) mm256_cvtps_epi32(a)
 
 
-#else
+# else
 
 static inline mm256_emu mm256_cvtepi32_ps(mm256i_emu a) {
-  mm256_emu ret;
-  ret.lo = _mm_cvtepi32_ps(a.lo);
-  ret.hi = _mm_cvtepi32_ps(a.hi);
-  return ret;
+    mm256_emu ret;
+    ret.lo = _mm_cvtepi32_ps(a.lo);
+    ret.hi = _mm_cvtepi32_ps(a.hi);
+    return ret;
 }
-#define _mm256_cvtepi32_ps(a) mm256_cvtepi32_ps(a)
+#  define _mm256_cvtepi32_ps(a) mm256_cvtepi32_ps(a)
 
 static inline mm256i_emu mm256_cvtps_epi32(mm256_emu a) {
-  mm256i_emu ret;
-  ret.lo = _mm_cvtps_epi32(a.lo);
-  ret.hi = _mm_cvtps_epi32(a.hi);
-  return ret;
+    mm256i_emu ret;
+    ret.lo = _mm_cvtps_epi32(a.lo);
+    ret.hi = _mm_cvtps_epi32(a.hi);
+    return ret;
 }
-#define _mm256_cvtps_epi32(a) mm256_cvtps_epi32(a)
+#  define _mm256_cvtps_epi32(a) mm256_cvtps_epi32(a)
 
-#endif /* __AVX__ */
+# endif /* __AVX__ */
 
 
 #endif /* __AVX2__ */
 
 /* In case we don't have FMA, make it a mul and an add. */
 #if !(defined(__FMA__) && defined(__AVX__))
-#define _mm256_fmadd_ps(a,b,c) _mm256_add_ps(_mm256_mul_ps(a, b), c)
-#define _mm_fmadd_ps(a,b,c) _mm_add_ps(_mm_mul_ps(a, b), c)
+# define _mm256_fmadd_ps(a, b, c) _mm256_add_ps(_mm256_mul_ps(a, b), c)
+# define _mm_fmadd_ps(a, b, c) _mm_add_ps(_mm_mul_ps(a, b), c)
 #endif
 
 #ifdef __AVX2__
-static inline __m256 exp8_approx(__m256 X)
-{
-   const __m256 K0 = _mm256_set1_ps(0.99992522f);
-   const __m256 K1 = _mm256_set1_ps(0.69583354f);
-   const __m256 K2 = _mm256_set1_ps(0.22606716f);
-   const __m256 K3 = _mm256_set1_ps(0.078024523f);
-   const __m256 log2_E = _mm256_set1_ps(1.44269504f);
-   const __m256 max_in = _mm256_set1_ps(50.f);
-   const __m256 min_in = _mm256_set1_ps(-50.f);
-   __m256 XF, Y;
-   __m256i I;
-   X = _mm256_mul_ps(X, log2_E);
-   X = _mm256_max_ps(min_in, _mm256_min_ps(max_in, X));
-   XF = _mm256_floor_ps(X);
-   I = _mm256_cvtps_epi32(XF);
-   X = _mm256_sub_ps(X, XF);
-   Y = _mm256_fmadd_ps(_mm256_fmadd_ps(_mm256_fmadd_ps(K3, X, K2), X, K1), X, K0);
-   I = _mm256_slli_epi32(I, 23);
-   Y = _mm256_castsi256_ps(_mm256_add_epi32(I, _mm256_castps_si256(Y)));
-   return Y;
+static inline __m256 exp8_approx(__m256 X) {
+    const __m256 K0 = _mm256_set1_ps(0.99992522f);
+    const __m256 K1 = _mm256_set1_ps(0.69583354f);
+    const __m256 K2 = _mm256_set1_ps(0.22606716f);
+    const __m256 K3 = _mm256_set1_ps(0.078024523f);
+    const __m256 log2_E = _mm256_set1_ps(1.44269504f);
+    const __m256 max_in = _mm256_set1_ps(50.f);
+    const __m256 min_in = _mm256_set1_ps(-50.f);
+    __m256 XF, Y;
+    __m256i I;
+    X = _mm256_mul_ps(X, log2_E);
+    X = _mm256_max_ps(min_in, _mm256_min_ps(max_in, X));
+    XF = _mm256_floor_ps(X);
+    I = _mm256_cvtps_epi32(XF);
+    X = _mm256_sub_ps(X, XF);
+    Y = _mm256_fmadd_ps(_mm256_fmadd_ps(_mm256_fmadd_ps(K3, X, K2), X, K1), X, K0);
+    I = _mm256_slli_epi32(I, 23);
+    Y = _mm256_castsi256_ps(_mm256_add_epi32(I, _mm256_castps_si256(Y)));
+    return Y;
 }
 
 static inline void vector_ps_to_epi8(unsigned char *x, const float *_x, int len) {
     int i;
-   __m256 const127 = _mm256_set1_ps(127.f);
-    for (i=0;i<len;i+=8) {
-       __m256 xf;
-       __m256i xi;
-       xf = _mm256_loadu_ps(&_x[i]);
-       xf = _mm256_fmadd_ps(xf, const127, const127);
-       xi = _mm256_cvtps_epi32(xf);
-       xi = _mm256_packus_epi32(xi,  _mm256_setzero_si256());
-       xi = _mm256_permute4x64_epi64(xi, 0xD8);
-       xi = _mm256_packus_epi16(xi, _mm256_setzero_si256());
-       xi = _mm256_permutevar8x32_epi32(xi, _mm256_setr_epi32(0,1, 0,0, 0,0, 0,0));
-       _mm256_storeu_si256 ((__m256i *)(void*)&x[i], xi);
-   }
+    __m256 const127 = _mm256_set1_ps(127.f);
+    for (i = 0; i < len; i += 8) {
+        __m256 xf;
+        __m256i xi;
+        xf = _mm256_loadu_ps(&_x[i]);
+        xf = _mm256_fmadd_ps(xf, const127, const127);
+        xi = _mm256_cvtps_epi32(xf);
+        xi = _mm256_packus_epi32(xi,  _mm256_setzero_si256());
+        xi = _mm256_permute4x64_epi64(xi, 0xD8);
+        xi = _mm256_packus_epi16(xi, _mm256_setzero_si256());
+        xi = _mm256_permutevar8x32_epi32(xi, _mm256_setr_epi32(0, 1, 0, 0, 0, 0, 0, 0));
+        _mm256_storeu_si256 ((__m256i *)(void*)&x[i], xi);
+    }
 }
 
 #else
-static inline __m128 exp4_approx(__m128 X)
-{
-   const __m128 K0 = _mm_set1_ps(0.99992522f);
-   const __m128 K1 = _mm_set1_ps(0.69583354f);
-   const __m128 K2 = _mm_set1_ps(0.22606716f);
-   const __m128 K3 = _mm_set1_ps(0.078024523f);
-   const __m128 log2_E = _mm_set1_ps(1.44269504);
-   const __m128 max_in = _mm_set1_ps(50.f);
-   const __m128 min_in = _mm_set1_ps(-50.f);
-   const __m128i mask = _mm_set1_epi32(0x7fffffff);
-   __m128 XF, Y;
-   __m128i I;
-   X = _mm_mul_ps(X, log2_E);
-   X = _mm_max_ps(min_in, _mm_min_ps(max_in, X));
-   XF = _mm_floor_ps(X);
-   I = _mm_cvtps_epi32(XF);
-   X = _mm_sub_ps(X, XF);
-   Y = _mm_fmadd_ps(_mm_fmadd_ps(_mm_fmadd_ps(K3, X, K2), X, K1), X, K0);
-   I = _mm_slli_epi32(I, 23);
-   Y = _mm_castsi128_ps(_mm_and_si128(mask, _mm_add_epi32(I, _mm_castps_si128(Y))));
-   return Y;
-}
-static inline __m256 exp8_approx(__m256 X)
-{
-   __m256 Y;
-   __m128 Xhi, Xlo, Yhi, Ylo;
-   Xhi = _mm256_extractf128_ps(X, 1);
-   Xlo = _mm256_extractf128_ps(X, 0);
-   Yhi = exp4_approx(Xhi);
-   Ylo = exp4_approx(Xlo);
-   Y = _mm256_insertf128_ps(_mm256_setzero_ps(), Yhi, 1);
-   Y = _mm256_insertf128_ps(Y, Ylo, 0);
-   return Y;
+static inline __m128 exp4_approx(__m128 X) {
+    const __m128 K0 = _mm_set1_ps(0.99992522f);
+    const __m128 K1 = _mm_set1_ps(0.69583354f);
+    const __m128 K2 = _mm_set1_ps(0.22606716f);
+    const __m128 K3 = _mm_set1_ps(0.078024523f);
+    const __m128 log2_E = _mm_set1_ps(1.44269504);
+    const __m128 max_in = _mm_set1_ps(50.f);
+    const __m128 min_in = _mm_set1_ps(-50.f);
+    const __m128i mask = _mm_set1_epi32(0x7fffffff);
+    __m128 XF, Y;
+    __m128i I;
+    X = _mm_mul_ps(X, log2_E);
+    X = _mm_max_ps(min_in, _mm_min_ps(max_in, X));
+    XF = _mm_floor_ps(X);
+    I = _mm_cvtps_epi32(XF);
+    X = _mm_sub_ps(X, XF);
+    Y = _mm_fmadd_ps(_mm_fmadd_ps(_mm_fmadd_ps(K3, X, K2), X, K1), X, K0);
+    I = _mm_slli_epi32(I, 23);
+    Y = _mm_castsi128_ps(_mm_and_si128(mask, _mm_add_epi32(I, _mm_castps_si128(Y))));
+    return Y;
+}
+static inline __m256 exp8_approx(__m256 X) {
+    __m256 Y;
+    __m128 Xhi, Xlo, Yhi, Ylo;
+    Xhi = _mm256_extractf128_ps(X, 1);
+    Xlo = _mm256_extractf128_ps(X, 0);
+    Yhi = exp4_approx(Xhi);
+    Ylo = exp4_approx(Xlo);
+    Y = _mm256_insertf128_ps(_mm256_setzero_ps(), Yhi, 1);
+    Y = _mm256_insertf128_ps(Y, Ylo, 0);
+    return Y;
 }
 
 static inline void vector_ps_to_epi8(unsigned char *x, const float *_x, int len) {
     int i;
-    for (i=0;i<len;i++) x[i] = 127+(int)floor(.5+127*_x[i]);
+    for (i = 0; i < len; i++)x[i] = 127 + (int)floor(.5 + 127*_x[i]);
 }
 
 #endif
@@ -396,25 +393,24 @@ static inline void vector_ps_to_epi8(unsigned char *x, const float *_x, int len)
    of the bounds). The max error is around 3e-4 and is dominated by the
    reciprocal approximation (the max error of the rational function is
    around 6e-5).
-   */
-static inline __m256 tanh8_approx(__m256 X)
-{
-   const __m256 N0 = _mm256_set1_ps(952.52801514f);
-   const __m256 N1 = _mm256_set1_ps(96.39235687f);
-   const __m256 N2 = _mm256_set1_ps(0.60863042f);
-   const __m256 D0 = _mm256_set1_ps(952.72399902f);
-   const __m256 D1 = _mm256_set1_ps(413.36801147f);
-   const __m256 D2 = _mm256_set1_ps(11.88600922f);
-   const __m256 max_out = _mm256_set1_ps(1.f);
-   const __m256 min_out = _mm256_set1_ps(-1.f);
-   __m256 X2, num, den;
-   X2 = _mm256_mul_ps(X, X);
-   num = _mm256_fmadd_ps(_mm256_fmadd_ps(N2, X2, N1), X2, N0);
-   den = _mm256_fmadd_ps(_mm256_fmadd_ps(D2, X2, D1), X2, D0);
-   num = _mm256_mul_ps(num, X);
-   den = _mm256_rcp_ps(den);
-   num = _mm256_mul_ps(num, den);
-   return _mm256_max_ps(min_out, _mm256_min_ps(max_out, num));
+ */
+static inline __m256 tanh8_approx(__m256 X) {
+    const __m256 N0 = _mm256_set1_ps(952.52801514f);
+    const __m256 N1 = _mm256_set1_ps(96.39235687f);
+    const __m256 N2 = _mm256_set1_ps(0.60863042f);
+    const __m256 D0 = _mm256_set1_ps(952.72399902f);
+    const __m256 D1 = _mm256_set1_ps(413.36801147f);
+    const __m256 D2 = _mm256_set1_ps(11.88600922f);
+    const __m256 max_out = _mm256_set1_ps(1.f);
+    const __m256 min_out = _mm256_set1_ps(-1.f);
+    __m256 X2, num, den;
+    X2 = _mm256_mul_ps(X, X);
+    num = _mm256_fmadd_ps(_mm256_fmadd_ps(N2, X2, N1), X2, N0);
+    den = _mm256_fmadd_ps(_mm256_fmadd_ps(D2, X2, D1), X2, D0);
+    num = _mm256_mul_ps(num, X);
+    den = _mm256_rcp_ps(den);
+    num = _mm256_mul_ps(num, den);
+    return _mm256_max_ps(min_out, _mm256_min_ps(max_out, num));
 }
 
 /* Sigmoid approximation using a Padé-like rational function:
@@ -424,198 +420,176 @@ static inline __m256 tanh8_approx(__m256 X)
    by powers of two to get the correct scaling. The max error is around 1.5e-4
    and is dominated by the reciprocal approximation (the max error of the
    rational function is around 3e-5).
-   */
-static inline __m256 sigmoid8_approx(__m256 X)
-{
-   const __m256 N0 = _mm256_set1_ps(238.13200378f);
-   const __m256 N1 = _mm256_set1_ps(6.02452230f);
-   const __m256 N2 = _mm256_set1_ps(0.00950985f);
-   const __m256 D0 = _mm256_set1_ps(952.72399902f);
-   const __m256 D1 = _mm256_set1_ps(103.34200287f);
-   const __m256 D2 = _mm256_set1_ps(0.74287558f);
-   const __m256 half = _mm256_set1_ps(0.5);
-   const __m256 max_out = _mm256_set1_ps(1.f);
-   const __m256 min_out = _mm256_set1_ps(0.f);
-   __m256 X2, num, den;
-   X2 = _mm256_mul_ps(X, X);
-   num = _mm256_fmadd_ps(_mm256_fmadd_ps(N2, X2, N1), X2, N0);
-   den = _mm256_fmadd_ps(_mm256_fmadd_ps(D2, X2, D1), X2, D0);
-   num = _mm256_mul_ps(num, X);
-   den = _mm256_rcp_ps(den);
-   num = _mm256_fmadd_ps(num, den, half);
-   return _mm256_max_ps(min_out, _mm256_min_ps(max_out, num));
-}
-
-static inline float tanh_approx(float x)
-{
-   float out[8];
-   __m256 X, Y;
-   X = _mm256_set1_ps(x);
-   Y = tanh8_approx(X);
-   _mm256_storeu_ps(out, Y);
-   return out[0];
-}
-
-static inline float sigmoid_approx(float x)
-{
-   float out[8];
-   __m256 X, Y;
-   X = _mm256_set1_ps(x);
-   Y = sigmoid8_approx(X);
-   _mm256_storeu_ps(out, Y);
-   return out[0];
+ */
+static inline __m256 sigmoid8_approx(__m256 X) {
+    const __m256 N0 = _mm256_set1_ps(238.13200378f);
+    const __m256 N1 = _mm256_set1_ps(6.02452230f);
+    const __m256 N2 = _mm256_set1_ps(0.00950985f);
+    const __m256 D0 = _mm256_set1_ps(952.72399902f);
+    const __m256 D1 = _mm256_set1_ps(103.34200287f);
+    const __m256 D2 = _mm256_set1_ps(0.74287558f);
+    const __m256 half = _mm256_set1_ps(0.5);
+    const __m256 max_out = _mm256_set1_ps(1.f);
+    const __m256 min_out = _mm256_set1_ps(0.f);
+    __m256 X2, num, den;
+    X2 = _mm256_mul_ps(X, X);
+    num = _mm256_fmadd_ps(_mm256_fmadd_ps(N2, X2, N1), X2, N0);
+    den = _mm256_fmadd_ps(_mm256_fmadd_ps(D2, X2, D1), X2, D0);
+    num = _mm256_mul_ps(num, X);
+    den = _mm256_rcp_ps(den);
+    num = _mm256_fmadd_ps(num, den, half);
+    return _mm256_max_ps(min_out, _mm256_min_ps(max_out, num));
+}
+
+static inline float tanh_approx(float x) {
+    float out[8];
+    __m256 X, Y;
+    X = _mm256_set1_ps(x);
+    Y = tanh8_approx(X);
+    _mm256_storeu_ps(out, Y);
+    return out[0];
+}
+
+static inline float sigmoid_approx(float x) {
+    float out[8];
+    __m256 X, Y;
+    X = _mm256_set1_ps(x);
+    Y = sigmoid8_approx(X);
+    _mm256_storeu_ps(out, Y);
+    return out[0];
 }
 
 #else
 
-static inline __m128 tanh4_approx(__m128 X)
-{
-   const __m128 N0 = _mm_set1_ps(952.52801514f);
-   const __m128 N1 = _mm_set1_ps(96.39235687f);
-   const __m128 N2 = _mm_set1_ps(0.60863042f);
-   const __m128 D0 = _mm_set1_ps(952.72399902f);
-   const __m128 D1 = _mm_set1_ps(413.36801147f);
-   const __m128 D2 = _mm_set1_ps(11.88600922f);
-   const __m128 max_out = _mm_set1_ps(1.f);
-   const __m128 min_out = _mm_set1_ps(-1.f);
-   __m128 X2, num, den;
-   X2 = _mm_mul_ps(X, X);
-   num = _mm_fmadd_ps(_mm_fmadd_ps(N2, X2, N1), X2, N0);
-   den = _mm_fmadd_ps(_mm_fmadd_ps(D2, X2, D1), X2, D0);
-   num = _mm_mul_ps(num, X);
-   den = _mm_rcp_ps(den);
-   num = _mm_mul_ps(num, den);
-   return _mm_max_ps(min_out, _mm_min_ps(max_out, num));
-}
-
-static inline __m128 sigmoid4_approx(__m128 X)
-{
-   const __m128 N0 = _mm_set1_ps(238.13200378f);
-   const __m128 N1 = _mm_set1_ps(6.02452230f);
-   const __m128 N2 = _mm_set1_ps(0.00950985f);
-   const __m128 D0 = _mm_set1_ps(952.72399902f);
-   const __m128 D1 = _mm_set1_ps(103.34200287f);
-   const __m128 D2 = _mm_set1_ps(0.74287558f);
-   const __m128 half = _mm_set1_ps(0.5);
-   const __m128 max_out = _mm_set1_ps(1.f);
-   const __m128 min_out = _mm_set1_ps(0.f);
-   __m128 X2, num, den;
-   X2 = _mm_mul_ps(X, X);
-   num = _mm_fmadd_ps(_mm_fmadd_ps(N2, X2, N1), X2, N0);
-   den = _mm_fmadd_ps(_mm_fmadd_ps(D2, X2, D1), X2, D0);
-   num = _mm_mul_ps(num, X);
-   den = _mm_rcp_ps(den);
-   num = _mm_fmadd_ps(num, den, half);
-   return _mm_max_ps(min_out, _mm_min_ps(max_out, num));
-}
-
-static inline float tanh_approx(float x)
-{
-   float out[4];
-   __m128 X, Y;
-   X = _mm_set1_ps(x);
-   Y = tanh4_approx(X);
-   _mm_storeu_ps(out, Y);
-   return out[0];
-}
-
-static inline float sigmoid_approx(float x)
-{
-   float out[4];
-   __m128 X, Y;
-   X = _mm_set1_ps(x);
-   Y = sigmoid4_approx(X);
-   _mm_storeu_ps(out, Y);
-   return out[0];
+static inline __m128 tanh4_approx(__m128 X) {
+    const __m128 N0 = _mm_set1_ps(952.52801514f);
+    const __m128 N1 = _mm_set1_ps(96.39235687f);
+    const __m128 N2 = _mm_set1_ps(0.60863042f);
+    const __m128 D0 = _mm_set1_ps(952.72399902f);
+    const __m128 D1 = _mm_set1_ps(413.36801147f);
+    const __m128 D2 = _mm_set1_ps(11.88600922f);
+    const __m128 max_out = _mm_set1_ps(1.f);
+    const __m128 min_out = _mm_set1_ps(-1.f);
+    __m128 X2, num, den;
+    X2 = _mm_mul_ps(X, X);
+    num = _mm_fmadd_ps(_mm_fmadd_ps(N2, X2, N1), X2, N0);
+    den = _mm_fmadd_ps(_mm_fmadd_ps(D2, X2, D1), X2, D0);
+    num = _mm_mul_ps(num, X);
+    den = _mm_rcp_ps(den);
+    num = _mm_mul_ps(num, den);
+    return _mm_max_ps(min_out, _mm_min_ps(max_out, num));
+}
+
+static inline __m128 sigmoid4_approx(__m128 X) {
+    const __m128 N0 = _mm_set1_ps(238.13200378f);
+    const __m128 N1 = _mm_set1_ps(6.02452230f);
+    const __m128 N2 = _mm_set1_ps(0.00950985f);
+    const __m128 D0 = _mm_set1_ps(952.72399902f);
+    const __m128 D1 = _mm_set1_ps(103.34200287f);
+    const __m128 D2 = _mm_set1_ps(0.74287558f);
+    const __m128 half = _mm_set1_ps(0.5);
+    const __m128 max_out = _mm_set1_ps(1.f);
+    const __m128 min_out = _mm_set1_ps(0.f);
+    __m128 X2, num, den;
+    X2 = _mm_mul_ps(X, X);
+    num = _mm_fmadd_ps(_mm_fmadd_ps(N2, X2, N1), X2, N0);
+    den = _mm_fmadd_ps(_mm_fmadd_ps(D2, X2, D1), X2, D0);
+    num = _mm_mul_ps(num, X);
+    den = _mm_rcp_ps(den);
+    num = _mm_fmadd_ps(num, den, half);
+    return _mm_max_ps(min_out, _mm_min_ps(max_out, num));
+}
+
+static inline float tanh_approx(float x) {
+    float out[4];
+    __m128 X, Y;
+    X = _mm_set1_ps(x);
+    Y = tanh4_approx(X);
+    _mm_storeu_ps(out, Y);
+    return out[0];
+}
+
+static inline float sigmoid_approx(float x) {
+    float out[4];
+    __m128 X, Y;
+    X = _mm_set1_ps(x);
+    Y = sigmoid4_approx(X);
+    _mm_storeu_ps(out, Y);
+    return out[0];
 }
 
 #endif
 
-static inline float lpcnet_exp(float x)
-{
-   float out[8];
-   __m256 X, Y;
-   X = _mm256_set1_ps(x);
-   Y = exp8_approx(X);
-   _mm256_storeu_ps(out, Y);
-   return out[0];
+static inline float lpcnet_exp(float x) {
+    float out[8];
+    __m256 X, Y;
+    X = _mm256_set1_ps(x);
+    Y = exp8_approx(X);
+    _mm256_storeu_ps(out, Y);
+    return out[0];
 }
 
-static inline void softmax(float *y, const float *x, int N)
-{
+static inline void softmax(float *y, const float *x, int N) {
     int i;
-    for (i=0;i<N-7;i+=8)
-    {
+    for (i = 0; i < N - 7; i += 8) {
         __m256 X, Y;
         X = _mm256_loadu_ps(&x[i]);
         Y = exp8_approx(X);
         _mm256_storeu_ps(&y[i], Y);
     }
-    for (;i<N;i++)
+    for (; i < N; i++)
         y[i] = lpcnet_exp(x[i]);
 }
 
 #ifdef __AVX__
-static inline void vec_tanh(float *y, const float *x, int N)
-{
+static inline void vec_tanh(float *y, const float *x, int N) {
     int i;
-    for (i=0;i<N-7;i+=8)
-    {
+    for (i = 0; i < N - 7; i += 8) {
         __m256 X, Y;
         X = _mm256_loadu_ps(&x[i]);
         Y = tanh8_approx(X);
         _mm256_storeu_ps(&y[i], Y);
     }
-    for (;i<N;i++)
-    {
+    for (; i < N; i++) {
         y[i] = tanh_approx(x[i]);
     }
 }
 
-static inline void vec_sigmoid(float *y, const float *x, int N)
-{
+static inline void vec_sigmoid(float *y, const float *x, int N) {
     int i;
-    for (i=0;i<N-7;i+=8)
-    {
+    for (i = 0; i < N - 7; i += 8) {
         __m256 X, Y;
         X = _mm256_loadu_ps(&x[i]);
         Y = sigmoid8_approx(X);
         _mm256_storeu_ps(&y[i], Y);
     }
-    for (;i<N;i++)
-    {
+    for (; i < N; i++) {
         y[i] = sigmoid_approx(x[i]);
     }
 }
 #else
-static inline void vec_tanh(float *y, const float *x, int N)
-{
+static inline void vec_tanh(float *y, const float *x, int N) {
     int i;
-    for (i=0;i<N-3;i+=4)
-    {
+    for (i = 0; i < N - 3; i += 4) {
         __m128 X, Y;
         X = _mm_loadu_ps(&x[i]);
         Y = tanh4_approx(X);
         _mm_storeu_ps(&y[i], Y);
     }
-    for (;i<N;i++)
-    {
+    for (; i < N; i++) {
         y[i] = tanh_approx(x[i]);
     }
 }
 
-static inline void vec_sigmoid(float *y, const float *x, int N)
-{
+static inline void vec_sigmoid(float *y, const float *x, int N) {
     int i;
-    for (i=0;i<N-3;i+=4)
-    {
+    for (i = 0; i < N - 3; i += 4) {
         __m128 X, Y;
         X = _mm_loadu_ps(&x[i]);
         Y = sigmoid4_approx(X);
         _mm_storeu_ps(&y[i], Y);
     }
-    for (;i<N;i++)
-    {
+    for (; i < N; i++) {
         y[i] = sigmoid_approx(x[i]);
     }
 }
@@ -624,258 +598,240 @@ static inline void vec_sigmoid(float *y, const float *x, int N)
 
 #if defined(__AVXVNNI__) || defined(__AVX512VNNI__)
 
-#define oac_mm256_dpbusds_epi32(src, a, b) _mm256_dpbusds_epi32(src, a, b)
+# define oac_mm256_dpbusds_epi32(src, a, b) _mm256_dpbusds_epi32(src, a, b)
 
 #elif defined(__AVX2__)
 
 static inline __m256i oac_mm256_dpbusds_epi32(__m256i src, __m256i a, __m256i b) {
-  __m256i ones, tmp;
-  ones = _mm256_set1_epi16(1);
-  tmp = _mm256_maddubs_epi16(a, b);
-  tmp = _mm256_madd_epi16(tmp, ones);
-  return _mm256_add_epi32(src, tmp);
+    __m256i ones, tmp;
+    ones = _mm256_set1_epi16(1);
+    tmp = _mm256_maddubs_epi16(a, b);
+    tmp = _mm256_madd_epi16(tmp, ones);
+    return _mm256_add_epi32(src, tmp);
 }
 
 #elif defined(__SSSE3__)
 
 static inline mm256i_emu oac_mm256_dpbusds_epi32(mm256i_emu src, mm256i_emu a, mm256i_emu b) {
-  mm256i_emu ones, tmp;
-  ones = _mm256_set1_epi16(1);
-  tmp = _mm256_maddubs_epi16(a, b);
-  tmp = _mm256_madd_epi16(tmp, ones);
-  return _mm256_add_epi32(src, tmp);
+    mm256i_emu ones, tmp;
+    ones = _mm256_set1_epi16(1);
+    tmp = _mm256_maddubs_epi16(a, b);
+    tmp = _mm256_madd_epi16(tmp, ones);
+    return _mm256_add_epi32(src, tmp);
 }
 
 #elif defined(__SSE2__)
 
 static inline __m128i mm_dpbusds_epi32(__m128i src, __m128i a, __m128i b) {
-  __m128i ah, al, bh, bl, tmp;
-  ah = _mm_srli_epi16(a, 8);
-  bh = _mm_srai_epi16(b, 8);
-  al = _mm_srli_epi16(_mm_slli_epi16(a, 8), 8);
-  bl = _mm_srai_epi16(_mm_slli_epi16(b, 8), 8);
-  tmp = _mm_add_epi32(_mm_madd_epi16(ah, bh), _mm_madd_epi16(al, bl));
-  return _mm_add_epi32(src, tmp);
+    __m128i ah, al, bh, bl, tmp;
+    ah = _mm_srli_epi16(a, 8);
+    bh = _mm_srai_epi16(b, 8);
+    al = _mm_srli_epi16(_mm_slli_epi16(a, 8), 8);
+    bl = _mm_srai_epi16(_mm_slli_epi16(b, 8), 8);
+    tmp = _mm_add_epi32(_mm_madd_epi16(ah, bh), _mm_madd_epi16(al, bl));
+    return _mm_add_epi32(src, tmp);
 }
 
 static inline mm256i_emu oac_mm256_dpbusds_epi32(mm256i_emu src, mm256i_emu a, mm256i_emu b) {
-  mm256i_emu res;
-  res.hi = mm_dpbusds_epi32(src.hi, a.hi, b.hi);
-  res.lo = mm_dpbusds_epi32(src.lo, a.lo, b.lo);
-  return res;
+    mm256i_emu res;
+    res.hi = mm_dpbusds_epi32(src.hi, a.hi, b.hi);
+    res.lo = mm_dpbusds_epi32(src.lo, a.lo, b.lo);
+    return res;
 }
 
 
 #else
 
-#error "No optimizations in vec_avx.h. This should never happen. "
+# error "No optimizations in vec_avx.h. This should never happen. "
 #endif
 
-static inline void sgemv(float *out, const float *weights, int rows, int cols, int col_stride, const float *x)
-{
-  int i, j;
-  i=0;
-  for (;i<rows-15;i+=16)
-  {
-     float *y;
-     __m256 vy0, vy8;
-     y = &out[i];
-     vy0 = _mm256_setzero_ps();
-     vy8 = _mm256_setzero_ps();
-     for (j=0;j<cols;j++)
-     {
-        __m256 vxj;
-        __m256 vw;
-        vxj = _mm256_broadcast_ss(&x[j]);
-
-        vw = _mm256_loadu_ps(&weights[j*col_stride + i]);
-        vy0 = _mm256_fmadd_ps(vw, vxj, vy0);
-
-        vw = _mm256_loadu_ps(&weights[j*col_stride + i + 8]);
-        vy8 = _mm256_fmadd_ps(vw, vxj, vy8);
-     }
-     _mm256_storeu_ps (&y[0], vy0);
-     _mm256_storeu_ps (&y[8], vy8);
-  }
-  for (;i<rows-7;i+=8)
-  {
-     float *y;
-     __m256 vy0;
-     y = &out[i];
-     vy0 = _mm256_setzero_ps();
-     for (j=0;j<cols;j++)
-     {
-        __m256 vxj;
-        __m256 vw;
-        vxj = _mm256_broadcast_ss(&x[j]);
-
-        vw = _mm256_loadu_ps(&weights[j*col_stride + i]);
-        vy0 = _mm256_fmadd_ps(vw, vxj, vy0);
-     }
-     _mm256_storeu_ps (&y[0], vy0);
-  }
-  for (;i<rows-3;i+=4)
-  {
-     float *y;
-     __m128 vy0;
-     y = &out[i];
-     vy0 = _mm_setzero_ps();
-     for (j=0;j<cols;j++)
-     {
-        __m128 vxj;
-        __m128 vw;
-        vxj = _mm_set1_ps(x[j]);
-
-        vw = _mm_loadu_ps(&weights[j*col_stride + i]);
-        vy0 = _mm_fmadd_ps(vw, vxj, vy0);
-     }
-     _mm_storeu_ps (&y[0], vy0);
-  }
-  for (;i<rows;i++)
-  {
-    out[i] = 0;
-    for (j=0;j<cols;j++) out[i] += weights[j*col_stride + i]*x[j];
-  }
-}
-
-static inline void sparse_sgemv8x4(float *out, const float *weights, const int *idx, int rows, const float *x)
-{
-   int i, j;
-   for (i=0;i<rows;i+=8)
-   {
-      float *y;
-      int cols;
-      __m256 vy0;
-      y = &out[i];
-      vy0 = _mm256_setzero_ps();
-      cols = *idx++;
-      for (j=0;j<cols;j++)
-      {
-         int id;
-         __m256 vxj;
-         __m256 vw;
-         id = *idx++;
-         vxj = _mm256_broadcast_ss(&x[id]);
-         vw = _mm256_loadu_ps(&weights[0]);
-         vy0 = _mm256_fmadd_ps(vw, vxj, vy0);
-
-         vxj = _mm256_broadcast_ss(&x[id+1]);
-         vw = _mm256_loadu_ps(&weights[8]);
-         vy0 = _mm256_fmadd_ps(vw, vxj, vy0);
-
-         vxj = _mm256_broadcast_ss(&x[id+2]);
-         vw = _mm256_loadu_ps(&weights[16]);
-         vy0 = _mm256_fmadd_ps(vw, vxj, vy0);
-
-         vxj = _mm256_broadcast_ss(&x[id+3]);
-         vw = _mm256_loadu_ps(&weights[24]);
-         vy0 = _mm256_fmadd_ps(vw, vxj, vy0);
-
-         weights += 32;
-      }
-      _mm256_storeu_ps (&y[0], vy0);
-   }
-}
-
-static inline void sparse_cgemv8x4(float *_out, const oac_int8 *w, const int *idx, const float *scale, int rows, int cols, const float *_x)
-{
-   int i, j;
-   unsigned char x[MAX_INPUTS];
-   /*for (i=0;i<cols;i++) x[i] = 127+floor(.5+127*_x[i]);*/
-   vector_ps_to_epi8(x, _x, cols);
-   for (i=0;i<rows;i+=8)
-   {
-      int colblocks;
-      __m256i vy0;
-      __m256 vout;
-      colblocks = *idx++;
-      vy0 = _mm256_setzero_si256();
-      j=0;
+static inline void sgemv(float *out, const float *weights, int rows, int cols, int col_stride, const float *x) {
+    int i, j;
+    i = 0;
+    for (; i < rows - 15; i += 16) {
+        float *y;
+        __m256 vy0, vy8;
+        y = &out[i];
+        vy0 = _mm256_setzero_ps();
+        vy8 = _mm256_setzero_ps();
+        for (j = 0; j < cols; j++) {
+            __m256 vxj;
+            __m256 vw;
+            vxj = _mm256_broadcast_ss(&x[j]);
+
+            vw = _mm256_loadu_ps(&weights[j*col_stride + i]);
+            vy0 = _mm256_fmadd_ps(vw, vxj, vy0);
+
+            vw = _mm256_loadu_ps(&weights[j*col_stride + i + 8]);
+            vy8 = _mm256_fmadd_ps(vw, vxj, vy8);
+        }
+        _mm256_storeu_ps (&y[0], vy0);
+        _mm256_storeu_ps (&y[8], vy8);
+    }
+    for (; i < rows - 7; i += 8) {
+        float *y;
+        __m256 vy0;
+        y = &out[i];
+        vy0 = _mm256_setzero_ps();
+        for (j = 0; j < cols; j++) {
+            __m256 vxj;
+            __m256 vw;
+            vxj = _mm256_broadcast_ss(&x[j]);
+
+            vw = _mm256_loadu_ps(&weights[j*col_stride + i]);
+            vy0 = _mm256_fmadd_ps(vw, vxj, vy0);
+        }
+        _mm256_storeu_ps (&y[0], vy0);
+    }
+    for (; i < rows - 3; i += 4) {
+        float *y;
+        __m128 vy0;
+        y = &out[i];
+        vy0 = _mm_setzero_ps();
+        for (j = 0; j < cols; j++) {
+            __m128 vxj;
+            __m128 vw;
+            vxj = _mm_set1_ps(x[j]);
+
+            vw = _mm_loadu_ps(&weights[j*col_stride + i]);
+            vy0 = _mm_fmadd_ps(vw, vxj, vy0);
+        }
+        _mm_storeu_ps (&y[0], vy0);
+    }
+    for (; i < rows; i++) {
+        out[i] = 0;
+        for (j = 0; j < cols; j++) out[i] += weights[j*col_stride + i]*x[j];
+    }
+}
+
+static inline void sparse_sgemv8x4(float *out, const float *weights, const int *idx, int rows, const float *x) {
+    int i, j;
+    for (i = 0; i < rows; i += 8) {
+        float *y;
+        int cols;
+        __m256 vy0;
+        y = &out[i];
+        vy0 = _mm256_setzero_ps();
+        cols = *idx++;
+        for (j = 0; j < cols; j++) {
+            int id;
+            __m256 vxj;
+            __m256 vw;
+            id = *idx++;
+            vxj = _mm256_broadcast_ss(&x[id]);
+            vw = _mm256_loadu_ps(&weights[0]);
+            vy0 = _mm256_fmadd_ps(vw, vxj, vy0);
+
+            vxj = _mm256_broadcast_ss(&x[id + 1]);
+            vw = _mm256_loadu_ps(&weights[8]);
+            vy0 = _mm256_fmadd_ps(vw, vxj, vy0);
+
+            vxj = _mm256_broadcast_ss(&x[id + 2]);
+            vw = _mm256_loadu_ps(&weights[16]);
+            vy0 = _mm256_fmadd_ps(vw, vxj, vy0);
+
+            vxj = _mm256_broadcast_ss(&x[id + 3]);
+            vw = _mm256_loadu_ps(&weights[24]);
+            vy0 = _mm256_fmadd_ps(vw, vxj, vy0);
+
+            weights += 32;
+        }
+        _mm256_storeu_ps (&y[0], vy0);
+    }
+}
+
+static inline void sparse_cgemv8x4(float *_out, const oac_int8 *w, const int *idx, const float *scale, int rows,
+                                   int cols, const float *_x) {
+    int i, j;
+    unsigned char x[MAX_INPUTS];
+    /*for (i=0;i<cols;i++) x[i] = 127+floor(.5+127*_x[i]);*/
+    vector_ps_to_epi8(x, _x, cols);
+    for (i = 0; i < rows; i += 8) {
+        int colblocks;
+        __m256i vy0;
+        __m256 vout;
+        colblocks = *idx++;
+        vy0 = _mm256_setzero_si256();
+        j = 0;
 #if 1 /* Unrolling by 4 gives some gain, comment out if it does not. */
-      for (;j<colblocks-3;j+=4)
-      {
-         __m256i vxj;
-         __m256i vw;
-         vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[*idx++]));
-         vw = _mm256_loadu_si256((const __m256i *)(void*)w);
-         vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
-         w += 32;
-         vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[*idx++]));
-         vw = _mm256_loadu_si256((const __m256i *)(void*)w);
-         vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
-         w += 32;
-         vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[*idx++]));
-         vw = _mm256_loadu_si256((const __m256i *)(void*)w);
-         vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
-         w += 32;
-         vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[*idx++]));
-         vw = _mm256_loadu_si256((const __m256i *)(void*)w);
-         vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
-         w += 32;
-      }
+        for (; j < colblocks - 3; j += 4) {
+            __m256i vxj;
+            __m256i vw;
+            vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[*idx++]));
+            vw = _mm256_loadu_si256((const __m256i *)(void*)w);
+            vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
+            w += 32;
+            vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[*idx++]));
+            vw = _mm256_loadu_si256((const __m256i *)(void*)w);
+            vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
+            w += 32;
+            vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[*idx++]));
+            vw = _mm256_loadu_si256((const __m256i *)(void*)w);
+            vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
+            w += 32;
+            vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[*idx++]));
+            vw = _mm256_loadu_si256((const __m256i *)(void*)w);
+            vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
+            w += 32;
+        }
 #endif
-      for (;j<colblocks;j++)
-      {
-         __m256i vxj;
-         __m256i vw;
-         vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[*idx++]));
-         vw = _mm256_loadu_si256((const __m256i *)(void*)w);
-         vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
-         w += 32;
-      }
-      vout = _mm256_cvtepi32_ps(vy0);
-      vout = _mm256_mul_ps(vout, _mm256_loadu_ps(&scale[i]));
-      _mm256_storeu_ps(&_out[i], vout);
-   }
-}
-static inline void cgemv8x4(float *_out, const oac_int8 *w, const float *scale, int rows, int cols, const float *_x)
-{
-   int i, j;
-   unsigned char x[MAX_INPUTS];
-   /*for (i=0;i<cols;i++) x[i] = 127+floor(.5+127*_x[i]);*/
-   vector_ps_to_epi8(x, _x, cols);
-   for (i=0;i<rows;i+=8)
-   {
-      __m256i vy0;
-      __m256 vout;
-      vy0 = _mm256_setzero_si256();
-      j=0;
+        for (; j < colblocks; j++) {
+            __m256i vxj;
+            __m256i vw;
+            vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[*idx++]));
+            vw = _mm256_loadu_si256((const __m256i *)(void*)w);
+            vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
+            w += 32;
+        }
+        vout = _mm256_cvtepi32_ps(vy0);
+        vout = _mm256_mul_ps(vout, _mm256_loadu_ps(&scale[i]));
+        _mm256_storeu_ps(&_out[i], vout);
+    }
+}
+static inline void cgemv8x4(float *_out, const oac_int8 *w, const float *scale, int rows, int cols, const float *_x) {
+    int i, j;
+    unsigned char x[MAX_INPUTS];
+    /*for (i=0;i<cols;i++) x[i] = 127+floor(.5+127*_x[i]);*/
+    vector_ps_to_epi8(x, _x, cols);
+    for (i = 0; i < rows; i += 8) {
+        __m256i vy0;
+        __m256 vout;
+        vy0 = _mm256_setzero_si256();
+        j = 0;
 #if 1 /* Unrolling by 4 gives some gain, comment out if it does not. */
-      for (;j<cols-12;j+=16)
-      {
-         __m256i vxj;
-         __m256i vw;
-         vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[j]));
-         vw = _mm256_loadu_si256((const __m256i *)(void*)w);
-         vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
-         w += 32;
-         vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[j+4]));
-         vw = _mm256_loadu_si256((const __m256i *)(void*)w);
-         vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
-         w += 32;
-         vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[j+8]));
-         vw = _mm256_loadu_si256((const __m256i *)(void*)w);
-         vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
-         w += 32;
-         vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[j+12]));
-         vw = _mm256_loadu_si256((const __m256i *)(void*)w);
-         vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
-         w += 32;
-      }
+        for (; j < cols - 12; j += 16) {
+            __m256i vxj;
+            __m256i vw;
+            vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[j]));
+            vw = _mm256_loadu_si256((const __m256i *)(void*)w);
+            vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
+            w += 32;
+            vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[j + 4]));
+            vw = _mm256_loadu_si256((const __m256i *)(void*)w);
+            vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
+            w += 32;
+            vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[j + 8]));
+            vw = _mm256_loadu_si256((const __m256i *)(void*)w);
+            vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
+            w += 32;
+            vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[j + 12]));
+            vw = _mm256_loadu_si256((const __m256i *)(void*)w);
+            vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
+            w += 32;
+        }
 #endif
-      for (;j<cols;j+=4)
-      {
-         __m256i vxj;
-         __m256i vw;
-         vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[j]));
-         vw = _mm256_loadu_si256((const __m256i *)(void*)w);
-         vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
-         w += 32;
-      }
-      vout = _mm256_cvtepi32_ps(vy0);
-      vout = _mm256_mul_ps(vout, _mm256_loadu_ps(&scale[i]));
-      _mm256_storeu_ps(&_out[i], vout);
-   }
+        for (; j < cols; j += 4) {
+            __m256i vxj;
+            __m256i vw;
+            vxj = _mm256_broadcastd_epi32(_mm_loadu_si32(&x[j]));
+            vw = _mm256_loadu_si256((const __m256i *)(void*)w);
+            vy0 = oac_mm256_dpbusds_epi32(vy0, vxj, vw);
+            w += 32;
+        }
+        vout = _mm256_cvtepi32_ps(vy0);
+        vout = _mm256_mul_ps(vout, _mm256_loadu_ps(&scale[i]));
+        _mm256_storeu_ps(&_out[i], vout);
+    }
 }
 
 #define SCALE (128.f*127.f)
diff --git a/dnn/vec_neon.h b/dnn/vec_neon.h
index 9b3b802a9..f4045afe3 100644
--- a/dnn/vec_neon.h
+++ b/dnn/vec_neon.h
@@ -25,7 +25,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 /* NEON support for ARM machines */
 
 #ifndef VEC_NEON_H
@@ -37,325 +37,301 @@
 #if defined(__arm__) && !defined(__aarch64__) && (__ARM_ARCH < 8 || !defined(__clang__))
 /* Emulate vcvtnq_s32_f32() for ARMv7 Neon. */
 static OAC_INLINE int32x4_t vcvtnq_s32_f32(float32x4_t x) {
-  return vrshrq_n_s32(vcvtq_n_s32_f32(x, 8), 8);
+    return vrshrq_n_s32(vcvtq_n_s32_f32(x, 8), 8);
 }
 
 static OAC_INLINE int16x8_t vpaddq_s16(int16x8_t a, int16x8_t b) {
-  return vcombine_s16(vpadd_s16(vget_low_s16(a), vget_high_s16(a)), vpadd_s16(vget_low_s16(b), vget_high_s16(b)));
+    return vcombine_s16(vpadd_s16(vget_low_s16(a), vget_high_s16(a)), vpadd_s16(vget_low_s16(b), vget_high_s16(b)));
 }
 
 static OAC_INLINE int16x8_t vmull_high_s8(int8x16_t a, int8x16_t b) {
-  return vmull_s8(vget_high_s8(a), vget_high_s8(b));
+    return vmull_s8(vget_high_s8(a), vget_high_s8(b));
 }
 #endif
 
 #ifdef __ARM_FEATURE_FMA
 /* If we can, force the compiler to use an FMA instruction rather than break
    vmlaq_f32() into fmul/fadd. */
-#define vmlaq_f32(a,b,c) vfmaq_f32(a,b,c)
+# define vmlaq_f32(a, b, c) vfmaq_f32(a, b, c)
 #endif
 
 #ifndef LPCNET_TEST
 static inline float32x4_t exp4_approx(float32x4_t x) {
-  int32x4_t i;
-  float32x4_t xf;
+    int32x4_t i;
+    float32x4_t xf;
 
-  x = vmaxq_f32(vminq_f32(x, vdupq_n_f32(88.f)), vdupq_n_f32(-88.f));
+    x = vmaxq_f32(vminq_f32(x, vdupq_n_f32(88.f)), vdupq_n_f32(-88.f));
 
-  /* express exp(x) as exp2(x/log(2)), add 127 for the exponent later */
-  x = vmlaq_f32(vdupq_n_f32(127.f), x, vdupq_n_f32(1.44269504f));
+    /* express exp(x) as exp2(x/log(2)), add 127 for the exponent later */
+    x = vmlaq_f32(vdupq_n_f32(127.f), x, vdupq_n_f32(1.44269504f));
 
-  /* split into integer and fractional parts */
-  i = vcvtq_s32_f32(x);
-  xf = vcvtq_f32_s32(i);
-  x = vsubq_f32(x, xf);
+    /* split into integer and fractional parts */
+    i = vcvtq_s32_f32(x);
+    xf = vcvtq_f32_s32(i);
+    x = vsubq_f32(x, xf);
 
-  float32x4_t K0 = vdupq_n_f32(0.99992522f);
-  float32x4_t K1 = vdupq_n_f32(0.69583354f);
-  float32x4_t K2 = vdupq_n_f32(0.22606716f);
-  float32x4_t K3 = vdupq_n_f32(0.078024523f);
-  float32x4_t Y = vmlaq_f32(K0, x, vmlaq_f32(K1, x, vmlaq_f32(K2, K3, x)));
+    float32x4_t K0 = vdupq_n_f32(0.99992522f);
+    float32x4_t K1 = vdupq_n_f32(0.69583354f);
+    float32x4_t K2 = vdupq_n_f32(0.22606716f);
+    float32x4_t K3 = vdupq_n_f32(0.078024523f);
+    float32x4_t Y = vmlaq_f32(K0, x, vmlaq_f32(K1, x, vmlaq_f32(K2, K3, x)));
 
-  /* compute 2^i */
-  float32x4_t exponent = vreinterpretq_f32_s32(vshlq_n_s32(i, 23));
+    /* compute 2^i */
+    float32x4_t exponent = vreinterpretq_f32_s32(vshlq_n_s32(i, 23));
 
-  Y = vmulq_f32(Y, exponent);
-  return Y;
+    Y = vmulq_f32(Y, exponent);
+    return Y;
 }
 
-static inline float32x4_t tanh4_approx(float32x4_t X)
-{
-  const float32x4_t N0 = vdupq_n_f32(952.52801514f);
-  const float32x4_t N1 = vdupq_n_f32(96.39235687f);
-  const float32x4_t N2 = vdupq_n_f32(0.60863042f);
-  const float32x4_t D0 = vdupq_n_f32(952.72399902f);
-  const float32x4_t D1 = vdupq_n_f32(413.36801147f);
-  const float32x4_t D2 = vdupq_n_f32(11.88600922f);
-  const float32x4_t max_out = vdupq_n_f32(1.f);
-  const float32x4_t min_out = vdupq_n_f32(-1.f);
-  float32x4_t X2, num, den;
-  X2 = vmulq_f32(X, X);
-  num = vmlaq_f32(N0, X2, vmlaq_f32(N1, N2, X2));
-  den = vmlaq_f32(D0, X2, vmlaq_f32(D1, D2, X2));
-  num = vmulq_f32(num, X);
-  den = vrecpeq_f32(den);
-  num = vmulq_f32(num, den);
-  return vmaxq_f32(min_out, vminq_f32(max_out, num));
+static inline float32x4_t tanh4_approx(float32x4_t X) {
+    const float32x4_t N0 = vdupq_n_f32(952.52801514f);
+    const float32x4_t N1 = vdupq_n_f32(96.39235687f);
+    const float32x4_t N2 = vdupq_n_f32(0.60863042f);
+    const float32x4_t D0 = vdupq_n_f32(952.72399902f);
+    const float32x4_t D1 = vdupq_n_f32(413.36801147f);
+    const float32x4_t D2 = vdupq_n_f32(11.88600922f);
+    const float32x4_t max_out = vdupq_n_f32(1.f);
+    const float32x4_t min_out = vdupq_n_f32(-1.f);
+    float32x4_t X2, num, den;
+    X2 = vmulq_f32(X, X);
+    num = vmlaq_f32(N0, X2, vmlaq_f32(N1, N2, X2));
+    den = vmlaq_f32(D0, X2, vmlaq_f32(D1, D2, X2));
+    num = vmulq_f32(num, X);
+    den = vrecpeq_f32(den);
+    num = vmulq_f32(num, den);
+    return vmaxq_f32(min_out, vminq_f32(max_out, num));
 }
 
-static inline float32x4_t sigmoid4_approx(float32x4_t X)
-{
-  const float32x4_t N0 = vdupq_n_f32(238.13200378f);
-  const float32x4_t N1 = vdupq_n_f32(6.02452230f);
-  const float32x4_t N2 = vdupq_n_f32(0.00950985f);
-  const float32x4_t D0 = vdupq_n_f32(952.72399902f);
-  const float32x4_t D1 = vdupq_n_f32(103.34200287f);
-  const float32x4_t D2 = vdupq_n_f32(0.74287558f);
-  const float32x4_t half = vdupq_n_f32(0.5f);
-  const float32x4_t max_out = vdupq_n_f32(1.f);
-  const float32x4_t min_out = vdupq_n_f32(0.f);
-  float32x4_t X2, num, den;
-  X2 = vmulq_f32(X, X);
-  num = vmlaq_f32(N0, X2, vmlaq_f32(N1, N2, X2));
-  den = vmlaq_f32(D0, X2, vmlaq_f32(D1, D2, X2));
-  num = vmulq_f32(num, X);
-  den = vrecpeq_f32(den);
-  num = vmlaq_f32(half, num, den);
-  return vmaxq_f32(min_out, vminq_f32(max_out, num));
+static inline float32x4_t sigmoid4_approx(float32x4_t X) {
+    const float32x4_t N0 = vdupq_n_f32(238.13200378f);
+    const float32x4_t N1 = vdupq_n_f32(6.02452230f);
+    const float32x4_t N2 = vdupq_n_f32(0.00950985f);
+    const float32x4_t D0 = vdupq_n_f32(952.72399902f);
+    const float32x4_t D1 = vdupq_n_f32(103.34200287f);
+    const float32x4_t D2 = vdupq_n_f32(0.74287558f);
+    const float32x4_t half = vdupq_n_f32(0.5f);
+    const float32x4_t max_out = vdupq_n_f32(1.f);
+    const float32x4_t min_out = vdupq_n_f32(0.f);
+    float32x4_t X2, num, den;
+    X2 = vmulq_f32(X, X);
+    num = vmlaq_f32(N0, X2, vmlaq_f32(N1, N2, X2));
+    den = vmlaq_f32(D0, X2, vmlaq_f32(D1, D2, X2));
+    num = vmulq_f32(num, X);
+    den = vrecpeq_f32(den);
+    num = vmlaq_f32(half, num, den);
+    return vmaxq_f32(min_out, vminq_f32(max_out, num));
 }
 
-static inline float lpcnet_exp(float x)
-{
-   float out[4];
-   float32x4_t X, Y;
-   X = vdupq_n_f32(x);
-   Y = exp4_approx(X);
-   vst1q_f32(out, Y);
-   return out[0];
+static inline float lpcnet_exp(float x) {
+    float out[4];
+    float32x4_t X, Y;
+    X = vdupq_n_f32(x);
+    Y = exp4_approx(X);
+    vst1q_f32(out, Y);
+    return out[0];
 }
 
-static inline float tanh_approx(float x)
-{
-   float out[4];
-   float32x4_t X, Y;
-   X = vdupq_n_f32(x);
-   Y = tanh4_approx(X);
-   vst1q_f32(out, Y);
-   return out[0];
+static inline float tanh_approx(float x) {
+    float out[4];
+    float32x4_t X, Y;
+    X = vdupq_n_f32(x);
+    Y = tanh4_approx(X);
+    vst1q_f32(out, Y);
+    return out[0];
 }
 
-static inline float sigmoid_approx(float x)
-{
-   float out[4];
-   float32x4_t X, Y;
-   X = vdupq_n_f32(x);
-   Y = sigmoid4_approx(X);
-   vst1q_f32(out, Y);
-   return out[0];
+static inline float sigmoid_approx(float x) {
+    float out[4];
+    float32x4_t X, Y;
+    X = vdupq_n_f32(x);
+    Y = sigmoid4_approx(X);
+    vst1q_f32(out, Y);
+    return out[0];
 }
 
-static inline void softmax(float *y, const float *x, int N)
-{
+static inline void softmax(float *y, const float *x, int N) {
     int i;
-    for (i=0;i<N-3;i+=4)
-    {
+    for (i = 0; i < N - 3; i += 4) {
         float32x4_t X, Y;
         X = vld1q_f32(&x[i]);
         Y = exp4_approx(X);
         vst1q_f32(&y[i], Y);
     }
-    for (;i<N;i++)
+    for (; i < N; i++)
         y[i] = lpcnet_exp(x[i]);
 }
 
-static inline void vec_tanh(float *y, const float *x, int N)
-{
+static inline void vec_tanh(float *y, const float *x, int N) {
     int i;
-    for (i=0;i<N-3;i+=4)
-    {
+    for (i = 0; i < N - 3; i += 4) {
         float32x4_t X, Y;
         X = vld1q_f32(&x[i]);
         Y = tanh4_approx(X);
         vst1q_f32(&y[i], Y);
     }
-    for (;i<N;i++)
-    {
+    for (; i < N; i++) {
         float ex2;
         ex2 = lpcnet_exp(2*x[i]);
-        y[i] = (ex2-1)/(ex2+1);
+        y[i] = (ex2 - 1)/(ex2 + 1);
     }
 }
 
-static inline void vec_sigmoid(float *y, const float *x, int N)
-{
+static inline void vec_sigmoid(float *y, const float *x, int N) {
     int i;
-    for (i=0;i<N-3;i+=4)
-    {
+    for (i = 0; i < N - 3; i += 4) {
         float32x4_t X, Y;
         X = vld1q_f32(&x[i]);
         Y = sigmoid4_approx(X);
         vst1q_f32(&y[i], Y);
     }
-    for (;i<N;i++)
-    {
+    for (; i < N; i++) {
         float ex;
         ex = lpcnet_exp(x[i]);
-        y[i] = (ex)/(ex+1);
+        y[i] = (ex)/(ex + 1);
     }
 }
 #endif
 
-static inline void sgemv16x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x)
-{
+static inline void sgemv16x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x) {
     int i, j;
-    for (i=0;i<rows;i+=16)
-    {
-	float * restrict y = &out[i];
+    for (i = 0; i < rows; i += 16) {
+        float * restrict y = &out[i];
 
-	/* keep y[0..15] in registers for duration of inner loop */
+        /* keep y[0..15] in registers for duration of inner loop */
 
-	float32x4_t y0_3 = vdupq_n_f32(0);
-	float32x4_t y4_7 = vdupq_n_f32(0);
-	float32x4_t y8_11 = vdupq_n_f32(0);
-	float32x4_t y12_15 = vdupq_n_f32(0);
+        float32x4_t y0_3 = vdupq_n_f32(0);
+        float32x4_t y4_7 = vdupq_n_f32(0);
+        float32x4_t y8_11 = vdupq_n_f32(0);
+        float32x4_t y12_15 = vdupq_n_f32(0);
 
-	for (j=0;j<cols;j++)
-	{
-	    const float * restrict w;
-	    float32x4_t wvec0_3, wvec4_7, wvec8_11, wvec12_15;
-	    float32x4_t xj;
+        for (j = 0; j < cols; j++) {
+            const float * restrict w;
+            float32x4_t wvec0_3, wvec4_7, wvec8_11, wvec12_15;
+            float32x4_t xj;
 
-	    w = &weights[j*col_stride + i];
-	    wvec0_3 = vld1q_f32(&w[0]);
-	    wvec4_7 = vld1q_f32(&w[4]);
-	    wvec8_11 = vld1q_f32(&w[8]);
-	    wvec12_15 = vld1q_f32(&w[12]);
+            w = &weights[j*col_stride + i];
+            wvec0_3 = vld1q_f32(&w[0]);
+            wvec4_7 = vld1q_f32(&w[4]);
+            wvec8_11 = vld1q_f32(&w[8]);
+            wvec12_15 = vld1q_f32(&w[12]);
 
-	    xj = vld1q_dup_f32(&x[j]);
+            xj = vld1q_dup_f32(&x[j]);
 
-	    y0_3 = vmlaq_f32(y0_3, wvec0_3, xj);
-	    y4_7 = vmlaq_f32(y4_7, wvec4_7, xj);
-	    y8_11 = vmlaq_f32(y8_11, wvec8_11, xj);
-	    y12_15 = vmlaq_f32(y12_15, wvec12_15, xj);
-	}
+            y0_3 = vmlaq_f32(y0_3, wvec0_3, xj);
+            y4_7 = vmlaq_f32(y4_7, wvec4_7, xj);
+            y8_11 = vmlaq_f32(y8_11, wvec8_11, xj);
+            y12_15 = vmlaq_f32(y12_15, wvec12_15, xj);
+        }
 
-	/* save y[0..15] back to memory */
+        /* save y[0..15] back to memory */
 
-	vst1q_f32(&y[0], y0_3);
-	vst1q_f32(&y[4], y4_7);
-	vst1q_f32(&y[8], y8_11);
-	vst1q_f32(&y[12], y12_15);
+        vst1q_f32(&y[0], y0_3);
+        vst1q_f32(&y[4], y4_7);
+        vst1q_f32(&y[8], y8_11);
+        vst1q_f32(&y[12], y12_15);
 
     }
 }
 
-static inline void sgemv8x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x)
-{
+static inline void sgemv8x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x) {
     int i, j;
-    for (i=0;i<rows;i+=8)
-    {
-    float * restrict y = &out[i];
+    for (i = 0; i < rows; i += 8) {
+        float * restrict y = &out[i];
 
-    /* keep y[0..15] in registers for duration of inner loop */
+        /* keep y[0..15] in registers for duration of inner loop */
 
-    float32x4_t y0_3 = vdupq_n_f32(0);
-    float32x4_t y4_7 = vdupq_n_f32(0);
+        float32x4_t y0_3 = vdupq_n_f32(0);
+        float32x4_t y4_7 = vdupq_n_f32(0);
 
-    for (j=0;j<cols;j++)
-    {
-        const float * restrict w;
-        float32x4_t wvec0_3, wvec4_7;
-        float32x4_t xj;
+        for (j = 0; j < cols; j++) {
+            const float * restrict w;
+            float32x4_t wvec0_3, wvec4_7;
+            float32x4_t xj;
 
-        w = &weights[j*col_stride + i];
-        wvec0_3 = vld1q_f32(&w[0]);
-        wvec4_7 = vld1q_f32(&w[4]);
+            w = &weights[j*col_stride + i];
+            wvec0_3 = vld1q_f32(&w[0]);
+            wvec4_7 = vld1q_f32(&w[4]);
 
-        xj = vld1q_dup_f32(&x[j]);
+            xj = vld1q_dup_f32(&x[j]);
 
-        y0_3 = vmlaq_f32(y0_3, wvec0_3, xj);
-        y4_7 = vmlaq_f32(y4_7, wvec4_7, xj);
-    }
+            y0_3 = vmlaq_f32(y0_3, wvec0_3, xj);
+            y4_7 = vmlaq_f32(y4_7, wvec4_7, xj);
+        }
 
-    /* save y[0..15] back to memory */
+        /* save y[0..15] back to memory */
 
-    vst1q_f32(&y[0], y0_3);
-    vst1q_f32(&y[4], y4_7);
+        vst1q_f32(&y[0], y0_3);
+        vst1q_f32(&y[4], y4_7);
     }
 }
 
-static inline void sgemv(float *out, const float *weights, int rows, int cols, int col_stride, const float *x)
-{
-   if ((rows&0xf) == 0) sgemv16x1(out, weights, rows, cols, col_stride, x);
-   else if ((rows&0x7) == 0) sgemv8x1(out, weights, rows, cols, col_stride, x);
-   else {
-      int i, j;
-      for (i=0;i<rows;i++)
-      {
-         out[i] = 0;
-         for (j=0;j<cols;j++) out[i] += weights[j*col_stride + i]*x[j];
-      }
-   }
+static inline void sgemv(float *out, const float *weights, int rows, int cols, int col_stride, const float *x) {
+    if ((rows&0xf) == 0) sgemv16x1(out, weights, rows, cols, col_stride, x);
+    else if ((rows&0x7) == 0) sgemv8x1(out, weights, rows, cols, col_stride, x);
+    else {
+        int i, j;
+        for (i = 0; i < rows; i++) {
+            out[i] = 0;
+            for (j = 0; j < cols; j++) out[i] += weights[j*col_stride + i]*x[j];
+        }
+    }
 }
 
 /* Temporarily use unoptimized version */
-static inline void sparse_sgemv8x4(float *out, const float *w, const int *idx, int rows, const float *x)
-{
-   int i, j;
-   OAC_CLEAR(out, rows);
-   for (i=0;i<rows;i+=8)
-   {
-      int cols;
-      cols = *idx++;
-      for (j=0;j<cols;j++)
-      {
-         int pos;
-         float * restrict y;
-         float xj0, xj1, xj2, xj3;
-         pos = (*idx++);
-         xj0 = x[pos+0];
-         xj1 = x[pos+1];
-         xj2 = x[pos+2];
-         xj3 = x[pos+3];
-         y = &out[i];
-         y[0] += w[0]*xj0;
-         y[1] += w[1]*xj0;
-         y[2] += w[2]*xj0;
-         y[3] += w[3]*xj0;
-         y[4] += w[4]*xj0;
-         y[5] += w[5]*xj0;
-         y[6] += w[6]*xj0;
-         y[7] += w[7]*xj0;
-
-         y[0] += w[8]*xj1;
-         y[1] += w[9]*xj1;
-         y[2] += w[10]*xj1;
-         y[3] += w[11]*xj1;
-         y[4] += w[12]*xj1;
-         y[5] += w[13]*xj1;
-         y[6] += w[14]*xj1;
-         y[7] += w[15]*xj1;
-
-         y[0] += w[16]*xj2;
-         y[1] += w[17]*xj2;
-         y[2] += w[18]*xj2;
-         y[3] += w[19]*xj2;
-         y[4] += w[20]*xj2;
-         y[5] += w[21]*xj2;
-         y[6] += w[22]*xj2;
-         y[7] += w[23]*xj2;
-
-         y[0] += w[24]*xj3;
-         y[1] += w[25]*xj3;
-         y[2] += w[26]*xj3;
-         y[3] += w[27]*xj3;
-         y[4] += w[28]*xj3;
-         y[5] += w[29]*xj3;
-         y[6] += w[30]*xj3;
-         y[7] += w[31]*xj3;
-         w += 32;
-      }
-   }
+static inline void sparse_sgemv8x4(float *out, const float *w, const int *idx, int rows, const float *x) {
+    int i, j;
+    OAC_CLEAR(out, rows);
+    for (i = 0; i < rows; i += 8) {
+        int cols;
+        cols = *idx++;
+        for (j = 0; j < cols; j++) {
+            int pos;
+            float * restrict y;
+            float xj0, xj1, xj2, xj3;
+            pos = (*idx++);
+            xj0 = x[pos + 0];
+            xj1 = x[pos + 1];
+            xj2 = x[pos + 2];
+            xj3 = x[pos + 3];
+            y = &out[i];
+            y[0] += w[0]*xj0;
+            y[1] += w[1]*xj0;
+            y[2] += w[2]*xj0;
+            y[3] += w[3]*xj0;
+            y[4] += w[4]*xj0;
+            y[5] += w[5]*xj0;
+            y[6] += w[6]*xj0;
+            y[7] += w[7]*xj0;
+
+            y[0] += w[8]*xj1;
+            y[1] += w[9]*xj1;
+            y[2] += w[10]*xj1;
+            y[3] += w[11]*xj1;
+            y[4] += w[12]*xj1;
+            y[5] += w[13]*xj1;
+            y[6] += w[14]*xj1;
+            y[7] += w[15]*xj1;
+
+            y[0] += w[16]*xj2;
+            y[1] += w[17]*xj2;
+            y[2] += w[18]*xj2;
+            y[3] += w[19]*xj2;
+            y[4] += w[20]*xj2;
+            y[5] += w[21]*xj2;
+            y[6] += w[22]*xj2;
+            y[7] += w[23]*xj2;
+
+            y[0] += w[24]*xj3;
+            y[1] += w[25]*xj3;
+            y[2] += w[26]*xj3;
+            y[3] += w[27]*xj3;
+            y[4] += w[28]*xj3;
+            y[5] += w[29]*xj3;
+            y[6] += w[30]*xj3;
+            y[7] += w[31]*xj3;
+            w += 32;
+        }
+    }
 }
 
 
@@ -367,106 +343,99 @@ static inline void sparse_sgemv8x4(float *out, const float *w, const int *idx, i
 
 #if __ARM_FEATURE_DOTPROD
 static inline int32x4_t vdotprod(int32x4_t acc, int8x16_t a, int8x16_t b) {
-  return vdotq_s32(acc, a, b);
+    return vdotq_s32(acc, a, b);
 }
 #else
-static inline int32x4_t vdotprod(int32x4_t acc, int8x16_t a, int8x16_t b)
-{
-  return vpadalq_s16(acc, vpaddq_s16(vmull_s8(vget_low_s8(a), vget_low_s8(b)),  vmull_high_s8(a, b)));
+static inline int32x4_t vdotprod(int32x4_t acc, int8x16_t a, int8x16_t b) {
+    return vpadalq_s16(acc, vpaddq_s16(vmull_s8(vget_low_s8(a), vget_low_s8(b)),  vmull_high_s8(a, b)));
 }
 #endif
 
-static inline void cgemv8x4(float *_out, const oac_int8 *w, const float *scale, int rows, int cols, const float *_x)
-{
-   int i, j;
-   oac_int32 x_int[MAX_INPUTS/4];
-   oac_int8 *x = (oac_int8*) x_int;
-   const float32x4_t const127 = vdupq_n_f32(127.);
-   for (i=0;i<cols;i+=8) {
-      int32x4_t xi0, xi4;
-      int16x8_t x_short;
-      xi0 = vcvtnq_s32_f32(vmulq_f32(const127, vld1q_f32(&_x[i])));
-      xi4 = vcvtnq_s32_f32(vmulq_f32(const127, vld1q_f32(&_x[i+4])));
-      x_short = vcombine_s16(vmovn_s32(xi0), vmovn_s32(xi4));
-      vst1_s8(&x[i], vmovn_s16(x_short));
-   }
-   for (i=0;i<rows;i+=8)
-   {
-      int32x4_t acc0, acc1;
-      int32x4_t acc2, acc3;
-      acc0 = vdupq_n_s32(0);
-      acc1 = vdupq_n_s32(0);
-      acc2 = vdupq_n_s32(0);
-      acc3 = vdupq_n_s32(0);
-      j=0;
-      for (;j<cols-4;j+=8)
-      {
-         int8x16_t vw0, vw1, vw2, vw3, vx0, vx1;
-         vx0 = vreinterpretq_s8_s32(vld1q_dup_s32((int*)(void*)&x[j]));
-         vw0 = vld1q_s8(w);
-         vw1 = vld1q_s8(&w[16]);
-         acc0 = vdotprod(acc0, vw0, vx0);
-         acc1 = vdotprod(acc1, vw1, vx0);
-         vx1 = vreinterpretq_s8_s32(vld1q_dup_s32((int*)(void*)&x[j+4]));
-         vw2 = vld1q_s8(&w[32]);
-         vw3 = vld1q_s8(&w[48]);
-         acc2 = vdotprod(acc2, vw2, vx1);
-         acc3 = vdotprod(acc3, vw3, vx1);
-         w += 64;
-      }
-      acc0 = vaddq_s32(acc0, acc2);
-      acc1 = vaddq_s32(acc1, acc3);
-      for (;j<cols;j+=4)
-      {
-         int8x16_t vw0, vw1, vx;
-         vx = vreinterpretq_s8_s32(vld1q_dup_s32((int*)(void*)&x[j]));
-         vw0 = vld1q_s8(w);
-         vw1 = vld1q_s8(&w[16]);
-         acc0 = vdotprod(acc0, vw0, vx);
-         acc1 = vdotprod(acc1, vw1, vx);
-         w += 32;
-      }
-      vst1q_f32(&_out[i], vmulq_f32(vld1q_f32(&scale[i]), vcvtq_f32_s32(acc0)));
-      vst1q_f32(&_out[i+4], vmulq_f32(vld1q_f32(&scale[i+4]), vcvtq_f32_s32(acc1)));
-   }
+static inline void cgemv8x4(float *_out, const oac_int8 *w, const float *scale, int rows, int cols, const float *_x) {
+    int i, j;
+    oac_int32 x_int[MAX_INPUTS/4];
+    oac_int8 *x = (oac_int8*) x_int;
+    const float32x4_t const127 = vdupq_n_f32(127.);
+    for (i = 0; i < cols; i += 8) {
+        int32x4_t xi0, xi4;
+        int16x8_t x_short;
+        xi0 = vcvtnq_s32_f32(vmulq_f32(const127, vld1q_f32(&_x[i])));
+        xi4 = vcvtnq_s32_f32(vmulq_f32(const127, vld1q_f32(&_x[i + 4])));
+        x_short = vcombine_s16(vmovn_s32(xi0), vmovn_s32(xi4));
+        vst1_s8(&x[i], vmovn_s16(x_short));
+    }
+    for (i = 0; i < rows; i += 8) {
+        int32x4_t acc0, acc1;
+        int32x4_t acc2, acc3;
+        acc0 = vdupq_n_s32(0);
+        acc1 = vdupq_n_s32(0);
+        acc2 = vdupq_n_s32(0);
+        acc3 = vdupq_n_s32(0);
+        j = 0;
+        for (; j < cols - 4; j += 8) {
+            int8x16_t vw0, vw1, vw2, vw3, vx0, vx1;
+            vx0 = vreinterpretq_s8_s32(vld1q_dup_s32((int*)(void*)&x[j]));
+            vw0 = vld1q_s8(w);
+            vw1 = vld1q_s8(&w[16]);
+            acc0 = vdotprod(acc0, vw0, vx0);
+            acc1 = vdotprod(acc1, vw1, vx0);
+            vx1 = vreinterpretq_s8_s32(vld1q_dup_s32((int*)(void*)&x[j + 4]));
+            vw2 = vld1q_s8(&w[32]);
+            vw3 = vld1q_s8(&w[48]);
+            acc2 = vdotprod(acc2, vw2, vx1);
+            acc3 = vdotprod(acc3, vw3, vx1);
+            w += 64;
+        }
+        acc0 = vaddq_s32(acc0, acc2);
+        acc1 = vaddq_s32(acc1, acc3);
+        for (; j < cols; j += 4) {
+            int8x16_t vw0, vw1, vx;
+            vx = vreinterpretq_s8_s32(vld1q_dup_s32((int*)(void*)&x[j]));
+            vw0 = vld1q_s8(w);
+            vw1 = vld1q_s8(&w[16]);
+            acc0 = vdotprod(acc0, vw0, vx);
+            acc1 = vdotprod(acc1, vw1, vx);
+            w += 32;
+        }
+        vst1q_f32(&_out[i], vmulq_f32(vld1q_f32(&scale[i]), vcvtq_f32_s32(acc0)));
+        vst1q_f32(&_out[i + 4], vmulq_f32(vld1q_f32(&scale[i + 4]), vcvtq_f32_s32(acc1)));
+    }
 }
 
-static inline void sparse_cgemv8x4(float *_out, const oac_int8 *w, const int *idx, const float *scale, int rows, int cols, const float *_x)
-{
-   int i, j;
-   oac_int32 x_int[MAX_INPUTS/4];
-   oac_int8 *x = (oac_int8*) x_int;
-   const float32x4_t const127 = vdupq_n_f32(127.);
-   for (i=0;i<cols;i+=8) {
-      int32x4_t xi0, xi4;
-      int16x8_t x_short;
-      xi0 = vcvtnq_s32_f32(vmulq_f32(const127, vld1q_f32(&_x[i])));
-      xi4 = vcvtnq_s32_f32(vmulq_f32(const127, vld1q_f32(&_x[i+4])));
-      x_short = vcombine_s16(vmovn_s32(xi0), vmovn_s32(xi4));
-      vst1_s8(&x[i], vmovn_s16(x_short));
-   }
-   for (i=0;i<rows;i+=8)
-   {
-      int colblocks;
-      int32x4_t acc0, acc1;
-      acc0 = vdupq_n_s32(0);
-      acc1 = vdupq_n_s32(0);
-      colblocks = *idx++;
-      for (j=0;j<colblocks;j++)
-      {
-         int pos;
-         pos = (*idx++);
-         int8x16_t vw0, vw1, vx;
-         vx = vreinterpretq_s8_s32(vld1q_dup_s32((int*)(void*)&x[pos]));
-         vw0 = vld1q_s8(w);
-         vw1 = vld1q_s8(&w[16]);
-         acc0 = vdotprod(acc0, vw0, vx);
-         acc1 = vdotprod(acc1, vw1, vx);
-         w += 32;
-      }
-      vst1q_f32(&_out[i], vmulq_f32(vld1q_f32(&scale[i]), vcvtq_f32_s32(acc0)));
-      vst1q_f32(&_out[i+4], vmulq_f32(vld1q_f32(&scale[i+4]), vcvtq_f32_s32(acc1)));
-   }
+static inline void sparse_cgemv8x4(float *_out, const oac_int8 *w, const int *idx, const float *scale, int rows,
+                                   int cols, const float *_x) {
+    int i, j;
+    oac_int32 x_int[MAX_INPUTS/4];
+    oac_int8 *x = (oac_int8*) x_int;
+    const float32x4_t const127 = vdupq_n_f32(127.);
+    for (i = 0; i < cols; i += 8) {
+        int32x4_t xi0, xi4;
+        int16x8_t x_short;
+        xi0 = vcvtnq_s32_f32(vmulq_f32(const127, vld1q_f32(&_x[i])));
+        xi4 = vcvtnq_s32_f32(vmulq_f32(const127, vld1q_f32(&_x[i + 4])));
+        x_short = vcombine_s16(vmovn_s32(xi0), vmovn_s32(xi4));
+        vst1_s8(&x[i], vmovn_s16(x_short));
+    }
+    for (i = 0; i < rows; i += 8) {
+        int colblocks;
+        int32x4_t acc0, acc1;
+        acc0 = vdupq_n_s32(0);
+        acc1 = vdupq_n_s32(0);
+        colblocks = *idx++;
+        for (j = 0; j < colblocks; j++) {
+            int pos;
+            pos = (*idx++);
+            int8x16_t vw0, vw1, vx;
+            vx = vreinterpretq_s8_s32(vld1q_dup_s32((int*)(void*)&x[pos]));
+            vw0 = vld1q_s8(w);
+            vw1 = vld1q_s8(&w[16]);
+            acc0 = vdotprod(acc0, vw0, vx);
+            acc1 = vdotprod(acc1, vw1, vx);
+            w += 32;
+        }
+        vst1q_f32(&_out[i], vmulq_f32(vld1q_f32(&scale[i]), vcvtq_f32_s32(acc0)));
+        vst1q_f32(&_out[i + 4], vmulq_f32(vld1q_f32(&scale[i + 4]), vcvtq_f32_s32(acc1)));
+    }
 }
 
 
diff --git a/dnn/write_lpcnet_weights.c b/dnn/write_lpcnet_weights.c
index 4ccc57aff..698304533 100644
--- a/dnn/write_lpcnet_weights.c
+++ b/dnn/write_lpcnet_weights.c
@@ -22,10 +22,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdio.h>
@@ -39,7 +39,7 @@
    but USE_WEIGHTS_FILE is defined in config.h. */
 #undef HAVE_CONFIG_H
 #ifdef USE_WEIGHTS_FILE
-#undef USE_WEIGHTS_FILE
+# undef USE_WEIGHTS_FILE
 #endif
 #include "pitchdnn_data.c"
 #include "fargan_data.c"
@@ -47,51 +47,49 @@
 #include "dred_rdovae_enc_data.c"
 #include "dred_rdovae_dec_data.c"
 #ifdef ENABLE_OSCE
-#include "lace_data.c"
-#include "nolace_data.c"
+# include "lace_data.c"
+# include "nolace_data.c"
 #endif
 
-void write_weights(const WeightArray *list, FILE *fout)
-{
-  int i=0;
-  unsigned char zeros[WEIGHT_BLOCK_SIZE] = {0};
-  while (list[i].name != NULL) {
-    WeightHead h;
-    if (strlen(list[i].name) >= sizeof(h.name) - 1) {
-      printf("[write_weights] warning: name %s too long\n", list[i].name);
+void write_weights(const WeightArray *list, FILE *fout) {
+    int i = 0;
+    unsigned char zeros[WEIGHT_BLOCK_SIZE] = {0};
+    while (list[i].name != NULL) {
+        WeightHead h;
+        if (strlen(list[i].name) >= sizeof(h.name) - 1) {
+            printf("[write_weights] warning: name %s too long\n", list[i].name);
+        }
+        memcpy(h.head, "DNNw", 4);
+        h.version = WEIGHT_BLOB_VERSION;
+        h.type = list[i].type;
+        h.size = list[i].size;
+        h.block_size = (h.size + WEIGHT_BLOCK_SIZE - 1)/WEIGHT_BLOCK_SIZE*WEIGHT_BLOCK_SIZE;
+        OAC_CLEAR(h.name, sizeof(h.name));
+        strncpy(h.name, list[i].name, sizeof(h.name));
+        h.name[sizeof(h.name) - 1] = 0;
+        celt_assert(sizeof(h) == WEIGHT_BLOCK_SIZE);
+        fwrite(&h, 1, WEIGHT_BLOCK_SIZE, fout);
+        fwrite(list[i].data, 1, h.size, fout);
+        fwrite(zeros, 1, h.block_size - h.size, fout);
+        i++;
     }
-    memcpy(h.head, "DNNw", 4);
-    h.version = WEIGHT_BLOB_VERSION;
-    h.type = list[i].type;
-    h.size = list[i].size;
-    h.block_size = (h.size+WEIGHT_BLOCK_SIZE-1)/WEIGHT_BLOCK_SIZE*WEIGHT_BLOCK_SIZE;
-    OAC_CLEAR(h.name, sizeof(h.name));
-    strncpy(h.name, list[i].name, sizeof(h.name));
-    h.name[sizeof(h.name)-1] = 0;
-    celt_assert(sizeof(h) == WEIGHT_BLOCK_SIZE);
-    fwrite(&h, 1, WEIGHT_BLOCK_SIZE, fout);
-    fwrite(list[i].data, 1, h.size, fout);
-    fwrite(zeros, 1, h.block_size-h.size, fout);
-    i++;
-  }
 }
 
-int main(void)
-{
-  FILE *fout = fopen("weights_blob.bin", "w");
-  write_weights(pitchdnn_arrays, fout);
-  write_weights(fargan_arrays, fout);
-  write_weights(plcmodel_arrays, fout);
-  write_weights(rdovaeenc_arrays, fout);
-  write_weights(rdovaedec_arrays, fout);
+int main(void) {
+    FILE *fout = fopen("weights_blob.bin", "w");
+    write_weights(pitchdnn_arrays, fout);
+    write_weights(fargan_arrays, fout);
+    write_weights(plcmodel_arrays, fout);
+    write_weights(rdovaeenc_arrays, fout);
+    write_weights(rdovaedec_arrays, fout);
 #ifdef ENABLE_OSCE
-#ifndef DISABLE_LACE
-  write_weights(lacelayers_arrays, fout);
+# ifndef DISABLE_LACE
+    write_weights(lacelayers_arrays, fout);
+# endif
+# ifndef DISABLE_NOLACE
+    write_weights(nolacelayers_arrays, fout);
+# endif
 #endif
-#ifndef DISABLE_NOLACE
-  write_weights(nolacelayers_arrays, fout);
-#endif
-#endif
-  fclose(fout);
-  return 0;
+    fclose(fout);
+    return 0;
 }
diff --git a/dnn/x86/dnn_x86.h b/dnn/x86/dnn_x86.h
index c572a0b18..7fe26cde1 100644
--- a/dnn/x86/dnn_x86.h
+++ b/dnn/x86/dnn_x86.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef DNN_X86_H
 #define DNN_X86_H
@@ -34,59 +34,73 @@
 #if defined(OAC_X86_MAY_HAVE_SSE2)
 void compute_linear_sse2(const LinearLayer *linear, float *out, const float *in);
 void compute_activation_sse2(float *output, const float *input, int N, int activation);
-void compute_conv2d_sse2(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride, int activation);
+void compute_conv2d_sse2(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride,
+    int activation);
 #endif
 
 #if defined(OAC_X86_MAY_HAVE_SSE4_1)
 void compute_linear_sse4_1(const LinearLayer *linear, float *out, const float *in);
 void compute_activation_sse4_1(float *output, const float *input, int N, int activation);
-void compute_conv2d_sse4_1(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride, int activation);
+void compute_conv2d_sse4_1(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride,
+    int activation);
 #endif
 
 #if defined(OAC_X86_MAY_HAVE_AVX2)
 void compute_linear_avx2(const LinearLayer *linear, float *out, const float *in);
 void compute_activation_avx2(float *output, const float *input, int N, int activation);
-void compute_conv2d_avx2(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride, int activation);
+void compute_conv2d_avx2(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride,
+    int activation);
 #endif
 
 
 #if defined(OAC_X86_PRESUME_AVX2)
 
-#define OVERRIDE_COMPUTE_LINEAR
-#define compute_linear(linear, out, in, arch) ((void)(arch),compute_linear_avx2(linear, out, in))
-#define OVERRIDE_COMPUTE_ACTIVATION
-#define compute_activation(output, input, N, activation, arch) ((void)(arch),compute_activation_avx2(output, input, N, activation))
-#define OVERRIDE_COMPUTE_CONV2D
-#define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch),compute_conv2d_avx2(conv, out, mem, in, height, hstride, activation))
+# define OVERRIDE_COMPUTE_LINEAR
+# define compute_linear(linear, out, in, arch) ((void)(arch), compute_linear_avx2(linear, out, in))
+# define OVERRIDE_COMPUTE_ACTIVATION
+# define compute_activation(output, input, N, activation, arch) ((void)(arch), \
+                                                                 compute_activation_avx2(output, input, N, activation))
+# define OVERRIDE_COMPUTE_CONV2D
+# define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch), \
+                                                                                compute_conv2d_avx2(conv, out, mem, in, \
+    height, hstride, activation))
 
 #elif defined(OAC_X86_PRESUME_SSE4_1) && !defined(OAC_X86_MAY_HAVE_AVX2)
 
-#define OVERRIDE_COMPUTE_LINEAR
-#define compute_linear(linear, out, in, arch) ((void)(arch),compute_linear_sse4_1(linear, out, in))
-#define OVERRIDE_COMPUTE_ACTIVATION
-#define compute_activation(output, input, N, activation, arch) ((void)(arch),compute_activation_sse4_1(output, input, N, activation))
-#define OVERRIDE_COMPUTE_CONV2D
-#define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch),compute_conv2d_sse4_1(conv, out, mem, in, height, hstride, activation))
+# define OVERRIDE_COMPUTE_LINEAR
+# define compute_linear(linear, out, in, arch) ((void)(arch), compute_linear_sse4_1(linear, out, in))
+# define OVERRIDE_COMPUTE_ACTIVATION
+# define compute_activation(output, input, N, activation, arch) ((void)(arch), \
+                                                                 compute_activation_sse4_1(output, input, N, \
+    activation))
+# define OVERRIDE_COMPUTE_CONV2D
+# define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch), \
+                                                                                compute_conv2d_sse4_1(conv, out, mem, \
+    in, height, hstride, activation))
 
 #elif defined(OAC_X86_PRESUME_SSE2) && !defined(OAC_X86_MAY_HAVE_AVX2) && !defined(OAC_X86_MAY_HAVE_SSE4_1)
 
-#define OVERRIDE_COMPUTE_LINEAR
-#define compute_linear(linear, out, in, arch) ((void)(arch),compute_linear_sse2(linear, out, in))
-#define OVERRIDE_COMPUTE_ACTIVATION
-#define compute_activation(output, input, N, activation, arch) ((void)(arch),compute_activation_sse2(output, input, N, activation))
-#define OVERRIDE_COMPUTE_CONV2D
-#define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch),compute_conv2d_sse2(conv, out, mem, in, height, hstride, activation))
+# define OVERRIDE_COMPUTE_LINEAR
+# define compute_linear(linear, out, in, arch) ((void)(arch), compute_linear_sse2(linear, out, in))
+# define OVERRIDE_COMPUTE_ACTIVATION
+# define compute_activation(output, input, N, activation, arch) ((void)(arch), \
+                                                                 compute_activation_sse2(output, input, N, activation))
+# define OVERRIDE_COMPUTE_CONV2D
+# define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch), \
+                                                                                compute_conv2d_sse2(conv, out, mem, in, \
+    height, hstride, activation))
 
-#elif defined(OAC_HAVE_RTCD) && (defined(OAC_X86_MAY_HAVE_AVX2) || defined(OAC_X86_MAY_HAVE_SSE4_1) || defined(OAC_X86_MAY_HAVE_SSE2))
+#elif defined(OAC_HAVE_RTCD) && (defined(OAC_X86_MAY_HAVE_AVX2) || defined(OAC_X86_MAY_HAVE_SSE4_1) \
+    || defined(OAC_X86_MAY_HAVE_SSE2))
 
 extern void (*const DNN_COMPUTE_LINEAR_IMPL[OAC_ARCHMASK + 1])(
                     const LinearLayer *linear,
                     float *out,
                     const float *in
-                    );
-#define OVERRIDE_COMPUTE_LINEAR
-#define compute_linear(linear, out, in, arch) \
-    ((*DNN_COMPUTE_LINEAR_IMPL[(arch) & OAC_ARCHMASK])(linear, out, in))
+    );
+# define OVERRIDE_COMPUTE_LINEAR
+# define compute_linear(linear, out, in, arch) \
+        ((*DNN_COMPUTE_LINEAR_IMPL[(arch)&OAC_ARCHMASK])(linear, out, in))
 
 
 extern void (*const DNN_COMPUTE_ACTIVATION_IMPL[OAC_ARCHMASK + 1])(
@@ -94,10 +108,10 @@ extern void (*const DNN_COMPUTE_ACTIVATION_IMPL[OAC_ARCHMASK + 1])(
                     const float *input,
                     int N,
                     int activation
-                    );
-#define OVERRIDE_COMPUTE_ACTIVATION
-#define compute_activation(output, input, N, activation, arch) \
-    ((*DNN_COMPUTE_ACTIVATION_IMPL[(arch) & OAC_ARCHMASK])(output, input, N, activation))
+    );
+# define OVERRIDE_COMPUTE_ACTIVATION
+# define compute_activation(output, input, N, activation, arch) \
+        ((*DNN_COMPUTE_ACTIVATION_IMPL[(arch)&OAC_ARCHMASK])(output, input, N, activation))
 
 
 extern void (*const DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
@@ -108,10 +122,10 @@ extern void (*const DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
                     int height,
                     int hstride,
                     int activation
-                    );
-#define OVERRIDE_COMPUTE_CONV2D
-#define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) \
-    ((*DNN_COMPUTE_CONV2D_IMPL[(arch) & OAC_ARCHMASK])(conv, out, mem, in, height, hstride, activation))
+    );
+# define OVERRIDE_COMPUTE_CONV2D
+# define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) \
+        ((*DNN_COMPUTE_CONV2D_IMPL[(arch)&OAC_ARCHMASK])(conv, out, mem, in, height, hstride, activation))
 
 
 #endif
diff --git a/dnn/x86/nnet_avx2.c b/dnn/x86/nnet_avx2.c
index 41037fcc8..b8c17f9b3 100644
--- a/dnn/x86/nnet_avx2.c
+++ b/dnn/x86/nnet_avx2.c
@@ -23,16 +23,16 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "x86/x86_arch_macros.h"
 
 #ifndef __AVX2__
-#error nnet_avx2.c is being compiled without AVX2 enabled
+# error nnet_avx2.c is being compiled without AVX2 enabled
 #endif
 
 #define RTCD_ARCH avx2
diff --git a/dnn/x86/nnet_sse2.c b/dnn/x86/nnet_sse2.c
index 447b947c2..6d1e4a82d 100644
--- a/dnn/x86/nnet_sse2.c
+++ b/dnn/x86/nnet_sse2.c
@@ -23,16 +23,16 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "x86/x86_arch_macros.h"
 
 #ifndef __SSE2__
-#error nnet_sse2.c is being compiled without SSE2 enabled
+# error nnet_sse2.c is being compiled without SSE2 enabled
 #endif
 
 #define RTCD_ARCH sse2
diff --git a/dnn/x86/nnet_sse4_1.c b/dnn/x86/nnet_sse4_1.c
index 224926e5a..fa3da6d24 100644
--- a/dnn/x86/nnet_sse4_1.c
+++ b/dnn/x86/nnet_sse4_1.c
@@ -23,16 +23,16 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "x86/x86_arch_macros.h"
 
 #ifndef __SSE4_1__
-#error nnet_sse4_1.c is being compiled without SSE4.1 enabled
+# error nnet_sse4_1.c is being compiled without SSE4.1 enabled
 #endif
 
 #define RTCD_ARCH sse4_1
diff --git a/dnn/x86/x86_dnn_map.c b/dnn/x86/x86_dnn_map.c
index e08af0557..16a92555b 100644
--- a/dnn/x86/x86_dnn_map.c
+++ b/dnn/x86/x86_dnn_map.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "x86/x86cpu.h"
@@ -34,18 +34,18 @@
 
 #if defined(OAC_HAVE_RTCD)
 
-#if (defined(OAC_X86_MAY_HAVE_SSE2) && !defined(OAC_X86_PRESUME_AVX2))
+# if (defined(OAC_X86_MAY_HAVE_SSE2) && !defined(OAC_X86_PRESUME_AVX2))
 
 void (*const DNN_COMPUTE_LINEAR_IMPL[OAC_ARCHMASK + 1])(
          const LinearLayer *linear,
          float *out,
          const float *in
-) = {
-  compute_linear_c,                /* non-sse */
-  compute_linear_c,
-  MAY_HAVE_SSE2(compute_linear),
-  MAY_HAVE_SSE4_1(compute_linear), /* sse4.1  */
-  MAY_HAVE_AVX2(compute_linear)  /* avx  */
+    ) = {
+    compute_linear_c,              /* non-sse */
+    compute_linear_c,
+    MAY_HAVE_SSE2(compute_linear),
+    MAY_HAVE_SSE4_1(compute_linear), /* sse4.1  */
+    MAY_HAVE_AVX2(compute_linear) /* avx  */
 };
 
 void (*const DNN_COMPUTE_ACTIVATION_IMPL[OAC_ARCHMASK + 1])(
@@ -53,12 +53,12 @@ void (*const DNN_COMPUTE_ACTIVATION_IMPL[OAC_ARCHMASK + 1])(
          const float *input,
          int N,
          int activation
-) = {
-  compute_activation_c,                /* non-sse */
-  compute_activation_c,
-  MAY_HAVE_SSE2(compute_activation),
-  MAY_HAVE_SSE4_1(compute_activation), /* sse4.1  */
-  MAY_HAVE_AVX2(compute_activation)  /* avx  */
+    ) = {
+    compute_activation_c,              /* non-sse */
+    compute_activation_c,
+    MAY_HAVE_SSE2(compute_activation),
+    MAY_HAVE_SSE4_1(compute_activation), /* sse4.1  */
+    MAY_HAVE_AVX2(compute_activation) /* avx  */
 };
 
 void (*const DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
@@ -69,15 +69,15 @@ void (*const DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
          int height,
          int hstride,
          int activation
-) = {
-  compute_conv2d_c,                /* non-sse */
-  compute_conv2d_c,
-  MAY_HAVE_SSE2(compute_conv2d),
-  MAY_HAVE_SSE4_1(compute_conv2d), /* sse4.1  */
-  MAY_HAVE_AVX2(compute_conv2d)  /* avx  */
+    ) = {
+    compute_conv2d_c,              /* non-sse */
+    compute_conv2d_c,
+    MAY_HAVE_SSE2(compute_conv2d),
+    MAY_HAVE_SSE4_1(compute_conv2d), /* sse4.1  */
+    MAY_HAVE_AVX2(compute_conv2d) /* avx  */
 };
 
-#endif
+# endif
 
 
 #endif
diff --git a/doc/trivial_example.c b/doc/trivial_example.c
index df3a7d14f..ff104dc28 100644
--- a/doc/trivial_example.c
+++ b/doc/trivial_example.c
@@ -22,7 +22,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 /* This is meant to be a simple example of encoding and decoding audio
    using Oac. It should make it easy to understand how the Oac API
@@ -45,127 +45,114 @@
 #define MAX_FRAME_SIZE 6*960
 #define MAX_PACKET_SIZE (3*1276)
 
-int main(int argc, char **argv)
-{
-   char *inFile;
-   FILE *fin;
-   char *outFile;
-   FILE *fout;
-   oac_int16 in[FRAME_SIZE*CHANNELS];
-   oac_int16 out[MAX_FRAME_SIZE*CHANNELS];
-   unsigned char cbits[MAX_PACKET_SIZE];
-   int nbBytes;
-   /*Holds the state of the encoder and decoder */
-   OacEncoder *encoder;
-   OacDecoder *decoder;
-   int err;
-
-   if (argc != 3)
-   {
-      fprintf(stderr, "usage: trivial_example input.pcm output.pcm\n");
-      fprintf(stderr, "input and output are 16-bit little-endian raw files\n");
-      return EXIT_FAILURE;
-   }
-
-   /*Create a new encoder state */
-   encoder = oac_encoder_create(SAMPLE_RATE, CHANNELS, APPLICATION, &err);
-   if (err<0)
-   {
-      fprintf(stderr, "failed to create an encoder: %s\n", oac_strerror(err));
-      return EXIT_FAILURE;
-   }
-   /* Set the desired bit-rate. You can also set other parameters if needed.
-      The Oac library is designed to have good defaults, so only set
-      parameters you know you need. Doing otherwise is likely to result
-      in worse quality, but better. */
-   err = oac_encoder_ctl(encoder, OAC_SET_BITRATE(BITRATE));
-   if (err<0)
-   {
-      fprintf(stderr, "failed to set bitrate: %s\n", oac_strerror(err));
-      return EXIT_FAILURE;
-   }
-   inFile = argv[1];
-   fin = fopen(inFile, "rb");
-   if (fin==NULL)
-   {
-      fprintf(stderr, "failed to open input file: %s\n", strerror(errno));
-      return EXIT_FAILURE;
-   }
-
-
-   /* Create a new decoder state. */
-   decoder = oac_decoder_create(SAMPLE_RATE, CHANNELS, &err);
-   if (err<0)
-   {
-      fprintf(stderr, "failed to create decoder: %s\n", oac_strerror(err));
-      return EXIT_FAILURE;
-   }
-   outFile = argv[2];
-   fout = fopen(outFile, "wb");
-   if (fout==NULL)
-   {
-      fprintf(stderr, "failed to open output file: %s\n", strerror(errno));
-      return EXIT_FAILURE;
-   }
-
-   while (1)
-   {
-      int i;
-      unsigned char pcm_bytes[MAX_FRAME_SIZE*CHANNELS*2];
-      int frame_size;
-      size_t samples;
-
-      /* Read a 16 bits/sample audio frame. */
-      samples = fread(pcm_bytes, sizeof(short)*CHANNELS, FRAME_SIZE, fin);
-
-      /* For simplicity, only read whole frames. In a real application,
-       * we'd pad the final partial frame with zeroes, record the exact
-       * duration, and trim the decoded audio to match.
-       */
-      if (samples != FRAME_SIZE)
-      {
-         break;
-      }
-
-      /* Convert from little-endian ordering. */
-      for (i=0;i<CHANNELS*FRAME_SIZE;i++)
-      {
-         in[i]=pcm_bytes[2*i+1]<<8|pcm_bytes[2*i];
-      }
-
-      /* Encode the frame. */
-      nbBytes = oac_encode(encoder, in, FRAME_SIZE, cbits, MAX_PACKET_SIZE);
-      if (nbBytes<0)
-      {
-         fprintf(stderr, "encode failed: %s\n", oac_strerror(nbBytes));
-         return EXIT_FAILURE;
-      }
-
-
-      /* Decode the data. In this example, frame_size will be constant because
-         the encoder is using a constant frame size. However, that may not
-         be the case for all encoders, so the decoder must always check
-         the frame size returned. */
-      frame_size = oac_decode(decoder, cbits, nbBytes, out, MAX_FRAME_SIZE, 0);
-      if (frame_size<0)
-      {
-         fprintf(stderr, "decoder failed: %s\n", oac_strerror(frame_size));
-         return EXIT_FAILURE;
-      }
-
-      /* Convert to little-endian ordering. */
-      for(i=0;i<CHANNELS*frame_size;i++)
-      {
-         pcm_bytes[2*i]=out[i]&0xFF;
-         pcm_bytes[2*i+1]=(out[i]>>8)&0xFF;
-      }
-      /* Write the decoded audio to file. */
-      fwrite(pcm_bytes, sizeof(short), frame_size*CHANNELS, fout);
-   }
-   /*Destroy the encoder state*/
-   oac_encoder_destroy(encoder);
-   oac_decoder_destroy(decoder);
-   fclose(fin);
-   fclose(fout);
-   return EXIT_SUCCESS;
+int main(int argc, char **argv) {
+    char *inFile;
+    FILE *fin;
+    char *outFile;
+    FILE *fout;
+    oac_int16 in[FRAME_SIZE*CHANNELS];
+    oac_int16 out[MAX_FRAME_SIZE*CHANNELS];
+    unsigned char cbits[MAX_PACKET_SIZE];
+    int nbBytes;
+    /*Holds the state of the encoder and decoder */
+    OacEncoder *encoder;
+    OacDecoder *decoder;
+    int err;
+
+    if (argc != 3) {
+        fprintf(stderr, "usage: trivial_example input.pcm output.pcm\n");
+        fprintf(stderr, "input and output are 16-bit little-endian raw files\n");
+        return EXIT_FAILURE;
+    }
+
+    /*Create a new encoder state */
+    encoder = oac_encoder_create(SAMPLE_RATE, CHANNELS, APPLICATION, &err);
+    if (err < 0) {
+        fprintf(stderr, "failed to create an encoder: %s\n", oac_strerror(err));
+        return EXIT_FAILURE;
+    }
+    /* Set the desired bit-rate. You can also set other parameters if needed.
+       The Oac library is designed to have good defaults, so only set
+       parameters you know you need. Doing otherwise is likely to result
+       in worse quality, but better. */
+    err = oac_encoder_ctl(encoder, OAC_SET_BITRATE(BITRATE));
+    if (err < 0) {
+        fprintf(stderr, "failed to set bitrate: %s\n", oac_strerror(err));
+        return EXIT_FAILURE;
+    }
+    inFile = argv[1];
+    fin = fopen(inFile, "rb");
+    if (fin == NULL) {
+        fprintf(stderr, "failed to open input file: %s\n", strerror(errno));
+        return EXIT_FAILURE;
+    }
+
+
+    /* Create a new decoder state. */
+    decoder = oac_decoder_create(SAMPLE_RATE, CHANNELS, &err);
+    if (err < 0) {
+        fprintf(stderr, "failed to create decoder: %s\n", oac_strerror(err));
+        return EXIT_FAILURE;
+    }
+    outFile = argv[2];
+    fout = fopen(outFile, "wb");
+    if (fout == NULL) {
+        fprintf(stderr, "failed to open output file: %s\n", strerror(errno));
+        return EXIT_FAILURE;
+    }
+
+    while (1) {
+        int i;
+        unsigned char pcm_bytes[MAX_FRAME_SIZE*CHANNELS*2];
+        int frame_size;
+        size_t samples;
+
+        /* Read a 16 bits/sample audio frame. */
+        samples = fread(pcm_bytes, sizeof(short)*CHANNELS, FRAME_SIZE, fin);
+
+        /* For simplicity, only read whole frames. In a real application,
+         * we'd pad the final partial frame with zeroes, record the exact
+         * duration, and trim the decoded audio to match.
+         */
+        if (samples != FRAME_SIZE) {
+            break;
+        }
+
+        /* Convert from little-endian ordering. */
+        for (i = 0; i < CHANNELS*FRAME_SIZE; i++) {
+            in[i] = pcm_bytes[2*i + 1]<<8|pcm_bytes[2*i];
+        }
+
+        /* Encode the frame. */
+        nbBytes = oac_encode(encoder, in, FRAME_SIZE, cbits, MAX_PACKET_SIZE);
+        if (nbBytes < 0) {
+            fprintf(stderr, "encode failed: %s\n", oac_strerror(nbBytes));
+            return EXIT_FAILURE;
+        }
+
+
+        /* Decode the data. In this example, frame_size will be constant because
+           the encoder is using a constant frame size. However, that may not
+           be the case for all encoders, so the decoder must always check
+           the frame size returned. */
+        frame_size = oac_decode(decoder, cbits, nbBytes, out, MAX_FRAME_SIZE, 0);
+        if (frame_size < 0) {
+            fprintf(stderr, "decoder failed: %s\n", oac_strerror(frame_size));
+            return EXIT_FAILURE;
+        }
+
+        /* Convert to little-endian ordering. */
+        for (i = 0; i < CHANNELS*frame_size; i++) {
+            pcm_bytes[2*i] = out[i]&0xFF;
+            pcm_bytes[2*i + 1] = (out[i]>>8)&0xFF;
+        }
+        /* Write the decoded audio to file. */
+        fwrite(pcm_bytes, sizeof(short), frame_size*CHANNELS, fout);
+    }
+    /*Destroy the encoder state*/
+    oac_encoder_destroy(encoder);
+    oac_decoder_destroy(decoder);
+    fclose(fin);
+    fclose(fout);
+    return EXIT_SUCCESS;
 }
diff --git a/include/oac.h b/include/oac.h
index beac463f4..77045255c 100644
--- a/include/oac.h
+++ b/include/oac.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 /**
  * @file oac.h
@@ -73,104 +73,104 @@ extern "C" {
  */
 
 /** @defgroup oac_encoder Oac Encoder
-  * @{
-  *
-  * @brief This page describes the process and functions used to encode Oac.
-  *
-  * Since Oac is a stateful codec, the encoding process starts with creating an encoder
-  * state. This can be done with:
-  *
-  * @code
-  * int          error;
-  * OacEncoder *enc;
-  * enc = oac_encoder_create(Fs, channels, application, &error);
-  * @endcode
-  *
-  * From this point, @c enc can be used for encoding an audio stream. An encoder state
-  * @b must @b not be used for more than one stream at the same time. Similarly, the encoder
-  * state @b must @b not be re-initialized for each frame.
-  *
-  * While oac_encoder_create() allocates memory for the state, it's also possible
-  * to initialize pre-allocated memory:
-  *
-  * @code
-  * int          size;
-  * int          error;
-  * OacEncoder *enc;
-  * size = oac_encoder_get_size(channels);
-  * enc = malloc(size);
-  * error = oac_encoder_init(enc, Fs, channels, application);
-  * @endcode
-  *
-  * where oac_encoder_get_size() returns the required size for the encoder state. Note that
-  * future versions of this code may change the size, so no assumptions should be made about it.
-  *
-  * The encoder state is always continuous in memory and only a shallow copy is sufficient
-  * to copy it (e.g. memcpy())
-  *
-  * It is possible to change some of the encoder's settings using the oac_encoder_ctl()
-  * interface. All these settings already default to the recommended value, so they should
-  * only be changed when necessary. The most common settings one may want to change are:
-  *
-  * @code
-  * oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrate));
-  * oac_encoder_ctl(enc, OAC_SET_COMPLEXITY(complexity));
-  * oac_encoder_ctl(enc, OAC_SET_SIGNAL(signal_type));
-  * @endcode
-  *
-  * where
-  *
-  * @arg bitrate is in bits per second (b/s)
-  * @arg complexity is a value from 1 to 10, where 1 is the lowest complexity and 10 is the highest
-  * @arg signal_type is either OAC_AUTO (default), OAC_SIGNAL_VOICE, or OAC_SIGNAL_MUSIC
-  *
-  * See @ref oac_encoderctls and @ref oac_genericctls for a complete list of parameters that can be set or queried. Most parameters can be set or changed at any time during a stream.
-  *
-  * To encode a frame, oac_encode() or oac_encode_float() must be called with exactly one frame (2.5, 5, 10, 20, 40 or 60 ms) of audio data:
-  * @code
-  * len = oac_encode(enc, audio_frame, frame_size, packet, max_packet);
-  * @endcode
-  *
-  * where
-  * <ul>
-  * <li>audio_frame is the audio data in oac_int16 (or float for oac_encode_float())</li>
-  * <li>frame_size is the duration of the frame in samples (per channel)</li>
-  * <li>packet is the byte array to which the compressed data is written</li>
-  * <li>max_packet is the maximum number of bytes that can be written in the packet (4000 bytes is recommended).
-  *     Do not use max_packet to control VBR target bitrate, instead use the #OAC_SET_BITRATE CTL.</li>
-  * </ul>
-  *
-  * oac_encode() and oac_encode_float() return the number of bytes actually written to the packet.
-  * The return value <b>can be negative</b>, which indicates that an error has occurred. If the return value
-  * is 2 bytes or less, then the packet does not need to be transmitted (DTX).
-  *
-  * Once the encoder state if no longer needed, it can be destroyed with
-  *
-  * @code
-  * oac_encoder_destroy(enc);
-  * @endcode
-  *
-  * If the encoder was created with oac_encoder_init() rather than oac_encoder_create(),
-  * then no action is required aside from potentially freeing the memory that was manually
-  * allocated for it (calling free(enc) for the example above)
-  *
-  */
+ * @{
+ *
+ * @brief This page describes the process and functions used to encode Oac.
+ *
+ * Since Oac is a stateful codec, the encoding process starts with creating an encoder
+ * state. This can be done with:
+ *
+ * @code
+ * int          error;
+ * OacEncoder *enc;
+ * enc = oac_encoder_create(Fs, channels, application, &error);
+ * @endcode
+ *
+ * From this point, @c enc can be used for encoding an audio stream. An encoder state
+ * @b must @b not be used for more than one stream at the same time. Similarly, the encoder
+ * state @b must @b not be re-initialized for each frame.
+ *
+ * While oac_encoder_create() allocates memory for the state, it's also possible
+ * to initialize pre-allocated memory:
+ *
+ * @code
+ * int          size;
+ * int          error;
+ * OacEncoder *enc;
+ * size = oac_encoder_get_size(channels);
+ * enc = malloc(size);
+ * error = oac_encoder_init(enc, Fs, channels, application);
+ * @endcode
+ *
+ * where oac_encoder_get_size() returns the required size for the encoder state. Note that
+ * future versions of this code may change the size, so no assumptions should be made about it.
+ *
+ * The encoder state is always continuous in memory and only a shallow copy is sufficient
+ * to copy it (e.g. memcpy())
+ *
+ * It is possible to change some of the encoder's settings using the oac_encoder_ctl()
+ * interface. All these settings already default to the recommended value, so they should
+ * only be changed when necessary. The most common settings one may want to change are:
+ *
+ * @code
+ * oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrate));
+ * oac_encoder_ctl(enc, OAC_SET_COMPLEXITY(complexity));
+ * oac_encoder_ctl(enc, OAC_SET_SIGNAL(signal_type));
+ * @endcode
+ *
+ * where
+ *
+ * @arg bitrate is in bits per second (b/s)
+ * @arg complexity is a value from 1 to 10, where 1 is the lowest complexity and 10 is the highest
+ * @arg signal_type is either OAC_AUTO (default), OAC_SIGNAL_VOICE, or OAC_SIGNAL_MUSIC
+ *
+ * See @ref oac_encoderctls and @ref oac_genericctls for a complete list of parameters that can be set or queried. Most parameters can be set or changed at any time during a stream.
+ *
+ * To encode a frame, oac_encode() or oac_encode_float() must be called with exactly one frame (2.5, 5, 10, 20, 40 or 60 ms) of audio data:
+ * @code
+ * len = oac_encode(enc, audio_frame, frame_size, packet, max_packet);
+ * @endcode
+ *
+ * where
+ * <ul>
+ * <li>audio_frame is the audio data in oac_int16 (or float for oac_encode_float())</li>
+ * <li>frame_size is the duration of the frame in samples (per channel)</li>
+ * <li>packet is the byte array to which the compressed data is written</li>
+ * <li>max_packet is the maximum number of bytes that can be written in the packet (4000 bytes is recommended).
+ *     Do not use max_packet to control VBR target bitrate, instead use the #OAC_SET_BITRATE CTL.</li>
+ * </ul>
+ *
+ * oac_encode() and oac_encode_float() return the number of bytes actually written to the packet.
+ * The return value <b>can be negative</b>, which indicates that an error has occurred. If the return value
+ * is 2 bytes or less, then the packet does not need to be transmitted (DTX).
+ *
+ * Once the encoder state if no longer needed, it can be destroyed with
+ *
+ * @code
+ * oac_encoder_destroy(enc);
+ * @endcode
+ *
+ * If the encoder was created with oac_encoder_init() rather than oac_encoder_create(),
+ * then no action is required aside from potentially freeing the memory that was manually
+ * allocated for it (calling free(enc) for the example above)
+ *
+ */
 
 /** Oac encoder state.
-  * This contains the complete state of an Oac encoder.
-  * It is position independent and can be freely copied.
-  * @see oac_encoder_create,oac_encoder_init
-  */
+ * This contains the complete state of an Oac encoder.
+ * It is position independent and can be freely copied.
+ * @see oac_encoder_create,oac_encoder_init
+ */
 typedef struct OacEncoder OacEncoder;
 
 /** Gets the size of an <code>OacEncoder</code> structure.
-  * @param[in] channels <tt>int</tt>: Number of channels.
-  *                                   This must be 1 or 2.
-  * @returns The size in bytes.
-  * @note Since this function does not take the application as input, it will overestimate
-  * the size required for OAC_APPLICATION_RESTRICTED_SILK and OAC_APPLICATION_RESTRICTED_CELT.
-  * That is generally not a problem, except when trying to know the size to use for a copy.
-  */
+ * @param[in] channels <tt>int</tt>: Number of channels.
+ *                                   This must be 1 or 2.
+ * @returns The size in bytes.
+ * @note Since this function does not take the application as input, it will overestimate
+ * the size required for OAC_APPLICATION_RESTRICTED_SILK and OAC_APPLICATION_RESTRICTED_CELT.
+ * That is generally not a problem, except when trying to know the size to use for a copy.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_encoder_get_size(int channels);
 
 /**
@@ -212,959 +212,960 @@ OAC_EXPORT OAC_WARN_UNUSED_RESULT OacEncoder *oac_encoder_create(
     oac_int32 Fs,
     int channels,
     int application,
-    int *error
-);
+    int *error);
 
 /** Initializes a previously allocated encoder state
-  * The memory pointed to by st must be at least the size returned by oac_encoder_get_size().
-  * This is intended for applications which use their own allocator instead of malloc.
-  * @see oac_encoder_create(),oac_encoder_get_size()
-  * To reset a previously initialized state, use the #OAC_RESET_STATE CTL.
-  * @param [in] st <tt>OacEncoder*</tt>: Encoder state
-  * @param [in] Fs <tt>oac_int32</tt>: Sampling rate of input signal (Hz)
+ * The memory pointed to by st must be at least the size returned by oac_encoder_get_size().
+ * This is intended for applications which use their own allocator instead of malloc.
+ * @see oac_encoder_create(),oac_encoder_get_size()
+ * To reset a previously initialized state, use the #OAC_RESET_STATE CTL.
+ * @param [in] st <tt>OacEncoder*</tt>: Encoder state
+ * @param [in] Fs <tt>oac_int32</tt>: Sampling rate of input signal (Hz)
  *                                      This must be one of 8000, 12000, 16000,
  *                                      24000, or 48000.
-  * @param [in] channels <tt>int</tt>: Number of channels (1 or 2) in input signal
-  * @param [in] application <tt>int</tt>: Coding mode (one of OAC_APPLICATION_VOIP, OAC_APPLICATION_AUDIO, or OAC_APPLICATION_RESTRICTED_LOWDELAY)
-  * @retval #OAC_OK Success or @ref oac_errorcodes
-  */
+ * @param [in] channels <tt>int</tt>: Number of channels (1 or 2) in input signal
+ * @param [in] application <tt>int</tt>: Coding mode (one of OAC_APPLICATION_VOIP, OAC_APPLICATION_AUDIO, or OAC_APPLICATION_RESTRICTED_LOWDELAY)
+ * @retval #OAC_OK Success or @ref oac_errorcodes
+ */
 OAC_EXPORT int oac_encoder_init(
     OacEncoder *st,
     oac_int32 Fs,
     int channels,
-    int application
-) OAC_ARG_NONNULL(1);
+    int application) OAC_ARG_NONNULL(1);
 
 /** Encodes an Oac frame.
-  * @param [in] st <tt>OacEncoder*</tt>: Encoder state
-  * @param [in] pcm <tt>oac_int16*</tt>: Input signal (interleaved if 2 channels). length is frame_size*channels*sizeof(oac_int16)
-  * @param [in] frame_size <tt>int</tt>: Number of samples per channel in the
-  *                                      input signal.
-  *                                      This must be an Oac frame size for
-  *                                      the encoder's sampling rate.
-  *                                      For example, at 48 kHz the permitted
-  *                                      values are 120, 240, 480, 960, 1920,
-  *                                      and 2880.
-  *                                      Passing in a duration of less than
-  *                                      10 ms (480 samples at 48 kHz) will
-  *                                      prevent the encoder from using the LPC
-  *                                      or hybrid modes.
-  * @param [out] data <tt>unsigned char*</tt>: Output payload.
-  *                                            This must contain storage for at
-  *                                            least \a max_data_bytes.
-  * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
-  *                                                 memory for the output
-  *                                                 payload. This may be
-  *                                                 used to impose an upper limit on
-  *                                                 the instant bitrate, but should
-  *                                                 not be used as the only bitrate
-  *                                                 control. Use #OAC_SET_BITRATE to
-  *                                                 control the bitrate.
-  * @returns The length of the encoded packet (in bytes) on success or a
-  *          negative error code (see @ref oac_errorcodes) on failure.
-  */
+ * @param [in] st <tt>OacEncoder*</tt>: Encoder state
+ * @param [in] pcm <tt>oac_int16*</tt>: Input signal (interleaved if 2 channels). length is frame_size*channels*sizeof(oac_int16)
+ * @param [in] frame_size <tt>int</tt>: Number of samples per channel in the
+ *                                      input signal.
+ *                                      This must be an Oac frame size for
+ *                                      the encoder's sampling rate.
+ *                                      For example, at 48 kHz the permitted
+ *                                      values are 120, 240, 480, 960, 1920,
+ *                                      and 2880.
+ *                                      Passing in a duration of less than
+ *                                      10 ms (480 samples at 48 kHz) will
+ *                                      prevent the encoder from using the LPC
+ *                                      or hybrid modes.
+ * @param [out] data <tt>unsigned char*</tt>: Output payload.
+ *                                            This must contain storage for at
+ *                                            least \a max_data_bytes.
+ * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
+ *                                                 memory for the output
+ *                                                 payload. This may be
+ *                                                 used to impose an upper limit on
+ *                                                 the instant bitrate, but should
+ *                                                 not be used as the only bitrate
+ *                                                 control. Use #OAC_SET_BITRATE to
+ *                                                 control the bitrate.
+ * @returns The length of the encoded packet (in bytes) on success or a
+ *          negative error code (see @ref oac_errorcodes) on failure.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_encode(
     OacEncoder *st,
     const oac_int16 *pcm,
     int frame_size,
     unsigned char *data,
-    oac_int32 max_data_bytes
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
+    oac_int32 max_data_bytes) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
 /** Encodes an Oac frame.
-  * @param [in] st <tt>OacEncoder*</tt>: Encoder state
-  * @param [in] pcm <tt>oac_int32*</tt>: Input signal (interleaved if 2 channels) representing (or slightly exceeding) 24-bit values. length is frame_size*channels*sizeof(oac_int32)
-  * @param [in] frame_size <tt>int</tt>: Number of samples per channel in the
-  *                                      input signal.
-  *                                      This must be an Oac frame size for
-  *                                      the encoder's sampling rate.
-  *                                      For example, at 48 kHz the permitted
-  *                                      values are 120, 240, 480, 960, 1920,
-  *                                      and 2880.
-  *                                      Passing in a duration of less than
-  *                                      10 ms (480 samples at 48 kHz) will
-  *                                      prevent the encoder from using the LPC
-  *                                      or hybrid modes.
-  * @param [out] data <tt>unsigned char*</tt>: Output payload.
-  *                                            This must contain storage for at
-  *                                            least \a max_data_bytes.
-  * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
-  *                                                 memory for the output
-  *                                                 payload. This may be
-  *                                                 used to impose an upper limit on
-  *                                                 the instant bitrate, but should
-  *                                                 not be used as the only bitrate
-  *                                                 control. Use #OAC_SET_BITRATE to
-  *                                                 control the bitrate.
-  * @returns The length of the encoded packet (in bytes) on success or a
-  *          negative error code (see @ref oac_errorcodes) on failure.
-  */
+ * @param [in] st <tt>OacEncoder*</tt>: Encoder state
+ * @param [in] pcm <tt>oac_int32*</tt>: Input signal (interleaved if 2 channels) representing (or slightly exceeding) 24-bit values. length is frame_size*channels*sizeof(oac_int32)
+ * @param [in] frame_size <tt>int</tt>: Number of samples per channel in the
+ *                                      input signal.
+ *                                      This must be an Oac frame size for
+ *                                      the encoder's sampling rate.
+ *                                      For example, at 48 kHz the permitted
+ *                                      values are 120, 240, 480, 960, 1920,
+ *                                      and 2880.
+ *                                      Passing in a duration of less than
+ *                                      10 ms (480 samples at 48 kHz) will
+ *                                      prevent the encoder from using the LPC
+ *                                      or hybrid modes.
+ * @param [out] data <tt>unsigned char*</tt>: Output payload.
+ *                                            This must contain storage for at
+ *                                            least \a max_data_bytes.
+ * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
+ *                                                 memory for the output
+ *                                                 payload. This may be
+ *                                                 used to impose an upper limit on
+ *                                                 the instant bitrate, but should
+ *                                                 not be used as the only bitrate
+ *                                                 control. Use #OAC_SET_BITRATE to
+ *                                                 control the bitrate.
+ * @returns The length of the encoded packet (in bytes) on success or a
+ *          negative error code (see @ref oac_errorcodes) on failure.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_encode24(
     OacEncoder *st,
     const oac_int32 *pcm,
     int frame_size,
     unsigned char *data,
-    oac_int32 max_data_bytes
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
+    oac_int32 max_data_bytes) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
 /** Encodes an Oac frame from floating point input.
-  * @param [in] st <tt>OacEncoder*</tt>: Encoder state
-  * @param [in] pcm <tt>float*</tt>: Input in float format (interleaved if 2 channels), with a normal range of +/-1.0.
-  *          Samples with a range beyond +/-1.0 are supported but will
-  *          be clipped by decoders using the integer API and should
-  *          only be used if it is known that the far end supports
-  *          extended dynamic range.
-  *          length is frame_size*channels*sizeof(float)
-  * @param [in] frame_size <tt>int</tt>: Number of samples per channel in the
-  *                                      input signal.
-  *                                      This must be an Oac frame size for
-  *                                      the encoder's sampling rate.
-  *                                      For example, at 48 kHz the permitted
-  *                                      values are 120, 240, 480, 960, 1920,
-  *                                      and 2880.
-  *                                      Passing in a duration of less than
-  *                                      10 ms (480 samples at 48 kHz) will
-  *                                      prevent the encoder from using the LPC
-  *                                      or hybrid modes.
-  * @param [out] data <tt>unsigned char*</tt>: Output payload.
-  *                                            This must contain storage for at
-  *                                            least \a max_data_bytes.
-  * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
-  *                                                 memory for the output
-  *                                                 payload. This may be
-  *                                                 used to impose an upper limit on
-  *                                                 the instant bitrate, but should
-  *                                                 not be used as the only bitrate
-  *                                                 control. Use #OAC_SET_BITRATE to
-  *                                                 control the bitrate.
-  * @returns The length of the encoded packet (in bytes) on success or a
-  *          negative error code (see @ref oac_errorcodes) on failure.
-  */
+ * @param [in] st <tt>OacEncoder*</tt>: Encoder state
+ * @param [in] pcm <tt>float*</tt>: Input in float format (interleaved if 2 channels), with a normal range of +/-1.0.
+ *          Samples with a range beyond +/-1.0 are supported but will
+ *          be clipped by decoders using the integer API and should
+ *          only be used if it is known that the far end supports
+ *          extended dynamic range.
+ *          length is frame_size*channels*sizeof(float)
+ * @param [in] frame_size <tt>int</tt>: Number of samples per channel in the
+ *                                      input signal.
+ *                                      This must be an Oac frame size for
+ *                                      the encoder's sampling rate.
+ *                                      For example, at 48 kHz the permitted
+ *                                      values are 120, 240, 480, 960, 1920,
+ *                                      and 2880.
+ *                                      Passing in a duration of less than
+ *                                      10 ms (480 samples at 48 kHz) will
+ *                                      prevent the encoder from using the LPC
+ *                                      or hybrid modes.
+ * @param [out] data <tt>unsigned char*</tt>: Output payload.
+ *                                            This must contain storage for at
+ *                                            least \a max_data_bytes.
+ * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
+ *                                                 memory for the output
+ *                                                 payload. This may be
+ *                                                 used to impose an upper limit on
+ *                                                 the instant bitrate, but should
+ *                                                 not be used as the only bitrate
+ *                                                 control. Use #OAC_SET_BITRATE to
+ *                                                 control the bitrate.
+ * @returns The length of the encoded packet (in bytes) on success or a
+ *          negative error code (see @ref oac_errorcodes) on failure.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_encode_float(
     OacEncoder *st,
     const float *pcm,
     int frame_size,
     unsigned char *data,
-    oac_int32 max_data_bytes
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
+    oac_int32 max_data_bytes) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
 /** Frees an <code>OacEncoder</code> allocated by oac_encoder_create().
-  * @param[in] st <tt>OacEncoder*</tt>: State to be freed.
-  */
+ * @param[in] st <tt>OacEncoder*</tt>: State to be freed.
+ */
 OAC_EXPORT void oac_encoder_destroy(OacEncoder *st);
 
 /** Perform a CTL function on an Oac encoder.
-  *
-  * Generally the request and subsequent arguments are generated
-  * by a convenience macro.
-  * @param st <tt>OacEncoder*</tt>: Encoder state.
-  * @param request This and all remaining parameters should be replaced by one
-  *                of the convenience macros in @ref oac_genericctls or
-  *                @ref oac_encoderctls.
-  * @see oac_genericctls
-  * @see oac_encoderctls
-  */
+ *
+ * Generally the request and subsequent arguments are generated
+ * by a convenience macro.
+ * @param st <tt>OacEncoder*</tt>: Encoder state.
+ * @param request This and all remaining parameters should be replaced by one
+ *                of the convenience macros in @ref oac_genericctls or
+ *                @ref oac_encoderctls.
+ * @see oac_genericctls
+ * @see oac_encoderctls
+ */
 OAC_EXPORT int oac_encoder_ctl(OacEncoder *st, int request, ...) OAC_ARG_NONNULL(1);
 /**@}*/
 
 /** @defgroup oac_decoder Oac Decoder
-  * @{
-  *
-  * @brief This page describes the process and functions used to decode Oac.
-  *
-  * The decoding process also starts with creating a decoder
-  * state. This can be done with:
-  * @code
-  * int          error;
-  * OacDecoder *dec;
-  * dec = oac_decoder_create(Fs, channels, &error);
-  * @endcode
-  * where
-  * @li Fs is the sampling rate and must be 8000, 12000, 16000, 24000, or 48000
-  * @li channels is the number of channels (1 or 2)
-  * @li error will hold the error code in case of failure (or #OAC_OK on success)
-  * @li the return value is a newly created decoder state to be used for decoding
-  *
-  * While oac_decoder_create() allocates memory for the state, it's also possible
-  * to initialize pre-allocated memory:
-  * @code
-  * int          size;
-  * int          error;
-  * OacDecoder *dec;
-  * size = oac_decoder_get_size(channels);
-  * dec = malloc(size);
-  * error = oac_decoder_init(dec, Fs, channels);
-  * @endcode
-  * where oac_decoder_get_size() returns the required size for the decoder state. Note that
-  * future versions of this code may change the size, so no assumptions should be made about it.
-  *
-  * The decoder state is always continuous in memory and only a shallow copy is sufficient
-  * to copy it (e.g. memcpy())
-  *
-  * To decode a frame, oac_decode() or oac_decode_float() must be called with a packet of compressed audio data:
-  * @code
-  * frame_size = oac_decode(dec, packet, len, decoded, max_size, 0);
-  * @endcode
-  * where
-  *
-  * @li packet is the byte array containing the compressed data
-  * @li len is the exact number of bytes contained in the packet
-  * @li decoded is the decoded audio data in oac_int16 (or float for oac_decode_float())
-  * @li max_size is the max duration of the frame in samples (per channel) that can fit into the decoded_frame array
-  *
-  * oac_decode() and oac_decode_float() return the number of samples (per channel) decoded from the packet.
-  * If that value is negative, then an error has occurred. This can occur if the packet is corrupted or if the audio
-  * buffer is too small to hold the decoded audio.
-  *
-  * Oac is a stateful codec with overlapping blocks and as a result Oac
-  * packets are not coded independently of each other. Packets must be
-  * passed into the decoder serially and in the correct order for a correct
-  * decode. Lost packets can be replaced with loss concealment by calling
-  * the decoder with a null pointer and zero length for the missing packet.
-  *
-  * A single codec state may only be accessed from a single thread at
-  * a time and any required locking must be performed by the caller. Separate
-  * streams must be decoded with separate decoder states and can be decoded
-  * in parallel unless the library was compiled with NONTHREADSAFE_PSEUDOSTACK
-  * defined.
-  *
-  */
+ * @{
+ *
+ * @brief This page describes the process and functions used to decode Oac.
+ *
+ * The decoding process also starts with creating a decoder
+ * state. This can be done with:
+ * @code
+ * int          error;
+ * OacDecoder *dec;
+ * dec = oac_decoder_create(Fs, channels, &error);
+ * @endcode
+ * where
+ * @li Fs is the sampling rate and must be 8000, 12000, 16000, 24000, or 48000
+ * @li channels is the number of channels (1 or 2)
+ * @li error will hold the error code in case of failure (or #OAC_OK on success)
+ * @li the return value is a newly created decoder state to be used for decoding
+ *
+ * While oac_decoder_create() allocates memory for the state, it's also possible
+ * to initialize pre-allocated memory:
+ * @code
+ * int          size;
+ * int          error;
+ * OacDecoder *dec;
+ * size = oac_decoder_get_size(channels);
+ * dec = malloc(size);
+ * error = oac_decoder_init(dec, Fs, channels);
+ * @endcode
+ * where oac_decoder_get_size() returns the required size for the decoder state. Note that
+ * future versions of this code may change the size, so no assumptions should be made about it.
+ *
+ * The decoder state is always continuous in memory and only a shallow copy is sufficient
+ * to copy it (e.g. memcpy())
+ *
+ * To decode a frame, oac_decode() or oac_decode_float() must be called with a packet of compressed audio data:
+ * @code
+ * frame_size = oac_decode(dec, packet, len, decoded, max_size, 0);
+ * @endcode
+ * where
+ *
+ * @li packet is the byte array containing the compressed data
+ * @li len is the exact number of bytes contained in the packet
+ * @li decoded is the decoded audio data in oac_int16 (or float for oac_decode_float())
+ * @li max_size is the max duration of the frame in samples (per channel) that can fit into the decoded_frame array
+ *
+ * oac_decode() and oac_decode_float() return the number of samples (per channel) decoded from the packet.
+ * If that value is negative, then an error has occurred. This can occur if the packet is corrupted or if the audio
+ * buffer is too small to hold the decoded audio.
+ *
+ * Oac is a stateful codec with overlapping blocks and as a result Oac
+ * packets are not coded independently of each other. Packets must be
+ * passed into the decoder serially and in the correct order for a correct
+ * decode. Lost packets can be replaced with loss concealment by calling
+ * the decoder with a null pointer and zero length for the missing packet.
+ *
+ * A single codec state may only be accessed from a single thread at
+ * a time and any required locking must be performed by the caller. Separate
+ * streams must be decoded with separate decoder states and can be decoded
+ * in parallel unless the library was compiled with NONTHREADSAFE_PSEUDOSTACK
+ * defined.
+ *
+ */
 
 /** Oac decoder state.
-  * This contains the complete state of an Oac decoder.
-  * It is position independent and can be freely copied.
-  * @see oac_decoder_create,oac_decoder_init
-  */
+ * This contains the complete state of an Oac decoder.
+ * It is position independent and can be freely copied.
+ * @see oac_decoder_create,oac_decoder_init
+ */
 typedef struct OacDecoder OacDecoder;
 
 /** Oac DRED decoder.
-  * This contains the complete state of an Oac DRED decoder.
-  * It is position independent and can be freely copied.
-  * @see oac_dred_decoder_create,oac_dred_decoder_init
-  */
+ * This contains the complete state of an Oac DRED decoder.
+ * It is position independent and can be freely copied.
+ * @see oac_dred_decoder_create,oac_dred_decoder_init
+ */
 typedef struct OacDREDDecoder OacDREDDecoder;
 
 
 /** Oac DRED state.
-  * This contains the complete state of an Oac DRED packet.
-  * It is position independent and can be freely copied.
-  * @see oac_dred_create,oac_dred_init
-  */
+ * This contains the complete state of an Oac DRED packet.
+ * It is position independent and can be freely copied.
+ * @see oac_dred_create,oac_dred_init
+ */
 typedef struct OacDRED OacDRED;
 
 /** Gets the size of an <code>OacDecoder</code> structure.
-  * @param [in] channels <tt>int</tt>: Number of channels.
-  *                                    This must be 1 or 2.
-  * @returns The size in bytes.
-  */
+ * @param [in] channels <tt>int</tt>: Number of channels.
+ *                                    This must be 1 or 2.
+ * @returns The size in bytes.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_decoder_get_size(int channels);
 
 /** Allocates and initializes a decoder state.
-  * @param [in] Fs <tt>oac_int32</tt>: Sample rate to decode at (Hz).
-  *                                     This must be one of 8000, 12000, 16000,
-  *                                     24000, or 48000.
-  * @param [in] channels <tt>int</tt>: Number of channels (1 or 2) to decode
-  * @param [out] error <tt>int*</tt>: #OAC_OK Success or @ref oac_errorcodes
-  *
-  * Internally Oac stores data at 48000 Hz, so that should be the default
-  * value for Fs. However, the decoder can efficiently decode to buffers
-  * at 8, 12, 16, and 24 kHz so if for some reason the caller cannot use
-  * data at the full sample rate, or knows the compressed data doesn't
-  * use the full frequency range, it can request decoding at a reduced
-  * rate. Likewise, the decoder is capable of filling in either mono or
-  * interleaved stereo pcm buffers, at the caller's request.
-  */
+ * @param [in] Fs <tt>oac_int32</tt>: Sample rate to decode at (Hz).
+ *                                     This must be one of 8000, 12000, 16000,
+ *                                     24000, or 48000.
+ * @param [in] channels <tt>int</tt>: Number of channels (1 or 2) to decode
+ * @param [out] error <tt>int*</tt>: #OAC_OK Success or @ref oac_errorcodes
+ *
+ * Internally Oac stores data at 48000 Hz, so that should be the default
+ * value for Fs. However, the decoder can efficiently decode to buffers
+ * at 8, 12, 16, and 24 kHz so if for some reason the caller cannot use
+ * data at the full sample rate, or knows the compressed data doesn't
+ * use the full frequency range, it can request decoding at a reduced
+ * rate. Likewise, the decoder is capable of filling in either mono or
+ * interleaved stereo pcm buffers, at the caller's request.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT OacDecoder *oac_decoder_create(
     oac_int32 Fs,
     int channels,
-    int *error
-);
+    int *error);
 
 /** Initializes a previously allocated decoder state.
-  * The state must be at least the size returned by oac_decoder_get_size().
-  * This is intended for applications which use their own allocator instead of malloc. @see oac_decoder_create,oac_decoder_get_size
-  * To reset a previously initialized state, use the #OAC_RESET_STATE CTL.
-  * @param [in] st <tt>OacDecoder*</tt>: Decoder state.
-  * @param [in] Fs <tt>oac_int32</tt>: Sampling rate to decode to (Hz).
-  *                                     This must be one of 8000, 12000, 16000,
-  *                                     24000, or 48000.
-  * @param [in] channels <tt>int</tt>: Number of channels (1 or 2) to decode
-  * @retval #OAC_OK Success or @ref oac_errorcodes
-  */
+ * The state must be at least the size returned by oac_decoder_get_size().
+ * This is intended for applications which use their own allocator instead of malloc. @see oac_decoder_create,oac_decoder_get_size
+ * To reset a previously initialized state, use the #OAC_RESET_STATE CTL.
+ * @param [in] st <tt>OacDecoder*</tt>: Decoder state.
+ * @param [in] Fs <tt>oac_int32</tt>: Sampling rate to decode to (Hz).
+ *                                     This must be one of 8000, 12000, 16000,
+ *                                     24000, or 48000.
+ * @param [in] channels <tt>int</tt>: Number of channels (1 or 2) to decode
+ * @retval #OAC_OK Success or @ref oac_errorcodes
+ */
 OAC_EXPORT int oac_decoder_init(
     OacDecoder *st,
     oac_int32 Fs,
-    int channels
-) OAC_ARG_NONNULL(1);
+    int channels) OAC_ARG_NONNULL(1);
 
 /** Decode an Oac packet.
-  * @param [in] st <tt>OacDecoder*</tt>: Decoder state
-  * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
-  * @param [in] len <tt>oac_int32</tt>: Number of bytes in payload*
-  * @param [out] pcm <tt>oac_int16*</tt>: Output signal (interleaved if 2 channels). length
-  *  is frame_size*channels*sizeof(oac_int16)
-  * @param [in] frame_size Number of samples per channel of available space in \a pcm.
-  *  If this is less than the maximum packet duration (120ms; 5760 for 48kHz), this function will
-  *  not be capable of decoding some packets. In the case of PLC (data==NULL) or FEC (decode_fec=1),
-  *  then frame_size needs to be exactly the duration of audio that is missing, otherwise the
-  *  decoder will not be in the optimal state to decode the next incoming packet. For the PLC and
-  *  FEC cases, frame_size <b>must</b> be a multiple of 2.5 ms.
-  * @param [in] decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band forward error correction data be
-  *  decoded. If no such data is available, the frame is decoded as if it were lost.
-  * @returns Number of decoded samples per channel or @ref oac_errorcodes
-  */
+ * @param [in] st <tt>OacDecoder*</tt>: Decoder state
+ * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
+ * @param [in] len <tt>oac_int32</tt>: Number of bytes in payload*
+ * @param [out] pcm <tt>oac_int16*</tt>: Output signal (interleaved if 2 channels). length
+ *  is frame_size*channels*sizeof(oac_int16)
+ * @param [in] frame_size Number of samples per channel of available space in \a pcm.
+ *  If this is less than the maximum packet duration (120ms; 5760 for 48kHz), this function will
+ *  not be capable of decoding some packets. In the case of PLC (data==NULL) or FEC (decode_fec=1),
+ *  then frame_size needs to be exactly the duration of audio that is missing, otherwise the
+ *  decoder will not be in the optimal state to decode the next incoming packet. For the PLC and
+ *  FEC cases, frame_size <b>must</b> be a multiple of 2.5 ms.
+ * @param [in] decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band forward error correction data be
+ *  decoded. If no such data is available, the frame is decoded as if it were lost.
+ * @returns Number of decoded samples per channel or @ref oac_errorcodes
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_decode(
     OacDecoder *st,
     const unsigned char *data,
     oac_int32 len,
     oac_int16 *pcm,
     int frame_size,
-    int decode_fec
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
+    int decode_fec) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
 /** Decode an Oac packet.
-  * @param [in] st <tt>OacDecoder*</tt>: Decoder state
-  * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
-  * @param [in] len <tt>oac_int32</tt>: Number of bytes in payload*
-  * @param [out] pcm <tt>oac_int32*</tt>: Output signal (interleaved if 2 channels) representing (or slightly exceeding) 24-bit values. length
-  *  is frame_size*channels*sizeof(oac_int32)
-  * @param [in] frame_size Number of samples per channel of available space in \a pcm.
-  *  If this is less than the maximum packet duration (120ms; 5760 for 48kHz), this function will
-  *  not be capable of decoding some packets. In the case of PLC (data==NULL) or FEC (decode_fec=1),
-  *  then frame_size needs to be exactly the duration of audio that is missing, otherwise the
-  *  decoder will not be in the optimal state to decode the next incoming packet. For the PLC and
-  *  FEC cases, frame_size <b>must</b> be a multiple of 2.5 ms.
-  * @param [in] decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band forward error correction data be
-  *  decoded. If no such data is available, the frame is decoded as if it were lost.
-  * @returns Number of decoded samples or @ref oac_errorcodes
-  */
+ * @param [in] st <tt>OacDecoder*</tt>: Decoder state
+ * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
+ * @param [in] len <tt>oac_int32</tt>: Number of bytes in payload*
+ * @param [out] pcm <tt>oac_int32*</tt>: Output signal (interleaved if 2 channels) representing (or slightly exceeding) 24-bit values. length
+ *  is frame_size*channels*sizeof(oac_int32)
+ * @param [in] frame_size Number of samples per channel of available space in \a pcm.
+ *  If this is less than the maximum packet duration (120ms; 5760 for 48kHz), this function will
+ *  not be capable of decoding some packets. In the case of PLC (data==NULL) or FEC (decode_fec=1),
+ *  then frame_size needs to be exactly the duration of audio that is missing, otherwise the
+ *  decoder will not be in the optimal state to decode the next incoming packet. For the PLC and
+ *  FEC cases, frame_size <b>must</b> be a multiple of 2.5 ms.
+ * @param [in] decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band forward error correction data be
+ *  decoded. If no such data is available, the frame is decoded as if it were lost.
+ * @returns Number of decoded samples or @ref oac_errorcodes
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_decode24(
     OacDecoder *st,
     const unsigned char *data,
     oac_int32 len,
     oac_int32 *pcm,
     int frame_size,
-    int decode_fec
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
+    int decode_fec) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
 /** Decode an Oac packet with floating point output.
-  * @param [in] st <tt>OacDecoder*</tt>: Decoder state
-  * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
-  * @param [in] len <tt>oac_int32</tt>: Number of bytes in payload
-  * @param [out] pcm <tt>float*</tt>: Output signal (interleaved if 2 channels). length
-  *  is frame_size*channels*sizeof(float)
-  * @param [in] frame_size Number of samples per channel of available space in \a pcm.
-  *  If this is less than the maximum packet duration (120ms; 5760 for 48kHz), this function will
-  *  not be capable of decoding some packets. In the case of PLC (data==NULL) or FEC (decode_fec=1),
-  *  then frame_size needs to be exactly the duration of audio that is missing, otherwise the
-  *  decoder will not be in the optimal state to decode the next incoming packet. For the PLC and
-  *  FEC cases, frame_size <b>must</b> be a multiple of 2.5 ms.
-  * @param [in] decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band forward error correction data be
-  *  decoded. If no such data is available the frame is decoded as if it were lost.
-  * @returns Number of decoded samples per channel or @ref oac_errorcodes
-  */
+ * @param [in] st <tt>OacDecoder*</tt>: Decoder state
+ * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
+ * @param [in] len <tt>oac_int32</tt>: Number of bytes in payload
+ * @param [out] pcm <tt>float*</tt>: Output signal (interleaved if 2 channels). length
+ *  is frame_size*channels*sizeof(float)
+ * @param [in] frame_size Number of samples per channel of available space in \a pcm.
+ *  If this is less than the maximum packet duration (120ms; 5760 for 48kHz), this function will
+ *  not be capable of decoding some packets. In the case of PLC (data==NULL) or FEC (decode_fec=1),
+ *  then frame_size needs to be exactly the duration of audio that is missing, otherwise the
+ *  decoder will not be in the optimal state to decode the next incoming packet. For the PLC and
+ *  FEC cases, frame_size <b>must</b> be a multiple of 2.5 ms.
+ * @param [in] decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band forward error correction data be
+ *  decoded. If no such data is available the frame is decoded as if it were lost.
+ * @returns Number of decoded samples per channel or @ref oac_errorcodes
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_decode_float(
     OacDecoder *st,
     const unsigned char *data,
     oac_int32 len,
     float *pcm,
     int frame_size,
-    int decode_fec
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
+    int decode_fec) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
 /** Perform a CTL function on an Oac decoder.
-  *
-  * Generally the request and subsequent arguments are generated
-  * by a convenience macro.
-  * @param st <tt>OacDecoder*</tt>: Decoder state.
-  * @param request This and all remaining parameters should be replaced by one
-  *                of the convenience macros in @ref oac_genericctls or
-  *                @ref oac_decoderctls.
-  * @see oac_genericctls
-  * @see oac_decoderctls
-  */
+ *
+ * Generally the request and subsequent arguments are generated
+ * by a convenience macro.
+ * @param st <tt>OacDecoder*</tt>: Decoder state.
+ * @param request This and all remaining parameters should be replaced by one
+ *                of the convenience macros in @ref oac_genericctls or
+ *                @ref oac_decoderctls.
+ * @see oac_genericctls
+ * @see oac_decoderctls
+ */
 OAC_EXPORT int oac_decoder_ctl(OacDecoder *st, int request, ...) OAC_ARG_NONNULL(1);
 
 /** Frees an <code>OacDecoder</code> allocated by oac_decoder_create().
-  * @param[in] st <tt>OacDecoder*</tt>: State to be freed.
-  */
+ * @param[in] st <tt>OacDecoder*</tt>: State to be freed.
+ */
 OAC_EXPORT void oac_decoder_destroy(OacDecoder *st);
 
 /** Gets the size of an <code>OacDREDDecoder</code> structure.
-  * @returns The size in bytes.
-  */
+ * @returns The size in bytes.
+ */
 OAC_EXPORT int oac_dred_decoder_get_size(void);
 
 /** Allocates and initializes an OacDREDDecoder state.
-  * @param [out] error <tt>int*</tt>: #OAC_OK Success or @ref oac_errorcodes
-  */
+ * @param [out] error <tt>int*</tt>: #OAC_OK Success or @ref oac_errorcodes
+ */
 OAC_EXPORT OacDREDDecoder *oac_dred_decoder_create(int *error);
 
 /** Initializes an <code>OacDREDDecoder</code> state.
-  * @param[in] dec <tt>OacDREDDecoder*</tt>: State to be initialized.
-  */
+ * @param[in] dec <tt>OacDREDDecoder*</tt>: State to be initialized.
+ */
 OAC_EXPORT int oac_dred_decoder_init(OacDREDDecoder *dec);
 
 /** Frees an <code>OacDREDDecoder</code> allocated by oac_dred_decoder_create().
-  * @param[in] dec <tt>OacDREDDecoder*</tt>: State to be freed.
-  */
+ * @param[in] dec <tt>OacDREDDecoder*</tt>: State to be freed.
+ */
 OAC_EXPORT void oac_dred_decoder_destroy(OacDREDDecoder *dec);
 
 /** Perform a CTL function on an Oac DRED decoder.
-  *
-  * Generally the request and subsequent arguments are generated
-  * by a convenience macro.
-  * @param dred_dec <tt>OacDREDDecoder*</tt>: DRED Decoder state.
-  * @param request This and all remaining parameters should be replaced by one
-  *                of the convenience macros in @ref oac_genericctls or
-  *                @ref oac_decoderctls.
-  * @see oac_genericctls
-  * @see oac_decoderctls
-  */
+ *
+ * Generally the request and subsequent arguments are generated
+ * by a convenience macro.
+ * @param dred_dec <tt>OacDREDDecoder*</tt>: DRED Decoder state.
+ * @param request This and all remaining parameters should be replaced by one
+ *                of the convenience macros in @ref oac_genericctls or
+ *                @ref oac_decoderctls.
+ * @see oac_genericctls
+ * @see oac_decoderctls
+ */
 OAC_EXPORT int oac_dred_decoder_ctl(OacDREDDecoder *dred_dec, int request, ...);
 
 /** Gets the size of an <code>OacDRED</code> structure.
-  * @returns The size in bytes.
-  */
+ * @returns The size in bytes.
+ */
 OAC_EXPORT int oac_dred_get_size(void);
 
 /** Allocates and initializes a DRED state.
-  * @param [out] error <tt>int*</tt>: #OAC_OK Success or @ref oac_errorcodes
-  */
+ * @param [out] error <tt>int*</tt>: #OAC_OK Success or @ref oac_errorcodes
+ */
 OAC_EXPORT OacDRED *oac_dred_alloc(int *error);
 
 /** Frees an <code>OacDRED</code> allocated by oac_dred_create().
-  * @param[in] dec <tt>OacDRED*</tt>: State to be freed.
-  */
+ * @param[in] dec <tt>OacDRED*</tt>: State to be freed.
+ */
 OAC_EXPORT void oac_dred_free(OacDRED *dec);
 
 /** Decode an Oac DRED packet.
-  * @param [in] dred_dec <tt>OacDRED*</tt>: DRED Decoder state
-  * @param [in] dred <tt>OacDRED*</tt>: DRED state
-  * @param [in] data <tt>char*</tt>: Input payload
-  * @param [in] len <tt>oac_int32</tt>: Number of bytes in payload
-  * @param [in] max_dred_samples <tt>oac_int32</tt>: Maximum number of DRED samples that may be needed (if available in the packet).
-  * @param [in] sampling_rate <tt>oac_int32</tt>: Sampling rate used for max_dred_samples argument. Needs not match the actual sampling rate of the decoder.
-  * @param [out] dred_end <tt>oac_int32*</tt>: Number of non-encoded (silence) samples between the DRED timestamp and the last DRED sample.
-  * @param [in] defer_processing <tt>int</tt>: Flag (0 or 1). If set to one, the CPU-intensive part of the DRED decoding is deferred until oac_dred_process() is called.
-  * @returns Offset (positive) of the first decoded DRED samples, zero if no DRED is present, or @ref oac_errorcodes
-  */
-OAC_EXPORT int oac_dred_parse(OacDREDDecoder *dred_dec, OacDRED *dred, const unsigned char *data, oac_int32 len, oac_int32 max_dred_samples, oac_int32 sampling_rate, int *dred_end, int defer_processing) OAC_ARG_NONNULL(1);
+ * @param [in] dred_dec <tt>OacDRED*</tt>: DRED Decoder state
+ * @param [in] dred <tt>OacDRED*</tt>: DRED state
+ * @param [in] data <tt>char*</tt>: Input payload
+ * @param [in] len <tt>oac_int32</tt>: Number of bytes in payload
+ * @param [in] max_dred_samples <tt>oac_int32</tt>: Maximum number of DRED samples that may be needed (if available in the packet).
+ * @param [in] sampling_rate <tt>oac_int32</tt>: Sampling rate used for max_dred_samples argument. Needs not match the actual sampling rate of the decoder.
+ * @param [out] dred_end <tt>oac_int32*</tt>: Number of non-encoded (silence) samples between the DRED timestamp and the last DRED sample.
+ * @param [in] defer_processing <tt>int</tt>: Flag (0 or 1). If set to one, the CPU-intensive part of the DRED decoding is deferred until oac_dred_process() is called.
+ * @returns Offset (positive) of the first decoded DRED samples, zero if no DRED is present, or @ref oac_errorcodes
+ */
+OAC_EXPORT int oac_dred_parse(OacDREDDecoder *dred_dec, OacDRED *dred, const unsigned char *data, oac_int32 len,
+    oac_int32 max_dred_samples, oac_int32 sampling_rate, int *dred_end, int defer_processing) OAC_ARG_NONNULL(1);
 
 /** Finish decoding an Oac DRED packet. The function only needs to be called if oac_dred_parse() was called with defer_processing=1.
-  * The source and destination will often be the same DRED state.
-  * @param [in] dred_dec <tt>OacDRED*</tt>: DRED Decoder state
-  * @param [in] src <tt>OacDRED*</tt>: Source DRED state to start the processing from.
-  * @param [out] dst <tt>OacDRED*</tt>: Destination DRED state to store the updated state after processing.
-  * @returns @ref oac_errorcodes
-  */
+ * The source and destination will often be the same DRED state.
+ * @param [in] dred_dec <tt>OacDRED*</tt>: DRED Decoder state
+ * @param [in] src <tt>OacDRED*</tt>: Source DRED state to start the processing from.
+ * @param [out] dst <tt>OacDRED*</tt>: Destination DRED state to store the updated state after processing.
+ * @returns @ref oac_errorcodes
+ */
 OAC_EXPORT int oac_dred_process(OacDREDDecoder *dred_dec, const OacDRED *src, OacDRED *dst);
 
 /** Decode audio from an Oac DRED packet with 16-bit output.
-  * @param [in] st <tt>OacDecoder*</tt>: Decoder state
-  * @param [in] dred <tt>OacDRED*</tt>: DRED state
-  * @param [in] dred_offset <tt>oac_int32</tt>: position of the redundancy to decode (in samples before the beginning of the real audio data in the packet).
-  * @param [out] pcm <tt>oac_int16*</tt>: Output signal (interleaved if 2 channels). length
-  *  is frame_size*channels*sizeof(oac_int16)
-  * @param [in] frame_size Number of samples per channel to decode in \a pcm.
-  *  frame_size <b>must</b> be a multiple of 2.5 ms.
-  * @returns Number of decoded samples or @ref oac_errorcodes
-  */
-OAC_EXPORT int oac_decoder_dred_decode(OacDecoder *st, const OacDRED *dred, oac_int32 dred_offset, oac_int16 *pcm, oac_int32 frame_size);
+ * @param [in] st <tt>OacDecoder*</tt>: Decoder state
+ * @param [in] dred <tt>OacDRED*</tt>: DRED state
+ * @param [in] dred_offset <tt>oac_int32</tt>: position of the redundancy to decode (in samples before the beginning of the real audio data in the packet).
+ * @param [out] pcm <tt>oac_int16*</tt>: Output signal (interleaved if 2 channels). length
+ *  is frame_size*channels*sizeof(oac_int16)
+ * @param [in] frame_size Number of samples per channel to decode in \a pcm.
+ *  frame_size <b>must</b> be a multiple of 2.5 ms.
+ * @returns Number of decoded samples or @ref oac_errorcodes
+ */
+OAC_EXPORT int oac_decoder_dred_decode(OacDecoder *st, const OacDRED *dred, oac_int32 dred_offset, oac_int16 *pcm,
+    oac_int32 frame_size);
 
 /** Decode audio from an Oac DRED packet with 24-bit output.
-  * @param [in] st <tt>OacDecoder*</tt>: Decoder state
-  * @param [in] dred <tt>OacDRED*</tt>: DRED state
-  * @param [in] dred_offset <tt>oac_int32</tt>: position of the redundancy to decode (in samples before the beginning of the real audio data in the packet).
-  * @param [out] pcm <tt>oac_int32*</tt>: Output signal (interleaved if 2 channels). length
-  *  is frame_size*channels*sizeof(oac_int16)
-  * @param [in] frame_size Number of samples per channel to decode in \a pcm.
-  *  frame_size <b>must</b> be a multiple of 2.5 ms.
-  * @returns Number of decoded samples or @ref oac_errorcodes
-  */
-OAC_EXPORT int oac_decoder_dred_decode24(OacDecoder *st, const OacDRED *dred, oac_int32 dred_offset, oac_int32 *pcm, oac_int32 frame_size);
+ * @param [in] st <tt>OacDecoder*</tt>: Decoder state
+ * @param [in] dred <tt>OacDRED*</tt>: DRED state
+ * @param [in] dred_offset <tt>oac_int32</tt>: position of the redundancy to decode (in samples before the beginning of the real audio data in the packet).
+ * @param [out] pcm <tt>oac_int32*</tt>: Output signal (interleaved if 2 channels). length
+ *  is frame_size*channels*sizeof(oac_int16)
+ * @param [in] frame_size Number of samples per channel to decode in \a pcm.
+ *  frame_size <b>must</b> be a multiple of 2.5 ms.
+ * @returns Number of decoded samples or @ref oac_errorcodes
+ */
+OAC_EXPORT int oac_decoder_dred_decode24(OacDecoder *st, const OacDRED *dred, oac_int32 dred_offset, oac_int32 *pcm,
+    oac_int32 frame_size);
 
 /** Decode audio from an Oac DRED packet with floating point output.
-  * @param [in] st <tt>OacDecoder*</tt>: Decoder state
-  * @param [in] dred <tt>OacDRED*</tt>: DRED state
-  * @param [in] dred_offset <tt>oac_int32</tt>: position of the redundancy to decode (in samples before the beginning of the real audio data in the packet).
-  * @param [out] pcm <tt>float*</tt>: Output signal (interleaved if 2 channels). length
-  *  is frame_size*channels*sizeof(float)
-  * @param [in] frame_size Number of samples per channel to decode in \a pcm.
-  *  frame_size <b>must</b> be a multiple of 2.5 ms.
-  * @returns Number of decoded samples or @ref oac_errorcodes
-  */
-OAC_EXPORT int oac_decoder_dred_decode_float(OacDecoder *st, const OacDRED *dred, oac_int32 dred_offset, float *pcm, oac_int32 frame_size);
+ * @param [in] st <tt>OacDecoder*</tt>: Decoder state
+ * @param [in] dred <tt>OacDRED*</tt>: DRED state
+ * @param [in] dred_offset <tt>oac_int32</tt>: position of the redundancy to decode (in samples before the beginning of the real audio data in the packet).
+ * @param [out] pcm <tt>float*</tt>: Output signal (interleaved if 2 channels). length
+ *  is frame_size*channels*sizeof(float)
+ * @param [in] frame_size Number of samples per channel to decode in \a pcm.
+ *  frame_size <b>must</b> be a multiple of 2.5 ms.
+ * @returns Number of decoded samples or @ref oac_errorcodes
+ */
+OAC_EXPORT int oac_decoder_dred_decode_float(OacDecoder *st, const OacDRED *dred, oac_int32 dred_offset, float *pcm,
+    oac_int32 frame_size);
 
 
 /** Parse an oac packet into one or more frames.
-  * Oac_decode will perform this operation internally so most applications do
-  * not need to use this function.
-  * This function does not copy the frames, the returned pointers are pointers into
-  * the input packet.
-  * @param [in] data <tt>char*</tt>: Oac packet to be parsed
-  * @param [in] len <tt>oac_int32</tt>: size of data
-  * @param [out] out_toc <tt>char*</tt>: TOC pointer
-  * @param [out] frames <tt>char*[48]</tt> encapsulated frames
-  * @param [out] size <tt>oac_int16[48]</tt> sizes of the encapsulated frames
-  * @param [out] payload_offset <tt>int*</tt>: returns the position of the payload within the packet (in bytes)
-  * @returns number of frames
-  */
+ * Oac_decode will perform this operation internally so most applications do
+ * not need to use this function.
+ * This function does not copy the frames, the returned pointers are pointers into
+ * the input packet.
+ * @param [in] data <tt>char*</tt>: Oac packet to be parsed
+ * @param [in] len <tt>oac_int32</tt>: size of data
+ * @param [out] out_toc <tt>char*</tt>: TOC pointer
+ * @param [out] frames <tt>char*[48]</tt> encapsulated frames
+ * @param [out] size <tt>oac_int16[48]</tt> sizes of the encapsulated frames
+ * @param [out] payload_offset <tt>int*</tt>: returns the position of the payload within the packet (in bytes)
+ * @returns number of frames
+ */
 OAC_EXPORT int oac_packet_parse(
-   const unsigned char *data,
-   oac_int32 len,
-   unsigned char *out_toc,
-   const unsigned char *frames[48],
-   oac_int16 size[48],
-   int *payload_offset
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(5);
+    const unsigned char *data,
+    oac_int32 len,
+    unsigned char *out_toc,
+    const unsigned char *frames[48],
+    oac_int16 size[48],
+    int *payload_offset) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(5);
 
 /** Gets the bandwidth of an Oac packet.
-  * @param [in] data <tt>char*</tt>: Oac packet
-  * @retval OAC_BANDWIDTH_NARROWBAND Narrowband (4kHz bandpass)
-  * @retval OAC_BANDWIDTH_MEDIUMBAND Mediumband (6kHz bandpass)
-  * @retval OAC_BANDWIDTH_WIDEBAND Wideband (8kHz bandpass)
-  * @retval OAC_BANDWIDTH_SUPERWIDEBAND Superwideband (12kHz bandpass)
-  * @retval OAC_BANDWIDTH_FULLBAND Fullband (20kHz bandpass)
-  * @retval OAC_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
-  */
+ * @param [in] data <tt>char*</tt>: Oac packet
+ * @retval OAC_BANDWIDTH_NARROWBAND Narrowband (4kHz bandpass)
+ * @retval OAC_BANDWIDTH_MEDIUMBAND Mediumband (6kHz bandpass)
+ * @retval OAC_BANDWIDTH_WIDEBAND Wideband (8kHz bandpass)
+ * @retval OAC_BANDWIDTH_SUPERWIDEBAND Superwideband (12kHz bandpass)
+ * @retval OAC_BANDWIDTH_FULLBAND Fullband (20kHz bandpass)
+ * @retval OAC_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_packet_get_bandwidth(const unsigned char *data) OAC_ARG_NONNULL(1);
 
 /** Gets the number of samples per frame from an Oac packet.
-  * @param [in] data <tt>char*</tt>: Oac packet.
-  *                                  This must contain at least one byte of
-  *                                  data.
-  * @param [in] Fs <tt>oac_int32</tt>: Sampling rate in Hz.
-  *                                     This must be a multiple of 400, or
-  *                                     inaccurate results will be returned.
-  * @returns Number of samples per frame.
-  */
-OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_packet_get_samples_per_frame(const unsigned char *data, oac_int32 Fs) OAC_ARG_NONNULL(1);
+ * @param [in] data <tt>char*</tt>: Oac packet.
+ *                                  This must contain at least one byte of
+ *                                  data.
+ * @param [in] Fs <tt>oac_int32</tt>: Sampling rate in Hz.
+ *                                     This must be a multiple of 400, or
+ *                                     inaccurate results will be returned.
+ * @returns Number of samples per frame.
+ */
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_packet_get_samples_per_frame(const unsigned char *data,
+    oac_int32 Fs) OAC_ARG_NONNULL(1);
 
 /** Gets the number of channels from an Oac packet.
-  * @param [in] data <tt>char*</tt>: Oac packet
-  * @returns Number of channels
-  * @retval OAC_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
-  */
+ * @param [in] data <tt>char*</tt>: Oac packet
+ * @returns Number of channels
+ * @retval OAC_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_packet_get_nb_channels(const unsigned char *data) OAC_ARG_NONNULL(1);
 
 /** Gets the number of frames in an Oac packet.
-  * @param [in] packet <tt>char*</tt>: Oac packet
-  * @param [in] len <tt>oac_int32</tt>: Length of packet
-  * @returns Number of frames
-  * @retval OAC_BAD_ARG Insufficient data was passed to the function
-  * @retval OAC_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
-  */
-OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_packet_get_nb_frames(const unsigned char packet[], oac_int32 len) OAC_ARG_NONNULL(1);
+ * @param [in] packet <tt>char*</tt>: Oac packet
+ * @param [in] len <tt>oac_int32</tt>: Length of packet
+ * @returns Number of frames
+ * @retval OAC_BAD_ARG Insufficient data was passed to the function
+ * @retval OAC_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+ */
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_packet_get_nb_frames(const unsigned char packet[],
+    oac_int32 len) OAC_ARG_NONNULL(1);
 
 /** Gets the number of samples of an Oac packet.
-  * @param [in] packet <tt>char*</tt>: Oac packet
-  * @param [in] len <tt>oac_int32</tt>: Length of packet
-  * @param [in] Fs <tt>oac_int32</tt>: Sampling rate in Hz.
-  *                                     This must be a multiple of 400, or
-  *                                     inaccurate results will be returned.
-  * @returns Number of samples
-  * @retval OAC_BAD_ARG Insufficient data was passed to the function
-  * @retval OAC_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
-  */
-OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_packet_get_nb_samples(const unsigned char packet[], oac_int32 len, oac_int32 Fs) OAC_ARG_NONNULL(1);
+ * @param [in] packet <tt>char*</tt>: Oac packet
+ * @param [in] len <tt>oac_int32</tt>: Length of packet
+ * @param [in] Fs <tt>oac_int32</tt>: Sampling rate in Hz.
+ *                                     This must be a multiple of 400, or
+ *                                     inaccurate results will be returned.
+ * @returns Number of samples
+ * @retval OAC_BAD_ARG Insufficient data was passed to the function
+ * @retval OAC_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+ */
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_packet_get_nb_samples(const unsigned char packet[], oac_int32 len,
+    oac_int32 Fs) OAC_ARG_NONNULL(1);
 
 /** Checks whether an Oac packet has LBRR.
-  * @param [in] packet <tt>char*</tt>: Oac packet
-  * @param [in] len <tt>oac_int32</tt>: Length of packet
-  * @returns 1 is LBRR is present, 0 otherwise
-  * @retval OAC_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
-  */
+ * @param [in] packet <tt>char*</tt>: Oac packet
+ * @param [in] len <tt>oac_int32</tt>: Length of packet
+ * @returns 1 is LBRR is present, 0 otherwise
+ * @retval OAC_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_packet_has_lbrr(const unsigned char packet[], oac_int32 len);
 
 /** Gets the number of samples of an Oac packet.
-  * @param [in] dec <tt>OacDecoder*</tt>: Decoder state
-  * @param [in] packet <tt>char*</tt>: Oac packet
-  * @param [in] len <tt>oac_int32</tt>: Length of packet
-  * @returns Number of samples
-  * @retval OAC_BAD_ARG Insufficient data was passed to the function
-  * @retval OAC_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
-  */
-OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_decoder_get_nb_samples(const OacDecoder *dec, const unsigned char packet[], oac_int32 len) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2);
+ * @param [in] dec <tt>OacDecoder*</tt>: Decoder state
+ * @param [in] packet <tt>char*</tt>: Oac packet
+ * @param [in] len <tt>oac_int32</tt>: Length of packet
+ * @returns Number of samples
+ * @retval OAC_BAD_ARG Insufficient data was passed to the function
+ * @retval OAC_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+ */
+OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_decoder_get_nb_samples(const OacDecoder *dec, const unsigned char packet[],
+    oac_int32 len) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2);
 
 /** Applies soft-clipping to bring a float signal within the [-1,1] range. If
-  * the signal is already in that range, nothing is done. If there are values
-  * outside of [-1,1], then the signal is clipped as smoothly as possible to
-  * both fit in the range and avoid creating excessive distortion in the
-  * process.
-  * @param [in,out] pcm <tt>float*</tt>: Input PCM and modified PCM
-  * @param [in] frame_size <tt>int</tt> Number of samples per channel to process
-  * @param [in] channels <tt>int</tt>: Number of channels
-  * @param [in,out] softclip_mem <tt>float*</tt>: State memory for the soft clipping process (one float per channel, initialized to zero)
-  */
+ * the signal is already in that range, nothing is done. If there are values
+ * outside of [-1,1], then the signal is clipped as smoothly as possible to
+ * both fit in the range and avoid creating excessive distortion in the
+ * process.
+ * @param [in,out] pcm <tt>float*</tt>: Input PCM and modified PCM
+ * @param [in] frame_size <tt>int</tt> Number of samples per channel to process
+ * @param [in] channels <tt>int</tt>: Number of channels
+ * @param [in,out] softclip_mem <tt>float*</tt>: State memory for the soft clipping process (one float per channel, initialized to zero)
+ */
 OAC_EXPORT void oac_pcm_soft_clip(float *pcm, int frame_size, int channels, float *softclip_mem);
 
 
 /**@}*/
 
 /** @defgroup oac_repacketizer Repacketizer
-  * @{
-  *
-  * The repacketizer can be used to merge multiple Oac packets into a single
-  * packet or alternatively to split Oac packets that have previously been
-  * merged. Splitting valid Oac packets is always guaranteed to succeed,
-  * whereas merging valid packets only succeeds if all frames have the same
-  * mode, bandwidth, and frame size, and when the total duration of the merged
-  * packet is no more than 120 ms. The 120 ms limit comes from the
-  * specification and limits decoder memory requirements at a point where
-  * framing overhead becomes negligible.
-  *
-  * The repacketizer currently only operates on elementary Oac
-  * streams. It will not manipulate multistream packets successfully, except in
-  * the degenerate case where they consist of data from a single stream.
-  *
-  * The repacketizing process starts with creating a repacketizer state, either
-  * by calling oac_repacketizer_create() or by allocating the memory yourself,
-  * e.g.,
-  * @code
-  * OacRepacketizer *rp;
-  * rp = (OacRepacketizer*)malloc(oac_repacketizer_get_size());
-  * if (rp != NULL)
-  *     oac_repacketizer_init(rp);
-  * @endcode
-  *
-  * Then the application should submit packets with oac_repacketizer_cat(),
-  * extract new packets with oac_repacketizer_out() or
-  * oac_repacketizer_out_range(), and then reset the state for the next set of
-  * input packets via oac_repacketizer_init().
-  *
-  * For example, to split a sequence of packets into individual frames:
-  * @code
-  * unsigned char *data;
-  * int len;
-  * while (get_next_packet(&data, &len))
-  * {
-  *   unsigned char out[1276];
-  *   oac_int32 out_len;
-  *   int nb_frames;
-  *   int err;
-  *   int i;
-  *   err = oac_repacketizer_cat(rp, data, len);
-  *   if (err != OAC_OK)
-  *   {
-  *     release_packet(data);
-  *     return err;
-  *   }
-  *   nb_frames = oac_repacketizer_get_nb_frames(rp);
-  *   for (i = 0; i < nb_frames; i++)
-  *   {
-  *     out_len = oac_repacketizer_out_range(rp, i, i+1, out, sizeof(out));
-  *     if (out_len < 0)
-  *     {
-  *        release_packet(data);
-  *        return (int)out_len;
-  *     }
-  *     output_next_packet(out, out_len);
-  *   }
-  *   oac_repacketizer_init(rp);
-  *   release_packet(data);
-  * }
-  * @endcode
-  *
-  * Alternatively, to combine a sequence of frames into packets that each
-  * contain up to <code>TARGET_DURATION_MS</code> milliseconds of data:
-  * @code
-  * // The maximum number of packets with duration TARGET_DURATION_MS occurs
-  * // when the frame size is 2.5 ms, for a total of (TARGET_DURATION_MS*2/5)
-  * // packets.
-  * unsigned char *data[(TARGET_DURATION_MS*2/5)+1];
-  * oac_int32 len[(TARGET_DURATION_MS*2/5)+1];
-  * int nb_packets;
-  * unsigned char out[1277*(TARGET_DURATION_MS*2/2)];
-  * oac_int32 out_len;
-  * int prev_toc;
-  * nb_packets = 0;
-  * while (get_next_packet(data+nb_packets, len+nb_packets))
-  * {
-  *   int nb_frames;
-  *   int err;
-  *   nb_frames = oac_packet_get_nb_frames(data[nb_packets], len[nb_packets]);
-  *   if (nb_frames < 1)
-  *   {
-  *     release_packets(data, nb_packets+1);
-  *     return nb_frames;
-  *   }
-  *   nb_frames += oac_repacketizer_get_nb_frames(rp);
-  *   // If adding the next packet would exceed our target, or it has an
-  *   // incompatible TOC sequence, output the packets we already have before
-  *   // submitting it.
-  *   // N.B., The nb_packets > 0 check ensures we've submitted at least one
-  *   // packet since the last call to oac_repacketizer_init(). Otherwise a
-  *   // single packet longer than TARGET_DURATION_MS would cause us to try to
-  *   // output an (invalid) empty packet. It also ensures that prev_toc has
-  *   // been set to a valid value. Additionally, len[nb_packets] > 0 is
-  *   // guaranteed by the call to oac_packet_get_nb_frames() above, so the
-  *   // reference to data[nb_packets][0] should be valid.
-  *   if (nb_packets > 0 && (
-  *       ((prev_toc & 0xFC) != (data[nb_packets][0] & 0xFC)) ||
-  *       oac_packet_get_samples_per_frame(data[nb_packets], 48000)*nb_frames >
-  *       TARGET_DURATION_MS*48))
-  *   {
-  *     out_len = oac_repacketizer_out(rp, out, sizeof(out));
-  *     if (out_len < 0)
-  *     {
-  *        release_packets(data, nb_packets+1);
-  *        return (int)out_len;
-  *     }
-  *     output_next_packet(out, out_len);
-  *     oac_repacketizer_init(rp);
-  *     release_packets(data, nb_packets);
-  *     data[0] = data[nb_packets];
-  *     len[0] = len[nb_packets];
-  *     nb_packets = 0;
-  *   }
-  *   err = oac_repacketizer_cat(rp, data[nb_packets], len[nb_packets]);
-  *   if (err != OAC_OK)
-  *   {
-  *     release_packets(data, nb_packets+1);
-  *     return err;
-  *   }
-  *   prev_toc = data[nb_packets][0];
-  *   nb_packets++;
-  * }
-  * // Output the final, partial packet.
-  * if (nb_packets > 0)
-  * {
-  *   out_len = oac_repacketizer_out(rp, out, sizeof(out));
-  *   release_packets(data, nb_packets);
-  *   if (out_len < 0)
-  *     return (int)out_len;
-  *   output_next_packet(out, out_len);
-  * }
-  * @endcode
-  *
-  * An alternate way of merging packets is to simply call oac_repacketizer_cat()
-  * unconditionally until it fails. At that point, the merged packet can be
-  * obtained with oac_repacketizer_out() and the input packet for which
-  * oac_repacketizer_cat() needs to be re-added to a newly reinitialized
-  * repacketizer state.
-  */
+ * @{
+ *
+ * The repacketizer can be used to merge multiple Oac packets into a single
+ * packet or alternatively to split Oac packets that have previously been
+ * merged. Splitting valid Oac packets is always guaranteed to succeed,
+ * whereas merging valid packets only succeeds if all frames have the same
+ * mode, bandwidth, and frame size, and when the total duration of the merged
+ * packet is no more than 120 ms. The 120 ms limit comes from the
+ * specification and limits decoder memory requirements at a point where
+ * framing overhead becomes negligible.
+ *
+ * The repacketizer currently only operates on elementary Oac
+ * streams. It will not manipulate multistream packets successfully, except in
+ * the degenerate case where they consist of data from a single stream.
+ *
+ * The repacketizing process starts with creating a repacketizer state, either
+ * by calling oac_repacketizer_create() or by allocating the memory yourself,
+ * e.g.,
+ * @code
+ * OacRepacketizer *rp;
+ * rp = (OacRepacketizer*)malloc(oac_repacketizer_get_size());
+ * if (rp != NULL)
+ *     oac_repacketizer_init(rp);
+ * @endcode
+ *
+ * Then the application should submit packets with oac_repacketizer_cat(),
+ * extract new packets with oac_repacketizer_out() or
+ * oac_repacketizer_out_range(), and then reset the state for the next set of
+ * input packets via oac_repacketizer_init().
+ *
+ * For example, to split a sequence of packets into individual frames:
+ * @code
+ * unsigned char *data;
+ * int len;
+ * while (get_next_packet(&data, &len))
+ * {
+ *   unsigned char out[1276];
+ *   oac_int32 out_len;
+ *   int nb_frames;
+ *   int err;
+ *   int i;
+ *   err = oac_repacketizer_cat(rp, data, len);
+ *   if (err != OAC_OK)
+ *   {
+ *     release_packet(data);
+ *     return err;
+ *   }
+ *   nb_frames = oac_repacketizer_get_nb_frames(rp);
+ *   for (i = 0; i < nb_frames; i++)
+ *   {
+ *     out_len = oac_repacketizer_out_range(rp, i, i+1, out, sizeof(out));
+ *     if (out_len < 0)
+ *     {
+ *        release_packet(data);
+ *        return (int)out_len;
+ *     }
+ *     output_next_packet(out, out_len);
+ *   }
+ *   oac_repacketizer_init(rp);
+ *   release_packet(data);
+ * }
+ * @endcode
+ *
+ * Alternatively, to combine a sequence of frames into packets that each
+ * contain up to <code>TARGET_DURATION_MS</code> milliseconds of data:
+ * @code
+ * // The maximum number of packets with duration TARGET_DURATION_MS occurs
+ * // when the frame size is 2.5 ms, for a total of (TARGET_DURATION_MS*2/5)
+ * // packets.
+ * unsigned char *data[(TARGET_DURATION_MS*2/5)+1];
+ * oac_int32 len[(TARGET_DURATION_MS*2/5)+1];
+ * int nb_packets;
+ * unsigned char out[1277*(TARGET_DURATION_MS*2/2)];
+ * oac_int32 out_len;
+ * int prev_toc;
+ * nb_packets = 0;
+ * while (get_next_packet(data+nb_packets, len+nb_packets))
+ * {
+ *   int nb_frames;
+ *   int err;
+ *   nb_frames = oac_packet_get_nb_frames(data[nb_packets], len[nb_packets]);
+ *   if (nb_frames < 1)
+ *   {
+ *     release_packets(data, nb_packets+1);
+ *     return nb_frames;
+ *   }
+ *   nb_frames += oac_repacketizer_get_nb_frames(rp);
+ *   // If adding the next packet would exceed our target, or it has an
+ *   // incompatible TOC sequence, output the packets we already have before
+ *   // submitting it.
+ *   // N.B., The nb_packets > 0 check ensures we've submitted at least one
+ *   // packet since the last call to oac_repacketizer_init(). Otherwise a
+ *   // single packet longer than TARGET_DURATION_MS would cause us to try to
+ *   // output an (invalid) empty packet. It also ensures that prev_toc has
+ *   // been set to a valid value. Additionally, len[nb_packets] > 0 is
+ *   // guaranteed by the call to oac_packet_get_nb_frames() above, so the
+ *   // reference to data[nb_packets][0] should be valid.
+ *   if (nb_packets > 0 && (
+ *       ((prev_toc & 0xFC) != (data[nb_packets][0] & 0xFC)) ||
+ *       oac_packet_get_samples_per_frame(data[nb_packets], 48000)*nb_frames >
+ *       TARGET_DURATION_MS*48))
+ *   {
+ *     out_len = oac_repacketizer_out(rp, out, sizeof(out));
+ *     if (out_len < 0)
+ *     {
+ *        release_packets(data, nb_packets+1);
+ *        return (int)out_len;
+ *     }
+ *     output_next_packet(out, out_len);
+ *     oac_repacketizer_init(rp);
+ *     release_packets(data, nb_packets);
+ *     data[0] = data[nb_packets];
+ *     len[0] = len[nb_packets];
+ *     nb_packets = 0;
+ *   }
+ *   err = oac_repacketizer_cat(rp, data[nb_packets], len[nb_packets]);
+ *   if (err != OAC_OK)
+ *   {
+ *     release_packets(data, nb_packets+1);
+ *     return err;
+ *   }
+ *   prev_toc = data[nb_packets][0];
+ *   nb_packets++;
+ * }
+ * // Output the final, partial packet.
+ * if (nb_packets > 0)
+ * {
+ *   out_len = oac_repacketizer_out(rp, out, sizeof(out));
+ *   release_packets(data, nb_packets);
+ *   if (out_len < 0)
+ *     return (int)out_len;
+ *   output_next_packet(out, out_len);
+ * }
+ * @endcode
+ *
+ * An alternate way of merging packets is to simply call oac_repacketizer_cat()
+ * unconditionally until it fails. At that point, the merged packet can be
+ * obtained with oac_repacketizer_out() and the input packet for which
+ * oac_repacketizer_cat() needs to be re-added to a newly reinitialized
+ * repacketizer state.
+ */
 
 typedef struct OacRepacketizer OacRepacketizer;
 
 /** Gets the size of an <code>OacRepacketizer</code> structure.
-  * @returns The size in bytes.
-  */
+ * @returns The size in bytes.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_repacketizer_get_size(void);
 
 /** (Re)initializes a previously allocated repacketizer state.
-  * The state must be at least the size returned by oac_repacketizer_get_size().
-  * This can be used for applications which use their own allocator instead of
-  * malloc().
-  * It must also be called to reset the queue of packets waiting to be
-  * repacketized, which is necessary if the maximum packet duration of 120 ms
-  * is reached or if you wish to submit packets with a different Oac
-  * configuration (coding mode, audio bandwidth, frame size, or channel count).
-  * Failure to do so will prevent a new packet from being added with
-  * oac_repacketizer_cat().
-  * @see oac_repacketizer_create
-  * @see oac_repacketizer_get_size
-  * @see oac_repacketizer_cat
-  * @param rp <tt>OacRepacketizer*</tt>: The repacketizer state to
-  *                                       (re)initialize.
-  * @returns A pointer to the same repacketizer state that was passed in.
-  */
+ * The state must be at least the size returned by oac_repacketizer_get_size().
+ * This can be used for applications which use their own allocator instead of
+ * malloc().
+ * It must also be called to reset the queue of packets waiting to be
+ * repacketized, which is necessary if the maximum packet duration of 120 ms
+ * is reached or if you wish to submit packets with a different Oac
+ * configuration (coding mode, audio bandwidth, frame size, or channel count).
+ * Failure to do so will prevent a new packet from being added with
+ * oac_repacketizer_cat().
+ * @see oac_repacketizer_create
+ * @see oac_repacketizer_get_size
+ * @see oac_repacketizer_cat
+ * @param rp <tt>OacRepacketizer*</tt>: The repacketizer state to
+ *                                       (re)initialize.
+ * @returns A pointer to the same repacketizer state that was passed in.
+ */
 OAC_EXPORT OacRepacketizer *oac_repacketizer_init(OacRepacketizer *rp) OAC_ARG_NONNULL(1);
 
 /** Allocates memory and initializes the new repacketizer with
  * oac_repacketizer_init().
-  */
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT OacRepacketizer *oac_repacketizer_create(void);
 
 /** Frees an <code>OacRepacketizer</code> allocated by
-  * oac_repacketizer_create().
-  * @param[in] rp <tt>OacRepacketizer*</tt>: State to be freed.
-  */
+ * oac_repacketizer_create().
+ * @param[in] rp <tt>OacRepacketizer*</tt>: State to be freed.
+ */
 OAC_EXPORT void oac_repacketizer_destroy(OacRepacketizer *rp);
 
 /** Add a packet to the current repacketizer state.
-  * This packet must match the configuration of any packets already submitted
-  * for repacketization since the last call to oac_repacketizer_init().
-  * This means that it must have the same coding mode, audio bandwidth, frame
-  * size, and channel count.
-  * This can be checked in advance by examining the top 6 bits of the first
-  * byte of the packet, and ensuring they match the top 6 bits of the first
-  * byte of any previously submitted packet.
-  * The total duration of audio in the repacketizer state also must not exceed
-  * 120 ms, the maximum duration of a single packet, after adding this packet.
-  *
-  * The contents of the current repacketizer state can be extracted into new
-  * packets using oac_repacketizer_out() or oac_repacketizer_out_range().
-  *
-  * In order to add a packet with a different configuration or to add more
-  * audio beyond 120 ms, you must clear the repacketizer state by calling
-  * oac_repacketizer_init().
-  * If a packet is too large to add to the current repacketizer state, no part
-  * of it is added, even if it contains multiple frames, some of which might
-  * fit.
-  * If you wish to be able to add parts of such packets, you should first use
-  * another repacketizer to split the packet into pieces and add them
-  * individually.
-  * @see oac_repacketizer_out_range
-  * @see oac_repacketizer_out
-  * @see oac_repacketizer_init
-  * @param rp <tt>OacRepacketizer*</tt>: The repacketizer state to which to
-  *                                       add the packet.
-  * @param[in] data <tt>const unsigned char*</tt>: The packet data.
-  *                                                The application must ensure
-  *                                                this pointer remains valid
-  *                                                until the next call to
-  *                                                oac_repacketizer_init() or
-  *                                                oac_repacketizer_destroy().
-  * @param len <tt>oac_int32</tt>: The number of bytes in the packet data.
-  * @returns An error code indicating whether or not the operation succeeded.
-  * @retval #OAC_OK The packet's contents have been added to the repacketizer
-  *                  state.
-  * @retval #OAC_INVALID_PACKET The packet did not have a valid TOC sequence,
-  *                              the packet's TOC sequence was not compatible
-  *                              with previously submitted packets (because
-  *                              the coding mode, audio bandwidth, frame size,
-  *                              or channel count did not match), or adding
-  *                              this packet would increase the total amount of
-  *                              audio stored in the repacketizer state to more
-  *                              than 120 ms.
-  */
-OAC_EXPORT int oac_repacketizer_cat(OacRepacketizer *rp, const unsigned char *data, oac_int32 len) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2);
+ * This packet must match the configuration of any packets already submitted
+ * for repacketization since the last call to oac_repacketizer_init().
+ * This means that it must have the same coding mode, audio bandwidth, frame
+ * size, and channel count.
+ * This can be checked in advance by examining the top 6 bits of the first
+ * byte of the packet, and ensuring they match the top 6 bits of the first
+ * byte of any previously submitted packet.
+ * The total duration of audio in the repacketizer state also must not exceed
+ * 120 ms, the maximum duration of a single packet, after adding this packet.
+ *
+ * The contents of the current repacketizer state can be extracted into new
+ * packets using oac_repacketizer_out() or oac_repacketizer_out_range().
+ *
+ * In order to add a packet with a different configuration or to add more
+ * audio beyond 120 ms, you must clear the repacketizer state by calling
+ * oac_repacketizer_init().
+ * If a packet is too large to add to the current repacketizer state, no part
+ * of it is added, even if it contains multiple frames, some of which might
+ * fit.
+ * If you wish to be able to add parts of such packets, you should first use
+ * another repacketizer to split the packet into pieces and add them
+ * individually.
+ * @see oac_repacketizer_out_range
+ * @see oac_repacketizer_out
+ * @see oac_repacketizer_init
+ * @param rp <tt>OacRepacketizer*</tt>: The repacketizer state to which to
+ *                                       add the packet.
+ * @param[in] data <tt>const unsigned char*</tt>: The packet data.
+ *                                                The application must ensure
+ *                                                this pointer remains valid
+ *                                                until the next call to
+ *                                                oac_repacketizer_init() or
+ *                                                oac_repacketizer_destroy().
+ * @param len <tt>oac_int32</tt>: The number of bytes in the packet data.
+ * @returns An error code indicating whether or not the operation succeeded.
+ * @retval #OAC_OK The packet's contents have been added to the repacketizer
+ *                  state.
+ * @retval #OAC_INVALID_PACKET The packet did not have a valid TOC sequence,
+ *                              the packet's TOC sequence was not compatible
+ *                              with previously submitted packets (because
+ *                              the coding mode, audio bandwidth, frame size,
+ *                              or channel count did not match), or adding
+ *                              this packet would increase the total amount of
+ *                              audio stored in the repacketizer state to more
+ *                              than 120 ms.
+ */
+OAC_EXPORT int oac_repacketizer_cat(OacRepacketizer *rp, const unsigned char *data,
+    oac_int32 len) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2);
 
 
 /** Construct a new packet from data previously submitted to the repacketizer
-  * state via oac_repacketizer_cat().
-  * @param rp <tt>OacRepacketizer*</tt>: The repacketizer state from which to
-  *                                       construct the new packet.
-  * @param begin <tt>int</tt>: The index of the first frame in the current
-  *                            repacketizer state to include in the output.
-  * @param end <tt>int</tt>: One past the index of the last frame in the
-  *                          current repacketizer state to include in the
-  *                          output.
-  * @param[out] data <tt>const unsigned char*</tt>: The buffer in which to
-  *                                                 store the output packet.
-  * @param maxlen <tt>oac_int32</tt>: The maximum number of bytes to store in
-  *                                    the output buffer. In order to guarantee
-  *                                    success, this should be at least
-  *                                    <code>1276</code> for a single frame,
-  *                                    or for multiple frames,
-  *                                    <code>1277*(end-begin)</code>.
-  *                                    However, <code>1*(end-begin)</code> plus
-  *                                    the size of all packet data submitted to
-  *                                    the repacketizer since the last call to
-  *                                    oac_repacketizer_init() or
-  *                                    oac_repacketizer_create() is also
-  *                                    sufficient, and possibly much smaller.
-  * @returns The total size of the output packet on success, or an error code
-  *          on failure.
-  * @retval #OAC_BAD_ARG <code>[begin,end)</code> was an invalid range of
-  *                       frames (begin < 0, begin >= end, or end >
-  *                       oac_repacketizer_get_nb_frames()).
-  * @retval #OAC_BUFFER_TOO_SMALL \a maxlen was insufficient to contain the
-  *                                complete output packet.
-  */
-OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_repacketizer_out_range(OacRepacketizer *rp, int begin, int end, unsigned char *data, oac_int32 maxlen) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
+ * state via oac_repacketizer_cat().
+ * @param rp <tt>OacRepacketizer*</tt>: The repacketizer state from which to
+ *                                       construct the new packet.
+ * @param begin <tt>int</tt>: The index of the first frame in the current
+ *                            repacketizer state to include in the output.
+ * @param end <tt>int</tt>: One past the index of the last frame in the
+ *                          current repacketizer state to include in the
+ *                          output.
+ * @param[out] data <tt>const unsigned char*</tt>: The buffer in which to
+ *                                                 store the output packet.
+ * @param maxlen <tt>oac_int32</tt>: The maximum number of bytes to store in
+ *                                    the output buffer. In order to guarantee
+ *                                    success, this should be at least
+ *                                    <code>1276</code> for a single frame,
+ *                                    or for multiple frames,
+ *                                    <code>1277*(end-begin)</code>.
+ *                                    However, <code>1*(end-begin)</code> plus
+ *                                    the size of all packet data submitted to
+ *                                    the repacketizer since the last call to
+ *                                    oac_repacketizer_init() or
+ *                                    oac_repacketizer_create() is also
+ *                                    sufficient, and possibly much smaller.
+ * @returns The total size of the output packet on success, or an error code
+ *          on failure.
+ * @retval #OAC_BAD_ARG <code>[begin,end)</code> was an invalid range of
+ *                       frames (begin < 0, begin >= end, or end >
+ *                       oac_repacketizer_get_nb_frames()).
+ * @retval #OAC_BUFFER_TOO_SMALL \a maxlen was insufficient to contain the
+ *                                complete output packet.
+ */
+OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_repacketizer_out_range(OacRepacketizer *rp, int begin, int end,
+    unsigned char *data, oac_int32 maxlen) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
 /** Return the total number of frames contained in packet data submitted to
-  * the repacketizer state so far via oac_repacketizer_cat() since the last
-  * call to oac_repacketizer_init() or oac_repacketizer_create().
-  * This defines the valid range of packets that can be extracted with
-  * oac_repacketizer_out_range() or oac_repacketizer_out().
-  * @param rp <tt>OacRepacketizer*</tt>: The repacketizer state containing the
-  *                                       frames.
-  * @returns The total number of frames contained in the packet data submitted
-  *          to the repacketizer state.
-  */
+ * the repacketizer state so far via oac_repacketizer_cat() since the last
+ * call to oac_repacketizer_init() or oac_repacketizer_create().
+ * This defines the valid range of packets that can be extracted with
+ * oac_repacketizer_out_range() or oac_repacketizer_out().
+ * @param rp <tt>OacRepacketizer*</tt>: The repacketizer state containing the
+ *                                       frames.
+ * @returns The total number of frames contained in the packet data submitted
+ *          to the repacketizer state.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_repacketizer_get_nb_frames(OacRepacketizer *rp) OAC_ARG_NONNULL(1);
 
 /** Construct a new packet from data previously submitted to the repacketizer
-  * state via oac_repacketizer_cat().
-  * This is a convenience routine that returns all the data submitted so far
-  * in a single packet.
-  * It is equivalent to calling
-  * @code
-  * oac_repacketizer_out_range(rp, 0, oac_repacketizer_get_nb_frames(rp),
-  *                             data, maxlen)
-  * @endcode
-  * @param rp <tt>OacRepacketizer*</tt>: The repacketizer state from which to
-  *                                       construct the new packet.
-  * @param[out] data <tt>const unsigned char*</tt>: The buffer in which to
-  *                                                 store the output packet.
-  * @param maxlen <tt>oac_int32</tt>: The maximum number of bytes to store in
-  *                                    the output buffer. In order to guarantee
-  *                                    success, this should be at least
-  *                                    <code>1277*oac_repacketizer_get_nb_frames(rp)</code>.
-  *                                    However,
-  *                                    <code>1*oac_repacketizer_get_nb_frames(rp)</code>
-  *                                    plus the size of all packet data
-  *                                    submitted to the repacketizer since the
-  *                                    last call to oac_repacketizer_init() or
-  *                                    oac_repacketizer_create() is also
-  *                                    sufficient, and possibly much smaller.
-  * @returns The total size of the output packet on success, or an error code
-  *          on failure.
-  * @retval #OAC_BUFFER_TOO_SMALL \a maxlen was insufficient to contain the
-  *                                complete output packet.
-  */
-OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_repacketizer_out(OacRepacketizer *rp, unsigned char *data, oac_int32 maxlen) OAC_ARG_NONNULL(1);
+ * state via oac_repacketizer_cat().
+ * This is a convenience routine that returns all the data submitted so far
+ * in a single packet.
+ * It is equivalent to calling
+ * @code
+ * oac_repacketizer_out_range(rp, 0, oac_repacketizer_get_nb_frames(rp),
+ *                             data, maxlen)
+ * @endcode
+ * @param rp <tt>OacRepacketizer*</tt>: The repacketizer state from which to
+ *                                       construct the new packet.
+ * @param[out] data <tt>const unsigned char*</tt>: The buffer in which to
+ *                                                 store the output packet.
+ * @param maxlen <tt>oac_int32</tt>: The maximum number of bytes to store in
+ *                                    the output buffer. In order to guarantee
+ *                                    success, this should be at least
+ *                                    <code>1277*oac_repacketizer_get_nb_frames(rp)</code>.
+ *                                    However,
+ *                                    <code>1*oac_repacketizer_get_nb_frames(rp)</code>
+ *                                    plus the size of all packet data
+ *                                    submitted to the repacketizer since the
+ *                                    last call to oac_repacketizer_init() or
+ *                                    oac_repacketizer_create() is also
+ *                                    sufficient, and possibly much smaller.
+ * @returns The total size of the output packet on success, or an error code
+ *          on failure.
+ * @retval #OAC_BUFFER_TOO_SMALL \a maxlen was insufficient to contain the
+ *                                complete output packet.
+ */
+OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_repacketizer_out(OacRepacketizer *rp, unsigned char *data,
+    oac_int32 maxlen) OAC_ARG_NONNULL(1);
 
 /** Pads a given Oac packet to a larger size (possibly changing the TOC sequence).
-  * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
-  *                                                   packet to pad.
-  * @param len <tt>oac_int32</tt>: The size of the packet.
-  *                                 This must be at least 1.
-  * @param new_len <tt>oac_int32</tt>: The desired size of the packet after padding.
-  *                                 This must be at least as large as len.
-  * @returns an error code
-  * @retval #OAC_OK \a on success.
-  * @retval #OAC_BAD_ARG \a len was less than 1 or new_len was less than len.
-  * @retval #OAC_INVALID_PACKET \a data did not contain a valid Oac packet.
-  */
+ * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
+ *                                                   packet to pad.
+ * @param len <tt>oac_int32</tt>: The size of the packet.
+ *                                 This must be at least 1.
+ * @param new_len <tt>oac_int32</tt>: The desired size of the packet after padding.
+ *                                 This must be at least as large as len.
+ * @returns an error code
+ * @retval #OAC_OK \a on success.
+ * @retval #OAC_BAD_ARG \a len was less than 1 or new_len was less than len.
+ * @retval #OAC_INVALID_PACKET \a data did not contain a valid Oac packet.
+ */
 OAC_EXPORT int oac_packet_pad(unsigned char *data, oac_int32 len, oac_int32 new_len);
 
 /** Remove all padding from a given Oac packet and rewrite the TOC sequence to
-  * minimize space usage.
-  * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
-  *                                                   packet to strip.
-  * @param len <tt>oac_int32</tt>: The size of the packet.
-  *                                 This must be at least 1.
-  * @returns The new size of the output packet on success, or an error code
-  *          on failure.
-  * @retval #OAC_BAD_ARG \a len was less than 1.
-  * @retval #OAC_INVALID_PACKET \a data did not contain a valid Oac packet.
-  */
+ * minimize space usage.
+ * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
+ *                                                   packet to strip.
+ * @param len <tt>oac_int32</tt>: The size of the packet.
+ *                                 This must be at least 1.
+ * @returns The new size of the output packet on success, or an error code
+ *          on failure.
+ * @retval #OAC_BAD_ARG \a len was less than 1.
+ * @retval #OAC_INVALID_PACKET \a data did not contain a valid Oac packet.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_packet_unpad(unsigned char *data, oac_int32 len);
 
 /** Pads a given Oac multi-stream packet to a larger size (possibly changing the TOC sequence).
-  * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
-  *                                                   packet to pad.
-  * @param len <tt>oac_int32</tt>: The size of the packet.
-  *                                 This must be at least 1.
-  * @param new_len <tt>oac_int32</tt>: The desired size of the packet after padding.
-  *                                 This must be at least 1.
-  * @param nb_streams <tt>oac_int32</tt>: The number of streams (not channels) in the packet.
-  *                                 This must be at least as large as len.
-  * @returns an error code
-  * @retval #OAC_OK \a on success.
-  * @retval #OAC_BAD_ARG \a len was less than 1.
-  * @retval #OAC_INVALID_PACKET \a data did not contain a valid Oac packet.
-  */
+ * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
+ *                                                   packet to pad.
+ * @param len <tt>oac_int32</tt>: The size of the packet.
+ *                                 This must be at least 1.
+ * @param new_len <tt>oac_int32</tt>: The desired size of the packet after padding.
+ *                                 This must be at least 1.
+ * @param nb_streams <tt>oac_int32</tt>: The number of streams (not channels) in the packet.
+ *                                 This must be at least as large as len.
+ * @returns an error code
+ * @retval #OAC_OK \a on success.
+ * @retval #OAC_BAD_ARG \a len was less than 1.
+ * @retval #OAC_INVALID_PACKET \a data did not contain a valid Oac packet.
+ */
 OAC_EXPORT int oac_multistream_packet_pad(unsigned char *data, oac_int32 len, oac_int32 new_len, int nb_streams);
 
 /** Remove all padding from a given Oac multi-stream packet and rewrite the TOC sequence to
-  * minimize space usage.
-  * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
-  *                                                   packet to strip.
-  * @param len <tt>oac_int32</tt>: The size of the packet.
-  *                                 This must be at least 1.
-  * @param nb_streams <tt>oac_int32</tt>: The number of streams (not channels) in the packet.
-  *                                 This must be at least 1.
-  * @returns The new size of the output packet on success, or an error code
-  *          on failure.
-  * @retval #OAC_BAD_ARG \a len was less than 1 or new_len was less than len.
-  * @retval #OAC_INVALID_PACKET \a data did not contain a valid Oac packet.
-  */
-OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_multistream_packet_unpad(unsigned char *data, oac_int32 len, int nb_streams);
+ * minimize space usage.
+ * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
+ *                                                   packet to strip.
+ * @param len <tt>oac_int32</tt>: The size of the packet.
+ *                                 This must be at least 1.
+ * @param nb_streams <tt>oac_int32</tt>: The number of streams (not channels) in the packet.
+ *                                 This must be at least 1.
+ * @returns The new size of the output packet on success, or an error code
+ *          on failure.
+ * @retval #OAC_BAD_ARG \a len was less than 1 or new_len was less than len.
+ * @retval #OAC_INVALID_PACKET \a data did not contain a valid Oac packet.
+ */
+OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_multistream_packet_unpad(unsigned char *data, oac_int32 len,
+    int nb_streams);
 
 /**@}*/
 
diff --git a/include/oac_custom.h b/include/oac_custom.h
index cb3159476..fe3344b7f 100644
--- a/include/oac_custom.h
+++ b/include/oac_custom.h
@@ -25,11 +25,11 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 /**
-  @file oac_custom.h
-  @brief Oac-Custom reference implementation API
+   @file oac_custom.h
+   @brief Oac-Custom reference implementation API
  */
 
 #ifndef OAC_CUSTOM_H
@@ -54,38 +54,38 @@ extern "C" {
 #endif
 
 /** @defgroup oac_custom Oac Custom
-  * @{
-  *  Oac Custom is an optional part of the Oac specification and
-  * reference implementation which uses a distinct API from the regular
-  * API and supports frame sizes that are not normally supported.\ Use
-  * of Oac Custom is discouraged for all but very special applications
-  * for which a frame size different from 2.5, 5, 10, or 20 ms is needed
-  * (for either complexity or latency reasons) and where interoperability
-  * is less important.
-  *
-  * In addition to the interoperability limitations the use of Oac custom
-  * disables a substantial chunk of the codec and generally lowers the
-  * quality available at a given bitrate. Normally when an application needs
-  * a different frame size from the codec it should buffer to match the
-  * sizes but this adds a small amount of delay which may be important
-  * in some very low latency applications. Some transports (especially
-  * constant rate RF transports) may also work best with frames of
-  * particular durations.
-  *
-  * Liboac only supports custom modes if they are enabled at compile time.
-  *
-  * The Oac Custom API is similar to the regular API but the
-  * @ref oac_encoder_create and @ref oac_decoder_create calls take
-  * an additional mode parameter which is a structure produced by
-  * a call to @ref oac_custom_mode_create. Both the encoder and decoder
-  * must create a mode using the same sample rate (fs) and frame size
-  * (frame size) so these parameters must either be signaled out of band
-  * or fixed in a particular implementation.
-  *
-  * Similar to regular Oac the custom modes support on the fly frame size
-  * switching, but the sizes available depend on the particular frame size in
-  * use. For some initial frame sizes on a single on the fly size is available.
-  */
+ * @{
+ *  Oac Custom is an optional part of the Oac specification and
+ * reference implementation which uses a distinct API from the regular
+ * API and supports frame sizes that are not normally supported.\ Use
+ * of Oac Custom is discouraged for all but very special applications
+ * for which a frame size different from 2.5, 5, 10, or 20 ms is needed
+ * (for either complexity or latency reasons) and where interoperability
+ * is less important.
+ *
+ * In addition to the interoperability limitations the use of Oac custom
+ * disables a substantial chunk of the codec and generally lowers the
+ * quality available at a given bitrate. Normally when an application needs
+ * a different frame size from the codec it should buffer to match the
+ * sizes but this adds a small amount of delay which may be important
+ * in some very low latency applications. Some transports (especially
+ * constant rate RF transports) may also work best with frames of
+ * particular durations.
+ *
+ * Liboac only supports custom modes if they are enabled at compile time.
+ *
+ * The Oac Custom API is similar to the regular API but the
+ * @ref oac_encoder_create and @ref oac_decoder_create calls take
+ * an additional mode parameter which is a structure produced by
+ * a call to @ref oac_custom_mode_create. Both the encoder and decoder
+ * must create a mode using the same sample rate (fs) and frame size
+ * (frame size) so these parameters must either be signaled out of band
+ * or fixed in a particular implementation.
+ *
+ * Similar to regular Oac the custom modes support on the fly frame size
+ * switching, but the sizes available depend on the particular frame size in
+ * use. For some initial frame sizes on a single on the fly size is available.
+ */
 
 /** Contains the state of an encoder. One encoder state is needed
     for each stream. It is initialized once at the beginning of the
@@ -111,20 +111,21 @@ typedef struct OacCustomDecoder OacCustomDecoder;
 typedef struct OacCustomMode OacCustomMode;
 
 /** Creates a new mode struct. This will be passed to an encoder or
-  * decoder. The mode MUST NOT BE DESTROYED until the encoders and
-  * decoders that use it are destroyed as well.
-  * @param [in] Fs <tt>int</tt>: Sampling rate (8000 to 96000 Hz)
-  * @param [in] frame_size <tt>int</tt>: Number of samples (per channel) to encode in each
-  *        packet (64 - 1024, prime factorization must contain zero or more 2s, 3s, or 5s and no other primes)
-  * @param [out] error <tt>int*</tt>: Returned error code (if NULL, no error will be returned)
-  * @return A newly created mode
-  */
-OAC_CUSTOM_EXPORT OAC_WARN_UNUSED_RESULT OacCustomMode *oac_custom_mode_create(oac_int32 Fs, int frame_size, int *error);
+ * decoder. The mode MUST NOT BE DESTROYED until the encoders and
+ * decoders that use it are destroyed as well.
+ * @param [in] Fs <tt>int</tt>: Sampling rate (8000 to 96000 Hz)
+ * @param [in] frame_size <tt>int</tt>: Number of samples (per channel) to encode in each
+ *        packet (64 - 1024, prime factorization must contain zero or more 2s, 3s, or 5s and no other primes)
+ * @param [out] error <tt>int*</tt>: Returned error code (if NULL, no error will be returned)
+ * @return A newly created mode
+ */
+OAC_CUSTOM_EXPORT OAC_WARN_UNUSED_RESULT OacCustomMode *oac_custom_mode_create(oac_int32 Fs, int frame_size,
+    int *error);
 
 /** Destroys a mode struct. Only call this after all encoders and
-  * decoders using this mode are destroyed as well.
-  * @param [in] mode <tt>OacCustomMode*</tt>: Mode to be freed.
-  */
+ * decoders using this mode are destroyed as well.
+ * @param [in] mode <tt>OacCustomMode*</tt>: Mode to be freed.
+ */
 OAC_CUSTOM_EXPORT void oac_custom_mode_destroy(OacCustomMode *mode);
 
 
@@ -132,131 +133,125 @@ OAC_CUSTOM_EXPORT void oac_custom_mode_destroy(OacCustomMode *mode);
 
 /* Encoder */
 /** Gets the size of an OacCustomEncoder structure.
-  * @param [in] mode <tt>OacCustomMode *</tt>: Mode configuration
-  * @param [in] channels <tt>int</tt>: Number of channels
-  * @returns size
-  */
+ * @param [in] mode <tt>OacCustomMode *</tt>: Mode configuration
+ * @param [in] channels <tt>int</tt>: Number of channels
+ * @returns size
+ */
 OAC_CUSTOM_EXPORT_STATIC OAC_WARN_UNUSED_RESULT int oac_custom_encoder_get_size(
     const OacCustomMode *mode,
-    int channels
-) OAC_ARG_NONNULL(1);
+    int channels) OAC_ARG_NONNULL(1);
 
-#if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
+# if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
 /** Initializes a previously allocated encoder state
-  * The memory pointed to by st must be the size returned by oac_custom_encoder_get_size.
-  * This is intended for applications which use their own allocator instead of malloc.
-  * @see oac_custom_encoder_create(),oac_custom_encoder_get_size()
-  * To reset a previously initialized state use the OAC_RESET_STATE CTL.
-  * @param [in] st <tt>OacCustomEncoder*</tt>: Encoder state
-  * @param [in] mode <tt>OacCustomMode *</tt>: Contains all the information about the characteristics of
-  *  the stream (must be the same characteristics as used for the
-  *  decoder)
-  * @param [in] channels <tt>int</tt>: Number of channels
-  * @return OAC_OK Success or @ref oac_errorcodes
-  */
+ * The memory pointed to by st must be the size returned by oac_custom_encoder_get_size.
+ * This is intended for applications which use their own allocator instead of malloc.
+ * @see oac_custom_encoder_create(),oac_custom_encoder_get_size()
+ * To reset a previously initialized state use the OAC_RESET_STATE CTL.
+ * @param [in] st <tt>OacCustomEncoder*</tt>: Encoder state
+ * @param [in] mode <tt>OacCustomMode *</tt>: Contains all the information about the characteristics of
+ *  the stream (must be the same characteristics as used for the
+ *  decoder)
+ * @param [in] channels <tt>int</tt>: Number of channels
+ * @return OAC_OK Success or @ref oac_errorcodes
+ */
 OAC_CUSTOM_EXPORT int oac_custom_encoder_init(
     OacCustomEncoder *st,
     const OacCustomMode *mode,
-    int channels
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2);
+    int channels) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2);
 # endif
 #endif
 
 
 /** Creates a new encoder state. Each stream needs its own encoder
-  * state (can't be shared across simultaneous streams).
-  * @param [in] mode <tt>OacCustomMode*</tt>: Contains all the information about the characteristics of
-  *  the stream (must be the same characteristics as used for the
-  *  decoder)
-  * @param [in] channels <tt>int</tt>: Number of channels
-  * @param [out] error <tt>int*</tt>: Returns an error code
-  * @return Newly created encoder state.
-*/
+ * state (can't be shared across simultaneous streams).
+ * @param [in] mode <tt>OacCustomMode*</tt>: Contains all the information about the characteristics of
+ *  the stream (must be the same characteristics as used for the
+ *  decoder)
+ * @param [in] channels <tt>int</tt>: Number of channels
+ * @param [out] error <tt>int*</tt>: Returns an error code
+ * @return Newly created encoder state.
+ */
 OAC_CUSTOM_EXPORT OAC_WARN_UNUSED_RESULT OacCustomEncoder *oac_custom_encoder_create(
     const OacCustomMode *mode,
     int channels,
-    int *error
-) OAC_ARG_NONNULL(1);
+    int *error) OAC_ARG_NONNULL(1);
 
 
 /** Destroys an encoder state.
-  * @param[in] st <tt>OacCustomEncoder*</tt>: State to be freed.
-  */
+ * @param[in] st <tt>OacCustomEncoder*</tt>: State to be freed.
+ */
 OAC_CUSTOM_EXPORT void oac_custom_encoder_destroy(OacCustomEncoder *st);
 
 /** Encodes a frame of audio.
-  * @param [in] st <tt>OacCustomEncoder*</tt>: Encoder state
-  * @param [in] pcm <tt>float*</tt>: PCM audio in float format, with a normal range of +/-1.0.
-  *          Samples with a range beyond +/-1.0 are supported but will
-  *          be clipped by decoders using the integer API and should
-  *          only be used if it is known that the far end supports
-  *          extended dynamic range. There must be exactly
-  *          frame_size samples per channel.
-  * @param [in] frame_size <tt>int</tt>: Number of samples per frame of input signal
-  * @param [out] compressed <tt>char *</tt>: The compressed data is written here. This may not alias pcm and must be at least maxCompressedBytes long.
-  * @param [in] maxCompressedBytes <tt>int</tt>: Maximum number of bytes to use for compressing the frame
-  *          (can change from one frame to another)
-  * @return Number of bytes written to "compressed".
-  *       If negative, an error has occurred (see error codes). It is IMPORTANT that
-  *       the length returned be somehow transmitted to the decoder. Otherwise, no
-  *       decoding is possible.
-  */
+ * @param [in] st <tt>OacCustomEncoder*</tt>: Encoder state
+ * @param [in] pcm <tt>float*</tt>: PCM audio in float format, with a normal range of +/-1.0.
+ *          Samples with a range beyond +/-1.0 are supported but will
+ *          be clipped by decoders using the integer API and should
+ *          only be used if it is known that the far end supports
+ *          extended dynamic range. There must be exactly
+ *          frame_size samples per channel.
+ * @param [in] frame_size <tt>int</tt>: Number of samples per frame of input signal
+ * @param [out] compressed <tt>char *</tt>: The compressed data is written here. This may not alias pcm and must be at least maxCompressedBytes long.
+ * @param [in] maxCompressedBytes <tt>int</tt>: Maximum number of bytes to use for compressing the frame
+ *          (can change from one frame to another)
+ * @return Number of bytes written to "compressed".
+ *       If negative, an error has occurred (see error codes). It is IMPORTANT that
+ *       the length returned be somehow transmitted to the decoder. Otherwise, no
+ *       decoding is possible.
+ */
 OAC_CUSTOM_EXPORT OAC_WARN_UNUSED_RESULT int oac_custom_encode_float(
     OacCustomEncoder *st,
     const float *pcm,
     int frame_size,
     unsigned char *compressed,
-    int maxCompressedBytes
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
+    int maxCompressedBytes) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
 /** Encodes a frame of audio.
-  * @param [in] st <tt>OacCustomEncoder*</tt>: Encoder state
-  * @param [in] pcm <tt>oac_int16*</tt>: PCM audio in signed 16-bit format (native endian).
-  *          There must be exactly frame_size samples per channel.
-  * @param [in] frame_size <tt>int</tt>: Number of samples per frame of input signal
-  * @param [out] compressed <tt>char *</tt>: The compressed data is written here. This may not alias pcm and must be at least maxCompressedBytes long.
-  * @param [in] maxCompressedBytes <tt>int</tt>: Maximum number of bytes to use for compressing the frame
-  *          (can change from one frame to another)
-  * @return Number of bytes written to "compressed".
-  *       If negative, an error has occurred (see error codes). It is IMPORTANT that
-  *       the length returned be somehow transmitted to the decoder. Otherwise, no
-  *       decoding is possible.
+ * @param [in] st <tt>OacCustomEncoder*</tt>: Encoder state
+ * @param [in] pcm <tt>oac_int16*</tt>: PCM audio in signed 16-bit format (native endian).
+ *          There must be exactly frame_size samples per channel.
+ * @param [in] frame_size <tt>int</tt>: Number of samples per frame of input signal
+ * @param [out] compressed <tt>char *</tt>: The compressed data is written here. This may not alias pcm and must be at least maxCompressedBytes long.
+ * @param [in] maxCompressedBytes <tt>int</tt>: Maximum number of bytes to use for compressing the frame
+ *          (can change from one frame to another)
+ * @return Number of bytes written to "compressed".
+ *       If negative, an error has occurred (see error codes). It is IMPORTANT that
+ *       the length returned be somehow transmitted to the decoder. Otherwise, no
+ *       decoding is possible.
  */
 OAC_CUSTOM_EXPORT OAC_WARN_UNUSED_RESULT int oac_custom_encode(
     OacCustomEncoder *st,
     const oac_int16 *pcm,
     int frame_size,
     unsigned char *compressed,
-    int maxCompressedBytes
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
+    int maxCompressedBytes) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
 /** Encodes a frame of audio.
-  * @param [in] st <tt>OacCustomEncoder*</tt>: Encoder state
-  * @param [in] pcm <tt>oac_int32*</tt>: PCM audio in signed 32-bit format (native endian) representing (or slightly exceeding) 24-bit values.
-  *          There must be exactly frame_size samples per channel.
-  * @param [in] frame_size <tt>int</tt>: Number of samples per frame of input signal
-  * @param [out] compressed <tt>char *</tt>: The compressed data is written here. This may not alias pcm and must be at least maxCompressedBytes long.
-  * @param [in] maxCompressedBytes <tt>int</tt>: Maximum number of bytes to use for compressing the frame
-  *          (can change from one frame to another)
-  * @return Number of bytes written to "compressed".
-  *       If negative, an error has occurred (see error codes). It is IMPORTANT that
-  *       the length returned be somehow transmitted to the decoder. Otherwise, no
-  *       decoding is possible.
+ * @param [in] st <tt>OacCustomEncoder*</tt>: Encoder state
+ * @param [in] pcm <tt>oac_int32*</tt>: PCM audio in signed 32-bit format (native endian) representing (or slightly exceeding) 24-bit values.
+ *          There must be exactly frame_size samples per channel.
+ * @param [in] frame_size <tt>int</tt>: Number of samples per frame of input signal
+ * @param [out] compressed <tt>char *</tt>: The compressed data is written here. This may not alias pcm and must be at least maxCompressedBytes long.
+ * @param [in] maxCompressedBytes <tt>int</tt>: Maximum number of bytes to use for compressing the frame
+ *          (can change from one frame to another)
+ * @return Number of bytes written to "compressed".
+ *       If negative, an error has occurred (see error codes). It is IMPORTANT that
+ *       the length returned be somehow transmitted to the decoder. Otherwise, no
+ *       decoding is possible.
  */
 OAC_CUSTOM_EXPORT OAC_WARN_UNUSED_RESULT int oac_custom_encode24(
     OacCustomEncoder *st,
     const oac_int32 *pcm,
     int frame_size,
     unsigned char *compressed,
-    int maxCompressedBytes
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
+    int maxCompressedBytes) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
 /** Perform a CTL function on an Oac custom encoder.
-  *
-  * Generally the request and subsequent arguments are generated
-  * by a convenience macro.
-  * @see oac_encoderctls
-  */
+ *
+ * Generally the request and subsequent arguments are generated
+ * by a convenience macro.
+ * @see oac_encoderctls
+ */
 OAC_CUSTOM_EXPORT int oac_custom_encoder_ctl(OacCustomEncoder * OAC_RESTRICT st, int request, ...) OAC_ARG_NONNULL(1);
 
 
@@ -264,112 +259,106 @@ OAC_CUSTOM_EXPORT int oac_custom_encoder_ctl(OacCustomEncoder * OAC_RESTRICT st,
 /* Decoder */
 
 /** Gets the size of an OacCustomDecoder structure.
-  * @param [in] mode <tt>OacCustomMode *</tt>: Mode configuration
-  * @param [in] channels <tt>int</tt>: Number of channels
-  * @returns size
-  */
+ * @param [in] mode <tt>OacCustomMode *</tt>: Mode configuration
+ * @param [in] channels <tt>int</tt>: Number of channels
+ * @returns size
+ */
 OAC_CUSTOM_EXPORT_STATIC OAC_WARN_UNUSED_RESULT int oac_custom_decoder_get_size(
     const OacCustomMode *mode,
-    int channels
-) OAC_ARG_NONNULL(1);
+    int channels) OAC_ARG_NONNULL(1);
 
 /** Initializes a previously allocated decoder state
-  * The memory pointed to by st must be the size returned by oac_custom_decoder_get_size.
-  * This is intended for applications which use their own allocator instead of malloc.
-  * @see oac_custom_decoder_create(),oac_custom_decoder_get_size()
-  * To reset a previously initialized state use the OAC_RESET_STATE CTL.
-  * @param [in] st <tt>OacCustomDecoder*</tt>: Decoder state
-  * @param [in] mode <tt>OacCustomMode *</tt>: Contains all the information about the characteristics of
-  *  the stream (must be the same characteristics as used for the
-  *  encoder)
-  * @param [in] channels <tt>int</tt>: Number of channels
-  * @return OAC_OK Success or @ref oac_errorcodes
-  */
+ * The memory pointed to by st must be the size returned by oac_custom_decoder_get_size.
+ * This is intended for applications which use their own allocator instead of malloc.
+ * @see oac_custom_decoder_create(),oac_custom_decoder_get_size()
+ * To reset a previously initialized state use the OAC_RESET_STATE CTL.
+ * @param [in] st <tt>OacCustomDecoder*</tt>: Decoder state
+ * @param [in] mode <tt>OacCustomMode *</tt>: Contains all the information about the characteristics of
+ *  the stream (must be the same characteristics as used for the
+ *  encoder)
+ * @param [in] channels <tt>int</tt>: Number of channels
+ * @return OAC_OK Success or @ref oac_errorcodes
+ */
 OAC_CUSTOM_EXPORT_STATIC int oac_custom_decoder_init(
     OacCustomDecoder *st,
     const OacCustomMode *mode,
-    int channels
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2);
+    int channels) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2);
 
 #endif
 
 
 /** Creates a new decoder state. Each stream needs its own decoder state (can't
-  * be shared across simultaneous streams).
-  * @param [in] mode <tt>OacCustomMode</tt>: Contains all the information about the characteristics of the
-  *          stream (must be the same characteristics as used for the encoder)
-  * @param [in] channels <tt>int</tt>: Number of channels
-  * @param [out] error <tt>int*</tt>: Returns an error code
-  * @return Newly created decoder state.
-  */
+ * be shared across simultaneous streams).
+ * @param [in] mode <tt>OacCustomMode</tt>: Contains all the information about the characteristics of the
+ *          stream (must be the same characteristics as used for the encoder)
+ * @param [in] channels <tt>int</tt>: Number of channels
+ * @param [out] error <tt>int*</tt>: Returns an error code
+ * @return Newly created decoder state.
+ */
 OAC_CUSTOM_EXPORT OAC_WARN_UNUSED_RESULT OacCustomDecoder *oac_custom_decoder_create(
     const OacCustomMode *mode,
     int channels,
-    int *error
-) OAC_ARG_NONNULL(1);
+    int *error) OAC_ARG_NONNULL(1);
 
 /** Destroys a decoder state.
-  * @param[in] st <tt>OacCustomDecoder*</tt>: State to be freed.
-  */
+ * @param[in] st <tt>OacCustomDecoder*</tt>: State to be freed.
+ */
 OAC_CUSTOM_EXPORT void oac_custom_decoder_destroy(OacCustomDecoder *st);
 
 /** Decode an oac custom frame with floating point output
-  * @param [in] st <tt>OacCustomDecoder*</tt>: Decoder state
-  * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
-  * @param [in] len <tt>int</tt>: Number of bytes in payload
-  * @param [out] pcm <tt>float*</tt>: Output signal (interleaved if 2 channels). length
-  *  is frame_size*channels*sizeof(float)
-  * @param [in] frame_size Number of samples per channel of available space in *pcm.
-  * @returns Number of decoded samples or @ref oac_errorcodes
-  */
+ * @param [in] st <tt>OacCustomDecoder*</tt>: Decoder state
+ * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
+ * @param [in] len <tt>int</tt>: Number of bytes in payload
+ * @param [out] pcm <tt>float*</tt>: Output signal (interleaved if 2 channels). length
+ *  is frame_size*channels*sizeof(float)
+ * @param [in] frame_size Number of samples per channel of available space in *pcm.
+ * @returns Number of decoded samples or @ref oac_errorcodes
+ */
 OAC_CUSTOM_EXPORT OAC_WARN_UNUSED_RESULT int oac_custom_decode_float(
     OacCustomDecoder *st,
     const unsigned char *data,
     int len,
     float *pcm,
-    int frame_size
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
+    int frame_size) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
 /** Decode an oac custom frame
-  * @param [in] st <tt>OacCustomDecoder*</tt>: Decoder state
-  * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
-  * @param [in] len <tt>int</tt>: Number of bytes in payload
-  * @param [out] pcm <tt>oac_int16*</tt>: Output signal (interleaved if 2 channels). length
-  *  is frame_size*channels*sizeof(oac_int16)
-  * @param [in] frame_size Number of samples per channel of available space in *pcm.
-  * @returns Number of decoded samples or @ref oac_errorcodes
-  */
+ * @param [in] st <tt>OacCustomDecoder*</tt>: Decoder state
+ * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
+ * @param [in] len <tt>int</tt>: Number of bytes in payload
+ * @param [out] pcm <tt>oac_int16*</tt>: Output signal (interleaved if 2 channels). length
+ *  is frame_size*channels*sizeof(oac_int16)
+ * @param [in] frame_size Number of samples per channel of available space in *pcm.
+ * @returns Number of decoded samples or @ref oac_errorcodes
+ */
 OAC_CUSTOM_EXPORT OAC_WARN_UNUSED_RESULT int oac_custom_decode(
     OacCustomDecoder *st,
     const unsigned char *data,
     int len,
     oac_int16 *pcm,
-    int frame_size
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
+    int frame_size) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
 /** Decode an oac custom frame
-  * @param [in] st <tt>OacCustomDecoder*</tt>: Decoder state
-  * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
-  * @param [in] len <tt>int</tt>: Number of bytes in payload
-  * @param [out] pcm <tt>oac_int32*</tt>: Output signal (interleaved if 2 channels) representing (or slightly exceeding) 24-bit values. length
-  *  is frame_size*channels*sizeof(oac_int32)
-  * @param [in] frame_size Number of samples per channel of available space in *pcm.
-  * @returns Number of decoded samples or @ref oac_errorcodes
-  */
+ * @param [in] st <tt>OacCustomDecoder*</tt>: Decoder state
+ * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
+ * @param [in] len <tt>int</tt>: Number of bytes in payload
+ * @param [out] pcm <tt>oac_int32*</tt>: Output signal (interleaved if 2 channels) representing (or slightly exceeding) 24-bit values. length
+ *  is frame_size*channels*sizeof(oac_int32)
+ * @param [in] frame_size Number of samples per channel of available space in *pcm.
+ * @returns Number of decoded samples or @ref oac_errorcodes
+ */
 OAC_CUSTOM_EXPORT OAC_WARN_UNUSED_RESULT int oac_custom_decode24(
     OacCustomDecoder *st,
     const unsigned char *data,
     int len,
     oac_int32 *pcm,
-    int frame_size
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
+    int frame_size) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
 /** Perform a CTL function on an Oac custom decoder.
-  *
-  * Generally the request and subsequent arguments are generated
-  * by a convenience macro.
-  * @see oac_genericctls
-  */
+ *
+ * Generally the request and subsequent arguments are generated
+ * by a convenience macro.
+ * @see oac_genericctls
+ */
 OAC_CUSTOM_EXPORT int oac_custom_decoder_ctl(OacCustomDecoder * OAC_RESTRICT st, int request, ...) OAC_ARG_NONNULL(1);
 
 /**@}*/
diff --git a/include/oac_defines.h b/include/oac_defines.h
index 25d20bf41..fc521aa5d 100644
--- a/include/oac_defines.h
+++ b/include/oac_defines.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 /**
  * @file oac_defines.h
@@ -77,17 +77,17 @@ extern "C" {
 # endif
 #endif
 
-# if !defined(OAC_GNUC_PREREQ)
-#  if defined(__GNUC__)&&defined(__GNUC_MINOR__)
-#   define OAC_GNUC_PREREQ(_maj,_min) \
- ((__GNUC__<<16)+__GNUC_MINOR__>=((_maj)<<16)+(_min))
-#  else
-#   define OAC_GNUC_PREREQ(_maj,_min) 0
-#  endif
+#if !defined(OAC_GNUC_PREREQ)
+# if defined(__GNUC__) && defined(__GNUC_MINOR__)
+#  define OAC_GNUC_PREREQ(_maj, _min) \
+        ((__GNUC__<<16) + __GNUC_MINOR__ >= ((_maj)<<16) + (_min))
+# else
+#  define OAC_GNUC_PREREQ(_maj, _min) 0
 # endif
+#endif
 
-#if (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) )
-# if OAC_GNUC_PREREQ(3,0)
+#if (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L))
+# if OAC_GNUC_PREREQ(3, 0)
 #  define OAC_RESTRICT __restrict__
 # elif (defined(_MSC_VER) && _MSC_VER >= 1400)
 #  define OAC_RESTRICT __restrict
@@ -98,8 +98,8 @@ extern "C" {
 # define OAC_RESTRICT restrict
 #endif
 
-#if (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) )
-# if OAC_GNUC_PREREQ(2,7)
+#if (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L))
+# if OAC_GNUC_PREREQ(2, 7)
 #  define OAC_INLINE __inline__
 # elif (defined(_MSC_VER))
 #  define OAC_INLINE __inline
@@ -111,8 +111,8 @@ extern "C" {
 #endif
 
 /**Warning attributes for oac functions
-  * NONNULL is not used in OAC_BUILD to avoid the compiler optimizing out
-  * some paranoid null checks. */
+ * NONNULL is not used in OAC_BUILD to avoid the compiler optimizing out
+ * some paranoid null checks. */
 #if defined(__GNUC__) && OAC_GNUC_PREREQ(3, 4)
 # define OAC_WARN_UNUSED_RESULT __attribute__ ((__warn_unused_result__))
 #else
@@ -125,8 +125,8 @@ extern "C" {
 #endif
 
 /** These are the actual Encoder CTL ID numbers.
-  * They should not be used directly by applications.
-  * In general, SETs should be even and GETs should be odd.*/
+ * They should not be used directly by applications.
+ * In general, SETs should be even and GETs should be odd.*/
 #define OAC_SET_APPLICATION_REQUEST         4000
 #define OAC_GET_APPLICATION_REQUEST         4001
 #define OAC_SET_BITRATE_REQUEST             4002
@@ -189,24 +189,24 @@ extern "C" {
 #ifdef DISABLE_PTR_CHECK
 /* Disable checks to prevent ubsan from complaining about NULL checks
    in test_oac_api. */
-#define oac_check_int_ptr(ptr) (ptr)
-#define oac_check_uint_ptr(ptr) (ptr)
-#define oac_check_uint8_ptr(ptr) (ptr)
-#define oac_check_val16_ptr(ptr) (ptr)
-#define oac_check_void_ptr(ptr) (ptr)
+# define oac_check_int_ptr(ptr) (ptr)
+# define oac_check_uint_ptr(ptr) (ptr)
+# define oac_check_uint8_ptr(ptr) (ptr)
+# define oac_check_val16_ptr(ptr) (ptr)
+# define oac_check_void_ptr(ptr) (ptr)
 #else
-#define oac_check_int_ptr(ptr) ((ptr) + ((ptr) - (oac_int32*)(ptr)))
-#define oac_check_uint_ptr(ptr) ((ptr) + ((ptr) - (oac_uint32*)(ptr)))
-#define oac_check_uint8_ptr(ptr) ((ptr) + ((ptr) - (oac_uint8*)(ptr)))
-#define oac_check_val16_ptr(ptr) ((ptr) + ((ptr) - (oac_val16*)(ptr)))
-#define oac_check_void_ptr(x) ((void)((void *)0 == (x)), (x))
+# define oac_check_int_ptr(ptr) ((ptr) + ((ptr) - (oac_int32*)(ptr)))
+# define oac_check_uint_ptr(ptr) ((ptr) + ((ptr) - (oac_uint32*)(ptr)))
+# define oac_check_uint8_ptr(ptr) ((ptr) + ((ptr) - (oac_uint8*)(ptr)))
+# define oac_check_val16_ptr(ptr) ((ptr) + ((ptr) - (oac_val16*)(ptr)))
+# define oac_check_void_ptr(x) ((void)((void *)0 == (x)), (x))
 #endif
 /** @endcond */
 
 /** @defgroup oac_ctlvalues Pre-defined values for CTL interface
-  * @see oac_genericctls, oac_encoderctls
-  * @{
-  */
+ * @see oac_genericctls, oac_encoderctls
+ * @{
+ */
 /* Values for the various encoder CTLs */
 #define OAC_AUTO                           -1000 /**<Auto/default setting @hideinitializer*/
 #define OAC_BITRATE_MAX                       -1 /**<Maximum bitrate @hideinitializer*/
@@ -248,608 +248,608 @@ extern "C" {
 
 
 /** @defgroup oac_encoderctls Encoder related CTLs
-  *
-  * These are convenience macros for use with the \c oac_encode_ctl
-  * interface. They are used to generate the appropriate series of
-  * arguments for that call, passing the correct type, size and so
-  * on as expected for each particular request.
-  *
-  * Some usage examples:
-  *
-  * @code
-  * int ret;
-  * ret = oac_encoder_ctl(enc_ctx, OAC_SET_BANDWIDTH(OAC_AUTO));
-  * if (ret != OAC_OK) return ret;
-  *
-  * oac_int32 rate;
-  * oac_encoder_ctl(enc_ctx, OAC_GET_BANDWIDTH(&rate));
-  *
-  * oac_encoder_ctl(enc_ctx, OAC_RESET_STATE);
-  * @endcode
-  *
-  * @see oac_genericctls, oac_encoder
-  * @{
-  */
+ *
+ * These are convenience macros for use with the \c oac_encode_ctl
+ * interface. They are used to generate the appropriate series of
+ * arguments for that call, passing the correct type, size and so
+ * on as expected for each particular request.
+ *
+ * Some usage examples:
+ *
+ * @code
+ * int ret;
+ * ret = oac_encoder_ctl(enc_ctx, OAC_SET_BANDWIDTH(OAC_AUTO));
+ * if (ret != OAC_OK) return ret;
+ *
+ * oac_int32 rate;
+ * oac_encoder_ctl(enc_ctx, OAC_GET_BANDWIDTH(&rate));
+ *
+ * oac_encoder_ctl(enc_ctx, OAC_RESET_STATE);
+ * @endcode
+ *
+ * @see oac_genericctls, oac_encoder
+ * @{
+ */
 
 /** Configures the encoder's computational complexity.
-  * The supported range is 0-10 inclusive with 10 representing the highest complexity.
-  * @see OAC_GET_COMPLEXITY
-  * @param[in] x <tt>oac_int32</tt>: Allowed values: 0-10, inclusive.
-  *
-  * @hideinitializer */
+ * The supported range is 0-10 inclusive with 10 representing the highest complexity.
+ * @see OAC_GET_COMPLEXITY
+ * @param[in] x <tt>oac_int32</tt>: Allowed values: 0-10, inclusive.
+ *
+ * @hideinitializer */
 #define OAC_SET_COMPLEXITY(x) OAC_SET_COMPLEXITY_REQUEST, oac_check_int(x)
 /** Gets the encoder's complexity configuration.
-  * @see OAC_SET_COMPLEXITY
-  * @param[out] x <tt>oac_int32 *</tt>: Returns a value in the range 0-10,
-  *                                      inclusive.
-  * @hideinitializer */
+ * @see OAC_SET_COMPLEXITY
+ * @param[out] x <tt>oac_int32 *</tt>: Returns a value in the range 0-10,
+ *                                      inclusive.
+ * @hideinitializer */
 #define OAC_GET_COMPLEXITY(x) OAC_GET_COMPLEXITY_REQUEST, oac_check_int_ptr(x)
 
 /** Configures the bitrate in the encoder.
-  * Rates from 500 to 512000 bits per second are meaningful, as well as the
-  * special values #OAC_AUTO and #OAC_BITRATE_MAX.
-  * The value #OAC_BITRATE_MAX can be used to cause the codec to use as much
-  * rate as it can, which is useful for controlling the rate by adjusting the
-  * output buffer size.
-  * @see OAC_GET_BITRATE
-  * @param[in] x <tt>oac_int32</tt>: Bitrate in bits per second. The default
-  *                                   is determined based on the number of
-  *                                   channels and the input sampling rate.
-  * @hideinitializer */
+ * Rates from 500 to 512000 bits per second are meaningful, as well as the
+ * special values #OAC_AUTO and #OAC_BITRATE_MAX.
+ * The value #OAC_BITRATE_MAX can be used to cause the codec to use as much
+ * rate as it can, which is useful for controlling the rate by adjusting the
+ * output buffer size.
+ * @see OAC_GET_BITRATE
+ * @param[in] x <tt>oac_int32</tt>: Bitrate in bits per second. The default
+ *                                   is determined based on the number of
+ *                                   channels and the input sampling rate.
+ * @hideinitializer */
 #define OAC_SET_BITRATE(x) OAC_SET_BITRATE_REQUEST, oac_check_int(x)
 /** Gets the encoder's bitrate configuration.
-  * @see OAC_SET_BITRATE
-  * @param[out] x <tt>oac_int32 *</tt>: Returns the bitrate in bits per second.
-  *                                      The default is determined based on the
-  *                                      number of channels and the input
-  *                                      sampling rate.
-  * @hideinitializer */
+ * @see OAC_SET_BITRATE
+ * @param[out] x <tt>oac_int32 *</tt>: Returns the bitrate in bits per second.
+ *                                      The default is determined based on the
+ *                                      number of channels and the input
+ *                                      sampling rate.
+ * @hideinitializer */
 #define OAC_GET_BITRATE(x) OAC_GET_BITRATE_REQUEST, oac_check_int_ptr(x)
 
 /** Enables or disables variable bitrate (VBR) in the encoder.
-  * The configured bitrate may not be met exactly because frames must
-  * be an integer number of bytes in length.
-  * @see OAC_GET_VBR
-  * @see OAC_SET_VBR_CONSTRAINT
-  * @param[in] x <tt>oac_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>0</dt><dd>Hard CBR. For LPC/hybrid modes at very low bit-rate, this can
-  *               cause noticeable quality degradation.</dd>
-  * <dt>1</dt><dd>VBR (default). The exact type of VBR is controlled by
-  *               #OAC_SET_VBR_CONSTRAINT.</dd>
-  * </dl>
-  * @hideinitializer */
+ * The configured bitrate may not be met exactly because frames must
+ * be an integer number of bytes in length.
+ * @see OAC_GET_VBR
+ * @see OAC_SET_VBR_CONSTRAINT
+ * @param[in] x <tt>oac_int32</tt>: Allowed values:
+ * <dl>
+ * <dt>0</dt><dd>Hard CBR. For LPC/hybrid modes at very low bit-rate, this can
+ *               cause noticeable quality degradation.</dd>
+ * <dt>1</dt><dd>VBR (default). The exact type of VBR is controlled by
+ *               #OAC_SET_VBR_CONSTRAINT.</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_SET_VBR(x) OAC_SET_VBR_REQUEST, oac_check_int(x)
 /** Determine if variable bitrate (VBR) is enabled in the encoder.
-  * @see OAC_SET_VBR
-  * @see OAC_GET_VBR_CONSTRAINT
-  * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>0</dt><dd>Hard CBR.</dd>
-  * <dt>1</dt><dd>VBR (default). The exact type of VBR may be retrieved via
-  *               #OAC_GET_VBR_CONSTRAINT.</dd>
-  * </dl>
-  * @hideinitializer */
+ * @see OAC_SET_VBR
+ * @see OAC_GET_VBR_CONSTRAINT
+ * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
+ * <dl>
+ * <dt>0</dt><dd>Hard CBR.</dd>
+ * <dt>1</dt><dd>VBR (default). The exact type of VBR may be retrieved via
+ *               #OAC_GET_VBR_CONSTRAINT.</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_GET_VBR(x) OAC_GET_VBR_REQUEST, oac_check_int_ptr(x)
 
 /** Enables or disables constrained VBR in the encoder.
-  * This setting is ignored when the encoder is in CBR mode.
-  * @warning Only the MDCT mode of Oac currently heeds the constraint.
-  *  Speech mode ignores it completely, hybrid mode may fail to obey it
-  *  if the LPC layer uses more bitrate than the constraint would have
-  *  permitted.
-  * @see OAC_GET_VBR_CONSTRAINT
-  * @see OAC_SET_VBR
-  * @param[in] x <tt>oac_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>0</dt><dd>Unconstrained VBR.</dd>
-  * <dt>1</dt><dd>Constrained VBR (default). This creates a maximum of one
-  *               frame of buffering delay assuming a transport with a
-  *               serialization speed of the nominal bitrate.</dd>
-  * </dl>
-  * @hideinitializer */
+ * This setting is ignored when the encoder is in CBR mode.
+ * @warning Only the MDCT mode of Oac currently heeds the constraint.
+ *  Speech mode ignores it completely, hybrid mode may fail to obey it
+ *  if the LPC layer uses more bitrate than the constraint would have
+ *  permitted.
+ * @see OAC_GET_VBR_CONSTRAINT
+ * @see OAC_SET_VBR
+ * @param[in] x <tt>oac_int32</tt>: Allowed values:
+ * <dl>
+ * <dt>0</dt><dd>Unconstrained VBR.</dd>
+ * <dt>1</dt><dd>Constrained VBR (default). This creates a maximum of one
+ *               frame of buffering delay assuming a transport with a
+ *               serialization speed of the nominal bitrate.</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_SET_VBR_CONSTRAINT(x) OAC_SET_VBR_CONSTRAINT_REQUEST, oac_check_int(x)
 /** Determine if constrained VBR is enabled in the encoder.
-  * @see OAC_SET_VBR_CONSTRAINT
-  * @see OAC_GET_VBR
-  * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>0</dt><dd>Unconstrained VBR.</dd>
-  * <dt>1</dt><dd>Constrained VBR (default).</dd>
-  * </dl>
-  * @hideinitializer */
+ * @see OAC_SET_VBR_CONSTRAINT
+ * @see OAC_GET_VBR
+ * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
+ * <dl>
+ * <dt>0</dt><dd>Unconstrained VBR.</dd>
+ * <dt>1</dt><dd>Constrained VBR (default).</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_GET_VBR_CONSTRAINT(x) OAC_GET_VBR_CONSTRAINT_REQUEST, oac_check_int_ptr(x)
 
 /** Configures mono/stereo forcing in the encoder.
-  * This can force the encoder to produce packets encoded as either mono or
-  * stereo, regardless of the format of the input audio. This is useful when
-  * the caller knows that the input signal is currently a mono source embedded
-  * in a stereo stream.
-  * @see OAC_GET_FORCE_CHANNELS
-  * @param[in] x <tt>oac_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>#OAC_AUTO</dt><dd>Not forced (default)</dd>
-  * <dt>1</dt>         <dd>Forced mono</dd>
-  * <dt>2</dt>         <dd>Forced stereo</dd>
-  * </dl>
-  * @hideinitializer */
+ * This can force the encoder to produce packets encoded as either mono or
+ * stereo, regardless of the format of the input audio. This is useful when
+ * the caller knows that the input signal is currently a mono source embedded
+ * in a stereo stream.
+ * @see OAC_GET_FORCE_CHANNELS
+ * @param[in] x <tt>oac_int32</tt>: Allowed values:
+ * <dl>
+ * <dt>#OAC_AUTO</dt><dd>Not forced (default)</dd>
+ * <dt>1</dt>         <dd>Forced mono</dd>
+ * <dt>2</dt>         <dd>Forced stereo</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_SET_FORCE_CHANNELS(x) OAC_SET_FORCE_CHANNELS_REQUEST, oac_check_int(x)
 /** Gets the encoder's forced channel configuration.
-  * @see OAC_SET_FORCE_CHANNELS
-  * @param[out] x <tt>oac_int32 *</tt>:
-  * <dl>
-  * <dt>#OAC_AUTO</dt><dd>Not forced (default)</dd>
-  * <dt>1</dt>         <dd>Forced mono</dd>
-  * <dt>2</dt>         <dd>Forced stereo</dd>
-  * </dl>
-  * @hideinitializer */
+ * @see OAC_SET_FORCE_CHANNELS
+ * @param[out] x <tt>oac_int32 *</tt>:
+ * <dl>
+ * <dt>#OAC_AUTO</dt><dd>Not forced (default)</dd>
+ * <dt>1</dt>         <dd>Forced mono</dd>
+ * <dt>2</dt>         <dd>Forced stereo</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_GET_FORCE_CHANNELS(x) OAC_GET_FORCE_CHANNELS_REQUEST, oac_check_int_ptr(x)
 
 /** Configures the maximum bandpass that the encoder will select automatically.
-  * Applications should normally use this instead of #OAC_SET_BANDWIDTH
-  * (leaving that set to the default, #OAC_AUTO). This allows the
-  * application to set an upper bound based on the type of input it is
-  * providing, but still gives the encoder the freedom to reduce the bandpass
-  * when the bitrate becomes too low, for better overall quality.
-  * @see OAC_GET_MAX_BANDWIDTH
-  * @param[in] x <tt>oac_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>OAC_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
-  * <dt>OAC_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
-  * <dt>OAC_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
-  * <dt>OAC_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
-  * <dt>OAC_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband (default)</dd>
-  * </dl>
-  * @hideinitializer */
+ * Applications should normally use this instead of #OAC_SET_BANDWIDTH
+ * (leaving that set to the default, #OAC_AUTO). This allows the
+ * application to set an upper bound based on the type of input it is
+ * providing, but still gives the encoder the freedom to reduce the bandpass
+ * when the bitrate becomes too low, for better overall quality.
+ * @see OAC_GET_MAX_BANDWIDTH
+ * @param[in] x <tt>oac_int32</tt>: Allowed values:
+ * <dl>
+ * <dt>OAC_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
+ * <dt>OAC_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
+ * <dt>OAC_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
+ * <dt>OAC_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
+ * <dt>OAC_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband (default)</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_SET_MAX_BANDWIDTH(x) OAC_SET_MAX_BANDWIDTH_REQUEST, oac_check_int(x)
 
 /** Gets the encoder's configured maximum allowed bandpass.
-  * @see OAC_SET_MAX_BANDWIDTH
-  * @param[out] x <tt>oac_int32 *</tt>: Allowed values:
-  * <dl>
-  * <dt>#OAC_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
-  * <dt>#OAC_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
-  * <dt>#OAC_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
-  * <dt>#OAC_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
-  * <dt>#OAC_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband (default)</dd>
-  * </dl>
-  * @hideinitializer */
+ * @see OAC_SET_MAX_BANDWIDTH
+ * @param[out] x <tt>oac_int32 *</tt>: Allowed values:
+ * <dl>
+ * <dt>#OAC_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
+ * <dt>#OAC_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
+ * <dt>#OAC_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
+ * <dt>#OAC_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
+ * <dt>#OAC_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband (default)</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_GET_MAX_BANDWIDTH(x) OAC_GET_MAX_BANDWIDTH_REQUEST, oac_check_int_ptr(x)
 
 /** Sets the encoder's bandpass to a specific value.
-  * This prevents the encoder from automatically selecting the bandpass based
-  * on the available bitrate. If an application knows the bandpass of the input
-  * audio it is providing, it should normally use #OAC_SET_MAX_BANDWIDTH
-  * instead, which still gives the encoder the freedom to reduce the bandpass
-  * when the bitrate becomes too low, for better overall quality.
-  * @see OAC_GET_BANDWIDTH
-  * @param[in] x <tt>oac_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>#OAC_AUTO</dt>                    <dd>(default)</dd>
-  * <dt>#OAC_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
-  * <dt>#OAC_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
-  * <dt>#OAC_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
-  * <dt>#OAC_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
-  * <dt>#OAC_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband</dd>
-  * </dl>
-  * @hideinitializer */
+ * This prevents the encoder from automatically selecting the bandpass based
+ * on the available bitrate. If an application knows the bandpass of the input
+ * audio it is providing, it should normally use #OAC_SET_MAX_BANDWIDTH
+ * instead, which still gives the encoder the freedom to reduce the bandpass
+ * when the bitrate becomes too low, for better overall quality.
+ * @see OAC_GET_BANDWIDTH
+ * @param[in] x <tt>oac_int32</tt>: Allowed values:
+ * <dl>
+ * <dt>#OAC_AUTO</dt>                    <dd>(default)</dd>
+ * <dt>#OAC_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
+ * <dt>#OAC_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
+ * <dt>#OAC_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
+ * <dt>#OAC_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
+ * <dt>#OAC_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_SET_BANDWIDTH(x) OAC_SET_BANDWIDTH_REQUEST, oac_check_int(x)
 
 /** Configures the type of signal being encoded.
-  * This is a hint which helps the encoder's mode selection.
-  * @see OAC_GET_SIGNAL
-  * @param[in] x <tt>oac_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>#OAC_AUTO</dt>        <dd>(default)</dd>
-  * <dt>#OAC_SIGNAL_VOICE</dt><dd>Bias thresholds towards choosing LPC or Hybrid modes.</dd>
-  * <dt>#OAC_SIGNAL_MUSIC</dt><dd>Bias thresholds towards choosing MDCT modes.</dd>
-  * </dl>
-  * @hideinitializer */
+ * This is a hint which helps the encoder's mode selection.
+ * @see OAC_GET_SIGNAL
+ * @param[in] x <tt>oac_int32</tt>: Allowed values:
+ * <dl>
+ * <dt>#OAC_AUTO</dt>        <dd>(default)</dd>
+ * <dt>#OAC_SIGNAL_VOICE</dt><dd>Bias thresholds towards choosing LPC or Hybrid modes.</dd>
+ * <dt>#OAC_SIGNAL_MUSIC</dt><dd>Bias thresholds towards choosing MDCT modes.</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_SET_SIGNAL(x) OAC_SET_SIGNAL_REQUEST, oac_check_int(x)
 /** Gets the encoder's configured signal type.
-  * @see OAC_SET_SIGNAL
-  * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>#OAC_AUTO</dt>        <dd>(default)</dd>
-  * <dt>#OAC_SIGNAL_VOICE</dt><dd>Bias thresholds towards choosing LPC or Hybrid modes.</dd>
-  * <dt>#OAC_SIGNAL_MUSIC</dt><dd>Bias thresholds towards choosing MDCT modes.</dd>
-  * </dl>
-  * @hideinitializer */
+ * @see OAC_SET_SIGNAL
+ * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
+ * <dl>
+ * <dt>#OAC_AUTO</dt>        <dd>(default)</dd>
+ * <dt>#OAC_SIGNAL_VOICE</dt><dd>Bias thresholds towards choosing LPC or Hybrid modes.</dd>
+ * <dt>#OAC_SIGNAL_MUSIC</dt><dd>Bias thresholds towards choosing MDCT modes.</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_GET_SIGNAL(x) OAC_GET_SIGNAL_REQUEST, oac_check_int_ptr(x)
 
 
 /** Configures the encoder's intended application.
-  * The initial value is a mandatory argument to the encoder_create function.
-  * @see OAC_GET_APPLICATION
-  * @param[in] x <tt>oac_int32</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>#OAC_APPLICATION_VOIP</dt>
-  * <dd>Process signal for improved speech intelligibility.</dd>
-  * <dt>#OAC_APPLICATION_AUDIO</dt>
-  * <dd>Favor faithfulness to the original input.</dd>
-  * <dt>#OAC_APPLICATION_RESTRICTED_LOWDELAY</dt>
-  * <dd>Configure the minimum possible coding delay by disabling certain modes
-  * of operation.</dd>
-  * </dl>
-  * @hideinitializer */
+ * The initial value is a mandatory argument to the encoder_create function.
+ * @see OAC_GET_APPLICATION
+ * @param[in] x <tt>oac_int32</tt>: Returns one of the following values:
+ * <dl>
+ * <dt>#OAC_APPLICATION_VOIP</dt>
+ * <dd>Process signal for improved speech intelligibility.</dd>
+ * <dt>#OAC_APPLICATION_AUDIO</dt>
+ * <dd>Favor faithfulness to the original input.</dd>
+ * <dt>#OAC_APPLICATION_RESTRICTED_LOWDELAY</dt>
+ * <dd>Configure the minimum possible coding delay by disabling certain modes
+ * of operation.</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_SET_APPLICATION(x) OAC_SET_APPLICATION_REQUEST, oac_check_int(x)
 /** Gets the encoder's configured application.
-  * @see OAC_SET_APPLICATION
-  * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>#OAC_APPLICATION_VOIP</dt>
-  * <dd>Process signal for improved speech intelligibility.</dd>
-  * <dt>#OAC_APPLICATION_AUDIO</dt>
-  * <dd>Favor faithfulness to the original input.</dd>
-  * <dt>#OAC_APPLICATION_RESTRICTED_LOWDELAY</dt>
-  * <dd>Configure the minimum possible coding delay by disabling certain modes
-  * of operation.</dd>
-  * </dl>
-  * @hideinitializer */
+ * @see OAC_SET_APPLICATION
+ * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
+ * <dl>
+ * <dt>#OAC_APPLICATION_VOIP</dt>
+ * <dd>Process signal for improved speech intelligibility.</dd>
+ * <dt>#OAC_APPLICATION_AUDIO</dt>
+ * <dd>Favor faithfulness to the original input.</dd>
+ * <dt>#OAC_APPLICATION_RESTRICTED_LOWDELAY</dt>
+ * <dd>Configure the minimum possible coding delay by disabling certain modes
+ * of operation.</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_GET_APPLICATION(x) OAC_GET_APPLICATION_REQUEST, oac_check_int_ptr(x)
 
 /** Gets the total samples of delay added by the entire codec.
-  * This can be queried by the encoder and then the provided number of samples can be
-  * skipped on from the start of the decoder's output to provide time aligned input
-  * and output. From the perspective of a decoding application the real data begins this many
-  * samples late.
-  *
-  * The decoder contribution to this delay is identical for all decoders, but the
-  * encoder portion of the delay may vary from implementation to implementation,
-  * version to version, or even depend on the encoder's initial configuration.
-  * Applications needing delay compensation should call this CTL rather than
-  * hard-coding a value.
-  * @param[out] x <tt>oac_int32 *</tt>:   Number of lookahead samples
-  * @hideinitializer */
+ * This can be queried by the encoder and then the provided number of samples can be
+ * skipped on from the start of the decoder's output to provide time aligned input
+ * and output. From the perspective of a decoding application the real data begins this many
+ * samples late.
+ *
+ * The decoder contribution to this delay is identical for all decoders, but the
+ * encoder portion of the delay may vary from implementation to implementation,
+ * version to version, or even depend on the encoder's initial configuration.
+ * Applications needing delay compensation should call this CTL rather than
+ * hard-coding a value.
+ * @param[out] x <tt>oac_int32 *</tt>:   Number of lookahead samples
+ * @hideinitializer */
 #define OAC_GET_LOOKAHEAD(x) OAC_GET_LOOKAHEAD_REQUEST, oac_check_int_ptr(x)
 
 /** Configures the encoder's use of inband forward error correction (FEC).
-  * @note This is only applicable to the LPC layer
-  * @see OAC_GET_INBAND_FEC
-  * @param[in] x <tt>oac_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>0</dt><dd>Disable inband FEC (default).</dd>
-  * <dt>1</dt><dd>Inband FEC enabled. If the packet loss rate is sufficiently high, Oac will automatically switch to SILK even at high rates to enable use of that FEC.</dd>
-  * <dt>2</dt><dd>Inband FEC enabled, but does not necessarily switch to SILK if we have music.</dd>
-  * </dl>
-  * @hideinitializer */
+ * @note This is only applicable to the LPC layer
+ * @see OAC_GET_INBAND_FEC
+ * @param[in] x <tt>oac_int32</tt>: Allowed values:
+ * <dl>
+ * <dt>0</dt><dd>Disable inband FEC (default).</dd>
+ * <dt>1</dt><dd>Inband FEC enabled. If the packet loss rate is sufficiently high, Oac will automatically switch to SILK even at high rates to enable use of that FEC.</dd>
+ * <dt>2</dt><dd>Inband FEC enabled, but does not necessarily switch to SILK if we have music.</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_SET_INBAND_FEC(x) OAC_SET_INBAND_FEC_REQUEST, oac_check_int(x)
 /** Gets encoder's configured use of inband forward error correction.
-  * @see OAC_SET_INBAND_FEC
-  * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>0</dt><dd>Inband FEC disabled (default).</dd>
-  * <dt>1</dt><dd>Inband FEC enabled. If the packet loss rate is sufficiently high, Oac will automatically switch to SILK even at high rates to enable use of that FEC.</dd>
-  * <dt>2</dt><dd>Inband FEC enabled, but does not necessarily switch to SILK if we have music.</dd>
-  * </dl>
-  * @hideinitializer */
+ * @see OAC_SET_INBAND_FEC
+ * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
+ * <dl>
+ * <dt>0</dt><dd>Inband FEC disabled (default).</dd>
+ * <dt>1</dt><dd>Inband FEC enabled. If the packet loss rate is sufficiently high, Oac will automatically switch to SILK even at high rates to enable use of that FEC.</dd>
+ * <dt>2</dt><dd>Inband FEC enabled, but does not necessarily switch to SILK if we have music.</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_GET_INBAND_FEC(x) OAC_GET_INBAND_FEC_REQUEST, oac_check_int_ptr(x)
 
 /** Configures the encoder's expected packet loss percentage.
-  * Higher values trigger progressively more loss resistant behavior in the encoder
-  * at the expense of quality at a given bitrate in the absence of packet loss, but
-  * greater quality under loss.
-  * @see OAC_GET_PACKET_LOSS_PERC
-  * @param[in] x <tt>oac_int32</tt>:   Loss percentage in the range 0-100, inclusive (default: 0).
-  * @hideinitializer */
+ * Higher values trigger progressively more loss resistant behavior in the encoder
+ * at the expense of quality at a given bitrate in the absence of packet loss, but
+ * greater quality under loss.
+ * @see OAC_GET_PACKET_LOSS_PERC
+ * @param[in] x <tt>oac_int32</tt>:   Loss percentage in the range 0-100, inclusive (default: 0).
+ * @hideinitializer */
 #define OAC_SET_PACKET_LOSS_PERC(x) OAC_SET_PACKET_LOSS_PERC_REQUEST, oac_check_int(x)
 /** Gets the encoder's configured packet loss percentage.
-  * @see OAC_SET_PACKET_LOSS_PERC
-  * @param[out] x <tt>oac_int32 *</tt>: Returns the configured loss percentage
-  *                                      in the range 0-100, inclusive (default: 0).
-  * @hideinitializer */
+ * @see OAC_SET_PACKET_LOSS_PERC
+ * @param[out] x <tt>oac_int32 *</tt>: Returns the configured loss percentage
+ *                                      in the range 0-100, inclusive (default: 0).
+ * @hideinitializer */
 #define OAC_GET_PACKET_LOSS_PERC(x) OAC_GET_PACKET_LOSS_PERC_REQUEST, oac_check_int_ptr(x)
 
 /** Configures the encoder's use of discontinuous transmission (DTX).
-  * @note This is only applicable to the LPC layer
-  * @see OAC_GET_DTX
-  * @param[in] x <tt>oac_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>0</dt><dd>Disable DTX (default).</dd>
-  * <dt>1</dt><dd>Enabled DTX.</dd>
-  * </dl>
-  * @hideinitializer */
+ * @note This is only applicable to the LPC layer
+ * @see OAC_GET_DTX
+ * @param[in] x <tt>oac_int32</tt>: Allowed values:
+ * <dl>
+ * <dt>0</dt><dd>Disable DTX (default).</dd>
+ * <dt>1</dt><dd>Enabled DTX.</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_SET_DTX(x) OAC_SET_DTX_REQUEST, oac_check_int(x)
 /** Gets encoder's configured use of discontinuous transmission.
-  * @see OAC_SET_DTX
-  * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>0</dt><dd>DTX disabled (default).</dd>
-  * <dt>1</dt><dd>DTX enabled.</dd>
-  * </dl>
-  * @hideinitializer */
+ * @see OAC_SET_DTX
+ * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
+ * <dl>
+ * <dt>0</dt><dd>DTX disabled (default).</dd>
+ * <dt>1</dt><dd>DTX enabled.</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_GET_DTX(x) OAC_GET_DTX_REQUEST, oac_check_int_ptr(x)
 /** Configures the depth of signal being encoded.
-  *
-  * This is a hint which helps the encoder identify silence and near-silence.
-  * It represents the number of significant bits of linear intensity below
-  * which the signal contains ignorable quantization or other noise.
-  *
-  * For example, OAC_SET_LSB_DEPTH(14) would be an appropriate setting
-  * for G.711 u-law input. OAC_SET_LSB_DEPTH(16) would be appropriate
-  * for 16-bit linear pcm input with oac_encode_float().
-  *
-  * When using oac_encode() instead of oac_encode_float(), or when liboac
-  * is compiled for fixed-point, the encoder uses the minimum of the value
-  * set here and the value 16.
-  *
-  * @see OAC_GET_LSB_DEPTH
-  * @param[in] x <tt>oac_int32</tt>: Input precision in bits, between 8 and 24
-  *                                   (default: 24).
-  * @hideinitializer */
+ *
+ * This is a hint which helps the encoder identify silence and near-silence.
+ * It represents the number of significant bits of linear intensity below
+ * which the signal contains ignorable quantization or other noise.
+ *
+ * For example, OAC_SET_LSB_DEPTH(14) would be an appropriate setting
+ * for G.711 u-law input. OAC_SET_LSB_DEPTH(16) would be appropriate
+ * for 16-bit linear pcm input with oac_encode_float().
+ *
+ * When using oac_encode() instead of oac_encode_float(), or when liboac
+ * is compiled for fixed-point, the encoder uses the minimum of the value
+ * set here and the value 16.
+ *
+ * @see OAC_GET_LSB_DEPTH
+ * @param[in] x <tt>oac_int32</tt>: Input precision in bits, between 8 and 24
+ *                                   (default: 24).
+ * @hideinitializer */
 #define OAC_SET_LSB_DEPTH(x) OAC_SET_LSB_DEPTH_REQUEST, oac_check_int(x)
 /** Gets the encoder's configured signal depth.
-  * @see OAC_SET_LSB_DEPTH
-  * @param[out] x <tt>oac_int32 *</tt>: Input precision in bits, between 8 and
-  *                                      24 (default: 24).
-  * @hideinitializer */
+ * @see OAC_SET_LSB_DEPTH
+ * @param[out] x <tt>oac_int32 *</tt>: Input precision in bits, between 8 and
+ *                                      24 (default: 24).
+ * @hideinitializer */
 #define OAC_GET_LSB_DEPTH(x) OAC_GET_LSB_DEPTH_REQUEST, oac_check_int_ptr(x)
 
 /** Configures the encoder's use of variable duration frames.
-  * When variable duration is enabled, the encoder is free to use a shorter frame
-  * size than the one requested in the oac_encode*() call.
-  * It is then the user's responsibility
-  * to verify how much audio was encoded by checking the ToC byte of the encoded
-  * packet. The part of the audio that was not encoded needs to be resent to the
-  * encoder for the next call. Do not use this option unless you <b>really</b>
-  * know what you are doing.
-  * @see OAC_GET_EXPERT_FRAME_DURATION
-  * @param[in] x <tt>oac_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>OAC_FRAMESIZE_ARG</dt><dd>Select frame size from the argument (default).</dd>
-  * <dt>OAC_FRAMESIZE_2_5_MS</dt><dd>Use 2.5 ms frames.</dd>
-  * <dt>OAC_FRAMESIZE_5_MS</dt><dd>Use 5 ms frames.</dd>
-  * <dt>OAC_FRAMESIZE_10_MS</dt><dd>Use 10 ms frames.</dd>
-  * <dt>OAC_FRAMESIZE_20_MS</dt><dd>Use 20 ms frames.</dd>
-  * <dt>OAC_FRAMESIZE_40_MS</dt><dd>Use 40 ms frames.</dd>
-  * <dt>OAC_FRAMESIZE_60_MS</dt><dd>Use 60 ms frames.</dd>
-  * <dt>OAC_FRAMESIZE_80_MS</dt><dd>Use 80 ms frames.</dd>
-  * <dt>OAC_FRAMESIZE_100_MS</dt><dd>Use 100 ms frames.</dd>
-  * <dt>OAC_FRAMESIZE_120_MS</dt><dd>Use 120 ms frames.</dd>
-  * </dl>
-  * @hideinitializer */
+ * When variable duration is enabled, the encoder is free to use a shorter frame
+ * size than the one requested in the oac_encode*() call.
+ * It is then the user's responsibility
+ * to verify how much audio was encoded by checking the ToC byte of the encoded
+ * packet. The part of the audio that was not encoded needs to be resent to the
+ * encoder for the next call. Do not use this option unless you <b>really</b>
+ * know what you are doing.
+ * @see OAC_GET_EXPERT_FRAME_DURATION
+ * @param[in] x <tt>oac_int32</tt>: Allowed values:
+ * <dl>
+ * <dt>OAC_FRAMESIZE_ARG</dt><dd>Select frame size from the argument (default).</dd>
+ * <dt>OAC_FRAMESIZE_2_5_MS</dt><dd>Use 2.5 ms frames.</dd>
+ * <dt>OAC_FRAMESIZE_5_MS</dt><dd>Use 5 ms frames.</dd>
+ * <dt>OAC_FRAMESIZE_10_MS</dt><dd>Use 10 ms frames.</dd>
+ * <dt>OAC_FRAMESIZE_20_MS</dt><dd>Use 20 ms frames.</dd>
+ * <dt>OAC_FRAMESIZE_40_MS</dt><dd>Use 40 ms frames.</dd>
+ * <dt>OAC_FRAMESIZE_60_MS</dt><dd>Use 60 ms frames.</dd>
+ * <dt>OAC_FRAMESIZE_80_MS</dt><dd>Use 80 ms frames.</dd>
+ * <dt>OAC_FRAMESIZE_100_MS</dt><dd>Use 100 ms frames.</dd>
+ * <dt>OAC_FRAMESIZE_120_MS</dt><dd>Use 120 ms frames.</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_SET_EXPERT_FRAME_DURATION(x) OAC_SET_EXPERT_FRAME_DURATION_REQUEST, oac_check_int(x)
 /** Gets the encoder's configured use of variable duration frames.
-  * @see OAC_SET_EXPERT_FRAME_DURATION
-  * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>OAC_FRAMESIZE_ARG</dt><dd>Select frame size from the argument (default).</dd>
-  * <dt>OAC_FRAMESIZE_2_5_MS</dt><dd>Use 2.5 ms frames.</dd>
-  * <dt>OAC_FRAMESIZE_5_MS</dt><dd>Use 5 ms frames.</dd>
-  * <dt>OAC_FRAMESIZE_10_MS</dt><dd>Use 10 ms frames.</dd>
-  * <dt>OAC_FRAMESIZE_20_MS</dt><dd>Use 20 ms frames.</dd>
-  * <dt>OAC_FRAMESIZE_40_MS</dt><dd>Use 40 ms frames.</dd>
-  * <dt>OAC_FRAMESIZE_60_MS</dt><dd>Use 60 ms frames.</dd>
-  * <dt>OAC_FRAMESIZE_80_MS</dt><dd>Use 80 ms frames.</dd>
-  * <dt>OAC_FRAMESIZE_100_MS</dt><dd>Use 100 ms frames.</dd>
-  * <dt>OAC_FRAMESIZE_120_MS</dt><dd>Use 120 ms frames.</dd>
-  * </dl>
-  * @hideinitializer */
+ * @see OAC_SET_EXPERT_FRAME_DURATION
+ * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
+ * <dl>
+ * <dt>OAC_FRAMESIZE_ARG</dt><dd>Select frame size from the argument (default).</dd>
+ * <dt>OAC_FRAMESIZE_2_5_MS</dt><dd>Use 2.5 ms frames.</dd>
+ * <dt>OAC_FRAMESIZE_5_MS</dt><dd>Use 5 ms frames.</dd>
+ * <dt>OAC_FRAMESIZE_10_MS</dt><dd>Use 10 ms frames.</dd>
+ * <dt>OAC_FRAMESIZE_20_MS</dt><dd>Use 20 ms frames.</dd>
+ * <dt>OAC_FRAMESIZE_40_MS</dt><dd>Use 40 ms frames.</dd>
+ * <dt>OAC_FRAMESIZE_60_MS</dt><dd>Use 60 ms frames.</dd>
+ * <dt>OAC_FRAMESIZE_80_MS</dt><dd>Use 80 ms frames.</dd>
+ * <dt>OAC_FRAMESIZE_100_MS</dt><dd>Use 100 ms frames.</dd>
+ * <dt>OAC_FRAMESIZE_120_MS</dt><dd>Use 120 ms frames.</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_GET_EXPERT_FRAME_DURATION(x) OAC_GET_EXPERT_FRAME_DURATION_REQUEST, oac_check_int_ptr(x)
 
 /** If set to 1, disables almost all use of prediction, making frames almost
-  * completely independent. This reduces quality.
-  * @see OAC_GET_PREDICTION_DISABLED
-  * @param[in] x <tt>oac_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>0</dt><dd>Enable prediction (default).</dd>
-  * <dt>1</dt><dd>Disable prediction.</dd>
-  * </dl>
-  * @hideinitializer */
+ * completely independent. This reduces quality.
+ * @see OAC_GET_PREDICTION_DISABLED
+ * @param[in] x <tt>oac_int32</tt>: Allowed values:
+ * <dl>
+ * <dt>0</dt><dd>Enable prediction (default).</dd>
+ * <dt>1</dt><dd>Disable prediction.</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_SET_PREDICTION_DISABLED(x) OAC_SET_PREDICTION_DISABLED_REQUEST, oac_check_int(x)
 /** Gets the encoder's configured prediction status.
-  * @see OAC_SET_PREDICTION_DISABLED
-  * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>0</dt><dd>Prediction enabled (default).</dd>
-  * <dt>1</dt><dd>Prediction disabled.</dd>
-  * </dl>
-  * @hideinitializer */
+ * @see OAC_SET_PREDICTION_DISABLED
+ * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
+ * <dl>
+ * <dt>0</dt><dd>Prediction enabled (default).</dd>
+ * <dt>1</dt><dd>Prediction disabled.</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_GET_PREDICTION_DISABLED(x) OAC_GET_PREDICTION_DISABLED_REQUEST, oac_check_int_ptr(x)
 
 /** If non-zero, enables Deep Redundancy (DRED) and use the specified maximum number of 10-ms redundant frames
-  * @hideinitializer */
+ * @hideinitializer */
 #define OAC_SET_DRED_DURATION(x) OAC_SET_DRED_DURATION_REQUEST, oac_check_int(x)
 /** Gets the encoder's configured Deep Redundancy (DRED) maximum number of frames.
-  * @hideinitializer */
+ * @hideinitializer */
 #define OAC_GET_DRED_DURATION(x) OAC_GET_DRED_DURATION_REQUEST, oac_check_int_ptr(x)
 
 /** Provide external DNN weights from binary object (only when explicitly built without the weights)
-  * @hideinitializer */
+ * @hideinitializer */
 #define OAC_SET_DNN_BLOB(data, len) OAC_SET_DNN_BLOB_REQUEST, oac_check_void_ptr(data), oac_check_int(len)
 
 
 /**@}*/
 
 /** @defgroup oac_genericctls Generic CTLs
-  *
-  * These macros are used with the \c oac_decoder_ctl and
-  * \c oac_encoder_ctl calls to generate a particular
-  * request.
-  *
-  * When called on an \c OacDecoder they apply to that
-  * particular decoder instance. When called on an
-  * \c OacEncoder they apply to the corresponding setting
-  * on that encoder instance, if present.
-  *
-  * Some usage examples:
-  *
-  * @code
-  * int ret;
-  * oac_int32 pitch;
-  * ret = oac_decoder_ctl(dec_ctx, OAC_GET_PITCH(&pitch));
-  * if (ret == OAC_OK) return ret;
-  *
-  * oac_encoder_ctl(enc_ctx, OAC_RESET_STATE);
-  * oac_decoder_ctl(dec_ctx, OAC_RESET_STATE);
-  *
-  * oac_int32 enc_bw, dec_bw;
-  * oac_encoder_ctl(enc_ctx, OAC_GET_BANDWIDTH(&enc_bw));
-  * oac_decoder_ctl(dec_ctx, OAC_GET_BANDWIDTH(&dec_bw));
-  * if (enc_bw != dec_bw) {
-  *   printf("packet bandwidth mismatch!\n");
-  * }
-  * @endcode
-  *
-  * @see oac_encoder, oac_decoder_ctl, oac_encoder_ctl, oac_decoderctls, oac_encoderctls
-  * @{
-  */
+ *
+ * These macros are used with the \c oac_decoder_ctl and
+ * \c oac_encoder_ctl calls to generate a particular
+ * request.
+ *
+ * When called on an \c OacDecoder they apply to that
+ * particular decoder instance. When called on an
+ * \c OacEncoder they apply to the corresponding setting
+ * on that encoder instance, if present.
+ *
+ * Some usage examples:
+ *
+ * @code
+ * int ret;
+ * oac_int32 pitch;
+ * ret = oac_decoder_ctl(dec_ctx, OAC_GET_PITCH(&pitch));
+ * if (ret == OAC_OK) return ret;
+ *
+ * oac_encoder_ctl(enc_ctx, OAC_RESET_STATE);
+ * oac_decoder_ctl(dec_ctx, OAC_RESET_STATE);
+ *
+ * oac_int32 enc_bw, dec_bw;
+ * oac_encoder_ctl(enc_ctx, OAC_GET_BANDWIDTH(&enc_bw));
+ * oac_decoder_ctl(dec_ctx, OAC_GET_BANDWIDTH(&dec_bw));
+ * if (enc_bw != dec_bw) {
+ *   printf("packet bandwidth mismatch!\n");
+ * }
+ * @endcode
+ *
+ * @see oac_encoder, oac_decoder_ctl, oac_encoder_ctl, oac_decoderctls, oac_encoderctls
+ * @{
+ */
 
 /** Resets the codec state to be equivalent to a freshly initialized state.
-  * This should be called when switching streams in order to prevent
-  * the back to back decoding from giving different results from
-  * one at a time decoding.
-  * @hideinitializer */
+ * This should be called when switching streams in order to prevent
+ * the back to back decoding from giving different results from
+ * one at a time decoding.
+ * @hideinitializer */
 #define OAC_RESET_STATE 4028
 
 /** Gets the final state of the codec's entropy coder.
-  * This is used for testing purposes,
-  * The encoder and decoder state should be identical after coding a payload
-  * (assuming no data corruption or software bugs)
-  *
-  * @param[out] x <tt>oac_uint32 *</tt>: Entropy coder state
-  *
-  * @hideinitializer */
+ * This is used for testing purposes,
+ * The encoder and decoder state should be identical after coding a payload
+ * (assuming no data corruption or software bugs)
+ *
+ * @param[out] x <tt>oac_uint32 *</tt>: Entropy coder state
+ *
+ * @hideinitializer */
 #define OAC_GET_FINAL_RANGE(x) OAC_GET_FINAL_RANGE_REQUEST, oac_check_uint_ptr(x)
 
 /** Gets the encoder's configured bandpass or the decoder's last bandpass.
-  * @see OAC_SET_BANDWIDTH
-  * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>#OAC_AUTO</dt>                    <dd>(default)</dd>
-  * <dt>#OAC_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
-  * <dt>#OAC_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
-  * <dt>#OAC_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
-  * <dt>#OAC_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
-  * <dt>#OAC_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband</dd>
-  * </dl>
-  * @hideinitializer */
+ * @see OAC_SET_BANDWIDTH
+ * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
+ * <dl>
+ * <dt>#OAC_AUTO</dt>                    <dd>(default)</dd>
+ * <dt>#OAC_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
+ * <dt>#OAC_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
+ * <dt>#OAC_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
+ * <dt>#OAC_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
+ * <dt>#OAC_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_GET_BANDWIDTH(x) OAC_GET_BANDWIDTH_REQUEST, oac_check_int_ptr(x)
 
 /** Gets the sampling rate the encoder or decoder was initialized with.
-  * This simply returns the <code>Fs</code> value passed to oac_encoder_init()
-  * or oac_decoder_init().
-  * @param[out] x <tt>oac_int32 *</tt>: Sampling rate of encoder or decoder.
-  * @hideinitializer
-  */
+ * This simply returns the <code>Fs</code> value passed to oac_encoder_init()
+ * or oac_decoder_init().
+ * @param[out] x <tt>oac_int32 *</tt>: Sampling rate of encoder or decoder.
+ * @hideinitializer
+ */
 #define OAC_GET_SAMPLE_RATE(x) OAC_GET_SAMPLE_RATE_REQUEST, oac_check_int_ptr(x)
 
 /** If set to 1, disables the use of phase inversion for intensity stereo,
-  * improving the quality of mono downmixes, but slightly reducing normal
-  * stereo quality. Disabling phase inversion in the decoder does not comply
-  * with RFC 6716, although it does not cause any interoperability issue and
-  * is expected to become part of the Oac standard once RFC 6716 is updated
-  * by draft-ietf-codec-oac-update.
-  * @see OAC_GET_PHASE_INVERSION_DISABLED
-  * @param[in] x <tt>oac_int32</tt>: Allowed values:
-  * <dl>
-  * <dt>0</dt><dd>Enable phase inversion (default).</dd>
-  * <dt>1</dt><dd>Disable phase inversion.</dd>
-  * </dl>
-  * @hideinitializer */
+ * improving the quality of mono downmixes, but slightly reducing normal
+ * stereo quality. Disabling phase inversion in the decoder does not comply
+ * with RFC 6716, although it does not cause any interoperability issue and
+ * is expected to become part of the Oac standard once RFC 6716 is updated
+ * by draft-ietf-codec-oac-update.
+ * @see OAC_GET_PHASE_INVERSION_DISABLED
+ * @param[in] x <tt>oac_int32</tt>: Allowed values:
+ * <dl>
+ * <dt>0</dt><dd>Enable phase inversion (default).</dd>
+ * <dt>1</dt><dd>Disable phase inversion.</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_SET_PHASE_INVERSION_DISABLED(x) OAC_SET_PHASE_INVERSION_DISABLED_REQUEST, oac_check_int(x)
 /** Gets the encoder's configured phase inversion status.
-  * @see OAC_SET_PHASE_INVERSION_DISABLED
-  * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>0</dt><dd>Stereo phase inversion enabled (default).</dd>
-  * <dt>1</dt><dd>Stereo phase inversion disabled.</dd>
-  * </dl>
-  * @hideinitializer */
+ * @see OAC_SET_PHASE_INVERSION_DISABLED
+ * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
+ * <dl>
+ * <dt>0</dt><dd>Stereo phase inversion enabled (default).</dd>
+ * <dt>1</dt><dd>Stereo phase inversion disabled.</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_GET_PHASE_INVERSION_DISABLED(x) OAC_GET_PHASE_INVERSION_DISABLED_REQUEST, oac_check_int_ptr(x)
 /** Gets the DTX state of the encoder.
-  * Returns whether the last encoded frame was either a comfort noise update
-  * during DTX or not encoded because of DTX.
-  * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
-  * <dl>
-  * <dt>0</dt><dd>The encoder is not in DTX.</dd>
-  * <dt>1</dt><dd>The encoder is in DTX.</dd>
-  * </dl>
-  * @hideinitializer */
+ * Returns whether the last encoded frame was either a comfort noise update
+ * during DTX or not encoded because of DTX.
+ * @param[out] x <tt>oac_int32 *</tt>: Returns one of the following values:
+ * <dl>
+ * <dt>0</dt><dd>The encoder is not in DTX.</dd>
+ * <dt>1</dt><dd>The encoder is in DTX.</dd>
+ * </dl>
+ * @hideinitializer */
 #define OAC_GET_IN_DTX(x) OAC_GET_IN_DTX_REQUEST, oac_check_int_ptr(x)
 
 /**@}*/
 
 /** @defgroup oac_decoderctls Decoder related CTLs
-  * @see oac_genericctls, oac_encoderctls, oac_decoder
-  * @{
-  */
+ * @see oac_genericctls, oac_encoderctls, oac_decoder
+ * @{
+ */
 
 /** Configures decoder gain adjustment.
-  * Scales the decoded output by a factor specified in Q8 dB units.
-  * This has a maximum range of -32768 to 32767 inclusive, and returns
-  * OAC_BAD_ARG otherwise. The default is zero indicating no adjustment.
-  * This setting survives decoder reset.
-  *
-  * gain = pow(10, x/(20.0*256))
-  *
-  * @param[in] x <tt>oac_int32</tt>:   Amount to scale PCM signal by in Q8 dB units.
-  * @hideinitializer */
+ * Scales the decoded output by a factor specified in Q8 dB units.
+ * This has a maximum range of -32768 to 32767 inclusive, and returns
+ * OAC_BAD_ARG otherwise. The default is zero indicating no adjustment.
+ * This setting survives decoder reset.
+ *
+ * gain = pow(10, x/(20.0*256))
+ *
+ * @param[in] x <tt>oac_int32</tt>:   Amount to scale PCM signal by in Q8 dB units.
+ * @hideinitializer */
 #define OAC_SET_GAIN(x) OAC_SET_GAIN_REQUEST, oac_check_int(x)
 /** Gets the decoder's configured gain adjustment. @see OAC_SET_GAIN
-  *
-  * @param[out] x <tt>oac_int32 *</tt>: Amount to scale PCM signal by in Q8 dB units.
-  * @hideinitializer */
+ *
+ * @param[out] x <tt>oac_int32 *</tt>: Amount to scale PCM signal by in Q8 dB units.
+ * @hideinitializer */
 #define OAC_GET_GAIN(x) OAC_GET_GAIN_REQUEST, oac_check_int_ptr(x)
 
 /** Gets the duration (in samples) of the last packet successfully decoded or concealed.
-  * @param[out] x <tt>oac_int32 *</tt>: Number of samples (at current sampling rate).
-  * @hideinitializer */
+ * @param[out] x <tt>oac_int32 *</tt>: Number of samples (at current sampling rate).
+ * @hideinitializer */
 #define OAC_GET_LAST_PACKET_DURATION(x) OAC_GET_LAST_PACKET_DURATION_REQUEST, oac_check_int_ptr(x)
 
 /** Gets the pitch of the last decoded frame, if available.
-  * This can be used for any post-processing algorithm requiring the use of pitch,
-  * e.g. time stretching/shortening. If the last frame was not voiced, or if the
-  * pitch was not coded in the frame, then zero is returned.
-  *
-  * This CTL is only implemented for decoder instances.
-  *
-  * @param[out] x <tt>oac_int32 *</tt>: pitch period at 48 kHz (or 0 if not available)
-  *
-  * @hideinitializer */
+ * This can be used for any post-processing algorithm requiring the use of pitch,
+ * e.g. time stretching/shortening. If the last frame was not voiced, or if the
+ * pitch was not coded in the frame, then zero is returned.
+ *
+ * This CTL is only implemented for decoder instances.
+ *
+ * @param[out] x <tt>oac_int32 *</tt>: pitch period at 48 kHz (or 0 if not available)
+ *
+ * @hideinitializer */
 #define OAC_GET_PITCH(x) OAC_GET_PITCH_REQUEST, oac_check_int_ptr(x)
 
 /** Enables blind bandwidth extension for wideband signals if decoding sampling rate is 48 kHz.
-  * @param[in] x <tt>oac_int32 </tt>: 1 enables bandwidth extension, 0 disables it.
-  * The default is 0.
-  *
-  * @hideinitializer */
- #define OAC_SET_OSCE_BWE(x) OAC_SET_OSCE_BWE_REQUEST, oac_check_int(x)
+ * @param[in] x <tt>oac_int32 </tt>: 1 enables bandwidth extension, 0 disables it.
+ * The default is 0.
+ *
+ * @hideinitializer */
+#define OAC_SET_OSCE_BWE(x) OAC_SET_OSCE_BWE_REQUEST, oac_check_int(x)
 /** Gets blind bandwidth extension flag for wideband signals if decoding sampling rate is 48 kHz.
-  * @param[out] x <tt>oac_int32 *</tt>: 1 if bwe enabled, 0 if disabled.
-  *
-  * @hideinitializer */
- #define OAC_GET_OSCE_BWE(x) OAC_GET_OSCE_BWE_REQUEST, oac_check_int_ptr(x)
+ * @param[out] x <tt>oac_int32 *</tt>: 1 if bwe enabled, 0 if disabled.
+ *
+ * @hideinitializer */
+#define OAC_GET_OSCE_BWE(x) OAC_GET_OSCE_BWE_REQUEST, oac_check_int_ptr(x)
 
 /** If set to 1, the decoder will ignore all extensions found in the padding area
-  * (does not affect DRED, which is decoded separately).
-  * @hideinitializer */
+ * (does not affect DRED, which is decoded separately).
+ * @hideinitializer */
 #define OAC_SET_IGNORE_EXTENSIONS(x) OAC_SET_IGNORE_EXTENSIONS_REQUEST, oac_check_int(x)
 /** Gets whether the decoder is ignoring extensions.
-  * @hideinitializer */
+ * @hideinitializer */
 #define OAC_GET_IGNORE_EXTENSIONS(x) OAC_GET_IGNORE_EXTENSIONS_REQUEST, oac_check_int_ptr(x)
 
 /**@}*/
 
 /** @defgroup oac_libinfo Oac library information functions
-  * @{
-  */
+ * @{
+ */
 
 /** Converts an oac error code into a human readable string.
-  *
-  * @param[in] error <tt>int</tt>: Error number
-  * @returns Error string
-  */
+ *
+ * @param[in] error <tt>int</tt>: Error number
+ * @returns Error string
+ */
 OAC_EXPORT const char *oac_strerror(int error);
 
 /** Gets the liboac version string.
-  *
-  * Applications may look for the substring "-fixed" in the version string to
-  * determine whether they have a fixed-point or floating-point build at
-  * runtime.
-  *
-  * @returns Version string
-  */
+ *
+ * Applications may look for the substring "-fixed" in the version string to
+ * determine whether they have a fixed-point or floating-point build at
+ * runtime.
+ *
+ * @returns Version string
+ */
 OAC_EXPORT const char *oac_get_version_string(void);
 /**@}*/
 
diff --git a/include/oac_multistream.h b/include/oac_multistream.h
index 490688d15..1e6d92d4e 100644
--- a/include/oac_multistream.h
+++ b/include/oac_multistream.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 /**
  * @file oac_multistream.h
@@ -42,15 +42,15 @@ extern "C" {
 /** @cond OAC_INTERNAL_DOC */
 
 /** Macros to trigger compilation errors when the wrong types are provided to a
-  * CTL. */
+ * CTL. */
 /**@{*/
 #define oac_check_encstate_ptr(ptr) ((ptr) + ((ptr) - (OacEncoder**)(ptr)))
 #define oac_check_decstate_ptr(ptr) ((ptr) + ((ptr) - (OacDecoder**)(ptr)))
 /**@}*/
 
 /** These are the actual encoder and decoder CTL ID numbers.
-  * They should not be used directly by applications.
-  * In general, SETs should be even and GETs should be odd.*/
+ * They should not be used directly by applications.
+ * In general, SETs should be even and GETs should be odd.*/
 /**@{*/
 #define OAC_MULTISTREAM_GET_ENCODER_STATE_REQUEST 5120
 #define OAC_MULTISTREAM_GET_DECODER_STATE_REQUEST 5122
@@ -59,430 +59,423 @@ extern "C" {
 /** @endcond */
 
 /** @defgroup oac_multistream_ctls Multistream specific encoder and decoder CTLs
-  *
-  * These are convenience macros that are specific to the
-  * oac_multistream_encoder_ctl() and oac_multistream_decoder_ctl()
-  * interface.
-  * The CTLs from @ref oac_genericctls, @ref oac_encoderctls, and
-  * @ref oac_decoderctls may be applied to a multistream encoder or decoder as
-  * well.
-  * In addition, you may retrieve the encoder or decoder state for an specific
-  * stream via #OAC_MULTISTREAM_GET_ENCODER_STATE or
-  * #OAC_MULTISTREAM_GET_DECODER_STATE and apply CTLs to it individually.
-  */
+ *
+ * These are convenience macros that are specific to the
+ * oac_multistream_encoder_ctl() and oac_multistream_decoder_ctl()
+ * interface.
+ * The CTLs from @ref oac_genericctls, @ref oac_encoderctls, and
+ * @ref oac_decoderctls may be applied to a multistream encoder or decoder as
+ * well.
+ * In addition, you may retrieve the encoder or decoder state for an specific
+ * stream via #OAC_MULTISTREAM_GET_ENCODER_STATE or
+ * #OAC_MULTISTREAM_GET_DECODER_STATE and apply CTLs to it individually.
+ */
 /**@{*/
 
 /** Gets the encoder state for an individual stream of a multistream encoder.
-  * @param[in] x <tt>oac_int32</tt>: The index of the stream whose encoder you
-  *                                   wish to retrieve.
-  *                                   This must be non-negative and less than
-  *                                   the <code>streams</code> parameter used
-  *                                   to initialize the encoder.
-  * @param[out] y <tt>OacEncoder**</tt>: Returns a pointer to the given
-  *                                       encoder state.
-  * @retval OAC_BAD_ARG The index of the requested stream was out of range.
-  * @hideinitializer
-  */
-#define OAC_MULTISTREAM_GET_ENCODER_STATE(x,y) OAC_MULTISTREAM_GET_ENCODER_STATE_REQUEST, oac_check_int(x), oac_check_encstate_ptr(y)
+ * @param[in] x <tt>oac_int32</tt>: The index of the stream whose encoder you
+ *                                   wish to retrieve.
+ *                                   This must be non-negative and less than
+ *                                   the <code>streams</code> parameter used
+ *                                   to initialize the encoder.
+ * @param[out] y <tt>OacEncoder**</tt>: Returns a pointer to the given
+ *                                       encoder state.
+ * @retval OAC_BAD_ARG The index of the requested stream was out of range.
+ * @hideinitializer
+ */
+#define OAC_MULTISTREAM_GET_ENCODER_STATE(x, y) OAC_MULTISTREAM_GET_ENCODER_STATE_REQUEST, oac_check_int(x), \
+        oac_check_encstate_ptr(y)
 
 /** Gets the decoder state for an individual stream of a multistream decoder.
-  * @param[in] x <tt>oac_int32</tt>: The index of the stream whose decoder you
-  *                                   wish to retrieve.
-  *                                   This must be non-negative and less than
-  *                                   the <code>streams</code> parameter used
-  *                                   to initialize the decoder.
-  * @param[out] y <tt>OacDecoder**</tt>: Returns a pointer to the given
-  *                                       decoder state.
-  * @retval OAC_BAD_ARG The index of the requested stream was out of range.
-  * @hideinitializer
-  */
-#define OAC_MULTISTREAM_GET_DECODER_STATE(x,y) OAC_MULTISTREAM_GET_DECODER_STATE_REQUEST, oac_check_int(x), oac_check_decstate_ptr(y)
+ * @param[in] x <tt>oac_int32</tt>: The index of the stream whose decoder you
+ *                                   wish to retrieve.
+ *                                   This must be non-negative and less than
+ *                                   the <code>streams</code> parameter used
+ *                                   to initialize the decoder.
+ * @param[out] y <tt>OacDecoder**</tt>: Returns a pointer to the given
+ *                                       decoder state.
+ * @retval OAC_BAD_ARG The index of the requested stream was out of range.
+ * @hideinitializer
+ */
+#define OAC_MULTISTREAM_GET_DECODER_STATE(x, y) OAC_MULTISTREAM_GET_DECODER_STATE_REQUEST, oac_check_int(x), \
+        oac_check_decstate_ptr(y)
 
 /**@}*/
 
 /** @defgroup oac_multistream Oac Multistream API
-  * @{
-  *
-  * The multistream API allows individual Oac streams to be combined into a
-  * single packet, enabling support for up to 255 channels. Unlike an
-  * elementary Oac stream, the encoder and decoder must negotiate the channel
-  * configuration before the decoder can successfully interpret the data in the
-  * packets produced by the encoder. Some basic information, such as packet
-  * duration, can be computed without any special negotiation.
-  *
-  * The format for multistream Oac packets is defined in
-  * <a href="https://tools.ietf.org/html/rfc7845">RFC 7845</a>
-  * and is based on the self-delimited Oac framing described in Appendix B of
-  * <a href="https://tools.ietf.org/html/rfc6716">RFC 6716</a>.
-  * Normal Oac packets are just a degenerate case of multistream Oac packets,
-  * and can be encoded or decoded with the multistream API by setting
-  * <code>streams</code> to <code>1</code> when initializing the encoder or
-  * decoder.
-  *
-  * Multistream Oac streams can contain up to 255 elementary Oac streams.
-  * These may be either "uncoupled" or "coupled", indicating that the decoder
-  * is configured to decode them to either 1 or 2 channels, respectively.
-  * The streams are ordered so that all coupled streams appear at the
-  * beginning.
-  *
-  * A <code>mapping</code> table defines which decoded channel <code>i</code>
-  * should be used for each input/output (I/O) channel <code>j</code>. This table is
-  * typically provided as an unsigned char array.
-  * Let <code>i = mapping[j]</code> be the index for I/O channel <code>j</code>.
-  * If <code>i < 2*coupled_streams</code>, then I/O channel <code>j</code> is
-  * encoded as the left channel of stream <code>(i/2)</code> if <code>i</code>
-  * is even, or  as the right channel of stream <code>(i/2)</code> if
-  * <code>i</code> is odd. Otherwise, I/O channel <code>j</code> is encoded as
-  * mono in stream <code>(i - coupled_streams)</code>, unless it has the special
-  * value 255, in which case it is omitted from the encoding entirely (the
-  * decoder will reproduce it as silence). Each value <code>i</code> must either
-  * be the special value 255 or be less than <code>streams + coupled_streams</code>.
-  *
-  * The output channels specified by the encoder
-  * should use the
-  * <a href="https://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-810004.3.9">Vorbis
-  * channel ordering</a>. A decoder may wish to apply an additional permutation
-  * to the mapping the encoder used to achieve a different output channel
-  * order (e.g. for outputting in WAV order).
-  *
-  * Each multistream packet contains an Oac packet for each stream, and all of
-  * the Oac packets in a single multistream packet must have the same
-  * duration. Therefore the duration of a multistream packet can be extracted
-  * from the TOC sequence of the first stream, which is located at the
-  * beginning of the packet, just like an elementary Oac stream:
-  *
-  * @code
-  * int nb_samples;
-  * int nb_frames;
-  * nb_frames = oac_packet_get_nb_frames(data, len);
-  * if (nb_frames < 1)
-  *   return nb_frames;
-  * nb_samples = oac_packet_get_samples_per_frame(data, 48000) * nb_frames;
-  * @endcode
-  *
-  * The general encoding and decoding process proceeds exactly the same as in
-  * the normal @ref oac_encoder and @ref oac_decoder APIs.
-  * See their documentation for an overview of how to use the corresponding
-  * multistream functions.
-  */
+ * @{
+ *
+ * The multistream API allows individual Oac streams to be combined into a
+ * single packet, enabling support for up to 255 channels. Unlike an
+ * elementary Oac stream, the encoder and decoder must negotiate the channel
+ * configuration before the decoder can successfully interpret the data in the
+ * packets produced by the encoder. Some basic information, such as packet
+ * duration, can be computed without any special negotiation.
+ *
+ * The format for multistream Oac packets is defined in
+ * <a href="https://tools.ietf.org/html/rfc7845">RFC 7845</a>
+ * and is based on the self-delimited Oac framing described in Appendix B of
+ * <a href="https://tools.ietf.org/html/rfc6716">RFC 6716</a>.
+ * Normal Oac packets are just a degenerate case of multistream Oac packets,
+ * and can be encoded or decoded with the multistream API by setting
+ * <code>streams</code> to <code>1</code> when initializing the encoder or
+ * decoder.
+ *
+ * Multistream Oac streams can contain up to 255 elementary Oac streams.
+ * These may be either "uncoupled" or "coupled", indicating that the decoder
+ * is configured to decode them to either 1 or 2 channels, respectively.
+ * The streams are ordered so that all coupled streams appear at the
+ * beginning.
+ *
+ * A <code>mapping</code> table defines which decoded channel <code>i</code>
+ * should be used for each input/output (I/O) channel <code>j</code>. This table is
+ * typically provided as an unsigned char array.
+ * Let <code>i = mapping[j]</code> be the index for I/O channel <code>j</code>.
+ * If <code>i < 2*coupled_streams</code>, then I/O channel <code>j</code> is
+ * encoded as the left channel of stream <code>(i/2)</code> if <code>i</code>
+ * is even, or  as the right channel of stream <code>(i/2)</code> if
+ * <code>i</code> is odd. Otherwise, I/O channel <code>j</code> is encoded as
+ * mono in stream <code>(i - coupled_streams)</code>, unless it has the special
+ * value 255, in which case it is omitted from the encoding entirely (the
+ * decoder will reproduce it as silence). Each value <code>i</code> must either
+ * be the special value 255 or be less than <code>streams + coupled_streams</code>.
+ *
+ * The output channels specified by the encoder
+ * should use the
+ * <a href="https://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-810004.3.9">Vorbis
+ * channel ordering</a>. A decoder may wish to apply an additional permutation
+ * to the mapping the encoder used to achieve a different output channel
+ * order (e.g. for outputting in WAV order).
+ *
+ * Each multistream packet contains an Oac packet for each stream, and all of
+ * the Oac packets in a single multistream packet must have the same
+ * duration. Therefore the duration of a multistream packet can be extracted
+ * from the TOC sequence of the first stream, which is located at the
+ * beginning of the packet, just like an elementary Oac stream:
+ *
+ * @code
+ * int nb_samples;
+ * int nb_frames;
+ * nb_frames = oac_packet_get_nb_frames(data, len);
+ * if (nb_frames < 1)
+ *   return nb_frames;
+ * nb_samples = oac_packet_get_samples_per_frame(data, 48000) * nb_frames;
+ * @endcode
+ *
+ * The general encoding and decoding process proceeds exactly the same as in
+ * the normal @ref oac_encoder and @ref oac_decoder APIs.
+ * See their documentation for an overview of how to use the corresponding
+ * multistream functions.
+ */
 
 /** Oac multistream encoder state.
-  * This contains the complete state of a multistream Oac encoder.
-  * It is position independent and can be freely copied.
-  * @see oac_multistream_encoder_create
-  * @see oac_multistream_encoder_init
-  */
+ * This contains the complete state of a multistream Oac encoder.
+ * It is position independent and can be freely copied.
+ * @see oac_multistream_encoder_create
+ * @see oac_multistream_encoder_init
+ */
 typedef struct OacMSEncoder OacMSEncoder;
 
 /** Oac multistream decoder state.
-  * This contains the complete state of a multistream Oac decoder.
-  * It is position independent and can be freely copied.
-  * @see oac_multistream_decoder_create
-  * @see oac_multistream_decoder_init
-  */
+ * This contains the complete state of a multistream Oac decoder.
+ * It is position independent and can be freely copied.
+ * @see oac_multistream_decoder_create
+ * @see oac_multistream_decoder_init
+ */
 typedef struct OacMSDecoder OacMSDecoder;
 
 /**\name Multistream encoder functions */
 /**@{*/
 
 /** Gets the size of an OacMSEncoder structure.
-  * @param streams <tt>int</tt>: The total number of streams to encode from the
-  *                              input.
-  *                              This must be no more than 255.
-  * @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
-  *                                      to encode.
-  *                                      This must be no larger than the total
-  *                                      number of streams.
-  *                                      Additionally, The total number of
-  *                                      encoded channels (<code>streams +
-  *                                      coupled_streams</code>) must be no
-  *                                      more than 255.
-  * @returns The size in bytes on success, or a negative error code
-  *          (see @ref oac_errorcodes) on error.
-  */
+ * @param streams <tt>int</tt>: The total number of streams to encode from the
+ *                              input.
+ *                              This must be no more than 255.
+ * @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
+ *                                      to encode.
+ *                                      This must be no larger than the total
+ *                                      number of streams.
+ *                                      Additionally, The total number of
+ *                                      encoded channels (<code>streams +
+ *                                      coupled_streams</code>) must be no
+ *                                      more than 255.
+ * @returns The size in bytes on success, or a negative error code
+ *          (see @ref oac_errorcodes) on error.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_multistream_encoder_get_size(
-      int streams,
-      int coupled_streams
-);
+    int streams,
+    int coupled_streams);
 
 OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_multistream_surround_encoder_get_size(
-      int channels,
-      int mapping_family
-);
+    int channels,
+    int mapping_family);
 
 
 /** Allocates and initializes a multistream encoder state.
-  * Call oac_multistream_encoder_destroy() to release
-  * this object when finished.
-  * @param Fs <tt>oac_int32</tt>: Sampling rate of the input signal (in Hz).
-  *                                This must be one of 8000, 12000, 16000,
-  *                                24000, or 48000.
-  * @param channels <tt>int</tt>: Number of channels in the input signal.
-  *                               This must be at most 255.
-  *                               It may be greater than the number of
-  *                               coded channels (<code>streams +
-  *                               coupled_streams</code>).
-  * @param streams <tt>int</tt>: The total number of streams to encode from the
-  *                              input.
-  *                              This must be no more than the number of channels.
-  * @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
-  *                                      to encode.
-  *                                      This must be no larger than the total
-  *                                      number of streams.
-  *                                      Additionally, The total number of
-  *                                      encoded channels (<code>streams +
-  *                                      coupled_streams</code>) must be no
-  *                                      more than the number of input channels.
-  * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
-  *                    encoded channels to input channels, as described in
-  *                    @ref oac_multistream. As an extra constraint, the
-  *                    multistream encoder does not allow encoding coupled
-  *                    streams for which one channel is unused since this
-  *                    is never a good idea.
-  * @param application <tt>int</tt>: The target encoder application.
-  *                                  This must be one of the following:
-  * <dl>
-  * <dt>#OAC_APPLICATION_VOIP</dt>
-  * <dd>Process signal for improved speech intelligibility.</dd>
-  * <dt>#OAC_APPLICATION_AUDIO</dt>
-  * <dd>Favor faithfulness to the original input.</dd>
-  * <dt>#OAC_APPLICATION_RESTRICTED_LOWDELAY</dt>
-  * <dd>Configure the minimum possible coding delay by disabling certain modes
-  * of operation.</dd>
-  * </dl>
-  * @param[out] error <tt>int *</tt>: Returns #OAC_OK on success, or an error
-  *                                   code (see @ref oac_errorcodes) on
-  *                                   failure.
-  */
+ * Call oac_multistream_encoder_destroy() to release
+ * this object when finished.
+ * @param Fs <tt>oac_int32</tt>: Sampling rate of the input signal (in Hz).
+ *                                This must be one of 8000, 12000, 16000,
+ *                                24000, or 48000.
+ * @param channels <tt>int</tt>: Number of channels in the input signal.
+ *                               This must be at most 255.
+ *                               It may be greater than the number of
+ *                               coded channels (<code>streams +
+ *                               coupled_streams</code>).
+ * @param streams <tt>int</tt>: The total number of streams to encode from the
+ *                              input.
+ *                              This must be no more than the number of channels.
+ * @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
+ *                                      to encode.
+ *                                      This must be no larger than the total
+ *                                      number of streams.
+ *                                      Additionally, The total number of
+ *                                      encoded channels (<code>streams +
+ *                                      coupled_streams</code>) must be no
+ *                                      more than the number of input channels.
+ * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
+ *                    encoded channels to input channels, as described in
+ *                    @ref oac_multistream. As an extra constraint, the
+ *                    multistream encoder does not allow encoding coupled
+ *                    streams for which one channel is unused since this
+ *                    is never a good idea.
+ * @param application <tt>int</tt>: The target encoder application.
+ *                                  This must be one of the following:
+ * <dl>
+ * <dt>#OAC_APPLICATION_VOIP</dt>
+ * <dd>Process signal for improved speech intelligibility.</dd>
+ * <dt>#OAC_APPLICATION_AUDIO</dt>
+ * <dd>Favor faithfulness to the original input.</dd>
+ * <dt>#OAC_APPLICATION_RESTRICTED_LOWDELAY</dt>
+ * <dd>Configure the minimum possible coding delay by disabling certain modes
+ * of operation.</dd>
+ * </dl>
+ * @param[out] error <tt>int *</tt>: Returns #OAC_OK on success, or an error
+ *                                   code (see @ref oac_errorcodes) on
+ *                                   failure.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT OacMSEncoder *oac_multistream_encoder_create(
-      oac_int32 Fs,
-      int channels,
-      int streams,
-      int coupled_streams,
-      const unsigned char *mapping,
-      int application,
-      int *error
-) OAC_ARG_NONNULL(5);
+    oac_int32 Fs,
+    int channels,
+    int streams,
+    int coupled_streams,
+    const unsigned char *mapping,
+    int application,
+    int *error) OAC_ARG_NONNULL(5);
 
 OAC_EXPORT OAC_WARN_UNUSED_RESULT OacMSEncoder *oac_multistream_surround_encoder_create(
-      oac_int32 Fs,
-      int channels,
-      int mapping_family,
-      int *streams,
-      int *coupled_streams,
-      unsigned char *mapping,
-      int application,
-      int *error
-) OAC_ARG_NONNULL(4) OAC_ARG_NONNULL(5) OAC_ARG_NONNULL(6);
+    oac_int32 Fs,
+    int channels,
+    int mapping_family,
+    int *streams,
+    int *coupled_streams,
+    unsigned char *mapping,
+    int application,
+    int *error) OAC_ARG_NONNULL(4) OAC_ARG_NONNULL(5) OAC_ARG_NONNULL(6);
 
 /** Initialize a previously allocated multistream encoder state.
-  * The memory pointed to by \a st must be at least the size returned by
-  * oac_multistream_encoder_get_size().
-  * This is intended for applications which use their own allocator instead of
-  * malloc.
-  * To reset a previously initialized state, use the #OAC_RESET_STATE CTL.
-  * @see oac_multistream_encoder_create
-  * @see oac_multistream_encoder_get_size
-  * @param st <tt>OacMSEncoder*</tt>: Multistream encoder state to initialize.
-  * @param Fs <tt>oac_int32</tt>: Sampling rate of the input signal (in Hz).
-  *                                This must be one of 8000, 12000, 16000,
-  *                                24000, or 48000.
-  * @param channels <tt>int</tt>: Number of channels in the input signal.
-  *                               This must be at most 255.
-  *                               It may be greater than the number of
-  *                               coded channels (<code>streams +
-  *                               coupled_streams</code>).
-  * @param streams <tt>int</tt>: The total number of streams to encode from the
-  *                              input.
-  *                              This must be no more than the number of channels.
-  * @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
-  *                                      to encode.
-  *                                      This must be no larger than the total
-  *                                      number of streams.
-  *                                      Additionally, The total number of
-  *                                      encoded channels (<code>streams +
-  *                                      coupled_streams</code>) must be no
-  *                                      more than the number of input channels.
-  * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
-  *                    encoded channels to input channels, as described in
-  *                    @ref oac_multistream. As an extra constraint, the
-  *                    multistream encoder does not allow encoding coupled
-  *                    streams for which one channel is unused since this
-  *                    is never a good idea.
-  * @param application <tt>int</tt>: The target encoder application.
-  *                                  This must be one of the following:
-  * <dl>
-  * <dt>#OAC_APPLICATION_VOIP</dt>
-  * <dd>Process signal for improved speech intelligibility.</dd>
-  * <dt>#OAC_APPLICATION_AUDIO</dt>
-  * <dd>Favor faithfulness to the original input.</dd>
-  * <dt>#OAC_APPLICATION_RESTRICTED_LOWDELAY</dt>
-  * <dd>Configure the minimum possible coding delay by disabling certain modes
-  * of operation.</dd>
-  * </dl>
-  * @returns #OAC_OK on success, or an error code (see @ref oac_errorcodes)
-  *          on failure.
-  */
+ * The memory pointed to by \a st must be at least the size returned by
+ * oac_multistream_encoder_get_size().
+ * This is intended for applications which use their own allocator instead of
+ * malloc.
+ * To reset a previously initialized state, use the #OAC_RESET_STATE CTL.
+ * @see oac_multistream_encoder_create
+ * @see oac_multistream_encoder_get_size
+ * @param st <tt>OacMSEncoder*</tt>: Multistream encoder state to initialize.
+ * @param Fs <tt>oac_int32</tt>: Sampling rate of the input signal (in Hz).
+ *                                This must be one of 8000, 12000, 16000,
+ *                                24000, or 48000.
+ * @param channels <tt>int</tt>: Number of channels in the input signal.
+ *                               This must be at most 255.
+ *                               It may be greater than the number of
+ *                               coded channels (<code>streams +
+ *                               coupled_streams</code>).
+ * @param streams <tt>int</tt>: The total number of streams to encode from the
+ *                              input.
+ *                              This must be no more than the number of channels.
+ * @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
+ *                                      to encode.
+ *                                      This must be no larger than the total
+ *                                      number of streams.
+ *                                      Additionally, The total number of
+ *                                      encoded channels (<code>streams +
+ *                                      coupled_streams</code>) must be no
+ *                                      more than the number of input channels.
+ * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
+ *                    encoded channels to input channels, as described in
+ *                    @ref oac_multistream. As an extra constraint, the
+ *                    multistream encoder does not allow encoding coupled
+ *                    streams for which one channel is unused since this
+ *                    is never a good idea.
+ * @param application <tt>int</tt>: The target encoder application.
+ *                                  This must be one of the following:
+ * <dl>
+ * <dt>#OAC_APPLICATION_VOIP</dt>
+ * <dd>Process signal for improved speech intelligibility.</dd>
+ * <dt>#OAC_APPLICATION_AUDIO</dt>
+ * <dd>Favor faithfulness to the original input.</dd>
+ * <dt>#OAC_APPLICATION_RESTRICTED_LOWDELAY</dt>
+ * <dd>Configure the minimum possible coding delay by disabling certain modes
+ * of operation.</dd>
+ * </dl>
+ * @returns #OAC_OK on success, or an error code (see @ref oac_errorcodes)
+ *          on failure.
+ */
 OAC_EXPORT int oac_multistream_encoder_init(
-      OacMSEncoder *st,
-      oac_int32 Fs,
-      int channels,
-      int streams,
-      int coupled_streams,
-      const unsigned char *mapping,
-      int application
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(6);
+    OacMSEncoder *st,
+    oac_int32 Fs,
+    int channels,
+    int streams,
+    int coupled_streams,
+    const unsigned char *mapping,
+    int application) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(6);
 
 OAC_EXPORT int oac_multistream_surround_encoder_init(
-      OacMSEncoder *st,
-      oac_int32 Fs,
-      int channels,
-      int mapping_family,
-      int *streams,
-      int *coupled_streams,
-      unsigned char *mapping,
-      int application
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(5) OAC_ARG_NONNULL(6) OAC_ARG_NONNULL(7);
+    OacMSEncoder *st,
+    oac_int32 Fs,
+    int channels,
+    int mapping_family,
+    int *streams,
+    int *coupled_streams,
+    unsigned char *mapping,
+    int application) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(5) OAC_ARG_NONNULL(6) OAC_ARG_NONNULL(7);
 
 /** Encodes a multistream Oac frame.
-  * @param st <tt>OacMSEncoder*</tt>: Multistream encoder state.
-  * @param[in] pcm <tt>const oac_int16*</tt>: The input signal as interleaved
-  *                                            samples.
-  *                                            This must contain
-  *                                            <code>frame_size*channels</code>
-  *                                            samples.
-  * @param frame_size <tt>int</tt>: Number of samples per channel in the input
-  *                                 signal.
-  *                                 This must be an Oac frame size for the
-  *                                 encoder's sampling rate.
-  *                                 For example, at 48 kHz the permitted values
-  *                                 are 120, 240, 480, 960, 1920, and 2880.
-  *                                 Passing in a duration of less than 10 ms
-  *                                 (480 samples at 48 kHz) will prevent the
-  *                                 encoder from using the LPC or hybrid modes.
-  * @param[out] data <tt>unsigned char*</tt>: Output payload.
-  *                                           This must contain storage for at
-  *                                           least \a max_data_bytes.
-  * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
-  *                                                 memory for the output
-  *                                                 payload. This may be
-  *                                                 used to impose an upper limit on
-  *                                                 the instant bitrate, but should
-  *                                                 not be used as the only bitrate
-  *                                                 control. Use #OAC_SET_BITRATE to
-  *                                                 control the bitrate.
-  * @returns The length of the encoded packet (in bytes) on success or a
-  *          negative error code (see @ref oac_errorcodes) on failure.
-  */
+ * @param st <tt>OacMSEncoder*</tt>: Multistream encoder state.
+ * @param[in] pcm <tt>const oac_int16*</tt>: The input signal as interleaved
+ *                                            samples.
+ *                                            This must contain
+ *                                            <code>frame_size*channels</code>
+ *                                            samples.
+ * @param frame_size <tt>int</tt>: Number of samples per channel in the input
+ *                                 signal.
+ *                                 This must be an Oac frame size for the
+ *                                 encoder's sampling rate.
+ *                                 For example, at 48 kHz the permitted values
+ *                                 are 120, 240, 480, 960, 1920, and 2880.
+ *                                 Passing in a duration of less than 10 ms
+ *                                 (480 samples at 48 kHz) will prevent the
+ *                                 encoder from using the LPC or hybrid modes.
+ * @param[out] data <tt>unsigned char*</tt>: Output payload.
+ *                                           This must contain storage for at
+ *                                           least \a max_data_bytes.
+ * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
+ *                                                 memory for the output
+ *                                                 payload. This may be
+ *                                                 used to impose an upper limit on
+ *                                                 the instant bitrate, but should
+ *                                                 not be used as the only bitrate
+ *                                                 control. Use #OAC_SET_BITRATE to
+ *                                                 control the bitrate.
+ * @returns The length of the encoded packet (in bytes) on success or a
+ *          negative error code (see @ref oac_errorcodes) on failure.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_multistream_encode(
     OacMSEncoder *st,
     const oac_int16 *pcm,
     int frame_size,
     unsigned char *data,
-    oac_int32 max_data_bytes
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
+    oac_int32 max_data_bytes) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
 /** Encodes a multistream Oac frame.
-  * @param st <tt>OacMSEncoder*</tt>: Multistream encoder state.
-  * @param[in] pcm <tt>const oac_int32*</tt>: The input signal as interleaved
-  *                                            samples representing (or slightly exceeding) 24-bit values.
-  *                                            This must contain
-  *                                            <code>frame_size*channels</code>
-  *                                            samples.
-  * @param frame_size <tt>int</tt>: Number of samples per channel in the input
-  *                                 signal.
-  *                                 This must be an Oac frame size for the
-  *                                 encoder's sampling rate.
-  *                                 For example, at 48 kHz the permitted values
-  *                                 are 120, 240, 480, 960, 1920, and 2880.
-  *                                 Passing in a duration of less than 10 ms
-  *                                 (480 samples at 48 kHz) will prevent the
-  *                                 encoder from using the LPC or hybrid modes.
-  * @param[out] data <tt>unsigned char*</tt>: Output payload.
-  *                                           This must contain storage for at
-  *                                           least \a max_data_bytes.
-  * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
-  *                                                 memory for the output
-  *                                                 payload. This may be
-  *                                                 used to impose an upper limit on
-  *                                                 the instant bitrate, but should
-  *                                                 not be used as the only bitrate
-  *                                                 control. Use #OAC_SET_BITRATE to
-  *                                                 control the bitrate.
-  * @returns The length of the encoded packet (in bytes) on success or a
-  *          negative error code (see @ref oac_errorcodes) on failure.
-  */
+ * @param st <tt>OacMSEncoder*</tt>: Multistream encoder state.
+ * @param[in] pcm <tt>const oac_int32*</tt>: The input signal as interleaved
+ *                                            samples representing (or slightly exceeding) 24-bit values.
+ *                                            This must contain
+ *                                            <code>frame_size*channels</code>
+ *                                            samples.
+ * @param frame_size <tt>int</tt>: Number of samples per channel in the input
+ *                                 signal.
+ *                                 This must be an Oac frame size for the
+ *                                 encoder's sampling rate.
+ *                                 For example, at 48 kHz the permitted values
+ *                                 are 120, 240, 480, 960, 1920, and 2880.
+ *                                 Passing in a duration of less than 10 ms
+ *                                 (480 samples at 48 kHz) will prevent the
+ *                                 encoder from using the LPC or hybrid modes.
+ * @param[out] data <tt>unsigned char*</tt>: Output payload.
+ *                                           This must contain storage for at
+ *                                           least \a max_data_bytes.
+ * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
+ *                                                 memory for the output
+ *                                                 payload. This may be
+ *                                                 used to impose an upper limit on
+ *                                                 the instant bitrate, but should
+ *                                                 not be used as the only bitrate
+ *                                                 control. Use #OAC_SET_BITRATE to
+ *                                                 control the bitrate.
+ * @returns The length of the encoded packet (in bytes) on success or a
+ *          negative error code (see @ref oac_errorcodes) on failure.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_multistream_encode24(
     OacMSEncoder *st,
     const oac_int32 *pcm,
     int frame_size,
     unsigned char *data,
-    oac_int32 max_data_bytes
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
+    oac_int32 max_data_bytes) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
 /** Encodes a multistream Oac frame from floating point input.
-  * @param st <tt>OacMSEncoder*</tt>: Multistream encoder state.
-  * @param[in] pcm <tt>const float*</tt>: The input signal as interleaved
-  *                                       samples with a normal range of
-  *                                       +/-1.0.
-  *                                       Samples with a range beyond +/-1.0
-  *                                       are supported but will be clipped by
-  *                                       decoders using the integer API and
-  *                                       should only be used if it is known
-  *                                       that the far end supports extended
-  *                                       dynamic range.
-  *                                       This must contain
-  *                                       <code>frame_size*channels</code>
-  *                                       samples.
-  * @param frame_size <tt>int</tt>: Number of samples per channel in the input
-  *                                 signal.
-  *                                 This must be an Oac frame size for the
-  *                                 encoder's sampling rate.
-  *                                 For example, at 48 kHz the permitted values
-  *                                 are 120, 240, 480, 960, 1920, and 2880.
-  *                                 Passing in a duration of less than 10 ms
-  *                                 (480 samples at 48 kHz) will prevent the
-  *                                 encoder from using the LPC or hybrid modes.
-  * @param[out] data <tt>unsigned char*</tt>: Output payload.
-  *                                           This must contain storage for at
-  *                                           least \a max_data_bytes.
-  * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
-  *                                                 memory for the output
-  *                                                 payload. This may be
-  *                                                 used to impose an upper limit on
-  *                                                 the instant bitrate, but should
-  *                                                 not be used as the only bitrate
-  *                                                 control. Use #OAC_SET_BITRATE to
-  *                                                 control the bitrate.
-  * @returns The length of the encoded packet (in bytes) on success or a
-  *          negative error code (see @ref oac_errorcodes) on failure.
-  */
+ * @param st <tt>OacMSEncoder*</tt>: Multistream encoder state.
+ * @param[in] pcm <tt>const float*</tt>: The input signal as interleaved
+ *                                       samples with a normal range of
+ *                                       +/-1.0.
+ *                                       Samples with a range beyond +/-1.0
+ *                                       are supported but will be clipped by
+ *                                       decoders using the integer API and
+ *                                       should only be used if it is known
+ *                                       that the far end supports extended
+ *                                       dynamic range.
+ *                                       This must contain
+ *                                       <code>frame_size*channels</code>
+ *                                       samples.
+ * @param frame_size <tt>int</tt>: Number of samples per channel in the input
+ *                                 signal.
+ *                                 This must be an Oac frame size for the
+ *                                 encoder's sampling rate.
+ *                                 For example, at 48 kHz the permitted values
+ *                                 are 120, 240, 480, 960, 1920, and 2880.
+ *                                 Passing in a duration of less than 10 ms
+ *                                 (480 samples at 48 kHz) will prevent the
+ *                                 encoder from using the LPC or hybrid modes.
+ * @param[out] data <tt>unsigned char*</tt>: Output payload.
+ *                                           This must contain storage for at
+ *                                           least \a max_data_bytes.
+ * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
+ *                                                 memory for the output
+ *                                                 payload. This may be
+ *                                                 used to impose an upper limit on
+ *                                                 the instant bitrate, but should
+ *                                                 not be used as the only bitrate
+ *                                                 control. Use #OAC_SET_BITRATE to
+ *                                                 control the bitrate.
+ * @returns The length of the encoded packet (in bytes) on success or a
+ *          negative error code (see @ref oac_errorcodes) on failure.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_multistream_encode_float(
-      OacMSEncoder *st,
-      const float *pcm,
-      int frame_size,
-      unsigned char *data,
-      oac_int32 max_data_bytes
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
+    OacMSEncoder *st,
+    const float *pcm,
+    int frame_size,
+    unsigned char *data,
+    oac_int32 max_data_bytes) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
 /** Frees an <code>OacMSEncoder</code> allocated by
-  * oac_multistream_encoder_create().
-  * @param st <tt>OacMSEncoder*</tt>: Multistream encoder state to be freed.
-  */
+ * oac_multistream_encoder_create().
+ * @param st <tt>OacMSEncoder*</tt>: Multistream encoder state to be freed.
+ */
 OAC_EXPORT void oac_multistream_encoder_destroy(OacMSEncoder *st);
 
 /** Perform a CTL function on a multistream Oac encoder.
-  *
-  * Generally the request and subsequent arguments are generated by a
-  * convenience macro.
-  * @param st <tt>OacMSEncoder*</tt>: Multistream encoder state.
-  * @param request This and all remaining parameters should be replaced by one
-  *                of the convenience macros in @ref oac_genericctls,
-  *                @ref oac_encoderctls, or @ref oac_multistream_ctls.
-  * @see oac_genericctls
-  * @see oac_encoderctls
-  * @see oac_multistream_ctls
-  */
+ *
+ * Generally the request and subsequent arguments are generated by a
+ * convenience macro.
+ * @param st <tt>OacMSEncoder*</tt>: Multistream encoder state.
+ * @param request This and all remaining parameters should be replaced by one
+ *                of the convenience macros in @ref oac_genericctls,
+ *                @ref oac_encoderctls, or @ref oac_multistream_ctls.
+ * @see oac_genericctls
+ * @see oac_encoderctls
+ * @see oac_multistream_ctls
+ */
 OAC_EXPORT int oac_multistream_encoder_ctl(OacMSEncoder *st, int request, ...) OAC_ARG_NONNULL(1);
 
 /**@}*/
@@ -491,238 +484,232 @@ OAC_EXPORT int oac_multistream_encoder_ctl(OacMSEncoder *st, int request, ...) O
 /**@{*/
 
 /** Gets the size of an <code>OacMSDecoder</code> structure.
-  * @param streams <tt>int</tt>: The total number of streams coded in the
-  *                              input.
-  *                              This must be no more than 255.
-  * @param coupled_streams <tt>int</tt>: Number streams to decode as coupled
-  *                                      (2 channel) streams.
-  *                                      This must be no larger than the total
-  *                                      number of streams.
-  *                                      Additionally, The total number of
-  *                                      coded channels (<code>streams +
-  *                                      coupled_streams</code>) must be no
-  *                                      more than 255.
-  * @returns The size in bytes on success, or a negative error code
-  *          (see @ref oac_errorcodes) on error.
-  */
+ * @param streams <tt>int</tt>: The total number of streams coded in the
+ *                              input.
+ *                              This must be no more than 255.
+ * @param coupled_streams <tt>int</tt>: Number streams to decode as coupled
+ *                                      (2 channel) streams.
+ *                                      This must be no larger than the total
+ *                                      number of streams.
+ *                                      Additionally, The total number of
+ *                                      coded channels (<code>streams +
+ *                                      coupled_streams</code>) must be no
+ *                                      more than 255.
+ * @returns The size in bytes on success, or a negative error code
+ *          (see @ref oac_errorcodes) on error.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_multistream_decoder_get_size(
-      int streams,
-      int coupled_streams
-);
+    int streams,
+    int coupled_streams);
 
 /** Allocates and initializes a multistream decoder state.
-  * Call oac_multistream_decoder_destroy() to release
-  * this object when finished.
-  * @param Fs <tt>oac_int32</tt>: Sampling rate to decode at (in Hz).
-  *                                This must be one of 8000, 12000, 16000,
-  *                                24000, or 48000.
-  * @param channels <tt>int</tt>: Number of channels to output.
-  *                               This must be at most 255.
-  *                               It may be different from the number of coded
-  *                               channels (<code>streams +
-  *                               coupled_streams</code>).
-  * @param streams <tt>int</tt>: The total number of streams coded in the
-  *                              input.
-  *                              This must be no more than 255.
-  * @param coupled_streams <tt>int</tt>: Number of streams to decode as coupled
-  *                                      (2 channel) streams.
-  *                                      This must be no larger than the total
-  *                                      number of streams.
-  *                                      Additionally, The total number of
-  *                                      coded channels (<code>streams +
-  *                                      coupled_streams</code>) must be no
-  *                                      more than 255.
-  * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
-  *                    coded channels to output channels, as described in
-  *                    @ref oac_multistream.
-  * @param[out] error <tt>int *</tt>: Returns #OAC_OK on success, or an error
-  *                                   code (see @ref oac_errorcodes) on
-  *                                   failure.
-  */
+ * Call oac_multistream_decoder_destroy() to release
+ * this object when finished.
+ * @param Fs <tt>oac_int32</tt>: Sampling rate to decode at (in Hz).
+ *                                This must be one of 8000, 12000, 16000,
+ *                                24000, or 48000.
+ * @param channels <tt>int</tt>: Number of channels to output.
+ *                               This must be at most 255.
+ *                               It may be different from the number of coded
+ *                               channels (<code>streams +
+ *                               coupled_streams</code>).
+ * @param streams <tt>int</tt>: The total number of streams coded in the
+ *                              input.
+ *                              This must be no more than 255.
+ * @param coupled_streams <tt>int</tt>: Number of streams to decode as coupled
+ *                                      (2 channel) streams.
+ *                                      This must be no larger than the total
+ *                                      number of streams.
+ *                                      Additionally, The total number of
+ *                                      coded channels (<code>streams +
+ *                                      coupled_streams</code>) must be no
+ *                                      more than 255.
+ * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
+ *                    coded channels to output channels, as described in
+ *                    @ref oac_multistream.
+ * @param[out] error <tt>int *</tt>: Returns #OAC_OK on success, or an error
+ *                                   code (see @ref oac_errorcodes) on
+ *                                   failure.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT OacMSDecoder *oac_multistream_decoder_create(
-      oac_int32 Fs,
-      int channels,
-      int streams,
-      int coupled_streams,
-      const unsigned char *mapping,
-      int *error
-) OAC_ARG_NONNULL(5);
+    oac_int32 Fs,
+    int channels,
+    int streams,
+    int coupled_streams,
+    const unsigned char *mapping,
+    int *error) OAC_ARG_NONNULL(5);
 
 /** Initialize a previously allocated decoder state object.
-  * The memory pointed to by \a st must be at least the size returned by
-  * oac_multistream_encoder_get_size().
-  * This is intended for applications which use their own allocator instead of
-  * malloc.
-  * To reset a previously initialized state, use the #OAC_RESET_STATE CTL.
-  * @see oac_multistream_decoder_create
-  * @see oac_multistream_deocder_get_size
-  * @param st <tt>OacMSEncoder*</tt>: Multistream encoder state to initialize.
-  * @param Fs <tt>oac_int32</tt>: Sampling rate to decode at (in Hz).
-  *                                This must be one of 8000, 12000, 16000,
-  *                                24000, or 48000.
-  * @param channels <tt>int</tt>: Number of channels to output.
-  *                               This must be at most 255.
-  *                               It may be different from the number of coded
-  *                               channels (<code>streams +
-  *                               coupled_streams</code>).
-  * @param streams <tt>int</tt>: The total number of streams coded in the
-  *                              input.
-  *                              This must be no more than 255.
-  * @param coupled_streams <tt>int</tt>: Number of streams to decode as coupled
-  *                                      (2 channel) streams.
-  *                                      This must be no larger than the total
-  *                                      number of streams.
-  *                                      Additionally, The total number of
-  *                                      coded channels (<code>streams +
-  *                                      coupled_streams</code>) must be no
-  *                                      more than 255.
-  * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
-  *                    coded channels to output channels, as described in
-  *                    @ref oac_multistream.
-  * @returns #OAC_OK on success, or an error code (see @ref oac_errorcodes)
-  *          on failure.
-  */
+ * The memory pointed to by \a st must be at least the size returned by
+ * oac_multistream_encoder_get_size().
+ * This is intended for applications which use their own allocator instead of
+ * malloc.
+ * To reset a previously initialized state, use the #OAC_RESET_STATE CTL.
+ * @see oac_multistream_decoder_create
+ * @see oac_multistream_deocder_get_size
+ * @param st <tt>OacMSEncoder*</tt>: Multistream encoder state to initialize.
+ * @param Fs <tt>oac_int32</tt>: Sampling rate to decode at (in Hz).
+ *                                This must be one of 8000, 12000, 16000,
+ *                                24000, or 48000.
+ * @param channels <tt>int</tt>: Number of channels to output.
+ *                               This must be at most 255.
+ *                               It may be different from the number of coded
+ *                               channels (<code>streams +
+ *                               coupled_streams</code>).
+ * @param streams <tt>int</tt>: The total number of streams coded in the
+ *                              input.
+ *                              This must be no more than 255.
+ * @param coupled_streams <tt>int</tt>: Number of streams to decode as coupled
+ *                                      (2 channel) streams.
+ *                                      This must be no larger than the total
+ *                                      number of streams.
+ *                                      Additionally, The total number of
+ *                                      coded channels (<code>streams +
+ *                                      coupled_streams</code>) must be no
+ *                                      more than 255.
+ * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
+ *                    coded channels to output channels, as described in
+ *                    @ref oac_multistream.
+ * @returns #OAC_OK on success, or an error code (see @ref oac_errorcodes)
+ *          on failure.
+ */
 OAC_EXPORT int oac_multistream_decoder_init(
-      OacMSDecoder *st,
-      oac_int32 Fs,
-      int channels,
-      int streams,
-      int coupled_streams,
-      const unsigned char *mapping
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(6);
+    OacMSDecoder *st,
+    oac_int32 Fs,
+    int channels,
+    int streams,
+    int coupled_streams,
+    const unsigned char *mapping) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(6);
 
 /** Decode a multistream Oac packet.
-  * @param st <tt>OacMSDecoder*</tt>: Multistream decoder state.
-  * @param[in] data <tt>const unsigned char*</tt>: Input payload.
-  *                                                Use a <code>NULL</code>
-  *                                                pointer to indicate packet
-  *                                                loss.
-  * @param len <tt>oac_int32</tt>: Number of bytes in payload.
-  * @param[out] pcm <tt>oac_int16*</tt>: Output signal, with interleaved
-  *                                       samples.
-  *                                       This must contain room for
-  *                                       <code>frame_size*channels</code>
-  *                                       samples.
-  * @param frame_size <tt>int</tt>: The number of samples per channel of
-  *                                 available space in \a pcm.
-  *                                 If this is less than the maximum packet duration
-  *                                 (120 ms; 5760 for 48kHz), this function will not be capable
-  *                                 of decoding some packets. In the case of PLC (data==NULL)
-  *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
-  *                                 the duration of audio that is missing, otherwise the
-  *                                 decoder will not be in the optimal state to decode the
-  *                                 next incoming packet. For the PLC and FEC cases, frame_size
-  *                                 <b>must</b> be a multiple of 2.5 ms.
-  * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
-  *                                 forward error correction data be decoded.
-  *                                 If no such data is available, the frame is
-  *                                 decoded as if it were lost.
-  * @returns Number of samples decoded on success or a negative error code
-  *          (see @ref oac_errorcodes) on failure.
-  */
+ * @param st <tt>OacMSDecoder*</tt>: Multistream decoder state.
+ * @param[in] data <tt>const unsigned char*</tt>: Input payload.
+ *                                                Use a <code>NULL</code>
+ *                                                pointer to indicate packet
+ *                                                loss.
+ * @param len <tt>oac_int32</tt>: Number of bytes in payload.
+ * @param[out] pcm <tt>oac_int16*</tt>: Output signal, with interleaved
+ *                                       samples.
+ *                                       This must contain room for
+ *                                       <code>frame_size*channels</code>
+ *                                       samples.
+ * @param frame_size <tt>int</tt>: The number of samples per channel of
+ *                                 available space in \a pcm.
+ *                                 If this is less than the maximum packet duration
+ *                                 (120 ms; 5760 for 48kHz), this function will not be capable
+ *                                 of decoding some packets. In the case of PLC (data==NULL)
+ *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
+ *                                 the duration of audio that is missing, otherwise the
+ *                                 decoder will not be in the optimal state to decode the
+ *                                 next incoming packet. For the PLC and FEC cases, frame_size
+ *                                 <b>must</b> be a multiple of 2.5 ms.
+ * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
+ *                                 forward error correction data be decoded.
+ *                                 If no such data is available, the frame is
+ *                                 decoded as if it were lost.
+ * @returns Number of samples decoded on success or a negative error code
+ *          (see @ref oac_errorcodes) on failure.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_multistream_decode(
     OacMSDecoder *st,
     const unsigned char *data,
     oac_int32 len,
     oac_int16 *pcm,
     int frame_size,
-    int decode_fec
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
+    int decode_fec) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
 /** Decode a multistream Oac packet.
-  * @param st <tt>OacMSDecoder*</tt>: Multistream decoder state.
-  * @param[in] data <tt>const unsigned char*</tt>: Input payload.
-  *                                                Use a <code>NULL</code>
-  *                                                pointer to indicate packet
-  *                                                loss.
-  * @param len <tt>oac_int32</tt>: Number of bytes in payload.
-  * @param[out] pcm <tt>oac_int32*</tt>: Output signal, with interleaved
-  *                                       samples representing (or slightly exceeding) 24-bit values.
-  *                                       This must contain room for
-  *                                       <code>frame_size*channels</code>
-  *                                       samples.
-  * @param frame_size <tt>int</tt>: The number of samples per channel of
-  *                                 available space in \a pcm.
-  *                                 If this is less than the maximum packet duration
-  *                                 (120 ms; 5760 for 48kHz), this function will not be capable
-  *                                 of decoding some packets. In the case of PLC (data==NULL)
-  *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
-  *                                 the duration of audio that is missing, otherwise the
-  *                                 decoder will not be in the optimal state to decode the
-  *                                 next incoming packet. For the PLC and FEC cases, frame_size
-  *                                 <b>must</b> be a multiple of 2.5 ms.
-  * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
-  *                                 forward error correction data be decoded.
-  *                                 If no such data is available, the frame is
-  *                                 decoded as if it were lost.
-  * @returns Number of samples decoded on success or a negative error code
-  *          (see @ref oac_errorcodes) on failure.
-  */
+ * @param st <tt>OacMSDecoder*</tt>: Multistream decoder state.
+ * @param[in] data <tt>const unsigned char*</tt>: Input payload.
+ *                                                Use a <code>NULL</code>
+ *                                                pointer to indicate packet
+ *                                                loss.
+ * @param len <tt>oac_int32</tt>: Number of bytes in payload.
+ * @param[out] pcm <tt>oac_int32*</tt>: Output signal, with interleaved
+ *                                       samples representing (or slightly exceeding) 24-bit values.
+ *                                       This must contain room for
+ *                                       <code>frame_size*channels</code>
+ *                                       samples.
+ * @param frame_size <tt>int</tt>: The number of samples per channel of
+ *                                 available space in \a pcm.
+ *                                 If this is less than the maximum packet duration
+ *                                 (120 ms; 5760 for 48kHz), this function will not be capable
+ *                                 of decoding some packets. In the case of PLC (data==NULL)
+ *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
+ *                                 the duration of audio that is missing, otherwise the
+ *                                 decoder will not be in the optimal state to decode the
+ *                                 next incoming packet. For the PLC and FEC cases, frame_size
+ *                                 <b>must</b> be a multiple of 2.5 ms.
+ * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
+ *                                 forward error correction data be decoded.
+ *                                 If no such data is available, the frame is
+ *                                 decoded as if it were lost.
+ * @returns Number of samples decoded on success or a negative error code
+ *          (see @ref oac_errorcodes) on failure.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_multistream_decode24(
     OacMSDecoder *st,
     const unsigned char *data,
     oac_int32 len,
     oac_int32 *pcm,
     int frame_size,
-    int decode_fec
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
+    int decode_fec) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
 /** Decode a multistream Oac packet with floating point output.
-  * @param st <tt>OacMSDecoder*</tt>: Multistream decoder state.
-  * @param[in] data <tt>const unsigned char*</tt>: Input payload.
-  *                                                Use a <code>NULL</code>
-  *                                                pointer to indicate packet
-  *                                                loss.
-  * @param len <tt>oac_int32</tt>: Number of bytes in payload.
-  * @param[out] pcm <tt>oac_int16*</tt>: Output signal, with interleaved
-  *                                       samples.
-  *                                       This must contain room for
-  *                                       <code>frame_size*channels</code>
-  *                                       samples.
-  * @param frame_size <tt>int</tt>: The number of samples per channel of
-  *                                 available space in \a pcm.
-  *                                 If this is less than the maximum packet duration
-  *                                 (120 ms; 5760 for 48kHz), this function will not be capable
-  *                                 of decoding some packets. In the case of PLC (data==NULL)
-  *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
-  *                                 the duration of audio that is missing, otherwise the
-  *                                 decoder will not be in the optimal state to decode the
-  *                                 next incoming packet. For the PLC and FEC cases, frame_size
-  *                                 <b>must</b> be a multiple of 2.5 ms.
-  * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
-  *                                 forward error correction data be decoded.
-  *                                 If no such data is available, the frame is
-  *                                 decoded as if it were lost.
-  * @returns Number of samples decoded on success or a negative error code
-  *          (see @ref oac_errorcodes) on failure.
-  */
+ * @param st <tt>OacMSDecoder*</tt>: Multistream decoder state.
+ * @param[in] data <tt>const unsigned char*</tt>: Input payload.
+ *                                                Use a <code>NULL</code>
+ *                                                pointer to indicate packet
+ *                                                loss.
+ * @param len <tt>oac_int32</tt>: Number of bytes in payload.
+ * @param[out] pcm <tt>oac_int16*</tt>: Output signal, with interleaved
+ *                                       samples.
+ *                                       This must contain room for
+ *                                       <code>frame_size*channels</code>
+ *                                       samples.
+ * @param frame_size <tt>int</tt>: The number of samples per channel of
+ *                                 available space in \a pcm.
+ *                                 If this is less than the maximum packet duration
+ *                                 (120 ms; 5760 for 48kHz), this function will not be capable
+ *                                 of decoding some packets. In the case of PLC (data==NULL)
+ *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
+ *                                 the duration of audio that is missing, otherwise the
+ *                                 decoder will not be in the optimal state to decode the
+ *                                 next incoming packet. For the PLC and FEC cases, frame_size
+ *                                 <b>must</b> be a multiple of 2.5 ms.
+ * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
+ *                                 forward error correction data be decoded.
+ *                                 If no such data is available, the frame is
+ *                                 decoded as if it were lost.
+ * @returns Number of samples decoded on success or a negative error code
+ *          (see @ref oac_errorcodes) on failure.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_multistream_decode_float(
     OacMSDecoder *st,
     const unsigned char *data,
     oac_int32 len,
     float *pcm,
     int frame_size,
-    int decode_fec
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
+    int decode_fec) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
 /** Perform a CTL function on a multistream Oac decoder.
-  *
-  * Generally the request and subsequent arguments are generated by a
-  * convenience macro.
-  * @param st <tt>OacMSDecoder*</tt>: Multistream decoder state.
-  * @param request This and all remaining parameters should be replaced by one
-  *                of the convenience macros in @ref oac_genericctls,
-  *                @ref oac_decoderctls, or @ref oac_multistream_ctls.
-  * @see oac_genericctls
-  * @see oac_decoderctls
-  * @see oac_multistream_ctls
-  */
+ *
+ * Generally the request and subsequent arguments are generated by a
+ * convenience macro.
+ * @param st <tt>OacMSDecoder*</tt>: Multistream decoder state.
+ * @param request This and all remaining parameters should be replaced by one
+ *                of the convenience macros in @ref oac_genericctls,
+ *                @ref oac_decoderctls, or @ref oac_multistream_ctls.
+ * @see oac_genericctls
+ * @see oac_decoderctls
+ * @see oac_multistream_ctls
+ */
 OAC_EXPORT int oac_multistream_decoder_ctl(OacMSDecoder *st, int request, ...) OAC_ARG_NONNULL(1);
 
 /** Frees an <code>OacMSDecoder</code> allocated by
-  * oac_multistream_decoder_create().
-  * @param st <tt>OacMSDecoder</tt>: Multistream decoder state to be freed.
-  */
+ * oac_multistream_decoder_create().
+ * @param st <tt>OacMSDecoder</tt>: Multistream decoder state to be freed.
+ */
 OAC_EXPORT void oac_multistream_decoder_destroy(OacMSDecoder *st);
 
 /**@}*/
diff --git a/include/oac_projection.h b/include/oac_projection.h
index 7846607ba..44ea59ed3 100644
--- a/include/oac_projection.h
+++ b/include/oac_projection.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 /**
  * @file oac_projection.h
@@ -42,8 +42,8 @@ extern "C" {
 /** @cond OAC_INTERNAL_DOC */
 
 /** These are the actual encoder and decoder CTL ID numbers.
-  * They should not be used directly by applications.c
-  * In general, SETs should be even and GETs should be odd.*/
+ * They should not be used directly by applications.c
+ * In general, SETs should be even and GETs should be odd.*/
 /**@{*/
 #define OAC_PROJECTION_GET_DEMIXING_MATRIX_GAIN_REQUEST    6001
 #define OAC_PROJECTION_GET_DEMIXING_MATRIX_SIZE_REQUEST    6003
@@ -54,40 +54,40 @@ extern "C" {
 /** @endcond */
 
 /** @defgroup oac_projection_ctls Projection specific encoder and decoder CTLs
-  *
-  * These are convenience macros that are specific to the
-  * oac_projection_encoder_ctl() and oac_projection_decoder_ctl()
-  * interface.
-  * The CTLs from @ref oac_genericctls, @ref oac_encoderctls,
-  * @ref oac_decoderctls, and @ref oac_multistream_ctls may be applied to a
-  * projection encoder or decoder as well.
-  */
+ *
+ * These are convenience macros that are specific to the
+ * oac_projection_encoder_ctl() and oac_projection_decoder_ctl()
+ * interface.
+ * The CTLs from @ref oac_genericctls, @ref oac_encoderctls,
+ * @ref oac_decoderctls, and @ref oac_multistream_ctls may be applied to a
+ * projection encoder or decoder as well.
+ */
 /**@{*/
 
 /** Gets the gain (in dB. S7.8-format) of the demixing matrix from the encoder.
-  * @param[out] x <tt>oac_int32 *</tt>: Returns the gain (in dB. S7.8-format)
-  *                                      of the demixing matrix.
-  * @hideinitializer
-  */
+ * @param[out] x <tt>oac_int32 *</tt>: Returns the gain (in dB. S7.8-format)
+ *                                      of the demixing matrix.
+ * @hideinitializer
+ */
 #define OAC_PROJECTION_GET_DEMIXING_MATRIX_GAIN(x) OAC_PROJECTION_GET_DEMIXING_MATRIX_GAIN_REQUEST, oac_check_int_ptr(x)
 
 
 /** Gets the size in bytes of the demixing matrix from the encoder.
-  * @param[out] x <tt>oac_int32 *</tt>: Returns the size in bytes of the
-  *                                      demixing matrix.
-  * @hideinitializer
-  */
+ * @param[out] x <tt>oac_int32 *</tt>: Returns the size in bytes of the
+ *                                      demixing matrix.
+ * @hideinitializer
+ */
 #define OAC_PROJECTION_GET_DEMIXING_MATRIX_SIZE(x) OAC_PROJECTION_GET_DEMIXING_MATRIX_SIZE_REQUEST, oac_check_int_ptr(x)
 
 
 /** Copies the demixing matrix to the supplied pointer location.
-  * @param[out] x <tt>unsigned char *</tt>: Returns the demixing matrix to the
-  *                                         supplied pointer location.
-  * @param y <tt>oac_int32</tt>: The size in bytes of the reserved memory at the
-  *                              pointer location.
-  * @hideinitializer
-  */
-#define OAC_PROJECTION_GET_DEMIXING_MATRIX(x,y) OAC_PROJECTION_GET_DEMIXING_MATRIX_REQUEST, x, oac_check_int(y)
+ * @param[out] x <tt>unsigned char *</tt>: Returns the demixing matrix to the
+ *                                         supplied pointer location.
+ * @param y <tt>oac_int32</tt>: The size in bytes of the reserved memory at the
+ *                              pointer location.
+ * @hideinitializer
+ */
+#define OAC_PROJECTION_GET_DEMIXING_MATRIX(x, y) OAC_PROJECTION_GET_DEMIXING_MATRIX_REQUEST, x, oac_check_int(y)
 
 
 /**@}*/
@@ -101,11 +101,11 @@ typedef struct OacProjectionEncoder OacProjectionEncoder;
 
 
 /** Oac projection decoder state.
-  * This contains the complete state of a projection Oac decoder.
-  * It is position independent and can be freely copied.
-  * @see oac_projection_decoder_create
-  * @see oac_projection_decoder_init
-  */
+ * This contains the complete state of a projection Oac decoder.
+ * It is position independent and can be freely copied.
+ * @see oac_projection_decoder_create
+ * @see oac_projection_decoder_init
+ */
 typedef struct OacProjectionDecoder OacProjectionDecoder;
 
 
@@ -113,51 +113,50 @@ typedef struct OacProjectionDecoder OacProjectionDecoder;
 /**@{*/
 
 /** Gets the size of an OacProjectionEncoder structure.
-  * @param channels <tt>int</tt>: The total number of input channels to encode.
-  *                               This must be no more than 255.
-  * @param mapping_family <tt>int</tt>: The mapping family to use for selecting
-  *                                     the appropriate projection.
-  * @returns The size in bytes on success, or a negative error code
-  *          (see @ref oac_errorcodes) on error.
-  */
+ * @param channels <tt>int</tt>: The total number of input channels to encode.
+ *                               This must be no more than 255.
+ * @param mapping_family <tt>int</tt>: The mapping family to use for selecting
+ *                                     the appropriate projection.
+ * @returns The size in bytes on success, or a negative error code
+ *          (see @ref oac_errorcodes) on error.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_projection_ambisonics_encoder_get_size(
     int channels,
-    int mapping_family
-);
+    int mapping_family);
 
 
 /** Allocates and initializes a projection encoder state.
-  * Call oac_projection_encoder_destroy() to release
-  * this object when finished.
-  * @param Fs <tt>oac_int32</tt>: Sampling rate of the input signal (in Hz).
-  *                                This must be one of 8000, 12000, 16000,
-  *                                24000, or 48000.
-  * @param channels <tt>int</tt>: Number of channels in the input signal.
-  *                               This must be at most 255.
-  *                               It may be greater than the number of
-  *                               coded channels (<code>streams +
-  *                               coupled_streams</code>).
-  * @param mapping_family <tt>int</tt>: The mapping family to use for selecting
-  *                                     the appropriate projection.
-  * @param[out] streams <tt>int *</tt>: The total number of streams that will
-  *                                     be encoded from the input.
-  * @param[out] coupled_streams <tt>int *</tt>: Number of coupled (2 channel)
-  *                                 streams that will be encoded from the input.
-  * @param application <tt>int</tt>: The target encoder application.
-  *                                  This must be one of the following:
-  * <dl>
-  * <dt>#OAC_APPLICATION_VOIP</dt>
-  * <dd>Process signal for improved speech intelligibility.</dd>
-  * <dt>#OAC_APPLICATION_AUDIO</dt>
-  * <dd>Favor faithfulness to the original input.</dd>
-  * <dt>#OAC_APPLICATION_RESTRICTED_LOWDELAY</dt>
-  * <dd>Configure the minimum possible coding delay by disabling certain modes
-  * of operation.</dd>
-  * </dl>
-  * @param[out] error <tt>int *</tt>: Returns #OAC_OK on success, or an error
-  *                                   code (see @ref oac_errorcodes) on
-  *                                   failure.
-  */
+ * Call oac_projection_encoder_destroy() to release
+ * this object when finished.
+ * @param Fs <tt>oac_int32</tt>: Sampling rate of the input signal (in Hz).
+ *                                This must be one of 8000, 12000, 16000,
+ *                                24000, or 48000.
+ * @param channels <tt>int</tt>: Number of channels in the input signal.
+ *                               This must be at most 255.
+ *                               It may be greater than the number of
+ *                               coded channels (<code>streams +
+ *                               coupled_streams</code>).
+ * @param mapping_family <tt>int</tt>: The mapping family to use for selecting
+ *                                     the appropriate projection.
+ * @param[out] streams <tt>int *</tt>: The total number of streams that will
+ *                                     be encoded from the input.
+ * @param[out] coupled_streams <tt>int *</tt>: Number of coupled (2 channel)
+ *                                 streams that will be encoded from the input.
+ * @param application <tt>int</tt>: The target encoder application.
+ *                                  This must be one of the following:
+ * <dl>
+ * <dt>#OAC_APPLICATION_VOIP</dt>
+ * <dd>Process signal for improved speech intelligibility.</dd>
+ * <dt>#OAC_APPLICATION_AUDIO</dt>
+ * <dd>Favor faithfulness to the original input.</dd>
+ * <dt>#OAC_APPLICATION_RESTRICTED_LOWDELAY</dt>
+ * <dd>Configure the minimum possible coding delay by disabling certain modes
+ * of operation.</dd>
+ * </dl>
+ * @param[out] error <tt>int *</tt>: Returns #OAC_OK on success, or an error
+ *                                   code (see @ref oac_errorcodes) on
+ *                                   failure.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT OacProjectionEncoder *oac_projection_ambisonics_encoder_create(
     oac_int32 Fs,
     int channels,
@@ -165,52 +164,51 @@ OAC_EXPORT OAC_WARN_UNUSED_RESULT OacProjectionEncoder *oac_projection_ambisonic
     int *streams,
     int *coupled_streams,
     int application,
-    int *error
-) OAC_ARG_NONNULL(4) OAC_ARG_NONNULL(5);
+    int *error) OAC_ARG_NONNULL(4) OAC_ARG_NONNULL(5);
 
 
 /** Initialize a previously allocated projection encoder state.
-  * The memory pointed to by \a st must be at least the size returned by
-  * oac_projection_ambisonics_encoder_get_size().
-  * This is intended for applications which use their own allocator instead of
-  * malloc.
-  * To reset a previously initialized state, use the #OAC_RESET_STATE CTL.
-  * @see oac_projection_ambisonics_encoder_create
-  * @see oac_projection_ambisonics_encoder_get_size
-  * @param st <tt>OacProjectionEncoder*</tt>: Projection encoder state to initialize.
-  * @param Fs <tt>oac_int32</tt>: Sampling rate of the input signal (in Hz).
-  *                                This must be one of 8000, 12000, 16000,
-  *                                24000, or 48000.
-  * @param channels <tt>int</tt>: Number of channels in the input signal.
-  *                               This must be at most 255.
-  *                               It may be greater than the number of
-  *                               coded channels (<code>streams +
-  *                               coupled_streams</code>).
-  * @param streams <tt>int</tt>: The total number of streams to encode from the
-  *                              input.
-  *                              This must be no more than the number of channels.
-  * @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
-  *                                      to encode.
-  *                                      This must be no larger than the total
-  *                                      number of streams.
-  *                                      Additionally, The total number of
-  *                                      encoded channels (<code>streams +
-  *                                      coupled_streams</code>) must be no
-  *                                      more than the number of input channels.
-  * @param application <tt>int</tt>: The target encoder application.
-  *                                  This must be one of the following:
-  * <dl>
-  * <dt>#OAC_APPLICATION_VOIP</dt>
-  * <dd>Process signal for improved speech intelligibility.</dd>
-  * <dt>#OAC_APPLICATION_AUDIO</dt>
-  * <dd>Favor faithfulness to the original input.</dd>
-  * <dt>#OAC_APPLICATION_RESTRICTED_LOWDELAY</dt>
-  * <dd>Configure the minimum possible coding delay by disabling certain modes
-  * of operation.</dd>
-  * </dl>
-  * @returns #OAC_OK on success, or an error code (see @ref oac_errorcodes)
-  *          on failure.
-  */
+ * The memory pointed to by \a st must be at least the size returned by
+ * oac_projection_ambisonics_encoder_get_size().
+ * This is intended for applications which use their own allocator instead of
+ * malloc.
+ * To reset a previously initialized state, use the #OAC_RESET_STATE CTL.
+ * @see oac_projection_ambisonics_encoder_create
+ * @see oac_projection_ambisonics_encoder_get_size
+ * @param st <tt>OacProjectionEncoder*</tt>: Projection encoder state to initialize.
+ * @param Fs <tt>oac_int32</tt>: Sampling rate of the input signal (in Hz).
+ *                                This must be one of 8000, 12000, 16000,
+ *                                24000, or 48000.
+ * @param channels <tt>int</tt>: Number of channels in the input signal.
+ *                               This must be at most 255.
+ *                               It may be greater than the number of
+ *                               coded channels (<code>streams +
+ *                               coupled_streams</code>).
+ * @param streams <tt>int</tt>: The total number of streams to encode from the
+ *                              input.
+ *                              This must be no more than the number of channels.
+ * @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
+ *                                      to encode.
+ *                                      This must be no larger than the total
+ *                                      number of streams.
+ *                                      Additionally, The total number of
+ *                                      encoded channels (<code>streams +
+ *                                      coupled_streams</code>) must be no
+ *                                      more than the number of input channels.
+ * @param application <tt>int</tt>: The target encoder application.
+ *                                  This must be one of the following:
+ * <dl>
+ * <dt>#OAC_APPLICATION_VOIP</dt>
+ * <dd>Process signal for improved speech intelligibility.</dd>
+ * <dt>#OAC_APPLICATION_AUDIO</dt>
+ * <dd>Favor faithfulness to the original input.</dd>
+ * <dt>#OAC_APPLICATION_RESTRICTED_LOWDELAY</dt>
+ * <dd>Configure the minimum possible coding delay by disabling certain modes
+ * of operation.</dd>
+ * </dl>
+ * @returns #OAC_OK on success, or an error code (see @ref oac_errorcodes)
+ *          on failure.
+ */
 OAC_EXPORT int oac_projection_ambisonics_encoder_init(
     OacProjectionEncoder *st,
     oac_int32 Fs,
@@ -218,154 +216,150 @@ OAC_EXPORT int oac_projection_ambisonics_encoder_init(
     int mapping_family,
     int *streams,
     int *coupled_streams,
-    int application
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(5) OAC_ARG_NONNULL(6);
+    int application) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(5) OAC_ARG_NONNULL(6);
 
 
 /** Encodes a projection Oac frame.
-  * @param st <tt>OacProjectionEncoder*</tt>: Projection encoder state.
-  * @param[in] pcm <tt>const oac_int16*</tt>: The input signal as interleaved
-  *                                            samples.
-  *                                            This must contain
-  *                                            <code>frame_size*channels</code>
-  *                                            samples.
-  * @param frame_size <tt>int</tt>: Number of samples per channel in the input
-  *                                 signal.
-  *                                 This must be an Oac frame size for the
-  *                                 encoder's sampling rate.
-  *                                 For example, at 48 kHz the permitted values
-  *                                 are 120, 240, 480, 960, 1920, and 2880.
-  *                                 Passing in a duration of less than 10 ms
-  *                                 (480 samples at 48 kHz) will prevent the
-  *                                 encoder from using the LPC or hybrid modes.
-  * @param[out] data <tt>unsigned char*</tt>: Output payload.
-  *                                           This must contain storage for at
-  *                                           least \a max_data_bytes.
-  * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
-  *                                                 memory for the output
-  *                                                 payload. This may be
-  *                                                 used to impose an upper limit on
-  *                                                 the instant bitrate, but should
-  *                                                 not be used as the only bitrate
-  *                                                 control. Use #OAC_SET_BITRATE to
-  *                                                 control the bitrate.
-  * @returns The length of the encoded packet (in bytes) on success or a
-  *          negative error code (see @ref oac_errorcodes) on failure.
-  */
+ * @param st <tt>OacProjectionEncoder*</tt>: Projection encoder state.
+ * @param[in] pcm <tt>const oac_int16*</tt>: The input signal as interleaved
+ *                                            samples.
+ *                                            This must contain
+ *                                            <code>frame_size*channels</code>
+ *                                            samples.
+ * @param frame_size <tt>int</tt>: Number of samples per channel in the input
+ *                                 signal.
+ *                                 This must be an Oac frame size for the
+ *                                 encoder's sampling rate.
+ *                                 For example, at 48 kHz the permitted values
+ *                                 are 120, 240, 480, 960, 1920, and 2880.
+ *                                 Passing in a duration of less than 10 ms
+ *                                 (480 samples at 48 kHz) will prevent the
+ *                                 encoder from using the LPC or hybrid modes.
+ * @param[out] data <tt>unsigned char*</tt>: Output payload.
+ *                                           This must contain storage for at
+ *                                           least \a max_data_bytes.
+ * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
+ *                                                 memory for the output
+ *                                                 payload. This may be
+ *                                                 used to impose an upper limit on
+ *                                                 the instant bitrate, but should
+ *                                                 not be used as the only bitrate
+ *                                                 control. Use #OAC_SET_BITRATE to
+ *                                                 control the bitrate.
+ * @returns The length of the encoded packet (in bytes) on success or a
+ *          negative error code (see @ref oac_errorcodes) on failure.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_projection_encode(
     OacProjectionEncoder *st,
     const oac_int16 *pcm,
     int frame_size,
     unsigned char *data,
-    oac_int32 max_data_bytes
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
+    oac_int32 max_data_bytes) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
 /** Encodes a projection Oac frame.
-  * @param st <tt>OacProjectionEncoder*</tt>: Projection encoder state.
-  * @param[in] pcm <tt>const oac_int32*</tt>: The input signal as interleaved
-  *                                            samples representing (or slightly exceeding) 24-bit values.
-  *                                            This must contain
-  *                                            <code>frame_size*channels</code>
-  *                                            samples.
-  * @param frame_size <tt>int</tt>: Number of samples per channel in the input
-  *                                 signal.
-  *                                 This must be an Oac frame size for the
-  *                                 encoder's sampling rate.
-  *                                 For example, at 48 kHz the permitted values
-  *                                 are 120, 240, 480, 960, 1920, and 2880.
-  *                                 Passing in a duration of less than 10 ms
-  *                                 (480 samples at 48 kHz) will prevent the
-  *                                 encoder from using the LPC or hybrid modes.
-  * @param[out] data <tt>unsigned char*</tt>: Output payload.
-  *                                           This must contain storage for at
-  *                                           least \a max_data_bytes.
-  * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
-  *                                                 memory for the output
-  *                                                 payload. This may be
-  *                                                 used to impose an upper limit on
-  *                                                 the instant bitrate, but should
-  *                                                 not be used as the only bitrate
-  *                                                 control. Use #OAC_SET_BITRATE to
-  *                                                 control the bitrate.
-  * @returns The length of the encoded packet (in bytes) on success or a
-  *          negative error code (see @ref oac_errorcodes) on failure.
-  */
+ * @param st <tt>OacProjectionEncoder*</tt>: Projection encoder state.
+ * @param[in] pcm <tt>const oac_int32*</tt>: The input signal as interleaved
+ *                                            samples representing (or slightly exceeding) 24-bit values.
+ *                                            This must contain
+ *                                            <code>frame_size*channels</code>
+ *                                            samples.
+ * @param frame_size <tt>int</tt>: Number of samples per channel in the input
+ *                                 signal.
+ *                                 This must be an Oac frame size for the
+ *                                 encoder's sampling rate.
+ *                                 For example, at 48 kHz the permitted values
+ *                                 are 120, 240, 480, 960, 1920, and 2880.
+ *                                 Passing in a duration of less than 10 ms
+ *                                 (480 samples at 48 kHz) will prevent the
+ *                                 encoder from using the LPC or hybrid modes.
+ * @param[out] data <tt>unsigned char*</tt>: Output payload.
+ *                                           This must contain storage for at
+ *                                           least \a max_data_bytes.
+ * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
+ *                                                 memory for the output
+ *                                                 payload. This may be
+ *                                                 used to impose an upper limit on
+ *                                                 the instant bitrate, but should
+ *                                                 not be used as the only bitrate
+ *                                                 control. Use #OAC_SET_BITRATE to
+ *                                                 control the bitrate.
+ * @returns The length of the encoded packet (in bytes) on success or a
+ *          negative error code (see @ref oac_errorcodes) on failure.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_projection_encode24(
     OacProjectionEncoder *st,
     const oac_int32 *pcm,
     int frame_size,
     unsigned char *data,
-    oac_int32 max_data_bytes
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
+    oac_int32 max_data_bytes) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
 
 /** Encodes a projection Oac frame from floating point input.
-  * @param st <tt>OacProjectionEncoder*</tt>: Projection encoder state.
-  * @param[in] pcm <tt>const float*</tt>: The input signal as interleaved
-  *                                       samples with a normal range of
-  *                                       +/-1.0.
-  *                                       Samples with a range beyond +/-1.0
-  *                                       are supported but will be clipped by
-  *                                       decoders using the integer API and
-  *                                       should only be used if it is known
-  *                                       that the far end supports extended
-  *                                       dynamic range.
-  *                                       This must contain
-  *                                       <code>frame_size*channels</code>
-  *                                       samples.
-  * @param frame_size <tt>int</tt>: Number of samples per channel in the input
-  *                                 signal.
-  *                                 This must be an Oac frame size for the
-  *                                 encoder's sampling rate.
-  *                                 For example, at 48 kHz the permitted values
-  *                                 are 120, 240, 480, 960, 1920, and 2880.
-  *                                 Passing in a duration of less than 10 ms
-  *                                 (480 samples at 48 kHz) will prevent the
-  *                                 encoder from using the LPC or hybrid modes.
-  * @param[out] data <tt>unsigned char*</tt>: Output payload.
-  *                                           This must contain storage for at
-  *                                           least \a max_data_bytes.
-  * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
-  *                                                 memory for the output
-  *                                                 payload. This may be
-  *                                                 used to impose an upper limit on
-  *                                                 the instant bitrate, but should
-  *                                                 not be used as the only bitrate
-  *                                                 control. Use #OAC_SET_BITRATE to
-  *                                                 control the bitrate.
-  * @returns The length of the encoded packet (in bytes) on success or a
-  *          negative error code (see @ref oac_errorcodes) on failure.
-  */
+ * @param st <tt>OacProjectionEncoder*</tt>: Projection encoder state.
+ * @param[in] pcm <tt>const float*</tt>: The input signal as interleaved
+ *                                       samples with a normal range of
+ *                                       +/-1.0.
+ *                                       Samples with a range beyond +/-1.0
+ *                                       are supported but will be clipped by
+ *                                       decoders using the integer API and
+ *                                       should only be used if it is known
+ *                                       that the far end supports extended
+ *                                       dynamic range.
+ *                                       This must contain
+ *                                       <code>frame_size*channels</code>
+ *                                       samples.
+ * @param frame_size <tt>int</tt>: Number of samples per channel in the input
+ *                                 signal.
+ *                                 This must be an Oac frame size for the
+ *                                 encoder's sampling rate.
+ *                                 For example, at 48 kHz the permitted values
+ *                                 are 120, 240, 480, 960, 1920, and 2880.
+ *                                 Passing in a duration of less than 10 ms
+ *                                 (480 samples at 48 kHz) will prevent the
+ *                                 encoder from using the LPC or hybrid modes.
+ * @param[out] data <tt>unsigned char*</tt>: Output payload.
+ *                                           This must contain storage for at
+ *                                           least \a max_data_bytes.
+ * @param [in] max_data_bytes <tt>oac_int32</tt>: Size of the allocated
+ *                                                 memory for the output
+ *                                                 payload. This may be
+ *                                                 used to impose an upper limit on
+ *                                                 the instant bitrate, but should
+ *                                                 not be used as the only bitrate
+ *                                                 control. Use #OAC_SET_BITRATE to
+ *                                                 control the bitrate.
+ * @returns The length of the encoded packet (in bytes) on success or a
+ *          negative error code (see @ref oac_errorcodes) on failure.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_projection_encode_float(
     OacProjectionEncoder *st,
     const float *pcm,
     int frame_size,
     unsigned char *data,
-    oac_int32 max_data_bytes
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
+    oac_int32 max_data_bytes) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(2) OAC_ARG_NONNULL(4);
 
 
 /** Frees an <code>OacProjectionEncoder</code> allocated by
-  * oac_projection_ambisonics_encoder_create().
-  * @param st <tt>OacProjectionEncoder*</tt>: Projection encoder state to be freed.
-  */
+ * oac_projection_ambisonics_encoder_create().
+ * @param st <tt>OacProjectionEncoder*</tt>: Projection encoder state to be freed.
+ */
 OAC_EXPORT void oac_projection_encoder_destroy(OacProjectionEncoder *st);
 
 
 /** Perform a CTL function on a projection Oac encoder.
-  *
-  * Generally the request and subsequent arguments are generated by a
-  * convenience macro.
-  * @param st <tt>OacProjectionEncoder*</tt>: Projection encoder state.
-  * @param request This and all remaining parameters should be replaced by one
-  *                of the convenience macros in @ref oac_genericctls,
-  *                @ref oac_encoderctls, @ref oac_multistream_ctls, or
-  *                @ref oac_projection_ctls
-  * @see oac_genericctls
-  * @see oac_encoderctls
-  * @see oac_multistream_ctls
-  * @see oac_projection_ctls
-  */
+ *
+ * Generally the request and subsequent arguments are generated by a
+ * convenience macro.
+ * @param st <tt>OacProjectionEncoder*</tt>: Projection encoder state.
+ * @param request This and all remaining parameters should be replaced by one
+ *                of the convenience macros in @ref oac_genericctls,
+ *                @ref oac_encoderctls, @ref oac_multistream_ctls, or
+ *                @ref oac_projection_ctls
+ * @see oac_genericctls
+ * @see oac_encoderctls
+ * @see oac_multistream_ctls
+ * @see oac_projection_ctls
+ */
 OAC_EXPORT int oac_projection_encoder_ctl(OacProjectionEncoder *st, int request, ...) OAC_ARG_NONNULL(1);
 
 
@@ -375,63 +369,62 @@ OAC_EXPORT int oac_projection_encoder_ctl(OacProjectionEncoder *st, int request,
 /**@{*/
 
 /** Gets the size of an <code>OacProjectionDecoder</code> structure.
-  * @param channels <tt>int</tt>: The total number of output channels.
-  *                               This must be no more than 255.
-  * @param streams <tt>int</tt>: The total number of streams coded in the
-  *                              input.
-  *                              This must be no more than 255.
-  * @param coupled_streams <tt>int</tt>: Number streams to decode as coupled
-  *                                      (2 channel) streams.
-  *                                      This must be no larger than the total
-  *                                      number of streams.
-  *                                      Additionally, The total number of
-  *                                      coded channels (<code>streams +
-  *                                      coupled_streams</code>) must be no
-  *                                      more than 255.
-  * @returns The size in bytes on success, or a negative error code
-  *          (see @ref oac_errorcodes) on error.
-  */
+ * @param channels <tt>int</tt>: The total number of output channels.
+ *                               This must be no more than 255.
+ * @param streams <tt>int</tt>: The total number of streams coded in the
+ *                              input.
+ *                              This must be no more than 255.
+ * @param coupled_streams <tt>int</tt>: Number streams to decode as coupled
+ *                                      (2 channel) streams.
+ *                                      This must be no larger than the total
+ *                                      number of streams.
+ *                                      Additionally, The total number of
+ *                                      coded channels (<code>streams +
+ *                                      coupled_streams</code>) must be no
+ *                                      more than 255.
+ * @returns The size in bytes on success, or a negative error code
+ *          (see @ref oac_errorcodes) on error.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT oac_int32 oac_projection_decoder_get_size(
     int channels,
     int streams,
-    int coupled_streams
-);
+    int coupled_streams);
 
 
 /** Allocates and initializes a projection decoder state.
-  * Call oac_projection_decoder_destroy() to release
-  * this object when finished.
-  * @param Fs <tt>oac_int32</tt>: Sampling rate to decode at (in Hz).
-  *                                This must be one of 8000, 12000, 16000,
-  *                                24000, or 48000.
-  * @param channels <tt>int</tt>: Number of channels to output.
-  *                               This must be at most 255.
-  *                               It may be different from the number of coded
-  *                               channels (<code>streams +
-  *                               coupled_streams</code>).
-  * @param streams <tt>int</tt>: The total number of streams coded in the
-  *                              input.
-  *                              This must be no more than 255.
-  * @param coupled_streams <tt>int</tt>: Number of streams to decode as coupled
-  *                                      (2 channel) streams.
-  *                                      This must be no larger than the total
-  *                                      number of streams.
-  *                                      Additionally, The total number of
-  *                                      coded channels (<code>streams +
-  *                                      coupled_streams</code>) must be no
-  *                                      more than 255.
-  * @param[in] demixing_matrix <tt>const unsigned char[demixing_matrix_size]</tt>: Demixing matrix
-  *                         that mapping from coded channels to output channels,
-  *                         as described in @ref oac_projection and
-  *                         @ref oac_projection_ctls.
-  * @param demixing_matrix_size <tt>oac_int32</tt>: The size in bytes of the
-  *                                                  demixing matrix, as
-  *                                                  described in @ref
-  *                                                  oac_projection_ctls.
-  * @param[out] error <tt>int *</tt>: Returns #OAC_OK on success, or an error
-  *                                   code (see @ref oac_errorcodes) on
-  *                                   failure.
-  */
+ * Call oac_projection_decoder_destroy() to release
+ * this object when finished.
+ * @param Fs <tt>oac_int32</tt>: Sampling rate to decode at (in Hz).
+ *                                This must be one of 8000, 12000, 16000,
+ *                                24000, or 48000.
+ * @param channels <tt>int</tt>: Number of channels to output.
+ *                               This must be at most 255.
+ *                               It may be different from the number of coded
+ *                               channels (<code>streams +
+ *                               coupled_streams</code>).
+ * @param streams <tt>int</tt>: The total number of streams coded in the
+ *                              input.
+ *                              This must be no more than 255.
+ * @param coupled_streams <tt>int</tt>: Number of streams to decode as coupled
+ *                                      (2 channel) streams.
+ *                                      This must be no larger than the total
+ *                                      number of streams.
+ *                                      Additionally, The total number of
+ *                                      coded channels (<code>streams +
+ *                                      coupled_streams</code>) must be no
+ *                                      more than 255.
+ * @param[in] demixing_matrix <tt>const unsigned char[demixing_matrix_size]</tt>: Demixing matrix
+ *                         that mapping from coded channels to output channels,
+ *                         as described in @ref oac_projection and
+ *                         @ref oac_projection_ctls.
+ * @param demixing_matrix_size <tt>oac_int32</tt>: The size in bytes of the
+ *                                                  demixing matrix, as
+ *                                                  described in @ref
+ *                                                  oac_projection_ctls.
+ * @param[out] error <tt>int *</tt>: Returns #OAC_OK on success, or an error
+ *                                   code (see @ref oac_errorcodes) on
+ *                                   failure.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT OacProjectionDecoder *oac_projection_decoder_create(
     oac_int32 Fs,
     int channels,
@@ -439,49 +432,48 @@ OAC_EXPORT OAC_WARN_UNUSED_RESULT OacProjectionDecoder *oac_projection_decoder_c
     int coupled_streams,
     unsigned char *demixing_matrix,
     oac_int32 demixing_matrix_size,
-    int *error
-) OAC_ARG_NONNULL(5);
+    int *error) OAC_ARG_NONNULL(5);
 
 
 /** Initialize a previously allocated projection decoder state object.
-  * The memory pointed to by \a st must be at least the size returned by
-  * oac_projection_decoder_get_size().
-  * This is intended for applications which use their own allocator instead of
-  * malloc.
-  * To reset a previously initialized state, use the #OAC_RESET_STATE CTL.
-  * @see oac_projection_decoder_create
-  * @see oac_projection_deocder_get_size
-  * @param st <tt>OacProjectionDecoder*</tt>: Projection encoder state to initialize.
-  * @param Fs <tt>oac_int32</tt>: Sampling rate to decode at (in Hz).
-  *                                This must be one of 8000, 12000, 16000,
-  *                                24000, or 48000.
-  * @param channels <tt>int</tt>: Number of channels to output.
-  *                               This must be at most 255.
-  *                               It may be different from the number of coded
-  *                               channels (<code>streams +
-  *                               coupled_streams</code>).
-  * @param streams <tt>int</tt>: The total number of streams coded in the
-  *                              input.
-  *                              This must be no more than 255.
-  * @param coupled_streams <tt>int</tt>: Number of streams to decode as coupled
-  *                                      (2 channel) streams.
-  *                                      This must be no larger than the total
-  *                                      number of streams.
-  *                                      Additionally, The total number of
-  *                                      coded channels (<code>streams +
-  *                                      coupled_streams</code>) must be no
-  *                                      more than 255.
-  * @param[in] demixing_matrix <tt>const unsigned char[demixing_matrix_size]</tt>: Demixing matrix
-  *                         that mapping from coded channels to output channels,
-  *                         as described in @ref oac_projection and
-  *                         @ref oac_projection_ctls.
-  * @param demixing_matrix_size <tt>oac_int32</tt>: The size in bytes of the
-  *                                                  demixing matrix, as
-  *                                                  described in @ref
-  *                                                  oac_projection_ctls.
-  * @returns #OAC_OK on success, or an error code (see @ref oac_errorcodes)
-  *          on failure.
-  */
+ * The memory pointed to by \a st must be at least the size returned by
+ * oac_projection_decoder_get_size().
+ * This is intended for applications which use their own allocator instead of
+ * malloc.
+ * To reset a previously initialized state, use the #OAC_RESET_STATE CTL.
+ * @see oac_projection_decoder_create
+ * @see oac_projection_deocder_get_size
+ * @param st <tt>OacProjectionDecoder*</tt>: Projection encoder state to initialize.
+ * @param Fs <tt>oac_int32</tt>: Sampling rate to decode at (in Hz).
+ *                                This must be one of 8000, 12000, 16000,
+ *                                24000, or 48000.
+ * @param channels <tt>int</tt>: Number of channels to output.
+ *                               This must be at most 255.
+ *                               It may be different from the number of coded
+ *                               channels (<code>streams +
+ *                               coupled_streams</code>).
+ * @param streams <tt>int</tt>: The total number of streams coded in the
+ *                              input.
+ *                              This must be no more than 255.
+ * @param coupled_streams <tt>int</tt>: Number of streams to decode as coupled
+ *                                      (2 channel) streams.
+ *                                      This must be no larger than the total
+ *                                      number of streams.
+ *                                      Additionally, The total number of
+ *                                      coded channels (<code>streams +
+ *                                      coupled_streams</code>) must be no
+ *                                      more than 255.
+ * @param[in] demixing_matrix <tt>const unsigned char[demixing_matrix_size]</tt>: Demixing matrix
+ *                         that mapping from coded channels to output channels,
+ *                         as described in @ref oac_projection and
+ *                         @ref oac_projection_ctls.
+ * @param demixing_matrix_size <tt>oac_int32</tt>: The size in bytes of the
+ *                                                  demixing matrix, as
+ *                                                  described in @ref
+ *                                                  oac_projection_ctls.
+ * @returns #OAC_OK on success, or an error code (see @ref oac_errorcodes)
+ *          on failure.
+ */
 OAC_EXPORT int oac_projection_decoder_init(
     OacProjectionDecoder *st,
     oac_int32 Fs,
@@ -489,146 +481,142 @@ OAC_EXPORT int oac_projection_decoder_init(
     int streams,
     int coupled_streams,
     unsigned char *demixing_matrix,
-    oac_int32 demixing_matrix_size
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(6);
+    oac_int32 demixing_matrix_size) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(6);
 
 
 /** Decode a projection Oac packet.
-  * @param st <tt>OacProjectionDecoder*</tt>: Projection decoder state.
-  * @param[in] data <tt>const unsigned char*</tt>: Input payload.
-  *                                                Use a <code>NULL</code>
-  *                                                pointer to indicate packet
-  *                                                loss.
-  * @param len <tt>oac_int32</tt>: Number of bytes in payload.
-  * @param[out] pcm <tt>oac_int16*</tt>: Output signal, with interleaved
-  *                                       samples.
-  *                                       This must contain room for
-  *                                       <code>frame_size*channels</code>
-  *                                       samples.
-  * @param frame_size <tt>int</tt>: The number of samples per channel of
-  *                                 available space in \a pcm.
-  *                                 If this is less than the maximum packet duration
-  *                                 (120 ms; 5760 for 48kHz), this function will not be capable
-  *                                 of decoding some packets. In the case of PLC (data==NULL)
-  *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
-  *                                 the duration of audio that is missing, otherwise the
-  *                                 decoder will not be in the optimal state to decode the
-  *                                 next incoming packet. For the PLC and FEC cases, frame_size
-  *                                 <b>must</b> be a multiple of 2.5 ms.
-  * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
-  *                                 forward error correction data be decoded.
-  *                                 If no such data is available, the frame is
-  *                                 decoded as if it were lost.
-  * @returns Number of samples decoded on success or a negative error code
-  *          (see @ref oac_errorcodes) on failure.
-  */
+ * @param st <tt>OacProjectionDecoder*</tt>: Projection decoder state.
+ * @param[in] data <tt>const unsigned char*</tt>: Input payload.
+ *                                                Use a <code>NULL</code>
+ *                                                pointer to indicate packet
+ *                                                loss.
+ * @param len <tt>oac_int32</tt>: Number of bytes in payload.
+ * @param[out] pcm <tt>oac_int16*</tt>: Output signal, with interleaved
+ *                                       samples.
+ *                                       This must contain room for
+ *                                       <code>frame_size*channels</code>
+ *                                       samples.
+ * @param frame_size <tt>int</tt>: The number of samples per channel of
+ *                                 available space in \a pcm.
+ *                                 If this is less than the maximum packet duration
+ *                                 (120 ms; 5760 for 48kHz), this function will not be capable
+ *                                 of decoding some packets. In the case of PLC (data==NULL)
+ *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
+ *                                 the duration of audio that is missing, otherwise the
+ *                                 decoder will not be in the optimal state to decode the
+ *                                 next incoming packet. For the PLC and FEC cases, frame_size
+ *                                 <b>must</b> be a multiple of 2.5 ms.
+ * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
+ *                                 forward error correction data be decoded.
+ *                                 If no such data is available, the frame is
+ *                                 decoded as if it were lost.
+ * @returns Number of samples decoded on success or a negative error code
+ *          (see @ref oac_errorcodes) on failure.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_projection_decode(
     OacProjectionDecoder *st,
     const unsigned char *data,
     oac_int32 len,
     oac_int16 *pcm,
     int frame_size,
-    int decode_fec
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
+    int decode_fec) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
 /** Decode a projection Oac packet.
-  * @param st <tt>OacProjectionDecoder*</tt>: Projection decoder state.
-  * @param[in] data <tt>const unsigned char*</tt>: Input payload.
-  *                                                Use a <code>NULL</code>
-  *                                                pointer to indicate packet
-  *                                                loss.
-  * @param len <tt>oac_int32</tt>: Number of bytes in payload.
-  * @param[out] pcm <tt>oac_int32*</tt>: Output signal, with interleaved
-  *                                       samples representing (or slightly exceeding) 24-bit values.
-  *                                       This must contain room for
-  *                                       <code>frame_size*channels</code>
-  *                                       samples.
-  * @param frame_size <tt>int</tt>: The number of samples per channel of
-  *                                 available space in \a pcm.
-  *                                 If this is less than the maximum packet duration
-  *                                 (120 ms; 5760 for 48kHz), this function will not be capable
-  *                                 of decoding some packets. In the case of PLC (data==NULL)
-  *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
-  *                                 the duration of audio that is missing, otherwise the
-  *                                 decoder will not be in the optimal state to decode the
-  *                                 next incoming packet. For the PLC and FEC cases, frame_size
-  *                                 <b>must</b> be a multiple of 2.5 ms.
-  * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
-  *                                 forward error correction data be decoded.
-  *                                 If no such data is available, the frame is
-  *                                 decoded as if it were lost.
-  * @returns Number of samples decoded on success or a negative error code
-  *          (see @ref oac_errorcodes) on failure.
-  */
+ * @param st <tt>OacProjectionDecoder*</tt>: Projection decoder state.
+ * @param[in] data <tt>const unsigned char*</tt>: Input payload.
+ *                                                Use a <code>NULL</code>
+ *                                                pointer to indicate packet
+ *                                                loss.
+ * @param len <tt>oac_int32</tt>: Number of bytes in payload.
+ * @param[out] pcm <tt>oac_int32*</tt>: Output signal, with interleaved
+ *                                       samples representing (or slightly exceeding) 24-bit values.
+ *                                       This must contain room for
+ *                                       <code>frame_size*channels</code>
+ *                                       samples.
+ * @param frame_size <tt>int</tt>: The number of samples per channel of
+ *                                 available space in \a pcm.
+ *                                 If this is less than the maximum packet duration
+ *                                 (120 ms; 5760 for 48kHz), this function will not be capable
+ *                                 of decoding some packets. In the case of PLC (data==NULL)
+ *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
+ *                                 the duration of audio that is missing, otherwise the
+ *                                 decoder will not be in the optimal state to decode the
+ *                                 next incoming packet. For the PLC and FEC cases, frame_size
+ *                                 <b>must</b> be a multiple of 2.5 ms.
+ * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
+ *                                 forward error correction data be decoded.
+ *                                 If no such data is available, the frame is
+ *                                 decoded as if it were lost.
+ * @returns Number of samples decoded on success or a negative error code
+ *          (see @ref oac_errorcodes) on failure.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_projection_decode24(
     OacProjectionDecoder *st,
     const unsigned char *data,
     oac_int32 len,
     oac_int32 *pcm,
     int frame_size,
-    int decode_fec
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
+    int decode_fec) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
 /** Decode a projection Oac packet with floating point output.
-  * @param st <tt>OacProjectionDecoder*</tt>: Projection decoder state.
-  * @param[in] data <tt>const unsigned char*</tt>: Input payload.
-  *                                                Use a <code>NULL</code>
-  *                                                pointer to indicate packet
-  *                                                loss.
-  * @param len <tt>oac_int32</tt>: Number of bytes in payload.
-  * @param[out] pcm <tt>oac_int16*</tt>: Output signal, with interleaved
-  *                                       samples.
-  *                                       This must contain room for
-  *                                       <code>frame_size*channels</code>
-  *                                       samples.
-  * @param frame_size <tt>int</tt>: The number of samples per channel of
-  *                                 available space in \a pcm.
-  *                                 If this is less than the maximum packet duration
-  *                                 (120 ms; 5760 for 48kHz), this function will not be capable
-  *                                 of decoding some packets. In the case of PLC (data==NULL)
-  *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
-  *                                 the duration of audio that is missing, otherwise the
-  *                                 decoder will not be in the optimal state to decode the
-  *                                 next incoming packet. For the PLC and FEC cases, frame_size
-  *                                 <b>must</b> be a multiple of 2.5 ms.
-  * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
-  *                                 forward error correction data be decoded.
-  *                                 If no such data is available, the frame is
-  *                                 decoded as if it were lost.
-  * @returns Number of samples decoded on success or a negative error code
-  *          (see @ref oac_errorcodes) on failure.
-  */
+ * @param st <tt>OacProjectionDecoder*</tt>: Projection decoder state.
+ * @param[in] data <tt>const unsigned char*</tt>: Input payload.
+ *                                                Use a <code>NULL</code>
+ *                                                pointer to indicate packet
+ *                                                loss.
+ * @param len <tt>oac_int32</tt>: Number of bytes in payload.
+ * @param[out] pcm <tt>oac_int16*</tt>: Output signal, with interleaved
+ *                                       samples.
+ *                                       This must contain room for
+ *                                       <code>frame_size*channels</code>
+ *                                       samples.
+ * @param frame_size <tt>int</tt>: The number of samples per channel of
+ *                                 available space in \a pcm.
+ *                                 If this is less than the maximum packet duration
+ *                                 (120 ms; 5760 for 48kHz), this function will not be capable
+ *                                 of decoding some packets. In the case of PLC (data==NULL)
+ *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
+ *                                 the duration of audio that is missing, otherwise the
+ *                                 decoder will not be in the optimal state to decode the
+ *                                 next incoming packet. For the PLC and FEC cases, frame_size
+ *                                 <b>must</b> be a multiple of 2.5 ms.
+ * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
+ *                                 forward error correction data be decoded.
+ *                                 If no such data is available, the frame is
+ *                                 decoded as if it were lost.
+ * @returns Number of samples decoded on success or a negative error code
+ *          (see @ref oac_errorcodes) on failure.
+ */
 OAC_EXPORT OAC_WARN_UNUSED_RESULT int oac_projection_decode_float(
     OacProjectionDecoder *st,
     const unsigned char *data,
     oac_int32 len,
     float *pcm,
     int frame_size,
-    int decode_fec
-) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
+    int decode_fec) OAC_ARG_NONNULL(1) OAC_ARG_NONNULL(4);
 
 
 /** Perform a CTL function on a projection Oac decoder.
-  *
-  * Generally the request and subsequent arguments are generated by a
-  * convenience macro.
-  * @param st <tt>OacProjectionDecoder*</tt>: Projection decoder state.
-  * @param request This and all remaining parameters should be replaced by one
-  *                of the convenience macros in @ref oac_genericctls,
-  *                @ref oac_decoderctls, @ref oac_multistream_ctls, or
-  *                @ref oac_projection_ctls.
-  * @see oac_genericctls
-  * @see oac_decoderctls
-  * @see oac_multistream_ctls
-  * @see oac_projection_ctls
-  */
+ *
+ * Generally the request and subsequent arguments are generated by a
+ * convenience macro.
+ * @param st <tt>OacProjectionDecoder*</tt>: Projection decoder state.
+ * @param request This and all remaining parameters should be replaced by one
+ *                of the convenience macros in @ref oac_genericctls,
+ *                @ref oac_decoderctls, @ref oac_multistream_ctls, or
+ *                @ref oac_projection_ctls.
+ * @see oac_genericctls
+ * @see oac_decoderctls
+ * @see oac_multistream_ctls
+ * @see oac_projection_ctls
+ */
 OAC_EXPORT int oac_projection_decoder_ctl(OacProjectionDecoder *st, int request, ...) OAC_ARG_NONNULL(1);
 
 
 /** Frees an <code>OacProjectionDecoder</code> allocated by
-  * oac_projection_decoder_create().
-  * @param st <tt>OacProjectionDecoder</tt>: Projection decoder state to be freed.
-  */
+ * oac_projection_decoder_create().
+ * @param st <tt>OacProjectionDecoder</tt>: Projection decoder state to be freed.
+ */
 OAC_EXPORT void oac_projection_decoder_destroy(OacProjectionDecoder *st);
 
 
diff --git a/include/oac_types.h b/include/oac_types.h
index ea3c957d4..a023a0e89 100644
--- a/include/oac_types.h
+++ b/include/oac_types.h
@@ -23,13 +23,13 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 /* oac_types.h based on ogg_types.h from libogg */
 
 /**
    @file oac_types.h
    @brief Oac reference implementation types
-*/
+ */
 #ifndef OAC_TYPES_H
 #define OAC_TYPES_H
 
@@ -42,124 +42,125 @@
 #define oac_uint8       unsigned char
 
 /* Use the real stdint.h if it's there (taken from Paul Hsieh's pstdint.h) */
-#if (defined(__STDC__) && __STDC__ && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_)) || defined (HAVE_STDINT_H))
-#include <stdint.h>
-#  undef oac_int64
-#  undef oac_int8
-#  undef oac_uint64
-#  undef oac_uint8
-   typedef int8_t oac_int8;
-   typedef uint8_t oac_uint8;
-   typedef int16_t oac_int16;
-   typedef uint16_t oac_uint16;
-   typedef int32_t oac_int32;
-   typedef uint32_t oac_uint32;
-   typedef int64_t oac_int64;
-   typedef uint64_t oac_uint64;
+#if (defined(__STDC__) && __STDC__ && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || (defined(__GNUC__) \
+    && (defined(_STDINT_H) || defined(_STDINT_H_)) || defined (HAVE_STDINT_H))
+# include <stdint.h>
+# undef oac_int64
+# undef oac_int8
+# undef oac_uint64
+# undef oac_uint8
+typedef int8_t oac_int8;
+typedef uint8_t oac_uint8;
+typedef int16_t oac_int16;
+typedef uint16_t oac_uint16;
+typedef int32_t oac_int32;
+typedef uint32_t oac_uint32;
+typedef int64_t oac_int64;
+typedef uint64_t oac_uint64;
 #elif defined(_WIN32)
 
-#  if defined(__CYGWIN__)
-#    include <_G_config.h>
-     typedef _G_int32_t oac_int32;
-     typedef _G_uint32_t oac_uint32;
-     typedef _G_int16 oac_int16;
-     typedef _G_uint16 oac_uint16;
-#  elif defined(__MINGW32__)
-     typedef short oac_int16;
-     typedef unsigned short oac_uint16;
-     typedef int oac_int32;
-     typedef unsigned int oac_uint32;
-#  elif defined(__MWERKS__)
-     typedef int oac_int32;
-     typedef unsigned int oac_uint32;
-     typedef short oac_int16;
-     typedef unsigned short oac_uint16;
-#  else
-     /* MSVC/Borland */
-     typedef __int32 oac_int32;
-     typedef unsigned __int32 oac_uint32;
-     typedef __int16 oac_int16;
-     typedef unsigned __int16 oac_uint16;
-#  endif
+# if defined(__CYGWIN__)
+#  include <_G_config.h>
+typedef _G_int32_t oac_int32;
+typedef _G_uint32_t oac_uint32;
+typedef _G_int16 oac_int16;
+typedef _G_uint16 oac_uint16;
+# elif defined(__MINGW32__)
+typedef short oac_int16;
+typedef unsigned short oac_uint16;
+typedef int oac_int32;
+typedef unsigned int oac_uint32;
+# elif defined(__MWERKS__)
+typedef int oac_int32;
+typedef unsigned int oac_uint32;
+typedef short oac_int16;
+typedef unsigned short oac_uint16;
+# else
+/* MSVC/Borland */
+typedef __int32 oac_int32;
+typedef unsigned __int32 oac_uint32;
+typedef __int16 oac_int16;
+typedef unsigned __int16 oac_uint16;
+# endif
 
 #elif defined(__MACOS__)
 
-#  include <sys/types.h>
-   typedef SInt16 oac_int16;
-   typedef UInt16 oac_uint16;
-   typedef SInt32 oac_int32;
-   typedef UInt32 oac_uint32;
+# include <sys/types.h>
+typedef SInt16 oac_int16;
+typedef UInt16 oac_uint16;
+typedef SInt32 oac_int32;
+typedef UInt32 oac_uint32;
 
 #elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
 
-#  include <sys/types.h>
-   typedef int16_t oac_int16;
-   typedef u_int16_t oac_uint16;
-   typedef int32_t oac_int32;
-   typedef u_int32_t oac_uint32;
+# include <sys/types.h>
+typedef int16_t oac_int16;
+typedef u_int16_t oac_uint16;
+typedef int32_t oac_int32;
+typedef u_int32_t oac_uint32;
 
 #elif defined(__BEOS__)
 
-   /* Be */
-#  include <inttypes.h>
-   typedef int16 oac_int16;
-   typedef u_int16 oac_uint16;
-   typedef int32_t oac_int32;
-   typedef u_int32_t oac_uint32;
+/* Be */
+# include <inttypes.h>
+typedef int16 oac_int16;
+typedef u_int16 oac_uint16;
+typedef int32_t oac_int32;
+typedef u_int32_t oac_uint32;
 
 #elif defined (__EMX__)
 
-   /* OS/2 GCC */
-   typedef short oac_int16;
-   typedef unsigned short oac_uint16;
-   typedef int oac_int32;
-   typedef unsigned int oac_uint32;
+/* OS/2 GCC */
+typedef short oac_int16;
+typedef unsigned short oac_uint16;
+typedef int oac_int32;
+typedef unsigned int oac_uint32;
 
 #elif defined (DJGPP)
 
-   /* DJGPP */
-   typedef short oac_int16;
-   typedef unsigned short oac_uint16;
-   typedef int oac_int32;
-   typedef unsigned int oac_uint32;
+/* DJGPP */
+typedef short oac_int16;
+typedef unsigned short oac_uint16;
+typedef int oac_int32;
+typedef unsigned int oac_uint32;
 
 #elif defined(R5900)
 
-   /* PS2 EE */
-   typedef int oac_int32;
-   typedef unsigned oac_uint32;
-   typedef short oac_int16;
-   typedef unsigned short oac_uint16;
+/* PS2 EE */
+typedef int oac_int32;
+typedef unsigned oac_uint32;
+typedef short oac_int16;
+typedef unsigned short oac_uint16;
 
 #elif defined(__SYMBIAN32__)
 
-   /* Symbian GCC */
-   typedef signed short oac_int16;
-   typedef unsigned short oac_uint16;
-   typedef signed int oac_int32;
-   typedef unsigned int oac_uint32;
+/* Symbian GCC */
+typedef signed short oac_int16;
+typedef unsigned short oac_uint16;
+typedef signed int oac_int32;
+typedef unsigned int oac_uint32;
 
 #elif defined(CONFIG_TI_C54X) || defined (CONFIG_TI_C55X)
 
-   typedef short oac_int16;
-   typedef unsigned short oac_uint16;
-   typedef long oac_int32;
-   typedef unsigned long oac_uint32;
+typedef short oac_int16;
+typedef unsigned short oac_uint16;
+typedef long oac_int32;
+typedef unsigned long oac_uint32;
 
 #elif defined(CONFIG_TI_C6X)
 
-   typedef short oac_int16;
-   typedef unsigned short oac_uint16;
-   typedef int oac_int32;
-   typedef unsigned int oac_uint32;
+typedef short oac_int16;
+typedef unsigned short oac_uint16;
+typedef int oac_int32;
+typedef unsigned int oac_uint32;
 
 #else
 
-   /* Give up, take a reasonable guess */
-   typedef short oac_int16;
-   typedef unsigned short oac_uint16;
-   typedef int oac_int32;
-   typedef unsigned int oac_uint32;
+/* Give up, take a reasonable guess */
+typedef short oac_int16;
+typedef unsigned short oac_uint16;
+typedef int oac_int32;
+typedef unsigned int oac_uint32;
 
 #endif
 
diff --git a/oac.cfg b/oac.cfg
new file mode 100644
index 000000000..8bfaa7e92
--- /dev/null
+++ b/oac.cfg
@@ -0,0 +1,3708 @@
+# Uncrustify-0.78.1_f
+
+#
+# General options
+#
+
+# The type of line endings.
+#
+# Default: auto
+newlines                        = auto     # lf/crlf/cr/auto
+
+# The original size of tabs in the input.
+#
+# Default: 8
+input_tab_size                  = 8        # unsigned number
+
+# The size of tabs in the output (only used if align_with_tabs=true).
+#
+# Default: 8
+output_tab_size                 = 8        # unsigned number
+
+# The ASCII value of the string escape char, usually 92 (\) or (Pawn) 94 (^).
+#
+# Default: 92
+string_escape_char              = 92       # unsigned number
+
+# Alternate string escape char (usually only used for Pawn).
+# Only works right before the quote char.
+string_escape_char2             = 0        # unsigned number
+
+# Replace tab characters found in string literals with the escape sequence \t
+# instead.
+string_replace_tab_chars        = false    # true/false
+
+# Allow interpreting '>=' and '>>=' as part of a template in code like
+# 'void f(list<list<B>>=val);'. If true, 'assert(x<0 && y>=3)' will be broken.
+# Improvements to template detection may make this option obsolete.
+tok_split_gte                   = false    # true/false
+
+# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multi-line macros).
+disable_processing_nl_cont      = false    # true/false
+
+# Specify the marker used in comments to disable processing of part of the
+# file.
+#
+# Default:  *INDENT-OFF*
+disable_processing_cmt          = " *INDENT-OFF*"      # string
+
+# Specify the marker used in comments to (re)enable processing in a file.
+#
+# Default:  *INDENT-ON*
+enable_processing_cmt           = " *INDENT-ON*"     # string
+
+# Enable parsing of digraphs.
+enable_digraphs                 = false    # true/false
+
+# Option to allow both disable_processing_cmt and enable_processing_cmt
+# strings, if specified, to be interpreted as ECMAScript regular expressions.
+# If true, a regex search will be performed within comments according to the
+# specified patterns in order to disable/enable processing.
+processing_cmt_as_regex         = false    # true/false
+
+# Add or remove the UTF-8 BOM (recommend 'remove').
+utf8_bom                        = ignore   # ignore/add/remove/force/not_defined
+
+# If the file contains bytes with values between 128 and 255, but is not
+# UTF-8, then output as UTF-8.
+utf8_byte                       = false    # true/false
+
+# Force the output encoding to UTF-8.
+utf8_force                      = false    # true/false
+
+#
+# Spacing options
+#
+
+# Add or remove space around non-assignment symbolic operators ('+', '/', '%',
+# '<<', and so forth).
+sp_arith                        = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove space around arithmetic operators '+' and '-'.
+#
+# Overrides sp_arith.
+sp_arith_additive               = add   # ignore/add/remove/force/not_defined
+
+# Add or remove space around assignment operator '=', '+=', etc.
+sp_assign                       = add   # ignore/add/remove/force/not_defined
+
+# Add or remove space around '=' in C++11 lambda capture specifications.
+#
+# Overrides sp_assign.
+sp_cpp_lambda_assign            = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after the capture specification of a C++11 lambda when
+# an argument list is present, as in '[] <here> (int x){ ... }'.
+sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after the capture specification of a C++11 lambda with
+# no argument list is present, as in '[] <here> { ... }'.
+sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after the opening parenthesis and before the closing
+# parenthesis of a argument list of a C++11 lambda, as in
+# '[]( <here> ){ ... }'
+# with an empty list.
+sp_cpp_lambda_argument_list_empty = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after the opening parenthesis and before the closing
+# parenthesis of a argument list of a C++11 lambda, as in
+# '[]( <here> int x <here> ){ ... }'.
+sp_cpp_lambda_argument_list     = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after the argument list of a C++11 lambda, as in
+# '[](int x) <here> { ... }'.
+sp_cpp_lambda_paren_brace       = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between a lambda body and its call operator of an
+# immediately invoked lambda, as in '[]( ... ){ ... } <here> ( ... )'.
+sp_cpp_lambda_fparen            = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space around assignment operator '=' in a prototype.
+#
+# If set to ignore, use sp_assign.
+sp_assign_default               = add   # ignore/add/remove/force/not_defined
+
+# Add or remove space before assignment operator '=', '+=', etc.
+#
+# Overrides sp_assign.
+sp_before_assign                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after assignment operator '=', '+=', etc.
+#
+# Overrides sp_assign.
+sp_after_assign                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space in 'enum {'.
+#
+# Default: add
+sp_enum_brace                   = add      # ignore/add/remove/force/not_defined
+
+# Add or remove space in 'NS_ENUM ('.
+sp_enum_paren                   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space around assignment '=' in enum.
+sp_enum_assign                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before assignment '=' in enum.
+#
+# Overrides sp_enum_assign.
+sp_enum_before_assign           = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after assignment '=' in enum.
+#
+# Overrides sp_enum_assign.
+sp_enum_after_assign            = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space around assignment ':' in enum.
+sp_enum_colon                   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space around preprocessor '##' concatenation operator.
+#
+# Default: add
+sp_pp_concat                    = add      # ignore/add/remove/force/not_defined
+
+# Add or remove space after preprocessor '#' stringify operator.
+# Also affects the '#@' charizing operator.
+sp_pp_stringify                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before preprocessor '#' stringify operator
+# as in '#define x(y) L#y'.
+sp_before_pp_stringify          = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space around boolean operators '&&' and '||'.
+sp_bool                         = add   # ignore/add/remove/force/not_defined
+
+# Add or remove space around compare operator '<', '>', '==', etc.
+sp_compare                      = add   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside '(' and ')'.
+sp_inside_paren                 = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove space between nested parentheses, i.e. '((' vs. ') )'.
+sp_paren_paren                  = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
+sp_cparen_oparen                = ignore   # ignore/add/remove/force/not_defined
+
+# Whether to balance spaces inside nested parentheses.
+sp_balance_nested_parens        = false    # true/false
+
+# Add or remove space between ')' and '{'.
+sp_paren_brace                  = add   # ignore/add/remove/force/not_defined
+
+# Add or remove space between nested braces, i.e. '{{' vs. '{ {'.
+sp_brace_brace                  = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove space before pointer star '*'.
+sp_before_ptr_star              = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before pointer star '*' that isn't followed by a
+# variable name. If set to ignore, sp_before_ptr_star is used instead.
+sp_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before pointer star '*' that is followed by a qualifier.
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_qualifier_ptr_star    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before pointer star '*' that is followed by 'operator' keyword.
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_operator_ptr_star     = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before pointer star '*' that is followed by
+# a class scope (as in 'int *MyClass::method()') or namespace scope
+# (as in 'int *my_ns::func()').
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_scope_ptr_star        = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before pointer star '*' that is followed by '::',
+# as in 'int *::func()'.
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_global_scope_ptr_star = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between a qualifier and a pointer star '*' that isn't
+# followed by a variable name, as in '(char const *)'. If set to ignore,
+# sp_before_ptr_star is used instead.
+sp_qualifier_unnamed_ptr_star   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between pointer stars '*', as in 'int ***a;'.
+sp_between_ptr_star             = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between pointer star '*' and reference '&', as in 'int *& a;'.
+sp_between_ptr_ref              = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after pointer star '*', if followed by a word.
+#
+# Overrides sp_type_func.
+sp_after_ptr_star               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after pointer caret '^', if followed by a word.
+sp_after_ptr_block_caret        = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after pointer star '*', if followed by a qualifier.
+sp_after_ptr_star_qualifier     = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after a pointer star '*', if followed by a function
+# prototype or function definition.
+#
+# Overrides sp_after_ptr_star and sp_type_func.
+sp_after_ptr_star_func          = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after a pointer star '*' in the trailing return of a
+# function prototype or function definition.
+sp_after_ptr_star_trailing      = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between the pointer star '*' and the name of the variable
+# in a function pointer definition.
+sp_ptr_star_func_var            = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between the pointer star '*' and the name of the type
+# in a function pointer type definition.
+sp_ptr_star_func_type           = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after a pointer star '*', if followed by an open
+# parenthesis, as in 'void* (*)()'.
+sp_ptr_star_paren               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before a pointer star '*', if followed by a function
+# prototype or function definition. If set to ignore, sp_before_ptr_star is
+# used instead.
+sp_before_ptr_star_func         = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between a qualifier and a pointer star '*' followed by
+# the name of the function in a function prototype or definition, as in
+# 'char const *foo()`. If set to ignore, sp_before_ptr_star is used instead.
+sp_qualifier_ptr_star_func      = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before a pointer star '*' in the trailing return of a
+# function prototype or function definition.
+sp_before_ptr_star_trailing     = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between a qualifier and a pointer star '*' in the
+# trailing return of a function prototype or function definition, as in
+# 'auto foo() -> char const *'.
+sp_qualifier_ptr_star_trailing  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before a reference sign '&'.
+sp_before_byref                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before a reference sign '&' that isn't followed by a
+# variable name. If set to ignore, sp_before_byref is used instead.
+sp_before_unnamed_byref         = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after reference sign '&', if followed by a word.
+#
+# Overrides sp_type_func.
+sp_after_byref                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after a reference sign '&', if followed by a function
+# prototype or function definition.
+#
+# Overrides sp_after_byref and sp_type_func.
+sp_after_byref_func             = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before a reference sign '&', if followed by a function
+# prototype or function definition.
+sp_before_byref_func            = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after a reference sign '&', if followed by an open
+# parenthesis, as in 'char& (*)()'.
+sp_byref_paren                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between type and word. In cases where total removal of
+# whitespace would be a syntax error, a value of 'remove' is treated the same
+# as 'force'.
+#
+# This also affects some other instances of space following a type that are
+# not covered by other options; for example, between the return type and
+# parenthesis of a function type template argument, between the type and
+# parenthesis of an array parameter, or between 'decltype(...)' and the
+# following word.
+#
+# Default: force
+sp_after_type                   = force    # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'decltype(...)' and word,
+# brace or function call.
+sp_after_decltype               = ignore   # ignore/add/remove/force/not_defined
+
+# (D) Add or remove space before the parenthesis in the D constructs
+# 'template Foo(' and 'class Foo('.
+sp_before_template_paren        = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'template' and '<'.
+# If set to ignore, sp_before_angle is used.
+sp_template_angle               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before '<'.
+sp_before_angle                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside '<' and '>'.
+sp_inside_angle                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside '<>'.
+# if empty.
+sp_inside_angle_empty           = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between '>' and ':'.
+sp_angle_colon                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after '>'.
+sp_after_angle                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between '>' and '(' as found in 'new List<byte>(foo);'.
+sp_angle_paren                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between '>' and '()' as found in 'new List<byte>();'.
+sp_angle_paren_empty            = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between '>' and a word as in 'List<byte> m;' or
+# 'template <typename T> static ...'.
+sp_angle_word                   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between '>' and '>' in '>>' (template stuff).
+#
+# Default: add
+sp_angle_shift                  = add      # ignore/add/remove/force/not_defined
+
+# (C++11) Permit removal of the space between '>>' in 'foo<bar<int> >'. Note
+# that sp_angle_shift cannot remove the space without this option.
+sp_permit_cpp11_shift           = false    # true/false
+
+# Add or remove space before '(' of control statements ('if', 'for', 'switch',
+# 'while', etc.).
+sp_before_sparen                = add   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside '(' and ')' of control statements other than
+# 'for'.
+sp_inside_sparen                = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove space after '(' of control statements other than 'for'.
+#
+# Overrides sp_inside_sparen.
+sp_inside_sparen_open           = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before ')' of control statements other than 'for'.
+#
+# Overrides sp_inside_sparen.
+sp_inside_sparen_close          = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside '(' and ')' of 'for' statements.
+sp_inside_for                   = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove space after '(' of 'for' statements.
+#
+# Overrides sp_inside_for.
+sp_inside_for_open              = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before ')' of 'for' statements.
+#
+# Overrides sp_inside_for.
+sp_inside_for_close             = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove space between '((' or '))' of control statements.
+sp_sparen_paren                 = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove space after ')' of control statements.
+sp_after_sparen                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between ')' and '{' of control statements.
+sp_sparen_brace                 = add   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'do' and '{'.
+sp_do_brace_open                = add   # ignore/add/remove/force/not_defined
+
+# Add or remove space between '}' and 'while'.
+sp_brace_close_while            = add   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'while' and '('. Overrides sp_before_sparen.
+sp_while_paren_open             = add   # ignore/add/remove/force/not_defined
+
+# (D) Add or remove space between 'invariant' and '('.
+sp_invariant_paren              = ignore   # ignore/add/remove/force/not_defined
+
+# (D) Add or remove space after the ')' in 'invariant (C) c'.
+sp_after_invariant_paren        = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
+sp_special_semi                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before ';'.
+#
+# Default: remove
+sp_before_semi                  = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove space before ';' in non-empty 'for' statements.
+sp_before_semi_for              = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before a semicolon of an empty left part of a for
+# statement, as in 'for ( <here> ; ; )'.
+sp_before_semi_for_empty        = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between the semicolons of an empty middle part of a for
+# statement, as in 'for ( ; <here> ; )'.
+sp_between_semi_for_empty       = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after ';', except when followed by a comment.
+#
+# Default: add
+sp_after_semi                   = add      # ignore/add/remove/force/not_defined
+
+# Add or remove space after ';' in non-empty 'for' statements.
+#
+# Default: force
+sp_after_semi_for               = force    # ignore/add/remove/force/not_defined
+
+# Add or remove space after the final semicolon of an empty part of a for
+# statement, as in 'for ( ; ; <here> )'.
+sp_after_semi_for_empty         = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before '[' (except '[]').
+sp_before_square                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before '[' for a variable definition.
+#
+# Default: remove
+sp_before_vardef_square         = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove space before '[' for asm block.
+sp_before_square_asm_block      = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before '[]'.
+sp_before_squares               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before C++17 structured bindings.
+sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside a non-empty '[' and ']'.
+sp_inside_square                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside '[]'.
+# if empty.
+sp_inside_square_empty          = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and
+# ']'. If set to ignore, sp_inside_square is used.
+sp_inside_square_oc_array       = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
+sp_after_comma                  = add   # ignore/add/remove/force/not_defined
+
+# Add or remove space before ',', i.e. 'a,b' vs. 'a ,b'.
+#
+# Default: remove
+sp_before_comma                 = remove   # ignore/add/remove/force/not_defined
+
+# (C#, Vala) Add or remove space between ',' and ']' in multidimensional array type
+# like 'int[,,]'.
+sp_after_mdatype_commas         = ignore   # ignore/add/remove/force/not_defined
+
+# (C#, Vala) Add or remove space between '[' and ',' in multidimensional array type
+# like 'int[,,]'.
+sp_before_mdatype_commas        = ignore   # ignore/add/remove/force/not_defined
+
+# (C#, Vala) Add or remove space between ',' in multidimensional array type
+# like 'int[,,]'.
+sp_between_mdatype_commas       = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between an open parenthesis and comma,
+# i.e. '(,' vs. '( ,'.
+#
+# Default: force
+sp_paren_comma                  = force    # ignore/add/remove/force/not_defined
+
+# Add or remove space between a type and ':'.
+sp_type_colon                   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after the variadic '...' when preceded by a
+# non-punctuator.
+# The value REMOVE will be overridden with FORCE
+sp_after_ellipsis               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before the variadic '...' when preceded by a
+# non-punctuator.
+# The value REMOVE will be overridden with FORCE
+sp_before_ellipsis              = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between a type and '...'.
+sp_type_ellipsis                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between a '*' and '...'.
+sp_ptr_type_ellipsis            = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between ')' and '...'.
+sp_paren_ellipsis               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between '&&' and '...'.
+sp_byref_ellipsis               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between ')' and a qualifier such as 'const'.
+sp_paren_qualifier              = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between ')' and 'noexcept'.
+sp_paren_noexcept               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after class ':'.
+sp_after_class_colon            = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before class ':'.
+sp_before_class_colon           = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after class constructor ':'.
+#
+# Default: add
+sp_after_constr_colon           = add      # ignore/add/remove/force/not_defined
+
+# Add or remove space before class constructor ':'.
+#
+# Default: add
+sp_before_constr_colon          = add      # ignore/add/remove/force/not_defined
+
+# Add or remove space before case ':'.
+#
+# Default: remove
+sp_before_case_colon            = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'operator' and operator sign.
+sp_after_operator               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between the operator symbol and the open parenthesis, as
+# in 'operator ++('.
+sp_after_operator_sym           = ignore   # ignore/add/remove/force/not_defined
+
+# Overrides sp_after_operator_sym when the operator has no arguments, as in
+# 'operator *()'.
+sp_after_operator_sym_empty     = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after C/D cast, i.e. 'cast(int)a' vs. 'cast(int) a' or
+# '(int)a' vs. '(int) a'.
+sp_after_cast                   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove spaces inside cast parentheses.
+sp_inside_paren_cast            = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between the type and open parenthesis in a C++ cast,
+# i.e. 'int(exp)' vs. 'int (exp)'.
+sp_cpp_cast_paren               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'sizeof' and '('.
+sp_sizeof_paren                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'sizeof' and '...'.
+sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'sizeof...' and '('.
+sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between '...' and a parameter pack.
+sp_ellipsis_parameter_pack      = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between a parameter pack and '...'.
+sp_parameter_pack_ellipsis      = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'decltype' and '('.
+sp_decltype_paren               = ignore   # ignore/add/remove/force/not_defined
+
+# (Pawn) Add or remove space after the tag keyword.
+sp_after_tag                    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside enum '{' and '}'.
+sp_inside_braces_enum           = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside struct/union '{' and '}'.
+sp_inside_braces_struct         = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
+sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after open brace in an unnamed temporary
+# direct-list-initialization
+# if statement is a brace_init_lst
+# works only if sp_brace_brace is set to ignore.
+sp_after_type_brace_init_lst_open = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before close brace in an unnamed temporary
+# direct-list-initialization
+# if statement is a brace_init_lst
+# works only if sp_brace_brace is set to ignore.
+sp_before_type_brace_init_lst_close = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside an unnamed temporary direct-list-initialization
+# if statement is a brace_init_lst
+# works only if sp_brace_brace is set to ignore
+# works only if sp_before_type_brace_init_lst_close is set to ignore.
+sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside '{' and '}'.
+sp_inside_braces                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside '{}'.
+# if empty.
+sp_inside_braces_empty          = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space around trailing return operator '->'.
+sp_trailing_return              = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between return type and function name. A minimum of 1
+# is forced except for pointer return types.
+sp_type_func                    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between type and open brace of an unnamed temporary
+# direct-list-initialization.
+sp_type_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between function name and '(' on function declaration.
+sp_func_proto_paren             = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between function name and '()' on function declaration
+# if empty.
+sp_func_proto_paren_empty       = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between function name and '(' with a typedef specifier.
+sp_func_type_paren              = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between alias name and '(' of a non-pointer function type typedef.
+sp_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between function name and '()' on function definition
+# if empty.
+sp_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside empty function '()'.
+# Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
+sp_inside_fparens               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside function '(' and ')'.
+sp_inside_fparen                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside user functor '(' and ')'.
+sp_func_call_user_inside_rparen = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside empty functor '()'.
+# Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
+sp_inside_rparens               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside functor '(' and ')'.
+sp_inside_rparen                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside the first parentheses in a function type, as in
+# 'void (*x)(...)'.
+sp_inside_tparen                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between the ')' and '(' in a function type, as in
+# 'void (*x)(...)'.
+sp_after_tparen_close           = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between ']' and '(' when part of a function call.
+sp_square_fparen                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between ')' and '{' of function.
+sp_fparen_brace                 = add   # ignore/add/remove/force/not_defined
+
+# Add or remove space between ')' and '{' of a function call in object
+# initialization.
+#
+# Overrides sp_fparen_brace.
+sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force/not_defined
+
+# (Java) Add or remove space between ')' and '{{' of double brace initializer.
+sp_fparen_dbrace                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between function name and '(' on function calls.
+sp_func_call_paren              = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between function name and '()' on function calls without
+# parameters. If set to ignore (the default), sp_func_call_paren is used.
+sp_func_call_paren_empty        = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between the user function name and '(' on function
+# calls. You need to set a keyword to be a user function in the config file,
+# like:
+#   set func_call_user tr _ i18n
+sp_func_call_user_paren         = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside user function '(' and ')'.
+sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between nested parentheses with user functions,
+# i.e. '((' vs. '( ('.
+sp_func_call_user_paren_paren   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between a constructor/destructor and the open
+# parenthesis.
+sp_func_class_paren             = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between a constructor without parameters or destructor
+# and '()'.
+sp_func_class_paren_empty       = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after 'return'.
+#
+# Default: force
+sp_return                       = force    # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'return' and '('.
+sp_return_paren                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'return' and '{'.
+sp_return_brace                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between '__attribute__' and '('.
+sp_attribute_paren              = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
+sp_defined_paren                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'throw' and '(' in 'throw (something)'.
+sp_throw_paren                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'throw' and anything other than '(' as in
+# '@throw [...];'.
+sp_after_throw                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'catch' and '(' in 'catch (something) { }'.
+# If set to ignore, sp_before_sparen is used.
+sp_catch_paren                  = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space between '@catch' and '('
+# in '@catch (something) { }'. If set to ignore, sp_catch_paren is used.
+sp_oc_catch_paren               = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space before Objective-C protocol list
+# as in '@protocol Protocol<here><Protocol_A>' or '@interface MyClass : NSObject<here><MyProtocol>'.
+sp_before_oc_proto_list         = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space between class name and '('
+# in '@interface className(categoryName)<ProtocolName>:BaseClass'
+sp_oc_classname_paren           = ignore   # ignore/add/remove/force/not_defined
+
+# (D) Add or remove space between 'version' and '('
+# in 'version (something) { }'. If set to ignore, sp_before_sparen is used.
+sp_version_paren                = ignore   # ignore/add/remove/force/not_defined
+
+# (D) Add or remove space between 'scope' and '('
+# in 'scope (something) { }'. If set to ignore, sp_before_sparen is used.
+sp_scope_paren                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'super' and '(' in 'super (something)'.
+#
+# Default: remove
+sp_super_paren                  = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'this' and '(' in 'this (something)'.
+#
+# Default: remove
+sp_this_paren                   = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove space between a macro name and its definition.
+sp_macro                        = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between a macro function ')' and its definition.
+sp_macro_func                   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'else' and '{' if on the same line.
+sp_else_brace                   = add   # ignore/add/remove/force/not_defined
+
+# Add or remove space between '}' and 'else' if on the same line.
+sp_brace_else                   = add   # ignore/add/remove/force/not_defined
+
+# Add or remove space between '}' and the name of a typedef on the same line.
+sp_brace_typedef                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before the '{' of a 'catch' statement, if the '{' and
+# 'catch' are on the same line, as in 'catch (decl) <here> {'.
+sp_catch_brace                  = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space before the '{' of a '@catch' statement, if the '{'
+# and '@catch' are on the same line, as in '@catch (decl) <here> {'.
+# If set to ignore, sp_catch_brace is used.
+sp_oc_catch_brace               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between '}' and 'catch' if on the same line.
+sp_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space between '}' and '@catch' if on the same line.
+# If set to ignore, sp_brace_catch is used.
+sp_oc_brace_catch               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'finally' and '{' if on the same line.
+sp_finally_brace                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between '}' and 'finally' if on the same line.
+sp_brace_finally                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'try' and '{' if on the same line.
+sp_try_brace                    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between get/set and '{' if on the same line.
+sp_getset_brace                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between a variable and '{' for C++ uniform
+# initialization.
+sp_word_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between a variable and '{' for a namespace.
+#
+# Default: add
+sp_word_brace_ns                = add      # ignore/add/remove/force/not_defined
+
+# Add or remove space before the '::' operator.
+sp_before_dc                    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after the '::' operator.
+sp_after_dc                     = ignore   # ignore/add/remove/force/not_defined
+
+# (D) Add or remove around the D named array initializer ':' operator.
+sp_d_array_colon                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after the '!' (not) unary operator.
+#
+# Default: remove
+sp_not                          = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove space between two '!' (not) unary operators.
+# If set to ignore, sp_not will be used.
+sp_not_not                      = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after the '~' (invert) unary operator.
+#
+# Default: remove
+sp_inv                          = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove space after the '&' (address-of) unary operator. This does not
+# affect the spacing after a '&' that is part of a type.
+#
+# Default: remove
+sp_addr                         = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove space around the '.' or '->' operators.
+#
+# Default: remove
+sp_member                       = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove space after the '*' (dereference) unary operator. This does
+# not affect the spacing after a '*' that is part of a type.
+#
+# Default: remove
+sp_deref                        = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
+#
+# Default: remove
+sp_sign                         = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove space between '++' and '--' the word to which it is being
+# applied, as in '(--x)' or 'y++;'.
+#
+# Default: remove
+sp_incdec                       = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove space before a backslash-newline at the end of a line.
+#
+# Default: add
+sp_before_nl_cont               = add      # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space after the scope '+' or '-', as in '-(void) foo;'
+# or '+(int) bar;'.
+sp_after_oc_scope               = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space after the colon in message specs,
+# i.e. '-(int) f:(int) x;' vs. '-(int) f: (int) x;'.
+sp_after_oc_colon               = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space before the colon in message specs,
+# i.e. '-(int) f: (int) x;' vs. '-(int) f : (int) x;'.
+sp_before_oc_colon              = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space after the colon in immutable dictionary expression
+# 'NSDictionary *test = @{@"foo" :@"bar"};'.
+sp_after_oc_dict_colon          = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space before the colon in immutable dictionary expression
+# 'NSDictionary *test = @{@"foo" :@"bar"};'.
+sp_before_oc_dict_colon         = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space after the colon in message specs,
+# i.e. '[object setValue:1];' vs. '[object setValue: 1];'.
+sp_after_send_oc_colon          = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space before the colon in message specs,
+# i.e. '[object setValue:1];' vs. '[object setValue :1];'.
+sp_before_send_oc_colon         = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space after the (type) in message specs,
+# i.e. '-(int)f: (int) x;' vs. '-(int)f: (int)x;'.
+sp_after_oc_type                = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space after the first (type) in message specs,
+# i.e. '-(int) f:(int)x;' vs. '-(int)f:(int)x;'.
+sp_after_oc_return_type         = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space between '@selector' and '(',
+# i.e. '@selector(msgName)' vs. '@selector (msgName)'.
+# Also applies to '@protocol()' constructs.
+sp_after_oc_at_sel              = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space between '@selector(x)' and the following word,
+# i.e. '@selector(foo) a:' vs. '@selector(foo)a:'.
+sp_after_oc_at_sel_parens       = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space inside '@selector' parentheses,
+# i.e. '@selector(foo)' vs. '@selector( foo )'.
+# Also applies to '@protocol()' constructs.
+sp_inside_oc_at_sel_parens      = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space before a block pointer caret,
+# i.e. '^int (int arg){...}' vs. ' ^int (int arg){...}'.
+sp_before_oc_block_caret        = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space after a block pointer caret,
+# i.e. '^int (int arg){...}' vs. '^ int (int arg){...}'.
+sp_after_oc_block_caret         = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space between the receiver and selector in a message,
+# as in '[receiver selector ...]'.
+sp_after_oc_msg_receiver        = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space after '@property'.
+sp_after_oc_property            = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove space between '@synchronized' and the open parenthesis,
+# i.e. '@synchronized(foo)' vs. '@synchronized (foo)'.
+sp_after_oc_synchronized        = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space around the ':' in 'b ? t : f'.
+sp_cond_colon                   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before the ':' in 'b ? t : f'.
+#
+# Overrides sp_cond_colon.
+sp_cond_colon_before            = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after the ':' in 'b ? t : f'.
+#
+# Overrides sp_cond_colon.
+sp_cond_colon_after             = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space around the '?' in 'b ? t : f'.
+sp_cond_question                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before the '?' in 'b ? t : f'.
+#
+# Overrides sp_cond_question.
+sp_cond_question_before         = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after the '?' in 'b ? t : f'.
+#
+# Overrides sp_cond_question.
+sp_cond_question_after          = ignore   # ignore/add/remove/force/not_defined
+
+# In the abbreviated ternary form '(a ?: b)', add or remove space between '?'
+# and ':'.
+#
+# Overrides all other sp_cond_* options.
+sp_cond_ternary_short           = ignore   # ignore/add/remove/force/not_defined
+
+# Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make
+# sense here.
+sp_case_label                   = ignore   # ignore/add/remove/force/not_defined
+
+# (D) Add or remove space around the D '..' operator.
+sp_range                        = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after ':' in a Java/C++11 range-based 'for',
+# as in 'for (Type var : <here> expr)'.
+sp_after_for_colon              = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before ':' in a Java/C++11 range-based 'for',
+# as in 'for (Type var <here> : expr)'.
+sp_before_for_colon             = ignore   # ignore/add/remove/force/not_defined
+
+# (D) Add or remove space between 'extern' and '(' as in 'extern <here> (C)'.
+sp_extern_paren                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after the opening of a C++ comment, as in '// <here> A'.
+sp_cmt_cpp_start                = ignore   # ignore/add/remove/force/not_defined
+
+# remove space after the '//' and the pvs command '-V1234',
+# only works with sp_cmt_cpp_start set to add or force.
+sp_cmt_cpp_pvs                  = false    # true/false
+
+# remove space after the '//' and the command 'lint',
+# only works with sp_cmt_cpp_start set to add or force.
+sp_cmt_cpp_lint                 = false    # true/false
+
+# Add or remove space in a C++ region marker comment, as in '// <here> BEGIN'.
+# A region marker is defined as a comment which is not preceded by other text
+# (i.e. the comment is the first non-whitespace on the line), and which starts
+# with either 'BEGIN' or 'END'.
+#
+# Overrides sp_cmt_cpp_start.
+sp_cmt_cpp_region               = ignore   # ignore/add/remove/force/not_defined
+
+# If true, space added with sp_cmt_cpp_start will be added after Doxygen
+# sequences like '///', '///<', '//!' and '//!<'.
+sp_cmt_cpp_doxygen              = false    # true/false
+
+# If true, space added with sp_cmt_cpp_start will be added after Qt translator
+# or meta-data comments like '//:', '//=', and '//~'.
+sp_cmt_cpp_qttr                 = false    # true/false
+
+# Add or remove space between #else or #endif and a trailing comment.
+sp_endif_cmt                    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after 'new', 'delete' and 'delete[]'.
+sp_after_new                    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between 'new' and '(' in 'new()'.
+sp_between_new_paren            = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space between ')' and type in 'new(foo) BAR'.
+sp_after_newop_paren            = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside parentheses of the new operator
+# as in 'new(foo) BAR'.
+sp_inside_newop_paren           = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after the open parenthesis of the new operator,
+# as in 'new(foo) BAR'.
+#
+# Overrides sp_inside_newop_paren.
+sp_inside_newop_paren_open      = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before the close parenthesis of the new operator,
+# as in 'new(foo) BAR'.
+#
+# Overrides sp_inside_newop_paren.
+sp_inside_newop_paren_close     = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before a trailing comment.
+sp_before_tr_cmt                = ignore   # ignore/add/remove/force/not_defined
+
+# Number of spaces before a trailing comment.
+sp_num_before_tr_cmt            = 0        # unsigned number
+
+# Add or remove space before an embedded comment.
+#
+# Default: force
+sp_before_emb_cmt               = force    # ignore/add/remove/force/not_defined
+
+# Number of spaces before an embedded comment.
+#
+# Default: 1
+sp_num_before_emb_cmt           = 1        # unsigned number
+
+# Add or remove space after an embedded comment.
+#
+# Default: force
+sp_after_emb_cmt                = force    # ignore/add/remove/force/not_defined
+
+# Number of spaces after an embedded comment.
+#
+# Default: 1
+sp_num_after_emb_cmt            = 1        # unsigned number
+
+# (Java) Add or remove space between an annotation and the open parenthesis.
+sp_annotation_paren             = ignore   # ignore/add/remove/force/not_defined
+
+# If true, vbrace tokens are dropped to the previous token and skipped.
+sp_skip_vbrace_tokens           = false    # true/false
+
+# Add or remove space after 'noexcept'.
+sp_after_noexcept               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after '_'.
+sp_vala_after_translation       = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before a bit colon ':'.
+sp_before_bit_colon             = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space after a bit colon ':'.
+sp_after_bit_colon              = ignore   # ignore/add/remove/force/not_defined
+
+# If true, a <TAB> is inserted after #define.
+force_tab_after_define          = false    # true/false
+
+#
+# Indenting options
+#
+
+# The number of columns to indent per level. Usually 2, 3, 4, or 8.
+#
+# Default: 8
+indent_columns                  = 4        # unsigned number
+
+# Whether to ignore indent for the first continuation line. Subsequent
+# continuation lines will still be indented to match the first.
+indent_ignore_first_continue    = false    # true/false
+
+# The continuation indent. If non-zero, this overrides the indent of '(', '['
+# and '=' continuation indents. Negative values are OK; negative value is
+# absolute and not increased for each '(' or '[' level.
+#
+# For FreeBSD, this is set to 4.
+# Requires indent_ignore_first_continue=false.
+indent_continue                 = 0        # number
+
+# The continuation indent, only for class header line(s). If non-zero, this
+# overrides the indent of 'class' continuation indents.
+# Requires indent_ignore_first_continue=false.
+indent_continue_class_head      = 0        # unsigned number
+
+# Whether to indent empty lines (i.e. lines which contain only spaces before
+# the newline character).
+indent_single_newlines          = false    # true/false
+
+# The continuation indent for func_*_param if they are true. If non-zero, this
+# overrides the indent.
+indent_param                    = 0        # unsigned number
+
+# How to use tabs when indenting code.
+#
+# 0: Spaces only
+# 1: Indent with tabs to brace level, align with spaces (default)
+# 2: Indent and align with tabs, using spaces when not on a tabstop
+#
+# Default: 1
+indent_with_tabs                = 0        # unsigned number
+
+# Whether to indent comments that are not at a brace level with tabs on a
+# tabstop. Requires indent_with_tabs=2. If false, will use spaces.
+indent_cmt_with_tabs            = false    # true/false
+
+# Whether to indent strings broken by '\' so that they line up.
+indent_align_string             = false    # true/false
+
+# The number of spaces to indent multi-line XML strings.
+# Requires indent_align_string=true.
+indent_xml_string               = 0        # unsigned number
+
+# Spaces to indent '{' from level.
+indent_brace                    = 0        # unsigned number
+
+# Whether braces are indented to the body level.
+indent_braces                   = false    # true/false
+
+# Whether to disable indenting function braces if indent_braces=true.
+indent_braces_no_func           = false    # true/false
+
+# Whether to disable indenting class braces if indent_braces=true.
+indent_braces_no_class          = false    # true/false
+
+# Whether to disable indenting struct braces if indent_braces=true.
+indent_braces_no_struct         = false    # true/false
+
+# Whether to indent based on the size of the brace parent,
+# i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc.
+indent_brace_parent             = false    # true/false
+
+# Whether to indent based on the open parenthesis instead of the open brace
+# in '({\n'.
+indent_paren_open_brace         = false    # true/false
+
+# (C#) Whether to indent the brace of a C# delegate by another level.
+indent_cs_delegate_brace        = false    # true/false
+
+# (C#) Whether to indent a C# delegate (to handle delegates with no brace) by
+# another level.
+indent_cs_delegate_body         = false    # true/false
+
+# Whether to indent the body of a 'namespace'.
+indent_namespace                = false    # true/false
+
+# Whether to indent only the first namespace, and not any nested namespaces.
+# Requires indent_namespace=true.
+indent_namespace_single_indent  = false    # true/false
+
+# The number of spaces to indent a namespace block.
+# If set to zero, use the value indent_columns
+indent_namespace_level          = 0        # unsigned number
+
+# If the body of the namespace is longer than this number, it won't be
+# indented. Requires indent_namespace=true. 0 means no limit.
+indent_namespace_limit          = 0        # unsigned number
+
+# Whether to indent only in inner namespaces (nested in other namespaces).
+# Requires indent_namespace=true.
+indent_namespace_inner_only     = false    # true/false
+
+# Whether the 'extern "C"' body is indented.
+indent_extern                   = false    # true/false
+
+# Whether the 'class' body is indented.
+indent_class                    = false    # true/false
+
+# Whether to ignore indent for the leading base class colon.
+indent_ignore_before_class_colon = false    # true/false
+
+# Additional indent before the leading base class colon.
+# Negative values decrease indent down to the first column.
+# Requires indent_ignore_before_class_colon=false and a newline break before
+# the colon (see pos_class_colon and nl_class_colon)
+indent_before_class_colon       = 0        # number
+
+# Whether to indent the stuff after a leading base class colon.
+indent_class_colon              = false    # true/false
+
+# Whether to indent based on a class colon instead of the stuff after the
+# colon. Requires indent_class_colon=true.
+indent_class_on_colon           = false    # true/false
+
+# Whether to ignore indent for a leading class initializer colon.
+indent_ignore_before_constr_colon = false    # true/false
+
+# Whether to indent the stuff after a leading class initializer colon.
+indent_constr_colon             = false    # true/false
+
+# Virtual indent from the ':' for leading member initializers.
+#
+# Default: 2
+indent_ctor_init_leading        = 2        # unsigned number
+
+# Virtual indent from the ':' for following member initializers.
+#
+# Default: 2
+indent_ctor_init_following      = 2        # unsigned number
+
+# Additional indent for constructor initializer list.
+# Negative values decrease indent down to the first column.
+indent_ctor_init                = 0        # number
+
+# Whether to indent 'if' following 'else' as a new block under the 'else'.
+# If false, 'else\nif' is treated as 'else if' for indenting purposes.
+indent_else_if                  = false    # true/false
+
+# Amount to indent variable declarations after a open brace.
+#
+#  <0: Relative
+# >=0: Absolute
+indent_var_def_blk              = 0        # number
+
+# Whether to indent continued variable declarations instead of aligning.
+indent_var_def_cont             = false    # true/false
+
+# How to indent continued shift expressions ('<<' and '>>').
+# Set align_left_shift=false when using this.
+#  0: Align shift operators instead of indenting them (default)
+#  1: Indent by one level
+# -1: Preserve original indentation
+indent_shift                    = 0        # number
+
+# Whether to force indentation of function definitions to start in column 1.
+indent_func_def_force_col1      = false    # true/false
+
+# Whether to indent continued function call parameters one indent level,
+# rather than aligning parameters under the open parenthesis.
+indent_func_call_param          = true    # true/false
+
+# Whether to indent continued function definition parameters one indent level,
+# rather than aligning parameters under the open parenthesis.
+indent_func_def_param           = false    # true/false
+
+# for function definitions, only if indent_func_def_param is false
+# Allows to align params when appropriate and indent them when not
+# behave as if it was true if paren position is more than this value
+# if paren position is more than the option value
+indent_func_def_param_paren_pos_threshold = 0        # unsigned number
+
+# Whether to indent continued function call prototype one indent level,
+# rather than aligning parameters under the open parenthesis.
+indent_func_proto_param         = true    # true/false
+
+# Whether to indent continued function call declaration one indent level,
+# rather than aligning parameters under the open parenthesis.
+indent_func_class_param         = false    # true/false
+
+# Whether to indent continued class variable constructors one indent level,
+# rather than aligning parameters under the open parenthesis.
+indent_func_ctor_var_param      = false    # true/false
+
+# Whether to indent continued template parameter list one indent level,
+# rather than aligning parameters under the open parenthesis.
+indent_template_param           = false    # true/false
+
+# Double the indent for indent_func_xxx_param options.
+# Use both values of the options indent_columns and indent_param.
+indent_func_param_double        = false    # true/false
+
+# Indentation column for standalone 'const' qualifier on a function
+# prototype.
+indent_func_const               = 0        # unsigned number
+
+# Indentation column for standalone 'throw' qualifier on a function
+# prototype.
+indent_func_throw               = 0        # unsigned number
+
+# How to indent within a macro followed by a brace on the same line
+# This allows reducing the indent in macros that have (for example)
+# `do { ... } while (0)` blocks bracketing them.
+#
+# true:  add an indent for the brace on the same line as the macro
+# false: do not add an indent for the brace on the same line as the macro
+#
+# Default: true
+indent_macro_brace              = true     # true/false
+
+# The number of spaces to indent a continued '->' or '.'.
+# Usually set to 0, 1, or indent_columns.
+indent_member                   = 0        # unsigned number
+
+# Whether lines broken at '.' or '->' should be indented by a single indent.
+# The indent_member option will not be effective if this is set to true.
+indent_member_single            = false    # true/false
+
+# Spaces to indent single line ('//') comments on lines before code.
+indent_single_line_comments_before = 0        # unsigned number
+
+# Spaces to indent single line ('//') comments on lines after code.
+indent_single_line_comments_after = 0        # unsigned number
+
+# When opening a paren for a control statement (if, for, while, etc), increase
+# the indent level by this value. Negative values decrease the indent level.
+indent_sparen_extra             = 0        # number
+
+# Whether to indent trailing single line ('//') comments relative to the code
+# instead of trying to keep the same absolute column.
+indent_relative_single_line_comments = false    # true/false
+
+# Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
+# It might be wise to choose the same value for the option indent_case_brace.
+indent_switch_case              = 4        # unsigned number
+
+# Spaces to indent the body of a 'switch' before any 'case'.
+# Usually the same as indent_columns or indent_switch_case.
+indent_switch_body              = 0        # unsigned number
+
+# Whether to ignore indent for '{' following 'case'.
+indent_ignore_case_brace        = false    # true/false
+
+# Spaces to indent '{' from 'case'. By default, the brace will appear under
+# the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.
+# It might be wise to choose the same value for the option indent_switch_case.
+indent_case_brace               = 0        # number
+
+# indent 'break' with 'case' from 'switch'.
+indent_switch_break_with_case   = false    # true/false
+
+# Whether to indent preprocessor statements inside of switch statements.
+#
+# Default: true
+indent_switch_pp                = true     # true/false
+
+# Spaces to shift the 'case' line, without affecting any other lines.
+# Usually 0.
+indent_case_shift               = 0        # unsigned number
+
+# Whether to align comments before 'case' with the 'case'.
+#
+# Default: true
+indent_case_comment             = true     # true/false
+
+# Whether to indent comments not found in first column.
+#
+# Default: true
+indent_comment                  = true     # true/false
+
+# Whether to indent comments found in first column.
+indent_col1_comment             = false    # true/false
+
+# Whether to indent multi string literal in first column.
+indent_col1_multi_string_literal = false    # true/false
+
+# Align comments on adjacent lines that are this many columns apart or less.
+#
+# Default: 3
+indent_comment_align_thresh     = 3        # unsigned number
+
+# Whether to ignore indent for goto labels.
+indent_ignore_label             = false    # true/false
+
+# How to indent goto labels. Requires indent_ignore_label=false.
+#
+#  >0: Absolute column where 1 is the leftmost column
+# <=0: Subtract from brace indent
+#
+# Default: 1
+indent_label                    = 1        # number
+
+# How to indent access specifiers that are followed by a
+# colon.
+#
+#  >0: Absolute column where 1 is the leftmost column
+# <=0: Subtract from brace indent
+#
+# Default: 1
+indent_access_spec              = 1        # number
+
+# Whether to indent the code after an access specifier by one level.
+# If true, this option forces 'indent_access_spec=0'.
+indent_access_spec_body         = false    # true/false
+
+# If an open parenthesis is followed by a newline, whether to indent the next
+# line so that it lines up after the open parenthesis (not recommended).
+indent_paren_nl                 = false    # true/false
+
+# How to indent a close parenthesis after a newline.
+#
+#  0: Indent to body level (default)
+#  1: Align under the open parenthesis
+#  2: Indent to the brace level
+# -1: Preserve original indentation
+indent_paren_close              = 0        # number
+
+# Whether to indent the open parenthesis of a function definition,
+# if the parenthesis is on its own line.
+indent_paren_after_func_def     = false    # true/false
+
+# Whether to indent the open parenthesis of a function declaration,
+# if the parenthesis is on its own line.
+indent_paren_after_func_decl    = false    # true/false
+
+# Whether to indent the open parenthesis of a function call,
+# if the parenthesis is on its own line.
+indent_paren_after_func_call    = false    # true/false
+
+# How to indent a comma when inside braces.
+#  0: Indent by one level (default)
+#  1: Align under the open brace
+# -1: Preserve original indentation
+indent_comma_brace              = 0        # number
+
+# How to indent a comma when inside parentheses.
+#  0: Indent by one level (default)
+#  1: Align under the open parenthesis
+# -1: Preserve original indentation
+indent_comma_paren              = 0        # number
+
+# How to indent a Boolean operator when inside parentheses.
+#  0: Indent by one level (default)
+#  1: Align under the open parenthesis
+# -1: Preserve original indentation
+indent_bool_paren               = 0        # number
+
+# Whether to ignore the indentation of a Boolean operator when outside
+# parentheses.
+indent_ignore_bool              = false    # true/false
+
+# Whether to ignore the indentation of an arithmetic operator.
+indent_ignore_arith             = false    # true/false
+
+# Whether to indent a semicolon when inside a for parenthesis.
+# If true, aligns under the open for parenthesis.
+indent_semicolon_for_paren      = false    # true/false
+
+# Whether to ignore the indentation of a semicolon outside of a 'for'
+# statement.
+indent_ignore_semicolon         = false    # true/false
+
+# Whether to align the first expression to following ones
+# if indent_bool_paren=1.
+indent_first_bool_expr          = false    # true/false
+
+# Whether to align the first expression to following ones
+# if indent_semicolon_for_paren=true.
+indent_first_for_expr           = false    # true/false
+
+# If an open square is followed by a newline, whether to indent the next line
+# so that it lines up after the open square (not recommended).
+indent_square_nl                = false    # true/false
+
+# (ESQL/C) Whether to preserve the relative indent of 'EXEC SQL' bodies.
+indent_preserve_sql             = false    # true/false
+
+# Whether to ignore the indentation of an assignment operator.
+indent_ignore_assign            = false    # true/false
+
+# Whether to align continued statements at the '='. If false or if the '=' is
+# followed by a newline, the next line is indent one tab.
+#
+# Default: true
+indent_align_assign             = true     # true/false
+
+# If true, the indentation of the chunks after a '=' sequence will be set at
+# LHS token indentation column before '='.
+indent_off_after_assign         = false    # true/false
+
+# Whether to align continued statements at the '('. If false or the '(' is
+# followed by a newline, the next line indent is one tab.
+#
+# Default: true
+indent_align_paren              = true     # true/false
+
+# (OC) Whether to indent Objective-C code inside message selectors.
+indent_oc_inside_msg_sel        = false    # true/false
+
+# (OC) Whether to indent Objective-C blocks at brace level instead of usual
+# rules.
+indent_oc_block                 = false    # true/false
+
+# (OC) Indent for Objective-C blocks in a message relative to the parameter
+# name.
+#
+# =0: Use indent_oc_block rules
+# >0: Use specified number of spaces to indent
+indent_oc_block_msg             = 0        # unsigned number
+
+# (OC) Minimum indent for subsequent parameters
+indent_oc_msg_colon             = 0        # unsigned number
+
+# (OC) Whether to prioritize aligning with initial colon (and stripping spaces
+# from lines, if necessary).
+#
+# Default: true
+indent_oc_msg_prioritize_first_colon = true     # true/false
+
+# (OC) Whether to indent blocks the way that Xcode does by default
+# (from the keyword if the parameter is on its own line; otherwise, from the
+# previous indentation level). Requires indent_oc_block_msg=true.
+indent_oc_block_msg_xcode_style = false    # true/false
+
+# (OC) Whether to indent blocks from where the brace is, relative to a
+# message keyword. Requires indent_oc_block_msg=true.
+indent_oc_block_msg_from_keyword = false    # true/false
+
+# (OC) Whether to indent blocks from where the brace is, relative to a message
+# colon. Requires indent_oc_block_msg=true.
+indent_oc_block_msg_from_colon  = false    # true/false
+
+# (OC) Whether to indent blocks from where the block caret is.
+# Requires indent_oc_block_msg=true.
+indent_oc_block_msg_from_caret  = false    # true/false
+
+# (OC) Whether to indent blocks from where the brace caret is.
+# Requires indent_oc_block_msg=true.
+indent_oc_block_msg_from_brace  = false    # true/false
+
+# When indenting after virtual brace open and newline add further spaces to
+# reach this minimum indent.
+indent_min_vbrace_open          = 0        # unsigned number
+
+# Whether to add further spaces after regular indent to reach next tabstop
+# when indenting after virtual brace open and newline.
+indent_vbrace_open_on_tabstop   = false    # true/false
+
+# How to indent after a brace followed by another token (not a newline).
+# true:  indent all contained lines to match the token
+# false: indent all contained lines to match the brace
+#
+# Default: true
+indent_token_after_brace        = true     # true/false
+
+# Whether to indent the body of a C++11 lambda.
+indent_cpp_lambda_body          = false    # true/false
+
+# How to indent compound literals that are being returned.
+# true: add both the indent from return & the compound literal open brace
+#       (i.e. 2 indent levels)
+# false: only indent 1 level, don't add the indent for the open brace, only
+#        add the indent for the return.
+#
+# Default: true
+indent_compound_literal_return  = true     # true/false
+
+# (C#) Whether to indent a 'using' block if no braces are used.
+#
+# Default: true
+indent_using_block              = true     # true/false
+
+# How to indent the continuation of ternary operator.
+#
+# 0: Off (default)
+# 1: When the `if_false` is a continuation, indent it under the `if_true` branch
+# 2: When the `:` is a continuation, indent it under `?`
+indent_ternary_operator         = 0        # unsigned number
+
+# Whether to indent the statements inside ternary operator.
+indent_inside_ternary_operator  = false    # true/false
+
+# If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.
+indent_off_after_return         = false    # true/false
+
+# If true, the indentation of the chunks after a `return new` sequence will be set at return indentation column.
+indent_off_after_return_new     = false    # true/false
+
+# If true, the tokens after return are indented with regular single indentation. By default (false) the indentation is after the return token.
+indent_single_after_return      = false    # true/false
+
+# Whether to ignore indent and alignment for 'asm' blocks (i.e. assume they
+# have their own indentation).
+indent_ignore_asm_block         = false    # true/false
+
+# Don't indent the close parenthesis of a function definition,
+# if the parenthesis is on its own line.
+donot_indent_func_def_close_paren = false    # true/false
+
+#
+# Newline adding and removing options
+#
+
+# Whether to collapse empty blocks between '{' and '}' except for functions.
+# Use nl_collapse_empty_body_functions to specify how empty function braces
+# should be formatted.
+nl_collapse_empty_body          = false    # true/false
+
+# Whether to collapse empty blocks between '{' and '}' for functions only.
+# If true, overrides nl_inside_empty_func.
+nl_collapse_empty_body_functions = false    # true/false
+
+# Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.
+nl_assign_leave_one_liners      = false    # true/false
+
+# Don't split one-line braced statements inside a 'class xx { }' body.
+nl_class_leave_one_liners       = false    # true/false
+
+# Don't split one-line enums, as in 'enum foo { BAR = 15 };'
+nl_enum_leave_one_liners        = false    # true/false
+
+# Don't split one-line get or set functions.
+nl_getset_leave_one_liners      = false    # true/false
+
+# (C#) Don't split one-line property get or set functions.
+nl_cs_property_leave_one_liners = false    # true/false
+
+# Don't split one-line function definitions, as in 'int foo() { return 0; }'.
+# might modify nl_func_type_name
+nl_func_leave_one_liners        = false    # true/false
+
+# Don't split one-line C++11 lambdas, as in '[]() { return 0; }'.
+nl_cpp_lambda_leave_one_liners  = false    # true/false
+
+# Don't split one-line if/else statements, as in 'if(...) b++;'.
+nl_if_leave_one_liners          = false    # true/false
+
+# Don't split one-line while statements, as in 'while(...) b++;'.
+nl_while_leave_one_liners       = false    # true/false
+
+# Don't split one-line do statements, as in 'do { b++; } while(...);'.
+nl_do_leave_one_liners          = false    # true/false
+
+# Don't split one-line for statements, as in 'for(...) b++;'.
+nl_for_leave_one_liners         = false    # true/false
+
+# (OC) Don't split one-line Objective-C messages.
+nl_oc_msg_leave_one_liner       = false    # true/false
+
+# (OC) Add or remove newline between method declaration and '{'.
+nl_oc_mdef_brace                = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove newline between Objective-C block signature and '{'.
+nl_oc_block_brace               = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove blank line before '@interface' statement.
+nl_oc_before_interface          = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove blank line before '@implementation' statement.
+nl_oc_before_implementation     = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove blank line before '@end' statement.
+nl_oc_before_end                = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove newline between '@interface' and '{'.
+nl_oc_interface_brace           = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove newline between '@implementation' and '{'.
+nl_oc_implementation_brace      = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newlines at the start of the file.
+nl_start_of_file                = ignore   # ignore/add/remove/force/not_defined
+
+# The minimum number of newlines at the start of the file (only used if
+# nl_start_of_file is 'add' or 'force').
+nl_start_of_file_min            = 0        # unsigned number
+
+# Add or remove newline at the end of the file.
+nl_end_of_file                  = ignore   # ignore/add/remove/force/not_defined
+
+# The minimum number of newlines at the end of the file (only used if
+# nl_end_of_file is 'add' or 'force').
+nl_end_of_file_min              = 0        # unsigned number
+
+# Add or remove newline between '=' and '{'.
+nl_assign_brace                 = ignore   # ignore/add/remove/force/not_defined
+
+# (D) Add or remove newline between '=' and '['.
+nl_assign_square                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between '[]' and '{'.
+nl_tsquare_brace                = ignore   # ignore/add/remove/force/not_defined
+
+# (D) Add or remove newline after '= ['. Will also affect the newline before
+# the ']'.
+nl_after_square_assign          = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between a function call's ')' and '{', as in
+# 'list_for_each(item, &list) { }'.
+nl_fcall_brace                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'enum' and '{'.
+nl_enum_brace                   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'enum' and 'class'.
+nl_enum_class                   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'enum class' and the identifier.
+nl_enum_class_identifier        = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'enum class' type and ':'.
+nl_enum_identifier_colon        = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'enum class identifier :' and type.
+nl_enum_colon_type              = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'struct and '{'.
+nl_struct_brace                 = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'union' and '{'.
+nl_union_brace                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'if' and '{'.
+nl_if_brace                     = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between '}' and 'else'.
+nl_brace_else                   = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'else if' and '{'. If set to ignore,
+# nl_if_brace is used instead.
+nl_elseif_brace                 = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'else' and '{'.
+nl_else_brace                   = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'else' and 'if'.
+nl_else_if                      = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove newline before '{' opening brace
+nl_before_opening_brace_func_class_def = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove newline before 'if'/'else if' closing parenthesis.
+nl_before_if_closing_paren      = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between '}' and 'finally'.
+nl_brace_finally                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'finally' and '{'.
+nl_finally_brace                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'try' and '{'.
+nl_try_brace                    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between get/set and '{'.
+nl_getset_brace                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'for' and '{'.
+nl_for_brace                    = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove newline before the '{' of a 'catch' statement, as in
+# 'catch (decl) <here> {'.
+nl_catch_brace                  = remove   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove newline before the '{' of a '@catch' statement, as in
+# '@catch (decl) <here> {'. If set to ignore, nl_catch_brace is used.
+nl_oc_catch_brace               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between '}' and 'catch'.
+nl_brace_catch                  = ignore   # ignore/add/remove/force/not_defined
+
+# (OC) Add or remove newline between '}' and '@catch'. If set to ignore,
+# nl_brace_catch is used.
+nl_oc_brace_catch               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between '}' and ']'.
+nl_brace_square                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between '}' and ')' in a function invocation.
+nl_brace_fparen                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'while' and '{'.
+nl_while_brace                  = remove   # ignore/add/remove/force/not_defined
+
+# (D) Add or remove newline between 'scope (x)' and '{'.
+nl_scope_brace                  = ignore   # ignore/add/remove/force/not_defined
+
+# (D) Add or remove newline between 'unittest' and '{'.
+nl_unittest_brace               = ignore   # ignore/add/remove/force/not_defined
+
+# (D) Add or remove newline between 'version (x)' and '{'.
+nl_version_brace                = ignore   # ignore/add/remove/force/not_defined
+
+# (C#) Add or remove newline between 'using' and '{'.
+nl_using_brace                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between two open or close braces. Due to general
+# newline/brace handling, REMOVE may not work.
+nl_brace_brace                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'do' and '{'.
+nl_do_brace                     = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between '}' and 'while' of 'do' statement.
+nl_brace_while                  = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'switch' and '{'.
+nl_switch_brace                 = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'synchronized' and '{'.
+nl_synchronized_brace           = ignore   # ignore/add/remove/force/not_defined
+
+# Add a newline between ')' and '{' if the ')' is on a different line than the
+# if/for/etc.
+#
+# Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and
+# nl_catch_brace.
+nl_multi_line_cond              = false    # true/false
+
+# Add a newline after '(' if an if/for/while/switch condition spans multiple
+# lines
+nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force/not_defined
+
+# Add a newline before ')' if an if/for/while/switch condition spans multiple
+# lines. Overrides nl_before_if_closing_paren if both are specified.
+nl_multi_line_sparen_close      = ignore   # ignore/add/remove/force/not_defined
+
+# Force a newline in a define after the macro name for multi-line defines.
+nl_multi_line_define            = false    # true/false
+
+# Whether to add a newline before 'case', and a blank line before a 'case'
+# statement that follows a ';' or '}'.
+nl_before_case                  = false    # true/false
+
+# Whether to add a newline after a 'case' statement.
+nl_after_case                   = false    # true/false
+
+# Add or remove newline between a case ':' and '{'.
+#
+# Overrides nl_after_case.
+nl_case_colon_brace             = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between ')' and 'throw'.
+nl_before_throw                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'namespace' and '{'.
+nl_namespace_brace              = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline after 'template<...>' of a template class.
+nl_template_class               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline after 'template<...>' of a template class declaration.
+#
+# Overrides nl_template_class.
+nl_template_class_decl          = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline after 'template<>' of a specialized class declaration.
+#
+# Overrides nl_template_class_decl.
+nl_template_class_decl_special  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline after 'template<...>' of a template class definition.
+#
+# Overrides nl_template_class.
+nl_template_class_def           = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline after 'template<>' of a specialized class definition.
+#
+# Overrides nl_template_class_def.
+nl_template_class_def_special   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline after 'template<...>' of a template function.
+nl_template_func                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline after 'template<...>' of a template function
+# declaration.
+#
+# Overrides nl_template_func.
+nl_template_func_decl           = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline after 'template<>' of a specialized function
+# declaration.
+#
+# Overrides nl_template_func_decl.
+nl_template_func_decl_special   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline after 'template<...>' of a template function
+# definition.
+#
+# Overrides nl_template_func.
+nl_template_func_def            = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline after 'template<>' of a specialized function
+# definition.
+#
+# Overrides nl_template_func_def.
+nl_template_func_def_special    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline after 'template<...>' of a template variable.
+nl_template_var                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'template<...>' and 'using' of a templated
+# type alias.
+nl_template_using               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'class' and '{'.
+nl_class_brace                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline before or after (depending on pos_class_comma,
+# may not be IGNORE) each',' in the base class list.
+nl_class_init_args              = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline after each ',' in the constructor member
+# initialization. Related to nl_constr_colon, pos_constr_colon and
+# pos_constr_comma.
+nl_constr_init_args             = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline before first element, after comma, and after last
+# element, in 'enum'.
+nl_enum_own_lines               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between return type and function name in a function
+# definition.
+# might be modified by nl_func_leave_one_liners
+nl_func_type_name               = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between return type and function name inside a class
+# definition. If set to ignore, nl_func_type_name or nl_func_proto_type_name
+# is used instead.
+nl_func_type_name_class         = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between class specification and '::'
+# in 'void A::f() { }'. Only appears in separate member implementation (does
+# not appear with in-line implementation).
+nl_func_class_scope             = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between function scope and name, as in
+# 'void A :: <here> f() { }'.
+nl_func_scope_name              = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between return type and function name in a prototype.
+nl_func_proto_type_name         = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between a function name and the opening '(' in the
+# declaration.
+nl_func_paren                   = remove   # ignore/add/remove/force/not_defined
+
+# Overrides nl_func_paren for functions with no parameters.
+nl_func_paren_empty             = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between a function name and the opening '(' in the
+# definition.
+nl_func_def_paren               = ignore   # ignore/add/remove/force/not_defined
+
+# Overrides nl_func_def_paren for functions with no parameters.
+nl_func_def_paren_empty         = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between a function name and the opening '(' in the
+# call.
+nl_func_call_paren              = ignore   # ignore/add/remove/force/not_defined
+
+# Overrides nl_func_call_paren for functions with no parameters.
+nl_func_call_paren_empty        = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline after '(' in a function declaration.
+nl_func_decl_start              = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline after '(' in a function definition.
+nl_func_def_start               = ignore   # ignore/add/remove/force/not_defined
+
+# Overrides nl_func_decl_start when there is only one parameter.
+nl_func_decl_start_single       = ignore   # ignore/add/remove/force/not_defined
+
+# Overrides nl_func_def_start when there is only one parameter.
+nl_func_def_start_single        = ignore   # ignore/add/remove/force/not_defined
+
+# Whether to add a newline after '(' in a function declaration if '(' and ')'
+# are in different lines. If false, nl_func_decl_start is used instead.
+nl_func_decl_start_multi_line   = false    # true/false
+
+# Whether to add a newline after '(' in a function definition if '(' and ')'
+# are in different lines. If false, nl_func_def_start is used instead.
+nl_func_def_start_multi_line    = false    # true/false
+
+# Add or remove newline after each ',' in a function declaration.
+nl_func_decl_args               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline after each ',' in a function definition.
+nl_func_def_args                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline after each ',' in a function call.
+nl_func_call_args               = ignore   # ignore/add/remove/force/not_defined
+
+# Whether to add a newline after each ',' in a function declaration if '('
+# and ')' are in different lines. If false, nl_func_decl_args is used instead.
+nl_func_decl_args_multi_line    = false    # true/false
+
+# Whether to add a newline after each ',' in a function definition if '('
+# and ')' are in different lines. If false, nl_func_def_args is used instead.
+nl_func_def_args_multi_line     = false    # true/false
+
+# Add or remove newline before the ')' in a function declaration.
+nl_func_decl_end                = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove newline before the ')' in a function definition.
+nl_func_def_end                 = remove   # ignore/add/remove/force/not_defined
+
+# Overrides nl_func_decl_end when there is only one parameter.
+nl_func_decl_end_single         = ignore   # ignore/add/remove/force/not_defined
+
+# Overrides nl_func_def_end when there is only one parameter.
+nl_func_def_end_single          = ignore   # ignore/add/remove/force/not_defined
+
+# Whether to add a newline before ')' in a function declaration if '(' and ')'
+# are in different lines. If false, nl_func_decl_end is used instead.
+nl_func_decl_end_multi_line     = false    # true/false
+
+# Whether to add a newline before ')' in a function definition if '(' and ')'
+# are in different lines. If false, nl_func_def_end is used instead.
+nl_func_def_end_multi_line      = false    # true/false
+
+# Add or remove newline between '()' in a function declaration.
+nl_func_decl_empty              = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between '()' in a function definition.
+nl_func_def_empty               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between '()' in a function call.
+nl_func_call_empty              = ignore   # ignore/add/remove/force/not_defined
+
+# Whether to add a newline after '(' in a function call,
+# has preference over nl_func_call_start_multi_line.
+nl_func_call_start              = ignore   # ignore/add/remove/force/not_defined
+
+# Whether to add a newline before ')' in a function call.
+nl_func_call_end                = ignore   # ignore/add/remove/force/not_defined
+
+# Whether to add a newline after '(' in a function call if '(' and ')' are in
+# different lines.
+nl_func_call_start_multi_line   = false    # true/false
+
+# Whether to add a newline after each ',' in a function call if '(' and ')'
+# are in different lines.
+nl_func_call_args_multi_line    = false    # true/false
+
+# Whether to add a newline before ')' in a function call if '(' and ')' are in
+# different lines.
+nl_func_call_end_multi_line     = false    # true/false
+
+# Whether to respect nl_func_call_XXX option in case of closure args.
+nl_func_call_args_multi_line_ignore_closures = false    # true/false
+
+# Whether to add a newline after '<' of a template parameter list.
+nl_template_start               = false    # true/false
+
+# Whether to add a newline after each ',' in a template parameter list.
+nl_template_args                = false    # true/false
+
+# Whether to add a newline before '>' of a template parameter list.
+nl_template_end                 = false    # true/false
+
+# (OC) Whether to put each Objective-C message parameter on a separate line.
+# See nl_oc_msg_leave_one_liner.
+nl_oc_msg_args                  = false    # true/false
+
+# (OC) Minimum number of Objective-C message parameters before applying nl_oc_msg_args.
+nl_oc_msg_args_min_params       = 0        # unsigned number
+
+# (OC) Max code width of Objective-C message before applying nl_oc_msg_args.
+nl_oc_msg_args_max_code_width   = 0        # unsigned number
+
+# Add or remove newline between function signature and '{'.
+nl_fdef_brace                   = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between function signature and '{',
+# if signature ends with ')'. Overrides nl_fdef_brace.
+nl_fdef_brace_cond              = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between C++11 lambda signature and '{'.
+nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'return' and the return expression.
+nl_return_expr                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline between 'throw' and the throw expression.
+nl_throw_expr                   = ignore   # ignore/add/remove/force/not_defined
+
+# Whether to add a newline after semicolons, except in 'for' statements.
+nl_after_semicolon              = false    # true/false
+
+# (Java) Add or remove newline between the ')' and '{{' of the double brace
+# initializer.
+nl_paren_dbrace_open            = ignore   # ignore/add/remove/force/not_defined
+
+# Whether to add a newline after the type in an unnamed temporary
+# direct-list-initialization, better:
+# before a direct-list-initialization.
+nl_type_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
+
+# Whether to add a newline after the open brace in an unnamed temporary
+# direct-list-initialization.
+nl_type_brace_init_lst_open     = ignore   # ignore/add/remove/force/not_defined
+
+# Whether to add a newline before the close brace in an unnamed temporary
+# direct-list-initialization.
+nl_type_brace_init_lst_close    = ignore   # ignore/add/remove/force/not_defined
+
+# Whether to add a newline before '{'.
+nl_before_brace_open            = false    # true/false
+
+# Whether to add a newline after '{'.
+nl_after_brace_open             = false    # true/false
+
+# Whether to add a newline between the open brace and a trailing single-line
+# comment. Requires nl_after_brace_open=true.
+nl_after_brace_open_cmt         = false    # true/false
+
+# Whether to add a newline after a virtual brace open with a non-empty body.
+# These occur in un-braced if/while/do/for statement bodies.
+nl_after_vbrace_open            = false    # true/false
+
+# Whether to add a newline after a virtual brace open with an empty body.
+# These occur in un-braced if/while/do/for statement bodies.
+nl_after_vbrace_open_empty      = false    # true/false
+
+# Whether to add a newline after '}'. Does not apply if followed by a
+# necessary ';'.
+nl_after_brace_close            = false    # true/false
+
+# Whether to add a newline after a virtual brace close,
+# as in 'if (foo) a++; <here> return;'.
+nl_after_vbrace_close           = false    # true/false
+
+# Add or remove newline between the close brace and identifier,
+# as in 'struct { int a; } <here> b;'. Affects enumerations, unions and
+# structures. If set to ignore, uses nl_after_brace_close.
+nl_brace_struct_var             = ignore   # ignore/add/remove/force/not_defined
+
+# Whether to alter newlines in '#define' macros.
+nl_define_macro                 = false    # true/false
+
+# Whether to alter newlines between consecutive parenthesis closes. The number
+# of closing parentheses in a line will depend on respective open parenthesis
+# lines.
+nl_squeeze_paren_close          = false    # true/false
+
+# Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and
+# '#endif'. Does not affect top-level #ifdefs.
+nl_squeeze_ifdef                = false    # true/false
+
+# Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well.
+nl_squeeze_ifdef_top_level      = false    # true/false
+
+# Add or remove blank line before 'if'.
+nl_before_if                    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove blank line after 'if' statement. Add/Force work only if the
+# next token is not a closing brace.
+nl_after_if                     = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove blank line before 'for'.
+nl_before_for                   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove blank line after 'for' statement.
+nl_after_for                    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove blank line before 'while'.
+nl_before_while                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove blank line after 'while' statement.
+nl_after_while                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove blank line before 'switch'.
+nl_before_switch                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove blank line after 'switch' statement.
+nl_after_switch                 = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove blank line before 'synchronized'.
+nl_before_synchronized          = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove blank line after 'synchronized' statement.
+nl_after_synchronized           = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove blank line before 'do'.
+nl_before_do                    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove blank line after 'do/while' statement.
+nl_after_do                     = ignore   # ignore/add/remove/force/not_defined
+
+# Ignore nl_before_{if,for,switch,do,synchronized} if the control
+# statement is immediately after a case statement.
+# if nl_before_{if,for,switch,do} is set to remove, this option
+# does nothing.
+nl_before_ignore_after_case     = false    # true/false
+
+# Whether to put a blank line before 'return' statements, unless after an open
+# brace.
+nl_before_return                = false    # true/false
+
+# Whether to put a blank line after 'return' statements, unless followed by a
+# close brace.
+nl_after_return                 = false    # true/false
+
+# Whether to put a blank line before a member '.' or '->' operators.
+nl_before_member                = ignore   # ignore/add/remove/force/not_defined
+
+# (Java) Whether to put a blank line after a member '.' or '->' operators.
+nl_after_member                 = ignore   # ignore/add/remove/force/not_defined
+
+# Whether to double-space commented-entries in 'struct'/'union'/'enum'.
+nl_ds_struct_enum_cmt           = false    # true/false
+
+# Whether to force a newline before '}' of a 'struct'/'union'/'enum'.
+# (Lower priority than eat_blanks_before_close_brace.)
+nl_ds_struct_enum_close_brace   = false    # true/false
+
+# Add or remove newline before or after (depending on pos_class_colon) a class
+# colon, as in 'class Foo <here> : <or here> public Bar'.
+nl_class_colon                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove newline around a class constructor colon. The exact position
+# depends on nl_constr_init_args, pos_constr_colon and pos_constr_comma.
+nl_constr_colon                 = ignore   # ignore/add/remove/force/not_defined
+
+# Whether to collapse a two-line namespace, like 'namespace foo\n{ decl; }'
+# into a single line. If true, prevents other brace newline rules from turning
+# such code into four lines. If true, it also preserves one-liner namespaces.
+nl_namespace_two_to_one_liner   = false    # true/false
+
+# Whether to remove a newline in simple unbraced if statements, turning them
+# into one-liners, as in 'if(b)\n i++;' => 'if(b) i++;'.
+nl_create_if_one_liner          = false    # true/false
+
+# Whether to remove a newline in simple unbraced for statements, turning them
+# into one-liners, as in 'for (...)\n stmt;' => 'for (...) stmt;'.
+nl_create_for_one_liner         = false    # true/false
+
+# Whether to remove a newline in simple unbraced while statements, turning
+# them into one-liners, as in 'while (expr)\n stmt;' => 'while (expr) stmt;'.
+nl_create_while_one_liner       = false    # true/false
+
+# Whether to collapse a function definition whose body (not counting braces)
+# is only one line so that the entire definition (prototype, braces, body) is
+# a single line.
+nl_create_func_def_one_liner    = false    # true/false
+
+# Whether to split one-line simple list definitions into three lines by
+# adding newlines, as in 'int a[12] = { <here> 0 <here> };'.
+nl_create_list_one_liner        = false    # true/false
+
+# Whether to split one-line simple unbraced if statements into two lines by
+# adding a newline, as in 'if(b) <here> i++;'.
+nl_split_if_one_liner           = false    # true/false
+
+# Whether to split one-line simple unbraced for statements into two lines by
+# adding a newline, as in 'for (...) <here> stmt;'.
+nl_split_for_one_liner          = false    # true/false
+
+# Whether to split one-line simple unbraced while statements into two lines by
+# adding a newline, as in 'while (expr) <here> stmt;'.
+nl_split_while_one_liner        = false    # true/false
+
+# Don't add a newline before a cpp-comment in a parameter list of a function
+# call.
+donot_add_nl_before_cpp_comment = false    # true/false
+
+#
+# Blank line options
+#
+
+# The maximum number of consecutive newlines (3 = 2 blank lines).
+nl_max                          = 0        # unsigned number
+
+# The maximum number of consecutive newlines in a function.
+nl_max_blank_in_func            = 0        # unsigned number
+
+# The number of newlines inside an empty function body.
+# This option overrides eat_blanks_after_open_brace and
+# eat_blanks_before_close_brace, but is ignored when
+# nl_collapse_empty_body_functions=true
+nl_inside_empty_func            = 0        # unsigned number
+
+# The number of newlines before a function prototype.
+nl_before_func_body_proto       = 0        # unsigned number
+
+# The number of newlines before a multi-line function definition. Where
+# applicable, this option is overridden with eat_blanks_after_open_brace=true
+nl_before_func_body_def         = 0        # unsigned number
+
+# The number of newlines before a class constructor/destructor prototype.
+nl_before_func_class_proto      = 0        # unsigned number
+
+# The number of newlines before a class constructor/destructor definition.
+nl_before_func_class_def        = 0        # unsigned number
+
+# The number of newlines after a function prototype.
+nl_after_func_proto             = 0        # unsigned number
+
+# The number of newlines after a function prototype, if not followed by
+# another function prototype.
+nl_after_func_proto_group       = 0        # unsigned number
+
+# The number of newlines after a class constructor/destructor prototype.
+nl_after_func_class_proto       = 0        # unsigned number
+
+# The number of newlines after a class constructor/destructor prototype,
+# if not followed by another constructor/destructor prototype.
+nl_after_func_class_proto_group = 0        # unsigned number
+
+# Whether one-line method definitions inside a class body should be treated
+# as if they were prototypes for the purposes of adding newlines.
+#
+# Requires nl_class_leave_one_liners=true. Overrides nl_before_func_body_def
+# and nl_before_func_class_def for one-liners.
+nl_class_leave_one_liner_groups = false    # true/false
+
+# The number of newlines after '}' of a multi-line function body.
+#
+# Overrides nl_min_after_func_body and nl_max_after_func_body.
+nl_after_func_body              = 0        # unsigned number
+
+# The minimum number of newlines after '}' of a multi-line function body.
+#
+# Only works when nl_after_func_body is 0.
+nl_min_after_func_body          = 0        # unsigned number
+
+# The maximum number of newlines after '}' of a multi-line function body.
+#
+# Only works when nl_after_func_body is 0.
+# Takes precedence over nl_min_after_func_body.
+nl_max_after_func_body          = 0        # unsigned number
+
+# The number of newlines after '}' of a multi-line function body in a class
+# declaration. Also affects class constructors/destructors.
+#
+# Overrides nl_after_func_body.
+nl_after_func_body_class        = 0        # unsigned number
+
+# The number of newlines after '}' of a single line function body. Also
+# affects class constructors/destructors.
+#
+# Overrides nl_after_func_body and nl_after_func_body_class.
+nl_after_func_body_one_liner    = 0        # unsigned number
+
+# The number of newlines before a block of typedefs. If nl_after_access_spec
+# is non-zero, that option takes precedence.
+#
+# 0: No change (default).
+nl_typedef_blk_start            = 0        # unsigned number
+
+# The number of newlines after a block of typedefs.
+#
+# 0: No change (default).
+nl_typedef_blk_end              = 0        # unsigned number
+
+# The maximum number of consecutive newlines within a block of typedefs.
+#
+# 0: No change (default).
+nl_typedef_blk_in               = 0        # unsigned number
+
+# The minimum number of blank lines after a block of variable definitions
+# at the top of a function body. If any preprocessor directives appear
+# between the opening brace of the function and the variable block, then
+# it is considered as not at the top of the function.Newlines are added
+# before trailing preprocessor directives, if any exist.
+#
+# 0: No change (default).
+nl_var_def_blk_end_func_top     = 0        # unsigned number
+
+# The minimum number of empty newlines before a block of variable definitions
+# not at the top of a function body. If nl_after_access_spec is non-zero,
+# that option takes precedence. Newlines are not added at the top of the
+# file or just after an opening brace. Newlines are added above any
+# preprocessor directives before the block.
+#
+# 0: No change (default).
+nl_var_def_blk_start            = 0        # unsigned number
+
+# The minimum number of empty newlines after a block of variable definitions
+# not at the top of a function body. Newlines are not added if the block
+# is at the bottom of the file or just before a preprocessor directive.
+#
+# 0: No change (default).
+nl_var_def_blk_end              = 0        # unsigned number
+
+# The maximum number of consecutive newlines within a block of variable
+# definitions.
+#
+# 0: No change (default).
+nl_var_def_blk_in               = 0        # unsigned number
+
+# The minimum number of newlines before a multi-line comment.
+# Doesn't apply if after a brace open or another multi-line comment.
+nl_before_block_comment         = 0        # unsigned number
+
+# The minimum number of newlines before a single-line C comment.
+# Doesn't apply if after a brace open or other single-line C comments.
+nl_before_c_comment             = 0        # unsigned number
+
+# The minimum number of newlines before a CPP comment.
+# Doesn't apply if after a brace open or other CPP comments.
+nl_before_cpp_comment           = 0        # unsigned number
+
+# Whether to force a newline after a multi-line comment.
+nl_after_multiline_comment      = false    # true/false
+
+# Whether to force a newline after a label's colon.
+nl_after_label_colon            = false    # true/false
+
+# The number of newlines before a struct definition.
+nl_before_struct                = 0        # unsigned number
+
+# The number of newlines after '}' or ';' of a struct/enum/union definition.
+nl_after_struct                 = 0        # unsigned number
+
+# The number of newlines before a class definition.
+nl_before_class                 = 0        # unsigned number
+
+# The number of newlines after '}' or ';' of a class definition.
+nl_after_class                  = 0        # unsigned number
+
+# The number of newlines before a namespace.
+nl_before_namespace             = 0        # unsigned number
+
+# The number of newlines after '{' of a namespace. This also adds newlines
+# before the matching '}'.
+#
+# 0: Apply eat_blanks_after_open_brace or eat_blanks_before_close_brace if
+#     applicable, otherwise no change.
+#
+# Overrides eat_blanks_after_open_brace and eat_blanks_before_close_brace.
+nl_inside_namespace             = 0        # unsigned number
+
+# The number of newlines after '}' of a namespace.
+nl_after_namespace              = 0        # unsigned number
+
+# The number of newlines before an access specifier label. This also includes
+# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
+# if after a brace open.
+#
+# 0: No change (default).
+nl_before_access_spec           = 0        # unsigned number
+
+# The number of newlines after an access specifier label. This also includes
+# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
+# if after a brace open.
+#
+# 0: No change (default).
+#
+# Overrides nl_typedef_blk_start and nl_var_def_blk_start.
+nl_after_access_spec            = 0        # unsigned number
+
+# The number of newlines between a function definition and the function
+# comment, as in '// comment\n <here> void foo() {...}'.
+#
+# 0: No change (default).
+nl_comment_func_def             = 0        # unsigned number
+
+# The number of newlines after a try-catch-finally block that isn't followed
+# by a brace close.
+#
+# 0: No change (default).
+nl_after_try_catch_finally      = 0        # unsigned number
+
+# (C#) The number of newlines before and after a property, indexer or event
+# declaration.
+#
+# 0: No change (default).
+nl_around_cs_property           = 0        # unsigned number
+
+# (C#) The number of newlines between the get/set/add/remove handlers.
+#
+# 0: No change (default).
+nl_between_get_set              = 0        # unsigned number
+
+# (C#) Add or remove newline between property and the '{'.
+nl_property_brace               = ignore   # ignore/add/remove/force/not_defined
+
+# Whether to remove blank lines after '{'.
+eat_blanks_after_open_brace     = false    # true/false
+
+# Whether to remove blank lines before '}'.
+eat_blanks_before_close_brace   = false    # true/false
+
+# How aggressively to remove extra newlines not in preprocessor.
+#
+# 0: No change (default)
+# 1: Remove most newlines not handled by other config
+# 2: Remove all newlines and reformat completely by config
+nl_remove_extra_newlines        = 0        # unsigned number
+
+# (Java) Add or remove newline after an annotation statement. Only affects
+# annotations that are after a newline.
+nl_after_annotation             = ignore   # ignore/add/remove/force/not_defined
+
+# (Java) Add or remove newline between two annotations.
+nl_between_annotation           = ignore   # ignore/add/remove/force/not_defined
+
+# The number of newlines before a whole-file #ifdef.
+#
+# 0: No change (default).
+nl_before_whole_file_ifdef      = 0        # unsigned number
+
+# The number of newlines after a whole-file #ifdef.
+#
+# 0: No change (default).
+nl_after_whole_file_ifdef       = 0        # unsigned number
+
+# The number of newlines before a whole-file #endif.
+#
+# 0: No change (default).
+nl_before_whole_file_endif      = 0        # unsigned number
+
+# The number of newlines after a whole-file #endif.
+#
+# 0: No change (default).
+nl_after_whole_file_endif       = 0        # unsigned number
+
+#
+# Positioning options
+#
+
+# The position of arithmetic operators in wrapped expressions.
+pos_arith                       = lead   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+# The position of assignment in wrapped expressions. Do not affect '='
+# followed by '{'.
+pos_assign                      = trail   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+# The position of Boolean operators in wrapped expressions.
+pos_bool                        = lead   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+# The position of comparison operators in wrapped expressions.
+pos_compare                     = trail   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+# The position of conditional operators, as in the '?' and ':' of
+# 'expr ? stmt : stmt', in wrapped expressions.
+pos_conditional                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+# The position of the comma in wrapped expressions.
+pos_comma                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+# The position of the comma in enum entries.
+pos_enum_comma                  = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+# The position of the comma in the base class list if there is more than one
+# line. Affects nl_class_init_args.
+pos_class_comma                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+# The position of the comma in the constructor initialization list.
+# Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon.
+pos_constr_comma                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+# The position of trailing/leading class colon, between class and base class
+# list. Affects nl_class_colon.
+pos_class_colon                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+# The position of colons between constructor and member initialization.
+# Related to nl_constr_colon, nl_constr_init_args and pos_constr_comma.
+pos_constr_colon                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+# The position of shift operators in wrapped expressions.
+pos_shift                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
+
+#
+# Line splitting options
+#
+
+# Try to limit code width to N columns.
+code_width                      = 120        # unsigned number
+
+# Whether to fully split long 'for' statements at semi-colons.
+ls_for_split_full               = false    # true/false
+
+# Whether to fully split long function prototypes/calls at commas.
+# The option ls_code_width has priority over the option ls_func_split_full.
+ls_func_split_full              = false    # true/false
+
+# Whether to split lines as close to code_width as possible and ignore some
+# groupings.
+# The option ls_code_width has priority over the option ls_func_split_full.
+ls_code_width                   = false    # true/false
+
+#
+# Code alignment options (not left column spaces/tabs)
+#
+
+# Whether to keep non-indenting tabs.
+align_keep_tabs                 = false    # true/false
+
+# Whether to use tabs for aligning.
+align_with_tabs                 = false    # true/false
+
+# Whether to bump out to the next tab when aligning.
+align_on_tabstop                = false    # true/false
+
+# Whether to right-align numbers.
+align_number_right              = false    # true/false
+
+# Whether to keep whitespace not required for alignment.
+align_keep_extra_space          = false    # true/false
+
+# Whether to align variable definitions in prototypes and functions.
+align_func_params               = false    # true/false
+
+# The span for aligning parameter definitions in function on parameter name.
+#
+# 0: Don't align (default).
+align_func_params_span          = 0        # unsigned number
+
+# The threshold for aligning function parameter definitions.
+# Use a negative number for absolute thresholds.
+#
+# 0: No limit (default).
+align_func_params_thresh        = 0        # number
+
+# The gap for aligning function parameter definitions.
+align_func_params_gap           = 0        # unsigned number
+
+# The span for aligning constructor value.
+#
+# 0: Don't align (default).
+align_constr_value_span         = 0        # unsigned number
+
+# The threshold for aligning constructor value.
+# Use a negative number for absolute thresholds.
+#
+# 0: No limit (default).
+align_constr_value_thresh       = 0        # number
+
+# The gap for aligning constructor value.
+align_constr_value_gap          = 0        # unsigned number
+
+# Whether to align parameters in single-line functions that have the same
+# name. The function names must already be aligned with each other.
+align_same_func_call_params     = false    # true/false
+
+# The span for aligning function-call parameters for single line functions.
+#
+# 0: Don't align (default).
+align_same_func_call_params_span = 0        # unsigned number
+
+# The threshold for aligning function-call parameters for single line
+# functions.
+# Use a negative number for absolute thresholds.
+#
+# 0: No limit (default).
+align_same_func_call_params_thresh = 0        # number
+
+# The span for aligning variable definitions.
+#
+# 0: Don't align (default).
+align_var_def_span              = 0        # unsigned number
+
+# How to consider (or treat) the '*' in the alignment of variable definitions.
+#
+# 0: Part of the type     'void *   foo;' (default)
+# 1: Part of the variable 'void     *foo;'
+# 2: Dangling             'void    *foo;'
+# Dangling: the '*' will not be taken into account when aligning.
+align_var_def_star_style        = 0        # unsigned number
+
+# How to consider (or treat) the '&' in the alignment of variable definitions.
+#
+# 0: Part of the type     'long &   foo;' (default)
+# 1: Part of the variable 'long     &foo;'
+# 2: Dangling             'long    &foo;'
+# Dangling: the '&' will not be taken into account when aligning.
+align_var_def_amp_style         = 0        # unsigned number
+
+# The threshold for aligning variable definitions.
+# Use a negative number for absolute thresholds.
+#
+# 0: No limit (default).
+align_var_def_thresh            = 0        # number
+
+# The gap for aligning variable definitions.
+align_var_def_gap               = 0        # unsigned number
+
+# Whether to align the colon in struct bit fields.
+align_var_def_colon             = false    # true/false
+
+# The gap for aligning the colon in struct bit fields.
+align_var_def_colon_gap         = 0        # unsigned number
+
+# Whether to align any attribute after the variable name.
+align_var_def_attribute         = false    # true/false
+
+# Whether to align inline struct/enum/union variable definitions.
+align_var_def_inline            = false    # true/false
+
+# The span for aligning on '=' in assignments.
+#
+# 0: Don't align (default).
+align_assign_span               = 0        # unsigned number
+
+# The span for aligning on '=' in function prototype modifier.
+#
+# 0: Don't align (default).
+align_assign_func_proto_span    = 0        # unsigned number
+
+# The threshold for aligning on '=' in assignments.
+# Use a negative number for absolute thresholds.
+#
+# 0: No limit (default).
+align_assign_thresh             = 0        # number
+
+# Whether to align on the left most assignment when multiple
+# definitions are found on the same line.
+# Depends on 'align_assign_span' and 'align_assign_thresh' settings.
+align_assign_on_multi_var_defs  = false    # true/false
+
+# The span for aligning on '{' in braced init list.
+#
+# 0: Don't align (default).
+align_braced_init_list_span     = 0        # unsigned number
+
+# The threshold for aligning on '{' in braced init list.
+# Use a negative number for absolute thresholds.
+#
+# 0: No limit (default).
+align_braced_init_list_thresh   = 0        # number
+
+# How to apply align_assign_span to function declaration "assignments", i.e.
+# 'virtual void foo() = 0' or '~foo() = {default|delete}'.
+#
+# 0: Align with other assignments (default)
+# 1: Align with each other, ignoring regular assignments
+# 2: Don't align
+align_assign_decl_func          = 0        # unsigned number
+
+# The span for aligning on '=' in enums.
+#
+# 0: Don't align (default).
+align_enum_equ_span             = 0        # unsigned number
+
+# The threshold for aligning on '=' in enums.
+# Use a negative number for absolute thresholds.
+#
+# 0: no limit (default).
+align_enum_equ_thresh           = 0        # number
+
+# The span for aligning class member definitions.
+#
+# 0: Don't align (default).
+align_var_class_span            = 0        # unsigned number
+
+# The threshold for aligning class member definitions.
+# Use a negative number for absolute thresholds.
+#
+# 0: No limit (default).
+align_var_class_thresh          = 0        # number
+
+# The gap for aligning class member definitions.
+align_var_class_gap             = 0        # unsigned number
+
+# The span for aligning struct/union member definitions.
+#
+# 0: Don't align (default).
+align_var_struct_span           = 0        # unsigned number
+
+# The threshold for aligning struct/union member definitions.
+# Use a negative number for absolute thresholds.
+#
+# 0: No limit (default).
+align_var_struct_thresh         = 0        # number
+
+# The gap for aligning struct/union member definitions.
+align_var_struct_gap            = 0        # unsigned number
+
+# The span for aligning struct initializer values.
+#
+# 0: Don't align (default).
+align_struct_init_span          = 0        # unsigned number
+
+# The span for aligning single-line typedefs.
+#
+# 0: Don't align (default).
+align_typedef_span              = 0        # unsigned number
+
+# The minimum space between the type and the synonym of a typedef.
+align_typedef_gap               = 0        # unsigned number
+
+# How to align typedef'd functions with other typedefs.
+#
+# 0: Don't mix them at all (default)
+# 1: Align the open parenthesis with the types
+# 2: Align the function type name with the other type names
+align_typedef_func              = 0        # unsigned number
+
+# How to consider (or treat) the '*' in the alignment of typedefs.
+#
+# 0: Part of the typedef type, 'typedef int * pint;' (default)
+# 1: Part of type name:        'typedef int   *pint;'
+# 2: Dangling:                 'typedef int  *pint;'
+# Dangling: the '*' will not be taken into account when aligning.
+align_typedef_star_style        = 0        # unsigned number
+
+# How to consider (or treat) the '&' in the alignment of typedefs.
+#
+# 0: Part of the typedef type, 'typedef int & intref;' (default)
+# 1: Part of type name:        'typedef int   &intref;'
+# 2: Dangling:                 'typedef int  &intref;'
+# Dangling: the '&' will not be taken into account when aligning.
+align_typedef_amp_style         = 0        # unsigned number
+
+# The span for aligning comments that end lines.
+#
+# 0: Don't align (default).
+align_right_cmt_span            = 0        # unsigned number
+
+# Minimum number of columns between preceding text and a trailing comment in
+# order for the comment to qualify for being aligned. Must be non-zero to have
+# an effect.
+align_right_cmt_gap             = 0        # unsigned number
+
+# If aligning comments, whether to mix with comments after '}' and #endif with
+# less than three spaces before the comment.
+align_right_cmt_mix             = false    # true/false
+
+# Whether to only align trailing comments that are at the same brace level.
+align_right_cmt_same_level      = false    # true/false
+
+# Minimum column at which to align trailing comments. Comments which are
+# aligned beyond this column, but which can be aligned in a lesser column,
+# may be "pulled in".
+#
+# 0: Ignore (default).
+align_right_cmt_at_col          = 0        # unsigned number
+
+# The span for aligning function prototypes.
+#
+# 0: Don't align (default).
+align_func_proto_span           = 0        # unsigned number
+
+# Whether to ignore continuation lines when evaluating the number of
+# new lines for the function prototype alignment's span.
+#
+# false: continuation lines are part of the newlines count
+# true:  continuation lines are not counted
+align_func_proto_span_ignore_cont_lines = false    # true/false
+
+# How to consider (or treat) the '*' in the alignment of function prototypes.
+#
+# 0: Part of the type     'void *   foo();' (default)
+# 1: Part of the function 'void     *foo();'
+# 2: Dangling             'void    *foo();'
+# Dangling: the '*' will not be taken into account when aligning.
+align_func_proto_star_style     = 0        # unsigned number
+
+# How to consider (or treat) the '&' in the alignment of function prototypes.
+#
+# 0: Part of the type     'long &   foo();' (default)
+# 1: Part of the function 'long     &foo();'
+# 2: Dangling             'long    &foo();'
+# Dangling: the '&' will not be taken into account when aligning.
+align_func_proto_amp_style      = 0        # unsigned number
+
+# The threshold for aligning function prototypes.
+# Use a negative number for absolute thresholds.
+#
+# 0: No limit (default).
+align_func_proto_thresh         = 0        # number
+
+# Minimum gap between the return type and the function name.
+align_func_proto_gap            = 0        # unsigned number
+
+# Whether to align function prototypes on the 'operator' keyword instead of
+# what follows.
+align_on_operator               = false    # true/false
+
+# Whether to mix aligning prototype and variable declarations. If true,
+# align_var_def_XXX options are used instead of align_func_proto_XXX options.
+align_mix_var_proto             = false    # true/false
+
+# Whether to align single-line functions with function prototypes.
+# Uses align_func_proto_span.
+align_single_line_func          = false    # true/false
+
+# Whether to align the open brace of single-line functions.
+# Requires align_single_line_func=true. Uses align_func_proto_span.
+align_single_line_brace         = false    # true/false
+
+# Gap for align_single_line_brace.
+align_single_line_brace_gap     = 0        # unsigned number
+
+# (OC) The span for aligning Objective-C message specifications.
+#
+# 0: Don't align (default).
+align_oc_msg_spec_span          = 0        # unsigned number
+
+# Whether and how to align backslashes that split a macro onto multiple lines.
+# This will not work right if the macro contains a multi-line comment.
+#
+# 0: Do nothing (default)
+# 1: Align the backslashes in the column at the end of the longest line
+# 2: Align with the backslash that is farthest to the left, or, if that
+#    backslash is farther left than the end of the longest line, at the end of
+#    the longest line
+# 3: Align with the backslash that is farthest to the right
+align_nl_cont                   = 0        # unsigned number
+
+# The minimum number of spaces between the end of a line and its continuation
+# backslash. Requires align_nl_cont.
+#
+# Default: 1
+align_nl_cont_spaces            = 1        # unsigned number
+
+# Whether to align macro functions and variables together.
+align_pp_define_together        = false    # true/false
+
+# The span for aligning on '#define' bodies.
+#
+# =0: Don't align (default)
+# >0: Number of lines (including comments) between blocks
+align_pp_define_span            = 0        # unsigned number
+
+# The minimum space between label and value of a preprocessor define.
+align_pp_define_gap             = 0        # unsigned number
+
+# Whether to align lines that start with '<<' with previous '<<'.
+#
+# Default: true
+align_left_shift                = true     # true/false
+
+# Whether to align comma-separated statements following '<<' (as used to
+# initialize Eigen matrices).
+align_eigen_comma_init          = false    # true/false
+
+# Whether to align text after 'asm volatile ()' colons.
+align_asm_colon                 = false    # true/false
+
+# (OC) Span for aligning parameters in an Objective-C message call
+# on the ':'.
+#
+# 0: Don't align.
+align_oc_msg_colon_span         = 0        # unsigned number
+
+# (OC) Whether to always align with the first parameter, even if it is too
+# short.
+align_oc_msg_colon_first        = false    # true/false
+
+# (OC) Whether to align parameters in an Objective-C '+' or '-' declaration
+# on the ':'.
+align_oc_decl_colon             = false    # true/false
+
+# (OC) Whether to not align parameters in an Objectve-C message call if first
+# colon is not on next line of the message call (the same way Xcode does
+# alignment)
+align_oc_msg_colon_xcode_like   = false    # true/false
+
+#
+# Comment modification options
+#
+
+# Try to wrap comments at N columns.
+cmt_width                       = 120        # unsigned number
+
+# How to reflow comments.
+#
+# 0: No reflowing (apart from the line wrapping due to cmt_width) (default)
+# 1: No touching at all
+# 2: Full reflow (enable cmt_indent_multi for indent with line wrapping due to cmt_width)
+cmt_reflow_mode                 = 1        # unsigned number
+
+# Path to a file that contains regular expressions describing patterns for
+# which the end of one line and the beginning of the next will be folded into
+# the same sentence or paragraph during full comment reflow. The regular
+# expressions are described using ECMAScript syntax. The syntax for this
+# specification is as follows, where "..." indicates the custom regular
+# expression and "n" indicates the nth end_of_prev_line_regex and
+# beg_of_next_line_regex regular expression pair:
+#
+# end_of_prev_line_regex[1] = "...$"
+# beg_of_next_line_regex[1] = "^..."
+# end_of_prev_line_regex[2] = "...$"
+# beg_of_next_line_regex[2] = "^..."
+#             .
+#             .
+#             .
+# end_of_prev_line_regex[n] = "...$"
+# beg_of_next_line_regex[n] = "^..."
+#
+# Note that use of this option overrides the default reflow fold regular
+# expressions, which are internally defined as follows:
+#
+# end_of_prev_line_regex[1] = "[\w,\]\)]$"
+# beg_of_next_line_regex[1] = "^[\w,\[\(]"
+# end_of_prev_line_regex[2] = "\.$"
+# beg_of_next_line_regex[2] = "^[A-Z]"
+cmt_reflow_fold_regex_file      = ""         # string
+
+# Whether to indent wrapped lines to the start of the encompassing paragraph
+# during full comment reflow (cmt_reflow_mode = 2). Overrides the value
+# specified by cmt_sp_after_star_cont.
+#
+# Note that cmt_align_doxygen_javadoc_tags overrides this option for
+# paragraphs associated with javadoc tags
+cmt_reflow_indent_to_paragraph_start = false    # true/false
+
+# Whether to convert all tabs to spaces in comments. If false, tabs in
+# comments are left alone, unless used for indenting.
+cmt_convert_tab_to_spaces       = false    # true/false
+
+# Whether to apply changes to multi-line comments, including cmt_width,
+# keyword substitution and leading chars.
+#
+# Default: true
+cmt_indent_multi                = true     # true/false
+
+# Whether to align doxygen javadoc-style tags ('@param', '@return', etc.)
+# and corresponding fields such that groups of consecutive block tags,
+# parameter names, and descriptions align with one another. Overrides that
+# which is specified by the cmt_sp_after_star_cont. If cmt_width > 0, it may
+# be necessary to enable cmt_indent_multi and set cmt_reflow_mode = 2
+# in order to achieve the desired alignment for line-wrapping.
+cmt_align_doxygen_javadoc_tags  = false    # true/false
+
+# The number of spaces to insert after the star and before doxygen
+# javadoc-style tags (@param, @return, etc). Requires enabling
+# cmt_align_doxygen_javadoc_tags. Overrides that which is specified by the
+# cmt_sp_after_star_cont.
+#
+# Default: 1
+cmt_sp_before_doxygen_javadoc_tags = 1        # unsigned number
+
+# Whether to change trailing, single-line c-comments into cpp-comments.
+cmt_trailing_single_line_c_to_cpp = false    # true/false
+
+# Whether to group c-comments that look like they are in a block.
+cmt_c_group                     = false    # true/false
+
+# Whether to put an empty '/*' on the first line of the combined c-comment.
+cmt_c_nl_start                  = false    # true/false
+
+# Whether to add a newline before the closing '*/' of the combined c-comment.
+cmt_c_nl_end                    = false    # true/false
+
+# Whether to change cpp-comments into c-comments.
+cmt_cpp_to_c                    = false    # true/false
+
+# Whether to group cpp-comments that look like they are in a block. Only
+# meaningful if cmt_cpp_to_c=true.
+cmt_cpp_group                   = false    # true/false
+
+# Whether to put an empty '/*' on the first line of the combined cpp-comment
+# when converting to a c-comment.
+#
+# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
+cmt_cpp_nl_start                = false    # true/false
+
+# Whether to add a newline before the closing '*/' of the combined cpp-comment
+# when converting to a c-comment.
+#
+# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
+cmt_cpp_nl_end                  = false    # true/false
+
+# Whether to put a star on subsequent comment lines.
+cmt_star_cont                   = false    # true/false
+
+# The number of spaces to insert at the start of subsequent comment lines.
+cmt_sp_before_star_cont         = 0        # unsigned number
+
+# The number of spaces to insert after the star on subsequent comment lines.
+cmt_sp_after_star_cont          = 0        # unsigned number
+
+# For multi-line comments with a '*' lead, remove leading spaces if the first
+# and last lines of the comment are the same length.
+#
+# Default: true
+cmt_multi_check_last            = true     # true/false
+
+# For multi-line comments with a '*' lead, remove leading spaces if the first
+# and last lines of the comment are the same length AND if the length is
+# bigger as the first_len minimum.
+#
+# Default: 4
+cmt_multi_first_len_minimum     = 4        # unsigned number
+
+# Path to a file that contains text to insert at the beginning of a file if
+# the file doesn't start with a C/C++ comment. If the inserted text contains
+# '$(filename)', that will be replaced with the current file's name.
+cmt_insert_file_header          = ""         # string
+
+# Path to a file that contains text to insert at the end of a file if the
+# file doesn't end with a C/C++ comment. If the inserted text contains
+# '$(filename)', that will be replaced with the current file's name.
+cmt_insert_file_footer          = ""         # string
+
+# Path to a file that contains text to insert before a function definition if
+# the function isn't preceded by a C/C++ comment. If the inserted text
+# contains '$(function)', '$(javaparam)' or '$(fclass)', these will be
+# replaced with, respectively, the name of the function, the javadoc '@param'
+# and '@return' stuff, or the name of the class to which the member function
+# belongs.
+cmt_insert_func_header          = ""         # string
+
+# Path to a file that contains text to insert before a class if the class
+# isn't preceded by a C/C++ comment. If the inserted text contains '$(class)',
+# that will be replaced with the class name.
+cmt_insert_class_header         = ""         # string
+
+# Path to a file that contains text to insert before an Objective-C message
+# specification, if the method isn't preceded by a C/C++ comment. If the
+# inserted text contains '$(message)' or '$(javaparam)', these will be
+# replaced with, respectively, the name of the function, or the javadoc
+# '@param' and '@return' stuff.
+cmt_insert_oc_msg_header        = ""         # string
+
+# Whether a comment should be inserted if a preprocessor is encountered when
+# stepping backwards from a function name.
+#
+# Applies to cmt_insert_oc_msg_header, cmt_insert_func_header and
+# cmt_insert_class_header.
+cmt_insert_before_preproc       = false    # true/false
+
+# Whether a comment should be inserted if a function is declared inline to a
+# class definition.
+#
+# Applies to cmt_insert_func_header.
+#
+# Default: true
+cmt_insert_before_inlines       = true     # true/false
+
+# Whether a comment should be inserted if the function is a class constructor
+# or destructor.
+#
+# Applies to cmt_insert_func_header.
+cmt_insert_before_ctor_dtor     = false    # true/false
+
+#
+# Code modifying options (non-whitespace)
+#
+
+# Add or remove braces on a single-line 'do' statement.
+mod_full_brace_do               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove braces on a single-line 'for' statement.
+mod_full_brace_for              = ignore   # ignore/add/remove/force/not_defined
+
+# (Pawn) Add or remove braces on a single-line function definition.
+mod_full_brace_function         = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove braces on a single-line 'if' statement. Braces will not be
+# removed if the braced statement contains an 'else'.
+mod_full_brace_if               = ignore   # ignore/add/remove/force/not_defined
+
+# Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
+# have, or do not have, braces. Overrides mod_full_brace_if.
+#
+# 0: Don't override mod_full_brace_if
+# 1: Add braces to all blocks if any block needs braces and remove braces if
+#    they can be removed from all blocks
+# 2: Add braces to all blocks if any block already has braces, regardless of
+#    whether it needs them
+# 3: Add braces to all blocks if any block needs braces and remove braces if
+#    they can be removed from all blocks, except if all blocks have braces
+#    despite none needing them
+mod_full_brace_if_chain         = 0        # unsigned number
+
+# Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.
+# If true, mod_full_brace_if_chain will only remove braces from an 'if' that
+# does not have an 'else if' or 'else'.
+mod_full_brace_if_chain_only    = false    # true/false
+
+# Add or remove braces on single-line 'while' statement.
+mod_full_brace_while            = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove braces on single-line 'using ()' statement.
+mod_full_brace_using            = ignore   # ignore/add/remove/force/not_defined
+
+# Don't remove braces around statements that span N newlines
+mod_full_brace_nl               = 0        # unsigned number
+
+# Whether to prevent removal of braces from 'if'/'for'/'while'/etc. blocks
+# which span multiple lines.
+#
+# Affects:
+#   mod_full_brace_for
+#   mod_full_brace_if
+#   mod_full_brace_if_chain
+#   mod_full_brace_if_chain_only
+#   mod_full_brace_while
+#   mod_full_brace_using
+#
+# Does not affect:
+#   mod_full_brace_do
+#   mod_full_brace_function
+mod_full_brace_nl_block_rem_mlcond = false    # true/false
+
+# Add or remove unnecessary parentheses on 'return' statement.
+mod_paren_on_return             = remove   # ignore/add/remove/force/not_defined
+
+# Add or remove unnecessary parentheses on 'throw' statement.
+mod_paren_on_throw              = ignore   # ignore/add/remove/force/not_defined
+
+# (Pawn) Whether to change optional semicolons to real semicolons.
+mod_pawn_semicolon              = false    # true/false
+
+# Whether to fully parenthesize Boolean expressions in 'while' and 'if'
+# statement, as in 'if (a && b > c)' => 'if (a && (b > c))'.
+mod_full_paren_if_bool          = false    # true/false
+
+# Whether to fully parenthesize Boolean expressions after '='
+# statement, as in 'x = a && b > c;' => 'x = (a && (b > c));'.
+mod_full_paren_assign_bool      = false    # true/false
+
+# Whether to fully parenthesize Boolean expressions after '='
+# statement, as in 'return  a && b > c;' => 'return (a && (b > c));'.
+mod_full_paren_return_bool      = false    # true/false
+
+# Whether to remove superfluous semicolons.
+mod_remove_extra_semicolon      = false    # true/false
+
+# Whether to remove duplicate include.
+mod_remove_duplicate_include    = false    # true/false
+
+# the following options (mod_XX_closebrace_comment) use different comment,
+# depending of the setting of the next option.
+# false: Use the c comment (default)
+# true : Use the cpp comment
+mod_add_force_c_closebrace_comment = false    # true/false
+
+# If a function body exceeds the specified number of newlines and doesn't have
+# a comment after the close brace, a comment will be added.
+mod_add_long_function_closebrace_comment = 0        # unsigned number
+
+# If a namespace body exceeds the specified number of newlines and doesn't
+# have a comment after the close brace, a comment will be added.
+mod_add_long_namespace_closebrace_comment = 0        # unsigned number
+
+# If a class body exceeds the specified number of newlines and doesn't have a
+# comment after the close brace, a comment will be added.
+mod_add_long_class_closebrace_comment = 0        # unsigned number
+
+# If a switch body exceeds the specified number of newlines and doesn't have a
+# comment after the close brace, a comment will be added.
+mod_add_long_switch_closebrace_comment = 0        # unsigned number
+
+# If an #ifdef body exceeds the specified number of newlines and doesn't have
+# a comment after the #endif, a comment will be added.
+mod_add_long_ifdef_endif_comment = 0        # unsigned number
+
+# If an #ifdef or #else body exceeds the specified number of newlines and
+# doesn't have a comment after the #else, a comment will be added.
+mod_add_long_ifdef_else_comment = 0        # unsigned number
+
+# Whether to take care of the case by the mod_sort_xx options.
+mod_sort_case_sensitive         = false    # true/false
+
+# Whether to sort consecutive single-line 'import' statements.
+mod_sort_import                 = false    # true/false
+
+# (C#) Whether to sort consecutive single-line 'using' statements.
+mod_sort_using                  = false    # true/false
+
+# Whether to sort consecutive single-line '#include' statements (C/C++) and
+# '#import' statements (Objective-C). Be aware that this has the potential to
+# break your code if your includes/imports have ordering dependencies.
+mod_sort_include                = false    # true/false
+
+# Whether to prioritize '#include' and '#import' statements that contain
+# filename without extension when sorting is enabled.
+mod_sort_incl_import_prioritize_filename = false    # true/false
+
+# Whether to prioritize '#include' and '#import' statements that does not
+# contain extensions when sorting is enabled.
+mod_sort_incl_import_prioritize_extensionless = false    # true/false
+
+# Whether to prioritize '#include' and '#import' statements that contain
+# angle over quotes when sorting is enabled.
+mod_sort_incl_import_prioritize_angle_over_quotes = false    # true/false
+
+# Whether to ignore file extension in '#include' and '#import' statements
+# for sorting comparison.
+mod_sort_incl_import_ignore_extension = false    # true/false
+
+# Whether to group '#include' and '#import' statements when sorting is enabled.
+mod_sort_incl_import_grouping_enabled = false    # true/false
+
+# Whether to move a 'break' that appears after a fully braced 'case' before
+# the close brace, as in 'case X: { ... } break;' => 'case X: { ... break; }'.
+mod_move_case_break             = false    # true/false
+
+# Whether to move a 'return' that appears after a fully braced 'case' before
+# the close brace, as in 'case X: { ... } return;' => 'case X: { ... return; }'.
+mod_move_case_return            = false    # true/false
+
+# Add or remove braces around a fully braced case statement. Will only remove
+# braces if there are no variable declarations in the block.
+mod_case_brace                  = ignore   # ignore/add/remove/force/not_defined
+
+# Whether to remove a void 'return;' that appears as the last statement in a
+# function.
+mod_remove_empty_return         = false    # true/false
+
+# Add or remove the comma after the last value of an enumeration.
+mod_enum_last_comma             = ignore   # ignore/add/remove/force/not_defined
+
+# Syntax to use for infinite loops.
+#
+# 0: Leave syntax alone (default)
+# 1: Rewrite as `for(;;)`
+# 2: Rewrite as `while(true)`
+# 3: Rewrite as `do`...`while(true);`
+# 4: Rewrite as `while(1)`
+# 5: Rewrite as `do`...`while(1);`
+#
+# Infinite loops that do not already match one of these syntaxes are ignored.
+# Other options that affect loop formatting will be applied after transforming
+# the syntax.
+mod_infinite_loop               = 0        # unsigned number
+
+# Add or remove the 'int' keyword in 'int short'.
+mod_int_short                   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'short int'.
+mod_short_int                   = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'int long'.
+mod_int_long                    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'long int'.
+mod_long_int                    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'int signed'.
+mod_int_signed                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'signed int'.
+mod_signed_int                  = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'int unsigned'.
+mod_int_unsigned                = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove the 'int' keyword in 'unsigned int'.
+mod_unsigned_int                = ignore   # ignore/add/remove/force/not_defined
+
+# If there is a situation where mod_int_* and mod_*_int would result in
+# multiple int keywords, whether to keep the rightmost int (the default) or the
+# leftmost int.
+mod_int_prefer_int_on_left      = false    # true/false
+
+# (OC) Whether to organize the properties. If true, properties will be
+# rearranged according to the mod_sort_oc_property_*_weight factors.
+mod_sort_oc_properties          = false    # true/false
+
+# (OC) Weight of a class property modifier.
+mod_sort_oc_property_class_weight = 0        # number
+
+# (OC) Weight of 'atomic' and 'nonatomic'.
+mod_sort_oc_property_thread_safe_weight = 0        # number
+
+# (OC) Weight of 'readwrite' when organizing properties.
+mod_sort_oc_property_readwrite_weight = 0        # number
+
+# (OC) Weight of a reference type specifier ('retain', 'copy', 'assign',
+# 'weak', 'strong') when organizing properties.
+mod_sort_oc_property_reference_weight = 0        # number
+
+# (OC) Weight of getter type ('getter=') when organizing properties.
+mod_sort_oc_property_getter_weight = 0        # number
+
+# (OC) Weight of setter type ('setter=') when organizing properties.
+mod_sort_oc_property_setter_weight = 0        # number
+
+# (OC) Weight of nullability type ('nullable', 'nonnull', 'null_unspecified',
+# 'null_resettable') when organizing properties.
+mod_sort_oc_property_nullability_weight = 0        # number
+
+#
+# Preprocessor options
+#
+
+# How to use tabs when indenting preprocessor code.
+#
+# -1: Use 'indent_with_tabs' setting (default)
+#  0: Spaces only
+#  1: Indent with tabs to brace level, align with spaces
+#  2: Indent and align with tabs, using spaces when not on a tabstop
+#
+# Default: -1
+pp_indent_with_tabs             = -1       # number
+
+# Add or remove indentation of preprocessor directives inside #if blocks
+# at brace level 0 (file-level).
+pp_indent                       = remove   # ignore/add/remove/force/not_defined
+
+# Whether to indent #if/#else/#endif at the brace level. If false, these are
+# indented from column 1.
+pp_indent_at_level              = false    # true/false
+
+# Whether to indent #if/#else/#endif at the parenthesis level if the brace
+# level is 0. If false, these are indented from column 1.
+pp_indent_at_level0             = false    # true/false
+
+# Specifies the number of columns to indent preprocessors per level
+# at brace level 0 (file-level). If pp_indent_at_level=false, also specifies
+# the number of columns to indent preprocessors per level
+# at brace level > 0 (function-level).
+#
+# Default: 1
+pp_indent_count                 = 1        # unsigned number
+
+# Add or remove space after # based on pp level of #if blocks.
+pp_space_after                  = add   # ignore/add/remove/force/not_defined
+
+# Sets the number of spaces per level added with pp_space_after.
+pp_space_count                  = 1        # unsigned number
+
+# The indent for '#region' and '#endregion' in C# and '#pragma region' in
+# C/C++. Negative values decrease indent down to the first column.
+pp_indent_region                = 0        # number
+
+# Whether to indent the code between #region and #endregion.
+pp_region_indent_code           = false    # true/false
+
+# If pp_indent_at_level=true, sets the indent for #if, #else and #endif when
+# not at file-level. Negative values decrease indent down to the first column.
+#
+# =0: Indent preprocessors using output_tab_size
+# >0: Column at which all preprocessors will be indented
+pp_indent_if                    = 0        # number
+
+# Whether to indent the code between #if, #else and #endif.
+pp_if_indent_code               = false    # true/false
+
+# Whether to indent the body of an #if that encompasses all the code in the file.
+pp_indent_in_guard              = false    # true/false
+
+# Whether to indent '#define' at the brace level. If false, these are
+# indented from column 1.
+pp_define_at_level              = false    # true/false
+
+# Whether to indent '#include' at the brace level.
+pp_include_at_level             = false    # true/false
+
+# Whether to ignore the '#define' body while formatting.
+pp_ignore_define_body           = false    # true/false
+
+# An offset value that controls the indentation of the body of a multiline #define.
+# 'body' refers to all the lines of a multiline #define except the first line.
+# Requires 'pp_ignore_define_body = false'.
+#
+#  <0: Absolute column: the body indentation starts off at the specified column
+#      (ex. -3 ==> the body is indented starting from column 3)
+# >=0: Relative to the column of the '#' of '#define'
+#      (ex.  3 ==> the body is indented starting 3 columns at the right of '#')
+#
+# Default: 8
+pp_multiline_define_body_indent = 8        # number
+
+# Whether to indent case statements between #if, #else, and #endif.
+# Only applies to the indent of the preprocessor that the case statements
+# directly inside of.
+#
+# Default: true
+pp_indent_case                  = true     # true/false
+
+# Whether to indent whole function definitions between #if, #else, and #endif.
+# Only applies to the indent of the preprocessor that the function definition
+# is directly inside of.
+#
+# Default: true
+pp_indent_func_def              = true     # true/false
+
+# Whether to indent extern C blocks between #if, #else, and #endif.
+# Only applies to the indent of the preprocessor that the extern block is
+# directly inside of.
+#
+# Default: true
+pp_indent_extern                = true     # true/false
+
+# How to indent braces directly inside #if, #else, and #endif.
+# Requires pp_if_indent_code=true and only applies to the indent of the
+# preprocessor that the braces are directly inside of.
+#  0: No extra indent
+#  1: Indent by one level
+# -1: Preserve original indentation
+#
+# Default: 1
+pp_indent_brace                 = 1        # number
+
+# Whether to print warning messages for unbalanced #if and #else blocks.
+# This will print a message in the following cases:
+# - if an #ifdef block ends on a different indent level than
+#   where it started from. Example:
+#
+#    #ifdef TEST
+#      int i;
+#      {
+#        int j;
+#    #endif
+#
+# - an #elif/#else block ends on a different indent level than
+#   the corresponding #ifdef block. Example:
+#
+#    #ifdef TEST
+#        int i;
+#    #else
+#        }
+#      int j;
+#    #endif
+pp_warn_unbalanced_if           = false    # true/false
+
+#
+# Sort includes options
+#
+
+# The regex for include category with priority 0.
+include_category_0              = ""         # string
+
+# The regex for include category with priority 1.
+include_category_1              = ""         # string
+
+# The regex for include category with priority 2.
+include_category_2              = ""         # string
+
+#
+# Use or Do not Use options
+#
+
+# true:  indent_func_call_param will be used (default)
+# false: indent_func_call_param will NOT be used
+#
+# Default: true
+use_indent_func_call_param      = false     # true/false
+
+# The value of the indentation for a continuation line is calculated
+# differently if the statement is:
+# - a declaration: your case with QString fileName ...
+# - an assignment: your case with pSettings = new QSettings( ...
+#
+# At the second case the indentation value might be used twice:
+# - at the assignment
+# - at the function call (if present)
+#
+# To prevent the double use of the indentation value, use this option with the
+# value 'true'.
+#
+# true:  indent_continue will be used only once
+# false: indent_continue will be used every time (default)
+#
+# Requires indent_ignore_first_continue=false.
+use_indent_continue_only_once   = true    # true/false
+
+# The indentation can be:
+# - after the assignment, at the '[' character
+# - at the beginning of the lambda body
+#
+# true:  indentation will be at the beginning of the lambda body
+# false: indentation will be after the assignment (default)
+indent_cpp_lambda_only_once     = false    # true/false
+
+# Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
+# historic behavior, but is probably not the desired behavior, so this is off
+# by default.
+use_sp_after_angle_always       = false    # true/false
+
+# Whether to apply special formatting for Qt SIGNAL/SLOT macros. Essentially,
+# this tries to format these so that they match Qt's normalized form (i.e. the
+# result of QMetaObject::normalizedSignature), which can slightly improve the
+# performance of the QObject::connect call, rather than how they would
+# otherwise be formatted.
+#
+# See options_for_QT.cpp for details.
+#
+# Default: true
+use_options_overriding_for_qt_macros = true     # true/false
+
+# If true: the form feed character is removed from the list of whitespace
+# characters. See https://en.cppreference.com/w/cpp/string/byte/isspace.
+use_form_feed_no_more_as_whitespace_character = false    # true/false
+
+#
+# Warn levels - 1: error, 2: warning (default), 3: note
+#
+
+# (C#) Warning is given if doing tab-to-\t replacement and we have found one
+# in a C# verbatim string literal.
+#
+# Default: 2
+warn_level_tabs_found_in_verbatim_string_literals = 2        # unsigned number
+
+# Limit the number of loops.
+# Used by uncrustify.cpp to exit from infinite loop.
+# 0: no limit.
+debug_max_number_of_loops       = 0        # number
+
+# Set the number of the line to protocol;
+# Used in the function prot_the_line if the 2. parameter is zero.
+# 0: nothing protocol.
+debug_line_number_to_protocol   = 0        # number
+
+# Set the number of second(s) before terminating formatting the current file,
+# 0: no timeout.
+# only for linux
+debug_timeout                   = 0        # number
+
+# Set the number of characters to be printed if the text is too long,
+# 0: do not truncate.
+debug_truncate                  = 0        # unsigned number
+
+# sort (or not) the tracking info.
+#
+# Default: true
+debug_sort_the_tracks           = true     # true/false
+
+# decode (or not) the flags as a new line.
+# only if the -p option is set.
+debug_decode_the_flags          = false    # true/false
+
+# use (or not) the exit(EX_SOFTWARE) function.
+#
+# Default: true
+debug_use_the_exit_function_pop = true     # true/false
+
+# insert the number of the line at the beginning of each line
+set_numbering_for_html_output   = false    # true/false
+
+# Meaning of the settings:
+#   Ignore - do not do any changes
+#   Add    - makes sure there is 1 or more space/brace/newline/etc
+#   Force  - makes sure there is exactly 1 space/brace/newline/etc,
+#            behaves like Add in some contexts
+#   Remove - removes space/brace/newline/etc
+#
+#
+# - Token(s) can be treated as specific type(s) with the 'set' option:
+#     `set tokenType tokenString [tokenString...]`
+#
+#     Example:
+#       `set BOOL __AND__ __OR__`
+#
+#     tokenTypes are defined in src/token_enum.h, use them without the
+#     'CT_' prefix: 'CT_BOOL' => 'BOOL'
+#
+#
+# - Token(s) can be treated as type(s) with the 'type' option.
+#     `type tokenString [tokenString...]`
+#
+#     Example:
+#       `type int c_uint_8 Rectangle`
+#
+#     This can also be achieved with `set TYPE int c_uint_8 Rectangle`
+#
+#
+# To embed whitespace in tokenStrings use the '\' escape character, or quote
+# the tokenStrings. These quotes are supported: "'`
+#
+#
+# - Support for the auto detection of languages through the file ending can be
+#   added using the 'file_ext' command.
+#     `file_ext langType langString [langString..]`
+#
+#     Example:
+#       `file_ext CPP .ch .cxx .cpp.in`
+#
+#     langTypes are defined in uncrusify_types.h in the lang_flag_e enum, use
+#     them without the 'LANG_' prefix: 'LANG_CPP' => 'CPP'
+#
+#
+# - Custom macro-based indentation can be set up using 'macro-open',
+#   'macro-else' and 'macro-close'.
+#     `(macro-open | macro-else | macro-close) tokenString`
+#
+#     Example:
+#       `macro-open  BEGIN_TEMPLATE_MESSAGE_MAP`
+#       `macro-open  BEGIN_MESSAGE_MAP`
+#       `macro-close END_MESSAGE_MAP`
+#
+#
+# option(s) with 'not default' value: 0
+#
diff --git a/silk/A2NLSF.c b/silk/A2NLSF.c
index de47f091e..5362367f8 100644
--- a/silk/A2NLSF.c
+++ b/silk/A2NLSF.c
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 /* Conversion between prediction filter coefficients and NLSFs  */
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 /* functions are accurate inverses of each other                */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -46,13 +46,12 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Transforms polynomials from cos(n*f) to cos(f)^n  */
 static OAC_INLINE void silk_A2NLSF_trans_poly(
     oac_int32          *p,                     /* I/O    Polynomial                                */
-    const oac_int      dd                      /* I      Polynomial order (= filter order / 2 )    */
-)
-{
+    const oac_int dd                           /* I      Polynomial order (= filter order / 2 )    */
+    ) {
     oac_int k, n;
 
-    for( k = 2; k <= dd; k++ ) {
-        for( n = dd; n > k; n-- ) {
+    for (k = 2; k <= dd; k++) {
+        for (n = dd; n > k; n--) {
             p[ n - 2 ] -= p[ n ];
         }
         p[ k - 2 ] -= silk_LSHIFT( p[ k ], 1 );
@@ -62,18 +61,16 @@ static OAC_INLINE void silk_A2NLSF_trans_poly(
 /* Polynomial evaluation          */
 static OAC_INLINE oac_int32 silk_A2NLSF_eval_poly( /* return the polynomial evaluation, in Q16     */
     oac_int32          *p,                     /* I    Polynomial, Q16                         */
-    const oac_int32    x,                      /* I    Evaluation point, Q12                   */
-    const oac_int      dd                      /* I    Order                                   */
-)
-{
-    oac_int   n;
+    const oac_int32 x,                         /* I    Evaluation point, Q12                   */
+    const oac_int dd                           /* I    Order                                   */
+    ) {
+    oac_int n;
     oac_int32 x_Q16, y32;
 
     y32 = p[ dd ];                                  /* Q16 */
     x_Q16 = silk_LSHIFT( x, 4 );
 
-    if ( oac_likely( 8 == dd ) )
-    {
+    if (oac_likely( 8 == dd )) {
         y32 = silk_SMLAWW( p[ 7 ], y32, x_Q16 );
         y32 = silk_SMLAWW( p[ 6 ], y32, x_Q16 );
         y32 = silk_SMLAWW( p[ 5 ], y32, x_Q16 );
@@ -82,10 +79,8 @@ static OAC_INLINE oac_int32 silk_A2NLSF_eval_poly( /* return the polynomial eval
         y32 = silk_SMLAWW( p[ 2 ], y32, x_Q16 );
         y32 = silk_SMLAWW( p[ 1 ], y32, x_Q16 );
         y32 = silk_SMLAWW( p[ 0 ], y32, x_Q16 );
-    }
-    else
-    {
-        for( n = dd - 1; n >= 0; n-- ) {
+    } else   {
+        for (n = dd - 1; n >= 0; n--) {
             y32 = silk_SMLAWW( p[ n ], y32, x_Q16 );    /* Q16 */
         }
     }
@@ -93,18 +88,16 @@ static OAC_INLINE oac_int32 silk_A2NLSF_eval_poly( /* return the polynomial eval
 }
 
 static OAC_INLINE void silk_A2NLSF_init(
-     const oac_int32    *a_Q16,
-     oac_int32          *P,
-     oac_int32          *Q,
-     const oac_int      dd
-)
-{
+    const oac_int32    *a_Q16,
+    oac_int32          *P,
+    oac_int32          *Q,
+    const oac_int dd)                           {
     oac_int k;
 
     /* Convert filter coefs to even and odd polynomials */
     P[dd] = silk_LSHIFT( 1, 16 );
     Q[dd] = silk_LSHIFT( 1, 16 );
-    for( k = 0; k < dd; k++ ) {
+    for (k = 0; k < dd; k++) {
         P[ k ] = -a_Q16[ dd - k - 1 ] - a_Q16[ dd + k ];    /* Q16 */
         Q[ k ] = -a_Q16[ dd - k - 1 ] + a_Q16[ dd + k ];    /* Q16 */
     }
@@ -112,7 +105,7 @@ static OAC_INLINE void silk_A2NLSF_init(
     /* Divide out zeros as we have that for even filter orders, */
     /* z =  1 is always a root in Q, and                        */
     /* z = -1 is always a root in P                             */
-    for( k = dd; k > 0; k-- ) {
+    for (k = dd; k > 0; k--) {
         P[ k - 1 ] -= P[ k ];
         Q[ k - 1 ] += Q[ k ];
     }
@@ -127,15 +120,14 @@ static OAC_INLINE void silk_A2NLSF_init(
 void silk_A2NLSF(
     oac_int16                  *NLSF,              /* O    Normalized Line Spectral Frequencies in Q15 (0..2^15-1) [d] */
     oac_int32                  *a_Q16,             /* I/O  Monic whitening filter coefficients in Q16 [d]              */
-    const oac_int              d                   /* I    Filter order (must be even)                                 */
-)
-{
-    oac_int   i, k, m, dd, root_ix, ffrac;
+    const oac_int d                                /* I    Filter order (must be even)                                 */
+    ) {
+    oac_int i, k, m, dd, root_ix, ffrac;
     oac_int32 xlo, xhi, xmid;
     oac_int32 ylo, yhi, ymid, thr;
     oac_int32 nom, den;
-    oac_int32 P[ SILK_MAX_ORDER_LPC / 2 + 1 ];
-    oac_int32 Q[ SILK_MAX_ORDER_LPC / 2 + 1 ];
+    oac_int32 P[ SILK_MAX_ORDER_LPC/2 + 1 ];
+    oac_int32 Q[ SILK_MAX_ORDER_LPC/2 + 1 ];
     oac_int32 *PQ[ 2 ];
     oac_int32 *p;
 
@@ -153,7 +145,7 @@ void silk_A2NLSF(
     xlo = silk_LSFCosTab_FIX_Q12[ 0 ]; /* Q12*/
     ylo = silk_A2NLSF_eval_poly( p, xlo, dd );
 
-    if( ylo < 0 ) {
+    if (ylo < 0) {
         /* Set the first NLSF to zero and move on to the next */
         NLSF[ 0 ] = 0;
         p = Q;                      /* Pointer to polynomial */
@@ -165,14 +157,14 @@ void silk_A2NLSF(
     k = 1;                          /* Loop counter */
     i = 0;                          /* Counter for bandwidth expansions applied */
     thr = 0;
-    while( 1 ) {
+    while (1) {
         /* Evaluate polynomial */
         xhi = silk_LSFCosTab_FIX_Q12[ k ]; /* Q12 */
         yhi = silk_A2NLSF_eval_poly( p, xhi, dd );
 
         /* Detect zero crossing */
-        if( ( ylo <= 0 && yhi >= thr ) || ( ylo >= 0 && yhi <= -thr ) ) {
-            if( yhi == 0 ) {
+        if ((ylo <= 0 && yhi >= thr) || (ylo >= 0 && yhi <= -thr)) {
+            if (yhi == 0) {
                 /* If the root lies exactly at the end of the current       */
                 /* interval, look for the next root in the next interval    */
                 thr = 1;
@@ -181,13 +173,13 @@ void silk_A2NLSF(
             }
             /* Binary division */
             ffrac = -256;
-            for( m = 0; m < BIN_DIV_STEPS_A2NLSF_FIX; m++ ) {
+            for (m = 0; m < BIN_DIV_STEPS_A2NLSF_FIX; m++) {
                 /* Evaluate polynomial */
                 xmid = silk_RSHIFT_ROUND( xlo + xhi, 1 );
                 ymid = silk_A2NLSF_eval_poly( p, xmid, dd );
 
                 /* Detect zero crossing */
-                if( ( ylo <= 0 && ymid >= 0 ) || ( ylo >= 0 && ymid <= 0 ) ) {
+                if ((ylo <= 0 && ymid >= 0) || (ylo >= 0 && ymid <= 0)) {
                     /* Reduce frequency */
                     xhi = xmid;
                     yhi = ymid;
@@ -200,32 +192,32 @@ void silk_A2NLSF(
             }
 
             /* Interpolate */
-            if( silk_abs( ylo ) < 65536 ) {
+            if (silk_abs( ylo ) < 65536) {
                 /* Avoid dividing by zero */
                 den = ylo - yhi;
                 nom = silk_LSHIFT( ylo, 8 - BIN_DIV_STEPS_A2NLSF_FIX ) + silk_RSHIFT( den, 1 );
-                if( den != 0 ) {
+                if (den != 0) {
                     ffrac += silk_DIV32( nom, den );
                 }
             } else {
                 /* No risk of dividing by zero because abs(ylo - yhi) >= abs(ylo) >= 65536 */
-                ffrac += silk_DIV32( ylo, silk_RSHIFT( ylo - yhi, 8 - BIN_DIV_STEPS_A2NLSF_FIX ) );
+                ffrac += silk_DIV32( ylo, silk_RSHIFT( ylo - yhi, 8 - BIN_DIV_STEPS_A2NLSF_FIX ));
             }
-            NLSF[ root_ix ] = (oac_int16)silk_min_32( silk_LSHIFT( (oac_int32)k, 8 ) + ffrac, silk_int16_MAX );
+            NLSF[ root_ix ] = (oac_int16)silk_min_32( silk_LSHIFT((oac_int32)k, 8 ) + ffrac, silk_int16_MAX );
 
             silk_assert( NLSF[ root_ix ] >= 0 );
 
             root_ix++;        /* Next root */
-            if( root_ix >= d ) {
+            if (root_ix >= d) {
                 /* Found all roots */
                 break;
             }
             /* Alternate pointer to polynomial */
-            p = PQ[ root_ix & 1 ];
+            p = PQ[ root_ix&1 ];
 
             /* Evaluate polynomial */
             xlo = silk_LSFCosTab_FIX_Q12[ k - 1 ]; /* Q12*/
-            ylo = silk_LSHIFT( 1 - ( root_ix & 2 ), 12 );
+            ylo = silk_LSHIFT( 1 - (root_ix&2), 12 );
         } else {
             /* Increment loop counter */
             k++;
@@ -233,25 +225,25 @@ void silk_A2NLSF(
             ylo = yhi;
             thr = 0;
 
-            if( k > LSF_COS_TAB_SZ_FIX ) {
+            if (k > LSF_COS_TAB_SZ_FIX) {
                 i++;
-                if( i > MAX_ITERATIONS_A2NLSF_FIX ) {
+                if (i > MAX_ITERATIONS_A2NLSF_FIX) {
                     /* Set NLSFs to white spectrum and exit */
-                    NLSF[ 0 ] = (oac_int16)silk_DIV32_16( 1 << 15, d + 1 );
-                    for( k = 1; k < d; k++ ) {
-                        NLSF[ k ] = (oac_int16)silk_ADD16( NLSF[ k-1 ], NLSF[ 0 ] );
+                    NLSF[ 0 ] = (oac_int16)silk_DIV32_16( 1<<15, d + 1 );
+                    for (k = 1; k < d; k++) {
+                        NLSF[ k ] = (oac_int16)silk_ADD16( NLSF[ k - 1 ], NLSF[ 0 ] );
                     }
                     return;
                 }
 
                 /* Error: Apply progressively more bandwidth expansion and run again */
-                silk_bwexpander_32( a_Q16, d, 65536 - silk_LSHIFT( 1, i ) );
+                silk_bwexpander_32( a_Q16, d, 65536 - silk_LSHIFT( 1, i ));
 
                 silk_A2NLSF_init( a_Q16, P, Q, dd );
                 p = P;                            /* Pointer to polynomial */
                 xlo = silk_LSFCosTab_FIX_Q12[ 0 ]; /* Q12*/
                 ylo = silk_A2NLSF_eval_poly( p, xlo, dd );
-                if( ylo < 0 ) {
+                if (ylo < 0) {
                     /* Set the first NLSF to zero and move on to the next */
                     NLSF[ 0 ] = 0;
                     p = Q;                        /* Pointer to polynomial */
diff --git a/silk/API.h b/silk/API.h
index 2a999e8ef..e5f7ffb0d 100644
--- a/silk/API.h
+++ b/silk/API.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_API_H
@@ -35,16 +35,16 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "entdec.h"
 
 #ifdef ENABLE_DEEP_PLC
-#include "lpcnet_private.h"
+# include "lpcnet_private.h"
 #endif
 
 #define SILK_MAX_FRAMES_PER_PACKET  3
 
 /* Struct for TOC (Table of Contents) */
 typedef struct {
-    oac_int    VADFlag;                                /* Voice activity for packet                            */
-    oac_int    VADFlags[ SILK_MAX_FRAMES_PER_PACKET ]; /* Voice activity for each frame in packet              */
-    oac_int    inbandFECFlag;                          /* Flag indicating if packet contains in-band FEC       */
+    oac_int VADFlag;                                   /* Voice activity for packet                            */
+    oac_int VADFlags[ SILK_MAX_FRAMES_PER_PACKET ];    /* Voice activity for each frame in packet              */
+    oac_int inbandFECFlag;                             /* Flag indicating if packet contains in-band FEC       */
 } silk_TOC_struct;
 
 /****************************************/
@@ -56,18 +56,18 @@ typedef struct {
 /***********************************************/
 oac_int silk_Get_Encoder_Size(                         /* O    Returns error code                              */
     oac_int                        *encSizeBytes,      /* O    Number of bytes in SILK encoder state           */
-    oac_int                         channels           /* I    Number of channels                              */
-);
+    oac_int channels                                   /* I    Number of channels                              */
+    );
 
 /*************************/
 /* Init or reset encoder */
 /*************************/
 oac_int silk_InitEncoder(                              /* O    Returns error code                              */
     void                            *encState,          /* I/O  State                                           */
-    int                              channels,          /* I    Number of channels                              */
-    int                              arch,              /* I    Run-time architecture                           */
+    int channels,                                       /* I    Number of channels                              */
+    int arch,                                           /* I    Run-time architecture                           */
     silk_EncControlStruct           *encStatus          /* O    Encoder Status                                  */
-);
+    );
 
 /**************************/
 /* Encode frame with Silk */
@@ -78,12 +78,12 @@ oac_int silk_Encode(                                   /* O    Returns error cod
     void                            *encState,          /* I/O  State                                           */
     silk_EncControlStruct           *encControl,        /* I    Control status                                  */
     const oac_res                  *samplesIn,         /* I    Speech sample input vector                      */
-    oac_int                        nSamplesIn,         /* I    Number of samples in input vector               */
+    oac_int nSamplesIn,                                /* I    Number of samples in input vector               */
     ec_enc                          *psRangeEnc,        /* I/O  Compressor data structure                       */
     oac_int32                      *nBytesOut,         /* I/O  Number of bytes in payload (input: Max bytes)   */
-    const oac_int                  prefillFlag,        /* I    Flag to indicate prefilling buffers no coding   */
-    int                             activity            /* I    Decision of Oac voice activity detector        */
-);
+    const oac_int prefillFlag,                         /* I    Flag to indicate prefilling buffers no coding   */
+    int activity                                        /* I    Decision of Oac voice activity detector        */
+    );
 
 /****************************************/
 /* Decoder functions                    */
@@ -97,42 +97,42 @@ oac_int silk_LoadOSCEModels(
     void *decState,                                     /* O    I/O State                                       */
     const unsigned char *data,                          /* I    pointer to binary blob                          */
     int len                                             /* I    length of binary blob data                      */
-);
+    );
 
 /***********************************************/
 /* Get size in bytes of the Silk decoder state */
 /***********************************************/
 oac_int silk_Get_Decoder_Size(                         /* O    Returns error code                              */
     oac_int                        *decSizeBytes       /* O    Number of bytes in SILK decoder state           */
-);
+    );
 
 /*************************/
 /* Init and Reset decoder */
 /*************************/
 oac_int silk_ResetDecoder(                              /* O    Returns error code                              */
     void                            *decState            /* I/O  State                                           */
-);
+    );
 
 oac_int silk_InitDecoder(                              /* O    Returns error code                              */
     void                            *decState           /* I/O  State                                           */
-);
+    );
 
 /******************/
 /* Decode a frame */
 /******************/
 oac_int silk_Decode(                                   /* O    Returns error code                              */
     void*                           decState,           /* I/O  State                                           */
-    silk_DecControlStruct*          decControl,         /* I/O  Control Structure                               */
-    oac_int                        lostFlag,           /* I    0: no loss, 1 loss, 2 decode fec                */
-    oac_int                        newPacketFlag,      /* I    Indicates first decoder call for this packet    */
-    ec_dec                          *psRangeDec,        /* I/O  Compressor data structure                       */
-    oac_res                        *samplesOut,        /* O    Decoded output speech vector                    */
-    oac_int32                      *nSamplesOut,       /* O    Number of samples decoded                       */
+    silk_DecControlStruct*decControl,                   /* I/O  Control Structure                               */
+    oac_int lostFlag,                                  /* I    0: no loss, 1 loss, 2 decode fec                */
+    oac_int newPacketFlag,                             /* I    Indicates first decoder call for this packet    */
+    ec_dec*psRangeDec,                                  /* I/O  Compressor data structure                       */
+    oac_res*samplesOut,                                /* O    Decoded output speech vector                    */
+    oac_int32*nSamplesOut,                             /* O    Number of samples decoded                       */
 #ifdef ENABLE_DEEP_PLC
-    LPCNetPLCState                  *lpcnet,
+    LPCNetPLCState*lpcnet,
 #endif
-    int                             arch                /* I    Run-time architecture                           */
-);
+    int arch                                            /* I    Run-time architecture                           */
+    );
 
 #if 0
 /**************************************/
@@ -140,10 +140,10 @@ oac_int silk_Decode(                                   /* O    Returns error cod
 /**************************************/
 oac_int silk_get_TOC(
     const oac_uint8                *payload,           /* I    Payload data                                */
-    const oac_int                  nBytesIn,           /* I    Number of input bytes                       */
-    const oac_int                  nFramesPerPayload,  /* I    Number of SILK frames per payload           */
+    const oac_int nBytesIn,                            /* I    Number of input bytes                       */
+    const oac_int nFramesPerPayload,                   /* I    Number of SILK frames per payload           */
     silk_TOC_struct                 *Silk_TOC           /* O    Type of content                             */
-);
+    );
 #endif
 
 
diff --git a/silk/CNG.c b/silk/CNG.c
index a19ae5086..2c0df33a4 100644
--- a/silk/CNG.c
+++ b/silk/CNG.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -34,24 +34,23 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Generates excitation for CNG LPC synthesis */
 static OAC_INLINE void silk_CNG_exc(
-    oac_int32                       exc_Q14[],          /* O    CNG excitation signal Q10                   */
-    oac_int32                       exc_buf_Q14[],      /* I    Random samples buffer Q10                   */
-    oac_int                         length,             /* I    Length                                      */
+    oac_int32 exc_Q14[],                                /* O    CNG excitation signal Q10                   */
+    oac_int32 exc_buf_Q14[],                            /* I    Random samples buffer Q10                   */
+    oac_int length,                                     /* I    Length                                      */
     oac_int32                       *rand_seed          /* I/O  Seed to random index generator              */
-)
-{
+    ) {
     oac_int32 seed;
-    oac_int   i, idx, exc_mask;
+    oac_int i, idx, exc_mask;
 
     exc_mask = CNG_BUF_MASK_MAX;
-    while( exc_mask > length ) {
+    while (exc_mask > length) {
         exc_mask = silk_RSHIFT( exc_mask, 1 );
     }
 
     seed = *rand_seed;
-    for( i = 0; i < length; i++ ) {
+    for (i = 0; i < length; i++) {
         seed = silk_RAND( seed );
-        idx = (oac_int)( silk_RSHIFT( seed, 24 ) & exc_mask );
+        idx = (oac_int)(silk_RSHIFT( seed, 24 )&exc_mask);
         silk_assert( idx >= 0 );
         silk_assert( idx <= CNG_BUF_MASK_MAX );
         exc_Q14[ i ] = exc_buf_Q14[ idx ];
@@ -61,13 +60,12 @@ static OAC_INLINE void silk_CNG_exc(
 
 void silk_CNG_Reset(
     silk_decoder_state          *psDec                          /* I/O  Decoder state                               */
-)
-{
+    ) {
     oac_int i, NLSF_step_Q15, NLSF_acc_Q15;
 
     NLSF_step_Q15 = silk_DIV32_16( silk_int16_MAX, psDec->LPC_order + 1 );
     NLSF_acc_Q15 = 0;
-    for( i = 0; i < psDec->LPC_order; i++ ) {
+    for (i = 0; i < psDec->LPC_order; i++) {
         NLSF_acc_Q15 += NLSF_step_Q15;
         psDec->sCNG.CNG_smth_NLSF_Q15[ i ] = NLSF_acc_Q15;
     }
@@ -79,66 +77,71 @@ void silk_CNG_Reset(
 void silk_CNG(
     silk_decoder_state          *psDec,                         /* I/O  Decoder state                               */
     silk_decoder_control        *psDecCtrl,                     /* I/O  Decoder control                             */
-    oac_int16                  frame[],                        /* I/O  Signal                                      */
-    oac_int                    length                          /* I    Length of residual                          */
-)
-{
-    oac_int   i, subfr;
+    oac_int16 frame[],                                         /* I/O  Signal                                      */
+    oac_int length                                             /* I    Length of residual                          */
+    ) {
+    oac_int i, subfr;
     oac_int32 LPC_pred_Q10, max_Gain_Q16, gain_Q16, gain_Q10;
     oac_int16 A_Q12[ MAX_LPC_ORDER ];
     silk_CNG_struct *psCNG = &psDec->sCNG;
     SAVE_STACK;
 
-    if( psDec->fs_kHz != psCNG->fs_kHz ) {
+    if (psDec->fs_kHz != psCNG->fs_kHz) {
         /* Reset state */
         silk_CNG_Reset( psDec );
 
         psCNG->fs_kHz = psDec->fs_kHz;
     }
-    if( psDec->lossCnt == 0 && psDec->prevSignalType == TYPE_NO_VOICE_ACTIVITY ) {
+    if (psDec->lossCnt == 0 && psDec->prevSignalType == TYPE_NO_VOICE_ACTIVITY) {
         /* Update CNG parameters */
 
         /* Smoothing of LSF's  */
-        for( i = 0; i < psDec->LPC_order; i++ ) {
-            psCNG->CNG_smth_NLSF_Q15[ i ] += silk_SMULWB( (oac_int32)psDec->prevNLSF_Q15[ i ] - (oac_int32)psCNG->CNG_smth_NLSF_Q15[ i ], CNG_NLSF_SMTH_Q16 );
+        for (i = 0; i < psDec->LPC_order; i++) {
+            psCNG->CNG_smth_NLSF_Q15[ i ] += silk_SMULWB((oac_int32)psDec->prevNLSF_Q15[ i ]
+                - (oac_int32)psCNG->CNG_smth_NLSF_Q15[ i ], CNG_NLSF_SMTH_Q16 );
         }
         /* Find the subframe with the highest gain */
         max_Gain_Q16 = 0;
         subfr        = 0;
-        for( i = 0; i < psDec->nb_subfr; i++ ) {
-            if( psDecCtrl->Gains_Q16[ i ] > max_Gain_Q16 ) {
+        for (i = 0; i < psDec->nb_subfr; i++) {
+            if (psDecCtrl->Gains_Q16[ i ] > max_Gain_Q16) {
                 max_Gain_Q16 = psDecCtrl->Gains_Q16[ i ];
                 subfr        = i;
             }
         }
         /* Update CNG excitation buffer with excitation from this subframe */
-        silk_memmove( &psCNG->CNG_exc_buf_Q14[ psDec->subfr_length ], psCNG->CNG_exc_buf_Q14, ( psDec->nb_subfr - 1 ) * psDec->subfr_length * sizeof( oac_int32 ) );
-        silk_memcpy(   psCNG->CNG_exc_buf_Q14, &psDec->exc_Q14[ subfr * psDec->subfr_length ], psDec->subfr_length * sizeof( oac_int32 ) );
+        silk_memmove( &psCNG->CNG_exc_buf_Q14[ psDec->subfr_length ], psCNG->CNG_exc_buf_Q14,
+            (psDec->nb_subfr - 1)*psDec->subfr_length*sizeof(oac_int32));
+        silk_memcpy(   psCNG->CNG_exc_buf_Q14, &psDec->exc_Q14[ subfr*psDec->subfr_length ],
+        psDec->subfr_length*sizeof(oac_int32));
 
         /* Smooth gains */
-        for( i = 0; i < psDec->nb_subfr; i++ ) {
-            psCNG->CNG_smth_Gain_Q16 += silk_SMULWB( psDecCtrl->Gains_Q16[ i ] - psCNG->CNG_smth_Gain_Q16, CNG_GAIN_SMTH_Q16 );
+        for (i = 0; i < psDec->nb_subfr; i++) {
+            psCNG->CNG_smth_Gain_Q16 += silk_SMULWB( psDecCtrl->Gains_Q16[ i ] - psCNG->CNG_smth_Gain_Q16,
+            CNG_GAIN_SMTH_Q16 );
             /* If the smoothed gain is 3 dB greater than this subframe's gain, use this subframe's gain to adapt faster. */
-            if( silk_SMULWW( psCNG->CNG_smth_Gain_Q16, CNG_GAIN_SMTH_THRESHOLD_Q16 ) > psDecCtrl->Gains_Q16[ i ] ) {
+            if (silk_SMULWW( psCNG->CNG_smth_Gain_Q16, CNG_GAIN_SMTH_THRESHOLD_Q16 ) > psDecCtrl->Gains_Q16[ i ]) {
                 psCNG->CNG_smth_Gain_Q16 = psDecCtrl->Gains_Q16[ i ];
             }
         }
     }
 
     /* Add CNG when packet is lost or during DTX */
-    if( psDec->lossCnt ) {
+    if (psDec->lossCnt) {
         VARDECL( oac_int32, CNG_sig_Q14 );
         ALLOC( CNG_sig_Q14, length + MAX_LPC_ORDER, oac_int32 );
 
         /* Generate CNG excitation */
         gain_Q16 = silk_SMULWW( psDec->sPLC.randScale_Q14, psDec->sPLC.prevGain_Q16[1] );
-        if( gain_Q16 >= (1 << 21) || psCNG->CNG_smth_Gain_Q16 > (1 << 23) ) {
+        if (gain_Q16 >= (1<<21) || psCNG->CNG_smth_Gain_Q16 > (1<<23)) {
             gain_Q16 = silk_SMULTT( gain_Q16, gain_Q16 );
-            gain_Q16 = silk_SUB_LSHIFT32(silk_SMULTT( psCNG->CNG_smth_Gain_Q16, psCNG->CNG_smth_Gain_Q16 ), gain_Q16, 5 );
+            gain_Q16 = silk_SUB_LSHIFT32(silk_SMULTT( psCNG->CNG_smth_Gain_Q16, psCNG->CNG_smth_Gain_Q16 ), gain_Q16,
+            5 );
             gain_Q16 = silk_LSHIFT32( silk_SQRT_APPROX( gain_Q16 ), 16 );
         } else {
             gain_Q16 = silk_SMULWW( gain_Q16, gain_Q16 );
-            gain_Q16 = silk_SUB_LSHIFT32(silk_SMULWW( psCNG->CNG_smth_Gain_Q16, psCNG->CNG_smth_Gain_Q16 ), gain_Q16, 5 );
+            gain_Q16 = silk_SUB_LSHIFT32(silk_SMULWW( psCNG->CNG_smth_Gain_Q16, psCNG->CNG_smth_Gain_Q16 ), gain_Q16,
+            5 );
             gain_Q16 = silk_LSHIFT32( silk_SQRT_APPROX( gain_Q16 ), 8 );
         }
         gain_Q10 = silk_RSHIFT( gain_Q16, 6 );
@@ -149,9 +152,9 @@ void silk_CNG(
         silk_NLSF2A( A_Q12, psCNG->CNG_smth_NLSF_Q15, psDec->LPC_order, psDec->arch );
 
         /* Generate CNG signal, by synthesis filtering */
-        silk_memcpy( CNG_sig_Q14, psCNG->CNG_synth_state, MAX_LPC_ORDER * sizeof( oac_int32 ) );
+        silk_memcpy( CNG_sig_Q14, psCNG->CNG_synth_state, MAX_LPC_ORDER*sizeof(oac_int32));
         celt_assert( psDec->LPC_order == 10 || psDec->LPC_order == 16 );
-        for( i = 0; i < length; i++ ) {
+        for (i = 0; i < length; i++) {
             /* Avoids introducing a bias because silk_SMLAWB() always rounds to -inf */
             LPC_pred_Q10 = silk_RSHIFT( psDec->LPC_order, 1 );
             LPC_pred_Q10 = silk_SMLAWB( LPC_pred_Q10, CNG_sig_Q14[ MAX_LPC_ORDER + i -  1 ], A_Q12[ 0 ] );
@@ -164,7 +167,7 @@ void silk_CNG(
             LPC_pred_Q10 = silk_SMLAWB( LPC_pred_Q10, CNG_sig_Q14[ MAX_LPC_ORDER + i -  8 ], A_Q12[ 7 ] );
             LPC_pred_Q10 = silk_SMLAWB( LPC_pred_Q10, CNG_sig_Q14[ MAX_LPC_ORDER + i -  9 ], A_Q12[ 8 ] );
             LPC_pred_Q10 = silk_SMLAWB( LPC_pred_Q10, CNG_sig_Q14[ MAX_LPC_ORDER + i - 10 ], A_Q12[ 9 ] );
-            if( psDec->LPC_order == 16 ) {
+            if (psDec->LPC_order == 16) {
                 LPC_pred_Q10 = silk_SMLAWB( LPC_pred_Q10, CNG_sig_Q14[ MAX_LPC_ORDER + i - 11 ], A_Q12[ 10 ] );
                 LPC_pred_Q10 = silk_SMLAWB( LPC_pred_Q10, CNG_sig_Q14[ MAX_LPC_ORDER + i - 12 ], A_Q12[ 11 ] );
                 LPC_pred_Q10 = silk_SMLAWB( LPC_pred_Q10, CNG_sig_Q14[ MAX_LPC_ORDER + i - 13 ], A_Q12[ 12 ] );
@@ -174,15 +177,17 @@ void silk_CNG(
             }
 
             /* Update states */
-            CNG_sig_Q14[ MAX_LPC_ORDER + i ] = silk_ADD_SAT32( CNG_sig_Q14[ MAX_LPC_ORDER + i ], silk_LSHIFT_SAT32( LPC_pred_Q10, 4 ) );
+            CNG_sig_Q14[ MAX_LPC_ORDER + i ] = silk_ADD_SAT32( CNG_sig_Q14[ MAX_LPC_ORDER + i ],
+            silk_LSHIFT_SAT32( LPC_pred_Q10, 4 ));
 
             /* Scale with Gain and add to input signal */
-            frame[ i ] = (oac_int16)silk_ADD_SAT16( frame[ i ], silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( CNG_sig_Q14[ MAX_LPC_ORDER + i ], gain_Q10 ), 8 ) ) );
+            frame[ i ] = (oac_int16)silk_ADD_SAT16( frame[ i ],
+            silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( CNG_sig_Q14[ MAX_LPC_ORDER + i ], gain_Q10 ), 8 )));
 
         }
-        silk_memcpy( psCNG->CNG_synth_state, &CNG_sig_Q14[ length ], MAX_LPC_ORDER * sizeof( oac_int32 ) );
+        silk_memcpy( psCNG->CNG_synth_state, &CNG_sig_Q14[ length ], MAX_LPC_ORDER*sizeof(oac_int32));
     } else {
-        silk_memset( psCNG->CNG_synth_state, 0, psDec->LPC_order *  sizeof( oac_int32 ) );
+        silk_memset( psCNG->CNG_synth_state, 0, psDec->LPC_order*sizeof(oac_int32));
     }
     RESTORE_STACK;
 }
diff --git a/silk/HP_variable_cutoff.c b/silk/HP_variable_cutoff.c
index 3489ea460..f883abbf3 100644
--- a/silk/HP_variable_cutoff.c
+++ b/silk/HP_variable_cutoff.c
@@ -1,77 +1,77 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 #ifdef FIXED_POINT
-#include "main_FIX.h"
+# include "main_FIX.h"
 #else
-#include "main_FLP.h"
+# include "main_FLP.h"
 #endif
 #include "tuning_parameters.h"
 
 /* High-pass filter with cutoff frequency adaptation based on pitch lag statistics */
 void silk_HP_variable_cutoff(
-    silk_encoder_state_Fxx          state_Fxx[]                         /* I/O  Encoder states                              */
-)
-{
-   oac_int   quality_Q15;
-   oac_int32 pitch_freq_Hz_Q16, pitch_freq_log_Q7, delta_freq_Q7;
-   silk_encoder_state *psEncC1 = &state_Fxx[ 0 ].sCmn;
+    silk_encoder_state_Fxx state_Fxx[]                                  /* I/O  Encoder states                              */
+    ) {
+    oac_int quality_Q15;
+    oac_int32 pitch_freq_Hz_Q16, pitch_freq_log_Q7, delta_freq_Q7;
+    silk_encoder_state *psEncC1 = &state_Fxx[ 0 ].sCmn;
 
-   /* Adaptive cutoff frequency: estimate low end of pitch frequency range */
-   if( psEncC1->prevSignalType == TYPE_VOICED ) {
-      /* difference, in log domain */
-      pitch_freq_Hz_Q16 = silk_DIV32_16( silk_LSHIFT( silk_MUL( psEncC1->fs_kHz, 1000 ), 16 ), psEncC1->prevLag );
-      pitch_freq_log_Q7 = silk_lin2log( pitch_freq_Hz_Q16 ) - ( 16 << 7 );
+    /* Adaptive cutoff frequency: estimate low end of pitch frequency range */
+    if (psEncC1->prevSignalType == TYPE_VOICED) {
+        /* difference, in log domain */
+        pitch_freq_Hz_Q16 = silk_DIV32_16( silk_LSHIFT( silk_MUL( psEncC1->fs_kHz, 1000 ), 16 ), psEncC1->prevLag );
+        pitch_freq_log_Q7 = silk_lin2log( pitch_freq_Hz_Q16 ) - (16<<7);
 
-      /* adjustment based on quality */
-      quality_Q15 = psEncC1->input_quality_bands_Q15[ 0 ];
-      pitch_freq_log_Q7 = silk_SMLAWB( pitch_freq_log_Q7, silk_SMULWB( silk_LSHIFT( -quality_Q15, 2 ), quality_Q15 ),
-            pitch_freq_log_Q7 - ( silk_lin2log( SILK_FIX_CONST( VARIABLE_HP_MIN_CUTOFF_HZ, 16 ) ) - ( 16 << 7 ) ) );
+        /* adjustment based on quality */
+        quality_Q15 = psEncC1->input_quality_bands_Q15[ 0 ];
+        pitch_freq_log_Q7 = silk_SMLAWB( pitch_freq_log_Q7, silk_SMULWB( silk_LSHIFT( -quality_Q15, 2 ), quality_Q15 ),
+            pitch_freq_log_Q7 - (silk_lin2log( SILK_FIX_CONST( VARIABLE_HP_MIN_CUTOFF_HZ, 16 )) - (16<<7)));
 
-      /* delta_freq = pitch_freq_log - psEnc->variable_HP_smth1; */
-      delta_freq_Q7 = pitch_freq_log_Q7 - silk_RSHIFT( psEncC1->variable_HP_smth1_Q15, 8 );
-      if( delta_freq_Q7 < 0 ) {
-         /* less smoothing for decreasing pitch frequency, to track something close to the minimum */
-         delta_freq_Q7 = silk_MUL( delta_freq_Q7, 3 );
-      }
+        /* delta_freq = pitch_freq_log - psEnc->variable_HP_smth1; */
+        delta_freq_Q7 = pitch_freq_log_Q7 - silk_RSHIFT( psEncC1->variable_HP_smth1_Q15, 8 );
+        if (delta_freq_Q7 < 0) {
+            /* less smoothing for decreasing pitch frequency, to track something close to the minimum */
+            delta_freq_Q7 = silk_MUL( delta_freq_Q7, 3 );
+        }
 
-      /* limit delta, to reduce impact of outliers in pitch estimation */
-      delta_freq_Q7 = silk_LIMIT_32( delta_freq_Q7, -SILK_FIX_CONST( VARIABLE_HP_MAX_DELTA_FREQ, 7 ), SILK_FIX_CONST( VARIABLE_HP_MAX_DELTA_FREQ, 7 ) );
+        /* limit delta, to reduce impact of outliers in pitch estimation */
+        delta_freq_Q7 = silk_LIMIT_32( delta_freq_Q7, -SILK_FIX_CONST( VARIABLE_HP_MAX_DELTA_FREQ, 7 ),
+        SILK_FIX_CONST( VARIABLE_HP_MAX_DELTA_FREQ, 7 ));
 
-      /* update smoother */
-      psEncC1->variable_HP_smth1_Q15 = silk_SMLAWB( psEncC1->variable_HP_smth1_Q15,
-            silk_SMULBB( psEncC1->speech_activity_Q8, delta_freq_Q7 ), SILK_FIX_CONST( VARIABLE_HP_SMTH_COEF1, 16 ) );
+        /* update smoother */
+        psEncC1->variable_HP_smth1_Q15 = silk_SMLAWB( psEncC1->variable_HP_smth1_Q15,
+            silk_SMULBB( psEncC1->speech_activity_Q8, delta_freq_Q7 ), SILK_FIX_CONST( VARIABLE_HP_SMTH_COEF1, 16 ));
 
-      /* limit frequency range */
-      psEncC1->variable_HP_smth1_Q15 = silk_LIMIT_32( psEncC1->variable_HP_smth1_Q15,
+        /* limit frequency range */
+        psEncC1->variable_HP_smth1_Q15 = silk_LIMIT_32( psEncC1->variable_HP_smth1_Q15,
             silk_LSHIFT( silk_lin2log( VARIABLE_HP_MIN_CUTOFF_HZ ), 8 ),
-            silk_LSHIFT( silk_lin2log( VARIABLE_HP_MAX_CUTOFF_HZ ), 8 ) );
-   }
+            silk_LSHIFT( silk_lin2log( VARIABLE_HP_MAX_CUTOFF_HZ ), 8 ));
+    }
 }
diff --git a/silk/Inlines.h b/silk/Inlines.h
index 50441bb1f..0981a921b 100644
--- a/silk/Inlines.h
+++ b/silk/Inlines.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 /*! \file silk_Inlines.h
@@ -34,14 +34,13 @@ POSSIBILITY OF SUCH DAMAGE.
 
 
 /* count leading zeros of oac_int64 */
-static OAC_INLINE oac_int32 silk_CLZ64( oac_int64 in )
-{
+static OAC_INLINE oac_int32 silk_CLZ64( oac_int64 in ) {
     oac_int32 in_upper;
 
     in_upper = (oac_int32)silk_RSHIFT64(in, 32);
     if (in_upper == 0) {
         /* Search in the lower 32 bits */
-        return 32 + silk_CLZ32( (oac_int32) in );
+        return 32 + silk_CLZ32((oac_int32) in );
     } else {
         /* Search in the upper 32 bits */
         return silk_CLZ32( in_upper );
@@ -53,28 +52,26 @@ static OAC_INLINE void silk_CLZ_FRAC(
     oac_int32 in,            /* I  input                               */
     oac_int32 *lz,           /* O  number of leading zeros             */
     oac_int32 *frac_Q7       /* O  the 7 bits right after the leading one */
-)
-{
+    ) {
     oac_int32 lzeros = silk_CLZ32(in);
 
-    * lz = lzeros;
-    * frac_Q7 = silk_ROR32(in, 24 - lzeros) & 0x7f;
+    *lz = lzeros;
+    *frac_Q7 = silk_ROR32(in, 24 - lzeros)&0x7f;
 }
 
 /* Approximation of square root                                          */
 /* Accuracy: < +/- 10%  for output values > 15                           */
 /*           < +/- 2.5% for output values > 120                          */
-static OAC_INLINE oac_int32 silk_SQRT_APPROX( oac_int32 x )
-{
+static OAC_INLINE oac_int32 silk_SQRT_APPROX( oac_int32 x ) {
     oac_int32 y, lz, frac_Q7;
 
-    if( x <= 0 ) {
+    if (x <= 0) {
         return 0;
     }
 
     silk_CLZ_FRAC(x, &lz, &frac_Q7);
 
-    if( lz & 1 ) {
+    if (lz&1) {
         y = 32768;
     } else {
         y = 46214;        /* 46214 = sqrt(2) * 32768 */
@@ -91,25 +88,24 @@ static OAC_INLINE oac_int32 silk_SQRT_APPROX( oac_int32 x )
 
 /* Divide two int32 values and return result as int32 in a given Q-domain */
 static OAC_INLINE oac_int32 silk_DIV32_varQ(   /* O    returns a good approximation of "(a32 << Qres) / b32" */
-    const oac_int32     a32,               /* I    numerator (Q0)                  */
-    const oac_int32     b32,               /* I    denominator (Q0)                */
-    const oac_int       Qres               /* I    Q-domain of result (>= 0)       */
-)
-{
-    oac_int   a_headrm, b_headrm, lshift;
+    const oac_int32 a32,                   /* I    numerator (Q0)                  */
+    const oac_int32 b32,                   /* I    denominator (Q0)                */
+    const oac_int Qres                     /* I    Q-domain of result (>= 0)       */
+    ) {
+    oac_int a_headrm, b_headrm, lshift;
     oac_int32 b32_inv, a32_nrm, b32_nrm, result;
 
     silk_assert( b32 != 0 );
     silk_assert( Qres >= 0 );
 
     /* Compute number of bits head room and normalize inputs */
-    a_headrm = silk_CLZ32( silk_abs(a32) ) - 1;
+    a_headrm = silk_CLZ32( silk_abs(a32)) - 1;
     a32_nrm = silk_LSHIFT(a32, a_headrm);                                       /* Q: a_headrm                  */
-    b_headrm = silk_CLZ32( silk_abs(b32) ) - 1;
+    b_headrm = silk_CLZ32( silk_abs(b32)) - 1;
     b32_nrm = silk_LSHIFT(b32, b_headrm);                                       /* Q: b_headrm                  */
 
     /* Inverse of b32, with 14 bits of precision */
-    b32_inv = silk_DIV32_16( silk_int32_MAX >> 2, silk_RSHIFT(b32_nrm, 16) );   /* Q: 29 + 16 - b_headrm        */
+    b32_inv = silk_DIV32_16( silk_int32_MAX>>2, silk_RSHIFT(b32_nrm, 16));      /* Q: 29 + 16 - b_headrm        */
 
     /* First approximation */
     result = silk_SMULWB(a32_nrm, b32_inv);                                     /* Q: 29 + a_headrm - b_headrm  */
@@ -123,10 +119,10 @@ static OAC_INLINE oac_int32 silk_DIV32_varQ(   /* O    returns a good approximat
 
     /* Convert to Qres domain */
     lshift = 29 + a_headrm - b_headrm - Qres;
-    if( lshift < 0 ) {
+    if (lshift < 0) {
         return silk_LSHIFT_SAT32(result, -lshift);
     } else {
-        if( lshift < 32){
+        if (lshift < 32) {
             return silk_RSHIFT(result, lshift);
         } else {
             /* Avoid undefined result */
@@ -137,40 +133,39 @@ static OAC_INLINE oac_int32 silk_DIV32_varQ(   /* O    returns a good approximat
 
 /* Invert int32 value and return result as int32 in a given Q-domain */
 static OAC_INLINE oac_int32 silk_INVERSE32_varQ(   /* O    returns a good approximation of "(1 << Qres) / b32" */
-    const oac_int32     b32,                   /* I    denominator (Q0)                */
-    const oac_int       Qres                   /* I    Q-domain of result (> 0)        */
-)
-{
-    oac_int   b_headrm, lshift;
+    const oac_int32 b32,                       /* I    denominator (Q0)                */
+    const oac_int Qres                         /* I    Q-domain of result (> 0)        */
+    ) {
+    oac_int b_headrm, lshift;
     oac_int32 b32_inv, b32_nrm, err_Q32, result;
 
     silk_assert( b32 != 0 );
     silk_assert( Qres > 0 );
 
     /* Compute number of bits head room and normalize input */
-    b_headrm = silk_CLZ32( silk_abs(b32) ) - 1;
+    b_headrm = silk_CLZ32( silk_abs(b32)) - 1;
     b32_nrm = silk_LSHIFT(b32, b_headrm);                                       /* Q: b_headrm                */
 
     /* Inverse of b32, with 14 bits of precision */
-    b32_inv = silk_DIV32_16( silk_int32_MAX >> 2, silk_RSHIFT(b32_nrm, 16) );   /* Q: 29 + 16 - b_headrm    */
+    b32_inv = silk_DIV32_16( silk_int32_MAX>>2, silk_RSHIFT(b32_nrm, 16));      /* Q: 29 + 16 - b_headrm    */
 
     /* First approximation */
     result = silk_LSHIFT(b32_inv, 16);                                          /* Q: 61 - b_headrm            */
 
     /* Compute residual by subtracting product of denominator and first approximation from one */
-    err_Q32 = silk_LSHIFT( ((oac_int32)1<<29) - silk_SMULWB(b32_nrm, b32_inv), 3 );        /* Q32                        */
+    err_Q32 = silk_LSHIFT(((oac_int32)1<<29) - silk_SMULWB(b32_nrm, b32_inv), 3 );         /* Q32                        */
 
     /* Refinement */
     result = silk_SMLAWW(result, err_Q32, b32_inv);                             /* Q: 61 - b_headrm            */
 
     /* Convert to Qres domain */
     lshift = 61 - b_headrm - Qres;
-    if( lshift <= 0 ) {
+    if (lshift <= 0) {
         return silk_LSHIFT_SAT32(result, -lshift);
     } else {
-        if( lshift < 32){
+        if (lshift < 32) {
             return silk_RSHIFT(result, lshift);
-        }else{
+        } else  {
             /* Avoid undefined result */
             return 0;
         }
diff --git a/silk/LPC_analysis_filter.c b/silk/LPC_analysis_filter.c
index 066c31339..2200839bc 100644
--- a/silk/LPC_analysis_filter.c
+++ b/silk/LPC_analysis_filter.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -50,36 +50,35 @@ void silk_LPC_analysis_filter(
     oac_int16                  *out,               /* O    Output signal                                               */
     const oac_int16            *in,                /* I    Input signal                                                */
     const oac_int16            *B,                 /* I    MA prediction coefficients, Q12 [order]                     */
-    const oac_int32            len,                /* I    Signal length                                               */
-    const oac_int32            d,                  /* I    Filter order                                                */
-    int                         arch                /* I    Run-time architecture                                       */
-)
-{
-    oac_int   j;
+    const oac_int32 len,                           /* I    Signal length                                               */
+    const oac_int32 d,                             /* I    Filter order                                                */
+    int arch                                        /* I    Run-time architecture                                       */
+    ) {
+    oac_int j;
 #if defined(FIXED_POINT) && USE_CELT_FIR
     oac_int16 num[SILK_MAX_ORDER_LPC];
 #else
     int ix;
-    oac_int32       out32_Q12, out32;
+    oac_int32 out32_Q12, out32;
     const oac_int16 *in_ptr;
 #endif
 
     celt_assert( d >= 6 );
-    celt_assert( (d & 1) == 0 );
+    celt_assert((d&1) == 0 );
     celt_assert( d <= len );
 
 #if defined(FIXED_POINT) && USE_CELT_FIR
     celt_assert( d <= SILK_MAX_ORDER_LPC );
-    for ( j = 0; j < d; j++ ) {
+    for (j = 0; j < d; j++) {
         num[ j ] = -B[ j ];
     }
     celt_fir( in + d, num, out + d, len - d, d, arch );
-    for ( j = 0; j < d; j++ ) {
+    for (j = 0; j < d; j++) {
         out[ j ] = 0;
     }
 #else
     (void)arch;
-    for( ix = d; ix < len; ix++ ) {
+    for (ix = d; ix < len; ix++) {
         in_ptr = &in[ ix - 1 ];
 
         out32_Q12 = silk_SMULBB( in_ptr[  0 ], B[ 0 ] );
@@ -90,13 +89,13 @@ void silk_LPC_analysis_filter(
         out32_Q12 = silk_SMLABB_ovflw( out32_Q12, in_ptr[ -3 ], B[ 3 ] );
         out32_Q12 = silk_SMLABB_ovflw( out32_Q12, in_ptr[ -4 ], B[ 4 ] );
         out32_Q12 = silk_SMLABB_ovflw( out32_Q12, in_ptr[ -5 ], B[ 5 ] );
-        for( j = 6; j < d; j += 2 ) {
+        for (j = 6; j < d; j += 2) {
             out32_Q12 = silk_SMLABB_ovflw( out32_Q12, in_ptr[ -j     ], B[ j     ] );
             out32_Q12 = silk_SMLABB_ovflw( out32_Q12, in_ptr[ -j - 1 ], B[ j + 1 ] );
         }
 
         /* Subtract prediction */
-        out32_Q12 = silk_SUB32_ovflw( silk_LSHIFT( (oac_int32)in_ptr[ 1 ], 12 ), out32_Q12 );
+        out32_Q12 = silk_SUB32_ovflw( silk_LSHIFT((oac_int32)in_ptr[ 1 ], 12 ), out32_Q12 );
 
         /* Scale to Q0 */
         out32 = silk_RSHIFT_ROUND( out32_Q12, 12 );
@@ -106,6 +105,6 @@ void silk_LPC_analysis_filter(
     }
 
     /* Set first d output samples to zero */
-    silk_memset( out, 0, d * sizeof( oac_int16 ) );
+    silk_memset( out, 0, d*sizeof(oac_int16));
 #endif
 }
diff --git a/silk/LPC_fit.c b/silk/LPC_fit.c
index 8f9b8b2df..e6370b075 100644
--- a/silk/LPC_fit.c
+++ b/silk/LPC_fit.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2013, Koen Vos. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2013, Koen Vos. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -36,46 +36,45 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_LPC_fit(
     oac_int16                  *a_QOUT,            /* O    Output signal                                               */
     oac_int32                    *a_QIN,             /* I/O  Input signal                                                */
-    const oac_int              QOUT,               /* I    Input Q domain                                              */
-    const oac_int              QIN,                /* I    Input Q domain                                              */
-    const oac_int              d                   /* I    Filter order                                                */
-)
-{
-    oac_int    i, k, idx = 0;
-    oac_int32    maxabs, absval, chirp_Q16;
+    const oac_int QOUT,                            /* I    Input Q domain                                              */
+    const oac_int QIN,                             /* I    Input Q domain                                              */
+    const oac_int d                                /* I    Filter order                                                */
+    ) {
+    oac_int i, k, idx = 0;
+    oac_int32 maxabs, absval, chirp_Q16;
 
     /* Limit the maximum absolute value of the prediction coefficients, so that they'll fit in int16 */
-    for( i = 0; i < 10; i++ ) {
+    for (i = 0; i < 10; i++) {
         /* Find maximum absolute value and its index */
         maxabs = 0;
-        for( k = 0; k < d; k++ ) {
+        for (k = 0; k < d; k++) {
             absval = silk_abs( a_QIN[k] );
-            if( absval > maxabs ) {
+            if (absval > maxabs) {
                 maxabs = absval;
                 idx    = k;
             }
         }
         maxabs = silk_RSHIFT_ROUND( maxabs, QIN - QOUT );
 
-        if( maxabs > silk_int16_MAX ) {
+        if (maxabs > silk_int16_MAX) {
             /* Reduce magnitude of prediction coefficients */
             maxabs = silk_min( maxabs, 163838 );  /* ( silk_int32_MAX >> 14 ) + silk_int16_MAX = 163838 */
             chirp_Q16 = SILK_FIX_CONST( 0.999, 16 ) - silk_DIV32( silk_LSHIFT( maxabs - silk_int16_MAX, 14 ),
-                                        silk_RSHIFT32( silk_MUL( maxabs, idx + 1), 2 ) );
+                                        silk_RSHIFT32( silk_MUL( maxabs, idx + 1), 2 ));
             silk_bwexpander_32( a_QIN, d, chirp_Q16 );
         } else {
             break;
         }
     }
 
-    if( i == 10 ) {
+    if (i == 10) {
         /* Reached the last iteration, clip the coefficients */
-        for( k = 0; k < d; k++ ) {
-            a_QOUT[ k ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( a_QIN[ k ], QIN - QOUT ) );
-            a_QIN[ k ] = silk_LSHIFT( (oac_int32)a_QOUT[ k ], QIN - QOUT );
+        for (k = 0; k < d; k++) {
+            a_QOUT[ k ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( a_QIN[ k ], QIN - QOUT ));
+            a_QIN[ k ] = silk_LSHIFT((oac_int32)a_QOUT[ k ], QIN - QOUT );
         }
     } else {
-        for( k = 0; k < d; k++ ) {
+        for (k = 0; k < d; k++) {
             a_QOUT[ k ] = (oac_int16)silk_RSHIFT_ROUND( a_QIN[ k ], QIN - QOUT );
         }
     }
diff --git a/silk/LPC_inv_pred_gain.c b/silk/LPC_inv_pred_gain.c
index f03afc2ea..10d5f22cb 100644
--- a/silk/LPC_inv_pred_gain.c
+++ b/silk/LPC_inv_pred_gain.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -40,17 +40,16 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Compute inverse of LPC prediction gain, and                          */
 /* test if LPC coefficients are stable (all poles within unit circle)   */
 static oac_int32 LPC_inverse_pred_gain_QA_c(               /* O   Returns inverse prediction gain in energy domain, Q30    */
-    oac_int32           A_QA[ SILK_MAX_ORDER_LPC ],        /* I   Prediction coefficients                                  */
-    const oac_int       order                              /* I   Prediction order                                         */
-)
-{
-    oac_int   k, n, mult2Q;
+    oac_int32 A_QA[ SILK_MAX_ORDER_LPC ],                  /* I   Prediction coefficients                                  */
+    const oac_int order                                    /* I   Prediction order                                         */
+    ) {
+    oac_int k, n, mult2Q;
     oac_int32 invGain_Q30, rc_Q31, rc_mult1_Q30, rc_mult2, tmp1, tmp2;
 
     invGain_Q30 = SILK_FIX_CONST( 1, 30 );
-    for( k = order - 1; k > 0; k-- ) {
+    for (k = order - 1; k > 0; k--) {
         /* Check for stability */
-        if( ( A_QA[ k ] > A_LIMIT ) || ( A_QA[ k ] < -A_LIMIT ) ) {
+        if ((A_QA[ k ] > A_LIMIT) || (A_QA[ k ] < -A_LIMIT)) {
             return 0;
         }
 
@@ -58,45 +57,45 @@ static oac_int32 LPC_inverse_pred_gain_QA_c(               /* O   Returns invers
         rc_Q31 = -silk_LSHIFT( A_QA[ k ], 31 - QA );
 
         /* rc_mult1_Q30 range: [ 1 : 2^30 ] */
-        rc_mult1_Q30 = silk_SUB32( SILK_FIX_CONST( 1, 30 ), silk_SMMUL( rc_Q31, rc_Q31 ) );
-        silk_assert( rc_mult1_Q30 > ( 1 << 15 ) );                   /* reduce A_LIMIT if fails */
-        silk_assert( rc_mult1_Q30 <= ( 1 << 30 ) );
+        rc_mult1_Q30 = silk_SUB32( SILK_FIX_CONST( 1, 30 ), silk_SMMUL( rc_Q31, rc_Q31 ));
+        silk_assert( rc_mult1_Q30 > (1<<15));                        /* reduce A_LIMIT if fails */
+        silk_assert( rc_mult1_Q30 <= (1<<30));
 
         /* Update inverse gain */
         /* invGain_Q30 range: [ 0 : 2^30 ] */
         invGain_Q30 = silk_LSHIFT( silk_SMMUL( invGain_Q30, rc_mult1_Q30 ), 2 );
         silk_assert( invGain_Q30 >= 0           );
-        silk_assert( invGain_Q30 <= ( 1 << 30 ) );
-        if( invGain_Q30 < SILK_FIX_CONST( 1.0f / MAX_PREDICTION_POWER_GAIN, 30 ) ) {
+        silk_assert( invGain_Q30 <= (1<<30));
+        if (invGain_Q30 < SILK_FIX_CONST( 1.0f/MAX_PREDICTION_POWER_GAIN, 30 )) {
             return 0;
         }
 
         /* rc_mult2 range: [ 2^30 : silk_int32_MAX ] */
-        mult2Q = 32 - silk_CLZ32( silk_abs( rc_mult1_Q30 ) );
+        mult2Q = 32 - silk_CLZ32( silk_abs( rc_mult1_Q30 ));
         rc_mult2 = silk_INVERSE32_varQ( rc_mult1_Q30, mult2Q + 30 );
 
         /* Update AR coefficient */
-        for( n = 0; n < (k + 1) >> 1; n++ ) {
+        for (n = 0; n < (k + 1)>>1; n++) {
             oac_int64 tmp64;
             tmp1 = A_QA[ n ];
             tmp2 = A_QA[ k - n - 1 ];
             tmp64 = silk_RSHIFT_ROUND64( silk_SMULL( silk_SUB_SAT32(tmp1,
-                  MUL32_FRAC_Q( tmp2, rc_Q31, 31 ) ), rc_mult2 ), mult2Q);
-            if( tmp64 > silk_int32_MAX || tmp64 < silk_int32_MIN ) {
-               return 0;
+                  MUL32_FRAC_Q( tmp2, rc_Q31, 31 )), rc_mult2 ), mult2Q);
+            if (tmp64 > silk_int32_MAX || tmp64 < silk_int32_MIN) {
+                return 0;
             }
             A_QA[ n ] = ( oac_int32 )tmp64;
             tmp64 = silk_RSHIFT_ROUND64( silk_SMULL( silk_SUB_SAT32(tmp2,
-                  MUL32_FRAC_Q( tmp1, rc_Q31, 31 ) ), rc_mult2), mult2Q);
-            if( tmp64 > silk_int32_MAX || tmp64 < silk_int32_MIN ) {
-               return 0;
+                  MUL32_FRAC_Q( tmp1, rc_Q31, 31 )), rc_mult2), mult2Q);
+            if (tmp64 > silk_int32_MAX || tmp64 < silk_int32_MIN) {
+                return 0;
             }
             A_QA[ k - n - 1 ] = ( oac_int32 )tmp64;
         }
     }
 
     /* Check for stability */
-    if( ( A_QA[ k ] > A_LIMIT ) || ( A_QA[ k ] < -A_LIMIT ) ) {
+    if ((A_QA[ k ] > A_LIMIT) || (A_QA[ k ] < -A_LIMIT)) {
         return 0;
     }
 
@@ -104,14 +103,14 @@ static oac_int32 LPC_inverse_pred_gain_QA_c(               /* O   Returns invers
     rc_Q31 = -silk_LSHIFT( A_QA[ 0 ], 31 - QA );
 
     /* Range: [ 1 : 2^30 ] */
-    rc_mult1_Q30 = silk_SUB32( SILK_FIX_CONST( 1, 30 ), silk_SMMUL( rc_Q31, rc_Q31 ) );
+    rc_mult1_Q30 = silk_SUB32( SILK_FIX_CONST( 1, 30 ), silk_SMMUL( rc_Q31, rc_Q31 ));
 
     /* Update inverse gain */
     /* Range: [ 0 : 2^30 ] */
     invGain_Q30 = silk_LSHIFT( silk_SMMUL( invGain_Q30, rc_mult1_Q30 ), 2 );
     silk_assert( invGain_Q30 >= 0           );
-    silk_assert( invGain_Q30 <= ( 1 << 30 ) );
-    if( invGain_Q30 < SILK_FIX_CONST( 1.0f / MAX_PREDICTION_POWER_GAIN, 30 ) ) {
+    silk_assert( invGain_Q30 <= (1<<30));
+    if (invGain_Q30 < SILK_FIX_CONST( 1.0f/MAX_PREDICTION_POWER_GAIN, 30 )) {
         return 0;
     }
 
@@ -121,20 +120,19 @@ static oac_int32 LPC_inverse_pred_gain_QA_c(               /* O   Returns invers
 /* For input in Q12 domain */
 oac_int32 silk_LPC_inverse_pred_gain_c(            /* O   Returns inverse prediction gain in energy domain, Q30        */
     const oac_int16            *A_Q12,             /* I   Prediction coefficients, Q12 [order]                         */
-    const oac_int              order               /* I   Prediction order                                             */
-)
-{
-    oac_int   k;
+    const oac_int order                            /* I   Prediction order                                             */
+    ) {
+    oac_int k;
     oac_int32 Atmp_QA[ SILK_MAX_ORDER_LPC ];
     oac_int32 DC_resp = 0;
 
     /* Increase Q domain of the AR coefficients */
-    for( k = 0; k < order; k++ ) {
+    for (k = 0; k < order; k++) {
         DC_resp += (oac_int32)A_Q12[ k ];
-        Atmp_QA[ k ] = silk_LSHIFT32( (oac_int32)A_Q12[ k ], QA - 12 );
+        Atmp_QA[ k ] = silk_LSHIFT32((oac_int32)A_Q12[ k ], QA - 12 );
     }
     /* If the DC is unstable, we don't even need to do the full calculations */
-    if( DC_resp >= 4096 ) {
+    if (DC_resp >= 4096) {
         return 0;
     }
     return LPC_inverse_pred_gain_QA_c( Atmp_QA, order );
diff --git a/silk/LP_variable_cutoff.c b/silk/LP_variable_cutoff.c
index 1cf1e19ba..981dffa31 100644
--- a/silk/LP_variable_cutoff.c
+++ b/silk/LP_variable_cutoff.c
@@ -1,95 +1,93 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 /*
     Elliptic/Cauer filters designed with 0.1 dB passband ripple,
     80 dB minimum stopband attenuation, and
     [0.95 : 0.15 : 0.35] normalized cut off frequencies.
-*/
+ */
 
 #include "main.h"
 
 /* Helper function, interpolates the filter taps */
 static OAC_INLINE void silk_LP_interpolate_filter_taps(
-    oac_int32           B_Q28[ TRANSITION_NB ],
-    oac_int32           A_Q28[ TRANSITION_NA ],
-    const oac_int       ind,
-    const oac_int32     fac_Q16
-)
-{
+    oac_int32 B_Q28[ TRANSITION_NB ],
+    oac_int32 A_Q28[ TRANSITION_NA ],
+    const oac_int ind,
+    const oac_int32 fac_Q16)                                {
     oac_int nb, na;
 
-    if( ind < TRANSITION_INT_NUM - 1 ) {
-        if( fac_Q16 > 0 ) {
-            if( fac_Q16 < 32768 ) { /* fac_Q16 is in range of a 16-bit int */
+    if (ind < TRANSITION_INT_NUM - 1) {
+        if (fac_Q16 > 0) {
+            if (fac_Q16 < 32768) {  /* fac_Q16 is in range of a 16-bit int */
                 /* Piece-wise linear interpolation of B and A */
-                for( nb = 0; nb < TRANSITION_NB; nb++ ) {
+                for (nb = 0; nb < TRANSITION_NB; nb++) {
                     B_Q28[ nb ] = silk_SMLAWB(
                         silk_Transition_LP_B_Q28[ ind     ][ nb ],
-                        silk_Transition_LP_B_Q28[ ind + 1 ][ nb ] -
-                        silk_Transition_LP_B_Q28[ ind     ][ nb ],
+                        silk_Transition_LP_B_Q28[ ind + 1 ][ nb ]
+                        - silk_Transition_LP_B_Q28[ ind     ][ nb ],
                         fac_Q16 );
                 }
-                for( na = 0; na < TRANSITION_NA; na++ ) {
+                for (na = 0; na < TRANSITION_NA; na++) {
                     A_Q28[ na ] = silk_SMLAWB(
                         silk_Transition_LP_A_Q28[ ind     ][ na ],
-                        silk_Transition_LP_A_Q28[ ind + 1 ][ na ] -
-                        silk_Transition_LP_A_Q28[ ind     ][ na ],
+                        silk_Transition_LP_A_Q28[ ind + 1 ][ na ]
+                        - silk_Transition_LP_A_Q28[ ind     ][ na ],
                         fac_Q16 );
                 }
             } else { /* ( fac_Q16 - ( 1 << 16 ) ) is in range of a 16-bit int */
-                silk_assert( fac_Q16 - ( 1 << 16 ) == silk_SAT16( fac_Q16 - ( 1 << 16 ) ) );
+                silk_assert( fac_Q16 - (1<<16) == silk_SAT16( fac_Q16 - (1<<16)));
                 /* Piece-wise linear interpolation of B and A */
-                for( nb = 0; nb < TRANSITION_NB; nb++ ) {
+                for (nb = 0; nb < TRANSITION_NB; nb++) {
                     B_Q28[ nb ] = silk_SMLAWB(
                         silk_Transition_LP_B_Q28[ ind + 1 ][ nb ],
-                        silk_Transition_LP_B_Q28[ ind + 1 ][ nb ] -
-                        silk_Transition_LP_B_Q28[ ind     ][ nb ],
-                        fac_Q16 - ( (oac_int32)1 << 16 ) );
+                        silk_Transition_LP_B_Q28[ ind + 1 ][ nb ]
+                        - silk_Transition_LP_B_Q28[ ind     ][ nb ],
+                        fac_Q16 - ((oac_int32)1<<16));
                 }
-                for( na = 0; na < TRANSITION_NA; na++ ) {
+                for (na = 0; na < TRANSITION_NA; na++) {
                     A_Q28[ na ] = silk_SMLAWB(
                         silk_Transition_LP_A_Q28[ ind + 1 ][ na ],
-                        silk_Transition_LP_A_Q28[ ind + 1 ][ na ] -
-                        silk_Transition_LP_A_Q28[ ind     ][ na ],
-                        fac_Q16 - ( (oac_int32)1 << 16 ) );
+                        silk_Transition_LP_A_Q28[ ind + 1 ][ na ]
+                        - silk_Transition_LP_A_Q28[ ind     ][ na ],
+                        fac_Q16 - ((oac_int32)1<<16));
                 }
             }
         } else {
-            silk_memcpy( B_Q28, silk_Transition_LP_B_Q28[ ind ], TRANSITION_NB * sizeof( oac_int32 ) );
-            silk_memcpy( A_Q28, silk_Transition_LP_A_Q28[ ind ], TRANSITION_NA * sizeof( oac_int32 ) );
+            silk_memcpy( B_Q28, silk_Transition_LP_B_Q28[ ind ], TRANSITION_NB*sizeof(oac_int32));
+            silk_memcpy( A_Q28, silk_Transition_LP_A_Q28[ ind ], TRANSITION_NA*sizeof(oac_int32));
         }
     } else {
-        silk_memcpy( B_Q28, silk_Transition_LP_B_Q28[ TRANSITION_INT_NUM - 1 ], TRANSITION_NB * sizeof( oac_int32 ) );
-        silk_memcpy( A_Q28, silk_Transition_LP_A_Q28[ TRANSITION_INT_NUM - 1 ], TRANSITION_NA * sizeof( oac_int32 ) );
+        silk_memcpy( B_Q28, silk_Transition_LP_B_Q28[ TRANSITION_INT_NUM - 1 ], TRANSITION_NB*sizeof(oac_int32));
+        silk_memcpy( A_Q28, silk_Transition_LP_A_Q28[ TRANSITION_INT_NUM - 1 ], TRANSITION_NA*sizeof(oac_int32));
     }
 }
 
@@ -100,18 +98,17 @@ static OAC_INLINE void silk_LP_interpolate_filter_taps(
 void silk_LP_variable_cutoff(
     silk_LP_state               *psLP,                          /* I/O  LP filter state                             */
     oac_int16                  *frame,                         /* I/O  Low-pass filtered output signal             */
-    const oac_int              frame_length                    /* I    Frame length                                */
-)
-{
-    oac_int32   B_Q28[ TRANSITION_NB ], A_Q28[ TRANSITION_NA ], fac_Q16 = 0;
-    oac_int     ind = 0;
+    const oac_int frame_length                                 /* I    Frame length                                */
+    ) {
+    oac_int32 B_Q28[ TRANSITION_NB ], A_Q28[ TRANSITION_NA ], fac_Q16 = 0;
+    oac_int ind = 0;
 
     silk_assert( psLP->transition_frame_no >= 0 && psLP->transition_frame_no <= TRANSITION_FRAMES );
 
     /* Run filter if needed */
-    if( psLP->mode != 0 ) {
+    if (psLP->mode != 0) {
         /* Calculate index and interpolation factor for interpolation */
-#if( TRANSITION_INT_STEPS == 64 )
+#if (TRANSITION_INT_STEPS == 64)
         fac_Q16 = silk_LSHIFT( TRANSITION_FRAMES - psLP->transition_frame_no, 16 - 6 );
 #else
         fac_Q16 = silk_DIV32_16( silk_LSHIFT( TRANSITION_FRAMES - psLP->transition_frame_no, 16 ), TRANSITION_FRAMES );
diff --git a/silk/MacroCount.h b/silk/MacroCount.h
index 2e1efc4f6..8b34323f3 100644
--- a/silk/MacroCount.h
+++ b/silk/MacroCount.h
@@ -1,224 +1,224 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SIGPROCFIX_API_MACROCOUNT_H
 #define SIGPROCFIX_API_MACROCOUNT_H
 
 #ifdef    silk_MACRO_COUNT
-#include <stdio.h>
-#define varDefine oac_int64 ops_count = 0;
+# include <stdio.h>
+# define varDefine oac_int64 ops_count = 0;
 
 extern oac_int64 ops_count;
 
-static OAC_INLINE oac_int64 silk_SaveCount(){
-    return(ops_count);
+static OAC_INLINE oac_int64 silk_SaveCount() {
+    return ops_count;
 }
 
-static OAC_INLINE oac_int64 silk_SaveResetCount(){
+static OAC_INLINE oac_int64 silk_SaveResetCount() {
     oac_int64 ret;
 
     ret = ops_count;
     ops_count = 0;
-    return(ret);
+    return ret;
 }
 
-static OAC_INLINE silk_PrintCount(){
+static OAC_INLINE silk_PrintCount() {
     printf("ops_count = %d \n ", (oac_int32)ops_count);
 }
 
-#undef silk_MUL
-static OAC_INLINE oac_int32 silk_MUL(oac_int32 a32, oac_int32 b32){
+# undef silk_MUL
+static OAC_INLINE oac_int32 silk_MUL(oac_int32 a32, oac_int32 b32) {
     oac_int32 ret;
     ops_count += 4;
-    ret = a32 * b32;
+    ret = a32*b32;
     return ret;
 }
 
-#undef silk_MUL_uint
-static OAC_INLINE oac_uint32 silk_MUL_uint(oac_uint32 a32, oac_uint32 b32){
+# undef silk_MUL_uint
+static OAC_INLINE oac_uint32 silk_MUL_uint(oac_uint32 a32, oac_uint32 b32) {
     oac_uint32 ret;
     ops_count += 4;
-    ret = a32 * b32;
+    ret = a32*b32;
     return ret;
 }
-#undef silk_MLA
-static OAC_INLINE oac_int32 silk_MLA(oac_int32 a32, oac_int32 b32, oac_int32 c32){
+# undef silk_MLA
+static OAC_INLINE oac_int32 silk_MLA(oac_int32 a32, oac_int32 b32, oac_int32 c32) {
     oac_int32 ret;
     ops_count += 4;
-    ret = a32 + b32 * c32;
+    ret = a32 + b32*c32;
     return ret;
 }
 
-#undef silk_MLA_uint
-static OAC_INLINE oac_int32 silk_MLA_uint(oac_uint32 a32, oac_uint32 b32, oac_uint32 c32){
+# undef silk_MLA_uint
+static OAC_INLINE oac_int32 silk_MLA_uint(oac_uint32 a32, oac_uint32 b32, oac_uint32 c32) {
     oac_uint32 ret;
     ops_count += 4;
-    ret = a32 + b32 * c32;
+    ret = a32 + b32*c32;
     return ret;
 }
 
-#undef silk_SMULWB
-static OAC_INLINE oac_int32 silk_SMULWB(oac_int32 a32, oac_int32 b32){
+# undef silk_SMULWB
+static OAC_INLINE oac_int32 silk_SMULWB(oac_int32 a32, oac_int32 b32) {
     oac_int32 ret;
     ops_count += 5;
-    ret = (a32 >> 16) * (oac_int32)((oac_int16)b32) + (((a32 & 0x0000FFFF) * (oac_int32)((oac_int16)b32)) >> 16);
+    ret = (a32>>16)*(oac_int32)((oac_int16)b32) + (((a32&0x0000FFFF)*(oac_int32)((oac_int16)b32))>>16);
     return ret;
 }
-#undef    silk_SMLAWB
-static OAC_INLINE oac_int32 silk_SMLAWB(oac_int32 a32, oac_int32 b32, oac_int32 c32){
+# undef    silk_SMLAWB
+static OAC_INLINE oac_int32 silk_SMLAWB(oac_int32 a32, oac_int32 b32, oac_int32 c32) {
     oac_int32 ret;
     ops_count += 5;
-    ret = ((a32) + ((((b32) >> 16) * (oac_int32)((oac_int16)(c32))) + ((((b32) & 0x0000FFFF) * (oac_int32)((oac_int16)(c32))) >> 16)));
+    ret = ((a32) + ((((b32)>>16)*(oac_int32)((oac_int16)(c32))) + ((((b32)&0x0000FFFF)*(oac_int32)((oac_int16)(c32)))>>
+                                                                   16)));
     return ret;
 }
 
-#undef silk_SMULWT
-static OAC_INLINE oac_int32 silk_SMULWT(oac_int32 a32, oac_int32 b32){
+# undef silk_SMULWT
+static OAC_INLINE oac_int32 silk_SMULWT(oac_int32 a32, oac_int32 b32) {
     oac_int32 ret;
     ops_count += 4;
-    ret = (a32 >> 16) * (b32 >> 16) + (((a32 & 0x0000FFFF) * (b32 >> 16)) >> 16);
+    ret = (a32>>16)*(b32>>16) + (((a32&0x0000FFFF)*(b32>>16))>>16);
     return ret;
 }
-#undef silk_SMLAWT
-static OAC_INLINE oac_int32 silk_SMLAWT(oac_int32 a32, oac_int32 b32, oac_int32 c32){
+# undef silk_SMLAWT
+static OAC_INLINE oac_int32 silk_SMLAWT(oac_int32 a32, oac_int32 b32, oac_int32 c32) {
     oac_int32 ret;
     ops_count += 4;
-    ret = a32 + ((b32 >> 16) * (c32 >> 16)) + (((b32 & 0x0000FFFF) * ((c32 >> 16)) >> 16));
+    ret = a32 + ((b32>>16)*(c32>>16)) + (((b32&0x0000FFFF)*((c32>>16))>>16));
     return ret;
 }
 
-#undef silk_SMULBB
-static OAC_INLINE oac_int32 silk_SMULBB(oac_int32 a32, oac_int32 b32){
+# undef silk_SMULBB
+static OAC_INLINE oac_int32 silk_SMULBB(oac_int32 a32, oac_int32 b32) {
     oac_int32 ret;
     ops_count += 1;
-    ret = (oac_int32)((oac_int16)a32) * (oac_int32)((oac_int16)b32);
+    ret = (oac_int32)((oac_int16)a32)*(oac_int32)((oac_int16)b32);
     return ret;
 }
-#undef silk_SMLABB
-static OAC_INLINE oac_int32 silk_SMLABB(oac_int32 a32, oac_int32 b32, oac_int32 c32){
+# undef silk_SMLABB
+static OAC_INLINE oac_int32 silk_SMLABB(oac_int32 a32, oac_int32 b32, oac_int32 c32) {
     oac_int32 ret;
     ops_count += 1;
-    ret = a32 + (oac_int32)((oac_int16)b32) * (oac_int32)((oac_int16)c32);
+    ret = a32 + (oac_int32)((oac_int16)b32)*(oac_int32)((oac_int16)c32);
     return ret;
 }
 
-#undef silk_SMULBT
-static OAC_INLINE oac_int32 silk_SMULBT(oac_int32 a32, oac_int32 b32 ){
+# undef silk_SMULBT
+static OAC_INLINE oac_int32 silk_SMULBT(oac_int32 a32, oac_int32 b32 ) {
     oac_int32 ret;
     ops_count += 4;
-    ret = ((oac_int32)((oac_int16)a32)) * (b32 >> 16);
+    ret = ((oac_int32)((oac_int16)a32))*(b32>>16);
     return ret;
 }
 
-#undef silk_SMLABT
-static OAC_INLINE oac_int32 silk_SMLABT(oac_int32 a32, oac_int32 b32, oac_int32 c32){
+# undef silk_SMLABT
+static OAC_INLINE oac_int32 silk_SMLABT(oac_int32 a32, oac_int32 b32, oac_int32 c32) {
     oac_int32 ret;
     ops_count += 1;
-    ret = a32 + ((oac_int32)((oac_int16)b32)) * (c32 >> 16);
+    ret = a32 + ((oac_int32)((oac_int16)b32))*(c32>>16);
     return ret;
 }
 
-#undef silk_SMULTT
-static OAC_INLINE oac_int32 silk_SMULTT(oac_int32 a32, oac_int32 b32){
+# undef silk_SMULTT
+static OAC_INLINE oac_int32 silk_SMULTT(oac_int32 a32, oac_int32 b32) {
     oac_int32 ret;
     ops_count += 1;
-    ret = (a32 >> 16) * (b32 >> 16);
+    ret = (a32>>16)*(b32>>16);
     return ret;
 }
 
-#undef    silk_SMLATT
-static OAC_INLINE oac_int32 silk_SMLATT(oac_int32 a32, oac_int32 b32, oac_int32 c32){
+# undef    silk_SMLATT
+static OAC_INLINE oac_int32 silk_SMLATT(oac_int32 a32, oac_int32 b32, oac_int32 c32) {
     oac_int32 ret;
     ops_count += 1;
-    ret = a32 + (b32 >> 16) * (c32 >> 16);
+    ret = a32 + (b32>>16)*(c32>>16);
     return ret;
 }
 
 
 /* multiply-accumulate macros that allow overflow in the addition (ie, no asserts in debug mode)*/
-#undef    silk_MLA_ovflw
-#define silk_MLA_ovflw silk_MLA
+# undef    silk_MLA_ovflw
+# define silk_MLA_ovflw silk_MLA
 
-#undef silk_SMLABB_ovflw
-#define silk_SMLABB_ovflw silk_SMLABB
+# undef silk_SMLABB_ovflw
+# define silk_SMLABB_ovflw silk_SMLABB
 
-#undef silk_SMLABT_ovflw
-#define silk_SMLABT_ovflw silk_SMLABT
+# undef silk_SMLABT_ovflw
+# define silk_SMLABT_ovflw silk_SMLABT
 
-#undef silk_SMLATT_ovflw
-#define silk_SMLATT_ovflw silk_SMLATT
+# undef silk_SMLATT_ovflw
+# define silk_SMLATT_ovflw silk_SMLATT
 
-#undef silk_SMLAWB_ovflw
-#define silk_SMLAWB_ovflw silk_SMLAWB
+# undef silk_SMLAWB_ovflw
+# define silk_SMLAWB_ovflw silk_SMLAWB
 
-#undef silk_SMLAWT_ovflw
-#define silk_SMLAWT_ovflw silk_SMLAWT
+# undef silk_SMLAWT_ovflw
+# define silk_SMLAWT_ovflw silk_SMLAWT
 
-#undef silk_SMULL
-static OAC_INLINE oac_int64 silk_SMULL(oac_int32 a32, oac_int32 b32){
+# undef silk_SMULL
+static OAC_INLINE oac_int64 silk_SMULL(oac_int32 a32, oac_int32 b32) {
     oac_int64 ret;
     ops_count += 8;
-    ret = ((oac_int64)(a32) * /*(oac_int64)*/(b32));
+    ret = ((oac_int64)(a32)*/*(oac_int64)*/ (b32));
     return ret;
 }
 
-#undef    silk_SMLAL
-static OAC_INLINE oac_int64 silk_SMLAL(oac_int64 a64, oac_int32 b32, oac_int32 c32){
+# undef    silk_SMLAL
+static OAC_INLINE oac_int64 silk_SMLAL(oac_int64 a64, oac_int32 b32, oac_int32 c32) {
     oac_int64 ret;
     ops_count += 8;
-    ret = a64 + ((oac_int64)(b32) * /*(oac_int64)*/(c32));
+    ret = a64 + ((oac_int64)(b32)*/*(oac_int64)*/ (c32));
     return ret;
 }
-#undef    silk_SMLALBB
-static OAC_INLINE oac_int64 silk_SMLALBB(oac_int64 a64, oac_int16 b16, oac_int16 c16){
+# undef    silk_SMLALBB
+static OAC_INLINE oac_int64 silk_SMLALBB(oac_int64 a64, oac_int16 b16, oac_int16 c16) {
     oac_int64 ret;
     ops_count += 4;
-    ret = a64 + ((oac_int64)(b16) * /*(oac_int64)*/(c16));
+    ret = a64 + ((oac_int64)(b16)*/*(oac_int64)*/ (c16));
     return ret;
 }
 
-#undef    SigProcFIX_CLZ16
-static OAC_INLINE oac_int32 SigProcFIX_CLZ16(oac_int16 in16)
-{
+# undef    SigProcFIX_CLZ16
+static OAC_INLINE oac_int32 SigProcFIX_CLZ16(oac_int16 in16) {
     oac_int32 out32 = 0;
     ops_count += 10;
-    if( in16 == 0 ) {
+    if (in16 == 0) {
         return 16;
     }
     /* test nibbles */
-    if( in16 & 0xFF00 ) {
-        if( in16 & 0xF000 ) {
+    if (in16&0xFF00) {
+        if (in16&0xF000) {
             in16 >>= 12;
         } else {
             out32 += 4;
             in16 >>= 8;
         }
     } else {
-        if( in16 & 0xFFF0 ) {
+        if (in16&0xFFF0) {
             out32 += 8;
             in16 >>= 4;
         } else {
@@ -226,484 +226,472 @@ static OAC_INLINE oac_int32 SigProcFIX_CLZ16(oac_int16 in16)
         }
     }
     /* test bits and return */
-    if( in16 & 0xC ) {
-        if( in16 & 0x8 )
+    if (in16&0xC) {
+        if (in16&0x8)
             return out32 + 0;
         else
             return out32 + 1;
     } else {
-        if( in16 & 0xE )
+        if (in16&0xE)
             return out32 + 2;
         else
             return out32 + 3;
     }
 }
 
-#undef SigProcFIX_CLZ32
-static OAC_INLINE oac_int32 SigProcFIX_CLZ32(oac_int32 in32)
-{
+# undef SigProcFIX_CLZ32
+static OAC_INLINE oac_int32 SigProcFIX_CLZ32(oac_int32 in32) {
     /* test highest 16 bits and convert to oac_int16 */
     ops_count += 2;
-    if( in32 & 0xFFFF0000 ) {
-        return SigProcFIX_CLZ16((oac_int16)(in32 >> 16));
+    if (in32&0xFFFF0000) {
+        return SigProcFIX_CLZ16((oac_int16)(in32>>16));
     } else {
         return SigProcFIX_CLZ16((oac_int16)in32) + 16;
     }
 }
 
-#undef silk_DIV32
-static OAC_INLINE oac_int32 silk_DIV32(oac_int32 a32, oac_int32 b32){
+# undef silk_DIV32
+static OAC_INLINE oac_int32 silk_DIV32(oac_int32 a32, oac_int32 b32) {
     ops_count += 64;
-    return a32 / b32;
+    return a32/b32;
 }
 
-#undef silk_DIV32_16
-static OAC_INLINE oac_int32 silk_DIV32_16(oac_int32 a32, oac_int32 b32){
+# undef silk_DIV32_16
+static OAC_INLINE oac_int32 silk_DIV32_16(oac_int32 a32, oac_int32 b32) {
     ops_count += 32;
-    return a32 / b32;
+    return a32/b32;
 }
 
-#undef silk_SAT8
-static OAC_INLINE oac_int8 silk_SAT8(oac_int64 a){
+# undef silk_SAT8
+static OAC_INLINE oac_int8 silk_SAT8(oac_int64 a) {
     oac_int8 tmp;
     ops_count += 1;
     tmp = (oac_int8)((a) > silk_int8_MAX ? silk_int8_MAX  : \
-                    ((a) < silk_int8_MIN ? silk_int8_MIN  : (a)));
-    return(tmp);
+                     ((a) < silk_int8_MIN ? silk_int8_MIN  : (a)));
+    return tmp;
 }
 
-#undef silk_SAT16
-static OAC_INLINE oac_int16 silk_SAT16(oac_int64 a){
+# undef silk_SAT16
+static OAC_INLINE oac_int16 silk_SAT16(oac_int64 a) {
     oac_int16 tmp;
     ops_count += 1;
     tmp = (oac_int16)((a) > silk_int16_MAX ? silk_int16_MAX  : \
-                     ((a) < silk_int16_MIN ? silk_int16_MIN  : (a)));
-    return(tmp);
+                      ((a) < silk_int16_MIN ? silk_int16_MIN  : (a)));
+    return tmp;
 }
-#undef silk_SAT32
-static OAC_INLINE oac_int32 silk_SAT32(oac_int64 a){
+# undef silk_SAT32
+static OAC_INLINE oac_int32 silk_SAT32(oac_int64 a) {
     oac_int32 tmp;
     ops_count += 1;
     tmp = (oac_int32)((a) > silk_int32_MAX ? silk_int32_MAX  : \
-                     ((a) < silk_int32_MIN ? silk_int32_MIN  : (a)));
-    return(tmp);
+                      ((a) < silk_int32_MIN ? silk_int32_MIN  : (a)));
+    return tmp;
 }
-#undef silk_POS_SAT32
-static OAC_INLINE oac_int32 silk_POS_SAT32(oac_int64 a){
+# undef silk_POS_SAT32
+static OAC_INLINE oac_int32 silk_POS_SAT32(oac_int64 a) {
     oac_int32 tmp;
     ops_count += 1;
     tmp = (oac_int32)((a) > silk_int32_MAX ? silk_int32_MAX : (a));
-    return(tmp);
+    return tmp;
 }
 
-#undef silk_ADD_POS_SAT8
-static OAC_INLINE oac_int8 silk_ADD_POS_SAT8(oac_int64 a, oac_int64 b){
+# undef silk_ADD_POS_SAT8
+static OAC_INLINE oac_int8 silk_ADD_POS_SAT8(oac_int64 a, oac_int64 b) {
     oac_int8 tmp;
     ops_count += 1;
-    tmp = (oac_int8)((((a)+(b)) & 0x80) ? silk_int8_MAX  : ((a)+(b)));
-    return(tmp);
+    tmp = (oac_int8)((((a) + (b))&0x80) ? silk_int8_MAX  : ((a) + (b)));
+    return tmp;
 }
-#undef silk_ADD_POS_SAT16
-static OAC_INLINE oac_int16 silk_ADD_POS_SAT16(oac_int64 a, oac_int64 b){
+# undef silk_ADD_POS_SAT16
+static OAC_INLINE oac_int16 silk_ADD_POS_SAT16(oac_int64 a, oac_int64 b) {
     oac_int16 tmp;
     ops_count += 1;
-    tmp = (oac_int16)((((a)+(b)) & 0x8000) ? silk_int16_MAX : ((a)+(b)));
-    return(tmp);
+    tmp = (oac_int16)((((a) + (b))&0x8000) ? silk_int16_MAX : ((a) + (b)));
+    return tmp;
 }
 
-#undef silk_ADD_POS_SAT32
-static OAC_INLINE oac_int32 silk_ADD_POS_SAT32(oac_int64 a, oac_int64 b){
+# undef silk_ADD_POS_SAT32
+static OAC_INLINE oac_int32 silk_ADD_POS_SAT32(oac_int64 a, oac_int64 b) {
     oac_int32 tmp;
     ops_count += 1;
-    tmp = (oac_int32)((((a)+(b)) & 0x80000000) ? silk_int32_MAX : ((a)+(b)));
-    return(tmp);
+    tmp = (oac_int32)((((a) + (b))&0x80000000) ? silk_int32_MAX : ((a) + (b)));
+    return tmp;
 }
 
-#undef    silk_LSHIFT8
-static OAC_INLINE oac_int8 silk_LSHIFT8(oac_int8 a, oac_int32 shift){
+# undef    silk_LSHIFT8
+static OAC_INLINE oac_int8 silk_LSHIFT8(oac_int8 a, oac_int32 shift) {
     oac_int8 ret;
     ops_count += 1;
-    ret = a << shift;
+    ret = a<<shift;
     return ret;
 }
-#undef    silk_LSHIFT16
-static OAC_INLINE oac_int16 silk_LSHIFT16(oac_int16 a, oac_int32 shift){
+# undef    silk_LSHIFT16
+static OAC_INLINE oac_int16 silk_LSHIFT16(oac_int16 a, oac_int32 shift) {
     oac_int16 ret;
     ops_count += 1;
-    ret = a << shift;
+    ret = a<<shift;
     return ret;
 }
-#undef    silk_LSHIFT32
-static OAC_INLINE oac_int32 silk_LSHIFT32(oac_int32 a, oac_int32 shift){
+# undef    silk_LSHIFT32
+static OAC_INLINE oac_int32 silk_LSHIFT32(oac_int32 a, oac_int32 shift) {
     oac_int32 ret;
     ops_count += 1;
-    ret = a << shift;
+    ret = a<<shift;
     return ret;
 }
-#undef    silk_LSHIFT64
-static OAC_INLINE oac_int64 silk_LSHIFT64(oac_int64 a, oac_int shift){
+# undef    silk_LSHIFT64
+static OAC_INLINE oac_int64 silk_LSHIFT64(oac_int64 a, oac_int shift) {
     ops_count += 1;
-    return a << shift;
+    return a<<shift;
 }
 
-#undef    silk_LSHIFT_ovflw
-static OAC_INLINE oac_int32 silk_LSHIFT_ovflw(oac_int32 a, oac_int32 shift){
+# undef    silk_LSHIFT_ovflw
+static OAC_INLINE oac_int32 silk_LSHIFT_ovflw(oac_int32 a, oac_int32 shift) {
     ops_count += 1;
-    return a << shift;
+    return a<<shift;
 }
 
-#undef    silk_LSHIFT_uint
-static OAC_INLINE oac_uint32 silk_LSHIFT_uint(oac_uint32 a, oac_int32 shift){
+# undef    silk_LSHIFT_uint
+static OAC_INLINE oac_uint32 silk_LSHIFT_uint(oac_uint32 a, oac_int32 shift) {
     oac_uint32 ret;
     ops_count += 1;
-    ret = a << shift;
+    ret = a<<shift;
     return ret;
 }
 
-#undef    silk_RSHIFT8
-static OAC_INLINE oac_int8 silk_RSHIFT8(oac_int8 a, oac_int32 shift){
+# undef    silk_RSHIFT8
+static OAC_INLINE oac_int8 silk_RSHIFT8(oac_int8 a, oac_int32 shift) {
     ops_count += 1;
-    return a >> shift;
+    return a>>shift;
 }
-#undef    silk_RSHIFT16
-static OAC_INLINE oac_int16 silk_RSHIFT16(oac_int16 a, oac_int32 shift){
+# undef    silk_RSHIFT16
+static OAC_INLINE oac_int16 silk_RSHIFT16(oac_int16 a, oac_int32 shift) {
     ops_count += 1;
-    return a >> shift;
+    return a>>shift;
 }
-#undef    silk_RSHIFT32
-static OAC_INLINE oac_int32 silk_RSHIFT32(oac_int32 a, oac_int32 shift){
+# undef    silk_RSHIFT32
+static OAC_INLINE oac_int32 silk_RSHIFT32(oac_int32 a, oac_int32 shift) {
     ops_count += 1;
-    return a >> shift;
+    return a>>shift;
 }
-#undef    silk_RSHIFT64
-static OAC_INLINE oac_int64 silk_RSHIFT64(oac_int64 a, oac_int64 shift){
+# undef    silk_RSHIFT64
+static OAC_INLINE oac_int64 silk_RSHIFT64(oac_int64 a, oac_int64 shift) {
     ops_count += 1;
-    return a >> shift;
+    return a>>shift;
 }
 
-#undef    silk_RSHIFT_uint
-static OAC_INLINE oac_uint32 silk_RSHIFT_uint(oac_uint32 a, oac_int32 shift){
+# undef    silk_RSHIFT_uint
+static OAC_INLINE oac_uint32 silk_RSHIFT_uint(oac_uint32 a, oac_int32 shift) {
     ops_count += 1;
-    return a >> shift;
+    return a>>shift;
 }
 
-#undef    silk_ADD_LSHIFT
-static OAC_INLINE oac_int32 silk_ADD_LSHIFT(oac_int32 a, oac_int32 b, oac_int32 shift){
+# undef    silk_ADD_LSHIFT
+static OAC_INLINE oac_int32 silk_ADD_LSHIFT(oac_int32 a, oac_int32 b, oac_int32 shift) {
     oac_int32 ret;
     ops_count += 1;
-    ret = a + (b << shift);
+    ret = a + (b<<shift);
     return ret;                /* shift >= 0*/
 }
-#undef    silk_ADD_LSHIFT32
-static OAC_INLINE oac_int32 silk_ADD_LSHIFT32(oac_int32 a, oac_int32 b, oac_int32 shift){
+# undef    silk_ADD_LSHIFT32
+static OAC_INLINE oac_int32 silk_ADD_LSHIFT32(oac_int32 a, oac_int32 b, oac_int32 shift) {
     oac_int32 ret;
     ops_count += 1;
-    ret = a + (b << shift);
+    ret = a + (b<<shift);
     return ret;                /* shift >= 0*/
 }
-#undef    silk_ADD_LSHIFT_uint
-static OAC_INLINE oac_uint32 silk_ADD_LSHIFT_uint(oac_uint32 a, oac_uint32 b, oac_int32 shift){
+# undef    silk_ADD_LSHIFT_uint
+static OAC_INLINE oac_uint32 silk_ADD_LSHIFT_uint(oac_uint32 a, oac_uint32 b, oac_int32 shift) {
     oac_uint32 ret;
     ops_count += 1;
-    ret = a + (b << shift);
+    ret = a + (b<<shift);
     return ret;                /* shift >= 0*/
 }
-#undef    silk_ADD_RSHIFT
-static OAC_INLINE oac_int32 silk_ADD_RSHIFT(oac_int32 a, oac_int32 b, oac_int32 shift){
+# undef    silk_ADD_RSHIFT
+static OAC_INLINE oac_int32 silk_ADD_RSHIFT(oac_int32 a, oac_int32 b, oac_int32 shift) {
     oac_int32 ret;
     ops_count += 1;
-    ret = a + (b >> shift);
+    ret = a + (b>>shift);
     return ret;                /* shift  > 0*/
 }
-#undef    silk_ADD_RSHIFT32
-static OAC_INLINE oac_int32 silk_ADD_RSHIFT32(oac_int32 a, oac_int32 b, oac_int32 shift){
+# undef    silk_ADD_RSHIFT32
+static OAC_INLINE oac_int32 silk_ADD_RSHIFT32(oac_int32 a, oac_int32 b, oac_int32 shift) {
     oac_int32 ret;
     ops_count += 1;
-    ret = a + (b >> shift);
+    ret = a + (b>>shift);
     return ret;                /* shift  > 0*/
 }
-#undef    silk_ADD_RSHIFT_uint
-static OAC_INLINE oac_uint32 silk_ADD_RSHIFT_uint(oac_uint32 a, oac_uint32 b, oac_int32 shift){
+# undef    silk_ADD_RSHIFT_uint
+static OAC_INLINE oac_uint32 silk_ADD_RSHIFT_uint(oac_uint32 a, oac_uint32 b, oac_int32 shift) {
     oac_uint32 ret;
     ops_count += 1;
-    ret = a + (b >> shift);
+    ret = a + (b>>shift);
     return ret;                /* shift  > 0*/
 }
-#undef    silk_SUB_LSHIFT32
-static OAC_INLINE oac_int32 silk_SUB_LSHIFT32(oac_int32 a, oac_int32 b, oac_int32 shift){
+# undef    silk_SUB_LSHIFT32
+static OAC_INLINE oac_int32 silk_SUB_LSHIFT32(oac_int32 a, oac_int32 b, oac_int32 shift) {
     oac_int32 ret;
     ops_count += 1;
-    ret = a - (b << shift);
+    ret = a - (b<<shift);
     return ret;                /* shift >= 0*/
 }
-#undef    silk_SUB_RSHIFT32
-static OAC_INLINE oac_int32 silk_SUB_RSHIFT32(oac_int32 a, oac_int32 b, oac_int32 shift){
+# undef    silk_SUB_RSHIFT32
+static OAC_INLINE oac_int32 silk_SUB_RSHIFT32(oac_int32 a, oac_int32 b, oac_int32 shift) {
     oac_int32 ret;
     ops_count += 1;
-    ret = a - (b >> shift);
+    ret = a - (b>>shift);
     return ret;                /* shift  > 0*/
 }
 
-#undef    silk_RSHIFT_ROUND
-static OAC_INLINE oac_int32 silk_RSHIFT_ROUND(oac_int32 a, oac_int32 shift){
+# undef    silk_RSHIFT_ROUND
+static OAC_INLINE oac_int32 silk_RSHIFT_ROUND(oac_int32 a, oac_int32 shift) {
     oac_int32 ret;
     ops_count += 3;
-    ret = shift == 1 ? (a >> 1) + (a & 1) : ((a >> (shift - 1)) + 1) >> 1;
+    ret = shift == 1 ? (a>>1) + (a&1) : ((a>>(shift - 1)) + 1)>>1;
     return ret;
 }
 
-#undef    silk_RSHIFT_ROUND64
-static OAC_INLINE oac_int64 silk_RSHIFT_ROUND64(oac_int64 a, oac_int32 shift){
+# undef    silk_RSHIFT_ROUND64
+static OAC_INLINE oac_int64 silk_RSHIFT_ROUND64(oac_int64 a, oac_int32 shift) {
     oac_int64 ret;
     ops_count += 6;
-    ret = shift == 1 ? (a >> 1) + (a & 1) : ((a >> (shift - 1)) + 1) >> 1;
+    ret = shift == 1 ? (a>>1) + (a&1) : ((a>>(shift - 1)) + 1)>>1;
     return ret;
 }
 
-#undef    silk_abs_int64
-static OAC_INLINE oac_int64 silk_abs_int64(oac_int64 a){
+# undef    silk_abs_int64
+static OAC_INLINE oac_int64 silk_abs_int64(oac_int64 a) {
     ops_count += 1;
-    return (((a) >  0)  ? (a) : -(a));            /* Be careful, silk_abs returns wrong when input equals to silk_intXX_MIN*/
+    return ((a) >  0)  ? (a) : -(a);            /* Be careful, silk_abs returns wrong when input equals to silk_intXX_MIN*/
 }
 
-#undef    silk_abs_int32
-static OAC_INLINE oac_int32 silk_abs_int32(oac_int32 a){
+# undef    silk_abs_int32
+static OAC_INLINE oac_int32 silk_abs_int32(oac_int32 a) {
     ops_count += 1;
     return silk_abs(a);
 }
 
 
-#undef silk_min
-static silk_min(a, b){
+# undef silk_min
+static silk_min(a, b) {
     ops_count += 1;
-    return (((a) < (b)) ? (a) :  (b));
+    return ((a) < (b)) ? (a) :  (b);
 }
-#undef silk_max
-static silk_max(a, b){
+# undef silk_max
+static silk_max(a, b) {
     ops_count += 1;
-    return (((a) > (b)) ? (a) :  (b));
+    return ((a) > (b)) ? (a) :  (b);
 }
-#undef silk_sign
-static silk_sign(a){
+# undef silk_sign
+static silk_sign(a) {
     ops_count += 1;
-    return ((a) > 0 ? 1 : ( (a) < 0 ? -1 : 0 ));
+    return (a) > 0 ? 1 : ((a) < 0 ? -1 : 0);
 }
 
-#undef    silk_ADD16
-static OAC_INLINE oac_int16 silk_ADD16(oac_int16 a, oac_int16 b){
+# undef    silk_ADD16
+static OAC_INLINE oac_int16 silk_ADD16(oac_int16 a, oac_int16 b) {
     oac_int16 ret;
     ops_count += 1;
     ret = a + b;
     return ret;
 }
 
-#undef    silk_ADD32
-static OAC_INLINE oac_int32 silk_ADD32(oac_int32 a, oac_int32 b){
+# undef    silk_ADD32
+static OAC_INLINE oac_int32 silk_ADD32(oac_int32 a, oac_int32 b) {
     oac_int32 ret;
     ops_count += 1;
     ret = a + b;
     return ret;
 }
 
-#undef    silk_ADD64
-static OAC_INLINE oac_int64 silk_ADD64(oac_int64 a, oac_int64 b){
+# undef    silk_ADD64
+static OAC_INLINE oac_int64 silk_ADD64(oac_int64 a, oac_int64 b) {
     oac_int64 ret;
     ops_count += 2;
     ret = a + b;
     return ret;
 }
 
-#undef    silk_SUB16
-static OAC_INLINE oac_int16 silk_SUB16(oac_int16 a, oac_int16 b){
+# undef    silk_SUB16
+static OAC_INLINE oac_int16 silk_SUB16(oac_int16 a, oac_int16 b) {
     oac_int16 ret;
     ops_count += 1;
     ret = a - b;
     return ret;
 }
 
-#undef    silk_SUB32
-static OAC_INLINE oac_int32 silk_SUB32(oac_int32 a, oac_int32 b){
+# undef    silk_SUB32
+static OAC_INLINE oac_int32 silk_SUB32(oac_int32 a, oac_int32 b) {
     oac_int32 ret;
     ops_count += 1;
     ret = a - b;
     return ret;
 }
 
-#undef    silk_SUB64
-static OAC_INLINE oac_int64 silk_SUB64(oac_int64 a, oac_int64 b){
+# undef    silk_SUB64
+static OAC_INLINE oac_int64 silk_SUB64(oac_int64 a, oac_int64 b) {
     oac_int64 ret;
     ops_count += 2;
     ret = a - b;
     return ret;
 }
 
-#undef silk_ADD_SAT16
+# undef silk_ADD_SAT16
 static OAC_INLINE oac_int16 silk_ADD_SAT16( oac_int16 a16, oac_int16 b16 ) {
     oac_int16 res;
     /* Nb will be counted in AKP_add32 and silk_SAT16*/
-    res = (oac_int16)silk_SAT16( silk_ADD32( (oac_int32)(a16), (b16) ) );
+    res = (oac_int16)silk_SAT16( silk_ADD32((oac_int32)(a16), (b16)));
     return res;
 }
 
-#undef silk_ADD_SAT32
-static OAC_INLINE oac_int32 silk_ADD_SAT32(oac_int32 a32, oac_int32 b32){
+# undef silk_ADD_SAT32
+static OAC_INLINE oac_int32 silk_ADD_SAT32(oac_int32 a32, oac_int32 b32) {
     oac_int32 res;
     ops_count += 1;
-    res =    ((((a32) + (b32)) & 0x80000000) == 0 ?                                    \
-            ((((a32) & (b32)) & 0x80000000) != 0 ? silk_int32_MIN : (a32)+(b32)) :    \
-            ((((a32) | (b32)) & 0x80000000) == 0 ? silk_int32_MAX : (a32)+(b32)) );
+    res =    ((((a32) + (b32))&0x80000000) == 0 ?                                    \
+              ((((a32)&(b32))&0x80000000) != 0 ? silk_int32_MIN : (a32) + (b32)) :    \
+              ((((a32)|(b32))&0x80000000) == 0 ? silk_int32_MAX : (a32) + (b32)));
     return res;
 }
 
-#undef silk_ADD_SAT64
+# undef silk_ADD_SAT64
 static OAC_INLINE oac_int64 silk_ADD_SAT64( oac_int64 a64, oac_int64 b64 ) {
     oac_int64 res;
     ops_count += 1;
-    res =    ((((a64) + (b64)) & 0x8000000000000000LL) == 0 ?                                \
-            ((((a64) & (b64)) & 0x8000000000000000LL) != 0 ? silk_int64_MIN : (a64)+(b64)) :    \
-            ((((a64) | (b64)) & 0x8000000000000000LL) == 0 ? silk_int64_MAX : (a64)+(b64)) );
+    res =    ((((a64) + (b64))&0x8000000000000000LL) == 0 ?                                \
+              ((((a64)&(b64))&0x8000000000000000LL) != 0 ? silk_int64_MIN : (a64) + (b64)) :    \
+              ((((a64)|(b64))&0x8000000000000000LL) == 0 ? silk_int64_MAX : (a64) + (b64)));
     return res;
 }
 
-#undef silk_SUB_SAT16
+# undef silk_SUB_SAT16
 static OAC_INLINE oac_int16 silk_SUB_SAT16( oac_int16 a16, oac_int16 b16 ) {
     oac_int16 res;
     silk_assert(0);
     /* Nb will be counted in sub-macros*/
-    res = (oac_int16)silk_SAT16( silk_SUB32( (oac_int32)(a16), (b16) ) );
+    res = (oac_int16)silk_SAT16( silk_SUB32((oac_int32)(a16), (b16)));
     return res;
 }
 
-#undef silk_SUB_SAT32
+# undef silk_SUB_SAT32
 static OAC_INLINE oac_int32 silk_SUB_SAT32( oac_int32 a32, oac_int32 b32 ) {
     oac_int32 res;
     ops_count += 1;
-    res =     ((((a32)-(b32)) & 0x80000000) == 0 ?                                            \
-            (( (a32) & ((b32)^0x80000000) & 0x80000000) ? silk_int32_MIN : (a32)-(b32)) :    \
-            ((((a32)^0x80000000) & (b32)  & 0x80000000) ? silk_int32_MAX : (a32)-(b32)) );
+    res =     ((((a32) - (b32))&0x80000000) == 0 ?                                            \
+               (((a32)&((b32)^0x80000000)&0x80000000) ? silk_int32_MIN : (a32) - (b32)) :    \
+               ((((a32)^0x80000000)&(b32)&0x80000000) ? silk_int32_MAX : (a32) - (b32)));
     return res;
 }
 
-#undef silk_SUB_SAT64
+# undef silk_SUB_SAT64
 static OAC_INLINE oac_int64 silk_SUB_SAT64( oac_int64 a64, oac_int64 b64 ) {
     oac_int64 res;
     ops_count += 1;
-    res =    ((((a64)-(b64)) & 0x8000000000000000LL) == 0 ?                                                        \
-            (( (a64) & ((b64)^0x8000000000000000LL) & 0x8000000000000000LL) ? silk_int64_MIN : (a64)-(b64)) :    \
-            ((((a64)^0x8000000000000000LL) & (b64)  & 0x8000000000000000LL) ? silk_int64_MAX : (a64)-(b64)) );
+    res =    ((((a64) - (b64))&0x8000000000000000LL) == 0 ?                                                        \
+              (((a64)&((b64)^0x8000000000000000LL)&0x8000000000000000LL) ? silk_int64_MIN : (a64) - (b64)) :    \
+              ((((a64)^0x8000000000000000LL)&(b64)&0x8000000000000000LL) ? silk_int64_MAX : (a64) - (b64)));
 
     return res;
 }
 
-#undef    silk_SMULWW
-static OAC_INLINE oac_int32 silk_SMULWW(oac_int32 a32, oac_int32 b32){
+# undef    silk_SMULWW
+static OAC_INLINE oac_int32 silk_SMULWW(oac_int32 a32, oac_int32 b32) {
     oac_int32 ret;
     /* Nb will be counted in sub-macros*/
     ret = silk_MLA(silk_SMULWB((a32), (b32)), (a32), silk_RSHIFT_ROUND((b32), 16));
     return ret;
 }
 
-#undef    silk_SMLAWW
-static OAC_INLINE oac_int32 silk_SMLAWW(oac_int32 a32, oac_int32 b32, oac_int32 c32){
+# undef    silk_SMLAWW
+static OAC_INLINE oac_int32 silk_SMLAWW(oac_int32 a32, oac_int32 b32, oac_int32 c32) {
     oac_int32 ret;
     /* Nb will be counted in sub-macros*/
     ret = silk_MLA(silk_SMLAWB((a32), (b32), (c32)), (b32), silk_RSHIFT_ROUND((c32), 16));
     return ret;
 }
 
-#undef    silk_min_int
-static OAC_INLINE oac_int silk_min_int(oac_int a, oac_int b)
-{
+# undef    silk_min_int
+static OAC_INLINE oac_int silk_min_int(oac_int a, oac_int b) {
     ops_count += 1;
-    return (((a) < (b)) ? (a) : (b));
+    return ((a) < (b)) ? (a) : (b);
 }
 
-#undef    silk_min_16
-static OAC_INLINE oac_int16 silk_min_16(oac_int16 a, oac_int16 b)
-{
+# undef    silk_min_16
+static OAC_INLINE oac_int16 silk_min_16(oac_int16 a, oac_int16 b) {
     ops_count += 1;
-    return (((a) < (b)) ? (a) : (b));
+    return ((a) < (b)) ? (a) : (b);
 }
-#undef    silk_min_32
-static OAC_INLINE oac_int32 silk_min_32(oac_int32 a, oac_int32 b)
-{
+# undef    silk_min_32
+static OAC_INLINE oac_int32 silk_min_32(oac_int32 a, oac_int32 b) {
     ops_count += 1;
-    return (((a) < (b)) ? (a) : (b));
+    return ((a) < (b)) ? (a) : (b);
 }
-#undef    silk_min_64
-static OAC_INLINE oac_int64 silk_min_64(oac_int64 a, oac_int64 b)
-{
+# undef    silk_min_64
+static OAC_INLINE oac_int64 silk_min_64(oac_int64 a, oac_int64 b) {
     ops_count += 1;
-    return (((a) < (b)) ? (a) : (b));
+    return ((a) < (b)) ? (a) : (b);
 }
 
 /* silk_min() versions with typecast in the function call */
-#undef    silk_max_int
-static OAC_INLINE oac_int silk_max_int(oac_int a, oac_int b)
-{
+# undef    silk_max_int
+static OAC_INLINE oac_int silk_max_int(oac_int a, oac_int b) {
     ops_count += 1;
-    return (((a) > (b)) ? (a) : (b));
+    return ((a) > (b)) ? (a) : (b);
 }
-#undef    silk_max_16
-static OAC_INLINE oac_int16 silk_max_16(oac_int16 a, oac_int16 b)
-{
+# undef    silk_max_16
+static OAC_INLINE oac_int16 silk_max_16(oac_int16 a, oac_int16 b) {
     ops_count += 1;
-    return (((a) > (b)) ? (a) : (b));
+    return ((a) > (b)) ? (a) : (b);
 }
-#undef    silk_max_32
-static OAC_INLINE oac_int32 silk_max_32(oac_int32 a, oac_int32 b)
-{
+# undef    silk_max_32
+static OAC_INLINE oac_int32 silk_max_32(oac_int32 a, oac_int32 b) {
     ops_count += 1;
-    return (((a) > (b)) ? (a) : (b));
+    return ((a) > (b)) ? (a) : (b);
 }
 
-#undef    silk_max_64
-static OAC_INLINE oac_int64 silk_max_64(oac_int64 a, oac_int64 b)
-{
+# undef    silk_max_64
+static OAC_INLINE oac_int64 silk_max_64(oac_int64 a, oac_int64 b) {
     ops_count += 1;
-    return (((a) > (b)) ? (a) : (b));
+    return ((a) > (b)) ? (a) : (b);
 }
 
 
-#undef silk_LIMIT_int
-static OAC_INLINE oac_int silk_LIMIT_int(oac_int a, oac_int limit1, oac_int limit2)
-{
+# undef silk_LIMIT_int
+static OAC_INLINE oac_int silk_LIMIT_int(oac_int a, oac_int limit1, oac_int limit2) {
     oac_int ret;
     ops_count += 6;
 
     ret = ((limit1) > (limit2) ? ((a) > (limit1) ? (limit1) : ((a) < (limit2) ? (limit2) : (a))) \
         : ((a) > (limit2) ? (limit2) : ((a) < (limit1) ? (limit1) : (a))));
 
-    return(ret);
+    return ret;
 }
 
-#undef silk_LIMIT_16
-static OAC_INLINE oac_int16 silk_LIMIT_16(oac_int16 a, oac_int16 limit1, oac_int16 limit2)
-{
+# undef silk_LIMIT_16
+static OAC_INLINE oac_int16 silk_LIMIT_16(oac_int16 a, oac_int16 limit1, oac_int16 limit2) {
     oac_int16 ret;
     ops_count += 6;
 
     ret = ((limit1) > (limit2) ? ((a) > (limit1) ? (limit1) : ((a) < (limit2) ? (limit2) : (a))) \
         : ((a) > (limit2) ? (limit2) : ((a) < (limit1) ? (limit1) : (a))));
 
-return(ret);
+    return ret;
 }
 
 
-#undef silk_LIMIT_32
-static OAC_INLINE oac_int32 silk_LIMIT_32(oac_int32 a, oac_int32 limit1, oac_int32 limit2)
-{
+# undef silk_LIMIT_32
+static OAC_INLINE oac_int32 silk_LIMIT_32(oac_int32 a, oac_int32 limit1, oac_int32 limit2) {
     oac_int32 ret;
     ops_count += 6;
 
     ret = ((limit1) > (limit2) ? ((a) > (limit1) ? (limit1) : ((a) < (limit2) ? (limit2) : (a))) \
         : ((a) > (limit2) ? (limit2) : ((a) < (limit1) ? (limit1) : (a))));
-    return(ret);
+    return ret;
 }
 
 #else
-#define varDefine
-#define silk_SaveCount()
+# define varDefine
+# define silk_SaveCount()
 
 #endif
 #endif
diff --git a/silk/MacroDebug.h b/silk/MacroDebug.h
index 605eaced4..b52b169f4 100644
--- a/silk/MacroDebug.h
+++ b/silk/MacroDebug.h
@@ -1,29 +1,29 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Copyright (C) 2012 Xiph.Org Foundation
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Copyright (C) 2012 Xiph.Org Foundation
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef MACRO_DEBUG_H
@@ -32,429 +32,403 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Redefine macro functions with extensive assertion in DEBUG mode.
    As functions can't be undefined, this file can't work with SigProcFIX_MacroCount.h */
 
-#if ( defined (FIXED_DEBUG) || ( 0 && defined (_DEBUG) ) ) && !defined (silk_MACRO_COUNT)
+#if (defined (FIXED_DEBUG) || (0 && defined (_DEBUG))) && !defined (silk_MACRO_COUNT)
 
-#undef silk_ADD16
-#define silk_ADD16(a,b) silk_ADD16_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int16 silk_ADD16_(oac_int16 a, oac_int16 b, char *file, int line){
+# undef silk_ADD16
+# define silk_ADD16(a, b) silk_ADD16_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int16 silk_ADD16_(oac_int16 a, oac_int16 b, char *file, int line) {
     oac_int16 ret;
 
     ret = a + b;
-    if ( ret != silk_ADD_SAT16( a, b ) )
-    {
+    if (ret != silk_ADD_SAT16( a, b )) {
         fprintf (stderr, "silk_ADD16(%d, %d) in %s: line %d\n", a, b, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
-#undef silk_ADD32
-#define silk_ADD32(a,b) silk_ADD32_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_ADD32_(oac_int32 a, oac_int32 b, char *file, int line){
+# undef silk_ADD32
+# define silk_ADD32(a, b) silk_ADD32_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_ADD32_(oac_int32 a, oac_int32 b, char *file, int line) {
     oac_int32 ret;
 
     ret = (oac_int32)((oac_uint32)a + (oac_uint32)b);
-    if ( ret != silk_ADD_SAT32( a, b ) )
-    {
+    if (ret != silk_ADD_SAT32( a, b )) {
         fprintf (stderr, "silk_ADD32(%d, %d) in %s: line %d\n", a, b, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
-#undef silk_ADD64
-#define silk_ADD64(a,b) silk_ADD64_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int64 silk_ADD64_(oac_int64 a, oac_int64 b, char *file, int line){
+# undef silk_ADD64
+# define silk_ADD64(a, b) silk_ADD64_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int64 silk_ADD64_(oac_int64 a, oac_int64 b, char *file, int line) {
     oac_int64 ret;
 
     ret = a + b;
-    if ( ret != silk_ADD_SAT64( a, b ) )
-    {
+    if (ret != silk_ADD_SAT64( a, b )) {
         fprintf (stderr, "silk_ADD64(%lld, %lld) in %s: line %d\n", (long long)a, (long long)b, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
-#undef silk_SUB16
-#define silk_SUB16(a,b) silk_SUB16_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int16 silk_SUB16_(oac_int16 a, oac_int16 b, char *file, int line){
+# undef silk_SUB16
+# define silk_SUB16(a, b) silk_SUB16_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int16 silk_SUB16_(oac_int16 a, oac_int16 b, char *file, int line) {
     oac_int16 ret;
 
     ret = a - b;
-    if ( ret != silk_SUB_SAT16( a, b ) )
-    {
+    if (ret != silk_SUB_SAT16( a, b )) {
         fprintf (stderr, "silk_SUB16(%d, %d) in %s: line %d\n", a, b, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
-#undef silk_SUB32
-#define silk_SUB32(a,b) silk_SUB32_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_SUB32_(oac_int32 a, oac_int32 b, char *file, int line){
+# undef silk_SUB32
+# define silk_SUB32(a, b) silk_SUB32_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_SUB32_(oac_int32 a, oac_int32 b, char *file, int line) {
     oac_int64 ret;
 
     ret = a - (oac_int64)b;
-    if ( ret != silk_SUB_SAT32( a, b ) )
-    {
+    if (ret != silk_SUB_SAT32( a, b )) {
         fprintf (stderr, "silk_SUB32(%d, %d) in %s: line %d\n", a, b, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
-#undef silk_SUB64
-#define silk_SUB64(a,b) silk_SUB64_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int64 silk_SUB64_(oac_int64 a, oac_int64 b, char *file, int line){
+# undef silk_SUB64
+# define silk_SUB64(a, b) silk_SUB64_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int64 silk_SUB64_(oac_int64 a, oac_int64 b, char *file, int line) {
     oac_int64 ret;
 
     ret = a - b;
-    if ( ret != silk_SUB_SAT64( a, b ) )
-    {
+    if (ret != silk_SUB_SAT64( a, b )) {
         fprintf (stderr, "silk_SUB64(%lld, %lld) in %s: line %d\n", (long long)a, (long long)b, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
-#undef silk_ADD_SAT16
-#define silk_ADD_SAT16(a,b) silk_ADD_SAT16_((a), (b), __FILE__, __LINE__)
+# undef silk_ADD_SAT16
+# define silk_ADD_SAT16(a, b) silk_ADD_SAT16_((a), (b), __FILE__, __LINE__)
 static OAC_INLINE oac_int16 silk_ADD_SAT16_( oac_int16 a16, oac_int16 b16, char *file, int line) {
     oac_int16 res;
-    res = (oac_int16)silk_SAT16( silk_ADD32( (oac_int32)(a16), (b16) ) );
-    if ( res != silk_SAT16( (oac_int32)a16 + (oac_int32)b16 ) )
-    {
+    res = (oac_int16)silk_SAT16( silk_ADD32((oac_int32)(a16), (b16)));
+    if (res != silk_SAT16((oac_int32)a16 + (oac_int32)b16 )) {
         fprintf (stderr, "silk_ADD_SAT16(%d, %d) in %s: line %d\n", a16, b16, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return res;
 }
 
-#undef silk_ADD_SAT32
-#define silk_ADD_SAT32(a,b) silk_ADD_SAT32_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_ADD_SAT32_(oac_int32 a32, oac_int32 b32, char *file, int line){
+# undef silk_ADD_SAT32
+# define silk_ADD_SAT32(a, b) silk_ADD_SAT32_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_ADD_SAT32_(oac_int32 a32, oac_int32 b32, char *file, int line) {
     oac_int32 res;
-    res =   ((((oac_uint32)(a32) + (oac_uint32)(b32)) & 0x80000000) == 0 ?       \
-            ((((a32) & (b32)) & 0x80000000) != 0 ? silk_int32_MIN : (a32)+(b32)) : \
-            ((((a32) | (b32)) & 0x80000000) == 0 ? silk_int32_MAX : (a32)+(b32)) );
-    if ( res != silk_SAT32( (oac_int64)a32 + (oac_int64)b32 ) )
-    {
+    res =   ((((oac_uint32)(a32) + (oac_uint32)(b32))&0x80000000) == 0 ?       \
+             ((((a32)&(b32))&0x80000000) != 0 ? silk_int32_MIN : (a32) + (b32)) : \
+             ((((a32)|(b32))&0x80000000) == 0 ? silk_int32_MAX : (a32) + (b32)));
+    if (res != silk_SAT32((oac_int64)a32 + (oac_int64)b32 )) {
         fprintf (stderr, "silk_ADD_SAT32(%d, %d) in %s: line %d\n", a32, b32, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return res;
 }
 
-#undef silk_ADD_SAT64
-#define silk_ADD_SAT64(a,b) silk_ADD_SAT64_((a), (b), __FILE__, __LINE__)
+# undef silk_ADD_SAT64
+# define silk_ADD_SAT64(a, b) silk_ADD_SAT64_((a), (b), __FILE__, __LINE__)
 static OAC_INLINE oac_int64 silk_ADD_SAT64_( oac_int64 a64, oac_int64 b64, char *file, int line) {
     oac_int64 res;
-    int        fail = 0;
-    res =   ((((a64) + (b64)) & 0x8000000000000000LL) == 0 ?                                 \
-            ((((a64) & (b64)) & 0x8000000000000000LL) != 0 ? silk_int64_MIN : (a64)+(b64)) : \
-            ((((a64) | (b64)) & 0x8000000000000000LL) == 0 ? silk_int64_MAX : (a64)+(b64)) );
-    if( res != a64 + b64 ) {
+    int fail = 0;
+    res =   ((((a64) + (b64))&0x8000000000000000LL) == 0 ?                                 \
+             ((((a64)&(b64))&0x8000000000000000LL) != 0 ? silk_int64_MIN : (a64) + (b64)) : \
+             ((((a64)|(b64))&0x8000000000000000LL) == 0 ? silk_int64_MAX : (a64) + (b64)));
+    if (res != a64 + b64) {
         /* Check that we saturated to the correct extreme value */
-        if ( !(( res == silk_int64_MAX && ( ( a64 >> 1 ) + ( b64 >> 1 ) > ( silk_int64_MAX >> 3 ) ) ) ||
-               ( res == silk_int64_MIN && ( ( a64 >> 1 ) + ( b64 >> 1 ) < ( silk_int64_MIN >> 3 ) ) ) ) )
-        {
+        if (!((res == silk_int64_MAX && ((a64>>1) + (b64>>1) > (silk_int64_MAX>>3)))
+              || (res == silk_int64_MIN && ((a64>>1) + (b64>>1) < (silk_int64_MIN>>3))))) {
             fail = 1;
         }
     } else {
         /* Saturation not necessary */
         fail = res != a64 + b64;
     }
-    if ( fail )
-    {
+    if (fail) {
         fprintf (stderr, "silk_ADD_SAT64(%lld, %lld) in %s: line %d\n", (long long)a64, (long long)b64, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return res;
 }
 
-#undef silk_SUB_SAT16
-#define silk_SUB_SAT16(a,b) silk_SUB_SAT16_((a), (b), __FILE__, __LINE__)
+# undef silk_SUB_SAT16
+# define silk_SUB_SAT16(a, b) silk_SUB_SAT16_((a), (b), __FILE__, __LINE__)
 static OAC_INLINE oac_int16 silk_SUB_SAT16_( oac_int16 a16, oac_int16 b16, char *file, int line ) {
     oac_int16 res;
-    res = (oac_int16)silk_SAT16( silk_SUB32( (oac_int32)(a16), (b16) ) );
-    if ( res != silk_SAT16( (oac_int32)a16 - (oac_int32)b16 ) )
-    {
+    res = (oac_int16)silk_SAT16( silk_SUB32((oac_int32)(a16), (b16)));
+    if (res != silk_SAT16((oac_int32)a16 - (oac_int32)b16 )) {
         fprintf (stderr, "silk_SUB_SAT16(%d, %d) in %s: line %d\n", a16, b16, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return res;
 }
 
-#undef silk_SUB_SAT32
-#define silk_SUB_SAT32(a,b) silk_SUB_SAT32_((a), (b), __FILE__, __LINE__)
+# undef silk_SUB_SAT32
+# define silk_SUB_SAT32(a, b) silk_SUB_SAT32_((a), (b), __FILE__, __LINE__)
 static OAC_INLINE oac_int32 silk_SUB_SAT32_( oac_int32 a32, oac_int32 b32, char *file, int line ) {
     oac_int32 res;
-    res =   ((((oac_uint32)(a32)-(oac_uint32)(b32)) & 0x80000000) == 0 ?                \
-            (( (a32) & ((b32)^0x80000000) & 0x80000000) ? silk_int32_MIN : (a32)-(b32)) : \
-            ((((a32)^0x80000000) & (b32)  & 0x80000000) ? silk_int32_MAX : (a32)-(b32)) );
-    if ( res != silk_SAT32( (oac_int64)a32 - (oac_int64)b32 ) )
-    {
+    res =   ((((oac_uint32)(a32) - (oac_uint32)(b32))&0x80000000) == 0 ?                \
+             (((a32)&((b32)^0x80000000)&0x80000000) ? silk_int32_MIN : (a32) - (b32)) : \
+             ((((a32)^0x80000000)&(b32)&0x80000000) ? silk_int32_MAX : (a32) - (b32)));
+    if (res != silk_SAT32((oac_int64)a32 - (oac_int64)b32 )) {
         fprintf (stderr, "silk_SUB_SAT32(%d, %d) in %s: line %d\n", a32, b32, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return res;
 }
 
-#undef silk_SUB_SAT64
-#define silk_SUB_SAT64(a,b) silk_SUB_SAT64_((a), (b), __FILE__, __LINE__)
+# undef silk_SUB_SAT64
+# define silk_SUB_SAT64(a, b) silk_SUB_SAT64_((a), (b), __FILE__, __LINE__)
 static OAC_INLINE oac_int64 silk_SUB_SAT64_( oac_int64 a64, oac_int64 b64, char *file, int line ) {
     oac_int64 res;
-    int        fail = 0;
-    res =   ((((a64)-(b64)) & 0x8000000000000000LL) == 0 ?                                                    \
-            (( (a64) & ((b64)^0x8000000000000000LL) & 0x8000000000000000LL) ? silk_int64_MIN : (a64)-(b64)) : \
-            ((((a64)^0x8000000000000000LL) & (b64)  & 0x8000000000000000LL) ? silk_int64_MAX : (a64)-(b64)) );
-    if( res != a64 - b64 ) {
+    int fail = 0;
+    res =   ((((a64) - (b64))&0x8000000000000000LL) == 0 ?                                                    \
+             (((a64)&((b64)^0x8000000000000000LL)&0x8000000000000000LL) ? silk_int64_MIN : (a64) - (b64)) : \
+             ((((a64)^0x8000000000000000LL)&(b64)&0x8000000000000000LL) ? silk_int64_MAX : (a64) - (b64)));
+    if (res != a64 - b64) {
         /* Check that we saturated to the correct extreme value */
-        if( !(( res == silk_int64_MAX && ( ( a64 >> 1 ) + ( b64 >> 1 ) > ( silk_int64_MAX >> 3 ) ) ) ||
-              ( res == silk_int64_MIN && ( ( a64 >> 1 ) + ( b64 >> 1 ) < ( silk_int64_MIN >> 3 ) ) ) ))
-        {
+        if (!((res == silk_int64_MAX && ((a64>>1) + (b64>>1) > (silk_int64_MAX>>3)))
+              || (res == silk_int64_MIN && ((a64>>1) + (b64>>1) < (silk_int64_MIN>>3))))) {
             fail = 1;
         }
     } else {
         /* Saturation not necessary */
         fail = res != a64 - b64;
     }
-    if ( fail )
-    {
+    if (fail) {
         fprintf (stderr, "silk_SUB_SAT64(%lld, %lld) in %s: line %d\n", (long long)a64, (long long)b64, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return res;
 }
 
-#undef silk_MUL
-#define silk_MUL(a,b) silk_MUL_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_MUL_(oac_int32 a32, oac_int32 b32, char *file, int line){
+# undef silk_MUL
+# define silk_MUL(a, b) silk_MUL_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_MUL_(oac_int32 a32, oac_int32 b32, char *file, int line) {
     oac_int32 ret;
     oac_int64 ret64;
-    ret = (oac_int32)((oac_uint32)a32 * (oac_uint32)b32);
-    ret64 = (oac_int64)a32 * (oac_int64)b32;
-    if ( (oac_int64)ret != ret64 )
-    {
+    ret = (oac_int32)((oac_uint32)a32*(oac_uint32)b32);
+    ret64 = (oac_int64)a32*(oac_int64)b32;
+    if ((oac_int64)ret != ret64) {
         fprintf (stderr, "silk_MUL(%d, %d) in %s: line %d\n", a32, b32, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
-#undef silk_MUL_uint
-#define silk_MUL_uint(a,b) silk_MUL_uint_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_uint32 silk_MUL_uint_(oac_uint32 a32, oac_uint32 b32, char *file, int line){
+# undef silk_MUL_uint
+# define silk_MUL_uint(a, b) silk_MUL_uint_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_uint32 silk_MUL_uint_(oac_uint32 a32, oac_uint32 b32, char *file, int line) {
     oac_uint32 ret;
-    ret = a32 * b32;
-    if ( (oac_uint64)ret != (oac_uint64)a32 * (oac_uint64)b32 )
-    {
+    ret = a32*b32;
+    if ((oac_uint64)ret != (oac_uint64)a32*(oac_uint64)b32) {
         fprintf (stderr, "silk_MUL_uint(%u, %u) in %s: line %d\n", a32, b32, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
-#undef silk_MLA
-#define silk_MLA(a,b,c) silk_MLA_((a), (b), (c), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_MLA_(oac_int32 a32, oac_int32 b32, oac_int32 c32, char *file, int line){
+# undef silk_MLA
+# define silk_MLA(a, b, c) silk_MLA_((a), (b), (c), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_MLA_(oac_int32 a32, oac_int32 b32, oac_int32 c32, char *file, int line) {
     oac_int32 ret;
-    ret = a32 + b32 * c32;
-    if ( (oac_int64)ret != (oac_int64)a32 + (oac_int64)b32 * (oac_int64)c32 )
-    {
+    ret = a32 + b32*c32;
+    if ((oac_int64)ret != (oac_int64)a32 + (oac_int64)b32*(oac_int64)c32) {
         fprintf (stderr, "silk_MLA(%d, %d, %d) in %s: line %d\n", a32, b32, c32, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
-#undef silk_MLA_uint
-#define silk_MLA_uint(a,b,c) silk_MLA_uint_((a), (b), (c), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_MLA_uint_(oac_uint32 a32, oac_uint32 b32, oac_uint32 c32, char *file, int line){
+# undef silk_MLA_uint
+# define silk_MLA_uint(a, b, c) silk_MLA_uint_((a), (b), (c), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_MLA_uint_(oac_uint32 a32, oac_uint32 b32, oac_uint32 c32, char *file, int line) {
     oac_uint32 ret;
-    ret = a32 + b32 * c32;
-    if ( (oac_int64)ret != (oac_int64)a32 + (oac_int64)b32 * (oac_int64)c32 )
-    {
+    ret = a32 + b32*c32;
+    if ((oac_int64)ret != (oac_int64)a32 + (oac_int64)b32*(oac_int64)c32) {
         fprintf (stderr, "silk_MLA_uint(%d, %d, %d) in %s: line %d\n", a32, b32, c32, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
-#undef silk_SMULWB
-#define silk_SMULWB(a,b) silk_SMULWB_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_SMULWB_(oac_int32 a32, oac_int32 b32, char *file, int line){
+# undef silk_SMULWB
+# define silk_SMULWB(a, b) silk_SMULWB_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_SMULWB_(oac_int32 a32, oac_int32 b32, char *file, int line) {
     oac_int32 ret;
-    ret = (a32 >> 16) * (oac_int32)((oac_int16)b32) + (((a32 & 0x0000FFFF) * (oac_int32)((oac_int16)b32)) >> 16);
-    if ( (oac_int64)ret != ((oac_int64)a32 * (oac_int16)b32) >> 16 )
-    {
+    ret = (a32>>16)*(oac_int32)((oac_int16)b32) + (((a32&0x0000FFFF)*(oac_int32)((oac_int16)b32))>>16);
+    if ((oac_int64)ret != ((oac_int64)a32*(oac_int16)b32)>>16) {
         fprintf (stderr, "silk_SMULWB(%d, %d) in %s: line %d\n", a32, b32, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
-#undef silk_SMLAWB
-#define silk_SMLAWB(a,b,c) silk_SMLAWB_((a), (b), (c), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_SMLAWB_(oac_int32 a32, oac_int32 b32, oac_int32 c32, char *file, int line){
+# undef silk_SMLAWB
+# define silk_SMLAWB(a, b, c) silk_SMLAWB_((a), (b), (c), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_SMLAWB_(oac_int32 a32, oac_int32 b32, oac_int32 c32, char *file, int line) {
     oac_int32 ret;
-    ret = silk_ADD32_ovflw( a32, silk_SMULWB( b32, c32 ) );
-    if ( ret != silk_ADD_SAT32( a32, silk_SMULWB( b32, c32 ) ) )
-    {
+    ret = silk_ADD32_ovflw( a32, silk_SMULWB( b32, c32 ));
+    if (ret != silk_ADD_SAT32( a32, silk_SMULWB( b32, c32 ))) {
         fprintf (stderr, "silk_SMLAWB(%d, %d, %d) in %s: line %d\n", a32, b32, c32, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
-#undef silk_SMULWT
-#define silk_SMULWT(a,b) silk_SMULWT_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_SMULWT_(oac_int32 a32, oac_int32 b32, char *file, int line){
+# undef silk_SMULWT
+# define silk_SMULWT(a, b) silk_SMULWT_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_SMULWT_(oac_int32 a32, oac_int32 b32, char *file, int line) {
     oac_int32 ret;
-    ret = (a32 >> 16) * (b32 >> 16) + (((a32 & 0x0000FFFF) * (b32 >> 16)) >> 16);
-    if ( (oac_int64)ret != ((oac_int64)a32 * (b32 >> 16)) >> 16 )
-    {
+    ret = (a32>>16)*(b32>>16) + (((a32&0x0000FFFF)*(b32>>16))>>16);
+    if ((oac_int64)ret != ((oac_int64)a32*(b32>>16))>>16) {
         fprintf (stderr, "silk_SMULWT(%d, %d) in %s: line %d\n", a32, b32, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
-#undef silk_SMLAWT
-#define silk_SMLAWT(a,b,c) silk_SMLAWT_((a), (b), (c), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_SMLAWT_(oac_int32 a32, oac_int32 b32, oac_int32 c32, char *file, int line){
+# undef silk_SMLAWT
+# define silk_SMLAWT(a, b, c) silk_SMLAWT_((a), (b), (c), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_SMLAWT_(oac_int32 a32, oac_int32 b32, oac_int32 c32, char *file, int line) {
     oac_int32 ret;
-    ret = a32 + ((b32 >> 16) * (c32 >> 16)) + (((b32 & 0x0000FFFF) * ((c32 >> 16)) >> 16));
-    if ( (oac_int64)ret != (oac_int64)a32 + (((oac_int64)b32 * (c32 >> 16)) >> 16) )
-    {
+    ret = a32 + ((b32>>16)*(c32>>16)) + (((b32&0x0000FFFF)*((c32>>16))>>16));
+    if ((oac_int64)ret != (oac_int64)a32 + (((oac_int64)b32*(c32>>16))>>16)) {
         fprintf (stderr, "silk_SMLAWT(%d, %d, %d) in %s: line %d\n", a32, b32, c32, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
-#undef silk_SMULL
-#define silk_SMULL(a,b) silk_SMULL_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int64 silk_SMULL_(oac_int64 a64, oac_int64 b64, char *file, int line){
+# undef silk_SMULL
+# define silk_SMULL(a, b) silk_SMULL_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int64 silk_SMULL_(oac_int64 a64, oac_int64 b64, char *file, int line) {
     oac_int64 ret64;
-    int        fail = 0;
-    ret64 = a64 * b64;
-    if( b64 != 0 ) {
-        fail = a64 != (ret64 / b64);
-    } else if( a64 != 0 ) {
-        fail = b64 != (ret64 / a64);
-    }
-    if ( fail )
-    {
+    int fail = 0;
+    ret64 = a64*b64;
+    if (b64 != 0) {
+        fail = a64 != (ret64/b64);
+    } else if (a64 != 0) {
+        fail = b64 != (ret64/a64);
+    }
+    if (fail) {
         fprintf (stderr, "silk_SMULL(%lld, %lld) in %s: line %d\n", (long long)a64, (long long)b64, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret64;
 }
 
 /* no checking needed for silk_SMULBB */
-#undef silk_SMLABB
-#define silk_SMLABB(a,b,c) silk_SMLABB_((a), (b), (c), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_SMLABB_(oac_int32 a32, oac_int32 b32, oac_int32 c32, char *file, int line){
+# undef silk_SMLABB
+# define silk_SMLABB(a, b, c) silk_SMLABB_((a), (b), (c), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_SMLABB_(oac_int32 a32, oac_int32 b32, oac_int32 c32, char *file, int line) {
     oac_int32 ret;
-    ret = a32 + (oac_int32)((oac_int16)b32) * (oac_int32)((oac_int16)c32);
-    if ( (oac_int64)ret != (oac_int64)a32 + (oac_int64)b32 * (oac_int16)c32 )
-    {
+    ret = a32 + (oac_int32)((oac_int16)b32)*(oac_int32)((oac_int16)c32);
+    if ((oac_int64)ret != (oac_int64)a32 + (oac_int64)b32*(oac_int16)c32) {
         fprintf (stderr, "silk_SMLABB(%d, %d, %d) in %s: line %d\n", a32, b32, c32, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
 /* no checking needed for silk_SMULBT */
-#undef silk_SMLABT
-#define silk_SMLABT(a,b,c) silk_SMLABT_((a), (b), (c), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_SMLABT_(oac_int32 a32, oac_int32 b32, oac_int32 c32, char *file, int line){
+# undef silk_SMLABT
+# define silk_SMLABT(a, b, c) silk_SMLABT_((a), (b), (c), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_SMLABT_(oac_int32 a32, oac_int32 b32, oac_int32 c32, char *file, int line) {
     oac_int32 ret;
-    ret = a32 + ((oac_int32)((oac_int16)b32)) * (c32 >> 16);
-    if ( (oac_int64)ret != (oac_int64)a32 + (oac_int64)b32 * (c32 >> 16) )
-    {
+    ret = a32 + ((oac_int32)((oac_int16)b32))*(c32>>16);
+    if ((oac_int64)ret != (oac_int64)a32 + (oac_int64)b32*(c32>>16)) {
         fprintf (stderr, "silk_SMLABT(%d, %d, %d) in %s: line %d\n", a32, b32, c32, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
 /* no checking needed for silk_SMULTT */
-#undef silk_SMLATT
-#define silk_SMLATT(a,b,c) silk_SMLATT_((a), (b), (c), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_SMLATT_(oac_int32 a32, oac_int32 b32, oac_int32 c32, char *file, int line){
+# undef silk_SMLATT
+# define silk_SMLATT(a, b, c) silk_SMLATT_((a), (b), (c), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_SMLATT_(oac_int32 a32, oac_int32 b32, oac_int32 c32, char *file, int line) {
     oac_int32 ret;
-    ret = a32 + (b32 >> 16) * (c32 >> 16);
-    if ( (oac_int64)ret != (oac_int64)a32 + (b32 >> 16) * (c32 >> 16) )
-    {
+    ret = a32 + (b32>>16)*(c32>>16);
+    if ((oac_int64)ret != (oac_int64)a32 + (b32>>16)*(c32>>16)) {
         fprintf (stderr, "silk_SMLATT(%d, %d, %d) in %s: line %d\n", a32, b32, c32, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
-#undef silk_SMULWW
-#define silk_SMULWW(a,b) silk_SMULWW_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_SMULWW_(oac_int32 a32, oac_int32 b32, char *file, int line){
+# undef silk_SMULWW
+# define silk_SMULWW(a, b) silk_SMULWW_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_SMULWW_(oac_int32 a32, oac_int32 b32, char *file, int line) {
     oac_int32 ret, tmp1, tmp2;
     oac_int64 ret64;
-    int        fail = 0;
+    int fail = 0;
 
     ret  = silk_SMULWB( a32, b32 );
     tmp1 = silk_RSHIFT_ROUND( b32, 16 );
     tmp2 = silk_MUL( a32, tmp1 );
 
-    fail |= (oac_int64)tmp2 != (oac_int64) a32 * (oac_int64) tmp1;
+    fail |= (oac_int64)tmp2 != (oac_int64) a32*(oac_int64) tmp1;
 
     tmp1 = ret;
     ret  = silk_ADD32( tmp1, tmp2 );
@@ -463,30 +437,28 @@ static OAC_INLINE oac_int32 silk_SMULWW_(oac_int32 a32, oac_int32 b32, char *fil
     ret64 = silk_RSHIFT64( silk_SMULL( a32, b32 ), 16 );
     fail |= (oac_int64)ret != ret64;
 
-    if ( fail )
-    {
+    if (fail) {
         fprintf (stderr, "silk_SMULWW(%d, %d) in %s: line %d\n", a32, b32, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
 
     return ret;
 }
 
-#undef silk_SMLAWW
-#define silk_SMLAWW(a,b,c) silk_SMLAWW_((a), (b), (c), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_SMLAWW_(oac_int32 a32, oac_int32 b32, oac_int32 c32, char *file, int line){
+# undef silk_SMLAWW
+# define silk_SMLAWW(a, b, c) silk_SMLAWW_((a), (b), (c), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_SMLAWW_(oac_int32 a32, oac_int32 b32, oac_int32 c32, char *file, int line) {
     oac_int32 ret, tmp;
 
     tmp = silk_SMULWW( b32, c32 );
     ret = silk_ADD32( a32, tmp );
-    if ( ret != silk_ADD_SAT32( a32, tmp ) )
-    {
+    if (ret != silk_ADD_SAT32( a32, tmp )) {
         fprintf (stderr, "silk_SMLAWW(%d, %d, %d) in %s: line %d\n", a32, b32, c32, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
@@ -497,34 +469,32 @@ static OAC_INLINE oac_int32 silk_SMLAWW_(oac_int32 a32, oac_int32 b32, oac_int32
    no checking needed for SigProcFIX_CLZ16
    no checking needed for SigProcFIX_CLZ32*/
 
-#undef silk_DIV32
-#define silk_DIV32(a,b) silk_DIV32_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_DIV32_(oac_int32 a32, oac_int32 b32, char *file, int line){
-    if ( b32 == 0 )
-    {
+# undef silk_DIV32
+# define silk_DIV32(a, b) silk_DIV32_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_DIV32_(oac_int32 a32, oac_int32 b32, char *file, int line) {
+    if (b32 == 0) {
         fprintf (stderr, "silk_DIV32(%d, %d) in %s: line %d\n", a32, b32, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
-    return a32 / b32;
+    return a32/b32;
 }
 
-#undef silk_DIV32_16
-#define silk_DIV32_16(a,b) silk_DIV32_16_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_DIV32_16_(oac_int32 a32, oac_int32 b32, char *file, int line){
+# undef silk_DIV32_16
+# define silk_DIV32_16(a, b) silk_DIV32_16_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_DIV32_16_(oac_int32 a32, oac_int32 b32, char *file, int line) {
     int fail = 0;
     fail |= b32 == 0;
     fail |= b32 > silk_int16_MAX;
     fail |= b32 < silk_int16_MIN;
-    if ( fail )
-    {
+    if (fail) {
         fprintf (stderr, "silk_DIV32_16(%d, %d) in %s: line %d\n", a32, b32, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
-    return a32 / b32;
+    return a32/b32;
 }
 
 /* no checking needed for silk_SAT8
@@ -535,403 +505,377 @@ static OAC_INLINE oac_int32 silk_DIV32_16_(oac_int32 a32, oac_int32 b32, char *f
    no checking needed for silk_ADD_POS_SAT16
    no checking needed for silk_ADD_POS_SAT32 */
 
-#undef silk_LSHIFT8
-#define silk_LSHIFT8(a,b) silk_LSHIFT8_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int8 silk_LSHIFT8_(oac_int8 a, oac_int32 shift, char *file, int line){
+# undef silk_LSHIFT8
+# define silk_LSHIFT8(a, b) silk_LSHIFT8_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int8 silk_LSHIFT8_(oac_int8 a, oac_int32 shift, char *file, int line) {
     oac_int8 ret;
-    int       fail = 0;
-    ret = (oac_int8)((oac_uint8)a << shift);
+    int fail = 0;
+    ret = (oac_int8)((oac_uint8)a<<shift);
     fail |= shift < 0;
     fail |= shift >= 8;
-    fail |= (oac_int64)ret != (oac_int64)(((oac_uint64)a) << shift);
-    if ( fail )
-    {
+    fail |= (oac_int64)ret != (oac_int64)(((oac_uint64)a)<<shift);
+    if (fail) {
         fprintf (stderr, "silk_LSHIFT8(%d, %d) in %s: line %d\n", a, shift, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
-#undef silk_LSHIFT16
-#define silk_LSHIFT16(a,b) silk_LSHIFT16_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int16 silk_LSHIFT16_(oac_int16 a, oac_int32 shift, char *file, int line){
+# undef silk_LSHIFT16
+# define silk_LSHIFT16(a, b) silk_LSHIFT16_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int16 silk_LSHIFT16_(oac_int16 a, oac_int32 shift, char *file, int line) {
     oac_int16 ret;
-    int        fail = 0;
-    ret = (oac_int16)((oac_uint16)a << shift);
+    int fail = 0;
+    ret = (oac_int16)((oac_uint16)a<<shift);
     fail |= shift < 0;
     fail |= shift >= 16;
-    fail |= (oac_int64)ret != (oac_int64)(((oac_uint64)a) << shift);
-    if ( fail )
-    {
+    fail |= (oac_int64)ret != (oac_int64)(((oac_uint64)a)<<shift);
+    if (fail) {
         fprintf (stderr, "silk_LSHIFT16(%d, %d) in %s: line %d\n", a, shift, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
-#undef silk_LSHIFT32
-#define silk_LSHIFT32(a,b) silk_LSHIFT32_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_LSHIFT32_(oac_int32 a, oac_int32 shift, char *file, int line){
+# undef silk_LSHIFT32
+# define silk_LSHIFT32(a, b) silk_LSHIFT32_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_LSHIFT32_(oac_int32 a, oac_int32 shift, char *file, int line) {
     oac_int32 ret;
-    int        fail = 0;
-    ret = (oac_int32)((oac_uint32)a << shift);
+    int fail = 0;
+    ret = (oac_int32)((oac_uint32)a<<shift);
     fail |= shift < 0;
     fail |= shift >= 32;
-    fail |= (oac_int64)ret != (oac_int64)(((oac_uint64)a) << shift);
-    if ( fail )
-    {
+    fail |= (oac_int64)ret != (oac_int64)(((oac_uint64)a)<<shift);
+    if (fail) {
         fprintf (stderr, "silk_LSHIFT32(%d, %d) in %s: line %d\n", a, shift, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
-#undef silk_LSHIFT64
-#define silk_LSHIFT64(a,b) silk_LSHIFT64_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int64 silk_LSHIFT64_(oac_int64 a, oac_int shift, char *file, int line){
+# undef silk_LSHIFT64
+# define silk_LSHIFT64(a, b) silk_LSHIFT64_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int64 silk_LSHIFT64_(oac_int64 a, oac_int shift, char *file, int line) {
     oac_int64 ret;
-    int        fail = 0;
-    ret = (oac_int64)((oac_uint64)a << shift);
+    int fail = 0;
+    ret = (oac_int64)((oac_uint64)a<<shift);
     fail |= shift < 0;
     fail |= shift >= 64;
     fail |= (ret>>shift) != ((oac_int64)a);
-    if ( fail )
-    {
+    if (fail) {
         fprintf (stderr, "silk_LSHIFT64(%lld, %d) in %s: line %d\n", (long long)a, shift, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
-#undef silk_LSHIFT_ovflw
-#define silk_LSHIFT_ovflw(a,b) silk_LSHIFT_ovflw_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_LSHIFT_ovflw_(oac_int32 a, oac_int32 shift, char *file, int line){
-    if ( (shift < 0) || (shift >= 32) ) /* no check for overflow */
-    {
+# undef silk_LSHIFT_ovflw
+# define silk_LSHIFT_ovflw(a, b) silk_LSHIFT_ovflw_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_LSHIFT_ovflw_(oac_int32 a, oac_int32 shift, char *file, int line) {
+    if ((shift < 0) || (shift >= 32)) { /* no check for overflow */
         fprintf (stderr, "silk_LSHIFT_ovflw(%d, %d) in %s: line %d\n", a, shift, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
-    return a << shift;
+    return a<<shift;
 }
 
-#undef silk_LSHIFT_uint
-#define silk_LSHIFT_uint(a,b) silk_LSHIFT_uint_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_uint32 silk_LSHIFT_uint_(oac_uint32 a, oac_int32 shift, char *file, int line){
+# undef silk_LSHIFT_uint
+# define silk_LSHIFT_uint(a, b) silk_LSHIFT_uint_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_uint32 silk_LSHIFT_uint_(oac_uint32 a, oac_int32 shift, char *file, int line) {
     oac_uint32 ret;
-    ret = a << shift;
-    if ( (shift < 0) || ((oac_int64)ret != ((oac_int64)a) << shift))
-    {
+    ret = a<<shift;
+    if ((shift < 0) || ((oac_int64)ret != ((oac_int64)a)<<shift)) {
         fprintf (stderr, "silk_LSHIFT_uint(%u, %d) in %s: line %d\n", a, shift, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
-#undef silk_RSHIFT8
-#define silk_RSHITF8(a,b) silk_RSHIFT8_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int8 silk_RSHIFT8_(oac_int8 a, oac_int32 shift, char *file, int line){
-    if ( (shift < 0) || (shift>=8) )
-    {
+# undef silk_RSHIFT8
+# define silk_RSHITF8(a, b) silk_RSHIFT8_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int8 silk_RSHIFT8_(oac_int8 a, oac_int32 shift, char *file, int line) {
+    if ((shift < 0) || (shift >= 8)) {
         fprintf (stderr, "silk_RSHITF8(%d, %d) in %s: line %d\n", a, shift, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
-    return a >> shift;
+    return a>>shift;
 }
 
-#undef silk_RSHIFT16
-#define silk_RSHITF16(a,b) silk_RSHIFT16_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int16 silk_RSHIFT16_(oac_int16 a, oac_int32 shift, char *file, int line){
-    if ( (shift < 0) || (shift>=16) )
-    {
+# undef silk_RSHIFT16
+# define silk_RSHITF16(a, b) silk_RSHIFT16_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int16 silk_RSHIFT16_(oac_int16 a, oac_int32 shift, char *file, int line) {
+    if ((shift < 0) || (shift >= 16)) {
         fprintf (stderr, "silk_RSHITF16(%d, %d) in %s: line %d\n", a, shift, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
-    return a >> shift;
+    return a>>shift;
 }
 
-#undef silk_RSHIFT32
-#define silk_RSHIFT32(a,b) silk_RSHIFT32_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_RSHIFT32_(oac_int32 a, oac_int32 shift, char *file, int line){
-    if ( (shift < 0) || (shift>=32) )
-    {
+# undef silk_RSHIFT32
+# define silk_RSHIFT32(a, b) silk_RSHIFT32_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_RSHIFT32_(oac_int32 a, oac_int32 shift, char *file, int line) {
+    if ((shift < 0) || (shift >= 32)) {
         fprintf (stderr, "silk_RSHITF32(%d, %d) in %s: line %d\n", a, shift, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
-    return a >> shift;
+    return a>>shift;
 }
 
-#undef silk_RSHIFT64
-#define silk_RSHIFT64(a,b) silk_RSHIFT64_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int64 silk_RSHIFT64_(oac_int64 a, oac_int64 shift, char *file, int line){
-    if ( (shift < 0) || (shift>=64) )
-    {
+# undef silk_RSHIFT64
+# define silk_RSHIFT64(a, b) silk_RSHIFT64_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int64 silk_RSHIFT64_(oac_int64 a, oac_int64 shift, char *file, int line) {
+    if ((shift < 0) || (shift >= 64)) {
         fprintf (stderr, "silk_RSHITF64(%lld, %lld) in %s: line %d\n", (long long)a, (long long)shift, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
-    return a >> shift;
+    return a>>shift;
 }
 
-#undef silk_RSHIFT_uint
-#define silk_RSHIFT_uint(a,b) silk_RSHIFT_uint_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_uint32 silk_RSHIFT_uint_(oac_uint32 a, oac_int32 shift, char *file, int line){
-    if ( (shift < 0) || (shift>32) )
-    {
+# undef silk_RSHIFT_uint
+# define silk_RSHIFT_uint(a, b) silk_RSHIFT_uint_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_uint32 silk_RSHIFT_uint_(oac_uint32 a, oac_int32 shift, char *file, int line) {
+    if ((shift < 0) || (shift > 32)) {
         fprintf (stderr, "silk_RSHIFT_uint(%u, %d) in %s: line %d\n", a, shift, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
-    return a >> shift;
+    return a>>shift;
 }
 
-#undef silk_ADD_LSHIFT
-#define silk_ADD_LSHIFT(a,b,c) silk_ADD_LSHIFT_((a), (b), (c), __FILE__, __LINE__)
-static OAC_INLINE int silk_ADD_LSHIFT_(int a, int b, int shift, char *file, int line){
+# undef silk_ADD_LSHIFT
+# define silk_ADD_LSHIFT(a, b, c) silk_ADD_LSHIFT_((a), (b), (c), __FILE__, __LINE__)
+static OAC_INLINE int silk_ADD_LSHIFT_(int a, int b, int shift, char *file, int line) {
     oac_int16 ret;
-    ret = a + (oac_int16)((oac_uint16)b << shift);
-    if ( (shift < 0) || (shift>15) || ((oac_int64)ret != (oac_int64)a + (oac_int64)(((oac_uint64)b) << shift)) )
-    {
+    ret = a + (oac_int16)((oac_uint16)b<<shift);
+    if ((shift < 0) || (shift > 15) || ((oac_int64)ret != (oac_int64)a + (oac_int64)(((oac_uint64)b)<<shift))) {
         fprintf (stderr, "silk_ADD_LSHIFT(%d, %d, %d) in %s: line %d\n", a, b, shift, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;                /* shift >= 0 */
 }
 
-#undef silk_ADD_LSHIFT32
-#define silk_ADD_LSHIFT32(a,b,c) silk_ADD_LSHIFT32_((a), (b), (c), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_ADD_LSHIFT32_(oac_int32 a, oac_int32 b, oac_int32 shift, char *file, int line){
+# undef silk_ADD_LSHIFT32
+# define silk_ADD_LSHIFT32(a, b, c) silk_ADD_LSHIFT32_((a), (b), (c), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_ADD_LSHIFT32_(oac_int32 a, oac_int32 b, oac_int32 shift, char *file, int line) {
     oac_int32 ret;
-    ret = silk_ADD32_ovflw(a, (oac_int32)((oac_uint32)b << shift));
-    if ( (shift < 0) || (shift>31) || ((oac_int64)ret != (oac_int64)a + (oac_int64)(((oac_uint64)b) << shift)) )
-    {
+    ret = silk_ADD32_ovflw(a, (oac_int32)((oac_uint32)b<<shift));
+    if ((shift < 0) || (shift > 31) || ((oac_int64)ret != (oac_int64)a + (oac_int64)(((oac_uint64)b)<<shift))) {
         fprintf (stderr, "silk_ADD_LSHIFT32(%d, %d, %d) in %s: line %d\n", a, b, shift, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;                /* shift >= 0 */
 }
 
-#undef silk_ADD_LSHIFT_uint
-#define silk_ADD_LSHIFT_uint(a,b,c) silk_ADD_LSHIFT_uint_((a), (b), (c), __FILE__, __LINE__)
-static OAC_INLINE oac_uint32 silk_ADD_LSHIFT_uint_(oac_uint32 a, oac_uint32 b, oac_int32 shift, char *file, int line){
+# undef silk_ADD_LSHIFT_uint
+# define silk_ADD_LSHIFT_uint(a, b, c) silk_ADD_LSHIFT_uint_((a), (b), (c), __FILE__, __LINE__)
+static OAC_INLINE oac_uint32 silk_ADD_LSHIFT_uint_(oac_uint32 a, oac_uint32 b, oac_int32 shift, char *file, int line) {
     oac_uint32 ret;
-    ret = a + (b << shift);
-    if ( (shift < 0) || (shift>32) || ((oac_int64)ret != (oac_int64)a + (((oac_int64)b) << shift)) )
-    {
+    ret = a + (b<<shift);
+    if ((shift < 0) || (shift > 32) || ((oac_int64)ret != (oac_int64)a + (((oac_int64)b)<<shift))) {
         fprintf (stderr, "silk_ADD_LSHIFT_uint(%u, %u, %d) in %s: line %d\n", a, b, shift, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;                /* shift >= 0 */
 }
 
-#undef silk_ADD_RSHIFT
-#define silk_ADD_RSHIFT(a,b,c) silk_ADD_RSHIFT_((a), (b), (c), __FILE__, __LINE__)
-static OAC_INLINE int silk_ADD_RSHIFT_(int a, int b, int shift, char *file, int line){
+# undef silk_ADD_RSHIFT
+# define silk_ADD_RSHIFT(a, b, c) silk_ADD_RSHIFT_((a), (b), (c), __FILE__, __LINE__)
+static OAC_INLINE int silk_ADD_RSHIFT_(int a, int b, int shift, char *file, int line) {
     oac_int16 ret;
-    ret = a + (b >> shift);
-    if ( (shift < 0) || (shift>15) || ((oac_int64)ret != (oac_int64)a + (((oac_int64)b) >> shift)) )
-    {
+    ret = a + (b>>shift);
+    if ((shift < 0) || (shift > 15) || ((oac_int64)ret != (oac_int64)a + (((oac_int64)b)>>shift))) {
         fprintf (stderr, "silk_ADD_RSHIFT(%d, %d, %d) in %s: line %d\n", a, b, shift, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;                /* shift  > 0 */
 }
 
-#undef silk_ADD_RSHIFT32
-#define silk_ADD_RSHIFT32(a,b,c) silk_ADD_RSHIFT32_((a), (b), (c), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_ADD_RSHIFT32_(oac_int32 a, oac_int32 b, oac_int32 shift, char *file, int line){
+# undef silk_ADD_RSHIFT32
+# define silk_ADD_RSHIFT32(a, b, c) silk_ADD_RSHIFT32_((a), (b), (c), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_ADD_RSHIFT32_(oac_int32 a, oac_int32 b, oac_int32 shift, char *file, int line) {
     oac_int32 ret;
-    ret = silk_ADD32_ovflw(a, (b >> shift));
-    if ( (shift < 0) || (shift>31) || ((oac_int64)ret != (oac_int64)a + (((oac_int64)b) >> shift)) )
-    {
+    ret = silk_ADD32_ovflw(a, (b>>shift));
+    if ((shift < 0) || (shift > 31) || ((oac_int64)ret != (oac_int64)a + (((oac_int64)b)>>shift))) {
         fprintf (stderr, "silk_ADD_RSHIFT32(%d, %d, %d) in %s: line %d\n", a, b, shift, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;                /* shift  > 0 */
 }
 
-#undef silk_ADD_RSHIFT_uint
-#define silk_ADD_RSHIFT_uint(a,b,c) silk_ADD_RSHIFT_uint_((a), (b), (c), __FILE__, __LINE__)
-static OAC_INLINE oac_uint32 silk_ADD_RSHIFT_uint_(oac_uint32 a, oac_uint32 b, oac_int32 shift, char *file, int line){
+# undef silk_ADD_RSHIFT_uint
+# define silk_ADD_RSHIFT_uint(a, b, c) silk_ADD_RSHIFT_uint_((a), (b), (c), __FILE__, __LINE__)
+static OAC_INLINE oac_uint32 silk_ADD_RSHIFT_uint_(oac_uint32 a, oac_uint32 b, oac_int32 shift, char *file, int line) {
     oac_uint32 ret;
-    ret = a + (b >> shift);
-    if ( (shift < 0) || (shift>32) || ((oac_int64)ret != (oac_int64)a + (((oac_int64)b) >> shift)) )
-    {
+    ret = a + (b>>shift);
+    if ((shift < 0) || (shift > 32) || ((oac_int64)ret != (oac_int64)a + (((oac_int64)b)>>shift))) {
         fprintf (stderr, "silk_ADD_RSHIFT_uint(%u, %u, %d) in %s: line %d\n", a, b, shift, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;                /* shift  > 0 */
 }
 
-#undef silk_SUB_LSHIFT32
-#define silk_SUB_LSHIFT32(a,b,c) silk_SUB_LSHIFT32_((a), (b), (c), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_SUB_LSHIFT32_(oac_int32 a, oac_int32 b, oac_int32 shift, char *file, int line){
+# undef silk_SUB_LSHIFT32
+# define silk_SUB_LSHIFT32(a, b, c) silk_SUB_LSHIFT32_((a), (b), (c), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_SUB_LSHIFT32_(oac_int32 a, oac_int32 b, oac_int32 shift, char *file, int line) {
     oac_int32 ret;
-    ret = silk_SUB32_ovflw(a, (oac_int32)((oac_uint32)b << shift));
-    if ( (shift < 0) || (shift>31) || ((oac_int64)ret != (oac_int64)a - (oac_int64)(((oac_uint64)b) << shift)) )
-    {
+    ret = silk_SUB32_ovflw(a, (oac_int32)((oac_uint32)b<<shift));
+    if ((shift < 0) || (shift > 31) || ((oac_int64)ret != (oac_int64)a - (oac_int64)(((oac_uint64)b)<<shift))) {
         fprintf (stderr, "silk_SUB_LSHIFT32(%d, %d, %d) in %s: line %d\n", a, b, shift, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;                /* shift >= 0 */
 }
 
-#undef silk_SUB_RSHIFT32
-#define silk_SUB_RSHIFT32(a,b,c) silk_SUB_RSHIFT32_((a), (b), (c), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_SUB_RSHIFT32_(oac_int32 a, oac_int32 b, oac_int32 shift, char *file, int line){
+# undef silk_SUB_RSHIFT32
+# define silk_SUB_RSHIFT32(a, b, c) silk_SUB_RSHIFT32_((a), (b), (c), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_SUB_RSHIFT32_(oac_int32 a, oac_int32 b, oac_int32 shift, char *file, int line) {
     oac_int32 ret;
-    ret = silk_SUB32_ovflw(a, (b >> shift));
-    if ( (shift < 0) || (shift>31) || ((oac_int64)ret != (oac_int64)a - (((oac_int64)b) >> shift)) )
-    {
+    ret = silk_SUB32_ovflw(a, (b>>shift));
+    if ((shift < 0) || (shift > 31) || ((oac_int64)ret != (oac_int64)a - (((oac_int64)b)>>shift))) {
         fprintf (stderr, "silk_SUB_RSHIFT32(%d, %d, %d) in %s: line %d\n", a, b, shift, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;                /* shift  > 0 */
 }
 
-#undef silk_RSHIFT_ROUND
-#define silk_RSHIFT_ROUND(a,b) silk_RSHIFT_ROUND_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_RSHIFT_ROUND_(oac_int32 a, oac_int32 shift, char *file, int line){
+# undef silk_RSHIFT_ROUND
+# define silk_RSHIFT_ROUND(a, b) silk_RSHIFT_ROUND_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_RSHIFT_ROUND_(oac_int32 a, oac_int32 shift, char *file, int line) {
     oac_int32 ret;
-    ret = shift == 1 ? (a >> 1) + (a & 1) : ((a >> (shift - 1)) + 1) >> 1;
+    ret = shift == 1 ? (a>>1) + (a&1) : ((a>>(shift - 1)) + 1)>>1;
     /* the macro definition can't handle a shift of zero */
-    if ( (shift <= 0) || (shift>31) || ((oac_int64)ret != ((oac_int64)a + ((oac_int64)1 << (shift - 1))) >> shift) )
-    {
+    if ((shift <= 0) || (shift > 31) || ((oac_int64)ret != ((oac_int64)a + ((oac_int64)1<<(shift - 1)))>>shift)) {
         fprintf (stderr, "silk_RSHIFT_ROUND(%d, %d) in %s: line %d\n", a, shift, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return ret;
 }
 
-#undef silk_RSHIFT_ROUND64
-#define silk_RSHIFT_ROUND64(a,b) silk_RSHIFT_ROUND64_((a), (b), __FILE__, __LINE__)
-static OAC_INLINE oac_int64 silk_RSHIFT_ROUND64_(oac_int64 a, oac_int32 shift, char *file, int line){
+# undef silk_RSHIFT_ROUND64
+# define silk_RSHIFT_ROUND64(a, b) silk_RSHIFT_ROUND64_((a), (b), __FILE__, __LINE__)
+static OAC_INLINE oac_int64 silk_RSHIFT_ROUND64_(oac_int64 a, oac_int32 shift, char *file, int line) {
     oac_int64 ret;
     /* the macro definition can't handle a shift of zero */
-    if ( (shift <= 0) || (shift>=64) )
-    {
+    if ((shift <= 0) || (shift >= 64)) {
         fprintf (stderr, "silk_RSHIFT_ROUND64(%lld, %d) in %s: line %d\n", (long long)a, shift, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
-    ret = shift == 1 ? (a >> 1) + (a & 1) : ((a >> (shift - 1)) + 1) >> 1;
+    ret = shift == 1 ? (a>>1) + (a&1) : ((a>>(shift - 1)) + 1)>>1;
     return ret;
 }
 
 /* silk_abs is used on floats also, so doesn't work... */
 /*#undef silk_abs
-static OAC_INLINE oac_int32 silk_abs(oac_int32 a){
+   static OAC_INLINE oac_int32 silk_abs(oac_int32 a){
     silk_assert(a != 0x80000000);
     return (((a) >  0)  ? (a) : -(a));            // Be careful, silk_abs returns wrong when input equals to silk_intXX_MIN
-}*/
+   }*/
 
-#undef silk_abs_int64
-#define silk_abs_int64(a) silk_abs_int64_((a), __FILE__, __LINE__)
-static OAC_INLINE oac_int64 silk_abs_int64_(oac_int64 a, char *file, int line){
-    if ( a == silk_int64_MIN )
-    {
+# undef silk_abs_int64
+# define silk_abs_int64(a) silk_abs_int64_((a), __FILE__, __LINE__)
+static OAC_INLINE oac_int64 silk_abs_int64_(oac_int64 a, char *file, int line) {
+    if (a == silk_int64_MIN) {
         fprintf (stderr, "silk_abs_int64(%lld) in %s: line %d\n", (long long)a, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
-    return (((a) >  0)  ? (a) : -(a));            /* Be careful, silk_abs returns wrong when input equals to silk_intXX_MIN */
+    return ((a) >  0)  ? (a) : -(a);            /* Be careful, silk_abs returns wrong when input equals to silk_intXX_MIN */
 }
 
-#undef silk_abs_int32
-#define silk_abs_int32(a) silk_abs_int32_((a), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_abs_int32_(oac_int32 a, char *file, int line){
-    if ( a == silk_int32_MIN )
-    {
+# undef silk_abs_int32
+# define silk_abs_int32(a) silk_abs_int32_((a), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_abs_int32_(oac_int32 a, char *file, int line) {
+    if (a == silk_int32_MIN) {
         fprintf (stderr, "silk_abs_int32(%d) in %s: line %d\n", a, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
     return silk_abs(a);
 }
 
-#undef silk_CHECK_FIT8
-#define silk_CHECK_FIT8(a) silk_CHECK_FIT8_((a), __FILE__, __LINE__)
-static OAC_INLINE oac_int8 silk_CHECK_FIT8_( oac_int64 a, char *file, int line ){
+# undef silk_CHECK_FIT8
+# define silk_CHECK_FIT8(a) silk_CHECK_FIT8_((a), __FILE__, __LINE__)
+static OAC_INLINE oac_int8 silk_CHECK_FIT8_( oac_int64 a, char *file, int line ) {
     oac_int8 ret;
     ret = (oac_int8)a;
-    if ( (oac_int64)ret != a )
-    {
+    if ((oac_int64)ret != a) {
         fprintf (stderr, "silk_CHECK_FIT8(%lld) in %s: line %d\n", (long long)a, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
-    return( ret );
+    return ret;
 }
 
-#undef silk_CHECK_FIT16
-#define silk_CHECK_FIT16(a) silk_CHECK_FIT16_((a), __FILE__, __LINE__)
-static OAC_INLINE oac_int16 silk_CHECK_FIT16_( oac_int64 a, char *file, int line ){
+# undef silk_CHECK_FIT16
+# define silk_CHECK_FIT16(a) silk_CHECK_FIT16_((a), __FILE__, __LINE__)
+static OAC_INLINE oac_int16 silk_CHECK_FIT16_( oac_int64 a, char *file, int line ) {
     oac_int16 ret;
     ret = (oac_int16)a;
-    if ( (oac_int64)ret != a )
-    {
+    if ((oac_int64)ret != a) {
         fprintf (stderr, "silk_CHECK_FIT16(%lld) in %s: line %d\n", (long long)a, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
-    return( ret );
+    return ret;
 }
 
-#undef silk_CHECK_FIT32
-#define silk_CHECK_FIT32(a) silk_CHECK_FIT32_((a), __FILE__, __LINE__)
-static OAC_INLINE oac_int32 silk_CHECK_FIT32_( oac_int64 a, char *file, int line ){
+# undef silk_CHECK_FIT32
+# define silk_CHECK_FIT32(a) silk_CHECK_FIT32_((a), __FILE__, __LINE__)
+static OAC_INLINE oac_int32 silk_CHECK_FIT32_( oac_int64 a, char *file, int line ) {
     oac_int32 ret;
     ret = (oac_int32)a;
-    if ( (oac_int64)ret != a )
-    {
+    if ((oac_int64)ret != a) {
         fprintf (stderr, "silk_CHECK_FIT32(%lld) in %s: line %d\n", (long long)a, file, line);
-#ifdef FIXED_DEBUG_ASSERT
+# ifdef FIXED_DEBUG_ASSERT
         silk_assert( 0 );
-#endif
+# endif
     }
-    return( ret );
+    return ret;
 }
 
 /* no checking for silk_NSHIFT_MUL_32_32
@@ -939,7 +883,7 @@ static OAC_INLINE oac_int32 silk_CHECK_FIT32_( oac_int64 a, char *file, int line
    no checking needed for silk_min
    no checking needed for silk_max
    no checking needed for silk_sign
-*/
+ */
 
 #endif
 #endif /* MACRO_DEBUG_H */
diff --git a/silk/NLSF2A.c b/silk/NLSF2A.c
index f2645bc46..ff31b6ac6 100644
--- a/silk/NLSF2A.c
+++ b/silk/NLSF2A.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 /* conversion between prediction filter coefficients and LSFs   */
@@ -44,19 +44,18 @@ POSSIBILITY OF SUCH DAMAGE.
 static OAC_INLINE void silk_NLSF2A_find_poly(
     oac_int32          *out,      /* O    intermediate polynomial, QA [dd+1]        */
     const oac_int32    *cLSF,     /* I    vector of interleaved 2*cos(LSFs), QA [d] */
-    oac_int            dd         /* I    polynomial order (= 1/2 * filter order)   */
-)
-{
-    oac_int   k, n;
+    oac_int dd                    /* I    polynomial order (= 1/2 * filter order)   */
+    ) {
+    oac_int k, n;
     oac_int32 ftmp;
 
     out[0] = silk_LSHIFT( 1, QA );
     out[1] = -cLSF[0];
-    for( k = 1; k < dd; k++ ) {
+    for (k = 1; k < dd; k++) {
         ftmp = cLSF[2*k];            /* QA*/
-        out[k+1] = silk_LSHIFT( out[k-1], 1 ) - (oac_int32)silk_RSHIFT_ROUND64( silk_SMULL( ftmp, out[k] ), QA );
-        for( n = k; n > 1; n-- ) {
-            out[n] += out[n-2] - (oac_int32)silk_RSHIFT_ROUND64( silk_SMULL( ftmp, out[n-1] ), QA );
+        out[k + 1] = silk_LSHIFT( out[k - 1], 1 ) - (oac_int32)silk_RSHIFT_ROUND64( silk_SMULL( ftmp, out[k] ), QA );
+        for (n = k; n > 1; n--) {
+            out[n] += out[n - 2] - (oac_int32)silk_RSHIFT_ROUND64( silk_SMULL( ftmp, out[n - 1] ), QA );
         }
         out[1] -= ftmp;
     }
@@ -66,31 +65,30 @@ static OAC_INLINE void silk_NLSF2A_find_poly(
 void silk_NLSF2A(
     oac_int16                  *a_Q12,             /* O    monic whitening filter coefficients in Q12,  [ d ]          */
     const oac_int16            *NLSF,              /* I    normalized line spectral frequencies in Q15, [ d ]          */
-    const oac_int              d,                  /* I    filter order (should be even)                               */
-    int                         arch                /* I    Run-time architecture                                       */
-)
-{
+    const oac_int d,                               /* I    filter order (should be even)                               */
+    int arch                                        /* I    Run-time architecture                                       */
+    ) {
     /* This ordering was found to maximize quality. It improves numerical accuracy of
        silk_NLSF2A_find_poly() compared to "standard" ordering. */
     static const unsigned char ordering16[16] = {
-      0, 15, 8, 7, 4, 11, 12, 3, 2, 13, 10, 5, 6, 9, 14, 1
+        0, 15, 8, 7, 4, 11, 12, 3, 2, 13, 10, 5, 6, 9, 14, 1
     };
     static const unsigned char ordering10[10] = {
-      0, 9, 6, 3, 4, 5, 8, 1, 2, 7
+        0, 9, 6, 3, 4, 5, 8, 1, 2, 7
     };
     const unsigned char *ordering;
-    oac_int   k, i, dd;
+    oac_int k, i, dd;
     oac_int32 cos_LSF_QA[ SILK_MAX_ORDER_LPC ];
-    oac_int32 P[ SILK_MAX_ORDER_LPC / 2 + 1 ], Q[ SILK_MAX_ORDER_LPC / 2 + 1 ];
+    oac_int32 P[ SILK_MAX_ORDER_LPC/2 + 1 ], Q[ SILK_MAX_ORDER_LPC/2 + 1 ];
     oac_int32 Ptmp, Qtmp, f_int, f_frac, cos_val, delta;
     oac_int32 a32_QA1[ SILK_MAX_ORDER_LPC ];
 
     silk_assert( LSF_COS_TAB_SZ_FIX == 128 );
-    celt_assert( d==10 || d==16 );
+    celt_assert( d == 10 || d == 16 );
 
     /* convert LSFs to 2*cos(LSF), using piecewise linear curve from table */
     ordering = d == 16 ? ordering16 : ordering10;
-    for( k = 0; k < d; k++ ) {
+    for (k = 0; k < d; k++) {
         silk_assert( NLSF[k] >= 0 );
 
         /* f_int on a scale 0-127 (rounded down) */
@@ -117,23 +115,23 @@ void silk_NLSF2A(
     silk_NLSF2A_find_poly( Q, &cos_LSF_QA[ 1 ], dd );
 
     /* convert even and odd polynomials to oac_int32 Q12 filter coefs */
-    for( k = 0; k < dd; k++ ) {
-        Ptmp = P[ k+1 ] + P[ k ];
-        Qtmp = Q[ k+1 ] - Q[ k ];
+    for (k = 0; k < dd; k++) {
+        Ptmp = P[ k + 1 ] + P[ k ];
+        Qtmp = Q[ k + 1 ] - Q[ k ];
 
         /* the Ptmp and Qtmp values at this stage need to fit in int32 */
         a32_QA1[ k ]     = -Qtmp - Ptmp;        /* QA+1 */
-        a32_QA1[ d-k-1 ] =  Qtmp - Ptmp;        /* QA+1 */
+        a32_QA1[ d - k - 1 ] =  Qtmp - Ptmp;        /* QA+1 */
     }
 
     /* Convert int32 coefficients to Q12 int16 coefs */
     silk_LPC_fit( a_Q12, a32_QA1, 12, QA + 1, d );
 
-    for( i = 0; silk_LPC_inverse_pred_gain( a_Q12, d, arch ) == 0 && i < MAX_LPC_STABILIZE_ITERATIONS; i++ ) {
+    for (i = 0; silk_LPC_inverse_pred_gain( a_Q12, d, arch ) == 0 && i < MAX_LPC_STABILIZE_ITERATIONS; i++) {
         /* Prediction coefficients are (too close to) unstable; apply bandwidth expansion   */
         /* on the unscaled coefficients, convert to Q12 and measure again                   */
-        silk_bwexpander_32( a32_QA1, d, 65536 - silk_LSHIFT( 2, i ) );
-        for( k = 0; k < d; k++ ) {
+        silk_bwexpander_32( a32_QA1, d, 65536 - silk_LSHIFT( 2, i ));
+        for (k = 0; k < d; k++) {
             a_Q12[ k ] = (oac_int16)silk_RSHIFT_ROUND( a32_QA1[ k ], QA + 1 - 12 );            /* QA+1 -> Q12 */
         }
     }
diff --git a/silk/NLSF_VQ.c b/silk/NLSF_VQ.c
index 483cd0a8d..3e825fd66 100644
--- a/silk/NLSF_VQ.c
+++ b/silk/NLSF_VQ.c
@@ -1,70 +1,69 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
 
 /* Compute quantization errors for an LPC_order element input vector for a VQ codebook */
 void silk_NLSF_VQ(
-    oac_int32                  err_Q24[],                      /* O    Quantization errors [K]                     */
-    const oac_int16            in_Q15[],                       /* I    Input vectors to be quantized [LPC_order]   */
-    const oac_uint8            pCB_Q8[],                       /* I    Codebook vectors [K*LPC_order]              */
-    const oac_int16            pWght_Q9[],                     /* I    Codebook weights [K*LPC_order]              */
-    const oac_int              K,                              /* I    Number of codebook vectors                  */
-    const oac_int              LPC_order                       /* I    Number of LPCs                              */
-)
-{
-    oac_int         i, m;
-    oac_int32       diff_Q15, diffw_Q24, sum_error_Q24, pred_Q24;
+    oac_int32 err_Q24[],                                       /* O    Quantization errors [K]                     */
+    const oac_int16 in_Q15[],                                  /* I    Input vectors to be quantized [LPC_order]   */
+    const oac_uint8 pCB_Q8[],                                  /* I    Codebook vectors [K*LPC_order]              */
+    const oac_int16 pWght_Q9[],                                /* I    Codebook weights [K*LPC_order]              */
+    const oac_int K,                                           /* I    Number of codebook vectors                  */
+    const oac_int LPC_order                                    /* I    Number of LPCs                              */
+    ) {
+    oac_int i, m;
+    oac_int32 diff_Q15, diffw_Q24, sum_error_Q24, pred_Q24;
     const oac_int16 *w_Q9_ptr;
     const oac_uint8 *cb_Q8_ptr;
 
-    celt_assert( ( LPC_order & 1 ) == 0 );
+    celt_assert((LPC_order&1) == 0 );
 
     /* Loop over codebook */
     cb_Q8_ptr = pCB_Q8;
     w_Q9_ptr = pWght_Q9;
-    for( i = 0; i < K; i++ ) {
+    for (i = 0; i < K; i++) {
         sum_error_Q24 = 0;
         pred_Q24 = 0;
-        for( m = LPC_order-2; m >= 0; m -= 2 ) {
+        for (m = LPC_order - 2; m >= 0; m -= 2) {
             /* Compute weighted absolute predictive quantization error for index m + 1 */
             diff_Q15 = silk_SUB_LSHIFT32( in_Q15[ m + 1 ], (oac_int32)cb_Q8_ptr[ m + 1 ], 7 ); /* range: [ -32767 : 32767 ]*/
             diffw_Q24 = silk_SMULBB( diff_Q15, w_Q9_ptr[ m + 1 ] );
-            sum_error_Q24 = silk_ADD32( sum_error_Q24, silk_abs( silk_SUB_RSHIFT32( diffw_Q24, pred_Q24, 1 ) ) );
+            sum_error_Q24 = silk_ADD32( sum_error_Q24, silk_abs( silk_SUB_RSHIFT32( diffw_Q24, pred_Q24, 1 )));
             pred_Q24 = diffw_Q24;
 
             /* Compute weighted absolute predictive quantization error for index m */
             diff_Q15 = silk_SUB_LSHIFT32( in_Q15[ m ], (oac_int32)cb_Q8_ptr[ m ], 7 ); /* range: [ -32767 : 32767 ]*/
             diffw_Q24 = silk_SMULBB( diff_Q15, w_Q9_ptr[ m ] );
-            sum_error_Q24 = silk_ADD32( sum_error_Q24, silk_abs( silk_SUB_RSHIFT32( diffw_Q24, pred_Q24, 1 ) ) );
+            sum_error_Q24 = silk_ADD32( sum_error_Q24, silk_abs( silk_SUB_RSHIFT32( diffw_Q24, pred_Q24, 1 )));
             pred_Q24 = diffw_Q24;
 
             silk_assert( sum_error_Q24 >= 0 );
diff --git a/silk/NLSF_VQ_weights_laroia.c b/silk/NLSF_VQ_weights_laroia.c
index d75692c38..2b74875de 100644
--- a/silk/NLSF_VQ_weights_laroia.c
+++ b/silk/NLSF_VQ_weights_laroia.c
@@ -1,80 +1,79 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "define.h"
 #include "SigProc_FIX.h"
 
 /*
-R. Laroia, N. Phamdo and N. Farvardin, "Robust and Efficient Quantization of Speech LSP
-Parameters Using Structured Vector Quantization", Proc. IEEE Int. Conf. Acoust., Speech,
-Signal Processing, pp. 641-644, 1991.
-*/
+   R. Laroia, N. Phamdo and N. Farvardin, "Robust and Efficient Quantization of Speech LSP
+   Parameters Using Structured Vector Quantization", Proc. IEEE Int. Conf. Acoust., Speech,
+   Signal Processing, pp. 641-644, 1991.
+ */
 
 /* Laroia low complexity NLSF weights */
 void silk_NLSF_VQ_weights_laroia(
     oac_int16                  *pNLSFW_Q_OUT,      /* O     Pointer to input vector weights [D]                        */
     const oac_int16            *pNLSF_Q15,         /* I     Pointer to input vector         [D]                        */
-    const oac_int              D                   /* I     Input vector dimension (even)                              */
-)
-{
-    oac_int   k;
+    const oac_int D                                /* I     Input vector dimension (even)                              */
+    ) {
+    oac_int k;
     oac_int32 tmp1_int, tmp2_int;
 
     celt_assert( D > 0 );
-    celt_assert( ( D & 1 ) == 0 );
+    celt_assert((D&1) == 0 );
 
     /* First value */
     tmp1_int = silk_max_int( pNLSF_Q15[ 0 ], 1 );
-    tmp1_int = silk_DIV32_16( (oac_int32)1 << ( 15 + NLSF_W_Q ), tmp1_int );
+    tmp1_int = silk_DIV32_16((oac_int32)1<<(15 + NLSF_W_Q), tmp1_int );
     tmp2_int = silk_max_int( pNLSF_Q15[ 1 ] - pNLSF_Q15[ 0 ], 1 );
-    tmp2_int = silk_DIV32_16( (oac_int32)1 << ( 15 + NLSF_W_Q ), tmp2_int );
+    tmp2_int = silk_DIV32_16((oac_int32)1<<(15 + NLSF_W_Q), tmp2_int );
     pNLSFW_Q_OUT[ 0 ] = (oac_int16)silk_min_int( tmp1_int + tmp2_int, silk_int16_MAX );
     silk_assert( pNLSFW_Q_OUT[ 0 ] > 0 );
 
     /* Main loop */
-    for( k = 1; k < D - 1; k += 2 ) {
+    for (k = 1; k < D - 1; k += 2) {
         tmp1_int = silk_max_int( pNLSF_Q15[ k + 1 ] - pNLSF_Q15[ k ], 1 );
-        tmp1_int = silk_DIV32_16( (oac_int32)1 << ( 15 + NLSF_W_Q ), tmp1_int );
+        tmp1_int = silk_DIV32_16((oac_int32)1<<(15 + NLSF_W_Q), tmp1_int );
         pNLSFW_Q_OUT[ k ] = (oac_int16)silk_min_int( tmp1_int + tmp2_int, silk_int16_MAX );
         silk_assert( pNLSFW_Q_OUT[ k ] > 0 );
 
         tmp2_int = silk_max_int( pNLSF_Q15[ k + 2 ] - pNLSF_Q15[ k + 1 ], 1 );
-        tmp2_int = silk_DIV32_16( (oac_int32)1 << ( 15 + NLSF_W_Q ), tmp2_int );
+        tmp2_int = silk_DIV32_16((oac_int32)1<<(15 + NLSF_W_Q), tmp2_int );
         pNLSFW_Q_OUT[ k + 1 ] = (oac_int16)silk_min_int( tmp1_int + tmp2_int, silk_int16_MAX );
         silk_assert( pNLSFW_Q_OUT[ k + 1 ] > 0 );
     }
 
     /* Last value */
-    tmp1_int = silk_max_int( ( 1 << 15 ) - pNLSF_Q15[ D - 1 ], 1 );
-    tmp1_int = silk_DIV32_16( (oac_int32)1 << ( 15 + NLSF_W_Q ), tmp1_int );
+    tmp1_int = silk_max_int((1<<15) - pNLSF_Q15[ D - 1 ], 1 );
+    tmp1_int = silk_DIV32_16((oac_int32)1<<(15 + NLSF_W_Q), tmp1_int );
     pNLSFW_Q_OUT[ D - 1 ] = (oac_int16)silk_min_int( tmp1_int + tmp2_int, silk_int16_MAX );
     silk_assert( pNLSFW_Q_OUT[ D - 1 ] > 0 );
 }
diff --git a/silk/NLSF_decode.c b/silk/NLSF_decode.c
index b41e99ef2..d37ccaa60 100644
--- a/silk/NLSF_decode.c
+++ b/silk/NLSF_decode.c
@@ -1,55 +1,54 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
 
 /* Predictive dequantizer for NLSF residuals */
 static OAC_INLINE void silk_NLSF_residual_dequant(          /* O    Returns RD value in Q30                     */
-          oac_int16         x_Q10[],                        /* O    Output [ order ]                            */
-    const oac_int8          indices[],                      /* I    Quantization indices [ order ]              */
-    const oac_uint8         pred_coef_Q8[],                 /* I    Backward predictor coefs [ order ]          */
-    const oac_int           quant_step_size_Q16,            /* I    Quantization step size                      */
-    const oac_int16         order                           /* I    Number of input values                      */
-)
-{
-    oac_int     i, out_Q10, pred_Q10;
+    oac_int16 x_Q10[],                                      /* O    Output [ order ]                            */
+    const oac_int8 indices[],                               /* I    Quantization indices [ order ]              */
+    const oac_uint8 pred_coef_Q8[],                         /* I    Backward predictor coefs [ order ]          */
+    const oac_int quant_step_size_Q16,                      /* I    Quantization step size                      */
+    const oac_int16 order                                   /* I    Number of input values                      */
+    ) {
+    oac_int i, out_Q10, pred_Q10;
 
     out_Q10 = 0;
-    for( i = order-1; i >= 0; i-- ) {
+    for (i = order - 1; i >= 0; i--) {
         pred_Q10 = silk_RSHIFT( silk_SMULBB( out_Q10, (oac_int16)pred_coef_Q8[ i ] ), 8 );
         out_Q10  = silk_LSHIFT( indices[ i ], 10 );
-        if( out_Q10 > 0 ) {
-            out_Q10 = silk_SUB16( out_Q10, SILK_FIX_CONST( NLSF_QUANT_LEVEL_ADJ, 10 ) );
-        } else if( out_Q10 < 0 ) {
-            out_Q10 = silk_ADD16( out_Q10, SILK_FIX_CONST( NLSF_QUANT_LEVEL_ADJ, 10 ) );
+        if (out_Q10 > 0) {
+            out_Q10 = silk_SUB16( out_Q10, SILK_FIX_CONST( NLSF_QUANT_LEVEL_ADJ, 10 ));
+        } else if (out_Q10 < 0) {
+            out_Q10 = silk_ADD16( out_Q10, SILK_FIX_CONST( NLSF_QUANT_LEVEL_ADJ, 10 ));
         }
         out_Q10  = silk_SMLAWB( pred_Q10, (oac_int32)out_Q10, quant_step_size_Q16 );
         x_Q10[ i ] = out_Q10;
@@ -61,16 +60,15 @@ static OAC_INLINE void silk_NLSF_residual_dequant(          /* O    Returns RD v
 /* NLSF vector decoder */
 /***********************/
 void silk_NLSF_decode(
-          oac_int16            *pNLSF_Q15,                     /* O    Quantized NLSF vector [ LPC_ORDER ]         */
-          oac_int8             *NLSFIndices,                   /* I    Codebook path vector [ LPC_ORDER + 1 ]      */
+    oac_int16            *pNLSF_Q15,                           /* O    Quantized NLSF vector [ LPC_ORDER ]         */
+    oac_int8             *NLSFIndices,                         /* I    Codebook path vector [ LPC_ORDER + 1 ]      */
     const silk_NLSF_CB_struct   *psNLSF_CB                      /* I    Codebook object                             */
-)
-{
-    oac_int         i;
-    oac_uint8       pred_Q8[  MAX_LPC_ORDER ];
-    oac_int16       ec_ix[    MAX_LPC_ORDER ];
-    oac_int16       res_Q10[  MAX_LPC_ORDER ];
-    oac_int32       NLSF_Q15_tmp;
+    ) {
+    oac_int i;
+    oac_uint8 pred_Q8[  MAX_LPC_ORDER ];
+    oac_int16 ec_ix[    MAX_LPC_ORDER ];
+    oac_int16 res_Q10[  MAX_LPC_ORDER ];
+    oac_int32 NLSF_Q15_tmp;
     const oac_uint8 *pCB_element;
     const oac_int16 *pCB_Wght_Q9;
 
@@ -81,10 +79,11 @@ void silk_NLSF_decode(
     silk_NLSF_residual_dequant( res_Q10, &NLSFIndices[ 1 ], pred_Q8, psNLSF_CB->quantStepSize_Q16, psNLSF_CB->order );
 
     /* Apply inverse square-rooted weights to first stage and add to output */
-    pCB_element = &psNLSF_CB->CB1_NLSF_Q8[ NLSFIndices[ 0 ] * psNLSF_CB->order ];
-    pCB_Wght_Q9 = &psNLSF_CB->CB1_Wght_Q9[ NLSFIndices[ 0 ] * psNLSF_CB->order ];
-    for( i = 0; i < psNLSF_CB->order; i++ ) {
-        NLSF_Q15_tmp = silk_ADD_LSHIFT32( silk_DIV32_16( silk_LSHIFT( (oac_int32)res_Q10[ i ], 14 ), pCB_Wght_Q9[ i ] ), (oac_int16)pCB_element[ i ], 7 );
+    pCB_element = &psNLSF_CB->CB1_NLSF_Q8[ NLSFIndices[ 0 ]*psNLSF_CB->order ];
+    pCB_Wght_Q9 = &psNLSF_CB->CB1_Wght_Q9[ NLSFIndices[ 0 ]*psNLSF_CB->order ];
+    for (i = 0; i < psNLSF_CB->order; i++) {
+        NLSF_Q15_tmp = silk_ADD_LSHIFT32( silk_DIV32_16( silk_LSHIFT((oac_int32)res_Q10[ i ], 14 ), pCB_Wght_Q9[ i ] ),
+            (oac_int16)pCB_element[ i ], 7 );
         pNLSF_Q15[ i ] = (oac_int16)silk_LIMIT( NLSF_Q15_tmp, 0, 32767 );
     }
 
diff --git a/silk/NLSF_del_dec_quant.c b/silk/NLSF_del_dec_quant.c
index 1ac9ac75e..83f9cca34 100644
--- a/silk/NLSF_del_dec_quant.c
+++ b/silk/NLSF_del_dec_quant.c
@@ -1,97 +1,97 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
 
 /* Delayed-decision quantizer for NLSF residuals */
 oac_int32 silk_NLSF_del_dec_quant(                             /* O    Returns RD value in Q25                     */
-    oac_int8                   indices[],                      /* O    Quantization indices [ order ]              */
-    const oac_int16            x_Q10[],                        /* I    Input [ order ]                             */
-    const oac_int16            w_Q5[],                         /* I    Weights [ order ]                           */
-    const oac_uint8            pred_coef_Q8[],                 /* I    Backward predictor coefs [ order ]          */
-    const oac_int16            ec_ix[],                        /* I    Indices to entropy coding tables [ order ]  */
-    const oac_uint8            ec_rates_Q5[],                  /* I    Rates []                                    */
-    const oac_int              quant_step_size_Q16,            /* I    Quantization step size                      */
-    const oac_int16            inv_quant_step_size_Q6,         /* I    Inverse quantization step size              */
-    const oac_int32            mu_Q20,                         /* I    R/D tradeoff                                */
-    const oac_int16            order                           /* I    Number of input values                      */
-)
-{
-    oac_int         i, j, nStates, ind_tmp, ind_min_max, ind_max_min, in_Q10, res_Q10;
-    oac_int         pred_Q10, diff_Q10, rate0_Q5, rate1_Q5;
-    oac_int16       out0_Q10, out1_Q10;
-    oac_int32       RD_tmp_Q25, min_Q25, min_max_Q25, max_min_Q25;
-    oac_int         ind_sort[         NLSF_QUANT_DEL_DEC_STATES ];
-    oac_int8        ind[              NLSF_QUANT_DEL_DEC_STATES ][ MAX_LPC_ORDER ];
-    oac_int16       prev_out_Q10[ 2 * NLSF_QUANT_DEL_DEC_STATES ];
-    oac_int32       RD_Q25[       2 * NLSF_QUANT_DEL_DEC_STATES ];
-    oac_int32       RD_min_Q25[       NLSF_QUANT_DEL_DEC_STATES ];
-    oac_int32       RD_max_Q25[       NLSF_QUANT_DEL_DEC_STATES ];
+    oac_int8 indices[],                                        /* O    Quantization indices [ order ]              */
+    const oac_int16 x_Q10[],                                   /* I    Input [ order ]                             */
+    const oac_int16 w_Q5[],                                    /* I    Weights [ order ]                           */
+    const oac_uint8 pred_coef_Q8[],                            /* I    Backward predictor coefs [ order ]          */
+    const oac_int16 ec_ix[],                                   /* I    Indices to entropy coding tables [ order ]  */
+    const oac_uint8 ec_rates_Q5[],                             /* I    Rates []                                    */
+    const oac_int quant_step_size_Q16,                         /* I    Quantization step size                      */
+    const oac_int16 inv_quant_step_size_Q6,                    /* I    Inverse quantization step size              */
+    const oac_int32 mu_Q20,                                    /* I    R/D tradeoff                                */
+    const oac_int16 order                                      /* I    Number of input values                      */
+    ) {
+    oac_int i, j, nStates, ind_tmp, ind_min_max, ind_max_min, in_Q10, res_Q10;
+    oac_int pred_Q10, diff_Q10, rate0_Q5, rate1_Q5;
+    oac_int16 out0_Q10, out1_Q10;
+    oac_int32 RD_tmp_Q25, min_Q25, min_max_Q25, max_min_Q25;
+    oac_int ind_sort[         NLSF_QUANT_DEL_DEC_STATES ];
+    oac_int8 ind[              NLSF_QUANT_DEL_DEC_STATES ][ MAX_LPC_ORDER ];
+    oac_int16 prev_out_Q10[ 2*NLSF_QUANT_DEL_DEC_STATES ];
+    oac_int32 RD_Q25[       2*NLSF_QUANT_DEL_DEC_STATES ];
+    oac_int32 RD_min_Q25[       NLSF_QUANT_DEL_DEC_STATES ];
+    oac_int32 RD_max_Q25[       NLSF_QUANT_DEL_DEC_STATES ];
     const oac_uint8 *rates_Q5;
 
-    oac_int out0_Q10_table[2 * NLSF_QUANT_MAX_AMPLITUDE_EXT];
-    oac_int out1_Q10_table[2 * NLSF_QUANT_MAX_AMPLITUDE_EXT];
+    oac_int out0_Q10_table[2*NLSF_QUANT_MAX_AMPLITUDE_EXT];
+    oac_int out1_Q10_table[2*NLSF_QUANT_MAX_AMPLITUDE_EXT];
 
-    for (i = -NLSF_QUANT_MAX_AMPLITUDE_EXT; i <= NLSF_QUANT_MAX_AMPLITUDE_EXT-1; i++)
-    {
+    for (i = -NLSF_QUANT_MAX_AMPLITUDE_EXT; i <= NLSF_QUANT_MAX_AMPLITUDE_EXT - 1; i++) {
         out0_Q10 = silk_LSHIFT( i, 10 );
         out1_Q10 = silk_ADD16( out0_Q10, 1024 );
-        if( i > 0 ) {
-            out0_Q10 = silk_SUB16( out0_Q10, SILK_FIX_CONST( NLSF_QUANT_LEVEL_ADJ, 10 ) );
-            out1_Q10 = silk_SUB16( out1_Q10, SILK_FIX_CONST( NLSF_QUANT_LEVEL_ADJ, 10 ) );
-        } else if( i == 0 ) {
-            out1_Q10 = silk_SUB16( out1_Q10, SILK_FIX_CONST( NLSF_QUANT_LEVEL_ADJ, 10 ) );
-        } else if( i == -1 ) {
-            out0_Q10 = silk_ADD16( out0_Q10, SILK_FIX_CONST( NLSF_QUANT_LEVEL_ADJ, 10 ) );
+        if (i > 0) {
+            out0_Q10 = silk_SUB16( out0_Q10, SILK_FIX_CONST( NLSF_QUANT_LEVEL_ADJ, 10 ));
+            out1_Q10 = silk_SUB16( out1_Q10, SILK_FIX_CONST( NLSF_QUANT_LEVEL_ADJ, 10 ));
+        } else if (i == 0) {
+            out1_Q10 = silk_SUB16( out1_Q10, SILK_FIX_CONST( NLSF_QUANT_LEVEL_ADJ, 10 ));
+        } else if (i == -1) {
+            out0_Q10 = silk_ADD16( out0_Q10, SILK_FIX_CONST( NLSF_QUANT_LEVEL_ADJ, 10 ));
         } else {
-            out0_Q10 = silk_ADD16( out0_Q10, SILK_FIX_CONST( NLSF_QUANT_LEVEL_ADJ, 10 ) );
-            out1_Q10 = silk_ADD16( out1_Q10, SILK_FIX_CONST( NLSF_QUANT_LEVEL_ADJ, 10 ) );
+            out0_Q10 = silk_ADD16( out0_Q10, SILK_FIX_CONST( NLSF_QUANT_LEVEL_ADJ, 10 ));
+            out1_Q10 = silk_ADD16( out1_Q10, SILK_FIX_CONST( NLSF_QUANT_LEVEL_ADJ, 10 ));
         }
-        out0_Q10_table[ i + NLSF_QUANT_MAX_AMPLITUDE_EXT ] = silk_RSHIFT( silk_SMULBB( out0_Q10, quant_step_size_Q16 ), 16 );
-        out1_Q10_table[ i + NLSF_QUANT_MAX_AMPLITUDE_EXT ] = silk_RSHIFT( silk_SMULBB( out1_Q10, quant_step_size_Q16 ), 16 );
+        out0_Q10_table[ i + NLSF_QUANT_MAX_AMPLITUDE_EXT ] = silk_RSHIFT( silk_SMULBB( out0_Q10, quant_step_size_Q16 ),
+        16 );
+        out1_Q10_table[ i + NLSF_QUANT_MAX_AMPLITUDE_EXT ] = silk_RSHIFT( silk_SMULBB( out1_Q10, quant_step_size_Q16 ),
+        16 );
     }
 
-    silk_assert( (NLSF_QUANT_DEL_DEC_STATES & (NLSF_QUANT_DEL_DEC_STATES-1)) == 0 );     /* must be power of two */
+    silk_assert((NLSF_QUANT_DEL_DEC_STATES&(NLSF_QUANT_DEL_DEC_STATES - 1)) == 0 );      /* must be power of two */
 
     nStates = 1;
     RD_Q25[ 0 ] = 0;
     prev_out_Q10[ 0 ] = 0;
-    for( i = order - 1; i >= 0; i-- ) {
+    for (i = order - 1; i >= 0; i--) {
         rates_Q5 = &ec_rates_Q5[ ec_ix[ i ] ];
         in_Q10 = x_Q10[ i ];
-        for( j = 0; j < nStates; j++ ) {
-            pred_Q10 = silk_RSHIFT( silk_SMULBB( (oac_int16)pred_coef_Q8[ i ], prev_out_Q10[ j ] ), 8 );
+        for (j = 0; j < nStates; j++) {
+            pred_Q10 = silk_RSHIFT( silk_SMULBB((oac_int16)pred_coef_Q8[ i ], prev_out_Q10[ j ] ), 8 );
             res_Q10  = silk_SUB16( in_Q10, pred_Q10 );
             ind_tmp  = silk_RSHIFT( silk_SMULBB( inv_quant_step_size_Q6, res_Q10 ), 16 );
-            ind_tmp  = silk_LIMIT( ind_tmp, -NLSF_QUANT_MAX_AMPLITUDE_EXT, NLSF_QUANT_MAX_AMPLITUDE_EXT-1 );
+            ind_tmp  = silk_LIMIT( ind_tmp, -NLSF_QUANT_MAX_AMPLITUDE_EXT, NLSF_QUANT_MAX_AMPLITUDE_EXT - 1 );
             ind[ j ][ i ] = (oac_int8)ind_tmp;
 
             /* compute outputs for ind_tmp and ind_tmp + 1 */
@@ -104,20 +104,20 @@ oac_int32 silk_NLSF_del_dec_quant(                             /* O    Returns R
             prev_out_Q10[ j + nStates ] = out1_Q10;
 
             /* compute RD for ind_tmp and ind_tmp + 1 */
-            if( ind_tmp + 1 >= NLSF_QUANT_MAX_AMPLITUDE ) {
-                if( ind_tmp + 1 == NLSF_QUANT_MAX_AMPLITUDE ) {
+            if (ind_tmp + 1 >= NLSF_QUANT_MAX_AMPLITUDE) {
+                if (ind_tmp + 1 == NLSF_QUANT_MAX_AMPLITUDE) {
                     rate0_Q5 = rates_Q5[ ind_tmp + NLSF_QUANT_MAX_AMPLITUDE ];
                     rate1_Q5 = 280;
                 } else {
-                    rate0_Q5 = silk_SMLABB( 280 - 43 * NLSF_QUANT_MAX_AMPLITUDE, 43, ind_tmp );
+                    rate0_Q5 = silk_SMLABB( 280 - 43*NLSF_QUANT_MAX_AMPLITUDE, 43, ind_tmp );
                     rate1_Q5 = silk_ADD16( rate0_Q5, 43 );
                 }
-            } else if( ind_tmp <= -NLSF_QUANT_MAX_AMPLITUDE ) {
-                if( ind_tmp == -NLSF_QUANT_MAX_AMPLITUDE ) {
+            } else if (ind_tmp <= -NLSF_QUANT_MAX_AMPLITUDE) {
+                if (ind_tmp == -NLSF_QUANT_MAX_AMPLITUDE) {
                     rate0_Q5 = 280;
                     rate1_Q5 = rates_Q5[ ind_tmp + 1 + NLSF_QUANT_MAX_AMPLITUDE ];
                 } else {
-                    rate0_Q5 = silk_SMLABB( 280 - 43 * NLSF_QUANT_MAX_AMPLITUDE, -43, ind_tmp );
+                    rate0_Q5 = silk_SMLABB( 280 - 43*NLSF_QUANT_MAX_AMPLITUDE, -43, ind_tmp );
                     rate1_Q5 = silk_SUB16( rate0_Q5, 43 );
                 }
             } else {
@@ -126,24 +126,26 @@ oac_int32 silk_NLSF_del_dec_quant(                             /* O    Returns R
             }
             RD_tmp_Q25            = RD_Q25[ j ];
             diff_Q10              = silk_SUB16( in_Q10, out0_Q10 );
-            RD_Q25[ j ]           = silk_SMLABB( silk_MLA( RD_tmp_Q25, silk_SMULBB( diff_Q10, diff_Q10 ), w_Q5[ i ] ), mu_Q20, rate0_Q5 );
+            RD_Q25[ j ]           = silk_SMLABB( silk_MLA( RD_tmp_Q25, silk_SMULBB( diff_Q10, diff_Q10 ), w_Q5[ i ] ),
+            mu_Q20, rate0_Q5 );
             diff_Q10              = silk_SUB16( in_Q10, out1_Q10 );
-            RD_Q25[ j + nStates ] = silk_SMLABB( silk_MLA( RD_tmp_Q25, silk_SMULBB( diff_Q10, diff_Q10 ), w_Q5[ i ] ), mu_Q20, rate1_Q5 );
+            RD_Q25[ j + nStates ] = silk_SMLABB( silk_MLA( RD_tmp_Q25, silk_SMULBB( diff_Q10, diff_Q10 ), w_Q5[ i ] ),
+            mu_Q20, rate1_Q5 );
         }
 
-        if( nStates <= NLSF_QUANT_DEL_DEC_STATES/2 ) {
+        if (nStates <= NLSF_QUANT_DEL_DEC_STATES/2) {
             /* double number of states and copy */
-            for( j = 0; j < nStates; j++ ) {
+            for (j = 0; j < nStates; j++) {
                 ind[ j + nStates ][ i ] = ind[ j ][ i ] + 1;
             }
             nStates = silk_LSHIFT( nStates, 1 );
-            for( j = nStates; j < NLSF_QUANT_DEL_DEC_STATES; j++ ) {
+            for (j = nStates; j < NLSF_QUANT_DEL_DEC_STATES; j++) {
                 ind[ j ][ i ] = ind[ j - nStates ][ i ];
             }
         } else {
             /* sort lower and upper half of RD_Q25, pairwise */
-            for( j = 0; j < NLSF_QUANT_DEL_DEC_STATES; j++ ) {
-                if( RD_Q25[ j ] > RD_Q25[ j + NLSF_QUANT_DEL_DEC_STATES ] ) {
+            for (j = 0; j < NLSF_QUANT_DEL_DEC_STATES; j++) {
+                if (RD_Q25[ j ] > RD_Q25[ j + NLSF_QUANT_DEL_DEC_STATES ]) {
                     RD_max_Q25[ j ]                         = RD_Q25[ j ];
                     RD_min_Q25[ j ]                         = RD_Q25[ j + NLSF_QUANT_DEL_DEC_STATES ];
                     RD_Q25[ j ]                             = RD_min_Q25[ j ];
@@ -161,34 +163,34 @@ oac_int32 silk_NLSF_del_dec_quant(                             /* O    Returns R
             }
             /* compare the highest RD values of the winning half with the lowest one in the losing half, and copy if necessary */
             /* afterwards ind_sort[] will contain the indices of the NLSF_QUANT_DEL_DEC_STATES winning RD values */
-            while( 1 ) {
+            while (1) {
                 min_max_Q25 = silk_int32_MAX;
                 max_min_Q25 = 0;
                 ind_min_max = 0;
                 ind_max_min = 0;
-                for( j = 0; j < NLSF_QUANT_DEL_DEC_STATES; j++ ) {
-                    if( min_max_Q25 > RD_max_Q25[ j ] ) {
+                for (j = 0; j < NLSF_QUANT_DEL_DEC_STATES; j++) {
+                    if (min_max_Q25 > RD_max_Q25[ j ]) {
                         min_max_Q25 = RD_max_Q25[ j ];
                         ind_min_max = j;
                     }
-                    if( max_min_Q25 < RD_min_Q25[ j ] ) {
+                    if (max_min_Q25 < RD_min_Q25[ j ]) {
                         max_min_Q25 = RD_min_Q25[ j ];
                         ind_max_min = j;
                     }
                 }
-                if( min_max_Q25 >= max_min_Q25 ) {
+                if (min_max_Q25 >= max_min_Q25) {
                     break;
                 }
                 /* copy ind_min_max to ind_max_min */
-                ind_sort[     ind_max_min ] = ind_sort[     ind_min_max ] ^ NLSF_QUANT_DEL_DEC_STATES;
+                ind_sort[     ind_max_min ] = ind_sort[     ind_min_max ]^NLSF_QUANT_DEL_DEC_STATES;
                 RD_Q25[       ind_max_min ] = RD_Q25[       ind_min_max + NLSF_QUANT_DEL_DEC_STATES ];
                 prev_out_Q10[ ind_max_min ] = prev_out_Q10[ ind_min_max + NLSF_QUANT_DEL_DEC_STATES ];
                 RD_min_Q25[   ind_max_min ] = 0;
                 RD_max_Q25[   ind_min_max ] = silk_int32_MAX;
-                silk_memcpy( ind[ ind_max_min ], ind[ ind_min_max ], MAX_LPC_ORDER * sizeof( oac_int8 ) );
+                silk_memcpy( ind[ ind_max_min ], ind[ ind_min_max ], MAX_LPC_ORDER*sizeof(oac_int8));
             }
             /* increment index if it comes from the upper half */
-            for( j = 0; j < NLSF_QUANT_DEL_DEC_STATES; j++ ) {
+            for (j = 0; j < NLSF_QUANT_DEL_DEC_STATES; j++) {
                 ind[ j ][ i ] += silk_RSHIFT( ind_sort[ j ], NLSF_QUANT_DEL_DEC_STATES_LOG2 );
             }
         }
@@ -197,14 +199,14 @@ oac_int32 silk_NLSF_del_dec_quant(                             /* O    Returns R
     /* last sample: find winner, copy indices and return RD value */
     ind_tmp = 0;
     min_Q25 = silk_int32_MAX;
-    for( j = 0; j < 2 * NLSF_QUANT_DEL_DEC_STATES; j++ ) {
-        if( min_Q25 > RD_Q25[ j ] ) {
+    for (j = 0; j < 2*NLSF_QUANT_DEL_DEC_STATES; j++) {
+        if (min_Q25 > RD_Q25[ j ]) {
             min_Q25 = RD_Q25[ j ];
             ind_tmp = j;
         }
     }
-    for( j = 0; j < order; j++ ) {
-        indices[ j ] = ind[ ind_tmp & ( NLSF_QUANT_DEL_DEC_STATES - 1 ) ][ j ];
+    for (j = 0; j < order; j++) {
+        indices[ j ] = ind[ ind_tmp&(NLSF_QUANT_DEL_DEC_STATES - 1) ][ j ];
         silk_assert( indices[ j ] >= -NLSF_QUANT_MAX_AMPLITUDE_EXT );
         silk_assert( indices[ j ] <=  NLSF_QUANT_MAX_AMPLITUDE_EXT );
     }
diff --git a/silk/NLSF_encode.c b/silk/NLSF_encode.c
index dd8ee84be..7aa48bf9e 100644
--- a/silk/NLSF_encode.c
+++ b/silk/NLSF_encode.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -36,26 +36,25 @@ POSSIBILITY OF SUCH DAMAGE.
 /* NLSF vector encoder */
 /***********************/
 oac_int32 silk_NLSF_encode(                                    /* O    Returns RD value in Q25                     */
-          oac_int8             *NLSFIndices,                   /* I    Codebook path vector [ LPC_ORDER + 1 ]      */
-          oac_int16            *pNLSF_Q15,                     /* I/O  (Un)quantized NLSF vector [ LPC_ORDER ]     */
+    oac_int8             *NLSFIndices,                         /* I    Codebook path vector [ LPC_ORDER + 1 ]      */
+    oac_int16            *pNLSF_Q15,                           /* I/O  (Un)quantized NLSF vector [ LPC_ORDER ]     */
     const silk_NLSF_CB_struct   *psNLSF_CB,                     /* I    Codebook object                             */
     const oac_int16            *pW_Q2,                         /* I    NLSF weight vector [ LPC_ORDER ]            */
-    const oac_int              NLSF_mu_Q20,                    /* I    Rate weight for the RD optimization         */
-    const oac_int              nSurvivors,                     /* I    Max survivors after first stage             */
-    const oac_int              signalType                      /* I    Signal type: 0/1/2                          */
-)
-{
-    oac_int         i, s, ind1, bestIndex, prob_Q8, bits_q7;
-    oac_int32       W_tmp_Q9, ret;
+    const oac_int NLSF_mu_Q20,                                 /* I    Rate weight for the RD optimization         */
+    const oac_int nSurvivors,                                  /* I    Max survivors after first stage             */
+    const oac_int signalType                                   /* I    Signal type: 0/1/2                          */
+    ) {
+    oac_int i, s, ind1, bestIndex, prob_Q8, bits_q7;
+    oac_int32 W_tmp_Q9, ret;
     VARDECL( oac_int32, err_Q24 );
     VARDECL( oac_int32, RD_Q25 );
     VARDECL( oac_int, tempIndices1 );
     VARDECL( oac_int8, tempIndices2 );
-    oac_int16       res_Q10[      MAX_LPC_ORDER ];
-    oac_int16       NLSF_tmp_Q15[ MAX_LPC_ORDER ];
-    oac_int16       W_adj_Q5[     MAX_LPC_ORDER ];
-    oac_uint8       pred_Q8[      MAX_LPC_ORDER ];
-    oac_int16       ec_ix[        MAX_LPC_ORDER ];
+    oac_int16 res_Q10[      MAX_LPC_ORDER ];
+    oac_int16 NLSF_tmp_Q15[ MAX_LPC_ORDER ];
+    oac_int16 W_adj_Q5[     MAX_LPC_ORDER ];
+    oac_uint8 pred_Q8[      MAX_LPC_ORDER ];
+    oac_int16 ec_ix[        MAX_LPC_ORDER ];
     const oac_uint8 *pCB_element, *iCDF_ptr;
     const oac_int16 *pCB_Wght_Q9;
     SAVE_STACK;
@@ -68,52 +67,54 @@ oac_int32 silk_NLSF_encode(                                    /* O    Returns R
 
     /* First stage: VQ */
     ALLOC( err_Q24, psNLSF_CB->nVectors, oac_int32 );
-    silk_NLSF_VQ( err_Q24, pNLSF_Q15, psNLSF_CB->CB1_NLSF_Q8, psNLSF_CB->CB1_Wght_Q9, psNLSF_CB->nVectors, psNLSF_CB->order );
+    silk_NLSF_VQ( err_Q24, pNLSF_Q15, psNLSF_CB->CB1_NLSF_Q8, psNLSF_CB->CB1_Wght_Q9, psNLSF_CB->nVectors,
+    psNLSF_CB->order );
 
     /* Sort the quantization errors */
     ALLOC( tempIndices1, nSurvivors, oac_int );
     silk_insertion_sort_increasing( err_Q24, tempIndices1, psNLSF_CB->nVectors, nSurvivors );
 
     ALLOC( RD_Q25, nSurvivors, oac_int32 );
-    ALLOC( tempIndices2, nSurvivors * MAX_LPC_ORDER, oac_int8 );
+    ALLOC( tempIndices2, nSurvivors*MAX_LPC_ORDER, oac_int8 );
 
     /* Loop over survivors */
-    for( s = 0; s < nSurvivors; s++ ) {
+    for (s = 0; s < nSurvivors; s++) {
         ind1 = tempIndices1[ s ];
 
         /* Residual after first stage */
-        pCB_element = &psNLSF_CB->CB1_NLSF_Q8[ ind1 * psNLSF_CB->order ];
-        pCB_Wght_Q9 = &psNLSF_CB->CB1_Wght_Q9[ ind1 * psNLSF_CB->order ];
-        for( i = 0; i < psNLSF_CB->order; i++ ) {
-            NLSF_tmp_Q15[ i ] = silk_LSHIFT16( (oac_int16)pCB_element[ i ], 7 );
+        pCB_element = &psNLSF_CB->CB1_NLSF_Q8[ ind1*psNLSF_CB->order ];
+        pCB_Wght_Q9 = &psNLSF_CB->CB1_Wght_Q9[ ind1*psNLSF_CB->order ];
+        for (i = 0; i < psNLSF_CB->order; i++) {
+            NLSF_tmp_Q15[ i ] = silk_LSHIFT16((oac_int16)pCB_element[ i ], 7 );
             W_tmp_Q9 = pCB_Wght_Q9[ i ];
             res_Q10[ i ] = (oac_int16)silk_RSHIFT( silk_SMULBB( pNLSF_Q15[ i ] - NLSF_tmp_Q15[ i ], W_tmp_Q9 ), 14 );
-            W_adj_Q5[ i ] = silk_DIV32_varQ( (oac_int32)pW_Q2[ i ], silk_SMULBB( W_tmp_Q9, W_tmp_Q9 ), 21 );
+            W_adj_Q5[ i ] = silk_DIV32_varQ((oac_int32)pW_Q2[ i ], silk_SMULBB( W_tmp_Q9, W_tmp_Q9 ), 21 );
         }
 
         /* Unpack entropy table indices and predictor for current CB1 index */
         silk_NLSF_unpack( ec_ix, pred_Q8, psNLSF_CB, ind1 );
 
         /* Trellis quantizer */
-        RD_Q25[ s ] = silk_NLSF_del_dec_quant( &tempIndices2[ s * MAX_LPC_ORDER ], res_Q10, W_adj_Q5, pred_Q8, ec_ix,
-            psNLSF_CB->ec_Rates_Q5, psNLSF_CB->quantStepSize_Q16, psNLSF_CB->invQuantStepSize_Q6, NLSF_mu_Q20, psNLSF_CB->order );
+        RD_Q25[ s ] = silk_NLSF_del_dec_quant( &tempIndices2[ s*MAX_LPC_ORDER ], res_Q10, W_adj_Q5, pred_Q8, ec_ix,
+            psNLSF_CB->ec_Rates_Q5, psNLSF_CB->quantStepSize_Q16, psNLSF_CB->invQuantStepSize_Q6, NLSF_mu_Q20,
+        psNLSF_CB->order );
 
         /* Add rate for first stage */
-        iCDF_ptr = &psNLSF_CB->CB1_iCDF[ ( signalType >> 1 ) * psNLSF_CB->nVectors ];
-        if( ind1 == 0 ) {
+        iCDF_ptr = &psNLSF_CB->CB1_iCDF[ (signalType>>1)*psNLSF_CB->nVectors ];
+        if (ind1 == 0) {
             prob_Q8 = 256 - iCDF_ptr[ ind1 ];
         } else {
             prob_Q8 = iCDF_ptr[ ind1 - 1 ] - iCDF_ptr[ ind1 ];
         }
-        bits_q7 = ( 8 << 7 ) - silk_lin2log( prob_Q8 );
-        RD_Q25[ s ] = silk_SMLABB( RD_Q25[ s ], bits_q7, silk_RSHIFT( NLSF_mu_Q20, 2 ) );
+        bits_q7 = (8<<7) - silk_lin2log( prob_Q8 );
+        RD_Q25[ s ] = silk_SMLABB( RD_Q25[ s ], bits_q7, silk_RSHIFT( NLSF_mu_Q20, 2 ));
     }
 
     /* Find the lowest rate-distortion error */
     silk_insertion_sort_increasing( RD_Q25, &bestIndex, nSurvivors, 1 );
 
     NLSFIndices[ 0 ] = (oac_int8)tempIndices1[ bestIndex ];
-    silk_memcpy( &NLSFIndices[ 1 ], &tempIndices2[ bestIndex * MAX_LPC_ORDER ], psNLSF_CB->order * sizeof( oac_int8 ) );
+    silk_memcpy( &NLSFIndices[ 1 ], &tempIndices2[ bestIndex*MAX_LPC_ORDER ], psNLSF_CB->order*sizeof(oac_int8));
 
     /* Decode */
     silk_NLSF_decode( pNLSF_Q15, NLSFIndices, psNLSF_CB );
diff --git a/silk/NLSF_stabilize.c b/silk/NLSF_stabilize.c
index 48b25f2f4..278bed595 100644
--- a/silk/NLSF_stabilize.c
+++ b/silk/NLSF_stabilize.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 /* NLSF stabilizer:                                         */
@@ -45,19 +45,18 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* NLSF stabilizer, for a single input data vector */
 void silk_NLSF_stabilize(
-          oac_int16            *NLSF_Q15,          /* I/O   Unstable/stabilized normalized LSF vector in Q15 [L]       */
+    oac_int16            *NLSF_Q15,                /* I/O   Unstable/stabilized normalized LSF vector in Q15 [L]       */
     const oac_int16            *NDeltaMin_Q15,     /* I     Min distance vector, NDeltaMin_Q15[L] must be >= 1 [L+1]   */
-    const oac_int              L                   /* I     Number of NLSF parameters in the input vector              */
-)
-{
-    oac_int   i, I=0, k, loops;
+    const oac_int L                                /* I     Number of NLSF parameters in the input vector              */
+    ) {
+    oac_int i, I = 0, k, loops;
     oac_int16 center_freq_Q15;
     oac_int32 diff_Q15, min_diff_Q15, min_center_Q15, max_center_Q15;
 
     /* This is necessary to ensure an output within range of a oac_int16 */
     silk_assert( NDeltaMin_Q15[L] >= 1 );
 
-    for( loops = 0; loops < MAX_LOOPS; loops++ ) {
+    for (loops = 0; loops < MAX_LOOPS; loops++) {
         /**************************/
         /* Find smallest distance */
         /**************************/
@@ -65,16 +64,16 @@ void silk_NLSF_stabilize(
         min_diff_Q15 = NLSF_Q15[0] - NDeltaMin_Q15[0];
         I = 0;
         /* Middle elements */
-        for( i = 1; i <= L-1; i++ ) {
-            diff_Q15 = NLSF_Q15[i] - ( NLSF_Q15[i-1] + NDeltaMin_Q15[i] );
-            if( diff_Q15 < min_diff_Q15 ) {
+        for (i = 1; i <= L - 1; i++) {
+            diff_Q15 = NLSF_Q15[i] - (NLSF_Q15[i - 1] + NDeltaMin_Q15[i]);
+            if (diff_Q15 < min_diff_Q15) {
                 min_diff_Q15 = diff_Q15;
                 I = i;
             }
         }
         /* Last element */
-        diff_Q15 = ( 1 << 15 ) - ( NLSF_Q15[L-1] + NDeltaMin_Q15[L] );
-        if( diff_Q15 < min_diff_Q15 ) {
+        diff_Q15 = (1<<15) - (NLSF_Q15[L - 1] + NDeltaMin_Q15[L]);
+        if (diff_Q15 < min_diff_Q15) {
             min_diff_Q15 = diff_Q15;
             I = L;
         }
@@ -82,44 +81,44 @@ void silk_NLSF_stabilize(
         /***************************************************/
         /* Now check if the smallest distance non-negative */
         /***************************************************/
-        if( min_diff_Q15 >= 0 ) {
+        if (min_diff_Q15 >= 0) {
             return;
         }
 
-        if( I == 0 ) {
+        if (I == 0) {
             /* Move away from lower limit */
             NLSF_Q15[0] = NDeltaMin_Q15[0];
 
-        } else if( I == L) {
+        } else if (I == L) {
             /* Move away from higher limit */
-            NLSF_Q15[L-1] = ( 1 << 15 ) - NDeltaMin_Q15[L];
+            NLSF_Q15[L - 1] = (1<<15) - NDeltaMin_Q15[L];
 
         } else {
             /* Find the lower extreme for the location of the current center frequency */
             min_center_Q15 = 0;
-            for( k = 0; k < I; k++ ) {
+            for (k = 0; k < I; k++) {
                 min_center_Q15 += NDeltaMin_Q15[k];
             }
             min_center_Q15 += silk_RSHIFT( NDeltaMin_Q15[I], 1 );
 
             /* Find the upper extreme for the location of the current center frequency */
-            max_center_Q15 = 1 << 15;
-            for( k = L; k > I; k-- ) {
+            max_center_Q15 = 1<<15;
+            for (k = L; k > I; k--) {
                 max_center_Q15 -= NDeltaMin_Q15[k];
             }
             max_center_Q15 -= silk_RSHIFT( NDeltaMin_Q15[I], 1 );
 
             /* Move apart, sorted by value, keeping the same center frequency */
-            center_freq_Q15 = (oac_int16)silk_LIMIT_32( silk_RSHIFT_ROUND( (oac_int32)NLSF_Q15[I-1] + (oac_int32)NLSF_Q15[I], 1 ),
+            center_freq_Q15 = (oac_int16)silk_LIMIT_32( silk_RSHIFT_ROUND((oac_int32)NLSF_Q15[I - 1]
+                + (oac_int32)NLSF_Q15[I], 1 ),
                 min_center_Q15, max_center_Q15 );
-            NLSF_Q15[I-1] = center_freq_Q15 - silk_RSHIFT( NDeltaMin_Q15[I], 1 );
-            NLSF_Q15[I] = NLSF_Q15[I-1] + NDeltaMin_Q15[I];
+            NLSF_Q15[I - 1] = center_freq_Q15 - silk_RSHIFT( NDeltaMin_Q15[I], 1 );
+            NLSF_Q15[I] = NLSF_Q15[I - 1] + NDeltaMin_Q15[I];
         }
     }
 
     /* Safe and simple fall back method, which is less ideal than the above */
-    if( loops == MAX_LOOPS )
-    {
+    if (loops == MAX_LOOPS) {
         /* Insertion sort (fast for already almost sorted arrays):   */
         /* Best case:  O(n)   for an already sorted array            */
         /* Worst case: O(n^2) for an inversely sorted array          */
@@ -129,14 +128,14 @@ void silk_NLSF_stabilize(
         NLSF_Q15[0] = silk_max_int( NLSF_Q15[0], NDeltaMin_Q15[0] );
 
         /* Keep delta_min distance between the NLSFs */
-        for( i = 1; i < L; i++ )
-            NLSF_Q15[i] = silk_max_int( NLSF_Q15[i], silk_ADD_SAT16( NLSF_Q15[i-1], NDeltaMin_Q15[i] ) );
+        for (i = 1; i < L; i++)
+            NLSF_Q15[i] = silk_max_int( NLSF_Q15[i], silk_ADD_SAT16( NLSF_Q15[i - 1], NDeltaMin_Q15[i] ));
 
         /* Last NLSF should be no higher than 1 - NDeltaMin[L] */
-        NLSF_Q15[L-1] = silk_min_int( NLSF_Q15[L-1], (1<<15) - NDeltaMin_Q15[L] );
+        NLSF_Q15[L - 1] = silk_min_int( NLSF_Q15[L - 1], (1<<15) - NDeltaMin_Q15[L] );
 
         /* Keep NDeltaMin distance between the NLSFs */
-        for( i = L-2; i >= 0; i-- )
-            NLSF_Q15[i] = silk_min_int( NLSF_Q15[i], NLSF_Q15[i+1] - NDeltaMin_Q15[i+1] );
+        for (i = L - 2; i >= 0; i--)
+            NLSF_Q15[i] = silk_min_int( NLSF_Q15[i], NLSF_Q15[i + 1] - NDeltaMin_Q15[i + 1] );
     }
 }
diff --git a/silk/NLSF_unpack.c b/silk/NLSF_unpack.c
index 8e87144cf..415025632 100644
--- a/silk/NLSF_unpack.c
+++ b/silk/NLSF_unpack.c
@@ -1,54 +1,53 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
 
 /* Unpack predictor values and indices for entropy coding tables */
 void silk_NLSF_unpack(
-          oac_int16            ec_ix[],                        /* O    Indices to entropy tables [ LPC_ORDER ]     */
-          oac_uint8            pred_Q8[],                      /* O    LSF predictor [ LPC_ORDER ]                 */
+    oac_int16 ec_ix[],                                         /* O    Indices to entropy tables [ LPC_ORDER ]     */
+    oac_uint8 pred_Q8[],                                       /* O    LSF predictor [ LPC_ORDER ]                 */
     const silk_NLSF_CB_struct   *psNLSF_CB,                     /* I    Codebook object                             */
-    const oac_int              CB1_index                       /* I    Index of vector in first LSF codebook       */
-)
-{
-    oac_int   i;
+    const oac_int CB1_index                                    /* I    Index of vector in first LSF codebook       */
+    ) {
+    oac_int i;
     oac_uint8 entry;
     const oac_uint8 *ec_sel_ptr;
 
-    ec_sel_ptr = &psNLSF_CB->ec_sel[ CB1_index * psNLSF_CB->order / 2 ];
-    for( i = 0; i < psNLSF_CB->order; i += 2 ) {
+    ec_sel_ptr = &psNLSF_CB->ec_sel[ CB1_index*psNLSF_CB->order/2 ];
+    for (i = 0; i < psNLSF_CB->order; i += 2) {
         entry = *ec_sel_ptr++;
-        ec_ix  [ i     ] = silk_SMULBB( silk_RSHIFT( entry, 1 ) & 7, 2 * NLSF_QUANT_MAX_AMPLITUDE + 1 );
-        pred_Q8[ i     ] = psNLSF_CB->pred_Q8[ i + ( entry & 1 ) * ( psNLSF_CB->order - 1 ) ];
-        ec_ix  [ i + 1 ] = silk_SMULBB( silk_RSHIFT( entry, 5 ) & 7, 2 * NLSF_QUANT_MAX_AMPLITUDE + 1 );
-        pred_Q8[ i + 1 ] = psNLSF_CB->pred_Q8[ i + ( silk_RSHIFT( entry, 4 ) & 1 ) * ( psNLSF_CB->order - 1 ) + 1 ];
+        ec_ix  [ i     ] = silk_SMULBB( silk_RSHIFT( entry, 1 )&7, 2*NLSF_QUANT_MAX_AMPLITUDE + 1 );
+        pred_Q8[ i     ] = psNLSF_CB->pred_Q8[ i + (entry&1)*(psNLSF_CB->order - 1) ];
+        ec_ix  [ i + 1 ] = silk_SMULBB( silk_RSHIFT( entry, 5 )&7, 2*NLSF_QUANT_MAX_AMPLITUDE + 1 );
+        pred_Q8[ i + 1 ] = psNLSF_CB->pred_Q8[ i + (silk_RSHIFT( entry, 4 )&1)*(psNLSF_CB->order - 1) + 1 ];
     }
 }
diff --git a/silk/NSQ.c b/silk/NSQ.c
index 3ac07413c..4f5eac36c 100644
--- a/silk/NSQ.c
+++ b/silk/NSQ.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -37,40 +37,40 @@ POSSIBILITY OF SUCH DAMAGE.
 static OAC_INLINE void silk_nsq_scale_states(
     const silk_encoder_state *psEncC,           /* I    Encoder State                   */
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                       */
-    const oac_int16    x16[],                  /* I    input                           */
-    oac_int32          x_sc_Q10[],             /* O    input scaled with 1/Gain        */
-    const oac_int16    sLTP[],                 /* I    re-whitened LTP state in Q0     */
-    oac_int32          sLTP_Q15[],             /* O    LTP state matching scaled input */
-    oac_int            subfr,                  /* I    subframe number                 */
-    const oac_int      LTP_scale_Q14,          /* I                                    */
-    const oac_int32    Gains_Q16[ MAX_NB_SUBFR ], /* I                                 */
-    const oac_int      pitchL[ MAX_NB_SUBFR ], /* I    Pitch lag                       */
-    const oac_int      signal_type             /* I    Signal type                     */
-);
+    const oac_int16 x16[],                     /* I    input                           */
+    oac_int32 x_sc_Q10[],                      /* O    input scaled with 1/Gain        */
+    const oac_int16 sLTP[],                    /* I    re-whitened LTP state in Q0     */
+    oac_int32 sLTP_Q15[],                      /* O    LTP state matching scaled input */
+    oac_int subfr,                             /* I    subframe number                 */
+    const oac_int LTP_scale_Q14,               /* I                                    */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],    /* I                                 */
+    const oac_int pitchL[ MAX_NB_SUBFR ],      /* I    Pitch lag                       */
+    const oac_int signal_type                  /* I    Signal type                     */
+    );
 
 #if !defined(OAC_X86_MAY_HAVE_SSE4_1)
 static OAC_INLINE void silk_noise_shape_quantizer(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                       */
-    oac_int            signalType,             /* I    Signal type                     */
-    const oac_int32    x_sc_Q10[],             /* I                                    */
-    oac_int8           pulses[],               /* O                                    */
-    oac_int16          xq[],                   /* O                                    */
-    oac_int32          sLTP_Q15[],             /* I/O  LTP state                       */
-    const oac_int16    a_Q12[],                /* I    Short term prediction coefs     */
-    const oac_int16    b_Q14[],                /* I    Long term prediction coefs      */
-    const oac_int16    AR_shp_Q13[],           /* I    Noise shaping AR coefs          */
-    oac_int            lag,                    /* I    Pitch lag                       */
-    oac_int32          HarmShapeFIRPacked_Q14, /* I                                    */
-    oac_int            Tilt_Q14,               /* I    Spectral tilt                   */
-    oac_int32          LF_shp_Q14,             /* I                                    */
-    oac_int32          Gain_Q16,               /* I                                    */
-    oac_int            Lambda_Q10,             /* I                                    */
-    oac_int            offset_Q10,             /* I                                    */
-    oac_int            length,                 /* I    Input length                    */
-    oac_int            shapingLPCOrder,        /* I    Noise shaping AR filter order   */
-    oac_int            predictLPCOrder,        /* I    Prediction filter order         */
-    int                 arch                    /* I    Architecture                    */
-);
+    oac_int signalType,                        /* I    Signal type                     */
+    const oac_int32 x_sc_Q10[],                /* I                                    */
+    oac_int8 pulses[],                         /* O                                    */
+    oac_int16 xq[],                            /* O                                    */
+    oac_int32 sLTP_Q15[],                      /* I/O  LTP state                       */
+    const oac_int16 a_Q12[],                   /* I    Short term prediction coefs     */
+    const oac_int16 b_Q14[],                   /* I    Long term prediction coefs      */
+    const oac_int16 AR_shp_Q13[],              /* I    Noise shaping AR coefs          */
+    oac_int lag,                               /* I    Pitch lag                       */
+    oac_int32 HarmShapeFIRPacked_Q14,          /* I                                    */
+    oac_int Tilt_Q14,                          /* I    Spectral tilt                   */
+    oac_int32 LF_shp_Q14,                      /* I                                    */
+    oac_int32 Gain_Q16,                        /* I                                    */
+    oac_int Lambda_Q10,                        /* I                                    */
+    oac_int offset_Q10,                        /* I                                    */
+    oac_int length,                            /* I    Input length                    */
+    oac_int shapingLPCOrder,                   /* I    Noise shaping AR filter order   */
+    oac_int predictLPCOrder,                   /* I    Prediction filter order         */
+    int arch                                    /* I    Architecture                    */
+    );
 #endif
 
 void silk_NSQ_c
@@ -78,27 +78,26 @@ void silk_NSQ_c
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const oac_int16            x16[],                                        /* I    Input                           */
-    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16 x16[],                                                   /* I    Input                           */
+    oac_int8 pulses[],                                                       /* O    Quantized pulse signal          */
     const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
-)
-{
-    oac_int            k, lag, start_idx, LSF_interpolation_flag;
+    const oac_int16 LTPCoef_Q14[ LTP_ORDER*MAX_NB_SUBFR ],                   /* I    Long term prediction coefs      */
+    const oac_int16 AR_Q13[ MAX_NB_SUBFR*MAX_SHAPE_LPC_ORDER ],              /* I    Noise shaping coefs             */
+    const oac_int HarmShapeGain_Q14[ MAX_NB_SUBFR ],                         /* I    Long term shaping coefs         */
+    const oac_int Tilt_Q14[ MAX_NB_SUBFR ],                                  /* I    Spectral tilt                   */
+    const oac_int32 LF_shp_Q14[ MAX_NB_SUBFR ],                              /* I    Low frequency shaping coefs     */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],                               /* I    Quantization step sizes         */
+    const oac_int pitchL[ MAX_NB_SUBFR ],                                    /* I    Pitch lags                      */
+    const oac_int Lambda_Q10,                                                /* I    Rate/distortion tradeoff        */
+    const oac_int LTP_scale_Q14                                              /* I    LTP state scaling               */
+) {
+    oac_int k, lag, start_idx, LSF_interpolation_flag;
     const oac_int16    *A_Q12, *B_Q14, *AR_shp_Q13;
     oac_int16          *pxq;
     VARDECL( oac_int32, sLTP_Q15 );
     VARDECL( oac_int16, sLTP );
-    oac_int32          HarmShapeFIRPacked_Q14;
-    oac_int            offset_Q10;
+    oac_int32 HarmShapeFIRPacked_Q14;
+    oac_int offset_Q10;
     VARDECL( oac_int32, x_sc_Q10 );
     SAVE_STACK;
 
@@ -109,9 +108,9 @@ void silk_NSQ_c
 
     silk_assert( NSQ->prev_gain_Q16 != 0 );
 
-    offset_Q10 = silk_Quantization_Offsets_Q10[ psIndices->signalType >> 1 ][ psIndices->quantOffsetType ];
+    offset_Q10 = silk_Quantization_Offsets_Q10[ psIndices->signalType>>1 ][ psIndices->quantOffsetType ];
 
-    if( psIndices->NLSFInterpCoef_Q2 == 4 ) {
+    if (psIndices->NLSFInterpCoef_Q2 == 4) {
         LSF_interpolation_flag = 0;
     } else {
         LSF_interpolation_flag = 1;
@@ -124,28 +123,28 @@ void silk_NSQ_c
     NSQ->sLTP_shp_buf_idx = psEncC->ltp_mem_length;
     NSQ->sLTP_buf_idx     = psEncC->ltp_mem_length;
     pxq                   = &NSQ->xq[ psEncC->ltp_mem_length ];
-    for( k = 0; k < psEncC->nb_subfr; k++ ) {
-        A_Q12      = &PredCoef_Q12[ (( k >> 1 ) | ( 1 - LSF_interpolation_flag )) * MAX_LPC_ORDER ];
-        B_Q14      = &LTPCoef_Q14[ k * LTP_ORDER ];
-        AR_shp_Q13 = &AR_Q13[ k * MAX_SHAPE_LPC_ORDER ];
+    for (k = 0; k < psEncC->nb_subfr; k++) {
+        A_Q12      = &PredCoef_Q12[ ((k>>1)|(1 - LSF_interpolation_flag))*MAX_LPC_ORDER ];
+        B_Q14      = &LTPCoef_Q14[ k*LTP_ORDER ];
+        AR_shp_Q13 = &AR_Q13[ k*MAX_SHAPE_LPC_ORDER ];
 
         /* Noise shape parameters */
         silk_assert( HarmShapeGain_Q14[ k ] >= 0 );
         HarmShapeFIRPacked_Q14  =                          silk_RSHIFT( HarmShapeGain_Q14[ k ], 2 );
-        HarmShapeFIRPacked_Q14 |= silk_LSHIFT( (oac_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
+        HarmShapeFIRPacked_Q14 |= silk_LSHIFT((oac_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
 
         NSQ->rewhite_flag = 0;
-        if( psIndices->signalType == TYPE_VOICED ) {
+        if (psIndices->signalType == TYPE_VOICED) {
             /* Voiced */
             lag = pitchL[ k ];
 
             /* Re-whitening */
-            if( ( k & ( 3 - silk_LSHIFT( LSF_interpolation_flag, 1 ) ) ) == 0 ) {
+            if ((k&(3 - silk_LSHIFT( LSF_interpolation_flag, 1 ))) == 0) {
                 /* Rewhiten with new A coefs */
-                start_idx = psEncC->ltp_mem_length - lag - psEncC->predictLPCOrder - LTP_ORDER / 2;
+                start_idx = psEncC->ltp_mem_length - lag - psEncC->predictLPCOrder - LTP_ORDER/2;
                 celt_assert( start_idx > 0 );
 
-                silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k * psEncC->subfr_length ],
+                silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k*psEncC->subfr_length ],
                     A_Q12, psEncC->ltp_mem_length - start_idx, psEncC->predictLPCOrder, psEncC->arch );
 
                 NSQ->rewhite_flag = 1;
@@ -153,7 +152,8 @@ void silk_NSQ_c
             }
         }
 
-        silk_nsq_scale_states( psEncC, NSQ, x16, x_sc_Q10, sLTP, sLTP_Q15, k, LTP_scale_Q14, Gains_Q16, pitchL, psIndices->signalType );
+        silk_nsq_scale_states( psEncC, NSQ, x16, x_sc_Q10, sLTP, sLTP_Q15, k, LTP_scale_Q14, Gains_Q16, pitchL,
+        psIndices->signalType );
 
         silk_noise_shape_quantizer( NSQ, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15, A_Q12, B_Q14,
             AR_shp_Q13, lag, HarmShapeFIRPacked_Q14, Tilt_Q14[ k ], LF_shp_Q14[ k ], Gains_Q16[ k ], Lambda_Q10,
@@ -168,8 +168,10 @@ void silk_NSQ_c
     NSQ->lagPrev = pitchL[ psEncC->nb_subfr - 1 ];
 
     /* Save quantized speech and noise shaping signals */
-    silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( oac_int16 ) );
-    silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( oac_int32 ) );
+    silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ],
+    psEncC->ltp_mem_length*sizeof(oac_int16));
+    silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ],
+    psEncC->ltp_mem_length*sizeof(oac_int32));
     RESTORE_STACK;
 }
 
@@ -182,39 +184,38 @@ static OAC_INLINE
 #endif
 void silk_noise_shape_quantizer(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                       */
-    oac_int            signalType,             /* I    Signal type                     */
-    const oac_int32    x_sc_Q10[],             /* I                                    */
-    oac_int8           pulses[],               /* O                                    */
-    oac_int16          xq[],                   /* O                                    */
-    oac_int32          sLTP_Q15[],             /* I/O  LTP state                       */
-    const oac_int16    a_Q12[],                /* I    Short term prediction coefs     */
-    const oac_int16    b_Q14[],                /* I    Long term prediction coefs      */
-    const oac_int16    AR_shp_Q13[],           /* I    Noise shaping AR coefs          */
-    oac_int            lag,                    /* I    Pitch lag                       */
-    oac_int32          HarmShapeFIRPacked_Q14, /* I                                    */
-    oac_int            Tilt_Q14,               /* I    Spectral tilt                   */
-    oac_int32          LF_shp_Q14,             /* I                                    */
-    oac_int32          Gain_Q16,               /* I                                    */
-    oac_int            Lambda_Q10,             /* I                                    */
-    oac_int            offset_Q10,             /* I                                    */
-    oac_int            length,                 /* I    Input length                    */
-    oac_int            shapingLPCOrder,        /* I    Noise shaping AR filter order   */
-    oac_int            predictLPCOrder,        /* I    Prediction filter order         */
-    int                 arch                    /* I    Architecture                    */
-)
-{
-    oac_int     i;
-    oac_int32   LTP_pred_Q13, LPC_pred_Q10, n_AR_Q12, n_LTP_Q13;
-    oac_int32   n_LF_Q12, r_Q10, rr_Q10, q1_Q0, q1_Q10, q2_Q10, rd1_Q20, rd2_Q20;
-    oac_int32   exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10;
-    oac_int32   tmp1, tmp2, sLF_AR_shp_Q14;
+    oac_int signalType,                        /* I    Signal type                     */
+    const oac_int32 x_sc_Q10[],                /* I                                    */
+    oac_int8 pulses[],                         /* O                                    */
+    oac_int16 xq[],                            /* O                                    */
+    oac_int32 sLTP_Q15[],                      /* I/O  LTP state                       */
+    const oac_int16 a_Q12[],                   /* I    Short term prediction coefs     */
+    const oac_int16 b_Q14[],                   /* I    Long term prediction coefs      */
+    const oac_int16 AR_shp_Q13[],              /* I    Noise shaping AR coefs          */
+    oac_int lag,                               /* I    Pitch lag                       */
+    oac_int32 HarmShapeFIRPacked_Q14,          /* I                                    */
+    oac_int Tilt_Q14,                          /* I    Spectral tilt                   */
+    oac_int32 LF_shp_Q14,                      /* I                                    */
+    oac_int32 Gain_Q16,                        /* I                                    */
+    oac_int Lambda_Q10,                        /* I                                    */
+    oac_int offset_Q10,                        /* I                                    */
+    oac_int length,                            /* I    Input length                    */
+    oac_int shapingLPCOrder,                   /* I    Noise shaping AR filter order   */
+    oac_int predictLPCOrder,                   /* I    Prediction filter order         */
+    int arch                                    /* I    Architecture                    */
+    ) {
+    oac_int i;
+    oac_int32 LTP_pred_Q13, LPC_pred_Q10, n_AR_Q12, n_LTP_Q13;
+    oac_int32 n_LF_Q12, r_Q10, rr_Q10, q1_Q0, q1_Q10, q2_Q10, rd1_Q20, rd2_Q20;
+    oac_int32 exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10;
+    oac_int32 tmp1, tmp2, sLF_AR_shp_Q14;
     oac_int32   *psLPC_Q14, *shp_lag_ptr, *pred_lag_ptr;
 #ifdef silk_short_prediction_create_arch_coef
-    oac_int32   a_Q12_arch[MAX_LPC_ORDER];
+    oac_int32 a_Q12_arch[MAX_LPC_ORDER];
 #endif
 
-    shp_lag_ptr  = &NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS / 2 ];
-    pred_lag_ptr = &sLTP_Q15[ NSQ->sLTP_buf_idx - lag + LTP_ORDER / 2 ];
+    shp_lag_ptr  = &NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS/2 ];
+    pred_lag_ptr = &sLTP_Q15[ NSQ->sLTP_buf_idx - lag + LTP_ORDER/2 ];
     Gain_Q10     = silk_RSHIFT( Gain_Q16, 6 );
 
     /* Set up short term AR state */
@@ -224,7 +225,7 @@ void silk_noise_shape_quantizer(
     silk_short_prediction_create_arch_coef(a_Q12_arch, a_Q12, predictLPCOrder);
 #endif
 
-    for( i = 0; i < length; i++ ) {
+    for (i = 0; i < length; i++) {
         /* Generate dither */
         NSQ->rand_seed = silk_RAND( NSQ->rand_seed );
 
@@ -232,7 +233,7 @@ void silk_noise_shape_quantizer(
         LPC_pred_Q10 = silk_noise_shape_quantizer_short_prediction(psLPC_Q14, a_Q12, a_Q12_arch, predictLPCOrder, arch);
 
         /* Long-term prediction */
-        if( signalType == TYPE_VOICED ) {
+        if (signalType == TYPE_VOICED) {
             /* Unrolled loop */
             /* Avoids introducing a bias because silk_SMLAWB() always rounds to -inf */
             LTP_pred_Q13 = 2;
@@ -247,8 +248,9 @@ void silk_noise_shape_quantizer(
         }
 
         /* Noise shape feedback */
-        celt_assert( ( shapingLPCOrder & 1 ) == 0 );   /* check that order is even */
-        n_AR_Q12 = silk_NSQ_noise_shape_feedback_loop(&NSQ->sDiff_shp_Q14, NSQ->sAR2_Q14, AR_shp_Q13, shapingLPCOrder, arch);
+        celt_assert((shapingLPCOrder&1) == 0 );        /* check that order is even */
+        n_AR_Q12 = silk_NSQ_noise_shape_feedback_loop(&NSQ->sDiff_shp_Q14, NSQ->sAR2_Q14, AR_shp_Q13, shapingLPCOrder,
+        arch);
 
         n_AR_Q12 = silk_SMLAWB( n_AR_Q12, NSQ->sLF_AR_shp_Q14, Tilt_Q14 );
 
@@ -260,7 +262,7 @@ void silk_noise_shape_quantizer(
         /* Combine prediction and noise shaping signals */
         tmp1 = silk_SUB32_ovflw( silk_LSHIFT32( LPC_pred_Q10, 2 ), n_AR_Q12 );  /* Q12 */
         tmp1 = silk_SUB32_ovflw( tmp1, n_LF_Q12 );                              /* Q12 */
-        if( lag > 0 ) {
+        if (lag > 0) {
             /* Symmetric, packed FIR coefficients */
             n_LTP_Q13 = silk_SMULWB( silk_ADD_SAT32( shp_lag_ptr[ 0 ], shp_lag_ptr[ -2 ] ), HarmShapeFIRPacked_Q14 );
             n_LTP_Q13 = silk_SMLAWT( n_LTP_Q13, shp_lag_ptr[ -1 ],                      HarmShapeFIRPacked_Q14 );
@@ -268,7 +270,7 @@ void silk_noise_shape_quantizer(
             shp_lag_ptr++;
 
             tmp2 = silk_SUB32( LTP_pred_Q13, n_LTP_Q13 );                       /* Q13 */
-            tmp1 = silk_ADD32_ovflw( tmp2, silk_LSHIFT32( tmp1, 1 ) );          /* Q13 */
+            tmp1 = silk_ADD32_ovflw( tmp2, silk_LSHIFT32( tmp1, 1 ));           /* Q13 */
             tmp1 = silk_RSHIFT_ROUND( tmp1, 3 );                                /* Q10 */
         } else {
             tmp1 = silk_RSHIFT_ROUND( tmp1, 2 );                                /* Q10 */
@@ -277,10 +279,10 @@ void silk_noise_shape_quantizer(
         r_Q10 = silk_SUB32( x_sc_Q10[ i ], tmp1 );                              /* residual error Q10 */
 
         /* Flip sign depending on dither */
-        if( NSQ->rand_seed < 0 ) {
+        if (NSQ->rand_seed < 0) {
             r_Q10 = -r_Q10;
         }
-        r_Q10 = silk_LIMIT_32( r_Q10, -(31 << 10), 30 << 10 );
+        r_Q10 = silk_LIMIT_32( r_Q10, -(31<<10), 30<<10 );
 
         /* Find two quantization level candidates and measure their rate-distortion */
         q1_Q10 = silk_SUB32( r_Q10, offset_Q10 );
@@ -298,18 +300,18 @@ void silk_noise_shape_quantizer(
                 q1_Q0 = 0;
             }
         }
-        if( q1_Q0 > 0 ) {
+        if (q1_Q0 > 0) {
             q1_Q10  = silk_SUB32( silk_LSHIFT( q1_Q0, 10 ), QUANT_LEVEL_ADJUST_Q10 );
             q1_Q10  = silk_ADD32( q1_Q10, offset_Q10 );
             q2_Q10  = silk_ADD32( q1_Q10, 1024 );
             rd1_Q20 = silk_SMULBB( q1_Q10, Lambda_Q10 );
             rd2_Q20 = silk_SMULBB( q2_Q10, Lambda_Q10 );
-        } else if( q1_Q0 == 0 ) {
+        } else if (q1_Q0 == 0) {
             q1_Q10  = offset_Q10;
             q2_Q10  = silk_ADD32( q1_Q10, 1024 - QUANT_LEVEL_ADJUST_Q10 );
             rd1_Q20 = silk_SMULBB( q1_Q10, Lambda_Q10 );
             rd2_Q20 = silk_SMULBB( q2_Q10, Lambda_Q10 );
-        } else if( q1_Q0 == -1 ) {
+        } else if (q1_Q0 == -1) {
             q2_Q10  = offset_Q10;
             q1_Q10  = silk_SUB32( q2_Q10, 1024 - QUANT_LEVEL_ADJUST_Q10 );
             rd1_Q20 = silk_SMULBB( -q1_Q10, Lambda_Q10 );
@@ -326,7 +328,7 @@ void silk_noise_shape_quantizer(
         rr_Q10  = silk_SUB32( r_Q10, q2_Q10 );
         rd2_Q20 = silk_SMLABB( rd2_Q20, rr_Q10, rr_Q10 );
 
-        if( rd2_Q20 < rd1_Q20 ) {
+        if (rd2_Q20 < rd1_Q20) {
             q1_Q10 = q2_Q10;
         }
 
@@ -334,22 +336,22 @@ void silk_noise_shape_quantizer(
 
         /* Excitation */
         exc_Q14 = silk_LSHIFT( q1_Q10, 4 );
-        if ( NSQ->rand_seed < 0 ) {
-           exc_Q14 = -exc_Q14;
+        if (NSQ->rand_seed < 0) {
+            exc_Q14 = -exc_Q14;
         }
 
         /* Add predictions */
         LPC_exc_Q14 = silk_ADD_LSHIFT32( exc_Q14, LTP_pred_Q13, 1 );
-        xq_Q14      = silk_ADD32_ovflw( LPC_exc_Q14, silk_LSHIFT32( LPC_pred_Q10, 4 ) );
+        xq_Q14      = silk_ADD32_ovflw( LPC_exc_Q14, silk_LSHIFT32( LPC_pred_Q10, 4 ));
 
         /* Scale XQ back to normal level before saving */
-        xq[ i ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( xq_Q14, Gain_Q10 ), 8 ) );
+        xq[ i ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( xq_Q14, Gain_Q10 ), 8 ));
 
         /* Update states */
         psLPC_Q14++;
         *psLPC_Q14 = xq_Q14;
-        NSQ->sDiff_shp_Q14 = silk_SUB32_ovflw( xq_Q14, silk_LSHIFT32( x_sc_Q10[ i ], 4 ) );
-        sLF_AR_shp_Q14 = silk_SUB32_ovflw( NSQ->sDiff_shp_Q14, silk_LSHIFT32( n_AR_Q12, 2 ) );
+        NSQ->sDiff_shp_Q14 = silk_SUB32_ovflw( xq_Q14, silk_LSHIFT32( x_sc_Q10[ i ], 4 ));
+        sLF_AR_shp_Q14 = silk_SUB32_ovflw( NSQ->sDiff_shp_Q14, silk_LSHIFT32( n_AR_Q12, 2 ));
         NSQ->sLF_AR_shp_Q14 = sLF_AR_shp_Q14;
 
         NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx ] = silk_SUB32_ovflw(sLF_AR_shp_Q14, silk_LSHIFT32(n_LF_Q12, 2));
@@ -362,24 +364,23 @@ void silk_noise_shape_quantizer(
     }
 
     /* Update LPC synth buffer */
-    silk_memcpy( NSQ->sLPC_Q14, &NSQ->sLPC_Q14[ length ], NSQ_LPC_BUF_LENGTH * sizeof( oac_int32 ) );
+    silk_memcpy( NSQ->sLPC_Q14, &NSQ->sLPC_Q14[ length ], NSQ_LPC_BUF_LENGTH*sizeof(oac_int32));
 }
 
 static OAC_INLINE void silk_nsq_scale_states(
     const silk_encoder_state *psEncC,           /* I    Encoder State                   */
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                       */
-    const oac_int16    x16[],                  /* I    input                           */
-    oac_int32          x_sc_Q10[],             /* O    input scaled with 1/Gain        */
-    const oac_int16    sLTP[],                 /* I    re-whitened LTP state in Q0     */
-    oac_int32          sLTP_Q15[],             /* O    LTP state matching scaled input */
-    oac_int            subfr,                  /* I    subframe number                 */
-    const oac_int      LTP_scale_Q14,          /* I                                    */
-    const oac_int32    Gains_Q16[ MAX_NB_SUBFR ], /* I                                 */
-    const oac_int      pitchL[ MAX_NB_SUBFR ], /* I    Pitch lag                       */
-    const oac_int      signal_type             /* I    Signal type                     */
-)
-{
-    oac_int   i, lag;
+    const oac_int16 x16[],                     /* I    input                           */
+    oac_int32 x_sc_Q10[],                      /* O    input scaled with 1/Gain        */
+    const oac_int16 sLTP[],                    /* I    re-whitened LTP state in Q0     */
+    oac_int32 sLTP_Q15[],                      /* O    LTP state matching scaled input */
+    oac_int subfr,                             /* I    subframe number                 */
+    const oac_int LTP_scale_Q14,               /* I                                    */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],    /* I                                 */
+    const oac_int pitchL[ MAX_NB_SUBFR ],      /* I    Pitch lag                       */
+    const oac_int signal_type                  /* I    Signal type                     */
+    ) {
+    oac_int i, lag;
     oac_int32 gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
 
     lag          = pitchL[ subfr ];
@@ -388,34 +389,34 @@ static OAC_INLINE void silk_nsq_scale_states(
 
     /* Scale input */
     inv_gain_Q26 = silk_RSHIFT_ROUND( inv_gain_Q31, 5 );
-    for( i = 0; i < psEncC->subfr_length; i++ ) {
+    for (i = 0; i < psEncC->subfr_length; i++) {
         x_sc_Q10[ i ] = silk_SMULWW( x16[ i ], inv_gain_Q26 );
     }
 
     /* After rewhitening the LTP state is un-scaled, so scale with inv_gain_Q16 */
-    if( NSQ->rewhite_flag ) {
-        if( subfr == 0 ) {
+    if (NSQ->rewhite_flag) {
+        if (subfr == 0) {
             /* Do LTP downscaling */
             inv_gain_Q31 = silk_LSHIFT( silk_SMULWB( inv_gain_Q31, LTP_scale_Q14 ), 2 );
         }
-        for( i = NSQ->sLTP_buf_idx - lag - LTP_ORDER / 2; i < NSQ->sLTP_buf_idx; i++ ) {
+        for (i = NSQ->sLTP_buf_idx - lag - LTP_ORDER/2; i < NSQ->sLTP_buf_idx; i++) {
             silk_assert( i < MAX_FRAME_LENGTH );
             sLTP_Q15[ i ] = silk_SMULWB( inv_gain_Q31, sLTP[ i ] );
         }
     }
 
     /* Adjust for changing gain */
-    if( Gains_Q16[ subfr ] != NSQ->prev_gain_Q16 ) {
+    if (Gains_Q16[ subfr ] != NSQ->prev_gain_Q16) {
         gain_adj_Q16 =  silk_DIV32_varQ( NSQ->prev_gain_Q16, Gains_Q16[ subfr ], 16 );
 
         /* Scale long-term shaping state */
-        for( i = NSQ->sLTP_shp_buf_idx - psEncC->ltp_mem_length; i < NSQ->sLTP_shp_buf_idx; i++ ) {
+        for (i = NSQ->sLTP_shp_buf_idx - psEncC->ltp_mem_length; i < NSQ->sLTP_shp_buf_idx; i++) {
             NSQ->sLTP_shp_Q14[ i ] = silk_SMULWW( gain_adj_Q16, NSQ->sLTP_shp_Q14[ i ] );
         }
 
         /* Scale long-term prediction state */
-        if( signal_type == TYPE_VOICED && NSQ->rewhite_flag == 0 ) {
-            for( i = NSQ->sLTP_buf_idx - lag - LTP_ORDER / 2; i < NSQ->sLTP_buf_idx; i++ ) {
+        if (signal_type == TYPE_VOICED && NSQ->rewhite_flag == 0) {
+            for (i = NSQ->sLTP_buf_idx - lag - LTP_ORDER/2; i < NSQ->sLTP_buf_idx; i++) {
                 sLTP_Q15[ i ] = silk_SMULWW( gain_adj_Q16, sLTP_Q15[ i ] );
             }
         }
@@ -424,10 +425,10 @@ static OAC_INLINE void silk_nsq_scale_states(
         NSQ->sDiff_shp_Q14 = silk_SMULWW( gain_adj_Q16, NSQ->sDiff_shp_Q14 );
 
         /* Scale short-term prediction and shaping states */
-        for( i = 0; i < NSQ_LPC_BUF_LENGTH; i++ ) {
+        for (i = 0; i < NSQ_LPC_BUF_LENGTH; i++) {
             NSQ->sLPC_Q14[ i ] = silk_SMULWW( gain_adj_Q16, NSQ->sLPC_Q14[ i ] );
         }
-        for( i = 0; i < MAX_SHAPE_LPC_ORDER; i++ ) {
+        for (i = 0; i < MAX_SHAPE_LPC_ORDER; i++) {
             NSQ->sAR2_Q14[ i ] = silk_SMULWW( gain_adj_Q16, NSQ->sAR2_Q14[ i ] );
         }
 
diff --git a/silk/NSQ.h b/silk/NSQ.h
index f9ccbe4c5..af1d3b967 100644
--- a/silk/NSQ.h
+++ b/silk/NSQ.h
@@ -1,29 +1,29 @@
 /***********************************************************************
-Copyright (c) 2014 Vidyo.
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2014 Vidyo.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 #ifndef SILK_NSQ_H
 #define SILK_NSQ_H
@@ -32,8 +32,8 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #undef silk_short_prediction_create_arch_coef
 
-static OAC_INLINE oac_int32 silk_noise_shape_quantizer_short_prediction_c(const oac_int32 *buf32, const oac_int16 *coef16, oac_int order)
-{
+static OAC_INLINE oac_int32 silk_noise_shape_quantizer_short_prediction_c(const oac_int32 *buf32,
+                                                                          const oac_int16 *coef16, oac_int order) {
     oac_int32 out;
     silk_assert( order == 10 || order == 16 );
 
@@ -50,8 +50,7 @@ static OAC_INLINE oac_int32 silk_noise_shape_quantizer_short_prediction_c(const
     out = silk_SMLAWB( out, buf32[ -8 ], coef16[ 8 ] );
     out = silk_SMLAWB( out, buf32[ -9 ], coef16[ 9 ] );
 
-    if( order == 16 )
-    {
+    if (order == 16) {
         out = silk_SMLAWB( out, buf32[ -10 ], coef16[ 10 ] );
         out = silk_SMLAWB( out, buf32[ -11 ], coef16[ 11 ] );
         out = silk_SMLAWB( out, buf32[ -12 ], coef16[ 12 ] );
@@ -62,10 +61,12 @@ static OAC_INLINE oac_int32 silk_noise_shape_quantizer_short_prediction_c(const
     return out;
 }
 
-#define silk_noise_shape_quantizer_short_prediction(in, coef, coefRev, order, arch)  ((void)arch,silk_noise_shape_quantizer_short_prediction_c(in, coef, order))
+#define silk_noise_shape_quantizer_short_prediction(in, coef, coefRev, order, arch)  ((void)arch, \
+                                                                                      silk_noise_shape_quantizer_short_prediction_c \
+                                                                                      (in, coef, order))
 
-static OAC_INLINE oac_int32 silk_NSQ_noise_shape_feedback_loop_c(const oac_int32 *data0, oac_int32 *data1, const oac_int16 *coef, oac_int order)
-{
+static OAC_INLINE oac_int32 silk_NSQ_noise_shape_feedback_loop_c(const oac_int32 *data0, oac_int32 *data1,
+                                                                 const oac_int16 *coef, oac_int order) {
     oac_int32 out;
     oac_int32 tmp1, tmp2;
     oac_int j;
@@ -92,14 +93,16 @@ static OAC_INLINE oac_int32 silk_NSQ_noise_shape_feedback_loop_c(const oac_int32
     return out;
 }
 
-#define silk_NSQ_noise_shape_feedback_loop(data0, data1, coef, order, arch)  ((void)arch,silk_NSQ_noise_shape_feedback_loop_c(data0, data1, coef, order))
+#define silk_NSQ_noise_shape_feedback_loop(data0, data1, coef, order, arch)  ((void)arch, \
+                                                                              silk_NSQ_noise_shape_feedback_loop_c( \
+    data0, data1, coef, order))
 
 #if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
-#include "arm/NSQ_neon.h"
+# include "arm/NSQ_neon.h"
 #endif
 
 #if defined(__mips)
-#include "mips/NSQ_mips.h"
+# include "mips/NSQ_mips.h"
 #endif
 
 #endif /* SILK_NSQ_H */
diff --git a/silk/NSQ_del_dec.c b/silk/NSQ_del_dec.c
index c89555eb3..6b0da0a94 100644
--- a/silk/NSQ_del_dec.c
+++ b/silk/NSQ_del_dec.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -59,85 +59,84 @@ typedef struct {
     oac_int32 LPC_exc_Q14;
 } NSQ_sample_struct;
 
-typedef NSQ_sample_struct  NSQ_sample_pair[ 2 ];
+typedef NSQ_sample_struct NSQ_sample_pair[ 2 ];
 
 static OAC_INLINE void silk_nsq_del_dec_scale_states(
     const silk_encoder_state *psEncC,               /* I    Encoder State                       */
     silk_nsq_state      *NSQ,                       /* I/O  NSQ state                           */
-    NSQ_del_dec_struct  psDelDec[],                 /* I/O  Delayed decision states             */
-    const oac_int16    x16[],                      /* I    Input                               */
-    oac_int32          x_sc_Q10[],                 /* O    Input scaled with 1/Gain in Q10     */
-    const oac_int16    sLTP[],                     /* I    Re-whitened LTP state in Q0         */
-    oac_int32          sLTP_Q15[],                 /* O    LTP state matching scaled input     */
-    oac_int            subfr,                      /* I    Subframe number                     */
-    oac_int            nStatesDelayedDecision,     /* I    Number of del dec states            */
-    const oac_int      LTP_scale_Q14,              /* I    LTP state scaling                   */
-    const oac_int32    Gains_Q16[ MAX_NB_SUBFR ],  /* I                                        */
-    const oac_int      pitchL[ MAX_NB_SUBFR ],     /* I    Pitch lag                           */
-    const oac_int      signal_type,                /* I    Signal type                         */
-    const oac_int      decisionDelay               /* I    Decision delay                      */
-);
+    NSQ_del_dec_struct psDelDec[],                  /* I/O  Delayed decision states             */
+    const oac_int16 x16[],                         /* I    Input                               */
+    oac_int32 x_sc_Q10[],                          /* O    Input scaled with 1/Gain in Q10     */
+    const oac_int16 sLTP[],                        /* I    Re-whitened LTP state in Q0         */
+    oac_int32 sLTP_Q15[],                          /* O    LTP state matching scaled input     */
+    oac_int subfr,                                 /* I    Subframe number                     */
+    oac_int nStatesDelayedDecision,                /* I    Number of del dec states            */
+    const oac_int LTP_scale_Q14,                   /* I    LTP state scaling                   */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],     /* I                                        */
+    const oac_int pitchL[ MAX_NB_SUBFR ],          /* I    Pitch lag                           */
+    const oac_int signal_type,                     /* I    Signal type                         */
+    const oac_int decisionDelay                    /* I    Decision delay                      */
+    );
 
 /******************************************/
 /* Noise shape quantizer for one subframe */
 /******************************************/
 static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                           */
-    NSQ_del_dec_struct  psDelDec[],             /* I/O  Delayed decision states             */
-    oac_int            signalType,             /* I    Signal type                         */
-    const oac_int32    x_Q10[],                /* I                                        */
-    oac_int8           pulses[],               /* O                                        */
-    oac_int16          xq[],                   /* O                                        */
-    oac_int32          sLTP_Q15[],             /* I/O  LTP filter state                    */
-    oac_int32          delayedGain_Q10[],      /* I/O  Gain delay buffer                   */
-    const oac_int16    a_Q12[],                /* I    Short term prediction coefs         */
-    const oac_int16    b_Q14[],                /* I    Long term prediction coefs          */
-    const oac_int16    AR_shp_Q13[],           /* I    Noise shaping coefs                 */
-    oac_int            lag,                    /* I    Pitch lag                           */
-    oac_int32          HarmShapeFIRPacked_Q14, /* I                                        */
-    oac_int            Tilt_Q14,               /* I    Spectral tilt                       */
-    oac_int32          LF_shp_Q14,             /* I                                        */
-    oac_int32          Gain_Q16,               /* I                                        */
-    oac_int            Lambda_Q10,             /* I                                        */
-    oac_int            offset_Q10,             /* I                                        */
-    oac_int            length,                 /* I    Input length                        */
-    oac_int            subfr,                  /* I    Subframe number                     */
-    oac_int            shapingLPCOrder,        /* I    Shaping LPC filter order            */
-    oac_int            predictLPCOrder,        /* I    Prediction filter order             */
-    oac_int            warping_Q16,            /* I                                        */
-    oac_int            nStatesDelayedDecision, /* I    Number of states in decision tree   */
+    NSQ_del_dec_struct psDelDec[],              /* I/O  Delayed decision states             */
+    oac_int signalType,                        /* I    Signal type                         */
+    const oac_int32 x_Q10[],                   /* I                                        */
+    oac_int8 pulses[],                         /* O                                        */
+    oac_int16 xq[],                            /* O                                        */
+    oac_int32 sLTP_Q15[],                      /* I/O  LTP filter state                    */
+    oac_int32 delayedGain_Q10[],               /* I/O  Gain delay buffer                   */
+    const oac_int16 a_Q12[],                   /* I    Short term prediction coefs         */
+    const oac_int16 b_Q14[],                   /* I    Long term prediction coefs          */
+    const oac_int16 AR_shp_Q13[],              /* I    Noise shaping coefs                 */
+    oac_int lag,                               /* I    Pitch lag                           */
+    oac_int32 HarmShapeFIRPacked_Q14,          /* I                                        */
+    oac_int Tilt_Q14,                          /* I    Spectral tilt                       */
+    oac_int32 LF_shp_Q14,                      /* I                                        */
+    oac_int32 Gain_Q16,                        /* I                                        */
+    oac_int Lambda_Q10,                        /* I                                        */
+    oac_int offset_Q10,                        /* I                                        */
+    oac_int length,                            /* I    Input length                        */
+    oac_int subfr,                             /* I    Subframe number                     */
+    oac_int shapingLPCOrder,                   /* I    Shaping LPC filter order            */
+    oac_int predictLPCOrder,                   /* I    Prediction filter order             */
+    oac_int warping_Q16,                       /* I                                        */
+    oac_int nStatesDelayedDecision,            /* I    Number of states in decision tree   */
     oac_int            *smpl_buf_idx,          /* I/O  Index to newest samples in buffers  */
-    oac_int            decisionDelay,          /* I                                        */
-    int                 arch                    /* I                                        */
-);
+    oac_int decisionDelay,                     /* I                                        */
+    int arch                                    /* I                                        */
+    );
 
 void silk_NSQ_del_dec_c(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const oac_int16            x16[],                                        /* I    Input                           */
-    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16 x16[],                                                   /* I    Input                           */
+    oac_int8 pulses[],                                                       /* O    Quantized pulse signal          */
     const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
-)
-{
-    oac_int            i, k, lag, start_idx, LSF_interpolation_flag, Winner_ind, subfr;
-    oac_int            last_smple_idx, smpl_buf_idx, decisionDelay;
+    const oac_int16 LTPCoef_Q14[ LTP_ORDER*MAX_NB_SUBFR ],                   /* I    Long term prediction coefs      */
+    const oac_int16 AR_Q13[ MAX_NB_SUBFR*MAX_SHAPE_LPC_ORDER ],              /* I    Noise shaping coefs             */
+    const oac_int HarmShapeGain_Q14[ MAX_NB_SUBFR ],                         /* I    Long term shaping coefs         */
+    const oac_int Tilt_Q14[ MAX_NB_SUBFR ],                                  /* I    Spectral tilt                   */
+    const oac_int32 LF_shp_Q14[ MAX_NB_SUBFR ],                              /* I    Low frequency shaping coefs     */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],                               /* I    Quantization step sizes         */
+    const oac_int pitchL[ MAX_NB_SUBFR ],                                    /* I    Pitch lags                      */
+    const oac_int Lambda_Q10,                                                /* I    Rate/distortion tradeoff        */
+    const oac_int LTP_scale_Q14                                              /* I    LTP state scaling               */
+    ) {
+    oac_int i, k, lag, start_idx, LSF_interpolation_flag, Winner_ind, subfr;
+    oac_int last_smple_idx, smpl_buf_idx, decisionDelay;
     const oac_int16    *A_Q12, *B_Q14, *AR_shp_Q13;
     oac_int16          *pxq;
     VARDECL( oac_int32, sLTP_Q15 );
     VARDECL( oac_int16, sLTP );
-    oac_int32          HarmShapeFIRPacked_Q14;
-    oac_int            offset_Q10;
-    oac_int32          RDmin_Q10, Gain_Q10;
+    oac_int32 HarmShapeFIRPacked_Q14;
+    oac_int offset_Q10;
+    oac_int32 RDmin_Q10, Gain_Q10;
     VARDECL( oac_int32, x_sc_Q10 );
     VARDECL( oac_int32, delayedGain_Q10 );
     VARDECL( NSQ_del_dec_struct, psDelDec );
@@ -151,36 +150,36 @@ void silk_NSQ_del_dec_c(
 
     /* Initialize delayed decision states */
     ALLOC( psDelDec, psEncC->nStatesDelayedDecision, NSQ_del_dec_struct );
-    silk_memset( psDelDec, 0, psEncC->nStatesDelayedDecision * sizeof( NSQ_del_dec_struct ) );
-    for( k = 0; k < psEncC->nStatesDelayedDecision; k++ ) {
+    silk_memset( psDelDec, 0, psEncC->nStatesDelayedDecision*sizeof(NSQ_del_dec_struct));
+    for (k = 0; k < psEncC->nStatesDelayedDecision; k++) {
         psDD                 = &psDelDec[ k ];
-        psDD->Seed           = ( k + psIndices->Seed ) & 3;
+        psDD->Seed           = (k + psIndices->Seed)&3;
         psDD->SeedInit       = psDD->Seed;
         psDD->RD_Q10         = 0;
         psDD->LF_AR_Q14      = NSQ->sLF_AR_shp_Q14;
         psDD->Diff_Q14       = NSQ->sDiff_shp_Q14;
         psDD->Shape_Q14[ 0 ] = NSQ->sLTP_shp_Q14[ psEncC->ltp_mem_length - 1 ];
-        silk_memcpy( psDD->sLPC_Q14, NSQ->sLPC_Q14, NSQ_LPC_BUF_LENGTH * sizeof( oac_int32 ) );
-        silk_memcpy( psDD->sAR2_Q14, NSQ->sAR2_Q14, sizeof( NSQ->sAR2_Q14 ) );
+        silk_memcpy( psDD->sLPC_Q14, NSQ->sLPC_Q14, NSQ_LPC_BUF_LENGTH*sizeof(oac_int32));
+        silk_memcpy( psDD->sAR2_Q14, NSQ->sAR2_Q14, sizeof(NSQ->sAR2_Q14));
     }
 
-    offset_Q10   = silk_Quantization_Offsets_Q10[ psIndices->signalType >> 1 ][ psIndices->quantOffsetType ];
+    offset_Q10   = silk_Quantization_Offsets_Q10[ psIndices->signalType>>1 ][ psIndices->quantOffsetType ];
     smpl_buf_idx = 0; /* index of oldest samples */
 
     decisionDelay = silk_min_int( DECISION_DELAY, psEncC->subfr_length );
 
     /* For voiced frames limit the decision delay to lower than the pitch lag */
-    if( psIndices->signalType == TYPE_VOICED ) {
-        for( k = 0; k < psEncC->nb_subfr; k++ ) {
-            decisionDelay = silk_min_int( decisionDelay, pitchL[ k ] - LTP_ORDER / 2 - 1 );
+    if (psIndices->signalType == TYPE_VOICED) {
+        for (k = 0; k < psEncC->nb_subfr; k++) {
+            decisionDelay = silk_min_int( decisionDelay, pitchL[ k ] - LTP_ORDER/2 - 1 );
         }
     } else {
-        if( lag > 0 ) {
-            decisionDelay = silk_min_int( decisionDelay, lag - LTP_ORDER / 2 - 1 );
+        if (lag > 0) {
+            decisionDelay = silk_min_int( decisionDelay, lag - LTP_ORDER/2 - 1 );
         }
     }
 
-    if( psIndices->NLSFInterpCoef_Q2 == 4 ) {
+    if (psIndices->NLSFInterpCoef_Q2 == 4) {
         LSF_interpolation_flag = 0;
     } else {
         LSF_interpolation_flag = 1;
@@ -195,37 +194,37 @@ void silk_NSQ_del_dec_c(
     NSQ->sLTP_shp_buf_idx = psEncC->ltp_mem_length;
     NSQ->sLTP_buf_idx     = psEncC->ltp_mem_length;
     subfr = 0;
-    for( k = 0; k < psEncC->nb_subfr; k++ ) {
-        A_Q12      = &PredCoef_Q12[ ( ( k >> 1 ) | ( 1 - LSF_interpolation_flag ) ) * MAX_LPC_ORDER ];
-        B_Q14      = &LTPCoef_Q14[ k * LTP_ORDER           ];
-        AR_shp_Q13 = &AR_Q13[     k * MAX_SHAPE_LPC_ORDER ];
+    for (k = 0; k < psEncC->nb_subfr; k++) {
+        A_Q12      = &PredCoef_Q12[ ((k>>1)|(1 - LSF_interpolation_flag))*MAX_LPC_ORDER ];
+        B_Q14      = &LTPCoef_Q14[ k*LTP_ORDER           ];
+        AR_shp_Q13 = &AR_Q13[     k*MAX_SHAPE_LPC_ORDER ];
 
         /* Noise shape parameters */
         silk_assert( HarmShapeGain_Q14[ k ] >= 0 );
         HarmShapeFIRPacked_Q14  =                          silk_RSHIFT( HarmShapeGain_Q14[ k ], 2 );
-        HarmShapeFIRPacked_Q14 |= silk_LSHIFT( (oac_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
+        HarmShapeFIRPacked_Q14 |= silk_LSHIFT((oac_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
 
         NSQ->rewhite_flag = 0;
-        if( psIndices->signalType == TYPE_VOICED ) {
+        if (psIndices->signalType == TYPE_VOICED) {
             /* Voiced */
             lag = pitchL[ k ];
 
             /* Re-whitening */
-            if( ( k & ( 3 - silk_LSHIFT( LSF_interpolation_flag, 1 ) ) ) == 0 ) {
-                if( k == 2 ) {
+            if ((k&(3 - silk_LSHIFT( LSF_interpolation_flag, 1 ))) == 0) {
+                if (k == 2) {
                     /* RESET DELAYED DECISIONS */
                     /* Find winner */
                     RDmin_Q10 = psDelDec[ 0 ].RD_Q10;
                     Winner_ind = 0;
-                    for( i = 1; i < psEncC->nStatesDelayedDecision; i++ ) {
-                        if( psDelDec[ i ].RD_Q10 < RDmin_Q10 ) {
+                    for (i = 1; i < psEncC->nStatesDelayedDecision; i++) {
+                        if (psDelDec[ i ].RD_Q10 < RDmin_Q10) {
                             RDmin_Q10 = psDelDec[ i ].RD_Q10;
                             Winner_ind = i;
                         }
                     }
-                    for( i = 0; i < psEncC->nStatesDelayedDecision; i++ ) {
-                        if( i != Winner_ind ) {
-                            psDelDec[ i ].RD_Q10 += ( silk_int32_MAX >> 4 );
+                    for (i = 0; i < psEncC->nStatesDelayedDecision; i++) {
+                        if (i != Winner_ind) {
+                            psDelDec[ i ].RD_Q10 += (silk_int32_MAX>>4);
                             silk_assert( psDelDec[ i ].RD_Q10 >= 0 );
                         }
                     }
@@ -233,23 +232,25 @@ void silk_NSQ_del_dec_c(
                     /* Copy final part of signals from winner state to output and long-term filter states */
                     psDD = &psDelDec[ Winner_ind ];
                     last_smple_idx = smpl_buf_idx + decisionDelay;
-                    for( i = 0; i < decisionDelay; i++ ) {
-                        last_smple_idx = ( last_smple_idx - 1 ) % DECISION_DELAY;
-                        if( last_smple_idx < 0 ) last_smple_idx += DECISION_DELAY;
-                        pulses[   i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ], 10 );
+                    for (i = 0; i < decisionDelay; i++) {
+                        last_smple_idx = (last_smple_idx - 1)%DECISION_DELAY;
+                        if (last_smple_idx < 0)  last_smple_idx += DECISION_DELAY;
+                        pulses[   i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ],
+                        10 );
                         pxq[ i - decisionDelay ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND(
-                            silk_SMULWW( psDD->Xq_Q14[ last_smple_idx ], Gains_Q16[ 1 ] ), 14 ) );
-                        NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay + i ] = psDD->Shape_Q14[ last_smple_idx ];
+                            silk_SMULWW( psDD->Xq_Q14[ last_smple_idx ], Gains_Q16[ 1 ] ), 14 ));
+                        NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay
+                                           + i ] = psDD->Shape_Q14[ last_smple_idx ];
                     }
 
                     subfr = 0;
                 }
 
                 /* Rewhiten with new A coefs */
-                start_idx = psEncC->ltp_mem_length - lag - psEncC->predictLPCOrder - LTP_ORDER / 2;
+                start_idx = psEncC->ltp_mem_length - lag - psEncC->predictLPCOrder - LTP_ORDER/2;
                 celt_assert( start_idx > 0 );
 
-                silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k * psEncC->subfr_length ],
+                silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k*psEncC->subfr_length ],
                     A_Q12, psEncC->ltp_mem_length - start_idx, psEncC->predictLPCOrder, psEncC->arch );
 
                 NSQ->sLTP_buf_idx = psEncC->ltp_mem_length;
@@ -263,7 +264,8 @@ void silk_NSQ_del_dec_c(
         silk_noise_shape_quantizer_del_dec( NSQ, psDelDec, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15,
             delayedGain_Q10, A_Q12, B_Q14, AR_shp_Q13, lag, HarmShapeFIRPacked_Q14, Tilt_Q14[ k ], LF_shp_Q14[ k ],
             Gains_Q16[ k ], Lambda_Q10, offset_Q10, psEncC->subfr_length, subfr++, psEncC->shapingLPCOrder,
-            psEncC->predictLPCOrder, psEncC->warping_Q16, psEncC->nStatesDelayedDecision, &smpl_buf_idx, decisionDelay, psEncC->arch );
+            psEncC->predictLPCOrder, psEncC->warping_Q16, psEncC->nStatesDelayedDecision, &smpl_buf_idx, decisionDelay,
+        psEncC->arch );
 
         x16    += psEncC->subfr_length;
         pulses += psEncC->subfr_length;
@@ -273,8 +275,8 @@ void silk_NSQ_del_dec_c(
     /* Find winner */
     RDmin_Q10 = psDelDec[ 0 ].RD_Q10;
     Winner_ind = 0;
-    for( k = 1; k < psEncC->nStatesDelayedDecision; k++ ) {
-        if( psDelDec[ k ].RD_Q10 < RDmin_Q10 ) {
+    for (k = 1; k < psEncC->nStatesDelayedDecision; k++) {
+        if (psDelDec[ k ].RD_Q10 < RDmin_Q10) {
             RDmin_Q10 = psDelDec[ k ].RD_Q10;
             Winner_ind = k;
         }
@@ -285,17 +287,17 @@ void silk_NSQ_del_dec_c(
     psIndices->Seed = psDD->SeedInit;
     last_smple_idx = smpl_buf_idx + decisionDelay;
     Gain_Q10 = silk_RSHIFT32( Gains_Q16[ psEncC->nb_subfr - 1 ], 6 );
-    for( i = 0; i < decisionDelay; i++ ) {
-        last_smple_idx = ( last_smple_idx - 1 ) % DECISION_DELAY;
-        if( last_smple_idx < 0 ) last_smple_idx += DECISION_DELAY;
+    for (i = 0; i < decisionDelay; i++) {
+        last_smple_idx = (last_smple_idx - 1)%DECISION_DELAY;
+        if (last_smple_idx < 0)  last_smple_idx += DECISION_DELAY;
 
         pulses[   i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ], 10 );
         pxq[ i - decisionDelay ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND(
-            silk_SMULWW( psDD->Xq_Q14[ last_smple_idx ], Gain_Q10 ), 8 ) );
+            silk_SMULWW( psDD->Xq_Q14[ last_smple_idx ], Gain_Q10 ), 8 ));
         NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay + i ] = psDD->Shape_Q14[ last_smple_idx ];
     }
-    silk_memcpy( NSQ->sLPC_Q14, &psDD->sLPC_Q14[ psEncC->subfr_length ], NSQ_LPC_BUF_LENGTH * sizeof( oac_int32 ) );
-    silk_memcpy( NSQ->sAR2_Q14, psDD->sAR2_Q14, sizeof( psDD->sAR2_Q14 ) );
+    silk_memcpy( NSQ->sLPC_Q14, &psDD->sLPC_Q14[ psEncC->subfr_length ], NSQ_LPC_BUF_LENGTH*sizeof(oac_int32));
+    silk_memcpy( NSQ->sAR2_Q14, psDD->sAR2_Q14, sizeof(psDD->sAR2_Q14));
 
     /* Update states */
     NSQ->sLF_AR_shp_Q14 = psDD->LF_AR_Q14;
@@ -303,8 +305,10 @@ void silk_NSQ_del_dec_c(
     NSQ->lagPrev        = pitchL[ psEncC->nb_subfr - 1 ];
 
     /* Save quantized speech signal */
-    silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( oac_int16 ) );
-    silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( oac_int32 ) );
+    silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ],
+    psEncC->ltp_mem_length*sizeof(oac_int16));
+    silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ],
+    psEncC->ltp_mem_length*sizeof(oac_int32));
     RESTORE_STACK;
 }
 
@@ -314,44 +318,43 @@ void silk_NSQ_del_dec_c(
 #ifndef OVERRIDE_silk_noise_shape_quantizer_del_dec
 static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                           */
-    NSQ_del_dec_struct  psDelDec[],             /* I/O  Delayed decision states             */
-    oac_int            signalType,             /* I    Signal type                         */
-    const oac_int32    x_Q10[],                /* I                                        */
-    oac_int8           pulses[],               /* O                                        */
-    oac_int16          xq[],                   /* O                                        */
-    oac_int32          sLTP_Q15[],             /* I/O  LTP filter state                    */
-    oac_int32          delayedGain_Q10[],      /* I/O  Gain delay buffer                   */
-    const oac_int16    a_Q12[],                /* I    Short term prediction coefs         */
-    const oac_int16    b_Q14[],                /* I    Long term prediction coefs          */
-    const oac_int16    AR_shp_Q13[],           /* I    Noise shaping coefs                 */
-    oac_int            lag,                    /* I    Pitch lag                           */
-    oac_int32          HarmShapeFIRPacked_Q14, /* I                                        */
-    oac_int            Tilt_Q14,               /* I    Spectral tilt                       */
-    oac_int32          LF_shp_Q14,             /* I                                        */
-    oac_int32          Gain_Q16,               /* I                                        */
-    oac_int            Lambda_Q10,             /* I                                        */
-    oac_int            offset_Q10,             /* I                                        */
-    oac_int            length,                 /* I    Input length                        */
-    oac_int            subfr,                  /* I    Subframe number                     */
-    oac_int            shapingLPCOrder,        /* I    Shaping LPC filter order            */
-    oac_int            predictLPCOrder,        /* I    Prediction filter order             */
-    oac_int            warping_Q16,            /* I                                        */
-    oac_int            nStatesDelayedDecision, /* I    Number of states in decision tree   */
+    NSQ_del_dec_struct psDelDec[],              /* I/O  Delayed decision states             */
+    oac_int signalType,                        /* I    Signal type                         */
+    const oac_int32 x_Q10[],                   /* I                                        */
+    oac_int8 pulses[],                         /* O                                        */
+    oac_int16 xq[],                            /* O                                        */
+    oac_int32 sLTP_Q15[],                      /* I/O  LTP filter state                    */
+    oac_int32 delayedGain_Q10[],               /* I/O  Gain delay buffer                   */
+    const oac_int16 a_Q12[],                   /* I    Short term prediction coefs         */
+    const oac_int16 b_Q14[],                   /* I    Long term prediction coefs          */
+    const oac_int16 AR_shp_Q13[],              /* I    Noise shaping coefs                 */
+    oac_int lag,                               /* I    Pitch lag                           */
+    oac_int32 HarmShapeFIRPacked_Q14,          /* I                                        */
+    oac_int Tilt_Q14,                          /* I    Spectral tilt                       */
+    oac_int32 LF_shp_Q14,                      /* I                                        */
+    oac_int32 Gain_Q16,                        /* I                                        */
+    oac_int Lambda_Q10,                        /* I                                        */
+    oac_int offset_Q10,                        /* I                                        */
+    oac_int length,                            /* I    Input length                        */
+    oac_int subfr,                             /* I    Subframe number                     */
+    oac_int shapingLPCOrder,                   /* I    Shaping LPC filter order            */
+    oac_int predictLPCOrder,                   /* I    Prediction filter order             */
+    oac_int warping_Q16,                       /* I                                        */
+    oac_int nStatesDelayedDecision,            /* I    Number of states in decision tree   */
     oac_int            *smpl_buf_idx,          /* I/O  Index to newest samples in buffers  */
-    oac_int            decisionDelay,          /* I                                        */
-    int                 arch                    /* I                                        */
-)
-{
-    oac_int     i, j, k, Winner_ind, RDmin_ind, RDmax_ind, last_smple_idx;
-    oac_int32   Winner_rand_state;
-    oac_int32   LTP_pred_Q14, LPC_pred_Q14, n_AR_Q14, n_LTP_Q14;
-    oac_int32   n_LF_Q14, r_Q10, rr_Q10, rd1_Q10, rd2_Q10, RDmin_Q10, RDmax_Q10;
-    oac_int32   q1_Q0, q1_Q10, q2_Q10, exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10;
-    oac_int32   tmp1, tmp2, sLF_AR_shp_Q14;
+    oac_int decisionDelay,                     /* I                                        */
+    int arch                                    /* I                                        */
+    ) {
+    oac_int i, j, k, Winner_ind, RDmin_ind, RDmax_ind, last_smple_idx;
+    oac_int32 Winner_rand_state;
+    oac_int32 LTP_pred_Q14, LPC_pred_Q14, n_AR_Q14, n_LTP_Q14;
+    oac_int32 n_LF_Q14, r_Q10, rr_Q10, rd1_Q10, rd2_Q10, RDmin_Q10, RDmax_Q10;
+    oac_int32 q1_Q0, q1_Q10, q2_Q10, exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10;
+    oac_int32 tmp1, tmp2, sLF_AR_shp_Q14;
     oac_int32   *pred_lag_ptr, *shp_lag_ptr, *psLPC_Q14;
-#ifdef silk_short_prediction_create_arch_coef
-    oac_int32   a_Q12_arch[MAX_LPC_ORDER];
-#endif
+# ifdef silk_short_prediction_create_arch_coef
+    oac_int32 a_Q12_arch[MAX_LPC_ORDER];
+# endif
 
     VARDECL( NSQ_sample_pair, psSampleState );
     NSQ_del_dec_struct *psDD;
@@ -361,19 +364,19 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
     celt_assert( nStatesDelayedDecision > 0 );
     ALLOC( psSampleState, nStatesDelayedDecision, NSQ_sample_pair );
 
-    shp_lag_ptr  = &NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS / 2 ];
-    pred_lag_ptr = &sLTP_Q15[ NSQ->sLTP_buf_idx - lag + LTP_ORDER / 2 ];
+    shp_lag_ptr  = &NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS/2 ];
+    pred_lag_ptr = &sLTP_Q15[ NSQ->sLTP_buf_idx - lag + LTP_ORDER/2 ];
     Gain_Q10     = silk_RSHIFT( Gain_Q16, 6 );
 
-#ifdef silk_short_prediction_create_arch_coef
+# ifdef silk_short_prediction_create_arch_coef
     silk_short_prediction_create_arch_coef(a_Q12_arch, a_Q12, predictLPCOrder);
-#endif
+# endif
 
-    for( i = 0; i < length; i++ ) {
+    for (i = 0; i < length; i++) {
         /* Perform common calculations used in all states */
 
         /* Long-term prediction */
-        if( signalType == TYPE_VOICED ) {
+        if (signalType == TYPE_VOICED) {
             /* Unrolled loop */
             /* Avoids introducing a bias because silk_SMLAWB() always rounds to -inf */
             LTP_pred_Q14 = 2;
@@ -389,7 +392,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
         }
 
         /* Long-term shaping */
-        if( lag > 0 ) {
+        if (lag > 0) {
             /* Symmetric, packed FIR coefficients */
             n_LTP_Q14 = silk_SMULWB( silk_ADD_SAT32( shp_lag_ptr[ 0 ], shp_lag_ptr[ -2 ] ), HarmShapeFIRPacked_Q14 );
             n_LTP_Q14 = silk_SMLAWT( n_LTP_Q14, shp_lag_ptr[ -1 ], HarmShapeFIRPacked_Q14 );
@@ -399,7 +402,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
             n_LTP_Q14 = 0;
         }
 
-        for( k = 0; k < nStatesDelayedDecision; k++ ) {
+        for (k = 0; k < nStatesDelayedDecision; k++) {
             /* Delayed decision state */
             psDD = &psDelDec[ k ];
 
@@ -412,11 +415,12 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
             /* Pointer used in short term prediction and shaping */
             psLPC_Q14 = &psDD->sLPC_Q14[ NSQ_LPC_BUF_LENGTH - 1 + i ];
             /* Short-term prediction */
-            LPC_pred_Q14 = silk_noise_shape_quantizer_short_prediction(psLPC_Q14, a_Q12, a_Q12_arch, predictLPCOrder, arch);
+            LPC_pred_Q14 = silk_noise_shape_quantizer_short_prediction(psLPC_Q14, a_Q12, a_Q12_arch, predictLPCOrder,
+            arch);
             LPC_pred_Q14 = silk_LSHIFT( LPC_pred_Q14, 4 );                              /* Q10 -> Q14 */
 
             /* Noise shape feedback */
-            celt_assert( ( shapingLPCOrder & 1 ) == 0 );   /* check that order is even */
+            celt_assert((shapingLPCOrder&1) == 0 );        /* check that order is even */
             /* Output of lowpass section */
             tmp2 = silk_SMLAWB( psDD->Diff_Q14, psDD->sAR2_Q14[ 0 ], warping_Q16 );
             /* Output of allpass section */
@@ -425,13 +429,15 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
             n_AR_Q14 = silk_RSHIFT( shapingLPCOrder, 1 );
             n_AR_Q14 = silk_SMLAWB( n_AR_Q14, tmp2, AR_shp_Q13[ 0 ] );
             /* Loop over allpass sections */
-            for( j = 2; j < shapingLPCOrder; j += 2 ) {
+            for (j = 2; j < shapingLPCOrder; j += 2) {
                 /* Output of allpass section */
-                tmp2 = silk_SMLAWB( psDD->sAR2_Q14[ j - 1 ], silk_SUB32_ovflw(psDD->sAR2_Q14[ j + 0 ], tmp1), warping_Q16 );
+                tmp2 = silk_SMLAWB( psDD->sAR2_Q14[ j - 1 ], silk_SUB32_ovflw(psDD->sAR2_Q14[ j + 0 ], tmp1),
+                warping_Q16 );
                 psDD->sAR2_Q14[ j - 1 ] = tmp1;
                 n_AR_Q14 = silk_SMLAWB( n_AR_Q14, tmp1, AR_shp_Q13[ j - 1 ] );
                 /* Output of allpass section */
-                tmp1 = silk_SMLAWB( psDD->sAR2_Q14[ j + 0 ], silk_SUB32_ovflw(psDD->sAR2_Q14[ j + 1 ], tmp2), warping_Q16 );
+                tmp1 = silk_SMLAWB( psDD->sAR2_Q14[ j + 0 ], silk_SUB32_ovflw(psDD->sAR2_Q14[ j + 1 ], tmp2),
+                warping_Q16 );
                 psDD->sAR2_Q14[ j + 0 ] = tmp2;
                 n_AR_Q14 = silk_SMLAWB( n_AR_Q14, tmp2, AR_shp_Q13[ j ] );
             }
@@ -456,10 +462,10 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
             r_Q10 = silk_SUB32( x_Q10[ i ], tmp1 );                                     /* residual error Q10 */
 
             /* Flip sign depending on dither */
-            if ( psDD->Seed < 0 ) {
+            if (psDD->Seed < 0) {
                 r_Q10 = -r_Q10;
             }
-            r_Q10 = silk_LIMIT_32( r_Q10, -(31 << 10), 30 << 10 );
+            r_Q10 = silk_LIMIT_32( r_Q10, -(31<<10), 30<<10 );
 
             /* Find two quantization level candidates and measure their rate-distortion */
             q1_Q10 = silk_SUB32( r_Q10, offset_Q10 );
@@ -477,18 +483,18 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
                     q1_Q0 = 0;
                 }
             }
-            if( q1_Q0 > 0 ) {
+            if (q1_Q0 > 0) {
                 q1_Q10  = silk_SUB32( silk_LSHIFT( q1_Q0, 10 ), QUANT_LEVEL_ADJUST_Q10 );
                 q1_Q10  = silk_ADD32( q1_Q10, offset_Q10 );
                 q2_Q10  = silk_ADD32( q1_Q10, 1024 );
                 rd1_Q10 = silk_SMULBB( q1_Q10, Lambda_Q10 );
                 rd2_Q10 = silk_SMULBB( q2_Q10, Lambda_Q10 );
-            } else if( q1_Q0 == 0 ) {
+            } else if (q1_Q0 == 0) {
                 q1_Q10  = offset_Q10;
                 q2_Q10  = silk_ADD32( q1_Q10, 1024 - QUANT_LEVEL_ADJUST_Q10 );
                 rd1_Q10 = silk_SMULBB( q1_Q10, Lambda_Q10 );
                 rd2_Q10 = silk_SMULBB( q2_Q10, Lambda_Q10 );
-            } else if( q1_Q0 == -1 ) {
+            } else if (q1_Q0 == -1) {
                 q2_Q10  = offset_Q10;
                 q1_Q10  = silk_SUB32( q2_Q10, 1024 - QUANT_LEVEL_ADJUST_Q10 );
                 rd1_Q10 = silk_SMULBB( -q1_Q10, Lambda_Q10 );
@@ -505,7 +511,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
             rr_Q10  = silk_SUB32( r_Q10, q2_Q10 );
             rd2_Q10 = silk_RSHIFT( silk_SMLABB( rd2_Q10, rr_Q10, rr_Q10 ), 10 );
 
-            if( rd1_Q10 < rd2_Q10 ) {
+            if (rd1_Q10 < rd2_Q10) {
                 psSS[ 0 ].RD_Q10 = silk_ADD32( psDD->RD_Q10, rd1_Q10 );
                 psSS[ 1 ].RD_Q10 = silk_ADD32( psDD->RD_Q10, rd2_Q10 );
                 psSS[ 0 ].Q_Q10  = q1_Q10;
@@ -521,7 +527,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
 
             /* Quantized excitation */
             exc_Q14 = silk_LSHIFT32( psSS[ 0 ].Q_Q10, 4 );
-            if ( psDD->Seed < 0 ) {
+            if (psDD->Seed < 0) {
                 exc_Q14 = -exc_Q14;
             }
 
@@ -530,7 +536,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
             xq_Q14      = silk_ADD32_ovflw( LPC_exc_Q14, LPC_pred_Q14 );
 
             /* Update states */
-            psSS[ 0 ].Diff_Q14     = silk_SUB32_ovflw( xq_Q14, silk_LSHIFT32( x_Q10[ i ], 4 ) );
+            psSS[ 0 ].Diff_Q14     = silk_SUB32_ovflw( xq_Q14, silk_LSHIFT32( x_Q10[ i ], 4 ));
             sLF_AR_shp_Q14         = silk_SUB32_ovflw( psSS[ 0 ].Diff_Q14, n_AR_Q14 );
             psSS[ 0 ].sLTP_shp_Q14 = silk_SUB_SAT32( sLF_AR_shp_Q14, n_LF_Q14 );
             psSS[ 0 ].LF_AR_Q14    = sLF_AR_shp_Q14;
@@ -541,7 +547,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
 
             /* Quantized excitation */
             exc_Q14 = silk_LSHIFT32( psSS[ 1 ].Q_Q10, 4 );
-            if ( psDD->Seed < 0 ) {
+            if (psDD->Seed < 0) {
                 exc_Q14 = -exc_Q14;
             }
 
@@ -550,7 +556,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
             xq_Q14      = silk_ADD32_ovflw( LPC_exc_Q14, LPC_pred_Q14 );
 
             /* Update states */
-            psSS[ 1 ].Diff_Q14     = silk_SUB32_ovflw( xq_Q14, silk_LSHIFT32( x_Q10[ i ], 4 ) );
+            psSS[ 1 ].Diff_Q14     = silk_SUB32_ovflw( xq_Q14, silk_LSHIFT32( x_Q10[ i ], 4 ));
             sLF_AR_shp_Q14         = silk_SUB32_ovflw( psSS[ 1 ].Diff_Q14, n_AR_Q14 );
             psSS[ 1 ].sLTP_shp_Q14 = silk_SUB_SAT32( sLF_AR_shp_Q14, n_LF_Q14 );
             psSS[ 1 ].LF_AR_Q14    = sLF_AR_shp_Q14;
@@ -558,15 +564,15 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
             psSS[ 1 ].xq_Q14       = xq_Q14;
         }
 
-        *smpl_buf_idx  = ( *smpl_buf_idx - 1 ) % DECISION_DELAY;
-        if( *smpl_buf_idx < 0 ) *smpl_buf_idx += DECISION_DELAY;
-        last_smple_idx = ( *smpl_buf_idx + decisionDelay ) % DECISION_DELAY;
+        *smpl_buf_idx  = (*smpl_buf_idx - 1)%DECISION_DELAY;
+        if (*smpl_buf_idx < 0)  *smpl_buf_idx += DECISION_DELAY;
+        last_smple_idx = (*smpl_buf_idx + decisionDelay)%DECISION_DELAY;
 
         /* Find winner */
         RDmin_Q10 = psSampleState[ 0 ][ 0 ].RD_Q10;
         Winner_ind = 0;
-        for( k = 1; k < nStatesDelayedDecision; k++ ) {
-            if( psSampleState[ k ][ 0 ].RD_Q10 < RDmin_Q10 ) {
+        for (k = 1; k < nStatesDelayedDecision; k++) {
+            if (psSampleState[ k ][ 0 ].RD_Q10 < RDmin_Q10) {
                 RDmin_Q10  = psSampleState[ k ][ 0 ].RD_Q10;
                 Winner_ind = k;
             }
@@ -574,10 +580,10 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
 
         /* Increase RD values of expired states */
         Winner_rand_state = psDelDec[ Winner_ind ].RandState[ last_smple_idx ];
-        for( k = 0; k < nStatesDelayedDecision; k++ ) {
-            if( psDelDec[ k ].RandState[ last_smple_idx ] != Winner_rand_state ) {
-                psSampleState[ k ][ 0 ].RD_Q10 = silk_ADD32( psSampleState[ k ][ 0 ].RD_Q10, silk_int32_MAX >> 4 );
-                psSampleState[ k ][ 1 ].RD_Q10 = silk_ADD32( psSampleState[ k ][ 1 ].RD_Q10, silk_int32_MAX >> 4 );
+        for (k = 0; k < nStatesDelayedDecision; k++) {
+            if (psDelDec[ k ].RandState[ last_smple_idx ] != Winner_rand_state) {
+                psSampleState[ k ][ 0 ].RD_Q10 = silk_ADD32( psSampleState[ k ][ 0 ].RD_Q10, silk_int32_MAX>>4 );
+                psSampleState[ k ][ 1 ].RD_Q10 = silk_ADD32( psSampleState[ k ][ 1 ].RD_Q10, silk_int32_MAX>>4 );
                 silk_assert( psSampleState[ k ][ 0 ].RD_Q10 >= 0 );
             }
         }
@@ -587,32 +593,32 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
         RDmin_Q10  = psSampleState[ 0 ][ 1 ].RD_Q10;
         RDmax_ind = 0;
         RDmin_ind = 0;
-        for( k = 1; k < nStatesDelayedDecision; k++ ) {
+        for (k = 1; k < nStatesDelayedDecision; k++) {
             /* find worst in first set */
-            if( psSampleState[ k ][ 0 ].RD_Q10 > RDmax_Q10 ) {
+            if (psSampleState[ k ][ 0 ].RD_Q10 > RDmax_Q10) {
                 RDmax_Q10  = psSampleState[ k ][ 0 ].RD_Q10;
                 RDmax_ind = k;
             }
             /* find best in second set */
-            if( psSampleState[ k ][ 1 ].RD_Q10 < RDmin_Q10 ) {
+            if (psSampleState[ k ][ 1 ].RD_Q10 < RDmin_Q10) {
                 RDmin_Q10  = psSampleState[ k ][ 1 ].RD_Q10;
                 RDmin_ind = k;
             }
         }
 
         /* Replace a state if best from second set outperforms worst in first set */
-        if( RDmin_Q10 < RDmax_Q10 ) {
-            silk_memcpy( ( (oac_int32 *)&psDelDec[ RDmax_ind ] ) + i,
-                         ( (oac_int32 *)&psDelDec[ RDmin_ind ] ) + i, sizeof( NSQ_del_dec_struct ) - i * sizeof( oac_int32) );
-            silk_memcpy( &psSampleState[ RDmax_ind ][ 0 ], &psSampleState[ RDmin_ind ][ 1 ], sizeof( NSQ_sample_struct ) );
+        if (RDmin_Q10 < RDmax_Q10) {
+            silk_memcpy(((oac_int32 *)&psDelDec[ RDmax_ind ]) + i,
+                ((oac_int32 *)&psDelDec[ RDmin_ind ]) + i, sizeof(NSQ_del_dec_struct) - i*sizeof(oac_int32));
+            silk_memcpy( &psSampleState[ RDmax_ind ][ 0 ], &psSampleState[ RDmin_ind ][ 1 ], sizeof(NSQ_sample_struct));
         }
 
         /* Write samples from winner to output and long-term filter states */
         psDD = &psDelDec[ Winner_ind ];
-        if( subfr > 0 || i >= decisionDelay ) {
+        if (subfr > 0 || i >= decisionDelay) {
             pulses[  i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ], 10 );
             xq[ i - decisionDelay ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND(
-                silk_SMULWW( psDD->Xq_Q14[ last_smple_idx ], delayedGain_Q10[ last_smple_idx ] ), 8 ) );
+                silk_SMULWW( psDD->Xq_Q14[ last_smple_idx ], delayedGain_Q10[ last_smple_idx ] ), 8 ));
             NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay ] = psDD->Shape_Q14[ last_smple_idx ];
             sLTP_Q15[          NSQ->sLTP_buf_idx     - decisionDelay ] = psDD->Pred_Q15[  last_smple_idx ];
         }
@@ -620,7 +626,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
         NSQ->sLTP_buf_idx++;
 
         /* Update states */
-        for( k = 0; k < nStatesDelayedDecision; k++ ) {
+        for (k = 0; k < nStatesDelayedDecision; k++) {
             psDD                                     = &psDelDec[ k ];
             psSS                                     = &psSampleState[ k ][ 0 ];
             psDD->LF_AR_Q14                          = psSS->LF_AR_Q14;
@@ -630,16 +636,17 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
             psDD->Q_Q10[     *smpl_buf_idx ]         = psSS->Q_Q10;
             psDD->Pred_Q15[  *smpl_buf_idx ]         = silk_LSHIFT32( psSS->LPC_exc_Q14, 1 );
             psDD->Shape_Q14[ *smpl_buf_idx ]         = psSS->sLTP_shp_Q14;
-            psDD->Seed                               = silk_ADD32_ovflw( psDD->Seed, silk_RSHIFT_ROUND( psSS->Q_Q10, 10 ) );
+            psDD->Seed                               = silk_ADD32_ovflw( psDD->Seed,
+            silk_RSHIFT_ROUND( psSS->Q_Q10, 10 ));
             psDD->RandState[ *smpl_buf_idx ]         = psDD->Seed;
             psDD->RD_Q10                             = psSS->RD_Q10;
         }
         delayedGain_Q10[     *smpl_buf_idx ]         = Gain_Q10;
     }
     /* Update LPC states */
-    for( k = 0; k < nStatesDelayedDecision; k++ ) {
+    for (k = 0; k < nStatesDelayedDecision; k++) {
         psDD = &psDelDec[ k ];
-        silk_memcpy( psDD->sLPC_Q14, &psDD->sLPC_Q14[ length ], NSQ_LPC_BUF_LENGTH * sizeof( oac_int32 ) );
+        silk_memcpy( psDD->sLPC_Q14, &psDD->sLPC_Q14[ length ], NSQ_LPC_BUF_LENGTH*sizeof(oac_int32));
     }
     RESTORE_STACK;
 }
@@ -648,22 +655,21 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
 static OAC_INLINE void silk_nsq_del_dec_scale_states(
     const silk_encoder_state *psEncC,               /* I    Encoder State                       */
     silk_nsq_state      *NSQ,                       /* I/O  NSQ state                           */
-    NSQ_del_dec_struct  psDelDec[],                 /* I/O  Delayed decision states             */
-    const oac_int16    x16[],                      /* I    Input                               */
-    oac_int32          x_sc_Q10[],                 /* O    Input scaled with 1/Gain in Q10     */
-    const oac_int16    sLTP[],                     /* I    Re-whitened LTP state in Q0         */
-    oac_int32          sLTP_Q15[],                 /* O    LTP state matching scaled input     */
-    oac_int            subfr,                      /* I    Subframe number                     */
-    oac_int            nStatesDelayedDecision,     /* I    Number of del dec states            */
-    const oac_int      LTP_scale_Q14,              /* I    LTP state scaling                   */
-    const oac_int32    Gains_Q16[ MAX_NB_SUBFR ],  /* I                                        */
-    const oac_int      pitchL[ MAX_NB_SUBFR ],     /* I    Pitch lag                           */
-    const oac_int      signal_type,                /* I    Signal type                         */
-    const oac_int      decisionDelay               /* I    Decision delay                      */
-)
-{
-    oac_int            i, k, lag;
-    oac_int32          gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
+    NSQ_del_dec_struct psDelDec[],                  /* I/O  Delayed decision states             */
+    const oac_int16 x16[],                         /* I    Input                               */
+    oac_int32 x_sc_Q10[],                          /* O    Input scaled with 1/Gain in Q10     */
+    const oac_int16 sLTP[],                        /* I    Re-whitened LTP state in Q0         */
+    oac_int32 sLTP_Q15[],                          /* O    LTP state matching scaled input     */
+    oac_int subfr,                                 /* I    Subframe number                     */
+    oac_int nStatesDelayedDecision,                /* I    Number of del dec states            */
+    const oac_int LTP_scale_Q14,                   /* I    LTP state scaling                   */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],     /* I                                        */
+    const oac_int pitchL[ MAX_NB_SUBFR ],          /* I    Pitch lag                           */
+    const oac_int signal_type,                     /* I    Signal type                         */
+    const oac_int decisionDelay                    /* I    Decision delay                      */
+    ) {
+    oac_int i, k, lag;
+    oac_int32 gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
     NSQ_del_dec_struct  *psDD;
 
     lag          = pitchL[ subfr ];
@@ -672,39 +678,39 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states(
 
     /* Scale input */
     inv_gain_Q26 = silk_RSHIFT_ROUND( inv_gain_Q31, 5 );
-    for( i = 0; i < psEncC->subfr_length; i++ ) {
+    for (i = 0; i < psEncC->subfr_length; i++) {
         x_sc_Q10[ i ] = silk_SMULWW( x16[ i ], inv_gain_Q26 );
     }
 
     /* After rewhitening the LTP state is un-scaled, so scale with inv_gain_Q16 */
-    if( NSQ->rewhite_flag ) {
-        if( subfr == 0 ) {
+    if (NSQ->rewhite_flag) {
+        if (subfr == 0) {
             /* Do LTP downscaling */
             inv_gain_Q31 = silk_LSHIFT( silk_SMULWB( inv_gain_Q31, LTP_scale_Q14 ), 2 );
         }
-        for( i = NSQ->sLTP_buf_idx - lag - LTP_ORDER / 2; i < NSQ->sLTP_buf_idx; i++ ) {
+        for (i = NSQ->sLTP_buf_idx - lag - LTP_ORDER/2; i < NSQ->sLTP_buf_idx; i++) {
             silk_assert( i < MAX_FRAME_LENGTH );
             sLTP_Q15[ i ] = silk_SMULWB( inv_gain_Q31, sLTP[ i ] );
         }
     }
 
     /* Adjust for changing gain */
-    if( Gains_Q16[ subfr ] != NSQ->prev_gain_Q16 ) {
+    if (Gains_Q16[ subfr ] != NSQ->prev_gain_Q16) {
         gain_adj_Q16 =  silk_DIV32_varQ( NSQ->prev_gain_Q16, Gains_Q16[ subfr ], 16 );
 
         /* Scale long-term shaping state */
-        for( i = NSQ->sLTP_shp_buf_idx - psEncC->ltp_mem_length; i < NSQ->sLTP_shp_buf_idx; i++ ) {
+        for (i = NSQ->sLTP_shp_buf_idx - psEncC->ltp_mem_length; i < NSQ->sLTP_shp_buf_idx; i++) {
             NSQ->sLTP_shp_Q14[ i ] = silk_SMULWW( gain_adj_Q16, NSQ->sLTP_shp_Q14[ i ] );
         }
 
         /* Scale long-term prediction state */
-        if( signal_type == TYPE_VOICED && NSQ->rewhite_flag == 0 ) {
-            for( i = NSQ->sLTP_buf_idx - lag - LTP_ORDER / 2; i < NSQ->sLTP_buf_idx - decisionDelay; i++ ) {
+        if (signal_type == TYPE_VOICED && NSQ->rewhite_flag == 0) {
+            for (i = NSQ->sLTP_buf_idx - lag - LTP_ORDER/2; i < NSQ->sLTP_buf_idx - decisionDelay; i++) {
                 sLTP_Q15[ i ] = silk_SMULWW( gain_adj_Q16, sLTP_Q15[ i ] );
             }
         }
 
-        for( k = 0; k < nStatesDelayedDecision; k++ ) {
+        for (k = 0; k < nStatesDelayedDecision; k++) {
             psDD = &psDelDec[ k ];
 
             /* Scale scalar states */
@@ -712,13 +718,13 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states(
             psDD->Diff_Q14 = silk_SMULWW( gain_adj_Q16, psDD->Diff_Q14 );
 
             /* Scale short-term prediction and shaping states */
-            for( i = 0; i < NSQ_LPC_BUF_LENGTH; i++ ) {
+            for (i = 0; i < NSQ_LPC_BUF_LENGTH; i++) {
                 psDD->sLPC_Q14[ i ] = silk_SMULWW( gain_adj_Q16, psDD->sLPC_Q14[ i ] );
             }
-            for( i = 0; i < MAX_SHAPE_LPC_ORDER; i++ ) {
+            for (i = 0; i < MAX_SHAPE_LPC_ORDER; i++) {
                 psDD->sAR2_Q14[ i ] = silk_SMULWW( gain_adj_Q16, psDD->sAR2_Q14[ i ] );
             }
-            for( i = 0; i < DECISION_DELAY; i++ ) {
+            for (i = 0; i < DECISION_DELAY; i++) {
                 psDD->Pred_Q15[  i ] = silk_SMULWW( gain_adj_Q16, psDD->Pred_Q15[  i ] );
                 psDD->Shape_Q14[ i ] = silk_SMULWW( gain_adj_Q16, psDD->Shape_Q14[ i ] );
             }
diff --git a/silk/PLC.c b/silk/PLC.c
index 1d79548c1..af2e2cc00 100644
--- a/silk/PLC.c
+++ b/silk/PLC.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -34,7 +34,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "PLC.h"
 
 #ifdef ENABLE_DEEP_PLC
-#include "lpcnet.h"
+# include "lpcnet.h"
 #endif
 
 #define NB_ATT 2
@@ -45,23 +45,22 @@ static const oac_int16 PLC_RAND_ATTENUATE_UV_Q15[NB_ATT] = { 32440, 29491 }; /*
 static OAC_INLINE void silk_PLC_update(
     silk_decoder_state                  *psDec,             /* I/O Decoder state        */
     silk_decoder_control                *psDecCtrl          /* I/O Decoder control      */
-);
+    );
 
 static OAC_INLINE void silk_PLC_conceal(
     silk_decoder_state                  *psDec,             /* I/O Decoder state        */
     silk_decoder_control                *psDecCtrl,         /* I/O Decoder control      */
-    oac_int16                          frame[],            /* O LPC residual signal    */
+    oac_int16 frame[],                                     /* O LPC residual signal    */
 #ifdef ENABLE_DEEP_PLC
     LPCNetPLCState                      *lpcnet,
 #endif
-    int                                 arch                /* I  Run-time architecture */
-);
+    int arch                                                /* I  Run-time architecture */
+    );
 
 
 void silk_PLC_Reset(
     silk_decoder_state                  *psDec              /* I/O Decoder state        */
-)
-{
+    ) {
     psDec->sPLC.pitchL_Q8 = silk_LSHIFT( psDec->frame_length, 8 - 1 );
     psDec->sPLC.prevGain_Q16[ 0 ] = SILK_FIX_CONST( 1, 16 );
     psDec->sPLC.prevGain_Q16[ 1 ] = SILK_FIX_CONST( 1, 16 );
@@ -72,21 +71,20 @@ void silk_PLC_Reset(
 void silk_PLC(
     silk_decoder_state                  *psDec,             /* I/O Decoder state        */
     silk_decoder_control                *psDecCtrl,         /* I/O Decoder control      */
-    oac_int16                          frame[],            /* I/O  signal              */
-    oac_int                            lost,               /* I Loss flag              */
+    oac_int16 frame[],                                     /* I/O  signal              */
+    oac_int lost,                                          /* I Loss flag              */
 #ifdef ENABLE_DEEP_PLC
     LPCNetPLCState                      *lpcnet,
 #endif
-    int                                 arch                /* I Run-time architecture  */
-)
-{
+    int arch                                                /* I Run-time architecture  */
+    ) {
     /* PLC control function */
-    if( psDec->fs_kHz != psDec->sPLC.fs_kHz ) {
+    if (psDec->fs_kHz != psDec->sPLC.fs_kHz) {
         silk_PLC_Reset( psDec );
         psDec->sPLC.fs_kHz = psDec->fs_kHz;
     }
 
-    if( lost ) {
+    if (lost) {
         /****************************/
         /* Generate Signal          */
         /****************************/
@@ -103,10 +101,10 @@ void silk_PLC(
         /****************************/
         silk_PLC_update( psDec, psDecCtrl );
 #ifdef ENABLE_DEEP_PLC
-        if ( lpcnet != NULL && psDec->sPLC.fs_kHz == 16 ) {
+        if (lpcnet != NULL && psDec->sPLC.fs_kHz == 16) {
             int k;
-            for( k = 0; k < psDec->nb_subfr; k += 2 ) {
-                lpcnet_plc_update( lpcnet, frame + k * psDec->subfr_length );
+            for (k = 0; k < psDec->nb_subfr; k += 2) {
+                lpcnet_plc_update( lpcnet, frame + k*psDec->subfr_length );
             }
         }
 #endif
@@ -119,10 +117,9 @@ void silk_PLC(
 static OAC_INLINE void silk_PLC_update(
     silk_decoder_state                  *psDec,             /* I/O Decoder state        */
     silk_decoder_control                *psDecCtrl          /* I/O Decoder control      */
-)
-{
+    ) {
     oac_int32 LTP_Gain_Q14, temp_LTP_Gain_Q14;
-    oac_int   i, j;
+    oac_int i, j;
     silk_PLC_struct *psPLC;
 
     psPLC = &psDec->sPLC;
@@ -130,68 +127,68 @@ static OAC_INLINE void silk_PLC_update(
     /* Update parameters used in case of packet loss */
     psDec->prevSignalType = psDec->indices.signalType;
     LTP_Gain_Q14 = 0;
-    if( psDec->indices.signalType == TYPE_VOICED ) {
+    if (psDec->indices.signalType == TYPE_VOICED) {
         /* Find the parameters for the last subframe which contains a pitch pulse */
-        for( j = 0; j * psDec->subfr_length < psDecCtrl->pitchL[ psDec->nb_subfr - 1 ]; j++ ) {
-            if( j == psDec->nb_subfr ) {
+        for (j = 0; j*psDec->subfr_length < psDecCtrl->pitchL[ psDec->nb_subfr - 1 ]; j++) {
+            if (j == psDec->nb_subfr) {
                 break;
             }
             temp_LTP_Gain_Q14 = 0;
-            for( i = 0; i < LTP_ORDER; i++ ) {
-                temp_LTP_Gain_Q14 += psDecCtrl->LTPCoef_Q14[ ( psDec->nb_subfr - 1 - j ) * LTP_ORDER  + i ];
+            for (i = 0; i < LTP_ORDER; i++) {
+                temp_LTP_Gain_Q14 += psDecCtrl->LTPCoef_Q14[ (psDec->nb_subfr - 1 - j)*LTP_ORDER  + i ];
             }
-            if( temp_LTP_Gain_Q14 > LTP_Gain_Q14 ) {
+            if (temp_LTP_Gain_Q14 > LTP_Gain_Q14) {
                 LTP_Gain_Q14 = temp_LTP_Gain_Q14;
                 silk_memcpy( psPLC->LTPCoef_Q14,
                     &psDecCtrl->LTPCoef_Q14[ silk_SMULBB( psDec->nb_subfr - 1 - j, LTP_ORDER ) ],
-                    LTP_ORDER * sizeof( oac_int16 ) );
+                    LTP_ORDER*sizeof(oac_int16));
 
                 psPLC->pitchL_Q8 = silk_LSHIFT( psDecCtrl->pitchL[ psDec->nb_subfr - 1 - j ], 8 );
             }
         }
 
-        silk_memset( psPLC->LTPCoef_Q14, 0, LTP_ORDER * sizeof( oac_int16 ) );
-        psPLC->LTPCoef_Q14[ LTP_ORDER / 2 ] = LTP_Gain_Q14;
+        silk_memset( psPLC->LTPCoef_Q14, 0, LTP_ORDER*sizeof(oac_int16));
+        psPLC->LTPCoef_Q14[ LTP_ORDER/2 ] = LTP_Gain_Q14;
 
         /* Limit LT coefs */
-        if( LTP_Gain_Q14 < V_PITCH_GAIN_START_MIN_Q14 ) {
-            oac_int   scale_Q10;
+        if (LTP_Gain_Q14 < V_PITCH_GAIN_START_MIN_Q14) {
+            oac_int scale_Q10;
             oac_int32 tmp;
 
             tmp = silk_LSHIFT( V_PITCH_GAIN_START_MIN_Q14, 10 );
-            scale_Q10 = silk_DIV32( tmp, silk_max( LTP_Gain_Q14, 1 ) );
-            for( i = 0; i < LTP_ORDER; i++ ) {
+            scale_Q10 = silk_DIV32( tmp, silk_max( LTP_Gain_Q14, 1 ));
+            for (i = 0; i < LTP_ORDER; i++) {
                 psPLC->LTPCoef_Q14[ i ] = silk_RSHIFT( silk_SMULBB( psPLC->LTPCoef_Q14[ i ], scale_Q10 ), 10 );
             }
-        } else if( LTP_Gain_Q14 > V_PITCH_GAIN_START_MAX_Q14 ) {
-            oac_int   scale_Q14;
+        } else if (LTP_Gain_Q14 > V_PITCH_GAIN_START_MAX_Q14) {
+            oac_int scale_Q14;
             oac_int32 tmp;
 
             tmp = silk_LSHIFT( V_PITCH_GAIN_START_MAX_Q14, 14 );
-            scale_Q14 = silk_DIV32( tmp, silk_max( LTP_Gain_Q14, 1 ) );
-            for( i = 0; i < LTP_ORDER; i++ ) {
+            scale_Q14 = silk_DIV32( tmp, silk_max( LTP_Gain_Q14, 1 ));
+            for (i = 0; i < LTP_ORDER; i++) {
                 psPLC->LTPCoef_Q14[ i ] = silk_RSHIFT( silk_SMULBB( psPLC->LTPCoef_Q14[ i ], scale_Q14 ), 14 );
             }
         }
     } else {
         psPLC->pitchL_Q8 = silk_LSHIFT( silk_SMULBB( psDec->fs_kHz, 18 ), 8 );
-        silk_memset( psPLC->LTPCoef_Q14, 0, LTP_ORDER * sizeof( oac_int16 ));
+        silk_memset( psPLC->LTPCoef_Q14, 0, LTP_ORDER*sizeof(oac_int16));
     }
 
     /* Save LPC coefficients */
-    silk_memcpy( psPLC->prevLPC_Q12, psDecCtrl->PredCoef_Q12[ 1 ], psDec->LPC_order * sizeof( oac_int16 ) );
+    silk_memcpy( psPLC->prevLPC_Q12, psDecCtrl->PredCoef_Q12[ 1 ], psDec->LPC_order*sizeof(oac_int16));
     psPLC->prevLTP_scale_Q14 = psDecCtrl->LTP_scale_Q14;
 
     /* Save last two gains */
-    silk_memcpy( psPLC->prevGain_Q16, &psDecCtrl->Gains_Q16[ psDec->nb_subfr - 2 ], 2 * sizeof( oac_int32 ) );
+    silk_memcpy( psPLC->prevGain_Q16, &psDecCtrl->Gains_Q16[ psDec->nb_subfr - 2 ], 2*sizeof(oac_int32));
 
     psPLC->subfr_length = psDec->subfr_length;
     psPLC->nb_subfr = psDec->nb_subfr;
 }
 
 static OAC_INLINE void silk_PLC_energy(oac_int32 *energy1, oac_int *shift1, oac_int32 *energy2, oac_int *shift2,
-      const oac_int32 *exc_Q14, const oac_int32 *prevGain_Q10, int subfr_length, int nb_subfr)
-{
+                                       const oac_int32 *exc_Q14, const oac_int32 *prevGain_Q10, int subfr_length,
+                                       int nb_subfr) {
     int i, k;
     VARDECL( oac_int16, exc_buf );
     oac_int16 *exc_buf_ptr;
@@ -200,10 +197,10 @@ static OAC_INLINE void silk_PLC_energy(oac_int32 *energy1, oac_int *shift1, oac_
     /* Find random noise component */
     /* Scale previous excitation signal */
     exc_buf_ptr = exc_buf;
-    for( k = 0; k < 2; k++ ) {
-        for( i = 0; i < subfr_length; i++ ) {
+    for (k = 0; k < 2; k++) {
+        for (i = 0; i < subfr_length; i++) {
             exc_buf_ptr[ i ] = (oac_int16)silk_SAT16( silk_RSHIFT(
-                silk_SMULWW( exc_Q14[ i + ( k + nb_subfr - 2 ) * subfr_length ], prevGain_Q10[ k ] ), 8 ) );
+                silk_SMULWW( exc_Q14[ i + (k + nb_subfr - 2)*subfr_length ], prevGain_Q10[ k ] ), 8 ));
         }
         exc_buf_ptr += subfr_length;
     }
@@ -216,15 +213,14 @@ static OAC_INLINE void silk_PLC_energy(oac_int32 *energy1, oac_int *shift1, oac_
 static OAC_INLINE void silk_PLC_conceal(
     silk_decoder_state                  *psDec,             /* I/O Decoder state        */
     silk_decoder_control                *psDecCtrl,         /* I/O Decoder control      */
-    oac_int16                          frame[],            /* O LPC residual signal    */
+    oac_int16 frame[],                                     /* O LPC residual signal    */
 #ifdef ENABLE_DEEP_PLC
     LPCNetPLCState                      *lpcnet,
 #endif
-    int                                 arch                /* I Run-time architecture  */
-)
-{
-    oac_int   i, j, k;
-    oac_int   lag, idx, sLTP_buf_idx, shift1, shift2;
+    int arch                                                /* I Run-time architecture  */
+    ) {
+    oac_int i, j, k;
+    oac_int lag, idx, sLTP_buf_idx, shift1, shift2;
     oac_int32 rand_seed, harm_Gain_Q15, rand_Gain_Q15, inv_gain_Q30;
     oac_int32 energy1, energy2, *rand_ptr, *pred_lag_ptr;
     oac_int32 LPC_pred_Q10, LTP_pred_Q12;
@@ -245,7 +241,7 @@ static OAC_INLINE void silk_PLC_conceal(
     ALLOC( sLTP_Q14, psDec->ltp_mem_length + psDec->frame_length, oac_int32 );
 #ifdef SMALL_FOOTPRINT
     /* Ugly hack that breaks aliasing rules to save stack: put sLTP at the very end of sLTP_Q14. */
-    sLTP = ((oac_int16*)&sLTP_Q14[psDec->ltp_mem_length + psDec->frame_length])-psDec->ltp_mem_length;
+    sLTP = ((oac_int16*)&sLTP_Q14[psDec->ltp_mem_length + psDec->frame_length]) - psDec->ltp_mem_length;
 #else
     ALLOC( sLTP, psDec->ltp_mem_length, oac_int16 );
 #endif
@@ -253,18 +249,19 @@ static OAC_INLINE void silk_PLC_conceal(
     prevGain_Q10[0] = silk_RSHIFT( psPLC->prevGain_Q16[ 0 ], 6);
     prevGain_Q10[1] = silk_RSHIFT( psPLC->prevGain_Q16[ 1 ], 6);
 
-    if( psDec->first_frame_after_reset ) {
-       silk_memset( psPLC->prevLPC_Q12, 0, sizeof( psPLC->prevLPC_Q12 ) );
+    if (psDec->first_frame_after_reset) {
+        silk_memset( psPLC->prevLPC_Q12, 0, sizeof(psPLC->prevLPC_Q12));
     }
 
-    silk_PLC_energy(&energy1, &shift1, &energy2, &shift2, psDec->exc_Q14, prevGain_Q10, psDec->subfr_length, psDec->nb_subfr);
+    silk_PLC_energy(&energy1, &shift1, &energy2, &shift2, psDec->exc_Q14, prevGain_Q10, psDec->subfr_length,
+    psDec->nb_subfr);
 
-    if( silk_RSHIFT( energy1, shift2 ) < silk_RSHIFT( energy2, shift1 ) ) {
+    if (silk_RSHIFT( energy1, shift2 ) < silk_RSHIFT( energy2, shift1 )) {
         /* First sub-frame has lowest energy */
-        rand_ptr = &psDec->exc_Q14[ silk_max_int( 0, ( psPLC->nb_subfr - 1 ) * psPLC->subfr_length - RAND_BUF_SIZE ) ];
+        rand_ptr = &psDec->exc_Q14[ silk_max_int( 0, (psPLC->nb_subfr - 1)*psPLC->subfr_length - RAND_BUF_SIZE ) ];
     } else {
         /* Second sub-frame has lowest energy */
-        rand_ptr = &psDec->exc_Q14[ silk_max_int( 0, psPLC->nb_subfr * psPLC->subfr_length - RAND_BUF_SIZE ) ];
+        rand_ptr = &psDec->exc_Q14[ silk_max_int( 0, psPLC->nb_subfr*psPLC->subfr_length - RAND_BUF_SIZE ) ];
     }
 
     /* Set up Gain to random noise component */
@@ -273,25 +270,25 @@ static OAC_INLINE void silk_PLC_conceal(
 
     /* Set up attenuation gains */
     harm_Gain_Q15 = HARM_ATT_Q15[ silk_min_int( NB_ATT - 1, psDec->lossCnt ) ];
-    if( psDec->prevSignalType == TYPE_VOICED ) {
+    if (psDec->prevSignalType == TYPE_VOICED) {
         rand_Gain_Q15 = PLC_RAND_ATTENUATE_V_Q15[  silk_min_int( NB_ATT - 1, psDec->lossCnt ) ];
     } else {
         rand_Gain_Q15 = PLC_RAND_ATTENUATE_UV_Q15[ silk_min_int( NB_ATT - 1, psDec->lossCnt ) ];
     }
 
     /* LPC concealment. Apply BWE to previous LPC */
-    silk_bwexpander( psPLC->prevLPC_Q12, psDec->LPC_order, SILK_FIX_CONST( BWE_COEF, 16 ) );
+    silk_bwexpander( psPLC->prevLPC_Q12, psDec->LPC_order, SILK_FIX_CONST( BWE_COEF, 16 ));
 
     /* Preload LPC coefficients to array on stack. Gives small performance gain */
-    silk_memcpy( A_Q12, psPLC->prevLPC_Q12, psDec->LPC_order * sizeof( oac_int16 ) );
+    silk_memcpy( A_Q12, psPLC->prevLPC_Q12, psDec->LPC_order*sizeof(oac_int16));
 
     /* First Lost frame */
-    if( psDec->lossCnt == 0 ) {
-        rand_scale_Q14 = 1 << 14;
+    if (psDec->lossCnt == 0) {
+        rand_scale_Q14 = 1<<14;
 
         /* Reduce random noise Gain for voiced frames */
-        if( psDec->prevSignalType == TYPE_VOICED ) {
-            for( i = 0; i < LTP_ORDER; i++ ) {
+        if (psDec->prevSignalType == TYPE_VOICED) {
+            for (i = 0; i < LTP_ORDER; i++) {
                 rand_scale_Q14 -= B_Q14[ i ];
             }
             rand_scale_Q14 = silk_max_16( 3277, rand_scale_Q14 ); /* 0.2 */
@@ -302,8 +299,8 @@ static OAC_INLINE void silk_PLC_conceal(
 
             invGain_Q30 = silk_LPC_inverse_pred_gain( psPLC->prevLPC_Q12, psDec->LPC_order, arch );
 
-            down_scale_Q30 = silk_min_32( silk_RSHIFT( (oac_int32)1 << 30, LOG2_INV_LPC_GAIN_HIGH_THRES ), invGain_Q30 );
-            down_scale_Q30 = silk_max_32( silk_RSHIFT( (oac_int32)1 << 30, LOG2_INV_LPC_GAIN_LOW_THRES ), down_scale_Q30 );
+            down_scale_Q30 = silk_min_32( silk_RSHIFT((oac_int32)1<<30, LOG2_INV_LPC_GAIN_HIGH_THRES ), invGain_Q30 );
+            down_scale_Q30 = silk_max_32( silk_RSHIFT((oac_int32)1<<30, LOG2_INV_LPC_GAIN_LOW_THRES ), down_scale_Q30 );
             down_scale_Q30 = silk_LSHIFT( down_scale_Q30, LOG2_INV_LPC_GAIN_HIGH_THRES );
 
             rand_Gain_Q15 = silk_RSHIFT( silk_SMULWB( down_scale_Q30, rand_Gain_Q15 ), 14 );
@@ -315,23 +312,24 @@ static OAC_INLINE void silk_PLC_conceal(
     sLTP_buf_idx = psDec->ltp_mem_length;
 
     /* Rewhiten LTP state */
-    idx = psDec->ltp_mem_length - lag - psDec->LPC_order - LTP_ORDER / 2;
+    idx = psDec->ltp_mem_length - lag - psDec->LPC_order - LTP_ORDER/2;
     celt_assert( idx > 0 );
-    silk_LPC_analysis_filter( &sLTP[ idx ], &psDec->outBuf[ idx ], A_Q12, psDec->ltp_mem_length - idx, psDec->LPC_order, arch );
+    silk_LPC_analysis_filter( &sLTP[ idx ], &psDec->outBuf[ idx ], A_Q12, psDec->ltp_mem_length - idx, psDec->LPC_order,
+    arch );
     /* Scale LTP state */
     inv_gain_Q30 = silk_INVERSE32_varQ( psPLC->prevGain_Q16[ 1 ], 46 );
-    inv_gain_Q30 = silk_min( inv_gain_Q30, silk_int32_MAX >> 1 );
-    for( i = idx + psDec->LPC_order; i < psDec->ltp_mem_length; i++ ) {
+    inv_gain_Q30 = silk_min( inv_gain_Q30, silk_int32_MAX>>1 );
+    for (i = idx + psDec->LPC_order; i < psDec->ltp_mem_length; i++) {
         sLTP_Q14[ i ] = silk_SMULWB( inv_gain_Q30, sLTP[ i ] );
     }
 
     /***************************/
     /* LTP synthesis filtering */
     /***************************/
-    for( k = 0; k < psDec->nb_subfr; k++ ) {
+    for (k = 0; k < psDec->nb_subfr; k++) {
         /* Set up pointer */
-        pred_lag_ptr = &sLTP_Q14[ sLTP_buf_idx - lag + LTP_ORDER / 2 ];
-        for( i = 0; i < psDec->subfr_length; i++ ) {
+        pred_lag_ptr = &sLTP_Q14[ sLTP_buf_idx - lag + LTP_ORDER/2 ];
+        for (i = 0; i < psDec->subfr_length; i++) {
             /* Unrolled loop */
             /* Avoids introducing a bias because silk_SMLAWB() always rounds to -inf */
             LTP_pred_Q12 = 2;
@@ -344,13 +342,13 @@ static OAC_INLINE void silk_PLC_conceal(
 
             /* Generate LPC excitation */
             rand_seed = silk_RAND( rand_seed );
-            idx = silk_RSHIFT( rand_seed, 25 ) & RAND_BUF_MASK;
+            idx = silk_RSHIFT( rand_seed, 25 )&RAND_BUF_MASK;
             sLTP_Q14[ sLTP_buf_idx ] = silk_LSHIFT32( silk_SMLAWB( LTP_pred_Q12, rand_ptr[ idx ], rand_scale_Q14 ), 2 );
             sLTP_buf_idx++;
         }
 
         /* Gradually reduce LTP gain */
-        for( j = 0; j < LTP_ORDER; j++ ) {
+        for (j = 0; j < LTP_ORDER; j++) {
             B_Q14[ j ] = silk_RSHIFT( silk_SMULBB( harm_Gain_Q15, B_Q14[ j ] ), 15 );
         }
         /* Gradually reduce excitation gain */
@@ -358,7 +356,8 @@ static OAC_INLINE void silk_PLC_conceal(
 
         /* Slowly increase pitch lag */
         psPLC->pitchL_Q8 = silk_SMLAWB( psPLC->pitchL_Q8, psPLC->pitchL_Q8, PITCH_DRIFT_FAC_Q16 );
-        psPLC->pitchL_Q8 = silk_min_32( psPLC->pitchL_Q8, silk_LSHIFT( silk_SMULBB( MAX_PITCH_LAG_MS, psDec->fs_kHz ), 8 ) );
+        psPLC->pitchL_Q8 = silk_min_32( psPLC->pitchL_Q8,
+        silk_LSHIFT( silk_SMULBB( MAX_PITCH_LAG_MS, psDec->fs_kHz ), 8 ));
         lag = silk_RSHIFT_ROUND( psPLC->pitchL_Q8, 8 );
     }
 
@@ -368,10 +367,10 @@ static OAC_INLINE void silk_PLC_conceal(
     sLPC_Q14_ptr = &sLTP_Q14[ psDec->ltp_mem_length - MAX_LPC_ORDER ];
 
     /* Copy LPC state */
-    silk_memcpy( sLPC_Q14_ptr, psDec->sLPC_Q14_buf, MAX_LPC_ORDER * sizeof( oac_int32 ) );
+    silk_memcpy( sLPC_Q14_ptr, psDec->sLPC_Q14_buf, MAX_LPC_ORDER*sizeof(oac_int32));
 
     celt_assert( psDec->LPC_order >= 10 ); /* check that unrolling works */
-    for( i = 0; i < psDec->frame_length; i++ ) {
+    for (i = 0; i < psDec->frame_length; i++) {
         /* partly unrolled */
         /* Avoids introducing a bias because silk_SMLAWB() always rounds to -inf */
         LPC_pred_Q10 = silk_RSHIFT( psDec->LPC_order, 1 );
@@ -385,7 +384,7 @@ static OAC_INLINE void silk_PLC_conceal(
         LPC_pred_Q10 = silk_SMLAWB( LPC_pred_Q10, sLPC_Q14_ptr[ MAX_LPC_ORDER + i -  8 ], A_Q12[ 7 ] );
         LPC_pred_Q10 = silk_SMLAWB( LPC_pred_Q10, sLPC_Q14_ptr[ MAX_LPC_ORDER + i -  9 ], A_Q12[ 8 ] );
         LPC_pred_Q10 = silk_SMLAWB( LPC_pred_Q10, sLPC_Q14_ptr[ MAX_LPC_ORDER + i - 10 ], A_Q12[ 9 ] );
-        for( j = 10; j < psDec->LPC_order; j++ ) {
+        for (j = 10; j < psDec->LPC_order; j++) {
             LPC_pred_Q10 = silk_SMLAWB( LPC_pred_Q10, sLPC_Q14_ptr[ MAX_LPC_ORDER + i - j - 1 ], A_Q12[ j ] );
         }
 
@@ -394,36 +393,38 @@ static OAC_INLINE void silk_PLC_conceal(
                                             silk_LSHIFT_SAT32( LPC_pred_Q10, 4 ));
 
         /* Scale with Gain */
-        frame[ i ] = (oac_int16)silk_SAT16( silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( sLPC_Q14_ptr[ MAX_LPC_ORDER + i ], prevGain_Q10[ 1 ] ), 8 ) ) );
+        frame[ i ] = (oac_int16)silk_SAT16( silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( sLPC_Q14_ptr[ MAX_LPC_ORDER
+                                                                                                      + i ],
+        prevGain_Q10[ 1 ] ), 8 )));
     }
 #ifdef ENABLE_DEEP_PLC
-    if ( lpcnet != NULL && lpcnet->loaded && psDec->sPLC.fs_kHz == 16 ) {
+    if (lpcnet != NULL && lpcnet->loaded && psDec->sPLC.fs_kHz == 16) {
         int run_deep_plc = psDec->sPLC.enable_deep_plc || lpcnet->fec_fill_pos != 0;
-        if( run_deep_plc ) {
-            for( k = 0; k < psDec->nb_subfr; k += 2 ) {
-                lpcnet_plc_conceal( lpcnet, frame + k * psDec->subfr_length );
+        if (run_deep_plc) {
+            for (k = 0; k < psDec->nb_subfr; k += 2) {
+                lpcnet_plc_conceal( lpcnet, frame + k*psDec->subfr_length );
             }
             /* We *should* be able to copy only from psDec->frame_length-MAX_LPC_ORDER, i.e. the last MAX_LPC_ORDER samples. */
-            for( i = 0; i < psDec->frame_length; i++ ) {
-                sLPC_Q14_ptr[ MAX_LPC_ORDER + i ] = (int)floor(.5 + frame[ i ] * (float)(1 << 24) / prevGain_Q10[ 1 ] );
+            for (i = 0; i < psDec->frame_length; i++) {
+                sLPC_Q14_ptr[ MAX_LPC_ORDER + i ] = (int)floor(.5 + frame[ i ]*(float)(1<<24)/prevGain_Q10[ 1 ] );
             }
         } else {
-          for( k = 0; k < psDec->nb_subfr; k += 2 ) {
-              lpcnet_plc_update( lpcnet, frame + k * psDec->subfr_length );
-          }
+            for (k = 0; k < psDec->nb_subfr; k += 2) {
+                lpcnet_plc_update( lpcnet, frame + k*psDec->subfr_length );
+            }
         }
     }
 #endif
 
     /* Save LPC state */
-    silk_memcpy( psDec->sLPC_Q14_buf, &sLPC_Q14_ptr[ psDec->frame_length ], MAX_LPC_ORDER * sizeof( oac_int32 ) );
+    silk_memcpy( psDec->sLPC_Q14_buf, &sLPC_Q14_ptr[ psDec->frame_length ], MAX_LPC_ORDER*sizeof(oac_int32));
 
     /**************************************/
     /* Update states                      */
     /**************************************/
     psPLC->rand_seed     = rand_seed;
     psPLC->randScale_Q14 = rand_scale_Q14;
-    for( i = 0; i < MAX_NB_SUBFR; i++ ) {
+    for (i = 0; i < MAX_NB_SUBFR; i++) {
         psDecCtrl->pitchL[ i ] = lag;
     }
     RESTORE_STACK;
@@ -432,56 +433,55 @@ static OAC_INLINE void silk_PLC_conceal(
 /* Glues concealed frames with new good received frames */
 void silk_PLC_glue_frames(
     silk_decoder_state                  *psDec,             /* I/O decoder state        */
-    oac_int16                          frame[],            /* I/O signal               */
-    oac_int                            length              /* I length of signal       */
-)
-{
-    oac_int   i, energy_shift;
+    oac_int16 frame[],                                     /* I/O signal               */
+    oac_int length                                         /* I length of signal       */
+    ) {
+    oac_int i, energy_shift;
     oac_int32 energy;
     silk_PLC_struct *psPLC;
     psPLC = &psDec->sPLC;
 
-    if( psDec->lossCnt ) {
+    if (psDec->lossCnt) {
         /* Calculate energy in concealed residual */
         silk_sum_sqr_shift( &psPLC->conc_energy, &psPLC->conc_energy_shift, frame, length );
 
         psPLC->last_frame_lost = 1;
     } else {
-        if( psDec->sPLC.last_frame_lost ) {
+        if (psDec->sPLC.last_frame_lost) {
             /* Calculate residual in decoded signal if last frame was lost */
             silk_sum_sqr_shift( &energy, &energy_shift, frame, length );
 
             /* Normalize energies */
-            if( energy_shift > psPLC->conc_energy_shift ) {
+            if (energy_shift > psPLC->conc_energy_shift) {
                 psPLC->conc_energy = silk_RSHIFT( psPLC->conc_energy, energy_shift - psPLC->conc_energy_shift );
-            } else if( energy_shift < psPLC->conc_energy_shift ) {
+            } else if (energy_shift < psPLC->conc_energy_shift) {
                 energy = silk_RSHIFT( energy, psPLC->conc_energy_shift - energy_shift );
             }
 
             /* Fade in the energy difference */
-            if( energy > psPLC->conc_energy ) {
+            if (energy > psPLC->conc_energy) {
                 oac_int32 frac_Q24, LZ;
                 oac_int32 gain_Q16, slope_Q16;
 
                 LZ = silk_CLZ32( psPLC->conc_energy );
                 LZ = LZ - 1;
                 psPLC->conc_energy = silk_LSHIFT( psPLC->conc_energy, LZ );
-                energy = silk_RSHIFT( energy, silk_max_32( 24 - LZ, 0 ) );
+                energy = silk_RSHIFT( energy, silk_max_32( 24 - LZ, 0 ));
 
-                frac_Q24 = silk_DIV32( psPLC->conc_energy, silk_max( energy, 1 ) );
+                frac_Q24 = silk_DIV32( psPLC->conc_energy, silk_max( energy, 1 ));
 
                 gain_Q16 = silk_LSHIFT( silk_SQRT_APPROX( frac_Q24 ), 4 );
-                slope_Q16 = silk_DIV32_16( ( (oac_int32)1 << 16 ) - gain_Q16, length );
+                slope_Q16 = silk_DIV32_16(((oac_int32)1<<16) - gain_Q16, length );
                 /* Make slope 4x steeper to avoid missing onsets after DTX */
                 slope_Q16 = silk_LSHIFT( slope_Q16, 2 );
 #ifdef ENABLE_DEEP_PLC
-                if ( psDec->sPLC.fs_kHz != 16 )
+                if (psDec->sPLC.fs_kHz != 16)
 #endif
                 {
-                    for( i = 0; i < length; i++ ) {
+                    for (i = 0; i < length; i++) {
                         frame[ i ] = silk_SMULWB( gain_Q16, frame[ i ] );
                         gain_Q16 += slope_Q16;
-                        if( gain_Q16 > (oac_int32)1 << 16 ) {
+                        if (gain_Q16 > (oac_int32)1<<16) {
                             break;
                         }
                     }
diff --git a/silk/PLC.h b/silk/PLC.h
index 764d01842..7ac8c609d 100644
--- a/silk/PLC.h
+++ b/silk/PLC.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_PLC_H
@@ -35,30 +35,30 @@ POSSIBILITY OF SUCH DAMAGE.
 #define V_PITCH_GAIN_START_MAX_Q14      15565               /* 0.95 in Q14              */
 #define MAX_PITCH_LAG_MS                18
 #define RAND_BUF_SIZE                   128
-#define RAND_BUF_MASK                   ( RAND_BUF_SIZE - 1 )
+#define RAND_BUF_MASK                   (RAND_BUF_SIZE - 1)
 #define LOG2_INV_LPC_GAIN_HIGH_THRES    3                   /* 2^3 = 8 dB LPC gain      */
 #define LOG2_INV_LPC_GAIN_LOW_THRES     8                   /* 2^8 = 24 dB LPC gain     */
 #define PITCH_DRIFT_FAC_Q16             655                 /* 0.01 in Q16              */
 
 void silk_PLC_Reset(
     silk_decoder_state                  *psDec              /* I/O Decoder state        */
-);
+    );
 
 void silk_PLC(
-    silk_decoder_state                  *psDec,             /* I/O Decoder state        */
-    silk_decoder_control                *psDecCtrl,         /* I/O Decoder control      */
-    oac_int16                          frame[],            /* I/O  signal              */
-    oac_int                            lost,               /* I Loss flag              */
+    silk_decoder_state*psDec,                               /* I/O Decoder state        */
+    silk_decoder_control*psDecCtrl,                         /* I/O Decoder control      */
+    oac_int16 frame[],                                     /* I/O  signal              */
+    oac_int lost,                                          /* I Loss flag              */
 #ifdef ENABLE_DEEP_PLC
-    LPCNetPLCState                      *lpcnet,
+    LPCNetPLCState*lpcnet,
 #endif
-    int                                 arch                /* I Run-time architecture  */
-);
+    int arch                                                /* I Run-time architecture  */
+    );
 
 void silk_PLC_glue_frames(
     silk_decoder_state                  *psDec,             /* I/O decoder state        */
-    oac_int16                          frame[],            /* I/O signal               */
-    oac_int                            length              /* I length of signal       */
-);
+    oac_int16 frame[],                                     /* I/O signal               */
+    oac_int length                                         /* I length of signal       */
+    );
 
 #endif
diff --git a/silk/SigProc_FIX.h b/silk/SigProc_FIX.h
index 4d6d19ef2..6c9d45787 100644
--- a/silk/SigProc_FIX.h
+++ b/silk/SigProc_FIX.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_SIGPROC_FIX_H
@@ -40,12 +40,12 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "cpu_support.h"
 
 #if defined(OAC_X86_MAY_HAVE_SSE4_1)
-#include "x86/SigProc_FIX_sse.h"
+# include "x86/SigProc_FIX_sse.h"
 #endif
 
 #if (defined(OAC_ARM_ASM) || defined(OAC_ARM_MAY_HAVE_NEON_INTR))
-#include "arm/biquad_alt_arm.h"
-#include "arm/LPC_inv_pred_gain_arm.h"
+# include "arm/biquad_alt_arm.h"
+# include "arm/LPC_inv_pred_gain_arm.h"
 #endif
 
 /********************************************************************/
@@ -54,43 +54,43 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /*!
  * Initialize/reset the resampler state for a given pair of input/output sampling rates
-*/
+ */
 oac_int silk_resampler_init(
     silk_resampler_state_struct *S,                 /* I/O  Resampler state                                             */
-    oac_int32                  Fs_Hz_in,           /* I    Input sampling rate (Hz)                                    */
-    oac_int32                  Fs_Hz_out,          /* I    Output sampling rate (Hz)                                   */
-    oac_int                    forEnc              /* I    If 1: encoder; if 0: decoder                                */
-);
+    oac_int32 Fs_Hz_in,                            /* I    Input sampling rate (Hz)                                    */
+    oac_int32 Fs_Hz_out,                           /* I    Output sampling rate (Hz)                                   */
+    oac_int forEnc                                 /* I    If 1: encoder; if 0: decoder                                */
+    );
 
 /*!
  * Resampler: convert from one sampling rate to another
  */
 oac_int silk_resampler(
     silk_resampler_state_struct *S,                 /* I/O  Resampler state                                             */
-    oac_int16                  out[],              /* O    Output signal                                               */
-    const oac_int16            in[],               /* I    Input signal                                                */
-    oac_int32                  inLen               /* I    Number of input samples                                     */
-);
+    oac_int16 out[],                               /* O    Output signal                                               */
+    const oac_int16 in[],                          /* I    Input signal                                                */
+    oac_int32 inLen                                /* I    Number of input samples                                     */
+    );
 
 /*!
-* Downsample 2x, mediocre quality
-*/
+ * Downsample 2x, mediocre quality
+ */
 void silk_resampler_down2(
     oac_int32                  *S,                 /* I/O  State vector [ 2 ]                                          */
     oac_int16                  *out,               /* O    Output signal [ len ]                                       */
     const oac_int16            *in,                /* I    Input signal [ floor(len/2) ]                               */
-    oac_int32                  inLen               /* I    Number of input samples                                     */
-);
+    oac_int32 inLen                                /* I    Number of input samples                                     */
+    );
 
 /*!
  * Downsample by a factor 2/3, low quality
-*/
+ */
 void silk_resampler_down2_3(
     oac_int32                  *S,                 /* I/O  State vector [ 6 ]                                          */
     oac_int16                  *out,               /* O    Output signal [ floor(2*inLen/3) ]                          */
     const oac_int16            *in,                /* I    Input signal [ inLen ]                                      */
-    oac_int32                  inLen               /* I    Number of input samples                                     */
-);
+    oac_int32 inLen                                /* I    Number of input samples                                     */
+    );
 
 /*!
  * second order ARMA filter;
@@ -103,8 +103,8 @@ void silk_biquad_alt_stride1(
     const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
     oac_int32                  *S,                 /* I/O   State vector [2]                                           */
     oac_int16                  *out,               /* O     output signal                                              */
-    const oac_int32            len                 /* I     signal length (must be even)                               */
-);
+    const oac_int32 len                            /* I     signal length (must be even)                               */
+    );
 
 void silk_biquad_alt_stride2_c(
     const oac_int16            *in,                /* I     input signal                                               */
@@ -112,39 +112,39 @@ void silk_biquad_alt_stride2_c(
     const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
     oac_int32                  *S,                 /* I/O   State vector [4]                                           */
     oac_int16                  *out,               /* O     output signal                                              */
-    const oac_int32            len                 /* I     signal length (must be even)                               */
-);
+    const oac_int32 len                            /* I     signal length (must be even)                               */
+    );
 
 /* Variable order MA prediction error filter. */
 void silk_LPC_analysis_filter(
     oac_int16                  *out,               /* O    Output signal                                               */
     const oac_int16            *in,                /* I    Input signal                                                */
     const oac_int16            *B,                 /* I    MA prediction coefficients, Q12 [order]                     */
-    const oac_int32            len,                /* I    Signal length                                               */
-    const oac_int32            d,                  /* I    Filter order                                                */
-    int                         arch                /* I    Run-time architecture                                       */
-);
+    const oac_int32 len,                           /* I    Signal length                                               */
+    const oac_int32 d,                             /* I    Filter order                                                */
+    int arch                                        /* I    Run-time architecture                                       */
+    );
 
 /* Chirp (bandwidth expand) LP AR filter */
 void silk_bwexpander(
     oac_int16                  *ar,                /* I/O  AR filter to be expanded (without leading 1)                */
-    const oac_int              d,                  /* I    Length of ar                                                */
-    oac_int32                  chirp_Q16           /* I    Chirp factor (typically in the range 0 to 1)                */
-);
+    const oac_int d,                               /* I    Length of ar                                                */
+    oac_int32 chirp_Q16                            /* I    Chirp factor (typically in the range 0 to 1)                */
+    );
 
 /* Chirp (bandwidth expand) LP AR filter */
 void silk_bwexpander_32(
     oac_int32                  *ar,                /* I/O  AR filter to be expanded (without leading 1)                */
-    const oac_int              d,                  /* I    Length of ar                                                */
-    oac_int32                  chirp_Q16           /* I    Chirp factor in Q16                                         */
-);
+    const oac_int d,                               /* I    Length of ar                                                */
+    oac_int32 chirp_Q16                            /* I    Chirp factor in Q16                                         */
+    );
 
 /* Compute inverse of LPC prediction gain, and                           */
 /* test if LPC coefficients are stable (all poles within unit circle)    */
 oac_int32 silk_LPC_inverse_pred_gain_c(            /* O   Returns inverse prediction gain in energy domain, Q30        */
     const oac_int16            *A_Q12,             /* I   Prediction coefficients, Q12 [order]                         */
-    const oac_int              order               /* I   Prediction order                                             */
-);
+    const oac_int order                            /* I   Prediction order                                             */
+    );
 
 /* Split signal in two decimated bands using first-order allpass filters */
 void silk_ana_filt_bank_1(
@@ -152,15 +152,17 @@ void silk_ana_filt_bank_1(
     oac_int32                  *S,                 /* I/O  State vector [2]                                            */
     oac_int16                  *outL,              /* O    Low band [N/2]                                              */
     oac_int16                  *outH,              /* O    High band [N/2]                                             */
-    const oac_int32            N                   /* I    Number of input samples                                     */
-);
+    const oac_int32 N                              /* I    Number of input samples                                     */
+    );
 
 #if !defined(OVERRIDE_silk_biquad_alt_stride2)
-#define silk_biquad_alt_stride2(in, B_Q28, A_Q28, S, out, len, arch) ((void)(arch), silk_biquad_alt_stride2_c(in, B_Q28, A_Q28, S, out, len))
+# define silk_biquad_alt_stride2(in, B_Q28, A_Q28, S, out, len, arch) ((void)(arch), \
+                                                                       silk_biquad_alt_stride2_c(in, B_Q28, A_Q28, S, \
+    out, len))
 #endif
 
 #if !defined(OVERRIDE_silk_LPC_inverse_pred_gain)
-#define silk_LPC_inverse_pred_gain(A_Q12, order, arch)     ((void)(arch), silk_LPC_inverse_pred_gain_c(A_Q12, order))
+# define silk_LPC_inverse_pred_gain(A_Q12, order, arch)     ((void)(arch), silk_LPC_inverse_pred_gain_c(A_Q12, order))
 #endif
 
 /********************************************************************/
@@ -170,19 +172,19 @@ void silk_ana_filt_bank_1(
 /* Approximation of 128 * log2() (exact inverse of approx 2^() below) */
 /* Convert input to a log scale    */
 oac_int32 silk_lin2log(
-    const oac_int32            inLin               /* I  input in linear scale                                         */
-);
+    const oac_int32 inLin                          /* I  input in linear scale                                         */
+    );
 
 /* Approximation of a sigmoid function */
 oac_int silk_sigm_Q15(
-    oac_int                    in_Q5               /* I                                                                */
-);
+    oac_int in_Q5                                  /* I                                                                */
+    );
 
 /* Approximation of 2^() (exact inverse of approx log2() above) */
 /* Convert input to a linear scale */
 oac_int32 silk_log2lin(
-    const oac_int32            inLog_Q7            /* I  input on log scale                                            */
-);
+    const oac_int32 inLog_Q7                       /* I  input on log scale                                            */
+    );
 
 /* Compute number of bits to right shift the sum of squares of a vector    */
 /* of int16s to make it fit in an int32                                    */
@@ -190,8 +192,8 @@ void silk_sum_sqr_shift(
     oac_int32                  *energy,            /* O   Energy of x, after shifting to the right                     */
     oac_int                    *shift,             /* O   Number of bits right shift applied to energy                 */
     const oac_int16            *x,                 /* I   Input vector                                                 */
-    oac_int                    len                 /* I   Length of input vector                                       */
-);
+    oac_int len                                    /* I   Length of input vector                                       */
+    );
 
 /* Calculates the reflection coefficients from the correlation sequence    */
 /* Faster than schur64(), but much less accurate.                          */
@@ -199,31 +201,31 @@ void silk_sum_sqr_shift(
 oac_int32 silk_schur(                              /* O    Returns residual energy                                     */
     oac_int16                  *rc_Q15,            /* O    reflection coefficients [order] Q15                         */
     const oac_int32            *c,                 /* I    correlations [order+1]                                      */
-    const oac_int32            order               /* I    prediction order                                            */
-);
+    const oac_int32 order                          /* I    prediction order                                            */
+    );
 
 /* Calculates the reflection coefficients from the correlation sequence    */
 /* Slower than schur(), but more accurate.                                 */
 /* Uses SMULL(), available on armv4                                        */
 oac_int32 silk_schur64(                            /* O    returns residual energy                                     */
-    oac_int32                  rc_Q16[],           /* O    Reflection coefficients [order] Q16                         */
-    const oac_int32            c[],                /* I    Correlations [order+1]                                      */
-    oac_int32                  order               /* I    Prediction order                                            */
-);
+    oac_int32 rc_Q16[],                            /* O    Reflection coefficients [order] Q16                         */
+    const oac_int32 c[],                           /* I    Correlations [order+1]                                      */
+    oac_int32 order                                /* I    Prediction order                                            */
+    );
 
 /* Step up function, converts reflection coefficients to prediction coefficients */
 void silk_k2a(
     oac_int32                  *A_Q24,             /* O    Prediction coefficients [order] Q24                         */
     const oac_int16            *rc_Q15,            /* I    Reflection coefficients [order] Q15                         */
-    const oac_int32            order               /* I    Prediction order                                            */
-);
+    const oac_int32 order                          /* I    Prediction order                                            */
+    );
 
 /* Step up function, converts reflection coefficients to prediction coefficients */
 void silk_k2a_Q16(
     oac_int32                  *A_Q24,             /* O    Prediction coefficients [order] Q24                         */
     const oac_int32            *rc_Q16,            /* I    Reflection coefficients [order] Q16                         */
-    const oac_int32            order               /* I    Prediction order                                            */
-);
+    const oac_int32 order                          /* I    Prediction order                                            */
+    );
 
 /* Apply sine window to signal vector.                              */
 /* Window types:                                                    */
@@ -231,29 +233,29 @@ void silk_k2a_Q16(
 /*    2 -> sine window from pi/2 to pi                              */
 /* every other sample of window is linearly interpolated, for speed */
 void silk_apply_sine_window(
-    oac_int16                  px_win[],           /* O    Pointer to windowed signal                                  */
-    const oac_int16            px[],               /* I    Pointer to input signal                                     */
-    const oac_int              win_type,           /* I    Selects a window type                                       */
-    const oac_int              length              /* I    Window length, multiple of 4                                */
-);
+    oac_int16 px_win[],                            /* O    Pointer to windowed signal                                  */
+    const oac_int16 px[],                          /* I    Pointer to input signal                                     */
+    const oac_int win_type,                        /* I    Selects a window type                                       */
+    const oac_int length                           /* I    Window length, multiple of 4                                */
+    );
 
 /* Compute autocorrelation */
 void silk_autocorr(
     oac_int32                  *results,           /* O    Result (length correlationCount)                            */
     oac_int                    *scale,             /* O    Scaling of the correlation vector                           */
     const oac_int16            *inputData,         /* I    Input data to correlate                                     */
-    const oac_int              inputDataSize,      /* I    Length of input                                             */
-    const oac_int              correlationCount,   /* I    Number of correlation taps to compute                       */
-    int                         arch                /* I    Run-time architecture                                       */
-);
+    const oac_int inputDataSize,                   /* I    Length of input                                             */
+    const oac_int correlationCount,                /* I    Number of correlation taps to compute                       */
+    int arch                                        /* I    Run-time architecture                                       */
+    );
 
 void silk_decode_pitch(
-    oac_int16                  lagIndex,           /* I                                                                */
-    oac_int8                   contourIndex,       /* O                                                                */
-    oac_int                    pitch_lags[],       /* O    4 pitch values                                              */
-    const oac_int              Fs_kHz,             /* I    sampling frequency (kHz)                                    */
-    const oac_int              nb_subfr            /* I    number of sub frames                                        */
-);
+    oac_int16 lagIndex,                            /* I                                                                */
+    oac_int8 contourIndex,                         /* O                                                                */
+    oac_int pitch_lags[],                          /* O    4 pitch values                                              */
+    const oac_int Fs_kHz,                          /* I    sampling frequency (kHz)                                    */
+    const oac_int nb_subfr                         /* I    number of sub frames                                        */
+    );
 
 oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 voiced, 1 unvoiced                      */
     const oac_int16            *frame,             /* I    Signal of length PE_FRAME_LENGTH_MS*Fs_kHz                  */
@@ -261,100 +263,100 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
     oac_int16                  *lagIndex,          /* O    Lag Index                                                   */
     oac_int8                   *contourIndex,      /* O    Pitch contour Index                                         */
     oac_int                    *LTPCorr_Q15,       /* I/O  Normalized correlation; input: value from previous frame    */
-    oac_int                    prevLag,            /* I    Last lag of previous frame; set to zero is unvoiced         */
-    const oac_int32            search_thres1_Q16,  /* I    First stage threshold for lag candidates 0 - 1              */
-    const oac_int              search_thres2_Q13,  /* I    Final threshold for lag candidates 0 - 1                    */
-    const oac_int              Fs_kHz,             /* I    Sample frequency (kHz)                                      */
-    const oac_int              complexity,         /* I    Complexity setting, 0-2, where 2 is highest                 */
-    const oac_int              nb_subfr,           /* I    number of 5 ms subframes                                    */
-    int                         arch                /* I    Run-time architecture                                       */
-);
+    oac_int prevLag,                               /* I    Last lag of previous frame; set to zero is unvoiced         */
+    const oac_int32 search_thres1_Q16,             /* I    First stage threshold for lag candidates 0 - 1              */
+    const oac_int search_thres2_Q13,               /* I    Final threshold for lag candidates 0 - 1                    */
+    const oac_int Fs_kHz,                          /* I    Sample frequency (kHz)                                      */
+    const oac_int complexity,                      /* I    Complexity setting, 0-2, where 2 is highest                 */
+    const oac_int nb_subfr,                        /* I    number of 5 ms subframes                                    */
+    int arch                                        /* I    Run-time architecture                                       */
+    );
 
 /* Compute Normalized Line Spectral Frequencies (NLSFs) from whitening filter coefficients      */
 /* If not all roots are found, the a_Q16 coefficients are bandwidth expanded until convergence. */
 void silk_A2NLSF(
     oac_int16                  *NLSF,              /* O    Normalized Line Spectral Frequencies in Q15 (0..2^15-1) [d] */
     oac_int32                  *a_Q16,             /* I/O  Monic whitening filter coefficients in Q16 [d]              */
-    const oac_int              d                   /* I    Filter order (must be even)                                 */
-);
+    const oac_int d                                /* I    Filter order (must be even)                                 */
+    );
 
 /* compute whitening filter coefficients from normalized line spectral frequencies */
 void silk_NLSF2A(
     oac_int16                  *a_Q12,             /* O    monic whitening filter coefficients in Q12,  [ d ]          */
     const oac_int16            *NLSF,              /* I    normalized line spectral frequencies in Q15, [ d ]          */
-    const oac_int              d,                  /* I    filter order (should be even)                               */
-    int                         arch                /* I    Run-time architecture                                       */
-);
+    const oac_int d,                               /* I    filter order (should be even)                               */
+    int arch                                        /* I    Run-time architecture                                       */
+    );
 
 /* Convert int32 coefficients to int16 coefs and make sure there's no wrap-around */
 void silk_LPC_fit(
     oac_int16                  *a_QOUT,            /* O    Output signal                                               */
     oac_int32                  *a_QIN,             /* I/O  Input signal                                                */
-    const oac_int              QOUT,               /* I    Input Q domain                                              */
-    const oac_int              QIN,                /* I    Input Q domain                                              */
-    const oac_int              d                   /* I    Filter order                                                */
-);
+    const oac_int QOUT,                            /* I    Input Q domain                                              */
+    const oac_int QIN,                             /* I    Input Q domain                                              */
+    const oac_int d                                /* I    Filter order                                                */
+    );
 
 void silk_insertion_sort_increasing(
     oac_int32                  *a,                 /* I/O   Unsorted / Sorted vector                                   */
     oac_int                    *idx,               /* O     Index vector for the sorted elements                       */
-    const oac_int              L,                  /* I     Vector length                                              */
-    const oac_int              K                   /* I     Number of correctly sorted positions                       */
-);
+    const oac_int L,                               /* I     Vector length                                              */
+    const oac_int K                                /* I     Number of correctly sorted positions                       */
+    );
 
 void silk_insertion_sort_decreasing_int16(
     oac_int16                  *a,                 /* I/O   Unsorted / Sorted vector                                   */
     oac_int                    *idx,               /* O     Index vector for the sorted elements                       */
-    const oac_int              L,                  /* I     Vector length                                              */
-    const oac_int              K                   /* I     Number of correctly sorted positions                       */
-);
+    const oac_int L,                               /* I     Vector length                                              */
+    const oac_int K                                /* I     Number of correctly sorted positions                       */
+    );
 
 void silk_insertion_sort_increasing_all_values_int16(
-     oac_int16                 *a,                 /* I/O   Unsorted / Sorted vector                                   */
-     const oac_int             L                   /* I     Vector length                                              */
-);
+    oac_int16                 *a,                  /* I/O   Unsorted / Sorted vector                                   */
+    const oac_int L                                /* I     Vector length                                              */
+    );
 
 /* NLSF stabilizer, for a single input data vector */
 void silk_NLSF_stabilize(
-          oac_int16            *NLSF_Q15,          /* I/O   Unstable/stabilized normalized LSF vector in Q15 [L]       */
+    oac_int16            *NLSF_Q15,                /* I/O   Unstable/stabilized normalized LSF vector in Q15 [L]       */
     const oac_int16            *NDeltaMin_Q15,     /* I     Min distance vector, NDeltaMin_Q15[L] must be >= 1 [L+1]   */
-    const oac_int              L                   /* I     Number of NLSF parameters in the input vector              */
-);
+    const oac_int L                                /* I     Number of NLSF parameters in the input vector              */
+    );
 
 /* Laroia low complexity NLSF weights */
 void silk_NLSF_VQ_weights_laroia(
     oac_int16                  *pNLSFW_Q_OUT,      /* O     Pointer to input vector weights [D]                        */
     const oac_int16            *pNLSF_Q15,         /* I     Pointer to input vector         [D]                        */
-    const oac_int              D                   /* I     Input vector dimension (even)                              */
-);
+    const oac_int D                                /* I     Input vector dimension (even)                              */
+    );
 
 /* Compute reflection coefficients from input signal */
 void silk_burg_modified_c(
     oac_int32                  *res_nrg,           /* O    Residual energy                                             */
     oac_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
-    oac_int32                  A_Q16[],            /* O    Prediction coefficients (length order)                      */
-    const oac_int16            x[],                /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
-    const oac_int32            minInvGain_Q30,     /* I    Inverse of max prediction gain                              */
-    const oac_int              subfr_length,       /* I    Input signal subframe length (incl. D preceding samples)    */
-    const oac_int              nb_subfr,           /* I    Number of subframes stacked in x                            */
-    const oac_int              D,                  /* I    Order                                                       */
-    int                         arch                /* I    Run-time architecture                                       */
-);
+    oac_int32 A_Q16[],                             /* O    Prediction coefficients (length order)                      */
+    const oac_int16 x[],                           /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
+    const oac_int32 minInvGain_Q30,                /* I    Inverse of max prediction gain                              */
+    const oac_int subfr_length,                    /* I    Input signal subframe length (incl. D preceding samples)    */
+    const oac_int nb_subfr,                        /* I    Number of subframes stacked in x                            */
+    const oac_int D,                               /* I    Order                                                       */
+    int arch                                        /* I    Run-time architecture                                       */
+    );
 
 /* Copy and multiply a vector by a constant */
 void silk_scale_copy_vector16(
     oac_int16                  *data_out,
     const oac_int16            *data_in,
-    oac_int32                  gain_Q16,           /* I    Gain in Q16                                                 */
-    const oac_int              dataSize            /* I    Length                                                      */
-);
+    oac_int32 gain_Q16,                            /* I    Gain in Q16                                                 */
+    const oac_int dataSize                         /* I    Length                                                      */
+    );
 
 /* Some for the LTP related function requires Q26 to work.*/
 void silk_scale_vector32_Q26_lshift_18(
     oac_int32                  *data1,             /* I/O  Q0/Q18                                                      */
-    oac_int32                  gain_Q26,           /* I    Q26                                                         */
-    oac_int                    dataSize            /* I    length                                                      */
-);
+    oac_int32 gain_Q26,                            /* I    Q26                                                         */
+    oac_int dataSize                               /* I    length                                                      */
+    );
 
 /********************************************************************/
 /*                        INLINE ARM MATH                           */
@@ -363,25 +365,25 @@ void silk_scale_vector32_Q26_lshift_18(
 /*    return sum( inVec1[i] * inVec2[i] ) */
 
 oac_int32 silk_inner_prod_aligned(
-    const oac_int16 *const     inVec1,             /*    I input vector 1                                              */
-    const oac_int16 *const     inVec2,             /*    I input vector 2                                              */
-    const oac_int              len,                /*    I vector lengths                                              */
-    int                         arch                /*    I Run-time architecture                                       */
-);
+    const oac_int16 *const inVec1,                 /*    I input vector 1                                              */
+    const oac_int16 *const inVec2,                 /*    I input vector 2                                              */
+    const oac_int len,                             /*    I vector lengths                                              */
+    int arch                                        /*    I Run-time architecture                                       */
+    );
 
 
 oac_int32 silk_inner_prod_aligned_scale(
-    const oac_int16 *const     inVec1,             /*    I input vector 1                                              */
-    const oac_int16 *const     inVec2,             /*    I input vector 2                                              */
-    const oac_int              scale,              /*    I number of bits to shift                                     */
-    const oac_int              len                 /*    I vector lengths                                              */
-);
+    const oac_int16 *const inVec1,                 /*    I input vector 1                                              */
+    const oac_int16 *const inVec2,                 /*    I input vector 2                                              */
+    const oac_int scale,                           /*    I number of bits to shift                                     */
+    const oac_int len                              /*    I vector lengths                                              */
+    );
 
 oac_int64 silk_inner_prod16_c(
     const oac_int16            *inVec1,            /*    I input vector 1                                              */
     const oac_int16            *inVec2,            /*    I input vector 2                                              */
-    const oac_int              len                 /*    I vector lengths                                              */
-);
+    const oac_int len                              /*    I vector lengths                                              */
+    );
 
 /********************************************************************/
 /*                                MACROS                            */
@@ -391,25 +393,24 @@ oac_int64 silk_inner_prod16_c(
    left. Output is 32bit int.
    Note: contemporary compilers recognize the C expression below and
    compile it into a 'ror' instruction if available. No need for OAC_INLINE ASM! */
-static OAC_INLINE oac_int32 silk_ROR32( oac_int32 a32, oac_int rot )
-{
+static OAC_INLINE oac_int32 silk_ROR32( oac_int32 a32, oac_int rot ) {
     oac_uint32 x = (oac_uint32) a32;
     oac_uint32 r = (oac_uint32) rot;
-    oac_uint32 m = (oac_uint32) -rot;
-    if( rot == 0 ) {
+    oac_uint32 m = (oac_uint32) - rot;
+    if (rot == 0) {
         return a32;
-    } else if( rot < 0 ) {
-        return (oac_int32) ((x << m) | (x >> (32 - m)));
+    } else if (rot < 0) {
+        return (oac_int32) ((x<<m)|(x>>(32 - m)));
     } else {
-        return (oac_int32) ((x << (32 - r)) | (x >> r));
+        return (oac_int32) ((x<<(32 - r))|(x>>r));
     }
 }
 
 /* Allocate oac_int16 aligned to 4-byte memory address */
 #if EMBEDDED_ARM
-#define silk_DWORD_ALIGN __attribute__((aligned(4)))
+# define silk_DWORD_ALIGN __attribute__((aligned(4)))
 #else
-#define silk_DWORD_ALIGN
+# define silk_DWORD_ALIGN
 #endif
 
 /* Useful Macros that can be adjusted to other platforms */
@@ -420,27 +421,27 @@ static OAC_INLINE oac_int32 silk_ROR32( oac_int32 a32, oac_int rot )
 /* Fixed point macros */
 
 /* (a32 * b32) output have to be 32bit int */
-#define silk_MUL(a32, b32)                  ((a32) * (b32))
+#define silk_MUL(a32, b32)                  ((a32)*(b32))
 
 /* (a32 * b32) output have to be 32bit uint */
 #define silk_MUL_uint(a32, b32)             silk_MUL(a32, b32)
 
 /* a32 + (b32 * c32) output have to be 32bit int */
-#define silk_MLA(a32, b32, c32)             silk_ADD32((a32),((b32) * (c32)))
+#define silk_MLA(a32, b32, c32)             silk_ADD32((a32), ((b32)*(c32)))
 
 /* a32 + (b32 * c32) output have to be 32bit uint */
 #define silk_MLA_uint(a32, b32, c32)        silk_MLA(a32, b32, c32)
 
 /* ((a32 >> 16)  * (b32 >> 16)) output have to be 32bit int */
-#define silk_SMULTT(a32, b32)               (((a32) >> 16) * ((b32) >> 16))
+#define silk_SMULTT(a32, b32)               (((a32)>>16)*((b32)>>16))
 
 /* a32 + ((a32 >> 16)  * (b32 >> 16)) output have to be 32bit int */
-#define silk_SMLATT(a32, b32, c32)          silk_ADD32((a32),((b32) >> 16) * ((c32) >> 16))
+#define silk_SMLATT(a32, b32, c32)          silk_ADD32((a32), ((b32)>>16)*((c32)>>16))
 
-#define silk_SMLALBB(a64, b16, c16)         silk_ADD64((a64),(oac_int64)((oac_int32)(b16) * (oac_int32)(c16)))
+#define silk_SMLALBB(a64, b16, c16)         silk_ADD64((a64), (oac_int64)((oac_int32)(b16)*(oac_int32)(c16)))
 
 /* (a32 * b32) */
-#define silk_SMULL(a32, b32)                ((oac_int64)(a32) * /*(oac_int64)*/(b32))
+#define silk_SMULL(a32, b32)                ((oac_int64)(a32)*/*(oac_int64)*/ (b32))
 
 /* Adds two signed 32-bit values in a way that can overflow, while not relying on undefined behaviour
    (just standard two's complement implementation-specific behaviour) */
@@ -450,11 +451,13 @@ static OAC_INLINE oac_int32 silk_ROR32( oac_int32 a32, oac_int rot )
 #define silk_SUB32_ovflw(a, b)              ((oac_int32)((oac_uint32)(a) - (oac_uint32)(b)))
 
 /* Multiply-accumulate macros that allow overflow in the addition (ie, no asserts in debug mode) */
-#define silk_MLA_ovflw(a32, b32, c32)       silk_ADD32_ovflw((a32), (oac_uint32)(b32) * (oac_uint32)(c32))
-#define silk_SMLABB_ovflw(a32, b32, c32)    (silk_ADD32_ovflw((a32) , ((oac_int32)((oac_int16)(b32))) * (oac_int32)((oac_int16)(c32))))
+#define silk_MLA_ovflw(a32, b32, c32)       silk_ADD32_ovflw((a32), (oac_uint32)(b32)*(oac_uint32)(c32))
+#define silk_SMLABB_ovflw(a32, b32, \
+                          c32)    (silk_ADD32_ovflw((a32), \
+    ((oac_int32)((oac_int16)(b32)))*(oac_int32)((oac_int16)(c32))))
 
-#define silk_DIV32_16(a32, b16)             ((oac_int32)((a32) / (b16)))
-#define silk_DIV32(a32, b32)                ((oac_int32)((a32) / (b32)))
+#define silk_DIV32_16(a32, b16)             ((oac_int32)((a32)/(b16)))
+#define silk_DIV32(a32, b32)                ((oac_int32)((a32)/(b32)))
 
 /* These macros enables checking for overflow in silk_API_Debug.h*/
 #define silk_ADD16(a, b)                    ((a) + (b))
@@ -466,33 +469,37 @@ static OAC_INLINE oac_int32 silk_ROR32( oac_int32 a32, oac_int rot )
 #define silk_SUB64(a, b)                    ((a) - (b))
 
 #define silk_SAT8(a)                        ((a) > silk_int8_MAX ? silk_int8_MAX  :       \
-                                            ((a) < silk_int8_MIN ? silk_int8_MIN  : (a)))
+                                             ((a) < silk_int8_MIN ? silk_int8_MIN  : (a)))
 #define silk_SAT16(a)                       ((a) > silk_int16_MAX ? silk_int16_MAX :      \
-                                            ((a) < silk_int16_MIN ? silk_int16_MIN : (a)))
+                                             ((a) < silk_int16_MIN ? silk_int16_MIN : (a)))
 #define silk_SAT32(a)                       ((a) > silk_int32_MAX ? silk_int32_MAX :      \
-                                            ((a) < silk_int32_MIN ? silk_int32_MIN : (a)))
+                                             ((a) < silk_int32_MIN ? silk_int32_MIN : (a)))
 
 #define silk_CHECK_FIT8(a)                  (a)
 #define silk_CHECK_FIT16(a)                 (a)
 #define silk_CHECK_FIT32(a)                 (a)
 
-#define silk_ADD_SAT16(a, b)                (oac_int16)silk_SAT16( silk_ADD32( (oac_int32)(a), (b) ) )
-#define silk_ADD_SAT64(a, b)                ((((a) + (b)) & 0x8000000000000000LL) == 0 ?                            \
-                                            ((((a) & (b)) & 0x8000000000000000LL) != 0 ? silk_int64_MIN : (a)+(b)) : \
-                                            ((((a) | (b)) & 0x8000000000000000LL) == 0 ? silk_int64_MAX : (a)+(b)) )
+#define silk_ADD_SAT16(a, b)                (oac_int16)silk_SAT16( silk_ADD32((oac_int32)(a), (b)))
+#define silk_ADD_SAT64(a, b)                ((((a) + (b))&0x8000000000000000LL) == 0 ?                            \
+                                             ((((a)&(b))&0x8000000000000000LL) != 0 ? silk_int64_MIN : (a) + (b)) : \
+                                             ((((a)|(b))&0x8000000000000000LL) == 0 ? silk_int64_MAX : (a) + (b)))
 
-#define silk_SUB_SAT16(a, b)                (oac_int16)silk_SAT16( silk_SUB32( (oac_int32)(a), (b) ) )
-#define silk_SUB_SAT64(a, b)                ((((a)-(b)) & 0x8000000000000000LL) == 0 ?                                               \
-                                            (( (a) & ((b)^0x8000000000000000LL) & 0x8000000000000000LL) ? silk_int64_MIN : (a)-(b)) : \
-                                            ((((a)^0x8000000000000000LL) & (b)  & 0x8000000000000000LL) ? silk_int64_MAX : (a)-(b)) )
+#define silk_SUB_SAT16(a, b)                (oac_int16)silk_SAT16( silk_SUB32((oac_int32)(a), (b)))
+#define silk_SUB_SAT64(a, b)                ((((a) - (b))&0x8000000000000000LL) == 0 ?                                               \
+                                             (((a)&((b)^0x8000000000000000LL) \
+                                               &0x8000000000000000LL) ? silk_int64_MIN : (a) - (b)) : \
+                                             ((((a)^0x8000000000000000LL)&(b) \
+                                               &0x8000000000000000LL) ? silk_int64_MAX : (a) - (b)))
 
 /* Saturation for positive input values */
 #define silk_POS_SAT32(a)                   ((a) > silk_int32_MAX ? silk_int32_MAX : (a))
 
 /* Add with saturation for positive input values */
-#define silk_ADD_POS_SAT8(a, b)             ((((a)+(b)) & 0x80)                 ? silk_int8_MAX  : ((a)+(b)))
-#define silk_ADD_POS_SAT16(a, b)            ((((a)+(b)) & 0x8000)               ? silk_int16_MAX : ((a)+(b)))
-#define silk_ADD_POS_SAT32(a, b)            ((((oac_uint32)(a)+(oac_uint32)(b)) & 0x80000000) ? silk_int32_MAX : ((a)+(b)))
+#define silk_ADD_POS_SAT8(a, b)             ((((a) + (b))&0x80)                 ? silk_int8_MAX  : ((a) + (b)))
+#define silk_ADD_POS_SAT16(a, b)            ((((a) + (b))&0x8000)               ? silk_int16_MAX : ((a) + (b)))
+#define silk_ADD_POS_SAT32(a, \
+                           b)            ((((oac_uint32)(a) + (oac_uint32)(b))&0x80000000) ? silk_int32_MAX : ((a) \
+                                                                                                               + (b)))
 
 #define silk_LSHIFT8(a, shift)              ((oac_int8)((oac_uint8)(a)<<(shift)))         /* shift >= 0, shift < 8  */
 #define silk_LSHIFT16(a, shift)             ((oac_int16)((oac_uint16)(a)<<(shift)))       /* shift >= 0, shift < 16 */
@@ -507,12 +514,12 @@ static OAC_INLINE oac_int32 silk_ROR32( oac_int32 a32, oac_int rot )
 #define silk_RSHIFT(a, shift)               silk_RSHIFT32(a, shift)                         /* shift >= 0, shift < 32 */
 
 /* saturates before shifting */
-#define silk_LSHIFT_SAT32(a, shift)         (silk_LSHIFT32( silk_LIMIT( (a), silk_RSHIFT32( silk_int32_MIN, (shift) ), \
-                                                    silk_RSHIFT32( silk_int32_MAX, (shift) ) ), (shift) ))
+#define silk_LSHIFT_SAT32(a, shift)         (silk_LSHIFT32( silk_LIMIT((a), silk_RSHIFT32( silk_int32_MIN, (shift)), \
+                                                    silk_RSHIFT32( silk_int32_MAX, (shift))), (shift)))
 
-#define silk_LSHIFT_ovflw(a, shift)         ((oac_int32)((oac_uint32)(a) << (shift)))     /* shift >= 0, allowed to overflow */
-#define silk_LSHIFT_uint(a, shift)          ((a) << (shift))                                /* shift >= 0 */
-#define silk_RSHIFT_uint(a, shift)          ((a) >> (shift))                                /* shift >= 0 */
+#define silk_LSHIFT_ovflw(a, shift)         ((oac_int32)((oac_uint32)(a)<<(shift)))       /* shift >= 0, allowed to overflow */
+#define silk_LSHIFT_uint(a, shift)          ((a)<<(shift))                                  /* shift >= 0 */
+#define silk_RSHIFT_uint(a, shift)          ((a)>>(shift))                                  /* shift >= 0 */
 
 #define silk_ADD_LSHIFT(a, b, shift)        ((a) + silk_LSHIFT((b), (shift)))               /* shift >= 0 */
 #define silk_ADD_LSHIFT32(a, b, shift)      silk_ADD32((a), silk_LSHIFT32((b), (shift)))    /* shift >= 0 */
@@ -524,69 +531,64 @@ static OAC_INLINE oac_int32 silk_ROR32( oac_int32 a32, oac_int rot )
 #define silk_SUB_RSHIFT32(a, b, shift)      silk_SUB32((a), silk_RSHIFT32((b), (shift)))    /* shift >= 0 */
 
 /* Requires that shift > 0 */
-#define silk_RSHIFT_ROUND(a, shift)         ((shift) == 1 ? ((a) >> 1) + ((a) & 1) : (((a) >> ((shift) - 1)) + 1) >> 1)
-#define silk_RSHIFT_ROUND64(a, shift)       ((shift) == 1 ? ((a) >> 1) + ((a) & 1) : (((a) >> ((shift) - 1)) + 1) >> 1)
+#define silk_RSHIFT_ROUND(a, shift)         ((shift) == 1 ? ((a)>>1) + ((a)&1) : (((a)>>((shift) - 1)) + 1)>>1)
+#define silk_RSHIFT_ROUND64(a, shift)       ((shift) == 1 ? ((a)>>1) + ((a)&1) : (((a)>>((shift) - 1)) + 1)>>1)
 
 /* Number of rightshift required to fit the multiplication */
-#define silk_NSHIFT_MUL_32_32(a, b)         ( -(31- (32-silk_CLZ32(silk_abs(a)) + (32-silk_CLZ32(silk_abs(b))))) )
-#define silk_NSHIFT_MUL_16_16(a, b)         ( -(15- (16-silk_CLZ16(silk_abs(a)) + (16-silk_CLZ16(silk_abs(b))))) )
+#define silk_NSHIFT_MUL_32_32(a, b)         (-(31 - (32 - silk_CLZ32(silk_abs(a)) + (32 - silk_CLZ32(silk_abs(b))))))
+#define silk_NSHIFT_MUL_16_16(a, b)         (-(15 - (16 - silk_CLZ16(silk_abs(a)) + (16 - silk_CLZ16(silk_abs(b))))))
 
 
 #define silk_min(a, b)                      (((a) < (b)) ? (a) : (b))
 #define silk_max(a, b)                      (((a) > (b)) ? (a) : (b))
 
 /* Macro to convert floating-point constants to fixed-point */
-#define SILK_FIX_CONST( C, Q )              ((oac_int32)((C) * ((oac_int64)1 << (Q)) + 0.5))
+#define SILK_FIX_CONST( C, Q )              ((oac_int32)((C) *((oac_int64)1<<(Q)) + 0.5))
 
 /* silk_min() versions with typecast in the function call */
-static OAC_INLINE oac_int silk_min_int(oac_int a, oac_int b)
-{
-    return (((a) < (b)) ? (a) : (b));
+static OAC_INLINE oac_int silk_min_int(oac_int a, oac_int b) {
+    return ((a) < (b)) ? (a) : (b);
 }
-static OAC_INLINE oac_int16 silk_min_16(oac_int16 a, oac_int16 b)
-{
-    return (((a) < (b)) ? (a) : (b));
+static OAC_INLINE oac_int16 silk_min_16(oac_int16 a, oac_int16 b) {
+    return ((a) < (b)) ? (a) : (b);
 }
-static OAC_INLINE oac_int32 silk_min_32(oac_int32 a, oac_int32 b)
-{
-    return (((a) < (b)) ? (a) : (b));
+static OAC_INLINE oac_int32 silk_min_32(oac_int32 a, oac_int32 b) {
+    return ((a) < (b)) ? (a) : (b);
 }
-static OAC_INLINE oac_int64 silk_min_64(oac_int64 a, oac_int64 b)
-{
-    return (((a) < (b)) ? (a) : (b));
+static OAC_INLINE oac_int64 silk_min_64(oac_int64 a, oac_int64 b) {
+    return ((a) < (b)) ? (a) : (b);
 }
 
 /* silk_min() versions with typecast in the function call */
-static OAC_INLINE oac_int silk_max_int(oac_int a, oac_int b)
-{
-    return (((a) > (b)) ? (a) : (b));
+static OAC_INLINE oac_int silk_max_int(oac_int a, oac_int b) {
+    return ((a) > (b)) ? (a) : (b);
 }
-static OAC_INLINE oac_int16 silk_max_16(oac_int16 a, oac_int16 b)
-{
-    return (((a) > (b)) ? (a) : (b));
+static OAC_INLINE oac_int16 silk_max_16(oac_int16 a, oac_int16 b) {
+    return ((a) > (b)) ? (a) : (b);
 }
-static OAC_INLINE oac_int32 silk_max_32(oac_int32 a, oac_int32 b)
-{
-    return (((a) > (b)) ? (a) : (b));
+static OAC_INLINE oac_int32 silk_max_32(oac_int32 a, oac_int32 b) {
+    return ((a) > (b)) ? (a) : (b);
 }
-static OAC_INLINE oac_int64 silk_max_64(oac_int64 a, oac_int64 b)
-{
-    return (((a) > (b)) ? (a) : (b));
+static OAC_INLINE oac_int64 silk_max_64(oac_int64 a, oac_int64 b) {
+    return ((a) > (b)) ? (a) : (b);
 }
 
-#define silk_LIMIT( a, limit1, limit2)      ((limit1) > (limit2) ? ((a) > (limit1) ? (limit1) : ((a) < (limit2) ? (limit2) : (a))) \
-                                                                 : ((a) > (limit2) ? (limit2) : ((a) < (limit1) ? (limit1) : (a))))
+#define silk_LIMIT( a, limit1, \
+                    limit2)      ((limit1) > (limit2) ? ((a) > (limit1) ? (limit1) : ((a) < (limit2) ? (limit2) : (a))) \
+                                                                 : ((a) > \
+                                                                    (limit2) ? (limit2) : ((a) < \
+                                                                                           (limit1) ? (limit1) : (a))))
 
 #define silk_LIMIT_int                      silk_LIMIT
 #define silk_LIMIT_16                       silk_LIMIT
 #define silk_LIMIT_32                       silk_LIMIT
 
 #define silk_abs(a)                         (((a) >  0)  ? (a) : -(a))            /* Be careful, silk_abs returns wrong when input equals to silk_intXX_MIN */
-#define silk_abs_int(a)                     (((a) ^ ((a) >> (8 * sizeof(a) - 1))) - ((a) >> (8 * sizeof(a) - 1)))
-#define silk_abs_int32(a)                   (((a) ^ ((a) >> 31)) - ((a) >> 31))
+#define silk_abs_int(a)                     (((a)^((a)>>(8*sizeof(a) - 1))) - ((a)>>(8*sizeof(a) - 1)))
+#define silk_abs_int32(a)                   (((a)^((a)>>31)) - ((a)>>31))
 #define silk_abs_int64(a)                   (((a) >  0)  ? (a) : -(a))
 
-#define silk_sign(a)                        ((a) > 0 ? 1 : ( (a) < 0 ? -1 : 0 ))
+#define silk_sign(a)                        ((a) > 0 ? 1 : ((a) < 0 ? -1 : 0))
 
 /* PSEUDO-RANDOM GENERATOR                                                          */
 /* Make sure to store the result as the seed for the next call (also in between     */
@@ -608,13 +610,14 @@ static OAC_INLINE oac_int64 silk_max_64(oac_int64 a, oac_int64 b)
 #define silk_SMMUL(a32, b32)                (oac_int32)silk_RSHIFT64(silk_SMULL((a32), (b32)), 32)
 
 #if !defined(OVERRIDE_silk_burg_modified)
-#define silk_burg_modified(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch) \
-    ((void)(arch), silk_burg_modified_c(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch))
+# define silk_burg_modified(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch) \
+        ((void)(arch), \
+         silk_burg_modified_c(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch))
 #endif
 
 #if !defined(OVERRIDE_silk_inner_prod16)
-#define silk_inner_prod16(inVec1, inVec2, len, arch) \
-    ((void)(arch),silk_inner_prod16_c(inVec1, inVec2, len))
+# define silk_inner_prod16(inVec1, inVec2, len, arch) \
+        ((void)(arch), silk_inner_prod16_c(inVec1, inVec2, len))
 #endif
 
 #include "Inlines.h"
@@ -622,19 +625,19 @@ static OAC_INLINE oac_int64 silk_max_64(oac_int64 a, oac_int64 b)
 #include "MacroDebug.h"
 
 #ifdef OAC_ARM_INLINE_ASM
-#include "arm/SigProc_FIX_armv4.h"
+# include "arm/SigProc_FIX_armv4.h"
 #endif
 
 #ifdef OAC_ARM_INLINE_EDSP
-#include "arm/SigProc_FIX_armv5e.h"
+# include "arm/SigProc_FIX_armv5e.h"
 #endif
 
 #if defined(FIXED_POINT) && defined(__mips_dsp) && __mips == 32
-#include "mips/sigproc_fix_mipsr1.h"
+# include "mips/sigproc_fix_mipsr1.h"
 #endif
 
 #ifdef OAC_XTENSA_LX7
-#include "xtensa/SigProc_FIX_lx7.h"
+# include "xtensa/SigProc_FIX_lx7.h"
 #endif
 
 
diff --git a/silk/VAD.c b/silk/VAD.c
index 880b16501..4feb1fbb7 100644
--- a/silk/VAD.c
+++ b/silk/VAD.c
@@ -1,43 +1,43 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
 #include "stack_alloc.h"
 
 /* Silk VAD noise level estimation */
-# if !defined(OAC_X86_MAY_HAVE_SSE4_1)
+#if !defined(OAC_X86_MAY_HAVE_SSE4_1)
 static OAC_INLINE void silk_VAD_GetNoiseLevels(
-    const oac_int32             pX[ VAD_N_BANDS ], /* I    subband energies                            */
+    const oac_int32 pX[ VAD_N_BANDS ],             /* I    subband energies                            */
     silk_VAD_state              *psSilk_VAD         /* I/O  Pointer to Silk VAD state                   */
-);
+    );
 #endif
 
 /**********************************/
@@ -45,32 +45,31 @@ static OAC_INLINE void silk_VAD_GetNoiseLevels(
 /**********************************/
 oac_int silk_VAD_Init(                                         /* O    Return value, 0 if success                  */
     silk_VAD_state              *psSilk_VAD                     /* I/O  Pointer to Silk VAD state                   */
-)
-{
+    ) {
     oac_int b, ret = 0;
 
     /* reset state memory */
-    silk_memset( psSilk_VAD, 0, sizeof( silk_VAD_state ) );
+    silk_memset( psSilk_VAD, 0, sizeof(silk_VAD_state));
 
     /* init noise levels */
     /* Initialize array with approx pink noise levels (psd proportional to inverse of frequency) */
-    for( b = 0; b < VAD_N_BANDS; b++ ) {
+    for (b = 0; b < VAD_N_BANDS; b++) {
         psSilk_VAD->NoiseLevelBias[ b ] = silk_max_32( silk_DIV32_16( VAD_NOISE_LEVELS_BIAS, b + 1 ), 1 );
     }
 
     /* Initialize state */
-    for( b = 0; b < VAD_N_BANDS; b++ ) {
+    for (b = 0; b < VAD_N_BANDS; b++) {
         psSilk_VAD->NL[ b ]     = silk_MUL( 100, psSilk_VAD->NoiseLevelBias[ b ] );
         psSilk_VAD->inv_NL[ b ] = silk_DIV32( silk_int32_MAX, psSilk_VAD->NL[ b ] );
     }
     psSilk_VAD->counter = 15;
 
     /* init smoothed energy-to-noise ratio*/
-    for( b = 0; b < VAD_N_BANDS; b++ ) {
-        psSilk_VAD->NrgRatioSmth_Q8[ b ] = 100 * 256;       /* 100 * 256 --> 20 dB SNR */
+    for (b = 0; b < VAD_N_BANDS; b++) {
+        psSilk_VAD->NrgRatioSmth_Q8[ b ] = 100*256;         /* 100 * 256 --> 20 dB SNR */
     }
 
-    return( ret );
+    return ret;
 }
 
 /* Weighting factors for tilt measure */
@@ -81,21 +80,20 @@ static const oac_int32 tiltWeights[ VAD_N_BANDS ] = { 30000, 6000, -12000, -1200
 /***************************************/
 oac_int silk_VAD_GetSA_Q8_c(                                   /* O    Return value, 0 if success                  */
     silk_encoder_state          *psEncC,                        /* I/O  Encoder state                               */
-    const oac_int16            pIn[]                           /* I    PCM input                                   */
-)
-{
-    oac_int   SA_Q15, pSNR_dB_Q7, input_tilt;
-    oac_int   decimated_framelength1, decimated_framelength2;
-    oac_int   decimated_framelength;
-    oac_int   dec_subframe_length, dec_subframe_offset, SNR_Q7, i, b, s;
+    const oac_int16 pIn[]                                      /* I    PCM input                                   */
+    ) {
+    oac_int SA_Q15, pSNR_dB_Q7, input_tilt;
+    oac_int decimated_framelength1, decimated_framelength2;
+    oac_int decimated_framelength;
+    oac_int dec_subframe_length, dec_subframe_offset, SNR_Q7, i, b, s;
     oac_int32 sumSquared, smooth_coef_Q16;
     oac_int16 HPstateTmp;
     VARDECL( oac_int16, X );
     oac_int32 Xnrg[ VAD_N_BANDS ];
     oac_int32 NrgToNoiseRatio_Q8[ VAD_N_BANDS ];
     oac_int32 speech_nrg, x_tmp;
-    oac_int   X_offset[ VAD_N_BANDS ];
-    oac_int   ret = 0;
+    oac_int X_offset[ VAD_N_BANDS ];
+    oac_int ret = 0;
     silk_VAD_state *psSilk_VAD = &psEncC->sVAD;
     SAVE_STACK;
 
@@ -103,7 +101,7 @@ oac_int silk_VAD_GetSA_Q8_c(                                   /* O    Return va
     silk_assert( VAD_N_BANDS == 4 );
     celt_assert( MAX_FRAME_LENGTH >= psEncC->frame_length );
     celt_assert( psEncC->frame_length <= 512 );
-    celt_assert( psEncC->frame_length == 8 * silk_RSHIFT( psEncC->frame_length, 3 ) );
+    celt_assert( psEncC->frame_length == 8*silk_RSHIFT( psEncC->frame_length, 3 ));
 
     /***********************/
     /* Filter and Decimate */
@@ -143,7 +141,7 @@ oac_int silk_VAD_GetSA_Q8_c(                                   /* O    Return va
     /*********************************************/
     X[ decimated_framelength - 1 ] = silk_RSHIFT( X[ decimated_framelength - 1 ], 1 );
     HPstateTmp = X[ decimated_framelength - 1 ];
-    for( i = decimated_framelength - 1; i > 0; i-- ) {
+    for (i = decimated_framelength - 1; i > 0; i--) {
         X[ i - 1 ]  = silk_RSHIFT( X[ i - 1 ], 1 );
         X[ i ]     -= X[ i - 1 ];
     }
@@ -153,9 +151,9 @@ oac_int silk_VAD_GetSA_Q8_c(                                   /* O    Return va
     /*************************************/
     /* Calculate the energy in each band */
     /*************************************/
-    for( b = 0; b < VAD_N_BANDS; b++ ) {
+    for (b = 0; b < VAD_N_BANDS; b++) {
         /* Find the decimated framelength in the non-uniformly divided bands */
-        decimated_framelength = silk_RSHIFT( psEncC->frame_length, silk_min_int( VAD_N_BANDS - b, VAD_N_BANDS - 1 ) );
+        decimated_framelength = silk_RSHIFT( psEncC->frame_length, silk_min_int( VAD_N_BANDS - b, VAD_N_BANDS - 1 ));
 
         /* Split length into subframe lengths */
         dec_subframe_length = silk_RSHIFT( decimated_framelength, VAD_INTERNAL_SUBFRAMES_LOG2 );
@@ -164,9 +162,9 @@ oac_int silk_VAD_GetSA_Q8_c(                                   /* O    Return va
         /* Compute energy per sub-frame */
         /* initialize with summed energy of last subframe */
         Xnrg[ b ] = psSilk_VAD->XnrgSubfr[ b ];
-        for( s = 0; s < VAD_INTERNAL_SUBFRAMES; s++ ) {
+        for (s = 0; s < VAD_INTERNAL_SUBFRAMES; s++) {
             sumSquared = 0;
-            for( i = 0; i < dec_subframe_length; i++ ) {
+            for (i = 0; i < dec_subframe_length; i++) {
                 /* The energy will be less than dec_subframe_length * ( silk_int16_MIN / 8 ) ^ 2.            */
                 /* Therefore we can accumulate with no risk of overflow (unless dec_subframe_length > 128)  */
                 x_tmp = silk_RSHIFT(
@@ -178,11 +176,11 @@ oac_int silk_VAD_GetSA_Q8_c(                                   /* O    Return va
             }
 
             /* Add/saturate summed energy of current subframe */
-            if( s < VAD_INTERNAL_SUBFRAMES - 1 ) {
+            if (s < VAD_INTERNAL_SUBFRAMES - 1) {
                 Xnrg[ b ] = silk_ADD_POS_SAT32( Xnrg[ b ], sumSquared );
             } else {
                 /* Look-ahead subframe */
-                Xnrg[ b ] = silk_ADD_POS_SAT32( Xnrg[ b ], silk_RSHIFT( sumSquared, 1 ) );
+                Xnrg[ b ] = silk_ADD_POS_SAT32( Xnrg[ b ], silk_RSHIFT( sumSquared, 1 ));
             }
 
             dec_subframe_offset += dec_subframe_length;
@@ -200,24 +198,24 @@ oac_int silk_VAD_GetSA_Q8_c(                                   /* O    Return va
     /***********************************************/
     sumSquared = 0;
     input_tilt = 0;
-    for( b = 0; b < VAD_N_BANDS; b++ ) {
+    for (b = 0; b < VAD_N_BANDS; b++) {
         speech_nrg = Xnrg[ b ] - psSilk_VAD->NL[ b ];
-        if( speech_nrg > 0 ) {
+        if (speech_nrg > 0) {
             /* Divide, with sufficient resolution */
-            if( ( Xnrg[ b ] & 0xFF800000 ) == 0 ) {
+            if ((Xnrg[ b ]&0xFF800000) == 0) {
                 NrgToNoiseRatio_Q8[ b ] = silk_DIV32( silk_LSHIFT( Xnrg[ b ], 8 ), psSilk_VAD->NL[ b ] + 1 );
             } else {
                 NrgToNoiseRatio_Q8[ b ] = silk_DIV32( Xnrg[ b ], silk_RSHIFT( psSilk_VAD->NL[ b ], 8 ) + 1 );
             }
 
             /* Convert to log domain */
-            SNR_Q7 = silk_lin2log( NrgToNoiseRatio_Q8[ b ] ) - 8 * 128;
+            SNR_Q7 = silk_lin2log( NrgToNoiseRatio_Q8[ b ] ) - 8*128;
 
             /* Sum-of-squares */
             sumSquared = silk_SMLABB( sumSquared, SNR_Q7, SNR_Q7 );          /* Q14 */
 
             /* Tilt measure */
-            if( speech_nrg < ( (oac_int32)1 << 20 ) ) {
+            if (speech_nrg < ((oac_int32)1<<20)) {
                 /* Scale down SNR value for small subband speech energies */
                 SNR_Q7 = silk_SMULWB( silk_LSHIFT( silk_SQRT_APPROX( speech_nrg ), 6 ), SNR_Q7 );
             }
@@ -231,7 +229,7 @@ oac_int silk_VAD_GetSA_Q8_c(                                   /* O    Return va
     sumSquared = silk_DIV32_16( sumSquared, VAD_N_BANDS ); /* Q14 */
 
     /* Root-mean-square approximation, scale to dBs, and write to output pointer */
-    pSNR_dB_Q7 = (oac_int16)( 3 * silk_SQRT_APPROX( sumSquared ) ); /* Q7 */
+    pSNR_dB_Q7 = (oac_int16)(3*silk_SQRT_APPROX( sumSquared ));     /* Q7 */
 
     /*********************************/
     /* Speech Probability Estimation */
@@ -247,18 +245,18 @@ oac_int silk_VAD_GetSA_Q8_c(                                   /* O    Return va
     /* Scale the sigmoid output based on power levels */
     /**************************************************/
     speech_nrg = 0;
-    for( b = 0; b < VAD_N_BANDS; b++ ) {
+    for (b = 0; b < VAD_N_BANDS; b++) {
         /* Accumulate signal-without-noise energies, higher frequency bands have more weight */
-        speech_nrg += ( b + 1 ) * silk_RSHIFT( Xnrg[ b ] - psSilk_VAD->NL[ b ], 4 );
+        speech_nrg += (b + 1)*silk_RSHIFT( Xnrg[ b ] - psSilk_VAD->NL[ b ], 4 );
     }
 
-    if( psEncC->frame_length == 20 * psEncC->fs_kHz ) {
+    if (psEncC->frame_length == 20*psEncC->fs_kHz) {
         speech_nrg = silk_RSHIFT32( speech_nrg, 1 );
     }
     /* Power scaling */
-    if( speech_nrg <= 0 ) {
+    if (speech_nrg <= 0) {
         SA_Q15 = silk_RSHIFT( SA_Q15, 1 );
-    } else if( speech_nrg < 16384 ) {
+    } else if (speech_nrg < 16384) {
         speech_nrg = silk_LSHIFT32( speech_nrg, 16 );
 
         /* square-root */
@@ -273,44 +271,43 @@ oac_int silk_VAD_GetSA_Q8_c(                                   /* O    Return va
     /* Energy Level and SNR estimation */
     /***********************************/
     /* Smoothing coefficient */
-    smooth_coef_Q16 = silk_SMULWB( VAD_SNR_SMOOTH_COEF_Q18, silk_SMULWB( (oac_int32)SA_Q15, SA_Q15 ) );
+    smooth_coef_Q16 = silk_SMULWB( VAD_SNR_SMOOTH_COEF_Q18, silk_SMULWB((oac_int32)SA_Q15, SA_Q15 ));
 
-    if( psEncC->frame_length == 10 * psEncC->fs_kHz ) {
+    if (psEncC->frame_length == 10*psEncC->fs_kHz) {
         smooth_coef_Q16 >>= 1;
     }
 
-    for( b = 0; b < VAD_N_BANDS; b++ ) {
+    for (b = 0; b < VAD_N_BANDS; b++) {
         /* compute smoothed energy-to-noise ratio per band */
         psSilk_VAD->NrgRatioSmth_Q8[ b ] = silk_SMLAWB( psSilk_VAD->NrgRatioSmth_Q8[ b ],
             NrgToNoiseRatio_Q8[ b ] - psSilk_VAD->NrgRatioSmth_Q8[ b ], smooth_coef_Q16 );
 
         /* signal to noise ratio in dB per band */
-        SNR_Q7 = 3 * ( silk_lin2log( psSilk_VAD->NrgRatioSmth_Q8[b] ) - 8 * 128 );
+        SNR_Q7 = 3*(silk_lin2log( psSilk_VAD->NrgRatioSmth_Q8[b] ) - 8*128);
         /* quality = sigmoid( 0.25 * ( SNR_dB - 16 ) ); */
-        psEncC->input_quality_bands_Q15[ b ] = silk_sigm_Q15( silk_RSHIFT( SNR_Q7 - 16 * 128, 4 ) );
+        psEncC->input_quality_bands_Q15[ b ] = silk_sigm_Q15( silk_RSHIFT( SNR_Q7 - 16*128, 4 ));
     }
 
     RESTORE_STACK;
-    return( ret );
+    return ret;
 }
 
 /**************************/
 /* Noise level estimation */
 /**************************/
-# if  !defined(OAC_X86_MAY_HAVE_SSE4_1)
+#if  !defined(OAC_X86_MAY_HAVE_SSE4_1)
 static OAC_INLINE
 #endif
 void silk_VAD_GetNoiseLevels(
-    const oac_int32            pX[ VAD_N_BANDS ],  /* I    subband energies                            */
+    const oac_int32 pX[ VAD_N_BANDS ],             /* I    subband energies                            */
     silk_VAD_state              *psSilk_VAD         /* I/O  Pointer to Silk VAD state                   */
-)
-{
-    oac_int   k;
+    ) {
+    oac_int k;
     oac_int32 nl, nrg, inv_nrg;
-    oac_int   coef, min_coef;
+    oac_int coef, min_coef;
 
     /* Initially faster smoothing */
-    if( psSilk_VAD->counter < 1000 ) { /* 1000 = 20 sec */
+    if (psSilk_VAD->counter < 1000) {  /* 1000 = 20 sec */
         min_coef = silk_DIV32_16( silk_int16_MAX, silk_RSHIFT( psSilk_VAD->counter, 4 ) + 1 );
         /* Increment frame counter */
         psSilk_VAD->counter++;
@@ -318,7 +315,7 @@ void silk_VAD_GetNoiseLevels(
         min_coef = 0;
     }
 
-    for( k = 0; k < VAD_N_BANDS; k++ ) {
+    for (k = 0; k < VAD_N_BANDS; k++) {
         /* Get old noise level estimate for current band */
         nl = psSilk_VAD->NL[ k ];
         silk_assert( nl >= 0 );
@@ -332,12 +329,12 @@ void silk_VAD_GetNoiseLevels(
         silk_assert( inv_nrg >= 0 );
 
         /* Less update when subband energy is high */
-        if( nrg > silk_LSHIFT( nl, 3 ) ) {
-            coef = VAD_NOISE_LEVEL_SMOOTH_COEF_Q16 >> 3;
-        } else if( nrg < nl ) {
+        if (nrg > silk_LSHIFT( nl, 3 )) {
+            coef = VAD_NOISE_LEVEL_SMOOTH_COEF_Q16>>3;
+        } else if (nrg < nl) {
             coef = VAD_NOISE_LEVEL_SMOOTH_COEF_Q16;
         } else {
-            coef = silk_SMULWB( silk_SMULWW( inv_nrg, nl ), VAD_NOISE_LEVEL_SMOOTH_COEF_Q16 << 1 );
+            coef = silk_SMULWB( silk_SMULWW( inv_nrg, nl ), VAD_NOISE_LEVEL_SMOOTH_COEF_Q16<<1 );
         }
 
         /* Initially faster smoothing */
diff --git a/silk/VQ_WMat_EC.c b/silk/VQ_WMat_EC.c
index 47f0f3373..c45ed9452 100644
--- a/silk/VQ_WMat_EC.c
+++ b/silk/VQ_WMat_EC.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -42,12 +42,11 @@ void silk_VQ_WMat_EC_c(
     const oac_int8             *cb_Q7,                         /* I    codebook                                    */
     const oac_uint8            *cb_gain_Q7,                    /* I    codebook effective gain                     */
     const oac_uint8            *cl_Q5,                         /* I    code length for each codebook vector        */
-    const oac_int              subfr_len,                      /* I    number of samples per subframe              */
-    const oac_int32            max_gain_Q7,                    /* I    maximum sum of absolute LTP coefficients    */
-    const oac_int              L                               /* I    number of vectors in codebook               */
-)
-{
-    oac_int   k, gain_tmp_Q7;
+    const oac_int subfr_len,                                   /* I    number of samples per subframe              */
+    const oac_int32 max_gain_Q7,                               /* I    maximum sum of absolute LTP coefficients    */
+    const oac_int L                                            /* I    number of vectors in codebook               */
+    ) {
+    oac_int k, gain_tmp_Q7;
     const oac_int8 *cb_row_Q7;
     oac_int32 neg_xX_Q24[ 5 ];
     oac_int32 sum1_Q15, sum2_Q24;
@@ -66,7 +65,7 @@ void silk_VQ_WMat_EC_c(
     cb_row_Q7 = cb_Q7;
     /* If things go really bad, at least *ind is set to something safe. */
     *ind = 0;
-    for( k = 0; k < L; k++ ) {
+    for (k = 0; k < L; k++) {
         oac_int32 penalty;
         gain_tmp_Q7 = cb_gain_Q7[k];
         /* Weighted rate */
@@ -112,12 +111,12 @@ void silk_VQ_WMat_EC_c(
         sum1_Q15 = silk_SMLAWB( sum1_Q15,        sum2_Q24,  cb_row_Q7[ 4 ] );
 
         /* find best */
-        if( sum1_Q15 >= 0 ) {
+        if (sum1_Q15 >= 0) {
             /* Translate residual energy to bits using high-rate assumption (6 dB ==> 1 bit/sample) */
-            bits_res_Q8 = silk_SMULBB( subfr_len, silk_lin2log( sum1_Q15 + penalty) - (15 << 7) );
+            bits_res_Q8 = silk_SMULBB( subfr_len, silk_lin2log( sum1_Q15 + penalty) - (15<<7));
             /* In the following line we reduce the codelength component by half ("-1"); seems to slightly improve quality */
-            bits_tot_Q8 = silk_ADD_LSHIFT32( bits_res_Q8, cl_Q5[ k ], 3-1 );
-            if( bits_tot_Q8 <= *rate_dist_Q8 ) {
+            bits_tot_Q8 = silk_ADD_LSHIFT32( bits_res_Q8, cl_Q5[ k ], 3 - 1 );
+            if (bits_tot_Q8 <= *rate_dist_Q8) {
                 *rate_dist_Q8 = bits_tot_Q8;
                 *res_nrg_Q15 = sum1_Q15 + penalty;
                 *ind = (oac_int8)k;
diff --git a/silk/ana_filt_bank_1.c b/silk/ana_filt_bank_1.c
index 34e084c52..5c835ac9f 100644
--- a/silk/ana_filt_bank_1.c
+++ b/silk/ana_filt_bank_1.c
@@ -1,38 +1,38 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
 
 /* Coefficients for 2-band filter bank based on first-order allpass filters */
-static const oac_int16 A_fb1_20 = 5394 << 1;
+static const oac_int16 A_fb1_20 = 5394<<1;
 static const oac_int16 A_fb1_21 = -24290; /* (oac_int16)(20623 << 1) */
 
 /* Split signal into two decimated bands using first-order allpass filters */
@@ -41,16 +41,15 @@ void silk_ana_filt_bank_1(
     oac_int32                  *S,                 /* I/O  State vector [2]                                            */
     oac_int16                  *outL,              /* O    Low band [N/2]                                              */
     oac_int16                  *outH,              /* O    High band [N/2]                                             */
-    const oac_int32            N                   /* I    Number of input samples                                     */
-)
-{
-    oac_int      k, N2 = silk_RSHIFT( N, 1 );
-    oac_int32    in32, X, Y, out_1, out_2;
+    const oac_int32 N                              /* I    Number of input samples                                     */
+    ) {
+    oac_int k, N2 = silk_RSHIFT( N, 1 );
+    oac_int32 in32, X, Y, out_1, out_2;
 
     /* Internal variables and state are in Q10 format */
-    for( k = 0; k < N2; k++ ) {
+    for (k = 0; k < N2; k++) {
         /* Convert to Q10 */
-        in32 = silk_LSHIFT( (oac_int32)in[ 2 * k ], 10 );
+        in32 = silk_LSHIFT((oac_int32)in[ 2*k ], 10 );
 
         /* All-pass section for even input sample */
         Y      = silk_SUB32( in32, S[ 0 ] );
@@ -59,7 +58,7 @@ void silk_ana_filt_bank_1(
         S[ 0 ] = silk_ADD32( in32, X );
 
         /* Convert to Q10 */
-        in32 = silk_LSHIFT( (oac_int32)in[ 2 * k + 1 ], 10 );
+        in32 = silk_LSHIFT((oac_int32)in[ 2*k + 1 ], 10 );
 
         /* All-pass section for odd input sample, and add to output of previous section */
         Y      = silk_SUB32( in32, S[ 1 ] );
@@ -68,7 +67,7 @@ void silk_ana_filt_bank_1(
         S[ 1 ] = silk_ADD32( in32, X );
 
         /* Add/subtract, convert back to int16 and store to output */
-        outL[ k ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_ADD32( out_2, out_1 ), 11 ) );
-        outH[ k ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SUB32( out_2, out_1 ), 11 ) );
+        outL[ k ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_ADD32( out_2, out_1 ), 11 ));
+        outH[ k ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SUB32( out_2, out_1 ), 11 ));
     }
 }
diff --git a/silk/arm/LPC_inv_pred_gain_arm.h b/silk/arm/LPC_inv_pred_gain_arm.h
index fc1c1b73e..031d8488c 100644
--- a/silk/arm/LPC_inv_pred_gain_arm.h
+++ b/silk/arm/LPC_inv_pred_gain_arm.h
@@ -1,57 +1,60 @@
 /***********************************************************************
-Copyright (c) 2017 Google Inc.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2017 Google Inc.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_LPC_INV_PRED_GAIN_ARM_H
-# define SILK_LPC_INV_PRED_GAIN_ARM_H
+#define SILK_LPC_INV_PRED_GAIN_ARM_H
 
-# include "celt/arm/armcpu.h"
+#include "celt/arm/armcpu.h"
 
-# if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
+#if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 oac_int32 silk_LPC_inverse_pred_gain_neon(         /* O   Returns inverse prediction gain in energy domain, Q30        */
     const oac_int16            *A_Q12,             /* I   Prediction coefficients, Q12 [order]                         */
-    const oac_int              order               /* I   Prediction order                                             */
-);
+    const oac_int order                            /* I   Prediction order                                             */
+    );
 
-#  if !defined(OAC_HAVE_RTCD) && defined(OAC_ARM_PRESUME_NEON)
-#   define OVERRIDE_silk_LPC_inverse_pred_gain            (1)
-#   define silk_LPC_inverse_pred_gain(A_Q12, order, arch) ((void)(arch), PRESUME_NEON(silk_LPC_inverse_pred_gain)(A_Q12, order))
-#  endif
+# if !defined(OAC_HAVE_RTCD) && defined(OAC_ARM_PRESUME_NEON)
+#  define OVERRIDE_silk_LPC_inverse_pred_gain            (1)
+#  define silk_LPC_inverse_pred_gain(A_Q12, order, arch) ((void)(arch), \
+                                                          PRESUME_NEON(silk_LPC_inverse_pred_gain)(A_Q12, order))
 # endif
+#endif
 
-# if !defined(OVERRIDE_silk_LPC_inverse_pred_gain)
+#if !defined(OVERRIDE_silk_LPC_inverse_pred_gain)
 /*Is run-time CPU detection enabled on this platform?*/
-#  if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
-extern oac_int32 (*const SILK_LPC_INVERSE_PRED_GAIN_IMPL[OAC_ARCHMASK+1])(const oac_int16 *A_Q12, const oac_int order);
-#   define OVERRIDE_silk_LPC_inverse_pred_gain            (1)
-#   define silk_LPC_inverse_pred_gain(A_Q12, order, arch) ((*SILK_LPC_INVERSE_PRED_GAIN_IMPL[(arch)&OAC_ARCHMASK])(A_Q12, order))
-#  elif defined(OAC_ARM_PRESUME_NEON_INTR)
-#   define OVERRIDE_silk_LPC_inverse_pred_gain            (1)
-#   define silk_LPC_inverse_pred_gain(A_Q12, order, arch) ((void)(arch), silk_LPC_inverse_pred_gain_neon(A_Q12, order))
-#  endif
+# if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
+extern oac_int32 (*const SILK_LPC_INVERSE_PRED_GAIN_IMPL[OAC_ARCHMASK + 1])(const oac_int16 *A_Q12,
+const oac_int order);
+#  define OVERRIDE_silk_LPC_inverse_pred_gain            (1)
+#  define silk_LPC_inverse_pred_gain(A_Q12, order, \
+                                     arch) ((*SILK_LPC_INVERSE_PRED_GAIN_IMPL[(arch)&OAC_ARCHMASK])(A_Q12, order))
+# elif defined(OAC_ARM_PRESUME_NEON_INTR)
+#  define OVERRIDE_silk_LPC_inverse_pred_gain            (1)
+#  define silk_LPC_inverse_pred_gain(A_Q12, order, arch) ((void)(arch), silk_LPC_inverse_pred_gain_neon(A_Q12, order))
 # endif
+#endif
 
 #endif /* end SILK_LPC_INV_PRED_GAIN_ARM_H */
diff --git a/silk/arm/LPC_inv_pred_gain_neon_intr.c b/silk/arm/LPC_inv_pred_gain_neon_intr.c
index 52a7894e5..065666486 100644
--- a/silk/arm/LPC_inv_pred_gain_neon_intr.c
+++ b/silk/arm/LPC_inv_pred_gain_neon_intr.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2017 Google Inc.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2017 Google Inc.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <arm_neon.h>
@@ -53,25 +53,24 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Compute inverse of LPC prediction gain, and                          */
 /* test if LPC coefficients are stable (all poles within unit circle)   */
 static OAC_INLINE oac_int32 LPC_inverse_pred_gain_QA_neon( /* O   Returns inverse prediction gain in energy domain, Q30    */
-    oac_int32           A_QA[ SILK_MAX_ORDER_LPC ],         /* I   Prediction coefficients                                  */
-    const oac_int       order                               /* I   Prediction order                                         */
-)
-{
-    oac_int   k, n, mult2Q;
+    oac_int32 A_QA[ SILK_MAX_ORDER_LPC ],                   /* I   Prediction coefficients                                  */
+    const oac_int order                                     /* I   Prediction order                                         */
+    ) {
+    oac_int k, n, mult2Q;
     oac_int32 invGain_Q30, rc_Q31, rc_mult1_Q30, rc_mult2, tmp1, tmp2;
     oac_int32 max, min;
-    int32x4_t  max_s32x4, min_s32x4;
-    int32x2_t  max_s32x2, min_s32x2;
+    int32x4_t max_s32x4, min_s32x4;
+    int32x2_t max_s32x2, min_s32x2;
 
     max_s32x4 = vdupq_n_s32( silk_int32_MIN );
     min_s32x4 = vdupq_n_s32( silk_int32_MAX );
     invGain_Q30 = SILK_FIX_CONST( 1, 30 );
-    for( k = order - 1; k > 0; k-- ) {
+    for (k = order - 1; k > 0; k--) {
         int32x2_t rc_Q31_s32x2, rc_mult2_s32x2;
         int64x2_t mult2Q_s64x2;
 
         /* Check for stability */
-        if( ( A_QA[ k ] > A_LIMIT ) || ( A_QA[ k ] < -A_LIMIT ) ) {
+        if ((A_QA[ k ] > A_LIMIT) || (A_QA[ k ] < -A_LIMIT)) {
             return 0;
         }
 
@@ -79,21 +78,21 @@ static OAC_INLINE oac_int32 LPC_inverse_pred_gain_QA_neon( /* O   Returns invers
         rc_Q31 = -silk_LSHIFT( A_QA[ k ], 31 - QA );
 
         /* rc_mult1_Q30 range: [ 1 : 2^30 ] */
-        rc_mult1_Q30 = silk_SUB32( SILK_FIX_CONST( 1, 30 ), silk_SMMUL( rc_Q31, rc_Q31 ) );
-        silk_assert( rc_mult1_Q30 > ( 1 << 15 ) );                   /* reduce A_LIMIT if fails */
-        silk_assert( rc_mult1_Q30 <= ( 1 << 30 ) );
+        rc_mult1_Q30 = silk_SUB32( SILK_FIX_CONST( 1, 30 ), silk_SMMUL( rc_Q31, rc_Q31 ));
+        silk_assert( rc_mult1_Q30 > (1<<15));                        /* reduce A_LIMIT if fails */
+        silk_assert( rc_mult1_Q30 <= (1<<30));
 
         /* Update inverse gain */
         /* invGain_Q30 range: [ 0 : 2^30 ] */
         invGain_Q30 = silk_LSHIFT( silk_SMMUL( invGain_Q30, rc_mult1_Q30 ), 2 );
         silk_assert( invGain_Q30 >= 0           );
-        silk_assert( invGain_Q30 <= ( 1 << 30 ) );
-        if( invGain_Q30 < SILK_FIX_CONST( 1.0f / MAX_PREDICTION_POWER_GAIN, 30 ) ) {
+        silk_assert( invGain_Q30 <= (1<<30));
+        if (invGain_Q30 < SILK_FIX_CONST( 1.0f/MAX_PREDICTION_POWER_GAIN, 30 )) {
             return 0;
         }
 
         /* rc_mult2 range: [ 2^30 : silk_int32_MAX ] */
-        mult2Q = 32 - silk_CLZ32( silk_abs( rc_mult1_Q30 ) );
+        mult2Q = 32 - silk_CLZ32( silk_abs( rc_mult1_Q30 ));
         rc_mult2 = silk_INVERSE32_varQ( rc_mult1_Q30, mult2Q + 30 );
 
         /* Update AR coefficient */
@@ -101,14 +100,14 @@ static OAC_INLINE oac_int32 LPC_inverse_pred_gain_QA_neon( /* O   Returns invers
         mult2Q_s64x2   = vdupq_n_s64( -mult2Q );
         rc_mult2_s32x2 = vdup_n_s32( rc_mult2 );
 
-        for( n = 0; n < ( ( k + 1 ) >> 1 ) - 3; n += 4 ) {
+        for (n = 0; n < ((k + 1)>>1) - 3; n += 4) {
             /* We always calculate extra elements of A_QA buffer when ( k % 4 ) != 0, to take the advantage of SIMD parallelization. */
             int32x4_t tmp1_s32x4, tmp2_s32x4, t0_s32x4, t1_s32x4, s0_s32x4, s1_s32x4, t_QA0_s32x4, t_QA1_s32x4;
             int64x2_t t0_s64x2, t1_s64x2, t2_s64x2, t3_s64x2;
             tmp1_s32x4  = vld1q_s32( A_QA + n );
             tmp2_s32x4  = vld1q_s32( A_QA + k - n - 4 );
             tmp2_s32x4  = vrev64q_s32( tmp2_s32x4 );
-            tmp2_s32x4  = vcombine_s32( vget_high_s32( tmp2_s32x4 ), vget_low_s32( tmp2_s32x4 ) );
+            tmp2_s32x4  = vcombine_s32( vget_high_s32( tmp2_s32x4 ), vget_low_s32( tmp2_s32x4 ));
             t0_s32x4    = vqrdmulhq_lane_s32( tmp2_s32x4, rc_Q31_s32x2, 0 );
             t1_s32x4    = vqrdmulhq_lane_s32( tmp1_s32x4, rc_Q31_s32x2, 0 );
             t_QA0_s32x4 = vqsubq_s32( tmp1_s32x4, t0_s32x4 );
@@ -121,50 +120,50 @@ static OAC_INLINE oac_int32 LPC_inverse_pred_gain_QA_neon( /* O   Returns invers
             t1_s64x2    = vrshlq_s64( t1_s64x2, mult2Q_s64x2 );
             t2_s64x2    = vrshlq_s64( t2_s64x2, mult2Q_s64x2 );
             t3_s64x2    = vrshlq_s64( t3_s64x2, mult2Q_s64x2 );
-            t0_s32x4    = vcombine_s32( vmovn_s64( t0_s64x2 ), vmovn_s64( t1_s64x2 ) );
-            t1_s32x4    = vcombine_s32( vmovn_s64( t2_s64x2 ), vmovn_s64( t3_s64x2 ) );
-            s0_s32x4    = vcombine_s32( vshrn_n_s64( t0_s64x2, 31 ), vshrn_n_s64( t1_s64x2, 31 ) );
-            s1_s32x4    = vcombine_s32( vshrn_n_s64( t2_s64x2, 31 ), vshrn_n_s64( t3_s64x2, 31 ) );
+            t0_s32x4    = vcombine_s32( vmovn_s64( t0_s64x2 ), vmovn_s64( t1_s64x2 ));
+            t1_s32x4    = vcombine_s32( vmovn_s64( t2_s64x2 ), vmovn_s64( t3_s64x2 ));
+            s0_s32x4    = vcombine_s32( vshrn_n_s64( t0_s64x2, 31 ), vshrn_n_s64( t1_s64x2, 31 ));
+            s1_s32x4    = vcombine_s32( vshrn_n_s64( t2_s64x2, 31 ), vshrn_n_s64( t3_s64x2, 31 ));
             max_s32x4   = vmaxq_s32( max_s32x4, s0_s32x4 );
             min_s32x4   = vminq_s32( min_s32x4, s0_s32x4 );
             max_s32x4   = vmaxq_s32( max_s32x4, s1_s32x4 );
             min_s32x4   = vminq_s32( min_s32x4, s1_s32x4 );
             t1_s32x4    = vrev64q_s32( t1_s32x4 );
-            t1_s32x4    = vcombine_s32( vget_high_s32( t1_s32x4 ), vget_low_s32( t1_s32x4 ) );
+            t1_s32x4    = vcombine_s32( vget_high_s32( t1_s32x4 ), vget_low_s32( t1_s32x4 ));
             vst1q_s32( A_QA + n,         t0_s32x4 );
             vst1q_s32( A_QA + k - n - 4, t1_s32x4 );
         }
-        for( ; n < (k + 1) >> 1; n++ ) {
+        for ( ; n < (k + 1)>>1; n++) {
             oac_int64 tmp64;
             tmp1 = A_QA[ n ];
             tmp2 = A_QA[ k - n - 1 ];
             tmp64 = silk_RSHIFT_ROUND64( silk_SMULL( silk_SUB_SAT32(tmp1,
-                  MUL32_FRAC_Q( tmp2, rc_Q31, 31 ) ), rc_mult2 ), mult2Q);
-            if( tmp64 > silk_int32_MAX || tmp64 < silk_int32_MIN ) {
-               return 0;
+                  MUL32_FRAC_Q( tmp2, rc_Q31, 31 )), rc_mult2 ), mult2Q);
+            if (tmp64 > silk_int32_MAX || tmp64 < silk_int32_MIN) {
+                return 0;
             }
             A_QA[ n ] = ( oac_int32 )tmp64;
             tmp64 = silk_RSHIFT_ROUND64( silk_SMULL( silk_SUB_SAT32(tmp2,
-                  MUL32_FRAC_Q( tmp1, rc_Q31, 31 ) ), rc_mult2), mult2Q);
-            if( tmp64 > silk_int32_MAX || tmp64 < silk_int32_MIN ) {
-               return 0;
+                  MUL32_FRAC_Q( tmp1, rc_Q31, 31 )), rc_mult2), mult2Q);
+            if (tmp64 > silk_int32_MAX || tmp64 < silk_int32_MIN) {
+                return 0;
             }
             A_QA[ k - n - 1 ] = ( oac_int32 )tmp64;
         }
     }
 
     /* Check for stability */
-    if( ( A_QA[ k ] > A_LIMIT ) || ( A_QA[ k ] < -A_LIMIT ) ) {
+    if ((A_QA[ k ] > A_LIMIT) || (A_QA[ k ] < -A_LIMIT)) {
         return 0;
     }
 
-    max_s32x2 = vmax_s32( vget_low_s32( max_s32x4 ), vget_high_s32( max_s32x4 ) );
-    min_s32x2 = vmin_s32( vget_low_s32( min_s32x4 ), vget_high_s32( min_s32x4 ) );
-    max_s32x2 = vmax_s32( max_s32x2, vreinterpret_s32_s64( vshr_n_s64( vreinterpret_s64_s32( max_s32x2 ), 32 ) ) );
-    min_s32x2 = vmin_s32( min_s32x2, vreinterpret_s32_s64( vshr_n_s64( vreinterpret_s64_s32( min_s32x2 ), 32 ) ) );
+    max_s32x2 = vmax_s32( vget_low_s32( max_s32x4 ), vget_high_s32( max_s32x4 ));
+    min_s32x2 = vmin_s32( vget_low_s32( min_s32x4 ), vget_high_s32( min_s32x4 ));
+    max_s32x2 = vmax_s32( max_s32x2, vreinterpret_s32_s64( vshr_n_s64( vreinterpret_s64_s32( max_s32x2 ), 32 )));
+    min_s32x2 = vmin_s32( min_s32x2, vreinterpret_s32_s64( vshr_n_s64( vreinterpret_s64_s32( min_s32x2 ), 32 )));
     max = vget_lane_s32( max_s32x2, 0 );
     min = vget_lane_s32( min_s32x2, 0 );
-    if( ( max > 0 ) || ( min < -1 ) ) {
+    if ((max > 0) || (min < -1)) {
         return 0;
     }
 
@@ -172,14 +171,14 @@ static OAC_INLINE oac_int32 LPC_inverse_pred_gain_QA_neon( /* O   Returns invers
     rc_Q31 = -silk_LSHIFT( A_QA[ 0 ], 31 - QA );
 
     /* Range: [ 1 : 2^30 ] */
-    rc_mult1_Q30 = silk_SUB32( SILK_FIX_CONST( 1, 30 ), silk_SMMUL( rc_Q31, rc_Q31 ) );
+    rc_mult1_Q30 = silk_SUB32( SILK_FIX_CONST( 1, 30 ), silk_SMMUL( rc_Q31, rc_Q31 ));
 
     /* Update inverse gain */
     /* Range: [ 0 : 2^30 ] */
     invGain_Q30 = silk_LSHIFT( silk_SMMUL( invGain_Q30, rc_mult1_Q30 ), 2 );
     silk_assert( invGain_Q30 >= 0           );
-    silk_assert( invGain_Q30 <= ( 1 << 30 ) );
-    if( invGain_Q30 < SILK_FIX_CONST( 1.0f / MAX_PREDICTION_POWER_GAIN, 30 ) ) {
+    silk_assert( invGain_Q30 <= (1<<30));
+    if (invGain_Q30 < SILK_FIX_CONST( 1.0f/MAX_PREDICTION_POWER_GAIN, 30 )) {
         return 0;
     }
 
@@ -189,91 +188,87 @@ static OAC_INLINE oac_int32 LPC_inverse_pred_gain_QA_neon( /* O   Returns invers
 /* For input in Q12 domain */
 oac_int32 silk_LPC_inverse_pred_gain_neon(         /* O   Returns inverse prediction gain in energy domain, Q30        */
     const oac_int16            *A_Q12,             /* I   Prediction coefficients, Q12 [order]                         */
-    const oac_int              order               /* I   Prediction order                                             */
-)
-{
+    const oac_int order                            /* I   Prediction order                                             */
+    ) {
 #ifdef OAC_CHECK_ASM
     const oac_int32 invGain_Q30_c = silk_LPC_inverse_pred_gain_c( A_Q12, order );
 #endif
 
     oac_int32 invGain_Q30;
-    if( ( SILK_MAX_ORDER_LPC != 24 ) || ( order & 1 )) {
+    if ((SILK_MAX_ORDER_LPC != 24) || (order&1)) {
         invGain_Q30 = silk_LPC_inverse_pred_gain_c( A_Q12, order );
-    }
-    else {
+    } else   {
         oac_int32 Atmp_QA[ SILK_MAX_ORDER_LPC ];
         oac_int32 DC_resp;
-        int16x8_t  t0_s16x8, t1_s16x8, t2_s16x8;
-        int32x4_t  t0_s32x4;
-        const oac_int leftover = order & 7;
+        int16x8_t t0_s16x8, t1_s16x8, t2_s16x8;
+        int32x4_t t0_s32x4;
+        const oac_int leftover = order&7;
 
         /* Increase Q domain of the AR coefficients */
         t0_s16x8 = vld1q_s16( A_Q12 +  0 );
         t1_s16x8 = vld1q_s16( A_Q12 +  8 );
-        if ( order > 16 ) {
-          t2_s16x8 = vld1q_s16( A_Q12 + 16 );
+        if (order > 16) {
+            t2_s16x8 = vld1q_s16( A_Q12 + 16 );
         }
         t0_s32x4 = vpaddlq_s16( t0_s16x8 );
 
-        switch( order - leftover )
-        {
-        case 24:
-            t0_s32x4 = vpadalq_s16( t0_s32x4, t2_s16x8 );
-            vst1q_s32( Atmp_QA + 16, vshll_n_s16( vget_low_s16 ( t2_s16x8 ), QA - 12 ) );
-            vst1q_s32( Atmp_QA + 20, vshll_n_s16( vget_high_s16( t2_s16x8 ), QA - 12 ) );
+        switch (order - leftover) {
+            case 24:
+                t0_s32x4 = vpadalq_s16( t0_s32x4, t2_s16x8 );
+                vst1q_s32( Atmp_QA + 16, vshll_n_s16( vget_low_s16 ( t2_s16x8 ), QA - 12 ));
+                vst1q_s32( Atmp_QA + 20, vshll_n_s16( vget_high_s16( t2_s16x8 ), QA - 12 ));
             /* FALLTHROUGH */
 
-        case 16:
-            t0_s32x4 = vpadalq_s16( t0_s32x4, t1_s16x8 );
-            vst1q_s32( Atmp_QA +  8, vshll_n_s16( vget_low_s16 ( t1_s16x8 ), QA - 12 ) );
-            vst1q_s32( Atmp_QA + 12, vshll_n_s16( vget_high_s16( t1_s16x8 ), QA - 12 ) );
+            case 16:
+                t0_s32x4 = vpadalq_s16( t0_s32x4, t1_s16x8 );
+                vst1q_s32( Atmp_QA +  8, vshll_n_s16( vget_low_s16 ( t1_s16x8 ), QA - 12 ));
+                vst1q_s32( Atmp_QA + 12, vshll_n_s16( vget_high_s16( t1_s16x8 ), QA - 12 ));
             /* FALLTHROUGH */
 
-        case 8:
-        {
-            const int32x2_t t_s32x2 = vpadd_s32( vget_low_s32( t0_s32x4 ), vget_high_s32( t0_s32x4 ) );
-            const int64x1_t t_s64x1 = vpaddl_s32( t_s32x2 );
-            DC_resp = vget_lane_s32( vreinterpret_s32_s64( t_s64x1 ), 0 );
-            vst1q_s32( Atmp_QA + 0, vshll_n_s16( vget_low_s16 ( t0_s16x8 ), QA - 12 ) );
-            vst1q_s32( Atmp_QA + 4, vshll_n_s16( vget_high_s16( t0_s16x8 ), QA - 12 ) );
-        }
-        break;
-
-        default:
-            DC_resp = 0;
+            case 8:
+            {
+                const int32x2_t t_s32x2 = vpadd_s32( vget_low_s32( t0_s32x4 ), vget_high_s32( t0_s32x4 ));
+                const int64x1_t t_s64x1 = vpaddl_s32( t_s32x2 );
+                DC_resp = vget_lane_s32( vreinterpret_s32_s64( t_s64x1 ), 0 );
+                vst1q_s32( Atmp_QA + 0, vshll_n_s16( vget_low_s16 ( t0_s16x8 ), QA - 12 ));
+                vst1q_s32( Atmp_QA + 4, vshll_n_s16( vget_high_s16( t0_s16x8 ), QA - 12 ));
+            }
             break;
+
+            default:
+                DC_resp = 0;
+                break;
         }
         A_Q12 += order - leftover;
 
-        switch( leftover )
-        {
-        case 6:
-            DC_resp += (oac_int32)A_Q12[ 5 ];
-            DC_resp += (oac_int32)A_Q12[ 4 ];
-            Atmp_QA[ order - leftover + 5 ] = silk_LSHIFT32( (oac_int32)A_Q12[ 5 ], QA - 12 );
-            Atmp_QA[ order - leftover + 4 ] = silk_LSHIFT32( (oac_int32)A_Q12[ 4 ], QA - 12 );
+        switch (leftover) {
+            case 6:
+                DC_resp += (oac_int32)A_Q12[ 5 ];
+                DC_resp += (oac_int32)A_Q12[ 4 ];
+                Atmp_QA[ order - leftover + 5 ] = silk_LSHIFT32((oac_int32)A_Q12[ 5 ], QA - 12 );
+                Atmp_QA[ order - leftover + 4 ] = silk_LSHIFT32((oac_int32)A_Q12[ 4 ], QA - 12 );
             /* FALLTHROUGH */
 
-        case 4:
-            DC_resp += (oac_int32)A_Q12[ 3 ];
-            DC_resp += (oac_int32)A_Q12[ 2 ];
-            Atmp_QA[ order - leftover + 3 ] = silk_LSHIFT32( (oac_int32)A_Q12[ 3 ], QA - 12 );
-            Atmp_QA[ order - leftover + 2 ] = silk_LSHIFT32( (oac_int32)A_Q12[ 2 ], QA - 12 );
+            case 4:
+                DC_resp += (oac_int32)A_Q12[ 3 ];
+                DC_resp += (oac_int32)A_Q12[ 2 ];
+                Atmp_QA[ order - leftover + 3 ] = silk_LSHIFT32((oac_int32)A_Q12[ 3 ], QA - 12 );
+                Atmp_QA[ order - leftover + 2 ] = silk_LSHIFT32((oac_int32)A_Q12[ 2 ], QA - 12 );
             /* FALLTHROUGH */
 
-        case 2:
-            DC_resp += (oac_int32)A_Q12[ 1 ];
-            DC_resp += (oac_int32)A_Q12[ 0 ];
-            Atmp_QA[ order - leftover + 1 ] = silk_LSHIFT32( (oac_int32)A_Q12[ 1 ], QA - 12 );
-            Atmp_QA[ order - leftover + 0 ] = silk_LSHIFT32( (oac_int32)A_Q12[ 0 ], QA - 12 );
+            case 2:
+                DC_resp += (oac_int32)A_Q12[ 1 ];
+                DC_resp += (oac_int32)A_Q12[ 0 ];
+                Atmp_QA[ order - leftover + 1 ] = silk_LSHIFT32((oac_int32)A_Q12[ 1 ], QA - 12 );
+                Atmp_QA[ order - leftover + 0 ] = silk_LSHIFT32((oac_int32)A_Q12[ 0 ], QA - 12 );
             /* FALLTHROUGH */
 
-        default:
-            break;
+            default:
+                break;
         }
 
         /* If the DC is unstable, we don't even need to do the full calculations */
-        if( DC_resp >= 4096 ) {
+        if (DC_resp >= 4096) {
             invGain_Q30 = 0;
         } else {
             invGain_Q30 = LPC_inverse_pred_gain_QA_neon( Atmp_QA, order );
diff --git a/silk/arm/NSQ_del_dec_arm.h b/silk/arm/NSQ_del_dec_arm.h
index d99b5a2ba..d87162db2 100644
--- a/silk/arm/NSQ_del_dec_arm.h
+++ b/silk/arm/NSQ_del_dec_arm.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2017 Google Inc.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2017 Google Inc.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_NSQ_DEL_DEC_ARM_H
@@ -35,8 +35,8 @@ void silk_NSQ_del_dec_neon(
     const silk_encoder_state *psEncC, silk_nsq_state *NSQ,
     SideInfoIndices *psIndices, const oac_int16 x16[], oac_int8 pulses[],
     const oac_int16 *PredCoef_Q12,
-    const oac_int16 LTPCoef_Q14[LTP_ORDER * MAX_NB_SUBFR],
-    const oac_int16 AR_Q13[MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER],
+    const oac_int16 LTPCoef_Q14[LTP_ORDER*MAX_NB_SUBFR],
+    const oac_int16 AR_Q13[MAX_NB_SUBFR*MAX_SHAPE_LPC_ORDER],
     const oac_int HarmShapeGain_Q14[MAX_NB_SUBFR],
     const oac_int Tilt_Q14[MAX_NB_SUBFR],
     const oac_int32 LF_shp_Q14[MAX_NB_SUBFR],
@@ -44,24 +44,24 @@ void silk_NSQ_del_dec_neon(
     const oac_int pitchL[MAX_NB_SUBFR], const oac_int Lambda_Q10,
     const oac_int LTP_scale_Q14);
 
-#if !defined(OAC_HAVE_RTCD)
-#define OVERRIDE_silk_NSQ_del_dec (1)
-#define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12,  \
-                         LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14, Tilt_Q14,   \
-                         LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10,          \
-                         LTP_scale_Q14, arch)                                \
-    ((void)(arch),                                                           \
-     PRESUME_NEON(silk_NSQ_del_dec)(                                         \
-         psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14,     \
-         AR_Q13, HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, \
-         Lambda_Q10, LTP_scale_Q14))
-#endif
+# if !defined(OAC_HAVE_RTCD)
+#  define OVERRIDE_silk_NSQ_del_dec (1)
+#  define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12,  \
+                           LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14, Tilt_Q14,   \
+                           LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10,          \
+                           LTP_scale_Q14, arch)                                \
+        ((void)(arch),                                                           \
+         PRESUME_NEON(silk_NSQ_del_dec)(                                         \
+             psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14,     \
+             AR_Q13, HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, \
+             Lambda_Q10, LTP_scale_Q14))
+# endif
 #endif
 
 #if !defined(OVERRIDE_silk_NSQ_del_dec)
 /*Is run-time CPU detection enabled on this platform?*/
-#if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && \
-                                !defined(OAC_ARM_PRESUME_NEON_INTR))
+# if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && \
+    !defined(OAC_ARM_PRESUME_NEON_INTR))
 extern void (*const SILK_NSQ_DEL_DEC_IMPL[OAC_ARCHMASK + 1])(
     const silk_encoder_state *psEncC, silk_nsq_state *NSQ,
     SideInfoIndices *psIndices, const oac_int16 x16[], oac_int8 pulses[],
@@ -74,27 +74,27 @@ extern void (*const SILK_NSQ_DEL_DEC_IMPL[OAC_ARCHMASK + 1])(
     const oac_int32 Gains_Q16[MAX_NB_SUBFR],
     const oac_int pitchL[MAX_NB_SUBFR], const oac_int Lambda_Q10,
     const oac_int LTP_scale_Q14);
-#define OVERRIDE_silk_NSQ_del_dec (1)
-#define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, \
-                         LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14, Tilt_Q14,  \
-                         LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10,         \
-                         LTP_scale_Q14, arch)                               \
-    ((*SILK_NSQ_DEL_DEC_IMPL[(arch)&OAC_ARCHMASK])(                        \
-        psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14,     \
-        AR_Q13, HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, \
-        Lambda_Q10, LTP_scale_Q14))
-#elif defined(OAC_ARM_PRESUME_NEON_INTR)
-#define OVERRIDE_silk_NSQ_del_dec (1)
-#define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12,   \
-                         LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14, Tilt_Q14,    \
-                         LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10,           \
-                         LTP_scale_Q14, arch)                                 \
-    ((void)(arch),                                                            \
-     silk_NSQ_del_dec_neon(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, \
+#  define OVERRIDE_silk_NSQ_del_dec (1)
+#  define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, \
+                           LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14, Tilt_Q14,  \
+                           LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10,         \
+                           LTP_scale_Q14, arch)                               \
+        ((*SILK_NSQ_DEL_DEC_IMPL[(arch)&OAC_ARCHMASK])(                        \
+             psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14,     \
+             AR_Q13, HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, \
+             Lambda_Q10, LTP_scale_Q14))
+# elif defined(OAC_ARM_PRESUME_NEON_INTR)
+#  define OVERRIDE_silk_NSQ_del_dec (1)
+#  define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12,   \
+                           LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14, Tilt_Q14,    \
+                           LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10,           \
+                           LTP_scale_Q14, arch)                                 \
+        ((void)(arch),                                                            \
+         silk_NSQ_del_dec_neon(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, \
                            LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14, Tilt_Q14,  \
                            LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10,         \
                            LTP_scale_Q14))
-#endif
+# endif
 #endif
 
 #endif /* end SILK_NSQ_DEL_DEC_ARM_H */
diff --git a/silk/arm/NSQ_del_dec_neon_intr.c b/silk/arm/NSQ_del_dec_neon_intr.c
index be90f0ca3..5db221148 100644
--- a/silk/arm/NSQ_del_dec_neon_intr.c
+++ b/silk/arm/NSQ_del_dec_neon_intr.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2017 Google Inc.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2017 Google Inc.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <arm_neon.h>
@@ -70,17 +70,17 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states_neon(
     const silk_encoder_state *psEncC,               /* I    Encoder State                       */
     silk_nsq_state      *NSQ,                       /* I/O  NSQ state                           */
     NSQ_del_decs_struct psDelDec[],                 /* I/O  Delayed decision states             */
-    const oac_int16    x16[],                      /* I    Input                               */
-    oac_int32          x_sc_Q10[],                 /* O    Input scaled with 1/Gain in Q10     */
-    const oac_int16    sLTP[],                     /* I    Re-whitened LTP state in Q0         */
-    oac_int32          sLTP_Q15[],                 /* O    LTP state matching scaled input     */
-    oac_int            subfr,                      /* I    Subframe number                     */
-    const oac_int      LTP_scale_Q14,              /* I    LTP state scaling                   */
-    const oac_int32    Gains_Q16[ MAX_NB_SUBFR ],  /* I                                        */
-    const oac_int      pitchL[ MAX_NB_SUBFR ],     /* I    Pitch lag                           */
-    const oac_int      signal_type,                /* I    Signal type                         */
-    const oac_int      decisionDelay               /* I    Decision delay                      */
-);
+    const oac_int16 x16[],                         /* I    Input                               */
+    oac_int32 x_sc_Q10[],                          /* O    Input scaled with 1/Gain in Q10     */
+    const oac_int16 sLTP[],                        /* I    Re-whitened LTP state in Q0         */
+    oac_int32 sLTP_Q15[],                          /* O    LTP state matching scaled input     */
+    oac_int subfr,                                 /* I    Subframe number                     */
+    const oac_int LTP_scale_Q14,                   /* I    LTP state scaling                   */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],     /* I                                        */
+    const oac_int pitchL[ MAX_NB_SUBFR ],          /* I    Pitch lag                           */
+    const oac_int signal_type,                     /* I    Signal type                         */
+    const oac_int decisionDelay                    /* I    Decision delay                      */
+    );
 
 /******************************************/
 /* Noise shape quantizer for one subframe */
@@ -88,47 +88,45 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states_neon(
 static OAC_INLINE void silk_noise_shape_quantizer_del_dec_neon(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                           */
     NSQ_del_decs_struct psDelDec[],             /* I/O  Delayed decision states             */
-    oac_int            signalType,             /* I    Signal type                         */
-    const oac_int32    x_Q10[],                /* I                                        */
-    oac_int8           pulses[],               /* O                                        */
-    oac_int16          xq[],                   /* O                                        */
-    oac_int32          sLTP_Q15[],             /* I/O  LTP filter state                    */
-    oac_int32          delayedGain_Q10[],      /* I/O  Gain delay buffer                   */
-    const oac_int16    a_Q12[],                /* I    Short term prediction coefs         */
-    const oac_int16    b_Q14[],                /* I    Long term prediction coefs          */
-    const oac_int16    AR_shp_Q13[],           /* I    Noise shaping coefs                 */
-    oac_int            lag,                    /* I    Pitch lag                           */
-    oac_int32          HarmShapeFIRPacked_Q14, /* I                                        */
-    oac_int            Tilt_Q14,               /* I    Spectral tilt                       */
-    oac_int32          LF_shp_Q14,             /* I                                        */
-    oac_int32          Gain_Q16,               /* I                                        */
-    oac_int            Lambda_Q10,             /* I                                        */
-    oac_int            offset_Q10,             /* I                                        */
-    oac_int            length,                 /* I    Input length                        */
-    oac_int            subfr,                  /* I    Subframe number                     */
-    oac_int            shapingLPCOrder,        /* I    Shaping LPC filter order            */
-    oac_int            predictLPCOrder,        /* I    Prediction filter order             */
-    oac_int            warping_Q16,            /* I                                        */
-    oac_int            nStatesDelayedDecision, /* I    Number of states in decision tree   */
+    oac_int signalType,                        /* I    Signal type                         */
+    const oac_int32 x_Q10[],                   /* I                                        */
+    oac_int8 pulses[],                         /* O                                        */
+    oac_int16 xq[],                            /* O                                        */
+    oac_int32 sLTP_Q15[],                      /* I/O  LTP filter state                    */
+    oac_int32 delayedGain_Q10[],               /* I/O  Gain delay buffer                   */
+    const oac_int16 a_Q12[],                   /* I    Short term prediction coefs         */
+    const oac_int16 b_Q14[],                   /* I    Long term prediction coefs          */
+    const oac_int16 AR_shp_Q13[],              /* I    Noise shaping coefs                 */
+    oac_int lag,                               /* I    Pitch lag                           */
+    oac_int32 HarmShapeFIRPacked_Q14,          /* I                                        */
+    oac_int Tilt_Q14,                          /* I    Spectral tilt                       */
+    oac_int32 LF_shp_Q14,                      /* I                                        */
+    oac_int32 Gain_Q16,                        /* I                                        */
+    oac_int Lambda_Q10,                        /* I                                        */
+    oac_int offset_Q10,                        /* I                                        */
+    oac_int length,                            /* I    Input length                        */
+    oac_int subfr,                             /* I    Subframe number                     */
+    oac_int shapingLPCOrder,                   /* I    Shaping LPC filter order            */
+    oac_int predictLPCOrder,                   /* I    Prediction filter order             */
+    oac_int warping_Q16,                       /* I                                        */
+    oac_int nStatesDelayedDecision,            /* I    Number of states in decision tree   */
     oac_int            *smpl_buf_idx,          /* I/O  Index to newest samples in buffers  */
-    oac_int            decisionDelay           /* I                                        */
-);
+    oac_int decisionDelay                      /* I                                        */
+    );
 
 static OAC_INLINE void copy_winner_state_kernel(
     const NSQ_del_decs_struct *psDelDec,
-    const oac_int            offset,
-    const oac_int            last_smple_idx,
-    const oac_int            Winner_ind,
-    const int32x2_t           gain_lo_s32x2,
-    const int32x2_t           gain_hi_s32x2,
-    const int32x4_t           shift_s32x4,
-    int32x4_t                 t0_s32x4,
-    int32x4_t                 t1_s32x4,
-    oac_int8 *const          pulses,
+    const oac_int offset,
+    const oac_int last_smple_idx,
+    const oac_int Winner_ind,
+    const int32x2_t gain_lo_s32x2,
+    const int32x2_t gain_hi_s32x2,
+    const int32x4_t shift_s32x4,
+    int32x4_t t0_s32x4,
+    int32x4_t t1_s32x4,
+    oac_int8 *const pulses,
     oac_int16                *pxq,
-    silk_nsq_state            *NSQ
-)
-{
+    silk_nsq_state            *NSQ) {
     int16x8_t t_s16x8;
     int32x4_t o0_s32x4, o1_s32x4;
 
@@ -140,8 +138,8 @@ static OAC_INLINE void copy_winner_state_kernel(
     t1_s32x4 = vld1q_lane_s32( &psDelDec->Q_Q10[ last_smple_idx - 5 ][ Winner_ind ], t1_s32x4, 1 );
     t1_s32x4 = vld1q_lane_s32( &psDelDec->Q_Q10[ last_smple_idx - 6 ][ Winner_ind ], t1_s32x4, 2 );
     t1_s32x4 = vld1q_lane_s32( &psDelDec->Q_Q10[ last_smple_idx - 7 ][ Winner_ind ], t1_s32x4, 3 );
-    t_s16x8 = vcombine_s16( vrshrn_n_s32( t0_s32x4, 10 ), vrshrn_n_s32( t1_s32x4, 10 ) );
-    vst1_s8( &pulses[ offset ], vmovn_s16( t_s16x8 ) );
+    t_s16x8 = vcombine_s16( vrshrn_n_s32( t0_s32x4, 10 ), vrshrn_n_s32( t1_s32x4, 10 ));
+    vst1_s8( &pulses[ offset ], vmovn_s16( t_s16x8 ));
 
     t0_s32x4 = vld1q_lane_s32( &psDelDec->Xq_Q14[ last_smple_idx - 0 ][ Winner_ind ], t0_s32x4, 0 );
     t0_s32x4 = vld1q_lane_s32( &psDelDec->Xq_Q14[ last_smple_idx - 1 ][ Winner_ind ], t0_s32x4, 1 );
@@ -157,8 +155,8 @@ static OAC_INLINE void copy_winner_state_kernel(
     o1_s32x4 = vmlaq_lane_s32( o1_s32x4, t1_s32x4, gain_hi_s32x2, 0 );
     o0_s32x4 = vrshlq_s32( o0_s32x4, shift_s32x4 );
     o1_s32x4 = vrshlq_s32( o1_s32x4, shift_s32x4 );
-    vst1_s16( &pxq[ offset + 0 ], vqmovn_s32( o0_s32x4 ) );
-    vst1_s16( &pxq[ offset + 4 ], vqmovn_s32( o1_s32x4 ) );
+    vst1_s16( &pxq[ offset + 0 ], vqmovn_s32( o0_s32x4 ));
+    vst1_s16( &pxq[ offset + 4 ], vqmovn_s32( o1_s32x4 ));
 
     t0_s32x4 = vld1q_lane_s32( &psDelDec->Shape_Q14[ last_smple_idx - 0 ][ Winner_ind ], t0_s32x4, 0 );
     t0_s32x4 = vld1q_lane_s32( &psDelDec->Shape_Q14[ last_smple_idx - 1 ][ Winner_ind ], t0_s32x4, 1 );
@@ -174,44 +172,54 @@ static OAC_INLINE void copy_winner_state_kernel(
 
 static OAC_INLINE void copy_winner_state(
     const NSQ_del_decs_struct *psDelDec,
-    const oac_int            decisionDelay,
-    const oac_int            smpl_buf_idx,
-    const oac_int            Winner_ind,
-    const oac_int32          gain,
-    const oac_int32          shift,
-    oac_int8 *const          pulses,
+    const oac_int decisionDelay,
+    const oac_int smpl_buf_idx,
+    const oac_int Winner_ind,
+    const oac_int32 gain,
+    const oac_int32 shift,
+    oac_int8 *const pulses,
     oac_int16                *pxq,
-    silk_nsq_state            *NSQ
-)
-{
-    oac_int        i, last_smple_idx;
-    const int32x2_t gain_lo_s32x2 = vdup_n_s32( silk_LSHIFT32( gain & 0x0000FFFF, 15 ) );
-    const int32x2_t gain_hi_s32x2 = vdup_n_s32( gain >> 16 );
+    silk_nsq_state            *NSQ) {
+    oac_int i, last_smple_idx;
+    const int32x2_t gain_lo_s32x2 = vdup_n_s32( silk_LSHIFT32( gain&0x0000FFFF, 15 ));
+    const int32x2_t gain_hi_s32x2 = vdup_n_s32( gain>>16 );
     const int32x4_t shift_s32x4 = vdupq_n_s32( -shift );
-    int32x4_t       t0_s32x4, t1_s32x4;
+    int32x4_t t0_s32x4, t1_s32x4;
 
     t0_s32x4 = t1_s32x4 = vdupq_n_s32( 0 ); /* initialization */
     last_smple_idx = smpl_buf_idx + decisionDelay - 1 + DECISION_DELAY;
-    if( last_smple_idx >= DECISION_DELAY ) last_smple_idx -= DECISION_DELAY;
-    if( last_smple_idx >= DECISION_DELAY ) last_smple_idx -= DECISION_DELAY;
+    if (last_smple_idx >= DECISION_DELAY)  last_smple_idx -= DECISION_DELAY;
+    if (last_smple_idx >= DECISION_DELAY)  last_smple_idx -= DECISION_DELAY;
 
-    for( i = 0; ( i < ( decisionDelay - 7 ) ) && ( last_smple_idx >= 7 ); i += 8, last_smple_idx -= 8 ) {
-        copy_winner_state_kernel( psDelDec, i - decisionDelay, last_smple_idx, Winner_ind, gain_lo_s32x2, gain_hi_s32x2, shift_s32x4, t0_s32x4, t1_s32x4, pulses, pxq, NSQ );
+    for (i = 0; (i < (decisionDelay - 7)) && (last_smple_idx >= 7); i += 8, last_smple_idx -= 8) {
+        copy_winner_state_kernel( psDelDec, i - decisionDelay, last_smple_idx, Winner_ind, gain_lo_s32x2, gain_hi_s32x2,
+        shift_s32x4, t0_s32x4, t1_s32x4, pulses, pxq, NSQ );
     }
-    for( ; ( i < decisionDelay ) && ( last_smple_idx >= 0 ); i++, last_smple_idx-- ) {
-        pulses[ i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDelDec->Q_Q10[ last_smple_idx ][ Winner_ind ], 10 );
-        pxq[ i - decisionDelay ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( psDelDec->Xq_Q14[ last_smple_idx ][ Winner_ind ], gain ), shift ) );
-        NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay + i ] = psDelDec->Shape_Q14[ last_smple_idx ][ Winner_ind ];
+    for ( ; (i < decisionDelay) && (last_smple_idx >= 0); i++, last_smple_idx--) {
+        pulses[ i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDelDec->Q_Q10[ last_smple_idx ][ Winner_ind ],
+        10 );
+        pxq[ i
+             - decisionDelay ] =
+            (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( psDelDec->Xq_Q14[ last_smple_idx ][ Winner_ind ],
+        gain ), shift ));
+        NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay
+                           + i ] = psDelDec->Shape_Q14[ last_smple_idx ][ Winner_ind ];
     }
 
     last_smple_idx += DECISION_DELAY;
-    for( ; i < ( decisionDelay - 7 ); i++, last_smple_idx-- ) {
-        copy_winner_state_kernel( psDelDec, i - decisionDelay, last_smple_idx, Winner_ind, gain_lo_s32x2, gain_hi_s32x2, shift_s32x4, t0_s32x4, t1_s32x4, pulses, pxq, NSQ );
+    for ( ; i < (decisionDelay - 7); i++, last_smple_idx--) {
+        copy_winner_state_kernel( psDelDec, i - decisionDelay, last_smple_idx, Winner_ind, gain_lo_s32x2, gain_hi_s32x2,
+        shift_s32x4, t0_s32x4, t1_s32x4, pulses, pxq, NSQ );
     }
-    for( ; i < decisionDelay; i++, last_smple_idx-- ) {
-        pulses[ i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDelDec->Q_Q10[ last_smple_idx ][ Winner_ind ], 10 );
-        pxq[ i - decisionDelay ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( psDelDec->Xq_Q14[ last_smple_idx ][ Winner_ind ], gain ), shift ) );
-        NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay + i ] = psDelDec->Shape_Q14[ last_smple_idx ][ Winner_ind ];
+    for ( ; i < decisionDelay; i++, last_smple_idx--) {
+        pulses[ i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDelDec->Q_Q10[ last_smple_idx ][ Winner_ind ],
+        10 );
+        pxq[ i
+             - decisionDelay ] =
+            (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( psDelDec->Xq_Q14[ last_smple_idx ][ Winner_ind ],
+        gain ), shift ));
+        NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay
+                           + i ] = psDelDec->Shape_Q14[ last_smple_idx ][ Winner_ind ];
     }
 }
 
@@ -219,20 +227,19 @@ void silk_NSQ_del_dec_neon(
     const silk_encoder_state    *psEncC,                                    /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                       /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                 /* I/O  Quantization Indices            */
-    const oac_int16            x16[],                                      /* I    Input                           */
-    oac_int8                   pulses[],                                   /* O    Quantized pulse signal          */
+    const oac_int16 x16[],                                                 /* I    Input                           */
+    oac_int8 pulses[],                                                     /* O    Quantized pulse signal          */
     const oac_int16            *PredCoef_Q12,                              /* I    Short term prediction coefs     */
-    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],    /* I    Long term prediction coefs      */
-    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs              */
-    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],          /* I    Long term shaping coefs         */
-    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                   /* I    Spectral tilt                   */
-    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                 /* I    Low frequency shaping coefs     */
-    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                  /* I    Quantization step sizes         */
-    const oac_int              pitchL[ MAX_NB_SUBFR ],                     /* I    Pitch lags                      */
-    const oac_int              Lambda_Q10,                                 /* I    Rate/distortion tradeoff        */
-    const oac_int              LTP_scale_Q14                               /* I    LTP state scaling               */
-)
-{
+    const oac_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],               /* I    Long term prediction coefs      */
+    const oac_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ],            /* I Noise shaping coefs              */
+    const oac_int HarmShapeGain_Q14[ MAX_NB_SUBFR ],                       /* I    Long term shaping coefs         */
+    const oac_int Tilt_Q14[ MAX_NB_SUBFR ],                                /* I    Spectral tilt                   */
+    const oac_int32 LF_shp_Q14[ MAX_NB_SUBFR ],                            /* I    Low frequency shaping coefs     */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],                             /* I    Quantization step sizes         */
+    const oac_int pitchL[ MAX_NB_SUBFR ],                                  /* I    Pitch lags                      */
+    const oac_int Lambda_Q10,                                              /* I    Rate/distortion tradeoff        */
+    const oac_int LTP_scale_Q14                                            /* I    LTP state scaling               */
+    ) {
 #ifdef OAC_CHECK_ASM
     silk_nsq_state NSQ_c;
     SideInfoIndices psIndices_c;
@@ -240,15 +247,16 @@ void silk_NSQ_del_dec_neon(
     const oac_int8 *const pulses_a = pulses;
 
     ( void )pulses_a;
-    silk_memcpy( &NSQ_c, NSQ, sizeof( NSQ_c ) );
-    silk_memcpy( &psIndices_c, psIndices, sizeof( psIndices_c ) );
-    silk_memcpy( pulses_c, pulses, sizeof( pulses_c ) );
-    silk_NSQ_del_dec_c( psEncC, &NSQ_c, &psIndices_c, x16, pulses_c, PredCoef_Q12, LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16,
+    silk_memcpy( &NSQ_c, NSQ, sizeof(NSQ_c));
+    silk_memcpy( &psIndices_c, psIndices, sizeof(psIndices_c));
+    silk_memcpy( pulses_c, pulses, sizeof(pulses_c));
+    silk_NSQ_del_dec_c( psEncC, &NSQ_c, &psIndices_c, x16, pulses_c, PredCoef_Q12, LTPCoef_Q14, AR_Q13,
+    HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16,
                        pitchL, Lambda_Q10, LTP_scale_Q14 );
 #endif
 
     /* The optimization parallelizes the different delay decision states. */
-    if(( psEncC->nStatesDelayedDecision > NEON_MAX_DEL_DEC_STATES ) || ( psEncC->nStatesDelayedDecision <= 2 )) {
+    if ((psEncC->nStatesDelayedDecision > NEON_MAX_DEL_DEC_STATES) || (psEncC->nStatesDelayedDecision <= 2)) {
         /* NEON intrinsics optimization now can only parallelize up to 4 delay decision states.    */
         /* If there are more states, C function is called, and this optimization must be expanded. */
         /* When the number of delay decision states is less than 3, there are penalties using this */
@@ -258,19 +266,19 @@ void silk_NSQ_del_dec_neon(
         silk_NSQ_del_dec_c( psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14,
             Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14 );
     } else {
-        oac_int            i, k, lag, start_idx, LSF_interpolation_flag, Winner_ind, subfr;
-        oac_int            smpl_buf_idx, decisionDelay;
+        oac_int i, k, lag, start_idx, LSF_interpolation_flag, Winner_ind, subfr;
+        oac_int smpl_buf_idx, decisionDelay;
         const oac_int16    *A_Q12, *B_Q14, *AR_shp_Q13;
         oac_int16          *pxq;
         VARDECL( oac_int32, sLTP_Q15 );
         VARDECL( oac_int16, sLTP );
-        oac_int32          HarmShapeFIRPacked_Q14;
-        oac_int            offset_Q10;
-        oac_int32          RDmin_Q10, Gain_Q10;
+        oac_int32 HarmShapeFIRPacked_Q14;
+        oac_int offset_Q10;
+        oac_int32 RDmin_Q10, Gain_Q10;
         VARDECL( oac_int32, x_sc_Q10 );
         VARDECL( oac_int32, delayedGain_Q10 );
         VARDECL( NSQ_del_decs_struct, psDelDec );
-        int32x4_t           t_s32x4;
+        int32x4_t t_s32x4;
         SAVE_STACK;
 
         /* Set unvoiced lag to the previous one, overwrite later for voiced */
@@ -282,41 +290,41 @@ void silk_NSQ_del_dec_neon(
         ALLOC( psDelDec, 1, NSQ_del_decs_struct );
         OAC_CLEAR(psDelDec, 1);
         /* Only RandState and RD_Q10 need to be initialized to 0. */
-        silk_memset( psDelDec->RandState, 0, sizeof( psDelDec->RandState ) );
-        vst1q_s32( psDelDec->RD_Q10, vdupq_n_s32( 0 ) );
+        silk_memset( psDelDec->RandState, 0, sizeof(psDelDec->RandState));
+        vst1q_s32( psDelDec->RD_Q10, vdupq_n_s32( 0 ));
 
-        for( k = 0; k < psEncC->nStatesDelayedDecision; k++ ) {
-            psDelDec->SeedInit[ k ] = psDelDec->Seed[ k ] = ( k + psIndices->Seed ) & 3;
+        for (k = 0; k < psEncC->nStatesDelayedDecision; k++) {
+            psDelDec->SeedInit[ k ] = psDelDec->Seed[ k ] = (k + psIndices->Seed)&3;
         }
-        vst1q_s32( psDelDec->LF_AR_Q14, vld1q_dup_s32( &NSQ->sLF_AR_shp_Q14 ) );
-        vst1q_s32( psDelDec->Diff_Q14, vld1q_dup_s32( &NSQ->sDiff_shp_Q14 ) );
-        vst1q_s32( psDelDec->Shape_Q14[ 0 ], vld1q_dup_s32( &NSQ->sLTP_shp_Q14[ psEncC->ltp_mem_length - 1 ] ) );
-        for( i = 0; i < NSQ_LPC_BUF_LENGTH; i++ ) {
-            vst1q_s32( psDelDec->sLPC_Q14[ i ], vld1q_dup_s32( &NSQ->sLPC_Q14[ i ] ) );
+        vst1q_s32( psDelDec->LF_AR_Q14, vld1q_dup_s32( &NSQ->sLF_AR_shp_Q14 ));
+        vst1q_s32( psDelDec->Diff_Q14, vld1q_dup_s32( &NSQ->sDiff_shp_Q14 ));
+        vst1q_s32( psDelDec->Shape_Q14[ 0 ], vld1q_dup_s32( &NSQ->sLTP_shp_Q14[ psEncC->ltp_mem_length - 1 ] ));
+        for (i = 0; i < NSQ_LPC_BUF_LENGTH; i++) {
+            vst1q_s32( psDelDec->sLPC_Q14[ i ], vld1q_dup_s32( &NSQ->sLPC_Q14[ i ] ));
         }
-        for( i = 0; i < (oac_int)( sizeof( NSQ->sAR2_Q14 ) / sizeof( NSQ->sAR2_Q14[ 0 ] ) ); i++ ) {
-            vst1q_s32( psDelDec->sAR2_Q14[ i ], vld1q_dup_s32( &NSQ->sAR2_Q14[ i ] ) );
+        for (i = 0; i < (oac_int)(sizeof(NSQ->sAR2_Q14)/sizeof(NSQ->sAR2_Q14[ 0 ])); i++) {
+            vst1q_s32( psDelDec->sAR2_Q14[ i ], vld1q_dup_s32( &NSQ->sAR2_Q14[ i ] ));
         }
 
-        offset_Q10   = silk_Quantization_Offsets_Q10[ psIndices->signalType >> 1 ][ psIndices->quantOffsetType ];
+        offset_Q10   = silk_Quantization_Offsets_Q10[ psIndices->signalType>>1 ][ psIndices->quantOffsetType ];
         smpl_buf_idx = 0; /* index of oldest samples */
 
         decisionDelay = silk_min_int( DECISION_DELAY, psEncC->subfr_length );
 
         /* For voiced frames limit the decision delay to lower than the pitch lag */
-        if( psIndices->signalType == TYPE_VOICED ) {
+        if (psIndices->signalType == TYPE_VOICED) {
             oac_int pitch_min = pitchL[ 0 ];
-            for( k = 1; k < psEncC->nb_subfr; k++ ) {
+            for (k = 1; k < psEncC->nb_subfr; k++) {
                 pitch_min = silk_min_int( pitch_min, pitchL[ k ] );
             }
-            decisionDelay = silk_min_int( decisionDelay, pitch_min - LTP_ORDER / 2 - 1 );
+            decisionDelay = silk_min_int( decisionDelay, pitch_min - LTP_ORDER/2 - 1 );
         } else {
-            if( lag > 0 ) {
-                decisionDelay = silk_min_int( decisionDelay, lag - LTP_ORDER / 2 - 1 );
+            if (lag > 0) {
+                decisionDelay = silk_min_int( decisionDelay, lag - LTP_ORDER/2 - 1 );
             }
         }
 
-        if( psIndices->NLSFInterpCoef_Q2 == 4 ) {
+        if (psIndices->NLSFInterpCoef_Q2 == 4) {
             LSF_interpolation_flag = 0;
         } else {
             LSF_interpolation_flag = 1;
@@ -331,51 +339,52 @@ void silk_NSQ_del_dec_neon(
         NSQ->sLTP_shp_buf_idx = psEncC->ltp_mem_length;
         NSQ->sLTP_buf_idx     = psEncC->ltp_mem_length;
         subfr = 0;
-        for( k = 0; k < psEncC->nb_subfr; k++ ) {
-            A_Q12      = &PredCoef_Q12[ ( ( k >> 1 ) | ( 1 - LSF_interpolation_flag ) ) * MAX_LPC_ORDER ];
-            B_Q14      = &LTPCoef_Q14[ k * LTP_ORDER           ];
-            AR_shp_Q13 = &AR_Q13[     k * MAX_SHAPE_LPC_ORDER ];
+        for (k = 0; k < psEncC->nb_subfr; k++) {
+            A_Q12      = &PredCoef_Q12[ ((k>>1)|(1 - LSF_interpolation_flag))*MAX_LPC_ORDER ];
+            B_Q14      = &LTPCoef_Q14[ k*LTP_ORDER           ];
+            AR_shp_Q13 = &AR_Q13[     k*MAX_SHAPE_LPC_ORDER ];
 
             /* Noise shape parameters */
             silk_assert( HarmShapeGain_Q14[ k ] >= 0 );
             HarmShapeFIRPacked_Q14  =                          silk_RSHIFT( HarmShapeGain_Q14[ k ], 2 );
-            HarmShapeFIRPacked_Q14 |= silk_LSHIFT( (oac_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
+            HarmShapeFIRPacked_Q14 |= silk_LSHIFT((oac_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
 
             NSQ->rewhite_flag = 0;
-            if( psIndices->signalType == TYPE_VOICED ) {
+            if (psIndices->signalType == TYPE_VOICED) {
                 /* Voiced */
                 lag = pitchL[ k ];
 
                 /* Re-whitening */
-                if( ( k & ( 3 - silk_LSHIFT( LSF_interpolation_flag, 1 ) ) ) == 0 ) {
-                    if( k == 2 ) {
+                if ((k&(3 - silk_LSHIFT( LSF_interpolation_flag, 1 ))) == 0) {
+                    if (k == 2) {
                         /* RESET DELAYED DECISIONS */
                         /* Find winner */
                         int32x4_t RD_Q10_s32x4;
                         RDmin_Q10 = psDelDec->RD_Q10[ 0 ];
                         Winner_ind = 0;
-                        for( i = 1; i < psEncC->nStatesDelayedDecision; i++ ) {
-                            if( psDelDec->RD_Q10[ i ] < RDmin_Q10 ) {
+                        for (i = 1; i < psEncC->nStatesDelayedDecision; i++) {
+                            if (psDelDec->RD_Q10[ i ] < RDmin_Q10) {
                                 RDmin_Q10 = psDelDec->RD_Q10[ i ];
                                 Winner_ind = i;
                             }
                         }
-                        psDelDec->RD_Q10[ Winner_ind ] -= ( silk_int32_MAX >> 4 );
+                        psDelDec->RD_Q10[ Winner_ind ] -= (silk_int32_MAX>>4);
                         RD_Q10_s32x4 = vld1q_s32( psDelDec->RD_Q10 );
-                        RD_Q10_s32x4 = vaddq_s32( RD_Q10_s32x4, vdupq_n_s32( silk_int32_MAX >> 4 ) );
+                        RD_Q10_s32x4 = vaddq_s32( RD_Q10_s32x4, vdupq_n_s32( silk_int32_MAX>>4 ));
                         vst1q_s32( psDelDec->RD_Q10, RD_Q10_s32x4 );
 
                         /* Copy final part of signals from winner state to output and long-term filter states */
-                        copy_winner_state( psDelDec, decisionDelay, smpl_buf_idx, Winner_ind, Gains_Q16[ 1 ], 14, pulses, pxq, NSQ );
+                        copy_winner_state( psDelDec, decisionDelay, smpl_buf_idx, Winner_ind, Gains_Q16[ 1 ], 14,
+                        pulses, pxq, NSQ );
 
                         subfr = 0;
                     }
 
                     /* Rewhiten with new A coefs */
-                    start_idx = psEncC->ltp_mem_length - lag - psEncC->predictLPCOrder - LTP_ORDER / 2;
+                    start_idx = psEncC->ltp_mem_length - lag - psEncC->predictLPCOrder - LTP_ORDER/2;
                     silk_assert( start_idx > 0 );
 
-                    silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k * psEncC->subfr_length ],
+                    silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k*psEncC->subfr_length ],
                         A_Q12, psEncC->ltp_mem_length - start_idx, psEncC->predictLPCOrder, psEncC->arch );
 
                     NSQ->sLTP_buf_idx = psEncC->ltp_mem_length;
@@ -386,10 +395,12 @@ void silk_NSQ_del_dec_neon(
             silk_nsq_del_dec_scale_states_neon( psEncC, NSQ, psDelDec, x16, x_sc_Q10, sLTP, sLTP_Q15, k,
                 LTP_scale_Q14, Gains_Q16, pitchL, psIndices->signalType, decisionDelay );
 
-            silk_noise_shape_quantizer_del_dec_neon( NSQ, psDelDec, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15,
+            silk_noise_shape_quantizer_del_dec_neon( NSQ, psDelDec, psIndices->signalType, x_sc_Q10, pulses, pxq,
+            sLTP_Q15,
                 delayedGain_Q10, A_Q12, B_Q14, AR_shp_Q13, lag, HarmShapeFIRPacked_Q14, Tilt_Q14[ k ], LF_shp_Q14[ k ],
                 Gains_Q16[ k ], Lambda_Q10, offset_Q10, psEncC->subfr_length, subfr++, psEncC->shapingLPCOrder,
-                psEncC->predictLPCOrder, psEncC->warping_Q16, psEncC->nStatesDelayedDecision, &smpl_buf_idx, decisionDelay );
+                psEncC->predictLPCOrder, psEncC->warping_Q16, psEncC->nStatesDelayedDecision, &smpl_buf_idx,
+            decisionDelay );
 
             x16    += psEncC->subfr_length;
             pulses += psEncC->subfr_length;
@@ -399,8 +410,8 @@ void silk_NSQ_del_dec_neon(
         /* Find winner */
         RDmin_Q10 = psDelDec->RD_Q10[ 0 ];
         Winner_ind = 0;
-        for( k = 1; k < psEncC->nStatesDelayedDecision; k++ ) {
-            if( psDelDec->RD_Q10[ k ] < RDmin_Q10 ) {
+        for (k = 1; k < psEncC->nStatesDelayedDecision; k++) {
+            if (psDelDec->RD_Q10[ k ] < RDmin_Q10) {
                 RDmin_Q10 = psDelDec->RD_Q10[ k ];
                 Winner_ind = k;
             }
@@ -412,7 +423,7 @@ void silk_NSQ_del_dec_neon(
         copy_winner_state( psDelDec, decisionDelay, smpl_buf_idx, Winner_ind, Gain_Q10, 8, pulses, pxq, NSQ );
 
         t_s32x4 = vdupq_n_s32( 0 ); /* initialization */
-        for( i = 0; i < ( NSQ_LPC_BUF_LENGTH - 3 ); i += 4 ) {
+        for (i = 0; i < (NSQ_LPC_BUF_LENGTH - 3); i += 4) {
             t_s32x4 = vld1q_lane_s32( &psDelDec->sLPC_Q14[ i + 0 ][ Winner_ind ], t_s32x4, 0 );
             t_s32x4 = vld1q_lane_s32( &psDelDec->sLPC_Q14[ i + 1 ][ Winner_ind ], t_s32x4, 1 );
             t_s32x4 = vld1q_lane_s32( &psDelDec->sLPC_Q14[ i + 2 ][ Winner_ind ], t_s32x4, 2 );
@@ -420,11 +431,11 @@ void silk_NSQ_del_dec_neon(
             vst1q_s32( &NSQ->sLPC_Q14[ i ], t_s32x4 );
         }
 
-        for( ; i < NSQ_LPC_BUF_LENGTH; i++ ) {
-          NSQ->sLPC_Q14[ i ] = psDelDec->sLPC_Q14[ i ][ Winner_ind ];
+        for ( ; i < NSQ_LPC_BUF_LENGTH; i++) {
+            NSQ->sLPC_Q14[ i ] = psDelDec->sLPC_Q14[ i ][ Winner_ind ];
         }
 
-        for( i = 0; i < (oac_int)( sizeof( NSQ->sAR2_Q14 ) / sizeof( NSQ->sAR2_Q14[ 0 ] ) - 3 ); i += 4 ) {
+        for (i = 0; i < (oac_int)(sizeof(NSQ->sAR2_Q14)/sizeof(NSQ->sAR2_Q14[ 0 ]) - 3); i += 4) {
             t_s32x4 = vld1q_lane_s32( &psDelDec->sAR2_Q14[ i + 0 ][ Winner_ind ], t_s32x4, 0 );
             t_s32x4 = vld1q_lane_s32( &psDelDec->sAR2_Q14[ i + 1 ][ Winner_ind ], t_s32x4, 1 );
             t_s32x4 = vld1q_lane_s32( &psDelDec->sAR2_Q14[ i + 2 ][ Winner_ind ], t_s32x4, 2 );
@@ -432,8 +443,8 @@ void silk_NSQ_del_dec_neon(
             vst1q_s32( &NSQ->sAR2_Q14[ i ], t_s32x4 );
         }
 
-        for( ; i < (oac_int)( sizeof( NSQ->sAR2_Q14 ) / sizeof( NSQ->sAR2_Q14[ 0 ] ) ); i++ ) {
-          NSQ->sAR2_Q14[ i ] = psDelDec->sAR2_Q14[ i ][ Winner_ind ];
+        for ( ; i < (oac_int)(sizeof(NSQ->sAR2_Q14)/sizeof(NSQ->sAR2_Q14[ 0 ])); i++) {
+            NSQ->sAR2_Q14[ i ] = psDelDec->sAR2_Q14[ i ][ Winner_ind ];
         }
 
         /* Update states */
@@ -442,15 +453,17 @@ void silk_NSQ_del_dec_neon(
         NSQ->lagPrev        = pitchL[ psEncC->nb_subfr - 1 ];
 
         /* Save quantized speech signal */
-        silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( oac_int16 ) );
-        silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( oac_int32 ) );
+        silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ],
+        psEncC->ltp_mem_length*sizeof(oac_int16));
+        silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ],
+        psEncC->ltp_mem_length*sizeof(oac_int32));
         RESTORE_STACK;
     }
 
 #ifdef OAC_CHECK_ASM
-    silk_assert( !memcmp( &NSQ_c, NSQ, sizeof( NSQ_c ) ) );
-    silk_assert( !memcmp( &psIndices_c, psIndices, sizeof( psIndices_c ) ) );
-    silk_assert( !memcmp( pulses_c, pulses_a, sizeof( pulses_c ) ) );
+    silk_assert( !memcmp( &NSQ_c, NSQ, sizeof(NSQ_c)));
+    silk_assert( !memcmp( &psIndices_c, psIndices, sizeof(psIndices_c)));
+    silk_assert( !memcmp( pulses_c, pulses_a, sizeof(pulses_c)));
 #endif
 }
 
@@ -459,59 +472,56 @@ void silk_NSQ_del_dec_neon(
 /******************************************/
 /* Note: Function silk_short_prediction_create_arch_coef_neon() defined in NSQ_neon.h is actually a hacking C function. */
 /*       Therefore here we append "_local" to the NEON function name to avoid confusion.                                */
-static OAC_INLINE void silk_short_prediction_create_arch_coef_neon_local(oac_int32 *out, const oac_int16 *in, oac_int order)
-{
-  int16x8_t t_s16x8;
-  int32x4_t t0_s32x4, t1_s32x4, t2_s32x4, t3_s32x4;
-  silk_assert( order == 10 || order == 16 );
-
-  t_s16x8 = vld1q_s16( in + 0 );                                                   /* 7 6 5 4  3 2 1 0    */
-  t_s16x8 = vrev64q_s16( t_s16x8 );                                                /* 4 5 6 7  0 1 2 3    */
-  t2_s32x4 = vshll_n_s16( vget_high_s16( t_s16x8 ), 15 );                          /* 4 5 6 7             */
-  t3_s32x4 = vshll_n_s16( vget_low_s16(  t_s16x8 ), 15 );                          /* 0 1 2 3             */
-
-  if( order == 16 ) {
-      t_s16x8 = vld1q_s16( in + 8 );                                               /* F E D C  B A 9 8    */
-      t_s16x8 = vrev64q_s16( t_s16x8 );                                            /* C D E F  8 9 A B    */
-      t0_s32x4 = vshll_n_s16( vget_high_s16( t_s16x8 ), 15 );                      /* C D E F             */
-      t1_s32x4 = vshll_n_s16( vget_low_s16(  t_s16x8 ), 15 );                      /* 8 9 A B             */
-  } else {
-      int16x4_t t_s16x4;
-
-      t0_s32x4 = vdupq_n_s32( 0 );                                                 /* zero zero zero zero */
-      t_s16x4 = vld1_s16( in + 6 );                                                /* 9    8    7    6    */
-      t_s16x4 = vrev64_s16( t_s16x4 );                                             /* 6    7    8    9    */
-      t1_s32x4 = vshll_n_s16( t_s16x4, 15 );
-      t1_s32x4 = vcombine_s32( vget_low_s32(t0_s32x4), vget_low_s32( t1_s32x4 ) ); /* 8    9    zero zero */
-  }
-  vst1q_s32( out +  0, t0_s32x4 );
-  vst1q_s32( out +  4, t1_s32x4 );
-  vst1q_s32( out +  8, t2_s32x4 );
-  vst1q_s32( out + 12, t3_s32x4 );
+static OAC_INLINE void silk_short_prediction_create_arch_coef_neon_local(oac_int32 *out, const oac_int16 *in,
+                                                                         oac_int order) {
+    int16x8_t t_s16x8;
+    int32x4_t t0_s32x4, t1_s32x4, t2_s32x4, t3_s32x4;
+    silk_assert( order == 10 || order == 16 );
+
+    t_s16x8 = vld1q_s16( in + 0 );                                                 /* 7 6 5 4  3 2 1 0    */
+    t_s16x8 = vrev64q_s16( t_s16x8 );                                              /* 4 5 6 7  0 1 2 3    */
+    t2_s32x4 = vshll_n_s16( vget_high_s16( t_s16x8 ), 15 );                        /* 4 5 6 7             */
+    t3_s32x4 = vshll_n_s16( vget_low_s16(  t_s16x8 ), 15 );                        /* 0 1 2 3             */
+
+    if (order == 16) {
+        t_s16x8 = vld1q_s16( in + 8 );                                             /* F E D C  B A 9 8    */
+        t_s16x8 = vrev64q_s16( t_s16x8 );                                          /* C D E F  8 9 A B    */
+        t0_s32x4 = vshll_n_s16( vget_high_s16( t_s16x8 ), 15 );                    /* C D E F             */
+        t1_s32x4 = vshll_n_s16( vget_low_s16(  t_s16x8 ), 15 );                    /* 8 9 A B             */
+    } else {
+        int16x4_t t_s16x4;
+
+        t0_s32x4 = vdupq_n_s32( 0 );                                               /* zero zero zero zero */
+        t_s16x4 = vld1_s16( in + 6 );                                              /* 9    8    7    6    */
+        t_s16x4 = vrev64_s16( t_s16x4 );                                           /* 6    7    8    9    */
+        t1_s32x4 = vshll_n_s16( t_s16x4, 15 );
+        t1_s32x4 = vcombine_s32( vget_low_s32(t0_s32x4), vget_low_s32( t1_s32x4 )); /* 8    9    zero zero */
+    }
+    vst1q_s32( out +  0, t0_s32x4 );
+    vst1q_s32( out +  4, t1_s32x4 );
+    vst1q_s32( out +  8, t2_s32x4 );
+    vst1q_s32( out + 12, t3_s32x4 );
 }
 
 static OAC_INLINE int32x4_t silk_SMLAWB_lane0_neon(
     const int32x4_t out_s32x4,
     const int32x4_t in_s32x4,
-    const int32x2_t coef_s32x2
-)
-{
-    return vaddq_s32( out_s32x4, vqdmulhq_lane_s32( in_s32x4, coef_s32x2, 0 ) );
+    const int32x2_t coef_s32x2) {
+    return vaddq_s32( out_s32x4, vqdmulhq_lane_s32( in_s32x4, coef_s32x2, 0 ));
 }
 
 static OAC_INLINE int32x4_t silk_SMLAWB_lane1_neon(
     const int32x4_t out_s32x4,
     const int32x4_t in_s32x4,
-    const int32x2_t coef_s32x2
-)
-{
-    return vaddq_s32( out_s32x4, vqdmulhq_lane_s32( in_s32x4, coef_s32x2, 1 ) );
+    const int32x2_t coef_s32x2) {
+    return vaddq_s32( out_s32x4, vqdmulhq_lane_s32( in_s32x4, coef_s32x2, 1 ));
 }
 
 /* Note: This function has different return value than silk_noise_shape_quantizer_short_prediction_neon(). */
 /*       Therefore here we append "_local" to the function name to avoid confusion.                        */
-static OAC_INLINE int32x4_t silk_noise_shape_quantizer_short_prediction_neon_local(const oac_int32 *buf32, const oac_int32 *a_Q12_arch, oac_int order)
-{
+static OAC_INLINE int32x4_t silk_noise_shape_quantizer_short_prediction_neon_local(const oac_int32 *buf32,
+                                                                                   const oac_int32 *a_Q12_arch,
+                                                                                   oac_int order) {
     const int32x4_t a_Q12_arch0_s32x4 = vld1q_s32( a_Q12_arch + 0 );
     const int32x4_t a_Q12_arch1_s32x4 = vld1q_s32( a_Q12_arch + 4 );
     const int32x4_t a_Q12_arch2_s32x4 = vld1q_s32( a_Q12_arch + 8 );
@@ -520,23 +530,39 @@ static OAC_INLINE int32x4_t silk_noise_shape_quantizer_short_prediction_neon_loc
 
     silk_assert( order == 10 || order == 16 );
     /* Avoids introducing a bias because silk_SMLAWB() always rounds to -inf */
-    LPC_pred_Q14_s32x4 = vdupq_n_s32( silk_RSHIFT( order, 1 ) );
-    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane0_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 +  0 * NEON_MAX_DEL_DEC_STATES ), vget_low_s32(  a_Q12_arch0_s32x4 ) );
-    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane1_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 +  1 * NEON_MAX_DEL_DEC_STATES ), vget_low_s32(  a_Q12_arch0_s32x4 ) );
-    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane0_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 +  2 * NEON_MAX_DEL_DEC_STATES ), vget_high_s32( a_Q12_arch0_s32x4 ) );
-    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane1_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 +  3 * NEON_MAX_DEL_DEC_STATES ), vget_high_s32( a_Q12_arch0_s32x4 ) );
-    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane0_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 +  4 * NEON_MAX_DEL_DEC_STATES ), vget_low_s32(  a_Q12_arch1_s32x4 ) );
-    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane1_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 +  5 * NEON_MAX_DEL_DEC_STATES ), vget_low_s32(  a_Q12_arch1_s32x4 ) );
-    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane0_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 +  6 * NEON_MAX_DEL_DEC_STATES ), vget_high_s32( a_Q12_arch1_s32x4 ) );
-    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane1_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 +  7 * NEON_MAX_DEL_DEC_STATES ), vget_high_s32( a_Q12_arch1_s32x4 ) );
-    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane0_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 +  8 * NEON_MAX_DEL_DEC_STATES ), vget_low_s32(  a_Q12_arch2_s32x4 ) );
-    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane1_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 +  9 * NEON_MAX_DEL_DEC_STATES ), vget_low_s32(  a_Q12_arch2_s32x4 ) );
-    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane0_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 + 10 * NEON_MAX_DEL_DEC_STATES ), vget_high_s32( a_Q12_arch2_s32x4 ) );
-    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane1_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 + 11 * NEON_MAX_DEL_DEC_STATES ), vget_high_s32( a_Q12_arch2_s32x4 ) );
-    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane0_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 + 12 * NEON_MAX_DEL_DEC_STATES ), vget_low_s32(  a_Q12_arch3_s32x4 ) );
-    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane1_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 + 13 * NEON_MAX_DEL_DEC_STATES ), vget_low_s32(  a_Q12_arch3_s32x4 ) );
-    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane0_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 + 14 * NEON_MAX_DEL_DEC_STATES ), vget_high_s32( a_Q12_arch3_s32x4 ) );
-    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane1_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 + 15 * NEON_MAX_DEL_DEC_STATES ), vget_high_s32( a_Q12_arch3_s32x4 ) );
+    LPC_pred_Q14_s32x4 = vdupq_n_s32( silk_RSHIFT( order, 1 ));
+    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane0_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 +  0*NEON_MAX_DEL_DEC_STATES ),
+    vget_low_s32(  a_Q12_arch0_s32x4 ));
+    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane1_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 +  1*NEON_MAX_DEL_DEC_STATES ),
+    vget_low_s32(  a_Q12_arch0_s32x4 ));
+    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane0_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 +  2*NEON_MAX_DEL_DEC_STATES ),
+    vget_high_s32( a_Q12_arch0_s32x4 ));
+    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane1_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 +  3*NEON_MAX_DEL_DEC_STATES ),
+    vget_high_s32( a_Q12_arch0_s32x4 ));
+    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane0_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 +  4*NEON_MAX_DEL_DEC_STATES ),
+    vget_low_s32(  a_Q12_arch1_s32x4 ));
+    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane1_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 +  5*NEON_MAX_DEL_DEC_STATES ),
+    vget_low_s32(  a_Q12_arch1_s32x4 ));
+    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane0_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 +  6*NEON_MAX_DEL_DEC_STATES ),
+    vget_high_s32( a_Q12_arch1_s32x4 ));
+    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane1_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 +  7*NEON_MAX_DEL_DEC_STATES ),
+    vget_high_s32( a_Q12_arch1_s32x4 ));
+    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane0_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 +  8*NEON_MAX_DEL_DEC_STATES ),
+    vget_low_s32(  a_Q12_arch2_s32x4 ));
+    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane1_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 +  9*NEON_MAX_DEL_DEC_STATES ),
+    vget_low_s32(  a_Q12_arch2_s32x4 ));
+    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane0_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 + 10*NEON_MAX_DEL_DEC_STATES ),
+    vget_high_s32( a_Q12_arch2_s32x4 ));
+    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane1_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 + 11*NEON_MAX_DEL_DEC_STATES ),
+    vget_high_s32( a_Q12_arch2_s32x4 ));
+    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane0_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 + 12*NEON_MAX_DEL_DEC_STATES ),
+    vget_low_s32(  a_Q12_arch3_s32x4 ));
+    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane1_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 + 13*NEON_MAX_DEL_DEC_STATES ),
+    vget_low_s32(  a_Q12_arch3_s32x4 ));
+    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane0_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 + 14*NEON_MAX_DEL_DEC_STATES ),
+    vget_high_s32( a_Q12_arch3_s32x4 ));
+    LPC_pred_Q14_s32x4 = silk_SMLAWB_lane1_neon( LPC_pred_Q14_s32x4, vld1q_s32( buf32 + 15*NEON_MAX_DEL_DEC_STATES ),
+    vget_high_s32( a_Q12_arch3_s32x4 ));
 
     return LPC_pred_Q14_s32x4;
 }
@@ -544,41 +570,40 @@ static OAC_INLINE int32x4_t silk_noise_shape_quantizer_short_prediction_neon_loc
 static OAC_INLINE void silk_noise_shape_quantizer_del_dec_neon(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                           */
     NSQ_del_decs_struct psDelDec[],             /* I/O  Delayed decision states             */
-    oac_int            signalType,             /* I    Signal type                         */
-    const oac_int32    x_Q10[],                /* I                                        */
-    oac_int8           pulses[],               /* O                                        */
-    oac_int16          xq[],                   /* O                                        */
-    oac_int32          sLTP_Q15[],             /* I/O  LTP filter state                    */
-    oac_int32          delayedGain_Q10[],      /* I/O  Gain delay buffer                   */
-    const oac_int16    a_Q12[],                /* I    Short term prediction coefs         */
-    const oac_int16    b_Q14[],                /* I    Long term prediction coefs          */
-    const oac_int16    AR_shp_Q13[],           /* I    Noise shaping coefs                 */
-    oac_int            lag,                    /* I    Pitch lag                           */
-    oac_int32          HarmShapeFIRPacked_Q14, /* I                                        */
-    oac_int            Tilt_Q14,               /* I    Spectral tilt                       */
-    oac_int32          LF_shp_Q14,             /* I                                        */
-    oac_int32          Gain_Q16,               /* I                                        */
-    oac_int            Lambda_Q10,             /* I                                        */
-    oac_int            offset_Q10,             /* I                                        */
-    oac_int            length,                 /* I    Input length                        */
-    oac_int            subfr,                  /* I    Subframe number                     */
-    oac_int            shapingLPCOrder,        /* I    Shaping LPC filter order            */
-    oac_int            predictLPCOrder,        /* I    Prediction filter order             */
-    oac_int            warping_Q16,            /* I                                        */
-    oac_int            nStatesDelayedDecision, /* I    Number of states in decision tree   */
+    oac_int signalType,                        /* I    Signal type                         */
+    const oac_int32 x_Q10[],                   /* I                                        */
+    oac_int8 pulses[],                         /* O                                        */
+    oac_int16 xq[],                            /* O                                        */
+    oac_int32 sLTP_Q15[],                      /* I/O  LTP filter state                    */
+    oac_int32 delayedGain_Q10[],               /* I/O  Gain delay buffer                   */
+    const oac_int16 a_Q12[],                   /* I    Short term prediction coefs         */
+    const oac_int16 b_Q14[],                   /* I    Long term prediction coefs          */
+    const oac_int16 AR_shp_Q13[],              /* I    Noise shaping coefs                 */
+    oac_int lag,                               /* I    Pitch lag                           */
+    oac_int32 HarmShapeFIRPacked_Q14,          /* I                                        */
+    oac_int Tilt_Q14,                          /* I    Spectral tilt                       */
+    oac_int32 LF_shp_Q14,                      /* I                                        */
+    oac_int32 Gain_Q16,                        /* I                                        */
+    oac_int Lambda_Q10,                        /* I                                        */
+    oac_int offset_Q10,                        /* I                                        */
+    oac_int length,                            /* I    Input length                        */
+    oac_int subfr,                             /* I    Subframe number                     */
+    oac_int shapingLPCOrder,                   /* I    Shaping LPC filter order            */
+    oac_int predictLPCOrder,                   /* I    Prediction filter order             */
+    oac_int warping_Q16,                       /* I                                        */
+    oac_int nStatesDelayedDecision,            /* I    Number of states in decision tree   */
     oac_int            *smpl_buf_idx,          /* I/O  Index to newest samples in buffers  */
-    oac_int            decisionDelay           /* I                                        */
-)
-{
-    oac_int     i, j, k, Winner_ind, RDmin_ind, RDmax_ind, last_smple_idx;
-    oac_int32   Winner_rand_state;
-    oac_int32   LTP_pred_Q14, n_LTP_Q14;
-    oac_int32   RDmin_Q10, RDmax_Q10;
-    oac_int32   Gain_Q10;
+    oac_int decisionDelay                      /* I                                        */
+    ) {
+    oac_int i, j, k, Winner_ind, RDmin_ind, RDmax_ind, last_smple_idx;
+    oac_int32 Winner_rand_state;
+    oac_int32 LTP_pred_Q14, n_LTP_Q14;
+    oac_int32 RDmin_Q10, RDmax_Q10;
+    oac_int32 Gain_Q10;
     oac_int32   *pred_lag_ptr, *shp_lag_ptr;
-    oac_int32   a_Q12_arch[MAX_LPC_ORDER];
-    const int32x2_t warping_Q16_s32x2 = vdup_n_s32( silk_LSHIFT32( warping_Q16, 16 ) >> 1 );
-    const oac_int32 LF_shp_Q29 = silk_LSHIFT32( LF_shp_Q14, 16 ) >> 1;
+    oac_int32 a_Q12_arch[MAX_LPC_ORDER];
+    const int32x2_t warping_Q16_s32x2 = vdup_n_s32( silk_LSHIFT32( warping_Q16, 16 )>>1 );
+    const oac_int32 LF_shp_Q29 = silk_LSHIFT32( LF_shp_Q14, 16 )>>1;
     oac_int32 AR_shp_Q28[ MAX_SHAPE_LPC_ORDER ];
     const uint32x4_t rand_multiplier_u32x4 = vdupq_n_u32( RAND_MULTIPLIER );
     const uint32x4_t rand_increment_u32x4 = vdupq_n_u32( RAND_INCREMENT );
@@ -587,27 +612,27 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_neon(
     SAVE_STACK;
 
     silk_assert( nStatesDelayedDecision > 0 );
-    silk_assert( ( shapingLPCOrder & 1 ) == 0 );   /* check that order is even */
+    silk_assert((shapingLPCOrder&1) == 0 );        /* check that order is even */
     ALLOC( psSampleState, 2, NSQ_samples_struct );
     OAC_CLEAR(psSampleState, 2);
 
-    shp_lag_ptr  = &NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS / 2 ];
-    pred_lag_ptr = &sLTP_Q15[ NSQ->sLTP_buf_idx - lag + LTP_ORDER / 2 ];
+    shp_lag_ptr  = &NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS/2 ];
+    pred_lag_ptr = &sLTP_Q15[ NSQ->sLTP_buf_idx - lag + LTP_ORDER/2 ];
     Gain_Q10     = silk_RSHIFT( Gain_Q16, 6 );
 
-    for( i = 0; i < ( MAX_SHAPE_LPC_ORDER - 7 ); i += 8 ) {
-      const int16x8_t t_s16x8 = vld1q_s16( AR_shp_Q13 +  i );
-      vst1q_s32( AR_shp_Q28 + i + 0, vshll_n_s16( vget_low_s16(  t_s16x8 ), 15 ) );
-      vst1q_s32( AR_shp_Q28 + i + 4, vshll_n_s16( vget_high_s16( t_s16x8 ), 15 ) );
+    for (i = 0; i < (MAX_SHAPE_LPC_ORDER - 7); i += 8) {
+        const int16x8_t t_s16x8 = vld1q_s16( AR_shp_Q13 +  i );
+        vst1q_s32( AR_shp_Q28 + i + 0, vshll_n_s16( vget_low_s16(  t_s16x8 ), 15 ));
+        vst1q_s32( AR_shp_Q28 + i + 4, vshll_n_s16( vget_high_s16( t_s16x8 ), 15 ));
     }
 
-    for( ; i < MAX_SHAPE_LPC_ORDER; i++ ) {
-      AR_shp_Q28[i] = silk_LSHIFT32( AR_shp_Q13[i], 15 );
+    for ( ; i < MAX_SHAPE_LPC_ORDER; i++) {
+        AR_shp_Q28[i] = silk_LSHIFT32( AR_shp_Q13[i], 15 );
     }
 
     silk_short_prediction_create_arch_coef_neon_local( a_Q12_arch, a_Q12, predictLPCOrder );
 
-    for( i = 0; i < length; i++ ) {
+    for (i = 0; i < length; i++) {
         int32x4_t Seed_s32x4, LPC_pred_Q14_s32x4;
         int32x4_t sign_s32x4, tmp1_s32x4, tmp2_s32x4;
         int32x4_t n_AR_Q14_s32x4, n_LF_Q14_s32x4;
@@ -617,7 +642,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_neon(
         /* Perform common calculations used in all states */
 
         /* Long-term prediction */
-        if( signalType == TYPE_VOICED ) {
+        if (signalType == TYPE_VOICED) {
             /* Unrolled loop */
             /* Avoids introducing a bias because silk_SMLAWB() always rounds to -inf */
             LTP_pred_Q14 = 2;
@@ -633,7 +658,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_neon(
         }
 
         /* Long-term shaping */
-        if( lag > 0 ) {
+        if (lag > 0) {
             /* Symmetric, packed FIR coefficients */
             n_LTP_Q14 = silk_SMULWB( silk_ADD32( shp_lag_ptr[ 0 ], shp_lag_ptr[ -2 ] ), HarmShapeFIRPacked_Q14 );
             n_LTP_Q14 = silk_SMLAWT( n_LTP_Q14, shp_lag_ptr[ -1 ],                      HarmShapeFIRPacked_Q14 );
@@ -645,44 +670,53 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_neon(
 
         /* Generate dither */
         Seed_s32x4 = vld1q_s32( psDelDec->Seed );
-        Seed_s32x4 = vreinterpretq_s32_u32( vmlaq_u32( rand_increment_u32x4, vreinterpretq_u32_s32( Seed_s32x4 ), rand_multiplier_u32x4 ) );
+        Seed_s32x4 = vreinterpretq_s32_u32( vmlaq_u32( rand_increment_u32x4, vreinterpretq_u32_s32( Seed_s32x4 ),
+        rand_multiplier_u32x4 ));
         vst1q_s32( psDelDec->Seed, Seed_s32x4 );
 
         /* Short-term prediction */
-        LPC_pred_Q14_s32x4 = silk_noise_shape_quantizer_short_prediction_neon_local(psDelDec->sLPC_Q14[ NSQ_LPC_BUF_LENGTH - 16 + i ], a_Q12_arch, predictLPCOrder);
+        LPC_pred_Q14_s32x4 =
+            silk_noise_shape_quantizer_short_prediction_neon_local(psDelDec->sLPC_Q14[ NSQ_LPC_BUF_LENGTH - 16 + i ],
+        a_Q12_arch, predictLPCOrder);
         LPC_pred_Q14_s32x4 = vshlq_n_s32( LPC_pred_Q14_s32x4, 4 ); /* Q10 -> Q14 */
 
         /* Noise shape feedback */
         /* Output of lowpass section */
-        tmp2_s32x4 = silk_SMLAWB_lane0_neon( vld1q_s32( psDelDec->Diff_Q14 ), vld1q_s32( psDelDec->sAR2_Q14[ 0 ] ), warping_Q16_s32x2 );
+        tmp2_s32x4 = silk_SMLAWB_lane0_neon( vld1q_s32( psDelDec->Diff_Q14 ), vld1q_s32( psDelDec->sAR2_Q14[ 0 ] ),
+        warping_Q16_s32x2 );
         /* Output of allpass section */
         tmp1_s32x4 = vsubq_s32( vld1q_s32( psDelDec->sAR2_Q14[ 1 ] ), tmp2_s32x4 );
         tmp1_s32x4 = silk_SMLAWB_lane0_neon( vld1q_s32( psDelDec->sAR2_Q14[ 0 ] ), tmp1_s32x4, warping_Q16_s32x2 );
         vst1q_s32( psDelDec->sAR2_Q14[ 0 ], tmp2_s32x4 );
         AR_shp_Q28_s32x2 = vld1_s32( AR_shp_Q28 );
-        n_AR_Q14_s32x4 = vaddq_s32( vdupq_n_s32( silk_RSHIFT( shapingLPCOrder, 1 ) ), vqdmulhq_lane_s32( tmp2_s32x4, AR_shp_Q28_s32x2, 0 ) );
+        n_AR_Q14_s32x4 = vaddq_s32( vdupq_n_s32( silk_RSHIFT( shapingLPCOrder, 1 )),
+        vqdmulhq_lane_s32( tmp2_s32x4, AR_shp_Q28_s32x2, 0 ));
 
         /* Loop over allpass sections */
-        for( j = 2; j < shapingLPCOrder; j += 2 ) {
+        for (j = 2; j < shapingLPCOrder; j += 2) {
             /* Output of allpass section */
             tmp2_s32x4 = vsubq_s32( vld1q_s32( psDelDec->sAR2_Q14[ j + 0 ] ), tmp1_s32x4 );
-            tmp2_s32x4 = silk_SMLAWB_lane0_neon( vld1q_s32( psDelDec->sAR2_Q14[ j - 1 ] ), tmp2_s32x4, warping_Q16_s32x2 );
+            tmp2_s32x4 = silk_SMLAWB_lane0_neon( vld1q_s32( psDelDec->sAR2_Q14[ j - 1 ] ), tmp2_s32x4,
+            warping_Q16_s32x2 );
             vst1q_s32( psDelDec->sAR2_Q14[ j - 1 ], tmp1_s32x4 );
-            n_AR_Q14_s32x4 = vaddq_s32( n_AR_Q14_s32x4, vqdmulhq_lane_s32( tmp1_s32x4, AR_shp_Q28_s32x2, 1 ) );
+            n_AR_Q14_s32x4 = vaddq_s32( n_AR_Q14_s32x4, vqdmulhq_lane_s32( tmp1_s32x4, AR_shp_Q28_s32x2, 1 ));
             /* Output of allpass section */
             tmp1_s32x4 = vsubq_s32( vld1q_s32( psDelDec->sAR2_Q14[ j + 1 ] ), tmp2_s32x4 );
-            tmp1_s32x4 = silk_SMLAWB_lane0_neon( vld1q_s32( psDelDec->sAR2_Q14[ j + 0 ] ), tmp1_s32x4, warping_Q16_s32x2 );
+            tmp1_s32x4 = silk_SMLAWB_lane0_neon( vld1q_s32( psDelDec->sAR2_Q14[ j + 0 ] ), tmp1_s32x4,
+            warping_Q16_s32x2 );
             vst1q_s32( psDelDec->sAR2_Q14[ j + 0 ], tmp2_s32x4 );
             AR_shp_Q28_s32x2 = vld1_s32( &AR_shp_Q28[ j ] );
-            n_AR_Q14_s32x4 = vaddq_s32( n_AR_Q14_s32x4, vqdmulhq_lane_s32( tmp2_s32x4, AR_shp_Q28_s32x2, 0 ) );
+            n_AR_Q14_s32x4 = vaddq_s32( n_AR_Q14_s32x4, vqdmulhq_lane_s32( tmp2_s32x4, AR_shp_Q28_s32x2, 0 ));
         }
         vst1q_s32( psDelDec->sAR2_Q14[ shapingLPCOrder - 1 ], tmp1_s32x4 );
-        n_AR_Q14_s32x4 = vaddq_s32( n_AR_Q14_s32x4, vqdmulhq_lane_s32( tmp1_s32x4, AR_shp_Q28_s32x2, 1 ) );
+        n_AR_Q14_s32x4 = vaddq_s32( n_AR_Q14_s32x4, vqdmulhq_lane_s32( tmp1_s32x4, AR_shp_Q28_s32x2, 1 ));
         n_AR_Q14_s32x4 = vshlq_n_s32( n_AR_Q14_s32x4, 1 );                                                                                        /* Q11 -> Q12 */
-        n_AR_Q14_s32x4 = vaddq_s32( n_AR_Q14_s32x4, vqdmulhq_n_s32( vld1q_s32( psDelDec->LF_AR_Q14 ), silk_LSHIFT32( Tilt_Q14, 16 ) >> 1 ) );     /* Q12 */
+        n_AR_Q14_s32x4 = vaddq_s32( n_AR_Q14_s32x4,
+        vqdmulhq_n_s32( vld1q_s32( psDelDec->LF_AR_Q14 ), silk_LSHIFT32( Tilt_Q14, 16 )>>1 ));                                                    /* Q12 */
         n_AR_Q14_s32x4 = vshlq_n_s32( n_AR_Q14_s32x4, 2 );                                                                                        /* Q12 -> Q14 */
         n_LF_Q14_s32x4 = vqdmulhq_n_s32( vld1q_s32( psDelDec->Shape_Q14[ *smpl_buf_idx ] ), LF_shp_Q29 );                                         /* Q12 */
-        n_LF_Q14_s32x4 = vaddq_s32( n_LF_Q14_s32x4, vqdmulhq_n_s32( vld1q_s32( psDelDec->LF_AR_Q14 ), silk_LSHIFT32( LF_shp_Q14 >> 16 , 15 ) ) ); /* Q12 */
+        n_LF_Q14_s32x4 = vaddq_s32( n_LF_Q14_s32x4,
+        vqdmulhq_n_s32( vld1q_s32( psDelDec->LF_AR_Q14 ), silk_LSHIFT32( LF_shp_Q14>>16, 15 )));                                                  /* Q12 */
         n_LF_Q14_s32x4 = vshlq_n_s32( n_LF_Q14_s32x4, 2 );                                                                                        /* Q12 -> Q14 */
 
         /* Input minus prediction plus noise feedback                       */
@@ -694,58 +728,64 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_neon(
         tmp1_s32x4 = vsubq_s32( vdupq_n_s32( x_Q10[ i ] ), tmp1_s32x4 );        /* residual error Q10 */
 
         /* Flip sign depending on dither */
-        sign_s32x4 = vreinterpretq_s32_u32( vcltq_s32( Seed_s32x4, vdupq_n_s32( 0 ) ) );
+        sign_s32x4 = vreinterpretq_s32_u32( vcltq_s32( Seed_s32x4, vdupq_n_s32( 0 )));
         tmp1_s32x4 = veorq_s32( tmp1_s32x4, sign_s32x4 );
         tmp1_s32x4 = vsubq_s32( tmp1_s32x4, sign_s32x4 );
-        tmp1_s32x4 = vmaxq_s32( tmp1_s32x4, vdupq_n_s32( -( 31 << 10 ) ) );
-        tmp1_s32x4 = vminq_s32( tmp1_s32x4, vdupq_n_s32( 30 << 10 ) );
+        tmp1_s32x4 = vmaxq_s32( tmp1_s32x4, vdupq_n_s32( -(31<<10)));
+        tmp1_s32x4 = vminq_s32( tmp1_s32x4, vdupq_n_s32( 30<<10 ));
         r_Q10_s16x4 = vmovn_s32( tmp1_s32x4 );
 
         /* Find two quantization level candidates and measure their rate-distortion */
         {
-            int16x4_t q1_Q10_s16x4 = vsub_s16( r_Q10_s16x4, vdup_n_s16( offset_Q10 ) );
+            int16x4_t q1_Q10_s16x4 = vsub_s16( r_Q10_s16x4, vdup_n_s16( offset_Q10 ));
             int16x4_t q1_Q0_s16x4 = vshr_n_s16( q1_Q10_s16x4, 10 );
             int16x4_t q2_Q10_s16x4;
             int32x4_t rd1_Q10_s32x4, rd2_Q10_s32x4;
             uint32x4_t t_u32x4;
 
-            if( Lambda_Q10 > 2048 ) {
+            if (Lambda_Q10 > 2048) {
                 /* For aggressive RDO, the bias becomes more than one pulse. */
                 const int rdo_offset = Lambda_Q10/2 - 512;
-                const uint16x4_t greaterThanRdo = vcgt_s16( q1_Q10_s16x4, vdup_n_s16( rdo_offset ) );
-                const uint16x4_t lessThanMinusRdo = vclt_s16( q1_Q10_s16x4, vdup_n_s16( -rdo_offset ) );
-                int16x4_t signed_offset = vbsl_s16( greaterThanRdo, vdup_n_s16( -rdo_offset ), vdup_n_s16( 0 ) );
+                const uint16x4_t greaterThanRdo = vcgt_s16( q1_Q10_s16x4, vdup_n_s16( rdo_offset ));
+                const uint16x4_t lessThanMinusRdo = vclt_s16( q1_Q10_s16x4, vdup_n_s16( -rdo_offset ));
+                int16x4_t signed_offset = vbsl_s16( greaterThanRdo, vdup_n_s16( -rdo_offset ), vdup_n_s16( 0 ));
                 signed_offset = vbsl_s16( lessThanMinusRdo, vdup_n_s16( rdo_offset ), signed_offset );
                 /* If Lambda_Q10 > 32767, then q1_Q0, q1_Q10 and q2_Q10 must change to 32-bit. */
                 silk_assert( Lambda_Q10 <= 32767 );
 
-                q1_Q0_s16x4 = vreinterpret_s16_u16( vclt_s16( q1_Q10_s16x4, vdup_n_s16( 0 ) ) );
-                q1_Q0_s16x4 = vbsl_s16(vorr_u16(greaterThanRdo, lessThanMinusRdo), vadd_s16( q1_Q10_s16x4 , signed_offset), q1_Q0_s16x4);
+                q1_Q0_s16x4 = vreinterpret_s16_u16( vclt_s16( q1_Q10_s16x4, vdup_n_s16( 0 )));
+                q1_Q0_s16x4 = vbsl_s16(vorr_u16(greaterThanRdo, lessThanMinusRdo),
+                vadd_s16( q1_Q10_s16x4, signed_offset), q1_Q0_s16x4);
                 q1_Q0_s16x4 = vshr_n_s16( q1_Q0_s16x4, 10 );
             }
             {
-                const uint16x4_t equal0_u16x4 = vceq_s16( q1_Q0_s16x4, vdup_n_s16( 0 ) );
-                const uint16x4_t equalMinus1_u16x4 = vceq_s16( q1_Q0_s16x4, vdup_n_s16( -1 ) );
-                const uint16x4_t lessThanMinus1_u16x4 = vclt_s16( q1_Q0_s16x4, vdup_n_s16( -1 ) );
+                const uint16x4_t equal0_u16x4 = vceq_s16( q1_Q0_s16x4, vdup_n_s16( 0 ));
+                const uint16x4_t equalMinus1_u16x4 = vceq_s16( q1_Q0_s16x4, vdup_n_s16( -1 ));
+                const uint16x4_t lessThanMinus1_u16x4 = vclt_s16( q1_Q0_s16x4, vdup_n_s16( -1 ));
                 int16x4_t tmp1_s16x4, tmp2_s16x4, tmp_summand_s16x4;
 
                 q1_Q10_s16x4 = vshl_n_s16( q1_Q0_s16x4, 10 );
-                tmp_summand_s16x4 = vand_s16( vreinterpret_s16_u16(vcge_s16(q1_Q0_s16x4, vdup_n_s16(0))), vdup_n_s16( offset_Q10 - QUANT_LEVEL_ADJUST_Q10 ) );
+                tmp_summand_s16x4 = vand_s16( vreinterpret_s16_u16(vcge_s16(q1_Q0_s16x4, vdup_n_s16(0))),
+                vdup_n_s16( offset_Q10 - QUANT_LEVEL_ADJUST_Q10 ));
                 tmp1_s16x4 = vadd_s16( q1_Q10_s16x4, tmp_summand_s16x4 );
-                tmp_summand_s16x4 = vbsl_s16( lessThanMinus1_u16x4, vdup_n_s16( offset_Q10 + QUANT_LEVEL_ADJUST_Q10 ), vdup_n_s16(0) );
+                tmp_summand_s16x4 = vbsl_s16( lessThanMinus1_u16x4, vdup_n_s16( offset_Q10 + QUANT_LEVEL_ADJUST_Q10 ),
+                vdup_n_s16(0));
                 q1_Q10_s16x4 = vadd_s16( q1_Q10_s16x4,  tmp_summand_s16x4);
                 q1_Q10_s16x4 = vbsl_s16( lessThanMinus1_u16x4, q1_Q10_s16x4, tmp1_s16x4 );
                 q1_Q10_s16x4 = vbsl_s16( equal0_u16x4, vdup_n_s16( offset_Q10 ), q1_Q10_s16x4 );
-                q1_Q10_s16x4 = vbsl_s16( equalMinus1_u16x4, vdup_n_s16( offset_Q10 - ( 1024 - QUANT_LEVEL_ADJUST_Q10 ) ), q1_Q10_s16x4 );
-                q2_Q10_s16x4 = vadd_s16( q1_Q10_s16x4, vdup_n_s16( 1024 ) );
-                q2_Q10_s16x4 = vbsl_s16( equal0_u16x4, vdup_n_s16( offset_Q10 + 1024 - QUANT_LEVEL_ADJUST_Q10 ), q2_Q10_s16x4 );
+                q1_Q10_s16x4 = vbsl_s16( equalMinus1_u16x4, vdup_n_s16( offset_Q10 - (1024 - QUANT_LEVEL_ADJUST_Q10)),
+                q1_Q10_s16x4 );
+                q2_Q10_s16x4 = vadd_s16( q1_Q10_s16x4, vdup_n_s16( 1024 ));
+                q2_Q10_s16x4 = vbsl_s16( equal0_u16x4, vdup_n_s16( offset_Q10 + 1024 - QUANT_LEVEL_ADJUST_Q10 ),
+                q2_Q10_s16x4 );
                 q2_Q10_s16x4 = vbsl_s16( equalMinus1_u16x4, vdup_n_s16( offset_Q10 ), q2_Q10_s16x4 );
                 tmp1_s16x4 = q1_Q10_s16x4;
                 tmp2_s16x4 = q2_Q10_s16x4;
-                tmp1_s16x4 = vbsl_s16( vorr_u16( equalMinus1_u16x4, lessThanMinus1_u16x4 ), vneg_s16( tmp1_s16x4 ), tmp1_s16x4 );
+                tmp1_s16x4 = vbsl_s16( vorr_u16( equalMinus1_u16x4, lessThanMinus1_u16x4 ), vneg_s16( tmp1_s16x4 ),
+                tmp1_s16x4 );
                 tmp2_s16x4 = vbsl_s16( lessThanMinus1_u16x4, vneg_s16( tmp2_s16x4 ), tmp2_s16x4 );
-                rd1_Q10_s32x4 = vmull_s16( tmp1_s16x4, vdup_n_s16( Lambda_Q10 ) );
-                rd2_Q10_s32x4 = vmull_s16( tmp2_s16x4, vdup_n_s16( Lambda_Q10 ) );
+                rd1_Q10_s32x4 = vmull_s16( tmp1_s16x4, vdup_n_s16( Lambda_Q10 ));
+                rd2_Q10_s32x4 = vmull_s16( tmp2_s16x4, vdup_n_s16( Lambda_Q10 ));
             }
 
             rr_Q10_s16x4 = vsub_s16( r_Q10_s16x4, q1_Q10_s16x4 );
@@ -757,13 +797,13 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_neon(
             rd2_Q10_s32x4 = vshrq_n_s32( rd2_Q10_s32x4, 10 );
 
             tmp2_s32x4 = vld1q_s32( psDelDec->RD_Q10 );
-            tmp1_s32x4 = vaddq_s32( tmp2_s32x4, vminq_s32( rd1_Q10_s32x4, rd2_Q10_s32x4 ) );
-            tmp2_s32x4 = vaddq_s32( tmp2_s32x4, vmaxq_s32( rd1_Q10_s32x4, rd2_Q10_s32x4 ) );
+            tmp1_s32x4 = vaddq_s32( tmp2_s32x4, vminq_s32( rd1_Q10_s32x4, rd2_Q10_s32x4 ));
+            tmp2_s32x4 = vaddq_s32( tmp2_s32x4, vmaxq_s32( rd1_Q10_s32x4, rd2_Q10_s32x4 ));
             vst1q_s32( psSampleState[ 0 ].RD_Q10, tmp1_s32x4 );
             vst1q_s32( psSampleState[ 1 ].RD_Q10, tmp2_s32x4 );
             t_u32x4 = vcltq_s32( rd1_Q10_s32x4, rd2_Q10_s32x4 );
-            tmp1_s32x4 = vbslq_s32( t_u32x4, vmovl_s16( q1_Q10_s16x4 ), vmovl_s16( q2_Q10_s16x4 ) );
-            tmp2_s32x4 = vbslq_s32( t_u32x4, vmovl_s16( q2_Q10_s16x4 ), vmovl_s16( q1_Q10_s16x4 ) );
+            tmp1_s32x4 = vbslq_s32( t_u32x4, vmovl_s16( q1_Q10_s16x4 ), vmovl_s16( q2_Q10_s16x4 ));
+            tmp2_s32x4 = vbslq_s32( t_u32x4, vmovl_s16( q2_Q10_s16x4 ), vmovl_s16( q1_Q10_s16x4 ));
             vst1q_s32( psSampleState[ 0 ].Q_Q10, tmp1_s32x4 );
             vst1q_s32( psSampleState[ 1 ].Q_Q10, tmp2_s32x4 );
         }
@@ -778,14 +818,14 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_neon(
             exc_Q14_s32x4 = vsubq_s32( exc_Q14_s32x4, sign_s32x4 );
 
             /* Add predictions */
-            LPC_exc_Q14_s32x4 = vaddq_s32( exc_Q14_s32x4, vdupq_n_s32( LTP_pred_Q14 ) );
+            LPC_exc_Q14_s32x4 = vaddq_s32( exc_Q14_s32x4, vdupq_n_s32( LTP_pred_Q14 ));
             xq_Q14_s32x4      = vaddq_s32( LPC_exc_Q14_s32x4, LPC_pred_Q14_s32x4 );
 
             /* Update states */
-            tmp1_s32x4 = vsubq_s32( xq_Q14_s32x4, vshlq_n_s32( vdupq_n_s32( x_Q10[ i ] ), 4 ) );
+            tmp1_s32x4 = vsubq_s32( xq_Q14_s32x4, vshlq_n_s32( vdupq_n_s32( x_Q10[ i ] ), 4 ));
             vst1q_s32( psSampleState[ 0 ].Diff_Q14, tmp1_s32x4 );
             sLF_AR_shp_Q14_s32x4 = vsubq_s32( tmp1_s32x4, n_AR_Q14_s32x4 );
-            vst1q_s32( psSampleState[ 0 ].sLTP_shp_Q14, vsubq_s32( sLF_AR_shp_Q14_s32x4, n_LF_Q14_s32x4 ) );
+            vst1q_s32( psSampleState[ 0 ].sLTP_shp_Q14, vsubq_s32( sLF_AR_shp_Q14_s32x4, n_LF_Q14_s32x4 ));
             vst1q_s32( psSampleState[ 0 ].LF_AR_Q14, sLF_AR_shp_Q14_s32x4 );
             vst1q_s32( psSampleState[ 0 ].LPC_exc_Q14, LPC_exc_Q14_s32x4 );
             vst1q_s32( psSampleState[ 0 ].xq_Q14, xq_Q14_s32x4 );
@@ -796,52 +836,53 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_neon(
             exc_Q14_s32x4 = vsubq_s32( exc_Q14_s32x4, sign_s32x4 );
 
             /* Add predictions */
-            LPC_exc_Q14_s32x4 = vaddq_s32( exc_Q14_s32x4, vdupq_n_s32( LTP_pred_Q14 ) );
+            LPC_exc_Q14_s32x4 = vaddq_s32( exc_Q14_s32x4, vdupq_n_s32( LTP_pred_Q14 ));
             xq_Q14_s32x4      = vaddq_s32( LPC_exc_Q14_s32x4, LPC_pred_Q14_s32x4 );
 
             /* Update states */
-            tmp1_s32x4 = vsubq_s32( xq_Q14_s32x4, vshlq_n_s32( vdupq_n_s32( x_Q10[ i ] ), 4 ) );
+            tmp1_s32x4 = vsubq_s32( xq_Q14_s32x4, vshlq_n_s32( vdupq_n_s32( x_Q10[ i ] ), 4 ));
             vst1q_s32( psSampleState[ 1 ].Diff_Q14, tmp1_s32x4 );
             sLF_AR_shp_Q14_s32x4 = vsubq_s32( tmp1_s32x4, n_AR_Q14_s32x4 );
-            vst1q_s32( psSampleState[ 1 ].sLTP_shp_Q14, vsubq_s32( sLF_AR_shp_Q14_s32x4, n_LF_Q14_s32x4 ) );
+            vst1q_s32( psSampleState[ 1 ].sLTP_shp_Q14, vsubq_s32( sLF_AR_shp_Q14_s32x4, n_LF_Q14_s32x4 ));
             vst1q_s32( psSampleState[ 1 ].LF_AR_Q14, sLF_AR_shp_Q14_s32x4 );
             vst1q_s32( psSampleState[ 1 ].LPC_exc_Q14, LPC_exc_Q14_s32x4 );
             vst1q_s32( psSampleState[ 1 ].xq_Q14, xq_Q14_s32x4 );
         }
 
-        *smpl_buf_idx = *smpl_buf_idx ? ( *smpl_buf_idx - 1 ) : ( DECISION_DELAY - 1);
+        *smpl_buf_idx = *smpl_buf_idx ? (*smpl_buf_idx - 1) : (DECISION_DELAY - 1);
         last_smple_idx = *smpl_buf_idx + decisionDelay + DECISION_DELAY;
-        if( last_smple_idx >= DECISION_DELAY ) last_smple_idx -= DECISION_DELAY;
-        if( last_smple_idx >= DECISION_DELAY ) last_smple_idx -= DECISION_DELAY;
+        if (last_smple_idx >= DECISION_DELAY)  last_smple_idx -= DECISION_DELAY;
+        if (last_smple_idx >= DECISION_DELAY)  last_smple_idx -= DECISION_DELAY;
 
         /* Find winner */
         RDmin_Q10 = psSampleState[ 0 ].RD_Q10[ 0 ];
         Winner_ind = 0;
-        for( k = 1; k < nStatesDelayedDecision; k++ ) {
-            if( psSampleState[ 0 ].RD_Q10[ k ] < RDmin_Q10 ) {
+        for (k = 1; k < nStatesDelayedDecision; k++) {
+            if (psSampleState[ 0 ].RD_Q10[ k ] < RDmin_Q10) {
                 RDmin_Q10 = psSampleState[ 0 ].RD_Q10[ k ];
                 Winner_ind = k;
             }
         }
 
         /* clear unused part of RD_Q10 to avoid overflows */
-        if( nStatesDelayedDecision < NEON_MAX_DEL_DEC_STATES )
-        {
-            OAC_CLEAR(psSampleState[0].RD_Q10 + nStatesDelayedDecision, NEON_MAX_DEL_DEC_STATES - nStatesDelayedDecision);
-            OAC_CLEAR(psSampleState[1].RD_Q10 + nStatesDelayedDecision, NEON_MAX_DEL_DEC_STATES - nStatesDelayedDecision);
+        if (nStatesDelayedDecision < NEON_MAX_DEL_DEC_STATES) {
+            OAC_CLEAR(psSampleState[0].RD_Q10 + nStatesDelayedDecision,
+            NEON_MAX_DEL_DEC_STATES - nStatesDelayedDecision);
+            OAC_CLEAR(psSampleState[1].RD_Q10 + nStatesDelayedDecision,
+            NEON_MAX_DEL_DEC_STATES - nStatesDelayedDecision);
         }
 
         /* Increase RD values of expired states */
         {
             uint32x4_t t_u32x4;
             Winner_rand_state = psDelDec->RandState[ last_smple_idx ][ Winner_ind ];
-            t_u32x4 = vceqq_s32( vld1q_s32( psDelDec->RandState[ last_smple_idx ] ), vdupq_n_s32( Winner_rand_state ) );
+            t_u32x4 = vceqq_s32( vld1q_s32( psDelDec->RandState[ last_smple_idx ] ), vdupq_n_s32( Winner_rand_state ));
             t_u32x4 = vmvnq_u32( t_u32x4 );
             t_u32x4 = vshrq_n_u32( t_u32x4, 5 );
             tmp1_s32x4 = vld1q_s32( psSampleState[ 0 ].RD_Q10 );
             tmp2_s32x4 = vld1q_s32( psSampleState[ 1 ].RD_Q10 );
-            tmp1_s32x4 = vaddq_s32( tmp1_s32x4, vreinterpretq_s32_u32( t_u32x4 ) );
-            tmp2_s32x4 = vaddq_s32( tmp2_s32x4, vreinterpretq_s32_u32( t_u32x4 ) );
+            tmp1_s32x4 = vaddq_s32( tmp1_s32x4, vreinterpretq_s32_u32( t_u32x4 ));
+            tmp2_s32x4 = vaddq_s32( tmp2_s32x4, vreinterpretq_s32_u32( t_u32x4 ));
             vst1q_s32( psSampleState[ 0 ].RD_Q10, tmp1_s32x4 );
             vst1q_s32( psSampleState[ 1 ].RD_Q10, tmp2_s32x4 );
 
@@ -850,14 +891,14 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_neon(
             RDmin_Q10 = psSampleState[ 1 ].RD_Q10[ 0 ];
             RDmax_ind = 0;
             RDmin_ind = 0;
-            for( k = 1; k < nStatesDelayedDecision; k++ ) {
+            for (k = 1; k < nStatesDelayedDecision; k++) {
                 /* find worst in first set */
-                if( psSampleState[ 0 ].RD_Q10[ k ] > RDmax_Q10 ) {
+                if (psSampleState[ 0 ].RD_Q10[ k ] > RDmax_Q10) {
                     RDmax_Q10 = psSampleState[ 0 ].RD_Q10[ k ];
                     RDmax_ind = k;
                 }
                 /* find best in second set */
-                if( psSampleState[ 1 ].RD_Q10[ k ] < RDmin_Q10 ) {
+                if (psSampleState[ 1 ].RD_Q10[ k ] < RDmin_Q10) {
                     RDmin_Q10 = psSampleState[ 1 ].RD_Q10[ k ];
                     RDmin_ind = k;
                 }
@@ -865,17 +906,17 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_neon(
         }
 
         /* Replace a state if best from second set outperforms worst in first set */
-        if( RDmin_Q10 < RDmax_Q10 ) {
+        if (RDmin_Q10 < RDmax_Q10) {
             oac_int32 (*ptr)[NEON_MAX_DEL_DEC_STATES] = psDelDec->RandState;
-            const int numOthers = (int)( ( sizeof( NSQ_del_decs_struct ) - sizeof( ( (NSQ_del_decs_struct *)0 )->sLPC_Q14 ) )
-                / ( NEON_MAX_DEL_DEC_STATES * sizeof( oac_int32 ) ) );
+            const int numOthers = (int)((sizeof(NSQ_del_decs_struct) - sizeof(((NSQ_del_decs_struct *)0)->sLPC_Q14))
+                                        /(NEON_MAX_DEL_DEC_STATES*sizeof(oac_int32)));
             /* Only ( predictLPCOrder - 1 ) of sLPC_Q14 buffer need to be updated, though the first several     */
             /* useless sLPC_Q14[] will be different comparing with C when predictLPCOrder < NSQ_LPC_BUF_LENGTH. */
             /* Here just update constant ( NSQ_LPC_BUF_LENGTH - 1 ) for simplicity.                             */
-            for( j = i + 1; j < i + NSQ_LPC_BUF_LENGTH; j++ ) {
+            for (j = i + 1; j < i + NSQ_LPC_BUF_LENGTH; j++) {
                 psDelDec->sLPC_Q14[ j ][ RDmax_ind ] = psDelDec->sLPC_Q14[ j ][ RDmin_ind ];
             }
-            for( j = 0; j < numOthers; j++ ) {
+            for (j = 0; j < numOthers; j++) {
                 ptr[ j ][ RDmax_ind ] = ptr[ j ][ RDmin_ind ];
             }
 
@@ -889,45 +930,48 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_neon(
         }
 
         /* Write samples from winner to output and long-term filter states */
-        if( subfr > 0 || i >= decisionDelay ) {
-            pulses[  i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDelDec->Q_Q10[ last_smple_idx ][ Winner_ind ], 10 );
+        if (subfr > 0 || i >= decisionDelay) {
+            pulses[  i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDelDec->Q_Q10[ last_smple_idx ][ Winner_ind ],
+            10 );
             xq[ i - decisionDelay ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND(
-                silk_SMULWW( psDelDec->Xq_Q14[ last_smple_idx ][ Winner_ind ], delayedGain_Q10[ last_smple_idx ] ), 8 ) );
-            NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay ] = psDelDec->Shape_Q14[ last_smple_idx ][ Winner_ind ];
-            sLTP_Q15[          NSQ->sLTP_buf_idx     - decisionDelay ] = psDelDec->Pred_Q15[  last_smple_idx ][ Winner_ind ];
+                silk_SMULWW( psDelDec->Xq_Q14[ last_smple_idx ][ Winner_ind ], delayedGain_Q10[ last_smple_idx ] ),
+            8 ));
+            NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx
+                               - decisionDelay ] = psDelDec->Shape_Q14[ last_smple_idx ][ Winner_ind ];
+            sLTP_Q15[          NSQ->sLTP_buf_idx
+                               - decisionDelay ] = psDelDec->Pred_Q15[  last_smple_idx ][ Winner_ind ];
         }
         NSQ->sLTP_shp_buf_idx++;
         NSQ->sLTP_buf_idx++;
 
         /* Update states */
-        vst1q_s32( psDelDec->LF_AR_Q14, vld1q_s32( psSampleState[ 0 ].LF_AR_Q14 ) );
-        vst1q_s32( psDelDec->Diff_Q14, vld1q_s32( psSampleState[ 0 ].Diff_Q14 ) );
-        vst1q_s32( psDelDec->sLPC_Q14[ NSQ_LPC_BUF_LENGTH + i ], vld1q_s32( psSampleState[ 0 ].xq_Q14 ) );
-        vst1q_s32( psDelDec->Xq_Q14[ *smpl_buf_idx ], vld1q_s32( psSampleState[ 0 ].xq_Q14 ) );
+        vst1q_s32( psDelDec->LF_AR_Q14, vld1q_s32( psSampleState[ 0 ].LF_AR_Q14 ));
+        vst1q_s32( psDelDec->Diff_Q14, vld1q_s32( psSampleState[ 0 ].Diff_Q14 ));
+        vst1q_s32( psDelDec->sLPC_Q14[ NSQ_LPC_BUF_LENGTH + i ], vld1q_s32( psSampleState[ 0 ].xq_Q14 ));
+        vst1q_s32( psDelDec->Xq_Q14[ *smpl_buf_idx ], vld1q_s32( psSampleState[ 0 ].xq_Q14 ));
         tmp1_s32x4 = vld1q_s32( psSampleState[ 0 ].Q_Q10 );
         vst1q_s32( psDelDec->Q_Q10[ *smpl_buf_idx ], tmp1_s32x4 );
-        vst1q_s32( psDelDec->Pred_Q15[ *smpl_buf_idx ], vshlq_n_s32( vld1q_s32( psSampleState[ 0 ].LPC_exc_Q14 ), 1 ) );
-        vst1q_s32( psDelDec->Shape_Q14[ *smpl_buf_idx ], vld1q_s32( psSampleState[ 0 ].sLTP_shp_Q14 ) );
+        vst1q_s32( psDelDec->Pred_Q15[ *smpl_buf_idx ], vshlq_n_s32( vld1q_s32( psSampleState[ 0 ].LPC_exc_Q14 ), 1 ));
+        vst1q_s32( psDelDec->Shape_Q14[ *smpl_buf_idx ], vld1q_s32( psSampleState[ 0 ].sLTP_shp_Q14 ));
         tmp1_s32x4 = vrshrq_n_s32( tmp1_s32x4, 10 );
         tmp1_s32x4 = vreinterpretq_s32_u32( vaddq_u32( vreinterpretq_u32_s32(
-            vld1q_s32( psDelDec->Seed ) ), vreinterpretq_u32_s32( tmp1_s32x4 ) ) );
+            vld1q_s32( psDelDec->Seed )), vreinterpretq_u32_s32( tmp1_s32x4 )));
         vst1q_s32( psDelDec->Seed, tmp1_s32x4 );
         vst1q_s32( psDelDec->RandState[ *smpl_buf_idx ], tmp1_s32x4 );
-        vst1q_s32( psDelDec->RD_Q10, vld1q_s32( psSampleState[ 0 ].RD_Q10 ) );
+        vst1q_s32( psDelDec->RD_Q10, vld1q_s32( psSampleState[ 0 ].RD_Q10 ));
         delayedGain_Q10[ *smpl_buf_idx ] = Gain_Q10;
     }
     /* Update LPC states */
-    silk_memcpy( psDelDec->sLPC_Q14[ 0 ], psDelDec->sLPC_Q14[ length ], NEON_MAX_DEL_DEC_STATES * NSQ_LPC_BUF_LENGTH * sizeof( oac_int32 ) );
+    silk_memcpy( psDelDec->sLPC_Q14[ 0 ], psDelDec->sLPC_Q14[ length ],
+    NEON_MAX_DEL_DEC_STATES*NSQ_LPC_BUF_LENGTH*sizeof(oac_int32));
 
     RESTORE_STACK;
 }
 
 static OAC_INLINE void silk_SMULWB_8_neon(
     const oac_int16 *a,
-    const int32x2_t  b,
-    oac_int32       *o
-)
-{
+    const int32x2_t b,
+    oac_int32       *o) {
     const int16x8_t a_s16x8 = vld1q_s16( a );
     int32x4_t o0_s32x4, o1_s32x4;
 
@@ -942,8 +986,7 @@ static OAC_INLINE void silk_SMULWB_8_neon(
 /* Only works when ( b >= -65536 ) && ( b < 65536 ). */
 static OAC_INLINE void silk_SMULWW_small_b_4_neon(
     oac_int32       *a,
-    const int32x2_t  b_s32x2)
-{
+    const int32x2_t b_s32x2) {
     int32x4_t o_s32x4;
 
     o_s32x4 = vld1q_s32( a );
@@ -954,9 +997,7 @@ static OAC_INLINE void silk_SMULWW_small_b_4_neon(
 /* Only works when ( b >= -65536 ) && ( b < 65536 ). */
 static OAC_INLINE void silk_SMULWW_small_b_8_neon(
     oac_int32       *a,
-    const int32x2_t  b_s32x2
-)
-{
+    const int32x2_t b_s32x2) {
     int32x4_t o0_s32x4, o1_s32x4;
 
     o0_s32x4 = vld1q_s32( a );
@@ -969,8 +1010,7 @@ static OAC_INLINE void silk_SMULWW_small_b_8_neon(
 
 static OAC_INLINE void silk_SMULWW_4_neon(
     oac_int32       *a,
-    const int32x2_t  b_s32x2)
-{
+    const int32x2_t b_s32x2) {
     int32x4_t a_s32x4, o_s32x4;
 
     a_s32x4 = vld1q_s32( a );
@@ -981,9 +1021,7 @@ static OAC_INLINE void silk_SMULWW_4_neon(
 
 static OAC_INLINE void silk_SMULWW_8_neon(
     oac_int32       *a,
-    const int32x2_t  b_s32x2
-)
-{
+    const int32x2_t b_s32x2) {
     int32x4_t a0_s32x4, a1_s32x4, o0_s32x4, o1_s32x4;
 
     a0_s32x4 = vld1q_s32( a );
@@ -1000,17 +1038,15 @@ static OAC_INLINE void silk_SMULWW_loop_neon(
     const oac_int16 *a,
     const oac_int32 b,
     oac_int32       *o,
-    const oac_int   loop_num
-)
-{
+    const oac_int loop_num) {
     oac_int i;
     int32x2_t b_s32x2;
 
     b_s32x2 = vdup_n_s32( b );
-    for( i = 0; i < loop_num - 7; i += 8 ) {
+    for (i = 0; i < loop_num - 7; i += 8) {
         silk_SMULWB_8_neon( a + i, b_s32x2, o + i );
     }
-    for( ; i < loop_num; i++ ) {
+    for ( ; i < loop_num; i++) {
         o[ i ] = silk_SMULWW( a[ i ], b );
     }
 }
@@ -1019,20 +1055,19 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states_neon(
     const silk_encoder_state *psEncC,               /* I    Encoder State                       */
     silk_nsq_state      *NSQ,                       /* I/O  NSQ state                           */
     NSQ_del_decs_struct psDelDec[],                 /* I/O  Delayed decision states             */
-    const oac_int16    x16[],                      /* I    Input                               */
-    oac_int32          x_sc_Q10[],                 /* O    Input scaled with 1/Gain in Q10     */
-    const oac_int16    sLTP[],                     /* I    Re-whitened LTP state in Q0         */
-    oac_int32          sLTP_Q15[],                 /* O    LTP state matching scaled input     */
-    oac_int            subfr,                      /* I    Subframe number                     */
-    const oac_int      LTP_scale_Q14,              /* I    LTP state scaling                   */
-    const oac_int32    Gains_Q16[ MAX_NB_SUBFR ],  /* I                                        */
-    const oac_int      pitchL[ MAX_NB_SUBFR ],     /* I    Pitch lag                           */
-    const oac_int      signal_type,                /* I    Signal type                         */
-    const oac_int      decisionDelay               /* I    Decision delay                      */
-)
-{
-    oac_int            i, lag;
-    oac_int32          gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
+    const oac_int16 x16[],                         /* I    Input                               */
+    oac_int32 x_sc_Q10[],                          /* O    Input scaled with 1/Gain in Q10     */
+    const oac_int16 sLTP[],                        /* I    Re-whitened LTP state in Q0         */
+    oac_int32 sLTP_Q15[],                          /* O    LTP state matching scaled input     */
+    oac_int subfr,                                 /* I    Subframe number                     */
+    const oac_int LTP_scale_Q14,                   /* I    LTP state scaling                   */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],     /* I                                        */
+    const oac_int pitchL[ MAX_NB_SUBFR ],          /* I    Pitch lag                           */
+    const oac_int signal_type,                     /* I    Signal type                         */
+    const oac_int decisionDelay                    /* I    Decision delay                      */
+    ) {
+    oac_int i, lag;
+    oac_int32 gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
 
     lag          = pitchL[ subfr ];
     inv_gain_Q31 = silk_INVERSE32_varQ( silk_max( Gains_Q16[ subfr ], 1 ), 47 );
@@ -1043,35 +1078,36 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states_neon(
     silk_SMULWW_loop_neon( x16, inv_gain_Q26, x_sc_Q10, psEncC->subfr_length );
 
     /* After rewhitening the LTP state is un-scaled, so scale with inv_gain_Q16 */
-    if( NSQ->rewhite_flag ) {
-        if( subfr == 0 ) {
+    if (NSQ->rewhite_flag) {
+        if (subfr == 0) {
             /* Do LTP downscaling */
             inv_gain_Q31 = silk_LSHIFT( silk_SMULWB( inv_gain_Q31, LTP_scale_Q14 ), 2 );
         }
-        silk_SMULWW_loop_neon( sLTP + NSQ->sLTP_buf_idx - lag - LTP_ORDER / 2, inv_gain_Q31, sLTP_Q15 + NSQ->sLTP_buf_idx - lag - LTP_ORDER / 2, lag + LTP_ORDER / 2 );
+        silk_SMULWW_loop_neon( sLTP + NSQ->sLTP_buf_idx - lag - LTP_ORDER/2, inv_gain_Q31,
+        sLTP_Q15 + NSQ->sLTP_buf_idx - lag - LTP_ORDER/2, lag + LTP_ORDER/2 );
     }
 
     /* Adjust for changing gain */
-    if( Gains_Q16[ subfr ] != NSQ->prev_gain_Q16 ) {
+    if (Gains_Q16[ subfr ] != NSQ->prev_gain_Q16) {
         int32x2_t gain_adj_Q16_s32x2;
         gain_adj_Q16 = silk_DIV32_varQ( NSQ->prev_gain_Q16, Gains_Q16[ subfr ], 16 );
 
         /* Scale long-term shaping state */
-        if( ( gain_adj_Q16 >= -65536 ) && ( gain_adj_Q16 < 65536 ) ) {
-            gain_adj_Q16_s32x2 = vdup_n_s32( silk_LSHIFT32( gain_adj_Q16, 15 ) );
-            for( i = NSQ->sLTP_shp_buf_idx - psEncC->ltp_mem_length; i < NSQ->sLTP_shp_buf_idx - 7; i += 8 ) {
+        if ((gain_adj_Q16 >= -65536) && (gain_adj_Q16 < 65536)) {
+            gain_adj_Q16_s32x2 = vdup_n_s32( silk_LSHIFT32( gain_adj_Q16, 15 ));
+            for (i = NSQ->sLTP_shp_buf_idx - psEncC->ltp_mem_length; i < NSQ->sLTP_shp_buf_idx - 7; i += 8) {
                 silk_SMULWW_small_b_8_neon( NSQ->sLTP_shp_Q14 + i, gain_adj_Q16_s32x2 );
             }
-            for( ; i < NSQ->sLTP_shp_buf_idx; i++ ) {
+            for ( ; i < NSQ->sLTP_shp_buf_idx; i++) {
                 NSQ->sLTP_shp_Q14[ i ] = silk_SMULWW( gain_adj_Q16, NSQ->sLTP_shp_Q14[ i ] );
             }
 
             /* Scale long-term prediction state */
-            if( signal_type == TYPE_VOICED && NSQ->rewhite_flag == 0 ) {
-                for( i = NSQ->sLTP_buf_idx - lag - LTP_ORDER / 2; i < NSQ->sLTP_buf_idx - decisionDelay - 7; i += 8 ) {
+            if (signal_type == TYPE_VOICED && NSQ->rewhite_flag == 0) {
+                for (i = NSQ->sLTP_buf_idx - lag - LTP_ORDER/2; i < NSQ->sLTP_buf_idx - decisionDelay - 7; i += 8) {
                     silk_SMULWW_small_b_8_neon( sLTP_Q15 + i, gain_adj_Q16_s32x2 );
                 }
-                for( ; i < NSQ->sLTP_buf_idx - decisionDelay; i++ ) {
+                for ( ; i < NSQ->sLTP_buf_idx - decisionDelay; i++) {
                     sLTP_Q15[ i ] = silk_SMULWW( gain_adj_Q16, sLTP_Q15[ i ] );
                 }
             }
@@ -1081,34 +1117,34 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states_neon(
             silk_SMULWW_small_b_4_neon( psDelDec->Diff_Q14,  gain_adj_Q16_s32x2 );
 
             /* Scale short-term prediction and shaping states */
-            for( i = 0; i < NSQ_LPC_BUF_LENGTH; i++ ) {
+            for (i = 0; i < NSQ_LPC_BUF_LENGTH; i++) {
                 silk_SMULWW_small_b_4_neon( psDelDec->sLPC_Q14[ i ], gain_adj_Q16_s32x2 );
             }
 
-            for( i = 0; i < MAX_SHAPE_LPC_ORDER; i++ ) {
+            for (i = 0; i < MAX_SHAPE_LPC_ORDER; i++) {
                 silk_SMULWW_small_b_4_neon( psDelDec->sAR2_Q14[ i ], gain_adj_Q16_s32x2 );
             }
 
-            for( i = 0; i < DECISION_DELAY; i++ ) {
+            for (i = 0; i < DECISION_DELAY; i++) {
                 silk_SMULWW_small_b_4_neon( psDelDec->Pred_Q15[  i ], gain_adj_Q16_s32x2 );
                 silk_SMULWW_small_b_4_neon( psDelDec->Shape_Q14[ i ], gain_adj_Q16_s32x2 );
             }
         } else {
-            gain_adj_Q16_s32x2 = vdup_n_s32( silk_LSHIFT32( gain_adj_Q16 & 0x0000FFFF, 15 ) );
-            gain_adj_Q16_s32x2 = vset_lane_s32( gain_adj_Q16 >> 16, gain_adj_Q16_s32x2, 1 );
-            for( i = NSQ->sLTP_shp_buf_idx - psEncC->ltp_mem_length; i < NSQ->sLTP_shp_buf_idx - 7; i += 8 ) {
+            gain_adj_Q16_s32x2 = vdup_n_s32( silk_LSHIFT32( gain_adj_Q16&0x0000FFFF, 15 ));
+            gain_adj_Q16_s32x2 = vset_lane_s32( gain_adj_Q16>>16, gain_adj_Q16_s32x2, 1 );
+            for (i = NSQ->sLTP_shp_buf_idx - psEncC->ltp_mem_length; i < NSQ->sLTP_shp_buf_idx - 7; i += 8) {
                 silk_SMULWW_8_neon( NSQ->sLTP_shp_Q14 + i, gain_adj_Q16_s32x2 );
             }
-            for( ; i < NSQ->sLTP_shp_buf_idx; i++ ) {
+            for ( ; i < NSQ->sLTP_shp_buf_idx; i++) {
                 NSQ->sLTP_shp_Q14[ i ] = silk_SMULWW( gain_adj_Q16, NSQ->sLTP_shp_Q14[ i ] );
             }
 
             /* Scale long-term prediction state */
-            if( signal_type == TYPE_VOICED && NSQ->rewhite_flag == 0 ) {
-                for( i = NSQ->sLTP_buf_idx - lag - LTP_ORDER / 2; i < NSQ->sLTP_buf_idx - decisionDelay - 7; i += 8 ) {
+            if (signal_type == TYPE_VOICED && NSQ->rewhite_flag == 0) {
+                for (i = NSQ->sLTP_buf_idx - lag - LTP_ORDER/2; i < NSQ->sLTP_buf_idx - decisionDelay - 7; i += 8) {
                     silk_SMULWW_8_neon( sLTP_Q15 + i, gain_adj_Q16_s32x2 );
                 }
-                for( ; i < NSQ->sLTP_buf_idx - decisionDelay; i++ ) {
+                for ( ; i < NSQ->sLTP_buf_idx - decisionDelay; i++) {
                     sLTP_Q15[ i ] = silk_SMULWW( gain_adj_Q16, sLTP_Q15[ i ] );
                 }
             }
@@ -1118,15 +1154,15 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states_neon(
             silk_SMULWW_4_neon( psDelDec->Diff_Q14,  gain_adj_Q16_s32x2 );
 
             /* Scale short-term prediction and shaping states */
-            for( i = 0; i < NSQ_LPC_BUF_LENGTH; i++ ) {
+            for (i = 0; i < NSQ_LPC_BUF_LENGTH; i++) {
                 silk_SMULWW_4_neon( psDelDec->sLPC_Q14[ i ], gain_adj_Q16_s32x2 );
             }
 
-            for( i = 0; i < MAX_SHAPE_LPC_ORDER; i++ ) {
+            for (i = 0; i < MAX_SHAPE_LPC_ORDER; i++) {
                 silk_SMULWW_4_neon( psDelDec->sAR2_Q14[ i ], gain_adj_Q16_s32x2 );
             }
 
-            for( i = 0; i < DECISION_DELAY; i++ ) {
+            for (i = 0; i < DECISION_DELAY; i++) {
                 silk_SMULWW_4_neon( psDelDec->Pred_Q15[  i ], gain_adj_Q16_s32x2 );
                 silk_SMULWW_4_neon( psDelDec->Shape_Q14[ i ], gain_adj_Q16_s32x2 );
             }
diff --git a/silk/arm/NSQ_neon.c b/silk/arm/NSQ_neon.c
index b1d2a8336..66ab82f13 100644
--- a/silk/arm/NSQ_neon.c
+++ b/silk/arm/NSQ_neon.c
@@ -1,31 +1,31 @@
 /***********************************************************************
-Copyright (C) 2014 Vidyo
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (C) 2014 Vidyo
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <arm_neon.h>
@@ -35,8 +35,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "celt/cpu_support.h"
 #include "celt/arm/armcpu.h"
 
-oac_int32 silk_noise_shape_quantizer_short_prediction_neon(const oac_int32 *buf32, const oac_int32 *coef32, oac_int order)
-{
+oac_int32 silk_noise_shape_quantizer_short_prediction_neon(const oac_int32 *buf32, const oac_int32 *coef32,
+                                                           oac_int order) {
     int32x4_t coef0 = vld1q_s32(coef32);
     int32x4_t coef1 = vld1q_s32(coef32 + 4);
     int32x4_t coef2 = vld1q_s32(coef32 + 8);
@@ -69,11 +69,10 @@ oac_int32 silk_noise_shape_quantizer_short_prediction_neon(const oac_int32 *buf3
 }
 
 
-oac_int32 silk_NSQ_noise_shape_feedback_loop_neon(const oac_int32 *data0, oac_int32 *data1, const oac_int16 *coef, oac_int order)
-{
+oac_int32 silk_NSQ_noise_shape_feedback_loop_neon(const oac_int32 *data0, oac_int32 *data1, const oac_int16 *coef,
+                                                  oac_int order) {
     oac_int32 out;
-    if (order == 8)
-    {
+    if (order == 8) {
         int32x4_t a00 = vdupq_n_s32(data0[0]);
         int32x4_t a01 = vld1q_s32(data1);  /* data1[0] ... [3] */
 
@@ -81,19 +80,19 @@ oac_int32 silk_NSQ_noise_shape_feedback_loop_neon(const oac_int32 *data0, oac_in
         int32x4_t a1 = vld1q_s32(data1 + 3);  /* data1[3] ... [6] */
 
         /*TODO: Convert these once in advance instead of once per sample, like
-          silk_noise_shape_quantizer_short_prediction_neon() does.*/
+           silk_noise_shape_quantizer_short_prediction_neon() does.*/
         int16x8_t coef16 = vld1q_s16(coef);
         int32x4_t coef0 = vmovl_s16(vget_low_s16(coef16));
         int32x4_t coef1 = vmovl_s16(vget_high_s16(coef16));
 
         /*This is not bit-exact with the C version, since we do not drop the
-          lower 16 bits of each multiply, but wait until the end to truncate
-          precision. This is an encoder-specific calculation (and unlike
-          silk_noise_shape_quantizer_short_prediction_neon(), is not meant to
-          simulate what the decoder will do). We still could use vqdmulhq_s32()
-          like silk_noise_shape_quantizer_short_prediction_neon() and save
-          half the multiplies, but the speed difference is not large, since we
-          then need two extra adds.*/
+           lower 16 bits of each multiply, but wait until the end to truncate
+           precision. This is an encoder-specific calculation (and unlike
+           silk_noise_shape_quantizer_short_prediction_neon(), is not meant to
+           simulate what the decoder will do). We still could use vqdmulhq_s32()
+           like silk_noise_shape_quantizer_short_prediction_neon() and save
+           half the multiplies, but the speed difference is not large, since we
+           then need two extra adds.*/
         int64x2_t b0 = vmull_s32(vget_low_s32(a0), vget_low_s32(coef0));
         int64x2_t b1 = vmlal_s32(b0, vget_high_s32(a0), vget_high_s32(coef0));
         int64x2_t b2 = vmlal_s32(b1, vget_low_s32(a1), vget_low_s32(coef1));
diff --git a/silk/arm/NSQ_neon.h b/silk/arm/NSQ_neon.h
index e586e00d1..aafedf06b 100644
--- a/silk/arm/NSQ_neon.h
+++ b/silk/arm/NSQ_neon.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (C) 2014 Vidyo
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (C) 2014 Vidyo
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 #ifndef SILK_NSQ_NEON_H
 #define SILK_NSQ_NEON_H
@@ -32,8 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #undef silk_short_prediction_create_arch_coef
 /* For vectorized calc, reverse a_Q12 coefs, convert to 32-bit, and shift for vqdmulhq_s32. */
-static OAC_INLINE void silk_short_prediction_create_arch_coef_neon(oac_int32 *out, const oac_int16 *in, oac_int order)
-{
+static OAC_INLINE void silk_short_prediction_create_arch_coef_neon(oac_int32 *out, const oac_int16 *in, oac_int order) {
     out[15] = silk_LSHIFT32(in[0], 15);
     out[14] = silk_LSHIFT32(in[1], 15);
     out[13] = silk_LSHIFT32(in[2], 15);
@@ -45,17 +44,14 @@ static OAC_INLINE void silk_short_prediction_create_arch_coef_neon(oac_int32 *ou
     out[7]  = silk_LSHIFT32(in[8], 15);
     out[6]  = silk_LSHIFT32(in[9], 15);
 
-    if (order == 16)
-    {
+    if (order == 16) {
         out[5] = silk_LSHIFT32(in[10], 15);
         out[4] = silk_LSHIFT32(in[11], 15);
         out[3] = silk_LSHIFT32(in[12], 15);
         out[2] = silk_LSHIFT32(in[13], 15);
         out[1] = silk_LSHIFT32(in[14], 15);
         out[0] = silk_LSHIFT32(in[15], 15);
-    }
-    else
-    {
+    } else {
         out[5] = 0;
         out[4] = 0;
         out[3] = 0;
@@ -67,47 +63,51 @@ static OAC_INLINE void silk_short_prediction_create_arch_coef_neon(oac_int32 *ou
 
 #if defined(OAC_ARM_PRESUME_NEON_INTR)
 
-#define silk_short_prediction_create_arch_coef(out, in, order) \
-    (silk_short_prediction_create_arch_coef_neon(out, in, order))
+# define silk_short_prediction_create_arch_coef(out, in, order) \
+        (silk_short_prediction_create_arch_coef_neon(out, in, order))
 
 #elif defined(OAC_HAVE_RTCD) && defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 
-#define silk_short_prediction_create_arch_coef(out, in, order) \
-    do { if (arch >= OAC_ARCH_ARM_NEON) { silk_short_prediction_create_arch_coef_neon(out, in, order); } } while (0)
+# define silk_short_prediction_create_arch_coef(out, in, order) \
+        do { if (arch >= OAC_ARCH_ARM_NEON) { silk_short_prediction_create_arch_coef_neon(out, in, order); } } while (0)
 
 #endif
 
-oac_int32 silk_noise_shape_quantizer_short_prediction_neon(const oac_int32 *buf32, const oac_int32 *coef32, oac_int order);
+oac_int32 silk_noise_shape_quantizer_short_prediction_neon(const oac_int32 *buf32, const oac_int32 *coef32,
+    oac_int order);
 
-oac_int32 silk_NSQ_noise_shape_feedback_loop_neon(const oac_int32 *data0, oac_int32 *data1, const oac_int16 *coef, oac_int order);
+oac_int32 silk_NSQ_noise_shape_feedback_loop_neon(const oac_int32 *data0, oac_int32 *data1, const oac_int16 *coef,
+    oac_int order);
 
 #if defined(OAC_ARM_PRESUME_NEON_INTR)
-#undef silk_noise_shape_quantizer_short_prediction
-#define silk_noise_shape_quantizer_short_prediction(in, coef, coefRev, order, arch) \
-    ((void)arch,silk_noise_shape_quantizer_short_prediction_neon(in, coefRev, order))
+# undef silk_noise_shape_quantizer_short_prediction
+# define silk_noise_shape_quantizer_short_prediction(in, coef, coefRev, order, arch) \
+        ((void)arch, silk_noise_shape_quantizer_short_prediction_neon(in, coefRev, order))
 
-#undef silk_NSQ_noise_shape_feedback_loop
-#define silk_NSQ_noise_shape_feedback_loop(data0, data1, coef, order, arch)  ((void)arch,silk_NSQ_noise_shape_feedback_loop_neon(data0, data1, coef, order))
+# undef silk_NSQ_noise_shape_feedback_loop
+# define silk_NSQ_noise_shape_feedback_loop(data0, data1, coef, order, arch)  ((void)arch, \
+                                                                               silk_NSQ_noise_shape_feedback_loop_neon( \
+    data0, data1, coef, order))
 
 #elif defined(OAC_HAVE_RTCD) && defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 
 /* silk_noise_shape_quantizer_short_prediction implementations take different parameters based on arch
    (coef vs. coefRev) so can't use the usual IMPL table implementation */
-#undef silk_noise_shape_quantizer_short_prediction
-#define silk_noise_shape_quantizer_short_prediction(in, coef, coefRev, order, arch)  \
-    (arch >= OAC_ARCH_ARM_NEON ? \
-        silk_noise_shape_quantizer_short_prediction_neon(in, coefRev, order) : \
-        silk_noise_shape_quantizer_short_prediction_c(in, coef, order))
+# undef silk_noise_shape_quantizer_short_prediction
+# define silk_noise_shape_quantizer_short_prediction(in, coef, coefRev, order, arch)  \
+        (arch >= OAC_ARCH_ARM_NEON ? \
+         silk_noise_shape_quantizer_short_prediction_neon(in, coefRev, order) : \
+         silk_noise_shape_quantizer_short_prediction_c(in, coef, order))
 
 extern oac_int32
- (*const SILK_NSQ_NOISE_SHAPE_FEEDBACK_LOOP_IMPL[OAC_ARCHMASK+1])(
+(*const SILK_NSQ_NOISE_SHAPE_FEEDBACK_LOOP_IMPL[OAC_ARCHMASK + 1])(
  const oac_int32 *data0, oac_int32 *data1, const oac_int16 *coef,
  oac_int order);
 
-#undef silk_NSQ_noise_shape_feedback_loop
-#define silk_NSQ_noise_shape_feedback_loop(data0, data1, coef, order, arch) \
- (SILK_NSQ_NOISE_SHAPE_FEEDBACK_LOOP_IMPL[(arch)&OAC_ARCHMASK](data0, data1, \
- coef, order))
+# undef silk_NSQ_noise_shape_feedback_loop
+# define silk_NSQ_noise_shape_feedback_loop(data0, data1, coef, order, arch) \
+        (SILK_NSQ_NOISE_SHAPE_FEEDBACK_LOOP_IMPL[(arch)&OAC_ARCHMASK](data0, data1, \
+                                                                      coef, order))
 
 #endif
 
diff --git a/silk/arm/SigProc_FIX_armv4.h b/silk/arm/SigProc_FIX_armv4.h
index e9ad69b7d..163111b04 100644
--- a/silk/arm/SigProc_FIX_armv4.h
+++ b/silk/arm/SigProc_FIX_armv4.h
@@ -1,29 +1,29 @@
 /***********************************************************************
-Copyright (C) 2013 Xiph.Org Foundation and contributors
-Copyright (c) 2013       Parrot
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (C) 2013 Xiph.Org Foundation and contributors
+   Copyright (c) 2013       Parrot
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_SIGPROC_FIX_ARMv4_H
@@ -31,16 +31,15 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #undef silk_MLA
 static OAC_INLINE oac_int32 silk_MLA_armv4(oac_int32 a, oac_int32 b,
- oac_int32 c)
-{
-  oac_int32 res;
-  __asm__(
-      "#silk_MLA\n\t"
-      "mla %0, %1, %2, %3\n\t"
-      : "=&r"(res)
-      : "r"(b), "r"(c), "r"(a)
-  );
-  return res;
+                                           oac_int32 c) {
+    oac_int32 res;
+    __asm__ (
+        "#silk_MLA\n\t"
+        "mla %0, %1, %2, %3\n\t"
+        : "=&r" (res)
+        : "r" (b), "r" (c), "r" (a)
+        );
+    return res;
 }
 #define silk_MLA(a, b, c) (silk_MLA_armv4(a, b, c))
 
diff --git a/silk/arm/SigProc_FIX_armv5e.h b/silk/arm/SigProc_FIX_armv5e.h
index 3bc208c30..0548f0f2a 100644
--- a/silk/arm/SigProc_FIX_armv5e.h
+++ b/silk/arm/SigProc_FIX_armv5e.h
@@ -1,60 +1,58 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Copyright (c) 2013       Parrot
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Copyright (c) 2013       Parrot
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_SIGPROC_FIX_ARMv5E_H
 #define SILK_SIGPROC_FIX_ARMv5E_H
 
 #undef silk_SMULTT
-static OAC_INLINE oac_int32 silk_SMULTT_armv5e(oac_int32 a, oac_int32 b)
-{
-  oac_int32 res;
-  __asm__(
-      "#silk_SMULTT\n\t"
-      "smultt %0, %1, %2\n\t"
-      : "=r"(res)
-      : "%r"(a), "r"(b)
-  );
-  return res;
+static OAC_INLINE oac_int32 silk_SMULTT_armv5e(oac_int32 a, oac_int32 b) {
+    oac_int32 res;
+    __asm__ (
+        "#silk_SMULTT\n\t"
+        "smultt %0, %1, %2\n\t"
+        : "=r" (res)
+        : "%r" (a), "r" (b)
+        );
+    return res;
 }
 #define silk_SMULTT(a, b) (silk_SMULTT_armv5e(a, b))
 
 #undef silk_SMLATT
 static OAC_INLINE oac_int32 silk_SMLATT_armv5e(oac_int32 a, oac_int32 b,
- oac_int32 c)
-{
-  oac_int32 res;
-  __asm__(
-      "#silk_SMLATT\n\t"
-      "smlatt %0, %1, %2, %3\n\t"
-      : "=r"(res)
-      : "%r"(b), "r"(c), "r"(a)
-  );
-  return res;
+                                               oac_int32 c) {
+    oac_int32 res;
+    __asm__ (
+        "#silk_SMLATT\n\t"
+        "smlatt %0, %1, %2, %3\n\t"
+        : "=r" (res)
+        : "%r" (b), "r" (c), "r" (a)
+        );
+    return res;
 }
 #define silk_SMLATT(a, b, c) (silk_SMLATT_armv5e(a, b, c))
 
diff --git a/silk/arm/arm_silk_map.c b/silk/arm/arm_silk_map.c
index b0c6599e7..d65fa5e74 100644
--- a/silk/arm/arm_silk_map.c
+++ b/silk/arm/arm_silk_map.c
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (C) 2014 Vidyo
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (C) 2014 Vidyo
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #if defined(OAC_HAVE_RTCD)
 
 # if (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && \
- !defined(OAC_ARM_PRESUME_NEON_INTR))
+    !defined(OAC_ARM_PRESUME_NEON_INTR))
 
 void (*const SILK_BIQUAD_ALT_STRIDE2_IMPL[OAC_ARCHMASK + 1])(
         const oac_int16            *in,                /* I     input signal                                               */
@@ -43,84 +43,84 @@ void (*const SILK_BIQUAD_ALT_STRIDE2_IMPL[OAC_ARCHMASK + 1])(
         const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
         oac_int32                  *S,                 /* I/O   State vector [4]                                           */
         oac_int16                  *out,               /* O     output signal                                              */
-        const oac_int32            len                 /* I     signal length (must be even)                               */
-) = {
-      silk_biquad_alt_stride2_c,    /* ARMv4 */
-      silk_biquad_alt_stride2_c,    /* EDSP */
-      silk_biquad_alt_stride2_c,    /* Media */
-      silk_biquad_alt_stride2_neon, /* Neon */
-      silk_biquad_alt_stride2_neon, /* dotprod */
+        const oac_int32 len                            /* I     signal length (must be even)                               */
+    ) = {
+    silk_biquad_alt_stride2_c,      /* ARMv4 */
+    silk_biquad_alt_stride2_c,      /* EDSP */
+    silk_biquad_alt_stride2_c,      /* Media */
+    silk_biquad_alt_stride2_neon,   /* Neon */
+    silk_biquad_alt_stride2_neon,   /* dotprod */
 };
 
 oac_int32 (*const SILK_LPC_INVERSE_PRED_GAIN_IMPL[OAC_ARCHMASK + 1])( /* O   Returns inverse prediction gain in energy domain, Q30        */
         const oac_int16            *A_Q12,                             /* I   Prediction coefficients, Q12 [order]                         */
-        const oac_int              order                               /* I   Prediction order                                             */
-) = {
-      silk_LPC_inverse_pred_gain_c,    /* ARMv4 */
-      silk_LPC_inverse_pred_gain_c,    /* EDSP */
-      silk_LPC_inverse_pred_gain_c,    /* Media */
-      silk_LPC_inverse_pred_gain_neon, /* Neon */
-      silk_LPC_inverse_pred_gain_neon, /* dotprod */
+        const oac_int order                                            /* I   Prediction order                                             */
+    ) = {
+    silk_LPC_inverse_pred_gain_c,      /* ARMv4 */
+    silk_LPC_inverse_pred_gain_c,      /* EDSP */
+    silk_LPC_inverse_pred_gain_c,      /* Media */
+    silk_LPC_inverse_pred_gain_neon,   /* Neon */
+    silk_LPC_inverse_pred_gain_neon,   /* dotprod */
 };
 
 void  (*const SILK_NSQ_DEL_DEC_IMPL[OAC_ARCHMASK + 1])(
         const silk_encoder_state    *psEncC,                                    /* I    Encoder State                   */
         silk_nsq_state              *NSQ,                                       /* I/O  NSQ state                       */
         SideInfoIndices             *psIndices,                                 /* I/O  Quantization Indices            */
-        const oac_int16            x16[],                                      /* I    Input                           */
-        oac_int8                   pulses[],                                   /* O    Quantized pulse signal          */
+        const oac_int16 x16[],                                                 /* I    Input                           */
+        oac_int8 pulses[],                                                     /* O    Quantized pulse signal          */
         const oac_int16            *PredCoef_Q12,                              /* I    Short term prediction coefs     */
-        const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],    /* I    Long term prediction coefs      */
-        const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs              */
-        const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],          /* I    Long term shaping coefs         */
-        const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                   /* I    Spectral tilt                   */
-        const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                 /* I    Low frequency shaping coefs     */
-        const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                  /* I    Quantization step sizes         */
-        const oac_int              pitchL[ MAX_NB_SUBFR ],                     /* I    Pitch lags                      */
-        const oac_int              Lambda_Q10,                                 /* I    Rate/distortion tradeoff        */
-        const oac_int              LTP_scale_Q14                               /* I    LTP state scaling               */
-) = {
-      silk_NSQ_del_dec_c,    /* ARMv4 */
-      silk_NSQ_del_dec_c,    /* EDSP */
-      silk_NSQ_del_dec_c,    /* Media */
-      silk_NSQ_del_dec_neon, /* Neon */
-      silk_NSQ_del_dec_neon, /* dotprod */
+        const oac_int16 LTPCoef_Q14[ LTP_ORDER*MAX_NB_SUBFR ],                 /* I    Long term prediction coefs      */
+        const oac_int16 AR_Q13[ MAX_NB_SUBFR*MAX_SHAPE_LPC_ORDER ],              /* I Noise shaping coefs              */
+        const oac_int HarmShapeGain_Q14[ MAX_NB_SUBFR ],                       /* I    Long term shaping coefs         */
+        const oac_int Tilt_Q14[ MAX_NB_SUBFR ],                                /* I    Spectral tilt                   */
+        const oac_int32 LF_shp_Q14[ MAX_NB_SUBFR ],                            /* I    Low frequency shaping coefs     */
+        const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],                             /* I    Quantization step sizes         */
+        const oac_int pitchL[ MAX_NB_SUBFR ],                                  /* I    Pitch lags                      */
+        const oac_int Lambda_Q10,                                              /* I    Rate/distortion tradeoff        */
+        const oac_int LTP_scale_Q14                                            /* I    LTP state scaling               */
+    ) = {
+    silk_NSQ_del_dec_c,      /* ARMv4 */
+    silk_NSQ_del_dec_c,      /* EDSP */
+    silk_NSQ_del_dec_c,      /* Media */
+    silk_NSQ_del_dec_neon,   /* Neon */
+    silk_NSQ_del_dec_neon,   /* dotprod */
 };
 
 /*There is no table for silk_noise_shape_quantizer_short_prediction because the
    NEON version takes different parameters than the C version.
-  Instead RTCD is done via if statements at the call sites.
-  See NSQ_neon.h for details.*/
+   Instead RTCD is done via if statements at the call sites.
+   See NSQ_neon.h for details.*/
 
 oac_int32
- (*const SILK_NSQ_NOISE_SHAPE_FEEDBACK_LOOP_IMPL[OAC_ARCHMASK+1])(
+(*const SILK_NSQ_NOISE_SHAPE_FEEDBACK_LOOP_IMPL[OAC_ARCHMASK + 1])(
  const oac_int32 *data0, oac_int32 *data1, const oac_int16 *coef,
  oac_int order) = {
-  silk_NSQ_noise_shape_feedback_loop_c,    /* ARMv4 */
-  silk_NSQ_noise_shape_feedback_loop_c,    /* EDSP */
-  silk_NSQ_noise_shape_feedback_loop_c,    /* Media */
-  silk_NSQ_noise_shape_feedback_loop_neon, /* NEON */
-  silk_NSQ_noise_shape_feedback_loop_neon, /* dotprod */
+    silk_NSQ_noise_shape_feedback_loop_c,  /* ARMv4 */
+    silk_NSQ_noise_shape_feedback_loop_c,  /* EDSP */
+    silk_NSQ_noise_shape_feedback_loop_c,  /* Media */
+    silk_NSQ_noise_shape_feedback_loop_neon, /* NEON */
+    silk_NSQ_noise_shape_feedback_loop_neon, /* dotprod */
 };
 
 # endif
 
 # if defined(FIXED_POINT) && \
- defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR)
+    defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR)
 
 void (*const SILK_WARPED_AUTOCORRELATION_FIX_IMPL[OAC_ARCHMASK + 1])(
           oac_int32                *corr,                                  /* O    Result [order + 1]                                                          */
           oac_int                  *scale,                                 /* O    Scaling of the correlation vector                                           */
     const oac_int16                *input,                                 /* I    Input data to correlate                                                     */
-    const oac_int                  warping_Q16,                            /* I    Warping coefficient                                                         */
-    const oac_int                  length,                                 /* I    Length of input                                                             */
-    const oac_int                  order                                   /* I    Correlation order (even)                                                    */
-) = {
-      silk_warped_autocorrelation_FIX_c,    /* ARMv4 */
-      silk_warped_autocorrelation_FIX_c,    /* EDSP */
-      silk_warped_autocorrelation_FIX_c,    /* Media */
-      silk_warped_autocorrelation_FIX_neon, /* Neon */
-      silk_warped_autocorrelation_FIX_neon, /* dotprod */
+    const oac_int warping_Q16,                                             /* I    Warping coefficient                                                         */
+    const oac_int length,                                                  /* I    Length of input                                                             */
+    const oac_int order                                                    /* I    Correlation order (even)                                                    */
+    ) = {
+    silk_warped_autocorrelation_FIX_c,      /* ARMv4 */
+    silk_warped_autocorrelation_FIX_c,      /* EDSP */
+    silk_warped_autocorrelation_FIX_c,      /* Media */
+    silk_warped_autocorrelation_FIX_neon,   /* Neon */
+    silk_warped_autocorrelation_FIX_neon,   /* dotprod */
 };
 
 # endif
diff --git a/silk/arm/biquad_alt_arm.h b/silk/arm/biquad_alt_arm.h
index 63bd97ea6..da873cb98 100644
--- a/silk/arm/biquad_alt_arm.h
+++ b/silk/arm/biquad_alt_arm.h
@@ -1,68 +1,75 @@
 /***********************************************************************
-Copyright (c) 2017 Google Inc.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2017 Google Inc.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_BIQUAD_ALT_ARM_H
-# define SILK_BIQUAD_ALT_ARM_H
+#define SILK_BIQUAD_ALT_ARM_H
 
-# include "celt/arm/armcpu.h"
+#include "celt/arm/armcpu.h"
 
-# if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
+#if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 void silk_biquad_alt_stride2_neon(
     const oac_int16            *in,                /* I     input signal                                               */
     const oac_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
     const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
     oac_int32                  *S,                 /* I/O   State vector [4]                                           */
     oac_int16                  *out,               /* O     output signal                                              */
-    const oac_int32            len                 /* I     signal length (must be even)                               */
-);
+    const oac_int32 len                            /* I     signal length (must be even)                               */
+    );
 
-#  if !defined(OAC_HAVE_RTCD) && defined(OAC_ARM_PRESUME_NEON)
-#   define OVERRIDE_silk_biquad_alt_stride2                   (1)
-#   define silk_biquad_alt_stride2(in, B_Q28, A_Q28, S, out, len, arch) ((void)(arch), PRESUME_NEON(silk_biquad_alt_stride2)(in, B_Q28, A_Q28, S, out, len))
-#  endif
+# if !defined(OAC_HAVE_RTCD) && defined(OAC_ARM_PRESUME_NEON)
+#  define OVERRIDE_silk_biquad_alt_stride2                   (1)
+#  define silk_biquad_alt_stride2(in, B_Q28, A_Q28, S, out, len, arch) ((void)(arch), \
+                                                                        PRESUME_NEON(silk_biquad_alt_stride2)(in, B_Q28, \
+                                                                                                              A_Q28, S, \
+                                                                                                              out, len))
 # endif
+#endif
 
-# if !defined(OVERRIDE_silk_biquad_alt_stride2)
+#if !defined(OVERRIDE_silk_biquad_alt_stride2)
 /*Is run-time CPU detection enabled on this platform?*/
-#  if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
-extern void (*const SILK_BIQUAD_ALT_STRIDE2_IMPL[OAC_ARCHMASK+1])(
+# if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
+extern void (*const SILK_BIQUAD_ALT_STRIDE2_IMPL[OAC_ARCHMASK + 1])(
         const oac_int16            *in,                /* I     input signal                                               */
         const oac_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
         const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
         oac_int32                  *S,                 /* I/O   State vector [4]                                           */
         oac_int16                  *out,               /* O     output signal                                              */
-        const oac_int32            len                 /* I     signal length (must be even)                               */
+        const oac_int32 len                            /* I     signal length (must be even)                               */
     );
-#   define OVERRIDE_silk_biquad_alt_stride2                  (1)
-#   define silk_biquad_alt_stride2(in, B_Q28, A_Q28, S, out, len, arch) ((*SILK_BIQUAD_ALT_STRIDE2_IMPL[(arch)&OAC_ARCHMASK])(in, B_Q28, A_Q28, S, out, len))
-#  elif defined(OAC_ARM_PRESUME_NEON_INTR)
-#   define OVERRIDE_silk_biquad_alt_stride2                  (1)
-#   define silk_biquad_alt_stride2(in, B_Q28, A_Q28, S, out, len, arch) ((void)(arch), silk_biquad_alt_stride2_neon(in, B_Q28, A_Q28, S, out, len))
-#  endif
+#  define OVERRIDE_silk_biquad_alt_stride2                  (1)
+#  define silk_biquad_alt_stride2(in, B_Q28, A_Q28, S, out, len, \
+                                  arch) ((*SILK_BIQUAD_ALT_STRIDE2_IMPL[(arch)&OAC_ARCHMASK])(in, B_Q28, A_Q28, S, out, \
+                                                                                              len))
+# elif defined(OAC_ARM_PRESUME_NEON_INTR)
+#  define OVERRIDE_silk_biquad_alt_stride2                  (1)
+#  define silk_biquad_alt_stride2(in, B_Q28, A_Q28, S, out, len, arch) ((void)(arch), \
+                                                                        silk_biquad_alt_stride2_neon(in, B_Q28, A_Q28, \
+    S, out, len))
 # endif
+#endif
 
 #endif /* end SILK_BIQUAD_ALT_ARM_H */
diff --git a/silk/arm/biquad_alt_neon_intr.c b/silk/arm/biquad_alt_neon_intr.c
index 8f5951550..e8ee2e091 100644
--- a/silk/arm/biquad_alt_neon_intr.c
+++ b/silk/arm/biquad_alt_neon_intr.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2017 Google Inc.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2017 Google Inc.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <arm_neon.h>
@@ -36,12 +36,14 @@ POSSIBILITY OF SUCH DAMAGE.
 #endif
 #include "SigProc_FIX.h"
 
-static inline void silk_biquad_alt_stride2_kernel( const int32x4_t A_L_s32x4, const int32x4_t A_U_s32x4, const int32x4_t B_Q28_s32x4, const int32x2_t t_s32x2, const int32x4_t in_s32x4, int32x4_t *S_s32x4, int32x2_t *out32_Q14_s32x2 )
-{
+static inline void silk_biquad_alt_stride2_kernel( const int32x4_t A_L_s32x4, const int32x4_t A_U_s32x4,
+                                                   const int32x4_t B_Q28_s32x4, const int32x2_t t_s32x2,
+                                                   const int32x4_t in_s32x4, int32x4_t *S_s32x4,
+                                                   int32x2_t *out32_Q14_s32x2 ) {
     int32x4_t t_s32x4, out32_Q14_s32x4;
 
     *out32_Q14_s32x2 = vadd_s32( vget_low_s32( *S_s32x4 ), t_s32x2 );              /* silk_SMLAWB( S{0,1}, B_Q28[ 0 ], in{0,1} )                                      */
-    *S_s32x4         = vcombine_s32( vget_high_s32( *S_s32x4 ), vdup_n_s32( 0 ) ); /* S{0,1} = S{2,3}; S{2,3} = 0;                                                    */
+    *S_s32x4         = vcombine_s32( vget_high_s32( *S_s32x4 ), vdup_n_s32( 0 ));  /* S{0,1} = S{2,3}; S{2,3} = 0;                                                    */
     *out32_Q14_s32x2 = vshl_n_s32( *out32_Q14_s32x2, 2 );                          /* out32_Q14_{0,1} = silk_LSHIFT( silk_SMLAWB( S{0,1}, B_Q28[ 0 ], in{0,1} ), 2 ); */
     out32_Q14_s32x4  = vcombine_s32( *out32_Q14_s32x2, *out32_Q14_s32x2 );         /* out32_Q14_{0,1,0,1}                                                             */
     t_s32x4          = vqdmulhq_s32( out32_Q14_s32x4, A_L_s32x4 );                 /* silk_SMULWB( out32_Q14_{0,1,0,1}, A{0,0,1,1}_L_Q28 )                            */
@@ -58,26 +60,25 @@ void silk_biquad_alt_stride2_neon(
     const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
     oac_int32                  *S,                 /* I/O   State vector [4]                                           */
     oac_int16                  *out,               /* O     output signal                                              */
-    const oac_int32            len                 /* I     signal length (must be even)                               */
-)
-{
+    const oac_int32 len                            /* I     signal length (must be even)                               */
+    ) {
     /* DIRECT FORM II TRANSPOSED (uses 2 element state vector) */
-    oac_int        k            = 0;
-    const int32x2_t offset_s32x2 = vdup_n_s32( (1<<14) - 1 );
+    oac_int k            = 0;
+    const int32x2_t offset_s32x2 = vdup_n_s32((1<<14) - 1 );
     const int32x4_t offset_s32x4 = vcombine_s32( offset_s32x2, offset_s32x2 );
-    int16x4_t       in_s16x4  = vdup_n_s16( 0 );
-    int16x4_t       out_s16x4;
-    int32x2_t       A_Q28_s32x2, A_L_s32x2, A_U_s32x2, B_Q28_s32x2, t_s32x2;
-    int32x4_t       A_L_s32x4, A_U_s32x4, B_Q28_s32x4, S_s32x4, out32_Q14_s32x4;
-    int32x2x2_t     t0_s32x2x2, t1_s32x2x2, t2_s32x2x2, S_s32x2x2;
+    int16x4_t in_s16x4  = vdup_n_s16( 0 );
+    int16x4_t out_s16x4;
+    int32x2_t A_Q28_s32x2, A_L_s32x2, A_U_s32x2, B_Q28_s32x2, t_s32x2;
+    int32x4_t A_L_s32x4, A_U_s32x4, B_Q28_s32x4, S_s32x4, out32_Q14_s32x4;
+    int32x2x2_t t0_s32x2x2, t1_s32x2x2, t2_s32x2x2, S_s32x2x2;
 
 #ifdef OAC_CHECK_ASM
     oac_int32 S_c[ 4 ];
     VARDECL( oac_int16, out_c );
     SAVE_STACK;
-    ALLOC( out_c, 2 * len, oac_int16 );
+    ALLOC( out_c, 2*len, oac_int16 );
 
-    silk_memcpy( &S_c, S, sizeof( S_c ) );
+    silk_memcpy( &S_c, S, sizeof(S_c));
     silk_biquad_alt_stride2_c( in, B_Q28, A_Q28, S_c, out_c, len );
 #endif
 
@@ -85,7 +86,7 @@ void silk_biquad_alt_stride2_neon(
     A_Q28_s32x2 = vld1_s32( A_Q28 );
     A_Q28_s32x2 = vneg_s32( A_Q28_s32x2 );
     A_L_s32x2   = vshl_n_s32( A_Q28_s32x2, 18 );                                                        /* ( -A_Q28[] & 0x00003FFF ) << 18                                                     */
-    A_L_s32x2   = vreinterpret_s32_u32( vshr_n_u32( vreinterpret_u32_s32( A_L_s32x2 ), 3 ) );           /* ( -A_Q28[] & 0x00003FFF ) << 15                                                     */
+    A_L_s32x2   = vreinterpret_s32_u32( vshr_n_u32( vreinterpret_u32_s32( A_L_s32x2 ), 3 ));            /* ( -A_Q28[] & 0x00003FFF ) << 15                                                     */
     A_U_s32x2   = vshr_n_s32( A_Q28_s32x2, 14 );                                                        /* silk_RSHIFT( -A_Q28[], 14 )                                                         */
     A_U_s32x2   = vshl_n_s32( A_U_s32x2, 16 );                                                          /* silk_RSHIFT( -A_Q28[], 14 ) << 16 (Clip two leading bits to conform to C function.) */
     A_U_s32x2   = vshr_n_s32( A_U_s32x2, 1 );                                                           /* silk_RSHIFT( -A_Q28[], 14 ) << 15                                                   */
@@ -99,48 +100,51 @@ void silk_biquad_alt_stride2_neon(
     A_U_s32x4    = vcombine_s32( t1_s32x2x2.val[ 0 ], t1_s32x2x2.val[ 1 ] );                            /* A{0,0,1,1}_U_Q28          */
     B_Q28_s32x4  = vcombine_s32( t2_s32x2x2.val[ 0 ], t2_s32x2x2.val[ 1 ] );                            /* B_Q28[ {1,1,2,2} ]        */
     S_s32x4      = vld1q_s32( S );                                                                      /* S0 = S[ 0 ]; S3 = S[ 3 ]; */
-    S_s32x2x2    = vtrn_s32( vget_low_s32( S_s32x4 ), vget_high_s32( S_s32x4 ) );                       /* S2 = S[ 1 ]; S1 = S[ 2 ]; */
+    S_s32x2x2    = vtrn_s32( vget_low_s32( S_s32x4 ), vget_high_s32( S_s32x4 ));                        /* S2 = S[ 1 ]; S1 = S[ 2 ]; */
     S_s32x4      = vcombine_s32( S_s32x2x2.val[ 0 ], S_s32x2x2.val[ 1 ] );
 
-    for( ; k < len - 1; k += 2 ) {
+    for ( ; k < len - 1; k += 2) {
         int32x4_t in_s32x4[ 2 ], t_s32x4;
         int32x2_t out32_Q14_s32x2[ 2 ];
 
         /* S[ 2 * i + 0 ], S[ 2 * i + 1 ], S[ 2 * i + 2 ], S[ 2 * i + 3 ]: Q12 */
-        in_s16x4      = vld1_s16( &in[ 2 * k ] );                                                       /* in{0,1,2,3} = in[ 2 * k + {0,1,2,3} ]; */
+        in_s16x4      = vld1_s16( &in[ 2*k ] );                                                         /* in{0,1,2,3} = in[ 2 * k + {0,1,2,3} ]; */
         in_s32x4[ 0 ] = vshll_n_s16( in_s16x4, 15 );                                                    /* in{0,1,2,3} << 15                      */
         t_s32x4       = vqdmulhq_lane_s32( in_s32x4[ 0 ], B_Q28_s32x2, 0 );                             /* silk_SMULWB( B_Q28[ 0 ], in{0,1,2,3} ) */
-        in_s32x4[ 1 ] = vcombine_s32( vget_high_s32( in_s32x4[ 0 ] ), vget_high_s32( in_s32x4[ 0 ] ) ); /* in{2,3,2,3} << 15                      */
-        in_s32x4[ 0 ] = vcombine_s32( vget_low_s32 ( in_s32x4[ 0 ] ), vget_low_s32 ( in_s32x4[ 0 ] ) ); /* in{0,1,0,1} << 15                      */
-        silk_biquad_alt_stride2_kernel( A_L_s32x4, A_U_s32x4, B_Q28_s32x4, vget_low_s32 ( t_s32x4 ), in_s32x4[ 0 ], &S_s32x4, &out32_Q14_s32x2[ 0 ] );
-        silk_biquad_alt_stride2_kernel( A_L_s32x4, A_U_s32x4, B_Q28_s32x4, vget_high_s32( t_s32x4 ), in_s32x4[ 1 ], &S_s32x4, &out32_Q14_s32x2[ 1 ] );
+        in_s32x4[ 1 ] = vcombine_s32( vget_high_s32( in_s32x4[ 0 ] ), vget_high_s32( in_s32x4[ 0 ] ));  /* in{2,3,2,3} << 15                      */
+        in_s32x4[ 0 ] = vcombine_s32( vget_low_s32 ( in_s32x4[ 0 ] ), vget_low_s32 ( in_s32x4[ 0 ] ));  /* in{0,1,0,1} << 15                      */
+        silk_biquad_alt_stride2_kernel( A_L_s32x4, A_U_s32x4, B_Q28_s32x4, vget_low_s32 ( t_s32x4 ), in_s32x4[ 0 ],
+        &S_s32x4, &out32_Q14_s32x2[ 0 ] );
+        silk_biquad_alt_stride2_kernel( A_L_s32x4, A_U_s32x4, B_Q28_s32x4, vget_high_s32( t_s32x4 ), in_s32x4[ 1 ],
+        &S_s32x4, &out32_Q14_s32x2[ 1 ] );
 
         /* Scale back to Q0 and saturate */
         out32_Q14_s32x4 = vcombine_s32( out32_Q14_s32x2[ 0 ], out32_Q14_s32x2[ 1 ] );                   /* out32_Q14_{0,1,2,3}                                                                                        */
         out32_Q14_s32x4 = vaddq_s32( out32_Q14_s32x4, offset_s32x4 );                                   /* out32_Q14_{0,1,2,3} + (1<<14) - 1                                                                          */
         out_s16x4       = vqshrn_n_s32( out32_Q14_s32x4, 14 );                                          /* (oac_int16)silk_SAT16( silk_RSHIFT( out32_Q14_{0,1,2,3} + (1<<14) - 1, 14 ) )                             */
-        vst1_s16( &out[ 2 * k ], out_s16x4 );                                                           /* out[ 2 * k + {0,1,2,3} ] = (oac_int16)silk_SAT16( silk_RSHIFT( out32_Q14_{0,1,2,3} + (1<<14) - 1, 14 ) ); */
+        vst1_s16( &out[ 2*k ], out_s16x4 );                                                             /* out[ 2 * k + {0,1,2,3} ] = (oac_int16)silk_SAT16( silk_RSHIFT( out32_Q14_{0,1,2,3} + (1<<14) - 1, 14 ) ); */
     }
 
     /* Process leftover. */
-    if( k < len ) {
+    if (k < len) {
         int32x4_t in_s32x4;
         int32x2_t out32_Q14_s32x2;
 
         /* S[ 2 * i + 0 ], S[ 2 * i + 1 ]: Q12 */
-        in_s16x4     = vld1_lane_s16( &in[ 2 * k + 0 ], in_s16x4, 0 );                                  /* in{0,1} = in[ 2 * k + {0,1} ];     */
-        in_s16x4     = vld1_lane_s16( &in[ 2 * k + 1 ], in_s16x4, 1 );                                  /* in{0,1} = in[ 2 * k + {0,1} ];     */
+        in_s16x4     = vld1_lane_s16( &in[ 2*k + 0 ], in_s16x4, 0 );                                    /* in{0,1} = in[ 2 * k + {0,1} ];     */
+        in_s16x4     = vld1_lane_s16( &in[ 2*k + 1 ], in_s16x4, 1 );                                    /* in{0,1} = in[ 2 * k + {0,1} ];     */
         in_s32x4     = vshll_n_s16( in_s16x4, 15 );                                                     /* in{0,1} << 15                      */
         t_s32x2      = vqdmulh_lane_s32( vget_low_s32( in_s32x4 ), B_Q28_s32x2, 0 );                    /* silk_SMULWB( B_Q28[ 0 ], in{0,1} ) */
-        in_s32x4     = vcombine_s32( vget_low_s32( in_s32x4 ), vget_low_s32( in_s32x4 ) );              /* in{0,1,0,1} << 15                  */
-        silk_biquad_alt_stride2_kernel( A_L_s32x4, A_U_s32x4, B_Q28_s32x4, t_s32x2, in_s32x4, &S_s32x4, &out32_Q14_s32x2 );
+        in_s32x4     = vcombine_s32( vget_low_s32( in_s32x4 ), vget_low_s32( in_s32x4 ));               /* in{0,1,0,1} << 15                  */
+        silk_biquad_alt_stride2_kernel( A_L_s32x4, A_U_s32x4, B_Q28_s32x4, t_s32x2, in_s32x4, &S_s32x4,
+        &out32_Q14_s32x2 );
 
         /* Scale back to Q0 and saturate */
         out32_Q14_s32x2 = vadd_s32( out32_Q14_s32x2, offset_s32x2 );                                    /* out32_Q14_{0,1} + (1<<14) - 1                                                              */
         out32_Q14_s32x4 = vcombine_s32( out32_Q14_s32x2, out32_Q14_s32x2 );                             /* out32_Q14_{0,1,0,1} + (1<<14) - 1                                                          */
         out_s16x4       = vqshrn_n_s32( out32_Q14_s32x4, 14 );                                          /* (oac_int16)silk_SAT16( silk_RSHIFT( out32_Q14_{0,1,0,1} + (1<<14) - 1, 14 ) )             */
-        vst1_lane_s16( &out[ 2 * k + 0 ], out_s16x4, 0 );                                               /* out[ 2 * k + 0 ] = (oac_int16)silk_SAT16( silk_RSHIFT( out32_Q14_0 + (1<<14) - 1, 14 ) ); */
-        vst1_lane_s16( &out[ 2 * k + 1 ], out_s16x4, 1 );                                               /* out[ 2 * k + 1 ] = (oac_int16)silk_SAT16( silk_RSHIFT( out32_Q14_1 + (1<<14) - 1, 14 ) ); */
+        vst1_lane_s16( &out[ 2*k + 0 ], out_s16x4, 0 );                                                 /* out[ 2 * k + 0 ] = (oac_int16)silk_SAT16( silk_RSHIFT( out32_Q14_0 + (1<<14) - 1, 14 ) ); */
+        vst1_lane_s16( &out[ 2*k + 1 ], out_s16x4, 1 );                                                 /* out[ 2 * k + 1 ] = (oac_int16)silk_SAT16( silk_RSHIFT( out32_Q14_1 + (1<<14) - 1, 14 ) ); */
     }
 
     vst1q_lane_s32( &S[ 0 ], S_s32x4, 0 );                                                              /* S[ 0 ] = S0; */
@@ -149,8 +153,8 @@ void silk_biquad_alt_stride2_neon(
     vst1q_lane_s32( &S[ 3 ], S_s32x4, 3 );                                                              /* S[ 3 ] = S3; */
 
 #ifdef OAC_CHECK_ASM
-    silk_assert( !memcmp( S_c, S, sizeof( S_c ) ) );
-    silk_assert( !memcmp( out_c, out, 2 * len * sizeof( oac_int16 ) ) );
+    silk_assert( !memcmp( S_c, S, sizeof(S_c)));
+    silk_assert( !memcmp( out_c, out, 2*len*sizeof(oac_int16)));
     RESTORE_STACK;
 #endif
 }
diff --git a/silk/arm/macros_arm64.h b/silk/arm/macros_arm64.h
index ed030413c..fa551775a 100644
--- a/silk/arm/macros_arm64.h
+++ b/silk/arm/macros_arm64.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (C) 2015 Vidyo
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (C) 2015 Vidyo
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_MACROS_ARM64_H
diff --git a/silk/arm/macros_armv4.h b/silk/arm/macros_armv4.h
index 04ec98ade..80e566da4 100644
--- a/silk/arm/macros_armv4.h
+++ b/silk/arm/macros_armv4.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (C) 2013 Xiph.Org Foundation and contributors.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (C) 2013 Xiph.Org Foundation and contributors.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_MACROS_ARMv4_H
@@ -31,21 +31,20 @@ POSSIBILITY OF SUCH DAMAGE.
 /* This macro only avoids the undefined behaviour from a left shift of
    a negative value. It should only be used in macros that can't include
    SigProc_FIX.h. In other cases, use silk_LSHIFT32(). */
-#define SAFE_SHL(a,b) ((oac_int32)((oac_uint32)(a) << (b)))
+#define SAFE_SHL(a, b) ((oac_int32)((oac_uint32)(a)<<(b)))
 
 /* (a32 * (oac_int32)((oac_int16)(b32))) >> 16 output have to be 32bit int */
 #undef silk_SMULWB
-static OAC_INLINE oac_int32 silk_SMULWB_armv4(oac_int32 a, oac_int16 b)
-{
-  unsigned rd_lo;
-  int rd_hi;
-  __asm__(
-      "#silk_SMULWB\n\t"
-      "smull %0, %1, %2, %3\n\t"
-      : "=&r"(rd_lo), "=&r"(rd_hi)
-      : "%r"(a), "r"(SAFE_SHL(b,16))
-  );
-  return rd_hi;
+static OAC_INLINE oac_int32 silk_SMULWB_armv4(oac_int32 a, oac_int16 b) {
+    unsigned rd_lo;
+    int rd_hi;
+    __asm__ (
+        "#silk_SMULWB\n\t"
+        "smull %0, %1, %2, %3\n\t"
+        : "=&r" (rd_lo), "=&r" (rd_hi)
+        : "%r" (a), "r" (SAFE_SHL(b, 16))
+        );
+    return rd_hi;
 }
 #define silk_SMULWB(a, b) (silk_SMULWB_armv4(a, b))
 
@@ -55,17 +54,16 @@ static OAC_INLINE oac_int32 silk_SMULWB_armv4(oac_int32 a, oac_int16 b)
 
 /* (a32 * (b32 >> 16)) >> 16 */
 #undef silk_SMULWT
-static OAC_INLINE oac_int32 silk_SMULWT_armv4(oac_int32 a, oac_int32 b)
-{
-  unsigned rd_lo;
-  int rd_hi;
-  __asm__(
-      "#silk_SMULWT\n\t"
-      "smull %0, %1, %2, %3\n\t"
-      : "=&r"(rd_lo), "=&r"(rd_hi)
-      : "%r"(a), "r"(b&~0xFFFF)
-  );
-  return rd_hi;
+static OAC_INLINE oac_int32 silk_SMULWT_armv4(oac_int32 a, oac_int32 b) {
+    unsigned rd_lo;
+    int rd_hi;
+    __asm__ (
+        "#silk_SMULWT\n\t"
+        "smull %0, %1, %2, %3\n\t"
+        : "=&r" (rd_lo), "=&r" (rd_hi)
+        : "%r" (a), "r" (b&~0xFFFF)
+        );
+    return rd_hi;
 }
 #define silk_SMULWT(a, b) (silk_SMULWT_armv4(a, b))
 
@@ -75,33 +73,31 @@ static OAC_INLINE oac_int32 silk_SMULWT_armv4(oac_int32 a, oac_int32 b)
 
 /* (a32 * b32) >> 16 */
 #undef silk_SMULWW
-static OAC_INLINE oac_int32 silk_SMULWW_armv4(oac_int32 a, oac_int32 b)
-{
-  unsigned rd_lo;
-  int rd_hi;
-  __asm__(
-    "#silk_SMULWW\n\t"
-    "smull %0, %1, %2, %3\n\t"
-    : "=&r"(rd_lo), "=&r"(rd_hi)
-    : "%r"(a), "r"(b)
-  );
-  return SAFE_SHL(rd_hi,16)+(rd_lo>>16);
+static OAC_INLINE oac_int32 silk_SMULWW_armv4(oac_int32 a, oac_int32 b) {
+    unsigned rd_lo;
+    int rd_hi;
+    __asm__ (
+        "#silk_SMULWW\n\t"
+        "smull %0, %1, %2, %3\n\t"
+        : "=&r" (rd_lo), "=&r" (rd_hi)
+        : "%r" (a), "r" (b)
+        );
+    return SAFE_SHL(rd_hi, 16) + (rd_lo>>16);
 }
 #define silk_SMULWW(a, b) (silk_SMULWW_armv4(a, b))
 
 #undef silk_SMLAWW
 static OAC_INLINE oac_int32 silk_SMLAWW_armv4(oac_int32 a, oac_int32 b,
- oac_int32 c)
-{
-  unsigned rd_lo;
-  int rd_hi;
-  __asm__(
-    "#silk_SMLAWW\n\t"
-    "smull %0, %1, %2, %3\n\t"
-    : "=&r"(rd_lo), "=&r"(rd_hi)
-    : "%r"(b), "r"(c)
-  );
-  return a+SAFE_SHL(rd_hi,16)+(rd_lo>>16);
+                                              oac_int32 c) {
+    unsigned rd_lo;
+    int rd_hi;
+    __asm__ (
+        "#silk_SMLAWW\n\t"
+        "smull %0, %1, %2, %3\n\t"
+        : "=&r" (rd_lo), "=&r" (rd_hi)
+        : "%r" (b), "r" (c)
+        );
+    return a + SAFE_SHL(rd_hi, 16) + (rd_lo>>16);
 }
 #define silk_SMLAWW(a, b, c) (silk_SMLAWW_armv4(a, b, c))
 
diff --git a/silk/arm/macros_armv5e.h b/silk/arm/macros_armv5e.h
index bfaea7e42..a84ca75ab 100644
--- a/silk/arm/macros_armv5e.h
+++ b/silk/arm/macros_armv5e.h
@@ -1,29 +1,29 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Copyright (c) 2013       Parrot
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Copyright (c) 2013       Parrot
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_MACROS_ARMv5E_H
@@ -32,186 +32,174 @@ POSSIBILITY OF SUCH DAMAGE.
 /* This macro only avoids the undefined behaviour from a left shift of
    a negative value. It should only be used in macros that can't include
    SigProc_FIX.h. In other cases, use silk_LSHIFT32(). */
-#define SAFE_SHL(a,b) ((oac_int32)((oac_uint32)(a) << (b)))
+#define SAFE_SHL(a, b) ((oac_int32)((oac_uint32)(a)<<(b)))
 
 /* (a32 * (oac_int32)((oac_int16)(b32))) >> 16 output have to be 32bit int */
 #undef silk_SMULWB
-static OAC_INLINE oac_int32 silk_SMULWB_armv5e(oac_int32 a, oac_int16 b)
-{
-  int res;
-  __asm__(
-      "#silk_SMULWB\n\t"
-      "smulwb %0, %1, %2\n\t"
-      : "=r"(res)
-      : "r"(a), "r"(b)
-  );
-  return res;
+static OAC_INLINE oac_int32 silk_SMULWB_armv5e(oac_int32 a, oac_int16 b) {
+    int res;
+    __asm__ (
+        "#silk_SMULWB\n\t"
+        "smulwb %0, %1, %2\n\t"
+        : "=r" (res)
+        : "r" (a), "r" (b)
+        );
+    return res;
 }
 #define silk_SMULWB(a, b) (silk_SMULWB_armv5e(a, b))
 
 /* a32 + (b32 * (oac_int32)((oac_int16)(c32))) >> 16 output have to be 32bit int */
 #undef silk_SMLAWB
 static OAC_INLINE oac_int32 silk_SMLAWB_armv5e(oac_int32 a, oac_int32 b,
- oac_int16 c)
-{
-  int res;
-  __asm__(
-      "#silk_SMLAWB\n\t"
-      "smlawb %0, %1, %2, %3\n\t"
-      : "=r"(res)
-      : "r"(b), "r"(c), "r"(a)
-  );
-  return res;
+                                               oac_int16 c) {
+    int res;
+    __asm__ (
+        "#silk_SMLAWB\n\t"
+        "smlawb %0, %1, %2, %3\n\t"
+        : "=r" (res)
+        : "r" (b), "r" (c), "r" (a)
+        );
+    return res;
 }
 #define silk_SMLAWB(a, b, c) (silk_SMLAWB_armv5e(a, b, c))
 
 /* (a32 * (b32 >> 16)) >> 16 */
 #undef silk_SMULWT
-static OAC_INLINE oac_int32 silk_SMULWT_armv5e(oac_int32 a, oac_int32 b)
-{
-  int res;
-  __asm__(
-      "#silk_SMULWT\n\t"
-      "smulwt %0, %1, %2\n\t"
-      : "=r"(res)
-      : "r"(a), "r"(b)
-  );
-  return res;
+static OAC_INLINE oac_int32 silk_SMULWT_armv5e(oac_int32 a, oac_int32 b) {
+    int res;
+    __asm__ (
+        "#silk_SMULWT\n\t"
+        "smulwt %0, %1, %2\n\t"
+        : "=r" (res)
+        : "r" (a), "r" (b)
+        );
+    return res;
 }
 #define silk_SMULWT(a, b) (silk_SMULWT_armv5e(a, b))
 
 /* a32 + (b32 * (c32 >> 16)) >> 16 */
 #undef silk_SMLAWT
 static OAC_INLINE oac_int32 silk_SMLAWT_armv5e(oac_int32 a, oac_int32 b,
- oac_int32 c)
-{
-  int res;
-  __asm__(
-      "#silk_SMLAWT\n\t"
-      "smlawt %0, %1, %2, %3\n\t"
-      : "=r"(res)
-      : "r"(b), "r"(c), "r"(a)
-  );
-  return res;
+                                               oac_int32 c) {
+    int res;
+    __asm__ (
+        "#silk_SMLAWT\n\t"
+        "smlawt %0, %1, %2, %3\n\t"
+        : "=r" (res)
+        : "r" (b), "r" (c), "r" (a)
+        );
+    return res;
 }
 #define silk_SMLAWT(a, b, c) (silk_SMLAWT_armv5e(a, b, c))
 
 /* (oac_int32)((oac_int16)(a3))) * (oac_int32)((oac_int16)(b32)) output have to be 32bit int */
 #undef silk_SMULBB
-static OAC_INLINE oac_int32 silk_SMULBB_armv5e(oac_int32 a, oac_int32 b)
-{
-  int res;
-  __asm__(
-      "#silk_SMULBB\n\t"
-      "smulbb %0, %1, %2\n\t"
-      : "=r"(res)
-      : "%r"(a), "r"(b)
-  );
-  return res;
+static OAC_INLINE oac_int32 silk_SMULBB_armv5e(oac_int32 a, oac_int32 b) {
+    int res;
+    __asm__ (
+        "#silk_SMULBB\n\t"
+        "smulbb %0, %1, %2\n\t"
+        : "=r" (res)
+        : "%r" (a), "r" (b)
+        );
+    return res;
 }
 #define silk_SMULBB(a, b) (silk_SMULBB_armv5e(a, b))
 
 /* a32 + (oac_int32)((oac_int16)(b32)) * (oac_int32)((oac_int16)(c32)) output have to be 32bit int */
 #undef silk_SMLABB
 static OAC_INLINE oac_int32 silk_SMLABB_armv5e(oac_int32 a, oac_int32 b,
- oac_int32 c)
-{
-  int res;
-  __asm__(
-      "#silk_SMLABB\n\t"
-      "smlabb %0, %1, %2, %3\n\t"
-      : "=r"(res)
-      : "%r"(b), "r"(c), "r"(a)
-  );
-  return res;
+                                               oac_int32 c) {
+    int res;
+    __asm__ (
+        "#silk_SMLABB\n\t"
+        "smlabb %0, %1, %2, %3\n\t"
+        : "=r" (res)
+        : "%r" (b), "r" (c), "r" (a)
+        );
+    return res;
 }
 #define silk_SMLABB(a, b, c) (silk_SMLABB_armv5e(a, b, c))
 
 /* (oac_int32)((oac_int16)(a32)) * (b32 >> 16) */
 #undef silk_SMULBT
-static OAC_INLINE oac_int32 silk_SMULBT_armv5e(oac_int32 a, oac_int32 b)
-{
-  int res;
-  __asm__(
-      "#silk_SMULBT\n\t"
-      "smulbt %0, %1, %2\n\t"
-      : "=r"(res)
-      : "r"(a), "r"(b)
-  );
-  return res;
+static OAC_INLINE oac_int32 silk_SMULBT_armv5e(oac_int32 a, oac_int32 b) {
+    int res;
+    __asm__ (
+        "#silk_SMULBT\n\t"
+        "smulbt %0, %1, %2\n\t"
+        : "=r" (res)
+        : "r" (a), "r" (b)
+        );
+    return res;
 }
 #define silk_SMULBT(a, b) (silk_SMULBT_armv5e(a, b))
 
 /* a32 + (oac_int32)((oac_int16)(b32)) * (c32 >> 16) */
 #undef silk_SMLABT
 static OAC_INLINE oac_int32 silk_SMLABT_armv5e(oac_int32 a, oac_int32 b,
- oac_int32 c)
-{
-  int res;
-  __asm__(
-      "#silk_SMLABT\n\t"
-      "smlabt %0, %1, %2, %3\n\t"
-      : "=r"(res)
-      : "r"(b), "r"(c), "r"(a)
-  );
-  return res;
+                                               oac_int32 c) {
+    int res;
+    __asm__ (
+        "#silk_SMLABT\n\t"
+        "smlabt %0, %1, %2, %3\n\t"
+        : "=r" (res)
+        : "r" (b), "r" (c), "r" (a)
+        );
+    return res;
 }
 #define silk_SMLABT(a, b, c) (silk_SMLABT_armv5e(a, b, c))
 
 /* add/subtract with output saturated */
 #undef silk_ADD_SAT32
-static OAC_INLINE oac_int32 silk_ADD_SAT32_armv5e(oac_int32 a, oac_int32 b)
-{
-  int res;
-  __asm__(
-      "#silk_ADD_SAT32\n\t"
-      "qadd %0, %1, %2\n\t"
-      : "=r"(res)
-      : "%r"(a), "r"(b)
-  );
-  return res;
+static OAC_INLINE oac_int32 silk_ADD_SAT32_armv5e(oac_int32 a, oac_int32 b) {
+    int res;
+    __asm__ (
+        "#silk_ADD_SAT32\n\t"
+        "qadd %0, %1, %2\n\t"
+        : "=r" (res)
+        : "%r" (a), "r" (b)
+        );
+    return res;
 }
 #define silk_ADD_SAT32(a, b) (silk_ADD_SAT32_armv5e(a, b))
 
 #undef silk_SUB_SAT32
-static OAC_INLINE oac_int32 silk_SUB_SAT32_armv5e(oac_int32 a, oac_int32 b)
-{
-  int res;
-  __asm__(
-      "#silk_SUB_SAT32\n\t"
-      "qsub %0, %1, %2\n\t"
-      : "=r"(res)
-      : "r"(a), "r"(b)
-  );
-  return res;
+static OAC_INLINE oac_int32 silk_SUB_SAT32_armv5e(oac_int32 a, oac_int32 b) {
+    int res;
+    __asm__ (
+        "#silk_SUB_SAT32\n\t"
+        "qsub %0, %1, %2\n\t"
+        : "=r" (res)
+        : "r" (a), "r" (b)
+        );
+    return res;
 }
 #define silk_SUB_SAT32(a, b) (silk_SUB_SAT32_armv5e(a, b))
 
 #undef silk_CLZ16
-static OAC_INLINE oac_int32 silk_CLZ16_armv5(oac_int16 in16)
-{
-  int res;
-  __asm__(
-      "#silk_CLZ16\n\t"
-      "clz %0, %1;\n"
-      : "=r"(res)
-      : "r"(SAFE_SHL(in16,16)|0x8000)
-  );
-  return res;
+static OAC_INLINE oac_int32 silk_CLZ16_armv5(oac_int16 in16) {
+    int res;
+    __asm__ (
+        "#silk_CLZ16\n\t"
+        "clz %0, %1;\n"
+        : "=r" (res)
+        : "r" (SAFE_SHL(in16, 16)|0x8000)
+        );
+    return res;
 }
 #define silk_CLZ16(in16) (silk_CLZ16_armv5(in16))
 
 #undef silk_CLZ32
-static OAC_INLINE oac_int32 silk_CLZ32_armv5(oac_int32 in32)
-{
-  int res;
-  __asm__(
-      "#silk_CLZ32\n\t"
-      "clz %0, %1\n\t"
-      : "=r"(res)
-      : "r"(in32)
-  );
-  return res;
+static OAC_INLINE oac_int32 silk_CLZ32_armv5(oac_int32 in32) {
+    int res;
+    __asm__ (
+        "#silk_CLZ32\n\t"
+        "clz %0, %1\n\t"
+        : "=r" (res)
+        : "r" (in32)
+        );
+    return res;
 }
 #define silk_CLZ32(in32) (silk_CLZ32_armv5(in32))
 
diff --git a/silk/biquad_alt.c b/silk/biquad_alt.c
index 472d43ea1..e715f8ef4 100644
--- a/silk/biquad_alt.c
+++ b/silk/biquad_alt.c
@@ -1,39 +1,39 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 /*                                                                      *
- * silk_biquad_alt.c                                              *
- *                                                                      *
- * Second order ARMA filter                                             *
- * Can handle slowly varying filter coefficients                        *
- *                                                                      */
+* silk_biquad_alt.c                                              *
+*                                                                      *
+* Second order ARMA filter                                             *
+* Can handle slowly varying filter coefficients                        *
+*                                                                      */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -45,20 +45,19 @@ void silk_biquad_alt_stride1(
     const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
     oac_int32                  *S,                 /* I/O   State vector [2]                                           */
     oac_int16                  *out,               /* O     output signal                                              */
-    const oac_int32            len                 /* I     signal length (must be even)                               */
-)
-{
+    const oac_int32 len                            /* I     signal length (must be even)                               */
+    ) {
     /* DIRECT FORM II TRANSPOSED (uses 2 element state vector) */
-    oac_int   k;
+    oac_int k;
     oac_int32 inval, A0_U_Q28, A0_L_Q28, A1_U_Q28, A1_L_Q28, out32_Q14;
 
     /* Negate A_Q28 values and split in two parts */
-    A0_L_Q28 = ( -A_Q28[ 0 ] ) & 0x00003FFF;        /* lower part */
+    A0_L_Q28 = (-A_Q28[ 0 ])&0x00003FFF;            /* lower part */
     A0_U_Q28 = silk_RSHIFT( -A_Q28[ 0 ], 14 );      /* upper part */
-    A1_L_Q28 = ( -A_Q28[ 1 ] ) & 0x00003FFF;        /* lower part */
+    A1_L_Q28 = (-A_Q28[ 1 ])&0x00003FFF;            /* lower part */
     A1_U_Q28 = silk_RSHIFT( -A_Q28[ 1 ], 14 );      /* upper part */
 
-    for( k = 0; k < len; k++ ) {
+    for (k = 0; k < len; k++) {
         /* S[ 0 ], S[ 1 ]: Q12 */
         inval = in[ k ];
         out32_Q14 = silk_LSHIFT( silk_SMLAWB( S[ 0 ], B_Q28[ 0 ], inval ), 2 );
@@ -72,7 +71,7 @@ void silk_biquad_alt_stride1(
         S[ 1 ] = silk_SMLAWB( S[ 1 ], B_Q28[ 2 ], inval );
 
         /* Scale back to Q0 and saturate */
-        out[ k ] = (oac_int16)silk_SAT16( silk_RSHIFT( out32_Q14 + (1<<14) - 1, 14 ) );
+        out[ k ] = (oac_int16)silk_SAT16( silk_RSHIFT( out32_Q14 + (1<<14) - 1, 14 ));
     }
 }
 
@@ -82,40 +81,39 @@ void silk_biquad_alt_stride2_c(
     const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
     oac_int32                  *S,                 /* I/O   State vector [4]                                           */
     oac_int16                  *out,               /* O     output signal                                              */
-    const oac_int32            len                 /* I     signal length (must be even)                               */
-)
-{
+    const oac_int32 len                            /* I     signal length (must be even)                               */
+    ) {
     /* DIRECT FORM II TRANSPOSED (uses 2 element state vector) */
-    oac_int   k;
+    oac_int k;
     oac_int32 A0_U_Q28, A0_L_Q28, A1_U_Q28, A1_L_Q28, out32_Q14[ 2 ];
 
     /* Negate A_Q28 values and split in two parts */
-    A0_L_Q28 = ( -A_Q28[ 0 ] ) & 0x00003FFF;        /* lower part */
+    A0_L_Q28 = (-A_Q28[ 0 ])&0x00003FFF;            /* lower part */
     A0_U_Q28 = silk_RSHIFT( -A_Q28[ 0 ], 14 );      /* upper part */
-    A1_L_Q28 = ( -A_Q28[ 1 ] ) & 0x00003FFF;        /* lower part */
+    A1_L_Q28 = (-A_Q28[ 1 ])&0x00003FFF;            /* lower part */
     A1_U_Q28 = silk_RSHIFT( -A_Q28[ 1 ], 14 );      /* upper part */
 
-    for( k = 0; k < len; k++ ) {
+    for (k = 0; k < len; k++) {
         /* S[ 0 ], S[ 1 ], S[ 2 ], S[ 3 ]: Q12 */
-        out32_Q14[ 0 ] = silk_LSHIFT( silk_SMLAWB( S[ 0 ], B_Q28[ 0 ], in[ 2 * k + 0 ] ), 2 );
-        out32_Q14[ 1 ] = silk_LSHIFT( silk_SMLAWB( S[ 2 ], B_Q28[ 0 ], in[ 2 * k + 1 ] ), 2 );
+        out32_Q14[ 0 ] = silk_LSHIFT( silk_SMLAWB( S[ 0 ], B_Q28[ 0 ], in[ 2*k + 0 ] ), 2 );
+        out32_Q14[ 1 ] = silk_LSHIFT( silk_SMLAWB( S[ 2 ], B_Q28[ 0 ], in[ 2*k + 1 ] ), 2 );
 
         S[ 0 ] = S[ 1 ] + silk_RSHIFT_ROUND( silk_SMULWB( out32_Q14[ 0 ], A0_L_Q28 ), 14 );
         S[ 2 ] = S[ 3 ] + silk_RSHIFT_ROUND( silk_SMULWB( out32_Q14[ 1 ], A0_L_Q28 ), 14 );
         S[ 0 ] = silk_SMLAWB( S[ 0 ], out32_Q14[ 0 ], A0_U_Q28 );
         S[ 2 ] = silk_SMLAWB( S[ 2 ], out32_Q14[ 1 ], A0_U_Q28 );
-        S[ 0 ] = silk_SMLAWB( S[ 0 ], B_Q28[ 1 ], in[ 2 * k + 0 ] );
-        S[ 2 ] = silk_SMLAWB( S[ 2 ], B_Q28[ 1 ], in[ 2 * k + 1 ] );
+        S[ 0 ] = silk_SMLAWB( S[ 0 ], B_Q28[ 1 ], in[ 2*k + 0 ] );
+        S[ 2 ] = silk_SMLAWB( S[ 2 ], B_Q28[ 1 ], in[ 2*k + 1 ] );
 
         S[ 1 ] = silk_RSHIFT_ROUND( silk_SMULWB( out32_Q14[ 0 ], A1_L_Q28 ), 14 );
         S[ 3 ] = silk_RSHIFT_ROUND( silk_SMULWB( out32_Q14[ 1 ], A1_L_Q28 ), 14 );
         S[ 1 ] = silk_SMLAWB( S[ 1 ], out32_Q14[ 0 ], A1_U_Q28 );
         S[ 3 ] = silk_SMLAWB( S[ 3 ], out32_Q14[ 1 ], A1_U_Q28 );
-        S[ 1 ] = silk_SMLAWB( S[ 1 ], B_Q28[ 2 ], in[ 2 * k + 0 ] );
-        S[ 3 ] = silk_SMLAWB( S[ 3 ], B_Q28[ 2 ], in[ 2 * k + 1 ] );
+        S[ 1 ] = silk_SMLAWB( S[ 1 ], B_Q28[ 2 ], in[ 2*k + 0 ] );
+        S[ 3 ] = silk_SMLAWB( S[ 3 ], B_Q28[ 2 ], in[ 2*k + 1 ] );
 
         /* Scale back to Q0 and saturate */
-        out[ 2 * k + 0 ] = (oac_int16)silk_SAT16( silk_RSHIFT( out32_Q14[ 0 ] + (1<<14) - 1, 14 ) );
-        out[ 2 * k + 1 ] = (oac_int16)silk_SAT16( silk_RSHIFT( out32_Q14[ 1 ] + (1<<14) - 1, 14 ) );
+        out[ 2*k + 0 ] = (oac_int16)silk_SAT16( silk_RSHIFT( out32_Q14[ 0 ] + (1<<14) - 1, 14 ));
+        out[ 2*k + 1 ] = (oac_int16)silk_SAT16( silk_RSHIFT( out32_Q14[ 1 ] + (1<<14) - 1, 14 ));
     }
 }
diff --git a/silk/bwexpander.c b/silk/bwexpander.c
index d4b8b060c..7d3552332 100644
--- a/silk/bwexpander.c
+++ b/silk/bwexpander.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -34,16 +34,15 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Chirp (bandwidth expand) LP AR filter */
 void silk_bwexpander(
     oac_int16                  *ar,                /* I/O  AR filter to be expanded (without leading 1)                */
-    const oac_int              d,                  /* I    Length of ar                                                */
-    oac_int32                  chirp_Q16           /* I    Chirp factor (typically in the range 0 to 1)                */
-)
-{
-    oac_int   i;
+    const oac_int d,                               /* I    Length of ar                                                */
+    oac_int32 chirp_Q16                            /* I    Chirp factor (typically in the range 0 to 1)                */
+    ) {
+    oac_int i;
     oac_int32 chirp_minus_one_Q16 = chirp_Q16 - 65536;
 
     /* NB: Dont use silk_SMULWB, instead of silk_RSHIFT_ROUND( silk_MUL(), 16 ), below.  */
     /* Bias in silk_SMULWB can lead to unstable filters                                */
-    for( i = 0; i < d - 1; i++ ) {
+    for (i = 0; i < d - 1; i++) {
         ar[ i ]    = (oac_int16)silk_RSHIFT_ROUND( silk_MUL( chirp_Q16, ar[ i ]             ), 16 );
         chirp_Q16 +=             silk_RSHIFT_ROUND( silk_MUL( chirp_Q16, chirp_minus_one_Q16 ), 16 );
     }
diff --git a/silk/bwexpander_32.c b/silk/bwexpander_32.c
index 266f7b29a..9f30c0346 100644
--- a/silk/bwexpander_32.c
+++ b/silk/bwexpander_32.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -35,14 +35,13 @@ POSSIBILITY OF SUCH DAMAGE.
    This logic is reused in _celt_lpc(). Any bug fixes should also be applied there. */
 void silk_bwexpander_32(
     oac_int32                  *ar,                /* I/O  AR filter to be expanded (without leading 1)                */
-    const oac_int              d,                  /* I    Length of ar                                                */
-    oac_int32                  chirp_Q16           /* I    Chirp factor in Q16                                         */
-)
-{
-    oac_int   i;
+    const oac_int d,                               /* I    Length of ar                                                */
+    oac_int32 chirp_Q16                            /* I    Chirp factor in Q16                                         */
+    ) {
+    oac_int i;
     oac_int32 chirp_minus_one_Q16 = chirp_Q16 - 65536;
 
-    for( i = 0; i < d - 1; i++ ) {
+    for (i = 0; i < d - 1; i++) {
         ar[ i ]    = silk_SMULWW( chirp_Q16, ar[ i ] );
         chirp_Q16 += silk_RSHIFT_ROUND( silk_MUL( chirp_Q16, chirp_minus_one_Q16 ), 16 );
     }
diff --git a/silk/check_control_input.c b/silk/check_control_input.c
index b5c749fc5..cfe278f9d 100644
--- a/silk/check_control_input.c
+++ b/silk/check_control_input.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -36,71 +36,70 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Check encoder control struct */
 oac_int check_control_input(
     silk_EncControlStruct        *encControl                    /* I    Control structure                           */
-)
-{
+    ) {
     celt_assert( encControl != NULL );
 
-    if( ( ( encControl->API_sampleRate            !=  8000 ) &&
-          ( encControl->API_sampleRate            != 12000 ) &&
-          ( encControl->API_sampleRate            != 16000 ) &&
-          ( encControl->API_sampleRate            != 24000 ) &&
-          ( encControl->API_sampleRate            != 32000 ) &&
-          ( encControl->API_sampleRate            != 44100 ) &&
+    if (((encControl->API_sampleRate            !=  8000)
+         && (encControl->API_sampleRate            != 12000)
+         && (encControl->API_sampleRate            != 16000)
+         && (encControl->API_sampleRate            != 24000)
+         && (encControl->API_sampleRate            != 32000)
+         && (encControl->API_sampleRate            != 44100) &&
 #ifdef ENABLE_QEXT
-          ( encControl->API_sampleRate            != 96000 ) &&
+         (encControl->API_sampleRate            != 96000) &&
 #endif
-          ( encControl->API_sampleRate            != 48000 ) ) ||
-        ( ( encControl->desiredInternalSampleRate !=  8000 ) &&
-          ( encControl->desiredInternalSampleRate != 12000 ) &&
-          ( encControl->desiredInternalSampleRate != 16000 ) ) ||
-        ( ( encControl->maxInternalSampleRate     !=  8000 ) &&
-          ( encControl->maxInternalSampleRate     != 12000 ) &&
-          ( encControl->maxInternalSampleRate     != 16000 ) ) ||
-        ( ( encControl->minInternalSampleRate     !=  8000 ) &&
-          ( encControl->minInternalSampleRate     != 12000 ) &&
-          ( encControl->minInternalSampleRate     != 16000 ) ) ||
-          ( encControl->minInternalSampleRate > encControl->desiredInternalSampleRate ) ||
-          ( encControl->maxInternalSampleRate < encControl->desiredInternalSampleRate ) ||
-          ( encControl->minInternalSampleRate > encControl->maxInternalSampleRate ) ) {
+         (encControl->API_sampleRate            != 48000))
+        || ((encControl->desiredInternalSampleRate !=  8000)
+            && (encControl->desiredInternalSampleRate != 12000)
+            && (encControl->desiredInternalSampleRate != 16000))
+        || ((encControl->maxInternalSampleRate     !=  8000)
+            && (encControl->maxInternalSampleRate     != 12000)
+            && (encControl->maxInternalSampleRate     != 16000))
+        || ((encControl->minInternalSampleRate     !=  8000)
+            && (encControl->minInternalSampleRate     != 12000)
+            && (encControl->minInternalSampleRate     != 16000))
+        || (encControl->minInternalSampleRate > encControl->desiredInternalSampleRate)
+        || (encControl->maxInternalSampleRate < encControl->desiredInternalSampleRate)
+        || (encControl->minInternalSampleRate > encControl->maxInternalSampleRate)) {
         celt_assert( 0 );
         return SILK_ENC_FS_NOT_SUPPORTED;
     }
-    if( encControl->payloadSize_ms != 10 &&
-        encControl->payloadSize_ms != 20 &&
-        encControl->payloadSize_ms != 40 &&
-        encControl->payloadSize_ms != 60 ) {
+    if (encControl->payloadSize_ms != 10
+        && encControl->payloadSize_ms != 20
+        && encControl->payloadSize_ms != 40
+        && encControl->payloadSize_ms != 60) {
         celt_assert( 0 );
         return SILK_ENC_PACKET_SIZE_NOT_SUPPORTED;
     }
-    if( encControl->packetLossPercentage < 0 || encControl->packetLossPercentage > 100 ) {
+    if (encControl->packetLossPercentage < 0 || encControl->packetLossPercentage > 100) {
         celt_assert( 0 );
         return SILK_ENC_INVALID_LOSS_RATE;
     }
-    if( encControl->useDTX < 0 || encControl->useDTX > 1 ) {
+    if (encControl->useDTX < 0 || encControl->useDTX > 1) {
         celt_assert( 0 );
         return SILK_ENC_INVALID_DTX_SETTING;
     }
-    if( encControl->useCBR < 0 || encControl->useCBR > 1 ) {
+    if (encControl->useCBR < 0 || encControl->useCBR > 1) {
         celt_assert( 0 );
         return SILK_ENC_INVALID_CBR_SETTING;
     }
-    if( encControl->useInBandFEC < 0 || encControl->useInBandFEC > 1 ) {
+    if (encControl->useInBandFEC < 0 || encControl->useInBandFEC > 1) {
         celt_assert( 0 );
         return SILK_ENC_INVALID_INBAND_FEC_SETTING;
     }
-    if( encControl->nChannelsAPI < 1 || encControl->nChannelsAPI > ENCODER_NUM_CHANNELS ) {
+    if (encControl->nChannelsAPI < 1 || encControl->nChannelsAPI > ENCODER_NUM_CHANNELS) {
         celt_assert( 0 );
         return SILK_ENC_INVALID_NUMBER_OF_CHANNELS_ERROR;
     }
-    if( encControl->nChannelsInternal < 1 || encControl->nChannelsInternal > ENCODER_NUM_CHANNELS ) {
+    if (encControl->nChannelsInternal < 1 || encControl->nChannelsInternal > ENCODER_NUM_CHANNELS) {
         celt_assert( 0 );
         return SILK_ENC_INVALID_NUMBER_OF_CHANNELS_ERROR;
     }
-    if( encControl->nChannelsInternal > encControl->nChannelsAPI ) {
+    if (encControl->nChannelsInternal > encControl->nChannelsAPI) {
         celt_assert( 0 );
         return SILK_ENC_INVALID_NUMBER_OF_CHANNELS_ERROR;
     }
-    if( encControl->complexity < 0 || encControl->complexity > 10 ) {
+    if (encControl->complexity < 0 || encControl->complexity > 10) {
         celt_assert( 0 );
         return SILK_ENC_INVALID_COMPLEXITY_SETTING;
     }
diff --git a/silk/code_signs.c b/silk/code_signs.c
index b73c14f19..7cd02418e 100644
--- a/silk/code_signs.c
+++ b/silk/code_signs.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -34,35 +34,34 @@ POSSIBILITY OF SUCH DAMAGE.
 /*#define silk_enc_map(a)                ((a) > 0 ? 1 : 0)*/
 /*#define silk_dec_map(a)                ((a) > 0 ? 1 : -1)*/
 /* shifting avoids if-statement */
-#define silk_enc_map(a)                  ( silk_RSHIFT( (a), 15 ) + 1 )
-#define silk_dec_map(a)                  ( silk_LSHIFT( (a),  1 ) - 1 )
+#define silk_enc_map(a)                  (silk_RSHIFT((a), 15 ) + 1)
+#define silk_dec_map(a)                  (silk_LSHIFT((a),  1 ) - 1)
 
 /* Encodes signs of excitation */
 void silk_encode_signs(
     ec_enc                      *psRangeEnc,                        /* I/O  Compressor data structure                   */
-    const oac_int8             pulses[],                           /* I    pulse signal                                */
-    oac_int                    length,                             /* I    length of input                             */
-    const oac_int              signalType,                         /* I    Signal type                                 */
-    const oac_int              quantOffsetType,                    /* I    Quantization offset type                    */
-    const oac_int              sum_pulses[ MAX_NB_SHELL_BLOCKS ]   /* I    Sum of absolute pulses per block            */
-)
-{
-    oac_int         i, j, p;
-    oac_uint8       icdf[ 2 ];
+    const oac_int8 pulses[],                                       /* I    pulse signal                                */
+    oac_int length,                                                /* I    length of input                             */
+    const oac_int signalType,                                      /* I    Signal type                                 */
+    const oac_int quantOffsetType,                                 /* I    Quantization offset type                    */
+    const oac_int sum_pulses[ MAX_NB_SHELL_BLOCKS ]                /* I    Sum of absolute pulses per block            */
+    ) {
+    oac_int i, j, p;
+    oac_uint8 icdf[ 2 ];
     const oac_int8  *q_ptr;
     const oac_uint8 *icdf_ptr;
 
     icdf[ 1 ] = 0;
     q_ptr = pulses;
-    i = silk_SMULBB( 7, silk_ADD_LSHIFT( quantOffsetType, signalType, 1 ) );
+    i = silk_SMULBB( 7, silk_ADD_LSHIFT( quantOffsetType, signalType, 1 ));
     icdf_ptr = &silk_sign_iCDF[ i ];
     length = silk_RSHIFT( length + SHELL_CODEC_FRAME_LENGTH/2, LOG2_SHELL_CODEC_FRAME_LENGTH );
-    for( i = 0; i < length; i++ ) {
+    for (i = 0; i < length; i++) {
         p = sum_pulses[ i ];
-        if( p > 0 ) {
-            icdf[ 0 ] = icdf_ptr[ silk_min( p & 0x1F, 6 ) ];
-            for( j = 0; j < SHELL_CODEC_FRAME_LENGTH; j++ ) {
-                if( q_ptr[ j ] != 0 ) {
+        if (p > 0) {
+            icdf[ 0 ] = icdf_ptr[ silk_min( p&0x1F, 6 ) ];
+            for (j = 0; j < SHELL_CODEC_FRAME_LENGTH; j++) {
+                if (q_ptr[ j ] != 0) {
                     ec_enc_icdf( psRangeEnc, silk_enc_map( q_ptr[ j ]), icdf, 8 );
                 }
             }
@@ -74,38 +73,37 @@ void silk_encode_signs(
 /* Decodes signs of excitation */
 void silk_decode_signs(
     ec_dec                      *psRangeDec,                        /* I/O  Compressor data structure                   */
-    oac_int16                  pulses[],                           /* I/O  pulse signal                                */
-    oac_int                    length,                             /* I    length of input                             */
-    const oac_int              signalType,                         /* I    Signal type                                 */
-    const oac_int              quantOffsetType,                    /* I    Quantization offset type                    */
-    const oac_int              sum_pulses[ MAX_NB_SHELL_BLOCKS ]   /* I    Sum of absolute pulses per block            */
-)
-{
-    oac_int         i, j, p;
-    oac_uint8       icdf[ 2 ];
+    oac_int16 pulses[],                                            /* I/O  pulse signal                                */
+    oac_int length,                                                /* I    length of input                             */
+    const oac_int signalType,                                      /* I    Signal type                                 */
+    const oac_int quantOffsetType,                                 /* I    Quantization offset type                    */
+    const oac_int sum_pulses[ MAX_NB_SHELL_BLOCKS ]                /* I    Sum of absolute pulses per block            */
+    ) {
+    oac_int i, j, p;
+    oac_uint8 icdf[ 2 ];
     oac_int16       *q_ptr;
     const oac_uint8 *icdf_ptr;
 
     icdf[ 1 ] = 0;
     q_ptr = pulses;
-    i = silk_SMULBB( 7, silk_ADD_LSHIFT( quantOffsetType, signalType, 1 ) );
+    i = silk_SMULBB( 7, silk_ADD_LSHIFT( quantOffsetType, signalType, 1 ));
     icdf_ptr = &silk_sign_iCDF[ i ];
     length = silk_RSHIFT( length + SHELL_CODEC_FRAME_LENGTH/2, LOG2_SHELL_CODEC_FRAME_LENGTH );
-    for( i = 0; i < length; i++ ) {
+    for (i = 0; i < length; i++) {
         p = sum_pulses[ i ];
-        if( p > 0 ) {
-            icdf[ 0 ] = icdf_ptr[ silk_min( p & 0x1F, 6 ) ];
-            for( j = 0; j < SHELL_CODEC_FRAME_LENGTH; j++ ) {
-                if( q_ptr[ j ] > 0 ) {
+        if (p > 0) {
+            icdf[ 0 ] = icdf_ptr[ silk_min( p&0x1F, 6 ) ];
+            for (j = 0; j < SHELL_CODEC_FRAME_LENGTH; j++) {
+                if (q_ptr[ j ] > 0) {
                     /* attach sign */
 #if 0
                     /* conditional implementation */
-                    if( ec_dec_icdf( psRangeDec, icdf, 8 ) == 0 ) {
+                    if (ec_dec_icdf( psRangeDec, icdf, 8 ) == 0) {
                         q_ptr[ j ] = -q_ptr[ j ];
                     }
 #else
                     /* implementation with shift, subtraction, multiplication */
-                    q_ptr[ j ] *= silk_dec_map( ec_dec_icdf( psRangeDec, icdf, 8 ) );
+                    q_ptr[ j ] *= silk_dec_map( ec_dec_icdf( psRangeDec, icdf, 8 ));
 #endif
                 }
             }
diff --git a/silk/control.h b/silk/control.h
index 86038032d..d3c247d90 100644
--- a/silk/control.h
+++ b/silk/control.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_CONTROL_H
@@ -148,7 +148,7 @@ typedef struct {
     /* I: OSCE method */
     oac_int osce_method;
 
-#ifdef ENABLE_OSCE_BWE
+# ifdef ENABLE_OSCE_BWE
     /* I: OSCE bandwidth extension method */
     oac_int enable_osce_bwe;
 
@@ -157,7 +157,7 @@ typedef struct {
 
     /* O: previous extended mode */
     oac_int prev_osce_extended_mode;
-#endif
+# endif
 #endif
 } silk_DecControlStruct;
 
diff --git a/silk/control_SNR.c b/silk/control_SNR.c
index 834cf4671..79f9ef903 100644
--- a/silk/control_SNR.c
+++ b/silk/control_SNR.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -38,73 +38,72 @@ POSSIBILITY OF SUCH DAMAGE.
    These tables were obtained by running different SNRs through the
    encoder and measuring the active bitrate. */
 static const unsigned char silk_TargetRate_NB_21[117 - 10] = {
-                                              0, 15, 39, 52, 61, 68,
-     74, 79, 84, 88, 92, 95, 99,102,105,108,111,114,117,119,122,124,
-    126,129,131,133,135,137,139,142,143,145,147,149,151,153,155,157,
-    158,160,162,163,165,167,168,170,171,173,174,176,177,179,180,182,
-    183,185,186,187,189,190,192,193,194,196,197,199,200,201,203,204,
-    205,207,208,209,211,212,213,215,216,217,219,220,221,223,224,225,
-    227,228,230,231,232,234,235,236,238,239,241,242,243,245,246,248,
-    249,250,252,253,255
+    0, 15, 39, 52, 61, 68,
+    74, 79, 84, 88, 92, 95, 99, 102, 105, 108, 111, 114, 117, 119, 122, 124,
+    126, 129, 131, 133, 135, 137, 139, 142, 143, 145, 147, 149, 151, 153, 155, 157,
+    158, 160, 162, 163, 165, 167, 168, 170, 171, 173, 174, 176, 177, 179, 180, 182,
+    183, 185, 186, 187, 189, 190, 192, 193, 194, 196, 197, 199, 200, 201, 203, 204,
+    205, 207, 208, 209, 211, 212, 213, 215, 216, 217, 219, 220, 221, 223, 224, 225,
+    227, 228, 230, 231, 232, 234, 235, 236, 238, 239, 241, 242, 243, 245, 246, 248,
+    249, 250, 252, 253, 255
 };
 
 static const unsigned char silk_TargetRate_MB_21[165 - 10] = {
-                                              0,  0, 28, 43, 52, 59,
-     65, 70, 74, 78, 81, 85, 87, 90, 93, 95, 98,100,102,105,107,109,
-    111,113,115,116,118,120,122,123,125,127,128,130,131,133,134,136,
-    137,138,140,141,143,144,145,147,148,149,151,152,153,154,156,157,
-    158,159,160,162,163,164,165,166,167,168,169,171,172,173,174,175,
-    176,177,178,179,180,181,182,183,184,185,186,187,188,188,189,190,
-    191,192,193,194,195,196,197,198,199,200,201,202,203,203,204,205,
-    206,207,208,209,210,211,212,213,214,214,215,216,217,218,219,220,
-    221,222,223,224,224,225,226,227,228,229,230,231,232,233,234,235,
-    236,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,
-    251,252,253,254,255
+    0,  0, 28, 43, 52, 59,
+    65, 70, 74, 78, 81, 85, 87, 90, 93, 95, 98, 100, 102, 105, 107, 109,
+    111, 113, 115, 116, 118, 120, 122, 123, 125, 127, 128, 130, 131, 133, 134, 136,
+    137, 138, 140, 141, 143, 144, 145, 147, 148, 149, 151, 152, 153, 154, 156, 157,
+    158, 159, 160, 162, 163, 164, 165, 166, 167, 168, 169, 171, 172, 173, 174, 175,
+    176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 188, 189, 190,
+    191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 203, 204, 205,
+    206, 207, 208, 209, 210, 211, 212, 213, 214, 214, 215, 216, 217, 218, 219, 220,
+    221, 222, 223, 224, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235,
+    236, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250,
+    251, 252, 253, 254, 255
 };
 
 static const unsigned char silk_TargetRate_WB_21[201 - 10] = {
-                                              0,  0,  0,  8, 29, 41,
-     49, 56, 62, 66, 70, 74, 77, 80, 83, 86, 88, 91, 93, 95, 97, 99,
-    101,103,105,107,108,110,112,113,115,116,118,119,121,122,123,125,
-    126,127,129,130,131,132,134,135,136,137,138,140,141,142,143,144,
-    145,146,147,148,149,150,151,152,153,154,156,157,158,159,159,160,
-    161,162,163,164,165,166,167,168,169,170,171,171,172,173,174,175,
-    176,177,177,178,179,180,181,181,182,183,184,185,185,186,187,188,
-    189,189,190,191,192,192,193,194,195,195,196,197,198,198,199,200,
-    200,201,202,203,203,204,205,206,206,207,208,209,209,210,211,211,
-    212,213,214,214,215,216,216,217,218,219,219,220,221,221,222,223,
-    224,224,225,226,226,227,228,229,229,230,231,232,232,233,234,234,
-    235,236,237,237,238,239,240,240,241,242,243,243,244,245,246,246,
-    247,248,249,249,250,251,252,253,255
+    0,  0,  0,  8, 29, 41,
+    49, 56, 62, 66, 70, 74, 77, 80, 83, 86, 88, 91, 93, 95, 97, 99,
+    101, 103, 105, 107, 108, 110, 112, 113, 115, 116, 118, 119, 121, 122, 123, 125,
+    126, 127, 129, 130, 131, 132, 134, 135, 136, 137, 138, 140, 141, 142, 143, 144,
+    145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 156, 157, 158, 159, 159, 160,
+    161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 171, 172, 173, 174, 175,
+    176, 177, 177, 178, 179, 180, 181, 181, 182, 183, 184, 185, 185, 186, 187, 188,
+    189, 189, 190, 191, 192, 192, 193, 194, 195, 195, 196, 197, 198, 198, 199, 200,
+    200, 201, 202, 203, 203, 204, 205, 206, 206, 207, 208, 209, 209, 210, 211, 211,
+    212, 213, 214, 214, 215, 216, 216, 217, 218, 219, 219, 220, 221, 221, 222, 223,
+    224, 224, 225, 226, 226, 227, 228, 229, 229, 230, 231, 232, 232, 233, 234, 234,
+    235, 236, 237, 237, 238, 239, 240, 240, 241, 242, 243, 243, 244, 245, 246, 246,
+    247, 248, 249, 249, 250, 251, 252, 253, 255
 };
 
 /* Control SNR of residual quantizer */
 oac_int silk_control_SNR(
     silk_encoder_state          *psEncC,                        /* I/O  Pointer to Silk encoder state               */
-    oac_int32                  TargetRate_bps                  /* I    Target max bitrate (bps)                    */
-)
-{
+    oac_int32 TargetRate_bps                                   /* I    Target max bitrate (bps)                    */
+    ) {
     int id;
     int bound;
     const unsigned char *snr_table;
 
     psEncC->TargetRate_bps = TargetRate_bps;
-    if( psEncC->nb_subfr == 2 ) {
+    if (psEncC->nb_subfr == 2) {
         TargetRate_bps -= 2000 + psEncC->fs_kHz/16;
     }
-    if( psEncC->fs_kHz == 8 ) {
+    if (psEncC->fs_kHz == 8) {
         bound = sizeof(silk_TargetRate_NB_21);
         snr_table = silk_TargetRate_NB_21;
-    } else if( psEncC->fs_kHz == 12 ) {
+    } else if (psEncC->fs_kHz == 12) {
         bound = sizeof(silk_TargetRate_MB_21);
         snr_table = silk_TargetRate_MB_21;
     } else {
         bound = sizeof(silk_TargetRate_WB_21);
         snr_table = silk_TargetRate_WB_21;
     }
-    id = (TargetRate_bps+200)/400;
-    id = silk_min(id - 10, bound-1);
-    if( id <= 0 ) {
+    id = (TargetRate_bps + 200)/400;
+    id = silk_min(id - 10, bound - 1);
+    if (id <= 0) {
         psEncC->SNR_dB_Q7 = 0;
     } else {
         psEncC->SNR_dB_Q7 = snr_table[id]*21;
diff --git a/silk/control_audio_bandwidth.c b/silk/control_audio_bandwidth.c
index 82e704d52..4590d6f58 100644
--- a/silk/control_audio_bandwidth.c
+++ b/silk/control_audio_bandwidth.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -36,24 +36,23 @@ POSSIBILITY OF SUCH DAMAGE.
 oac_int silk_control_audio_bandwidth(
     silk_encoder_state          *psEncC,                        /* I/O  Pointer to Silk encoder state               */
     silk_EncControlStruct       *encControl                     /* I    Control structure                           */
-)
-{
-    oac_int   fs_kHz;
-    oac_int   orig_kHz;
+    ) {
+    oac_int fs_kHz;
+    oac_int orig_kHz;
     oac_int32 fs_Hz;
 
     orig_kHz = psEncC->fs_kHz;
     /* Handle a bandwidth-switching reset where we need to be aware what the last sampling rate was. */
-    if( orig_kHz == 0 ) {
+    if (orig_kHz == 0) {
         orig_kHz = psEncC->sLP.saved_fs_kHz;
     }
     fs_kHz = orig_kHz;
     fs_Hz = silk_SMULBB( fs_kHz, 1000 );
-    if( fs_Hz == 0 ) {
+    if (fs_Hz == 0) {
         /* Encoder has just been initialized */
         fs_Hz  = silk_min( psEncC->desiredInternal_fs_Hz, psEncC->API_fs_Hz );
         fs_kHz = silk_DIV32_16( fs_Hz, 1000 );
-    } else if( fs_Hz > psEncC->API_fs_Hz || fs_Hz > psEncC->maxInternal_fs_Hz || fs_Hz < psEncC->minInternal_fs_Hz ) {
+    } else if (fs_Hz > psEncC->API_fs_Hz || fs_Hz > psEncC->maxInternal_fs_Hz || fs_Hz < psEncC->minInternal_fs_Hz) {
         /* Make sure internal rate is not higher than external rate or maximum allowed, or lower than minimum allowed */
         fs_Hz  = psEncC->API_fs_Hz;
         fs_Hz  = silk_min( fs_Hz, psEncC->maxInternal_fs_Hz );
@@ -61,45 +60,42 @@ oac_int silk_control_audio_bandwidth(
         fs_kHz = silk_DIV32_16( fs_Hz, 1000 );
     } else {
         /* State machine for the internal sampling rate switching */
-        if( psEncC->sLP.transition_frame_no >= TRANSITION_FRAMES ) {
+        if (psEncC->sLP.transition_frame_no >= TRANSITION_FRAMES) {
             /* Stop transition phase */
             psEncC->sLP.mode = 0;
         }
-        if( psEncC->allow_bandwidth_switch || encControl->oacCanSwitch ) {
+        if (psEncC->allow_bandwidth_switch || encControl->oacCanSwitch) {
             /* Check if we should switch down */
-            if( silk_SMULBB( orig_kHz, 1000 ) > psEncC->desiredInternal_fs_Hz )
-            {
+            if (silk_SMULBB( orig_kHz, 1000 ) > psEncC->desiredInternal_fs_Hz) {
                 /* Switch down */
-                if( psEncC->sLP.mode == 0 ) {
+                if (psEncC->sLP.mode == 0) {
                     /* New transition */
                     psEncC->sLP.transition_frame_no = TRANSITION_FRAMES;
 
                     /* Reset transition filter state */
-                    silk_memset( psEncC->sLP.In_LP_State, 0, sizeof( psEncC->sLP.In_LP_State ) );
+                    silk_memset( psEncC->sLP.In_LP_State, 0, sizeof(psEncC->sLP.In_LP_State));
                 }
-                if( encControl->oacCanSwitch ) {
+                if (encControl->oacCanSwitch) {
                     /* Stop transition phase */
                     psEncC->sLP.mode = 0;
 
                     /* Switch to a lower sample frequency */
                     fs_kHz = orig_kHz == 16 ? 12 : 8;
                 } else {
-                   if( psEncC->sLP.transition_frame_no <= 0 ) {
-                       encControl->switchReady = 1;
-                       /* Make room for redundancy */
-                       encControl->maxBits -= encControl->maxBits * 5 / ( encControl->payloadSize_ms + 5 );
-                   } else {
-                       /* Direction: down (at double speed) */
-                       psEncC->sLP.mode = -2;
-                   }
+                    if (psEncC->sLP.transition_frame_no <= 0) {
+                        encControl->switchReady = 1;
+                        /* Make room for redundancy */
+                        encControl->maxBits -= encControl->maxBits*5/(encControl->payloadSize_ms + 5);
+                    } else {
+                        /* Direction: down (at double speed) */
+                        psEncC->sLP.mode = -2;
+                    }
                 }
-            }
-            else
+            } else
             /* Check if we should switch up */
-            if( silk_SMULBB( orig_kHz, 1000 ) < psEncC->desiredInternal_fs_Hz )
-            {
+            if (silk_SMULBB( orig_kHz, 1000 ) < psEncC->desiredInternal_fs_Hz) {
                 /* Switch up */
-                if( encControl->oacCanSwitch ) {
+                if (encControl->oacCanSwitch) {
                     /* Switch to a higher sample frequency */
                     fs_kHz = orig_kHz == 8 ? 12 : 16;
 
@@ -107,23 +103,23 @@ oac_int silk_control_audio_bandwidth(
                     psEncC->sLP.transition_frame_no = 0;
 
                     /* Reset transition filter state */
-                    silk_memset( psEncC->sLP.In_LP_State, 0, sizeof( psEncC->sLP.In_LP_State ) );
+                    silk_memset( psEncC->sLP.In_LP_State, 0, sizeof(psEncC->sLP.In_LP_State));
 
                     /* Direction: up */
                     psEncC->sLP.mode = 1;
                 } else {
-                   if( psEncC->sLP.mode == 0 ) {
-                       encControl->switchReady = 1;
-                       /* Make room for redundancy */
-                       encControl->maxBits -= encControl->maxBits * 5 / ( encControl->payloadSize_ms + 5 );
-                   } else {
-                       /* Direction: up */
-                       psEncC->sLP.mode = 1;
-                   }
+                    if (psEncC->sLP.mode == 0) {
+                        encControl->switchReady = 1;
+                        /* Make room for redundancy */
+                        encControl->maxBits -= encControl->maxBits*5/(encControl->payloadSize_ms + 5);
+                    } else {
+                        /* Direction: up */
+                        psEncC->sLP.mode = 1;
+                    }
                 }
             } else {
-               if (psEncC->sLP.mode<0)
-                  psEncC->sLP.mode = 1;
+                if (psEncC->sLP.mode < 0)
+                    psEncC->sLP.mode = 1;
             }
         }
     }
diff --git a/silk/control_codec.c b/silk/control_codec.c
index 23ef68450..2a777db49 100644
--- a/silk/control_codec.c
+++ b/silk/control_codec.c
@@ -1,39 +1,39 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 #ifdef FIXED_POINT
-#include "main_FIX.h"
-#define silk_encoder_state_Fxx      silk_encoder_state_FIX
+# include "main_FIX.h"
+# define silk_encoder_state_Fxx      silk_encoder_state_FIX
 #else
-#include "main_FLP.h"
-#define silk_encoder_state_Fxx      silk_encoder_state_FLP
+# include "main_FLP.h"
+# define silk_encoder_state_Fxx      silk_encoder_state_FLP
 #endif
 #include "stack_alloc.h"
 #include "tuning_parameters.h"
@@ -41,36 +41,34 @@ POSSIBILITY OF SUCH DAMAGE.
 
 static oac_int silk_setup_resamplers(
     silk_encoder_state_Fxx          *psEnc,             /* I/O                      */
-    oac_int                        fs_kHz              /* I                        */
-);
+    oac_int fs_kHz                                     /* I                        */
+    );
 
 static oac_int silk_setup_fs(
     silk_encoder_state_Fxx          *psEnc,             /* I/O                      */
-    oac_int                        fs_kHz,             /* I                        */
-    oac_int                        PacketSize_ms       /* I                        */
-);
+    oac_int fs_kHz,                                    /* I                        */
+    oac_int PacketSize_ms                              /* I                        */
+    );
 
 static oac_int silk_setup_complexity(
     silk_encoder_state              *psEncC,            /* I/O                      */
-    oac_int                        Complexity          /* I                        */
-);
+    oac_int Complexity                                 /* I                        */
+    );
 
 static OAC_INLINE oac_int silk_setup_LBRR(
     silk_encoder_state              *psEncC,            /* I/O                      */
     const silk_EncControlStruct     *encControl         /* I                        */
-);
+    );
 
 
 /* Control encoder */
 oac_int silk_control_encoder(
     silk_encoder_state_Fxx          *psEnc,                                 /* I/O  Pointer to Silk encoder state                                               */
     silk_EncControlStruct           *encControl,                            /* I    Control structure                                                           */
-    const oac_int                  allow_bw_switch,                        /* I    Flag to allow switching audio bandwidth                                     */
-    const oac_int                  channelNb,                              /* I    Channel number                                                              */
-    const oac_int                  force_fs_kHz
-)
-{
-    oac_int   fs_kHz, ret = 0;
+    const oac_int allow_bw_switch,                                         /* I    Flag to allow switching audio bandwidth                                     */
+    const oac_int channelNb,                                               /* I    Channel number                                                              */
+    const oac_int force_fs_kHz) {
+    oac_int fs_kHz, ret = 0;
 
     psEnc->sCmn.useDTX                 = encControl->useDTX;
     psEnc->sCmn.useCBR                 = encControl->useCBR;
@@ -84,8 +82,8 @@ oac_int silk_control_encoder(
     psEnc->sCmn.allow_bandwidth_switch = allow_bw_switch;
     psEnc->sCmn.channelNb              = channelNb;
 
-    if( psEnc->sCmn.controlled_since_last_payload != 0 && psEnc->sCmn.prefillFlag == 0 ) {
-        if( psEnc->sCmn.API_fs_Hz != psEnc->sCmn.prev_API_fs_Hz && psEnc->sCmn.fs_kHz > 0 ) {
+    if (psEnc->sCmn.controlled_since_last_payload != 0 && psEnc->sCmn.prefillFlag == 0) {
+        if (psEnc->sCmn.API_fs_Hz != psEnc->sCmn.prev_API_fs_Hz && psEnc->sCmn.fs_kHz > 0) {
             /* Change in API sampling rate in the middle of encoding a packet */
             ret += silk_setup_resamplers( psEnc, psEnc->sCmn.fs_kHz );
         }
@@ -98,8 +96,8 @@ oac_int silk_control_encoder(
     /* Determine internal sampling rate         */
     /********************************************/
     fs_kHz = silk_control_audio_bandwidth( &psEnc->sCmn, encControl );
-    if( force_fs_kHz ) {
-       fs_kHz = force_fs_kHz;
+    if (force_fs_kHz) {
+        fs_kHz = force_fs_kHz;
     }
     /********************************************/
     /* Prepare resampler and buffered data      */
@@ -133,17 +131,15 @@ oac_int silk_control_encoder(
 
 static oac_int silk_setup_resamplers(
     silk_encoder_state_Fxx          *psEnc,             /* I/O                      */
-    oac_int                         fs_kHz              /* I                        */
-)
-{
-    oac_int   ret = SILK_NO_ERROR;
+    oac_int fs_kHz                                      /* I                        */
+    ) {
+    oac_int ret = SILK_NO_ERROR;
     SAVE_STACK;
 
-    if( psEnc->sCmn.fs_kHz != fs_kHz || psEnc->sCmn.prev_API_fs_Hz != psEnc->sCmn.API_fs_Hz )
-    {
-        if( psEnc->sCmn.fs_kHz == 0 ) {
+    if (psEnc->sCmn.fs_kHz != fs_kHz || psEnc->sCmn.prev_API_fs_Hz != psEnc->sCmn.API_fs_Hz) {
+        if (psEnc->sCmn.fs_kHz == 0) {
             /* Initialize the resampler for enc_API.c preparing resampling from API_fs_Hz to fs_kHz */
-            ret += silk_resampler_init( &psEnc->sCmn.resampler_state, psEnc->sCmn.API_fs_Hz, fs_kHz * 1000, 1 );
+            ret += silk_resampler_init( &psEnc->sCmn.resampler_state, psEnc->sCmn.API_fs_Hz, fs_kHz*1000, 1 );
         } else {
             VARDECL( oac_int16, x_buf_API_fs_Hz );
             VARDECL( silk_resampler_state_struct, temp_resampler_state );
@@ -157,11 +153,11 @@ static oac_int silk_setup_resamplers(
             oac_int32 old_buf_samples;
             oac_int32 buf_length_ms;
 
-            buf_length_ms = silk_LSHIFT( psEnc->sCmn.nb_subfr * 5, 1 ) + LA_SHAPE_MS;
-            old_buf_samples = buf_length_ms * psEnc->sCmn.fs_kHz;
+            buf_length_ms = silk_LSHIFT( psEnc->sCmn.nb_subfr*5, 1 ) + LA_SHAPE_MS;
+            old_buf_samples = buf_length_ms*psEnc->sCmn.fs_kHz;
 
 #ifndef FIXED_POINT
-            new_buf_samples = buf_length_ms * fs_kHz;
+            new_buf_samples = buf_length_ms*fs_kHz;
             ALLOC( x_bufFIX, silk_max( old_buf_samples, new_buf_samples ),
                    oac_int16 );
             silk_float2short_array( x_bufFIX, psEnc->x_buf, old_buf_samples );
@@ -169,17 +165,19 @@ static oac_int silk_setup_resamplers(
 
             /* Initialize resampler for temporary resampling of x_buf data to API_fs_Hz */
             ALLOC( temp_resampler_state, 1, silk_resampler_state_struct );
-            ret += silk_resampler_init( temp_resampler_state, silk_SMULBB( psEnc->sCmn.fs_kHz, 1000 ), psEnc->sCmn.API_fs_Hz, 0 );
+            ret += silk_resampler_init( temp_resampler_state, silk_SMULBB( psEnc->sCmn.fs_kHz, 1000 ),
+            psEnc->sCmn.API_fs_Hz, 0 );
 
             /* Calculate number of samples to temporarily upsample */
-            api_buf_samples = buf_length_ms * silk_DIV32_16( psEnc->sCmn.API_fs_Hz, 1000 );
+            api_buf_samples = buf_length_ms*silk_DIV32_16( psEnc->sCmn.API_fs_Hz, 1000 );
 
             /* Temporary resampling of x_buf data to API_fs_Hz */
             ALLOC( x_buf_API_fs_Hz, api_buf_samples, oac_int16 );
             ret += silk_resampler( temp_resampler_state, x_buf_API_fs_Hz, x_bufFIX, old_buf_samples );
 
             /* Initialize the resampler for enc_API.c preparing resampling from API_fs_Hz to fs_kHz */
-            ret += silk_resampler_init( &psEnc->sCmn.resampler_state, psEnc->sCmn.API_fs_Hz, silk_SMULBB( fs_kHz, 1000 ), 1 );
+            ret += silk_resampler_init( &psEnc->sCmn.resampler_state, psEnc->sCmn.API_fs_Hz,
+            silk_SMULBB( fs_kHz, 1000 ), 1 );
 
             /* Correct resampler state by resampling buffered data from API_fs_Hz to fs_kHz */
             ret += silk_resampler( &psEnc->sCmn.resampler_state, x_bufFIX, x_buf_API_fs_Hz, api_buf_samples );
@@ -198,26 +196,25 @@ static oac_int silk_setup_resamplers(
 
 static oac_int silk_setup_fs(
     silk_encoder_state_Fxx          *psEnc,             /* I/O                      */
-    oac_int                        fs_kHz,             /* I                        */
-    oac_int                        PacketSize_ms       /* I                        */
-)
-{
+    oac_int fs_kHz,                                    /* I                        */
+    oac_int PacketSize_ms                              /* I                        */
+    ) {
     oac_int ret = SILK_NO_ERROR;
 
     /* Set packet size */
-    if( PacketSize_ms != psEnc->sCmn.PacketSize_ms ) {
-        if( ( PacketSize_ms !=  10 ) &&
-            ( PacketSize_ms !=  20 ) &&
-            ( PacketSize_ms !=  40 ) &&
-            ( PacketSize_ms !=  60 ) ) {
+    if (PacketSize_ms != psEnc->sCmn.PacketSize_ms) {
+        if ((PacketSize_ms !=  10)
+            && (PacketSize_ms !=  20)
+            && (PacketSize_ms !=  40)
+            && (PacketSize_ms !=  60)) {
             ret = SILK_ENC_PACKET_SIZE_NOT_SUPPORTED;
         }
-        if( PacketSize_ms <= 10 ) {
+        if (PacketSize_ms <= 10) {
             psEnc->sCmn.nFramesPerPacket = 1;
             psEnc->sCmn.nb_subfr = PacketSize_ms == 10 ? 2 : 1;
             psEnc->sCmn.frame_length = silk_SMULBB( PacketSize_ms, fs_kHz );
             psEnc->sCmn.pitch_LPC_win_length = silk_SMULBB( FIND_PITCH_LPC_WIN_MS_2_SF, fs_kHz );
-            if( psEnc->sCmn.fs_kHz == 8 ) {
+            if (psEnc->sCmn.fs_kHz == 8) {
                 psEnc->sCmn.pitch_contour_iCDF = silk_pitch_contour_10_ms_NB_iCDF;
             } else {
                 psEnc->sCmn.pitch_contour_iCDF = silk_pitch_contour_10_ms_iCDF;
@@ -227,7 +224,7 @@ static oac_int silk_setup_fs(
             psEnc->sCmn.nb_subfr = MAX_NB_SUBFR;
             psEnc->sCmn.frame_length = silk_SMULBB( 20, fs_kHz );
             psEnc->sCmn.pitch_LPC_win_length = silk_SMULBB( FIND_PITCH_LPC_WIN_MS, fs_kHz );
-            if( psEnc->sCmn.fs_kHz == 8 ) {
+            if (psEnc->sCmn.fs_kHz == 8) {
                 psEnc->sCmn.pitch_contour_iCDF = silk_pitch_contour_NB_iCDF;
             } else {
                 psEnc->sCmn.pitch_contour_iCDF = silk_pitch_contour_iCDF;
@@ -240,12 +237,12 @@ static oac_int silk_setup_fs(
     /* Set internal sampling frequency */
     celt_assert( fs_kHz == 8 || fs_kHz == 12 || fs_kHz == 16 );
     celt_assert( psEnc->sCmn.nb_subfr == 2 || psEnc->sCmn.nb_subfr == 4 );
-    if( psEnc->sCmn.fs_kHz != fs_kHz ) {
+    if (psEnc->sCmn.fs_kHz != fs_kHz) {
         /* reset part of the state */
-        silk_memset( &psEnc->sShape,               0, sizeof( psEnc->sShape ) );
-        silk_memset( &psEnc->sCmn.sNSQ,            0, sizeof( psEnc->sCmn.sNSQ ) );
-        silk_memset( psEnc->sCmn.prev_NLSFq_Q15,   0, sizeof( psEnc->sCmn.prev_NLSFq_Q15 ) );
-        silk_memset( &psEnc->sCmn.sLP.In_LP_State, 0, sizeof( psEnc->sCmn.sLP.In_LP_State ) );
+        silk_memset( &psEnc->sShape,               0, sizeof(psEnc->sShape));
+        silk_memset( &psEnc->sCmn.sNSQ,            0, sizeof(psEnc->sCmn.sNSQ));
+        silk_memset( psEnc->sCmn.prev_NLSFq_Q15,   0, sizeof(psEnc->sCmn.prev_NLSFq_Q15));
+        silk_memset( &psEnc->sCmn.sLP.In_LP_State, 0, sizeof(psEnc->sCmn.sLP.In_LP_State));
         psEnc->sCmn.inputBufIx                  = 0;
         psEnc->sCmn.nFramesEncoded              = 0;
         psEnc->sCmn.TargetRate_bps              = 0;     /* trigger new SNR computation */
@@ -259,39 +256,39 @@ static oac_int silk_setup_fs(
         psEnc->sCmn.prevSignalType              = TYPE_NO_VOICE_ACTIVITY;
 
         psEnc->sCmn.fs_kHz = fs_kHz;
-        if( psEnc->sCmn.fs_kHz == 8 ) {
-            if( psEnc->sCmn.nb_subfr == MAX_NB_SUBFR ) {
+        if (psEnc->sCmn.fs_kHz == 8) {
+            if (psEnc->sCmn.nb_subfr == MAX_NB_SUBFR) {
                 psEnc->sCmn.pitch_contour_iCDF = silk_pitch_contour_NB_iCDF;
             } else {
                 psEnc->sCmn.pitch_contour_iCDF = silk_pitch_contour_10_ms_NB_iCDF;
             }
         } else {
-            if( psEnc->sCmn.nb_subfr == MAX_NB_SUBFR ) {
+            if (psEnc->sCmn.nb_subfr == MAX_NB_SUBFR) {
                 psEnc->sCmn.pitch_contour_iCDF = silk_pitch_contour_iCDF;
             } else {
                 psEnc->sCmn.pitch_contour_iCDF = silk_pitch_contour_10_ms_iCDF;
             }
         }
-        if( psEnc->sCmn.fs_kHz == 8 || psEnc->sCmn.fs_kHz == 12 ) {
+        if (psEnc->sCmn.fs_kHz == 8 || psEnc->sCmn.fs_kHz == 12) {
             psEnc->sCmn.predictLPCOrder = MIN_LPC_ORDER;
             psEnc->sCmn.psNLSF_CB  = &silk_NLSF_CB_NB_MB;
         } else {
             psEnc->sCmn.predictLPCOrder = MAX_LPC_ORDER;
             psEnc->sCmn.psNLSF_CB  = &silk_NLSF_CB_WB;
         }
-        psEnc->sCmn.subfr_length   = SUB_FRAME_LENGTH_MS * fs_kHz;
+        psEnc->sCmn.subfr_length   = SUB_FRAME_LENGTH_MS*fs_kHz;
         psEnc->sCmn.frame_length   = silk_SMULBB( psEnc->sCmn.subfr_length, psEnc->sCmn.nb_subfr );
         psEnc->sCmn.ltp_mem_length = silk_SMULBB( LTP_MEM_LENGTH_MS, fs_kHz );
         psEnc->sCmn.la_pitch       = silk_SMULBB( LA_PITCH_MS, fs_kHz );
         psEnc->sCmn.max_pitch_lag  = silk_SMULBB( 18, fs_kHz );
-        if( psEnc->sCmn.nb_subfr == MAX_NB_SUBFR ) {
+        if (psEnc->sCmn.nb_subfr == MAX_NB_SUBFR) {
             psEnc->sCmn.pitch_LPC_win_length = silk_SMULBB( FIND_PITCH_LPC_WIN_MS, fs_kHz );
         } else {
             psEnc->sCmn.pitch_LPC_win_length = silk_SMULBB( FIND_PITCH_LPC_WIN_MS_2_SF, fs_kHz );
         }
-        if( psEnc->sCmn.fs_kHz == 16 ) {
+        if (psEnc->sCmn.fs_kHz == 16) {
             psEnc->sCmn.pitch_lag_low_bits_iCDF = silk_uniform8_iCDF;
-        } else if( psEnc->sCmn.fs_kHz == 12 ) {
+        } else if (psEnc->sCmn.fs_kHz == 12) {
             psEnc->sCmn.pitch_lag_low_bits_iCDF = silk_uniform6_iCDF;
         } else {
             psEnc->sCmn.pitch_lag_low_bits_iCDF = silk_uniform4_iCDF;
@@ -299,95 +296,94 @@ static oac_int silk_setup_fs(
     }
 
     /* Check that settings are valid */
-    celt_assert( ( psEnc->sCmn.subfr_length * psEnc->sCmn.nb_subfr ) == psEnc->sCmn.frame_length );
+    celt_assert((psEnc->sCmn.subfr_length*psEnc->sCmn.nb_subfr) == psEnc->sCmn.frame_length );
 
     return ret;
 }
 
 static oac_int silk_setup_complexity(
     silk_encoder_state              *psEncC,            /* I/O                      */
-    oac_int                        Complexity          /* I                        */
-)
-{
+    oac_int Complexity                                 /* I                        */
+    ) {
     oac_int ret = 0;
 
     /* Set encoding complexity */
     celt_assert( Complexity >= 0 && Complexity <= 10 );
-    if( Complexity < 1 ) {
+    if (Complexity < 1) {
         psEncC->pitchEstimationComplexity       = SILK_PE_MIN_COMPLEX;
         psEncC->pitchEstimationThreshold_Q16    = SILK_FIX_CONST( 0.8, 16 );
         psEncC->pitchEstimationLPCOrder         = 6;
         psEncC->shapingLPCOrder                 = 12;
-        psEncC->la_shape                        = 3 * psEncC->fs_kHz;
+        psEncC->la_shape                        = 3*psEncC->fs_kHz;
         psEncC->nStatesDelayedDecision          = 1;
         psEncC->useInterpolatedNLSFs            = 0;
         psEncC->NLSF_MSVQ_Survivors             = 2;
         psEncC->warping_Q16                     = 0;
-    } else if( Complexity < 2 ) {
+    } else if (Complexity < 2) {
         psEncC->pitchEstimationComplexity       = SILK_PE_MID_COMPLEX;
         psEncC->pitchEstimationThreshold_Q16    = SILK_FIX_CONST( 0.76, 16 );
         psEncC->pitchEstimationLPCOrder         = 8;
         psEncC->shapingLPCOrder                 = 14;
-        psEncC->la_shape                        = 5 * psEncC->fs_kHz;
+        psEncC->la_shape                        = 5*psEncC->fs_kHz;
         psEncC->nStatesDelayedDecision          = 1;
         psEncC->useInterpolatedNLSFs            = 0;
         psEncC->NLSF_MSVQ_Survivors             = 3;
         psEncC->warping_Q16                     = 0;
-    } else if( Complexity < 3 ) {
+    } else if (Complexity < 3) {
         psEncC->pitchEstimationComplexity       = SILK_PE_MIN_COMPLEX;
         psEncC->pitchEstimationThreshold_Q16    = SILK_FIX_CONST( 0.8, 16 );
         psEncC->pitchEstimationLPCOrder         = 6;
         psEncC->shapingLPCOrder                 = 12;
-        psEncC->la_shape                        = 3 * psEncC->fs_kHz;
+        psEncC->la_shape                        = 3*psEncC->fs_kHz;
         psEncC->nStatesDelayedDecision          = 2;
         psEncC->useInterpolatedNLSFs            = 0;
         psEncC->NLSF_MSVQ_Survivors             = 2;
         psEncC->warping_Q16                     = 0;
-    } else if( Complexity < 4 ) {
+    } else if (Complexity < 4) {
         psEncC->pitchEstimationComplexity       = SILK_PE_MID_COMPLEX;
         psEncC->pitchEstimationThreshold_Q16    = SILK_FIX_CONST( 0.76, 16 );
         psEncC->pitchEstimationLPCOrder         = 8;
         psEncC->shapingLPCOrder                 = 14;
-        psEncC->la_shape                        = 5 * psEncC->fs_kHz;
+        psEncC->la_shape                        = 5*psEncC->fs_kHz;
         psEncC->nStatesDelayedDecision          = 2;
         psEncC->useInterpolatedNLSFs            = 0;
         psEncC->NLSF_MSVQ_Survivors             = 4;
         psEncC->warping_Q16                     = 0;
-    } else if( Complexity < 6 ) {
+    } else if (Complexity < 6) {
         psEncC->pitchEstimationComplexity       = SILK_PE_MID_COMPLEX;
         psEncC->pitchEstimationThreshold_Q16    = SILK_FIX_CONST( 0.74, 16 );
         psEncC->pitchEstimationLPCOrder         = 10;
         psEncC->shapingLPCOrder                 = 16;
-        psEncC->la_shape                        = 5 * psEncC->fs_kHz;
+        psEncC->la_shape                        = 5*psEncC->fs_kHz;
         psEncC->nStatesDelayedDecision          = 2;
         psEncC->useInterpolatedNLSFs            = 1;
         psEncC->NLSF_MSVQ_Survivors             = 6;
-        psEncC->warping_Q16                     = psEncC->fs_kHz * SILK_FIX_CONST( WARPING_MULTIPLIER, 16 );
-    } else if( Complexity < 8 ) {
+        psEncC->warping_Q16                     = psEncC->fs_kHz*SILK_FIX_CONST( WARPING_MULTIPLIER, 16 );
+    } else if (Complexity < 8) {
         psEncC->pitchEstimationComplexity       = SILK_PE_MID_COMPLEX;
         psEncC->pitchEstimationThreshold_Q16    = SILK_FIX_CONST( 0.72, 16 );
         psEncC->pitchEstimationLPCOrder         = 12;
         psEncC->shapingLPCOrder                 = 20;
-        psEncC->la_shape                        = 5 * psEncC->fs_kHz;
+        psEncC->la_shape                        = 5*psEncC->fs_kHz;
         psEncC->nStatesDelayedDecision          = 3;
         psEncC->useInterpolatedNLSFs            = 1;
         psEncC->NLSF_MSVQ_Survivors             = 8;
-        psEncC->warping_Q16                     = psEncC->fs_kHz * SILK_FIX_CONST( WARPING_MULTIPLIER, 16 );
+        psEncC->warping_Q16                     = psEncC->fs_kHz*SILK_FIX_CONST( WARPING_MULTIPLIER, 16 );
     } else {
         psEncC->pitchEstimationComplexity       = SILK_PE_MAX_COMPLEX;
         psEncC->pitchEstimationThreshold_Q16    = SILK_FIX_CONST( 0.7, 16 );
         psEncC->pitchEstimationLPCOrder         = 16;
         psEncC->shapingLPCOrder                 = 24;
-        psEncC->la_shape                        = 5 * psEncC->fs_kHz;
+        psEncC->la_shape                        = 5*psEncC->fs_kHz;
         psEncC->nStatesDelayedDecision          = MAX_DEL_DEC_STATES;
         psEncC->useInterpolatedNLSFs            = 1;
         psEncC->NLSF_MSVQ_Survivors             = 16;
-        psEncC->warping_Q16                     = psEncC->fs_kHz * SILK_FIX_CONST( WARPING_MULTIPLIER, 16 );
+        psEncC->warping_Q16                     = psEncC->fs_kHz*SILK_FIX_CONST( WARPING_MULTIPLIER, 16 );
     }
 
     /* Do not allow higher pitch estimation LPC order than predict LPC order */
     psEncC->pitchEstimationLPCOrder = silk_min_int( psEncC->pitchEstimationLPCOrder, psEncC->predictLPCOrder );
-    psEncC->shapeWinLength          = SUB_FRAME_LENGTH_MS * psEncC->fs_kHz + 2 * psEncC->la_shape;
+    psEncC->shapeWinLength          = SUB_FRAME_LENGTH_MS*psEncC->fs_kHz + 2*psEncC->la_shape;
     psEncC->Complexity              = Complexity;
 
     celt_assert( psEncC->pitchEstimationLPCOrder <= MAX_FIND_PITCH_LPC_ORDER );
@@ -403,19 +399,19 @@ static oac_int silk_setup_complexity(
 static OAC_INLINE oac_int silk_setup_LBRR(
     silk_encoder_state          *psEncC,            /* I/O                      */
     const silk_EncControlStruct *encControl         /* I                        */
-)
-{
-    oac_int   LBRR_in_previous_packet, ret = SILK_NO_ERROR;
+    ) {
+    oac_int LBRR_in_previous_packet, ret = SILK_NO_ERROR;
 
     LBRR_in_previous_packet = psEncC->LBRR_enabled;
     psEncC->LBRR_enabled = encControl->LBRR_coded;
-    if( psEncC->LBRR_enabled ) {
+    if (psEncC->LBRR_enabled) {
         /* Set gain increase for coding LBRR excitation */
-        if( LBRR_in_previous_packet == 0 ) {
+        if (LBRR_in_previous_packet == 0) {
             /* Previous packet did not have LBRR, and was therefore coded at a higher bitrate */
             psEncC->LBRR_GainIncreases = 7;
         } else {
-            psEncC->LBRR_GainIncreases = silk_max_int( 7 - silk_SMULWB( (oac_int32)psEncC->PacketLoss_perc, SILK_FIX_CONST( 0.2, 16 ) ), 3 );
+            psEncC->LBRR_GainIncreases = silk_max_int( 7 - silk_SMULWB((oac_int32)psEncC->PacketLoss_perc,
+            SILK_FIX_CONST( 0.2, 16 )), 3 );
         }
     }
 
diff --git a/silk/debug.c b/silk/debug.c
index d90fa612d..dc2bbb47b 100644
--- a/silk/debug.c
+++ b/silk/debug.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 typedef int prevent_empty_translation_unit_warning;
@@ -34,20 +34,19 @@ typedef int prevent_empty_translation_unit_warning;
 #include "debug.h"
 
 #if SILK_DEBUG || SILK_TIC_TOC
-#include "SigProc_FIX.h"
+# include "SigProc_FIX.h"
 #endif
 
 #if SILK_TIC_TOC
 
-#if (defined(_WIN32) || defined(_WINCE))
-#include <windows.h>    /* timer */
-#else   /* Linux or Mac*/
-#include <sys/time.h>
-#endif
+# if (defined(_WIN32) || defined(_WINCE))
+#  include <windows.h>  /* timer */
+# else   /* Linux or Mac*/
+#  include <sys/time.h>
+# endif
 
-#ifdef _WIN32
-unsigned long silk_GetHighResolutionTime(void) /* O  time in usec*/
-{
+# ifdef _WIN32
+unsigned long silk_GetHighResolutionTime(void) { /* O  time in usec*/
     /* Returns a time counter in microsec   */
     /* the resolution is platform dependent */
     /* but is typically 1.62 us resolution  */
@@ -55,36 +54,33 @@ unsigned long silk_GetHighResolutionTime(void) /* O  time in usec*/
     LARGE_INTEGER lpFrequency;
     QueryPerformanceCounter(&lpPerformanceCount);
     QueryPerformanceFrequency(&lpFrequency);
-    return (unsigned long)((1000000*(lpPerformanceCount.QuadPart)) / lpFrequency.QuadPart);
+    return (unsigned long)((1000000*(lpPerformanceCount.QuadPart))/lpFrequency.QuadPart);
 }
-#else   /* Linux or Mac*/
-unsigned long GetHighResolutionTime(void) /* O  time in usec*/
-{
+# else   /* Linux or Mac*/
+unsigned long GetHighResolutionTime(void) { /* O  time in usec*/
     struct timeval tv;
     gettimeofday(&tv, 0);
-    return((tv.tv_sec*1000000)+(tv.tv_usec));
+    return (tv.tv_sec*1000000) + (tv.tv_usec);
 }
-#endif
+# endif
 
-int           silk_Timer_nTimers = 0;
-int           silk_Timer_depth_ctr = 0;
-char          silk_Timer_tags[silk_NUM_TIMERS_MAX][silk_NUM_TIMERS_MAX_TAG_LEN];
-#ifdef _WIN32
+int silk_Timer_nTimers = 0;
+int silk_Timer_depth_ctr = 0;
+char silk_Timer_tags[silk_NUM_TIMERS_MAX][silk_NUM_TIMERS_MAX_TAG_LEN];
+# ifdef _WIN32
 LARGE_INTEGER silk_Timer_start[silk_NUM_TIMERS_MAX];
-#else
+# else
 unsigned long silk_Timer_start[silk_NUM_TIMERS_MAX];
-#endif
-unsigned int  silk_Timer_cnt[silk_NUM_TIMERS_MAX];
-oac_int64     silk_Timer_min[silk_NUM_TIMERS_MAX];
-oac_int64     silk_Timer_sum[silk_NUM_TIMERS_MAX];
-oac_int64     silk_Timer_max[silk_NUM_TIMERS_MAX];
-oac_int64     silk_Timer_depth[silk_NUM_TIMERS_MAX];
+# endif
+unsigned int silk_Timer_cnt[silk_NUM_TIMERS_MAX];
+oac_int64 silk_Timer_min[silk_NUM_TIMERS_MAX];
+oac_int64 silk_Timer_sum[silk_NUM_TIMERS_MAX];
+oac_int64 silk_Timer_max[silk_NUM_TIMERS_MAX];
+oac_int64 silk_Timer_depth[silk_NUM_TIMERS_MAX];
 
-#ifdef _WIN32
-void silk_TimerSave(char *file_name)
-{
-    if( silk_Timer_nTimers > 0 )
-    {
+# ifdef _WIN32
+void silk_TimerSave(char *file_name) {
+    if (silk_Timer_nTimers > 0) {
         int k;
         FILE *fp;
         LARGE_INTEGER lpFrequency;
@@ -92,24 +88,24 @@ void silk_TimerSave(char *file_name)
         int del = 0x7FFFFFFF;
         double avg, sum_avg;
         /* estimate overhead of calling performance counters */
-        for( k = 0; k < 1000; k++ ) {
+        for (k = 0; k < 1000; k++) {
             QueryPerformanceCounter(&lpPerformanceCount1);
             QueryPerformanceCounter(&lpPerformanceCount2);
             lpPerformanceCount2.QuadPart -= lpPerformanceCount1.QuadPart;
-            if( (int)lpPerformanceCount2.LowPart < del )
+            if ((int)lpPerformanceCount2.LowPart < del)
                 del = lpPerformanceCount2.LowPart;
         }
         QueryPerformanceFrequency(&lpFrequency);
         /* print results to file */
         sum_avg = 0.0f;
-        for( k = 0; k < silk_Timer_nTimers; k++ ) {
+        for (k = 0; k < silk_Timer_nTimers; k++) {
             if (silk_Timer_depth[k] == 0) {
-                sum_avg += (1e6 * silk_Timer_sum[k] / silk_Timer_cnt[k] - del) / lpFrequency.QuadPart * silk_Timer_cnt[k];
+                sum_avg += (1e6*silk_Timer_sum[k]/silk_Timer_cnt[k] - del)/lpFrequency.QuadPart*silk_Timer_cnt[k];
             }
         }
         fp = fopen(file_name, "w");
         fprintf(fp, "                                min         avg     %%         max      count\n");
-        for( k = 0; k < silk_Timer_nTimers; k++ ) {
+        for (k = 0; k < silk_Timer_nTimers; k++) {
             if (silk_Timer_depth[k] == 0) {
                 fprintf(fp, "%-28s", silk_Timer_tags[k]);
             } else if (silk_Timer_depth[k] == 1) {
@@ -121,28 +117,25 @@ void silk_TimerSave(char *file_name)
             } else {
                 fprintf(fp, "    %-24s", silk_Timer_tags[k]);
             }
-            avg = (1e6 * silk_Timer_sum[k] / silk_Timer_cnt[k] - del) / lpFrequency.QuadPart;
-            fprintf(fp, "%8.2f", (1e6 * (silk_max_64(silk_Timer_min[k] - del, 0))) / lpFrequency.QuadPart);
-            fprintf(fp, "%12.2f %6.2f", avg, 100.0 * avg / sum_avg * silk_Timer_cnt[k]);
-            fprintf(fp, "%12.2f", (1e6 * (silk_max_64(silk_Timer_max[k] - del, 0))) / lpFrequency.QuadPart);
+            avg = (1e6*silk_Timer_sum[k]/silk_Timer_cnt[k] - del)/lpFrequency.QuadPart;
+            fprintf(fp, "%8.2f", (1e6*(silk_max_64(silk_Timer_min[k] - del, 0)))/lpFrequency.QuadPart);
+            fprintf(fp, "%12.2f %6.2f", avg, 100.0*avg/sum_avg*silk_Timer_cnt[k]);
+            fprintf(fp, "%12.2f", (1e6*(silk_max_64(silk_Timer_max[k] - del, 0)))/lpFrequency.QuadPart);
             fprintf(fp, "%10d\n", silk_Timer_cnt[k]);
         }
         fprintf(fp, "                                microseconds\n");
         fclose(fp);
     }
 }
-#else
-void silk_TimerSave(char *file_name)
-{
-    if( silk_Timer_nTimers > 0 )
-    {
+# else
+void silk_TimerSave(char *file_name) {
+    if (silk_Timer_nTimers > 0) {
         int k;
         FILE *fp;
         /* print results to file */
         fp = fopen(file_name, "w");
         fprintf(fp, "                                min         avg         max      count\n");
-        for( k = 0; k < silk_Timer_nTimers; k++ )
-        {
+        for (k = 0; k < silk_Timer_nTimers; k++) {
             if (silk_Timer_depth[k] == 0) {
                 fprintf(fp, "%-28s", silk_Timer_tags[k]);
             } else if (silk_Timer_depth[k] == 1) {
@@ -155,7 +148,7 @@ void silk_TimerSave(char *file_name)
                 fprintf(fp, "    %-24s", silk_Timer_tags[k]);
             }
             fprintf(fp, "%d ", silk_Timer_min[k]);
-            fprintf(fp, "%f ", (double)silk_Timer_sum[k] / (double)silk_Timer_cnt[k]);
+            fprintf(fp, "%f ", (double)silk_Timer_sum[k]/(double)silk_Timer_cnt[k]);
             fprintf(fp, "%d ", silk_Timer_max[k]);
             fprintf(fp, "%10d\n", silk_Timer_cnt[k]);
         }
@@ -163,7 +156,7 @@ void silk_TimerSave(char *file_name)
         fclose(fp);
     }
 }
-#endif
+# endif
 
 #endif /* SILK_TIC_TOC */
 
diff --git a/silk/debug.h b/silk/debug.h
index 887c9adc3..931ad775d 100644
--- a/silk/debug.h
+++ b/silk/debug.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_DEBUG_H
@@ -37,9 +37,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #define SILK_TIC_TOC 0
 
 #if SILK_DEBUG || SILK_TIC_TOC
-#include "typedef.h"
-#include <string.h>     /* strcpy, strcmp */
-#include <stdio.h>      /* file writing */
+# include "typedef.h"
+# include <string.h>    /* strcpy, strcmp */
+# include <stdio.h>     /* file writing */
 #endif
 
 
@@ -47,11 +47,11 @@ POSSIBILITY OF SUCH DAMAGE.
 
 unsigned long GetHighResolutionTime(void); /* O  time in usec*/
 
-#if (defined(_WIN32) || defined(_WINCE))
-#include <windows.h>    /* timer */
-#else   /* Linux or Mac*/
-#include <sys/time.h>
-#endif
+# if (defined(_WIN32) || defined(_WINCE))
+#  include <windows.h>  /* timer */
+# else   /* Linux or Mac*/
+#  include <sys/time.h>
+# endif
 
 /*********************************/
 /* timer functions for profiling */
@@ -71,149 +71,149 @@ unsigned long GetHighResolutionTime(void); /* O  time in usec*/
 void silk_TimerSave(char *file_name);
 
 /* max number of timers (in different locations) */
-#define silk_NUM_TIMERS_MAX                  50
+# define silk_NUM_TIMERS_MAX                  50
 /* max length of name tags in TIC(..), TOC(..) */
-#define silk_NUM_TIMERS_MAX_TAG_LEN          30
+# define silk_NUM_TIMERS_MAX_TAG_LEN          30
 
-extern int           silk_Timer_nTimers;
-extern int           silk_Timer_depth_ctr;
-extern char          silk_Timer_tags[silk_NUM_TIMERS_MAX][silk_NUM_TIMERS_MAX_TAG_LEN];
-#ifdef _WIN32
+extern int silk_Timer_nTimers;
+extern int silk_Timer_depth_ctr;
+extern char silk_Timer_tags[silk_NUM_TIMERS_MAX][silk_NUM_TIMERS_MAX_TAG_LEN];
+# ifdef _WIN32
 extern LARGE_INTEGER silk_Timer_start[silk_NUM_TIMERS_MAX];
-#else
+# else
 extern unsigned long silk_Timer_start[silk_NUM_TIMERS_MAX];
-#endif
-extern unsigned int  silk_Timer_cnt[silk_NUM_TIMERS_MAX];
-extern oac_int64    silk_Timer_sum[silk_NUM_TIMERS_MAX];
-extern oac_int64    silk_Timer_max[silk_NUM_TIMERS_MAX];
-extern oac_int64    silk_Timer_min[silk_NUM_TIMERS_MAX];
-extern oac_int64    silk_Timer_depth[silk_NUM_TIMERS_MAX];
+# endif
+extern unsigned int silk_Timer_cnt[silk_NUM_TIMERS_MAX];
+extern oac_int64 silk_Timer_sum[silk_NUM_TIMERS_MAX];
+extern oac_int64 silk_Timer_max[silk_NUM_TIMERS_MAX];
+extern oac_int64 silk_Timer_min[silk_NUM_TIMERS_MAX];
+extern oac_int64 silk_Timer_depth[silk_NUM_TIMERS_MAX];
 
 /* WARNING: TIC()/TOC can measure only up to 0.1 seconds at a time */
-#ifdef _WIN32
-#define TIC(TAG_NAME) {                                     \
-    static int init = 0;                                    \
-    static int ID = -1;                                     \
-    if( init == 0 )                                         \
-    {                                                       \
-        int k;                                              \
-        init = 1;                                           \
-        for( k = 0; k < silk_Timer_nTimers; k++ ) {         \
-            if( strcmp(silk_Timer_tags[k], #TAG_NAME) == 0 ) { \
-                ID = k;                                     \
-                break;                                      \
-            }                                               \
-        }                                                   \
-        if (ID == -1) {                                     \
-            ID = silk_Timer_nTimers;                        \
-            silk_Timer_nTimers++;                           \
-            silk_Timer_depth[ID] = silk_Timer_depth_ctr;    \
-            strcpy(silk_Timer_tags[ID], #TAG_NAME);         \
-            silk_Timer_cnt[ID] = 0;                         \
-            silk_Timer_sum[ID] = 0;                         \
-            silk_Timer_min[ID] = 0xFFFFFFFF;                \
-            silk_Timer_max[ID] = 0;                         \
-        }                                                   \
-    }                                                       \
-    silk_Timer_depth_ctr++;                                 \
-    QueryPerformanceCounter(&silk_Timer_start[ID]);         \
+# ifdef _WIN32
+#  define TIC(TAG_NAME) {                                     \
+            static int init = 0;                                    \
+            static int ID = -1;                                     \
+            if (init == 0)                                         \
+            {                                                       \
+                int k;                                              \
+                init = 1;                                           \
+                for (k = 0; k < silk_Timer_nTimers; k++) {         \
+                    if (strcmp(silk_Timer_tags[k], #TAG_NAME) == 0) { \
+                        ID = k;                                     \
+                        break;                                      \
+                    }                                               \
+                }                                                   \
+                if (ID == -1) {                                     \
+                    ID = silk_Timer_nTimers;                        \
+                    silk_Timer_nTimers++;                           \
+                    silk_Timer_depth[ID] = silk_Timer_depth_ctr;    \
+                    strcpy(silk_Timer_tags[ID], #TAG_NAME);         \
+                    silk_Timer_cnt[ID] = 0;                         \
+                    silk_Timer_sum[ID] = 0;                         \
+                    silk_Timer_min[ID] = 0xFFFFFFFF;                \
+                    silk_Timer_max[ID] = 0;                         \
+                }                                                   \
+            }                                                       \
+            silk_Timer_depth_ctr++;                                 \
+            QueryPerformanceCounter(&silk_Timer_start[ID]);         \
 }
-#else
-#define TIC(TAG_NAME) {                                     \
-    static int init = 0;                                    \
-    static int ID = -1;                                     \
-    if( init == 0 )                                         \
-    {                                                       \
-        int k;                                              \
-        init = 1;                                           \
-        for( k = 0; k < silk_Timer_nTimers; k++ ) {         \
-        if( strcmp(silk_Timer_tags[k], #TAG_NAME) == 0 ) {  \
-                ID = k;                                     \
-                break;                                      \
-            }                                               \
-        }                                                   \
-        if (ID == -1) {                                     \
-            ID = silk_Timer_nTimers;                        \
-            silk_Timer_nTimers++;                           \
-            silk_Timer_depth[ID] = silk_Timer_depth_ctr;    \
-            strcpy(silk_Timer_tags[ID], #TAG_NAME);         \
-            silk_Timer_cnt[ID] = 0;                         \
-            silk_Timer_sum[ID] = 0;                         \
-            silk_Timer_min[ID] = 0xFFFFFFFF;                \
-            silk_Timer_max[ID] = 0;                         \
-        }                                                   \
-    }                                                       \
-    silk_Timer_depth_ctr++;                                 \
-    silk_Timer_start[ID] = GetHighResolutionTime();         \
+# else
+#  define TIC(TAG_NAME) {                                     \
+            static int init = 0;                                    \
+            static int ID = -1;                                     \
+            if (init == 0)                                         \
+            {                                                       \
+                int k;                                              \
+                init = 1;                                           \
+                for (k = 0; k < silk_Timer_nTimers; k++) {         \
+                    if (strcmp(silk_Timer_tags[k], #TAG_NAME) == 0) {  \
+                        ID = k;                                     \
+                        break;                                      \
+                    }                                               \
+                }                                                   \
+                if (ID == -1) {                                     \
+                    ID = silk_Timer_nTimers;                        \
+                    silk_Timer_nTimers++;                           \
+                    silk_Timer_depth[ID] = silk_Timer_depth_ctr;    \
+                    strcpy(silk_Timer_tags[ID], #TAG_NAME);         \
+                    silk_Timer_cnt[ID] = 0;                         \
+                    silk_Timer_sum[ID] = 0;                         \
+                    silk_Timer_min[ID] = 0xFFFFFFFF;                \
+                    silk_Timer_max[ID] = 0;                         \
+                }                                                   \
+            }                                                       \
+            silk_Timer_depth_ctr++;                                 \
+            silk_Timer_start[ID] = GetHighResolutionTime();         \
 }
-#endif
+# endif
 
-#ifdef _WIN32
-#define TOC(TAG_NAME) {                                             \
-    LARGE_INTEGER lpPerformanceCount;                               \
-    static int init = 0;                                            \
-    static int ID = 0;                                              \
-    if( init == 0 )                                                 \
-    {                                                               \
-        int k;                                                      \
-        init = 1;                                                   \
-        for( k = 0; k < silk_Timer_nTimers; k++ ) {                 \
-            if( strcmp(silk_Timer_tags[k], #TAG_NAME) == 0 ) {      \
-                ID = k;                                             \
-                break;                                              \
-            }                                                       \
-        }                                                           \
-    }                                                               \
-    QueryPerformanceCounter(&lpPerformanceCount);                   \
-    lpPerformanceCount.QuadPart -= silk_Timer_start[ID].QuadPart;   \
-    if((lpPerformanceCount.QuadPart < 100000000) &&                 \
-        (lpPerformanceCount.QuadPart >= 0)) {                       \
-        silk_Timer_cnt[ID]++;                                       \
-        silk_Timer_sum[ID] += lpPerformanceCount.QuadPart;          \
-        if( lpPerformanceCount.QuadPart > silk_Timer_max[ID] )      \
-            silk_Timer_max[ID] = lpPerformanceCount.QuadPart;       \
-        if( lpPerformanceCount.QuadPart < silk_Timer_min[ID] )      \
-            silk_Timer_min[ID] = lpPerformanceCount.QuadPart;       \
-    }                                                               \
-    silk_Timer_depth_ctr--;                                         \
+# ifdef _WIN32
+#  define TOC(TAG_NAME) {                                             \
+            LARGE_INTEGER lpPerformanceCount;                               \
+            static int init = 0;                                            \
+            static int ID = 0;                                              \
+            if (init == 0)                                                 \
+            {                                                               \
+                int k;                                                      \
+                init = 1;                                                   \
+                for (k = 0; k < silk_Timer_nTimers; k++) {                 \
+                    if (strcmp(silk_Timer_tags[k], #TAG_NAME) == 0) {      \
+                        ID = k;                                             \
+                        break;                                              \
+                    }                                                       \
+                }                                                           \
+            }                                                               \
+            QueryPerformanceCounter(&lpPerformanceCount);                   \
+            lpPerformanceCount.QuadPart -= silk_Timer_start[ID].QuadPart;   \
+            if ((lpPerformanceCount.QuadPart < 100000000) &&                 \
+                (lpPerformanceCount.QuadPart >= 0)) {                       \
+                silk_Timer_cnt[ID]++;                                       \
+                silk_Timer_sum[ID] += lpPerformanceCount.QuadPart;          \
+                if (lpPerformanceCount.QuadPart > silk_Timer_max[ID])      \
+                silk_Timer_max[ID] = lpPerformanceCount.QuadPart;       \
+                if (lpPerformanceCount.QuadPart < silk_Timer_min[ID])      \
+                silk_Timer_min[ID] = lpPerformanceCount.QuadPart;       \
+            }                                                               \
+            silk_Timer_depth_ctr--;                                         \
 }
-#else
-#define TOC(TAG_NAME) {                                             \
-    unsigned long endTime;                                          \
-    static int init = 0;                                            \
-    static int ID = 0;                                              \
-    if( init == 0 )                                                 \
-    {                                                               \
-        int k;                                                      \
-        init = 1;                                                   \
-        for( k = 0; k < silk_Timer_nTimers; k++ ) {                 \
-            if( strcmp(silk_Timer_tags[k], #TAG_NAME) == 0 ) {      \
-                ID = k;                                             \
-                break;                                              \
-            }                                                       \
-        }                                                           \
-    }                                                               \
-    endTime = GetHighResolutionTime();                              \
-    endTime -= silk_Timer_start[ID];                                \
-    if((endTime < 100000000) &&                                     \
-        (endTime >= 0)) {                                           \
-        silk_Timer_cnt[ID]++;                                       \
-        silk_Timer_sum[ID] += endTime;                              \
-        if( endTime > silk_Timer_max[ID] )                          \
-            silk_Timer_max[ID] = endTime;                           \
-        if( endTime < silk_Timer_min[ID] )                          \
-            silk_Timer_min[ID] = endTime;                           \
-    }                                                               \
-        silk_Timer_depth_ctr--;                                     \
+# else
+#  define TOC(TAG_NAME) {                                             \
+            unsigned long endTime;                                          \
+            static int init = 0;                                            \
+            static int ID = 0;                                              \
+            if (init == 0)                                                 \
+            {                                                               \
+                int k;                                                      \
+                init = 1;                                                   \
+                for (k = 0; k < silk_Timer_nTimers; k++) {                 \
+                    if (strcmp(silk_Timer_tags[k], #TAG_NAME) == 0) {      \
+                        ID = k;                                             \
+                        break;                                              \
+                    }                                                       \
+                }                                                           \
+            }                                                               \
+            endTime = GetHighResolutionTime();                              \
+            endTime -= silk_Timer_start[ID];                                \
+            if ((endTime < 100000000) &&                                     \
+                (endTime >= 0)) {                                           \
+                silk_Timer_cnt[ID]++;                                       \
+                silk_Timer_sum[ID] += endTime;                              \
+                if (endTime > silk_Timer_max[ID])                          \
+                silk_Timer_max[ID] = endTime;                           \
+                if (endTime < silk_Timer_min[ID])                          \
+                silk_Timer_min[ID] = endTime;                           \
+            }                                                               \
+            silk_Timer_depth_ctr--;                                     \
 }
-#endif
+# endif
 
 #else /* SILK_TIC_TOC */
 
 /* define macros as empty strings */
-#define TIC(TAG_NAME)
-#define TOC(TAG_NAME)
-#define silk_TimerSave(FILE_NAME)
+# define TIC(TAG_NAME)
+# define TOC(TAG_NAME)
+# define silk_TimerSave(FILE_NAME)
 
 #endif /* SILK_TIC_TOC */
 
@@ -224,35 +224,35 @@ extern oac_int64    silk_Timer_depth[silk_NUM_TIMERS_MAX];
 /************************************/
 /* Example: DEBUG_STORE_DATA(testfile.pcm, &RIN[0], 160*sizeof(oac_int16)); */
 
-#define silk_NUM_STORES_MAX                                  100
+# define silk_NUM_STORES_MAX                                  100
 extern FILE *silk_debug_store_fp[ silk_NUM_STORES_MAX ];
 extern int silk_debug_store_count;
 
 /* Faster way of storing the data */
-#define DEBUG_STORE_DATA( FILE_NAME, DATA_PTR, N_BYTES ) {          \
-    static oac_int init = 0, cnt = 0;                              \
-    static FILE **fp;                                               \
-    if (init == 0) {                                                \
-        init = 1;                                                   \
-        cnt = silk_debug_store_count++;                             \
-        silk_debug_store_fp[ cnt ] = fopen(#FILE_NAME, "wb");       \
-    }                                                               \
-    fwrite((DATA_PTR), (N_BYTES), 1, silk_debug_store_fp[ cnt ]);   \
+# define DEBUG_STORE_DATA( FILE_NAME, DATA_PTR, N_BYTES ) {          \
+            static oac_int init = 0, cnt = 0;                              \
+            static FILE **fp;                                               \
+            if (init == 0) {                                                \
+                init = 1;                                                   \
+                cnt = silk_debug_store_count++;                             \
+                silk_debug_store_fp[ cnt ] = fopen(#FILE_NAME, "wb");       \
+            }                                                               \
+            fwrite((DATA_PTR), (N_BYTES), 1, silk_debug_store_fp[ cnt ]);   \
 }
 
 /* Call this at the end of main() */
-#define SILK_DEBUG_STORE_CLOSE_FILES {                              \
-    oac_int i;                                                     \
-    for( i = 0; i < silk_debug_store_count; i++ ) {                 \
-        fclose( silk_debug_store_fp[ i ] );                         \
-    }                                                               \
+# define SILK_DEBUG_STORE_CLOSE_FILES {                              \
+            oac_int i;                                                     \
+            for (i = 0; i < silk_debug_store_count; i++) {                 \
+                fclose( silk_debug_store_fp[ i ] );                         \
+            }                                                               \
 }
 
 #else /* SILK_DEBUG */
 
 /* define macros as empty strings */
-#define DEBUG_STORE_DATA(FILE_NAME, DATA_PTR, N_BYTES)
-#define SILK_DEBUG_STORE_CLOSE_FILES
+# define DEBUG_STORE_DATA(FILE_NAME, DATA_PTR, N_BYTES)
+# define SILK_DEBUG_STORE_CLOSE_FILES
 
 #endif /* SILK_DEBUG */
 
diff --git a/silk/dec_API.c b/silk/dec_API.c
index 367ae099f..5e7c6b7bd 100644
--- a/silk/dec_API.c
+++ b/silk/dec_API.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 #include "API.h"
 #include "main.h"
@@ -34,24 +34,24 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "os_support.h"
 
 #ifdef ENABLE_OSCE
-#include "osce.h"
-#include "osce_structs.h"
-#ifdef ENABLE_OSCE_BWE
-#include "osce_features.h"
-#endif
+# include "osce.h"
+# include "osce_structs.h"
+# ifdef ENABLE_OSCE_BWE
+#  include "osce_features.h"
+# endif
 #endif
 
 /************************/
 /* Decoder Super Struct */
 /************************/
 typedef struct {
-    silk_decoder_state          channel_state[ DECODER_NUM_CHANNELS ];
-    stereo_dec_state                sStereo;
-    oac_int                         nChannelsAPI;
-    oac_int                         nChannelsInternal;
-    oac_int                         prev_decode_only_middle;
+    silk_decoder_state channel_state[ DECODER_NUM_CHANNELS ];
+    stereo_dec_state sStereo;
+    oac_int nChannelsAPI;
+    oac_int nChannelsInternal;
+    oac_int prev_decode_only_middle;
 #ifdef ENABLE_OSCE
-    OSCEModel                        osce_model;
+    OSCEModel osce_model;
 #endif
 } silk_decoder;
 
@@ -61,8 +61,7 @@ typedef struct {
 
 
 
-oac_int silk_LoadOSCEModels(void *decState, const unsigned char *data, int len)
-{
+oac_int silk_LoadOSCEModels(void *decState, const unsigned char *data, int len) {
 #ifdef ENABLE_OSCE
     oac_int ret = SILK_NO_ERROR;
 
@@ -79,11 +78,10 @@ oac_int silk_LoadOSCEModels(void *decState, const unsigned char *data, int len)
 
 oac_int silk_Get_Decoder_Size(                         /* O    Returns error code                              */
     oac_int                        *decSizeBytes       /* O    Number of bytes in SILK decoder state           */
-)
-{
+    ) {
     oac_int ret = SILK_NO_ERROR;
 
-    *decSizeBytes = sizeof( silk_decoder );
+    *decSizeBytes = sizeof(silk_decoder);
 
     return ret;
 }
@@ -91,12 +89,11 @@ oac_int silk_Get_Decoder_Size(                         /* O    Returns error cod
 /* Reset decoder state */
 oac_int silk_ResetDecoder(                              /* O    Returns error code                              */
     void                            *decState           /* I/O  State                                           */
-)
-{
+    ) {
     oac_int n, ret = SILK_NO_ERROR;
     silk_decoder_state *channel_state = ((silk_decoder *)decState)->channel_state;
 
-    for( n = 0; n < DECODER_NUM_CHANNELS; n++ ) {
+    for (n = 0; n < DECODER_NUM_CHANNELS; n++) {
         ret  = silk_reset_decoder( &channel_state[ n ] );
     }
     silk_memset(&((silk_decoder *)decState)->sStereo, 0, sizeof(((silk_decoder *)decState)->sStereo));
@@ -109,8 +106,7 @@ oac_int silk_ResetDecoder(                              /* O    Returns error co
 
 oac_int silk_InitDecoder(                              /* O    Returns error code                              */
     void                            *decState           /* I/O  State                                           */
-)
-{
+    ) {
     oac_int n, ret = SILK_NO_ERROR;
     silk_decoder_state *channel_state = ((silk_decoder *)decState)->channel_state;
 #ifdef ENABLE_OSCE
@@ -121,7 +117,7 @@ oac_int silk_InitDecoder(                              /* O    Returns error cod
     silk_LoadOSCEModels(decState, NULL, 0);
 #endif
 
-    for( n = 0; n < DECODER_NUM_CHANNELS; n++ ) {
+    for (n = 0; n < DECODER_NUM_CHANNELS; n++) {
         ret  = silk_init_decoder( &channel_state[ n ] );
     }
     silk_memset(&((silk_decoder *)decState)->sStereo, 0, sizeof(((silk_decoder *)decState)->sStereo));
@@ -135,18 +131,17 @@ oac_int silk_InitDecoder(                              /* O    Returns error cod
 oac_int silk_Decode(                                   /* O    Returns error code                              */
     void*                           decState,           /* I/O  State                                           */
     silk_DecControlStruct*          decControl,         /* I/O  Control Structure                               */
-    oac_int                        lostFlag,           /* I    0: no loss, 1 loss, 2 decode fec                */
-    oac_int                        newPacketFlag,      /* I    Indicates first decoder call for this packet    */
+    oac_int lostFlag,                                  /* I    0: no loss, 1 loss, 2 decode fec                */
+    oac_int newPacketFlag,                             /* I    Indicates first decoder call for this packet    */
     ec_dec                          *psRangeDec,        /* I/O  Compressor data structure                       */
     oac_res                        *samplesOut,        /* O    Decoded output speech vector                    */
     oac_int32                      *nSamplesOut,       /* O    Number of samples decoded                       */
 #ifdef ENABLE_DEEP_PLC
     LPCNetPLCState                  *lpcnet,
 #endif
-    int                             arch                /* I    Run-time architecture                           */
-)
-{
-    oac_int   i, n, decode_only_middle = 0, ret = SILK_NO_ERROR;
+    int arch                                            /* I    Run-time architecture                           */
+    ) {
+    oac_int i, n, decode_only_middle = 0, ret = SILK_NO_ERROR;
     oac_int32 nSamplesOutDec, LBRR_symbol;
     oac_int16 *samplesOut1_tmp[ 2 ];
     VARDECL( oac_int16, samplesOut1_tmp_storage1 );
@@ -167,37 +162,37 @@ oac_int silk_Decode(                                   /* O    Returns error cod
     /**********************************/
     /* Test if first frame in payload */
     /**********************************/
-    if( newPacketFlag ) {
-        for( n = 0; n < decControl->nChannelsInternal; n++ ) {
+    if (newPacketFlag) {
+        for (n = 0; n < decControl->nChannelsInternal; n++) {
             channel_state[ n ].nFramesDecoded = 0;  /* Used to count frames in packet */
         }
     }
 
     /* If Mono -> Stereo transition in bitstream: init state of second channel */
-    if( decControl->nChannelsInternal > psDec->nChannelsInternal ) {
+    if (decControl->nChannelsInternal > psDec->nChannelsInternal) {
         ret += silk_init_decoder( &channel_state[ 1 ] );
     }
 
-    stereo_to_mono = decControl->nChannelsInternal == 1 && psDec->nChannelsInternal == 2 &&
-                     ( decControl->internalSampleRate == 1000*channel_state[ 0 ].fs_kHz );
+    stereo_to_mono = decControl->nChannelsInternal == 1 && psDec->nChannelsInternal == 2
+                     && (decControl->internalSampleRate == 1000*channel_state[ 0 ].fs_kHz);
 
-    if( channel_state[ 0 ].nFramesDecoded == 0 ) {
-        for( n = 0; n < decControl->nChannelsInternal; n++ ) {
+    if (channel_state[ 0 ].nFramesDecoded == 0) {
+        for (n = 0; n < decControl->nChannelsInternal; n++) {
             oac_int fs_kHz_dec;
-            if( decControl->payloadSize_ms == 0 ) {
+            if (decControl->payloadSize_ms == 0) {
                 /* Assuming packet loss, use 10 ms */
                 channel_state[ n ].nFramesPerPacket = 1;
                 channel_state[ n ].nb_subfr = 2;
-            } else if( decControl->payloadSize_ms == 10 ) {
+            } else if (decControl->payloadSize_ms == 10) {
                 channel_state[ n ].nFramesPerPacket = 1;
                 channel_state[ n ].nb_subfr = 2;
-            } else if( decControl->payloadSize_ms == 20 ) {
+            } else if (decControl->payloadSize_ms == 20) {
                 channel_state[ n ].nFramesPerPacket = 1;
                 channel_state[ n ].nb_subfr = 4;
-            } else if( decControl->payloadSize_ms == 40 ) {
+            } else if (decControl->payloadSize_ms == 40) {
                 channel_state[ n ].nFramesPerPacket = 2;
                 channel_state[ n ].nb_subfr = 4;
-            } else if( decControl->payloadSize_ms == 60 ) {
+            } else if (decControl->payloadSize_ms == 60) {
                 channel_state[ n ].nFramesPerPacket = 3;
                 channel_state[ n ].nb_subfr = 4;
             } else {
@@ -205,8 +200,8 @@ oac_int silk_Decode(                                   /* O    Returns error cod
                 RESTORE_STACK;
                 return SILK_DEC_INVALID_FRAME_SIZE;
             }
-            fs_kHz_dec = ( decControl->internalSampleRate >> 10 ) + 1;
-            if( fs_kHz_dec != 8 && fs_kHz_dec != 12 && fs_kHz_dec != 16 ) {
+            fs_kHz_dec = (decControl->internalSampleRate>>10) + 1;
+            if (fs_kHz_dec != 8 && fs_kHz_dec != 12 && fs_kHz_dec != 16) {
                 celt_assert( 0 );
                 RESTORE_STACK;
                 return SILK_DEC_INVALID_SAMPLING_FREQUENCY;
@@ -215,60 +210,63 @@ oac_int silk_Decode(                                   /* O    Returns error cod
         }
     }
 
-    if( decControl->nChannelsAPI == 2 && decControl->nChannelsInternal == 2 && ( psDec->nChannelsAPI == 1 || psDec->nChannelsInternal == 1 ) ) {
-        silk_memset( psDec->sStereo.pred_prev_Q13, 0, sizeof( psDec->sStereo.pred_prev_Q13 ) );
-        silk_memset( psDec->sStereo.sSide, 0, sizeof( psDec->sStereo.sSide ) );
-        silk_memcpy( &channel_state[ 1 ].resampler_state, &channel_state[ 0 ].resampler_state, sizeof( silk_resampler_state_struct ) );
+    if (decControl->nChannelsAPI == 2 && decControl->nChannelsInternal == 2
+        && (psDec->nChannelsAPI == 1 || psDec->nChannelsInternal == 1)) {
+        silk_memset( psDec->sStereo.pred_prev_Q13, 0, sizeof(psDec->sStereo.pred_prev_Q13));
+        silk_memset( psDec->sStereo.sSide, 0, sizeof(psDec->sStereo.sSide));
+        silk_memcpy( &channel_state[ 1 ].resampler_state, &channel_state[ 0 ].resampler_state,
+        sizeof(silk_resampler_state_struct));
     }
     psDec->nChannelsAPI      = decControl->nChannelsAPI;
     psDec->nChannelsInternal = decControl->nChannelsInternal;
 
-    if( decControl->API_sampleRate > (oac_int32)MAX_API_FS_KHZ * 1000 || decControl->API_sampleRate < 8000 ) {
+    if (decControl->API_sampleRate > (oac_int32)MAX_API_FS_KHZ*1000 || decControl->API_sampleRate < 8000) {
         ret = SILK_DEC_INVALID_SAMPLING_FREQUENCY;
         RESTORE_STACK;
-        return( ret );
+        return ret;
     }
 
-    if( lostFlag != FLAG_PACKET_LOST && channel_state[ 0 ].nFramesDecoded == 0 ) {
+    if (lostFlag != FLAG_PACKET_LOST && channel_state[ 0 ].nFramesDecoded == 0) {
         /* First decoder call for this payload */
         /* Decode VAD flags and LBRR flag */
-        for( n = 0; n < decControl->nChannelsInternal; n++ ) {
-            for( i = 0; i < channel_state[ n ].nFramesPerPacket; i++ ) {
+        for (n = 0; n < decControl->nChannelsInternal; n++) {
+            for (i = 0; i < channel_state[ n ].nFramesPerPacket; i++) {
                 channel_state[ n ].VAD_flags[ i ] = ec_dec_bit_logp(psRangeDec, 1);
             }
             channel_state[ n ].LBRR_flag = ec_dec_bit_logp(psRangeDec, 1);
         }
         /* Decode LBRR flags */
-        for( n = 0; n < decControl->nChannelsInternal; n++ ) {
-            silk_memset( channel_state[ n ].LBRR_flags, 0, sizeof( channel_state[ n ].LBRR_flags ) );
-            if( channel_state[ n ].LBRR_flag ) {
-                if( channel_state[ n ].nFramesPerPacket == 1 ) {
+        for (n = 0; n < decControl->nChannelsInternal; n++) {
+            silk_memset( channel_state[ n ].LBRR_flags, 0, sizeof(channel_state[ n ].LBRR_flags));
+            if (channel_state[ n ].LBRR_flag) {
+                if (channel_state[ n ].nFramesPerPacket == 1) {
                     channel_state[ n ].LBRR_flags[ 0 ] = 1;
                 } else {
-                    LBRR_symbol = ec_dec_icdf( psRangeDec, silk_LBRR_flags_iCDF_ptr[ channel_state[ n ].nFramesPerPacket - 2 ], 8 ) + 1;
-                    for( i = 0; i < channel_state[ n ].nFramesPerPacket; i++ ) {
-                        channel_state[ n ].LBRR_flags[ i ] = silk_RSHIFT( LBRR_symbol, i ) & 1;
+                    LBRR_symbol = ec_dec_icdf( psRangeDec,
+                    silk_LBRR_flags_iCDF_ptr[ channel_state[ n ].nFramesPerPacket - 2 ], 8 ) + 1;
+                    for (i = 0; i < channel_state[ n ].nFramesPerPacket; i++) {
+                        channel_state[ n ].LBRR_flags[ i ] = silk_RSHIFT( LBRR_symbol, i )&1;
                     }
                 }
             }
         }
 
-        if( lostFlag == FLAG_DECODE_NORMAL ) {
+        if (lostFlag == FLAG_DECODE_NORMAL) {
             /* Regular decoding: skip all LBRR data */
-            for( i = 0; i < channel_state[ 0 ].nFramesPerPacket; i++ ) {
-                for( n = 0; n < decControl->nChannelsInternal; n++ ) {
-                    if( channel_state[ n ].LBRR_flags[ i ] ) {
+            for (i = 0; i < channel_state[ 0 ].nFramesPerPacket; i++) {
+                for (n = 0; n < decControl->nChannelsInternal; n++) {
+                    if (channel_state[ n ].LBRR_flags[ i ]) {
                         oac_int16 pulses[ MAX_FRAME_LENGTH ];
                         oac_int condCoding;
 
-                        if( decControl->nChannelsInternal == 2 && n == 0 ) {
+                        if (decControl->nChannelsInternal == 2 && n == 0) {
                             silk_stereo_decode_pred( psRangeDec, MS_pred_Q13 );
-                            if( channel_state[ 1 ].LBRR_flags[ i ] == 0 ) {
+                            if (channel_state[ 1 ].LBRR_flags[ i ] == 0) {
                                 silk_stereo_decode_mid_only( psRangeDec, &decode_only_middle );
                             }
                         }
                         /* Use conditional coding if previous frame available */
-                        if( i > 0 && channel_state[ n ].LBRR_flags[ i - 1 ] ) {
+                        if (i > 0 && channel_state[ n ].LBRR_flags[ i - 1 ]) {
                             condCoding = CODE_CONDITIONALLY;
                         } else {
                             condCoding = CODE_INDEPENDENTLY;
@@ -283,30 +281,31 @@ oac_int silk_Decode(                                   /* O    Returns error cod
     }
 
     /* Get MS predictor index */
-    if( decControl->nChannelsInternal == 2 ) {
-        if(   lostFlag == FLAG_DECODE_NORMAL ||
-            ( lostFlag == FLAG_DECODE_LBRR && channel_state[ 0 ].LBRR_flags[ channel_state[ 0 ].nFramesDecoded ] == 1 ) )
-        {
+    if (decControl->nChannelsInternal == 2) {
+        if (lostFlag == FLAG_DECODE_NORMAL
+            || (lostFlag == FLAG_DECODE_LBRR
+                && channel_state[ 0 ].LBRR_flags[ channel_state[ 0 ].nFramesDecoded ] == 1)) {
             silk_stereo_decode_pred( psRangeDec, MS_pred_Q13 );
             /* For LBRR data, decode mid-only flag only if side-channel's LBRR flag is false */
-            if( ( lostFlag == FLAG_DECODE_NORMAL && channel_state[ 1 ].VAD_flags[ channel_state[ 0 ].nFramesDecoded ] == 0 ) ||
-                ( lostFlag == FLAG_DECODE_LBRR && channel_state[ 1 ].LBRR_flags[ channel_state[ 0 ].nFramesDecoded ] == 0 ) )
-            {
+            if ((lostFlag == FLAG_DECODE_NORMAL
+                 && channel_state[ 1 ].VAD_flags[ channel_state[ 0 ].nFramesDecoded ] == 0)
+                || (lostFlag == FLAG_DECODE_LBRR
+                    && channel_state[ 1 ].LBRR_flags[ channel_state[ 0 ].nFramesDecoded ] == 0)) {
                 silk_stereo_decode_mid_only( psRangeDec, &decode_only_middle );
             } else {
                 decode_only_middle = 0;
             }
         } else {
-            for( n = 0; n < 2; n++ ) {
+            for (n = 0; n < 2; n++) {
                 MS_pred_Q13[ n ] = psDec->sStereo.pred_prev_Q13[ n ];
             }
         }
     }
 
     /* Reset side channel decoder prediction memory for first frame with side coding */
-    if( decControl->nChannelsInternal == 2 && decode_only_middle == 0 && psDec->prev_decode_only_middle == 1 ) {
-        silk_memset( psDec->channel_state[ 1 ].outBuf, 0, sizeof(psDec->channel_state[ 1 ].outBuf) );
-        silk_memset( psDec->channel_state[ 1 ].sLPC_Q14_buf, 0, sizeof(psDec->channel_state[ 1 ].sLPC_Q14_buf) );
+    if (decControl->nChannelsInternal == 2 && decode_only_middle == 0 && psDec->prev_decode_only_middle == 1) {
+        silk_memset( psDec->channel_state[ 1 ].outBuf, 0, sizeof(psDec->channel_state[ 1 ].outBuf));
+        silk_memset( psDec->channel_state[ 1 ].sLPC_Q14_buf, 0, sizeof(psDec->channel_state[ 1 ].sLPC_Q14_buf));
         psDec->channel_state[ 1 ].lagPrev        = 100;
         psDec->channel_state[ 1 ].LastGainIndex  = 10;
         psDec->channel_state[ 1 ].prevSignalType = TYPE_NO_VOICE_ACTIVITY;
@@ -316,31 +315,32 @@ oac_int silk_Decode(                                   /* O    Returns error cod
     /* Check if the temp buffer fits into the output PCM buffer. If it fits,
        we can delay allocating the temp buffer until after the SILK peak stack
        usage. We need to use a < and not a <= because of the two extra samples. */
-    ALLOC( samplesOut1_tmp_storage1, decControl->nChannelsInternal*(channel_state[ 0 ].frame_length + 2 ),
+    ALLOC( samplesOut1_tmp_storage1, decControl->nChannelsInternal*(channel_state[ 0 ].frame_length + 2),
            oac_int16 );
     samplesOut1_tmp[ 0 ] = samplesOut1_tmp_storage1;
     samplesOut1_tmp[ 1 ] = samplesOut1_tmp_storage1 + channel_state[ 0 ].frame_length + 2;
 
-    if( lostFlag == FLAG_DECODE_NORMAL ) {
+    if (lostFlag == FLAG_DECODE_NORMAL) {
         has_side = !decode_only_middle;
     } else {
         has_side = !psDec->prev_decode_only_middle
-              || (decControl->nChannelsInternal == 2 && lostFlag == FLAG_DECODE_LBRR && channel_state[1].LBRR_flags[ channel_state[1].nFramesDecoded ] == 1 );
+                   || (decControl->nChannelsInternal == 2 && lostFlag == FLAG_DECODE_LBRR
+                       && channel_state[1].LBRR_flags[ channel_state[1].nFramesDecoded ] == 1);
     }
     channel_state[ 0 ].sPLC.enable_deep_plc = decControl->enable_deep_plc;
     /* Call decoder for one frame */
-    for( n = 0; n < decControl->nChannelsInternal; n++ ) {
-        if( n == 0 || has_side ) {
+    for (n = 0; n < decControl->nChannelsInternal; n++) {
+        if (n == 0 || has_side) {
             oac_int FrameIndex;
             oac_int condCoding;
 
             FrameIndex = channel_state[ 0 ].nFramesDecoded - n;
             /* Use independent coding if no previous frame available */
-            if( FrameIndex <= 0 ) {
+            if (FrameIndex <= 0) {
                 condCoding = CODE_INDEPENDENTLY;
-            } else if( lostFlag == FLAG_DECODE_LBRR ) {
+            } else if (lostFlag == FLAG_DECODE_LBRR) {
                 condCoding = channel_state[ n ].LBRR_flags[ FrameIndex - 1 ] ? CODE_CONDITIONALLY : CODE_INDEPENDENTLY;
-            } else if( n > 0 && psDec->prev_decode_only_middle ) {
+            } else if (n > 0 && psDec->prev_decode_only_middle) {
                 /* If we skipped a side frame in this packet, we don't
                    need LTP scaling; the LTP state is well-defined. */
                 condCoding = CODE_INDEPENDENTLY_NO_LTP_SCALING;
@@ -348,11 +348,12 @@ oac_int silk_Decode(                                   /* O    Returns error cod
                 condCoding = CODE_CONDITIONALLY;
             }
 #ifdef ENABLE_OSCE
-            if ( channel_state[n].osce.method != decControl->osce_method ) {
+            if (channel_state[n].osce.method != decControl->osce_method) {
                 osce_reset( &channel_state[n].osce, decControl->osce_method );
             }
 #endif
-            ret += silk_decode_frame( &channel_state[ n ], psRangeDec, &samplesOut1_tmp[ n ][ 2 ], &nSamplesOutDec, lostFlag, condCoding,
+            ret += silk_decode_frame( &channel_state[ n ], psRangeDec, &samplesOut1_tmp[ n ][ 2 ], &nSamplesOutDec,
+            lostFlag, condCoding,
 #ifdef ENABLE_DEEP_PLC
                 n == 0 ? lpcnet : NULL,
 #endif
@@ -361,32 +362,34 @@ oac_int silk_Decode(                                   /* O    Returns error cod
 #endif
                 arch);
         } else {
-            silk_memset( &samplesOut1_tmp[ n ][ 2 ], 0, nSamplesOutDec * sizeof( oac_int16 ) );
+            silk_memset( &samplesOut1_tmp[ n ][ 2 ], 0, nSamplesOutDec*sizeof(oac_int16));
         }
         channel_state[ n ].nFramesDecoded++;
     }
 
-    if( decControl->nChannelsAPI == 2 && decControl->nChannelsInternal == 2 ) {
+    if (decControl->nChannelsAPI == 2 && decControl->nChannelsInternal == 2) {
         /* Convert Mid/Side to Left/Right */
-        silk_stereo_MS_to_LR( &psDec->sStereo, samplesOut1_tmp[ 0 ], samplesOut1_tmp[ 1 ], MS_pred_Q13, channel_state[ 0 ].fs_kHz, nSamplesOutDec );
+        silk_stereo_MS_to_LR( &psDec->sStereo, samplesOut1_tmp[ 0 ], samplesOut1_tmp[ 1 ], MS_pred_Q13,
+        channel_state[ 0 ].fs_kHz, nSamplesOutDec );
     } else {
         /* Buffering */
-        silk_memcpy( samplesOut1_tmp[ 0 ], psDec->sStereo.sMid, 2 * sizeof( oac_int16 ) );
-        silk_memcpy( psDec->sStereo.sMid, &samplesOut1_tmp[ 0 ][ nSamplesOutDec ], 2 * sizeof( oac_int16 ) );
+        silk_memcpy( samplesOut1_tmp[ 0 ], psDec->sStereo.sMid, 2*sizeof(oac_int16));
+        silk_memcpy( psDec->sStereo.sMid, &samplesOut1_tmp[ 0 ][ nSamplesOutDec ], 2*sizeof(oac_int16));
     }
 
     /* Number of output samples */
-    *nSamplesOut = silk_DIV32( nSamplesOutDec * decControl->API_sampleRate, silk_SMULBB( channel_state[ 0 ].fs_kHz, 1000 ) );
+    *nSamplesOut = silk_DIV32( nSamplesOutDec*decControl->API_sampleRate,
+    silk_SMULBB( channel_state[ 0 ].fs_kHz, 1000 ));
 
     /* Set up pointers to temp buffers */
     ALLOC( samplesOut2_tmp, *nSamplesOut, oac_int16 );
     resample_out_ptr = samplesOut2_tmp;
 
 #ifdef ENABLE_OSCE_BWE
-    ALLOC(resamp_buffer, 3 * MAX_FRAME_LENGTH, oac_int16);
+    ALLOC(resamp_buffer, 3*MAX_FRAME_LENGTH, oac_int16);
 #endif
 
-    for( n = 0; n < silk_min( decControl->nChannelsAPI, decControl->nChannelsInternal ); n++ ) {
+    for (n = 0; n < silk_min( decControl->nChannelsAPI, decControl->nChannelsInternal ); n++) {
 
 #ifdef ENABLE_OSCE_BWE
         /* Resample or extend decoded signal to API_sampleRate */
@@ -401,14 +404,16 @@ oac_int silk_Decode(                                   /* O    Returns error cod
             osce_bwe(&psDec->osce_model, &channel_state[ n ].osce_bwe,
                 resample_out_ptr, &samplesOut1_tmp[ n ][ 1 ], nSamplesOutDec, arch);
 
-            if (decControl->prev_osce_extended_mode == OSCE_MODE_SILK_ONLY ||
-                decControl->prev_osce_extended_mode == OSCE_MODE_HYBRID) {
-                    /* cross-fade with upsampled signal */
-                    silk_resampler( &channel_state[ n ].resampler_state, resamp_buffer, &samplesOut1_tmp[ n ][ 1 ], nSamplesOutDec );
-                    osce_bwe_cross_fade_10ms(resample_out_ptr, resamp_buffer, 480);
+            if (decControl->prev_osce_extended_mode == OSCE_MODE_SILK_ONLY
+                || decControl->prev_osce_extended_mode == OSCE_MODE_HYBRID) {
+                /* cross-fade with upsampled signal */
+                silk_resampler( &channel_state[ n ].resampler_state, resamp_buffer, &samplesOut1_tmp[ n ][ 1 ],
+                nSamplesOutDec );
+                osce_bwe_cross_fade_10ms(resample_out_ptr, resamp_buffer, 480);
             }
         } else {
-            ret += silk_resampler( &channel_state[ n ].resampler_state, resample_out_ptr, &samplesOut1_tmp[ n ][ 1 ], nSamplesOutDec );
+            ret += silk_resampler( &channel_state[ n ].resampler_state, resample_out_ptr, &samplesOut1_tmp[ n ][ 1 ],
+            nSamplesOutDec );
             if (decControl->prev_osce_extended_mode == OSCE_MODE_SILK_BBWE && decControl->internalSampleRate == 16000) {
                 /* fade out if internal sample rate did not change */
                 osce_bwe(&psDec->osce_model, &channel_state[ n ].osce_bwe,
@@ -419,15 +424,16 @@ oac_int silk_Decode(                                   /* O    Returns error cod
         }
 #else
         /* Resample decoded signal to API_sampleRate */
-        ret += silk_resampler( &channel_state[ n ].resampler_state, resample_out_ptr, &samplesOut1_tmp[ n ][ 1 ], nSamplesOutDec );
+        ret += silk_resampler( &channel_state[ n ].resampler_state, resample_out_ptr, &samplesOut1_tmp[ n ][ 1 ],
+        nSamplesOutDec );
 #endif
         /* Interleave if stereo output and stereo stream */
-        if( decControl->nChannelsAPI == 2 ) {
-            for( i = 0; i < *nSamplesOut; i++ ) {
-                samplesOut[ n + 2 * i ] = INT16TORES(resample_out_ptr[ i ]);
+        if (decControl->nChannelsAPI == 2) {
+            for (i = 0; i < *nSamplesOut; i++) {
+                samplesOut[ n + 2*i ] = INT16TORES(resample_out_ptr[ i ]);
             }
         } else {
-            for( i = 0; i < *nSamplesOut; i++ ) {
+            for (i = 0; i < *nSamplesOut; i++) {
                 samplesOut[ i ] = INT16TORES(resample_out_ptr[ i ]);
             }
         }
@@ -438,37 +444,38 @@ oac_int silk_Decode(                                   /* O    Returns error cod
 #endif
 
     /* Create two channel output from mono stream */
-    if( decControl->nChannelsAPI == 2 && decControl->nChannelsInternal == 1 ) {
-        if ( stereo_to_mono ){
+    if (decControl->nChannelsAPI == 2 && decControl->nChannelsInternal == 1) {
+        if (stereo_to_mono) {
             /* Resample right channel for newly collapsed stereo just in case
                we weren't doing collapsing when switching to mono */
-            ret += silk_resampler( &channel_state[ 1 ].resampler_state, resample_out_ptr, &samplesOut1_tmp[ 0 ][ 1 ], nSamplesOutDec );
+            ret += silk_resampler( &channel_state[ 1 ].resampler_state, resample_out_ptr, &samplesOut1_tmp[ 0 ][ 1 ],
+            nSamplesOutDec );
 
-            for( i = 0; i < *nSamplesOut; i++ ) {
-                samplesOut[ 1 + 2 * i ] = INT16TORES(resample_out_ptr[ i ]);
+            for (i = 0; i < *nSamplesOut; i++) {
+                samplesOut[ 1 + 2*i ] = INT16TORES(resample_out_ptr[ i ]);
             }
         } else {
-            for( i = 0; i < *nSamplesOut; i++ ) {
-                samplesOut[ 1 + 2 * i ] = samplesOut[ 0 + 2 * i ];
+            for (i = 0; i < *nSamplesOut; i++) {
+                samplesOut[ 1 + 2*i ] = samplesOut[ 0 + 2*i ];
             }
         }
     }
 
     /* Export pitch lag, measured at 48 kHz sampling rate */
-    if( channel_state[ 0 ].prevSignalType == TYPE_VOICED ) {
+    if (channel_state[ 0 ].prevSignalType == TYPE_VOICED) {
         int mult_tab[ 3 ] = { 6, 4, 3 };
-        decControl->prevPitchLag = channel_state[ 0 ].lagPrev * mult_tab[ ( channel_state[ 0 ].fs_kHz - 8 ) >> 2 ];
+        decControl->prevPitchLag = channel_state[ 0 ].lagPrev*mult_tab[ (channel_state[ 0 ].fs_kHz - 8)>>2 ];
     } else {
         decControl->prevPitchLag = 0;
     }
 
-    if( lostFlag == FLAG_PACKET_LOST ) {
-       /* On packet loss, remove the gain clamping to prevent having the energy "bounce back"
-          if we lose packets when the energy is going down */
-       for ( i = 0; i < psDec->nChannelsInternal; i++ )
-          psDec->channel_state[ i ].LastGainIndex = 10;
+    if (lostFlag == FLAG_PACKET_LOST) {
+        /* On packet loss, remove the gain clamping to prevent having the energy "bounce back"
+           if we lose packets when the energy is going down */
+        for (i = 0; i < psDec->nChannelsInternal; i++)
+            psDec->channel_state[ i ].LastGainIndex = 10;
     } else {
-       psDec->prev_decode_only_middle = decode_only_middle;
+        psDec->prev_decode_only_middle = decode_only_middle;
     }
     RESTORE_STACK;
     return ret;
@@ -478,30 +485,29 @@ oac_int silk_Decode(                                   /* O    Returns error cod
 /* Getting table of contents for a packet */
 oac_int silk_get_TOC(
     const oac_uint8                *payload,           /* I    Payload data                                */
-    const oac_int                  nBytesIn,           /* I    Number of input bytes                       */
-    const oac_int                  nFramesPerPayload,  /* I    Number of SILK frames per payload           */
+    const oac_int nBytesIn,                            /* I    Number of input bytes                       */
+    const oac_int nFramesPerPayload,                   /* I    Number of SILK frames per payload           */
     silk_TOC_struct                 *Silk_TOC           /* O    Type of content                             */
-)
-{
+    ) {
     oac_int i, flags, ret = SILK_NO_ERROR;
 
-    if( nBytesIn < 1 ) {
+    if (nBytesIn < 1) {
         return -1;
     }
-    if( nFramesPerPayload < 0 || nFramesPerPayload > 3 ) {
+    if (nFramesPerPayload < 0 || nFramesPerPayload > 3) {
         return -1;
     }
 
-    silk_memset( Silk_TOC, 0, sizeof( *Silk_TOC ) );
+    silk_memset( Silk_TOC, 0, sizeof(*Silk_TOC));
 
     /* For stereo, extract the flags for the mid channel */
-    flags = silk_RSHIFT( payload[ 0 ], 7 - nFramesPerPayload ) & ( silk_LSHIFT( 1, nFramesPerPayload + 1 ) - 1 );
+    flags = silk_RSHIFT( payload[ 0 ], 7 - nFramesPerPayload )&(silk_LSHIFT( 1, nFramesPerPayload + 1 ) - 1);
 
-    Silk_TOC->inbandFECFlag = flags & 1;
-    for( i = nFramesPerPayload - 1; i >= 0 ; i-- ) {
+    Silk_TOC->inbandFECFlag = flags&1;
+    for (i = nFramesPerPayload - 1; i >= 0 ; i--) {
         flags = silk_RSHIFT( flags, 1 );
-        Silk_TOC->VADFlags[ i ] = flags & 1;
-        Silk_TOC->VADFlag |= flags & 1;
+        Silk_TOC->VADFlags[ i ] = flags&1;
+        Silk_TOC->VADFlag |= flags&1;
     }
 
     return ret;
diff --git a/silk/decode_core.c b/silk/decode_core.c
index e1c3b887c..e53874941 100644
--- a/silk/decode_core.c
+++ b/silk/decode_core.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -38,12 +38,11 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_decode_core(
     silk_decoder_state          *psDec,                         /* I/O  Decoder state                               */
     silk_decoder_control        *psDecCtrl,                     /* I    Decoder control                             */
-    oac_int16                  xq[],                           /* O    Decoded speech                              */
-    const oac_int16            pulses[ MAX_FRAME_LENGTH ],     /* I    Pulse signal                                */
-    int                         arch                            /* I    Run-time architecture                       */
-)
-{
-    oac_int   i, k, lag = 0, start_idx, sLTP_buf_idx, NLSF_interpolation_flag, signalType;
+    oac_int16 xq[],                                            /* O    Decoded speech                              */
+    const oac_int16 pulses[ MAX_FRAME_LENGTH ],                /* I    Pulse signal                                */
+    int arch                                                    /* I    Run-time architecture                       */
+    ) {
+    oac_int i, k, lag = 0, start_idx, sLTP_buf_idx, NLSF_interpolation_flag, signalType;
     oac_int16 *A_Q12, *B_Q14, *pxq, A_Q12_tmp[ MAX_LPC_ORDER ];
     VARDECL( oac_int16, sLTP );
     VARDECL( oac_int32, sLTP_Q15 );
@@ -66,9 +65,9 @@ void silk_decode_core(
     ALLOC( sLPC_Q14, psDec->subfr_length + MAX_LPC_ORDER, oac_int32 );
 #endif
 
-    offset_Q10 = silk_Quantization_Offsets_Q10[ psDec->indices.signalType >> 1 ][ psDec->indices.quantOffsetType ];
+    offset_Q10 = silk_Quantization_Offsets_Q10[ psDec->indices.signalType>>1 ][ psDec->indices.quantOffsetType ];
 
-    if( psDec->indices.NLSFInterpCoef_Q2 < 1 << 2 ) {
+    if (psDec->indices.NLSFInterpCoef_Q2 < 1<<2) {
         NLSF_interpolation_flag = 1;
     } else {
         NLSF_interpolation_flag = 0;
@@ -76,52 +75,51 @@ void silk_decode_core(
 
     /* Decode excitation */
     rand_seed = psDec->indices.Seed;
-    for( i = 0; i < psDec->frame_length; i++ ) {
+    for (i = 0; i < psDec->frame_length; i++) {
         rand_seed = silk_RAND( rand_seed );
-        psDec->exc_Q14[ i ] = silk_LSHIFT( (oac_int32)pulses[ i ], 14 );
-        if( psDec->exc_Q14[ i ] > 0 ) {
-            psDec->exc_Q14[ i ] -= QUANT_LEVEL_ADJUST_Q10 << 4;
-        } else
-        if( psDec->exc_Q14[ i ] < 0 ) {
-            psDec->exc_Q14[ i ] += QUANT_LEVEL_ADJUST_Q10 << 4;
+        psDec->exc_Q14[ i ] = silk_LSHIFT((oac_int32)pulses[ i ], 14 );
+        if (psDec->exc_Q14[ i ] > 0) {
+            psDec->exc_Q14[ i ] -= QUANT_LEVEL_ADJUST_Q10<<4;
+        } else if (psDec->exc_Q14[ i ] < 0) {
+            psDec->exc_Q14[ i ] += QUANT_LEVEL_ADJUST_Q10<<4;
         }
-        psDec->exc_Q14[ i ] += offset_Q10 << 4;
-        if( rand_seed < 0 ) {
-           psDec->exc_Q14[ i ] = -psDec->exc_Q14[ i ];
+        psDec->exc_Q14[ i ] += offset_Q10<<4;
+        if (rand_seed < 0) {
+            psDec->exc_Q14[ i ] = -psDec->exc_Q14[ i ];
         }
 
         rand_seed = silk_ADD32_ovflw( rand_seed, pulses[ i ] );
     }
 
     /* Copy LPC state */
-    silk_memcpy( sLPC_Q14, psDec->sLPC_Q14_buf, MAX_LPC_ORDER * sizeof( oac_int32 ) );
+    silk_memcpy( sLPC_Q14, psDec->sLPC_Q14_buf, MAX_LPC_ORDER*sizeof(oac_int32));
 
     pexc_Q14 = psDec->exc_Q14;
     pxq      = xq;
     sLTP_buf_idx = psDec->ltp_mem_length;
     /* Loop over subframes */
-    for( k = 0; k < psDec->nb_subfr; k++ ) {
+    for (k = 0; k < psDec->nb_subfr; k++) {
         pres_Q14 = res_Q14;
-        A_Q12 = psDecCtrl->PredCoef_Q12[ k >> 1 ];
+        A_Q12 = psDecCtrl->PredCoef_Q12[ k>>1 ];
 
         /* Preload LPC coefficients to array on stack. Gives small performance gain */
-        silk_memcpy( A_Q12_tmp, A_Q12, psDec->LPC_order * sizeof( oac_int16 ) );
-        B_Q14        = &psDecCtrl->LTPCoef_Q14[ k * LTP_ORDER ];
+        silk_memcpy( A_Q12_tmp, A_Q12, psDec->LPC_order*sizeof(oac_int16));
+        B_Q14        = &psDecCtrl->LTPCoef_Q14[ k*LTP_ORDER ];
         signalType   = psDec->indices.signalType;
 
         Gain_Q10     = silk_RSHIFT( psDecCtrl->Gains_Q16[ k ], 6 );
         inv_gain_Q31 = silk_INVERSE32_varQ( psDecCtrl->Gains_Q16[ k ], 47 );
 
         /* Calculate gain adjustment factor */
-        if( psDecCtrl->Gains_Q16[ k ] != psDec->prev_gain_Q16 ) {
+        if (psDecCtrl->Gains_Q16[ k ] != psDec->prev_gain_Q16) {
             gain_adj_Q16 =  silk_DIV32_varQ( psDec->prev_gain_Q16, psDecCtrl->Gains_Q16[ k ], 16 );
 
             /* Scale short term state */
-            for( i = 0; i < MAX_LPC_ORDER; i++ ) {
+            for (i = 0; i < MAX_LPC_ORDER; i++) {
                 sLPC_Q14[ i ] = silk_SMULWW( gain_adj_Q16, sLPC_Q14[ i ] );
             }
         } else {
-            gain_adj_Q16 = (oac_int32)1 << 16;
+            gain_adj_Q16 = (oac_int32)1<<16;
         }
 
         /* Save inv_gain */
@@ -129,56 +127,58 @@ void silk_decode_core(
         psDec->prev_gain_Q16 = psDecCtrl->Gains_Q16[ k ];
 
         /* Avoid abrupt transition from voiced PLC to unvoiced normal decoding */
-        if( psDec->lossCnt && psDec->prevSignalType == TYPE_VOICED &&
-            psDec->indices.signalType != TYPE_VOICED && k < MAX_NB_SUBFR/2 ) {
+        if (psDec->lossCnt && psDec->prevSignalType == TYPE_VOICED
+            && psDec->indices.signalType != TYPE_VOICED && k < MAX_NB_SUBFR/2) {
 
-            silk_memset( B_Q14, 0, LTP_ORDER * sizeof( oac_int16 ) );
+            silk_memset( B_Q14, 0, LTP_ORDER*sizeof(oac_int16));
             B_Q14[ LTP_ORDER/2 ] = SILK_FIX_CONST( 0.25, 14 );
 
             signalType = TYPE_VOICED;
             psDecCtrl->pitchL[ k ] = psDec->lagPrev;
         }
 
-        if( signalType == TYPE_VOICED ) {
+        if (signalType == TYPE_VOICED) {
             /* Voiced */
             lag = psDecCtrl->pitchL[ k ];
 
             /* Re-whitening */
-            if( k == 0 || ( k == 2 && NLSF_interpolation_flag ) ) {
+            if (k == 0 || (k == 2 && NLSF_interpolation_flag)) {
                 /* Rewhiten with new A coefs */
-                start_idx = psDec->ltp_mem_length - lag - psDec->LPC_order - LTP_ORDER / 2;
+                start_idx = psDec->ltp_mem_length - lag - psDec->LPC_order - LTP_ORDER/2;
                 celt_assert( start_idx > 0 );
 
-                if( k == 2 ) {
-                    silk_memcpy( &psDec->outBuf[ psDec->ltp_mem_length ], xq, 2 * psDec->subfr_length * sizeof( oac_int16 ) );
+                if (k == 2) {
+                    silk_memcpy( &psDec->outBuf[ psDec->ltp_mem_length ], xq, 2*psDec->subfr_length*sizeof(oac_int16));
                 }
 
-                silk_LPC_analysis_filter( &sLTP[ start_idx ], &psDec->outBuf[ start_idx + k * psDec->subfr_length ],
+                silk_LPC_analysis_filter( &sLTP[ start_idx ], &psDec->outBuf[ start_idx + k*psDec->subfr_length ],
                     A_Q12, psDec->ltp_mem_length - start_idx, psDec->LPC_order, arch );
 
                 /* After rewhitening the LTP state is unscaled */
-                if( k == 0 ) {
+                if (k == 0) {
                     /* Do LTP downscaling to reduce inter-packet dependency */
                     inv_gain_Q31 = silk_LSHIFT( silk_SMULWB( inv_gain_Q31, psDecCtrl->LTP_scale_Q14 ), 2 );
                 }
-                for( i = 0; i < lag + LTP_ORDER/2; i++ ) {
-                    sLTP_Q15[ sLTP_buf_idx - i - 1 ] = silk_SMULWB( inv_gain_Q31, sLTP[ psDec->ltp_mem_length - i - 1 ] );
+                for (i = 0; i < lag + LTP_ORDER/2; i++) {
+                    sLTP_Q15[ sLTP_buf_idx - i - 1 ] = silk_SMULWB( inv_gain_Q31,
+                    sLTP[ psDec->ltp_mem_length - i - 1 ] );
                 }
             } else {
                 /* Update LTP state when Gain changes */
-                if( gain_adj_Q16 != (oac_int32)1 << 16 ) {
-                    for( i = 0; i < lag + LTP_ORDER/2; i++ ) {
-                        sLTP_Q15[ sLTP_buf_idx - i - 1 ] = silk_SMULWW( gain_adj_Q16, sLTP_Q15[ sLTP_buf_idx - i - 1 ] );
+                if (gain_adj_Q16 != (oac_int32)1<<16) {
+                    for (i = 0; i < lag + LTP_ORDER/2; i++) {
+                        sLTP_Q15[ sLTP_buf_idx - i - 1 ] = silk_SMULWW( gain_adj_Q16,
+                        sLTP_Q15[ sLTP_buf_idx - i - 1 ] );
                     }
                 }
             }
         }
 
         /* Long-term prediction */
-        if( signalType == TYPE_VOICED ) {
+        if (signalType == TYPE_VOICED) {
             /* Set up pointer */
-            pred_lag_ptr = &sLTP_Q15[ sLTP_buf_idx - lag + LTP_ORDER / 2 ];
-            for( i = 0; i < psDec->subfr_length; i++ ) {
+            pred_lag_ptr = &sLTP_Q15[ sLTP_buf_idx - lag + LTP_ORDER/2 ];
+            for (i = 0; i < psDec->subfr_length; i++) {
                 /* Unrolled loop */
                 /* Avoids introducing a bias because silk_SMLAWB() always rounds to -inf */
                 LTP_pred_Q13 = 2;
@@ -200,7 +200,7 @@ void silk_decode_core(
             pres_Q14 = pexc_Q14;
         }
 
-        for( i = 0; i < psDec->subfr_length; i++ ) {
+        for (i = 0; i < psDec->subfr_length; i++) {
             /* Short-term prediction */
             celt_assert( psDec->LPC_order == 10 || psDec->LPC_order == 16 );
             /* Avoids introducing a bias because silk_SMLAWB() always rounds to -inf */
@@ -215,7 +215,7 @@ void silk_decode_core(
             LPC_pred_Q10 = silk_SMLAWB( LPC_pred_Q10, sLPC_Q14[ MAX_LPC_ORDER + i -  8 ], A_Q12_tmp[ 7 ] );
             LPC_pred_Q10 = silk_SMLAWB( LPC_pred_Q10, sLPC_Q14[ MAX_LPC_ORDER + i -  9 ], A_Q12_tmp[ 8 ] );
             LPC_pred_Q10 = silk_SMLAWB( LPC_pred_Q10, sLPC_Q14[ MAX_LPC_ORDER + i - 10 ], A_Q12_tmp[ 9 ] );
-            if( psDec->LPC_order == 16 ) {
+            if (psDec->LPC_order == 16) {
                 LPC_pred_Q10 = silk_SMLAWB( LPC_pred_Q10, sLPC_Q14[ MAX_LPC_ORDER + i - 11 ], A_Q12_tmp[ 10 ] );
                 LPC_pred_Q10 = silk_SMLAWB( LPC_pred_Q10, sLPC_Q14[ MAX_LPC_ORDER + i - 12 ], A_Q12_tmp[ 11 ] );
                 LPC_pred_Q10 = silk_SMLAWB( LPC_pred_Q10, sLPC_Q14[ MAX_LPC_ORDER + i - 13 ], A_Q12_tmp[ 12 ] );
@@ -225,19 +225,20 @@ void silk_decode_core(
             }
 
             /* Add prediction to LPC excitation */
-            sLPC_Q14[ MAX_LPC_ORDER + i ] = silk_ADD_SAT32( pres_Q14[ i ], silk_LSHIFT_SAT32( LPC_pred_Q10, 4 ) );
+            sLPC_Q14[ MAX_LPC_ORDER + i ] = silk_ADD_SAT32( pres_Q14[ i ], silk_LSHIFT_SAT32( LPC_pred_Q10, 4 ));
 
             /* Scale with gain */
-            pxq[ i ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( sLPC_Q14[ MAX_LPC_ORDER + i ], Gain_Q10 ), 8 ) );
+            pxq[ i ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( sLPC_Q14[ MAX_LPC_ORDER + i ], Gain_Q10 ),
+            8 ));
         }
 
         /* Update LPC filter state */
-        silk_memcpy( sLPC_Q14, &sLPC_Q14[ psDec->subfr_length ], MAX_LPC_ORDER * sizeof( oac_int32 ) );
+        silk_memcpy( sLPC_Q14, &sLPC_Q14[ psDec->subfr_length ], MAX_LPC_ORDER*sizeof(oac_int32));
         pexc_Q14 += psDec->subfr_length;
         pxq      += psDec->subfr_length;
     }
 
     /* Save LPC state */
-    silk_memcpy( psDec->sLPC_Q14_buf, sLPC_Q14, MAX_LPC_ORDER * sizeof( oac_int32 ) );
+    silk_memcpy( psDec->sLPC_Q14_buf, sLPC_Q14, MAX_LPC_ORDER*sizeof(oac_int32));
     RESTORE_STACK;
 }
diff --git a/silk/decode_frame.c b/silk/decode_frame.c
index 07588aedf..f21b5fad8 100644
--- a/silk/decode_frame.c
+++ b/silk/decode_frame.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -34,7 +34,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "PLC.h"
 
 #ifdef ENABLE_OSCE
-#include "osce.h"
+# include "osce.h"
 #endif
 
 /****************/
@@ -43,21 +43,20 @@ POSSIBILITY OF SUCH DAMAGE.
 oac_int silk_decode_frame(
     silk_decoder_state          *psDec,                         /* I/O  Pointer to Silk decoder state               */
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
-    oac_int16                  pOut[],                         /* O    Pointer to output speech frame              */
+    oac_int16 pOut[],                                          /* O    Pointer to output speech frame              */
     oac_int32                  *pN,                            /* O    Pointer to size of output frame             */
-    oac_int                    lostFlag,                       /* I    0: no loss, 1 loss, 2 decode fec            */
-    oac_int                    condCoding,                     /* I    The type of conditional coding to use       */
+    oac_int lostFlag,                                          /* I    0: no loss, 1 loss, 2 decode fec            */
+    oac_int condCoding,                                        /* I    The type of conditional coding to use       */
 #ifdef ENABLE_DEEP_PLC
     LPCNetPLCState              *lpcnet,
 #endif
 #ifdef ENABLE_OSCE
     OSCEModel                   *osce_model,
 #endif
-    int                         arch                            /* I    Run-time architecture                       */
-)
-{
+    int arch                                                    /* I    Run-time architecture                       */
+    ) {
     VARDECL( silk_decoder_control, psDecCtrl );
-    oac_int         L, mv_len, ret = 0;
+    oac_int L, mv_len, ret = 0;
     SAVE_STACK;
 
     L = psDec->frame_length;
@@ -67,16 +66,15 @@ oac_int silk_decode_frame(
     /* Safety checks */
     celt_assert( L > 0 && L <= MAX_FRAME_LENGTH );
 
-    if(   lostFlag == FLAG_DECODE_NORMAL ||
-        ( lostFlag == FLAG_DECODE_LBRR && psDec->LBRR_flags[ psDec->nFramesDecoded ] == 1 ) )
-    {
+    if (lostFlag == FLAG_DECODE_NORMAL
+        || (lostFlag == FLAG_DECODE_LBRR && psDec->LBRR_flags[ psDec->nFramesDecoded ] == 1)) {
         VARDECL( oac_int16, pulses );
 #ifdef ENABLE_OSCE
-        oac_int32  ec_start;
+        oac_int32 ec_start;
         ec_start = ec_tell(psRangeDec);
 #endif
-        ALLOC( pulses, (L + SHELL_CODEC_FRAME_LENGTH - 1) &
-                       ~(SHELL_CODEC_FRAME_LENGTH - 1), oac_int16 );
+        ALLOC( pulses, (L + SHELL_CODEC_FRAME_LENGTH - 1)
+            &~(SHELL_CODEC_FRAME_LENGTH - 1), oac_int16 );
         /*********************************************/
         /* Decode quantization indices of side info  */
         /*********************************************/
@@ -103,8 +101,8 @@ oac_int silk_decode_frame(
         /*************************/
         celt_assert( psDec->ltp_mem_length >= psDec->frame_length );
         mv_len = psDec->ltp_mem_length - psDec->frame_length;
-        silk_memmove( psDec->outBuf, &psDec->outBuf[ psDec->frame_length ], mv_len * sizeof(oac_int16) );
-        silk_memcpy( &psDec->outBuf[ mv_len ], pOut, psDec->frame_length * sizeof( oac_int16 ) );
+        silk_memmove( psDec->outBuf, &psDec->outBuf[ psDec->frame_length ], mv_len*sizeof(oac_int16));
+        silk_memcpy( &psDec->outBuf[ mv_len ], pOut, psDec->frame_length*sizeof(oac_int16));
 
 #ifdef ENABLE_OSCE
         /********************************************************/
@@ -144,8 +142,8 @@ oac_int silk_decode_frame(
         /*************************/
         celt_assert( psDec->ltp_mem_length >= psDec->frame_length );
         mv_len = psDec->ltp_mem_length - psDec->frame_length;
-        silk_memmove( psDec->outBuf, &psDec->outBuf[ psDec->frame_length ], mv_len * sizeof(oac_int16) );
-        silk_memcpy( &psDec->outBuf[ mv_len ], pOut, psDec->frame_length * sizeof( oac_int16 ) );
+        silk_memmove( psDec->outBuf, &psDec->outBuf[ psDec->frame_length ], mv_len*sizeof(oac_int16));
+        silk_memcpy( &psDec->outBuf[ mv_len ], pOut, psDec->frame_length*sizeof(oac_int16));
     }
 
     /************************************************/
diff --git a/silk/decode_indices.c b/silk/decode_indices.c
index 1b6154fbf..2f8fffdb7 100644
--- a/silk/decode_indices.c
+++ b/silk/decode_indices.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -35,87 +35,88 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_decode_indices(
     silk_decoder_state          *psDec,                         /* I/O  State                                       */
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
-    oac_int                    FrameIndex,                     /* I    Frame number                                */
-    oac_int                    decode_LBRR,                    /* I    Flag indicating LBRR data is being decoded  */
-    oac_int                    condCoding                      /* I    The type of conditional coding to use       */
-)
-{
-    oac_int   i, k, Ix;
-    oac_int   decode_absolute_lagIndex, delta_lagIndex;
+    oac_int FrameIndex,                                        /* I    Frame number                                */
+    oac_int decode_LBRR,                                       /* I    Flag indicating LBRR data is being decoded  */
+    oac_int condCoding                                         /* I    The type of conditional coding to use       */
+    ) {
+    oac_int i, k, Ix;
+    oac_int decode_absolute_lagIndex, delta_lagIndex;
     oac_int16 ec_ix[ MAX_LPC_ORDER ];
     oac_uint8 pred_Q8[ MAX_LPC_ORDER ];
 
     /*******************************************/
     /* Decode signal type and quantizer offset */
     /*******************************************/
-    if( decode_LBRR || psDec->VAD_flags[ FrameIndex ] ) {
+    if (decode_LBRR || psDec->VAD_flags[ FrameIndex ]) {
         Ix = ec_dec_icdf( psRangeDec, silk_type_offset_VAD_iCDF, 8 ) + 2;
     } else {
         Ix = ec_dec_icdf( psRangeDec, silk_type_offset_no_VAD_iCDF, 8 );
     }
     psDec->indices.signalType      = (oac_int8)silk_RSHIFT( Ix, 1 );
-    psDec->indices.quantOffsetType = (oac_int8)( Ix & 1 );
+    psDec->indices.quantOffsetType = (oac_int8)(Ix&1);
 
     /****************/
     /* Decode gains */
     /****************/
     /* First subframe */
-    if( condCoding == CODE_CONDITIONALLY ) {
+    if (condCoding == CODE_CONDITIONALLY) {
         /* Conditional coding */
         psDec->indices.GainsIndices[ 0 ] = (oac_int8)ec_dec_icdf( psRangeDec, silk_delta_gain_iCDF, 8 );
     } else {
         /* Independent coding, in two stages: MSB bits followed by 3 LSBs */
-        psDec->indices.GainsIndices[ 0 ]  = (oac_int8)silk_LSHIFT( ec_dec_icdf( psRangeDec, silk_gain_iCDF[ psDec->indices.signalType ], 8 ), 3 );
+        psDec->indices.GainsIndices[ 0 ]  = (oac_int8)silk_LSHIFT( ec_dec_icdf( psRangeDec,
+        silk_gain_iCDF[ psDec->indices.signalType ], 8 ), 3 );
         psDec->indices.GainsIndices[ 0 ] += (oac_int8)ec_dec_icdf( psRangeDec, silk_uniform8_iCDF, 8 );
     }
 
     /* Remaining subframes */
-    for( i = 1; i < psDec->nb_subfr; i++ ) {
+    for (i = 1; i < psDec->nb_subfr; i++) {
         psDec->indices.GainsIndices[ i ] = (oac_int8)ec_dec_icdf( psRangeDec, silk_delta_gain_iCDF, 8 );
     }
 
     /**********************/
     /* Decode LSF Indices */
     /**********************/
-    psDec->indices.NLSFIndices[ 0 ] = (oac_int8)ec_dec_icdf( psRangeDec, &psDec->psNLSF_CB->CB1_iCDF[ ( psDec->indices.signalType >> 1 ) * psDec->psNLSF_CB->nVectors ], 8 );
+    psDec->indices.NLSFIndices[ 0 ] = (oac_int8)ec_dec_icdf( psRangeDec,
+    &psDec->psNLSF_CB->CB1_iCDF[ (psDec->indices.signalType>>1)*psDec->psNLSF_CB->nVectors ], 8 );
     silk_NLSF_unpack( ec_ix, pred_Q8, psDec->psNLSF_CB, psDec->indices.NLSFIndices[ 0 ] );
     celt_assert( psDec->psNLSF_CB->order == psDec->LPC_order );
-    for( i = 0; i < psDec->psNLSF_CB->order; i++ ) {
+    for (i = 0; i < psDec->psNLSF_CB->order; i++) {
         Ix = ec_dec_icdf( psRangeDec, &psDec->psNLSF_CB->ec_iCDF[ ec_ix[ i ] ], 8 );
-        if( Ix == 0 ) {
+        if (Ix == 0) {
             Ix -= ec_dec_icdf( psRangeDec, silk_NLSF_EXT_iCDF, 8 );
-        } else if( Ix == 2 * NLSF_QUANT_MAX_AMPLITUDE ) {
+        } else if (Ix == 2*NLSF_QUANT_MAX_AMPLITUDE) {
             Ix += ec_dec_icdf( psRangeDec, silk_NLSF_EXT_iCDF, 8 );
         }
-        psDec->indices.NLSFIndices[ i+1 ] = (oac_int8)( Ix - NLSF_QUANT_MAX_AMPLITUDE );
+        psDec->indices.NLSFIndices[ i + 1 ] = (oac_int8)(Ix - NLSF_QUANT_MAX_AMPLITUDE);
     }
 
     /* Decode LSF interpolation factor */
-    if( psDec->nb_subfr == MAX_NB_SUBFR ) {
+    if (psDec->nb_subfr == MAX_NB_SUBFR) {
         psDec->indices.NLSFInterpCoef_Q2 = (oac_int8)ec_dec_icdf( psRangeDec, silk_NLSF_interpolation_factor_iCDF, 8 );
     } else {
         psDec->indices.NLSFInterpCoef_Q2 = 4;
     }
 
-    if( psDec->indices.signalType == TYPE_VOICED )
-    {
+    if (psDec->indices.signalType == TYPE_VOICED) {
         /*********************/
         /* Decode pitch lags */
         /*********************/
         /* Get lag index */
         decode_absolute_lagIndex = 1;
-        if( condCoding == CODE_CONDITIONALLY && psDec->ec_prevSignalType == TYPE_VOICED ) {
+        if (condCoding == CODE_CONDITIONALLY && psDec->ec_prevSignalType == TYPE_VOICED) {
             /* Decode Delta index */
             delta_lagIndex = (oac_int16)ec_dec_icdf( psRangeDec, silk_pitch_delta_iCDF, 8 );
-            if( delta_lagIndex > 0 ) {
+            if (delta_lagIndex > 0) {
                 delta_lagIndex = delta_lagIndex - 9;
-                psDec->indices.lagIndex = (oac_int16)( psDec->ec_prevLagIndex + delta_lagIndex );
+                psDec->indices.lagIndex = (oac_int16)(psDec->ec_prevLagIndex + delta_lagIndex);
                 decode_absolute_lagIndex = 0;
             }
         }
-        if( decode_absolute_lagIndex ) {
+        if (decode_absolute_lagIndex) {
             /* Absolute decoding */
-            psDec->indices.lagIndex  = (oac_int16)ec_dec_icdf( psRangeDec, silk_pitch_lag_iCDF, 8 ) * silk_RSHIFT( psDec->fs_kHz, 1 );
+            psDec->indices.lagIndex  = (oac_int16)ec_dec_icdf( psRangeDec, silk_pitch_lag_iCDF,
+            8 )*silk_RSHIFT( psDec->fs_kHz, 1 );
             psDec->indices.lagIndex += (oac_int16)ec_dec_icdf( psRangeDec, psDec->pitch_lag_low_bits_iCDF, 8 );
         }
         psDec->ec_prevLagIndex = psDec->indices.lagIndex;
@@ -129,14 +130,15 @@ void silk_decode_indices(
         /* Decode PERIndex value */
         psDec->indices.PERIndex = (oac_int8)ec_dec_icdf( psRangeDec, silk_LTP_per_index_iCDF, 8 );
 
-        for( k = 0; k < psDec->nb_subfr; k++ ) {
-            psDec->indices.LTPIndex[ k ] = (oac_int8)ec_dec_icdf( psRangeDec, silk_LTP_gain_iCDF_ptrs[ psDec->indices.PERIndex ], 8 );
+        for (k = 0; k < psDec->nb_subfr; k++) {
+            psDec->indices.LTPIndex[ k ] = (oac_int8)ec_dec_icdf( psRangeDec,
+            silk_LTP_gain_iCDF_ptrs[ psDec->indices.PERIndex ], 8 );
         }
 
         /**********************/
         /* Decode LTP scaling */
         /**********************/
-        if( condCoding == CODE_INDEPENDENTLY ) {
+        if (condCoding == CODE_INDEPENDENTLY) {
             psDec->indices.LTP_scaleIndex = (oac_int8)ec_dec_icdf( psRangeDec, silk_LTPscale_iCDF, 8 );
         } else {
             psDec->indices.LTP_scaleIndex = 0;
diff --git a/silk/decode_parameters.c b/silk/decode_parameters.c
index 73638c35f..f65ae88c5 100644
--- a/silk/decode_parameters.c
+++ b/silk/decode_parameters.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -35,10 +35,9 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_decode_parameters(
     silk_decoder_state          *psDec,                         /* I/O  State                                       */
     silk_decoder_control        *psDecCtrl,                     /* I/O  Decoder control                             */
-    oac_int                    condCoding                      /* I    The type of conditional coding to use       */
-)
-{
-    oac_int   i, k, Ix;
+    oac_int condCoding                                         /* I    The type of conditional coding to use       */
+    ) {
+    oac_int i, k, Ix;
     oac_int16 pNLSF_Q15[ MAX_LPC_ORDER ], pNLSF0_Q15[ MAX_LPC_ORDER ];
     const oac_int8 *cbk_ptr_Q7;
 
@@ -56,14 +55,14 @@ void silk_decode_parameters(
 
     /* If just reset, e.g., because internal Fs changed, do not allow interpolation */
     /* improves the case of packet loss in the first frame after a switch           */
-    if( psDec->first_frame_after_reset == 1 ) {
+    if (psDec->first_frame_after_reset == 1) {
         psDec->indices.NLSFInterpCoef_Q2 = 4;
     }
 
-    if( psDec->indices.NLSFInterpCoef_Q2 < 4 ) {
+    if (psDec->indices.NLSFInterpCoef_Q2 < 4) {
         /* Calculation of the interpolated NLSF0 vector from the interpolation factor, */
         /* the previous NLSF1, and the current NLSF1                                   */
-        for( i = 0; i < psDec->LPC_order; i++ ) {
+        for (i = 0; i < psDec->LPC_order; i++) {
             pNLSF0_Q15[ i ] = psDec->prevNLSF_Q15[ i ] + silk_RSHIFT( silk_MUL( psDec->indices.NLSFInterpCoef_Q2,
                 pNLSF_Q15[ i ] - psDec->prevNLSF_Q15[ i ] ), 2 );
         }
@@ -72,32 +71,33 @@ void silk_decode_parameters(
         silk_NLSF2A( psDecCtrl->PredCoef_Q12[ 0 ], pNLSF0_Q15, psDec->LPC_order, psDec->arch );
     } else {
         /* Copy LPC coefficients for first half from second half */
-        silk_memcpy( psDecCtrl->PredCoef_Q12[ 0 ], psDecCtrl->PredCoef_Q12[ 1 ], psDec->LPC_order * sizeof( oac_int16 ) );
+        silk_memcpy( psDecCtrl->PredCoef_Q12[ 0 ], psDecCtrl->PredCoef_Q12[ 1 ], psDec->LPC_order*sizeof(oac_int16));
     }
 
-    silk_memcpy( psDec->prevNLSF_Q15, pNLSF_Q15, psDec->LPC_order * sizeof( oac_int16 ) );
+    silk_memcpy( psDec->prevNLSF_Q15, pNLSF_Q15, psDec->LPC_order*sizeof(oac_int16));
 
     /* After a packet loss do BWE of LPC coefs */
-    if( psDec->lossCnt ) {
+    if (psDec->lossCnt) {
         silk_bwexpander( psDecCtrl->PredCoef_Q12[ 0 ], psDec->LPC_order, BWE_AFTER_LOSS_Q16 );
         silk_bwexpander( psDecCtrl->PredCoef_Q12[ 1 ], psDec->LPC_order, BWE_AFTER_LOSS_Q16 );
     }
 
-    if( psDec->indices.signalType == TYPE_VOICED ) {
+    if (psDec->indices.signalType == TYPE_VOICED) {
         /*********************/
         /* Decode pitch lags */
         /*********************/
 
         /* Decode pitch values */
-        silk_decode_pitch( psDec->indices.lagIndex, psDec->indices.contourIndex, psDecCtrl->pitchL, psDec->fs_kHz, psDec->nb_subfr );
+        silk_decode_pitch( psDec->indices.lagIndex, psDec->indices.contourIndex, psDecCtrl->pitchL, psDec->fs_kHz,
+        psDec->nb_subfr );
 
         /* Decode Codebook Index */
         cbk_ptr_Q7 = silk_LTP_vq_ptrs_Q7[ psDec->indices.PERIndex ]; /* set pointer to start of codebook */
 
-        for( k = 0; k < psDec->nb_subfr; k++ ) {
+        for (k = 0; k < psDec->nb_subfr; k++) {
             Ix = psDec->indices.LTPIndex[ k ];
-            for( i = 0; i < LTP_ORDER; i++ ) {
-                psDecCtrl->LTPCoef_Q14[ k * LTP_ORDER + i ] = silk_LSHIFT( cbk_ptr_Q7[ Ix * LTP_ORDER + i ], 7 );
+            for (i = 0; i < LTP_ORDER; i++) {
+                psDecCtrl->LTPCoef_Q14[ k*LTP_ORDER + i ] = silk_LSHIFT( cbk_ptr_Q7[ Ix*LTP_ORDER + i ], 7 );
             }
         }
 
@@ -107,8 +107,8 @@ void silk_decode_parameters(
         Ix = psDec->indices.LTP_scaleIndex;
         psDecCtrl->LTP_scale_Q14 = silk_LTPScales_table_Q14[ Ix ];
     } else {
-        silk_memset( psDecCtrl->pitchL,      0,             psDec->nb_subfr * sizeof( oac_int   ) );
-        silk_memset( psDecCtrl->LTPCoef_Q14, 0, LTP_ORDER * psDec->nb_subfr * sizeof( oac_int16 ) );
+        silk_memset( psDecCtrl->pitchL,      0,             psDec->nb_subfr*sizeof(oac_int));
+        silk_memset( psDecCtrl->LTPCoef_Q14, 0, LTP_ORDER*psDec->nb_subfr*sizeof(oac_int16));
         psDec->indices.PERIndex  = 0;
         psDecCtrl->LTP_scale_Q14 = 0;
     }
diff --git a/silk/decode_pitch.c b/silk/decode_pitch.c
index 8918095e9..0983e0603 100644
--- a/silk/decode_pitch.c
+++ b/silk/decode_pitch.c
@@ -1,66 +1,65 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 /***********************************************************
-* Pitch analyser function
-********************************************************** */
+ * Pitch analyser function
+ ********************************************************** */
 #include "SigProc_FIX.h"
 #include "pitch_est_defines.h"
 
 void silk_decode_pitch(
-    oac_int16                  lagIndex,           /* I                                                                */
-    oac_int8                   contourIndex,       /* O                                                                */
-    oac_int                    pitch_lags[],       /* O    4 pitch values                                              */
-    const oac_int              Fs_kHz,             /* I    sampling frequency (kHz)                                    */
-    const oac_int              nb_subfr            /* I    number of sub frames                                        */
-)
-{
-    oac_int   lag, k, min_lag, max_lag, cbk_size;
+    oac_int16 lagIndex,                            /* I                                                                */
+    oac_int8 contourIndex,                         /* O                                                                */
+    oac_int pitch_lags[],                          /* O    4 pitch values                                              */
+    const oac_int Fs_kHz,                          /* I    sampling frequency (kHz)                                    */
+    const oac_int nb_subfr                         /* I    number of sub frames                                        */
+    ) {
+    oac_int lag, k, min_lag, max_lag, cbk_size;
     const oac_int8 *Lag_CB_ptr;
 
-    if( Fs_kHz == 8 ) {
-        if( nb_subfr == PE_MAX_NB_SUBFR ) {
+    if (Fs_kHz == 8) {
+        if (nb_subfr == PE_MAX_NB_SUBFR) {
             Lag_CB_ptr = &silk_CB_lags_stage2[ 0 ][ 0 ];
             cbk_size   = PE_NB_CBKS_STAGE2_EXT;
         } else {
-            celt_assert( nb_subfr == PE_MAX_NB_SUBFR >> 1 );
+            celt_assert( nb_subfr == PE_MAX_NB_SUBFR>>1 );
             Lag_CB_ptr = &silk_CB_lags_stage2_10_ms[ 0 ][ 0 ];
             cbk_size   = PE_NB_CBKS_STAGE2_10MS;
         }
     } else {
-        if( nb_subfr == PE_MAX_NB_SUBFR ) {
+        if (nb_subfr == PE_MAX_NB_SUBFR) {
             Lag_CB_ptr = &silk_CB_lags_stage3[ 0 ][ 0 ];
             cbk_size   = PE_NB_CBKS_STAGE3_MAX;
         } else {
-            celt_assert( nb_subfr == PE_MAX_NB_SUBFR >> 1 );
+            celt_assert( nb_subfr == PE_MAX_NB_SUBFR>>1 );
             Lag_CB_ptr = &silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
             cbk_size   = PE_NB_CBKS_STAGE3_10MS;
         }
@@ -70,7 +69,7 @@ void silk_decode_pitch(
     max_lag = silk_SMULBB( PE_MAX_LAG_MS, Fs_kHz );
     lag = min_lag + lagIndex;
 
-    for( k = 0; k < nb_subfr; k++ ) {
+    for (k = 0; k < nb_subfr; k++) {
         pitch_lags[ k ] = lag + matrix_ptr( Lag_CB_ptr, k, contourIndex, cbk_size );
         pitch_lags[ k ] = silk_LIMIT( pitch_lags[ k ], min_lag, max_lag );
     }
diff --git a/silk/decode_pulses.c b/silk/decode_pulses.c
index dd8394e3c..7fbe142d5 100644
--- a/silk/decode_pulses.c
+++ b/silk/decode_pulses.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -36,27 +36,26 @@ POSSIBILITY OF SUCH DAMAGE.
 /*********************************************/
 void silk_decode_pulses(
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
-    oac_int16                  pulses[],                       /* O    Excitation signal                           */
-    const oac_int              signalType,                     /* I    Sigtype                                     */
-    const oac_int              quantOffsetType,                /* I    quantOffsetType                             */
-    const oac_int              frame_length                    /* I    Frame length                                */
-)
-{
-    oac_int   i, j, k, iter, abs_q, nLS, RateLevelIndex;
-    oac_int   sum_pulses[ MAX_NB_SHELL_BLOCKS ], nLshifts[ MAX_NB_SHELL_BLOCKS ];
+    oac_int16 pulses[],                                        /* O    Excitation signal                           */
+    const oac_int signalType,                                  /* I    Sigtype                                     */
+    const oac_int quantOffsetType,                             /* I    quantOffsetType                             */
+    const oac_int frame_length                                 /* I    Frame length                                */
+    ) {
+    oac_int i, j, k, iter, abs_q, nLS, RateLevelIndex;
+    oac_int sum_pulses[ MAX_NB_SHELL_BLOCKS ], nLshifts[ MAX_NB_SHELL_BLOCKS ];
     oac_int16 *pulses_ptr;
     const oac_uint8 *cdf_ptr;
 
     /*********************/
     /* Decode rate level */
     /*********************/
-    RateLevelIndex = ec_dec_icdf( psRangeDec, silk_rate_levels_iCDF[ signalType >> 1 ], 8 );
+    RateLevelIndex = ec_dec_icdf( psRangeDec, silk_rate_levels_iCDF[ signalType>>1 ], 8 );
 
     /* Calculate number of shell blocks */
-    silk_assert( 1 << LOG2_SHELL_CODEC_FRAME_LENGTH == SHELL_CODEC_FRAME_LENGTH );
+    silk_assert( 1<<LOG2_SHELL_CODEC_FRAME_LENGTH == SHELL_CODEC_FRAME_LENGTH );
     iter = silk_RSHIFT( frame_length, LOG2_SHELL_CODEC_FRAME_LENGTH );
-    if( iter * SHELL_CODEC_FRAME_LENGTH < frame_length ) {
-        celt_assert( frame_length == 12 * 10 ); /* Make sure only happens for 10 ms @ 12 kHz */
+    if (iter*SHELL_CODEC_FRAME_LENGTH < frame_length) {
+        celt_assert( frame_length == 12*10 );   /* Make sure only happens for 10 ms @ 12 kHz */
         iter++;
     }
 
@@ -64,47 +63,48 @@ void silk_decode_pulses(
     /* Sum-Weighted-Pulses Decoding                    */
     /***************************************************/
     cdf_ptr = silk_pulses_per_block_iCDF[ RateLevelIndex ];
-    for( i = 0; i < iter; i++ ) {
+    for (i = 0; i < iter; i++) {
         nLshifts[ i ] = 0;
         sum_pulses[ i ] = ec_dec_icdf( psRangeDec, cdf_ptr, 8 );
 
         /* LSB indication */
-        while( sum_pulses[ i ] == SILK_MAX_PULSES + 1 ) {
+        while (sum_pulses[ i ] == SILK_MAX_PULSES + 1) {
             nLshifts[ i ]++;
             /* When we've already got 10 LSBs, we shift the table to not allow (SILK_MAX_PULSES + 1) */
             sum_pulses[ i ] = ec_dec_icdf( psRangeDec,
-                    silk_pulses_per_block_iCDF[ N_RATE_LEVELS - 1] + ( nLshifts[ i ] == 10 ), 8 );
+                    silk_pulses_per_block_iCDF[ N_RATE_LEVELS - 1] + (nLshifts[ i ] == 10), 8 );
         }
     }
 
     /***************************************************/
     /* Shell decoding                                  */
     /***************************************************/
-    for( i = 0; i < iter; i++ ) {
-        if( sum_pulses[ i ] > 0 ) {
+    for (i = 0; i < iter; i++) {
+        if (sum_pulses[ i ] > 0) {
             silk_shell_decoder( &pulses[ silk_SMULBB( i, SHELL_CODEC_FRAME_LENGTH ) ], psRangeDec, sum_pulses[ i ] );
         } else {
-            silk_memset( &pulses[ silk_SMULBB( i, SHELL_CODEC_FRAME_LENGTH ) ], 0, SHELL_CODEC_FRAME_LENGTH * sizeof( pulses[0] ) );
+            silk_memset( &pulses[ silk_SMULBB( i, SHELL_CODEC_FRAME_LENGTH ) ], 0,
+            SHELL_CODEC_FRAME_LENGTH*sizeof(pulses[0]));
         }
     }
 
     /***************************************************/
     /* LSB Decoding                                    */
     /***************************************************/
-    for( i = 0; i < iter; i++ ) {
-        if( nLshifts[ i ] > 0 ) {
+    for (i = 0; i < iter; i++) {
+        if (nLshifts[ i ] > 0) {
             nLS = nLshifts[ i ];
             pulses_ptr = &pulses[ silk_SMULBB( i, SHELL_CODEC_FRAME_LENGTH ) ];
-            for( k = 0; k < SHELL_CODEC_FRAME_LENGTH; k++ ) {
+            for (k = 0; k < SHELL_CODEC_FRAME_LENGTH; k++) {
                 abs_q = pulses_ptr[ k ];
-                for( j = 0; j < nLS; j++ ) {
+                for (j = 0; j < nLS; j++) {
                     abs_q = silk_LSHIFT( abs_q, 1 );
                     abs_q += ec_dec_icdf( psRangeDec, silk_lsb_iCDF, 8 );
                 }
                 pulses_ptr[ k ] = abs_q;
             }
             /* Mark the number of pulses non-zero for sign decoding. */
-            sum_pulses[ i ] |= nLS << 5;
+            sum_pulses[ i ] |= nLS<<5;
         }
     }
 
diff --git a/silk/decoder_set_fs.c b/silk/decoder_set_fs.c
index 12c5f06a5..cdf54f83b 100644
--- a/silk/decoder_set_fs.c
+++ b/silk/decoder_set_fs.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -34,10 +34,9 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Set decoder sampling rate */
 oac_int silk_decoder_set_fs(
     silk_decoder_state          *psDec,                         /* I/O  Decoder state pointer                       */
-    oac_int                    fs_kHz,                         /* I    Sampling frequency (kHz)                    */
-    oac_int32                  fs_API_Hz                       /* I    API Sampling frequency (Hz)                 */
-)
-{
+    oac_int fs_kHz,                                            /* I    Sampling frequency (kHz)                    */
+    oac_int32 fs_API_Hz                                        /* I    API Sampling frequency (Hz)                 */
+    ) {
     oac_int frame_length, ret = 0;
 
     celt_assert( fs_kHz == 8 || fs_kHz == 12 || fs_kHz == 16 );
@@ -48,41 +47,41 @@ oac_int silk_decoder_set_fs(
     frame_length = silk_SMULBB( psDec->nb_subfr, psDec->subfr_length );
 
     /* Initialize resampler when switching internal or external sampling frequency */
-    if( psDec->fs_kHz != fs_kHz || psDec->fs_API_hz != fs_API_Hz ) {
+    if (psDec->fs_kHz != fs_kHz || psDec->fs_API_hz != fs_API_Hz) {
         /* Initialize the resampler for dec_API.c preparing resampling from fs_kHz to API_fs_Hz */
         ret += silk_resampler_init( &psDec->resampler_state, silk_SMULBB( fs_kHz, 1000 ), fs_API_Hz, 0 );
 
         psDec->fs_API_hz = fs_API_Hz;
     }
 
-    if( psDec->fs_kHz != fs_kHz || frame_length != psDec->frame_length ) {
-        if( fs_kHz == 8 ) {
-            if( psDec->nb_subfr == MAX_NB_SUBFR ) {
+    if (psDec->fs_kHz != fs_kHz || frame_length != psDec->frame_length) {
+        if (fs_kHz == 8) {
+            if (psDec->nb_subfr == MAX_NB_SUBFR) {
                 psDec->pitch_contour_iCDF = silk_pitch_contour_NB_iCDF;
             } else {
                 psDec->pitch_contour_iCDF = silk_pitch_contour_10_ms_NB_iCDF;
             }
         } else {
-            if( psDec->nb_subfr == MAX_NB_SUBFR ) {
+            if (psDec->nb_subfr == MAX_NB_SUBFR) {
                 psDec->pitch_contour_iCDF = silk_pitch_contour_iCDF;
             } else {
                 psDec->pitch_contour_iCDF = silk_pitch_contour_10_ms_iCDF;
             }
         }
-        if( psDec->fs_kHz != fs_kHz ) {
+        if (psDec->fs_kHz != fs_kHz) {
             psDec->ltp_mem_length = silk_SMULBB( LTP_MEM_LENGTH_MS, fs_kHz );
-            if( fs_kHz == 8 || fs_kHz == 12 ) {
+            if (fs_kHz == 8 || fs_kHz == 12) {
                 psDec->LPC_order = MIN_LPC_ORDER;
                 psDec->psNLSF_CB = &silk_NLSF_CB_NB_MB;
             } else {
                 psDec->LPC_order = MAX_LPC_ORDER;
                 psDec->psNLSF_CB = &silk_NLSF_CB_WB;
             }
-            if( fs_kHz == 16 ) {
+            if (fs_kHz == 16) {
                 psDec->pitch_lag_low_bits_iCDF = silk_uniform8_iCDF;
-            } else if( fs_kHz == 12 ) {
+            } else if (fs_kHz == 12) {
                 psDec->pitch_lag_low_bits_iCDF = silk_uniform6_iCDF;
-            } else if( fs_kHz == 8 ) {
+            } else if (fs_kHz == 8) {
                 psDec->pitch_lag_low_bits_iCDF = silk_uniform4_iCDF;
             } else {
                 /* unsupported sampling rate */
@@ -93,7 +92,7 @@ oac_int silk_decoder_set_fs(
             psDec->LastGainIndex           = 10;
             psDec->prevSignalType          = TYPE_NO_VOICE_ACTIVITY;
             silk_memset( psDec->outBuf, 0, sizeof(psDec->outBuf));
-            silk_memset( psDec->sLPC_Q14_buf, 0, sizeof(psDec->sLPC_Q14_buf) );
+            silk_memset( psDec->sLPC_Q14_buf, 0, sizeof(psDec->sLPC_Q14_buf));
         }
 
         psDec->fs_kHz       = fs_kHz;
diff --git a/silk/define.h b/silk/define.h
index caed67103..b6123731c 100644
--- a/silk/define.h
+++ b/silk/define.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_DEFINE_H
@@ -61,9 +61,9 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Maximum sampling frequency */
 #define MAX_FS_KHZ                              16
 #ifdef ENABLE_QEXT
-#define MAX_API_FS_KHZ                          96
+# define MAX_API_FS_KHZ                          96
 #else
-#define MAX_API_FS_KHZ                          48
+# define MAX_API_FS_KHZ                          48
 #endif
 
 /* Signal types */
@@ -92,28 +92,28 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Number of samples per frame */
 #define LTP_MEM_LENGTH_MS                       20
 #define SUB_FRAME_LENGTH_MS                     5
-#define MAX_SUB_FRAME_LENGTH                    ( SUB_FRAME_LENGTH_MS * MAX_FS_KHZ )
-#define MAX_FRAME_LENGTH_MS                     ( SUB_FRAME_LENGTH_MS * MAX_NB_SUBFR )
-#define MAX_FRAME_LENGTH                        ( MAX_FRAME_LENGTH_MS * MAX_FS_KHZ )
+#define MAX_SUB_FRAME_LENGTH                    (SUB_FRAME_LENGTH_MS*MAX_FS_KHZ)
+#define MAX_FRAME_LENGTH_MS                     (SUB_FRAME_LENGTH_MS*MAX_NB_SUBFR)
+#define MAX_FRAME_LENGTH                        (MAX_FRAME_LENGTH_MS*MAX_FS_KHZ)
 
 /* Milliseconds of lookahead for pitch analysis */
 #define LA_PITCH_MS                             2
-#define LA_PITCH_MAX                            ( LA_PITCH_MS * MAX_FS_KHZ )
+#define LA_PITCH_MAX                            (LA_PITCH_MS*MAX_FS_KHZ)
 
 /* Order of LPC used in find pitch */
 #define MAX_FIND_PITCH_LPC_ORDER                16
 
 /* Length of LPC window used in find pitch */
-#define FIND_PITCH_LPC_WIN_MS                   ( 20 + (LA_PITCH_MS << 1) )
-#define FIND_PITCH_LPC_WIN_MS_2_SF              ( 10 + (LA_PITCH_MS << 1) )
-#define FIND_PITCH_LPC_WIN_MAX                  ( FIND_PITCH_LPC_WIN_MS * MAX_FS_KHZ )
+#define FIND_PITCH_LPC_WIN_MS                   (20 + (LA_PITCH_MS<<1))
+#define FIND_PITCH_LPC_WIN_MS_2_SF              (10 + (LA_PITCH_MS<<1))
+#define FIND_PITCH_LPC_WIN_MAX                  (FIND_PITCH_LPC_WIN_MS*MAX_FS_KHZ)
 
 /* Milliseconds of lookahead for noise shape analysis */
 #define LA_SHAPE_MS                             5
-#define LA_SHAPE_MAX                            ( LA_SHAPE_MS * MAX_FS_KHZ )
+#define LA_SHAPE_MAX                            (LA_SHAPE_MS*MAX_FS_KHZ)
 
 /* Maximum length of LPC window used in noise shape analysis */
-#define SHAPE_LPC_WIN_MAX                       ( 15 * MAX_FS_KHZ )
+#define SHAPE_LPC_WIN_MAX                       (15*MAX_FS_KHZ)
 
 /* dB level of lowest gain quantization level */
 #define MIN_QGAIN_DB                            2
@@ -160,14 +160,14 @@ POSSIBILITY OF SUCH DAMAGE.
 #define MAX_DEL_DEC_STATES                      4
 
 #define LTP_BUF_LENGTH                          512
-#define LTP_MASK                                ( LTP_BUF_LENGTH - 1 )
+#define LTP_MASK                                (LTP_BUF_LENGTH - 1)
 
 #define DECISION_DELAY                          40
 
 /* Number of subframes for excitation entropy coding */
 #define SHELL_CODEC_FRAME_LENGTH                16
 #define LOG2_SHELL_CODEC_FRAME_LENGTH           4
-#define MAX_NB_SHELL_BLOCKS                     ( MAX_FRAME_LENGTH / SHELL_CODEC_FRAME_LENGTH )
+#define MAX_NB_SHELL_BLOCKS                     (MAX_FRAME_LENGTH/SHELL_CODEC_FRAME_LENGTH)
 
 /* Number of rate levels, for entropy coding of excitation */
 #define N_RATE_LEVELS                           10
@@ -177,7 +177,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #define MAX_MATRIX_SIZE                         MAX_LPC_ORDER /* Max of LPC Order and LTP order */
 
-# define NSQ_LPC_BUF_LENGTH                     MAX_LPC_ORDER
+#define NSQ_LPC_BUF_LENGTH                     MAX_LPC_ORDER
 
 /***************************/
 /* Voice activity detector */
@@ -185,7 +185,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #define VAD_N_BANDS                             4
 
 #define VAD_INTERNAL_SUBFRAMES_LOG2             2
-#define VAD_INTERNAL_SUBFRAMES                  ( 1 << VAD_INTERNAL_SUBFRAMES_LOG2 )
+#define VAD_INTERNAL_SUBFRAMES                  (1<<VAD_INTERNAL_SUBFRAMES_LOG2)
 
 #define VAD_NOISE_LEVEL_SMOOTH_COEF_Q16         1024    /* Must be <  4096 */
 #define VAD_NOISE_LEVELS_BIAS                   50
@@ -209,15 +209,15 @@ POSSIBILITY OF SUCH DAMAGE.
 #define NLSF_QUANT_MAX_AMPLITUDE_EXT            10
 #define NLSF_QUANT_LEVEL_ADJ                    0.1
 #define NLSF_QUANT_DEL_DEC_STATES_LOG2          2
-#define NLSF_QUANT_DEL_DEC_STATES               ( 1 << NLSF_QUANT_DEL_DEC_STATES_LOG2 )
+#define NLSF_QUANT_DEL_DEC_STATES               (1<<NLSF_QUANT_DEL_DEC_STATES_LOG2)
 
 /* Transition filtering for mode switching */
 #define TRANSITION_TIME_MS                      5120    /* 5120 = 64 * FRAME_LENGTH_MS * ( TRANSITION_INT_NUM - 1 ) = 64*(20*4)*/
 #define TRANSITION_NB                           3       /* Hardcoded in tables */
 #define TRANSITION_NA                           2       /* Hardcoded in tables */
 #define TRANSITION_INT_NUM                      5       /* Hardcoded in tables */
-#define TRANSITION_FRAMES                       ( TRANSITION_TIME_MS / MAX_FRAME_LENGTH_MS )
-#define TRANSITION_INT_STEPS                    ( TRANSITION_FRAMES  / ( TRANSITION_INT_NUM - 1 ) )
+#define TRANSITION_FRAMES                       (TRANSITION_TIME_MS/MAX_FRAME_LENGTH_MS)
+#define TRANSITION_INT_STEPS                    (TRANSITION_FRAMES/(TRANSITION_INT_NUM - 1))
 
 /* BWE factors to apply after packet loss */
 #define BWE_AFTER_LOSS_Q16                      63570
diff --git a/silk/enc_API.c b/silk/enc_API.c
index a9520f078..996561894 100644
--- a/silk/enc_API.c
+++ b/silk/enc_API.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 #include "define.h"
 #include "API.h"
@@ -36,13 +36,13 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "structs.h"
 #include "tuning_parameters.h"
 #ifdef FIXED_POINT
-#include "main_FIX.h"
+# include "main_FIX.h"
 #else
-#include "main_FLP.h"
+# include "main_FLP.h"
 #endif
 
 #ifdef ENABLE_DRED
-#include "dred_encoder.h"
+# include "dred_encoder.h"
 #endif
 
 /***************************************/
@@ -51,7 +51,7 @@ POSSIBILITY OF SUCH DAMAGE.
 static oac_int silk_QueryEncoder(                      /* O    Returns error code                              */
     const void                      *encState,          /* I    State                                           */
     silk_EncControlStruct           *encStatus          /* O    Encoder Status                                  */
-);
+    );
 
 /****************************************/
 /* Encoder functions                    */
@@ -59,15 +59,14 @@ static oac_int silk_QueryEncoder(                      /* O    Returns error cod
 
 oac_int silk_Get_Encoder_Size(                         /* O    Returns error code                              */
     oac_int                        *encSizeBytes,      /* O    Number of bytes in SILK encoder state           */
-    oac_int                         channels           /* I    Number of channels                              */
-)
-{
+    oac_int channels                                   /* I    Number of channels                              */
+    ) {
     oac_int ret = SILK_NO_ERROR;
 
-    *encSizeBytes = sizeof( silk_encoder );
+    *encSizeBytes = sizeof(silk_encoder);
     /* Skip second encoder state for mono. */
-    if ( channels == 1 ) {
-        *encSizeBytes -= sizeof( silk_encoder_state_Fxx );
+    if (channels == 1) {
+        *encSizeBytes -= sizeof(silk_encoder_state_Fxx);
     }
 
     return ret;
@@ -78,20 +77,19 @@ oac_int silk_Get_Encoder_Size(                         /* O    Returns error cod
 /*************************/
 oac_int silk_InitEncoder(                              /* O    Returns error code                              */
     void                            *encState,          /* I/O  State                                           */
-    int                              channels,          /* I    Number of channels                              */
-    int                              arch,              /* I    Run-time architecture                           */
+    int channels,                                       /* I    Number of channels                              */
+    int arch,                                           /* I    Run-time architecture                           */
     silk_EncControlStruct           *encStatus          /* O    Encoder Status                                  */
-)
-{
+    ) {
     silk_encoder *psEnc;
     oac_int n, ret = SILK_NO_ERROR;
 
     psEnc = (silk_encoder *)encState;
 
     /* Reset encoder. Skip second encoder state for mono. */
-    silk_memset( psEnc, 0, sizeof( silk_encoder ) - (channels==1)*sizeof( silk_encoder_state_Fxx ) );
-    for( n = 0; n < channels; n++ ) {
-        if( ret += silk_init_encoder( &psEnc->state_Fxx[ n ], arch ) ) {
+    silk_memset( psEnc, 0, sizeof(silk_encoder) - (channels == 1)*sizeof(silk_encoder_state_Fxx));
+    for (n = 0; n < channels; n++) {
+        if (ret += silk_init_encoder( &psEnc->state_Fxx[ n ], arch )) {
             celt_assert( 0 );
         }
     }
@@ -100,7 +98,7 @@ oac_int silk_InitEncoder(                              /* O    Returns error cod
     psEnc->nChannelsInternal = 1;
 
     /* Read control structure */
-    if( ret += silk_QueryEncoder( encState, encStatus ) ) {
+    if (ret += silk_QueryEncoder( encState, encStatus )) {
         celt_assert( 0 );
     }
 
@@ -113,8 +111,7 @@ oac_int silk_InitEncoder(                              /* O    Returns error cod
 static oac_int silk_QueryEncoder(                      /* O    Returns error code                              */
     const void                      *encState,          /* I    State                                           */
     silk_EncControlStruct           *encStatus          /* O    Encoder Status                                  */
-)
-{
+    ) {
     oac_int ret = SILK_NO_ERROR;
     silk_encoder_state_Fxx *state_Fxx;
     silk_encoder *psEnc = (silk_encoder *)encState;
@@ -151,35 +148,34 @@ oac_int silk_Encode(                                   /* O    Returns error cod
     void                            *encState,          /* I/O  State                                           */
     silk_EncControlStruct           *encControl,        /* I    Control status                                  */
     const oac_res                  *samplesIn,         /* I    Speech sample input vector                      */
-    oac_int                        nSamplesIn,         /* I    Number of samples in input vector               */
+    oac_int nSamplesIn,                                /* I    Number of samples in input vector               */
     ec_enc                          *psRangeEnc,        /* I/O  Compressor data structure                       */
     oac_int32                      *nBytesOut,         /* I/O  Number of bytes in payload (input: Max bytes)   */
-    const oac_int                  prefillFlag,        /* I    Flag to indicate prefilling buffers no coding   */
-    oac_int                        activity            /* I    Decision of Oac voice activity detector        */
-)
-{
-    oac_int   n, i, nBits, flags, tmp_payloadSize_ms = 0, tmp_complexity = 0, ret = 0;
-    oac_int   nSamplesToBuffer, nSamplesToBufferMax, nBlocksOf10ms;
-    oac_int   nSamplesFromInput = 0, nSamplesFromInputMax;
-    oac_int   speech_act_thr_for_switch_Q8;
+    const oac_int prefillFlag,                         /* I    Flag to indicate prefilling buffers no coding   */
+    oac_int activity                                   /* I    Decision of Oac voice activity detector        */
+    ) {
+    oac_int n, i, nBits, flags, tmp_payloadSize_ms = 0, tmp_complexity = 0, ret = 0;
+    oac_int nSamplesToBuffer, nSamplesToBufferMax, nBlocksOf10ms;
+    oac_int nSamplesFromInput = 0, nSamplesFromInputMax;
+    oac_int speech_act_thr_for_switch_Q8;
     oac_int32 TargetRate_bps, MStargetRates_bps[ 2 ], channelRate_bps, LBRR_symbol, sum;
     silk_encoder *psEnc = ( silk_encoder * )encState;
     VARDECL( oac_int16, buf );
     oac_int transition, curr_block, tot_blocks;
     SAVE_STACK;
 
-    celt_assert( encControl->nChannelsAPI >= encControl->nChannelsInternal && encControl->nChannelsAPI >= psEnc->nChannelsInternal );
-    if (encControl->reducedDependency)
-    {
-       for( n = 0; n < encControl->nChannelsAPI; n++ ) {
-           psEnc->state_Fxx[ n ].sCmn.first_frame_after_reset = 1;
-       }
+    celt_assert( encControl->nChannelsAPI >= encControl->nChannelsInternal
+        && encControl->nChannelsAPI >= psEnc->nChannelsInternal );
+    if (encControl->reducedDependency) {
+        for (n = 0; n < encControl->nChannelsAPI; n++) {
+            psEnc->state_Fxx[ n ].sCmn.first_frame_after_reset = 1;
+        }
     }
-    for( n = 0; n < encControl->nChannelsAPI; n++ ) {
+    for (n = 0; n < encControl->nChannelsAPI; n++) {
         psEnc->state_Fxx[ n ].sCmn.nFramesEncoded = 0;
     }
     /* Check values in encoder control structure */
-    if( ( ret = check_control_input( encControl ) ) != 0 ) {
+    if ((ret = check_control_input( encControl )) != 0) {
         celt_assert( 0 );
         RESTORE_STACK;
         return ret;
@@ -187,49 +183,52 @@ oac_int silk_Encode(                                   /* O    Returns error cod
 
     encControl->switchReady = 0;
 
-    if( encControl->nChannelsInternal > psEnc->nChannelsInternal ) {
+    if (encControl->nChannelsInternal > psEnc->nChannelsInternal) {
         /* Mono -> Stereo transition: init state of second channel and stereo state */
         ret += silk_init_encoder( &psEnc->state_Fxx[ 1 ], psEnc->state_Fxx[ 0 ].sCmn.arch );
-        silk_memset( psEnc->sStereo.pred_prev_Q13, 0, sizeof( psEnc->sStereo.pred_prev_Q13 ) );
-        silk_memset( psEnc->sStereo.sSide, 0, sizeof( psEnc->sStereo.sSide ) );
+        silk_memset( psEnc->sStereo.pred_prev_Q13, 0, sizeof(psEnc->sStereo.pred_prev_Q13));
+        silk_memset( psEnc->sStereo.sSide, 0, sizeof(psEnc->sStereo.sSide));
         psEnc->sStereo.mid_side_amp_Q0[ 0 ] = 0;
         psEnc->sStereo.mid_side_amp_Q0[ 1 ] = 1;
         psEnc->sStereo.mid_side_amp_Q0[ 2 ] = 0;
         psEnc->sStereo.mid_side_amp_Q0[ 3 ] = 1;
         psEnc->sStereo.width_prev_Q14 = 0;
         psEnc->sStereo.smth_width_Q14 = SILK_FIX_CONST( 1, 14 );
-        if( psEnc->nChannelsAPI == 2 ) {
-            silk_memcpy( &psEnc->state_Fxx[ 1 ].sCmn.resampler_state, &psEnc->state_Fxx[ 0 ].sCmn.resampler_state, sizeof( silk_resampler_state_struct ) );
-            silk_memcpy( &psEnc->state_Fxx[ 1 ].sCmn.In_HP_State,     &psEnc->state_Fxx[ 0 ].sCmn.In_HP_State,     sizeof( psEnc->state_Fxx[ 1 ].sCmn.In_HP_State ) );
+        if (psEnc->nChannelsAPI == 2) {
+            silk_memcpy( &psEnc->state_Fxx[ 1 ].sCmn.resampler_state, &psEnc->state_Fxx[ 0 ].sCmn.resampler_state,
+            sizeof(silk_resampler_state_struct));
+            silk_memcpy( &psEnc->state_Fxx[ 1 ].sCmn.In_HP_State,     &psEnc->state_Fxx[ 0 ].sCmn.In_HP_State,
+            sizeof(psEnc->state_Fxx[ 1 ].sCmn.In_HP_State));
         }
     }
 
-    transition = (encControl->payloadSize_ms != psEnc->state_Fxx[ 0 ].sCmn.PacketSize_ms) || (psEnc->nChannelsInternal != encControl->nChannelsInternal);
+    transition = (encControl->payloadSize_ms != psEnc->state_Fxx[ 0 ].sCmn.PacketSize_ms)
+                 || (psEnc->nChannelsInternal != encControl->nChannelsInternal);
 
     psEnc->nChannelsAPI = encControl->nChannelsAPI;
     psEnc->nChannelsInternal = encControl->nChannelsInternal;
 
-    nBlocksOf10ms = silk_DIV32( 100 * nSamplesIn, encControl->API_sampleRate );
-    tot_blocks = ( nBlocksOf10ms > 1 ) ? nBlocksOf10ms >> 1 : 1;
+    nBlocksOf10ms = silk_DIV32( 100*nSamplesIn, encControl->API_sampleRate );
+    tot_blocks = (nBlocksOf10ms > 1) ? nBlocksOf10ms>>1 : 1;
     curr_block = 0;
-    if( prefillFlag ) {
+    if (prefillFlag) {
         silk_LP_state save_LP;
         /* Only accept input length of 10 ms */
-        if( nBlocksOf10ms != 1 ) {
+        if (nBlocksOf10ms != 1) {
             celt_assert( 0 );
             RESTORE_STACK;
             return SILK_ENC_INPUT_INVALID_NO_OF_SAMPLES;
         }
-        if ( prefillFlag == 2 ) {
+        if (prefillFlag == 2) {
             save_LP = psEnc->state_Fxx[ 0 ].sCmn.sLP;
             /* Save the sampling rate so the bandwidth switching code can keep handling transitions. */
             save_LP.saved_fs_kHz = psEnc->state_Fxx[ 0 ].sCmn.fs_kHz;
         }
         /* Reset Encoder */
-        for( n = 0; n < encControl->nChannelsInternal; n++ ) {
+        for (n = 0; n < encControl->nChannelsInternal; n++) {
             ret = silk_init_encoder( &psEnc->state_Fxx[ n ], psEnc->state_Fxx[ n ].sCmn.arch );
             /* Restore the variable LP state. */
-            if ( prefillFlag == 2 ) {
+            if (prefillFlag == 2) {
                 psEnc->state_Fxx[ n ].sCmn.sLP = save_LP;
             }
             celt_assert( !ret );
@@ -238,170 +237,184 @@ oac_int silk_Encode(                                   /* O    Returns error cod
         encControl->payloadSize_ms = 10;
         tmp_complexity = encControl->complexity;
         encControl->complexity = 0;
-        for( n = 0; n < encControl->nChannelsInternal; n++ ) {
+        for (n = 0; n < encControl->nChannelsInternal; n++) {
             psEnc->state_Fxx[ n ].sCmn.controlled_since_last_payload = 0;
             psEnc->state_Fxx[ n ].sCmn.prefillFlag = 1;
         }
     } else {
         /* Only accept input lengths that are a multiple of 10 ms */
-        if( nBlocksOf10ms * encControl->API_sampleRate != 100 * nSamplesIn || nSamplesIn < 0 ) {
+        if (nBlocksOf10ms*encControl->API_sampleRate != 100*nSamplesIn || nSamplesIn < 0) {
             celt_assert( 0 );
             RESTORE_STACK;
             return SILK_ENC_INPUT_INVALID_NO_OF_SAMPLES;
         }
         /* Make sure no more than one packet can be produced */
-        if( 1000 * (oac_int32)nSamplesIn > encControl->payloadSize_ms * encControl->API_sampleRate ) {
+        if (1000*(oac_int32)nSamplesIn > encControl->payloadSize_ms*encControl->API_sampleRate) {
             celt_assert( 0 );
             RESTORE_STACK;
             return SILK_ENC_INPUT_INVALID_NO_OF_SAMPLES;
         }
     }
 
-    for( n = 0; n < encControl->nChannelsInternal; n++ ) {
+    for (n = 0; n < encControl->nChannelsInternal; n++) {
         /* Force the side channel to the same rate as the mid */
-        oac_int force_fs_kHz = (n==1) ? psEnc->state_Fxx[0].sCmn.fs_kHz : 0;
-        if( ( ret = silk_control_encoder( &psEnc->state_Fxx[ n ], encControl, psEnc->allowBandwidthSwitch, n, force_fs_kHz ) ) != 0 ) {
+        oac_int force_fs_kHz = (n == 1) ? psEnc->state_Fxx[0].sCmn.fs_kHz : 0;
+        if ((ret = silk_control_encoder( &psEnc->state_Fxx[ n ], encControl, psEnc->allowBandwidthSwitch, n,
+        force_fs_kHz )) != 0) {
             silk_assert( 0 );
             RESTORE_STACK;
             return ret;
         }
-        if( psEnc->state_Fxx[n].sCmn.first_frame_after_reset || transition ) {
-            for( i = 0; i < psEnc->state_Fxx[ 0 ].sCmn.nFramesPerPacket; i++ ) {
+        if (psEnc->state_Fxx[n].sCmn.first_frame_after_reset || transition) {
+            for (i = 0; i < psEnc->state_Fxx[ 0 ].sCmn.nFramesPerPacket; i++) {
                 psEnc->state_Fxx[ n ].sCmn.LBRR_flags[ i ] = 0;
             }
         }
         psEnc->state_Fxx[ n ].sCmn.inDTX = psEnc->state_Fxx[ n ].sCmn.useDTX;
     }
-    celt_assert( encControl->nChannelsInternal == 1 || psEnc->state_Fxx[ 0 ].sCmn.fs_kHz == psEnc->state_Fxx[ 1 ].sCmn.fs_kHz );
+    celt_assert( encControl->nChannelsInternal == 1
+        || psEnc->state_Fxx[ 0 ].sCmn.fs_kHz == psEnc->state_Fxx[ 1 ].sCmn.fs_kHz );
 
     /* Input buffering/resampling and encoding */
     nSamplesToBufferMax =
-        10 * nBlocksOf10ms * psEnc->state_Fxx[ 0 ].sCmn.fs_kHz;
+        10*nBlocksOf10ms*psEnc->state_Fxx[ 0 ].sCmn.fs_kHz;
     nSamplesFromInputMax =
-        silk_DIV32_16( nSamplesToBufferMax *
-                           psEnc->state_Fxx[ 0 ].sCmn.API_fs_Hz,
-                       psEnc->state_Fxx[ 0 ].sCmn.fs_kHz * 1000 );
+        silk_DIV32_16( nSamplesToBufferMax
+            *psEnc->state_Fxx[ 0 ].sCmn.API_fs_Hz,
+                       psEnc->state_Fxx[ 0 ].sCmn.fs_kHz*1000 );
     ALLOC( buf, nSamplesFromInputMax, oac_int16 );
-    while( 1 ) {
+    while (1) {
         int curr_nBitsUsedLBRR = 0;
         nSamplesToBuffer  = psEnc->state_Fxx[ 0 ].sCmn.frame_length - psEnc->state_Fxx[ 0 ].sCmn.inputBufIx;
         nSamplesToBuffer  = silk_min( nSamplesToBuffer, nSamplesToBufferMax );
-        nSamplesFromInput = silk_DIV32_16( nSamplesToBuffer * psEnc->state_Fxx[ 0 ].sCmn.API_fs_Hz, psEnc->state_Fxx[ 0 ].sCmn.fs_kHz * 1000 );
+        nSamplesFromInput = silk_DIV32_16( nSamplesToBuffer*psEnc->state_Fxx[ 0 ].sCmn.API_fs_Hz,
+        psEnc->state_Fxx[ 0 ].sCmn.fs_kHz*1000 );
         /* Resample and write to buffer */
-        if( encControl->nChannelsAPI == 2 && encControl->nChannelsInternal == 2 ) {
+        if (encControl->nChannelsAPI == 2 && encControl->nChannelsInternal == 2) {
             oac_int id = psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded;
-            for( n = 0; n < nSamplesFromInput; n++ ) {
-                buf[ n ] = RES2INT16(samplesIn[ 2 * n ]);
+            for (n = 0; n < nSamplesFromInput; n++) {
+                buf[ n ] = RES2INT16(samplesIn[ 2*n ]);
             }
             /* Making sure to start both resamplers from the same state when switching from mono to stereo */
-            if( psEnc->nPrevChannelsInternal == 1 && id==0 ) {
-               silk_memcpy( &psEnc->state_Fxx[ 1 ].sCmn.resampler_state, &psEnc->state_Fxx[ 0 ].sCmn.resampler_state, sizeof(psEnc->state_Fxx[ 1 ].sCmn.resampler_state));
+            if (psEnc->nPrevChannelsInternal == 1 && id == 0) {
+                silk_memcpy( &psEnc->state_Fxx[ 1 ].sCmn.resampler_state, &psEnc->state_Fxx[ 0 ].sCmn.resampler_state,
+                sizeof(psEnc->state_Fxx[ 1 ].sCmn.resampler_state));
             }
 
             ret += silk_resampler( &psEnc->state_Fxx[ 0 ].sCmn.resampler_state,
-                &psEnc->state_Fxx[ 0 ].sCmn.inputBuf[ psEnc->state_Fxx[ 0 ].sCmn.inputBufIx + 2 ], buf, nSamplesFromInput );
+                &psEnc->state_Fxx[ 0 ].sCmn.inputBuf[ psEnc->state_Fxx[ 0 ].sCmn.inputBufIx + 2 ], buf,
+            nSamplesFromInput );
             psEnc->state_Fxx[ 0 ].sCmn.inputBufIx += nSamplesToBuffer;
 
             nSamplesToBuffer  = psEnc->state_Fxx[ 1 ].sCmn.frame_length - psEnc->state_Fxx[ 1 ].sCmn.inputBufIx;
-            nSamplesToBuffer  = silk_min( nSamplesToBuffer, 10 * nBlocksOf10ms * psEnc->state_Fxx[ 1 ].sCmn.fs_kHz );
-            for( n = 0; n < nSamplesFromInput; n++ ) {
-                buf[ n ] = RES2INT16(samplesIn[ 2 * n + 1 ]);
+            nSamplesToBuffer  = silk_min( nSamplesToBuffer, 10*nBlocksOf10ms*psEnc->state_Fxx[ 1 ].sCmn.fs_kHz );
+            for (n = 0; n < nSamplesFromInput; n++) {
+                buf[ n ] = RES2INT16(samplesIn[ 2*n + 1 ]);
             }
             ret += silk_resampler( &psEnc->state_Fxx[ 1 ].sCmn.resampler_state,
-                &psEnc->state_Fxx[ 1 ].sCmn.inputBuf[ psEnc->state_Fxx[ 1 ].sCmn.inputBufIx + 2 ], buf, nSamplesFromInput );
+                &psEnc->state_Fxx[ 1 ].sCmn.inputBuf[ psEnc->state_Fxx[ 1 ].sCmn.inputBufIx + 2 ], buf,
+            nSamplesFromInput );
 
             psEnc->state_Fxx[ 1 ].sCmn.inputBufIx += nSamplesToBuffer;
-        } else if( encControl->nChannelsAPI == 2 && encControl->nChannelsInternal == 1 ) {
+        } else if (encControl->nChannelsAPI == 2 && encControl->nChannelsInternal == 1) {
             /* Combine left and right channels before resampling */
-            for( n = 0; n < nSamplesFromInput; n++ ) {
-                sum = RES2INT16(samplesIn[ 2 * n ] + samplesIn[ 2 * n + 1 ]);
+            for (n = 0; n < nSamplesFromInput; n++) {
+                sum = RES2INT16(samplesIn[ 2*n ] + samplesIn[ 2*n + 1 ]);
                 buf[ n ] = (oac_int16)silk_RSHIFT_ROUND( sum,  1 );
             }
             ret += silk_resampler( &psEnc->state_Fxx[ 0 ].sCmn.resampler_state,
-                &psEnc->state_Fxx[ 0 ].sCmn.inputBuf[ psEnc->state_Fxx[ 0 ].sCmn.inputBufIx + 2 ], buf, nSamplesFromInput );
+                &psEnc->state_Fxx[ 0 ].sCmn.inputBuf[ psEnc->state_Fxx[ 0 ].sCmn.inputBufIx + 2 ], buf,
+            nSamplesFromInput );
             /* On the first mono frame, average the results for the two resampler states  */
-            if( psEnc->nPrevChannelsInternal == 2 && psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded == 0 ) {
-               ret += silk_resampler( &psEnc->state_Fxx[ 1 ].sCmn.resampler_state,
-                   &psEnc->state_Fxx[ 1 ].sCmn.inputBuf[ psEnc->state_Fxx[ 1 ].sCmn.inputBufIx + 2 ], buf, nSamplesFromInput );
-               for( n = 0; n < psEnc->state_Fxx[ 0 ].sCmn.frame_length; n++ ) {
-                  psEnc->state_Fxx[ 0 ].sCmn.inputBuf[ psEnc->state_Fxx[ 0 ].sCmn.inputBufIx+n+2 ] =
-                        silk_RSHIFT(psEnc->state_Fxx[ 0 ].sCmn.inputBuf[ psEnc->state_Fxx[ 0 ].sCmn.inputBufIx+n+2 ]
-                                  + psEnc->state_Fxx[ 1 ].sCmn.inputBuf[ psEnc->state_Fxx[ 1 ].sCmn.inputBufIx+n+2 ], 1);
-               }
+            if (psEnc->nPrevChannelsInternal == 2 && psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded == 0) {
+                ret += silk_resampler( &psEnc->state_Fxx[ 1 ].sCmn.resampler_state,
+                   &psEnc->state_Fxx[ 1 ].sCmn.inputBuf[ psEnc->state_Fxx[ 1 ].sCmn.inputBufIx + 2 ], buf,
+                nSamplesFromInput );
+                for (n = 0; n < psEnc->state_Fxx[ 0 ].sCmn.frame_length; n++) {
+                    psEnc->state_Fxx[ 0 ].sCmn.inputBuf[ psEnc->state_Fxx[ 0 ].sCmn.inputBufIx + n + 2 ] =
+                        silk_RSHIFT(psEnc->state_Fxx[ 0 ].sCmn.inputBuf[ psEnc->state_Fxx[ 0 ].sCmn.inputBufIx + n + 2 ]
+                            + psEnc->state_Fxx[ 1 ].sCmn.inputBuf[ psEnc->state_Fxx[ 1 ].sCmn.inputBufIx + n + 2 ], 1);
+                }
             }
             psEnc->state_Fxx[ 0 ].sCmn.inputBufIx += nSamplesToBuffer;
         } else {
             celt_assert( encControl->nChannelsAPI == 1 && encControl->nChannelsInternal == 1 );
-            for( n = 0; n < nSamplesFromInput; n++ ) {
+            for (n = 0; n < nSamplesFromInput; n++) {
                 buf[n] = RES2INT16(samplesIn[n]);
             }
             ret += silk_resampler( &psEnc->state_Fxx[ 0 ].sCmn.resampler_state,
-                &psEnc->state_Fxx[ 0 ].sCmn.inputBuf[ psEnc->state_Fxx[ 0 ].sCmn.inputBufIx + 2 ], buf, nSamplesFromInput );
+                &psEnc->state_Fxx[ 0 ].sCmn.inputBuf[ psEnc->state_Fxx[ 0 ].sCmn.inputBufIx + 2 ], buf,
+            nSamplesFromInput );
             psEnc->state_Fxx[ 0 ].sCmn.inputBufIx += nSamplesToBuffer;
         }
 
-        samplesIn  += nSamplesFromInput * encControl->nChannelsAPI;
+        samplesIn  += nSamplesFromInput*encControl->nChannelsAPI;
         nSamplesIn -= nSamplesFromInput;
 
         /* Default */
         psEnc->allowBandwidthSwitch = 0;
 
         /* Silk encoder */
-        if( psEnc->state_Fxx[ 0 ].sCmn.inputBufIx >= psEnc->state_Fxx[ 0 ].sCmn.frame_length ) {
+        if (psEnc->state_Fxx[ 0 ].sCmn.inputBufIx >= psEnc->state_Fxx[ 0 ].sCmn.frame_length) {
             /* Enough data in input buffer, so encode */
             celt_assert( psEnc->state_Fxx[ 0 ].sCmn.inputBufIx == psEnc->state_Fxx[ 0 ].sCmn.frame_length );
-            celt_assert( encControl->nChannelsInternal == 1 || psEnc->state_Fxx[ 1 ].sCmn.inputBufIx == psEnc->state_Fxx[ 1 ].sCmn.frame_length );
+            celt_assert( encControl->nChannelsInternal == 1
+                || psEnc->state_Fxx[ 1 ].sCmn.inputBufIx == psEnc->state_Fxx[ 1 ].sCmn.frame_length );
 
             /* Deal with LBRR data */
-            if( psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded == 0 && !prefillFlag ) {
+            if (psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded == 0 && !prefillFlag) {
                 /* Create space at start of payload for VAD and FEC flags */
                 oac_uint8 iCDF[ 2 ] = { 0, 0 };
-                iCDF[ 0 ] = 256 - silk_RSHIFT( 256, ( psEnc->state_Fxx[ 0 ].sCmn.nFramesPerPacket + 1 ) * encControl->nChannelsInternal );
+                iCDF[ 0 ] = 256 - silk_RSHIFT( 256,
+                    (psEnc->state_Fxx[ 0 ].sCmn.nFramesPerPacket + 1)*encControl->nChannelsInternal );
                 ec_enc_icdf( psRangeEnc, 0, iCDF, 8 );
                 curr_nBitsUsedLBRR = ec_tell( psRangeEnc );
 
                 /* Encode any LBRR data from previous packet */
                 /* Encode LBRR flags */
-                for( n = 0; n < encControl->nChannelsInternal; n++ ) {
+                for (n = 0; n < encControl->nChannelsInternal; n++) {
                     LBRR_symbol = 0;
-                    for( i = 0; i < psEnc->state_Fxx[ n ].sCmn.nFramesPerPacket; i++ ) {
+                    for (i = 0; i < psEnc->state_Fxx[ n ].sCmn.nFramesPerPacket; i++) {
                         LBRR_symbol |= silk_LSHIFT( psEnc->state_Fxx[ n ].sCmn.LBRR_flags[ i ], i );
                     }
                     psEnc->state_Fxx[ n ].sCmn.LBRR_flag = LBRR_symbol > 0 ? 1 : 0;
-                    if( LBRR_symbol && psEnc->state_Fxx[ n ].sCmn.nFramesPerPacket > 1 ) {
-                        ec_enc_icdf( psRangeEnc, LBRR_symbol - 1, silk_LBRR_flags_iCDF_ptr[ psEnc->state_Fxx[ n ].sCmn.nFramesPerPacket - 2 ], 8 );
+                    if (LBRR_symbol && psEnc->state_Fxx[ n ].sCmn.nFramesPerPacket > 1) {
+                        ec_enc_icdf( psRangeEnc, LBRR_symbol - 1,
+                        silk_LBRR_flags_iCDF_ptr[ psEnc->state_Fxx[ n ].sCmn.nFramesPerPacket - 2 ], 8 );
                     }
                 }
 
                 /* Code LBRR indices and excitation signals */
-                for( i = 0; i < psEnc->state_Fxx[ 0 ].sCmn.nFramesPerPacket; i++ ) {
-                    for( n = 0; n < encControl->nChannelsInternal; n++ ) {
-                        if( psEnc->state_Fxx[ n ].sCmn.LBRR_flags[ i ] ) {
+                for (i = 0; i < psEnc->state_Fxx[ 0 ].sCmn.nFramesPerPacket; i++) {
+                    for (n = 0; n < encControl->nChannelsInternal; n++) {
+                        if (psEnc->state_Fxx[ n ].sCmn.LBRR_flags[ i ]) {
                             oac_int condCoding;
 
-                            if( encControl->nChannelsInternal == 2 && n == 0 ) {
+                            if (encControl->nChannelsInternal == 2 && n == 0) {
                                 silk_stereo_encode_pred( psRangeEnc, psEnc->sStereo.predIx[ i ] );
                                 /* For LBRR data there's no need to code the mid-only flag if the side-channel LBRR flag is set */
-                                if( psEnc->state_Fxx[ 1 ].sCmn.LBRR_flags[ i ] == 0 ) {
+                                if (psEnc->state_Fxx[ 1 ].sCmn.LBRR_flags[ i ] == 0) {
                                     silk_stereo_encode_mid_only( psRangeEnc, psEnc->sStereo.mid_only_flags[ i ] );
                                 }
                             }
                             /* Use conditional coding if previous frame available */
-                            if( i > 0 && psEnc->state_Fxx[ n ].sCmn.LBRR_flags[ i - 1 ] ) {
+                            if (i > 0 && psEnc->state_Fxx[ n ].sCmn.LBRR_flags[ i - 1 ]) {
                                 condCoding = CODE_CONDITIONALLY;
                             } else {
                                 condCoding = CODE_INDEPENDENTLY;
                             }
                             silk_encode_indices( &psEnc->state_Fxx[ n ].sCmn, psRangeEnc, i, 1, condCoding );
-                            silk_encode_pulses( psRangeEnc, psEnc->state_Fxx[ n ].sCmn.indices_LBRR[i].signalType, psEnc->state_Fxx[ n ].sCmn.indices_LBRR[i].quantOffsetType,
+                            silk_encode_pulses( psRangeEnc, psEnc->state_Fxx[ n ].sCmn.indices_LBRR[i].signalType,
+                            psEnc->state_Fxx[ n ].sCmn.indices_LBRR[i].quantOffsetType,
                                 psEnc->state_Fxx[ n ].sCmn.pulses_LBRR[ i ], psEnc->state_Fxx[ n ].sCmn.frame_length );
                         }
                     }
                 }
 
                 /* Reset LBRR flags */
-                for( n = 0; n < encControl->nChannelsInternal; n++ ) {
-                    silk_memset( psEnc->state_Fxx[ n ].sCmn.LBRR_flags, 0, sizeof( psEnc->state_Fxx[ n ].sCmn.LBRR_flags ) );
+                for (n = 0; n < encControl->nChannelsInternal; n++) {
+                    silk_memset( psEnc->state_Fxx[ n ].sCmn.LBRR_flags, 0,
+                    sizeof(psEnc->state_Fxx[ n ].sCmn.LBRR_flags));
                 }
                 curr_nBitsUsedLBRR = ec_tell( psRangeEnc ) - curr_nBitsUsedLBRR;
             }
@@ -411,50 +424,58 @@ oac_int silk_Encode(                                   /* O    Returns error cod
             /* Total target bits for packet */
             nBits = silk_DIV32_16( silk_MUL( encControl->bitRate, encControl->payloadSize_ms ), 1000 );
             /* Subtract bits used for LBRR */
-            if( !prefillFlag ) {
+            if (!prefillFlag) {
                 /* psEnc->nBitsUsedLBRR is an exponential moving average of the LBRR usage,
                    except that for the first LBRR frame it does no averaging and for the first
                    frame after after LBRR, it goes back to zero immediately. */
-                if ( curr_nBitsUsedLBRR < 10 ) {
+                if (curr_nBitsUsedLBRR < 10) {
                     psEnc->nBitsUsedLBRR = 0;
-                } else if ( psEnc->nBitsUsedLBRR < 10) {
+                } else if (psEnc->nBitsUsedLBRR < 10) {
                     psEnc->nBitsUsedLBRR = curr_nBitsUsedLBRR;
                 } else {
-                    psEnc->nBitsUsedLBRR = ( psEnc->nBitsUsedLBRR + curr_nBitsUsedLBRR ) / 2;
+                    psEnc->nBitsUsedLBRR = (psEnc->nBitsUsedLBRR + curr_nBitsUsedLBRR)/2;
                 }
                 nBits -= psEnc->nBitsUsedLBRR;
             }
             /* Divide by number of uncoded frames left in packet */
             nBits = silk_DIV32_16( nBits, psEnc->state_Fxx[ 0 ].sCmn.nFramesPerPacket );
             /* Convert to bits/second */
-            if( encControl->payloadSize_ms == 10 ) {
+            if (encControl->payloadSize_ms == 10) {
                 TargetRate_bps = silk_SMULBB( nBits, 100 );
             } else {
                 TargetRate_bps = silk_SMULBB( nBits, 50 );
             }
             /* Subtract fraction of bits in excess of target in previous frames and packets */
             TargetRate_bps -= silk_DIV32_16( silk_MUL( psEnc->nBitsExceeded, 1000 ), BITRESERVOIR_DECAY_TIME_MS );
-            if( !prefillFlag && psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded > 0 ) {
+            if (!prefillFlag && psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded > 0) {
                 /* Compare actual vs target bits so far in this packet */
-                oac_int32 bitsBalance = ec_tell( psRangeEnc ) - psEnc->nBitsUsedLBRR - nBits * psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded;
+                oac_int32 bitsBalance = ec_tell( psRangeEnc ) - psEnc->nBitsUsedLBRR - nBits
+                                        *psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded;
                 TargetRate_bps -= silk_DIV32_16( silk_MUL( bitsBalance, 1000 ), BITRESERVOIR_DECAY_TIME_MS );
             }
             /* Never exceed input bitrate */
             TargetRate_bps = silk_LIMIT( TargetRate_bps, encControl->bitRate, 5000 );
 
             /* Convert Left/Right to Mid/Side */
-            if( encControl->nChannelsInternal == 2 ) {
-                silk_stereo_LR_to_MS( &psEnc->sStereo, &psEnc->state_Fxx[ 0 ].sCmn.inputBuf[ 2 ], &psEnc->state_Fxx[ 1 ].sCmn.inputBuf[ 2 ],
-                    psEnc->sStereo.predIx[ psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded ], &psEnc->sStereo.mid_only_flags[ psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded ],
-                    MStargetRates_bps, TargetRate_bps, psEnc->state_Fxx[ 0 ].sCmn.speech_activity_Q8, encControl->toMono,
+            if (encControl->nChannelsInternal == 2) {
+                silk_stereo_LR_to_MS( &psEnc->sStereo, &psEnc->state_Fxx[ 0 ].sCmn.inputBuf[ 2 ],
+                &psEnc->state_Fxx[ 1 ].sCmn.inputBuf[ 2 ],
+                    psEnc->sStereo.predIx[ psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded ],
+                &psEnc->sStereo.mid_only_flags[ psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded ],
+                    MStargetRates_bps, TargetRate_bps, psEnc->state_Fxx[ 0 ].sCmn.speech_activity_Q8,
+                encControl->toMono,
                     psEnc->state_Fxx[ 0 ].sCmn.fs_kHz, psEnc->state_Fxx[ 0 ].sCmn.frame_length );
-                if( psEnc->sStereo.mid_only_flags[ psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded ] == 0 ) {
+                if (psEnc->sStereo.mid_only_flags[ psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded ] == 0) {
                     /* Reset side channel encoder memory for first frame with side coding */
-                    if( psEnc->prev_decode_only_middle == 1 ) {
-                        silk_memset( &psEnc->state_Fxx[ 1 ].sShape,               0, sizeof( psEnc->state_Fxx[ 1 ].sShape ) );
-                        silk_memset( &psEnc->state_Fxx[ 1 ].sCmn.sNSQ,            0, sizeof( psEnc->state_Fxx[ 1 ].sCmn.sNSQ ) );
-                        silk_memset( psEnc->state_Fxx[ 1 ].sCmn.prev_NLSFq_Q15,   0, sizeof( psEnc->state_Fxx[ 1 ].sCmn.prev_NLSFq_Q15 ) );
-                        silk_memset( &psEnc->state_Fxx[ 1 ].sCmn.sLP.In_LP_State, 0, sizeof( psEnc->state_Fxx[ 1 ].sCmn.sLP.In_LP_State ) );
+                    if (psEnc->prev_decode_only_middle == 1) {
+                        silk_memset( &psEnc->state_Fxx[ 1 ].sShape,               0,
+                        sizeof(psEnc->state_Fxx[ 1 ].sShape));
+                        silk_memset( &psEnc->state_Fxx[ 1 ].sCmn.sNSQ,            0,
+                        sizeof(psEnc->state_Fxx[ 1 ].sCmn.sNSQ));
+                        silk_memset( psEnc->state_Fxx[ 1 ].sCmn.prev_NLSFq_Q15,   0,
+                        sizeof(psEnc->state_Fxx[ 1 ].sCmn.prev_NLSFq_Q15));
+                        silk_memset( &psEnc->state_Fxx[ 1 ].sCmn.sLP.In_LP_State, 0,
+                        sizeof(psEnc->state_Fxx[ 1 ].sCmn.sLP.In_LP_State));
                         psEnc->state_Fxx[ 1 ].sCmn.prevLag                 = 100;
                         psEnc->state_Fxx[ 1 ].sCmn.sNSQ.lagPrev            = 100;
                         psEnc->state_Fxx[ 1 ].sShape.LastGainIndex         = 10;
@@ -466,63 +487,67 @@ oac_int silk_Encode(                                   /* O    Returns error cod
                 } else {
                     psEnc->state_Fxx[ 1 ].sCmn.VAD_flags[ psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded ] = 0;
                 }
-                if( !prefillFlag ) {
-                    silk_stereo_encode_pred( psRangeEnc, psEnc->sStereo.predIx[ psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded ] );
-                    if( psEnc->state_Fxx[ 1 ].sCmn.VAD_flags[ psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded ] == 0 ) {
-                        silk_stereo_encode_mid_only( psRangeEnc, psEnc->sStereo.mid_only_flags[ psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded ] );
+                if (!prefillFlag) {
+                    silk_stereo_encode_pred( psRangeEnc,
+                    psEnc->sStereo.predIx[ psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded ] );
+                    if (psEnc->state_Fxx[ 1 ].sCmn.VAD_flags[ psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded ] == 0) {
+                        silk_stereo_encode_mid_only( psRangeEnc,
+                        psEnc->sStereo.mid_only_flags[ psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded ] );
                     }
                 }
             } else {
                 /* Buffering */
-                silk_memcpy( psEnc->state_Fxx[ 0 ].sCmn.inputBuf, psEnc->sStereo.sMid, 2 * sizeof( oac_int16 ) );
-                silk_memcpy( psEnc->sStereo.sMid, &psEnc->state_Fxx[ 0 ].sCmn.inputBuf[ psEnc->state_Fxx[ 0 ].sCmn.frame_length ], 2 * sizeof( oac_int16 ) );
+                silk_memcpy( psEnc->state_Fxx[ 0 ].sCmn.inputBuf, psEnc->sStereo.sMid, 2*sizeof(oac_int16));
+                silk_memcpy( psEnc->sStereo.sMid,
+                &psEnc->state_Fxx[ 0 ].sCmn.inputBuf[ psEnc->state_Fxx[ 0 ].sCmn.frame_length ], 2*sizeof(oac_int16));
             }
             silk_encode_do_VAD_Fxx( &psEnc->state_Fxx[ 0 ], activity );
 
             /* Encode */
-            for( n = 0; n < encControl->nChannelsInternal; n++ ) {
+            for (n = 0; n < encControl->nChannelsInternal; n++) {
                 oac_int maxBits, useCBR;
 
                 /* Handling rate constraints */
                 maxBits = encControl->maxBits;
-                if( tot_blocks == 2 && curr_block == 0 ) {
-                    maxBits = maxBits * 3 / 5;
-                } else if( tot_blocks == 3 ) {
-                    if( curr_block == 0 ) {
-                        maxBits = maxBits * 2 / 5;
-                    } else if( curr_block == 1 ) {
-                        maxBits = maxBits * 3 / 4;
+                if (tot_blocks == 2 && curr_block == 0) {
+                    maxBits = maxBits*3/5;
+                } else if (tot_blocks == 3) {
+                    if (curr_block == 0) {
+                        maxBits = maxBits*2/5;
+                    } else if (curr_block == 1) {
+                        maxBits = maxBits*3/4;
                     }
                 }
                 useCBR = encControl->useCBR && curr_block == tot_blocks - 1;
 
-                if( encControl->nChannelsInternal == 1 ) {
+                if (encControl->nChannelsInternal == 1) {
                     channelRate_bps = TargetRate_bps;
                 } else {
                     channelRate_bps = MStargetRates_bps[ n ];
-                    if( n == 0 && MStargetRates_bps[ 1 ] > 0 ) {
+                    if (n == 0 && MStargetRates_bps[ 1 ] > 0) {
                         useCBR = 0;
                         /* Give mid up to 1/2 of the max bits for that frame */
-                        maxBits -= encControl->maxBits / ( tot_blocks * 2 );
+                        maxBits -= encControl->maxBits/(tot_blocks*2);
                     }
                 }
 
-                if( channelRate_bps > 0 ) {
+                if (channelRate_bps > 0) {
                     oac_int condCoding;
 
                     silk_control_SNR( &psEnc->state_Fxx[ n ].sCmn, channelRate_bps );
 
                     /* Use independent coding if no previous frame available */
-                    if( psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded - n <= 0 ) {
+                    if (psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded - n <= 0) {
                         condCoding = CODE_INDEPENDENTLY;
-                    } else if( n > 0 && psEnc->prev_decode_only_middle ) {
+                    } else if (n > 0 && psEnc->prev_decode_only_middle) {
                         /* If we skipped a side frame in this packet, we don't
                            need LTP scaling; the LTP state is well-defined. */
                         condCoding = CODE_INDEPENDENTLY_NO_LTP_SCALING;
                     } else {
                         condCoding = CODE_CONDITIONALLY;
                     }
-                    if( ( ret = silk_encode_frame_Fxx( &psEnc->state_Fxx[ n ], nBytesOut, psRangeEnc, condCoding, maxBits, useCBR ) ) != 0 ) {
+                    if ((ret = silk_encode_frame_Fxx( &psEnc->state_Fxx[ n ], nBytesOut, psRangeEnc, condCoding,
+                    maxBits, useCBR )) != 0) {
                         silk_assert( 0 );
                     }
                 }
@@ -530,36 +555,42 @@ oac_int silk_Encode(                                   /* O    Returns error cod
                 psEnc->state_Fxx[ n ].sCmn.inputBufIx = 0;
                 psEnc->state_Fxx[ n ].sCmn.nFramesEncoded++;
             }
-            psEnc->prev_decode_only_middle = psEnc->sStereo.mid_only_flags[ psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded - 1 ];
+            psEnc->prev_decode_only_middle = psEnc->sStereo.mid_only_flags[ psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded
+                                                                            - 1 ];
 
             /* Insert VAD and FEC flags at beginning of bitstream */
-            if( *nBytesOut > 0 && psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded == psEnc->state_Fxx[ 0 ].sCmn.nFramesPerPacket) {
+            if (*nBytesOut > 0
+                && psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded == psEnc->state_Fxx[ 0 ].sCmn.nFramesPerPacket) {
                 flags = 0;
-                for( n = 0; n < encControl->nChannelsInternal; n++ ) {
-                    for( i = 0; i < psEnc->state_Fxx[ n ].sCmn.nFramesPerPacket; i++ ) {
+                for (n = 0; n < encControl->nChannelsInternal; n++) {
+                    for (i = 0; i < psEnc->state_Fxx[ n ].sCmn.nFramesPerPacket; i++) {
                         flags  = silk_LSHIFT( flags, 1 );
                         flags |= psEnc->state_Fxx[ n ].sCmn.VAD_flags[ i ];
                     }
                     flags  = silk_LSHIFT( flags, 1 );
                     flags |= psEnc->state_Fxx[ n ].sCmn.LBRR_flag;
                 }
-                if( !prefillFlag ) {
-                    ec_enc_patch_initial_bits( psRangeEnc, flags, ( psEnc->state_Fxx[ 0 ].sCmn.nFramesPerPacket + 1 ) * encControl->nChannelsInternal );
+                if (!prefillFlag) {
+                    ec_enc_patch_initial_bits( psRangeEnc, flags,
+                        (psEnc->state_Fxx[ 0 ].sCmn.nFramesPerPacket + 1)*encControl->nChannelsInternal );
                 }
 
                 /* Return zero bytes if all channels DTXed */
-                if( psEnc->state_Fxx[ 0 ].sCmn.inDTX && ( encControl->nChannelsInternal == 1 || psEnc->state_Fxx[ 1 ].sCmn.inDTX ) ) {
+                if (psEnc->state_Fxx[ 0 ].sCmn.inDTX
+                    && (encControl->nChannelsInternal == 1 || psEnc->state_Fxx[ 1 ].sCmn.inDTX)) {
                     *nBytesOut = 0;
                 }
 
-                psEnc->nBitsExceeded += *nBytesOut * 8;
-                psEnc->nBitsExceeded -= silk_DIV32_16( silk_MUL( encControl->bitRate, encControl->payloadSize_ms ), 1000 );
+                psEnc->nBitsExceeded += *nBytesOut*8;
+                psEnc->nBitsExceeded -= silk_DIV32_16( silk_MUL( encControl->bitRate, encControl->payloadSize_ms ),
+                1000 );
                 psEnc->nBitsExceeded  = silk_LIMIT( psEnc->nBitsExceeded, 0, 10000 );
 
                 /* Update flag indicating if bandwidth switching is allowed */
                 speech_act_thr_for_switch_Q8 = silk_SMLAWB( SILK_FIX_CONST( SPEECH_ACTIVITY_DTX_THRES, 8 ),
-                    SILK_FIX_CONST( ( 1 - SPEECH_ACTIVITY_DTX_THRES ) / MAX_BANDWIDTH_SWITCH_DELAY_MS, 16 + 8 ), psEnc->timeSinceSwitchAllowed_ms );
-                if( psEnc->state_Fxx[ 0 ].sCmn.speech_activity_Q8 < speech_act_thr_for_switch_Q8 ) {
+                    SILK_FIX_CONST((1 - SPEECH_ACTIVITY_DTX_THRES)/MAX_BANDWIDTH_SWITCH_DELAY_MS, 16 + 8 ),
+                psEnc->timeSinceSwitchAllowed_ms );
+                if (psEnc->state_Fxx[ 0 ].sCmn.speech_activity_Q8 < speech_act_thr_for_switch_Q8) {
                     psEnc->allowBandwidthSwitch = 1;
                     psEnc->timeSinceSwitchAllowed_ms = 0;
                 } else {
@@ -568,7 +599,7 @@ oac_int silk_Encode(                                   /* O    Returns error cod
                 }
             }
 
-            if( nSamplesIn == 0 ) {
+            if (nSamplesIn == 0) {
                 break;
             }
         } else {
@@ -580,13 +611,14 @@ oac_int silk_Encode(                                   /* O    Returns error cod
     psEnc->nPrevChannelsInternal = encControl->nChannelsInternal;
 
     encControl->allowBandwidthSwitch = psEnc->allowBandwidthSwitch;
-    encControl->inWBmodeWithoutVariableLP = psEnc->state_Fxx[ 0 ].sCmn.fs_kHz == 16 && psEnc->state_Fxx[ 0 ].sCmn.sLP.mode == 0;
+    encControl->inWBmodeWithoutVariableLP = psEnc->state_Fxx[ 0 ].sCmn.fs_kHz == 16
+                                            && psEnc->state_Fxx[ 0 ].sCmn.sLP.mode == 0;
     encControl->internalSampleRate = silk_SMULBB( psEnc->state_Fxx[ 0 ].sCmn.fs_kHz, 1000 );
     encControl->stereoWidth_Q14 = encControl->toMono ? 0 : psEnc->sStereo.smth_width_Q14;
-    if( prefillFlag ) {
+    if (prefillFlag) {
         encControl->payloadSize_ms = tmp_payloadSize_ms;
         encControl->complexity = tmp_complexity;
-        for( n = 0; n < encControl->nChannelsInternal; n++ ) {
+        for (n = 0; n < encControl->nChannelsInternal; n++) {
             psEnc->state_Fxx[ n ].sCmn.controlled_since_last_payload = 0;
             psEnc->state_Fxx[ n ].sCmn.prefillFlag = 0;
         }
@@ -594,7 +626,7 @@ oac_int silk_Encode(                                   /* O    Returns error cod
 
     encControl->signalType = psEnc->state_Fxx[0].sCmn.indices.signalType;
     encControl->offset = silk_Quantization_Offsets_Q10
-                         [ psEnc->state_Fxx[0].sCmn.indices.signalType >> 1 ]
+                         [ psEnc->state_Fxx[0].sCmn.indices.signalType>>1 ]
                          [ psEnc->state_Fxx[0].sCmn.indices.quantOffsetType ];
     RESTORE_STACK;
     return ret;
diff --git a/silk/encode_indices.c b/silk/encode_indices.c
index c2e40ef66..6158afd73 100644
--- a/silk/encode_indices.c
+++ b/silk/encode_indices.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -35,30 +35,29 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_encode_indices(
     silk_encoder_state          *psEncC,                        /* I/O  Encoder state                               */
     ec_enc                      *psRangeEnc,                    /* I/O  Compressor data structure                   */
-    oac_int                    FrameIndex,                     /* I    Frame number                                */
-    oac_int                    encode_LBRR,                    /* I    Flag indicating LBRR data is being encoded  */
-    oac_int                    condCoding                      /* I    The type of conditional coding to use       */
-)
-{
-    oac_int   i, k, typeOffset;
-    oac_int   encode_absolute_lagIndex, delta_lagIndex;
+    oac_int FrameIndex,                                        /* I    Frame number                                */
+    oac_int encode_LBRR,                                       /* I    Flag indicating LBRR data is being encoded  */
+    oac_int condCoding                                         /* I    The type of conditional coding to use       */
+    ) {
+    oac_int i, k, typeOffset;
+    oac_int encode_absolute_lagIndex, delta_lagIndex;
     oac_int16 ec_ix[ MAX_LPC_ORDER ];
     oac_uint8 pred_Q8[ MAX_LPC_ORDER ];
     const SideInfoIndices *psIndices;
 
-    if( encode_LBRR ) {
-         psIndices = &psEncC->indices_LBRR[ FrameIndex ];
+    if (encode_LBRR) {
+        psIndices = &psEncC->indices_LBRR[ FrameIndex ];
     } else {
-         psIndices = &psEncC->indices;
+        psIndices = &psEncC->indices;
     }
 
     /*******************************************/
     /* Encode signal type and quantizer offset */
     /*******************************************/
-    typeOffset = 2 * psIndices->signalType + psIndices->quantOffsetType;
+    typeOffset = 2*psIndices->signalType + psIndices->quantOffsetType;
     celt_assert( typeOffset >= 0 && typeOffset < 6 );
     celt_assert( encode_LBRR == 0 || typeOffset >= 2 );
-    if( encode_LBRR || typeOffset >= 2 ) {
+    if (encode_LBRR || typeOffset >= 2) {
         ec_enc_icdf( psRangeEnc, typeOffset - 2, silk_type_offset_VAD_iCDF, 8 );
     } else {
         ec_enc_icdf( psRangeEnc, typeOffset, silk_type_offset_no_VAD_iCDF, 8 );
@@ -68,58 +67,64 @@ void silk_encode_indices(
     /* Encode gains */
     /****************/
     /* first subframe */
-    if( condCoding == CODE_CONDITIONALLY ) {
+    if (condCoding == CODE_CONDITIONALLY) {
         /* conditional coding */
-        silk_assert( psIndices->GainsIndices[ 0 ] >= 0 && psIndices->GainsIndices[ 0 ] < MAX_DELTA_GAIN_QUANT - MIN_DELTA_GAIN_QUANT + 1 );
+        silk_assert( psIndices->GainsIndices[ 0 ] >= 0
+            && psIndices->GainsIndices[ 0 ] < MAX_DELTA_GAIN_QUANT - MIN_DELTA_GAIN_QUANT + 1 );
         ec_enc_icdf( psRangeEnc, psIndices->GainsIndices[ 0 ], silk_delta_gain_iCDF, 8 );
     } else {
         /* independent coding, in two stages: MSB bits followed by 3 LSBs */
         silk_assert( psIndices->GainsIndices[ 0 ] >= 0 && psIndices->GainsIndices[ 0 ] < N_LEVELS_QGAIN );
-        ec_enc_icdf( psRangeEnc, silk_RSHIFT( psIndices->GainsIndices[ 0 ], 3 ), silk_gain_iCDF[ psIndices->signalType ], 8 );
-        ec_enc_icdf( psRangeEnc, psIndices->GainsIndices[ 0 ] & 7, silk_uniform8_iCDF, 8 );
+        ec_enc_icdf( psRangeEnc, silk_RSHIFT( psIndices->GainsIndices[ 0 ], 3 ),
+        silk_gain_iCDF[ psIndices->signalType ], 8 );
+        ec_enc_icdf( psRangeEnc, psIndices->GainsIndices[ 0 ]&7, silk_uniform8_iCDF, 8 );
     }
 
     /* remaining subframes */
-    for( i = 1; i < psEncC->nb_subfr; i++ ) {
-        silk_assert( psIndices->GainsIndices[ i ] >= 0 && psIndices->GainsIndices[ i ] < MAX_DELTA_GAIN_QUANT - MIN_DELTA_GAIN_QUANT + 1 );
+    for (i = 1; i < psEncC->nb_subfr; i++) {
+        silk_assert( psIndices->GainsIndices[ i ] >= 0
+            && psIndices->GainsIndices[ i ] < MAX_DELTA_GAIN_QUANT - MIN_DELTA_GAIN_QUANT + 1 );
         ec_enc_icdf( psRangeEnc, psIndices->GainsIndices[ i ], silk_delta_gain_iCDF, 8 );
     }
 
     /****************/
     /* Encode NLSFs */
     /****************/
-    ec_enc_icdf( psRangeEnc, psIndices->NLSFIndices[ 0 ], &psEncC->psNLSF_CB->CB1_iCDF[ ( psIndices->signalType >> 1 ) * psEncC->psNLSF_CB->nVectors ], 8 );
+    ec_enc_icdf( psRangeEnc, psIndices->NLSFIndices[ 0 ],
+    &psEncC->psNLSF_CB->CB1_iCDF[ (psIndices->signalType>>1)*psEncC->psNLSF_CB->nVectors ], 8 );
     silk_NLSF_unpack( ec_ix, pred_Q8, psEncC->psNLSF_CB, psIndices->NLSFIndices[ 0 ] );
     celt_assert( psEncC->psNLSF_CB->order == psEncC->predictLPCOrder );
-    for( i = 0; i < psEncC->psNLSF_CB->order; i++ ) {
-        if( psIndices->NLSFIndices[ i+1 ] >= NLSF_QUANT_MAX_AMPLITUDE ) {
-            ec_enc_icdf( psRangeEnc, 2 * NLSF_QUANT_MAX_AMPLITUDE, &psEncC->psNLSF_CB->ec_iCDF[ ec_ix[ i ] ], 8 );
-            ec_enc_icdf( psRangeEnc, psIndices->NLSFIndices[ i+1 ] - NLSF_QUANT_MAX_AMPLITUDE, silk_NLSF_EXT_iCDF, 8 );
-        } else if( psIndices->NLSFIndices[ i+1 ] <= -NLSF_QUANT_MAX_AMPLITUDE ) {
+    for (i = 0; i < psEncC->psNLSF_CB->order; i++) {
+        if (psIndices->NLSFIndices[ i + 1 ] >= NLSF_QUANT_MAX_AMPLITUDE) {
+            ec_enc_icdf( psRangeEnc, 2*NLSF_QUANT_MAX_AMPLITUDE, &psEncC->psNLSF_CB->ec_iCDF[ ec_ix[ i ] ], 8 );
+            ec_enc_icdf( psRangeEnc, psIndices->NLSFIndices[ i + 1 ] - NLSF_QUANT_MAX_AMPLITUDE, silk_NLSF_EXT_iCDF,
+            8 );
+        } else if (psIndices->NLSFIndices[ i + 1 ] <= -NLSF_QUANT_MAX_AMPLITUDE) {
             ec_enc_icdf( psRangeEnc, 0, &psEncC->psNLSF_CB->ec_iCDF[ ec_ix[ i ] ], 8 );
-            ec_enc_icdf( psRangeEnc, -psIndices->NLSFIndices[ i+1 ] - NLSF_QUANT_MAX_AMPLITUDE, silk_NLSF_EXT_iCDF, 8 );
+            ec_enc_icdf( psRangeEnc, -psIndices->NLSFIndices[ i + 1 ] - NLSF_QUANT_MAX_AMPLITUDE, silk_NLSF_EXT_iCDF,
+            8 );
         } else {
-            ec_enc_icdf( psRangeEnc, psIndices->NLSFIndices[ i+1 ] + NLSF_QUANT_MAX_AMPLITUDE, &psEncC->psNLSF_CB->ec_iCDF[ ec_ix[ i ] ], 8 );
+            ec_enc_icdf( psRangeEnc, psIndices->NLSFIndices[ i + 1 ] + NLSF_QUANT_MAX_AMPLITUDE,
+            &psEncC->psNLSF_CB->ec_iCDF[ ec_ix[ i ] ], 8 );
         }
     }
 
     /* Encode NLSF interpolation factor */
-    if( psEncC->nb_subfr == MAX_NB_SUBFR ) {
+    if (psEncC->nb_subfr == MAX_NB_SUBFR) {
         silk_assert( psIndices->NLSFInterpCoef_Q2 >= 0 && psIndices->NLSFInterpCoef_Q2 < 5 );
         ec_enc_icdf( psRangeEnc, psIndices->NLSFInterpCoef_Q2, silk_NLSF_interpolation_factor_iCDF, 8 );
     }
 
-    if( psIndices->signalType == TYPE_VOICED )
-    {
+    if (psIndices->signalType == TYPE_VOICED) {
         /*********************/
         /* Encode pitch lags */
         /*********************/
         /* lag index */
         encode_absolute_lagIndex = 1;
-        if( condCoding == CODE_CONDITIONALLY && psEncC->ec_prevSignalType == TYPE_VOICED ) {
+        if (condCoding == CODE_CONDITIONALLY && psEncC->ec_prevSignalType == TYPE_VOICED) {
             /* Delta Encoding */
             delta_lagIndex = psIndices->lagIndex - psEncC->ec_prevLagIndex;
-            if( delta_lagIndex < -8 || delta_lagIndex > 11 ) {
+            if (delta_lagIndex < -8 || delta_lagIndex > 11) {
                 delta_lagIndex = 0;
             } else {
                 delta_lagIndex = delta_lagIndex + 9;
@@ -128,12 +133,12 @@ void silk_encode_indices(
             silk_assert( delta_lagIndex >= 0 && delta_lagIndex < 21 );
             ec_enc_icdf( psRangeEnc, delta_lagIndex, silk_pitch_delta_iCDF, 8 );
         }
-        if( encode_absolute_lagIndex ) {
+        if (encode_absolute_lagIndex) {
             /* Absolute encoding */
             oac_int32 pitch_high_bits, pitch_low_bits;
-            pitch_high_bits = silk_DIV32_16( psIndices->lagIndex, silk_RSHIFT( psEncC->fs_kHz, 1 ) );
-            pitch_low_bits = psIndices->lagIndex - silk_SMULBB( pitch_high_bits, silk_RSHIFT( psEncC->fs_kHz, 1 ) );
-            silk_assert( pitch_low_bits < psEncC->fs_kHz / 2 );
+            pitch_high_bits = silk_DIV32_16( psIndices->lagIndex, silk_RSHIFT( psEncC->fs_kHz, 1 ));
+            pitch_low_bits = psIndices->lagIndex - silk_SMULBB( pitch_high_bits, silk_RSHIFT( psEncC->fs_kHz, 1 ));
+            silk_assert( pitch_low_bits < psEncC->fs_kHz/2 );
             silk_assert( pitch_high_bits < 32 );
             ec_enc_icdf( psRangeEnc, pitch_high_bits, silk_pitch_lag_iCDF, 8 );
             ec_enc_icdf( psRangeEnc, pitch_low_bits, psEncC->pitch_lag_low_bits_iCDF, 8 );
@@ -142,10 +147,10 @@ void silk_encode_indices(
 
         /* Contour index */
         silk_assert(   psIndices->contourIndex  >= 0 );
-        silk_assert( ( psIndices->contourIndex < 34 && psEncC->fs_kHz  > 8 && psEncC->nb_subfr == 4 ) ||
-                    ( psIndices->contourIndex < 11 && psEncC->fs_kHz == 8 && psEncC->nb_subfr == 4 ) ||
-                    ( psIndices->contourIndex < 12 && psEncC->fs_kHz  > 8 && psEncC->nb_subfr == 2 ) ||
-                    ( psIndices->contourIndex <  3 && psEncC->fs_kHz == 8 && psEncC->nb_subfr == 2 ) );
+        silk_assert((psIndices->contourIndex < 34 && psEncC->fs_kHz  > 8 && psEncC->nb_subfr == 4)
+            || (psIndices->contourIndex < 11 && psEncC->fs_kHz == 8 && psEncC->nb_subfr == 4)
+            || (psIndices->contourIndex < 12 && psEncC->fs_kHz  > 8 && psEncC->nb_subfr == 2)
+            || (psIndices->contourIndex <  3 && psEncC->fs_kHz == 8 && psEncC->nb_subfr == 2));
         ec_enc_icdf( psRangeEnc, psIndices->contourIndex, psEncC->pitch_contour_iCDF, 8 );
 
         /********************/
@@ -156,15 +161,15 @@ void silk_encode_indices(
         ec_enc_icdf( psRangeEnc, psIndices->PERIndex, silk_LTP_per_index_iCDF, 8 );
 
         /* Codebook Indices */
-        for( k = 0; k < psEncC->nb_subfr; k++ ) {
-            silk_assert( psIndices->LTPIndex[ k ] >= 0 && psIndices->LTPIndex[ k ] < ( 8 << psIndices->PERIndex ) );
+        for (k = 0; k < psEncC->nb_subfr; k++) {
+            silk_assert( psIndices->LTPIndex[ k ] >= 0 && psIndices->LTPIndex[ k ] < (8<<psIndices->PERIndex));
             ec_enc_icdf( psRangeEnc, psIndices->LTPIndex[ k ], silk_LTP_gain_iCDF_ptrs[ psIndices->PERIndex ], 8 );
         }
 
         /**********************/
         /* Encode LTP scaling */
         /**********************/
-        if( condCoding == CODE_INDEPENDENTLY ) {
+        if (condCoding == CODE_INDEPENDENTLY) {
             silk_assert( psIndices->LTP_scaleIndex >= 0 && psIndices->LTP_scaleIndex < 3 );
             ec_enc_icdf( psRangeEnc, psIndices->LTP_scaleIndex, silk_LTPscale_iCDF, 8 );
         }
diff --git a/silk/encode_pulses.c b/silk/encode_pulses.c
index 89aac654f..c7364deab 100644
--- a/silk/encode_pulses.c
+++ b/silk/encode_pulses.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -39,15 +39,14 @@ POSSIBILITY OF SUCH DAMAGE.
 static OAC_INLINE oac_int combine_and_check(    /* return ok                           */
     oac_int         *pulses_comb,           /* O                                   */
     const oac_int   *pulses_in,             /* I                                   */
-    oac_int         max_pulses,             /* I    max value for sum of pulses    */
-    oac_int         len                     /* I    number of output values        */
-)
-{
+    oac_int max_pulses,                     /* I    max value for sum of pulses    */
+    oac_int len                             /* I    number of output values        */
+    ) {
     oac_int k, sum;
 
-    for( k = 0; k < len; k++ ) {
-        sum = pulses_in[ 2 * k ] + pulses_in[ 2 * k + 1 ];
-        if( sum > max_pulses ) {
+    for (k = 0; k < len; k++) {
+        sum = pulses_in[ 2*k ] + pulses_in[ 2*k + 1 ];
+        if (sum > max_pulses) {
             return 1;
         }
         pulses_comb[ k ] = sum;
@@ -59,56 +58,55 @@ static OAC_INLINE oac_int combine_and_check(    /* return ok
 /* Encode quantization indices of excitation */
 void silk_encode_pulses(
     ec_enc                      *psRangeEnc,                    /* I/O  compressor data structure                   */
-    const oac_int              signalType,                     /* I    Signal type                                 */
-    const oac_int              quantOffsetType,                /* I    quantOffsetType                             */
-    oac_int8                   pulses[],                       /* I    quantization indices                        */
-    const oac_int              frame_length                    /* I    Frame length                                */
-)
-{
-    oac_int   i, k, j, iter, bit, nLS, scale_down, RateLevelIndex = 0;
+    const oac_int signalType,                                  /* I    Signal type                                 */
+    const oac_int quantOffsetType,                             /* I    quantOffsetType                             */
+    oac_int8 pulses[],                                         /* I    quantization indices                        */
+    const oac_int frame_length                                 /* I    Frame length                                */
+    ) {
+    oac_int i, k, j, iter, bit, nLS, scale_down, RateLevelIndex = 0;
     oac_int32 abs_q, minSumBits_Q5, sumBits_Q5;
     VARDECL( oac_int, abs_pulses );
     VARDECL( oac_int, sum_pulses );
     VARDECL( oac_int, nRshifts );
-    oac_int   pulses_comb[ 8 ];
+    oac_int pulses_comb[ 8 ];
     oac_int   *abs_pulses_ptr;
     const oac_int8 *pulses_ptr;
     const oac_uint8 *cdf_ptr;
     const oac_uint8 *nBits_ptr;
     SAVE_STACK;
 
-    silk_memset( pulses_comb, 0, 8 * sizeof( oac_int ) ); /* Fixing Valgrind reported problem*/
+    silk_memset( pulses_comb, 0, 8*sizeof(oac_int));      /* Fixing Valgrind reported problem*/
 
     /****************************/
     /* Prepare for shell coding */
     /****************************/
     /* Calculate number of shell blocks */
-    silk_assert( 1 << LOG2_SHELL_CODEC_FRAME_LENGTH == SHELL_CODEC_FRAME_LENGTH );
+    silk_assert( 1<<LOG2_SHELL_CODEC_FRAME_LENGTH == SHELL_CODEC_FRAME_LENGTH );
     iter = silk_RSHIFT( frame_length, LOG2_SHELL_CODEC_FRAME_LENGTH );
-    if( iter * SHELL_CODEC_FRAME_LENGTH < frame_length ) {
-        celt_assert( frame_length == 12 * 10 ); /* Make sure only happens for 10 ms @ 12 kHz */
+    if (iter*SHELL_CODEC_FRAME_LENGTH < frame_length) {
+        celt_assert( frame_length == 12*10 );   /* Make sure only happens for 10 ms @ 12 kHz */
         iter++;
-        silk_memset( &pulses[ frame_length ], 0, SHELL_CODEC_FRAME_LENGTH * sizeof(oac_int8));
+        silk_memset( &pulses[ frame_length ], 0, SHELL_CODEC_FRAME_LENGTH*sizeof(oac_int8));
     }
 
     /* Take the absolute value of the pulses */
-    ALLOC( abs_pulses, iter * SHELL_CODEC_FRAME_LENGTH, oac_int );
-    silk_assert( !( SHELL_CODEC_FRAME_LENGTH & 3 ) );
-    for( i = 0; i < iter * SHELL_CODEC_FRAME_LENGTH; i+=4 ) {
-        abs_pulses[i+0] = ( oac_int )silk_abs( pulses[ i + 0 ] );
-        abs_pulses[i+1] = ( oac_int )silk_abs( pulses[ i + 1 ] );
-        abs_pulses[i+2] = ( oac_int )silk_abs( pulses[ i + 2 ] );
-        abs_pulses[i+3] = ( oac_int )silk_abs( pulses[ i + 3 ] );
+    ALLOC( abs_pulses, iter*SHELL_CODEC_FRAME_LENGTH, oac_int );
+    silk_assert( !(SHELL_CODEC_FRAME_LENGTH&3));
+    for (i = 0; i < iter*SHELL_CODEC_FRAME_LENGTH; i += 4) {
+        abs_pulses[i + 0] = ( oac_int )silk_abs( pulses[ i + 0 ] );
+        abs_pulses[i + 1] = ( oac_int )silk_abs( pulses[ i + 1 ] );
+        abs_pulses[i + 2] = ( oac_int )silk_abs( pulses[ i + 2 ] );
+        abs_pulses[i + 3] = ( oac_int )silk_abs( pulses[ i + 3 ] );
     }
 
     /* Calc sum pulses per shell code frame */
     ALLOC( sum_pulses, iter, oac_int );
     ALLOC( nRshifts, iter, oac_int );
     abs_pulses_ptr = abs_pulses;
-    for( i = 0; i < iter; i++ ) {
+    for (i = 0; i < iter; i++) {
         nRshifts[ i ] = 0;
 
-        while( 1 ) {
+        while (1) {
             /* 1+1 -> 2 */
             scale_down = combine_and_check( pulses_comb, abs_pulses_ptr, silk_max_pulses_table[ 0 ], 8 );
             /* 2+2 -> 4 */
@@ -118,10 +116,10 @@ void silk_encode_pulses(
             /* 8+8 -> 16 */
             scale_down += combine_and_check( &sum_pulses[ i ], pulses_comb, silk_max_pulses_table[ 3 ], 1 );
 
-            if( scale_down ) {
+            if (scale_down) {
                 /* We need to downscale the quantization signal */
                 nRshifts[ i ]++;
-                for( k = 0; k < SHELL_CODEC_FRAME_LENGTH; k++ ) {
+                for (k = 0; k < SHELL_CODEC_FRAME_LENGTH; k++) {
                     abs_pulses_ptr[ k ] = silk_RSHIFT( abs_pulses_ptr[ k ], 1 );
                 }
             } else {
@@ -137,33 +135,33 @@ void silk_encode_pulses(
     /**************/
     /* find rate level that leads to fewest bits for coding of pulses per block info */
     minSumBits_Q5 = silk_int32_MAX;
-    for( k = 0; k < N_RATE_LEVELS - 1; k++ ) {
+    for (k = 0; k < N_RATE_LEVELS - 1; k++) {
         nBits_ptr  = silk_pulses_per_block_BITS_Q5[ k ];
-        sumBits_Q5 = silk_rate_levels_BITS_Q5[ signalType >> 1 ][ k ];
-        for( i = 0; i < iter; i++ ) {
-            if( nRshifts[ i ] > 0 ) {
+        sumBits_Q5 = silk_rate_levels_BITS_Q5[ signalType>>1 ][ k ];
+        for (i = 0; i < iter; i++) {
+            if (nRshifts[ i ] > 0) {
                 sumBits_Q5 += nBits_ptr[ SILK_MAX_PULSES + 1 ];
             } else {
                 sumBits_Q5 += nBits_ptr[ sum_pulses[ i ] ];
             }
         }
-        if( sumBits_Q5 < minSumBits_Q5 ) {
+        if (sumBits_Q5 < minSumBits_Q5) {
             minSumBits_Q5 = sumBits_Q5;
             RateLevelIndex = k;
         }
     }
-    ec_enc_icdf( psRangeEnc, RateLevelIndex, silk_rate_levels_iCDF[ signalType >> 1 ], 8 );
+    ec_enc_icdf( psRangeEnc, RateLevelIndex, silk_rate_levels_iCDF[ signalType>>1 ], 8 );
 
     /***************************************************/
     /* Sum-Weighted-Pulses Encoding                    */
     /***************************************************/
     cdf_ptr = silk_pulses_per_block_iCDF[ RateLevelIndex ];
-    for( i = 0; i < iter; i++ ) {
-        if( nRshifts[ i ] == 0 ) {
+    for (i = 0; i < iter; i++) {
+        if (nRshifts[ i ] == 0) {
             ec_enc_icdf( psRangeEnc, sum_pulses[ i ], cdf_ptr, 8 );
         } else {
             ec_enc_icdf( psRangeEnc, SILK_MAX_PULSES + 1, cdf_ptr, 8 );
-            for( k = 0; k < nRshifts[ i ] - 1; k++ ) {
+            for (k = 0; k < nRshifts[ i ] - 1; k++) {
                 ec_enc_icdf( psRangeEnc, SILK_MAX_PULSES + 1, silk_pulses_per_block_iCDF[ N_RATE_LEVELS - 1 ], 8 );
             }
             ec_enc_icdf( psRangeEnc, sum_pulses[ i ], silk_pulses_per_block_iCDF[ N_RATE_LEVELS - 1 ], 8 );
@@ -173,26 +171,26 @@ void silk_encode_pulses(
     /******************/
     /* Shell Encoding */
     /******************/
-    for( i = 0; i < iter; i++ ) {
-        if( sum_pulses[ i ] > 0 ) {
-            silk_shell_encoder( psRangeEnc, &abs_pulses[ i * SHELL_CODEC_FRAME_LENGTH ] );
+    for (i = 0; i < iter; i++) {
+        if (sum_pulses[ i ] > 0) {
+            silk_shell_encoder( psRangeEnc, &abs_pulses[ i*SHELL_CODEC_FRAME_LENGTH ] );
         }
     }
 
     /****************/
     /* LSB Encoding */
     /****************/
-    for( i = 0; i < iter; i++ ) {
-        if( nRshifts[ i ] > 0 ) {
-            pulses_ptr = &pulses[ i * SHELL_CODEC_FRAME_LENGTH ];
+    for (i = 0; i < iter; i++) {
+        if (nRshifts[ i ] > 0) {
+            pulses_ptr = &pulses[ i*SHELL_CODEC_FRAME_LENGTH ];
             nLS = nRshifts[ i ] - 1;
-            for( k = 0; k < SHELL_CODEC_FRAME_LENGTH; k++ ) {
+            for (k = 0; k < SHELL_CODEC_FRAME_LENGTH; k++) {
                 abs_q = (oac_int8)silk_abs( pulses_ptr[ k ] );
-                for( j = nLS; j > 0; j-- ) {
-                    bit = silk_RSHIFT( abs_q, j ) & 1;
+                for (j = nLS; j > 0; j--) {
+                    bit = silk_RSHIFT( abs_q, j )&1;
                     ec_enc_icdf( psRangeEnc, bit, silk_lsb_iCDF, 8 );
                 }
-                bit = abs_q & 1;
+                bit = abs_q&1;
                 ec_enc_icdf( psRangeEnc, bit, silk_lsb_iCDF, 8 );
             }
         }
diff --git a/silk/errors.h b/silk/errors.h
index 28b87ddd3..0a8b4ae5e 100644
--- a/silk/errors.h
+++ b/silk/errors.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_ERRORS_H
diff --git a/silk/fixed/LTP_analysis_filter_FIX.c b/silk/fixed/LTP_analysis_filter_FIX.c
index db17a3218..8fa52e7b0 100644
--- a/silk/fixed/LTP_analysis_filter_FIX.c
+++ b/silk/fixed/LTP_analysis_filter_FIX.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FIX.h"
@@ -34,38 +34,37 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_LTP_analysis_filter_FIX(
     oac_int16                      *LTP_res,                               /* O    LTP residual signal of length MAX_NB_SUBFR * ( pre_length + subfr_length )  */
     const oac_int16                *x,                                     /* I    Pointer to input signal with at least max( pitchL ) preceding samples       */
-    const oac_int16                LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],/* I    LTP_ORDER LTP coefficients for each MAX_NB_SUBFR subframe                   */
-    const oac_int                  pitchL[ MAX_NB_SUBFR ],                 /* I    Pitch lag, one for each subframe                                            */
-    const oac_int32                invGains_Q16[ MAX_NB_SUBFR ],           /* I    Inverse quantization gains, one for each subframe                           */
-    const oac_int                  subfr_length,                           /* I    Length of each subframe                                                     */
-    const oac_int                  nb_subfr,                               /* I    Number of subframes                                                         */
-    const oac_int                  pre_length                              /* I    Length of the preceding samples starting at &x[0] for each subframe         */
-)
-{
+    const oac_int16 LTPCoef_Q14[ LTP_ORDER*MAX_NB_SUBFR ],                 /* I    LTP_ORDER LTP coefficients for each MAX_NB_SUBFR subframe                   */
+    const oac_int pitchL[ MAX_NB_SUBFR ],                                  /* I    Pitch lag, one for each subframe                                            */
+    const oac_int32 invGains_Q16[ MAX_NB_SUBFR ],                          /* I    Inverse quantization gains, one for each subframe                           */
+    const oac_int subfr_length,                                            /* I    Length of each subframe                                                     */
+    const oac_int nb_subfr,                                                /* I    Number of subframes                                                         */
+    const oac_int pre_length                                               /* I    Length of the preceding samples starting at &x[0] for each subframe         */
+    ) {
     const oac_int16 *x_ptr, *x_lag_ptr;
-    oac_int16   Btmp_Q14[ LTP_ORDER ];
+    oac_int16 Btmp_Q14[ LTP_ORDER ];
     oac_int16   *LTP_res_ptr;
-    oac_int     k, i;
-    oac_int32   LTP_est;
+    oac_int k, i;
+    oac_int32 LTP_est;
 
     x_ptr = x;
     LTP_res_ptr = LTP_res;
-    for( k = 0; k < nb_subfr; k++ ) {
+    for (k = 0; k < nb_subfr; k++) {
 
         x_lag_ptr = x_ptr - pitchL[ k ];
 
-        Btmp_Q14[ 0 ] = LTPCoef_Q14[ k * LTP_ORDER ];
-        Btmp_Q14[ 1 ] = LTPCoef_Q14[ k * LTP_ORDER + 1 ];
-        Btmp_Q14[ 2 ] = LTPCoef_Q14[ k * LTP_ORDER + 2 ];
-        Btmp_Q14[ 3 ] = LTPCoef_Q14[ k * LTP_ORDER + 3 ];
-        Btmp_Q14[ 4 ] = LTPCoef_Q14[ k * LTP_ORDER + 4 ];
+        Btmp_Q14[ 0 ] = LTPCoef_Q14[ k*LTP_ORDER ];
+        Btmp_Q14[ 1 ] = LTPCoef_Q14[ k*LTP_ORDER + 1 ];
+        Btmp_Q14[ 2 ] = LTPCoef_Q14[ k*LTP_ORDER + 2 ];
+        Btmp_Q14[ 3 ] = LTPCoef_Q14[ k*LTP_ORDER + 3 ];
+        Btmp_Q14[ 4 ] = LTPCoef_Q14[ k*LTP_ORDER + 4 ];
 
         /* LTP analysis FIR filter */
-        for( i = 0; i < subfr_length + pre_length; i++ ) {
+        for (i = 0; i < subfr_length + pre_length; i++) {
             LTP_res_ptr[ i ] = x_ptr[ i ];
 
             /* Long-term prediction */
-            LTP_est = silk_SMULBB( x_lag_ptr[ LTP_ORDER / 2 ], Btmp_Q14[ 0 ] );
+            LTP_est = silk_SMULBB( x_lag_ptr[ LTP_ORDER/2 ], Btmp_Q14[ 0 ] );
             LTP_est = silk_SMLABB_ovflw( LTP_est, x_lag_ptr[ 1 ], Btmp_Q14[ 1 ] );
             LTP_est = silk_SMLABB_ovflw( LTP_est, x_lag_ptr[ 0 ], Btmp_Q14[ 2 ] );
             LTP_est = silk_SMLABB_ovflw( LTP_est, x_lag_ptr[ -1 ], Btmp_Q14[ 3 ] );
@@ -74,7 +73,7 @@ void silk_LTP_analysis_filter_FIX(
             LTP_est = silk_RSHIFT_ROUND( LTP_est, 14 ); /* round and -> Q0*/
 
             /* Subtract long-term prediction */
-            LTP_res_ptr[ i ] = (oac_int16)silk_SAT16( (oac_int32)x_ptr[ i ] - LTP_est );
+            LTP_res_ptr[ i ] = (oac_int16)silk_SAT16((oac_int32)x_ptr[ i ] - LTP_est );
 
             /* Scale residual */
             LTP_res_ptr[ i ] = silk_SMULWB( invGains_Q16[ k ], LTP_res_ptr[ i ] );
diff --git a/silk/fixed/LTP_scale_ctrl_FIX.c b/silk/fixed/LTP_scale_ctrl_FIX.c
index 31ae8fa17..7a4d359dd 100644
--- a/silk/fixed/LTP_scale_ctrl_FIX.c
+++ b/silk/fixed/LTP_scale_ctrl_FIX.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FIX.h"
@@ -35,21 +35,22 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_LTP_scale_ctrl_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  encoder control                                                             */
-    oac_int                        condCoding                              /* I    The type of conditional coding to use                                       */
-)
-{
+    oac_int condCoding                                                     /* I    The type of conditional coding to use                                       */
+    ) {
     oac_int round_loss;
 
-    if( condCoding == CODE_INDEPENDENTLY ) {
+    if (condCoding == CODE_INDEPENDENTLY) {
         /* Only scale if first frame in packet */
-        round_loss = psEnc->sCmn.PacketLoss_perc * psEnc->sCmn.nFramesPerPacket;
-        if ( psEnc->sCmn.LBRR_flag ) {
+        round_loss = psEnc->sCmn.PacketLoss_perc*psEnc->sCmn.nFramesPerPacket;
+        if (psEnc->sCmn.LBRR_flag) {
             /* LBRR reduces the effective loss. In practice, it does not square the loss because
                losses aren't independent, but that still seems to work best. We also never go below 2%. */
-            round_loss = 2 + silk_SMULBB( round_loss, round_loss ) / 100;
+            round_loss = 2 + silk_SMULBB( round_loss, round_loss )/100;
         }
-        psEnc->sCmn.indices.LTP_scaleIndex = silk_SMULBB( psEncCtrl->LTPredCodGain_Q7, round_loss ) > silk_log2lin( 128*7 + 2900-psEnc->sCmn.SNR_dB_Q7 );
-        psEnc->sCmn.indices.LTP_scaleIndex += silk_SMULBB( psEncCtrl->LTPredCodGain_Q7, round_loss ) > silk_log2lin( 128*7 + 3900-psEnc->sCmn.SNR_dB_Q7 );
+        psEnc->sCmn.indices.LTP_scaleIndex = silk_SMULBB( psEncCtrl->LTPredCodGain_Q7,
+        round_loss ) > silk_log2lin( 128*7 + 2900 - psEnc->sCmn.SNR_dB_Q7 );
+        psEnc->sCmn.indices.LTP_scaleIndex += silk_SMULBB( psEncCtrl->LTPredCodGain_Q7,
+        round_loss ) > silk_log2lin( 128*7 + 3900 - psEnc->sCmn.SNR_dB_Q7 );
     } else {
         /* Default is minimum scaling */
         psEnc->sCmn.indices.LTP_scaleIndex = 0;
diff --git a/silk/fixed/apply_sine_window_FIX.c b/silk/fixed/apply_sine_window_FIX.c
index 84f7020d1..3711ce07b 100644
--- a/silk/fixed/apply_sine_window_FIX.c
+++ b/silk/fixed/apply_sine_window_FIX.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -40,62 +40,61 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Matlab code for table:
    for k=16:9*4:16+2*9*4, fprintf(' %7.d,', -round(65536*pi ./ (k:4:k+8*4))); fprintf('\n'); end
-*/
+ */
 static const oac_int16 freq_table_Q16[ 27 ] = {
-   12111,    9804,    8235,    7100,    6239,    5565,    5022,    4575,    4202,
+    12111,    9804,    8235,    7100,    6239,    5565,    5022,    4575,    4202,
     3885,    3612,    3375,    3167,    2984,    2820,    2674,    2542,    2422,
     2313,    2214,    2123,    2038,    1961,    1889,    1822,    1760,    1702,
 };
 
 void silk_apply_sine_window(
-    oac_int16                  px_win[],           /* O    Pointer to windowed signal                                  */
-    const oac_int16            px[],               /* I    Pointer to input signal                                     */
-    const oac_int              win_type,           /* I    Selects a window type                                       */
-    const oac_int              length              /* I    Window length, multiple of 4                                */
-)
-{
-    oac_int   k, f_Q16, c_Q16;
+    oac_int16 px_win[],                            /* O    Pointer to windowed signal                                  */
+    const oac_int16 px[],                          /* I    Pointer to input signal                                     */
+    const oac_int win_type,                        /* I    Selects a window type                                       */
+    const oac_int length                           /* I    Window length, multiple of 4                                */
+    ) {
+    oac_int k, f_Q16, c_Q16;
     oac_int32 S0_Q16, S1_Q16;
 
     celt_assert( win_type == 1 || win_type == 2 );
 
     /* Length must be in a range from 16 to 120 and a multiple of 4 */
     celt_assert( length >= 16 && length <= 120 );
-    celt_assert( ( length & 3 ) == 0 );
+    celt_assert((length&3) == 0 );
 
     /* Frequency */
-    k = ( length >> 2 ) - 4;
+    k = (length>>2) - 4;
     celt_assert( k >= 0 && k <= 26 );
     f_Q16 = (oac_int)freq_table_Q16[ k ];
 
     /* Factor used for cosine approximation */
-    c_Q16 = silk_SMULWB( (oac_int32)f_Q16, -f_Q16 );
+    c_Q16 = silk_SMULWB((oac_int32)f_Q16, -f_Q16 );
     silk_assert( c_Q16 >= -32768 );
 
     /* initialize state */
-    if( win_type == 1 ) {
+    if (win_type == 1) {
         /* start from 0 */
         S0_Q16 = 0;
         /* approximation of sin(f) */
         S1_Q16 = f_Q16 + silk_RSHIFT( length, 3 );
     } else {
         /* start from 1 */
-        S0_Q16 = ( (oac_int32)1 << 16 );
+        S0_Q16 = ((oac_int32)1<<16);
         /* approximation of cos(f) */
-        S1_Q16 = ( (oac_int32)1 << 16 ) + silk_RSHIFT( c_Q16, 1 ) + silk_RSHIFT( length, 4 );
+        S1_Q16 = ((oac_int32)1<<16) + silk_RSHIFT( c_Q16, 1 ) + silk_RSHIFT( length, 4 );
     }
 
     /* Uses the recursive equation:   sin(n*f) = 2 * cos(f) * sin((n-1)*f) - sin((n-2)*f)    */
     /* 4 samples at a time */
-    for( k = 0; k < length; k += 4 ) {
+    for (k = 0; k < length; k += 4) {
         px_win[ k ]     = (oac_int16)silk_SMULWB( silk_RSHIFT( S0_Q16 + S1_Q16, 1 ), px[ k ] );
         px_win[ k + 1 ] = (oac_int16)silk_SMULWB( S1_Q16, px[ k + 1] );
         S0_Q16 = silk_SMULWB( S1_Q16, c_Q16 ) + silk_LSHIFT( S1_Q16, 1 ) - S0_Q16 + 1;
-        S0_Q16 = silk_min( S0_Q16, ( (oac_int32)1 << 16 ) );
+        S0_Q16 = silk_min( S0_Q16, ((oac_int32)1<<16));
 
         px_win[ k + 2 ] = (oac_int16)silk_SMULWB( silk_RSHIFT( S0_Q16 + S1_Q16, 1 ), px[ k + 2] );
         px_win[ k + 3 ] = (oac_int16)silk_SMULWB( S0_Q16, px[ k + 3 ] );
         S1_Q16 = silk_SMULWB( S0_Q16, c_Q16 ) + silk_LSHIFT( S0_Q16, 1 ) - S1_Q16;
-        S1_Q16 = silk_min( S1_Q16, ( (oac_int32)1 << 16 ) );
+        S1_Q16 = silk_min( S1_Q16, ((oac_int32)1<<16));
     }
 }
diff --git a/silk/fixed/arm/warped_autocorrelation_FIX_arm.h b/silk/fixed/arm/warped_autocorrelation_FIX_arm.h
index b78461e8c..546fa90e2 100644
--- a/silk/fixed/arm/warped_autocorrelation_FIX_arm.h
+++ b/silk/fixed/arm/warped_autocorrelation_FIX_arm.h
@@ -1,68 +1,69 @@
 /***********************************************************************
-Copyright (c) 2017 Google Inc.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2017 Google Inc.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_WARPED_AUTOCORRELATION_FIX_ARM_H
-# define SILK_WARPED_AUTOCORRELATION_FIX_ARM_H
+#define SILK_WARPED_AUTOCORRELATION_FIX_ARM_H
 
-# include "celt/arm/armcpu.h"
+#include "celt/arm/armcpu.h"
 
-# if defined(FIXED_POINT)
+#if defined(FIXED_POINT)
 
-#  if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
+# if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 void silk_warped_autocorrelation_FIX_neon(
-          oac_int32                *corr,                                  /* O    Result [order + 1]                                                          */
-          oac_int                  *scale,                                 /* O    Scaling of the correlation vector                                           */
+    oac_int32                *corr,                                        /* O    Result [order + 1]                                                          */
+    oac_int                  *scale,                                       /* O    Scaling of the correlation vector                                           */
     const oac_int16                *input,                                 /* I    Input data to correlate                                                     */
-    const oac_int                  warping_Q16,                            /* I    Warping coefficient                                                         */
-    const oac_int                  length,                                 /* I    Length of input                                                             */
-    const oac_int                  order                                   /* I    Correlation order (even)                                                    */
-);
+    const oac_int warping_Q16,                                             /* I    Warping coefficient                                                         */
+    const oac_int length,                                                  /* I    Length of input                                                             */
+    const oac_int order                                                    /* I    Correlation order (even)                                                    */
+    );
 
 #  if !defined(OAC_HAVE_RTCD) && defined(OAC_ARM_PRESUME_NEON)
 #   define OVERRIDE_silk_warped_autocorrelation_FIX (1)
 #   define silk_warped_autocorrelation_FIX(corr, scale, input, warping_Q16, length, order, arch) \
-    ((void)(arch), PRESUME_NEON(silk_warped_autocorrelation_FIX)(corr, scale, input, warping_Q16, length, order))
-#  endif
+        ((void)(arch), PRESUME_NEON(silk_warped_autocorrelation_FIX)(corr, scale, input, warping_Q16, length, order))
 #  endif
+# endif
 
-#  if !defined(OVERRIDE_silk_warped_autocorrelation_FIX)
+# if !defined(OVERRIDE_silk_warped_autocorrelation_FIX)
 /*Is run-time CPU detection enabled on this platform?*/
-#   if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
-extern void (*const SILK_WARPED_AUTOCORRELATION_FIX_IMPL[OAC_ARCHMASK+1])(oac_int32*, oac_int*, const oac_int16*, const oac_int, const oac_int, const oac_int);
-#    define OVERRIDE_silk_warped_autocorrelation_FIX (1)
-#    define silk_warped_autocorrelation_FIX(corr, scale, input, warping_Q16, length, order, arch) \
-    ((*SILK_WARPED_AUTOCORRELATION_FIX_IMPL[(arch)&OAC_ARCHMASK])(corr, scale, input, warping_Q16, length, order))
-#   elif defined(OAC_ARM_PRESUME_NEON_INTR)
-#    define OVERRIDE_silk_warped_autocorrelation_FIX (1)
-#    define silk_warped_autocorrelation_FIX(corr, scale, input, warping_Q16, length, order, arch) \
-    ((void)(arch), silk_warped_autocorrelation_FIX_neon(corr, scale, input, warping_Q16, length, order))
-#   endif
+#  if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
+extern void (*const SILK_WARPED_AUTOCORRELATION_FIX_IMPL[OAC_ARCHMASK + 1])(oac_int32*, oac_int*, const oac_int16*,
+const oac_int, const oac_int, const oac_int);
+#   define OVERRIDE_silk_warped_autocorrelation_FIX (1)
+#   define silk_warped_autocorrelation_FIX(corr, scale, input, warping_Q16, length, order, arch) \
+        ((*SILK_WARPED_AUTOCORRELATION_FIX_IMPL[(arch)&OAC_ARCHMASK])(corr, scale, input, warping_Q16, length, order))
+#  elif defined(OAC_ARM_PRESUME_NEON_INTR)
+#   define OVERRIDE_silk_warped_autocorrelation_FIX (1)
+#   define silk_warped_autocorrelation_FIX(corr, scale, input, warping_Q16, length, order, arch) \
+        ((void)(arch), silk_warped_autocorrelation_FIX_neon(corr, scale, input, warping_Q16, length, order))
 #  endif
+# endif
 
-# endif /* end FIXED_POINT */
+#endif /* end FIXED_POINT */
 
 #endif /* end SILK_WARPED_AUTOCORRELATION_FIX_ARM_H */
diff --git a/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c b/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c
index 83ad19bcf..7f84aa6a1 100644
--- a/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c
+++ b/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2017 Google Inc., Jean-Marc Valin
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2017 Google Inc., Jean-Marc Valin
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <arm_neon.h>
@@ -36,44 +36,43 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "stack_alloc.h"
 #include "main_FIX.h"
 
-static OAC_INLINE void calc_corr( const oac_int32 *const input_QS, oac_int64 *const corr_QC, const oac_int offset, const int32x4_t state_QS_s32x4 )
-{
+static OAC_INLINE void calc_corr( const oac_int32 *const input_QS, oac_int64 *const corr_QC, const oac_int offset,
+                                  const int32x4_t state_QS_s32x4 ) {
     int64x2_t corr_QC_s64x2[ 2 ], t_s64x2[ 2 ];
     const int32x4_t input_QS_s32x4 = vld1q_s32( input_QS + offset );
     corr_QC_s64x2[ 0 ] = vld1q_s64( corr_QC + offset + 0 );
     corr_QC_s64x2[ 1 ] = vld1q_s64( corr_QC + offset + 2 );
-    t_s64x2[ 0 ] = vmull_s32( vget_low_s32( state_QS_s32x4 ), vget_low_s32( input_QS_s32x4 ) );
-    t_s64x2[ 1 ] = vmull_s32( vget_high_s32( state_QS_s32x4 ), vget_high_s32( input_QS_s32x4 ) );
-    corr_QC_s64x2[ 0 ] = vsraq_n_s64( corr_QC_s64x2[ 0 ], t_s64x2[ 0 ], 2 * QS - QC );
-    corr_QC_s64x2[ 1 ] = vsraq_n_s64( corr_QC_s64x2[ 1 ], t_s64x2[ 1 ], 2 * QS - QC );
+    t_s64x2[ 0 ] = vmull_s32( vget_low_s32( state_QS_s32x4 ), vget_low_s32( input_QS_s32x4 ));
+    t_s64x2[ 1 ] = vmull_s32( vget_high_s32( state_QS_s32x4 ), vget_high_s32( input_QS_s32x4 ));
+    corr_QC_s64x2[ 0 ] = vsraq_n_s64( corr_QC_s64x2[ 0 ], t_s64x2[ 0 ], 2*QS - QC );
+    corr_QC_s64x2[ 1 ] = vsraq_n_s64( corr_QC_s64x2[ 1 ], t_s64x2[ 1 ], 2*QS - QC );
     vst1q_s64( corr_QC + offset + 0, corr_QC_s64x2[ 0 ] );
     vst1q_s64( corr_QC + offset + 2, corr_QC_s64x2[ 1 ] );
 }
 
-static OAC_INLINE int32x4_t calc_state( const int32x4_t state_QS0_s32x4, const int32x4_t state_QS0_1_s32x4, const int32x4_t state_QS1_1_s32x4, const int32x4_t warping_Q16_s32x4 )
-{
+static OAC_INLINE int32x4_t calc_state( const int32x4_t state_QS0_s32x4, const int32x4_t state_QS0_1_s32x4,
+                                        const int32x4_t state_QS1_1_s32x4, const int32x4_t warping_Q16_s32x4 ) {
     int32x4_t t_s32x4 = vsubq_s32( state_QS0_s32x4, state_QS0_1_s32x4 );
     t_s32x4 = vqdmulhq_s32( t_s32x4, warping_Q16_s32x4 );
     return vaddq_s32( state_QS1_1_s32x4, t_s32x4 );
 }
 
 void silk_warped_autocorrelation_FIX_neon(
-          oac_int32                *corr,                                  /* O    Result [order + 1]                                                          */
-          oac_int                  *scale,                                 /* O    Scaling of the correlation vector                                           */
+    oac_int32                *corr,                                        /* O    Result [order + 1]                                                          */
+    oac_int                  *scale,                                       /* O    Scaling of the correlation vector                                           */
     const oac_int16                *input,                                 /* I    Input data to correlate                                                     */
-    const oac_int                  warping_Q16,                            /* I    Warping coefficient                                                         */
-    const oac_int                  length,                                 /* I    Length of input                                                             */
-    const oac_int                  order                                   /* I    Correlation order (even)                                                    */
-)
-{
-    if( ( MAX_SHAPE_LPC_ORDER > 24 ) || ( order < 6 ) ) {
+    const oac_int warping_Q16,                                             /* I    Warping coefficient                                                         */
+    const oac_int length,                                                  /* I    Length of input                                                             */
+    const oac_int order                                                    /* I    Correlation order (even)                                                    */
+    ) {
+    if ((MAX_SHAPE_LPC_ORDER > 24) || (order < 6)) {
         silk_warped_autocorrelation_FIX_c( corr, scale, input, warping_Q16, length, order );
     } else {
-        oac_int       n, i, lsh;
-        oac_int64     corr_QC[ MAX_SHAPE_LPC_ORDER + 1 ] = { 0 }; /* In reverse order */
-        oac_int64     corr_QC_orderT;
-        int64x2_t      lsh_s64x2;
-        const oac_int orderT = ( order + 3 ) & ~3;
+        oac_int n, i, lsh;
+        oac_int64 corr_QC[ MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };     /* In reverse order */
+        oac_int64 corr_QC_orderT;
+        int64x2_t lsh_s64x2;
+        const oac_int orderT = (order + 3)&~3;
         oac_int64     *corr_QCT;
         oac_int32     *input_QS;
         VARDECL( oac_int32, input_QST );
@@ -81,50 +80,50 @@ void silk_warped_autocorrelation_FIX_neon(
         SAVE_STACK;
 
         /* Order must be even */
-        silk_assert( ( order & 1 ) == 0 );
-        silk_assert( 2 * QS - QC >= 0 );
+        silk_assert((order&1) == 0 );
+        silk_assert( 2*QS - QC >= 0 );
 
         /* The additional +4 is to ensure a later vld1q_s32 call does not overflow.               */
         /* Strictly, only +3 is needed but +4 simplifies initialization using the 4x32 neon load. */
-        ALLOC( input_QST, length + 2 * MAX_SHAPE_LPC_ORDER + 4, oac_int32 );
+        ALLOC( input_QST, length + 2*MAX_SHAPE_LPC_ORDER + 4, oac_int32 );
 
         input_QS = input_QST;
         /* input_QS has zero paddings in the beginning and end. */
-        vst1q_s32( input_QS, vdupq_n_s32( 0 ) );
+        vst1q_s32( input_QS, vdupq_n_s32( 0 ));
         input_QS += 4;
-        vst1q_s32( input_QS, vdupq_n_s32( 0 ) );
+        vst1q_s32( input_QS, vdupq_n_s32( 0 ));
         input_QS += 4;
-        vst1q_s32( input_QS, vdupq_n_s32( 0 ) );
+        vst1q_s32( input_QS, vdupq_n_s32( 0 ));
         input_QS += 4;
-        vst1q_s32( input_QS, vdupq_n_s32( 0 ) );
+        vst1q_s32( input_QS, vdupq_n_s32( 0 ));
         input_QS += 4;
-        vst1q_s32( input_QS, vdupq_n_s32( 0 ) );
+        vst1q_s32( input_QS, vdupq_n_s32( 0 ));
         input_QS += 4;
-        vst1q_s32( input_QS, vdupq_n_s32( 0 ) );
+        vst1q_s32( input_QS, vdupq_n_s32( 0 ));
         input_QS += 4;
 
         /* Loop over samples */
-        for( n = 0; n < length - 7; n += 8, input_QS += 8 ) {
+        for (n = 0; n < length - 7; n += 8, input_QS += 8) {
             const int16x8_t t0_s16x4 = vld1q_s16( input + n );
-            vst1q_s32( input_QS + 0, vshll_n_s16( vget_low_s16( t0_s16x4 ), QS ) );
-            vst1q_s32( input_QS + 4, vshll_n_s16( vget_high_s16( t0_s16x4 ), QS ) );
+            vst1q_s32( input_QS + 0, vshll_n_s16( vget_low_s16( t0_s16x4 ), QS ));
+            vst1q_s32( input_QS + 4, vshll_n_s16( vget_high_s16( t0_s16x4 ), QS ));
         }
-        for( ; n < length; n++, input_QS++ ) {
-            input_QS[ 0 ] = silk_LSHIFT32( (oac_int32)input[ n ], QS );
+        for ( ; n < length; n++, input_QS++) {
+            input_QS[ 0 ] = silk_LSHIFT32((oac_int32)input[ n ], QS );
         }
-        vst1q_s32( input_QS, vdupq_n_s32( 0 ) );
+        vst1q_s32( input_QS, vdupq_n_s32( 0 ));
         input_QS += 4;
-        vst1q_s32( input_QS, vdupq_n_s32( 0 ) );
+        vst1q_s32( input_QS, vdupq_n_s32( 0 ));
         input_QS += 4;
-        vst1q_s32( input_QS, vdupq_n_s32( 0 ) );
+        vst1q_s32( input_QS, vdupq_n_s32( 0 ));
         input_QS += 4;
-        vst1q_s32( input_QS, vdupq_n_s32( 0 ) );
+        vst1q_s32( input_QS, vdupq_n_s32( 0 ));
         input_QS += 4;
-        vst1q_s32( input_QS, vdupq_n_s32( 0 ) );
+        vst1q_s32( input_QS, vdupq_n_s32( 0 ));
         input_QS += 4;
-        vst1q_s32( input_QS, vdupq_n_s32( 0 ) );
+        vst1q_s32( input_QS, vdupq_n_s32( 0 ));
         input_QS += 4;
-        vst1q_s32( input_QS, vdupq_n_s32( 0 ) );
+        vst1q_s32( input_QS, vdupq_n_s32( 0 ));
         input_QS = input_QST + MAX_SHAPE_LPC_ORDER - orderT;
 
         /* The following loop runs ( length + order ) times, with ( order ) extra epilogues.                  */
@@ -133,7 +132,7 @@ void silk_warped_autocorrelation_FIX_neon(
 
         /* Keep the C code here to help understand the intrinsics optimization. */
         /*
-        {
+           {
             oac_int32 state_QS[ 2 ][ MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };
             oac_int32 *state_QST[ 3 ];
             state_QST[ 0 ] = state_QS[ 0 ];
@@ -148,11 +147,11 @@ void silk_warped_autocorrelation_FIX_neon(
                 state_QST[ 0 ] = state_QST[ 1 ];
                 state_QST[ 1 ] = state_QST[ 2 ];
             }
-        }
-        */
+           }
+         */
 
         {
-            const int32x4_t warping_Q16_s32x4 = vdupq_n_s32( warping_Q16 << 15 );
+            const int32x4_t warping_Q16_s32x4 = vdupq_n_s32( warping_Q16<<15 );
             const oac_int32 *in = input_QS + orderT;
             oac_int o = orderT;
             int32x4_t state_QS_s32x4[ 3 ][ 2 ];
@@ -164,7 +163,7 @@ void silk_warped_autocorrelation_FIX_neon(
             /* Calculate 8 taps of all inputs in each loop. */
             do {
                 state_QS_s32x4[ 0 ][ 0 ] = state_QS_s32x4[ 0 ][ 1 ] =
-                state_QS_s32x4[ 1 ][ 0 ] = state_QS_s32x4[ 1 ][ 1 ] = vdupq_n_s32( 0 );
+                    state_QS_s32x4[ 1 ][ 0 ] = state_QS_s32x4[ 1 ][ 1 ] = vdupq_n_s32( 0 );
                 n = 0;
                 do {
                     calc_corr( input_QS + n, corr_QC, o - 8, state_QS_s32x4[ 0 ][ 0 ] );
@@ -173,16 +172,18 @@ void silk_warped_autocorrelation_FIX_neon(
                     vst1q_lane_s32( state + n, state_QS_s32x4[ 0 ][ 0 ], 0 );
                     state_QS_s32x4[ 2 ][ 0 ] = vextq_s32( state_QS_s32x4[ 0 ][ 0 ], state_QS_s32x4[ 0 ][ 1 ], 1 );
                     state_QS_s32x4[ 2 ][ 1 ] = vextq_s32( state_QS_s32x4[ 0 ][ 1 ], state_QS_s32x4[ 2 ][ 1 ], 1 );
-                    state_QS_s32x4[ 0 ][ 0 ] = calc_state( state_QS_s32x4[ 0 ][ 0 ], state_QS_s32x4[ 2 ][ 0 ], state_QS_s32x4[ 1 ][ 0 ], warping_Q16_s32x4 );
-                    state_QS_s32x4[ 0 ][ 1 ] = calc_state( state_QS_s32x4[ 0 ][ 1 ], state_QS_s32x4[ 2 ][ 1 ], state_QS_s32x4[ 1 ][ 1 ], warping_Q16_s32x4 );
+                    state_QS_s32x4[ 0 ][ 0 ] = calc_state( state_QS_s32x4[ 0 ][ 0 ], state_QS_s32x4[ 2 ][ 0 ],
+                    state_QS_s32x4[ 1 ][ 0 ], warping_Q16_s32x4 );
+                    state_QS_s32x4[ 0 ][ 1 ] = calc_state( state_QS_s32x4[ 0 ][ 1 ], state_QS_s32x4[ 2 ][ 1 ],
+                    state_QS_s32x4[ 1 ][ 1 ], warping_Q16_s32x4 );
                     state_QS_s32x4[ 1 ][ 0 ] = state_QS_s32x4[ 2 ][ 0 ];
                     state_QS_s32x4[ 1 ][ 1 ] = state_QS_s32x4[ 2 ][ 1 ];
-                } while( ++n < ( length + order ) );
+                } while (++n < (length + order));
                 in = state;
                 o -= 8;
-            } while( o > 4 );
+            } while (o > 4);
 
-            if( o ) {
+            if (o) {
                 /* Calculate the last 4 taps of all inputs. */
                 oac_int32 *stateT = state;
                 silk_assert( o == 4 );
@@ -193,11 +194,12 @@ void silk_warped_autocorrelation_FIX_neon(
                     state_QS_s32x4[ 2 ][ 0 ] = vld1q_s32( stateT );
                     vst1q_lane_s32( stateT, state_QS_s32x4[ 0 ][ 0 ], 0 );
                     state_QS_s32x4[ 2 ][ 0 ] = vextq_s32( state_QS_s32x4[ 0 ][ 0 ], state_QS_s32x4[ 2 ][ 0 ], 1 );
-                    state_QS_s32x4[ 0 ][ 0 ] = calc_state( state_QS_s32x4[ 0 ][ 0 ], state_QS_s32x4[ 2 ][ 0 ], state_QS_s32x4[ 1 ][ 0 ], warping_Q16_s32x4 );
+                    state_QS_s32x4[ 0 ][ 0 ] = calc_state( state_QS_s32x4[ 0 ][ 0 ], state_QS_s32x4[ 2 ][ 0 ],
+                    state_QS_s32x4[ 1 ][ 0 ], warping_Q16_s32x4 );
                     state_QS_s32x4[ 1 ][ 0 ] = state_QS_s32x4[ 2 ][ 0 ];
                     input_QS++;
                     stateT++;
-                } while( --n );
+                } while (--n);
             }
         }
 
@@ -206,17 +208,17 @@ void silk_warped_autocorrelation_FIX_neon(
             int32x4_t t_s32x4;
             int64x1_t t_s64x1;
             int64x2_t t_s64x2 = vdupq_n_s64( 0 );
-            for( n = 0; n <= length - 8; n += 8 ) {
+            for (n = 0; n <= length - 8; n += 8) {
                 int16x8_t input_s16x8 = vld1q_s16( inputT );
-                t_s32x4 = vmull_s16( vget_low_s16( input_s16x8 ), vget_low_s16( input_s16x8 ) );
-                t_s32x4 = vmlal_s16( t_s32x4, vget_high_s16( input_s16x8 ), vget_high_s16( input_s16x8 ) );
-                t_s64x2 = vaddw_s32( t_s64x2, vget_low_s32( t_s32x4 ) );
-                t_s64x2 = vaddw_s32( t_s64x2, vget_high_s32( t_s32x4 ) );
+                t_s32x4 = vmull_s16( vget_low_s16( input_s16x8 ), vget_low_s16( input_s16x8 ));
+                t_s32x4 = vmlal_s16( t_s32x4, vget_high_s16( input_s16x8 ), vget_high_s16( input_s16x8 ));
+                t_s64x2 = vaddw_s32( t_s64x2, vget_low_s32( t_s32x4 ));
+                t_s64x2 = vaddw_s32( t_s64x2, vget_high_s32( t_s32x4 ));
                 inputT += 8;
             }
-            t_s64x1 = vadd_s64( vget_low_s64( t_s64x2 ), vget_high_s64( t_s64x2 ) );
+            t_s64x1 = vadd_s64( vget_low_s64( t_s64x2 ), vget_high_s64( t_s64x2 ));
             corr_QC_orderT = vget_lane_s64( t_s64x1, 0 );
-            for( ; n < length; n++ ) {
+            for ( ; n < length; n++) {
                 corr_QC_orderT += silk_SMULL( input[ n ], input[ n ] );
             }
             corr_QC_orderT = silk_LSHIFT64( corr_QC_orderT, QC );
@@ -226,27 +228,27 @@ void silk_warped_autocorrelation_FIX_neon(
         corr_QCT = corr_QC + orderT - order;
         lsh = silk_CLZ64( corr_QC_orderT ) - 35;
         lsh = silk_LIMIT( lsh, -12 - QC, 30 - QC );
-        *scale = -( QC + lsh );
+        *scale = -(QC + lsh);
         silk_assert( *scale >= -30 && *scale <= 12 );
         lsh_s64x2 = vdupq_n_s64( lsh );
-        for( i = 0; i <= order - 3; i += 4 ) {
+        for (i = 0; i <= order - 3; i += 4) {
             int32x4_t corr_s32x4;
             int64x2_t corr_QC0_s64x2, corr_QC1_s64x2;
             corr_QC0_s64x2 = vld1q_s64( corr_QCT + i );
             corr_QC1_s64x2 = vld1q_s64( corr_QCT + i + 2 );
             corr_QC0_s64x2 = vshlq_s64( corr_QC0_s64x2, lsh_s64x2 );
             corr_QC1_s64x2 = vshlq_s64( corr_QC1_s64x2, lsh_s64x2 );
-            corr_s32x4     = vcombine_s32( vmovn_s64( corr_QC1_s64x2 ), vmovn_s64( corr_QC0_s64x2 ) );
+            corr_s32x4     = vcombine_s32( vmovn_s64( corr_QC1_s64x2 ), vmovn_s64( corr_QC0_s64x2 ));
             corr_s32x4     = vrev64q_s32( corr_s32x4 );
             vst1q_s32( corr + order - i - 3, corr_s32x4 );
         }
-        if( lsh >= 0 ) {
-            for( ; i < order + 1; i++ ) {
-                corr[ order - i ] = (oac_int32)silk_CHECK_FIT32( silk_LSHIFT64( corr_QCT[ i ], lsh ) );
+        if (lsh >= 0) {
+            for ( ; i < order + 1; i++) {
+                corr[ order - i ] = (oac_int32)silk_CHECK_FIT32( silk_LSHIFT64( corr_QCT[ i ], lsh ));
             }
         } else {
-            for( ; i < order + 1; i++ ) {
-                corr[ order - i ] = (oac_int32)silk_CHECK_FIT32( silk_RSHIFT64( corr_QCT[ i ], -lsh ) );
+            for ( ; i < order + 1; i++) {
+                corr[ order - i ] = (oac_int32)silk_CHECK_FIT32( silk_RSHIFT64( corr_QCT[ i ], -lsh ));
             }
         }
         silk_assert( corr_QCT[ order ] >= 0 ); /* If breaking, decrease QC*/
@@ -256,9 +258,9 @@ void silk_warped_autocorrelation_FIX_neon(
 #ifdef OAC_CHECK_ASM
     {
         oac_int32 corr_c[ MAX_SHAPE_LPC_ORDER + 1 ];
-        oac_int   scale_c;
+        oac_int scale_c;
         silk_warped_autocorrelation_FIX_c( corr_c, &scale_c, input, warping_Q16, length, order );
-        silk_assert( !memcmp( corr_c, corr, sizeof( corr_c[ 0 ] ) * ( order + 1 ) ) );
+        silk_assert( !memcmp( corr_c, corr, sizeof(corr_c[ 0 ])*(order + 1)));
         silk_assert( scale_c == *scale );
     }
 #endif
diff --git a/silk/fixed/autocorr_FIX.c b/silk/fixed/autocorr_FIX.c
index 2a2d6f888..85be77921 100644
--- a/silk/fixed/autocorr_FIX.c
+++ b/silk/fixed/autocorr_FIX.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -37,12 +37,11 @@ void silk_autocorr(
     oac_int32                  *results,           /* O    Result (length correlationCount)                            */
     oac_int                    *scale,             /* O    Scaling of the correlation vector                           */
     const oac_int16            *inputData,         /* I    Input data to correlate                                     */
-    const oac_int              inputDataSize,      /* I    Length of input                                             */
-    const oac_int              correlationCount,   /* I    Number of correlation taps to compute                       */
-    int                         arch                /* I    Run-time architecture                                       */
-)
-{
-    oac_int   corrCount;
+    const oac_int inputDataSize,                   /* I    Length of input                                             */
+    const oac_int correlationCount,                /* I    Number of correlation taps to compute                       */
+    int arch                                        /* I    Run-time architecture                                       */
+    ) {
+    oac_int corrCount;
     corrCount = silk_min_int( inputDataSize, correlationCount );
-    *scale = _celt_autocorr(inputData, results, NULL, 0, corrCount-1, inputDataSize, arch);
+    *scale = _celt_autocorr(inputData, results, NULL, 0, corrCount - 1, inputDataSize, arch);
 }
diff --git a/silk/fixed/burg_modified_FIX.c b/silk/fixed/burg_modified_FIX.c
index 0c16b9d0f..ec67c72c6 100644
--- a/silk/fixed/burg_modified_FIX.c
+++ b/silk/fixed/burg_modified_FIX.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -45,27 +45,26 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_burg_modified_c(
     oac_int32                  *res_nrg,           /* O    Residual energy                                             */
     oac_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
-    oac_int32                  A_Q16[],            /* O    Prediction coefficients (length order)                      */
-    const oac_int16            x[],                /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
-    const oac_int32            minInvGain_Q30,     /* I    Inverse of max prediction gain                              */
-    const oac_int              subfr_length,       /* I    Input signal subframe length (incl. D preceding samples)    */
-    const oac_int              nb_subfr,           /* I    Number of subframes stacked in x                            */
-    const oac_int              D,                  /* I    Order                                                       */
-    int                         arch                /* I    Run-time architecture                                       */
-)
-{
-    oac_int         k, n, s, lz, rshifts, reached_max_gain;
-    oac_int32       C0, num, nrg, rc_Q31, invGain_Q30, Atmp_QA, Atmp1, tmp1, tmp2, x1, x2;
+    oac_int32 A_Q16[],                             /* O    Prediction coefficients (length order)                      */
+    const oac_int16 x[],                           /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
+    const oac_int32 minInvGain_Q30,                /* I    Inverse of max prediction gain                              */
+    const oac_int subfr_length,                    /* I    Input signal subframe length (incl. D preceding samples)    */
+    const oac_int nb_subfr,                        /* I    Number of subframes stacked in x                            */
+    const oac_int D,                               /* I    Order                                                       */
+    int arch                                        /* I    Run-time architecture                                       */
+    ) {
+    oac_int k, n, s, lz, rshifts, reached_max_gain;
+    oac_int32 C0, num, nrg, rc_Q31, invGain_Q30, Atmp_QA, Atmp1, tmp1, tmp2, x1, x2;
     const oac_int16 *x_ptr;
-    oac_int32       C_first_row[ SILK_MAX_ORDER_LPC ];
-    oac_int32       C_last_row[  SILK_MAX_ORDER_LPC ];
-    oac_int32       Af_QA[       SILK_MAX_ORDER_LPC ];
-    oac_int32       CAf[ SILK_MAX_ORDER_LPC + 1 ];
-    oac_int32       CAb[ SILK_MAX_ORDER_LPC + 1 ];
-    oac_int32       xcorr[ SILK_MAX_ORDER_LPC ];
-    oac_int64       C0_64;
+    oac_int32 C_first_row[ SILK_MAX_ORDER_LPC ];
+    oac_int32 C_last_row[  SILK_MAX_ORDER_LPC ];
+    oac_int32 Af_QA[       SILK_MAX_ORDER_LPC ];
+    oac_int32 CAf[ SILK_MAX_ORDER_LPC + 1 ];
+    oac_int32 CAb[ SILK_MAX_ORDER_LPC + 1 ];
+    oac_int32 xcorr[ SILK_MAX_ORDER_LPC ];
+    oac_int64 C0_64;
 
-    celt_assert( subfr_length * nb_subfr <= MAX_FRAME_SIZE );
+    celt_assert( subfr_length*nb_subfr <= MAX_FRAME_SIZE );
 
     /* Compute autocorrelations, added over subframes */
     C0_64 = silk_inner_prod16( x, x, subfr_length*nb_subfr, arch );
@@ -81,51 +80,51 @@ void silk_burg_modified_c(
     }
 
     CAb[ 0 ] = CAf[ 0 ] = C0 + silk_SMMUL( SILK_FIX_CONST( FIND_LPC_COND_FAC, 32 ), C0 ) + 1;                                /* Q(-rshifts) */
-    silk_memset( C_first_row, 0, SILK_MAX_ORDER_LPC * sizeof( oac_int32 ) );
-    if( rshifts > 0 ) {
-        for( s = 0; s < nb_subfr; s++ ) {
-            x_ptr = x + s * subfr_length;
-            for( n = 1; n < D + 1; n++ ) {
+    silk_memset( C_first_row, 0, SILK_MAX_ORDER_LPC*sizeof(oac_int32));
+    if (rshifts > 0) {
+        for (s = 0; s < nb_subfr; s++) {
+            x_ptr = x + s*subfr_length;
+            for (n = 1; n < D + 1; n++) {
                 C_first_row[ n - 1 ] += (oac_int32)silk_RSHIFT64(
                     silk_inner_prod16( x_ptr, x_ptr + n, subfr_length - n, arch ), rshifts );
             }
         }
     } else {
-        for( s = 0; s < nb_subfr; s++ ) {
+        for (s = 0; s < nb_subfr; s++) {
             int i;
             oac_int32 d;
-            x_ptr = x + s * subfr_length;
+            x_ptr = x + s*subfr_length;
             celt_pitch_xcorr(x_ptr, x_ptr + 1, xcorr, subfr_length - D, D, arch );
-            for( n = 1; n < D + 1; n++ ) {
-               for ( i = n + subfr_length - D, d = 0; i < subfr_length; i++ )
-                  d = MAC16_16( d, x_ptr[ i ], x_ptr[ i - n ] );
-               xcorr[ n - 1 ] += d;
+            for (n = 1; n < D + 1; n++) {
+                for (i = n + subfr_length - D, d = 0; i < subfr_length; i++)
+                    d = MAC16_16( d, x_ptr[ i ], x_ptr[ i - n ] );
+                xcorr[ n - 1 ] += d;
             }
-            for( n = 1; n < D + 1; n++ ) {
+            for (n = 1; n < D + 1; n++) {
                 C_first_row[ n - 1 ] += silk_LSHIFT32( xcorr[ n - 1 ], -rshifts );
             }
         }
     }
-    silk_memcpy( C_last_row, C_first_row, SILK_MAX_ORDER_LPC * sizeof( oac_int32 ) );
+    silk_memcpy( C_last_row, C_first_row, SILK_MAX_ORDER_LPC*sizeof(oac_int32));
 
     /* Initialize */
     CAb[ 0 ] = CAf[ 0 ] = C0 + silk_SMMUL( SILK_FIX_CONST( FIND_LPC_COND_FAC, 32 ), C0 ) + 1;                                /* Q(-rshifts) */
 
-    invGain_Q30 = (oac_int32)1 << 30;
+    invGain_Q30 = (oac_int32)1<<30;
     reached_max_gain = 0;
-    for( n = 0; n < D; n++ ) {
+    for (n = 0; n < D; n++) {
         /* Update first row of correlation matrix (without first element) */
         /* Update last row of correlation matrix (without last element, stored in reversed order) */
         /* Update C * Af */
         /* Update C * flipud(Af) (stored in reversed order) */
-        if( rshifts > -2 ) {
-            for( s = 0; s < nb_subfr; s++ ) {
-                x_ptr = x + s * subfr_length;
-                x1  = -silk_LSHIFT32( (oac_int32)x_ptr[ n ],                    16 - rshifts );        /* Q(16-rshifts) */
-                x2  = -silk_LSHIFT32( (oac_int32)x_ptr[ subfr_length - n - 1 ], 16 - rshifts );        /* Q(16-rshifts) */
-                tmp1 = silk_LSHIFT32( (oac_int32)x_ptr[ n ],                    QA - 16 );             /* Q(QA-16) */
-                tmp2 = silk_LSHIFT32( (oac_int32)x_ptr[ subfr_length - n - 1 ], QA - 16 );             /* Q(QA-16) */
-                for( k = 0; k < n; k++ ) {
+        if (rshifts > -2) {
+            for (s = 0; s < nb_subfr; s++) {
+                x_ptr = x + s*subfr_length;
+                x1  = -silk_LSHIFT32((oac_int32)x_ptr[ n ],                    16 - rshifts );         /* Q(16-rshifts) */
+                x2  = -silk_LSHIFT32((oac_int32)x_ptr[ subfr_length - n - 1 ], 16 - rshifts );         /* Q(16-rshifts) */
+                tmp1 = silk_LSHIFT32((oac_int32)x_ptr[ n ],                    QA - 16 );              /* Q(QA-16) */
+                tmp2 = silk_LSHIFT32((oac_int32)x_ptr[ subfr_length - n - 1 ], QA - 16 );              /* Q(QA-16) */
+                for (k = 0; k < n; k++) {
                     C_first_row[ k ] = silk_SMLAWB( C_first_row[ k ], x1, x_ptr[ n - k - 1 ]            ); /* Q( -rshifts ) */
                     C_last_row[ k ]  = silk_SMLAWB( C_last_row[ k ],  x2, x_ptr[ subfr_length - n + k ] ); /* Q( -rshifts ) */
                     Atmp_QA = Af_QA[ k ];
@@ -134,19 +133,19 @@ void silk_burg_modified_c(
                 }
                 tmp1 = silk_LSHIFT32( -tmp1, 32 - QA - rshifts );                                       /* Q(16-rshifts) */
                 tmp2 = silk_LSHIFT32( -tmp2, 32 - QA - rshifts );                                       /* Q(16-rshifts) */
-                for( k = 0; k <= n; k++ ) {
+                for (k = 0; k <= n; k++) {
                     CAf[ k ] = silk_SMLAWB( CAf[ k ], tmp1, x_ptr[ n - k ]                    );        /* Q( -rshift ) */
                     CAb[ k ] = silk_SMLAWB( CAb[ k ], tmp2, x_ptr[ subfr_length - n + k - 1 ] );        /* Q( -rshift ) */
                 }
             }
         } else {
-            for( s = 0; s < nb_subfr; s++ ) {
-                x_ptr = x + s * subfr_length;
-                x1  = -silk_LSHIFT32( (oac_int32)x_ptr[ n ],                    -rshifts );            /* Q( -rshifts ) */
-                x2  = -silk_LSHIFT32( (oac_int32)x_ptr[ subfr_length - n - 1 ], -rshifts );            /* Q( -rshifts ) */
-                tmp1 = silk_LSHIFT32( (oac_int32)x_ptr[ n ],                    17 );                  /* Q17 */
-                tmp2 = silk_LSHIFT32( (oac_int32)x_ptr[ subfr_length - n - 1 ], 17 );                  /* Q17 */
-                for( k = 0; k < n; k++ ) {
+            for (s = 0; s < nb_subfr; s++) {
+                x_ptr = x + s*subfr_length;
+                x1  = -silk_LSHIFT32((oac_int32)x_ptr[ n ],                    -rshifts );             /* Q( -rshifts ) */
+                x2  = -silk_LSHIFT32((oac_int32)x_ptr[ subfr_length - n - 1 ], -rshifts );             /* Q( -rshifts ) */
+                tmp1 = silk_LSHIFT32((oac_int32)x_ptr[ n ],                    17 );                   /* Q17 */
+                tmp2 = silk_LSHIFT32((oac_int32)x_ptr[ subfr_length - n - 1 ], 17 );                   /* Q17 */
+                for (k = 0; k < n; k++) {
                     C_first_row[ k ] = silk_MLA( C_first_row[ k ], x1, x_ptr[ n - k - 1 ]            ); /* Q( -rshifts ) */
                     C_last_row[ k ]  = silk_MLA( C_last_row[ k ],  x2, x_ptr[ subfr_length - n + k ] ); /* Q( -rshifts ) */
                     Atmp1 = silk_RSHIFT_ROUND( Af_QA[ k ], QA - 17 );                                   /* Q17 */
@@ -158,11 +157,11 @@ void silk_burg_modified_c(
                 }
                 tmp1 = -tmp1;                                                                           /* Q17 */
                 tmp2 = -tmp2;                                                                           /* Q17 */
-                for( k = 0; k <= n; k++ ) {
+                for (k = 0; k <= n; k++) {
                     CAf[ k ] = silk_SMLAWW( CAf[ k ], tmp1,
-                        silk_LSHIFT32( (oac_int32)x_ptr[ n - k ], -rshifts - 1 ) );                    /* Q( -rshift ) */
+                        silk_LSHIFT32((oac_int32)x_ptr[ n - k ], -rshifts - 1 ));                      /* Q( -rshift ) */
                     CAb[ k ] = silk_SMLAWW( CAb[ k ], tmp2,
-                        silk_LSHIFT32( (oac_int32)x_ptr[ subfr_length - n + k - 1 ], -rshifts - 1 ) ); /* Q( -rshift ) */
+                        silk_LSHIFT32((oac_int32)x_ptr[ subfr_length - n + k - 1 ], -rshifts - 1 ));   /* Q( -rshift ) */
                 }
             }
         }
@@ -172,9 +171,9 @@ void silk_burg_modified_c(
         tmp2 = C_last_row[ n ];                                                                         /* Q( -rshifts ) */
         num  = 0;                                                                                       /* Q( -rshifts ) */
         nrg  = silk_ADD32( CAb[ 0 ], CAf[ 0 ] );                                                        /* Q( 1-rshifts ) */
-        for( k = 0; k < n; k++ ) {
+        for (k = 0; k < n; k++) {
             Atmp_QA = Af_QA[ k ];
-            lz = silk_CLZ32( silk_abs( Atmp_QA ) ) - 1;
+            lz = silk_CLZ32( silk_abs( Atmp_QA )) - 1;
             lz = silk_min( 32 - QA, lz );
             Atmp1 = silk_LSHIFT32( Atmp_QA, lz );                                                       /* Q( QA + lz ) */
 
@@ -190,24 +189,24 @@ void silk_burg_modified_c(
         num = silk_LSHIFT32( -num, 1 );                                                                 /* Q( 1-rshifts ) */
 
         /* Calculate the next order reflection (parcor) coefficient */
-        if( silk_abs( num ) < nrg ) {
+        if (silk_abs( num ) < nrg) {
             rc_Q31 = silk_DIV32_varQ( num, nrg, 31 );
         } else {
-            rc_Q31 = ( num > 0 ) ? silk_int32_MAX : silk_int32_MIN;
+            rc_Q31 = (num > 0) ? silk_int32_MAX : silk_int32_MIN;
         }
 
         /* Update inverse prediction gain */
-        tmp1 = ( (oac_int32)1 << 30 ) - silk_SMMUL( rc_Q31, rc_Q31 );
+        tmp1 = ((oac_int32)1<<30) - silk_SMMUL( rc_Q31, rc_Q31 );
         tmp1 = silk_LSHIFT( silk_SMMUL( invGain_Q30, tmp1 ), 2 );
-        if( tmp1 <= minInvGain_Q30 ) {
+        if (tmp1 <= minInvGain_Q30) {
             /* Max prediction gain exceeded; set reflection coefficient such that max prediction gain is exactly hit */
-            tmp2 = ( (oac_int32)1 << 30 ) - silk_DIV32_varQ( minInvGain_Q30, invGain_Q30, 30 );            /* Q30 */
+            tmp2 = ((oac_int32)1<<30) - silk_DIV32_varQ( minInvGain_Q30, invGain_Q30, 30 );                /* Q30 */
             rc_Q31 = silk_SQRT_APPROX( tmp2 );                                                  /* Q15 */
-            if( rc_Q31 > 0 ) {
+            if (rc_Q31 > 0) {
                 /* Newton-Raphson iteration */
                 rc_Q31 = silk_RSHIFT32( rc_Q31 + silk_DIV32( tmp2, rc_Q31 ), 1 );                       /* Q15 */
                 rc_Q31 = silk_LSHIFT32( rc_Q31, 16 );                                                   /* Q31 */
-                if( num < 0 ) {
+                if (num < 0) {
                     /* Ensure adjusted reflection coefficients has the original sign */
                     rc_Q31 = -rc_Q31;
                 }
@@ -219,7 +218,7 @@ void silk_burg_modified_c(
         }
 
         /* Update the AR coefficients */
-        for( k = 0; k < (n + 1) >> 1; k++ ) {
+        for (k = 0; k < (n + 1)>>1; k++) {
             tmp1 = Af_QA[ k ];                                                                  /* QA */
             tmp2 = Af_QA[ n - k - 1 ];                                                          /* QA */
             Af_QA[ k ]         = silk_ADD_LSHIFT32( tmp1, silk_SMMUL( tmp2, rc_Q31 ), 1 );      /* QA */
@@ -227,16 +226,16 @@ void silk_burg_modified_c(
         }
         Af_QA[ n ] = silk_RSHIFT32( rc_Q31, 31 - QA );                                          /* QA */
 
-        if( reached_max_gain ) {
+        if (reached_max_gain) {
             /* Reached max prediction gain; set remaining coefficients to zero and exit loop */
-            for( k = n + 1; k < D; k++ ) {
+            for (k = n + 1; k < D; k++) {
                 Af_QA[ k ] = 0;
             }
             break;
         }
 
         /* Update C * Af and C * Ab */
-        for( k = 0; k <= n + 1; k++ ) {
+        for (k = 0; k <= n + 1; k++) {
             tmp1 = CAf[ k ];                                                                    /* Q( -rshifts ) */
             tmp2 = CAb[ n - k + 1 ];                                                            /* Q( -rshifts ) */
             CAf[ k ]         = silk_ADD_LSHIFT32( tmp1, silk_SMMUL( tmp2, rc_Q31 ), 1 );        /* Q( -rshifts ) */
@@ -244,20 +243,20 @@ void silk_burg_modified_c(
         }
     }
 
-    if( reached_max_gain ) {
-        for( k = 0; k < D; k++ ) {
+    if (reached_max_gain) {
+        for (k = 0; k < D; k++) {
             /* Scale coefficients */
             A_Q16[ k ] = -silk_RSHIFT_ROUND( Af_QA[ k ], QA - 16 );
         }
         /* Subtract energy of preceding samples from C0 */
-        if( rshifts > 0 ) {
-            for( s = 0; s < nb_subfr; s++ ) {
-                x_ptr = x + s * subfr_length;
+        if (rshifts > 0) {
+            for (s = 0; s < nb_subfr; s++) {
+                x_ptr = x + s*subfr_length;
                 C0 -= (oac_int32)silk_RSHIFT64( silk_inner_prod16( x_ptr, x_ptr, D, arch ), rshifts );
             }
         } else {
-            for( s = 0; s < nb_subfr; s++ ) {
-                x_ptr = x + s * subfr_length;
+            for (s = 0; s < nb_subfr; s++) {
+                x_ptr = x + s*subfr_length;
                 C0 -= silk_LSHIFT32( silk_inner_prod_aligned( x_ptr, x_ptr, D, arch), -rshifts);
             }
         }
@@ -267,8 +266,8 @@ void silk_burg_modified_c(
     } else {
         /* Return residual energy */
         nrg  = CAf[ 0 ];                                                                            /* Q( -rshifts ) */
-        tmp1 = (oac_int32)1 << 16;                                                                             /* Q16 */
-        for( k = 0; k < D; k++ ) {
+        tmp1 = (oac_int32)1<<16;                                                                               /* Q16 */
+        for (k = 0; k < D; k++) {
             Atmp1 = silk_RSHIFT_ROUND( Af_QA[ k ], QA - 16 );                                       /* Q16 */
             nrg  = silk_SMLAWW( nrg, CAf[ k + 1 ], Atmp1 );                                         /* Q( -rshifts ) */
             tmp1 = silk_SMLAWW( tmp1, Atmp1, Atmp1 );                                               /* Q16 */
diff --git a/silk/fixed/corrMatrix_FIX.c b/silk/fixed/corrMatrix_FIX.c
index df030fa5b..d27ddd20d 100644
--- a/silk/fixed/corrMatrix_FIX.c
+++ b/silk/fixed/corrMatrix_FIX.c
@@ -1,37 +1,37 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 /**********************************************************************
- * Correlation Matrix Computations for LS estimate.
- **********************************************************************/
+* Correlation Matrix Computations for LS estimate.
+**********************************************************************/
 
 #include "main_FIX.h"
 
@@ -39,25 +39,24 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_corrVector_FIX(
     const oac_int16                *x,                                     /* I    x vector [L + order - 1] used to form data matrix X                         */
     const oac_int16                *t,                                     /* I    Target vector [L]                                                           */
-    const oac_int                  L,                                      /* I    Length of vectors                                                           */
-    const oac_int                  order,                                  /* I    Max lag for correlation                                                     */
+    const oac_int L,                                                       /* I    Length of vectors                                                           */
+    const oac_int order,                                                   /* I    Max lag for correlation                                                     */
     oac_int32                      *Xt,                                    /* O    Pointer to X'*t correlation vector [order]                                  */
-    const oac_int                  rshifts,                                /* I    Right shifts of correlations                                                */
-    int                             arch                                    /* I    Run-time architecture                                                       */
-)
-{
-    oac_int         lag, i;
+    const oac_int rshifts,                                                 /* I    Right shifts of correlations                                                */
+    int arch                                                                /* I    Run-time architecture                                                       */
+    ) {
+    oac_int lag, i;
     const oac_int16 *ptr1, *ptr2;
-    oac_int32       inner_prod;
+    oac_int32 inner_prod;
 
     ptr1 = &x[ order - 1 ]; /* Points to first sample of column 0 of X: X[:,0] */
     ptr2 = t;
     /* Calculate X'*t */
-    if( rshifts > 0 ) {
+    if (rshifts > 0) {
         /* Right shifting used */
-        for( lag = 0; lag < order; lag++ ) {
+        for (lag = 0; lag < order; lag++) {
             inner_prod = 0;
-            for( i = 0; i < L; i++ ) {
+            for (i = 0; i < L; i++) {
                 inner_prod = silk_ADD_RSHIFT32( inner_prod, silk_SMULBB( ptr1[ i ], ptr2[i] ), rshifts );
             }
             Xt[ lag ] = inner_prod; /* X[:,lag]'*t */
@@ -65,7 +64,7 @@ void silk_corrVector_FIX(
         }
     } else {
         silk_assert( rshifts == 0 );
-        for( lag = 0; lag < order; lag++ ) {
+        for (lag = 0; lag < order; lag++) {
             Xt[ lag ] = silk_inner_prod_aligned( ptr1, ptr2, L, arch ); /* X[:,lag]'*t */
             ptr1--; /* Go to next column of X */
         }
@@ -75,16 +74,15 @@ void silk_corrVector_FIX(
 /* Calculates correlation matrix X'*X */
 void silk_corrMatrix_FIX(
     const oac_int16                *x,                                     /* I    x vector [L + order - 1] used to form data matrix X                         */
-    const oac_int                  L,                                      /* I    Length of vectors                                                           */
-    const oac_int                  order,                                  /* I    Max lag for correlation                                                     */
+    const oac_int L,                                                       /* I    Length of vectors                                                           */
+    const oac_int order,                                                   /* I    Max lag for correlation                                                     */
     oac_int32                      *XX,                                    /* O    Pointer to X'*X correlation matrix [ order x order ]                        */
     oac_int32                      *nrg,                                    /* O    Energy of x vector                                                            */
     oac_int                        *rshifts,                               /* O    Right shifts of correlations and energy                                     */
-    int                             arch                                    /* I    Run-time architecture                                                       */
-)
-{
-    oac_int         i, j, lag;
-    oac_int32       energy;
+    int arch                                                                /* I    Run-time architecture                                                       */
+    ) {
+    oac_int i, j, lag;
+    oac_int32 energy;
     const oac_int16 *ptr1, *ptr2;
 
     /* Calculate energy to find shift used to fit in 32 bits */
@@ -93,7 +91,7 @@ void silk_corrMatrix_FIX(
 
     /* Calculate energy of first column (0) of X: X[:,0]'*X[:,0] */
     /* Remove contribution of first order - 1 samples */
-    for( i = 0; i < order - 1; i++ ) {
+    for (i = 0; i < order - 1; i++) {
         energy -= silk_RSHIFT32( silk_SMULBB( x[ i ], x[ i ] ), *rshifts );
     }
 
@@ -102,43 +100,43 @@ void silk_corrMatrix_FIX(
     matrix_ptr( XX, 0, 0, order ) = energy;
     silk_assert( energy >= 0 );
     ptr1 = &x[ order - 1 ]; /* First sample of column 0 of X */
-    for( j = 1; j < order; j++ ) {
-        energy = silk_SUB32( energy, silk_RSHIFT32( silk_SMULBB( ptr1[ L - j ], ptr1[ L - j ] ), *rshifts ) );
-        energy = silk_ADD32( energy, silk_RSHIFT32( silk_SMULBB( ptr1[ -j ], ptr1[ -j ] ), *rshifts ) );
+    for (j = 1; j < order; j++) {
+        energy = silk_SUB32( energy, silk_RSHIFT32( silk_SMULBB( ptr1[ L - j ], ptr1[ L - j ] ), *rshifts ));
+        energy = silk_ADD32( energy, silk_RSHIFT32( silk_SMULBB( ptr1[ -j ], ptr1[ -j ] ), *rshifts ));
         matrix_ptr( XX, j, j, order ) = energy;
         silk_assert( energy >= 0 );
     }
 
     ptr2 = &x[ order - 2 ]; /* First sample of column 1 of X */
     /* Calculate the remaining elements of the correlation matrix */
-    if( *rshifts > 0 ) {
+    if (*rshifts > 0) {
         /* Right shifting used */
-        for( lag = 1; lag < order; lag++ ) {
+        for (lag = 1; lag < order; lag++) {
             /* Inner product of column 0 and column lag: X[:,0]'*X[:,lag] */
             energy = 0;
-            for( i = 0; i < L; i++ ) {
+            for (i = 0; i < L; i++) {
                 energy += silk_RSHIFT32( silk_SMULBB( ptr1[ i ], ptr2[i] ), *rshifts );
             }
             /* Calculate remaining off diagonal: X[:,j]'*X[:,j + lag] */
             matrix_ptr( XX, lag, 0, order ) = energy;
             matrix_ptr( XX, 0, lag, order ) = energy;
-            for( j = 1; j < ( order - lag ); j++ ) {
-                energy = silk_SUB32( energy, silk_RSHIFT32( silk_SMULBB( ptr1[ L - j ], ptr2[ L - j ] ), *rshifts ) );
-                energy = silk_ADD32( energy, silk_RSHIFT32( silk_SMULBB( ptr1[ -j ], ptr2[ -j ] ), *rshifts ) );
+            for (j = 1; j < (order - lag); j++) {
+                energy = silk_SUB32( energy, silk_RSHIFT32( silk_SMULBB( ptr1[ L - j ], ptr2[ L - j ] ), *rshifts ));
+                energy = silk_ADD32( energy, silk_RSHIFT32( silk_SMULBB( ptr1[ -j ], ptr2[ -j ] ), *rshifts ));
                 matrix_ptr( XX, lag + j, j, order ) = energy;
                 matrix_ptr( XX, j, lag + j, order ) = energy;
             }
             ptr2--; /* Update pointer to first sample of next column (lag) in X */
         }
     } else {
-        for( lag = 1; lag < order; lag++ ) {
+        for (lag = 1; lag < order; lag++) {
             /* Inner product of column 0 and column lag: X[:,0]'*X[:,lag] */
             energy = silk_inner_prod_aligned( ptr1, ptr2, L, arch );
             matrix_ptr( XX, lag, 0, order ) = energy;
             matrix_ptr( XX, 0, lag, order ) = energy;
             /* Calculate remaining off diagonal: X[:,j]'*X[:,j + lag] */
-            for( j = 1; j < ( order - lag ); j++ ) {
-                energy = silk_SUB32( energy, silk_SMULBB( ptr1[ L - j ], ptr2[ L - j ] ) );
+            for (j = 1; j < (order - lag); j++) {
+                energy = silk_SUB32( energy, silk_SMULBB( ptr1[ L - j ], ptr2[ L - j ] ));
                 energy = silk_SMLABB( energy, ptr1[ -j ], ptr2[ -j ] );
                 matrix_ptr( XX, lag + j, j, order ) = energy;
                 matrix_ptr( XX, j, lag + j, order ) = energy;
diff --git a/silk/fixed/encode_frame_FIX.c b/silk/fixed/encode_frame_FIX.c
index 10f331154..b29f06492 100644
--- a/silk/fixed/encode_frame_FIX.c
+++ b/silk/fixed/encode_frame_FIX.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdlib.h>
@@ -38,15 +38,14 @@ POSSIBILITY OF SUCH DAMAGE.
 static OAC_INLINE void silk_LBRR_encode_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  Pointer to Silk FIX encoder control struct                                  */
-    const oac_int16                x16[],                                  /* I    Input signal                                                                */
-    oac_int                        condCoding                              /* I    The type of conditional coding used so far for this frame                   */
-);
+    const oac_int16 x16[],                                                 /* I    Input signal                                                                */
+    oac_int condCoding                                                     /* I    The type of conditional coding used so far for this frame                   */
+    );
 
 void silk_encode_do_VAD_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
-    oac_int                        activity                                /* I    Decision of Oac voice activity detector                                    */
-)
-{
+    oac_int activity                                                       /* I    Decision of Oac voice activity detector                                    */
+    ) {
     const oac_int activity_threshold = SILK_FIX_CONST( SPEECH_ACTIVITY_DTX_THRES, 8 );
 
     /****************************/
@@ -54,19 +53,19 @@ void silk_encode_do_VAD_FIX(
     /****************************/
     silk_VAD_GetSA_Q8( &psEnc->sCmn, psEnc->sCmn.inputBuf + 1, psEnc->sCmn.arch );
     /* If Oac VAD is inactive and Silk VAD is active: lower Silk VAD to just under the threshold */
-    if( activity == VAD_NO_ACTIVITY && psEnc->sCmn.speech_activity_Q8 >= activity_threshold ) {
+    if (activity == VAD_NO_ACTIVITY && psEnc->sCmn.speech_activity_Q8 >= activity_threshold) {
         psEnc->sCmn.speech_activity_Q8 = activity_threshold - 1;
     }
 
     /**************************************************/
     /* Convert speech activity into VAD and DTX flags */
     /**************************************************/
-    if( psEnc->sCmn.speech_activity_Q8 < activity_threshold ) {
+    if (psEnc->sCmn.speech_activity_Q8 < activity_threshold) {
         psEnc->sCmn.indices.signalType = TYPE_NO_VOICE_ACTIVITY;
         psEnc->sCmn.noSpeechCounter++;
-        if( psEnc->sCmn.noSpeechCounter <= NB_SPEECH_FRAMES_BEFORE_DTX ) {
+        if (psEnc->sCmn.noSpeechCounter <= NB_SPEECH_FRAMES_BEFORE_DTX) {
             psEnc->sCmn.inDTX = 0;
-        } else if( psEnc->sCmn.noSpeechCounter > MAX_CONSECUTIVE_DTX + NB_SPEECH_FRAMES_BEFORE_DTX ) {
+        } else if (psEnc->sCmn.noSpeechCounter > MAX_CONSECUTIVE_DTX + NB_SPEECH_FRAMES_BEFORE_DTX) {
             psEnc->sCmn.noSpeechCounter = NB_SPEECH_FRAMES_BEFORE_DTX;
             psEnc->sCmn.inDTX           = 0;
         }
@@ -86,26 +85,25 @@ oac_int silk_encode_frame_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
     oac_int32                      *pnBytesOut,                            /* O    Pointer to number of payload bytes;                                         */
     ec_enc                          *psRangeEnc,                            /* I/O  compressor data structure                                                   */
-    oac_int                        condCoding,                             /* I    The type of conditional coding to use                                       */
-    oac_int                        maxBits,                                /* I    If > 0: maximum number of output bits                                       */
-    oac_int                        useCBR                                  /* I    Flag to force constant-bitrate operation                                    */
-)
-{
+    oac_int condCoding,                                                    /* I    The type of conditional coding to use                                       */
+    oac_int maxBits,                                                       /* I    If > 0: maximum number of output bits                                       */
+    oac_int useCBR                                                         /* I    Flag to force constant-bitrate operation                                    */
+    ) {
     silk_encoder_control_FIX sEncCtrl;
-    oac_int     i, iter, maxIter, found_upper, found_lower, ret = 0;
+    oac_int i, iter, maxIter, found_upper, found_lower, ret = 0;
     oac_int16   *x_frame;
-    ec_enc       sRangeEnc_copy, sRangeEnc_copy2;
+    ec_enc sRangeEnc_copy, sRangeEnc_copy2;
     VARDECL(silk_nsq_state, sNSQ_copy);
-    oac_int32   seed_copy, nBits, nBits_lower, nBits_upper, gainMult_lower, gainMult_upper;
-    oac_int32   gainsID, gainsID_lower, gainsID_upper;
-    oac_int16   gainMult_Q8;
-    oac_int16   ec_prevLagIndex_copy;
-    oac_int     ec_prevSignalType_copy;
-    oac_int8    LastGainIndex_copy2;
-    oac_int     gain_lock[ MAX_NB_SUBFR ] = {0};
-    oac_int16   best_gain_mult[ MAX_NB_SUBFR ];
-    oac_int     best_sum[ MAX_NB_SUBFR ];
-    oac_int     bits_margin;
+    oac_int32 seed_copy, nBits, nBits_lower, nBits_upper, gainMult_lower, gainMult_upper;
+    oac_int32 gainsID, gainsID_lower, gainsID_upper;
+    oac_int16 gainMult_Q8;
+    oac_int16 ec_prevLagIndex_copy;
+    oac_int ec_prevSignalType_copy;
+    oac_int8 LastGainIndex_copy2;
+    oac_int gain_lock[ MAX_NB_SUBFR ] = {0};
+    oac_int16 best_gain_mult[ MAX_NB_SUBFR ];
+    oac_int best_sum[ MAX_NB_SUBFR ];
+    oac_int bits_margin;
     SAVE_STACK;
 
     /* Using ALLOC() instead of a regular stack allocation to minimize real stack use when using the pseudostack.
@@ -117,7 +115,7 @@ oac_int silk_encode_frame_FIX(
     /* This is totally unnecessary but many compilers (including gcc) are too dumb to realise it */
     LastGainIndex_copy2 = nBits_lower = nBits_upper = gainMult_lower = gainMult_upper = 0;
 
-    psEnc->sCmn.indices.Seed = psEnc->sCmn.frameCounter++ & 3;
+    psEnc->sCmn.indices.Seed = psEnc->sCmn.frameCounter++&3;
 
     /**************************************************************/
     /* Set up Input Pointers, and insert frame in input buffer   */
@@ -133,16 +131,17 @@ oac_int silk_encode_frame_FIX(
     /*******************************************/
     /* Copy new frame to front of input buffer */
     /*******************************************/
-    silk_memcpy( x_frame + LA_SHAPE_MS * psEnc->sCmn.fs_kHz, psEnc->sCmn.inputBuf + 1, psEnc->sCmn.frame_length * sizeof( oac_int16 ) );
+    silk_memcpy( x_frame + LA_SHAPE_MS*psEnc->sCmn.fs_kHz, psEnc->sCmn.inputBuf + 1,
+    psEnc->sCmn.frame_length*sizeof(oac_int16));
 
-    if( !psEnc->sCmn.prefillFlag ) {
+    if (!psEnc->sCmn.prefillFlag) {
         VARDECL( oac_int16, res_pitch );
         VARDECL( oac_uint8, ec_buf_copy );
         oac_int16 *res_pitch_frame;
 
         ALLOC( res_pitch,
                psEnc->sCmn.la_pitch + psEnc->sCmn.frame_length
-                   + psEnc->sCmn.ltp_mem_length, oac_int16 );
+            + psEnc->sCmn.ltp_mem_length, oac_int16 );
         /* start of pitch LPC residual frame */
         res_pitch_frame = res_pitch + psEnc->sCmn.ltp_mem_length;
 
@@ -180,22 +179,22 @@ oac_int silk_encode_frame_FIX(
         gainsID_lower = -1;
         gainsID_upper = -1;
         /* Copy part of the input state */
-        silk_memcpy( &sRangeEnc_copy, psRangeEnc, sizeof( ec_enc ) );
-        silk_memcpy( &sNSQ_copy[0], &psEnc->sCmn.sNSQ, sizeof( silk_nsq_state ) );
+        silk_memcpy( &sRangeEnc_copy, psRangeEnc, sizeof(ec_enc));
+        silk_memcpy( &sNSQ_copy[0], &psEnc->sCmn.sNSQ, sizeof(silk_nsq_state));
         seed_copy = psEnc->sCmn.indices.Seed;
         ec_prevLagIndex_copy = psEnc->sCmn.ec_prevLagIndex;
         ec_prevSignalType_copy = psEnc->sCmn.ec_prevSignalType;
         ALLOC( ec_buf_copy, 1275, oac_uint8 );
-        for( iter = 0; ; iter++ ) {
-            if( gainsID == gainsID_lower ) {
+        for (iter = 0; ; iter++) {
+            if (gainsID == gainsID_lower) {
                 nBits = nBits_lower;
-            } else if( gainsID == gainsID_upper ) {
+            } else if (gainsID == gainsID_upper) {
                 nBits = nBits_upper;
             } else {
                 /* Restore part of the input state */
-                if( iter > 0 ) {
-                    silk_memcpy( psRangeEnc, &sRangeEnc_copy, sizeof( ec_enc ) );
-                    silk_memcpy( &psEnc->sCmn.sNSQ, &sNSQ_copy[0], sizeof( silk_nsq_state ) );
+                if (iter > 0) {
+                    silk_memcpy( psRangeEnc, &sRangeEnc_copy, sizeof(ec_enc));
+                    silk_memcpy( &psEnc->sCmn.sNSQ, &sNSQ_copy[0], sizeof(silk_nsq_state));
                     psEnc->sCmn.indices.Seed = seed_copy;
                     psEnc->sCmn.ec_prevLagIndex = ec_prevLagIndex_copy;
                     psEnc->sCmn.ec_prevSignalType = ec_prevSignalType_copy;
@@ -204,20 +203,25 @@ oac_int silk_encode_frame_FIX(
                 /*****************************************/
                 /* Noise shaping quantization            */
                 /*****************************************/
-                if( psEnc->sCmn.nStatesDelayedDecision > 1 || psEnc->sCmn.warping_Q16 > 0 ) {
-                    silk_NSQ_del_dec( &psEnc->sCmn, &psEnc->sCmn.sNSQ, &psEnc->sCmn.indices, x_frame, psEnc->sCmn.pulses,
-                           sEncCtrl.PredCoef_Q12[ 0 ], sEncCtrl.LTPCoef_Q14, sEncCtrl.AR_Q13, sEncCtrl.HarmShapeGain_Q14,
-                           sEncCtrl.Tilt_Q14, sEncCtrl.LF_shp_Q14, sEncCtrl.Gains_Q16, sEncCtrl.pitchL, sEncCtrl.Lambda_Q10, sEncCtrl.LTP_scale_Q14,
+                if (psEnc->sCmn.nStatesDelayedDecision > 1 || psEnc->sCmn.warping_Q16 > 0) {
+                    silk_NSQ_del_dec( &psEnc->sCmn, &psEnc->sCmn.sNSQ, &psEnc->sCmn.indices, x_frame,
+                    psEnc->sCmn.pulses,
+                           sEncCtrl.PredCoef_Q12[ 0 ], sEncCtrl.LTPCoef_Q14, sEncCtrl.AR_Q13,
+                    sEncCtrl.HarmShapeGain_Q14,
+                           sEncCtrl.Tilt_Q14, sEncCtrl.LF_shp_Q14, sEncCtrl.Gains_Q16, sEncCtrl.pitchL,
+                    sEncCtrl.Lambda_Q10, sEncCtrl.LTP_scale_Q14,
                            psEnc->sCmn.arch );
                 } else {
                     silk_NSQ( &psEnc->sCmn, &psEnc->sCmn.sNSQ, &psEnc->sCmn.indices, x_frame, psEnc->sCmn.pulses,
-                            sEncCtrl.PredCoef_Q12[ 0 ], sEncCtrl.LTPCoef_Q14, sEncCtrl.AR_Q13, sEncCtrl.HarmShapeGain_Q14,
-                            sEncCtrl.Tilt_Q14, sEncCtrl.LF_shp_Q14, sEncCtrl.Gains_Q16, sEncCtrl.pitchL, sEncCtrl.Lambda_Q10, sEncCtrl.LTP_scale_Q14,
+                            sEncCtrl.PredCoef_Q12[ 0 ], sEncCtrl.LTPCoef_Q14, sEncCtrl.AR_Q13,
+                    sEncCtrl.HarmShapeGain_Q14,
+                            sEncCtrl.Tilt_Q14, sEncCtrl.LF_shp_Q14, sEncCtrl.Gains_Q16, sEncCtrl.pitchL,
+                    sEncCtrl.Lambda_Q10, sEncCtrl.LTP_scale_Q14,
                             psEnc->sCmn.arch);
                 }
 
-                if ( iter == maxIter && !found_lower ) {
-                    silk_memcpy( &sRangeEnc_copy2, psRangeEnc, sizeof( ec_enc ) );
+                if (iter == maxIter && !found_lower) {
+                    silk_memcpy( &sRangeEnc_copy2, psRangeEnc, sizeof(ec_enc));
                 }
 
                 /****************************************/
@@ -234,21 +238,21 @@ oac_int silk_encode_frame_FIX(
                 nBits = ec_tell( psRangeEnc );
 
                 /* If we still bust after the last iteration, do some damage control. */
-                if ( iter == maxIter && !found_lower && nBits > maxBits ) {
-                    silk_memcpy( psRangeEnc, &sRangeEnc_copy2, sizeof( ec_enc ) );
+                if (iter == maxIter && !found_lower && nBits > maxBits) {
+                    silk_memcpy( psRangeEnc, &sRangeEnc_copy2, sizeof(ec_enc));
 
                     /* Keep gains the same as the last frame. */
                     psEnc->sShape.LastGainIndex = sEncCtrl.lastGainIndexPrev;
-                    for ( i = 0; i < psEnc->sCmn.nb_subfr; i++ ) {
+                    for (i = 0; i < psEnc->sCmn.nb_subfr; i++) {
                         psEnc->sCmn.indices.GainsIndices[ i ] = 4;
                     }
                     if (condCoding != CODE_CONDITIONALLY) {
-                       psEnc->sCmn.indices.GainsIndices[ 0 ] = sEncCtrl.lastGainIndexPrev;
+                        psEnc->sCmn.indices.GainsIndices[ 0 ] = sEncCtrl.lastGainIndexPrev;
                     }
                     psEnc->sCmn.ec_prevLagIndex = ec_prevLagIndex_copy;
                     psEnc->sCmn.ec_prevSignalType = ec_prevSignalType_copy;
                     /* Clear all pulses. */
-                    for ( i = 0; i < psEnc->sCmn.frame_length; i++ ) {
+                    for (i = 0; i < psEnc->sCmn.frame_length; i++) {
                         psEnc->sCmn.pulses[ i ] = 0;
                     }
 
@@ -260,25 +264,25 @@ oac_int silk_encode_frame_FIX(
                     nBits = ec_tell( psRangeEnc );
                 }
 
-                if( useCBR == 0 && iter == 0 && nBits <= maxBits ) {
+                if (useCBR == 0 && iter == 0 && nBits <= maxBits) {
                     break;
                 }
             }
 
-            if( iter == maxIter ) {
-                if( found_lower && ( gainsID == gainsID_lower || nBits > maxBits ) ) {
+            if (iter == maxIter) {
+                if (found_lower && (gainsID == gainsID_lower || nBits > maxBits)) {
                     /* Restore output state from earlier iteration that did meet the bitrate budget */
-                    silk_memcpy( psRangeEnc, &sRangeEnc_copy2, sizeof( ec_enc ) );
+                    silk_memcpy( psRangeEnc, &sRangeEnc_copy2, sizeof(ec_enc));
                     celt_assert( sRangeEnc_copy2.offs <= 1275 );
                     silk_memcpy( psRangeEnc->buf, ec_buf_copy, sRangeEnc_copy2.offs );
-                    silk_memcpy( &psEnc->sCmn.sNSQ, &sNSQ_copy[1], sizeof( silk_nsq_state ) );
+                    silk_memcpy( &psEnc->sCmn.sNSQ, &sNSQ_copy[1], sizeof(silk_nsq_state));
                     psEnc->sShape.LastGainIndex = LastGainIndex_copy2;
                 }
                 break;
             }
 
-            if( nBits > maxBits ) {
-                if( found_lower == 0 && iter >= 2 ) {
+            if (nBits > maxBits) {
+                if (found_lower == 0 && iter >= 2) {
                     /* Adjust the quantizer's rate/distortion tradeoff and discard previous "upper" results */
                     sEncCtrl.Lambda_Q10 = silk_ADD_RSHIFT32( sEncCtrl.Lambda_Q10, sEncCtrl.Lambda_Q10, 1 );
                     found_upper = 0;
@@ -289,17 +293,17 @@ oac_int silk_encode_frame_FIX(
                     gainMult_upper = gainMult_Q8;
                     gainsID_upper = gainsID;
                 }
-            } else if( nBits < maxBits - bits_margin ) {
+            } else if (nBits < maxBits - bits_margin) {
                 found_lower = 1;
                 nBits_lower = nBits;
                 gainMult_lower = gainMult_Q8;
-                if( gainsID != gainsID_lower ) {
+                if (gainsID != gainsID_lower) {
                     gainsID_lower = gainsID;
                     /* Copy part of the output state */
-                    silk_memcpy( &sRangeEnc_copy2, psRangeEnc, sizeof( ec_enc ) );
+                    silk_memcpy( &sRangeEnc_copy2, psRangeEnc, sizeof(ec_enc));
                     celt_assert( psRangeEnc->offs <= 1275 );
                     silk_memcpy( ec_buf_copy, psRangeEnc->buf, psRangeEnc->offs );
-                    silk_memcpy( &sNSQ_copy[1], &psEnc->sCmn.sNSQ, sizeof( silk_nsq_state ) );
+                    silk_memcpy( &sNSQ_copy[1], &psEnc->sCmn.sNSQ, sizeof(silk_nsq_state));
                     LastGainIndex_copy2 = psEnc->sShape.LastGainIndex;
                 }
             } else {
@@ -307,14 +311,14 @@ oac_int silk_encode_frame_FIX(
                 break;
             }
 
-            if ( !found_lower && nBits > maxBits ) {
+            if (!found_lower && nBits > maxBits) {
                 int j;
-                for ( i = 0; i < psEnc->sCmn.nb_subfr; i++ ) {
-                    int sum=0;
-                    for ( j = i*psEnc->sCmn.subfr_length; j < (i+1)*psEnc->sCmn.subfr_length; j++ ) {
+                for (i = 0; i < psEnc->sCmn.nb_subfr; i++) {
+                    int sum = 0;
+                    for (j = i*psEnc->sCmn.subfr_length; j < (i + 1)*psEnc->sCmn.subfr_length; j++) {
                         sum += abs( psEnc->sCmn.pulses[j] );
                     }
-                    if ( iter == 0 || (sum < best_sum[i] && !gain_lock[i]) ) {
+                    if (iter == 0 || (sum < best_sum[i] && !gain_lock[i])) {
                         best_sum[i] = sum;
                         best_gain_mult[i] = gainMult_Q8;
                     } else {
@@ -322,28 +326,29 @@ oac_int silk_encode_frame_FIX(
                     }
                 }
             }
-            if( ( found_lower & found_upper ) == 0 ) {
+            if ((found_lower&found_upper) == 0) {
                 /* Adjust gain according to high-rate rate/distortion curve */
-                if( nBits > maxBits ) {
+                if (nBits > maxBits) {
                     gainMult_Q8 = silk_min_32( 1024, gainMult_Q8*3/2 );
                 } else {
                     gainMult_Q8 = silk_max_32( 64, gainMult_Q8*4/5 );
                 }
             } else {
                 /* Adjust gain by interpolating */
-                gainMult_Q8 = gainMult_lower + silk_DIV32_16( silk_MUL( gainMult_upper - gainMult_lower, maxBits - nBits_lower ), nBits_upper - nBits_lower );
+                gainMult_Q8 = gainMult_lower + silk_DIV32_16( silk_MUL( gainMult_upper - gainMult_lower,
+                maxBits - nBits_lower ), nBits_upper - nBits_lower );
                 /* New gain multiplier must be between 25% and 75% of old range (note that gainMult_upper < gainMult_lower) */
-                if( gainMult_Q8 > silk_ADD_RSHIFT32( gainMult_lower, gainMult_upper - gainMult_lower, 2 ) ) {
+                if (gainMult_Q8 > silk_ADD_RSHIFT32( gainMult_lower, gainMult_upper - gainMult_lower, 2 )) {
                     gainMult_Q8 = silk_ADD_RSHIFT32( gainMult_lower, gainMult_upper - gainMult_lower, 2 );
-                } else
-                if( gainMult_Q8 < silk_SUB_RSHIFT32( gainMult_upper, gainMult_upper - gainMult_lower, 2 ) ) {
+                } else if (gainMult_Q8 < silk_SUB_RSHIFT32( gainMult_upper, gainMult_upper - gainMult_lower,
+                2 )) {
                     gainMult_Q8 = silk_SUB_RSHIFT32( gainMult_upper, gainMult_upper - gainMult_lower, 2 );
                 }
             }
 
-            for( i = 0; i < psEnc->sCmn.nb_subfr; i++ ) {
+            for (i = 0; i < psEnc->sCmn.nb_subfr; i++) {
                 oac_int16 tmp;
-                if ( gain_lock[i] ) {
+                if (gain_lock[i]) {
                     tmp = best_gain_mult[i];
                 } else {
                     tmp = gainMult_Q8;
@@ -363,10 +368,10 @@ oac_int silk_encode_frame_FIX(
 
     /* Update input buffer */
     silk_memmove( psEnc->x_buf, &psEnc->x_buf[ psEnc->sCmn.frame_length ],
-        ( psEnc->sCmn.ltp_mem_length + LA_SHAPE_MS * psEnc->sCmn.fs_kHz ) * sizeof( oac_int16 ) );
+        (psEnc->sCmn.ltp_mem_length + LA_SHAPE_MS*psEnc->sCmn.fs_kHz)*sizeof(oac_int16));
 
     /* Exit without entropy coding */
-    if( psEnc->sCmn.prefillFlag ) {
+    if (psEnc->sCmn.prefillFlag) {
         /* No payload */
         *pnBytesOut = 0;
         RESTORE_STACK;
@@ -392,11 +397,10 @@ oac_int silk_encode_frame_FIX(
 static OAC_INLINE void silk_LBRR_encode_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  Pointer to Silk FIX encoder control struct                                  */
-    const oac_int16                x16[],                                  /* I    Input signal                                                                */
-    oac_int                        condCoding                              /* I    The type of conditional coding used so far for this frame                   */
-)
-{
-    oac_int32   TempGains_Q16[ MAX_NB_SUBFR ];
+    const oac_int16 x16[],                                                 /* I    Input signal                                                                */
+    oac_int condCoding                                                     /* I    The type of conditional coding used so far for this frame                   */
+    ) {
+    oac_int32 TempGains_Q16[ MAX_NB_SUBFR ];
     SideInfoIndices *psIndices_LBRR = &psEnc->sCmn.indices_LBRR[ psEnc->sCmn.nFramesEncoded ];
     VARDECL(silk_nsq_state, sNSQ_LBRR);
     SAVE_STACK;
@@ -404,7 +408,7 @@ static OAC_INLINE void silk_LBRR_encode_FIX(
     /*******************************************/
     /* Control use of inband LBRR              */
     /*******************************************/
-    if( psEnc->sCmn.LBRR_enabled && psEnc->sCmn.speech_activity_Q8 > SILK_FIX_CONST( LBRR_SPEECH_ACTIVITY_THRES, 8 ) ) {
+    if (psEnc->sCmn.LBRR_enabled && psEnc->sCmn.speech_activity_Q8 > SILK_FIX_CONST( LBRR_SPEECH_ACTIVITY_THRES, 8 )) {
         /* Using ALLOC() instead of a regular stack allocation to minimize real stack use when using the pseudostack.
            This is useful on some embedded systems. */
         ALLOC(sNSQ_LBRR, 1, silk_nsq_state);
@@ -412,13 +416,13 @@ static OAC_INLINE void silk_LBRR_encode_FIX(
         psEnc->sCmn.LBRR_flags[ psEnc->sCmn.nFramesEncoded ] = 1;
 
         /* Copy noise shaping quantizer state and quantization indices from regular encoding */
-        silk_memcpy( &sNSQ_LBRR[0], &psEnc->sCmn.sNSQ, sizeof( silk_nsq_state ) );
-        silk_memcpy( psIndices_LBRR, &psEnc->sCmn.indices, sizeof( SideInfoIndices ) );
+        silk_memcpy( &sNSQ_LBRR[0], &psEnc->sCmn.sNSQ, sizeof(silk_nsq_state));
+        silk_memcpy( psIndices_LBRR, &psEnc->sCmn.indices, sizeof(SideInfoIndices));
 
         /* Save original gains */
-        silk_memcpy( TempGains_Q16, psEncCtrl->Gains_Q16, psEnc->sCmn.nb_subfr * sizeof( oac_int32 ) );
+        silk_memcpy( TempGains_Q16, psEncCtrl->Gains_Q16, psEnc->sCmn.nb_subfr*sizeof(oac_int32));
 
-        if( psEnc->sCmn.nFramesEncoded == 0 || psEnc->sCmn.LBRR_flags[ psEnc->sCmn.nFramesEncoded - 1 ] == 0 ) {
+        if (psEnc->sCmn.nFramesEncoded == 0 || psEnc->sCmn.LBRR_flags[ psEnc->sCmn.nFramesEncoded - 1 ] == 0) {
             /* First frame in packet or previous frame not LBRR coded */
             psEnc->sCmn.LBRRprevLastGainIndex = psEnc->sShape.LastGainIndex;
 
@@ -435,20 +439,24 @@ static OAC_INLINE void silk_LBRR_encode_FIX(
         /*****************************************/
         /* Noise shaping quantization            */
         /*****************************************/
-        if( psEnc->sCmn.nStatesDelayedDecision > 1 || psEnc->sCmn.warping_Q16 > 0 ) {
+        if (psEnc->sCmn.nStatesDelayedDecision > 1 || psEnc->sCmn.warping_Q16 > 0) {
             silk_NSQ_del_dec( &psEnc->sCmn, &sNSQ_LBRR[0], psIndices_LBRR, x16,
-                psEnc->sCmn.pulses_LBRR[ psEnc->sCmn.nFramesEncoded ], psEncCtrl->PredCoef_Q12[ 0 ], psEncCtrl->LTPCoef_Q14,
+                psEnc->sCmn.pulses_LBRR[ psEnc->sCmn.nFramesEncoded ], psEncCtrl->PredCoef_Q12[ 0 ],
+            psEncCtrl->LTPCoef_Q14,
                 psEncCtrl->AR_Q13, psEncCtrl->HarmShapeGain_Q14, psEncCtrl->Tilt_Q14, psEncCtrl->LF_shp_Q14,
-                psEncCtrl->Gains_Q16, psEncCtrl->pitchL, psEncCtrl->Lambda_Q10, psEncCtrl->LTP_scale_Q14, psEnc->sCmn.arch );
+                psEncCtrl->Gains_Q16, psEncCtrl->pitchL, psEncCtrl->Lambda_Q10, psEncCtrl->LTP_scale_Q14,
+            psEnc->sCmn.arch );
         } else {
             silk_NSQ( &psEnc->sCmn, &sNSQ_LBRR[0], psIndices_LBRR, x16,
-                psEnc->sCmn.pulses_LBRR[ psEnc->sCmn.nFramesEncoded ], psEncCtrl->PredCoef_Q12[ 0 ], psEncCtrl->LTPCoef_Q14,
+                psEnc->sCmn.pulses_LBRR[ psEnc->sCmn.nFramesEncoded ], psEncCtrl->PredCoef_Q12[ 0 ],
+            psEncCtrl->LTPCoef_Q14,
                 psEncCtrl->AR_Q13, psEncCtrl->HarmShapeGain_Q14, psEncCtrl->Tilt_Q14, psEncCtrl->LF_shp_Q14,
-                psEncCtrl->Gains_Q16, psEncCtrl->pitchL, psEncCtrl->Lambda_Q10, psEncCtrl->LTP_scale_Q14, psEnc->sCmn.arch );
+                psEncCtrl->Gains_Q16, psEncCtrl->pitchL, psEncCtrl->Lambda_Q10, psEncCtrl->LTP_scale_Q14,
+            psEnc->sCmn.arch );
         }
 
         /* Restore original gains */
-        silk_memcpy( psEncCtrl->Gains_Q16, TempGains_Q16, psEnc->sCmn.nb_subfr * sizeof( oac_int32 ) );
+        silk_memcpy( psEncCtrl->Gains_Q16, TempGains_Q16, psEnc->sCmn.nb_subfr*sizeof(oac_int32));
     }
     RESTORE_STACK;
 }
diff --git a/silk/fixed/find_LPC_FIX.c b/silk/fixed/find_LPC_FIX.c
index 8be9692af..8091c4863 100644
--- a/silk/fixed/find_LPC_FIX.c
+++ b/silk/fixed/find_LPC_FIX.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FIX.h"
@@ -36,22 +36,21 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Finds LPC vector from correlations, and converts to NLSF */
 void silk_find_LPC_FIX(
     silk_encoder_state              *psEncC,                                /* I/O  Encoder state                                                               */
-    oac_int16                      NLSF_Q15[],                             /* O    NLSFs                                                                       */
-    const oac_int16                x[],                                    /* I    Input signal                                                                */
-    const oac_int32                minInvGain_Q30                          /* I    Inverse of max prediction gain                                              */
-)
-{
-    oac_int     k, subfr_length;
-    oac_int32   a_Q16[ MAX_LPC_ORDER ];
-    oac_int     isInterpLower, shift;
-    oac_int32   res_nrg0, res_nrg1;
-    oac_int     rshift0, rshift1;
+    oac_int16 NLSF_Q15[],                                                  /* O    NLSFs                                                                       */
+    const oac_int16 x[],                                                   /* I    Input signal                                                                */
+    const oac_int32 minInvGain_Q30                                         /* I    Inverse of max prediction gain                                              */
+    ) {
+    oac_int k, subfr_length;
+    oac_int32 a_Q16[ MAX_LPC_ORDER ];
+    oac_int isInterpLower, shift;
+    oac_int32 res_nrg0, res_nrg1;
+    oac_int rshift0, rshift1;
 
     /* Used only for LSF interpolation */
-    oac_int32   a_tmp_Q16[ MAX_LPC_ORDER ], res_nrg_interp, res_nrg, res_tmp_nrg;
-    oac_int     res_nrg_interp_Q, res_nrg_Q, res_tmp_nrg_Q;
-    oac_int16   a_tmp_Q12[ MAX_LPC_ORDER ];
-    oac_int16   NLSF0_Q15[ MAX_LPC_ORDER ];
+    oac_int32 a_tmp_Q16[ MAX_LPC_ORDER ], res_nrg_interp, res_nrg, res_tmp_nrg;
+    oac_int res_nrg_interp_Q, res_nrg_Q, res_tmp_nrg_Q;
+    oac_int16 a_tmp_Q12[ MAX_LPC_ORDER ];
+    oac_int16 NLSF0_Q15[ MAX_LPC_ORDER ];
     SAVE_STACK;
 
     subfr_length = psEncC->subfr_length + psEncC->predictLPCOrder;
@@ -60,19 +59,21 @@ void silk_find_LPC_FIX(
     psEncC->indices.NLSFInterpCoef_Q2 = 4;
 
     /* Burg AR analysis for the full frame */
-    silk_burg_modified( &res_nrg, &res_nrg_Q, a_Q16, x, minInvGain_Q30, subfr_length, psEncC->nb_subfr, psEncC->predictLPCOrder, psEncC->arch );
+    silk_burg_modified( &res_nrg, &res_nrg_Q, a_Q16, x, minInvGain_Q30, subfr_length, psEncC->nb_subfr,
+    psEncC->predictLPCOrder, psEncC->arch );
 
-    if( psEncC->useInterpolatedNLSFs && !psEncC->first_frame_after_reset && psEncC->nb_subfr == MAX_NB_SUBFR ) {
+    if (psEncC->useInterpolatedNLSFs && !psEncC->first_frame_after_reset && psEncC->nb_subfr == MAX_NB_SUBFR) {
         VARDECL( oac_int16, LPC_res );
 
         /* Optimal solution for last 10 ms */
-        silk_burg_modified( &res_tmp_nrg, &res_tmp_nrg_Q, a_tmp_Q16, x + 2 * subfr_length, minInvGain_Q30, subfr_length, 2, psEncC->predictLPCOrder, psEncC->arch );
+        silk_burg_modified( &res_tmp_nrg, &res_tmp_nrg_Q, a_tmp_Q16, x + 2*subfr_length, minInvGain_Q30, subfr_length,
+        2, psEncC->predictLPCOrder, psEncC->arch );
 
         /* subtract residual energy here, as that's easier than adding it to the    */
         /* residual energy of the first 10 ms in each iteration of the search below */
         shift = res_tmp_nrg_Q - res_nrg_Q;
-        if( shift >= 0 ) {
-            if( shift < 32 ) {
+        if (shift >= 0) {
+            if (shift < 32) {
                 res_nrg = res_nrg - silk_RSHIFT( res_tmp_nrg, shift );
             }
         } else {
@@ -84,10 +85,10 @@ void silk_find_LPC_FIX(
         /* Convert to NLSFs */
         silk_A2NLSF( NLSF_Q15, a_tmp_Q16, psEncC->predictLPCOrder );
 
-        ALLOC( LPC_res, 2 * subfr_length, oac_int16 );
+        ALLOC( LPC_res, 2*subfr_length, oac_int16 );
 
         /* Search over interpolation indices to find the one with lowest residual energy */
-        for( k = 3; k >= 0; k-- ) {
+        for (k = 3; k >= 0; k--) {
             /* Interpolate NLSFs for first half */
             silk_interpolate( NLSF0_Q15, psEncC->prev_NLSFq_Q15, NLSF_Q15, k, psEncC->predictLPCOrder );
 
@@ -95,14 +96,16 @@ void silk_find_LPC_FIX(
             silk_NLSF2A( a_tmp_Q12, NLSF0_Q15, psEncC->predictLPCOrder, psEncC->arch );
 
             /* Calculate residual energy with NLSF interpolation */
-            silk_LPC_analysis_filter( LPC_res, x, a_tmp_Q12, 2 * subfr_length, psEncC->predictLPCOrder, psEncC->arch );
+            silk_LPC_analysis_filter( LPC_res, x, a_tmp_Q12, 2*subfr_length, psEncC->predictLPCOrder, psEncC->arch );
 
-            silk_sum_sqr_shift( &res_nrg0, &rshift0, LPC_res + psEncC->predictLPCOrder,                subfr_length - psEncC->predictLPCOrder );
-            silk_sum_sqr_shift( &res_nrg1, &rshift1, LPC_res + psEncC->predictLPCOrder + subfr_length, subfr_length - psEncC->predictLPCOrder );
+            silk_sum_sqr_shift( &res_nrg0, &rshift0, LPC_res + psEncC->predictLPCOrder,
+            subfr_length - psEncC->predictLPCOrder );
+            silk_sum_sqr_shift( &res_nrg1, &rshift1, LPC_res + psEncC->predictLPCOrder + subfr_length,
+            subfr_length - psEncC->predictLPCOrder );
 
             /* Add subframe energies from first half frame */
             shift = rshift0 - rshift1;
-            if( shift >= 0 ) {
+            if (shift >= 0) {
                 res_nrg1         = silk_RSHIFT( res_nrg1, shift );
                 res_nrg_interp_Q = -rshift0;
             } else {
@@ -113,15 +116,15 @@ void silk_find_LPC_FIX(
 
             /* Compare with first half energy without NLSF interpolation, or best interpolated value so far */
             shift = res_nrg_interp_Q - res_nrg_Q;
-            if( shift >= 0 ) {
-                if( silk_RSHIFT( res_nrg_interp, shift ) < res_nrg ) {
+            if (shift >= 0) {
+                if (silk_RSHIFT( res_nrg_interp, shift ) < res_nrg) {
                     isInterpLower = silk_TRUE;
                 } else {
                     isInterpLower = silk_FALSE;
                 }
             } else {
-                if( -shift < 32 ) {
-                    if( res_nrg_interp < silk_RSHIFT( res_nrg, -shift ) ) {
+                if (-shift < 32) {
+                    if (res_nrg_interp < silk_RSHIFT( res_nrg, -shift )) {
                         isInterpLower = silk_TRUE;
                     } else {
                         isInterpLower = silk_FALSE;
@@ -132,7 +135,7 @@ void silk_find_LPC_FIX(
             }
 
             /* Determine whether current interpolated NLSFs are best so far */
-            if( isInterpLower == silk_TRUE ) {
+            if (isInterpLower == silk_TRUE) {
                 /* Interpolation has lower residual energy */
                 res_nrg   = res_nrg_interp;
                 res_nrg_Q = res_nrg_interp_Q;
@@ -141,11 +144,12 @@ void silk_find_LPC_FIX(
         }
     }
 
-    if( psEncC->indices.NLSFInterpCoef_Q2 == 4 ) {
+    if (psEncC->indices.NLSFInterpCoef_Q2 == 4) {
         /* NLSF interpolation is currently inactive, calculate NLSFs from full frame AR coefficients */
         silk_A2NLSF( NLSF_Q15, a_Q16, psEncC->predictLPCOrder );
     }
 
-    celt_assert( psEncC->indices.NLSFInterpCoef_Q2 == 4 || ( psEncC->useInterpolatedNLSFs && !psEncC->first_frame_after_reset && psEncC->nb_subfr == MAX_NB_SUBFR ) );
+    celt_assert( psEncC->indices.NLSFInterpCoef_Q2 == 4
+        || (psEncC->useInterpolatedNLSFs && !psEncC->first_frame_after_reset && psEncC->nb_subfr == MAX_NB_SUBFR));
     RESTORE_STACK;
 }
diff --git a/silk/fixed/find_LTP_FIX.c b/silk/fixed/find_LTP_FIX.c
index 506c6777c..c4ae8d493 100644
--- a/silk/fixed/find_LTP_FIX.c
+++ b/silk/fixed/find_LTP_FIX.c
@@ -1,69 +1,68 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FIX.h"
 #include "tuning_parameters.h"
 
 void silk_find_LTP_FIX(
-    oac_int32                      XXLTP_Q17[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ], /* O    Correlation matrix                                               */
-    oac_int32                      xXLTP_Q17[ MAX_NB_SUBFR * LTP_ORDER ],  /* O    Correlation vector                                                          */
-    const oac_int16                r_ptr[],                                /* I    Residual signal after LPC                                                   */
-    const oac_int                  lag[ MAX_NB_SUBFR ],                    /* I    LTP lags                                                                    */
-    const oac_int                  subfr_length,                           /* I    Subframe length                                                             */
-    const oac_int                  nb_subfr,                               /* I    Number of subframes                                                         */
-    int                             arch                                    /* I    Run-time architecture                                                       */
-)
-{
-    oac_int   i, k, extra_shifts;
-    oac_int   xx_shifts, xX_shifts, XX_shifts;
+    oac_int32 XXLTP_Q17[ MAX_NB_SUBFR*LTP_ORDER*LTP_ORDER ],                          /* O    Correlation matrix                                               */
+    oac_int32 xXLTP_Q17[ MAX_NB_SUBFR*LTP_ORDER ],                         /* O    Correlation vector                                                          */
+    const oac_int16 r_ptr[],                                               /* I    Residual signal after LPC                                                   */
+    const oac_int lag[ MAX_NB_SUBFR ],                                     /* I    LTP lags                                                                    */
+    const oac_int subfr_length,                                            /* I    Subframe length                                                             */
+    const oac_int nb_subfr,                                                /* I    Number of subframes                                                         */
+    int arch                                                                /* I    Run-time architecture                                                       */
+    ) {
+    oac_int i, k, extra_shifts;
+    oac_int xx_shifts, xX_shifts, XX_shifts;
     const oac_int16 *lag_ptr;
     oac_int32 *XXLTP_Q17_ptr, *xXLTP_Q17_ptr;
     oac_int32 xx, nrg, temp;
 
     xXLTP_Q17_ptr = xXLTP_Q17;
     XXLTP_Q17_ptr = XXLTP_Q17;
-    for( k = 0; k < nb_subfr; k++ ) {
-        lag_ptr = r_ptr - ( lag[ k ] + LTP_ORDER / 2 );
+    for (k = 0; k < nb_subfr; k++) {
+        lag_ptr = r_ptr - (lag[ k ] + LTP_ORDER/2);
 
         silk_sum_sqr_shift( &xx, &xx_shifts, r_ptr, subfr_length + LTP_ORDER );                            /* xx in Q( -xx_shifts ) */
         silk_corrMatrix_FIX( lag_ptr, subfr_length, LTP_ORDER, XXLTP_Q17_ptr, &nrg, &XX_shifts, arch );    /* XXLTP_Q17_ptr and nrg in Q( -XX_shifts ) */
         extra_shifts = xx_shifts - XX_shifts;
-        if( extra_shifts > 0 ) {
+        if (extra_shifts > 0) {
             /* Shift XX */
             xX_shifts = xx_shifts;
-            for( i = 0; i < LTP_ORDER * LTP_ORDER; i++ ) {
+            for (i = 0; i < LTP_ORDER*LTP_ORDER; i++) {
                 XXLTP_Q17_ptr[ i ] = silk_RSHIFT32( XXLTP_Q17_ptr[ i ], extra_shifts );              /* Q( -xX_shifts ) */
             }
             nrg = silk_RSHIFT32( nrg, extra_shifts );                                                /* Q( -xX_shifts ) */
-        } else if( extra_shifts < 0 ) {
+        } else if (extra_shifts < 0) {
             /* Shift xx */
             xX_shifts = XX_shifts;
             xx = silk_RSHIFT32( xx, -extra_shifts );                                                 /* Q( -xX_shifts ) */
@@ -73,27 +72,27 @@ void silk_find_LTP_FIX(
         silk_corrVector_FIX( lag_ptr, r_ptr, subfr_length, LTP_ORDER, xXLTP_Q17_ptr, xX_shifts, arch );    /* xXLTP_Q17_ptr in Q( -xX_shifts ) */
 
         /* At this point all correlations are in Q(-xX_shifts) */
-        temp = silk_SMLAWB( 1, nrg, SILK_FIX_CONST( LTP_CORR_INV_MAX, 16 ) );
+        temp = silk_SMLAWB( 1, nrg, SILK_FIX_CONST( LTP_CORR_INV_MAX, 16 ));
         temp = silk_max( temp, xx );
-TIC(div)
+        TIC(div)
 #if 0
-        for( i = 0; i < LTP_ORDER * LTP_ORDER; i++ ) {
+        for (i = 0; i < LTP_ORDER*LTP_ORDER; i++) {
             XXLTP_Q17_ptr[ i ] = silk_DIV32_varQ( XXLTP_Q17_ptr[ i ], temp, 17 );
         }
-        for( i = 0; i < LTP_ORDER; i++ ) {
+        for (i = 0; i < LTP_ORDER; i++) {
             xXLTP_Q17_ptr[ i ] = silk_DIV32_varQ( xXLTP_Q17_ptr[ i ], temp, 17 );
         }
 #else
-        for( i = 0; i < LTP_ORDER * LTP_ORDER; i++ ) {
-            XXLTP_Q17_ptr[ i ] = (oac_int32)( silk_LSHIFT64( (oac_int64)XXLTP_Q17_ptr[ i ], 17 ) / temp );
+        for (i = 0; i < LTP_ORDER*LTP_ORDER; i++) {
+            XXLTP_Q17_ptr[ i ] = (oac_int32)(silk_LSHIFT64((oac_int64)XXLTP_Q17_ptr[ i ], 17 )/temp);
         }
-        for( i = 0; i < LTP_ORDER; i++ ) {
-            xXLTP_Q17_ptr[ i ] = (oac_int32)( silk_LSHIFT64( (oac_int64)xXLTP_Q17_ptr[ i ], 17 ) / temp );
+        for (i = 0; i < LTP_ORDER; i++) {
+            xXLTP_Q17_ptr[ i ] = (oac_int32)(silk_LSHIFT64((oac_int64)xXLTP_Q17_ptr[ i ], 17 )/temp);
         }
 #endif
-TOC(div)
+        TOC(div)
         r_ptr         += subfr_length;
-        XXLTP_Q17_ptr += LTP_ORDER * LTP_ORDER;
+        XXLTP_Q17_ptr += LTP_ORDER*LTP_ORDER;
         xXLTP_Q17_ptr += LTP_ORDER;
     }
 }
diff --git a/silk/fixed/find_pitch_lags_FIX.c b/silk/fixed/find_pitch_lags_FIX.c
index 73b3e65eb..d239f2dcf 100644
--- a/silk/fixed/find_pitch_lags_FIX.c
+++ b/silk/fixed/find_pitch_lags_FIX.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FIX.h"
@@ -37,12 +37,11 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_find_pitch_lags_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  encoder control                                                             */
-    oac_int16                      res[],                                  /* O    residual                                                                    */
-    const oac_int16                x[],                                    /* I    Speech signal                                                               */
-    int                             arch                                    /* I    Run-time architecture                                                       */
-)
-{
-    oac_int   buf_len, i, scale;
+    oac_int16 res[],                                                       /* O    residual                                                                    */
+    const oac_int16 x[],                                                   /* I    Speech signal                                                               */
+    int arch                                                                /* I    Run-time architecture                                                       */
+    ) {
+    oac_int buf_len, i, scale;
     oac_int32 thrhld_Q13, res_nrg;
     const oac_int16 *x_ptr;
     VARDECL( oac_int16, Wsig );
@@ -77,7 +76,8 @@ void silk_find_pitch_lags_FIX(
     /* Middle un - windowed samples */
     Wsig_ptr  += psEnc->sCmn.la_pitch;
     x_ptr += psEnc->sCmn.la_pitch;
-    silk_memcpy( Wsig_ptr, x_ptr, ( psEnc->sCmn.pitch_LPC_win_length - silk_LSHIFT( psEnc->sCmn.la_pitch, 1 ) ) * sizeof( oac_int16 ) );
+    silk_memcpy( Wsig_ptr, x_ptr,
+        (psEnc->sCmn.pitch_LPC_win_length - silk_LSHIFT( psEnc->sCmn.la_pitch, 1 ))*sizeof(oac_int16));
 
     /* Last LA_LTP samples */
     Wsig_ptr  += psEnc->sCmn.pitch_LPC_win_length - silk_LSHIFT( psEnc->sCmn.la_pitch, 1 );
@@ -85,10 +85,12 @@ void silk_find_pitch_lags_FIX(
     silk_apply_sine_window( Wsig_ptr, x_ptr, 2, psEnc->sCmn.la_pitch );
 
     /* Calculate autocorrelation sequence */
-    silk_autocorr( auto_corr, &scale, Wsig, psEnc->sCmn.pitch_LPC_win_length, psEnc->sCmn.pitchEstimationLPCOrder + 1, arch );
+    silk_autocorr( auto_corr, &scale, Wsig, psEnc->sCmn.pitch_LPC_win_length, psEnc->sCmn.pitchEstimationLPCOrder + 1,
+    arch );
 
     /* Add white noise, as fraction of energy */
-    auto_corr[ 0 ] = silk_SMLAWB( auto_corr[ 0 ], auto_corr[ 0 ], SILK_FIX_CONST( FIND_PITCH_WHITE_NOISE_FRACTION, 16 ) ) + 1;
+    auto_corr[ 0 ] = silk_SMLAWB( auto_corr[ 0 ], auto_corr[ 0 ],
+    SILK_FIX_CONST( FIND_PITCH_WHITE_NOISE_FRACTION, 16 )) + 1;
 
     /* Calculate the reflection coefficients using schur */
     res_nrg = silk_schur( rc_Q15, auto_corr, psEnc->sCmn.pitchEstimationLPCOrder );
@@ -100,41 +102,42 @@ void silk_find_pitch_lags_FIX(
     silk_k2a( A_Q24, rc_Q15, psEnc->sCmn.pitchEstimationLPCOrder );
 
     /* Convert From 32 bit Q24 to 16 bit Q12 coefs */
-    for( i = 0; i < psEnc->sCmn.pitchEstimationLPCOrder; i++ ) {
-        A_Q12[ i ] = (oac_int16)silk_SAT16( silk_RSHIFT( A_Q24[ i ], 12 ) );
+    for (i = 0; i < psEnc->sCmn.pitchEstimationLPCOrder; i++) {
+        A_Q12[ i ] = (oac_int16)silk_SAT16( silk_RSHIFT( A_Q24[ i ], 12 ));
     }
 
     /* Do BWE */
-    silk_bwexpander( A_Q12, psEnc->sCmn.pitchEstimationLPCOrder, SILK_FIX_CONST( FIND_PITCH_BANDWIDTH_EXPANSION, 16 ) );
+    silk_bwexpander( A_Q12, psEnc->sCmn.pitchEstimationLPCOrder, SILK_FIX_CONST( FIND_PITCH_BANDWIDTH_EXPANSION, 16 ));
 
     /*****************************************/
     /* LPC analysis filtering                */
     /*****************************************/
     silk_LPC_analysis_filter( res, x, A_Q12, buf_len, psEnc->sCmn.pitchEstimationLPCOrder, psEnc->sCmn.arch );
 
-    if( psEnc->sCmn.indices.signalType != TYPE_NO_VOICE_ACTIVITY && psEnc->sCmn.first_frame_after_reset == 0 ) {
+    if (psEnc->sCmn.indices.signalType != TYPE_NO_VOICE_ACTIVITY && psEnc->sCmn.first_frame_after_reset == 0) {
         /* Threshold for pitch estimator */
         thrhld_Q13 = SILK_FIX_CONST( 0.6, 13 );
         thrhld_Q13 = silk_SMLABB( thrhld_Q13, SILK_FIX_CONST( -0.004, 13 ), psEnc->sCmn.pitchEstimationLPCOrder );
         thrhld_Q13 = silk_SMLAWB( thrhld_Q13, SILK_FIX_CONST( -0.1,   21  ), psEnc->sCmn.speech_activity_Q8 );
-        thrhld_Q13 = silk_SMLABB( thrhld_Q13, SILK_FIX_CONST( -0.15,  13 ), silk_RSHIFT( psEnc->sCmn.prevSignalType, 1 ) );
+        thrhld_Q13 = silk_SMLABB( thrhld_Q13, SILK_FIX_CONST( -0.15,  13 ),
+        silk_RSHIFT( psEnc->sCmn.prevSignalType, 1 ));
         thrhld_Q13 = silk_SMLAWB( thrhld_Q13, SILK_FIX_CONST( -0.1,   14 ), psEnc->sCmn.input_tilt_Q15 );
         thrhld_Q13 = silk_SAT16(  thrhld_Q13 );
 
         /*****************************************/
         /* Call pitch estimator                  */
         /*****************************************/
-        if( silk_pitch_analysis_core( res, psEncCtrl->pitchL, &psEnc->sCmn.indices.lagIndex, &psEnc->sCmn.indices.contourIndex,
+        if (silk_pitch_analysis_core( res, psEncCtrl->pitchL, &psEnc->sCmn.indices.lagIndex,
+        &psEnc->sCmn.indices.contourIndex,
                 &psEnc->LTPCorr_Q15, psEnc->sCmn.prevLag, psEnc->sCmn.pitchEstimationThreshold_Q16,
-                (oac_int)thrhld_Q13, psEnc->sCmn.fs_kHz, psEnc->sCmn.pitchEstimationComplexity, psEnc->sCmn.nb_subfr,
-                psEnc->sCmn.arch) == 0 )
-        {
+            (oac_int)thrhld_Q13, psEnc->sCmn.fs_kHz, psEnc->sCmn.pitchEstimationComplexity, psEnc->sCmn.nb_subfr,
+                psEnc->sCmn.arch) == 0) {
             psEnc->sCmn.indices.signalType = TYPE_VOICED;
         } else {
             psEnc->sCmn.indices.signalType = TYPE_UNVOICED;
         }
     } else {
-        silk_memset( psEncCtrl->pitchL, 0, sizeof( psEncCtrl->pitchL ) );
+        silk_memset( psEncCtrl->pitchL, 0, sizeof(psEncCtrl->pitchL));
         psEnc->sCmn.indices.lagIndex = 0;
         psEnc->sCmn.indices.contourIndex = 0;
         psEnc->LTPCorr_Q15 = 0;
diff --git a/silk/fixed/find_pred_coefs_FIX.c b/silk/fixed/find_pred_coefs_FIX.c
index b376bde5b..c4561d99a 100644
--- a/silk/fixed/find_pred_coefs_FIX.c
+++ b/silk/fixed/find_pred_coefs_FIX.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FIX.h"
@@ -35,27 +35,26 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_find_pred_coefs_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  encoder control                                                             */
-    const oac_int16                res_pitch[],                            /* I    Residual from pitch analysis                                                */
-    const oac_int16                x[],                                    /* I    Speech signal                                                               */
-    oac_int                        condCoding                              /* I    The type of conditional coding to use                                       */
-)
-{
-    oac_int         i;
-    oac_int32       invGains_Q16[ MAX_NB_SUBFR ], local_gains[ MAX_NB_SUBFR ];
+    const oac_int16 res_pitch[],                                           /* I    Residual from pitch analysis                                                */
+    const oac_int16 x[],                                                   /* I    Speech signal                                                               */
+    oac_int condCoding                                                     /* I    The type of conditional coding to use                                       */
+    ) {
+    oac_int i;
+    oac_int32 invGains_Q16[ MAX_NB_SUBFR ], local_gains[ MAX_NB_SUBFR ];
     /* Set to NLSF_Q15 to zero so we don't copy junk to the state. */
-    oac_int16       NLSF_Q15[ MAX_LPC_ORDER ]={0};
+    oac_int16 NLSF_Q15[ MAX_LPC_ORDER ] = {0};
     const oac_int16 *x_ptr;
     oac_int16       *x_pre_ptr;
     VARDECL( oac_int16, LPC_in_pre );
-    oac_int32       min_gain_Q16, minInvGain_Q30;
+    oac_int32 min_gain_Q16, minInvGain_Q30;
     SAVE_STACK;
 
     /* weighting for weighted least squares */
-    min_gain_Q16 = silk_int32_MAX >> 6;
-    for( i = 0; i < psEnc->sCmn.nb_subfr; i++ ) {
+    min_gain_Q16 = silk_int32_MAX>>6;
+    for (i = 0; i < psEnc->sCmn.nb_subfr; i++) {
         min_gain_Q16 = silk_min( min_gain_Q16, psEncCtrl->Gains_Q16[ i ] );
     }
-    for( i = 0; i < psEnc->sCmn.nb_subfr; i++ ) {
+    for (i = 0; i < psEnc->sCmn.nb_subfr; i++) {
         /* Divide to Q16 */
         silk_assert( psEncCtrl->Gains_Q16[ i ] > 0 );
         /* Invert and normalize gains, and ensure that maximum invGains_Q16 is within range of a 16 bit int */
@@ -65,26 +64,26 @@ void silk_find_pred_coefs_FIX(
         invGains_Q16[ i ] = silk_max( invGains_Q16[ i ], 100 );
 
         /* Square the inverted gains */
-        silk_assert( invGains_Q16[ i ] == silk_SAT16( invGains_Q16[ i ] ) );
+        silk_assert( invGains_Q16[ i ] == silk_SAT16( invGains_Q16[ i ] ));
 
         /* Invert the inverted and normalized gains */
-        local_gains[ i ] = silk_DIV32( ( (oac_int32)1 << 16 ), invGains_Q16[ i ] );
+        local_gains[ i ] = silk_DIV32(((oac_int32)1<<16), invGains_Q16[ i ] );
     }
 
     ALLOC( LPC_in_pre,
-           psEnc->sCmn.nb_subfr * psEnc->sCmn.predictLPCOrder
-               + psEnc->sCmn.frame_length, oac_int16 );
-    if( psEnc->sCmn.indices.signalType == TYPE_VOICED ) {
+           psEnc->sCmn.nb_subfr*psEnc->sCmn.predictLPCOrder
+        + psEnc->sCmn.frame_length, oac_int16 );
+    if (psEnc->sCmn.indices.signalType == TYPE_VOICED) {
         VARDECL( oac_int32, xXLTP_Q17 );
         VARDECL( oac_int32, XXLTP_Q17 );
 
         /**********/
         /* VOICED */
         /**********/
-        celt_assert( psEnc->sCmn.ltp_mem_length - psEnc->sCmn.predictLPCOrder >= psEncCtrl->pitchL[ 0 ] + LTP_ORDER / 2 );
+        celt_assert( psEnc->sCmn.ltp_mem_length - psEnc->sCmn.predictLPCOrder >= psEncCtrl->pitchL[ 0 ] + LTP_ORDER/2 );
 
-        ALLOC( xXLTP_Q17, psEnc->sCmn.nb_subfr * LTP_ORDER, oac_int32 );
-        ALLOC( XXLTP_Q17, psEnc->sCmn.nb_subfr * LTP_ORDER * LTP_ORDER, oac_int32 );
+        ALLOC( xXLTP_Q17, psEnc->sCmn.nb_subfr*LTP_ORDER, oac_int32 );
+        ALLOC( XXLTP_Q17, psEnc->sCmn.nb_subfr*LTP_ORDER*LTP_ORDER, oac_int32 );
 
         /* LTP analysis */
         silk_find_LTP_FIX( XXLTP_Q17, xXLTP_Q17, res_pitch,
@@ -92,14 +91,16 @@ void silk_find_pred_coefs_FIX(
 
         /* Quantize LTP gain parameters */
         silk_quant_LTP_gains( psEncCtrl->LTPCoef_Q14, psEnc->sCmn.indices.LTPIndex, &psEnc->sCmn.indices.PERIndex,
-            &psEnc->sCmn.sum_log_gain_Q7, &psEncCtrl->LTPredCodGain_Q7, XXLTP_Q17, xXLTP_Q17, psEnc->sCmn.subfr_length, psEnc->sCmn.nb_subfr, psEnc->sCmn.arch );
+            &psEnc->sCmn.sum_log_gain_Q7, &psEncCtrl->LTPredCodGain_Q7, XXLTP_Q17, xXLTP_Q17, psEnc->sCmn.subfr_length,
+        psEnc->sCmn.nb_subfr, psEnc->sCmn.arch );
 
         /* Control LTP scaling */
         silk_LTP_scale_ctrl_FIX( psEnc, psEncCtrl, condCoding );
 
         /* Create LTP residual */
         silk_LTP_analysis_filter_FIX( LPC_in_pre, x - psEnc->sCmn.predictLPCOrder, psEncCtrl->LTPCoef_Q14,
-            psEncCtrl->pitchL, invGains_Q16, psEnc->sCmn.subfr_length, psEnc->sCmn.nb_subfr, psEnc->sCmn.predictLPCOrder );
+            psEncCtrl->pitchL, invGains_Q16, psEnc->sCmn.subfr_length, psEnc->sCmn.nb_subfr,
+        psEnc->sCmn.predictLPCOrder );
 
     } else {
         /************/
@@ -108,27 +109,29 @@ void silk_find_pred_coefs_FIX(
         /* Create signal with prepended subframes, scaled by inverse gains */
         x_ptr     = x - psEnc->sCmn.predictLPCOrder;
         x_pre_ptr = LPC_in_pre;
-        for( i = 0; i < psEnc->sCmn.nb_subfr; i++ ) {
+        for (i = 0; i < psEnc->sCmn.nb_subfr; i++) {
             silk_scale_copy_vector16( x_pre_ptr, x_ptr, invGains_Q16[ i ],
                 psEnc->sCmn.subfr_length + psEnc->sCmn.predictLPCOrder );
             x_pre_ptr += psEnc->sCmn.subfr_length + psEnc->sCmn.predictLPCOrder;
             x_ptr     += psEnc->sCmn.subfr_length;
         }
 
-        silk_memset( psEncCtrl->LTPCoef_Q14, 0, psEnc->sCmn.nb_subfr * LTP_ORDER * sizeof( oac_int16 ) );
+        silk_memset( psEncCtrl->LTPCoef_Q14, 0, psEnc->sCmn.nb_subfr*LTP_ORDER*sizeof(oac_int16));
         psEncCtrl->LTPredCodGain_Q7 = 0;
         psEnc->sCmn.sum_log_gain_Q7 = 0;
         psEncCtrl->LTP_scale_Q14 = 0;
     }
 
     /* Limit on total predictive coding gain */
-    if( psEnc->sCmn.first_frame_after_reset ) {
-        minInvGain_Q30 = SILK_FIX_CONST( 1.0f / MAX_PREDICTION_POWER_GAIN_AFTER_RESET, 30 );
+    if (psEnc->sCmn.first_frame_after_reset) {
+        minInvGain_Q30 = SILK_FIX_CONST( 1.0f/MAX_PREDICTION_POWER_GAIN_AFTER_RESET, 30 );
     } else {
-        minInvGain_Q30 = silk_log2lin( silk_SMLAWB( 16 << 7, (oac_int32)psEncCtrl->LTPredCodGain_Q7, SILK_FIX_CONST( 1.0 / 3, 16 ) ) );      /* Q16 */
+        minInvGain_Q30 = silk_log2lin( silk_SMLAWB( 16<<7, (oac_int32)psEncCtrl->LTPredCodGain_Q7,
+        SILK_FIX_CONST( 1.0/3, 16 )));                                                                                                       /* Q16 */
         minInvGain_Q30 = silk_DIV32_varQ( minInvGain_Q30,
             silk_SMULWW( SILK_FIX_CONST( MAX_PREDICTION_POWER_GAIN, 0 ),
-                silk_SMLAWB( SILK_FIX_CONST( 0.25, 18 ), SILK_FIX_CONST( 0.75, 18 ), psEncCtrl->coding_quality_Q14 ) ), 14 );
+                silk_SMLAWB( SILK_FIX_CONST( 0.25, 18 ), SILK_FIX_CONST( 0.75, 18 ), psEncCtrl->coding_quality_Q14 )),
+        14 );
     }
 
     /* LPC_in_pre contains the LTP-filtered input for voiced, and the unfiltered input for unvoiced */
@@ -142,6 +145,6 @@ void silk_find_pred_coefs_FIX(
         psEnc->sCmn.subfr_length, psEnc->sCmn.nb_subfr, psEnc->sCmn.predictLPCOrder, psEnc->sCmn.arch );
 
     /* Copy to prediction struct for use in next frame for interpolation */
-    silk_memcpy( psEnc->sCmn.prev_NLSFq_Q15, NLSF_Q15, sizeof( psEnc->sCmn.prev_NLSFq_Q15 ) );
+    silk_memcpy( psEnc->sCmn.prev_NLSFq_Q15, NLSF_Q15, sizeof(psEnc->sCmn.prev_NLSFq_Q15));
     RESTORE_STACK;
 }
diff --git a/silk/fixed/k2a_FIX.c b/silk/fixed/k2a_FIX.c
index e52076c8d..2e6ec35c2 100644
--- a/silk/fixed/k2a_FIX.c
+++ b/silk/fixed/k2a_FIX.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -35,20 +35,19 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_k2a(
     oac_int32                  *A_Q24,             /* O    Prediction coefficients [order] Q24                         */
     const oac_int16            *rc_Q15,            /* I    Reflection coefficients [order] Q15                         */
-    const oac_int32            order               /* I    Prediction order                                            */
-)
-{
-    oac_int   k, n;
+    const oac_int32 order                          /* I    Prediction order                                            */
+    ) {
+    oac_int k, n;
     oac_int32 rc, tmp1, tmp2;
 
-    for( k = 0; k < order; k++ ) {
+    for (k = 0; k < order; k++) {
         rc = rc_Q15[ k ];
-        for( n = 0; n < (k + 1) >> 1; n++ ) {
+        for (n = 0; n < (k + 1)>>1; n++) {
             tmp1 = A_Q24[ n ];
             tmp2 = A_Q24[ k - n - 1 ];
             A_Q24[ n ]         = silk_SMLAWB( tmp1, silk_LSHIFT( tmp2, 1 ), rc );
             A_Q24[ k - n - 1 ] = silk_SMLAWB( tmp2, silk_LSHIFT( tmp1, 1 ), rc );
         }
-        A_Q24[ k ] = -silk_LSHIFT( (oac_int32)rc_Q15[ k ], 9 );
+        A_Q24[ k ] = -silk_LSHIFT((oac_int32)rc_Q15[ k ], 9 );
     }
 }
diff --git a/silk/fixed/k2a_Q16_FIX.c b/silk/fixed/k2a_Q16_FIX.c
index c793e706f..b45858b12 100644
--- a/silk/fixed/k2a_Q16_FIX.c
+++ b/silk/fixed/k2a_Q16_FIX.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -35,15 +35,14 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_k2a_Q16(
     oac_int32                  *A_Q24,             /* O    Prediction coefficients [order] Q24                         */
     const oac_int32            *rc_Q16,            /* I    Reflection coefficients [order] Q16                         */
-    const oac_int32            order               /* I    Prediction order                                            */
-)
-{
-    oac_int   k, n;
+    const oac_int32 order                          /* I    Prediction order                                            */
+    ) {
+    oac_int k, n;
     oac_int32 rc, tmp1, tmp2;
 
-    for( k = 0; k < order; k++ ) {
+    for (k = 0; k < order; k++) {
         rc = rc_Q16[ k ];
-        for( n = 0; n < (k + 1) >> 1; n++ ) {
+        for (n = 0; n < (k + 1)>>1; n++) {
             tmp1 = A_Q24[ n ];
             tmp2 = A_Q24[ k - n - 1 ];
             A_Q24[ n ]         = silk_SMLAWW( tmp1, tmp2, rc );
diff --git a/silk/fixed/main_FIX.h b/silk/fixed/main_FIX.h
index fd2edf549..58b6d1738 100644
--- a/silk/fixed/main_FIX.h
+++ b/silk/fixed/main_FIX.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_MAIN_FIX_H
@@ -37,8 +37,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "entenc.h"
 
 #if ((defined(OAC_ARM_ASM) && defined(FIXED_POINT)) \
-   || defined(OAC_ARM_MAY_HAVE_NEON_INTR))
-#include "fixed/arm/warped_autocorrelation_FIX_arm.h"
+    || defined(OAC_ARM_MAY_HAVE_NEON_INTR))
+# include "fixed/arm/warped_autocorrelation_FIX_arm.h"
 #endif
 
 
@@ -55,39 +55,38 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* High-pass filter with cutoff frequency adaptation based on pitch lag statistics */
 void silk_HP_variable_cutoff(
-    silk_encoder_state_Fxx          state_Fxx[]                             /* I/O  Encoder states                                                              */
-);
+    silk_encoder_state_Fxx state_Fxx[]                                      /* I/O  Encoder states                                                              */
+    );
 
 /* Encoder main function */
 void silk_encode_do_VAD_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
-    oac_int                        activity                                /* I    Decision of Oac voice activity detector                                    */
-);
+    oac_int activity                                                       /* I    Decision of Oac voice activity detector                                    */
+    );
 
 /* Encoder main function */
 oac_int silk_encode_frame_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
     oac_int32                      *pnBytesOut,                            /* O    Pointer to number of payload bytes;                                         */
     ec_enc                          *psRangeEnc,                            /* I/O  compressor data structure                                                   */
-    oac_int                        condCoding,                             /* I    The type of conditional coding to use                                       */
-    oac_int                        maxBits,                                /* I    If > 0: maximum number of output bits                                       */
-    oac_int                        useCBR                                  /* I    Flag to force constant-bitrate operation                                    */
-);
+    oac_int condCoding,                                                    /* I    The type of conditional coding to use                                       */
+    oac_int maxBits,                                                       /* I    If > 0: maximum number of output bits                                       */
+    oac_int useCBR                                                         /* I    Flag to force constant-bitrate operation                                    */
+    );
 
 /* Initializes the Silk encoder state */
 oac_int silk_init_encoder(
     silk_encoder_state_Fxx          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
-    int                              arch                                   /* I    Run-time architecture                                                       */
-);
+    int arch                                                                /* I    Run-time architecture                                                       */
+    );
 
 /* Control the Silk encoder */
 oac_int silk_control_encoder(
     silk_encoder_state_Fxx          *psEnc,                                 /* I/O  Pointer to Silk encoder state                                               */
     silk_EncControlStruct           *encControl,                            /* I    Control structure                                                           */
-    const oac_int                  allow_bw_switch,                        /* I    Flag to allow switching audio bandwidth                                     */
-    const oac_int                  channelNb,                              /* I    Channel number                                                              */
-    const oac_int                  force_fs_kHz
-);
+    const oac_int allow_bw_switch,                                         /* I    Flag to allow switching audio bandwidth                                     */
+    const oac_int channelNb,                                               /* I    Channel number                                                              */
+    const oac_int force_fs_kHz);
 
 /**************************/
 /* Noise shaping analysis */
@@ -98,21 +97,21 @@ void silk_noise_shape_analysis_FIX(
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  Encoder control FIX                                                         */
     const oac_int16                *pitch_res,                             /* I    LPC residual from pitch analysis                                            */
     const oac_int16                *x,                                     /* I    Input signal [ frame_length + la_shape ]                                    */
-    int                              arch                                   /* I    Run-time architecture                                                       */
-);
+    int arch                                                                /* I    Run-time architecture                                                       */
+    );
 
 /* Autocorrelations for a warped frequency axis */
 void silk_warped_autocorrelation_FIX_c(
-          oac_int32                *corr,                                  /* O    Result [order + 1]                                                          */
-          oac_int                  *scale,                                 /* O    Scaling of the correlation vector                                           */
+    oac_int32                *corr,                                        /* O    Result [order + 1]                                                          */
+    oac_int                  *scale,                                       /* O    Scaling of the correlation vector                                           */
     const oac_int16                *input,                                 /* I    Input data to correlate                                                     */
-    const oac_int                  warping_Q16,                            /* I    Warping coefficient                                                         */
-    const oac_int                  length,                                 /* I    Length of input                                                             */
-    const oac_int                  order                                   /* I    Correlation order (even)                                                    */
-);
+    const oac_int warping_Q16,                                             /* I    Warping coefficient                                                         */
+    const oac_int length,                                                  /* I    Length of input                                                             */
+    const oac_int order                                                    /* I    Correlation order (even)                                                    */
+    );
 
 #if !defined(OVERRIDE_silk_warped_autocorrelation_FIX)
-#define silk_warped_autocorrelation_FIX(corr, scale, input, warping_Q16, length, order, arch) \
+# define silk_warped_autocorrelation_FIX(corr, scale, input, warping_Q16, length, order, arch) \
         ((void)(arch), silk_warped_autocorrelation_FIX_c(corr, scale, input, warping_Q16, length, order))
 #endif
 
@@ -120,8 +119,8 @@ void silk_warped_autocorrelation_FIX_c(
 void silk_LTP_scale_ctrl_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  encoder control                                                             */
-    oac_int                        condCoding                              /* I    The type of conditional coding to use                                       */
-);
+    oac_int condCoding                                                     /* I    The type of conditional coding to use                                       */
+    );
 
 /**********************************************/
 /* Prediction Analysis                        */
@@ -130,80 +129,80 @@ void silk_LTP_scale_ctrl_FIX(
 void silk_find_pitch_lags_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  encoder control                                                             */
-    oac_int16                      res[],                                  /* O    residual                                                                    */
-    const oac_int16                x[],                                    /* I    Speech signal                                                               */
-    int                             arch                                    /* I    Run-time architecture                                                       */
-);
+    oac_int16 res[],                                                       /* O    residual                                                                    */
+    const oac_int16 x[],                                                   /* I    Speech signal                                                               */
+    int arch                                                                /* I    Run-time architecture                                                       */
+    );
 
 /* Find LPC and LTP coefficients */
 void silk_find_pred_coefs_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  encoder control                                                             */
-    const oac_int16                res_pitch[],                            /* I    Residual from pitch analysis                                                */
-    const oac_int16                x[],                                    /* I    Speech signal                                                               */
-    oac_int                        condCoding                              /* I    The type of conditional coding to use                                       */
-);
+    const oac_int16 res_pitch[],                                           /* I    Residual from pitch analysis                                                */
+    const oac_int16 x[],                                                   /* I    Speech signal                                                               */
+    oac_int condCoding                                                     /* I    The type of conditional coding to use                                       */
+    );
 
 /* LPC analysis */
 void silk_find_LPC_FIX(
     silk_encoder_state              *psEncC,                                /* I/O  Encoder state                                                               */
-    oac_int16                      NLSF_Q15[],                             /* O    NLSFs                                                                       */
-    const oac_int16                x[],                                    /* I    Input signal                                                                */
-    const oac_int32                minInvGain_Q30                          /* I    Inverse of max prediction gain                                              */
-);
+    oac_int16 NLSF_Q15[],                                                  /* O    NLSFs                                                                       */
+    const oac_int16 x[],                                                   /* I    Input signal                                                                */
+    const oac_int32 minInvGain_Q30                                         /* I    Inverse of max prediction gain                                              */
+    );
 
 /* LTP analysis */
 void silk_find_LTP_FIX(
-    oac_int32                      XXLTP_Q17[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ], /* O    Correlation matrix                                               */
-    oac_int32                      xXLTP_Q17[ MAX_NB_SUBFR * LTP_ORDER ],  /* O    Correlation vector                                                          */
-    const oac_int16                r_lpc[],                                /* I    Residual signal after LPC                                                   */
-    const oac_int                  lag[ MAX_NB_SUBFR ],                    /* I    LTP lags                                                                    */
-    const oac_int                  subfr_length,                           /* I    Subframe length                                                             */
-    const oac_int                  nb_subfr,                               /* I    Number of subframes                                                         */
-    int                             arch                                    /* I    Run-time architecture                                                       */
-);
+    oac_int32 XXLTP_Q17[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ],                      /* O    Correlation matrix                                               */
+    oac_int32 xXLTP_Q17[ MAX_NB_SUBFR * LTP_ORDER ],                       /* O    Correlation vector                                                          */
+    const oac_int16 r_lpc[],                                               /* I    Residual signal after LPC                                                   */
+    const oac_int lag[ MAX_NB_SUBFR ],                                     /* I    LTP lags                                                                    */
+    const oac_int subfr_length,                                            /* I    Subframe length                                                             */
+    const oac_int nb_subfr,                                                /* I    Number of subframes                                                         */
+    int arch                                                                /* I    Run-time architecture                                                       */
+    );
 
 void silk_LTP_analysis_filter_FIX(
     oac_int16                      *LTP_res,                               /* O    LTP residual signal of length MAX_NB_SUBFR * ( pre_length + subfr_length )  */
     const oac_int16                *x,                                     /* I    Pointer to input signal with at least max( pitchL ) preceding samples       */
-    const oac_int16                LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],/* I    LTP_ORDER LTP coefficients for each MAX_NB_SUBFR subframe                   */
-    const oac_int                  pitchL[ MAX_NB_SUBFR ],                 /* I    Pitch lag, one for each subframe                                            */
-    const oac_int32                invGains_Q16[ MAX_NB_SUBFR ],           /* I    Inverse quantization gains, one for each subframe                           */
-    const oac_int                  subfr_length,                           /* I    Length of each subframe                                                     */
-    const oac_int                  nb_subfr,                               /* I    Number of subframes                                                         */
-    const oac_int                  pre_length                              /* I    Length of the preceding samples starting at &x[0] for each subframe         */
-);
+    const oac_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],               /* I    LTP_ORDER LTP coefficients for each MAX_NB_SUBFR subframe                   */
+    const oac_int pitchL[ MAX_NB_SUBFR ],                                  /* I    Pitch lag, one for each subframe                                            */
+    const oac_int32 invGains_Q16[ MAX_NB_SUBFR ],                          /* I    Inverse quantization gains, one for each subframe                           */
+    const oac_int subfr_length,                                            /* I    Length of each subframe                                                     */
+    const oac_int nb_subfr,                                                /* I    Number of subframes                                                         */
+    const oac_int pre_length                                               /* I    Length of the preceding samples starting at &x[0] for each subframe         */
+    );
 
 /* Calculates residual energies of input subframes where all subframes have LPC_order   */
 /* of preceding samples                                                                 */
 void silk_residual_energy_FIX(
-          oac_int32                nrgs[ MAX_NB_SUBFR ],                   /* O    Residual energy per subframe                                                */
-          oac_int                  nrgsQ[ MAX_NB_SUBFR ],                  /* O    Q value per subframe                                                        */
-    const oac_int16                x[],                                    /* I    Input signal                                                                */
-          oac_int16                a_Q12[ 2 ][ MAX_LPC_ORDER ],            /* I    AR coefs for each frame half                                                */
-    const oac_int32                gains[ MAX_NB_SUBFR ],                  /* I    Quantization gains                                                          */
-    const oac_int                  subfr_length,                           /* I    Subframe length                                                             */
-    const oac_int                  nb_subfr,                               /* I    Number of subframes                                                         */
-    const oac_int                  LPC_order,                              /* I    LPC order                                                                   */
-    int                             arch                                    /* I    Run-time architecture                                                       */
-);
+    oac_int32 nrgs[ MAX_NB_SUBFR ],                                        /* O    Residual energy per subframe                                                */
+    oac_int nrgsQ[ MAX_NB_SUBFR ],                                         /* O    Q value per subframe                                                        */
+    const oac_int16 x[],                                                   /* I    Input signal                                                                */
+    oac_int16 a_Q12[ 2 ][ MAX_LPC_ORDER ],                                 /* I    AR coefs for each frame half                                                */
+    const oac_int32 gains[ MAX_NB_SUBFR ],                                 /* I    Quantization gains                                                          */
+    const oac_int subfr_length,                                            /* I    Subframe length                                                             */
+    const oac_int nb_subfr,                                                /* I    Number of subframes                                                         */
+    const oac_int LPC_order,                                               /* I    LPC order                                                                   */
+    int arch                                                                /* I    Run-time architecture                                                       */
+    );
 
 /* Residual energy: nrg = wxx - 2 * wXx * c + c' * wXX * c */
 oac_int32 silk_residual_energy16_covar_FIX(
     const oac_int16                *c,                                     /* I    Prediction vector                                                           */
     const oac_int32                *wXX,                                   /* I    Correlation matrix                                                          */
     const oac_int32                *wXx,                                   /* I    Correlation vector                                                          */
-    oac_int32                      wxx,                                    /* I    Signal energy                                                               */
-    oac_int                        D,                                      /* I    Dimension                                                                   */
-    oac_int                        cQ                                      /* I    Q value for c vector 0 - 15                                                 */
-);
+    oac_int32 wxx,                                                         /* I    Signal energy                                                               */
+    oac_int D,                                                             /* I    Dimension                                                                   */
+    oac_int cQ                                                             /* I    Q value for c vector 0 - 15                                                 */
+    );
 
 /* Processing of gains */
 void silk_process_gains_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  Encoder control                                                             */
-    oac_int                        condCoding                              /* I    The type of conditional coding to use                                       */
-);
+    oac_int condCoding                                                     /* I    The type of conditional coding to use                                       */
+    );
 
 /******************/
 /* Linear Algebra */
@@ -211,23 +210,23 @@ void silk_process_gains_FIX(
 /* Calculates correlation matrix X'*X */
 void silk_corrMatrix_FIX(
     const oac_int16                *x,                                     /* I    x vector [L + order - 1] used to form data matrix X                         */
-    const oac_int                  L,                                      /* I    Length of vectors                                                           */
-    const oac_int                  order,                                  /* I    Max lag for correlation                                                     */
+    const oac_int L,                                                       /* I    Length of vectors                                                           */
+    const oac_int order,                                                   /* I    Max lag for correlation                                                     */
     oac_int32                      *XX,                                    /* O    Pointer to X'*X correlation matrix [ order x order ]                        */
     oac_int32                      *nrg,                                   /* O    Energy of x vector                                                          */
     oac_int                        *rshifts,                               /* O    Right shifts of correlations                                                */
-    int                              arch                                   /* I    Run-time architecture                                                       */
-);
+    int arch                                                                /* I    Run-time architecture                                                       */
+    );
 
 /* Calculates correlation vector X'*t */
 void silk_corrVector_FIX(
     const oac_int16                *x,                                     /* I    x vector [L + order - 1] used to form data matrix X                         */
     const oac_int16                *t,                                     /* I    Target vector [L]                                                           */
-    const oac_int                  L,                                      /* I    Length of vectors                                                           */
-    const oac_int                  order,                                  /* I    Max lag for correlation                                                     */
+    const oac_int L,                                                       /* I    Length of vectors                                                           */
+    const oac_int order,                                                   /* I    Max lag for correlation                                                     */
     oac_int32                      *Xt,                                    /* O    Pointer to X'*t correlation vector [order]                                  */
-    const oac_int                  rshifts,                                /* I    Right shifts of correlations                                                */
-    int                             arch                                    /* I    Run-time architecture                                                       */
-);
+    const oac_int rshifts,                                                 /* I    Right shifts of correlations                                                */
+    int arch                                                                /* I    Run-time architecture                                                       */
+    );
 
 #endif /* SILK_MAIN_FIX_H */
diff --git a/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h b/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h
index b27039231..ad91d38aa 100644
--- a/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h
+++ b/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h
@@ -1,104 +1,104 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef __WARPED_AUTOCORRELATION_FIX_MIPSR1_H__
 #define __WARPED_AUTOCORRELATION_FIX_MIPSR1_H__
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FIX.h"
 
 #if defined (__mips_dsp) && __mips == 32
 
-#define MIPS_MADD __builtin_mips_madd
-#define MIPS_SHILO __builtin_mips_shilo
+# define MIPS_MADD __builtin_mips_madd
+# define MIPS_SHILO __builtin_mips_shilo
 
-#define OVERRIDE_silk_warped_autocorrelation_FIX_c
+# define OVERRIDE_silk_warped_autocorrelation_FIX_c
 
 #elif defined (__mips_isa_rev) && __mips == 32
 
 static inline long long MIPS_MADD(long long acc, int a, int b) {
-    return acc + (long long)a * b;
+    return acc + (long long)a*b;
 }
 
 static inline long long MIPS_SHILO(long long acc, int sh) {
-    return (sh >= 0) ? (acc >> sh) : (acc << -sh);
+    return (sh >= 0) ? (acc>>sh) : (acc<< -sh);
 }
 
-#define OVERRIDE_silk_warped_autocorrelation_FIX_c
+# define OVERRIDE_silk_warped_autocorrelation_FIX_c
 
 #endif
 
 /* Autocorrelations for a warped frequency axis */
 #if defined (OVERRIDE_silk_warped_autocorrelation_FIX_c)
 
-#undef QC
-#define QC  10
+# undef QC
+# define QC  10
 
-#undef QS
-#define QS  14
+# undef QS
+# define QS  14
 
 void silk_warped_autocorrelation_FIX_c(
-          oac_int32                *corr,                                  /* O    Result [order + 1]                                                          */
-          oac_int                  *scale,                                 /* O    Scaling of the correlation vector                                           */
+    oac_int32                *corr,                                        /* O    Result [order + 1]                                                          */
+    oac_int                  *scale,                                       /* O    Scaling of the correlation vector                                           */
     const oac_int16                *input,                                 /* I    Input data to correlate                                                     */
-    const oac_int                  warping_Q16,                            /* I    Warping coefficient                                                         */
-    const oac_int                  length,                                 /* I    Length of input                                                             */
-    const oac_int                  order                                   /* I    Correlation order (even)                                                    */
-)
-{
-    oac_int   n, i, lsh;
-    oac_int32 tmp1_QS=0, tmp2_QS=0, tmp3_QS=0, tmp4_QS=0, tmp5_QS=0, tmp6_QS=0, tmp7_QS=0, tmp8_QS=0, start_1=0, start_2=0, start_3=0;
+    const oac_int warping_Q16,                                             /* I    Warping coefficient                                                         */
+    const oac_int length,                                                  /* I    Length of input                                                             */
+    const oac_int order                                                    /* I    Correlation order (even)                                                    */
+    ) {
+    oac_int n, i, lsh;
+    oac_int32 tmp1_QS = 0, tmp2_QS = 0, tmp3_QS = 0, tmp4_QS = 0, tmp5_QS = 0, tmp6_QS = 0, tmp7_QS = 0, tmp8_QS = 0,
+              start_1 = 0, start_2 = 0, start_3 = 0;
     oac_int32 state_QS[ MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };
     oac_int64 corr_QC[  MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };
     oac_int64 temp64;
 
     oac_int32 val;
-    val = 2 * QS - QC;
+    val = 2*QS - QC;
 
     /* Order must be even */
-    silk_assert( ( order & 1 ) == 0 );
-    silk_assert( 2 * QS - QC >= 0 );
+    silk_assert((order&1) == 0 );
+    silk_assert( 2*QS - QC >= 0 );
 
     /* Loop over samples */
-    for( n = 0; n < length; n=n+4 ) {
+    for (n = 0; n < length; n = n + 4) {
 
-        tmp1_QS = silk_LSHIFT32( (oac_int32)input[ n ], QS );
+        tmp1_QS = silk_LSHIFT32((oac_int32)input[ n ], QS );
         start_1 = tmp1_QS;
-        tmp3_QS = silk_LSHIFT32( (oac_int32)input[ n+1], QS );
+        tmp3_QS = silk_LSHIFT32((oac_int32)input[ n + 1], QS );
         start_2 = tmp3_QS;
-        tmp5_QS = silk_LSHIFT32( (oac_int32)input[ n+2], QS );
+        tmp5_QS = silk_LSHIFT32((oac_int32)input[ n + 2], QS );
         start_3 = tmp5_QS;
-        tmp7_QS = silk_LSHIFT32( (oac_int32)input[ n+3], QS );
+        tmp7_QS = silk_LSHIFT32((oac_int32)input[ n + 3], QS );
 
         /* Loop over allpass sections */
-        for( i = 0; i < order; i += 2 ) {
+        for (i = 0; i < order; i += 2) {
             /* Output of allpass section */
             tmp2_QS = silk_SMLAWB( state_QS[ i ], state_QS[ i + 1 ] - tmp1_QS, warping_Q16 );
             corr_QC[  i ] = MIPS_MADD( corr_QC[  i ], tmp1_QS,  start_1);
@@ -115,17 +115,17 @@ void silk_warped_autocorrelation_FIX_c(
 
             /* Output of allpass section */
             tmp1_QS = silk_SMLAWB( state_QS[ i + 1 ], state_QS[ i + 2 ] - tmp2_QS, warping_Q16 );
-            corr_QC[  i+1 ] = MIPS_MADD( corr_QC[  i+1 ], tmp2_QS,  start_1);
+            corr_QC[  i + 1 ] = MIPS_MADD( corr_QC[  i + 1 ], tmp2_QS,  start_1);
 
             tmp3_QS = silk_SMLAWB( tmp2_QS, tmp1_QS - tmp4_QS, warping_Q16 );
-            corr_QC[  i+1 ] = MIPS_MADD( corr_QC[  i+1 ], tmp4_QS,  start_2);
+            corr_QC[  i + 1 ] = MIPS_MADD( corr_QC[  i + 1 ], tmp4_QS,  start_2);
 
             tmp5_QS = silk_SMLAWB( tmp4_QS, tmp3_QS - tmp6_QS, warping_Q16 );
-            corr_QC[  i+1 ] = MIPS_MADD( corr_QC[  i+1 ], tmp6_QS,  start_3);
+            corr_QC[  i + 1 ] = MIPS_MADD( corr_QC[  i + 1 ], tmp6_QS,  start_3);
 
             tmp7_QS = silk_SMLAWB( tmp6_QS, tmp5_QS - tmp8_QS, warping_Q16 );
             state_QS[ i + 1 ]  = tmp8_QS;
-            corr_QC[  i+1 ] = MIPS_MADD( corr_QC[  i+1 ], tmp8_QS,  state_QS[ 0 ]);
+            corr_QC[  i + 1 ] = MIPS_MADD( corr_QC[  i + 1 ], tmp8_QS,  state_QS[ 0 ]);
 
         }
         state_QS[ order ] = tmp7_QS;
@@ -136,12 +136,12 @@ void silk_warped_autocorrelation_FIX_c(
         corr_QC[  order ] = MIPS_MADD( corr_QC[  order ], tmp7_QS,  state_QS[ 0 ]);
     }
 
-    for(;n< length; n++ ) {
+    for (; n < length; n++) {
 
-        tmp1_QS = silk_LSHIFT32( (oac_int32)input[ n ], QS );
+        tmp1_QS = silk_LSHIFT32((oac_int32)input[ n ], QS );
 
         /* Loop over allpass sections */
-        for( i = 0; i < order; i += 2 ) {
+        for (i = 0; i < order; i += 2) {
 
             /* Output of allpass section */
             tmp2_QS = silk_SMLAWB( state_QS[ i ], state_QS[ i + 1 ] - tmp1_QS, warping_Q16 );
@@ -151,7 +151,7 @@ void silk_warped_autocorrelation_FIX_c(
             /* Output of allpass section */
             tmp1_QS = silk_SMLAWB( state_QS[ i + 1 ], state_QS[ i + 2 ] - tmp2_QS, warping_Q16 );
             state_QS[ i + 1 ]  = tmp2_QS;
-            corr_QC[  i+1 ] = MIPS_MADD( corr_QC[  i+1 ], tmp2_QS,   state_QS[ 0 ]);
+            corr_QC[  i + 1 ] = MIPS_MADD( corr_QC[  i + 1 ], tmp2_QS,   state_QS[ 0 ]);
         }
         state_QS[ order ] = tmp1_QS;
         corr_QC[  order ] = MIPS_MADD( corr_QC[  order ], tmp1_QS,   state_QS[ 0 ]);
@@ -162,27 +162,27 @@ void silk_warped_autocorrelation_FIX_c(
 
     lsh = silk_CLZ64( temp64 ) - 35;
     lsh = silk_LIMIT( lsh, -12 - QC, 30 - QC );
-    *scale = -( QC + lsh );
+    *scale = -(QC + lsh);
     silk_assert( *scale >= -30 && *scale <= 12 );
-    if( lsh >= 0 ) {
-        for( i = 0; i < order + 1; i++ ) {
+    if (lsh >= 0) {
+        for (i = 0; i < order + 1; i++) {
             temp64 = corr_QC[ i ];
             //temp64 = MIPS_SHILO(temp64, val);
-            temp64 = (val >= 0) ? (temp64 >> val) : (temp64 << -val);
-            corr[ i ] = (oac_int32)silk_CHECK_FIT32( MIPS_SHILO( temp64, -lsh ) );
+            temp64 = (val >= 0) ? (temp64>>val) : (temp64<< -val);
+            corr[ i ] = (oac_int32)silk_CHECK_FIT32( MIPS_SHILO( temp64, -lsh ));
         }
     } else {
-        for( i = 0; i < order + 1; i++ ) {
+        for (i = 0; i < order + 1; i++) {
             temp64 = corr_QC[ i ];
             //temp64 = MIPS_SHILO(temp64, val);
-            temp64 = (val >= 0) ? (temp64 >> val) : (temp64 << -val);
-            corr[ i ] = (oac_int32)silk_CHECK_FIT32( MIPS_SHILO( temp64, -lsh ) );
+            temp64 = (val >= 0) ? (temp64>>val) : (temp64<< -val);
+            corr[ i ] = (oac_int32)silk_CHECK_FIT32( MIPS_SHILO( temp64, -lsh ));
         }
     }
 
-     corr_QC[ 0 ] = MIPS_SHILO(corr_QC[ 0 ], val);
+    corr_QC[ 0 ] = MIPS_SHILO(corr_QC[ 0 ], val);
 
-     silk_assert( corr_QC[ 0 ] >= 0 ); /* If breaking, decrease QC*/
+    silk_assert( corr_QC[ 0 ] >= 0 );  /* If breaking, decrease QC*/
 }
 #endif /* OVERRIDE_silk_warped_autocorrelation_FIX_c */
 
diff --git a/silk/fixed/noise_shape_analysis_FIX.c b/silk/fixed/noise_shape_analysis_FIX.c
index 5bc28dc93..4af2414d3 100644
--- a/silk/fixed/noise_shape_analysis_FIX.c
+++ b/silk/fixed/noise_shape_analysis_FIX.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FIX.h"
@@ -39,15 +39,14 @@ POSSIBILITY OF SUCH DAMAGE.
 /* coefficient in an array of coefficients, for monic filters.                                    */
 static OAC_INLINE oac_int32 warped_gain( /* gain in Q16*/
     const oac_int32     *coefs_Q24,
-    oac_int             lambda_Q16,
-    oac_int             order
-) {
-    oac_int   i;
+    oac_int lambda_Q16,
+    oac_int order) {
+    oac_int i;
     oac_int32 gain_Q24;
 
     lambda_Q16 = -lambda_Q16;
     gain_Q24 = coefs_Q24[ order - 1 ];
-    for( i = order - 2; i >= 0; i-- ) {
+    for (i = order - 2; i >= 0; i--) {
         gain_Q24 = silk_SMLAWB( coefs_Q24[ i ], gain_Q24, lambda_Q16 );
     }
     gain_Q24  = silk_SMLAWB( SILK_FIX_CONST( 1.0, 24 ), gain_Q24, -lambda_Q16 );
@@ -58,70 +57,70 @@ static OAC_INLINE oac_int32 warped_gain( /* gain in Q16*/
 /* amplitude of monic warped coefficients by using bandwidth expansion on the true coefficients */
 static OAC_INLINE void limit_warped_coefs(
     oac_int32           *coefs_Q24,
-    oac_int             lambda_Q16,
-    oac_int32           limit_Q24,
-    oac_int             order
-) {
-    oac_int   i, iter, ind = 0;
+    oac_int lambda_Q16,
+    oac_int32 limit_Q24,
+    oac_int order) {
+    oac_int i, iter, ind = 0;
     oac_int32 tmp, maxabs_Q24, chirp_Q16, gain_Q16;
     oac_int32 nom_Q16, den_Q24;
     oac_int32 limit_Q20, maxabs_Q20;
 
     /* Convert to monic coefficients */
     lambda_Q16 = -lambda_Q16;
-    for( i = order - 1; i > 0; i-- ) {
+    for (i = order - 1; i > 0; i--) {
         coefs_Q24[ i - 1 ] = silk_SMLAWB( coefs_Q24[ i - 1 ], coefs_Q24[ i ], lambda_Q16 );
     }
     lambda_Q16 = -lambda_Q16;
     nom_Q16  = silk_SMLAWB( SILK_FIX_CONST( 1.0, 16 ), -(oac_int32)lambda_Q16, lambda_Q16 );
     den_Q24  = silk_SMLAWB( SILK_FIX_CONST( 1.0, 24 ), coefs_Q24[ 0 ], lambda_Q16 );
     gain_Q16 = silk_DIV32_varQ( nom_Q16, den_Q24, 24 );
-    for( i = 0; i < order; i++ ) {
+    for (i = 0; i < order; i++) {
         coefs_Q24[ i ] = silk_SMULWW( gain_Q16, coefs_Q24[ i ] );
     }
     limit_Q20 = silk_RSHIFT(limit_Q24, 4);
-    for( iter = 0; iter < 10; iter++ ) {
+    for (iter = 0; iter < 10; iter++) {
         /* Find maximum absolute value */
         maxabs_Q24 = -1;
-        for( i = 0; i < order; i++ ) {
+        for (i = 0; i < order; i++) {
             tmp = silk_abs_int32( coefs_Q24[ i ] );
-            if( tmp > maxabs_Q24 ) {
+            if (tmp > maxabs_Q24) {
                 maxabs_Q24 = tmp;
                 ind = i;
             }
         }
         /* Use Q20 to avoid any overflow when multiplying by (ind + 1) later. */
         maxabs_Q20 = silk_RSHIFT(maxabs_Q24, 4);
-        if( maxabs_Q20 <= limit_Q20 ) {
+        if (maxabs_Q20 <= limit_Q20) {
             /* Coefficients are within range - done */
             return;
         }
 
         /* Convert back to true warped coefficients */
-        for( i = 1; i < order; i++ ) {
+        for (i = 1; i < order; i++) {
             coefs_Q24[ i - 1 ] = silk_SMLAWB( coefs_Q24[ i - 1 ], coefs_Q24[ i ], lambda_Q16 );
         }
         gain_Q16 = silk_INVERSE32_varQ( gain_Q16, 32 );
-        for( i = 0; i < order; i++ ) {
+        for (i = 0; i < order; i++) {
             coefs_Q24[ i ] = silk_SMULWW( gain_Q16, coefs_Q24[ i ] );
         }
 
         /* Apply bandwidth expansion */
         chirp_Q16 = SILK_FIX_CONST( 0.99, 16 ) - silk_DIV32_varQ(
-            silk_SMULWB( maxabs_Q20 - limit_Q20, silk_SMLABB( SILK_FIX_CONST( 0.8, 10 ), SILK_FIX_CONST( 0.1, 10 ), iter ) ),
+            silk_SMULWB( maxabs_Q20 - limit_Q20,
+        silk_SMLABB( SILK_FIX_CONST( 0.8, 10 ), SILK_FIX_CONST( 0.1, 10 ), iter )),
             silk_MUL( maxabs_Q20, ind + 1 ), 22 );
         silk_bwexpander_32( coefs_Q24, order, chirp_Q16 );
 
         /* Convert to monic warped coefficients */
         lambda_Q16 = -lambda_Q16;
-        for( i = order - 1; i > 0; i-- ) {
+        for (i = order - 1; i > 0; i--) {
             coefs_Q24[ i - 1 ] = silk_SMLAWB( coefs_Q24[ i - 1 ], coefs_Q24[ i ], lambda_Q16 );
         }
         lambda_Q16 = -lambda_Q16;
         nom_Q16  = silk_SMLAWB( SILK_FIX_CONST( 1.0, 16 ), -(oac_int32)lambda_Q16,        lambda_Q16 );
         den_Q24  = silk_SMLAWB( SILK_FIX_CONST( 1.0, 24 ), coefs_Q24[ 0 ], lambda_Q16 );
         gain_Q16 = silk_DIV32_varQ( nom_Q16, den_Q24, 24 );
-        for( i = 0; i < order; i++ ) {
+        for (i = 0; i < order; i++) {
             coefs_Q24[ i ] = silk_SMULWW( gain_Q16, coefs_Q24[ i ] );
         }
     }
@@ -136,17 +135,16 @@ void silk_noise_shape_analysis_FIX(
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  Encoder control FIX                                                         */
     const oac_int16                *pitch_res,                             /* I    LPC residual from pitch analysis                                            */
     const oac_int16                *x,                                     /* I    Input signal [ frame_length + la_shape ]                                    */
-    int                              arch                                   /* I    Run-time architecture                                                       */
-)
-{
+    int arch                                                                /* I    Run-time architecture                                                       */
+    ) {
     silk_shape_state_FIX *psShapeSt = &psEnc->sShape;
-    oac_int     k, i, nSamples, nSegs, Qnrg, b_Q14, warping_Q16, scale = 0;
-    oac_int32   SNR_adj_dB_Q7, HarmShapeGain_Q16, Tilt_Q16, tmp32;
-    oac_int32   nrg, log_energy_Q7, log_energy_prev_Q7, energy_variation_Q7;
-    oac_int32   BWExp_Q16, gain_mult_Q16, gain_add_Q16, strength_Q16, b_Q8;
-    oac_int32   auto_corr[     MAX_SHAPE_LPC_ORDER + 1 ];
-    oac_int32   refl_coef_Q16[ MAX_SHAPE_LPC_ORDER ];
-    oac_int32   AR_Q24[       MAX_SHAPE_LPC_ORDER ];
+    oac_int k, i, nSamples, nSegs, Qnrg, b_Q14, warping_Q16, scale = 0;
+    oac_int32 SNR_adj_dB_Q7, HarmShapeGain_Q16, Tilt_Q16, tmp32;
+    oac_int32 nrg, log_energy_Q7, log_energy_prev_Q7, energy_variation_Q7;
+    oac_int32 BWExp_Q16, gain_mult_Q16, gain_add_Q16, strength_Q16, b_Q8;
+    oac_int32 auto_corr[     MAX_SHAPE_LPC_ORDER + 1 ];
+    oac_int32 refl_coef_Q16[ MAX_SHAPE_LPC_ORDER ];
+    oac_int32 AR_Q24[       MAX_SHAPE_LPC_ORDER ];
     VARDECL( oac_int16, x_windowed );
     const oac_int16 *x_ptr, *pitch_res_ptr;
     SAVE_STACK;
@@ -160,23 +158,23 @@ void silk_noise_shape_analysis_FIX(
     SNR_adj_dB_Q7 = psEnc->sCmn.SNR_dB_Q7;
 
     /* Input quality is the average of the quality in the lowest two VAD bands */
-    psEncCtrl->input_quality_Q14 = ( oac_int )silk_RSHIFT( (oac_int32)psEnc->sCmn.input_quality_bands_Q15[ 0 ]
+    psEncCtrl->input_quality_Q14 = ( oac_int )silk_RSHIFT((oac_int32)psEnc->sCmn.input_quality_bands_Q15[ 0 ]
         + psEnc->sCmn.input_quality_bands_Q15[ 1 ], 2 );
 
     /* Coding quality level, between 0.0_Q0 and 1.0_Q0, but in Q14 */
-    psEncCtrl->coding_quality_Q14 = silk_RSHIFT( silk_sigm_Q15( silk_RSHIFT_ROUND( SNR_adj_dB_Q7 -
-        SILK_FIX_CONST( 20.0, 7 ), 4 ) ), 1 );
+    psEncCtrl->coding_quality_Q14 = silk_RSHIFT( silk_sigm_Q15( silk_RSHIFT_ROUND( SNR_adj_dB_Q7
+        - SILK_FIX_CONST( 20.0, 7 ), 4 )), 1 );
 
     /* Reduce coding SNR during low speech activity */
-    if( psEnc->sCmn.useCBR == 0 ) {
+    if (psEnc->sCmn.useCBR == 0) {
         b_Q8 = SILK_FIX_CONST( 1.0, 8 ) - psEnc->sCmn.speech_activity_Q8;
         b_Q8 = silk_SMULWB( silk_LSHIFT( b_Q8, 8 ), b_Q8 );
         SNR_adj_dB_Q7 = silk_SMLAWB( SNR_adj_dB_Q7,
-            silk_SMULBB( SILK_FIX_CONST( -BG_SNR_DECR_dB, 7 ) >> ( 4 + 1 ), b_Q8 ),                                       /* Q11*/
-            silk_SMULWB( SILK_FIX_CONST( 1.0, 14 ) + psEncCtrl->input_quality_Q14, psEncCtrl->coding_quality_Q14 ) );     /* Q12*/
+            silk_SMULBB( SILK_FIX_CONST( -BG_SNR_DECR_dB, 7 )>>(4 + 1), b_Q8 ),                                           /* Q11*/
+            silk_SMULWB( SILK_FIX_CONST( 1.0, 14 ) + psEncCtrl->input_quality_Q14, psEncCtrl->coding_quality_Q14 ));      /* Q12*/
     }
 
-    if( psEnc->sCmn.indices.signalType == TYPE_VOICED ) {
+    if (psEnc->sCmn.indices.signalType == TYPE_VOICED) {
         /* Reduce gains for periodic signals */
         SNR_adj_dB_Q7 = silk_SMLAWB( SNR_adj_dB_Q7, SILK_FIX_CONST( HARM_SNR_INCR_dB, 8 ), psEnc->LTPCorr_Q15 );
     } else {
@@ -190,7 +188,7 @@ void silk_noise_shape_analysis_FIX(
     /* SPARSENESS PROCESSING */
     /*************************/
     /* Set quantizer offset */
-    if( psEnc->sCmn.indices.signalType == TYPE_VOICED ) {
+    if (psEnc->sCmn.indices.signalType == TYPE_VOICED) {
         /* Initially set to 0; may be overruled in process_gains(..) */
         psEnc->sCmn.indices.quantOffsetType = 0;
     } else {
@@ -199,13 +197,13 @@ void silk_noise_shape_analysis_FIX(
         energy_variation_Q7 = 0;
         log_energy_prev_Q7  = 0;
         pitch_res_ptr = pitch_res;
-        nSegs = silk_SMULBB( SUB_FRAME_LENGTH_MS, psEnc->sCmn.nb_subfr ) / 2;
-        for( k = 0; k < nSegs; k++ ) {
+        nSegs = silk_SMULBB( SUB_FRAME_LENGTH_MS, psEnc->sCmn.nb_subfr )/2;
+        for (k = 0; k < nSegs; k++) {
             silk_sum_sqr_shift( &nrg, &scale, pitch_res_ptr, nSamples );
             nrg += silk_RSHIFT( nSamples, scale );           /* Q(-scale)*/
 
             log_energy_Q7 = silk_lin2log( nrg );
-            if( k > 0 ) {
+            if (k > 0) {
                 energy_variation_Q7 += silk_abs( log_energy_Q7 - log_energy_prev_Q7 );
             }
             log_energy_prev_Q7 = log_energy_Q7;
@@ -213,7 +211,7 @@ void silk_noise_shape_analysis_FIX(
         }
 
         /* Set quantization offset depending on sparseness measure */
-        if( energy_variation_Q7 > SILK_FIX_CONST( ENERGY_VARIATION_THRESHOLD_QNT_OFFSET, 7 ) * (nSegs-1) ) {
+        if (energy_variation_Q7 > SILK_FIX_CONST( ENERGY_VARIATION_THRESHOLD_QNT_OFFSET, 7 )*(nSegs - 1)) {
             psEnc->sCmn.indices.quantOffsetType = 0;
         } else {
             psEnc->sCmn.indices.quantOffsetType = 1;
@@ -224,13 +222,14 @@ void silk_noise_shape_analysis_FIX(
     /* Control bandwidth expansion */
     /*******************************/
     /* More BWE for signals with high prediction gain */
-    strength_Q16 = silk_SMULWB( psEncCtrl->predGain_Q16, SILK_FIX_CONST( FIND_PITCH_WHITE_NOISE_FRACTION, 16 ) );
+    strength_Q16 = silk_SMULWB( psEncCtrl->predGain_Q16, SILK_FIX_CONST( FIND_PITCH_WHITE_NOISE_FRACTION, 16 ));
     BWExp_Q16 = silk_DIV32_varQ( SILK_FIX_CONST( BANDWIDTH_EXPANSION, 16 ),
         silk_SMLAWW( SILK_FIX_CONST( 1.0, 16 ), strength_Q16, strength_Q16 ), 16 );
 
-    if( psEnc->sCmn.warping_Q16 > 0 ) {
+    if (psEnc->sCmn.warping_Q16 > 0) {
         /* Slightly more warping in analysis will move quantization noise up in frequency, where it's better masked */
-        warping_Q16 = silk_SMLAWB( psEnc->sCmn.warping_Q16, (oac_int32)psEncCtrl->coding_quality_Q14, SILK_FIX_CONST( 0.01, 18 ) );
+        warping_Q16 = silk_SMLAWB( psEnc->sCmn.warping_Q16, (oac_int32)psEncCtrl->coding_quality_Q14,
+        SILK_FIX_CONST( 0.01, 18 ));
     } else {
         warping_Q16 = 0;
     }
@@ -239,32 +238,34 @@ void silk_noise_shape_analysis_FIX(
     /* Compute noise shaping AR coefs and gains */
     /********************************************/
     ALLOC( x_windowed, psEnc->sCmn.shapeWinLength, oac_int16 );
-    for( k = 0; k < psEnc->sCmn.nb_subfr; k++ ) {
+    for (k = 0; k < psEnc->sCmn.nb_subfr; k++) {
         /* Apply window: sine slope followed by flat part followed by cosine slope */
         oac_int shift, slope_part, flat_part;
-        flat_part = psEnc->sCmn.fs_kHz * 3;
+        flat_part = psEnc->sCmn.fs_kHz*3;
         slope_part = silk_RSHIFT( psEnc->sCmn.shapeWinLength - flat_part, 1 );
 
         silk_apply_sine_window( x_windowed, x_ptr, 1, slope_part );
         shift = slope_part;
-        silk_memcpy( x_windowed + shift, x_ptr + shift, flat_part * sizeof(oac_int16) );
+        silk_memcpy( x_windowed + shift, x_ptr + shift, flat_part*sizeof(oac_int16));
         shift += flat_part;
         silk_apply_sine_window( x_windowed + shift, x_ptr + shift, 2, slope_part );
 
         /* Update pointer: next LPC analysis block */
         x_ptr += psEnc->sCmn.subfr_length;
 
-        if( psEnc->sCmn.warping_Q16 > 0 ) {
+        if (psEnc->sCmn.warping_Q16 > 0) {
             /* Calculate warped auto correlation */
-            silk_warped_autocorrelation_FIX( auto_corr, &scale, x_windowed, warping_Q16, psEnc->sCmn.shapeWinLength, psEnc->sCmn.shapingLPCOrder, arch );
+            silk_warped_autocorrelation_FIX( auto_corr, &scale, x_windowed, warping_Q16, psEnc->sCmn.shapeWinLength,
+            psEnc->sCmn.shapingLPCOrder, arch );
         } else {
             /* Calculate regular auto correlation */
-            silk_autocorr( auto_corr, &scale, x_windowed, psEnc->sCmn.shapeWinLength, psEnc->sCmn.shapingLPCOrder + 1, arch );
+            silk_autocorr( auto_corr, &scale, x_windowed, psEnc->sCmn.shapeWinLength, psEnc->sCmn.shapingLPCOrder + 1,
+            arch );
         }
 
         /* Add white noise, as a fraction of energy */
         auto_corr[0] = silk_ADD32( auto_corr[0], silk_max_32( silk_SMULWB( silk_RSHIFT( auto_corr[ 0 ], 4 ),
-            SILK_FIX_CONST( SHAPE_WHITE_NOISE_FRACTION, 20 ) ), 1 ) );
+            SILK_FIX_CONST( SHAPE_WHITE_NOISE_FRACTION, 20 )), 1 ));
 
         /* Calculate the reflection coefficients using schur */
         nrg = silk_schur64( refl_coef_Q16, auto_corr, psEnc->sCmn.shapingLPCOrder );
@@ -278,7 +279,7 @@ void silk_noise_shape_analysis_FIX(
         silk_assert( Qnrg <=  30 );
 
         /* Make sure that Qnrg is an even number */
-        if( Qnrg & 1 ) {
+        if (Qnrg&1) {
             Qnrg -= 1;
             nrg >>= 1;
         }
@@ -288,15 +289,16 @@ void silk_noise_shape_analysis_FIX(
 
         psEncCtrl->Gains_Q16[ k ] = silk_LSHIFT_SAT32( tmp32, 16 - Qnrg );
 
-        if( psEnc->sCmn.warping_Q16 > 0 ) {
+        if (psEnc->sCmn.warping_Q16 > 0) {
             /* Adjust gain for warping */
             gain_mult_Q16 = warped_gain( AR_Q24, warping_Q16, psEnc->sCmn.shapingLPCOrder );
             silk_assert( psEncCtrl->Gains_Q16[ k ] > 0 );
-            if( psEncCtrl->Gains_Q16[ k ] < SILK_FIX_CONST( 0.25, 16 ) ) {
+            if (psEncCtrl->Gains_Q16[ k ] < SILK_FIX_CONST( 0.25, 16 )) {
                 psEncCtrl->Gains_Q16[ k ] = silk_SMULWW( psEncCtrl->Gains_Q16[ k ], gain_mult_Q16 );
             } else {
-                psEncCtrl->Gains_Q16[ k ] = silk_SMULWW( silk_RSHIFT_ROUND( psEncCtrl->Gains_Q16[ k ], 1 ), gain_mult_Q16 );
-                if ( psEncCtrl->Gains_Q16[ k ] >= ( silk_int32_MAX >> 1 ) ) {
+                psEncCtrl->Gains_Q16[ k ] = silk_SMULWW( silk_RSHIFT_ROUND( psEncCtrl->Gains_Q16[ k ], 1 ),
+                gain_mult_Q16 );
+                if (psEncCtrl->Gains_Q16[ k ] >= (silk_int32_MAX>>1)) {
                     psEncCtrl->Gains_Q16[ k ] = silk_int32_MAX;
                 } else {
                     psEncCtrl->Gains_Q16[ k ] = silk_LSHIFT32( psEncCtrl->Gains_Q16[ k ], 1 );
@@ -308,16 +310,17 @@ void silk_noise_shape_analysis_FIX(
         /* Bandwidth expansion */
         silk_bwexpander_32( AR_Q24, psEnc->sCmn.shapingLPCOrder, BWExp_Q16 );
 
-        if( psEnc->sCmn.warping_Q16 > 0 ) {
+        if (psEnc->sCmn.warping_Q16 > 0) {
             /* Convert to monic warped prediction coefficients and limit absolute values */
             limit_warped_coefs( AR_Q24, warping_Q16, SILK_FIX_CONST( 3.999, 24 ), psEnc->sCmn.shapingLPCOrder );
 
             /* Convert from Q24 to Q13 and store in int16 */
-            for( i = 0; i < psEnc->sCmn.shapingLPCOrder; i++ ) {
-                psEncCtrl->AR_Q13[ k * MAX_SHAPE_LPC_ORDER + i ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( AR_Q24[ i ], 11 ) );
+            for (i = 0; i < psEnc->sCmn.shapingLPCOrder; i++) {
+                psEncCtrl->AR_Q13[ k*MAX_SHAPE_LPC_ORDER + i ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( AR_Q24[ i ],
+                11 ));
             }
         } else {
-            silk_LPC_fit( &psEncCtrl->AR_Q13[ k * MAX_SHAPE_LPC_ORDER ], AR_Q24, 13, 24, psEnc->sCmn.shapingLPCOrder );
+            silk_LPC_fit( &psEncCtrl->AR_Q13[ k*MAX_SHAPE_LPC_ORDER ], AR_Q24, 13, 24, psEnc->sCmn.shapingLPCOrder );
         }
     }
 
@@ -325,10 +328,11 @@ void silk_noise_shape_analysis_FIX(
     /* Gain tweaking */
     /*****************/
     /* Increase gains during low speech activity and put lower limit on gains */
-    gain_mult_Q16 = silk_log2lin( -silk_SMLAWB( -SILK_FIX_CONST( 16.0, 7 ), SNR_adj_dB_Q7, SILK_FIX_CONST( 0.16, 16 ) ) );
-    gain_add_Q16  = silk_log2lin(  silk_SMLAWB(  SILK_FIX_CONST( 16.0, 7 ), SILK_FIX_CONST( MIN_QGAIN_DB, 7 ), SILK_FIX_CONST( 0.16, 16 ) ) );
+    gain_mult_Q16 = silk_log2lin( -silk_SMLAWB( -SILK_FIX_CONST( 16.0, 7 ), SNR_adj_dB_Q7, SILK_FIX_CONST( 0.16, 16 )));
+    gain_add_Q16  = silk_log2lin(  silk_SMLAWB(  SILK_FIX_CONST( 16.0, 7 ), SILK_FIX_CONST( MIN_QGAIN_DB, 7 ),
+    SILK_FIX_CONST( 0.16, 16 )));
     silk_assert( gain_mult_Q16 > 0 );
-    for( k = 0; k < psEnc->sCmn.nb_subfr; k++ ) {
+    for (k = 0; k < psEnc->sCmn.nb_subfr; k++) {
         psEncCtrl->Gains_Q16[ k ] = silk_SMULWW( psEncCtrl->Gains_Q16[ k ], gain_mult_Q16 );
         silk_assert( psEncCtrl->Gains_Q16[ k ] >= 0 );
         psEncCtrl->Gains_Q16[ k ] = silk_ADD_POS_SAT32( psEncCtrl->Gains_Q16[ k ], gain_add_Q16 );
@@ -340,29 +344,31 @@ void silk_noise_shape_analysis_FIX(
     /************************************************/
     /* Less low frequency shaping for noisy inputs */
     strength_Q16 = silk_MUL( SILK_FIX_CONST( LOW_FREQ_SHAPING, 4 ), silk_SMLAWB( SILK_FIX_CONST( 1.0, 12 ),
-        SILK_FIX_CONST( LOW_QUALITY_LOW_FREQ_SHAPING_DECR, 13 ), psEnc->sCmn.input_quality_bands_Q15[ 0 ] - SILK_FIX_CONST( 1.0, 15 ) ) );
+        SILK_FIX_CONST( LOW_QUALITY_LOW_FREQ_SHAPING_DECR, 13 ),
+    psEnc->sCmn.input_quality_bands_Q15[ 0 ] - SILK_FIX_CONST( 1.0, 15 )));
     strength_Q16 = silk_RSHIFT( silk_MUL( strength_Q16, psEnc->sCmn.speech_activity_Q8 ), 8 );
-    if( psEnc->sCmn.indices.signalType == TYPE_VOICED ) {
+    if (psEnc->sCmn.indices.signalType == TYPE_VOICED) {
         /* Reduce low frequencies quantization noise for periodic signals, depending on pitch lag */
         /*f = 400; freqz([1, -0.98 + 2e-4 * f], [1, -0.97 + 7e-4 * f], 2^12, Fs); axis([0, 1000, -10, 1])*/
         oac_int fs_kHz_inv = silk_DIV32_16( SILK_FIX_CONST( 0.2, 14 ), psEnc->sCmn.fs_kHz );
-        for( k = 0; k < psEnc->sCmn.nb_subfr; k++ ) {
+        for (k = 0; k < psEnc->sCmn.nb_subfr; k++) {
             b_Q14 = fs_kHz_inv + silk_DIV32_16( SILK_FIX_CONST( 3.0, 14 ), psEncCtrl->pitchL[ k ] );
             /* Pack two coefficients in one int32 */
-            psEncCtrl->LF_shp_Q14[ k ]  = silk_LSHIFT( SILK_FIX_CONST( 1.0, 14 ) - b_Q14 - silk_SMULWB( strength_Q16, b_Q14 ), 16 );
-            psEncCtrl->LF_shp_Q14[ k ] |= (oac_uint16)( b_Q14 - SILK_FIX_CONST( 1.0, 14 ) );
+            psEncCtrl->LF_shp_Q14[ k ]  = silk_LSHIFT( SILK_FIX_CONST( 1.0, 14 ) - b_Q14 - silk_SMULWB( strength_Q16,
+            b_Q14 ), 16 );
+            psEncCtrl->LF_shp_Q14[ k ] |= (oac_uint16)(b_Q14 - SILK_FIX_CONST( 1.0, 14 ));
         }
-        silk_assert( SILK_FIX_CONST( HARM_HP_NOISE_COEF, 24 ) < SILK_FIX_CONST( 0.5, 24 ) ); /* Guarantees that second argument to SMULWB() is within range of an oac_int16*/
-        Tilt_Q16 = - SILK_FIX_CONST( HP_NOISE_COEF, 16 ) -
-            silk_SMULWB( SILK_FIX_CONST( 1.0, 16 ) - SILK_FIX_CONST( HP_NOISE_COEF, 16 ),
-                silk_SMULWB( SILK_FIX_CONST( HARM_HP_NOISE_COEF, 24 ), psEnc->sCmn.speech_activity_Q8 ) );
+        silk_assert( SILK_FIX_CONST( HARM_HP_NOISE_COEF, 24 ) < SILK_FIX_CONST( 0.5, 24 ));  /* Guarantees that second argument to SMULWB() is within range of an oac_int16*/
+        Tilt_Q16 = -SILK_FIX_CONST( HP_NOISE_COEF, 16 )
+                   - silk_SMULWB( SILK_FIX_CONST( 1.0, 16 ) - SILK_FIX_CONST( HP_NOISE_COEF, 16 ),
+                silk_SMULWB( SILK_FIX_CONST( HARM_HP_NOISE_COEF, 24 ), psEnc->sCmn.speech_activity_Q8 ));
     } else {
         b_Q14 = silk_DIV32_16( 21299, psEnc->sCmn.fs_kHz ); /* 1.3_Q0 = 21299_Q14*/
         /* Pack two coefficients in one int32 */
-        psEncCtrl->LF_shp_Q14[ 0 ]  = silk_LSHIFT( SILK_FIX_CONST( 1.0, 14 ) - b_Q14 -
-            silk_SMULWB( strength_Q16, silk_SMULWB( SILK_FIX_CONST( 0.6, 16 ), b_Q14 ) ), 16 );
-        psEncCtrl->LF_shp_Q14[ 0 ] |= (oac_uint16)( b_Q14 - SILK_FIX_CONST( 1.0, 14 ) );
-        for( k = 1; k < psEnc->sCmn.nb_subfr; k++ ) {
+        psEncCtrl->LF_shp_Q14[ 0 ]  = silk_LSHIFT( SILK_FIX_CONST( 1.0, 14 ) - b_Q14
+            - silk_SMULWB( strength_Q16, silk_SMULWB( SILK_FIX_CONST( 0.6, 16 ), b_Q14 )), 16 );
+        psEncCtrl->LF_shp_Q14[ 0 ] |= (oac_uint16)(b_Q14 - SILK_FIX_CONST( 1.0, 14 ));
+        for (k = 1; k < psEnc->sCmn.nb_subfr; k++) {
             psEncCtrl->LF_shp_Q14[ k ] = psEncCtrl->LF_shp_Q14[ 0 ];
         }
         Tilt_Q16 = -SILK_FIX_CONST( HP_NOISE_COEF, 16 );
@@ -371,15 +377,16 @@ void silk_noise_shape_analysis_FIX(
     /****************************/
     /* HARMONIC SHAPING CONTROL */
     /****************************/
-    if( USE_HARM_SHAPING && psEnc->sCmn.indices.signalType == TYPE_VOICED ) {
+    if (USE_HARM_SHAPING && psEnc->sCmn.indices.signalType == TYPE_VOICED) {
         /* More harmonic noise shaping for high bitrates or noisy input */
         HarmShapeGain_Q16 = silk_SMLAWB( SILK_FIX_CONST( HARMONIC_SHAPING, 16 ),
-                SILK_FIX_CONST( 1.0, 16 ) - silk_SMULWB( SILK_FIX_CONST( 1.0, 18 ) - silk_LSHIFT( psEncCtrl->coding_quality_Q14, 4 ),
-                psEncCtrl->input_quality_Q14 ), SILK_FIX_CONST( HIGH_RATE_OR_LOW_QUALITY_HARMONIC_SHAPING, 16 ) );
+                SILK_FIX_CONST( 1.0,
+        16 ) - silk_SMULWB( SILK_FIX_CONST( 1.0, 18 ) - silk_LSHIFT( psEncCtrl->coding_quality_Q14, 4 ),
+                psEncCtrl->input_quality_Q14 ), SILK_FIX_CONST( HIGH_RATE_OR_LOW_QUALITY_HARMONIC_SHAPING, 16 ));
 
         /* Less harmonic noise shaping for less periodic signals */
         HarmShapeGain_Q16 = silk_SMULWB( silk_LSHIFT( HarmShapeGain_Q16, 1 ),
-            silk_SQRT_APPROX( silk_LSHIFT( psEnc->LTPCorr_Q15, 15 ) ) );
+            silk_SQRT_APPROX( silk_LSHIFT( psEnc->LTPCorr_Q15, 15 )));
     } else {
         HarmShapeGain_Q16 = 0;
     }
@@ -387,11 +394,13 @@ void silk_noise_shape_analysis_FIX(
     /*************************/
     /* Smooth over subframes */
     /*************************/
-    for( k = 0; k < MAX_NB_SUBFR; k++ ) {
+    for (k = 0; k < MAX_NB_SUBFR; k++) {
         psShapeSt->HarmShapeGain_smth_Q16 =
-            silk_SMLAWB( psShapeSt->HarmShapeGain_smth_Q16, HarmShapeGain_Q16 - psShapeSt->HarmShapeGain_smth_Q16, SILK_FIX_CONST( SUBFR_SMTH_COEF, 16 ) );
+            silk_SMLAWB( psShapeSt->HarmShapeGain_smth_Q16, HarmShapeGain_Q16 - psShapeSt->HarmShapeGain_smth_Q16,
+        SILK_FIX_CONST( SUBFR_SMTH_COEF, 16 ));
         psShapeSt->Tilt_smth_Q16 =
-            silk_SMLAWB( psShapeSt->Tilt_smth_Q16,          Tilt_Q16          - psShapeSt->Tilt_smth_Q16,          SILK_FIX_CONST( SUBFR_SMTH_COEF, 16 ) );
+            silk_SMLAWB( psShapeSt->Tilt_smth_Q16,          Tilt_Q16          - psShapeSt->Tilt_smth_Q16,
+        SILK_FIX_CONST( SUBFR_SMTH_COEF, 16 ));
 
         psEncCtrl->HarmShapeGain_Q14[ k ] = ( oac_int )silk_RSHIFT_ROUND( psShapeSt->HarmShapeGain_smth_Q16, 2 );
         psEncCtrl->Tilt_Q14[ k ]          = ( oac_int )silk_RSHIFT_ROUND( psShapeSt->Tilt_smth_Q16,          2 );
diff --git a/silk/fixed/pitch_analysis_core_FIX.c b/silk/fixed/pitch_analysis_core_FIX.c
index cb4fd5802..1f4635375 100644
--- a/silk/fixed/pitch_analysis_core_FIX.c
+++ b/silk/fixed/pitch_analysis_core_FIX.c
@@ -1,37 +1,37 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 /***********************************************************
-* Pitch analyser function
-********************************************************** */
+ * Pitch analyser function
+ ********************************************************** */
 #include "SigProc_FIX.h"
 #include "pitch_est_defines.h"
 #include "stack_alloc.h"
@@ -39,17 +39,17 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "pitch.h"
 
 #define SCRATCH_SIZE    22
-#define SF_LENGTH_4KHZ  ( PE_SUBFR_LENGTH_MS * 4 )
-#define SF_LENGTH_8KHZ  ( PE_SUBFR_LENGTH_MS * 8 )
-#define MIN_LAG_4KHZ    ( PE_MIN_LAG_MS * 4 )
-#define MIN_LAG_8KHZ    ( PE_MIN_LAG_MS * 8 )
-#define MAX_LAG_4KHZ    ( PE_MAX_LAG_MS * 4 )
-#define MAX_LAG_8KHZ    ( PE_MAX_LAG_MS * 8 - 1 )
-#define CSTRIDE_4KHZ    ( MAX_LAG_4KHZ + 1 - MIN_LAG_4KHZ )
-#define CSTRIDE_8KHZ    ( MAX_LAG_8KHZ + 3 - ( MIN_LAG_8KHZ - 2 ) )
-#define D_COMP_MIN      ( MIN_LAG_8KHZ - 3 )
-#define D_COMP_MAX      ( MAX_LAG_8KHZ + 4 )
-#define D_COMP_STRIDE   ( D_COMP_MAX - D_COMP_MIN )
+#define SF_LENGTH_4KHZ  (PE_SUBFR_LENGTH_MS*4)
+#define SF_LENGTH_8KHZ  (PE_SUBFR_LENGTH_MS*8)
+#define MIN_LAG_4KHZ    (PE_MIN_LAG_MS*4)
+#define MIN_LAG_8KHZ    (PE_MIN_LAG_MS*8)
+#define MAX_LAG_4KHZ    (PE_MAX_LAG_MS*4)
+#define MAX_LAG_8KHZ    (PE_MAX_LAG_MS*8 - 1)
+#define CSTRIDE_4KHZ    (MAX_LAG_4KHZ + 1 - MIN_LAG_4KHZ)
+#define CSTRIDE_8KHZ    (MAX_LAG_8KHZ + 3 - (MIN_LAG_8KHZ - 2))
+#define D_COMP_MIN      (MIN_LAG_8KHZ - 3)
+#define D_COMP_MAX      (MAX_LAG_8KHZ + 4)
+#define D_COMP_STRIDE   (D_COMP_MAX - D_COMP_MIN)
 
 typedef oac_int32 silk_pe_stage3_vals[ PE_NB_STAGE3_LAGS ];
 
@@ -58,23 +58,23 @@ typedef oac_int32 silk_pe_stage3_vals[ PE_NB_STAGE3_LAGS ];
 /************************************************************/
 static void silk_P_Ana_calc_corr_st3(
     silk_pe_stage3_vals cross_corr_st3[],              /* O 3 DIM correlation array */
-    const oac_int16  frame[],                         /* I vector to correlate         */
-    oac_int          start_lag,                       /* I lag offset to search around */
-    oac_int          sf_length,                       /* I length of a 5 ms subframe   */
-    oac_int          nb_subfr,                        /* I number of subframes         */
-    oac_int          complexity,                      /* I Complexity setting          */
-    int               arch                             /* I Run-time architecture       */
-);
+    const oac_int16 frame[],                          /* I vector to correlate         */
+    oac_int start_lag,                                /* I lag offset to search around */
+    oac_int sf_length,                                /* I length of a 5 ms subframe   */
+    oac_int nb_subfr,                                 /* I number of subframes         */
+    oac_int complexity,                               /* I Complexity setting          */
+    int arch                                           /* I Run-time architecture       */
+    );
 
 static void silk_P_Ana_calc_energy_st3(
     silk_pe_stage3_vals energies_st3[],                /* O 3 DIM energy array */
-    const oac_int16  frame[],                         /* I vector to calc energy in    */
-    oac_int          start_lag,                       /* I lag offset to search around */
-    oac_int          sf_length,                       /* I length of one 5 ms subframe */
-    oac_int          nb_subfr,                        /* I number of subframes         */
-    oac_int          complexity,                      /* I Complexity setting          */
-    int               arch                             /* I Run-time architecture       */
-);
+    const oac_int16 frame[],                          /* I vector to calc energy in    */
+    oac_int start_lag,                                /* I lag offset to search around */
+    oac_int sf_length,                                /* I length of one 5 ms subframe */
+    oac_int nb_subfr,                                 /* I number of subframes         */
+    oac_int complexity,                               /* I Complexity setting          */
+    int arch                                           /* I Run-time architecture       */
+    );
 
 /*************************************************************/
 /*      FIXED POINT CORE PITCH ANALYSIS FUNCTION             */
@@ -85,38 +85,37 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
     oac_int16                  *lagIndex,          /* O    Lag Index                                                   */
     oac_int8                   *contourIndex,      /* O    Pitch contour Index                                         */
     oac_int                    *LTPCorr_Q15,       /* I/O  Normalized correlation; input: value from previous frame    */
-    oac_int                    prevLag,            /* I    Last lag of previous frame; set to zero is unvoiced         */
-    const oac_int32            search_thres1_Q16,  /* I    First stage threshold for lag candidates 0 - 1              */
-    const oac_int              search_thres2_Q13,  /* I    Final threshold for lag candidates 0 - 1                    */
-    const oac_int              Fs_kHz,             /* I    Sample frequency (kHz)                                      */
-    const oac_int              complexity,         /* I    Complexity setting, 0-2, where 2 is highest                 */
-    const oac_int              nb_subfr,           /* I    number of 5 ms subframes                                    */
-    int                         arch                /* I    Run-time architecture                                       */
-)
-{
+    oac_int prevLag,                               /* I    Last lag of previous frame; set to zero is unvoiced         */
+    const oac_int32 search_thres1_Q16,             /* I    First stage threshold for lag candidates 0 - 1              */
+    const oac_int search_thres2_Q13,               /* I    Final threshold for lag candidates 0 - 1                    */
+    const oac_int Fs_kHz,                          /* I    Sample frequency (kHz)                                      */
+    const oac_int complexity,                      /* I    Complexity setting, 0-2, where 2 is highest                 */
+    const oac_int nb_subfr,                        /* I    number of 5 ms subframes                                    */
+    int arch                                        /* I    Run-time architecture                                       */
+    ) {
     VARDECL( oac_int16, frame_8kHz_buf );
     VARDECL( oac_int16, frame_4kHz );
     VARDECL( oac_int16, frame_scaled );
     oac_int32 filt_state[ 6 ];
     const oac_int16 *frame, *frame_8kHz;
-    oac_int   i, k, d, j;
+    oac_int i, k, d, j;
     VARDECL( oac_int16, C );
     VARDECL( oac_int32, xcorr32 );
     const oac_int16 *target_ptr, *basis_ptr;
     oac_int32 cross_corr, normalizer, energy, energy_basis, energy_target;
-    oac_int   d_srch[ PE_D_SRCH_LENGTH ], Cmax, length_d_srch, length_d_comp, shift;
+    oac_int d_srch[ PE_D_SRCH_LENGTH ], Cmax, length_d_srch, length_d_comp, shift;
     VARDECL( oac_int16, d_comp );
     oac_int32 sum, threshold, lag_counter;
-    oac_int   CBimax, CBimax_new, CBimax_old, lag, start_lag, end_lag, lag_new;
+    oac_int CBimax, CBimax_new, CBimax_old, lag, start_lag, end_lag, lag_new;
     oac_int32 CC[ PE_NB_CBKS_STAGE2_EXT ], CCmax, CCmax_b, CCmax_new_b, CCmax_new;
     VARDECL( silk_pe_stage3_vals, energies_st3 );
     VARDECL( silk_pe_stage3_vals, cross_corr_st3 );
-    oac_int   frame_length, frame_length_8kHz, frame_length_4kHz;
-    oac_int   sf_length;
-    oac_int   min_lag;
-    oac_int   max_lag;
+    oac_int frame_length, frame_length_8kHz, frame_length_4kHz;
+    oac_int sf_length;
+    oac_int min_lag;
+    oac_int max_lag;
     oac_int32 contour_bias_Q15, diff;
-    oac_int   nb_cbk_search, cbk_size;
+    oac_int nb_cbk_search, cbk_size;
     oac_int32 delta_lag_log2_sqr_Q7, lag_log2_Q7, prevLag_log2_Q7, prev_lag_bias_Q13;
     const oac_int8 *Lag_CB_ptr;
     SAVE_STACK;
@@ -128,24 +127,24 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
     celt_assert( complexity >= SILK_PE_MIN_COMPLEX );
     celt_assert( complexity <= SILK_PE_MAX_COMPLEX );
 
-    silk_assert( search_thres1_Q16 >= 0 && search_thres1_Q16 <= (1<<16) );
-    silk_assert( search_thres2_Q13 >= 0 && search_thres2_Q13 <= (1<<13) );
+    silk_assert( search_thres1_Q16 >= 0 && search_thres1_Q16 <= (1<<16));
+    silk_assert( search_thres2_Q13 >= 0 && search_thres2_Q13 <= (1<<13));
 
     /* Set up frame lengths max / min lag for the sampling frequency */
-    frame_length      = ( PE_LTP_MEM_LENGTH_MS + nb_subfr * PE_SUBFR_LENGTH_MS ) * Fs_kHz;
-    frame_length_4kHz = ( PE_LTP_MEM_LENGTH_MS + nb_subfr * PE_SUBFR_LENGTH_MS ) * 4;
-    frame_length_8kHz = ( PE_LTP_MEM_LENGTH_MS + nb_subfr * PE_SUBFR_LENGTH_MS ) * 8;
-    sf_length         = PE_SUBFR_LENGTH_MS * Fs_kHz;
-    min_lag           = PE_MIN_LAG_MS * Fs_kHz;
-    max_lag           = PE_MAX_LAG_MS * Fs_kHz - 1;
+    frame_length      = (PE_LTP_MEM_LENGTH_MS + nb_subfr*PE_SUBFR_LENGTH_MS)*Fs_kHz;
+    frame_length_4kHz = (PE_LTP_MEM_LENGTH_MS + nb_subfr*PE_SUBFR_LENGTH_MS)*4;
+    frame_length_8kHz = (PE_LTP_MEM_LENGTH_MS + nb_subfr*PE_SUBFR_LENGTH_MS)*8;
+    sf_length         = PE_SUBFR_LENGTH_MS*Fs_kHz;
+    min_lag           = PE_MIN_LAG_MS*Fs_kHz;
+    max_lag           = PE_MAX_LAG_MS*Fs_kHz - 1;
 
     /* Downscale input if necessary */
     silk_sum_sqr_shift( &energy, &shift, frame_unscaled, frame_length );
     shift += 3 - silk_CLZ32( energy );        /* at least two bits headroom */
     ALLOC( frame_scaled, frame_length, oac_int16 );
-    if( shift > 0 ) {
+    if (shift > 0) {
         shift = silk_RSHIFT( shift + 1, 1 );
-        for( i = 0; i < frame_length; i++ ) {
+        for (i = 0; i < frame_length; i++) {
             frame_scaled[ i ] = silk_RSHIFT( frame_unscaled[ i ], shift );
         }
         frame = frame_scaled;
@@ -153,14 +152,14 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
         frame = frame_unscaled;
     }
 
-    ALLOC( frame_8kHz_buf, ( Fs_kHz == 8 ) ? 1 : frame_length_8kHz, oac_int16 );
+    ALLOC( frame_8kHz_buf, (Fs_kHz == 8) ? 1 : frame_length_8kHz, oac_int16 );
     /* Resample from input sampled at Fs_kHz to 8 kHz */
-    if( Fs_kHz == 16 ) {
-        silk_memset( filt_state, 0, 2 * sizeof( oac_int32 ) );
+    if (Fs_kHz == 16) {
+        silk_memset( filt_state, 0, 2*sizeof(oac_int32));
         silk_resampler_down2( filt_state, frame_8kHz_buf, frame, frame_length );
         frame_8kHz = frame_8kHz_buf;
-    } else if( Fs_kHz == 12 ) {
-        silk_memset( filt_state, 0, 6 * sizeof( oac_int32 ) );
+    } else if (Fs_kHz == 12) {
+        silk_memset( filt_state, 0, 6*sizeof(oac_int32));
         silk_resampler_down2_3( filt_state, frame_8kHz_buf, frame, frame_length );
         frame_8kHz = frame_8kHz_buf;
     } else {
@@ -169,12 +168,12 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
     }
 
     /* Decimate again to 4 kHz */
-    silk_memset( filt_state, 0, 2 * sizeof( oac_int32 ) );/* Set state to zero */
+    silk_memset( filt_state, 0, 2*sizeof(oac_int32));     /* Set state to zero */
     ALLOC( frame_4kHz, frame_length_4kHz, oac_int16 );
     silk_resampler_down2( filt_state, frame_4kHz, frame_8kHz, frame_length_8kHz );
 
     /* Low-pass filter */
-    for( i = frame_length_4kHz - 1; i > 0; i-- ) {
+    for (i = frame_length_4kHz - 1; i > 0; i--) {
         frame_4kHz[ i ] = silk_ADD_SAT16( frame_4kHz[ i ], frame_4kHz[ i - 1 ] );
     }
 
@@ -182,11 +181,11 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
     /******************************************************************************
     * FIRST STAGE, operating in 4 khz
     ******************************************************************************/
-    ALLOC( C, nb_subfr * CSTRIDE_8KHZ, oac_int16 );
-    ALLOC( xcorr32, MAX_LAG_4KHZ-MIN_LAG_4KHZ+1, oac_int32 );
-    silk_memset( C, 0, (nb_subfr >> 1) * CSTRIDE_4KHZ * sizeof( oac_int16 ) );
+    ALLOC( C, nb_subfr*CSTRIDE_8KHZ, oac_int16 );
+    ALLOC( xcorr32, MAX_LAG_4KHZ - MIN_LAG_4KHZ + 1, oac_int32 );
+    silk_memset( C, 0, (nb_subfr>>1)*CSTRIDE_4KHZ*sizeof(oac_int16));
     target_ptr = &frame_4kHz[ silk_LSHIFT( SF_LENGTH_4KHZ, 2 ) ];
-    for( k = 0; k < nb_subfr >> 1; k++ ) {
+    for (k = 0; k < nb_subfr>>1; k++) {
         /* Check that we are within range of the array */
         celt_assert( target_ptr >= frame_4kHz );
         celt_assert( target_ptr + SF_LENGTH_8KHZ <= frame_4kHz + frame_length_4kHz );
@@ -197,19 +196,20 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
         celt_assert( basis_ptr >= frame_4kHz );
         celt_assert( basis_ptr + SF_LENGTH_8KHZ <= frame_4kHz + frame_length_4kHz );
 
-        celt_pitch_xcorr( target_ptr, target_ptr - MAX_LAG_4KHZ, xcorr32, SF_LENGTH_8KHZ, MAX_LAG_4KHZ - MIN_LAG_4KHZ + 1, arch );
+        celt_pitch_xcorr( target_ptr, target_ptr - MAX_LAG_4KHZ, xcorr32, SF_LENGTH_8KHZ,
+        MAX_LAG_4KHZ - MIN_LAG_4KHZ + 1, arch );
 
         /* Calculate first vector products before loop */
         cross_corr = xcorr32[ MAX_LAG_4KHZ - MIN_LAG_4KHZ ];
         normalizer = silk_inner_prod_aligned( target_ptr, target_ptr, SF_LENGTH_8KHZ, arch );
-        normalizer = silk_ADD32( normalizer, silk_inner_prod_aligned( basis_ptr,  basis_ptr, SF_LENGTH_8KHZ, arch ) );
-        normalizer = silk_ADD32( normalizer, silk_SMULBB( SF_LENGTH_8KHZ, 4000 ) );
+        normalizer = silk_ADD32( normalizer, silk_inner_prod_aligned( basis_ptr,  basis_ptr, SF_LENGTH_8KHZ, arch ));
+        normalizer = silk_ADD32( normalizer, silk_SMULBB( SF_LENGTH_8KHZ, 4000 ));
 
         matrix_ptr( C, k, 0, CSTRIDE_4KHZ ) =
             (oac_int16)silk_DIV32_varQ( cross_corr, normalizer, 13 + 1 );                      /* Q13 */
 
         /* From now on normalizer is computed recursively */
-        for( d = MIN_LAG_4KHZ + 1; d <= MAX_LAG_4KHZ; d++ ) {
+        for (d = MIN_LAG_4KHZ + 1; d <= MAX_LAG_4KHZ; d++) {
             basis_ptr--;
 
             /* Check that we are within range of the array */
@@ -220,8 +220,8 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
 
             /* Add contribution of new sample and remove contribution from oldest sample */
             normalizer = silk_ADD32( normalizer,
-                silk_SMULBB( basis_ptr[ 0 ], basis_ptr[ 0 ] ) -
-                silk_SMULBB( basis_ptr[ SF_LENGTH_8KHZ ], basis_ptr[ SF_LENGTH_8KHZ ] ) );
+                silk_SMULBB( basis_ptr[ 0 ], basis_ptr[ 0 ] )
+                - silk_SMULBB( basis_ptr[ SF_LENGTH_8KHZ ], basis_ptr[ SF_LENGTH_8KHZ ] ));
 
             matrix_ptr( C, k, d - MIN_LAG_4KHZ, CSTRIDE_4KHZ) =
                 (oac_int16)silk_DIV32_varQ( cross_corr, normalizer, 13 + 1 );                  /* Q13 */
@@ -231,32 +231,32 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
     }
 
     /* Combine two subframes into single correlation measure and apply short-lag bias */
-    if( nb_subfr == PE_MAX_NB_SUBFR ) {
-        for( i = MAX_LAG_4KHZ; i >= MIN_LAG_4KHZ; i-- ) {
+    if (nb_subfr == PE_MAX_NB_SUBFR) {
+        for (i = MAX_LAG_4KHZ; i >= MIN_LAG_4KHZ; i--) {
             sum = (oac_int32)matrix_ptr( C, 0, i - MIN_LAG_4KHZ, CSTRIDE_4KHZ )
-                + (oac_int32)matrix_ptr( C, 1, i - MIN_LAG_4KHZ, CSTRIDE_4KHZ );               /* Q14 */
-            sum = silk_SMLAWB( sum, sum, silk_LSHIFT( -i, 4 ) );                                /* Q14 */
+                  + (oac_int32)matrix_ptr( C, 1, i - MIN_LAG_4KHZ, CSTRIDE_4KHZ );             /* Q14 */
+            sum = silk_SMLAWB( sum, sum, silk_LSHIFT( -i, 4 ));                                 /* Q14 */
             C[ i - MIN_LAG_4KHZ ] = (oac_int16)sum;                                            /* Q14 */
         }
     } else {
         /* Only short-lag bias */
-        for( i = MAX_LAG_4KHZ; i >= MIN_LAG_4KHZ; i-- ) {
-            sum = silk_LSHIFT( (oac_int32)C[ i - MIN_LAG_4KHZ ], 1 );                          /* Q14 */
-            sum = silk_SMLAWB( sum, sum, silk_LSHIFT( -i, 4 ) );                                /* Q14 */
+        for (i = MAX_LAG_4KHZ; i >= MIN_LAG_4KHZ; i--) {
+            sum = silk_LSHIFT((oac_int32)C[ i - MIN_LAG_4KHZ ], 1 );                           /* Q14 */
+            sum = silk_SMLAWB( sum, sum, silk_LSHIFT( -i, 4 ));                                 /* Q14 */
             C[ i - MIN_LAG_4KHZ ] = (oac_int16)sum;                                            /* Q14 */
         }
     }
 
     /* Sort */
     length_d_srch = silk_ADD_LSHIFT32( 4, complexity, 1 );
-    celt_assert( 3 * length_d_srch <= PE_D_SRCH_LENGTH );
+    celt_assert( 3*length_d_srch <= PE_D_SRCH_LENGTH );
     silk_insertion_sort_decreasing_int16( C, d_srch, CSTRIDE_4KHZ,
                                           length_d_srch );
 
     /* Escape if correlation is very low already here */
     Cmax = (oac_int)C[ 0 ];                                                    /* Q14 */
-    if( Cmax < SILK_FIX_CONST( 0.2, 14 ) ) {
-        silk_memset( pitch_out, 0, nb_subfr * sizeof( oac_int ) );
+    if (Cmax < SILK_FIX_CONST( 0.2, 14 )) {
+        silk_memset( pitch_out, 0, nb_subfr*sizeof(oac_int));
         *LTPCorr_Q15  = 0;
         *lagIndex     = 0;
         *contourIndex = 0;
@@ -265,9 +265,9 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
     }
 
     threshold = silk_SMULWB( search_thres1_Q16, Cmax );
-    for( i = 0; i < length_d_srch; i++ ) {
+    for (i = 0; i < length_d_srch; i++) {
         /* Convert to 8 kHz indices for the sorted correlation that exceeds the threshold */
-        if( C[ i ] > threshold ) {
+        if (C[ i ] > threshold) {
             d_srch[ i ] = silk_LSHIFT( d_srch[ i ] + MIN_LAG_4KHZ, 1 );
         } else {
             length_d_srch = i;
@@ -277,36 +277,36 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
     celt_assert( length_d_srch > 0 );
 
     ALLOC( d_comp, D_COMP_STRIDE, oac_int16 );
-    for( i = D_COMP_MIN; i < D_COMP_MAX; i++ ) {
+    for (i = D_COMP_MIN; i < D_COMP_MAX; i++) {
         d_comp[ i - D_COMP_MIN ] = 0;
     }
-    for( i = 0; i < length_d_srch; i++ ) {
+    for (i = 0; i < length_d_srch; i++) {
         d_comp[ d_srch[ i ] - D_COMP_MIN ] = 1;
     }
 
     /* Convolution */
-    for( i = D_COMP_MAX - 1; i >= MIN_LAG_8KHZ; i-- ) {
+    for (i = D_COMP_MAX - 1; i >= MIN_LAG_8KHZ; i--) {
         d_comp[ i - D_COMP_MIN ] +=
             d_comp[ i - 1 - D_COMP_MIN ] + d_comp[ i - 2 - D_COMP_MIN ];
     }
 
     length_d_srch = 0;
-    for( i = MIN_LAG_8KHZ; i < MAX_LAG_8KHZ + 1; i++ ) {
-        if( d_comp[ i + 1 - D_COMP_MIN ] > 0 ) {
+    for (i = MIN_LAG_8KHZ; i < MAX_LAG_8KHZ + 1; i++) {
+        if (d_comp[ i + 1 - D_COMP_MIN ] > 0) {
             d_srch[ length_d_srch ] = i;
             length_d_srch++;
         }
     }
 
     /* Convolution */
-    for( i = D_COMP_MAX - 1; i >= MIN_LAG_8KHZ; i-- ) {
+    for (i = D_COMP_MAX - 1; i >= MIN_LAG_8KHZ; i--) {
         d_comp[ i - D_COMP_MIN ] += d_comp[ i - 1 - D_COMP_MIN ]
-            + d_comp[ i - 2 - D_COMP_MIN ] + d_comp[ i - 3 - D_COMP_MIN ];
+                                    + d_comp[ i - 2 - D_COMP_MIN ] + d_comp[ i - 3 - D_COMP_MIN ];
     }
 
     length_d_comp = 0;
-    for( i = MIN_LAG_8KHZ; i < D_COMP_MAX; i++ ) {
-        if( d_comp[ i - D_COMP_MIN ] > 0 ) {
+    for (i = MIN_LAG_8KHZ; i < D_COMP_MAX; i++) {
+        if (d_comp[ i - D_COMP_MIN ] > 0) {
             d_comp[ length_d_comp ] = i - 2;
             length_d_comp++;
         }
@@ -319,17 +319,17 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
     /*********************************************************************************
     * Find energy of each subframe projected onto its history, for a range of delays
     *********************************************************************************/
-    silk_memset( C, 0, nb_subfr * CSTRIDE_8KHZ * sizeof( oac_int16 ) );
+    silk_memset( C, 0, nb_subfr*CSTRIDE_8KHZ*sizeof(oac_int16));
 
-    target_ptr = &frame_8kHz[ PE_LTP_MEM_LENGTH_MS * 8 ];
-    for( k = 0; k < nb_subfr; k++ ) {
+    target_ptr = &frame_8kHz[ PE_LTP_MEM_LENGTH_MS*8 ];
+    for (k = 0; k < nb_subfr; k++) {
 
         /* Check that we are within range of the array */
         celt_assert( target_ptr >= frame_8kHz );
         celt_assert( target_ptr + SF_LENGTH_8KHZ <= frame_8kHz + frame_length_8kHz );
 
         energy_target = silk_ADD32( silk_inner_prod_aligned( target_ptr, target_ptr, SF_LENGTH_8KHZ, arch ), 1 );
-        for( j = 0; j < length_d_comp; j++ ) {
+        for (j = 0; j < length_d_comp; j++) {
             d = d_comp[ j ];
             basis_ptr = target_ptr - d;
 
@@ -338,15 +338,15 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
             silk_assert( basis_ptr + SF_LENGTH_8KHZ <= frame_8kHz + frame_length_8kHz );
 
             cross_corr = silk_inner_prod_aligned( target_ptr, basis_ptr, SF_LENGTH_8KHZ, arch );
-            if( cross_corr > 0 ) {
+            if (cross_corr > 0) {
                 energy_basis = silk_inner_prod_aligned( basis_ptr, basis_ptr, SF_LENGTH_8KHZ, arch );
-                matrix_ptr( C, k, d - ( MIN_LAG_8KHZ - 2 ), CSTRIDE_8KHZ ) =
+                matrix_ptr( C, k, d - (MIN_LAG_8KHZ - 2), CSTRIDE_8KHZ ) =
                     (oac_int16)silk_DIV32_varQ( cross_corr,
                                                  silk_ADD32( energy_target,
                                                              energy_basis ),
                                                  13 + 1 );                                      /* Q13 */
             } else {
-                matrix_ptr( C, k, d - ( MIN_LAG_8KHZ - 2 ), CSTRIDE_8KHZ ) = 0;
+                matrix_ptr( C, k, d - (MIN_LAG_8KHZ - 2), CSTRIDE_8KHZ ) = 0;
             }
         }
         target_ptr += SF_LENGTH_8KHZ;
@@ -361,22 +361,22 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
     CBimax = 0; /* To avoid returning undefined lag values */
     lag = -1;   /* To check if lag with strong enough correlation has been found */
 
-    if( prevLag > 0 ) {
-        if( Fs_kHz == 12 ) {
+    if (prevLag > 0) {
+        if (Fs_kHz == 12) {
             prevLag = silk_DIV32_16( silk_LSHIFT( prevLag, 1 ), 3 );
-        } else if( Fs_kHz == 16 ) {
+        } else if (Fs_kHz == 16) {
             prevLag = silk_RSHIFT( prevLag, 1 );
         }
-        prevLag_log2_Q7 = silk_lin2log( (oac_int32)prevLag );
+        prevLag_log2_Q7 = silk_lin2log((oac_int32)prevLag );
     } else {
         prevLag_log2_Q7 = 0;
     }
-    silk_assert( search_thres2_Q13 == silk_SAT16( search_thres2_Q13 ) );
+    silk_assert( search_thres2_Q13 == silk_SAT16( search_thres2_Q13 ));
     /* Set up stage 2 codebook based on number of subframes */
-    if( nb_subfr == PE_MAX_NB_SUBFR ) {
+    if (nb_subfr == PE_MAX_NB_SUBFR) {
         cbk_size   = PE_NB_CBKS_STAGE2_EXT;
         Lag_CB_ptr = &silk_CB_lags_stage2[ 0 ][ 0 ];
-        if( Fs_kHz == 8 && complexity > SILK_PE_MIN_COMPLEX ) {
+        if (Fs_kHz == 8 && complexity > SILK_PE_MIN_COMPLEX) {
             /* If input is 8 khz use a larger codebook here because it is last stage */
             nb_cbk_search = PE_NB_CBKS_STAGE2_EXT;
         } else {
@@ -388,25 +388,25 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
         nb_cbk_search  = PE_NB_CBKS_STAGE2_10MS;
     }
 
-    for( k = 0; k < length_d_srch; k++ ) {
+    for (k = 0; k < length_d_srch; k++) {
         d = d_srch[ k ];
-        for( j = 0; j < nb_cbk_search; j++ ) {
+        for (j = 0; j < nb_cbk_search; j++) {
             CC[ j ] = 0;
-            for( i = 0; i < nb_subfr; i++ ) {
+            for (i = 0; i < nb_subfr; i++) {
                 oac_int d_subfr;
                 /* Try all codebooks */
                 d_subfr = d + matrix_ptr( Lag_CB_ptr, i, j, cbk_size );
                 CC[ j ] = CC[ j ]
-                    + (oac_int32)matrix_ptr( C, i,
-                                              d_subfr - ( MIN_LAG_8KHZ - 2 ),
+                          + (oac_int32)matrix_ptr( C, i,
+                                              d_subfr - (MIN_LAG_8KHZ - 2),
                                               CSTRIDE_8KHZ );
             }
         }
         /* Find best codebook */
         CCmax_new = silk_int32_MIN;
         CBimax_new = 0;
-        for( i = 0; i < nb_cbk_search; i++ ) {
-            if( CC[ i ] > CCmax_new ) {
+        for (i = 0; i < nb_cbk_search; i++) {
+            if (CC[ i ] > CCmax_new) {
                 CCmax_new = CC[ i ];
                 CBimax_new = i;
             }
@@ -414,25 +414,30 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
 
         /* Bias towards shorter lags */
         lag_log2_Q7 = silk_lin2log( d ); /* Q7 */
-        silk_assert( lag_log2_Q7 == silk_SAT16( lag_log2_Q7 ) );
-        silk_assert( nb_subfr * SILK_FIX_CONST( PE_SHORTLAG_BIAS, 13 ) == silk_SAT16( nb_subfr * SILK_FIX_CONST( PE_SHORTLAG_BIAS, 13 ) ) );
-        CCmax_new_b = CCmax_new - silk_RSHIFT( silk_SMULBB( nb_subfr * SILK_FIX_CONST( PE_SHORTLAG_BIAS, 13 ), lag_log2_Q7 ), 7 ); /* Q13 */
+        silk_assert( lag_log2_Q7 == silk_SAT16( lag_log2_Q7 ));
+        silk_assert( nb_subfr*SILK_FIX_CONST( PE_SHORTLAG_BIAS,
+        13 ) == silk_SAT16( nb_subfr*SILK_FIX_CONST( PE_SHORTLAG_BIAS, 13 )));
+        CCmax_new_b = CCmax_new - silk_RSHIFT( silk_SMULBB( nb_subfr*SILK_FIX_CONST( PE_SHORTLAG_BIAS, 13 ),
+        lag_log2_Q7 ), 7 );                                                                                                        /* Q13 */
 
         /* Bias towards previous lag */
-        silk_assert( nb_subfr * SILK_FIX_CONST( PE_PREVLAG_BIAS, 13 ) == silk_SAT16( nb_subfr * SILK_FIX_CONST( PE_PREVLAG_BIAS, 13 ) ) );
-        if( prevLag > 0 ) {
+        silk_assert( nb_subfr*SILK_FIX_CONST( PE_PREVLAG_BIAS,
+        13 ) == silk_SAT16( nb_subfr*SILK_FIX_CONST( PE_PREVLAG_BIAS, 13 )));
+        if (prevLag > 0) {
             delta_lag_log2_sqr_Q7 = lag_log2_Q7 - prevLag_log2_Q7;
-            silk_assert( delta_lag_log2_sqr_Q7 == silk_SAT16( delta_lag_log2_sqr_Q7 ) );
+            silk_assert( delta_lag_log2_sqr_Q7 == silk_SAT16( delta_lag_log2_sqr_Q7 ));
             delta_lag_log2_sqr_Q7 = silk_RSHIFT( silk_SMULBB( delta_lag_log2_sqr_Q7, delta_lag_log2_sqr_Q7 ), 7 );
-            prev_lag_bias_Q13 = silk_RSHIFT( silk_SMULBB( nb_subfr * SILK_FIX_CONST( PE_PREVLAG_BIAS, 13 ), *LTPCorr_Q15 ), 15 ); /* Q13 */
-            prev_lag_bias_Q13 = silk_DIV32( silk_MUL( prev_lag_bias_Q13, delta_lag_log2_sqr_Q7 ), delta_lag_log2_sqr_Q7 + SILK_FIX_CONST( 0.5, 7 ) );
+            prev_lag_bias_Q13 = silk_RSHIFT( silk_SMULBB( nb_subfr*SILK_FIX_CONST( PE_PREVLAG_BIAS, 13 ),
+            *LTPCorr_Q15 ), 15 );                                                                                                 /* Q13 */
+            prev_lag_bias_Q13 = silk_DIV32( silk_MUL( prev_lag_bias_Q13, delta_lag_log2_sqr_Q7 ),
+            delta_lag_log2_sqr_Q7 + SILK_FIX_CONST( 0.5, 7 ));
             CCmax_new_b -= prev_lag_bias_Q13; /* Q13 */
         }
 
-        if( CCmax_new_b > CCmax_b                                   &&  /* Find maximum biased correlation                  */
-            CCmax_new > silk_SMULBB( nb_subfr, search_thres2_Q13 )  &&  /* Correlation needs to be high enough to be voiced */
-            silk_CB_lags_stage2[ 0 ][ CBimax_new ] <= MIN_LAG_8KHZ      /* Lag must be in range                             */
-         ) {
+        if (CCmax_new_b > CCmax_b                                       /* Find maximum biased correlation                  */
+            && CCmax_new > silk_SMULBB( nb_subfr, search_thres2_Q13 )   /* Correlation needs to be high enough to be voiced */
+            && silk_CB_lags_stage2[ 0 ][ CBimax_new ] <= MIN_LAG_8KHZ   /* Lag must be in range                             */
+            ) {
             CCmax_b = CCmax_new_b;
             CCmax   = CCmax_new;
             lag     = d;
@@ -440,9 +445,9 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
         }
     }
 
-    if( lag == -1 ) {
+    if (lag == -1) {
         /* No suitable candidate found */
-        silk_memset( pitch_out, 0, nb_subfr * sizeof( oac_int ) );
+        silk_memset( pitch_out, 0, nb_subfr*sizeof(oac_int));
         *LTPCorr_Q15  = 0;
         *lagIndex     = 0;
         *contourIndex = 0;
@@ -454,15 +459,15 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
     *LTPCorr_Q15 = (oac_int)silk_LSHIFT( silk_DIV32_16( CCmax, nb_subfr ), 2 );
     silk_assert( *LTPCorr_Q15 >= 0 );
 
-    if( Fs_kHz > 8 ) {
+    if (Fs_kHz > 8) {
         /* Search in original signal */
 
         CBimax_old = CBimax;
         /* Compensate for decimation */
-        silk_assert( lag == silk_SAT16( lag ) );
-        if( Fs_kHz == 12 ) {
+        silk_assert( lag == silk_SAT16( lag ));
+        if (Fs_kHz == 12) {
             lag = silk_RSHIFT( silk_SMULBB( lag, 3 ), 1 );
-        } else if( Fs_kHz == 16 ) {
+        } else if (Fs_kHz == 16) {
             lag = silk_LSHIFT( lag, 1 );
         } else {
             lag = silk_SMULBB( lag, 3 );
@@ -476,12 +481,12 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
 
         CCmax = silk_int32_MIN;
         /* pitch lags according to second stage */
-        for( k = 0; k < nb_subfr; k++ ) {
-            pitch_out[ k ] = lag + 2 * silk_CB_lags_stage2[ k ][ CBimax_old ];
+        for (k = 0; k < nb_subfr; k++) {
+            pitch_out[ k ] = lag + 2*silk_CB_lags_stage2[ k ][ CBimax_old ];
         }
 
         /* Set up codebook parameters according to complexity setting and frame length */
-        if( nb_subfr == PE_MAX_NB_SUBFR ) {
+        if (nb_subfr == PE_MAX_NB_SUBFR) {
             nb_cbk_search   = (oac_int)silk_nb_cbk_searchs_stage3[ complexity ];
             cbk_size        = PE_NB_CBKS_STAGE3_MAX;
             Lag_CB_ptr      = &silk_CB_lags_stage3[ 0 ][ 0 ];
@@ -492,22 +497,22 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
         }
 
         /* Calculate the correlations and energies needed in stage 3 */
-        ALLOC( energies_st3, nb_subfr * nb_cbk_search, silk_pe_stage3_vals );
-        ALLOC( cross_corr_st3, nb_subfr * nb_cbk_search, silk_pe_stage3_vals );
+        ALLOC( energies_st3, nb_subfr*nb_cbk_search, silk_pe_stage3_vals );
+        ALLOC( cross_corr_st3, nb_subfr*nb_cbk_search, silk_pe_stage3_vals );
         silk_P_Ana_calc_corr_st3(  cross_corr_st3, frame, start_lag, sf_length, nb_subfr, complexity, arch );
         silk_P_Ana_calc_energy_st3( energies_st3, frame, start_lag, sf_length, nb_subfr, complexity, arch );
 
         lag_counter = 0;
-        silk_assert( lag == silk_SAT16( lag ) );
+        silk_assert( lag == silk_SAT16( lag ));
         contour_bias_Q15 = silk_DIV32_16( SILK_FIX_CONST( PE_FLATCONTOUR_BIAS, 15 ), lag );
 
-        target_ptr = &frame[ PE_LTP_MEM_LENGTH_MS * Fs_kHz ];
-        energy_target = silk_ADD32( silk_inner_prod_aligned( target_ptr, target_ptr, nb_subfr * sf_length, arch ), 1 );
-        for( d = start_lag; d <= end_lag; d++ ) {
-            for( j = 0; j < nb_cbk_search; j++ ) {
+        target_ptr = &frame[ PE_LTP_MEM_LENGTH_MS*Fs_kHz ];
+        energy_target = silk_ADD32( silk_inner_prod_aligned( target_ptr, target_ptr, nb_subfr*sf_length, arch ), 1 );
+        for (d = start_lag; d <= end_lag; d++) {
+            for (j = 0; j < nb_cbk_search; j++) {
                 cross_corr = 0;
                 energy     = energy_target;
-                for( k = 0; k < nb_subfr; k++ ) {
+                for (k = 0; k < nb_subfr; k++) {
                     cross_corr = silk_ADD32( cross_corr,
                         matrix_ptr( cross_corr_st3, k, j,
                                     nb_cbk_search )[ lag_counter ] );
@@ -516,17 +521,17 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
                                     nb_cbk_search )[ lag_counter ] );
                     silk_assert( energy >= 0 );
                 }
-                if( cross_corr > 0 ) {
+                if (cross_corr > 0) {
                     CCmax_new = silk_DIV32_varQ( cross_corr, energy, 13 + 1 );          /* Q13 */
                     /* Reduce depending on flatness of contour */
                     diff = silk_int16_MAX - silk_MUL( contour_bias_Q15, j );            /* Q15 */
-                    silk_assert( diff == silk_SAT16( diff ) );
+                    silk_assert( diff == silk_SAT16( diff ));
                     CCmax_new = silk_SMULWB( CCmax_new, diff );                         /* Q14 */
                 } else {
                     CCmax_new = 0;
                 }
 
-                if( CCmax_new > CCmax && ( d + silk_CB_lags_stage3[ 0 ][ j ] ) <= max_lag ) {
+                if (CCmax_new > CCmax && (d + silk_CB_lags_stage3[ 0 ][ j ]) <= max_lag) {
                     CCmax   = CCmax_new;
                     lag_new = d;
                     CBimax  = j;
@@ -535,19 +540,19 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
             lag_counter++;
         }
 
-        for( k = 0; k < nb_subfr; k++ ) {
+        for (k = 0; k < nb_subfr; k++) {
             pitch_out[ k ] = lag_new + matrix_ptr( Lag_CB_ptr, k, CBimax, cbk_size );
-            pitch_out[ k ] = silk_LIMIT( pitch_out[ k ], min_lag, PE_MAX_LAG_MS * Fs_kHz );
+            pitch_out[ k ] = silk_LIMIT( pitch_out[ k ], min_lag, PE_MAX_LAG_MS*Fs_kHz );
         }
-        *lagIndex = (oac_int16)( lag_new - min_lag);
+        *lagIndex = (oac_int16)(lag_new - min_lag);
         *contourIndex = (oac_int8)CBimax;
     } else {        /* Fs_kHz == 8 */
         /* Save Lags */
-        for( k = 0; k < nb_subfr; k++ ) {
+        for (k = 0; k < nb_subfr; k++) {
             pitch_out[ k ] = lag + matrix_ptr( Lag_CB_ptr, k, CBimax, cbk_size );
-            pitch_out[ k ] = silk_LIMIT( pitch_out[ k ], MIN_LAG_8KHZ, PE_MAX_LAG_MS * 8 );
+            pitch_out[ k ] = silk_LIMIT( pitch_out[ k ], MIN_LAG_8KHZ, PE_MAX_LAG_MS*8 );
         }
-        *lagIndex = (oac_int16)( lag - MIN_LAG_8KHZ );
+        *lagIndex = (oac_int16)(lag - MIN_LAG_8KHZ);
         *contourIndex = (oac_int8)CBimax;
     }
     celt_assert( *lagIndex >= 0 );
@@ -557,31 +562,30 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
 }
 
 /***********************************************************************
- * Calculates the correlations used in stage 3 search. In order to cover
- * the whole lag codebook for all the searched offset lags (lag +- 2),
- * the following correlations are needed in each sub frame:
- *
- * sf1: lag range [-8,...,7] total 16 correlations
- * sf2: lag range [-4,...,4] total 9 correlations
- * sf3: lag range [-3,....4] total 8 correltions
- * sf4: lag range [-6,....8] total 15 correlations
- *
- * In total 48 correlations. The direct implementation computed in worst
- * case 4*12*5 = 240 correlations, but more likely around 120.
- ***********************************************************************/
+* Calculates the correlations used in stage 3 search. In order to cover
+* the whole lag codebook for all the searched offset lags (lag +- 2),
+* the following correlations are needed in each sub frame:
+*
+* sf1: lag range [-8,...,7] total 16 correlations
+* sf2: lag range [-4,...,4] total 9 correlations
+* sf3: lag range [-3,....4] total 8 correltions
+* sf4: lag range [-6,....8] total 15 correlations
+*
+* In total 48 correlations. The direct implementation computed in worst
+* case 4*12*5 = 240 correlations, but more likely around 120.
+***********************************************************************/
 static void silk_P_Ana_calc_corr_st3(
     silk_pe_stage3_vals cross_corr_st3[],              /* O 3 DIM correlation array */
-    const oac_int16  frame[],                         /* I vector to correlate         */
-    oac_int          start_lag,                       /* I lag offset to search around */
-    oac_int          sf_length,                       /* I length of a 5 ms subframe   */
-    oac_int          nb_subfr,                        /* I number of subframes         */
-    oac_int          complexity,                      /* I Complexity setting          */
-    int               arch                             /* I Run-time architecture       */
-)
-{
+    const oac_int16 frame[],                          /* I vector to correlate         */
+    oac_int start_lag,                                /* I lag offset to search around */
+    oac_int sf_length,                                /* I length of a 5 ms subframe   */
+    oac_int nb_subfr,                                 /* I number of subframes         */
+    oac_int complexity,                               /* I Complexity setting          */
+    int arch                                           /* I Run-time architecture       */
+    ) {
     const oac_int16 *target_ptr;
-    oac_int   i, j, k, lag_counter, lag_low, lag_high;
-    oac_int   nb_cbk_search, delta, idx, cbk_size;
+    oac_int i, j, k, lag_counter, lag_low, lag_high;
+    oac_int nb_cbk_search, delta, idx, cbk_size;
     VARDECL( oac_int32, scratch_mem );
     VARDECL( oac_int32, xcorr32 );
     const oac_int8 *Lag_range_ptr, *Lag_CB_ptr;
@@ -590,13 +594,13 @@ static void silk_P_Ana_calc_corr_st3(
     celt_assert( complexity >= SILK_PE_MIN_COMPLEX );
     celt_assert( complexity <= SILK_PE_MAX_COMPLEX );
 
-    if( nb_subfr == PE_MAX_NB_SUBFR ) {
+    if (nb_subfr == PE_MAX_NB_SUBFR) {
         Lag_range_ptr = &silk_Lag_range_stage3[ complexity ][ 0 ][ 0 ];
         Lag_CB_ptr    = &silk_CB_lags_stage3[ 0 ][ 0 ];
         nb_cbk_search = silk_nb_cbk_searchs_stage3[ complexity ];
         cbk_size      = PE_NB_CBKS_STAGE3_MAX;
     } else {
-        celt_assert( nb_subfr == PE_MAX_NB_SUBFR >> 1);
+        celt_assert( nb_subfr == PE_MAX_NB_SUBFR>>1);
         Lag_range_ptr = &silk_Lag_range_stage3_10_ms[ 0 ][ 0 ];
         Lag_CB_ptr    = &silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
         nb_cbk_search = PE_NB_CBKS_STAGE3_10MS;
@@ -606,26 +610,27 @@ static void silk_P_Ana_calc_corr_st3(
     ALLOC( xcorr32, SCRATCH_SIZE, oac_int32 );
 
     target_ptr = &frame[ silk_LSHIFT( sf_length, 2 ) ]; /* Pointer to middle of frame */
-    for( k = 0; k < nb_subfr; k++ ) {
+    for (k = 0; k < nb_subfr; k++) {
         lag_counter = 0;
 
         /* Calculate the correlations for each subframe */
         lag_low  = matrix_ptr( Lag_range_ptr, k, 0, 2 );
         lag_high = matrix_ptr( Lag_range_ptr, k, 1, 2 );
-        celt_assert(lag_high-lag_low+1 <= SCRATCH_SIZE);
-        celt_pitch_xcorr( target_ptr, target_ptr - start_lag - lag_high, xcorr32, sf_length, lag_high - lag_low + 1, arch );
-        for( j = lag_low; j <= lag_high; j++ ) {
+        celt_assert(lag_high - lag_low + 1 <= SCRATCH_SIZE);
+        celt_pitch_xcorr( target_ptr, target_ptr - start_lag - lag_high, xcorr32, sf_length, lag_high - lag_low + 1,
+        arch );
+        for (j = lag_low; j <= lag_high; j++) {
             silk_assert( lag_counter < SCRATCH_SIZE );
             scratch_mem[ lag_counter ] = xcorr32[ lag_high - j ];
             lag_counter++;
         }
 
         delta = matrix_ptr( Lag_range_ptr, k, 0, 2 );
-        for( i = 0; i < nb_cbk_search; i++ ) {
+        for (i = 0; i < nb_cbk_search; i++) {
             /* Fill out the 3 dim array that stores the correlations for */
             /* each code_book vector for each start lag */
             idx = matrix_ptr( Lag_CB_ptr, k, i, cbk_size ) - delta;
-            for( j = 0; j < PE_NB_STAGE3_LAGS; j++ ) {
+            for (j = 0; j < PE_NB_STAGE3_LAGS; j++) {
                 silk_assert( idx + j < SCRATCH_SIZE );
                 silk_assert( idx + j < lag_counter );
                 matrix_ptr( cross_corr_st3, k, i, nb_cbk_search )[ j ] =
@@ -643,18 +648,17 @@ static void silk_P_Ana_calc_corr_st3(
 /********************************************************************/
 static void silk_P_Ana_calc_energy_st3(
     silk_pe_stage3_vals energies_st3[],                 /* O 3 DIM energy array */
-    const oac_int16  frame[],                          /* I vector to calc energy in    */
-    oac_int          start_lag,                        /* I lag offset to search around */
-    oac_int          sf_length,                        /* I length of one 5 ms subframe */
-    oac_int          nb_subfr,                         /* I number of subframes         */
-    oac_int          complexity,                       /* I Complexity setting          */
-    int               arch                              /* I Run-time architecture       */
-)
-{
+    const oac_int16 frame[],                           /* I vector to calc energy in    */
+    oac_int start_lag,                                 /* I lag offset to search around */
+    oac_int sf_length,                                 /* I length of one 5 ms subframe */
+    oac_int nb_subfr,                                  /* I number of subframes         */
+    oac_int complexity,                                /* I Complexity setting          */
+    int arch                                            /* I Run-time architecture       */
+    ) {
     const oac_int16 *target_ptr, *basis_ptr;
     oac_int32 energy;
-    oac_int   k, i, j, lag_counter;
-    oac_int   nb_cbk_search, delta, idx, cbk_size, lag_diff;
+    oac_int k, i, j, lag_counter;
+    oac_int nb_cbk_search, delta, idx, cbk_size, lag_diff;
     VARDECL( oac_int32, scratch_mem );
     const oac_int8 *Lag_range_ptr, *Lag_CB_ptr;
     SAVE_STACK;
@@ -662,13 +666,13 @@ static void silk_P_Ana_calc_energy_st3(
     celt_assert( complexity >= SILK_PE_MIN_COMPLEX );
     celt_assert( complexity <= SILK_PE_MAX_COMPLEX );
 
-    if( nb_subfr == PE_MAX_NB_SUBFR ) {
+    if (nb_subfr == PE_MAX_NB_SUBFR) {
         Lag_range_ptr = &silk_Lag_range_stage3[ complexity ][ 0 ][ 0 ];
         Lag_CB_ptr    = &silk_CB_lags_stage3[ 0 ][ 0 ];
         nb_cbk_search = silk_nb_cbk_searchs_stage3[ complexity ];
         cbk_size      = PE_NB_CBKS_STAGE3_MAX;
     } else {
-        celt_assert( nb_subfr == PE_MAX_NB_SUBFR >> 1);
+        celt_assert( nb_subfr == PE_MAX_NB_SUBFR>>1);
         Lag_range_ptr = &silk_Lag_range_stage3_10_ms[ 0 ][ 0 ];
         Lag_CB_ptr    = &silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
         nb_cbk_search = PE_NB_CBKS_STAGE3_10MS;
@@ -677,24 +681,24 @@ static void silk_P_Ana_calc_energy_st3(
     ALLOC( scratch_mem, SCRATCH_SIZE, oac_int32 );
 
     target_ptr = &frame[ silk_LSHIFT( sf_length, 2 ) ];
-    for( k = 0; k < nb_subfr; k++ ) {
+    for (k = 0; k < nb_subfr; k++) {
         lag_counter = 0;
 
         /* Calculate the energy for first lag */
-        basis_ptr = target_ptr - ( start_lag + matrix_ptr( Lag_range_ptr, k, 0, 2 ) );
+        basis_ptr = target_ptr - (start_lag + matrix_ptr( Lag_range_ptr, k, 0, 2 ));
         energy = silk_inner_prod_aligned( basis_ptr, basis_ptr, sf_length, arch );
         silk_assert( energy >= 0 );
         scratch_mem[ lag_counter ] = energy;
         lag_counter++;
 
-        lag_diff = ( matrix_ptr( Lag_range_ptr, k, 1, 2 ) -  matrix_ptr( Lag_range_ptr, k, 0, 2 ) + 1 );
-        for( i = 1; i < lag_diff; i++ ) {
+        lag_diff = (matrix_ptr( Lag_range_ptr, k, 1, 2 ) -  matrix_ptr( Lag_range_ptr, k, 0, 2 ) + 1);
+        for (i = 1; i < lag_diff; i++) {
             /* remove part outside new window */
             energy -= silk_SMULBB( basis_ptr[ sf_length - i ], basis_ptr[ sf_length - i ] );
             silk_assert( energy >= 0 );
 
             /* add part that comes into window */
-            energy = silk_ADD_SAT32( energy, silk_SMULBB( basis_ptr[ -i ], basis_ptr[ -i ] ) );
+            energy = silk_ADD_SAT32( energy, silk_SMULBB( basis_ptr[ -i ], basis_ptr[ -i ] ));
             silk_assert( energy >= 0 );
             silk_assert( lag_counter < SCRATCH_SIZE );
             scratch_mem[ lag_counter ] = energy;
@@ -702,11 +706,11 @@ static void silk_P_Ana_calc_energy_st3(
         }
 
         delta = matrix_ptr( Lag_range_ptr, k, 0, 2 );
-        for( i = 0; i < nb_cbk_search; i++ ) {
+        for (i = 0; i < nb_cbk_search; i++) {
             /* Fill out the 3 dim array that stores the correlations for    */
             /* each code_book vector for each start lag                     */
             idx = matrix_ptr( Lag_CB_ptr, k, i, cbk_size ) - delta;
-            for( j = 0; j < PE_NB_STAGE3_LAGS; j++ ) {
+            for (j = 0; j < PE_NB_STAGE3_LAGS; j++) {
                 silk_assert( idx + j < SCRATCH_SIZE );
                 silk_assert( idx + j < lag_counter );
                 matrix_ptr( energies_st3, k, i, nb_cbk_search )[ j ] =
diff --git a/silk/fixed/process_gains_FIX.c b/silk/fixed/process_gains_FIX.c
index 5c86f9347..028fa5235 100644
--- a/silk/fixed/process_gains_FIX.c
+++ b/silk/fixed/process_gains_FIX.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FIX.h"
@@ -36,18 +36,17 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_process_gains_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  Encoder control                                                             */
-    oac_int                        condCoding                              /* I    The type of conditional coding to use                                       */
-)
-{
+    oac_int condCoding                                                     /* I    The type of conditional coding to use                                       */
+    ) {
     silk_shape_state_FIX *psShapeSt = &psEnc->sShape;
-    oac_int     k;
-    oac_int32   s_Q16, InvMaxSqrVal_Q16, gain, gain_squared, ResNrg, ResNrgPart, quant_offset_Q10;
+    oac_int k;
+    oac_int32 s_Q16, InvMaxSqrVal_Q16, gain, gain_squared, ResNrg, ResNrgPart, quant_offset_Q10;
 
     /* Gain reduction when LTP coding gain is high */
-    if( psEnc->sCmn.indices.signalType == TYPE_VOICED ) {
+    if (psEnc->sCmn.indices.signalType == TYPE_VOICED) {
         /*s = -0.5f * silk_sigmoid( 0.25f * ( psEncCtrl->LTPredCodGain - 12.0f ) ); */
-        s_Q16 = -silk_sigm_Q15( silk_RSHIFT_ROUND( psEncCtrl->LTPredCodGain_Q7 - SILK_FIX_CONST( 12.0, 7 ), 4 ) );
-        for( k = 0; k < psEnc->sCmn.nb_subfr; k++ ) {
+        s_Q16 = -silk_sigm_Q15( silk_RSHIFT_ROUND( psEncCtrl->LTPredCodGain_Q7 - SILK_FIX_CONST( 12.0, 7 ), 4 ));
+        for (k = 0; k < psEnc->sCmn.nb_subfr; k++) {
             psEncCtrl->Gains_Q16[ k ] = silk_SMLAWB( psEncCtrl->Gains_Q16[ k ], psEncCtrl->Gains_Q16[ k ], s_Q16 );
         }
     }
@@ -55,39 +54,40 @@ void silk_process_gains_FIX(
     /* Limit the quantized signal */
     /* InvMaxSqrVal = pow( 2.0f, 0.33f * ( 21.0f - SNR_dB ) ) / subfr_length; */
     InvMaxSqrVal_Q16 = silk_DIV32_16( silk_log2lin(
-        silk_SMULWB( SILK_FIX_CONST( 21 + 16 / 0.33, 7 ) - psEnc->sCmn.SNR_dB_Q7, SILK_FIX_CONST( 0.33, 16 ) ) ), psEnc->sCmn.subfr_length );
+        silk_SMULWB( SILK_FIX_CONST( 21 + 16/0.33, 7 ) - psEnc->sCmn.SNR_dB_Q7, SILK_FIX_CONST( 0.33, 16 ))),
+    psEnc->sCmn.subfr_length );
 
-    for( k = 0; k < psEnc->sCmn.nb_subfr; k++ ) {
+    for (k = 0; k < psEnc->sCmn.nb_subfr; k++) {
         /* Soft limit on ratio residual energy and squared gains */
         ResNrg     = psEncCtrl->ResNrg[ k ];
         ResNrgPart = silk_SMULWW( ResNrg, InvMaxSqrVal_Q16 );
-        if( psEncCtrl->ResNrgQ[ k ] > 0 ) {
+        if (psEncCtrl->ResNrgQ[ k ] > 0) {
             ResNrgPart = silk_RSHIFT_ROUND( ResNrgPart, psEncCtrl->ResNrgQ[ k ] );
         } else {
-            if( ResNrgPart >= silk_RSHIFT( silk_int32_MAX, -psEncCtrl->ResNrgQ[ k ] ) ) {
+            if (ResNrgPart >= silk_RSHIFT( silk_int32_MAX, -psEncCtrl->ResNrgQ[ k ] )) {
                 ResNrgPart = silk_int32_MAX;
             } else {
                 ResNrgPart = silk_LSHIFT( ResNrgPart, -psEncCtrl->ResNrgQ[ k ] );
             }
         }
         gain = psEncCtrl->Gains_Q16[ k ];
-        gain_squared = silk_ADD_SAT32( ResNrgPart, silk_SMMUL( gain, gain ) );
-        if( gain_squared < silk_int16_MAX ) {
+        gain_squared = silk_ADD_SAT32( ResNrgPart, silk_SMMUL( gain, gain ));
+        if (gain_squared < silk_int16_MAX) {
             /* recalculate with higher precision */
             gain_squared = silk_SMLAWW( silk_LSHIFT( ResNrgPart, 16 ), gain, gain );
             silk_assert( gain_squared > 0 );
             gain = silk_SQRT_APPROX( gain_squared );                    /* Q8   */
-            gain = silk_min( gain, silk_int32_MAX >> 8 );
+            gain = silk_min( gain, silk_int32_MAX>>8 );
             psEncCtrl->Gains_Q16[ k ] = silk_LSHIFT_SAT32( gain, 8 );   /* Q16  */
         } else {
             gain = silk_SQRT_APPROX( gain_squared );                    /* Q0   */
-            gain = silk_min( gain, silk_int32_MAX >> 16 );
+            gain = silk_min( gain, silk_int32_MAX>>16 );
             psEncCtrl->Gains_Q16[ k ] = silk_LSHIFT_SAT32( gain, 16 );  /* Q16  */
         }
     }
 
     /* Save unquantized gains and gain Index */
-    silk_memcpy( psEncCtrl->GainsUnq_Q16, psEncCtrl->Gains_Q16, psEnc->sCmn.nb_subfr * sizeof( oac_int32 ) );
+    silk_memcpy( psEncCtrl->GainsUnq_Q16, psEncCtrl->Gains_Q16, psEnc->sCmn.nb_subfr*sizeof(oac_int32));
     psEncCtrl->lastGainIndexPrev = psShapeSt->LastGainIndex;
 
     /* Quantize gains */
@@ -95,8 +95,8 @@ void silk_process_gains_FIX(
         &psShapeSt->LastGainIndex, condCoding == CODE_CONDITIONALLY, psEnc->sCmn.nb_subfr );
 
     /* Set quantizer offset for voiced signals. Larger offset when LTP coding gain is low or tilt is high (ie low-pass) */
-    if( psEnc->sCmn.indices.signalType == TYPE_VOICED ) {
-        if( psEncCtrl->LTPredCodGain_Q7 + silk_RSHIFT( psEnc->sCmn.input_tilt_Q15, 8 ) > SILK_FIX_CONST( 1.0, 7 ) ) {
+    if (psEnc->sCmn.indices.signalType == TYPE_VOICED) {
+        if (psEncCtrl->LTPredCodGain_Q7 + silk_RSHIFT( psEnc->sCmn.input_tilt_Q15, 8 ) > SILK_FIX_CONST( 1.0, 7 )) {
             psEnc->sCmn.indices.quantOffsetType = 0;
         } else {
             psEnc->sCmn.indices.quantOffsetType = 1;
@@ -104,14 +104,20 @@ void silk_process_gains_FIX(
     }
 
     /* Quantizer boundary adjustment */
-    quant_offset_Q10 = silk_Quantization_Offsets_Q10[ psEnc->sCmn.indices.signalType >> 1 ][ psEnc->sCmn.indices.quantOffsetType ];
+    quant_offset_Q10 = silk_Quantization_Offsets_Q10[ psEnc->sCmn.indices.signalType>>
+                                                      1 ][ psEnc->sCmn.indices.quantOffsetType ];
     psEncCtrl->Lambda_Q10 = SILK_FIX_CONST( LAMBDA_OFFSET, 10 )
-                          + silk_SMULBB( SILK_FIX_CONST( LAMBDA_DELAYED_DECISIONS, 10 ), psEnc->sCmn.nStatesDelayedDecision )
-                          + silk_SMULWB( SILK_FIX_CONST( LAMBDA_SPEECH_ACT,        18 ), psEnc->sCmn.speech_activity_Q8     )
-                          + silk_SMULWB( SILK_FIX_CONST( LAMBDA_INPUT_QUALITY,     12 ), psEncCtrl->input_quality_Q14       )
-                          + silk_SMULWB( SILK_FIX_CONST( LAMBDA_CODING_QUALITY,    12 ), psEncCtrl->coding_quality_Q14      )
-                          + silk_SMULWB( SILK_FIX_CONST( LAMBDA_QUANT_OFFSET,      16 ), quant_offset_Q10                   );
+                            + silk_SMULBB( SILK_FIX_CONST( LAMBDA_DELAYED_DECISIONS, 10 ),
+    psEnc->sCmn.nStatesDelayedDecision )
+                            + silk_SMULWB( SILK_FIX_CONST( LAMBDA_SPEECH_ACT,        18 ),
+    psEnc->sCmn.speech_activity_Q8     )
+                            + silk_SMULWB( SILK_FIX_CONST( LAMBDA_INPUT_QUALITY,     12 ),
+    psEncCtrl->input_quality_Q14       )
+                            + silk_SMULWB( SILK_FIX_CONST( LAMBDA_CODING_QUALITY,    12 ),
+    psEncCtrl->coding_quality_Q14      )
+                            + silk_SMULWB( SILK_FIX_CONST( LAMBDA_QUANT_OFFSET,      16 ),
+    quant_offset_Q10                   );
 
     silk_assert( psEncCtrl->Lambda_Q10 > 0 );
-    silk_assert( psEncCtrl->Lambda_Q10 < SILK_FIX_CONST( 2, 10 ) );
+    silk_assert( psEncCtrl->Lambda_Q10 < SILK_FIX_CONST( 2, 10 ));
 }
diff --git a/silk/fixed/regularize_correlations_FIX.c b/silk/fixed/regularize_correlations_FIX.c
index 09fc75564..3fc26e528 100644
--- a/silk/fixed/regularize_correlations_FIX.c
+++ b/silk/fixed/regularize_correlations_FIX.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FIX.h"
@@ -35,12 +35,11 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_regularize_correlations_FIX(
     oac_int32                      *XX,                                    /* I/O  Correlation matrices                                                        */
     oac_int32                      *xx,                                    /* I/O  Correlation values                                                          */
-    oac_int32                      noise,                                  /* I    Noise to add                                                                */
-    oac_int                        D                                       /* I    Dimension of XX                                                             */
-)
-{
+    oac_int32 noise,                                                       /* I    Noise to add                                                                */
+    oac_int D                                                              /* I    Dimension of XX                                                             */
+    ) {
     oac_int i;
-    for( i = 0; i < D; i++ ) {
+    for (i = 0; i < D; i++) {
         matrix_ptr( &XX[ 0 ], i, i, D ) = silk_ADD32( matrix_ptr( &XX[ 0 ], i, i, D ), noise );
     }
     xx[ 0 ] += noise;
diff --git a/silk/fixed/residual_energy16_FIX.c b/silk/fixed/residual_energy16_FIX.c
index d95590067..d5f9c80b8 100644
--- a/silk/fixed/residual_energy16_FIX.c
+++ b/silk/fixed/residual_energy16_FIX.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FIX.h"
@@ -36,14 +36,13 @@ oac_int32 silk_residual_energy16_covar_FIX(
     const oac_int16                *c,                                     /* I    Prediction vector                                                           */
     const oac_int32                *wXX,                                   /* I    Correlation matrix                                                          */
     const oac_int32                *wXx,                                   /* I    Correlation vector                                                          */
-    oac_int32                      wxx,                                    /* I    Signal energy                                                               */
-    oac_int                        D,                                      /* I    Dimension                                                                   */
-    oac_int                        cQ                                      /* I    Q value for c vector 0 - 15                                                 */
-)
-{
-    oac_int   i, j, lshifts, Qxtra;
+    oac_int32 wxx,                                                         /* I    Signal energy                                                               */
+    oac_int D,                                                             /* I    Dimension                                                                   */
+    oac_int cQ                                                             /* I    Q value for c vector 0 - 15                                                 */
+    ) {
+    oac_int i, j, lshifts, Qxtra;
     oac_int32 c_max, w_max, tmp, tmp2, nrg;
-    oac_int   cn[ MAX_MATRIX_SIZE ];
+    oac_int cn[ MAX_MATRIX_SIZE ];
     const oac_int32 *pRow;
 
     /* Safety checks */
@@ -56,33 +55,33 @@ oac_int32 silk_residual_energy16_covar_FIX(
     Qxtra = lshifts;
 
     c_max = 0;
-    for( i = 0; i < D; i++ ) {
-        c_max = silk_max_32( c_max, silk_abs( (oac_int32)c[ i ] ) );
+    for (i = 0; i < D; i++) {
+        c_max = silk_max_32( c_max, silk_abs((oac_int32)c[ i ] ));
     }
     Qxtra = silk_min_int( Qxtra, silk_CLZ32( c_max ) - 17 );
 
-    w_max = silk_max_32( wXX[ 0 ], wXX[ D * D - 1 ] );
-    Qxtra = silk_min_int( Qxtra, silk_CLZ32( silk_MUL( D, silk_RSHIFT( silk_SMULWB( w_max, c_max ), 4 ) ) ) - 5 );
+    w_max = silk_max_32( wXX[ 0 ], wXX[ D*D - 1 ] );
+    Qxtra = silk_min_int( Qxtra, silk_CLZ32( silk_MUL( D, silk_RSHIFT( silk_SMULWB( w_max, c_max ), 4 ))) - 5 );
     Qxtra = silk_max_int( Qxtra, 0 );
-    for( i = 0; i < D; i++ ) {
-        cn[ i ] = silk_LSHIFT( ( oac_int )c[ i ], Qxtra );
-        silk_assert( silk_abs(cn[i]) <= ( silk_int16_MAX + 1 ) ); /* Check that silk_SMLAWB can be used */
+    for (i = 0; i < D; i++) {
+        cn[ i ] = silk_LSHIFT(( oac_int )c[ i ], Qxtra );
+        silk_assert( silk_abs(cn[i]) <= (silk_int16_MAX + 1));    /* Check that silk_SMLAWB can be used */
     }
     lshifts -= Qxtra;
 
     /* Compute wxx - 2 * wXx * c */
     tmp = 0;
-    for( i = 0; i < D; i++ ) {
+    for (i = 0; i < D; i++) {
         tmp = silk_SMLAWB( tmp, wXx[ i ], cn[ i ] );
     }
     nrg = silk_RSHIFT( wxx, 1 + lshifts ) - tmp;                         /* Q: -lshifts - 1 */
 
     /* Add c' * wXX * c, assuming wXX is symmetric */
     tmp2 = 0;
-    for( i = 0; i < D; i++ ) {
+    for (i = 0; i < D; i++) {
         tmp = 0;
-        pRow = &wXX[ i * D ];
-        for( j = i + 1; j < D; j++ ) {
+        pRow = &wXX[ i*D ];
+        for (j = i + 1; j < D; j++) {
             tmp = silk_SMLAWB( tmp, pRow[ j ], cn[ j ] );
         }
         tmp  = silk_SMLAWB( tmp,  silk_RSHIFT( pRow[ i ], 1 ), cn[ i ] );
@@ -91,10 +90,10 @@ oac_int32 silk_residual_energy16_covar_FIX(
     nrg = silk_ADD_LSHIFT32( nrg, tmp2, lshifts );                       /* Q: -lshifts - 1 */
 
     /* Keep one bit free always, because we add them for LSF interpolation */
-    if( nrg < 1 ) {
+    if (nrg < 1) {
         nrg = 1;
-    } else if( nrg > silk_RSHIFT( silk_int32_MAX, lshifts + 2 ) ) {
-        nrg = silk_int32_MAX >> 1;
+    } else if (nrg > silk_RSHIFT( silk_int32_MAX, lshifts + 2 )) {
+        nrg = silk_int32_MAX>>1;
     } else {
         nrg = silk_LSHIFT( nrg, lshifts + 1 );                           /* Q0 */
     }
diff --git a/silk/fixed/residual_energy_FIX.c b/silk/fixed/residual_energy_FIX.c
index 21faa63e6..dd5479d71 100644
--- a/silk/fixed/residual_energy_FIX.c
+++ b/silk/fixed/residual_energy_FIX.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FIX.h"
@@ -35,52 +35,51 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Calculates residual energies of input subframes where all subframes have LPC_order   */
 /* of preceding samples                                                                 */
 void silk_residual_energy_FIX(
-          oac_int32                nrgs[ MAX_NB_SUBFR ],                   /* O    Residual energy per subframe                                                */
-          oac_int                  nrgsQ[ MAX_NB_SUBFR ],                  /* O    Q value per subframe                                                        */
-    const oac_int16                x[],                                    /* I    Input signal                                                                */
-          oac_int16                a_Q12[ 2 ][ MAX_LPC_ORDER ],            /* I    AR coefs for each frame half                                                */
-    const oac_int32                gains[ MAX_NB_SUBFR ],                  /* I    Quantization gains                                                          */
-    const oac_int                  subfr_length,                           /* I    Subframe length                                                             */
-    const oac_int                  nb_subfr,                               /* I    Number of subframes                                                         */
-    const oac_int                  LPC_order,                              /* I    LPC order                                                                   */
-          int                       arch                                    /* I    Run-time architecture                                                       */
-)
-{
-    oac_int         offset, i, j, rshift, lz1, lz2;
+    oac_int32 nrgs[ MAX_NB_SUBFR ],                                        /* O    Residual energy per subframe                                                */
+    oac_int nrgsQ[ MAX_NB_SUBFR ],                                         /* O    Q value per subframe                                                        */
+    const oac_int16 x[],                                                   /* I    Input signal                                                                */
+    oac_int16 a_Q12[ 2 ][ MAX_LPC_ORDER ],                                 /* I    AR coefs for each frame half                                                */
+    const oac_int32 gains[ MAX_NB_SUBFR ],                                 /* I    Quantization gains                                                          */
+    const oac_int subfr_length,                                            /* I    Subframe length                                                             */
+    const oac_int nb_subfr,                                                /* I    Number of subframes                                                         */
+    const oac_int LPC_order,                                               /* I    LPC order                                                                   */
+    int arch                                                                /* I    Run-time architecture                                                       */
+    ) {
+    oac_int offset, i, j, rshift, lz1, lz2;
     oac_int16       *LPC_res_ptr;
     VARDECL( oac_int16, LPC_res );
     const oac_int16 *x_ptr;
-    oac_int32       tmp32;
+    oac_int32 tmp32;
     SAVE_STACK;
 
     x_ptr  = x;
     offset = LPC_order + subfr_length;
 
     /* Filter input to create the LPC residual for each frame half, and measure subframe energies */
-    ALLOC( LPC_res, ( MAX_NB_SUBFR >> 1 ) * offset, oac_int16 );
-    celt_assert( ( nb_subfr >> 1 ) * ( MAX_NB_SUBFR >> 1 ) == nb_subfr );
-    for( i = 0; i < nb_subfr >> 1; i++ ) {
+    ALLOC( LPC_res, (MAX_NB_SUBFR>>1)*offset, oac_int16 );
+    celt_assert((nb_subfr>>1)*(MAX_NB_SUBFR>>1) == nb_subfr );
+    for (i = 0; i < nb_subfr>>1; i++) {
         /* Calculate half frame LPC residual signal including preceding samples */
-        silk_LPC_analysis_filter( LPC_res, x_ptr, a_Q12[ i ], ( MAX_NB_SUBFR >> 1 ) * offset, LPC_order, arch );
+        silk_LPC_analysis_filter( LPC_res, x_ptr, a_Q12[ i ], (MAX_NB_SUBFR>>1)*offset, LPC_order, arch );
 
         /* Point to first subframe of the just calculated LPC residual signal */
         LPC_res_ptr = LPC_res + LPC_order;
-        for( j = 0; j < ( MAX_NB_SUBFR >> 1 ); j++ ) {
+        for (j = 0; j < (MAX_NB_SUBFR>>1); j++) {
             /* Measure subframe energy */
-            silk_sum_sqr_shift( &nrgs[ i * ( MAX_NB_SUBFR >> 1 ) + j ], &rshift, LPC_res_ptr, subfr_length );
+            silk_sum_sqr_shift( &nrgs[ i*(MAX_NB_SUBFR>>1) + j ], &rshift, LPC_res_ptr, subfr_length );
 
             /* Set Q values for the measured energy */
-            nrgsQ[ i * ( MAX_NB_SUBFR >> 1 ) + j ] = -rshift;
+            nrgsQ[ i*(MAX_NB_SUBFR>>1) + j ] = -rshift;
 
             /* Move to next subframe */
             LPC_res_ptr += offset;
         }
         /* Move to next frame half */
-        x_ptr += ( MAX_NB_SUBFR >> 1 ) * offset;
+        x_ptr += (MAX_NB_SUBFR>>1)*offset;
     }
 
     /* Apply the squared subframe gains */
-    for( i = 0; i < nb_subfr; i++ ) {
+    for (i = 0; i < nb_subfr; i++) {
         /* Fully upscale gains and energies */
         lz1 = silk_CLZ32( nrgs[  i ] ) - 1;
         lz2 = silk_CLZ32( gains[ i ] ) - 1;
@@ -91,8 +90,8 @@ void silk_residual_energy_FIX(
         tmp32 = silk_SMMUL( tmp32, tmp32 ); /* Q( 2 * lz2 - 32 )*/
 
         /* Scale energies */
-        nrgs[ i ] = silk_SMMUL( tmp32, silk_LSHIFT32( nrgs[ i ], lz1 ) ); /* Q( nrgsQ[ i ] + lz1 + 2 * lz2 - 32 - 32 )*/
-        nrgsQ[ i ] += lz1 + 2 * lz2 - 32 - 32;
+        nrgs[ i ] = silk_SMMUL( tmp32, silk_LSHIFT32( nrgs[ i ], lz1 ));  /* Q( nrgsQ[ i ] + lz1 + 2 * lz2 - 32 - 32 )*/
+        nrgsQ[ i ] += lz1 + 2*lz2 - 32 - 32;
     }
     RESTORE_STACK;
 }
diff --git a/silk/fixed/schur64_FIX.c b/silk/fixed/schur64_FIX.c
index 1a87de0ec..b01ab2e37 100644
--- a/silk/fixed/schur64_FIX.c
+++ b/silk/fixed/schur64_FIX.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -34,38 +34,37 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Slower than schur(), but more accurate.                              */
 /* Uses SMULL(), available on armv4                                     */
 oac_int32 silk_schur64(                            /* O    returns residual energy                                     */
-    oac_int32                  rc_Q16[],           /* O    Reflection coefficients [order] Q16                         */
-    const oac_int32            c[],                /* I    Correlations [order+1]                                      */
-    oac_int32                  order               /* I    Prediction order                                            */
-)
-{
-    oac_int   k, n;
+    oac_int32 rc_Q16[],                            /* O    Reflection coefficients [order] Q16                         */
+    const oac_int32 c[],                           /* I    Correlations [order+1]                                      */
+    oac_int32 order                                /* I    Prediction order                                            */
+    ) {
+    oac_int k, n;
     oac_int32 C[ SILK_MAX_ORDER_LPC + 1 ][ 2 ];
     oac_int32 Ctmp1_Q30, Ctmp2_Q30, rc_tmp_Q31;
 
     celt_assert( order >= 0 && order <= SILK_MAX_ORDER_LPC );
 
     /* Check for invalid input */
-    if( c[ 0 ] <= 0 ) {
-        silk_memset( rc_Q16, 0, order * sizeof( oac_int32 ) );
+    if (c[ 0 ] <= 0) {
+        silk_memset( rc_Q16, 0, order*sizeof(oac_int32));
         return 0;
     }
 
     k = 0;
     do {
         C[ k ][ 0 ] = C[ k ][ 1 ] = c[ k ];
-    } while( ++k <= order );
+    } while (++k <= order);
 
-    for( k = 0; k < order; k++ ) {
+    for (k = 0; k < order; k++) {
         /* Check that we won't be getting an unstable rc, otherwise stop here. */
         if (silk_abs_int32(C[ k + 1 ][ 0 ]) >= C[ 0 ][ 1 ]) {
-           if ( C[ k + 1 ][ 0 ] > 0 ) {
-              rc_Q16[ k ] = -SILK_FIX_CONST( .99f, 16 );
-           } else {
-              rc_Q16[ k ] = SILK_FIX_CONST( .99f, 16 );
-           }
-           k++;
-           break;
+            if (C[ k + 1 ][ 0 ] > 0) {
+                rc_Q16[ k ] = -SILK_FIX_CONST( .99f, 16 );
+            } else {
+                rc_Q16[ k ] = SILK_FIX_CONST( .99f, 16 );
+            }
+            k++;
+            break;
         }
 
         /* Get reflection coefficient: divide two Q30 values and get result in Q31 */
@@ -75,7 +74,7 @@ oac_int32 silk_schur64(                            /* O    returns residual ener
         rc_Q16[ k ] = silk_RSHIFT_ROUND( rc_tmp_Q31, 15 );
 
         /* Update correlations */
-        for( n = 0; n < order - k; n++ ) {
+        for (n = 0; n < order - k; n++) {
             Ctmp1_Q30 = C[ n + k + 1 ][ 0 ];
             Ctmp2_Q30 = C[ n ][ 1 ];
 
@@ -85,8 +84,8 @@ oac_int32 silk_schur64(                            /* O    returns residual ener
         }
     }
 
-    for(; k < order; k++ ) {
-       rc_Q16[ k ] = 0;
+    for (; k < order; k++) {
+        rc_Q16[ k ] = 0;
     }
 
     return silk_max_32( 1, C[ 0 ][ 1 ] );
diff --git a/silk/fixed/schur_FIX.c b/silk/fixed/schur_FIX.c
index f9a25ad9b..b3d26d2f8 100644
--- a/silk/fixed/schur_FIX.c
+++ b/silk/fixed/schur_FIX.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -36,12 +36,11 @@ POSSIBILITY OF SUCH DAMAGE.
 oac_int32 silk_schur(                              /* O    Returns residual energy                                     */
     oac_int16                  *rc_Q15,            /* O    reflection coefficients [order] Q15                         */
     const oac_int32            *c,                 /* I    correlations [order+1]                                      */
-    const oac_int32            order               /* I    prediction order                                            */
-)
-{
-    oac_int        k, n, lz;
-    oac_int32    C[ SILK_MAX_ORDER_LPC + 1 ][ 2 ];
-    oac_int32    Ctmp1, Ctmp2, rc_tmp_Q15;
+    const oac_int32 order                          /* I    prediction order                                            */
+    ) {
+    oac_int k, n, lz;
+    oac_int32 C[ SILK_MAX_ORDER_LPC + 1 ][ 2 ];
+    oac_int32 Ctmp1, Ctmp2, rc_tmp_Q15;
 
     celt_assert( order >= 0 && order <= SILK_MAX_ORDER_LPC );
 
@@ -50,38 +49,38 @@ oac_int32 silk_schur(                              /* O    Returns residual ener
 
     /* Copy correlations and adjust level to Q30 */
     k = 0;
-    if( lz < 2 ) {
+    if (lz < 2) {
         /* lz must be 1, so shift one to the right */
         do {
             C[ k ][ 0 ] = C[ k ][ 1 ] = silk_RSHIFT( c[ k ], 1 );
-        } while( ++k <= order );
-    } else if( lz > 2 ) {
+        } while (++k <= order);
+    } else if (lz > 2) {
         /* Shift to the left */
         lz -= 2;
         do {
             C[ k ][ 0 ] = C[ k ][ 1 ] = silk_LSHIFT( c[ k ], lz );
-        } while( ++k <= order );
+        } while (++k <= order);
     } else {
         /* No need to shift */
         do {
             C[ k ][ 0 ] = C[ k ][ 1 ] = c[ k ];
-        } while( ++k <= order );
+        } while (++k <= order);
     }
 
-    for( k = 0; k < order; k++ ) {
+    for (k = 0; k < order; k++) {
         /* Check that we won't be getting an unstable rc, otherwise stop here. */
         if (silk_abs_int32(C[ k + 1 ][ 0 ]) >= C[ 0 ][ 1 ]) {
-           if ( C[ k + 1 ][ 0 ] > 0 ) {
-              rc_Q15[ k ] = -SILK_FIX_CONST( .99f, 15 );
-           } else {
-              rc_Q15[ k ] = SILK_FIX_CONST( .99f, 15 );
-           }
-           k++;
-           break;
+            if (C[ k + 1 ][ 0 ] > 0) {
+                rc_Q15[ k ] = -SILK_FIX_CONST( .99f, 15 );
+            } else {
+                rc_Q15[ k ] = SILK_FIX_CONST( .99f, 15 );
+            }
+            k++;
+            break;
         }
 
         /* Get reflection coefficient */
-        rc_tmp_Q15 = -silk_DIV32_16( C[ k + 1 ][ 0 ], silk_max_32( silk_RSHIFT( C[ 0 ][ 1 ], 15 ), 1 ) );
+        rc_tmp_Q15 = -silk_DIV32_16( C[ k + 1 ][ 0 ], silk_max_32( silk_RSHIFT( C[ 0 ][ 1 ], 15 ), 1 ));
 
         /* Clip (shouldn't happen for properly conditioned inputs) */
         rc_tmp_Q15 = silk_SAT16( rc_tmp_Q15 );
@@ -90,7 +89,7 @@ oac_int32 silk_schur(                              /* O    Returns residual ener
         rc_Q15[ k ] = (oac_int16)rc_tmp_Q15;
 
         /* Update correlations */
-        for( n = 0; n < order - k; n++ ) {
+        for (n = 0; n < order - k; n++) {
             Ctmp1 = C[ n + k + 1 ][ 0 ];
             Ctmp2 = C[ n ][ 1 ];
             C[ n + k + 1 ][ 0 ] = silk_SMLAWB( Ctmp1, silk_LSHIFT( Ctmp2, 1 ), rc_tmp_Q15 );
@@ -98,8 +97,8 @@ oac_int32 silk_schur(                              /* O    Returns residual ener
         }
     }
 
-    for(; k < order; k++ ) {
-       rc_Q15[ k ] = 0;
+    for (; k < order; k++) {
+        rc_Q15[ k ] = 0;
     }
 
     /* return residual energy */
diff --git a/silk/fixed/structs_FIX.h b/silk/fixed/structs_FIX.h
index 674f9a17b..de9397a29 100644
--- a/silk/fixed/structs_FIX.h
+++ b/silk/fixed/structs_FIX.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_STRUCTS_FIX_H
@@ -37,23 +37,23 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Noise shaping analysis state */
 /********************************/
 typedef struct {
-    oac_int8                   LastGainIndex;
-    oac_int32                  HarmBoost_smth_Q16;
-    oac_int32                  HarmShapeGain_smth_Q16;
-    oac_int32                  Tilt_smth_Q16;
+    oac_int8 LastGainIndex;
+    oac_int32 HarmBoost_smth_Q16;
+    oac_int32 HarmShapeGain_smth_Q16;
+    oac_int32 Tilt_smth_Q16;
 } silk_shape_state_FIX;
 
 /********************************/
 /* Encoder state FIX            */
 /********************************/
 typedef struct {
-    silk_encoder_state          sCmn;                                   /* Common struct, shared with floating-point code       */
-    silk_shape_state_FIX        sShape;                                 /* Shape state                                          */
+    silk_encoder_state sCmn;                                            /* Common struct, shared with floating-point code       */
+    silk_shape_state_FIX sShape;                                        /* Shape state                                          */
 
     /* Buffer for find pitch and noise shape analysis */
-    silk_DWORD_ALIGN oac_int16 x_buf[ 2 * MAX_FRAME_LENGTH + LA_SHAPE_MAX ];/* Buffer for find pitch and noise shape analysis  */
-    oac_int                    LTPCorr_Q15;                            /* Normalized correlation from pitch lag estimator      */
-    oac_int32                    resNrgSmth;
+    silk_DWORD_ALIGN oac_int16 x_buf[ 2*MAX_FRAME_LENGTH + LA_SHAPE_MAX ];  /* Buffer for find pitch and noise shape analysis  */
+    oac_int LTPCorr_Q15;                                               /* Normalized correlation from pitch lag estimator      */
+    oac_int32 resNrgSmth;
 } silk_encoder_state_FIX;
 
 /************************/
@@ -61,48 +61,48 @@ typedef struct {
 /************************/
 typedef struct {
     /* Prediction and coding parameters */
-    oac_int32                  Gains_Q16[ MAX_NB_SUBFR ];
+    oac_int32 Gains_Q16[ MAX_NB_SUBFR ];
     silk_DWORD_ALIGN oac_int16 PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ];
-    oac_int16                  LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ];
-    oac_int                    LTP_scale_Q14;
-    oac_int                    pitchL[ MAX_NB_SUBFR ];
+    oac_int16 LTPCoef_Q14[ LTP_ORDER*MAX_NB_SUBFR ];
+    oac_int LTP_scale_Q14;
+    oac_int pitchL[ MAX_NB_SUBFR ];
 
     /* Noise shaping parameters */
     /* Testing */
-    silk_DWORD_ALIGN oac_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ];
-    oac_int32                  LF_shp_Q14[        MAX_NB_SUBFR ];      /* Packs two int16 coefficients per int32 value         */
-    oac_int                    Tilt_Q14[          MAX_NB_SUBFR ];
-    oac_int                    HarmShapeGain_Q14[ MAX_NB_SUBFR ];
-    oac_int                    Lambda_Q10;
-    oac_int                    input_quality_Q14;
-    oac_int                    coding_quality_Q14;
+    silk_DWORD_ALIGN oac_int16 AR_Q13[ MAX_NB_SUBFR*MAX_SHAPE_LPC_ORDER ];
+    oac_int32 LF_shp_Q14[        MAX_NB_SUBFR ];                       /* Packs two int16 coefficients per int32 value         */
+    oac_int Tilt_Q14[          MAX_NB_SUBFR ];
+    oac_int HarmShapeGain_Q14[ MAX_NB_SUBFR ];
+    oac_int Lambda_Q10;
+    oac_int input_quality_Q14;
+    oac_int coding_quality_Q14;
 
     /* measures */
-    oac_int32                  predGain_Q16;
-    oac_int                    LTPredCodGain_Q7;
-    oac_int32                  ResNrg[ MAX_NB_SUBFR ];                 /* Residual energy per subframe                         */
-    oac_int                    ResNrgQ[ MAX_NB_SUBFR ];                /* Q domain for the residual energy > 0                 */
+    oac_int32 predGain_Q16;
+    oac_int LTPredCodGain_Q7;
+    oac_int32 ResNrg[ MAX_NB_SUBFR ];                                  /* Residual energy per subframe                         */
+    oac_int ResNrgQ[ MAX_NB_SUBFR ];                                   /* Q domain for the residual energy > 0                 */
 
     /* Parameters for CBR mode */
-    oac_int32                  GainsUnq_Q16[ MAX_NB_SUBFR ];
-    oac_int8                   lastGainIndexPrev;
+    oac_int32 GainsUnq_Q16[ MAX_NB_SUBFR ];
+    oac_int8 lastGainIndexPrev;
 } silk_encoder_control_FIX;
 
 /************************/
 /* Encoder Super Struct */
 /************************/
 typedef struct {
-    stereo_enc_state            sStereo;
-    oac_int32                  nBitsUsedLBRR;
-    oac_int32                  nBitsExceeded;
-    oac_int                    nChannelsAPI;
-    oac_int                    nChannelsInternal;
-    oac_int                    nPrevChannelsInternal;
-    oac_int                    timeSinceSwitchAllowed_ms;
-    oac_int                    allowBandwidthSwitch;
-    oac_int                    prev_decode_only_middle;
+    stereo_enc_state sStereo;
+    oac_int32 nBitsUsedLBRR;
+    oac_int32 nBitsExceeded;
+    oac_int nChannelsAPI;
+    oac_int nChannelsInternal;
+    oac_int nPrevChannelsInternal;
+    oac_int timeSinceSwitchAllowed_ms;
+    oac_int allowBandwidthSwitch;
+    oac_int prev_decode_only_middle;
     /* This needs to be last so we can skip the second state for mono. */
-    silk_encoder_state_FIX      state_Fxx[ ENCODER_NUM_CHANNELS ];
+    silk_encoder_state_FIX state_Fxx[ ENCODER_NUM_CHANNELS ];
 } silk_encoder;
 
 
diff --git a/silk/fixed/vector_ops_FIX.c b/silk/fixed/vector_ops_FIX.c
index 5a34a502c..e3c14901e 100644
--- a/silk/fixed/vector_ops_FIX.c
+++ b/silk/fixed/vector_ops_FIX.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -36,14 +36,13 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_scale_copy_vector16(
     oac_int16                  *data_out,
     const oac_int16            *data_in,
-    oac_int32                  gain_Q16,           /* I    Gain in Q16                                                 */
-    const oac_int              dataSize            /* I    Length                                                      */
-)
-{
-    oac_int  i;
+    oac_int32 gain_Q16,                            /* I    Gain in Q16                                                 */
+    const oac_int dataSize                         /* I    Length                                                      */
+    ) {
+    oac_int i;
     oac_int32 tmp32;
 
-    for( i = 0; i < dataSize; i++ ) {
+    for (i = 0; i < dataSize; i++) {
         tmp32 = silk_SMULWB( gain_Q16, data_in[ i ] );
         data_out[ i ] = (oac_int16)silk_CHECK_FIT16( tmp32 );
     }
@@ -52,14 +51,13 @@ void silk_scale_copy_vector16(
 /* Multiply a vector by a constant */
 void silk_scale_vector32_Q26_lshift_18(
     oac_int32                  *data1,             /* I/O  Q0/Q18                                                      */
-    oac_int32                  gain_Q26,           /* I    Q26                                                         */
-    oac_int                    dataSize            /* I    length                                                      */
-)
-{
-    oac_int  i;
+    oac_int32 gain_Q26,                            /* I    Q26                                                         */
+    oac_int dataSize                               /* I    length                                                      */
+    ) {
+    oac_int i;
 
-    for( i = 0; i < dataSize; i++ ) {
-        data1[ i ] = (oac_int32)silk_CHECK_FIT32( silk_RSHIFT64( silk_SMULL( data1[ i ], gain_Q26 ), 8 ) );    /* OUTPUT: Q18 */
+    for (i = 0; i < dataSize; i++) {
+        data1[ i ] = (oac_int32)silk_CHECK_FIT32( silk_RSHIFT64( silk_SMULL( data1[ i ], gain_Q26 ), 8 ));     /* OUTPUT: Q18 */
     }
 }
 
@@ -69,18 +67,17 @@ void silk_scale_vector32_Q26_lshift_18(
 /*        * len should be positive 16bit integer.                               */
 /*        * only when len>6, memory access can be reduced by half.              */
 oac_int32 silk_inner_prod_aligned(
-    const oac_int16 *const     inVec1,             /*    I input vector 1                                              */
-    const oac_int16 *const     inVec2,             /*    I input vector 2                                              */
-    const oac_int              len,                /*    I vector lengths                                              */
-    int                         arch                /*    I Run-time architecture                                       */
-)
-{
+    const oac_int16 *const inVec1,                 /*    I input vector 1                                              */
+    const oac_int16 *const inVec2,                 /*    I input vector 2                                              */
+    const oac_int len,                             /*    I vector lengths                                              */
+    int arch                                        /*    I Run-time architecture                                       */
+    ) {
 #ifdef FIXED_POINT
-   return celt_inner_prod(inVec1, inVec2, len, arch);
+    return celt_inner_prod(inVec1, inVec2, len, arch);
 #else
-    oac_int   i;
+    oac_int i;
     oac_int32 sum = 0;
-    for( i = 0; i < len; i++ ) {
+    for (i = 0; i < len; i++) {
         sum = silk_SMLABB( sum, inVec1[ i ], inVec2[ i ] );
     }
     return sum;
@@ -90,12 +87,11 @@ oac_int32 silk_inner_prod_aligned(
 oac_int64 silk_inner_prod16_c(
     const oac_int16            *inVec1,            /*    I input vector 1                                              */
     const oac_int16            *inVec2,            /*    I input vector 2                                              */
-    const oac_int              len                 /*    I vector lengths                                              */
-)
-{
-    oac_int   i;
+    const oac_int len                              /*    I vector lengths                                              */
+    ) {
+    oac_int i;
     oac_int64 sum = 0;
-    for( i = 0; i < len; i++ ) {
+    for (i = 0; i < len; i++) {
         sum = silk_SMLALBB( sum, inVec1[ i ], inVec2[ i ] );
     }
     return sum;
diff --git a/silk/fixed/warped_autocorrelation_FIX.c b/silk/fixed/warped_autocorrelation_FIX.c
index f018a1de1..8d4ac4bdc 100644
--- a/silk/fixed/warped_autocorrelation_FIX.c
+++ b/silk/fixed/warped_autocorrelation_FIX.c
@@ -1,90 +1,89 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FIX.h"
 
 #if defined(__mips)
-#include "mips/warped_autocorrelation_FIX_mipsr1.h"
+# include "mips/warped_autocorrelation_FIX_mipsr1.h"
 #endif
 
 
 /* Autocorrelations for a warped frequency axis */
 #ifndef OVERRIDE_silk_warped_autocorrelation_FIX_c
 void silk_warped_autocorrelation_FIX_c(
-          oac_int32                *corr,                                  /* O    Result [order + 1]                                                          */
-          oac_int                  *scale,                                 /* O    Scaling of the correlation vector                                           */
+    oac_int32                *corr,                                        /* O    Result [order + 1]                                                          */
+    oac_int                  *scale,                                       /* O    Scaling of the correlation vector                                           */
     const oac_int16                *input,                                 /* I    Input data to correlate                                                     */
-    const oac_int                  warping_Q16,                            /* I    Warping coefficient                                                         */
-    const oac_int                  length,                                 /* I    Length of input                                                             */
-    const oac_int                  order                                   /* I    Correlation order (even)                                                    */
-)
-{
-    oac_int   n, i, lsh;
+    const oac_int warping_Q16,                                             /* I    Warping coefficient                                                         */
+    const oac_int length,                                                  /* I    Length of input                                                             */
+    const oac_int order                                                    /* I    Correlation order (even)                                                    */
+    ) {
+    oac_int n, i, lsh;
     oac_int32 tmp1_QS, tmp2_QS;
     oac_int32 state_QS[ MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };
     oac_int64 corr_QC[  MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };
 
     /* Order must be even */
-    celt_assert( ( order & 1 ) == 0 );
-    silk_assert( 2 * QS - QC >= 0 );
+    celt_assert((order&1) == 0 );
+    silk_assert( 2*QS - QC >= 0 );
 
     /* Loop over samples */
-    for( n = 0; n < length; n++ ) {
-        tmp1_QS = silk_LSHIFT32( (oac_int32)input[ n ], QS );
+    for (n = 0; n < length; n++) {
+        tmp1_QS = silk_LSHIFT32((oac_int32)input[ n ], QS );
         /* Loop over allpass sections */
-        for( i = 0; i < order; i += 2 ) {
+        for (i = 0; i < order; i += 2) {
             /* Output of allpass section */
             tmp2_QS = silk_SMLAWB( state_QS[ i ], state_QS[ i + 1 ] - tmp1_QS, warping_Q16 );
             state_QS[ i ]  = tmp1_QS;
-            corr_QC[  i ] += silk_RSHIFT64( silk_SMULL( tmp1_QS, state_QS[ 0 ] ), 2 * QS - QC );
+            corr_QC[  i ] += silk_RSHIFT64( silk_SMULL( tmp1_QS, state_QS[ 0 ] ), 2*QS - QC );
             /* Output of allpass section */
             tmp1_QS = silk_SMLAWB( state_QS[ i + 1 ], state_QS[ i + 2 ] - tmp2_QS, warping_Q16 );
             state_QS[ i + 1 ]  = tmp2_QS;
-            corr_QC[  i + 1 ] += silk_RSHIFT64( silk_SMULL( tmp2_QS, state_QS[ 0 ] ), 2 * QS - QC );
+            corr_QC[  i + 1 ] += silk_RSHIFT64( silk_SMULL( tmp2_QS, state_QS[ 0 ] ), 2*QS - QC );
         }
         state_QS[ order ] = tmp1_QS;
-        corr_QC[  order ] += silk_RSHIFT64( silk_SMULL( tmp1_QS, state_QS[ 0 ] ), 2 * QS - QC );
+        corr_QC[  order ] += silk_RSHIFT64( silk_SMULL( tmp1_QS, state_QS[ 0 ] ), 2*QS - QC );
     }
 
     lsh = silk_CLZ64( corr_QC[ 0 ] ) - 35;
     lsh = silk_LIMIT( lsh, -12 - QC, 30 - QC );
-    *scale = -( QC + lsh );
+    *scale = -(QC + lsh);
     silk_assert( *scale >= -30 && *scale <= 12 );
-    if( lsh >= 0 ) {
-        for( i = 0; i < order + 1; i++ ) {
-            corr[ i ] = (oac_int32)silk_CHECK_FIT32( silk_LSHIFT64( corr_QC[ i ], lsh ) );
+    if (lsh >= 0) {
+        for (i = 0; i < order + 1; i++) {
+            corr[ i ] = (oac_int32)silk_CHECK_FIT32( silk_LSHIFT64( corr_QC[ i ], lsh ));
         }
     } else {
-        for( i = 0; i < order + 1; i++ ) {
-            corr[ i ] = (oac_int32)silk_CHECK_FIT32( silk_RSHIFT64( corr_QC[ i ], -lsh ) );
+        for (i = 0; i < order + 1; i++) {
+            corr[ i ] = (oac_int32)silk_CHECK_FIT32( silk_RSHIFT64( corr_QC[ i ], -lsh ));
         }
     }
     silk_assert( corr_QC[ 0 ] >= 0 ); /* If breaking, decrease QC*/
diff --git a/silk/fixed/x86/burg_modified_FIX_sse4_1.c b/silk/fixed/x86/burg_modified_FIX_sse4_1.c
index e0f2669f1..d47876ea3 100644
--- a/silk/fixed/x86/burg_modified_FIX_sse4_1.c
+++ b/silk/fixed/x86/burg_modified_FIX_sse4_1.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <xmmintrin.h>
@@ -50,30 +50,30 @@
 void silk_burg_modified_sse4_1(
     oac_int32                  *res_nrg,           /* O    Residual energy                                             */
     oac_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
-    oac_int32                  A_Q16[],            /* O    Prediction coefficients (length order)                      */
-    const oac_int16            x[],                /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
-    const oac_int32            minInvGain_Q30,     /* I    Inverse of max prediction gain                              */
-    const oac_int              subfr_length,       /* I    Input signal subframe length (incl. D preceding samples)    */
-    const oac_int              nb_subfr,           /* I    Number of subframes stacked in x                            */
-    const oac_int              D,                  /* I    Order                                                       */
-    int                         arch                /* I    Run-time architecture                                       */
-)
-{
-    oac_int         k, n, s, lz, rshifts, reached_max_gain;
-    oac_int32       C0, num, nrg, rc_Q31, invGain_Q30, Atmp_QA, Atmp1, tmp1, tmp2, x1, x2;
+    oac_int32 A_Q16[],                             /* O    Prediction coefficients (length order)                      */
+    const oac_int16 x[],                           /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
+    const oac_int32 minInvGain_Q30,                /* I    Inverse of max prediction gain                              */
+    const oac_int subfr_length,                    /* I    Input signal subframe length (incl. D preceding samples)    */
+    const oac_int nb_subfr,                        /* I    Number of subframes stacked in x                            */
+    const oac_int D,                               /* I    Order                                                       */
+    int arch                                        /* I    Run-time architecture                                       */
+    ) {
+    oac_int k, n, s, lz, rshifts, reached_max_gain;
+    oac_int32 C0, num, nrg, rc_Q31, invGain_Q30, Atmp_QA, Atmp1, tmp1, tmp2, x1, x2;
     const oac_int16 *x_ptr;
-    oac_int32       C_first_row[ SILK_MAX_ORDER_LPC ];
-    oac_int32       C_last_row[  SILK_MAX_ORDER_LPC ];
-    oac_int32       Af_QA[       SILK_MAX_ORDER_LPC ];
-    oac_int32       CAf[ SILK_MAX_ORDER_LPC + 1 ];
-    oac_int32       CAb[ SILK_MAX_ORDER_LPC + 1 ];
-    oac_int32       xcorr[ SILK_MAX_ORDER_LPC ];
-    oac_int64       C0_64;
-
-    __m128i FIRST_3210, LAST_3210, ATMP_3210, TMP1_3210, TMP2_3210, T1_3210, T2_3210, PTR_3210, SUBFR_3210, X1_3210, X2_3210;
+    oac_int32 C_first_row[ SILK_MAX_ORDER_LPC ];
+    oac_int32 C_last_row[  SILK_MAX_ORDER_LPC ];
+    oac_int32 Af_QA[       SILK_MAX_ORDER_LPC ];
+    oac_int32 CAf[ SILK_MAX_ORDER_LPC + 1 ];
+    oac_int32 CAb[ SILK_MAX_ORDER_LPC + 1 ];
+    oac_int32 xcorr[ SILK_MAX_ORDER_LPC ];
+    oac_int64 C0_64;
+
+    __m128i FIRST_3210, LAST_3210, ATMP_3210, TMP1_3210, TMP2_3210, T1_3210, T2_3210, PTR_3210, SUBFR_3210, X1_3210,
+            X2_3210;
     __m128i CONST1 = _mm_set1_epi32(1);
 
-    celt_assert( subfr_length * nb_subfr <= MAX_FRAME_SIZE );
+    celt_assert( subfr_length*nb_subfr <= MAX_FRAME_SIZE );
 
     /* Compute autocorrelations, added over subframes */
     C0_64 = silk_inner_prod16( x, x, subfr_length*nb_subfr, arch );
@@ -89,51 +89,51 @@ void silk_burg_modified_sse4_1(
     }
 
     CAb[ 0 ] = CAf[ 0 ] = C0 + silk_SMMUL( SILK_FIX_CONST( FIND_LPC_COND_FAC, 32 ), C0 ) + 1;                                /* Q(-rshifts) */
-    silk_memset( C_first_row, 0, SILK_MAX_ORDER_LPC * sizeof( oac_int32 ) );
-    if( rshifts > 0 ) {
-        for( s = 0; s < nb_subfr; s++ ) {
-            x_ptr = x + s * subfr_length;
-            for( n = 1; n < D + 1; n++ ) {
+    silk_memset( C_first_row, 0, SILK_MAX_ORDER_LPC*sizeof(oac_int32));
+    if (rshifts > 0) {
+        for (s = 0; s < nb_subfr; s++) {
+            x_ptr = x + s*subfr_length;
+            for (n = 1; n < D + 1; n++) {
                 C_first_row[ n - 1 ] += (oac_int32)silk_RSHIFT64(
                     silk_inner_prod16( x_ptr, x_ptr + n, subfr_length - n, arch ), rshifts );
             }
         }
     } else {
-        for( s = 0; s < nb_subfr; s++ ) {
+        for (s = 0; s < nb_subfr; s++) {
             int i;
             oac_int32 d;
-            x_ptr = x + s * subfr_length;
+            x_ptr = x + s*subfr_length;
             celt_pitch_xcorr(x_ptr, x_ptr + 1, xcorr, subfr_length - D, D, arch );
-            for( n = 1; n < D + 1; n++ ) {
-               for ( i = n + subfr_length - D, d = 0; i < subfr_length; i++ )
-                  d = MAC16_16( d, x_ptr[ i ], x_ptr[ i - n ] );
-               xcorr[ n - 1 ] += d;
+            for (n = 1; n < D + 1; n++) {
+                for (i = n + subfr_length - D, d = 0; i < subfr_length; i++)
+                    d = MAC16_16( d, x_ptr[ i ], x_ptr[ i - n ] );
+                xcorr[ n - 1 ] += d;
             }
-            for( n = 1; n < D + 1; n++ ) {
+            for (n = 1; n < D + 1; n++) {
                 C_first_row[ n - 1 ] += silk_LSHIFT32( xcorr[ n - 1 ], -rshifts );
             }
         }
     }
-    silk_memcpy( C_last_row, C_first_row, SILK_MAX_ORDER_LPC * sizeof( oac_int32 ) );
+    silk_memcpy( C_last_row, C_first_row, SILK_MAX_ORDER_LPC*sizeof(oac_int32));
 
     /* Initialize */
     CAb[ 0 ] = CAf[ 0 ] = C0 + silk_SMMUL( SILK_FIX_CONST( FIND_LPC_COND_FAC, 32 ), C0 ) + 1;                                /* Q(-rshifts) */
 
-    invGain_Q30 = (oac_int32)1 << 30;
+    invGain_Q30 = (oac_int32)1<<30;
     reached_max_gain = 0;
-    for( n = 0; n < D; n++ ) {
+    for (n = 0; n < D; n++) {
         /* Update first row of correlation matrix (without first element) */
         /* Update last row of correlation matrix (without last element, stored in reversed order) */
         /* Update C * Af */
         /* Update C * flipud(Af) (stored in reversed order) */
-        if( rshifts > -2 ) {
-            for( s = 0; s < nb_subfr; s++ ) {
-                x_ptr = x + s * subfr_length;
-                x1  = -silk_LSHIFT32( (oac_int32)x_ptr[ n ],                    16 - rshifts );        /* Q(16-rshifts) */
-                x2  = -silk_LSHIFT32( (oac_int32)x_ptr[ subfr_length - n - 1 ], 16 - rshifts );        /* Q(16-rshifts) */
-                tmp1 = silk_LSHIFT32( (oac_int32)x_ptr[ n ],                    QA - 16 );             /* Q(QA-16) */
-                tmp2 = silk_LSHIFT32( (oac_int32)x_ptr[ subfr_length - n - 1 ], QA - 16 );             /* Q(QA-16) */
-                for( k = 0; k < n; k++ ) {
+        if (rshifts > -2) {
+            for (s = 0; s < nb_subfr; s++) {
+                x_ptr = x + s*subfr_length;
+                x1  = -silk_LSHIFT32((oac_int32)x_ptr[ n ],                    16 - rshifts );         /* Q(16-rshifts) */
+                x2  = -silk_LSHIFT32((oac_int32)x_ptr[ subfr_length - n - 1 ], 16 - rshifts );         /* Q(16-rshifts) */
+                tmp1 = silk_LSHIFT32((oac_int32)x_ptr[ n ],                    QA - 16 );              /* Q(QA-16) */
+                tmp2 = silk_LSHIFT32((oac_int32)x_ptr[ subfr_length - n - 1 ], QA - 16 );              /* Q(QA-16) */
+                for (k = 0; k < n; k++) {
                     C_first_row[ k ] = silk_SMLAWB( C_first_row[ k ], x1, x_ptr[ n - k - 1 ]            ); /* Q( -rshifts ) */
                     C_last_row[ k ]  = silk_SMLAWB( C_last_row[ k ],  x2, x_ptr[ subfr_length - n + k ] ); /* Q( -rshifts ) */
                     Atmp_QA = Af_QA[ k ];
@@ -142,30 +142,30 @@ void silk_burg_modified_sse4_1(
                 }
                 tmp1 = silk_LSHIFT32( -tmp1, 32 - QA - rshifts );                                       /* Q(16-rshifts) */
                 tmp2 = silk_LSHIFT32( -tmp2, 32 - QA - rshifts );                                       /* Q(16-rshifts) */
-                for( k = 0; k <= n; k++ ) {
+                for (k = 0; k <= n; k++) {
                     CAf[ k ] = silk_SMLAWB( CAf[ k ], tmp1, x_ptr[ n - k ]                    );        /* Q( -rshift ) */
                     CAb[ k ] = silk_SMLAWB( CAb[ k ], tmp2, x_ptr[ subfr_length - n + k - 1 ] );        /* Q( -rshift ) */
                 }
             }
         } else {
-            for( s = 0; s < nb_subfr; s++ ) {
-                x_ptr = x + s * subfr_length;
-                x1  = -silk_LSHIFT32( (oac_int32)x_ptr[ n ],                    -rshifts );            /* Q( -rshifts ) */
-                x2  = -silk_LSHIFT32( (oac_int32)x_ptr[ subfr_length - n - 1 ], -rshifts );            /* Q( -rshifts ) */
-                tmp1 = silk_LSHIFT32( (oac_int32)x_ptr[ n ],                    17 );                  /* Q17 */
-                tmp2 = silk_LSHIFT32( (oac_int32)x_ptr[ subfr_length - n - 1 ], 17 );                  /* Q17 */
+            for (s = 0; s < nb_subfr; s++) {
+                x_ptr = x + s*subfr_length;
+                x1  = -silk_LSHIFT32((oac_int32)x_ptr[ n ],                    -rshifts );             /* Q( -rshifts ) */
+                x2  = -silk_LSHIFT32((oac_int32)x_ptr[ subfr_length - n - 1 ], -rshifts );             /* Q( -rshifts ) */
+                tmp1 = silk_LSHIFT32((oac_int32)x_ptr[ n ],                    17 );                   /* Q17 */
+                tmp2 = silk_LSHIFT32((oac_int32)x_ptr[ subfr_length - n - 1 ], 17 );                   /* Q17 */
 
                 X1_3210 = _mm_set1_epi32( x1 );
                 X2_3210 = _mm_set1_epi32( x2 );
                 TMP1_3210 = _mm_setzero_si128();
                 TMP2_3210 = _mm_setzero_si128();
-                for( k = 0; k < n - 3; k += 4 ) {
+                for (k = 0; k < n - 3; k += 4) {
                     PTR_3210   = OP_CVTEPI16_EPI32_M64( &x_ptr[ n - k - 1 - 3 ] );
                     SUBFR_3210 = OP_CVTEPI16_EPI32_M64( &x_ptr[ subfr_length - n + k ] );
-                    FIRST_3210 = _mm_loadu_si128( (__m128i *)(void*)&C_first_row[ k ] );
-                    PTR_3210   = _mm_shuffle_epi32( PTR_3210,  _MM_SHUFFLE( 0, 1, 2, 3 ) );
-                    LAST_3210  = _mm_loadu_si128( (__m128i *)(void*)&C_last_row[ k ] );
-                    ATMP_3210  = _mm_loadu_si128( (__m128i *)(void*)&Af_QA[ k ] );
+                    FIRST_3210 = _mm_loadu_si128((__m128i *)(void*)&C_first_row[ k ] );
+                    PTR_3210   = _mm_shuffle_epi32( PTR_3210,  _MM_SHUFFLE( 0, 1, 2, 3 ));
+                    LAST_3210  = _mm_loadu_si128((__m128i *)(void*)&C_last_row[ k ] );
+                    ATMP_3210  = _mm_loadu_si128((__m128i *)(void*)&Af_QA[ k ] );
 
                     T1_3210 = _mm_mullo_epi32( PTR_3210, X1_3210 );
                     T2_3210 = _mm_mullo_epi32( SUBFR_3210, X2_3210 );
@@ -180,22 +180,22 @@ void silk_burg_modified_sse4_1(
                     PTR_3210   = _mm_mullo_epi32( ATMP_3210, PTR_3210 );
                     SUBFR_3210   = _mm_mullo_epi32( ATMP_3210, SUBFR_3210 );
 
-                    _mm_storeu_si128( (__m128i *)(void*)&C_first_row[ k ], FIRST_3210 );
-                    _mm_storeu_si128( (__m128i *)(void*)&C_last_row[ k ], LAST_3210 );
+                    _mm_storeu_si128((__m128i *)(void*)&C_first_row[ k ], FIRST_3210 );
+                    _mm_storeu_si128((__m128i *)(void*)&C_last_row[ k ], LAST_3210 );
 
                     TMP1_3210 = _mm_add_epi32( TMP1_3210, PTR_3210 );
                     TMP2_3210 = _mm_add_epi32( TMP2_3210, SUBFR_3210 );
                 }
 
-                TMP1_3210 = _mm_add_epi32( TMP1_3210, _mm_unpackhi_epi64(TMP1_3210, TMP1_3210 ) );
-                TMP2_3210 = _mm_add_epi32( TMP2_3210, _mm_unpackhi_epi64(TMP2_3210, TMP2_3210 ) );
-                TMP1_3210 = _mm_add_epi32( TMP1_3210, _mm_shufflelo_epi16(TMP1_3210, 0x0E ) );
-                TMP2_3210 = _mm_add_epi32( TMP2_3210, _mm_shufflelo_epi16(TMP2_3210, 0x0E ) );
+                TMP1_3210 = _mm_add_epi32( TMP1_3210, _mm_unpackhi_epi64(TMP1_3210, TMP1_3210 ));
+                TMP2_3210 = _mm_add_epi32( TMP2_3210, _mm_unpackhi_epi64(TMP2_3210, TMP2_3210 ));
+                TMP1_3210 = _mm_add_epi32( TMP1_3210, _mm_shufflelo_epi16(TMP1_3210, 0x0E ));
+                TMP2_3210 = _mm_add_epi32( TMP2_3210, _mm_shufflelo_epi16(TMP2_3210, 0x0E ));
 
                 tmp1 += _mm_cvtsi128_si32( TMP1_3210 );
                 tmp2 += _mm_cvtsi128_si32( TMP2_3210 );
 
-                for( ; k < n; k++ ) {
+                for ( ; k < n; k++) {
                     C_first_row[ k ] = silk_MLA( C_first_row[ k ], x1, x_ptr[ n - k - 1 ]            ); /* Q( -rshifts ) */
                     C_last_row[ k ]  = silk_MLA( C_last_row[ k ],  x2, x_ptr[ subfr_length - n + k ] ); /* Q( -rshifts ) */
                     Atmp1 = silk_RSHIFT_ROUND( Af_QA[ k ], QA - 17 );                                   /* Q17 */
@@ -217,18 +217,18 @@ void silk_burg_modified_sse4_1(
                     xmm_tmp1 = _mm_set1_epi32( tmp1 );
                     xmm_tmp2 = _mm_set1_epi32( tmp2 );
 
-                    for( k = 0; k <= n - 3; k += 4 ) {
+                    for (k = 0; k <= n - 3; k += 4) {
                         xmm_x_ptr_n_k_x2x0 = OP_CVTEPI16_EPI32_M64( &x_ptr[ n - k - 3 ] );
                         xmm_x_ptr_sub_x2x0 = OP_CVTEPI16_EPI32_M64( &x_ptr[ subfr_length - n + k - 1 ] );
 
-                        xmm_x_ptr_n_k_x2x0 = _mm_shuffle_epi32( xmm_x_ptr_n_k_x2x0, _MM_SHUFFLE( 0, 1, 2, 3 ) );
+                        xmm_x_ptr_n_k_x2x0 = _mm_shuffle_epi32( xmm_x_ptr_n_k_x2x0, _MM_SHUFFLE( 0, 1, 2, 3 ));
 
                         xmm_x_ptr_n_k_x2x0 = _mm_slli_epi32( xmm_x_ptr_n_k_x2x0, -rshifts - 1 );
                         xmm_x_ptr_sub_x2x0 = _mm_slli_epi32( xmm_x_ptr_sub_x2x0, -rshifts - 1 );
 
                         /* equal shift right 4 bytes, xmm_x_ptr_n_k_x3x1 = _mm_srli_si128(xmm_x_ptr_n_k_x2x0, 4)*/
-                        xmm_x_ptr_n_k_x3x1 = _mm_shuffle_epi32( xmm_x_ptr_n_k_x2x0, _MM_SHUFFLE( 0, 3, 2, 1 ) );
-                        xmm_x_ptr_sub_x3x1 = _mm_shuffle_epi32( xmm_x_ptr_sub_x2x0, _MM_SHUFFLE( 0, 3, 2, 1 ) );
+                        xmm_x_ptr_n_k_x3x1 = _mm_shuffle_epi32( xmm_x_ptr_n_k_x2x0, _MM_SHUFFLE( 0, 3, 2, 1 ));
+                        xmm_x_ptr_sub_x3x1 = _mm_shuffle_epi32( xmm_x_ptr_sub_x2x0, _MM_SHUFFLE( 0, 3, 2, 1 ));
 
                         xmm_x_ptr_n_k_x2x0 = _mm_mul_epi32( xmm_x_ptr_n_k_x2x0, xmm_tmp1 );
                         xmm_x_ptr_n_k_x3x1 = _mm_mul_epi32( xmm_x_ptr_n_k_x3x1, xmm_tmp1 );
@@ -243,21 +243,21 @@ void silk_burg_modified_sse4_1(
                         xmm_x_ptr_n_k_x2x0 = _mm_blend_epi16( xmm_x_ptr_n_k_x2x0, xmm_x_ptr_n_k_x3x1, 0xCC );
                         xmm_x_ptr_sub_x2x0 = _mm_blend_epi16( xmm_x_ptr_sub_x2x0, xmm_x_ptr_sub_x3x1, 0xCC );
 
-                        X1_3210  = _mm_loadu_si128( (__m128i *)(void*)&CAf[ k ] );
-                        PTR_3210 = _mm_loadu_si128( (__m128i *)(void*)&CAb[ k ] );
+                        X1_3210  = _mm_loadu_si128((__m128i *)(void*)&CAf[ k ] );
+                        PTR_3210 = _mm_loadu_si128((__m128i *)(void*)&CAb[ k ] );
 
                         X1_3210  = _mm_add_epi32( X1_3210, xmm_x_ptr_n_k_x2x0 );
                         PTR_3210 = _mm_add_epi32( PTR_3210, xmm_x_ptr_sub_x2x0 );
 
-                        _mm_storeu_si128( (__m128i *)(void*)&CAf[ k ], X1_3210 );
-                        _mm_storeu_si128( (__m128i *)(void*)&CAb[ k ], PTR_3210 );
+                        _mm_storeu_si128((__m128i *)(void*)&CAf[ k ], X1_3210 );
+                        _mm_storeu_si128((__m128i *)(void*)&CAb[ k ], PTR_3210 );
                     }
 
-                    for( ; k <= n; k++ ) {
+                    for ( ; k <= n; k++) {
                         CAf[ k ] = silk_SMLAWW( CAf[ k ], tmp1,
-                            silk_LSHIFT32( (oac_int32)x_ptr[ n - k ], -rshifts - 1 ) );                    /* Q( -rshift ) */
+                            silk_LSHIFT32((oac_int32)x_ptr[ n - k ], -rshifts - 1 ));                      /* Q( -rshift ) */
                         CAb[ k ] = silk_SMLAWW( CAb[ k ], tmp2,
-                            silk_LSHIFT32( (oac_int32)x_ptr[ subfr_length - n + k - 1 ], -rshifts - 1 ) ); /* Q( -rshift ) */
+                            silk_LSHIFT32((oac_int32)x_ptr[ subfr_length - n + k - 1 ], -rshifts - 1 ));   /* Q( -rshift ) */
                     }
                 }
             }
@@ -268,9 +268,9 @@ void silk_burg_modified_sse4_1(
         tmp2 = C_last_row[ n ];                                                                         /* Q( -rshifts ) */
         num  = 0;                                                                                       /* Q( -rshifts ) */
         nrg  = silk_ADD32( CAb[ 0 ], CAf[ 0 ] );                                                        /* Q( 1-rshifts ) */
-        for( k = 0; k < n; k++ ) {
+        for (k = 0; k < n; k++) {
             Atmp_QA = Af_QA[ k ];
-            lz = silk_CLZ32( silk_abs( Atmp_QA ) ) - 1;
+            lz = silk_CLZ32( silk_abs( Atmp_QA )) - 1;
             lz = silk_min( 32 - QA, lz );
             Atmp1 = silk_LSHIFT32( Atmp_QA, lz );                                                       /* Q( QA + lz ) */
 
@@ -286,24 +286,24 @@ void silk_burg_modified_sse4_1(
         num = silk_LSHIFT32( -num, 1 );                                                                 /* Q( 1-rshifts ) */
 
         /* Calculate the next order reflection (parcor) coefficient */
-        if( silk_abs( num ) < nrg ) {
+        if (silk_abs( num ) < nrg) {
             rc_Q31 = silk_DIV32_varQ( num, nrg, 31 );
         } else {
-            rc_Q31 = ( num > 0 ) ? silk_int32_MAX : silk_int32_MIN;
+            rc_Q31 = (num > 0) ? silk_int32_MAX : silk_int32_MIN;
         }
 
         /* Update inverse prediction gain */
-        tmp1 = ( (oac_int32)1 << 30 ) - silk_SMMUL( rc_Q31, rc_Q31 );
+        tmp1 = ((oac_int32)1<<30) - silk_SMMUL( rc_Q31, rc_Q31 );
         tmp1 = silk_LSHIFT( silk_SMMUL( invGain_Q30, tmp1 ), 2 );
-        if( tmp1 <= minInvGain_Q30 ) {
+        if (tmp1 <= minInvGain_Q30) {
             /* Max prediction gain exceeded; set reflection coefficient such that max prediction gain is exactly hit */
-            tmp2 = ( (oac_int32)1 << 30 ) - silk_DIV32_varQ( minInvGain_Q30, invGain_Q30, 30 );            /* Q30 */
+            tmp2 = ((oac_int32)1<<30) - silk_DIV32_varQ( minInvGain_Q30, invGain_Q30, 30 );                /* Q30 */
             rc_Q31 = silk_SQRT_APPROX( tmp2 );                                                  /* Q15 */
-            if( rc_Q31 > 0 ) {
-                 /* Newton-Raphson iteration */
+            if (rc_Q31 > 0) {
+                /* Newton-Raphson iteration */
                 rc_Q31 = silk_RSHIFT32( rc_Q31 + silk_DIV32( tmp2, rc_Q31 ), 1 );                   /* Q15 */
                 rc_Q31 = silk_LSHIFT32( rc_Q31, 16 );                                               /* Q31 */
-                if( num < 0 ) {
+                if (num < 0) {
                     /* Ensure adjusted reflection coefficients has the original sign */
                     rc_Q31 = -rc_Q31;
                 }
@@ -315,7 +315,7 @@ void silk_burg_modified_sse4_1(
         }
 
         /* Update the AR coefficients */
-        for( k = 0; k < (n + 1) >> 1; k++ ) {
+        for (k = 0; k < (n + 1)>>1; k++) {
             tmp1 = Af_QA[ k ];                                                                  /* QA */
             tmp2 = Af_QA[ n - k - 1 ];                                                          /* QA */
             Af_QA[ k ]         = silk_ADD_LSHIFT32( tmp1, silk_SMMUL( tmp2, rc_Q31 ), 1 );      /* QA */
@@ -323,16 +323,16 @@ void silk_burg_modified_sse4_1(
         }
         Af_QA[ n ] = silk_RSHIFT32( rc_Q31, 31 - QA );                                          /* QA */
 
-        if( reached_max_gain ) {
+        if (reached_max_gain) {
             /* Reached max prediction gain; set remaining coefficients to zero and exit loop */
-            for( k = n + 1; k < D; k++ ) {
+            for (k = n + 1; k < D; k++) {
                 Af_QA[ k ] = 0;
             }
             break;
         }
 
         /* Update C * Af and C * Ab */
-        for( k = 0; k <= n + 1; k++ ) {
+        for (k = 0; k <= n + 1; k++) {
             tmp1 = CAf[ k ];                                                                    /* Q( -rshifts ) */
             tmp2 = CAb[ n - k + 1 ];                                                            /* Q( -rshifts ) */
             CAf[ k ]         = silk_ADD_LSHIFT32( tmp1, silk_SMMUL( tmp2, rc_Q31 ), 1 );        /* Q( -rshifts ) */
@@ -340,20 +340,20 @@ void silk_burg_modified_sse4_1(
         }
     }
 
-    if( reached_max_gain ) {
-        for( k = 0; k < D; k++ ) {
+    if (reached_max_gain) {
+        for (k = 0; k < D; k++) {
             /* Scale coefficients */
             A_Q16[ k ] = -silk_RSHIFT_ROUND( Af_QA[ k ], QA - 16 );
         }
         /* Subtract energy of preceding samples from C0 */
-        if( rshifts > 0 ) {
-            for( s = 0; s < nb_subfr; s++ ) {
-                x_ptr = x + s * subfr_length;
+        if (rshifts > 0) {
+            for (s = 0; s < nb_subfr; s++) {
+                x_ptr = x + s*subfr_length;
                 C0 -= (oac_int32)silk_RSHIFT64( silk_inner_prod16( x_ptr, x_ptr, D, arch ), rshifts );
             }
         } else {
-            for( s = 0; s < nb_subfr; s++ ) {
-                x_ptr = x + s * subfr_length;
+            for (s = 0; s < nb_subfr; s++) {
+                x_ptr = x + s*subfr_length;
                 C0 -= silk_LSHIFT32( silk_inner_prod_aligned( x_ptr, x_ptr, D, arch ), -rshifts );
             }
         }
@@ -363,8 +363,8 @@ void silk_burg_modified_sse4_1(
     } else {
         /* Return residual energy */
         nrg  = CAf[ 0 ];                                                                            /* Q( -rshifts ) */
-        tmp1 = (oac_int32)1 << 16;                                                                             /* Q16 */
-        for( k = 0; k < D; k++ ) {
+        tmp1 = (oac_int32)1<<16;                                                                               /* Q16 */
+        for (k = 0; k < D; k++) {
             Atmp1 = silk_RSHIFT_ROUND( Af_QA[ k ], QA - 16 );                                       /* Q16 */
             nrg  = silk_SMLAWW( nrg, CAf[ k + 1 ], Atmp1 );                                         /* Q( -rshifts ) */
             tmp1 = silk_SMLAWW( tmp1, Atmp1, Atmp1 );                                               /* Q16 */
@@ -390,11 +390,11 @@ void silk_burg_modified_sse4_1(
             nb_subfr,
             D,
             0
-        );
+            );
 
         silk_assert( *res_nrg == res_nrg_c );
         silk_assert( *res_nrg_Q == res_nrg_Q_c );
-        silk_assert( !memcmp( A_Q16, A_Q16_c, D * sizeof( *A_Q16 ) ) );
+        silk_assert( !memcmp( A_Q16, A_Q16_c, D*sizeof(*A_Q16)));
     }
 #endif
 }
diff --git a/silk/fixed/x86/vector_ops_FIX_sse4_1.c b/silk/fixed/x86/vector_ops_FIX_sse4_1.c
index c0be8d597..8eae66204 100644
--- a/silk/fixed/x86/vector_ops_FIX_sse4_1.c
+++ b/silk/fixed/x86/vector_ops_FIX_sse4_1.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <xmmintrin.h>
@@ -41,10 +41,9 @@
 oac_int64 silk_inner_prod16_sse4_1(
     const oac_int16            *inVec1,            /*    I input vector 1                                              */
     const oac_int16            *inVec2,            /*    I input vector 2                                              */
-    const oac_int              len                 /*    I vector lengths                                              */
-)
-{
-    oac_int  i, dataSize4;
+    const oac_int len                              /*    I vector lengths                                              */
+    ) {
+    oac_int i, dataSize4;
     oac_int64 sum;
 
     __m128i xmm_prod_20, xmm_prod_31;
@@ -52,18 +51,18 @@ oac_int64 silk_inner_prod16_sse4_1(
     __m128i inVec2_3210, acc2;
 
     sum = 0;
-    dataSize4 = len & ~3;
+    dataSize4 = len&~3;
 
     acc1 = _mm_setzero_si128();
     acc2 = _mm_setzero_si128();
 
-    for( i = 0; i < dataSize4; i += 4 ) {
+    for (i = 0; i < dataSize4; i += 4) {
         inVec1_3210 = OP_CVTEPI16_EPI32_M64( &inVec1[i + 0] );
         inVec2_3210 = OP_CVTEPI16_EPI32_M64( &inVec2[i + 0] );
         xmm_prod_20 = _mm_mul_epi32( inVec1_3210, inVec2_3210 );
 
-        inVec1_3210 = _mm_shuffle_epi32( inVec1_3210, _MM_SHUFFLE( 0, 3, 2, 1 ) );
-        inVec2_3210 = _mm_shuffle_epi32( inVec2_3210, _MM_SHUFFLE( 0, 3, 2, 1 ) );
+        inVec1_3210 = _mm_shuffle_epi32( inVec1_3210, _MM_SHUFFLE( 0, 3, 2, 1 ));
+        inVec2_3210 = _mm_shuffle_epi32( inVec2_3210, _MM_SHUFFLE( 0, 3, 2, 1 ));
         xmm_prod_31 = _mm_mul_epi32( inVec1_3210, inVec2_3210 );
 
         acc1 = _mm_add_epi64( acc1, xmm_prod_20 );
@@ -73,12 +72,12 @@ oac_int64 silk_inner_prod16_sse4_1(
     acc1 = _mm_add_epi64( acc1, acc2 );
 
     /* equal shift right 8 bytes */
-    acc2 = _mm_shuffle_epi32( acc1, _MM_SHUFFLE( 0, 0, 3, 2 ) );
+    acc2 = _mm_shuffle_epi32( acc1, _MM_SHUFFLE( 0, 0, 3, 2 ));
     acc1 = _mm_add_epi64( acc1, acc2 );
 
-    _mm_storel_epi64( (__m128i *)(void *)&sum, acc1 );
+    _mm_storel_epi64((__m128i *)(void *)&sum, acc1 );
 
-    for( ; i < len; i++ ) {
+    for ( ; i < len; i++) {
         sum = silk_SMLALBB( sum, inVec1[ i ], inVec2[ i ] );
     }
 
diff --git a/silk/float/LPC_analysis_filter_FLP.c b/silk/float/LPC_analysis_filter_FLP.c
index 77bed6757..33a212a20 100644
--- a/silk/float/LPC_analysis_filter_FLP.c
+++ b/silk/float/LPC_analysis_filter_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdlib.h>
@@ -41,36 +41,35 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* 16th order LPC analysis filter, does not write first 16 samples */
 static OAC_INLINE void silk_LPC_analysis_filter16_FLP(
-          silk_float                 r_LPC[],            /* O    LPC residual signal                     */
-    const silk_float                 PredCoef[],         /* I    LPC coefficients                        */
-    const silk_float                 s[],                /* I    Input signal                            */
-    const oac_int                   length              /* I    Length of input signal                  */
-)
-{
-    oac_int   ix;
+    silk_float r_LPC[],                                  /* O    LPC residual signal                     */
+    const silk_float PredCoef[],                         /* I    LPC coefficients                        */
+    const silk_float s[],                                /* I    Input signal                            */
+    const oac_int length                                /* I    Length of input signal                  */
+    ) {
+    oac_int ix;
     silk_float LPC_pred;
     const silk_float *s_ptr;
 
-    for( ix = 16; ix < length; ix++ ) {
+    for (ix = 16; ix < length; ix++) {
         s_ptr = &s[ix - 1];
 
         /* short-term prediction */
-        LPC_pred = s_ptr[  0 ]  * PredCoef[ 0 ]  +
-                   s_ptr[ -1 ]  * PredCoef[ 1 ]  +
-                   s_ptr[ -2 ]  * PredCoef[ 2 ]  +
-                   s_ptr[ -3 ]  * PredCoef[ 3 ]  +
-                   s_ptr[ -4 ]  * PredCoef[ 4 ]  +
-                   s_ptr[ -5 ]  * PredCoef[ 5 ]  +
-                   s_ptr[ -6 ]  * PredCoef[ 6 ]  +
-                   s_ptr[ -7 ]  * PredCoef[ 7 ]  +
-                   s_ptr[ -8 ]  * PredCoef[ 8 ]  +
-                   s_ptr[ -9 ]  * PredCoef[ 9 ]  +
-                   s_ptr[ -10 ] * PredCoef[ 10 ] +
-                   s_ptr[ -11 ] * PredCoef[ 11 ] +
-                   s_ptr[ -12 ] * PredCoef[ 12 ] +
-                   s_ptr[ -13 ] * PredCoef[ 13 ] +
-                   s_ptr[ -14 ] * PredCoef[ 14 ] +
-                   s_ptr[ -15 ] * PredCoef[ 15 ];
+        LPC_pred = s_ptr[  0 ]*PredCoef[ 0 ]
+                   + s_ptr[ -1 ]*PredCoef[ 1 ]
+                   + s_ptr[ -2 ]*PredCoef[ 2 ]
+                   + s_ptr[ -3 ]*PredCoef[ 3 ]
+                   + s_ptr[ -4 ]*PredCoef[ 4 ]
+                   + s_ptr[ -5 ]*PredCoef[ 5 ]
+                   + s_ptr[ -6 ]*PredCoef[ 6 ]
+                   + s_ptr[ -7 ]*PredCoef[ 7 ]
+                   + s_ptr[ -8 ]*PredCoef[ 8 ]
+                   + s_ptr[ -9 ]*PredCoef[ 9 ]
+                   + s_ptr[ -10 ]*PredCoef[ 10 ]
+                   + s_ptr[ -11 ]*PredCoef[ 11 ]
+                   + s_ptr[ -12 ]*PredCoef[ 12 ]
+                   + s_ptr[ -13 ]*PredCoef[ 13 ]
+                   + s_ptr[ -14 ]*PredCoef[ 14 ]
+                   + s_ptr[ -15 ]*PredCoef[ 15 ];
 
         /* prediction error */
         r_LPC[ix] = s_ptr[ 1 ] - LPC_pred;
@@ -79,32 +78,31 @@ static OAC_INLINE void silk_LPC_analysis_filter16_FLP(
 
 /* 12th order LPC analysis filter, does not write first 12 samples */
 static OAC_INLINE void silk_LPC_analysis_filter12_FLP(
-          silk_float                 r_LPC[],            /* O    LPC residual signal                     */
-    const silk_float                 PredCoef[],         /* I    LPC coefficients                        */
-    const silk_float                 s[],                /* I    Input signal                            */
-    const oac_int                   length              /* I    Length of input signal                  */
-)
-{
-    oac_int   ix;
+    silk_float r_LPC[],                                  /* O    LPC residual signal                     */
+    const silk_float PredCoef[],                         /* I    LPC coefficients                        */
+    const silk_float s[],                                /* I    Input signal                            */
+    const oac_int length                                /* I    Length of input signal                  */
+    ) {
+    oac_int ix;
     silk_float LPC_pred;
     const silk_float *s_ptr;
 
-    for( ix = 12; ix < length; ix++ ) {
+    for (ix = 12; ix < length; ix++) {
         s_ptr = &s[ix - 1];
 
         /* short-term prediction */
-        LPC_pred = s_ptr[  0 ]  * PredCoef[ 0 ]  +
-                   s_ptr[ -1 ]  * PredCoef[ 1 ]  +
-                   s_ptr[ -2 ]  * PredCoef[ 2 ]  +
-                   s_ptr[ -3 ]  * PredCoef[ 3 ]  +
-                   s_ptr[ -4 ]  * PredCoef[ 4 ]  +
-                   s_ptr[ -5 ]  * PredCoef[ 5 ]  +
-                   s_ptr[ -6 ]  * PredCoef[ 6 ]  +
-                   s_ptr[ -7 ]  * PredCoef[ 7 ]  +
-                   s_ptr[ -8 ]  * PredCoef[ 8 ]  +
-                   s_ptr[ -9 ]  * PredCoef[ 9 ]  +
-                   s_ptr[ -10 ] * PredCoef[ 10 ] +
-                   s_ptr[ -11 ] * PredCoef[ 11 ];
+        LPC_pred = s_ptr[  0 ]*PredCoef[ 0 ]
+                   + s_ptr[ -1 ]*PredCoef[ 1 ]
+                   + s_ptr[ -2 ]*PredCoef[ 2 ]
+                   + s_ptr[ -3 ]*PredCoef[ 3 ]
+                   + s_ptr[ -4 ]*PredCoef[ 4 ]
+                   + s_ptr[ -5 ]*PredCoef[ 5 ]
+                   + s_ptr[ -6 ]*PredCoef[ 6 ]
+                   + s_ptr[ -7 ]*PredCoef[ 7 ]
+                   + s_ptr[ -8 ]*PredCoef[ 8 ]
+                   + s_ptr[ -9 ]*PredCoef[ 9 ]
+                   + s_ptr[ -10 ]*PredCoef[ 10 ]
+                   + s_ptr[ -11 ]*PredCoef[ 11 ];
 
         /* prediction error */
         r_LPC[ix] = s_ptr[ 1 ] - LPC_pred;
@@ -113,30 +111,29 @@ static OAC_INLINE void silk_LPC_analysis_filter12_FLP(
 
 /* 10th order LPC analysis filter, does not write first 10 samples */
 static OAC_INLINE void silk_LPC_analysis_filter10_FLP(
-          silk_float                 r_LPC[],            /* O    LPC residual signal                     */
-    const silk_float                 PredCoef[],         /* I    LPC coefficients                        */
-    const silk_float                 s[],                /* I    Input signal                            */
-    const oac_int                   length              /* I    Length of input signal                  */
-)
-{
-    oac_int   ix;
+    silk_float r_LPC[],                                  /* O    LPC residual signal                     */
+    const silk_float PredCoef[],                         /* I    LPC coefficients                        */
+    const silk_float s[],                                /* I    Input signal                            */
+    const oac_int length                                /* I    Length of input signal                  */
+    ) {
+    oac_int ix;
     silk_float LPC_pred;
     const silk_float *s_ptr;
 
-    for( ix = 10; ix < length; ix++ ) {
+    for (ix = 10; ix < length; ix++) {
         s_ptr = &s[ix - 1];
 
         /* short-term prediction */
-        LPC_pred = s_ptr[  0 ] * PredCoef[ 0 ]  +
-                   s_ptr[ -1 ] * PredCoef[ 1 ]  +
-                   s_ptr[ -2 ] * PredCoef[ 2 ]  +
-                   s_ptr[ -3 ] * PredCoef[ 3 ]  +
-                   s_ptr[ -4 ] * PredCoef[ 4 ]  +
-                   s_ptr[ -5 ] * PredCoef[ 5 ]  +
-                   s_ptr[ -6 ] * PredCoef[ 6 ]  +
-                   s_ptr[ -7 ] * PredCoef[ 7 ]  +
-                   s_ptr[ -8 ] * PredCoef[ 8 ]  +
-                   s_ptr[ -9 ] * PredCoef[ 9 ];
+        LPC_pred = s_ptr[  0 ]*PredCoef[ 0 ]
+                   + s_ptr[ -1 ]*PredCoef[ 1 ]
+                   + s_ptr[ -2 ]*PredCoef[ 2 ]
+                   + s_ptr[ -3 ]*PredCoef[ 3 ]
+                   + s_ptr[ -4 ]*PredCoef[ 4 ]
+                   + s_ptr[ -5 ]*PredCoef[ 5 ]
+                   + s_ptr[ -6 ]*PredCoef[ 6 ]
+                   + s_ptr[ -7 ]*PredCoef[ 7 ]
+                   + s_ptr[ -8 ]*PredCoef[ 8 ]
+                   + s_ptr[ -9 ]*PredCoef[ 9 ];
 
         /* prediction error */
         r_LPC[ix] = s_ptr[ 1 ] - LPC_pred;
@@ -145,28 +142,27 @@ static OAC_INLINE void silk_LPC_analysis_filter10_FLP(
 
 /* 8th order LPC analysis filter, does not write first 8 samples */
 static OAC_INLINE void silk_LPC_analysis_filter8_FLP(
-          silk_float                 r_LPC[],            /* O    LPC residual signal                     */
-    const silk_float                 PredCoef[],         /* I    LPC coefficients                        */
-    const silk_float                 s[],                /* I    Input signal                            */
-    const oac_int                   length              /* I    Length of input signal                  */
-)
-{
-    oac_int   ix;
+    silk_float r_LPC[],                                  /* O    LPC residual signal                     */
+    const silk_float PredCoef[],                         /* I    LPC coefficients                        */
+    const silk_float s[],                                /* I    Input signal                            */
+    const oac_int length                                /* I    Length of input signal                  */
+    ) {
+    oac_int ix;
     silk_float LPC_pred;
     const silk_float *s_ptr;
 
-    for( ix = 8; ix < length; ix++ ) {
+    for (ix = 8; ix < length; ix++) {
         s_ptr = &s[ix - 1];
 
         /* short-term prediction */
-        LPC_pred = s_ptr[  0 ] * PredCoef[ 0 ]  +
-                   s_ptr[ -1 ] * PredCoef[ 1 ]  +
-                   s_ptr[ -2 ] * PredCoef[ 2 ]  +
-                   s_ptr[ -3 ] * PredCoef[ 3 ]  +
-                   s_ptr[ -4 ] * PredCoef[ 4 ]  +
-                   s_ptr[ -5 ] * PredCoef[ 5 ]  +
-                   s_ptr[ -6 ] * PredCoef[ 6 ]  +
-                   s_ptr[ -7 ] * PredCoef[ 7 ];
+        LPC_pred = s_ptr[  0 ]*PredCoef[ 0 ]
+                   + s_ptr[ -1 ]*PredCoef[ 1 ]
+                   + s_ptr[ -2 ]*PredCoef[ 2 ]
+                   + s_ptr[ -3 ]*PredCoef[ 3 ]
+                   + s_ptr[ -4 ]*PredCoef[ 4 ]
+                   + s_ptr[ -5 ]*PredCoef[ 5 ]
+                   + s_ptr[ -6 ]*PredCoef[ 6 ]
+                   + s_ptr[ -7 ]*PredCoef[ 7 ];
 
         /* prediction error */
         r_LPC[ix] = s_ptr[ 1 ] - LPC_pred;
@@ -175,26 +171,25 @@ static OAC_INLINE void silk_LPC_analysis_filter8_FLP(
 
 /* 6th order LPC analysis filter, does not write first 6 samples */
 static OAC_INLINE void silk_LPC_analysis_filter6_FLP(
-          silk_float                 r_LPC[],            /* O    LPC residual signal                     */
-    const silk_float                 PredCoef[],         /* I    LPC coefficients                        */
-    const silk_float                 s[],                /* I    Input signal                            */
-    const oac_int                   length              /* I    Length of input signal                  */
-)
-{
-    oac_int   ix;
+    silk_float r_LPC[],                                  /* O    LPC residual signal                     */
+    const silk_float PredCoef[],                         /* I    LPC coefficients                        */
+    const silk_float s[],                                /* I    Input signal                            */
+    const oac_int length                                /* I    Length of input signal                  */
+    ) {
+    oac_int ix;
     silk_float LPC_pred;
     const silk_float *s_ptr;
 
-    for( ix = 6; ix < length; ix++ ) {
+    for (ix = 6; ix < length; ix++) {
         s_ptr = &s[ix - 1];
 
         /* short-term prediction */
-        LPC_pred = s_ptr[  0 ] * PredCoef[ 0 ]  +
-                   s_ptr[ -1 ] * PredCoef[ 1 ]  +
-                   s_ptr[ -2 ] * PredCoef[ 2 ]  +
-                   s_ptr[ -3 ] * PredCoef[ 3 ]  +
-                   s_ptr[ -4 ] * PredCoef[ 4 ]  +
-                   s_ptr[ -5 ] * PredCoef[ 5 ];
+        LPC_pred = s_ptr[  0 ]*PredCoef[ 0 ]
+                   + s_ptr[ -1 ]*PredCoef[ 1 ]
+                   + s_ptr[ -2 ]*PredCoef[ 2 ]
+                   + s_ptr[ -3 ]*PredCoef[ 3 ]
+                   + s_ptr[ -4 ]*PredCoef[ 4 ]
+                   + s_ptr[ -5 ]*PredCoef[ 5 ];
 
         /* prediction error */
         r_LPC[ix] = s_ptr[ 1 ] - LPC_pred;
@@ -208,41 +203,40 @@ static OAC_INLINE void silk_LPC_analysis_filter6_FLP(
 /* first Order output samples are set to zero   */
 /************************************************/
 void silk_LPC_analysis_filter_FLP(
-    silk_float                      r_LPC[],                            /* O    LPC residual signal                         */
-    const silk_float                PredCoef[],                         /* I    LPC coefficients                            */
-    const silk_float                s[],                                /* I    Input signal                                */
-    const oac_int                  length,                             /* I    Length of input signal                      */
-    const oac_int                  Order                               /* I    LPC order                                   */
-)
-{
+    silk_float r_LPC[],                                                 /* O    LPC residual signal                         */
+    const silk_float PredCoef[],                                        /* I    LPC coefficients                            */
+    const silk_float s[],                                               /* I    Input signal                                */
+    const oac_int length,                                              /* I    Length of input signal                      */
+    const oac_int Order                                                /* I    LPC order                                   */
+    ) {
     celt_assert( Order <= length );
 
-    switch( Order ) {
+    switch (Order) {
         case 6:
             silk_LPC_analysis_filter6_FLP(  r_LPC, PredCoef, s, length );
-        break;
+            break;
 
         case 8:
             silk_LPC_analysis_filter8_FLP(  r_LPC, PredCoef, s, length );
-        break;
+            break;
 
         case 10:
             silk_LPC_analysis_filter10_FLP( r_LPC, PredCoef, s, length );
-        break;
+            break;
 
         case 12:
             silk_LPC_analysis_filter12_FLP( r_LPC, PredCoef, s, length );
-        break;
+            break;
 
         case 16:
             silk_LPC_analysis_filter16_FLP( r_LPC, PredCoef, s, length );
-        break;
+            break;
 
         default:
             celt_assert( 0 );
-        break;
+            break;
     }
 
     /* Set first Order output samples to zero */
-    silk_memset( r_LPC, 0, Order * sizeof( silk_float ) );
+    silk_memset( r_LPC, 0, Order*sizeof(silk_float));
 }
diff --git a/silk/float/LPC_inv_pred_gain_FLP.c b/silk/float/LPC_inv_pred_gain_FLP.c
index 68c280e90..848296c0a 100644
--- a/silk/float/LPC_inv_pred_gain_FLP.c
+++ b/silk/float/LPC_inv_pred_gain_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -38,35 +38,34 @@ POSSIBILITY OF SUCH DAMAGE.
 /* this code is based on silk_a2k_FLP()                                 */
 silk_float silk_LPC_inverse_pred_gain_FLP(  /* O    return inverse prediction gain, energy domain               */
     const silk_float    *A,                 /* I    prediction coefficients [order]                             */
-    oac_int32          order               /* I    prediction order                                            */
-)
-{
-    oac_int   k, n;
-    double     invGain, rc, rc_mult1, rc_mult2, tmp1, tmp2;
+    oac_int32 order                        /* I    prediction order                                            */
+    ) {
+    oac_int k, n;
+    double invGain, rc, rc_mult1, rc_mult2, tmp1, tmp2;
     silk_float Atmp[ SILK_MAX_ORDER_LPC ];
 
-    silk_memcpy( Atmp, A, order * sizeof(silk_float) );
+    silk_memcpy( Atmp, A, order*sizeof(silk_float));
 
     invGain = 1.0;
-    for( k = order - 1; k > 0; k-- ) {
+    for (k = order - 1; k > 0; k--) {
         rc = -Atmp[ k ];
-        rc_mult1 = 1.0f - rc * rc;
+        rc_mult1 = 1.0f - rc*rc;
         invGain *= rc_mult1;
-        if( invGain * MAX_PREDICTION_POWER_GAIN < 1.0f ) {
+        if (invGain*MAX_PREDICTION_POWER_GAIN < 1.0f) {
             return 0.0f;
         }
-        rc_mult2 = 1.0f / rc_mult1;
-        for( n = 0; n < (k + 1) >> 1; n++ ) {
+        rc_mult2 = 1.0f/rc_mult1;
+        for (n = 0; n < (k + 1)>>1; n++) {
             tmp1 = Atmp[ n ];
             tmp2 = Atmp[ k - n - 1 ];
-            Atmp[ n ]         = (silk_float)( ( tmp1 - tmp2 * rc ) * rc_mult2 );
-            Atmp[ k - n - 1 ] = (silk_float)( ( tmp2 - tmp1 * rc ) * rc_mult2 );
+            Atmp[ n ]         = (silk_float)((tmp1 - tmp2*rc)*rc_mult2);
+            Atmp[ k - n - 1 ] = (silk_float)((tmp2 - tmp1*rc)*rc_mult2);
         }
     }
     rc = -Atmp[ 0 ];
-    rc_mult1 = 1.0f - rc * rc;
+    rc_mult1 = 1.0f - rc*rc;
     invGain *= rc_mult1;
-    if( invGain * MAX_PREDICTION_POWER_GAIN < 1.0f ) {
+    if (invGain*MAX_PREDICTION_POWER_GAIN < 1.0f) {
         return 0.0f;
     }
     return (silk_float)invGain;
diff --git a/silk/float/LTP_analysis_filter_FLP.c b/silk/float/LTP_analysis_filter_FLP.c
index f23683ca7..a47dce895 100644
--- a/silk/float/LTP_analysis_filter_FLP.c
+++ b/silk/float/LTP_analysis_filter_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FLP.h"
@@ -34,35 +34,34 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_LTP_analysis_filter_FLP(
     silk_float                      *LTP_res,                           /* O    LTP res MAX_NB_SUBFR*(pre_lgth+subfr_lngth) */
     const silk_float                *x,                                 /* I    Input signal, with preceding samples        */
-    const silk_float                B[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    LTP coefficients for each subframe          */
-    const oac_int                  pitchL[   MAX_NB_SUBFR ],           /* I    Pitch lags                                  */
-    const silk_float                invGains[ MAX_NB_SUBFR ],           /* I    Inverse quantization gains                  */
-    const oac_int                  subfr_length,                       /* I    Length of each subframe                     */
-    const oac_int                  nb_subfr,                           /* I    number of subframes                         */
-    const oac_int                  pre_length                          /* I    Preceding samples for each subframe         */
-)
-{
+    const silk_float B[ LTP_ORDER*MAX_NB_SUBFR ],                       /* I    LTP coefficients for each subframe          */
+    const oac_int pitchL[   MAX_NB_SUBFR ],                            /* I    Pitch lags                                  */
+    const silk_float invGains[ MAX_NB_SUBFR ],                          /* I    Inverse quantization gains                  */
+    const oac_int subfr_length,                                        /* I    Length of each subframe                     */
+    const oac_int nb_subfr,                                            /* I    number of subframes                         */
+    const oac_int pre_length                                           /* I    Preceding samples for each subframe         */
+    ) {
     const silk_float *x_ptr, *x_lag_ptr;
-    silk_float   Btmp[ LTP_ORDER ];
+    silk_float Btmp[ LTP_ORDER ];
     silk_float   *LTP_res_ptr;
-    silk_float   inv_gain;
-    oac_int     k, i, j;
+    silk_float inv_gain;
+    oac_int k, i, j;
 
     x_ptr = x;
     LTP_res_ptr = LTP_res;
-    for( k = 0; k < nb_subfr; k++ ) {
+    for (k = 0; k < nb_subfr; k++) {
         x_lag_ptr = x_ptr - pitchL[ k ];
         inv_gain = invGains[ k ];
-        for( i = 0; i < LTP_ORDER; i++ ) {
-            Btmp[ i ] = B[ k * LTP_ORDER + i ];
+        for (i = 0; i < LTP_ORDER; i++) {
+            Btmp[ i ] = B[ k*LTP_ORDER + i ];
         }
 
         /* LTP analysis FIR filter */
-        for( i = 0; i < subfr_length + pre_length; i++ ) {
+        for (i = 0; i < subfr_length + pre_length; i++) {
             LTP_res_ptr[ i ] = x_ptr[ i ];
             /* Subtract long-term prediction */
-            for( j = 0; j < LTP_ORDER; j++ ) {
-                LTP_res_ptr[ i ] -= Btmp[ j ] * x_lag_ptr[ LTP_ORDER / 2 - j ];
+            for (j = 0; j < LTP_ORDER; j++) {
+                LTP_res_ptr[ i ] -= Btmp[ j ]*x_lag_ptr[ LTP_ORDER/2 - j ];
             }
             LTP_res_ptr[ i ] *= inv_gain;
             x_lag_ptr++;
diff --git a/silk/float/LTP_scale_ctrl_FLP.c b/silk/float/LTP_scale_ctrl_FLP.c
index 7a95555a9..910cba9ea 100644
--- a/silk/float/LTP_scale_ctrl_FLP.c
+++ b/silk/float/LTP_scale_ctrl_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FLP.h"
@@ -34,25 +34,26 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_LTP_scale_ctrl_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
-    oac_int                        condCoding                          /* I    The type of conditional coding to use       */
-)
-{
-    oac_int   round_loss;
+    oac_int condCoding                                                 /* I    The type of conditional coding to use       */
+    ) {
+    oac_int round_loss;
 
-    if( condCoding == CODE_INDEPENDENTLY ) {
+    if (condCoding == CODE_INDEPENDENTLY) {
         /* Only scale if first frame in packet */
-        round_loss = psEnc->sCmn.PacketLoss_perc * psEnc->sCmn.nFramesPerPacket;
-        if ( psEnc->sCmn.LBRR_flag ) {
+        round_loss = psEnc->sCmn.PacketLoss_perc*psEnc->sCmn.nFramesPerPacket;
+        if (psEnc->sCmn.LBRR_flag) {
             /* LBRR reduces the effective loss. In practice, it does not square the loss because
                losses aren't independent, but that still seems to work best. We also never go below 2%. */
-            round_loss = 2 + silk_SMULBB( round_loss, round_loss) / 100;
+            round_loss = 2 + silk_SMULBB( round_loss, round_loss)/100;
         }
-        psEnc->sCmn.indices.LTP_scaleIndex = silk_SMULBB( psEncCtrl->LTPredCodGain, round_loss ) > silk_log2lin( 2900 - psEnc->sCmn.SNR_dB_Q7 );
-        psEnc->sCmn.indices.LTP_scaleIndex += silk_SMULBB( psEncCtrl->LTPredCodGain, round_loss ) > silk_log2lin( 3900 - psEnc->sCmn.SNR_dB_Q7 );
+        psEnc->sCmn.indices.LTP_scaleIndex = silk_SMULBB( psEncCtrl->LTPredCodGain,
+        round_loss ) > silk_log2lin( 2900 - psEnc->sCmn.SNR_dB_Q7 );
+        psEnc->sCmn.indices.LTP_scaleIndex += silk_SMULBB( psEncCtrl->LTPredCodGain,
+        round_loss ) > silk_log2lin( 3900 - psEnc->sCmn.SNR_dB_Q7 );
     } else {
         /* Default is minimum scaling */
         psEnc->sCmn.indices.LTP_scaleIndex = 0;
     }
 
-    psEncCtrl->LTP_scale = (silk_float)silk_LTPScales_table_Q14[ psEnc->sCmn.indices.LTP_scaleIndex ] / 16384.0f;
+    psEncCtrl->LTP_scale = (silk_float)silk_LTPScales_table_Q14[ psEnc->sCmn.indices.LTP_scaleIndex ]/16384.0f;
 }
diff --git a/silk/float/SigProc_FLP.h b/silk/float/SigProc_FLP.h
index ba177dab9..208757d34 100644
--- a/silk/float/SigProc_FLP.h
+++ b/silk/float/SigProc_FLP.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_SIGPROC_FLP_H
@@ -41,38 +41,37 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Chirp (bw expand) LP AR filter */
 void silk_bwexpander_FLP(
     silk_float          *ar,                /* I/O  AR filter to be expanded (without leading 1)                */
-    const oac_int      d,                  /* I    length of ar                                                */
-    const silk_float    chirp               /* I    chirp factor (typically in range (0..1) )                   */
-);
+    const oac_int d,                       /* I    length of ar                                                */
+    const silk_float chirp                  /* I    chirp factor (typically in range (0..1) )                   */
+    );
 
 /* compute inverse of LPC prediction gain, and                          */
 /* test if LPC coefficients are stable (all poles within unit circle)   */
 /* this code is based on silk_FLP_a2k()                                 */
 silk_float silk_LPC_inverse_pred_gain_FLP(  /* O    return inverse prediction gain, energy domain               */
     const silk_float    *A,                 /* I    prediction coefficients [order]                             */
-    oac_int32          order               /* I    prediction order                                            */
-);
+    oac_int32 order                        /* I    prediction order                                            */
+    );
 
 silk_float silk_schur_FLP(                  /* O    returns residual energy                                     */
-    silk_float          refl_coef[],        /* O    reflection coefficients (length order)                      */
-    const silk_float    auto_corr[],        /* I    autocorrelation sequence (length order+1)                   */
-    oac_int            order               /* I    order                                                       */
-);
+    silk_float refl_coef[],                 /* O    reflection coefficients (length order)                      */
+    const silk_float auto_corr[],           /* I    autocorrelation sequence (length order+1)                   */
+    oac_int order                          /* I    order                                                       */
+    );
 
 void silk_k2a_FLP(
     silk_float          *A,                 /* O     prediction coefficients [order]                            */
     const silk_float    *rc,                /* I     reflection coefficients [order]                            */
-    oac_int32          order               /* I     prediction order                                           */
-);
+    oac_int32 order                        /* I     prediction order                                           */
+    );
 
 /* compute autocorrelation */
 void silk_autocorrelation_FLP(
     silk_float          *results,           /* O    result (length correlationCount)                            */
     const silk_float    *inputData,         /* I    input data to correlate                                     */
-    oac_int            inputDataSize,      /* I    length of input                                             */
-    oac_int            correlationCount,    /* I    number of correlation taps to compute                       */
-    int                 arch
-);
+    oac_int inputDataSize,                 /* I    length of input                                             */
+    oac_int correlationCount,               /* I    number of correlation taps to compute                       */
+    int arch);
 
 oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1 unvoiced                      */
     const silk_float    *frame,             /* I    Signal of length PE_FRAME_LENGTH_MS*Fs_kHz                  */
@@ -80,65 +79,61 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
     oac_int16          *lagIndex,          /* O    Lag Index                                                   */
     oac_int8           *contourIndex,      /* O    Pitch contour Index                                         */
     silk_float          *LTPCorr,           /* I/O  Normalized correlation; input: value from previous frame    */
-    oac_int            prevLag,            /* I    Last lag of previous frame; set to zero is unvoiced         */
-    const silk_float    search_thres1,      /* I    First stage threshold for lag candidates 0 - 1              */
-    const silk_float    search_thres2,      /* I    Final threshold for lag candidates 0 - 1                    */
-    const oac_int      Fs_kHz,             /* I    sample frequency (kHz)                                      */
-    const oac_int      complexity,         /* I    Complexity setting, 0-2, where 2 is highest                 */
-    const oac_int      nb_subfr,           /* I    Number of 5 ms subframes                                    */
-    int                 arch                /* I    Run-time architecture                                       */
-);
+    oac_int prevLag,                       /* I    Last lag of previous frame; set to zero is unvoiced         */
+    const silk_float search_thres1,         /* I    First stage threshold for lag candidates 0 - 1              */
+    const silk_float search_thres2,         /* I    Final threshold for lag candidates 0 - 1                    */
+    const oac_int Fs_kHz,                  /* I    sample frequency (kHz)                                      */
+    const oac_int complexity,              /* I    Complexity setting, 0-2, where 2 is highest                 */
+    const oac_int nb_subfr,                /* I    Number of 5 ms subframes                                    */
+    int arch                                /* I    Run-time architecture                                       */
+    );
 
 void silk_insertion_sort_decreasing_FLP(
     silk_float          *a,                 /* I/O  Unsorted / Sorted vector                                    */
     oac_int            *idx,               /* O    Index vector for the sorted elements                        */
-    const oac_int      L,                  /* I    Vector length                                               */
-    const oac_int      K                   /* I    Number of correctly sorted positions                        */
-);
+    const oac_int L,                       /* I    Vector length                                               */
+    const oac_int K                        /* I    Number of correctly sorted positions                        */
+    );
 
 /* Compute reflection coefficients from input signal */
 silk_float silk_burg_modified_FLP(          /* O    returns residual energy                                     */
-    silk_float          A[],                /* O    prediction coefficients (length order)                      */
-    const silk_float    x[],                /* I    input signal, length: nb_subfr*(D+L_sub)                    */
-    const silk_float    minInvGain,         /* I    minimum inverse prediction gain                             */
-    const oac_int      subfr_length,       /* I    input signal subframe length (incl. D preceding samples)    */
-    const oac_int      nb_subfr,           /* I    number of subframes stacked in x                            */
-    const oac_int      D,                  /* I    order                                                       */
-    int                 arch
-);
+    silk_float A[],                         /* O    prediction coefficients (length order)                      */
+    const silk_float x[],                   /* I    input signal, length: nb_subfr*(D+L_sub)                    */
+    const silk_float minInvGain,            /* I    minimum inverse prediction gain                             */
+    const oac_int subfr_length,            /* I    input signal subframe length (incl. D preceding samples)    */
+    const oac_int nb_subfr,                /* I    number of subframes stacked in x                            */
+    const oac_int D,                       /* I    order                                                       */
+    int arch);
 
 /* multiply a vector by a constant */
 void silk_scale_vector_FLP(
     silk_float          *data1,
-    silk_float          gain,
-    oac_int            dataSize
-);
+    silk_float gain,
+    oac_int dataSize);
 
 /* copy and multiply a vector by a constant */
 void silk_scale_copy_vector_FLP(
     silk_float          *data_out,
     const silk_float    *data_in,
-    silk_float          gain,
-    oac_int            dataSize
-);
+    silk_float gain,
+    oac_int dataSize);
 
 /* inner product of two silk_float arrays, with result as double */
 double silk_inner_product_FLP_c(
     const silk_float    *data1,
     const silk_float    *data2,
-    oac_int            dataSize
-);
+    oac_int dataSize);
 
 #ifndef OVERRIDE_inner_product_FLP
-#define silk_inner_product_FLP(data1, data2, dataSize, arch) ((void)arch,silk_inner_product_FLP_c(data1, data2, dataSize))
+# define silk_inner_product_FLP(data1, data2, dataSize, arch) ((void)arch, \
+                                                               silk_inner_product_FLP_c(data1, data2, dataSize))
 #endif
 
 
 /* sum of squares of a silk_float array, with result as double */
 double silk_energy_FLP(
     const silk_float    *data,
-    oac_int            dataSize
-);
+    oac_int dataSize);
 
 /********************************************************************/
 /*                                MACROS                            */
@@ -151,14 +146,12 @@ double silk_energy_FLP(
 #define silk_abs_float( a )                     ((silk_float)fabs(a))
 
 /* sigmoid function */
-static OAC_INLINE silk_float silk_sigmoid( silk_float x )
-{
-    return (silk_float)(1.0 / (1.0 + exp(-x)));
+static OAC_INLINE silk_float silk_sigmoid( silk_float x ) {
+    return (silk_float)(1.0/(1.0 + exp(-x)));
 }
 
 /* floating-point to integer conversion (rounding) */
-static OAC_INLINE oac_int32 silk_float2int( silk_float x )
-{
+static OAC_INLINE oac_int32 silk_float2int( silk_float x ) {
     return (oac_int32)float2int( x );
 }
 
@@ -166,12 +159,10 @@ static OAC_INLINE oac_int32 silk_float2int( silk_float x )
 static OAC_INLINE void silk_float2short_array(
     oac_int16       *out,
     const silk_float *in,
-    oac_int32       length
-)
-{
+    oac_int32 length) {
     oac_int32 k;
-    for( k = length - 1; k >= 0; k-- ) {
-        out[k] = silk_SAT16( (oac_int32)float2int( in[k] ) );
+    for (k = length - 1; k >= 0; k--) {
+        out[k] = silk_SAT16((oac_int32)float2int( in[k] ));
     }
 }
 
@@ -179,19 +170,16 @@ static OAC_INLINE void silk_float2short_array(
 static OAC_INLINE void silk_short2float_array(
     silk_float       *out,
     const oac_int16 *in,
-    oac_int32       length
-)
-{
+    oac_int32 length) {
     oac_int32 k;
-    for( k = length - 1; k >= 0; k-- ) {
+    for (k = length - 1; k >= 0; k--) {
         out[k] = (silk_float)in[k];
     }
 }
 
 /* using log2() helps the fixed-point conversion */
-static OAC_INLINE silk_float silk_log2( double x )
-{
-    return ( silk_float )( 3.32192809488736 * log10( x ) );
+static OAC_INLINE silk_float silk_log2( double x ) {
+    return ( silk_float )(3.32192809488736*log10( x ));
 }
 
 #endif /* SILK_SIGPROC_FLP_H */
diff --git a/silk/float/apply_sine_window_FLP.c b/silk/float/apply_sine_window_FLP.c
index 8b9991bfd..49d991dd1 100644
--- a/silk/float/apply_sine_window_FLP.c
+++ b/silk/float/apply_sine_window_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FLP.h"
@@ -36,27 +36,26 @@ POSSIBILITY OF SUCH DAMAGE.
 /*  1 -> sine window from 0 to pi/2     */
 /*  2 -> sine window from pi/2 to pi    */
 void silk_apply_sine_window_FLP(
-    silk_float                      px_win[],                           /* O    Pointer to windowed signal                  */
-    const silk_float                px[],                               /* I    Pointer to input signal                     */
-    const oac_int                  win_type,                           /* I    Selects a window type                       */
-    const oac_int                  length                              /* I    Window length, multiple of 4                */
-)
-{
-    oac_int   k;
+    silk_float px_win[],                                                /* O    Pointer to windowed signal                  */
+    const silk_float px[],                                              /* I    Pointer to input signal                     */
+    const oac_int win_type,                                            /* I    Selects a window type                       */
+    const oac_int length                                               /* I    Window length, multiple of 4                */
+    ) {
+    oac_int k;
     silk_float freq, c, S0, S1;
 
     celt_assert( win_type == 1 || win_type == 2 );
 
     /* Length must be multiple of 4 */
-    celt_assert( ( length & 3 ) == 0 );
+    celt_assert((length&3) == 0 );
 
-    freq = PI / ( length + 1 );
+    freq = PI/(length + 1);
 
     /* Approximation of 2 * cos(f) */
-    c = 2.0f - freq * freq;
+    c = 2.0f - freq*freq;
 
     /* Initialize state */
-    if( win_type < 2 ) {
+    if (win_type < 2) {
         /* Start from 0 */
         S0 = 0.0f;
         /* Approximation of sin(f) */
@@ -65,17 +64,17 @@ void silk_apply_sine_window_FLP(
         /* Start from 1 */
         S0 = 1.0f;
         /* Approximation of cos(f) */
-        S1 = 0.5f * c;
+        S1 = 0.5f*c;
     }
 
     /* Uses the recursive equation:   sin(n*f) = 2 * cos(f) * sin((n-1)*f) - sin((n-2)*f)   */
     /* 4 samples at a time */
-    for( k = 0; k < length; k += 4 ) {
-        px_win[ k + 0 ] = px[ k + 0 ] * 0.5f * ( S0 + S1 );
-        px_win[ k + 1 ] = px[ k + 1 ] * S1;
-        S0 = c * S1 - S0;
-        px_win[ k + 2 ] = px[ k + 2 ] * 0.5f * ( S1 + S0 );
-        px_win[ k + 3 ] = px[ k + 3 ] * S0;
-        S1 = c * S0 - S1;
+    for (k = 0; k < length; k += 4) {
+        px_win[ k + 0 ] = px[ k + 0 ]*0.5f*(S0 + S1);
+        px_win[ k + 1 ] = px[ k + 1 ]*S1;
+        S0 = c*S1 - S0;
+        px_win[ k + 2 ] = px[ k + 2 ]*0.5f*(S1 + S0);
+        px_win[ k + 3 ] = px[ k + 3 ]*S0;
+        S1 = c*S0 - S1;
     }
 }
diff --git a/silk/float/autocorrelation_FLP.c b/silk/float/autocorrelation_FLP.c
index 99df0eac6..2229742d3 100644
--- a/silk/float/autocorrelation_FLP.c
+++ b/silk/float/autocorrelation_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "typedef.h"
@@ -36,18 +36,16 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_autocorrelation_FLP(
     silk_float          *results,           /* O    result (length correlationCount)                            */
     const silk_float    *inputData,         /* I    input data to correlate                                     */
-    oac_int            inputDataSize,      /* I    length of input                                             */
-    oac_int            correlationCount,    /* I    number of correlation taps to compute                       */
-    int                 arch
-)
-{
+    oac_int inputDataSize,                 /* I    length of input                                             */
+    oac_int correlationCount,               /* I    number of correlation taps to compute                       */
+    int arch)                             {
     oac_int i;
 
-    if( correlationCount > inputDataSize ) {
+    if (correlationCount > inputDataSize) {
         correlationCount = inputDataSize;
     }
 
-    for( i = 0; i < correlationCount; i++ ) {
+    for (i = 0; i < correlationCount; i++) {
         results[ i ] =  (silk_float)silk_inner_product_FLP( inputData, inputData + i, inputDataSize - i, arch );
     }
 }
diff --git a/silk/float/burg_modified_FLP.c b/silk/float/burg_modified_FLP.c
index 0aa71764d..dffa91663 100644
--- a/silk/float/burg_modified_FLP.c
+++ b/silk/float/burg_modified_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FLP.h"
@@ -37,66 +37,64 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Compute reflection coefficients from input signal */
 silk_float silk_burg_modified_FLP(          /* O    returns residual energy                                     */
-    silk_float          A[],                /* O    prediction coefficients (length order)                      */
-    const silk_float    x[],                /* I    input signal, length: nb_subfr*(D+L_sub)                    */
-    const silk_float    minInvGain,         /* I    minimum inverse prediction gain                             */
-    const oac_int      subfr_length,       /* I    input signal subframe length (incl. D preceding samples)    */
-    const oac_int      nb_subfr,           /* I    number of subframes stacked in x                            */
-    const oac_int      D,                  /* I    order                                                       */
-    int                 arch
-)
-{
-    oac_int         k, n, s, reached_max_gain;
-    double           C0, invGain, num, nrg_f, nrg_b, rc, Atmp, tmp1, tmp2;
+    silk_float A[],                         /* O    prediction coefficients (length order)                      */
+    const silk_float x[],                   /* I    input signal, length: nb_subfr*(D+L_sub)                    */
+    const silk_float minInvGain,            /* I    minimum inverse prediction gain                             */
+    const oac_int subfr_length,            /* I    input signal subframe length (incl. D preceding samples)    */
+    const oac_int nb_subfr,                /* I    number of subframes stacked in x                            */
+    const oac_int D,                       /* I    order                                                       */
+    int arch)                             {
+    oac_int k, n, s, reached_max_gain;
+    double C0, invGain, num, nrg_f, nrg_b, rc, Atmp, tmp1, tmp2;
     const silk_float *x_ptr;
-    double           C_first_row[ SILK_MAX_ORDER_LPC ], C_last_row[ SILK_MAX_ORDER_LPC ];
-    double           CAf[ SILK_MAX_ORDER_LPC + 1 ], CAb[ SILK_MAX_ORDER_LPC + 1 ];
-    double           Af[ SILK_MAX_ORDER_LPC ];
+    double C_first_row[ SILK_MAX_ORDER_LPC ], C_last_row[ SILK_MAX_ORDER_LPC ];
+    double CAf[ SILK_MAX_ORDER_LPC + 1 ], CAb[ SILK_MAX_ORDER_LPC + 1 ];
+    double Af[ SILK_MAX_ORDER_LPC ];
 
-    celt_assert( subfr_length * nb_subfr <= MAX_FRAME_SIZE );
+    celt_assert( subfr_length*nb_subfr <= MAX_FRAME_SIZE );
 
     /* Compute autocorrelations, added over subframes */
-    C0 = silk_energy_FLP( x, nb_subfr * subfr_length );
-    silk_memset( C_first_row, 0, SILK_MAX_ORDER_LPC * sizeof( double ) );
-    for( s = 0; s < nb_subfr; s++ ) {
-        x_ptr = x + s * subfr_length;
-        for( n = 1; n < D + 1; n++ ) {
+    C0 = silk_energy_FLP( x, nb_subfr*subfr_length );
+    silk_memset( C_first_row, 0, SILK_MAX_ORDER_LPC*sizeof(double));
+    for (s = 0; s < nb_subfr; s++) {
+        x_ptr = x + s*subfr_length;
+        for (n = 1; n < D + 1; n++) {
             C_first_row[ n - 1 ] += silk_inner_product_FLP( x_ptr, x_ptr + n, subfr_length - n, arch );
         }
     }
-    silk_memcpy( C_last_row, C_first_row, SILK_MAX_ORDER_LPC * sizeof( double ) );
+    silk_memcpy( C_last_row, C_first_row, SILK_MAX_ORDER_LPC*sizeof(double));
 
     /* Initialize */
-    CAb[ 0 ] = CAf[ 0 ] = C0 + FIND_LPC_COND_FAC * C0 + 1e-9f;
+    CAb[ 0 ] = CAf[ 0 ] = C0 + FIND_LPC_COND_FAC*C0 + 1e-9f;
     invGain = 1.0f;
     reached_max_gain = 0;
-    for( n = 0; n < D; n++ ) {
+    for (n = 0; n < D; n++) {
         /* Update first row of correlation matrix (without first element) */
         /* Update last row of correlation matrix (without last element, stored in reversed order) */
         /* Update C * Af */
         /* Update C * flipud(Af) (stored in reversed order) */
-        for( s = 0; s < nb_subfr; s++ ) {
-            x_ptr = x + s * subfr_length;
+        for (s = 0; s < nb_subfr; s++) {
+            x_ptr = x + s*subfr_length;
             tmp1 = x_ptr[ n ];
             tmp2 = x_ptr[ subfr_length - n - 1 ];
-            for( k = 0; k < n; k++ ) {
-                C_first_row[ k ] -= x_ptr[ n ] * x_ptr[ n - k - 1 ];
-                C_last_row[ k ]  -= x_ptr[ subfr_length - n - 1 ] * x_ptr[ subfr_length - n + k ];
+            for (k = 0; k < n; k++) {
+                C_first_row[ k ] -= x_ptr[ n ]*x_ptr[ n - k - 1 ];
+                C_last_row[ k ]  -= x_ptr[ subfr_length - n - 1 ]*x_ptr[ subfr_length - n + k ];
                 Atmp = Af[ k ];
-                tmp1 += x_ptr[ n - k - 1 ] * Atmp;
-                tmp2 += x_ptr[ subfr_length - n + k ] * Atmp;
+                tmp1 += x_ptr[ n - k - 1 ]*Atmp;
+                tmp2 += x_ptr[ subfr_length - n + k ]*Atmp;
             }
-            for( k = 0; k <= n; k++ ) {
-                CAf[ k ] -= tmp1 * x_ptr[ n - k ];
-                CAb[ k ] -= tmp2 * x_ptr[ subfr_length - n + k - 1 ];
+            for (k = 0; k <= n; k++) {
+                CAf[ k ] -= tmp1*x_ptr[ n - k ];
+                CAb[ k ] -= tmp2*x_ptr[ subfr_length - n + k - 1 ];
             }
         }
         tmp1 = C_first_row[ n ];
         tmp2 = C_last_row[ n ];
-        for( k = 0; k < n; k++ ) {
+        for (k = 0; k < n; k++) {
             Atmp = Af[ k ];
-            tmp1 += C_last_row[  n - k - 1 ] * Atmp;
-            tmp2 += C_first_row[ n - k - 1 ] * Atmp;
+            tmp1 += C_last_row[  n - k - 1 ]*Atmp;
+            tmp2 += C_first_row[ n - k - 1 ]*Atmp;
         }
         CAf[ n + 1 ] = tmp1;
         CAb[ n + 1 ] = tmp2;
@@ -105,25 +103,25 @@ silk_float silk_burg_modified_FLP(          /* O    returns residual energy
         num = CAb[ n + 1 ];
         nrg_b = CAb[ 0 ];
         nrg_f = CAf[ 0 ];
-        for( k = 0; k < n; k++ ) {
+        for (k = 0; k < n; k++) {
             Atmp = Af[ k ];
-            num   += CAb[ n - k ] * Atmp;
-            nrg_b += CAb[ k + 1 ] * Atmp;
-            nrg_f += CAf[ k + 1 ] * Atmp;
+            num   += CAb[ n - k ]*Atmp;
+            nrg_b += CAb[ k + 1 ]*Atmp;
+            nrg_f += CAf[ k + 1 ]*Atmp;
         }
         silk_assert( nrg_f > 0.0 );
         silk_assert( nrg_b > 0.0 );
 
         /* Calculate the next order reflection (parcor) coefficient */
-        rc = -2.0 * num / ( nrg_f + nrg_b );
+        rc = -2.0*num/(nrg_f + nrg_b);
         silk_assert( rc > -1.0 && rc < 1.0 );
 
         /* Update inverse prediction gain */
-        tmp1 = invGain * ( 1.0 - rc * rc );
-        if( tmp1 <= minInvGain ) {
+        tmp1 = invGain*(1.0 - rc*rc);
+        if (tmp1 <= minInvGain) {
             /* Max prediction gain exceeded; set reflection coefficient such that max prediction gain is exactly hit */
-            rc = sqrt( 1.0 - minInvGain / invGain );
-            if( num > 0 ) {
+            rc = sqrt( 1.0 - minInvGain/invGain );
+            if (num > 0) {
                 /* Ensure adjusted reflection coefficients has the original sign */
                 rc = -rc;
             }
@@ -134,52 +132,52 @@ silk_float silk_burg_modified_FLP(          /* O    returns residual energy
         }
 
         /* Update the AR coefficients */
-        for( k = 0; k < (n + 1) >> 1; k++ ) {
+        for (k = 0; k < (n + 1)>>1; k++) {
             tmp1 = Af[ k ];
             tmp2 = Af[ n - k - 1 ];
-            Af[ k ]         = tmp1 + rc * tmp2;
-            Af[ n - k - 1 ] = tmp2 + rc * tmp1;
+            Af[ k ]         = tmp1 + rc*tmp2;
+            Af[ n - k - 1 ] = tmp2 + rc*tmp1;
         }
         Af[ n ] = rc;
 
-        if( reached_max_gain ) {
+        if (reached_max_gain) {
             /* Reached max prediction gain; set remaining coefficients to zero and exit loop */
-            for( k = n + 1; k < D; k++ ) {
+            for (k = n + 1; k < D; k++) {
                 Af[ k ] = 0.0;
             }
             break;
         }
 
         /* Update C * Af and C * Ab */
-        for( k = 0; k <= n + 1; k++ ) {
+        for (k = 0; k <= n + 1; k++) {
             tmp1 = CAf[ k ];
-            CAf[ k ]          += rc * CAb[ n - k + 1 ];
-            CAb[ n - k + 1  ] += rc * tmp1;
+            CAf[ k ]          += rc*CAb[ n - k + 1 ];
+            CAb[ n - k + 1  ] += rc*tmp1;
         }
     }
 
-    if( reached_max_gain ) {
+    if (reached_max_gain) {
         /* Convert to silk_float */
-        for( k = 0; k < D; k++ ) {
-            A[ k ] = (silk_float)( -Af[ k ] );
+        for (k = 0; k < D; k++) {
+            A[ k ] = (silk_float)(-Af[ k ]);
         }
         /* Subtract energy of preceding samples from C0 */
-        for( s = 0; s < nb_subfr; s++ ) {
-            C0 -= silk_energy_FLP( x + s * subfr_length, D );
+        for (s = 0; s < nb_subfr; s++) {
+            C0 -= silk_energy_FLP( x + s*subfr_length, D );
         }
         /* Approximate residual energy */
-        nrg_f = C0 * invGain;
+        nrg_f = C0*invGain;
     } else {
         /* Compute residual energy and store coefficients as silk_float */
         nrg_f = CAf[ 0 ];
         tmp1 = 1.0;
-        for( k = 0; k < D; k++ ) {
+        for (k = 0; k < D; k++) {
             Atmp = Af[ k ];
-            nrg_f += CAf[ k + 1 ] * Atmp;
-            tmp1  += Atmp * Atmp;
+            nrg_f += CAf[ k + 1 ]*Atmp;
+            tmp1  += Atmp*Atmp;
             A[ k ] = (silk_float)(-Atmp);
         }
-        nrg_f -= FIND_LPC_COND_FAC * C0 * tmp1;
+        nrg_f -= FIND_LPC_COND_FAC*C0*tmp1;
     }
 
     /* Return residual energy */
diff --git a/silk/float/bwexpander_FLP.c b/silk/float/bwexpander_FLP.c
index 4e764f94c..f760b0cc8 100644
--- a/silk/float/bwexpander_FLP.c
+++ b/silk/float/bwexpander_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FLP.h"
@@ -34,14 +34,13 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Chirp (bw expand) LP AR filter */
 void silk_bwexpander_FLP(
     silk_float          *ar,                /* I/O  AR filter to be expanded (without leading 1)                */
-    const oac_int      d,                  /* I    length of ar                                                */
-    const silk_float    chirp               /* I    chirp factor (typically in range (0..1) )                   */
-)
-{
-    oac_int   i;
+    const oac_int d,                       /* I    length of ar                                                */
+    const silk_float chirp                  /* I    chirp factor (typically in range (0..1) )                   */
+    ) {
+    oac_int i;
     silk_float cfac = chirp;
 
-    for( i = 0; i < d - 1; i++ ) {
+    for (i = 0; i < d - 1; i++) {
         ar[ i ] *=  cfac;
         cfac    *=  chirp;
     }
diff --git a/silk/float/corrMatrix_FLP.c b/silk/float/corrMatrix_FLP.c
index 975c41c6b..ca765be18 100644
--- a/silk/float/corrMatrix_FLP.c
+++ b/silk/float/corrMatrix_FLP.c
@@ -1,37 +1,37 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 /**********************************************************************
- * Correlation matrix computations for LS estimate.
- **********************************************************************/
+* Correlation matrix computations for LS estimate.
+**********************************************************************/
 
 #include "main_FLP.h"
 
@@ -39,17 +39,15 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_corrVector_FLP(
     const silk_float                *x,                                 /* I    x vector [L+order-1] used to create X       */
     const silk_float                *t,                                 /* I    Target vector [L]                           */
-    const oac_int                  L,                                  /* I    Length of vecors                            */
-    const oac_int                  Order,                              /* I    Max lag for correlation                     */
+    const oac_int L,                                                   /* I    Length of vecors                            */
+    const oac_int Order,                                               /* I    Max lag for correlation                     */
     silk_float                      *Xt,                                /* O    X'*t correlation vector [order]             */
-    int                             arch
-)
-{
+    int arch)                                         {
     oac_int lag;
     const silk_float *ptr1;
 
     ptr1 = &x[ Order - 1 ];                     /* Points to first sample of column 0 of X: X[:,0] */
-    for( lag = 0; lag < Order; lag++ ) {
+    for (lag = 0; lag < Order; lag++) {
         /* Calculate X[:,lag]'*t */
         Xt[ lag ] = (silk_float)silk_inner_product_FLP( ptr1, t, L, arch );
         ptr1--;                                 /* Next column of X */
@@ -59,34 +57,32 @@ void silk_corrVector_FLP(
 /* Calculates correlation matrix X'*X */
 void silk_corrMatrix_FLP(
     const silk_float                *x,                                 /* I    x vector [ L+order-1 ] used to create X     */
-    const oac_int                  L,                                  /* I    Length of vectors                           */
-    const oac_int                  Order,                              /* I    Max lag for correlation                     */
+    const oac_int L,                                                   /* I    Length of vectors                           */
+    const oac_int Order,                                               /* I    Max lag for correlation                     */
     silk_float                      *XX,                                /* O    X'*X correlation matrix [order x order]     */
-    int                             arch
-)
-{
+    int arch)                                         {
     oac_int j, lag;
-    double  energy;
+    double energy;
     const silk_float *ptr1, *ptr2;
 
     ptr1 = &x[ Order - 1 ];                     /* First sample of column 0 of X */
     energy = silk_energy_FLP( ptr1, L );  /* X[:,0]'*X[:,0] */
     matrix_ptr( XX, 0, 0, Order ) = ( silk_float )energy;
-    for( j = 1; j < Order; j++ ) {
+    for (j = 1; j < Order; j++) {
         /* Calculate X[:,j]'*X[:,j] */
-        energy += ptr1[ -j ] * ptr1[ -j ] - ptr1[ L - j ] * ptr1[ L - j ];
+        energy += ptr1[ -j ]*ptr1[ -j ] - ptr1[ L - j ]*ptr1[ L - j ];
         matrix_ptr( XX, j, j, Order ) = ( silk_float )energy;
     }
 
     ptr2 = &x[ Order - 2 ];                     /* First sample of column 1 of X */
-    for( lag = 1; lag < Order; lag++ ) {
+    for (lag = 1; lag < Order; lag++) {
         /* Calculate X[:,0]'*X[:,lag] */
         energy = silk_inner_product_FLP( ptr1, ptr2, L, arch );
         matrix_ptr( XX, lag, 0, Order ) = ( silk_float )energy;
         matrix_ptr( XX, 0, lag, Order ) = ( silk_float )energy;
         /* Calculate X[:,j]'*X[:,j + lag] */
-        for( j = 1; j < ( Order - lag ); j++ ) {
-            energy += ptr1[ -j ] * ptr2[ -j ] - ptr1[ L - j ] * ptr2[ L - j ];
+        for (j = 1; j < (Order - lag); j++) {
+            energy += ptr1[ -j ]*ptr2[ -j ] - ptr1[ L - j ]*ptr2[ L - j ];
             matrix_ptr( XX, lag + j, j, Order ) = ( silk_float )energy;
             matrix_ptr( XX, j, lag + j, Order ) = ( silk_float )energy;
         }
diff --git a/silk/float/encode_frame_FLP.c b/silk/float/encode_frame_FLP.c
index 1fa00335b..11ccb4052 100644
--- a/silk/float/encode_frame_FLP.c
+++ b/silk/float/encode_frame_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdlib.h>
@@ -38,15 +38,14 @@ POSSIBILITY OF SUCH DAMAGE.
 static OAC_INLINE void silk_LBRR_encode_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
-    const silk_float                xfw[],                              /* I    Input signal                                */
-    oac_int                        condCoding                          /* I    The type of conditional coding used so far for this frame */
-);
+    const silk_float xfw[],                                             /* I    Input signal                                */
+    oac_int condCoding                                                 /* I    The type of conditional coding used so far for this frame */
+    );
 
 void silk_encode_do_VAD_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
-    oac_int                        activity                            /* I    Decision of Oac voice activity detector    */
-)
-{
+    oac_int activity                                                   /* I    Decision of Oac voice activity detector    */
+    ) {
     const oac_int activity_threshold = SILK_FIX_CONST( SPEECH_ACTIVITY_DTX_THRES, 8 );
 
     /****************************/
@@ -54,19 +53,19 @@ void silk_encode_do_VAD_FLP(
     /****************************/
     silk_VAD_GetSA_Q8( &psEnc->sCmn, psEnc->sCmn.inputBuf + 1, psEnc->sCmn.arch );
     /* If Oac VAD is inactive and Silk VAD is active: lower Silk VAD to just under the threshold */
-    if( activity == VAD_NO_ACTIVITY && psEnc->sCmn.speech_activity_Q8 >= activity_threshold ) {
+    if (activity == VAD_NO_ACTIVITY && psEnc->sCmn.speech_activity_Q8 >= activity_threshold) {
         psEnc->sCmn.speech_activity_Q8 = activity_threshold - 1;
     }
 
     /**************************************************/
     /* Convert speech activity into VAD and DTX flags */
     /**************************************************/
-    if( psEnc->sCmn.speech_activity_Q8 < activity_threshold ) {
+    if (psEnc->sCmn.speech_activity_Q8 < activity_threshold) {
         psEnc->sCmn.indices.signalType = TYPE_NO_VOICE_ACTIVITY;
         psEnc->sCmn.noSpeechCounter++;
-        if( psEnc->sCmn.noSpeechCounter <= NB_SPEECH_FRAMES_BEFORE_DTX ) {
+        if (psEnc->sCmn.noSpeechCounter <= NB_SPEECH_FRAMES_BEFORE_DTX) {
             psEnc->sCmn.inDTX = 0;
-        } else if( psEnc->sCmn.noSpeechCounter > MAX_CONSECUTIVE_DTX + NB_SPEECH_FRAMES_BEFORE_DTX ) {
+        } else if (psEnc->sCmn.noSpeechCounter > MAX_CONSECUTIVE_DTX + NB_SPEECH_FRAMES_BEFORE_DTX) {
             psEnc->sCmn.noSpeechCounter = NB_SPEECH_FRAMES_BEFORE_DTX;
             psEnc->sCmn.inDTX           = 0;
         }
@@ -86,28 +85,27 @@ oac_int silk_encode_frame_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     oac_int32                      *pnBytesOut,                        /* O    Number of payload bytes;                    */
     ec_enc                          *psRangeEnc,                        /* I/O  compressor data structure                   */
-    oac_int                        condCoding,                         /* I    The type of conditional coding to use       */
-    oac_int                        maxBits,                            /* I    If > 0: maximum number of output bits       */
-    oac_int                        useCBR                              /* I    Flag to force constant-bitrate operation    */
-)
-{
+    oac_int condCoding,                                                /* I    The type of conditional coding to use       */
+    oac_int maxBits,                                                   /* I    If > 0: maximum number of output bits       */
+    oac_int useCBR                                                     /* I    Flag to force constant-bitrate operation    */
+    ) {
     silk_encoder_control_FLP sEncCtrl;
-    oac_int     i, iter, maxIter, found_upper, found_lower, ret = 0;
+    oac_int i, iter, maxIter, found_upper, found_lower, ret = 0;
     silk_float   *x_frame, *res_pitch_frame;
-    silk_float   res_pitch[ 2 * MAX_FRAME_LENGTH + LA_PITCH_MAX ];
-    ec_enc       sRangeEnc_copy, sRangeEnc_copy2;
+    silk_float res_pitch[ 2*MAX_FRAME_LENGTH + LA_PITCH_MAX ];
+    ec_enc sRangeEnc_copy, sRangeEnc_copy2;
     VARDECL(silk_nsq_state, sNSQ_copy);
-    oac_int32   seed_copy, nBits, nBits_lower, nBits_upper, gainMult_lower, gainMult_upper;
-    oac_int32   gainsID, gainsID_lower, gainsID_upper;
-    oac_int16   gainMult_Q8;
-    oac_int16   ec_prevLagIndex_copy;
-    oac_int     ec_prevSignalType_copy;
-    oac_int8    LastGainIndex_copy2;
-    oac_int32   pGains_Q16[ MAX_NB_SUBFR ];
-    oac_int     gain_lock[ MAX_NB_SUBFR ] = {0};
-    oac_int16   best_gain_mult[ MAX_NB_SUBFR ];
-    oac_int     best_sum[ MAX_NB_SUBFR ];
-    oac_int     bits_margin;
+    oac_int32 seed_copy, nBits, nBits_lower, nBits_upper, gainMult_lower, gainMult_upper;
+    oac_int32 gainsID, gainsID_lower, gainsID_upper;
+    oac_int16 gainMult_Q8;
+    oac_int16 ec_prevLagIndex_copy;
+    oac_int ec_prevSignalType_copy;
+    oac_int8 LastGainIndex_copy2;
+    oac_int32 pGains_Q16[ MAX_NB_SUBFR ];
+    oac_int gain_lock[ MAX_NB_SUBFR ] = {0};
+    oac_int16 best_gain_mult[ MAX_NB_SUBFR ];
+    oac_int best_sum[ MAX_NB_SUBFR ];
+    oac_int bits_margin;
     SAVE_STACK;
 
     /* Using ALLOC() instead of a regular stack allocation to minimize real stack use when using the pseudostack.
@@ -119,7 +117,7 @@ oac_int silk_encode_frame_FLP(
     /* This is totally unnecessary but many compilers (including gcc) are too dumb to realise it */
     LastGainIndex_copy2 = nBits_lower = nBits_upper = gainMult_lower = gainMult_upper = 0;
 
-    psEnc->sCmn.indices.Seed = psEnc->sCmn.frameCounter++ & 3;
+    psEnc->sCmn.indices.Seed = psEnc->sCmn.frameCounter++&3;
 
     /**************************************************************/
     /* Set up Input Pointers, and insert frame in input buffer    */
@@ -136,14 +134,15 @@ oac_int silk_encode_frame_FLP(
     /*******************************************/
     /* Copy new frame to front of input buffer */
     /*******************************************/
-    silk_short2float_array( x_frame + LA_SHAPE_MS * psEnc->sCmn.fs_kHz, psEnc->sCmn.inputBuf + 1, psEnc->sCmn.frame_length );
+    silk_short2float_array( x_frame + LA_SHAPE_MS*psEnc->sCmn.fs_kHz, psEnc->sCmn.inputBuf + 1,
+    psEnc->sCmn.frame_length );
 
     /* Add tiny signal to avoid high CPU load from denormalized floating point numbers */
-    for( i = 0; i < 8; i++ ) {
-        x_frame[ LA_SHAPE_MS * psEnc->sCmn.fs_kHz + i * ( psEnc->sCmn.frame_length >> 3 ) ] += ( 1 - ( i & 2 ) ) * 1e-6f;
+    for (i = 0; i < 8; i++) {
+        x_frame[ LA_SHAPE_MS*psEnc->sCmn.fs_kHz + i*(psEnc->sCmn.frame_length>>3) ] += (1 - (i&2))*1e-6f;
     }
 
-    if( !psEnc->sCmn.prefillFlag ) {
+    if (!psEnc->sCmn.prefillFlag) {
         VARDECL( oac_uint8, ec_buf_copy );
         /*****************************************/
         /* Find pitch lags, initial LPC analysis */
@@ -179,22 +178,22 @@ oac_int silk_encode_frame_FLP(
         gainsID_lower = -1;
         gainsID_upper = -1;
         /* Copy part of the input state */
-        silk_memcpy( &sRangeEnc_copy, psRangeEnc, sizeof( ec_enc ) );
-        silk_memcpy( &sNSQ_copy[0], &psEnc->sCmn.sNSQ, sizeof( silk_nsq_state ) );
+        silk_memcpy( &sRangeEnc_copy, psRangeEnc, sizeof(ec_enc));
+        silk_memcpy( &sNSQ_copy[0], &psEnc->sCmn.sNSQ, sizeof(silk_nsq_state));
         seed_copy = psEnc->sCmn.indices.Seed;
         ec_prevLagIndex_copy = psEnc->sCmn.ec_prevLagIndex;
         ec_prevSignalType_copy = psEnc->sCmn.ec_prevSignalType;
         ALLOC( ec_buf_copy, 1275, oac_uint8 );
-        for( iter = 0; ; iter++ ) {
-            if( gainsID == gainsID_lower ) {
+        for (iter = 0; ; iter++) {
+            if (gainsID == gainsID_lower) {
                 nBits = nBits_lower;
-            } else if( gainsID == gainsID_upper ) {
+            } else if (gainsID == gainsID_upper) {
                 nBits = nBits_upper;
             } else {
                 /* Restore part of the input state */
-                if( iter > 0 ) {
-                    silk_memcpy( psRangeEnc, &sRangeEnc_copy, sizeof( ec_enc ) );
-                    silk_memcpy( &psEnc->sCmn.sNSQ, &sNSQ_copy[0], sizeof( silk_nsq_state ) );
+                if (iter > 0) {
+                    silk_memcpy( psRangeEnc, &sRangeEnc_copy, sizeof(ec_enc));
+                    silk_memcpy( &psEnc->sCmn.sNSQ, &sNSQ_copy[0], sizeof(silk_nsq_state));
                     psEnc->sCmn.indices.Seed = seed_copy;
                     psEnc->sCmn.ec_prevLagIndex = ec_prevLagIndex_copy;
                     psEnc->sCmn.ec_prevSignalType = ec_prevSignalType_copy;
@@ -203,10 +202,11 @@ oac_int silk_encode_frame_FLP(
                 /*****************************************/
                 /* Noise shaping quantization            */
                 /*****************************************/
-                silk_NSQ_wrapper_FLP( psEnc, &sEncCtrl, &psEnc->sCmn.indices, &psEnc->sCmn.sNSQ, psEnc->sCmn.pulses, x_frame );
+                silk_NSQ_wrapper_FLP( psEnc, &sEncCtrl, &psEnc->sCmn.indices, &psEnc->sCmn.sNSQ, psEnc->sCmn.pulses,
+                x_frame );
 
-                if ( iter == maxIter && !found_lower ) {
-                    silk_memcpy( &sRangeEnc_copy2, psRangeEnc, sizeof( ec_enc ) );
+                if (iter == maxIter && !found_lower) {
+                    silk_memcpy( &sRangeEnc_copy2, psRangeEnc, sizeof(ec_enc));
                 }
 
                 /****************************************/
@@ -223,21 +223,21 @@ oac_int silk_encode_frame_FLP(
                 nBits = ec_tell( psRangeEnc );
 
                 /* If we still bust after the last iteration, do some damage control. */
-                if ( iter == maxIter && !found_lower && nBits > maxBits ) {
-                    silk_memcpy( psRangeEnc, &sRangeEnc_copy2, sizeof( ec_enc ) );
+                if (iter == maxIter && !found_lower && nBits > maxBits) {
+                    silk_memcpy( psRangeEnc, &sRangeEnc_copy2, sizeof(ec_enc));
 
                     /* Keep gains the same as the last frame. */
                     psEnc->sShape.LastGainIndex = sEncCtrl.lastGainIndexPrev;
-                    for ( i = 0; i < psEnc->sCmn.nb_subfr; i++ ) {
+                    for (i = 0; i < psEnc->sCmn.nb_subfr; i++) {
                         psEnc->sCmn.indices.GainsIndices[ i ] = 4;
                     }
                     if (condCoding != CODE_CONDITIONALLY) {
-                       psEnc->sCmn.indices.GainsIndices[ 0 ] = sEncCtrl.lastGainIndexPrev;
+                        psEnc->sCmn.indices.GainsIndices[ 0 ] = sEncCtrl.lastGainIndexPrev;
                     }
                     psEnc->sCmn.ec_prevLagIndex = ec_prevLagIndex_copy;
                     psEnc->sCmn.ec_prevSignalType = ec_prevSignalType_copy;
                     /* Clear all pulses. */
-                    for ( i = 0; i < psEnc->sCmn.frame_length; i++ ) {
+                    for (i = 0; i < psEnc->sCmn.frame_length; i++) {
                         psEnc->sCmn.pulses[ i ] = 0;
                     }
 
@@ -249,25 +249,25 @@ oac_int silk_encode_frame_FLP(
                     nBits = ec_tell( psRangeEnc );
                 }
 
-                if( useCBR == 0 && iter == 0 && nBits <= maxBits ) {
+                if (useCBR == 0 && iter == 0 && nBits <= maxBits) {
                     break;
                 }
             }
 
-            if( iter == maxIter ) {
-                if( found_lower && ( gainsID == gainsID_lower || nBits > maxBits ) ) {
+            if (iter == maxIter) {
+                if (found_lower && (gainsID == gainsID_lower || nBits > maxBits)) {
                     /* Restore output state from earlier iteration that did meet the bitrate budget */
-                    silk_memcpy( psRangeEnc, &sRangeEnc_copy2, sizeof( ec_enc ) );
+                    silk_memcpy( psRangeEnc, &sRangeEnc_copy2, sizeof(ec_enc));
                     celt_assert( sRangeEnc_copy2.offs <= 1275 );
                     silk_memcpy( psRangeEnc->buf, ec_buf_copy, sRangeEnc_copy2.offs );
-                    silk_memcpy( &psEnc->sCmn.sNSQ, &sNSQ_copy[1], sizeof( silk_nsq_state ) );
+                    silk_memcpy( &psEnc->sCmn.sNSQ, &sNSQ_copy[1], sizeof(silk_nsq_state));
                     psEnc->sShape.LastGainIndex = LastGainIndex_copy2;
                 }
                 break;
             }
 
-            if( nBits > maxBits ) {
-                if( found_lower == 0 && iter >= 2 ) {
+            if (nBits > maxBits) {
+                if (found_lower == 0 && iter >= 2) {
                     /* Adjust the quantizer's rate/distortion tradeoff and discard previous "upper" results */
                     sEncCtrl.Lambda = silk_max_float(sEncCtrl.Lambda*1.5f, 1.5f);
                     /* Reducing dithering can help us hit the target. */
@@ -280,17 +280,17 @@ oac_int silk_encode_frame_FLP(
                     gainMult_upper = gainMult_Q8;
                     gainsID_upper = gainsID;
                 }
-            } else if( nBits < maxBits - bits_margin ) {
+            } else if (nBits < maxBits - bits_margin) {
                 found_lower = 1;
                 nBits_lower = nBits;
                 gainMult_lower = gainMult_Q8;
-                if( gainsID != gainsID_lower ) {
+                if (gainsID != gainsID_lower) {
                     gainsID_lower = gainsID;
                     /* Copy part of the output state */
-                    silk_memcpy( &sRangeEnc_copy2, psRangeEnc, sizeof( ec_enc ) );
+                    silk_memcpy( &sRangeEnc_copy2, psRangeEnc, sizeof(ec_enc));
                     celt_assert( psRangeEnc->offs <= 1275 );
                     silk_memcpy( ec_buf_copy, psRangeEnc->buf, psRangeEnc->offs );
-                    silk_memcpy( &sNSQ_copy[1], &psEnc->sCmn.sNSQ, sizeof( silk_nsq_state ) );
+                    silk_memcpy( &sNSQ_copy[1], &psEnc->sCmn.sNSQ, sizeof(silk_nsq_state));
                     LastGainIndex_copy2 = psEnc->sShape.LastGainIndex;
                 }
             } else {
@@ -298,14 +298,14 @@ oac_int silk_encode_frame_FLP(
                 break;
             }
 
-            if ( !found_lower && nBits > maxBits ) {
+            if (!found_lower && nBits > maxBits) {
                 int j;
-                for ( i = 0; i < psEnc->sCmn.nb_subfr; i++ ) {
-                    int sum=0;
-                    for ( j = i*psEnc->sCmn.subfr_length; j < (i+1)*psEnc->sCmn.subfr_length; j++ ) {
+                for (i = 0; i < psEnc->sCmn.nb_subfr; i++) {
+                    int sum = 0;
+                    for (j = i*psEnc->sCmn.subfr_length; j < (i + 1)*psEnc->sCmn.subfr_length; j++) {
                         sum += abs( psEnc->sCmn.pulses[j] );
                     }
-                    if ( iter == 0 || (sum < best_sum[i] && !gain_lock[i]) ) {
+                    if (iter == 0 || (sum < best_sum[i] && !gain_lock[i])) {
                         best_sum[i] = sum;
                         best_gain_mult[i] = gainMult_Q8;
                     } else {
@@ -313,28 +313,29 @@ oac_int silk_encode_frame_FLP(
                     }
                 }
             }
-            if( ( found_lower & found_upper ) == 0 ) {
+            if ((found_lower&found_upper) == 0) {
                 /* Adjust gain according to high-rate rate/distortion curve */
-                if( nBits > maxBits ) {
+                if (nBits > maxBits) {
                     gainMult_Q8 = silk_min_32( 1024, gainMult_Q8*3/2 );
                 } else {
                     gainMult_Q8 = silk_max_32( 64, gainMult_Q8*4/5 );
                 }
             } else {
                 /* Adjust gain by interpolating */
-                gainMult_Q8 = gainMult_lower + ( ( gainMult_upper - gainMult_lower ) * ( maxBits - nBits_lower ) ) / ( nBits_upper - nBits_lower );
+                gainMult_Q8 = gainMult_lower + ((gainMult_upper - gainMult_lower)*(maxBits - nBits_lower))
+                              /(nBits_upper - nBits_lower);
                 /* New gain multiplier must be between 25% and 75% of old range (note that gainMult_upper < gainMult_lower) */
-                if( gainMult_Q8 > silk_ADD_RSHIFT32( gainMult_lower, gainMult_upper - gainMult_lower, 2 ) ) {
+                if (gainMult_Q8 > silk_ADD_RSHIFT32( gainMult_lower, gainMult_upper - gainMult_lower, 2 )) {
                     gainMult_Q8 = silk_ADD_RSHIFT32( gainMult_lower, gainMult_upper - gainMult_lower, 2 );
-                } else
-                if( gainMult_Q8 < silk_SUB_RSHIFT32( gainMult_upper, gainMult_upper - gainMult_lower, 2 ) ) {
+                } else if (gainMult_Q8 < silk_SUB_RSHIFT32( gainMult_upper, gainMult_upper - gainMult_lower,
+                2 )) {
                     gainMult_Q8 = silk_SUB_RSHIFT32( gainMult_upper, gainMult_upper - gainMult_lower, 2 );
                 }
             }
 
-            for( i = 0; i < psEnc->sCmn.nb_subfr; i++ ) {
+            for (i = 0; i < psEnc->sCmn.nb_subfr; i++) {
                 oac_int16 tmp;
-                if ( gain_lock[i] ) {
+                if (gain_lock[i]) {
                     tmp = best_gain_mult[i];
                 } else {
                     tmp = gainMult_Q8;
@@ -351,18 +352,18 @@ oac_int silk_encode_frame_FLP(
             gainsID = silk_gains_ID( psEnc->sCmn.indices.GainsIndices, psEnc->sCmn.nb_subfr );
 
             /* Overwrite unquantized gains with quantized gains and convert back to Q0 from Q16 */
-            for( i = 0; i < psEnc->sCmn.nb_subfr; i++ ) {
-                sEncCtrl.Gains[ i ] = pGains_Q16[ i ] / 65536.0f;
+            for (i = 0; i < psEnc->sCmn.nb_subfr; i++) {
+                sEncCtrl.Gains[ i ] = pGains_Q16[ i ]/65536.0f;
             }
         }
     }
 
     /* Update input buffer */
     silk_memmove( psEnc->x_buf, &psEnc->x_buf[ psEnc->sCmn.frame_length ],
-        ( psEnc->sCmn.ltp_mem_length + LA_SHAPE_MS * psEnc->sCmn.fs_kHz ) * sizeof( silk_float ) );
+        (psEnc->sCmn.ltp_mem_length + LA_SHAPE_MS*psEnc->sCmn.fs_kHz)*sizeof(silk_float));
 
     /* Exit without entropy coding */
-    if( psEnc->sCmn.prefillFlag ) {
+    if (psEnc->sCmn.prefillFlag) {
         /* No payload */
         *pnBytesOut = 0;
         RESTORE_STACK;
@@ -388,13 +389,12 @@ oac_int silk_encode_frame_FLP(
 static OAC_INLINE void silk_LBRR_encode_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
-    const silk_float                xfw[],                              /* I    Input signal                                */
-    oac_int                        condCoding                          /* I    The type of conditional coding used so far for this frame */
-)
-{
-    oac_int     k;
-    oac_int32   Gains_Q16[ MAX_NB_SUBFR ];
-    silk_float   TempGains[ MAX_NB_SUBFR ];
+    const silk_float xfw[],                                             /* I    Input signal                                */
+    oac_int condCoding                                                 /* I    The type of conditional coding used so far for this frame */
+    ) {
+    oac_int k;
+    oac_int32 Gains_Q16[ MAX_NB_SUBFR ];
+    silk_float TempGains[ MAX_NB_SUBFR ];
     SideInfoIndices *psIndices_LBRR = &psEnc->sCmn.indices_LBRR[ psEnc->sCmn.nFramesEncoded ];
     VARDECL(silk_nsq_state, sNSQ_LBRR);
     SAVE_STACK;
@@ -402,7 +402,7 @@ static OAC_INLINE void silk_LBRR_encode_FLP(
     /*******************************************/
     /* Control use of inband LBRR              */
     /*******************************************/
-    if( psEnc->sCmn.LBRR_enabled && psEnc->sCmn.speech_activity_Q8 > SILK_FIX_CONST( LBRR_SPEECH_ACTIVITY_THRES, 8 ) ) {
+    if (psEnc->sCmn.LBRR_enabled && psEnc->sCmn.speech_activity_Q8 > SILK_FIX_CONST( LBRR_SPEECH_ACTIVITY_THRES, 8 )) {
         /* Using ALLOC() instead of a regular stack allocation to minimize real stack use when using the pseudostack.
            This is useful on some embedded systems. */
         ALLOC(sNSQ_LBRR, 1, silk_nsq_state);
@@ -410,13 +410,13 @@ static OAC_INLINE void silk_LBRR_encode_FLP(
         psEnc->sCmn.LBRR_flags[ psEnc->sCmn.nFramesEncoded ] = 1;
 
         /* Copy noise shaping quantizer state and quantization indices from regular encoding */
-        silk_memcpy( &sNSQ_LBRR[0], &psEnc->sCmn.sNSQ, sizeof( silk_nsq_state ) );
-        silk_memcpy( psIndices_LBRR, &psEnc->sCmn.indices, sizeof( SideInfoIndices ) );
+        silk_memcpy( &sNSQ_LBRR[0], &psEnc->sCmn.sNSQ, sizeof(silk_nsq_state));
+        silk_memcpy( psIndices_LBRR, &psEnc->sCmn.indices, sizeof(SideInfoIndices));
 
         /* Save original gains */
-        silk_memcpy( TempGains, psEncCtrl->Gains, psEnc->sCmn.nb_subfr * sizeof( silk_float ) );
+        silk_memcpy( TempGains, psEncCtrl->Gains, psEnc->sCmn.nb_subfr*sizeof(silk_float));
 
-        if( psEnc->sCmn.nFramesEncoded == 0 || psEnc->sCmn.LBRR_flags[ psEnc->sCmn.nFramesEncoded - 1 ] == 0 ) {
+        if (psEnc->sCmn.nFramesEncoded == 0 || psEnc->sCmn.LBRR_flags[ psEnc->sCmn.nFramesEncoded - 1 ] == 0) {
             /* First frame in packet or previous frame not LBRR coded */
             psEnc->sCmn.LBRRprevLastGainIndex = psEnc->sShape.LastGainIndex;
 
@@ -430,8 +430,8 @@ static OAC_INLINE void silk_LBRR_encode_FLP(
             &psEnc->sCmn.LBRRprevLastGainIndex, condCoding == CODE_CONDITIONALLY, psEnc->sCmn.nb_subfr );
 
         /* Overwrite unquantized gains with quantized gains and convert back to Q0 from Q16 */
-        for( k = 0; k <  psEnc->sCmn.nb_subfr; k++ ) {
-            psEncCtrl->Gains[ k ] = Gains_Q16[ k ] * ( 1.0f / 65536.0f );
+        for (k = 0; k <  psEnc->sCmn.nb_subfr; k++) {
+            psEncCtrl->Gains[ k ] = Gains_Q16[ k ]*(1.0f/65536.0f);
         }
 
         /*****************************************/
@@ -441,7 +441,7 @@ static OAC_INLINE void silk_LBRR_encode_FLP(
             psEnc->sCmn.pulses_LBRR[ psEnc->sCmn.nFramesEncoded ], xfw );
 
         /* Restore original gains */
-        silk_memcpy( psEncCtrl->Gains, TempGains, psEnc->sCmn.nb_subfr * sizeof( silk_float ) );
+        silk_memcpy( psEncCtrl->Gains, TempGains, psEnc->sCmn.nb_subfr*sizeof(silk_float));
     }
     RESTORE_STACK;
 }
diff --git a/silk/float/energy_FLP.c b/silk/float/energy_FLP.c
index 312e080d1..1825a90a5 100644
--- a/silk/float/energy_FLP.c
+++ b/silk/float/energy_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FLP.h"
@@ -34,24 +34,22 @@ POSSIBILITY OF SUCH DAMAGE.
 /* sum of squares of a silk_float array, with result as double */
 double silk_energy_FLP(
     const silk_float    *data,
-    oac_int            dataSize
-)
-{
+    oac_int dataSize)                                {
     oac_int i;
-    double   result;
+    double result;
 
     /* 4x unrolled loop */
     result = 0.0;
-    for( i = 0; i < dataSize - 3; i += 4 ) {
-        result += data[ i + 0 ] * (double)data[ i + 0 ] +
-                  data[ i + 1 ] * (double)data[ i + 1 ] +
-                  data[ i + 2 ] * (double)data[ i + 2 ] +
-                  data[ i + 3 ] * (double)data[ i + 3 ];
+    for (i = 0; i < dataSize - 3; i += 4) {
+        result += data[ i + 0 ]*(double)data[ i + 0 ]
+                  + data[ i + 1 ]*(double)data[ i + 1 ]
+                  + data[ i + 2 ]*(double)data[ i + 2 ]
+                  + data[ i + 3 ]*(double)data[ i + 3 ];
     }
 
     /* add any remaining products */
-    for( ; i < dataSize; i++ ) {
-        result += data[ i ] * (double)data[ i ];
+    for ( ; i < dataSize; i++) {
+        result += data[ i ]*(double)data[ i ];
     }
 
     silk_assert( result >= 0.0 );
diff --git a/silk/float/find_LPC_FLP.c b/silk/float/find_LPC_FLP.c
index 5a423e96c..5766459f2 100644
--- a/silk/float/find_LPC_FLP.c
+++ b/silk/float/find_LPC_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "define.h"
@@ -36,20 +36,18 @@ POSSIBILITY OF SUCH DAMAGE.
 /* LPC analysis */
 void silk_find_LPC_FLP(
     silk_encoder_state              *psEncC,                            /* I/O  Encoder state                               */
-    oac_int16                      NLSF_Q15[],                         /* O    NLSFs                                       */
-    const silk_float                x[],                                /* I    Input signal                                */
-    const silk_float                minInvGain,                         /* I    Inverse of max prediction gain              */
-    int                             arch
-)
-{
-    oac_int    k, subfr_length;
-    silk_float  a[ MAX_LPC_ORDER ];
+    oac_int16 NLSF_Q15[],                                              /* O    NLSFs                                       */
+    const silk_float x[],                                               /* I    Input signal                                */
+    const silk_float minInvGain,                                        /* I    Inverse of max prediction gain              */
+    int arch) {
+    oac_int k, subfr_length;
+    silk_float a[ MAX_LPC_ORDER ];
 
     /* Used only for NLSF interpolation */
-    silk_float  res_nrg, res_nrg_2nd, res_nrg_interp;
-    oac_int16  NLSF0_Q15[ MAX_LPC_ORDER ];
-    silk_float  a_tmp[ MAX_LPC_ORDER ];
-    silk_float  LPC_res[ MAX_FRAME_LENGTH + MAX_NB_SUBFR * MAX_LPC_ORDER ];
+    silk_float res_nrg, res_nrg_2nd, res_nrg_interp;
+    oac_int16 NLSF0_Q15[ MAX_LPC_ORDER ];
+    silk_float a_tmp[ MAX_LPC_ORDER ];
+    silk_float LPC_res[ MAX_FRAME_LENGTH + MAX_NB_SUBFR*MAX_LPC_ORDER ];
 
     subfr_length = psEncC->subfr_length + psEncC->predictLPCOrder;
 
@@ -59,17 +57,18 @@ void silk_find_LPC_FLP(
     /* Burg AR analysis for the full frame */
     res_nrg = silk_burg_modified_FLP( a, x, minInvGain, subfr_length, psEncC->nb_subfr, psEncC->predictLPCOrder, arch );
 
-    if( psEncC->useInterpolatedNLSFs && !psEncC->first_frame_after_reset && psEncC->nb_subfr == MAX_NB_SUBFR ) {
+    if (psEncC->useInterpolatedNLSFs && !psEncC->first_frame_after_reset && psEncC->nb_subfr == MAX_NB_SUBFR) {
         /* Optimal solution for last 10 ms; subtract residual energy here, as that's easier than        */
         /* adding it to the residual energy of the first 10 ms in each iteration of the search below    */
-        res_nrg -= silk_burg_modified_FLP( a_tmp, x + ( MAX_NB_SUBFR / 2 ) * subfr_length, minInvGain, subfr_length, MAX_NB_SUBFR / 2, psEncC->predictLPCOrder, arch );
+        res_nrg -= silk_burg_modified_FLP( a_tmp, x + (MAX_NB_SUBFR/2)*subfr_length, minInvGain, subfr_length,
+        MAX_NB_SUBFR/2, psEncC->predictLPCOrder, arch );
 
         /* Convert to NLSFs */
         silk_A2NLSF_FLP( NLSF_Q15, a_tmp, psEncC->predictLPCOrder );
 
         /* Search over interpolation indices to find the one with lowest residual energy */
         res_nrg_2nd = silk_float_MAX;
-        for( k = 3; k >= 0; k-- ) {
+        for (k = 3; k >= 0; k--) {
             /* Interpolate NLSFs for first half */
             silk_interpolate( NLSF0_Q15, psEncC->prev_NLSFq_Q15, NLSF_Q15, k, psEncC->predictLPCOrder );
 
@@ -77,17 +76,19 @@ void silk_find_LPC_FLP(
             silk_NLSF2A_FLP( a_tmp, NLSF0_Q15, psEncC->predictLPCOrder, psEncC->arch );
 
             /* Calculate residual energy with LSF interpolation */
-            silk_LPC_analysis_filter_FLP( LPC_res, a_tmp, x, 2 * subfr_length, psEncC->predictLPCOrder );
+            silk_LPC_analysis_filter_FLP( LPC_res, a_tmp, x, 2*subfr_length, psEncC->predictLPCOrder );
             res_nrg_interp = (silk_float)(
-                silk_energy_FLP( LPC_res + psEncC->predictLPCOrder,                subfr_length - psEncC->predictLPCOrder ) +
-                silk_energy_FLP( LPC_res + psEncC->predictLPCOrder + subfr_length, subfr_length - psEncC->predictLPCOrder ) );
+                silk_energy_FLP( LPC_res + psEncC->predictLPCOrder,
+            subfr_length - psEncC->predictLPCOrder )
+                + silk_energy_FLP( LPC_res + psEncC->predictLPCOrder + subfr_length,
+            subfr_length - psEncC->predictLPCOrder ));
 
             /* Determine whether current interpolated NLSFs are best so far */
-            if( res_nrg_interp < res_nrg ) {
+            if (res_nrg_interp < res_nrg) {
                 /* Interpolation has lower residual energy */
                 res_nrg = res_nrg_interp;
                 psEncC->indices.NLSFInterpCoef_Q2 = (oac_int8)k;
-            } else if( res_nrg_interp > res_nrg_2nd ) {
+            } else if (res_nrg_interp > res_nrg_2nd) {
                 /* No reason to continue iterating - residual energies will continue to climb */
                 break;
             }
@@ -95,11 +96,11 @@ void silk_find_LPC_FLP(
         }
     }
 
-    if( psEncC->indices.NLSFInterpCoef_Q2 == 4 ) {
+    if (psEncC->indices.NLSFInterpCoef_Q2 == 4) {
         /* NLSF interpolation is currently inactive, calculate NLSFs from full frame AR coefficients */
         silk_A2NLSF_FLP( NLSF_Q15, a, psEncC->predictLPCOrder );
     }
 
-    celt_assert( psEncC->indices.NLSFInterpCoef_Q2 == 4 ||
-        ( psEncC->useInterpolatedNLSFs && !psEncC->first_frame_after_reset && psEncC->nb_subfr == MAX_NB_SUBFR ) );
+    celt_assert( psEncC->indices.NLSFInterpCoef_Q2 == 4
+        || (psEncC->useInterpolatedNLSFs && !psEncC->first_frame_after_reset && psEncC->nb_subfr == MAX_NB_SUBFR));
 }
diff --git a/silk/float/find_LTP_FLP.c b/silk/float/find_LTP_FLP.c
index 46bdbcc07..917625eaf 100644
--- a/silk/float/find_LTP_FLP.c
+++ b/silk/float/find_LTP_FLP.c
@@ -1,65 +1,63 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FLP.h"
 #include "tuning_parameters.h"
 
 void silk_find_LTP_FLP(
-    silk_float                      XX[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ], /* O    Weight for LTP quantization         */
-    silk_float                      xX[ MAX_NB_SUBFR * LTP_ORDER ],     /* O    Weight for LTP quantization                 */
-    const silk_float                r_ptr[],                            /* I    LPC residual                                */
-    const oac_int                  lag[ MAX_NB_SUBFR ],                /* I    LTP lags                                    */
-    const oac_int                  subfr_length,                       /* I    Subframe length                             */
-    const oac_int                  nb_subfr,                           /* I    number of subframes                         */
-    int                             arch
-)
-{
-    oac_int   k;
+    silk_float XX[ MAX_NB_SUBFR*LTP_ORDER*LTP_ORDER ],                          /* O    Weight for LTP quantization         */
+    silk_float xX[ MAX_NB_SUBFR*LTP_ORDER ],                            /* O    Weight for LTP quantization                 */
+    const silk_float r_ptr[],                                           /* I    LPC residual                                */
+    const oac_int lag[ MAX_NB_SUBFR ],                                 /* I    LTP lags                                    */
+    const oac_int subfr_length,                                        /* I    Subframe length                             */
+    const oac_int nb_subfr,                                            /* I    number of subframes                         */
+    int arch)                                         {
+    oac_int k;
     silk_float *xX_ptr, *XX_ptr;
     const silk_float *lag_ptr;
     silk_float xx, temp;
 
     xX_ptr = xX;
     XX_ptr = XX;
-    for( k = 0; k < nb_subfr; k++ ) {
-        lag_ptr = r_ptr - ( lag[ k ] + LTP_ORDER / 2 );
+    for (k = 0; k < nb_subfr; k++) {
+        lag_ptr = r_ptr - (lag[ k ] + LTP_ORDER/2);
         silk_corrMatrix_FLP( lag_ptr, subfr_length, LTP_ORDER, XX_ptr, arch );
         silk_corrVector_FLP( lag_ptr, r_ptr, subfr_length, LTP_ORDER, xX_ptr, arch );
         xx = ( silk_float )silk_energy_FLP( r_ptr, subfr_length + LTP_ORDER );
-        temp = 1.0f / silk_max( xx, LTP_CORR_INV_MAX * 0.5f * ( XX_ptr[ 0 ] + XX_ptr[ 24 ] ) + 1.0f );
-        silk_scale_vector_FLP( XX_ptr, temp, LTP_ORDER * LTP_ORDER );
+        temp = 1.0f/silk_max( xx, LTP_CORR_INV_MAX*0.5f*(XX_ptr[ 0 ] + XX_ptr[ 24 ]) + 1.0f );
+        silk_scale_vector_FLP( XX_ptr, temp, LTP_ORDER*LTP_ORDER );
         silk_scale_vector_FLP( xX_ptr, temp, LTP_ORDER );
 
         r_ptr  += subfr_length;
-        XX_ptr += LTP_ORDER * LTP_ORDER;
+        XX_ptr += LTP_ORDER*LTP_ORDER;
         xX_ptr += LTP_ORDER;
     }
 }
diff --git a/silk/float/find_pitch_lags_FLP.c b/silk/float/find_pitch_lags_FLP.c
index 4ba21db54..b6e8bdcda 100644
--- a/silk/float/find_pitch_lags_FLP.c
+++ b/silk/float/find_pitch_lags_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdlib.h>
@@ -36,12 +36,11 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_find_pitch_lags_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
-    silk_float                      res[],                              /* O    Residual                                    */
-    const silk_float                x[],                                /* I    Speech signal                               */
-    int                             arch                                /* I    Run-time architecture                       */
-)
-{
-    oac_int   buf_len;
+    silk_float res[],                                                   /* O    Residual                                    */
+    const silk_float x[],                                               /* I    Speech signal                               */
+    int arch                                                            /* I    Run-time architecture                       */
+    ) {
+    oac_int buf_len;
     silk_float thrhld, res_nrg;
     const silk_float *x_buf_ptr, *x_buf;
     silk_float auto_corr[ MAX_FIND_PITCH_LPC_ORDER + 1 ];
@@ -74,24 +73,26 @@ void silk_find_pitch_lags_FLP(
     /* Middle non-windowed samples */
     Wsig_ptr  += psEnc->sCmn.la_pitch;
     x_buf_ptr += psEnc->sCmn.la_pitch;
-    silk_memcpy( Wsig_ptr, x_buf_ptr, ( psEnc->sCmn.pitch_LPC_win_length - ( psEnc->sCmn.la_pitch << 1 ) ) * sizeof( silk_float ) );
+    silk_memcpy( Wsig_ptr, x_buf_ptr,
+        (psEnc->sCmn.pitch_LPC_win_length - (psEnc->sCmn.la_pitch<<1))*sizeof(silk_float));
 
     /* Last LA_LTP samples */
-    Wsig_ptr  += psEnc->sCmn.pitch_LPC_win_length - ( psEnc->sCmn.la_pitch << 1 );
-    x_buf_ptr += psEnc->sCmn.pitch_LPC_win_length - ( psEnc->sCmn.la_pitch << 1 );
+    Wsig_ptr  += psEnc->sCmn.pitch_LPC_win_length - (psEnc->sCmn.la_pitch<<1);
+    x_buf_ptr += psEnc->sCmn.pitch_LPC_win_length - (psEnc->sCmn.la_pitch<<1);
     silk_apply_sine_window_FLP( Wsig_ptr, x_buf_ptr, 2, psEnc->sCmn.la_pitch );
 
     /* Calculate autocorrelation sequence */
-    silk_autocorrelation_FLP( auto_corr, Wsig, psEnc->sCmn.pitch_LPC_win_length, psEnc->sCmn.pitchEstimationLPCOrder + 1, arch );
+    silk_autocorrelation_FLP( auto_corr, Wsig, psEnc->sCmn.pitch_LPC_win_length,
+    psEnc->sCmn.pitchEstimationLPCOrder + 1, arch );
 
     /* Add white noise, as a fraction of the energy */
-    auto_corr[ 0 ] += auto_corr[ 0 ] * FIND_PITCH_WHITE_NOISE_FRACTION + 1;
+    auto_corr[ 0 ] += auto_corr[ 0 ]*FIND_PITCH_WHITE_NOISE_FRACTION + 1;
 
     /* Calculate the reflection coefficients using Schur */
     res_nrg = silk_schur_FLP( refl_coef, auto_corr, psEnc->sCmn.pitchEstimationLPCOrder );
 
     /* Prediction gain */
-    psEncCtrl->predGain = auto_corr[ 0 ] / silk_max_float( res_nrg, 1.0f );
+    psEncCtrl->predGain = auto_corr[ 0 ]/silk_max_float( res_nrg, 1.0f );
 
     /* Convert reflection coefficients to prediction coefficients */
     silk_k2a_FLP( A, refl_coef, psEnc->sCmn.pitchEstimationLPCOrder );
@@ -104,27 +105,27 @@ void silk_find_pitch_lags_FLP(
     /*****************************************/
     silk_LPC_analysis_filter_FLP( res, A, x_buf, buf_len, psEnc->sCmn.pitchEstimationLPCOrder );
 
-    if( psEnc->sCmn.indices.signalType != TYPE_NO_VOICE_ACTIVITY && psEnc->sCmn.first_frame_after_reset == 0 ) {
+    if (psEnc->sCmn.indices.signalType != TYPE_NO_VOICE_ACTIVITY && psEnc->sCmn.first_frame_after_reset == 0) {
         /* Threshold for pitch estimator */
         thrhld  = 0.6f;
-        thrhld -= 0.004f * psEnc->sCmn.pitchEstimationLPCOrder;
-        thrhld -= 0.1f   * psEnc->sCmn.speech_activity_Q8 * ( 1.0f /  256.0f );
-        thrhld -= 0.15f  * (psEnc->sCmn.prevSignalType >> 1);
-        thrhld -= 0.1f   * psEnc->sCmn.input_tilt_Q15 * ( 1.0f / 32768.0f );
+        thrhld -= 0.004f*psEnc->sCmn.pitchEstimationLPCOrder;
+        thrhld -= 0.1f*psEnc->sCmn.speech_activity_Q8*(1.0f/256.0f);
+        thrhld -= 0.15f*(psEnc->sCmn.prevSignalType>>1);
+        thrhld -= 0.1f*psEnc->sCmn.input_tilt_Q15*(1.0f/32768.0f);
 
         /*****************************************/
         /* Call Pitch estimator                  */
         /*****************************************/
-        if( silk_pitch_analysis_core_FLP( res, psEncCtrl->pitchL, &psEnc->sCmn.indices.lagIndex,
-            &psEnc->sCmn.indices.contourIndex, &psEnc->LTPCorr, psEnc->sCmn.prevLag, psEnc->sCmn.pitchEstimationThreshold_Q16 / 65536.0f,
-            thrhld, psEnc->sCmn.fs_kHz, psEnc->sCmn.pitchEstimationComplexity, psEnc->sCmn.nb_subfr, arch ) == 0 )
-        {
+        if (silk_pitch_analysis_core_FLP( res, psEncCtrl->pitchL, &psEnc->sCmn.indices.lagIndex,
+            &psEnc->sCmn.indices.contourIndex, &psEnc->LTPCorr, psEnc->sCmn.prevLag,
+        psEnc->sCmn.pitchEstimationThreshold_Q16/65536.0f,
+            thrhld, psEnc->sCmn.fs_kHz, psEnc->sCmn.pitchEstimationComplexity, psEnc->sCmn.nb_subfr, arch ) == 0) {
             psEnc->sCmn.indices.signalType = TYPE_VOICED;
         } else {
             psEnc->sCmn.indices.signalType = TYPE_UNVOICED;
         }
     } else {
-        silk_memset( psEncCtrl->pitchL, 0, sizeof( psEncCtrl->pitchL ) );
+        silk_memset( psEncCtrl->pitchL, 0, sizeof(psEncCtrl->pitchL));
         psEnc->sCmn.indices.lagIndex = 0;
         psEnc->sCmn.indices.contourIndex = 0;
         psEnc->LTPCorr = 0;
diff --git a/silk/float/find_pred_coefs_FLP.c b/silk/float/find_pred_coefs_FLP.c
index 1e605dced..3fc6d88e1 100644
--- a/silk/float/find_pred_coefs_FLP.c
+++ b/silk/float/find_pred_coefs_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FLP.h"
@@ -35,39 +35,40 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_find_pred_coefs_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
-    const silk_float                res_pitch[],                        /* I    Residual from pitch analysis                */
-    const silk_float                x[],                                /* I    Speech signal                               */
-    oac_int                        condCoding                          /* I    The type of conditional coding to use       */
-)
-{
-    oac_int         i;
-    silk_float       XXLTP[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ];
-    silk_float       xXLTP[ MAX_NB_SUBFR * LTP_ORDER ];
-    silk_float       invGains[ MAX_NB_SUBFR ];
+    const silk_float res_pitch[],                                       /* I    Residual from pitch analysis                */
+    const silk_float x[],                                               /* I    Speech signal                               */
+    oac_int condCoding                                                 /* I    The type of conditional coding to use       */
+    ) {
+    oac_int i;
+    silk_float XXLTP[ MAX_NB_SUBFR*LTP_ORDER*LTP_ORDER ];
+    silk_float xXLTP[ MAX_NB_SUBFR*LTP_ORDER ];
+    silk_float invGains[ MAX_NB_SUBFR ];
     /* Set to NLSF_Q15 to zero so we don't copy junk to the state. */
-    oac_int16       NLSF_Q15[ MAX_LPC_ORDER ]={0};
+    oac_int16 NLSF_Q15[ MAX_LPC_ORDER ] = {0};
     const silk_float *x_ptr;
-    silk_float       *x_pre_ptr, LPC_in_pre[ MAX_NB_SUBFR * MAX_LPC_ORDER + MAX_FRAME_LENGTH ];
-    silk_float       minInvGain;
+    silk_float       *x_pre_ptr, LPC_in_pre[ MAX_NB_SUBFR*MAX_LPC_ORDER + MAX_FRAME_LENGTH ];
+    silk_float minInvGain;
 
     /* Weighting for weighted least squares */
-    for( i = 0; i < psEnc->sCmn.nb_subfr; i++ ) {
+    for (i = 0; i < psEnc->sCmn.nb_subfr; i++) {
         silk_assert( psEncCtrl->Gains[ i ] > 0.0f );
-        invGains[ i ] = 1.0f / psEncCtrl->Gains[ i ];
+        invGains[ i ] = 1.0f/psEncCtrl->Gains[ i ];
     }
 
-    if( psEnc->sCmn.indices.signalType == TYPE_VOICED ) {
+    if (psEnc->sCmn.indices.signalType == TYPE_VOICED) {
         /**********/
         /* VOICED */
         /**********/
-        celt_assert( psEnc->sCmn.ltp_mem_length - psEnc->sCmn.predictLPCOrder >= psEncCtrl->pitchL[ 0 ] + LTP_ORDER / 2 );
+        celt_assert( psEnc->sCmn.ltp_mem_length - psEnc->sCmn.predictLPCOrder >= psEncCtrl->pitchL[ 0 ] + LTP_ORDER/2 );
 
         /* LTP analysis */
-        silk_find_LTP_FLP( XXLTP, xXLTP, res_pitch, psEncCtrl->pitchL, psEnc->sCmn.subfr_length, psEnc->sCmn.nb_subfr, psEnc->sCmn.arch );
+        silk_find_LTP_FLP( XXLTP, xXLTP, res_pitch, psEncCtrl->pitchL, psEnc->sCmn.subfr_length, psEnc->sCmn.nb_subfr,
+        psEnc->sCmn.arch );
 
         /* Quantize LTP gain parameters */
         silk_quant_LTP_gains_FLP( psEncCtrl->LTPCoef, psEnc->sCmn.indices.LTPIndex, &psEnc->sCmn.indices.PERIndex,
-            &psEnc->sCmn.sum_log_gain_Q7, &psEncCtrl->LTPredCodGain, XXLTP, xXLTP, psEnc->sCmn.subfr_length, psEnc->sCmn.nb_subfr, psEnc->sCmn.arch );
+            &psEnc->sCmn.sum_log_gain_Q7, &psEncCtrl->LTPredCodGain, XXLTP, xXLTP, psEnc->sCmn.subfr_length,
+        psEnc->sCmn.nb_subfr, psEnc->sCmn.arch );
 
         /* Control LTP scaling */
         silk_LTP_scale_ctrl_FLP( psEnc, psEncCtrl, condCoding );
@@ -82,23 +83,23 @@ void silk_find_pred_coefs_FLP(
         /* Create signal with prepended subframes, scaled by inverse gains */
         x_ptr     = x - psEnc->sCmn.predictLPCOrder;
         x_pre_ptr = LPC_in_pre;
-        for( i = 0; i < psEnc->sCmn.nb_subfr; i++ ) {
+        for (i = 0; i < psEnc->sCmn.nb_subfr; i++) {
             silk_scale_copy_vector_FLP( x_pre_ptr, x_ptr, invGains[ i ],
                 psEnc->sCmn.subfr_length + psEnc->sCmn.predictLPCOrder );
             x_pre_ptr += psEnc->sCmn.subfr_length + psEnc->sCmn.predictLPCOrder;
             x_ptr     += psEnc->sCmn.subfr_length;
         }
-        silk_memset( psEncCtrl->LTPCoef, 0, psEnc->sCmn.nb_subfr * LTP_ORDER * sizeof( silk_float ) );
+        silk_memset( psEncCtrl->LTPCoef, 0, psEnc->sCmn.nb_subfr*LTP_ORDER*sizeof(silk_float));
         psEncCtrl->LTPredCodGain = 0.0f;
         psEnc->sCmn.sum_log_gain_Q7 = 0;
     }
 
     /* Limit on total predictive coding gain */
-    if( psEnc->sCmn.first_frame_after_reset ) {
-        minInvGain = 1.0f / MAX_PREDICTION_POWER_GAIN_AFTER_RESET;
+    if (psEnc->sCmn.first_frame_after_reset) {
+        minInvGain = 1.0f/MAX_PREDICTION_POWER_GAIN_AFTER_RESET;
     } else {
-        minInvGain = (silk_float)pow( 2, psEncCtrl->LTPredCodGain / 3 ) /  MAX_PREDICTION_POWER_GAIN;
-        minInvGain /= 0.25f + 0.75f * psEncCtrl->coding_quality;
+        minInvGain = (silk_float)pow( 2, psEncCtrl->LTPredCodGain/3 )/MAX_PREDICTION_POWER_GAIN;
+        minInvGain /= 0.25f + 0.75f*psEncCtrl->coding_quality;
     }
 
     /* LPC_in_pre contains the LTP-filtered input for voiced, and the unfiltered input for unvoiced */
@@ -112,5 +113,5 @@ void silk_find_pred_coefs_FLP(
         psEnc->sCmn.subfr_length, psEnc->sCmn.nb_subfr, psEnc->sCmn.predictLPCOrder );
 
     /* Copy to prediction struct for use in next frame for interpolation */
-    silk_memcpy( psEnc->sCmn.prev_NLSFq_Q15, NLSF_Q15, sizeof( psEnc->sCmn.prev_NLSFq_Q15 ) );
+    silk_memcpy( psEnc->sCmn.prev_NLSFq_Q15, NLSF_Q15, sizeof(psEnc->sCmn.prev_NLSFq_Q15));
 }
diff --git a/silk/float/inner_product_FLP.c b/silk/float/inner_product_FLP.c
index 5d547d005..75e8d2b44 100644
--- a/silk/float/inner_product_FLP.c
+++ b/silk/float/inner_product_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FLP.h"
@@ -35,24 +35,22 @@ POSSIBILITY OF SUCH DAMAGE.
 double silk_inner_product_FLP_c(
     const silk_float    *data1,
     const silk_float    *data2,
-    oac_int            dataSize
-)
-{
+    oac_int dataSize)                                {
     oac_int i;
-    double   result;
+    double result;
 
     /* 4x unrolled loop */
     result = 0.0;
-    for( i = 0; i < dataSize - 3; i += 4 ) {
-        result += data1[ i + 0 ] * (double)data2[ i + 0 ] +
-                  data1[ i + 1 ] * (double)data2[ i + 1 ] +
-                  data1[ i + 2 ] * (double)data2[ i + 2 ] +
-                  data1[ i + 3 ] * (double)data2[ i + 3 ];
+    for (i = 0; i < dataSize - 3; i += 4) {
+        result += data1[ i + 0 ]*(double)data2[ i + 0 ]
+                  + data1[ i + 1 ]*(double)data2[ i + 1 ]
+                  + data1[ i + 2 ]*(double)data2[ i + 2 ]
+                  + data1[ i + 3 ]*(double)data2[ i + 3 ];
     }
 
     /* add any remaining products */
-    for( ; i < dataSize; i++ ) {
-        result += data1[ i ] * (double)data2[ i ];
+    for ( ; i < dataSize; i++) {
+        result += data1[ i ]*(double)data2[ i ];
     }
 
     return result;
diff --git a/silk/float/k2a_FLP.c b/silk/float/k2a_FLP.c
index 213d02a17..cd383f35d 100644
--- a/silk/float/k2a_FLP.c
+++ b/silk/float/k2a_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FLP.h"
@@ -35,19 +35,18 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_k2a_FLP(
     silk_float          *A,                 /* O     prediction coefficients [order]                            */
     const silk_float    *rc,                /* I     reflection coefficients [order]                            */
-    oac_int32          order               /* I     prediction order                                           */
-)
-{
-    oac_int   k, n;
+    oac_int32 order                        /* I     prediction order                                           */
+    ) {
+    oac_int k, n;
     silk_float rck, tmp1, tmp2;
 
-    for( k = 0; k < order; k++ ) {
+    for (k = 0; k < order; k++) {
         rck = rc[ k ];
-        for( n = 0; n < (k + 1) >> 1; n++ ) {
+        for (n = 0; n < (k + 1)>>1; n++) {
             tmp1 = A[ n ];
             tmp2 = A[ k - n - 1 ];
-            A[ n ]         = tmp1 + tmp2 * rck;
-            A[ k - n - 1 ] = tmp2 + tmp1 * rck;
+            A[ n ]         = tmp1 + tmp2*rck;
+            A[ k - n - 1 ] = tmp2 + tmp1*rck;
         }
         A[ k ] = -rck;
     }
diff --git a/silk/float/main_FLP.h b/silk/float/main_FLP.h
index dfdfd2bd6..54dcd24cf 100644
--- a/silk/float/main_FLP.h
+++ b/silk/float/main_FLP.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_MAIN_FLP_H
@@ -47,39 +47,38 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* High-pass filter with cutoff frequency adaptation based on pitch lag statistics */
 void silk_HP_variable_cutoff(
-    silk_encoder_state_Fxx          state_Fxx[]                         /* I/O  Encoder states                              */
-);
+    silk_encoder_state_Fxx state_Fxx[]                                  /* I/O  Encoder states                              */
+    );
 
 /* Encoder main function */
 void silk_encode_do_VAD_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
-    oac_int                        activity                            /* I    Decision of Oac voice activity detector    */
-);
+    oac_int activity                                                   /* I    Decision of Oac voice activity detector    */
+    );
 
 /* Encoder main function */
 oac_int silk_encode_frame_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     oac_int32                      *pnBytesOut,                        /* O    Number of payload bytes;                    */
     ec_enc                          *psRangeEnc,                        /* I/O  compressor data structure                   */
-    oac_int                        condCoding,                         /* I    The type of conditional coding to use       */
-    oac_int                        maxBits,                            /* I    If > 0: maximum number of output bits       */
-    oac_int                        useCBR                              /* I    Flag to force constant-bitrate operation    */
-);
+    oac_int condCoding,                                                /* I    The type of conditional coding to use       */
+    oac_int maxBits,                                                   /* I    If > 0: maximum number of output bits       */
+    oac_int useCBR                                                     /* I    Flag to force constant-bitrate operation    */
+    );
 
 /* Initializes the Silk encoder state */
 oac_int silk_init_encoder(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
-    int                              arch                               /* I    Run-tim architecture                        */
-);
+    int arch                                                            /* I    Run-tim architecture                        */
+    );
 
 /* Control the Silk encoder */
 oac_int silk_control_encoder(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Pointer to Silk encoder state FLP           */
     silk_EncControlStruct           *encControl,                        /* I    Control structure                           */
-    const oac_int                  allow_bw_switch,                    /* I    Flag to allow switching audio bandwidth     */
-    const oac_int                  channelNb,                          /* I    Channel number                              */
-    const oac_int                  force_fs_kHz
-);
+    const oac_int allow_bw_switch,                                     /* I    Flag to allow switching audio bandwidth     */
+    const oac_int channelNb,                                           /* I    Channel number                              */
+    const oac_int force_fs_kHz);
 
 /**************************/
 /* Noise shaping analysis */
@@ -90,23 +89,23 @@ void silk_noise_shape_analysis_FLP(
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     const silk_float                *pitch_res,                         /* I    LPC residual from pitch analysis            */
     const silk_float                *x                                  /* I    Input signal [frame_length + la_shape]      */
-);
+    );
 
 /* Autocorrelations for a warped frequency axis */
 void silk_warped_autocorrelation_FLP(
     silk_float                      *corr,                              /* O    Result [order + 1]                          */
     const silk_float                *input,                             /* I    Input data to correlate                     */
-    const silk_float                warping,                            /* I    Warping coefficient                         */
-    const oac_int                  length,                             /* I    Length of input                             */
-    const oac_int                  order                               /* I    Correlation order (even)                    */
-);
+    const silk_float warping,                                           /* I    Warping coefficient                         */
+    const oac_int length,                                              /* I    Length of input                             */
+    const oac_int order                                                /* I    Correlation order (even)                    */
+    );
 
 /* Calculation of LTP state scaling */
 void silk_LTP_scale_ctrl_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
-    oac_int                        condCoding                          /* I    The type of conditional coding to use       */
-);
+    oac_int condCoding                                                 /* I    The type of conditional coding to use       */
+    );
 
 /**********************************************/
 /* Prediction Analysis                        */
@@ -115,101 +114,99 @@ void silk_LTP_scale_ctrl_FLP(
 void silk_find_pitch_lags_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
-    silk_float                      res[],                              /* O    Residual                                    */
-    const silk_float                x[],                                /* I    Speech signal                               */
-    int                             arch                                /* I    Run-time architecture                       */
-);
+    silk_float res[],                                                   /* O    Residual                                    */
+    const silk_float x[],                                               /* I    Speech signal                               */
+    int arch                                                            /* I    Run-time architecture                       */
+    );
 
 /* Find LPC and LTP coefficients */
 void silk_find_pred_coefs_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
-    const silk_float                res_pitch[],                        /* I    Residual from pitch analysis                */
-    const silk_float                x[],                                /* I    Speech signal                               */
-    oac_int                        condCoding                          /* I    The type of conditional coding to use       */
-);
+    const silk_float res_pitch[],                                       /* I    Residual from pitch analysis                */
+    const silk_float x[],                                               /* I    Speech signal                               */
+    oac_int condCoding                                                 /* I    The type of conditional coding to use       */
+    );
 
 /* LPC analysis */
 void silk_find_LPC_FLP(
     silk_encoder_state              *psEncC,                            /* I/O  Encoder state                               */
-    oac_int16                      NLSF_Q15[],                         /* O    NLSFs                                       */
-    const silk_float                x[],                                /* I    Input signal                                */
-    const silk_float                minInvGain,                         /* I    Prediction gain from LTP (dB)               */
-    int                             arch
-);
+    oac_int16 NLSF_Q15[],                                              /* O    NLSFs                                       */
+    const silk_float x[],                                               /* I    Input signal                                */
+    const silk_float minInvGain,                                        /* I    Prediction gain from LTP (dB)               */
+    int arch);
 
 /* LTP analysis */
 void silk_find_LTP_FLP(
-    silk_float                      XX[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ], /* O    Weight for LTP quantization         */
-    silk_float                      xX[ MAX_NB_SUBFR * LTP_ORDER ],     /* O    Weight for LTP quantization                 */
-    const silk_float                r_ptr[],                            /* I    LPC residual                                */
-    const oac_int                  lag[  MAX_NB_SUBFR ],               /* I    LTP lags                                    */
-    const oac_int                  subfr_length,                       /* I    Subframe length                             */
-    const oac_int                  nb_subfr,                           /* I    number of subframes                         */
-    int                             arch
-);
+    silk_float XX[ MAX_NB_SUBFR*LTP_ORDER*LTP_ORDER ],                          /* O    Weight for LTP quantization         */
+    silk_float xX[ MAX_NB_SUBFR*LTP_ORDER ],                            /* O    Weight for LTP quantization                 */
+    const silk_float r_ptr[],                                           /* I    LPC residual                                */
+    const oac_int lag[  MAX_NB_SUBFR ],                                /* I    LTP lags                                    */
+    const oac_int subfr_length,                                        /* I    Subframe length                             */
+    const oac_int nb_subfr,                                            /* I    number of subframes                         */
+    int arch);
 
 void silk_LTP_analysis_filter_FLP(
     silk_float                      *LTP_res,                           /* O    LTP res MAX_NB_SUBFR*(pre_lgth+subfr_lngth) */
     const silk_float                *x,                                 /* I    Input signal, with preceding samples        */
-    const silk_float                B[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    LTP coefficients for each subframe          */
-    const oac_int                  pitchL[   MAX_NB_SUBFR ],           /* I    Pitch lags                                  */
-    const silk_float                invGains[ MAX_NB_SUBFR ],           /* I    Inverse quantization gains                  */
-    const oac_int                  subfr_length,                       /* I    Length of each subframe                     */
-    const oac_int                  nb_subfr,                           /* I    number of subframes                         */
-    const oac_int                  pre_length                          /* I    Preceding samples for each subframe         */
-);
+    const silk_float B[ LTP_ORDER*MAX_NB_SUBFR ],                       /* I    LTP coefficients for each subframe          */
+    const oac_int pitchL[   MAX_NB_SUBFR ],                            /* I    Pitch lags                                  */
+    const silk_float invGains[ MAX_NB_SUBFR ],                          /* I    Inverse quantization gains                  */
+    const oac_int subfr_length,                                        /* I    Length of each subframe                     */
+    const oac_int nb_subfr,                                            /* I    number of subframes                         */
+    const oac_int pre_length                                           /* I    Preceding samples for each subframe         */
+    );
 
 /* Calculates residual energies of input subframes where all subframes have LPC_order   */
 /* of preceding samples                                                                 */
 void silk_residual_energy_FLP(
-    silk_float                      nrgs[ MAX_NB_SUBFR ],               /* O    Residual energy per subframe                */
-    const silk_float                x[],                                /* I    Input signal                                */
-    silk_float                      a[ 2 ][ MAX_LPC_ORDER ],            /* I    AR coefs for each frame half                */
-    const silk_float                gains[],                            /* I    Quantization gains                          */
-    const oac_int                  subfr_length,                       /* I    Subframe length                             */
-    const oac_int                  nb_subfr,                           /* I    number of subframes                         */
-    const oac_int                  LPC_order                           /* I    LPC order                                   */
-);
+    silk_float nrgs[ MAX_NB_SUBFR ],                                    /* O    Residual energy per subframe                */
+    const silk_float x[],                                               /* I    Input signal                                */
+    silk_float a[ 2 ][ MAX_LPC_ORDER ],                                 /* I    AR coefs for each frame half                */
+    const silk_float gains[],                                           /* I    Quantization gains                          */
+    const oac_int subfr_length,                                        /* I    Subframe length                             */
+    const oac_int nb_subfr,                                            /* I    number of subframes                         */
+    const oac_int LPC_order                                            /* I    LPC order                                   */
+    );
 
 /* 16th order LPC analysis filter */
 void silk_LPC_analysis_filter_FLP(
-    silk_float                      r_LPC[],                            /* O    LPC residual signal                         */
-    const silk_float                PredCoef[],                         /* I    LPC coefficients                            */
-    const silk_float                s[],                                /* I    Input signal                                */
-    const oac_int                  length,                             /* I    Length of input signal                      */
-    const oac_int                  Order                               /* I    LPC order                                   */
-);
+    silk_float r_LPC[],                                                 /* O    LPC residual signal                         */
+    const silk_float PredCoef[],                                        /* I    LPC coefficients                            */
+    const silk_float s[],                                               /* I    Input signal                                */
+    const oac_int length,                                              /* I    Length of input signal                      */
+    const oac_int Order                                                /* I    LPC order                                   */
+    );
 
 /* LTP tap quantizer */
 void silk_quant_LTP_gains_FLP(
-    silk_float                      B[ MAX_NB_SUBFR * LTP_ORDER ],      /* O    Quantized LTP gains                         */
-    oac_int8                       cbk_index[ MAX_NB_SUBFR ],          /* O    Codebook index                              */
+    silk_float B[ MAX_NB_SUBFR*LTP_ORDER ],                             /* O    Quantized LTP gains                         */
+    oac_int8 cbk_index[ MAX_NB_SUBFR ],                                /* O    Codebook index                              */
     oac_int8                       *periodicity_index,                 /* O    Periodicity index                           */
     oac_int32                      *sum_log_gain_Q7,                   /* I/O  Cumulative max prediction gain  */
     silk_float                      *pred_gain_dB,                      /* O    LTP prediction gain                         */
-    const silk_float                XX[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ], /* I    Correlation matrix                  */
-    const silk_float                xX[ MAX_NB_SUBFR * LTP_ORDER ],     /* I    Correlation vector                          */
-    const oac_int                  subfr_len,                          /* I    Number of samples per subframe              */
-    const oac_int                  nb_subfr,                           /* I    Number of subframes                         */
-    int                             arch                                /* I    Run-time architecture                       */
-);
+    const silk_float XX[ MAX_NB_SUBFR*LTP_ORDER*LTP_ORDER ],                    /* I    Correlation matrix                  */
+    const silk_float xX[ MAX_NB_SUBFR*LTP_ORDER ],                      /* I    Correlation vector                          */
+    const oac_int subfr_len,                                           /* I    Number of samples per subframe              */
+    const oac_int nb_subfr,                                            /* I    Number of subframes                         */
+    int arch                                                            /* I    Run-time architecture                       */
+    );
 
 /* Residual energy: nrg = wxx - 2 * wXx * c + c' * wXX * c */
 silk_float silk_residual_energy_covar_FLP(                              /* O    Weighted residual energy                    */
     const silk_float                *c,                                 /* I    Filter coefficients                         */
     silk_float                      *wXX,                               /* I/O  Weighted correlation matrix, reg. out       */
     const silk_float                *wXx,                               /* I    Weighted correlation vector                 */
-    const silk_float                wxx,                                /* I    Weighted correlation value                  */
-    const oac_int                  D                                   /* I    Dimension                                   */
-);
+    const silk_float wxx,                                               /* I    Weighted correlation value                  */
+    const oac_int D                                                    /* I    Dimension                                   */
+    );
 
 /* Processing of gains */
 void silk_process_gains_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
-    oac_int                        condCoding                          /* I    The type of conditional coding to use       */
-);
+    oac_int condCoding                                                 /* I    The type of conditional coding to use       */
+    );
 
 /******************/
 /* Linear Algebra */
@@ -217,32 +214,30 @@ void silk_process_gains_FLP(
 /* Calculates correlation matrix X'*X */
 void silk_corrMatrix_FLP(
     const silk_float                *x,                                 /* I    x vector [ L+order-1 ] used to create X     */
-    const oac_int                  L,                                  /* I    Length of vectors                           */
-    const oac_int                  Order,                              /* I    Max lag for correlation                     */
+    const oac_int L,                                                   /* I    Length of vectors                           */
+    const oac_int Order,                                               /* I    Max lag for correlation                     */
     silk_float                      *XX,                                /* O    X'*X correlation matrix [order x order]     */
-    int                             arch
-);
+    int arch);
 
 /* Calculates correlation vector X'*t */
 void silk_corrVector_FLP(
     const silk_float                *x,                                 /* I    x vector [L+order-1] used to create X       */
     const silk_float                *t,                                 /* I    Target vector [L]                           */
-    const oac_int                  L,                                  /* I    Length of vecors                            */
-    const oac_int                  Order,                              /* I    Max lag for correlation                     */
+    const oac_int L,                                                   /* I    Length of vecors                            */
+    const oac_int Order,                                               /* I    Max lag for correlation                     */
     silk_float                      *Xt,                                /* O    X'*t correlation vector [order]             */
-    int                             arch
-);
+    int arch);
 
 /* Apply sine window to signal vector.  */
 /* Window types:                        */
 /*  1 -> sine window from 0 to pi/2     */
 /*  2 -> sine window from pi/2 to pi    */
 void silk_apply_sine_window_FLP(
-    silk_float                      px_win[],                           /* O    Pointer to windowed signal                  */
-    const silk_float                px[],                               /* I    Pointer to input signal                     */
-    const oac_int                  win_type,                           /* I    Selects a window type                       */
-    const oac_int                  length                              /* I    Window length, multiple of 4                */
-);
+    silk_float px_win[],                                                /* O    Pointer to windowed signal                  */
+    const silk_float px[],                                              /* I    Pointer to input signal                     */
+    const oac_int win_type,                                            /* I    Selects a window type                       */
+    const oac_int length                                               /* I    Window length, multiple of 4                */
+    );
 
 /* Wrapper functions. Call flp / fix code */
 
@@ -250,24 +245,24 @@ void silk_apply_sine_window_FLP(
 void silk_A2NLSF_FLP(
     oac_int16                      *NLSF_Q15,                          /* O    NLSF vector      [ LPC_order ]              */
     const silk_float                *pAR,                               /* I    LPC coefficients [ LPC_order ]              */
-    const oac_int                  LPC_order                           /* I    LPC order                                   */
-);
+    const oac_int LPC_order                                            /* I    LPC order                                   */
+    );
 
 /* Convert NLSF parameters to AR prediction filter coefficients */
 void silk_NLSF2A_FLP(
     silk_float                      *pAR,                               /* O    LPC coefficients [ LPC_order ]              */
     const oac_int16                *NLSF_Q15,                          /* I    NLSF vector      [ LPC_order ]              */
-    const oac_int                  LPC_order,                          /* I    LPC order                                   */
-    int                             arch                                /* I    Run-time architecture                       */
-);
+    const oac_int LPC_order,                                           /* I    LPC order                                   */
+    int arch                                                            /* I    Run-time architecture                       */
+    );
 
 /* Limit, stabilize, and quantize NLSFs */
 void silk_process_NLSFs_FLP(
     silk_encoder_state              *psEncC,                            /* I/O  Encoder state                               */
-    silk_float                      PredCoef[ 2 ][ MAX_LPC_ORDER ],     /* O    Prediction coefficients                     */
-    oac_int16                      NLSF_Q15[      MAX_LPC_ORDER ],     /* I/O  Normalized LSFs (quant out) (0 - (2^15-1))  */
-    const oac_int16                prev_NLSF_Q15[ MAX_LPC_ORDER ]      /* I    Previous Normalized LSFs (0 - (2^15-1))     */
-);
+    silk_float PredCoef[ 2 ][ MAX_LPC_ORDER ],                          /* O    Prediction coefficients                     */
+    oac_int16 NLSF_Q15[      MAX_LPC_ORDER ],                          /* I/O  Normalized LSFs (quant out) (0 - (2^15-1))  */
+    const oac_int16 prev_NLSF_Q15[ MAX_LPC_ORDER ]                     /* I    Previous Normalized LSFs (0 - (2^15-1))     */
+    );
 
 /* Floating-point Silk NSQ wrapper      */
 void silk_NSQ_wrapper_FLP(
@@ -275,8 +270,8 @@ void silk_NSQ_wrapper_FLP(
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     SideInfoIndices                 *psIndices,                         /* I/O  Quantization indices                        */
     silk_nsq_state                  *psNSQ,                             /* I/O  Noise Shaping Quantzation state             */
-    oac_int8                       pulses[],                           /* O    Quantized pulse signal                      */
-    const silk_float                x[]                                 /* I    Prefiltered input signal                    */
-);
+    oac_int8 pulses[],                                                 /* O    Quantized pulse signal                      */
+    const silk_float x[]                                                /* I    Prefiltered input signal                    */
+    );
 
 #endif
diff --git a/silk/float/noise_shape_analysis_FLP.c b/silk/float/noise_shape_analysis_FLP.c
index 199504145..f94ceab4d 100644
--- a/silk/float/noise_shape_analysis_FLP.c
+++ b/silk/float/noise_shape_analysis_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FLP.h"
@@ -38,75 +38,73 @@ POSSIBILITY OF SUCH DAMAGE.
 /* coefficient in an array of coefficients, for monic filters.                                    */
 static OAC_INLINE silk_float warped_gain(
     const silk_float     *coefs,
-    silk_float           lambda,
-    oac_int             order
-) {
-    oac_int   i;
+    silk_float lambda,
+    oac_int order) {
+    oac_int i;
     silk_float gain;
 
     lambda = -lambda;
     gain = coefs[ order - 1 ];
-    for( i = order - 2; i >= 0; i-- ) {
-        gain = lambda * gain + coefs[ i ];
+    for (i = order - 2; i >= 0; i--) {
+        gain = lambda*gain + coefs[ i ];
     }
-    return (silk_float)( 1.0f / ( 1.0f - lambda * gain ) );
+    return (silk_float)(1.0f/(1.0f - lambda*gain));
 }
 
 /* Convert warped filter coefficients to monic pseudo-warped coefficients and limit maximum     */
 /* amplitude of monic warped coefficients by using bandwidth expansion on the true coefficients */
 static OAC_INLINE void warped_true2monic_coefs(
     silk_float           *coefs,
-    silk_float           lambda,
-    silk_float           limit,
-    oac_int             order
-) {
-    oac_int   i, iter, ind = 0;
+    silk_float lambda,
+    silk_float limit,
+    oac_int order) {
+    oac_int i, iter, ind = 0;
     silk_float tmp, maxabs, chirp, gain;
 
     /* Convert to monic coefficients */
-    for( i = order - 1; i > 0; i-- ) {
-        coefs[ i - 1 ] -= lambda * coefs[ i ];
+    for (i = order - 1; i > 0; i--) {
+        coefs[ i - 1 ] -= lambda*coefs[ i ];
     }
-    gain = ( 1.0f - lambda * lambda ) / ( 1.0f + lambda * coefs[ 0 ] );
-    for( i = 0; i < order; i++ ) {
+    gain = (1.0f - lambda*lambda)/(1.0f + lambda*coefs[ 0 ]);
+    for (i = 0; i < order; i++) {
         coefs[ i ] *= gain;
     }
 
     /* Limit */
-    for( iter = 0; iter < 10; iter++ ) {
+    for (iter = 0; iter < 10; iter++) {
         /* Find maximum absolute value */
         maxabs = -1.0f;
-        for( i = 0; i < order; i++ ) {
+        for (i = 0; i < order; i++) {
             tmp = silk_abs_float( coefs[ i ] );
-            if( tmp > maxabs ) {
+            if (tmp > maxabs) {
                 maxabs = tmp;
                 ind = i;
             }
         }
-        if( maxabs <= limit ) {
+        if (maxabs <= limit) {
             /* Coefficients are within range - done */
             return;
         }
 
         /* Convert back to true warped coefficients */
-        for( i = 1; i < order; i++ ) {
-            coefs[ i - 1 ] += lambda * coefs[ i ];
+        for (i = 1; i < order; i++) {
+            coefs[ i - 1 ] += lambda*coefs[ i ];
         }
-        gain = 1.0f / gain;
-        for( i = 0; i < order; i++ ) {
+        gain = 1.0f/gain;
+        for (i = 0; i < order; i++) {
             coefs[ i ] *= gain;
         }
 
         /* Apply bandwidth expansion */
-        chirp = 0.99f - ( 0.8f + 0.1f * iter ) * ( maxabs - limit ) / ( maxabs * ( ind + 1 ) );
+        chirp = 0.99f - (0.8f + 0.1f*iter)*(maxabs - limit)/(maxabs*(ind + 1));
         silk_bwexpander_FLP( coefs, order, chirp );
 
         /* Convert to monic warped coefficients */
-        for( i = order - 1; i > 0; i-- ) {
-            coefs[ i - 1 ] -= lambda * coefs[ i ];
+        for (i = order - 1; i > 0; i--) {
+            coefs[ i - 1 ] -= lambda*coefs[ i ];
         }
-        gain = ( 1.0f - lambda * lambda ) / ( 1.0f + lambda * coefs[ 0 ] );
-        for( i = 0; i < order; i++ ) {
+        gain = (1.0f - lambda*lambda)/(1.0f + lambda*coefs[ 0 ]);
+        for (i = 0; i < order; i++) {
             coefs[ i ] *= gain;
         }
     }
@@ -115,29 +113,28 @@ static OAC_INLINE void warped_true2monic_coefs(
 
 static OAC_INLINE void limit_coefs(
     silk_float           *coefs,
-    silk_float           limit,
-    oac_int             order
-) {
-    oac_int   i, iter, ind = 0;
+    silk_float limit,
+    oac_int order) {
+    oac_int i, iter, ind = 0;
     silk_float tmp, maxabs, chirp;
 
-    for( iter = 0; iter < 10; iter++ ) {
+    for (iter = 0; iter < 10; iter++) {
         /* Find maximum absolute value */
         maxabs = -1.0f;
-        for( i = 0; i < order; i++ ) {
+        for (i = 0; i < order; i++) {
             tmp = silk_abs_float( coefs[ i ] );
-            if( tmp > maxabs ) {
+            if (tmp > maxabs) {
                 maxabs = tmp;
                 ind = i;
             }
         }
-        if( maxabs <= limit ) {
+        if (maxabs <= limit) {
             /* Coefficients are within range - done */
             return;
         }
 
         /* Apply bandwidth expansion */
-        chirp = 0.99f - ( 0.8f + 0.1f * iter ) * ( maxabs - limit ) / ( maxabs * ( ind + 1 ) );
+        chirp = 0.99f - (0.8f + 0.1f*iter)*(maxabs - limit)/(maxabs*(ind + 1));
         silk_bwexpander_FLP( coefs, order, chirp );
     }
     silk_assert( 0 );
@@ -149,16 +146,15 @@ void silk_noise_shape_analysis_FLP(
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     const silk_float                *pitch_res,                         /* I    LPC residual from pitch analysis            */
     const silk_float                *x                                  /* I    Input signal [frame_length + la_shape]      */
-)
-{
+    ) {
     silk_shape_state_FLP *psShapeSt = &psEnc->sShape;
-    oac_int     k, nSamples, nSegs;
-    silk_float   SNR_adj_dB, HarmShapeGain, Tilt;
-    silk_float   nrg, log_energy, log_energy_prev, energy_variation;
-    silk_float   BWExp, gain_mult, gain_add, strength, b, warping;
-    silk_float   x_windowed[ SHAPE_LPC_WIN_MAX ];
-    silk_float   auto_corr[ MAX_SHAPE_LPC_ORDER + 1 ];
-    silk_float   rc[ MAX_SHAPE_LPC_ORDER + 1 ];
+    oac_int k, nSamples, nSegs;
+    silk_float SNR_adj_dB, HarmShapeGain, Tilt;
+    silk_float nrg, log_energy, log_energy_prev, energy_variation;
+    silk_float BWExp, gain_mult, gain_add, strength, b, warping;
+    silk_float x_windowed[ SHAPE_LPC_WIN_MAX ];
+    silk_float auto_corr[ MAX_SHAPE_LPC_ORDER + 1 ];
+    silk_float rc[ MAX_SHAPE_LPC_ORDER + 1 ];
     const silk_float *x_ptr, *pitch_res_ptr;
 
     /* Point to start of first LPC analysis block */
@@ -167,46 +163,48 @@ void silk_noise_shape_analysis_FLP(
     /****************/
     /* GAIN CONTROL */
     /****************/
-    SNR_adj_dB = psEnc->sCmn.SNR_dB_Q7 * ( 1 / 128.0f );
+    SNR_adj_dB = psEnc->sCmn.SNR_dB_Q7*(1/128.0f);
 
     /* Input quality is the average of the quality in the lowest two VAD bands */
-    psEncCtrl->input_quality = 0.5f * ( psEnc->sCmn.input_quality_bands_Q15[ 0 ] + psEnc->sCmn.input_quality_bands_Q15[ 1 ] ) * ( 1.0f / 32768.0f );
+    psEncCtrl->input_quality = 0.5f
+                               *(psEnc->sCmn.input_quality_bands_Q15[ 0 ] + psEnc->sCmn.input_quality_bands_Q15[ 1 ])
+                               *(1.0f/32768.0f);
 
     /* Coding quality level, between 0.0 and 1.0 */
-    psEncCtrl->coding_quality = silk_sigmoid( 0.25f * ( SNR_adj_dB - 20.0f ) );
+    psEncCtrl->coding_quality = silk_sigmoid( 0.25f*(SNR_adj_dB - 20.0f));
 
-    if( psEnc->sCmn.useCBR == 0 ) {
+    if (psEnc->sCmn.useCBR == 0) {
         /* Reduce coding SNR during low speech activity */
-        b = 1.0f - psEnc->sCmn.speech_activity_Q8 * ( 1.0f /  256.0f );
-        SNR_adj_dB -= BG_SNR_DECR_dB * psEncCtrl->coding_quality * ( 0.5f + 0.5f * psEncCtrl->input_quality ) * b * b;
+        b = 1.0f - psEnc->sCmn.speech_activity_Q8*(1.0f/256.0f);
+        SNR_adj_dB -= BG_SNR_DECR_dB*psEncCtrl->coding_quality*(0.5f + 0.5f*psEncCtrl->input_quality)*b*b;
     }
 
-    if( psEnc->sCmn.indices.signalType == TYPE_VOICED ) {
+    if (psEnc->sCmn.indices.signalType == TYPE_VOICED) {
         /* Reduce gains for periodic signals */
-        SNR_adj_dB += HARM_SNR_INCR_dB * psEnc->LTPCorr;
+        SNR_adj_dB += HARM_SNR_INCR_dB*psEnc->LTPCorr;
     } else {
         /* For unvoiced signals and low-quality input, adjust the quality slower than SNR_dB setting */
-        SNR_adj_dB += ( -0.4f * psEnc->sCmn.SNR_dB_Q7 * ( 1 / 128.0f ) + 6.0f ) * ( 1.0f - psEncCtrl->input_quality );
+        SNR_adj_dB += (-0.4f*psEnc->sCmn.SNR_dB_Q7*(1/128.0f) + 6.0f)*(1.0f - psEncCtrl->input_quality);
     }
 
     /*************************/
     /* SPARSENESS PROCESSING */
     /*************************/
     /* Set quantizer offset */
-    if( psEnc->sCmn.indices.signalType == TYPE_VOICED ) {
+    if (psEnc->sCmn.indices.signalType == TYPE_VOICED) {
         /* Initially set to 0; may be overruled in process_gains(..) */
         psEnc->sCmn.indices.quantOffsetType = 0;
     } else {
         /* Sparseness measure, based on relative fluctuations of energy per 2 milliseconds */
-        nSamples = 2 * psEnc->sCmn.fs_kHz;
+        nSamples = 2*psEnc->sCmn.fs_kHz;
         energy_variation = 0.0f;
         log_energy_prev  = 0.0f;
         pitch_res_ptr = pitch_res;
-        nSegs = silk_SMULBB( SUB_FRAME_LENGTH_MS, psEnc->sCmn.nb_subfr ) / 2;
-        for( k = 0; k < nSegs; k++ ) {
+        nSegs = silk_SMULBB( SUB_FRAME_LENGTH_MS, psEnc->sCmn.nb_subfr )/2;
+        for (k = 0; k < nSegs; k++) {
             nrg = ( silk_float )nSamples + ( silk_float )silk_energy_FLP( pitch_res_ptr, nSamples );
             log_energy = silk_log2( nrg );
-            if( k > 0 ) {
+            if (k > 0) {
                 energy_variation += silk_abs_float( log_energy - log_energy_prev );
             }
             log_energy_prev = log_energy;
@@ -214,7 +212,7 @@ void silk_noise_shape_analysis_FLP(
         }
 
         /* Set quantization offset depending on sparseness measure */
-        if( energy_variation > ENERGY_VARIATION_THRESHOLD_QNT_OFFSET * (nSegs-1) ) {
+        if (energy_variation > ENERGY_VARIATION_THRESHOLD_QNT_OFFSET*(nSegs - 1)) {
             psEnc->sCmn.indices.quantOffsetType = 0;
         } else {
             psEnc->sCmn.indices.quantOffsetType = 1;
@@ -225,61 +223,64 @@ void silk_noise_shape_analysis_FLP(
     /* Control bandwidth expansion */
     /*******************************/
     /* More BWE for signals with high prediction gain */
-    strength = FIND_PITCH_WHITE_NOISE_FRACTION * psEncCtrl->predGain;           /* between 0.0 and 1.0 */
-    BWExp = BANDWIDTH_EXPANSION / ( 1.0f + strength * strength );
+    strength = FIND_PITCH_WHITE_NOISE_FRACTION*psEncCtrl->predGain;             /* between 0.0 and 1.0 */
+    BWExp = BANDWIDTH_EXPANSION/(1.0f + strength*strength);
 
     /* Slightly more warping in analysis will move quantization noise up in frequency, where it's better masked */
-    warping = (silk_float)psEnc->sCmn.warping_Q16 / 65536.0f + 0.01f * psEncCtrl->coding_quality;
+    warping = (silk_float)psEnc->sCmn.warping_Q16/65536.0f + 0.01f*psEncCtrl->coding_quality;
 
     /********************************************/
     /* Compute noise shaping AR coefs and gains */
     /********************************************/
-    for( k = 0; k < psEnc->sCmn.nb_subfr; k++ ) {
+    for (k = 0; k < psEnc->sCmn.nb_subfr; k++) {
         /* Apply window: sine slope followed by flat part followed by cosine slope */
         oac_int shift, slope_part, flat_part;
-        flat_part = psEnc->sCmn.fs_kHz * 3;
-        slope_part = ( psEnc->sCmn.shapeWinLength - flat_part ) / 2;
+        flat_part = psEnc->sCmn.fs_kHz*3;
+        slope_part = (psEnc->sCmn.shapeWinLength - flat_part)/2;
 
         silk_apply_sine_window_FLP( x_windowed, x_ptr, 1, slope_part );
         shift = slope_part;
-        silk_memcpy( x_windowed + shift, x_ptr + shift, flat_part * sizeof(silk_float) );
+        silk_memcpy( x_windowed + shift, x_ptr + shift, flat_part*sizeof(silk_float));
         shift += flat_part;
         silk_apply_sine_window_FLP( x_windowed + shift, x_ptr + shift, 2, slope_part );
 
         /* Update pointer: next LPC analysis block */
         x_ptr += psEnc->sCmn.subfr_length;
 
-        if( psEnc->sCmn.warping_Q16 > 0 ) {
+        if (psEnc->sCmn.warping_Q16 > 0) {
             /* Calculate warped auto correlation */
             silk_warped_autocorrelation_FLP( auto_corr, x_windowed, warping,
                 psEnc->sCmn.shapeWinLength, psEnc->sCmn.shapingLPCOrder );
         } else {
             /* Calculate regular auto correlation */
-            silk_autocorrelation_FLP( auto_corr, x_windowed, psEnc->sCmn.shapeWinLength, psEnc->sCmn.shapingLPCOrder + 1, psEnc->sCmn.arch );
+            silk_autocorrelation_FLP( auto_corr, x_windowed, psEnc->sCmn.shapeWinLength,
+            psEnc->sCmn.shapingLPCOrder + 1, psEnc->sCmn.arch );
         }
 
         /* Add white noise, as a fraction of energy */
-        auto_corr[ 0 ] += auto_corr[ 0 ] * SHAPE_WHITE_NOISE_FRACTION + 1.0f;
+        auto_corr[ 0 ] += auto_corr[ 0 ]*SHAPE_WHITE_NOISE_FRACTION + 1.0f;
 
         /* Convert correlations to prediction coefficients, and compute residual energy */
         nrg = silk_schur_FLP( rc, auto_corr, psEnc->sCmn.shapingLPCOrder );
-        silk_k2a_FLP( &psEncCtrl->AR[ k * MAX_SHAPE_LPC_ORDER ], rc, psEnc->sCmn.shapingLPCOrder );
+        silk_k2a_FLP( &psEncCtrl->AR[ k*MAX_SHAPE_LPC_ORDER ], rc, psEnc->sCmn.shapingLPCOrder );
         psEncCtrl->Gains[ k ] = ( silk_float )sqrt( nrg );
 
-        if( psEnc->sCmn.warping_Q16 > 0 ) {
+        if (psEnc->sCmn.warping_Q16 > 0) {
             /* Adjust gain for warping */
-            psEncCtrl->Gains[ k ] *= warped_gain( &psEncCtrl->AR[ k * MAX_SHAPE_LPC_ORDER ], warping, psEnc->sCmn.shapingLPCOrder );
+            psEncCtrl->Gains[ k ] *= warped_gain( &psEncCtrl->AR[ k*MAX_SHAPE_LPC_ORDER ], warping,
+            psEnc->sCmn.shapingLPCOrder );
         }
 
         /* Bandwidth expansion for synthesis filter shaping */
-        silk_bwexpander_FLP( &psEncCtrl->AR[ k * MAX_SHAPE_LPC_ORDER ], psEnc->sCmn.shapingLPCOrder, BWExp );
+        silk_bwexpander_FLP( &psEncCtrl->AR[ k*MAX_SHAPE_LPC_ORDER ], psEnc->sCmn.shapingLPCOrder, BWExp );
 
-        if( psEnc->sCmn.warping_Q16 > 0 ) {
+        if (psEnc->sCmn.warping_Q16 > 0) {
             /* Convert to monic warped prediction coefficients and limit absolute values */
-            warped_true2monic_coefs( &psEncCtrl->AR[ k * MAX_SHAPE_LPC_ORDER ], warping, 3.999f, psEnc->sCmn.shapingLPCOrder );
+            warped_true2monic_coefs( &psEncCtrl->AR[ k*MAX_SHAPE_LPC_ORDER ], warping, 3.999f,
+            psEnc->sCmn.shapingLPCOrder );
         } else {
             /* Limit absolute values */
-            limit_coefs( &psEncCtrl->AR[ k * MAX_SHAPE_LPC_ORDER ], 3.999f, psEnc->sCmn.shapingLPCOrder );
+            limit_coefs( &psEncCtrl->AR[ k*MAX_SHAPE_LPC_ORDER ], 3.999f, psEnc->sCmn.shapingLPCOrder );
         }
     }
 
@@ -287,9 +288,9 @@ void silk_noise_shape_analysis_FLP(
     /* Gain tweaking */
     /*****************/
     /* Increase gains during low speech activity */
-    gain_mult = (silk_float)pow( 2.0f, -0.16f * SNR_adj_dB );
-    gain_add  = (silk_float)pow( 2.0f,  0.16f * MIN_QGAIN_DB );
-    for( k = 0; k < psEnc->sCmn.nb_subfr; k++ ) {
+    gain_mult = (silk_float)pow( 2.0f, -0.16f*SNR_adj_dB );
+    gain_add  = (silk_float)pow( 2.0f,  0.16f*MIN_QGAIN_DB );
+    for (k = 0; k < psEnc->sCmn.nb_subfr; k++) {
         psEncCtrl->Gains[ k ] *= gain_mult;
         psEncCtrl->Gains[ k ] += gain_add;
     }
@@ -298,23 +299,25 @@ void silk_noise_shape_analysis_FLP(
     /* Control low-frequency shaping and noise tilt */
     /************************************************/
     /* Less low frequency shaping for noisy inputs */
-    strength = LOW_FREQ_SHAPING * ( 1.0f + LOW_QUALITY_LOW_FREQ_SHAPING_DECR * ( psEnc->sCmn.input_quality_bands_Q15[ 0 ] * ( 1.0f / 32768.0f ) - 1.0f ) );
-    strength *= psEnc->sCmn.speech_activity_Q8 * ( 1.0f /  256.0f );
-    if( psEnc->sCmn.indices.signalType == TYPE_VOICED ) {
+    strength = LOW_FREQ_SHAPING
+               *(1.0f + LOW_QUALITY_LOW_FREQ_SHAPING_DECR
+                 *(psEnc->sCmn.input_quality_bands_Q15[ 0 ]*(1.0f/32768.0f) - 1.0f));
+    strength *= psEnc->sCmn.speech_activity_Q8*(1.0f/256.0f);
+    if (psEnc->sCmn.indices.signalType == TYPE_VOICED) {
         /* Reduce low frequencies quantization noise for periodic signals, depending on pitch lag */
         /*f = 400; freqz([1, -0.98 + 2e-4 * f], [1, -0.97 + 7e-4 * f], 2^12, Fs); axis([0, 1000, -10, 1])*/
-        for( k = 0; k < psEnc->sCmn.nb_subfr; k++ ) {
-            b = 0.2f / psEnc->sCmn.fs_kHz + 3.0f / psEncCtrl->pitchL[ k ];
+        for (k = 0; k < psEnc->sCmn.nb_subfr; k++) {
+            b = 0.2f/psEnc->sCmn.fs_kHz + 3.0f/psEncCtrl->pitchL[ k ];
             psEncCtrl->LF_MA_shp[ k ] = -1.0f + b;
-            psEncCtrl->LF_AR_shp[ k ] =  1.0f - b - b * strength;
+            psEncCtrl->LF_AR_shp[ k ] =  1.0f - b - b*strength;
         }
-        Tilt = - HP_NOISE_COEF -
-            (1 - HP_NOISE_COEF) * HARM_HP_NOISE_COEF * psEnc->sCmn.speech_activity_Q8 * ( 1.0f /  256.0f );
+        Tilt = -HP_NOISE_COEF
+               - (1 - HP_NOISE_COEF)*HARM_HP_NOISE_COEF*psEnc->sCmn.speech_activity_Q8*(1.0f/256.0f);
     } else {
-        b = 1.3f / psEnc->sCmn.fs_kHz;
+        b = 1.3f/psEnc->sCmn.fs_kHz;
         psEncCtrl->LF_MA_shp[ 0 ] = -1.0f + b;
-        psEncCtrl->LF_AR_shp[ 0 ] =  1.0f - b - b * strength * 0.6f;
-        for( k = 1; k < psEnc->sCmn.nb_subfr; k++ ) {
+        psEncCtrl->LF_AR_shp[ 0 ] =  1.0f - b - b*strength*0.6f;
+        for (k = 1; k < psEnc->sCmn.nb_subfr; k++) {
             psEncCtrl->LF_MA_shp[ k ] = psEncCtrl->LF_MA_shp[ 0 ];
             psEncCtrl->LF_AR_shp[ k ] = psEncCtrl->LF_AR_shp[ 0 ];
         }
@@ -324,13 +327,13 @@ void silk_noise_shape_analysis_FLP(
     /****************************/
     /* HARMONIC SHAPING CONTROL */
     /****************************/
-    if( USE_HARM_SHAPING && psEnc->sCmn.indices.signalType == TYPE_VOICED ) {
+    if (USE_HARM_SHAPING && psEnc->sCmn.indices.signalType == TYPE_VOICED) {
         /* Harmonic noise shaping */
         HarmShapeGain = HARMONIC_SHAPING;
 
         /* More harmonic noise shaping for high bitrates or noisy input */
-        HarmShapeGain += HIGH_RATE_OR_LOW_QUALITY_HARMONIC_SHAPING *
-            ( 1.0f - ( 1.0f - psEncCtrl->coding_quality ) * psEncCtrl->input_quality );
+        HarmShapeGain += HIGH_RATE_OR_LOW_QUALITY_HARMONIC_SHAPING
+                         *(1.0f - (1.0f - psEncCtrl->coding_quality)*psEncCtrl->input_quality);
 
         /* Less harmonic noise shaping for less periodic signals */
         HarmShapeGain *= ( silk_float )sqrt( psEnc->LTPCorr );
@@ -341,10 +344,10 @@ void silk_noise_shape_analysis_FLP(
     /*************************/
     /* Smooth over subframes */
     /*************************/
-    for( k = 0; k < psEnc->sCmn.nb_subfr; k++ ) {
-        psShapeSt->HarmShapeGain_smth += SUBFR_SMTH_COEF * ( HarmShapeGain - psShapeSt->HarmShapeGain_smth );
+    for (k = 0; k < psEnc->sCmn.nb_subfr; k++) {
+        psShapeSt->HarmShapeGain_smth += SUBFR_SMTH_COEF*(HarmShapeGain - psShapeSt->HarmShapeGain_smth);
         psEncCtrl->HarmShapeGain[ k ]  = psShapeSt->HarmShapeGain_smth;
-        psShapeSt->Tilt_smth          += SUBFR_SMTH_COEF * ( Tilt - psShapeSt->Tilt_smth );
+        psShapeSt->Tilt_smth          += SUBFR_SMTH_COEF*(Tilt - psShapeSt->Tilt_smth);
         psEncCtrl->Tilt[ k ]           = psShapeSt->Tilt_smth;
     }
 }
diff --git a/silk/float/pitch_analysis_core_FLP.c b/silk/float/pitch_analysis_core_FLP.c
index 9b95a261b..8ff25b7a4 100644
--- a/silk/float/pitch_analysis_core_FLP.c
+++ b/silk/float/pitch_analysis_core_FLP.c
@@ -1,37 +1,37 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 /*****************************************************************************
-* Pitch analyser function
-******************************************************************************/
+ * Pitch analyser function
+ ******************************************************************************/
 #include "SigProc_FLP.h"
 #include "SigProc_FIX.h"
 #include "pitch_est_defines.h"
@@ -44,22 +44,22 @@ POSSIBILITY OF SUCH DAMAGE.
 /************************************************************/
 static void silk_P_Ana_calc_corr_st3(
     silk_float cross_corr_st3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ][ PE_NB_STAGE3_LAGS ], /* O 3 DIM correlation array */
-    const silk_float    frame[],            /* I vector to correlate                                            */
-    oac_int            start_lag,          /* I start lag                                                      */
-    oac_int            sf_length,          /* I sub frame length                                               */
-    oac_int            nb_subfr,           /* I number of subframes                                            */
-    oac_int            complexity,         /* I Complexity setting                                             */
-    int                 arch                /* I Run-time architecture                                          */
-);
+    const silk_float frame[],               /* I vector to correlate                                            */
+    oac_int start_lag,                     /* I start lag                                                      */
+    oac_int sf_length,                     /* I sub frame length                                               */
+    oac_int nb_subfr,                      /* I number of subframes                                            */
+    oac_int complexity,                    /* I Complexity setting                                             */
+    int arch                                /* I Run-time architecture                                          */
+    );
 
 static void silk_P_Ana_calc_energy_st3(
     silk_float energies_st3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ][ PE_NB_STAGE3_LAGS ], /* O 3 DIM correlation array */
-    const silk_float    frame[],            /* I vector to correlate                                            */
-    oac_int            start_lag,          /* I start lag                                                      */
-    oac_int            sf_length,          /* I sub frame length                                               */
-    oac_int            nb_subfr,           /* I number of subframes                                            */
-    oac_int            complexity          /* I Complexity setting                                             */
-);
+    const silk_float frame[],               /* I vector to correlate                                            */
+    oac_int start_lag,                     /* I start lag                                                      */
+    oac_int sf_length,                     /* I sub frame length                                               */
+    oac_int nb_subfr,                      /* I number of subframes                                            */
+    oac_int complexity                     /* I Complexity setting                                             */
+    );
 
 /************************************************************/
 /* CORE PITCH ANALYSIS FUNCTION                             */
@@ -70,42 +70,41 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
     oac_int16          *lagIndex,          /* O    Lag Index                                                   */
     oac_int8           *contourIndex,      /* O    Pitch contour Index                                         */
     silk_float          *LTPCorr,           /* I/O  Normalized correlation; input: value from previous frame    */
-    oac_int            prevLag,            /* I    Last lag of previous frame; set to zero is unvoiced         */
-    const silk_float    search_thres1,      /* I    First stage threshold for lag candidates 0 - 1              */
-    const silk_float    search_thres2,      /* I    Final threshold for lag candidates 0 - 1                    */
-    const oac_int      Fs_kHz,             /* I    sample frequency (kHz)                                      */
-    const oac_int      complexity,         /* I    Complexity setting, 0-2, where 2 is highest                 */
-    const oac_int      nb_subfr,           /* I    Number of 5 ms subframes                                    */
-    int                 arch                /* I    Run-time architecture                                       */
-)
-{
-    oac_int   i, k, d, j;
-    silk_float frame_8kHz[  PE_MAX_FRAME_LENGTH_MS * 8 ];
-    silk_float frame_4kHz[  PE_MAX_FRAME_LENGTH_MS * 4 ];
-    oac_int16 frame_8_FIX[ PE_MAX_FRAME_LENGTH_MS * 8 ];
-    oac_int16 frame_4_FIX[ PE_MAX_FRAME_LENGTH_MS * 4 ];
+    oac_int prevLag,                       /* I    Last lag of previous frame; set to zero is unvoiced         */
+    const silk_float search_thres1,         /* I    First stage threshold for lag candidates 0 - 1              */
+    const silk_float search_thres2,         /* I    Final threshold for lag candidates 0 - 1                    */
+    const oac_int Fs_kHz,                  /* I    sample frequency (kHz)                                      */
+    const oac_int complexity,              /* I    Complexity setting, 0-2, where 2 is highest                 */
+    const oac_int nb_subfr,                /* I    Number of 5 ms subframes                                    */
+    int arch                                /* I    Run-time architecture                                       */
+    ) {
+    oac_int i, k, d, j;
+    silk_float frame_8kHz[  PE_MAX_FRAME_LENGTH_MS*8 ];
+    silk_float frame_4kHz[  PE_MAX_FRAME_LENGTH_MS*4 ];
+    oac_int16 frame_8_FIX[ PE_MAX_FRAME_LENGTH_MS*8 ];
+    oac_int16 frame_4_FIX[ PE_MAX_FRAME_LENGTH_MS*4 ];
     oac_int32 filt_state[ 6 ];
     silk_float threshold, contour_bias;
-    silk_float C[ PE_MAX_NB_SUBFR][ (PE_MAX_LAG >> 1) + 5 ];
-    oac_val32 xcorr[ PE_MAX_LAG_MS * 4 - PE_MIN_LAG_MS * 4 + 1 ];
+    silk_float C[ PE_MAX_NB_SUBFR][ (PE_MAX_LAG>>1) + 5 ];
+    oac_val32 xcorr[ PE_MAX_LAG_MS*4 - PE_MIN_LAG_MS*4 + 1 ];
     silk_float CC[ PE_NB_CBKS_STAGE2_EXT ];
     const silk_float *target_ptr, *basis_ptr;
-    double    cross_corr, normalizer, energy, energy_tmp;
-    oac_int   d_srch[ PE_D_SRCH_LENGTH ];
-    oac_int16 d_comp[ (PE_MAX_LAG >> 1) + 5 ];
-    oac_int   length_d_srch, length_d_comp;
+    double cross_corr, normalizer, energy, energy_tmp;
+    oac_int d_srch[ PE_D_SRCH_LENGTH ];
+    oac_int16 d_comp[ (PE_MAX_LAG>>1) + 5 ];
+    oac_int length_d_srch, length_d_comp;
     silk_float Cmax, CCmax, CCmax_b, CCmax_new_b, CCmax_new;
-    oac_int   CBimax, CBimax_new, lag, start_lag, end_lag, lag_new;
-    oac_int   cbk_size;
+    oac_int CBimax, CBimax_new, lag, start_lag, end_lag, lag_new;
+    oac_int cbk_size;
     silk_float lag_log2, prevLag_log2, delta_lag_log2_sqr;
     silk_float energies_st3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ][ PE_NB_STAGE3_LAGS ];
     silk_float cross_corr_st3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ][ PE_NB_STAGE3_LAGS ];
-    oac_int   lag_counter;
-    oac_int   frame_length, frame_length_8kHz, frame_length_4kHz;
-    oac_int   sf_length, sf_length_8kHz, sf_length_4kHz;
-    oac_int   min_lag, min_lag_8kHz, min_lag_4kHz;
-    oac_int   max_lag, max_lag_8kHz, max_lag_4kHz;
-    oac_int   nb_cbk_search;
+    oac_int lag_counter;
+    oac_int frame_length, frame_length_8kHz, frame_length_4kHz;
+    oac_int sf_length, sf_length_8kHz, sf_length_4kHz;
+    oac_int min_lag, min_lag_8kHz, min_lag_4kHz;
+    oac_int max_lag, max_lag_8kHz, max_lag_4kHz;
+    oac_int nb_cbk_search;
     const oac_int8 *Lag_CB_ptr;
 
     /* Check for valid sampling frequency */
@@ -119,32 +118,32 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
     silk_assert( search_thres2 >= 0.0f && search_thres2 <= 1.0f );
 
     /* Set up frame lengths max / min lag for the sampling frequency */
-    frame_length      = ( PE_LTP_MEM_LENGTH_MS + nb_subfr * PE_SUBFR_LENGTH_MS ) * Fs_kHz;
-    frame_length_4kHz = ( PE_LTP_MEM_LENGTH_MS + nb_subfr * PE_SUBFR_LENGTH_MS ) * 4;
-    frame_length_8kHz = ( PE_LTP_MEM_LENGTH_MS + nb_subfr * PE_SUBFR_LENGTH_MS ) * 8;
-    sf_length         = PE_SUBFR_LENGTH_MS * Fs_kHz;
-    sf_length_4kHz    = PE_SUBFR_LENGTH_MS * 4;
-    sf_length_8kHz    = PE_SUBFR_LENGTH_MS * 8;
-    min_lag           = PE_MIN_LAG_MS * Fs_kHz;
-    min_lag_4kHz      = PE_MIN_LAG_MS * 4;
-    min_lag_8kHz      = PE_MIN_LAG_MS * 8;
-    max_lag           = PE_MAX_LAG_MS * Fs_kHz - 1;
-    max_lag_4kHz      = PE_MAX_LAG_MS * 4;
-    max_lag_8kHz      = PE_MAX_LAG_MS * 8 - 1;
+    frame_length      = (PE_LTP_MEM_LENGTH_MS + nb_subfr*PE_SUBFR_LENGTH_MS)*Fs_kHz;
+    frame_length_4kHz = (PE_LTP_MEM_LENGTH_MS + nb_subfr*PE_SUBFR_LENGTH_MS)*4;
+    frame_length_8kHz = (PE_LTP_MEM_LENGTH_MS + nb_subfr*PE_SUBFR_LENGTH_MS)*8;
+    sf_length         = PE_SUBFR_LENGTH_MS*Fs_kHz;
+    sf_length_4kHz    = PE_SUBFR_LENGTH_MS*4;
+    sf_length_8kHz    = PE_SUBFR_LENGTH_MS*8;
+    min_lag           = PE_MIN_LAG_MS*Fs_kHz;
+    min_lag_4kHz      = PE_MIN_LAG_MS*4;
+    min_lag_8kHz      = PE_MIN_LAG_MS*8;
+    max_lag           = PE_MAX_LAG_MS*Fs_kHz - 1;
+    max_lag_4kHz      = PE_MAX_LAG_MS*4;
+    max_lag_8kHz      = PE_MAX_LAG_MS*8 - 1;
 
     /* Resample from input sampled at Fs_kHz to 8 kHz */
-    if( Fs_kHz == 16 ) {
+    if (Fs_kHz == 16) {
         /* Resample to 16 -> 8 khz */
-        oac_int16 frame_16_FIX[ 16 * PE_MAX_FRAME_LENGTH_MS ];
+        oac_int16 frame_16_FIX[ 16*PE_MAX_FRAME_LENGTH_MS ];
         silk_float2short_array( frame_16_FIX, frame, frame_length );
-        silk_memset( filt_state, 0, 2 * sizeof( oac_int32 ) );
+        silk_memset( filt_state, 0, 2*sizeof(oac_int32));
         silk_resampler_down2( filt_state, frame_8_FIX, frame_16_FIX, frame_length );
         silk_short2float_array( frame_8kHz, frame_8_FIX, frame_length_8kHz );
-    } else if( Fs_kHz == 12 ) {
+    } else if (Fs_kHz == 12) {
         /* Resample to 12 -> 8 khz */
-        oac_int16 frame_12_FIX[ 12 * PE_MAX_FRAME_LENGTH_MS ];
+        oac_int16 frame_12_FIX[ 12*PE_MAX_FRAME_LENGTH_MS ];
         silk_float2short_array( frame_12_FIX, frame, frame_length );
-        silk_memset( filt_state, 0, 6 * sizeof( oac_int32 ) );
+        silk_memset( filt_state, 0, 6*sizeof(oac_int32));
         silk_resampler_down2_3( filt_state, frame_8_FIX, frame_12_FIX, frame_length );
         silk_short2float_array( frame_8kHz, frame_8_FIX, frame_length_8kHz );
     } else {
@@ -153,21 +152,21 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
     }
 
     /* Decimate again to 4 kHz */
-    silk_memset( filt_state, 0, 2 * sizeof( oac_int32 ) );
+    silk_memset( filt_state, 0, 2*sizeof(oac_int32));
     silk_resampler_down2( filt_state, frame_4_FIX, frame_8_FIX, frame_length_8kHz );
     silk_short2float_array( frame_4kHz, frame_4_FIX, frame_length_4kHz );
 
     /* Low-pass filter */
-    for( i = frame_length_4kHz - 1; i > 0; i-- ) {
+    for (i = frame_length_4kHz - 1; i > 0; i--) {
         frame_4kHz[ i ] = silk_ADD_SAT16( frame_4kHz[ i ], frame_4kHz[ i - 1 ] );
     }
 
     /******************************************************************************
     * FIRST STAGE, operating in 4 khz
     ******************************************************************************/
-    silk_memset(C, 0, sizeof(silk_float) * nb_subfr * ((PE_MAX_LAG >> 1) + 5));
+    silk_memset(C, 0, sizeof(silk_float)*nb_subfr*((PE_MAX_LAG>>1) + 5));
     target_ptr = &frame_4kHz[ silk_LSHIFT( sf_length_4kHz, 2 ) ];
-    for( k = 0; k < nb_subfr >> 1; k++ ) {
+    for (k = 0; k < nb_subfr>>1; k++) {
         /* Check that we are within range of the array */
         celt_assert( target_ptr >= frame_4kHz );
         celt_assert( target_ptr + sf_length_8kHz <= frame_4kHz + frame_length_4kHz );
@@ -178,18 +177,19 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
         celt_assert( basis_ptr >= frame_4kHz );
         celt_assert( basis_ptr + sf_length_8kHz <= frame_4kHz + frame_length_4kHz );
 
-        celt_pitch_xcorr( target_ptr, target_ptr-max_lag_4kHz, xcorr, sf_length_8kHz, max_lag_4kHz - min_lag_4kHz + 1, arch );
+        celt_pitch_xcorr( target_ptr, target_ptr - max_lag_4kHz, xcorr, sf_length_8kHz, max_lag_4kHz - min_lag_4kHz + 1,
+        arch );
 
         /* Calculate first vector products before loop */
         cross_corr = xcorr[ max_lag_4kHz - min_lag_4kHz ];
-        normalizer = silk_energy_FLP( target_ptr, sf_length_8kHz ) +
-                     silk_energy_FLP( basis_ptr,  sf_length_8kHz ) +
-                     sf_length_8kHz * 4000.0f;
+        normalizer = silk_energy_FLP( target_ptr, sf_length_8kHz )
+                     + silk_energy_FLP( basis_ptr,  sf_length_8kHz )
+                     + sf_length_8kHz*4000.0f;
 
-        C[ 0 ][ min_lag_4kHz ] += (silk_float)( 2 * cross_corr / normalizer );
+        C[ 0 ][ min_lag_4kHz ] += (silk_float)(2*cross_corr/normalizer);
 
         /* From now on normalizer is computed recursively */
-        for( d = min_lag_4kHz + 1; d <= max_lag_4kHz; d++ ) {
+        for (d = min_lag_4kHz + 1; d <= max_lag_4kHz; d++) {
             basis_ptr--;
 
             /* Check that we are within range of the array */
@@ -200,38 +200,39 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
 
             /* Add contribution of new sample and remove contribution from oldest sample */
             normalizer +=
-                basis_ptr[ 0 ] * (double)basis_ptr[ 0 ] -
-                basis_ptr[ sf_length_8kHz ] * (double)basis_ptr[ sf_length_8kHz ];
-            C[ 0 ][ d ] += (silk_float)( 2 * cross_corr / normalizer );
+                basis_ptr[ 0 ]*(double)basis_ptr[ 0 ]
+                - basis_ptr[ sf_length_8kHz ]*(double)basis_ptr[ sf_length_8kHz ];
+            C[ 0 ][ d ] += (silk_float)(2*cross_corr/normalizer);
         }
         /* Update target pointer */
         target_ptr += sf_length_8kHz;
     }
 
     /* Apply short-lag bias */
-    for( i = max_lag_4kHz; i >= min_lag_4kHz; i-- ) {
-        C[ 0 ][ i ] -= C[ 0 ][ i ] * i / 4096.0f;
+    for (i = max_lag_4kHz; i >= min_lag_4kHz; i--) {
+        C[ 0 ][ i ] -= C[ 0 ][ i ]*i/4096.0f;
     }
 
     /* Sort */
-    length_d_srch = 4 + 2 * complexity;
-    celt_assert( 3 * length_d_srch <= PE_D_SRCH_LENGTH );
-    silk_insertion_sort_decreasing_FLP( &C[ 0 ][ min_lag_4kHz ], d_srch, max_lag_4kHz - min_lag_4kHz + 1, length_d_srch );
+    length_d_srch = 4 + 2*complexity;
+    celt_assert( 3*length_d_srch <= PE_D_SRCH_LENGTH );
+    silk_insertion_sort_decreasing_FLP( &C[ 0 ][ min_lag_4kHz ], d_srch, max_lag_4kHz - min_lag_4kHz + 1,
+    length_d_srch );
 
     /* Escape if correlation is very low already here */
     Cmax = C[ 0 ][ min_lag_4kHz ];
-    if( Cmax < 0.2f ) {
-        silk_memset( pitch_out, 0, nb_subfr * sizeof( oac_int ) );
+    if (Cmax < 0.2f) {
+        silk_memset( pitch_out, 0, nb_subfr*sizeof(oac_int));
         *LTPCorr      = 0.0f;
         *lagIndex     = 0;
         *contourIndex = 0;
         return 1;
     }
 
-    threshold = search_thres1 * Cmax;
-    for( i = 0; i < length_d_srch; i++ ) {
+    threshold = search_thres1*Cmax;
+    for (i = 0; i < length_d_srch; i++) {
         /* Convert to 8 kHz indices for the sorted correlation that exceeds the threshold */
-        if( C[ 0 ][ min_lag_4kHz + i ] > threshold ) {
+        if (C[ 0 ][ min_lag_4kHz + i ] > threshold) {
             d_srch[ i ] = silk_LSHIFT( d_srch[ i ] + min_lag_4kHz, 1 );
         } else {
             length_d_srch = i;
@@ -240,35 +241,35 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
     }
     celt_assert( length_d_srch > 0 );
 
-    for( i = min_lag_8kHz - 5; i < max_lag_8kHz + 5; i++ ) {
+    for (i = min_lag_8kHz - 5; i < max_lag_8kHz + 5; i++) {
         d_comp[ i ] = 0;
     }
-    for( i = 0; i < length_d_srch; i++ ) {
+    for (i = 0; i < length_d_srch; i++) {
         d_comp[ d_srch[ i ] ] = 1;
     }
 
     /* Convolution */
-    for( i = max_lag_8kHz + 3; i >= min_lag_8kHz; i-- ) {
+    for (i = max_lag_8kHz + 3; i >= min_lag_8kHz; i--) {
         d_comp[ i ] += d_comp[ i - 1 ] + d_comp[ i - 2 ];
     }
 
     length_d_srch = 0;
-    for( i = min_lag_8kHz; i < max_lag_8kHz + 1; i++ ) {
-        if( d_comp[ i + 1 ] > 0 ) {
+    for (i = min_lag_8kHz; i < max_lag_8kHz + 1; i++) {
+        if (d_comp[ i + 1 ] > 0) {
             d_srch[ length_d_srch ] = i;
             length_d_srch++;
         }
     }
 
     /* Convolution */
-    for( i = max_lag_8kHz + 3; i >= min_lag_8kHz; i-- ) {
+    for (i = max_lag_8kHz + 3; i >= min_lag_8kHz; i--) {
         d_comp[ i ] += d_comp[ i - 1 ] + d_comp[ i - 2 ] + d_comp[ i - 3 ];
     }
 
     length_d_comp = 0;
-    for( i = min_lag_8kHz; i < max_lag_8kHz + 4; i++ ) {
-        if( d_comp[ i ] > 0 ) {
-            d_comp[ length_d_comp ] = (oac_int16)( i - 2 );
+    for (i = min_lag_8kHz; i < max_lag_8kHz + 4; i++) {
+        if (d_comp[ i ] > 0) {
+            d_comp[ length_d_comp ] = (oac_int16)(i - 2);
             length_d_comp++;
         }
     }
@@ -279,22 +280,22 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
     /*********************************************************************************
     * Find energy of each subframe projected onto its history, for a range of delays
     *********************************************************************************/
-    silk_memset( C, 0, PE_MAX_NB_SUBFR*((PE_MAX_LAG >> 1) + 5) * sizeof(silk_float));
+    silk_memset( C, 0, PE_MAX_NB_SUBFR*((PE_MAX_LAG>>1) + 5)*sizeof(silk_float));
 
-    if( Fs_kHz == 8 ) {
-        target_ptr = &frame[ PE_LTP_MEM_LENGTH_MS * 8 ];
+    if (Fs_kHz == 8) {
+        target_ptr = &frame[ PE_LTP_MEM_LENGTH_MS*8 ];
     } else {
-        target_ptr = &frame_8kHz[ PE_LTP_MEM_LENGTH_MS * 8 ];
+        target_ptr = &frame_8kHz[ PE_LTP_MEM_LENGTH_MS*8 ];
     }
-    for( k = 0; k < nb_subfr; k++ ) {
+    for (k = 0; k < nb_subfr; k++) {
         energy_tmp = silk_energy_FLP( target_ptr, sf_length_8kHz ) + 1.0;
-        for( j = 0; j < length_d_comp; j++ ) {
+        for (j = 0; j < length_d_comp; j++) {
             d = d_comp[ j ];
             basis_ptr = target_ptr - d;
             cross_corr = silk_inner_product_FLP( basis_ptr, target_ptr, sf_length_8kHz, arch );
-            if( cross_corr > 0.0f ) {
+            if (cross_corr > 0.0f) {
                 energy = silk_energy_FLP( basis_ptr, sf_length_8kHz );
-                C[ k ][ d ] = (silk_float)( 2 * cross_corr / ( energy + energy_tmp ) );
+                C[ k ][ d ] = (silk_float)(2*cross_corr/(energy + energy_tmp));
             } else {
                 C[ k ][ d ] = 0.0f;
             }
@@ -311,22 +312,22 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
     CBimax = 0; /* To avoid returning undefined lag values */
     lag = -1;   /* To check if lag with strong enough correlation has been found */
 
-    if( prevLag > 0 ) {
-        if( Fs_kHz == 12 ) {
-            prevLag = silk_LSHIFT( prevLag, 1 ) / 3;
-        } else if( Fs_kHz == 16 ) {
+    if (prevLag > 0) {
+        if (Fs_kHz == 12) {
+            prevLag = silk_LSHIFT( prevLag, 1 )/3;
+        } else if (Fs_kHz == 16) {
             prevLag = silk_RSHIFT( prevLag, 1 );
         }
-        prevLag_log2 = silk_log2( (silk_float)prevLag );
+        prevLag_log2 = silk_log2((silk_float)prevLag );
     } else {
         prevLag_log2 = 0;
     }
 
     /* Set up stage 2 codebook based on number of subframes */
-    if( nb_subfr == PE_MAX_NB_SUBFR ) {
+    if (nb_subfr == PE_MAX_NB_SUBFR) {
         cbk_size   = PE_NB_CBKS_STAGE2_EXT;
         Lag_CB_ptr = &silk_CB_lags_stage2[ 0 ][ 0 ];
-        if( Fs_kHz == 8 && complexity > SILK_PE_MIN_COMPLEX ) {
+        if (Fs_kHz == 8 && complexity > SILK_PE_MIN_COMPLEX) {
             /* If input is 8 khz use a larger codebook here because it is last stage */
             nb_cbk_search = PE_NB_CBKS_STAGE2_EXT;
         } else {
@@ -338,11 +339,11 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
         nb_cbk_search  = PE_NB_CBKS_STAGE2_10MS;
     }
 
-    for( k = 0; k < length_d_srch; k++ ) {
+    for (k = 0; k < length_d_srch; k++) {
         d = d_srch[ k ];
-        for( j = 0; j < nb_cbk_search; j++ ) {
+        for (j = 0; j < nb_cbk_search; j++) {
             CC[j] = 0.0f;
-            for( i = 0; i < nb_subfr; i++ ) {
+            for (i = 0; i < nb_subfr; i++) {
                 /* Try all codebooks */
                 CC[ j ] += C[ i ][ d + matrix_ptr( Lag_CB_ptr, i, j, cbk_size )];
             }
@@ -350,27 +351,27 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
         /* Find best codebook */
         CCmax_new  = -1000.0f;
         CBimax_new = 0;
-        for( i = 0; i < nb_cbk_search; i++ ) {
-            if( CC[ i ] > CCmax_new ) {
+        for (i = 0; i < nb_cbk_search; i++) {
+            if (CC[ i ] > CCmax_new) {
                 CCmax_new = CC[ i ];
                 CBimax_new = i;
             }
         }
 
         /* Bias towards shorter lags */
-        lag_log2 = silk_log2( (silk_float)d );
-        CCmax_new_b = CCmax_new - PE_SHORTLAG_BIAS * nb_subfr * lag_log2;
+        lag_log2 = silk_log2((silk_float)d );
+        CCmax_new_b = CCmax_new - PE_SHORTLAG_BIAS*nb_subfr*lag_log2;
 
         /* Bias towards previous lag */
-        if( prevLag > 0 ) {
+        if (prevLag > 0) {
             delta_lag_log2_sqr = lag_log2 - prevLag_log2;
             delta_lag_log2_sqr *= delta_lag_log2_sqr;
-            CCmax_new_b -= PE_PREVLAG_BIAS * nb_subfr * (*LTPCorr) * delta_lag_log2_sqr / ( delta_lag_log2_sqr + 0.5f );
+            CCmax_new_b -= PE_PREVLAG_BIAS*nb_subfr*(*LTPCorr)*delta_lag_log2_sqr/(delta_lag_log2_sqr + 0.5f);
         }
 
-        if( CCmax_new_b > CCmax_b &&                /* Find maximum biased correlation                  */
-            CCmax_new > nb_subfr * search_thres2    /* Correlation needs to be high enough to be voiced */
-        ) {
+        if (CCmax_new_b > CCmax_b                   /* Find maximum biased correlation                  */
+            && CCmax_new > nb_subfr*search_thres2   /* Correlation needs to be high enough to be voiced */
+            ) {
             CCmax_b = CCmax_new_b;
             CCmax   = CCmax_new;
             lag     = d;
@@ -378,9 +379,9 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
         }
     }
 
-    if( lag == -1 ) {
+    if (lag == -1) {
         /* No suitable candidate found */
-        silk_memset( pitch_out, 0, PE_MAX_NB_SUBFR * sizeof(oac_int) );
+        silk_memset( pitch_out, 0, PE_MAX_NB_SUBFR*sizeof(oac_int));
         *LTPCorr      = 0.0f;
         *lagIndex     = 0;
         *contourIndex = 0;
@@ -388,15 +389,15 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
     }
 
     /* Output normalized correlation */
-    *LTPCorr = (silk_float)( CCmax / nb_subfr );
+    *LTPCorr = (silk_float)(CCmax/nb_subfr);
     silk_assert( *LTPCorr >= 0.0f );
 
-    if( Fs_kHz > 8 ) {
+    if (Fs_kHz > 8) {
         /* Search in original signal */
 
         /* Compensate for decimation */
-        silk_assert( lag == silk_SAT16( lag ) );
-        if( Fs_kHz == 12 ) {
+        silk_assert( lag == silk_SAT16( lag ));
+        if (Fs_kHz == 12) {
             lag = silk_RSHIFT_ROUND( silk_SMULBB( lag, 3 ), 1 );
         } else { /* Fs_kHz == 16 */
             lag = silk_LSHIFT( lag, 1 );
@@ -415,11 +416,11 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
         silk_P_Ana_calc_energy_st3( energies_st3, frame, start_lag, sf_length, nb_subfr, complexity );
 
         lag_counter = 0;
-        silk_assert( lag == silk_SAT16( lag ) );
-        contour_bias = PE_FLATCONTOUR_BIAS / lag;
+        silk_assert( lag == silk_SAT16( lag ));
+        contour_bias = PE_FLATCONTOUR_BIAS/lag;
 
         /* Set up cbk parameters according to complexity setting and frame length */
-        if( nb_subfr == PE_MAX_NB_SUBFR ) {
+        if (nb_subfr == PE_MAX_NB_SUBFR) {
             nb_cbk_search = (oac_int)silk_nb_cbk_searchs_stage3[ complexity ];
             cbk_size      = PE_NB_CBKS_STAGE3_MAX;
             Lag_CB_ptr    = &silk_CB_lags_stage3[ 0 ][ 0 ];
@@ -429,25 +430,25 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
             Lag_CB_ptr    = &silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
         }
 
-        target_ptr = &frame[ PE_LTP_MEM_LENGTH_MS * Fs_kHz ];
-        energy_tmp = silk_energy_FLP( target_ptr, nb_subfr * sf_length ) + 1.0;
-        for( d = start_lag; d <= end_lag; d++ ) {
-            for( j = 0; j < nb_cbk_search; j++ ) {
+        target_ptr = &frame[ PE_LTP_MEM_LENGTH_MS*Fs_kHz ];
+        energy_tmp = silk_energy_FLP( target_ptr, nb_subfr*sf_length ) + 1.0;
+        for (d = start_lag; d <= end_lag; d++) {
+            for (j = 0; j < nb_cbk_search; j++) {
                 cross_corr = 0.0;
                 energy = energy_tmp;
-                for( k = 0; k < nb_subfr; k++ ) {
+                for (k = 0; k < nb_subfr; k++) {
                     cross_corr += cross_corr_st3[ k ][ j ][ lag_counter ];
                     energy     +=   energies_st3[ k ][ j ][ lag_counter ];
                 }
-                if( cross_corr > 0.0 ) {
-                    CCmax_new = (silk_float)( 2 * cross_corr / energy );
+                if (cross_corr > 0.0) {
+                    CCmax_new = (silk_float)(2*cross_corr/energy);
                     /* Reduce depending on flatness of contour */
-                    CCmax_new *= 1.0f - contour_bias * j;
+                    CCmax_new *= 1.0f - contour_bias*j;
                 } else {
                     CCmax_new = 0.0f;
                 }
 
-                if( CCmax_new > CCmax && ( d + (oac_int)silk_CB_lags_stage3[ 0 ][ j ] ) <= max_lag ) {
+                if (CCmax_new > CCmax && (d + (oac_int)silk_CB_lags_stage3[ 0 ][ j ]) <= max_lag) {
                     CCmax   = CCmax_new;
                     lag_new = d;
                     CBimax  = j;
@@ -456,19 +457,19 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
             lag_counter++;
         }
 
-        for( k = 0; k < nb_subfr; k++ ) {
+        for (k = 0; k < nb_subfr; k++) {
             pitch_out[ k ] = lag_new + matrix_ptr( Lag_CB_ptr, k, CBimax, cbk_size );
-            pitch_out[ k ] = silk_LIMIT( pitch_out[ k ], min_lag, PE_MAX_LAG_MS * Fs_kHz );
+            pitch_out[ k ] = silk_LIMIT( pitch_out[ k ], min_lag, PE_MAX_LAG_MS*Fs_kHz );
         }
-        *lagIndex = (oac_int16)( lag_new - min_lag );
+        *lagIndex = (oac_int16)(lag_new - min_lag);
         *contourIndex = (oac_int8)CBimax;
     } else {        /* Fs_kHz == 8 */
         /* Save Lags */
-        for( k = 0; k < nb_subfr; k++ ) {
+        for (k = 0; k < nb_subfr; k++) {
             pitch_out[ k ] = lag + matrix_ptr( Lag_CB_ptr, k, CBimax, cbk_size );
-            pitch_out[ k ] = silk_LIMIT( pitch_out[ k ], min_lag_8kHz, PE_MAX_LAG_MS * 8 );
+            pitch_out[ k ] = silk_LIMIT( pitch_out[ k ], min_lag_8kHz, PE_MAX_LAG_MS*8 );
         }
-        *lagIndex = (oac_int16)( lag - min_lag_8kHz );
+        *lagIndex = (oac_int16)(lag - min_lag_8kHz);
         *contourIndex = (oac_int8)CBimax;
     }
     celt_assert( *lagIndex >= 0 );
@@ -477,31 +478,30 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
 }
 
 /***********************************************************************
- * Calculates the correlations used in stage 3 search. In order to cover
- * the whole lag codebook for all the searched offset lags (lag +- 2),
- * the following correlations are needed in each sub frame:
- *
- * sf1: lag range [-8,...,7] total 16 correlations
- * sf2: lag range [-4,...,4] total 9 correlations
- * sf3: lag range [-3,....4] total 8 correltions
- * sf4: lag range [-6,....8] total 15 correlations
- *
- * In total 48 correlations. The direct implementation computed in worst
- * case 4*12*5 = 240 correlations, but more likely around 120.
- ***********************************************************************/
+* Calculates the correlations used in stage 3 search. In order to cover
+* the whole lag codebook for all the searched offset lags (lag +- 2),
+* the following correlations are needed in each sub frame:
+*
+* sf1: lag range [-8,...,7] total 16 correlations
+* sf2: lag range [-4,...,4] total 9 correlations
+* sf3: lag range [-3,....4] total 8 correltions
+* sf4: lag range [-6,....8] total 15 correlations
+*
+* In total 48 correlations. The direct implementation computed in worst
+* case 4*12*5 = 240 correlations, but more likely around 120.
+***********************************************************************/
 static void silk_P_Ana_calc_corr_st3(
     silk_float cross_corr_st3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ][ PE_NB_STAGE3_LAGS ], /* O 3 DIM correlation array */
-    const silk_float    frame[],            /* I vector to correlate                                            */
-    oac_int            start_lag,          /* I start lag                                                      */
-    oac_int            sf_length,          /* I sub frame length                                               */
-    oac_int            nb_subfr,           /* I number of subframes                                            */
-    oac_int            complexity,         /* I Complexity setting                                             */
-    int                 arch                /* I Run-time architecture                                          */
-)
-{
+    const silk_float frame[],               /* I vector to correlate                                            */
+    oac_int start_lag,                     /* I start lag                                                      */
+    oac_int sf_length,                     /* I sub frame length                                               */
+    oac_int nb_subfr,                      /* I number of subframes                                            */
+    oac_int complexity,                    /* I Complexity setting                                             */
+    int arch                                /* I Run-time architecture                                          */
+    ) {
     const silk_float *target_ptr;
-    oac_int   i, j, k, lag_counter, lag_low, lag_high;
-    oac_int   nb_cbk_search, delta, idx, cbk_size;
+    oac_int i, j, k, lag_counter, lag_low, lag_high;
+    oac_int nb_cbk_search, delta, idx, cbk_size;
     silk_float scratch_mem[ SCRATCH_SIZE ];
     oac_val32 xcorr[ SCRATCH_SIZE ];
     const oac_int8 *Lag_range_ptr, *Lag_CB_ptr;
@@ -509,13 +509,13 @@ static void silk_P_Ana_calc_corr_st3(
     celt_assert( complexity >= SILK_PE_MIN_COMPLEX );
     celt_assert( complexity <= SILK_PE_MAX_COMPLEX );
 
-    if( nb_subfr == PE_MAX_NB_SUBFR ) {
+    if (nb_subfr == PE_MAX_NB_SUBFR) {
         Lag_range_ptr = &silk_Lag_range_stage3[ complexity ][ 0 ][ 0 ];
         Lag_CB_ptr    = &silk_CB_lags_stage3[ 0 ][ 0 ];
         nb_cbk_search = silk_nb_cbk_searchs_stage3[ complexity ];
         cbk_size      = PE_NB_CBKS_STAGE3_MAX;
     } else {
-        celt_assert( nb_subfr == PE_MAX_NB_SUBFR >> 1);
+        celt_assert( nb_subfr == PE_MAX_NB_SUBFR>>1);
         Lag_range_ptr = &silk_Lag_range_stage3_10_ms[ 0 ][ 0 ];
         Lag_CB_ptr    = &silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
         nb_cbk_search = PE_NB_CBKS_STAGE3_10MS;
@@ -523,26 +523,27 @@ static void silk_P_Ana_calc_corr_st3(
     }
 
     target_ptr = &frame[ silk_LSHIFT( sf_length, 2 ) ]; /* Pointer to middle of frame */
-    for( k = 0; k < nb_subfr; k++ ) {
+    for (k = 0; k < nb_subfr; k++) {
         lag_counter = 0;
 
         /* Calculate the correlations for each subframe */
         lag_low  = matrix_ptr( Lag_range_ptr, k, 0, 2 );
         lag_high = matrix_ptr( Lag_range_ptr, k, 1, 2 );
-        silk_assert(lag_high-lag_low+1 <= SCRATCH_SIZE);
-        celt_pitch_xcorr( target_ptr, target_ptr - start_lag - lag_high, xcorr, sf_length, lag_high - lag_low + 1, arch );
-        for( j = lag_low; j <= lag_high; j++ ) {
+        silk_assert(lag_high - lag_low + 1 <= SCRATCH_SIZE);
+        celt_pitch_xcorr( target_ptr, target_ptr - start_lag - lag_high, xcorr, sf_length, lag_high - lag_low + 1,
+        arch );
+        for (j = lag_low; j <= lag_high; j++) {
             silk_assert( lag_counter < SCRATCH_SIZE );
             scratch_mem[ lag_counter ] = xcorr[ lag_high - j ];
             lag_counter++;
         }
 
         delta = matrix_ptr( Lag_range_ptr, k, 0, 2 );
-        for( i = 0; i < nb_cbk_search; i++ ) {
+        for (i = 0; i < nb_cbk_search; i++) {
             /* Fill out the 3 dim array that stores the correlations for */
             /* each code_book vector for each start lag */
             idx = matrix_ptr( Lag_CB_ptr, k, i, cbk_size ) - delta;
-            for( j = 0; j < PE_NB_STAGE3_LAGS; j++ ) {
+            for (j = 0; j < PE_NB_STAGE3_LAGS; j++) {
                 silk_assert( idx + j < SCRATCH_SIZE );
                 silk_assert( idx + j < lag_counter );
                 cross_corr_st3[ k ][ i ][ j ] = scratch_mem[ idx + j ];
@@ -558,30 +559,29 @@ static void silk_P_Ana_calc_corr_st3(
 /********************************************************************/
 static void silk_P_Ana_calc_energy_st3(
     silk_float energies_st3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ][ PE_NB_STAGE3_LAGS ], /* O 3 DIM correlation array */
-    const silk_float    frame[],            /* I vector to correlate                                            */
-    oac_int            start_lag,          /* I start lag                                                      */
-    oac_int            sf_length,          /* I sub frame length                                               */
-    oac_int            nb_subfr,           /* I number of subframes                                            */
-    oac_int            complexity          /* I Complexity setting                                             */
-)
-{
+    const silk_float frame[],               /* I vector to correlate                                            */
+    oac_int start_lag,                     /* I start lag                                                      */
+    oac_int sf_length,                     /* I sub frame length                                               */
+    oac_int nb_subfr,                      /* I number of subframes                                            */
+    oac_int complexity                     /* I Complexity setting                                             */
+    ) {
     const silk_float *target_ptr, *basis_ptr;
-    double    energy;
-    oac_int   k, i, j, lag_counter;
-    oac_int   nb_cbk_search, delta, idx, cbk_size, lag_diff;
+    double energy;
+    oac_int k, i, j, lag_counter;
+    oac_int nb_cbk_search, delta, idx, cbk_size, lag_diff;
     silk_float scratch_mem[ SCRATCH_SIZE ];
     const oac_int8 *Lag_range_ptr, *Lag_CB_ptr;
 
     celt_assert( complexity >= SILK_PE_MIN_COMPLEX );
     celt_assert( complexity <= SILK_PE_MAX_COMPLEX );
 
-    if( nb_subfr == PE_MAX_NB_SUBFR ) {
+    if (nb_subfr == PE_MAX_NB_SUBFR) {
         Lag_range_ptr = &silk_Lag_range_stage3[ complexity ][ 0 ][ 0 ];
         Lag_CB_ptr    = &silk_CB_lags_stage3[ 0 ][ 0 ];
         nb_cbk_search = silk_nb_cbk_searchs_stage3[ complexity ];
         cbk_size      = PE_NB_CBKS_STAGE3_MAX;
     } else {
-        celt_assert( nb_subfr == PE_MAX_NB_SUBFR >> 1);
+        celt_assert( nb_subfr == PE_MAX_NB_SUBFR>>1);
         Lag_range_ptr = &silk_Lag_range_stage3_10_ms[ 0 ][ 0 ];
         Lag_CB_ptr    = &silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
         nb_cbk_search = PE_NB_CBKS_STAGE3_10MS;
@@ -589,24 +589,24 @@ static void silk_P_Ana_calc_energy_st3(
     }
 
     target_ptr = &frame[ silk_LSHIFT( sf_length, 2 ) ];
-    for( k = 0; k < nb_subfr; k++ ) {
+    for (k = 0; k < nb_subfr; k++) {
         lag_counter = 0;
 
         /* Calculate the energy for first lag */
-        basis_ptr = target_ptr - ( start_lag + matrix_ptr( Lag_range_ptr, k, 0, 2 ) );
+        basis_ptr = target_ptr - (start_lag + matrix_ptr( Lag_range_ptr, k, 0, 2 ));
         energy = silk_energy_FLP( basis_ptr, sf_length ) + 1e-3;
         silk_assert( energy >= 0.0 );
         scratch_mem[lag_counter] = (silk_float)energy;
         lag_counter++;
 
-        lag_diff = ( matrix_ptr( Lag_range_ptr, k, 1, 2 ) -  matrix_ptr( Lag_range_ptr, k, 0, 2 ) + 1 );
-        for( i = 1; i < lag_diff; i++ ) {
+        lag_diff = (matrix_ptr( Lag_range_ptr, k, 1, 2 ) -  matrix_ptr( Lag_range_ptr, k, 0, 2 ) + 1);
+        for (i = 1; i < lag_diff; i++) {
             /* remove part outside new window */
-            energy -= basis_ptr[sf_length - i] * (double)basis_ptr[sf_length - i];
+            energy -= basis_ptr[sf_length - i]*(double)basis_ptr[sf_length - i];
             silk_assert( energy >= 0.0 );
 
             /* add part that comes into window */
-            energy += basis_ptr[ -i ] * (double)basis_ptr[ -i ];
+            energy += basis_ptr[ -i ]*(double)basis_ptr[ -i ];
             silk_assert( energy >= 0.0 );
             silk_assert( lag_counter < SCRATCH_SIZE );
             scratch_mem[lag_counter] = (silk_float)energy;
@@ -614,11 +614,11 @@ static void silk_P_Ana_calc_energy_st3(
         }
 
         delta = matrix_ptr( Lag_range_ptr, k, 0, 2 );
-        for( i = 0; i < nb_cbk_search; i++ ) {
+        for (i = 0; i < nb_cbk_search; i++) {
             /* Fill out the 3 dim array that stores the correlations for    */
             /* each code_book vector for each start lag                     */
             idx = matrix_ptr( Lag_CB_ptr, k, i, cbk_size ) - delta;
-            for( j = 0; j < PE_NB_STAGE3_LAGS; j++ ) {
+            for (j = 0; j < PE_NB_STAGE3_LAGS; j++) {
                 silk_assert( idx + j < SCRATCH_SIZE );
                 silk_assert( idx + j < lag_counter );
                 energies_st3[ k ][ i ][ j ] = scratch_mem[ idx + j ];
diff --git a/silk/float/process_gains_FLP.c b/silk/float/process_gains_FLP.c
index 28fe84442..63b1748ea 100644
--- a/silk/float/process_gains_FLP.c
+++ b/silk/float/process_gains_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FLP.h"
@@ -36,39 +36,39 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_process_gains_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
-    oac_int                        condCoding                          /* I    The type of conditional coding to use       */
-)
-{
+    oac_int condCoding                                                 /* I    The type of conditional coding to use       */
+    ) {
     silk_shape_state_FLP *psShapeSt = &psEnc->sShape;
-    oac_int     k;
-    oac_int32   pGains_Q16[ MAX_NB_SUBFR ];
-    silk_float   s, InvMaxSqrVal, gain, quant_offset;
+    oac_int k;
+    oac_int32 pGains_Q16[ MAX_NB_SUBFR ];
+    silk_float s, InvMaxSqrVal, gain, quant_offset;
 
     /* Gain reduction when LTP coding gain is high */
-    if( psEnc->sCmn.indices.signalType == TYPE_VOICED ) {
-        s = 1.0f - 0.5f * silk_sigmoid( 0.25f * ( psEncCtrl->LTPredCodGain - 12.0f ) );
-        for( k = 0; k < psEnc->sCmn.nb_subfr; k++ ) {
+    if (psEnc->sCmn.indices.signalType == TYPE_VOICED) {
+        s = 1.0f - 0.5f*silk_sigmoid( 0.25f*(psEncCtrl->LTPredCodGain - 12.0f));
+        for (k = 0; k < psEnc->sCmn.nb_subfr; k++) {
             psEncCtrl->Gains[ k ] *= s;
         }
     }
 
     /* Limit the quantized signal */
-    InvMaxSqrVal = ( silk_float )( pow( 2.0f, 0.33f * ( 21.0f - psEnc->sCmn.SNR_dB_Q7 * ( 1 / 128.0f ) ) ) / psEnc->sCmn.subfr_length );
+    InvMaxSqrVal = ( silk_float )(pow( 2.0f,
+    0.33f*(21.0f - psEnc->sCmn.SNR_dB_Q7*(1/128.0f)))/psEnc->sCmn.subfr_length);
 
-    for( k = 0; k < psEnc->sCmn.nb_subfr; k++ ) {
+    for (k = 0; k < psEnc->sCmn.nb_subfr; k++) {
         /* Soft limit on ratio residual energy and squared gains */
         gain = psEncCtrl->Gains[ k ];
-        gain = ( silk_float )sqrt( gain * gain + psEncCtrl->ResNrg[ k ] * InvMaxSqrVal );
+        gain = ( silk_float )sqrt( gain*gain + psEncCtrl->ResNrg[ k ]*InvMaxSqrVal );
         psEncCtrl->Gains[ k ] = silk_min_float( gain, 32767.0f );
     }
 
     /* Prepare gains for noise shaping quantization */
-    for( k = 0; k < psEnc->sCmn.nb_subfr; k++ ) {
-        pGains_Q16[ k ] = (oac_int32)( psEncCtrl->Gains[ k ] * 65536.0f );
+    for (k = 0; k < psEnc->sCmn.nb_subfr; k++) {
+        pGains_Q16[ k ] = (oac_int32)(psEncCtrl->Gains[ k ]*65536.0f);
     }
 
     /* Save unquantized gains and gain Index */
-    silk_memcpy( psEncCtrl->GainsUnq_Q16, pGains_Q16, psEnc->sCmn.nb_subfr * sizeof( oac_int32 ) );
+    silk_memcpy( psEncCtrl->GainsUnq_Q16, pGains_Q16, psEnc->sCmn.nb_subfr*sizeof(oac_int32));
     psEncCtrl->lastGainIndexPrev = psShapeSt->LastGainIndex;
 
     /* Quantize gains */
@@ -76,13 +76,13 @@ void silk_process_gains_FLP(
             &psShapeSt->LastGainIndex, condCoding == CODE_CONDITIONALLY, psEnc->sCmn.nb_subfr );
 
     /* Overwrite unquantized gains with quantized gains and convert back to Q0 from Q16 */
-    for( k = 0; k < psEnc->sCmn.nb_subfr; k++ ) {
-        psEncCtrl->Gains[ k ] = pGains_Q16[ k ] / 65536.0f;
+    for (k = 0; k < psEnc->sCmn.nb_subfr; k++) {
+        psEncCtrl->Gains[ k ] = pGains_Q16[ k ]/65536.0f;
     }
 
     /* Set quantizer offset for voiced signals. Larger offset when LTP coding gain is low or tilt is high (ie low-pass) */
-    if( psEnc->sCmn.indices.signalType == TYPE_VOICED ) {
-        if( psEncCtrl->LTPredCodGain + psEnc->sCmn.input_tilt_Q15 * ( 1.0f / 32768.0f ) > 1.0f ) {
+    if (psEnc->sCmn.indices.signalType == TYPE_VOICED) {
+        if (psEncCtrl->LTPredCodGain + psEnc->sCmn.input_tilt_Q15*(1.0f/32768.0f) > 1.0f) {
             psEnc->sCmn.indices.quantOffsetType = 0;
         } else {
             psEnc->sCmn.indices.quantOffsetType = 1;
@@ -90,13 +90,14 @@ void silk_process_gains_FLP(
     }
 
     /* Quantizer boundary adjustment */
-    quant_offset = silk_Quantization_Offsets_Q10[ psEnc->sCmn.indices.signalType >> 1 ][ psEnc->sCmn.indices.quantOffsetType ] / 1024.0f;
+    quant_offset = silk_Quantization_Offsets_Q10[ psEnc->sCmn.indices.signalType>>
+                                                  1 ][ psEnc->sCmn.indices.quantOffsetType ]/1024.0f;
     psEncCtrl->Lambda = LAMBDA_OFFSET
-                      + LAMBDA_DELAYED_DECISIONS * psEnc->sCmn.nStatesDelayedDecision
-                      + LAMBDA_SPEECH_ACT        * psEnc->sCmn.speech_activity_Q8 * ( 1.0f /  256.0f )
-                      + LAMBDA_INPUT_QUALITY     * psEncCtrl->input_quality
-                      + LAMBDA_CODING_QUALITY    * psEncCtrl->coding_quality
-                      + LAMBDA_QUANT_OFFSET      * quant_offset;
+                        + LAMBDA_DELAYED_DECISIONS*psEnc->sCmn.nStatesDelayedDecision
+                        + LAMBDA_SPEECH_ACT*psEnc->sCmn.speech_activity_Q8*(1.0f/256.0f)
+                        + LAMBDA_INPUT_QUALITY*psEncCtrl->input_quality
+                        + LAMBDA_CODING_QUALITY*psEncCtrl->coding_quality
+                        + LAMBDA_QUANT_OFFSET*quant_offset;
 
     silk_assert( psEncCtrl->Lambda > 0.0f );
     silk_assert( psEncCtrl->Lambda < 2.0f );
diff --git a/silk/float/regularize_correlations_FLP.c b/silk/float/regularize_correlations_FLP.c
index 80ca02356..02fcab593 100644
--- a/silk/float/regularize_correlations_FLP.c
+++ b/silk/float/regularize_correlations_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FLP.h"
@@ -35,13 +35,12 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_regularize_correlations_FLP(
     silk_float                      *XX,                                /* I/O  Correlation matrices                        */
     silk_float                      *xx,                                /* I/O  Correlation values                          */
-    const silk_float                noise,                              /* I    Noise energy to add                         */
-    const oac_int                  D                                   /* I    Dimension of XX                             */
-)
-{
+    const silk_float noise,                                             /* I    Noise energy to add                         */
+    const oac_int D                                                    /* I    Dimension of XX                             */
+    ) {
     oac_int i;
 
-    for( i = 0; i < D; i++ ) {
+    for (i = 0; i < D; i++) {
         matrix_ptr( &XX[ 0 ], i, i, D ) += noise;
     }
     xx[ 0 ] += noise;
diff --git a/silk/float/residual_energy_FLP.c b/silk/float/residual_energy_FLP.c
index c5bf88769..672934922 100644
--- a/silk/float/residual_energy_FLP.c
+++ b/silk/float/residual_energy_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FLP.h"
@@ -39,46 +39,45 @@ silk_float silk_residual_energy_covar_FLP(                              /* O
     const silk_float                *c,                                 /* I    Filter coefficients                         */
     silk_float                      *wXX,                               /* I/O  Weighted correlation matrix, reg. out       */
     const silk_float                *wXx,                               /* I    Weighted correlation vector                 */
-    const silk_float                wxx,                                /* I    Weighted correlation value                  */
-    const oac_int                  D                                   /* I    Dimension                                   */
-)
-{
-    oac_int   i, j, k;
+    const silk_float wxx,                                               /* I    Weighted correlation value                  */
+    const oac_int D                                                    /* I    Dimension                                   */
+    ) {
+    oac_int i, j, k;
     silk_float tmp, nrg = 0.0f, regularization;
 
     /* Safety checks */
     celt_assert( D >= 0 );
 
-    regularization = REGULARIZATION_FACTOR * ( wXX[ 0 ] + wXX[ D * D - 1 ] );
-    for( k = 0; k < MAX_ITERATIONS_RESIDUAL_NRG; k++ ) {
+    regularization = REGULARIZATION_FACTOR*(wXX[ 0 ] + wXX[ D*D - 1 ]);
+    for (k = 0; k < MAX_ITERATIONS_RESIDUAL_NRG; k++) {
         nrg = wxx;
 
         tmp = 0.0f;
-        for( i = 0; i < D; i++ ) {
-            tmp += wXx[ i ] * c[ i ];
+        for (i = 0; i < D; i++) {
+            tmp += wXx[ i ]*c[ i ];
         }
-        nrg -= 2.0f * tmp;
+        nrg -= 2.0f*tmp;
 
         /* compute c' * wXX * c, assuming wXX is symmetric */
-        for( i = 0; i < D; i++ ) {
+        for (i = 0; i < D; i++) {
             tmp = 0.0f;
-            for( j = i + 1; j < D; j++ ) {
-                tmp += matrix_c_ptr( wXX, i, j, D ) * c[ j ];
+            for (j = i + 1; j < D; j++) {
+                tmp += matrix_c_ptr( wXX, i, j, D )*c[ j ];
             }
-            nrg += c[ i ] * ( 2.0f * tmp + matrix_c_ptr( wXX, i, i, D ) * c[ i ] );
+            nrg += c[ i ]*(2.0f*tmp + matrix_c_ptr( wXX, i, i, D )*c[ i ]);
         }
-        if( nrg > 0 ) {
+        if (nrg > 0) {
             break;
         } else {
             /* Add white noise */
-            for( i = 0; i < D; i++ ) {
+            for (i = 0; i < D; i++) {
                 matrix_c_ptr( wXX, i, i, D ) +=  regularization;
             }
             /* Increase noise for next run */
             regularization *= 2.0f;
         }
     }
-    if( k == MAX_ITERATIONS_RESIDUAL_NRG ) {
+    if (k == MAX_ITERATIONS_RESIDUAL_NRG) {
         silk_assert( nrg == 0 );
         nrg = 1.0f;
     }
@@ -89,29 +88,28 @@ silk_float silk_residual_energy_covar_FLP(                              /* O
 /* Calculates residual energies of input subframes where all subframes have LPC_order   */
 /* of preceding samples                                                                 */
 void silk_residual_energy_FLP(
-    silk_float                      nrgs[ MAX_NB_SUBFR ],               /* O    Residual energy per subframe                */
-    const silk_float                x[],                                /* I    Input signal                                */
-    silk_float                      a[ 2 ][ MAX_LPC_ORDER ],            /* I    AR coefs for each frame half                */
-    const silk_float                gains[],                            /* I    Quantization gains                          */
-    const oac_int                  subfr_length,                       /* I    Subframe length                             */
-    const oac_int                  nb_subfr,                           /* I    number of subframes                         */
-    const oac_int                  LPC_order                           /* I    LPC order                                   */
-)
-{
-    oac_int     shift;
-    silk_float   *LPC_res_ptr, LPC_res[ ( MAX_FRAME_LENGTH + MAX_NB_SUBFR * MAX_LPC_ORDER ) / 2 ];
+    silk_float nrgs[ MAX_NB_SUBFR ],                                    /* O    Residual energy per subframe                */
+    const silk_float x[],                                               /* I    Input signal                                */
+    silk_float a[ 2 ][ MAX_LPC_ORDER ],                                 /* I    AR coefs for each frame half                */
+    const silk_float gains[],                                           /* I    Quantization gains                          */
+    const oac_int subfr_length,                                        /* I    Subframe length                             */
+    const oac_int nb_subfr,                                            /* I    number of subframes                         */
+    const oac_int LPC_order                                            /* I    LPC order                                   */
+    ) {
+    oac_int shift;
+    silk_float   *LPC_res_ptr, LPC_res[ (MAX_FRAME_LENGTH + MAX_NB_SUBFR*MAX_LPC_ORDER)/2 ];
 
     LPC_res_ptr = LPC_res + LPC_order;
     shift = LPC_order + subfr_length;
 
     /* Filter input to create the LPC residual for each frame half, and measure subframe energies */
-    silk_LPC_analysis_filter_FLP( LPC_res, a[ 0 ], x + 0 * shift, 2 * shift, LPC_order );
-    nrgs[ 0 ] = ( silk_float )( gains[ 0 ] * gains[ 0 ] * silk_energy_FLP( LPC_res_ptr + 0 * shift, subfr_length ) );
-    nrgs[ 1 ] = ( silk_float )( gains[ 1 ] * gains[ 1 ] * silk_energy_FLP( LPC_res_ptr + 1 * shift, subfr_length ) );
+    silk_LPC_analysis_filter_FLP( LPC_res, a[ 0 ], x + 0*shift, 2*shift, LPC_order );
+    nrgs[ 0 ] = ( silk_float )(gains[ 0 ]*gains[ 0 ]*silk_energy_FLP( LPC_res_ptr + 0*shift, subfr_length ));
+    nrgs[ 1 ] = ( silk_float )(gains[ 1 ]*gains[ 1 ]*silk_energy_FLP( LPC_res_ptr + 1*shift, subfr_length ));
 
-    if( nb_subfr == MAX_NB_SUBFR ) {
-        silk_LPC_analysis_filter_FLP( LPC_res, a[ 1 ], x + 2 * shift, 2 * shift, LPC_order );
-        nrgs[ 2 ] = ( silk_float )( gains[ 2 ] * gains[ 2 ] * silk_energy_FLP( LPC_res_ptr + 0 * shift, subfr_length ) );
-        nrgs[ 3 ] = ( silk_float )( gains[ 3 ] * gains[ 3 ] * silk_energy_FLP( LPC_res_ptr + 1 * shift, subfr_length ) );
+    if (nb_subfr == MAX_NB_SUBFR) {
+        silk_LPC_analysis_filter_FLP( LPC_res, a[ 1 ], x + 2*shift, 2*shift, LPC_order );
+        nrgs[ 2 ] = ( silk_float )(gains[ 2 ]*gains[ 2 ]*silk_energy_FLP( LPC_res_ptr + 0*shift, subfr_length ));
+        nrgs[ 3 ] = ( silk_float )(gains[ 3 ]*gains[ 3 ]*silk_energy_FLP( LPC_res_ptr + 1*shift, subfr_length ));
     }
 }
diff --git a/silk/float/scale_copy_vector_FLP.c b/silk/float/scale_copy_vector_FLP.c
index f66dea922..cb0b9cedd 100644
--- a/silk/float/scale_copy_vector_FLP.c
+++ b/silk/float/scale_copy_vector_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FLP.h"
@@ -35,23 +35,21 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_scale_copy_vector_FLP(
     silk_float          *data_out,
     const silk_float    *data_in,
-    silk_float          gain,
-    oac_int            dataSize
-)
-{
-    oac_int  i, dataSize4;
+    silk_float gain,
+    oac_int dataSize)                                {
+    oac_int i, dataSize4;
 
     /* 4x unrolled loop */
-    dataSize4 = dataSize & 0xFFFC;
-    for( i = 0; i < dataSize4; i += 4 ) {
-        data_out[ i + 0 ] = gain * data_in[ i + 0 ];
-        data_out[ i + 1 ] = gain * data_in[ i + 1 ];
-        data_out[ i + 2 ] = gain * data_in[ i + 2 ];
-        data_out[ i + 3 ] = gain * data_in[ i + 3 ];
+    dataSize4 = dataSize&0xFFFC;
+    for (i = 0; i < dataSize4; i += 4) {
+        data_out[ i + 0 ] = gain*data_in[ i + 0 ];
+        data_out[ i + 1 ] = gain*data_in[ i + 1 ];
+        data_out[ i + 2 ] = gain*data_in[ i + 2 ];
+        data_out[ i + 3 ] = gain*data_in[ i + 3 ];
     }
 
     /* any remaining elements */
-    for( ; i < dataSize; i++ ) {
-        data_out[ i ] = gain * data_in[ i ];
+    for ( ; i < dataSize; i++) {
+        data_out[ i ] = gain*data_in[ i ];
     }
 }
diff --git a/silk/float/scale_vector_FLP.c b/silk/float/scale_vector_FLP.c
index 379a527f7..0add05d26 100644
--- a/silk/float/scale_vector_FLP.c
+++ b/silk/float/scale_vector_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FLP.h"
@@ -34,15 +34,13 @@ POSSIBILITY OF SUCH DAMAGE.
 /* multiply a vector by a constant */
 void silk_scale_vector_FLP(
     silk_float          *data1,
-    silk_float          gain,
-    oac_int            dataSize
-)
-{
-    oac_int  i, dataSize4;
+    silk_float gain,
+    oac_int dataSize)                                {
+    oac_int i, dataSize4;
 
     /* 4x unrolled loop */
-    dataSize4 = dataSize & 0xFFFC;
-    for( i = 0; i < dataSize4; i += 4 ) {
+    dataSize4 = dataSize&0xFFFC;
+    for (i = 0; i < dataSize4; i += 4) {
         data1[ i + 0 ] *= gain;
         data1[ i + 1 ] *= gain;
         data1[ i + 2 ] *= gain;
@@ -50,7 +48,7 @@ void silk_scale_vector_FLP(
     }
 
     /* any remaining elements */
-    for( ; i < dataSize; i++ ) {
+    for ( ; i < dataSize; i++) {
         data1[ i ] *= gain;
     }
 }
diff --git a/silk/float/schur_FLP.c b/silk/float/schur_FLP.c
index 23079ed5c..d6623de3f 100644
--- a/silk/float/schur_FLP.c
+++ b/silk/float/schur_FLP.c
@@ -1,43 +1,42 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FLP.h"
 
 silk_float silk_schur_FLP(                  /* O    returns residual energy                                     */
-    silk_float          refl_coef[],        /* O    reflection coefficients (length order)                      */
-    const silk_float    auto_corr[],        /* I    autocorrelation sequence (length order+1)                   */
-    oac_int            order               /* I    order                                                       */
-)
-{
-    oac_int   k, n;
+    silk_float refl_coef[],                 /* O    reflection coefficients (length order)                      */
+    const silk_float auto_corr[],           /* I    autocorrelation sequence (length order+1)                   */
+    oac_int order                          /* I    order                                                       */
+    ) {
+    oac_int k, n;
     double C[ SILK_MAX_ORDER_LPC + 1 ][ 2 ];
     double Ctmp1, Ctmp2, rc_tmp;
 
@@ -47,21 +46,21 @@ silk_float silk_schur_FLP(                  /* O    returns residual energy
     k = 0;
     do {
         C[ k ][ 0 ] = C[ k ][ 1 ] = auto_corr[ k ];
-    } while( ++k <= order );
+    } while (++k <= order);
 
-    for( k = 0; k < order; k++ ) {
+    for (k = 0; k < order; k++) {
         /* Get reflection coefficient */
-        rc_tmp = -C[ k + 1 ][ 0 ] / silk_max_float( C[ 0 ][ 1 ], 1e-9f );
+        rc_tmp = -C[ k + 1 ][ 0 ]/silk_max_float( C[ 0 ][ 1 ], 1e-9f );
 
         /* Save the output */
         refl_coef[ k ] = (silk_float)rc_tmp;
 
         /* Update correlations */
-        for( n = 0; n < order - k; n++ ) {
+        for (n = 0; n < order - k; n++) {
             Ctmp1 = C[ n + k + 1 ][ 0 ];
             Ctmp2 = C[ n ][ 1 ];
-            C[ n + k + 1 ][ 0 ] = Ctmp1 + Ctmp2 * rc_tmp;
-            C[ n ][ 1 ]         = Ctmp2 + Ctmp1 * rc_tmp;
+            C[ n + k + 1 ][ 0 ] = Ctmp1 + Ctmp2*rc_tmp;
+            C[ n ][ 1 ]         = Ctmp2 + Ctmp1*rc_tmp;
         }
     }
 
diff --git a/silk/float/sort_FLP.c b/silk/float/sort_FLP.c
index e2fb338bb..82be72b38 100644
--- a/silk/float/sort_FLP.c
+++ b/silk/float/sort_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 /* Insertion sort (fast for already almost sorted arrays):  */
@@ -39,12 +39,11 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_insertion_sort_decreasing_FLP(
     silk_float          *a,                 /* I/O  Unsorted / Sorted vector                                    */
     oac_int            *idx,               /* O    Index vector for the sorted elements                        */
-    const oac_int      L,                  /* I    Vector length                                               */
-    const oac_int      K                   /* I    Number of correctly sorted positions                        */
-)
-{
+    const oac_int L,                       /* I    Vector length                                               */
+    const oac_int K                        /* I    Number of correctly sorted positions                        */
+    ) {
     silk_float value;
-    oac_int   i, j;
+    oac_int i, j;
 
     /* Safety checks */
     celt_assert( K >  0 );
@@ -52,14 +51,14 @@ void silk_insertion_sort_decreasing_FLP(
     celt_assert( L >= K );
 
     /* Write start indices in index vector */
-    for( i = 0; i < K; i++ ) {
+    for (i = 0; i < K; i++) {
         idx[ i ] = i;
     }
 
     /* Sort vector elements by value, decreasing order */
-    for( i = 1; i < K; i++ ) {
+    for (i = 1; i < K; i++) {
         value = a[ i ];
-        for( j = i - 1; ( j >= 0 ) && ( value > a[ j ] ); j-- ) {
+        for (j = i - 1; (j >= 0) && (value > a[ j ]); j--) {
             a[ j + 1 ]   = a[ j ];      /* Shift value */
             idx[ j + 1 ] = idx[ j ];    /* Shift index */
         }
@@ -69,10 +68,10 @@ void silk_insertion_sort_decreasing_FLP(
 
     /* If less than L values are asked check the remaining values,      */
     /* but only spend CPU to ensure that the K first values are correct */
-    for( i = K; i < L; i++ ) {
+    for (i = K; i < L; i++) {
         value = a[ i ];
-        if( value > a[ K - 1 ] ) {
-            for( j = K - 2; ( j >= 0 ) && ( value > a[ j ] ); j-- ) {
+        if (value > a[ K - 1 ]) {
+            for (j = K - 2; (j >= 0) && (value > a[ j ]); j--) {
                 a[ j + 1 ]   = a[ j ];      /* Shift value */
                 idx[ j + 1 ] = idx[ j ];    /* Shift index */
             }
diff --git a/silk/float/structs_FLP.h b/silk/float/structs_FLP.h
index 2901b9be0..84c305329 100644
--- a/silk/float/structs_FLP.h
+++ b/silk/float/structs_FLP.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_STRUCTS_FLP_H
@@ -37,21 +37,21 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Noise shaping analysis state */
 /********************************/
 typedef struct {
-    oac_int8                   LastGainIndex;
-    silk_float                  HarmShapeGain_smth;
-    silk_float                  Tilt_smth;
+    oac_int8 LastGainIndex;
+    silk_float HarmShapeGain_smth;
+    silk_float Tilt_smth;
 } silk_shape_state_FLP;
 
 /********************************/
 /* Encoder state FLP            */
 /********************************/
 typedef struct {
-    silk_encoder_state          sCmn;                               /* Common struct, shared with fixed-point code */
-    silk_shape_state_FLP        sShape;                             /* Noise shaping state */
+    silk_encoder_state sCmn;                                        /* Common struct, shared with fixed-point code */
+    silk_shape_state_FLP sShape;                                    /* Noise shaping state */
 
     /* Buffer for find pitch and noise shape analysis */
-    silk_float                  x_buf[ 2 * MAX_FRAME_LENGTH + LA_SHAPE_MAX ];/* Buffer for find pitch and noise shape analysis */
-    silk_float                  LTPCorr;                            /* Normalized correlation from pitch lag estimator */
+    silk_float x_buf[ 2*MAX_FRAME_LENGTH + LA_SHAPE_MAX ];                   /* Buffer for find pitch and noise shape analysis */
+    silk_float LTPCorr;                                             /* Normalized correlation from pitch lag estimator */
 } silk_encoder_state_FLP;
 
 /************************/
@@ -59,47 +59,47 @@ typedef struct {
 /************************/
 typedef struct {
     /* Prediction and coding parameters */
-    silk_float                  Gains[ MAX_NB_SUBFR ];
-    silk_float                  PredCoef[ 2 ][ MAX_LPC_ORDER ];     /* holds interpolated and final coefficients */
-    silk_float                  LTPCoef[LTP_ORDER * MAX_NB_SUBFR];
-    silk_float                  LTP_scale;
-    oac_int                    pitchL[ MAX_NB_SUBFR ];
+    silk_float Gains[ MAX_NB_SUBFR ];
+    silk_float PredCoef[ 2 ][ MAX_LPC_ORDER ];                      /* holds interpolated and final coefficients */
+    silk_float LTPCoef[LTP_ORDER*MAX_NB_SUBFR];
+    silk_float LTP_scale;
+    oac_int pitchL[ MAX_NB_SUBFR ];
 
     /* Noise shaping parameters */
-    silk_float                  AR[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ];
-    silk_float                  LF_MA_shp[     MAX_NB_SUBFR ];
-    silk_float                  LF_AR_shp[     MAX_NB_SUBFR ];
-    silk_float                  Tilt[          MAX_NB_SUBFR ];
-    silk_float                  HarmShapeGain[ MAX_NB_SUBFR ];
-    silk_float                  Lambda;
-    silk_float                  input_quality;
-    silk_float                  coding_quality;
+    silk_float AR[ MAX_NB_SUBFR*MAX_SHAPE_LPC_ORDER ];
+    silk_float LF_MA_shp[     MAX_NB_SUBFR ];
+    silk_float LF_AR_shp[     MAX_NB_SUBFR ];
+    silk_float Tilt[          MAX_NB_SUBFR ];
+    silk_float HarmShapeGain[ MAX_NB_SUBFR ];
+    silk_float Lambda;
+    silk_float input_quality;
+    silk_float coding_quality;
 
     /* Measures */
-    silk_float                  predGain;
-    silk_float                  LTPredCodGain;
-    silk_float                  ResNrg[ MAX_NB_SUBFR ];             /* Residual energy per subframe */
+    silk_float predGain;
+    silk_float LTPredCodGain;
+    silk_float ResNrg[ MAX_NB_SUBFR ];                              /* Residual energy per subframe */
 
     /* Parameters for CBR mode */
-    oac_int32                  GainsUnq_Q16[ MAX_NB_SUBFR ];
-    oac_int8                   lastGainIndexPrev;
+    oac_int32 GainsUnq_Q16[ MAX_NB_SUBFR ];
+    oac_int8 lastGainIndexPrev;
 } silk_encoder_control_FLP;
 
 /************************/
 /* Encoder Super Struct */
 /************************/
 typedef struct {
-    stereo_enc_state            sStereo;
-    oac_int32                  nBitsUsedLBRR;
-    oac_int32                  nBitsExceeded;
-    oac_int                    nChannelsAPI;
-    oac_int                    nChannelsInternal;
-    oac_int                    nPrevChannelsInternal;
-    oac_int                    timeSinceSwitchAllowed_ms;
-    oac_int                    allowBandwidthSwitch;
-    oac_int                    prev_decode_only_middle;
+    stereo_enc_state sStereo;
+    oac_int32 nBitsUsedLBRR;
+    oac_int32 nBitsExceeded;
+    oac_int nChannelsAPI;
+    oac_int nChannelsInternal;
+    oac_int nPrevChannelsInternal;
+    oac_int timeSinceSwitchAllowed_ms;
+    oac_int allowBandwidthSwitch;
+    oac_int prev_decode_only_middle;
     /* This needs to be last so we can skip the second state for mono. */
-    silk_encoder_state_FLP      state_Fxx[ ENCODER_NUM_CHANNELS ];
+    silk_encoder_state_FLP state_Fxx[ ENCODER_NUM_CHANNELS ];
 } silk_encoder;
 
 #endif
diff --git a/silk/float/warped_autocorrelation_FLP.c b/silk/float/warped_autocorrelation_FLP.c
index 92e7a4ee8..571a9c936 100644
--- a/silk/float/warped_autocorrelation_FLP.c
+++ b/silk/float/warped_autocorrelation_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FLP.h"
@@ -35,41 +35,40 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_warped_autocorrelation_FLP(
     silk_float                      *corr,                              /* O    Result [order + 1]                          */
     const silk_float                *input,                             /* I    Input data to correlate                     */
-    const silk_float                warping,                            /* I    Warping coefficient                         */
-    const oac_int                  length,                             /* I    Length of input                             */
-    const oac_int                  order                               /* I    Correlation order (even)                    */
-)
-{
-    oac_int    n, i;
-    double      tmp1, tmp2;
-    double      state[ MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };
-    double      C[     MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };
+    const silk_float warping,                                           /* I    Warping coefficient                         */
+    const oac_int length,                                              /* I    Length of input                             */
+    const oac_int order                                                /* I    Correlation order (even)                    */
+    ) {
+    oac_int n, i;
+    double tmp1, tmp2;
+    double state[ MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };
+    double C[     MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };
 
     /* Order must be even */
-    celt_assert( ( order & 1 ) == 0 );
+    celt_assert((order&1) == 0 );
 
     /* Loop over samples */
-    for( n = 0; n < length; n++ ) {
+    for (n = 0; n < length; n++) {
         tmp1 = input[ n ];
         /* Loop over allpass sections */
-        for( i = 0; i < order; i += 2 ) {
+        for (i = 0; i < order; i += 2) {
             /* Output of allpass section */
             /* We voluntarily use two multiples instead of factoring the expression to
                reduce the length of the dependency chain (tmp1->tmp2->tmp1... ). */
-            tmp2 = state[ i ] + warping * state[ i + 1 ] - warping * tmp1;
+            tmp2 = state[ i ] + warping*state[ i + 1 ] - warping*tmp1;
             state[ i ] = tmp1;
-            C[ i ] += state[ 0 ] * tmp1;
+            C[ i ] += state[ 0 ]*tmp1;
             /* Output of allpass section */
-            tmp1 = state[ i + 1 ] + warping * state[ i + 2 ] - warping * tmp2;
+            tmp1 = state[ i + 1 ] + warping*state[ i + 2 ] - warping*tmp2;
             state[ i + 1 ] = tmp2;
-            C[ i + 1 ] += state[ 0 ] * tmp2;
+            C[ i + 1 ] += state[ 0 ]*tmp2;
         }
         state[ order ] = tmp1;
-        C[ order ] += state[ 0 ] * tmp1;
+        C[ order ] += state[ 0 ]*tmp1;
     }
 
     /* Copy correlations in silk_float output format */
-    for( i = 0; i < order + 1; i++ ) {
+    for (i = 0; i < order + 1; i++) {
         corr[ i ] = ( silk_float )C[ i ];
     }
 }
diff --git a/silk/float/wrappers_FLP.c b/silk/float/wrappers_FLP.c
index d1c93f812..5b9dc429f 100644
--- a/silk/float/wrappers_FLP.c
+++ b/silk/float/wrappers_FLP.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main_FLP.h"
@@ -37,14 +37,13 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_A2NLSF_FLP(
     oac_int16                      *NLSF_Q15,                          /* O    NLSF vector      [ LPC_order ]              */
     const silk_float                *pAR,                               /* I    LPC coefficients [ LPC_order ]              */
-    const oac_int                  LPC_order                           /* I    LPC order                                   */
-)
-{
-    oac_int   i;
+    const oac_int LPC_order                                            /* I    LPC order                                   */
+    ) {
+    oac_int i;
     oac_int32 a_fix_Q16[ MAX_LPC_ORDER ];
 
-    for( i = 0; i < LPC_order; i++ ) {
-        a_fix_Q16[ i ] = silk_float2int( pAR[ i ] * 65536.0f );
+    for (i = 0; i < LPC_order; i++) {
+        a_fix_Q16[ i ] = silk_float2int( pAR[ i ]*65536.0f );
     }
 
     silk_A2NLSF( NLSF_Q15, a_fix_Q16, LPC_order );
@@ -54,17 +53,16 @@ void silk_A2NLSF_FLP(
 void silk_NLSF2A_FLP(
     silk_float                      *pAR,                               /* O    LPC coefficients [ LPC_order ]              */
     const oac_int16                *NLSF_Q15,                          /* I    NLSF vector      [ LPC_order ]              */
-    const oac_int                  LPC_order,                          /* I    LPC order                                   */
-    int                             arch                                /* I    Run-time architecture                       */
-)
-{
-    oac_int   i;
+    const oac_int LPC_order,                                           /* I    LPC order                                   */
+    int arch                                                            /* I    Run-time architecture                       */
+    ) {
+    oac_int i;
     oac_int16 a_fix_Q12[ MAX_LPC_ORDER ];
 
     silk_NLSF2A( a_fix_Q12, NLSF_Q15, LPC_order, arch );
 
-    for( i = 0; i < LPC_order; i++ ) {
-        pAR[ i ] = ( silk_float )a_fix_Q12[ i ] * ( 1.0f / 4096.0f );
+    for (i = 0; i < LPC_order; i++) {
+        pAR[ i ] = ( silk_float )a_fix_Q12[ i ]*(1.0f/4096.0f);
     }
 }
 
@@ -73,19 +71,18 @@ void silk_NLSF2A_FLP(
 /******************************************/
 void silk_process_NLSFs_FLP(
     silk_encoder_state              *psEncC,                            /* I/O  Encoder state                               */
-    silk_float                      PredCoef[ 2 ][ MAX_LPC_ORDER ],     /* O    Prediction coefficients                     */
-    oac_int16                      NLSF_Q15[      MAX_LPC_ORDER ],     /* I/O  Normalized LSFs (quant out) (0 - (2^15-1))  */
-    const oac_int16                prev_NLSF_Q15[ MAX_LPC_ORDER ]      /* I    Previous Normalized LSFs (0 - (2^15-1))     */
-)
-{
-    oac_int     i, j;
-    oac_int16   PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ];
+    silk_float PredCoef[ 2 ][ MAX_LPC_ORDER ],                          /* O    Prediction coefficients                     */
+    oac_int16 NLSF_Q15[      MAX_LPC_ORDER ],                          /* I/O  Normalized LSFs (quant out) (0 - (2^15-1))  */
+    const oac_int16 prev_NLSF_Q15[ MAX_LPC_ORDER ]                     /* I    Previous Normalized LSFs (0 - (2^15-1))     */
+    ) {
+    oac_int i, j;
+    oac_int16 PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ];
 
     silk_process_NLSFs( psEncC, PredCoef_Q12, NLSF_Q15, prev_NLSF_Q15);
 
-    for( j = 0; j < 2; j++ ) {
-        for( i = 0; i < psEncC->predictLPCOrder; i++ ) {
-            PredCoef[ j ][ i ] = ( silk_float )PredCoef_Q12[ j ][ i ] * ( 1.0f / 4096.0f );
+    for (j = 0; j < 2; j++) {
+        for (i = 0; i < psEncC->predictLPCOrder; i++) {
+            PredCoef[ j ][ i ] = ( silk_float )PredCoef_Q12[ j ][ i ]*(1.0f/4096.0f);
         }
     }
 }
@@ -98,74 +95,75 @@ void silk_NSQ_wrapper_FLP(
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     SideInfoIndices                 *psIndices,                         /* I/O  Quantization indices                        */
     silk_nsq_state                  *psNSQ,                             /* I/O  Noise Shaping Quantzation state             */
-    oac_int8                       pulses[],                           /* O    Quantized pulse signal                      */
-    const silk_float                x[]                                 /* I    Prefiltered input signal                    */
-)
-{
-    oac_int     i, j;
-    oac_int16   x16[ MAX_FRAME_LENGTH ];
-    oac_int32   Gains_Q16[ MAX_NB_SUBFR ];
+    oac_int8 pulses[],                                                 /* O    Quantized pulse signal                      */
+    const silk_float x[]                                                /* I    Prefiltered input signal                    */
+    ) {
+    oac_int i, j;
+    oac_int16 x16[ MAX_FRAME_LENGTH ];
+    oac_int32 Gains_Q16[ MAX_NB_SUBFR ];
     silk_DWORD_ALIGN oac_int16 PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ];
-    oac_int16   LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ];
-    oac_int     LTP_scale_Q14;
+    oac_int16 LTPCoef_Q14[ LTP_ORDER*MAX_NB_SUBFR ];
+    oac_int LTP_scale_Q14;
 
     /* Noise shaping parameters */
-    oac_int16   AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ];
-    oac_int32   LF_shp_Q14[ MAX_NB_SUBFR ];         /* Packs two int16 coefficients per int32 value             */
-    oac_int     Lambda_Q10;
-    oac_int     Tilt_Q14[ MAX_NB_SUBFR ];
-    oac_int     HarmShapeGain_Q14[ MAX_NB_SUBFR ];
+    oac_int16 AR_Q13[ MAX_NB_SUBFR*MAX_SHAPE_LPC_ORDER ];
+    oac_int32 LF_shp_Q14[ MAX_NB_SUBFR ];           /* Packs two int16 coefficients per int32 value             */
+    oac_int Lambda_Q10;
+    oac_int Tilt_Q14[ MAX_NB_SUBFR ];
+    oac_int HarmShapeGain_Q14[ MAX_NB_SUBFR ];
 
     /* Convert control struct to fix control struct */
     /* Noise shape parameters */
-    for( i = 0; i < psEnc->sCmn.nb_subfr; i++ ) {
-        for( j = 0; j < psEnc->sCmn.shapingLPCOrder; j++ ) {
-            AR_Q13[ i * MAX_SHAPE_LPC_ORDER + j ] = silk_float2int( psEncCtrl->AR[ i * MAX_SHAPE_LPC_ORDER + j ] * 8192.0f );
+    for (i = 0; i < psEnc->sCmn.nb_subfr; i++) {
+        for (j = 0; j < psEnc->sCmn.shapingLPCOrder; j++) {
+            AR_Q13[ i*MAX_SHAPE_LPC_ORDER + j ] = silk_float2int( psEncCtrl->AR[ i*MAX_SHAPE_LPC_ORDER + j ]*8192.0f );
         }
     }
 
-    for( i = 0; i < psEnc->sCmn.nb_subfr; i++ ) {
-        LF_shp_Q14[ i ] =   silk_LSHIFT32( silk_float2int( psEncCtrl->LF_AR_shp[ i ]     * 16384.0f ), 16 ) |
-                              (oac_uint16)silk_float2int( psEncCtrl->LF_MA_shp[ i ]     * 16384.0f );
-        Tilt_Q14[ i ]   =        (oac_int)silk_float2int( psEncCtrl->Tilt[ i ]          * 16384.0f );
-        HarmShapeGain_Q14[ i ] = (oac_int)silk_float2int( psEncCtrl->HarmShapeGain[ i ] * 16384.0f );
+    for (i = 0; i < psEnc->sCmn.nb_subfr; i++) {
+        LF_shp_Q14[ i ] =   silk_LSHIFT32( silk_float2int( psEncCtrl->LF_AR_shp[ i ]*16384.0f ), 16 )
+                          |(oac_uint16)silk_float2int( psEncCtrl->LF_MA_shp[ i ]*16384.0f );
+        Tilt_Q14[ i ]   =        (oac_int)silk_float2int( psEncCtrl->Tilt[ i ]*16384.0f );
+        HarmShapeGain_Q14[ i ] = (oac_int)silk_float2int( psEncCtrl->HarmShapeGain[ i ]*16384.0f );
     }
-    Lambda_Q10 = ( oac_int )silk_float2int( psEncCtrl->Lambda * 1024.0f );
+    Lambda_Q10 = ( oac_int )silk_float2int( psEncCtrl->Lambda*1024.0f );
 
     /* prediction and coding parameters */
-    for( i = 0; i < psEnc->sCmn.nb_subfr * LTP_ORDER; i++ ) {
-        LTPCoef_Q14[ i ] = (oac_int16)silk_float2int( psEncCtrl->LTPCoef[ i ] * 16384.0f );
+    for (i = 0; i < psEnc->sCmn.nb_subfr*LTP_ORDER; i++) {
+        LTPCoef_Q14[ i ] = (oac_int16)silk_float2int( psEncCtrl->LTPCoef[ i ]*16384.0f );
     }
 
-    for( j = 0; j < 2; j++ ) {
-        for( i = 0; i < psEnc->sCmn.predictLPCOrder; i++ ) {
-            PredCoef_Q12[ j ][ i ] = (oac_int16)silk_float2int( psEncCtrl->PredCoef[ j ][ i ] * 4096.0f );
+    for (j = 0; j < 2; j++) {
+        for (i = 0; i < psEnc->sCmn.predictLPCOrder; i++) {
+            PredCoef_Q12[ j ][ i ] = (oac_int16)silk_float2int( psEncCtrl->PredCoef[ j ][ i ]*4096.0f );
         }
     }
 
-    for( i = 0; i < psEnc->sCmn.nb_subfr; i++ ) {
-        Gains_Q16[ i ] = silk_float2int( psEncCtrl->Gains[ i ] * 65536.0f );
+    for (i = 0; i < psEnc->sCmn.nb_subfr; i++) {
+        Gains_Q16[ i ] = silk_float2int( psEncCtrl->Gains[ i ]*65536.0f );
         silk_assert( Gains_Q16[ i ] > 0 );
     }
 
-    if( psIndices->signalType == TYPE_VOICED ) {
+    if (psIndices->signalType == TYPE_VOICED) {
         LTP_scale_Q14 = silk_LTPScales_table_Q14[ psIndices->LTP_scaleIndex ];
     } else {
         LTP_scale_Q14 = 0;
     }
 
     /* Convert input to fix */
-    for( i = 0; i < psEnc->sCmn.frame_length; i++ ) {
+    for (i = 0; i < psEnc->sCmn.frame_length; i++) {
         x16[ i ] = silk_float2int( x[ i ] );
     }
 
     /* Call NSQ */
-    if( psEnc->sCmn.nStatesDelayedDecision > 1 || psEnc->sCmn.warping_Q16 > 0 ) {
+    if (psEnc->sCmn.nStatesDelayedDecision > 1 || psEnc->sCmn.warping_Q16 > 0) {
         silk_NSQ_del_dec( &psEnc->sCmn, psNSQ, psIndices, x16, pulses, PredCoef_Q12[ 0 ], LTPCoef_Q14,
-            AR_Q13, HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, psEncCtrl->pitchL, Lambda_Q10, LTP_scale_Q14, psEnc->sCmn.arch );
+            AR_Q13, HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, psEncCtrl->pitchL, Lambda_Q10, LTP_scale_Q14,
+        psEnc->sCmn.arch );
     } else {
         silk_NSQ( &psEnc->sCmn, psNSQ, psIndices, x16, pulses, PredCoef_Q12[ 0 ], LTPCoef_Q14,
-            AR_Q13, HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, psEncCtrl->pitchL, Lambda_Q10, LTP_scale_Q14, psEnc->sCmn.arch );
+            AR_Q13, HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, psEncCtrl->pitchL, Lambda_Q10, LTP_scale_Q14,
+        psEnc->sCmn.arch );
     }
 }
 
@@ -173,37 +171,37 @@ void silk_NSQ_wrapper_FLP(
 /* Floating-point Silk LTP quantiation wrapper */
 /***********************************************/
 void silk_quant_LTP_gains_FLP(
-    silk_float                      B[ MAX_NB_SUBFR * LTP_ORDER ],      /* O    Quantized LTP gains                            */
-    oac_int8                       cbk_index[ MAX_NB_SUBFR ],          /* O    Codebook index                              */
+    silk_float B[ MAX_NB_SUBFR * LTP_ORDER ],                           /* O    Quantized LTP gains                            */
+    oac_int8 cbk_index[ MAX_NB_SUBFR ],                                /* O    Codebook index                              */
     oac_int8                       *periodicity_index,                 /* O    Periodicity index                           */
     oac_int32                      *sum_log_gain_Q7,                   /* I/O  Cumulative max prediction gain  */
     silk_float                      *pred_gain_dB,                        /* O    LTP prediction gain                            */
-    const silk_float                XX[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ], /* I    Correlation matrix                    */
-    const silk_float                xX[ MAX_NB_SUBFR * LTP_ORDER ],        /* I    Correlation vector                            */
-    const oac_int                    subfr_len,                            /* I    Number of samples per subframe                */
-    const oac_int                    nb_subfr,                           /* I    Number of subframes                            */
-    int                             arch                                /* I    Run-time architecture                       */
-)
-{
-    oac_int   i, pred_gain_dB_Q7;
-    oac_int16 B_Q14[ MAX_NB_SUBFR * LTP_ORDER ];
-    oac_int32 XX_Q17[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ];
-    oac_int32 xX_Q17[ MAX_NB_SUBFR * LTP_ORDER ];
+    const silk_float XX[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ],                /* I    Correlation matrix                    */
+    const silk_float xX[ MAX_NB_SUBFR * LTP_ORDER ],                       /* I    Correlation vector                            */
+    const oac_int subfr_len,                                               /* I    Number of samples per subframe                */
+    const oac_int nb_subfr,                                              /* I    Number of subframes                            */
+    int arch                                                            /* I    Run-time architecture                       */
+    ) {
+    oac_int i, pred_gain_dB_Q7;
+    oac_int16 B_Q14[ MAX_NB_SUBFR*LTP_ORDER ];
+    oac_int32 XX_Q17[ MAX_NB_SUBFR*LTP_ORDER*LTP_ORDER ];
+    oac_int32 xX_Q17[ MAX_NB_SUBFR*LTP_ORDER ];
 
     i = 0;
     do {
-        XX_Q17[ i ] = (oac_int32)silk_float2int( XX[ i ] * 131072.0f );
-    } while ( ++i < nb_subfr * LTP_ORDER * LTP_ORDER );
+        XX_Q17[ i ] = (oac_int32)silk_float2int( XX[ i ]*131072.0f );
+    } while (++i < nb_subfr*LTP_ORDER*LTP_ORDER);
     i = 0;
     do {
-        xX_Q17[ i ] = (oac_int32)silk_float2int( xX[ i ] * 131072.0f );
-    } while ( ++i < nb_subfr * LTP_ORDER );
+        xX_Q17[ i ] = (oac_int32)silk_float2int( xX[ i ]*131072.0f );
+    } while (++i < nb_subfr*LTP_ORDER);
 
-    silk_quant_LTP_gains( B_Q14, cbk_index, periodicity_index, sum_log_gain_Q7, &pred_gain_dB_Q7, XX_Q17, xX_Q17, subfr_len, nb_subfr, arch );
+    silk_quant_LTP_gains( B_Q14, cbk_index, periodicity_index, sum_log_gain_Q7, &pred_gain_dB_Q7, XX_Q17, xX_Q17,
+    subfr_len, nb_subfr, arch );
 
-    for( i = 0; i < nb_subfr * LTP_ORDER; i++ ) {
-        B[ i ] = (silk_float)B_Q14[ i ] * ( 1.0f / 16384.0f );
+    for (i = 0; i < nb_subfr*LTP_ORDER; i++) {
+        B[ i ] = (silk_float)B_Q14[ i ]*(1.0f/16384.0f);
     }
 
-    *pred_gain_dB = (silk_float)pred_gain_dB_Q7 * ( 1.0f / 128.0f );
+    *pred_gain_dB = (silk_float)pred_gain_dB_Q7*(1.0f/128.0f);
 }
diff --git a/silk/float/x86/inner_product_FLP_avx2.c b/silk/float/x86/inner_product_FLP_avx2.c
index 8f4ab3995..054387bf0 100644
--- a/silk/float/x86/inner_product_FLP_avx2.c
+++ b/silk/float/x86/inner_product_FLP_avx2.c
@@ -1,33 +1,33 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
               2023 Amazon
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FLP.h"
@@ -38,18 +38,16 @@ POSSIBILITY OF SUCH DAMAGE.
 double silk_inner_product_FLP_avx2(
     const silk_float    *data1,
     const silk_float    *data2,
-    oac_int            dataSize
-)
-{
+    oac_int dataSize)                                {
     oac_int i;
     __m256d accum1, accum2;
-    double   result;
+    double result;
 
     /* 4x unrolled loop */
     result = 0.0;
     accum1 = accum2 = _mm256_setzero_pd();
-    for( i = 0; i < dataSize - 7; i += 8 ) {
-        __m128  x1f, x2f;
+    for (i = 0; i < dataSize - 7; i += 8) {
+        __m128 x1f, x2f;
         __m256d x1d, x2d;
         x1f = _mm_loadu_ps( &data1[ i ] );
         x2f = _mm_loadu_ps( &data2[ i ] );
@@ -62,8 +60,8 @@ double silk_inner_product_FLP_avx2(
         x2d = _mm256_cvtps_pd( x2f );
         accum2 = _mm256_fmadd_pd( x1d, x2d, accum2 );
     }
-    for( ; i < dataSize - 3; i += 4 ) {
-        __m128  x1f, x2f;
+    for ( ; i < dataSize - 3; i += 4) {
+        __m128 x1f, x2f;
         __m256d x1d, x2d;
         x1f = _mm_loadu_ps( &data1[ i ] );
         x2f = _mm_loadu_ps( &data2[ i ] );
@@ -73,12 +71,12 @@ double silk_inner_product_FLP_avx2(
     }
     accum1 = _mm256_add_pd(accum1, accum2);
     accum1 = _mm256_add_pd(accum1, _mm256_permute2f128_pd(accum1, accum1, 1));
-    accum1 = _mm256_hadd_pd(accum1,accum1);
+    accum1 = _mm256_hadd_pd(accum1, accum1);
     result = _mm256_cvtsd_f64(accum1);
 
     /* add any remaining products */
-    for( ; i < dataSize; i++ ) {
-        result += data1[ i ] * (double)data2[ i ];
+    for ( ; i < dataSize; i++) {
+        result += data1[ i ]*(double)data2[ i ];
     }
 
     return result;
diff --git a/silk/gain_quant.c b/silk/gain_quant.c
index 580eb0886..7606b1aee 100644
--- a/silk/gain_quant.c
+++ b/silk/gain_quant.c
@@ -1,63 +1,62 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
 
-#define OFFSET                  ( ( MIN_QGAIN_DB * 128 ) / 6 + 16 * 128 )
-#define SCALE_Q16               ( ( 65536 * ( N_LEVELS_QGAIN - 1 ) ) / ( ( ( MAX_QGAIN_DB - MIN_QGAIN_DB ) * 128 ) / 6 ) )
-#define INV_SCALE_Q16           ( ( 65536 * ( ( ( MAX_QGAIN_DB - MIN_QGAIN_DB ) * 128 ) / 6 ) ) / ( N_LEVELS_QGAIN - 1 ) )
+#define OFFSET                  ((MIN_QGAIN_DB*128)/6 + 16*128)
+#define SCALE_Q16               ((65536*(N_LEVELS_QGAIN - 1))/(((MAX_QGAIN_DB - MIN_QGAIN_DB)*128)/6))
+#define INV_SCALE_Q16           ((65536*(((MAX_QGAIN_DB - MIN_QGAIN_DB)*128)/6))/(N_LEVELS_QGAIN - 1))
 
 /* Gain scalar quantization with hysteresis, uniform on log scale */
 void silk_gains_quant(
-    oac_int8                   ind[ MAX_NB_SUBFR ],            /* O    gain indices                                */
-    oac_int32                  gain_Q16[ MAX_NB_SUBFR ],       /* I/O  gains (quantized out)                       */
+    oac_int8 ind[ MAX_NB_SUBFR ],                              /* O    gain indices                                */
+    oac_int32 gain_Q16[ MAX_NB_SUBFR ],                        /* I/O  gains (quantized out)                       */
     oac_int8                   *prev_ind,                      /* I/O  last index in previous frame                */
-    const oac_int              conditional,                    /* I    first gain is delta coded if 1              */
-    const oac_int              nb_subfr                        /* I    number of subframes                         */
-)
-{
+    const oac_int conditional,                                 /* I    first gain is delta coded if 1              */
+    const oac_int nb_subfr                                     /* I    number of subframes                         */
+    ) {
     oac_int k, double_step_size_threshold;
 
-    for( k = 0; k < nb_subfr; k++ ) {
+    for (k = 0; k < nb_subfr; k++) {
         /* Convert to log scale, scale, floor() */
         ind[ k ] = silk_SMULWB( SCALE_Q16, silk_lin2log( gain_Q16[ k ] ) - OFFSET );
 
         /* Round towards previous quantized gain (hysteresis) */
-        if( ind[ k ] < *prev_ind ) {
+        if (ind[ k ] < *prev_ind) {
             ind[ k ]++;
         }
         ind[ k ] = silk_LIMIT_int( ind[ k ], 0, N_LEVELS_QGAIN - 1 );
 
         /* Compute delta indices and limit */
-        if( k == 0 && conditional == 0 ) {
+        if (k == 0 && conditional == 0) {
             /* Full index */
             ind[ k ] = silk_LIMIT_int( ind[ k ], *prev_ind + MIN_DELTA_GAIN_QUANT, N_LEVELS_QGAIN - 1 );
             *prev_ind = ind[ k ];
@@ -66,15 +65,15 @@ void silk_gains_quant(
             ind[ k ] = ind[ k ] - *prev_ind;
 
             /* Double the quantization step size for large gain increases, so that the max gain level can be reached */
-            double_step_size_threshold = 2 * MAX_DELTA_GAIN_QUANT - N_LEVELS_QGAIN + *prev_ind;
-            if( ind[ k ] > double_step_size_threshold ) {
+            double_step_size_threshold = 2*MAX_DELTA_GAIN_QUANT - N_LEVELS_QGAIN + *prev_ind;
+            if (ind[ k ] > double_step_size_threshold) {
                 ind[ k ] = double_step_size_threshold + silk_RSHIFT( ind[ k ] - double_step_size_threshold + 1, 1 );
             }
 
             ind[ k ] = silk_LIMIT_int( ind[ k ], MIN_DELTA_GAIN_QUANT, MAX_DELTA_GAIN_QUANT );
 
             /* Accumulate deltas */
-            if( ind[ k ] > double_step_size_threshold ) {
+            if (ind[ k ] > double_step_size_threshold) {
                 *prev_ind += silk_LSHIFT( ind[ k ], 1 ) - double_step_size_threshold;
                 *prev_ind = silk_min_int( *prev_ind, N_LEVELS_QGAIN - 1 );
             } else {
@@ -86,23 +85,22 @@ void silk_gains_quant(
         }
 
         /* Scale and convert to linear scale */
-        gain_Q16[ k ] = silk_log2lin( silk_min_32( silk_SMULWB( INV_SCALE_Q16, *prev_ind ) + OFFSET, 3967 ) ); /* 3967 = 31 in Q7 */
+        gain_Q16[ k ] = silk_log2lin( silk_min_32( silk_SMULWB( INV_SCALE_Q16, *prev_ind ) + OFFSET, 3967 ));  /* 3967 = 31 in Q7 */
     }
 }
 
 /* Gains scalar dequantization, uniform on log scale */
 void silk_gains_dequant(
-    oac_int32                  gain_Q16[ MAX_NB_SUBFR ],       /* O    quantized gains                             */
-    const oac_int8             ind[ MAX_NB_SUBFR ],            /* I    gain indices                                */
+    oac_int32 gain_Q16[ MAX_NB_SUBFR ],                        /* O    quantized gains                             */
+    const oac_int8 ind[ MAX_NB_SUBFR ],                        /* I    gain indices                                */
     oac_int8                   *prev_ind,                      /* I/O  last index in previous frame                */
-    const oac_int              conditional,                    /* I    first gain is delta coded if 1              */
-    const oac_int              nb_subfr                        /* I    number of subframes                          */
-)
-{
-    oac_int   k, ind_tmp, double_step_size_threshold;
-
-    for( k = 0; k < nb_subfr; k++ ) {
-        if( k == 0 && conditional == 0 ) {
+    const oac_int conditional,                                 /* I    first gain is delta coded if 1              */
+    const oac_int nb_subfr                                     /* I    number of subframes                          */
+    ) {
+    oac_int k, ind_tmp, double_step_size_threshold;
+
+    for (k = 0; k < nb_subfr; k++) {
+        if (k == 0 && conditional == 0) {
             /* Gain index is not allowed to go down more than 16 steps (~21.8 dB) */
             *prev_ind = silk_max_int( ind[ k ], *prev_ind - 16 );
         } else {
@@ -110,8 +108,8 @@ void silk_gains_dequant(
             ind_tmp = ind[ k ] + MIN_DELTA_GAIN_QUANT;
 
             /* Accumulate deltas */
-            double_step_size_threshold = 2 * MAX_DELTA_GAIN_QUANT - N_LEVELS_QGAIN + *prev_ind;
-            if( ind_tmp > double_step_size_threshold ) {
+            double_step_size_threshold = 2*MAX_DELTA_GAIN_QUANT - N_LEVELS_QGAIN + *prev_ind;
+            if (ind_tmp > double_step_size_threshold) {
                 *prev_ind += silk_LSHIFT( ind_tmp, 1 ) - double_step_size_threshold;
             } else {
                 *prev_ind += ind_tmp;
@@ -120,21 +118,20 @@ void silk_gains_dequant(
         *prev_ind = silk_LIMIT_int( *prev_ind, 0, N_LEVELS_QGAIN - 1 );
 
         /* Scale and convert to linear scale */
-        gain_Q16[ k ] = silk_log2lin( silk_min_32( silk_SMULWB( INV_SCALE_Q16, *prev_ind ) + OFFSET, 3967 ) ); /* 3967 = 31 in Q7 */
+        gain_Q16[ k ] = silk_log2lin( silk_min_32( silk_SMULWB( INV_SCALE_Q16, *prev_ind ) + OFFSET, 3967 ));  /* 3967 = 31 in Q7 */
     }
 }
 
 /* Compute unique identifier of gain indices vector */
 oac_int32 silk_gains_ID(                                       /* O    returns unique identifier of gains          */
-    const oac_int8             ind[ MAX_NB_SUBFR ],            /* I    gain indices                                */
-    const oac_int              nb_subfr                        /* I    number of subframes                         */
-)
-{
-    oac_int   k;
+    const oac_int8 ind[ MAX_NB_SUBFR ],                        /* I    gain indices                                */
+    const oac_int nb_subfr                                     /* I    number of subframes                         */
+    ) {
+    oac_int k;
     oac_int32 gainsID;
 
     gainsID = 0;
-    for( k = 0; k < nb_subfr; k++ ) {
+    for (k = 0; k < nb_subfr; k++) {
         gainsID = silk_ADD_LSHIFT32( ind[ k ], gainsID, 8 );
     }
 
diff --git a/silk/init_decoder.c b/silk/init_decoder.c
index e82f3bba7..c57238e15 100644
--- a/silk/init_decoder.c
+++ b/silk/init_decoder.c
@@ -1,38 +1,38 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
 
 #ifdef ENABLE_OSCE
-#include "osce.h"
+# include "osce.h"
 #endif
 
 #include "structs.h"
@@ -42,10 +42,10 @@ POSSIBILITY OF SUCH DAMAGE.
 /************************/
 oac_int silk_reset_decoder(
     silk_decoder_state          *psDec                          /* I/O  Decoder state pointer                       */
-)
-{
+    ) {
     /* Clear the entire encoder state, except anything copied */
-    silk_memset( &psDec->SILK_DECODER_STATE_RESET_START, 0, sizeof( silk_decoder_state ) - ((char*) &psDec->SILK_DECODER_STATE_RESET_START - (char*)psDec) );
+    silk_memset( &psDec->SILK_DECODER_STATE_RESET_START, 0,
+    sizeof(silk_decoder_state) - ((char*) &psDec->SILK_DECODER_STATE_RESET_START - (char*)psDec));
 
     /* Used to deactivate LSF interpolation */
     psDec->first_frame_after_reset = 1;
@@ -72,12 +72,11 @@ oac_int silk_reset_decoder(
 /************************/
 oac_int silk_init_decoder(
     silk_decoder_state          *psDec                          /* I/O  Decoder state pointer                       */
-)
-{
+    ) {
     /* Clear the entire encoder state, except anything copied */
-    silk_memset( psDec, 0, sizeof( silk_decoder_state ) );
+    silk_memset( psDec, 0, sizeof(silk_decoder_state));
 
     silk_reset_decoder( psDec );
 
-    return(0);
+    return 0;
 }
diff --git a/silk/init_encoder.c b/silk/init_encoder.c
index 6ed8330d7..730bc2e93 100644
--- a/silk/init_encoder.c
+++ b/silk/init_encoder.c
@@ -1,43 +1,43 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 #ifdef FIXED_POINT
-#include "main_FIX.h"
+# include "main_FIX.h"
 #else
-#include "main_FLP.h"
+# include "main_FLP.h"
 #endif
 #include "tuning_parameters.h"
 #include "cpu_support.h"
 
 #ifdef ENABLE_DRED
-#include "dred_encoder.h"
+# include "dred_encoder.h"
 #endif
 
 /*********************************/
@@ -45,17 +45,17 @@ POSSIBILITY OF SUCH DAMAGE.
 /*********************************/
 oac_int silk_init_encoder(
     silk_encoder_state_Fxx          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
-    int                              arch                                   /* I    Run-time architecture                                                       */
-)
-{
+    int arch                                                                /* I    Run-time architecture                                                       */
+    ) {
     oac_int ret = 0;
 
     /* Clear the entire encoder state */
-    silk_memset( psEnc, 0, sizeof( silk_encoder_state_Fxx ) );
+    silk_memset( psEnc, 0, sizeof(silk_encoder_state_Fxx));
 
     psEnc->sCmn.arch = arch;
 
-    psEnc->sCmn.variable_HP_smth1_Q15 = silk_LSHIFT( silk_lin2log( SILK_FIX_CONST( VARIABLE_HP_MIN_CUTOFF_HZ, 16 ) ) - ( 16 << 7 ), 8 );
+    psEnc->sCmn.variable_HP_smth1_Q15 = silk_LSHIFT( silk_lin2log( SILK_FIX_CONST( VARIABLE_HP_MIN_CUTOFF_HZ,
+    16 )) - (16<<7), 8 );
     psEnc->sCmn.variable_HP_smth2_Q15 = psEnc->sCmn.variable_HP_smth1_Q15;
 
     /* Used to deactivate LSF interpolation, pitch prediction */
@@ -64,5 +64,5 @@ oac_int silk_init_encoder(
     /* Initialize Silk VAD */
     ret += silk_VAD_Init( &psEnc->sCmn.sVAD );
 
-    return  ret;
+    return ret;
 }
diff --git a/silk/inner_prod_aligned.c b/silk/inner_prod_aligned.c
index 093c822d3..b82867b7d 100644
--- a/silk/inner_prod_aligned.c
+++ b/silk/inner_prod_aligned.c
@@ -1,46 +1,45 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
 
 oac_int32 silk_inner_prod_aligned_scale(
-    const oac_int16 *const     inVec1,             /*    I input vector 1                                              */
-    const oac_int16 *const     inVec2,             /*    I input vector 2                                              */
-    const oac_int              scale,              /*    I number of bits to shift                                     */
-    const oac_int              len                 /*    I vector lengths                                              */
-)
-{
-    oac_int   i;
+    const oac_int16 *const inVec1,                 /*    I input vector 1                                              */
+    const oac_int16 *const inVec2,                 /*    I input vector 2                                              */
+    const oac_int scale,                           /*    I number of bits to shift                                     */
+    const oac_int len                              /*    I vector lengths                                              */
+    ) {
+    oac_int i;
     oac_int32 sum = 0;
-    for( i = 0; i < len; i++ ) {
+    for (i = 0; i < len; i++) {
         sum = silk_ADD_RSHIFT32( sum, silk_SMULBB( inVec1[ i ], inVec2[ i ] ), scale );
     }
     return sum;
diff --git a/silk/interpolate.c b/silk/interpolate.c
index 6aa6096e0..5ba59a38e 100644
--- a/silk/interpolate.c
+++ b/silk/interpolate.c
@@ -1,51 +1,50 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
 
 /* Interpolate two vectors */
 void silk_interpolate(
-    oac_int16                  xi[ MAX_LPC_ORDER ],            /* O    interpolated vector                         */
-    const oac_int16            x0[ MAX_LPC_ORDER ],            /* I    first vector                                */
-    const oac_int16            x1[ MAX_LPC_ORDER ],            /* I    second vector                               */
-    const oac_int              ifact_Q2,                       /* I    interp. factor, weight on 2nd vector        */
-    const oac_int              d                               /* I    number of parameters                        */
-)
-{
+    oac_int16 xi[ MAX_LPC_ORDER ],                             /* O    interpolated vector                         */
+    const oac_int16 x0[ MAX_LPC_ORDER ],                       /* I    first vector                                */
+    const oac_int16 x1[ MAX_LPC_ORDER ],                       /* I    second vector                               */
+    const oac_int ifact_Q2,                                    /* I    interp. factor, weight on 2nd vector        */
+    const oac_int d                                            /* I    number of parameters                        */
+    ) {
     oac_int i;
 
     celt_assert( ifact_Q2 >= 0 );
     celt_assert( ifact_Q2 <= 4 );
 
-    for( i = 0; i < d; i++ ) {
+    for (i = 0; i < d; i++) {
         xi[ i ] = (oac_int16)silk_ADD_RSHIFT( x0[ i ], silk_SMULBB( x1[ i ] - x0[ i ], ifact_Q2 ), 2 );
     }
 }
diff --git a/silk/lin2log.c b/silk/lin2log.c
index 5b738eff0..3c67dded2 100644
--- a/silk/lin2log.c
+++ b/silk/lin2log.c
@@ -1,41 +1,40 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
 /* Approximation of 128 * log2() (very close inverse of silk_log2lin()) */
 /* Convert input to a log scale    */
 oac_int32 silk_lin2log(
-    const oac_int32            inLin               /* I  input in linear scale                                         */
-)
-{
+    const oac_int32 inLin                          /* I  input in linear scale                                         */
+    ) {
     oac_int32 lz, frac_Q7;
 
     silk_CLZ_FRAC( inLin, &lz, &frac_Q7 );
diff --git a/silk/log2lin.c b/silk/log2lin.c
index eb650775f..3a05fc8d7 100644
--- a/silk/log2lin.c
+++ b/silk/log2lin.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -34,25 +34,26 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Approximation of 2^() (very close inverse of silk_lin2log()) */
 /* Convert input to a linear scale    */
 oac_int32 silk_log2lin(
-    const oac_int32            inLog_Q7            /* I  input on log scale                                            */
-)
-{
+    const oac_int32 inLog_Q7                       /* I  input on log scale                                            */
+    ) {
     oac_int32 out, frac_Q7;
 
-    if( inLog_Q7 < 0 ) {
+    if (inLog_Q7 < 0) {
         return 0;
-    } else if ( inLog_Q7 >= 3967 ) {
+    } else if (inLog_Q7 >= 3967) {
         return silk_int32_MAX;
     }
 
-    out = silk_LSHIFT( 1, silk_RSHIFT( inLog_Q7, 7 ) );
-    frac_Q7 = inLog_Q7 & 0x7F;
-    if( inLog_Q7 < 2048 ) {
+    out = silk_LSHIFT( 1, silk_RSHIFT( inLog_Q7, 7 ));
+    frac_Q7 = inLog_Q7&0x7F;
+    if (inLog_Q7 < 2048) {
         /* Piece-wise parabolic approximation */
-        out = silk_ADD_RSHIFT32( out, silk_MUL( out, silk_SMLAWB( frac_Q7, silk_SMULBB( frac_Q7, 128 - frac_Q7 ), -174 ) ), 7 );
+        out = silk_ADD_RSHIFT32( out,
+        silk_MUL( out, silk_SMLAWB( frac_Q7, silk_SMULBB( frac_Q7, 128 - frac_Q7 ), -174 )), 7 );
     } else {
         /* Piece-wise parabolic approximation */
-        out = silk_MLA( out, silk_RSHIFT( out, 7 ), silk_SMLAWB( frac_Q7, silk_SMULBB( frac_Q7, 128 - frac_Q7 ), -174 ) );
+        out = silk_MLA( out, silk_RSHIFT( out, 7 ),
+        silk_SMLAWB( frac_Q7, silk_SMULBB( frac_Q7, 128 - frac_Q7 ), -174 ));
     }
     return out;
 }
diff --git a/silk/macros.h b/silk/macros.h
index cdcf6d366..e35637dc7 100644
--- a/silk/macros.h
+++ b/silk/macros.h
@@ -1,35 +1,35 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_MACROS_H
 #define SILK_MACROS_H
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "oac_types.h"
@@ -40,115 +40,120 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* (a32 * (oac_int32)((oac_int16)(b32))) >> 16 output have to be 32bit int */
 #if OAC_FAST_INT64
-#define silk_SMULWB(a32, b32)            ((oac_int32)(((a32) * (oac_int64)((oac_int16)(b32))) >> 16))
+# define silk_SMULWB(a32, b32)            ((oac_int32)(((a32)*(oac_int64)((oac_int16)(b32)))>>16))
 #else
-#define silk_SMULWB(a32, b32)            ((((a32) >> 16) * (oac_int32)((oac_int16)(b32))) + ((((a32) & 0x0000FFFF) * (oac_int32)((oac_int16)(b32))) >> 16))
+# define silk_SMULWB(a32, \
+                     b32)            ((((a32)>> \
+                                        16)*(oac_int32)((oac_int16)(b32))) \
+                                      + ((((a32)&0x0000FFFF)*(oac_int32)((oac_int16)(b32)))>>16))
 #endif
 
 /* a32 + (b32 * (oac_int32)((oac_int16)(c32))) >> 16 output have to be 32bit int */
 #if OAC_FAST_INT64
-#define silk_SMLAWB(a32, b32, c32)       ((oac_int32)((a32) + (((b32) * (oac_int64)((oac_int16)(c32))) >> 16)))
+# define silk_SMLAWB(a32, b32, c32)       ((oac_int32)((a32) + (((b32)*(oac_int64)((oac_int16)(c32)))>>16)))
 #else
-#define silk_SMLAWB(a32, b32, c32)       ((a32) + ((((b32) >> 16) * (oac_int32)((oac_int16)(c32))) + ((((b32) & 0x0000FFFF) * (oac_int32)((oac_int16)(c32))) >> 16)))
+# define silk_SMLAWB(a32, b32, \
+                     c32)       ((a32) + ((((b32)>> \
+                                            16)*(oac_int32)((oac_int16)(c32))) \
+                                          + ((((b32)&0x0000FFFF)*(oac_int32)((oac_int16)(c32)))>>16)))
 #endif
 
 /* (a32 * (b32 >> 16)) >> 16 */
 #if OAC_FAST_INT64
-#define silk_SMULWT(a32, b32)            ((oac_int32)(((a32) * (oac_int64)((b32) >> 16)) >> 16))
+# define silk_SMULWT(a32, b32)            ((oac_int32)(((a32)*(oac_int64)((b32)>>16))>>16))
 #else
-#define silk_SMULWT(a32, b32)            (((a32) >> 16) * ((b32) >> 16) + ((((a32) & 0x0000FFFF) * ((b32) >> 16)) >> 16))
+# define silk_SMULWT(a32, b32)            (((a32)>>16)*((b32)>>16) + ((((a32)&0x0000FFFF)*((b32)>>16))>>16))
 #endif
 
 /* a32 + (b32 * (c32 >> 16)) >> 16 */
 #if OAC_FAST_INT64
-#define silk_SMLAWT(a32, b32, c32)       ((oac_int32)((a32) + (((b32) * ((oac_int64)(c32) >> 16)) >> 16)))
+# define silk_SMLAWT(a32, b32, c32)       ((oac_int32)((a32) + (((b32)*((oac_int64)(c32)>>16))>>16)))
 #else
-#define silk_SMLAWT(a32, b32, c32)       ((a32) + (((b32) >> 16) * ((c32) >> 16)) + ((((b32) & 0x0000FFFF) * ((c32) >> 16)) >> 16))
+# define silk_SMLAWT(a32, b32, c32)       ((a32) + (((b32)>>16)*((c32)>>16)) + ((((b32)&0x0000FFFF)*((c32)>>16))>>16))
 #endif
 
 /* (oac_int32)((oac_int16)(a3))) * (oac_int32)((oac_int16)(b32)) output have to be 32bit int */
-#define silk_SMULBB(a32, b32)            ((oac_int32)((oac_int16)(a32)) * (oac_int32)((oac_int16)(b32)))
+#define silk_SMULBB(a32, b32)            ((oac_int32)((oac_int16)(a32))*(oac_int32)((oac_int16)(b32)))
 
 /* a32 + (oac_int32)((oac_int16)(b32)) * (oac_int32)((oac_int16)(c32)) output have to be 32bit int */
-#define silk_SMLABB(a32, b32, c32)       ((a32) + ((oac_int32)((oac_int16)(b32))) * (oac_int32)((oac_int16)(c32)))
+#define silk_SMLABB(a32, b32, c32)       ((a32) + ((oac_int32)((oac_int16)(b32)))*(oac_int32)((oac_int16)(c32)))
 
 /* (oac_int32)((oac_int16)(a32)) * (b32 >> 16) */
-#define silk_SMULBT(a32, b32)            ((oac_int32)((oac_int16)(a32)) * ((b32) >> 16))
+#define silk_SMULBT(a32, b32)            ((oac_int32)((oac_int16)(a32))*((b32)>>16))
 
 /* a32 + (oac_int32)((oac_int16)(b32)) * (c32 >> 16) */
-#define silk_SMLABT(a32, b32, c32)       ((a32) + ((oac_int32)((oac_int16)(b32))) * ((c32) >> 16))
+#define silk_SMLABT(a32, b32, c32)       ((a32) + ((oac_int32)((oac_int16)(b32)))*((c32)>>16))
 
 /* a64 + (b32 * c32) */
-#define silk_SMLAL(a64, b32, c32)        (silk_ADD64((a64), ((oac_int64)(b32) * (oac_int64)(c32))))
+#define silk_SMLAL(a64, b32, c32)        (silk_ADD64((a64), ((oac_int64)(b32)*(oac_int64)(c32))))
 
 /* (a32 * b32) >> 16 */
 #if OAC_FAST_INT64
-#define silk_SMULWW(a32, b32)            ((oac_int32)(((oac_int64)(a32) * (b32)) >> 16))
+# define silk_SMULWW(a32, b32)            ((oac_int32)(((oac_int64)(a32)*(b32))>>16))
 #else
-#define silk_SMULWW(a32, b32)            silk_MLA(silk_SMULWB((a32), (b32)), (a32), silk_RSHIFT_ROUND((b32), 16))
+# define silk_SMULWW(a32, b32)            silk_MLA(silk_SMULWB((a32), (b32)), (a32), silk_RSHIFT_ROUND((b32), 16))
 #endif
 
 /* a32 + ((b32 * c32) >> 16) */
 #if OAC_FAST_INT64
-#define silk_SMLAWW(a32, b32, c32)       ((oac_int32)((a32) + (((oac_int64)(b32) * (c32)) >> 16)))
+# define silk_SMLAWW(a32, b32, c32)       ((oac_int32)((a32) + (((oac_int64)(b32)*(c32))>>16)))
 #else
-#define silk_SMLAWW(a32, b32, c32)       silk_MLA(silk_SMLAWB((a32), (b32), (c32)), (b32), silk_RSHIFT_ROUND((c32), 16))
+# define silk_SMLAWW(a32, b32, c32)       silk_MLA(silk_SMLAWB((a32), (b32), (c32)), (b32), \
+    silk_RSHIFT_ROUND((c32), 16))
 #endif
 
 /* add/subtract with output saturated */
-#define silk_ADD_SAT32(a, b)             ((((oac_uint32)(a) + (oac_uint32)(b)) & 0x80000000) == 0 ?                              \
-                                        ((((a) & (b)) & 0x80000000) != 0 ? silk_int32_MIN : (a)+(b)) :   \
-                                        ((((a) | (b)) & 0x80000000) == 0 ? silk_int32_MAX : (a)+(b)) )
+#define silk_ADD_SAT32(a, b)             ((((oac_uint32)(a) + (oac_uint32)(b))&0x80000000) == 0 ?                              \
+                                          ((((a)&(b))&0x80000000) != 0 ? silk_int32_MIN : (a) + (b)) :   \
+                                          ((((a)|(b))&0x80000000) == 0 ? silk_int32_MAX : (a) + (b)))
 
-#define silk_SUB_SAT32(a, b)             ((((oac_uint32)(a)-(oac_uint32)(b)) & 0x80000000) == 0 ?                                        \
-                                        (( (a) & ((b)^0x80000000) & 0x80000000) ? silk_int32_MIN : (a)-(b)) :    \
-                                        ((((a)^0x80000000) & (b)  & 0x80000000) ? silk_int32_MAX : (a)-(b)) )
+#define silk_SUB_SAT32(a, b)             ((((oac_uint32)(a) - (oac_uint32)(b))&0x80000000) == 0 ?                                        \
+                                          (((a)&((b)^0x80000000)&0x80000000) ? silk_int32_MIN : (a) - (b)) :    \
+                                          ((((a)^0x80000000)&(b)&0x80000000) ? silk_int32_MAX : (a) - (b)))
 
 #if defined(FIXED_POINT) && defined(__mips)
-#include "mips/macros_mipsr1.h"
+# include "mips/macros_mipsr1.h"
 #endif
 
 #include "ecintrin.h"
 #ifndef OVERRIDE_silk_CLZ16
-static OAC_INLINE oac_int32 silk_CLZ16(oac_int16 in16)
-{
+static OAC_INLINE oac_int32 silk_CLZ16(oac_int16 in16) {
     return 32 - EC_ILOG(in16<<16|0x8000);
 }
 #endif
 
 #ifndef OVERRIDE_silk_CLZ32
-static OAC_INLINE oac_int32 silk_CLZ32(oac_int32 in32)
-{
+static OAC_INLINE oac_int32 silk_CLZ32(oac_int32 in32) {
     return in32 ? 32 - EC_ILOG(in32) : 32;
 }
 #endif
 
 /* Row based */
 #define matrix_ptr(Matrix_base_adr, row, column, N) \
-    (*((Matrix_base_adr) + ((row)*(N)+(column))))
+        (*((Matrix_base_adr) + ((row)*(N) + (column))))
 #define matrix_adr(Matrix_base_adr, row, column, N) \
-      ((Matrix_base_adr) + ((row)*(N)+(column)))
+        ((Matrix_base_adr) + ((row)*(N) + (column)))
 
 /* Column based */
 #ifndef matrix_c_ptr
-#   define matrix_c_ptr(Matrix_base_adr, row, column, M) \
-    (*((Matrix_base_adr) + ((row)+(M)*(column))))
+# define matrix_c_ptr(Matrix_base_adr, row, column, M) \
+        (*((Matrix_base_adr) + ((row) + (M)*(column))))
 #endif
 
 #ifdef OAC_ARM_INLINE_ASM
-#include "arm/macros_armv4.h"
+# include "arm/macros_armv4.h"
 #endif
 
 #ifdef OAC_ARM_INLINE_EDSP
-#include "arm/macros_armv5e.h"
+# include "arm/macros_armv5e.h"
 #endif
 
 #ifdef OAC_ARM_PRESUME_AARCH64_NEON_INTR
-#include "arm/macros_arm64.h"
+# include "arm/macros_arm64.h"
 #endif
 
 #ifdef OAC_XTENSA_LX7
-#include "xtensa/macros_lx7.h"
+# include "xtensa/macros_lx7.h"
 #endif
 
 #endif /* SILK_MACROS_H */
diff --git a/silk/main.h b/silk/main.h
index 04152bc57..3bc24024e 100644
--- a/silk/main.h
+++ b/silk/main.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_MAIN_H
@@ -39,114 +39,113 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "entdec.h"
 
 #if defined(OAC_X86_MAY_HAVE_SSE4_1)
-#include "x86/main_sse.h"
+# include "x86/main_sse.h"
 #endif
 
 #if (defined(OAC_ARM_ASM) || defined(OAC_ARM_MAY_HAVE_NEON_INTR))
-#include "arm/NSQ_del_dec_arm.h"
+# include "arm/NSQ_del_dec_arm.h"
 #endif
 
 /* Convert Left/Right stereo signal to adaptive Mid/Side representation */
 void silk_stereo_LR_to_MS(
     stereo_enc_state            *state,                         /* I/O  State                                       */
-    oac_int16                  x1[],                           /* I/O  Left input signal, becomes mid signal       */
-    oac_int16                  x2[],                           /* I/O  Right input signal, becomes side signal     */
-    oac_int8                   ix[ 2 ][ 3 ],                   /* O    Quantization indices                        */
+    oac_int16 x1[],                                            /* I/O  Left input signal, becomes mid signal       */
+    oac_int16 x2[],                                            /* I/O  Right input signal, becomes side signal     */
+    oac_int8 ix[ 2 ][ 3 ],                                     /* O    Quantization indices                        */
     oac_int8                   *mid_only_flag,                 /* O    Flag: only mid signal coded                 */
-    oac_int32                  mid_side_rates_bps[],           /* O    Bitrates for mid and side signals           */
-    oac_int32                  total_rate_bps,                 /* I    Total bitrate                               */
-    oac_int                    prev_speech_act_Q8,             /* I    Speech activity level in previous frame     */
-    oac_int                    toMono,                         /* I    Last frame before a stereo->mono transition */
-    oac_int                    fs_kHz,                         /* I    Sample rate (kHz)                           */
-    oac_int                    frame_length                    /* I    Number of samples                           */
-);
+    oac_int32 mid_side_rates_bps[],                            /* O    Bitrates for mid and side signals           */
+    oac_int32 total_rate_bps,                                  /* I    Total bitrate                               */
+    oac_int prev_speech_act_Q8,                                /* I    Speech activity level in previous frame     */
+    oac_int toMono,                                            /* I    Last frame before a stereo->mono transition */
+    oac_int fs_kHz,                                            /* I    Sample rate (kHz)                           */
+    oac_int frame_length                                       /* I    Number of samples                           */
+    );
 
 /* Convert adaptive Mid/Side representation to Left/Right stereo signal */
 void silk_stereo_MS_to_LR(
     stereo_dec_state            *state,                         /* I/O  State                                       */
-    oac_int16                  x1[],                           /* I/O  Left input signal, becomes mid signal       */
-    oac_int16                  x2[],                           /* I/O  Right input signal, becomes side signal     */
-    const oac_int32            pred_Q13[],                     /* I    Predictors                                  */
-    oac_int                    fs_kHz,                         /* I    Samples rate (kHz)                          */
-    oac_int                    frame_length                    /* I    Number of samples                           */
-);
+    oac_int16 x1[],                                            /* I/O  Left input signal, becomes mid signal       */
+    oac_int16 x2[],                                            /* I/O  Right input signal, becomes side signal     */
+    const oac_int32 pred_Q13[],                                /* I    Predictors                                  */
+    oac_int fs_kHz,                                            /* I    Samples rate (kHz)                          */
+    oac_int frame_length                                       /* I    Number of samples                           */
+    );
 
 /* Find least-squares prediction gain for one signal based on another and quantize it */
 oac_int32 silk_stereo_find_predictor(                          /* O    Returns predictor in Q13                    */
     oac_int32                  *ratio_Q14,                     /* O    Ratio of residual and mid energies          */
-    const oac_int16            x[],                            /* I    Basis signal                                */
-    const oac_int16            y[],                            /* I    Target signal                               */
-    oac_int32                  mid_res_amp_Q0[],               /* I/O  Smoothed mid, residual norms                */
-    oac_int                    length,                         /* I    Number of samples                           */
-    oac_int                    smooth_coef_Q16                 /* I    Smoothing coefficient                       */
-);
+    const oac_int16 x[],                                       /* I    Basis signal                                */
+    const oac_int16 y[],                                       /* I    Target signal                               */
+    oac_int32 mid_res_amp_Q0[],                                /* I/O  Smoothed mid, residual norms                */
+    oac_int length,                                            /* I    Number of samples                           */
+    oac_int smooth_coef_Q16                                    /* I    Smoothing coefficient                       */
+    );
 
 /* Quantize mid/side predictors */
 void silk_stereo_quant_pred(
-    oac_int32                  pred_Q13[],                     /* I/O  Predictors (out: quantized)                 */
-    oac_int8                   ix[ 2 ][ 3 ]                    /* O    Quantization indices                        */
-);
+    oac_int32 pred_Q13[],                                      /* I/O  Predictors (out: quantized)                 */
+    oac_int8 ix[ 2 ][ 3 ]                                      /* O    Quantization indices                        */
+    );
 
 /* Entropy code the mid/side quantization indices */
 void silk_stereo_encode_pred(
     ec_enc                      *psRangeEnc,                    /* I/O  Compressor data structure                   */
-    oac_int8                   ix[ 2 ][ 3 ]                    /* I    Quantization indices                        */
-);
+    oac_int8 ix[ 2 ][ 3 ]                                      /* I    Quantization indices                        */
+    );
 
 /* Entropy code the mid-only flag */
 void silk_stereo_encode_mid_only(
     ec_enc                      *psRangeEnc,                    /* I/O  Compressor data structure                   */
-    oac_int8                   mid_only_flag
-);
+    oac_int8 mid_only_flag);
 
 /* Decode mid/side predictors */
 void silk_stereo_decode_pred(
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
-    oac_int32                  pred_Q13[]                      /* O    Predictors                                  */
-);
+    oac_int32 pred_Q13[]                                       /* O    Predictors                                  */
+    );
 
 /* Decode mid-only flag */
 void silk_stereo_decode_mid_only(
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
     oac_int                    *decode_only_mid                /* O    Flag that only mid channel has been coded   */
-);
+    );
 
 /* Encodes signs of excitation */
 void silk_encode_signs(
     ec_enc                      *psRangeEnc,                        /* I/O  Compressor data structure               */
-    const oac_int8             pulses[],                           /* I    pulse signal                            */
-    oac_int                    length,                             /* I    length of input                         */
-    const oac_int              signalType,                         /* I    Signal type                             */
-    const oac_int              quantOffsetType,                    /* I    Quantization offset type                */
-    const oac_int              sum_pulses[ MAX_NB_SHELL_BLOCKS ]   /* I    Sum of absolute pulses per block        */
-);
+    const oac_int8 pulses[],                                       /* I    pulse signal                            */
+    oac_int length,                                                /* I    length of input                         */
+    const oac_int signalType,                                      /* I    Signal type                             */
+    const oac_int quantOffsetType,                                 /* I    Quantization offset type                */
+    const oac_int sum_pulses[ MAX_NB_SHELL_BLOCKS ]                /* I    Sum of absolute pulses per block        */
+    );
 
 /* Decodes signs of excitation */
 void silk_decode_signs(
     ec_dec                      *psRangeDec,                        /* I/O  Compressor data structure               */
-    oac_int16                  pulses[],                           /* I/O  pulse signal                            */
-    oac_int                    length,                             /* I    length of input                         */
-    const oac_int              signalType,                         /* I    Signal type                             */
-    const oac_int              quantOffsetType,                    /* I    Quantization offset type                */
-    const oac_int              sum_pulses[ MAX_NB_SHELL_BLOCKS ]   /* I    Sum of absolute pulses per block        */
-);
+    oac_int16 pulses[],                                            /* I/O  pulse signal                            */
+    oac_int length,                                                /* I    length of input                         */
+    const oac_int signalType,                                      /* I    Signal type                             */
+    const oac_int quantOffsetType,                                 /* I    Quantization offset type                */
+    const oac_int sum_pulses[ MAX_NB_SHELL_BLOCKS ]                /* I    Sum of absolute pulses per block        */
+    );
 
 /* Check encoder control struct */
 oac_int check_control_input(
     silk_EncControlStruct        *encControl                    /* I    Control structure                           */
-);
+    );
 
 /* Control internal sampling rate */
 oac_int silk_control_audio_bandwidth(
     silk_encoder_state          *psEncC,                        /* I/O  Pointer to Silk encoder state               */
     silk_EncControlStruct       *encControl                     /* I    Control structure                           */
-);
+    );
 
 /* Control SNR of residual quantizer */
 oac_int silk_control_SNR(
     silk_encoder_state          *psEncC,                        /* I/O  Pointer to Silk encoder state               */
-    oac_int32                  TargetRate_bps                  /* I    Target max bitrate (bps)                    */
-);
+    oac_int32 TargetRate_bps                                   /* I    Target max bitrate (bps)                    */
+    );
 
 /***************/
 /* Shell coder */
@@ -155,71 +154,71 @@ oac_int silk_control_SNR(
 /* Encode quantization indices of excitation */
 void silk_encode_pulses(
     ec_enc                      *psRangeEnc,                    /* I/O  compressor data structure                   */
-    const oac_int              signalType,                     /* I    Signal type                                 */
-    const oac_int              quantOffsetType,                /* I    quantOffsetType                             */
-    oac_int8                   pulses[],                       /* I    quantization indices                        */
-    const oac_int              frame_length                    /* I    Frame length                                */
-);
+    const oac_int signalType,                                  /* I    Signal type                                 */
+    const oac_int quantOffsetType,                             /* I    quantOffsetType                             */
+    oac_int8 pulses[],                                         /* I    quantization indices                        */
+    const oac_int frame_length                                 /* I    Frame length                                */
+    );
 
 /* Shell encoder, operates on one shell code frame of 16 pulses */
 void silk_shell_encoder(
     ec_enc                      *psRangeEnc,                    /* I/O  compressor data structure                   */
     const oac_int              *pulses0                        /* I    data: nonnegative pulse amplitudes          */
-);
+    );
 
 /* Shell decoder, operates on one shell code frame of 16 pulses */
 void silk_shell_decoder(
     oac_int16                  *pulses0,                       /* O    data: nonnegative pulse amplitudes          */
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
-    const oac_int              pulses4                         /* I    number of pulses per pulse-subframe         */
-);
+    const oac_int pulses4                                      /* I    number of pulses per pulse-subframe         */
+    );
 
 /* Gain scalar quantization with hysteresis, uniform on log scale */
 void silk_gains_quant(
-    oac_int8                   ind[ MAX_NB_SUBFR ],            /* O    gain indices                                */
-    oac_int32                  gain_Q16[ MAX_NB_SUBFR ],       /* I/O  gains (quantized out)                       */
+    oac_int8 ind[ MAX_NB_SUBFR ],                              /* O    gain indices                                */
+    oac_int32 gain_Q16[ MAX_NB_SUBFR ],                        /* I/O  gains (quantized out)                       */
     oac_int8                   *prev_ind,                      /* I/O  last index in previous frame                */
-    const oac_int              conditional,                    /* I    first gain is delta coded if 1              */
-    const oac_int              nb_subfr                        /* I    number of subframes                         */
-);
+    const oac_int conditional,                                 /* I    first gain is delta coded if 1              */
+    const oac_int nb_subfr                                     /* I    number of subframes                         */
+    );
 
 /* Gains scalar dequantization, uniform on log scale */
 void silk_gains_dequant(
-    oac_int32                  gain_Q16[ MAX_NB_SUBFR ],       /* O    quantized gains                             */
-    const oac_int8             ind[ MAX_NB_SUBFR ],            /* I    gain indices                                */
+    oac_int32 gain_Q16[ MAX_NB_SUBFR ],                        /* O    quantized gains                             */
+    const oac_int8 ind[ MAX_NB_SUBFR ],                        /* I    gain indices                                */
     oac_int8                   *prev_ind,                      /* I/O  last index in previous frame                */
-    const oac_int              conditional,                    /* I    first gain is delta coded if 1              */
-    const oac_int              nb_subfr                        /* I    number of subframes                          */
-);
+    const oac_int conditional,                                 /* I    first gain is delta coded if 1              */
+    const oac_int nb_subfr                                     /* I    number of subframes                          */
+    );
 
 /* Compute unique identifier of gain indices vector */
 oac_int32 silk_gains_ID(                                       /* O    returns unique identifier of gains          */
-    const oac_int8             ind[ MAX_NB_SUBFR ],            /* I    gain indices                                */
-    const oac_int              nb_subfr                        /* I    number of subframes                         */
-);
+    const oac_int8 ind[ MAX_NB_SUBFR ],                        /* I    gain indices                                */
+    const oac_int nb_subfr                                     /* I    number of subframes                         */
+    );
 
 /* Interpolate two vectors */
 void silk_interpolate(
-    oac_int16                  xi[ MAX_LPC_ORDER ],            /* O    interpolated vector                         */
-    const oac_int16            x0[ MAX_LPC_ORDER ],            /* I    first vector                                */
-    const oac_int16            x1[ MAX_LPC_ORDER ],            /* I    second vector                               */
-    const oac_int              ifact_Q2,                       /* I    interp. factor, weight on 2nd vector        */
-    const oac_int              d                               /* I    number of parameters                        */
-);
+    oac_int16 xi[ MAX_LPC_ORDER ],                             /* O    interpolated vector                         */
+    const oac_int16 x0[ MAX_LPC_ORDER ],                       /* I    first vector                                */
+    const oac_int16 x1[ MAX_LPC_ORDER ],                       /* I    second vector                               */
+    const oac_int ifact_Q2,                                    /* I    interp. factor, weight on 2nd vector        */
+    const oac_int d                                            /* I    number of parameters                        */
+    );
 
 /* LTP tap quantizer */
 void silk_quant_LTP_gains(
-    oac_int16                  B_Q14[ MAX_NB_SUBFR * LTP_ORDER ],          /* O    Quantized LTP gains             */
-    oac_int8                   cbk_index[ MAX_NB_SUBFR ],                  /* O    Codebook Index                  */
+    oac_int16 B_Q14[ MAX_NB_SUBFR*LTP_ORDER ],                             /* O    Quantized LTP gains             */
+    oac_int8 cbk_index[ MAX_NB_SUBFR ],                                    /* O    Codebook Index                  */
     oac_int8                   *periodicity_index,                         /* O    Periodicity Index               */
     oac_int32                  *sum_gain_dB_Q7,                            /* I/O  Cumulative max prediction gain  */
     oac_int                    *pred_gain_dB_Q7,                           /* O    LTP prediction gain             */
-    const oac_int32            XX_Q17[ MAX_NB_SUBFR*LTP_ORDER*LTP_ORDER ], /* I    Correlation matrix in Q18       */
-    const oac_int32            xX_Q17[ MAX_NB_SUBFR*LTP_ORDER ],           /* I    Correlation vector in Q18       */
-    const oac_int              subfr_len,                                  /* I    Number of samples per subframe  */
-    const oac_int              nb_subfr,                                   /* I    Number of subframes             */
-    int                         arch                                        /* I    Run-time architecture           */
-);
+    const oac_int32 XX_Q17[ MAX_NB_SUBFR*LTP_ORDER*LTP_ORDER ],            /* I    Correlation matrix in Q18       */
+    const oac_int32 xX_Q17[ MAX_NB_SUBFR*LTP_ORDER ],                      /* I    Correlation vector in Q18       */
+    const oac_int subfr_len,                                               /* I    Number of samples per subframe  */
+    const oac_int nb_subfr,                                                /* I    Number of subframes             */
+    int arch                                                                /* I    Run-time architecture           */
+    );
 
 /* Entropy constrained matrix-weighted VQ, for a single input data vector */
 void silk_VQ_WMat_EC_c(
@@ -232,14 +231,17 @@ void silk_VQ_WMat_EC_c(
     const oac_int8             *cb_Q7,                         /* I    codebook                                    */
     const oac_uint8            *cb_gain_Q7,                    /* I    codebook effective gain                     */
     const oac_uint8            *cl_Q5,                         /* I    code length for each codebook vector        */
-    const oac_int              subfr_len,                      /* I    number of samples per subframe              */
-    const oac_int32            max_gain_Q7,                    /* I    maximum sum of absolute LTP coefficients    */
-    const oac_int              L                               /* I    number of vectors in codebook               */
-);
+    const oac_int subfr_len,                                   /* I    number of samples per subframe              */
+    const oac_int32 max_gain_Q7,                               /* I    maximum sum of absolute LTP coefficients    */
+    const oac_int L                                            /* I    number of vectors in codebook               */
+    );
 
 #if !defined(OVERRIDE_silk_VQ_WMat_EC)
-#define silk_VQ_WMat_EC(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, subfr_len, max_gain_Q7, L, arch) \
-    ((void)(arch),silk_VQ_WMat_EC_c(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, subfr_len, max_gain_Q7, L))
+# define silk_VQ_WMat_EC(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, subfr_len, \
+                         max_gain_Q7, L, arch) \
+        ((void)(arch), \
+         silk_VQ_WMat_EC_c(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, subfr_len, \
+    max_gain_Q7, L))
 #endif
 
 /************************************/
@@ -250,24 +252,24 @@ void silk_NSQ_c(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const oac_int16            x16[],                                        /* I    Input                           */
-    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16 x16[],                                                   /* I    Input                           */
+    oac_int8 pulses[],                                                       /* O    Quantized pulse signal          */
     const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
-);
+    const oac_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],                 /* I    Long term prediction coefs      */
+    const oac_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ],            /* I    Noise shaping coefs             */
+    const oac_int HarmShapeGain_Q14[ MAX_NB_SUBFR ],                         /* I    Long term shaping coefs         */
+    const oac_int Tilt_Q14[ MAX_NB_SUBFR ],                                  /* I    Spectral tilt                   */
+    const oac_int32 LF_shp_Q14[ MAX_NB_SUBFR ],                              /* I    Low frequency shaping coefs     */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],                               /* I    Quantization step sizes         */
+    const oac_int pitchL[ MAX_NB_SUBFR ],                                    /* I    Pitch lags                      */
+    const oac_int Lambda_Q10,                                                /* I    Rate/distortion tradeoff        */
+    const oac_int LTP_scale_Q14                                              /* I    LTP state scaling               */
+    );
 
 #if !defined(OVERRIDE_silk_NSQ)
-#define silk_NSQ(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
-                   HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
-    ((void)(arch),silk_NSQ_c(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
+# define silk_NSQ(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
+                  HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
+        ((void)(arch), silk_NSQ_c(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
                    HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14))
 #endif
 
@@ -276,24 +278,24 @@ void silk_NSQ_del_dec_c(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const oac_int16            x16[],                                        /* I    Input                           */
-    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16 x16[],                                                   /* I    Input                           */
+    oac_int8 pulses[],                                                       /* O    Quantized pulse signal          */
     const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
-);
+    const oac_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],                 /* I    Long term prediction coefs      */
+    const oac_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ],            /* I    Noise shaping coefs             */
+    const oac_int HarmShapeGain_Q14[ MAX_NB_SUBFR ],                         /* I    Long term shaping coefs         */
+    const oac_int Tilt_Q14[ MAX_NB_SUBFR ],                                  /* I    Spectral tilt                   */
+    const oac_int32 LF_shp_Q14[ MAX_NB_SUBFR ],                              /* I    Low frequency shaping coefs     */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],                               /* I    Quantization step sizes         */
+    const oac_int pitchL[ MAX_NB_SUBFR ],                                    /* I    Pitch lags                      */
+    const oac_int Lambda_Q10,                                                /* I    Rate/distortion tradeoff        */
+    const oac_int LTP_scale_Q14                                              /* I    LTP state scaling               */
+    );
 
 #if !defined(OVERRIDE_silk_NSQ_del_dec)
-#define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
-                           HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
-    ((void)(arch),silk_NSQ_del_dec_c(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
+# define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
+                          HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
+        ((void)(arch), silk_NSQ_del_dec_c(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
                            HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14))
 #endif
 
@@ -303,16 +305,16 @@ void silk_NSQ_del_dec_c(
 /* Initialize the Silk VAD */
 oac_int silk_VAD_Init(                                         /* O    Return value, 0 if success                  */
     silk_VAD_state              *psSilk_VAD                     /* I/O  Pointer to Silk VAD state                   */
-);
+    );
 
 /* Get speech activity level in Q8 */
 oac_int silk_VAD_GetSA_Q8_c(                                   /* O    Return value, 0 if success                  */
     silk_encoder_state          *psEncC,                        /* I/O  Encoder state                               */
-    const oac_int16            pIn[]                           /* I    PCM input                                   */
-);
+    const oac_int16 pIn[]                                      /* I    PCM input                                   */
+    );
 
 #if !defined(OVERRIDE_silk_VAD_GetSA_Q8)
-#define silk_VAD_GetSA_Q8(psEnC, pIn, arch) ((void)(arch),silk_VAD_GetSA_Q8_c(psEnC, pIn))
+# define silk_VAD_GetSA_Q8(psEnC, pIn, arch) ((void)(arch), silk_VAD_GetSA_Q8_c(psEnC, pIn))
 #endif
 
 /* Low-pass filter with variable cutoff frequency based on  */
@@ -321,8 +323,8 @@ oac_int silk_VAD_GetSA_Q8_c(                                   /* O    Return va
 void silk_LP_variable_cutoff(
     silk_LP_state               *psLP,                          /* I/O  LP filter state                             */
     oac_int16                  *frame,                         /* I/O  Low-pass filtered output signal             */
-    const oac_int              frame_length                    /* I    Frame length                                */
-);
+    const oac_int frame_length                                 /* I    Frame length                                */
+    );
 
 /******************/
 /* NLSF Quantizer */
@@ -330,132 +332,132 @@ void silk_LP_variable_cutoff(
 /* Limit, stabilize, convert and quantize NLSFs */
 void silk_process_NLSFs(
     silk_encoder_state          *psEncC,                            /* I/O  Encoder state                               */
-    oac_int16                  PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ], /* O    Prediction coefficients                     */
-    oac_int16                  pNLSF_Q15[         MAX_LPC_ORDER ], /* I/O  Normalized LSFs (quant out) (0 - (2^15-1))  */
-    const oac_int16            prev_NLSFq_Q15[    MAX_LPC_ORDER ]  /* I    Previous Normalized LSFs (0 - (2^15-1))     */
-);
+    oac_int16 PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ],                  /* O    Prediction coefficients                     */
+    oac_int16 pNLSF_Q15[         MAX_LPC_ORDER ],                  /* I/O  Normalized LSFs (quant out) (0 - (2^15-1))  */
+    const oac_int16 prev_NLSFq_Q15[    MAX_LPC_ORDER ]             /* I    Previous Normalized LSFs (0 - (2^15-1))     */
+    );
 
 oac_int32 silk_NLSF_encode(                                    /* O    Returns RD value in Q25                     */
-          oac_int8             *NLSFIndices,                   /* I    Codebook path vector [ LPC_ORDER + 1 ]      */
-          oac_int16            *pNLSF_Q15,                     /* I/O  Quantized NLSF vector [ LPC_ORDER ]         */
+    oac_int8             *NLSFIndices,                         /* I    Codebook path vector [ LPC_ORDER + 1 ]      */
+    oac_int16            *pNLSF_Q15,                           /* I/O  Quantized NLSF vector [ LPC_ORDER ]         */
     const silk_NLSF_CB_struct   *psNLSF_CB,                     /* I    Codebook object                             */
     const oac_int16            *pW_QW,                         /* I    NLSF weight vector [ LPC_ORDER ]            */
-    const oac_int              NLSF_mu_Q20,                    /* I    Rate weight for the RD optimization         */
-    const oac_int              nSurvivors,                     /* I    Max survivors after first stage             */
-    const oac_int              signalType                      /* I    Signal type: 0/1/2                          */
-);
+    const oac_int NLSF_mu_Q20,                                 /* I    Rate weight for the RD optimization         */
+    const oac_int nSurvivors,                                  /* I    Max survivors after first stage             */
+    const oac_int signalType                                   /* I    Signal type: 0/1/2                          */
+    );
 
 /* Compute quantization errors for an LPC_order element input vector for a VQ codebook */
 void silk_NLSF_VQ(
-    oac_int32                  err_Q26[],                      /* O    Quantization errors [K]                     */
-    const oac_int16            in_Q15[],                       /* I    Input vectors to be quantized [LPC_order]   */
-    const oac_uint8            pCB_Q8[],                       /* I    Codebook vectors [K*LPC_order]              */
-    const oac_int16            pWght_Q9[],                     /* I    Codebook weights [K*LPC_order]              */
-    const oac_int              K,                              /* I    Number of codebook vectors                  */
-    const oac_int              LPC_order                       /* I    Number of LPCs                              */
-);
+    oac_int32 err_Q26[],                                       /* O    Quantization errors [K]                     */
+    const oac_int16 in_Q15[],                                  /* I    Input vectors to be quantized [LPC_order]   */
+    const oac_uint8 pCB_Q8[],                                  /* I    Codebook vectors [K*LPC_order]              */
+    const oac_int16 pWght_Q9[],                                /* I    Codebook weights [K*LPC_order]              */
+    const oac_int K,                                           /* I    Number of codebook vectors                  */
+    const oac_int LPC_order                                    /* I    Number of LPCs                              */
+    );
 
 /* Delayed-decision quantizer for NLSF residuals */
 oac_int32 silk_NLSF_del_dec_quant(                             /* O    Returns RD value in Q25                     */
-    oac_int8                   indices[],                      /* O    Quantization indices [ order ]              */
-    const oac_int16            x_Q10[],                        /* I    Input [ order ]                             */
-    const oac_int16            w_Q5[],                         /* I    Weights [ order ]                           */
-    const oac_uint8            pred_coef_Q8[],                 /* I    Backward predictor coefs [ order ]          */
-    const oac_int16            ec_ix[],                        /* I    Indices to entropy coding tables [ order ]  */
-    const oac_uint8            ec_rates_Q5[],                  /* I    Rates []                                    */
-    const oac_int              quant_step_size_Q16,            /* I    Quantization step size                      */
-    const oac_int16            inv_quant_step_size_Q6,         /* I    Inverse quantization step size              */
-    const oac_int32            mu_Q20,                         /* I    R/D tradeoff                                */
-    const oac_int16            order                           /* I    Number of input values                      */
-);
+    oac_int8 indices[],                                        /* O    Quantization indices [ order ]              */
+    const oac_int16 x_Q10[],                                   /* I    Input [ order ]                             */
+    const oac_int16 w_Q5[],                                    /* I    Weights [ order ]                           */
+    const oac_uint8 pred_coef_Q8[],                            /* I    Backward predictor coefs [ order ]          */
+    const oac_int16 ec_ix[],                                   /* I    Indices to entropy coding tables [ order ]  */
+    const oac_uint8 ec_rates_Q5[],                             /* I    Rates []                                    */
+    const oac_int quant_step_size_Q16,                         /* I    Quantization step size                      */
+    const oac_int16 inv_quant_step_size_Q6,                    /* I    Inverse quantization step size              */
+    const oac_int32 mu_Q20,                                    /* I    R/D tradeoff                                */
+    const oac_int16 order                                      /* I    Number of input values                      */
+    );
 
 /* Unpack predictor values and indices for entropy coding tables */
 void silk_NLSF_unpack(
-          oac_int16            ec_ix[],                        /* O    Indices to entropy tables [ LPC_ORDER ]     */
-          oac_uint8            pred_Q8[],                      /* O    LSF predictor [ LPC_ORDER ]                 */
+    oac_int16 ec_ix[],                                         /* O    Indices to entropy tables [ LPC_ORDER ]     */
+    oac_uint8 pred_Q8[],                                       /* O    LSF predictor [ LPC_ORDER ]                 */
     const silk_NLSF_CB_struct   *psNLSF_CB,                     /* I    Codebook object                             */
-    const oac_int              CB1_index                       /* I    Index of vector in first LSF codebook       */
-);
+    const oac_int CB1_index                                    /* I    Index of vector in first LSF codebook       */
+    );
 
 /***********************/
 /* NLSF vector decoder */
 /***********************/
 void silk_NLSF_decode(
-          oac_int16            *pNLSF_Q15,                     /* O    Quantized NLSF vector [ LPC_ORDER ]         */
-          oac_int8             *NLSFIndices,                   /* I    Codebook path vector [ LPC_ORDER + 1 ]      */
+    oac_int16            *pNLSF_Q15,                           /* O    Quantized NLSF vector [ LPC_ORDER ]         */
+    oac_int8             *NLSFIndices,                         /* I    Codebook path vector [ LPC_ORDER + 1 ]      */
     const silk_NLSF_CB_struct   *psNLSF_CB                      /* I    Codebook object                             */
-);
+    );
 
 /****************************************************/
 /* Decoder Functions                                */
 /****************************************************/
 oac_int silk_reset_decoder(
     silk_decoder_state          *psDec                          /* I/O  Decoder state pointer                       */
-);
+    );
 
 oac_int silk_init_decoder(
     silk_decoder_state          *psDec                          /* I/O  Decoder state pointer                       */
-);
+    );
 
 /* Set decoder sampling rate */
 oac_int silk_decoder_set_fs(
     silk_decoder_state          *psDec,                         /* I/O  Decoder state pointer                       */
-    oac_int                    fs_kHz,                         /* I    Sampling frequency (kHz)                    */
-    oac_int32                  fs_API_Hz                       /* I    API Sampling frequency (Hz)                 */
-);
+    oac_int fs_kHz,                                            /* I    Sampling frequency (kHz)                    */
+    oac_int32 fs_API_Hz                                        /* I    API Sampling frequency (Hz)                 */
+    );
 
 /****************/
 /* Decode frame */
 /****************/
 oac_int silk_decode_frame(
-    silk_decoder_state          *psDec,                         /* I/O  Pointer to Silk decoder state               */
-    ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
-    oac_int16                  pOut[],                         /* O    Pointer to output speech frame              */
-    oac_int32                  *pN,                            /* O    Pointer to size of output frame             */
-    oac_int                    lostFlag,                       /* I    0: no loss, 1 loss, 2 decode fec            */
-    oac_int                    condCoding,                     /* I    The type of conditional coding to use       */
+    silk_decoder_state*psDec,                                   /* I/O  Pointer to Silk decoder state               */
+    ec_dec*psRangeDec,                                          /* I/O  Compressor data structure                   */
+    oac_int16 pOut[],                                          /* O    Pointer to output speech frame              */
+    oac_int32*pN,                                              /* O    Pointer to size of output frame             */
+    oac_int lostFlag,                                          /* I    0: no loss, 1 loss, 2 decode fec            */
+    oac_int condCoding,                                        /* I    The type of conditional coding to use       */
 #ifdef ENABLE_DEEP_PLC
-    LPCNetPLCState              *lpcnet,
+    LPCNetPLCState*lpcnet,
 #endif
 #ifdef ENABLE_OSCE
-    OSCEModel                   *osce_model,
+    OSCEModel*osce_model,
 #endif
-    int                         arch                            /* I    Run-time architecture                       */
-);
+    int arch                                                    /* I    Run-time architecture                       */
+    );
 
 /* Decode indices from bitstream */
 void silk_decode_indices(
     silk_decoder_state          *psDec,                         /* I/O  State                                       */
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
-    oac_int                    FrameIndex,                     /* I    Frame number                                */
-    oac_int                    decode_LBRR,                    /* I    Flag indicating LBRR data is being decoded  */
-    oac_int                    condCoding                      /* I    The type of conditional coding to use       */
-);
+    oac_int FrameIndex,                                        /* I    Frame number                                */
+    oac_int decode_LBRR,                                       /* I    Flag indicating LBRR data is being decoded  */
+    oac_int condCoding                                         /* I    The type of conditional coding to use       */
+    );
 
 /* Decode parameters from payload */
 void silk_decode_parameters(
     silk_decoder_state          *psDec,                         /* I/O  State                                       */
     silk_decoder_control        *psDecCtrl,                     /* I/O  Decoder control                             */
-    oac_int                    condCoding                      /* I    The type of conditional coding to use       */
-);
+    oac_int condCoding                                         /* I    The type of conditional coding to use       */
+    );
 
 /* Core decoder. Performs inverse NSQ operation LTP + LPC */
 void silk_decode_core(
     silk_decoder_state          *psDec,                         /* I/O  Decoder state                               */
     silk_decoder_control        *psDecCtrl,                     /* I    Decoder control                             */
-    oac_int16                  xq[],                           /* O    Decoded speech                              */
-    const oac_int16            pulses[ MAX_FRAME_LENGTH ],     /* I    Pulse signal                                */
-    int                         arch                            /* I    Run-time architecture                       */
-);
+    oac_int16 xq[],                                            /* O    Decoded speech                              */
+    const oac_int16 pulses[ MAX_FRAME_LENGTH ],                /* I    Pulse signal                                */
+    int arch                                                    /* I    Run-time architecture                       */
+    );
 
 /* Decode quantization indices of excitation (Shell coding) */
 void silk_decode_pulses(
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
-    oac_int16                  pulses[],                       /* O    Excitation signal                           */
-    const oac_int              signalType,                     /* I    Sigtype                                     */
-    const oac_int              quantOffsetType,                /* I    quantOffsetType                             */
-    const oac_int              frame_length                    /* I    Frame length                                */
-);
+    oac_int16 pulses[],                                        /* O    Excitation signal                           */
+    const oac_int signalType,                                  /* I    Sigtype                                     */
+    const oac_int quantOffsetType,                             /* I    quantOffsetType                             */
+    const oac_int frame_length                                 /* I    Frame length                                */
+    );
 
 /******************/
 /* CNG */
@@ -464,23 +466,23 @@ void silk_decode_pulses(
 /* Reset CNG */
 void silk_CNG_Reset(
     silk_decoder_state          *psDec                          /* I/O  Decoder state                               */
-);
+    );
 
 /* Updates CNG estimate, and applies the CNG when packet was lost */
 void silk_CNG(
     silk_decoder_state          *psDec,                         /* I/O  Decoder state                               */
     silk_decoder_control        *psDecCtrl,                     /* I/O  Decoder control                             */
-    oac_int16                  frame[],                        /* I/O  Signal                                      */
-    oac_int                    length                          /* I    Length of residual                          */
-);
+    oac_int16 frame[],                                         /* I/O  Signal                                      */
+    oac_int length                                             /* I    Length of residual                          */
+    );
 
 /* Encoding of various parameters */
 void silk_encode_indices(
     silk_encoder_state          *psEncC,                        /* I/O  Encoder state                               */
     ec_enc                      *psRangeEnc,                    /* I/O  Compressor data structure                   */
-    oac_int                    FrameIndex,                     /* I    Frame number                                */
-    oac_int                    encode_LBRR,                    /* I    Flag indicating LBRR data is being encoded  */
-    oac_int                    condCoding                      /* I    The type of conditional coding to use       */
-);
+    oac_int FrameIndex,                                        /* I    Frame number                                */
+    oac_int encode_LBRR,                                       /* I    Flag indicating LBRR data is being encoded  */
+    oac_int condCoding                                         /* I    The type of conditional coding to use       */
+    );
 
 #endif
diff --git a/silk/mips/NSQ_mips.h b/silk/mips/NSQ_mips.h
index 9fb82bfad..f90b6b446 100644
--- a/silk/mips/NSQ_mips.h
+++ b/silk/mips/NSQ_mips.h
@@ -1,35 +1,35 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef NSQ_MIPS_H__
 #define NSQ_MIPS_H__
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -37,38 +37,38 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #if defined (__mips_dsp) && __mips == 32
 
-#define MIPS_MULT __builtin_mips_mult
-#define MIPS_MADD __builtin_mips_madd
-#define MIPS_EXTR_R __builtin_mips_extr_r_w
+# define MIPS_MULT __builtin_mips_mult
+# define MIPS_MADD __builtin_mips_madd
+# define MIPS_EXTR_R __builtin_mips_extr_r_w
 
-#define OVERRIDE_silk_noise_shape_quantizer_short_prediction
+# define OVERRIDE_silk_noise_shape_quantizer_short_prediction
 /* suddenly performance is worse */
-#define dont_OVERRIDE_silk_NSQ_noise_shape_feedback_loop
+# define dont_OVERRIDE_silk_NSQ_noise_shape_feedback_loop
 
 /* gets worst performance result */
 #elif defined(__mips_isa_rev) && __mips == 32
 
 static inline long long MIPS_MULT(int a, int b) {
-    return (long long)a * b;
+    return (long long)a*b;
 }
 
 static inline long long MIPS_MADD(long long acc, int a, int b) {
-    return acc + (long long)a * b;
+    return acc + (long long)a*b;
 }
 
 static inline oac_val32 MIPS_EXTR_R(long long acc, int shift) {
-    return (oac_val32)((acc + (1 << shift) / 2) >> shift);
+    return (oac_val32)((acc + (1<<shift)/2)>>shift);
 }
 
-#define OVERRIDE_silk_noise_shape_quantizer_short_prediction
-#define OVERRIDE_silk_NSQ_noise_shape_feedback_loop
+# define OVERRIDE_silk_noise_shape_quantizer_short_prediction
+# define OVERRIDE_silk_NSQ_noise_shape_feedback_loop
 
 #endif
 
 #if defined(OVERRIDE_silk_noise_shape_quantizer_short_prediction)
 
-static OAC_INLINE oac_int32 silk_noise_shape_quantizer_short_prediction_mips(const oac_int32 *buf32, const oac_int16 *coef16, oac_int order)
-{
+static OAC_INLINE oac_int32 silk_noise_shape_quantizer_short_prediction_mips(const oac_int32 *buf32,
+                                                                             const oac_int16 *coef16, oac_int order) {
     oac_int64 out;
     silk_assert( order == 10 || order == 16 );
 
@@ -83,8 +83,7 @@ static OAC_INLINE oac_int32 silk_noise_shape_quantizer_short_prediction_mips(con
     out = MIPS_MADD( out, buf32[ -8 ], coef16[ 8 ] );
     out = MIPS_MADD( out, buf32[ -9 ], coef16[ 9 ] );
 
-    if( order == 16 )
-    {
+    if (order == 16) {
         out = MIPS_MADD( out, buf32[ -10 ], coef16[ 10 ] );
         out = MIPS_MADD( out, buf32[ -11 ], coef16[ 11 ] );
         out = MIPS_MADD( out, buf32[ -12 ], coef16[ 12 ] );
@@ -95,16 +94,18 @@ static OAC_INLINE oac_int32 silk_noise_shape_quantizer_short_prediction_mips(con
     return MIPS_EXTR_R(out, 16);
 }
 
-#undef  silk_noise_shape_quantizer_short_prediction
-#define silk_noise_shape_quantizer_short_prediction(in, coef, coefRev, order, arch)  ((void)arch,silk_noise_shape_quantizer_short_prediction_mips(in, coef, order))
+# undef  silk_noise_shape_quantizer_short_prediction
+# define silk_noise_shape_quantizer_short_prediction(in, coef, coefRev, order, arch)  ((void)arch, \
+                                                                                       silk_noise_shape_quantizer_short_prediction_mips \
+                                                                                       (in, coef, order))
 
 #endif /* OVERRIDE_silk_noise_shape_quantizer_short_prediction */
 
 
 #if defined(OVERRIDE_silk_NSQ_noise_shape_feedback_loop)
 
-static OAC_INLINE oac_int32 silk_NSQ_noise_shape_feedback_loop_mips(const oac_int32 *data0, oac_int32 *data1, const oac_int16 *coef, oac_int order)
-{
+static OAC_INLINE oac_int32 silk_NSQ_noise_shape_feedback_loop_mips(const oac_int32 *data0, oac_int32 *data1,
+                                                                    const oac_int16 *coef, oac_int order) {
     oac_int32 out;
     oac_int32 tmp1, tmp2;
     oac_int j;
@@ -126,11 +127,13 @@ static OAC_INLINE oac_int32 silk_NSQ_noise_shape_feedback_loop_mips(const oac_in
     data1[order - 1] = tmp1;
     out = MIPS_MADD(out, tmp1, coef[order - 1]);
     /* silk_SMLAWB: shift right by 16  &&  Q11 -> Q12: shift left by 1 */
-    return MIPS_EXTR_R( out, (16 - 1) );
+    return MIPS_EXTR_R( out, (16 - 1));
 }
 
-#undef  silk_NSQ_noise_shape_feedback_loop
-#define silk_NSQ_noise_shape_feedback_loop(data0, data1, coef, order, arch)  ((void)arch,silk_NSQ_noise_shape_feedback_loop_mips(data0, data1, coef, order))
+# undef  silk_NSQ_noise_shape_feedback_loop
+# define silk_NSQ_noise_shape_feedback_loop(data0, data1, coef, order, arch)  ((void)arch, \
+                                                                               silk_NSQ_noise_shape_feedback_loop_mips( \
+    data0, data1, coef, order))
 
 #endif /* OVERRIDE_silk_NSQ_noise_shape_feedback_loop */
 
diff --git a/silk/mips/macros_mipsr1.h b/silk/mips/macros_mipsr1.h
index 94d366ec1..5365948a1 100644
--- a/silk/mips/macros_mipsr1.h
+++ b/silk/mips/macros_mipsr1.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 
@@ -32,9 +32,8 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #if defined (__mips_dsp) && __mips == 32
 
-#undef silk_SMULWB
-static inline int silk_SMULWB(int a, int b)
-{
+# undef silk_SMULWB
+static inline int silk_SMULWB(int a, int b) {
     long long ac;
     int c;
 
@@ -44,12 +43,11 @@ static inline int silk_SMULWB(int a, int b)
     return c;
 }
 
-#undef silk_SMLAWB
-#define silk_SMLAWB(a32, b32, c32)       ((a32) + silk_SMULWB(b32, c32))
+# undef silk_SMLAWB
+# define silk_SMLAWB(a32, b32, c32)       ((a32) + silk_SMULWB(b32, c32))
 
-#undef silk_SMULWW
-static inline int silk_SMULWW(int a, int b)
-{
+# undef silk_SMULWW
+static inline int silk_SMULWW(int a, int b) {
     long long ac;
     int c;
 
@@ -59,9 +57,8 @@ static inline int silk_SMULWW(int a, int b)
     return c;
 }
 
-#undef silk_SMLAWW
-static inline int silk_SMLAWW(int a, int b, int c)
-{
+# undef silk_SMLAWW
+static inline int silk_SMLAWW(int a, int b, int c) {
     long long ac;
     int res;
 
@@ -74,35 +71,31 @@ static inline int silk_SMLAWW(int a, int b, int c)
 
 #elif defined (__mips_isa_rev) && __mips == 32
 
-#undef silk_SMULWB
-static inline int silk_SMULWB(int a, int b)
-{
-    long long ac = (long long)a * (int)(b << 16);
+# undef silk_SMULWB
+static inline int silk_SMULWB(int a, int b) {
+    long long ac = (long long)a*(int)(b<<16);
 
-    return ac >> 32;
+    return ac>>32;
 }
 
 /* a32 + (b32 * (oac_int32)((oac_int16)(c32))) >> 16 output have to be 32bit int */
-#undef silk_SMLAWB
-static inline int silk_SMLAWB(int a, int b, int c)
-{
-    long long ac = (long long)b * (int)(c << 16);
+# undef silk_SMLAWB
+static inline int silk_SMLAWB(int a, int b, int c) {
+    long long ac = (long long)b*(int)(c<<16);
 
-    return a + (ac >> 32);
+    return a + (ac>>32);
 }
 
 #endif
 
 #if defined (__mips_isa_rev) /* MIPS32r1+ */
 
-static inline int mips_clz(oac_uint32 x)
-{
+static inline int mips_clz(oac_uint32 x) {
     return x ? __builtin_clz(x) : 32;
 }
 
-#define OVERRIDE_silk_CLZ16
-static inline oac_int32 silk_CLZ16(oac_int16 in16)
-{
+# define OVERRIDE_silk_CLZ16
+static inline oac_int32 silk_CLZ16(oac_int16 in16) {
     int re32;
     oac_uint32 in32 = (oac_uint16)in16;
     re32 = mips_clz(in32);
@@ -110,9 +103,8 @@ static inline oac_int32 silk_CLZ16(oac_int16 in16)
     return re32;
 }
 
-#define OVERRIDE_silk_CLZ32
-static inline oac_int32 silk_CLZ32(oac_int32 in32)
-{
+# define OVERRIDE_silk_CLZ32
+static inline oac_int32 silk_CLZ32(oac_int32 in32) {
     int re32;
     re32 = mips_clz(in32);
     return re32;
diff --git a/silk/mips/sigproc_fix_mipsr1.h b/silk/mips/sigproc_fix_mipsr1.h
index 51520c0a6..593df1086 100644
--- a/silk/mips/sigproc_fix_mipsr1.h
+++ b/silk/mips/sigproc_fix_mipsr1.h
@@ -1,36 +1,35 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_SIGPROC_FIX_MIPSR1_H
 #define SILK_SIGPROC_FIX_MIPSR1_H
 
 #undef silk_SAT16
-static inline short int silk_SAT16(int a)
-{
+static inline short int silk_SAT16(int a) {
     int c;
     c = __builtin_mips_shll_s_w(a, 16);
     c = c>>16;
@@ -39,8 +38,7 @@ static inline short int silk_SAT16(int a)
 }
 
 #undef silk_LSHIFT_SAT32
-static inline int silk_LSHIFT_SAT32(int a, int shift)
-{
+static inline int silk_LSHIFT_SAT32(int a, int shift) {
     int r;
 
     r = __builtin_mips_shll_s_w(a, shift);
@@ -49,8 +47,7 @@ static inline int silk_LSHIFT_SAT32(int a, int shift)
 }
 
 #undef silk_RSHIFT_ROUND
-static inline int silk_RSHIFT_ROUND(int a, int shift)
-{
+static inline int silk_RSHIFT_ROUND(int a, int shift) {
     int r;
 
     r = __builtin_mips_shra_r_w(a, shift);
diff --git a/silk/pitch_est_defines.h b/silk/pitch_est_defines.h
index 715991179..287fdd5ab 100644
--- a/silk/pitch_est_defines.h
+++ b/silk/pitch_est_defines.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_PE_DEFINES_H
@@ -39,17 +39,17 @@ POSSIBILITY OF SUCH DAMAGE.
 #define PE_MAX_NB_SUBFR             4
 #define PE_SUBFR_LENGTH_MS          5   /* 5 ms */
 
-#define PE_LTP_MEM_LENGTH_MS        ( 4 * PE_SUBFR_LENGTH_MS )
+#define PE_LTP_MEM_LENGTH_MS        (4*PE_SUBFR_LENGTH_MS)
 
-#define PE_MAX_FRAME_LENGTH_MS      ( PE_LTP_MEM_LENGTH_MS + PE_MAX_NB_SUBFR * PE_SUBFR_LENGTH_MS )
-#define PE_MAX_FRAME_LENGTH         ( PE_MAX_FRAME_LENGTH_MS * PE_MAX_FS_KHZ )
-#define PE_MAX_FRAME_LENGTH_ST_1    ( PE_MAX_FRAME_LENGTH >> 2 )
-#define PE_MAX_FRAME_LENGTH_ST_2    ( PE_MAX_FRAME_LENGTH >> 1 )
+#define PE_MAX_FRAME_LENGTH_MS      (PE_LTP_MEM_LENGTH_MS + PE_MAX_NB_SUBFR*PE_SUBFR_LENGTH_MS)
+#define PE_MAX_FRAME_LENGTH         (PE_MAX_FRAME_LENGTH_MS*PE_MAX_FS_KHZ)
+#define PE_MAX_FRAME_LENGTH_ST_1    (PE_MAX_FRAME_LENGTH>>2)
+#define PE_MAX_FRAME_LENGTH_ST_2    (PE_MAX_FRAME_LENGTH>>1)
 
 #define PE_MAX_LAG_MS               18           /* 18 ms -> 56 Hz */
 #define PE_MIN_LAG_MS               2            /* 2 ms -> 500 Hz */
-#define PE_MAX_LAG                  ( PE_MAX_LAG_MS * PE_MAX_FS_KHZ )
-#define PE_MIN_LAG                  ( PE_MIN_LAG_MS * PE_MAX_FS_KHZ )
+#define PE_MAX_LAG                  (PE_MAX_LAG_MS*PE_MAX_FS_KHZ)
+#define PE_MIN_LAG                  (PE_MIN_LAG_MS*PE_MAX_FS_KHZ)
 
 #define PE_D_SRCH_LENGTH            24
 
@@ -80,8 +80,8 @@ extern const oac_int8 silk_Lag_range_stage3[ SILK_PE_MAX_COMPLEX + 1 ] [ PE_MAX_
 extern const oac_int8 silk_nb_cbk_searchs_stage3[ SILK_PE_MAX_COMPLEX + 1 ];
 
 /* Tables for 10 ms frames */
-extern const oac_int8 silk_CB_lags_stage2_10_ms[ PE_MAX_NB_SUBFR >> 1][ 3 ];
-extern const oac_int8 silk_CB_lags_stage3_10_ms[ PE_MAX_NB_SUBFR >> 1 ][ 12 ];
-extern const oac_int8 silk_Lag_range_stage3_10_ms[ PE_MAX_NB_SUBFR >> 1 ][ 2 ];
+extern const oac_int8 silk_CB_lags_stage2_10_ms[ PE_MAX_NB_SUBFR>>1][ 3 ];
+extern const oac_int8 silk_CB_lags_stage3_10_ms[ PE_MAX_NB_SUBFR>>1 ][ 12 ];
+extern const oac_int8 silk_Lag_range_stage3_10_ms[ PE_MAX_NB_SUBFR>>1 ][ 2 ];
 
 #endif
diff --git a/silk/pitch_est_tables.c b/silk/pitch_est_tables.c
index 4804b8739..ef8578030 100644
--- a/silk/pitch_est_tables.c
+++ b/silk/pitch_est_tables.c
@@ -1,50 +1,50 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "typedef.h"
 #include "pitch_est_defines.h"
 
-const oac_int8 silk_CB_lags_stage2_10_ms[ PE_MAX_NB_SUBFR >> 1][ PE_NB_CBKS_STAGE2_10MS ] =
+const oac_int8 silk_CB_lags_stage2_10_ms[ PE_MAX_NB_SUBFR>>1][ PE_NB_CBKS_STAGE2_10MS ] =
 {
     {0, 1, 0},
     {0, 0, 1}
 };
 
-const oac_int8 silk_CB_lags_stage3_10_ms[ PE_MAX_NB_SUBFR >> 1 ][ PE_NB_CBKS_STAGE3_10MS ] =
+const oac_int8 silk_CB_lags_stage3_10_ms[ PE_MAX_NB_SUBFR>>1 ][ PE_NB_CBKS_STAGE3_10MS ] =
 {
-    { 0, 0, 1,-1, 1,-1, 2,-2, 2,-2, 3,-3},
-    { 0, 1, 0, 1,-1, 2,-1, 2,-2, 3,-2, 3}
+    { 0, 0, 1, -1, 1, -1, 2, -2, 2, -2, 3, -3},
+    { 0, 1, 0, 1, -1, 2, -1, 2, -2, 3, -2, 3}
 };
 
-const oac_int8 silk_Lag_range_stage3_10_ms[ PE_MAX_NB_SUBFR >> 1 ][ 2 ] =
+const oac_int8 silk_Lag_range_stage3_10_ms[ PE_MAX_NB_SUBFR>>1 ][ 2 ] =
 {
     {-3, 7},
     {-2, 7}
@@ -52,42 +52,43 @@ const oac_int8 silk_Lag_range_stage3_10_ms[ PE_MAX_NB_SUBFR >> 1 ][ 2 ] =
 
 const oac_int8 silk_CB_lags_stage2[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE2_EXT ] =
 {
-    {0, 2,-1,-1,-1, 0, 0, 1, 1, 0, 1},
+    {0, 2, -1, -1, -1, 0, 0, 1, 1, 0, 1},
     {0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0},
     {0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0},
-    {0,-1, 2, 1, 0, 1, 1, 0, 0,-1,-1}
+    {0, -1, 2, 1, 0, 1, 1, 0, 0, -1, -1}
 };
 
 const oac_int8 silk_CB_lags_stage3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ] =
 {
-    {0, 0, 1,-1, 0, 1,-1, 0,-1, 1,-2, 2,-2,-2, 2,-3, 2, 3,-3,-4, 3,-4, 4, 4,-5, 5,-6,-5, 6,-7, 6, 5, 8,-9},
-    {0, 0, 1, 0, 0, 0, 0, 0, 0, 0,-1, 1, 0, 0, 1,-1, 0, 1,-1,-1, 1,-1, 2, 1,-1, 2,-2,-2, 2,-2, 2, 2, 3,-3},
-    {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1,-1, 1, 0, 0, 2, 1,-1, 2,-1,-1, 2,-1, 2, 2,-1, 3,-2,-2,-2, 3},
-    {0, 1, 0, 0, 1, 0, 1,-1, 2,-1, 2,-1, 2, 3,-2, 3,-2,-2, 4, 4,-3, 5,-3,-4, 6,-4, 6, 5,-5, 8,-6,-5,-7, 9}
+    {0, 0, 1, -1, 0, 1, -1, 0, -1, 1, -2, 2, -2, -2, 2, -3, 2, 3, -3, -4, 3, -4, 4, 4, -5, 5, -6, -5, 6, -7, 6, 5, 8,
+     -9},
+    {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, -1, 1, 0, 0, 1, -1, 0, 1, -1, -1, 1, -1, 2, 1, -1, 2, -2, -2, 2, -2, 2, 2, 3, -3},
+    {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, -1, 1, 0, 0, 2, 1, -1, 2, -1, -1, 2, -1, 2, 2, -1, 3, -2, -2, -2, 3},
+    {0, 1, 0, 0, 1, 0, 1, -1, 2, -1, 2, -1, 2, 3, -2, 3, -2, -2, 4, 4, -3, 5, -3, -4, 6, -4, 6, 5, -5, 8, -6, -5, -7, 9}
 };
 
 const oac_int8 silk_Lag_range_stage3[ SILK_PE_MAX_COMPLEX + 1 ] [ PE_MAX_NB_SUBFR ][ 2 ] =
 {
     /* Lags to search for low number of stage3 cbks */
     {
-        {-5,8},
-        {-1,6},
-        {-1,6},
-        {-4,10}
+        {-5, 8},
+        {-1, 6},
+        {-1, 6},
+        {-4, 10}
     },
     /* Lags to search for middle number of stage3 cbks */
     {
-        {-6,10},
-        {-2,6},
-        {-1,6},
-        {-5,10}
+        {-6, 10},
+        {-2, 6},
+        {-1, 6},
+        {-5, 10}
     },
     /* Lags to search for max number of stage3 cbks */
     {
-        {-9,12},
-        {-3,7},
-        {-2,7},
-        {-7,13}
+        {-9, 12},
+        {-3, 7},
+        {-2, 7},
+        {-7, 13}
     }
 };
 
diff --git a/silk/process_NLSFs.c b/silk/process_NLSFs.c
index 4fffd94d2..b2b0d1deb 100644
--- a/silk/process_NLSFs.c
+++ b/silk/process_NLSFs.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -34,41 +34,40 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Limit, stabilize, convert and quantize NLSFs */
 void silk_process_NLSFs(
     silk_encoder_state          *psEncC,                            /* I/O  Encoder state                               */
-    oac_int16                  PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ], /* O    Prediction coefficients                     */
-    oac_int16                  pNLSF_Q15[         MAX_LPC_ORDER ], /* I/O  Normalized LSFs (quant out) (0 - (2^15-1))  */
-    const oac_int16            prev_NLSFq_Q15[    MAX_LPC_ORDER ]  /* I    Previous Normalized LSFs (0 - (2^15-1))     */
-)
-{
-    oac_int     i, doInterpolate;
-    oac_int     NLSF_mu_Q20;
-    oac_int16   i_sqr_Q15;
-    oac_int16   pNLSF0_temp_Q15[ MAX_LPC_ORDER ];
-    oac_int16   pNLSFW_QW[ MAX_LPC_ORDER ];
-    oac_int16   pNLSFW0_temp_QW[ MAX_LPC_ORDER ];
+    oac_int16 PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ],                  /* O    Prediction coefficients                     */
+    oac_int16 pNLSF_Q15[         MAX_LPC_ORDER ],                  /* I/O  Normalized LSFs (quant out) (0 - (2^15-1))  */
+    const oac_int16 prev_NLSFq_Q15[    MAX_LPC_ORDER ]             /* I    Previous Normalized LSFs (0 - (2^15-1))     */
+    ) {
+    oac_int i, doInterpolate;
+    oac_int NLSF_mu_Q20;
+    oac_int16 i_sqr_Q15;
+    oac_int16 pNLSF0_temp_Q15[ MAX_LPC_ORDER ];
+    oac_int16 pNLSFW_QW[ MAX_LPC_ORDER ];
+    oac_int16 pNLSFW0_temp_QW[ MAX_LPC_ORDER ];
 
     silk_assert( psEncC->speech_activity_Q8 >=   0 );
-    silk_assert( psEncC->speech_activity_Q8 <= SILK_FIX_CONST( 1.0, 8 ) );
-    celt_assert( psEncC->useInterpolatedNLSFs == 1 || psEncC->indices.NLSFInterpCoef_Q2 == ( 1 << 2 ) );
+    silk_assert( psEncC->speech_activity_Q8 <= SILK_FIX_CONST( 1.0, 8 ));
+    celt_assert( psEncC->useInterpolatedNLSFs == 1 || psEncC->indices.NLSFInterpCoef_Q2 == (1<<2));
 
     /***********************/
     /* Calculate mu values */
     /***********************/
     /* NLSF_mu  = 0.003 - 0.0015 * psEnc->speech_activity; */
     NLSF_mu_Q20 = silk_SMLAWB( SILK_FIX_CONST( 0.003, 20 ), SILK_FIX_CONST( -0.001, 28 ), psEncC->speech_activity_Q8 );
-    if( psEncC->nb_subfr == 2 ) {
+    if (psEncC->nb_subfr == 2) {
         /* Multiply by 1.5 for 10 ms packets */
         NLSF_mu_Q20 = silk_ADD_RSHIFT( NLSF_mu_Q20, NLSF_mu_Q20, 1 );
     }
 
     celt_assert( NLSF_mu_Q20 >  0 );
-    silk_assert( NLSF_mu_Q20 <= SILK_FIX_CONST( 0.005, 20 ) );
+    silk_assert( NLSF_mu_Q20 <= SILK_FIX_CONST( 0.005, 20 ));
 
     /* Calculate NLSF weights */
     silk_NLSF_VQ_weights_laroia( pNLSFW_QW, pNLSF_Q15, psEncC->predictLPCOrder );
 
     /* Update NLSF weights for interpolated NLSFs */
-    doInterpolate = ( psEncC->useInterpolatedNLSFs == 1 ) && ( psEncC->indices.NLSFInterpCoef_Q2 < 4 );
-    if( doInterpolate ) {
+    doInterpolate = (psEncC->useInterpolatedNLSFs == 1) && (psEncC->indices.NLSFInterpCoef_Q2 < 4);
+    if (doInterpolate) {
         /* Calculate the interpolated NLSF vector for the first half */
         silk_interpolate( pNLSF0_temp_Q15, prev_NLSFq_Q15, pNLSF_Q15,
             psEncC->indices.NLSFInterpCoef_Q2, psEncC->predictLPCOrder );
@@ -77,10 +76,11 @@ void silk_process_NLSFs(
         silk_NLSF_VQ_weights_laroia( pNLSFW0_temp_QW, pNLSF0_temp_Q15, psEncC->predictLPCOrder );
 
         /* Update NLSF weights with contribution from first half */
-        i_sqr_Q15 = silk_LSHIFT( silk_SMULBB( psEncC->indices.NLSFInterpCoef_Q2, psEncC->indices.NLSFInterpCoef_Q2 ), 11 );
-        for( i = 0; i < psEncC->predictLPCOrder; i++ ) {
+        i_sqr_Q15 = silk_LSHIFT( silk_SMULBB( psEncC->indices.NLSFInterpCoef_Q2, psEncC->indices.NLSFInterpCoef_Q2 ),
+        11 );
+        for (i = 0; i < psEncC->predictLPCOrder; i++) {
             pNLSFW_QW[ i ] = silk_ADD16( silk_RSHIFT( pNLSFW_QW[ i ], 1 ), silk_RSHIFT(
-                  silk_SMULBB( pNLSFW0_temp_QW[ i ], i_sqr_Q15 ), 16) );
+                  silk_SMULBB( pNLSFW0_temp_QW[ i ], i_sqr_Q15 ), 16));
             silk_assert( pNLSFW_QW[ i ] >= 1 );
         }
     }
@@ -91,7 +91,7 @@ void silk_process_NLSFs(
     /* Convert quantized NLSFs back to LPC coefficients */
     silk_NLSF2A( PredCoef_Q12[ 1 ], pNLSF_Q15, psEncC->predictLPCOrder, psEncC->arch );
 
-    if( doInterpolate ) {
+    if (doInterpolate) {
         /* Calculate the interpolated, quantized LSF vector for the first half */
         silk_interpolate( pNLSF0_temp_Q15, prev_NLSFq_Q15, pNLSF_Q15,
             psEncC->indices.NLSFInterpCoef_Q2, psEncC->predictLPCOrder );
@@ -102,6 +102,6 @@ void silk_process_NLSFs(
     } else {
         /* Copy LPC coefficients for first half from second half */
         celt_assert( psEncC->predictLPCOrder <= MAX_LPC_ORDER );
-        silk_memcpy( PredCoef_Q12[ 0 ], PredCoef_Q12[ 1 ], psEncC->predictLPCOrder * sizeof( oac_int16 ) );
+        silk_memcpy( PredCoef_Q12[ 0 ], PredCoef_Q12[ 1 ], psEncC->predictLPCOrder*sizeof(oac_int16));
     }
 }
diff --git a/silk/quant_LTP_gains.c b/silk/quant_LTP_gains.c
index ad74eb2c8..d0fb73420 100644
--- a/silk/quant_LTP_gains.c
+++ b/silk/quant_LTP_gains.c
@@ -1,59 +1,58 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
 #include "tuning_parameters.h"
 
 void silk_quant_LTP_gains(
-    oac_int16                  B_Q14[ MAX_NB_SUBFR * LTP_ORDER ],          /* O    Quantized LTP gains             */
-    oac_int8                   cbk_index[ MAX_NB_SUBFR ],                  /* O    Codebook Index                  */
+    oac_int16 B_Q14[ MAX_NB_SUBFR*LTP_ORDER ],                             /* O    Quantized LTP gains             */
+    oac_int8 cbk_index[ MAX_NB_SUBFR ],                                    /* O    Codebook Index                  */
     oac_int8                   *periodicity_index,                         /* O    Periodicity Index               */
     oac_int32                  *sum_log_gain_Q7,                           /* I/O  Cumulative max prediction gain  */
     oac_int                    *pred_gain_dB_Q7,                           /* O    LTP prediction gain             */
-    const oac_int32            XX_Q17[ MAX_NB_SUBFR*LTP_ORDER*LTP_ORDER ], /* I    Correlation matrix in Q18       */
-    const oac_int32            xX_Q17[ MAX_NB_SUBFR*LTP_ORDER ],           /* I    Correlation vector in Q18       */
-    const oac_int              subfr_len,                                  /* I    Number of samples per subframe  */
-    const oac_int              nb_subfr,                                   /* I    Number of subframes             */
-    int                         arch                                        /* I    Run-time architecture           */
-)
-{
-    oac_int             j, k, cbk_size;
-    oac_int8            temp_idx[ MAX_NB_SUBFR ];
+    const oac_int32 XX_Q17[ MAX_NB_SUBFR*LTP_ORDER*LTP_ORDER ],            /* I    Correlation matrix in Q18       */
+    const oac_int32 xX_Q17[ MAX_NB_SUBFR*LTP_ORDER ],                      /* I    Correlation vector in Q18       */
+    const oac_int subfr_len,                                               /* I    Number of samples per subframe  */
+    const oac_int nb_subfr,                                                /* I    Number of subframes             */
+    int arch                                                                /* I    Run-time architecture           */
+    ) {
+    oac_int j, k, cbk_size;
+    oac_int8 temp_idx[ MAX_NB_SUBFR ];
     const oac_uint8     *cl_ptr_Q5;
     const oac_int8      *cbk_ptr_Q7;
     const oac_uint8     *cbk_gain_ptr_Q7;
     const oac_int32     *XX_Q17_ptr, *xX_Q17_ptr;
-    oac_int32           res_nrg_Q15_subfr, res_nrg_Q15, rate_dist_Q7_subfr, rate_dist_Q7, min_rate_dist_Q7;
-    oac_int32           sum_log_gain_tmp_Q7, best_sum_log_gain_Q7, max_gain_Q7;
-    oac_int             gain_Q7;
+    oac_int32 res_nrg_Q15_subfr, res_nrg_Q15, rate_dist_Q7_subfr, rate_dist_Q7, min_rate_dist_Q7;
+    oac_int32 sum_log_gain_tmp_Q7, best_sum_log_gain_Q7, max_gain_Q7;
+    oac_int gain_Q7;
 
     /***************************************************/
     /* iterate over different codebooks with different */
@@ -61,7 +60,7 @@ void silk_quant_LTP_gains(
     /***************************************************/
     min_rate_dist_Q7 = silk_int32_MAX;
     best_sum_log_gain_Q7 = 0;
-    for( k = 0; k < 3; k++ ) {
+    for (k = 0; k < 3; k++) {
         /* Safety margin for pitch gain control, to take into account factors
            such as state rescaling/rewhitening. */
         oac_int32 gain_safety = SILK_FIX_CONST( 0.4, 7 );
@@ -78,9 +77,9 @@ void silk_quant_LTP_gains(
         res_nrg_Q15 = 0;
         rate_dist_Q7 = 0;
         sum_log_gain_tmp_Q7 = *sum_log_gain_Q7;
-        for( j = 0; j < nb_subfr; j++ ) {
-            max_gain_Q7 = silk_log2lin( ( SILK_FIX_CONST( MAX_SUM_LOG_GAIN_DB / 6.0, 7 ) - sum_log_gain_tmp_Q7 )
-                                        + SILK_FIX_CONST( 7, 7 ) ) - gain_safety;
+        for (j = 0; j < nb_subfr; j++) {
+            max_gain_Q7 = silk_log2lin((SILK_FIX_CONST( MAX_SUM_LOG_GAIN_DB/6.0, 7 ) - sum_log_gain_tmp_Q7)
+                + SILK_FIX_CONST( 7, 7 )) - gain_safety;
             silk_VQ_WMat_EC(
                 &temp_idx[ j ],         /* O    index of best codebook vector                           */
                 &res_nrg_Q15_subfr,     /* O    residual energy                                         */
@@ -95,38 +94,38 @@ void silk_quant_LTP_gains(
                 max_gain_Q7,            /* I    maximum sum of absolute LTP coefficients                */
                 cbk_size,               /* I    number of vectors in codebook                           */
                 arch                    /* I    Run-time architecture                                   */
-            );
+                );
 
             res_nrg_Q15  = silk_ADD_POS_SAT32( res_nrg_Q15, res_nrg_Q15_subfr );
             rate_dist_Q7 = silk_ADD_POS_SAT32( rate_dist_Q7, rate_dist_Q7_subfr );
             sum_log_gain_tmp_Q7 = silk_max(0, sum_log_gain_tmp_Q7
-                                + silk_lin2log( gain_safety + gain_Q7 ) - SILK_FIX_CONST( 7, 7 ));
+                + silk_lin2log( gain_safety + gain_Q7 ) - SILK_FIX_CONST( 7, 7 ));
 
-            XX_Q17_ptr += LTP_ORDER * LTP_ORDER;
+            XX_Q17_ptr += LTP_ORDER*LTP_ORDER;
             xX_Q17_ptr += LTP_ORDER;
         }
 
-        if( rate_dist_Q7 <= min_rate_dist_Q7 ) {
+        if (rate_dist_Q7 <= min_rate_dist_Q7) {
             min_rate_dist_Q7 = rate_dist_Q7;
             *periodicity_index = (oac_int8)k;
-            silk_memcpy( cbk_index, temp_idx, nb_subfr * sizeof( oac_int8 ) );
+            silk_memcpy( cbk_index, temp_idx, nb_subfr*sizeof(oac_int8));
             best_sum_log_gain_Q7 = sum_log_gain_tmp_Q7;
         }
     }
 
     cbk_ptr_Q7 = silk_LTP_vq_ptrs_Q7[ *periodicity_index ];
-    for( j = 0; j < nb_subfr; j++ ) {
-        for( k = 0; k < LTP_ORDER; k++ ) {
-            B_Q14[ j * LTP_ORDER + k ] = silk_LSHIFT( cbk_ptr_Q7[ cbk_index[ j ] * LTP_ORDER + k ], 7 );
+    for (j = 0; j < nb_subfr; j++) {
+        for (k = 0; k < LTP_ORDER; k++) {
+            B_Q14[ j*LTP_ORDER + k ] = silk_LSHIFT( cbk_ptr_Q7[ cbk_index[ j ]*LTP_ORDER + k ], 7 );
         }
     }
 
-    if( nb_subfr == 2 ) {
+    if (nb_subfr == 2) {
         res_nrg_Q15 = silk_RSHIFT32( res_nrg_Q15, 1 );
     } else {
         res_nrg_Q15 = silk_RSHIFT32( res_nrg_Q15, 2 );
     }
 
     *sum_log_gain_Q7 = best_sum_log_gain_Q7;
-    *pred_gain_dB_Q7 = (oac_int)silk_SMULBB( -3, silk_lin2log( res_nrg_Q15 ) - ( 15 << 7 ) );
+    *pred_gain_dB_Q7 = (oac_int)silk_SMULBB( -3, silk_lin2log( res_nrg_Q15 ) - (15<<7));
 }
diff --git a/silk/resampler.c b/silk/resampler.c
index 2e16d9eb2..b7d86183e 100644
--- a/silk/resampler.c
+++ b/silk/resampler.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 /*
@@ -68,7 +68,7 @@ static const oac_int8 delay_matrix_dec[ 3 ][ 6 ] = {
 };
 
 /* Simple way to make [8000, 12000, 16000, 24000, 48000] to [0, 1, 2, 3, 4] */
-#define rateID(R) IMIN(5, ( ( ( ((R)>>12) - ((R)>16000) ) >> ((R)>24000) ) - 1 ))
+#define rateID(R) IMIN(5, (((((R)>>12) - ((R) > 16000))>>((R) > 24000)) - 1))
 
 #define USE_silk_resampler_copy                     (0)
 #define USE_silk_resampler_private_up2_HQ_wrapper   (1)
@@ -78,35 +78,35 @@ static const oac_int8 delay_matrix_dec[ 3 ][ 6 ] = {
 /* Initialize/reset the resampler state for a given pair of input/output sampling rates */
 oac_int silk_resampler_init(
     silk_resampler_state_struct *S,                 /* I/O  Resampler state                                             */
-    oac_int32                  Fs_Hz_in,           /* I    Input sampling rate (Hz)                                    */
-    oac_int32                  Fs_Hz_out,          /* I    Output sampling rate (Hz)                                   */
-    oac_int                    forEnc              /* I    If 1: encoder; if 0: decoder                                */
-)
-{
+    oac_int32 Fs_Hz_in,                            /* I    Input sampling rate (Hz)                                    */
+    oac_int32 Fs_Hz_out,                           /* I    Output sampling rate (Hz)                                   */
+    oac_int forEnc                                 /* I    If 1: encoder; if 0: decoder                                */
+    ) {
     oac_int up2x;
 
     /* Clear state */
-    silk_memset( S, 0, sizeof( silk_resampler_state_struct ) );
+    silk_memset( S, 0, sizeof(silk_resampler_state_struct));
 
     /* Input checking */
-    if( forEnc ) {
-        if( ( Fs_Hz_in  != 8000 && Fs_Hz_in  != 12000 && Fs_Hz_in  != 16000 && Fs_Hz_in  != 24000 && Fs_Hz_in  != 48000
+    if (forEnc) {
+        if ((Fs_Hz_in  != 8000 && Fs_Hz_in  != 12000 && Fs_Hz_in  != 16000 && Fs_Hz_in  != 24000 && Fs_Hz_in  != 48000
 #ifdef ENABLE_QEXT
-                  && Fs_Hz_in != 96000
+             && Fs_Hz_in != 96000
 #endif
-              ) ||
-            ( Fs_Hz_out != 8000 && Fs_Hz_out != 12000 && Fs_Hz_out != 16000 ) ) {
+             )
+            || (Fs_Hz_out != 8000 && Fs_Hz_out != 12000 && Fs_Hz_out != 16000)) {
             celt_assert( 0 );
             return -1;
         }
         S->inputDelay = delay_matrix_enc[ rateID( Fs_Hz_in ) ][ rateID( Fs_Hz_out ) ];
     } else {
-        if( ( Fs_Hz_in  != 8000 && Fs_Hz_in  != 12000 && Fs_Hz_in  != 16000 ) ||
-            ( Fs_Hz_out != 8000 && Fs_Hz_out != 12000 && Fs_Hz_out != 16000 && Fs_Hz_out != 24000 && Fs_Hz_out != 48000
+        if ((Fs_Hz_in  != 8000 && Fs_Hz_in  != 12000 && Fs_Hz_in  != 16000)
+            || (Fs_Hz_out != 8000 && Fs_Hz_out != 12000 && Fs_Hz_out != 16000 && Fs_Hz_out != 24000
+                && Fs_Hz_out != 48000
 #ifdef ENABLE_QEXT
-                  && Fs_Hz_out != 96000
+                && Fs_Hz_out != 96000
 #endif
-                  ) ) {
+                )) {
             celt_assert( 0 );
             return -1;
         }
@@ -117,13 +117,13 @@ oac_int silk_resampler_init(
     S->Fs_out_kHz = silk_DIV32_16( Fs_Hz_out, 1000 );
 
     /* Number of samples processed per batch */
-    S->batchSize = S->Fs_in_kHz * RESAMPLER_MAX_BATCH_SIZE_MS;
+    S->batchSize = S->Fs_in_kHz*RESAMPLER_MAX_BATCH_SIZE_MS;
 
     /* Find resampler with the right sampling ratio */
     up2x = 0;
-    if( Fs_Hz_out > Fs_Hz_in ) {
+    if (Fs_Hz_out > Fs_Hz_in) {
         /* Upsample */
-        if( Fs_Hz_out == silk_MUL( Fs_Hz_in, 2 ) ) {                            /* Fs_out : Fs_in = 2 : 1 */
+        if (Fs_Hz_out == silk_MUL( Fs_Hz_in, 2 )) {                             /* Fs_out : Fs_in = 2 : 1 */
             /* Special case: directly use 2x upsampler */
             S->resampler_function = USE_silk_resampler_private_up2_HQ_wrapper;
         } else {
@@ -131,30 +131,30 @@ oac_int silk_resampler_init(
             S->resampler_function = USE_silk_resampler_private_IIR_FIR;
             up2x = 1;
         }
-    } else if ( Fs_Hz_out < Fs_Hz_in ) {
+    } else if (Fs_Hz_out < Fs_Hz_in) {
         /* Downsample */
-         S->resampler_function = USE_silk_resampler_private_down_FIR;
-        if( silk_MUL( Fs_Hz_out, 4 ) == silk_MUL( Fs_Hz_in, 3 ) ) {             /* Fs_out : Fs_in = 3 : 4 */
+        S->resampler_function = USE_silk_resampler_private_down_FIR;
+        if (silk_MUL( Fs_Hz_out, 4 ) == silk_MUL( Fs_Hz_in, 3 )) {              /* Fs_out : Fs_in = 3 : 4 */
             S->FIR_Fracs = 3;
             S->FIR_Order = RESAMPLER_DOWN_ORDER_FIR0;
             S->Coefs = silk_Resampler_3_4_COEFS;
-        } else if( silk_MUL( Fs_Hz_out, 3 ) == silk_MUL( Fs_Hz_in, 2 ) ) {      /* Fs_out : Fs_in = 2 : 3 */
+        } else if (silk_MUL( Fs_Hz_out, 3 ) == silk_MUL( Fs_Hz_in, 2 )) {       /* Fs_out : Fs_in = 2 : 3 */
             S->FIR_Fracs = 2;
             S->FIR_Order = RESAMPLER_DOWN_ORDER_FIR0;
             S->Coefs = silk_Resampler_2_3_COEFS;
-        } else if( silk_MUL( Fs_Hz_out, 2 ) == Fs_Hz_in ) {                     /* Fs_out : Fs_in = 1 : 2 */
+        } else if (silk_MUL( Fs_Hz_out, 2 ) == Fs_Hz_in) {                      /* Fs_out : Fs_in = 1 : 2 */
             S->FIR_Fracs = 1;
             S->FIR_Order = RESAMPLER_DOWN_ORDER_FIR1;
             S->Coefs = silk_Resampler_1_2_COEFS;
-        } else if( silk_MUL( Fs_Hz_out, 3 ) == Fs_Hz_in ) {                     /* Fs_out : Fs_in = 1 : 3 */
+        } else if (silk_MUL( Fs_Hz_out, 3 ) == Fs_Hz_in) {                      /* Fs_out : Fs_in = 1 : 3 */
             S->FIR_Fracs = 1;
             S->FIR_Order = RESAMPLER_DOWN_ORDER_FIR2;
             S->Coefs = silk_Resampler_1_3_COEFS;
-        } else if( silk_MUL( Fs_Hz_out, 4 ) == Fs_Hz_in ) {                     /* Fs_out : Fs_in = 1 : 4 */
+        } else if (silk_MUL( Fs_Hz_out, 4 ) == Fs_Hz_in) {                      /* Fs_out : Fs_in = 1 : 4 */
             S->FIR_Fracs = 1;
             S->FIR_Order = RESAMPLER_DOWN_ORDER_FIR2;
             S->Coefs = silk_Resampler_1_4_COEFS;
-        } else if( silk_MUL( Fs_Hz_out, 6 ) == Fs_Hz_in ) {                     /* Fs_out : Fs_in = 1 : 6 */
+        } else if (silk_MUL( Fs_Hz_out, 6 ) == Fs_Hz_in) {                      /* Fs_out : Fs_in = 1 : 6 */
             S->FIR_Fracs = 1;
             S->FIR_Order = RESAMPLER_DOWN_ORDER_FIR2;
             S->Coefs = silk_Resampler_1_6_COEFS;
@@ -171,7 +171,7 @@ oac_int silk_resampler_init(
     /* Ratio of input/output samples */
     S->invRatio_Q16 = silk_LSHIFT32( silk_DIV32( silk_LSHIFT32( Fs_Hz_in, 14 + up2x ), Fs_Hz_out ), 2 );
     /* Make sure the ratio is rounded up */
-    while( silk_SMULWW( S->invRatio_Q16, Fs_Hz_out ) < silk_LSHIFT32( Fs_Hz_in, up2x ) ) {
+    while (silk_SMULWW( S->invRatio_Q16, Fs_Hz_out ) < silk_LSHIFT32( Fs_Hz_in, up2x )) {
         S->invRatio_Q16++;
     }
 
@@ -182,11 +182,10 @@ oac_int silk_resampler_init(
 /* Input and output sampling rate are at most 48000 Hz  */
 oac_int silk_resampler(
     silk_resampler_state_struct *S,                 /* I/O  Resampler state                                             */
-    oac_int16                  out[],              /* O    Output signal                                               */
-    const oac_int16            in[],               /* I    Input signal                                                */
-    oac_int32                  inLen               /* I    Number of input samples                                     */
-)
-{
+    oac_int16 out[],                               /* O    Output signal                                               */
+    const oac_int16 in[],                          /* I    Input signal                                                */
+    oac_int32 inLen                                /* I    Number of input samples                                     */
+    ) {
     oac_int nSamples;
 
     /* Need at least 1 ms of input data */
@@ -197,9 +196,9 @@ oac_int silk_resampler(
     nSamples = S->Fs_in_kHz - S->inputDelay;
 
     /* Copy to delay buffer */
-    silk_memcpy( &S->delayBuf[ S->inputDelay ], in, nSamples * sizeof( oac_int16 ) );
+    silk_memcpy( &S->delayBuf[ S->inputDelay ], in, nSamples*sizeof(oac_int16));
 
-    switch( S->resampler_function ) {
+    switch (S->resampler_function) {
         case USE_silk_resampler_private_up2_HQ_wrapper:
             silk_resampler_private_up2_HQ_wrapper( S, out, S->delayBuf, S->Fs_in_kHz );
             silk_resampler_private_up2_HQ_wrapper( S, &out[ S->Fs_out_kHz ], &in[ nSamples ], inLen - S->Fs_in_kHz );
@@ -213,12 +212,12 @@ oac_int silk_resampler(
             silk_resampler_private_down_FIR( S, &out[ S->Fs_out_kHz ], &in[ nSamples ], inLen - S->Fs_in_kHz );
             break;
         default:
-            silk_memcpy( out, S->delayBuf, S->Fs_in_kHz * sizeof( oac_int16 ) );
-            silk_memcpy( &out[ S->Fs_out_kHz ], &in[ nSamples ], ( inLen - S->Fs_in_kHz ) * sizeof( oac_int16 ) );
+            silk_memcpy( out, S->delayBuf, S->Fs_in_kHz*sizeof(oac_int16));
+            silk_memcpy( &out[ S->Fs_out_kHz ], &in[ nSamples ], (inLen - S->Fs_in_kHz)*sizeof(oac_int16));
     }
 
     /* Copy to delay buffer */
-    silk_memcpy( S->delayBuf, &in[ inLen - S->inputDelay ], S->inputDelay * sizeof( oac_int16 ) );
+    silk_memcpy( S->delayBuf, &in[ inLen - S->inputDelay ], S->inputDelay*sizeof(oac_int16));
 
     return 0;
 }
diff --git a/silk/resampler_down2.c b/silk/resampler_down2.c
index d1e64791a..41c22d3af 100644
--- a/silk/resampler_down2.c
+++ b/silk/resampler_down2.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -37,9 +37,8 @@ void silk_resampler_down2(
     oac_int32                  *S,                 /* I/O  State vector [ 2 ]                                          */
     oac_int16                  *out,               /* O    Output signal [ floor(len/2) ]                              */
     const oac_int16            *in,                /* I    Input signal [ len ]                                        */
-    oac_int32                  inLen               /* I    Number of input samples                                     */
-)
-{
+    oac_int32 inLen                                /* I    Number of input samples                                     */
+    ) {
     oac_int32 k, len2 = silk_RSHIFT32( inLen, 1 );
     oac_int32 in32, out32, Y, X;
 
@@ -47,9 +46,9 @@ void silk_resampler_down2(
     celt_assert( silk_resampler_down2_1 < 0 );
 
     /* Internal variables and state are in Q10 format */
-    for( k = 0; k < len2; k++ ) {
+    for (k = 0; k < len2; k++) {
         /* Convert to Q10 */
-        in32 = silk_LSHIFT( (oac_int32)in[ 2 * k ], 10 );
+        in32 = silk_LSHIFT((oac_int32)in[ 2*k ], 10 );
 
         /* All-pass section for even input sample */
         Y      = silk_SUB32( in32, S[ 0 ] );
@@ -58,7 +57,7 @@ void silk_resampler_down2(
         S[ 0 ] = silk_ADD32( in32, X );
 
         /* Convert to Q10 */
-        in32 = silk_LSHIFT( (oac_int32)in[ 2 * k + 1 ], 10 );
+        in32 = silk_LSHIFT((oac_int32)in[ 2*k + 1 ], 10 );
 
         /* All-pass section for odd input sample, and add to output of previous section */
         Y      = silk_SUB32( in32, S[ 1 ] );
@@ -68,6 +67,6 @@ void silk_resampler_down2(
         S[ 1 ] = silk_ADD32( in32, X );
 
         /* Add, convert back to int16 and store to output */
-        out[ k ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( out32, 11 ) );
+        out[ k ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( out32, 11 ));
     }
 }
diff --git a/silk/resampler_down2_3.c b/silk/resampler_down2_3.c
index 453c739a8..e9747c46b 100644
--- a/silk/resampler_down2_3.c
+++ b/silk/resampler_down2_3.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -40,9 +40,8 @@ void silk_resampler_down2_3(
     oac_int32                  *S,                 /* I/O  State vector [ 6 ]                                          */
     oac_int16                  *out,               /* O    Output signal [ floor(2*inLen/3) ]                          */
     const oac_int16            *in,                /* I    Input signal [ inLen ]                                      */
-    oac_int32                  inLen               /* I    Number of input samples                                     */
-)
-{
+    oac_int32 inLen                                /* I    Number of input samples                                     */
+    ) {
     oac_int32 nSamplesIn, counter, res_Q6;
     VARDECL( oac_int32, buf );
     oac_int32 *buf_ptr;
@@ -51,10 +50,10 @@ void silk_resampler_down2_3(
     ALLOC( buf, RESAMPLER_MAX_BATCH_SIZE_IN + ORDER_FIR, oac_int32 );
 
     /* Copy buffered samples to start of buffer */
-    silk_memcpy( buf, S, ORDER_FIR * sizeof( oac_int32 ) );
+    silk_memcpy( buf, S, ORDER_FIR*sizeof(oac_int32));
 
     /* Iterate over blocks of frameSizeIn input samples */
-    while( 1 ) {
+    while (1) {
         nSamplesIn = silk_min( inLen, RESAMPLER_MAX_BATCH_SIZE_IN );
 
         /* Second-order AR filter (output in Q8) */
@@ -64,7 +63,7 @@ void silk_resampler_down2_3(
         /* Interpolate filtered signal */
         buf_ptr = buf;
         counter = nSamplesIn;
-        while( counter > 2 ) {
+        while (counter > 2) {
             /* Inner product */
             res_Q6 = silk_SMULWB(         buf_ptr[ 0 ], silk_Resampler_2_3_COEFS_LQ[ 2 ] );
             res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 1 ], silk_Resampler_2_3_COEFS_LQ[ 3 ] );
@@ -72,7 +71,7 @@ void silk_resampler_down2_3(
             res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 3 ], silk_Resampler_2_3_COEFS_LQ[ 4 ] );
 
             /* Scale down, saturate and store in output array */
-            *out++ = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q6, 6 ) );
+            *out++ = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q6, 6 ));
 
             res_Q6 = silk_SMULWB(         buf_ptr[ 1 ], silk_Resampler_2_3_COEFS_LQ[ 4 ] );
             res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 2 ], silk_Resampler_2_3_COEFS_LQ[ 5 ] );
@@ -80,7 +79,7 @@ void silk_resampler_down2_3(
             res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 4 ], silk_Resampler_2_3_COEFS_LQ[ 2 ] );
 
             /* Scale down, saturate and store in output array */
-            *out++ = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q6, 6 ) );
+            *out++ = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q6, 6 ));
 
             buf_ptr += 3;
             counter -= 3;
@@ -89,15 +88,15 @@ void silk_resampler_down2_3(
         in += nSamplesIn;
         inLen -= nSamplesIn;
 
-        if( inLen > 0 ) {
+        if (inLen > 0) {
             /* More iterations to do; copy last part of filtered signal to beginning of buffer */
-            silk_memcpy( buf, &buf[ nSamplesIn ], ORDER_FIR * sizeof( oac_int32 ) );
+            silk_memcpy( buf, &buf[ nSamplesIn ], ORDER_FIR*sizeof(oac_int32));
         } else {
             break;
         }
     }
 
     /* Copy last part of filtered signal to the state for the next call */
-    silk_memcpy( S, &buf[ nSamplesIn ], ORDER_FIR * sizeof( oac_int32 ) );
+    silk_memcpy( S, &buf[ nSamplesIn ], ORDER_FIR*sizeof(oac_int32));
     RESTORE_STACK;
 }
diff --git a/silk/resampler_private.h b/silk/resampler_private.h
index 57de3c562..ce00ba907 100644
--- a/silk/resampler_private.h
+++ b/silk/resampler_private.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_RESAMPLER_PRIVATE_H
@@ -35,47 +35,47 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Number of input samples to process in the inner loop */
 #define RESAMPLER_MAX_BATCH_SIZE_MS             10
 #define RESAMPLER_MAX_FS_KHZ                    48
-#define RESAMPLER_MAX_BATCH_SIZE_IN             ( RESAMPLER_MAX_BATCH_SIZE_MS * RESAMPLER_MAX_FS_KHZ )
+#define RESAMPLER_MAX_BATCH_SIZE_IN             (RESAMPLER_MAX_BATCH_SIZE_MS*RESAMPLER_MAX_FS_KHZ)
 
 /* Description: Hybrid IIR/FIR polyphase implementation of resampling */
 void silk_resampler_private_IIR_FIR(
     void                            *SS,            /* I/O  Resampler state             */
-    oac_int16                      out[],          /* O    Output signal               */
-    const oac_int16                in[],           /* I    Input signal                */
-    oac_int32                      inLen           /* I    Number of input samples     */
-);
+    oac_int16 out[],                               /* O    Output signal               */
+    const oac_int16 in[],                          /* I    Input signal                */
+    oac_int32 inLen                                /* I    Number of input samples     */
+    );
 
 /* Description: Hybrid IIR/FIR polyphase implementation of resampling */
 void silk_resampler_private_down_FIR(
     void                            *SS,            /* I/O  Resampler state             */
-    oac_int16                      out[],          /* O    Output signal               */
-    const oac_int16                in[],           /* I    Input signal                */
-    oac_int32                      inLen           /* I    Number of input samples     */
-);
+    oac_int16 out[],                               /* O    Output signal               */
+    const oac_int16 in[],                          /* I    Input signal                */
+    oac_int32 inLen                                /* I    Number of input samples     */
+    );
 
 /* Upsample by a factor 2, high quality */
 void silk_resampler_private_up2_HQ_wrapper(
     void                            *SS,            /* I/O  Resampler state (unused)    */
     oac_int16                      *out,           /* O    Output signal [ 2 * len ]   */
     const oac_int16                *in,            /* I    Input signal [ len ]        */
-    oac_int32                      len             /* I    Number of input samples     */
-);
+    oac_int32 len                                  /* I    Number of input samples     */
+    );
 
 /* Upsample by a factor 2, high quality */
 void silk_resampler_private_up2_HQ(
     oac_int32                      *S,             /* I/O  Resampler state [ 6 ]       */
     oac_int16                      *out,           /* O    Output signal [ 2 * len ]   */
     const oac_int16                *in,            /* I    Input signal [ len ]        */
-    oac_int32                      len             /* I    Number of input samples     */
-);
+    oac_int32 len                                  /* I    Number of input samples     */
+    );
 
 /* Second order AR filter */
 void silk_resampler_private_AR2(
-    oac_int32                      S[],            /* I/O  State vector [ 2 ]          */
-    oac_int32                      out_Q8[],       /* O    Output signal               */
-    const oac_int16                in[],           /* I    Input signal                */
-    const oac_int16                A_Q14[],        /* I    AR coefficients, Q14        */
-    oac_int32                      len             /* I    Signal length               */
-);
+    oac_int32 S[],                                 /* I/O  State vector [ 2 ]          */
+    oac_int32 out_Q8[],                            /* O    Output signal               */
+    const oac_int16 in[],                          /* I    Input signal                */
+    const oac_int16 A_Q14[],                       /* I    AR coefficients, Q14        */
+    oac_int32 len                                  /* I    Signal length               */
+    );
 
 #endif /* SILK_RESAMPLER_PRIVATE_H */
diff --git a/silk/resampler_private_AR2.c b/silk/resampler_private_AR2.c
index 57556a72a..4afdfadaf 100644
--- a/silk/resampler_private_AR2.c
+++ b/silk/resampler_private_AR2.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -34,17 +34,16 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Second order AR filter with single delay elements */
 void silk_resampler_private_AR2(
-    oac_int32                      S[],            /* I/O  State vector [ 2 ]          */
-    oac_int32                      out_Q8[],       /* O    Output signal               */
-    const oac_int16                in[],           /* I    Input signal                */
-    const oac_int16                A_Q14[],        /* I    AR coefficients, Q14        */
-    oac_int32                      len             /* I    Signal length               */
-)
-{
-    oac_int32    k;
-    oac_int32    out32;
+    oac_int32 S[],                                 /* I/O  State vector [ 2 ]          */
+    oac_int32 out_Q8[],                            /* O    Output signal               */
+    const oac_int16 in[],                          /* I    Input signal                */
+    const oac_int16 A_Q14[],                       /* I    AR coefficients, Q14        */
+    oac_int32 len                                  /* I    Signal length               */
+    ) {
+    oac_int32 k;
+    oac_int32 out32;
 
-    for( k = 0; k < len; k++ ) {
+    for (k = 0; k < len; k++) {
         out32       = silk_ADD_LSHIFT32( S[ 0 ], (oac_int32)in[ k ], 8 );
         out_Q8[ k ] = out32;
         out32       = silk_LSHIFT( out32, 2 );
diff --git a/silk/resampler_private_IIR_FIR.c b/silk/resampler_private_IIR_FIR.c
index 923402e7c..9eb1a1c43 100644
--- a/silk/resampler_private_IIR_FIR.c
+++ b/silk/resampler_private_IIR_FIR.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -36,18 +36,16 @@ POSSIBILITY OF SUCH DAMAGE.
 static OAC_INLINE oac_int16 *silk_resampler_private_IIR_FIR_INTERPOL(
     oac_int16  *out,
     oac_int16  *buf,
-    oac_int32  max_index_Q16,
-    oac_int32  index_increment_Q16
-)
-{
+    oac_int32 max_index_Q16,
+    oac_int32 index_increment_Q16)                                   {
     oac_int32 index_Q16, res_Q15;
     oac_int16 *buf_ptr;
     oac_int32 table_index;
 
     /* Interpolate upsampled signal and store in output array */
-    for( index_Q16 = 0; index_Q16 < max_index_Q16; index_Q16 += index_increment_Q16 ) {
-        table_index = silk_SMULWB( index_Q16 & 0xFFFF, 12 );
-        buf_ptr = &buf[ index_Q16 >> 16 ];
+    for (index_Q16 = 0; index_Q16 < max_index_Q16; index_Q16 += index_increment_Q16) {
+        table_index = silk_SMULWB( index_Q16&0xFFFF, 12 );
+        buf_ptr = &buf[ index_Q16>>16 ];
 
         res_Q15 = silk_SMULBB(          buf_ptr[ 0 ], silk_resampler_frac_FIR_12[      table_index ][ 0 ] );
         res_Q15 = silk_SMLABB( res_Q15, buf_ptr[ 1 ], silk_resampler_frac_FIR_12[      table_index ][ 1 ] );
@@ -57,32 +55,31 @@ static OAC_INLINE oac_int16 *silk_resampler_private_IIR_FIR_INTERPOL(
         res_Q15 = silk_SMLABB( res_Q15, buf_ptr[ 5 ], silk_resampler_frac_FIR_12[ 11 - table_index ][ 2 ] );
         res_Q15 = silk_SMLABB( res_Q15, buf_ptr[ 6 ], silk_resampler_frac_FIR_12[ 11 - table_index ][ 1 ] );
         res_Q15 = silk_SMLABB( res_Q15, buf_ptr[ 7 ], silk_resampler_frac_FIR_12[ 11 - table_index ][ 0 ] );
-        *out++ = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q15, 15 ) );
+        *out++ = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q15, 15 ));
     }
     return out;
 }
 /* Upsample using a combination of allpass-based 2x upsampling and FIR interpolation */
 void silk_resampler_private_IIR_FIR(
     void                            *SS,            /* I/O  Resampler state             */
-    oac_int16                      out[],          /* O    Output signal               */
-    const oac_int16                in[],           /* I    Input signal                */
-    oac_int32                      inLen           /* I    Number of input samples     */
-)
-{
+    oac_int16 out[],                               /* O    Output signal               */
+    const oac_int16 in[],                          /* I    Input signal                */
+    oac_int32 inLen                                /* I    Number of input samples     */
+    ) {
     silk_resampler_state_struct *S = (silk_resampler_state_struct *)SS;
     oac_int32 nSamplesIn;
     oac_int32 max_index_Q16, index_increment_Q16;
     VARDECL( oac_int16, buf );
     SAVE_STACK;
 
-    ALLOC( buf, 2 * S->batchSize + RESAMPLER_ORDER_FIR_12, oac_int16 );
+    ALLOC( buf, 2*S->batchSize + RESAMPLER_ORDER_FIR_12, oac_int16 );
 
     /* Copy buffered samples to start of buffer */
-    silk_memcpy( buf, S->sFIR.i16, RESAMPLER_ORDER_FIR_12 * sizeof( oac_int16 ) );
+    silk_memcpy( buf, S->sFIR.i16, RESAMPLER_ORDER_FIR_12*sizeof(oac_int16));
 
     /* Iterate over blocks of frameSizeIn input samples */
     index_increment_Q16 = S->invRatio_Q16;
-    while( 1 ) {
+    while (1) {
         nSamplesIn = silk_min( inLen, S->batchSize );
 
         /* Upsample 2x */
@@ -93,15 +90,15 @@ void silk_resampler_private_IIR_FIR(
         in += nSamplesIn;
         inLen -= nSamplesIn;
 
-        if( inLen > 0 ) {
+        if (inLen > 0) {
             /* More iterations to do; copy last part of filtered signal to beginning of buffer */
-            silk_memcpy( buf, &buf[ nSamplesIn << 1 ], RESAMPLER_ORDER_FIR_12 * sizeof( oac_int16 ) );
+            silk_memcpy( buf, &buf[ nSamplesIn<<1 ], RESAMPLER_ORDER_FIR_12*sizeof(oac_int16));
         } else {
             break;
         }
     }
 
     /* Copy last part of filtered signal to the state for the next call */
-    silk_memcpy( S->sFIR.i16, &buf[ nSamplesIn << 1 ], RESAMPLER_ORDER_FIR_12 * sizeof( oac_int16 ) );
+    silk_memcpy( S->sFIR.i16, &buf[ nSamplesIn<<1 ], RESAMPLER_ORDER_FIR_12*sizeof(oac_int16));
     RESTORE_STACK;
 }
diff --git a/silk/resampler_private_down_FIR.c b/silk/resampler_private_down_FIR.c
index dc8c834a0..512e090d3 100644
--- a/silk/resampler_private_down_FIR.c
+++ b/silk/resampler_private_down_FIR.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -37,28 +37,26 @@ static OAC_INLINE oac_int16 *silk_resampler_private_down_FIR_INTERPOL(
     oac_int16          *out,
     oac_int32          *buf,
     const oac_int16    *FIR_Coefs,
-    oac_int            FIR_Order,
-    oac_int            FIR_Fracs,
-    oac_int32          max_index_Q16,
-    oac_int32          index_increment_Q16
-)
-{
+    oac_int FIR_Order,
+    oac_int FIR_Fracs,
+    oac_int32 max_index_Q16,
+    oac_int32 index_increment_Q16)                                           {
     oac_int32 index_Q16, res_Q6;
     oac_int32 *buf_ptr;
     oac_int32 interpol_ind;
     const oac_int16 *interpol_ptr;
 
-    switch( FIR_Order ) {
+    switch (FIR_Order) {
         case RESAMPLER_DOWN_ORDER_FIR0:
-            for( index_Q16 = 0; index_Q16 < max_index_Q16; index_Q16 += index_increment_Q16 ) {
+            for (index_Q16 = 0; index_Q16 < max_index_Q16; index_Q16 += index_increment_Q16) {
                 /* Integer part gives pointer to buffered input */
                 buf_ptr = buf + silk_RSHIFT( index_Q16, 16 );
 
                 /* Fractional part gives interpolation coefficients */
-                interpol_ind = silk_SMULWB( index_Q16 & 0xFFFF, FIR_Fracs );
+                interpol_ind = silk_SMULWB( index_Q16&0xFFFF, FIR_Fracs );
 
                 /* Inner product */
-                interpol_ptr = &FIR_Coefs[ RESAMPLER_DOWN_ORDER_FIR0 / 2 * interpol_ind ];
+                interpol_ptr = &FIR_Coefs[ RESAMPLER_DOWN_ORDER_FIR0/2*interpol_ind ];
                 res_Q6 = silk_SMULWB(         buf_ptr[ 0 ], interpol_ptr[ 0 ] );
                 res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 1 ], interpol_ptr[ 1 ] );
                 res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 2 ], interpol_ptr[ 2 ] );
@@ -68,7 +66,7 @@ static OAC_INLINE oac_int16 *silk_resampler_private_down_FIR_INTERPOL(
                 res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 6 ], interpol_ptr[ 6 ] );
                 res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 7 ], interpol_ptr[ 7 ] );
                 res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 8 ], interpol_ptr[ 8 ] );
-                interpol_ptr = &FIR_Coefs[ RESAMPLER_DOWN_ORDER_FIR0 / 2 * ( FIR_Fracs - 1 - interpol_ind ) ];
+                interpol_ptr = &FIR_Coefs[ RESAMPLER_DOWN_ORDER_FIR0/2*(FIR_Fracs - 1 - interpol_ind) ];
                 res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 17 ], interpol_ptr[ 0 ] );
                 res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 16 ], interpol_ptr[ 1 ] );
                 res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 15 ], interpol_ptr[ 2 ] );
@@ -80,11 +78,11 @@ static OAC_INLINE oac_int16 *silk_resampler_private_down_FIR_INTERPOL(
                 res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[  9 ], interpol_ptr[ 8 ] );
 
                 /* Scale down, saturate and store in output array */
-                *out++ = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q6, 6 ) );
+                *out++ = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q6, 6 ));
             }
             break;
         case RESAMPLER_DOWN_ORDER_FIR1:
-            for( index_Q16 = 0; index_Q16 < max_index_Q16; index_Q16 += index_increment_Q16 ) {
+            for (index_Q16 = 0; index_Q16 < max_index_Q16; index_Q16 += index_increment_Q16) {
                 /* Integer part gives pointer to buffered input */
                 buf_ptr = buf + silk_RSHIFT( index_Q16, 16 );
 
@@ -103,11 +101,11 @@ static OAC_INLINE oac_int16 *silk_resampler_private_down_FIR_INTERPOL(
                 res_Q6 = silk_SMLAWB( res_Q6, silk_ADD32( buf_ptr[ 11 ], buf_ptr[ 12 ] ), FIR_Coefs[ 11 ] );
 
                 /* Scale down, saturate and store in output array */
-                *out++ = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q6, 6 ) );
+                *out++ = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q6, 6 ));
             }
             break;
         case RESAMPLER_DOWN_ORDER_FIR2:
-            for( index_Q16 = 0; index_Q16 < max_index_Q16; index_Q16 += index_increment_Q16 ) {
+            for (index_Q16 = 0; index_Q16 < max_index_Q16; index_Q16 += index_increment_Q16) {
                 /* Integer part gives pointer to buffered input */
                 buf_ptr = buf + silk_RSHIFT( index_Q16, 16 );
 
@@ -132,7 +130,7 @@ static OAC_INLINE oac_int16 *silk_resampler_private_down_FIR_INTERPOL(
                 res_Q6 = silk_SMLAWB( res_Q6, silk_ADD32( buf_ptr[ 17 ], buf_ptr[ 18 ] ), FIR_Coefs[ 17 ] );
 
                 /* Scale down, saturate and store in output array */
-                *out++ = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q6, 6 ) );
+                *out++ = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q6, 6 ));
             }
             break;
         default:
@@ -144,11 +142,10 @@ static OAC_INLINE oac_int16 *silk_resampler_private_down_FIR_INTERPOL(
 /* Resample with a 2nd order AR filter followed by FIR interpolation */
 void silk_resampler_private_down_FIR(
     void                            *SS,            /* I/O  Resampler state             */
-    oac_int16                      out[],          /* O    Output signal               */
-    const oac_int16                in[],           /* I    Input signal                */
-    oac_int32                      inLen           /* I    Number of input samples     */
-)
-{
+    oac_int16 out[],                               /* O    Output signal               */
+    const oac_int16 in[],                          /* I    Input signal                */
+    oac_int32 inLen                                /* I    Number of input samples     */
+    ) {
     silk_resampler_state_struct *S = (silk_resampler_state_struct *)SS;
     oac_int32 nSamplesIn;
     oac_int32 max_index_Q16, index_increment_Q16;
@@ -159,13 +156,13 @@ void silk_resampler_private_down_FIR(
     ALLOC( buf, S->batchSize + S->FIR_Order, oac_int32 );
 
     /* Copy buffered samples to start of buffer */
-    silk_memcpy( buf, S->sFIR.i32, S->FIR_Order * sizeof( oac_int32 ) );
+    silk_memcpy( buf, S->sFIR.i32, S->FIR_Order*sizeof(oac_int32));
 
     FIR_Coefs = &S->Coefs[ 2 ];
 
     /* Iterate over blocks of frameSizeIn input samples */
     index_increment_Q16 = S->invRatio_Q16;
-    while( 1 ) {
+    while (1) {
         nSamplesIn = silk_min( inLen, S->batchSize );
 
         /* Second-order AR filter (output in Q8) */
@@ -180,15 +177,15 @@ void silk_resampler_private_down_FIR(
         in += nSamplesIn;
         inLen -= nSamplesIn;
 
-        if( inLen > 1 ) {
+        if (inLen > 1) {
             /* More iterations to do; copy last part of filtered signal to beginning of buffer */
-            silk_memcpy( buf, &buf[ nSamplesIn ], S->FIR_Order * sizeof( oac_int32 ) );
+            silk_memcpy( buf, &buf[ nSamplesIn ], S->FIR_Order*sizeof(oac_int32));
         } else {
             break;
         }
     }
 
     /* Copy last part of filtered signal to the state for the next call */
-    silk_memcpy( S->sFIR.i32, &buf[ nSamplesIn ], S->FIR_Order * sizeof( oac_int32 ) );
+    silk_memcpy( S->sFIR.i32, &buf[ nSamplesIn ], S->FIR_Order*sizeof(oac_int32));
     RESTORE_STACK;
 }
diff --git a/silk/resampler_private_up2_HQ.c b/silk/resampler_private_up2_HQ.c
index f19746225..29ce980e7 100644
--- a/silk/resampler_private_up2_HQ.c
+++ b/silk/resampler_private_up2_HQ.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -39,9 +39,8 @@ void silk_resampler_private_up2_HQ(
     oac_int32                      *S,             /* I/O  Resampler state [ 6 ]       */
     oac_int16                      *out,           /* O    Output signal [ 2 * len ]   */
     const oac_int16                *in,            /* I    Input signal [ len ]        */
-    oac_int32                      len             /* I    Number of input samples     */
-)
-{
+    oac_int32 len                                  /* I    Number of input samples     */
+    ) {
     oac_int32 k;
     oac_int32 in32, out32_1, out32_2, Y, X;
 
@@ -53,9 +52,9 @@ void silk_resampler_private_up2_HQ(
     silk_assert( silk_resampler_up2_hq_1[ 2 ] < 0 );
 
     /* Internal variables and state are in Q10 format */
-    for( k = 0; k < len; k++ ) {
+    for (k = 0; k < len; k++) {
         /* Convert to Q10 */
-        in32 = silk_LSHIFT( (oac_int32)in[ k ], 10 );
+        in32 = silk_LSHIFT((oac_int32)in[ k ], 10 );
 
         /* First all-pass section for even output sample */
         Y       = silk_SUB32( in32, S[ 0 ] );
@@ -76,7 +75,7 @@ void silk_resampler_private_up2_HQ(
         S[ 2 ]  = silk_ADD32( out32_2, X );
 
         /* Apply gain in Q15, convert back to int16 and store to output */
-        out[ 2 * k ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( out32_1, 10 ) );
+        out[ 2*k ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( out32_1, 10 ));
 
         /* First all-pass section for odd output sample */
         Y       = silk_SUB32( in32, S[ 3 ] );
@@ -97,7 +96,7 @@ void silk_resampler_private_up2_HQ(
         S[ 5 ]  = silk_ADD32( out32_2, X );
 
         /* Apply gain in Q15, convert back to int16 and store to output */
-        out[ 2 * k + 1 ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( out32_1, 10 ) );
+        out[ 2*k + 1 ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( out32_1, 10 ));
     }
 }
 
@@ -105,9 +104,8 @@ void silk_resampler_private_up2_HQ_wrapper(
     void                            *SS,            /* I/O  Resampler state (unused)    */
     oac_int16                      *out,           /* O    Output signal [ 2 * len ]   */
     const oac_int16                *in,            /* I    Input signal [ len ]        */
-    oac_int32                      len             /* I    Number of input samples     */
-)
-{
+    oac_int32 len                                  /* I    Number of input samples     */
+    ) {
     silk_resampler_state_struct *S = (silk_resampler_state_struct *)SS;
     silk_resampler_private_up2_HQ( S->sIIR, out, in, len );
 }
diff --git a/silk/resampler_rom.c b/silk/resampler_rom.c
index 717e244de..e6f87ce3e 100644
--- a/silk/resampler_rom.c
+++ b/silk/resampler_rom.c
@@ -1,36 +1,36 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 /* Filter coefficients for IIR/FIR polyphase resampling     *
- * Total size: 179 Words (358 Bytes)                        */
+* Total size: 179 Words (358 Bytes)                        */
 
 #include "resampler_private.h"
 
@@ -40,47 +40,50 @@ POSSIBILITY OF SUCH DAMAGE.
 /* const oac_int16 silk_resampler_up2_hq_notch[ 4 ] = { 9634,  -7012,   7209,  30474 }; */
 
 /* Tables with IIR and FIR coefficients for fractional downsamplers (123 Words) */
-silk_DWORD_ALIGN const oac_int16 silk_Resampler_3_4_COEFS[ 2 + 3 * RESAMPLER_DOWN_ORDER_FIR0 / 2 ] = {
+silk_DWORD_ALIGN const oac_int16 silk_Resampler_3_4_COEFS[ 2 + 3*RESAMPLER_DOWN_ORDER_FIR0/2 ] = {
     -20694, -13867,
-       -49,     64,     17,   -157,    353,   -496,    163,  11047,  22205,
-       -39,      6,     91,   -170,    186,     23,   -896,   6336,  19928,
-       -19,    -36,    102,    -89,    -24,    328,   -951,   2568,  15909,
+    -49,     64,     17,   -157,    353,   -496,    163,  11047,  22205,
+    -39,      6,     91,   -170,    186,     23,   -896,   6336,  19928,
+    -19,    -36,    102,    -89,    -24,    328,   -951,   2568,  15909,
 };
 
-silk_DWORD_ALIGN const oac_int16 silk_Resampler_2_3_COEFS[ 2 + 2 * RESAMPLER_DOWN_ORDER_FIR0 / 2 ] = {
+silk_DWORD_ALIGN const oac_int16 silk_Resampler_2_3_COEFS[ 2 + 2*RESAMPLER_DOWN_ORDER_FIR0/2 ] = {
     -14457, -14019,
-        64,    128,   -122,     36,    310,   -768,    584,   9267,  17733,
-        12,    128,     18,   -142,    288,   -117,   -865,   4123,  14459,
+    64,    128,   -122,     36,    310,   -768,    584,   9267,  17733,
+    12,    128,     18,   -142,    288,   -117,   -865,   4123,  14459,
 };
 
-silk_DWORD_ALIGN const oac_int16 silk_Resampler_1_2_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR1 / 2 ] = {
-       616, -14323,
-       -10,     39,     58,    -46,    -84,    120,    184,   -315,   -541,   1284,   5380,   9024,
+silk_DWORD_ALIGN const oac_int16 silk_Resampler_1_2_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR1/2 ] = {
+    616, -14323,
+    -10,     39,     58,    -46,    -84,    120,    184,   -315,   -541,   1284,   5380,   9024,
 };
 
-silk_DWORD_ALIGN const oac_int16 silk_Resampler_1_3_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR2 / 2 ] = {
-     16102, -15162,
-       -13,      0,     20,     26,      5,    -31,    -43,     -4,     65,     90,      7,   -157,   -248,    -44,    593,   1583,   2612,   3271,
+silk_DWORD_ALIGN const oac_int16 silk_Resampler_1_3_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR2/2 ] = {
+    16102, -15162,
+    -13,      0,     20,     26,      5,    -31,    -43,     -4,     65,     90,      7,   -157,   -248,    -44,    593,
+    1583,   2612,   3271,
 };
 
-silk_DWORD_ALIGN const oac_int16 silk_Resampler_1_4_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR2 / 2 ] = {
-     22500, -15099,
-         3,    -14,    -20,    -15,      2,     25,     37,     25,    -16,    -71,   -107,    -79,     50,    292,    623,    982,   1288,   1464,
+silk_DWORD_ALIGN const oac_int16 silk_Resampler_1_4_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR2/2 ] = {
+    22500, -15099,
+    3,    -14,    -20,    -15,      2,     25,     37,     25,    -16,    -71,   -107,    -79,     50,    292,    623,
+    982,   1288,   1464,
 };
 
-silk_DWORD_ALIGN const oac_int16 silk_Resampler_1_6_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR2 / 2 ] = {
-     27540, -15257,
-        17,     12,      8,      1,    -10,    -22,    -30,    -32,    -22,      3,     44,    100,    168,    243,    317,    381,    429,    455,
+silk_DWORD_ALIGN const oac_int16 silk_Resampler_1_6_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR2/2 ] = {
+    27540, -15257,
+    17,     12,      8,      1,    -10,    -22,    -30,    -32,    -22,      3,     44,    100,    168,    243,    317,
+    381,    429,    455,
 };
 
-silk_DWORD_ALIGN const oac_int16 silk_Resampler_2_3_COEFS_LQ[ 2 + 2 * 2 ] = {
-     -2797,  -6507,
-      4697,  10739,
-      1567,   8276,
+silk_DWORD_ALIGN const oac_int16 silk_Resampler_2_3_COEFS_LQ[ 2 + 2*2 ] = {
+    -2797,  -6507,
+    4697,  10739,
+    1567,   8276,
 };
 
 /* Table with interplation fractions of 1/24, 3/24, 5/24, ... , 23/24 : 23/24 (46 Words) */
-silk_DWORD_ALIGN const oac_int16 silk_resampler_frac_FIR_12[ 12 ][ RESAMPLER_ORDER_FIR_12 / 2 ] = {
+silk_DWORD_ALIGN const oac_int16 silk_resampler_frac_FIR_12[ 12 ][ RESAMPLER_ORDER_FIR_12/2 ] = {
     {  189,  -600,   617, 30567 },
     {  117,  -159, -1070, 29704 },
     {   52,   221, -2392, 28276 },
diff --git a/silk/resampler_rom.h b/silk/resampler_rom.h
index 5702ba465..a41aec60d 100644
--- a/silk/resampler_rom.h
+++ b/silk/resampler_rom.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_FIX_RESAMPLER_ROM_H
@@ -46,15 +46,15 @@ static const oac_int16 silk_resampler_up2_hq_0[ 3 ] = { 1746, 14986, 39083 - 655
 static const oac_int16 silk_resampler_up2_hq_1[ 3 ] = { 6854, 25769, 55542 - 65536 };
 
 /* Tables with IIR and FIR coefficients for fractional downsamplers */
-extern const oac_int16 silk_Resampler_3_4_COEFS[ 2 + 3 * RESAMPLER_DOWN_ORDER_FIR0 / 2 ];
-extern const oac_int16 silk_Resampler_2_3_COEFS[ 2 + 2 * RESAMPLER_DOWN_ORDER_FIR0 / 2 ];
-extern const oac_int16 silk_Resampler_1_2_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR1 / 2 ];
-extern const oac_int16 silk_Resampler_1_3_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR2 / 2 ];
-extern const oac_int16 silk_Resampler_1_4_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR2 / 2 ];
-extern const oac_int16 silk_Resampler_1_6_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR2 / 2 ];
-extern const oac_int16 silk_Resampler_2_3_COEFS_LQ[ 2 + 2 * 2 ];
+extern const oac_int16 silk_Resampler_3_4_COEFS[ 2 + 3*RESAMPLER_DOWN_ORDER_FIR0/2 ];
+extern const oac_int16 silk_Resampler_2_3_COEFS[ 2 + 2*RESAMPLER_DOWN_ORDER_FIR0/2 ];
+extern const oac_int16 silk_Resampler_1_2_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR1/2 ];
+extern const oac_int16 silk_Resampler_1_3_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR2/2 ];
+extern const oac_int16 silk_Resampler_1_4_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR2/2 ];
+extern const oac_int16 silk_Resampler_1_6_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR2/2 ];
+extern const oac_int16 silk_Resampler_2_3_COEFS_LQ[ 2 + 2*2 ];
 
 /* Table with interplation fractions of 1/24, 3/24, ..., 23/24 */
-extern const oac_int16 silk_resampler_frac_FIR_12[ 12 ][ RESAMPLER_ORDER_FIR_12 / 2 ];
+extern const oac_int16 silk_resampler_frac_FIR_12[ 12 ][ RESAMPLER_ORDER_FIR_12/2 ];
 
 #endif /* SILK_FIX_RESAMPLER_ROM_H */
diff --git a/silk/resampler_structs.h b/silk/resampler_structs.h
index 8d39a1110..bf90bbaf2 100644
--- a/silk/resampler_structs.h
+++ b/silk/resampler_structs.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_RESAMPLER_STRUCTS_H
@@ -31,21 +31,21 @@ POSSIBILITY OF SUCH DAMAGE.
 #define SILK_RESAMPLER_MAX_FIR_ORDER                 36
 #define SILK_RESAMPLER_MAX_IIR_ORDER                 6
 
-typedef struct _silk_resampler_state_struct{
-    oac_int32       sIIR[ SILK_RESAMPLER_MAX_IIR_ORDER ]; /* this must be the first element of this struct */
-    union{
-        oac_int32   i32[ SILK_RESAMPLER_MAX_FIR_ORDER ];
-        oac_int16   i16[ SILK_RESAMPLER_MAX_FIR_ORDER ];
+typedef struct _silk_resampler_state_struct {
+    oac_int32 sIIR[ SILK_RESAMPLER_MAX_IIR_ORDER ];       /* this must be the first element of this struct */
+    union {
+        oac_int32 i32[ SILK_RESAMPLER_MAX_FIR_ORDER ];
+        oac_int16 i16[ SILK_RESAMPLER_MAX_FIR_ORDER ];
     }                sFIR;
-    oac_int16       delayBuf[ 96 ];
-    oac_int         resampler_function;
-    oac_int         batchSize;
-    oac_int32       invRatio_Q16;
-    oac_int         FIR_Order;
-    oac_int         FIR_Fracs;
-    oac_int         Fs_in_kHz;
-    oac_int         Fs_out_kHz;
-    oac_int         inputDelay;
+    oac_int16 delayBuf[ 96 ];
+    oac_int resampler_function;
+    oac_int batchSize;
+    oac_int32 invRatio_Q16;
+    oac_int FIR_Order;
+    oac_int FIR_Fracs;
+    oac_int Fs_in_kHz;
+    oac_int Fs_out_kHz;
+    oac_int inputDelay;
     const oac_int16 *Coefs;
 } silk_resampler_state_struct;
 
diff --git a/silk/shell_coder.c b/silk/shell_coder.c
index 123783ef6..a872e2f10 100644
--- a/silk/shell_coder.c
+++ b/silk/shell_coder.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -36,23 +36,21 @@ POSSIBILITY OF SUCH DAMAGE.
 static OAC_INLINE void combine_pulses(
     oac_int         *out,   /* O    combined pulses vector [len] */
     const oac_int   *in,    /* I    input vector       [2 * len] */
-    const oac_int   len     /* I    number of OUTPUT samples     */
-)
-{
+    const oac_int len       /* I    number of OUTPUT samples     */
+    ) {
     oac_int k;
-    for( k = 0; k < len; k++ ) {
-        out[ k ] = in[ 2 * k ] + in[ 2 * k + 1 ];
+    for (k = 0; k < len; k++) {
+        out[ k ] = in[ 2*k ] + in[ 2*k + 1 ];
     }
 }
 
 static OAC_INLINE void encode_split(
     ec_enc                      *psRangeEnc,    /* I/O  compressor data structure                   */
-    const oac_int              p_child1,       /* I    pulse amplitude of first child subframe     */
-    const oac_int              p,              /* I    pulse amplitude of current subframe         */
+    const oac_int p_child1,                    /* I    pulse amplitude of first child subframe     */
+    const oac_int p,                           /* I    pulse amplitude of current subframe         */
     const oac_uint8            *shell_table    /* I    table of shell cdfs                         */
-)
-{
-    if( p > 0 ) {
+    ) {
+    if (p > 0) {
         ec_enc_icdf( psRangeEnc, p_child1, &shell_table[ silk_shell_code_table_offsets[ p ] ], 8 );
     }
 }
@@ -61,11 +59,10 @@ static OAC_INLINE void decode_split(
     oac_int16                  *p_child1,      /* O    pulse amplitude of first child subframe     */
     oac_int16                  *p_child2,      /* O    pulse amplitude of second child subframe    */
     ec_dec                      *psRangeDec,    /* I/O  Compressor data structure                   */
-    const oac_int              p,              /* I    pulse amplitude of current subframe         */
+    const oac_int p,                           /* I    pulse amplitude of current subframe         */
     const oac_uint8            *shell_table    /* I    table of shell cdfs                         */
-)
-{
-    if( p > 0 ) {
+    ) {
+    if (p > 0) {
         p_child1[ 0 ] = ec_dec_icdf( psRangeDec, &shell_table[ silk_shell_code_table_offsets[ p ] ], 8 );
         p_child2[ 0 ] = p - p_child1[ 0 ];
     } else {
@@ -78,8 +75,7 @@ static OAC_INLINE void decode_split(
 void silk_shell_encoder(
     ec_enc                      *psRangeEnc,                    /* I/O  compressor data structure                   */
     const oac_int              *pulses0                        /* I    data: nonnegative pulse amplitudes          */
-)
-{
+    ) {
     oac_int pulses1[ 8 ], pulses2[ 4 ], pulses3[ 2 ], pulses4[ 1 ];
 
     /* this function operates on one shell code frame of 16 pulses */
@@ -119,9 +115,8 @@ void silk_shell_encoder(
 void silk_shell_decoder(
     oac_int16                  *pulses0,                       /* O    data: nonnegative pulse amplitudes          */
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
-    const oac_int              pulses4                         /* I    number of pulses per pulse-subframe         */
-)
-{
+    const oac_int pulses4                                      /* I    number of pulses per pulse-subframe         */
+    ) {
     oac_int16 pulses3[ 2 ], pulses2[ 4 ], pulses1[ 8 ];
 
     /* this function operates on one shell code frame of 16 pulses */
diff --git a/silk/sigm_Q15.c b/silk/sigm_Q15.c
index 02a49643b..40673e845 100644
--- a/silk/sigm_Q15.c
+++ b/silk/sigm_Q15.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 /* Approximate sigmoid function */
@@ -47,29 +47,28 @@ static const oac_int32 sigm_LUT_neg_Q15[ 6 ] = {
 };
 
 oac_int silk_sigm_Q15(
-    oac_int                    in_Q5               /* I                                                                */
-)
-{
+    oac_int in_Q5                                  /* I                                                                */
+    ) {
     oac_int ind;
 
-    if( in_Q5 < 0 ) {
+    if (in_Q5 < 0) {
         /* Negative input */
         in_Q5 = -in_Q5;
-        if( in_Q5 >= 6 * 32 ) {
+        if (in_Q5 >= 6*32) {
             return 0;        /* Clip */
         } else {
             /* Linear interpolation of look up table */
             ind = silk_RSHIFT( in_Q5, 5 );
-            return( sigm_LUT_neg_Q15[ ind ] - silk_SMULBB( sigm_LUT_slope_Q10[ ind ], in_Q5 & 0x1F ) );
+            return sigm_LUT_neg_Q15[ ind ] - silk_SMULBB( sigm_LUT_slope_Q10[ ind ], in_Q5&0x1F );
         }
     } else {
         /* Positive input */
-        if( in_Q5 >= 6 * 32 ) {
+        if (in_Q5 >= 6*32) {
             return 32767;        /* clip */
         } else {
             /* Linear interpolation of look up table */
             ind = silk_RSHIFT( in_Q5, 5 );
-            return( sigm_LUT_pos_Q15[ ind ] + silk_SMULBB( sigm_LUT_slope_Q10[ ind ], in_Q5 & 0x1F ) );
+            return sigm_LUT_pos_Q15[ ind ] + silk_SMULBB( sigm_LUT_slope_Q10[ ind ], in_Q5&0x1F );
         }
     }
 }
diff --git a/silk/sort.c b/silk/sort.c
index e321e1340..63271e6c3 100644
--- a/silk/sort.c
+++ b/silk/sort.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 /* Insertion sort (fast for already almost sorted arrays):   */
@@ -40,12 +40,11 @@ POSSIBILITY OF SUCH DAMAGE.
 void silk_insertion_sort_increasing(
     oac_int32           *a,             /* I/O   Unsorted / Sorted vector               */
     oac_int             *idx,           /* O     Index vector for the sorted elements   */
-    const oac_int       L,              /* I     Vector length                          */
-    const oac_int       K               /* I     Number of correctly sorted positions   */
-)
-{
-    oac_int32    value;
-    oac_int        i, j;
+    const oac_int L,                    /* I     Vector length                          */
+    const oac_int K                     /* I     Number of correctly sorted positions   */
+    ) {
+    oac_int32 value;
+    oac_int i, j;
 
     /* Safety checks */
     celt_assert( K >  0 );
@@ -53,14 +52,14 @@ void silk_insertion_sort_increasing(
     celt_assert( L >= K );
 
     /* Write start indices in index vector */
-    for( i = 0; i < K; i++ ) {
+    for (i = 0; i < K; i++) {
         idx[ i ] = i;
     }
 
     /* Sort vector elements by value, increasing order */
-    for( i = 1; i < K; i++ ) {
+    for (i = 1; i < K; i++) {
         value = a[ i ];
-        for( j = i - 1; ( j >= 0 ) && ( value < a[ j ] ); j-- ) {
+        for (j = i - 1; (j >= 0) && (value < a[ j ]); j--) {
             a[ j + 1 ]   = a[ j ];       /* Shift value */
             idx[ j + 1 ] = idx[ j ];     /* Shift index */
         }
@@ -70,10 +69,10 @@ void silk_insertion_sort_increasing(
 
     /* If less than L values are asked for, check the remaining values, */
     /* but only spend CPU to ensure that the K first values are correct */
-    for( i = K; i < L; i++ ) {
+    for (i = K; i < L; i++) {
         value = a[ i ];
-        if( value < a[ K - 1 ] ) {
-            for( j = K - 2; ( j >= 0 ) && ( value < a[ j ] ); j-- ) {
+        if (value < a[ K - 1 ]) {
+            for (j = K - 2; (j >= 0) && (value < a[ j ]); j--) {
                 a[ j + 1 ]   = a[ j ];       /* Shift value */
                 idx[ j + 1 ] = idx[ j ];     /* Shift index */
             }
@@ -88,10 +87,9 @@ void silk_insertion_sort_increasing(
 void silk_insertion_sort_decreasing_int16(
     oac_int16                  *a,                 /* I/O   Unsorted / Sorted vector                                   */
     oac_int                    *idx,               /* O     Index vector for the sorted elements                       */
-    const oac_int              L,                  /* I     Vector length                                              */
-    const oac_int              K                   /* I     Number of correctly sorted positions                       */
-)
-{
+    const oac_int L,                               /* I     Vector length                                              */
+    const oac_int K                                /* I     Number of correctly sorted positions                       */
+    ) {
     oac_int i, j;
     oac_int value;
 
@@ -101,14 +99,14 @@ void silk_insertion_sort_decreasing_int16(
     celt_assert( L >= K );
 
     /* Write start indices in index vector */
-    for( i = 0; i < K; i++ ) {
+    for (i = 0; i < K; i++) {
         idx[ i ] = i;
     }
 
     /* Sort vector elements by value, decreasing order */
-    for( i = 1; i < K; i++ ) {
+    for (i = 1; i < K; i++) {
         value = a[ i ];
-        for( j = i - 1; ( j >= 0 ) && ( value > a[ j ] ); j-- ) {
+        for (j = i - 1; (j >= 0) && (value > a[ j ]); j--) {
             a[ j + 1 ]   = a[ j ];     /* Shift value */
             idx[ j + 1 ] = idx[ j ];   /* Shift index */
         }
@@ -118,10 +116,10 @@ void silk_insertion_sort_decreasing_int16(
 
     /* If less than L values are asked for, check the remaining values, */
     /* but only spend CPU to ensure that the K first values are correct */
-    for( i = K; i < L; i++ ) {
+    for (i = K; i < L; i++) {
         value = a[ i ];
-        if( value > a[ K - 1 ] ) {
-            for( j = K - 2; ( j >= 0 ) && ( value > a[ j ] ); j-- ) {
+        if (value > a[ K - 1 ]) {
+            for (j = K - 2; (j >= 0) && (value > a[ j ]); j--) {
                 a[ j + 1 ]   = a[ j ];     /* Shift value */
                 idx[ j + 1 ] = idx[ j ];   /* Shift index */
             }
@@ -133,20 +131,19 @@ void silk_insertion_sort_decreasing_int16(
 #endif
 
 void silk_insertion_sort_increasing_all_values_int16(
-     oac_int16                 *a,                 /* I/O   Unsorted / Sorted vector                                   */
-     const oac_int             L                   /* I     Vector length                                              */
-)
-{
-    oac_int    value;
-    oac_int    i, j;
+    oac_int16                 *a,                  /* I/O   Unsorted / Sorted vector                                   */
+    const oac_int L                                /* I     Vector length                                              */
+    ) {
+    oac_int value;
+    oac_int i, j;
 
     /* Safety checks */
     celt_assert( L >  0 );
 
     /* Sort vector elements by value, increasing order */
-    for( i = 1; i < L; i++ ) {
+    for (i = 1; i < L; i++) {
         value = a[ i ];
-        for( j = i - 1; ( j >= 0 ) && ( value < a[ j ] ); j-- ) {
+        for (j = i - 1; (j >= 0) && (value < a[ j ]); j--) {
             a[ j + 1 ] = a[ j ]; /* Shift value */
         }
         a[ j + 1 ] = value; /* Write value */
diff --git a/silk/stereo_LR_to_MS.c b/silk/stereo_LR_to_MS.c
index 8678cfe3c..4f5cce660 100644
--- a/silk/stereo_LR_to_MS.c
+++ b/silk/stereo_LR_to_MS.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -35,19 +35,18 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Convert Left/Right stereo signal to adaptive Mid/Side representation */
 void silk_stereo_LR_to_MS(
     stereo_enc_state            *state,                         /* I/O  State                                       */
-    oac_int16                  x1[],                           /* I/O  Left input signal, becomes mid signal       */
-    oac_int16                  x2[],                           /* I/O  Right input signal, becomes side signal     */
-    oac_int8                   ix[ 2 ][ 3 ],                   /* O    Quantization indices                        */
+    oac_int16 x1[],                                            /* I/O  Left input signal, becomes mid signal       */
+    oac_int16 x2[],                                            /* I/O  Right input signal, becomes side signal     */
+    oac_int8 ix[ 2 ][ 3 ],                                     /* O    Quantization indices                        */
     oac_int8                   *mid_only_flag,                 /* O    Flag: only mid signal coded                 */
-    oac_int32                  mid_side_rates_bps[],           /* O    Bitrates for mid and side signals           */
-    oac_int32                  total_rate_bps,                 /* I    Total bitrate                               */
-    oac_int                    prev_speech_act_Q8,             /* I    Speech activity level in previous frame     */
-    oac_int                    toMono,                         /* I    Last frame before a stereo->mono transition */
-    oac_int                    fs_kHz,                         /* I    Sample rate (kHz)                           */
-    oac_int                    frame_length                    /* I    Number of samples                           */
-)
-{
-    oac_int   n, is10msFrame, denom_Q16, delta0_Q13, delta1_Q13;
+    oac_int32 mid_side_rates_bps[],                            /* O    Bitrates for mid and side signals           */
+    oac_int32 total_rate_bps,                                  /* I    Total bitrate                               */
+    oac_int prev_speech_act_Q8,                                /* I    Speech activity level in previous frame     */
+    oac_int toMono,                                            /* I    Last frame before a stereo->mono transition */
+    oac_int fs_kHz,                                            /* I    Sample rate (kHz)                           */
+    oac_int frame_length                                       /* I    Number of samples                           */
+    ) {
+    oac_int n, is10msFrame, denom_Q16, delta0_Q13, delta1_Q13;
     oac_int32 sum, diff, smooth_coef_Q16, pred_Q13[ 2 ], pred0_Q13, pred1_Q13;
     oac_int32 LP_ratio_Q14, HP_ratio_Q14, frac_Q16, frac_3_Q16, min_mid_rate_bps, width_Q14, w_Q24, deltaw_Q24;
     VARDECL( oac_int16, side );
@@ -60,23 +59,23 @@ void silk_stereo_LR_to_MS(
 
     ALLOC( side, frame_length + 2, oac_int16 );
     /* Convert to basic mid/side signals */
-    for( n = 0; n < frame_length + 2; n++ ) {
+    for (n = 0; n < frame_length + 2; n++) {
         sum  = x1[ n - 2 ] + (oac_int32)x2[ n - 2 ];
         diff = x1[ n - 2 ] - (oac_int32)x2[ n - 2 ];
         mid[  n ] = (oac_int16)silk_RSHIFT_ROUND( sum, 1 );
-        side[ n ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( diff, 1 ) );
+        side[ n ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( diff, 1 ));
     }
 
     /* Buffering */
-    silk_memcpy( mid,  state->sMid,  2 * sizeof( oac_int16 ) );
-    silk_memcpy( side, state->sSide, 2 * sizeof( oac_int16 ) );
-    silk_memcpy( state->sMid,  &mid[  frame_length ], 2 * sizeof( oac_int16 ) );
-    silk_memcpy( state->sSide, &side[ frame_length ], 2 * sizeof( oac_int16 ) );
+    silk_memcpy( mid,  state->sMid,  2*sizeof(oac_int16));
+    silk_memcpy( side, state->sSide, 2*sizeof(oac_int16));
+    silk_memcpy( state->sMid,  &mid[  frame_length ], 2*sizeof(oac_int16));
+    silk_memcpy( state->sSide, &side[ frame_length ], 2*sizeof(oac_int16));
 
     /* LP and HP filter mid signal */
     ALLOC( LP_mid, frame_length, oac_int16 );
     ALLOC( HP_mid, frame_length, oac_int16 );
-    for( n = 0; n < frame_length; n++ ) {
+    for (n = 0; n < frame_length; n++) {
         sum = silk_RSHIFT_ROUND( silk_ADD_LSHIFT32( mid[ n ] + (oac_int32)mid[ n + 2 ], mid[ n + 1 ], 1 ), 2 );
         LP_mid[ n ] = sum;
         HP_mid[ n ] = mid[ n + 1 ] - sum;
@@ -85,62 +84,65 @@ void silk_stereo_LR_to_MS(
     /* LP and HP filter side signal */
     ALLOC( LP_side, frame_length, oac_int16 );
     ALLOC( HP_side, frame_length, oac_int16 );
-    for( n = 0; n < frame_length; n++ ) {
+    for (n = 0; n < frame_length; n++) {
         sum = silk_RSHIFT_ROUND( silk_ADD_LSHIFT32( side[ n ] + (oac_int32)side[ n + 2 ], side[ n + 1 ], 1 ), 2 );
         LP_side[ n ] = sum;
         HP_side[ n ] = side[ n + 1 ] - sum;
     }
 
     /* Find energies and predictors */
-    is10msFrame = frame_length == 10 * fs_kHz;
+    is10msFrame = frame_length == 10*fs_kHz;
     smooth_coef_Q16 = is10msFrame ?
-        SILK_FIX_CONST( STEREO_RATIO_SMOOTH_COEF / 2, 16 ) :
-        SILK_FIX_CONST( STEREO_RATIO_SMOOTH_COEF,     16 );
+                      SILK_FIX_CONST( STEREO_RATIO_SMOOTH_COEF/2, 16 ) :
+                      SILK_FIX_CONST( STEREO_RATIO_SMOOTH_COEF,     16 );
     smooth_coef_Q16 = silk_SMULWB( silk_SMULBB( prev_speech_act_Q8, prev_speech_act_Q8 ), smooth_coef_Q16 );
 
-    pred_Q13[ 0 ] = silk_stereo_find_predictor( &LP_ratio_Q14, LP_mid, LP_side, &state->mid_side_amp_Q0[ 0 ], frame_length, smooth_coef_Q16 );
-    pred_Q13[ 1 ] = silk_stereo_find_predictor( &HP_ratio_Q14, HP_mid, HP_side, &state->mid_side_amp_Q0[ 2 ], frame_length, smooth_coef_Q16 );
+    pred_Q13[ 0 ] = silk_stereo_find_predictor( &LP_ratio_Q14, LP_mid, LP_side, &state->mid_side_amp_Q0[ 0 ],
+    frame_length, smooth_coef_Q16 );
+    pred_Q13[ 1 ] = silk_stereo_find_predictor( &HP_ratio_Q14, HP_mid, HP_side, &state->mid_side_amp_Q0[ 2 ],
+    frame_length, smooth_coef_Q16 );
     /* Ratio of the norms of residual and mid signals */
     frac_Q16 = silk_SMLABB( HP_ratio_Q14, LP_ratio_Q14, 3 );
-    frac_Q16 = silk_min( frac_Q16, SILK_FIX_CONST( 1, 16 ) );
+    frac_Q16 = silk_min( frac_Q16, SILK_FIX_CONST( 1, 16 ));
 
     /* Determine bitrate distribution between mid and side, and possibly reduce stereo width */
     total_rate_bps -= is10msFrame ? 1200 : 600;      /* Subtract approximate bitrate for coding stereo parameters */
-    if( total_rate_bps < 1 ) {
+    if (total_rate_bps < 1) {
         total_rate_bps = 1;
     }
     min_mid_rate_bps = silk_SMLABB( 2000, fs_kHz, 600 );
     silk_assert( min_mid_rate_bps < 32767 );
     /* Default bitrate distribution: 8 parts for Mid and (5+3*frac) parts for Side. so: mid_rate = ( 8 / ( 13 + 3 * frac ) ) * total_ rate */
     frac_3_Q16 = silk_MUL( 3, frac_Q16 );
-    mid_side_rates_bps[ 0 ] = silk_DIV32_varQ( total_rate_bps, SILK_FIX_CONST( 8 + 5, 16 ) + frac_3_Q16, 16+3 );
+    mid_side_rates_bps[ 0 ] = silk_DIV32_varQ( total_rate_bps, SILK_FIX_CONST( 8 + 5, 16 ) + frac_3_Q16, 16 + 3 );
     /* If Mid bitrate below minimum, reduce stereo width */
-    if( mid_side_rates_bps[ 0 ] < min_mid_rate_bps ) {
+    if (mid_side_rates_bps[ 0 ] < min_mid_rate_bps) {
         mid_side_rates_bps[ 0 ] = min_mid_rate_bps;
         mid_side_rates_bps[ 1 ] = total_rate_bps - mid_side_rates_bps[ 0 ];
         /* width = 4 * ( 2 * side_rate - min_rate ) / ( ( 1 + 3 * frac ) * min_rate ) */
         width_Q14 = silk_DIV32_varQ( silk_LSHIFT( mid_side_rates_bps[ 1 ], 1 ) - min_mid_rate_bps,
-            silk_SMULWB( SILK_FIX_CONST( 1, 16 ) + frac_3_Q16, min_mid_rate_bps ), 14+2 );
-        width_Q14 = silk_LIMIT( width_Q14, 0, SILK_FIX_CONST( 1, 14 ) );
+            silk_SMULWB( SILK_FIX_CONST( 1, 16 ) + frac_3_Q16, min_mid_rate_bps ), 14 + 2 );
+        width_Q14 = silk_LIMIT( width_Q14, 0, SILK_FIX_CONST( 1, 14 ));
     } else {
         mid_side_rates_bps[ 1 ] = total_rate_bps - mid_side_rates_bps[ 0 ];
         width_Q14 = SILK_FIX_CONST( 1, 14 );
     }
 
     /* Smoother */
-    state->smth_width_Q14 = (oac_int16)silk_SMLAWB( state->smth_width_Q14, width_Q14 - state->smth_width_Q14, smooth_coef_Q16 );
+    state->smth_width_Q14 = (oac_int16)silk_SMLAWB( state->smth_width_Q14, width_Q14 - state->smth_width_Q14,
+    smooth_coef_Q16 );
 
     /* At very low bitrates or for inputs that are nearly amplitude panned, switch to panned-mono coding */
     *mid_only_flag = 0;
-    if( toMono ) {
+    if (toMono) {
         /* Last frame before stereo->mono transition; collapse stereo width */
         width_Q14 = 0;
         pred_Q13[ 0 ] = 0;
         pred_Q13[ 1 ] = 0;
         silk_stereo_quant_pred( pred_Q13, ix );
-    } else if( state->width_prev_Q14 == 0 &&
-        ( 8 * total_rate_bps < 13 * min_mid_rate_bps || silk_SMULWB( frac_Q16, state->smth_width_Q14 ) < SILK_FIX_CONST( 0.05, 14 ) ) )
-    {
+    } else if (state->width_prev_Q14 == 0
+               && (8*total_rate_bps < 13*min_mid_rate_bps || silk_SMULWB( frac_Q16,
+    state->smth_width_Q14 ) < SILK_FIX_CONST( 0.05, 14 ))) {
         /* Code as panned-mono; previous frame already had zero width */
         /* Scale down and quantize predictors */
         pred_Q13[ 0 ] = silk_RSHIFT( silk_SMULBB( state->smth_width_Q14, pred_Q13[ 0 ] ), 14 );
@@ -153,9 +155,9 @@ void silk_stereo_LR_to_MS(
         mid_side_rates_bps[ 0 ] = total_rate_bps;
         mid_side_rates_bps[ 1 ] = 0;
         *mid_only_flag = 1;
-    } else if( state->width_prev_Q14 != 0 &&
-        ( 8 * total_rate_bps < 11 * min_mid_rate_bps || silk_SMULWB( frac_Q16, state->smth_width_Q14 ) < SILK_FIX_CONST( 0.02, 14 ) ) )
-    {
+    } else if (state->width_prev_Q14 != 0
+               && (8*total_rate_bps < 11*min_mid_rate_bps || silk_SMULWB( frac_Q16,
+    state->smth_width_Q14 ) < SILK_FIX_CONST( 0.02, 14 ))) {
         /* Transition to zero-width stereo */
         /* Scale down and quantize predictors */
         pred_Q13[ 0 ] = silk_RSHIFT( silk_SMULBB( state->smth_width_Q14, pred_Q13[ 0 ] ), 14 );
@@ -165,7 +167,7 @@ void silk_stereo_LR_to_MS(
         width_Q14 = 0;
         pred_Q13[ 0 ] = 0;
         pred_Q13[ 1 ] = 0;
-    } else if( state->smth_width_Q14 > SILK_FIX_CONST( 0.95, 14 ) ) {
+    } else if (state->smth_width_Q14 > SILK_FIX_CONST( 0.95, 14 )) {
         /* Full-width stereo coding */
         silk_stereo_quant_pred( pred_Q13, ix );
         width_Q14 = SILK_FIX_CONST( 1, 14 );
@@ -178,9 +180,9 @@ void silk_stereo_LR_to_MS(
     }
 
     /* Make sure to keep on encoding until the tapered output has been transmitted */
-    if( *mid_only_flag == 1 ) {
-        state->silent_side_len += frame_length - STEREO_INTERP_LEN_MS * fs_kHz;
-        if( state->silent_side_len < LA_SHAPE_MS * fs_kHz ) {
+    if (*mid_only_flag == 1) {
+        state->silent_side_len += frame_length - STEREO_INTERP_LEN_MS*fs_kHz;
+        if (state->silent_side_len < LA_SHAPE_MS*fs_kHz) {
             *mid_only_flag = 0;
         } else {
             /* Limit to avoid wrapping around */
@@ -190,7 +192,7 @@ void silk_stereo_LR_to_MS(
         state->silent_side_len = 0;
     }
 
-    if( *mid_only_flag == 0 && mid_side_rates_bps[ 1 ] < 1 ) {
+    if (*mid_only_flag == 0 && mid_side_rates_bps[ 1 ] < 1) {
         mid_side_rates_bps[ 1 ] = 1;
         mid_side_rates_bps[ 0 ] = silk_max_int( 1, total_rate_bps - mid_side_rates_bps[ 1 ]);
     }
@@ -199,28 +201,28 @@ void silk_stereo_LR_to_MS(
     pred0_Q13  = -state->pred_prev_Q13[ 0 ];
     pred1_Q13  = -state->pred_prev_Q13[ 1 ];
     w_Q24      =  silk_LSHIFT( state->width_prev_Q14, 10 );
-    denom_Q16  = silk_DIV32_16( (oac_int32)1 << 16, STEREO_INTERP_LEN_MS * fs_kHz );
+    denom_Q16  = silk_DIV32_16((oac_int32)1<<16, STEREO_INTERP_LEN_MS*fs_kHz );
     delta0_Q13 = -silk_RSHIFT_ROUND( silk_SMULBB( pred_Q13[ 0 ] - state->pred_prev_Q13[ 0 ], denom_Q16 ), 16 );
     delta1_Q13 = -silk_RSHIFT_ROUND( silk_SMULBB( pred_Q13[ 1 ] - state->pred_prev_Q13[ 1 ], denom_Q16 ), 16 );
     deltaw_Q24 =  silk_LSHIFT( silk_SMULWB( width_Q14 - state->width_prev_Q14, denom_Q16 ), 10 );
-    for( n = 0; n < STEREO_INTERP_LEN_MS * fs_kHz; n++ ) {
+    for (n = 0; n < STEREO_INTERP_LEN_MS*fs_kHz; n++) {
         pred0_Q13 += delta0_Q13;
         pred1_Q13 += delta1_Q13;
         w_Q24   += deltaw_Q24;
         sum = silk_LSHIFT( silk_ADD_LSHIFT32( mid[ n ] + (oac_int32)mid[ n + 2 ], mid[ n + 1 ], 1 ), 9 );    /* Q11 */
         sum = silk_SMLAWB( silk_SMULWB( w_Q24, side[ n + 1 ] ), sum, pred0_Q13 );               /* Q8  */
-        sum = silk_SMLAWB( sum, silk_LSHIFT( (oac_int32)mid[ n + 1 ], 11 ), pred1_Q13 );       /* Q8  */
-        x2[ n - 1 ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( sum, 8 ) );
+        sum = silk_SMLAWB( sum, silk_LSHIFT((oac_int32)mid[ n + 1 ], 11 ), pred1_Q13 );        /* Q8  */
+        x2[ n - 1 ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( sum, 8 ));
     }
 
     pred0_Q13 = -pred_Q13[ 0 ];
     pred1_Q13 = -pred_Q13[ 1 ];
     w_Q24     =  silk_LSHIFT( width_Q14, 10 );
-    for( n = STEREO_INTERP_LEN_MS * fs_kHz; n < frame_length; n++ ) {
+    for (n = STEREO_INTERP_LEN_MS*fs_kHz; n < frame_length; n++) {
         sum = silk_LSHIFT( silk_ADD_LSHIFT32( mid[ n ] + (oac_int32)mid[ n + 2 ], mid[ n + 1 ], 1 ), 9 );    /* Q11 */
         sum = silk_SMLAWB( silk_SMULWB( w_Q24, side[ n + 1 ] ), sum, pred0_Q13 );               /* Q8  */
-        sum = silk_SMLAWB( sum, silk_LSHIFT( (oac_int32)mid[ n + 1 ], 11 ), pred1_Q13 );       /* Q8  */
-        x2[ n - 1 ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( sum, 8 ) );
+        sum = silk_SMLAWB( sum, silk_LSHIFT((oac_int32)mid[ n + 1 ], 11 ), pred1_Q13 );        /* Q8  */
+        x2[ n - 1 ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( sum, 8 ));
     }
     state->pred_prev_Q13[ 0 ] = (oac_int16)pred_Q13[ 0 ];
     state->pred_prev_Q13[ 1 ] = (oac_int16)pred_Q13[ 1 ];
diff --git a/silk/stereo_MS_to_LR.c b/silk/stereo_MS_to_LR.c
index d510de9ea..a858f5511 100644
--- a/silk/stereo_MS_to_LR.c
+++ b/silk/stereo_MS_to_LR.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -34,49 +34,48 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Convert adaptive Mid/Side representation to Left/Right stereo signal */
 void silk_stereo_MS_to_LR(
     stereo_dec_state            *state,                         /* I/O  State                                       */
-    oac_int16                  x1[],                           /* I/O  Left input signal, becomes mid signal       */
-    oac_int16                  x2[],                           /* I/O  Right input signal, becomes side signal     */
-    const oac_int32            pred_Q13[],                     /* I    Predictors                                  */
-    oac_int                    fs_kHz,                         /* I    Samples rate (kHz)                          */
-    oac_int                    frame_length                    /* I    Number of samples                           */
-)
-{
-    oac_int   n, denom_Q16, delta0_Q13, delta1_Q13;
+    oac_int16 x1[],                                            /* I/O  Left input signal, becomes mid signal       */
+    oac_int16 x2[],                                            /* I/O  Right input signal, becomes side signal     */
+    const oac_int32 pred_Q13[],                                /* I    Predictors                                  */
+    oac_int fs_kHz,                                            /* I    Samples rate (kHz)                          */
+    oac_int frame_length                                       /* I    Number of samples                           */
+    ) {
+    oac_int n, denom_Q16, delta0_Q13, delta1_Q13;
     oac_int32 sum, diff, pred0_Q13, pred1_Q13;
 
     /* Buffering */
-    silk_memcpy( x1, state->sMid,  2 * sizeof( oac_int16 ) );
-    silk_memcpy( x2, state->sSide, 2 * sizeof( oac_int16 ) );
-    silk_memcpy( state->sMid,  &x1[ frame_length ], 2 * sizeof( oac_int16 ) );
-    silk_memcpy( state->sSide, &x2[ frame_length ], 2 * sizeof( oac_int16 ) );
+    silk_memcpy( x1, state->sMid,  2*sizeof(oac_int16));
+    silk_memcpy( x2, state->sSide, 2*sizeof(oac_int16));
+    silk_memcpy( state->sMid,  &x1[ frame_length ], 2*sizeof(oac_int16));
+    silk_memcpy( state->sSide, &x2[ frame_length ], 2*sizeof(oac_int16));
 
     /* Interpolate predictors and add prediction to side channel */
     pred0_Q13  = state->pred_prev_Q13[ 0 ];
     pred1_Q13  = state->pred_prev_Q13[ 1 ];
-    denom_Q16  = silk_DIV32_16( (oac_int32)1 << 16, STEREO_INTERP_LEN_MS * fs_kHz );
+    denom_Q16  = silk_DIV32_16((oac_int32)1<<16, STEREO_INTERP_LEN_MS*fs_kHz );
     delta0_Q13 = silk_RSHIFT_ROUND( silk_SMULBB( pred_Q13[ 0 ] - state->pred_prev_Q13[ 0 ], denom_Q16 ), 16 );
     delta1_Q13 = silk_RSHIFT_ROUND( silk_SMULBB( pred_Q13[ 1 ] - state->pred_prev_Q13[ 1 ], denom_Q16 ), 16 );
-    for( n = 0; n < STEREO_INTERP_LEN_MS * fs_kHz; n++ ) {
+    for (n = 0; n < STEREO_INTERP_LEN_MS*fs_kHz; n++) {
         pred0_Q13 += delta0_Q13;
         pred1_Q13 += delta1_Q13;
         sum = silk_LSHIFT( silk_ADD_LSHIFT32( x1[ n ] + (oac_int32)x1[ n + 2 ], x1[ n + 1 ], 1 ), 9 );       /* Q11 */
-        sum = silk_SMLAWB( silk_LSHIFT( (oac_int32)x2[ n + 1 ], 8 ), sum, pred0_Q13 );         /* Q8  */
-        sum = silk_SMLAWB( sum, silk_LSHIFT( (oac_int32)x1[ n + 1 ], 11 ), pred1_Q13 );        /* Q8  */
-        x2[ n + 1 ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( sum, 8 ) );
+        sum = silk_SMLAWB( silk_LSHIFT((oac_int32)x2[ n + 1 ], 8 ), sum, pred0_Q13 );          /* Q8  */
+        sum = silk_SMLAWB( sum, silk_LSHIFT((oac_int32)x1[ n + 1 ], 11 ), pred1_Q13 );         /* Q8  */
+        x2[ n + 1 ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( sum, 8 ));
     }
     pred0_Q13 = pred_Q13[ 0 ];
     pred1_Q13 = pred_Q13[ 1 ];
-    for( n = STEREO_INTERP_LEN_MS * fs_kHz; n < frame_length; n++ ) {
+    for (n = STEREO_INTERP_LEN_MS*fs_kHz; n < frame_length; n++) {
         sum = silk_LSHIFT( silk_ADD_LSHIFT32( x1[ n ] + (oac_int32)x1[ n + 2 ], x1[ n + 1 ], 1 ), 9 );       /* Q11 */
-        sum = silk_SMLAWB( silk_LSHIFT( (oac_int32)x2[ n + 1 ], 8 ), sum, pred0_Q13 );         /* Q8  */
-        sum = silk_SMLAWB( sum, silk_LSHIFT( (oac_int32)x1[ n + 1 ], 11 ), pred1_Q13 );        /* Q8  */
-        x2[ n + 1 ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( sum, 8 ) );
+        sum = silk_SMLAWB( silk_LSHIFT((oac_int32)x2[ n + 1 ], 8 ), sum, pred0_Q13 );          /* Q8  */
+        sum = silk_SMLAWB( sum, silk_LSHIFT((oac_int32)x1[ n + 1 ], 11 ), pred1_Q13 );         /* Q8  */
+        x2[ n + 1 ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( sum, 8 ));
     }
     state->pred_prev_Q13[ 0 ] = pred_Q13[ 0 ];
     state->pred_prev_Q13[ 1 ] = pred_Q13[ 1 ];
 
     /* Convert to left/right signals */
-    for( n = 0; n < frame_length; n++ ) {
+    for (n = 0; n < frame_length; n++) {
         sum  = x1[ n + 1 ] + (oac_int32)x2[ n + 1 ];
         diff = x1[ n + 1 ] - (oac_int32)x2[ n + 1 ];
         x1[ n + 1 ] = (oac_int16)silk_SAT16( sum );
diff --git a/silk/stereo_decode_pred.c b/silk/stereo_decode_pred.c
index 54063e6ab..d85ac5ab6 100644
--- a/silk/stereo_decode_pred.c
+++ b/silk/stereo_decode_pred.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -34,28 +34,27 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Decode mid/side predictors */
 void silk_stereo_decode_pred(
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
-    oac_int32                  pred_Q13[]                      /* O    Predictors                                  */
-)
-{
-    oac_int   n, ix[ 2 ][ 3 ];
+    oac_int32 pred_Q13[]                                       /* O    Predictors                                  */
+    ) {
+    oac_int n, ix[ 2 ][ 3 ];
     oac_int32 low_Q13, step_Q13;
 
     /* Entropy decoding */
     n = ec_dec_icdf( psRangeDec, silk_stereo_pred_joint_iCDF, 8 );
     ix[ 0 ][ 2 ] = silk_DIV32_16( n, 5 );
-    ix[ 1 ][ 2 ] = n - 5 * ix[ 0 ][ 2 ];
-    for( n = 0; n < 2; n++ ) {
+    ix[ 1 ][ 2 ] = n - 5*ix[ 0 ][ 2 ];
+    for (n = 0; n < 2; n++) {
         ix[ n ][ 0 ] = ec_dec_icdf( psRangeDec, silk_uniform3_iCDF, 8 );
         ix[ n ][ 1 ] = ec_dec_icdf( psRangeDec, silk_uniform5_iCDF, 8 );
     }
 
     /* Dequantize */
-    for( n = 0; n < 2; n++ ) {
-        ix[ n ][ 0 ] += 3 * ix[ n ][ 2 ];
+    for (n = 0; n < 2; n++) {
+        ix[ n ][ 0 ] += 3*ix[ n ][ 2 ];
         low_Q13 = silk_stereo_pred_quant_Q13[ ix[ n ][ 0 ] ];
         step_Q13 = silk_SMULWB( silk_stereo_pred_quant_Q13[ ix[ n ][ 0 ] + 1 ] - low_Q13,
-            SILK_FIX_CONST( 0.5 / STEREO_QUANT_SUB_STEPS, 16 ) );
-        pred_Q13[ n ] = silk_SMLABB( low_Q13, step_Q13, 2 * ix[ n ][ 1 ] + 1 );
+            SILK_FIX_CONST( 0.5/STEREO_QUANT_SUB_STEPS, 16 ));
+        pred_Q13[ n ] = silk_SMLABB( low_Q13, step_Q13, 2*ix[ n ][ 1 ] + 1 );
     }
 
     /* Subtract second from first predictor (helps when actually applying these) */
@@ -66,8 +65,7 @@ void silk_stereo_decode_pred(
 void silk_stereo_decode_mid_only(
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
     oac_int                    *decode_only_mid                /* O    Flag that only mid channel has been coded   */
-)
-{
+    ) {
     /* Decode flag that only mid channel is coded */
     *decode_only_mid = ec_dec_icdf( psRangeDec, silk_stereo_only_code_mid_iCDF, 8 );
 }
diff --git a/silk/stereo_encode_pred.c b/silk/stereo_encode_pred.c
index 8b1474494..9edce7b10 100644
--- a/silk/stereo_encode_pred.c
+++ b/silk/stereo_encode_pred.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -34,16 +34,15 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Entropy code the mid/side quantization indices */
 void silk_stereo_encode_pred(
     ec_enc                      *psRangeEnc,                    /* I/O  Compressor data structure                   */
-    oac_int8                   ix[ 2 ][ 3 ]                    /* I    Quantization indices                        */
-)
-{
-    oac_int   n;
+    oac_int8 ix[ 2 ][ 3 ]                                      /* I    Quantization indices                        */
+    ) {
+    oac_int n;
 
     /* Entropy coding */
-    n = 5 * ix[ 0 ][ 2 ] + ix[ 1 ][ 2 ];
+    n = 5*ix[ 0 ][ 2 ] + ix[ 1 ][ 2 ];
     celt_assert( n < 25 );
     ec_enc_icdf( psRangeEnc, n, silk_stereo_pred_joint_iCDF, 8 );
-    for( n = 0; n < 2; n++ ) {
+    for (n = 0; n < 2; n++) {
         celt_assert( ix[ n ][ 0 ] < 3 );
         celt_assert( ix[ n ][ 1 ] < STEREO_QUANT_SUB_STEPS );
         ec_enc_icdf( psRangeEnc, ix[ n ][ 0 ], silk_uniform3_iCDF, 8 );
@@ -54,9 +53,7 @@ void silk_stereo_encode_pred(
 /* Entropy code the mid-only flag */
 void silk_stereo_encode_mid_only(
     ec_enc                      *psRangeEnc,                    /* I/O  Compressor data structure                   */
-    oac_int8                   mid_only_flag
-)
-{
+    oac_int8 mid_only_flag)                                             {
     /* Encode flag that only mid channel is coded */
     ec_enc_icdf( psRangeEnc, mid_only_flag, silk_stereo_only_code_mid_iCDF, 8 );
 }
diff --git a/silk/stereo_find_predictor.c b/silk/stereo_find_predictor.c
index 7d0aaaf26..f90fd9e8a 100644
--- a/silk/stereo_find_predictor.c
+++ b/silk/stereo_find_predictor.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
@@ -34,41 +34,42 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Find least-squares prediction gain for one signal based on another and quantize it */
 oac_int32 silk_stereo_find_predictor(                          /* O    Returns predictor in Q13                    */
     oac_int32                  *ratio_Q14,                     /* O    Ratio of residual and mid energies          */
-    const oac_int16            x[],                            /* I    Basis signal                                */
-    const oac_int16            y[],                            /* I    Target signal                               */
-    oac_int32                  mid_res_amp_Q0[],               /* I/O  Smoothed mid, residual norms                */
-    oac_int                    length,                         /* I    Number of samples                           */
-    oac_int                    smooth_coef_Q16                 /* I    Smoothing coefficient                       */
-)
-{
-    oac_int   scale, scale1, scale2;
+    const oac_int16 x[],                                       /* I    Basis signal                                */
+    const oac_int16 y[],                                       /* I    Target signal                               */
+    oac_int32 mid_res_amp_Q0[],                                /* I/O  Smoothed mid, residual norms                */
+    oac_int length,                                            /* I    Number of samples                           */
+    oac_int smooth_coef_Q16                                    /* I    Smoothing coefficient                       */
+    ) {
+    oac_int scale, scale1, scale2;
     oac_int32 nrgx, nrgy, corr, pred_Q13, pred2_Q10;
 
     /* Find  predictor */
     silk_sum_sqr_shift( &nrgx, &scale1, x, length );
     silk_sum_sqr_shift( &nrgy, &scale2, y, length );
     scale = silk_max_int( scale1, scale2 );
-    scale = scale + ( scale & 1 );          /* make even */
+    scale = scale + (scale&1);              /* make even */
     nrgy = silk_RSHIFT32( nrgy, scale - scale2 );
     nrgx = silk_RSHIFT32( nrgx, scale - scale1 );
     nrgx = silk_max_int( nrgx, 1 );
     corr = silk_inner_prod_aligned_scale( x, y, scale, length );
     pred_Q13 = silk_DIV32_varQ( corr, nrgx, 13 );
-    pred_Q13 = silk_LIMIT( pred_Q13, -(1 << 14), 1 << 14 );
+    pred_Q13 = silk_LIMIT( pred_Q13, -(1<<14), 1<<14 );
     pred2_Q10 = silk_SMULWB( pred_Q13, pred_Q13 );
 
     /* Faster update for signals with large prediction parameters */
-    smooth_coef_Q16 = (oac_int)silk_max_int( smooth_coef_Q16, silk_abs( pred2_Q10 ) );
+    smooth_coef_Q16 = (oac_int)silk_max_int( smooth_coef_Q16, silk_abs( pred2_Q10 ));
 
     /* Smoothed mid and residual norms */
     silk_assert( smooth_coef_Q16 < 32768 );
     scale = silk_RSHIFT( scale, 1 );
-    mid_res_amp_Q0[ 0 ] = silk_SMLAWB( mid_res_amp_Q0[ 0 ], silk_LSHIFT( silk_SQRT_APPROX( nrgx ), scale ) - mid_res_amp_Q0[ 0 ],
+    mid_res_amp_Q0[ 0 ] = silk_SMLAWB( mid_res_amp_Q0[ 0 ],
+    silk_LSHIFT( silk_SQRT_APPROX( nrgx ), scale ) - mid_res_amp_Q0[ 0 ],
         smooth_coef_Q16 );
     /* Residual energy = nrgy - 2 * pred * corr + pred^2 * nrgx */
     nrgy = silk_SUB_LSHIFT32( nrgy, silk_SMULWB( corr, pred_Q13 ), 3 + 1 );
     nrgy = silk_ADD_LSHIFT32( nrgy, silk_SMULWB( nrgx, pred2_Q10 ), 6 );
-    mid_res_amp_Q0[ 1 ] = silk_SMLAWB( mid_res_amp_Q0[ 1 ], silk_LSHIFT( silk_SQRT_APPROX( nrgy ), scale ) - mid_res_amp_Q0[ 1 ],
+    mid_res_amp_Q0[ 1 ] = silk_SMLAWB( mid_res_amp_Q0[ 1 ],
+    silk_LSHIFT( silk_SQRT_APPROX( nrgy ), scale ) - mid_res_amp_Q0[ 1 ],
         smooth_coef_Q16 );
 
     /* Ratio of smoothed residual and mid norms */
diff --git a/silk/stereo_quant_pred.c b/silk/stereo_quant_pred.c
index 83873ea04..5747e83a7 100644
--- a/silk/stereo_quant_pred.c
+++ b/silk/stereo_quant_pred.c
@@ -1,57 +1,56 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "main.h"
 
 /* Quantize mid/side predictors */
 void silk_stereo_quant_pred(
-    oac_int32                  pred_Q13[],                     /* I/O  Predictors (out: quantized)                 */
-    oac_int8                   ix[ 2 ][ 3 ]                    /* O    Quantization indices                        */
-)
-{
-    oac_int   i, j, n;
+    oac_int32 pred_Q13[],                                      /* I/O  Predictors (out: quantized)                 */
+    oac_int8 ix[ 2 ][ 3 ]                                      /* O    Quantization indices                        */
+    ) {
+    oac_int i, j, n;
     oac_int32 low_Q13, step_Q13, lvl_Q13, err_min_Q13, err_Q13, quant_pred_Q13 = 0;
 
     /* Quantize */
-    for( n = 0; n < 2; n++ ) {
+    for (n = 0; n < 2; n++) {
         /* Brute-force search over quantization levels */
         err_min_Q13 = silk_int32_MAX;
-        for( i = 0; i < STEREO_QUANT_TAB_SIZE - 1; i++ ) {
+        for (i = 0; i < STEREO_QUANT_TAB_SIZE - 1; i++) {
             low_Q13 = silk_stereo_pred_quant_Q13[ i ];
             step_Q13 = silk_SMULWB( silk_stereo_pred_quant_Q13[ i + 1 ] - low_Q13,
-                SILK_FIX_CONST( 0.5 / STEREO_QUANT_SUB_STEPS, 16 ) );
-            for( j = 0; j < STEREO_QUANT_SUB_STEPS; j++ ) {
-                lvl_Q13 = silk_SMLABB( low_Q13, step_Q13, 2 * j + 1 );
+                SILK_FIX_CONST( 0.5/STEREO_QUANT_SUB_STEPS, 16 ));
+            for (j = 0; j < STEREO_QUANT_SUB_STEPS; j++) {
+                lvl_Q13 = silk_SMLABB( low_Q13, step_Q13, 2*j + 1 );
                 err_Q13 = silk_abs( pred_Q13[ n ] - lvl_Q13 );
-                if( err_Q13 < err_min_Q13 ) {
+                if (err_Q13 < err_min_Q13) {
                     err_min_Q13 = err_Q13;
                     quant_pred_Q13 = lvl_Q13;
                     ix[ n ][ 0 ] = i;
@@ -62,9 +61,9 @@ void silk_stereo_quant_pred(
                 }
             }
         }
-        done:
+done:
         ix[ n ][ 2 ]  = silk_DIV32_16( ix[ n ][ 0 ], 3 );
-        ix[ n ][ 0 ] -= ix[ n ][ 2 ] * 3;
+        ix[ n ][ 0 ] -= ix[ n ][ 2 ]*3;
         pred_Q13[ n ] = quant_pred_Q13;
     }
 
diff --git a/silk/structs.h b/silk/structs.h
index cb335add2..2588a6d5f 100644
--- a/silk/structs.h
+++ b/silk/structs.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_STRUCTS_H
@@ -35,18 +35,18 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "entdec.h"
 
 #ifdef ENABLE_DEEP_PLC
-#include "lpcnet.h"
-#include "lpcnet_private.h"
+# include "lpcnet.h"
+# include "lpcnet_private.h"
 #endif
 
 #ifdef ENABLE_DRED
-#include "dred_encoder.h"
-#include "dred_decoder.h"
+# include "dred_encoder.h"
+# include "dred_decoder.h"
 #endif
 
 #ifdef ENABLE_OSCE
-#include "osce_config.h"
-#include "osce_structs.h"
+# include "osce_config.h"
+# include "osce_structs.h"
 #endif
 
 
@@ -54,50 +54,50 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Noise shaping quantization state */
 /************************************/
 typedef struct {
-    oac_int16                  xq[           2 * MAX_FRAME_LENGTH ]; /* Buffer for quantized output signal                             */
-    oac_int32                  sLTP_shp_Q14[ 2 * MAX_FRAME_LENGTH ];
-    oac_int32                  sLPC_Q14[ MAX_SUB_FRAME_LENGTH + NSQ_LPC_BUF_LENGTH ];
-    oac_int32                  sAR2_Q14[ MAX_SHAPE_LPC_ORDER ];
-    oac_int32                  sLF_AR_shp_Q14;
-    oac_int32                  sDiff_shp_Q14;
-    oac_int                    lagPrev;
-    oac_int                    sLTP_buf_idx;
-    oac_int                    sLTP_shp_buf_idx;
-    oac_int32                  rand_seed;
-    oac_int32                  prev_gain_Q16;
-    oac_int                    rewhite_flag;
+    oac_int16 xq[           2*MAX_FRAME_LENGTH ];                    /* Buffer for quantized output signal                             */
+    oac_int32 sLTP_shp_Q14[ 2*MAX_FRAME_LENGTH ];
+    oac_int32 sLPC_Q14[ MAX_SUB_FRAME_LENGTH + NSQ_LPC_BUF_LENGTH ];
+    oac_int32 sAR2_Q14[ MAX_SHAPE_LPC_ORDER ];
+    oac_int32 sLF_AR_shp_Q14;
+    oac_int32 sDiff_shp_Q14;
+    oac_int lagPrev;
+    oac_int sLTP_buf_idx;
+    oac_int sLTP_shp_buf_idx;
+    oac_int32 rand_seed;
+    oac_int32 prev_gain_Q16;
+    oac_int rewhite_flag;
 } silk_nsq_state;
 
 /********************************/
 /* VAD state                    */
 /********************************/
 typedef struct {
-    oac_int32                  AnaState[ 2 ];                  /* Analysis filterbank state: 0-8 kHz                                   */
-    oac_int32                  AnaState1[ 2 ];                 /* Analysis filterbank state: 0-4 kHz                                   */
-    oac_int32                  AnaState2[ 2 ];                 /* Analysis filterbank state: 0-2 kHz                                   */
-    oac_int32                  XnrgSubfr[ VAD_N_BANDS ];       /* Subframe energies                                                    */
-    oac_int32                  NrgRatioSmth_Q8[ VAD_N_BANDS ]; /* Smoothed energy level in each band                                   */
-    oac_int16                  HPstate;                        /* State of differentiator in the lowest band                           */
-    oac_int32                  NL[ VAD_N_BANDS ];              /* Noise energy level in each band                                      */
-    oac_int32                  inv_NL[ VAD_N_BANDS ];          /* Inverse noise energy level in each band                              */
-    oac_int32                  NoiseLevelBias[ VAD_N_BANDS ];  /* Noise level estimator bias/offset                                    */
-    oac_int32                  counter;                        /* Frame counter used in the initial phase                              */
+    oac_int32 AnaState[ 2 ];                                   /* Analysis filterbank state: 0-8 kHz                                   */
+    oac_int32 AnaState1[ 2 ];                                  /* Analysis filterbank state: 0-4 kHz                                   */
+    oac_int32 AnaState2[ 2 ];                                  /* Analysis filterbank state: 0-2 kHz                                   */
+    oac_int32 XnrgSubfr[ VAD_N_BANDS ];                        /* Subframe energies                                                    */
+    oac_int32 NrgRatioSmth_Q8[ VAD_N_BANDS ];                  /* Smoothed energy level in each band                                   */
+    oac_int16 HPstate;                                         /* State of differentiator in the lowest band                           */
+    oac_int32 NL[ VAD_N_BANDS ];                               /* Noise energy level in each band                                      */
+    oac_int32 inv_NL[ VAD_N_BANDS ];                           /* Inverse noise energy level in each band                              */
+    oac_int32 NoiseLevelBias[ VAD_N_BANDS ];                   /* Noise level estimator bias/offset                                    */
+    oac_int32 counter;                                         /* Frame counter used in the initial phase                              */
 } silk_VAD_state;
 
 /* Variable cut-off low-pass filter state */
 typedef struct {
-    oac_int32                   In_LP_State[ 2 ];           /* Low pass filter state */
-    oac_int32                   transition_frame_no;        /* Counter which is mapped to a cut-off frequency */
-    oac_int                     mode;                       /* Operating mode, <0: switch down, >0: switch up; 0: do nothing           */
-    oac_int32                   saved_fs_kHz;               /* If non-zero, holds the last sampling rate before a bandwidth switching reset. */
+    oac_int32 In_LP_State[ 2 ];                             /* Low pass filter state */
+    oac_int32 transition_frame_no;                          /* Counter which is mapped to a cut-off frequency */
+    oac_int mode;                                           /* Operating mode, <0: switch down, >0: switch up; 0: do nothing           */
+    oac_int32 saved_fs_kHz;                                 /* If non-zero, holds the last sampling rate before a bandwidth switching reset. */
 } silk_LP_state;
 
 /* Structure containing NLSF codebook */
 typedef struct {
-    const oac_int16             nVectors;
-    const oac_int16             order;
-    const oac_int16             quantStepSize_Q16;
-    const oac_int16             invQuantStepSize_Q6;
+    const oac_int16 nVectors;
+    const oac_int16 order;
+    const oac_int16 quantStepSize_Q16;
+    const oac_int16 invQuantStepSize_Q6;
     const oac_uint8             *CB1_NLSF_Q8;
     const oac_int16             *CB1_Wght_Q9;
     const oac_uint8             *CB1_iCDF;
@@ -109,133 +109,133 @@ typedef struct {
 } silk_NLSF_CB_struct;
 
 typedef struct {
-    oac_int16                   pred_prev_Q13[ 2 ];
-    oac_int16                   sMid[ 2 ];
-    oac_int16                   sSide[ 2 ];
-    oac_int32                   mid_side_amp_Q0[ 4 ];
-    oac_int16                   smth_width_Q14;
-    oac_int16                   width_prev_Q14;
-    oac_int16                   silent_side_len;
-    oac_int8                    predIx[ MAX_FRAMES_PER_PACKET ][ 2 ][ 3 ];
-    oac_int8                    mid_only_flags[ MAX_FRAMES_PER_PACKET ];
+    oac_int16 pred_prev_Q13[ 2 ];
+    oac_int16 sMid[ 2 ];
+    oac_int16 sSide[ 2 ];
+    oac_int32 mid_side_amp_Q0[ 4 ];
+    oac_int16 smth_width_Q14;
+    oac_int16 width_prev_Q14;
+    oac_int16 silent_side_len;
+    oac_int8 predIx[ MAX_FRAMES_PER_PACKET ][ 2 ][ 3 ];
+    oac_int8 mid_only_flags[ MAX_FRAMES_PER_PACKET ];
 } stereo_enc_state;
 
 typedef struct {
-    oac_int16                   pred_prev_Q13[ 2 ];
-    oac_int16                   sMid[ 2 ];
-    oac_int16                   sSide[ 2 ];
+    oac_int16 pred_prev_Q13[ 2 ];
+    oac_int16 sMid[ 2 ];
+    oac_int16 sSide[ 2 ];
 } stereo_dec_state;
 
 typedef struct {
-    oac_int8                    GainsIndices[ MAX_NB_SUBFR ];
-    oac_int8                    LTPIndex[ MAX_NB_SUBFR ];
-    oac_int8                    NLSFIndices[ MAX_LPC_ORDER + 1 ];
-    oac_int16                   lagIndex;
-    oac_int8                    contourIndex;
-    oac_int8                    signalType;
-    oac_int8                    quantOffsetType;
-    oac_int8                    NLSFInterpCoef_Q2;
-    oac_int8                    PERIndex;
-    oac_int8                    LTP_scaleIndex;
-    oac_int8                    Seed;
+    oac_int8 GainsIndices[ MAX_NB_SUBFR ];
+    oac_int8 LTPIndex[ MAX_NB_SUBFR ];
+    oac_int8 NLSFIndices[ MAX_LPC_ORDER + 1 ];
+    oac_int16 lagIndex;
+    oac_int8 contourIndex;
+    oac_int8 signalType;
+    oac_int8 quantOffsetType;
+    oac_int8 NLSFInterpCoef_Q2;
+    oac_int8 PERIndex;
+    oac_int8 LTP_scaleIndex;
+    oac_int8 Seed;
 } SideInfoIndices;
 
 /********************************/
 /* Encoder state                */
 /********************************/
 typedef struct {
-    oac_int32                   In_HP_State[ 2 ];                  /* High pass filter state                                           */
-    oac_int32                   variable_HP_smth1_Q15;             /* State of first smoother                                          */
-    oac_int32                   variable_HP_smth2_Q15;             /* State of second smoother                                         */
-    silk_LP_state                sLP;                               /* Low pass filter state                                            */
-    silk_VAD_state               sVAD;                              /* Voice activity detector state                                    */
-    silk_nsq_state               sNSQ;                              /* Noise Shape Quantizer State                                      */
-    oac_int16                   prev_NLSFq_Q15[ MAX_LPC_ORDER ];   /* Previously quantized NLSF vector                                 */
-    oac_int                     speech_activity_Q8;                /* Speech activity                                                  */
-    oac_int                     allow_bandwidth_switch;            /* Flag indicating that switching of internal bandwidth is allowed  */
-    oac_int8                    LBRRprevLastGainIndex;
-    oac_int8                    prevSignalType;
-    oac_int                     prevLag;
-    oac_int                     pitch_LPC_win_length;
-    oac_int                     max_pitch_lag;                     /* Highest possible pitch lag (samples)                             */
-    oac_int32                   API_fs_Hz;                         /* API sampling frequency (Hz)                                      */
-    oac_int32                   prev_API_fs_Hz;                    /* Previous API sampling frequency (Hz)                             */
-    oac_int                     maxInternal_fs_Hz;                 /* Maximum internal sampling frequency (Hz)                         */
-    oac_int                     minInternal_fs_Hz;                 /* Minimum internal sampling frequency (Hz)                         */
-    oac_int                     desiredInternal_fs_Hz;             /* Soft request for internal sampling frequency (Hz)                */
-    oac_int                     fs_kHz;                            /* Internal sampling frequency (kHz)                                */
-    oac_int                     nb_subfr;                          /* Number of 5 ms subframes in a frame                              */
-    oac_int                     frame_length;                      /* Frame length (samples)                                           */
-    oac_int                     subfr_length;                      /* Subframe length (samples)                                        */
-    oac_int                     ltp_mem_length;                    /* Length of LTP memory                                             */
-    oac_int                     la_pitch;                          /* Look-ahead for pitch analysis (samples)                          */
-    oac_int                     la_shape;                          /* Look-ahead for noise shape analysis (samples)                    */
-    oac_int                     shapeWinLength;                    /* Window length for noise shape analysis (samples)                 */
-    oac_int32                   TargetRate_bps;                    /* Target bitrate (bps)                                             */
-    oac_int                     PacketSize_ms;                     /* Number of milliseconds to put in each packet                     */
-    oac_int                     PacketLoss_perc;                   /* Packet loss rate measured by farend                              */
-    oac_int32                   frameCounter;
-    oac_int                     Complexity;                        /* Complexity setting                                               */
-    oac_int                     nStatesDelayedDecision;            /* Number of states in delayed decision quantization                */
-    oac_int                     useInterpolatedNLSFs;              /* Flag for using NLSF interpolation                                */
-    oac_int                     shapingLPCOrder;                   /* Filter order for noise shaping filters                           */
-    oac_int                     predictLPCOrder;                   /* Filter order for prediction filters                              */
-    oac_int                     pitchEstimationComplexity;         /* Complexity level for pitch estimator                             */
-    oac_int                     pitchEstimationLPCOrder;           /* Whitening filter order for pitch estimator                       */
-    oac_int32                   pitchEstimationThreshold_Q16;      /* Threshold for pitch estimator                                    */
-    oac_int32                   sum_log_gain_Q7;                   /* Cumulative max prediction gain                                   */
-    oac_int                     NLSF_MSVQ_Survivors;               /* Number of survivors in NLSF MSVQ                                 */
-    oac_int                     first_frame_after_reset;           /* Flag for deactivating NLSF interpolation, pitch prediction       */
-    oac_int                     controlled_since_last_payload;     /* Flag for ensuring codec_control only runs once per packet        */
-    oac_int                     warping_Q16;                       /* Warping parameter for warped noise shaping                       */
-    oac_int                     useCBR;                            /* Flag to enable constant bitrate                                  */
-    oac_int                     prefillFlag;                       /* Flag to indicate that only buffers are prefilled, no coding      */
+    oac_int32 In_HP_State[ 2 ];                                    /* High pass filter state                                           */
+    oac_int32 variable_HP_smth1_Q15;                               /* State of first smoother                                          */
+    oac_int32 variable_HP_smth2_Q15;                               /* State of second smoother                                         */
+    silk_LP_state sLP;                                              /* Low pass filter state                                            */
+    silk_VAD_state sVAD;                                            /* Voice activity detector state                                    */
+    silk_nsq_state sNSQ;                                            /* Noise Shape Quantizer State                                      */
+    oac_int16 prev_NLSFq_Q15[ MAX_LPC_ORDER ];                     /* Previously quantized NLSF vector                                 */
+    oac_int speech_activity_Q8;                                    /* Speech activity                                                  */
+    oac_int allow_bandwidth_switch;                                /* Flag indicating that switching of internal bandwidth is allowed  */
+    oac_int8 LBRRprevLastGainIndex;
+    oac_int8 prevSignalType;
+    oac_int prevLag;
+    oac_int pitch_LPC_win_length;
+    oac_int max_pitch_lag;                                         /* Highest possible pitch lag (samples)                             */
+    oac_int32 API_fs_Hz;                                           /* API sampling frequency (Hz)                                      */
+    oac_int32 prev_API_fs_Hz;                                      /* Previous API sampling frequency (Hz)                             */
+    oac_int maxInternal_fs_Hz;                                     /* Maximum internal sampling frequency (Hz)                         */
+    oac_int minInternal_fs_Hz;                                     /* Minimum internal sampling frequency (Hz)                         */
+    oac_int desiredInternal_fs_Hz;                                 /* Soft request for internal sampling frequency (Hz)                */
+    oac_int fs_kHz;                                                /* Internal sampling frequency (kHz)                                */
+    oac_int nb_subfr;                                              /* Number of 5 ms subframes in a frame                              */
+    oac_int frame_length;                                          /* Frame length (samples)                                           */
+    oac_int subfr_length;                                          /* Subframe length (samples)                                        */
+    oac_int ltp_mem_length;                                        /* Length of LTP memory                                             */
+    oac_int la_pitch;                                              /* Look-ahead for pitch analysis (samples)                          */
+    oac_int la_shape;                                              /* Look-ahead for noise shape analysis (samples)                    */
+    oac_int shapeWinLength;                                        /* Window length for noise shape analysis (samples)                 */
+    oac_int32 TargetRate_bps;                                      /* Target bitrate (bps)                                             */
+    oac_int PacketSize_ms;                                         /* Number of milliseconds to put in each packet                     */
+    oac_int PacketLoss_perc;                                       /* Packet loss rate measured by farend                              */
+    oac_int32 frameCounter;
+    oac_int Complexity;                                            /* Complexity setting                                               */
+    oac_int nStatesDelayedDecision;                                /* Number of states in delayed decision quantization                */
+    oac_int useInterpolatedNLSFs;                                  /* Flag for using NLSF interpolation                                */
+    oac_int shapingLPCOrder;                                       /* Filter order for noise shaping filters                           */
+    oac_int predictLPCOrder;                                       /* Filter order for prediction filters                              */
+    oac_int pitchEstimationComplexity;                             /* Complexity level for pitch estimator                             */
+    oac_int pitchEstimationLPCOrder;                               /* Whitening filter order for pitch estimator                       */
+    oac_int32 pitchEstimationThreshold_Q16;                        /* Threshold for pitch estimator                                    */
+    oac_int32 sum_log_gain_Q7;                                     /* Cumulative max prediction gain                                   */
+    oac_int NLSF_MSVQ_Survivors;                                   /* Number of survivors in NLSF MSVQ                                 */
+    oac_int first_frame_after_reset;                               /* Flag for deactivating NLSF interpolation, pitch prediction       */
+    oac_int controlled_since_last_payload;                         /* Flag for ensuring codec_control only runs once per packet        */
+    oac_int warping_Q16;                                           /* Warping parameter for warped noise shaping                       */
+    oac_int useCBR;                                                /* Flag to enable constant bitrate                                  */
+    oac_int prefillFlag;                                           /* Flag to indicate that only buffers are prefilled, no coding      */
     const oac_uint8             *pitch_lag_low_bits_iCDF;          /* Pointer to iCDF table for low bits of pitch lag index            */
     const oac_uint8             *pitch_contour_iCDF;               /* Pointer to iCDF table for pitch contour index                    */
     const silk_NLSF_CB_struct    *psNLSF_CB;                        /* Pointer to NLSF codebook                                         */
-    oac_int                     input_quality_bands_Q15[ VAD_N_BANDS ];
-    oac_int                     input_tilt_Q15;
-    oac_int                     SNR_dB_Q7;                         /* Quality setting                                                  */
+    oac_int input_quality_bands_Q15[ VAD_N_BANDS ];
+    oac_int input_tilt_Q15;
+    oac_int SNR_dB_Q7;                                             /* Quality setting                                                  */
 
-    oac_int8                    VAD_flags[ MAX_FRAMES_PER_PACKET ];
-    oac_int8                    LBRR_flag;
-    oac_int                     LBRR_flags[ MAX_FRAMES_PER_PACKET ];
+    oac_int8 VAD_flags[ MAX_FRAMES_PER_PACKET ];
+    oac_int8 LBRR_flag;
+    oac_int LBRR_flags[ MAX_FRAMES_PER_PACKET ];
 
-    SideInfoIndices              indices;
-    oac_int8                    pulses[ MAX_FRAME_LENGTH ];
+    SideInfoIndices indices;
+    oac_int8 pulses[ MAX_FRAME_LENGTH ];
 
-    int                          arch;
+    int arch;
 
     /* Input/output buffering */
-    oac_int16                   inputBuf[ MAX_FRAME_LENGTH + 2 ];  /* Buffer containing input signal                                   */
-    oac_int                     inputBufIx;
-    oac_int                     nFramesPerPacket;
-    oac_int                     nFramesEncoded;                    /* Number of frames analyzed in current packet                      */
+    oac_int16 inputBuf[ MAX_FRAME_LENGTH + 2 ];                    /* Buffer containing input signal                                   */
+    oac_int inputBufIx;
+    oac_int nFramesPerPacket;
+    oac_int nFramesEncoded;                                        /* Number of frames analyzed in current packet                      */
 
-    oac_int                     nChannelsAPI;
-    oac_int                     nChannelsInternal;
-    oac_int                     channelNb;
+    oac_int nChannelsAPI;
+    oac_int nChannelsInternal;
+    oac_int channelNb;
 
     /* Parameters For LTP scaling Control */
-    oac_int                     frames_since_onset;
+    oac_int frames_since_onset;
 
     /* Specifically for entropy coding */
-    oac_int                     ec_prevSignalType;
-    oac_int16                   ec_prevLagIndex;
+    oac_int ec_prevSignalType;
+    oac_int16 ec_prevLagIndex;
 
     silk_resampler_state_struct resampler_state;
 
     /* DTX */
-    oac_int                     useDTX;                            /* Flag to enable DTX                                               */
-    oac_int                     inDTX;                             /* Flag to signal DTX period                                        */
-    oac_int                     noSpeechCounter;                   /* Counts concecutive nonactive frames, used by DTX                 */
+    oac_int useDTX;                                                /* Flag to enable DTX                                               */
+    oac_int inDTX;                                                 /* Flag to signal DTX period                                        */
+    oac_int noSpeechCounter;                                       /* Counts concecutive nonactive frames, used by DTX                 */
 
     /* Inband Low Bitrate Redundancy (LBRR) data */
-    oac_int                     useInBandFEC;                      /* Saves the API setting for query                                  */
-    oac_int                     LBRR_enabled;                      /* Depends on useInBandFRC, bitrate and packet loss rate            */
-    oac_int                     LBRR_GainIncreases;                /* Gains increment for coding LBRR frames                           */
-    SideInfoIndices              indices_LBRR[ MAX_FRAMES_PER_PACKET ];
-    oac_int8                    pulses_LBRR[ MAX_FRAMES_PER_PACKET ][ MAX_FRAME_LENGTH ];
+    oac_int useInBandFEC;                                          /* Saves the API setting for query                                  */
+    oac_int LBRR_enabled;                                          /* Depends on useInBandFRC, bitrate and packet loss rate            */
+    oac_int LBRR_GainIncreases;                                    /* Gains increment for coding LBRR frames                           */
+    SideInfoIndices indices_LBRR[ MAX_FRAMES_PER_PACKET ];
+    oac_int8 pulses_LBRR[ MAX_FRAMES_PER_PACKET ][ MAX_FRAME_LENGTH ];
 } silk_encoder_state;
 
 
@@ -254,30 +254,30 @@ typedef struct {
 
 /* Struct for Packet Loss Concealment */
 typedef struct {
-    oac_int32                  pitchL_Q8;                          /* Pitch lag to use for voiced concealment                          */
-    oac_int16                  LTPCoef_Q14[ LTP_ORDER ];           /* LTP coefficients to use for voiced concealment                   */
-    oac_int16                  prevLPC_Q12[ MAX_LPC_ORDER ];
-    oac_int                    last_frame_lost;                    /* Was previous frame lost                                          */
-    oac_int32                  rand_seed;                          /* Seed for unvoiced signal generation                              */
-    oac_int16                  randScale_Q14;                      /* Scaling of unvoiced random signal                                */
-    oac_int32                  conc_energy;
-    oac_int                    conc_energy_shift;
-    oac_int16                  prevLTP_scale_Q14;
-    oac_int32                  prevGain_Q16[ 2 ];
-    oac_int                    fs_kHz;
-    oac_int                    nb_subfr;
-    oac_int                    subfr_length;
-    oac_int                    enable_deep_plc;
+    oac_int32 pitchL_Q8;                                           /* Pitch lag to use for voiced concealment                          */
+    oac_int16 LTPCoef_Q14[ LTP_ORDER ];                            /* LTP coefficients to use for voiced concealment                   */
+    oac_int16 prevLPC_Q12[ MAX_LPC_ORDER ];
+    oac_int last_frame_lost;                                       /* Was previous frame lost                                          */
+    oac_int32 rand_seed;                                           /* Seed for unvoiced signal generation                              */
+    oac_int16 randScale_Q14;                                       /* Scaling of unvoiced random signal                                */
+    oac_int32 conc_energy;
+    oac_int conc_energy_shift;
+    oac_int16 prevLTP_scale_Q14;
+    oac_int32 prevGain_Q16[ 2 ];
+    oac_int fs_kHz;
+    oac_int nb_subfr;
+    oac_int subfr_length;
+    oac_int enable_deep_plc;
 } silk_PLC_struct;
 
 /* Struct for CNG */
 typedef struct {
-    oac_int32                  CNG_exc_buf_Q14[ MAX_FRAME_LENGTH ];
-    oac_int16                  CNG_smth_NLSF_Q15[ MAX_LPC_ORDER ];
-    oac_int32                  CNG_synth_state[ MAX_LPC_ORDER ];
-    oac_int32                  CNG_smth_Gain_Q16;
-    oac_int32                  rand_seed;
-    oac_int                    fs_kHz;
+    oac_int32 CNG_exc_buf_Q14[ MAX_FRAME_LENGTH ];
+    oac_int16 CNG_smth_NLSF_Q15[ MAX_LPC_ORDER ];
+    oac_int32 CNG_synth_state[ MAX_LPC_ORDER ];
+    oac_int32 CNG_smth_Gain_Q16;
+    oac_int32 rand_seed;
+    oac_int fs_kHz;
 } silk_CNG_struct;
 
 /********************************/
@@ -285,56 +285,56 @@ typedef struct {
 /********************************/
 typedef struct {
 #ifdef ENABLE_OSCE
-    silk_OSCE_struct            osce;
-#ifdef ENABLE_OSCE_BWE
-    silk_OSCE_BWE_struct        osce_bwe;
-#endif
+    silk_OSCE_struct osce;
+# ifdef ENABLE_OSCE_BWE
+    silk_OSCE_BWE_struct osce_bwe;
+# endif
 #endif
 #define SILK_DECODER_STATE_RESET_START prev_gain_Q16
-    oac_int32                  prev_gain_Q16;
-    oac_int32                  exc_Q14[ MAX_FRAME_LENGTH ];
-    oac_int32                  sLPC_Q14_buf[ MAX_LPC_ORDER ];
-    oac_int16                  outBuf[ MAX_FRAME_LENGTH + 2 * MAX_SUB_FRAME_LENGTH ];  /* Buffer for output signal                     */
-    oac_int                    lagPrev;                            /* Previous Lag                                                     */
-    oac_int8                   LastGainIndex;                      /* Previous gain index                                              */
-    oac_int                    fs_kHz;                             /* Sampling frequency in kHz                                        */
-    oac_int32                  fs_API_hz;                          /* API sample frequency (Hz)                                        */
-    oac_int                    nb_subfr;                           /* Number of 5 ms subframes in a frame                              */
-    oac_int                    frame_length;                       /* Frame length (samples)                                           */
-    oac_int                    subfr_length;                       /* Subframe length (samples)                                        */
-    oac_int                    ltp_mem_length;                     /* Length of LTP memory                                             */
-    oac_int                    LPC_order;                          /* LPC order                                                        */
-    oac_int16                  prevNLSF_Q15[ MAX_LPC_ORDER ];      /* Used to interpolate LSFs                                         */
-    oac_int                    first_frame_after_reset;            /* Flag for deactivating NLSF interpolation                         */
+    oac_int32 prev_gain_Q16;
+    oac_int32 exc_Q14[ MAX_FRAME_LENGTH ];
+    oac_int32 sLPC_Q14_buf[ MAX_LPC_ORDER ];
+    oac_int16 outBuf[ MAX_FRAME_LENGTH + 2*MAX_SUB_FRAME_LENGTH ];                     /* Buffer for output signal                     */
+    oac_int lagPrev;                                               /* Previous Lag                                                     */
+    oac_int8 LastGainIndex;                                        /* Previous gain index                                              */
+    oac_int fs_kHz;                                                /* Sampling frequency in kHz                                        */
+    oac_int32 fs_API_hz;                                           /* API sample frequency (Hz)                                        */
+    oac_int nb_subfr;                                              /* Number of 5 ms subframes in a frame                              */
+    oac_int frame_length;                                          /* Frame length (samples)                                           */
+    oac_int subfr_length;                                          /* Subframe length (samples)                                        */
+    oac_int ltp_mem_length;                                        /* Length of LTP memory                                             */
+    oac_int LPC_order;                                             /* LPC order                                                        */
+    oac_int16 prevNLSF_Q15[ MAX_LPC_ORDER ];                       /* Used to interpolate LSFs                                         */
+    oac_int first_frame_after_reset;                               /* Flag for deactivating NLSF interpolation                         */
     const oac_uint8            *pitch_lag_low_bits_iCDF;           /* Pointer to iCDF table for low bits of pitch lag index            */
     const oac_uint8            *pitch_contour_iCDF;                /* Pointer to iCDF table for pitch contour index                    */
 
     /* For buffering payload in case of more frames per packet */
-    oac_int                    nFramesDecoded;
-    oac_int                    nFramesPerPacket;
+    oac_int nFramesDecoded;
+    oac_int nFramesPerPacket;
 
     /* Specifically for entropy coding */
-    oac_int                    ec_prevSignalType;
-    oac_int16                  ec_prevLagIndex;
+    oac_int ec_prevSignalType;
+    oac_int16 ec_prevLagIndex;
 
-    oac_int                    VAD_flags[ MAX_FRAMES_PER_PACKET ];
-    oac_int                    LBRR_flag;
-    oac_int                    LBRR_flags[ MAX_FRAMES_PER_PACKET ];
+    oac_int VAD_flags[ MAX_FRAMES_PER_PACKET ];
+    oac_int LBRR_flag;
+    oac_int LBRR_flags[ MAX_FRAMES_PER_PACKET ];
 
     silk_resampler_state_struct resampler_state;
 
     const silk_NLSF_CB_struct   *psNLSF_CB;                         /* Pointer to NLSF codebook                                         */
 
     /* Quantization indices */
-    SideInfoIndices             indices;
+    SideInfoIndices indices;
 
     /* CNG state */
-    silk_CNG_struct             sCNG;
+    silk_CNG_struct sCNG;
 
     /* Stuff used for PLC */
-    oac_int                    lossCnt;
-    oac_int                    prevSignalType;
-    int                         arch;
+    oac_int lossCnt;
+    oac_int prevSignalType;
+    int arch;
 
     silk_PLC_struct sPLC;
 
@@ -345,12 +345,12 @@ typedef struct {
 /************************/
 typedef struct {
     /* Prediction and coding parameters */
-    oac_int                    pitchL[ MAX_NB_SUBFR ];
-    oac_int32                  Gains_Q16[ MAX_NB_SUBFR ];
+    oac_int pitchL[ MAX_NB_SUBFR ];
+    oac_int32 Gains_Q16[ MAX_NB_SUBFR ];
     /* Holds interpolated and final coefficients, 4-byte aligned */
     silk_DWORD_ALIGN oac_int16 PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ];
-    oac_int16                  LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ];
-    oac_int                    LTP_scale_Q14;
+    oac_int16 LTPCoef_Q14[ LTP_ORDER*MAX_NB_SUBFR ];
+    oac_int LTP_scale_Q14;
 } silk_decoder_control;
 
 
diff --git a/silk/sum_sqr_shift.c b/silk/sum_sqr_shift.c
index 77db747a0..fd9e50631 100644
--- a/silk/sum_sqr_shift.c
+++ b/silk/sum_sqr_shift.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "SigProc_FIX.h"
@@ -37,23 +37,22 @@ void silk_sum_sqr_shift(
     oac_int32                  *energy,            /* O   Energy of x, after shifting to the right                     */
     oac_int                    *shift,             /* O   Number of bits right shift applied to energy                 */
     const oac_int16            *x,                 /* I   Input vector                                                 */
-    oac_int                    len                 /* I   Length of input vector                                       */
-)
-{
-    oac_int   i, shft;
+    oac_int len                                    /* I   Length of input vector                                       */
+    ) {
+    oac_int i, shft;
     oac_uint32 nrg_tmp;
     oac_int32 nrg;
 
     /* Do a first run with the maximum shift we could have. */
-    shft = 31-silk_CLZ32(len);
+    shft = 31 - silk_CLZ32(len);
     /* Let's be conservative with rounding and start with nrg=len. */
     nrg  = len;
-    for( i = 0; i < len - 1; i += 2 ) {
+    for (i = 0; i < len - 1; i += 2) {
         nrg_tmp = silk_SMULBB( x[ i ], x[ i ] );
         nrg_tmp = silk_SMLABB_ovflw( nrg_tmp, x[ i + 1 ], x[ i + 1 ] );
         nrg = (oac_int32)silk_ADD_RSHIFT_uint( nrg, nrg_tmp, shft );
     }
-    if( i < len ) {
+    if (i < len) {
         /* One sample left to process */
         nrg_tmp = silk_SMULBB( x[ i ], x[ i ] );
         nrg = (oac_int32)silk_ADD_RSHIFT_uint( nrg, nrg_tmp, shft );
@@ -61,14 +60,14 @@ void silk_sum_sqr_shift(
     silk_assert( nrg >= 0 );
     /* Make sure the result will fit in a 32-bit signed integer with two bits
        of headroom. */
-    shft = silk_max_32(0, shft+3 - silk_CLZ32(nrg));
+    shft = silk_max_32(0, shft + 3 - silk_CLZ32(nrg));
     nrg = 0;
-    for( i = 0 ; i < len - 1; i += 2 ) {
+    for (i = 0 ; i < len - 1; i += 2) {
         nrg_tmp = silk_SMULBB( x[ i ], x[ i ] );
         nrg_tmp = silk_SMLABB_ovflw( nrg_tmp, x[ i + 1 ], x[ i + 1 ] );
         nrg = (oac_int32)silk_ADD_RSHIFT_uint( nrg, nrg_tmp, shft );
     }
-    if( i < len ) {
+    if (i < len) {
         /* One sample left to process */
         nrg_tmp = silk_SMULBB( x[ i ], x[ i ] );
         nrg = (oac_int32)silk_ADD_RSHIFT_uint( nrg, nrg_tmp, shft );
diff --git a/silk/table_LSF_cos.c b/silk/table_LSF_cos.c
index 99711f66d..442dd7d56 100644
--- a/silk/table_LSF_cos.c
+++ b/silk/table_LSF_cos.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "tables.h"
@@ -34,37 +34,37 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Cosine approximation table for LSF conversion */
 /* Q12 values (even) */
 const oac_int16 silk_LSFCosTab_FIX_Q12[ LSF_COS_TAB_SZ_FIX + 1 ] = {
-            8192,             8190,             8182,             8170,
-            8152,             8130,             8104,             8072,
-            8034,             7994,             7946,             7896,
-            7840,             7778,             7714,             7644,
-            7568,             7490,             7406,             7318,
-            7226,             7128,             7026,             6922,
-            6812,             6698,             6580,             6458,
-            6332,             6204,             6070,             5934,
-            5792,             5648,             5502,             5352,
-            5198,             5040,             4880,             4718,
-            4552,             4382,             4212,             4038,
-            3862,             3684,             3502,             3320,
-            3136,             2948,             2760,             2570,
-            2378,             2186,             1990,             1794,
-            1598,             1400,             1202,             1002,
-             802,              602,              402,              202,
-               0,             -202,             -402,             -602,
-            -802,            -1002,            -1202,            -1400,
-           -1598,            -1794,            -1990,            -2186,
-           -2378,            -2570,            -2760,            -2948,
-           -3136,            -3320,            -3502,            -3684,
-           -3862,            -4038,            -4212,            -4382,
-           -4552,            -4718,            -4880,            -5040,
-           -5198,            -5352,            -5502,            -5648,
-           -5792,            -5934,            -6070,            -6204,
-           -6332,            -6458,            -6580,            -6698,
-           -6812,            -6922,            -7026,            -7128,
-           -7226,            -7318,            -7406,            -7490,
-           -7568,            -7644,            -7714,            -7778,
-           -7840,            -7896,            -7946,            -7994,
-           -8034,            -8072,            -8104,            -8130,
-           -8152,            -8170,            -8182,            -8190,
-           -8192
+    8192,             8190,             8182,             8170,
+    8152,             8130,             8104,             8072,
+    8034,             7994,             7946,             7896,
+    7840,             7778,             7714,             7644,
+    7568,             7490,             7406,             7318,
+    7226,             7128,             7026,             6922,
+    6812,             6698,             6580,             6458,
+    6332,             6204,             6070,             5934,
+    5792,             5648,             5502,             5352,
+    5198,             5040,             4880,             4718,
+    4552,             4382,             4212,             4038,
+    3862,             3684,             3502,             3320,
+    3136,             2948,             2760,             2570,
+    2378,             2186,             1990,             1794,
+    1598,             1400,             1202,             1002,
+    802,              602,              402,              202,
+    0,             -202,             -402,             -602,
+    -802,            -1002,            -1202,            -1400,
+    -1598,            -1794,            -1990,            -2186,
+    -2378,            -2570,            -2760,            -2948,
+    -3136,            -3320,            -3502,            -3684,
+    -3862,            -4038,            -4212,            -4382,
+    -4552,            -4718,            -4880,            -5040,
+    -5198,            -5352,            -5502,            -5648,
+    -5792,            -5934,            -6070,            -6204,
+    -6332,            -6458,            -6580,            -6698,
+    -6812,            -6922,            -7026,            -7128,
+    -7226,            -7318,            -7406,            -7490,
+    -7568,            -7644,            -7714,            -7778,
+    -7840,            -7896,            -7946,            -7994,
+    -8034,            -8072,            -8104,            -8130,
+    -8152,            -8170,            -8182,            -8190,
+    -8192
 };
diff --git a/silk/tables.h b/silk/tables.h
index d61d41a64..d80c7ed18 100644
--- a/silk/tables.h
+++ b/silk/tables.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_TABLES_H
@@ -33,74 +33,74 @@ POSSIBILITY OF SUCH DAMAGE.
 
 
 /* Entropy coding tables (with size in bytes indicated) */
-extern const oac_uint8  silk_gain_iCDF[ 3 ][ N_LEVELS_QGAIN / 8 ];                                 /* 24 */
-extern const oac_uint8  silk_delta_gain_iCDF[ MAX_DELTA_GAIN_QUANT - MIN_DELTA_GAIN_QUANT + 1 ];   /* 41 */
+extern const oac_uint8 silk_gain_iCDF[ 3 ][ N_LEVELS_QGAIN/8 ];                                    /* 24 */
+extern const oac_uint8 silk_delta_gain_iCDF[ MAX_DELTA_GAIN_QUANT - MIN_DELTA_GAIN_QUANT + 1 ];    /* 41 */
 
-extern const oac_uint8  silk_pitch_lag_iCDF[ 2 * ( PITCH_EST_MAX_LAG_MS - PITCH_EST_MIN_LAG_MS ) ];/* 32 */
-extern const oac_uint8  silk_pitch_delta_iCDF[ 21 ];                                               /*  21 */
-extern const oac_uint8  silk_pitch_contour_iCDF[ 34 ];                                             /*  34 */
-extern const oac_uint8  silk_pitch_contour_NB_iCDF[ 11 ];                                          /*  11 */
-extern const oac_uint8  silk_pitch_contour_10_ms_iCDF[ 12 ];                                       /*  12 */
-extern const oac_uint8  silk_pitch_contour_10_ms_NB_iCDF[ 3 ];                                     /*   3 */
+extern const oac_uint8 silk_pitch_lag_iCDF[ 2*(PITCH_EST_MAX_LAG_MS - PITCH_EST_MIN_LAG_MS) ];     /* 32 */
+extern const oac_uint8 silk_pitch_delta_iCDF[ 21 ];                                                /*  21 */
+extern const oac_uint8 silk_pitch_contour_iCDF[ 34 ];                                              /*  34 */
+extern const oac_uint8 silk_pitch_contour_NB_iCDF[ 11 ];                                           /*  11 */
+extern const oac_uint8 silk_pitch_contour_10_ms_iCDF[ 12 ];                                        /*  12 */
+extern const oac_uint8 silk_pitch_contour_10_ms_NB_iCDF[ 3 ];                                      /*   3 */
 
-extern const oac_uint8  silk_pulses_per_block_iCDF[ N_RATE_LEVELS ][ SILK_MAX_PULSES + 2 ];        /* 180 */
-extern const oac_uint8  silk_pulses_per_block_BITS_Q5[ N_RATE_LEVELS - 1 ][ SILK_MAX_PULSES + 2 ]; /* 162 */
+extern const oac_uint8 silk_pulses_per_block_iCDF[ N_RATE_LEVELS ][ SILK_MAX_PULSES + 2 ];         /* 180 */
+extern const oac_uint8 silk_pulses_per_block_BITS_Q5[ N_RATE_LEVELS - 1 ][ SILK_MAX_PULSES + 2 ];  /* 162 */
 
-extern const oac_uint8  silk_rate_levels_iCDF[ 2 ][ N_RATE_LEVELS - 1 ];                           /*  18 */
-extern const oac_uint8  silk_rate_levels_BITS_Q5[ 2 ][ N_RATE_LEVELS - 1 ];                        /*  18 */
+extern const oac_uint8 silk_rate_levels_iCDF[ 2 ][ N_RATE_LEVELS - 1 ];                            /*  18 */
+extern const oac_uint8 silk_rate_levels_BITS_Q5[ 2 ][ N_RATE_LEVELS - 1 ];                         /*  18 */
 
-extern const oac_uint8  silk_max_pulses_table[ 4 ];                                                /*   4 */
+extern const oac_uint8 silk_max_pulses_table[ 4 ];                                                 /*   4 */
 
-extern const oac_uint8  silk_shell_code_table0[ 152 ];                                             /* 152 */
-extern const oac_uint8  silk_shell_code_table1[ 152 ];                                             /* 152 */
-extern const oac_uint8  silk_shell_code_table2[ 152 ];                                             /* 152 */
-extern const oac_uint8  silk_shell_code_table3[ 152 ];                                             /* 152 */
-extern const oac_uint8  silk_shell_code_table_offsets[ SILK_MAX_PULSES + 1 ];                      /*  17 */
+extern const oac_uint8 silk_shell_code_table0[ 152 ];                                              /* 152 */
+extern const oac_uint8 silk_shell_code_table1[ 152 ];                                              /* 152 */
+extern const oac_uint8 silk_shell_code_table2[ 152 ];                                              /* 152 */
+extern const oac_uint8 silk_shell_code_table3[ 152 ];                                              /* 152 */
+extern const oac_uint8 silk_shell_code_table_offsets[ SILK_MAX_PULSES + 1 ];                       /*  17 */
 
-extern const oac_uint8  silk_lsb_iCDF[ 2 ];                                                        /*   2 */
+extern const oac_uint8 silk_lsb_iCDF[ 2 ];                                                         /*   2 */
 
-extern const oac_uint8  silk_sign_iCDF[ 42 ];                                                      /*  42 */
+extern const oac_uint8 silk_sign_iCDF[ 42 ];                                                       /*  42 */
 
-extern const oac_uint8  silk_uniform3_iCDF[ 3 ];                                                   /*   3 */
-extern const oac_uint8  silk_uniform4_iCDF[ 4 ];                                                   /*   4 */
-extern const oac_uint8  silk_uniform5_iCDF[ 5 ];                                                   /*   5 */
-extern const oac_uint8  silk_uniform6_iCDF[ 6 ];                                                   /*   6 */
-extern const oac_uint8  silk_uniform8_iCDF[ 8 ];                                                   /*   8 */
+extern const oac_uint8 silk_uniform3_iCDF[ 3 ];                                                    /*   3 */
+extern const oac_uint8 silk_uniform4_iCDF[ 4 ];                                                    /*   4 */
+extern const oac_uint8 silk_uniform5_iCDF[ 5 ];                                                    /*   5 */
+extern const oac_uint8 silk_uniform6_iCDF[ 6 ];                                                    /*   6 */
+extern const oac_uint8 silk_uniform8_iCDF[ 8 ];                                                    /*   8 */
 
-extern const oac_uint8  silk_NLSF_EXT_iCDF[ 7 ];                                                   /*   7 */
+extern const oac_uint8 silk_NLSF_EXT_iCDF[ 7 ];                                                    /*   7 */
 
-extern const oac_uint8  silk_LTP_per_index_iCDF[ 3 ];                                              /*   3 */
+extern const oac_uint8 silk_LTP_per_index_iCDF[ 3 ];                                               /*   3 */
 extern const oac_uint8  * const silk_LTP_gain_iCDF_ptrs[ NB_LTP_CBKS ];                            /*   3 */
 extern const oac_uint8  * const silk_LTP_gain_BITS_Q5_ptrs[ NB_LTP_CBKS ];                         /*   3 */
 extern const oac_int8   * const silk_LTP_vq_ptrs_Q7[ NB_LTP_CBKS ];                                /* 168 */
 extern const oac_uint8  * const silk_LTP_vq_gain_ptrs_Q7[NB_LTP_CBKS];
-extern const oac_int8   silk_LTP_vq_sizes[ NB_LTP_CBKS ];                                          /*   3 */
+extern const oac_int8 silk_LTP_vq_sizes[ NB_LTP_CBKS ];                                            /*   3 */
 
-extern const oac_uint8  silk_LTPscale_iCDF[ 3 ];                                                   /*   4 */
-extern const oac_int16  silk_LTPScales_table_Q14[ 3 ];                                             /*   6 */
+extern const oac_uint8 silk_LTPscale_iCDF[ 3 ];                                                    /*   4 */
+extern const oac_int16 silk_LTPScales_table_Q14[ 3 ];                                              /*   6 */
 
-extern const oac_uint8  silk_type_offset_VAD_iCDF[ 4 ];                                            /*   4 */
-extern const oac_uint8  silk_type_offset_no_VAD_iCDF[ 2 ];                                         /*   2 */
+extern const oac_uint8 silk_type_offset_VAD_iCDF[ 4 ];                                             /*   4 */
+extern const oac_uint8 silk_type_offset_no_VAD_iCDF[ 2 ];                                          /*   2 */
 
-extern const oac_int16  silk_stereo_pred_quant_Q13[ STEREO_QUANT_TAB_SIZE ];                       /*  32 */
-extern const oac_uint8  silk_stereo_pred_joint_iCDF[ 25 ];                                         /*  25 */
-extern const oac_uint8  silk_stereo_only_code_mid_iCDF[ 2 ];                                       /*   2 */
+extern const oac_int16 silk_stereo_pred_quant_Q13[ STEREO_QUANT_TAB_SIZE ];                        /*  32 */
+extern const oac_uint8 silk_stereo_pred_joint_iCDF[ 25 ];                                          /*  25 */
+extern const oac_uint8 silk_stereo_only_code_mid_iCDF[ 2 ];                                        /*   2 */
 
 extern const oac_uint8  * const silk_LBRR_flags_iCDF_ptr[ 2 ];                                     /*  10 */
 
-extern const oac_uint8  silk_NLSF_interpolation_factor_iCDF[ 5 ];                                  /*   5 */
+extern const oac_uint8 silk_NLSF_interpolation_factor_iCDF[ 5 ];                                   /*   5 */
 
 extern const silk_NLSF_CB_struct silk_NLSF_CB_WB;                                                   /* 1040 */
 extern const silk_NLSF_CB_struct silk_NLSF_CB_NB_MB;                                                /* 728 */
 
 /* Quantization offsets */
-extern const oac_int16  silk_Quantization_Offsets_Q10[ 2 ][ 2 ];                                   /*   8 */
+extern const oac_int16 silk_Quantization_Offsets_Q10[ 2 ][ 2 ];                                    /*   8 */
 
 /* Interpolation points for filter coefficients used in the bandwidth transition smoother */
-extern const oac_int32  silk_Transition_LP_B_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NB ];           /*  60 */
-extern const oac_int32  silk_Transition_LP_A_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NA ];           /*  60 */
+extern const oac_int32 silk_Transition_LP_B_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NB ];            /*  60 */
+extern const oac_int32 silk_Transition_LP_A_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NA ];            /*  60 */
 
 /* Rom table with cosine values */
-extern const oac_int16  silk_LSFCosTab_FIX_Q12[ LSF_COS_TAB_SZ_FIX + 1 ];                          /* 258 */
+extern const oac_int16 silk_LSFCosTab_FIX_Q12[ LSF_COS_TAB_SZ_FIX + 1 ];                           /* 258 */
 
 #endif
diff --git a/silk/tables_LTP.c b/silk/tables_LTP.c
index b7eb60611..ffb4ddafb 100644
--- a/silk/tables_LTP.c
+++ b/silk/tables_LTP.c
@@ -1,70 +1,70 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "tables.h"
 
 const oac_uint8 silk_LTP_per_index_iCDF[3] = {
-       179,     99,      0
+    179,     99,      0
 };
 
 static const oac_uint8 silk_LTP_gain_iCDF_0[8] = {
-        71,     56,     43,     30,     21,     12,      6,      0
+    71,     56,     43,     30,     21,     12,      6,      0
 };
 
 static const oac_uint8 silk_LTP_gain_iCDF_1[16] = {
-       199,    165,    144,    124,    109,     96,     84,     71,
-        61,     51,     42,     32,     23,     15,      8,      0
+    199,    165,    144,    124,    109,     96,     84,     71,
+    61,     51,     42,     32,     23,     15,      8,      0
 };
 
 static const oac_uint8 silk_LTP_gain_iCDF_2[32] = {
-       241,    225,    211,    199,    187,    175,    164,    153,
-       142,    132,    123,    114,    105,     96,     88,     80,
-        72,     64,     57,     50,     44,     38,     33,     29,
-        24,     20,     16,     12,      9,      5,      2,      0
+    241,    225,    211,    199,    187,    175,    164,    153,
+    142,    132,    123,    114,    105,     96,     88,     80,
+    72,     64,     57,     50,     44,     38,     33,     29,
+    24,     20,     16,     12,      9,      5,      2,      0
 };
 
 static const oac_uint8 silk_LTP_gain_BITS_Q5_0[8] = {
-        15,    131,    138,    138,    155,    155,    173,    173
+    15,    131,    138,    138,    155,    155,    173,    173
 };
 
 static const oac_uint8 silk_LTP_gain_BITS_Q5_1[16] = {
-        69,     93,    115,    118,    131,    138,    141,    138,
-       150,    150,    155,    150,    155,    160,    166,    160
+    69,     93,    115,    118,    131,    138,    141,    138,
+    150,    150,    155,    150,    155,    160,    166,    160
 };
 
 static const oac_uint8 silk_LTP_gain_BITS_Q5_2[32] = {
-       131,    128,    134,    141,    141,    141,    145,    145,
-       145,    150,    155,    155,    155,    155,    160,    160,
-       160,    160,    166,    166,    173,    173,    182,    192,
-       182,    192,    192,    192,    205,    192,    205,    224
+    131,    128,    134,    141,    141,    141,    145,    145,
+    145,    150,    155,    155,    155,    155,    160,    160,
+    160,    160,    166,    166,    173,    173,    182,    192,
+    182,    192,    192,    192,    205,    192,    205,    224
 };
 
 const oac_uint8 * const silk_LTP_gain_iCDF_ptrs[NB_LTP_CBKS] = {
@@ -81,182 +81,182 @@ const oac_uint8 * const silk_LTP_gain_BITS_Q5_ptrs[NB_LTP_CBKS] = {
 
 static const oac_int8 silk_LTP_gain_vq_0[8][5] =
 {
-{
-         4,      6,     24,      7,      5
-},
-{
-         0,      0,      2,      0,      0
-},
-{
+    {
+        4,      6,     24,      7,      5
+    },
+    {
+        0,      0,      2,      0,      0
+    },
+    {
         12,     28,     41,     13,     -4
-},
-{
+    },
+    {
         -9,     15,     42,     25,     14
-},
-{
-         1,     -2,     62,     41,     -9
-},
-{
-       -10,     37,     65,     -4,      3
-},
-{
+    },
+    {
+        1,     -2,     62,     41,     -9
+    },
+    {
+        -10,     37,     65,     -4,      3
+    },
+    {
         -6,      4,     66,      7,     -8
-},
-{
+    },
+    {
         16,     14,     38,     -3,     33
-}
+    }
 };
 
 static const oac_int8 silk_LTP_gain_vq_1[16][5] =
 {
-{
+    {
         13,     22,     39,     23,     12
-},
-{
+    },
+    {
         -1,     36,     64,     27,     -6
-},
-{
+    },
+    {
         -7,     10,     55,     43,     17
-},
-{
-         1,      1,      8,      1,      1
-},
-{
-         6,    -11,     74,     53,     -9
-},
-{
-       -12,     55,     76,    -12,      8
-},
-{
+    },
+    {
+        1,      1,      8,      1,      1
+    },
+    {
+        6,    -11,     74,     53,     -9
+    },
+    {
+        -12,     55,     76,    -12,      8
+    },
+    {
         -3,      3,     93,     27,     -4
-},
-{
+    },
+    {
         26,     39,     59,      3,     -8
-},
-{
-         2,      0,     77,     11,      9
-},
-{
+    },
+    {
+        2,      0,     77,     11,      9
+    },
+    {
         -8,     22,     44,     -6,      7
-},
-{
+    },
+    {
         40,      9,     26,      3,      9
-},
-{
+    },
+    {
         -7,     20,    101,     -7,      4
-},
-{
-         3,     -8,     42,     26,      0
-},
-{
-       -15,     33,     68,      2,     23
-},
-{
+    },
+    {
+        3,     -8,     42,     26,      0
+    },
+    {
+        -15,     33,     68,      2,     23
+    },
+    {
         -2,     55,     46,     -2,     15
-},
-{
-         3,     -1,     21,     16,     41
-}
+    },
+    {
+        3,     -1,     21,     16,     41
+    }
 };
 
 static const oac_int8 silk_LTP_gain_vq_2[32][5] =
 {
-{
+    {
         -6,     27,     61,     39,      5
-},
-{
-       -11,     42,     88,      4,      1
-},
-{
+    },
+    {
+        -11,     42,     88,      4,      1
+    },
+    {
         -2,     60,     65,      6,     -4
-},
-{
+    },
+    {
         -1,     -5,     73,     56,      1
-},
-{
+    },
+    {
         -9,     19,     94,     29,     -9
-},
-{
-         0,     12,     99,      6,      4
-},
-{
-         8,    -19,    102,     46,    -13
-},
-{
-         3,      2,     13,      3,      2
-},
-{
-         9,    -21,     84,     72,    -18
-},
-{
-       -11,     46,    104,    -22,      8
-},
-{
+    },
+    {
+        0,     12,     99,      6,      4
+    },
+    {
+        8,    -19,    102,     46,    -13
+    },
+    {
+        3,      2,     13,      3,      2
+    },
+    {
+        9,    -21,     84,     72,    -18
+    },
+    {
+        -11,     46,    104,    -22,      8
+    },
+    {
         18,     38,     48,     23,      0
-},
-{
-       -16,     70,     83,    -21,     11
-},
-{
-         5,    -11,    117,     22,     -8
-},
-{
+    },
+    {
+        -16,     70,     83,    -21,     11
+    },
+    {
+        5,    -11,    117,     22,     -8
+    },
+    {
         -6,     23,    117,    -12,      3
-},
-{
-         3,     -8,     95,     28,      4
-},
-{
-       -10,     15,     77,     60,    -15
-},
-{
+    },
+    {
+        3,     -8,     95,     28,      4
+    },
+    {
+        -10,     15,     77,     60,    -15
+    },
+    {
         -1,      4,    124,      2,     -4
-},
-{
-         3,     38,     84,     24,    -25
-},
-{
-         2,     13,     42,     13,     31
-},
-{
+    },
+    {
+        3,     38,     84,     24,    -25
+    },
+    {
+        2,     13,     42,     13,     31
+    },
+    {
         21,     -4,     56,     46,     -1
-},
-{
+    },
+    {
         -1,     35,     79,    -13,     19
-},
-{
+    },
+    {
         -7,     65,     88,     -9,    -14
-},
-{
+    },
+    {
         20,      4,     81,     49,    -29
-},
-{
+    },
+    {
         20,      0,     75,      3,    -17
-},
-{
-         5,     -9,     44,     92,     -8
-},
-{
-         1,     -3,     22,     69,     31
-},
-{
+    },
+    {
+        5,     -9,     44,     92,     -8
+    },
+    {
+        1,     -3,     22,     69,     31
+    },
+    {
         -6,     95,     41,    -12,      5
-},
-{
+    },
+    {
         39,     67,     16,     -4,      1
-},
-{
-         0,     -6,    120,     55,    -36
-},
-{
-       -13,     44,    122,      4,    -24
-},
-{
+    },
+    {
+        0,     -6,    120,     55,    -36
+    },
+    {
+        -13,     44,    122,      4,    -24
+    },
+    {
         81,      5,     11,      3,      7
-},
-{
-         2,      0,      9,     10,     88
-}
+    },
+    {
+        2,      0,      9,     10,     88
+    }
 };
 
 const oac_int8 * const silk_LTP_vq_ptrs_Q7[NB_LTP_CBKS] = {
@@ -268,19 +268,19 @@ const oac_int8 * const silk_LTP_vq_ptrs_Q7[NB_LTP_CBKS] = {
 /* Maximum frequency-dependent response of the pitch taps above,
    computed as max(abs(freqz(taps))) */
 static const oac_uint8 silk_LTP_gain_vq_0_gain[8] = {
-      46,      2,     90,     87,     93,     91,     82,     98
+    46,      2,     90,     87,     93,     91,     82,     98
 };
 
 static const oac_uint8 silk_LTP_gain_vq_1_gain[16] = {
-     109,    120,    118,     12,    113,    115,    117,    119,
-      99,     59,     87,    111,     63,    111,    112,     80
+    109,    120,    118,     12,    113,    115,    117,    119,
+    99,     59,     87,    111,     63,    111,    112,     80
 };
 
 static const oac_uint8 silk_LTP_gain_vq_2_gain[32] = {
-     126,    124,    125,    124,    129,    121,    126,     23,
-     132,    127,    127,    127,    126,    127,    122,    133,
-     130,    134,    101,    118,    119,    145,    126,     86,
-     124,    120,    123,    119,    170,    173,    107,    109
+    126,    124,    125,    124,    129,    121,    126,     23,
+    132,    127,    127,    127,    126,    127,    122,    133,
+    130,    134,    101,    118,    119,    145,    126,     86,
+    124,    120,    123,    119,    170,    173,    107,    109
 };
 
 const oac_uint8 * const silk_LTP_vq_gain_ptrs_Q7[NB_LTP_CBKS] = {
diff --git a/silk/tables_NLSF_CB_NB_MB.c b/silk/tables_NLSF_CB_NB_MB.c
index c26871f57..1e3abc1ba 100644
--- a/silk/tables_NLSF_CB_NB_MB.c
+++ b/silk/tables_NLSF_CB_NB_MB.c
@@ -1,181 +1,181 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "tables.h"
 
 static const oac_uint8 silk_NLSF_CB1_NB_MB_Q8[ 320 ] = {
-        12,     35,     60,     83,    108,    132,    157,    180,
-       206,    228,     15,     32,     55,     77,    101,    125,
-       151,    175,    201,    225,     19,     42,     66,     89,
-       114,    137,    162,    184,    209,    230,     12,     25,
-        50,     72,     97,    120,    147,    172,    200,    223,
-        26,     44,     69,     90,    114,    135,    159,    180,
-       205,    225,     13,     22,     53,     80,    106,    130,
-       156,    180,    205,    228,     15,     25,     44,     64,
-        90,    115,    142,    168,    196,    222,     19,     24,
-        62,     82,    100,    120,    145,    168,    190,    214,
-        22,     31,     50,     79,    103,    120,    151,    170,
-       203,    227,     21,     29,     45,     65,    106,    124,
-       150,    171,    196,    224,     30,     49,     75,     97,
-       121,    142,    165,    186,    209,    229,     19,     25,
-        52,     70,     93,    116,    143,    166,    192,    219,
-        26,     34,     62,     75,     97,    118,    145,    167,
-       194,    217,     25,     33,     56,     70,     91,    113,
-       143,    165,    196,    223,     21,     34,     51,     72,
-        97,    117,    145,    171,    196,    222,     20,     29,
-        50,     67,     90,    117,    144,    168,    197,    221,
-        22,     31,     48,     66,     95,    117,    146,    168,
-       196,    222,     24,     33,     51,     77,    116,    134,
-       158,    180,    200,    224,     21,     28,     70,     87,
-       106,    124,    149,    170,    194,    217,     26,     33,
-        53,     64,     83,    117,    152,    173,    204,    225,
-        27,     34,     65,     95,    108,    129,    155,    174,
-       210,    225,     20,     26,     72,     99,    113,    131,
-       154,    176,    200,    219,     34,     43,     61,     78,
-        93,    114,    155,    177,    205,    229,     23,     29,
-        54,     97,    124,    138,    163,    179,    209,    229,
-        30,     38,     56,     89,    118,    129,    158,    178,
-       200,    231,     21,     29,     49,     63,     85,    111,
-       142,    163,    193,    222,     27,     48,     77,    103,
-       133,    158,    179,    196,    215,    232,     29,     47,
-        74,     99,    124,    151,    176,    198,    220,    237,
-        33,     42,     61,     76,     93,    121,    155,    174,
-       207,    225,     29,     53,     87,    112,    136,    154,
-       170,    188,    208,    227,     24,     30,     52,     84,
-       131,    150,    166,    186,    203,    229,     37,     48,
-        64,     84,    104,    118,    156,    177,    201,    230
+    12,     35,     60,     83,    108,    132,    157,    180,
+    206,    228,     15,     32,     55,     77,    101,    125,
+    151,    175,    201,    225,     19,     42,     66,     89,
+    114,    137,    162,    184,    209,    230,     12,     25,
+    50,     72,     97,    120,    147,    172,    200,    223,
+    26,     44,     69,     90,    114,    135,    159,    180,
+    205,    225,     13,     22,     53,     80,    106,    130,
+    156,    180,    205,    228,     15,     25,     44,     64,
+    90,    115,    142,    168,    196,    222,     19,     24,
+    62,     82,    100,    120,    145,    168,    190,    214,
+    22,     31,     50,     79,    103,    120,    151,    170,
+    203,    227,     21,     29,     45,     65,    106,    124,
+    150,    171,    196,    224,     30,     49,     75,     97,
+    121,    142,    165,    186,    209,    229,     19,     25,
+    52,     70,     93,    116,    143,    166,    192,    219,
+    26,     34,     62,     75,     97,    118,    145,    167,
+    194,    217,     25,     33,     56,     70,     91,    113,
+    143,    165,    196,    223,     21,     34,     51,     72,
+    97,    117,    145,    171,    196,    222,     20,     29,
+    50,     67,     90,    117,    144,    168,    197,    221,
+    22,     31,     48,     66,     95,    117,    146,    168,
+    196,    222,     24,     33,     51,     77,    116,    134,
+    158,    180,    200,    224,     21,     28,     70,     87,
+    106,    124,    149,    170,    194,    217,     26,     33,
+    53,     64,     83,    117,    152,    173,    204,    225,
+    27,     34,     65,     95,    108,    129,    155,    174,
+    210,    225,     20,     26,     72,     99,    113,    131,
+    154,    176,    200,    219,     34,     43,     61,     78,
+    93,    114,    155,    177,    205,    229,     23,     29,
+    54,     97,    124,    138,    163,    179,    209,    229,
+    30,     38,     56,     89,    118,    129,    158,    178,
+    200,    231,     21,     29,     49,     63,     85,    111,
+    142,    163,    193,    222,     27,     48,     77,    103,
+    133,    158,    179,    196,    215,    232,     29,     47,
+    74,     99,    124,    151,    176,    198,    220,    237,
+    33,     42,     61,     76,     93,    121,    155,    174,
+    207,    225,     29,     53,     87,    112,    136,    154,
+    170,    188,    208,    227,     24,     30,     52,     84,
+    131,    150,    166,    186,    203,    229,     37,     48,
+    64,     84,    104,    118,    156,    177,    201,    230
 };
 
 static const oac_int16 silk_NLSF_CB1_Wght_Q9[ 320 ] = {
-     2897, 2314, 2314, 2314, 2287, 2287, 2314, 2300, 2327, 2287,
-     2888, 2580, 2394, 2367, 2314, 2274, 2274, 2274, 2274, 2194,
-     2487, 2340, 2340, 2314, 2314, 2314, 2340, 2340, 2367, 2354,
-     3216, 2766, 2340, 2340, 2314, 2274, 2221, 2207, 2261, 2194,
-     2460, 2474, 2367, 2394, 2394, 2394, 2394, 2367, 2407, 2314,
-     3479, 3056, 2127, 2207, 2274, 2274, 2274, 2287, 2314, 2261,
-     3282, 3141, 2580, 2394, 2247, 2221, 2207, 2194, 2194, 2114,
-     4096, 3845, 2221, 2620, 2620, 2407, 2314, 2394, 2367, 2074,
-     3178, 3244, 2367, 2221, 2553, 2434, 2340, 2314, 2167, 2221,
-     3338, 3488, 2726, 2194, 2261, 2460, 2354, 2367, 2207, 2101,
-     2354, 2420, 2327, 2367, 2394, 2420, 2420, 2420, 2460, 2367,
-     3779, 3629, 2434, 2527, 2367, 2274, 2274, 2300, 2207, 2048,
-     3254, 3225, 2713, 2846, 2447, 2327, 2300, 2300, 2274, 2127,
-     3263, 3300, 2753, 2806, 2447, 2261, 2261, 2247, 2127, 2101,
-     2873, 2981, 2633, 2367, 2407, 2354, 2194, 2247, 2247, 2114,
-     3225, 3197, 2633, 2580, 2274, 2181, 2247, 2221, 2221, 2141,
-     3178, 3310, 2740, 2407, 2274, 2274, 2274, 2287, 2194, 2114,
-     3141, 3272, 2460, 2061, 2287, 2500, 2367, 2487, 2434, 2181,
-     3507, 3282, 2314, 2700, 2647, 2474, 2367, 2394, 2340, 2127,
-     3423, 3535, 3038, 3056, 2300, 1950, 2221, 2274, 2274, 2274,
-     3404, 3366, 2087, 2687, 2873, 2354, 2420, 2274, 2474, 2540,
-     3760, 3488, 1950, 2660, 2897, 2527, 2394, 2367, 2460, 2261,
-     3028, 3272, 2740, 2888, 2740, 2154, 2127, 2287, 2234, 2247,
-     3695, 3657, 2025, 1969, 2660, 2700, 2580, 2500, 2327, 2367,
-     3207, 3413, 2354, 2074, 2888, 2888, 2340, 2487, 2247, 2167,
-     3338, 3366, 2846, 2780, 2327, 2154, 2274, 2287, 2114, 2061,
-     2327, 2300, 2181, 2167, 2181, 2367, 2633, 2700, 2700, 2553,
-     2407, 2434, 2221, 2261, 2221, 2221, 2340, 2420, 2607, 2700,
-     3038, 3244, 2806, 2888, 2474, 2074, 2300, 2314, 2354, 2380,
-     2221, 2154, 2127, 2287, 2500, 2793, 2793, 2620, 2580, 2367,
-     3676, 3713, 2234, 1838, 2181, 2753, 2726, 2673, 2513, 2207,
-     2793, 3160, 2726, 2553, 2846, 2513, 2181, 2394, 2221, 2181
+    2897, 2314, 2314, 2314, 2287, 2287, 2314, 2300, 2327, 2287,
+    2888, 2580, 2394, 2367, 2314, 2274, 2274, 2274, 2274, 2194,
+    2487, 2340, 2340, 2314, 2314, 2314, 2340, 2340, 2367, 2354,
+    3216, 2766, 2340, 2340, 2314, 2274, 2221, 2207, 2261, 2194,
+    2460, 2474, 2367, 2394, 2394, 2394, 2394, 2367, 2407, 2314,
+    3479, 3056, 2127, 2207, 2274, 2274, 2274, 2287, 2314, 2261,
+    3282, 3141, 2580, 2394, 2247, 2221, 2207, 2194, 2194, 2114,
+    4096, 3845, 2221, 2620, 2620, 2407, 2314, 2394, 2367, 2074,
+    3178, 3244, 2367, 2221, 2553, 2434, 2340, 2314, 2167, 2221,
+    3338, 3488, 2726, 2194, 2261, 2460, 2354, 2367, 2207, 2101,
+    2354, 2420, 2327, 2367, 2394, 2420, 2420, 2420, 2460, 2367,
+    3779, 3629, 2434, 2527, 2367, 2274, 2274, 2300, 2207, 2048,
+    3254, 3225, 2713, 2846, 2447, 2327, 2300, 2300, 2274, 2127,
+    3263, 3300, 2753, 2806, 2447, 2261, 2261, 2247, 2127, 2101,
+    2873, 2981, 2633, 2367, 2407, 2354, 2194, 2247, 2247, 2114,
+    3225, 3197, 2633, 2580, 2274, 2181, 2247, 2221, 2221, 2141,
+    3178, 3310, 2740, 2407, 2274, 2274, 2274, 2287, 2194, 2114,
+    3141, 3272, 2460, 2061, 2287, 2500, 2367, 2487, 2434, 2181,
+    3507, 3282, 2314, 2700, 2647, 2474, 2367, 2394, 2340, 2127,
+    3423, 3535, 3038, 3056, 2300, 1950, 2221, 2274, 2274, 2274,
+    3404, 3366, 2087, 2687, 2873, 2354, 2420, 2274, 2474, 2540,
+    3760, 3488, 1950, 2660, 2897, 2527, 2394, 2367, 2460, 2261,
+    3028, 3272, 2740, 2888, 2740, 2154, 2127, 2287, 2234, 2247,
+    3695, 3657, 2025, 1969, 2660, 2700, 2580, 2500, 2327, 2367,
+    3207, 3413, 2354, 2074, 2888, 2888, 2340, 2487, 2247, 2167,
+    3338, 3366, 2846, 2780, 2327, 2154, 2274, 2287, 2114, 2061,
+    2327, 2300, 2181, 2167, 2181, 2367, 2633, 2700, 2700, 2553,
+    2407, 2434, 2221, 2261, 2221, 2221, 2340, 2420, 2607, 2700,
+    3038, 3244, 2806, 2888, 2474, 2074, 2300, 2314, 2354, 2380,
+    2221, 2154, 2127, 2287, 2500, 2793, 2793, 2620, 2580, 2367,
+    3676, 3713, 2234, 1838, 2181, 2753, 2726, 2673, 2513, 2207,
+    2793, 3160, 2726, 2553, 2846, 2513, 2181, 2394, 2221, 2181
 };
 
 static const oac_uint8 silk_NLSF_CB1_iCDF_NB_MB[ 64 ] = {
-       212,    178,    148,    129,    108,     96,     85,     82,
-        79,     77,     61,     59,     57,     56,     51,     49,
-        48,     45,     42,     41,     40,     38,     36,     34,
-        31,     30,     21,     12,     10,      3,      1,      0,
-       255,    245,    244,    236,    233,    225,    217,    203,
-       190,    176,    175,    161,    149,    136,    125,    114,
-       102,     91,     81,     71,     60,     52,     43,     35,
-        28,     20,     19,     18,     12,     11,      5,      0
+    212,    178,    148,    129,    108,     96,     85,     82,
+    79,     77,     61,     59,     57,     56,     51,     49,
+    48,     45,     42,     41,     40,     38,     36,     34,
+    31,     30,     21,     12,     10,      3,      1,      0,
+    255,    245,    244,    236,    233,    225,    217,    203,
+    190,    176,    175,    161,    149,    136,    125,    114,
+    102,     91,     81,     71,     60,     52,     43,     35,
+    28,     20,     19,     18,     12,     11,      5,      0
 };
 
 static const oac_uint8 silk_NLSF_CB2_SELECT_NB_MB[ 160 ] = {
-        16,      0,      0,      0,      0,     99,     66,     36,
-        36,     34,     36,     34,     34,     34,     34,     83,
-        69,     36,     52,     34,    116,    102,     70,     68,
-        68,    176,    102,     68,     68,     34,     65,     85,
-        68,     84,     36,    116,    141,    152,    139,    170,
-       132,    187,    184,    216,    137,    132,    249,    168,
-       185,    139,    104,    102,    100,     68,     68,    178,
-       218,    185,    185,    170,    244,    216,    187,    187,
-       170,    244,    187,    187,    219,    138,    103,    155,
-       184,    185,    137,    116,    183,    155,    152,    136,
-       132,    217,    184,    184,    170,    164,    217,    171,
-       155,    139,    244,    169,    184,    185,    170,    164,
-       216,    223,    218,    138,    214,    143,    188,    218,
-       168,    244,    141,    136,    155,    170,    168,    138,
-       220,    219,    139,    164,    219,    202,    216,    137,
-       168,    186,    246,    185,    139,    116,    185,    219,
-       185,    138,    100,    100,    134,    100,    102,     34,
-        68,     68,    100,     68,    168,    203,    221,    218,
-       168,    167,    154,    136,    104,     70,    164,    246,
-       171,    137,    139,    137,    155,    218,    219,    139
+    16,      0,      0,      0,      0,     99,     66,     36,
+    36,     34,     36,     34,     34,     34,     34,     83,
+    69,     36,     52,     34,    116,    102,     70,     68,
+    68,    176,    102,     68,     68,     34,     65,     85,
+    68,     84,     36,    116,    141,    152,    139,    170,
+    132,    187,    184,    216,    137,    132,    249,    168,
+    185,    139,    104,    102,    100,     68,     68,    178,
+    218,    185,    185,    170,    244,    216,    187,    187,
+    170,    244,    187,    187,    219,    138,    103,    155,
+    184,    185,    137,    116,    183,    155,    152,    136,
+    132,    217,    184,    184,    170,    164,    217,    171,
+    155,    139,    244,    169,    184,    185,    170,    164,
+    216,    223,    218,    138,    214,    143,    188,    218,
+    168,    244,    141,    136,    155,    170,    168,    138,
+    220,    219,    139,    164,    219,    202,    216,    137,
+    168,    186,    246,    185,    139,    116,    185,    219,
+    185,    138,    100,    100,    134,    100,    102,     34,
+    68,     68,    100,     68,    168,    203,    221,    218,
+    168,    167,    154,    136,    104,     70,    164,    246,
+    171,    137,    139,    137,    155,    218,    219,    139
 };
 
 static const oac_uint8 silk_NLSF_CB2_iCDF_NB_MB[ 72 ] = {
-       255,    254,    253,    238,     14,      3,      2,      1,
-         0,    255,    254,    252,    218,     35,      3,      2,
-         1,      0,    255,    254,    250,    208,     59,      4,
-         2,      1,      0,    255,    254,    246,    194,     71,
-        10,      2,      1,      0,    255,    252,    236,    183,
-        82,      8,      2,      1,      0,    255,    252,    235,
-       180,     90,     17,      2,      1,      0,    255,    248,
-       224,    171,     97,     30,      4,      1,      0,    255,
-       254,    236,    173,     95,     37,      7,      1,      0
+    255,    254,    253,    238,     14,      3,      2,      1,
+    0,    255,    254,    252,    218,     35,      3,      2,
+    1,      0,    255,    254,    250,    208,     59,      4,
+    2,      1,      0,    255,    254,    246,    194,     71,
+    10,      2,      1,      0,    255,    252,    236,    183,
+    82,      8,      2,      1,      0,    255,    252,    235,
+    180,     90,     17,      2,      1,      0,    255,    248,
+    224,    171,     97,     30,      4,      1,      0,    255,
+    254,    236,    173,     95,     37,      7,      1,      0
 };
 
 static const oac_uint8 silk_NLSF_CB2_BITS_NB_MB_Q5[ 72 ] = {
-       255,    255,    255,    131,      6,    145,    255,    255,
-       255,    255,    255,    236,     93,     15,     96,    255,
-       255,    255,    255,    255,    194,     83,     25,     71,
-       221,    255,    255,    255,    255,    162,     73,     34,
-        66,    162,    255,    255,    255,    210,    126,     73,
-        43,     57,    173,    255,    255,    255,    201,    125,
-        71,     48,     58,    130,    255,    255,    255,    166,
-       110,     73,     57,     62,    104,    210,    255,    255,
-       251,    123,     65,     55,     68,    100,    171,    255
+    255,    255,    255,    131,      6,    145,    255,    255,
+    255,    255,    255,    236,     93,     15,     96,    255,
+    255,    255,    255,    255,    194,     83,     25,     71,
+    221,    255,    255,    255,    255,    162,     73,     34,
+    66,    162,    255,    255,    255,    210,    126,     73,
+    43,     57,    173,    255,    255,    255,    201,    125,
+    71,     48,     58,    130,    255,    255,    255,    166,
+    110,     73,     57,     62,    104,    210,    255,    255,
+    251,    123,     65,     55,     68,    100,    171,    255
 };
 
 static const oac_uint8 silk_NLSF_PRED_NB_MB_Q8[ 18 ] = {
-       179,    138,    140,    148,    151,    149,    153,    151,
-       163,    116,     67,     82,     59,     92,     72,    100,
-        89,     92
+    179,    138,    140,    148,    151,    149,    153,    151,
+    163,    116,     67,     82,     59,     92,     72,    100,
+    89,     92
 };
 
 static const oac_int16 silk_NLSF_DELTA_MIN_NB_MB_Q15[ 11 ] = {
-       250,      3,      6,      3,      3,      3,      4,      3,
-         3,      3,    461
+    250,      3,      6,      3,      3,      3,      4,      3,
+    3,      3,    461
 };
 
 const silk_NLSF_CB_struct silk_NLSF_CB_NB_MB =
@@ -183,7 +183,7 @@ const silk_NLSF_CB_struct silk_NLSF_CB_NB_MB =
     32,
     10,
     SILK_FIX_CONST( 0.18, 16 ),
-    SILK_FIX_CONST( 1.0 / 0.18, 6 ),
+    SILK_FIX_CONST( 1.0/0.18, 6 ),
     silk_NLSF_CB1_NB_MB_Q8,
     silk_NLSF_CB1_Wght_Q9,
     silk_NLSF_CB1_iCDF_NB_MB,
diff --git a/silk/tables_NLSF_CB_WB.c b/silk/tables_NLSF_CB_WB.c
index f4f584ef2..75e0eb7d8 100644
--- a/silk/tables_NLSF_CB_WB.c
+++ b/silk/tables_NLSF_CB_WB.c
@@ -1,219 +1,219 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "tables.h"
 
 static const oac_uint8 silk_NLSF_CB1_WB_Q8[ 512 ] = {
-         7,     23,     38,     54,     69,     85,    100,    116,
-       131,    147,    162,    178,    193,    208,    223,    239,
-        13,     25,     41,     55,     69,     83,     98,    112,
-       127,    142,    157,    171,    187,    203,    220,    236,
-        15,     21,     34,     51,     61,     78,     92,    106,
-       126,    136,    152,    167,    185,    205,    225,    240,
-        10,     21,     36,     50,     63,     79,     95,    110,
-       126,    141,    157,    173,    189,    205,    221,    237,
-        17,     20,     37,     51,     59,     78,     89,    107,
-       123,    134,    150,    164,    184,    205,    224,    240,
-        10,     15,     32,     51,     67,     81,     96,    112,
-       129,    142,    158,    173,    189,    204,    220,    236,
-         8,     21,     37,     51,     65,     79,     98,    113,
-       126,    138,    155,    168,    179,    192,    209,    218,
-        12,     15,     34,     55,     63,     78,     87,    108,
-       118,    131,    148,    167,    185,    203,    219,    236,
-        16,     19,     32,     36,     56,     79,     91,    108,
-       118,    136,    154,    171,    186,    204,    220,    237,
-        11,     28,     43,     58,     74,     89,    105,    120,
-       135,    150,    165,    180,    196,    211,    226,    241,
-         6,     16,     33,     46,     60,     75,     92,    107,
-       123,    137,    156,    169,    185,    199,    214,    225,
-        11,     19,     30,     44,     57,     74,     89,    105,
-       121,    135,    152,    169,    186,    202,    218,    234,
-        12,     19,     29,     46,     57,     71,     88,    100,
-       120,    132,    148,    165,    182,    199,    216,    233,
-        17,     23,     35,     46,     56,     77,     92,    106,
-       123,    134,    152,    167,    185,    204,    222,    237,
-        14,     17,     45,     53,     63,     75,     89,    107,
-       115,    132,    151,    171,    188,    206,    221,    240,
-         9,     16,     29,     40,     56,     71,     88,    103,
-       119,    137,    154,    171,    189,    205,    222,    237,
-        16,     19,     36,     48,     57,     76,     87,    105,
-       118,    132,    150,    167,    185,    202,    218,    236,
-        12,     17,     29,     54,     71,     81,     94,    104,
-       126,    136,    149,    164,    182,    201,    221,    237,
-        15,     28,     47,     62,     79,     97,    115,    129,
-       142,    155,    168,    180,    194,    208,    223,    238,
-         8,     14,     30,     45,     62,     78,     94,    111,
-       127,    143,    159,    175,    192,    207,    223,    239,
-        17,     30,     49,     62,     79,     92,    107,    119,
-       132,    145,    160,    174,    190,    204,    220,    235,
-        14,     19,     36,     45,     61,     76,     91,    108,
-       121,    138,    154,    172,    189,    205,    222,    238,
-        12,     18,     31,     45,     60,     76,     91,    107,
-       123,    138,    154,    171,    187,    204,    221,    236,
-        13,     17,     31,     43,     53,     70,     83,    103,
-       114,    131,    149,    167,    185,    203,    220,    237,
-        17,     22,     35,     42,     58,     78,     93,    110,
-       125,    139,    155,    170,    188,    206,    224,    240,
-         8,     15,     34,     50,     67,     83,     99,    115,
-       131,    146,    162,    178,    193,    209,    224,    239,
-        13,     16,     41,     66,     73,     86,     95,    111,
-       128,    137,    150,    163,    183,    206,    225,    241,
-        17,     25,     37,     52,     63,     75,     92,    102,
-       119,    132,    144,    160,    175,    191,    212,    231,
-        19,     31,     49,     65,     83,    100,    117,    133,
-       147,    161,    174,    187,    200,    213,    227,    242,
-        18,     31,     52,     68,     88,    103,    117,    126,
-       138,    149,    163,    177,    192,    207,    223,    239,
-        16,     29,     47,     61,     76,     90,    106,    119,
-       133,    147,    161,    176,    193,    209,    224,    240,
-        15,     21,     35,     50,     61,     73,     86,     97,
-       110,    119,    129,    141,    175,    198,    218,    237
+    7,     23,     38,     54,     69,     85,    100,    116,
+    131,    147,    162,    178,    193,    208,    223,    239,
+    13,     25,     41,     55,     69,     83,     98,    112,
+    127,    142,    157,    171,    187,    203,    220,    236,
+    15,     21,     34,     51,     61,     78,     92,    106,
+    126,    136,    152,    167,    185,    205,    225,    240,
+    10,     21,     36,     50,     63,     79,     95,    110,
+    126,    141,    157,    173,    189,    205,    221,    237,
+    17,     20,     37,     51,     59,     78,     89,    107,
+    123,    134,    150,    164,    184,    205,    224,    240,
+    10,     15,     32,     51,     67,     81,     96,    112,
+    129,    142,    158,    173,    189,    204,    220,    236,
+    8,     21,     37,     51,     65,     79,     98,    113,
+    126,    138,    155,    168,    179,    192,    209,    218,
+    12,     15,     34,     55,     63,     78,     87,    108,
+    118,    131,    148,    167,    185,    203,    219,    236,
+    16,     19,     32,     36,     56,     79,     91,    108,
+    118,    136,    154,    171,    186,    204,    220,    237,
+    11,     28,     43,     58,     74,     89,    105,    120,
+    135,    150,    165,    180,    196,    211,    226,    241,
+    6,     16,     33,     46,     60,     75,     92,    107,
+    123,    137,    156,    169,    185,    199,    214,    225,
+    11,     19,     30,     44,     57,     74,     89,    105,
+    121,    135,    152,    169,    186,    202,    218,    234,
+    12,     19,     29,     46,     57,     71,     88,    100,
+    120,    132,    148,    165,    182,    199,    216,    233,
+    17,     23,     35,     46,     56,     77,     92,    106,
+    123,    134,    152,    167,    185,    204,    222,    237,
+    14,     17,     45,     53,     63,     75,     89,    107,
+    115,    132,    151,    171,    188,    206,    221,    240,
+    9,     16,     29,     40,     56,     71,     88,    103,
+    119,    137,    154,    171,    189,    205,    222,    237,
+    16,     19,     36,     48,     57,     76,     87,    105,
+    118,    132,    150,    167,    185,    202,    218,    236,
+    12,     17,     29,     54,     71,     81,     94,    104,
+    126,    136,    149,    164,    182,    201,    221,    237,
+    15,     28,     47,     62,     79,     97,    115,    129,
+    142,    155,    168,    180,    194,    208,    223,    238,
+    8,     14,     30,     45,     62,     78,     94,    111,
+    127,    143,    159,    175,    192,    207,    223,    239,
+    17,     30,     49,     62,     79,     92,    107,    119,
+    132,    145,    160,    174,    190,    204,    220,    235,
+    14,     19,     36,     45,     61,     76,     91,    108,
+    121,    138,    154,    172,    189,    205,    222,    238,
+    12,     18,     31,     45,     60,     76,     91,    107,
+    123,    138,    154,    171,    187,    204,    221,    236,
+    13,     17,     31,     43,     53,     70,     83,    103,
+    114,    131,    149,    167,    185,    203,    220,    237,
+    17,     22,     35,     42,     58,     78,     93,    110,
+    125,    139,    155,    170,    188,    206,    224,    240,
+    8,     15,     34,     50,     67,     83,     99,    115,
+    131,    146,    162,    178,    193,    209,    224,    239,
+    13,     16,     41,     66,     73,     86,     95,    111,
+    128,    137,    150,    163,    183,    206,    225,    241,
+    17,     25,     37,     52,     63,     75,     92,    102,
+    119,    132,    144,    160,    175,    191,    212,    231,
+    19,     31,     49,     65,     83,    100,    117,    133,
+    147,    161,    174,    187,    200,    213,    227,    242,
+    18,     31,     52,     68,     88,    103,    117,    126,
+    138,    149,    163,    177,    192,    207,    223,    239,
+    16,     29,     47,     61,     76,     90,    106,    119,
+    133,    147,    161,    176,    193,    209,    224,    240,
+    15,     21,     35,     50,     61,     73,     86,     97,
+    110,    119,    129,    141,    175,    198,    218,    237
 };
 
 static const oac_int16 silk_NLSF_CB1_WB_Wght_Q9[ 512 ] = {
-     3657, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2963, 2963, 2925, 2846,
-     3216, 3085, 2972, 3056, 3056, 3010, 3010, 3010, 2963, 2963, 3010, 2972, 2888, 2846, 2846, 2726,
-     3920, 4014, 2981, 3207, 3207, 2934, 3056, 2846, 3122, 3244, 2925, 2846, 2620, 2553, 2780, 2925,
-     3516, 3197, 3010, 3103, 3019, 2888, 2925, 2925, 2925, 2925, 2888, 2888, 2888, 2888, 2888, 2753,
-     5054, 5054, 2934, 3573, 3385, 3056, 3085, 2793, 3160, 3160, 2972, 2846, 2513, 2540, 2753, 2888,
-     4428, 4149, 2700, 2753, 2972, 3010, 2925, 2846, 2981, 3019, 2925, 2925, 2925, 2925, 2888, 2726,
-     3620, 3019, 2972, 3056, 3056, 2873, 2806, 3056, 3216, 3047, 2981, 3291, 3291, 2981, 3310, 2991,
-     5227, 5014, 2540, 3338, 3526, 3385, 3197, 3094, 3376, 2981, 2700, 2647, 2687, 2793, 2846, 2673,
-     5081, 5174, 4615, 4428, 2460, 2897, 3047, 3207, 3169, 2687, 2740, 2888, 2846, 2793, 2846, 2700,
-     3122, 2888, 2963, 2925, 2925, 2925, 2925, 2963, 2963, 2963, 2963, 2925, 2925, 2963, 2963, 2963,
-     4202, 3207, 2981, 3103, 3010, 2888, 2888, 2925, 2972, 2873, 2916, 3019, 2972, 3010, 3197, 2873,
-     3760, 3760, 3244, 3103, 2981, 2888, 2925, 2888, 2972, 2934, 2793, 2793, 2846, 2888, 2888, 2660,
-     3854, 4014, 3207, 3122, 3244, 2934, 3047, 2963, 2963, 3085, 2846, 2793, 2793, 2793, 2793, 2580,
-     3845, 4080, 3357, 3516, 3094, 2740, 3010, 2934, 3122, 3085, 2846, 2846, 2647, 2647, 2846, 2806,
-     5147, 4894, 3225, 3845, 3441, 3169, 2897, 3413, 3451, 2700, 2580, 2673, 2740, 2846, 2806, 2753,
-     4109, 3789, 3291, 3160, 2925, 2888, 2888, 2925, 2793, 2740, 2793, 2740, 2793, 2846, 2888, 2806,
-     5081, 5054, 3047, 3545, 3244, 3056, 3085, 2944, 3103, 2897, 2740, 2740, 2740, 2846, 2793, 2620,
-     4309, 4309, 2860, 2527, 3207, 3376, 3376, 3075, 3075, 3376, 3056, 2846, 2647, 2580, 2726, 2753,
-     3056, 2916, 2806, 2888, 2740, 2687, 2897, 3103, 3150, 3150, 3216, 3169, 3056, 3010, 2963, 2846,
-     4375, 3882, 2925, 2888, 2846, 2888, 2846, 2846, 2888, 2888, 2888, 2846, 2888, 2925, 2888, 2846,
-     2981, 2916, 2916, 2981, 2981, 3056, 3122, 3216, 3150, 3056, 3010, 2972, 2972, 2972, 2925, 2740,
-     4229, 4149, 3310, 3347, 2925, 2963, 2888, 2981, 2981, 2846, 2793, 2740, 2846, 2846, 2846, 2793,
-     4080, 4014, 3103, 3010, 2925, 2925, 2925, 2888, 2925, 2925, 2846, 2846, 2846, 2793, 2888, 2780,
-     4615, 4575, 3169, 3441, 3207, 2981, 2897, 3038, 3122, 2740, 2687, 2687, 2687, 2740, 2793, 2700,
-     4149, 4269, 3789, 3657, 2726, 2780, 2888, 2888, 3010, 2972, 2925, 2846, 2687, 2687, 2793, 2888,
-     4215, 3554, 2753, 2846, 2846, 2888, 2888, 2888, 2925, 2925, 2888, 2925, 2925, 2925, 2963, 2888,
-     5174, 4921, 2261, 3432, 3789, 3479, 3347, 2846, 3310, 3479, 3150, 2897, 2460, 2487, 2753, 2925,
-     3451, 3685, 3122, 3197, 3357, 3047, 3207, 3207, 2981, 3216, 3085, 2925, 2925, 2687, 2540, 2434,
-     2981, 3010, 2793, 2793, 2740, 2793, 2846, 2972, 3056, 3103, 3150, 3150, 3150, 3103, 3010, 3010,
-     2944, 2873, 2687, 2726, 2780, 3010, 3432, 3545, 3357, 3244, 3056, 3010, 2963, 2925, 2888, 2846,
-     3019, 2944, 2897, 3010, 3010, 2972, 3019, 3103, 3056, 3056, 3010, 2888, 2846, 2925, 2925, 2888,
-     3920, 3967, 3010, 3197, 3357, 3216, 3291, 3291, 3479, 3704, 3441, 2726, 2181, 2460, 2580, 2607
+    3657, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2963, 2963, 2925, 2846,
+    3216, 3085, 2972, 3056, 3056, 3010, 3010, 3010, 2963, 2963, 3010, 2972, 2888, 2846, 2846, 2726,
+    3920, 4014, 2981, 3207, 3207, 2934, 3056, 2846, 3122, 3244, 2925, 2846, 2620, 2553, 2780, 2925,
+    3516, 3197, 3010, 3103, 3019, 2888, 2925, 2925, 2925, 2925, 2888, 2888, 2888, 2888, 2888, 2753,
+    5054, 5054, 2934, 3573, 3385, 3056, 3085, 2793, 3160, 3160, 2972, 2846, 2513, 2540, 2753, 2888,
+    4428, 4149, 2700, 2753, 2972, 3010, 2925, 2846, 2981, 3019, 2925, 2925, 2925, 2925, 2888, 2726,
+    3620, 3019, 2972, 3056, 3056, 2873, 2806, 3056, 3216, 3047, 2981, 3291, 3291, 2981, 3310, 2991,
+    5227, 5014, 2540, 3338, 3526, 3385, 3197, 3094, 3376, 2981, 2700, 2647, 2687, 2793, 2846, 2673,
+    5081, 5174, 4615, 4428, 2460, 2897, 3047, 3207, 3169, 2687, 2740, 2888, 2846, 2793, 2846, 2700,
+    3122, 2888, 2963, 2925, 2925, 2925, 2925, 2963, 2963, 2963, 2963, 2925, 2925, 2963, 2963, 2963,
+    4202, 3207, 2981, 3103, 3010, 2888, 2888, 2925, 2972, 2873, 2916, 3019, 2972, 3010, 3197, 2873,
+    3760, 3760, 3244, 3103, 2981, 2888, 2925, 2888, 2972, 2934, 2793, 2793, 2846, 2888, 2888, 2660,
+    3854, 4014, 3207, 3122, 3244, 2934, 3047, 2963, 2963, 3085, 2846, 2793, 2793, 2793, 2793, 2580,
+    3845, 4080, 3357, 3516, 3094, 2740, 3010, 2934, 3122, 3085, 2846, 2846, 2647, 2647, 2846, 2806,
+    5147, 4894, 3225, 3845, 3441, 3169, 2897, 3413, 3451, 2700, 2580, 2673, 2740, 2846, 2806, 2753,
+    4109, 3789, 3291, 3160, 2925, 2888, 2888, 2925, 2793, 2740, 2793, 2740, 2793, 2846, 2888, 2806,
+    5081, 5054, 3047, 3545, 3244, 3056, 3085, 2944, 3103, 2897, 2740, 2740, 2740, 2846, 2793, 2620,
+    4309, 4309, 2860, 2527, 3207, 3376, 3376, 3075, 3075, 3376, 3056, 2846, 2647, 2580, 2726, 2753,
+    3056, 2916, 2806, 2888, 2740, 2687, 2897, 3103, 3150, 3150, 3216, 3169, 3056, 3010, 2963, 2846,
+    4375, 3882, 2925, 2888, 2846, 2888, 2846, 2846, 2888, 2888, 2888, 2846, 2888, 2925, 2888, 2846,
+    2981, 2916, 2916, 2981, 2981, 3056, 3122, 3216, 3150, 3056, 3010, 2972, 2972, 2972, 2925, 2740,
+    4229, 4149, 3310, 3347, 2925, 2963, 2888, 2981, 2981, 2846, 2793, 2740, 2846, 2846, 2846, 2793,
+    4080, 4014, 3103, 3010, 2925, 2925, 2925, 2888, 2925, 2925, 2846, 2846, 2846, 2793, 2888, 2780,
+    4615, 4575, 3169, 3441, 3207, 2981, 2897, 3038, 3122, 2740, 2687, 2687, 2687, 2740, 2793, 2700,
+    4149, 4269, 3789, 3657, 2726, 2780, 2888, 2888, 3010, 2972, 2925, 2846, 2687, 2687, 2793, 2888,
+    4215, 3554, 2753, 2846, 2846, 2888, 2888, 2888, 2925, 2925, 2888, 2925, 2925, 2925, 2963, 2888,
+    5174, 4921, 2261, 3432, 3789, 3479, 3347, 2846, 3310, 3479, 3150, 2897, 2460, 2487, 2753, 2925,
+    3451, 3685, 3122, 3197, 3357, 3047, 3207, 3207, 2981, 3216, 3085, 2925, 2925, 2687, 2540, 2434,
+    2981, 3010, 2793, 2793, 2740, 2793, 2846, 2972, 3056, 3103, 3150, 3150, 3150, 3103, 3010, 3010,
+    2944, 2873, 2687, 2726, 2780, 3010, 3432, 3545, 3357, 3244, 3056, 3010, 2963, 2925, 2888, 2846,
+    3019, 2944, 2897, 3010, 3010, 2972, 3019, 3103, 3056, 3056, 3010, 2888, 2846, 2925, 2925, 2888,
+    3920, 3967, 3010, 3197, 3357, 3216, 3291, 3291, 3479, 3704, 3441, 2726, 2181, 2460, 2580, 2607
 };
 
 static const oac_uint8 silk_NLSF_CB1_iCDF_WB[ 64 ] = {
-       225,    204,    201,    184,    183,    175,    158,    154,
-       153,    135,    119,    115,    113,    110,    109,     99,
-        98,     95,     79,     68,     52,     50,     48,     45,
-        43,     32,     31,     27,     18,     10,      3,      0,
-       255,    251,    235,    230,    212,    201,    196,    182,
-       167,    166,    163,    151,    138,    124,    110,    104,
-        90,     78,     76,     70,     69,     57,     45,     34,
-        24,     21,     11,      6,      5,      4,      3,      0
+    225,    204,    201,    184,    183,    175,    158,    154,
+    153,    135,    119,    115,    113,    110,    109,     99,
+    98,     95,     79,     68,     52,     50,     48,     45,
+    43,     32,     31,     27,     18,     10,      3,      0,
+    255,    251,    235,    230,    212,    201,    196,    182,
+    167,    166,    163,    151,    138,    124,    110,    104,
+    90,     78,     76,     70,     69,     57,     45,     34,
+    24,     21,     11,      6,      5,      4,      3,      0
 };
 
 static const oac_uint8 silk_NLSF_CB2_SELECT_WB[ 256 ] = {
-         0,      0,      0,      0,      0,      0,      0,      1,
-       100,    102,    102,     68,     68,     36,     34,     96,
-       164,    107,    158,    185,    180,    185,    139,    102,
-        64,     66,     36,     34,     34,      0,      1,     32,
-       208,    139,    141,    191,    152,    185,    155,    104,
-        96,    171,    104,    166,    102,    102,    102,    132,
-         1,      0,      0,      0,      0,     16,     16,      0,
-        80,    109,     78,    107,    185,    139,    103,    101,
-       208,    212,    141,    139,    173,    153,    123,    103,
-        36,      0,      0,      0,      0,      0,      0,      1,
-        48,      0,      0,      0,      0,      0,      0,     32,
-        68,    135,    123,    119,    119,    103,     69,     98,
-        68,    103,    120,    118,    118,    102,     71,     98,
-       134,    136,    157,    184,    182,    153,    139,    134,
-       208,    168,    248,     75,    189,    143,    121,    107,
-        32,     49,     34,     34,     34,      0,     17,      2,
-       210,    235,    139,    123,    185,    137,    105,    134,
-        98,    135,    104,    182,    100,    183,    171,    134,
-       100,     70,     68,     70,     66,     66,     34,    131,
-        64,    166,    102,     68,     36,      2,      1,      0,
-       134,    166,    102,     68,     34,     34,     66,    132,
-       212,    246,    158,    139,    107,    107,     87,    102,
-       100,    219,    125,    122,    137,    118,    103,    132,
-       114,    135,    137,    105,    171,    106,     50,     34,
-       164,    214,    141,    143,    185,    151,    121,    103,
-       192,     34,      0,      0,      0,      0,      0,      1,
-       208,    109,     74,    187,    134,    249,    159,    137,
-       102,    110,    154,    118,     87,    101,    119,    101,
-         0,      2,      0,     36,     36,     66,     68,     35,
-        96,    164,    102,    100,     36,      0,      2,     33,
-       167,    138,    174,    102,    100,     84,      2,      2,
-       100,    107,    120,    119,     36,    197,     24,      0
+    0,      0,      0,      0,      0,      0,      0,      1,
+    100,    102,    102,     68,     68,     36,     34,     96,
+    164,    107,    158,    185,    180,    185,    139,    102,
+    64,     66,     36,     34,     34,      0,      1,     32,
+    208,    139,    141,    191,    152,    185,    155,    104,
+    96,    171,    104,    166,    102,    102,    102,    132,
+    1,      0,      0,      0,      0,     16,     16,      0,
+    80,    109,     78,    107,    185,    139,    103,    101,
+    208,    212,    141,    139,    173,    153,    123,    103,
+    36,      0,      0,      0,      0,      0,      0,      1,
+    48,      0,      0,      0,      0,      0,      0,     32,
+    68,    135,    123,    119,    119,    103,     69,     98,
+    68,    103,    120,    118,    118,    102,     71,     98,
+    134,    136,    157,    184,    182,    153,    139,    134,
+    208,    168,    248,     75,    189,    143,    121,    107,
+    32,     49,     34,     34,     34,      0,     17,      2,
+    210,    235,    139,    123,    185,    137,    105,    134,
+    98,    135,    104,    182,    100,    183,    171,    134,
+    100,     70,     68,     70,     66,     66,     34,    131,
+    64,    166,    102,     68,     36,      2,      1,      0,
+    134,    166,    102,     68,     34,     34,     66,    132,
+    212,    246,    158,    139,    107,    107,     87,    102,
+    100,    219,    125,    122,    137,    118,    103,    132,
+    114,    135,    137,    105,    171,    106,     50,     34,
+    164,    214,    141,    143,    185,    151,    121,    103,
+    192,     34,      0,      0,      0,      0,      0,      1,
+    208,    109,     74,    187,    134,    249,    159,    137,
+    102,    110,    154,    118,     87,    101,    119,    101,
+    0,      2,      0,     36,     36,     66,     68,     35,
+    96,    164,    102,    100,     36,      0,      2,     33,
+    167,    138,    174,    102,    100,     84,      2,      2,
+    100,    107,    120,    119,     36,    197,     24,      0
 };
 
 static const oac_uint8 silk_NLSF_CB2_iCDF_WB[ 72 ] = {
-       255,    254,    253,    244,     12,      3,      2,      1,
-         0,    255,    254,    252,    224,     38,      3,      2,
-         1,      0,    255,    254,    251,    209,     57,      4,
-         2,      1,      0,    255,    254,    244,    195,     69,
-         4,      2,      1,      0,    255,    251,    232,    184,
-        84,      7,      2,      1,      0,    255,    254,    240,
-       186,     86,     14,      2,      1,      0,    255,    254,
-       239,    178,     91,     30,      5,      1,      0,    255,
-       248,    227,    177,    100,     19,      2,      1,      0
+    255,    254,    253,    244,     12,      3,      2,      1,
+    0,    255,    254,    252,    224,     38,      3,      2,
+    1,      0,    255,    254,    251,    209,     57,      4,
+    2,      1,      0,    255,    254,    244,    195,     69,
+    4,      2,      1,      0,    255,    251,    232,    184,
+    84,      7,      2,      1,      0,    255,    254,    240,
+    186,     86,     14,      2,      1,      0,    255,    254,
+    239,    178,     91,     30,      5,      1,      0,    255,
+    248,    227,    177,    100,     19,      2,      1,      0
 };
 
 static const oac_uint8 silk_NLSF_CB2_BITS_WB_Q5[ 72 ] = {
-       255,    255,    255,    156,      4,    154,    255,    255,
-       255,    255,    255,    227,    102,     15,     92,    255,
-       255,    255,    255,    255,    213,     83,     24,     72,
-       236,    255,    255,    255,    255,    150,     76,     33,
-        63,    214,    255,    255,    255,    190,    121,     77,
-        43,     55,    185,    255,    255,    255,    245,    137,
-        71,     43,     59,    139,    255,    255,    255,    255,
-       131,     66,     50,     66,    107,    194,    255,    255,
-       166,    116,     76,     55,     53,    125,    255,    255
+    255,    255,    255,    156,      4,    154,    255,    255,
+    255,    255,    255,    227,    102,     15,     92,    255,
+    255,    255,    255,    255,    213,     83,     24,     72,
+    236,    255,    255,    255,    255,    150,     76,     33,
+    63,    214,    255,    255,    255,    190,    121,     77,
+    43,     55,    185,    255,    255,    255,    245,    137,
+    71,     43,     59,    139,    255,    255,    255,    255,
+    131,     66,     50,     66,    107,    194,    255,    255,
+    166,    116,     76,     55,     53,    125,    255,    255
 };
 
 static const oac_uint8 silk_NLSF_PRED_WB_Q8[ 30 ] = {
-       175,    148,    160,    176,    178,    173,    174,    164,
-       177,    174,    196,    182,    198,    192,    182,     68,
-        62,     66,     60,     72,    117,     85,     90,    118,
-       136,    151,    142,    160,    142,    155
+    175,    148,    160,    176,    178,    173,    174,    164,
+    177,    174,    196,    182,    198,    192,    182,     68,
+    62,     66,     60,     72,    117,     85,     90,    118,
+    136,    151,    142,    160,    142,    155
 };
 
 static const oac_int16 silk_NLSF_DELTA_MIN_WB_Q15[ 17 ] = {
-       100,      3,     40,      3,      3,      3,      5,     14,
-        14,     10,     11,      3,      8,      9,      7,      3,
-       347
+    100,      3,     40,      3,      3,      3,      5,     14,
+    14,     10,     11,      3,      8,      9,      7,      3,
+    347
 };
 
 const silk_NLSF_CB_struct silk_NLSF_CB_WB =
@@ -221,7 +221,7 @@ const silk_NLSF_CB_struct silk_NLSF_CB_WB =
     32,
     16,
     SILK_FIX_CONST( 0.15, 16 ),
-    SILK_FIX_CONST( 1.0 / 0.15, 6 ),
+    SILK_FIX_CONST( 1.0/0.15, 6 ),
     silk_NLSF_CB1_WB_Q8,
     silk_NLSF_CB1_WB_Wght_Q9,
     silk_NLSF_CB1_iCDF_WB,
diff --git a/silk/tables_gain.c b/silk/tables_gain.c
index d133b91da..f7c1f2287 100644
--- a/silk/tables_gain.c
+++ b/silk/tables_gain.c
@@ -1,55 +1,55 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "tables.h"
 
 
-const oac_uint8 silk_gain_iCDF[ 3 ][ N_LEVELS_QGAIN / 8 ] =
+const oac_uint8 silk_gain_iCDF[ 3 ][ N_LEVELS_QGAIN/8 ] =
 {
-{
-       224,    112,     44,     15,      3,      2,      1,      0
-},
-{
-       254,    237,    192,    132,     70,     23,      4,      0
-},
-{
-       255,    252,    226,    155,     61,     11,      2,      0
-}
+    {
+        224,    112,     44,     15,      3,      2,      1,      0
+    },
+    {
+        254,    237,    192,    132,     70,     23,      4,      0
+    },
+    {
+        255,    252,    226,    155,     61,     11,      2,      0
+    }
 };
 
 const oac_uint8 silk_delta_gain_iCDF[ MAX_DELTA_GAIN_QUANT - MIN_DELTA_GAIN_QUANT + 1 ] = {
-       250,    245,    234,    203,     71,     50,     42,     38,
-        35,     33,     31,     29,     28,     27,     26,     25,
-        24,     23,     22,     21,     20,     19,     18,     17,
-        16,     15,     14,     13,     12,     11,     10,      9,
-         8,      7,      6,      5,      4,      3,      2,      1,
-         0
+    250,    245,    234,    203,     71,     50,     42,     38,
+    35,     33,     31,     29,     28,     27,     26,     25,
+    24,     23,     22,     21,     20,     19,     18,     17,
+    16,     15,     14,     13,     12,     11,     10,      9,
+    8,      7,      6,      5,      4,      3,      2,      1,
+    0
 };
diff --git a/silk/tables_other.c b/silk/tables_other.c
index 989728230..6bafd635a 100644
--- a/silk/tables_other.c
+++ b/silk/tables_other.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "structs.h"
@@ -37,16 +37,16 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Tables for stereo predictor coding */
 const oac_int16 silk_stereo_pred_quant_Q13[ STEREO_QUANT_TAB_SIZE ] = {
     -13732, -10050, -8266, -7526, -6500, -5000, -2950,  -820,
-       820,   2950,  5000,  6500,  7526,  8266, 10050, 13732
+    820,   2950,  5000,  6500,  7526,  8266, 10050, 13732
 };
-const oac_uint8  silk_stereo_pred_joint_iCDF[ 25 ] = {
+const oac_uint8 silk_stereo_pred_joint_iCDF[ 25 ] = {
     249, 247, 246, 245, 244,
     234, 210, 202, 201, 200,
     197, 174,  82,  59,  56,
-     55,  54,  46,  22,  12,
-     11,  10,   9,   7,   0
+    55,  54,  46,  22,  12,
+    11,  10,   9,   7,   0
 };
-const oac_uint8  silk_stereo_only_code_mid_iCDF[ 2 ] = { 64, 0 };
+const oac_uint8 silk_stereo_only_code_mid_iCDF[ 2 ] = { 64, 0 };
 
 /* Tables for LBRR flags */
 static const oac_uint8 silk_LBRR_flags_2_iCDF[ 3 ] = { 203, 150, 0 };
@@ -64,17 +64,17 @@ const oac_uint8 silk_LTPscale_iCDF[ 3 ] = { 128, 64, 0 };
 
 /* Tables for signal type and offset coding */
 const oac_uint8 silk_type_offset_VAD_iCDF[ 4 ] = {
-       232,    158,    10,      0
+    232,    158,    10,      0
 };
 const oac_uint8 silk_type_offset_no_VAD_iCDF[ 2 ] = {
-       230,      0
+    230,      0
 };
 
 /* Tables for NLSF interpolation factor */
 const oac_uint8 silk_NLSF_interpolation_factor_iCDF[ 5 ] = { 243, 221, 192, 181, 0 };
 
 /* Quantization offsets */
-const oac_int16  silk_Quantization_Offsets_Q10[ 2 ][ 2 ] = {
+const oac_int16 silk_Quantization_Offsets_Q10[ 2 ][ 2 ] = {
     { OFFSET_UVL_Q10, OFFSET_UVH_Q10 }, { OFFSET_VL_Q10, OFFSET_VH_Q10 }
 };
 
@@ -97,19 +97,19 @@ const oac_uint8 silk_NLSF_EXT_iCDF[ 7 ] = { 100, 40, 16, 7, 3, 1, 0 };
 /* Interpolation points for filter coefficients used in the bandwidth transition smoother */
 const oac_int32 silk_Transition_LP_B_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NB ] =
 {
-{    250767114,  501534038,  250767114  },
-{    209867381,  419732057,  209867381  },
-{    170987846,  341967853,  170987846  },
-{    131531482,  263046905,  131531482  },
-{     89306658,  178584282,   89306658  }
+    {    250767114,  501534038,  250767114  },
+    {    209867381,  419732057,  209867381  },
+    {    170987846,  341967853,  170987846  },
+    {    131531482,  263046905,  131531482  },
+    {     89306658,  178584282,   89306658  }
 };
 
 /* Interpolation points for filter coefficients used in the bandwidth transition smoother */
 const oac_int32 silk_Transition_LP_A_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NA ] =
 {
-{    506393414,  239854379  },
-{    411067935,  169683996  },
-{    306733530,  116694253  },
-{    185807084,   77959395  },
-{     35497197,   57401098  }
+    {    506393414,  239854379  },
+    {    411067935,  169683996  },
+    {    306733530,  116694253  },
+    {    185807084,   77959395  },
+    {     35497197,   57401098  }
 };
diff --git a/silk/tables_pitch_lag.c b/silk/tables_pitch_lag.c
index 65faed94f..8cb3a07b2 100644
--- a/silk/tables_pitch_lag.c
+++ b/silk/tables_pitch_lag.c
@@ -1,67 +1,67 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "tables.h"
 
-const oac_uint8 silk_pitch_lag_iCDF[ 2 * ( PITCH_EST_MAX_LAG_MS - PITCH_EST_MIN_LAG_MS ) ] = {
-       253,    250,    244,    233,    212,    182,    150,    131,
-       120,    110,     98,     85,     72,     60,     49,     40,
-        32,     25,     19,     15,     13,     11,      9,      8,
-         7,      6,      5,      4,      3,      2,      1,      0
+const oac_uint8 silk_pitch_lag_iCDF[ 2*(PITCH_EST_MAX_LAG_MS - PITCH_EST_MIN_LAG_MS) ] = {
+    253,    250,    244,    233,    212,    182,    150,    131,
+    120,    110,     98,     85,     72,     60,     49,     40,
+    32,     25,     19,     15,     13,     11,      9,      8,
+    7,      6,      5,      4,      3,      2,      1,      0
 };
 
 const oac_uint8 silk_pitch_delta_iCDF[21] = {
-       210,    208,    206,    203,    199,    193,    183,    168,
-       142,    104,     74,     52,     37,     27,     20,     14,
-        10,      6,      4,      2,      0
+    210,    208,    206,    203,    199,    193,    183,    168,
+    142,    104,     74,     52,     37,     27,     20,     14,
+    10,      6,      4,      2,      0
 };
 
 const oac_uint8 silk_pitch_contour_iCDF[34] = {
-       223,    201,    183,    167,    152,    138,    124,    111,
-        98,     88,     79,     70,     62,     56,     50,     44,
-        39,     35,     31,     27,     24,     21,     18,     16,
-        14,     12,     10,      8,      6,      4,      3,      2,
-         1,      0
+    223,    201,    183,    167,    152,    138,    124,    111,
+    98,     88,     79,     70,     62,     56,     50,     44,
+    39,     35,     31,     27,     24,     21,     18,     16,
+    14,     12,     10,      8,      6,      4,      3,      2,
+    1,      0
 };
 
 const oac_uint8 silk_pitch_contour_NB_iCDF[11] = {
-       188,    176,    155,    138,    119,     97,     67,     43,
-        26,     10,      0
+    188,    176,    155,    138,    119,     97,     67,     43,
+    26,     10,      0
 };
 
 const oac_uint8 silk_pitch_contour_10_ms_iCDF[12] = {
-       165,    119,     80,     61,     47,     35,     27,     20,
-        14,      9,      4,      0
+    165,    119,     80,     61,     47,     35,     27,     20,
+    14,      9,      4,      0
 };
 
 const oac_uint8 silk_pitch_contour_10_ms_NB_iCDF[3] = {
-       113,     63,      0
+    113,     63,      0
 };
diff --git a/silk/tables_pulses_per_block.c b/silk/tables_pulses_per_block.c
index 0caee892d..0f2008b8a 100644
--- a/silk/tables_pulses_per_block.c
+++ b/silk/tables_pulses_per_block.c
@@ -1,264 +1,264 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "tables.h"
 
 const oac_uint8 silk_max_pulses_table[ 4 ] = {
-         8,     10,     12,     16
+    8,     10,     12,     16
 };
 
 const oac_uint8 silk_pulses_per_block_iCDF[ 10 ][ 18 ] = {
-{
-       125,     51,     26,     18,     15,     12,     11,     10,
-         9,      8,      7,      6,      5,      4,      3,      2,
-         1,      0
-},
-{
-       198,    105,     45,     22,     15,     12,     11,     10,
-         9,      8,      7,      6,      5,      4,      3,      2,
-         1,      0
-},
-{
-       213,    162,    116,     83,     59,     43,     32,     24,
+    {
+        125,     51,     26,     18,     15,     12,     11,     10,
+        9,      8,      7,      6,      5,      4,      3,      2,
+        1,      0
+    },
+    {
+        198,    105,     45,     22,     15,     12,     11,     10,
+        9,      8,      7,      6,      5,      4,      3,      2,
+        1,      0
+    },
+    {
+        213,    162,    116,     83,     59,     43,     32,     24,
         18,     15,     12,      9,      7,      6,      5,      3,
-         2,      0
-},
-{
-       239,    187,    116,     59,     28,     16,     11,     10,
-         9,      8,      7,      6,      5,      4,      3,      2,
-         1,      0
-},
-{
-       250,    229,    188,    135,     86,     51,     30,     19,
+        2,      0
+    },
+    {
+        239,    187,    116,     59,     28,     16,     11,     10,
+        9,      8,      7,      6,      5,      4,      3,      2,
+        1,      0
+    },
+    {
+        250,    229,    188,    135,     86,     51,     30,     19,
         13,     10,      8,      6,      5,      4,      3,      2,
-         1,      0
-},
-{
-       249,    235,    213,    185,    156,    128,    103,     83,
+        1,      0
+    },
+    {
+        249,    235,    213,    185,    156,    128,    103,     83,
         66,     53,     42,     33,     26,     21,     17,     13,
         10,      0
-},
-{
-       254,    249,    235,    206,    164,    118,     77,     46,
+    },
+    {
+        254,    249,    235,    206,    164,    118,     77,     46,
         27,     16,     10,      7,      5,      4,      3,      2,
-         1,      0
-},
-{
-       255,    253,    249,    239,    220,    191,    156,    119,
+        1,      0
+    },
+    {
+        255,    253,    249,    239,    220,    191,    156,    119,
         85,     57,     37,     23,     15,     10,      6,      4,
-         2,      0
-},
-{
-       255,    253,    251,    246,    237,    223,    203,    179,
-       152,    124,     98,     75,     55,     40,     29,     21,
+        2,      0
+    },
+    {
+        255,    253,    251,    246,    237,    223,    203,    179,
+        152,    124,     98,     75,     55,     40,     29,     21,
         15,      0
-},
-{
-       255,    254,    253,    247,    220,    162,    106,     67,
+    },
+    {
+        255,    254,    253,    247,    220,    162,    106,     67,
         42,     28,     18,     12,      9,      6,      4,      3,
-         2,      0
-}
+        2,      0
+    }
 };
 
 const oac_uint8 silk_pulses_per_block_BITS_Q5[ 9 ][ 18 ] = {
-{
+    {
         31,     57,    107,    160,    205,    205,    255,    255,
-       255,    255,    255,    255,    255,    255,    255,    255,
-       255,    255
-},
-{
+        255,    255,    255,    255,    255,    255,    255,    255,
+        255,    255
+    },
+    {
         69,     47,     67,    111,    166,    205,    255,    255,
-       255,    255,    255,    255,    255,    255,    255,    255,
-       255,    255
-},
-{
+        255,    255,    255,    255,    255,    255,    255,    255,
+        255,    255
+    },
+    {
         82,     74,     79,     95,    109,    128,    145,    160,
-       173,    205,    205,    205,    224,    255,    255,    224,
-       255,    224
-},
-{
-       125,     74,     59,     69,     97,    141,    182,    255,
-       255,    255,    255,    255,    255,    255,    255,    255,
-       255,    255
-},
-{
-       173,    115,     85,     73,     76,     92,    115,    145,
-       173,    205,    224,    224,    255,    255,    255,    255,
-       255,    255
-},
-{
-       166,    134,    113,    102,    101,    102,    107,    118,
-       125,    138,    145,    155,    166,    182,    192,    192,
-       205,    150
-},
-{
-       224,    182,    134,    101,     83,     79,     85,     97,
-       120,    145,    173,    205,    224,    255,    255,    255,
-       255,    255
-},
-{
-       255,    224,    192,    150,    120,    101,     92,     89,
+        173,    205,    205,    205,    224,    255,    255,    224,
+        255,    224
+    },
+    {
+        125,     74,     59,     69,     97,    141,    182,    255,
+        255,    255,    255,    255,    255,    255,    255,    255,
+        255,    255
+    },
+    {
+        173,    115,     85,     73,     76,     92,    115,    145,
+        173,    205,    224,    224,    255,    255,    255,    255,
+        255,    255
+    },
+    {
+        166,    134,    113,    102,    101,    102,    107,    118,
+        125,    138,    145,    155,    166,    182,    192,    192,
+        205,    150
+    },
+    {
+        224,    182,    134,    101,     83,     79,     85,     97,
+        120,    145,    173,    205,    224,    255,    255,    255,
+        255,    255
+    },
+    {
+        255,    224,    192,    150,    120,    101,     92,     89,
         93,    102,    118,    134,    160,    182,    192,    224,
-       224,    224
-},
-{
-       255,    224,    224,    182,    155,    134,    118,    109,
-       104,    102,    106,    111,    118,    131,    145,    160,
-       173,    131
-}
+        224,    224
+    },
+    {
+        255,    224,    224,    182,    155,    134,    118,    109,
+        104,    102,    106,    111,    118,    131,    145,    160,
+        173,    131
+    }
 };
 
 const oac_uint8 silk_rate_levels_iCDF[ 2 ][ 9 ] =
 {
-{
-       241,    190,    178,    132,     87,     74,     41,     14,
-         0
-},
-{
-       223,    193,    157,    140,    106,     57,     39,     18,
-         0
-}
+    {
+        241,    190,    178,    132,     87,     74,     41,     14,
+        0
+    },
+    {
+        223,    193,    157,    140,    106,     57,     39,     18,
+        0
+    }
 };
 
 const oac_uint8 silk_rate_levels_BITS_Q5[ 2 ][ 9 ] =
 {
-{
-       131,     74,    141,     79,     80,    138,     95,    104,
-       134
-},
-{
+    {
+        131,     74,    141,     79,     80,    138,     95,    104,
+        134
+    },
+    {
         95,     99,     91,    125,     93,     76,    123,    115,
-       123
-}
+        123
+    }
 };
 
 const oac_uint8 silk_shell_code_table0[ 152 ] = {
-       128,      0,    214,     42,      0,    235,    128,     21,
-         0,    244,    184,     72,     11,      0,    248,    214,
-       128,     42,      7,      0,    248,    225,    170,     80,
-        25,      5,      0,    251,    236,    198,    126,     54,
-        18,      3,      0,    250,    238,    211,    159,     82,
-        35,     15,      5,      0,    250,    231,    203,    168,
-       128,     88,     53,     25,      6,      0,    252,    238,
-       216,    185,    148,    108,     71,     40,     18,      4,
-         0,    253,    243,    225,    199,    166,    128,     90,
-        57,     31,     13,      3,      0,    254,    246,    233,
-       212,    183,    147,    109,     73,     44,     23,     10,
-         2,      0,    255,    250,    240,    223,    198,    166,
-       128,     90,     58,     33,     16,      6,      1,      0,
-       255,    251,    244,    231,    210,    181,    146,    110,
-        75,     46,     25,     12,      5,      1,      0,    255,
-       253,    248,    238,    221,    196,    164,    128,     92,
-        60,     35,     18,      8,      3,      1,      0,    255,
-       253,    249,    242,    229,    208,    180,    146,    110,
-        76,     48,     27,     14,      7,      3,      1,      0
+    128,      0,    214,     42,      0,    235,    128,     21,
+    0,    244,    184,     72,     11,      0,    248,    214,
+    128,     42,      7,      0,    248,    225,    170,     80,
+    25,      5,      0,    251,    236,    198,    126,     54,
+    18,      3,      0,    250,    238,    211,    159,     82,
+    35,     15,      5,      0,    250,    231,    203,    168,
+    128,     88,     53,     25,      6,      0,    252,    238,
+    216,    185,    148,    108,     71,     40,     18,      4,
+    0,    253,    243,    225,    199,    166,    128,     90,
+    57,     31,     13,      3,      0,    254,    246,    233,
+    212,    183,    147,    109,     73,     44,     23,     10,
+    2,      0,    255,    250,    240,    223,    198,    166,
+    128,     90,     58,     33,     16,      6,      1,      0,
+    255,    251,    244,    231,    210,    181,    146,    110,
+    75,     46,     25,     12,      5,      1,      0,    255,
+    253,    248,    238,    221,    196,    164,    128,     92,
+    60,     35,     18,      8,      3,      1,      0,    255,
+    253,    249,    242,    229,    208,    180,    146,    110,
+    76,     48,     27,     14,      7,      3,      1,      0
 };
 
 const oac_uint8 silk_shell_code_table1[ 152 ] = {
-       129,      0,    207,     50,      0,    236,    129,     20,
-         0,    245,    185,     72,     10,      0,    249,    213,
-       129,     42,      6,      0,    250,    226,    169,     87,
-        27,      4,      0,    251,    233,    194,    130,     62,
-        20,      4,      0,    250,    236,    207,    160,     99,
-        47,     17,      3,      0,    255,    240,    217,    182,
-       131,     81,     41,     11,      1,      0,    255,    254,
-       233,    201,    159,    107,     61,     20,      2,      1,
-         0,    255,    249,    233,    206,    170,    128,     86,
-        50,     23,      7,      1,      0,    255,    250,    238,
-       217,    186,    148,    108,     70,     39,     18,      6,
-         1,      0,    255,    252,    243,    226,    200,    166,
-       128,     90,     56,     30,     13,      4,      1,      0,
-       255,    252,    245,    231,    209,    180,    146,    110,
-        76,     47,     25,     11,      4,      1,      0,    255,
-       253,    248,    237,    219,    194,    163,    128,     93,
-        62,     37,     19,      8,      3,      1,      0,    255,
-       254,    250,    241,    226,    205,    177,    145,    111,
-        79,     51,     30,     15,      6,      2,      1,      0
+    129,      0,    207,     50,      0,    236,    129,     20,
+    0,    245,    185,     72,     10,      0,    249,    213,
+    129,     42,      6,      0,    250,    226,    169,     87,
+    27,      4,      0,    251,    233,    194,    130,     62,
+    20,      4,      0,    250,    236,    207,    160,     99,
+    47,     17,      3,      0,    255,    240,    217,    182,
+    131,     81,     41,     11,      1,      0,    255,    254,
+    233,    201,    159,    107,     61,     20,      2,      1,
+    0,    255,    249,    233,    206,    170,    128,     86,
+    50,     23,      7,      1,      0,    255,    250,    238,
+    217,    186,    148,    108,     70,     39,     18,      6,
+    1,      0,    255,    252,    243,    226,    200,    166,
+    128,     90,     56,     30,     13,      4,      1,      0,
+    255,    252,    245,    231,    209,    180,    146,    110,
+    76,     47,     25,     11,      4,      1,      0,    255,
+    253,    248,    237,    219,    194,    163,    128,     93,
+    62,     37,     19,      8,      3,      1,      0,    255,
+    254,    250,    241,    226,    205,    177,    145,    111,
+    79,     51,     30,     15,      6,      2,      1,      0
 };
 
 const oac_uint8 silk_shell_code_table2[ 152 ] = {
-       129,      0,    203,     54,      0,    234,    129,     23,
-         0,    245,    184,     73,     10,      0,    250,    215,
-       129,     41,      5,      0,    252,    232,    173,     86,
-        24,      3,      0,    253,    240,    200,    129,     56,
-        15,      2,      0,    253,    244,    217,    164,     94,
-        38,     10,      1,      0,    253,    245,    226,    189,
-       132,     71,     27,      7,      1,      0,    253,    246,
-       231,    203,    159,    105,     56,     23,      6,      1,
-         0,    255,    248,    235,    213,    179,    133,     85,
-        47,     19,      5,      1,      0,    255,    254,    243,
-       221,    194,    159,    117,     70,     37,     12,      2,
-         1,      0,    255,    254,    248,    234,    208,    171,
-       128,     85,     48,     22,      8,      2,      1,      0,
-       255,    254,    250,    240,    220,    189,    149,    107,
-        67,     36,     16,      6,      2,      1,      0,    255,
-       254,    251,    243,    227,    201,    166,    128,     90,
-        55,     29,     13,      5,      2,      1,      0,    255,
-       254,    252,    246,    234,    213,    183,    147,    109,
-        73,     43,     22,     10,      4,      2,      1,      0
+    129,      0,    203,     54,      0,    234,    129,     23,
+    0,    245,    184,     73,     10,      0,    250,    215,
+    129,     41,      5,      0,    252,    232,    173,     86,
+    24,      3,      0,    253,    240,    200,    129,     56,
+    15,      2,      0,    253,    244,    217,    164,     94,
+    38,     10,      1,      0,    253,    245,    226,    189,
+    132,     71,     27,      7,      1,      0,    253,    246,
+    231,    203,    159,    105,     56,     23,      6,      1,
+    0,    255,    248,    235,    213,    179,    133,     85,
+    47,     19,      5,      1,      0,    255,    254,    243,
+    221,    194,    159,    117,     70,     37,     12,      2,
+    1,      0,    255,    254,    248,    234,    208,    171,
+    128,     85,     48,     22,      8,      2,      1,      0,
+    255,    254,    250,    240,    220,    189,    149,    107,
+    67,     36,     16,      6,      2,      1,      0,    255,
+    254,    251,    243,    227,    201,    166,    128,     90,
+    55,     29,     13,      5,      2,      1,      0,    255,
+    254,    252,    246,    234,    213,    183,    147,    109,
+    73,     43,     22,     10,      4,      2,      1,      0
 };
 
 const oac_uint8 silk_shell_code_table3[ 152 ] = {
-       130,      0,    200,     58,      0,    231,    130,     26,
-         0,    244,    184,     76,     12,      0,    249,    214,
-       130,     43,      6,      0,    252,    232,    173,     87,
-        24,      3,      0,    253,    241,    203,    131,     56,
-        14,      2,      0,    254,    246,    221,    167,     94,
-        35,      8,      1,      0,    254,    249,    232,    193,
-       130,     65,     23,      5,      1,      0,    255,    251,
-       239,    211,    162,     99,     45,     15,      4,      1,
-         0,    255,    251,    243,    223,    186,    131,     74,
-        33,     11,      3,      1,      0,    255,    252,    245,
-       230,    202,    158,    105,     57,     24,      8,      2,
-         1,      0,    255,    253,    247,    235,    214,    179,
-       132,     84,     44,     19,      7,      2,      1,      0,
-       255,    254,    250,    240,    223,    196,    159,    112,
-        69,     36,     15,      6,      2,      1,      0,    255,
-       254,    253,    245,    231,    209,    176,    136,     93,
-        55,     27,     11,      3,      2,      1,      0,    255,
-       254,    253,    252,    239,    221,    194,    158,    117,
-        76,     42,     18,      4,      3,      2,      1,      0
+    130,      0,    200,     58,      0,    231,    130,     26,
+    0,    244,    184,     76,     12,      0,    249,    214,
+    130,     43,      6,      0,    252,    232,    173,     87,
+    24,      3,      0,    253,    241,    203,    131,     56,
+    14,      2,      0,    254,    246,    221,    167,     94,
+    35,      8,      1,      0,    254,    249,    232,    193,
+    130,     65,     23,      5,      1,      0,    255,    251,
+    239,    211,    162,     99,     45,     15,      4,      1,
+    0,    255,    251,    243,    223,    186,    131,     74,
+    33,     11,      3,      1,      0,    255,    252,    245,
+    230,    202,    158,    105,     57,     24,      8,      2,
+    1,      0,    255,    253,    247,    235,    214,    179,
+    132,     84,     44,     19,      7,      2,      1,      0,
+    255,    254,    250,    240,    223,    196,    159,    112,
+    69,     36,     15,      6,      2,      1,      0,    255,
+    254,    253,    245,    231,    209,    176,    136,     93,
+    55,     27,     11,      3,      2,      1,      0,    255,
+    254,    253,    252,    239,    221,    194,    158,    117,
+    76,     42,     18,      4,      3,      2,      1,      0
 };
 
 const oac_uint8 silk_shell_code_table_offsets[ 17 ] = {
-         0,      0,      2,      5,      9,     14,     20,     27,
-        35,     44,     54,     65,     77,     90,    104,    119,
-       135
+    0,      0,      2,      5,      9,     14,     20,     27,
+    35,     44,     54,     65,     77,     90,    104,    119,
+    135
 };
 
 const oac_uint8 silk_sign_iCDF[ 42 ] = {
-       254,     49,     67,     77,     82,     93,     99,
-       198,     11,     18,     24,     31,     36,     45,
-       255,     46,     66,     78,     87,     94,    104,
-       208,     14,     21,     32,     42,     51,     66,
-       255,     94,    104,    109,    112,    115,    118,
-       248,     53,     69,     80,     88,     95,    102
+    254,     49,     67,     77,     82,     93,     99,
+    198,     11,     18,     24,     31,     36,     45,
+    255,     46,     66,     78,     87,     94,    104,
+    208,     14,     21,     32,     42,     51,     66,
+    255,     94,    104,    109,    112,    115,    118,
+    248,     53,     69,     80,     88,     95,    102
 };
diff --git a/silk/tests/test_unit_LPC_inv_pred_gain.c b/silk/tests/test_unit_LPC_inv_pred_gain.c
index b37205e1d..80137cbaa 100644
--- a/silk/tests/test_unit_LPC_inv_pred_gain.c
+++ b/silk/tests/test_unit_LPC_inv_pred_gain.c
@@ -1,32 +1,32 @@
 /***********************************************************************
-Copyright (c) 2017 Google Inc., Jean-Marc Valin
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2017 Google Inc., Jean-Marc Valin
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdio.h>
@@ -45,41 +45,41 @@ int check_stability(oac_int16 *A_Q12, int order) {
     int sum_a, sum_abs_a;
     double y[SILK_MAX_ORDER_LPC] = {0};
     sum_a = sum_abs_a = 0;
-    for( j = 0; j < order; j++ ) {
+    for (j = 0; j < order; j++) {
         sum_a += A_Q12[ j ];
         sum_abs_a += silk_abs( A_Q12[ j ] );
     }
     /* Check DC stability. */
-    if( sum_a >= 4096 ) {
+    if (sum_a >= 4096) {
         return 0;
     }
     /* If the sum of absolute values is less than 1, the filter
        has to be stable. */
-    if( sum_abs_a < 4096 ) {
+    if (sum_abs_a < 4096) {
         return 1;
     }
     y[0] = 1;
-    for( i = 0; i < 10000; i++ ) {
+    for (i = 0; i < 10000; i++) {
         double sum = 0;
-        for( j = 0; j < order; j++ ) {
+        for (j = 0; j < order; j++) {
             sum += y[ j ]*A_Q12[ j ];
         }
-        for( j = order - 1; j > 0; j-- ) {
+        for (j = order - 1; j > 0; j--) {
             y[ j ] = y[ j - 1 ];
         }
         y[ 0 ] = sum*(1./4096);
         /* If impulse response reaches +/- 10000, the filter
            is definitely unstable. */
-        if( !(y[ 0 ] < 10000 && y[ 0 ] > -10000) ) {
+        if (!(y[ 0 ] < 10000 && y[ 0 ] > -10000)) {
             return 0;
         }
         /* Test every 8 sample for low amplitude. */
-        if( ( i & 0x7 ) == 0 ) {
+        if ((i&0x7) == 0) {
             double amp = 0;
-            for( j = 0; j < order; j++ ) {
+            for (j = 0; j < order; j++) {
                 amp += fabs(y[j]);
             }
-            if( amp < 0.00001 ) {
+            if (amp < 0.00001) {
                 return 1;
             }
         }
@@ -99,28 +99,28 @@ int main(void) {
     srand(0);
 
     printf("Testing silk_LPC_inverse_pred_gain() optimization ...\n");
-    for( count = 0; count < loop_num; count++ ) {
+    for (count = 0; count < loop_num; count++) {
         unsigned int i;
-        oac_int     order;
+        oac_int order;
         unsigned int shift;
-        oac_int16   A_Q12[ SILK_MAX_ORDER_LPC ];
+        oac_int16 A_Q12[ SILK_MAX_ORDER_LPC ];
         oac_int32 gain;
 
-        for( order = 2; order <= SILK_MAX_ORDER_LPC; order += 2 ) { /* order must be even. */
-            for( shift = 0; shift < 16; shift++ ) { /* Different dynamic range. */
-                for( i = 0; i < SILK_MAX_ORDER_LPC; i++ ) {
-                    A_Q12[i] = ((oac_int16)rand()) >> shift;
+        for (order = 2; order <= SILK_MAX_ORDER_LPC; order += 2) {  /* order must be even. */
+            for (shift = 0; shift < 16; shift++) {  /* Different dynamic range. */
+                for (i = 0; i < SILK_MAX_ORDER_LPC; i++) {
+                    A_Q12[i] = ((oac_int16)rand())>>shift;
                 }
                 gain = silk_LPC_inverse_pred_gain(A_Q12, order, arch);
                 /* Look for filters that silk_LPC_inverse_pred_gain() thinks are
                    stable but definitely aren't. */
-                if( gain != 0 && !check_stability(A_Q12, order) ) {
+                if (gain != 0 && !check_stability(A_Q12, order)) {
                     fprintf(stderr, "**Loop %4d failed!**\n", count);
                     return 1;
                 }
             }
         }
-        if( !(count % 500) ) {
+        if (!(count%500)) {
             printf("Loop %4d passed\n", count);
         }
     }
diff --git a/silk/tuning_parameters.h b/silk/tuning_parameters.h
index e2a23eb8b..2d264da3b 100644
--- a/silk/tuning_parameters.h
+++ b/silk/tuning_parameters.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_TUNING_PARAMETERS_H
diff --git a/silk/typedef.h b/silk/typedef.h
index e59b2464b..6c265c877 100644
--- a/silk/typedef.h
+++ b/silk/typedef.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (c) 2006-2011, Skype Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2006-2011, Skype Limited. All rights reserved.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_TYPEDEF_H
@@ -60,17 +60,16 @@ POSSIBILITY OF SUCH DAMAGE.
 # ifdef ENABLE_ASSERTIONS
 #  include <stdio.h>
 #  include <stdlib.h>
-#define silk_fatal(str) _silk_fatal(str, __FILE__, __LINE__);
-#ifdef __GNUC__
+#  define silk_fatal(str) _silk_fatal(str, __FILE__, __LINE__);
+#  ifdef __GNUC__
 __attribute__((noreturn))
-#endif
-static OAC_INLINE void _silk_fatal(const char *str, const char *file, int line)
-{
-   fprintf (stderr, "Fatal (internal) error in %s, line %d: %s\n", file, line, str);
-#if defined(_MSC_VER)
-   _set_abort_behavior( 0, _WRITE_ABORT_MSG);
-#endif
-   abort();
+#  endif
+static OAC_INLINE void _silk_fatal(const char *str, const char *file, int line) {
+    fprintf (stderr, "Fatal (internal) error in %s, line %d: %s\n", file, line, str);
+#  if defined(_MSC_VER)
+    _set_abort_behavior( 0, _WRITE_ABORT_MSG);
+#  endif
+    abort();
 }
 #  define silk_assert(COND) {if (!(COND)) {silk_fatal("assertion failed: " #COND);}}
 # else
diff --git a/silk/x86/NSQ_del_dec_avx2.c b/silk/x86/NSQ_del_dec_avx2.c
index 94012cbfc..653388aa9 100644
--- a/silk/x86/NSQ_del_dec_avx2.c
+++ b/silk/x86/NSQ_del_dec_avx2.c
@@ -1,36 +1,36 @@
 /***********************************************************************
-Copyright (c) 2021 Google Inc.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (c) 2021 Google Inc.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #ifdef OAC_CHECK_ASM
-#include <string.h>
+# include <string.h>
 #endif
 
 #include "oac_defines.h"
@@ -42,70 +42,63 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "celt/x86/x86cpu.h"
 
 /* Returns TRUE if all assumptions met */
-static OAC_INLINE int verify_assumptions(const silk_encoder_state *psEncC)
-{
+static OAC_INLINE int verify_assumptions(const silk_encoder_state *psEncC) {
     /* This optimization is based on these assumptions        */
     /* These assumptions are fundamental and hence assert are */
     /* used. Should any assert triggers, we have to re-visit  */
     /* all related code to make sure it still functions the   */
     /* same as the C implementation.                          */
-    silk_assert(MAX_DEL_DEC_STATES  <= 4      &&
-                MAX_FRAME_LENGTH     % 4 == 0 &&
-                MAX_SUB_FRAME_LENGTH % 4 == 0 &&
-                LTP_MEM_LENGTH_MS    % 4 == 0 );
-    silk_assert(psEncC->fs_kHz ==  8 ||
-                psEncC->fs_kHz == 12 ||
-                psEncC->fs_kHz == 16 );
-    silk_assert(psEncC->nb_subfr <= MAX_NB_SUBFR &&
-                psEncC->nb_subfr > 0             );
-    silk_assert(psEncC->nStatesDelayedDecision <= MAX_DEL_DEC_STATES &&
-                psEncC->nStatesDelayedDecision > 0                   );
-    silk_assert(psEncC->ltp_mem_length == psEncC->fs_kHz * LTP_MEM_LENGTH_MS);
+    silk_assert(MAX_DEL_DEC_STATES  <= 4
+        && MAX_FRAME_LENGTH%4 == 0
+        && MAX_SUB_FRAME_LENGTH%4 == 0
+        && LTP_MEM_LENGTH_MS%4 == 0 );
+    silk_assert(psEncC->fs_kHz ==  8
+        || psEncC->fs_kHz == 12
+        || psEncC->fs_kHz == 16 );
+    silk_assert(psEncC->nb_subfr <= MAX_NB_SUBFR
+        && psEncC->nb_subfr > 0             );
+    silk_assert(psEncC->nStatesDelayedDecision <= MAX_DEL_DEC_STATES
+        && psEncC->nStatesDelayedDecision > 0                   );
+    silk_assert(psEncC->ltp_mem_length == psEncC->fs_kHz*LTP_MEM_LENGTH_MS);
 
     /* Regressions were observed on certain AMD Zen CPUs when      */
     /* nStatesDelayedDecision is 1 or 2. Ideally we should detect  */
     /* these CPUs and enable this optimization on others; however, */
     /* there is no good way to do so under current OAC framework. */
-    return psEncC->nStatesDelayedDecision == 3 ||
-           psEncC->nStatesDelayedDecision == 4;
+    return psEncC->nStatesDelayedDecision == 3
+           || psEncC->nStatesDelayedDecision == 4;
 }
 
 /* Intrinsics not defined on MSVC */
 #ifdef _MSC_VER
-#include <intsafe.h>
-static inline int __builtin_sadd_overflow(oac_int32 a, oac_int32 b, oac_int32* res)
-{
-    *res = a+b;
-    return (*res ^ a) & (*res ^ b) & 0x80000000;
+# include <intsafe.h>
+static inline int __builtin_sadd_overflow(oac_int32 a, oac_int32 b, oac_int32* res) {
+    *res = a + b;
+    return (*res^a)&(*res^b)&0x80000000;
 }
-static inline int __builtin_ctz(unsigned int x)
-{
+static inline int __builtin_ctz(unsigned int x) {
     DWORD res = 0;
     return _BitScanForward(&res, x) ? res : 32;
 }
 #endif
 
-static OAC_INLINE __m128i silk_cvtepi64_epi32_high(__m256i num)
-{
+static OAC_INLINE __m128i silk_cvtepi64_epi32_high(__m256i num) {
     return _mm256_castsi256_si128(_mm256_permutevar8x32_epi32(num, _mm256_set_epi32(0, 0, 0, 0, 7, 5, 3, 1)));
 }
 
-static OAC_INLINE oac_int16 silk_sat16(oac_int32 num)
-{
+static OAC_INLINE oac_int16 silk_sat16(oac_int32 num) {
     num = num > silk_int16_MAX ? silk_int16_MAX : num;
     num = num < silk_int16_MIN ? silk_int16_MIN : num;
     return num;
 }
 
-static OAC_INLINE oac_int32 silk_sar_round_32(oac_int32 a, int bits)
-{
+static OAC_INLINE oac_int32 silk_sar_round_32(oac_int32 a, int bits) {
     silk_assert(bits > 0 && bits < 31);
-    a += 1 << (bits-1);
-    return a >> bits;
+    a += 1<<(bits - 1);
+    return a>>bits;
 }
 
-static OAC_INLINE oac_int64 silk_sar_round_smulww(oac_int32 a, oac_int32 b, int bits)
-{
+static OAC_INLINE oac_int64 silk_sar_round_smulww(oac_int32 a, oac_int32 b, int bits) {
 #ifndef OAC_CHECK_ASM
     oac_int64 t;
 #endif
@@ -115,54 +108,47 @@ static OAC_INLINE oac_int64 silk_sar_round_smulww(oac_int32 a, oac_int32 b, int
 #else
     /* This code is more correct, but it won't overflow like the C code in some rare cases. */
     silk_assert(bits > 0 && bits < 63);
-    t = ((oac_int64)a) * ((oac_int64)b);
+    t = ((oac_int64)a)*((oac_int64)b);
     bits += 16;
-    t += 1ull << (bits-1);
-    return t >> bits;
+    t += 1ull<<(bits - 1);
+    return t>>bits;
 #endif
 }
 
-static OAC_INLINE oac_int32 silk_add_sat32(oac_int32 a, oac_int32 b)
-{
+static OAC_INLINE oac_int32 silk_add_sat32(oac_int32 a, oac_int32 b) {
     oac_int32 sum;
-    if (__builtin_sadd_overflow(a, b, &sum))
-    {
+    if (__builtin_sadd_overflow(a, b, &sum)) {
         return a >= 0 ? silk_int32_MAX : silk_int32_MIN;
     }
     return sum;
 }
 
-static OAC_INLINE __m128i silk_mm_srai_round_epi32(__m128i a, int bits)
-{
+static OAC_INLINE __m128i silk_mm_srai_round_epi32(__m128i a, int bits) {
     silk_assert(bits > 0 && bits < 31);
-    return _mm_srai_epi32(_mm_add_epi32(a, _mm_set1_epi32(1 << (bits - 1))), bits);
+    return _mm_srai_epi32(_mm_add_epi32(a, _mm_set1_epi32(1<<(bits - 1))), bits);
 }
 
 /* add/subtract with output saturated */
-static OAC_INLINE __m128i silk_mm_add_sat_epi32(__m128i a, __m128i b)
-{
+static OAC_INLINE __m128i silk_mm_add_sat_epi32(__m128i a, __m128i b) {
     __m128i r = _mm_add_epi32(a, b);
     __m128i OF = _mm_and_si128(_mm_xor_si128(a, r), _mm_xor_si128(b, r));           /* OF = (sum ^ a) & (sum ^ b)   */
     __m128i SAT = _mm_add_epi32(_mm_srli_epi32(a, 31), _mm_set1_epi32(0x7FFFFFFF)); /* SAT = (a >> 31) + 0x7FFFFFFF */
     return _mm_blendv_epi8(r, SAT, _mm_srai_epi32(OF, 31));
 }
-static OAC_INLINE __m128i silk_mm_sub_sat_epi32(__m128i a, __m128i b)
-{
+static OAC_INLINE __m128i silk_mm_sub_sat_epi32(__m128i a, __m128i b) {
     __m128i r = _mm_sub_epi32(a, b);
     __m128i OF = _mm_andnot_si128(_mm_xor_si128(b, r), _mm_xor_si128(a, r));        /* OF = (sum ^ a) & (sum ^ ~b) = (sum ^ a) & ~(sum ^ b) */
     __m128i SAT = _mm_add_epi32(_mm_srli_epi32(a, 31), _mm_set1_epi32(0x7FFFFFFF)); /* SAT = (a >> 31) + 0x7FFFFFFF                         */
     return _mm_blendv_epi8(r, SAT, _mm_srai_epi32(OF, 31));
 }
-static OAC_INLINE __m256i silk_mm256_sub_sat_epi32(__m256i a, __m256i b)
-{
+static OAC_INLINE __m256i silk_mm256_sub_sat_epi32(__m256i a, __m256i b) {
     __m256i r = _mm256_sub_epi32(a, b);
     __m256i OF = _mm256_andnot_si256(_mm256_xor_si256(b, r), _mm256_xor_si256(a, r));        /* OF = (sum ^ a) & (sum ^ ~b) = (sum ^ a) & ~(sum ^ b) */
     __m256i SAT = _mm256_add_epi32(_mm256_srli_epi32(a, 31), _mm256_set1_epi32(0x7FFFFFFF)); /* SAT = (a >> 31) + 0x7FFFFFFF                         */
     return _mm256_blendv_epi8(r, SAT, _mm256_srai_epi32(OF, 31));
 }
 
-static OAC_INLINE __m128i silk_mm_limit_epi32(__m128i num, oac_int32 limit1, oac_int32 limit2)
-{
+static OAC_INLINE __m128i silk_mm_limit_epi32(__m128i num, oac_int32 limit1, oac_int32 limit2) {
     oac_int32 lo = limit1 < limit2 ? limit1 : limit2;
     oac_int32 hi = limit1 > limit2 ? limit1 : limit2;
 
@@ -172,30 +158,26 @@ static OAC_INLINE __m128i silk_mm_limit_epi32(__m128i num, oac_int32 limit1, oac
 }
 
 /* cond < 0 ? -num : num */
-static OAC_INLINE __m128i silk_mm_sign_epi32(__m128i num, __m128i cond)
-{
+static OAC_INLINE __m128i silk_mm_sign_epi32(__m128i num, __m128i cond) {
     return _mm_sign_epi32(num, _mm_or_si128(cond, _mm_set1_epi32(1)));
 }
-static OAC_INLINE __m256i silk_mm256_sign_epi32(__m256i num, __m256i cond)
-{
+static OAC_INLINE __m256i silk_mm256_sign_epi32(__m256i num, __m256i cond) {
     return _mm256_sign_epi32(num, _mm256_or_si256(cond, _mm256_set1_epi32(1)));
 }
 
 /* (a32 * b32) >> 16 */
-static OAC_INLINE __m128i silk_mm_smulww_epi32(__m128i a, oac_int32 b)
-{
-    return silk_cvtepi64_epi32_high(_mm256_slli_epi64(_mm256_mul_epi32(_mm256_cvtepi32_epi64(a), _mm256_set1_epi32(b)), 16));
+static OAC_INLINE __m128i silk_mm_smulww_epi32(__m128i a, oac_int32 b) {
+    return silk_cvtepi64_epi32_high(_mm256_slli_epi64(_mm256_mul_epi32(_mm256_cvtepi32_epi64(a), _mm256_set1_epi32(b)),
+    16));
 }
 
 /* (a32 * (oac_int32)((oac_int16)(b32))) >> 16 output have to be 32bit int */
-static OAC_INLINE __m128i silk_mm_smulwb_epi32(__m128i a, oac_int32 b)
-{
+static OAC_INLINE __m128i silk_mm_smulwb_epi32(__m128i a, oac_int32 b) {
     return silk_cvtepi64_epi32_high(_mm256_mul_epi32(_mm256_cvtepi32_epi64(a), _mm256_set1_epi32((oac_uint32)b<<16)));
 }
 
 /* (oac_int32)((oac_int16)(a3))) * (oac_int32)((oac_int16)(b32)) output have to be 32bit int */
-static OAC_INLINE __m256i silk_mm256_smulbb_epi32(__m256i a, __m256i b)
-{
+static OAC_INLINE __m256i silk_mm256_smulbb_epi32(__m256i a, __m256i b) {
     const char FF = (char)0xFF;
     __m256i msk = _mm256_set_epi8(
         FF, FF, FF, FF, FF, FF, FF, FF, 13, 12, 9, 8, 5, 4, 1, 0,
@@ -207,63 +189,54 @@ static OAC_INLINE __m256i silk_mm256_smulbb_epi32(__m256i a, __m256i b)
     return _mm256_unpacklo_epi16(lo, hi);
 }
 
-static OAC_INLINE __m256i silk_mm256_reverse_epi32(__m256i v)
-{
+static OAC_INLINE __m256i silk_mm256_reverse_epi32(__m256i v) {
     v = _mm256_shuffle_epi32(v, 0x1B);
     v = _mm256_permute4x64_epi64(v, 0x4E);
     return v;
 }
 
-static OAC_INLINE oac_int32 silk_mm256_hsum_epi32(__m256i v)
-{
+static OAC_INLINE oac_int32 silk_mm256_hsum_epi32(__m256i v) {
     __m128i sum = _mm_add_epi32(_mm256_extracti128_si256(v, 1), _mm256_extracti128_si256(v, 0));
     sum = _mm_add_epi32(sum, _mm_shuffle_epi32(sum, 0x4E));
     sum = _mm_add_epi32(sum, _mm_shuffle_epi32(sum, 0xB1));
     return _mm_cvtsi128_si32(sum);
 }
 
-static OAC_INLINE __m128i silk_mm_hmin_epi32(__m128i num)
-{
+static OAC_INLINE __m128i silk_mm_hmin_epi32(__m128i num) {
     num = _mm_min_epi32(num, _mm_shuffle_epi32(num, 0x4E)); /* 0123 -> 2301 */
     num = _mm_min_epi32(num, _mm_shuffle_epi32(num, 0xB1)); /* 0123 -> 1032 */
     return num;
 }
 
-static OAC_INLINE __m128i silk_mm_hmax_epi32(__m128i num)
-{
+static OAC_INLINE __m128i silk_mm_hmax_epi32(__m128i num) {
     num = _mm_max_epi32(num, _mm_shuffle_epi32(num, 0x4E)); /* 0123 -> 2310 */
     num = _mm_max_epi32(num, _mm_shuffle_epi32(num, 0xB1)); /* 0123 -> 1032 */
     return num;
 }
 
-static OAC_INLINE __m128i silk_mm_mask_hmin_epi32(__m128i num, __m128i mask)
-{
+static OAC_INLINE __m128i silk_mm_mask_hmin_epi32(__m128i num, __m128i mask) {
     num = _mm_blendv_epi8(num, _mm_set1_epi32(silk_int32_MAX), mask);
     return silk_mm_hmin_epi32(num);
 }
 
-static OAC_INLINE __m128i silk_mm_mask_hmax_epi32(__m128i num, __m128i mask)
-{
+static OAC_INLINE __m128i silk_mm_mask_hmax_epi32(__m128i num, __m128i mask) {
     num = _mm_blendv_epi8(num, _mm_set1_epi32(silk_int32_MIN), mask);
     return silk_mm_hmax_epi32(num);
 }
 
-static OAC_INLINE __m128i silk_mm256_rand_epi32(__m128i seed)
-{
+static OAC_INLINE __m128i silk_mm256_rand_epi32(__m128i seed) {
     seed = _mm_mullo_epi32(seed, _mm_set1_epi32(RAND_MULTIPLIER));
     seed = _mm_add_epi32(seed, _mm_set1_epi32(RAND_INCREMENT));
     return seed;
 }
 
-static OAC_INLINE oac_int32 silk_index_of_first_equal_epi32(__m128i a, __m128i b)
-{
-    unsigned int mask = _mm_movemask_epi8(_mm_cmpeq_epi32(a, b)) & 0x1111;
+static OAC_INLINE oac_int32 silk_index_of_first_equal_epi32(__m128i a, __m128i b) {
+    unsigned int mask = _mm_movemask_epi8(_mm_cmpeq_epi32(a, b))&0x1111;
     silk_assert(mask != 0);
-    return __builtin_ctz(mask) >> 2;
+    return __builtin_ctz(mask)>>2;
 }
 
-static __m128i silk_index_to_selector(oac_int32 index)
-{
+static __m128i silk_index_to_selector(oac_int32 index) {
     silk_assert(index < 4);
     index <<= 2;
     return _mm_set_epi8(
@@ -273,13 +246,11 @@ static __m128i silk_index_to_selector(oac_int32 index)
         index + 3, index + 2, index + 1, index + 0);
 }
 
-static oac_int32 silk_select_winner(__m128i num, __m128i selector)
-{
+static oac_int32 silk_select_winner(__m128i num, __m128i selector) {
     return _mm_cvtsi128_si32(_mm_shuffle_epi8(num, selector));
 }
 
-typedef struct
-{
+typedef struct {
     __m128i RandState;
     __m128i Q_Q10;
     __m128i Xq_Q14;
@@ -287,8 +258,7 @@ typedef struct
     __m128i Shape_Q14;
 } NSQ_del_dec_sample_struct;
 
-typedef struct
-{
+typedef struct {
     __m128i sLPC_Q14[MAX_SUB_FRAME_LENGTH + NSQ_LPC_BUF_LENGTH];
     __m128i LF_AR_Q14;
     __m128i Seed;
@@ -313,7 +283,7 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states_avx2(
     const oac_int pitchL[MAX_NB_SUBFR],       /* I    Pitch lag                       */
     const oac_int signal_type,                /* I    Signal type                     */
     const oac_int decisionDelay               /* I    Decision delay                  */
-);
+    );
 
 /*******************************************/
 /* LPC analysis filter                     */
@@ -325,9 +295,9 @@ static OAC_INLINE void silk_LPC_analysis_filter_avx2(
     oac_int16                  *out,               /* O    Output signal                           */
     const oac_int16            *in,                /* I    Input signal                            */
     const oac_int16            *B,                 /* I    MA prediction coefficients, Q12 [order] */
-    const oac_int32            len,                /* I    Signal length                           */
-    const oac_int32            order               /* I    Filter order                            */
-);
+    const oac_int32 len,                           /* I    Signal length                           */
+    const oac_int32 order                          /* I    Filter order                            */
+    );
 
 /******************************************/
 /* Noise shape quantizer for one subframe */
@@ -359,7 +329,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
     __m128i MaskDelDec,                         /* I    Mask of states in decision tree    */
     oac_int *smpl_buf_idx,                     /* I/O  Index to newest samples in buffers */
     oac_int decisionDelay                      /* I                                       */
-);
+    );
 
 void silk_NSQ_del_dec_avx2(
     const silk_encoder_state *psEncC,                            /* I    Encoder State               */
@@ -377,8 +347,7 @@ void silk_NSQ_del_dec_avx2(
     const oac_int32 pitchL[MAX_NB_SUBFR],                       /* I    Pitch lags                  */
     const oac_int Lambda_Q10,                                   /* I    Rate/distortion tradeoff    */
     const oac_int LTP_scale_Q14                                 /* I    LTP state scaling           */
-)
-{
+    ) {
 #ifdef OAC_CHECK_ASM
     silk_nsq_state NSQ_c;
     SideInfoIndices psIndices_c;
@@ -388,13 +357,14 @@ void silk_NSQ_del_dec_avx2(
     silk_memcpy(&NSQ_c, NSQ, sizeof(NSQ_c));
     silk_memcpy(&psIndices_c, psIndices, sizeof(psIndices_c));
     silk_memcpy(pulses_c, pulses, sizeof(pulses_c));
-    silk_NSQ_del_dec_c(psEncC, &NSQ_c, &psIndices_c, x16, pulses_c, PredCoef_Q12, LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16,
+    silk_NSQ_del_dec_c(psEncC, &NSQ_c, &psIndices_c, x16, pulses_c, PredCoef_Q12, LTPCoef_Q14, AR_Q13,
+    HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16,
                        pitchL, Lambda_Q10, LTP_scale_Q14);
 #endif
 
-    if (!verify_assumptions(psEncC))
-    {
-        silk_NSQ_del_dec_c(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14);
+    if (!verify_assumptions(psEncC)) {
+        silk_NSQ_del_dec_c(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14,
+        Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14);
         return;
     }
 
@@ -414,7 +384,7 @@ void silk_NSQ_del_dec_avx2(
     __m128i RDmin_Q10, MaskDelDec, Winner_selector;
     SAVE_STACK;
 
-    MaskDelDec = _mm_cvtepi8_epi32(_mm_cvtsi32_si128(0xFFFFFF00ul << ((psEncC->nStatesDelayedDecision - 1) << 3)));
+    MaskDelDec = _mm_cvtepi8_epi32(_mm_cvtsi32_si128(0xFFFFFF00ul<<((psEncC->nStatesDelayedDecision - 1)<<3)));
 
     /* Set unvoiced lag to the previous one, overwrite later for voiced */
     lag = NSQ->lagPrev;
@@ -428,42 +398,32 @@ void silk_NSQ_del_dec_avx2(
     psDelDec.LF_AR_Q14 = _mm_set1_epi32(NSQ->sLF_AR_shp_Q14);
     psDelDec.Diff_Q14 = _mm_set1_epi32(NSQ->sDiff_shp_Q14);
     psDelDec.Samples[0].Shape_Q14 = _mm_set1_epi32(NSQ->sLTP_shp_Q14[psEncC->ltp_mem_length - 1]);
-    for (i = 0; i < NSQ_LPC_BUF_LENGTH; i++)
-    {
+    for (i = 0; i < NSQ_LPC_BUF_LENGTH; i++) {
         psDelDec.sLPC_Q14[i] = _mm_set1_epi32(NSQ->sLPC_Q14[i]);
     }
-    for (i = 0; i < MAX_SHAPE_LPC_ORDER; i++)
-    {
+    for (i = 0; i < MAX_SHAPE_LPC_ORDER; i++) {
         psDelDec.sAR2_Q14[i] = _mm_set1_epi32(NSQ->sAR2_Q14[i]);
     }
 
-    offset_Q10 = silk_Quantization_Offsets_Q10[psIndices->signalType >> 1][psIndices->quantOffsetType];
+    offset_Q10 = silk_Quantization_Offsets_Q10[psIndices->signalType>>1][psIndices->quantOffsetType];
     smpl_buf_idx = 0; /* index of oldest samples */
 
     decisionDelay = silk_min_int(DECISION_DELAY, psEncC->subfr_length);
 
     /* For voiced frames limit the decision delay to lower than the pitch lag */
-    if (psIndices->signalType == TYPE_VOICED)
-    {
-        for (k = 0; k < psEncC->nb_subfr; k++)
-        {
-            decisionDelay = silk_min_int(decisionDelay, pitchL[k] - LTP_ORDER / 2 - 1);
+    if (psIndices->signalType == TYPE_VOICED) {
+        for (k = 0; k < psEncC->nb_subfr; k++) {
+            decisionDelay = silk_min_int(decisionDelay, pitchL[k] - LTP_ORDER/2 - 1);
         }
-    }
-    else
-    {
-        if (lag > 0)
-        {
-            decisionDelay = silk_min_int(decisionDelay, lag - LTP_ORDER / 2 - 1);
+    } else {
+        if (lag > 0) {
+            decisionDelay = silk_min_int(decisionDelay, lag - LTP_ORDER/2 - 1);
         }
     }
 
-    if (psIndices->NLSFInterpCoef_Q2 == 4)
-    {
+    if (psIndices->NLSFInterpCoef_Q2 == 4) {
         LSF_interpolation_flag = 0;
-    }
-    else
-    {
+    } else {
         LSF_interpolation_flag = 1;
     }
 
@@ -474,28 +434,24 @@ void silk_NSQ_del_dec_avx2(
     NSQ->sLTP_shp_buf_idx = psEncC->ltp_mem_length;
     NSQ->sLTP_buf_idx = psEncC->ltp_mem_length;
     subfr = 0;
-    for (k = 0; k < psEncC->nb_subfr; k++)
-    {
-        A_Q12 = &PredCoef_Q12[((k >> 1) | (1 ^ LSF_interpolation_flag)) * MAX_LPC_ORDER];
-        B_Q14 = &LTPCoef_Q14[k * LTP_ORDER];
-        AR_shp_Q13 = &AR_Q13[k * MAX_SHAPE_LPC_ORDER];
+    for (k = 0; k < psEncC->nb_subfr; k++) {
+        A_Q12 = &PredCoef_Q12[((k>>1)|(1^LSF_interpolation_flag))*MAX_LPC_ORDER];
+        B_Q14 = &LTPCoef_Q14[k*LTP_ORDER];
+        AR_shp_Q13 = &AR_Q13[k*MAX_SHAPE_LPC_ORDER];
 
         /* Noise shape parameters */
         silk_assert(HarmShapeGain_Q14[k] >= 0);
         HarmShapeFIRPacked_Q14  =                          silk_RSHIFT( HarmShapeGain_Q14[ k ], 2 );
-        HarmShapeFIRPacked_Q14 |= silk_LSHIFT( (oac_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
+        HarmShapeFIRPacked_Q14 |= silk_LSHIFT((oac_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
 
         NSQ->rewhite_flag = 0;
-        if (psIndices->signalType == TYPE_VOICED)
-        {
+        if (psIndices->signalType == TYPE_VOICED) {
             /* Voiced */
             lag = pitchL[k];
 
             /* Re-whitening */
-            if ((k & (3 ^ (LSF_interpolation_flag << 1))) == 0)
-            {
-                if (k == 2)
-                {
+            if ((k&(3^(LSF_interpolation_flag<<1))) == 0) {
+                if (k == 2) {
                     /* RESET DELAYED DECISIONS */
                     /* Find winner */
                     RDmin_Q10 = silk_mm_mask_hmin_epi32(psDelDec.RD_Q10, MaskDelDec);
@@ -504,20 +460,20 @@ void silk_NSQ_del_dec_avx2(
                     psDelDec.RD_Q10 = _mm_add_epi32(
                         psDelDec.RD_Q10,
                         _mm_blendv_epi8(
-                            _mm_set1_epi32(silk_int32_MAX >> 4),
+                            _mm_set1_epi32(silk_int32_MAX>>4),
                             _mm_setzero_si128(),
-                            _mm_cvtepi8_epi32(_mm_cvtsi32_si128(0xFFU << (unsigned)(Winner_ind << 3)))));
+                            _mm_cvtepi8_epi32(_mm_cvtsi32_si128(0xFFU<<(unsigned)(Winner_ind<<3)))));
 
                     /* Copy final part of signals from winner state to output and long-term filter states */
                     last_smple_idx = smpl_buf_idx + decisionDelay;
-                    for (i = 0; i < decisionDelay; i++)
-                    {
-                        last_smple_idx = (last_smple_idx + DECISION_DELAY - 1) % DECISION_DELAY;
+                    for (i = 0; i < decisionDelay; i++) {
+                        last_smple_idx = (last_smple_idx + DECISION_DELAY - 1)%DECISION_DELAY;
                         psSample = &psDelDec.Samples[last_smple_idx];
                         pulses[i - decisionDelay] =
                             (oac_int8)silk_sar_round_32(silk_select_winner(psSample->Q_Q10, Winner_selector), 10);
                         pxq[i - decisionDelay] =
-                            silk_sat16((oac_int32)silk_sar_round_smulww(silk_select_winner(psSample->Xq_Q14, Winner_selector), Gains_Q16[1], 14));
+                            silk_sat16((oac_int32)silk_sar_round_smulww(silk_select_winner(psSample->Xq_Q14,
+                        Winner_selector), Gains_Q16[1], 14));
                         NSQ->sLTP_shp_Q14[NSQ->sLTP_shp_buf_idx - decisionDelay + i] =
                             silk_select_winner(psSample->Shape_Q14, Winner_selector);
                     }
@@ -526,10 +482,10 @@ void silk_NSQ_del_dec_avx2(
                 }
 
                 /* Rewhiten with new A coefs */
-                start_idx = psEncC->ltp_mem_length - lag - psEncC->predictLPCOrder - LTP_ORDER / 2;
+                start_idx = psEncC->ltp_mem_length - lag - psEncC->predictLPCOrder - LTP_ORDER/2;
                 silk_assert(start_idx > 0);
 
-                silk_LPC_analysis_filter_avx2(&sLTP[start_idx], &NSQ->xq[start_idx + k * psEncC->subfr_length],
+                silk_LPC_analysis_filter_avx2(&sLTP[start_idx], &NSQ->xq[start_idx + k*psEncC->subfr_length],
                                               A_Q12, psEncC->ltp_mem_length - start_idx, psEncC->predictLPCOrder);
 
                 NSQ->sLTP_buf_idx = psEncC->ltp_mem_length;
@@ -541,9 +497,12 @@ void silk_NSQ_del_dec_avx2(
                                            LTP_scale_Q14, Gains_Q16, pitchL, psIndices->signalType, decisionDelay);
 
         silk_noise_shape_quantizer_del_dec_avx2(NSQ, &psDelDec, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15,
-                                                delayedGain_Q10, A_Q12, B_Q14, AR_shp_Q13, lag, HarmShapeFIRPacked_Q14, Tilt_Q14[k], LF_shp_Q14[k],
-                                                Gains_Q16[k], Lambda_Q10, offset_Q10, psEncC->subfr_length, subfr++, psEncC->shapingLPCOrder,
-                                                psEncC->predictLPCOrder, psEncC->warping_Q16, MaskDelDec, &smpl_buf_idx, decisionDelay);
+                                                delayedGain_Q10, A_Q12, B_Q14, AR_shp_Q13, lag, HarmShapeFIRPacked_Q14,
+        Tilt_Q14[k], LF_shp_Q14[k],
+                                                Gains_Q16[k], Lambda_Q10, offset_Q10, psEncC->subfr_length, subfr++,
+        psEncC->shapingLPCOrder,
+                                                psEncC->predictLPCOrder, psEncC->warping_Q16, MaskDelDec, &smpl_buf_idx,
+        decisionDelay);
 
         x16 += psEncC->subfr_length;
         pulses += psEncC->subfr_length;
@@ -557,25 +516,23 @@ void silk_NSQ_del_dec_avx2(
     /* Copy final part of signals from winner state to output and long-term filter states */
     psIndices->Seed = silk_select_winner(psDelDec.SeedInit, Winner_selector);
     last_smple_idx = smpl_buf_idx + decisionDelay;
-    Gain_Q10 = Gains_Q16[psEncC->nb_subfr - 1] >> 6;
-    for (i = 0; i < decisionDelay; i++)
-    {
-        last_smple_idx = (last_smple_idx + DECISION_DELAY - 1) % DECISION_DELAY;
+    Gain_Q10 = Gains_Q16[psEncC->nb_subfr - 1]>>6;
+    for (i = 0; i < decisionDelay; i++) {
+        last_smple_idx = (last_smple_idx + DECISION_DELAY - 1)%DECISION_DELAY;
         psSample = &psDelDec.Samples[last_smple_idx];
 
         pulses[i - decisionDelay] =
             (oac_int8)silk_sar_round_32(silk_select_winner(psSample->Q_Q10, Winner_selector), 10);
         pxq[i - decisionDelay] =
-            silk_sat16((oac_int32)silk_sar_round_smulww(silk_select_winner(psSample->Xq_Q14, Winner_selector), Gain_Q10, 8));
+            silk_sat16((oac_int32)silk_sar_round_smulww(silk_select_winner(psSample->Xq_Q14, Winner_selector), Gain_Q10,
+        8));
         NSQ->sLTP_shp_Q14[NSQ->sLTP_shp_buf_idx - decisionDelay + i] =
             silk_select_winner(psSample->Shape_Q14, Winner_selector);
     }
-    for (i = 0; i < NSQ_LPC_BUF_LENGTH; i++)
-    {
+    for (i = 0; i < NSQ_LPC_BUF_LENGTH; i++) {
         NSQ->sLPC_Q14[i] = silk_select_winner(psDelDec.sLPC_Q14[i], Winner_selector);
     }
-    for (i = 0; i < MAX_SHAPE_LPC_ORDER; i++)
-    {
+    for (i = 0; i < MAX_SHAPE_LPC_ORDER; i++) {
         NSQ->sAR2_Q14[i] = silk_select_winner(psDelDec.sAR2_Q14[i], Winner_selector);
     }
 
@@ -585,8 +542,8 @@ void silk_NSQ_del_dec_avx2(
     NSQ->lagPrev = pitchL[psEncC->nb_subfr - 1];
 
     /* Save quantized speech signal */
-    silk_memmove(NSQ->xq, &NSQ->xq[psEncC->frame_length], psEncC->ltp_mem_length * sizeof(oac_int16));
-    silk_memmove(NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[psEncC->frame_length], psEncC->ltp_mem_length * sizeof(oac_int32));
+    silk_memmove(NSQ->xq, &NSQ->xq[psEncC->frame_length], psEncC->ltp_mem_length*sizeof(oac_int16));
+    silk_memmove(NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[psEncC->frame_length], psEncC->ltp_mem_length*sizeof(oac_int32));
 
 #ifdef OAC_CHECK_ASM
     silk_assert(!memcmp(&NSQ_c, NSQ, sizeof(NSQ_c)));
@@ -597,32 +554,47 @@ void silk_NSQ_del_dec_avx2(
     RESTORE_STACK;
 }
 
-static OAC_INLINE __m128i silk_noise_shape_quantizer_short_prediction_x4(const __m128i *buf32, const oac_int16 *coef16, oac_int order)
-{
+static OAC_INLINE __m128i silk_noise_shape_quantizer_short_prediction_x4(const __m128i *buf32, const oac_int16 *coef16,
+                                                                         oac_int order) {
     __m256i out;
     silk_assert(order == 10 || order == 16);
 
     /* Avoids introducing a bias because silk_SMLAWB() always rounds to -inf */
-    out = _mm256_set1_epi32(order >> 1);
-    out = _mm256_add_epi32(out, _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-0]), _mm256_set1_epi32(silk_LSHIFT(coef16[0], 16)))); /* High DWORD */
-    out = _mm256_add_epi32(out, _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-1]), _mm256_set1_epi32(silk_LSHIFT(coef16[1], 16)))); /* High DWORD */
-    out = _mm256_add_epi32(out, _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-2]), _mm256_set1_epi32(silk_LSHIFT(coef16[2], 16)))); /* High DWORD */
-    out = _mm256_add_epi32(out, _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-3]), _mm256_set1_epi32(silk_LSHIFT(coef16[3], 16)))); /* High DWORD */
-    out = _mm256_add_epi32(out, _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-4]), _mm256_set1_epi32(silk_LSHIFT(coef16[4], 16)))); /* High DWORD */
-    out = _mm256_add_epi32(out, _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-5]), _mm256_set1_epi32(silk_LSHIFT(coef16[5], 16)))); /* High DWORD */
-    out = _mm256_add_epi32(out, _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-6]), _mm256_set1_epi32(silk_LSHIFT(coef16[6], 16)))); /* High DWORD */
-    out = _mm256_add_epi32(out, _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-7]), _mm256_set1_epi32(silk_LSHIFT(coef16[7], 16)))); /* High DWORD */
-    out = _mm256_add_epi32(out, _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-8]), _mm256_set1_epi32(silk_LSHIFT(coef16[8], 16)))); /* High DWORD */
-    out = _mm256_add_epi32(out, _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-9]), _mm256_set1_epi32(silk_LSHIFT(coef16[9], 16)))); /* High DWORD */
-
-    if (order == 16)
-    {
-        out = _mm256_add_epi32(out, _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-10]), _mm256_set1_epi32(silk_LSHIFT(coef16[10], 16)))); /* High DWORD */
-        out = _mm256_add_epi32(out, _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-11]), _mm256_set1_epi32(silk_LSHIFT(coef16[11], 16)))); /* High DWORD */
-        out = _mm256_add_epi32(out, _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-12]), _mm256_set1_epi32(silk_LSHIFT(coef16[12], 16)))); /* High DWORD */
-        out = _mm256_add_epi32(out, _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-13]), _mm256_set1_epi32(silk_LSHIFT(coef16[13], 16)))); /* High DWORD */
-        out = _mm256_add_epi32(out, _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-14]), _mm256_set1_epi32(silk_LSHIFT(coef16[14], 16)))); /* High DWORD */
-        out = _mm256_add_epi32(out, _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-15]), _mm256_set1_epi32(silk_LSHIFT(coef16[15], 16)))); /* High DWORD */
+    out = _mm256_set1_epi32(order>>1);
+    out = _mm256_add_epi32(out,
+    _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-0]), _mm256_set1_epi32(silk_LSHIFT(coef16[0], 16))));                             /* High DWORD */
+    out = _mm256_add_epi32(out,
+    _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-1]), _mm256_set1_epi32(silk_LSHIFT(coef16[1], 16))));                             /* High DWORD */
+    out = _mm256_add_epi32(out,
+    _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-2]), _mm256_set1_epi32(silk_LSHIFT(coef16[2], 16))));                             /* High DWORD */
+    out = _mm256_add_epi32(out,
+    _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-3]), _mm256_set1_epi32(silk_LSHIFT(coef16[3], 16))));                             /* High DWORD */
+    out = _mm256_add_epi32(out,
+    _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-4]), _mm256_set1_epi32(silk_LSHIFT(coef16[4], 16))));                             /* High DWORD */
+    out = _mm256_add_epi32(out,
+    _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-5]), _mm256_set1_epi32(silk_LSHIFT(coef16[5], 16))));                             /* High DWORD */
+    out = _mm256_add_epi32(out,
+    _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-6]), _mm256_set1_epi32(silk_LSHIFT(coef16[6], 16))));                             /* High DWORD */
+    out = _mm256_add_epi32(out,
+    _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-7]), _mm256_set1_epi32(silk_LSHIFT(coef16[7], 16))));                             /* High DWORD */
+    out = _mm256_add_epi32(out,
+    _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-8]), _mm256_set1_epi32(silk_LSHIFT(coef16[8], 16))));                             /* High DWORD */
+    out = _mm256_add_epi32(out,
+    _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-9]), _mm256_set1_epi32(silk_LSHIFT(coef16[9], 16))));                             /* High DWORD */
+
+    if (order == 16) {
+        out = _mm256_add_epi32(out,
+        _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-10]), _mm256_set1_epi32(silk_LSHIFT(coef16[10], 16))));                             /* High DWORD */
+        out = _mm256_add_epi32(out,
+        _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-11]), _mm256_set1_epi32(silk_LSHIFT(coef16[11], 16))));                             /* High DWORD */
+        out = _mm256_add_epi32(out,
+        _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-12]), _mm256_set1_epi32(silk_LSHIFT(coef16[12], 16))));                             /* High DWORD */
+        out = _mm256_add_epi32(out,
+        _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-13]), _mm256_set1_epi32(silk_LSHIFT(coef16[13], 16))));                             /* High DWORD */
+        out = _mm256_add_epi32(out,
+        _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-14]), _mm256_set1_epi32(silk_LSHIFT(coef16[14], 16))));                             /* High DWORD */
+        out = _mm256_add_epi32(out,
+        _mm256_mul_epi32(_mm256_cvtepi32_epi64(buf32[-15]), _mm256_set1_epi32(silk_LSHIFT(coef16[15], 16))));                             /* High DWORD */
     }
     return silk_cvtepi64_epi32_high(out);
 }
@@ -657,15 +629,13 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
     __m128i MaskDelDec,                         /* I    Mask of states in decision tree    */
     oac_int *smpl_buf_idx,                     /* I/O  Index to newest samples in buffers */
     oac_int decisionDelay                      /* I                                       */
-)
-{
+    ) {
     int i;
-    oac_int32 *shp_lag_ptr = &NSQ->sLTP_shp_Q14[NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS / 2];
-    oac_int32 *pred_lag_ptr = &sLTP_Q15[NSQ->sLTP_buf_idx - lag + LTP_ORDER / 2];
-    oac_int32 Gain_Q10 = Gain_Q16 >> 6;
+    oac_int32 *shp_lag_ptr = &NSQ->sLTP_shp_Q14[NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS/2];
+    oac_int32 *pred_lag_ptr = &sLTP_Q15[NSQ->sLTP_buf_idx - lag + LTP_ORDER/2];
+    oac_int32 Gain_Q10 = Gain_Q16>>6;
 
-    for (i = 0; i < length; i++)
-    {
+    for (i = 0; i < length; i++) {
         /* Perform common calculations used in all states */
         /* NSQ_sample_struct */
         /* Low  128 bits => 1st set */
@@ -692,8 +662,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
         oac_int32 LTP_pred_Q14, n_LTP_Q14;
 
         /* Long-term prediction */
-        if (signalType == TYPE_VOICED)
-        {
+        if (signalType == TYPE_VOICED) {
             /* Unrolled loop */
             /* Avoids introducing a bias because silk_SMLAWB() always rounds to -inf */
             LTP_pred_Q14 = 2;
@@ -704,24 +673,19 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
             LTP_pred_Q14 += silk_SMULWB(pred_lag_ptr[-4], b_Q14[4]);
             LTP_pred_Q14 = silk_LSHIFT(LTP_pred_Q14, 1); /* Q13 -> Q14 */
             pred_lag_ptr++;
-        }
-        else
-        {
+        } else {
             LTP_pred_Q14 = 0;
         }
 
         /* Long-term shaping */
-        if (lag > 0)
-        {
+        if (lag > 0) {
             /* Symmetric, packed FIR coefficients */
             n_LTP_Q14 = silk_add_sat32(shp_lag_ptr[0], shp_lag_ptr[-2]);
             n_LTP_Q14 = silk_SMULWB(n_LTP_Q14, HarmShapeFIRPacked_Q14);
             n_LTP_Q14 = n_LTP_Q14 + silk_SMULWT(shp_lag_ptr[-1], HarmShapeFIRPacked_Q14);
             n_LTP_Q14 = LTP_pred_Q14 - (silk_LSHIFT(n_LTP_Q14, 2)); /* Q12 -> Q14 */
             shp_lag_ptr++;
-        }
-        else
-        {
+        } else {
             n_LTP_Q14 = 0;
         }
 
@@ -731,22 +695,23 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
         psDelDec->Seed = silk_mm256_rand_epi32(psDelDec->Seed);
 
         /* Short-term prediction */
-        LPC_pred_Q14 = silk_noise_shape_quantizer_short_prediction_x4(&psDelDec->sLPC_Q14[NSQ_LPC_BUF_LENGTH - 1 + i], a_Q12, predictLPCOrder);
+        LPC_pred_Q14 = silk_noise_shape_quantizer_short_prediction_x4(&psDelDec->sLPC_Q14[NSQ_LPC_BUF_LENGTH - 1 + i],
+        a_Q12, predictLPCOrder);
         LPC_pred_Q14 = _mm_slli_epi32(LPC_pred_Q14, 4); /* Q10 -> Q14 */
 
         /* Noise shape feedback */
         silk_assert(shapingLPCOrder > 0);
-        silk_assert((shapingLPCOrder & 1) == 0); /* check that order is even */
+        silk_assert((shapingLPCOrder&1) == 0);   /* check that order is even */
         /* Output of lowpass section */
         tmp0 = _mm_add_epi32(psDelDec->Diff_Q14, silk_mm_smulwb_epi32(psDelDec->sAR2_Q14[0], warping_Q16));
-        n_AR_Q14 = _mm_set1_epi32(shapingLPCOrder >> 1);
-        for (j = 0; j < shapingLPCOrder - 1; j++)
-        {
+        n_AR_Q14 = _mm_set1_epi32(shapingLPCOrder>>1);
+        for (j = 0; j < shapingLPCOrder - 1; j++) {
             /* Output of allpass section */
             tmp1 = psDelDec->sAR2_Q14[j];
             psDelDec->sAR2_Q14[j] = tmp0;
             n_AR_Q14 = _mm_add_epi32(n_AR_Q14, silk_mm_smulwb_epi32(tmp0, AR_shp_Q13[j]));
-            tmp0 = _mm_add_epi32(tmp1, silk_mm_smulwb_epi32(_mm_sub_epi32(psDelDec->sAR2_Q14[j + 1], tmp0), warping_Q16));
+            tmp0 = _mm_add_epi32(tmp1,
+            silk_mm_smulwb_epi32(_mm_sub_epi32(psDelDec->sAR2_Q14[j + 1], tmp0), warping_Q16));
         }
         psDelDec->sAR2_Q14[shapingLPCOrder - 1] = tmp0;
         n_AR_Q14 = _mm_add_epi32(n_AR_Q14, silk_mm_smulwb_epi32(tmp0, AR_shp_Q13[shapingLPCOrder - 1]));
@@ -756,7 +721,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
         n_AR_Q14 = _mm_slli_epi32(n_AR_Q14, 2);                                                  /* Q12 -> Q14 */
 
         tmp0 = silk_mm_smulwb_epi32(psDelDec->Samples[*smpl_buf_idx].Shape_Q14, LF_shp_Q14); /* Q12 */
-        tmp1 = silk_mm_smulwb_epi32(psDelDec->LF_AR_Q14, LF_shp_Q14 >> 16);                  /* Q12 */
+        tmp1 = silk_mm_smulwb_epi32(psDelDec->LF_AR_Q14, LF_shp_Q14>>16);                    /* Q12 */
         n_LF_Q14 = _mm_add_epi32(tmp0, tmp1);                                                /* Q12 */
         n_LF_Q14 = _mm_slli_epi32(n_LF_Q14, 2);                                              /* Q12 -> Q14 */
 
@@ -771,15 +736,14 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
 
         /* Flip sign depending on dither */
         r_Q10 = silk_mm_sign_epi32(r_Q10, psDelDec->Seed);
-        r_Q10 = silk_mm_limit_epi32(r_Q10, -(31 << 10), 30 << 10);
+        r_Q10 = silk_mm_limit_epi32(r_Q10, -(31<<10), 30<<10);
 
         /* Find two quantization level candidates and measure their rate-distortion */
         q1_Q10 = _mm_sub_epi32(r_Q10, _mm_set1_epi32(offset_Q10));
         q1_Q0 = _mm_srai_epi32(q1_Q10, 10);
-        if (Lambda_Q10 > 2048)
-        {
+        if (Lambda_Q10 > 2048) {
             /* For aggressive RDO, the bias becomes more than one pulse. */
-            tmp0 = _mm_sub_epi32(_mm_abs_epi32(q1_Q10), _mm_set1_epi32(Lambda_Q10 / 2 - 512)); /* rdo_offset */
+            tmp0 = _mm_sub_epi32(_mm_abs_epi32(q1_Q10), _mm_set1_epi32(Lambda_Q10/2 - 512));   /* rdo_offset */
             q1_Q0 = _mm_srai_epi32(q1_Q10, 31);
             tmp1 = _mm_cmpgt_epi32(tmp0, _mm_setzero_si128());
             tmp0 = _mm_srai_epi32(silk_mm_sign_epi32(tmp0, q1_Q10), 10);
@@ -804,7 +768,8 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
         rd_Q10 = _mm256_add_epi32(rd_Q10, rr_Q10);
         rd_Q10 = _mm256_srai_epi32(rd_Q10, 10);
 
-        mask = _mm256_broadcastsi128_si256(_mm_cmplt_epi32(_mm256_extracti128_si256(rd_Q10, 0), _mm256_extracti128_si256(rd_Q10, 1)));
+        mask = _mm256_broadcastsi128_si256(_mm_cmplt_epi32(_mm256_extracti128_si256(rd_Q10, 0),
+        _mm256_extracti128_si256(rd_Q10, 1)));
         SS_RD_Q10 = _mm256_add_epi32(
             _mm256_broadcastsi128_si256(psDelDec->RD_Q10),
             _mm256_blendv_epi8(
@@ -833,19 +798,20 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
 
         /* END Updating Delayed Decision States */
 
-        *smpl_buf_idx = (*smpl_buf_idx + DECISION_DELAY - 1) % DECISION_DELAY;
-        last_smple_idx = (*smpl_buf_idx + decisionDelay) % DECISION_DELAY;
+        *smpl_buf_idx = (*smpl_buf_idx + DECISION_DELAY - 1)%DECISION_DELAY;
+        last_smple_idx = (*smpl_buf_idx + decisionDelay)%DECISION_DELAY;
         psLastSample = &psDelDec->Samples[last_smple_idx];
 
         /* Find winner */
         RDmin_Q10 = silk_mm_mask_hmin_epi32(_mm256_castsi256_si128(SS_RD_Q10), MaskDelDec);
-        Winner_selector = silk_index_to_selector(silk_index_of_first_equal_epi32(RDmin_Q10, _mm256_castsi256_si128(SS_RD_Q10)));
+        Winner_selector = silk_index_to_selector(silk_index_of_first_equal_epi32(RDmin_Q10,
+        _mm256_castsi256_si128(SS_RD_Q10)));
 
         /* Increase RD values of expired states */
         Winner_rand_state = _mm_shuffle_epi8(psLastSample->RandState, Winner_selector);
 
         SS_RD_Q10 = _mm256_blendv_epi8(
-            _mm256_add_epi32(SS_RD_Q10, _mm256_set1_epi32(silk_int32_MAX >> 4)),
+            _mm256_add_epi32(SS_RD_Q10, _mm256_set1_epi32(silk_int32_MAX>>4)),
             SS_RD_Q10,
             _mm256_broadcastsi128_si256(_mm_cmpeq_epi32(psLastSample->RandState, Winner_rand_state)));
 
@@ -856,35 +822,32 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
 
         /* Replace a state if best from second set outperforms worst in first set */
         tmp0 = _mm_cmplt_epi32(RDmin_Q10, RDmax_Q10);
-        if (!_mm_test_all_zeros(tmp0, tmp0))
-        {
+        if (!_mm_test_all_zeros(tmp0, tmp0)) {
             int t;
             RDmax_ind = silk_index_of_first_equal_epi32(RDmax_Q10, _mm256_extracti128_si256(SS_RD_Q10, 0));
             RDmin_ind = silk_index_of_first_equal_epi32(RDmin_Q10, _mm256_extracti128_si256(SS_RD_Q10, 1));
-            tmp1 = _mm_cvtepi8_epi32(_mm_cvtsi32_si128(0xFFU << (unsigned)(RDmax_ind << 3)));
+            tmp1 = _mm_cvtepi8_epi32(_mm_cvtsi32_si128(0xFFU<<(unsigned)(RDmax_ind<<3)));
             tmp0 = _mm_blendv_epi8(
                 _mm_set_epi8(0xF, 0xE, 0xD, 0xC, 0xB, 0xA, 0x9, 0x8, 0x7, 0x6, 0x5, 0x4, 0x3, 0x2, 0x1, 0x0),
                 silk_index_to_selector(RDmin_ind),
                 tmp1);
-            for (t = i; t < MAX_SUB_FRAME_LENGTH + NSQ_LPC_BUF_LENGTH; t++)
-            {
+            for (t = i; t < MAX_SUB_FRAME_LENGTH + NSQ_LPC_BUF_LENGTH; t++) {
                 psDelDec->sLPC_Q14[t] = _mm_shuffle_epi8(psDelDec->sLPC_Q14[t], tmp0);
             }
             psDelDec->Seed = _mm_shuffle_epi8(psDelDec->Seed, tmp0);
             psDelDec->SeedInit = _mm_shuffle_epi8(psDelDec->SeedInit, tmp0);
-            for (t = 0; t < MAX_SHAPE_LPC_ORDER; t++)
-            {
+            for (t = 0; t < MAX_SHAPE_LPC_ORDER; t++) {
                 psDelDec->sAR2_Q14[t] = _mm_shuffle_epi8(psDelDec->sAR2_Q14[t], tmp0);
             }
-            for (t = 0; t < DECISION_DELAY; t++)
-            {
+            for (t = 0; t < DECISION_DELAY; t++) {
                 psDelDec->Samples[t].RandState = _mm_shuffle_epi8(psDelDec->Samples[t].RandState, tmp0);
                 psDelDec->Samples[t].Q_Q10 = _mm_shuffle_epi8(psDelDec->Samples[t].Q_Q10, tmp0);
                 psDelDec->Samples[t].Xq_Q14 = _mm_shuffle_epi8(psDelDec->Samples[t].Xq_Q14, tmp0);
                 psDelDec->Samples[t].Pred_Q15 = _mm_shuffle_epi8(psDelDec->Samples[t].Pred_Q15, tmp0);
                 psDelDec->Samples[t].Shape_Q14 = _mm_shuffle_epi8(psDelDec->Samples[t].Shape_Q14, tmp0);
             }
-            mask = _mm256_castsi128_si256(_mm_blendv_epi8(_mm_set_epi32(0x3, 0x2, 0x1, 0x0), _mm_set1_epi32(RDmin_ind + 4), tmp1));
+            mask = _mm256_castsi128_si256(_mm_blendv_epi8(_mm_set_epi32(0x3, 0x2, 0x1, 0x0),
+            _mm_set1_epi32(RDmin_ind + 4), tmp1));
             SS_Q_Q10 = _mm256_permutevar8x32_epi32(SS_Q_Q10, mask);
             SS_RD_Q10 = _mm256_permutevar8x32_epi32(SS_RD_Q10, mask);
             SS_xq_Q14 = _mm256_permutevar8x32_epi32(SS_xq_Q14, mask);
@@ -895,12 +858,12 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
         }
 
         /* Write samples from winner to output and long-term filter states */
-        if (subfr > 0 || i >= decisionDelay)
-        {
+        if (subfr > 0 || i >= decisionDelay) {
             pulses[i - decisionDelay] =
                 (oac_int8)silk_sar_round_32(silk_select_winner(psLastSample->Q_Q10, Winner_selector), 10);
             xq[i - decisionDelay] =
-                silk_sat16((oac_int32)silk_sar_round_smulww(silk_select_winner(psLastSample->Xq_Q14, Winner_selector), delayedGain_Q10[last_smple_idx], 8));
+                silk_sat16((oac_int32)silk_sar_round_smulww(silk_select_winner(psLastSample->Xq_Q14, Winner_selector),
+            delayedGain_Q10[last_smple_idx], 8));
             NSQ->sLTP_shp_Q14[NSQ->sLTP_shp_buf_idx - decisionDelay] =
                 silk_select_winner(psLastSample->Shape_Q14, Winner_selector);
             sLTP_Q15[NSQ->sLTP_buf_idx - decisionDelay] =
@@ -924,8 +887,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
         delayedGain_Q10[*smpl_buf_idx] = Gain_Q10;
     }
     /* Update LPC states */
-    for (i = 0; i < NSQ_LPC_BUF_LENGTH; i++)
-    {
+    for (i = 0; i < NSQ_LPC_BUF_LENGTH; i++) {
         psDelDec->sLPC_Q14[i] = (&psDelDec->sLPC_Q14[length])[i];
     }
 }
@@ -944,8 +906,7 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states_avx2(
     const oac_int pitchL[MAX_NB_SUBFR],       /* I    Pitch lag                       */
     const oac_int signal_type,                /* I    Signal type                     */
     const oac_int decisionDelay               /* I    Decision delay                  */
-)
-{
+    ) {
     int i;
     oac_int lag;
     oac_int32 gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
@@ -957,46 +918,39 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states_avx2(
 
     /* Scale input */
     inv_gain_Q26 = silk_sar_round_32(inv_gain_Q31, 5);
-    for (i = 0; i < psEncC->subfr_length; i+=4)
-    {
+    for (i = 0; i < psEncC->subfr_length; i += 4) {
         __m256i x = _mm256_cvtepi16_epi64(_mm_loadu_si64(&x16[i]));
         x = _mm256_slli_epi64(_mm256_mul_epi32(x, _mm256_set1_epi32(inv_gain_Q26)), 16);
         _mm_storeu_si128((__m128i*)(void*)&x_sc_Q10[i], silk_cvtepi64_epi32_high(x));
     }
 
     /* After rewhitening the LTP state is un-scaled, so scale with inv_gain_Q16 */
-    if (NSQ->rewhite_flag)
-    {
-        if (subfr == 0)
-        {
+    if (NSQ->rewhite_flag) {
+        if (subfr == 0) {
             /* Do LTP downscaling */
             inv_gain_Q31 = silk_LSHIFT(silk_SMULWB(inv_gain_Q31, LTP_scale_Q14), 2);
         }
-        for (i = NSQ->sLTP_buf_idx - lag - LTP_ORDER / 2; i < NSQ->sLTP_buf_idx; i++)
-        {
+        for (i = NSQ->sLTP_buf_idx - lag - LTP_ORDER/2; i < NSQ->sLTP_buf_idx; i++) {
             silk_assert(i < MAX_FRAME_LENGTH);
             sLTP_Q15[i] = silk_SMULWB(inv_gain_Q31, sLTP[i]);
         }
     }
 
     /* Adjust for changing gain */
-    if (Gains_Q16[subfr] != NSQ->prev_gain_Q16)
-    {
+    if (Gains_Q16[subfr] != NSQ->prev_gain_Q16) {
         gain_adj_Q16 = silk_DIV32_varQ(NSQ->prev_gain_Q16, Gains_Q16[subfr], 16);
 
         /* Scale long-term shaping state */
-        for (i = NSQ->sLTP_shp_buf_idx - psEncC->ltp_mem_length; i < NSQ->sLTP_shp_buf_idx; i+=4)
-        {
-	    oac_int32 *p = &NSQ->sLTP_shp_Q14[i];
-            _mm_storeu_si128((__m128i*)(void*)p, silk_mm_smulww_epi32(_mm_loadu_si128((__m128i*)(void*)p), gain_adj_Q16));
+        for (i = NSQ->sLTP_shp_buf_idx - psEncC->ltp_mem_length; i < NSQ->sLTP_shp_buf_idx; i += 4) {
+            oac_int32 *p = &NSQ->sLTP_shp_Q14[i];
+            _mm_storeu_si128((__m128i*)(void*)p,
+            silk_mm_smulww_epi32(_mm_loadu_si128((__m128i*)(void*)p), gain_adj_Q16));
         }
 
         /* Scale long-term prediction state */
-        if (signal_type == TYPE_VOICED && NSQ->rewhite_flag == 0)
-        {
-            for (i = NSQ->sLTP_buf_idx - lag - LTP_ORDER / 2; i < NSQ->sLTP_buf_idx - decisionDelay; i++)
-            {
-                sLTP_Q15[i] = ((oac_int64)sLTP_Q15[i]) * ((oac_int64)gain_adj_Q16) >> 16;
+        if (signal_type == TYPE_VOICED && NSQ->rewhite_flag == 0) {
+            for (i = NSQ->sLTP_buf_idx - lag - LTP_ORDER/2; i < NSQ->sLTP_buf_idx - decisionDelay; i++) {
+                sLTP_Q15[i] = ((oac_int64)sLTP_Q15[i])*((oac_int64)gain_adj_Q16)>>16;
             }
         }
 
@@ -1005,18 +959,15 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states_avx2(
         psDelDec->Diff_Q14 = silk_mm_smulww_epi32(psDelDec->Diff_Q14, gain_adj_Q16);
 
         /* Scale short-term prediction and shaping states */
-        for (i = 0; i < NSQ_LPC_BUF_LENGTH; i++)
-        {
+        for (i = 0; i < NSQ_LPC_BUF_LENGTH; i++) {
             psDelDec->sLPC_Q14[i] = silk_mm_smulww_epi32(psDelDec->sLPC_Q14[i], gain_adj_Q16);
         }
-        for (i = 0; i < DECISION_DELAY; i++)
-        {
+        for (i = 0; i < DECISION_DELAY; i++) {
             psSample = &psDelDec->Samples[i];
             psSample->Pred_Q15 = silk_mm_smulww_epi32(psSample->Pred_Q15, gain_adj_Q16);
             psSample->Shape_Q14 = silk_mm_smulww_epi32(psSample->Shape_Q14, gain_adj_Q16);
         }
-        for (i = 0; i < MAX_SHAPE_LPC_ORDER; i++)
-        {
+        for (i = 0; i < MAX_SHAPE_LPC_ORDER; i++) {
             psDelDec->sAR2_Q14[i] = silk_mm_smulww_epi32(psDelDec->sAR2_Q14[i], gain_adj_Q16);
         }
 
@@ -1029,31 +980,26 @@ static OAC_INLINE void silk_LPC_analysis_filter_avx2(
     oac_int16                  *out,               /* O    Output signal                           */
     const oac_int16            *in,                /* I    Input signal                            */
     const oac_int16            *B,                 /* I    MA prediction coefficients, Q12 [order] */
-    const oac_int32            len,                /* I    Signal length                           */
-    const oac_int32            order               /* I    Filter order                            */
-)
-{
+    const oac_int32 len,                           /* I    Signal length                           */
+    const oac_int32 order                          /* I    Filter order                            */
+    ) {
     int i;
-    oac_int32       out32_Q12, out32;
+    oac_int32 out32_Q12, out32;
     silk_assert(order == 10 || order == 16);
 
-    for(i = order; i < len; i++ )
-    {
+    for (i = order; i < len; i++) {
         const oac_int16 *in_ptr = &in[ i ];
         /* Allowing wrap around so that two wraps can cancel each other. The rare
            cases where the result wraps around can only be triggered by invalid streams*/
 
         __m256i in_v = _mm256_cvtepi16_epi32(_mm_loadu_si128((__m128i*)(void*)&in_ptr[-8]));
-        __m256i B_v  = _mm256_cvtepi16_epi32(_mm_loadu_si128((__m128i*)(void*)&      B[0]));
+        __m256i B_v  = _mm256_cvtepi16_epi32(_mm_loadu_si128((__m128i*)(void*)&B[0]));
         __m256i sum = _mm256_mullo_epi32(in_v, silk_mm256_reverse_epi32(B_v));
-        if (order > 10)
-        {
+        if (order > 10) {
             in_v = _mm256_cvtepi16_epi32(_mm_loadu_si128((__m128i*)(void*)&in_ptr[-16]));
             B_v  = _mm256_cvtepi16_epi32(_mm_loadu_si128((__m128i*)(void*)&B       [8]));
             B_v  = silk_mm256_reverse_epi32(B_v);
-        }
-        else
-        {
+        } else {
             in_v = _mm256_cvtepi16_epi32(_mm_loadu_si32(&in_ptr[-10]));
             B_v  = _mm256_cvtepi16_epi32(_mm_loadu_si32(&B       [8]));
             B_v  = _mm256_shuffle_epi32(B_v, 0x01);
@@ -1063,7 +1009,7 @@ static OAC_INLINE void silk_LPC_analysis_filter_avx2(
         out32_Q12 = silk_mm256_hsum_epi32(sum);
 
         /* Subtract prediction */
-        out32_Q12 = silk_SUB32_ovflw( silk_LSHIFT( (oac_int32)*in_ptr, 12 ), out32_Q12 );
+        out32_Q12 = silk_SUB32_ovflw( silk_LSHIFT((oac_int32)*in_ptr, 12 ), out32_Q12 );
 
         /* Scale to Q0 */
         out32 = silk_sar_round_32(out32_Q12, 12);
@@ -1073,5 +1019,5 @@ static OAC_INLINE void silk_LPC_analysis_filter_avx2(
     }
 
     /* Set first d output samples to zero */
-    silk_memset( out, 0, order * sizeof( oac_int16 ) );
+    silk_memset( out, 0, order*sizeof(oac_int16));
 }
diff --git a/silk/x86/NSQ_del_dec_sse4_1.c b/silk/x86/NSQ_del_dec_sse4_1.c
index 9d8f542f9..7851b28b9 100644
--- a/silk/x86/NSQ_del_dec_sse4_1.c
+++ b/silk/x86/NSQ_del_dec_sse4_1.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <xmmintrin.h>
@@ -62,84 +62,83 @@ typedef struct {
     oac_int32 LPC_exc_Q14;
 } NSQ_sample_struct;
 
-typedef NSQ_sample_struct  NSQ_sample_pair[ 2 ];
+typedef NSQ_sample_struct NSQ_sample_pair[ 2 ];
 
 static OAC_INLINE void silk_nsq_del_dec_scale_states_sse4_1(
     const silk_encoder_state *psEncC,               /* I    Encoder State                       */
     silk_nsq_state      *NSQ,                       /* I/O  NSQ state                           */
-    NSQ_del_dec_struct  psDelDec[],                 /* I/O  Delayed decision states             */
-    const oac_int16    x16[],                      /* I    Input                               */
-    oac_int32          x_sc_Q10[],                 /* O    Input scaled with 1/Gain in Q10     */
-    const oac_int16    sLTP[],                     /* I    Re-whitened LTP state in Q0         */
-    oac_int32          sLTP_Q15[],                 /* O    LTP state matching scaled input     */
-    oac_int            subfr,                      /* I    Subframe number                     */
-    oac_int            nStatesDelayedDecision,     /* I    Number of del dec states            */
-    const oac_int      LTP_scale_Q14,              /* I    LTP state scaling                   */
-    const oac_int32    Gains_Q16[ MAX_NB_SUBFR ],  /* I                                        */
-    const oac_int      pitchL[ MAX_NB_SUBFR ],     /* I    Pitch lag                           */
-    const oac_int      signal_type,                /* I    Signal type                         */
-    const oac_int      decisionDelay               /* I    Decision delay                      */
-);
+    NSQ_del_dec_struct psDelDec[],                  /* I/O  Delayed decision states             */
+    const oac_int16 x16[],                         /* I    Input                               */
+    oac_int32 x_sc_Q10[],                          /* O    Input scaled with 1/Gain in Q10     */
+    const oac_int16 sLTP[],                        /* I    Re-whitened LTP state in Q0         */
+    oac_int32 sLTP_Q15[],                          /* O    LTP state matching scaled input     */
+    oac_int subfr,                                 /* I    Subframe number                     */
+    oac_int nStatesDelayedDecision,                /* I    Number of del dec states            */
+    const oac_int LTP_scale_Q14,                   /* I    LTP state scaling                   */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],     /* I                                        */
+    const oac_int pitchL[ MAX_NB_SUBFR ],          /* I    Pitch lag                           */
+    const oac_int signal_type,                     /* I    Signal type                         */
+    const oac_int decisionDelay                    /* I    Decision delay                      */
+    );
 
 /******************************************/
 /* Noise shape quantizer for one subframe */
 /******************************************/
 static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                           */
-    NSQ_del_dec_struct  psDelDec[],             /* I/O  Delayed decision states             */
-    oac_int            signalType,             /* I    Signal type                         */
-    const oac_int32    x_Q10[],                /* I                                        */
-    oac_int8           pulses[],               /* O                                        */
-    oac_int16          xq[],                   /* O                                        */
-    oac_int32          sLTP_Q15[],             /* I/O  LTP filter state                    */
-    oac_int32          delayedGain_Q10[],      /* I/O  Gain delay buffer                   */
-    const oac_int16    a_Q12[],                /* I    Short term prediction coefs         */
-    const oac_int16    b_Q14[],                /* I    Long term prediction coefs          */
-    const oac_int16    AR_shp_Q13[],           /* I    Noise shaping coefs                 */
-    oac_int            lag,                    /* I    Pitch lag                           */
-    oac_int32          HarmShapeFIRPacked_Q14, /* I                                        */
-    oac_int            Tilt_Q14,               /* I    Spectral tilt                       */
-    oac_int32          LF_shp_Q14,             /* I                                        */
-    oac_int32          Gain_Q16,               /* I                                        */
-    oac_int            Lambda_Q10,             /* I                                        */
-    oac_int            offset_Q10,             /* I                                        */
-    oac_int            length,                 /* I    Input length                        */
-    oac_int            subfr,                  /* I    Subframe number                     */
-    oac_int            shapingLPCOrder,        /* I    Shaping LPC filter order            */
-    oac_int            predictLPCOrder,        /* I    Prediction filter order             */
-    oac_int            warping_Q16,            /* I                                        */
-    oac_int            nStatesDelayedDecision, /* I    Number of states in decision tree   */
+    NSQ_del_dec_struct psDelDec[],              /* I/O  Delayed decision states             */
+    oac_int signalType,                        /* I    Signal type                         */
+    const oac_int32 x_Q10[],                   /* I                                        */
+    oac_int8 pulses[],                         /* O                                        */
+    oac_int16 xq[],                            /* O                                        */
+    oac_int32 sLTP_Q15[],                      /* I/O  LTP filter state                    */
+    oac_int32 delayedGain_Q10[],               /* I/O  Gain delay buffer                   */
+    const oac_int16 a_Q12[],                   /* I    Short term prediction coefs         */
+    const oac_int16 b_Q14[],                   /* I    Long term prediction coefs          */
+    const oac_int16 AR_shp_Q13[],              /* I    Noise shaping coefs                 */
+    oac_int lag,                               /* I    Pitch lag                           */
+    oac_int32 HarmShapeFIRPacked_Q14,          /* I                                        */
+    oac_int Tilt_Q14,                          /* I    Spectral tilt                       */
+    oac_int32 LF_shp_Q14,                      /* I                                        */
+    oac_int32 Gain_Q16,                        /* I                                        */
+    oac_int Lambda_Q10,                        /* I                                        */
+    oac_int offset_Q10,                        /* I                                        */
+    oac_int length,                            /* I    Input length                        */
+    oac_int subfr,                             /* I    Subframe number                     */
+    oac_int shapingLPCOrder,                   /* I    Shaping LPC filter order            */
+    oac_int predictLPCOrder,                   /* I    Prediction filter order             */
+    oac_int warping_Q16,                       /* I                                        */
+    oac_int nStatesDelayedDecision,            /* I    Number of states in decision tree   */
     oac_int            *smpl_buf_idx,          /* I/O  Index to newest samples in buffers  */
-    oac_int            decisionDelay           /* I                                        */
-);
+    oac_int decisionDelay                      /* I                                        */
+    );
 
 void silk_NSQ_del_dec_sse4_1(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const oac_int16            x16[],                                        /* I    Input                           */
-    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16 x16[],                                                   /* I    Input                           */
+    oac_int8 pulses[],                                                       /* O    Quantized pulse signal          */
     const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
-)
-{
-    oac_int            i, k, lag, start_idx, LSF_interpolation_flag, Winner_ind, subfr;
-    oac_int            last_smple_idx, smpl_buf_idx, decisionDelay;
+    const oac_int16 LTPCoef_Q14[ LTP_ORDER*MAX_NB_SUBFR ],                   /* I    Long term prediction coefs      */
+    const oac_int16 AR_Q13[ MAX_NB_SUBFR*MAX_SHAPE_LPC_ORDER ],              /* I    Noise shaping coefs             */
+    const oac_int HarmShapeGain_Q14[ MAX_NB_SUBFR ],                         /* I    Long term shaping coefs         */
+    const oac_int Tilt_Q14[ MAX_NB_SUBFR ],                                  /* I    Spectral tilt                   */
+    const oac_int32 LF_shp_Q14[ MAX_NB_SUBFR ],                              /* I    Low frequency shaping coefs     */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],                               /* I    Quantization step sizes         */
+    const oac_int pitchL[ MAX_NB_SUBFR ],                                    /* I    Pitch lags                      */
+    const oac_int Lambda_Q10,                                                /* I    Rate/distortion tradeoff        */
+    const oac_int LTP_scale_Q14                                              /* I    LTP state scaling               */
+    ) {
+    oac_int i, k, lag, start_idx, LSF_interpolation_flag, Winner_ind, subfr;
+    oac_int last_smple_idx, smpl_buf_idx, decisionDelay;
     const oac_int16    *A_Q12, *B_Q14, *AR_shp_Q13;
     oac_int16          *pxq;
     VARDECL( oac_int32, sLTP_Q15 );
     VARDECL( oac_int16, sLTP );
-    oac_int32          HarmShapeFIRPacked_Q14;
-    oac_int            offset_Q10;
-    oac_int32          RDmin_Q10, Gain_Q10;
+    oac_int32 HarmShapeFIRPacked_Q14;
+    oac_int offset_Q10;
+    oac_int32 RDmin_Q10, Gain_Q10;
     VARDECL( oac_int32, x_sc_Q10 );
     VARDECL( oac_int32, delayedGain_Q10 );
     VARDECL( NSQ_del_dec_struct, psDelDec );
@@ -154,10 +153,10 @@ void silk_NSQ_del_dec_sse4_1(
 
 #ifdef OAC_CHECK_ASM
     ( void )pulses_a;
-    silk_memcpy( &NSQ_c, NSQ, sizeof( NSQ_c ) );
-    silk_memcpy( &psIndices_c, psIndices, sizeof( psIndices_c ) );
-    silk_assert( psEncC->nb_subfr * psEncC->subfr_length <= MAX_FRAME_LENGTH );
-    silk_memcpy( pulses_c, pulses, psEncC->nb_subfr * psEncC->subfr_length * sizeof( pulses[0] ) );
+    silk_memcpy( &NSQ_c, NSQ, sizeof(NSQ_c));
+    silk_memcpy( &psIndices_c, psIndices, sizeof(psIndices_c));
+    silk_assert( psEncC->nb_subfr*psEncC->subfr_length <= MAX_FRAME_LENGTH );
+    silk_memcpy( pulses_c, pulses, psEncC->nb_subfr*psEncC->subfr_length*sizeof(pulses[0]));
     silk_NSQ_del_dec_c(
         psEncC,
         &NSQ_c,
@@ -174,7 +173,7 @@ void silk_NSQ_del_dec_sse4_1(
         pitchL,
         Lambda_Q10,
         LTP_scale_Q14
-    );
+        );
 #endif
 
     /* Set unvoiced lag to the previous one, overwrite later for voiced */
@@ -184,36 +183,36 @@ void silk_NSQ_del_dec_sse4_1(
 
     /* Initialize delayed decision states */
     ALLOC( psDelDec, psEncC->nStatesDelayedDecision, NSQ_del_dec_struct );
-    silk_memset( psDelDec, 0, psEncC->nStatesDelayedDecision * sizeof( NSQ_del_dec_struct ) );
-    for( k = 0; k < psEncC->nStatesDelayedDecision; k++ ) {
+    silk_memset( psDelDec, 0, psEncC->nStatesDelayedDecision*sizeof(NSQ_del_dec_struct));
+    for (k = 0; k < psEncC->nStatesDelayedDecision; k++) {
         psDD                 = &psDelDec[ k ];
-        psDD->Seed           = ( k + psIndices->Seed ) & 3;
+        psDD->Seed           = (k + psIndices->Seed)&3;
         psDD->SeedInit       = psDD->Seed;
         psDD->RD_Q10         = 0;
         psDD->LF_AR_Q14      = NSQ->sLF_AR_shp_Q14;
         psDD->Diff_Q14       = NSQ->sDiff_shp_Q14;
         psDD->Shape_Q14[ 0 ] = NSQ->sLTP_shp_Q14[ psEncC->ltp_mem_length - 1 ];
-        silk_memcpy( psDD->sLPC_Q14, NSQ->sLPC_Q14, NSQ_LPC_BUF_LENGTH * sizeof( oac_int32 ) );
-        silk_memcpy( psDD->sAR2_Q14, NSQ->sAR2_Q14, sizeof( NSQ->sAR2_Q14 ) );
+        silk_memcpy( psDD->sLPC_Q14, NSQ->sLPC_Q14, NSQ_LPC_BUF_LENGTH*sizeof(oac_int32));
+        silk_memcpy( psDD->sAR2_Q14, NSQ->sAR2_Q14, sizeof(NSQ->sAR2_Q14));
     }
 
-    offset_Q10   = silk_Quantization_Offsets_Q10[ psIndices->signalType >> 1 ][ psIndices->quantOffsetType ];
+    offset_Q10   = silk_Quantization_Offsets_Q10[ psIndices->signalType>>1 ][ psIndices->quantOffsetType ];
     smpl_buf_idx = 0; /* index of oldest samples */
 
     decisionDelay = silk_min_int( DECISION_DELAY, psEncC->subfr_length );
 
     /* For voiced frames limit the decision delay to lower than the pitch lag */
-    if( psIndices->signalType == TYPE_VOICED ) {
-        for( k = 0; k < psEncC->nb_subfr; k++ ) {
-            decisionDelay = silk_min_int( decisionDelay, pitchL[ k ] - LTP_ORDER / 2 - 1 );
+    if (psIndices->signalType == TYPE_VOICED) {
+        for (k = 0; k < psEncC->nb_subfr; k++) {
+            decisionDelay = silk_min_int( decisionDelay, pitchL[ k ] - LTP_ORDER/2 - 1 );
         }
     } else {
-        if( lag > 0 ) {
-            decisionDelay = silk_min_int( decisionDelay, lag - LTP_ORDER / 2 - 1 );
+        if (lag > 0) {
+            decisionDelay = silk_min_int( decisionDelay, lag - LTP_ORDER/2 - 1 );
         }
     }
 
-    if( psIndices->NLSFInterpCoef_Q2 == 4 ) {
+    if (psIndices->NLSFInterpCoef_Q2 == 4) {
         LSF_interpolation_flag = 0;
     } else {
         LSF_interpolation_flag = 1;
@@ -228,37 +227,37 @@ void silk_NSQ_del_dec_sse4_1(
     NSQ->sLTP_shp_buf_idx = psEncC->ltp_mem_length;
     NSQ->sLTP_buf_idx     = psEncC->ltp_mem_length;
     subfr = 0;
-    for( k = 0; k < psEncC->nb_subfr; k++ ) {
-        A_Q12      = &PredCoef_Q12[ ( ( k >> 1 ) | ( 1 - LSF_interpolation_flag ) ) * MAX_LPC_ORDER ];
-        B_Q14      = &LTPCoef_Q14[ k * LTP_ORDER           ];
-        AR_shp_Q13 = &AR_Q13[     k * MAX_SHAPE_LPC_ORDER ];
+    for (k = 0; k < psEncC->nb_subfr; k++) {
+        A_Q12      = &PredCoef_Q12[ ((k>>1)|(1 - LSF_interpolation_flag))*MAX_LPC_ORDER ];
+        B_Q14      = &LTPCoef_Q14[ k*LTP_ORDER           ];
+        AR_shp_Q13 = &AR_Q13[     k*MAX_SHAPE_LPC_ORDER ];
 
         /* Noise shape parameters */
         silk_assert( HarmShapeGain_Q14[ k ] >= 0 );
         HarmShapeFIRPacked_Q14  =                          silk_RSHIFT( HarmShapeGain_Q14[ k ], 2 );
-        HarmShapeFIRPacked_Q14 |= silk_LSHIFT( (oac_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
+        HarmShapeFIRPacked_Q14 |= silk_LSHIFT((oac_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
 
         NSQ->rewhite_flag = 0;
-        if( psIndices->signalType == TYPE_VOICED ) {
+        if (psIndices->signalType == TYPE_VOICED) {
             /* Voiced */
             lag = pitchL[ k ];
 
             /* Re-whitening */
-            if( ( k & ( 3 - silk_LSHIFT( LSF_interpolation_flag, 1 ) ) ) == 0 ) {
-                if( k == 2 ) {
+            if ((k&(3 - silk_LSHIFT( LSF_interpolation_flag, 1 ))) == 0) {
+                if (k == 2) {
                     /* RESET DELAYED DECISIONS */
                     /* Find winner */
                     RDmin_Q10 = psDelDec[ 0 ].RD_Q10;
                     Winner_ind = 0;
-                    for( i = 1; i < psEncC->nStatesDelayedDecision; i++ ) {
-                        if( psDelDec[ i ].RD_Q10 < RDmin_Q10 ) {
+                    for (i = 1; i < psEncC->nStatesDelayedDecision; i++) {
+                        if (psDelDec[ i ].RD_Q10 < RDmin_Q10) {
                             RDmin_Q10 = psDelDec[ i ].RD_Q10;
                             Winner_ind = i;
                         }
                     }
-                    for( i = 0; i < psEncC->nStatesDelayedDecision; i++ ) {
-                        if( i != Winner_ind ) {
-                            psDelDec[ i ].RD_Q10 += ( silk_int32_MAX >> 4 );
+                    for (i = 0; i < psEncC->nStatesDelayedDecision; i++) {
+                        if (i != Winner_ind) {
+                            psDelDec[ i ].RD_Q10 += (silk_int32_MAX>>4);
                             silk_assert( psDelDec[ i ].RD_Q10 >= 0 );
                         }
                     }
@@ -266,23 +265,25 @@ void silk_NSQ_del_dec_sse4_1(
                     /* Copy final part of signals from winner state to output and long-term filter states */
                     psDD = &psDelDec[ Winner_ind ];
                     last_smple_idx = smpl_buf_idx + decisionDelay;
-                    for( i = 0; i < decisionDelay; i++ ) {
-                        last_smple_idx = ( last_smple_idx - 1 ) % DECISION_DELAY;
-                        if( last_smple_idx < 0 ) last_smple_idx += DECISION_DELAY;
-                        pulses[   i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ], 10 );
+                    for (i = 0; i < decisionDelay; i++) {
+                        last_smple_idx = (last_smple_idx - 1)%DECISION_DELAY;
+                        if (last_smple_idx < 0)  last_smple_idx += DECISION_DELAY;
+                        pulses[   i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ],
+                        10 );
                         pxq[ i - decisionDelay ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND(
-                            silk_SMULWW( psDD->Xq_Q14[ last_smple_idx ], Gains_Q16[ 1 ] ), 14 ) );
-                        NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay + i ] = psDD->Shape_Q14[ last_smple_idx ];
+                            silk_SMULWW( psDD->Xq_Q14[ last_smple_idx ], Gains_Q16[ 1 ] ), 14 ));
+                        NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay
+                                           + i ] = psDD->Shape_Q14[ last_smple_idx ];
                     }
 
                     subfr = 0;
                 }
 
                 /* Rewhiten with new A coefs */
-                start_idx = psEncC->ltp_mem_length - lag - psEncC->predictLPCOrder - LTP_ORDER / 2;
+                start_idx = psEncC->ltp_mem_length - lag - psEncC->predictLPCOrder - LTP_ORDER/2;
                 celt_assert( start_idx > 0 );
 
-                silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k * psEncC->subfr_length ],
+                silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k*psEncC->subfr_length ],
                     A_Q12, psEncC->ltp_mem_length - start_idx, psEncC->predictLPCOrder, psEncC->arch );
 
                 NSQ->sLTP_buf_idx = psEncC->ltp_mem_length;
@@ -293,10 +294,12 @@ void silk_NSQ_del_dec_sse4_1(
         silk_nsq_del_dec_scale_states_sse4_1( psEncC, NSQ, psDelDec, x16, x_sc_Q10, sLTP, sLTP_Q15, k,
             psEncC->nStatesDelayedDecision, LTP_scale_Q14, Gains_Q16, pitchL, psIndices->signalType, decisionDelay );
 
-        silk_noise_shape_quantizer_del_dec_sse4_1( NSQ, psDelDec, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15,
+        silk_noise_shape_quantizer_del_dec_sse4_1( NSQ, psDelDec, psIndices->signalType, x_sc_Q10, pulses, pxq,
+        sLTP_Q15,
             delayedGain_Q10, A_Q12, B_Q14, AR_shp_Q13, lag, HarmShapeFIRPacked_Q14, Tilt_Q14[ k ], LF_shp_Q14[ k ],
             Gains_Q16[ k ], Lambda_Q10, offset_Q10, psEncC->subfr_length, subfr++, psEncC->shapingLPCOrder,
-            psEncC->predictLPCOrder, psEncC->warping_Q16, psEncC->nStatesDelayedDecision, &smpl_buf_idx, decisionDelay );
+            psEncC->predictLPCOrder, psEncC->warping_Q16, psEncC->nStatesDelayedDecision, &smpl_buf_idx,
+        decisionDelay );
 
         x16    += psEncC->subfr_length;
         pulses += psEncC->subfr_length;
@@ -306,8 +309,8 @@ void silk_NSQ_del_dec_sse4_1(
     /* Find winner */
     RDmin_Q10 = psDelDec[ 0 ].RD_Q10;
     Winner_ind = 0;
-    for( k = 1; k < psEncC->nStatesDelayedDecision; k++ ) {
-        if( psDelDec[ k ].RD_Q10 < RDmin_Q10 ) {
+    for (k = 1; k < psEncC->nStatesDelayedDecision; k++) {
+        if (psDelDec[ k ].RD_Q10 < RDmin_Q10) {
             RDmin_Q10 = psDelDec[ k ].RD_Q10;
             Winner_ind = k;
         }
@@ -318,17 +321,17 @@ void silk_NSQ_del_dec_sse4_1(
     psIndices->Seed = psDD->SeedInit;
     last_smple_idx = smpl_buf_idx + decisionDelay;
     Gain_Q10 = silk_RSHIFT32( Gains_Q16[ psEncC->nb_subfr - 1 ], 6 );
-    for( i = 0; i < decisionDelay; i++ ) {
-        last_smple_idx = ( last_smple_idx - 1 ) % DECISION_DELAY;
-        if( last_smple_idx < 0 ) last_smple_idx += DECISION_DELAY;
+    for (i = 0; i < decisionDelay; i++) {
+        last_smple_idx = (last_smple_idx - 1)%DECISION_DELAY;
+        if (last_smple_idx < 0)  last_smple_idx += DECISION_DELAY;
 
         pulses[   i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ], 10 );
         pxq[ i - decisionDelay ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND(
-            silk_SMULWW( psDD->Xq_Q14[ last_smple_idx ], Gain_Q10 ), 8 ) );
+            silk_SMULWW( psDD->Xq_Q14[ last_smple_idx ], Gain_Q10 ), 8 ));
         NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay + i ] = psDD->Shape_Q14[ last_smple_idx ];
     }
-    silk_memcpy( NSQ->sLPC_Q14, &psDD->sLPC_Q14[ psEncC->subfr_length ], NSQ_LPC_BUF_LENGTH * sizeof( oac_int32 ) );
-    silk_memcpy( NSQ->sAR2_Q14, psDD->sAR2_Q14, sizeof( psDD->sAR2_Q14 ) );
+    silk_memcpy( NSQ->sLPC_Q14, &psDD->sLPC_Q14[ psEncC->subfr_length ], NSQ_LPC_BUF_LENGTH*sizeof(oac_int32));
+    silk_memcpy( NSQ->sAR2_Q14, psDD->sAR2_Q14, sizeof(psDD->sAR2_Q14));
 
     /* Update states */
     NSQ->sLF_AR_shp_Q14 = psDD->LF_AR_Q14;
@@ -336,13 +339,15 @@ void silk_NSQ_del_dec_sse4_1(
     NSQ->lagPrev        = pitchL[ psEncC->nb_subfr - 1 ];
 
     /* Save quantized speech signal */
-    silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( oac_int16 ) );
-    silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( oac_int32 ) );
+    silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ],
+    psEncC->ltp_mem_length*sizeof(oac_int16));
+    silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ],
+    psEncC->ltp_mem_length*sizeof(oac_int32));
 
 #ifdef OAC_CHECK_ASM
-    silk_assert( !memcmp( &NSQ_c, NSQ, sizeof( NSQ_c ) ) );
-    silk_assert( !memcmp( &psIndices_c, psIndices, sizeof( psIndices_c ) ) );
-    silk_assert( !memcmp( pulses_c, pulses_a, psEncC->nb_subfr * psEncC->subfr_length * sizeof( pulses[0] ) ) );
+    silk_assert( !memcmp( &NSQ_c, NSQ, sizeof(NSQ_c)));
+    silk_assert( !memcmp( &psIndices_c, psIndices, sizeof(psIndices_c)));
+    silk_assert( !memcmp( pulses_c, pulses_a, psEncC->nb_subfr*psEncC->subfr_length*sizeof(pulses[0])));
 #endif
 
     RESTORE_STACK;
@@ -353,39 +358,38 @@ void silk_NSQ_del_dec_sse4_1(
 /******************************************/
 static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                           */
-    NSQ_del_dec_struct  psDelDec[],             /* I/O  Delayed decision states             */
-    oac_int            signalType,             /* I    Signal type                         */
-    const oac_int32    x_Q10[],                /* I                                        */
-    oac_int8           pulses[],               /* O                                        */
-    oac_int16          xq[],                   /* O                                        */
-    oac_int32          sLTP_Q15[],             /* I/O  LTP filter state                    */
-    oac_int32          delayedGain_Q10[],      /* I/O  Gain delay buffer                   */
-    const oac_int16    a_Q12[],                /* I    Short term prediction coefs         */
-    const oac_int16    b_Q14[],                /* I    Long term prediction coefs          */
-    const oac_int16    AR_shp_Q13[],           /* I    Noise shaping coefs                 */
-    oac_int            lag,                    /* I    Pitch lag                           */
-    oac_int32          HarmShapeFIRPacked_Q14, /* I                                        */
-    oac_int            Tilt_Q14,               /* I    Spectral tilt                       */
-    oac_int32          LF_shp_Q14,             /* I                                        */
-    oac_int32          Gain_Q16,               /* I                                        */
-    oac_int            Lambda_Q10,             /* I                                        */
-    oac_int            offset_Q10,             /* I                                        */
-    oac_int            length,                 /* I    Input length                        */
-    oac_int            subfr,                  /* I    Subframe number                     */
-    oac_int            shapingLPCOrder,        /* I    Shaping LPC filter order            */
-    oac_int            predictLPCOrder,        /* I    Prediction filter order             */
-    oac_int            warping_Q16,            /* I                                        */
-    oac_int            nStatesDelayedDecision, /* I    Number of states in decision tree   */
+    NSQ_del_dec_struct psDelDec[],              /* I/O  Delayed decision states             */
+    oac_int signalType,                        /* I    Signal type                         */
+    const oac_int32 x_Q10[],                   /* I                                        */
+    oac_int8 pulses[],                         /* O                                        */
+    oac_int16 xq[],                            /* O                                        */
+    oac_int32 sLTP_Q15[],                      /* I/O  LTP filter state                    */
+    oac_int32 delayedGain_Q10[],               /* I/O  Gain delay buffer                   */
+    const oac_int16 a_Q12[],                   /* I    Short term prediction coefs         */
+    const oac_int16 b_Q14[],                   /* I    Long term prediction coefs          */
+    const oac_int16 AR_shp_Q13[],              /* I    Noise shaping coefs                 */
+    oac_int lag,                               /* I    Pitch lag                           */
+    oac_int32 HarmShapeFIRPacked_Q14,          /* I                                        */
+    oac_int Tilt_Q14,                          /* I    Spectral tilt                       */
+    oac_int32 LF_shp_Q14,                      /* I                                        */
+    oac_int32 Gain_Q16,                        /* I                                        */
+    oac_int Lambda_Q10,                        /* I                                        */
+    oac_int offset_Q10,                        /* I                                        */
+    oac_int length,                            /* I    Input length                        */
+    oac_int subfr,                             /* I    Subframe number                     */
+    oac_int shapingLPCOrder,                   /* I    Shaping LPC filter order            */
+    oac_int predictLPCOrder,                   /* I    Prediction filter order             */
+    oac_int warping_Q16,                       /* I                                        */
+    oac_int nStatesDelayedDecision,            /* I    Number of states in decision tree   */
     oac_int            *smpl_buf_idx,          /* I/O  Index to newest samples in buffers  */
-    oac_int            decisionDelay           /* I                                        */
-)
-{
-    oac_int     i, j, k, Winner_ind, RDmin_ind, RDmax_ind, last_smple_idx;
-    oac_int32   Winner_rand_state;
-    oac_int32   LTP_pred_Q14, LPC_pred_Q14, n_AR_Q14, n_LTP_Q14;
-    oac_int32   n_LF_Q14, r_Q10, rr_Q10, rd1_Q10, rd2_Q10, RDmin_Q10, RDmax_Q10;
-    oac_int32   q1_Q0, q1_Q10, q2_Q10, exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10;
-    oac_int32   tmp1, tmp2, sLF_AR_shp_Q14;
+    oac_int decisionDelay                      /* I                                        */
+    ) {
+    oac_int i, j, k, Winner_ind, RDmin_ind, RDmax_ind, last_smple_idx;
+    oac_int32 Winner_rand_state;
+    oac_int32 LTP_pred_Q14, LPC_pred_Q14, n_AR_Q14, n_LTP_Q14;
+    oac_int32 n_LF_Q14, r_Q10, rr_Q10, rd1_Q10, rd2_Q10, RDmin_Q10, RDmax_Q10;
+    oac_int32 q1_Q0, q1_Q10, q2_Q10, exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10;
+    oac_int32 tmp1, tmp2, sLF_AR_shp_Q14;
     oac_int32   *pred_lag_ptr, *shp_lag_ptr, *psLPC_Q14;
     int rdo_offset;
 
@@ -400,45 +404,45 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
     celt_assert( nStatesDelayedDecision > 0 );
     ALLOC( psSampleState, nStatesDelayedDecision, NSQ_sample_pair );
 
-    rdo_offset = (Lambda_Q10 >> 1) - 512;
+    rdo_offset = (Lambda_Q10>>1) - 512;
 
-    shp_lag_ptr  = &NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS / 2 ];
-    pred_lag_ptr = &sLTP_Q15[ NSQ->sLTP_buf_idx - lag + LTP_ORDER / 2 ];
+    shp_lag_ptr  = &NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS/2 ];
+    pred_lag_ptr = &sLTP_Q15[ NSQ->sLTP_buf_idx - lag + LTP_ORDER/2 ];
     Gain_Q10     = silk_RSHIFT( Gain_Q16, 6 );
 
     a_Q12_0123 = OP_CVTEPI16_EPI32_M64( a_Q12 );
     a_Q12_4567 = OP_CVTEPI16_EPI32_M64( a_Q12 + 4 );
 
-    if( oac_likely( predictLPCOrder == 16 ) ) {
+    if (oac_likely( predictLPCOrder == 16 )) {
         a_Q12_89AB = OP_CVTEPI16_EPI32_M64( a_Q12 + 8 );
         a_Q12_CDEF = OP_CVTEPI16_EPI32_M64( a_Q12 + 12 );
     }
 
-    if( signalType == TYPE_VOICED ){
+    if (signalType == TYPE_VOICED) {
         b_Q12_0123 = OP_CVTEPI16_EPI32_M64( b_Q14 );
-        b_sr_Q12_0123 = _mm_shuffle_epi32( b_Q12_0123, _MM_SHUFFLE( 0, 3, 2, 1 ) ); /* equal shift right 4 bytes */
+        b_sr_Q12_0123 = _mm_shuffle_epi32( b_Q12_0123, _MM_SHUFFLE( 0, 3, 2, 1 ));  /* equal shift right 4 bytes */
     }
-    for( i = 0; i < length; i++ ) {
+    for (i = 0; i < length; i++) {
         /* Perform common calculations used in all states */
 
         /* Long-term prediction */
-        if( signalType == TYPE_VOICED ) {
+        if (signalType == TYPE_VOICED) {
             /* Unrolled loop */
             /* Avoids introducing a bias because silk_SMLAWB() always rounds to -inf */
             LTP_pred_Q14 = 2;
             {
                 __m128i tmpa, tmpb, pred_lag_ptr_tmp;
-                pred_lag_ptr_tmp    = _mm_loadu_si128( (__m128i *)(void*)(&pred_lag_ptr[ -3 ] ) );
+                pred_lag_ptr_tmp    = _mm_loadu_si128((__m128i *)(void*)(&pred_lag_ptr[ -3 ]));
                 pred_lag_ptr_tmp    = _mm_shuffle_epi32( pred_lag_ptr_tmp, 0x1B );
                 tmpa                = _mm_mul_epi32( pred_lag_ptr_tmp, b_Q12_0123 );
                 tmpa                = _mm_srli_si128( tmpa, 2 );
 
-                pred_lag_ptr_tmp = _mm_shuffle_epi32( pred_lag_ptr_tmp, _MM_SHUFFLE( 0, 3, 2, 1 ) );/* equal shift right 4 bytes */
+                pred_lag_ptr_tmp = _mm_shuffle_epi32( pred_lag_ptr_tmp, _MM_SHUFFLE( 0, 3, 2, 1 )); /* equal shift right 4 bytes */
                 pred_lag_ptr_tmp    = _mm_mul_epi32( pred_lag_ptr_tmp, b_sr_Q12_0123 );
                 pred_lag_ptr_tmp    = _mm_srli_si128( pred_lag_ptr_tmp, 2 );
                 pred_lag_ptr_tmp    = _mm_add_epi32( pred_lag_ptr_tmp, tmpa );
 
-                tmpb = _mm_shuffle_epi32( pred_lag_ptr_tmp, _MM_SHUFFLE( 0, 0, 3, 2 ) );/* equal shift right 8 bytes */
+                tmpb = _mm_shuffle_epi32( pred_lag_ptr_tmp, _MM_SHUFFLE( 0, 0, 3, 2 )); /* equal shift right 8 bytes */
                 pred_lag_ptr_tmp    = _mm_add_epi32( pred_lag_ptr_tmp, tmpb );
                 LTP_pred_Q14        += _mm_cvtsi128_si32( pred_lag_ptr_tmp );
 
@@ -451,7 +455,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
         }
 
         /* Long-term shaping */
-        if( lag > 0 ) {
+        if (lag > 0) {
             /* Symmetric, packed FIR coefficients */
             n_LTP_Q14 = silk_SMULWB( silk_ADD_SAT32( shp_lag_ptr[ 0 ], shp_lag_ptr[ -2 ] ), HarmShapeFIRPacked_Q14 );
             n_LTP_Q14 = silk_SMLAWT( n_LTP_Q14, shp_lag_ptr[ -1 ], HarmShapeFIRPacked_Q14 );
@@ -463,7 +467,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
         {
             __m128i tmpa, tmpb, psLPC_Q14_tmp, a_Q12_tmp;
 
-            for( k = 0; k < nStatesDelayedDecision; k++ ) {
+            for (k = 0; k < nStatesDelayedDecision; k++) {
                 /* Delayed decision state */
                 psDD = &psDelDec[ k ];
 
@@ -483,70 +487,67 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
                 tmpb = _mm_setzero_si128();
 
                 /* step 1 */
-                psLPC_Q14_tmp   = _mm_loadu_si128( (__m128i *)(void*)(&psLPC_Q14[ -3 ] ) ); /* -3, -2 , -1, 0 */
+                psLPC_Q14_tmp   = _mm_loadu_si128((__m128i *)(void*)(&psLPC_Q14[ -3 ]));    /* -3, -2 , -1, 0 */
                 psLPC_Q14_tmp   = _mm_shuffle_epi32( psLPC_Q14_tmp, 0x1B );      /* 0, -1, -2, -3 */
                 tmpa            = _mm_mul_epi32( psLPC_Q14_tmp, a_Q12_0123 );    /* 0, -1, -2, -3 * 0123 -> 0*0, 2*-2 */
 
                 tmpa            = _mm_srli_epi64( tmpa, 16 );
                 tmpb            = _mm_add_epi32( tmpb, tmpa );
 
-                psLPC_Q14_tmp = _mm_shuffle_epi32( psLPC_Q14_tmp, _MM_SHUFFLE( 0, 3, 2, 1 ) ); /* equal shift right 4 bytes */
-                a_Q12_tmp = _mm_shuffle_epi32( a_Q12_0123, _MM_SHUFFLE(0, 3, 2, 1 ) ); /* equal shift right 4 bytes */
+                psLPC_Q14_tmp = _mm_shuffle_epi32( psLPC_Q14_tmp, _MM_SHUFFLE( 0, 3, 2, 1 ));  /* equal shift right 4 bytes */
+                a_Q12_tmp = _mm_shuffle_epi32( a_Q12_0123, _MM_SHUFFLE(0, 3, 2, 1 ));  /* equal shift right 4 bytes */
                 psLPC_Q14_tmp   = _mm_mul_epi32( psLPC_Q14_tmp, a_Q12_tmp ); /* 1*-1, 3*-3 */
                 psLPC_Q14_tmp   = _mm_srli_epi64( psLPC_Q14_tmp, 16 );
                 tmpb            = _mm_add_epi32( tmpb, psLPC_Q14_tmp );
 
                 /* step 2 */
-                psLPC_Q14_tmp   = _mm_loadu_si128( (__m128i *)(void*)(&psLPC_Q14[ -7 ] ) );
+                psLPC_Q14_tmp   = _mm_loadu_si128((__m128i *)(void*)(&psLPC_Q14[ -7 ]));
                 psLPC_Q14_tmp   = _mm_shuffle_epi32( psLPC_Q14_tmp, 0x1B );
                 tmpa            = _mm_mul_epi32( psLPC_Q14_tmp, a_Q12_4567 );
                 tmpa            = _mm_srli_epi64( tmpa, 16 );
                 tmpb            = _mm_add_epi32( tmpb, tmpa );
 
-                psLPC_Q14_tmp = _mm_shuffle_epi32( psLPC_Q14_tmp, _MM_SHUFFLE( 0, 3, 2, 1 ) ); /* equal shift right 4 bytes */
-                a_Q12_tmp = _mm_shuffle_epi32( a_Q12_4567, _MM_SHUFFLE(0, 3, 2, 1 ) ); /* equal shift right 4 bytes */
+                psLPC_Q14_tmp = _mm_shuffle_epi32( psLPC_Q14_tmp, _MM_SHUFFLE( 0, 3, 2, 1 ));  /* equal shift right 4 bytes */
+                a_Q12_tmp = _mm_shuffle_epi32( a_Q12_4567, _MM_SHUFFLE(0, 3, 2, 1 ));  /* equal shift right 4 bytes */
                 psLPC_Q14_tmp   = _mm_mul_epi32( psLPC_Q14_tmp, a_Q12_tmp );
                 psLPC_Q14_tmp   = _mm_srli_epi64( psLPC_Q14_tmp, 16 );
                 tmpb            = _mm_add_epi32( tmpb, psLPC_Q14_tmp );
 
-                if ( oac_likely( predictLPCOrder == 16 ) )
-                {
+                if (oac_likely( predictLPCOrder == 16 )) {
                     /* step 3 */
-                    psLPC_Q14_tmp   = _mm_loadu_si128( (__m128i *)(void*)(&psLPC_Q14[ -11 ] ) );
+                    psLPC_Q14_tmp   = _mm_loadu_si128((__m128i *)(void*)(&psLPC_Q14[ -11 ]));
                     psLPC_Q14_tmp   = _mm_shuffle_epi32( psLPC_Q14_tmp, 0x1B );
                     tmpa            = _mm_mul_epi32( psLPC_Q14_tmp, a_Q12_89AB );
                     tmpa            = _mm_srli_epi64( tmpa, 16 );
                     tmpb            = _mm_add_epi32( tmpb, tmpa );
 
-                    psLPC_Q14_tmp = _mm_shuffle_epi32( psLPC_Q14_tmp, _MM_SHUFFLE( 0, 3, 2, 1 ) ); /* equal shift right 4 bytes */
-                    a_Q12_tmp = _mm_shuffle_epi32( a_Q12_89AB, _MM_SHUFFLE(0, 3, 2, 1 ) );/* equal shift right 4 bytes */
+                    psLPC_Q14_tmp = _mm_shuffle_epi32( psLPC_Q14_tmp, _MM_SHUFFLE( 0, 3, 2, 1 ));  /* equal shift right 4 bytes */
+                    a_Q12_tmp = _mm_shuffle_epi32( a_Q12_89AB, _MM_SHUFFLE(0, 3, 2, 1 )); /* equal shift right 4 bytes */
                     psLPC_Q14_tmp   = _mm_mul_epi32( psLPC_Q14_tmp, a_Q12_tmp );
                     psLPC_Q14_tmp   = _mm_srli_epi64( psLPC_Q14_tmp, 16 );
                     tmpb            = _mm_add_epi32( tmpb, psLPC_Q14_tmp );
 
                     /* step 4 */
-                    psLPC_Q14_tmp   = _mm_loadu_si128( (__m128i *)(void*)(&psLPC_Q14[ -15 ] ) );
+                    psLPC_Q14_tmp   = _mm_loadu_si128((__m128i *)(void*)(&psLPC_Q14[ -15 ]));
                     psLPC_Q14_tmp   = _mm_shuffle_epi32( psLPC_Q14_tmp, 0x1B );
                     tmpa            = _mm_mul_epi32( psLPC_Q14_tmp, a_Q12_CDEF );
                     tmpa            = _mm_srli_epi64( tmpa, 16 );
                     tmpb            = _mm_add_epi32( tmpb, tmpa );
 
-                    psLPC_Q14_tmp = _mm_shuffle_epi32( psLPC_Q14_tmp, _MM_SHUFFLE( 0, 3, 2, 1 ) ); /* equal shift right 4 bytes */
-                    a_Q12_tmp = _mm_shuffle_epi32( a_Q12_CDEF, _MM_SHUFFLE(0, 3, 2, 1 ) ); /* equal shift right 4 bytes */
+                    psLPC_Q14_tmp = _mm_shuffle_epi32( psLPC_Q14_tmp, _MM_SHUFFLE( 0, 3, 2, 1 ));  /* equal shift right 4 bytes */
+                    a_Q12_tmp = _mm_shuffle_epi32( a_Q12_CDEF, _MM_SHUFFLE(0, 3, 2, 1 ));  /* equal shift right 4 bytes */
                     psLPC_Q14_tmp   = _mm_mul_epi32( psLPC_Q14_tmp, a_Q12_tmp );
                     psLPC_Q14_tmp   = _mm_srli_epi64( psLPC_Q14_tmp, 16 );
                     tmpb            = _mm_add_epi32( tmpb, psLPC_Q14_tmp );
 
                     /* add at last */
                     /* equal shift right 8 bytes*/
-                    tmpa            = _mm_shuffle_epi32( tmpb, _MM_SHUFFLE( 0, 0, 3, 2 ) );
+                    tmpa            = _mm_shuffle_epi32( tmpb, _MM_SHUFFLE( 0, 0, 3, 2 ));
                     tmpb            = _mm_add_epi32( tmpb, tmpa );
                     LPC_pred_Q14    += _mm_cvtsi128_si32( tmpb );
-                }
-                else
-                {
+                } else {
                     /* add at last */
-                    tmpa            = _mm_shuffle_epi32( tmpb, _MM_SHUFFLE( 0, 0, 3, 2 ) ); /* equal shift right 8 bytes*/
+                    tmpa            = _mm_shuffle_epi32( tmpb, _MM_SHUFFLE( 0, 0, 3, 2 ));  /* equal shift right 8 bytes*/
                     tmpb            = _mm_add_epi32( tmpb, tmpa );
                     LPC_pred_Q14    += _mm_cvtsi128_si32( tmpb );
 
@@ -557,7 +558,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
                 LPC_pred_Q14 = silk_LSHIFT( LPC_pred_Q14, 4 ); /* Q10 -> Q14 */
 
                 /* Noise shape feedback */
-                celt_assert( ( shapingLPCOrder & 1 ) == 0 );   /* check that order is even */
+                celt_assert((shapingLPCOrder&1) == 0 );        /* check that order is even */
                 /* Output of lowpass section */
                 tmp2 = silk_SMLAWB( psDD->Diff_Q14, psDD->sAR2_Q14[ 0 ], warping_Q16 );
                 /* Output of allpass section */
@@ -566,13 +567,15 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
                 n_AR_Q14 = silk_RSHIFT( shapingLPCOrder, 1 );
                 n_AR_Q14 = silk_SMLAWB( n_AR_Q14, tmp2, AR_shp_Q13[ 0 ] );
                 /* Loop over allpass sections */
-                for( j = 2; j < shapingLPCOrder; j += 2 ) {
+                for (j = 2; j < shapingLPCOrder; j += 2) {
                     /* Output of allpass section */
-                    tmp2 = silk_SMLAWB( psDD->sAR2_Q14[ j - 1 ], silk_SUB32_ovflw(psDD->sAR2_Q14[ j + 0 ], tmp1), warping_Q16 );
+                    tmp2 = silk_SMLAWB( psDD->sAR2_Q14[ j - 1 ], silk_SUB32_ovflw(psDD->sAR2_Q14[ j + 0 ], tmp1),
+                    warping_Q16 );
                     psDD->sAR2_Q14[ j - 1 ] = tmp1;
                     n_AR_Q14 = silk_SMLAWB( n_AR_Q14, tmp1, AR_shp_Q13[ j - 1 ] );
                     /* Output of allpass section */
-                    tmp1 = silk_SMLAWB( psDD->sAR2_Q14[ j + 0 ], silk_SUB32_ovflw(psDD->sAR2_Q14[ j + 1 ], tmp2), warping_Q16 );
+                    tmp1 = silk_SMLAWB( psDD->sAR2_Q14[ j + 0 ], silk_SUB32_ovflw(psDD->sAR2_Q14[ j + 1 ], tmp2),
+                    warping_Q16 );
                     psDD->sAR2_Q14[ j + 0 ] = tmp2;
                     n_AR_Q14 = silk_SMLAWB( n_AR_Q14, tmp2, AR_shp_Q13[ j ] );
                 }
@@ -597,10 +600,10 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
                 r_Q10 = silk_SUB32( x_Q10[ i ], tmp1 );                                     /* residual error Q10 */
 
                 /* Flip sign depending on dither */
-                if ( psDD->Seed < 0 ) {
+                if (psDD->Seed < 0) {
                     r_Q10 = -r_Q10;
                 }
-                r_Q10 = silk_LIMIT_32( r_Q10, -(31 << 10), 30 << 10 );
+                r_Q10 = silk_LIMIT_32( r_Q10, -(31<<10), 30<<10 );
 
                 /* Find two quantization level candidates and measure their rate-distortion */
                 q1_Q10 = silk_SUB32( r_Q10, offset_Q10 );
@@ -617,18 +620,18 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
                         q1_Q0 = 0;
                     }
                 }
-                if( q1_Q0 > 0 ) {
+                if (q1_Q0 > 0) {
                     q1_Q10  = silk_SUB32( silk_LSHIFT( q1_Q0, 10 ), QUANT_LEVEL_ADJUST_Q10 );
                     q1_Q10  = silk_ADD32( q1_Q10, offset_Q10 );
                     q2_Q10  = silk_ADD32( q1_Q10, 1024 );
                     rd1_Q10 = silk_SMULBB( q1_Q10, Lambda_Q10 );
                     rd2_Q10 = silk_SMULBB( q2_Q10, Lambda_Q10 );
-                } else if( q1_Q0 == 0 ) {
+                } else if (q1_Q0 == 0) {
                     q1_Q10  = offset_Q10;
                     q2_Q10  = silk_ADD32( q1_Q10, 1024 - QUANT_LEVEL_ADJUST_Q10 );
                     rd1_Q10 = silk_SMULBB( q1_Q10, Lambda_Q10 );
                     rd2_Q10 = silk_SMULBB( q2_Q10, Lambda_Q10 );
-                } else if( q1_Q0 == -1 ) {
+                } else if (q1_Q0 == -1) {
                     q2_Q10  = offset_Q10;
                     q1_Q10  = silk_SUB32( q2_Q10, 1024 - QUANT_LEVEL_ADJUST_Q10 );
                     rd1_Q10 = silk_SMULBB( -q1_Q10, Lambda_Q10 );
@@ -645,7 +648,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
                 rr_Q10  = silk_SUB32( r_Q10, q2_Q10 );
                 rd2_Q10 = silk_RSHIFT( silk_SMLABB( rd2_Q10, rr_Q10, rr_Q10 ), 10 );
 
-                if( rd1_Q10 < rd2_Q10 ) {
+                if (rd1_Q10 < rd2_Q10) {
                     psSS[ 0 ].RD_Q10 = silk_ADD32( psDD->RD_Q10, rd1_Q10 );
                     psSS[ 1 ].RD_Q10 = silk_ADD32( psDD->RD_Q10, rd2_Q10 );
                     psSS[ 0 ].Q_Q10  = q1_Q10;
@@ -661,7 +664,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
 
                 /* Quantized excitation */
                 exc_Q14 = silk_LSHIFT32( psSS[ 0 ].Q_Q10, 4 );
-                if ( psDD->Seed < 0 ) {
+                if (psDD->Seed < 0) {
                     exc_Q14 = -exc_Q14;
                 }
 
@@ -670,7 +673,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
                 xq_Q14      = silk_ADD32_ovflw( LPC_exc_Q14, LPC_pred_Q14 );
 
                 /* Update states */
-                psSS[ 0 ].Diff_Q14     = silk_SUB32_ovflw( xq_Q14, silk_LSHIFT32( x_Q10[ i ], 4 ) );
+                psSS[ 0 ].Diff_Q14     = silk_SUB32_ovflw( xq_Q14, silk_LSHIFT32( x_Q10[ i ], 4 ));
                 sLF_AR_shp_Q14         = silk_SUB32_ovflw( psSS[ 0 ].Diff_Q14, n_AR_Q14 );
                 psSS[ 0 ].sLTP_shp_Q14 = silk_SUB_SAT32( sLF_AR_shp_Q14, n_LF_Q14 );
                 psSS[ 0 ].LF_AR_Q14    = sLF_AR_shp_Q14;
@@ -681,7 +684,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
 
                 /* Quantized excitation */
                 exc_Q14 = silk_LSHIFT32( psSS[ 1 ].Q_Q10, 4 );
-                if ( psDD->Seed < 0 ) {
+                if (psDD->Seed < 0) {
                     exc_Q14 = -exc_Q14;
                 }
 
@@ -690,7 +693,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
                 xq_Q14      = silk_ADD32_ovflw( LPC_exc_Q14, LPC_pred_Q14 );
 
                 /* Update states */
-                psSS[ 1 ].Diff_Q14     = silk_SUB32_ovflw( xq_Q14, silk_LSHIFT32( x_Q10[ i ], 4 ) );
+                psSS[ 1 ].Diff_Q14     = silk_SUB32_ovflw( xq_Q14, silk_LSHIFT32( x_Q10[ i ], 4 ));
                 sLF_AR_shp_Q14         = silk_SUB32_ovflw( psSS[ 1 ].Diff_Q14, n_AR_Q14 );
                 psSS[ 1 ].sLTP_shp_Q14 = silk_SUB_SAT32( sLF_AR_shp_Q14, n_LF_Q14 );
                 psSS[ 1 ].LF_AR_Q14    = sLF_AR_shp_Q14;
@@ -698,15 +701,15 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
                 psSS[ 1 ].xq_Q14       = xq_Q14;
             }
         }
-        *smpl_buf_idx  = ( *smpl_buf_idx - 1 ) % DECISION_DELAY;
-        if( *smpl_buf_idx < 0 ) *smpl_buf_idx += DECISION_DELAY;
-        last_smple_idx = ( *smpl_buf_idx + decisionDelay ) % DECISION_DELAY;
+        *smpl_buf_idx  = (*smpl_buf_idx - 1)%DECISION_DELAY;
+        if (*smpl_buf_idx < 0)  *smpl_buf_idx += DECISION_DELAY;
+        last_smple_idx = (*smpl_buf_idx + decisionDelay)%DECISION_DELAY;
 
         /* Find winner */
         RDmin_Q10 = psSampleState[ 0 ][ 0 ].RD_Q10;
         Winner_ind = 0;
-        for( k = 1; k < nStatesDelayedDecision; k++ ) {
-            if( psSampleState[ k ][ 0 ].RD_Q10 < RDmin_Q10 ) {
+        for (k = 1; k < nStatesDelayedDecision; k++) {
+            if (psSampleState[ k ][ 0 ].RD_Q10 < RDmin_Q10) {
                 RDmin_Q10  = psSampleState[ k ][ 0 ].RD_Q10;
                 Winner_ind = k;
             }
@@ -714,10 +717,10 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
 
         /* Increase RD values of expired states */
         Winner_rand_state = psDelDec[ Winner_ind ].RandState[ last_smple_idx ];
-        for( k = 0; k < nStatesDelayedDecision; k++ ) {
-            if( psDelDec[ k ].RandState[ last_smple_idx ] != Winner_rand_state ) {
-                psSampleState[ k ][ 0 ].RD_Q10 = silk_ADD32( psSampleState[ k ][ 0 ].RD_Q10, silk_int32_MAX >> 4 );
-                psSampleState[ k ][ 1 ].RD_Q10 = silk_ADD32( psSampleState[ k ][ 1 ].RD_Q10, silk_int32_MAX >> 4 );
+        for (k = 0; k < nStatesDelayedDecision; k++) {
+            if (psDelDec[ k ].RandState[ last_smple_idx ] != Winner_rand_state) {
+                psSampleState[ k ][ 0 ].RD_Q10 = silk_ADD32( psSampleState[ k ][ 0 ].RD_Q10, silk_int32_MAX>>4 );
+                psSampleState[ k ][ 1 ].RD_Q10 = silk_ADD32( psSampleState[ k ][ 1 ].RD_Q10, silk_int32_MAX>>4 );
                 silk_assert( psSampleState[ k ][ 0 ].RD_Q10 >= 0 );
             }
         }
@@ -727,32 +730,32 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
         RDmin_Q10  = psSampleState[ 0 ][ 1 ].RD_Q10;
         RDmax_ind = 0;
         RDmin_ind = 0;
-        for( k = 1; k < nStatesDelayedDecision; k++ ) {
+        for (k = 1; k < nStatesDelayedDecision; k++) {
             /* find worst in first set */
-            if( psSampleState[ k ][ 0 ].RD_Q10 > RDmax_Q10 ) {
+            if (psSampleState[ k ][ 0 ].RD_Q10 > RDmax_Q10) {
                 RDmax_Q10  = psSampleState[ k ][ 0 ].RD_Q10;
                 RDmax_ind = k;
             }
             /* find best in second set */
-            if( psSampleState[ k ][ 1 ].RD_Q10 < RDmin_Q10 ) {
+            if (psSampleState[ k ][ 1 ].RD_Q10 < RDmin_Q10) {
                 RDmin_Q10  = psSampleState[ k ][ 1 ].RD_Q10;
                 RDmin_ind = k;
             }
         }
 
         /* Replace a state if best from second set outperforms worst in first set */
-        if( RDmin_Q10 < RDmax_Q10 ) {
-            silk_memcpy( ( (oac_int32 *)&psDelDec[ RDmax_ind ] ) + i,
-                         ( (oac_int32 *)&psDelDec[ RDmin_ind ] ) + i, sizeof( NSQ_del_dec_struct ) - i * sizeof( oac_int32) );
-            silk_memcpy( &psSampleState[ RDmax_ind ][ 0 ], &psSampleState[ RDmin_ind ][ 1 ], sizeof( NSQ_sample_struct ) );
+        if (RDmin_Q10 < RDmax_Q10) {
+            silk_memcpy(((oac_int32 *)&psDelDec[ RDmax_ind ]) + i,
+                ((oac_int32 *)&psDelDec[ RDmin_ind ]) + i, sizeof(NSQ_del_dec_struct) - i*sizeof(oac_int32));
+            silk_memcpy( &psSampleState[ RDmax_ind ][ 0 ], &psSampleState[ RDmin_ind ][ 1 ], sizeof(NSQ_sample_struct));
         }
 
         /* Write samples from winner to output and long-term filter states */
         psDD = &psDelDec[ Winner_ind ];
-        if( subfr > 0 || i >= decisionDelay ) {
+        if (subfr > 0 || i >= decisionDelay) {
             pulses[  i - decisionDelay ] = (oac_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ], 10 );
             xq[ i - decisionDelay ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND(
-                silk_SMULWW( psDD->Xq_Q14[ last_smple_idx ], delayedGain_Q10[ last_smple_idx ] ), 8 ) );
+                silk_SMULWW( psDD->Xq_Q14[ last_smple_idx ], delayedGain_Q10[ last_smple_idx ] ), 8 ));
             NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay ] = psDD->Shape_Q14[ last_smple_idx ];
             sLTP_Q15[          NSQ->sLTP_buf_idx     - decisionDelay ] = psDD->Pred_Q15[  last_smple_idx ];
         }
@@ -760,7 +763,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
         NSQ->sLTP_buf_idx++;
 
         /* Update states */
-        for( k = 0; k < nStatesDelayedDecision; k++ ) {
+        for (k = 0; k < nStatesDelayedDecision; k++) {
             psDD                                     = &psDelDec[ k ];
             psSS                                     = &psSampleState[ k ][ 0 ];
             psDD->LF_AR_Q14                          = psSS->LF_AR_Q14;
@@ -770,16 +773,17 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
             psDD->Q_Q10[     *smpl_buf_idx ]         = psSS->Q_Q10;
             psDD->Pred_Q15[  *smpl_buf_idx ]         = silk_LSHIFT32( psSS->LPC_exc_Q14, 1 );
             psDD->Shape_Q14[ *smpl_buf_idx ]         = psSS->sLTP_shp_Q14;
-            psDD->Seed                               = silk_ADD32_ovflw( psDD->Seed, silk_RSHIFT_ROUND( psSS->Q_Q10, 10 ) );
+            psDD->Seed                               = silk_ADD32_ovflw( psDD->Seed,
+            silk_RSHIFT_ROUND( psSS->Q_Q10, 10 ));
             psDD->RandState[ *smpl_buf_idx ]         = psDD->Seed;
             psDD->RD_Q10                             = psSS->RD_Q10;
         }
         delayedGain_Q10[     *smpl_buf_idx ]         = Gain_Q10;
     }
     /* Update LPC states */
-    for( k = 0; k < nStatesDelayedDecision; k++ ) {
+    for (k = 0; k < nStatesDelayedDecision; k++) {
         psDD = &psDelDec[ k ];
-        silk_memcpy( psDD->sLPC_Q14, &psDD->sLPC_Q14[ length ], NSQ_LPC_BUF_LENGTH * sizeof( oac_int32 ) );
+        silk_memcpy( psDD->sLPC_Q14, &psDD->sLPC_Q14[ length ], NSQ_LPC_BUF_LENGTH*sizeof(oac_int32));
     }
     RESTORE_STACK;
 }
@@ -787,22 +791,21 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
 static OAC_INLINE void silk_nsq_del_dec_scale_states_sse4_1(
     const silk_encoder_state *psEncC,               /* I    Encoder State                       */
     silk_nsq_state      *NSQ,                       /* I/O  NSQ state                           */
-    NSQ_del_dec_struct  psDelDec[],                 /* I/O  Delayed decision states             */
-    const oac_int16    x16[],                      /* I    Input                               */
-    oac_int32          x_sc_Q10[],                 /* O    Input scaled with 1/Gain in Q10     */
-    const oac_int16    sLTP[],                     /* I    Re-whitened LTP state in Q0         */
-    oac_int32          sLTP_Q15[],                 /* O    LTP state matching scaled input     */
-    oac_int            subfr,                      /* I    Subframe number                     */
-    oac_int            nStatesDelayedDecision,     /* I    Number of del dec states            */
-    const oac_int      LTP_scale_Q14,              /* I    LTP state scaling                   */
-    const oac_int32    Gains_Q16[ MAX_NB_SUBFR ],  /* I                                        */
-    const oac_int      pitchL[ MAX_NB_SUBFR ],     /* I    Pitch lag                           */
-    const oac_int      signal_type,                /* I    Signal type                         */
-    const oac_int      decisionDelay               /* I    Decision delay                      */
-)
-{
-    oac_int            i, k, lag;
-    oac_int32          gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
+    NSQ_del_dec_struct psDelDec[],                  /* I/O  Delayed decision states             */
+    const oac_int16 x16[],                         /* I    Input                               */
+    oac_int32 x_sc_Q10[],                          /* O    Input scaled with 1/Gain in Q10     */
+    const oac_int16 sLTP[],                        /* I    Re-whitened LTP state in Q0         */
+    oac_int32 sLTP_Q15[],                          /* O    LTP state matching scaled input     */
+    oac_int subfr,                                 /* I    Subframe number                     */
+    oac_int nStatesDelayedDecision,                /* I    Number of del dec states            */
+    const oac_int LTP_scale_Q14,                   /* I    LTP state scaling                   */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],     /* I                                        */
+    const oac_int pitchL[ MAX_NB_SUBFR ],          /* I    Pitch lag                           */
+    const oac_int signal_type,                     /* I    Signal type                         */
+    const oac_int decisionDelay                    /* I    Decision delay                      */
+    ) {
+    oac_int i, k, lag;
+    oac_int32 gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
     NSQ_del_dec_struct  *psDD;
     __m128i xmm_inv_gain_Q26, xmm_x16_x2x0, xmm_x16_x3x1;
 
@@ -816,11 +819,11 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states_sse4_1(
     /* prepare inv_gain_Q26 in packed 4 32-bits */
     xmm_inv_gain_Q26 = _mm_set1_epi32(inv_gain_Q26);
 
-    for( i = 0; i < psEncC->subfr_length - 3; i += 4 ) {
-        xmm_x16_x2x0 = OP_CVTEPI16_EPI32_M64( &(x16[ i ] ) );
+    for (i = 0; i < psEncC->subfr_length - 3; i += 4) {
+        xmm_x16_x2x0 = OP_CVTEPI16_EPI32_M64( &(x16[ i ]));
 
         /* equal shift right 4 bytes*/
-        xmm_x16_x3x1 = _mm_shuffle_epi32( xmm_x16_x2x0, _MM_SHUFFLE( 0, 3, 2, 1 ) );
+        xmm_x16_x3x1 = _mm_shuffle_epi32( xmm_x16_x2x0, _MM_SHUFFLE( 0, 3, 2, 1 ));
 
         xmm_x16_x2x0 = _mm_mul_epi32( xmm_x16_x2x0, xmm_inv_gain_Q26 );
         xmm_x16_x3x1 = _mm_mul_epi32( xmm_x16_x3x1, xmm_inv_gain_Q26 );
@@ -830,27 +833,27 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states_sse4_1(
 
         xmm_x16_x2x0 = _mm_blend_epi16( xmm_x16_x2x0, xmm_x16_x3x1, 0xCC );
 
-        _mm_storeu_si128( (__m128i *)(void*)(&(x_sc_Q10[ i ] ) ), xmm_x16_x2x0 );
+        _mm_storeu_si128((__m128i *)(void*)(&(x_sc_Q10[ i ])), xmm_x16_x2x0 );
     }
 
-    for( ; i < psEncC->subfr_length; i++ ) {
+    for ( ; i < psEncC->subfr_length; i++) {
         x_sc_Q10[ i ] = silk_SMULWW( x16[ i ], inv_gain_Q26 );
     }
 
     /* After rewhitening the LTP state is un-scaled, so scale with inv_gain_Q16 */
-    if( NSQ->rewhite_flag ) {
-        if( subfr == 0 ) {
+    if (NSQ->rewhite_flag) {
+        if (subfr == 0) {
             /* Do LTP downscaling */
             inv_gain_Q31 = silk_LSHIFT( silk_SMULWB( inv_gain_Q31, LTP_scale_Q14 ), 2 );
         }
-        for( i = NSQ->sLTP_buf_idx - lag - LTP_ORDER / 2; i < NSQ->sLTP_buf_idx; i++ ) {
+        for (i = NSQ->sLTP_buf_idx - lag - LTP_ORDER/2; i < NSQ->sLTP_buf_idx; i++) {
             silk_assert( i < MAX_FRAME_LENGTH );
             sLTP_Q15[ i ] = silk_SMULWB( inv_gain_Q31, sLTP[ i ] );
         }
     }
 
     /* Adjust for changing gain */
-    if( Gains_Q16[ subfr ] != NSQ->prev_gain_Q16 ) {
+    if (Gains_Q16[ subfr ] != NSQ->prev_gain_Q16) {
         gain_adj_Q16 =  silk_DIV32_varQ( NSQ->prev_gain_Q16, Gains_Q16[ subfr ], 16 );
 
         /* Scale long-term shaping state */
@@ -860,11 +863,10 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states_sse4_1(
             /* prepare gain_adj_Q16 in packed 4 32-bits */
             xmm_gain_adj_Q16 = _mm_set1_epi32( gain_adj_Q16 );
 
-            for( i = NSQ->sLTP_shp_buf_idx - psEncC->ltp_mem_length; i < NSQ->sLTP_shp_buf_idx - 3; i += 4 )
-            {
-                xmm_sLTP_shp_Q14_x2x0 = _mm_loadu_si128( (__m128i *)(void*)(&(NSQ->sLTP_shp_Q14[ i ] ) ) );
+            for (i = NSQ->sLTP_shp_buf_idx - psEncC->ltp_mem_length; i < NSQ->sLTP_shp_buf_idx - 3; i += 4) {
+                xmm_sLTP_shp_Q14_x2x0 = _mm_loadu_si128((__m128i *)(void*)(&(NSQ->sLTP_shp_Q14[ i ])));
                 /* equal shift right 4 bytes*/
-                xmm_sLTP_shp_Q14_x3x1 = _mm_shuffle_epi32( xmm_sLTP_shp_Q14_x2x0, _MM_SHUFFLE( 0, 3, 2, 1 ) );
+                xmm_sLTP_shp_Q14_x3x1 = _mm_shuffle_epi32( xmm_sLTP_shp_Q14_x2x0, _MM_SHUFFLE( 0, 3, 2, 1 ));
 
                 xmm_sLTP_shp_Q14_x2x0 = _mm_mul_epi32( xmm_sLTP_shp_Q14_x2x0, xmm_gain_adj_Q16 );
                 xmm_sLTP_shp_Q14_x3x1 = _mm_mul_epi32( xmm_sLTP_shp_Q14_x3x1, xmm_gain_adj_Q16 );
@@ -874,21 +876,21 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states_sse4_1(
 
                 xmm_sLTP_shp_Q14_x2x0 = _mm_blend_epi16( xmm_sLTP_shp_Q14_x2x0, xmm_sLTP_shp_Q14_x3x1, 0xCC );
 
-                _mm_storeu_si128( (__m128i *)(void*)(&(NSQ->sLTP_shp_Q14[ i ] ) ), xmm_sLTP_shp_Q14_x2x0 );
+                _mm_storeu_si128((__m128i *)(void*)(&(NSQ->sLTP_shp_Q14[ i ])), xmm_sLTP_shp_Q14_x2x0 );
             }
 
-            for( ; i < NSQ->sLTP_shp_buf_idx; i++ ) {
+            for ( ; i < NSQ->sLTP_shp_buf_idx; i++) {
                 NSQ->sLTP_shp_Q14[ i ] = silk_SMULWW( gain_adj_Q16, NSQ->sLTP_shp_Q14[ i ] );
             }
 
             /* Scale long-term prediction state */
-            if( signal_type == TYPE_VOICED && NSQ->rewhite_flag == 0 ) {
-                for( i = NSQ->sLTP_buf_idx - lag - LTP_ORDER / 2; i < NSQ->sLTP_buf_idx - decisionDelay; i++ ) {
+            if (signal_type == TYPE_VOICED && NSQ->rewhite_flag == 0) {
+                for (i = NSQ->sLTP_buf_idx - lag - LTP_ORDER/2; i < NSQ->sLTP_buf_idx - decisionDelay; i++) {
                     sLTP_Q15[ i ] = silk_SMULWW( gain_adj_Q16, sLTP_Q15[ i ] );
                 }
             }
 
-            for( k = 0; k < nStatesDelayedDecision; k++ ) {
+            for (k = 0; k < nStatesDelayedDecision; k++) {
                 psDD = &psDelDec[ k ];
 
                 /* Scale scalar states */
@@ -896,13 +898,13 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states_sse4_1(
                 psDD->Diff_Q14 = silk_SMULWW( gain_adj_Q16, psDD->Diff_Q14 );
 
                 /* Scale short-term prediction and shaping states */
-                for( i = 0; i < NSQ_LPC_BUF_LENGTH; i++ ) {
+                for (i = 0; i < NSQ_LPC_BUF_LENGTH; i++) {
                     psDD->sLPC_Q14[ i ] = silk_SMULWW( gain_adj_Q16, psDD->sLPC_Q14[ i ] );
                 }
-                for( i = 0; i < MAX_SHAPE_LPC_ORDER; i++ ) {
+                for (i = 0; i < MAX_SHAPE_LPC_ORDER; i++) {
                     psDD->sAR2_Q14[ i ] = silk_SMULWW( gain_adj_Q16, psDD->sAR2_Q14[ i ] );
                 }
-                for( i = 0; i < DECISION_DELAY; i++ ) {
+                for (i = 0; i < DECISION_DELAY; i++) {
                     psDD->Pred_Q15[  i ] = silk_SMULWW( gain_adj_Q16, psDD->Pred_Q15[  i ] );
                     psDD->Shape_Q14[ i ] = silk_SMULWW( gain_adj_Q16, psDD->Shape_Q14[ i ] );
                 }
diff --git a/silk/x86/NSQ_sse4_1.c b/silk/x86/NSQ_sse4_1.c
index 826723401..683be4a78 100644
--- a/silk/x86/NSQ_sse4_1.c
+++ b/silk/x86/NSQ_sse4_1.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <xmmintrin.h>
@@ -39,68 +39,67 @@
 static OAC_INLINE void silk_nsq_scale_states_sse4_1(
     const silk_encoder_state *psEncC,              /* I    Encoder State                   */
     silk_nsq_state      *NSQ,                      /* I/O  NSQ state                       */
-    const oac_int16    x16[],                     /* I    input                           */
-    oac_int32          x_sc_Q10[],                /* O    input scaled with 1/Gain        */
-    const oac_int16    sLTP[],                    /* I    re-whitened LTP state in Q0     */
-    oac_int32          sLTP_Q15[],                /* O    LTP state matching scaled input */
-    oac_int            subfr,                     /* I    subframe number                 */
-    const oac_int      LTP_scale_Q14,             /* I                                    */
-    const oac_int32    Gains_Q16[ MAX_NB_SUBFR ], /* I                                    */
-    const oac_int      pitchL[ MAX_NB_SUBFR ],    /* I    Pitch lag                       */
-    const oac_int      signal_type                /* I    Signal type                     */
-);
+    const oac_int16 x16[],                        /* I    input                           */
+    oac_int32 x_sc_Q10[],                         /* O    input scaled with 1/Gain        */
+    const oac_int16 sLTP[],                       /* I    re-whitened LTP state in Q0     */
+    oac_int32 sLTP_Q15[],                         /* O    LTP state matching scaled input */
+    oac_int subfr,                                /* I    subframe number                 */
+    const oac_int LTP_scale_Q14,                  /* I                                    */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],    /* I                                    */
+    const oac_int pitchL[ MAX_NB_SUBFR ],         /* I    Pitch lag                       */
+    const oac_int signal_type                     /* I    Signal type                     */
+    );
 
 static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                       */
-    oac_int            signalType,             /* I    Signal type                     */
-    const oac_int32    x_sc_Q10[],             /* I                                    */
-    oac_int8           pulses[],               /* O                                    */
-    oac_int16          xq[],                   /* O                                    */
-    oac_int32          sLTP_Q15[],             /* I/O  LTP state                       */
-    const oac_int16    a_Q12[],                /* I    Short term prediction coefs     */
-    const oac_int16    b_Q14[],                /* I    Long term prediction coefs      */
-    const oac_int16    AR_shp_Q13[],           /* I    Noise shaping AR coefs          */
-    oac_int            lag,                    /* I    Pitch lag                       */
-    oac_int32          HarmShapeFIRPacked_Q14, /* I                                    */
-    oac_int            Tilt_Q14,               /* I    Spectral tilt                   */
-    oac_int32          LF_shp_Q14,             /* I                                    */
-    oac_int32          Gain_Q16,               /* I                                    */
-    oac_int            Lambda_Q10,             /* I                                    */
-    oac_int            offset_Q10,             /* I                                    */
-    oac_int            length,                 /* I    Input length                    */
-    oac_int32          table[][4]              /* I                                    */
-);
+    oac_int signalType,                        /* I    Signal type                     */
+    const oac_int32 x_sc_Q10[],                /* I                                    */
+    oac_int8 pulses[],                         /* O                                    */
+    oac_int16 xq[],                            /* O                                    */
+    oac_int32 sLTP_Q15[],                      /* I/O  LTP state                       */
+    const oac_int16 a_Q12[],                   /* I    Short term prediction coefs     */
+    const oac_int16 b_Q14[],                   /* I    Long term prediction coefs      */
+    const oac_int16 AR_shp_Q13[],              /* I    Noise shaping AR coefs          */
+    oac_int lag,                               /* I    Pitch lag                       */
+    oac_int32 HarmShapeFIRPacked_Q14,          /* I                                    */
+    oac_int Tilt_Q14,                          /* I    Spectral tilt                   */
+    oac_int32 LF_shp_Q14,                      /* I                                    */
+    oac_int32 Gain_Q16,                        /* I                                    */
+    oac_int Lambda_Q10,                        /* I                                    */
+    oac_int offset_Q10,                        /* I                                    */
+    oac_int length,                            /* I    Input length                    */
+    oac_int32 table[][4]                       /* I                                    */
+    );
 
 void silk_NSQ_sse4_1(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const oac_int16            x16[],                                        /* I    Input                           */
-    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16 x16[],                                                   /* I    Input                           */
+    oac_int8 pulses[],                                                       /* O    Quantized pulse signal          */
     const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
-)
-{
-    oac_int            k, lag, start_idx, LSF_interpolation_flag;
+    const oac_int16 LTPCoef_Q14[ LTP_ORDER*MAX_NB_SUBFR ],                   /* I    Long term prediction coefs      */
+    const oac_int16 AR_Q13[ MAX_NB_SUBFR*MAX_SHAPE_LPC_ORDER ],              /* I    Noise shaping coefs             */
+    const oac_int HarmShapeGain_Q14[ MAX_NB_SUBFR ],                         /* I    Long term shaping coefs         */
+    const oac_int Tilt_Q14[ MAX_NB_SUBFR ],                                  /* I    Spectral tilt                   */
+    const oac_int32 LF_shp_Q14[ MAX_NB_SUBFR ],                              /* I    Low frequency shaping coefs     */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],                               /* I    Quantization step sizes         */
+    const oac_int pitchL[ MAX_NB_SUBFR ],                                    /* I    Pitch lags                      */
+    const oac_int Lambda_Q10,                                                /* I    Rate/distortion tradeoff        */
+    const oac_int LTP_scale_Q14                                              /* I    LTP state scaling               */
+    ) {
+    oac_int k, lag, start_idx, LSF_interpolation_flag;
     const oac_int16    *A_Q12, *B_Q14, *AR_shp_Q13;
     oac_int16          *pxq;
     VARDECL( oac_int32, sLTP_Q15 );
     VARDECL( oac_int16, sLTP );
-    oac_int32          HarmShapeFIRPacked_Q14;
-    oac_int            offset_Q10;
+    oac_int32 HarmShapeFIRPacked_Q14;
+    oac_int offset_Q10;
     VARDECL( oac_int32, x_sc_Q10 );
 
-    oac_int32   table[ 64 ][ 4 ];
-    oac_int32   tmp1;
-    oac_int32   q1_Q10, q2_Q10, rd1_Q20, rd2_Q20;
+    oac_int32 table[ 64 ][ 4 ];
+    oac_int32 tmp1;
+    oac_int32 q1_Q10, q2_Q10, rd1_Q20, rd2_Q20;
 
 #ifdef OAC_CHECK_ASM
     silk_nsq_state NSQ_c;
@@ -113,10 +112,10 @@ void silk_NSQ_sse4_1(
 
 #ifdef OAC_CHECK_ASM
     ( void )pulses_a;
-    silk_memcpy( &NSQ_c, NSQ, sizeof( NSQ_c ) );
-    silk_memcpy( &psIndices_c, psIndices, sizeof( psIndices_c ) );
-    silk_assert( psEncC->nb_subfr * psEncC->subfr_length <= MAX_FRAME_LENGTH );
-    silk_memcpy( pulses_c, pulses, psEncC->nb_subfr * psEncC->subfr_length * sizeof( pulses[0] ) );
+    silk_memcpy( &NSQ_c, NSQ, sizeof(NSQ_c));
+    silk_memcpy( &psIndices_c, psIndices, sizeof(psIndices_c));
+    silk_assert( psEncC->nb_subfr*psEncC->subfr_length <= MAX_FRAME_LENGTH );
+    silk_memcpy( pulses_c, pulses, psEncC->nb_subfr*psEncC->subfr_length*sizeof(pulses[0]));
 
     silk_NSQ_c(
         psEncC,
@@ -134,7 +133,7 @@ void silk_NSQ_sse4_1(
         pitchL,
         Lambda_Q10,
         LTP_scale_Q14
-    );
+        );
 #endif
 
     NSQ->rand_seed = psIndices->Seed;
@@ -144,63 +143,61 @@ void silk_NSQ_sse4_1(
 
     silk_assert( NSQ->prev_gain_Q16 != 0 );
 
-    offset_Q10 = silk_Quantization_Offsets_Q10[ psIndices->signalType >> 1 ][ psIndices->quantOffsetType ];
+    offset_Q10 = silk_Quantization_Offsets_Q10[ psIndices->signalType>>1 ][ psIndices->quantOffsetType ];
 
     /* 0 */
     q1_Q10  = offset_Q10;
-    q2_Q10  = offset_Q10 + ( 1024 - QUANT_LEVEL_ADJUST_Q10 );
-    rd1_Q20 = q1_Q10 * Lambda_Q10;
-    rd2_Q20 = q2_Q10 * Lambda_Q10;
+    q2_Q10  = offset_Q10 + (1024 - QUANT_LEVEL_ADJUST_Q10);
+    rd1_Q20 = q1_Q10*Lambda_Q10;
+    rd2_Q20 = q2_Q10*Lambda_Q10;
 
     table[ 32 ][ 0 ] = q1_Q10;
     table[ 32 ][ 1 ] = q2_Q10;
-    table[ 32 ][ 2 ] = 2 * (q1_Q10 - q2_Q10);
-    table[ 32 ][ 3 ] = (rd1_Q20 - rd2_Q20) + (q1_Q10 * q1_Q10 - q2_Q10 * q2_Q10);
+    table[ 32 ][ 2 ] = 2*(q1_Q10 - q2_Q10);
+    table[ 32 ][ 3 ] = (rd1_Q20 - rd2_Q20) + (q1_Q10*q1_Q10 - q2_Q10*q2_Q10);
 
     /* -1 */
-    q1_Q10  = offset_Q10 - ( 1024 - QUANT_LEVEL_ADJUST_Q10 );
+    q1_Q10  = offset_Q10 - (1024 - QUANT_LEVEL_ADJUST_Q10);
     q2_Q10  = offset_Q10;
-    rd1_Q20 = - q1_Q10 * Lambda_Q10;
-    rd2_Q20 = q2_Q10 * Lambda_Q10;
+    rd1_Q20 = -q1_Q10*Lambda_Q10;
+    rd2_Q20 = q2_Q10*Lambda_Q10;
 
     table[ 31 ][ 0 ] = q1_Q10;
     table[ 31 ][ 1 ] = q2_Q10;
-    table[ 31 ][ 2 ] = 2 * (q1_Q10 - q2_Q10);
-    table[ 31 ][ 3 ] = (rd1_Q20 - rd2_Q20) + (q1_Q10 * q1_Q10 - q2_Q10 * q2_Q10);
+    table[ 31 ][ 2 ] = 2*(q1_Q10 - q2_Q10);
+    table[ 31 ][ 3 ] = (rd1_Q20 - rd2_Q20) + (q1_Q10*q1_Q10 - q2_Q10*q2_Q10);
 
     /* > 0 */
-    for (k = 1; k <= 31; k++)
-    {
+    for (k = 1; k <= 31; k++) {
         tmp1 = offset_Q10 + silk_LSHIFT( k, 10 );
 
         q1_Q10  = tmp1 - QUANT_LEVEL_ADJUST_Q10;
         q2_Q10  = tmp1 - QUANT_LEVEL_ADJUST_Q10 + 1024;
-        rd1_Q20 = q1_Q10 * Lambda_Q10;
-        rd2_Q20 = q2_Q10 * Lambda_Q10;
+        rd1_Q20 = q1_Q10*Lambda_Q10;
+        rd2_Q20 = q2_Q10*Lambda_Q10;
 
         table[ 32 + k ][ 0 ] = q1_Q10;
         table[ 32 + k ][ 1 ] = q2_Q10;
-        table[ 32 + k ][ 2 ] = 2 * (q1_Q10 - q2_Q10);
-        table[ 32 + k ][ 3 ] = (rd1_Q20 - rd2_Q20) + (q1_Q10 * q1_Q10 - q2_Q10 * q2_Q10);
+        table[ 32 + k ][ 2 ] = 2*(q1_Q10 - q2_Q10);
+        table[ 32 + k ][ 3 ] = (rd1_Q20 - rd2_Q20) + (q1_Q10*q1_Q10 - q2_Q10*q2_Q10);
     }
 
     /* < -1 */
-    for (k = -32; k <= -2; k++)
-    {
+    for (k = -32; k <= -2; k++) {
         tmp1 = offset_Q10 + silk_LSHIFT( k, 10 );
 
         q1_Q10  = tmp1 + QUANT_LEVEL_ADJUST_Q10;
         q2_Q10  = tmp1 + QUANT_LEVEL_ADJUST_Q10 + 1024;
-        rd1_Q20 = - q1_Q10 * Lambda_Q10;
-        rd2_Q20 = - q2_Q10 * Lambda_Q10;
+        rd1_Q20 = -q1_Q10*Lambda_Q10;
+        rd2_Q20 = -q2_Q10*Lambda_Q10;
 
         table[ 32 + k ][ 0 ] = q1_Q10;
         table[ 32 + k ][ 1 ] = q2_Q10;
-        table[ 32 + k ][ 2 ] = 2 * (q1_Q10 - q2_Q10);
-        table[ 32 + k ][ 3 ] = (rd1_Q20 - rd2_Q20) + (q1_Q10 * q1_Q10 - q2_Q10 * q2_Q10);
+        table[ 32 + k ][ 2 ] = 2*(q1_Q10 - q2_Q10);
+        table[ 32 + k ][ 3 ] = (rd1_Q20 - rd2_Q20) + (q1_Q10*q1_Q10 - q2_Q10*q2_Q10);
     }
 
-    if( psIndices->NLSFInterpCoef_Q2 == 4 ) {
+    if (psIndices->NLSFInterpCoef_Q2 == 4) {
         LSF_interpolation_flag = 0;
     } else {
         LSF_interpolation_flag = 1;
@@ -213,28 +210,28 @@ void silk_NSQ_sse4_1(
     NSQ->sLTP_shp_buf_idx = psEncC->ltp_mem_length;
     NSQ->sLTP_buf_idx     = psEncC->ltp_mem_length;
     pxq                   = &NSQ->xq[ psEncC->ltp_mem_length ];
-    for( k = 0; k < psEncC->nb_subfr; k++ ) {
-        A_Q12      = &PredCoef_Q12[ (( k >> 1 ) | ( 1 - LSF_interpolation_flag )) * MAX_LPC_ORDER ];
-        B_Q14      = &LTPCoef_Q14[ k * LTP_ORDER ];
-        AR_shp_Q13 = &AR_Q13[ k * MAX_SHAPE_LPC_ORDER ];
+    for (k = 0; k < psEncC->nb_subfr; k++) {
+        A_Q12      = &PredCoef_Q12[ ((k>>1)|(1 - LSF_interpolation_flag))*MAX_LPC_ORDER ];
+        B_Q14      = &LTPCoef_Q14[ k*LTP_ORDER ];
+        AR_shp_Q13 = &AR_Q13[ k*MAX_SHAPE_LPC_ORDER ];
 
         /* Noise shape parameters */
         silk_assert( HarmShapeGain_Q14[ k ] >= 0 );
         HarmShapeFIRPacked_Q14  =                          silk_RSHIFT( HarmShapeGain_Q14[ k ], 2 );
-        HarmShapeFIRPacked_Q14 |= silk_LSHIFT( (oac_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
+        HarmShapeFIRPacked_Q14 |= silk_LSHIFT((oac_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 );
 
         NSQ->rewhite_flag = 0;
-        if( psIndices->signalType == TYPE_VOICED ) {
+        if (psIndices->signalType == TYPE_VOICED) {
             /* Voiced */
             lag = pitchL[ k ];
 
             /* Re-whitening */
-            if( ( k & ( 3 - silk_LSHIFT( LSF_interpolation_flag, 1 ) ) ) == 0 ) {
+            if ((k&(3 - silk_LSHIFT( LSF_interpolation_flag, 1 ))) == 0) {
                 /* Rewhiten with new A coefs */
-                start_idx = psEncC->ltp_mem_length - lag - psEncC->predictLPCOrder - LTP_ORDER / 2;
+                start_idx = psEncC->ltp_mem_length - lag - psEncC->predictLPCOrder - LTP_ORDER/2;
                 celt_assert( start_idx > 0 );
 
-                silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k * psEncC->subfr_length ],
+                silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k*psEncC->subfr_length ],
                     A_Q12, psEncC->ltp_mem_length - start_idx, psEncC->predictLPCOrder, psEncC->arch );
 
                 NSQ->rewhite_flag = 1;
@@ -242,16 +239,15 @@ void silk_NSQ_sse4_1(
             }
         }
 
-        silk_nsq_scale_states_sse4_1( psEncC, NSQ, x16, x_sc_Q10, sLTP, sLTP_Q15, k, LTP_scale_Q14, Gains_Q16, pitchL, psIndices->signalType );
+        silk_nsq_scale_states_sse4_1( psEncC, NSQ, x16, x_sc_Q10, sLTP, sLTP_Q15, k, LTP_scale_Q14, Gains_Q16, pitchL,
+        psIndices->signalType );
 
-        if ( oac_likely( ( 10 == psEncC->shapingLPCOrder ) && ( 16 == psEncC->predictLPCOrder) ) )
-        {
-            silk_noise_shape_quantizer_10_16_sse4_1( NSQ, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15, A_Q12, B_Q14,
+        if (oac_likely((10 == psEncC->shapingLPCOrder) && (16 == psEncC->predictLPCOrder))) {
+            silk_noise_shape_quantizer_10_16_sse4_1( NSQ, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15, A_Q12,
+            B_Q14,
                 AR_shp_Q13, lag, HarmShapeFIRPacked_Q14, Tilt_Q14[ k ], LF_shp_Q14[ k ], Gains_Q16[ k ], Lambda_Q10,
-                offset_Q10, psEncC->subfr_length, &(table[32]) );
-        }
-        else
-        {
+                offset_Q10, psEncC->subfr_length, &(table[32]));
+        } else {
             silk_noise_shape_quantizer( NSQ, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15, A_Q12, B_Q14,
                 AR_shp_Q13, lag, HarmShapeFIRPacked_Q14, Tilt_Q14[ k ], LF_shp_Q14[ k ], Gains_Q16[ k ], Lambda_Q10,
                 offset_Q10, psEncC->subfr_length, psEncC->shapingLPCOrder, psEncC->predictLPCOrder, psEncC->arch );
@@ -266,13 +262,15 @@ void silk_NSQ_sse4_1(
     NSQ->lagPrev = pitchL[ psEncC->nb_subfr - 1 ];
 
     /* Save quantized speech and noise shaping signals */
-    silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( oac_int16 ) );
-    silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( oac_int32 ) );
+    silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ],
+    psEncC->ltp_mem_length*sizeof(oac_int16));
+    silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ],
+    psEncC->ltp_mem_length*sizeof(oac_int32));
 
 #ifdef OAC_CHECK_ASM
-    silk_assert( !memcmp( &NSQ_c, NSQ, sizeof( NSQ_c ) ) );
-    silk_assert( !memcmp( &psIndices_c, psIndices, sizeof( psIndices_c ) ) );
-    silk_assert( !memcmp( pulses_c, pulses_a, psEncC->nb_subfr * psEncC->subfr_length * sizeof( pulses[0] ) ) );
+    silk_assert( !memcmp( &NSQ_c, NSQ, sizeof(NSQ_c)));
+    silk_assert( !memcmp( &psIndices_c, psIndices, sizeof(psIndices_c)));
+    silk_assert( !memcmp( pulses_c, pulses_a, psEncC->nb_subfr*psEncC->subfr_length*sizeof(pulses[0])));
 #endif
 
     RESTORE_STACK;
@@ -283,30 +281,29 @@ void silk_NSQ_sse4_1(
 /************************************/
 static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                       */
-    oac_int            signalType,             /* I    Signal type                     */
-    const oac_int32    x_sc_Q10[],             /* I                                    */
-    oac_int8           pulses[],               /* O                                    */
-    oac_int16          xq[],                   /* O                                    */
-    oac_int32          sLTP_Q15[],             /* I/O  LTP state                       */
-    const oac_int16    a_Q12[],                /* I    Short term prediction coefs     */
-    const oac_int16    b_Q14[],                /* I    Long term prediction coefs      */
-    const oac_int16    AR_shp_Q13[],           /* I    Noise shaping AR coefs          */
-    oac_int            lag,                    /* I    Pitch lag                       */
-    oac_int32          HarmShapeFIRPacked_Q14, /* I                                    */
-    oac_int            Tilt_Q14,               /* I    Spectral tilt                   */
-    oac_int32          LF_shp_Q14,             /* I                                    */
-    oac_int32          Gain_Q16,               /* I                                    */
-    oac_int            Lambda_Q10,             /* I                                    */
-    oac_int            offset_Q10,             /* I                                    */
-    oac_int            length,                 /* I    Input length                    */
-    oac_int32          table[][4]              /* I                                    */
-)
-{
-    oac_int     i;
-    oac_int32   LTP_pred_Q13, LPC_pred_Q10, n_AR_Q12, n_LTP_Q13;
-    oac_int32   n_LF_Q12, r_Q10, q1_Q0, q1_Q10, q2_Q10;
-    oac_int32   exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10, sDiff_shp_Q14;
-    oac_int32   tmp1, tmp2, sLF_AR_shp_Q14;
+    oac_int signalType,                        /* I    Signal type                     */
+    const oac_int32 x_sc_Q10[],                /* I                                    */
+    oac_int8 pulses[],                         /* O                                    */
+    oac_int16 xq[],                            /* O                                    */
+    oac_int32 sLTP_Q15[],                      /* I/O  LTP state                       */
+    const oac_int16 a_Q12[],                   /* I    Short term prediction coefs     */
+    const oac_int16 b_Q14[],                   /* I    Long term prediction coefs      */
+    const oac_int16 AR_shp_Q13[],              /* I    Noise shaping AR coefs          */
+    oac_int lag,                               /* I    Pitch lag                       */
+    oac_int32 HarmShapeFIRPacked_Q14,          /* I                                    */
+    oac_int Tilt_Q14,                          /* I    Spectral tilt                   */
+    oac_int32 LF_shp_Q14,                      /* I                                    */
+    oac_int32 Gain_Q16,                        /* I                                    */
+    oac_int Lambda_Q10,                        /* I                                    */
+    oac_int offset_Q10,                        /* I                                    */
+    oac_int length,                            /* I    Input length                    */
+    oac_int32 table[][4]                       /* I                                    */
+    ) {
+    oac_int i;
+    oac_int32 LTP_pred_Q13, LPC_pred_Q10, n_AR_Q12, n_LTP_Q13;
+    oac_int32 n_LF_Q12, r_Q10, q1_Q0, q1_Q10, q2_Q10;
+    oac_int32 exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10, sDiff_shp_Q14;
+    oac_int32 tmp1, tmp2, sLF_AR_shp_Q14;
     oac_int32   *psLPC_Q14, *shp_lag_ptr, *pred_lag_ptr;
 
     __m128i xmm_tempa, xmm_tempb;
@@ -320,10 +317,10 @@ static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
     __m128i sAR2_Q14_hi_76543210, sAR2_Q14_lo_76543210;
     __m128i AR_shp_Q13_76543210;
 
-    int rdo_offset = (Lambda_Q10 >> 1) - 512;
+    int rdo_offset = (Lambda_Q10>>1) - 512;
 
-    shp_lag_ptr  = &NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS / 2 ];
-    pred_lag_ptr = &sLTP_Q15[ NSQ->sLTP_buf_idx - lag + LTP_ORDER / 2 ];
+    shp_lag_ptr  = &NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS/2 ];
+    pred_lag_ptr = &sLTP_Q15[ NSQ->sLTP_buf_idx - lag + LTP_ORDER/2 ];
     Gain_Q10     = silk_RSHIFT( Gain_Q16, 6 );
 
     /* Set up short term AR state */
@@ -338,21 +335,21 @@ static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
     xmm_one = _mm_set_epi8( 1, 0, 3, 2, 5, 4, 7, 6, 9, 8, 11, 10, 13, 12, 15, 14 );
 
     /* load a_Q12[0] - a_Q12[7] */
-    a_Q12_01234567 = _mm_loadu_si128( (__m128i *)(void*)(&a_Q12[ 0 ] ) );
+    a_Q12_01234567 = _mm_loadu_si128((__m128i *)(void*)(&a_Q12[ 0 ]));
     /* load a_Q12[ 8 ] - a_Q12[ 15 ] */
-    a_Q12_89ABCDEF = _mm_loadu_si128( (__m128i *)(void*)(&a_Q12[ 8 ] ) );
+    a_Q12_89ABCDEF = _mm_loadu_si128((__m128i *)(void*)(&a_Q12[ 8 ]));
 
     a_Q12_01234567 = _mm_shuffle_epi8( a_Q12_01234567, xmm_one );
     a_Q12_89ABCDEF = _mm_shuffle_epi8( a_Q12_89ABCDEF, xmm_one );
 
     /* load AR_shp_Q13 */
-    AR_shp_Q13_76543210 = _mm_loadu_si128( (__m128i *)(void*)(&AR_shp_Q13[0] ) );
+    AR_shp_Q13_76543210 = _mm_loadu_si128((__m128i *)(void*)(&AR_shp_Q13[0]));
 
     /* load psLPC_Q14 */
     xmm_one = _mm_set_epi8(15, 14, 11, 10, 7, 6, 3, 2, 13, 12, 9, 8, 5, 4, 1, 0 );
 
-    xmm_tempa = _mm_loadu_si128( (__m128i *)(void*)(&psLPC_Q14[-16]) );
-    xmm_tempb = _mm_loadu_si128( (__m128i *)(void*)(&psLPC_Q14[-12]) );
+    xmm_tempa = _mm_loadu_si128((__m128i *)(void*)(&psLPC_Q14[-16]));
+    xmm_tempb = _mm_loadu_si128((__m128i *)(void*)(&psLPC_Q14[-12]));
 
     xmm_tempa = _mm_shuffle_epi8( xmm_tempa, xmm_one );
     xmm_tempb = _mm_shuffle_epi8( xmm_tempb, xmm_one );
@@ -360,8 +357,8 @@ static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
     psLPC_Q14_hi_89ABCDEF = _mm_unpackhi_epi64( xmm_tempa, xmm_tempb );
     psLPC_Q14_lo_89ABCDEF = _mm_unpacklo_epi64( xmm_tempa, xmm_tempb );
 
-    xmm_tempa = _mm_loadu_si128( (__m128i *)(void*)(&psLPC_Q14[ -8 ]) );
-    xmm_tempb = _mm_loadu_si128( (__m128i *)(void*)(&psLPC_Q14[ -4 ]) );
+    xmm_tempa = _mm_loadu_si128((__m128i *)(void*)(&psLPC_Q14[ -8 ]));
+    xmm_tempb = _mm_loadu_si128((__m128i *)(void*)(&psLPC_Q14[ -4 ]));
 
     xmm_tempa = _mm_shuffle_epi8( xmm_tempa, xmm_one );
     xmm_tempb = _mm_shuffle_epi8( xmm_tempb, xmm_one );
@@ -370,8 +367,8 @@ static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
     psLPC_Q14_lo_01234567 = _mm_unpacklo_epi64( xmm_tempa, xmm_tempb );
 
     /* load sAR2_Q14 */
-    xmm_tempa = _mm_loadu_si128( (__m128i *)(void*)(&(NSQ->sAR2_Q14[ 0 ]) ) );
-    xmm_tempb = _mm_loadu_si128( (__m128i *)(void*)(&(NSQ->sAR2_Q14[ 4 ]) ) );
+    xmm_tempa = _mm_loadu_si128((__m128i *)(void*)(&(NSQ->sAR2_Q14[ 0 ])));
+    xmm_tempb = _mm_loadu_si128((__m128i *)(void*)(&(NSQ->sAR2_Q14[ 4 ])));
 
     xmm_tempa = _mm_shuffle_epi8( xmm_tempa, xmm_one );
     xmm_tempb = _mm_shuffle_epi8( xmm_tempb, xmm_one );
@@ -382,8 +379,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
     /* prepare 1 in 8 * 16bit */
     xmm_one = _mm_set1_epi16(1);
 
-    for( i = 0; i < length; i++ )
-    {
+    for (i = 0; i < length; i++) {
         /* Short-term prediction */
         __m128i xmm_hi_07, xmm_hi_8F, xmm_lo_07, xmm_lo_8F;
 
@@ -397,7 +393,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
         psLPC_Q14_hi_01234567 = _mm_srli_si128( psLPC_Q14_hi_01234567, 2 );
         psLPC_Q14_lo_01234567 = _mm_srli_si128( psLPC_Q14_lo_01234567, 2 );
 
-        psLPC_Q14_hi_01234567 = _mm_insert_epi16( psLPC_Q14_hi_01234567, (xq_Q14 >> 16), 7 );
+        psLPC_Q14_hi_01234567 = _mm_insert_epi16( psLPC_Q14_hi_01234567, (xq_Q14>>16), 7 );
         psLPC_Q14_lo_01234567 = _mm_insert_epi16( psLPC_Q14_lo_01234567, (xq_Q14),       7 );
 
         /* high part, use pmaddwd, results in 4 32-bit */
@@ -426,13 +422,13 @@ static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
 
         xmm_hi_07 = _mm_add_epi32( xmm_hi_07, xmm_lo_07 );
 
-        xmm_hi_07 = _mm_add_epi32( xmm_hi_07, _mm_unpackhi_epi64(xmm_hi_07, xmm_hi_07 ) );
-        xmm_hi_07 = _mm_add_epi32( xmm_hi_07, _mm_shufflelo_epi16(xmm_hi_07, 0x0E ) );
+        xmm_hi_07 = _mm_add_epi32( xmm_hi_07, _mm_unpackhi_epi64(xmm_hi_07, xmm_hi_07 ));
+        xmm_hi_07 = _mm_add_epi32( xmm_hi_07, _mm_shufflelo_epi16(xmm_hi_07, 0x0E ));
 
         LPC_pred_Q10 += _mm_cvtsi128_si32( xmm_hi_07 );
 
         /* Long-term prediction */
-        if ( oac_likely( signalType == TYPE_VOICED ) ) {
+        if (oac_likely( signalType == TYPE_VOICED )) {
             /* Unrolled loop */
             /* Avoids introducing a bias because silk_SMLAWB() always rounds to -inf */
             LTP_pred_Q13 = 2;
@@ -443,7 +439,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
                 b_Q14_0123 = _mm_shuffle_epi32( b_Q14_3210, 0x1B );
 
                 /* loaded: [0] [-1] [-2] [-3] */
-                pred_lag_ptr_0123 = _mm_loadu_si128( (__m128i *)(void*)(&pred_lag_ptr[ -3 ] ) );
+                pred_lag_ptr_0123 = _mm_loadu_si128((__m128i *)(void*)(&pred_lag_ptr[ -3 ]));
                 /* shuffle to [-3] [-2] [-1] [0] and to new xmm */
                 xmm_tempa = _mm_shuffle_epi32( pred_lag_ptr_0123, 0x1B );
                 /*64-bit multiply, a[2] * b[-2], a[0] * b[0] */
@@ -457,7 +453,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
 
                 pred_lag_ptr_0123 = _mm_add_epi32( pred_lag_ptr_0123, xmm_tempa );
                 /* equal shift right 8 bytes*/
-                xmm_tempa = _mm_shuffle_epi32( pred_lag_ptr_0123, _MM_SHUFFLE( 0, 0, 3, 2 ) );
+                xmm_tempa = _mm_shuffle_epi32( pred_lag_ptr_0123, _MM_SHUFFLE( 0, 0, 3, 2 ));
                 xmm_tempa = _mm_add_epi32( xmm_tempa, pred_lag_ptr_0123 );
 
                 LTP_pred_Q13 += _mm_cvtsi128_si32( xmm_tempa );
@@ -469,12 +465,13 @@ static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
 
         /* Noise shape feedback */
         NSQ->sAR2_Q14[ 9 ] = NSQ->sAR2_Q14[ 8 ];
-        NSQ->sAR2_Q14[ 8 ] = _mm_cvtsi128_si32( _mm_srli_si128(_mm_unpackhi_epi16( sAR2_Q14_lo_76543210, sAR2_Q14_hi_76543210 ), 12 ) );
+        NSQ->sAR2_Q14[ 8 ] = _mm_cvtsi128_si32( _mm_srli_si128(_mm_unpackhi_epi16( sAR2_Q14_lo_76543210,
+        sAR2_Q14_hi_76543210 ), 12 ));
 
         sAR2_Q14_hi_76543210 = _mm_slli_si128( sAR2_Q14_hi_76543210, 2 );
         sAR2_Q14_lo_76543210 = _mm_slli_si128( sAR2_Q14_lo_76543210, 2 );
 
-        sAR2_Q14_hi_76543210 = _mm_insert_epi16( sAR2_Q14_hi_76543210, (sDiff_shp_Q14 >> 16), 0 );
+        sAR2_Q14_hi_76543210 = _mm_insert_epi16( sAR2_Q14_hi_76543210, (sDiff_shp_Q14>>16), 0 );
         sAR2_Q14_lo_76543210 = _mm_insert_epi16( sAR2_Q14_lo_76543210, (sDiff_shp_Q14),       0 );
 
         /* high part, use pmaddwd, results in 4 32-bit */
@@ -492,8 +489,8 @@ static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
         /* accumulate */
         xmm_hi_07 = _mm_add_epi32( xmm_hi_07, xmm_lo_07 );
 
-        xmm_hi_07 = _mm_add_epi32( xmm_hi_07, _mm_unpackhi_epi64(xmm_hi_07, xmm_hi_07 ) );
-        xmm_hi_07 = _mm_add_epi32( xmm_hi_07, _mm_shufflelo_epi16(xmm_hi_07, 0x0E ) );
+        xmm_hi_07 = _mm_add_epi32( xmm_hi_07, _mm_unpackhi_epi64(xmm_hi_07, xmm_hi_07 ));
+        xmm_hi_07 = _mm_add_epi32( xmm_hi_07, _mm_shufflelo_epi16(xmm_hi_07, 0x0E ));
 
         n_AR_Q12 = 5 + _mm_cvtsi128_si32( xmm_hi_07 );
 
@@ -511,7 +508,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
         /* Combine prediction and noise shaping signals */
         tmp1 = silk_SUB32( silk_LSHIFT32( LPC_pred_Q10, 2 ), n_AR_Q12 );        /* Q12 */
         tmp1 = silk_SUB32( tmp1, n_LF_Q12 );                                    /* Q12 */
-        if( lag > 0 ) {
+        if (lag > 0) {
             /* Symmetric, packed FIR coefficients */
             n_LTP_Q13 = silk_SMULWB( silk_ADD_SAT32( shp_lag_ptr[ 0 ], shp_lag_ptr[ -2 ] ), HarmShapeFIRPacked_Q14 );
             n_LTP_Q13 = silk_SMLAWT( n_LTP_Q13, shp_lag_ptr[ -1 ],                      HarmShapeFIRPacked_Q14 );
@@ -532,9 +529,9 @@ static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
 
         /* Flip sign depending on dither */
         tmp2 = -r_Q10;
-        if ( NSQ->rand_seed < 0 ) r_Q10 = tmp2;
+        if (NSQ->rand_seed < 0)   r_Q10 = tmp2;
 
-        r_Q10 = silk_LIMIT_32( r_Q10, -(31 << 10), 30 << 10 );
+        r_Q10 = silk_LIMIT_32( r_Q10, -(31<<10), 30<<10 );
 
         /* Find two quantization level candidates and measure their rate-distortion */
         q1_Q10 = silk_SUB32( r_Q10, offset_Q10 );
@@ -555,8 +552,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
         q1_Q10 = table[q1_Q0][0];
         q2_Q10 = table[q1_Q0][1];
 
-        if (r_Q10 * table[q1_Q0][2] - table[q1_Q0][3] < 0)
-        {
+        if (r_Q10*table[q1_Q0][2] - table[q1_Q0][3] < 0) {
             q1_Q10 = q2_Q10;
         }
 
@@ -566,7 +562,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
         exc_Q14 = silk_LSHIFT( q1_Q10, 4 );
 
         tmp2 = -exc_Q14;
-        if ( NSQ->rand_seed < 0 ) exc_Q14 = tmp2;
+        if (NSQ->rand_seed < 0)   exc_Q14 = tmp2;
 
         /* Add predictions */
         LPC_exc_Q14 = silk_ADD_LSHIFT32( exc_Q14, LTP_pred_Q13, 1 );
@@ -595,8 +591,8 @@ static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
     /* write back sAR2_Q14 */
     xmm_tempa = _mm_unpackhi_epi16( sAR2_Q14_lo_76543210, sAR2_Q14_hi_76543210 );
     xmm_tempb = _mm_unpacklo_epi16( sAR2_Q14_lo_76543210, sAR2_Q14_hi_76543210 );
-    _mm_storeu_si128( (__m128i *)(void*)(&NSQ->sAR2_Q14[ 4 ]), xmm_tempa );
-    _mm_storeu_si128( (__m128i *)(void*)(&NSQ->sAR2_Q14[ 0 ]), xmm_tempb );
+    _mm_storeu_si128((__m128i *)(void*)(&NSQ->sAR2_Q14[ 4 ]), xmm_tempa );
+    _mm_storeu_si128((__m128i *)(void*)(&NSQ->sAR2_Q14[ 0 ]), xmm_tempb );
 
     /* xq[ i ] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( psLPC_Q14[ i ], Gain_Q10 ), 8 ) ); */
     {
@@ -604,21 +600,20 @@ static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
         __m128i xmm_xq_Q14_3210, xmm_xq_Q14_x3x1, xmm_xq_Q14_7654, xmm_xq_Q14_x7x5;
 
         /* prepare (1 << 7) in packed 4 32-bits */
-        xmm_tempa = _mm_set1_epi32( (1 << 7) );
+        xmm_tempa = _mm_set1_epi32((1<<7));
 
         /* prepare Gain_Q10 in packed 4 32-bits */
         xmm_Gain_Q10 = _mm_set1_epi32( Gain_Q10 );
 
         /* process xq */
-        for (i = 0; i < length - 7; i += 8)
-        {
-            xmm_xq_Q14_3210 = _mm_loadu_si128( (__m128i *)(void*)(&(psLPC_Q14[ i + 0 ] ) ) );
-            xmm_xq_Q14_7654 = _mm_loadu_si128( (__m128i *)(void*)(&(psLPC_Q14[ i + 4 ] ) ) );
+        for (i = 0; i < length - 7; i += 8) {
+            xmm_xq_Q14_3210 = _mm_loadu_si128((__m128i *)(void*)(&(psLPC_Q14[ i + 0 ])));
+            xmm_xq_Q14_7654 = _mm_loadu_si128((__m128i *)(void*)(&(psLPC_Q14[ i + 4 ])));
 
             /* equal shift right 4 bytes*/
-            xmm_xq_Q14_x3x1 = _mm_shuffle_epi32( xmm_xq_Q14_3210, _MM_SHUFFLE( 0, 3, 2, 1 ) );
+            xmm_xq_Q14_x3x1 = _mm_shuffle_epi32( xmm_xq_Q14_3210, _MM_SHUFFLE( 0, 3, 2, 1 ));
             /* equal shift right 4 bytes*/
-            xmm_xq_Q14_x7x5 = _mm_shuffle_epi32( xmm_xq_Q14_7654, _MM_SHUFFLE( 0, 3, 2, 1 ) );
+            xmm_xq_Q14_x7x5 = _mm_shuffle_epi32( xmm_xq_Q14_7654, _MM_SHUFFLE( 0, 3, 2, 1 ));
 
             xmm_xq_Q14_3210 = _mm_mul_epi32( xmm_xq_Q14_3210, xmm_Gain_Q10 );
             xmm_xq_Q14_x3x1 = _mm_mul_epi32( xmm_xq_Q14_x3x1, xmm_Gain_Q10 );
@@ -644,33 +639,31 @@ static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
             xmm_xq_Q14_3210 = _mm_packs_epi32( xmm_xq_Q14_3210, xmm_xq_Q14_7654 );
 
             /* save to xq */
-            _mm_storeu_si128( (__m128i *)(void*)(&xq[ i ] ), xmm_xq_Q14_3210 );
+            _mm_storeu_si128((__m128i *)(void*)(&xq[ i ]), xmm_xq_Q14_3210 );
         }
     }
-    for ( ; i < length; i++)
-    {
-        xq[i] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( psLPC_Q14[ i ], Gain_Q10 ), 8 ) );
+    for ( ; i < length; i++) {
+        xq[i] = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( psLPC_Q14[ i ], Gain_Q10 ), 8 ));
     }
 
     /* Update LPC synth buffer */
-    silk_memcpy( NSQ->sLPC_Q14, &NSQ->sLPC_Q14[ length ], NSQ_LPC_BUF_LENGTH * sizeof( oac_int32 ) );
+    silk_memcpy( NSQ->sLPC_Q14, &NSQ->sLPC_Q14[ length ], NSQ_LPC_BUF_LENGTH*sizeof(oac_int32));
 }
 
 static OAC_INLINE void silk_nsq_scale_states_sse4_1(
     const silk_encoder_state *psEncC,              /* I    Encoder State                   */
     silk_nsq_state      *NSQ,                      /* I/O  NSQ state                       */
-    const oac_int16    x16[],                     /* I    input                           */
-    oac_int32          x_sc_Q10[],                /* O    input scaled with 1/Gain        */
-    const oac_int16    sLTP[],                    /* I    re-whitened LTP state in Q0     */
-    oac_int32          sLTP_Q15[],                /* O    LTP state matching scaled input */
-    oac_int            subfr,                     /* I    subframe number                 */
-    const oac_int      LTP_scale_Q14,             /* I                                    */
-    const oac_int32    Gains_Q16[ MAX_NB_SUBFR ], /* I                                    */
-    const oac_int      pitchL[ MAX_NB_SUBFR ],    /* I    Pitch lag                       */
-    const oac_int      signal_type                /* I    Signal type                     */
-)
-{
-    oac_int   i, lag;
+    const oac_int16 x16[],                        /* I    input                           */
+    oac_int32 x_sc_Q10[],                         /* O    input scaled with 1/Gain        */
+    const oac_int16 sLTP[],                       /* I    re-whitened LTP state in Q0     */
+    oac_int32 sLTP_Q15[],                         /* O    LTP state matching scaled input */
+    oac_int subfr,                                /* I    subframe number                 */
+    const oac_int LTP_scale_Q14,                  /* I                                    */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],    /* I                                    */
+    const oac_int pitchL[ MAX_NB_SUBFR ],         /* I    Pitch lag                       */
+    const oac_int signal_type                     /* I    Signal type                     */
+    ) {
+    oac_int i, lag;
     oac_int32 gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
     __m128i xmm_inv_gain_Q26, xmm_x16_x2x0, xmm_x16_x3x1;
 
@@ -684,11 +677,11 @@ static OAC_INLINE void silk_nsq_scale_states_sse4_1(
     /* prepare inv_gain_Q26 in packed 4 32-bits */
     xmm_inv_gain_Q26 = _mm_set1_epi32(inv_gain_Q26);
 
-    for( i = 0; i < psEncC->subfr_length - 3; i += 4 ) {
-        xmm_x16_x2x0 = OP_CVTEPI16_EPI32_M64( &(x16[ i ] ) );
+    for (i = 0; i < psEncC->subfr_length - 3; i += 4) {
+        xmm_x16_x2x0 = OP_CVTEPI16_EPI32_M64( &(x16[ i ]));
 
         /* equal shift right 4 bytes*/
-        xmm_x16_x3x1 = _mm_shuffle_epi32( xmm_x16_x2x0, _MM_SHUFFLE( 0, 3, 2, 1 ) );
+        xmm_x16_x3x1 = _mm_shuffle_epi32( xmm_x16_x2x0, _MM_SHUFFLE( 0, 3, 2, 1 ));
 
         xmm_x16_x2x0 = _mm_mul_epi32( xmm_x16_x2x0, xmm_inv_gain_Q26 );
         xmm_x16_x3x1 = _mm_mul_epi32( xmm_x16_x3x1, xmm_inv_gain_Q26 );
@@ -698,27 +691,27 @@ static OAC_INLINE void silk_nsq_scale_states_sse4_1(
 
         xmm_x16_x2x0 = _mm_blend_epi16( xmm_x16_x2x0, xmm_x16_x3x1, 0xCC );
 
-        _mm_storeu_si128( (__m128i *)(void*)(&(x_sc_Q10[ i ] ) ), xmm_x16_x2x0 );
+        _mm_storeu_si128((__m128i *)(void*)(&(x_sc_Q10[ i ])), xmm_x16_x2x0 );
     }
 
-    for( ; i < psEncC->subfr_length; i++ ) {
+    for ( ; i < psEncC->subfr_length; i++) {
         x_sc_Q10[ i ] = silk_SMULWW( x16[ i ], inv_gain_Q26 );
     }
 
     /* After rewhitening the LTP state is un-scaled, so scale with inv_gain_Q16 */
-    if( NSQ->rewhite_flag ) {
-        if( subfr == 0 ) {
+    if (NSQ->rewhite_flag) {
+        if (subfr == 0) {
             /* Do LTP downscaling */
             inv_gain_Q31 = silk_LSHIFT( silk_SMULWB( inv_gain_Q31, LTP_scale_Q14 ), 2 );
         }
-        for( i = NSQ->sLTP_buf_idx - lag - LTP_ORDER / 2; i < NSQ->sLTP_buf_idx; i++ ) {
+        for (i = NSQ->sLTP_buf_idx - lag - LTP_ORDER/2; i < NSQ->sLTP_buf_idx; i++) {
             silk_assert( i < MAX_FRAME_LENGTH );
             sLTP_Q15[ i ] = silk_SMULWB( inv_gain_Q31, sLTP[ i ] );
         }
     }
 
     /* Adjust for changing gain */
-    if( Gains_Q16[ subfr ] != NSQ->prev_gain_Q16 ) {
+    if (Gains_Q16[ subfr ] != NSQ->prev_gain_Q16) {
         __m128i xmm_gain_adj_Q16, xmm_sLTP_shp_Q14_x2x0, xmm_sLTP_shp_Q14_x3x1;
         gain_adj_Q16 =  silk_DIV32_varQ( NSQ->prev_gain_Q16, Gains_Q16[ subfr ], 16 );
 
@@ -727,11 +720,10 @@ static OAC_INLINE void silk_nsq_scale_states_sse4_1(
         /* prepare gain_adj_Q16 in packed 4 32-bits */
         xmm_gain_adj_Q16 = _mm_set1_epi32(gain_adj_Q16);
 
-        for( i = NSQ->sLTP_shp_buf_idx - psEncC->ltp_mem_length; i < NSQ->sLTP_shp_buf_idx - 3; i += 4 )
-        {
-            xmm_sLTP_shp_Q14_x2x0 = _mm_loadu_si128( (__m128i *)(void*)(&(NSQ->sLTP_shp_Q14[ i ] ) ) );
+        for (i = NSQ->sLTP_shp_buf_idx - psEncC->ltp_mem_length; i < NSQ->sLTP_shp_buf_idx - 3; i += 4) {
+            xmm_sLTP_shp_Q14_x2x0 = _mm_loadu_si128((__m128i *)(void*)(&(NSQ->sLTP_shp_Q14[ i ])));
             /* equal shift right 4 bytes*/
-            xmm_sLTP_shp_Q14_x3x1 = _mm_shuffle_epi32( xmm_sLTP_shp_Q14_x2x0, _MM_SHUFFLE( 0, 3, 2, 1 ) );
+            xmm_sLTP_shp_Q14_x3x1 = _mm_shuffle_epi32( xmm_sLTP_shp_Q14_x2x0, _MM_SHUFFLE( 0, 3, 2, 1 ));
 
             xmm_sLTP_shp_Q14_x2x0 = _mm_mul_epi32( xmm_sLTP_shp_Q14_x2x0, xmm_gain_adj_Q16 );
             xmm_sLTP_shp_Q14_x3x1 = _mm_mul_epi32( xmm_sLTP_shp_Q14_x3x1, xmm_gain_adj_Q16 );
@@ -741,16 +733,16 @@ static OAC_INLINE void silk_nsq_scale_states_sse4_1(
 
             xmm_sLTP_shp_Q14_x2x0 = _mm_blend_epi16( xmm_sLTP_shp_Q14_x2x0, xmm_sLTP_shp_Q14_x3x1, 0xCC );
 
-            _mm_storeu_si128( (__m128i *)(void*)(&(NSQ->sLTP_shp_Q14[ i ] ) ), xmm_sLTP_shp_Q14_x2x0 );
+            _mm_storeu_si128((__m128i *)(void*)(&(NSQ->sLTP_shp_Q14[ i ])), xmm_sLTP_shp_Q14_x2x0 );
         }
 
-        for( ; i < NSQ->sLTP_shp_buf_idx; i++ ) {
+        for ( ; i < NSQ->sLTP_shp_buf_idx; i++) {
             NSQ->sLTP_shp_Q14[ i ] = silk_SMULWW( gain_adj_Q16, NSQ->sLTP_shp_Q14[ i ] );
         }
 
         /* Scale long-term prediction state */
-        if( signal_type == TYPE_VOICED && NSQ->rewhite_flag == 0 ) {
-            for( i = NSQ->sLTP_buf_idx - lag - LTP_ORDER / 2; i < NSQ->sLTP_buf_idx; i++ ) {
+        if (signal_type == TYPE_VOICED && NSQ->rewhite_flag == 0) {
+            for (i = NSQ->sLTP_buf_idx - lag - LTP_ORDER/2; i < NSQ->sLTP_buf_idx; i++) {
                 sLTP_Q15[ i ] = silk_SMULWW( gain_adj_Q16, sLTP_Q15[ i ] );
             }
         }
@@ -759,10 +751,10 @@ static OAC_INLINE void silk_nsq_scale_states_sse4_1(
         NSQ->sDiff_shp_Q14 = silk_SMULWW( gain_adj_Q16, NSQ->sDiff_shp_Q14 );
 
         /* Scale short-term prediction and shaping states */
-        for( i = 0; i < NSQ_LPC_BUF_LENGTH; i++ ) {
+        for (i = 0; i < NSQ_LPC_BUF_LENGTH; i++) {
             NSQ->sLPC_Q14[ i ] = silk_SMULWW( gain_adj_Q16, NSQ->sLPC_Q14[ i ] );
         }
-        for( i = 0; i < MAX_SHAPE_LPC_ORDER; i++ ) {
+        for (i = 0; i < MAX_SHAPE_LPC_ORDER; i++) {
             NSQ->sAR2_Q14[ i ] = silk_SMULWW( gain_adj_Q16, NSQ->sAR2_Q14[ i ] );
         }
 
diff --git a/silk/x86/SigProc_FIX_sse.h b/silk/x86/SigProc_FIX_sse.h
index b877fb67c..3de5e3f4a 100644
--- a/silk/x86/SigProc_FIX_sse.h
+++ b/silk/x86/SigProc_FIX_sse.h
@@ -23,77 +23,78 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef SIGPROC_FIX_SSE_H
-# define SIGPROC_FIX_SSE_H
+#define SIGPROC_FIX_SSE_H
 
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
-# if defined(OAC_X86_MAY_HAVE_SSE4_1)
+#if defined(OAC_X86_MAY_HAVE_SSE4_1)
 void silk_burg_modified_sse4_1(
     oac_int32                  *res_nrg,           /* O    Residual energy                                             */
     oac_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
-    oac_int32                  A_Q16[],            /* O    Prediction coefficients (length order)                      */
-    const oac_int16            x[],                /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
-    const oac_int32            minInvGain_Q30,     /* I    Inverse of max prediction gain                              */
-    const oac_int              subfr_length,       /* I    Input signal subframe length (incl. D preceding samples)    */
-    const oac_int              nb_subfr,           /* I    Number of subframes stacked in x                            */
-    const oac_int              D,                  /* I    Order                                                       */
-    int                         arch                /* I    Run-time architecture                                       */
-);
+    oac_int32 A_Q16[],                             /* O    Prediction coefficients (length order)                      */
+    const oac_int16 x[],                           /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
+    const oac_int32 minInvGain_Q30,                /* I    Inverse of max prediction gain                              */
+    const oac_int subfr_length,                    /* I    Input signal subframe length (incl. D preceding samples)    */
+    const oac_int nb_subfr,                        /* I    Number of subframes stacked in x                            */
+    const oac_int D,                               /* I    Order                                                       */
+    int arch                                        /* I    Run-time architecture                                       */
+    );
 
-#  if defined(OAC_X86_PRESUME_SSE4_1)
+# if defined(OAC_X86_PRESUME_SSE4_1)
 
-#   define OVERRIDE_silk_burg_modified
-#   define silk_burg_modified(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch) \
-       ((void)(arch), silk_burg_modified_sse4_1(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch))
+#  define OVERRIDE_silk_burg_modified
+#  define silk_burg_modified(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch) \
+        ((void)(arch), \
+         silk_burg_modified_sse4_1(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch))
 
-#  elif defined(OAC_HAVE_RTCD)
+# elif defined(OAC_HAVE_RTCD)
 
 extern void (*const SILK_BURG_MODIFIED_IMPL[OAC_ARCHMASK + 1])(
     oac_int32                  *res_nrg,           /* O    Residual energy                                             */
     oac_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
-    oac_int32                  A_Q16[],            /* O    Prediction coefficients (length order)                      */
-    const oac_int16            x[],                /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
-    const oac_int32            minInvGain_Q30,     /* I    Inverse of max prediction gain                              */
-    const oac_int              subfr_length,       /* I    Input signal subframe length (incl. D preceding samples)    */
-    const oac_int              nb_subfr,           /* I    Number of subframes stacked in x                            */
-    const oac_int              D,                  /* I    Order                                                       */
-    int                         arch                /* I    Run-time architecture                                       */);
-
-#   define OVERRIDE_silk_burg_modified
-#   define silk_burg_modified(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch) \
-     ((*SILK_BURG_MODIFIED_IMPL[(arch) & OAC_ARCHMASK])(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch))
+    oac_int32 A_Q16[],                             /* O    Prediction coefficients (length order)                      */
+    const oac_int16 x[],                           /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
+    const oac_int32 minInvGain_Q30,                /* I    Inverse of max prediction gain                              */
+    const oac_int subfr_length,                    /* I    Input signal subframe length (incl. D preceding samples)    */
+    const oac_int nb_subfr,                        /* I    Number of subframes stacked in x                            */
+    const oac_int D,                               /* I    Order                                                       */
+    int arch /* I    Run-time architecture                                       */);
+
+#  define OVERRIDE_silk_burg_modified
+#  define silk_burg_modified(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch) \
+        ((*SILK_BURG_MODIFIED_IMPL[(arch)&OAC_ARCHMASK])(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, \
+                                                         nb_subfr, D, arch))
 
-#  endif
+# endif
 
 oac_int64 silk_inner_prod16_sse4_1(
     const oac_int16 *inVec1,
     const oac_int16 *inVec2,
-    const oac_int   len
-);
+    const oac_int len);
 
 
-#  if defined(OAC_X86_PRESUME_SSE4_1)
+# if defined(OAC_X86_PRESUME_SSE4_1)
 
-#   define OVERRIDE_silk_inner_prod16
-#   define silk_inner_prod16(inVec1, inVec2, len, arch) \
-       ((void)(arch),silk_inner_prod16_sse4_1(inVec1, inVec2, len))
+#  define OVERRIDE_silk_inner_prod16
+#  define silk_inner_prod16(inVec1, inVec2, len, arch) \
+        ((void)(arch), silk_inner_prod16_sse4_1(inVec1, inVec2, len))
 
-#  elif defined(OAC_HAVE_RTCD)
+# elif defined(OAC_HAVE_RTCD)
 
 extern oac_int64 (*const SILK_INNER_PROD16_IMPL[OAC_ARCHMASK + 1])(
                     const oac_int16 *inVec1,
                     const oac_int16 *inVec2,
-                    const oac_int   len);
+                    const oac_int len);
 
-#   define OVERRIDE_silk_inner_prod16
-#   define silk_inner_prod16(inVec1, inVec2, len, arch) \
-     ((*SILK_INNER_PROD16_IMPL[(arch) & OAC_ARCHMASK])(inVec1, inVec2, len))
+#  define OVERRIDE_silk_inner_prod16
+#  define silk_inner_prod16(inVec1, inVec2, len, arch) \
+        ((*SILK_INNER_PROD16_IMPL[(arch)&OAC_ARCHMASK])(inVec1, inVec2, len))
 
-#  endif
 # endif
 #endif
+#endif
diff --git a/silk/x86/VAD_sse4_1.c b/silk/x86/VAD_sse4_1.c
index c3aef6b7c..0633fc74b 100644
--- a/silk/x86/VAD_sse4_1.c
+++ b/silk/x86/VAD_sse4_1.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <xmmintrin.h>
@@ -44,21 +44,20 @@ static const oac_int32 tiltWeights[ VAD_N_BANDS ] = { 30000, 6000, -12000, -1200
 /***************************************/
 oac_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if success                  */
     silk_encoder_state          *psEncC,            /* I/O  Encoder state                               */
-    const oac_int16            pIn[]               /* I    PCM input                                   */
-)
-{
-    oac_int   SA_Q15, pSNR_dB_Q7, input_tilt;
-    oac_int   decimated_framelength1, decimated_framelength2;
-    oac_int   decimated_framelength;
-    oac_int   dec_subframe_length, dec_subframe_offset, SNR_Q7, i, b, s;
+    const oac_int16 pIn[]                          /* I    PCM input                                   */
+    ) {
+    oac_int SA_Q15, pSNR_dB_Q7, input_tilt;
+    oac_int decimated_framelength1, decimated_framelength2;
+    oac_int decimated_framelength;
+    oac_int dec_subframe_length, dec_subframe_offset, SNR_Q7, i, b, s;
     oac_int32 sumSquared, smooth_coef_Q16;
     oac_int16 HPstateTmp;
     VARDECL( oac_int16, X );
     oac_int32 Xnrg[ VAD_N_BANDS ];
     oac_int32 NrgToNoiseRatio_Q8[ VAD_N_BANDS ];
     oac_int32 speech_nrg, x_tmp;
-    oac_int   X_offset[ VAD_N_BANDS ];
-    oac_int   ret = 0;
+    oac_int X_offset[ VAD_N_BANDS ];
+    oac_int ret = 0;
     silk_VAD_state *psSilk_VAD = &psEncC->sVAD;
 
     SAVE_STACK;
@@ -67,7 +66,7 @@ oac_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if su
     silk_encoder_state psEncC_c;
     oac_int ret_c;
 
-    silk_memcpy( &psEncC_c, psEncC, sizeof( psEncC_c ) );
+    silk_memcpy( &psEncC_c, psEncC, sizeof(psEncC_c));
     ret_c = silk_VAD_GetSA_Q8_c( &psEncC_c, pIn );
 #endif
 
@@ -75,7 +74,7 @@ oac_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if su
     silk_assert( VAD_N_BANDS == 4 );
     celt_assert( MAX_FRAME_LENGTH >= psEncC->frame_length );
     celt_assert( psEncC->frame_length <= 512 );
-    celt_assert( psEncC->frame_length == 8 * silk_RSHIFT( psEncC->frame_length, 3 ) );
+    celt_assert( psEncC->frame_length == 8*silk_RSHIFT( psEncC->frame_length, 3 ));
 
     /***********************/
     /* Filter and Decimate */
@@ -115,7 +114,7 @@ oac_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if su
     /*********************************************/
     X[ decimated_framelength - 1 ] = silk_RSHIFT( X[ decimated_framelength - 1 ], 1 );
     HPstateTmp = X[ decimated_framelength - 1 ];
-    for( i = decimated_framelength - 1; i > 0; i-- ) {
+    for (i = decimated_framelength - 1; i > 0; i--) {
         X[ i - 1 ]  = silk_RSHIFT( X[ i - 1 ], 1 );
         X[ i ]     -= X[ i - 1 ];
     }
@@ -125,9 +124,9 @@ oac_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if su
     /*************************************/
     /* Calculate the energy in each band */
     /*************************************/
-    for( b = 0; b < VAD_N_BANDS; b++ ) {
+    for (b = 0; b < VAD_N_BANDS; b++) {
         /* Find the decimated framelength in the non-uniformly divided bands */
-        decimated_framelength = silk_RSHIFT( psEncC->frame_length, silk_min_int( VAD_N_BANDS - b, VAD_N_BANDS - 1 ) );
+        decimated_framelength = silk_RSHIFT( psEncC->frame_length, silk_min_int( VAD_N_BANDS - b, VAD_N_BANDS - 1 ));
 
         /* Split length into subframe lengths */
         dec_subframe_length = silk_RSHIFT( decimated_framelength, VAD_INTERNAL_SUBFRAMES_LOG2 );
@@ -136,26 +135,25 @@ oac_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if su
         /* Compute energy per sub-frame */
         /* initialize with summed energy of last subframe */
         Xnrg[ b ] = psSilk_VAD->XnrgSubfr[ b ];
-        for( s = 0; s < VAD_INTERNAL_SUBFRAMES; s++ ) {
+        for (s = 0; s < VAD_INTERNAL_SUBFRAMES; s++) {
             __m128i xmm_X, xmm_acc;
             sumSquared = 0;
 
             xmm_acc = _mm_setzero_si128();
 
-            for( i = 0; i < dec_subframe_length - 7; i += 8 )
-            {
-                xmm_X   = _mm_loadu_si128( (__m128i *)(void*)&(X[ X_offset[ b ] + i + dec_subframe_offset ] ) );
+            for (i = 0; i < dec_subframe_length - 7; i += 8) {
+                xmm_X   = _mm_loadu_si128((__m128i *)(void*)&(X[ X_offset[ b ] + i + dec_subframe_offset ]));
                 xmm_X   = _mm_srai_epi16( xmm_X, 3 );
                 xmm_X   = _mm_madd_epi16( xmm_X, xmm_X );
                 xmm_acc = _mm_add_epi32( xmm_acc, xmm_X );
             }
 
-            xmm_acc = _mm_add_epi32( xmm_acc, _mm_unpackhi_epi64( xmm_acc, xmm_acc ) );
-            xmm_acc = _mm_add_epi32( xmm_acc, _mm_shufflelo_epi16( xmm_acc, 0x0E ) );
+            xmm_acc = _mm_add_epi32( xmm_acc, _mm_unpackhi_epi64( xmm_acc, xmm_acc ));
+            xmm_acc = _mm_add_epi32( xmm_acc, _mm_shufflelo_epi16( xmm_acc, 0x0E ));
 
             sumSquared += _mm_cvtsi128_si32( xmm_acc );
 
-            for( ; i < dec_subframe_length; i++ ) {
+            for ( ; i < dec_subframe_length; i++) {
                 /* The energy will be less than dec_subframe_length * ( silk_int16_MIN / 8 ) ^ 2.            */
                 /* Therefore we can accumulate with no risk of overflow (unless dec_subframe_length > 128)  */
                 x_tmp = silk_RSHIFT(
@@ -167,11 +165,11 @@ oac_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if su
             }
 
             /* Add/saturate summed energy of current subframe */
-            if( s < VAD_INTERNAL_SUBFRAMES - 1 ) {
+            if (s < VAD_INTERNAL_SUBFRAMES - 1) {
                 Xnrg[ b ] = silk_ADD_POS_SAT32( Xnrg[ b ], sumSquared );
             } else {
                 /* Look-ahead subframe */
-                Xnrg[ b ] = silk_ADD_POS_SAT32( Xnrg[ b ], silk_RSHIFT( sumSquared, 1 ) );
+                Xnrg[ b ] = silk_ADD_POS_SAT32( Xnrg[ b ], silk_RSHIFT( sumSquared, 1 ));
             }
 
             dec_subframe_offset += dec_subframe_length;
@@ -189,24 +187,24 @@ oac_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if su
     /***********************************************/
     sumSquared = 0;
     input_tilt = 0;
-    for( b = 0; b < VAD_N_BANDS; b++ ) {
+    for (b = 0; b < VAD_N_BANDS; b++) {
         speech_nrg = Xnrg[ b ] - psSilk_VAD->NL[ b ];
-        if( speech_nrg > 0 ) {
+        if (speech_nrg > 0) {
             /* Divide, with sufficient resolution */
-            if( ( Xnrg[ b ] & 0xFF800000 ) == 0 ) {
+            if ((Xnrg[ b ]&0xFF800000) == 0) {
                 NrgToNoiseRatio_Q8[ b ] = silk_DIV32( silk_LSHIFT( Xnrg[ b ], 8 ), psSilk_VAD->NL[ b ] + 1 );
             } else {
                 NrgToNoiseRatio_Q8[ b ] = silk_DIV32( Xnrg[ b ], silk_RSHIFT( psSilk_VAD->NL[ b ], 8 ) + 1 );
             }
 
             /* Convert to log domain */
-            SNR_Q7 = silk_lin2log( NrgToNoiseRatio_Q8[ b ] ) - 8 * 128;
+            SNR_Q7 = silk_lin2log( NrgToNoiseRatio_Q8[ b ] ) - 8*128;
 
             /* Sum-of-squares */
             sumSquared = silk_SMLABB( sumSquared, SNR_Q7, SNR_Q7 );          /* Q14 */
 
             /* Tilt measure */
-            if( speech_nrg < ( (oac_int32)1 << 20 ) ) {
+            if (speech_nrg < ((oac_int32)1<<20)) {
                 /* Scale down SNR value for small subband speech energies */
                 SNR_Q7 = silk_SMULWB( silk_LSHIFT( silk_SQRT_APPROX( speech_nrg ), 6 ), SNR_Q7 );
             }
@@ -220,7 +218,7 @@ oac_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if su
     sumSquared = silk_DIV32_16( sumSquared, VAD_N_BANDS ); /* Q14 */
 
     /* Root-mean-square approximation, scale to dBs, and write to output pointer */
-    pSNR_dB_Q7 = (oac_int16)( 3 * silk_SQRT_APPROX( sumSquared ) ); /* Q7 */
+    pSNR_dB_Q7 = (oac_int16)(3*silk_SQRT_APPROX( sumSquared ));     /* Q7 */
 
     /*********************************/
     /* Speech Probability Estimation */
@@ -236,18 +234,18 @@ oac_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if su
     /* Scale the sigmoid output based on power levels */
     /**************************************************/
     speech_nrg = 0;
-    for( b = 0; b < VAD_N_BANDS; b++ ) {
+    for (b = 0; b < VAD_N_BANDS; b++) {
         /* Accumulate signal-without-noise energies, higher frequency bands have more weight */
-        speech_nrg += ( b + 1 ) * silk_RSHIFT( Xnrg[ b ] - psSilk_VAD->NL[ b ], 4 );
+        speech_nrg += (b + 1)*silk_RSHIFT( Xnrg[ b ] - psSilk_VAD->NL[ b ], 4 );
     }
 
-    if( psEncC->frame_length == 20 * psEncC->fs_kHz ) {
+    if (psEncC->frame_length == 20*psEncC->fs_kHz) {
         speech_nrg = silk_RSHIFT32( speech_nrg, 1 );
     }
     /* Power scaling */
-    if( speech_nrg <= 0 ) {
+    if (speech_nrg <= 0) {
         SA_Q15 = silk_RSHIFT( SA_Q15, 1 );
-    } else if( speech_nrg < 16384 ) {
+    } else if (speech_nrg < 16384) {
         speech_nrg = silk_LSHIFT32( speech_nrg, 16 );
 
         /* square-root */
@@ -262,28 +260,28 @@ oac_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if su
     /* Energy Level and SNR estimation */
     /***********************************/
     /* Smoothing coefficient */
-    smooth_coef_Q16 = silk_SMULWB( VAD_SNR_SMOOTH_COEF_Q18, silk_SMULWB( (oac_int32)SA_Q15, SA_Q15 ) );
+    smooth_coef_Q16 = silk_SMULWB( VAD_SNR_SMOOTH_COEF_Q18, silk_SMULWB((oac_int32)SA_Q15, SA_Q15 ));
 
-    if( psEncC->frame_length == 10 * psEncC->fs_kHz ) {
+    if (psEncC->frame_length == 10*psEncC->fs_kHz) {
         smooth_coef_Q16 >>= 1;
     }
 
-    for( b = 0; b < VAD_N_BANDS; b++ ) {
+    for (b = 0; b < VAD_N_BANDS; b++) {
         /* compute smoothed energy-to-noise ratio per band */
         psSilk_VAD->NrgRatioSmth_Q8[ b ] = silk_SMLAWB( psSilk_VAD->NrgRatioSmth_Q8[ b ],
             NrgToNoiseRatio_Q8[ b ] - psSilk_VAD->NrgRatioSmth_Q8[ b ], smooth_coef_Q16 );
 
         /* signal to noise ratio in dB per band */
-        SNR_Q7 = 3 * ( silk_lin2log( psSilk_VAD->NrgRatioSmth_Q8[b] ) - 8 * 128 );
+        SNR_Q7 = 3*(silk_lin2log( psSilk_VAD->NrgRatioSmth_Q8[b] ) - 8*128);
         /* quality = sigmoid( 0.25 * ( SNR_dB - 16 ) ); */
-        psEncC->input_quality_bands_Q15[ b ] = silk_sigm_Q15( silk_RSHIFT( SNR_Q7 - 16 * 128, 4 ) );
+        psEncC->input_quality_bands_Q15[ b ] = silk_sigm_Q15( silk_RSHIFT( SNR_Q7 - 16*128, 4 ));
     }
 
 #ifdef OAC_CHECK_ASM
     silk_assert( ret == ret_c );
-    silk_assert( !memcmp( &psEncC_c, psEncC, sizeof( psEncC_c ) ) );
+    silk_assert( !memcmp( &psEncC_c, psEncC, sizeof(psEncC_c)));
 #endif
 
     RESTORE_STACK;
-    return( ret );
+    return ret;
 }
diff --git a/silk/x86/VQ_WMat_EC_sse4_1.c b/silk/x86/VQ_WMat_EC_sse4_1.c
index 50add48a3..bd92a9730 100644
--- a/silk/x86/VQ_WMat_EC_sse4_1.c
+++ b/silk/x86/VQ_WMat_EC_sse4_1.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <xmmintrin.h>
@@ -46,12 +46,11 @@ void silk_VQ_WMat_EC_sse4_1(
     const oac_int8             *cb_Q7,                         /* I    codebook                                    */
     const oac_uint8            *cb_gain_Q7,                    /* I    codebook effective gain                     */
     const oac_uint8            *cl_Q5,                         /* I    code length for each codebook vector        */
-    const oac_int              subfr_len,                      /* I    number of samples per subframe              */
-    const oac_int32            max_gain_Q7,                    /* I    maximum sum of absolute LTP coefficients    */
-    const oac_int              L                               /* I    number of vectors in codebook               */
-)
-{
-    oac_int   k, gain_tmp_Q7;
+    const oac_int subfr_len,                                   /* I    number of samples per subframe              */
+    const oac_int32 max_gain_Q7,                               /* I    maximum sum of absolute LTP coefficients    */
+    const oac_int L                                            /* I    number of vectors in codebook               */
+    ) {
+    oac_int k, gain_tmp_Q7;
     const oac_int8 *cb_row_Q7;
     oac_int32 neg_xX_Q24[ 5 ];
     oac_int32 sum1_Q15, sum2_Q24;
@@ -65,8 +64,8 @@ void silk_VQ_WMat_EC_sse4_1(
     neg_xX_Q24[ 3 ] = -silk_LSHIFT32( xX_Q17[ 3 ], 7 );
     neg_xX_Q24[ 4 ] = -silk_LSHIFT32( xX_Q17[ 4 ], 7 );
 
-    v_XX_31_Q17 = _mm_loadu_si128( (__m128i *)(void*)(&XX_Q17[ 1 ] ) );
-    v_XX_42_Q17 = _mm_shuffle_epi32( v_XX_31_Q17, _MM_SHUFFLE( 0, 3, 2, 1 ) );
+    v_XX_31_Q17 = _mm_loadu_si128((__m128i *)(void*)(&XX_Q17[ 1 ]));
+    v_XX_42_Q17 = _mm_shuffle_epi32( v_XX_31_Q17, _MM_SHUFFLE( 0, 3, 2, 1 ));
 
     /* Loop over codebook */
     *rate_dist_Q8 = silk_int32_MAX;
@@ -74,7 +73,7 @@ void silk_VQ_WMat_EC_sse4_1(
     cb_row_Q7 = cb_Q7;
     /* If things go really bad, at least *ind is set to something safe. */
     *ind = 0;
-    for( k = 0; k < L; k++ ) {
+    for (k = 0; k < L; k++) {
         oac_int32 penalty;
         gain_tmp_Q7 = cb_gain_Q7[k];
         /* Weighted rate */
@@ -86,11 +85,11 @@ void silk_VQ_WMat_EC_sse4_1(
 
         /* first row of XX_Q17 */
         v_cb_row_31_Q7 = OP_CVTEPI8_EPI32_M32( &cb_row_Q7[ 1 ] );
-        v_cb_row_42_Q7 = _mm_shuffle_epi32( v_cb_row_31_Q7, _MM_SHUFFLE( 0, 3, 2, 1 ) );
+        v_cb_row_42_Q7 = _mm_shuffle_epi32( v_cb_row_31_Q7, _MM_SHUFFLE( 0, 3, 2, 1 ));
         v_cb_row_31_Q7 = _mm_mul_epi32( v_XX_31_Q17, v_cb_row_31_Q7 );
         v_cb_row_42_Q7 = _mm_mul_epi32( v_XX_42_Q17, v_cb_row_42_Q7 );
         v_acc1_Q24 = _mm_add_epi64( v_cb_row_31_Q7, v_cb_row_42_Q7);
-        v_acc2_Q24 = _mm_shuffle_epi32( v_acc1_Q24, _MM_SHUFFLE( 1, 0, 3, 2 ) );
+        v_acc2_Q24 = _mm_shuffle_epi32( v_acc1_Q24, _MM_SHUFFLE( 1, 0, 3, 2 ));
         v_acc1_Q24 = _mm_add_epi64( v_acc1_Q24, v_acc2_Q24);
         sum2_Q24 = _mm_cvtsi128_si32( v_acc1_Q24 );
         sum2_Q24 = silk_ADD32( neg_xX_Q24[ 0 ], sum2_Q24 );
@@ -125,12 +124,12 @@ void silk_VQ_WMat_EC_sse4_1(
         sum1_Q15 = silk_SMLAWB( sum1_Q15,        sum2_Q24,  cb_row_Q7[ 4 ] );
 
         /* find best */
-        if( sum1_Q15 >= 0 ) {
+        if (sum1_Q15 >= 0) {
             /* Translate residual energy to bits using high-rate assumption (6 dB ==> 1 bit/sample) */
-            bits_res_Q8 = silk_SMULBB( subfr_len, silk_lin2log( sum1_Q15 + penalty) - (15 << 7) );
+            bits_res_Q8 = silk_SMULBB( subfr_len, silk_lin2log( sum1_Q15 + penalty) - (15<<7));
             /* In the following line we reduce the codelength component by half ("-1"); seems to slightly improve quality */
-            bits_tot_Q8 = silk_ADD_LSHIFT32( bits_res_Q8, cl_Q5[ k ], 3-1 );
-            if( bits_tot_Q8 <= *rate_dist_Q8 ) {
+            bits_tot_Q8 = silk_ADD_LSHIFT32( bits_res_Q8, cl_Q5[ k ], 3 - 1 );
+            if (bits_tot_Q8 <= *rate_dist_Q8) {
                 *rate_dist_Q8 = bits_tot_Q8;
                 *res_nrg_Q15 = sum1_Q15 + penalty;
                 *ind = (oac_int8)k;
@@ -144,10 +143,10 @@ void silk_VQ_WMat_EC_sse4_1(
 
 #ifdef OAC_CHECK_ASM
     {
-        oac_int8  ind_c = 0;
+        oac_int8 ind_c = 0;
         oac_int32 res_nrg_Q15_c = 0;
         oac_int32 rate_dist_Q8_c = 0;
-        oac_int   gain_Q7_c = 0;
+        oac_int gain_Q7_c = 0;
 
         silk_VQ_WMat_EC_c(
             &ind_c,
@@ -162,7 +161,7 @@ void silk_VQ_WMat_EC_sse4_1(
             subfr_len,
             max_gain_Q7,
             L
-        );
+            );
 
         silk_assert( *ind == ind_c );
         silk_assert( *res_nrg_Q15 == res_nrg_Q15_c );
diff --git a/silk/x86/main_sse.h b/silk/x86/main_sse.h
index 81d32222d..2bb7e073a 100644
--- a/silk/x86/main_sse.h
+++ b/silk/x86/main_sse.h
@@ -23,16 +23,16 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef MAIN_SSE_H
-# define MAIN_SSE_H
+#define MAIN_SSE_H
 
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
-# if defined(OAC_X86_MAY_HAVE_SSE4_1)
+#if defined(OAC_X86_MAY_HAVE_SSE4_1)
 
 void silk_VQ_WMat_EC_sse4_1(
     oac_int8                   *ind,                           /* O    index of best codebook vector               */
@@ -44,20 +44,21 @@ void silk_VQ_WMat_EC_sse4_1(
     const oac_int8             *cb_Q7,                         /* I    codebook                                    */
     const oac_uint8            *cb_gain_Q7,                    /* I    codebook effective gain                     */
     const oac_uint8            *cl_Q5,                         /* I    code length for each codebook vector        */
-    const oac_int              subfr_len,                      /* I    number of samples per subframe              */
-    const oac_int32            max_gain_Q7,                    /* I    maximum sum of absolute LTP coefficients    */
-    const oac_int              L                               /* I    number of vectors in codebook               */
-);
-
-#  if defined OAC_X86_PRESUME_SSE4_1
-
-#   define OVERRIDE_silk_VQ_WMat_EC
-#   define silk_VQ_WMat_EC(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, \
-                           subfr_len, max_gain_Q7, L, arch) \
-    ((void)(arch),silk_VQ_WMat_EC_sse4_1(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, \
+    const oac_int subfr_len,                                   /* I    number of samples per subframe              */
+    const oac_int32 max_gain_Q7,                               /* I    maximum sum of absolute LTP coefficients    */
+    const oac_int L                                            /* I    number of vectors in codebook               */
+    );
+
+# if defined OAC_X86_PRESUME_SSE4_1
+
+#  define OVERRIDE_silk_VQ_WMat_EC
+#  define silk_VQ_WMat_EC(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, \
+                          subfr_len, max_gain_Q7, L, arch) \
+        ((void)(arch), \
+         silk_VQ_WMat_EC_sse4_1(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, \
                           subfr_len, max_gain_Q7, L))
 
-#  elif defined(OAC_HAVE_RTCD)
+# elif defined(OAC_HAVE_RTCD)
 
 extern void (*const SILK_VQ_WMAT_EC_IMPL[OAC_ARCHMASK + 1])(
     oac_int8                   *ind,                           /* O    index of best codebook vector               */
@@ -69,90 +70,92 @@ extern void (*const SILK_VQ_WMAT_EC_IMPL[OAC_ARCHMASK + 1])(
     const oac_int8             *cb_Q7,                         /* I    codebook                                    */
     const oac_uint8            *cb_gain_Q7,                    /* I    codebook effective gain                     */
     const oac_uint8            *cl_Q5,                         /* I    code length for each codebook vector        */
-    const oac_int              subfr_len,                      /* I    number of samples per subframe              */
-    const oac_int32            max_gain_Q7,                    /* I    maximum sum of absolute LTP coefficients    */
-    const oac_int              L                               /* I    number of vectors in codebook               */
-);
-
-#   define OVERRIDE_silk_VQ_WMat_EC
-#   define silk_VQ_WMat_EC(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, \
-                           subfr_len, max_gain_Q7, L, arch) \
-    ((*SILK_VQ_WMAT_EC_IMPL[(arch) & OAC_ARCHMASK])(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, \
-                          subfr_len, max_gain_Q7, L))
+    const oac_int subfr_len,                                   /* I    number of samples per subframe              */
+    const oac_int32 max_gain_Q7,                               /* I    maximum sum of absolute LTP coefficients    */
+    const oac_int L                                            /* I    number of vectors in codebook               */
+    );
+
+#  define OVERRIDE_silk_VQ_WMat_EC
+#  define silk_VQ_WMat_EC(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, \
+                          subfr_len, max_gain_Q7, L, arch) \
+        ((*SILK_VQ_WMAT_EC_IMPL[(arch)&OAC_ARCHMASK])(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, \
+                                                      cb_gain_Q7, cl_Q5, \
+                                                      subfr_len, max_gain_Q7, L))
 
-#  endif
+# endif
 
 void silk_NSQ_sse4_1(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const oac_int16            x16[],                                        /* I    Input                           */
-    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16 x16[],                                                   /* I    Input                           */
+    oac_int8 pulses[],                                                       /* O    Quantized pulse signal          */
     const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
-);
-
-#  if defined OAC_X86_PRESUME_SSE4_1
-
-#   define OVERRIDE_silk_NSQ
-#   define silk_NSQ(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \
-                    HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
-    ((void)(arch),silk_NSQ_sse4_1(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \
+    const oac_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],                 /* I    Long term prediction coefs      */
+    const oac_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ],            /* I    Noise shaping coefs             */
+    const oac_int HarmShapeGain_Q14[ MAX_NB_SUBFR ],                         /* I    Long term shaping coefs         */
+    const oac_int Tilt_Q14[ MAX_NB_SUBFR ],                                  /* I    Spectral tilt                   */
+    const oac_int32 LF_shp_Q14[ MAX_NB_SUBFR ],                              /* I    Low frequency shaping coefs     */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],                               /* I    Quantization step sizes         */
+    const oac_int pitchL[ MAX_NB_SUBFR ],                                    /* I    Pitch lags                      */
+    const oac_int Lambda_Q10,                                                /* I    Rate/distortion tradeoff        */
+    const oac_int LTP_scale_Q14                                              /* I    LTP state scaling               */
+    );
+
+# if defined OAC_X86_PRESUME_SSE4_1
+
+#  define OVERRIDE_silk_NSQ
+#  define silk_NSQ(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \
+                   HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
+        ((void)(arch), silk_NSQ_sse4_1(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \
                    HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14))
 
-#  elif defined(OAC_HAVE_RTCD)
+# elif defined(OAC_HAVE_RTCD)
 
 extern void (*const SILK_NSQ_IMPL[OAC_ARCHMASK + 1])(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const oac_int16            x16[],                                        /* I    Input                           */
-    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16 x16[],                                                   /* I    Input                           */
+    oac_int8 pulses[],                                                       /* O    Quantized pulse signal          */
     const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
-);
-
-#   define OVERRIDE_silk_NSQ
-#   define silk_NSQ(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \
-                    HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
-    ((*SILK_NSQ_IMPL[(arch) & OAC_ARCHMASK])(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \
-                   HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14))
+    const oac_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],                 /* I    Long term prediction coefs      */
+    const oac_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ],            /* I    Noise shaping coefs             */
+    const oac_int HarmShapeGain_Q14[ MAX_NB_SUBFR ],                         /* I    Long term shaping coefs         */
+    const oac_int Tilt_Q14[ MAX_NB_SUBFR ],                                  /* I    Spectral tilt                   */
+    const oac_int32 LF_shp_Q14[ MAX_NB_SUBFR ],                              /* I    Low frequency shaping coefs     */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],                               /* I    Quantization step sizes         */
+    const oac_int pitchL[ MAX_NB_SUBFR ],                                    /* I    Pitch lags                      */
+    const oac_int Lambda_Q10,                                                /* I    Rate/distortion tradeoff        */
+    const oac_int LTP_scale_Q14                                              /* I    LTP state scaling               */
+    );
+
+#  define OVERRIDE_silk_NSQ
+#  define silk_NSQ(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \
+                   HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
+        ((*SILK_NSQ_IMPL[(arch)&OAC_ARCHMASK])(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \
+                                               HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, \
+                                               LTP_scale_Q14))
 
-#  endif
+# endif
 
 void silk_NSQ_del_dec_sse4_1(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const oac_int16            x16[],                                        /* I    Input                           */
-    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16 x16[],                                                   /* I    Input                           */
+    oac_int8 pulses[],                                                       /* O    Quantized pulse signal          */
     const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
-);
+    const oac_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],                 /* I    Long term prediction coefs      */
+    const oac_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ],            /* I    Noise shaping coefs             */
+    const oac_int HarmShapeGain_Q14[ MAX_NB_SUBFR ],                         /* I    Long term shaping coefs         */
+    const oac_int Tilt_Q14[ MAX_NB_SUBFR ],                                  /* I    Spectral tilt                   */
+    const oac_int32 LF_shp_Q14[ MAX_NB_SUBFR ],                              /* I    Low frequency shaping coefs     */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],                               /* I    Quantization step sizes         */
+    const oac_int pitchL[ MAX_NB_SUBFR ],                                    /* I    Pitch lags                      */
+    const oac_int Lambda_Q10,                                                /* I    Rate/distortion tradeoff        */
+    const oac_int LTP_scale_Q14                                              /* I    LTP state scaling               */
+    );
 
 void silk_NSQ_del_dec_avx2(
     const silk_encoder_state *psEncC,                            /* I    Encoder State               */
@@ -170,130 +173,135 @@ void silk_NSQ_del_dec_avx2(
     const oac_int32 pitchL[MAX_NB_SUBFR],                       /* I    Pitch lags                  */
     const oac_int Lambda_Q10,                                   /* I    Rate/distortion tradeoff    */
     const oac_int LTP_scale_Q14                                 /* I    LTP state scaling           */
-);
+    );
 
-#  if defined (OAC_X86_PRESUME_AVX2)
+# if defined (OAC_X86_PRESUME_AVX2)
 
-#   define OVERRIDE_silk_NSQ_del_dec
-#   define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
-                            HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
-    ((void)(arch),silk_NSQ_del_dec_avx2(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
+#  define OVERRIDE_silk_NSQ_del_dec
+#  define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
+                           HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
+        ((void)(arch), silk_NSQ_del_dec_avx2(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
                            HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14))
 
-#  elif defined (OAC_X86_PRESUME_SSE4_1) && !defined(OAC_X86_MAY_HAVE_AVX2)
+# elif defined (OAC_X86_PRESUME_SSE4_1) && !defined(OAC_X86_MAY_HAVE_AVX2)
 
-#   define OVERRIDE_silk_NSQ_del_dec
-#   define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
-                            HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
-    ((void)(arch),silk_NSQ_del_dec_sse4_1(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
+#  define OVERRIDE_silk_NSQ_del_dec
+#  define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
+                           HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
+        ((void)(arch), silk_NSQ_del_dec_sse4_1(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
                            HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14))
 
-#  elif defined(OAC_HAVE_RTCD)
+# elif defined(OAC_HAVE_RTCD)
 
 extern void (*const SILK_NSQ_DEL_DEC_IMPL[OAC_ARCHMASK + 1])(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const oac_int16            x16[],                                        /* I    Input                           */
-    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16 x16[],                                                   /* I    Input                           */
+    oac_int8 pulses[],                                                       /* O    Quantized pulse signal          */
     const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
-);
-
-#   define OVERRIDE_silk_NSQ_del_dec
-#   define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
-                            HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
-    ((*SILK_NSQ_DEL_DEC_IMPL[(arch) & OAC_ARCHMASK])(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
-                           HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14))
+    const oac_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],                 /* I    Long term prediction coefs      */
+    const oac_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ],            /* I    Noise shaping coefs             */
+    const oac_int HarmShapeGain_Q14[ MAX_NB_SUBFR ],                         /* I    Long term shaping coefs         */
+    const oac_int Tilt_Q14[ MAX_NB_SUBFR ],                                  /* I    Spectral tilt                   */
+    const oac_int32 LF_shp_Q14[ MAX_NB_SUBFR ],                              /* I    Low frequency shaping coefs     */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],                               /* I    Quantization step sizes         */
+    const oac_int pitchL[ MAX_NB_SUBFR ],                                    /* I    Pitch lags                      */
+    const oac_int Lambda_Q10,                                                /* I    Rate/distortion tradeoff        */
+    const oac_int LTP_scale_Q14                                              /* I    LTP state scaling               */
+    );
+
+#  define OVERRIDE_silk_NSQ_del_dec
+#  define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
+                           HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
+        ((*SILK_NSQ_DEL_DEC_IMPL[(arch)&OAC_ARCHMASK])(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, \
+                                                       AR_Q13, \
+                                                       HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, \
+                                                       Lambda_Q10, LTP_scale_Q14))
 
-#  endif
+# endif
 
 void silk_noise_shape_quantizer(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                       */
-    oac_int            signalType,             /* I    Signal type                     */
-    const oac_int32    x_sc_Q10[],             /* I                                    */
-    oac_int8           pulses[],               /* O                                    */
-    oac_int16          xq[],                   /* O                                    */
-    oac_int32          sLTP_Q15[],             /* I/O  LTP state                       */
-    const oac_int16    a_Q12[],                /* I    Short term prediction coefs     */
-    const oac_int16    b_Q14[],                /* I    Long term prediction coefs      */
-    const oac_int16    AR_shp_Q13[],           /* I    Noise shaping AR coefs          */
-    oac_int            lag,                    /* I    Pitch lag                       */
-    oac_int32          HarmShapeFIRPacked_Q14, /* I                                    */
-    oac_int            Tilt_Q14,               /* I    Spectral tilt                   */
-    oac_int32          LF_shp_Q14,             /* I                                    */
-    oac_int32          Gain_Q16,               /* I                                    */
-    oac_int            Lambda_Q10,             /* I                                    */
-    oac_int            offset_Q10,             /* I                                    */
-    oac_int            length,                 /* I    Input length                    */
-    oac_int            shapingLPCOrder,        /* I    Noise shaping AR filter order   */
-    oac_int            predictLPCOrder,        /* I    Prediction filter order         */
-    int                 arch                    /* I    Architecture                    */
-);
+    oac_int signalType,                        /* I    Signal type                     */
+    const oac_int32 x_sc_Q10[],                /* I                                    */
+    oac_int8 pulses[],                         /* O                                    */
+    oac_int16 xq[],                            /* O                                    */
+    oac_int32 sLTP_Q15[],                      /* I/O  LTP state                       */
+    const oac_int16 a_Q12[],                   /* I    Short term prediction coefs     */
+    const oac_int16 b_Q14[],                   /* I    Long term prediction coefs      */
+    const oac_int16 AR_shp_Q13[],              /* I    Noise shaping AR coefs          */
+    oac_int lag,                               /* I    Pitch lag                       */
+    oac_int32 HarmShapeFIRPacked_Q14,          /* I                                    */
+    oac_int Tilt_Q14,                          /* I    Spectral tilt                   */
+    oac_int32 LF_shp_Q14,                      /* I                                    */
+    oac_int32 Gain_Q16,                        /* I                                    */
+    oac_int Lambda_Q10,                        /* I                                    */
+    oac_int offset_Q10,                        /* I                                    */
+    oac_int length,                            /* I    Input length                    */
+    oac_int shapingLPCOrder,                   /* I    Noise shaping AR filter order   */
+    oac_int predictLPCOrder,                   /* I    Prediction filter order         */
+    int arch                                    /* I    Architecture                    */
+    );
 
 /**************************/
 /* Noise level estimation */
 /**************************/
 void silk_VAD_GetNoiseLevels(
-    const oac_int32            pX[ VAD_N_BANDS ],  /* I    subband energies                            */
+    const oac_int32 pX[ VAD_N_BANDS ],             /* I    subband energies                            */
     silk_VAD_state              *psSilk_VAD         /* I/O  Pointer to Silk VAD state                   */
-);
+    );
 
 oac_int silk_VAD_GetSA_Q8_sse4_1(
     silk_encoder_state *psEnC,
-    const oac_int16   pIn[]
-);
+    const oac_int16 pIn[]);
 
-#  if defined(OAC_X86_PRESUME_SSE4_1)
+# if defined(OAC_X86_PRESUME_SSE4_1)
 
-#   define OVERRIDE_silk_VAD_GetSA_Q8
-#   define silk_VAD_GetSA_Q8(psEnC, pIn, arch) ((void)(arch),silk_VAD_GetSA_Q8_sse4_1(psEnC, pIn))
+#  define OVERRIDE_silk_VAD_GetSA_Q8
+#  define silk_VAD_GetSA_Q8(psEnC, pIn, arch) ((void)(arch), silk_VAD_GetSA_Q8_sse4_1(psEnC, pIn))
 
-#  elif defined(OAC_HAVE_RTCD)
+# elif defined(OAC_HAVE_RTCD)
 
 extern oac_int (*const SILK_VAD_GETSA_Q8_IMPL[OAC_ARCHMASK + 1])(
      silk_encoder_state *psEnC,
-     const oac_int16   pIn[]);
+     const oac_int16 pIn[]);
 
-#   define OVERRIDE_silk_VAD_GetSA_Q8
-#   define silk_VAD_GetSA_Q8(psEnC, pIn, arch) \
-      ((*SILK_VAD_GETSA_Q8_IMPL[(arch) & OAC_ARCHMASK])(psEnC, pIn))
+#  define OVERRIDE_silk_VAD_GetSA_Q8
+#  define silk_VAD_GetSA_Q8(psEnC, pIn, arch) \
+        ((*SILK_VAD_GETSA_Q8_IMPL[(arch)&OAC_ARCHMASK])(psEnC, pIn))
 
-#  endif
+# endif
 
-#ifndef FIXED_POINT
+# ifndef FIXED_POINT
 double silk_inner_product_FLP_avx2(
     const silk_float    *data1,
     const silk_float    *data2,
-    oac_int            dataSize
-);
+    oac_int dataSize);
 
-#if defined (OAC_X86_PRESUME_AVX2)
+#  if defined (OAC_X86_PRESUME_AVX2)
 
-#define OVERRIDE_inner_product_FLP
-#define silk_inner_product_FLP(data1, data2, dataSize, arch) ((void)arch,silk_inner_product_FLP_avx2(data1, data2, dataSize))
+#   define OVERRIDE_inner_product_FLP
+#   define silk_inner_product_FLP(data1, data2, dataSize, arch) ((void)arch, \
+                                                                 silk_inner_product_FLP_avx2(data1, data2, dataSize))
 
-#elif defined(OAC_HAVE_RTCD) && defined(OAC_X86_MAY_HAVE_AVX2)
+#  elif defined(OAC_HAVE_RTCD) && defined(OAC_X86_MAY_HAVE_AVX2)
 
-#define OVERRIDE_inner_product_FLP
+#   define OVERRIDE_inner_product_FLP
 extern double (*const SILK_INNER_PRODUCT_FLP_IMPL[OAC_ARCHMASK + 1])(
     const silk_float    *data1,
     const silk_float    *data2,
-    oac_int            dataSize
-);
+    oac_int dataSize
+    );
 
-#define silk_inner_product_FLP(data1, data2, dataSize, arch) ((void)arch,(*SILK_INNER_PRODUCT_FLP_IMPL[(arch) & OAC_ARCHMASK])(data1, data2, dataSize))
-
-#endif
-#endif
+#   define silk_inner_product_FLP(data1, data2, dataSize, arch) ((void)arch, \
+                                                                 (*SILK_INNER_PRODUCT_FLP_IMPL[(arch) \
+                                                                                               &OAC_ARCHMASK])(data1, \
+                                                                                                               data2, \
+                                                                                                               dataSize))
 
+#  endif
 # endif
+
+#endif
 #endif
diff --git a/silk/x86/x86_silk_map.c b/silk/x86/x86_silk_map.c
index 92d8214ce..514c5a941 100644
--- a/silk/x86/x86_silk_map.c
+++ b/silk/x86/x86_silk_map.c
@@ -23,74 +23,74 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #if defined(HAVE_CONFIG_H)
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "celt/x86/x86cpu.h"
 #include "structs.h"
 #include "SigProc_FIX.h"
 #ifndef FIXED_POINT
-#include "SigProc_FLP.h"
+# include "SigProc_FLP.h"
 #endif
 #include "pitch.h"
 #include "main.h"
 
 #if defined(OAC_HAVE_RTCD) && !defined(OAC_X86_PRESUME_AVX2)
 
-#if defined(FIXED_POINT)
+# if defined(FIXED_POINT)
 
-#include "fixed/main_FIX.h"
+#  include "fixed/main_FIX.h"
 
 oac_int64 (*const SILK_INNER_PROD16_IMPL[ OAC_ARCHMASK + 1 ] )(
     const oac_int16 *inVec1,
     const oac_int16 *inVec2,
-    const oac_int   len
-) = {
-  silk_inner_prod16_c,                  /* non-sse */
-  silk_inner_prod16_c,
-  silk_inner_prod16_c,
-  MAY_HAVE_SSE4_1( silk_inner_prod16 ), /* sse4.1 */
-  MAY_HAVE_SSE4_1( silk_inner_prod16 )  /* avx */
+    const oac_int len
+    ) = {
+    silk_inner_prod16_c,                /* non-sse */
+    silk_inner_prod16_c,
+    silk_inner_prod16_c,
+    MAY_HAVE_SSE4_1( silk_inner_prod16 ), /* sse4.1 */
+    MAY_HAVE_SSE4_1( silk_inner_prod16 ) /* avx */
 };
 
-#endif
+# endif
 
 oac_int (*const SILK_VAD_GETSA_Q8_IMPL[ OAC_ARCHMASK + 1 ] )(
     silk_encoder_state *psEncC,
-    const oac_int16   pIn[]
-) = {
-  silk_VAD_GetSA_Q8_c,                  /* non-sse */
-  silk_VAD_GetSA_Q8_c,
-  silk_VAD_GetSA_Q8_c,
-  MAY_HAVE_SSE4_1( silk_VAD_GetSA_Q8 ), /* sse4.1 */
-  MAY_HAVE_SSE4_1( silk_VAD_GetSA_Q8 )  /* avx */
+    const oac_int16 pIn[]
+    ) = {
+    silk_VAD_GetSA_Q8_c,                /* non-sse */
+    silk_VAD_GetSA_Q8_c,
+    silk_VAD_GetSA_Q8_c,
+    MAY_HAVE_SSE4_1( silk_VAD_GetSA_Q8 ), /* sse4.1 */
+    MAY_HAVE_SSE4_1( silk_VAD_GetSA_Q8 ) /* avx */
 };
 
 void (*const SILK_NSQ_IMPL[ OAC_ARCHMASK + 1 ] )(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const oac_int16            x16[],                                        /* I    Input                           */
-    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16 x16[],                                                   /* I    Input                           */
+    oac_int8 pulses[],                                                       /* O    Quantized pulse signal          */
     const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
-) = {
-  silk_NSQ_c,                  /* non-sse */
-  silk_NSQ_c,
-  silk_NSQ_c,
-  MAY_HAVE_SSE4_1( silk_NSQ ), /* sse4.1 */
-  MAY_HAVE_SSE4_1( silk_NSQ )  /* avx */
+    const oac_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],                 /* I    Long term prediction coefs      */
+    const oac_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ],            /* I    Noise shaping coefs             */
+    const oac_int HarmShapeGain_Q14[ MAX_NB_SUBFR ],                         /* I    Long term shaping coefs         */
+    const oac_int Tilt_Q14[ MAX_NB_SUBFR ],                                  /* I    Spectral tilt                   */
+    const oac_int32 LF_shp_Q14[ MAX_NB_SUBFR ],                              /* I    Low frequency shaping coefs     */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],                               /* I    Quantization step sizes         */
+    const oac_int pitchL[ MAX_NB_SUBFR ],                                    /* I    Pitch lags                      */
+    const oac_int Lambda_Q10,                                                /* I    Rate/distortion tradeoff        */
+    const oac_int LTP_scale_Q14                                              /* I    LTP state scaling               */
+    ) = {
+    silk_NSQ_c,                /* non-sse */
+    silk_NSQ_c,
+    silk_NSQ_c,
+    MAY_HAVE_SSE4_1( silk_NSQ ), /* sse4.1 */
+    MAY_HAVE_SSE4_1( silk_NSQ ) /* avx */
 };
 
 void (*const SILK_VQ_WMAT_EC_IMPL[ OAC_ARCHMASK + 1 ] )(
@@ -103,77 +103,77 @@ void (*const SILK_VQ_WMAT_EC_IMPL[ OAC_ARCHMASK + 1 ] )(
     const oac_int8             *cb_Q7,                         /* I    codebook                                    */
     const oac_uint8            *cb_gain_Q7,                    /* I    codebook effective gain                     */
     const oac_uint8            *cl_Q5,                         /* I    code length for each codebook vector        */
-    const oac_int              subfr_len,                      /* I    number of samples per subframe              */
-    const oac_int32            max_gain_Q7,                    /* I    maximum sum of absolute LTP coefficients    */
-    const oac_int              L                               /* I    number of vectors in codebook               */
-) = {
-  silk_VQ_WMat_EC_c,                  /* non-sse */
-  silk_VQ_WMat_EC_c,
-  silk_VQ_WMat_EC_c,
-  MAY_HAVE_SSE4_1( silk_VQ_WMat_EC ), /* sse4.1 */
-  MAY_HAVE_SSE4_1( silk_VQ_WMat_EC )  /* avx */
+    const oac_int subfr_len,                                   /* I    number of samples per subframe              */
+    const oac_int32 max_gain_Q7,                               /* I    maximum sum of absolute LTP coefficients    */
+    const oac_int L                                            /* I    number of vectors in codebook               */
+    ) = {
+    silk_VQ_WMat_EC_c,                /* non-sse */
+    silk_VQ_WMat_EC_c,
+    silk_VQ_WMat_EC_c,
+    MAY_HAVE_SSE4_1( silk_VQ_WMat_EC ), /* sse4.1 */
+    MAY_HAVE_SSE4_1( silk_VQ_WMat_EC ) /* avx */
 };
 
 void (*const SILK_NSQ_DEL_DEC_IMPL[ OAC_ARCHMASK + 1 ] )(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
-    const oac_int16            x16[],                                        /* I    Input                           */
-    oac_int8                   pulses[],                                     /* O    Quantized pulse signal          */
+    const oac_int16 x16[],                                                   /* I    Input                           */
+    oac_int8 pulses[],                                                       /* O    Quantized pulse signal          */
     const oac_int16            *PredCoef_Q12,                                /* I    Short term prediction coefs     */
-    const oac_int16            LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],      /* I    Long term prediction coefs      */
-    const oac_int16            AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I    Noise shaping coefs             */
-    const oac_int              HarmShapeGain_Q14[ MAX_NB_SUBFR ],            /* I    Long term shaping coefs         */
-    const oac_int              Tilt_Q14[ MAX_NB_SUBFR ],                     /* I    Spectral tilt                   */
-    const oac_int32            LF_shp_Q14[ MAX_NB_SUBFR ],                   /* I    Low frequency shaping coefs     */
-    const oac_int32            Gains_Q16[ MAX_NB_SUBFR ],                    /* I    Quantization step sizes         */
-    const oac_int              pitchL[ MAX_NB_SUBFR ],                       /* I    Pitch lags                      */
-    const oac_int              Lambda_Q10,                                   /* I    Rate/distortion tradeoff        */
-    const oac_int              LTP_scale_Q14                                 /* I    LTP state scaling               */
-) = {
-  silk_NSQ_del_dec_c,                  /* non-sse */
-  silk_NSQ_del_dec_c,
-  silk_NSQ_del_dec_c,
-  MAY_HAVE_SSE4_1( silk_NSQ_del_dec ), /* sse4.1 */
-  MAY_HAVE_AVX2( silk_NSQ_del_dec )  /* avx */
+    const oac_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],                 /* I    Long term prediction coefs      */
+    const oac_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ],            /* I    Noise shaping coefs             */
+    const oac_int HarmShapeGain_Q14[ MAX_NB_SUBFR ],                         /* I    Long term shaping coefs         */
+    const oac_int Tilt_Q14[ MAX_NB_SUBFR ],                                  /* I    Spectral tilt                   */
+    const oac_int32 LF_shp_Q14[ MAX_NB_SUBFR ],                              /* I    Low frequency shaping coefs     */
+    const oac_int32 Gains_Q16[ MAX_NB_SUBFR ],                               /* I    Quantization step sizes         */
+    const oac_int pitchL[ MAX_NB_SUBFR ],                                    /* I    Pitch lags                      */
+    const oac_int Lambda_Q10,                                                /* I    Rate/distortion tradeoff        */
+    const oac_int LTP_scale_Q14                                              /* I    LTP state scaling               */
+    ) = {
+    silk_NSQ_del_dec_c,                /* non-sse */
+    silk_NSQ_del_dec_c,
+    silk_NSQ_del_dec_c,
+    MAY_HAVE_SSE4_1( silk_NSQ_del_dec ), /* sse4.1 */
+    MAY_HAVE_AVX2( silk_NSQ_del_dec ) /* avx */
 };
 
-#if defined(FIXED_POINT)
+# if defined(FIXED_POINT)
 
 void (*const SILK_BURG_MODIFIED_IMPL[ OAC_ARCHMASK + 1 ] )(
     oac_int32                  *res_nrg,           /* O    Residual energy                                             */
     oac_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
-    oac_int32                  A_Q16[],            /* O    Prediction coefficients (length order)                      */
-    const oac_int16            x[],                /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
-    const oac_int32            minInvGain_Q30,     /* I    Inverse of max prediction gain                              */
-    const oac_int              subfr_length,       /* I    Input signal subframe length (incl. D preceding samples)    */
-    const oac_int              nb_subfr,           /* I    Number of subframes stacked in x                            */
-    const oac_int              D,                  /* I    Order                                                       */
-    int                         arch                /* I    Run-time architecture                                       */
-) = {
-  silk_burg_modified_c,                  /* non-sse */
-  silk_burg_modified_c,
-  silk_burg_modified_c,
-  MAY_HAVE_SSE4_1( silk_burg_modified ), /* sse4.1 */
-  MAY_HAVE_SSE4_1( silk_burg_modified )  /* avx */
+    oac_int32 A_Q16[],                             /* O    Prediction coefficients (length order)                      */
+    const oac_int16 x[],                           /* I    Input signal, length: nb_subfr * ( D + subfr_length )       */
+    const oac_int32 minInvGain_Q30,                /* I    Inverse of max prediction gain                              */
+    const oac_int subfr_length,                    /* I    Input signal subframe length (incl. D preceding samples)    */
+    const oac_int nb_subfr,                        /* I    Number of subframes stacked in x                            */
+    const oac_int D,                               /* I    Order                                                       */
+    int arch                                        /* I    Run-time architecture                                       */
+    ) = {
+    silk_burg_modified_c,                /* non-sse */
+    silk_burg_modified_c,
+    silk_burg_modified_c,
+    MAY_HAVE_SSE4_1( silk_burg_modified ), /* sse4.1 */
+    MAY_HAVE_SSE4_1( silk_burg_modified ) /* avx */
 };
 
-#endif
+# endif
 
-#ifndef FIXED_POINT
+# ifndef FIXED_POINT
 
 double (*const SILK_INNER_PRODUCT_FLP_IMPL[ OAC_ARCHMASK + 1 ] )(
     const silk_float    *data1,
     const silk_float    *data2,
-    oac_int            dataSize
-) = {
-  silk_inner_product_FLP_c,                  /* non-sse */
-  silk_inner_product_FLP_c,
-  silk_inner_product_FLP_c,
-  silk_inner_product_FLP_c, /* sse4.1 */
-  MAY_HAVE_AVX2( silk_inner_product_FLP )  /* avx */
+    oac_int dataSize
+    ) = {
+    silk_inner_product_FLP_c,                /* non-sse */
+    silk_inner_product_FLP_c,
+    silk_inner_product_FLP_c,
+    silk_inner_product_FLP_c, /* sse4.1 */
+    MAY_HAVE_AVX2( silk_inner_product_FLP ) /* avx */
 };
 
-#endif
+# endif
 
 #endif
diff --git a/silk/xtensa/SigProc_FIX_lx7.h b/silk/xtensa/SigProc_FIX_lx7.h
index cea902bac..121e3350d 100644
--- a/silk/xtensa/SigProc_FIX_lx7.h
+++ b/silk/xtensa/SigProc_FIX_lx7.h
@@ -1,42 +1,41 @@
 /***********************************************************************
-Copyright (C) 2025 Xiph.Org Foundation and contributors.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (C) 2025 Xiph.Org Foundation and contributors.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_SIGPROC_FIX_LX7_H
 #define SILK_SIGPROC_FIX_LX7_H
 
 #undef silk_SAT16
-static inline short int silk_SAT16_lx7(oac_int32 a)
-{
+static inline short int silk_SAT16_lx7(oac_int32 a) {
     oac_int32 res;
-    __asm__(
+    __asm__ (
         "clamps %0, %1, 15\n\t"
-        : "=r"(res)
-        : "r"(a)
-    );
+        : "=r" (res)
+        : "r" (a)
+        );
     return res;
 }
 #define silk_SAT16(a) (silk_SAT16_lx7(a))
diff --git a/silk/xtensa/macros_lx7.h b/silk/xtensa/macros_lx7.h
index b6c2183ab..53524b48e 100644
--- a/silk/xtensa/macros_lx7.h
+++ b/silk/xtensa/macros_lx7.h
@@ -1,28 +1,28 @@
 /***********************************************************************
-Copyright (C) 2025 Xiph.Org Foundation and contributors.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-- Neither the name of Internet Society, IETF or IETF Trust, nor the
-names of specific contributors, may be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+   Copyright (C) 2025 Xiph.Org Foundation and contributors.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   - Neither the name of Internet Society, IETF or IETF Trust, nor the
+   names of specific contributors, may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
 ***********************************************************************/
 
 #ifndef SILK_MACROS_LX7_H
@@ -31,18 +31,17 @@ POSSIBILITY OF SUCH DAMAGE.
 /* This macro only avoids the undefined behaviour from a left shift of
    a negative value. It should only be used in macros that can't include
    SigProc_FIX.h. In other cases, use silk_LSHIFT32(). */
-#define SAFE_SHL(a, b) ((oac_int32)((oac_uint32)(a) << (b)))
+#define SAFE_SHL(a, b) ((oac_int32)((oac_uint32)(a)<<(b)))
 
 /* (a32 * (oac_int32)((oac_int16)(b32))) >> 16 output have to be 32bit int */
 #undef silk_SMULWB
-static OAC_INLINE oac_int32 silk_SMULWB_lx7(oac_int32 a32, oac_int32 b32)
-{
+static OAC_INLINE oac_int32 silk_SMULWB_lx7(oac_int32 a32, oac_int32 b32) {
     oac_int32 res;
-    __asm__(
+    __asm__ (
         "mulsh %0, %1, %2\n\t"
-        : "=r"(res)
-        : "r"(a32), "r"(SAFE_SHL(b32, 16))
-    );
+        : "=r" (res)
+        : "r" (a32), "r" (SAFE_SHL(b32, 16))
+        );
     return res;
 }
 #define silk_SMULWB(a32, b32) (silk_SMULWB_lx7(a32, b32))
@@ -53,14 +52,13 @@ static OAC_INLINE oac_int32 silk_SMULWB_lx7(oac_int32 a32, oac_int32 b32)
 
 /* (a32 * (b32 >> 16)) >> 16 */
 #undef silk_SMULWT
-static OAC_INLINE oac_int32 silk_SMULWT_lx7(oac_int32 a32, oac_int32 b32)
-{
+static OAC_INLINE oac_int32 silk_SMULWT_lx7(oac_int32 a32, oac_int32 b32) {
     oac_int32 res;
-    __asm__(
+    __asm__ (
         "mulsh %0, %1, %2\n\t"
-        : "=r"(res)
-        : "r"(a32), "r"(SAFE_SHL(b32 >> 16, 16))
-    );
+        : "=r" (res)
+        : "r" (a32), "r" (SAFE_SHL(b32>>16, 16))
+        );
     return res;
 }
 
@@ -69,8 +67,7 @@ static OAC_INLINE oac_int32 silk_SMULWT_lx7(oac_int32 a32, oac_int32 b32)
 #define silk_SMLAWT(a32, b32, c32) ((a32) + silk_SMULWT_lx7(b32, c32))
 
 #undef silk_CLZ32
-static OAC_INLINE oac_int32 silk_CLZ32_lx7(oac_int32 in32)
-{
+static OAC_INLINE oac_int32 silk_CLZ32_lx7(oac_int32 in32) {
     return __builtin_clz(in32);
 }
 #define silk_CLZ32(in32) (silk_CLZ32_lx7(in32))
diff --git a/src/analysis.c b/src/analysis.c
index 7e9d75f44..f483ca860 100644
--- a/src/analysis.c
+++ b/src/analysis.c
@@ -23,16 +23,16 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #define ANALYSIS_C
 
 #ifdef MLP_TRAINING
-#include <stdio.h>
+# include <stdio.h>
 #endif
 
 #include "mathops.h"
@@ -47,85 +47,84 @@
 #include "float_cast.h"
 
 #ifndef M_PI
-#define M_PI 3.141592653
+# define M_PI 3.141592653
 #endif
 
 #ifndef DISABLE_FLOAT_API
 
-#define TRANSITION_PENALTY 10
+# define TRANSITION_PENALTY 10
 
 static const float dct_table[128] = {
-        0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f,
-        0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f,
-        0.351851f, 0.338330f, 0.311806f, 0.273300f, 0.224292f, 0.166664f, 0.102631f, 0.034654f,
-       -0.034654f,-0.102631f,-0.166664f,-0.224292f,-0.273300f,-0.311806f,-0.338330f,-0.351851f,
-        0.346760f, 0.293969f, 0.196424f, 0.068975f,-0.068975f,-0.196424f,-0.293969f,-0.346760f,
-       -0.346760f,-0.293969f,-0.196424f,-0.068975f, 0.068975f, 0.196424f, 0.293969f, 0.346760f,
-        0.338330f, 0.224292f, 0.034654f,-0.166664f,-0.311806f,-0.351851f,-0.273300f,-0.102631f,
-        0.102631f, 0.273300f, 0.351851f, 0.311806f, 0.166664f,-0.034654f,-0.224292f,-0.338330f,
-        0.326641f, 0.135299f,-0.135299f,-0.326641f,-0.326641f,-0.135299f, 0.135299f, 0.326641f,
-        0.326641f, 0.135299f,-0.135299f,-0.326641f,-0.326641f,-0.135299f, 0.135299f, 0.326641f,
-        0.311806f, 0.034654f,-0.273300f,-0.338330f,-0.102631f, 0.224292f, 0.351851f, 0.166664f,
-       -0.166664f,-0.351851f,-0.224292f, 0.102631f, 0.338330f, 0.273300f,-0.034654f,-0.311806f,
-        0.293969f,-0.068975f,-0.346760f,-0.196424f, 0.196424f, 0.346760f, 0.068975f,-0.293969f,
-       -0.293969f, 0.068975f, 0.346760f, 0.196424f,-0.196424f,-0.346760f,-0.068975f, 0.293969f,
-        0.273300f,-0.166664f,-0.338330f, 0.034654f, 0.351851f, 0.102631f,-0.311806f,-0.224292f,
-        0.224292f, 0.311806f,-0.102631f,-0.351851f,-0.034654f, 0.338330f, 0.166664f,-0.273300f,
+    0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f,
+    0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f,
+    0.351851f, 0.338330f, 0.311806f, 0.273300f, 0.224292f, 0.166664f, 0.102631f, 0.034654f,
+    -0.034654f, -0.102631f, -0.166664f, -0.224292f, -0.273300f, -0.311806f, -0.338330f, -0.351851f,
+    0.346760f, 0.293969f, 0.196424f, 0.068975f, -0.068975f, -0.196424f, -0.293969f, -0.346760f,
+    -0.346760f, -0.293969f, -0.196424f, -0.068975f, 0.068975f, 0.196424f, 0.293969f, 0.346760f,
+    0.338330f, 0.224292f, 0.034654f, -0.166664f, -0.311806f, -0.351851f, -0.273300f, -0.102631f,
+    0.102631f, 0.273300f, 0.351851f, 0.311806f, 0.166664f, -0.034654f, -0.224292f, -0.338330f,
+    0.326641f, 0.135299f, -0.135299f, -0.326641f, -0.326641f, -0.135299f, 0.135299f, 0.326641f,
+    0.326641f, 0.135299f, -0.135299f, -0.326641f, -0.326641f, -0.135299f, 0.135299f, 0.326641f,
+    0.311806f, 0.034654f, -0.273300f, -0.338330f, -0.102631f, 0.224292f, 0.351851f, 0.166664f,
+    -0.166664f, -0.351851f, -0.224292f, 0.102631f, 0.338330f, 0.273300f, -0.034654f, -0.311806f,
+    0.293969f, -0.068975f, -0.346760f, -0.196424f, 0.196424f, 0.346760f, 0.068975f, -0.293969f,
+    -0.293969f, 0.068975f, 0.346760f, 0.196424f, -0.196424f, -0.346760f, -0.068975f, 0.293969f,
+    0.273300f, -0.166664f, -0.338330f, 0.034654f, 0.351851f, 0.102631f, -0.311806f, -0.224292f,
+    0.224292f, 0.311806f, -0.102631f, -0.351851f, -0.034654f, 0.338330f, 0.166664f, -0.273300f,
 };
 
 static const float analysis_window[240] = {
-      0.000043f, 0.000171f, 0.000385f, 0.000685f, 0.001071f, 0.001541f, 0.002098f, 0.002739f,
-      0.003466f, 0.004278f, 0.005174f, 0.006156f, 0.007222f, 0.008373f, 0.009607f, 0.010926f,
-      0.012329f, 0.013815f, 0.015385f, 0.017037f, 0.018772f, 0.020590f, 0.022490f, 0.024472f,
-      0.026535f, 0.028679f, 0.030904f, 0.033210f, 0.035595f, 0.038060f, 0.040604f, 0.043227f,
-      0.045928f, 0.048707f, 0.051564f, 0.054497f, 0.057506f, 0.060591f, 0.063752f, 0.066987f,
-      0.070297f, 0.073680f, 0.077136f, 0.080665f, 0.084265f, 0.087937f, 0.091679f, 0.095492f,
-      0.099373f, 0.103323f, 0.107342f, 0.111427f, 0.115579f, 0.119797f, 0.124080f, 0.128428f,
-      0.132839f, 0.137313f, 0.141849f, 0.146447f, 0.151105f, 0.155823f, 0.160600f, 0.165435f,
-      0.170327f, 0.175276f, 0.180280f, 0.185340f, 0.190453f, 0.195619f, 0.200838f, 0.206107f,
-      0.211427f, 0.216797f, 0.222215f, 0.227680f, 0.233193f, 0.238751f, 0.244353f, 0.250000f,
-      0.255689f, 0.261421f, 0.267193f, 0.273005f, 0.278856f, 0.284744f, 0.290670f, 0.296632f,
-      0.302628f, 0.308658f, 0.314721f, 0.320816f, 0.326941f, 0.333097f, 0.339280f, 0.345492f,
-      0.351729f, 0.357992f, 0.364280f, 0.370590f, 0.376923f, 0.383277f, 0.389651f, 0.396044f,
-      0.402455f, 0.408882f, 0.415325f, 0.421783f, 0.428254f, 0.434737f, 0.441231f, 0.447736f,
-      0.454249f, 0.460770f, 0.467298f, 0.473832f, 0.480370f, 0.486912f, 0.493455f, 0.500000f,
-      0.506545f, 0.513088f, 0.519630f, 0.526168f, 0.532702f, 0.539230f, 0.545751f, 0.552264f,
-      0.558769f, 0.565263f, 0.571746f, 0.578217f, 0.584675f, 0.591118f, 0.597545f, 0.603956f,
-      0.610349f, 0.616723f, 0.623077f, 0.629410f, 0.635720f, 0.642008f, 0.648271f, 0.654508f,
-      0.660720f, 0.666903f, 0.673059f, 0.679184f, 0.685279f, 0.691342f, 0.697372f, 0.703368f,
-      0.709330f, 0.715256f, 0.721144f, 0.726995f, 0.732807f, 0.738579f, 0.744311f, 0.750000f,
-      0.755647f, 0.761249f, 0.766807f, 0.772320f, 0.777785f, 0.783203f, 0.788573f, 0.793893f,
-      0.799162f, 0.804381f, 0.809547f, 0.814660f, 0.819720f, 0.824724f, 0.829673f, 0.834565f,
-      0.839400f, 0.844177f, 0.848895f, 0.853553f, 0.858151f, 0.862687f, 0.867161f, 0.871572f,
-      0.875920f, 0.880203f, 0.884421f, 0.888573f, 0.892658f, 0.896677f, 0.900627f, 0.904508f,
-      0.908321f, 0.912063f, 0.915735f, 0.919335f, 0.922864f, 0.926320f, 0.929703f, 0.933013f,
-      0.936248f, 0.939409f, 0.942494f, 0.945503f, 0.948436f, 0.951293f, 0.954072f, 0.956773f,
-      0.959396f, 0.961940f, 0.964405f, 0.966790f, 0.969096f, 0.971321f, 0.973465f, 0.975528f,
-      0.977510f, 0.979410f, 0.981228f, 0.982963f, 0.984615f, 0.986185f, 0.987671f, 0.989074f,
-      0.990393f, 0.991627f, 0.992778f, 0.993844f, 0.994826f, 0.995722f, 0.996534f, 0.997261f,
-      0.997902f, 0.998459f, 0.998929f, 0.999315f, 0.999615f, 0.999829f, 0.999957f, 1.000000f,
+    0.000043f, 0.000171f, 0.000385f, 0.000685f, 0.001071f, 0.001541f, 0.002098f, 0.002739f,
+    0.003466f, 0.004278f, 0.005174f, 0.006156f, 0.007222f, 0.008373f, 0.009607f, 0.010926f,
+    0.012329f, 0.013815f, 0.015385f, 0.017037f, 0.018772f, 0.020590f, 0.022490f, 0.024472f,
+    0.026535f, 0.028679f, 0.030904f, 0.033210f, 0.035595f, 0.038060f, 0.040604f, 0.043227f,
+    0.045928f, 0.048707f, 0.051564f, 0.054497f, 0.057506f, 0.060591f, 0.063752f, 0.066987f,
+    0.070297f, 0.073680f, 0.077136f, 0.080665f, 0.084265f, 0.087937f, 0.091679f, 0.095492f,
+    0.099373f, 0.103323f, 0.107342f, 0.111427f, 0.115579f, 0.119797f, 0.124080f, 0.128428f,
+    0.132839f, 0.137313f, 0.141849f, 0.146447f, 0.151105f, 0.155823f, 0.160600f, 0.165435f,
+    0.170327f, 0.175276f, 0.180280f, 0.185340f, 0.190453f, 0.195619f, 0.200838f, 0.206107f,
+    0.211427f, 0.216797f, 0.222215f, 0.227680f, 0.233193f, 0.238751f, 0.244353f, 0.250000f,
+    0.255689f, 0.261421f, 0.267193f, 0.273005f, 0.278856f, 0.284744f, 0.290670f, 0.296632f,
+    0.302628f, 0.308658f, 0.314721f, 0.320816f, 0.326941f, 0.333097f, 0.339280f, 0.345492f,
+    0.351729f, 0.357992f, 0.364280f, 0.370590f, 0.376923f, 0.383277f, 0.389651f, 0.396044f,
+    0.402455f, 0.408882f, 0.415325f, 0.421783f, 0.428254f, 0.434737f, 0.441231f, 0.447736f,
+    0.454249f, 0.460770f, 0.467298f, 0.473832f, 0.480370f, 0.486912f, 0.493455f, 0.500000f,
+    0.506545f, 0.513088f, 0.519630f, 0.526168f, 0.532702f, 0.539230f, 0.545751f, 0.552264f,
+    0.558769f, 0.565263f, 0.571746f, 0.578217f, 0.584675f, 0.591118f, 0.597545f, 0.603956f,
+    0.610349f, 0.616723f, 0.623077f, 0.629410f, 0.635720f, 0.642008f, 0.648271f, 0.654508f,
+    0.660720f, 0.666903f, 0.673059f, 0.679184f, 0.685279f, 0.691342f, 0.697372f, 0.703368f,
+    0.709330f, 0.715256f, 0.721144f, 0.726995f, 0.732807f, 0.738579f, 0.744311f, 0.750000f,
+    0.755647f, 0.761249f, 0.766807f, 0.772320f, 0.777785f, 0.783203f, 0.788573f, 0.793893f,
+    0.799162f, 0.804381f, 0.809547f, 0.814660f, 0.819720f, 0.824724f, 0.829673f, 0.834565f,
+    0.839400f, 0.844177f, 0.848895f, 0.853553f, 0.858151f, 0.862687f, 0.867161f, 0.871572f,
+    0.875920f, 0.880203f, 0.884421f, 0.888573f, 0.892658f, 0.896677f, 0.900627f, 0.904508f,
+    0.908321f, 0.912063f, 0.915735f, 0.919335f, 0.922864f, 0.926320f, 0.929703f, 0.933013f,
+    0.936248f, 0.939409f, 0.942494f, 0.945503f, 0.948436f, 0.951293f, 0.954072f, 0.956773f,
+    0.959396f, 0.961940f, 0.964405f, 0.966790f, 0.969096f, 0.971321f, 0.973465f, 0.975528f,
+    0.977510f, 0.979410f, 0.981228f, 0.982963f, 0.984615f, 0.986185f, 0.987671f, 0.989074f,
+    0.990393f, 0.991627f, 0.992778f, 0.993844f, 0.994826f, 0.995722f, 0.996534f, 0.997261f,
+    0.997902f, 0.998459f, 0.998929f, 0.999315f, 0.999615f, 0.999829f, 0.999957f, 1.000000f,
 };
 
-static const int tbands[NB_TBANDS+1] = {
-      4, 8, 12, 16, 20, 24, 28, 32, 40, 48, 56, 64, 80, 96, 112, 136, 160, 192, 240
+static const int tbands[NB_TBANDS + 1] = {
+    4, 8, 12, 16, 20, 24, 28, 32, 40, 48, 56, 64, 80, 96, 112, 136, 160, 192, 240
 };
 
-#define NB_TONAL_SKIP_BANDS 9
+# define NB_TONAL_SKIP_BANDS 9
 
 static oac_val32 silk_resampler_down2_hp(
     oac_val32                  *S,                 /* I/O  State vector [ 2 ]                                          */
     oac_val32                  *out,               /* O    Output signal [ floor(len/2) ]                              */
     const oac_val32            *in,                /* I    Input signal [ len ]                                        */
-    int                         inLen               /* I    Number of input samples                                     */
-)
-{
+    int inLen                                       /* I    Number of input samples                                     */
+    ) {
     int k, len2 = inLen/2;
     oac_val32 in32, out32, out32_hp, Y, X;
     oac_val64 hp_ener = 0;
     /* Internal variables and state are in Q10 format */
-    for( k = 0; k < len2; k++ ) {
+    for (k = 0; k < len2; k++) {
         /* Convert to Q10 */
-        in32 = in[ 2 * k ];
+        in32 = in[ 2*k ];
 
         /* All-pass section for even input sample */
         Y      = SUB32( in32, S[ 0 ] );
@@ -134,7 +133,7 @@ static oac_val32 silk_resampler_down2_hp(
         S[ 0 ] = ADD32( in32, X );
         out32_hp = out32;
         /* Convert to Q10 */
-        in32 = in[ 2 * k + 1 ];
+        in32 = in[ 2*k + 1 ];
 
         /* All-pass section for odd input sample, and add to output of previous section */
         Y      = SUB32( in32, S[ 1 ] );
@@ -154,301 +153,286 @@ static oac_val32 silk_resampler_down2_hp(
         /* Add, convert back to int16 and store to output */
         out[ k ] = HALF32(out32);
     }
-#ifdef FIXED_POINT
+# ifdef FIXED_POINT
     /* Fitting in 32 bits. */
-    hp_ener = hp_ener >> (2*SIG_SHIFT);
+    hp_ener = hp_ener>>(2*SIG_SHIFT);
     if (hp_ener > 2147483647) hp_ener = 2147483647;
-#endif
+# endif
     return (oac_val32)hp_ener;
 }
 
-static oac_val32 downmix_and_resample(downmix_func downmix, const void *_x, oac_val32 *y, oac_val32 S[3], int subframe, int offset, int c1, int c2, int C, int Fs)
-{
-   VARDECL(oac_val32, tmp);
-   int j;
-   oac_val32 ret = 0;
-   SAVE_STACK;
-
-   if (subframe==0) return 0;
-   if (Fs == 48000)
-   {
-      subframe *= 2;
-      offset *= 2;
-   } else if (Fs == 16000) {
-      subframe = subframe*2/3;
-      offset = offset*2/3;
-   }
-   else if (Fs != 24000) celt_assert(0);
-   ALLOC(tmp, subframe, oac_val32);
-
-   downmix(_x, tmp, subframe, offset, c1, c2, C);
-   if ((c2==-2 && C==2) || c2>-1) {
-      for (j=0;j<subframe;j++) {
-         tmp[j] = HALF32(tmp[j]);
-      }
-   }
-   if (Fs == 48000)
-   {
-      ret = silk_resampler_down2_hp(S, y, tmp, subframe);
-   } else if (Fs == 24000) {
-      OAC_COPY(y, tmp, subframe);
-   } else if (Fs == 16000) {
-      VARDECL(oac_val32, tmp3x);
-      ALLOC(tmp3x, 3*subframe, oac_val32);
-      /* Don't do this at home! This resampler is horrible and it's only (barely)
-         usable for the purpose of the analysis because we don't care about all
-         the aliasing between 8 kHz and 12 kHz. */
-      for (j=0;j<subframe;j++)
-      {
-         tmp3x[3*j] = tmp[j];
-         tmp3x[3*j+1] = tmp[j];
-         tmp3x[3*j+2] = tmp[j];
-      }
-      silk_resampler_down2_hp(S, y, tmp3x, 3*subframe);
-   }
-   RESTORE_STACK;
-#ifndef FIXED_POINT
-   ret *= 1.f/32768/32768;
-#endif
-   return ret;
+static oac_val32 downmix_and_resample(downmix_func downmix, const void *_x, oac_val32 *y, oac_val32 S[3], int subframe,
+                                      int offset, int c1, int c2, int C, int Fs) {
+    VARDECL(oac_val32, tmp);
+    int j;
+    oac_val32 ret = 0;
+    SAVE_STACK;
+
+    if (subframe == 0) return 0;
+    if (Fs == 48000) {
+        subframe *= 2;
+        offset *= 2;
+    } else if (Fs == 16000) {
+        subframe = subframe*2/3;
+        offset = offset*2/3;
+    } else if (Fs != 24000) celt_assert(0);
+    ALLOC(tmp, subframe, oac_val32);
+
+    downmix(_x, tmp, subframe, offset, c1, c2, C);
+    if ((c2 == -2 && C == 2) || c2 > -1) {
+        for (j = 0; j < subframe; j++) {
+            tmp[j] = HALF32(tmp[j]);
+        }
+    }
+    if (Fs == 48000) {
+        ret = silk_resampler_down2_hp(S, y, tmp, subframe);
+    } else if (Fs == 24000) {
+        OAC_COPY(y, tmp, subframe);
+    } else if (Fs == 16000) {
+        VARDECL(oac_val32, tmp3x);
+        ALLOC(tmp3x, 3*subframe, oac_val32);
+        /* Don't do this at home! This resampler is horrible and it's only (barely)
+           usable for the purpose of the analysis because we don't care about all
+           the aliasing between 8 kHz and 12 kHz. */
+        for (j = 0; j < subframe; j++) {
+            tmp3x[3*j] = tmp[j];
+            tmp3x[3*j + 1] = tmp[j];
+            tmp3x[3*j + 2] = tmp[j];
+        }
+        silk_resampler_down2_hp(S, y, tmp3x, 3*subframe);
+    }
+    RESTORE_STACK;
+# ifndef FIXED_POINT
+    ret *= 1.f/32768/32768;
+# endif
+    return ret;
 }
 
-void tonality_analysis_init(TonalityAnalysisState *tonal, oac_int32 Fs)
-{
-  /* Initialize reusable fields. */
-  tonal->arch = oac_select_arch();
-  tonal->Fs = Fs;
-  /* Clear remaining fields. */
-  tonality_analysis_reset(tonal);
+void tonality_analysis_init(TonalityAnalysisState *tonal, oac_int32 Fs) {
+    /* Initialize reusable fields. */
+    tonal->arch = oac_select_arch();
+    tonal->Fs = Fs;
+    /* Clear remaining fields. */
+    tonality_analysis_reset(tonal);
 }
 
-void tonality_analysis_reset(TonalityAnalysisState *tonal)
-{
-  /* Clear non-reusable fields. */
-  char *start = (char*)&tonal->TONALITY_ANALYSIS_RESET_START;
-  OAC_CLEAR(start, sizeof(TonalityAnalysisState) - (start - (char*)tonal));
+void tonality_analysis_reset(TonalityAnalysisState *tonal) {
+    /* Clear non-reusable fields. */
+    char *start = (char*)&tonal->TONALITY_ANALYSIS_RESET_START;
+    OAC_CLEAR(start, sizeof(TonalityAnalysisState) - (start - (char*)tonal));
 }
 
-void tonality_get_info(TonalityAnalysisState *tonal, AnalysisInfo *info_out, int len)
-{
-   int pos;
-   int curr_lookahead;
-   float tonality_max;
-   float tonality_avg;
-   int tonality_count;
-   int i;
-   int pos0;
-   float prob_avg;
-   float prob_count;
-   float prob_min, prob_max;
-   float vad_prob;
-   int mpos, vpos;
-   int bandwidth_span;
-
-   pos = tonal->read_pos;
-   curr_lookahead = tonal->write_pos-tonal->read_pos;
-   if (curr_lookahead<0)
-      curr_lookahead += DETECT_SIZE;
-
-   tonal->read_subframe += len/(tonal->Fs/400);
-   while (tonal->read_subframe>=8)
-   {
-      tonal->read_subframe -= 8;
-      tonal->read_pos++;
-   }
-   if (tonal->read_pos>=DETECT_SIZE)
-      tonal->read_pos-=DETECT_SIZE;
-
-   /* On long frames, look at the second analysis window rather than the first. */
-   if (len > tonal->Fs/50 && pos != tonal->write_pos)
-   {
-      pos++;
-      if (pos==DETECT_SIZE)
-         pos=0;
-   }
-   if (pos == tonal->write_pos)
-      pos--;
-   if (pos<0)
-      pos = DETECT_SIZE-1;
-   pos0 = pos;
-   OAC_COPY(info_out, &tonal->info[pos], 1);
-   if (!info_out->valid)
-      return;
-   tonality_max = tonality_avg = info_out->tonality;
-   tonality_count = 1;
-   /* Look at the neighbouring frames and pick largest bandwidth found (to be safe). */
-   bandwidth_span = 6;
-   /* If possible, look ahead for a tone to compensate for the delay in the tone detector. */
-   for (i=0;i<3;i++)
-   {
-      pos++;
-      if (pos==DETECT_SIZE)
-         pos = 0;
-      if (pos == tonal->write_pos)
-         break;
-      tonality_max = MAX32(tonality_max, tonal->info[pos].tonality);
-      tonality_avg += tonal->info[pos].tonality;
-      tonality_count++;
-      info_out->bandwidth = IMAX(info_out->bandwidth, tonal->info[pos].bandwidth);
-      bandwidth_span--;
-   }
-   pos = pos0;
-   /* Look back in time to see if any has a wider bandwidth than the current frame. */
-   for (i=0;i<bandwidth_span;i++)
-   {
-      pos--;
-      if (pos < 0)
-         pos = DETECT_SIZE-1;
-      if (pos == tonal->write_pos)
-         break;
-      info_out->bandwidth = IMAX(info_out->bandwidth, tonal->info[pos].bandwidth);
-   }
-   info_out->tonality = MAX32(tonality_avg/tonality_count, tonality_max-.2f);
-
-   mpos = vpos = pos0;
-   /* If we have enough look-ahead, compensate for the ~5-frame delay in the music prob and
-      ~1 frame delay in the VAD prob. */
-   if (curr_lookahead > 15)
-   {
-      mpos += 5;
-      if (mpos>=DETECT_SIZE)
-         mpos -= DETECT_SIZE;
-      vpos += 1;
-      if (vpos>=DETECT_SIZE)
-         vpos -= DETECT_SIZE;
-   }
-
-   /* The following calculations attempt to minimize a "badness function"
-      for the transition. When switching from speech to music, the badness
-      of switching at frame k is
-      b_k = S*v_k + \sum_{i=0}^{k-1} v_i*(p_i - T)
-      where
-      v_i is the activity probability (VAD) at frame i,
-      p_i is the music probability at frame i
-      T is the probability threshold for switching
-      S is the penalty for switching during active audio rather than silence
-      the current frame has index i=0
-
-      Rather than apply badness to directly decide when to switch, what we compute
-      instead is the threshold for which the optimal switching point is now. When
-      considering whether to switch now (frame 0) or at frame k, we have:
-      S*v_0 = S*v_k + \sum_{i=0}^{k-1} v_i*(p_i - T)
-      which gives us:
-      T = ( \sum_{i=0}^{k-1} v_i*p_i + S*(v_k-v_0) ) / ( \sum_{i=0}^{k-1} v_i )
-      We take the min threshold across all positive values of k (up to the maximum
-      amount of lookahead we have) to give us the threshold for which the current
-      frame is the optimal switch point.
-
-      The last step is that we need to consider whether we want to switch at all.
-      For that we use the average of the music probability over the entire window.
-      If the threshold is higher than that average we're not going to
-      switch, so we compute a min with the average as well. The result of all these
-      min operations is music_prob_min, which gives the threshold for switching to music
-      if we're currently encoding for speech.
-
-      We do the exact opposite to compute music_prob_max which is used for switching
-      from music to speech.
-    */
-   prob_min = 1.f;
-   prob_max = 0.f;
-   vad_prob = tonal->info[vpos].activity_probability;
-   prob_count = MAX16(.1f, vad_prob);
-   prob_avg = MAX16(.1f, vad_prob)*tonal->info[mpos].music_prob;
-   while (1)
-   {
-      float pos_vad;
-      mpos++;
-      if (mpos==DETECT_SIZE)
-         mpos = 0;
-      if (mpos == tonal->write_pos)
-         break;
-      vpos++;
-      if (vpos==DETECT_SIZE)
-         vpos = 0;
-      if (vpos == tonal->write_pos)
-         break;
-      pos_vad = tonal->info[vpos].activity_probability;
-      prob_min = MIN16((prob_avg - TRANSITION_PENALTY*(vad_prob - pos_vad))/prob_count, prob_min);
-      prob_max = MAX16((prob_avg + TRANSITION_PENALTY*(vad_prob - pos_vad))/prob_count, prob_max);
-      prob_count += MAX16(.1f, pos_vad);
-      prob_avg += MAX16(.1f, pos_vad)*tonal->info[mpos].music_prob;
-   }
-   info_out->music_prob = prob_avg/prob_count;
-   prob_min = MIN16(prob_avg/prob_count, prob_min);
-   prob_max = MAX16(prob_avg/prob_count, prob_max);
-   prob_min = MAX16(prob_min, 0.f);
-   prob_max = MIN16(prob_max, 1.f);
-
-   /* If we don't have enough look-ahead, do our best to make a decent decision. */
-   if (curr_lookahead < 10)
-   {
-      float pmin, pmax;
-      pmin = prob_min;
-      pmax = prob_max;
-      pos = pos0;
-      /* Look for min/max in the past. */
-      for (i=0;i<IMIN(tonal->count-1, 15);i++)
-      {
-         pos--;
-         if (pos < 0)
-            pos = DETECT_SIZE-1;
-         pmin = MIN16(pmin, tonal->info[pos].music_prob);
-         pmax = MAX16(pmax, tonal->info[pos].music_prob);
-      }
-      /* Bias against switching on active audio. */
-      pmin = MAX16(0.f, pmin - .1f*vad_prob);
-      pmax = MIN16(1.f, pmax + .1f*vad_prob);
-      prob_min += (1.f-.1f*curr_lookahead)*(pmin - prob_min);
-      prob_max += (1.f-.1f*curr_lookahead)*(pmax - prob_max);
-   }
-   info_out->music_prob_min = prob_min;
-   info_out->music_prob_max = prob_max;
-
-   /* printf("%f %f %f %f %f\n", prob_min, prob_max, prob_avg/prob_count, vad_prob, info_out->music_prob); */
+void tonality_get_info(TonalityAnalysisState *tonal, AnalysisInfo *info_out, int len) {
+    int pos;
+    int curr_lookahead;
+    float tonality_max;
+    float tonality_avg;
+    int tonality_count;
+    int i;
+    int pos0;
+    float prob_avg;
+    float prob_count;
+    float prob_min, prob_max;
+    float vad_prob;
+    int mpos, vpos;
+    int bandwidth_span;
+
+    pos = tonal->read_pos;
+    curr_lookahead = tonal->write_pos - tonal->read_pos;
+    if (curr_lookahead < 0)
+        curr_lookahead += DETECT_SIZE;
+
+    tonal->read_subframe += len/(tonal->Fs/400);
+    while (tonal->read_subframe >= 8) {
+        tonal->read_subframe -= 8;
+        tonal->read_pos++;
+    }
+    if (tonal->read_pos >= DETECT_SIZE)
+        tonal->read_pos -= DETECT_SIZE;
+
+    /* On long frames, look at the second analysis window rather than the first. */
+    if (len > tonal->Fs/50 && pos != tonal->write_pos) {
+        pos++;
+        if (pos == DETECT_SIZE)
+            pos = 0;
+    }
+    if (pos == tonal->write_pos)
+        pos--;
+    if (pos < 0)
+        pos = DETECT_SIZE - 1;
+    pos0 = pos;
+    OAC_COPY(info_out, &tonal->info[pos], 1);
+    if (!info_out->valid)
+        return;
+    tonality_max = tonality_avg = info_out->tonality;
+    tonality_count = 1;
+    /* Look at the neighbouring frames and pick largest bandwidth found (to be safe). */
+    bandwidth_span = 6;
+    /* If possible, look ahead for a tone to compensate for the delay in the tone detector. */
+    for (i = 0; i < 3; i++) {
+        pos++;
+        if (pos == DETECT_SIZE)
+            pos = 0;
+        if (pos == tonal->write_pos)
+            break;
+        tonality_max = MAX32(tonality_max, tonal->info[pos].tonality);
+        tonality_avg += tonal->info[pos].tonality;
+        tonality_count++;
+        info_out->bandwidth = IMAX(info_out->bandwidth, tonal->info[pos].bandwidth);
+        bandwidth_span--;
+    }
+    pos = pos0;
+    /* Look back in time to see if any has a wider bandwidth than the current frame. */
+    for (i = 0; i < bandwidth_span; i++) {
+        pos--;
+        if (pos < 0)
+            pos = DETECT_SIZE - 1;
+        if (pos == tonal->write_pos)
+            break;
+        info_out->bandwidth = IMAX(info_out->bandwidth, tonal->info[pos].bandwidth);
+    }
+    info_out->tonality = MAX32(tonality_avg/tonality_count, tonality_max - .2f);
+
+    mpos = vpos = pos0;
+    /* If we have enough look-ahead, compensate for the ~5-frame delay in the music prob and
+       ~1 frame delay in the VAD prob. */
+    if (curr_lookahead > 15) {
+        mpos += 5;
+        if (mpos >= DETECT_SIZE)
+            mpos -= DETECT_SIZE;
+        vpos += 1;
+        if (vpos >= DETECT_SIZE)
+            vpos -= DETECT_SIZE;
+    }
+
+    /* The following calculations attempt to minimize a "badness function"
+       for the transition. When switching from speech to music, the badness
+       of switching at frame k is
+       b_k = S*v_k + \sum_{i=0}^{k-1} v_i*(p_i - T)
+       where
+       v_i is the activity probability (VAD) at frame i,
+       p_i is the music probability at frame i
+       T is the probability threshold for switching
+       S is the penalty for switching during active audio rather than silence
+       the current frame has index i=0
+
+       Rather than apply badness to directly decide when to switch, what we compute
+       instead is the threshold for which the optimal switching point is now. When
+       considering whether to switch now (frame 0) or at frame k, we have:
+       S*v_0 = S*v_k + \sum_{i=0}^{k-1} v_i*(p_i - T)
+       which gives us:
+       T = ( \sum_{i=0}^{k-1} v_i*p_i + S*(v_k-v_0) ) / ( \sum_{i=0}^{k-1} v_i )
+       We take the min threshold across all positive values of k (up to the maximum
+       amount of lookahead we have) to give us the threshold for which the current
+       frame is the optimal switch point.
+
+       The last step is that we need to consider whether we want to switch at all.
+       For that we use the average of the music probability over the entire window.
+       If the threshold is higher than that average we're not going to
+       switch, so we compute a min with the average as well. The result of all these
+       min operations is music_prob_min, which gives the threshold for switching to music
+       if we're currently encoding for speech.
+
+       We do the exact opposite to compute music_prob_max which is used for switching
+       from music to speech.
+     */
+    prob_min = 1.f;
+    prob_max = 0.f;
+    vad_prob = tonal->info[vpos].activity_probability;
+    prob_count = MAX16(.1f, vad_prob);
+    prob_avg = MAX16(.1f, vad_prob)*tonal->info[mpos].music_prob;
+    while (1) {
+        float pos_vad;
+        mpos++;
+        if (mpos == DETECT_SIZE)
+            mpos = 0;
+        if (mpos == tonal->write_pos)
+            break;
+        vpos++;
+        if (vpos == DETECT_SIZE)
+            vpos = 0;
+        if (vpos == tonal->write_pos)
+            break;
+        pos_vad = tonal->info[vpos].activity_probability;
+        prob_min = MIN16((prob_avg - TRANSITION_PENALTY*(vad_prob - pos_vad))/prob_count, prob_min);
+        prob_max = MAX16((prob_avg + TRANSITION_PENALTY*(vad_prob - pos_vad))/prob_count, prob_max);
+        prob_count += MAX16(.1f, pos_vad);
+        prob_avg += MAX16(.1f, pos_vad)*tonal->info[mpos].music_prob;
+    }
+    info_out->music_prob = prob_avg/prob_count;
+    prob_min = MIN16(prob_avg/prob_count, prob_min);
+    prob_max = MAX16(prob_avg/prob_count, prob_max);
+    prob_min = MAX16(prob_min, 0.f);
+    prob_max = MIN16(prob_max, 1.f);
+
+    /* If we don't have enough look-ahead, do our best to make a decent decision. */
+    if (curr_lookahead < 10) {
+        float pmin, pmax;
+        pmin = prob_min;
+        pmax = prob_max;
+        pos = pos0;
+        /* Look for min/max in the past. */
+        for (i = 0; i < IMIN(tonal->count - 1, 15); i++) {
+            pos--;
+            if (pos < 0)
+                pos = DETECT_SIZE - 1;
+            pmin = MIN16(pmin, tonal->info[pos].music_prob);
+            pmax = MAX16(pmax, tonal->info[pos].music_prob);
+        }
+        /* Bias against switching on active audio. */
+        pmin = MAX16(0.f, pmin - .1f*vad_prob);
+        pmax = MIN16(1.f, pmax + .1f*vad_prob);
+        prob_min += (1.f - .1f*curr_lookahead)*(pmin - prob_min);
+        prob_max += (1.f - .1f*curr_lookahead)*(pmax - prob_max);
+    }
+    info_out->music_prob_min = prob_min;
+    info_out->music_prob_max = prob_max;
+
+    /* printf("%f %f %f %f %f\n", prob_min, prob_max, prob_avg/prob_count, vad_prob, info_out->music_prob); */
 }
 
 static const float std_feature_bias[9] = {
-      5.684947f, 3.475288f, 1.770634f, 1.599784f, 3.773215f,
-      2.163313f, 1.260756f, 1.116868f, 1.918795f
+    5.684947f, 3.475288f, 1.770634f, 1.599784f, 3.773215f,
+    2.163313f, 1.260756f, 1.116868f, 1.918795f
 };
 
-#define LEAKAGE_OFFSET 2.5f
-#define LEAKAGE_SLOPE 2.f
+# define LEAKAGE_OFFSET 2.5f
+# define LEAKAGE_SLOPE 2.f
 
-#ifdef FIXED_POINT
+# ifdef FIXED_POINT
 /* For fixed-point, the input is +/-2^15 shifted up by SIG_SHIFT, so we need to
    compensate for that in the energy. */
-#define SCALE_COMPENS (1.f/((oac_int32)1<<(15+SIG_SHIFT)))
-#define SCALE_ENER(e) ((SCALE_COMPENS*SCALE_COMPENS)*(e))
-#else
-#define SCALE_ENER(e) ((1.f/32768/32768)*e)
-#endif
-
-#ifdef FIXED_POINT
-static int is_digital_silence32(const oac_val32* pcm, int frame_size, int channels, int lsb_depth)
-{
-   int silence = 0;
-   oac_val32 sample_max = 0;
-#ifdef MLP_TRAINING
-   return 0;
-#endif
-   sample_max = celt_maxabs32(pcm, frame_size*channels);
-
-   silence = (sample_max == 0);
-   (void)lsb_depth;
-   return silence;
+#  define SCALE_COMPENS (1.f/((oac_int32)1<<(15 + SIG_SHIFT)))
+#  define SCALE_ENER(e) ((SCALE_COMPENS*SCALE_COMPENS)*(e))
+# else
+#  define SCALE_ENER(e) ((1.f/32768/32768)*e)
+# endif
+
+# ifdef FIXED_POINT
+static int is_digital_silence32(const oac_val32* pcm, int frame_size, int channels, int lsb_depth) {
+    int silence = 0;
+    oac_val32 sample_max = 0;
+#  ifdef MLP_TRAINING
+    return 0;
+#  endif
+    sample_max = celt_maxabs32(pcm, frame_size*channels);
+
+    silence = (sample_max == 0);
+    (void)lsb_depth;
+    return silence;
 }
-#else
-#define is_digital_silence32(pcm, frame_size, channels, lsb_depth) is_digital_silence(pcm, frame_size, channels, lsb_depth)
-#endif
+# else
+#  define is_digital_silence32(pcm, frame_size, channels, lsb_depth) is_digital_silence(pcm, frame_size, channels, \
+    lsb_depth)
+# endif
 
-static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt_mode, const void *x, int len, int offset, int c1, int c2, int C, int lsb_depth, downmix_func downmix)
-{
+static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt_mode, const void *x, int len,
+                              int offset, int c1, int c2, int C, int lsb_depth, downmix_func downmix) {
     int i, b;
     const kiss_fft_state *kfft;
     VARDECL(kiss_fft_cpx, in);
     VARDECL(kiss_fft_cpx, out);
-    int N = 480, N2=240;
+    int N = 480, N2 = 240;
     float * OAC_RESTRICT A = tonal->angle;
     float * OAC_RESTRICT dA = tonal->d_angle;
     float * OAC_RESTRICT d2A = tonal->d2_angle;
@@ -463,15 +447,15 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
     /*float tw_sum=0;*/
     float frame_noisiness;
     const float pi4 = (float)(M_PI*M_PI*M_PI*M_PI);
-    float slope=0;
+    float slope = 0;
     float frame_stationarity;
     float relativeE;
     float frame_probs[2];
     float alpha, alphaE, alphaE2;
     float frame_loudness;
     float bandwidth_mask;
-    int is_masked[NB_TBANDS+1];
-    int bandwidth=0;
+    int is_masked[NB_TBANDS + 1];
+    int bandwidth = 0;
     float maxE = 0;
     float noise_floor;
     int remaining;
@@ -479,52 +463,49 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
     float hp_ener;
     float tonality2[240];
     float midE[8];
-    float spec_variability=0;
-    float band_log2[NB_TBANDS+1];
-    float leakage_from[NB_TBANDS+1];
-    float leakage_to[NB_TBANDS+1];
+    float spec_variability = 0;
+    float band_log2[NB_TBANDS + 1];
+    float leakage_from[NB_TBANDS + 1];
+    float leakage_to[NB_TBANDS + 1];
     float layer_out[MAX_NEURONS];
     float below_max_pitch;
     float above_max_pitch;
     int is_silence;
     SAVE_STACK;
 
-    if (!tonal->initialized)
-    {
-       tonal->mem_fill = 240;
-       tonal->initialized = 1;
+    if (!tonal->initialized) {
+        tonal->mem_fill = 240;
+        tonal->initialized = 1;
     }
-    alpha = 1.f/IMIN(10, 1+tonal->count);
-    alphaE = 1.f/IMIN(25, 1+tonal->count);
+    alpha = 1.f/IMIN(10, 1 + tonal->count);
+    alphaE = 1.f/IMIN(25, 1 + tonal->count);
     /* Noise floor related decay for bandwidth detection: -2.2 dB/second */
-    alphaE2 = 1.f/IMIN(100, 1+tonal->count);
+    alphaE2 = 1.f/IMIN(100, 1 + tonal->count);
     if (tonal->count <= 1) alphaE2 = 1;
 
-    if (tonal->Fs == 48000)
-    {
-       /* len and offset are now at 24 kHz. */
-       len/= 2;
-       offset /= 2;
+    if (tonal->Fs == 48000) {
+        /* len and offset are now at 24 kHz. */
+        len /= 2;
+        offset /= 2;
     } else if (tonal->Fs == 16000) {
-       len = 3*len/2;
-       offset = 3*offset/2;
+        len = 3*len/2;
+        offset = 3*offset/2;
     }
 
     kfft = celt_mode->mdct.kfft[0];
     tonal->hp_ener_accum += (float)downmix_and_resample(downmix, x,
           &tonal->inmem[tonal->mem_fill], tonal->downmix_state,
-          IMIN(len, ANALYSIS_BUF_SIZE-tonal->mem_fill), offset, c1, c2, C, tonal->Fs);
-    if (tonal->mem_fill+len < ANALYSIS_BUF_SIZE)
-    {
-       tonal->mem_fill += len;
-       /* Don't have enough to update the analysis */
-       RESTORE_STACK;
-       return;
+          IMIN(len, ANALYSIS_BUF_SIZE - tonal->mem_fill), offset, c1, c2, C, tonal->Fs);
+    if (tonal->mem_fill + len < ANALYSIS_BUF_SIZE) {
+        tonal->mem_fill += len;
+        /* Don't have enough to update the analysis */
+        RESTORE_STACK;
+        return;
     }
     hp_ener = tonal->hp_ener_accum;
     info = &tonal->info[tonal->write_pos++];
-    if (tonal->write_pos>=DETECT_SIZE)
-       tonal->write_pos-=DETECT_SIZE;
+    if (tonal->write_pos >= DETECT_SIZE)
+        tonal->write_pos -= DETECT_SIZE;
 
     is_silence = is_digital_silence32(tonal->inmem, ANALYSIS_BUF_SIZE, 1, lsb_depth);
 
@@ -532,84 +513,79 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
     ALLOC(out, 480, kiss_fft_cpx);
     ALLOC(tonality, 240, float);
     ALLOC(noisiness, 240, float);
-    for (i=0;i<N2;i++)
-    {
-       float w = analysis_window[i];
-       in[i].r = (kiss_fft_scalar)(w*tonal->inmem[i]);
-       in[i].i = (kiss_fft_scalar)(w*tonal->inmem[N2+i]);
-       in[N-i-1].r = (kiss_fft_scalar)(w*tonal->inmem[N-i-1]);
-       in[N-i-1].i = (kiss_fft_scalar)(w*tonal->inmem[N+N2-i-1]);
-    }
-    OAC_MOVE(tonal->inmem, tonal->inmem+ANALYSIS_BUF_SIZE-240, 240);
-    remaining = len - (ANALYSIS_BUF_SIZE-tonal->mem_fill);
+    for (i = 0; i < N2; i++) {
+        float w = analysis_window[i];
+        in[i].r = (kiss_fft_scalar)(w*tonal->inmem[i]);
+        in[i].i = (kiss_fft_scalar)(w*tonal->inmem[N2 + i]);
+        in[N - i - 1].r = (kiss_fft_scalar)(w*tonal->inmem[N - i - 1]);
+        in[N - i - 1].i = (kiss_fft_scalar)(w*tonal->inmem[N + N2 - i - 1]);
+    }
+    OAC_MOVE(tonal->inmem, tonal->inmem + ANALYSIS_BUF_SIZE - 240, 240);
+    remaining = len - (ANALYSIS_BUF_SIZE - tonal->mem_fill);
     tonal->hp_ener_accum = (float)downmix_and_resample(downmix, x,
           &tonal->inmem[240], tonal->downmix_state, remaining,
-          offset+ANALYSIS_BUF_SIZE-tonal->mem_fill, c1, c2, C, tonal->Fs);
+          offset + ANALYSIS_BUF_SIZE - tonal->mem_fill, c1, c2, C, tonal->Fs);
     tonal->mem_fill = 240 + remaining;
-    if (is_silence)
-    {
-       /* On silence, copy the previous analysis. */
-       int prev_pos = tonal->write_pos-2;
-       if (prev_pos < 0)
-          prev_pos += DETECT_SIZE;
-       OAC_COPY(info, &tonal->info[prev_pos], 1);
-       RESTORE_STACK;
-       return;
+    if (is_silence) {
+        /* On silence, copy the previous analysis. */
+        int prev_pos = tonal->write_pos - 2;
+        if (prev_pos < 0)
+            prev_pos += DETECT_SIZE;
+        OAC_COPY(info, &tonal->info[prev_pos], 1);
+        RESTORE_STACK;
+        return;
     }
     oac_fft(kfft, in, out, tonal->arch);
-#ifndef FIXED_POINT
+# ifndef FIXED_POINT
     /* If there's any NaN on the input, the entire output will be NaN, so we only need to check one value. */
-    if (celt_isnan(out[0].r))
-    {
-       info->valid = 0;
-       RESTORE_STACK;
-       return;
+    if (celt_isnan(out[0].r)) {
+        info->valid = 0;
+        RESTORE_STACK;
+        return;
     }
-#endif
-
-    for (i=1;i<N2;i++)
-    {
-       float X1r, X2r, X1i, X2i;
-       float angle, d_angle, d2_angle;
-       float angle2, d_angle2, d2_angle2;
-       float mod1, mod2, avg_mod;
-       X1r = (float)out[i].r+out[N-i].r;
-       X1i = (float)out[i].i-out[N-i].i;
-       X2r = (float)out[i].i+out[N-i].i;
-       X2i = (float)out[N-i].r-out[i].r;
-
-       angle = (float)(.5f/M_PI)*fast_atan2f(X1i, X1r);
-       d_angle = angle - A[i];
-       d2_angle = d_angle - dA[i];
-
-       angle2 = (float)(.5f/M_PI)*fast_atan2f(X2i, X2r);
-       d_angle2 = angle2 - angle;
-       d2_angle2 = d_angle2 - d_angle;
-
-       mod1 = d2_angle - (float)float2int(d2_angle);
-       noisiness[i] = ABS16(mod1);
-       mod1 *= mod1;
-       mod1 *= mod1;
-
-       mod2 = d2_angle2 - (float)float2int(d2_angle2);
-       noisiness[i] += ABS16(mod2);
-       mod2 *= mod2;
-       mod2 *= mod2;
-
-       avg_mod = .25f*(d2A[i]+mod1+2*mod2);
-       /* This introduces an extra delay of 2 frames in the detection. */
-       tonality[i] = 1.f/(1.f+40.f*16.f*pi4*avg_mod)-.015f;
-       /* No delay on this detection, but it's less reliable. */
-       tonality2[i] = 1.f/(1.f+40.f*16.f*pi4*mod2)-.015f;
-
-       A[i] = angle2;
-       dA[i] = d_angle2;
-       d2A[i] = mod2;
-    }
-    for (i=2;i<N2-1;i++)
-    {
-       float tt = MIN32(tonality2[i], MAX32(tonality2[i-1], tonality2[i+1]));
-       tonality[i] = .9f*MAX32(tonality[i], tt-.1f);
+# endif
+
+    for (i = 1; i < N2; i++) {
+        float X1r, X2r, X1i, X2i;
+        float angle, d_angle, d2_angle;
+        float angle2, d_angle2, d2_angle2;
+        float mod1, mod2, avg_mod;
+        X1r = (float)out[i].r + out[N - i].r;
+        X1i = (float)out[i].i - out[N - i].i;
+        X2r = (float)out[i].i + out[N - i].i;
+        X2i = (float)out[N - i].r - out[i].r;
+
+        angle = (float)(.5f/M_PI)*fast_atan2f(X1i, X1r);
+        d_angle = angle - A[i];
+        d2_angle = d_angle - dA[i];
+
+        angle2 = (float)(.5f/M_PI)*fast_atan2f(X2i, X2r);
+        d_angle2 = angle2 - angle;
+        d2_angle2 = d_angle2 - d_angle;
+
+        mod1 = d2_angle - (float)float2int(d2_angle);
+        noisiness[i] = ABS16(mod1);
+        mod1 *= mod1;
+        mod1 *= mod1;
+
+        mod2 = d2_angle2 - (float)float2int(d2_angle2);
+        noisiness[i] += ABS16(mod2);
+        mod2 *= mod2;
+        mod2 *= mod2;
+
+        avg_mod = .25f*(d2A[i] + mod1 + 2*mod2);
+        /* This introduces an extra delay of 2 frames in the detection. */
+        tonality[i] = 1.f/(1.f + 40.f*16.f*pi4*avg_mod) - .015f;
+        /* No delay on this detection, but it's less reliable. */
+        tonality2[i] = 1.f/(1.f + 40.f*16.f*pi4*mod2) - .015f;
+
+        A[i] = angle2;
+        dA[i] = d_angle2;
+        d2A[i] = mod2;
+    }
+    for (i = 2; i < N2 - 1; i++) {
+        float tt = MIN32(tonality2[i], MAX32(tonality2[i - 1], tonality2[i + 1]));
+        tonality[i] = .9f*MAX32(tonality[i], tt - .1f);
     }
     frame_tonality = 0;
     max_frame_tonality = 0;
@@ -617,310 +593,288 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
     info->activity = 0;
     frame_noisiness = 0;
     frame_stationarity = 0;
-    if (!tonal->count)
-    {
-       for (b=0;b<NB_TBANDS;b++)
-       {
-          tonal->lowE[b] = 1e10;
-          tonal->highE[b] = -1e10;
-       }
+    if (!tonal->count) {
+        for (b = 0; b < NB_TBANDS; b++) {
+            tonal->lowE[b] = 1e10;
+            tonal->highE[b] = -1e10;
+        }
     }
     relativeE = 0;
     frame_loudness = 0;
     /* The energy of the very first band is special because of DC. */
     {
-       float E = 0;
-       float X1r, X2r;
-       X1r = 2*(float)out[0].r;
-       X2r = 2*(float)out[0].i;
-       E = X1r*X1r + X2r*X2r;
-       for (i=1;i<4;i++)
-       {
-          float binE = out[i].r*(float)out[i].r + out[N-i].r*(float)out[N-i].r
-                     + out[i].i*(float)out[i].i + out[N-i].i*(float)out[N-i].i;
-          E += binE;
-       }
-       E = SCALE_ENER(E);
-       band_log2[0] = .5f*1.442695f*(float)log(E+1e-10f);
-    }
-    for (b=0;b<NB_TBANDS;b++)
-    {
-       float E=0, tE=0, nE=0;
-       float L1, L2;
-       float stationarity;
-       for (i=tbands[b];i<tbands[b+1];i++)
-       {
-          float binE = out[i].r*(float)out[i].r + out[N-i].r*(float)out[N-i].r
-                     + out[i].i*(float)out[i].i + out[N-i].i*(float)out[N-i].i;
-          binE = SCALE_ENER(binE);
-          E += binE;
-          tE += binE*MAX32(0, tonality[i]);
-          nE += binE*2.f*(.5f-noisiness[i]);
-       }
-#ifndef FIXED_POINT
-       /* Check for extreme band energies that could cause NaNs later. */
-       if (!(E<1e9f) || celt_isnan(E))
-       {
-          info->valid = 0;
-          RESTORE_STACK;
-          return;
-       }
-#endif
-
-       tonal->E[tonal->E_count][b] = E;
-       frame_noisiness += nE/(1e-15f+E);
-
-       frame_loudness += (float)sqrt(E+1e-10f);
-       logE[b] = (float)log(E+1e-10f);
-       band_log2[b+1] = .5f*1.442695f*(float)log(E+1e-10f);
-       tonal->logE[tonal->E_count][b] = logE[b];
-       if (tonal->count==0)
-          tonal->highE[b] = tonal->lowE[b] = logE[b];
-       if (tonal->highE[b] > tonal->lowE[b] + 7.5)
-       {
-          if (tonal->highE[b] - logE[b] > logE[b] - tonal->lowE[b])
-             tonal->highE[b] -= .01f;
-          else
-             tonal->lowE[b] += .01f;
-       }
-       if (logE[b] > tonal->highE[b])
-       {
-          tonal->highE[b] = logE[b];
-          tonal->lowE[b] = MAX32(tonal->highE[b]-15, tonal->lowE[b]);
-       } else if (logE[b] < tonal->lowE[b])
-       {
-          tonal->lowE[b] = logE[b];
-          tonal->highE[b] = MIN32(tonal->lowE[b]+15, tonal->highE[b]);
-       }
-       relativeE += (logE[b]-tonal->lowE[b])/(1e-5f + (tonal->highE[b]-tonal->lowE[b]));
-
-       L1=L2=0;
-       for (i=0;i<NB_FRAMES;i++)
-       {
-          L1 += (float)sqrt(tonal->E[i][b]);
-          L2 += tonal->E[i][b];
-       }
-
-       stationarity = MIN16(0.99f,L1/(float)sqrt(1e-15+NB_FRAMES*L2));
-       stationarity *= stationarity;
-       stationarity *= stationarity;
-       frame_stationarity += stationarity;
-       /*band_tonality[b] = tE/(1e-15+E)*/;
-       band_tonality[b] = MAX16(tE/(1e-15f+E), stationarity*tonal->prev_band_tonality[b]);
-#if 0
-       if (b>=NB_TONAL_SKIP_BANDS)
-       {
-          frame_tonality += tweight[b]*band_tonality[b];
-          tw_sum += tweight[b];
-       }
-#else
-       frame_tonality += band_tonality[b];
-       if (b>=NB_TBANDS-NB_TONAL_SKIP_BANDS)
-          frame_tonality -= band_tonality[b-NB_TBANDS+NB_TONAL_SKIP_BANDS];
-#endif
-       max_frame_tonality = MAX16(max_frame_tonality, (1.f+.03f*(b-NB_TBANDS))*frame_tonality);
-       slope += band_tonality[b]*(b-8);
-       /*printf("%f %f ", band_tonality[b], stationarity);*/
-       tonal->prev_band_tonality[b] = band_tonality[b];
+        float E = 0;
+        float X1r, X2r;
+        X1r = 2*(float)out[0].r;
+        X2r = 2*(float)out[0].i;
+        E = X1r*X1r + X2r*X2r;
+        for (i = 1; i < 4; i++) {
+            float binE = out[i].r*(float)out[i].r + out[N - i].r*(float)out[N - i].r
+                         + out[i].i*(float)out[i].i + out[N - i].i*(float)out[N - i].i;
+            E += binE;
+        }
+        E = SCALE_ENER(E);
+        band_log2[0] = .5f*1.442695f*(float)log(E + 1e-10f);
+    }
+    for (b = 0; b < NB_TBANDS; b++) {
+        float E = 0, tE = 0, nE = 0;
+        float L1, L2;
+        float stationarity;
+        for (i = tbands[b]; i < tbands[b + 1]; i++) {
+            float binE = out[i].r*(float)out[i].r + out[N - i].r*(float)out[N - i].r
+                         + out[i].i*(float)out[i].i + out[N - i].i*(float)out[N - i].i;
+            binE = SCALE_ENER(binE);
+            E += binE;
+            tE += binE*MAX32(0, tonality[i]);
+            nE += binE*2.f*(.5f - noisiness[i]);
+        }
+# ifndef FIXED_POINT
+        /* Check for extreme band energies that could cause NaNs later. */
+        if (!(E < 1e9f) || celt_isnan(E)) {
+            info->valid = 0;
+            RESTORE_STACK;
+            return;
+        }
+# endif
+
+        tonal->E[tonal->E_count][b] = E;
+        frame_noisiness += nE/(1e-15f + E);
+
+        frame_loudness += (float)sqrt(E + 1e-10f);
+        logE[b] = (float)log(E + 1e-10f);
+        band_log2[b + 1] = .5f*1.442695f*(float)log(E + 1e-10f);
+        tonal->logE[tonal->E_count][b] = logE[b];
+        if (tonal->count == 0)
+            tonal->highE[b] = tonal->lowE[b] = logE[b];
+        if (tonal->highE[b] > tonal->lowE[b] + 7.5) {
+            if (tonal->highE[b] - logE[b] > logE[b] - tonal->lowE[b])
+                tonal->highE[b] -= .01f;
+            else
+                tonal->lowE[b] += .01f;
+        }
+        if (logE[b] > tonal->highE[b]) {
+            tonal->highE[b] = logE[b];
+            tonal->lowE[b] = MAX32(tonal->highE[b] - 15, tonal->lowE[b]);
+        } else if (logE[b] < tonal->lowE[b]) {
+            tonal->lowE[b] = logE[b];
+            tonal->highE[b] = MIN32(tonal->lowE[b] + 15, tonal->highE[b]);
+        }
+        relativeE += (logE[b] - tonal->lowE[b])/(1e-5f + (tonal->highE[b] - tonal->lowE[b]));
+
+        L1 = L2 = 0;
+        for (i = 0; i < NB_FRAMES; i++) {
+            L1 += (float)sqrt(tonal->E[i][b]);
+            L2 += tonal->E[i][b];
+        }
+
+        stationarity = MIN16(0.99f, L1/(float)sqrt(1e-15 + NB_FRAMES*L2));
+        stationarity *= stationarity;
+        stationarity *= stationarity;
+        frame_stationarity += stationarity;
+        /*band_tonality[b] = tE/(1e-15+E)*/;
+        band_tonality[b] = MAX16(tE/(1e-15f + E), stationarity*tonal->prev_band_tonality[b]);
+# if 0
+        if (b >= NB_TONAL_SKIP_BANDS) {
+            frame_tonality += tweight[b]*band_tonality[b];
+            tw_sum += tweight[b];
+        }
+# else
+        frame_tonality += band_tonality[b];
+        if (b >= NB_TBANDS - NB_TONAL_SKIP_BANDS)
+            frame_tonality -= band_tonality[b - NB_TBANDS + NB_TONAL_SKIP_BANDS];
+# endif
+        max_frame_tonality = MAX16(max_frame_tonality, (1.f + .03f*(b - NB_TBANDS))*frame_tonality);
+        slope += band_tonality[b]*(b - 8);
+        /*printf("%f %f ", band_tonality[b], stationarity);*/
+        tonal->prev_band_tonality[b] = band_tonality[b];
     }
 
     leakage_from[0] = band_log2[0];
     leakage_to[0] = band_log2[0] - LEAKAGE_OFFSET;
-    for (b=1;b<NB_TBANDS+1;b++)
-    {
-       float leak_slope = LEAKAGE_SLOPE*(tbands[b]-tbands[b-1])/4;
-       leakage_from[b] = MIN16(leakage_from[b-1]+leak_slope, band_log2[b]);
-       leakage_to[b] = MAX16(leakage_to[b-1]-leak_slope, band_log2[b]-LEAKAGE_OFFSET);
+    for (b = 1; b < NB_TBANDS + 1; b++) {
+        float leak_slope = LEAKAGE_SLOPE*(tbands[b] - tbands[b - 1])/4;
+        leakage_from[b] = MIN16(leakage_from[b - 1] + leak_slope, band_log2[b]);
+        leakage_to[b] = MAX16(leakage_to[b - 1] - leak_slope, band_log2[b] - LEAKAGE_OFFSET);
     }
-    for (b=NB_TBANDS-2;b>=0;b--)
-    {
-       float leak_slope = LEAKAGE_SLOPE*(tbands[b+1]-tbands[b])/4;
-       leakage_from[b] = MIN16(leakage_from[b+1]+leak_slope, leakage_from[b]);
-       leakage_to[b] = MAX16(leakage_to[b+1]-leak_slope, leakage_to[b]);
+    for (b = NB_TBANDS - 2; b >= 0; b--) {
+        float leak_slope = LEAKAGE_SLOPE*(tbands[b + 1] - tbands[b])/4;
+        leakage_from[b] = MIN16(leakage_from[b + 1] + leak_slope, leakage_from[b]);
+        leakage_to[b] = MAX16(leakage_to[b + 1] - leak_slope, leakage_to[b]);
     }
-    celt_assert(NB_TBANDS+1 <= LEAK_BANDS);
-    for (b=0;b<NB_TBANDS+1;b++)
-    {
-       /* leak_boost[] is made up of two terms. The first, based on leakage_to[],
-          represents the boost needed to overcome the amount of analysis leakage
-          cause in a weaker band b by louder neighbouring bands.
-          The second, based on leakage_from[], applies to a loud band b for
-          which the quantization noise causes synthesis leakage to the weaker
-          neighbouring bands. */
-       float boost = MAX16(0, leakage_to[b] - band_log2[b]) +
-             MAX16(0, band_log2[b] - (leakage_from[b]+LEAKAGE_OFFSET));
-       info->leak_boost[b] = IMIN(255, (int)floor(.5 + 64.f*boost));
-    }
-    for (;b<LEAK_BANDS;b++) info->leak_boost[b] = 0;
-
-    for (i=0;i<NB_FRAMES;i++)
-    {
-       int j;
-       float mindist = 1e15f;
-       for (j=0;j<NB_FRAMES;j++)
-       {
-          int k;
-          float dist=0;
-          for (k=0;k<NB_TBANDS;k++)
-          {
-             float tmp;
-             tmp = tonal->logE[i][k] - tonal->logE[j][k];
-             dist += tmp*tmp;
-          }
-          if (j!=i)
-             mindist = MIN32(mindist, dist);
-       }
-       spec_variability += mindist;
+    celt_assert(NB_TBANDS + 1 <= LEAK_BANDS);
+    for (b = 0; b < NB_TBANDS + 1; b++) {
+        /* leak_boost[] is made up of two terms. The first, based on leakage_to[],
+           represents the boost needed to overcome the amount of analysis leakage
+           cause in a weaker band b by louder neighbouring bands.
+           The second, based on leakage_from[], applies to a loud band b for
+           which the quantization noise causes synthesis leakage to the weaker
+           neighbouring bands. */
+        float boost = MAX16(0, leakage_to[b] - band_log2[b])
+                      + MAX16(0, band_log2[b] - (leakage_from[b] + LEAKAGE_OFFSET));
+        info->leak_boost[b] = IMIN(255, (int)floor(.5 + 64.f*boost));
+    }
+    for (; b < LEAK_BANDS; b++)info->leak_boost[b] = 0;
+
+    for (i = 0; i < NB_FRAMES; i++) {
+        int j;
+        float mindist = 1e15f;
+        for (j = 0; j < NB_FRAMES; j++) {
+            int k;
+            float dist = 0;
+            for (k = 0; k < NB_TBANDS; k++) {
+                float tmp;
+                tmp = tonal->logE[i][k] - tonal->logE[j][k];
+                dist += tmp*tmp;
+            }
+            if (j != i)
+                mindist = MIN32(mindist, dist);
+        }
+        spec_variability += mindist;
     }
     spec_variability = (float)sqrt(spec_variability/NB_FRAMES/NB_TBANDS);
     bandwidth_mask = 0;
     bandwidth = 0;
     maxE = 0;
-    noise_floor = 5.7e-4f/(1<<(IMAX(0,lsb_depth-8)));
+    noise_floor = 5.7e-4f/(1<<(IMAX(0, lsb_depth - 8)));
     noise_floor *= noise_floor;
-    below_max_pitch=0;
-    above_max_pitch=0;
-    for (b=0;b<NB_TBANDS;b++)
-    {
-       float E=0;
-       float Em;
-       int band_start, band_end;
-       /* Keep a margin of 300 Hz for aliasing */
-       band_start = tbands[b];
-       band_end = tbands[b+1];
-       for (i=band_start;i<band_end;i++)
-       {
-          float binE = out[i].r*(float)out[i].r + out[N-i].r*(float)out[N-i].r
-                     + out[i].i*(float)out[i].i + out[N-i].i*(float)out[N-i].i;
-          E += binE;
-       }
-       E = SCALE_ENER(E);
-       maxE = MAX32(maxE, E);
-       if (band_start < 64)
-       {
-          below_max_pitch += E;
-       } else {
-          above_max_pitch += E;
-       }
-       tonal->meanE[b] = MAX32((1-alphaE2)*tonal->meanE[b], E);
-       Em = MAX32(E, tonal->meanE[b]);
-       /* Consider the band "active" only if all these conditions are met:
-          1) less than 90 dB below the peak band (maximal masking possible considering
-             both the ATH and the loudness-dependent slope of the spreading function)
-          2) above the PCM quantization noise floor
-          We use b+1 because the first CELT band isn't included in tbands[]
-       */
-       if (E*1e9f > maxE && (Em > 3*noise_floor*(band_end-band_start) || E > noise_floor*(band_end-band_start)))
-          bandwidth = b+1;
-       /* Check if the band is masked (see below). */
-       is_masked[b] = E < (tonal->prev_bandwidth >= b+1  ? .01f : .05f)*bandwidth_mask;
-       /* Use a simple follower with 13 dB/Bark slope for spreading function. */
-       bandwidth_mask = MAX32(.05f*bandwidth_mask, E);
+    below_max_pitch = 0;
+    above_max_pitch = 0;
+    for (b = 0; b < NB_TBANDS; b++) {
+        float E = 0;
+        float Em;
+        int band_start, band_end;
+        /* Keep a margin of 300 Hz for aliasing */
+        band_start = tbands[b];
+        band_end = tbands[b + 1];
+        for (i = band_start; i < band_end; i++) {
+            float binE = out[i].r*(float)out[i].r + out[N - i].r*(float)out[N - i].r
+                         + out[i].i*(float)out[i].i + out[N - i].i*(float)out[N - i].i;
+            E += binE;
+        }
+        E = SCALE_ENER(E);
+        maxE = MAX32(maxE, E);
+        if (band_start < 64) {
+            below_max_pitch += E;
+        } else {
+            above_max_pitch += E;
+        }
+        tonal->meanE[b] = MAX32((1 - alphaE2)*tonal->meanE[b], E);
+        Em = MAX32(E, tonal->meanE[b]);
+        /* Consider the band "active" only if all these conditions are met:
+           1) less than 90 dB below the peak band (maximal masking possible considering
+              both the ATH and the loudness-dependent slope of the spreading function)
+           2) above the PCM quantization noise floor
+           We use b+1 because the first CELT band isn't included in tbands[]
+         */
+        if (E*1e9f > maxE && (Em > 3*noise_floor*(band_end - band_start) || E > noise_floor*(band_end - band_start)))
+            bandwidth = b + 1;
+        /* Check if the band is masked (see below). */
+        is_masked[b] = E < (tonal->prev_bandwidth >= b + 1  ? .01f : .05f)*bandwidth_mask;
+        /* Use a simple follower with 13 dB/Bark slope for spreading function. */
+        bandwidth_mask = MAX32(.05f*bandwidth_mask, E);
     }
     /* Special case for the last two bands, for which we don't have spectrum but only
        the energy above 12 kHz. The difficulty here is that the high-pass we use
        leaks some LF energy, so we need to increase the threshold without accidentally cutting
        off the band. */
     if (tonal->Fs == 48000) {
-       float noise_ratio;
-       float Em;
-       float E = hp_ener*(1.f/(60*60));
-       noise_ratio = tonal->prev_bandwidth==20 ? 10.f : 30.f;
-
-#ifdef FIXED_POINT
-       /* silk_resampler_down2_hp() shifted right by an extra 8 bits. */
-       E *= 256.f*(1.f/Q15ONE)*(1.f/Q15ONE);
-#endif
-       above_max_pitch += E;
-       tonal->meanE[b] = MAX32((1-alphaE2)*tonal->meanE[b], E);
-       Em = MAX32(E, tonal->meanE[b]);
-       if (Em > 3*noise_ratio*noise_floor*160 || E > noise_ratio*noise_floor*160)
-          bandwidth = 20;
-       /* Check if the band is masked (see below). */
-       is_masked[b] = E < (tonal->prev_bandwidth == 20  ? .01f : .05f)*bandwidth_mask;
+        float noise_ratio;
+        float Em;
+        float E = hp_ener*(1.f/(60*60));
+        noise_ratio = tonal->prev_bandwidth == 20 ? 10.f : 30.f;
+
+# ifdef FIXED_POINT
+        /* silk_resampler_down2_hp() shifted right by an extra 8 bits. */
+        E *= 256.f*(1.f/Q15ONE)*(1.f/Q15ONE);
+# endif
+        above_max_pitch += E;
+        tonal->meanE[b] = MAX32((1 - alphaE2)*tonal->meanE[b], E);
+        Em = MAX32(E, tonal->meanE[b]);
+        if (Em > 3*noise_ratio*noise_floor*160 || E > noise_ratio*noise_floor*160)
+            bandwidth = 20;
+        /* Check if the band is masked (see below). */
+        is_masked[b] = E < (tonal->prev_bandwidth == 20  ? .01f : .05f)*bandwidth_mask;
     }
     if (above_max_pitch > below_max_pitch)
-       info->max_pitch_ratio = below_max_pitch/above_max_pitch;
+        info->max_pitch_ratio = below_max_pitch/above_max_pitch;
     else
-       info->max_pitch_ratio = 1;
+        info->max_pitch_ratio = 1;
     /* In some cases, resampling aliasing can create a small amount of energy in the first band
        being cut. So if the last band is masked, we don't include it.  */
     if (bandwidth == 20 && is_masked[NB_TBANDS])
-       bandwidth-=2;
-    else if (bandwidth > 0 && bandwidth <= NB_TBANDS && is_masked[bandwidth-1])
-       bandwidth--;
-    if (tonal->count<=2)
-       bandwidth = 20;
+        bandwidth -= 2;
+    else if (bandwidth > 0 && bandwidth <= NB_TBANDS && is_masked[bandwidth - 1])
+        bandwidth--;
+    if (tonal->count <= 2)
+        bandwidth = 20;
     frame_loudness = 20*(float)log10(frame_loudness);
-    tonal->Etracker = MAX32(tonal->Etracker-.003f, frame_loudness);
-    tonal->lowECount *= (1-alphaE);
-    if (frame_loudness < tonal->Etracker-30)
-       tonal->lowECount += alphaE;
-
-    for (i=0;i<8;i++)
-    {
-       float sum=0;
-       for (b=0;b<16;b++)
-          sum += dct_table[i*16+b]*logE[b];
-       BFCC[i] = sum;
+    tonal->Etracker = MAX32(tonal->Etracker - .003f, frame_loudness);
+    tonal->lowECount *= (1 - alphaE);
+    if (frame_loudness < tonal->Etracker - 30)
+        tonal->lowECount += alphaE;
+
+    for (i = 0; i < 8; i++) {
+        float sum = 0;
+        for (b = 0; b < 16; b++)
+            sum += dct_table[i*16 + b]*logE[b];
+        BFCC[i] = sum;
     }
-    for (i=0;i<8;i++)
-    {
-       float sum=0;
-       for (b=0;b<16;b++)
-          sum += dct_table[i*16+b]*.5f*(tonal->highE[b]+tonal->lowE[b]);
-       midE[i] = sum;
+    for (i = 0; i < 8; i++) {
+        float sum = 0;
+        for (b = 0; b < 16; b++)
+            sum += dct_table[i*16 + b]*.5f*(tonal->highE[b] + tonal->lowE[b]);
+        midE[i] = sum;
     }
 
     frame_stationarity /= NB_TBANDS;
     relativeE /= NB_TBANDS;
-    if (tonal->count<10)
-       relativeE = .5f;
+    if (tonal->count < 10)
+        relativeE = .5f;
     frame_noisiness /= NB_TBANDS;
-#if 1
-    info->activity = frame_noisiness + (1-frame_noisiness)*relativeE;
-#else
-    info->activity = .5*(1+frame_noisiness-frame_stationarity);
-#endif
-    frame_tonality = (max_frame_tonality/(NB_TBANDS-NB_TONAL_SKIP_BANDS));
+# if 1
+    info->activity = frame_noisiness + (1 - frame_noisiness)*relativeE;
+# else
+    info->activity = .5*(1 + frame_noisiness - frame_stationarity);
+# endif
+    frame_tonality = (max_frame_tonality/(NB_TBANDS - NB_TONAL_SKIP_BANDS));
     frame_tonality = MAX16(frame_tonality, tonal->prev_tonality*.8f);
     tonal->prev_tonality = frame_tonality;
 
     slope /= 8*8;
     info->tonality_slope = slope;
 
-    tonal->E_count = (tonal->E_count+1)%NB_FRAMES;
-    tonal->count = IMIN(tonal->count+1, ANALYSIS_COUNT_MAX);
+    tonal->E_count = (tonal->E_count + 1)%NB_FRAMES;
+    tonal->count = IMIN(tonal->count + 1, ANALYSIS_COUNT_MAX);
     info->tonality = frame_tonality;
 
-    for (i=0;i<4;i++)
-       features[i] = -0.12299f*(BFCC[i]+tonal->mem[i+24]) + 0.49195f*(tonal->mem[i]+tonal->mem[i+16]) + 0.69693f*tonal->mem[i+8] - 1.4349f*tonal->cmean[i];
+    for (i = 0; i < 4; i++)
+        features[i] = -0.12299f*(BFCC[i] + tonal->mem[i + 24]) + 0.49195f*(tonal->mem[i] + tonal->mem[i + 16])
+                      + 0.69693f*tonal->mem[i + 8] - 1.4349f*tonal->cmean[i];
 
-    for (i=0;i<4;i++)
-       tonal->cmean[i] = (1-alpha)*tonal->cmean[i] + alpha*BFCC[i];
+    for (i = 0; i < 4; i++)
+        tonal->cmean[i] = (1 - alpha)*tonal->cmean[i] + alpha*BFCC[i];
 
-    for (i=0;i<4;i++)
-        features[4+i] = 0.63246f*(BFCC[i]-tonal->mem[i+24]) + 0.31623f*(tonal->mem[i]-tonal->mem[i+16]);
-    for (i=0;i<3;i++)
-        features[8+i] = 0.53452f*(BFCC[i]+tonal->mem[i+24]) - 0.26726f*(tonal->mem[i]+tonal->mem[i+16]) -0.53452f*tonal->mem[i+8];
+    for (i = 0; i < 4; i++)
+        features[4 + i] = 0.63246f*(BFCC[i] - tonal->mem[i + 24]) + 0.31623f*(tonal->mem[i] - tonal->mem[i + 16]);
+    for (i = 0; i < 3; i++)
+        features[8 + i] = 0.53452f*(BFCC[i] + tonal->mem[i + 24]) - 0.26726f*(tonal->mem[i] + tonal->mem[i + 16])
+                          - 0.53452f*tonal->mem[i + 8];
 
-    if (tonal->count > 5)
-    {
-       for (i=0;i<9;i++)
-          tonal->std[i] = (1-alpha)*tonal->std[i] + alpha*features[i]*features[i];
+    if (tonal->count > 5) {
+        for (i = 0; i < 9; i++)
+            tonal->std[i] = (1 - alpha)*tonal->std[i] + alpha*features[i]*features[i];
     }
-    for (i=0;i<4;i++)
-       features[i] = BFCC[i]-midE[i];
-
-    for (i=0;i<8;i++)
-    {
-       tonal->mem[i+24] = tonal->mem[i+16];
-       tonal->mem[i+16] = tonal->mem[i+8];
-       tonal->mem[i+8] = tonal->mem[i];
-       tonal->mem[i] = BFCC[i];
+    for (i = 0; i < 4; i++)
+        features[i] = BFCC[i] - midE[i];
+
+    for (i = 0; i < 8; i++) {
+        tonal->mem[i + 24] = tonal->mem[i + 16];
+        tonal->mem[i + 16] = tonal->mem[i + 8];
+        tonal->mem[i + 8] = tonal->mem[i];
+        tonal->mem[i] = BFCC[i];
     }
-    for (i=0;i<9;i++)
-       features[11+i] = (float)sqrt(tonal->std[i]) - std_feature_bias[i];
+    for (i = 0; i < 9; i++)
+        features[11 + i] = (float)sqrt(tonal->std[i]) - std_feature_bias[i];
     features[18] = spec_variability - 0.78f;
     features[20] = info->tonality - 0.154723f;
     features[21] = info->activity - 0.724643f;
@@ -937,11 +891,11 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
     info->music_prob = frame_probs[0];
 
     /*printf("%f %f %f\n", frame_probs[0], frame_probs[1], info->music_prob);*/
-#ifdef MLP_TRAINING
-    for (i=0;i<25;i++)
-       printf("%f ", features[i]);
+# ifdef MLP_TRAINING
+    for (i = 0; i < 25; i++)
+        printf("%f ", features[i]);
     printf("\n");
-#endif
+# endif
 
     info->bandwidth = bandwidth;
     tonal->prev_bandwidth = bandwidth;
@@ -952,31 +906,30 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
 }
 
 void run_analysis(TonalityAnalysisState *analysis, const CELTMode *celt_mode, const void *analysis_pcm,
-                 int analysis_frame_size, int frame_size, int c1, int c2, int C, oac_int32 Fs,
-                 int lsb_depth, downmix_func downmix, AnalysisInfo *analysis_info)
-{
-   int offset;
-   int pcm_len;
-
-   analysis_frame_size -= analysis_frame_size&1;
-   if (analysis_pcm != NULL)
-   {
-      /* Avoid overflow/wrap-around of the analysis buffer */
-      analysis_frame_size = IMIN((DETECT_SIZE-5)*Fs/50, analysis_frame_size);
-
-      pcm_len = analysis_frame_size - analysis->analysis_offset;
-      offset = analysis->analysis_offset;
-      while (pcm_len>0) {
-         tonality_analysis(analysis, celt_mode, analysis_pcm, IMIN(Fs/50, pcm_len), offset, c1, c2, C, lsb_depth, downmix);
-         offset += Fs/50;
-         pcm_len -= Fs/50;
-      }
-      analysis->analysis_offset = analysis_frame_size;
-
-      analysis->analysis_offset -= frame_size;
-   }
-
-   tonality_get_info(analysis, analysis_info, frame_size);
+                  int analysis_frame_size, int frame_size, int c1, int c2, int C, oac_int32 Fs,
+                  int lsb_depth, downmix_func downmix, AnalysisInfo *analysis_info) {
+    int offset;
+    int pcm_len;
+
+    analysis_frame_size -= analysis_frame_size&1;
+    if (analysis_pcm != NULL) {
+        /* Avoid overflow/wrap-around of the analysis buffer */
+        analysis_frame_size = IMIN((DETECT_SIZE - 5)*Fs/50, analysis_frame_size);
+
+        pcm_len = analysis_frame_size - analysis->analysis_offset;
+        offset = analysis->analysis_offset;
+        while (pcm_len > 0) {
+            tonality_analysis(analysis, celt_mode, analysis_pcm, IMIN(Fs/50, pcm_len), offset, c1, c2, C, lsb_depth,
+            downmix);
+            offset += Fs/50;
+            pcm_len -= Fs/50;
+        }
+        analysis->analysis_offset = analysis_frame_size;
+
+        analysis->analysis_offset -= frame_size;
+    }
+
+    tonality_get_info(analysis, analysis_info, frame_size);
 }
 
 #endif /* DISABLE_FLOAT_API */
diff --git a/src/analysis.h b/src/analysis.h
index c339e4624..0e55ea980 100644
--- a/src/analysis.h
+++ b/src/analysis.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef ANALYSIS_H
 #define ANALYSIS_H
@@ -45,39 +45,39 @@
 /*#define MLP_TRAINING*/
 
 typedef struct {
-   int arch;
-   int application;
-   oac_int32 Fs;
+    int arch;
+    int application;
+    oac_int32 Fs;
 #define TONALITY_ANALYSIS_RESET_START angle
-   float angle[240];
-   float d_angle[240];
-   float d2_angle[240];
-   oac_val32 inmem[ANALYSIS_BUF_SIZE];
-   int   mem_fill;                      /* number of usable samples in the buffer */
-   float prev_band_tonality[NB_TBANDS];
-   float prev_tonality;
-   int prev_bandwidth;
-   float E[NB_FRAMES][NB_TBANDS];
-   float logE[NB_FRAMES][NB_TBANDS];
-   float lowE[NB_TBANDS];
-   float highE[NB_TBANDS];
-   float meanE[NB_TBANDS+1];
-   float mem[32];
-   float cmean[8];
-   float std[9];
-   float Etracker;
-   float lowECount;
-   int E_count;
-   int count;
-   int analysis_offset;
-   int write_pos;
-   int read_pos;
-   int read_subframe;
-   float hp_ener_accum;
-   int initialized;
-   float rnn_state[MAX_NEURONS];
-   oac_val32 downmix_state[3];
-   AnalysisInfo info[DETECT_SIZE];
+    float angle[240];
+    float d_angle[240];
+    float d2_angle[240];
+    oac_val32 inmem[ANALYSIS_BUF_SIZE];
+    int mem_fill;                       /* number of usable samples in the buffer */
+    float prev_band_tonality[NB_TBANDS];
+    float prev_tonality;
+    int prev_bandwidth;
+    float E[NB_FRAMES][NB_TBANDS];
+    float logE[NB_FRAMES][NB_TBANDS];
+    float lowE[NB_TBANDS];
+    float highE[NB_TBANDS];
+    float meanE[NB_TBANDS + 1];
+    float mem[32];
+    float cmean[8];
+    float std[9];
+    float Etracker;
+    float lowECount;
+    int E_count;
+    int count;
+    int analysis_offset;
+    int write_pos;
+    int read_pos;
+    int read_subframe;
+    float hp_ener_accum;
+    int initialized;
+    float rnn_state[MAX_NEURONS];
+    oac_val32 downmix_state[3];
+    AnalysisInfo info[DETECT_SIZE];
 } TonalityAnalysisState;
 
 /** Initialize a TonalityAnalysisState struct.
@@ -97,7 +97,7 @@ void tonality_analysis_reset(TonalityAnalysisState *analysis);
 void tonality_get_info(TonalityAnalysisState *tonal, AnalysisInfo *info_out, int len);
 
 void run_analysis(TonalityAnalysisState *analysis, const CELTMode *celt_mode, const void *analysis_pcm,
-                 int analysis_frame_size, int frame_size, int c1, int c2, int C, oac_int32 Fs,
-                 int lsb_depth, downmix_func downmix, AnalysisInfo *analysis_info);
+    int analysis_frame_size, int frame_size, int c1, int c2, int C, oac_int32 Fs,
+    int lsb_depth, downmix_func downmix, AnalysisInfo *analysis_info);
 
 #endif
diff --git a/src/extensions.c b/src/extensions.c
index af037eb46..fc2b4653a 100644
--- a/src/extensions.c
+++ b/src/extensions.c
@@ -22,10 +22,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 
@@ -43,50 +43,46 @@
     the repeated extension payloads.
    That requires higher-level logic. */
 static oac_int32 skip_extension_payload(const unsigned char **pdata,
- oac_int32 len, oac_int32 *pheader_size, int id_byte,
- oac_int32 trailing_short_len)
-{
-   const unsigned char *data;
-   oac_int32 header_size;
-   int id, L;
-   data = *pdata;
-   header_size = 0;
-   id = id_byte>>1;
-   L = id_byte&1;
-   if ((id == 0 && L == 1) || id == 2)
-   {
-      /* Nothing to do. */
-   } else if (id > 0 && id < 32)
-   {
-      if (len < L)
-         return -1;
-      data += L;
-      len -= L;
-   } else {
-      if (L==0)
-      {
-         if (len < trailing_short_len) return -1;
-         data += len - trailing_short_len;
-         len = trailing_short_len;
-      } else {
-         oac_int32 bytes=0;
-         oac_int32 lacing;
-         do {
-            if (len < 1)
-               return -1;
-            lacing = *data++;
-            bytes += lacing;
-            header_size++;
-            len -= lacing + 1;
-         } while (lacing == 255);
-         if (len < 0)
+                                        oac_int32 len, oac_int32 *pheader_size, int id_byte,
+                                        oac_int32 trailing_short_len) {
+    const unsigned char *data;
+    oac_int32 header_size;
+    int id, L;
+    data = *pdata;
+    header_size = 0;
+    id = id_byte>>1;
+    L = id_byte&1;
+    if ((id == 0 && L == 1) || id == 2) {
+        /* Nothing to do. */
+    } else if (id > 0 && id < 32) {
+        if (len < L)
             return -1;
-         data += bytes;
-      }
-   }
-   *pdata = data;
-   *pheader_size = header_size;
-   return len;
+        data += L;
+        len -= L;
+    } else {
+        if (L == 0) {
+            if (len < trailing_short_len) return -1;
+            data += len - trailing_short_len;
+            len = trailing_short_len;
+        } else {
+            oac_int32 bytes = 0;
+            oac_int32 lacing;
+            do {
+                if (len < 1)
+                    return -1;
+                lacing = *data++;
+                bytes += lacing;
+                header_size++;
+                len -= lacing + 1;
+            } while (lacing == 255);
+            if (len < 0)
+                return -1;
+            data += bytes;
+        }
+    }
+    *pdata = data;
+    *pheader_size = header_size;
+    return len;
 }
 
 /* Given an extension, advance data to the next extension and return the
@@ -96,50 +92,49 @@ static oac_int32 skip_extension_payload(const unsigned char **pdata,
    Higher-level logic is required to skip the extension payloads that come
     after it.*/
 static oac_int32 skip_extension(const unsigned char **pdata, oac_int32 len,
- oac_int32 *pheader_size)
-{
-   const unsigned char *data;
-   int id_byte;
-   if (len == 0) {
-      *pheader_size = 0;
-      return 0;
-   }
-   if (len < 1)
-      return -1;
-   data = *pdata;
-   id_byte = *data++;
-   len--;
-   len = skip_extension_payload(&data, len, pheader_size, id_byte, 0);
-   if (len >= 0) {
-      *pdata = data;
-      (*pheader_size)++;
-   }
-   return len;
+                                oac_int32 *pheader_size) {
+    const unsigned char *data;
+    int id_byte;
+    if (len == 0) {
+        *pheader_size = 0;
+        return 0;
+    }
+    if (len < 1)
+        return -1;
+    data = *pdata;
+    id_byte = *data++;
+    len--;
+    len = skip_extension_payload(&data, len, pheader_size, id_byte, 0);
+    if (len >= 0) {
+        *pdata = data;
+        (*pheader_size)++;
+    }
+    return len;
 }
 
 void oac_extension_iterator_init(OacExtensionIterator *iter,
- const unsigned char *data, oac_int32 len, oac_int32 nb_frames) {
-   celt_assert(len >= 0);
-   celt_assert(data != NULL || len == 0);
-   celt_assert(nb_frames >= 0 && nb_frames <= 48);
-   iter->repeat_data = iter->curr_data = iter->data = data;
-   iter->last_long = iter->src_data = NULL;
-   iter->curr_len = iter->len = len;
-   iter->repeat_len = iter->src_len = 0;
-   iter->trailing_short_len = 0;
-   iter->frame_max = iter->nb_frames = nb_frames;
-   iter->repeat_frame = iter->curr_frame = 0;
-   iter->repeat_l = 0;
+                                 const unsigned char *data, oac_int32 len, oac_int32 nb_frames) {
+    celt_assert(len >= 0);
+    celt_assert(data != NULL || len == 0);
+    celt_assert(nb_frames >= 0 && nb_frames <= 48);
+    iter->repeat_data = iter->curr_data = iter->data = data;
+    iter->last_long = iter->src_data = NULL;
+    iter->curr_len = iter->len = len;
+    iter->repeat_len = iter->src_len = 0;
+    iter->trailing_short_len = 0;
+    iter->frame_max = iter->nb_frames = nb_frames;
+    iter->repeat_frame = iter->curr_frame = 0;
+    iter->repeat_l = 0;
 }
 
 /* Reset the iterator so it can start iterating again from the first
     extension. */
 void oac_extension_iterator_reset(OacExtensionIterator *iter) {
-   iter->repeat_data = iter->curr_data = iter->data;
-   iter->last_long = NULL;
-   iter->curr_len = iter->len;
-   iter->repeat_frame = iter->curr_frame = 0;
-   iter->trailing_short_len = 0;
+    iter->repeat_data = iter->curr_data = iter->data;
+    iter->last_long = NULL;
+    iter->curr_len = iter->len;
+    iter->repeat_frame = iter->curr_frame = 0;
+    iter->trailing_short_len = 0;
 }
 
 /* Tell the iterator not to return any extensions for frames of index
@@ -147,76 +142,76 @@ void oac_extension_iterator_reset(OacExtensionIterator *iter) {
    This can allow it to stop iterating early if these extensions are not
     needed. */
 void oac_extension_iterator_set_frame_max(OacExtensionIterator *iter,
- int frame_max) {
-   iter->frame_max = frame_max;
+                                          int frame_max) {
+    iter->frame_max = frame_max;
 }
 
 /* Return the next repeated extension.
    The return value is non-zero if one is found, negative on error, or 0 if we
     have finished repeating extensions. */
 static int oac_extension_iterator_next_repeat(OacExtensionIterator *iter,
- oac_extension_data *ext) {
-   oac_int32 header_size;
-   celt_assert(iter->repeat_frame > 0);
-   for (;iter->repeat_frame < iter->nb_frames; iter->repeat_frame++) {
-      while (iter->src_len > 0) {
-         const unsigned char *curr_data0;
-         int repeat_id_byte;
-         repeat_id_byte = *iter->src_data;
-         iter->src_len = skip_extension(&iter->src_data, iter->src_len,
+                                              oac_extension_data *ext) {
+    oac_int32 header_size;
+    celt_assert(iter->repeat_frame > 0);
+    for (; iter->repeat_frame < iter->nb_frames; iter->repeat_frame++) {
+        while (iter->src_len > 0) {
+            const unsigned char *curr_data0;
+            int repeat_id_byte;
+            repeat_id_byte = *iter->src_data;
+            iter->src_len = skip_extension(&iter->src_data, iter->src_len,
           &header_size);
-         /* We skipped this extension earlier, so it should not fail now. */
-         celt_assert(iter->src_len >= 0);
-         /* Don't repeat padding or frame separators with a 0 increment. */
-         if (repeat_id_byte <= 3) continue;
-         /* If the "Repeat These Extensions" extension had L == 0 and this
-             is the last repeated long extension, then force decoding the
-             payload with L = 0. */
-         if (iter->repeat_l == 0
-          && iter->repeat_frame + 1 >= iter->nb_frames
-          && iter->src_data == iter->last_long) {
-            repeat_id_byte &= ~1;
-         }
-         curr_data0 = iter->curr_data;
-         iter->curr_len = skip_extension_payload(&iter->curr_data,
+            /* We skipped this extension earlier, so it should not fail now. */
+            celt_assert(iter->src_len >= 0);
+            /* Don't repeat padding or frame separators with a 0 increment. */
+            if (repeat_id_byte <= 3) continue;
+            /* If the "Repeat These Extensions" extension had L == 0 and this
+                is the last repeated long extension, then force decoding the
+                payload with L = 0. */
+            if (iter->repeat_l == 0
+                && iter->repeat_frame + 1 >= iter->nb_frames
+                && iter->src_data == iter->last_long) {
+                repeat_id_byte &= ~1;
+            }
+            curr_data0 = iter->curr_data;
+            iter->curr_len = skip_extension_payload(&iter->curr_data,
           iter->curr_len, &header_size, repeat_id_byte,
           iter->trailing_short_len);
-         if (iter->curr_len < 0) {
-            return OAC_INVALID_PACKET;
-         }
-         celt_assert(iter->curr_data - iter->data
-          == iter->len - iter->curr_len);
-         /* If we were asked to stop at frame_max, skip extensions for later
-             frames. */
-         if (iter->repeat_frame >= iter->frame_max) {
-            continue;
-         }
-         if (ext != NULL) {
-            ext->id = repeat_id_byte >> 1;
-            ext->frame = iter->repeat_frame;
-            ext->data = curr_data0 + header_size;
-            ext->len = iter->curr_data - curr_data0 - header_size;
-         }
-         return 1;
-      }
-      /* We finished repeating the extensions for this frame. */
-      iter->src_data = iter->repeat_data;
-      iter->src_len = iter->repeat_len;
-   }
-   /* We finished repeating extensions. */
-   iter->repeat_data = iter->curr_data;
-   iter->last_long = NULL;
-   /* If L == 0, advance the frame number to handle the case where we did
-       not consume all of the data with an L == 0 long extension. */
-   if (iter->repeat_l == 0) {
-      iter->curr_frame++;
-      /* Ignore additional padding if this was already the last frame. */
-      if (iter->curr_frame >= iter->nb_frames) {
-         iter->curr_len = 0;
-      }
-   }
-   iter->repeat_frame = 0;
-   return 0;
+            if (iter->curr_len < 0) {
+                return OAC_INVALID_PACKET;
+            }
+            celt_assert(iter->curr_data - iter->data ==
+             iter->len - iter->curr_len);
+            /* If we were asked to stop at frame_max, skip extensions for later
+                frames. */
+            if (iter->repeat_frame >= iter->frame_max) {
+                continue;
+            }
+            if (ext != NULL) {
+                ext->id = repeat_id_byte>>1;
+                ext->frame = iter->repeat_frame;
+                ext->data = curr_data0 + header_size;
+                ext->len = iter->curr_data - curr_data0 - header_size;
+            }
+            return 1;
+        }
+        /* We finished repeating the extensions for this frame. */
+        iter->src_data = iter->repeat_data;
+        iter->src_len = iter->repeat_len;
+    }
+    /* We finished repeating extensions. */
+    iter->repeat_data = iter->curr_data;
+    iter->last_long = NULL;
+    /* If L == 0, advance the frame number to handle the case where we did
+        not consume all of the data with an L == 0 long extension. */
+    if (iter->repeat_l == 0) {
+        iter->curr_frame++;
+        /* Ignore additional padding if this was already the last frame. */
+        if (iter->curr_frame >= iter->nb_frames) {
+            iter->curr_len = 0;
+        }
+    }
+    iter->repeat_frame = 0;
+    return 0;
 }
 
 /* Return the next extension (excluding real padding, separators, and repeat
@@ -224,131 +219,127 @@ static int oac_extension_iterator_next_repeat(OacExtensionIterator *iter,
    Due to the extension repetition mechanism, extensions are not necessarily
     returned in frame order. */
 int oac_extension_iterator_next(OacExtensionIterator *iter,
- oac_extension_data *ext) {
-   oac_int32 header_size;
-   if (iter->curr_len < 0) {
-      return OAC_INVALID_PACKET;
-   }
-   if (iter->repeat_frame > 0) {
-      int ret;
-      /* We are in the process of repeating some extensions. */
-      ret = oac_extension_iterator_next_repeat(iter, ext);
-      if (ret) return ret;
-   }
-   /* Checking this here allows oac_extension_iterator_set_frame_max() to be
-       called at any point. */
-   if (iter->curr_frame >= iter->frame_max) {
-      return 0;
-   }
-   while (iter->curr_len > 0) {
-      const unsigned char *curr_data0;
-      int id;
-      int L;
-      curr_data0 = iter->curr_data;
-      id = *curr_data0>>1;
-      L = *curr_data0&1;
-      iter->curr_len = skip_extension(&iter->curr_data, iter->curr_len,
+                                oac_extension_data *ext) {
+    oac_int32 header_size;
+    if (iter->curr_len < 0) {
+        return OAC_INVALID_PACKET;
+    }
+    if (iter->repeat_frame > 0) {
+        int ret;
+        /* We are in the process of repeating some extensions. */
+        ret = oac_extension_iterator_next_repeat(iter, ext);
+        if (ret) return ret;
+    }
+    /* Checking this here allows oac_extension_iterator_set_frame_max() to be
+        called at any point. */
+    if (iter->curr_frame >= iter->frame_max) {
+        return 0;
+    }
+    while (iter->curr_len > 0) {
+        const unsigned char *curr_data0;
+        int id;
+        int L;
+        curr_data0 = iter->curr_data;
+        id = *curr_data0>>1;
+        L = *curr_data0&1;
+        iter->curr_len = skip_extension(&iter->curr_data, iter->curr_len,
        &header_size);
-      if (iter->curr_len < 0) {
-         return OAC_INVALID_PACKET;
-      }
-      celt_assert(iter->curr_data - iter->data == iter->len - iter->curr_len);
-      if (id == 1) {
-         if (L == 0) {
-            iter->curr_frame++;
-         }
-         else {
-            /* A frame increment of 0 is a no-op. */
-            if (!curr_data0[1]) continue;
-            iter->curr_frame += curr_data0[1];
-         }
-         if (iter->curr_frame >= iter->nb_frames) {
-            iter->curr_len = -1;
+        if (iter->curr_len < 0) {
             return OAC_INVALID_PACKET;
-         }
-         /* If we were asked to stop at frame_max, skip extensions for later
-             frames. */
-         if (iter->curr_frame >= iter->frame_max) {
-            iter->curr_len = 0;
-         }
-         iter->repeat_data = iter->curr_data;
-         iter->last_long = NULL;
-         iter->trailing_short_len = 0;
-      }
-      else if (id == 2) {
-         int ret;
-         iter->repeat_l = L;
-         iter->repeat_frame = iter->curr_frame + 1;
-         iter->repeat_len = curr_data0 - iter->repeat_data;
-         iter->src_data = iter->repeat_data;
-         iter->src_len = iter->repeat_len;
-         ret = oac_extension_iterator_next_repeat(iter, ext);
-         if (ret) return ret;
-      }
-      else if (id > 2) {
-         /* Update the location of the last long extension.
-            This lets us know when we need to modify the last L flag if we
-             repeat these extensions with L=0. */
-         if (id >= 32) {
-           iter->last_long = iter->curr_data;
-           iter->trailing_short_len = 0;
-         }
-         /* Otherwise, keep track of how many payload bytes follow the last
-             long extension. */
-         else iter->trailing_short_len += L;
-         if (ext != NULL) {
-            ext->id = id;
-            ext->frame = iter->curr_frame;
-            ext->data = curr_data0 + header_size;
-            ext->len = iter->curr_data - curr_data0 - header_size;
-         }
-         return 1;
-      }
-   }
-   return 0;
+        }
+        celt_assert(iter->curr_data - iter->data == iter->len - iter->curr_len);
+        if (id == 1) {
+            if (L == 0) {
+                iter->curr_frame++;
+            } else   {
+                /* A frame increment of 0 is a no-op. */
+                if (!curr_data0[1]) continue;
+                iter->curr_frame += curr_data0[1];
+            }
+            if (iter->curr_frame >= iter->nb_frames) {
+                iter->curr_len = -1;
+                return OAC_INVALID_PACKET;
+            }
+            /* If we were asked to stop at frame_max, skip extensions for later
+                frames. */
+            if (iter->curr_frame >= iter->frame_max) {
+                iter->curr_len = 0;
+            }
+            iter->repeat_data = iter->curr_data;
+            iter->last_long = NULL;
+            iter->trailing_short_len = 0;
+        } else if (id == 2)   {
+            int ret;
+            iter->repeat_l = L;
+            iter->repeat_frame = iter->curr_frame + 1;
+            iter->repeat_len = curr_data0 - iter->repeat_data;
+            iter->src_data = iter->repeat_data;
+            iter->src_len = iter->repeat_len;
+            ret = oac_extension_iterator_next_repeat(iter, ext);
+            if (ret) return ret;
+        } else if (id > 2)   {
+            /* Update the location of the last long extension.
+               This lets us know when we need to modify the last L flag if we
+                repeat these extensions with L=0. */
+            if (id >= 32) {
+                iter->last_long = iter->curr_data;
+                iter->trailing_short_len = 0;
+            }
+            /* Otherwise, keep track of how many payload bytes follow the last
+                long extension. */
+            else iter->trailing_short_len += L;
+            if (ext != NULL) {
+                ext->id = id;
+                ext->frame = iter->curr_frame;
+                ext->data = curr_data0 + header_size;
+                ext->len = iter->curr_data - curr_data0 - header_size;
+            }
+            return 1;
+        }
+    }
+    return 0;
 }
 
 int oac_extension_iterator_find(OacExtensionIterator *iter,
- oac_extension_data *ext, int id) {
-   oac_extension_data curr_ext;
-   int ret;
-   for(;;) {
-      ret = oac_extension_iterator_next(iter, &curr_ext);
-      if (ret <= 0) {
-         return ret;
-      }
-      if (curr_ext.id == id) {
-         *ext = curr_ext;
-         return ret;
-      }
-   }
+                                oac_extension_data *ext, int id) {
+    oac_extension_data curr_ext;
+    int ret;
+    for (;;) {
+        ret = oac_extension_iterator_next(iter, &curr_ext);
+        if (ret <= 0) {
+            return ret;
+        }
+        if (curr_ext.id == id) {
+            *ext = curr_ext;
+            return ret;
+        }
+    }
 }
 
 /* Count the number of extensions, excluding real padding, separators, and
     repeat indicators, but including the repeated extensions. */
 oac_int32 oac_packet_extensions_count(const unsigned char *data,
- oac_int32 len, int nb_frames)
-{
-   OacExtensionIterator iter;
-   int count;
-   oac_extension_iterator_init(&iter, data, len, nb_frames);
-   for (count=0; oac_extension_iterator_next(&iter, NULL) > 0; count++);
-   return count;
+                                      oac_int32 len, int nb_frames) {
+    OacExtensionIterator iter;
+    int count;
+    oac_extension_iterator_init(&iter, data, len, nb_frames);
+    for (count = 0; oac_extension_iterator_next(&iter, NULL) > 0; count++) ;
+    return count;
 }
 
 /* Count the number of extensions for each frame, excluding real padding and
     separators and repeat indicators, but including the repeated extensions. */
 oac_int32 oac_packet_extensions_count_ext(const unsigned char *data,
- oac_int32 len, oac_int32 *nb_frame_exts, int nb_frames) {
-   OacExtensionIterator iter;
-   oac_extension_data ext;
-   int count;
-   oac_extension_iterator_init(&iter, data, len, nb_frames);
-   OAC_CLEAR(nb_frame_exts, nb_frames);
-   for (count=0; oac_extension_iterator_next(&iter, &ext) > 0; count++) {
-      nb_frame_exts[ext.frame]++;
-   }
-   return count;
+                                          oac_int32 len, oac_int32 *nb_frame_exts, int nb_frames) {
+    OacExtensionIterator iter;
+    oac_extension_data ext;
+    int count;
+    oac_extension_iterator_init(&iter, data, len, nb_frames);
+    OAC_CLEAR(nb_frame_exts, nb_frames);
+    for (count = 0; oac_extension_iterator_next(&iter, &ext) > 0; count++) {
+        nb_frame_exts[ext.frame]++;
+    }
+    return count;
 }
 
 /* Extract extensions from Oac padding (excluding real padding, separators,
@@ -357,25 +348,25 @@ oac_int32 oac_packet_extensions_count_ext(const unsigned char *data,
    Due to the extension repetition mechanism, extensions are not necessarily
     returned in frame order. */
 oac_int32 oac_packet_extensions_parse(const unsigned char *data,
- oac_int32 len, oac_extension_data *extensions, oac_int32 *nb_extensions,
- int nb_frames) {
-   OacExtensionIterator iter;
-   int count;
-   int ret;
-   celt_assert(nb_extensions != NULL);
-   celt_assert(extensions != NULL || *nb_extensions == 0);
-   oac_extension_iterator_init(&iter, data, len, nb_frames);
-   for (count=0;; count++) {
-      oac_extension_data ext;
-      ret = oac_extension_iterator_next(&iter, &ext);
-      if (ret <= 0) break;
-      if (count == *nb_extensions) {
-         return OAC_BUFFER_TOO_SMALL;
-      }
-      extensions[count] = ext;
-   }
-   *nb_extensions = count;
-   return ret;
+                                      oac_int32 len, oac_extension_data *extensions, oac_int32 *nb_extensions,
+                                      int nb_frames) {
+    OacExtensionIterator iter;
+    int count;
+    int ret;
+    celt_assert(nb_extensions != NULL);
+    celt_assert(extensions != NULL || *nb_extensions == 0);
+    oac_extension_iterator_init(&iter, data, len, nb_frames);
+    for (count = 0;; count++) {
+        oac_extension_data ext;
+        ret = oac_extension_iterator_next(&iter, &ext);
+        if (ret <= 0) break;
+        if (count == *nb_extensions) {
+            return OAC_BUFFER_TOO_SMALL;
+        }
+        extensions[count] = ext;
+    }
+    *nb_extensions = count;
+    return ret;
 }
 
 /* Extract extensions from Oac padding (excluding real padding, separators,
@@ -384,289 +375,267 @@ oac_int32 oac_packet_extensions_parse(const unsigned char *data,
    nb_frame_exts must be filled with the output of
     oac_packet_extensions_count_ext(). */
 oac_int32 oac_packet_extensions_parse_ext(const unsigned char *data,
- oac_int32 len, oac_extension_data *extensions, oac_int32 *nb_extensions,
- const oac_int32 *nb_frame_exts, int nb_frames) {
-   OacExtensionIterator iter;
-   oac_extension_data ext;
-   oac_int32 nb_frames_cum[49];
-   int count;
-   int prev_total;
-   int ret;
-   celt_assert(nb_extensions != NULL);
-   celt_assert(extensions != NULL || *nb_extensions == 0);
-   celt_assert(nb_frames <= 48);
-   /* Convert the frame extension count array to a cumulative sum. */
-   prev_total = 0;
-   for (count=0; count<nb_frames; count++) {
-      int total;
-      total = nb_frame_exts[count] + prev_total;
-      nb_frames_cum[count] = prev_total;
-      prev_total = total;
-   }
-   nb_frames_cum[count] = prev_total;
-   oac_extension_iterator_init(&iter, data, len, nb_frames);
-   for (count=0;; count++) {
-      oac_int32 idx;
-      ret = oac_extension_iterator_next(&iter, &ext);
-      if (ret <= 0) break;
-      idx = nb_frames_cum[ext.frame]++;
-      if (idx >= *nb_extensions) {
-         return OAC_BUFFER_TOO_SMALL;
-      }
-      celt_assert(idx < nb_frames_cum[ext.frame + 1]);
-      extensions[idx] = ext;
-   }
-   *nb_extensions = count;
-   return ret;
+                                          oac_int32 len, oac_extension_data *extensions, oac_int32 *nb_extensions,
+                                          const oac_int32 *nb_frame_exts, int nb_frames) {
+    OacExtensionIterator iter;
+    oac_extension_data ext;
+    oac_int32 nb_frames_cum[49];
+    int count;
+    int prev_total;
+    int ret;
+    celt_assert(nb_extensions != NULL);
+    celt_assert(extensions != NULL || *nb_extensions == 0);
+    celt_assert(nb_frames <= 48);
+    /* Convert the frame extension count array to a cumulative sum. */
+    prev_total = 0;
+    for (count = 0; count < nb_frames; count++) {
+        int total;
+        total = nb_frame_exts[count] + prev_total;
+        nb_frames_cum[count] = prev_total;
+        prev_total = total;
+    }
+    nb_frames_cum[count] = prev_total;
+    oac_extension_iterator_init(&iter, data, len, nb_frames);
+    for (count = 0;; count++) {
+        oac_int32 idx;
+        ret = oac_extension_iterator_next(&iter, &ext);
+        if (ret <= 0) break;
+        idx = nb_frames_cum[ext.frame]++;
+        if (idx >= *nb_extensions) {
+            return OAC_BUFFER_TOO_SMALL;
+        }
+        celt_assert(idx < nb_frames_cum[ext.frame + 1]);
+        extensions[idx] = ext;
+    }
+    *nb_extensions = count;
+    return ret;
 }
 
 static int write_extension_payload(unsigned char *data, oac_int32 len,
- oac_int32 pos, const oac_extension_data *ext, int last) {
-   celt_assert(ext->id >= 3 && ext->id <= 127);
-   if (ext->id < 32)
-   {
-      if (ext->len < 0 || ext->len > 1)
-         return OAC_BAD_ARG;
-      if (ext->len > 0) {
-         if (len-pos < ext->len)
+                                   oac_int32 pos, const oac_extension_data *ext, int last) {
+    celt_assert(ext->id >= 3 && ext->id <= 127);
+    if (ext->id < 32) {
+        if (ext->len < 0 || ext->len > 1)
+            return OAC_BAD_ARG;
+        if (ext->len > 0) {
+            if (len - pos < ext->len)
+                return OAC_BUFFER_TOO_SMALL;
+            if (data) data[pos] = ext->data[0];
+            pos++;
+        }
+    } else {
+        oac_int32 length_bytes;
+        if (ext->len < 0)
+            return OAC_BAD_ARG;
+        length_bytes = 1 + ext->len/255;
+        if (last)
+            length_bytes = 0;
+        if (len - pos < length_bytes + ext->len)
             return OAC_BUFFER_TOO_SMALL;
-         if (data) data[pos] = ext->data[0];
-         pos++;
-      }
-   } else {
-      oac_int32 length_bytes;
-      if (ext->len < 0)
-         return OAC_BAD_ARG;
-      length_bytes = 1 + ext->len/255;
-      if (last)
-         length_bytes = 0;
-      if (len-pos < length_bytes + ext->len)
-         return OAC_BUFFER_TOO_SMALL;
-      if (!last)
-      {
-         oac_int32 j;
-         for (j=0;j<ext->len/255;j++) {
-            if (data) data[pos] = 255;
+        if (!last) {
+            oac_int32 j;
+            for (j = 0; j < ext->len/255; j++) {
+                if (data) data[pos] = 255;
+                pos++;
+            }
+            if (data) data[pos] = ext->len%255;
             pos++;
-         }
-         if (data) data[pos] = ext->len % 255;
-         pos++;
-      }
-      if (data) OAC_COPY(&data[pos], ext->data, ext->len);
-      pos += ext->len;
-   }
-   return pos;
+        }
+        if (data) OAC_COPY(&data[pos], ext->data, ext->len);
+        pos += ext->len;
+    }
+    return pos;
 }
 
 static int write_extension(unsigned char *data, oac_int32 len, oac_int32 pos,
- const oac_extension_data *ext, int last) {
-   if (len-pos < 1)
-      return OAC_BUFFER_TOO_SMALL;
-   celt_assert(ext->id >= 3 && ext->id <= 127);
-   if (data) data[pos] = (ext->id<<1) + (ext->id < 32 ? ext->len : !last);
-   pos++;
-   return write_extension_payload(data, len, pos, ext, last);
+                           const oac_extension_data *ext, int last) {
+    if (len - pos < 1)
+        return OAC_BUFFER_TOO_SMALL;
+    celt_assert(ext->id >= 3 && ext->id <= 127);
+    if (data) data[pos] = (ext->id<<1) + (ext->id < 32 ? ext->len : !last);
+    pos++;
+    return write_extension_payload(data, len, pos, ext, last);
 }
 
 oac_int32 oac_packet_extensions_generate(unsigned char *data, oac_int32 len,
- const oac_extension_data  *extensions, oac_int32 nb_extensions,
- int nb_frames, int pad)
-{
-   oac_int32 frame_min_idx[48];
-   oac_int32 frame_max_idx[48];
-   oac_int32 frame_repeat_idx[48];
-   oac_int32 i;
-   int f;
-   int curr_frame = 0;
-   oac_int32 pos = 0;
-   oac_int32 written = 0;
+                                         const oac_extension_data  *extensions, oac_int32 nb_extensions,
+                                         int nb_frames, int pad) {
+    oac_int32 frame_min_idx[48];
+    oac_int32 frame_max_idx[48];
+    oac_int32 frame_repeat_idx[48];
+    oac_int32 i;
+    int f;
+    int curr_frame = 0;
+    oac_int32 pos = 0;
+    oac_int32 written = 0;
 
-   celt_assert(len >= 0);
-   if (nb_frames > 48) return OAC_BAD_ARG;
+    celt_assert(len >= 0);
+    if (nb_frames > 48) return OAC_BAD_ARG;
 
-   /* Do a little work up-front to make this O(nb_extensions) instead of
-       O(nb_extensions*nb_frames) so long as the extensions are in frame
-       order (without requiring that they be in frame order). */
-   for (f=0;f<nb_frames;f++) frame_min_idx[f] = nb_extensions;
-   OAC_CLEAR(frame_max_idx, nb_frames);
-   for (i=0;i<nb_extensions;i++)
-   {
-      f = extensions[i].frame;
-      if (f < 0 || f >= nb_frames) return OAC_BAD_ARG;
-      if (extensions[i].id < 3 || extensions[i].id > 127) return OAC_BAD_ARG;
-      frame_min_idx[f] = IMIN(frame_min_idx[f], i);
-      frame_max_idx[f] = IMAX(frame_max_idx[f], i+1);
-   }
-   for (f=0;f<nb_frames;f++) frame_repeat_idx[f] = frame_min_idx[f];
-   for (f=0;f<nb_frames;f++)
-   {
-      oac_int32 last_long_idx;
-      int repeat_count;
-      repeat_count = 0;
-      last_long_idx = -1;
-      if (f + 1 < nb_frames)
-      {
-         for (i=frame_min_idx[f];i<frame_max_idx[f];i++)
-         {
-            if (extensions[i].frame == f)
-            {
-               int g;
-               /* Test if we can repeat this extension in future frames. */
-               for (g=f+1;g<nb_frames;g++)
-               {
-                  if (frame_repeat_idx[g] >= frame_max_idx[g]) break;
-                  celt_assert(extensions[frame_repeat_idx[g]].frame == g);
-                  if (extensions[frame_repeat_idx[g]].id != extensions[i].id)
-                  {
-                     break;
-                  }
-                  if (extensions[frame_repeat_idx[g]].id < 32
-                    && extensions[frame_repeat_idx[g]].len
-                    != extensions[i].len)
-                  {
-                     break;
-                  }
-               }
-               if (g < nb_frames) break;
-               /* We can! */
-               /* If this is a long extension, save the index of the last
-                   instance, so we can modify its L flag. */
-               if (extensions[i].id >= 32) {
-                  last_long_idx = frame_repeat_idx[nb_frames-1];
-               }
-               /* Using the repeat mechanism almost always makes the
-                   encoding smaller (or at least no larger).
-                  However, there's one case where that might not be true: if
-                   the last repeated long extension in the last frame was
-                   previously the last extension, but using the repeat
-                   mechanism makes that no longer true (because there are other
-                   non-repeated extensions in earlier frames that must now be
-                   coded after it), and coding its length requires more bytes
-                   than the repeat mechanism saves.
-                  This can only be true if its length is at least 255 bytes
-                   (although sometimes it requires even more).
-                  Currently we do not check for that, and just always use the
-                   repeat mechanism if we can.
-                  See git history for code that does the check. */
-               /* Advance the repeat pointers. */
-               for (g=f+1; g<nb_frames; g++)
-               {
-                  int j;
-                  for (j=frame_repeat_idx[g]+1; j<frame_max_idx[g]
-                   && extensions[j].frame != g; j++);
-                  frame_repeat_idx[g] = j;
-               }
-               repeat_count++;
-               /* Point the repeat pointer for this frame to the current
-                   extension, so we know when to trigger the repeats. */
-               frame_repeat_idx[f] = i;
-            }
-         }
-      }
-      for (i=frame_min_idx[f];i<frame_max_idx[f];i++)
-      {
-         if (extensions[i].frame == f)
-         {
-            /* Insert separator when needed. */
-            if (f != curr_frame) {
-               int diff = f - curr_frame;
-               if (len-pos < 2)
-                  return OAC_BUFFER_TOO_SMALL;
-               if (diff == 1) {
-                  if (data) data[pos] = 0x02;
-                  pos++;
-               } else {
-                  if (data) data[pos] = 0x03;
-                  pos++;
-                  if (data) data[pos] = diff;
-                  pos++;
-               }
-               curr_frame = f;
+    /* Do a little work up-front to make this O(nb_extensions) instead of
+        O(nb_extensions*nb_frames) so long as the extensions are in frame
+        order (without requiring that they be in frame order). */
+    for (f = 0; f < nb_frames; f++) frame_min_idx[f] = nb_extensions;
+    OAC_CLEAR(frame_max_idx, nb_frames);
+    for (i = 0; i < nb_extensions; i++) {
+        f = extensions[i].frame;
+        if (f < 0 || f >= nb_frames) return OAC_BAD_ARG;
+        if (extensions[i].id < 3 || extensions[i].id > 127) return OAC_BAD_ARG;
+        frame_min_idx[f] = IMIN(frame_min_idx[f], i);
+        frame_max_idx[f] = IMAX(frame_max_idx[f], i + 1);
+    }
+    for (f = 0; f < nb_frames; f++) frame_repeat_idx[f] = frame_min_idx[f];
+    for (f = 0; f < nb_frames; f++) {
+        oac_int32 last_long_idx;
+        int repeat_count;
+        repeat_count = 0;
+        last_long_idx = -1;
+        if (f + 1 < nb_frames) {
+            for (i = frame_min_idx[f]; i < frame_max_idx[f]; i++) {
+                if (extensions[i].frame == f) {
+                    int g;
+                    /* Test if we can repeat this extension in future frames. */
+                    for (g = f + 1; g < nb_frames; g++) {
+                        if (frame_repeat_idx[g] >= frame_max_idx[g]) break;
+                        celt_assert(extensions[frame_repeat_idx[g]].frame == g);
+                        if (extensions[frame_repeat_idx[g]].id != extensions[i].id) {
+                            break;
+                        }
+                        if (extensions[frame_repeat_idx[g]].id < 32
+                            && extensions[frame_repeat_idx[g]].len !=
+                            extensions[i].len) {
+                            break;
+                        }
+                    }
+                    if (g < nb_frames) break;
+                    /* We can! */
+                    /* If this is a long extension, save the index of the last
+                        instance, so we can modify its L flag. */
+                    if (extensions[i].id >= 32) {
+                        last_long_idx = frame_repeat_idx[nb_frames - 1];
+                    }
+                    /* Using the repeat mechanism almost always makes the
+                        encoding smaller (or at least no larger).
+                       However, there's one case where that might not be true: if
+                        the last repeated long extension in the last frame was
+                        previously the last extension, but using the repeat
+                        mechanism makes that no longer true (because there are other
+                        non-repeated extensions in earlier frames that must now be
+                        coded after it), and coding its length requires more bytes
+                        than the repeat mechanism saves.
+                       This can only be true if its length is at least 255 bytes
+                        (although sometimes it requires even more).
+                       Currently we do not check for that, and just always use the
+                        repeat mechanism if we can.
+                       See git history for code that does the check. */
+                    /* Advance the repeat pointers. */
+                    for (g = f + 1; g < nb_frames; g++) {
+                        int j;
+                        for (j = frame_repeat_idx[g] + 1; j < frame_max_idx[g]
+                             && extensions[j].frame != g; j++) ;
+                        frame_repeat_idx[g] = j;
+                    }
+                    repeat_count++;
+                    /* Point the repeat pointer for this frame to the current
+                        extension, so we know when to trigger the repeats. */
+                    frame_repeat_idx[f] = i;
+                }
             }
+        }
+        for (i = frame_min_idx[f]; i < frame_max_idx[f]; i++) {
+            if (extensions[i].frame == f) {
+                /* Insert separator when needed. */
+                if (f != curr_frame) {
+                    int diff = f - curr_frame;
+                    if (len - pos < 2)
+                        return OAC_BUFFER_TOO_SMALL;
+                    if (diff == 1) {
+                        if (data) data[pos] = 0x02;
+                        pos++;
+                    } else {
+                        if (data) data[pos] = 0x03;
+                        pos++;
+                        if (data) data[pos] = diff;
+                        pos++;
+                    }
+                    curr_frame = f;
+                }
 
-            pos = write_extension(data, len, pos, extensions + i,
+                pos = write_extension(data, len, pos, extensions + i,
              written == nb_extensions - 1);
-            if (pos < 0) return pos;
-            written++;
+                if (pos < 0) return pos;
+                written++;
 
-            if (repeat_count > 0 && frame_repeat_idx[f] == i) {
-               int nb_repeated;
-               int last;
-               int g;
-               /* Add the repeat indicator. */
-               nb_repeated = repeat_count*(nb_frames - (f + 1));
-               last = written + nb_repeated == nb_extensions
-                || (last_long_idx < 0 && i+1 >= frame_max_idx[f]);
-               if (len-pos < 1)
-                  return OAC_BUFFER_TOO_SMALL;
-               if (data) data[pos] = 0x04 + !last;
-               pos++;
-               for (g=f+1;g<nb_frames;g++)
-               {
-                  int j;
-                  for (j=frame_min_idx[g];j<frame_repeat_idx[g];j++)
-                  {
-                     if (extensions[j].frame == g)
-                     {
-                        pos = write_extension_payload(data, len, pos,
+                if (repeat_count > 0 && frame_repeat_idx[f] == i) {
+                    int nb_repeated;
+                    int last;
+                    int g;
+                    /* Add the repeat indicator. */
+                    nb_repeated = repeat_count*(nb_frames - (f + 1));
+                    last = written + nb_repeated == nb_extensions
+                           || (last_long_idx < 0 && i + 1 >= frame_max_idx[f]);
+                    if (len - pos < 1)
+                        return OAC_BUFFER_TOO_SMALL;
+                    if (data) data[pos] = 0x04 + !last;
+                    pos++;
+                    for (g = f + 1; g < nb_frames; g++) {
+                        int j;
+                        for (j = frame_min_idx[g]; j < frame_repeat_idx[g]; j++) {
+                            if (extensions[j].frame == g) {
+                                pos = write_extension_payload(data, len, pos,
                          extensions + j, last && j == last_long_idx);
-                        if (pos < 0) return pos;
-                        written++;
-                     }
-                  }
-                  frame_min_idx[g] = j;
-               }
-               if (last) curr_frame++;
+                                if (pos < 0) return pos;
+                                written++;
+                            }
+                        }
+                        frame_min_idx[g] = j;
+                    }
+                    if (last) curr_frame++;
+                }
             }
-         }
-      }
-   }
-   celt_assert(written == nb_extensions);
-   /* If we need to pad, just prepend 0x01 bytes. Even better would be to fill the
-      end with zeros, but that requires checking that turning the last extension into
-      an L=1 case still fits. */
-   if (pad && pos < len)
-   {
-      oac_int32 padding = len - pos;
-      if (data) {
-         OAC_MOVE(data+padding, data, pos);
-         for (i=0;i<padding;i++)
-            data[i] = 0x01;
-      }
-      pos += padding;
-   }
-   return pos;
+        }
+    }
+    celt_assert(written == nb_extensions);
+    /* If we need to pad, just prepend 0x01 bytes. Even better would be to fill the
+       end with zeros, but that requires checking that turning the last extension into
+       an L=1 case still fits. */
+    if (pad && pos < len) {
+        oac_int32 padding = len - pos;
+        if (data) {
+            OAC_MOVE(data + padding, data, pos);
+            for (i = 0; i < padding; i++)
+                data[i] = 0x01;
+        }
+        pos += padding;
+    }
+    return pos;
 }
 
 #if 0
-#include <stdio.h>
-int main()
-{
-   oac_extension_data ext[] = {{2, 0, (const unsigned char *)"a", 1},
-   {32, 10, (const unsigned char *)"DRED", 4},
-   {33, 1, (const unsigned char *)"NOT DRED", 8},
-   {3, 4, (const unsigned char *)NULL, 0}
-   };
-   oac_extension_data ext2[10];
-   int i, len;
-   int nb_ext = 10;
-   unsigned char packet[10000];
-   len = oac_packet_extensions_generate(packet, 32, ext, 4, 1);
-   for (i=0;i<len;i++)
-   {
-      printf("%#04x ", packet[i]);
-      if (i%16 == 15)
-         printf("\n");
-   }
-   printf("\n");
-   printf("count = %d\n", oac_packet_extensions_count(packet, len));
-   oac_packet_extensions_parse(packet, len, ext2, &nb_ext);
-   for (i=0;i<nb_ext;i++)
-   {
-      int j;
-      printf("%d %d {", ext2[i].id, ext2[i].frame);
-      for (j=0;j<ext2[i].len;j++) printf("%#04x ", ext2[i].data[j]);
-      printf("} %d\n", ext2[i].len);
-   }
+# include <stdio.h>
+int main() {
+    oac_extension_data ext[] = {{2, 0, (const unsigned char *)"a", 1},
+                                {32, 10, (const unsigned char *)"DRED", 4},
+                                {33, 1, (const unsigned char *)"NOT DRED", 8},
+                                {3, 4, (const unsigned char *)NULL, 0}};
+    oac_extension_data ext2[10];
+    int i, len;
+    int nb_ext = 10;
+    unsigned char packet[10000];
+    len = oac_packet_extensions_generate(packet, 32, ext, 4, 1);
+    for (i = 0; i < len; i++) {
+        printf("%#04x ", packet[i]);
+        if (i%16 == 15)
+            printf("\n");
+    }
+    printf("\n");
+    printf("count = %d\n", oac_packet_extensions_count(packet, len));
+    oac_packet_extensions_parse(packet, len, ext2, &nb_ext);
+    for (i = 0; i < nb_ext; i++) {
+        int j;
+        printf("%d %d {", ext2[i].id, ext2[i].frame);
+        for (j = 0; j < ext2[i].len; j++) printf("%#04x ", ext2[i].data[j]);
+        printf("} %d\n", ext2[i].len);
+    }
 }
 #endif
diff --git a/src/mapping_matrix.c b/src/mapping_matrix.c
index 8e254ea25..38f0e0f9c 100644
--- a/src/mapping_matrix.c
+++ b/src/mapping_matrix.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "arch.h"
@@ -35,50 +35,46 @@
 #include "oac_defines.h"
 #include "mapping_matrix.h"
 
-#define MATRIX_INDEX(nb_rows, row, col) (nb_rows * col + row)
+#define MATRIX_INDEX(nb_rows, row, col) (nb_rows*col + row)
 
-oac_int32 mapping_matrix_get_size(int rows, int cols)
-{
-  oac_int32 size;
+oac_int32 mapping_matrix_get_size(int rows, int cols) {
+    oac_int32 size;
 
-  /* Mapping Matrix must only support up to 255 channels in or out.
-   * Additionally, the total cell count must be <= 65004 octets in order
-   * for the matrix to be stored in an OGG header.
-   */
-  if (rows > 255 || cols > 255)
-      return 0;
-  size = rows * (oac_int32)cols * sizeof(oac_int16);
-  if (size > 65004)
-    return 0;
+    /* Mapping Matrix must only support up to 255 channels in or out.
+     * Additionally, the total cell count must be <= 65004 octets in order
+     * for the matrix to be stored in an OGG header.
+     */
+    if (rows > 255 || cols > 255)
+        return 0;
+    size = rows*(oac_int32)cols*sizeof(oac_int16);
+    if (size > 65004)
+        return 0;
 
-  return align(sizeof(MappingMatrix)) + align(size);
+    return align(sizeof(MappingMatrix)) + align(size);
 }
 
-oac_int16 *mapping_matrix_get_data(const MappingMatrix *matrix)
-{
-  /* void* cast avoids clang -Wcast-align warning */
-  return (oac_int16*)(void*)((char*)matrix + align(sizeof(MappingMatrix)));
+oac_int16 *mapping_matrix_get_data(const MappingMatrix *matrix) {
+    /* void* cast avoids clang -Wcast-align warning */
+    return (oac_int16*)(void*)((char*)matrix + align(sizeof(MappingMatrix)));
 }
 
 void mapping_matrix_init(MappingMatrix * const matrix,
-  int rows, int cols, int gain, const oac_int16 *data, oac_int32 data_size)
-{
-  int i;
-  oac_int16 *ptr;
+                         int rows, int cols, int gain, const oac_int16 *data, oac_int32 data_size) {
+    int i;
+    oac_int16 *ptr;
 
 #if !defined(ENABLE_ASSERTIONS)
-  (void)data_size;
+    (void)data_size;
 #endif
-  celt_assert(align(data_size) == align(rows * cols * sizeof(oac_int16)));
-
-  matrix->rows = rows;
-  matrix->cols = cols;
-  matrix->gain = gain;
-  ptr = mapping_matrix_get_data(matrix);
-  for (i = 0; i < rows * cols; i++)
-  {
-     ptr[i] = data[i];
-  }
+    celt_assert(align(data_size) == align(rows*cols*sizeof(oac_int16)));
+
+    matrix->rows = rows;
+    matrix->cols = cols;
+    matrix->gain = gain;
+    ptr = mapping_matrix_get_data(matrix);
+    for (i = 0; i < rows*cols; i++) {
+        ptr[i] = data[i];
+    }
 }
 
 #ifndef DISABLE_FLOAT_API
@@ -89,27 +85,24 @@ void mapping_matrix_multiply_channel_in_float(
     oac_res *output,
     int output_row,
     int output_rows,
-    int frame_size)
-{
-  /* Matrix data is ordered col-wise. */
-  oac_int16* matrix_data;
-  int i, col;
-
-  celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
-
-  matrix_data = mapping_matrix_get_data(matrix);
-
-  for (i = 0; i < frame_size; i++)
-  {
-    float tmp = 0;
-    for (col = 0; col < input_rows; col++)
-    {
-      tmp +=
-        matrix_data[MATRIX_INDEX(matrix->rows, output_row, col)] *
-        input[MATRIX_INDEX(input_rows, col, i)];
+    int frame_size) {
+    /* Matrix data is ordered col-wise. */
+    oac_int16* matrix_data;
+    int i, col;
+
+    celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
+
+    matrix_data = mapping_matrix_get_data(matrix);
+
+    for (i = 0; i < frame_size; i++) {
+        float tmp = 0;
+        for (col = 0; col < input_rows; col++) {
+            tmp +=
+                matrix_data[MATRIX_INDEX(matrix->rows, output_row, col)]
+                *input[MATRIX_INDEX(input_rows, col, i)];
+        }
+        output[output_rows*i] = FLOAT2RES((1/32768.f)*tmp);
     }
-    output[output_rows * i] = FLOAT2RES((1/32768.f)*tmp);
-  }
 }
 
 void mapping_matrix_multiply_channel_out_float(
@@ -119,29 +112,25 @@ void mapping_matrix_multiply_channel_out_float(
     int input_rows,
     float *output,
     int output_rows,
-    int frame_size
-)
-{
-  /* Matrix data is ordered col-wise. */
-  oac_int16* matrix_data;
-  int i, row;
-  float input_sample;
-
-  celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
-
-  matrix_data = mapping_matrix_get_data(matrix);
-
-  for (i = 0; i < frame_size; i++)
-  {
-    input_sample = RES2FLOAT(input[input_rows * i]);
-    for (row = 0; row < output_rows; row++)
-    {
-      float tmp =
-        (1/32768.f)*matrix_data[MATRIX_INDEX(matrix->rows, row, input_row)] *
-        input_sample;
-      output[MATRIX_INDEX(output_rows, row, i)] += tmp;
+    int frame_size)                   {
+    /* Matrix data is ordered col-wise. */
+    oac_int16* matrix_data;
+    int i, row;
+    float input_sample;
+
+    celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
+
+    matrix_data = mapping_matrix_get_data(matrix);
+
+    for (i = 0; i < frame_size; i++) {
+        input_sample = RES2FLOAT(input[input_rows*i]);
+        for (row = 0; row < output_rows; row++) {
+            float tmp =
+                (1/32768.f)*matrix_data[MATRIX_INDEX(matrix->rows, row, input_row)]
+                *input_sample;
+            output[MATRIX_INDEX(output_rows, row, i)] += tmp;
+        }
     }
-  }
 }
 #endif /* DISABLE_FLOAT_API */
 
@@ -152,37 +141,34 @@ void mapping_matrix_multiply_channel_in_short(
     oac_res *output,
     int output_row,
     int output_rows,
-    int frame_size)
-{
-  /* Matrix data is ordered col-wise. */
-  oac_int16* matrix_data;
-  int i, col;
+    int frame_size) {
+    /* Matrix data is ordered col-wise. */
+    oac_int16* matrix_data;
+    int i, col;
 
-  celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
+    celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
 
-  matrix_data = mapping_matrix_get_data(matrix);
+    matrix_data = mapping_matrix_get_data(matrix);
 
-  for (i = 0; i < frame_size; i++)
-  {
-    oac_val32 tmp = 0;
-    for (col = 0; col < input_rows; col++)
-    {
+    for (i = 0; i < frame_size; i++) {
+        oac_val32 tmp = 0;
+        for (col = 0; col < input_rows; col++) {
 #if defined(FIXED_POINT)
-      tmp +=
-        ((oac_int32)matrix_data[MATRIX_INDEX(matrix->rows, output_row, col)] *
-        (oac_int32)input[MATRIX_INDEX(input_rows, col, i)]) >> 8;
+            tmp +=
+                ((oac_int32)matrix_data[MATRIX_INDEX(matrix->rows, output_row, col)]
+                 *(oac_int32)input[MATRIX_INDEX(input_rows, col, i)])>>8;
 #else
-      tmp +=
-        matrix_data[MATRIX_INDEX(matrix->rows, output_row, col)] *
-        input[MATRIX_INDEX(input_rows, col, i)];
+            tmp +=
+                matrix_data[MATRIX_INDEX(matrix->rows, output_row, col)]
+                *input[MATRIX_INDEX(input_rows, col, i)];
 #endif
-    }
+        }
 #if defined(FIXED_POINT)
-    output[output_rows * i] = SHL32(tmp, RES_SHIFT-7);
+        output[output_rows*i] = SHL32(tmp, RES_SHIFT - 7);
 #else
-    output[output_rows * i] = (1/(32768.f*32768.f))*tmp;
+        output[output_rows*i] = (1/(32768.f*32768.f))*tmp;
 #endif
-  }
+    }
 }
 
 void mapping_matrix_multiply_channel_out_short(
@@ -192,28 +178,25 @@ void mapping_matrix_multiply_channel_out_short(
     int input_rows,
     oac_int16 *output,
     int output_rows,
-    int frame_size)
-{
-  /* Matrix data is ordered col-wise. */
-  oac_int16* matrix_data;
-  int i, row;
-  oac_int32 input_sample;
-
-  celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
-
-  matrix_data = mapping_matrix_get_data(matrix);
-
-  for (i = 0; i < frame_size; i++)
-  {
-    input_sample = RES2INT16(input[input_rows * i]);
-    for (row = 0; row < output_rows; row++)
-    {
-      oac_int32 tmp =
-        (oac_int32)matrix_data[MATRIX_INDEX(matrix->rows, row, input_row)] *
-        input_sample;
-      output[MATRIX_INDEX(output_rows, row, i)] += (tmp + 16384) >> 15;
+    int frame_size) {
+    /* Matrix data is ordered col-wise. */
+    oac_int16* matrix_data;
+    int i, row;
+    oac_int32 input_sample;
+
+    celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
+
+    matrix_data = mapping_matrix_get_data(matrix);
+
+    for (i = 0; i < frame_size; i++) {
+        input_sample = RES2INT16(input[input_rows*i]);
+        for (row = 0; row < output_rows; row++) {
+            oac_int32 tmp =
+                (oac_int32)matrix_data[MATRIX_INDEX(matrix->rows, row, input_row)]
+                *input_sample;
+            output[MATRIX_INDEX(output_rows, row, i)] += (tmp + 16384)>>15;
+        }
     }
-  }
 }
 
 void mapping_matrix_multiply_channel_in_int24(
@@ -223,31 +206,28 @@ void mapping_matrix_multiply_channel_in_int24(
     oac_res *output,
     int output_row,
     int output_rows,
-    int frame_size)
-{
-  /* Matrix data is ordered col-wise. */
-  oac_int16* matrix_data;
-  int i, col;
-
-  celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
-
-  matrix_data = mapping_matrix_get_data(matrix);
-
-  for (i = 0; i < frame_size; i++)
-  {
-    oac_val64 tmp = 0;
-    for (col = 0; col < input_rows; col++)
-    {
-      tmp +=
-        matrix_data[MATRIX_INDEX(matrix->rows, output_row, col)] *
-        (oac_val64)input[MATRIX_INDEX(input_rows, col, i)];
-    }
+    int frame_size) {
+    /* Matrix data is ordered col-wise. */
+    oac_int16* matrix_data;
+    int i, col;
+
+    celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
+
+    matrix_data = mapping_matrix_get_data(matrix);
+
+    for (i = 0; i < frame_size; i++) {
+        oac_val64 tmp = 0;
+        for (col = 0; col < input_rows; col++) {
+            tmp +=
+                matrix_data[MATRIX_INDEX(matrix->rows, output_row, col)]
+                *(oac_val64)input[MATRIX_INDEX(input_rows, col, i)];
+        }
 #if defined(FIXED_POINT)
-    output[output_rows * i] = INT24TORES((tmp + 16384) >> 15);
+        output[output_rows*i] = INT24TORES((tmp + 16384)>>15);
 #else
-    output[output_rows * i] = INT24TORES((1/(32768.f))*tmp);
+        output[output_rows*i] = INT24TORES((1/(32768.f))*tmp);
 #endif
-  }
+    }
 }
 
 void mapping_matrix_multiply_channel_out_int24(
@@ -257,737 +237,734 @@ void mapping_matrix_multiply_channel_out_int24(
     int input_rows,
     oac_int32 *output,
     int output_rows,
-    int frame_size)
-{
-  /* Matrix data is ordered col-wise. */
-  oac_int16* matrix_data;
-  int i, row;
-  oac_int32 input_sample;
-
-  celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
-
-  matrix_data = mapping_matrix_get_data(matrix);
-
-  for (i = 0; i < frame_size; i++)
-  {
-    input_sample = RES2INT24(input[input_rows * i]);
-    for (row = 0; row < output_rows; row++)
-    {
-      oac_int64 tmp =
-        (oac_int64)matrix_data[MATRIX_INDEX(matrix->rows, row, input_row)] *
-        input_sample;
-      output[MATRIX_INDEX(output_rows, row, i)] += (tmp + 16384) >> 15;
+    int frame_size) {
+    /* Matrix data is ordered col-wise. */
+    oac_int16* matrix_data;
+    int i, row;
+    oac_int32 input_sample;
+
+    celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
+
+    matrix_data = mapping_matrix_get_data(matrix);
+
+    for (i = 0; i < frame_size; i++) {
+        input_sample = RES2INT24(input[input_rows*i]);
+        for (row = 0; row < output_rows; row++) {
+            oac_int64 tmp =
+                (oac_int64)matrix_data[MATRIX_INDEX(matrix->rows, row, input_row)]
+                *input_sample;
+            output[MATRIX_INDEX(output_rows, row, i)] += (tmp + 16384)>>15;
+        }
     }
-  }
 }
 
 
 const MappingMatrix mapping_matrix_foa_mixing = { 6, 6, 0 };
 const oac_int16 mapping_matrix_foa_mixing_data[36] = {
-     16384,      0, -16384,  23170,      0,      0,  16384,  23170,
-     16384,      0,      0,      0,  16384,      0, -16384, -23170,
-         0,      0,  16384, -23170,  16384,      0,      0,      0,
-         0,      0,      0,      0,  32767,      0,      0,      0,
-         0,      0,      0,  32767
+    16384,      0, -16384,  23170,      0,      0,  16384,  23170,
+    16384,      0,      0,      0,  16384,      0, -16384, -23170,
+    0,      0,  16384, -23170,  16384,      0,      0,      0,
+    0,      0,      0,      0,  32767,      0,      0,      0,
+    0,      0,      0,  32767
 };
 
 const MappingMatrix mapping_matrix_soa_mixing = { 11, 11, 0 };
 const oac_int16 mapping_matrix_soa_mixing_data[121] = {
-     10923,   7723,  13377, -13377,  11585,   9459,   7723, -16384,
-     -6689,      0,      0,  10923,   7723,  13377,  13377, -11585,
-      9459,   7723,  16384,  -6689,      0,      0,  10923, -15447,
-     13377,      0,      0, -18919,   7723,      0,  13377,      0,
-         0,  10923,   7723, -13377, -13377,  11585,  -9459,   7723,
-     16384,  -6689,      0,      0,  10923,  -7723,      0,  13377,
+    10923,   7723,  13377, -13377,  11585,   9459,   7723, -16384,
+    -6689,      0,      0,  10923,   7723,  13377,  13377, -11585,
+    9459,   7723,  16384,  -6689,      0,      0,  10923, -15447,
+    13377,      0,      0, -18919,   7723,      0,  13377,      0,
+    0,  10923,   7723, -13377, -13377,  11585,  -9459,   7723,
+    16384,  -6689,      0,      0,  10923,  -7723,      0,  13377,
     -16384,      0, -15447,      0,   9459,      0,      0,  10923,
-     -7723,      0, -13377,  16384,      0, -15447,      0,   9459,
-         0,      0,  10923,  15447,      0,      0,      0,      0,
+    -7723,      0, -13377,  16384,      0, -15447,      0,   9459,
+    0,      0,  10923,  15447,      0,      0,      0,      0,
     -15447,      0, -18919,      0,      0,  10923,   7723, -13377,
-     13377, -11585,  -9459,   7723, -16384,  -6689,      0,      0,
-     10923, -15447, -13377,      0,      0,  18919,   7723,      0,
-     13377,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,  32767,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-     32767
+    13377, -11585,  -9459,   7723, -16384,  -6689,      0,      0,
+    10923, -15447, -13377,      0,      0,  18919,   7723,      0,
+    13377,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,  32767,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    32767
 };
 
 const MappingMatrix mapping_matrix_toa_mixing = { 18, 18, 0 };
 const oac_int16 mapping_matrix_toa_mixing_data[324] = {
-      8208,      0,   -881,  14369,      0,      0,  -8192,  -4163,
-     13218,      0,      0,      0,  11095,  -8836,  -6218,  14833,
-         0,      0,   8208, -10161,    881,  10161, -13218,  -2944,
-     -8192,   2944,      0, -10488,  -6218,   6248, -11095,  -6248,
-         0, -10488,      0,      0,   8208,  10161,    881, -10161,
+    8208,      0,   -881,  14369,      0,      0,  -8192,  -4163,
+    13218,      0,      0,      0,  11095,  -8836,  -6218,  14833,
+    0,      0,   8208, -10161,    881,  10161, -13218,  -2944,
+    -8192,   2944,      0, -10488,  -6218,   6248, -11095,  -6248,
+    0, -10488,      0,      0,   8208,  10161,    881, -10161,
     -13218,   2944,  -8192,  -2944,      0,  10488,  -6218,  -6248,
     -11095,   6248,      0,  10488,      0,      0,   8176,   5566,
     -11552,   5566,   9681, -11205,   8192, -11205,      0,   4920,
     -15158,   9756,  -3334,   9756,      0,  -4920,      0,      0,
-      8176,   7871,  11552,      0,      0,  15846,   8192,      0,
-     -9681,  -6958,      0,  13797,   3334,      0, -15158,      0,
-         0,      0,   8176,      0,  11552,   7871,      0,      0,
-      8192,  15846,   9681,      0,      0,      0,   3334,  13797,
-     15158,   6958,      0,      0,   8176,   5566, -11552,  -5566,
-     -9681, -11205,   8192,  11205,      0,   4920,  15158,   9756,
-     -3334,  -9756,      0,   4920,      0,      0,   8208,  14369,
-      -881,      0,      0,  -4163,  -8192,      0, -13218, -14833,
-         0,  -8836,  11095,      0,   6218,      0,      0,      0,
-      8208,  10161,    881,  10161,  13218,   2944,  -8192,   2944,
-         0,  10488,   6218,  -6248, -11095,  -6248,      0, -10488,
-         0,      0,   8208, -14369,   -881,      0,      0,   4163,
-     -8192,      0, -13218,  14833,      0,   8836,  11095,      0,
-      6218,      0,      0,      0,   8208,      0,   -881, -14369,
-         0,      0,  -8192,   4163,  13218,      0,      0,      0,
-     11095,   8836,  -6218, -14833,      0,      0,   8176,  -5566,
+    8176,   7871,  11552,      0,      0,  15846,   8192,      0,
+    -9681,  -6958,      0,  13797,   3334,      0, -15158,      0,
+    0,      0,   8176,      0,  11552,   7871,      0,      0,
+    8192,  15846,   9681,      0,      0,      0,   3334,  13797,
+    15158,   6958,      0,      0,   8176,   5566, -11552,  -5566,
+    -9681, -11205,   8192,  11205,      0,   4920,  15158,   9756,
+    -3334,  -9756,      0,   4920,      0,      0,   8208,  14369,
+    -881,      0,      0,  -4163,  -8192,      0, -13218, -14833,
+    0,  -8836,  11095,      0,   6218,      0,      0,      0,
+    8208,  10161,    881,  10161,  13218,   2944,  -8192,   2944,
+    0,  10488,   6218,  -6248, -11095,  -6248,      0, -10488,
+    0,      0,   8208, -14369,   -881,      0,      0,   4163,
+    -8192,      0, -13218,  14833,      0,   8836,  11095,      0,
+    6218,      0,      0,      0,   8208,      0,   -881, -14369,
+    0,      0,  -8192,   4163,  13218,      0,      0,      0,
+    11095,   8836,  -6218, -14833,      0,      0,   8176,  -5566,
     -11552,   5566,  -9681,  11205,   8192, -11205,      0,  -4920,
-     15158,  -9756,  -3334,   9756,      0,  -4920,      0,      0,
-      8176,      0,  11552,  -7871,      0,      0,   8192, -15846,
-      9681,      0,      0,      0,   3334, -13797,  15158,  -6958,
-         0,      0,   8176,  -7871,  11552,      0,      0, -15846,
-      8192,      0,  -9681,   6958,      0, -13797,   3334,      0,
+    15158,  -9756,  -3334,   9756,      0,  -4920,      0,      0,
+    8176,      0,  11552,  -7871,      0,      0,   8192, -15846,
+    9681,      0,      0,      0,   3334, -13797,  15158,  -6958,
+    0,      0,   8176,  -7871,  11552,      0,      0, -15846,
+    8192,      0,  -9681,   6958,      0, -13797,   3334,      0,
     -15158,      0,      0,      0,   8176,  -5566, -11552,  -5566,
-      9681,  11205,   8192,  11205,      0,  -4920, -15158,  -9756,
-     -3334,  -9756,      0,   4920,      0,      0,   8208, -10161,
-       881, -10161,  13218,  -2944,  -8192,  -2944,      0, -10488,
-      6218,   6248, -11095,   6248,      0,  10488,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-     32767,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,  32767
+    9681,  11205,   8192,  11205,      0,  -4920, -15158,  -9756,
+    -3334,  -9756,      0,   4920,      0,      0,   8208, -10161,
+    881, -10161,  13218,  -2944,  -8192,  -2944,      0, -10488,
+    6218,   6248, -11095,   6248,      0,  10488,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    32767,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,  32767
 };
 
 const MappingMatrix mapping_matrix_fourthoa_mixing = { 27, 27, 0 };
 const oac_int16 mapping_matrix_fourthoa_mixing_data[729] = {
-      9243,      0,  16010,      0,      0,      0,  20669,      0,
-         0,      0,      0,      0,  24456,      0,      0,      0,
-         0,      0,      0,      0,  27731,      0,      0,      0,
-         0,      0,      0,   9243,      0,  10884,  11741,      0,
-         0,   3995,  17849,   9626,      0,      0,      0,  -5727,
-     14399,  17315,   7625,      0,      0,      0,      0, -11747,
-      2574,  18637,  15552,   5930,      0,      0,   9243, -14302,
-     -2682,  -6677,  13337,   5357,  -9464,   2501, -11170,   4770,
-     -5911,  11501,   5858,   5369,   4951,  17901, -19071,  -2397,
-     -9281,  -9198,   7576,  -4294,   7773,  -8997,  -3399,      0,
-         0,   9243,   9940,  11991,  -3705,  -5144,  16647,   7057,
-     -6206,  -5941,  -2698, -10194,  16781,  -1788,  -6256, -11772,
-      4935,   3912,  -6062, -13039,   9446,  -9758,  -3521, -15058,
-     11089,    565,      0,      0,   9243, -15376,   3720,   2461,
-     -5285,  -7989,  -8660,   1278, -16087,  15811,  -3249,  10500,
-     -7757,  -1680,  -9890,  -8153,  10884,  11022,   2847,  12828,
-      5137,  -2053,   8666,  -5684,  14776,      0,      0,   9243,
+    9243,      0,  16010,      0,      0,      0,  20669,      0,
+    0,      0,      0,      0,  24456,      0,      0,      0,
+    0,      0,      0,      0,  27731,      0,      0,      0,
+    0,      0,      0,   9243,      0,  10884,  11741,      0,
+    0,   3995,  17849,   9626,      0,      0,      0,  -5727,
+    14399,  17315,   7625,      0,      0,      0,      0, -11747,
+    2574,  18637,  15552,   5930,      0,      0,   9243, -14302,
+    -2682,  -6677,  13337,   5357,  -9464,   2501, -11170,   4770,
+    -5911,  11501,   5858,   5369,   4951,  17901, -19071,  -2397,
+    -9281,  -9198,   7576,  -4294,   7773,  -8997,  -3399,      0,
+    0,   9243,   9940,  11991,  -3705,  -5144,  16647,   7057,
+    -6206,  -5941,  -2698, -10194,  16781,  -1788,  -6256, -11772,
+    4935,   3912,  -6062, -13039,   9446,  -9758,  -3521, -15058,
+    11089,    565,      0,      0,   9243, -15376,   3720,   2461,
+    -5285,  -7989,  -8660,   1278, -16087,  15811,  -3249,  10500,
+    -7757,  -1680,  -9890,  -8153,  10884,  11022,   2847,  12828,
+    5137,  -2053,   8666,  -5684,  14776,      0,      0,   9243,
     -10577,  10304,  -6186,   9139, -15222,   2507,  -8902,  -5140,
-      -145,  15562, -10596,  -7311,  -6197,  -8753,   8667,  -6014,
-      -281,  15033,    938, -11859,    548,  -8456,  16735,  -3654,
-         0,      0,   9243,   8974,   4839, -12343, -15472,   6066,
-     -7501,  -8343,   5015,  15920, -12374,  -4559,  -9400,   6271,
-      4011,   5191,  -9932,  14438,   4828,  -8768,   1909,  12059,
-     -1565,   4707, -13711,      0,      0,   9243,  15799,   2085,
-     -1534,  -3386,   4602,  -9808,   -447, -17267, -18054,  -1167,
+    -145,  15562, -10596,  -7311,  -6197,  -8753,   8667,  -6014,
+    -281,  15033,    938, -11859,    548,  -8456,  16735,  -3654,
+    0,      0,   9243,   8974,   4839, -12343, -15472,   6066,
+    -7501,  -8343,   5015,  15920, -12374,  -4559,  -9400,   6271,
+    4011,   5191,  -9932,  14438,   4828,  -8768,   1909,  12059,
+    -1565,   4707, -13711,      0,      0,   9243,  15799,   2085,
+    -1534,  -3386,   4602,  -9808,   -447, -17267, -18054,  -1167,
     -13525,  -4644,   1313,  -5951,   5397,   7485,  -7056,   2584,
-     -8120,   8669,    788,  13177,   2109,  18349,      0,      0,
-      9243,  12371, -10036,   1597,   2760, -17341,   1848,  -2239,
+    -8120,   8669,    788,  13177,   2109,  18349,      0,      0,
+    9243,  12371, -10036,   1597,   2760, -17341,   1848,  -2239,
     -10509,  -8474,  -4577,  11164,   7935,   1441,  17430,  -3436,
-     -3713,  15936,   4184,   2647, -11730,    341, -15934,   6462,
-      6581,      0,      0,   9243,  -8963,   2184,  13084, -16381,
-     -2734,  -9757,   3991,   6345, -18297,  -5912,   7604,  -4849,
+    -3713,  15936,   4184,   2647, -11730,    341, -15934,   6462,
+    6581,      0,      0,   9243,  -8963,   2184,  13084, -16381,
+    -2734,  -9757,   3991,   6345, -18297,  -5912,   7604,  -4849,
     -11100,   2290,  -4304, -13305,  -7488,  12338,   4805,   8505,
-     -7014,  -4779,  -1761, -14597,      0,      0,   9243,   1301,
+    -7014,  -4779,  -1761, -14597,      0,      0,   9243,   1301,
     -15498,   3799,    690,  -2816,  18718,  -8223,    889,    255,
-     -1768,   4485, -19951,  13097,  -2278,    167,     78,   -740,
-      3324,  -6139,  19488, -17925,   4283,   -486,     20,      0,
-         0,   9243, -13470,  -6719,   5452, -10257,  12641,  -4873,
-     -5116, -10595,   5856,  11389,   1502,  10876,   -608,  11765,
+    -1768,   4485, -19951,  13097,  -2278,    167,     78,   -740,
+    3324,  -6139,  19488, -17925,   4283,   -486,     20,      0,
+    0,   9243, -13470,  -6719,   5452, -10257,  12641,  -4873,
+    -5116, -10595,   5856,  11389,   1502,  10876,   -608,  11765,
     -13218,  13911,  -7373,  -2070, -13679,  -4154,   5536,  -2138,
-     16643,    451,      0,      0,   9243,   2455,  -3679, -15387,
-     -5277,  -1261,  -8697,   7906,  16112,   8147,   3208,  -1690,
-      7687,  10593,  -9796, -15852, -10884,  -5616,   2881,   2032,
-      5246, -12735,  -8796,  10928,  14833,      0,      0,   9243,
-     -6849,   2775, -14202,  13586,  -2655,  -9402,  -5505,  10809,
+    16643,    451,      0,      0,   9243,   2455,  -3679, -15387,
+    -5277,  -1261,  -8697,   7906,  16112,   8147,   3208,  -1690,
+    7687,  10593,  -9796, -15852, -10884,  -5616,   2881,   2032,
+    5246, -12735,  -8796,  10928,  14833,      0,      0,   9243,
+    -6849,   2775, -14202,  13586,  -2655,  -9402,  -5505,  10809,
     -18013,   6231,   5444,  -6041,  11288,   4958,  -4078,  18799,
-     -9368,  -9291,   4535,   7383,   9405,  -7391,  -2121,  -4336,
-         0,      0,   9243,   6423,  -9040,  11548,  10359,  -8109,
-      -450, -14580,   6431,  10857, -15475,   3569,   9707,   6416,
-     -9607,    521,   8528, -18391,  11049,   3815, -10423,   6860,
-      6860,   -883,  -4221,      0,      0,   9243,  11932,  -5968,
-     -8850, -14749,  -9946,  -6026,   7377,  -4472,   5206,  14547,
-     -3406,  10508,   2526,   4411,  14543,   8444,  -5822,    347,
-     12347,  -1709,  -9158,    105, -16265, -12642,      0,      0,
-      9243,  13044,   -150,   9282,  16910,   -274, -10332,   -194,
-     -5864,   5428,   -420, -12196,    344,  -8679,    145, -18554,
+    -9368,  -9291,   4535,   7383,   9405,  -7391,  -2121,  -4336,
+    0,      0,   9243,   6423,  -9040,  11548,  10359,  -8109,
+    -450, -14580,   6431,  10857, -15475,   3569,   9707,   6416,
+    -9607,    521,   8528, -18391,  11049,   3815, -10423,   6860,
+    6860,   -883,  -4221,      0,      0,   9243,  11932,  -5968,
+    -8850, -14749,  -9946,  -6026,   7377,  -4472,   5206,  14547,
+    -3406,  10508,   2526,   4411,  14543,   8444,  -5822,    347,
+    12347,  -1709,  -9158,    105, -16265, -12642,      0,      0,
+    9243,  13044,   -150,   9282,  16910,   -274, -10332,   -194,
+    -5864,   5428,   -420, -12196,    344,  -8679,    145, -18554,
     -12695,   -152, -14635,    503,  10389,    358,   5076,    522,
     -16100,      0,      0,   9243,  -8374, -13590,  -1221,   1428,
-     15896,  12005,   2318,  -4793,   2590,  -3209, -20390,  -6256,
-     -2974,  10766,   1202,   -876,  -6597,   5004,  19896,  -1541,
-      2902, -16788,  -3062,   1340,      0,      0,   9243,   9879,
-     10267,   7300,  10073,  14167,   2416,  10469,  -3094,   2899,
-     17092,   9762,  -7400,   7214,  -5250,  -8238,  -3989,   5578,
-     16392,  -1050, -11848,   -776,  -5034, -15850,  -5882,      0,
-         0,   9243,  -4974,  -9068,  12221,  -8490,   6299,   -388,
+    15896,  12005,   2318,  -4793,   2590,  -3209, -20390,  -6256,
+    -2974,  10766,   1202,   -876,  -6597,   5004,  19896,  -1541,
+    2902, -16788,  -3062,   1340,      0,      0,   9243,   9879,
+    10267,   7300,  10073,  14167,   2416,  10469,  -3094,   2899,
+    17092,   9762,  -7400,   7214,  -5250,  -8238,  -3989,   5578,
+    16392,  -1050, -11848,   -776,  -5034, -15850,  -5882,      0,
+    0,   9243,  -4974,  -9068,  12221,  -8490,   6299,   -388,
     -15478,   8702,  -9920,  12723,  -2810,   9668,   6905, -13040,
-      4325,  -9456,  16856,  -9159,  -2909, -10476,   7149,   9387,
-     -7350,    233,      0,      0,   9243,   3627, -13823,  -7218,
-     -3656,  -7002,  12776,  13935,   2719,   2446,   8352,   9252,
-     -7676, -18413,  -6212,   -429,  -1272,  -6335, -13356,  -9510,
-       295,  18926,   9934,   1112,   -382,      0,      0,   9243,
-     -6383,  -9343, -11326,  10097,   8329,    223,  14780,   6114,
+    4325,  -9456,  16856,  -9159,  -2909, -10476,   7149,   9387,
+    -7350,    233,      0,      0,   9243,   3627, -13823,  -7218,
+    -3656,  -7002,  12776,  13935,   2719,   2446,   8352,   9252,
+    -7676, -18413,  -6212,   -429,  -1272,  -6335, -13356,  -9510,
+    295,  18926,   9934,   1112,   -382,      0,      0,   9243,
+    -6383,  -9343, -11326,  10097,   8329,    223,  14780,   6114,
     -10348, -15590,  -4195,   9257,  -7445,  -9439,   -323,   7902,
-     18117,  12101,  -3142, -10944,  -5577,   7327,    566,  -4133,
-         0,      0,   9243,   2626,    865,  15769,   5783,    317,
+    18117,  12101,  -3142, -10944,  -5577,   7327,    566,  -4133,
+    0,      0,   9243,   2626,    865,  15769,   5783,    317,
     -10244,   1905,  16884,   9144,    826,  -2420,  -1972, -14536,
-      2413,  16939,  12500,   1482,  -4906,   -578,  10096,  -3476,
+    2413,  16939,  12500,   1482,  -4906,   -578,  10096,  -3476,
     -14323,   2745,  16105,      0,      0,   9243,  -8975,  12086,
-      5450,  -6832, -15149,   7333,   9200,  -3550,   -362, -13645,
+    5450,  -6832, -15149,   7333,   9200,  -3550,   -362, -13645,
     -15525,  -1391,   9428,  -7091,  -5442,   3105,   -820, -17685,
-     -9175,  -9462,   5572,  -9191, -12325,  -2180,      0,      0,
-      9243,   -114,  11576, -11058,    177,   -185,   5875, -17880,
-      8539,   -198,    339,   -173,  -3411, -16698,  16336,  -6369,
-       193,   -430,    408,    -75, -10806,  -7225,  19670, -13817,
-      4665,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,  32767,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-     32767
+    -9175,  -9462,   5572,  -9191, -12325,  -2180,      0,      0,
+    9243,   -114,  11576, -11058,    177,   -185,   5875, -17880,
+    8539,   -198,    339,   -173,  -3411, -16698,  16336,  -6369,
+    193,   -430,    408,    -75, -10806,  -7225,  19670, -13817,
+    4665,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,  32767,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    32767
 };
 
 const MappingMatrix mapping_matrix_fifthoa_mixing = { 38, 38, 0 };
 const oac_int16 mapping_matrix_fifthoa_mixing_data[1444] = {
-      9243,      0,  16010,      0,      0,      0,  20669,      0,
-         0,      0,      0,      0,  24456,      0,      0,      0,
-         0,      0,      0,      0,  27731,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,  30657,      0,
-         0,      0,      0,      0,      0,      0,   9243,      0,
-     -7023,  14387,      0,      0,  -4369, -14112,  14455,      0,
-         0,      0,  10931,   -510, -16777,  14031,      0,      0,
-         0,      0,  -5118,  14286,   4343, -18465,  13374,      0,
-         0,      0,      0,      0,  -6494, -12221,  11761,   8513,
+    9243,      0,  16010,      0,      0,      0,  20669,      0,
+    0,      0,      0,      0,  24456,      0,      0,      0,
+    0,      0,      0,      0,  27731,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,  30657,      0,
+    0,      0,      0,      0,      0,      0,   9243,      0,
+    -7023,  14387,      0,      0,  -4369, -14112,  14455,      0,
+    0,      0,  10931,   -510, -16777,  14031,      0,      0,
+    0,      0,  -5118,  14286,   4343, -18465,  13374,      0,
+    0,      0,      0,      0,  -6494, -12221,  11761,   8513,
     -19458,  12605,      0,      0,   9243, -14128,   5093,   5547,
     -10946, -10050,  -7197,   3945, -11790,   7142,  -9213,   6529,
-     -9701,  -2563,  -9923, -14846,  16521,   6816,   2764,  14103,
-      1118,  -5537,   2977, -14168,   1228,   4866,  17430,   -528,
-     10639,   2641,  10437,  -1037,  11460,   1098,   1296,  15737,
-         0,      0,   9243,   1128, -14775,   6062,    955,  -2329,
-     16069, -12511,   2477,    579,  -2333,   3440, -14197,  18478,
-     -6050,    940,    303,  -1604,   4106,  -4223,   9829, -22688,
-     10647,  -2604,    334,    145,   -927,   3203,  -6017,   4507,
-     -3812,  24212, -15600,   5198,  -1023,    110,      0,      0,
-      9243,   1158,  12997,   9277,   1501,   2103,  10097,  16840,
-      5916,   1402,   3225,   2488,   2929,  19916,  12706,   3585,
-      1137,   3415,   4698,   2078,  -5442,  16634,  18511,   8731,
-      2095,    850,   3061,   5733,   5225,    960, -11728,   7689,
-     20588,  14659,   5642,   1187,      0,      0,   9243,  -4663,
-     -3081, -15003,   9771,   2007,  -9185,   6457,  14199, -14357,
-     -4976,   3554,   6625,  11434,  -7231, -11297,  17760,   8291,
-     -6267,  -3368,   6712, -10837,  -9107,   6524,   6793, -19531,
+    -9701,  -2563,  -9923, -14846,  16521,   6816,   2764,  14103,
+    1118,  -5537,   2977, -14168,   1228,   4866,  17430,   -528,
+    10639,   2641,  10437,  -1037,  11460,   1098,   1296,  15737,
+    0,      0,   9243,   1128, -14775,   6062,    955,  -2329,
+    16069, -12511,   2477,    579,  -2333,   3440, -14197,  18478,
+    -6050,    940,    303,  -1604,   4106,  -4223,   9829, -22688,
+    10647,  -2604,    334,    145,   -927,   3203,  -6017,   4507,
+    -3812,  24212, -15600,   5198,  -1023,    110,      0,      0,
+    9243,   1158,  12997,   9277,   1501,   2103,  10097,  16840,
+    5916,   1402,   3225,   2488,   2929,  19916,  12706,   3585,
+    1137,   3415,   4698,   2078,  -5442,  16634,  18511,   8731,
+    2095,    850,   3061,   5733,   5225,    960, -11728,   7689,
+    20588,  14659,   5642,   1187,      0,      0,   9243,  -4663,
+    -3081, -15003,   9771,   2007,  -9185,   6457,  14199, -14357,
+    -4976,   3554,   6625,  11434,  -7231, -11297,  17760,   8291,
+    -6267,  -3368,   6712, -10837,  -9107,   6524,   6793, -19531,
     -11338,   7934,   7335,  -2205,  -9215,  -7094,  10659,   6243,
-     -4337,  -1250,      0,      0,   9243, -13515,   7679,  -3831,
-      7232, -14496,  -3201,  -4109, -11731,   8828,   9178,  -1901,
+    -4337,  -1250,      0,      0,   9243, -13515,   7679,  -3831,
+    7232, -14496,  -3201,  -4109, -11731,   8828,   9178,  -1901,
     -10848,   -539, -14888,   9626, -10860,  12703,   3824,  12334,
-     -7104,   3496,  -6203,  13852,   5461,  -2109, -17277,   7837,
-     -4714,  13901,   4097,   3940,   7647,   8546,   8688, -10986,
-         0,      0,   9243,   8113,  -9860,   9657,  10943, -11174,
-      1426, -13300,   1915,   8178, -17833,   6805,   8309,   8100,
-     -3121,  -4742,   2683, -15111,  15688,   2358, -11590,   2807,
-      2746,   8762,  -7430,  -2251,  -5481,  16370,  -4081,  -9694,
-      5872, -11539,   -714,  -9492,  15177,  -6126,      0,      0,
-      9243,   9933,  -9215,  -8528, -11831, -12785,    -62,  10976,
-     -1811,   5593,  18018,   6100,   9455,  -5237,   2758,   8971,
-      2743,  -9659, -13517,   5330, -10737,  -4576,  -2069, -15491,
-     -8749,  -7226,  -5237,   9191,   -181, -12277,   2815,  10540,
-       -27,  14741,  16703,   3103,      0,      0,   9243, -10067,
-     -8881,  -8723,  12265,  12487,   -793,  10821,  -1762,  -6021,
+    -7104,   3496,  -6203,  13852,   5461,  -2109, -17277,   7837,
+    -4714,  13901,   4097,   3940,   7647,   8546,   8688, -10986,
+    0,      0,   9243,   8113,  -9860,   9657,  10943, -11174,
+    1426, -13300,   1915,   8178, -17833,   6805,   8309,   8100,
+    -3121,  -4742,   2683, -15111,  15688,   2358, -11590,   2807,
+    2746,   8762,  -7430,  -2251,  -5481,  16370,  -4081,  -9694,
+    5872, -11539,   -714,  -9492,  15177,  -6126,      0,      0,
+    9243,   9933,  -9215,  -8528, -11831, -12785,    -62,  10976,
+    -1811,   5593,  18018,   6100,   9455,  -5237,   2758,   8971,
+    2743,  -9659, -13517,   5330, -10737,  -4576,  -2069, -15491,
+    -8749,  -7226,  -5237,   9191,   -181, -12277,   2815,  10540,
+    -27,  14741,  16703,   3103,      0,      0,   9243, -10067,
+    -8881,  -8723,  12265,  12487,   -793,  10821,  -1762,  -6021,
     -18002,  -5072,   9912,  -4395,   2587,   9368,  -2767,  10021,
-     12259,  -6468, -10113,  -5605,  -1761, -15590,  -9430,   7800,
-      5092,  -8835,   2293,  12314,   1222,  10671,   -329,  13745,
-     17349,   3563,      0,      0,   9243,  -6485,  12991,  -6743,
-      6108, -11768,  10080, -12236,    238,  -2883,  13115, -13907,
-      2900, -14460,    511,   2564,    186,  -7019,  19094, -11597,
-     -5472, -12058,    744,   6243,  -2384,    930,    501, -11778,
-     21214,  -5330, -11746,  -5542,    827,  10475,  -6418,   1132,
-         0,      0,   9243,   3862,   5238, -14627,  -7891,   2826,
-     -7015, -10701,  13900,  11410,  -6831,  -1679,  -9861,   6359,
-     12032, -11660, -14041,  11199,   1713,  -3895,    657,  14749,
-     -3017, -11445,   8380,  15575, -15236,   -346,   7690,   -923,
-     10317,   3498, -13545,    354,   9093,  -4476,      0,      0,
-      9243,  -8417,  13183,   3418,  -4018, -15498,  10685,   6294,
-     -4132,   1419,  -8755, -18818,   3926,   7642,  -9001,  -3235,
-      2125,   3506, -13037, -16570,  -4337,   6729, -13404,  -7991,
-        59,    443,   5804,   6005, -15011,  -9060, -11044,   3679,
+    12259,  -6468, -10113,  -5605,  -1761, -15590,  -9430,   7800,
+    5092,  -8835,   2293,  12314,   1222,  10671,   -329,  13745,
+    17349,   3563,      0,      0,   9243,  -6485,  12991,  -6743,
+    6108, -11768,  10080, -12236,    238,  -2883,  13115, -13907,
+    2900, -14460,    511,   2564,    186,  -7019,  19094, -11597,
+    -5472, -12058,    744,   6243,  -2384,    930,    501, -11778,
+    21214,  -5330, -11746,  -5542,    827,  10475,  -6418,   1132,
+    0,      0,   9243,   3862,   5238, -14627,  -7891,   2826,
+    -7015, -10701,  13900,  11410,  -6831,  -1679,  -9861,   6359,
+    12032, -11660, -14041,  11199,   1713,  -3895,    657,  14749,
+    -3017, -11445,   8380,  15575, -15236,   -346,   7690,   -923,
+    10317,   3498, -13545,    354,   9093,  -4476,      0,      0,
+    9243,  -8417,  13183,   3418,  -4018, -15498,  10685,   6294,
+    -4132,   1419,  -8755, -18818,   3926,   7642,  -9001,  -3235,
+    2125,   3506, -13037, -16570,  -4337,   6729, -13404,  -7991,
+    59,    443,   5804,   6005, -15011,  -9060, -11044,   3679,
     -15434, -13685,    161,   1185,      0,      0,   9243,  -5288,
-      6773, -13508,   9977,  -5002,  -4784, -12780,  10790, -12942,
-     11168,    519, -10890,   1326,  12078,  -6274,  13780, -16427,
-      2186,   5352,  -4328,  13671,   2364,  -7963,   1080, -12568,
-     19336,  -6557,  -8574,   4084,   7277,  10433,  -9273,  -3178,
-      1516,   3817,      0,      0,   9243,   9660,   7817,  10093,
-     13619,  10548,  -2942,  11021,    597,   9663,  17594,   1736,
+    6773, -13508,   9977,  -5002,  -4784, -12780,  10790, -12942,
+    11168,    519, -10890,   1326,  12078,  -6274,  13780, -16427,
+    2186,   5352,  -4328,  13671,   2364,  -7963,   1080, -12568,
+    19336,  -6557,  -8574,   4084,   7277,  10433,  -9273,  -3178,
+    1516,   3817,      0,      0,   9243,   9660,   7817,  10093,
+    13619,  10548,  -2942,  11021,    597,   9663,  17594,   1736,
     -10794,   1814,    771,  -8469,   1041,  14155,   7891,  -8597,
-     -7498,  -8982,    346, -12407, -11848,  -6809,   1686,   9181,
-     -8306, -10247,   3538, -10706,   -364,  -8047, -19188,  -8493,
-         0,      0,   9243,  -7163,  -1020,  14282, -14289,   1021,
+    -7498,  -8982,    346, -12407, -11848,  -6809,   1686,   9181,
+    -8306, -10247,   3538, -10706,   -364,  -8047, -19188,  -8493,
+    0,      0,   9243,  -7163,  -1020,  14282, -14289,   1021,
     -10208,  -2036,  10660, -18919,   2410,   6564,   2323, -13088,
-     -1798,   3365, -19498,   3619,  12022,  -1858,   9978,   3705,
-     -8969,   -643,  -5794, -15523,   4123,  15113,  -3949,  -6265,
-     -3596,  12490,   2946,  -2688,   1225, -14570,      0,      0,
-      9243, -12187,    772, -10354,  17623,  -1314, -10262,  -1117,
-     -2885,  -9937,   2249,  11267,  -1763,   9572,   -368,  16506,
-     -6510,  -1438, -15014,   2402,  10157,   2041,   2458,   2389,
+    -1798,   3365, -19498,   3619,  12022,  -1858,   9978,   3705,
+    -8969,   -643,  -5794, -15523,   4123,  15113,  -3949,  -6265,
+    -3596,  12490,   2946,  -2688,   1225, -14570,      0,      0,
+    9243, -12187,    772, -10354,  17623,  -1314, -10262,  -1117,
+    -2885,  -9937,   2249,  11267,  -1763,   9572,   -368,  16506,
+    -6510,  -1438, -15014,   2402,  10157,   2041,   2458,   2389,
     -19346,  19860,  -1041,   8067,  -3704, -10931,   2743,  -9286,
-       606, -13399,  -3095,   7924,      0,      0,   9243,  15545,
-     -2367,  -3011,  -6538,  -5139,  -9657,    995, -16242, -15706,
-      2557, -12952,   5226,   2508,   6353,  10156,  13593,   6966,
-      4795,   8960,   8183,  -1735,  11914,  -4504,  14149,  11727,
-     -6665,  10460,  -3962,  10145,  -7648,  -1965,  -9845,  -6764,
-     -6938, -16633,      0,      0,   9243,   3098,  12983,  -8841,
-     -3826,   5618,  10053, -16031,   4787,   3283,  -8209,   6632,
-      2856, -18922,  10272,  -2055,  -2344,   7987, -11939,   5516,
-     -5520, -15739,  14940,  -5001,    530,   1465,  -6306,  13388,
+    606, -13399,  -3095,   7924,      0,      0,   9243,  15545,
+    -2367,  -3011,  -6538,  -5139,  -9657,    995, -16242, -15706,
+    2557, -12952,   5226,   2508,   6353,  10156,  13593,   6966,
+    4795,   8960,   8183,  -1735,  11914,  -4504,  14149,  11727,
+    -6665,  10460,  -3962,  10145,  -7648,  -1965,  -9845,  -6764,
+    -6938, -16633,      0,      0,   9243,   3098,  12983,  -8841,
+    -3826,   5618,  10053, -16031,   4787,   3283,  -8209,   6632,
+    2856, -18922,  10272,  -2055,  -2344,   7987, -11939,   5516,
+    -5520, -15739,  14940,  -5001,    530,   1465,  -6306,  13388,
     -13243,   2513, -11772,  -7170,  16572,  -8384,   1426,    168,
-         0,      0,   9243, -15767,  -2008,  -1916,   4220,   4422,
-     -9846,    537, -17105,  17650,  -1400,  13589,   4481,   1651,
-      5677,   6701,  -9241,  -6642,  -3252,  -7827,   8792,   -951,
-     13182,  -2522,  17586, -17005,   3845, -12562,   2213, -11472,
-     -6688,  -1394,  -8970,  -4769,  -7316, -11753,      0,      0,
-      9243, -13344,  -3829,   7975, -14863,   7136,  -8561,  -4265,
-     -7992,   -801,   9405,   8912,   7937,  -5326,   5057, -17681,
-     15207,    575,   7717, -11360,   4847,   6789,   4150,  12686,
+    0,      0,   9243, -15767,  -2008,  -1916,   4220,   4422,
+    -9846,    537, -17105,  17650,  -1400,  13589,   4481,   1651,
+    5677,   6701,  -9241,  -6642,  -3252,  -7827,   8792,   -951,
+    13182,  -2522,  17586, -17005,   3845, -12562,   2213, -11472,
+    -6688,  -1394,  -8970,  -4769,  -7316, -11753,      0,      0,
+    9243, -13344,  -3829,   7975, -14863,   7136,  -8561,  -4265,
+    -7992,   -801,   9405,   8912,   7937,  -5326,   5057, -17681,
+    15207,    575,   7717, -11360,   4847,   6789,   4150,  12686,
     -10050,  16730, -12063,    322, -12920,  -3313, -10267,   1980,
-     -6948,   7112,   7972,   8042,      0,      0,   9243,   7791,
-     -1021,  13949,  15180,  -1111, -10208,  -1989,   9348,  19199,
-     -2561,  -7140,   2323, -12782,  -1577,    817,  18164,  -3673,
+    -6948,   7112,   7972,   8042,      0,      0,   9243,   7791,
+    -1021,  13949,  15180,  -1111, -10208,  -1989,   9348,  19199,
+    -2561,  -7140,   2323, -12782,  -1577,    817,  18164,  -3673,
     -12771,   2022,   9978,   3620,  -7865,   -156,  -9155,  11924,
-     -3842, -15336,   4196,   6814,  -3596,  12199,   2583,   -652,
-      1936, -17637,      0,      0,   9243,  -4810, -15144,  -1958,
-      1315,  10175,  17406,   4142,  -1348,    263,  -3292, -15632,
+    -3842, -15336,   4196,   6814,  -3596,  12199,   2583,   -652,
+    1936, -17637,      0,      0,   9243,  -4810, -15144,  -1958,
+    1315,  10175,  17406,   4142,  -1348,    263,  -3292, -15632,
     -17046,  -6363,   3374,    605,   -227,   -748,   5997,  20334,
-     14481,   8277,  -6146,  -1717,      5,     27,    712,   1542,
-     -9197, -23572, -10163,  -9595,   9425,   3539,    -17,    -72,
-         0,      0,   9243,  -7366,   8261,  11568, -11901,  -8499,
-     -2079,  13347,   5556, -12049, -16247,  -2282, -10529,   3584,
-      7585,  -1577,  -8464, -18652,  -8902,   5913,  -8688,  -9287,
-      4156,  -2442,  -7089,  -2993, -14485, -13949,   5422,   8459,
-      1638, -13285,  -2531,  -1826, -12132,  -9456,      0,      0,
-      9243,  11716,    698, -10889, -17818,   1143, -10275,  -1062,
-     -1305,  12057,  -2057, -10855,  -1595,  10088,   -150,  15043,
-      2978,   1578,  15225,  -2090,  10201,   1943,   1115,   1969,
+    14481,   8277,  -6146,  -1717,      5,     27,    712,   1542,
+    -9197, -23572, -10163,  -9595,   9425,   3539,    -17,    -72,
+    0,      0,   9243,  -7366,   8261,  11568, -11901,  -8499,
+    -2079,  13347,   5556, -12049, -16247,  -2282, -10529,   3584,
+    7585,  -1577,  -8464, -18652,  -8902,   5913,  -8688,  -9287,
+    4156,  -2442,  -7089,  -2993, -14485, -13949,   5422,   8459,
+    1638, -13285,  -2531,  -1826, -12132,  -9456,      0,      0,
+    9243,  11716,    698, -10889, -17818,   1143, -10275,  -1062,
+    -1305,  12057,  -2057, -10855,  -1595,  10088,   -150,  15043,
+    2978,   1578,  15225,  -2090,  10201,   1943,   1115,   1969,
     -20211, -17636,    430,  -9826,   3391,  10572,   2485,  -9826,
-       248, -12259,  -2924,  12131,      0,      0,   9243,   4361,
-     -4594, -14703,  -8956,  -2798,  -7781,   9434,  13769,  12936,
-      6800,  -2400,   9082,   8091, -10453, -11023, -15786, -11136,
-      3285,   4153,   2658, -14002,  -5051,   9489,   7000,  17206,
-     15024,  -2777,  -8491,    -42, -10626,    141,  13053,   2366,
-     -6662,  -2231,      0,      0,   9243,   -752, -11933, -10646,
-      1119,   1254,   6890,  17745,   7875,  -1203,  -2207,  -1251,
-      2024, -17706, -15532,  -5600,   1128,   2691,   2800,    683,
-     -9927,   9661,  19706,  12522,   3889,   -978,  -2789,  -3992,
-     -2440,    206,  12695,   2921, -17173, -18575,  -9616,  -2657,
-         0,      0,   9243,   4791, -15001,  -2887,  -1931, -10037,
-     16885,   6048,  -1020,     46,   4789,  15191, -15922,  -9154,
-      2530,    823,    252,   -130,  -8608, -19335,  12613,  11651,
-     -4549,  -2314,   -172,   -101,   -784,    265,  12975,  21741,
-     -7551, -13101,   6856,   4710,    535,    -46,      0,      0,
-      9243, -12153, -10395,    754,  -1281,  17644,   2735,  -1095,
+    248, -12259,  -2924,  12131,      0,      0,   9243,   4361,
+    -4594, -14703,  -8956,  -2798,  -7781,   9434,  13769,  12936,
+    6800,  -2400,   9082,   8091, -10453, -11023, -15786, -11136,
+    3285,   4153,   2658, -14002,  -5051,   9489,   7000,  17206,
+    15024,  -2777,  -8491,    -42, -10626,    141,  13053,   2366,
+    -6662,  -2231,      0,      0,   9243,   -752, -11933, -10646,
+    1119,   1254,   6890,  17745,   7875,  -1203,  -2207,  -1251,
+    2024, -17706, -15532,  -5600,   1128,   2691,   2800,    683,
+    -9927,   9661,  19706,  12522,   3889,   -978,  -2789,  -3992,
+    -2440,    206,  12695,   2921, -17173, -18575,  -9616,  -2657,
+    0,      0,   9243,   4791, -15001,  -2887,  -1931, -10037,
+    16885,   6048,  -1020,     46,   4789,  15191, -15922,  -9154,
+    2530,    823,    252,   -130,  -8608, -19335,  12613,  11651,
+    -4549,  -2314,   -172,   -101,   -784,    265,  12975,  21741,
+    -7551, -13101,   6856,   4710,    535,    -46,      0,      0,
+    9243, -12153, -10395,    754,  -1281,  17644,   2735,  -1095,
     -10274,   8359,   2200, -12593,   7083,    782,  17650,  -1573,
-      1685, -16282,  -2164,   -530, -11878,     32, -17359,   3065,
-      6651,  -5212,  -3628,  19365,    965,  13180,   8243,   -818,
-      7746,  -3645, -14323,   1670,      0,      0,   9243,  -6961,
+    1685, -16282,  -2164,   -530, -11878,     32, -17359,   3065,
+    6651,  -5212,  -3628,  19365,    965,  13180,   8243,   -818,
+    7746,  -3645, -14323,   1670,      0,      0,   9243,  -6961,
     -11198,   9081,  -8829,  10887,   4833, -14202,   2374,  -6524,
-     16339,  -9417,   4737,  12284,  -4394,  -2691,  -2683,  13690,
+    16339,  -9417,   4737,  12284,  -4394,  -2691,  -2683,  13690,
     -18539,   2830, -11438,  -3692,   4985,   5648,  -4628,    514,
-      6225, -18409,  12672,   5311,  11170,  -6928,  -3407,  -7595,
-     10737,  -3977,      0,      0,   9243,  12099, -10405,   1294,
-      2187, -17582,   2760,  -1880, -10105,  -8058,  -3760,  12583,
-      7058,   1346,  17376,  -2667,  -2829,  15710,   3705,    468,
+    6225, -18409,  12672,   5311,  11170,  -6928,  -3407,  -7595,
+    10737,  -3977,      0,      0,   9243,  12099, -10405,   1294,
+    2187, -17582,   2760,  -1880, -10105,  -8058,  -3760,  12583,
+    7058,   1346,  17376,  -2667,  -2829,  15710,   3705,    468,
     -11880,     50, -17123,   5201,   6230,   4698,   6098, -18716,
-     -1665, -13088,   8285,  -1400,   7696,  -6196, -13429,   2770,
-         0,      0,   9243,   8602,  13392,   1722,   2070,  16090,
-     11359,   3222,  -4960,  -2638,   4581,  20106,   5099,   4026,
+    -1665, -13088,   8285,  -1400,   7696,  -6196, -13429,   2770,
+    0,      0,   9243,   8602,  13392,   1722,   2070,  16090,
+    11359,   3222,  -4960,  -2638,   4581,  20106,   5099,   4026,
     -10978,  -1778,  -1314,  -6620,   6988,  18701,  -2965,   3745,
     -16745,  -4461,   1300,    584,  -3646, -11588,   8350,  11847,
     -10050,   2372, -20010,  -7809,   3608,    887,      0,      0,
-      9243,  14252,  -1958,   7026,  13986,  -3899,  -9870,  -1922,
+    9243,  14252,  -1958,   7026,  13986,  -3899,  -9870,  -1922,
     -10736,  -3693,  -4527, -12333,   4376,  -6080,   3475, -18537,
     -19222,   1355, -10843,   6913,   8869,   3408,   8323,   6804,
-     -5141, -13648,   7800,   2649,   7171,  10505,  -6548,   5179,
-     -5505,  13299,   2086,  15579,      0,      0,   9243,  11323,
-      9021,  -6835, -10810,  14267,   -489,  -8613,  -5689,    639,
+    -5141, -13648,   7800,   2649,   7171,  10505,  -6548,   5179,
+    -5505,  13299,   2086,  15579,      0,      0,   9243,  11323,
+    9021,  -6835, -10810,  14267,   -489,  -8613,  -5689,    639,
     -16117,   6224,  -9731,  -3757,  -8482,  10882,   7873,   1080,
     -11447,  -6791, -10388,   4099,  -6025,  18396,  -5407,  -7536,
-     14714,    984,   1267, -13940,  -1889,   8416,    666,  16762,
+    14714,    984,   1267, -13940,  -1889,   8416,    666,  16762,
     -10106,  -3418,      0,      0,   9243,    871,   4833,  15238,
-      1855,    588,  -7508,  10287,  16162,   2857,   1481,   -443,
-     -9392,  -7758,  12910,  16506,   3837,   2588,   -581,   -851,
-      1928, -14879,  -5066,  14950,  16498,   4773,   3842,   -425,
-     -1785,    -82,  10578,  -1435, -15554,  -2459,  16520,  16250,
-         0,      0,   9243,  14762,   5967,   1673,   3450,  12303,
-     -6027,   1394, -15022, -14571,   3402,  -4217, -10507,   -478,
+    1855,    588,  -7508,  10287,  16162,   2857,   1481,   -443,
+    -9392,  -7758,  12910,  16506,   3837,   2588,   -581,   -851,
+    1928, -14879,  -5066,  14950,  16498,   4773,   3842,   -425,
+    -1785,    -82,  10578,  -1435, -15554,  -2459,  16520,  16250,
+    0,      0,   9243,  14762,   5967,   1673,   3450,  12303,
+    -6027,   1394, -15022, -14571,   3402,  -4217, -10507,   -478,
     -14813,  -5131,  -6634, -16293,    -82, -15276,  -1705,  -1731,
-       358,  -5738,  13681,  12503,  -8200,  -3023,  -3290,  -7384,
-      9272,   -837,  14328,  -1064,  16913,   7915,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,  32767,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,  32767
+    358,  -5738,  13681,  12503,  -8200,  -3023,  -3290,  -7384,
+    9272,   -837,  14328,  -1064,  16913,   7915,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,  32767,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,  32767
 };
 
 const MappingMatrix mapping_matrix_foa_demixing = { 6, 6, 0 };
 const oac_int16 mapping_matrix_foa_demixing_data[36] = {
-     16384,  16384,  16384,  16384,      0,      0,      0,  23170,
-         0, -23170,      0,      0, -16384,  16384, -16384,  16384,
-         0,      0,  23170,      0, -23170,      0,      0,      0,
-         0,      0,      0,      0,  32767,      0,      0,      0,
-         0,      0,      0,  32767
+    16384,  16384,  16384,  16384,      0,      0,      0,  23170,
+    0, -23170,      0,      0, -16384,  16384, -16384,  16384,
+    0,      0,  23170,      0, -23170,      0,      0,      0,
+    0,      0,      0,      0,  32767,      0,      0,      0,
+    0,      0,      0,  32767
 };
 
 const MappingMatrix mapping_matrix_soa_demixing = { 11, 11, 3050 };
 const oac_int16 mapping_matrix_soa_demixing_data[121] = {
-      2771,   2771,   2771,   2771,   2771,   2771,   2771,   2771,
-      2771,      0,      0,  10033,  10033, -20066,  10033,  14189,
-     14189, -28378,  10033, -20066,      0,      0,   3393,   3393,
-      3393,  -3393,      0,      0,      0,  -3393,  -3393,      0,
-         0, -17378,  17378,      0, -17378, -24576,  24576,      0,
-     17378,      0,      0,      0, -14189,  14189,      0, -14189,
+    2771,   2771,   2771,   2771,   2771,   2771,   2771,   2771,
+    2771,      0,      0,  10033,  10033, -20066,  10033,  14189,
+    14189, -28378,  10033, -20066,      0,      0,   3393,   3393,
+    3393,  -3393,      0,      0,      0,  -3393,  -3393,      0,
+    0, -17378,  17378,      0, -17378, -24576,  24576,      0,
+    17378,      0,      0,      0, -14189,  14189,      0, -14189,
     -28378,  28378,      0,  14189,      0,      0,      0,   2399,
-      2399,  -4799,  -2399,      0,      0,      0,  -2399,   4799,
-         0,      0,   1959,   1959,   1959,   1959,  -3918,  -3918,
-     -3918,   1959,   1959,      0,      0,  -4156,   4156,      0,
-      4156,      0,      0,      0,  -4156,      0,      0,      0,
-      8192,   8192, -16384,   8192,  16384,  16384, -32768,   8192,
+    2399,  -4799,  -2399,      0,      0,      0,  -2399,   4799,
+    0,      0,   1959,   1959,   1959,   1959,  -3918,  -3918,
+    -3918,   1959,   1959,      0,      0,  -4156,   4156,      0,
+    4156,      0,      0,      0,  -4156,      0,      0,      0,
+    8192,   8192, -16384,   8192,  16384,  16384, -32768,   8192,
     -16384,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,   8312,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-      8312
+    0,      0,      0,      0,   8312,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    8312
 };
 
 const MappingMatrix mapping_matrix_toa_demixing = { 18, 18, 0 };
 const oac_int16 mapping_matrix_toa_demixing_data[324] = {
-      8192,   8192,   8192,   8192,   8192,   8192,   8192,   8192,
-      8192,   8192,   8192,   8192,   8192,   8192,   8192,   8192,
-         0,      0,      0,  -9779,   9779,   6263,   8857,      0,
-      6263,  13829,   9779, -13829,      0,  -6263,      0,  -8857,
-     -6263,  -9779,      0,      0,  -3413,   3413,   3413, -11359,
-     11359,  11359, -11359,  -3413,   3413,  -3413,  -3413, -11359,
-     11359,  11359, -11359,   3413,      0,      0,  13829,   9779,
-     -9779,   6263,      0,   8857,  -6263,      0,   9779,      0,
+    8192,   8192,   8192,   8192,   8192,   8192,   8192,   8192,
+    8192,   8192,   8192,   8192,   8192,   8192,   8192,   8192,
+    0,      0,      0,  -9779,   9779,   6263,   8857,      0,
+    6263,  13829,   9779, -13829,      0,  -6263,      0,  -8857,
+    -6263,  -9779,      0,      0,  -3413,   3413,   3413, -11359,
+    11359,  11359, -11359,  -3413,   3413,  -3413,  -3413, -11359,
+    11359,  11359, -11359,   3413,      0,      0,  13829,   9779,
+    -9779,   6263,      0,   8857,  -6263,      0,   9779,      0,
     -13829,   6263,  -8857,      0,  -6263,  -9779,      0,      0,
-         0, -15617, -15617,   6406,      0,      0,  -6406,      0,
-     15617,      0,      0,  -6406,      0,      0,   6406,  15617,
-         0,      0,      0,  -5003,   5003, -10664,  15081,      0,
+    0, -15617, -15617,   6406,      0,      0,  -6406,      0,
+    15617,      0,      0,  -6406,      0,      0,   6406,  15617,
+    0,      0,      0,  -5003,   5003, -10664,  15081,      0,
     -10664,  -7075,   5003,   7075,      0,  10664,      0, -15081,
-     10664,  -5003,      0,      0,  -8176,  -8176,  -8176,   8208,
-      8208,   8208,   8208,  -8176,  -8176,  -8176,  -8176,   8208,
-      8208,   8208,   8208,  -8176,      0,      0,  -7075,   5003,
-     -5003, -10664,      0,  15081,  10664,      0,   5003,      0,
-      7075, -10664, -15081,      0,  10664,  -5003,      0,      0,
-     15617,      0,      0,      0,  -6406,   6406,      0, -15617,
-         0, -15617,  15617,      0,   6406,  -6406,      0,      0,
-         0,      0,      0, -11393,  11393,   2993,  -4233,      0,
-      2993, -16112,  11393,  16112,      0,  -2993,      0,   4233,
-     -2993, -11393,      0,      0,      0,  -9974,  -9974, -13617,
-         0,      0,  13617,      0,   9974,      0,      0,  13617,
-         0,      0, -13617,   9974,      0,      0,      0,   5579,
-     -5579,  10185,  14403,      0,  10185,  -7890,  -5579,   7890,
-         0, -10185,      0, -14403, -10185,   5579,      0,      0,
-     11826, -11826, -11826,   -901,    901,    901,   -901,  11826,
+    10664,  -5003,      0,      0,  -8176,  -8176,  -8176,   8208,
+    8208,   8208,   8208,  -8176,  -8176,  -8176,  -8176,   8208,
+    8208,   8208,   8208,  -8176,      0,      0,  -7075,   5003,
+    -5003, -10664,      0,  15081,  10664,      0,   5003,      0,
+    7075, -10664, -15081,      0,  10664,  -5003,      0,      0,
+    15617,      0,      0,      0,  -6406,   6406,      0, -15617,
+    0, -15617,  15617,      0,   6406,  -6406,      0,      0,
+    0,      0,      0, -11393,  11393,   2993,  -4233,      0,
+    2993, -16112,  11393,  16112,      0,  -2993,      0,   4233,
+    -2993, -11393,      0,      0,      0,  -9974,  -9974, -13617,
+    0,      0,  13617,      0,   9974,      0,      0,  13617,
+    0,      0, -13617,   9974,      0,      0,      0,   5579,
+    -5579,  10185,  14403,      0,  10185,  -7890,  -5579,   7890,
+    0, -10185,      0, -14403, -10185,   5579,      0,      0,
+    11826, -11826, -11826,   -901,    901,    901,   -901,  11826,
     -11826,  11826,  11826,   -901,    901,    901,   -901, -11826,
-         0,      0,  -7890,  -5579,   5579,  10185,      0,  14403,
+    0,      0,  -7890,  -5579,   5579,  10185,      0,  14403,
     -10185,      0,  -5579,      0,   7890,  10185, -14403,      0,
     -10185,   5579,      0,      0,  -9974,      0,      0,      0,
     -13617,  13617,      0,   9974,      0,   9974,  -9974,      0,
-     13617, -13617,      0,      0,      0,      0,  16112, -11393,
-     11393,  -2993,      0,   4233,   2993,      0, -11393,      0,
+    13617, -13617,      0,      0,      0,      0,  16112, -11393,
+    11393,  -2993,      0,   4233,   2993,      0, -11393,      0,
     -16112,  -2993,  -4233,      0,   2993,  11393,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-     32767,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,  32767
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    32767,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,  32767
 };
 
 const MappingMatrix mapping_matrix_fourthoa_demixing = { 27, 27, 0 };
 const oac_int16 mapping_matrix_fourthoa_demixing_data[729] = {
-      4870,   4484,   4870,   4347,   4440,   4726,   4683,   4821,
-      4883,   4842,   4603,   4484,   4683,   4698,   4234,   4368,
-      4603,   4783,   4783,   4820,   4821,   4347,   4820,   4440,
-      4698,      0,      0,    101,     84,  -7818,   4640,  -7178,
-     -5492,   4629,   8384,   6547,  -4966,    617,  -6345,   1061,
-     -3241,   2939,   5549,   6390,  -4434,   4994,  -2610,   1993,
-     -2873,   1547,  -4356,   -164,      0,      0,   8797,   5074,
-     -1553,   5383,   1906,   5297,   2722,   1158,  -5226,   1311,
-     -7760,  -3327,  -1940,   1586,  -4093,  -2951,   -214,  -6873,
-      5450,  -4875,  -7193,  -4438,    558,   5593,   5607,      0,
-         0,    -26,   5761,  -3723,  -1460,   1195,  -3065,  -6357,
-     -1175,    608,   6965,   2310,   2759,  -8023,  -7138,   5162,
-     -3624,   5006,   -809,   3592,   6209,  -4159,  -4968,   8150,
-      2513,  -5702,      0,      0,    301,    109,   7161,  -2462,
-     -2443,   5044,  -7125,  -2256,   1967,  -9107,    259,  -4928,
-     -2592,   6514,   4111,  -7236,   8695,    635,   5009,  -4025,
-     -1937,   4794,   3420,  -3507,   -400,      0,      0,   -134,
-        85,   2771,   7842,  -3649,  -8225,   2866,   2586,  -9200,
-     -1945,  -1563,   6155,   -720,  -1061,  -3494,  -4513,   -487,
-      8389,   7317,   3348,  -3721,   3806,    371,  -6896,     70,
-         0,      0,  10919,   2072,  -4867,   3472,  -4429,   1721,
-     -4066,  -5193,   1032,  -5253,   9501,  -2017,  -3971,  -5261,
-      -306,  -2737,  -5137,   5713,   1237,     -8,   6387,    364,
-     -5423,   3364,   2888,      0,      0,    -48,   8946,   1048,
-     -2691,    602,  -4332,  -4302,   -514,  -1730,   2459,  -4328,
-     -2156,   3335,  -2748,  -6029,   4023,    155,    897,   5268,
-     -8380,   7625,   7395,    508,   3945,  -8951,      0,      0,
-        39,   4151,  -5965,  -3398,  -7006,  -3534,   2697,  -8989,
-     -5237,   2913,     46,  -5540,   8196,   5766,   2711,  -2520,
-     -3043,  -2146,   -948,   4965,   1806,   2472,   8988,  -1266,
-      4840,      0,      0,   -407,   -189,   2179,  -1627,   6516,
-       259,   7196,  -9449,  -4905,  -9766,    561,   4021,   3371,
-     -8650,   5032,   3329,   2534,    641,   2224,  -5747,   1047,
-     -4074,   5252,    -24,    674,      0,      0,    664,    237,
-     -2837,  -4072,  -1205,   8252,  -5875,  -1670,  -2743,  -3984,
-       381,   5059,   1765,   2666,  -8295,   7403,   1154,  -2086,
-      7622,   7105,   3677,  -6943,   1050,  -6632,   -694,      0,
-         0,    382,   -133,   5699,   7650,   5154,  -5713,  -1645,
-     -6902,   6181,   4450,   1151,    410,   -993,   3829,   2444,
-     -2405,  -6618,  -9514,   5366,  -1896,   5844,  -2886,  -1524,
-     -7321,  -1007,      0,      0,  12767,  -2530,   3183,  -1409,
-     -4015,  -2894,  -5155,  -1710,   3841,  -2107, -10274,   5119,
-      3979,  -4010,   5550,   4822,   -746,  -2507,  -3080,   4289,
-     -3675,   4333,  -1416,  -1230,  -1122,      0,      0,     17,
-      8048,   2398,  -2167,    -73,  -3606,   3125,    398,    731,
-     -5973,   5705,  -1032,   4679,   7305,   3134,   1301,  -3858,
-       -89,   2938,   4359,  -9155,  -4805,  -8407,   3673,  -8645,
-         0,      0,    187,   7355,   3145,  -6719,  -4432,  -5939,
-      2541,  -2810,   9723,    778,  -1105,   5687,  -4174,   2534,
-     -4461,   1017,   -244,   5481,  -1655,  -6765,  -3350,  -4894,
-      1592,  -2318,   8827,      0,      0,    196,   3588,   9631,
-      3063,  -4564,   6043,   2683,   2595,  -2488,  -2186,    173,
-     -6059,  -8270,  -2386,    409,   7441,  -8608,    376,  -4364,
-      2321,   -280,     97,   8331,  -3022,  -4721,      0,      0,
-       117,   -748, -10833,   1533,   4200,  -2875,   -997,   -109,
-     -3661,  -6119,   4454,   8808,  -9189,   8294,   1521,   7265,
-     -2348,  -5094,   -948,  -5400,  -3193,   8914,   5763,   1716,
-     -1070,      0,      0,   2497,    399,  -5201,  -2038,   7843,
-      -376,   7567,  -5073,   7616,  -5537,   2086,  -3453,  -5544,
-       -56, -11648,  -1314,   3546,  -3432,   -117,   8694,  -4245,
-      9621,   3098,  -2582,  -2351,      0,      0,   4386,  -3104,
-     -3132, -10512,    566,   5217,   5128,   4967,   1348,   7035,
-     -1470,     91,   -125,  -3548,   8244,  -3029, -10033,   2186,
-      9745,  -6440,  -2074,   3638,  -1477,  -7045,   -562,      0,
-         0,   2154,   8116,  -6102,   6570,  12998,   -712,  -4126,
-     -4996,     30,   1571,  -6393, -12794,    425,   5036,   1190,
-      5763,   5653,  12933,  -6671,   5197,  -2964,  -3316,  -6354,
+    4870,   4484,   4870,   4347,   4440,   4726,   4683,   4821,
+    4883,   4842,   4603,   4484,   4683,   4698,   4234,   4368,
+    4603,   4783,   4783,   4820,   4821,   4347,   4820,   4440,
+    4698,      0,      0,    101,     84,  -7818,   4640,  -7178,
+    -5492,   4629,   8384,   6547,  -4966,    617,  -6345,   1061,
+    -3241,   2939,   5549,   6390,  -4434,   4994,  -2610,   1993,
+    -2873,   1547,  -4356,   -164,      0,      0,   8797,   5074,
+    -1553,   5383,   1906,   5297,   2722,   1158,  -5226,   1311,
+    -7760,  -3327,  -1940,   1586,  -4093,  -2951,   -214,  -6873,
+    5450,  -4875,  -7193,  -4438,    558,   5593,   5607,      0,
+    0,    -26,   5761,  -3723,  -1460,   1195,  -3065,  -6357,
+    -1175,    608,   6965,   2310,   2759,  -8023,  -7138,   5162,
+    -3624,   5006,   -809,   3592,   6209,  -4159,  -4968,   8150,
+    2513,  -5702,      0,      0,    301,    109,   7161,  -2462,
+    -2443,   5044,  -7125,  -2256,   1967,  -9107,    259,  -4928,
+    -2592,   6514,   4111,  -7236,   8695,    635,   5009,  -4025,
+    -1937,   4794,   3420,  -3507,   -400,      0,      0,   -134,
+    85,   2771,   7842,  -3649,  -8225,   2866,   2586,  -9200,
+    -1945,  -1563,   6155,   -720,  -1061,  -3494,  -4513,   -487,
+    8389,   7317,   3348,  -3721,   3806,    371,  -6896,     70,
+    0,      0,  10919,   2072,  -4867,   3472,  -4429,   1721,
+    -4066,  -5193,   1032,  -5253,   9501,  -2017,  -3971,  -5261,
+    -306,  -2737,  -5137,   5713,   1237,     -8,   6387,    364,
+    -5423,   3364,   2888,      0,      0,    -48,   8946,   1048,
+    -2691,    602,  -4332,  -4302,   -514,  -1730,   2459,  -4328,
+    -2156,   3335,  -2748,  -6029,   4023,    155,    897,   5268,
+    -8380,   7625,   7395,    508,   3945,  -8951,      0,      0,
+    39,   4151,  -5965,  -3398,  -7006,  -3534,   2697,  -8989,
+    -5237,   2913,     46,  -5540,   8196,   5766,   2711,  -2520,
+    -3043,  -2146,   -948,   4965,   1806,   2472,   8988,  -1266,
+    4840,      0,      0,   -407,   -189,   2179,  -1627,   6516,
+    259,   7196,  -9449,  -4905,  -9766,    561,   4021,   3371,
+    -8650,   5032,   3329,   2534,    641,   2224,  -5747,   1047,
+    -4074,   5252,    -24,    674,      0,      0,    664,    237,
+    -2837,  -4072,  -1205,   8252,  -5875,  -1670,  -2743,  -3984,
+    381,   5059,   1765,   2666,  -8295,   7403,   1154,  -2086,
+    7622,   7105,   3677,  -6943,   1050,  -6632,   -694,      0,
+    0,    382,   -133,   5699,   7650,   5154,  -5713,  -1645,
+    -6902,   6181,   4450,   1151,    410,   -993,   3829,   2444,
+    -2405,  -6618,  -9514,   5366,  -1896,   5844,  -2886,  -1524,
+    -7321,  -1007,      0,      0,  12767,  -2530,   3183,  -1409,
+    -4015,  -2894,  -5155,  -1710,   3841,  -2107, -10274,   5119,
+    3979,  -4010,   5550,   4822,   -746,  -2507,  -3080,   4289,
+    -3675,   4333,  -1416,  -1230,  -1122,      0,      0,     17,
+    8048,   2398,  -2167,    -73,  -3606,   3125,    398,    731,
+    -5973,   5705,  -1032,   4679,   7305,   3134,   1301,  -3858,
+    -89,   2938,   4359,  -9155,  -4805,  -8407,   3673,  -8645,
+    0,      0,    187,   7355,   3145,  -6719,  -4432,  -5939,
+    2541,  -2810,   9723,    778,  -1105,   5687,  -4174,   2534,
+    -4461,   1017,   -244,   5481,  -1655,  -6765,  -3350,  -4894,
+    1592,  -2318,   8827,      0,      0,    196,   3588,   9631,
+    3063,  -4564,   6043,   2683,   2595,  -2488,  -2186,    173,
+    -6059,  -8270,  -2386,    409,   7441,  -8608,    376,  -4364,
+    2321,   -280,     97,   8331,  -3022,  -4721,      0,      0,
+    117,   -748, -10833,   1533,   4200,  -2875,   -997,   -109,
+    -3661,  -6119,   4454,   8808,  -9189,   8294,   1521,   7265,
+    -2348,  -5094,   -948,  -5400,  -3193,   8914,   5763,   1716,
+    -1070,      0,      0,   2497,    399,  -5201,  -2038,   7843,
+    -376,   7567,  -5073,   7616,  -5537,   2086,  -3453,  -5544,
+    -56, -11648,  -1314,   3546,  -3432,   -117,   8694,  -4245,
+    9621,   3098,  -2582,  -2351,      0,      0,   4386,  -3104,
+    -3132, -10512,    566,   5217,   5128,   4967,   1348,   7035,
+    -1470,     91,   -125,  -3548,   8244,  -3029, -10033,   2186,
+    9745,  -6440,  -2074,   3638,  -1477,  -7045,   -562,      0,
+    0,   2154,   8116,  -6102,   6570,  12998,   -712,  -4126,
+    -4996,     30,   1571,  -6393, -12794,    425,   5036,   1190,
+    5763,   5653,  12933,  -6671,   5197,  -2964,  -3316,  -6354,
     -10554,  -2652,      0,      0,  12618,  -3737,     93,  -5901,
-      4262,  -3364,   4444,   3103,  -2767,   3403,   4925,  -2584,
-      -989,   4977,  -3714,  -1965,   3076,    326,  -2946,  -2568,
-      1026,  -2980,   3362,  -6132,  -5966,      0,      0,   6001,
-        48,  -1979,  -7275,   3476,  -2096,  10591,   3793,   2629,
-      -447, -14747,  -3689,  -5525,   8358,   6883,  -9703,  -4556,
-      7471,   2965,   4056,  13221,  -7327,  -3073,  -2353,  -6720,
-         0,      0,    621,  11034,    -44,  -2828,   5978,  -1850,
-     -1772,   3894,  -7471,  -1397,    945,  -2028,  -2928,  -2240,
-      3172,   2222,   4544,  -4243,  -5645,   3745,   2573,   3511,
-     -8206,  -7286,   5700,      0,      0,    321,  10818,  -4982,
-      7813,   -749,   9907,   1360,  -1443,    568,  -1103,   2305,
-      6045,   2270,  -1063,  -1920,  -3073,   5893,  -3476, -11346,
-     -1657,   -588,   2957,  -2287,  -8527,  -8041,      0,      0,
-       119,   -268,   2372,  -3040,   4979,  -3789,  -5630,  10619,
-      5900,  -5109,  -4585,  -3862,  10467,  -3527,   -385, -10034,
-     -9991,   4860,    984,   2362,   2311,  -6804,   6324,    433,
-      5291,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,  32767,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-     32767
+    4262,  -3364,   4444,   3103,  -2767,   3403,   4925,  -2584,
+    -989,   4977,  -3714,  -1965,   3076,    326,  -2946,  -2568,
+    1026,  -2980,   3362,  -6132,  -5966,      0,      0,   6001,
+    48,  -1979,  -7275,   3476,  -2096,  10591,   3793,   2629,
+    -447, -14747,  -3689,  -5525,   8358,   6883,  -9703,  -4556,
+    7471,   2965,   4056,  13221,  -7327,  -3073,  -2353,  -6720,
+    0,      0,    621,  11034,    -44,  -2828,   5978,  -1850,
+    -1772,   3894,  -7471,  -1397,    945,  -2028,  -2928,  -2240,
+    3172,   2222,   4544,  -4243,  -5645,   3745,   2573,   3511,
+    -8206,  -7286,   5700,      0,      0,    321,  10818,  -4982,
+    7813,   -749,   9907,   1360,  -1443,    568,  -1103,   2305,
+    6045,   2270,  -1063,  -1920,  -3073,   5893,  -3476, -11346,
+    -1657,   -588,   2957,  -2287,  -8527,  -8041,      0,      0,
+    119,   -268,   2372,  -3040,   4979,  -3789,  -5630,  10619,
+    5900,  -5109,  -4585,  -3862,  10467,  -3527,   -385, -10034,
+    -9991,   4860,    984,   2362,   2311,  -6804,   6324,    433,
+    5291,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,  32767,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    32767
 };
 
 const MappingMatrix mapping_matrix_fifthoa_demixing = { 38, 38, 0 };
 const oac_int16 mapping_matrix_fifthoa_demixing_data[1444] = {
-      3188,   3247,   3268,   3368,   3368,   3138,   3268,   3099,
-      3211,   3368,   3099,   3247,   3211,   3368,   3368,   3368,
-      3149,   3268,   3247,   3211,   3099,   3188,   3138,   3149,
-      3099,   3188,   3368,   3149,   3188,   3247,   3268,   3138,
-      3211,   3368,   3138,   3149,      0,      0,    118,    -47,
-     -5011,    282,    333,  -1497,  -4584,   2908,   3388,  -3647,
-     -2493,   1139,  -2882,  -1719,   3604,  -2543,  -4328,   5443,
-      1286,  -5498,  -4583,   2510,  -1743,  -2556,   4168,   1446,
-      -290,   1812,  -4074,  -2377,   4152,   2847,   4991,   3980,
-       393,   5072,      0,      0,   5489,  -2235,   1507,  -5326,
-      4609,  -1096,   2926,  -3427,  -3301,  -3078,   4226,   1730,
-      4627,   2561,   2966,   -592,    143,   -677,   4617,   -755,
-      -956,   -433,  -5138,   3037,    157,  -1394,  -4498,  -4984,
-     -3661,  -4112,  -3756,   4628,   -570,   3356,   1605,   1803,
-         0,      0,   -162,   5162,   2132,   2392,   3556,  -5141,
-     -1536,   2975,  -3001,  -3350,  -2231,  -5230,   1294,  -4965,
-      3494,   5230,  -3292,  -1359,  -2945,   -773,   2670,   4867,
-      -660,   3720,  -3415,  -5112,  -3700,  -1211,    407,   3013,
-       763,    591,   2481,  -2657,   5210,    784,      0,      0,
-      -156,    338,  -4246,    510,    462,   3296,   2846,   3333,
-     -4292,   4574,   1940,  -2986,  -1275,   3701,   5022,  -5250,
-      5780,  -2676,  -1180,   1516,  -4852,   4877,    342,  -3923,
-     -5703,  -2920,    379,   -657,   -361,  -3346,   1044,    795,
-      5257,  -4004,    698,   1115,      0,      0,     47,   -140,
-     -3292,  -1097,    652,    855,  -5260,  -3691,  -4470,   4521,
-     -3863,   1093,  -5552,  -2016,   3831,    334,   -456,  -1532,
-      2068,   1788,   2054,   -295,   3668,  -2820,    328,   -994,
-       295,  -3301,   5770,   4282,  -6353,   5632,  -1371,   5005,
-       238,   4041,      0,      0,   6764,  -1659,  -2730,   5726,
-      3715,  -3216,   -933,    531,    -52,   -345,   3022,  -2818,
-      4005,  -1617,  -1189,  -3748,  -3403,  -3592,   4040,  -3553,
-     -2806,  -3444,   6023,   -711,  -3298,  -2503,   2548,   5564,
-       940,   1848,   1207,   4010,  -3488,   -358,  -2511,  -1966,
-         0,      0,    -64,  -5039,   1403,  -4455,   6240,   2189,
-     -1716,  -4348,   4183,   3951,  -4042,  -3606,   2399,  -4563,
-      4050,   -612,   -395,    348,  -5791,    391,  -1440,   -735,
-      1398,   4359,   -518,   2969,   6556,   1951,   -518,  -4993,
-      -925,    998,   -569,  -2934,   3460,    420,      0,      0,
-        16,   5482,  -4122,    770,   2082,   5020,  -3961,    485,
-      -584,   -793,      3,   5222,  -1416,   3673,     78,   3549,
-      -937,  -5723,   1673,  -6162,  -2540,   3082,   -355,   1838,
-      -615,   4601,   2832,   -359,  -3346,    668,  -3393,  -1583,
-     -3774,  -2206,   5754,  -4961,      0,      0,   -328,    299,
-      2470,    317,    525,  -4494,   2805,   2617,   2383,  -2363,
-     -1037,   4085,    895,  -4622,   3218,  -6607,  -3381,  -5933,
-      1397,   6394,   -446,   5694,     14,  -4510,   4329,   3690,
-      -334,      0,   2932,  -2478,  -2944,   -577,   -599,   -230,
-      1553,  -4736,      0,      0,   -324,    142,  -3252,   -867,
-      1111,  -1882,   3378,  -6055,   6502,  -6840,   4280,  -2694,
-     -2876,   4190,   6454,    655,   1061,    626,  -2669,   -798,
-      3192,   -985,   -898,  -5482,   -548,   2315,   -558,   1302,
-       900,   5747,  -1325,   1599,  -1384,  -5749,    624,   1110,
-         0,      0,    321,    312,   2188,   1322,    237,    708,
-      -304,   2463,   1500,  -1094,  -5112,  -1010,  -6799,    646,
-       992,   1969,   3423,  -3996,   2628,   4451,   3432,  -2833,
-     -6101,   -330,  -3768,     -3,   -707,   5961,  -4037,  -3736,
-      4080,   7254,  -4113,   2151,     54,  -2150,      0,      0,
-      7735,   4064,  -3884,  -5240,    577,   2229,  -3947,   2914,
-      3555,   4011,    774,  -3519,   1985,  -3701,  -3824,    330,
-      -905,   2085,   1155,   2176,   3006,    340,  -5533,  -3264,
-      -902,   3114,    344,  -5060,   1524,   1805,   1926,   2350,
-      1905,  -3203,  -2762,  -4162,      0,      0,    193,   -151,
-     -1434,   6289,   7354,   4234,    169,   2868,  -1977,  -1375,
-     -4987,   2345,   2742,    599,    939,  -4837,   2688,    991,
-     -6907,    716,  -1542,  -4346,  -1833,   1493,   3134,   2903,
-     -7019,  -2835,     93,   4395,    621,    870,  -2357,   -975,
-     -2933,   -127,      0,      0,   -616,  -5968,  -3479,  -1651,
-      4932,  -2445,  -5512,  -1451,    691,    739,    479,   4227,
-     -2886,   3853,      8,   -501,    188,   1990,   3842,   2270,
-      1662,   -174,   1290,   2456,     67,  -3267,  -5535,    483,
-      5721,  -1642,   6501,  -3432,   1184,  -3246,   4101,  -4880,
-         0,      0,   -465,   5264,  -4812,    682,   1683,  -4539,
-      2916,  -1985,   2899,   3324,   1060,  -4398,   -745,  -2137,
-     -3827,   1044,   6225,   3609,   -532,   1980,  -6001,    564,
-      -209,  -1299,   5336,  -3605,  -1484,     37,     19,  -1295,
-      -665,   -385,  -6773,   3651,   6153,  -1291,      0,      0,
-       193,   -415,   5166,   -110,    626,   6743,  -2860,   1425,
-      1101,  -1341,     80,  -4533,    249,   4231,   -119,  -6009,
-     -2970,   5170,   -822,  -2610,   4527,   5948,    182,  -2589,
-       837,  -5471,    371,    -43,    373,   -665,  -1233,   -626,
-     -7353,   2606,   1339,  -1398,      0,      0,   -533,    147,
-      2075,   -672,   1043,   3503,   4402,  -4971,  -3287,   3731,
-     -2606,   3817,   1972,  -5603,   5114,   1185,  -1318,   1906,
-      3018,  -1999,    343,  -1943,    207,  -6744,    913,  -4060,
-       645,   -349,  -5667,   4766,   5575,  -1733,   1116,    160,
-      1534,  -5690,      0,      0,   -137,    -36,   1556,   1325,
-      1553,  -2230,   1188,   5296,  -5104,   4673,   6295,    498,
-     -4723,    933,   2994,   4067,  -4700,   1758,  -4116,  -1252,
-      2444,  -4092,   1653,  -2802,   5069,   1133,    790,  -2355,
-      -934,  -6304,   1642,   2045,  -4259,  -3873,   -213,    215,
-         0,      0,   -364,    423,   4888,  -1316,    118,   -950,
-      4027,    114,   2961,  -3136,  -3012,   -883,  -6192,   1340,
-     -3210,  -1193,   1376,   3128,   1596,  -2994,  -3194,    533,
-      8502,   2487,  -1485,   1032,    301,  -8007,   -577,    887,
-       297,   7778,   3121,  -1901,    -94,  -6401,      0,      0,
-      9260,  -1845,    668,   2787,  -2255,   2699,  -2512,  -3737,
-     -3675,  -3601,  -1803,    210,  -1701,  -1442,  -2700,   3457,
-      2868,   2079,  -2113,   3178,   1277,   3578,   5240,  -2482,
-      3324,   1020,  -4027,   3835,  -3758,  -3633,  -3170,  -1310,
-      2509,  -3110,    713,    174,      0,      0,   -399,   4969,
-     -2321,  -7744,   6494,  -3776,   1478,    758,  -1794,  -2233,
-     -4059,   4932,   2770,   4761,  -3475,   1243,    829,   -651,
-     -5358,   -436,   2381,   1360,   2561,  -3118,    858,  -4366,
-      3933,   3646,    -43,  -1310,    -16,    924,   1197,   1415,
-     -5036,   -376,      0,      0,    100,   1410,   1290,   3199,
-      7091,  -3638,  -2641,   1118,     45,   -441,    794,   -974,
-     -5033,    889,    438,  -3102,    895,   3555,   4672,   4795,
-      1129,  -2408,  -2153,   1742,    159,  -2040,   7578,  -2006,
-     -5737,   1986,  -5568,  -6413,   2428,  -1387,  -2441,    667,
-         0,      0,    -37,  -6031,  -4434,   -904,   3290,   1806,
-      4736,   2516,  -5905,  -5927,   1754,  -4300,  -2468,  -2203,
-     -4836,   -672,   1444,  -1591,  -1631,  -1789,   4311,   -153,
-      -688,  -1222,   1058,   3139,   4659,   -353,   1543,   1838,
-      2180,  -1448,   2432,   6277,   5304,  -1692,      0,      0,
-      -280,   4506,    807,   -477,    823,   3550,   1427,  -1856,
-     -3003,  -3501,  -1203,   2679,    933,    778,  -4954,  -1977,
-     -7458,   4687,    435,   7045,  -4053,  -3130,    257,  -3917,
-     -6165,   1889,    927,    235,   1889,  -1097,   1985,    630,
-     -2172,  -2130,   7080,   4810,      0,      0,   -300,    496,
-      2808,    279,    667,  -7179,  -2661,   -526,  -2832,   1751,
-      2849,   4829,   -906,  -4151,  -1124,  -3062,   8166,   5361,
-     -1656,  -6017,   3265,   2551,   -864,   -432,  -6966,   6295,
-      -168,    901,    442,   -582,    269,    236,  -3574,    799,
-       472,    565,      0,      0,    805,  -2466,   6208,  -4592,
-      -170,  -6701,  -5610,   3678,  -4242,   4561,   -724,  -5534,
-      2415,   7354,   2761,   2699,   -349,   3822,  -2372,   1756,
-     -5523,  -3445,   -588,  -5749,  -3986,   9804,  -3871,   5375,
-     -2308,   5504,  -2766,  -1651,   1472,   6832,   2705,  -5104,
-         0,      0,   -700,  -1179,   4402,    400,   1383,    939,
-     -1342,   6013,   2577,  -3472,    472,   2883,   1450,  -3917,
-      2849,   5084,   4990,   5392,    342,  -4925,  -3329,  -5372,
-     -2674,  -6035,  -5072,   -836,    179,   2506,   7987,  -3647,
-     -8202,  -1437,   1891,   2400,   1607,  -3611,      0,      0,
-     -4706,  -4003,   9928,   -379,   5557,   3738,  -8789,    685,
-      1937,  -5157,  13388,   7995,  -4119,  -9909,  -5079,   4804,
-      5586,    774,  -5430,    299,  -9943,   3264,  -3690,  -3901,
-     -1133,  -6199,   3182,   1544,   5467,   3686,  -2639,   4068,
-      1163,   -185,  -1299,   -506,      0,      0,    843,   1005,
-     -1059,    467,  -1279,  -2259,   6057,  -1694,  -5885,   5342,
-     -5160,  -3748,  -1382,   4420,   -697,  -2000,  -3808,   3100,
-      2685,  -4073,    531,    318,  -7822,   2414,   2901,   3399,
-     -1340,   8449,   3685,    463,  -3341,   2423,   2304,  -2723,
-        84,  -2622,      0,      0,  12088,   -265,   2562,   -435,
-     -4348,  -2426,   3538,   1552,   1279,    883,  -4166,   2634,
-     -6130,   2994,   3729,  -1570,   -601,  -1753,  -5124,  -2788,
-     -2096,  -1920,  -2649,   2793,  -1079,  -1952,   2983,  -1530,
-      2499,   1769,   1492,  -6757,  -2108,   2841,   1466,   2597,
-         0,      0,  -3830,  -4093,   2448,  12720,   7737,   -665,
-      -832,  -9257,   2971,  -2400,    791,   1873,   1072,   -587,
-     -7440,   8055,   1531,  -4736,    616,  -1782,  -2982,   9663,
-     -5057,  -5926,   1610,  -4489,   7033,  -8658,   6010,  -5673,
-      5648,    812,   -271,  -1802,  -4500,   4392,      0,      0,
-      -888,   -327,   3373,  -1084,   7959,   2430,   1898,  -2360,
-     -1820,  -1377,  -1090,  -4436,  -3422,  -1106,  -3230,   3876,
-       -41,  -5128,   6375,  -1848,  -3824,   5844,    617,  -1957,
-      4232,   1345,  -1439,    -83,   3046,   -214,   5458,  -5566,
-     -4387,  -3738,  -5740,   8657,      0,      0,   6978,   6239,
-     -3686,   -981,  -2854,     78,   5859,   -357,   4618,   7391,
-      -138,    971,  -5799,   2135,   4478,  -7004,  -5949,   1668,
-     -6933,  -1163,   7010,  -5624,   2990,   6192,  -8075,   3567,
-     -8308,   2236,  -5098,  -2120,  -4355,  -4238,   4955,  10230,
-       692,  -5606,      0,      0,  -1348,  -7069,    -12,  -4927,
-      1211,    651,   1360,   7744,   3404,   5069,  -2438,   -105,
-      2332,   1494,  -4686,   1336,  -3628,   -881,   2474,   1736,
-       -26,   -257,   2135,  -4452,    446,   -641,  -4704,   2605,
-     -6436,   6662,  -4939,    990,  -1100,  -3782,   5028,   4753,
-         0,      0,  -2875,   6410,   3518,   3950,   1271,    869,
-     -2842,  -5837,   1532,  -2899,   1140,   -597,   1712,  -1988,
-     -4819,  -4783,   4773,  -8796,   2240,  -4596,   3565,  -4853,
-      -556,  -3974,   7366,  -4370,   3113,  -3548,   3552,  -5450,
-      3869,   2514,   6736,  -4570,   6074,   3151,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,  32767,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,      0,      0,      0,      0,      0,
-         0,      0,      0,  32767
+    3188,   3247,   3268,   3368,   3368,   3138,   3268,   3099,
+    3211,   3368,   3099,   3247,   3211,   3368,   3368,   3368,
+    3149,   3268,   3247,   3211,   3099,   3188,   3138,   3149,
+    3099,   3188,   3368,   3149,   3188,   3247,   3268,   3138,
+    3211,   3368,   3138,   3149,      0,      0,    118,    -47,
+    -5011,    282,    333,  -1497,  -4584,   2908,   3388,  -3647,
+    -2493,   1139,  -2882,  -1719,   3604,  -2543,  -4328,   5443,
+    1286,  -5498,  -4583,   2510,  -1743,  -2556,   4168,   1446,
+    -290,   1812,  -4074,  -2377,   4152,   2847,   4991,   3980,
+    393,   5072,      0,      0,   5489,  -2235,   1507,  -5326,
+    4609,  -1096,   2926,  -3427,  -3301,  -3078,   4226,   1730,
+    4627,   2561,   2966,   -592,    143,   -677,   4617,   -755,
+    -956,   -433,  -5138,   3037,    157,  -1394,  -4498,  -4984,
+    -3661,  -4112,  -3756,   4628,   -570,   3356,   1605,   1803,
+    0,      0,   -162,   5162,   2132,   2392,   3556,  -5141,
+    -1536,   2975,  -3001,  -3350,  -2231,  -5230,   1294,  -4965,
+    3494,   5230,  -3292,  -1359,  -2945,   -773,   2670,   4867,
+    -660,   3720,  -3415,  -5112,  -3700,  -1211,    407,   3013,
+    763,    591,   2481,  -2657,   5210,    784,      0,      0,
+    -156,    338,  -4246,    510,    462,   3296,   2846,   3333,
+    -4292,   4574,   1940,  -2986,  -1275,   3701,   5022,  -5250,
+    5780,  -2676,  -1180,   1516,  -4852,   4877,    342,  -3923,
+    -5703,  -2920,    379,   -657,   -361,  -3346,   1044,    795,
+    5257,  -4004,    698,   1115,      0,      0,     47,   -140,
+    -3292,  -1097,    652,    855,  -5260,  -3691,  -4470,   4521,
+    -3863,   1093,  -5552,  -2016,   3831,    334,   -456,  -1532,
+    2068,   1788,   2054,   -295,   3668,  -2820,    328,   -994,
+    295,  -3301,   5770,   4282,  -6353,   5632,  -1371,   5005,
+    238,   4041,      0,      0,   6764,  -1659,  -2730,   5726,
+    3715,  -3216,   -933,    531,    -52,   -345,   3022,  -2818,
+    4005,  -1617,  -1189,  -3748,  -3403,  -3592,   4040,  -3553,
+    -2806,  -3444,   6023,   -711,  -3298,  -2503,   2548,   5564,
+    940,   1848,   1207,   4010,  -3488,   -358,  -2511,  -1966,
+    0,      0,    -64,  -5039,   1403,  -4455,   6240,   2189,
+    -1716,  -4348,   4183,   3951,  -4042,  -3606,   2399,  -4563,
+    4050,   -612,   -395,    348,  -5791,    391,  -1440,   -735,
+    1398,   4359,   -518,   2969,   6556,   1951,   -518,  -4993,
+    -925,    998,   -569,  -2934,   3460,    420,      0,      0,
+    16,   5482,  -4122,    770,   2082,   5020,  -3961,    485,
+    -584,   -793,      3,   5222,  -1416,   3673,     78,   3549,
+    -937,  -5723,   1673,  -6162,  -2540,   3082,   -355,   1838,
+    -615,   4601,   2832,   -359,  -3346,    668,  -3393,  -1583,
+    -3774,  -2206,   5754,  -4961,      0,      0,   -328,    299,
+    2470,    317,    525,  -4494,   2805,   2617,   2383,  -2363,
+    -1037,   4085,    895,  -4622,   3218,  -6607,  -3381,  -5933,
+    1397,   6394,   -446,   5694,     14,  -4510,   4329,   3690,
+    -334,      0,   2932,  -2478,  -2944,   -577,   -599,   -230,
+    1553,  -4736,      0,      0,   -324,    142,  -3252,   -867,
+    1111,  -1882,   3378,  -6055,   6502,  -6840,   4280,  -2694,
+    -2876,   4190,   6454,    655,   1061,    626,  -2669,   -798,
+    3192,   -985,   -898,  -5482,   -548,   2315,   -558,   1302,
+    900,   5747,  -1325,   1599,  -1384,  -5749,    624,   1110,
+    0,      0,    321,    312,   2188,   1322,    237,    708,
+    -304,   2463,   1500,  -1094,  -5112,  -1010,  -6799,    646,
+    992,   1969,   3423,  -3996,   2628,   4451,   3432,  -2833,
+    -6101,   -330,  -3768,     -3,   -707,   5961,  -4037,  -3736,
+    4080,   7254,  -4113,   2151,     54,  -2150,      0,      0,
+    7735,   4064,  -3884,  -5240,    577,   2229,  -3947,   2914,
+    3555,   4011,    774,  -3519,   1985,  -3701,  -3824,    330,
+    -905,   2085,   1155,   2176,   3006,    340,  -5533,  -3264,
+    -902,   3114,    344,  -5060,   1524,   1805,   1926,   2350,
+    1905,  -3203,  -2762,  -4162,      0,      0,    193,   -151,
+    -1434,   6289,   7354,   4234,    169,   2868,  -1977,  -1375,
+    -4987,   2345,   2742,    599,    939,  -4837,   2688,    991,
+    -6907,    716,  -1542,  -4346,  -1833,   1493,   3134,   2903,
+    -7019,  -2835,     93,   4395,    621,    870,  -2357,   -975,
+    -2933,   -127,      0,      0,   -616,  -5968,  -3479,  -1651,
+    4932,  -2445,  -5512,  -1451,    691,    739,    479,   4227,
+    -2886,   3853,      8,   -501,    188,   1990,   3842,   2270,
+    1662,   -174,   1290,   2456,     67,  -3267,  -5535,    483,
+    5721,  -1642,   6501,  -3432,   1184,  -3246,   4101,  -4880,
+    0,      0,   -465,   5264,  -4812,    682,   1683,  -4539,
+    2916,  -1985,   2899,   3324,   1060,  -4398,   -745,  -2137,
+    -3827,   1044,   6225,   3609,   -532,   1980,  -6001,    564,
+    -209,  -1299,   5336,  -3605,  -1484,     37,     19,  -1295,
+    -665,   -385,  -6773,   3651,   6153,  -1291,      0,      0,
+    193,   -415,   5166,   -110,    626,   6743,  -2860,   1425,
+    1101,  -1341,     80,  -4533,    249,   4231,   -119,  -6009,
+    -2970,   5170,   -822,  -2610,   4527,   5948,    182,  -2589,
+    837,  -5471,    371,    -43,    373,   -665,  -1233,   -626,
+    -7353,   2606,   1339,  -1398,      0,      0,   -533,    147,
+    2075,   -672,   1043,   3503,   4402,  -4971,  -3287,   3731,
+    -2606,   3817,   1972,  -5603,   5114,   1185,  -1318,   1906,
+    3018,  -1999,    343,  -1943,    207,  -6744,    913,  -4060,
+    645,   -349,  -5667,   4766,   5575,  -1733,   1116,    160,
+    1534,  -5690,      0,      0,   -137,    -36,   1556,   1325,
+    1553,  -2230,   1188,   5296,  -5104,   4673,   6295,    498,
+    -4723,    933,   2994,   4067,  -4700,   1758,  -4116,  -1252,
+    2444,  -4092,   1653,  -2802,   5069,   1133,    790,  -2355,
+    -934,  -6304,   1642,   2045,  -4259,  -3873,   -213,    215,
+    0,      0,   -364,    423,   4888,  -1316,    118,   -950,
+    4027,    114,   2961,  -3136,  -3012,   -883,  -6192,   1340,
+    -3210,  -1193,   1376,   3128,   1596,  -2994,  -3194,    533,
+    8502,   2487,  -1485,   1032,    301,  -8007,   -577,    887,
+    297,   7778,   3121,  -1901,    -94,  -6401,      0,      0,
+    9260,  -1845,    668,   2787,  -2255,   2699,  -2512,  -3737,
+    -3675,  -3601,  -1803,    210,  -1701,  -1442,  -2700,   3457,
+    2868,   2079,  -2113,   3178,   1277,   3578,   5240,  -2482,
+    3324,   1020,  -4027,   3835,  -3758,  -3633,  -3170,  -1310,
+    2509,  -3110,    713,    174,      0,      0,   -399,   4969,
+    -2321,  -7744,   6494,  -3776,   1478,    758,  -1794,  -2233,
+    -4059,   4932,   2770,   4761,  -3475,   1243,    829,   -651,
+    -5358,   -436,   2381,   1360,   2561,  -3118,    858,  -4366,
+    3933,   3646,    -43,  -1310,    -16,    924,   1197,   1415,
+    -5036,   -376,      0,      0,    100,   1410,   1290,   3199,
+    7091,  -3638,  -2641,   1118,     45,   -441,    794,   -974,
+    -5033,    889,    438,  -3102,    895,   3555,   4672,   4795,
+    1129,  -2408,  -2153,   1742,    159,  -2040,   7578,  -2006,
+    -5737,   1986,  -5568,  -6413,   2428,  -1387,  -2441,    667,
+    0,      0,    -37,  -6031,  -4434,   -904,   3290,   1806,
+    4736,   2516,  -5905,  -5927,   1754,  -4300,  -2468,  -2203,
+    -4836,   -672,   1444,  -1591,  -1631,  -1789,   4311,   -153,
+    -688,  -1222,   1058,   3139,   4659,   -353,   1543,   1838,
+    2180,  -1448,   2432,   6277,   5304,  -1692,      0,      0,
+    -280,   4506,    807,   -477,    823,   3550,   1427,  -1856,
+    -3003,  -3501,  -1203,   2679,    933,    778,  -4954,  -1977,
+    -7458,   4687,    435,   7045,  -4053,  -3130,    257,  -3917,
+    -6165,   1889,    927,    235,   1889,  -1097,   1985,    630,
+    -2172,  -2130,   7080,   4810,      0,      0,   -300,    496,
+    2808,    279,    667,  -7179,  -2661,   -526,  -2832,   1751,
+    2849,   4829,   -906,  -4151,  -1124,  -3062,   8166,   5361,
+    -1656,  -6017,   3265,   2551,   -864,   -432,  -6966,   6295,
+    -168,    901,    442,   -582,    269,    236,  -3574,    799,
+    472,    565,      0,      0,    805,  -2466,   6208,  -4592,
+    -170,  -6701,  -5610,   3678,  -4242,   4561,   -724,  -5534,
+    2415,   7354,   2761,   2699,   -349,   3822,  -2372,   1756,
+    -5523,  -3445,   -588,  -5749,  -3986,   9804,  -3871,   5375,
+    -2308,   5504,  -2766,  -1651,   1472,   6832,   2705,  -5104,
+    0,      0,   -700,  -1179,   4402,    400,   1383,    939,
+    -1342,   6013,   2577,  -3472,    472,   2883,   1450,  -3917,
+    2849,   5084,   4990,   5392,    342,  -4925,  -3329,  -5372,
+    -2674,  -6035,  -5072,   -836,    179,   2506,   7987,  -3647,
+    -8202,  -1437,   1891,   2400,   1607,  -3611,      0,      0,
+    -4706,  -4003,   9928,   -379,   5557,   3738,  -8789,    685,
+    1937,  -5157,  13388,   7995,  -4119,  -9909,  -5079,   4804,
+    5586,    774,  -5430,    299,  -9943,   3264,  -3690,  -3901,
+    -1133,  -6199,   3182,   1544,   5467,   3686,  -2639,   4068,
+    1163,   -185,  -1299,   -506,      0,      0,    843,   1005,
+    -1059,    467,  -1279,  -2259,   6057,  -1694,  -5885,   5342,
+    -5160,  -3748,  -1382,   4420,   -697,  -2000,  -3808,   3100,
+    2685,  -4073,    531,    318,  -7822,   2414,   2901,   3399,
+    -1340,   8449,   3685,    463,  -3341,   2423,   2304,  -2723,
+    84,  -2622,      0,      0,  12088,   -265,   2562,   -435,
+    -4348,  -2426,   3538,   1552,   1279,    883,  -4166,   2634,
+    -6130,   2994,   3729,  -1570,   -601,  -1753,  -5124,  -2788,
+    -2096,  -1920,  -2649,   2793,  -1079,  -1952,   2983,  -1530,
+    2499,   1769,   1492,  -6757,  -2108,   2841,   1466,   2597,
+    0,      0,  -3830,  -4093,   2448,  12720,   7737,   -665,
+    -832,  -9257,   2971,  -2400,    791,   1873,   1072,   -587,
+    -7440,   8055,   1531,  -4736,    616,  -1782,  -2982,   9663,
+    -5057,  -5926,   1610,  -4489,   7033,  -8658,   6010,  -5673,
+    5648,    812,   -271,  -1802,  -4500,   4392,      0,      0,
+    -888,   -327,   3373,  -1084,   7959,   2430,   1898,  -2360,
+    -1820,  -1377,  -1090,  -4436,  -3422,  -1106,  -3230,   3876,
+    -41,  -5128,   6375,  -1848,  -3824,   5844,    617,  -1957,
+    4232,   1345,  -1439,    -83,   3046,   -214,   5458,  -5566,
+    -4387,  -3738,  -5740,   8657,      0,      0,   6978,   6239,
+    -3686,   -981,  -2854,     78,   5859,   -357,   4618,   7391,
+    -138,    971,  -5799,   2135,   4478,  -7004,  -5949,   1668,
+    -6933,  -1163,   7010,  -5624,   2990,   6192,  -8075,   3567,
+    -8308,   2236,  -5098,  -2120,  -4355,  -4238,   4955,  10230,
+    692,  -5606,      0,      0,  -1348,  -7069,    -12,  -4927,
+    1211,    651,   1360,   7744,   3404,   5069,  -2438,   -105,
+    2332,   1494,  -4686,   1336,  -3628,   -881,   2474,   1736,
+    -26,   -257,   2135,  -4452,    446,   -641,  -4704,   2605,
+    -6436,   6662,  -4939,    990,  -1100,  -3782,   5028,   4753,
+    0,      0,  -2875,   6410,   3518,   3950,   1271,    869,
+    -2842,  -5837,   1532,  -2899,   1140,   -597,   1712,  -1988,
+    -4819,  -4783,   4773,  -8796,   2240,  -4596,   3565,  -4853,
+    -556,  -3974,   7366,  -4370,   3113,  -3548,   3552,  -5450,
+    3869,   2514,   6736,  -4570,   6074,   3151,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,  32767,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,  32767
 };
diff --git a/src/mapping_matrix.h b/src/mapping_matrix.h
index 9df1c5271..9aa16b3d5 100644
--- a/src/mapping_matrix.h
+++ b/src/mapping_matrix.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 /**
  * @file mapping_matrix.h
@@ -36,8 +36,7 @@
 #include "oac_types.h"
 #include "oac_projection.h"
 
-typedef struct MappingMatrix
-{
+typedef struct MappingMatrix {
     int rows; /* number of channels outputted from matrix. */
     int cols; /* number of channels inputted to matrix. */
     int gain; /* in dB. S7.8-format. */
@@ -54,8 +53,7 @@ void mapping_matrix_init(
     int cols,
     int gain,
     const oac_int16 *data,
-    oac_int32 data_size
-);
+    oac_int32 data_size);
 
 #ifndef DISABLE_FLOAT_API
 void mapping_matrix_multiply_channel_in_float(
@@ -65,8 +63,7 @@ void mapping_matrix_multiply_channel_in_float(
     oac_res *output,
     int output_row,
     int output_rows,
-    int frame_size
-);
+    int frame_size);
 
 void mapping_matrix_multiply_channel_out_float(
     const MappingMatrix *matrix,
@@ -75,8 +72,7 @@ void mapping_matrix_multiply_channel_out_float(
     int input_rows,
     float *output,
     int output_rows,
-    int frame_size
-);
+    int frame_size);
 #endif /* DISABLE_FLOAT_API */
 
 void mapping_matrix_multiply_channel_in_short(
@@ -86,8 +82,7 @@ void mapping_matrix_multiply_channel_in_short(
     oac_res *output,
     int output_row,
     int output_rows,
-    int frame_size
-);
+    int frame_size);
 
 void mapping_matrix_multiply_channel_out_short(
     const MappingMatrix *matrix,
@@ -96,8 +91,7 @@ void mapping_matrix_multiply_channel_out_short(
     int input_rows,
     oac_int16 *output,
     int output_rows,
-    int frame_size
-);
+    int frame_size);
 
 
 void mapping_matrix_multiply_channel_in_int24(
@@ -107,8 +101,7 @@ void mapping_matrix_multiply_channel_in_int24(
     oac_res *output,
     int output_row,
     int output_rows,
-    int frame_size
-);
+    int frame_size);
 
 void mapping_matrix_multiply_channel_out_int24(
     const MappingMatrix *matrix,
@@ -117,8 +110,7 @@ void mapping_matrix_multiply_channel_out_int24(
     int input_rows,
     oac_int32 *output,
     int output_rows,
-    int frame_size
-);
+    int frame_size);
 /* Pre-computed mixing and demixing matrices for 1st to 3rd-order ambisonics.
  *   foa: first-order ambisonics
  *   soa: second-order ambisonics
diff --git a/src/mlp.c b/src/mlp.c
index a103ad692..ebce7b98d 100644
--- a/src/mlp.c
+++ b/src/mlp.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <math.h>
@@ -35,9 +35,8 @@
 #include "arch.h"
 #include "mlp.h"
 
-#define fmadd(a, b, c) ((a)*(b)+(c))
-static OAC_INLINE float tansig_approx(float x)
-{
+#define fmadd(a, b, c) ((a)*(b) + (c))
+static OAC_INLINE float tansig_approx(float x) {
     const float N0 = 952.52801514f;
     const float N1 = 96.39235687f;
     const float N2 = 0.60863042f;
@@ -52,80 +51,75 @@ static OAC_INLINE float tansig_approx(float x)
     return MAX32(-1.f, MIN32(1.f, num));
 }
 
-static OAC_INLINE float sigmoid_approx(float x)
-{
-   return .5f + .5f*tansig_approx(.5f*x);
+static OAC_INLINE float sigmoid_approx(float x) {
+    return .5f + .5f*tansig_approx(.5f*x);
 }
 
-static void gemm_accum(float *out, const oac_int8 *weights, int rows, int cols, int col_stride, const float *x)
-{
-   int i, j;
-   for (i=0;i<rows;i++)
-   {
-      for (j=0;j<cols;j++)
-         out[i] += weights[j*col_stride + i]*x[j];
-   }
+static void gemm_accum(float *out, const oac_int8 *weights, int rows, int cols, int col_stride, const float *x) {
+    int i, j;
+    for (i = 0; i < rows; i++) {
+        for (j = 0; j < cols; j++)
+            out[i] += weights[j*col_stride + i]*x[j];
+    }
 }
 
-void analysis_compute_dense(const AnalysisDenseLayer *layer, float *output, const float *input)
-{
-   int i;
-   int N, M;
-   int stride;
-   M = layer->nb_inputs;
-   N = layer->nb_neurons;
-   stride = N;
-   for (i=0;i<N;i++)
-      output[i] = layer->bias[i];
-   gemm_accum(output, layer->input_weights, N, M, stride, input);
-   for (i=0;i<N;i++)
-      output[i] *= WEIGHTS_SCALE;
-   if (layer->sigmoid) {
-      for (i=0;i<N;i++)
-         output[i] = sigmoid_approx(output[i]);
-   } else {
-      for (i=0;i<N;i++)
-         output[i] = tansig_approx(output[i]);
-   }
+void analysis_compute_dense(const AnalysisDenseLayer *layer, float *output, const float *input) {
+    int i;
+    int N, M;
+    int stride;
+    M = layer->nb_inputs;
+    N = layer->nb_neurons;
+    stride = N;
+    for (i = 0; i < N; i++)
+        output[i] = layer->bias[i];
+    gemm_accum(output, layer->input_weights, N, M, stride, input);
+    for (i = 0; i < N; i++)
+        output[i] *= WEIGHTS_SCALE;
+    if (layer->sigmoid) {
+        for (i = 0; i < N; i++)
+            output[i] = sigmoid_approx(output[i]);
+    } else {
+        for (i = 0; i < N; i++)
+            output[i] = tansig_approx(output[i]);
+    }
 }
 
-void analysis_compute_gru(const AnalysisGRULayer *gru, float *state, const float *input)
-{
-   int i;
-   int N, M;
-   int stride;
-   float tmp[MAX_NEURONS];
-   float z[MAX_NEURONS];
-   float r[MAX_NEURONS];
-   float h[MAX_NEURONS];
-   M = gru->nb_inputs;
-   N = gru->nb_neurons;
-   stride = 3*N;
-   /* Compute update gate. */
-   for (i=0;i<N;i++)
-      z[i] = gru->bias[i];
-   gemm_accum(z, gru->input_weights, N, M, stride, input);
-   gemm_accum(z, gru->recurrent_weights, N, N, stride, state);
-   for (i=0;i<N;i++)
-      z[i] = sigmoid_approx(WEIGHTS_SCALE*z[i]);
+void analysis_compute_gru(const AnalysisGRULayer *gru, float *state, const float *input) {
+    int i;
+    int N, M;
+    int stride;
+    float tmp[MAX_NEURONS];
+    float z[MAX_NEURONS];
+    float r[MAX_NEURONS];
+    float h[MAX_NEURONS];
+    M = gru->nb_inputs;
+    N = gru->nb_neurons;
+    stride = 3*N;
+    /* Compute update gate. */
+    for (i = 0; i < N; i++)
+        z[i] = gru->bias[i];
+    gemm_accum(z, gru->input_weights, N, M, stride, input);
+    gemm_accum(z, gru->recurrent_weights, N, N, stride, state);
+    for (i = 0; i < N; i++)
+        z[i] = sigmoid_approx(WEIGHTS_SCALE*z[i]);
 
-   /* Compute reset gate. */
-   for (i=0;i<N;i++)
-      r[i] = gru->bias[N + i];
-   gemm_accum(r, &gru->input_weights[N], N, M, stride, input);
-   gemm_accum(r, &gru->recurrent_weights[N], N, N, stride, state);
-   for (i=0;i<N;i++)
-      r[i] = sigmoid_approx(WEIGHTS_SCALE*r[i]);
+    /* Compute reset gate. */
+    for (i = 0; i < N; i++)
+        r[i] = gru->bias[N + i];
+    gemm_accum(r, &gru->input_weights[N], N, M, stride, input);
+    gemm_accum(r, &gru->recurrent_weights[N], N, N, stride, state);
+    for (i = 0; i < N; i++)
+        r[i] = sigmoid_approx(WEIGHTS_SCALE*r[i]);
 
-   /* Compute output. */
-   for (i=0;i<N;i++)
-      h[i] = gru->bias[2*N + i];
-   for (i=0;i<N;i++)
-      tmp[i] = state[i] * r[i];
-   gemm_accum(h, &gru->input_weights[2*N], N, M, stride, input);
-   gemm_accum(h, &gru->recurrent_weights[2*N], N, N, stride, tmp);
-   for (i=0;i<N;i++)
-      h[i] = z[i]*state[i] + (1-z[i])*tansig_approx(WEIGHTS_SCALE*h[i]);
-   for (i=0;i<N;i++)
-      state[i] = h[i];
+    /* Compute output. */
+    for (i = 0; i < N; i++)
+        h[i] = gru->bias[2*N + i];
+    for (i = 0; i < N; i++)
+        tmp[i] = state[i]*r[i];
+    gemm_accum(h, &gru->input_weights[2*N], N, M, stride, input);
+    gemm_accum(h, &gru->recurrent_weights[2*N], N, N, stride, tmp);
+    for (i = 0; i < N; i++)
+        h[i] = z[i]*state[i] + (1 - z[i])*tansig_approx(WEIGHTS_SCALE*h[i]);
+    for (i = 0; i < N; i++)
+        state[i] = h[i];
 }
diff --git a/src/mlp.h b/src/mlp.h
index 7a0f26fe7..afc8ea158 100644
--- a/src/mlp.h
+++ b/src/mlp.h
@@ -22,7 +22,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef MLP_H_
 #define MLP_H_
@@ -34,19 +34,19 @@
 #define MAX_NEURONS 32
 
 typedef struct {
-  const oac_int8 *bias;
-  const oac_int8 *input_weights;
-  int nb_inputs;
-  int nb_neurons;
-  int sigmoid;
+    const oac_int8 *bias;
+    const oac_int8 *input_weights;
+    int nb_inputs;
+    int nb_neurons;
+    int sigmoid;
 } AnalysisDenseLayer;
 
 typedef struct {
-  const oac_int8 *bias;
-  const oac_int8 *input_weights;
-  const oac_int8 *recurrent_weights;
-  int nb_inputs;
-  int nb_neurons;
+    const oac_int8 *bias;
+    const oac_int8 *input_weights;
+    const oac_int8 *recurrent_weights;
+    int nb_inputs;
+    int nb_neurons;
 } AnalysisGRULayer;
 
 extern const AnalysisDenseLayer layer0;
diff --git a/src/mlp_data.c b/src/mlp_data.c
index cf192295e..2721d228d 100644
--- a/src/mlp_data.c
+++ b/src/mlp_data.c
@@ -1,671 +1,671 @@
 /*This file is automatically generated from a Keras model*/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "mlp.h"
 
 static const oac_int8 layer0_weights[800] = {
-   -30, -9, 2, -12, 5, -1, 8, 9,
-   9, 8, -13, 18, -17, -34, -5, 17,
-   -11, 0, -4, 10, 2, 10, 15, -8,
-   2, -1, 0, 5, 13, -3, -16, 1,
-   -5, 3, 7, -28, -13, 6, 36, -3,
-   19, -60, -17, -28, 7, -11, -30, -7,
-   2, -42, -21, -3, 6, -22, 33, -9,
-   7, -30, 21, -14, 24, -11, -20, -18,
-   -5, -12, 12, -49, -50, -49, 16, 9,
-   -37, -1, 9, 34, -13, -31, -31, 12,
-   16, 44, -42, 2, -9, 8, -18, -6,
-   9, 36, 19, 11, 13, 12, -21, 3,
-   -28, -12, 3, 33, 25, -14, 11, 1,
-   -94, -39, 18, -12, -11, -15, -7, 49,
-   52, 10, -43, 9, 57, 8, 21, -6,
-   14, -15, 44, -8, 7, -30, -13, -2,
-   -9, 25, -2, -127, 18, -11, -52, 26,
-   -27, 27, 10, -10, 7, 43, 6, -24,
-   41, 10, -18, -27, 10, 17, 9, 10,
-   -17, -10, 20, -6, 22, 55, 35, -80,
-   36, 25, -24, -36, 15, 9, -19, 88,
-   19, 64, -51, -35, 17, 0, -7, 41,
-   -16, 27, 4, 15, -1, 18, -16, 47,
-   -39, -54, -8, 13, -25, -20, 102, -18,
-   -5, 44, 11, -28, 71, 2, -51, -5,
-   5, 2, -83, -9, -29, 8, 21, -53,
-   58, -37, -7, 13, 38, 9, 34, -1,
-   -41, 21, 4, -24, -36, -33, -21, 32,
-   75, -2, 1, -68, -1, 47, -29, 32,
-   20, 12, -65, -87, 5, 16, -12, 24,
-   40, 15, 7, 19, -26, -17, 17, 6,
-   -2, -37, -30, -9, 32, -127, -39, 0,
-   -31, -27, 4, -22, 23, -6, -77, 35,
-   -61, 32, -37, -24, 13, -11, -1, -40,
-   -3, 17, -7, 13, 11, 59, -19, 10,
-   6, -18, 0, 13, 3, -6, -23, 19,
-   11, -17, 13, -1, -80, 40, -53, 69,
-   -29, -54, 0, -4, 33, -25, -2, 38,
-   35, 36, -15, 46, 2, -13, -16, -8,
-   -8, 12, -24, -9, -55, -5, -9, 32,
-   11, 7, 12, -18, -10, -86, -38, 54,
-   37, -25, 18, -43, 7, -27, -27, -54,
-   13, 9, 22, 70, 6, 35, -7, 23,
-   -15, -44, -6, 7, -66, -85, 32, 40,
-   -19, -9, -7, 12, -15, 7, 2, 6,
-   -35, 11, 28, 0, 26, 14, 1, 1,
-   4, 12, 18, 35, 22, -18, -3, 14,
-   -1, 7, 14, -8, -14, -3, 4, -3,
-   -19, -7, -1, -25, -27, 25, -26, -2,
-   33, -22, -27, -25, 4, -9, 7, 21,
-   26, -30, 10, -9, -20, 11, 27, 10,
-   5, -18, 14, -4, 2, -17, -5, -7,
-   -9, -13, 15, 29, 1, -10, -16, -10,
-   35, 36, -7, -22, -44, 17, 30, 22,
-   21, -1, 22, -11, 32, -8, -7, 5,
-   -10, 5, 30, -20, 29, -20, -34, 12,
-   -4, -6, 6, -13, 10, -5, -68, -1,
-   24, 9, 19, -24, -64, 31, 19, 27,
-   -26, 75, -45, 41, 39, -42, 8, 6,
-   23, -30, 16, -25, 30, 34, 8, -38,
-   -3, 18, 16, -31, 22, -4, -9, 1,
-   20, 9, 38, -32, 0, -45, 0, -6,
-   -13, 11, -25, -32, -22, 31, -24, -11,
-   -11, -4, -4, 20, -34, 22, 20, 9,
-   -25, 27, -5, 28, -29, 29, 6, 21,
-   -6, -18, 54, 4, -46, 23, 21, -14,
-   -31, 36, -41, -24, 4, 22, 10, 11,
-   7, 36, -32, -13, -52, -17, 24, 28,
-   -37, -36, -1, 24, 9, -38, 35, 48,
-   18, 2, -1, 45, 10, 39, 24, -38,
-   13, 8, -16, 8, 25, 11, 7, -29,
-   -11, 7, 20, -30, -38, -45, 14, -18,
-   -28, -9, 65, 61, 22, -53, -38, -16,
-   36, 46, 20, -39, 32, -61, -6, -6,
-   -36, -33, -18, -28, 56, 101, 45, 11,
-   -28, -23, -29, -61, 20, -47, 2, 48,
-   27, -17, 1, 40, 1, 3, -51, 15,
-   35, 28, 22, 35, 53, -61, -29, 12,
-   -6, -21, 10, 3, -20, 2, -25, 1,
-   -6, 31, 11, -3, 1, -10, -52, 6,
-   126, -105, 122, 127, -128, 127, 127, -128,
-   127, 108, 12, 127, 48, -128, -36, -128,
-   127, 127, -128, -128, 127, 89, -128, 127,
-   -128, -128, -128, 127, 127, -128, -128, -93,
-   -82, 20, 125, 65, -82, 127, 38, -74,
-   81, 88, -88, 79, 51, -47, -111, -26,
-   14, 83, -88, -112, 24, 35, -101, 98,
-   -99, -48, -45, 46, 83, -60, -79, 45,
-   -20, -41, 9, 4, 52, 54, 93, -10,
-   4, 13, 3, 123, 6, 94, -111, -69,
-   -14, -31, 10, 12, 53, -79, -11, -21,
-   -2, -44, -72, 92, 65, -57, 56, -38,
-   127, -56, -128, 127, 127, -128, 86, 117,
-   -75, -128, 127, -19, -99, -112, 127, -128,
-   127, -48, 114, 118, -128, -128, 117, -17,
-   -6, 121, -128, 127, -128, 82, 54, -106,
-   127, 127, -33, 100, -39, -23, 18, -78,
-   -34, -29, -1, -30, 127, -26, 127, -128,
-   126, -128, 27, -23, -79, -120, -127, 127,
-   72, 66, 29, 7, -66, -56, -117, -128
+    -30, -9, 2, -12, 5, -1, 8, 9,
+    9, 8, -13, 18, -17, -34, -5, 17,
+    -11, 0, -4, 10, 2, 10, 15, -8,
+    2, -1, 0, 5, 13, -3, -16, 1,
+    -5, 3, 7, -28, -13, 6, 36, -3,
+    19, -60, -17, -28, 7, -11, -30, -7,
+    2, -42, -21, -3, 6, -22, 33, -9,
+    7, -30, 21, -14, 24, -11, -20, -18,
+    -5, -12, 12, -49, -50, -49, 16, 9,
+    -37, -1, 9, 34, -13, -31, -31, 12,
+    16, 44, -42, 2, -9, 8, -18, -6,
+    9, 36, 19, 11, 13, 12, -21, 3,
+    -28, -12, 3, 33, 25, -14, 11, 1,
+    -94, -39, 18, -12, -11, -15, -7, 49,
+    52, 10, -43, 9, 57, 8, 21, -6,
+    14, -15, 44, -8, 7, -30, -13, -2,
+    -9, 25, -2, -127, 18, -11, -52, 26,
+    -27, 27, 10, -10, 7, 43, 6, -24,
+    41, 10, -18, -27, 10, 17, 9, 10,
+    -17, -10, 20, -6, 22, 55, 35, -80,
+    36, 25, -24, -36, 15, 9, -19, 88,
+    19, 64, -51, -35, 17, 0, -7, 41,
+    -16, 27, 4, 15, -1, 18, -16, 47,
+    -39, -54, -8, 13, -25, -20, 102, -18,
+    -5, 44, 11, -28, 71, 2, -51, -5,
+    5, 2, -83, -9, -29, 8, 21, -53,
+    58, -37, -7, 13, 38, 9, 34, -1,
+    -41, 21, 4, -24, -36, -33, -21, 32,
+    75, -2, 1, -68, -1, 47, -29, 32,
+    20, 12, -65, -87, 5, 16, -12, 24,
+    40, 15, 7, 19, -26, -17, 17, 6,
+    -2, -37, -30, -9, 32, -127, -39, 0,
+    -31, -27, 4, -22, 23, -6, -77, 35,
+    -61, 32, -37, -24, 13, -11, -1, -40,
+    -3, 17, -7, 13, 11, 59, -19, 10,
+    6, -18, 0, 13, 3, -6, -23, 19,
+    11, -17, 13, -1, -80, 40, -53, 69,
+    -29, -54, 0, -4, 33, -25, -2, 38,
+    35, 36, -15, 46, 2, -13, -16, -8,
+    -8, 12, -24, -9, -55, -5, -9, 32,
+    11, 7, 12, -18, -10, -86, -38, 54,
+    37, -25, 18, -43, 7, -27, -27, -54,
+    13, 9, 22, 70, 6, 35, -7, 23,
+    -15, -44, -6, 7, -66, -85, 32, 40,
+    -19, -9, -7, 12, -15, 7, 2, 6,
+    -35, 11, 28, 0, 26, 14, 1, 1,
+    4, 12, 18, 35, 22, -18, -3, 14,
+    -1, 7, 14, -8, -14, -3, 4, -3,
+    -19, -7, -1, -25, -27, 25, -26, -2,
+    33, -22, -27, -25, 4, -9, 7, 21,
+    26, -30, 10, -9, -20, 11, 27, 10,
+    5, -18, 14, -4, 2, -17, -5, -7,
+    -9, -13, 15, 29, 1, -10, -16, -10,
+    35, 36, -7, -22, -44, 17, 30, 22,
+    21, -1, 22, -11, 32, -8, -7, 5,
+    -10, 5, 30, -20, 29, -20, -34, 12,
+    -4, -6, 6, -13, 10, -5, -68, -1,
+    24, 9, 19, -24, -64, 31, 19, 27,
+    -26, 75, -45, 41, 39, -42, 8, 6,
+    23, -30, 16, -25, 30, 34, 8, -38,
+    -3, 18, 16, -31, 22, -4, -9, 1,
+    20, 9, 38, -32, 0, -45, 0, -6,
+    -13, 11, -25, -32, -22, 31, -24, -11,
+    -11, -4, -4, 20, -34, 22, 20, 9,
+    -25, 27, -5, 28, -29, 29, 6, 21,
+    -6, -18, 54, 4, -46, 23, 21, -14,
+    -31, 36, -41, -24, 4, 22, 10, 11,
+    7, 36, -32, -13, -52, -17, 24, 28,
+    -37, -36, -1, 24, 9, -38, 35, 48,
+    18, 2, -1, 45, 10, 39, 24, -38,
+    13, 8, -16, 8, 25, 11, 7, -29,
+    -11, 7, 20, -30, -38, -45, 14, -18,
+    -28, -9, 65, 61, 22, -53, -38, -16,
+    36, 46, 20, -39, 32, -61, -6, -6,
+    -36, -33, -18, -28, 56, 101, 45, 11,
+    -28, -23, -29, -61, 20, -47, 2, 48,
+    27, -17, 1, 40, 1, 3, -51, 15,
+    35, 28, 22, 35, 53, -61, -29, 12,
+    -6, -21, 10, 3, -20, 2, -25, 1,
+    -6, 31, 11, -3, 1, -10, -52, 6,
+    126, -105, 122, 127, -128, 127, 127, -128,
+    127, 108, 12, 127, 48, -128, -36, -128,
+    127, 127, -128, -128, 127, 89, -128, 127,
+    -128, -128, -128, 127, 127, -128, -128, -93,
+    -82, 20, 125, 65, -82, 127, 38, -74,
+    81, 88, -88, 79, 51, -47, -111, -26,
+    14, 83, -88, -112, 24, 35, -101, 98,
+    -99, -48, -45, 46, 83, -60, -79, 45,
+    -20, -41, 9, 4, 52, 54, 93, -10,
+    4, 13, 3, 123, 6, 94, -111, -69,
+    -14, -31, 10, 12, 53, -79, -11, -21,
+    -2, -44, -72, 92, 65, -57, 56, -38,
+    127, -56, -128, 127, 127, -128, 86, 117,
+    -75, -128, 127, -19, -99, -112, 127, -128,
+    127, -48, 114, 118, -128, -128, 117, -17,
+    -6, 121, -128, 127, -128, 82, 54, -106,
+    127, 127, -33, 100, -39, -23, 18, -78,
+    -34, -29, -1, -30, 127, -26, 127, -128,
+    126, -128, 27, -23, -79, -120, -127, 127,
+    72, 66, 29, 7, -66, -56, -117, -128
 };
 
 static const oac_int8 layer0_bias[32] = {
-   51, -16, 1, 13, -5, -6, -16, -7,
-   11, -6, 106, 26, 28, -14, 21, -29,
-   7, 18, -18, -17, 21, -17, -9, 20,
-   -25, -3, -34, 48, 11, -13, -31, -20
+    51, -16, 1, 13, -5, -6, -16, -7,
+    11, -6, 106, 26, 28, -14, 21, -29,
+    7, 18, -18, -17, 21, -17, -9, 20,
+    -25, -3, -34, 48, 11, -13, -31, -20
 };
 
 static const oac_int8 layer1_weights[2304] = {
-   22, -1, -7, 7, 29, -27, -31, -17,
-   -13, 33, 44, -8, 11, 33, 24, 78,
-   15, 19, 30, -2, -24, 5, 49, 5,
-   36, 29, -14, -11, -48, -33, 21, -42,
-   -38, -12, 55, -37, 54, -8, 1, 36,
-   17, 0, 51, 31, 59, 7, -12, 53,
-   4, 32, -14, 48, 5, -10, -16, -8,
-   1, -16, -56, -24, -6, 18, -2, 23,
-   6, 46, -6, -10, 20, 35, -44, -15,
-   -49, 36, 16, 5, -7, -79, -67, 12,
-   70, -3, -79, -54, -85, -24, 47, -22,
-   33, 21, 69, -1, 11, 22, 14, -16,
-   -16, -22, -28, -11, 11, -41, 31, -26,
-   -33, -19, -4, 27, 32, -50, 5, -10,
-   -38, -22, -8, 35, -31, 1, -41, -15,
-   -11, 44, 28, -17, -41, -23, 17, 2,
-   -23, -26, -13, -13, -17, 6, 14, -31,
-   -25, 9, -19, 39, -8, 4, 31, -1,
-   -45, -11, -28, -92, -46, -15, 21, 118,
-   -22, 45, -51, 11, -20, -20, -15, 13,
-   -21, -97, -29, -32, -23, -42, 94, 1,
-   23, -8, 63, -3, -46, 19, -26, 32,
-   -40, -74, -26, 26, -4, -13, 30, -20,
-   -30, -25, -14, -31, -45, -43, 4, -60,
-   -48, -12, -34, 2, 2, 3, 13, 15,
-   11, 16, 5, 46, -9, -55, -16, -57,
-   29, 14, 38, -50, -2, -44, -11, -8,
-   52, -27, -38, -7, 20, 47, 17, -59,
-   0, 47, 46, -63, 35, -17, 19, 33,
-   68, -19, 2, 15, -16, 28, -16, -103,
-   26, -35, 47, -39, -60, 30, 31, -23,
-   -52, -13, 116, 47, -25, 30, 40, 30,
-   -22, 2, 12, -27, -18, 31, -10, 27,
-   -8, -66, 12, 14, 4, -26, -28, -13,
-   3, 13, -26, -51, 37, 5, 2, -21,
-   47, 3, 13, 25, -41, -27, -8, -4,
-   5, -76, -33, 28, 10, 9, -46, -74,
-   19, 28, 25, 31, 54, -55, 68, 38,
-   -24, -32, 2, 4, 68, 11, -1, 99,
-   5, 16, -2, -74, 40, 26, -26, 33,
-   31, -1, -68, 14, -6, 25, 9, 29,
-   60, 61, 7, -7, 0, -24, 7, 77,
-   4, -1, 16, -7, 13, -15, -19, 28,
-   -31, -24, -16, 37, 24, 13, 30, 10,
-   -30, 11, 11, -10, 22, 60, 28, 45,
-   -3, -40, -62, -5, -102, 9, -32, -27,
-   -54, 21, 15, -5, 37, -43, -11, 37,
-   -19, 47, -64, -128, -27, -114, 21, -66,
-   59, 46, -3, -12, -87, -9, 4, 19,
-   -113, -36, 78, 57, -26, -38, -77, -10,
-   6, 6, -75, 25, -97, -11, 33, -46,
-   1, 13, -21, -33, -20, 16, -6, -3,
-   -11, -4, -27, 38, 8, -41, -2, -33,
-   18, 19, -26, 1, -29, -22, -4, -14,
-   -55, -11, -80, -3, 11, 34, 90, 51,
-   11, 17, 43, 36, 127, -32, 29, 103,
-   9, 27, 13, 64, 56, 70, -14, 3,
-   -12, 10, 37, 3, 12, -22, -10, 46,
-   28, 10, 20, 26, -24, 18, 9, 7,
-   14, 34, -5, -7, 31, -14, -56, 11,
-   -18, -8, -17, -7, -10, -40, 10, -33,
-   -32, -43, 5, 9, 11, -4, 10, 50,
-   -12, -5, 46, 9, 7, 1, 11, 15,
-   91, -17, 7, -50, 23, 6, -30, -99,
-   0, -17, 14, 8, -10, -25, -30, -69,
-   -62, 31, 127, 114, -23, 101, -5, -54,
-   -6, -22, 7, -56, 39, 18, -29, 0,
-   46, 8, -79, 4, -21, 18, -32, 62,
-   -12, -8, -12, -58, 31, -32, 17, 6,
-   -24, 25, 24, 9, -4, -19, 45, 6,
-   17, -14, 5, -27, 16, -4, -41, 25,
-   -36, 5, 15, 12, 50, 27, 25, 23,
-   -44, -69, -9, -19, -48, -8, 4, 12,
-   -6, 13, -19, -30, -36, 26, 37, -1,
-   -3, -30, -42, -14, -10, -20, 26, -54,
-   -27, -44, 4, 73, -26, 90, 32, -69,
-   -29, -16, 3, 103, 15, -17, 37, 24,
-   -23, -31, 33, -37, -64, 25, 13, -81,
-   -28, -32, 27, 5, -35, -23, 15, -22,
-   19, -7, 9, 30, 19, -23, 27, -13,
-   43, 29, -29, -6, 9, -40, -33, -33,
-   -32, 9, 11, -48, -8, -23, -52, 46,
-   17, -22, -42, 35, -15, -41, 16, 34,
-   31, -42, -19, -11, 55, 7, -39, 89,
-   -11, -33, 20, -14, 22, 32, 3, -17,
-   -6, 14, 34, 1, 55, -21, -90, -8,
-   18, 27, 13, -29, 21, 15, -33, -51,
-   -9, -11, 4, -16, -18, 23, -4, -4,
-   48, 1, 7, 29, -14, -12, -16, 17,
-   35, 8, 0, -7, -2, 9, 8, 17,
-   -6, 53, -32, -21, -50, 5, 99, -60,
-   -5, -53, 10, -31, 12, -5, 7, 80,
-   36, 18, -31, 9, 98, 36, -63, -35,
-   4, -13, -28, -24, 28, -13, 18, 16,
-   -1, -18, -34, 10, 20, 7, 4, 29,
-   11, 25, -7, 36, 14, 45, 24, 1,
-   -16, 30, 6, 35, -6, -11, -24, 13,
-   -1, 27, 39, 20, 48, -11, -4, -13,
-   28, 11, -31, -18, 31, -29, 22, -2,
-   -20, -16, 5, 30, -12, -28, -3, 93,
-   -16, 23, 18, -29, 6, -54, -37, 28,
-   -3, -3, -47, -3, -36, -55, -3, 41,
-   -10, 47, -2, 23, 42, -7, -71, -27,
-   83, -64, 7, -24, 8, 26, -17, 15,
-   12, 31, -30, -38, -13, -33, -56, 4,
-   -17, 20, 18, 1, -30, -5, -6, -31,
-   -14, -37, 0, 22, 10, -30, 37, -17,
-   18, 6, 5, 23, -36, -32, 14, 18,
-   -13, -61, -52, -69, 44, -30, 16, 18,
-   -4, -25, 14, 81, 26, -8, -23, -59,
-   52, -104, 17, 119, -32, 26, 17, 1,
-   23, 45, 29, -64, -57, -14, 73, 21,
-   -13, -13, 9, -68, -7, -52, 3, 24,
-   -39, 44, -15, 27, 14, 19, -9, -28,
-   -11, 5, 3, -34, -2, 2, 22, -6,
-   -23, 4, 3, 13, -22, -13, -10, -18,
-   29, 6, 44, -13, -24, -8, 2, 30,
-   14, 43, 6, 17, -73, -6, -7, 20,
-   -80, -7, -7, -28, 15, -69, -38, -5,
-   -100, -35, 15, -79, 23, 29, -18, -27,
-   21, -66, -37, 8, -22, -39, 48, 4,
-   -13, 1, -9, 11, -29, 22, 6, -49,
-   32, -14, 47, -18, -4, 44, -52, -74,
-   43, 30, 23, -14, 5, 0, -27, 4,
-   -7, 10, -4, 10, 1, -16, 11, -18,
-   -2, -5, 2, -11, 0, -20, -4, 38,
-   74, 59, 39, 64, -10, 26, -3, -40,
-   -68, 3, -30, -51, 8, -19, -27, -46,
-   51, 52, 54, 36, 90, 92, 14, 13,
-   -5, 0, 16, -62, 16, 11, -47, -37,
-   -6, -5, 21, 54, -57, 32, 42, -6,
-   62, -9, 16, 21, 24, 9, -10, -4,
-   33, 50, 13, -15, 1, -35, -48, 18,
-   -11, -17, -67, -13, 21, 38, -44, 36,
-   -16, 29, 17, 5, -10, 18, 17, -32,
-   2, 8, 22, -56, -15, -32, 40, 43,
-   19, 46, -7, -100, -96, 19, 53, 24,
-   21, -26, -48, -101, -82, 61, 38, -85,
-   -28, -34, -1, 63, -5, -5, 39, 39,
-   -38, 32, -12, -28, 20, 40, -8, 2,
-   31, 12, -35, -13, 20, -25, 30, 8,
-   3, -13, -9, -20, 2, -13, 24, 37,
-   -10, 33, 6, 20, -16, -24, -6, -6,
-   -19, -5, 22, 21, 10, 11, -4, -39,
-   -1, 6, 49, 41, -15, -57, 21, -62,
-   77, -69, -13, 0, -74, 1, -7, -38,
-   -8, 6, 63, 28, 4, 26, -52, 82,
-   63, 13, 45, -33, 44, -52, -65, -21,
-   -46, -49, 64, -17, 32, 24, 68, -39,
-   -16, -5, -26, 28, 5, -61, -28, 2,
-   24, 11, -12, -33, 9, -37, -3, -28,
-   22, -37, -12, 19, 0, -18, -2, 14,
-   1, 4, 8, -9, -2, 43, -17, -2,
-   -66, -31, 56, -40, -87, -36, -2, -4,
-   -42, -45, -1, 31, -43, -15, 27, 63,
-   -11, 32, -10, -33, 27, -19, 4, 15,
-   -26, -34, 29, -4, -39, -65, 14, -20,
-   -21, -17, -36, 13, 59, 47, -38, -33,
-   13, -37, -8, -37, -7, -6, -76, -31,
-   -12, -46, 7, 24, -21, -30, -14, 9,
-   15, -12, -13, 47, -27, -25, -1, -39,
-   0, 20, -9, 6, 7, 4, 3, 7,
-   39, 50, 22, -7, 14, -20, 1, 70,
-   -28, 29, -41, 10, -16, -5, -28, -2,
-   -37, 32, -18, 17, 62, -11, -20, -50,
-   36, 21, -62, -12, -56, 52, 50, 17,
-   3, 48, 44, -41, -25, 3, 16, -3,
-   0, 33, -6, 15, 27, 34, -25, 22,
-   9, 17, -11, 36, 16, -2, 12, 21,
-   -52, 45, -2, -10, 46, 21, -18, 67,
-   -28, -13, 30, 37, 42, 16, -9, 11,
-   75, 7, -64, -40, -10, 29, 57, -23,
-   5, 53, -77, 3, -17, -5, 47, -55,
-   -35, -36, -13, 52, -53, -71, 52, -111,
-   -23, -26, -28, 29, -43, 55, -19, 43,
-   -19, 54, -12, -33, -44, -39, -19, -10,
-   -31, -10, 21, 38, -57, -20, 2, -25,
-   8, -6, 50, 12, 15, 25, -25, 15,
-   -30, -6, 9, 25, 37, 19, -4, 31,
-   -22, 2, 4, 2, 36, 7, 3, -34,
-   -80, 36, -10, -2, -5, 31, -36, 49,
-   -70, 20, -36, 21, 24, 25, -46, -51,
-   36, -58, -48, -40, -10, 55, 71, 47,
-   10, -1, 1, 2, -46, -68, 16, 13,
-   0, -74, -29, 73, -52, -18, -11, 7,
-   -44, -82, -32, -70, -28, -1, -39, -68,
-   -6, -41, 12, -22, -16, 40, -11, -25,
-   51, -9, 21, 4, 4, -34, 7, -78,
-   16, 6, -38, -30, -2, -44, 32, 0,
-   22, 64, 5, -72, -2, -14, -10, -16,
-   -8, -25, 12, 102, -58, 37, -10, -23,
-   15, 49, 7, -7, 2, -20, -32, 45,
-   -6, 48, 28, 30, 33, -1, 22, -6,
-   30, 65, -17, 29, 74, 37, -26, -10,
-   15, -24, 19, -66, 22, -10, -31, -1,
-   -18, -9, 11, 37, -4, 45, 5, 41,
-   17, 1, 1, 24, -58, 41, 5, -51,
-   14, 8, 43, 16, -10, -1, 45, 32,
-   -64, 3, -33, -25, -3, -27, -68, 12,
-   23, -11, -13, -37, -40, 4, -21, -12,
-   32, -23, -19, 76, 41, -23, -24, -44,
-   -65, -1, -15, 1, 71, 63, 5, 20,
-   -3, 21, -23, 31, -32, 18, -2, 27,
-   31, 46, -5, -39, -5, -35, 18, -18,
-   -40, -10, 3, 12, 2, -2, -22, 40,
-   5, -6, 60, 36, 3, 29, -27, 10,
-   25, -54, 5, 26, 39, 35, -24, -37,
-   30, -91, 28, -4, -21, -27, -39, -6,
-   5, 12, -128, 38, -16, 29, -95, -29,
-   82, -2, 35, 2, 12, 8, -22, 10,
-   80, -47, 2, -25, -73, -79, 16, -30,
-   -32, -66, 48, 21, -45, -11, -47, 14,
-   -27, -17, -7, 15, -44, -14, -44, -26,
-   -32, 26, -23, 17, -7, -28, 26, -6,
-   28, 6, -26, 2, 13, -14, -23, -14,
-   19, 46, 16, 2, -33, -21, 28, -17,
-   -42, 44, -37, 1, -39, 28, 84, -46,
-   15, 10, 13, -44, 72, -26, 26, 32,
-   -28, -12, -83, 2, 10, -30, -44, -10,
-   -28, 53, 45, 65, 0, -25, 57, 36,
-   -33, 6, 29, 44, -53, 11, 19, -2,
-   -27, 35, 32, 49, 4, 23, 38, 36,
-   24, 10, 51, -39, 4, -7, 26, 37,
-   -35, 11, -47, -18, 28, 16, -35, 42,
-   17, -21, -41, 28, 14, -12, 11, -45,
-   7, -43, -15, 18, -5, 38, -40, -50,
-   -30, -21, 9, -98, 13, 12, 23, 75,
-   -56, -7, -3, -4, -1, -34, 12, -49,
-   11, 26, -18, -28, -17, 33, 13, -14,
-   40, 24, -72, -37, 10, 17, -6, 22,
-   16, 16, -6, -12, -30, -14, 10, 40,
-   -23, 12, 15, -3, -15, 13, -56, -4,
-   -30, 1, -3, -17, 27, 50, -5, 64,
-   -36, -19, 7, 29, 22, 25, 9, -16,
-   -58, -69, -40, -61, -71, -14, 42, 93,
-   26, 11, -6, -58, -11, 70, -52, 19,
-   9, -30, -33, 11, -37, -47, -21, -22,
-   -40, 10, 47, 4, -23, 17, 48, 41,
-   -48, 14, 10, 15, 34, -23, -2, -47,
-   23, -32, -13, -10, -26, -26, -4, 16,
-   38, -14, 0, -12, -7, -7, 20, 44,
-   -1, -32, -27, -16, 4, -6, -18, 14,
-   5, 4, -29, 28, 7, -7, 15, -11,
-   -20, -45, -36, 16, 84, 34, -59, -30,
-   22, 126, 8, 68, 79, -17, 21, -68,
-   37, 5, 15, 63, 49, 127, -90, 85,
-   43, 7, 16, 9, 6, -45, -57, -43,
-   57, 11, -23, -11, -29, 60, -26, 0,
-   7, 42, -24, 10, 23, -25, 8, -7,
-   -40, 19, -17, 35, 4, 27, -39, -91,
-   27, -36, 34, 2, 16, -24, 25, 7,
-   -21, 5, 17, 10, -22, -30, 9, -17,
-   -61, -26, 33, 21, 58, -51, -14, 69,
-   -38, 20, 7, 80, -4, -65, -6, -27,
-   53, -12, 47, -1, -15, 1, 60, 102,
-   -79, -4, 12, 9, 22, 37, -8, -4,
-   37, 2, -3, -15, -16, -11, -5, 19,
-   -6, -43, 20, -25, -18, 10, -27, 0,
-   -28, -27, -11, 10, -18, -2, -4, -16,
-   26, 14, -6, 7, -6, 1, 53, -2,
-   -29, 23, 9, -30, -6, -4, -6, 56,
-   70, 0, -33, -20, -17, -9, -24, 46,
-   -5, -105, 47, -46, -51, 20, 20, -53,
-   -81, -1, -7, 75, -5, -21, -65, 12,
-   -52, 22, -50, -12, 49, 54, 76, -81,
-   10, 45, -41, -59, 18, -19, 25, 14,
-   -31, -53, -5, 12, 31, 84, -23, 2,
-   7, 2, 10, -32, 39, -2, -12, 1,
-   -9, 0, -10, -11, 9, 15, -8, -2,
-   2, -1, 10, 14, -5, -40, 19, -7,
-   -7, 26, -4, 2, 1, -27, 35, 32,
-   21, -31, 26, 43, -9, 4, -32, 40,
-   -62, -52, 36, 22, 38, 22, 36, -96,
-   6, -10, -23, -49, 15, -33, -18, -3,
-   0, 41, 21, -19, 21, 23, -39, -23,
-   -6, 6, 47, 56, 4, 74, 0, -98,
-   29, -47, -14, -36, 21, -22, 22, 16,
-   13, 12, 16, -5, 13, 17, -13, -15,
-   1, -34, -26, 26, 12, 32, 27, 13,
-   -67, 27, 2, 8, 10, 18, 16, 20,
-   -17, -17, 57, -64, 5, 14, 19, 31,
-   -18, -44, -46, -16, 4, -25, 17, -126,
-   -24, 39, 4, 8, 55, -25, -34, 39,
-   -16, 3, 9, 71, 72, -31, -55, 6,
-   10, -25, 32, -85, -21, 18, -8, 15,
-   12, -27, -7, 1, -21, -2, -5, 48,
-   -16, 18, 1, -22, -26, 16, 14, -31,
-   27, -6, -15, -21, 4, -14, 18, -36
+    22, -1, -7, 7, 29, -27, -31, -17,
+    -13, 33, 44, -8, 11, 33, 24, 78,
+    15, 19, 30, -2, -24, 5, 49, 5,
+    36, 29, -14, -11, -48, -33, 21, -42,
+    -38, -12, 55, -37, 54, -8, 1, 36,
+    17, 0, 51, 31, 59, 7, -12, 53,
+    4, 32, -14, 48, 5, -10, -16, -8,
+    1, -16, -56, -24, -6, 18, -2, 23,
+    6, 46, -6, -10, 20, 35, -44, -15,
+    -49, 36, 16, 5, -7, -79, -67, 12,
+    70, -3, -79, -54, -85, -24, 47, -22,
+    33, 21, 69, -1, 11, 22, 14, -16,
+    -16, -22, -28, -11, 11, -41, 31, -26,
+    -33, -19, -4, 27, 32, -50, 5, -10,
+    -38, -22, -8, 35, -31, 1, -41, -15,
+    -11, 44, 28, -17, -41, -23, 17, 2,
+    -23, -26, -13, -13, -17, 6, 14, -31,
+    -25, 9, -19, 39, -8, 4, 31, -1,
+    -45, -11, -28, -92, -46, -15, 21, 118,
+    -22, 45, -51, 11, -20, -20, -15, 13,
+    -21, -97, -29, -32, -23, -42, 94, 1,
+    23, -8, 63, -3, -46, 19, -26, 32,
+    -40, -74, -26, 26, -4, -13, 30, -20,
+    -30, -25, -14, -31, -45, -43, 4, -60,
+    -48, -12, -34, 2, 2, 3, 13, 15,
+    11, 16, 5, 46, -9, -55, -16, -57,
+    29, 14, 38, -50, -2, -44, -11, -8,
+    52, -27, -38, -7, 20, 47, 17, -59,
+    0, 47, 46, -63, 35, -17, 19, 33,
+    68, -19, 2, 15, -16, 28, -16, -103,
+    26, -35, 47, -39, -60, 30, 31, -23,
+    -52, -13, 116, 47, -25, 30, 40, 30,
+    -22, 2, 12, -27, -18, 31, -10, 27,
+    -8, -66, 12, 14, 4, -26, -28, -13,
+    3, 13, -26, -51, 37, 5, 2, -21,
+    47, 3, 13, 25, -41, -27, -8, -4,
+    5, -76, -33, 28, 10, 9, -46, -74,
+    19, 28, 25, 31, 54, -55, 68, 38,
+    -24, -32, 2, 4, 68, 11, -1, 99,
+    5, 16, -2, -74, 40, 26, -26, 33,
+    31, -1, -68, 14, -6, 25, 9, 29,
+    60, 61, 7, -7, 0, -24, 7, 77,
+    4, -1, 16, -7, 13, -15, -19, 28,
+    -31, -24, -16, 37, 24, 13, 30, 10,
+    -30, 11, 11, -10, 22, 60, 28, 45,
+    -3, -40, -62, -5, -102, 9, -32, -27,
+    -54, 21, 15, -5, 37, -43, -11, 37,
+    -19, 47, -64, -128, -27, -114, 21, -66,
+    59, 46, -3, -12, -87, -9, 4, 19,
+    -113, -36, 78, 57, -26, -38, -77, -10,
+    6, 6, -75, 25, -97, -11, 33, -46,
+    1, 13, -21, -33, -20, 16, -6, -3,
+    -11, -4, -27, 38, 8, -41, -2, -33,
+    18, 19, -26, 1, -29, -22, -4, -14,
+    -55, -11, -80, -3, 11, 34, 90, 51,
+    11, 17, 43, 36, 127, -32, 29, 103,
+    9, 27, 13, 64, 56, 70, -14, 3,
+    -12, 10, 37, 3, 12, -22, -10, 46,
+    28, 10, 20, 26, -24, 18, 9, 7,
+    14, 34, -5, -7, 31, -14, -56, 11,
+    -18, -8, -17, -7, -10, -40, 10, -33,
+    -32, -43, 5, 9, 11, -4, 10, 50,
+    -12, -5, 46, 9, 7, 1, 11, 15,
+    91, -17, 7, -50, 23, 6, -30, -99,
+    0, -17, 14, 8, -10, -25, -30, -69,
+    -62, 31, 127, 114, -23, 101, -5, -54,
+    -6, -22, 7, -56, 39, 18, -29, 0,
+    46, 8, -79, 4, -21, 18, -32, 62,
+    -12, -8, -12, -58, 31, -32, 17, 6,
+    -24, 25, 24, 9, -4, -19, 45, 6,
+    17, -14, 5, -27, 16, -4, -41, 25,
+    -36, 5, 15, 12, 50, 27, 25, 23,
+    -44, -69, -9, -19, -48, -8, 4, 12,
+    -6, 13, -19, -30, -36, 26, 37, -1,
+    -3, -30, -42, -14, -10, -20, 26, -54,
+    -27, -44, 4, 73, -26, 90, 32, -69,
+    -29, -16, 3, 103, 15, -17, 37, 24,
+    -23, -31, 33, -37, -64, 25, 13, -81,
+    -28, -32, 27, 5, -35, -23, 15, -22,
+    19, -7, 9, 30, 19, -23, 27, -13,
+    43, 29, -29, -6, 9, -40, -33, -33,
+    -32, 9, 11, -48, -8, -23, -52, 46,
+    17, -22, -42, 35, -15, -41, 16, 34,
+    31, -42, -19, -11, 55, 7, -39, 89,
+    -11, -33, 20, -14, 22, 32, 3, -17,
+    -6, 14, 34, 1, 55, -21, -90, -8,
+    18, 27, 13, -29, 21, 15, -33, -51,
+    -9, -11, 4, -16, -18, 23, -4, -4,
+    48, 1, 7, 29, -14, -12, -16, 17,
+    35, 8, 0, -7, -2, 9, 8, 17,
+    -6, 53, -32, -21, -50, 5, 99, -60,
+    -5, -53, 10, -31, 12, -5, 7, 80,
+    36, 18, -31, 9, 98, 36, -63, -35,
+    4, -13, -28, -24, 28, -13, 18, 16,
+    -1, -18, -34, 10, 20, 7, 4, 29,
+    11, 25, -7, 36, 14, 45, 24, 1,
+    -16, 30, 6, 35, -6, -11, -24, 13,
+    -1, 27, 39, 20, 48, -11, -4, -13,
+    28, 11, -31, -18, 31, -29, 22, -2,
+    -20, -16, 5, 30, -12, -28, -3, 93,
+    -16, 23, 18, -29, 6, -54, -37, 28,
+    -3, -3, -47, -3, -36, -55, -3, 41,
+    -10, 47, -2, 23, 42, -7, -71, -27,
+    83, -64, 7, -24, 8, 26, -17, 15,
+    12, 31, -30, -38, -13, -33, -56, 4,
+    -17, 20, 18, 1, -30, -5, -6, -31,
+    -14, -37, 0, 22, 10, -30, 37, -17,
+    18, 6, 5, 23, -36, -32, 14, 18,
+    -13, -61, -52, -69, 44, -30, 16, 18,
+    -4, -25, 14, 81, 26, -8, -23, -59,
+    52, -104, 17, 119, -32, 26, 17, 1,
+    23, 45, 29, -64, -57, -14, 73, 21,
+    -13, -13, 9, -68, -7, -52, 3, 24,
+    -39, 44, -15, 27, 14, 19, -9, -28,
+    -11, 5, 3, -34, -2, 2, 22, -6,
+    -23, 4, 3, 13, -22, -13, -10, -18,
+    29, 6, 44, -13, -24, -8, 2, 30,
+    14, 43, 6, 17, -73, -6, -7, 20,
+    -80, -7, -7, -28, 15, -69, -38, -5,
+    -100, -35, 15, -79, 23, 29, -18, -27,
+    21, -66, -37, 8, -22, -39, 48, 4,
+    -13, 1, -9, 11, -29, 22, 6, -49,
+    32, -14, 47, -18, -4, 44, -52, -74,
+    43, 30, 23, -14, 5, 0, -27, 4,
+    -7, 10, -4, 10, 1, -16, 11, -18,
+    -2, -5, 2, -11, 0, -20, -4, 38,
+    74, 59, 39, 64, -10, 26, -3, -40,
+    -68, 3, -30, -51, 8, -19, -27, -46,
+    51, 52, 54, 36, 90, 92, 14, 13,
+    -5, 0, 16, -62, 16, 11, -47, -37,
+    -6, -5, 21, 54, -57, 32, 42, -6,
+    62, -9, 16, 21, 24, 9, -10, -4,
+    33, 50, 13, -15, 1, -35, -48, 18,
+    -11, -17, -67, -13, 21, 38, -44, 36,
+    -16, 29, 17, 5, -10, 18, 17, -32,
+    2, 8, 22, -56, -15, -32, 40, 43,
+    19, 46, -7, -100, -96, 19, 53, 24,
+    21, -26, -48, -101, -82, 61, 38, -85,
+    -28, -34, -1, 63, -5, -5, 39, 39,
+    -38, 32, -12, -28, 20, 40, -8, 2,
+    31, 12, -35, -13, 20, -25, 30, 8,
+    3, -13, -9, -20, 2, -13, 24, 37,
+    -10, 33, 6, 20, -16, -24, -6, -6,
+    -19, -5, 22, 21, 10, 11, -4, -39,
+    -1, 6, 49, 41, -15, -57, 21, -62,
+    77, -69, -13, 0, -74, 1, -7, -38,
+    -8, 6, 63, 28, 4, 26, -52, 82,
+    63, 13, 45, -33, 44, -52, -65, -21,
+    -46, -49, 64, -17, 32, 24, 68, -39,
+    -16, -5, -26, 28, 5, -61, -28, 2,
+    24, 11, -12, -33, 9, -37, -3, -28,
+    22, -37, -12, 19, 0, -18, -2, 14,
+    1, 4, 8, -9, -2, 43, -17, -2,
+    -66, -31, 56, -40, -87, -36, -2, -4,
+    -42, -45, -1, 31, -43, -15, 27, 63,
+    -11, 32, -10, -33, 27, -19, 4, 15,
+    -26, -34, 29, -4, -39, -65, 14, -20,
+    -21, -17, -36, 13, 59, 47, -38, -33,
+    13, -37, -8, -37, -7, -6, -76, -31,
+    -12, -46, 7, 24, -21, -30, -14, 9,
+    15, -12, -13, 47, -27, -25, -1, -39,
+    0, 20, -9, 6, 7, 4, 3, 7,
+    39, 50, 22, -7, 14, -20, 1, 70,
+    -28, 29, -41, 10, -16, -5, -28, -2,
+    -37, 32, -18, 17, 62, -11, -20, -50,
+    36, 21, -62, -12, -56, 52, 50, 17,
+    3, 48, 44, -41, -25, 3, 16, -3,
+    0, 33, -6, 15, 27, 34, -25, 22,
+    9, 17, -11, 36, 16, -2, 12, 21,
+    -52, 45, -2, -10, 46, 21, -18, 67,
+    -28, -13, 30, 37, 42, 16, -9, 11,
+    75, 7, -64, -40, -10, 29, 57, -23,
+    5, 53, -77, 3, -17, -5, 47, -55,
+    -35, -36, -13, 52, -53, -71, 52, -111,
+    -23, -26, -28, 29, -43, 55, -19, 43,
+    -19, 54, -12, -33, -44, -39, -19, -10,
+    -31, -10, 21, 38, -57, -20, 2, -25,
+    8, -6, 50, 12, 15, 25, -25, 15,
+    -30, -6, 9, 25, 37, 19, -4, 31,
+    -22, 2, 4, 2, 36, 7, 3, -34,
+    -80, 36, -10, -2, -5, 31, -36, 49,
+    -70, 20, -36, 21, 24, 25, -46, -51,
+    36, -58, -48, -40, -10, 55, 71, 47,
+    10, -1, 1, 2, -46, -68, 16, 13,
+    0, -74, -29, 73, -52, -18, -11, 7,
+    -44, -82, -32, -70, -28, -1, -39, -68,
+    -6, -41, 12, -22, -16, 40, -11, -25,
+    51, -9, 21, 4, 4, -34, 7, -78,
+    16, 6, -38, -30, -2, -44, 32, 0,
+    22, 64, 5, -72, -2, -14, -10, -16,
+    -8, -25, 12, 102, -58, 37, -10, -23,
+    15, 49, 7, -7, 2, -20, -32, 45,
+    -6, 48, 28, 30, 33, -1, 22, -6,
+    30, 65, -17, 29, 74, 37, -26, -10,
+    15, -24, 19, -66, 22, -10, -31, -1,
+    -18, -9, 11, 37, -4, 45, 5, 41,
+    17, 1, 1, 24, -58, 41, 5, -51,
+    14, 8, 43, 16, -10, -1, 45, 32,
+    -64, 3, -33, -25, -3, -27, -68, 12,
+    23, -11, -13, -37, -40, 4, -21, -12,
+    32, -23, -19, 76, 41, -23, -24, -44,
+    -65, -1, -15, 1, 71, 63, 5, 20,
+    -3, 21, -23, 31, -32, 18, -2, 27,
+    31, 46, -5, -39, -5, -35, 18, -18,
+    -40, -10, 3, 12, 2, -2, -22, 40,
+    5, -6, 60, 36, 3, 29, -27, 10,
+    25, -54, 5, 26, 39, 35, -24, -37,
+    30, -91, 28, -4, -21, -27, -39, -6,
+    5, 12, -128, 38, -16, 29, -95, -29,
+    82, -2, 35, 2, 12, 8, -22, 10,
+    80, -47, 2, -25, -73, -79, 16, -30,
+    -32, -66, 48, 21, -45, -11, -47, 14,
+    -27, -17, -7, 15, -44, -14, -44, -26,
+    -32, 26, -23, 17, -7, -28, 26, -6,
+    28, 6, -26, 2, 13, -14, -23, -14,
+    19, 46, 16, 2, -33, -21, 28, -17,
+    -42, 44, -37, 1, -39, 28, 84, -46,
+    15, 10, 13, -44, 72, -26, 26, 32,
+    -28, -12, -83, 2, 10, -30, -44, -10,
+    -28, 53, 45, 65, 0, -25, 57, 36,
+    -33, 6, 29, 44, -53, 11, 19, -2,
+    -27, 35, 32, 49, 4, 23, 38, 36,
+    24, 10, 51, -39, 4, -7, 26, 37,
+    -35, 11, -47, -18, 28, 16, -35, 42,
+    17, -21, -41, 28, 14, -12, 11, -45,
+    7, -43, -15, 18, -5, 38, -40, -50,
+    -30, -21, 9, -98, 13, 12, 23, 75,
+    -56, -7, -3, -4, -1, -34, 12, -49,
+    11, 26, -18, -28, -17, 33, 13, -14,
+    40, 24, -72, -37, 10, 17, -6, 22,
+    16, 16, -6, -12, -30, -14, 10, 40,
+    -23, 12, 15, -3, -15, 13, -56, -4,
+    -30, 1, -3, -17, 27, 50, -5, 64,
+    -36, -19, 7, 29, 22, 25, 9, -16,
+    -58, -69, -40, -61, -71, -14, 42, 93,
+    26, 11, -6, -58, -11, 70, -52, 19,
+    9, -30, -33, 11, -37, -47, -21, -22,
+    -40, 10, 47, 4, -23, 17, 48, 41,
+    -48, 14, 10, 15, 34, -23, -2, -47,
+    23, -32, -13, -10, -26, -26, -4, 16,
+    38, -14, 0, -12, -7, -7, 20, 44,
+    -1, -32, -27, -16, 4, -6, -18, 14,
+    5, 4, -29, 28, 7, -7, 15, -11,
+    -20, -45, -36, 16, 84, 34, -59, -30,
+    22, 126, 8, 68, 79, -17, 21, -68,
+    37, 5, 15, 63, 49, 127, -90, 85,
+    43, 7, 16, 9, 6, -45, -57, -43,
+    57, 11, -23, -11, -29, 60, -26, 0,
+    7, 42, -24, 10, 23, -25, 8, -7,
+    -40, 19, -17, 35, 4, 27, -39, -91,
+    27, -36, 34, 2, 16, -24, 25, 7,
+    -21, 5, 17, 10, -22, -30, 9, -17,
+    -61, -26, 33, 21, 58, -51, -14, 69,
+    -38, 20, 7, 80, -4, -65, -6, -27,
+    53, -12, 47, -1, -15, 1, 60, 102,
+    -79, -4, 12, 9, 22, 37, -8, -4,
+    37, 2, -3, -15, -16, -11, -5, 19,
+    -6, -43, 20, -25, -18, 10, -27, 0,
+    -28, -27, -11, 10, -18, -2, -4, -16,
+    26, 14, -6, 7, -6, 1, 53, -2,
+    -29, 23, 9, -30, -6, -4, -6, 56,
+    70, 0, -33, -20, -17, -9, -24, 46,
+    -5, -105, 47, -46, -51, 20, 20, -53,
+    -81, -1, -7, 75, -5, -21, -65, 12,
+    -52, 22, -50, -12, 49, 54, 76, -81,
+    10, 45, -41, -59, 18, -19, 25, 14,
+    -31, -53, -5, 12, 31, 84, -23, 2,
+    7, 2, 10, -32, 39, -2, -12, 1,
+    -9, 0, -10, -11, 9, 15, -8, -2,
+    2, -1, 10, 14, -5, -40, 19, -7,
+    -7, 26, -4, 2, 1, -27, 35, 32,
+    21, -31, 26, 43, -9, 4, -32, 40,
+    -62, -52, 36, 22, 38, 22, 36, -96,
+    6, -10, -23, -49, 15, -33, -18, -3,
+    0, 41, 21, -19, 21, 23, -39, -23,
+    -6, 6, 47, 56, 4, 74, 0, -98,
+    29, -47, -14, -36, 21, -22, 22, 16,
+    13, 12, 16, -5, 13, 17, -13, -15,
+    1, -34, -26, 26, 12, 32, 27, 13,
+    -67, 27, 2, 8, 10, 18, 16, 20,
+    -17, -17, 57, -64, 5, 14, 19, 31,
+    -18, -44, -46, -16, 4, -25, 17, -126,
+    -24, 39, 4, 8, 55, -25, -34, 39,
+    -16, 3, 9, 71, 72, -31, -55, 6,
+    10, -25, 32, -85, -21, 18, -8, 15,
+    12, -27, -7, 1, -21, -2, -5, 48,
+    -16, 18, 1, -22, -26, 16, 14, -31,
+    27, -6, -15, -21, 4, -14, 18, -36
 };
 
 static const oac_int8 layer1_recur_weights[1728] = {
-   20, 67, -99, 12, 41, -25, 49, -44,
-   35, 81, 110, 47, 34, -66, -14, 14,
-   -60, 34, 29, -73, 10, 41, 35, 89,
-   7, -35, 22, 7, 27, -20, -6, 56,
-   26, 66, 6, 33, -55, 53, 1, -21,
-   14, 17, 68, 55, 59, 0, 18, -9,
-   5, -41, 6, -5, -114, -12, 29, 42,
-   -23, 10, 81, -27, 20, -53, -30, -62,
-   40, 95, 25, -4, 3, 18, -8, -15,
-   -29, -82, 2, -57, -3, -61, -29, -29,
-   49, 2, -55, 5, -69, -99, -49, -51,
-   6, -25, 12, 89, 44, -33, 5, 41,
-   1, 23, -37, -37, -28, -48, 3, 4,
-   -41, -30, -57, -35, -39, -1, -13, -56,
-   -5, 50, 49, 41, -4, -4, 33, -22,
-   -1, 33, 34, 18, 40, -42, 12, 1,
-   -6, -2, 18, 17, 39, 44, 11, 65,
-   -60, -45, 10, 91, 21, 9, -62, -11,
-   8, 69, 37, 24, -30, 21, 26, -27,
-   1, -28, 24, 66, -8, 6, -71, 34,
-   24, 44, 58, -78, -19, 57, 17, -60,
-   1, 12, -3, -1, -40, 22, 11, -5,
-   25, 12, 1, 72, 79, 7, -50, 23,
-   18, 13, 21, -11, -20, 5, 77, -94,
-   24, 15, 57, -51, 3, 36, 53, -1,
-   4, 14, 30, -31, 22, 40, 32, -11,
-   -34, -36, -59, 58, 25, 21, -54, -23,
-   40, 46, 18, 0, 12, 54, -96, -99,
-   -59, 5, 119, -38, 50, 55, 12, -16,
-   67, 0, 34, 35, 39, 35, -1, 69,
-   24, 27, -30, -35, -4, -70, 2, -44,
-   -7, -6, 19, -9, 60, 44, -21, -10,
-   37, 43, -16, -3, 30, -15, -65, 31,
-   -55, 18, -98, 76, 64, 25, 24, -18,
-   -7, -68, -10, 38, 27, -60, 36, 33,
-   16, 30, 34, -39, -37, 31, 12, 53,
-   -54, 14, -26, -49, -128, -13, -5, -22,
-   -11, -85, 55, -8, -51, -11, -33, -10,
-   -31, -76, -41, 23, 44, -40, -54, -127,
-   -101, 19, -23, -15, 15, 27, 58, -60,
-   8, 14, -33, 1, 48, -9, -11, -123,
-   3, 53, 23, 4, -28, 22, 2, -29,
-   -67, 36, 12, 7, 55, -21, 88, 20,
-   -1, -21, -17, 3, 41, 32, -10, -14,
-   -5, -57, 67, 57, 21, 23, -2, -27,
-   -73, -24, 120, 21, 18, -35, 42, -7,
-   3, -45, -25, 76, -34, 50, 11, -54,
-   -91, 3, -113, -20, -5, 47, 15, -47,
-   17, 27, -3, -26, -7, 10, 7, 74,
-   -40, 64, -7, -5, -24, -49, -24, -3,
-   -10, 27, -17, -8, -3, 14, -27, 33,
-   13, 39, 28, -7, -38, 29, 16, 44,
-   19, 55, -3, 9, -13, -57, 43, 43,
-   31, 0, -93, -17, 19, -56, 4, -12,
-   -25, 37, -85, -13, -118, 33, -17, 56,
-   71, -80, -4, 6, -11, -18, 47, -52,
-   25, 9, 48, -107, 1, 21, 20, -3,
-   10, -16, -4, 24, 17, 31, -61, -18,
-   -50, 24, -10, 12, 71, 26, 11, -3,
-   4, 1, 0, -7, -40, 18, 38, -34,
-   38, 17, 8, -34, 2, 21, 123, -32,
-   -26, 43, 14, -34, -1, -9, 37, -16,
-   6, -17, -62, 68, 22, 17, 11, -75,
-   33, -80, 62, -9, -75, 76, 36, -41,
-   -8, -40, -11, -71, 40, -39, 62, -49,
-   -81, 16, -9, -52, 52, 61, 17, -103,
-   -27, -10, -8, -54, -57, 21, 23, -16,
-   -52, 36, 18, 10, -5, 8, 15, -29,
-   5, -19, -37, 8, -53, 6, 19, -37,
-   38, -17, 48, 10, 0, 81, 46, 70,
-   -29, 101, 11, 44, -44, -3, 24, 11,
-   3, 14, -9, 11, 14, -45, 13, 46,
-   -3, -57, 68, 44, 63, 98, 25, -28,
-   -23, 15, 32, -10, 53, -6, -2, -9,
-   -6, 16, -107, -11, -11, -28, 59, 57,
-   -22, 38, 42, 83, 27, 5, 29, -30,
-   12, -21, -13, 31, 38, -21, 58, -10,
-   -10, -15, -2, -5, 11, 12, -73, -28,
-   -38, 22, 2, -25, 73, -52, -12, -55,
-   32, -63, 21, 51, 33, 52, -26, 55,
-   -26, -26, 57, -32, -4, -52, -61, 21,
-   -33, -91, -51, 69, -90, -53, -38, -44,
-   12, -76, -20, 77, -45, -7, 86, 43,
-   -109, -33, -105, -40, -121, -10, 0, -72,
-   45, -51, -75, -49, -38, -1, -62, 18,
-   -1, 30, -44, -14, -10, -67, 40, -10,
-   -34, 46, -64, -32, 29, -13, 33, 3,
-   -32, -5, 28, -27, -25, 93, 24, 68,
-   -40, 57, 23, -3, -21, -58, 17, -39,
-   -17, -22, -89, 11, 18, -46, 27, 24,
-   46, 127, 61, 87, 31, 127, -36, 47,
-   -23, 47, 127, -24, 110, 122, 30, 100,
-   0, 96, -12, 6, 50, 44, -13, 73,
-   4, 55, -11, -15, 49, 42, -6, 20,
-   -35, 58, 18, 38, 42, 72, 19, -21,
-   11, 9, -37, 7, 29, 31, 16, -17,
-   13, -50, 19, 5, -23, 51, -16, -5,
-   4, -24, 76, 10, -53, -28, -7, -65,
-   74, 40, -16, -29, 32, -16, -49, -35,
-   -3, 59, -96, -50, -43, -43, -61, -15,
-   -8, -36, -34, -33, -14, 11, -3, -39,
-   4, -114, -123, -11, -49, -21, 14, -56,
-   1, 43, -63, 26, 40, 18, -10, -26,
-   -14, -15, -35, -35, -11, 32, -44, -67,
-   2, 22, 7, 3, -9, -30, -51, -28,
-   28, 6, -22, 16, 34, -25, -52, -54,
-   -8, -6, 5, 8, 20, -16, -17, -44,
-   27, 3, 31, -5, -48, -1, -3, 116,
-   11, 71, -31, -47, 109, 50, -22, -12,
-   -57, 32, 66, 8, -25, -93, -54, -10,
-   19, -76, -34, 97, 48, -36, -18, -30,
-   -39, -26, -12, 28, 14, 12, -12, -31,
-   38, 2, 10, 4, -40, 20, 16, -61,
-   2, 64, 39, 5, 15, 33, 40, -61,
-   -49, 93, -10, 33, 28, -11, -27, -18,
-   39, -62, -6, -6, 62, 11, -8, 38,
-   -67, 12, 27, 39, -27, 123, -18, -6,
-   -65, 83, -64, 20, 19, -11, 33, 24,
-   17, 56, 78, 7, -15, 54, -101, -9,
-   115, -96, 50, 51, 35, 34, 27, 37,
-   -40, -11, 8, -36, 42, -45, 2, -23,
-   0, 67, -8, -9, -13, 50, -14, -27,
-   4, 0, -8, -14, 30, -9, 29, 15,
-   9, -38, 37, -8, 50, -46, 54, 41,
-   -11, -8, -11, -26, 39, 45, 14, -26,
-   -17, -27, 69, 38, 39, 98, 66, 0,
-   42, 123, -101, -19, -83, 117, -32, 56,
-   10, 12, -88, 79, -53, 56, 63, 95,
-   -62, 9, 36, -13, -79, -16, 37, -46,
-   35, -34, 14, 17, -54, 5, 21, -7,
-   7, 63, 56, 15, 27, -76, -25, 4,
-   -26, -63, 28, -67, -52, 43, -47, -70,
-   40, -12, 40, -66, -37, 0, 35, 37,
-   -53, 4, -17, -51, 11, 21, 14, -34,
-   -4, 24, -42, 29, 22, 7, 28, 12,
-   37, 39, -39, -19, 65, -60, -50, -2,
-   1, 82, 39, 19, -23, -43, -22, -67,
-   -35, -34, 32, 102, 81, 127, 36, 67,
-   -45, 1, -67, -52, -4, 35, 20, 28,
-   71, 86, -35, -9, -83, -34, 12, 9,
-   -23, 2, 14, 28, -23, 7, -25, 45,
-   7, 17, -37, 0, -19, 31, 26, 40,
-   -27, -16, 17, 5, -21, 23, 24, 96,
-   -55, 52, -19, -14, -6, 1, 50, -34,
-   86, -53, 38, 2, -52, -36, -13, 60,
-   -85, -120, 32, 7, -12, 22, 70, -7,
-   -94, 38, -76, -31, -20, 15, -28, 7,
-   6, 40, 53, 88, 3, 38, 18, -8,
-   -22, -23, 51, 37, -9, 13, -32, 25,
-   -21, 27, 31, 20, 18, -9, -13, 1,
-   21, -24, -13, 39, 15, -11, -29, -36,
-   18, 15, 8, 27, 21, -94, -1, -22,
-   49, 66, -1, 6, -3, -40, -18, 6,
-   28, 12, 33, -59, 62, 60, -48, 90,
-   -1, 108, 9, 18, -2, 27, 77, -65,
-   82, -48, -38, -19, -11, 127, 50, 66,
-   18, -13, -22, 60, -38, 40, -14, -26,
-   -13, 38, 67, 57, 30, 33, 26, 36,
-   38, -17, 27, -28, 20, 12, -64, 18,
-   5, -33, -27, 13, -26, 32, 35, -5,
-   -48, -14, 92, 43, -47, -14, 40, 11,
-   51, 66, 22, -63, -16, -61, 4, -28,
-   27, 20, -33, -30, -21, -29, -53, 31,
-   -40, 24, 43, -4, -19, 21, 67, 20,
-   100, -16, -93, 78, -6, -18, -52, -37,
-   -9, 66, -31, -8, 26, 18, 4, 24,
-   -22, 17, -2, -13, 27, 0, 8, -18,
-   -25, 5, -21, -24, -7, 18, -93, 21,
-   7, 2, -75, 69, 50, -5, -15, -17,
-   60, -42, 55, 1, -4, 3, 10, 46,
-   16, -13, 45, -7, -10, -44, -108, 49,
-   2, -15, -64, -12, -72, 32, -38, -45,
-   10, -54, 13, -13, -27, -36, -64, 58,
-   -62, -101, 88, -86, -71, -39, -9, -128,
-   32, 15, -4, 54, -16, -39, -26, -36,
-   46, 48, -64, -10, 19, 30, -13, 34,
-   -8, 50, 60, -22, -6, -11, -30, 5,
-   50, 32, 56, 0, 25, 6, 68, 11,
-   -29, 45, -9, -12, 4, 1, 18, -49,
-   0, -38, -19, 90, 29, 35, 51, 8,
-   -48, 96, -1, -12, -9, -32, -63, -65,
-   -7, 38, 89, 28, -85, -28, -23, -25,
-   -128, 56, 79, -36, 99, -6, -37, 7,
-   -13, -69, -46, -29, 25, 64, -21, 17,
-   1, 42, -66, 1, 80, 26, -32, 21,
-   15, 15, 6, 6, -10, 15, 127, 5,
-   38, 27, 87, -57, -25, 11, 72, -21,
-   -5, 11, -13, -66, 78, 36, -3, 41,
-   -21, 8, -33, 23, 73, 28, 57, -25,
-   -5, 4, -22, -47, 15, 4, -57, -72,
-   33, 1, 18, 2, 53, -71, -99, -21,
-   -3, -111, 108, 71, -14, 82, 25, 61,
-   -48, 5, 9, -51, -20, -25, -3, 14,
-   -33, 14, -3, -34, 22, 12, -19, -38,
-   -16, 2, 21, 16, 26, -31, 75, 44,
-   -31, 16, 26, 66, 17, -9, -22, -22,
-   22, -44, 22, 27, 2, 58, -14, 10,
-   -73, -42, 55, -25, -61, 72, -1, 30,
-   -58, -25, 63, 26, -48, -40, 26, -30,
-   60, 8, -17, -1, -18, -20, 43, -20,
-   -4, -28, 127, -106, 29, 70, 64, -27,
-   39, -33, -5, -88, -40, -52, 26, 44,
-   -17, 23, 2, -49, 22, -9, -8, 86,
-   49, -43, -60, 1, 10, 45, 36, -53,
-   -4, 33, 38, 48, -72, 1, 19, 21,
-   -65, 4, -5, -62, 27, -25, 17, -6,
-   6, -45, -39, -46, 4, 26, 127, -9,
-   18, -33, -18, -3, 33, 2, -5, 15,
-   -26, -22, -117, -63, -17, -59, 61, -74,
-   7, -47, -58, -128, -67, 15, -16, -128,
-   12, 2, 20, 9, -48, -40, 43, 3,
-   -40, -16, -38, -6, -22, -28, -16, -59,
-   -22, 6, -5, 11, -12, -66, -40, 27,
-   -62, -44, -19, 38, -3, 39, -8, 40,
-   -24, 13, 21, 50, -60, -22, 53, -29,
-   -6, 1, 22, -59, 0, 17, -39, 115
+    20, 67, -99, 12, 41, -25, 49, -44,
+    35, 81, 110, 47, 34, -66, -14, 14,
+    -60, 34, 29, -73, 10, 41, 35, 89,
+    7, -35, 22, 7, 27, -20, -6, 56,
+    26, 66, 6, 33, -55, 53, 1, -21,
+    14, 17, 68, 55, 59, 0, 18, -9,
+    5, -41, 6, -5, -114, -12, 29, 42,
+    -23, 10, 81, -27, 20, -53, -30, -62,
+    40, 95, 25, -4, 3, 18, -8, -15,
+    -29, -82, 2, -57, -3, -61, -29, -29,
+    49, 2, -55, 5, -69, -99, -49, -51,
+    6, -25, 12, 89, 44, -33, 5, 41,
+    1, 23, -37, -37, -28, -48, 3, 4,
+    -41, -30, -57, -35, -39, -1, -13, -56,
+    -5, 50, 49, 41, -4, -4, 33, -22,
+    -1, 33, 34, 18, 40, -42, 12, 1,
+    -6, -2, 18, 17, 39, 44, 11, 65,
+    -60, -45, 10, 91, 21, 9, -62, -11,
+    8, 69, 37, 24, -30, 21, 26, -27,
+    1, -28, 24, 66, -8, 6, -71, 34,
+    24, 44, 58, -78, -19, 57, 17, -60,
+    1, 12, -3, -1, -40, 22, 11, -5,
+    25, 12, 1, 72, 79, 7, -50, 23,
+    18, 13, 21, -11, -20, 5, 77, -94,
+    24, 15, 57, -51, 3, 36, 53, -1,
+    4, 14, 30, -31, 22, 40, 32, -11,
+    -34, -36, -59, 58, 25, 21, -54, -23,
+    40, 46, 18, 0, 12, 54, -96, -99,
+    -59, 5, 119, -38, 50, 55, 12, -16,
+    67, 0, 34, 35, 39, 35, -1, 69,
+    24, 27, -30, -35, -4, -70, 2, -44,
+    -7, -6, 19, -9, 60, 44, -21, -10,
+    37, 43, -16, -3, 30, -15, -65, 31,
+    -55, 18, -98, 76, 64, 25, 24, -18,
+    -7, -68, -10, 38, 27, -60, 36, 33,
+    16, 30, 34, -39, -37, 31, 12, 53,
+    -54, 14, -26, -49, -128, -13, -5, -22,
+    -11, -85, 55, -8, -51, -11, -33, -10,
+    -31, -76, -41, 23, 44, -40, -54, -127,
+    -101, 19, -23, -15, 15, 27, 58, -60,
+    8, 14, -33, 1, 48, -9, -11, -123,
+    3, 53, 23, 4, -28, 22, 2, -29,
+    -67, 36, 12, 7, 55, -21, 88, 20,
+    -1, -21, -17, 3, 41, 32, -10, -14,
+    -5, -57, 67, 57, 21, 23, -2, -27,
+    -73, -24, 120, 21, 18, -35, 42, -7,
+    3, -45, -25, 76, -34, 50, 11, -54,
+    -91, 3, -113, -20, -5, 47, 15, -47,
+    17, 27, -3, -26, -7, 10, 7, 74,
+    -40, 64, -7, -5, -24, -49, -24, -3,
+    -10, 27, -17, -8, -3, 14, -27, 33,
+    13, 39, 28, -7, -38, 29, 16, 44,
+    19, 55, -3, 9, -13, -57, 43, 43,
+    31, 0, -93, -17, 19, -56, 4, -12,
+    -25, 37, -85, -13, -118, 33, -17, 56,
+    71, -80, -4, 6, -11, -18, 47, -52,
+    25, 9, 48, -107, 1, 21, 20, -3,
+    10, -16, -4, 24, 17, 31, -61, -18,
+    -50, 24, -10, 12, 71, 26, 11, -3,
+    4, 1, 0, -7, -40, 18, 38, -34,
+    38, 17, 8, -34, 2, 21, 123, -32,
+    -26, 43, 14, -34, -1, -9, 37, -16,
+    6, -17, -62, 68, 22, 17, 11, -75,
+    33, -80, 62, -9, -75, 76, 36, -41,
+    -8, -40, -11, -71, 40, -39, 62, -49,
+    -81, 16, -9, -52, 52, 61, 17, -103,
+    -27, -10, -8, -54, -57, 21, 23, -16,
+    -52, 36, 18, 10, -5, 8, 15, -29,
+    5, -19, -37, 8, -53, 6, 19, -37,
+    38, -17, 48, 10, 0, 81, 46, 70,
+    -29, 101, 11, 44, -44, -3, 24, 11,
+    3, 14, -9, 11, 14, -45, 13, 46,
+    -3, -57, 68, 44, 63, 98, 25, -28,
+    -23, 15, 32, -10, 53, -6, -2, -9,
+    -6, 16, -107, -11, -11, -28, 59, 57,
+    -22, 38, 42, 83, 27, 5, 29, -30,
+    12, -21, -13, 31, 38, -21, 58, -10,
+    -10, -15, -2, -5, 11, 12, -73, -28,
+    -38, 22, 2, -25, 73, -52, -12, -55,
+    32, -63, 21, 51, 33, 52, -26, 55,
+    -26, -26, 57, -32, -4, -52, -61, 21,
+    -33, -91, -51, 69, -90, -53, -38, -44,
+    12, -76, -20, 77, -45, -7, 86, 43,
+    -109, -33, -105, -40, -121, -10, 0, -72,
+    45, -51, -75, -49, -38, -1, -62, 18,
+    -1, 30, -44, -14, -10, -67, 40, -10,
+    -34, 46, -64, -32, 29, -13, 33, 3,
+    -32, -5, 28, -27, -25, 93, 24, 68,
+    -40, 57, 23, -3, -21, -58, 17, -39,
+    -17, -22, -89, 11, 18, -46, 27, 24,
+    46, 127, 61, 87, 31, 127, -36, 47,
+    -23, 47, 127, -24, 110, 122, 30, 100,
+    0, 96, -12, 6, 50, 44, -13, 73,
+    4, 55, -11, -15, 49, 42, -6, 20,
+    -35, 58, 18, 38, 42, 72, 19, -21,
+    11, 9, -37, 7, 29, 31, 16, -17,
+    13, -50, 19, 5, -23, 51, -16, -5,
+    4, -24, 76, 10, -53, -28, -7, -65,
+    74, 40, -16, -29, 32, -16, -49, -35,
+    -3, 59, -96, -50, -43, -43, -61, -15,
+    -8, -36, -34, -33, -14, 11, -3, -39,
+    4, -114, -123, -11, -49, -21, 14, -56,
+    1, 43, -63, 26, 40, 18, -10, -26,
+    -14, -15, -35, -35, -11, 32, -44, -67,
+    2, 22, 7, 3, -9, -30, -51, -28,
+    28, 6, -22, 16, 34, -25, -52, -54,
+    -8, -6, 5, 8, 20, -16, -17, -44,
+    27, 3, 31, -5, -48, -1, -3, 116,
+    11, 71, -31, -47, 109, 50, -22, -12,
+    -57, 32, 66, 8, -25, -93, -54, -10,
+    19, -76, -34, 97, 48, -36, -18, -30,
+    -39, -26, -12, 28, 14, 12, -12, -31,
+    38, 2, 10, 4, -40, 20, 16, -61,
+    2, 64, 39, 5, 15, 33, 40, -61,
+    -49, 93, -10, 33, 28, -11, -27, -18,
+    39, -62, -6, -6, 62, 11, -8, 38,
+    -67, 12, 27, 39, -27, 123, -18, -6,
+    -65, 83, -64, 20, 19, -11, 33, 24,
+    17, 56, 78, 7, -15, 54, -101, -9,
+    115, -96, 50, 51, 35, 34, 27, 37,
+    -40, -11, 8, -36, 42, -45, 2, -23,
+    0, 67, -8, -9, -13, 50, -14, -27,
+    4, 0, -8, -14, 30, -9, 29, 15,
+    9, -38, 37, -8, 50, -46, 54, 41,
+    -11, -8, -11, -26, 39, 45, 14, -26,
+    -17, -27, 69, 38, 39, 98, 66, 0,
+    42, 123, -101, -19, -83, 117, -32, 56,
+    10, 12, -88, 79, -53, 56, 63, 95,
+    -62, 9, 36, -13, -79, -16, 37, -46,
+    35, -34, 14, 17, -54, 5, 21, -7,
+    7, 63, 56, 15, 27, -76, -25, 4,
+    -26, -63, 28, -67, -52, 43, -47, -70,
+    40, -12, 40, -66, -37, 0, 35, 37,
+    -53, 4, -17, -51, 11, 21, 14, -34,
+    -4, 24, -42, 29, 22, 7, 28, 12,
+    37, 39, -39, -19, 65, -60, -50, -2,
+    1, 82, 39, 19, -23, -43, -22, -67,
+    -35, -34, 32, 102, 81, 127, 36, 67,
+    -45, 1, -67, -52, -4, 35, 20, 28,
+    71, 86, -35, -9, -83, -34, 12, 9,
+    -23, 2, 14, 28, -23, 7, -25, 45,
+    7, 17, -37, 0, -19, 31, 26, 40,
+    -27, -16, 17, 5, -21, 23, 24, 96,
+    -55, 52, -19, -14, -6, 1, 50, -34,
+    86, -53, 38, 2, -52, -36, -13, 60,
+    -85, -120, 32, 7, -12, 22, 70, -7,
+    -94, 38, -76, -31, -20, 15, -28, 7,
+    6, 40, 53, 88, 3, 38, 18, -8,
+    -22, -23, 51, 37, -9, 13, -32, 25,
+    -21, 27, 31, 20, 18, -9, -13, 1,
+    21, -24, -13, 39, 15, -11, -29, -36,
+    18, 15, 8, 27, 21, -94, -1, -22,
+    49, 66, -1, 6, -3, -40, -18, 6,
+    28, 12, 33, -59, 62, 60, -48, 90,
+    -1, 108, 9, 18, -2, 27, 77, -65,
+    82, -48, -38, -19, -11, 127, 50, 66,
+    18, -13, -22, 60, -38, 40, -14, -26,
+    -13, 38, 67, 57, 30, 33, 26, 36,
+    38, -17, 27, -28, 20, 12, -64, 18,
+    5, -33, -27, 13, -26, 32, 35, -5,
+    -48, -14, 92, 43, -47, -14, 40, 11,
+    51, 66, 22, -63, -16, -61, 4, -28,
+    27, 20, -33, -30, -21, -29, -53, 31,
+    -40, 24, 43, -4, -19, 21, 67, 20,
+    100, -16, -93, 78, -6, -18, -52, -37,
+    -9, 66, -31, -8, 26, 18, 4, 24,
+    -22, 17, -2, -13, 27, 0, 8, -18,
+    -25, 5, -21, -24, -7, 18, -93, 21,
+    7, 2, -75, 69, 50, -5, -15, -17,
+    60, -42, 55, 1, -4, 3, 10, 46,
+    16, -13, 45, -7, -10, -44, -108, 49,
+    2, -15, -64, -12, -72, 32, -38, -45,
+    10, -54, 13, -13, -27, -36, -64, 58,
+    -62, -101, 88, -86, -71, -39, -9, -128,
+    32, 15, -4, 54, -16, -39, -26, -36,
+    46, 48, -64, -10, 19, 30, -13, 34,
+    -8, 50, 60, -22, -6, -11, -30, 5,
+    50, 32, 56, 0, 25, 6, 68, 11,
+    -29, 45, -9, -12, 4, 1, 18, -49,
+    0, -38, -19, 90, 29, 35, 51, 8,
+    -48, 96, -1, -12, -9, -32, -63, -65,
+    -7, 38, 89, 28, -85, -28, -23, -25,
+    -128, 56, 79, -36, 99, -6, -37, 7,
+    -13, -69, -46, -29, 25, 64, -21, 17,
+    1, 42, -66, 1, 80, 26, -32, 21,
+    15, 15, 6, 6, -10, 15, 127, 5,
+    38, 27, 87, -57, -25, 11, 72, -21,
+    -5, 11, -13, -66, 78, 36, -3, 41,
+    -21, 8, -33, 23, 73, 28, 57, -25,
+    -5, 4, -22, -47, 15, 4, -57, -72,
+    33, 1, 18, 2, 53, -71, -99, -21,
+    -3, -111, 108, 71, -14, 82, 25, 61,
+    -48, 5, 9, -51, -20, -25, -3, 14,
+    -33, 14, -3, -34, 22, 12, -19, -38,
+    -16, 2, 21, 16, 26, -31, 75, 44,
+    -31, 16, 26, 66, 17, -9, -22, -22,
+    22, -44, 22, 27, 2, 58, -14, 10,
+    -73, -42, 55, -25, -61, 72, -1, 30,
+    -58, -25, 63, 26, -48, -40, 26, -30,
+    60, 8, -17, -1, -18, -20, 43, -20,
+    -4, -28, 127, -106, 29, 70, 64, -27,
+    39, -33, -5, -88, -40, -52, 26, 44,
+    -17, 23, 2, -49, 22, -9, -8, 86,
+    49, -43, -60, 1, 10, 45, 36, -53,
+    -4, 33, 38, 48, -72, 1, 19, 21,
+    -65, 4, -5, -62, 27, -25, 17, -6,
+    6, -45, -39, -46, 4, 26, 127, -9,
+    18, -33, -18, -3, 33, 2, -5, 15,
+    -26, -22, -117, -63, -17, -59, 61, -74,
+    7, -47, -58, -128, -67, 15, -16, -128,
+    12, 2, 20, 9, -48, -40, 43, 3,
+    -40, -16, -38, -6, -22, -28, -16, -59,
+    -22, 6, -5, 11, -12, -66, -40, 27,
+    -62, -44, -19, 38, -3, 39, -8, 40,
+    -24, 13, 21, 50, -60, -22, 53, -29,
+    -6, 1, 22, -59, 0, 17, -39, 115
 };
 
 static const oac_int8 layer1_bias[72] = {
-   -42, 20, 16, 0, 105, 60, 1, -97,
-   24, 60, 18, 13, 62, 25, 127, 34,
-   79, 55, 118, 127, 95, 31, -4, 87,
-   21, 12, 2, -14, 18, 23, 8, 17,
-   -1, -8, 5, 4, 24, 37, 21, 13,
-   36, 13, 17, 18, 37, 30, 33, 1,
-   8, -16, -11, -5, -31, -3, -5, 0,
-   6, 3, 58, -7, -1, -16, 5, -13,
-   16, 10, -2, -14, 11, -4, 3, -11
+    -42, 20, 16, 0, 105, 60, 1, -97,
+    24, 60, 18, 13, 62, 25, 127, 34,
+    79, 55, 118, 127, 95, 31, -4, 87,
+    21, 12, 2, -14, 18, 23, 8, 17,
+    -1, -8, 5, 4, 24, 37, 21, 13,
+    36, 13, 17, 18, 37, 30, 33, 1,
+    8, -16, -11, -5, -31, -3, -5, 0,
+    6, 3, 58, -7, -1, -16, 5, -13,
+    16, 10, -2, -14, 11, -4, 3, -11
 };
 
 static const oac_int8 layer2_weights[48] = {
-   -113, -88, 31, -128, -126, -61, 85, -35,
-   118, -128, -61, 127, -128, -17, -128, 127,
-   104, -9, -128, 33, 45, 127, 5, 83,
-   84, -128, -85, -128, -45, 48, -53, -128,
-   46, 127, -17, 125, 117, -41, -117, -91,
-   -127, -68, -1, -89, -80, 32, 106, 7
+    -113, -88, 31, -128, -126, -61, 85, -35,
+    118, -128, -61, 127, -128, -17, -128, 127,
+    104, -9, -128, 33, 45, 127, 5, 83,
+    84, -128, -85, -128, -45, 48, -53, -128,
+    46, 127, -17, 125, 117, -41, -117, -91,
+    -127, -68, -1, -89, -80, 32, 106, 7
 };
 
 static const oac_int8 layer2_bias[2] = {
-   14, 117
+    14, 117
 };
 
 const AnalysisDenseLayer layer0 = {
-   layer0_bias,
-   layer0_weights,
-   25, 32, 0
+    layer0_bias,
+    layer0_weights,
+    25, 32, 0
 };
 
 const AnalysisGRULayer layer1 = {
-   layer1_bias,
-   layer1_weights,
-   layer1_recur_weights,
-   32, 24
+    layer1_bias,
+    layer1_weights,
+    layer1_recur_weights,
+    32, 24
 };
 
 const AnalysisDenseLayer layer2 = {
-   layer2_bias,
-   layer2_weights,
-   24, 2, 1
+    layer2_bias,
+    layer2_weights,
+    24, 2, 1
 };
diff --git a/src/oac.c b/src/oac.c
index 4378587e9..656631c54 100644
--- a/src/oac.c
+++ b/src/oac.c
@@ -24,10 +24,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "oac.h"
@@ -36,363 +36,328 @@
 
 #ifndef DISABLE_FLOAT_API
 
-void oac_pcm_soft_clip_impl(float *_x, int N, int C, float *declip_mem, int arch)
-{
-   int c;
-   int i;
-   float *x;
-   int all_within_neg1pos1;
-
-   if (C<1 || N<1 || !_x || !declip_mem) return;
-
-   /* Clamp everything within the range [-2, +2] which is the domain of the soft
-      clipping non-linearity. Outside the defined range the derivative will be zero,
-      therefore there is no discontinuity introduced here. The implementation
-      might provide a hint if all input samples are within the [-1, +1] range.
-
-   `oac_limit2_checkwithin1()`:
-      - Clamps all samples within the valid range [-2, +2].
-      - Generic C implementation:
-         * Does not attempt early detection whether samples are within hinted range.
-         * Always returns 0.
-      - Architecture specific implementation:
-         * Uses SIMD instructions to efficiently detect if all samples are
-           within the hinted range [-1, +1].
-         * Returns 1 if no samples exceed the hinted range, 0 otherwise.
-
-   `all_within_neg1pos1`:
-      - Optimization hint to skip per-sample out-of-bound checks.
-        If true, the check can be skipped. */
-   all_within_neg1pos1 = oac_limit2_checkwithin1(_x, N*C, arch);
-
-   for (c=0;c<C;c++)
-   {
-      float a;
-      float x0;
-      int curr;
-
-      x = _x+c;
-      a = declip_mem[c];
-      /* Continue applying the non-linearity from the previous frame to avoid
-         any discontinuity. */
-      for (i=0;i<N;i++)
-      {
-         if (x[i*C]*a>=0)
-            break;
-         x[i*C] = x[i*C]+a*x[i*C]*x[i*C];
-      }
-
-      curr=0;
-      x0 = x[0];
-      while(1)
-      {
-         int start, end;
-         float maxval;
-         int special=0;
-         int peak_pos;
-         /* Detection for early exit can be skipped if hinted by `all_within_neg1pos1` */
-         if (all_within_neg1pos1)
-         {
-            i = N;
-         } else {
-            for (i=curr;i<N;i++)
-            {
-               if (x[i*C]>1 || x[i*C]<-1)
-                  break;
+void oac_pcm_soft_clip_impl(float *_x, int N, int C, float *declip_mem, int arch) {
+    int c;
+    int i;
+    float *x;
+    int all_within_neg1pos1;
+
+    if (C < 1 || N < 1 || !_x || !declip_mem) return;
+
+    /* Clamp everything within the range [-2, +2] which is the domain of the soft
+       clipping non-linearity. Outside the defined range the derivative will be zero,
+       therefore there is no discontinuity introduced here. The implementation
+       might provide a hint if all input samples are within the [-1, +1] range.
+
+       `oac_limit2_checkwithin1()`:
+       - Clamps all samples within the valid range [-2, +2].
+       - Generic C implementation:
+     * Does not attempt early detection whether samples are within hinted range.
+     * Always returns 0.
+       - Architecture specific implementation:
+     * Uses SIMD instructions to efficiently detect if all samples are
+            within the hinted range [-1, +1].
+     * Returns 1 if no samples exceed the hinted range, 0 otherwise.
+
+       `all_within_neg1pos1`:
+       - Optimization hint to skip per-sample out-of-bound checks.
+         If true, the check can be skipped. */
+    all_within_neg1pos1 = oac_limit2_checkwithin1(_x, N*C, arch);
+
+    for (c = 0; c < C; c++) {
+        float a;
+        float x0;
+        int curr;
+
+        x = _x + c;
+        a = declip_mem[c];
+        /* Continue applying the non-linearity from the previous frame to avoid
+           any discontinuity. */
+        for (i = 0; i < N; i++) {
+            if (x[i*C]*a >= 0)
+                break;
+            x[i*C] = x[i*C] + a*x[i*C]*x[i*C];
+        }
+
+        curr = 0;
+        x0 = x[0];
+        while (1) {
+            int start, end;
+            float maxval;
+            int special = 0;
+            int peak_pos;
+            /* Detection for early exit can be skipped if hinted by `all_within_neg1pos1` */
+            if (all_within_neg1pos1) {
+                i = N;
+            } else {
+                for (i = curr; i < N; i++) {
+                    if (x[i*C] > 1 || x[i*C] < -1)
+                        break;
+                }
             }
-         }
-         if (i==N)
-         {
-            a=0;
-            break;
-         }
-         peak_pos = i;
-         start=end=i;
-         maxval=ABS16(x[i*C]);
-         /* Look for first zero crossing before clipping */
-         while (start>0 && x[i*C]*x[(start-1)*C]>=0)
-            start--;
-         /* Look for first zero crossing after clipping */
-         while (end<N && x[i*C]*x[end*C]>=0)
-         {
-            /* Look for other peaks until the next zero-crossing. */
-            if (ABS16(x[end*C])>maxval)
-            {
-               maxval = ABS16(x[end*C]);
-               peak_pos = end;
+            if (i == N) {
+                a = 0;
+                break;
             }
-            end++;
-         }
-         /* Detect the special case where we clip before the first zero crossing */
-         special = (start==0 && x[i*C]*x[0]>=0);
-
-         /* Compute a such that maxval + a*maxval^2 = 1 */
-         a=(maxval-1)/(maxval*maxval);
-         /* Slightly boost "a" by 2^-22. This is just enough to ensure -ffast-math
-            does not cause output values larger than +/-1, but small enough not
-            to matter even for 24-bit output.  */
-         a += a*2.4e-7f;
-         if (x[i*C]>0)
-            a = -a;
-         /* Apply soft clipping */
-         for (i=start;i<end;i++)
-            x[i*C] = x[i*C]+a*x[i*C]*x[i*C];
-
-         if (special && peak_pos>=2)
-         {
-            /* Add a linear ramp from the first sample to the signal peak.
-               This avoids a discontinuity at the beginning of the frame. */
-            float delta;
-            float offset = x0-x[0];
-            delta = offset / peak_pos;
-            for (i=curr;i<peak_pos;i++)
-            {
-               offset -= delta;
-               x[i*C] += offset;
-               x[i*C] = MAX16(-1.f, MIN16(1.f, x[i*C]));
+            peak_pos = i;
+            start = end = i;
+            maxval = ABS16(x[i*C]);
+            /* Look for first zero crossing before clipping */
+            while (start > 0 && x[i*C]*x[(start - 1)*C] >= 0)
+                start--;
+            /* Look for first zero crossing after clipping */
+            while (end < N && x[i*C]*x[end*C] >= 0) {
+                /* Look for other peaks until the next zero-crossing. */
+                if (ABS16(x[end*C]) > maxval) {
+                    maxval = ABS16(x[end*C]);
+                    peak_pos = end;
+                }
+                end++;
             }
-         }
-         curr = end;
-         if (curr==N)
-            break;
-      }
-      declip_mem[c] = a;
-   }
+            /* Detect the special case where we clip before the first zero crossing */
+            special = (start == 0 && x[i*C]*x[0] >= 0);
+
+            /* Compute a such that maxval + a*maxval^2 = 1 */
+            a = (maxval - 1)/(maxval*maxval);
+            /* Slightly boost "a" by 2^-22. This is just enough to ensure -ffast-math
+               does not cause output values larger than +/-1, but small enough not
+               to matter even for 24-bit output.  */
+            a += a*2.4e-7f;
+            if (x[i*C] > 0)
+                a = -a;
+            /* Apply soft clipping */
+            for (i = start; i < end; i++)
+                x[i*C] = x[i*C] + a*x[i*C]*x[i*C];
+
+            if (special && peak_pos >= 2) {
+                /* Add a linear ramp from the first sample to the signal peak.
+                   This avoids a discontinuity at the beginning of the frame. */
+                float delta;
+                float offset = x0 - x[0];
+                delta = offset/peak_pos;
+                for (i = curr; i < peak_pos; i++) {
+                    offset -= delta;
+                    x[i*C] += offset;
+                    x[i*C] = MAX16(-1.f, MIN16(1.f, x[i*C]));
+                }
+            }
+            curr = end;
+            if (curr == N)
+                break;
+        }
+        declip_mem[c] = a;
+    }
 }
 
-OAC_EXPORT void oac_pcm_soft_clip(float *_x, int N, int C, float *declip_mem)
-{
-   oac_pcm_soft_clip_impl(_x, N, C, declip_mem, 0);
+OAC_EXPORT void oac_pcm_soft_clip(float *_x, int N, int C, float *declip_mem) {
+    oac_pcm_soft_clip_impl(_x, N, C, declip_mem, 0);
 }
 
 #endif
 
-int encode_size(int size, unsigned char *data)
-{
-   if (size < 252)
-   {
-      data[0] = size;
-      return 1;
-   } else {
-      data[0] = 252+(size&0x3);
-      data[1] = (size-(int)data[0])>>2;
-      return 2;
-   }
+int encode_size(int size, unsigned char *data) {
+    if (size < 252) {
+        data[0] = size;
+        return 1;
+    } else {
+        data[0] = 252 + (size&0x3);
+        data[1] = (size - (int)data[0])>>2;
+        return 2;
+    }
 }
 
-static int parse_size(const unsigned char *data, oac_int32 len, oac_int16 *size)
-{
-   if (len<1)
-   {
-      *size = -1;
-      return -1;
-   } else if (data[0]<252)
-   {
-      *size = data[0];
-      return 1;
-   } else if (len<2)
-   {
-      *size = -1;
-      return -1;
-   } else {
-      *size = 4*data[1] + data[0];
-      return 2;
-   }
+static int parse_size(const unsigned char *data, oac_int32 len, oac_int16 *size) {
+    if (len < 1) {
+        *size = -1;
+        return -1;
+    } else if (data[0] < 252) {
+        *size = data[0];
+        return 1;
+    } else if (len < 2) {
+        *size = -1;
+        return -1;
+    } else {
+        *size = 4*data[1] + data[0];
+        return 2;
+    }
 }
 
 int oac_packet_get_samples_per_frame(const unsigned char *data,
-      oac_int32 Fs)
-{
-   int audiosize;
-   if (data[0]&0x80)
-   {
-      audiosize = ((data[0]>>3)&0x3);
-      audiosize = (Fs<<audiosize)/400;
-   } else if ((data[0]&0x60) == 0x60)
-   {
-      audiosize = (data[0]&0x08) ? Fs/50 : Fs/100;
-   } else {
-      audiosize = ((data[0]>>3)&0x3);
-      if (audiosize == 3)
-         audiosize = Fs*60/1000;
-      else
-         audiosize = (Fs<<audiosize)/100;
-   }
-   return audiosize;
+                                     oac_int32 Fs) {
+    int audiosize;
+    if (data[0]&0x80) {
+        audiosize = ((data[0]>>3)&0x3);
+        audiosize = (Fs<<audiosize)/400;
+    } else if ((data[0]&0x60) == 0x60) {
+        audiosize = (data[0]&0x08) ? Fs/50 : Fs/100;
+    } else {
+        audiosize = ((data[0]>>3)&0x3);
+        if (audiosize == 3)
+            audiosize = Fs*60/1000;
+        else
+            audiosize = (Fs<<audiosize)/100;
+    }
+    return audiosize;
 }
 
 int oac_packet_parse_impl(const unsigned char *data, oac_int32 len,
-      int self_delimited, unsigned char *out_toc,
-      const unsigned char *frames[48], oac_int16 size[48],
-      int *payload_offset, oac_int32 *packet_offset,
-      const unsigned char **padding, oac_int32 *padding_len)
-{
-   int i, bytes;
-   int count;
-   int cbr;
-   unsigned char ch, toc;
-   int framesize;
-   oac_int32 last_size;
-   oac_int32 pad = 0;
-   const unsigned char *data0 = data;
-
-   /* Make sure we return NULL/0 on error. */
-   if (padding != NULL)
-   {
-      *padding = NULL;
-      *padding_len = 0;
-   }
-
-   if (size==NULL || len<0)
-      return OAC_BAD_ARG;
-   if (len==0)
-      return OAC_INVALID_PACKET;
-
-   framesize = oac_packet_get_samples_per_frame(data, 48000);
-
-   cbr = 0;
-   toc = *data++;
-   len--;
-   last_size = len;
-   switch (toc&0x3)
-   {
-   /* One frame */
-   case 0:
-      count=1;
-      break;
-   /* Two CBR frames */
-   case 1:
-      count=2;
-      cbr = 1;
-      if (!self_delimited)
-      {
-         if (len&0x1)
-            return OAC_INVALID_PACKET;
-         last_size = len/2;
-         /* If last_size doesn't fit in size[0], we'll catch it later */
-         size[0] = (oac_int16)last_size;
-      }
-      break;
-   /* Two VBR frames */
-   case 2:
-      count = 2;
-      bytes = parse_size(data, len, size);
-      len -= bytes;
-      if (size[0]<0 || size[0] > len)
-         return OAC_INVALID_PACKET;
-      data += bytes;
-      last_size = len-size[0];
-      break;
-   /* Multiple CBR/VBR frames (from 0 to 120 ms) */
-   default: /*case 3:*/
-      if (len<1)
-         return OAC_INVALID_PACKET;
-      /* Number of frames encoded in bits 0 to 5 */
-      ch = *data++;
-      count = ch&0x3F;
-      if (count <= 0 || framesize*(oac_int32)count > 5760)
-         return OAC_INVALID_PACKET;
-      len--;
-      /* Padding flag is bit 6 */
-      if (ch&0x40)
-      {
-         int p;
-         do {
-            int tmp;
-            if (len<=0)
-               return OAC_INVALID_PACKET;
-            p = *data++;
-            len--;
-            tmp = p==255 ? 254: p;
-            len -= tmp;
-            pad += tmp;
-         } while (p==255);
-      }
-      if (len<0)
-         return OAC_INVALID_PACKET;
-      /* VBR flag is bit 7 */
-      cbr = !(ch&0x80);
-      if (!cbr)
-      {
-         /* VBR case */
-         last_size = len;
-         for (i=0;i<count-1;i++)
-         {
-            bytes = parse_size(data, len, size+i);
+                          int self_delimited, unsigned char *out_toc,
+                          const unsigned char *frames[48], oac_int16 size[48],
+                          int *payload_offset, oac_int32 *packet_offset,
+                          const unsigned char **padding, oac_int32 *padding_len) {
+    int i, bytes;
+    int count;
+    int cbr;
+    unsigned char ch, toc;
+    int framesize;
+    oac_int32 last_size;
+    oac_int32 pad = 0;
+    const unsigned char *data0 = data;
+
+    /* Make sure we return NULL/0 on error. */
+    if (padding != NULL) {
+        *padding = NULL;
+        *padding_len = 0;
+    }
+
+    if (size == NULL || len < 0)
+        return OAC_BAD_ARG;
+    if (len == 0)
+        return OAC_INVALID_PACKET;
+
+    framesize = oac_packet_get_samples_per_frame(data, 48000);
+
+    cbr = 0;
+    toc = *data++;
+    len--;
+    last_size = len;
+    switch (toc&0x3) {
+        /* One frame */
+        case 0:
+            count = 1;
+            break;
+        /* Two CBR frames */
+        case 1:
+            count = 2;
+            cbr = 1;
+            if (!self_delimited) {
+                if (len&0x1)
+                    return OAC_INVALID_PACKET;
+                last_size = len/2;
+                /* If last_size doesn't fit in size[0], we'll catch it later */
+                size[0] = (oac_int16)last_size;
+            }
+            break;
+        /* Two VBR frames */
+        case 2:
+            count = 2;
+            bytes = parse_size(data, len, size);
             len -= bytes;
-            if (size[i]<0 || size[i] > len)
-               return OAC_INVALID_PACKET;
+            if (size[0] < 0 || size[0] > len)
+                return OAC_INVALID_PACKET;
             data += bytes;
-            last_size -= bytes+size[i];
-         }
-         if (last_size<0)
+            last_size = len - size[0];
+            break;
+        /* Multiple CBR/VBR frames (from 0 to 120 ms) */
+        default: /*case 3:*/
+            if (len < 1)
+                return OAC_INVALID_PACKET;
+            /* Number of frames encoded in bits 0 to 5 */
+            ch = *data++;
+            count = ch&0x3F;
+            if (count <= 0 || framesize*(oac_int32)count > 5760)
+                return OAC_INVALID_PACKET;
+            len--;
+            /* Padding flag is bit 6 */
+            if (ch&0x40) {
+                int p;
+                do {
+                    int tmp;
+                    if (len <= 0)
+                        return OAC_INVALID_PACKET;
+                    p = *data++;
+                    len--;
+                    tmp = p == 255 ? 254: p;
+                    len -= tmp;
+                    pad += tmp;
+                } while (p == 255);
+            }
+            if (len < 0)
+                return OAC_INVALID_PACKET;
+            /* VBR flag is bit 7 */
+            cbr = !(ch&0x80);
+            if (!cbr) {
+                /* VBR case */
+                last_size = len;
+                for (i = 0; i < count - 1; i++) {
+                    bytes = parse_size(data, len, size + i);
+                    len -= bytes;
+                    if (size[i] < 0 || size[i] > len)
+                        return OAC_INVALID_PACKET;
+                    data += bytes;
+                    last_size -= bytes + size[i];
+                }
+                if (last_size < 0)
+                    return OAC_INVALID_PACKET;
+            } else if (!self_delimited) {
+                /* CBR case */
+                last_size = len/count;
+                if (last_size*count != len)
+                    return OAC_INVALID_PACKET;
+                for (i = 0; i < count - 1; i++)
+                    size[i] = (oac_int16)last_size;
+            }
+            break;
+    }
+    /* Self-delimited framing has an extra size for the last frame. */
+    if (self_delimited) {
+        bytes = parse_size(data, len, size + count - 1);
+        len -= bytes;
+        if (size[count - 1] < 0 || size[count - 1] > len)
             return OAC_INVALID_PACKET;
-      } else if (!self_delimited)
-      {
-         /* CBR case */
-         last_size = len/count;
-         if (last_size*count!=len)
+        data += bytes;
+        /* For CBR packets, apply the size to all the frames. */
+        if (cbr) {
+            if (size[count - 1]*count > len)
+                return OAC_INVALID_PACKET;
+            for (i = 0; i < count - 1; i++)
+                size[i] = size[count - 1];
+        } else if (bytes + size[count - 1] > last_size)
             return OAC_INVALID_PACKET;
-         for (i=0;i<count-1;i++)
-            size[i] = (oac_int16)last_size;
-      }
-      break;
-   }
-   /* Self-delimited framing has an extra size for the last frame. */
-   if (self_delimited)
-   {
-      bytes = parse_size(data, len, size+count-1);
-      len -= bytes;
-      if (size[count-1]<0 || size[count-1] > len)
-         return OAC_INVALID_PACKET;
-      data += bytes;
-      /* For CBR packets, apply the size to all the frames. */
-      if (cbr)
-      {
-         if (size[count-1]*count > len)
+    } else {
+        /* Because it's not encoded explicitly, it's possible the size of the
+           last packet (or all the packets, for the CBR case) is larger than
+           1275. Reject them here.*/
+        if (last_size > 1275)
             return OAC_INVALID_PACKET;
-         for (i=0;i<count-1;i++)
-            size[i] = size[count-1];
-      } else if (bytes+size[count-1] > last_size)
-         return OAC_INVALID_PACKET;
-   } else
-   {
-      /* Because it's not encoded explicitly, it's possible the size of the
-         last packet (or all the packets, for the CBR case) is larger than
-         1275. Reject them here.*/
-      if (last_size > 1275)
-         return OAC_INVALID_PACKET;
-      size[count-1] = (oac_int16)last_size;
-   }
-
-   if (payload_offset)
-      *payload_offset = (int)(data-data0);
-
-   for (i=0;i<count;i++)
-   {
-      if (frames)
-         frames[i] = data;
-      data += size[i];
-   }
-
-   if (padding != NULL)
-   {
-      *padding = data;
-      *padding_len = pad;
-   }
-   if (packet_offset)
-      *packet_offset = pad+(oac_int32)(data-data0);
-
-   if (out_toc)
-      *out_toc = toc;
-
-   return count;
+        size[count - 1] = (oac_int16)last_size;
+    }
+
+    if (payload_offset)
+        *payload_offset = (int)(data - data0);
+
+    for (i = 0; i < count; i++) {
+        if (frames)
+            frames[i] = data;
+        data += size[i];
+    }
+
+    if (padding != NULL) {
+        *padding = data;
+        *padding_len = pad;
+    }
+    if (packet_offset)
+        *packet_offset = pad + (oac_int32)(data - data0);
+
+    if (out_toc)
+        *out_toc = toc;
+
+    return count;
 }
 
 int oac_packet_parse(const unsigned char *data, oac_int32 len,
-      unsigned char *out_toc, const unsigned char *frames[48],
-      oac_int16 size[48], int *payload_offset)
-{
-   return oac_packet_parse_impl(data, len, 0, out_toc,
+                     unsigned char *out_toc, const unsigned char *frames[48],
+                     oac_int16 size[48], int *payload_offset) {
+    return oac_packet_parse_impl(data, len, 0, out_toc,
                                  frames, size, payload_offset, NULL, NULL, NULL);
 }
diff --git a/src/oac_compare.c b/src/oac_compare.c
index 3ccdb7134..1017a6a3f 100644
--- a/src/oac_compare.c
+++ b/src/oac_compare.c
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -35,348 +35,347 @@
 #define OAC_COSF(_x)        ((float)cos(_x))
 #define OAC_SINF(_x)        ((float)sin(_x))
 
-static void *check_alloc(void *_ptr){
-  if(_ptr==NULL){
-    fprintf(stderr,"Out of memory.\n");
-    exit(EXIT_FAILURE);
-  }
-  return _ptr;
+static void *check_alloc(void *_ptr) {
+    if (_ptr == NULL) {
+        fprintf(stderr, "Out of memory.\n");
+        exit(EXIT_FAILURE);
+    }
+    return _ptr;
 }
 
-static void *oac_malloc(size_t _size){
-  return check_alloc(malloc(_size));
+static void *oac_malloc(size_t _size) {
+    return check_alloc(malloc(_size));
 }
 
-static void *oac_realloc(void *_ptr,size_t _size){
-  return check_alloc(realloc(_ptr,_size));
+static void *oac_realloc(void *_ptr, size_t _size) {
+    return check_alloc(realloc(_ptr, _size));
 }
 
-static size_t read_pcm16(float **_samples,FILE *_fin,int _nchannels){
-  unsigned char  buf[1024];
-  float         *samples;
-  size_t         nsamples;
-  size_t         csamples;
-  size_t         xi;
-  size_t         nread;
-  samples=NULL;
-  nsamples=csamples=0;
-  for(;;){
-    nread=fread(buf,2*_nchannels,1024/(2*_nchannels),_fin);
-    if(nread<=0)break;
-    if(nsamples+nread>csamples){
-      do csamples=csamples<<1|1;
-      while(nsamples+nread>csamples);
-      samples=(float *)oac_realloc(samples,
+static size_t read_pcm16(float **_samples, FILE *_fin, int _nchannels) {
+    unsigned char buf[1024];
+    float         *samples;
+    size_t nsamples;
+    size_t csamples;
+    size_t xi;
+    size_t nread;
+    samples = NULL;
+    nsamples = csamples = 0;
+    for (;;) {
+        nread = fread(buf, 2*_nchannels, 1024/(2*_nchannels), _fin);
+        if (nread <= 0) break;
+        if (nsamples + nread > csamples) {
+            do csamples = csamples<<1|1;
+            while (nsamples + nread > csamples);
+            samples = (float *)oac_realloc(samples,
        _nchannels*csamples*sizeof(*samples));
+        }
+        for (xi = 0; xi < nread; xi++) {
+            int ci;
+            for (ci = 0; ci < _nchannels; ci++) {
+                int s;
+                s = buf[2*(xi*_nchannels + ci) + 1]<<8|buf[2*(xi*_nchannels + ci)];
+                s = ((s&0xFFFF)^0x8000) - 0x8000;
+                samples[(nsamples + xi)*_nchannels + ci] = s;
+            }
+        }
+        nsamples += nread;
     }
-    for(xi=0;xi<nread;xi++){
-      int ci;
-      for(ci=0;ci<_nchannels;ci++){
-        int s;
-        s=buf[2*(xi*_nchannels+ci)+1]<<8|buf[2*(xi*_nchannels+ci)];
-        s=((s&0xFFFF)^0x8000)-0x8000;
-        samples[(nsamples+xi)*_nchannels+ci]=s;
-      }
-    }
-    nsamples+=nread;
-  }
-  *_samples=(float *)oac_realloc(samples,
+    *_samples = (float *)oac_realloc(samples,
    _nchannels*nsamples*sizeof(*samples));
-  return nsamples;
+    return nsamples;
 }
 
-static void band_energy(float *_out,float *_ps,const int *_bands,int _nbands,
- const float *_in,int _nchannels,size_t _nframes,int _window_sz,
- int _step,int _downsample){
-  float *window;
-  float *x;
-  float *c;
-  float *s;
-  size_t xi;
-  int    xj;
-  int    ps_sz;
-  window=(float *)oac_malloc((3+_nchannels)*_window_sz*sizeof(*window));
-  c=window+_window_sz;
-  s=c+_window_sz;
-  x=s+_window_sz;
-  ps_sz=_window_sz/2;
-  for(xj=0;xj<_window_sz;xj++){
-    window[xj]=0.5F-0.5F*OAC_COSF((2*OAC_PI/(_window_sz-1))*xj);
-  }
-  for(xj=0;xj<_window_sz;xj++){
-    c[xj]=OAC_COSF((2*OAC_PI/_window_sz)*xj);
-  }
-  for(xj=0;xj<_window_sz;xj++){
-    s[xj]=OAC_SINF((2*OAC_PI/_window_sz)*xj);
-  }
-  for(xi=0;xi<_nframes;xi++){
-    int ci;
-    int xk;
-    int bi;
-    for(ci=0;ci<_nchannels;ci++){
-      for(xk=0;xk<_window_sz;xk++){
-        x[ci*_window_sz+xk]=window[xk]*_in[(xi*_step+xk)*_nchannels+ci];
-      }
+static void band_energy(float *_out, float *_ps, const int *_bands, int _nbands,
+                        const float *_in, int _nchannels, size_t _nframes, int _window_sz,
+                        int _step, int _downsample) {
+    float *window;
+    float *x;
+    float *c;
+    float *s;
+    size_t xi;
+    int xj;
+    int ps_sz;
+    window = (float *)oac_malloc((3 + _nchannels)*_window_sz*sizeof(*window));
+    c = window + _window_sz;
+    s = c + _window_sz;
+    x = s + _window_sz;
+    ps_sz = _window_sz/2;
+    for (xj = 0; xj < _window_sz; xj++) {
+        window[xj] = 0.5F - 0.5F*OAC_COSF((2*OAC_PI/(_window_sz - 1))*xj);
     }
-    for(bi=xj=0;bi<_nbands;bi++){
-      float p[2]={0};
-      for(;xj<_bands[bi+1];xj++){
-        for(ci=0;ci<_nchannels;ci++){
-          float re;
-          float im;
-          int   ti;
-          ti=0;
-          re=im=0;
-          for(xk=0;xk<_window_sz;xk++){
-            re+=c[ti]*x[ci*_window_sz+xk];
-            im-=s[ti]*x[ci*_window_sz+xk];
-            ti+=xj;
-            if(ti>=_window_sz)ti-=_window_sz;
-          }
-          re*=_downsample;
-          im*=_downsample;
-          _ps[(xi*ps_sz+xj)*_nchannels+ci]=re*re+im*im+100000;
-          p[ci]+=_ps[(xi*ps_sz+xj)*_nchannels+ci];
+    for (xj = 0; xj < _window_sz; xj++) {
+        c[xj] = OAC_COSF((2*OAC_PI/_window_sz)*xj);
+    }
+    for (xj = 0; xj < _window_sz; xj++) {
+        s[xj] = OAC_SINF((2*OAC_PI/_window_sz)*xj);
+    }
+    for (xi = 0; xi < _nframes; xi++) {
+        int ci;
+        int xk;
+        int bi;
+        for (ci = 0; ci < _nchannels; ci++) {
+            for (xk = 0; xk < _window_sz; xk++) {
+                x[ci*_window_sz + xk] = window[xk]*_in[(xi*_step + xk)*_nchannels + ci];
+            }
         }
-      }
-      if(_out){
-        _out[(xi*_nbands+bi)*_nchannels]=p[0]/(_bands[bi+1]-_bands[bi]);
-        if(_nchannels==2){
-          _out[(xi*_nbands+bi)*_nchannels+1]=p[1]/(_bands[bi+1]-_bands[bi]);
+        for (bi = xj = 0; bi < _nbands; bi++) {
+            float p[2] = {0};
+            for (; xj < _bands[bi + 1]; xj++) {
+                for (ci = 0; ci < _nchannels; ci++) {
+                    float re;
+                    float im;
+                    int ti;
+                    ti = 0;
+                    re = im = 0;
+                    for (xk = 0; xk < _window_sz; xk++) {
+                        re += c[ti]*x[ci*_window_sz + xk];
+                        im -= s[ti]*x[ci*_window_sz + xk];
+                        ti += xj;
+                        if (ti >= _window_sz) ti -= _window_sz;
+                    }
+                    re *= _downsample;
+                    im *= _downsample;
+                    _ps[(xi*ps_sz + xj)*_nchannels + ci] = re*re + im*im + 100000;
+                    p[ci] += _ps[(xi*ps_sz + xj)*_nchannels + ci];
+                }
+            }
+            if (_out) {
+                _out[(xi*_nbands + bi)*_nchannels] = p[0]/(_bands[bi + 1] - _bands[bi]);
+                if (_nchannels == 2) {
+                    _out[(xi*_nbands + bi)*_nchannels + 1] = p[1]/(_bands[bi + 1] - _bands[bi]);
+                }
+            }
         }
-      }
     }
-  }
-  free(window);
+    free(window);
 }
 
 #define NBANDS (21)
 #define NFREQS (240)
 
 /*Bands on which we compute the pseudo-NMR (Bark-derived
-  CELT bands).*/
-static const int BANDS[NBANDS+1]={
-  0,2,4,6,8,10,12,14,16,20,24,28,32,40,48,56,68,80,96,120,156,200
+   CELT bands).*/
+static const int BANDS[NBANDS + 1] = {
+    0, 2, 4, 6, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56, 68, 80, 96, 120, 156, 200
 };
 
 #define TEST_WIN_SIZE (480)
 #define TEST_WIN_STEP (120)
 
-int main(int _argc,const char **_argv){
-  FILE    *fin1;
-  FILE    *fin2;
-  float   *x;
-  float   *y;
-  float   *xb;
-  float   *X;
-  float   *Y;
-  double    err;
-  float    Q;
-  size_t   xlength;
-  size_t   ylength;
-  size_t   nframes;
-  size_t   xi;
-  int      ci;
-  int      xj;
-  int      bi;
-  int      nchannels;
-  unsigned rate;
-  int      downsample;
-  int      ybands;
-  int      yfreqs;
-  int      max_compare;
-  if(_argc<3||_argc>6){
-    fprintf(stderr,"Usage: %s [-s] [-r rate2] <file1.sw> <file2.sw>\n",
+int main(int _argc, const char **_argv) {
+    FILE    *fin1;
+    FILE    *fin2;
+    float   *x;
+    float   *y;
+    float   *xb;
+    float   *X;
+    float   *Y;
+    double err;
+    float Q;
+    size_t xlength;
+    size_t ylength;
+    size_t nframes;
+    size_t xi;
+    int ci;
+    int xj;
+    int bi;
+    int nchannels;
+    unsigned rate;
+    int downsample;
+    int ybands;
+    int yfreqs;
+    int max_compare;
+    if (_argc < 3 || _argc > 6) {
+        fprintf(stderr, "Usage: %s [-s] [-r rate2] <file1.sw> <file2.sw>\n",
      _argv[0]);
-    return EXIT_FAILURE;
-  }
-  nchannels=1;
-  if(strcmp(_argv[1],"-s")==0){
-    nchannels=2;
-    _argv++;
-  }
-  rate=48000;
-  ybands=NBANDS;
-  yfreqs=NFREQS;
-  downsample=1;
-  if(strcmp(_argv[1],"-r")==0){
-    rate=atoi(_argv[2]);
-    if(rate!=8000&&rate!=12000&&rate!=16000&&rate!=24000&&rate!=48000){
-      fprintf(stderr,
+        return EXIT_FAILURE;
+    }
+    nchannels = 1;
+    if (strcmp(_argv[1], "-s") == 0) {
+        nchannels = 2;
+        _argv++;
+    }
+    rate = 48000;
+    ybands = NBANDS;
+    yfreqs = NFREQS;
+    downsample = 1;
+    if (strcmp(_argv[1], "-r") == 0) {
+        rate = atoi(_argv[2]);
+        if (rate != 8000 && rate != 12000 && rate != 16000 && rate != 24000 && rate != 48000) {
+            fprintf(stderr,
        "Sampling rate must be 8000, 12000, 16000, 24000, or 48000\n");
-      return EXIT_FAILURE;
+            return EXIT_FAILURE;
+        }
+        downsample = 48000/rate;
+        switch (rate) {
+            case  8000: ybands = 13; break;
+            case 12000: ybands = 15; break;
+            case 16000: ybands = 17; break;
+            case 24000: ybands = 19; break;
+        }
+        yfreqs = NFREQS/downsample;
+        _argv += 2;
     }
-    downsample=48000/rate;
-    switch(rate){
-      case  8000:ybands=13;break;
-      case 12000:ybands=15;break;
-      case 16000:ybands=17;break;
-      case 24000:ybands=19;break;
+    fin1 = fopen(_argv[1], "rb");
+    if (fin1 == NULL) {
+        fprintf(stderr, "Error opening '%s'.\n", _argv[1]);
+        return EXIT_FAILURE;
     }
-    yfreqs=NFREQS/downsample;
-    _argv+=2;
-  }
-  fin1=fopen(_argv[1],"rb");
-  if(fin1==NULL){
-    fprintf(stderr,"Error opening '%s'.\n",_argv[1]);
-    return EXIT_FAILURE;
-  }
-  fin2=fopen(_argv[2],"rb");
-  if(fin2==NULL){
-    fprintf(stderr,"Error opening '%s'.\n",_argv[2]);
-    fclose(fin1);
-    return EXIT_FAILURE;
-  }
-  /*Read in the data and allocate scratch space.*/
-  xlength=read_pcm16(&x,fin1,2);
-  if(nchannels==1){
-    for(xi=0;xi<xlength;xi++)x[xi]=.5*(x[2*xi]+x[2*xi+1]);
-  }
-  fclose(fin1);
-  ylength=read_pcm16(&y,fin2,nchannels);
-  fclose(fin2);
-  if(xlength!=ylength*downsample){
-    fprintf(stderr,"Sample counts do not match (%lu!=%lu).\n",
-     (unsigned long)xlength,(unsigned long)ylength*downsample);
-    return EXIT_FAILURE;
-  }
-  if(xlength<TEST_WIN_SIZE){
-    fprintf(stderr,"Insufficient sample data (%lu<%i).\n",
-     (unsigned long)xlength,TEST_WIN_SIZE);
-    return EXIT_FAILURE;
-  }
-  nframes=(xlength-TEST_WIN_SIZE+TEST_WIN_STEP)/TEST_WIN_STEP;
-  xb=(float *)oac_malloc(nframes*NBANDS*nchannels*sizeof(*xb));
-  X=(float *)oac_malloc(nframes*NFREQS*nchannels*sizeof(*X));
-  Y=(float *)oac_malloc(nframes*yfreqs*nchannels*sizeof(*Y));
-  /*Compute the per-band spectral energy of the original signal
-     and the error.*/
-  band_energy(xb,X,BANDS,NBANDS,x,nchannels,nframes,
-   TEST_WIN_SIZE,TEST_WIN_STEP,1);
-  free(x);
-  band_energy(NULL,Y,BANDS,ybands,y,nchannels,nframes,
-   TEST_WIN_SIZE/downsample,TEST_WIN_STEP/downsample,downsample);
-  free(y);
-  for(xi=0;xi<nframes;xi++){
-    /*Frequency masking (low to high): 10 dB/Bark slope.*/
-    for(bi=1;bi<NBANDS;bi++){
-      for(ci=0;ci<nchannels;ci++){
-        xb[(xi*NBANDS+bi)*nchannels+ci]+=
-         0.1F*xb[(xi*NBANDS+bi-1)*nchannels+ci];
-      }
+    fin2 = fopen(_argv[2], "rb");
+    if (fin2 == NULL) {
+        fprintf(stderr, "Error opening '%s'.\n", _argv[2]);
+        fclose(fin1);
+        return EXIT_FAILURE;
     }
-    /*Frequency masking (high to low): 15 dB/Bark slope.*/
-    for(bi=NBANDS-1;bi-->0;){
-      for(ci=0;ci<nchannels;ci++){
-        xb[(xi*NBANDS+bi)*nchannels+ci]+=
-         0.03F*xb[(xi*NBANDS+bi+1)*nchannels+ci];
-      }
+    /*Read in the data and allocate scratch space.*/
+    xlength = read_pcm16(&x, fin1, 2);
+    if (nchannels == 1) {
+        for (xi = 0; xi < xlength; xi++) x[xi] = .5*(x[2*xi] + x[2*xi + 1]);
     }
-    if(xi>0){
-      /*Temporal masking: -3 dB/2.5ms slope.*/
-      for(bi=0;bi<NBANDS;bi++){
-        for(ci=0;ci<nchannels;ci++){
-          xb[(xi*NBANDS+bi)*nchannels+ci]+=
-           0.5F*xb[((xi-1)*NBANDS+bi)*nchannels+ci];
-        }
-      }
+    fclose(fin1);
+    ylength = read_pcm16(&y, fin2, nchannels);
+    fclose(fin2);
+    if (xlength != ylength*downsample) {
+        fprintf(stderr, "Sample counts do not match (%lu!=%lu).\n",
+            (unsigned long)xlength, (unsigned long)ylength*downsample);
+        return EXIT_FAILURE;
     }
-    /* Allowing some cross-talk */
-    if(nchannels==2){
-      for(bi=0;bi<NBANDS;bi++){
-        float l,r;
-        l=xb[(xi*NBANDS+bi)*nchannels+0];
-        r=xb[(xi*NBANDS+bi)*nchannels+1];
-        xb[(xi*NBANDS+bi)*nchannels+0]+=0.01F*r;
-        xb[(xi*NBANDS+bi)*nchannels+1]+=0.01F*l;
-      }
+    if (xlength < TEST_WIN_SIZE) {
+        fprintf(stderr, "Insufficient sample data (%lu<%i).\n",
+            (unsigned long)xlength, TEST_WIN_SIZE);
+        return EXIT_FAILURE;
     }
+    nframes = (xlength - TEST_WIN_SIZE + TEST_WIN_STEP)/TEST_WIN_STEP;
+    xb = (float *)oac_malloc(nframes*NBANDS*nchannels*sizeof(*xb));
+    X = (float *)oac_malloc(nframes*NFREQS*nchannels*sizeof(*X));
+    Y = (float *)oac_malloc(nframes*yfreqs*nchannels*sizeof(*Y));
+    /*Compute the per-band spectral energy of the original signal
+       and the error.*/
+    band_energy(xb, X, BANDS, NBANDS, x, nchannels, nframes,
+   TEST_WIN_SIZE, TEST_WIN_STEP, 1);
+    free(x);
+    band_energy(NULL, Y, BANDS, ybands, y, nchannels, nframes,
+   TEST_WIN_SIZE/downsample, TEST_WIN_STEP/downsample, downsample);
+    free(y);
+    for (xi = 0; xi < nframes; xi++) {
+        /*Frequency masking (low to high): 10 dB/Bark slope.*/
+        for (bi = 1; bi < NBANDS; bi++) {
+            for (ci = 0; ci < nchannels; ci++) {
+                xb[(xi*NBANDS + bi)*nchannels + ci] +=
+                    0.1F*xb[(xi*NBANDS + bi - 1)*nchannels + ci];
+            }
+        }
+        /*Frequency masking (high to low): 15 dB/Bark slope.*/
+        for (bi = NBANDS - 1; bi-- > 0;) {
+            for (ci = 0; ci < nchannels; ci++) {
+                xb[(xi*NBANDS + bi)*nchannels + ci] +=
+                    0.03F*xb[(xi*NBANDS + bi + 1)*nchannels + ci];
+            }
+        }
+        if (xi > 0) {
+            /*Temporal masking: -3 dB/2.5ms slope.*/
+            for (bi = 0; bi < NBANDS; bi++) {
+                for (ci = 0; ci < nchannels; ci++) {
+                    xb[(xi*NBANDS + bi)*nchannels + ci] +=
+                        0.5F*xb[((xi - 1)*NBANDS + bi)*nchannels + ci];
+                }
+            }
+        }
+        /* Allowing some cross-talk */
+        if (nchannels == 2) {
+            for (bi = 0; bi < NBANDS; bi++) {
+                float l, r;
+                l = xb[(xi*NBANDS + bi)*nchannels + 0];
+                r = xb[(xi*NBANDS + bi)*nchannels + 1];
+                xb[(xi*NBANDS + bi)*nchannels + 0] += 0.01F*r;
+                xb[(xi*NBANDS + bi)*nchannels + 1] += 0.01F*l;
+            }
+        }
 
-    /* Apply masking */
-    for(bi=0;bi<ybands;bi++){
-      for(xj=BANDS[bi];xj<BANDS[bi+1];xj++){
-        for(ci=0;ci<nchannels;ci++){
-          X[(xi*NFREQS+xj)*nchannels+ci]+=
-           0.1F*xb[(xi*NBANDS+bi)*nchannels+ci];
-          Y[(xi*yfreqs+xj)*nchannels+ci]+=
-           0.1F*xb[(xi*NBANDS+bi)*nchannels+ci];
+        /* Apply masking */
+        for (bi = 0; bi < ybands; bi++) {
+            for (xj = BANDS[bi]; xj < BANDS[bi + 1]; xj++) {
+                for (ci = 0; ci < nchannels; ci++) {
+                    X[(xi*NFREQS + xj)*nchannels + ci] +=
+                        0.1F*xb[(xi*NBANDS + bi)*nchannels + ci];
+                    Y[(xi*yfreqs + xj)*nchannels + ci] +=
+                        0.1F*xb[(xi*NBANDS + bi)*nchannels + ci];
+                }
+            }
         }
-      }
     }
-  }
 
-  /* Average of consecutive frames to make comparison slightly less sensitive */
-  for(bi=0;bi<ybands;bi++){
-    for(xj=BANDS[bi];xj<BANDS[bi+1];xj++){
-      for(ci=0;ci<nchannels;ci++){
-         float xtmp;
-         float ytmp;
-         xtmp = X[xj*nchannels+ci];
-         ytmp = Y[xj*nchannels+ci];
-         for(xi=1;xi<nframes;xi++){
-           float xtmp2;
-           float ytmp2;
-           xtmp2 = X[(xi*NFREQS+xj)*nchannels+ci];
-           ytmp2 = Y[(xi*yfreqs+xj)*nchannels+ci];
-           X[(xi*NFREQS+xj)*nchannels+ci] += xtmp;
-           Y[(xi*yfreqs+xj)*nchannels+ci] += ytmp;
-           xtmp = xtmp2;
-           ytmp = ytmp2;
-         }
-      }
+    /* Average of consecutive frames to make comparison slightly less sensitive */
+    for (bi = 0; bi < ybands; bi++) {
+        for (xj = BANDS[bi]; xj < BANDS[bi + 1]; xj++) {
+            for (ci = 0; ci < nchannels; ci++) {
+                float xtmp;
+                float ytmp;
+                xtmp = X[xj*nchannels + ci];
+                ytmp = Y[xj*nchannels + ci];
+                for (xi = 1; xi < nframes; xi++) {
+                    float xtmp2;
+                    float ytmp2;
+                    xtmp2 = X[(xi*NFREQS + xj)*nchannels + ci];
+                    ytmp2 = Y[(xi*yfreqs + xj)*nchannels + ci];
+                    X[(xi*NFREQS + xj)*nchannels + ci] += xtmp;
+                    Y[(xi*yfreqs + xj)*nchannels + ci] += ytmp;
+                    xtmp = xtmp2;
+                    ytmp = ytmp2;
+                }
+            }
+        }
     }
-  }
 
-  /*If working at a lower sampling rate, don't take into account the last
-     300 Hz to allow for different transition bands.
-    For 12 kHz, we don't skip anything, because the last band already skips
-     400 Hz.*/
-  if(rate==48000)max_compare=BANDS[NBANDS];
-  else if(rate==12000)max_compare=BANDS[ybands];
-  else max_compare=BANDS[ybands]-3;
-  err=0;
-  for(xi=0;xi<nframes;xi++){
-    double Ef;
-    Ef=0;
-    for(bi=0;bi<ybands;bi++){
-      double Eb;
-      Eb=0;
-      for(xj=BANDS[bi];xj<BANDS[bi+1]&&xj<max_compare;xj++){
-        for(ci=0;ci<nchannels;ci++){
-          float re;
-          float im;
-          re=Y[(xi*yfreqs+xj)*nchannels+ci]/X[(xi*NFREQS+xj)*nchannels+ci];
-          im=re-log(re)-1;
-          /*Make comparison less sensitive around the SILK/CELT cross-over to
-            allow for mode freedom in the filters.*/
-          if(xj>=79&&xj<=81)im*=0.1F;
-          if(xj==80)im*=0.1F;
-          Eb+=im;
+    /*If working at a lower sampling rate, don't take into account the last
+       300 Hz to allow for different transition bands.
+       For 12 kHz, we don't skip anything, because the last band already skips
+       400 Hz.*/
+    if (rate == 48000) max_compare = BANDS[NBANDS];
+    else if (rate == 12000) max_compare = BANDS[ybands];
+    else max_compare = BANDS[ybands] - 3;
+    err = 0;
+    for (xi = 0; xi < nframes; xi++) {
+        double Ef;
+        Ef = 0;
+        for (bi = 0; bi < ybands; bi++) {
+            double Eb;
+            Eb = 0;
+            for (xj = BANDS[bi]; xj < BANDS[bi + 1] && xj < max_compare; xj++) {
+                for (ci = 0; ci < nchannels; ci++) {
+                    float re;
+                    float im;
+                    re = Y[(xi*yfreqs + xj)*nchannels + ci]/X[(xi*NFREQS + xj)*nchannels + ci];
+                    im = re - log(re) - 1;
+                    /*Make comparison less sensitive around the SILK/CELT cross-over to
+                       allow for mode freedom in the filters.*/
+                    if (xj >= 79 && xj <= 81) im *= 0.1F;
+                    if (xj == 80) im *= 0.1F;
+                    Eb += im;
+                }
+            }
+            Eb /= (BANDS[bi + 1] - BANDS[bi])*nchannels;
+            Ef += Eb*Eb;
         }
-      }
-      Eb /= (BANDS[bi+1]-BANDS[bi])*nchannels;
-      Ef += Eb*Eb;
+        /*Using a fixed normalization value means we're willing to accept slightly
+           lower quality for lower sampling rates.*/
+        Ef /= NBANDS;
+        Ef *= Ef;
+        err += Ef*Ef;
+    }
+    free(xb);
+    free(X);
+    free(Y);
+    err = pow(err/nframes, 1.0/16);
+    Q = 100*(1 - 0.5*log(1 + err)/log(1.13));
+    if (Q < 0) {
+        fprintf(stderr, "Test vector FAILS\n");
+        fprintf(stderr, "Internal weighted error is %f\n", err);
+        return EXIT_FAILURE;
+    } else   {
+        fprintf(stderr, "Test vector PASSES\n");
+        fprintf(stderr,
+     "Oac quality metric: %.1f %% (internal weighted error is %f)\n", Q, err);
+        return EXIT_SUCCESS;
     }
-    /*Using a fixed normalization value means we're willing to accept slightly
-       lower quality for lower sampling rates.*/
-    Ef/=NBANDS;
-    Ef*=Ef;
-    err+=Ef*Ef;
-  }
-  free(xb);
-  free(X);
-  free(Y);
-  err=pow(err/nframes,1.0/16);
-  Q=100*(1-0.5*log(1+err)/log(1.13));
-  if(Q<0){
-    fprintf(stderr,"Test vector FAILS\n");
-    fprintf(stderr,"Internal weighted error is %f\n",err);
-    return EXIT_FAILURE;
-  }
-  else{
-    fprintf(stderr,"Test vector PASSES\n");
-    fprintf(stderr,
-     "Oac quality metric: %.1f %% (internal weighted error is %f)\n",Q,err);
-    return EXIT_SUCCESS;
-  }
 }
diff --git a/src/oac_decoder.c b/src/oac_decoder.c
index 9e3c61bdc..96cd4fc7d 100644
--- a/src/oac_decoder.c
+++ b/src/oac_decoder.c
@@ -24,14 +24,15 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
 #ifndef OAC_BUILD
-# error "OAC_BUILD _MUST_ be defined to build Oac. This probably means you need other defines as well, as in a config.h. See the included build files for details."
+# error \
+    "OAC_BUILD _MUST_ be defined to build Oac. This probably means you need other defines as well, as in a config.h. See the included build files for details."
 #endif
 
 #if defined(__GNUC__) && (__GNUC__ >= 2) && !defined(__OPTIMIZE__) && !defined(OAC_WILL_BE_SLOW)
@@ -54,878 +55,829 @@
 #include "cpu_support.h"
 
 #ifdef ENABLE_DEEP_PLC
-#include "dred_rdovae_dec_data.h"
-#include "dred_rdovae_dec.h"
+# include "dred_rdovae_dec_data.h"
+# include "dred_rdovae_dec.h"
 #endif
 
 #ifdef ENABLE_OSCE
-#include "osce.h"
+# include "osce.h"
 #endif
 
 struct OacDecoder {
-   int          celt_dec_offset;
-   int          silk_dec_offset;
-   int          channels;
-   oac_int32   Fs;          /** Sampling rate (at the API level) */
-   silk_DecControlStruct DecControl;
-   int          decode_gain;
-   int          complexity;
-   int          ignore_extensions;
-   int          arch;
+    int celt_dec_offset;
+    int silk_dec_offset;
+    int channels;
+    oac_int32 Fs;           /** Sampling rate (at the API level) */
+    silk_DecControlStruct DecControl;
+    int decode_gain;
+    int complexity;
+    int ignore_extensions;
+    int arch;
 #ifdef ENABLE_DEEP_PLC
     LPCNetPLCState lpcnet;
 #endif
 
-   /* Everything beyond this point gets cleared on a reset */
+    /* Everything beyond this point gets cleared on a reset */
 #define OAC_DECODER_RESET_START stream_channels
-   int          stream_channels;
-
-   int          bandwidth;
-   int          mode;
-   int          prev_mode;
-   int          frame_size;
-   int          prev_redundancy;
-   int          last_packet_duration;
+    int stream_channels;
+
+    int bandwidth;
+    int mode;
+    int prev_mode;
+    int frame_size;
+    int prev_redundancy;
+    int last_packet_duration;
 #ifndef FIXED_POINT
-   oac_val16   softclip_mem[2];
+    oac_val16 softclip_mem[2];
 #endif
 
-   oac_uint32  rangeFinal;
+    oac_uint32 rangeFinal;
 };
 
 #if defined(ENABLE_HARDENING) || defined(ENABLE_ASSERTIONS)
-static void validate_oac_decoder(OacDecoder *st)
-{
-   celt_assert(st->channels == 1 || st->channels == 2);
-#ifdef ENABLE_QEXT
-   celt_assert(st->Fs == 96000 || st->Fs == 48000 || st->Fs == 24000 || st->Fs == 16000 || st->Fs == 12000 || st->Fs == 8000);
-#else
-   celt_assert(st->Fs == 48000 || st->Fs == 24000 || st->Fs == 16000 || st->Fs == 12000 || st->Fs == 8000);
-#endif
-   celt_assert(st->DecControl.API_sampleRate == st->Fs);
-   celt_assert(st->DecControl.internalSampleRate == 0 || st->DecControl.internalSampleRate == 16000 || st->DecControl.internalSampleRate == 12000 || st->DecControl.internalSampleRate == 8000);
-   celt_assert(st->DecControl.nChannelsAPI == st->channels);
-   celt_assert(st->DecControl.nChannelsInternal == 0 || st->DecControl.nChannelsInternal == 1 || st->DecControl.nChannelsInternal == 2);
-   celt_assert(st->DecControl.payloadSize_ms == 0 || st->DecControl.payloadSize_ms == 10 || st->DecControl.payloadSize_ms == 20 || st->DecControl.payloadSize_ms == 40 || st->DecControl.payloadSize_ms == 60);
-#ifdef OAC_ARCHMASK
-   celt_assert(st->arch >= 0);
-   celt_assert(st->arch <= OAC_ARCHMASK);
-#endif
-   celt_assert(st->stream_channels == 1 || st->stream_channels == 2);
+static void validate_oac_decoder(OacDecoder *st) {
+    celt_assert(st->channels == 1 || st->channels == 2);
+# ifdef ENABLE_QEXT
+    celt_assert(st->Fs == 96000 || st->Fs == 48000 || st->Fs == 24000 || st->Fs == 16000 || st->Fs == 12000
+        || st->Fs == 8000);
+# else
+    celt_assert(st->Fs == 48000 || st->Fs == 24000 || st->Fs == 16000 || st->Fs == 12000 || st->Fs == 8000);
+# endif
+    celt_assert(st->DecControl.API_sampleRate == st->Fs);
+    celt_assert(st->DecControl.internalSampleRate == 0 || st->DecControl.internalSampleRate == 16000
+        || st->DecControl.internalSampleRate == 12000 || st->DecControl.internalSampleRate == 8000);
+    celt_assert(st->DecControl.nChannelsAPI == st->channels);
+    celt_assert(st->DecControl.nChannelsInternal == 0 || st->DecControl.nChannelsInternal == 1
+        || st->DecControl.nChannelsInternal == 2);
+    celt_assert(st->DecControl.payloadSize_ms == 0 || st->DecControl.payloadSize_ms == 10
+        || st->DecControl.payloadSize_ms == 20 || st->DecControl.payloadSize_ms == 40
+        || st->DecControl.payloadSize_ms == 60);
+# ifdef OAC_ARCHMASK
+    celt_assert(st->arch >= 0);
+    celt_assert(st->arch <= OAC_ARCHMASK);
+# endif
+    celt_assert(st->stream_channels == 1 || st->stream_channels == 2);
 }
-#define VALIDATE_OAC_DECODER(st) validate_oac_decoder(st)
+# define VALIDATE_OAC_DECODER(st) validate_oac_decoder(st)
 #else
-#define VALIDATE_OAC_DECODER(st)
+# define VALIDATE_OAC_DECODER(st)
 #endif
 
-int oac_decoder_get_size(int channels)
-{
-   int silkDecSizeBytes, celtDecSizeBytes;
-   int ret;
-   if (channels<1 || channels > 2)
-      return 0;
-   ret = silk_Get_Decoder_Size( &silkDecSizeBytes );
-   if(ret)
-      return 0;
-   silkDecSizeBytes = align(silkDecSizeBytes);
-   celtDecSizeBytes = celt_decoder_get_size(channels);
-   return align(sizeof(OacDecoder))+silkDecSizeBytes+celtDecSizeBytes;
+int oac_decoder_get_size(int channels) {
+    int silkDecSizeBytes, celtDecSizeBytes;
+    int ret;
+    if (channels < 1 || channels > 2)
+        return 0;
+    ret = silk_Get_Decoder_Size( &silkDecSizeBytes );
+    if (ret)
+        return 0;
+    silkDecSizeBytes = align(silkDecSizeBytes);
+    celtDecSizeBytes = celt_decoder_get_size(channels);
+    return align(sizeof(OacDecoder)) + silkDecSizeBytes + celtDecSizeBytes;
 }
 
-int oac_decoder_init(OacDecoder *st, oac_int32 Fs, int channels)
-{
-   void *silk_dec;
-   CELTDecoder *celt_dec;
-   int ret, silkDecSizeBytes;
+int oac_decoder_init(OacDecoder *st, oac_int32 Fs, int channels) {
+    void *silk_dec;
+    CELTDecoder *celt_dec;
+    int ret, silkDecSizeBytes;
 
-   if ((Fs!=48000&&Fs!=24000&&Fs!=16000&&Fs!=12000&&Fs!=8000
+    if ((Fs != 48000 && Fs != 24000 && Fs != 16000 && Fs != 12000 && Fs != 8000
 #ifdef ENABLE_QEXT
-         &&Fs!=96000
+         && Fs != 96000
 #endif
          )
-    || (channels!=1&&channels!=2))
-      return OAC_BAD_ARG;
-
-   OAC_CLEAR((char*)st, oac_decoder_get_size(channels));
-   /* Initialize SILK decoder */
-   ret = silk_Get_Decoder_Size(&silkDecSizeBytes);
-   if (ret)
-      return OAC_INTERNAL_ERROR;
-
-   silkDecSizeBytes = align(silkDecSizeBytes);
-   st->silk_dec_offset = align(sizeof(OacDecoder));
-   st->celt_dec_offset = st->silk_dec_offset+silkDecSizeBytes;
-   silk_dec = (char*)st+st->silk_dec_offset;
-   celt_dec = (CELTDecoder*)((char*)st+st->celt_dec_offset);
-   st->stream_channels = st->channels = channels;
-   st->complexity = 0;
-
-   st->Fs = Fs;
-   st->DecControl.API_sampleRate = st->Fs;
-   st->DecControl.nChannelsAPI      = st->channels;
-
-   /* Reset decoder */
-   ret = silk_InitDecoder( silk_dec );
-   if(ret)return OAC_INTERNAL_ERROR;
-
-   /* Initialize CELT decoder */
-   ret = celt_decoder_init(celt_dec, Fs, channels);
-   if(ret!=OAC_OK)return OAC_INTERNAL_ERROR;
-
-   celt_decoder_ctl(celt_dec, CELT_SET_SIGNALLING(0));
-
-   st->prev_mode = 0;
-   st->frame_size = Fs/400;
+        || (channels != 1 && channels != 2))
+        return OAC_BAD_ARG;
+
+    OAC_CLEAR((char*)st, oac_decoder_get_size(channels));
+    /* Initialize SILK decoder */
+    ret = silk_Get_Decoder_Size(&silkDecSizeBytes);
+    if (ret)
+        return OAC_INTERNAL_ERROR;
+
+    silkDecSizeBytes = align(silkDecSizeBytes);
+    st->silk_dec_offset = align(sizeof(OacDecoder));
+    st->celt_dec_offset = st->silk_dec_offset + silkDecSizeBytes;
+    silk_dec = (char*)st + st->silk_dec_offset;
+    celt_dec = (CELTDecoder*)((char*)st + st->celt_dec_offset);
+    st->stream_channels = st->channels = channels;
+    st->complexity = 0;
+
+    st->Fs = Fs;
+    st->DecControl.API_sampleRate = st->Fs;
+    st->DecControl.nChannelsAPI      = st->channels;
+
+    /* Reset decoder */
+    ret = silk_InitDecoder( silk_dec );
+    if (ret) return OAC_INTERNAL_ERROR;
+
+    /* Initialize CELT decoder */
+    ret = celt_decoder_init(celt_dec, Fs, channels);
+    if (ret != OAC_OK) return OAC_INTERNAL_ERROR;
+
+    celt_decoder_ctl(celt_dec, CELT_SET_SIGNALLING(0));
+
+    st->prev_mode = 0;
+    st->frame_size = Fs/400;
 #ifdef ENABLE_DEEP_PLC
     lpcnet_plc_init( &st->lpcnet);
 #endif
-   st->arch = oac_select_arch();
-   return OAC_OK;
+    st->arch = oac_select_arch();
+    return OAC_OK;
 }
 
-OacDecoder *oac_decoder_create(oac_int32 Fs, int channels, int *error)
-{
-   int ret;
-   OacDecoder *st;
-   if ((Fs!=48000&&Fs!=24000&&Fs!=16000&&Fs!=12000&&Fs!=8000
+OacDecoder *oac_decoder_create(oac_int32 Fs, int channels, int *error) {
+    int ret;
+    OacDecoder *st;
+    if ((Fs != 48000 && Fs != 24000 && Fs != 16000 && Fs != 12000 && Fs != 8000
 #ifdef ENABLE_QEXT
-         &&Fs!=96000
+         && Fs != 96000
 #endif
          )
-    || (channels!=1&&channels!=2))
-   {
-      if (error)
-         *error = OAC_BAD_ARG;
-      return NULL;
-   }
-   st = (OacDecoder *)oac_alloc(oac_decoder_get_size(channels));
-   if (st == NULL)
-   {
-      if (error)
-         *error = OAC_ALLOC_FAIL;
-      return NULL;
-   }
-   ret = oac_decoder_init(st, Fs, channels);
-   if (error)
-      *error = ret;
-   if (ret != OAC_OK)
-   {
-      oac_free(st);
-      st = NULL;
-   }
-   return st;
+        || (channels != 1 && channels != 2)) {
+        if (error)
+            *error = OAC_BAD_ARG;
+        return NULL;
+    }
+    st = (OacDecoder *)oac_alloc(oac_decoder_get_size(channels));
+    if (st == NULL) {
+        if (error)
+            *error = OAC_ALLOC_FAIL;
+        return NULL;
+    }
+    ret = oac_decoder_init(st, Fs, channels);
+    if (error)
+        *error = ret;
+    if (ret != OAC_OK) {
+        oac_free(st);
+        st = NULL;
+    }
+    return st;
 }
 
 static void smooth_fade(const oac_res *in1, const oac_res *in2,
-      oac_res *out, int overlap, int channels,
-      const celt_coef *window, oac_int32 Fs)
-{
-   int i, c;
-   int inc = 48000/Fs;
-   for (c=0;c<channels;c++)
-   {
-      for (i=0;i<overlap;i++)
-      {
-         celt_coef w = MULT_COEF(window[i*inc], window[i*inc]);
-         out[i*channels+c] = ADD32(MULT_COEF_32(w,in2[i*channels+c]),
-                                   MULT_COEF_32(COEF_ONE-w, in1[i*channels+c]));
-      }
-   }
+                        oac_res *out, int overlap, int channels,
+                        const celt_coef *window, oac_int32 Fs) {
+    int i, c;
+    int inc = 48000/Fs;
+    for (c = 0; c < channels; c++) {
+        for (i = 0; i < overlap; i++) {
+            celt_coef w = MULT_COEF(window[i*inc], window[i*inc]);
+            out[i*channels + c] = ADD32(MULT_COEF_32(w, in2[i*channels + c]),
+                                   MULT_COEF_32(COEF_ONE - w, in1[i*channels + c]));
+        }
+    }
 }
 
-static int oac_packet_get_mode(const unsigned char *data)
-{
-   int mode;
-   if (data[0]&0x80)
-   {
-      mode = MODE_CELT_ONLY;
-   } else if ((data[0]&0x60) == 0x60)
-   {
-      mode = MODE_HYBRID;
-   } else {
-      mode = MODE_SILK_ONLY;
-   }
-   return mode;
+static int oac_packet_get_mode(const unsigned char *data) {
+    int mode;
+    if (data[0]&0x80) {
+        mode = MODE_CELT_ONLY;
+    } else if ((data[0]&0x60) == 0x60) {
+        mode = MODE_HYBRID;
+    } else {
+        mode = MODE_SILK_ONLY;
+    }
+    return mode;
 }
 
 static int oac_decode_frame(OacDecoder *st, const unsigned char *data,
-      oac_int32 len, oac_res *pcm, int frame_size, int decode_fec)
-{
-   void *silk_dec;
-   CELTDecoder *celt_dec;
-   int i, silk_ret=0, celt_ret=0;
-   ec_dec dec;
-   oac_int32 silk_frame_size;
-   int pcm_transition_silk_size;
-   VARDECL(oac_res, pcm_transition_silk);
-   int pcm_transition_celt_size;
-   VARDECL(oac_res, pcm_transition_celt);
-   oac_res *pcm_transition=NULL;
-   int redundant_audio_size;
-   VARDECL(oac_res, redundant_audio);
-
-   int audiosize;
-   int mode;
-   int bandwidth;
-   int transition=0;
-   int start_band;
-   int redundancy=0;
-   int redundancy_bytes = 0;
-   int celt_to_silk=0;
-   int c;
-   int F2_5, F5, F10, F20;
-   const celt_coef *window;
-   oac_uint32 redundant_rng = 0;
-   int celt_accum;
-   ALLOC_STACK;
-
-   silk_dec = (char*)st+st->silk_dec_offset;
-   celt_dec = (CELTDecoder*)((char*)st+st->celt_dec_offset);
-   F20 = st->Fs/50;
-   F10 = F20>>1;
-   F5 = F10>>1;
-   F2_5 = F5>>1;
-   if (frame_size < F2_5)
-   {
-      RESTORE_STACK;
-      return OAC_BUFFER_TOO_SMALL;
-   }
-   /* Limit frame_size to avoid excessive stack allocations. */
-   frame_size = IMIN(frame_size, st->Fs/25*3);
-   /* Payloads of 1 (2 including ToC) or 0 trigger the PLC/DTX */
-   if (len<=1)
-   {
-      data = NULL;
-      /* In that case, don't conceal more than what the ToC says */
-      frame_size = IMIN(frame_size, st->frame_size);
-   }
-   if (data != NULL)
-   {
-      audiosize = st->frame_size;
-      mode = st->mode;
-      bandwidth = st->bandwidth;
-      ec_dec_init(&dec,(unsigned char*)data,len);
-   } else {
-      audiosize = frame_size;
-      /* Run PLC using last used mode (CELT if we ended with CELT redundancy) */
-      mode = st->prev_redundancy ? MODE_CELT_ONLY : st->prev_mode;
-      bandwidth = 0;
-
-      if (mode == 0)
-      {
-         /* If we haven't got any packet yet, all we can do is return zeros */
-         for (i=0;i<audiosize*st->channels;i++)
-            pcm[i] = 0;
-         RESTORE_STACK;
-         return audiosize;
-      }
-
-      /* Avoids trying to run the PLC on sizes other than 2.5 (CELT), 5 (CELT),
-         10, or 20 (e.g. 12.5 or 30 ms). */
-      if (audiosize > F20)
-      {
-         do {
-            int ret = oac_decode_frame(st, NULL, 0, pcm, IMIN(audiosize, F20), 0);
-            if (ret<0)
-            {
-               RESTORE_STACK;
-               return ret;
+                            oac_int32 len, oac_res *pcm, int frame_size, int decode_fec) {
+    void *silk_dec;
+    CELTDecoder *celt_dec;
+    int i, silk_ret = 0, celt_ret = 0;
+    ec_dec dec;
+    oac_int32 silk_frame_size;
+    int pcm_transition_silk_size;
+    VARDECL(oac_res, pcm_transition_silk);
+    int pcm_transition_celt_size;
+    VARDECL(oac_res, pcm_transition_celt);
+    oac_res *pcm_transition = NULL;
+    int redundant_audio_size;
+    VARDECL(oac_res, redundant_audio);
+
+    int audiosize;
+    int mode;
+    int bandwidth;
+    int transition = 0;
+    int start_band;
+    int redundancy = 0;
+    int redundancy_bytes = 0;
+    int celt_to_silk = 0;
+    int c;
+    int F2_5, F5, F10, F20;
+    const celt_coef *window;
+    oac_uint32 redundant_rng = 0;
+    int celt_accum;
+    ALLOC_STACK;
+
+    silk_dec = (char*)st + st->silk_dec_offset;
+    celt_dec = (CELTDecoder*)((char*)st + st->celt_dec_offset);
+    F20 = st->Fs/50;
+    F10 = F20>>1;
+    F5 = F10>>1;
+    F2_5 = F5>>1;
+    if (frame_size < F2_5) {
+        RESTORE_STACK;
+        return OAC_BUFFER_TOO_SMALL;
+    }
+    /* Limit frame_size to avoid excessive stack allocations. */
+    frame_size = IMIN(frame_size, st->Fs/25*3);
+    /* Payloads of 1 (2 including ToC) or 0 trigger the PLC/DTX */
+    if (len <= 1) {
+        data = NULL;
+        /* In that case, don't conceal more than what the ToC says */
+        frame_size = IMIN(frame_size, st->frame_size);
+    }
+    if (data != NULL) {
+        audiosize = st->frame_size;
+        mode = st->mode;
+        bandwidth = st->bandwidth;
+        ec_dec_init(&dec, (unsigned char*)data, len);
+    } else {
+        audiosize = frame_size;
+        /* Run PLC using last used mode (CELT if we ended with CELT redundancy) */
+        mode = st->prev_redundancy ? MODE_CELT_ONLY : st->prev_mode;
+        bandwidth = 0;
+
+        if (mode == 0) {
+            /* If we haven't got any packet yet, all we can do is return zeros */
+            for (i = 0; i < audiosize*st->channels; i++)
+                pcm[i] = 0;
+            RESTORE_STACK;
+            return audiosize;
+        }
+
+        /* Avoids trying to run the PLC on sizes other than 2.5 (CELT), 5 (CELT),
+           10, or 20 (e.g. 12.5 or 30 ms). */
+        if (audiosize > F20) {
+            do {
+                int ret = oac_decode_frame(st, NULL, 0, pcm, IMIN(audiosize, F20), 0);
+                if (ret < 0) {
+                    RESTORE_STACK;
+                    return ret;
+                }
+                pcm += ret*st->channels;
+                audiosize -= ret;
+            } while (audiosize > 0);
+            RESTORE_STACK;
+            return frame_size;
+        } else if (audiosize < F20) {
+            if (audiosize > F10)
+                audiosize = F10;
+            else if (mode != MODE_SILK_ONLY && audiosize > F5 && audiosize < F10)
+                audiosize = F5;
+        }
+    }
+
+    /* In fixed-point, we can tell CELT to do the accumulation on top of the
+       SILK PCM buffer. This saves some stack space. */
+    celt_accum = (mode != MODE_CELT_ONLY);
+
+    pcm_transition_silk_size = ALLOC_NONE;
+    pcm_transition_celt_size = ALLOC_NONE;
+    if (data != NULL && st->prev_mode > 0 && (
+            (mode == MODE_CELT_ONLY && st->prev_mode != MODE_CELT_ONLY && !st->prev_redundancy)
+            || (mode != MODE_CELT_ONLY && st->prev_mode == MODE_CELT_ONLY))
+        ) {
+        transition = 1;
+        /* Decide where to allocate the stack memory for pcm_transition */
+        if (mode == MODE_CELT_ONLY)
+            pcm_transition_celt_size = F5*st->channels;
+        else
+            pcm_transition_silk_size = F5*st->channels;
+    }
+    ALLOC(pcm_transition_celt, pcm_transition_celt_size, oac_res);
+    if (transition && mode == MODE_CELT_ONLY) {
+        pcm_transition = pcm_transition_celt;
+        oac_decode_frame(st, NULL, 0, pcm_transition, IMIN(F5, audiosize), 0);
+    }
+    if (audiosize > frame_size) {
+        /*fprintf(stderr, "PCM buffer too small: %d vs %d (mode = %d)\n", audiosize, frame_size, mode);*/
+        RESTORE_STACK;
+        return OAC_BAD_ARG;
+    } else {
+        frame_size = audiosize;
+    }
+
+    /* SILK processing */
+    if (mode != MODE_CELT_ONLY) {
+        int lost_flag, decoded_samples;
+        oac_res *pcm_ptr;
+        int pcm_too_small;
+        int pcm_silk_size = ALLOC_NONE;
+        VARDECL(oac_res, pcm_silk);
+        pcm_too_small = (frame_size < F10);
+        if (pcm_too_small)
+            pcm_silk_size = F10*st->channels;
+        ALLOC(pcm_silk, pcm_silk_size, oac_res);
+        if (pcm_too_small)
+            pcm_ptr = pcm_silk;
+        else
+            pcm_ptr = pcm;
+
+        if (st->prev_mode == MODE_CELT_ONLY)
+            silk_ResetDecoder( silk_dec );
+
+        /* The SILK PLC cannot produce frames of less than 10 ms */
+        st->DecControl.payloadSize_ms = IMAX(10, 1000*audiosize/st->Fs);
+
+        if (data != NULL) {
+            st->DecControl.nChannelsInternal = st->stream_channels;
+            if (mode == MODE_SILK_ONLY) {
+                if (bandwidth == OAC_BANDWIDTH_NARROWBAND) {
+                    st->DecControl.internalSampleRate = 8000;
+                } else if (bandwidth == OAC_BANDWIDTH_MEDIUMBAND) {
+                    st->DecControl.internalSampleRate = 12000;
+                } else if (bandwidth == OAC_BANDWIDTH_WIDEBAND) {
+                    st->DecControl.internalSampleRate = 16000;
+                } else {
+                    st->DecControl.internalSampleRate = 16000;
+                    celt_assert( 0 );
+                }
+            } else {
+                /* Hybrid mode */
+                st->DecControl.internalSampleRate = 16000;
             }
-            pcm += ret*st->channels;
-            audiosize -= ret;
-         } while (audiosize > 0);
-         RESTORE_STACK;
-         return frame_size;
-      } else if (audiosize < F20)
-      {
-         if (audiosize > F10)
-            audiosize = F10;
-         else if (mode != MODE_SILK_ONLY && audiosize > F5 && audiosize < F10)
-            audiosize = F5;
-      }
-   }
-
-   /* In fixed-point, we can tell CELT to do the accumulation on top of the
-      SILK PCM buffer. This saves some stack space. */
-   celt_accum = (mode != MODE_CELT_ONLY);
-
-   pcm_transition_silk_size = ALLOC_NONE;
-   pcm_transition_celt_size = ALLOC_NONE;
-   if (data!=NULL && st->prev_mode > 0 && (
-       (mode == MODE_CELT_ONLY && st->prev_mode != MODE_CELT_ONLY && !st->prev_redundancy)
-    || (mode != MODE_CELT_ONLY && st->prev_mode == MODE_CELT_ONLY) )
-      )
-   {
-      transition = 1;
-      /* Decide where to allocate the stack memory for pcm_transition */
-      if (mode == MODE_CELT_ONLY)
-         pcm_transition_celt_size = F5*st->channels;
-      else
-         pcm_transition_silk_size = F5*st->channels;
-   }
-   ALLOC(pcm_transition_celt, pcm_transition_celt_size, oac_res);
-   if (transition && mode == MODE_CELT_ONLY)
-   {
-      pcm_transition = pcm_transition_celt;
-      oac_decode_frame(st, NULL, 0, pcm_transition, IMIN(F5, audiosize), 0);
-   }
-   if (audiosize > frame_size)
-   {
-      /*fprintf(stderr, "PCM buffer too small: %d vs %d (mode = %d)\n", audiosize, frame_size, mode);*/
-      RESTORE_STACK;
-      return OAC_BAD_ARG;
-   } else {
-      frame_size = audiosize;
-   }
-
-   /* SILK processing */
-   if (mode != MODE_CELT_ONLY)
-   {
-      int lost_flag, decoded_samples;
-      oac_res *pcm_ptr;
-      int pcm_too_small;
-      int pcm_silk_size = ALLOC_NONE;
-      VARDECL(oac_res, pcm_silk);
-      pcm_too_small = (frame_size < F10);
-      if (pcm_too_small)
-         pcm_silk_size = F10*st->channels;
-      ALLOC(pcm_silk, pcm_silk_size, oac_res);
-      if (pcm_too_small)
-         pcm_ptr = pcm_silk;
-      else
-         pcm_ptr = pcm;
-
-      if (st->prev_mode==MODE_CELT_ONLY)
-         silk_ResetDecoder( silk_dec );
-
-      /* The SILK PLC cannot produce frames of less than 10 ms */
-      st->DecControl.payloadSize_ms = IMAX(10, 1000 * audiosize / st->Fs);
-
-      if (data != NULL)
-      {
-        st->DecControl.nChannelsInternal = st->stream_channels;
-        if( mode == MODE_SILK_ONLY ) {
-           if( bandwidth == OAC_BANDWIDTH_NARROWBAND ) {
-              st->DecControl.internalSampleRate = 8000;
-           } else if( bandwidth == OAC_BANDWIDTH_MEDIUMBAND ) {
-              st->DecControl.internalSampleRate = 12000;
-           } else if( bandwidth == OAC_BANDWIDTH_WIDEBAND ) {
-              st->DecControl.internalSampleRate = 16000;
-           } else {
-              st->DecControl.internalSampleRate = 16000;
-              celt_assert( 0 );
-           }
-        } else {
-           /* Hybrid mode */
-           st->DecControl.internalSampleRate = 16000;
         }
-     }
-     st->DecControl.enable_deep_plc = st->complexity >= 5;
+        st->DecControl.enable_deep_plc = st->complexity >= 5;
 #ifdef ENABLE_OSCE
-     st->DecControl.osce_method = OSCE_METHOD_NONE;
-#ifndef DISABLE_LACE
-     if (st->complexity >= 6) {st->DecControl.osce_method = OSCE_METHOD_LACE;}
-#endif
-#ifndef DISABLE_NOLACE
-     if (st->complexity >= 7) {st->DecControl.osce_method = OSCE_METHOD_NOLACE;}
-#endif
-#ifdef ENABLE_OSCE_BWE
-     if (st->complexity >= 4 && st->DecControl.enable_osce_bwe &&
-         st->Fs == 48000 && st->DecControl.internalSampleRate == 16000 &&
-         ((mode == MODE_SILK_ONLY) || (data == NULL))) {
-         /* request WB -> FB signal extension */
-         st->DecControl.osce_extended_mode = OSCE_MODE_SILK_BBWE;
-     } else {
-         /* at this point, mode can only be MODE_SILK_ONLY or MODE_HYBRID */
-         st->DecControl.osce_extended_mode = mode == MODE_SILK_ONLY ? OSCE_MODE_SILK_ONLY : OSCE_MODE_HYBRID;
-     }
-     if (st->prev_mode == MODE_CELT_ONLY) {
-         /* Update extended mode for CELT->SILK transition */
-         st->DecControl.prev_osce_extended_mode = OSCE_MODE_CELT_ONLY;
-     }
-#endif
+        st->DecControl.osce_method = OSCE_METHOD_NONE;
+# ifndef DISABLE_LACE
+        if (st->complexity >= 6) {
+            st->DecControl.osce_method = OSCE_METHOD_LACE;
+        }
+# endif
+# ifndef DISABLE_NOLACE
+        if (st->complexity >= 7) {
+            st->DecControl.osce_method = OSCE_METHOD_NOLACE;
+        }
+# endif
+# ifdef ENABLE_OSCE_BWE
+        if (st->complexity >= 4 && st->DecControl.enable_osce_bwe
+            && st->Fs == 48000 && st->DecControl.internalSampleRate == 16000
+            && ((mode == MODE_SILK_ONLY) || (data == NULL))) {
+            /* request WB -> FB signal extension */
+            st->DecControl.osce_extended_mode = OSCE_MODE_SILK_BBWE;
+        } else {
+            /* at this point, mode can only be MODE_SILK_ONLY or MODE_HYBRID */
+            st->DecControl.osce_extended_mode = mode == MODE_SILK_ONLY ? OSCE_MODE_SILK_ONLY : OSCE_MODE_HYBRID;
+        }
+        if (st->prev_mode == MODE_CELT_ONLY) {
+            /* Update extended mode for CELT->SILK transition */
+            st->DecControl.prev_osce_extended_mode = OSCE_MODE_CELT_ONLY;
+        }
+# endif
 #endif
 
-     lost_flag = data == NULL ? 1 : 2 * !!decode_fec;
-     decoded_samples = 0;
-     do {
-        /* Call SILK decoder */
-        int first_frame = decoded_samples == 0;
-        silk_ret = silk_Decode( silk_dec, &st->DecControl,
+        lost_flag = data == NULL ? 1 : 2*!!decode_fec;
+        decoded_samples = 0;
+        do {
+            /* Call SILK decoder */
+            int first_frame = decoded_samples == 0;
+            silk_ret = silk_Decode( silk_dec, &st->DecControl,
                                 lost_flag, first_frame, &dec, pcm_ptr, &silk_frame_size,
 #ifdef ENABLE_DEEP_PLC
                                 &st->lpcnet,
 #endif
                                 st->arch );
-        if( silk_ret ) {
-           if (lost_flag) {
-              /* PLC failure should not be fatal */
-              silk_frame_size = frame_size;
-              for (i=0;i<frame_size*st->channels;i++)
-                 pcm_ptr[i] = 0;
-           } else {
-             RESTORE_STACK;
-             return OAC_INTERNAL_ERROR;
-           }
+            if (silk_ret) {
+                if (lost_flag) {
+                    /* PLC failure should not be fatal */
+                    silk_frame_size = frame_size;
+                    for (i = 0; i < frame_size*st->channels; i++)
+                        pcm_ptr[i] = 0;
+                } else {
+                    RESTORE_STACK;
+                    return OAC_INTERNAL_ERROR;
+                }
+            }
+            pcm_ptr += silk_frame_size*st->channels;
+            decoded_samples += silk_frame_size;
+        } while (decoded_samples < frame_size);
+        if (pcm_too_small) {
+            OAC_COPY(pcm, pcm_silk, frame_size*st->channels);
         }
-        pcm_ptr += silk_frame_size * st->channels;
-        decoded_samples += silk_frame_size;
-      } while( decoded_samples < frame_size );
-     if (pcm_too_small) {
-        OAC_COPY(pcm, pcm_silk, frame_size*st->channels);
-     }
-   }
-
-   start_band = 0;
-   if (!decode_fec && mode != MODE_CELT_ONLY && data != NULL
-    && ec_tell(&dec)+17+20*(mode == MODE_HYBRID) <= 8*len)
-   {
-      /* Check if we have a redundant 0-8 kHz band */
-      if (mode == MODE_HYBRID)
-         redundancy = ec_dec_bit_logp(&dec, 12);
-      else
-         redundancy = 1;
-      if (redundancy)
-      {
-         celt_to_silk = ec_dec_bit_logp(&dec, 1);
-         /* redundancy_bytes will be at least two, in the non-hybrid
-            case due to the ec_tell() check above */
-         redundancy_bytes = mode==MODE_HYBRID ?
-               (oac_int32)ec_dec_uint(&dec, 256)+2 :
-               len-((ec_tell(&dec)+7)>>3);
-         len -= redundancy_bytes;
-         /* This is a sanity check. It should never happen for a valid
-            packet, so the exact behaviour is not normative. */
-         if (len*8 < ec_tell(&dec))
-         {
-            len = 0;
-            redundancy_bytes = 0;
-            redundancy = 0;
-         }
-         /* Shrink decoder because of raw bits */
-         dec.storage -= redundancy_bytes;
-      }
-   }
-   if (mode != MODE_CELT_ONLY)
-      start_band = 17;
-
-   if (redundancy)
-   {
-      transition = 0;
-      pcm_transition_silk_size=ALLOC_NONE;
-   }
-
-   ALLOC(pcm_transition_silk, pcm_transition_silk_size, oac_res);
-
-   if (transition && mode != MODE_CELT_ONLY)
-   {
-      pcm_transition = pcm_transition_silk;
-      oac_decode_frame(st, NULL, 0, pcm_transition, IMIN(F5, audiosize), 0);
-   }
-
-
-   if (bandwidth)
-   {
-      int endband=21;
-
-      switch(bandwidth)
-      {
-      case OAC_BANDWIDTH_NARROWBAND:
-         endband = 13;
-         break;
-      case OAC_BANDWIDTH_MEDIUMBAND:
-      case OAC_BANDWIDTH_WIDEBAND:
-         endband = 17;
-         break;
-      case OAC_BANDWIDTH_SUPERWIDEBAND:
-         endband = 19;
-         break;
-      case OAC_BANDWIDTH_FULLBAND:
-         endband = 21;
-         break;
-      default:
-         celt_assert(0);
-         break;
-      }
-      MUST_SUCCEED(celt_decoder_ctl(celt_dec, CELT_SET_END_BAND(endband)));
-   }
-   MUST_SUCCEED(celt_decoder_ctl(celt_dec, CELT_SET_CHANNELS(st->stream_channels)));
-
-   /* Only allocation memory for redundancy if/when needed */
-   redundant_audio_size = redundancy ? F5*st->channels : ALLOC_NONE;
-   ALLOC(redundant_audio, redundant_audio_size, oac_res);
-
-   /* 5 ms redundant frame for CELT->SILK*/
-   if (redundancy && celt_to_silk)
-   {
-      /* If the previous frame did not use CELT (the first redundancy frame in
-         a transition from SILK may have been lost) then the CELT decoder is
-         stale at this point and the redundancy audio is not useful, however
-         the final range is still needed (for testing), so the redundancy is
-         always decoded but the decoded audio may not be used */
-      MUST_SUCCEED(celt_decoder_ctl(celt_dec, CELT_SET_START_BAND(0)));
-      celt_decode_with_ec(celt_dec, data+len, redundancy_bytes,
+    }
+
+    start_band = 0;
+    if (!decode_fec && mode != MODE_CELT_ONLY && data != NULL
+        && ec_tell(&dec) + 17 + 20*(mode == MODE_HYBRID) <= 8*len) {
+        /* Check if we have a redundant 0-8 kHz band */
+        if (mode == MODE_HYBRID)
+            redundancy = ec_dec_bit_logp(&dec, 12);
+        else
+            redundancy = 1;
+        if (redundancy) {
+            celt_to_silk = ec_dec_bit_logp(&dec, 1);
+            /* redundancy_bytes will be at least two, in the non-hybrid
+               case due to the ec_tell() check above */
+            redundancy_bytes = mode == MODE_HYBRID ?
+                               (oac_int32)ec_dec_uint(&dec, 256) + 2 :
+                               len - ((ec_tell(&dec) + 7)>>3);
+            len -= redundancy_bytes;
+            /* This is a sanity check. It should never happen for a valid
+               packet, so the exact behaviour is not normative. */
+            if (len*8 < ec_tell(&dec)) {
+                len = 0;
+                redundancy_bytes = 0;
+                redundancy = 0;
+            }
+            /* Shrink decoder because of raw bits */
+            dec.storage -= redundancy_bytes;
+        }
+    }
+    if (mode != MODE_CELT_ONLY)
+        start_band = 17;
+
+    if (redundancy) {
+        transition = 0;
+        pcm_transition_silk_size = ALLOC_NONE;
+    }
+
+    ALLOC(pcm_transition_silk, pcm_transition_silk_size, oac_res);
+
+    if (transition && mode != MODE_CELT_ONLY) {
+        pcm_transition = pcm_transition_silk;
+        oac_decode_frame(st, NULL, 0, pcm_transition, IMIN(F5, audiosize), 0);
+    }
+
+
+    if (bandwidth) {
+        int endband = 21;
+
+        switch (bandwidth) {
+            case OAC_BANDWIDTH_NARROWBAND:
+                endband = 13;
+                break;
+            case OAC_BANDWIDTH_MEDIUMBAND:
+            case OAC_BANDWIDTH_WIDEBAND:
+                endband = 17;
+                break;
+            case OAC_BANDWIDTH_SUPERWIDEBAND:
+                endband = 19;
+                break;
+            case OAC_BANDWIDTH_FULLBAND:
+                endband = 21;
+                break;
+            default:
+                celt_assert(0);
+                break;
+        }
+        MUST_SUCCEED(celt_decoder_ctl(celt_dec, CELT_SET_END_BAND(endband)));
+    }
+    MUST_SUCCEED(celt_decoder_ctl(celt_dec, CELT_SET_CHANNELS(st->stream_channels)));
+
+    /* Only allocation memory for redundancy if/when needed */
+    redundant_audio_size = redundancy ? F5*st->channels : ALLOC_NONE;
+    ALLOC(redundant_audio, redundant_audio_size, oac_res);
+
+    /* 5 ms redundant frame for CELT->SILK*/
+    if (redundancy && celt_to_silk) {
+        /* If the previous frame did not use CELT (the first redundancy frame in
+           a transition from SILK may have been lost) then the CELT decoder is
+           stale at this point and the redundancy audio is not useful, however
+           the final range is still needed (for testing), so the redundancy is
+           always decoded but the decoded audio may not be used */
+        MUST_SUCCEED(celt_decoder_ctl(celt_dec, CELT_SET_START_BAND(0)));
+        celt_decode_with_ec(celt_dec, data + len, redundancy_bytes,
                           redundant_audio, F5, NULL, 0);
-      MUST_SUCCEED(celt_decoder_ctl(celt_dec, OAC_GET_FINAL_RANGE(&redundant_rng)));
-   }
+        MUST_SUCCEED(celt_decoder_ctl(celt_dec, OAC_GET_FINAL_RANGE(&redundant_rng)));
+    }
 
-   /* MUST be after PLC */
-   MUST_SUCCEED(celt_decoder_ctl(celt_dec, CELT_SET_START_BAND(start_band)));
+    /* MUST be after PLC */
+    MUST_SUCCEED(celt_decoder_ctl(celt_dec, CELT_SET_START_BAND(start_band)));
 
 #ifdef ENABLE_OSCE_BWE
-   if (mode != MODE_SILK_ONLY && st->DecControl.osce_extended_mode != OSCE_MODE_SILK_BBWE)
+    if (mode != MODE_SILK_ONLY && st->DecControl.osce_extended_mode != OSCE_MODE_SILK_BBWE)
 #else
-   if (mode != MODE_SILK_ONLY)
+    if (mode != MODE_SILK_ONLY)
 #endif
-   {
-      int celt_frame_size = IMIN(F20, frame_size);
-      /* Make sure to discard any previous CELT state */
-      if (mode != st->prev_mode && st->prev_mode > 0 && !st->prev_redundancy)
-         MUST_SUCCEED(celt_decoder_ctl(celt_dec, OAC_RESET_STATE));
-      /* Decode CELT */
-      celt_ret = celt_decode_with_ec_dred(celt_dec, decode_fec ? NULL : data,
+    {
+        int celt_frame_size = IMIN(F20, frame_size);
+        /* Make sure to discard any previous CELT state */
+        if (mode != st->prev_mode && st->prev_mode > 0 && !st->prev_redundancy)
+            MUST_SUCCEED(celt_decoder_ctl(celt_dec, OAC_RESET_STATE));
+        /* Decode CELT */
+        celt_ret = celt_decode_with_ec_dred(celt_dec, decode_fec ? NULL : data,
                                      len, pcm, celt_frame_size, &dec, celt_accum
 #ifdef ENABLE_DEEP_PLC
-                                     , &st->lpcnet
+            , &st->lpcnet
 #endif
-                                     );
-      celt_decoder_ctl(celt_dec, OAC_GET_FINAL_RANGE(&st->rangeFinal));
-   } else {
-      unsigned char silence[2] = {0xFF, 0xFF};
-      if (!celt_accum)
-      {
-         for (i=0;i<frame_size*st->channels;i++)
-            pcm[i] = 0;
-      }
-      /* For hybrid -> SILK transitions, we let the CELT MDCT
-         do a fade-out by decoding a silence frame */
-      if (st->prev_mode == MODE_HYBRID && !(redundancy && celt_to_silk && st->prev_redundancy) )
-      {
-         MUST_SUCCEED(celt_decoder_ctl(celt_dec, CELT_SET_START_BAND(0)));
-         celt_decode_with_ec(celt_dec, silence, 2, pcm, F2_5, NULL, celt_accum);
-      }
-      st->rangeFinal = dec.rng;
-   }
-
-   {
-      const CELTMode *celt_mode;
-      MUST_SUCCEED(celt_decoder_ctl(celt_dec, CELT_GET_MODE(&celt_mode)));
-      window = celt_mode->window;
-   }
-
-   /* 5 ms redundant frame for SILK->CELT */
-   if (redundancy && !celt_to_silk)
-   {
-      MUST_SUCCEED(celt_decoder_ctl(celt_dec, OAC_RESET_STATE));
-      MUST_SUCCEED(celt_decoder_ctl(celt_dec, CELT_SET_START_BAND(0)));
-
-      celt_decode_with_ec(celt_dec, data+len, redundancy_bytes, redundant_audio, F5, NULL, 0);
-      MUST_SUCCEED(celt_decoder_ctl(celt_dec, OAC_GET_FINAL_RANGE(&redundant_rng)));
-      smooth_fade(pcm+st->channels*(frame_size-F2_5), redundant_audio+st->channels*F2_5,
-                  pcm+st->channels*(frame_size-F2_5), F2_5, st->channels, window, st->Fs);
-   }
-   /* 5ms redundant frame for CELT->SILK; ignore if the previous frame did not
-      use CELT (the first redundancy frame in a transition from SILK may have
-      been lost) */
-   if (redundancy && celt_to_silk && (st->prev_mode != MODE_SILK_ONLY || st->prev_redundancy))
-   {
-      for (c=0;c<st->channels;c++)
-      {
-         for (i=0;i<F2_5;i++)
-            pcm[st->channels*i+c] = redundant_audio[st->channels*i+c];
-      }
-      smooth_fade(redundant_audio+st->channels*F2_5, pcm+st->channels*F2_5,
-                  pcm+st->channels*F2_5, F2_5, st->channels, window, st->Fs);
-   }
-   if (transition)
-   {
-      if (audiosize >= F5)
-      {
-         for (i=0;i<st->channels*F2_5;i++)
-            pcm[i] = pcm_transition[i];
-         smooth_fade(pcm_transition+st->channels*F2_5, pcm+st->channels*F2_5,
-                     pcm+st->channels*F2_5, F2_5,
+            );
+        celt_decoder_ctl(celt_dec, OAC_GET_FINAL_RANGE(&st->rangeFinal));
+    } else {
+        unsigned char silence[2] = {0xFF, 0xFF};
+        if (!celt_accum) {
+            for (i = 0; i < frame_size*st->channels; i++)
+                pcm[i] = 0;
+        }
+        /* For hybrid -> SILK transitions, we let the CELT MDCT
+           do a fade-out by decoding a silence frame */
+        if (st->prev_mode == MODE_HYBRID && !(redundancy && celt_to_silk && st->prev_redundancy)) {
+            MUST_SUCCEED(celt_decoder_ctl(celt_dec, CELT_SET_START_BAND(0)));
+            celt_decode_with_ec(celt_dec, silence, 2, pcm, F2_5, NULL, celt_accum);
+        }
+        st->rangeFinal = dec.rng;
+    }
+
+    {
+        const CELTMode *celt_mode;
+        MUST_SUCCEED(celt_decoder_ctl(celt_dec, CELT_GET_MODE(&celt_mode)));
+        window = celt_mode->window;
+    }
+
+    /* 5 ms redundant frame for SILK->CELT */
+    if (redundancy && !celt_to_silk) {
+        MUST_SUCCEED(celt_decoder_ctl(celt_dec, OAC_RESET_STATE));
+        MUST_SUCCEED(celt_decoder_ctl(celt_dec, CELT_SET_START_BAND(0)));
+
+        celt_decode_with_ec(celt_dec, data + len, redundancy_bytes, redundant_audio, F5, NULL, 0);
+        MUST_SUCCEED(celt_decoder_ctl(celt_dec, OAC_GET_FINAL_RANGE(&redundant_rng)));
+        smooth_fade(pcm + st->channels*(frame_size - F2_5), redundant_audio + st->channels*F2_5,
+                  pcm + st->channels*(frame_size - F2_5), F2_5, st->channels, window, st->Fs);
+    }
+    /* 5ms redundant frame for CELT->SILK; ignore if the previous frame did not
+       use CELT (the first redundancy frame in a transition from SILK may have
+       been lost) */
+    if (redundancy && celt_to_silk && (st->prev_mode != MODE_SILK_ONLY || st->prev_redundancy)) {
+        for (c = 0; c < st->channels; c++) {
+            for (i = 0; i < F2_5; i++)
+                pcm[st->channels*i + c] = redundant_audio[st->channels*i + c];
+        }
+        smooth_fade(redundant_audio + st->channels*F2_5, pcm + st->channels*F2_5,
+                  pcm + st->channels*F2_5, F2_5, st->channels, window, st->Fs);
+    }
+    if (transition) {
+        if (audiosize >= F5) {
+            for (i = 0; i < st->channels*F2_5; i++)
+                pcm[i] = pcm_transition[i];
+            smooth_fade(pcm_transition + st->channels*F2_5, pcm + st->channels*F2_5,
+                     pcm + st->channels*F2_5, F2_5,
                      st->channels, window, st->Fs);
-      } else {
-         /* Not enough time to do a clean transition, but we do it anyway
-            This will not preserve amplitude perfectly and may introduce
-            a bit of temporal aliasing, but it shouldn't be too bad and
-            that's pretty much the best we can do. In any case, generating this
-            transition it pretty silly in the first place */
-         smooth_fade(pcm_transition, pcm,
+        } else {
+            /* Not enough time to do a clean transition, but we do it anyway
+               This will not preserve amplitude perfectly and may introduce
+               a bit of temporal aliasing, but it shouldn't be too bad and
+               that's pretty much the best we can do. In any case, generating this
+               transition it pretty silly in the first place */
+            smooth_fade(pcm_transition, pcm,
                      pcm, F2_5,
                      st->channels, window, st->Fs);
-      }
-   }
-
-   if(st->decode_gain)
-   {
-      oac_val32 gain;
-      gain = celt_exp2(MULT16_16_P15(QCONST16(6.48814081e-4f, 25), st->decode_gain));
-      for (i=0;i<frame_size*st->channels;i++)
-      {
-         oac_val32 x;
-         x = MULT32_32_Q16(pcm[i],gain);
-         pcm[i] = SATURATE(x, 32767);
-      }
-   }
-
-   if (len <= 1)
-      st->rangeFinal = 0;
-   else
-      st->rangeFinal ^= redundant_rng;
-
-   st->prev_mode = mode;
-   st->prev_redundancy = redundancy && !celt_to_silk;
-
-   if (celt_ret>=0)
-   {
-      if (OAC_CHECK_ARRAY(pcm, audiosize*st->channels))
-         OAC_PRINT_INT(audiosize);
-   }
-
-   RESTORE_STACK;
-   return celt_ret < 0 ? celt_ret : audiosize;
+        }
+    }
+
+    if (st->decode_gain) {
+        oac_val32 gain;
+        gain = celt_exp2(MULT16_16_P15(QCONST16(6.48814081e-4f, 25), st->decode_gain));
+        for (i = 0; i < frame_size*st->channels; i++) {
+            oac_val32 x;
+            x = MULT32_32_Q16(pcm[i], gain);
+            pcm[i] = SATURATE(x, 32767);
+        }
+    }
+
+    if (len <= 1)
+        st->rangeFinal = 0;
+    else
+        st->rangeFinal ^= redundant_rng;
+
+    st->prev_mode = mode;
+    st->prev_redundancy = redundancy && !celt_to_silk;
+
+    if (celt_ret >= 0) {
+        if (OAC_CHECK_ARRAY(pcm, audiosize*st->channels))
+            OAC_PRINT_INT(audiosize);
+    }
+
+    RESTORE_STACK;
+    return celt_ret < 0 ? celt_ret : audiosize;
 
 }
 
 int oac_decode_native(OacDecoder *st, const unsigned char *data,
-      oac_int32 len, oac_res *pcm, int frame_size, int decode_fec,
-      int self_delimited, oac_int32 *packet_offset, int soft_clip, const OacDRED *dred, oac_int32 dred_offset)
-{
-   int i, nb_samples;
-   int count, offset;
-   unsigned char toc;
-   int packet_frame_size, packet_bandwidth, packet_mode, packet_stream_channels;
-   /* 48 x 2.5 ms = 120 ms */
-   oac_int16 size[48];
-   const unsigned char *padding;
-   oac_int32 padding_len;
-   OacExtensionIterator iter;
-   VALIDATE_OAC_DECODER(st);
-   if (decode_fec<0 || decode_fec>1)
-      return OAC_BAD_ARG;
-   /* For FEC/PLC, frame_size has to be to have a multiple of 2.5 ms */
-   if ((decode_fec || len==0 || data==NULL) && frame_size%(st->Fs/400)!=0)
-      return OAC_BAD_ARG;
+                      oac_int32 len, oac_res *pcm, int frame_size, int decode_fec,
+                      int self_delimited, oac_int32 *packet_offset, int soft_clip, const OacDRED *dred,
+                      oac_int32 dred_offset) {
+    int i, nb_samples;
+    int count, offset;
+    unsigned char toc;
+    int packet_frame_size, packet_bandwidth, packet_mode, packet_stream_channels;
+    /* 48 x 2.5 ms = 120 ms */
+    oac_int16 size[48];
+    const unsigned char *padding;
+    oac_int32 padding_len;
+    OacExtensionIterator iter;
+    VALIDATE_OAC_DECODER(st);
+    if (decode_fec < 0 || decode_fec > 1)
+        return OAC_BAD_ARG;
+    /* For FEC/PLC, frame_size has to be to have a multiple of 2.5 ms */
+    if ((decode_fec || len == 0 || data == NULL) && frame_size%(st->Fs/400) != 0)
+        return OAC_BAD_ARG;
 #ifdef ENABLE_DRED
-   if (dred != NULL && dred->process_stage == 2) {
-      int F10;
-      int features_per_frame;
-      int needed_feature_frames;
-      int init_frames;
-      lpcnet_plc_fec_clear(&st->lpcnet);
-      F10 = st->Fs/100;
-      /* if blend==0, the last PLC call was "update" and we need to feed two extra 10-ms frames. */
-      init_frames = (st->lpcnet.blend == 0) ? 2 : 0;
-      features_per_frame = IMAX(1, frame_size/F10);
-      needed_feature_frames = init_frames + features_per_frame;
-      for (i=0;i<needed_feature_frames;i++) {
-         int feature_offset;
-         /* We floor instead of rounding because 5-ms overlap compensates for the missing 0.5 rounding offset. */
-         feature_offset = init_frames - i - 2 + (int)floor(((float)dred_offset + dred->dred_offset*F10/4)/F10);
-         if (feature_offset <= 4*dred->nb_latents-1 && feature_offset >= 0) {
-           lpcnet_plc_fec_add(&st->lpcnet, dred->fec_features+feature_offset*DRED_NUM_FEATURES);
-         } else {
-           if (feature_offset >= 0) lpcnet_plc_fec_add(&st->lpcnet, NULL);
-         }
-
-      }
-   }
+    if (dred != NULL && dred->process_stage == 2) {
+        int F10;
+        int features_per_frame;
+        int needed_feature_frames;
+        int init_frames;
+        lpcnet_plc_fec_clear(&st->lpcnet);
+        F10 = st->Fs/100;
+        /* if blend==0, the last PLC call was "update" and we need to feed two extra 10-ms frames. */
+        init_frames = (st->lpcnet.blend == 0) ? 2 : 0;
+        features_per_frame = IMAX(1, frame_size/F10);
+        needed_feature_frames = init_frames + features_per_frame;
+        for (i = 0; i < needed_feature_frames; i++) {
+            int feature_offset;
+            /* We floor instead of rounding because 5-ms overlap compensates for the missing 0.5 rounding offset. */
+            feature_offset = init_frames - i - 2 + (int)floor(((float)dred_offset + dred->dred_offset*F10/4)/F10);
+            if (feature_offset <= 4*dred->nb_latents - 1 && feature_offset >= 0) {
+                lpcnet_plc_fec_add(&st->lpcnet, dred->fec_features + feature_offset*DRED_NUM_FEATURES);
+            } else {
+                if (feature_offset >= 0) lpcnet_plc_fec_add(&st->lpcnet, NULL);
+            }
+
+        }
+    }
 #else
-   (void)dred;
-   (void)dred_offset;
+    (void)dred;
+    (void)dred_offset;
 #endif
-   if (len==0 || data==NULL)
-   {
-      int pcm_count=0;
-      do {
-         int ret;
-         ret = oac_decode_frame(st, NULL, 0, pcm+pcm_count*st->channels, frame_size-pcm_count, 0);
-         if (ret<0)
-            return ret;
-         pcm_count += ret;
-      } while (pcm_count < frame_size);
-      celt_assert(pcm_count == frame_size);
-      if (OAC_CHECK_ARRAY(pcm, pcm_count*st->channels))
-         OAC_PRINT_INT(pcm_count);
-      st->last_packet_duration = pcm_count;
-      return pcm_count;
-   } else if (len<0)
-      return OAC_BAD_ARG;
-
-   packet_mode = oac_packet_get_mode(data);
-   packet_bandwidth = oac_packet_get_bandwidth(data);
-   packet_frame_size = oac_packet_get_samples_per_frame(data, st->Fs);
-   packet_stream_channels = oac_packet_get_nb_channels(data);
-
-   count = oac_packet_parse_impl(data, len, self_delimited, &toc, NULL,
+    if (len == 0 || data == NULL) {
+        int pcm_count = 0;
+        do {
+            int ret;
+            ret = oac_decode_frame(st, NULL, 0, pcm + pcm_count*st->channels, frame_size - pcm_count, 0);
+            if (ret < 0)
+                return ret;
+            pcm_count += ret;
+        } while (pcm_count < frame_size);
+        celt_assert(pcm_count == frame_size);
+        if (OAC_CHECK_ARRAY(pcm, pcm_count*st->channels))
+            OAC_PRINT_INT(pcm_count);
+        st->last_packet_duration = pcm_count;
+        return pcm_count;
+    } else if (len < 0)
+        return OAC_BAD_ARG;
+
+    packet_mode = oac_packet_get_mode(data);
+    packet_bandwidth = oac_packet_get_bandwidth(data);
+    packet_frame_size = oac_packet_get_samples_per_frame(data, st->Fs);
+    packet_stream_channels = oac_packet_get_nb_channels(data);
+
+    count = oac_packet_parse_impl(data, len, self_delimited, &toc, NULL,
                                   size, &offset, packet_offset, &padding, &padding_len);
-   if (st->ignore_extensions) {
-      padding = NULL;
-      padding_len = 0;
-   }
-   if (count<0)
-      return count;
-   oac_extension_iterator_init(&iter, padding, padding_len, count);
-
-   data += offset;
-
-   if (decode_fec)
-   {
-      int duration_copy;
-      int ret;
-      /* If no FEC can be present, run the PLC (recursive call) */
-      if (frame_size < packet_frame_size || packet_mode == MODE_CELT_ONLY || st->mode == MODE_CELT_ONLY)
-         return oac_decode_native(st, NULL, 0, pcm, frame_size, 0, 0, NULL, soft_clip, NULL, 0);
-      /* Otherwise, run the PLC on everything except the size for which we might have FEC */
-      duration_copy = st->last_packet_duration;
-      if (frame_size-packet_frame_size!=0)
-      {
-         ret = oac_decode_native(st, NULL, 0, pcm, frame_size-packet_frame_size, 0, 0, NULL, soft_clip, NULL, 0);
-         if (ret<0)
-         {
-            st->last_packet_duration = duration_copy;
-            return ret;
-         }
-         celt_assert(ret==frame_size-packet_frame_size);
-      }
-      /* Complete with FEC */
-      st->mode = packet_mode;
-      st->bandwidth = packet_bandwidth;
-      st->frame_size = packet_frame_size;
-      st->stream_channels = packet_stream_channels;
-      ret = oac_decode_frame(st, data, size[0], pcm+st->channels*(frame_size-packet_frame_size),
+    if (st->ignore_extensions) {
+        padding = NULL;
+        padding_len = 0;
+    }
+    if (count < 0)
+        return count;
+    oac_extension_iterator_init(&iter, padding, padding_len, count);
+
+    data += offset;
+
+    if (decode_fec) {
+        int duration_copy;
+        int ret;
+        /* If no FEC can be present, run the PLC (recursive call) */
+        if (frame_size < packet_frame_size || packet_mode == MODE_CELT_ONLY || st->mode == MODE_CELT_ONLY)
+            return oac_decode_native(st, NULL, 0, pcm, frame_size, 0, 0, NULL, soft_clip, NULL, 0);
+        /* Otherwise, run the PLC on everything except the size for which we might have FEC */
+        duration_copy = st->last_packet_duration;
+        if (frame_size - packet_frame_size != 0) {
+            ret = oac_decode_native(st, NULL, 0, pcm, frame_size - packet_frame_size, 0, 0, NULL, soft_clip, NULL, 0);
+            if (ret < 0) {
+                st->last_packet_duration = duration_copy;
+                return ret;
+            }
+            celt_assert(ret == frame_size - packet_frame_size);
+        }
+        /* Complete with FEC */
+        st->mode = packet_mode;
+        st->bandwidth = packet_bandwidth;
+        st->frame_size = packet_frame_size;
+        st->stream_channels = packet_stream_channels;
+        ret = oac_decode_frame(st, data, size[0], pcm + st->channels*(frame_size - packet_frame_size),
             packet_frame_size, 1);
-      if (ret<0)
-         return ret;
-      else {
-         if (OAC_CHECK_ARRAY(pcm, frame_size*st->channels))
-            OAC_PRINT_INT(frame_size);
-         st->last_packet_duration = frame_size;
-         return frame_size;
-      }
-   }
-
-   if (count*packet_frame_size > frame_size)
-      return OAC_BUFFER_TOO_SMALL;
-
-   /* Update the state as the last step to avoid updating it on an invalid packet */
-   st->mode = packet_mode;
-   st->bandwidth = packet_bandwidth;
-   st->frame_size = packet_frame_size;
-   st->stream_channels = packet_stream_channels;
-
-   nb_samples=0;
-   for (i=0;i<count;i++)
-   {
-      int ret;
-      ret = oac_decode_frame(st, data, size[i], pcm+nb_samples*st->channels, frame_size-nb_samples, 0);
-      if (ret<0)
-         return ret;
-      celt_assert(ret==packet_frame_size);
-      data += size[i];
-      nb_samples += ret;
-   }
-   st->last_packet_duration = nb_samples;
-   if (OAC_CHECK_ARRAY(pcm, nb_samples*st->channels))
-      OAC_PRINT_INT(nb_samples);
+        if (ret < 0)
+            return ret;
+        else {
+            if (OAC_CHECK_ARRAY(pcm, frame_size*st->channels))
+                OAC_PRINT_INT(frame_size);
+            st->last_packet_duration = frame_size;
+            return frame_size;
+        }
+    }
+
+    if (count*packet_frame_size > frame_size)
+        return OAC_BUFFER_TOO_SMALL;
+
+    /* Update the state as the last step to avoid updating it on an invalid packet */
+    st->mode = packet_mode;
+    st->bandwidth = packet_bandwidth;
+    st->frame_size = packet_frame_size;
+    st->stream_channels = packet_stream_channels;
+
+    nb_samples = 0;
+    for (i = 0; i < count; i++) {
+        int ret;
+        ret = oac_decode_frame(st, data, size[i], pcm + nb_samples*st->channels, frame_size - nb_samples, 0);
+        if (ret < 0)
+            return ret;
+        celt_assert(ret == packet_frame_size);
+        data += size[i];
+        nb_samples += ret;
+    }
+    st->last_packet_duration = nb_samples;
+    if (OAC_CHECK_ARRAY(pcm, nb_samples*st->channels))
+        OAC_PRINT_INT(nb_samples);
 #ifndef FIXED_POINT
-   if (soft_clip)
-      oac_pcm_soft_clip_impl(pcm, nb_samples, st->channels, st->softclip_mem, st->arch);
-   else
-      st->softclip_mem[0]=st->softclip_mem[1]=0;
+    if (soft_clip)
+        oac_pcm_soft_clip_impl(pcm, nb_samples, st->channels, st->softclip_mem, st->arch);
+    else
+        st->softclip_mem[0] = st->softclip_mem[1] = 0;
 #endif
-   return nb_samples;
+    return nb_samples;
 }
 
 #ifdef FIXED_POINT
-#define OPTIONAL_CLIP 0
+# define OPTIONAL_CLIP 0
 #else
-#define OPTIONAL_CLIP 1
+# define OPTIONAL_CLIP 1
 #endif
 
 int oac_decode(OacDecoder *st, const unsigned char *data,
-      oac_int32 len, oac_int16 *pcm, int frame_size, int decode_fec)
-{
-       VARDECL(oac_res, out);
-       int ret;
-       int nb_samples;
-       ALLOC_STACK;
-
-       if(frame_size<=0)
-       {
-          RESTORE_STACK;
-          return OAC_BAD_ARG;
-       }
-       if (data != NULL && len > 0 && !decode_fec)
-       {
-          nb_samples = oac_decoder_get_nb_samples(st, data, len);
-          if (nb_samples>0)
-             frame_size = IMIN(frame_size, nb_samples);
-          else
-             return OAC_INVALID_PACKET;
-       }
-       celt_assert(st->channels == 1 || st->channels == 2);
-       ALLOC(out, frame_size*st->channels, oac_res);
-
-       ret = oac_decode_native(st, data, len, out, frame_size, decode_fec, 0, NULL, OPTIONAL_CLIP, NULL, 0);
-       if (ret > 0)
-       {
-# if defined(FIXED_POINT)
-          int i;
-          for (i=0;i<ret*st->channels;i++)
-             pcm[i] = RES2INT16(out[i]);
-# else
-          celt_float2int16(out, pcm, ret*st->channels, st->arch);
-# endif
-       }
-       RESTORE_STACK;
-       return ret;
+               oac_int32 len, oac_int16 *pcm, int frame_size, int decode_fec) {
+    VARDECL(oac_res, out);
+    int ret;
+    int nb_samples;
+    ALLOC_STACK;
+
+    if (frame_size <= 0) {
+        RESTORE_STACK;
+        return OAC_BAD_ARG;
+    }
+    if (data != NULL && len > 0 && !decode_fec) {
+        nb_samples = oac_decoder_get_nb_samples(st, data, len);
+        if (nb_samples > 0)
+            frame_size = IMIN(frame_size, nb_samples);
+        else
+            return OAC_INVALID_PACKET;
+    }
+    celt_assert(st->channels == 1 || st->channels == 2);
+    ALLOC(out, frame_size*st->channels, oac_res);
+
+    ret = oac_decode_native(st, data, len, out, frame_size, decode_fec, 0, NULL, OPTIONAL_CLIP, NULL, 0);
+    if (ret > 0) {
+#if defined(FIXED_POINT)
+        int i;
+        for (i = 0; i < ret*st->channels; i++)
+            pcm[i] = RES2INT16(out[i]);
+#else
+        celt_float2int16(out, pcm, ret*st->channels, st->arch);
+#endif
+    }
+    RESTORE_STACK;
+    return ret;
 }
 
 #if defined(FIXED_POINT)
 int oac_decode24(OacDecoder *st, const unsigned char *data,
-      oac_int32 len, oac_int32 *pcm, int frame_size, int decode_fec)
-{
-   if(frame_size<=0)
-      return OAC_BAD_ARG;
-   return oac_decode_native(st, data, len, pcm, frame_size, decode_fec, 0, NULL, 0, NULL, 0);
+                 oac_int32 len, oac_int32 *pcm, int frame_size, int decode_fec) {
+    if (frame_size <= 0)
+        return OAC_BAD_ARG;
+    return oac_decode_native(st, data, len, pcm, frame_size, decode_fec, 0, NULL, 0, NULL, 0);
 }
 #else
 int oac_decode24(OacDecoder *st, const unsigned char *data,
-      oac_int32 len, oac_int32 *pcm, int frame_size, int decode_fec)
-{
-       VARDECL(oac_res, out);
-       int ret, i;
-       int nb_samples;
-       ALLOC_STACK;
-
-       if(frame_size<=0)
-       {
-          RESTORE_STACK;
-          return OAC_BAD_ARG;
-       }
-       if (data != NULL && len > 0 && !decode_fec)
-       {
-          nb_samples = oac_decoder_get_nb_samples(st, data, len);
-          if (nb_samples>0)
-             frame_size = IMIN(frame_size, nb_samples);
-          else
-             return OAC_INVALID_PACKET;
-       }
-       celt_assert(st->channels == 1 || st->channels == 2);
-       ALLOC(out, frame_size*st->channels, oac_res);
-
-       ret = oac_decode_native(st, data, len, out, frame_size, decode_fec, 0, NULL, 0, NULL, 0);
-       if (ret > 0)
-       {
-          nb_samples = ret*st->channels;
-          for (i=0;i<nb_samples;i++)
-             pcm[i] = RES2INT24(out[i]);
-       }
-       RESTORE_STACK;
-       return ret;
+                 oac_int32 len, oac_int32 *pcm, int frame_size, int decode_fec) {
+    VARDECL(oac_res, out);
+    int ret, i;
+    int nb_samples;
+    ALLOC_STACK;
+
+    if (frame_size <= 0) {
+        RESTORE_STACK;
+        return OAC_BAD_ARG;
+    }
+    if (data != NULL && len > 0 && !decode_fec) {
+        nb_samples = oac_decoder_get_nb_samples(st, data, len);
+        if (nb_samples > 0)
+            frame_size = IMIN(frame_size, nb_samples);
+        else
+            return OAC_INVALID_PACKET;
+    }
+    celt_assert(st->channels == 1 || st->channels == 2);
+    ALLOC(out, frame_size*st->channels, oac_res);
+
+    ret = oac_decode_native(st, data, len, out, frame_size, decode_fec, 0, NULL, 0, NULL, 0);
+    if (ret > 0) {
+        nb_samples = ret*st->channels;
+        for (i = 0; i < nb_samples; i++)
+            pcm[i] = RES2INT24(out[i]);
+    }
+    RESTORE_STACK;
+    return ret;
 }
 #endif
 
@@ -934,391 +886,357 @@ int oac_decode24(OacDecoder *st, const unsigned char *data,
 
 # if !defined(FIXED_POINT)
 int oac_decode_float(OacDecoder *st, const unsigned char *data,
-      oac_int32 len, oac_val16 *pcm, int frame_size, int decode_fec)
-{
-   if(frame_size<=0)
-      return OAC_BAD_ARG;
-   return oac_decode_native(st, data, len, pcm, frame_size, decode_fec, 0, NULL, 0, NULL, 0);
+                     oac_int32 len, oac_val16 *pcm, int frame_size, int decode_fec) {
+    if (frame_size <= 0)
+        return OAC_BAD_ARG;
+    return oac_decode_native(st, data, len, pcm, frame_size, decode_fec, 0, NULL, 0, NULL, 0);
 }
 # else
 int oac_decode_float(OacDecoder *st, const unsigned char *data,
-      oac_int32 len, float *pcm, int frame_size, int decode_fec)
-{
-   VARDECL(oac_res, out);
-   int ret, i;
-   int nb_samples;
-   ALLOC_STACK;
-
-   if(frame_size<=0)
-   {
-      RESTORE_STACK;
-      return OAC_BAD_ARG;
-   }
-   if (data != NULL && len > 0 && !decode_fec)
-   {
-      nb_samples = oac_decoder_get_nb_samples(st, data, len);
-      if (nb_samples>0)
-         frame_size = IMIN(frame_size, nb_samples);
-      else
-         return OAC_INVALID_PACKET;
-   }
-   celt_assert(st->channels == 1 || st->channels == 2);
-   ALLOC(out, frame_size*st->channels, oac_res);
-
-   ret = oac_decode_native(st, data, len, out, frame_size, decode_fec, 0, NULL, 0, NULL, 0);
-   if (ret > 0)
-   {
-      for (i=0;i<ret*st->channels;i++)
-         pcm[i] = RES2FLOAT(out[i]);
-   }
-   RESTORE_STACK;
-   return ret;
+                     oac_int32 len, float *pcm, int frame_size, int decode_fec) {
+    VARDECL(oac_res, out);
+    int ret, i;
+    int nb_samples;
+    ALLOC_STACK;
+
+    if (frame_size <= 0) {
+        RESTORE_STACK;
+        return OAC_BAD_ARG;
+    }
+    if (data != NULL && len > 0 && !decode_fec) {
+        nb_samples = oac_decoder_get_nb_samples(st, data, len);
+        if (nb_samples > 0)
+            frame_size = IMIN(frame_size, nb_samples);
+        else
+            return OAC_INVALID_PACKET;
+    }
+    celt_assert(st->channels == 1 || st->channels == 2);
+    ALLOC(out, frame_size*st->channels, oac_res);
+
+    ret = oac_decode_native(st, data, len, out, frame_size, decode_fec, 0, NULL, 0, NULL, 0);
+    if (ret > 0) {
+        for (i = 0; i < ret*st->channels; i++)
+            pcm[i] = RES2FLOAT(out[i]);
+    }
+    RESTORE_STACK;
+    return ret;
 }
 # endif
 
 #endif
 
 
-int oac_decoder_ctl(OacDecoder *st, int request, ...)
-{
-   int ret = OAC_OK;
-   va_list ap;
-   void *silk_dec;
-   CELTDecoder *celt_dec;
-
-   silk_dec = (char*)st+st->silk_dec_offset;
-   celt_dec = (CELTDecoder*)((char*)st+st->celt_dec_offset);
-
-
-   va_start(ap, request);
-
-   switch (request)
-   {
-   case OAC_GET_BANDWIDTH_REQUEST:
-   {
-      oac_int32 *value = va_arg(ap, oac_int32*);
-      if (!value)
-      {
-         goto bad_arg;
-      }
-      *value = st->bandwidth;
-   }
-   break;
-   case OAC_SET_COMPLEXITY_REQUEST:
-   {
-       oac_int32 value = va_arg(ap, oac_int32);
-       if(value<0 || value>10)
-       {
-          goto bad_arg;
-       }
-       st->complexity = value;
-       celt_decoder_ctl(celt_dec, OAC_SET_COMPLEXITY(value));
-   }
-   break;
-   case OAC_GET_COMPLEXITY_REQUEST:
-   {
-       oac_int32 *value = va_arg(ap, oac_int32*);
-       if (!value)
-       {
-          goto bad_arg;
-       }
-       *value = st->complexity;
-   }
-   break;
+int oac_decoder_ctl(OacDecoder *st, int request, ...) {
+    int ret = OAC_OK;
+    va_list ap;
+    void *silk_dec;
+    CELTDecoder *celt_dec;
+
+    silk_dec = (char*)st + st->silk_dec_offset;
+    celt_dec = (CELTDecoder*)((char*)st + st->celt_dec_offset);
+
+
+    va_start(ap, request);
+
+    switch (request) {
+        case OAC_GET_BANDWIDTH_REQUEST:
+        {
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            if (!value) {
+                goto bad_arg;
+            }
+            *value = st->bandwidth;
+        }
+        break;
+        case OAC_SET_COMPLEXITY_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            if (value < 0 || value > 10) {
+                goto bad_arg;
+            }
+            st->complexity = value;
+            celt_decoder_ctl(celt_dec, OAC_SET_COMPLEXITY(value));
+        }
+        break;
+        case OAC_GET_COMPLEXITY_REQUEST:
+        {
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            if (!value) {
+                goto bad_arg;
+            }
+            *value = st->complexity;
+        }
+        break;
 #ifdef ENABLE_OSCE_BWE
-   case OAC_SET_OSCE_BWE_REQUEST:
-   {
-       oac_int32 value = va_arg(ap, oac_int32);
-       if(value<0 || value>1)
-       {          goto bad_arg;
-       }
-       st->DecControl.enable_osce_bwe = value;
-
-      }
-   break;
-   case OAC_GET_OSCE_BWE_REQUEST:
-   {
-       oac_int32 *value = va_arg(ap, oac_int32*);
-       if (!value)
-       {
-          goto bad_arg;
-       }
-       *value = st->DecControl.enable_osce_bwe;
-   }
-   break;
+        case OAC_SET_OSCE_BWE_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            if (value < 0 || value > 1) {
+                goto bad_arg;
+            }
+            st->DecControl.enable_osce_bwe = value;
+
+        }
+        break;
+        case OAC_GET_OSCE_BWE_REQUEST:
+        {
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            if (!value) {
+                goto bad_arg;
+            }
+            *value = st->DecControl.enable_osce_bwe;
+        }
+        break;
 #endif
-   case OAC_GET_FINAL_RANGE_REQUEST:
-   {
-      oac_uint32 *value = va_arg(ap, oac_uint32*);
-      if (!value)
-      {
-         goto bad_arg;
-      }
-      *value = st->rangeFinal;
-   }
-   break;
-   case OAC_RESET_STATE:
-   {
-      OAC_CLEAR((char*)&st->OAC_DECODER_RESET_START,
-            sizeof(OacDecoder)-
-            ((char*)&st->OAC_DECODER_RESET_START - (char*)st));
-
-      celt_decoder_ctl(celt_dec, OAC_RESET_STATE);
-      silk_ResetDecoder( silk_dec );
-      st->stream_channels = st->channels;
-      st->frame_size = st->Fs/400;
+        case OAC_GET_FINAL_RANGE_REQUEST:
+        {
+            oac_uint32 *value = va_arg(ap, oac_uint32*);
+            if (!value) {
+                goto bad_arg;
+            }
+            *value = st->rangeFinal;
+        }
+        break;
+        case OAC_RESET_STATE:
+        {
+            OAC_CLEAR((char*)&st->OAC_DECODER_RESET_START,
+            sizeof(OacDecoder)
+                - ((char*)&st->OAC_DECODER_RESET_START - (char*)st));
+
+            celt_decoder_ctl(celt_dec, OAC_RESET_STATE);
+            silk_ResetDecoder( silk_dec );
+            st->stream_channels = st->channels;
+            st->frame_size = st->Fs/400;
 #ifdef ENABLE_DEEP_PLC
-      lpcnet_plc_reset( &st->lpcnet );
+            lpcnet_plc_reset( &st->lpcnet );
 #endif
-   }
-   break;
-   case OAC_GET_SAMPLE_RATE_REQUEST:
-   {
-      oac_int32 *value = va_arg(ap, oac_int32*);
-      if (!value)
-      {
-         goto bad_arg;
-      }
-      *value = st->Fs;
-   }
-   break;
-   case OAC_GET_PITCH_REQUEST:
-   {
-      oac_int32 *value = va_arg(ap, oac_int32*);
-      if (!value)
-      {
-         goto bad_arg;
-      }
-      if (st->prev_mode == MODE_CELT_ONLY)
-         ret = celt_decoder_ctl(celt_dec, OAC_GET_PITCH(value));
-      else
-         *value = st->DecControl.prevPitchLag;
-   }
-   break;
-   case OAC_GET_GAIN_REQUEST:
-   {
-      oac_int32 *value = va_arg(ap, oac_int32*);
-      if (!value)
-      {
-         goto bad_arg;
-      }
-      *value = st->decode_gain;
-   }
-   break;
-   case OAC_SET_GAIN_REQUEST:
-   {
-       oac_int32 value = va_arg(ap, oac_int32);
-       if (value<-32768 || value>32767)
-       {
-          goto bad_arg;
-       }
-       st->decode_gain = value;
-   }
-   break;
-   case OAC_GET_LAST_PACKET_DURATION_REQUEST:
-   {
-      oac_int32 *value = va_arg(ap, oac_int32*);
-      if (!value)
-      {
-         goto bad_arg;
-      }
-      *value = st->last_packet_duration;
-   }
-   break;
-   case OAC_SET_PHASE_INVERSION_DISABLED_REQUEST:
-   {
-       oac_int32 value = va_arg(ap, oac_int32);
-       if(value<0 || value>1)
-       {
-          goto bad_arg;
-       }
-       ret = celt_decoder_ctl(celt_dec, OAC_SET_PHASE_INVERSION_DISABLED(value));
-   }
-   break;
-   case OAC_GET_PHASE_INVERSION_DISABLED_REQUEST:
-   {
-       oac_int32 *value = va_arg(ap, oac_int32*);
-       if (!value)
-       {
-          goto bad_arg;
-       }
-       ret = celt_decoder_ctl(celt_dec, OAC_GET_PHASE_INVERSION_DISABLED(value));
-   }
-   break;
-   case OAC_SET_IGNORE_EXTENSIONS_REQUEST:
-   {
-       oac_int32 value = va_arg(ap, oac_int32);
-       if(value<0 || value>1)
-       {
-          goto bad_arg;
-       }
-       st->ignore_extensions = value;
-   }
-   break;
-   case OAC_GET_IGNORE_EXTENSIONS_REQUEST:
-   {
-       oac_int32 *value = va_arg(ap, oac_int32*);
-       if (!value)
-       {
-          goto bad_arg;
-       }
-       *value = st->ignore_extensions;
-   }
-   break;
+        }
+        break;
+        case OAC_GET_SAMPLE_RATE_REQUEST:
+        {
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            if (!value) {
+                goto bad_arg;
+            }
+            *value = st->Fs;
+        }
+        break;
+        case OAC_GET_PITCH_REQUEST:
+        {
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            if (!value) {
+                goto bad_arg;
+            }
+            if (st->prev_mode == MODE_CELT_ONLY)
+                ret = celt_decoder_ctl(celt_dec, OAC_GET_PITCH(value));
+            else
+                *value = st->DecControl.prevPitchLag;
+        }
+        break;
+        case OAC_GET_GAIN_REQUEST:
+        {
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            if (!value) {
+                goto bad_arg;
+            }
+            *value = st->decode_gain;
+        }
+        break;
+        case OAC_SET_GAIN_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            if (value < -32768 || value > 32767) {
+                goto bad_arg;
+            }
+            st->decode_gain = value;
+        }
+        break;
+        case OAC_GET_LAST_PACKET_DURATION_REQUEST:
+        {
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            if (!value) {
+                goto bad_arg;
+            }
+            *value = st->last_packet_duration;
+        }
+        break;
+        case OAC_SET_PHASE_INVERSION_DISABLED_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            if (value < 0 || value > 1) {
+                goto bad_arg;
+            }
+            ret = celt_decoder_ctl(celt_dec, OAC_SET_PHASE_INVERSION_DISABLED(value));
+        }
+        break;
+        case OAC_GET_PHASE_INVERSION_DISABLED_REQUEST:
+        {
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            if (!value) {
+                goto bad_arg;
+            }
+            ret = celt_decoder_ctl(celt_dec, OAC_GET_PHASE_INVERSION_DISABLED(value));
+        }
+        break;
+        case OAC_SET_IGNORE_EXTENSIONS_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            if (value < 0 || value > 1) {
+                goto bad_arg;
+            }
+            st->ignore_extensions = value;
+        }
+        break;
+        case OAC_GET_IGNORE_EXTENSIONS_REQUEST:
+        {
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            if (!value) {
+                goto bad_arg;
+            }
+            *value = st->ignore_extensions;
+        }
+        break;
 #ifdef USE_WEIGHTS_FILE
-   case OAC_SET_DNN_BLOB_REQUEST:
-   {
-       const unsigned char *data = va_arg(ap, const unsigned char *);
-       oac_int32 len = va_arg(ap, oac_int32);
-       if(len<0 || data == NULL)
-       {
-          goto bad_arg;
-       }
-       ret = lpcnet_plc_load_model(&st->lpcnet, data, len);
-       ret = silk_LoadOSCEModels(silk_dec, data, len) || ret;
-   }
-   break;
+        case OAC_SET_DNN_BLOB_REQUEST:
+        {
+            const unsigned char *data = va_arg(ap, const unsigned char *);
+            oac_int32 len = va_arg(ap, oac_int32);
+            if (len < 0 || data == NULL) {
+                goto bad_arg;
+            }
+            ret = lpcnet_plc_load_model(&st->lpcnet, data, len);
+            ret = silk_LoadOSCEModels(silk_dec, data, len) || ret;
+        }
+        break;
 #endif
-   default:
-      /*fprintf(stderr, "unknown oac_decoder_ctl() request: %d", request);*/
-      ret = OAC_UNIMPLEMENTED;
-      break;
-   }
-
-   va_end(ap);
-   return ret;
+        default:
+            /*fprintf(stderr, "unknown oac_decoder_ctl() request: %d", request);*/
+            ret = OAC_UNIMPLEMENTED;
+            break;
+    }
+
+    va_end(ap);
+    return ret;
 bad_arg:
-   va_end(ap);
-   return OAC_BAD_ARG;
+    va_end(ap);
+    return OAC_BAD_ARG;
 }
 
-void oac_decoder_destroy(OacDecoder *st)
-{
-   oac_free(st);
+void oac_decoder_destroy(OacDecoder *st) {
+    oac_free(st);
 }
 
 
-int oac_packet_get_bandwidth(const unsigned char *data)
-{
-   int bandwidth;
-   if (data[0]&0x80)
-   {
-      bandwidth = OAC_BANDWIDTH_MEDIUMBAND + ((data[0]>>5)&0x3);
-      if (bandwidth == OAC_BANDWIDTH_MEDIUMBAND)
-         bandwidth = OAC_BANDWIDTH_NARROWBAND;
-   } else if ((data[0]&0x60) == 0x60)
-   {
-      bandwidth = (data[0]&0x10) ? OAC_BANDWIDTH_FULLBAND :
-                                   OAC_BANDWIDTH_SUPERWIDEBAND;
-   } else {
-      bandwidth = OAC_BANDWIDTH_NARROWBAND + ((data[0]>>5)&0x3);
-   }
-   return bandwidth;
+int oac_packet_get_bandwidth(const unsigned char *data) {
+    int bandwidth;
+    if (data[0]&0x80) {
+        bandwidth = OAC_BANDWIDTH_MEDIUMBAND + ((data[0]>>5)&0x3);
+        if (bandwidth == OAC_BANDWIDTH_MEDIUMBAND)
+            bandwidth = OAC_BANDWIDTH_NARROWBAND;
+    } else if ((data[0]&0x60) == 0x60) {
+        bandwidth = (data[0]&0x10) ? OAC_BANDWIDTH_FULLBAND :
+                    OAC_BANDWIDTH_SUPERWIDEBAND;
+    } else {
+        bandwidth = OAC_BANDWIDTH_NARROWBAND + ((data[0]>>5)&0x3);
+    }
+    return bandwidth;
 }
 
-int oac_packet_get_nb_channels(const unsigned char *data)
-{
-   return (data[0]&0x4) ? 2 : 1;
+int oac_packet_get_nb_channels(const unsigned char *data) {
+    return (data[0]&0x4) ? 2 : 1;
 }
 
-int oac_packet_get_nb_frames(const unsigned char packet[], oac_int32 len)
-{
-   int count;
-   if (len<1)
-      return OAC_BAD_ARG;
-   count = packet[0]&0x3;
-   if (count==0)
-      return 1;
-   else if (count!=3)
-      return 2;
-   else if (len<2)
-      return OAC_INVALID_PACKET;
-   else
-      return packet[1]&0x3F;
+int oac_packet_get_nb_frames(const unsigned char packet[], oac_int32 len) {
+    int count;
+    if (len < 1)
+        return OAC_BAD_ARG;
+    count = packet[0]&0x3;
+    if (count == 0)
+        return 1;
+    else if (count != 3)
+        return 2;
+    else if (len < 2)
+        return OAC_INVALID_PACKET;
+    else
+        return packet[1]&0x3F;
 }
 
 int oac_packet_get_nb_samples(const unsigned char packet[], oac_int32 len,
-      oac_int32 Fs)
-{
-   int samples;
-   int count = oac_packet_get_nb_frames(packet, len);
-
-   if (count<0)
-      return count;
-
-   samples = count*oac_packet_get_samples_per_frame(packet, Fs);
-   /* Can't have more than 120 ms */
-   if (samples*25 > Fs*3)
-      return OAC_INVALID_PACKET;
-   else
-      return samples;
+                              oac_int32 Fs) {
+    int samples;
+    int count = oac_packet_get_nb_frames(packet, len);
+
+    if (count < 0)
+        return count;
+
+    samples = count*oac_packet_get_samples_per_frame(packet, Fs);
+    /* Can't have more than 120 ms */
+    if (samples*25 > Fs*3)
+        return OAC_INVALID_PACKET;
+    else
+        return samples;
 }
 
-int oac_packet_has_lbrr(const unsigned char packet[], oac_int32 len)
-{
-   int ret;
-   const unsigned char *frames[48];
-   oac_int16 size[48];
-   int packet_mode, packet_frame_size, packet_stream_channels;
-   int nb_frames=1;
-   int lbrr;
-
-   packet_mode = oac_packet_get_mode(packet);
-   if (packet_mode == MODE_CELT_ONLY)
-      return 0;
-   packet_frame_size = oac_packet_get_samples_per_frame(packet, 48000);
-   if (packet_frame_size > 960)
-      nb_frames = packet_frame_size/960;
-   packet_stream_channels = oac_packet_get_nb_channels(packet);
-   ret = oac_packet_parse(packet, len, NULL, frames, size, NULL);
-   if (ret <= 0)
-      return ret;
-   if (size[0] == 0)
-      return 0;
-   lbrr = (frames[0][0] >> (7-nb_frames)) & 0x1;
-   if (packet_stream_channels == 2)
-      lbrr = lbrr || ((frames[0][0] >> (6-2*nb_frames)) & 0x1);
-   return lbrr;
+int oac_packet_has_lbrr(const unsigned char packet[], oac_int32 len) {
+    int ret;
+    const unsigned char *frames[48];
+    oac_int16 size[48];
+    int packet_mode, packet_frame_size, packet_stream_channels;
+    int nb_frames = 1;
+    int lbrr;
+
+    packet_mode = oac_packet_get_mode(packet);
+    if (packet_mode == MODE_CELT_ONLY)
+        return 0;
+    packet_frame_size = oac_packet_get_samples_per_frame(packet, 48000);
+    if (packet_frame_size > 960)
+        nb_frames = packet_frame_size/960;
+    packet_stream_channels = oac_packet_get_nb_channels(packet);
+    ret = oac_packet_parse(packet, len, NULL, frames, size, NULL);
+    if (ret <= 0)
+        return ret;
+    if (size[0] == 0)
+        return 0;
+    lbrr = (frames[0][0]>>(7 - nb_frames))&0x1;
+    if (packet_stream_channels == 2)
+        lbrr = lbrr || ((frames[0][0]>>(6 - 2*nb_frames))&0x1);
+    return lbrr;
 }
 
 int oac_decoder_get_nb_samples(const OacDecoder *dec,
-      const unsigned char packet[], oac_int32 len)
-{
-   return oac_packet_get_nb_samples(packet, len, dec->Fs);
+                               const unsigned char packet[], oac_int32 len) {
+    return oac_packet_get_nb_samples(packet, len, dec->Fs);
 }
 
 struct OacDREDDecoder {
 #ifdef ENABLE_DRED
-   RDOVAEDec model;
+    RDOVAEDec model;
 #endif
-   int loaded;
-   int arch;
-   oac_uint32 magic;
+    int loaded;
+    int arch;
+    oac_uint32 magic;
 };
 
 #if defined(ENABLE_DRED) && (defined(ENABLE_HARDENING) || defined(ENABLE_ASSERTIONS))
-static void validate_dred_decoder(OacDREDDecoder *st)
-{
-   celt_assert(st->magic == 0xD8EDDEC0);
-#ifdef OAC_ARCHMASK
-   celt_assert(st->arch >= 0);
-   celt_assert(st->arch <= OAC_ARCHMASK);
-#endif
+static void validate_dred_decoder(OacDREDDecoder *st) {
+    celt_assert(st->magic == 0xD8EDDEC0);
+# ifdef OAC_ARCHMASK
+    celt_assert(st->arch >= 0);
+    celt_assert(st->arch <= OAC_ARCHMASK);
+# endif
 }
-#define VALIDATE_DRED_DECODER(st) validate_dred_decoder(st)
+# define VALIDATE_DRED_DECODER(st) validate_dred_decoder(st)
 #else
-#define VALIDATE_DRED_DECODER(st)
+# define VALIDATE_DRED_DECODER(st)
 #endif
 
 
-int oac_dred_decoder_get_size(void)
-{
-  return sizeof(OacDREDDecoder);
+int oac_dred_decoder_get_size(void) {
+    return sizeof(OacDREDDecoder);
 }
 
 #ifdef ENABLE_DRED
-int dred_decoder_load_model(OacDREDDecoder *dec, const unsigned char *data, int len)
-{
+int dred_decoder_load_model(OacDREDDecoder *dec, const unsigned char *data, int len) {
     WeightArray *list;
     int ret;
     parse_weights(&list, data, len);
@@ -1329,314 +1247,297 @@ int dred_decoder_load_model(OacDREDDecoder *dec, const unsigned char *data, int
 }
 #endif
 
-int oac_dred_decoder_init(OacDREDDecoder *dec)
-{
-   int ret = 0;
-   dec->loaded = 0;
+int oac_dred_decoder_init(OacDREDDecoder *dec) {
+    int ret = 0;
+    dec->loaded = 0;
 #if defined(ENABLE_DRED) && !defined(USE_WEIGHTS_FILE)
-   ret = init_rdovaedec(&dec->model, rdovaedec_arrays);
-   if (ret == 0) dec->loaded = 1;
+    ret = init_rdovaedec(&dec->model, rdovaedec_arrays);
+    if (ret == 0) dec->loaded = 1;
 #endif
-   dec->arch = oac_select_arch();
-   /* To make sure nobody forgets to init, use a magic number. */
-   dec->magic = 0xD8EDDEC0;
-   return (ret == 0) ? OAC_OK : OAC_UNIMPLEMENTED;
+    dec->arch = oac_select_arch();
+    /* To make sure nobody forgets to init, use a magic number. */
+    dec->magic = 0xD8EDDEC0;
+    return (ret == 0) ? OAC_OK : OAC_UNIMPLEMENTED;
 }
 
-OacDREDDecoder *oac_dred_decoder_create(int *error)
-{
-   int ret;
-   OacDREDDecoder *dec;
-   dec = (OacDREDDecoder *)oac_alloc(oac_dred_decoder_get_size());
-   if (dec == NULL)
-   {
-      if (error)
-         *error = OAC_ALLOC_FAIL;
-      return NULL;
-   }
-   ret = oac_dred_decoder_init(dec);
-   if (error)
-      *error = ret;
-   if (ret != OAC_OK)
-   {
-      oac_free(dec);
-      dec = NULL;
-   }
-   return dec;
+OacDREDDecoder *oac_dred_decoder_create(int *error) {
+    int ret;
+    OacDREDDecoder *dec;
+    dec = (OacDREDDecoder *)oac_alloc(oac_dred_decoder_get_size());
+    if (dec == NULL) {
+        if (error)
+            *error = OAC_ALLOC_FAIL;
+        return NULL;
+    }
+    ret = oac_dred_decoder_init(dec);
+    if (error)
+        *error = ret;
+    if (ret != OAC_OK) {
+        oac_free(dec);
+        dec = NULL;
+    }
+    return dec;
 }
 
-void oac_dred_decoder_destroy(OacDREDDecoder *dec)
-{
-   if (dec) dec->magic = 0xDE57801D;
-   oac_free(dec);
+void oac_dred_decoder_destroy(OacDREDDecoder *dec) {
+    if (dec) dec->magic = 0xDE57801D;
+    oac_free(dec);
 }
 
-int oac_dred_decoder_ctl(OacDREDDecoder *dred_dec, int request, ...)
-{
+int oac_dred_decoder_ctl(OacDREDDecoder *dred_dec, int request, ...) {
 #ifdef ENABLE_DRED
-   int ret = OAC_OK;
-   va_list ap;
+    int ret = OAC_OK;
+    va_list ap;
 
-   va_start(ap, request);
-   (void)dred_dec;
-   switch (request)
-   {
+    va_start(ap, request);
+    (void)dred_dec;
+    switch (request) {
 # ifdef USE_WEIGHTS_FILE
-   case OAC_SET_DNN_BLOB_REQUEST:
-   {
-      const unsigned char *data = va_arg(ap, const unsigned char *);
-      oac_int32 len = va_arg(ap, oac_int32);
-      if(len<0 || data == NULL)
-      {
-         goto bad_arg;
-      }
-      return dred_decoder_load_model(dred_dec, data, len);
-   }
-   break;
+        case OAC_SET_DNN_BLOB_REQUEST:
+        {
+            const unsigned char *data = va_arg(ap, const unsigned char *);
+            oac_int32 len = va_arg(ap, oac_int32);
+            if (len < 0 || data == NULL) {
+                goto bad_arg;
+            }
+            return dred_decoder_load_model(dred_dec, data, len);
+        }
+        break;
 # endif
-   default:
-     /*fprintf(stderr, "unknown oac_decoder_ctl() request: %d", request);*/
-     ret = OAC_UNIMPLEMENTED;
-     break;
-  }
-  va_end(ap);
-  return ret;
+        default:
+            /*fprintf(stderr, "unknown oac_decoder_ctl() request: %d", request);*/
+            ret = OAC_UNIMPLEMENTED;
+            break;
+    }
+    va_end(ap);
+    return ret;
 # ifdef USE_WEIGHTS_FILE
 bad_arg:
-  va_end(ap);
-  return OAC_BAD_ARG;
+    va_end(ap);
+    return OAC_BAD_ARG;
 # endif
 #else
-  (void)dred_dec;
-  (void)request;
-  return OAC_UNIMPLEMENTED;
+    (void)dred_dec;
+    (void)request;
+    return OAC_UNIMPLEMENTED;
 #endif
 }
 
 #ifdef ENABLE_DRED
-static int dred_find_payload(const unsigned char *data, oac_int32 len, const unsigned char **payload, int *dred_frame_offset)
-{
-   OacExtensionIterator iter;
-   oac_extension_data ext;
-   const unsigned char *padding;
-   oac_int32 padding_len;
-   int nb_frames;
-   const unsigned char *frames[48];
-   oac_int16 size[48];
-   int frame_size;
-   int ret;
-
-   *payload = NULL;
-   /* Get the padding section of the packet. */
-   ret = oac_packet_parse_impl(data, len, 0, NULL, frames, size, NULL, NULL,
+static int dred_find_payload(const unsigned char *data, oac_int32 len, const unsigned char **payload,
+                             int *dred_frame_offset) {
+    OacExtensionIterator iter;
+    oac_extension_data ext;
+    const unsigned char *padding;
+    oac_int32 padding_len;
+    int nb_frames;
+    const unsigned char *frames[48];
+    oac_int16 size[48];
+    int frame_size;
+    int ret;
+
+    *payload = NULL;
+    /* Get the padding section of the packet. */
+    ret = oac_packet_parse_impl(data, len, 0, NULL, frames, size, NULL, NULL,
     &padding, &padding_len);
-   if (ret < 0)
-      return ret;
-   nb_frames = ret;
-   frame_size = oac_packet_get_samples_per_frame(data, 48000);
-   oac_extension_iterator_init(&iter, padding, padding_len, nb_frames);
-   for (;;) {
-      ret = oac_extension_iterator_find(&iter, &ext, DRED_EXTENSION_ID);
-      if (ret <= 0)
-         return ret;
-      /* DRED position in the packet, in units of 2.5 ms like for the signaled DRED offset. */
-      *dred_frame_offset = ext.frame*frame_size/120;
-#ifdef DRED_EXPERIMENTAL_VERSION
-      /* Check that temporary extension type and version match.
-         This check will be removed once extension is finalized. */
-      if (ext.len > DRED_EXPERIMENTAL_BYTES && ext.data[0] == 'D'
-       && ext.data[1] == DRED_EXPERIMENTAL_VERSION) {
-         *payload = ext.data+2;
-         return ext.len-2;
-      }
-#else
-      if (ext.len > 0) {
-         *payload = ext.data;
-         return ext.len;
-      }
-#endif
-   }
+    if (ret < 0)
+        return ret;
+    nb_frames = ret;
+    frame_size = oac_packet_get_samples_per_frame(data, 48000);
+    oac_extension_iterator_init(&iter, padding, padding_len, nb_frames);
+    for (;;) {
+        ret = oac_extension_iterator_find(&iter, &ext, DRED_EXTENSION_ID);
+        if (ret <= 0)
+            return ret;
+        /* DRED position in the packet, in units of 2.5 ms like for the signaled DRED offset. */
+        *dred_frame_offset = ext.frame*frame_size/120;
+# ifdef DRED_EXPERIMENTAL_VERSION
+        /* Check that temporary extension type and version match.
+           This check will be removed once extension is finalized. */
+        if (ext.len > DRED_EXPERIMENTAL_BYTES && ext.data[0] == 'D'
+            && ext.data[1] == DRED_EXPERIMENTAL_VERSION) {
+            *payload = ext.data + 2;
+            return ext.len - 2;
+        }
+# else
+        if (ext.len > 0) {
+            *payload = ext.data;
+            return ext.len;
+        }
+# endif
+    }
 }
 #endif
 
-int oac_dred_get_size(void)
-{
+int oac_dred_get_size(void) {
 #ifdef ENABLE_DRED
-  return sizeof(OacDRED);
+    return sizeof(OacDRED);
 #else
-  return 0;
+    return 0;
 #endif
 }
 
-OacDRED *oac_dred_alloc(int *error)
-{
+OacDRED *oac_dred_alloc(int *error) {
 #ifdef ENABLE_DRED
-  OacDRED *dec;
-  dec = (OacDRED *)oac_alloc(oac_dred_get_size());
-  if (dec == NULL)
-  {
+    OacDRED *dec;
+    dec = (OacDRED *)oac_alloc(oac_dred_get_size());
+    if (dec == NULL) {
+        if (error)
+            *error = OAC_ALLOC_FAIL;
+        return NULL;
+    }
+    return dec;
+#else
     if (error)
-      *error = OAC_ALLOC_FAIL;
+        *error = OAC_UNIMPLEMENTED;
     return NULL;
-  }
-  return dec;
-#else
-  if (error)
-    *error = OAC_UNIMPLEMENTED;
-  return NULL;
 #endif
 }
 
-void oac_dred_free(OacDRED *dec)
-{
+void oac_dred_free(OacDRED *dec) {
 #ifdef ENABLE_DRED
-  oac_free(dec);
+    oac_free(dec);
 #else
-  (void)dec;
+    (void)dec;
 #endif
 }
 
-int oac_dred_parse(OacDREDDecoder *dred_dec, OacDRED *dred, const unsigned char *data, oac_int32 len, oac_int32 max_dred_samples, oac_int32 sampling_rate, int *dred_end, int defer_processing)
-{
+int oac_dred_parse(OacDREDDecoder *dred_dec, OacDRED *dred, const unsigned char *data, oac_int32 len,
+                   oac_int32 max_dred_samples, oac_int32 sampling_rate, int *dred_end, int defer_processing) {
 #ifdef ENABLE_DRED
-   const unsigned char *payload;
-   oac_int32 payload_len;
-   int dred_frame_offset=0;
-   VALIDATE_DRED_DECODER(dred_dec);
-   if (!dred_dec->loaded) return OAC_UNIMPLEMENTED;
-   dred->process_stage = -1;
-   payload_len = dred_find_payload(data, len, &payload, &dred_frame_offset);
-   if (payload_len < 0)
-      return payload_len;
-   if (payload != NULL)
-   {
-      int offset;
-      int min_feature_frames;
-      offset = 100*max_dred_samples/sampling_rate;
-      min_feature_frames = IMIN(2 + offset, 2*DRED_NUM_REDUNDANCY_FRAMES);
-      dred_ec_decode(dred, payload, payload_len, min_feature_frames, dred_frame_offset);
-      if (!defer_processing)
-         oac_dred_process(dred_dec, dred, dred);
-      if (dred_end) *dred_end = IMAX(0, -dred->dred_offset*sampling_rate/400);
-      return IMAX(0, dred->nb_latents*sampling_rate/25 - dred->dred_offset* sampling_rate/400);
-   }
-   if (dred_end) *dred_end = 0;
-   return 0;
+    const unsigned char *payload;
+    oac_int32 payload_len;
+    int dred_frame_offset = 0;
+    VALIDATE_DRED_DECODER(dred_dec);
+    if (!dred_dec->loaded) return OAC_UNIMPLEMENTED;
+    dred->process_stage = -1;
+    payload_len = dred_find_payload(data, len, &payload, &dred_frame_offset);
+    if (payload_len < 0)
+        return payload_len;
+    if (payload != NULL) {
+        int offset;
+        int min_feature_frames;
+        offset = 100*max_dred_samples/sampling_rate;
+        min_feature_frames = IMIN(2 + offset, 2*DRED_NUM_REDUNDANCY_FRAMES);
+        dred_ec_decode(dred, payload, payload_len, min_feature_frames, dred_frame_offset);
+        if (!defer_processing)
+            oac_dred_process(dred_dec, dred, dred);
+        if (dred_end) *dred_end = IMAX(0, -dred->dred_offset*sampling_rate/400);
+        return IMAX(0, dred->nb_latents*sampling_rate/25 - dred->dred_offset*sampling_rate/400);
+    }
+    if (dred_end) *dred_end = 0;
+    return 0;
 #else
-   (void)dred_dec;
-   (void)dred;
-   (void)data;
-   (void)len;
-   (void)max_dred_samples;
-   (void)sampling_rate;
-   (void)defer_processing;
-   (void)dred_end;
-   return OAC_UNIMPLEMENTED;
+    (void)dred_dec;
+    (void)dred;
+    (void)data;
+    (void)len;
+    (void)max_dred_samples;
+    (void)sampling_rate;
+    (void)defer_processing;
+    (void)dred_end;
+    return OAC_UNIMPLEMENTED;
 #endif
 }
 
-int oac_dred_process(OacDREDDecoder *dred_dec, const OacDRED *src, OacDRED *dst)
-{
+int oac_dred_process(OacDREDDecoder *dred_dec, const OacDRED *src, OacDRED *dst) {
 #ifdef ENABLE_DRED
-   if (dred_dec == NULL || src == NULL || dst == NULL || (src->process_stage != 1 && src->process_stage != 2))
-      return OAC_BAD_ARG;
-   VALIDATE_DRED_DECODER(dred_dec);
-   if (!dred_dec->loaded) return OAC_UNIMPLEMENTED;
-   if (src != dst)
-      OAC_COPY(dst, src, 1);
-   if (dst->process_stage == 2)
-      return OAC_OK;
-   DRED_rdovae_decode_all(&dred_dec->model, dst->fec_features, dst->state, dst->latents, dst->nb_latents, dred_dec->arch);
-   dst->process_stage = 2;
-   return OAC_OK;
+    if (dred_dec == NULL || src == NULL || dst == NULL || (src->process_stage != 1 && src->process_stage != 2))
+        return OAC_BAD_ARG;
+    VALIDATE_DRED_DECODER(dred_dec);
+    if (!dred_dec->loaded) return OAC_UNIMPLEMENTED;
+    if (src != dst)
+        OAC_COPY(dst, src, 1);
+    if (dst->process_stage == 2)
+        return OAC_OK;
+    DRED_rdovae_decode_all(&dred_dec->model, dst->fec_features, dst->state, dst->latents, dst->nb_latents,
+    dred_dec->arch);
+    dst->process_stage = 2;
+    return OAC_OK;
 #else
-   (void)dred_dec;
-   (void)src;
-   (void)dst;
-   return OAC_UNIMPLEMENTED;
+    (void)dred_dec;
+    (void)src;
+    (void)dst;
+    return OAC_UNIMPLEMENTED;
 #endif
 }
 
-int oac_decoder_dred_decode(OacDecoder *st, const OacDRED *dred, oac_int32 dred_offset, oac_int16 *pcm, oac_int32 frame_size)
-{
+int oac_decoder_dred_decode(OacDecoder *st, const OacDRED *dred, oac_int32 dred_offset, oac_int16 *pcm,
+                            oac_int32 frame_size) {
 #ifdef ENABLE_DRED
-   VARDECL(float, out);
-   int ret, i;
-   ALLOC_STACK;
-
-   if(frame_size<=0)
-   {
-      RESTORE_STACK;
-      return OAC_BAD_ARG;
-   }
-
-   celt_assert(st->channels == 1 || st->channels == 2);
-   ALLOC(out, frame_size*st->channels, float);
-
-   ret = oac_decode_native(st, NULL, 0, out, frame_size, 0, 0, NULL, 1, dred, dred_offset);
-   if (ret > 0)
-   {
-      for (i=0;i<ret*st->channels;i++)
-         pcm[i] = RES2INT16(out[i]);
-   }
-   RESTORE_STACK;
-   return ret;
+    VARDECL(float, out);
+    int ret, i;
+    ALLOC_STACK;
+
+    if (frame_size <= 0) {
+        RESTORE_STACK;
+        return OAC_BAD_ARG;
+    }
+
+    celt_assert(st->channels == 1 || st->channels == 2);
+    ALLOC(out, frame_size*st->channels, float);
+
+    ret = oac_decode_native(st, NULL, 0, out, frame_size, 0, 0, NULL, 1, dred, dred_offset);
+    if (ret > 0) {
+        for (i = 0; i < ret*st->channels; i++)
+            pcm[i] = RES2INT16(out[i]);
+    }
+    RESTORE_STACK;
+    return ret;
 #else
-   (void)st;
-   (void)dred;
-   (void)dred_offset;
-   (void)pcm;
-   (void)frame_size;
-   return OAC_UNIMPLEMENTED;
+    (void)st;
+    (void)dred;
+    (void)dred_offset;
+    (void)pcm;
+    (void)frame_size;
+    return OAC_UNIMPLEMENTED;
 #endif
 }
 
-int oac_decoder_dred_decode24(OacDecoder *st, const OacDRED *dred, oac_int32 dred_offset, oac_int32 *pcm, oac_int32 frame_size)
-{
+int oac_decoder_dred_decode24(OacDecoder *st, const OacDRED *dred, oac_int32 dred_offset, oac_int32 *pcm,
+                              oac_int32 frame_size) {
 #ifdef ENABLE_DRED
-   VARDECL(float, out);
-   int ret, i;
-   ALLOC_STACK;
-
-   if(frame_size<=0)
-   {
-      RESTORE_STACK;
-      return OAC_BAD_ARG;
-   }
-
-   celt_assert(st->channels == 1 || st->channels == 2);
-   ALLOC(out, frame_size*st->channels, float);
-
-   ret = oac_decode_native(st, NULL, 0, out, frame_size, 0, 0, NULL, 1, dred, dred_offset);
-   if (ret > 0)
-   {
-      for (i=0;i<ret*st->channels;i++)
-         pcm[i] = RES2INT24(out[i]);
-   }
-   RESTORE_STACK;
-   return ret;
+    VARDECL(float, out);
+    int ret, i;
+    ALLOC_STACK;
+
+    if (frame_size <= 0) {
+        RESTORE_STACK;
+        return OAC_BAD_ARG;
+    }
+
+    celt_assert(st->channels == 1 || st->channels == 2);
+    ALLOC(out, frame_size*st->channels, float);
+
+    ret = oac_decode_native(st, NULL, 0, out, frame_size, 0, 0, NULL, 1, dred, dred_offset);
+    if (ret > 0) {
+        for (i = 0; i < ret*st->channels; i++)
+            pcm[i] = RES2INT24(out[i]);
+    }
+    RESTORE_STACK;
+    return ret;
 #else
-   (void)st;
-   (void)dred;
-   (void)dred_offset;
-   (void)pcm;
-   (void)frame_size;
-   return OAC_UNIMPLEMENTED;
+    (void)st;
+    (void)dred;
+    (void)dred_offset;
+    (void)pcm;
+    (void)frame_size;
+    return OAC_UNIMPLEMENTED;
 #endif
 }
 
-int oac_decoder_dred_decode_float(OacDecoder *st, const OacDRED *dred, oac_int32 dred_offset, float *pcm, oac_int32 frame_size)
-{
+int oac_decoder_dred_decode_float(OacDecoder *st, const OacDRED *dred, oac_int32 dred_offset, float *pcm,
+                                  oac_int32 frame_size) {
 #ifdef ENABLE_DRED
-   if(frame_size<=0)
-      return OAC_BAD_ARG;
-   return oac_decode_native(st, NULL, 0, pcm, frame_size, 0, 0, NULL, 0, dred, dred_offset);
+    if (frame_size <= 0)
+        return OAC_BAD_ARG;
+    return oac_decode_native(st, NULL, 0, pcm, frame_size, 0, 0, NULL, 0, dred, dred_offset);
 #else
-   (void)st;
-   (void)dred;
-   (void)dred_offset;
-   (void)pcm;
-   (void)frame_size;
-   return OAC_UNIMPLEMENTED;
+    (void)st;
+    (void)dred;
+    (void)dred_offset;
+    (void)pcm;
+    (void)frame_size;
+    return OAC_UNIMPLEMENTED;
 #endif
 }
diff --git a/src/oac_demo.c b/src/oac_demo.c
index f78462ab6..c23ebf133 100644
--- a/src/oac_demo.c
+++ b/src/oac_demo.c
@@ -24,10 +24,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdio.h>
@@ -40,15 +40,15 @@
 #include "oac_private.h"
 #include "oac_multistream.h"
 #ifdef ENABLE_LOSSGEN
-#include "lossgen.h"
+# include "lossgen.h"
 #endif
 
 #define MAX_PACKET 15000
 
 #ifdef ENABLE_QEXT
-#define MAX_SAMPLING_RATE 96000
+# define MAX_SAMPLING_RATE 96000
 #else
-#define MAX_SAMPLING_RATE 48000
+# define MAX_SAMPLING_RATE 48000
 #endif
 
 #ifdef USE_WEIGHTS_FILE
@@ -61,66 +61,64 @@
    better resource utilization, especially if multiple processes are using the same
    file (mapping will be shared in cache). */
 void *load_blob(const char *filename, int *len) {
-  int fd;
-  void *data;
-  struct stat st;
-  if (stat(filename, &st)) {
-     *len = 0;
-     return NULL;
-  }
-  *len = st.st_size;
-  fd = open(filename, O_RDONLY);
-  if (fd<0) {
-     *len = 0;
-     return NULL;
-  }
-  data = mmap(NULL, *len, PROT_READ, MAP_SHARED, fd, 0);
-  if (data == MAP_FAILED) {
-     *len = 0;
-     data = NULL;
-  }
-  close(fd);
-  return data;
+    int fd;
+    void *data;
+    struct stat st;
+    if (stat(filename, &st)) {
+        *len = 0;
+        return NULL;
+    }
+    *len = st.st_size;
+    fd = open(filename, O_RDONLY);
+    if (fd < 0) {
+        *len = 0;
+        return NULL;
+    }
+    data = mmap(NULL, *len, PROT_READ, MAP_SHARED, fd, 0);
+    if (data == MAP_FAILED) {
+        *len = 0;
+        data = NULL;
+    }
+    close(fd);
+    return data;
 }
 void free_blob(void *blob, int len) {
-  if (blob) munmap(blob, len);
+    if (blob) munmap(blob, len);
 }
 # else
 void *load_blob(const char *filename, int *len) {
-  FILE *file;
-  void *data;
-  file = fopen(filename, "r");
-  if (file == NULL)
-  {
-    perror("could not open blob file");
-    *len = 0;
-    return NULL;
-  }
-  fseek(file, 0L, SEEK_END);
-  *len = ftell(file);
-  fseek(file, 0L, SEEK_SET);
-  if (*len <= 0) {
-     *len = 0;
-     return NULL;
-  }
-  data = malloc(*len);
-  if (!data) {
-     *len = 0;
-     return NULL;
-  }
-  *len = fread(data, 1, *len, file);
-  return data;
+    FILE *file;
+    void *data;
+    file = fopen(filename, "r");
+    if (file == NULL) {
+        perror("could not open blob file");
+        *len = 0;
+        return NULL;
+    }
+    fseek(file, 0L, SEEK_END);
+    *len = ftell(file);
+    fseek(file, 0L, SEEK_SET);
+    if (*len <= 0) {
+        *len = 0;
+        return NULL;
+    }
+    data = malloc(*len);
+    if (!data) {
+        *len = 0;
+        return NULL;
+    }
+    *len = fread(data, 1, *len, file);
+    return data;
 }
 void free_blob(void *blob, int len) {
-  free(blob);
-  (void)len;
+    free(blob);
+    (void)len;
 }
 # endif
 #endif
 
 
-void print_usage( char* argv[] )
-{
+void print_usage( char* argv[] ) {
     fprintf(stderr, "Usage: %s [-e] <application> <sampling rate (Hz)> <channels (1/2)> "
         "<bits per second>  [options] <input> <output>\n", argv[0]);
     fprintf(stderr, "       %s -d <sampling rate (Hz)> <channels (1/2)> "
@@ -131,8 +129,10 @@ void print_usage( char* argv[] )
     fprintf(stderr, "-d                   : only runs the decoder (reads the bit-stream as input)\n" );
     fprintf(stderr, "-cbr                 : enable constant bitrate; default: variable bitrate\n" );
     fprintf(stderr, "-cvbr                : enable constrained variable bitrate; default: unconstrained\n" );
-    fprintf(stderr, "-delayed-decision    : use look-ahead for speech/music detection (experts only); default: disabled\n" );
-    fprintf(stderr, "-bandwidth <NB|MB|WB|SWB|FB> : audio bandwidth (from narrowband to fullband); default: sampling rate\n" );
+    fprintf(stderr,
+    "-delayed-decision    : use look-ahead for speech/music detection (experts only); default: disabled\n" );
+    fprintf(stderr,
+    "-bandwidth <NB|MB|WB|SWB|FB> : audio bandwidth (from narrowband to fullband); default: sampling rate\n" );
     fprintf(stderr, "-framesize <2.5|5|10|20|40|60|80|100|120> : frame size in ms; default: 20 \n" );
     fprintf(stderr, "-max_payload <bytes> : maximum payload size in bytes, default: 1024\n" );
     fprintf(stderr, "-complexity <comp>   : encoder complexity, 0 (lowest) ... 10 (highest); default: 10\n" );
@@ -140,15 +140,18 @@ void print_usage( char* argv[] )
     fprintf(stderr, "-inbandfec           : enable SILK inband FEC\n" );
     fprintf(stderr, "-forcemono           : force mono encoding, even for stereo input\n" );
     fprintf(stderr, "-dtx                 : enable SILK DTX\n" );
-    fprintf(stderr, "-loss <perc>         : optimize for loss percentage and simulate packet loss, in percent (0-100); default: 0\n" );
+    fprintf(stderr,
+    "-loss <perc>         : optimize for loss percentage and simulate packet loss, in percent (0-100); default: 0\n" );
 #ifdef ENABLE_LOSSGEN
-    fprintf(stderr, "-sim_loss <perc>     : simulate realistic (bursty) packet loss from percentage, using generative model\n" );
+    fprintf(stderr,
+    "-sim_loss <perc>     : simulate realistic (bursty) packet loss from percentage, using generative model\n" );
 #endif
     fprintf(stderr, "-lossfile <file>     : simulate packet loss, reading loss from file\n" );
     fprintf(stderr, "-dred <frames>       : add Deep REDundancy (in units of 10-ms frames)\n" );
     fprintf(stderr, "-enc_loss            : Apply loss on the encoder side (store empty packets)\n" );
 #ifdef ENABLE_OSCE_BWE
-    fprintf(stderr, "-enable_osce_bwe     : enable OSCE bandwidth extension for wideband signals (48 kHz sampling rate only), raises dec_complexity to 4\n");
+    fprintf(stderr,
+    "-enable_osce_bwe     : enable OSCE bandwidth extension for wideband signals (48 kHz sampling rate only), raises dec_complexity to 4\n");
 #endif
 }
 
@@ -163,54 +166,56 @@ typedef union {
     float f;
 } float_bits;
 
-static void int_to_char(oac_uint32 i, unsigned char ch[4])
-{
+static void int_to_char(oac_uint32 i, unsigned char ch[4]) {
     ch[0] = i>>24;
     ch[1] = (i>>16)&0xFF;
     ch[2] = (i>>8)&0xFF;
     ch[3] = i&0xFF;
 }
 
-static oac_uint32 char_to_int(unsigned char ch[4])
-{
-    return ((oac_uint32)ch[0]<<24) | ((oac_uint32)ch[1]<<16)
-         | ((oac_uint32)ch[2]<< 8) |  (oac_uint32)ch[3];
+static oac_uint32 char_to_int(unsigned char ch[4]) {
+    return ((oac_uint32)ch[0]<<24)|((oac_uint32)ch[1]<<16)
+           |((oac_uint32)ch[2]<<8)|(oac_uint32)ch[3];
 }
 
-#define check_encoder_option(decode_only, opt) do {if (decode_only) {fprintf(stderr, "option %s is only for encoding\n", opt); goto failure;}} while(0)
-#define check_decoder_option(encode_only, opt) do {if (encode_only) {fprintf(stderr, "option %s is only for decoding\n", opt); goto failure;}} while(0)
+#define check_encoder_option(decode_only, \
+                             opt) do {if (decode_only) {fprintf(stderr, "option %s is only for encoding\n", opt); \
+                                                        goto failure;}} while (0)
+#define check_decoder_option(encode_only, \
+                             opt) do {if (encode_only) {fprintf(stderr, "option %s is only for decoding\n", opt); \
+                                                        goto failure;}} while (0)
 
 static const int silk8_test[][4] = {
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 960*3, 1},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 960*2, 1},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 960,   1},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 480,   1},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 960*3, 2},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 960*2, 2},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 960,   2},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 480,   2}
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 960*3, 1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 960*2, 1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 960,   1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 480,   1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 960*3, 2},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 960*2, 2},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 960,   2},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_NARROWBAND, 480,   2}
 };
 
 static const int silk12_test[][4] = {
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 960*3, 1},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 960*2, 1},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 960,   1},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 480,   1},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 960*3, 2},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 960*2, 2},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 960,   2},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 480,   2}
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 960*3, 1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 960*2, 1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 960,   1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 480,   1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 960*3, 2},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 960*2, 2},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 960,   2},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_MEDIUMBAND, 480,   2}
 };
 
 static const int silk16_test[][4] = {
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 960*3, 1},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 960*2, 1},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 960,   1},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 480,   1},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 960*3, 2},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 960*2, 2},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 960,   2},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 480,   2}
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 960*3, 1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 960*2, 1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 960,   1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 480,   1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 960*3, 2},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 960*2, 2},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 960,   2},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_WIDEBAND, 480,   2}
 };
 
 static const int silk_bw_switch_test[][4] = {
@@ -237,137 +242,134 @@ static const int silk_bw_switch_test[][4] = {
 };
 
 static const int hybrid24_test[][4] = {
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 960, 1},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 480, 1},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 960, 2},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 480, 2}
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 960, 1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 480, 1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 960, 2},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 480, 2}
 };
 
 static const int hybrid48_test[][4] = {
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_FULLBAND, 960, 1},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_FULLBAND, 480, 1},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_FULLBAND, 960, 2},
-      {MODE_SILK_ONLY, OAC_BANDWIDTH_FULLBAND, 480, 2}
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_FULLBAND, 960, 1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_FULLBAND, 480, 1},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_FULLBAND, 960, 2},
+    {MODE_SILK_ONLY, OAC_BANDWIDTH_FULLBAND, 480, 2}
 };
 
 static const int celt_test[][4] = {
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      960, 1},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 960, 1},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      960, 1},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    960, 1},
-
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      480, 1},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 480, 1},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      480, 1},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    480, 1},
-
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      240, 1},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 240, 1},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      240, 1},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    240, 1},
-
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      120, 1},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 120, 1},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      120, 1},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    120, 1},
-
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      960, 2},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 960, 2},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      960, 2},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    960, 2},
-
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      480, 2},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 480, 2},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      480, 2},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    480, 2},
-
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      240, 2},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 240, 2},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      240, 2},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    240, 2},
-
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      120, 2},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 120, 2},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      120, 2},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    120, 2},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      960, 1},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 960, 1},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      960, 1},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    960, 1},
+
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      480, 1},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 480, 1},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      480, 1},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    480, 1},
+
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      240, 1},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 240, 1},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      240, 1},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    240, 1},
+
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      120, 1},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 120, 1},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      120, 1},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    120, 1},
+
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      960, 2},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 960, 2},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      960, 2},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    960, 2},
+
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      480, 2},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 480, 2},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      480, 2},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    480, 2},
+
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      240, 2},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 240, 2},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      240, 2},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    240, 2},
+
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      120, 2},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_SUPERWIDEBAND, 120, 2},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_WIDEBAND,      120, 2},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_NARROWBAND,    120, 2},
 
 };
 
 static const int celt_hq_test[][4] = {
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      120, 2},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      240, 2},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      480, 2},
-      {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      960, 2},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      120, 2},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      240, 2},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      480, 2},
+    {MODE_CELT_ONLY, OAC_BANDWIDTH_FULLBAND,      960, 2},
 };
 
 #if 0 /* This is a hack that replaces the normal encoder/decoder with the multistream version */
-#define OacEncoder OacMSEncoder
-#define OacDecoder OacMSDecoder
-#define oac_encode24 oac_multistream_encode24
-#define oac_decode24 oac_multistream_decode24
-#define oac_encoder_ctl oac_multistream_encoder_ctl
-#define oac_decoder_ctl oac_multistream_decoder_ctl
-#define oac_encoder_create ms_oac_encoder_create
-#define oac_decoder_create ms_oac_decoder_create
-#define oac_encoder_destroy oac_multistream_encoder_destroy
-#define oac_decoder_destroy oac_multistream_decoder_destroy
-
-static OacEncoder *ms_oac_encoder_create(oac_int32 Fs, int channels, int application, int *error)
-{
-   int streams, coupled_streams;
-   unsigned char mapping[256];
-   return (OacEncoder *)oac_multistream_surround_encoder_create(Fs, channels, 1, &streams, &coupled_streams, mapping, application, error);
+# define OacEncoder OacMSEncoder
+# define OacDecoder OacMSDecoder
+# define oac_encode24 oac_multistream_encode24
+# define oac_decode24 oac_multistream_decode24
+# define oac_encoder_ctl oac_multistream_encoder_ctl
+# define oac_decoder_ctl oac_multistream_decoder_ctl
+# define oac_encoder_create ms_oac_encoder_create
+# define oac_decoder_create ms_oac_decoder_create
+# define oac_encoder_destroy oac_multistream_encoder_destroy
+# define oac_decoder_destroy oac_multistream_decoder_destroy
+
+static OacEncoder *ms_oac_encoder_create(oac_int32 Fs, int channels, int application, int *error) {
+    int streams, coupled_streams;
+    unsigned char mapping[256];
+    return (OacEncoder *)oac_multistream_surround_encoder_create(Fs, channels, 1, &streams, &coupled_streams, mapping,
+    application, error);
 }
-static OacDecoder *ms_oac_decoder_create(oac_int32 Fs, int channels, int *error)
-{
-   int streams;
-   int coupled_streams;
-   unsigned char mapping[256]={0,1};
-   streams = 1;
-   coupled_streams = channels==2;
-   return (OacDecoder *)oac_multistream_decoder_create(Fs, channels, streams, coupled_streams, mapping, error);
+static OacDecoder *ms_oac_decoder_create(oac_int32 Fs, int channels, int *error) {
+    int streams;
+    int coupled_streams;
+    unsigned char mapping[256] = {0, 1};
+    streams = 1;
+    coupled_streams = channels == 2;
+    return (OacDecoder *)oac_multistream_decoder_create(Fs, channels, streams, coupled_streams, mapping, error);
 }
 #endif
 
 
 #ifdef ENABLE_OSCE_TRAINING_DATA
-#define COMPLEXITY_MIN 0
-#define COMPLEXITY_MAX 10
+# define COMPLEXITY_MIN 0
+# define COMPLEXITY_MAX 10
 
-#define PACKET_LOSS_PERC_MIN 0
-#define PACKET_LOSS_PERC_MAX 50
-#define PACKET_LOSS_PERC_STEP 5
+# define PACKET_LOSS_PERC_MIN 0
+# define PACKET_LOSS_PERC_MAX 50
+# define PACKET_LOSS_PERC_STEP 5
 
-#define CBR_BITRATE_LIMIT 80000
+# define CBR_BITRATE_LIMIT 80000
 
-#define NUM_BITRATES 102
+# define NUM_BITRATES 102
 static int bitrates[NUM_BITRATES] = {
-        6000,  6060,  6120,  6180,  6240,  6300,  6360,  6420,  6480,
-        6525,  6561,  6598,  6634,  6670,  6707,  6743,  6780,  6816,
-        6853,  6889,  6926,  6962,  6999,  7042,  7085,  7128,  7171,
-        7215,  7258,  7301,  7344,  7388,  7431,  7474,  7512,  7541,
-        7570,  7599,  7628,  7657,  7686,  7715,  7744,  7773,  7802,
-        7831,  7860,  7889,  7918,  7947,  7976,  8013,  8096,  8179,
-        8262,  8344,  8427,  8511,  8605,  8699,  8792,  8886,  8980,
-        9100,  9227,  9354,  9480,  9561,  9634,  9706,  9779,  9851,
-        9924,  9996, 10161, 10330, 10499, 10698, 10898, 11124, 11378,
-       11575, 11719, 11862, 12014, 12345, 12751, 13195, 13561, 13795,
-       14069, 14671, 15403, 15790, 16371, 17399, 17968, 19382, 20468,
-       22000, 32000, 64000
+    6000,  6060,  6120,  6180,  6240,  6300,  6360,  6420,  6480,
+    6525,  6561,  6598,  6634,  6670,  6707,  6743,  6780,  6816,
+    6853,  6889,  6926,  6962,  6999,  7042,  7085,  7128,  7171,
+    7215,  7258,  7301,  7344,  7388,  7431,  7474,  7512,  7541,
+    7570,  7599,  7628,  7657,  7686,  7715,  7744,  7773,  7802,
+    7831,  7860,  7889,  7918,  7947,  7976,  8013,  8096,  8179,
+    8262,  8344,  8427,  8511,  8605,  8699,  8792,  8886,  8980,
+    9100,  9227,  9354,  9480,  9561,  9634,  9706,  9779,  9851,
+    9924,  9996, 10161, 10330, 10499, 10698, 10898, 11124, 11378,
+    11575, 11719, 11862, 12014, 12345, 12751, 13195, 13561, 13795,
+    14069, 14671, 15403, 15790, 16371, 17399, 17968, 19382, 20468,
+    22000, 32000, 64000
 };
 
-static int randint(int min, int max, int step)
-{
-    double r = ((double) rand())/ (RAND_MAX + 1.);
+static int randint(int min, int max, int step) {
+    double r = ((double) rand())/(RAND_MAX + 1.);
     int d;
 
-    d = ((int) ((max + 1 - min) * r / step) * step) + min;
+    d = ((int) ((max + 1 - min)*r/step)*step) + min;
 
     return d;
 }
 
-static void new_random_setting(OacEncoder *enc)
-{
+static void new_random_setting(OacEncoder *enc) {
     int bitrate_bps;
     int complexity;
     int packet_loss_perc;
@@ -378,8 +380,7 @@ static void new_random_setting(OacEncoder *enc)
     packet_loss_perc = randint(PACKET_LOSS_PERC_MIN, PACKET_LOSS_PERC_MAX, PACKET_LOSS_PERC_STEP);
     use_vbr = bitrate_bps < CBR_BITRATE_LIMIT ? 1 : randint(0, 1, 1);
 
-    if (1)
-    {
+    if (1) {
         printf("changing settings to %d\t%d\t%d\t%d\n", bitrate_bps, complexity, packet_loss_perc, use_vbr);
     }
 
@@ -391,22 +392,21 @@ static void new_random_setting(OacEncoder *enc)
 
 #endif
 
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
     int err;
     char *inFile, *outFile;
-    FILE *fin=NULL;
-    FILE *fout=NULL;
-    OacEncoder *enc=NULL;
-    OacDecoder *dec=NULL;
-    OacDRED *dred=NULL;
-    OacDREDDecoder *dred_dec=NULL;
+    FILE *fin = NULL;
+    FILE *fout = NULL;
+    OacEncoder *enc = NULL;
+    OacDecoder *dec = NULL;
+    OacDRED *dred = NULL;
+    OacDREDDecoder *dred_dec = NULL;
     int args;
     int len;
     int frame_size, channels;
-    oac_int32 bitrate_bps=0;
+    oac_int32 bitrate_bps = 0;
     unsigned char *data = NULL;
-    unsigned char *fbytes=NULL;
+    unsigned char *fbytes = NULL;
     oac_int32 sampling_rate;
     int use_vbr;
     int max_payload_bytes;
@@ -421,45 +421,45 @@ int main(int argc, char *argv[])
     float lossgen_perc = -1.f;
     LossGenState lossgen;
 #endif
-    oac_int32 count=0, count_act=0;
+    oac_int32 count = 0, count_act = 0;
     int k;
-    oac_int32 skip=0;
-    int format=FORMAT_S16_LE;
-    int stop=0;
-    oac_int32 *in=NULL;
-    oac_int32 *out=NULL;
-    int application=OAC_APPLICATION_AUDIO;
-    double bits=0.0, bits_max=0.0, bits_act=0.0, bits2=0.0, nrg;
-    double tot_samples=0;
+    oac_int32 skip = 0;
+    int format = FORMAT_S16_LE;
+    int stop = 0;
+    oac_int32 *in = NULL;
+    oac_int32 *out = NULL;
+    int application = OAC_APPLICATION_AUDIO;
+    double bits = 0.0, bits_max = 0.0, bits_act = 0.0, bits2 = 0.0, nrg;
+    double tot_samples = 0;
     oac_uint64 tot_in, tot_out;
-    int bandwidth=OAC_AUTO;
+    int bandwidth = OAC_AUTO;
     const char *bandwidth_string;
     int lost = 0, lost_prev = 1;
     oac_uint32 enc_final_range;
     oac_uint32 dec_final_range;
-    int encode_only=0, decode_only=0;
+    int encode_only = 0, decode_only = 0;
     int max_frame_size = MAX_SAMPLING_RATE*2;
     size_t num_read;
-    int curr_read=0;
+    int curr_read = 0;
     int sweep_bps = 0;
-    int random_framesize=0, newsize=0, delayed_celt=0;
-    int sweep_max=0, sweep_min=0;
-    int random_fec=0;
-    const int (*mode_list)[4]=NULL;
-    int nb_modes_in_list=0;
-    int curr_mode=0;
-    int curr_mode_count=0;
+    int random_framesize = 0, newsize = 0, delayed_celt = 0;
+    int sweep_max = 0, sweep_min = 0;
+    int random_fec = 0;
+    const int (*mode_list)[4] = NULL;
+    int nb_modes_in_list = 0;
+    int curr_mode = 0;
+    int curr_mode_count = 0;
     int mode_switch_time = 48000;
-    int nb_encoded=0;
-    int remaining=0;
-    int variable_duration=OAC_FRAMESIZE_ARG;
-    int delayed_decision=0;
+    int nb_encoded = 0;
+    int remaining = 0;
+    int variable_duration = OAC_FRAMESIZE_ARG;
+    int delayed_decision = 0;
     int ret = EXIT_FAILURE;
-    int lost_count=0;
-    FILE *packet_loss_file=NULL;
-    int dred_duration=0;
-    int ignore_extensions=0;
-    int encoder_loss=0;
+    int lost_count = 0;
+    FILE *packet_loss_file = NULL;
+    int dred_duration = 0;
+    int ignore_extensions = 0;
+    int encoder_loss = 0;
 #ifdef ENABLE_OSCE_TRAINING_DATA
     int silk_random_switching = 0;
     int silk_frame_counter = 0;
@@ -474,59 +474,53 @@ int main(int argc, char *argv[])
     blob_data = load_blob(filename, &blob_len);
 #endif
 
-    if (argc < 5 )
-    {
-       print_usage( argv );
-       goto failure;
+    if (argc < 5) {
+        print_usage( argv );
+        goto failure;
     }
 
-    tot_in=tot_out=0;
+    tot_in = tot_out = 0;
     fprintf(stderr, "%s\n", oac_get_version_string());
 
     args = 1;
-    if (strcmp(argv[args], "-e")==0)
-    {
+    if (strcmp(argv[args], "-e") == 0) {
         encode_only = 1;
         args++;
-    } else if (strcmp(argv[args], "-d")==0)
-    {
+    } else if (strcmp(argv[args], "-d") == 0) {
         decode_only = 1;
         args++;
     }
-    if (!decode_only && argc < 7 )
-    {
-       print_usage( argv );
-       goto failure;
+    if (!decode_only && argc < 7) {
+        print_usage( argv );
+        goto failure;
     }
 
-    if (!decode_only)
-    {
-       if (strcmp(argv[args], "voip")==0)
-          application = OAC_APPLICATION_VOIP;
-       else if (strcmp(argv[args], "restricted-lowdelay")==0)
-          application = OAC_APPLICATION_RESTRICTED_LOWDELAY;
-       else if (strcmp(argv[args], "restricted-silk")==0)
-          application = OAC_APPLICATION_RESTRICTED_SILK;
-       else if (strcmp(argv[args], "restricted-celt")==0)
-          application = OAC_APPLICATION_RESTRICTED_CELT;
-       else if (strcmp(argv[args], "audio")!=0) {
-          fprintf(stderr, "unknown application: %s\n", argv[args]);
-          print_usage(argv);
-          goto failure;
-       }
-       args++;
+    if (!decode_only) {
+        if (strcmp(argv[args], "voip") == 0)
+            application = OAC_APPLICATION_VOIP;
+        else if (strcmp(argv[args], "restricted-lowdelay") == 0)
+            application = OAC_APPLICATION_RESTRICTED_LOWDELAY;
+        else if (strcmp(argv[args], "restricted-silk") == 0)
+            application = OAC_APPLICATION_RESTRICTED_SILK;
+        else if (strcmp(argv[args], "restricted-celt") == 0)
+            application = OAC_APPLICATION_RESTRICTED_CELT;
+        else if (strcmp(argv[args], "audio") != 0) {
+            fprintf(stderr, "unknown application: %s\n", argv[args]);
+            print_usage(argv);
+            goto failure;
+        }
+        args++;
     }
     sampling_rate = (oac_int32)atol(argv[args]);
     args++;
 
     if (sampling_rate != 8000 && sampling_rate != 12000
-     && sampling_rate != 16000 && sampling_rate != 24000
-     && sampling_rate != 48000
+        && sampling_rate != 16000 && sampling_rate != 24000
+        && sampling_rate != 48000
 #ifdef ENABLE_QEXT
-     && sampling_rate != 96000
+        && sampling_rate != 96000
 #endif
-     )
-    {
+        ) {
         fprintf(stderr, "Supported sampling rates are 8000, 12000, 16000, 24000"
 #ifdef ENABLE_QEXT
               ", 48000 and 96000.\n");
@@ -540,16 +534,14 @@ int main(int argc, char *argv[])
     channels = atoi(argv[args]);
     args++;
 
-    if (channels < 1 || channels > 2)
-    {
+    if (channels < 1 || channels > 2) {
         fprintf(stderr, "Oac_demo supports only 1 or 2 channels.\n");
         goto failure;
     }
 
-    if (!decode_only)
-    {
-       bitrate_bps = (oac_int32)atol(argv[args]);
-       args++;
+    if (!decode_only) {
+        bitrate_bps = (oac_int32)atol(argv[args]);
+        args++;
     }
 
     /* defaults: */
@@ -562,23 +554,23 @@ int main(int argc, char *argv[])
     use_dtx = 0;
     packet_loss_perc = 0;
 
-    while( args < argc - 2 ) {
+    while (args < argc - 2) {
         /* process command line options */
-        if( strcmp( argv[ args ], "-cbr" ) == 0 ) {
+        if (strcmp( argv[ args ], "-cbr" ) == 0) {
             check_encoder_option(decode_only, "-cbr");
             use_vbr = 0;
             args++;
-        } else if( strcmp( argv[ args ], "-bandwidth" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-bandwidth" ) == 0) {
             check_encoder_option(decode_only, "-bandwidth");
-            if (strcmp(argv[ args + 1 ], "NB")==0)
+            if (strcmp(argv[ args + 1 ], "NB") == 0)
                 bandwidth = OAC_BANDWIDTH_NARROWBAND;
-            else if (strcmp(argv[ args + 1 ], "MB")==0)
+            else if (strcmp(argv[ args + 1 ], "MB") == 0)
                 bandwidth = OAC_BANDWIDTH_MEDIUMBAND;
-            else if (strcmp(argv[ args + 1 ], "WB")==0)
+            else if (strcmp(argv[ args + 1 ], "WB") == 0)
                 bandwidth = OAC_BANDWIDTH_WIDEBAND;
-            else if (strcmp(argv[ args + 1 ], "SWB")==0)
+            else if (strcmp(argv[ args + 1 ], "SWB") == 0)
                 bandwidth = OAC_BANDWIDTH_SUPERWIDEBAND;
-            else if (strcmp(argv[ args + 1 ], "FB")==0)
+            else if (strcmp(argv[ args + 1 ], "FB") == 0)
                 bandwidth = OAC_BANDWIDTH_FULLBAND;
             else {
                 fprintf(stderr, "Unknown bandwidth %s. "
@@ -587,25 +579,25 @@ int main(int argc, char *argv[])
                 goto failure;
             }
             args += 2;
-        } else if( strcmp( argv[ args ], "-framesize" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-framesize" ) == 0) {
             check_encoder_option(decode_only, "-framesize");
-            if (strcmp(argv[ args + 1 ], "2.5")==0)
+            if (strcmp(argv[ args + 1 ], "2.5") == 0)
                 frame_size = sampling_rate/400;
-            else if (strcmp(argv[ args + 1 ], "5")==0)
+            else if (strcmp(argv[ args + 1 ], "5") == 0)
                 frame_size = sampling_rate/200;
-            else if (strcmp(argv[ args + 1 ], "10")==0)
+            else if (strcmp(argv[ args + 1 ], "10") == 0)
                 frame_size = sampling_rate/100;
-            else if (strcmp(argv[ args + 1 ], "20")==0)
+            else if (strcmp(argv[ args + 1 ], "20") == 0)
                 frame_size = sampling_rate/50;
-            else if (strcmp(argv[ args + 1 ], "40")==0)
+            else if (strcmp(argv[ args + 1 ], "40") == 0)
                 frame_size = sampling_rate/25;
-            else if (strcmp(argv[ args + 1 ], "60")==0)
+            else if (strcmp(argv[ args + 1 ], "60") == 0)
                 frame_size = 3*sampling_rate/50;
-            else if (strcmp(argv[ args + 1 ], "80")==0)
+            else if (strcmp(argv[ args + 1 ], "80") == 0)
                 frame_size = 4*sampling_rate/50;
-            else if (strcmp(argv[ args + 1 ], "100")==0)
+            else if (strcmp(argv[ args + 1 ], "100") == 0)
                 frame_size = 5*sampling_rate/50;
-            else if (strcmp(argv[ args + 1 ], "120")==0)
+            else if (strcmp(argv[ args + 1 ], "120") == 0)
                 frame_size = 6*sampling_rate/50;
             else {
                 fprintf(stderr, "Unsupported frame size: %s ms. "
@@ -614,137 +606,137 @@ int main(int argc, char *argv[])
                 goto failure;
             }
             args += 2;
-        } else if( strcmp( argv[ args ], "-max_payload" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-max_payload" ) == 0) {
             check_encoder_option(decode_only, "-max_payload");
             max_payload_bytes = atoi( argv[ args + 1 ] );
             args += 2;
-        } else if( strcmp( argv[ args ], "-complexity" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-complexity" ) == 0) {
             check_encoder_option(decode_only, "-complexity");
             complexity = atoi( argv[ args + 1 ] );
             args += 2;
-        } else if( strcmp( argv[ args ], "-dec_complexity" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-dec_complexity" ) == 0) {
             check_decoder_option(encode_only, "-dec_complexity");
             dec_complexity = atoi( argv[ args + 1 ] );
             args += 2;
-        } else if( strcmp( argv[ args ], "-16" ) == 0 ) {
-           format = FORMAT_S16_LE;
-           args++;
-        } else if( strcmp( argv[ args ], "-24" ) == 0 ) {
-           format = FORMAT_S24_LE;
-           args++;
-        } else if( strcmp( argv[ args ], "-f32" ) == 0 ) {
-           format = FORMAT_F32_LE;
-           args++;
-        } else if( strcmp( argv[ args ], "-inbandfec" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-16" ) == 0) {
+            format = FORMAT_S16_LE;
+            args++;
+        } else if (strcmp( argv[ args ], "-24" ) == 0) {
+            format = FORMAT_S24_LE;
+            args++;
+        } else if (strcmp( argv[ args ], "-f32" ) == 0) {
+            format = FORMAT_F32_LE;
+            args++;
+        } else if (strcmp( argv[ args ], "-inbandfec" ) == 0) {
             use_inbandfec = 1;
             args++;
-        } else if( strcmp( argv[ args ], "-forcemono" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-forcemono" ) == 0) {
             check_encoder_option(decode_only, "-forcemono");
             forcechannels = 1;
             args++;
-        } else if( strcmp( argv[ args ], "-cvbr" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-cvbr" ) == 0) {
             check_encoder_option(decode_only, "-cvbr");
             cvbr = 1;
             args++;
-        } else if( strcmp( argv[ args ], "-delayed-decision" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-delayed-decision" ) == 0) {
             check_encoder_option(decode_only, "-delayed-decision");
             delayed_decision = 1;
             args++;
-        } else if( strcmp( argv[ args ], "-dtx") == 0 ) {
+        } else if (strcmp( argv[ args ], "-dtx") == 0) {
             check_encoder_option(decode_only, "-dtx");
             use_dtx = 1;
             args++;
-        } else if( strcmp( argv[ args ], "-loss" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-loss" ) == 0) {
             packet_loss_perc = atoi( argv[ args + 1 ] );
             args += 2;
 #ifdef ENABLE_LOSSGEN
-        } else if( strcmp( argv[ args ], "-sim_loss" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-sim_loss" ) == 0) {
             lossgen_perc = atof( argv[ args + 1 ] );
             lossgen_init(&lossgen);
             args += 2;
 #endif
-        } else if( strcmp( argv[ args ], "-lossfile" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-lossfile" ) == 0) {
             packet_loss_file = fopen( argv[ args + 1 ], "r" );
             if (packet_loss_file == NULL) {
                 fprintf(stderr, "failed to open loss file %s\n", argv[ args + 1 ] );
                 exit(1);
             }
             args += 2;
-        } else if( strcmp( argv[ args ], "-dred" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-dred" ) == 0) {
             dred_duration = atoi( argv[ args + 1 ] );
             args += 2;
-        } else if( strcmp( argv[ args ], "-enc_loss") == 0 ) {
+        } else if (strcmp( argv[ args ], "-enc_loss") == 0) {
             check_encoder_option(decode_only, "-enc_loss");
             encoder_loss = 1;
             args++;
-        } else if( strcmp( argv[ args ], "-sweep" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-sweep" ) == 0) {
             check_encoder_option(decode_only, "-sweep");
             sweep_bps = atoi( argv[ args + 1 ] );
             args += 2;
-        } else if( strcmp( argv[ args ], "-random_framesize" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-random_framesize" ) == 0) {
             check_encoder_option(decode_only, "-random_framesize");
             random_framesize = 1;
             args++;
-        } else if( strcmp( argv[ args ], "-sweep_max" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-sweep_max" ) == 0) {
             check_encoder_option(decode_only, "-sweep_max");
             sweep_max = atoi( argv[ args + 1 ] );
             args += 2;
-        } else if( strcmp( argv[ args ], "-random_fec" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-random_fec" ) == 0) {
             check_encoder_option(decode_only, "-random_fec");
             random_fec = 1;
             args++;
-        } else if( strcmp( argv[ args ], "-silk8k_test" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-silk8k_test" ) == 0) {
             check_encoder_option(decode_only, "-silk8k_test");
             mode_list = silk8_test;
             nb_modes_in_list = 8;
             args++;
-        } else if( strcmp( argv[ args ], "-silk12k_test" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-silk12k_test" ) == 0) {
             check_encoder_option(decode_only, "-silk12k_test");
             mode_list = silk12_test;
             nb_modes_in_list = 8;
             args++;
-        } else if( strcmp( argv[ args ], "-silk16k_test" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-silk16k_test" ) == 0) {
             check_encoder_option(decode_only, "-silk16k_test");
             mode_list = silk16_test;
             nb_modes_in_list = 8;
             args++;
-        } else if( strcmp( argv[ args ], "-silk_bw_switch_test" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-silk_bw_switch_test" ) == 0) {
             check_encoder_option(decode_only, "-silk_bw_switch_test");
             mode_list = silk_bw_switch_test;
             nb_modes_in_list = 20;
             args++;
-        } else if( strcmp( argv[ args ], "-hybrid24k_test" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-hybrid24k_test" ) == 0) {
             check_encoder_option(decode_only, "-hybrid24k_test");
             mode_list = hybrid24_test;
             nb_modes_in_list = 4;
             args++;
-        } else if( strcmp( argv[ args ], "-hybrid48k_test" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-hybrid48k_test" ) == 0) {
             check_encoder_option(decode_only, "-hybrid48k_test");
             mode_list = hybrid48_test;
             nb_modes_in_list = 4;
             args++;
-        } else if( strcmp( argv[ args ], "-celt_test" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-celt_test" ) == 0) {
             check_encoder_option(decode_only, "-celt_test");
             mode_list = celt_test;
             nb_modes_in_list = 32;
             args++;
-        } else if( strcmp( argv[ args ], "-celt_hq_test" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-celt_hq_test" ) == 0) {
             check_encoder_option(decode_only, "-celt_hq_test");
             mode_list = celt_hq_test;
             nb_modes_in_list = 4;
             args++;
-        } else if( strcmp( argv[ args ], "-ignore_extensions" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-ignore_extensions" ) == 0) {
             check_decoder_option(encode_only, "-ignore_extensions");
             ignore_extensions = 1;
             args++;
 #ifdef ENABLE_OSCE_TRAINING_DATA
-        } else if( strcmp( argv[ args ], "-silk_random_switching" ) == 0 ){
+        } else if (strcmp( argv[ args ], "-silk_random_switching" ) == 0) {
             silk_random_switching = atoi( argv[ args + 1 ] );
             printf("switching encoding parameters every %dth frame\n", silk_random_switching);
             args += 2;
 #endif
 #if defined(ENABLE_OSCE) && defined(ENABLE_OSCE_BWE)
-        } else if( strcmp( argv[ args ], "-enable_osce_bwe" ) == 0 ) {
+        } else if (strcmp( argv[ args ], "-enable_osce_bwe" ) == 0) {
             enable_osce_bwe = 1;
             args++;
 #endif
@@ -756,152 +748,143 @@ int main(int argc, char *argv[])
     }
 
     if (sweep_max)
-       sweep_min = bitrate_bps;
+        sweep_min = bitrate_bps;
 
-    if (max_payload_bytes < 0 || max_payload_bytes > MAX_PACKET)
-    {
+    if (max_payload_bytes < 0 || max_payload_bytes > MAX_PACKET) {
         fprintf (stderr, "max_payload_bytes must be between 0 and %d\n",
                           MAX_PACKET);
         goto failure;
     }
 
-    inFile = argv[argc-2];
+    inFile = argv[argc - 2];
     fin = fopen(inFile, "rb");
-    if (!fin)
-    {
-        fprintf (stderr, "Could not open input file %s\n", argv[argc-2]);
+    if (!fin) {
+        fprintf (stderr, "Could not open input file %s\n", argv[argc - 2]);
         goto failure;
     }
-    if (mode_list)
-    {
-       int size;
-       int sample_size=2;
-       if (format == FORMAT_S24_LE) sample_size=3;
-       else if (format == FORMAT_F32_LE) sample_size=4;
-       fseek(fin, 0, SEEK_END);
-       size = ftell(fin);
-       fprintf(stderr, "File size is %d bytes\n", size);
-       fseek(fin, 0, SEEK_SET);
-       mode_switch_time = size/sample_size/channels/nb_modes_in_list;
-       fprintf(stderr, "Switching mode every %d samples\n", mode_switch_time);
+    if (mode_list) {
+        int size;
+        int sample_size = 2;
+        if (format == FORMAT_S24_LE) sample_size = 3;
+        else if (format == FORMAT_F32_LE) sample_size = 4;
+        fseek(fin, 0, SEEK_END);
+        size = ftell(fin);
+        fprintf(stderr, "File size is %d bytes\n", size);
+        fseek(fin, 0, SEEK_SET);
+        mode_switch_time = size/sample_size/channels/nb_modes_in_list;
+        fprintf(stderr, "Switching mode every %d samples\n", mode_switch_time);
     }
 
-    outFile = argv[argc-1];
+    outFile = argv[argc - 1];
     fout = fopen(outFile, "wb+");
-    if (!fout)
-    {
-        fprintf (stderr, "Could not open output file %s\n", argv[argc-1]);
+    if (!fout) {
+        fprintf (stderr, "Could not open output file %s\n", argv[argc - 1]);
         goto failure;
     }
 
-    if (!decode_only)
-    {
-       enc = oac_encoder_create(sampling_rate, channels, application, &err);
-       if (err != OAC_OK)
-       {
-          fprintf(stderr, "Cannot create encoder: %s\n", oac_strerror(err));
-          goto failure;
-       }
-       oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrate_bps));
-       oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(bandwidth));
-       oac_encoder_ctl(enc, OAC_SET_VBR(use_vbr));
-       oac_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(cvbr));
-       oac_encoder_ctl(enc, OAC_SET_COMPLEXITY(complexity));
-       oac_encoder_ctl(enc, OAC_SET_INBAND_FEC(use_inbandfec));
-       oac_encoder_ctl(enc, OAC_SET_FORCE_CHANNELS(forcechannels));
-       oac_encoder_ctl(enc, OAC_SET_DTX(use_dtx));
-       oac_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(packet_loss_perc));
-
-       oac_encoder_ctl(enc, OAC_GET_LOOKAHEAD(&skip));
-       oac_encoder_ctl(enc, OAC_SET_LSB_DEPTH((format == FORMAT_S16_LE) ? 16 : 24));
-       oac_encoder_ctl(enc, OAC_SET_EXPERT_FRAME_DURATION(variable_duration));
-       if (dred_duration > 0)
-       {
-          oac_encoder_ctl(enc, OAC_SET_DRED_DURATION(dred_duration));
-       }
+    if (!decode_only) {
+        enc = oac_encoder_create(sampling_rate, channels, application, &err);
+        if (err != OAC_OK) {
+            fprintf(stderr, "Cannot create encoder: %s\n", oac_strerror(err));
+            goto failure;
+        }
+        oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrate_bps));
+        oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(bandwidth));
+        oac_encoder_ctl(enc, OAC_SET_VBR(use_vbr));
+        oac_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(cvbr));
+        oac_encoder_ctl(enc, OAC_SET_COMPLEXITY(complexity));
+        oac_encoder_ctl(enc, OAC_SET_INBAND_FEC(use_inbandfec));
+        oac_encoder_ctl(enc, OAC_SET_FORCE_CHANNELS(forcechannels));
+        oac_encoder_ctl(enc, OAC_SET_DTX(use_dtx));
+        oac_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(packet_loss_perc));
+
+        oac_encoder_ctl(enc, OAC_GET_LOOKAHEAD(&skip));
+        oac_encoder_ctl(enc, OAC_SET_LSB_DEPTH((format == FORMAT_S16_LE) ? 16 : 24));
+        oac_encoder_ctl(enc, OAC_SET_EXPERT_FRAME_DURATION(variable_duration));
+        if (dred_duration > 0) {
+            oac_encoder_ctl(enc, OAC_SET_DRED_DURATION(dred_duration));
+        }
 #ifdef ENABLE_OSCE_TRAINING_DATA
-       oac_encoder_ctl(enc, OAC_SET_FORCE_MODE(MODE_SILK_ONLY));
-       srand(0);
+        oac_encoder_ctl(enc, OAC_SET_FORCE_MODE(MODE_SILK_ONLY));
+        srand(0);
 #endif
     }
-    if (!encode_only)
-    {
-       dec = oac_decoder_create(sampling_rate, channels, &err);
-       if (err != OAC_OK)
-       {
-          fprintf(stderr, "Cannot create decoder: %s\n", oac_strerror(err));
-          goto failure;
-       }
+    if (!encode_only) {
+        dec = oac_decoder_create(sampling_rate, channels, &err);
+        if (err != OAC_OK) {
+            fprintf(stderr, "Cannot create decoder: %s\n", oac_strerror(err));
+            goto failure;
+        }
 #ifdef ENABLE_OSCE_BWE
-       if (enable_osce_bwe) {
+        if (enable_osce_bwe) {
             oac_decoder_ctl(dec, OAC_SET_OSCE_BWE(1));
-            if (dec_complexity < 4) {dec_complexity = 4;}
-       }
+            if (dec_complexity < 4) {
+                dec_complexity = 4;
+            }
+        }
 #endif
-       oac_decoder_ctl(dec, OAC_SET_COMPLEXITY(dec_complexity));
-       oac_decoder_ctl(dec, OAC_SET_IGNORE_EXTENSIONS(ignore_extensions));
+        oac_decoder_ctl(dec, OAC_SET_COMPLEXITY(dec_complexity));
+        oac_decoder_ctl(dec, OAC_SET_IGNORE_EXTENSIONS(ignore_extensions));
     }
-    switch(bandwidth)
-    {
-    case OAC_BANDWIDTH_NARROWBAND:
-         bandwidth_string = "narrowband";
-         break;
-    case OAC_BANDWIDTH_MEDIUMBAND:
-         bandwidth_string = "mediumband";
-         break;
-    case OAC_BANDWIDTH_WIDEBAND:
-         bandwidth_string = "wideband";
-         break;
-    case OAC_BANDWIDTH_SUPERWIDEBAND:
-         bandwidth_string = "superwideband";
-         break;
-    case OAC_BANDWIDTH_FULLBAND:
-         bandwidth_string = "fullband";
-         break;
-    case OAC_AUTO:
-         bandwidth_string = "auto bandwidth";
-         break;
-    default:
-         bandwidth_string = "unknown";
-         break;
+    switch (bandwidth) {
+        case OAC_BANDWIDTH_NARROWBAND:
+            bandwidth_string = "narrowband";
+            break;
+        case OAC_BANDWIDTH_MEDIUMBAND:
+            bandwidth_string = "mediumband";
+            break;
+        case OAC_BANDWIDTH_WIDEBAND:
+            bandwidth_string = "wideband";
+            break;
+        case OAC_BANDWIDTH_SUPERWIDEBAND:
+            bandwidth_string = "superwideband";
+            break;
+        case OAC_BANDWIDTH_FULLBAND:
+            bandwidth_string = "fullband";
+            break;
+        case OAC_AUTO:
+            bandwidth_string = "auto bandwidth";
+            break;
+        default:
+            bandwidth_string = "unknown";
+            break;
     }
 
     if (decode_only)
-       fprintf(stderr, "Decoding with %ld Hz output (%d channels)\n",
-                       (long)sampling_rate, channels);
+        fprintf(stderr, "Decoding with %ld Hz output (%d channels)\n",
+            (long)sampling_rate, channels);
     else
-       fprintf(stderr, "Encoding %ld Hz input at %.3f kb/s "
+        fprintf(stderr, "Encoding %ld Hz input at %.3f kb/s "
                        "in %s with %d-sample frames.\n",
-                       (long)sampling_rate, bitrate_bps*0.001,
+            (long)sampling_rate, bitrate_bps*0.001,
                        bandwidth_string, frame_size);
 
     in = (oac_int32*)malloc(max_frame_size*channels*sizeof(oac_int32));
     out = (oac_int32*)malloc(max_frame_size*channels*sizeof(oac_int32));
     /* We need to allocate for 16-bit PCM data, but we store it as unsigned char. */
     fbytes = (unsigned char*)malloc(max_frame_size*channels*sizeof(oac_int32));
-    data = (unsigned char*)calloc(max_payload_bytes,sizeof(unsigned char));
-    if(delayed_decision)
-    {
-       if (frame_size==sampling_rate/400)
-          variable_duration = OAC_FRAMESIZE_2_5_MS;
-       else if (frame_size==sampling_rate/200)
-          variable_duration = OAC_FRAMESIZE_5_MS;
-       else if (frame_size==sampling_rate/100)
-          variable_duration = OAC_FRAMESIZE_10_MS;
-       else if (frame_size==sampling_rate/50)
-          variable_duration = OAC_FRAMESIZE_20_MS;
-       else if (frame_size==sampling_rate/25)
-          variable_duration = OAC_FRAMESIZE_40_MS;
-       else if (frame_size==3*sampling_rate/50)
-          variable_duration = OAC_FRAMESIZE_60_MS;
-       else if (frame_size==4*sampling_rate/50)
-          variable_duration = OAC_FRAMESIZE_80_MS;
-       else if (frame_size==5*sampling_rate/50)
-          variable_duration = OAC_FRAMESIZE_100_MS;
-       else
-          variable_duration = OAC_FRAMESIZE_120_MS;
-       oac_encoder_ctl(enc, OAC_SET_EXPERT_FRAME_DURATION(variable_duration));
-       frame_size = 2*sampling_rate;
+    data = (unsigned char*)calloc(max_payload_bytes, sizeof(unsigned char));
+    if (delayed_decision) {
+        if (frame_size == sampling_rate/400)
+            variable_duration = OAC_FRAMESIZE_2_5_MS;
+        else if (frame_size == sampling_rate/200)
+            variable_duration = OAC_FRAMESIZE_5_MS;
+        else if (frame_size == sampling_rate/100)
+            variable_duration = OAC_FRAMESIZE_10_MS;
+        else if (frame_size == sampling_rate/50)
+            variable_duration = OAC_FRAMESIZE_20_MS;
+        else if (frame_size == sampling_rate/25)
+            variable_duration = OAC_FRAMESIZE_40_MS;
+        else if (frame_size == 3*sampling_rate/50)
+            variable_duration = OAC_FRAMESIZE_60_MS;
+        else if (frame_size == 4*sampling_rate/50)
+            variable_duration = OAC_FRAMESIZE_80_MS;
+        else if (frame_size == 5*sampling_rate/50)
+            variable_duration = OAC_FRAMESIZE_100_MS;
+        else
+            variable_duration = OAC_FRAMESIZE_120_MS;
+        oac_encoder_ctl(enc, OAC_SET_EXPERT_FRAME_DURATION(variable_duration));
+        frame_size = 2*sampling_rate;
     }
     dred_dec = oac_dred_decoder_create(&err);
     dred = oac_dred_alloc(&err);
@@ -910,164 +893,143 @@ int main(int argc, char *argv[])
     if (dec) oac_decoder_ctl(dec, OAC_SET_DNN_BLOB(blob_data, blob_len));
     if (dred_dec) oac_dred_decoder_ctl(dred_dec, OAC_SET_DNN_BLOB(blob_data, blob_len));
 #endif
-    while (!stop)
-    {
-        if (delayed_celt)
-        {
+    while (!stop) {
+        if (delayed_celt) {
             frame_size = newsize;
             delayed_celt = 0;
-        } else if (random_framesize && rand()%20==0)
-        {
+        } else if (random_framesize && rand()%20 == 0) {
             newsize = rand()%6;
-            switch(newsize)
-            {
-            case 0: newsize=sampling_rate/400; break;
-            case 1: newsize=sampling_rate/200; break;
-            case 2: newsize=sampling_rate/100; break;
-            case 3: newsize=sampling_rate/50; break;
-            case 4: newsize=sampling_rate/25; break;
-            case 5: newsize=3*sampling_rate/50; break;
+            switch (newsize) {
+                case 0: newsize = sampling_rate/400; break;
+                case 1: newsize = sampling_rate/200; break;
+                case 2: newsize = sampling_rate/100; break;
+                case 3: newsize = sampling_rate/50; break;
+                case 4: newsize = sampling_rate/25; break;
+                case 5: newsize = 3*sampling_rate/50; break;
             }
-            while (newsize < sampling_rate/25 && bitrate_bps-abs(sweep_bps) <= 3*12*sampling_rate/newsize)
-               newsize*=2;
-            if (newsize < sampling_rate/100 && frame_size >= sampling_rate/100)
-            {
+            while (newsize < sampling_rate/25 && bitrate_bps - abs(sweep_bps) <= 3*12*sampling_rate/newsize)
+                newsize *= 2;
+            if (newsize < sampling_rate/100 && frame_size >= sampling_rate/100) {
                 oac_encoder_ctl(enc, OAC_SET_FORCE_MODE(MODE_CELT_ONLY));
-                delayed_celt=1;
+                delayed_celt = 1;
             } else {
                 frame_size = newsize;
             }
         }
-        if (random_fec && rand()%30==0)
-        {
-           oac_encoder_ctl(enc, OAC_SET_INBAND_FEC(rand()%4==0));
+        if (random_fec && rand()%30 == 0) {
+            oac_encoder_ctl(enc, OAC_SET_INBAND_FEC(rand()%4 == 0));
         }
-        if (decode_only)
-        {
+        if (decode_only) {
             unsigned char ch[4];
             num_read = fread(ch, 1, 4, fin);
-            if (num_read!=4)
+            if (num_read != 4)
                 break;
             len = char_to_int(ch);
-            if (len>max_payload_bytes || len<0)
-            {
-                fprintf(stderr, "Invalid payload length: %d\n",len);
+            if (len > max_payload_bytes || len < 0) {
+                fprintf(stderr, "Invalid payload length: %d\n", len);
                 break;
             }
             num_read = fread(ch, 1, 4, fin);
-            if (num_read!=4)
+            if (num_read != 4)
                 break;
             enc_final_range = char_to_int(ch);
             num_read = fread(data, 1, len, fin);
-            if (num_read!=(size_t)len)
-            {
+            if (num_read != (size_t)len) {
                 fprintf(stderr, "Ran out of input, "
                                 "expecting %d bytes got %d\n",
-                                len,(int)num_read);
+                                len, (int)num_read);
                 break;
             }
         } else {
             int i;
-            if (mode_list!=NULL)
-            {
+            if (mode_list != NULL) {
                 oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(mode_list[curr_mode][1]));
                 oac_encoder_ctl(enc, OAC_SET_FORCE_MODE(mode_list[curr_mode][0]));
                 oac_encoder_ctl(enc, OAC_SET_FORCE_CHANNELS(mode_list[curr_mode][3]));
                 frame_size = mode_list[curr_mode][2]*sampling_rate/48000;
             }
 #ifdef ENABLE_OSCE_TRAINING_DATA
-            if (silk_random_switching)
-            {
+            if (silk_random_switching) {
                 silk_frame_counter += 1;
-                if (silk_frame_counter % silk_random_switching == 0) {
+                if (silk_frame_counter%silk_random_switching == 0) {
                     new_random_setting(enc);
                 }
             }
 #endif
-            num_read = fread(fbytes, format_size[format]*channels, frame_size-remaining, fin);
+            num_read = fread(fbytes, format_size[format]*channels, frame_size - remaining, fin);
             curr_read = (int)num_read;
             tot_in += curr_read;
             if (format == FORMAT_S16_LE) {
-               for(i=0;i<frame_size*channels;i++)
-               {
-                  oac_int32 s;
-                  s=fbytes[2*i+1]<<8|fbytes[2*i];
-                  s=((s&0xFFFF)^0x8000)-0x8000;
-                  in[i]=s*256;
-               }
+                for (i = 0; i < frame_size*channels; i++) {
+                    oac_int32 s;
+                    s = fbytes[2*i + 1]<<8|fbytes[2*i];
+                    s = ((s&0xFFFF)^0x8000) - 0x8000;
+                    in[i] = s*256;
+                }
             } else if (format == FORMAT_S24_LE) {
-               for(i=0;i<frame_size*channels;i++)
-               {
-                  oac_int32 s;
-                  s=fbytes[3*i+2]<<16|fbytes[3*i+1]<<8|fbytes[3*i];
-                  s=((s&0xFFFFFF)^0x800000)-0x800000;
-                  in[i]=s;
-               }
+                for (i = 0; i < frame_size*channels; i++) {
+                    oac_int32 s;
+                    s = fbytes[3*i + 2]<<16|fbytes[3*i + 1]<<8|fbytes[3*i];
+                    s = ((s&0xFFFFFF)^0x800000) - 0x800000;
+                    in[i] = s;
+                }
             } else if (format == FORMAT_F32_LE) {
-               for(i=0;i<frame_size*channels;i++)
-               {
-                  float_bits s;
-                  s.i=(oac_uint32)fbytes[4*i+3]<<24|fbytes[4*i+2]<<16|fbytes[4*i+1]<<8|fbytes[4*i];
-                  in[i]=(int)floor(.5 + s.f*8388608);
-               }
+                for (i = 0; i < frame_size*channels; i++) {
+                    float_bits s;
+                    s.i = (oac_uint32)fbytes[4*i + 3]<<24|fbytes[4*i + 2]<<16|fbytes[4*i + 1]<<8|fbytes[4*i];
+                    in[i] = (int)floor(.5 + s.f*8388608);
+                }
             }
-            if (curr_read+remaining < frame_size)
-            {
-                for (i=(curr_read+remaining)*channels;i<frame_size*channels;i++)
-                   in[i] = 0;
+            if (curr_read + remaining < frame_size) {
+                for (i = (curr_read + remaining)*channels; i < frame_size*channels; i++)
+                    in[i] = 0;
                 if (encode_only || decode_only)
-                   stop = 1;
+                    stop = 1;
             }
             len = oac_encode24(enc, in, frame_size, data, max_payload_bytes);
-            if (len < 0)
-            {
+            if (len < 0) {
                 fprintf (stderr, "oac_encode() returned %d\n", len);
                 goto failure;
             }
             nb_encoded = oac_packet_get_samples_per_frame(data, sampling_rate)*oac_packet_get_nb_frames(data, len);
-            remaining = frame_size-nb_encoded;
-            for(i=0;i<remaining*channels;i++)
-               in[i] = in[nb_encoded*channels+i];
-            if (sweep_bps!=0)
-            {
-               bitrate_bps += sweep_bps;
-               if (sweep_max)
-               {
-                  if (bitrate_bps > sweep_max)
-                     sweep_bps = -sweep_bps;
-                  else if (bitrate_bps < sweep_min)
-                     sweep_bps = -sweep_bps;
-               }
-               /* safety */
-               if (bitrate_bps<1000)
-                  bitrate_bps = 1000;
-               oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrate_bps));
+            remaining = frame_size - nb_encoded;
+            for (i = 0; i < remaining*channels; i++)
+                in[i] = in[nb_encoded*channels + i];
+            if (sweep_bps != 0) {
+                bitrate_bps += sweep_bps;
+                if (sweep_max) {
+                    if (bitrate_bps > sweep_max)
+                        sweep_bps = -sweep_bps;
+                    else if (bitrate_bps < sweep_min)
+                        sweep_bps = -sweep_bps;
+                }
+                /* safety */
+                if (bitrate_bps < 1000)
+                    bitrate_bps = 1000;
+                oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrate_bps));
             }
             oac_encoder_ctl(enc, OAC_GET_FINAL_RANGE(&enc_final_range));
             curr_mode_count += frame_size;
-            if (curr_mode_count > mode_switch_time && curr_mode < nb_modes_in_list-1)
-            {
-               curr_mode++;
-               curr_mode_count = 0;
+            if (curr_mode_count > mode_switch_time && curr_mode < nb_modes_in_list - 1) {
+                curr_mode++;
+                curr_mode_count = 0;
             }
         }
 
 #if 0 /* This is for testing the padding code, do not enable by default */
-        if (len<1275)
-        {
-           int new_len = len+rand()%(max_payload_bytes-len);
-           if ((err = oac_packet_pad(data, len, new_len)) != OAC_OK)
-           {
-              fprintf(stderr, "padding failed: %s\n", oac_strerror(err));
-              goto failure;
-           }
-           len = new_len;
+        if (len < 1275) {
+            int new_len = len + rand()%(max_payload_bytes - len);
+            if ((err = oac_packet_pad(data, len, new_len)) != OAC_OK) {
+                fprintf(stderr, "padding failed: %s\n", oac_strerror(err));
+                goto failure;
+            }
+            len = new_len;
         }
 #endif
         if (encode_only && !encoder_loss) {
             lost = 0;
         } else if (packet_loss_file != NULL) {
-            if ( fscanf(packet_loss_file, "%d", &lost) != 1) {
+            if (fscanf(packet_loss_file, "%d", &lost) != 1) {
                 lost = 0;
             }
 #ifdef ENABLE_LOSSGEN
@@ -1075,121 +1037,117 @@ int main(int argc, char *argv[])
             lost = sample_loss(&lossgen, lossgen_perc*.01f);
 #endif
         } else {
-            lost = (packet_loss_perc>0) && (rand()%100 < packet_loss_perc);
+            lost = (packet_loss_perc > 0) && (rand()%100 < packet_loss_perc);
         }
-        if (encode_only)
-        {
+        if (encode_only) {
             unsigned char int_field[4];
             if (lost) {
-               enc_final_range = 0;
-               len = 0;
+                enc_final_range = 0;
+                len = 0;
             }
             int_to_char(len, int_field);
             if (fwrite(int_field, 1, 4, fout) != 4) {
-               fprintf(stderr, "Error writing.\n");
-               goto failure;
+                fprintf(stderr, "Error writing.\n");
+                goto failure;
             }
             int_to_char(enc_final_range, int_field);
             if (fwrite(int_field, 1, 4, fout) != 4) {
-               fprintf(stderr, "Error writing.\n");
-               goto failure;
+                fprintf(stderr, "Error writing.\n");
+                goto failure;
             }
             if (fwrite(data, 1, len, fout) != (unsigned)len) {
-               fprintf(stderr, "Error writing.\n");
-               goto failure;
+                fprintf(stderr, "Error writing.\n");
+                goto failure;
             }
             tot_samples += nb_encoded;
         } else {
             int fr;
             int run_decoder;
-            int dred_input=0;
-            int dred_end=0;
+            int dred_input = 0;
+            int dred_end = 0;
             if (len == 0) lost = 1;
-            if (lost)
-            {
-               lost_count++;
-               run_decoder = 0;
+            if (lost) {
+                lost_count++;
+                run_decoder = 0;
             } else {
-               run_decoder= 1;
+                run_decoder = 1;
             }
             if (run_decoder)
                 run_decoder += lost_count;
             if (!lost && lost_count > 0) {
-                oac_int32 output_samples=0;
+                oac_int32 output_samples = 0;
                 oac_decoder_ctl(dec, OAC_GET_LAST_PACKET_DURATION(&output_samples));
                 dred_input = lost_count*output_samples;
                 /* Only decode the amount we need to fill in the gap. */
-                ret = oac_dred_parse(dred_dec, dred, data, len, IMIN(sampling_rate, IMAX(0, dred_input)), sampling_rate, &dred_end, 0);
+                ret = oac_dred_parse(dred_dec, dred, data, len, IMIN(sampling_rate, IMAX(0, dred_input)), sampling_rate,
+                &dred_end, 0);
                 dred_input = ret > 0 ? ret : 0;
             }
             /* FIXME: Figure out how to trigger the decoder when the last packet of the file is lost. */
-            for (fr=0;fr<run_decoder;fr++) {
-                oac_int32 output_samples=0;
-                if (fr == lost_count-1 && oac_packet_has_lbrr(data, len)) {
-                   oac_decoder_ctl(dec, OAC_GET_LAST_PACKET_DURATION(&output_samples));
-                   output_samples = oac_decode24(dec, data, len, out, output_samples, 1);
+            for (fr = 0; fr < run_decoder; fr++) {
+                oac_int32 output_samples = 0;
+                if (fr == lost_count - 1 && oac_packet_has_lbrr(data, len)) {
+                    oac_decoder_ctl(dec, OAC_GET_LAST_PACKET_DURATION(&output_samples));
+                    output_samples = oac_decode24(dec, data, len, out, output_samples, 1);
                 } else if (fr < lost_count) {
-                   oac_decoder_ctl(dec, OAC_GET_LAST_PACKET_DURATION(&output_samples));
-                   if (dred_input > 0)
-                      output_samples = oac_decoder_dred_decode24(dec, dred, (lost_count-fr)*output_samples, out, output_samples);
-                   else
-                      output_samples = oac_decode24(dec, NULL, 0, out, output_samples, 0);
+                    oac_decoder_ctl(dec, OAC_GET_LAST_PACKET_DURATION(&output_samples));
+                    if (dred_input > 0)
+                        output_samples = oac_decoder_dred_decode24(dec, dred, (lost_count - fr)*output_samples, out,
+                        output_samples);
+                    else
+                        output_samples = oac_decode24(dec, NULL, 0, out, output_samples, 0);
                 } else {
-                   output_samples = max_frame_size;
-                   output_samples = oac_decode24(dec, data, len, out, output_samples, 0);
+                    output_samples = max_frame_size;
+                    output_samples = oac_decode24(dec, data, len, out, output_samples, 0);
                 }
-                if (output_samples>0)
-                {
-                    if (!decode_only && tot_out + output_samples > tot_in)
-                    {
-                       stop=1;
-                       output_samples = (oac_int32)(tot_in - tot_out);
+                if (output_samples > 0) {
+                    if (!decode_only && tot_out + output_samples > tot_in) {
+                        stop = 1;
+                        output_samples = (oac_int32)(tot_in - tot_out);
                     }
-                    if (output_samples>skip) {
-                       int i;
-                       if (format == FORMAT_S16_LE) {
-                          for(i=0;i<(output_samples-skip)*channels;i++)
-                          {
-                             oac_int32 s;
-                             s=out[i+(skip*channels)];
-                             if (s > 0x007fff00) s = 0x007fff00;
-                             if (s < -0x007fff00) s = -0x007fff00;
-                             s=(s+128)>>8;
-                             fbytes[2*i]=s&0xFF;
-                             fbytes[2*i+1]=(s>>8)&0xFF;
-                          }
-                       } else if (format == FORMAT_S24_LE) {
-                          for(i=0;i<(output_samples-skip)*channels;i++)
-                          {
-                             oac_int32 s;
-                             s=out[i+(skip*channels)];
-                             if (s > 0x007fffff) s = 0x007fffff;
-                             if (s < -0x007fffff) s = -0x007fffff;
-                             fbytes[3*i]=s&0xFF;
-                             fbytes[3*i+1]=(s>>8)&0xFF;
-                             fbytes[3*i+2]=(s>>16)&0xFF;
-                          }
-                       } else if (format == FORMAT_F32_LE) {
-                          for(i=0;i<(output_samples-skip)*channels;i++)
-                          {
-                             float_bits s;
-                             s.f=out[i+(skip*channels)]*(1.f/8388608.f);
-                             fbytes[4*i]=s.i&0xFF;
-                             fbytes[4*i+1]=(s.i>>8)&0xFF;
-                             fbytes[4*i+2]=(s.i>>16)&0xFF;
-                             fbytes[4*i+3]=(s.i>>24)&0xFF;
-                          }
-                       }
-                       if (fwrite(fbytes, format_size[format]*channels, output_samples-skip, fout) != (unsigned)(output_samples-skip)){
-                          fprintf(stderr, "Error writing.\n");
-                          goto failure;
-                       }
-                       tot_out += output_samples-skip;
+                    if (output_samples > skip) {
+                        int i;
+                        if (format == FORMAT_S16_LE) {
+                            for (i = 0; i < (output_samples - skip)*channels; i++) {
+                                oac_int32 s;
+                                s = out[i + (skip*channels)];
+                                if (s > 0x007fff00) s = 0x007fff00;
+                                if (s < -0x007fff00) s = -0x007fff00;
+                                s = (s + 128)>>8;
+                                fbytes[2*i] = s&0xFF;
+                                fbytes[2*i + 1] = (s>>8)&0xFF;
+                            }
+                        } else if (format == FORMAT_S24_LE) {
+                            for (i = 0; i < (output_samples - skip)*channels; i++) {
+                                oac_int32 s;
+                                s = out[i + (skip*channels)];
+                                if (s > 0x007fffff) s = 0x007fffff;
+                                if (s < -0x007fffff) s = -0x007fffff;
+                                fbytes[3*i] = s&0xFF;
+                                fbytes[3*i + 1] = (s>>8)&0xFF;
+                                fbytes[3*i + 2] = (s>>16)&0xFF;
+                            }
+                        } else if (format == FORMAT_F32_LE) {
+                            for (i = 0; i < (output_samples - skip)*channels; i++) {
+                                float_bits s;
+                                s.f = out[i + (skip*channels)]*(1.f/8388608.f);
+                                fbytes[4*i] = s.i&0xFF;
+                                fbytes[4*i + 1] = (s.i>>8)&0xFF;
+                                fbytes[4*i + 2] = (s.i>>16)&0xFF;
+                                fbytes[4*i + 3] = (s.i>>24)&0xFF;
+                            }
+                        }
+                        if (fwrite(fbytes, format_size[format]*channels, output_samples - skip,
+                        fout) != (unsigned)(output_samples - skip)) {
+                            fprintf(stderr, "Error writing.\n");
+                            goto failure;
+                        }
+                        tot_out += output_samples - skip;
                     }
-                    if (output_samples<skip) skip -= output_samples;
+                    if (output_samples < skip)skip -= output_samples;
                     else skip = 0;
                 } else {
-                   fprintf(stderr, "error decoding frame: %s\n",
+                    fprintf(stderr, "error decoding frame: %s\n",
                                    oac_strerror(output_samples));
                 }
                 tot_samples += output_samples;
@@ -1197,36 +1155,35 @@ int main(int argc, char *argv[])
         }
 
         if (!encode_only)
-           oac_decoder_ctl(dec, OAC_GET_FINAL_RANGE(&dec_final_range));
+            oac_decoder_ctl(dec, OAC_GET_FINAL_RANGE(&dec_final_range));
         /* compare final range encoder rng values of encoder and decoder */
-        if( enc_final_range!=0  && !encode_only
-         && !lost && !lost_prev
-         && dec_final_range != enc_final_range ) {
+        if (enc_final_range != 0  && !encode_only
+            && !lost && !lost_prev
+            && dec_final_range != enc_final_range) {
             fprintf (stderr, "Error: Range coder state mismatch "
                              "between encoder and decoder "
                              "in frame %ld: 0x%8lx vs 0x%8lx\n",
-                         (long)count,
-                         (unsigned long)enc_final_range,
-                         (unsigned long)dec_final_range);
+                (long)count,
+                (unsigned long)enc_final_range,
+                (unsigned long)dec_final_range);
             goto failure;
         }
 
         lost_prev = lost;
         if (!lost)
-           lost_count = 0;
-        if( count >= use_inbandfec ) {
+            lost_count = 0;
+        if (count >= use_inbandfec) {
             /* count bits */
             bits += len*8;
-            bits_max = ( len*8 > bits_max ) ? len*8 : bits_max;
+            bits_max = (len*8 > bits_max) ? len*8 : bits_max;
             bits2 += len*(double)len*64;
-            if (!decode_only)
-            {
+            if (!decode_only) {
                 nrg = 0.0;
-                for ( k = 0; k < frame_size * channels; k++ ) {
-                    nrg += in[ k ] * (double)in[ k ];
+                for (k = 0; k < frame_size*channels; k++) {
+                    nrg += in[ k ]*(double)in[ k ];
                 }
-                nrg /= frame_size * channels;
-                if( nrg > 1e5 ) {
+                nrg /= frame_size*channels;
+                if (nrg > 1e5) {
                     bits_act += len*8;
                     count_act++;
                 }
@@ -1235,27 +1192,26 @@ int main(int argc, char *argv[])
         count++;
     }
 
-    if(decode_only && count > 0)
-        frame_size = (int)(tot_samples / count);
+    if (decode_only && count > 0)
+        frame_size = (int)(tot_samples/count);
     count -= use_inbandfec;
-    if (tot_samples >= 1 && count > 0 && frame_size)
-    {
-       /* Print out bitrate statistics */
-       double var;
-       fprintf (stderr, "average bitrate:             %7.3f kb/s\n",
+    if (tot_samples >= 1 && count > 0 && frame_size) {
+        /* Print out bitrate statistics */
+        double var;
+        fprintf (stderr, "average bitrate:             %7.3f kb/s\n",
                         1e-3*bits*sampling_rate/tot_samples);
-       fprintf (stderr, "maximum bitrate:             %7.3f kb/s\n",
+        fprintf (stderr, "maximum bitrate:             %7.3f kb/s\n",
                         1e-3*bits_max*sampling_rate/frame_size);
-       if (!decode_only)
-          fprintf (stderr, "active bitrate:              %7.3f kb/s\n",
-                           1e-3*bits_act*sampling_rate/(1e-15+frame_size*(double)count_act));
-       var = bits2/count - bits*bits/(count*(double)count);
-       if (var < 0)
-          var = 0;
-       fprintf (stderr, "bitrate standard deviation:  %7.3f kb/s\n",
+        if (!decode_only)
+            fprintf (stderr, "active bitrate:              %7.3f kb/s\n",
+                           1e-3*bits_act*sampling_rate/(1e-15 + frame_size*(double)count_act));
+        var = bits2/count - bits*bits/(count*(double)count);
+        if (var < 0)
+            var = 0;
+        fprintf (stderr, "bitrate standard deviation:  %7.3f kb/s\n",
                         1e-3*sqrt(var)*sampling_rate/frame_size);
     } else {
-       fprintf(stderr, "bitrate statistics are undefined\n");
+        fprintf(stderr, "bitrate statistics are undefined\n");
     }
     silk_TimerSave("oac_timing.txt");
     ret = EXIT_SUCCESS;
diff --git a/src/oac_encoder.c b/src/oac_encoder.c
index 94ce04c35..1b87cf3a5 100644
--- a/src/oac_encoder.c
+++ b/src/oac_encoder.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdarg.h>
@@ -47,127 +47,127 @@
 #include "tuning_parameters.h"
 
 #ifdef ENABLE_DRED
-#include "dred_coding.h"
+# include "dred_coding.h"
 #endif
 
 #ifdef FIXED_POINT
-#include "fixed/structs_FIX.h"
+# include "fixed/structs_FIX.h"
 #else
-#include "float/structs_FLP.h"
+# include "float/structs_FLP.h"
 #endif
 #ifdef ENABLE_OSCE_TRAINING_DATA
-#include <stdio.h>
+# include <stdio.h>
 #endif
 
 #ifdef ENABLE_QEXT
-#define MAX_ENCODER_BUFFER 960
+# define MAX_ENCODER_BUFFER 960
 #else
-#define MAX_ENCODER_BUFFER 480
+# define MAX_ENCODER_BUFFER 480
 #endif
 
 #define PSEUDO_SNR_THRESHOLD 316.23f    /* 10^(25/10) */
 
 typedef struct {
-   oac_val32 XX, XY, YY;
-   oac_val16 smoothed_width;
-   oac_val16 max_follower;
+    oac_val32 XX, XY, YY;
+    oac_val16 smoothed_width;
+    oac_val16 max_follower;
 } StereoWidthState;
 
 struct OacEncoder {
-    int          celt_enc_offset;
-    int          silk_enc_offset;
+    int celt_enc_offset;
+    int silk_enc_offset;
     silk_EncControlStruct silk_mode;
 #ifdef ENABLE_DRED
-    DREDEnc      dred_encoder;
+    DREDEnc dred_encoder;
 #endif
-    int          application;
-    int          channels;
-    int          delay_compensation;
-    int          force_channels;
-    int          signal_type;
-    int          user_bandwidth;
-    int          max_bandwidth;
-    int          user_forced_mode;
-    int          voice_ratio;
-    oac_int32   Fs;
-    int          use_vbr;
-    int          vbr_constraint;
-    int          variable_duration;
-    oac_int32   bitrate_bps;
-    oac_int32   user_bitrate_bps;
-    int          lsb_depth;
-    int          encoder_buffer;
-    int          lfe;
-    int          arch;
-    int          use_dtx;                 /* general DTX for both SILK and CELT */
-    int          fec_config;
+    int application;
+    int channels;
+    int delay_compensation;
+    int force_channels;
+    int signal_type;
+    int user_bandwidth;
+    int max_bandwidth;
+    int user_forced_mode;
+    int voice_ratio;
+    oac_int32 Fs;
+    int use_vbr;
+    int vbr_constraint;
+    int variable_duration;
+    oac_int32 bitrate_bps;
+    oac_int32 user_bitrate_bps;
+    int lsb_depth;
+    int encoder_buffer;
+    int lfe;
+    int arch;
+    int use_dtx;                          /* general DTX for both SILK and CELT */
+    int fec_config;
 #ifndef DISABLE_FLOAT_API
     TonalityAnalysisState analysis;
 #endif
 
 #define OAC_ENCODER_RESET_START stream_channels
-    int          stream_channels;
-    oac_int16   hybrid_stereo_width_Q14;
-    oac_int32   variable_HP_smth2_Q15;
-    oac_val16   prev_HB_gain;
-    oac_val32   hp_mem[4];
-    int          mode;
-    int          prev_mode;
-    int          prev_channels;
-    int          prev_framesize;
-    int          bandwidth;
+    int stream_channels;
+    oac_int16 hybrid_stereo_width_Q14;
+    oac_int32 variable_HP_smth2_Q15;
+    oac_val16 prev_HB_gain;
+    oac_val32 hp_mem[4];
+    int mode;
+    int prev_mode;
+    int prev_channels;
+    int prev_framesize;
+    int bandwidth;
     /* Bandwidth determined automatically from the rate (before any other adjustment) */
-    int          auto_bandwidth;
-    int          silk_bw_switch;
+    int auto_bandwidth;
+    int silk_bw_switch;
     /* Sampling rate (at the API level) */
-    int          first;
+    int first;
     celt_glog * energy_masking;
     StereoWidthState width_mem;
 #ifndef DISABLE_FLOAT_API
-    int          detected_bandwidth;
+    int detected_bandwidth;
 #endif
-    int          nb_no_activity_ms_Q1;
-    oac_val32   peak_signal_energy;
+    int nb_no_activity_ms_Q1;
+    oac_val32 peak_signal_energy;
 #ifdef ENABLE_DRED
-    int          dred_duration;
-    int          dred_q0;
-    int          dred_dQ;
-    int          dred_qmax;
-    int          dred_target_chunks;
+    int dred_duration;
+    int dred_q0;
+    int dred_dQ;
+    int dred_qmax;
+    int dred_target_chunks;
     unsigned char activity_mem[DRED_MAX_FRAMES*4]; /* 2.5ms resolution*/
 #endif
-    int          nonfinal_frame; /* current frame is not the final in a packet */
-    oac_uint32  rangeFinal;
+    int nonfinal_frame;          /* current frame is not the final in a packet */
+    oac_uint32 rangeFinal;
     /* Needs to be the last field because it may be partially or completely omitted. */
-    oac_res     delay_buffer[MAX_ENCODER_BUFFER*2];
+    oac_res delay_buffer[MAX_ENCODER_BUFFER*2];
 };
 
 /* Transition tables for the voice and music. First column is the
    middle (memoriless) threshold. The second column is the hysteresis
    (difference with the middle) */
 static const oac_int32 mono_voice_bandwidth_thresholds[8] = {
-         9000,  700, /* NB<->MB */
-         9000,  700, /* MB<->WB */
-        13500, 1000, /* WB<->SWB */
-        14000, 2000, /* SWB<->FB */
+    9000,  700,      /* NB<->MB */
+    9000,  700,      /* MB<->WB */
+    13500, 1000,     /* WB<->SWB */
+    14000, 2000,     /* SWB<->FB */
 };
 static const oac_int32 mono_music_bandwidth_thresholds[8] = {
-         9000,  700, /* NB<->MB */
-         9000,  700, /* MB<->WB */
-        11000, 1000, /* WB<->SWB */
-        12000, 2000, /* SWB<->FB */
+    9000,  700,      /* NB<->MB */
+    9000,  700,      /* MB<->WB */
+    11000, 1000,     /* WB<->SWB */
+    12000, 2000,     /* SWB<->FB */
 };
 static const oac_int32 stereo_voice_bandwidth_thresholds[8] = {
-         9000,  700, /* NB<->MB */
-         9000,  700, /* MB<->WB */
-        13500, 1000, /* WB<->SWB */
-        14000, 2000, /* SWB<->FB */
+    9000,  700,      /* NB<->MB */
+    9000,  700,      /* MB<->WB */
+    13500, 1000,     /* WB<->SWB */
+    14000, 2000,     /* SWB<->FB */
 };
 static const oac_int32 stereo_music_bandwidth_thresholds[8] = {
-         9000,  700, /* NB<->MB */
-         9000,  700, /* MB<->WB */
-        11000, 1000, /* WB<->SWB */
-        12000, 2000, /* SWB<->FB */
+    9000,  700,      /* NB<->MB */
+    9000,  700,      /* MB<->WB */
+    11000, 1000,     /* WB<->SWB */
+    12000, 2000,     /* SWB<->FB */
 };
 /* Threshold bit-rates for switching between mono and stereo */
 static const oac_int32 stereo_voice_threshold = 19000;
@@ -175,21 +175,20 @@ static const oac_int32 stereo_music_threshold = 17000;
 
 /* Threshold bit-rate for switching between SILK/hybrid and CELT-only */
 static const oac_int32 mode_thresholds[2][2] = {
-      /* voice */ /* music */
-      {  64000,      10000}, /* mono */
-      {  44000,      10000}, /* stereo */
+    /* voice */ /* music */
+    {  64000,      10000},   /* mono */
+    {  44000,      10000},   /* stereo */
 };
 
 static const oac_int32 fec_thresholds[] = {
-        12000, 1000, /* NB */
-        14000, 1000, /* MB */
-        16000, 1000, /* WB */
-        20000, 1000, /* SWB */
-        22000, 1000, /* FB */
+    12000, 1000,     /* NB */
+    14000, 1000,     /* MB */
+    16000, 1000,     /* WB */
+    20000, 1000,     /* SWB */
+    22000, 1000,     /* FB */
 };
 
-int oac_encoder_get_size(int channels)
-{
+int oac_encoder_get_size(int channels) {
     int ret;
     ret = oac_encoder_init(NULL, 48000, channels, OAC_APPLICATION_AUDIO);
     if (ret < 0)
@@ -198,24 +197,23 @@ int oac_encoder_get_size(int channels)
         return ret;
 }
 
-int oac_encoder_init(OacEncoder* st, oac_int32 Fs, int channels, int application)
-{
-    void *silk_enc=NULL;
-    CELTEncoder *celt_enc=NULL;
+int oac_encoder_init(OacEncoder* st, oac_int32 Fs, int channels, int application) {
+    void *silk_enc = NULL;
+    CELTEncoder *celt_enc = NULL;
     int err;
-    int ret, silkEncSizeBytes, celtEncSizeBytes=0;
+    int ret, silkEncSizeBytes, celtEncSizeBytes = 0;
     int tot_size;
     int base_size;
 
-   if((Fs!=48000&&Fs!=24000&&Fs!=16000&&Fs!=12000&&Fs!=8000
+    if ((Fs != 48000 && Fs != 24000 && Fs != 16000 && Fs != 12000 && Fs != 8000
 #ifdef ENABLE_QEXT
-         &&Fs!=96000
+         && Fs != 96000
 #endif
-         )||(channels!=1&&channels!=2)||
-        (application != OAC_APPLICATION_VOIP && application != OAC_APPLICATION_AUDIO
-        && application != OAC_APPLICATION_RESTRICTED_LOWDELAY
-        && application != OAC_APPLICATION_RESTRICTED_SILK
-        && application != OAC_APPLICATION_RESTRICTED_CELT))
+         ) || (channels != 1 && channels != 2)
+        || (application != OAC_APPLICATION_VOIP && application != OAC_APPLICATION_AUDIO
+            && application != OAC_APPLICATION_RESTRICTED_LOWDELAY
+            && application != OAC_APPLICATION_RESTRICTED_SILK
+            && application != OAC_APPLICATION_RESTRICTED_CELT))
         return OAC_BAD_ARG;
 
     /* Create SILK encoder */
@@ -229,16 +227,16 @@ int oac_encoder_init(OacEncoder* st, oac_int32 Fs, int channels, int application
         celtEncSizeBytes = celt_encoder_get_size(channels);
     base_size = align(sizeof(OacEncoder));
     if (application == OAC_APPLICATION_RESTRICTED_SILK || application == OAC_APPLICATION_RESTRICTED_CELT) {
-       base_size = align(base_size - MAX_ENCODER_BUFFER*2*sizeof(oac_res));
-    } else if (channels==1)
-       base_size = align(base_size - MAX_ENCODER_BUFFER*sizeof(oac_res));
-    tot_size = base_size+silkEncSizeBytes+celtEncSizeBytes;
+        base_size = align(base_size - MAX_ENCODER_BUFFER*2*sizeof(oac_res));
+    } else if (channels == 1)
+        base_size = align(base_size - MAX_ENCODER_BUFFER*sizeof(oac_res));
+    tot_size = base_size + silkEncSizeBytes + celtEncSizeBytes;
     if (st == NULL) {
         return tot_size;
     }
     OAC_CLEAR((char*)st, tot_size);
     st->silk_enc_offset = base_size;
-    st->celt_enc_offset = st->silk_enc_offset+silkEncSizeBytes;
+    st->celt_enc_offset = st->silk_enc_offset + silkEncSizeBytes;
 
     st->stream_channels = st->channels = channels;
 
@@ -246,12 +244,11 @@ int oac_encoder_init(OacEncoder* st, oac_int32 Fs, int channels, int application
 
     st->arch = oac_select_arch();
 
-    if (application != OAC_APPLICATION_RESTRICTED_CELT)
-    {
-       silk_enc = (char*)st+st->silk_enc_offset;
-       ret = silk_InitEncoder( silk_enc, st->channels, st->arch, &st->silk_mode );
+    if (application != OAC_APPLICATION_RESTRICTED_CELT) {
+        silk_enc = (char*)st + st->silk_enc_offset;
+        ret = silk_InitEncoder( silk_enc, st->channels, st->arch, &st->silk_mode );
     }
-    if(ret)return OAC_INTERNAL_ERROR;
+    if (ret)return OAC_INTERNAL_ERROR;
 
     /* default SILK parameters */
     st->silk_mode.nChannelsAPI              = channels;
@@ -272,13 +269,12 @@ int oac_encoder_init(OacEncoder* st, oac_int32 Fs, int channels, int application
 
     /* Create CELT encoder */
     /* Initialize CELT encoder */
-    if (application != OAC_APPLICATION_RESTRICTED_SILK)
-    {
-       celt_enc = (CELTEncoder*)((char*)st+st->celt_enc_offset);
-       err = celt_encoder_init(celt_enc, Fs, channels, st->arch);
-       if(err!=OAC_OK)return OAC_INTERNAL_ERROR;
-       celt_encoder_ctl(celt_enc, CELT_SET_SIGNALLING(0));
-       celt_encoder_ctl(celt_enc, OAC_SET_COMPLEXITY(st->silk_mode.complexity));
+    if (application != OAC_APPLICATION_RESTRICTED_SILK) {
+        celt_enc = (CELTEncoder*)((char*)st + st->celt_enc_offset);
+        err = celt_encoder_init(celt_enc, Fs, channels, st->arch);
+        if (err != OAC_OK) return OAC_INTERNAL_ERROR;
+        celt_encoder_ctl(celt_enc, CELT_SET_SIGNALLING(0));
+        celt_encoder_ctl(celt_enc, OAC_SET_COMPLEXITY(st->silk_mode.complexity));
     }
 
 #ifdef ENABLE_DRED
@@ -290,7 +286,7 @@ int oac_encoder_init(OacEncoder* st, oac_int32 Fs, int channels, int application
     /* Makes constrained VBR the default (safer for real-time use) */
     st->vbr_constraint = 1;
     st->user_bitrate_bps = OAC_AUTO;
-    st->bitrate_bps = 3000+Fs*channels;
+    st->bitrate_bps = 3000 + Fs*channels;
     st->application = application;
     st->signal_type = OAC_AUTO;
     st->user_bandwidth = OAC_AUTO;
@@ -299,17 +295,17 @@ int oac_encoder_init(OacEncoder* st, oac_int32 Fs, int channels, int application
     st->user_forced_mode = OAC_AUTO;
     st->voice_ratio = -1;
     if (application != OAC_APPLICATION_RESTRICTED_CELT && application != OAC_APPLICATION_RESTRICTED_SILK)
-       st->encoder_buffer = st->Fs/100;
+        st->encoder_buffer = st->Fs/100;
     else
-       st->encoder_buffer = 0;
+        st->encoder_buffer = 0;
     st->lsb_depth = 24;
     st->variable_duration = OAC_FRAMESIZE_ARG;
 
     /* Delay compensation of 4 ms (2.5 ms for SILK's extra look-ahead
-       + 1.5 ms for SILK resamplers and stereo prediction) */
+     + 1.5 ms for SILK resamplers and stereo prediction) */
     st->delay_compensation = st->Fs/250;
 
-    st->hybrid_stereo_width_Q14 = 1 << 14;
+    st->hybrid_stereo_width_Q14 = 1<<14;
     st->prev_HB_gain = Q15ONE;
     st->variable_HP_smth2_Q15 = silk_LSHIFT( silk_lin2log( VARIABLE_HP_MIN_CUTOFF_HZ ), 8 );
     st->first = 1;
@@ -324,36 +320,31 @@ int oac_encoder_init(OacEncoder* st, oac_int32 Fs, int channels, int application
     return OAC_OK;
 }
 
-static unsigned char gen_toc(int mode, int framerate, int bandwidth, int channels)
-{
-   int period;
-   unsigned char toc;
-   period = 0;
-   while (framerate < 400)
-   {
-       framerate <<= 1;
-       period++;
-   }
-   if (mode == MODE_SILK_ONLY)
-   {
-       toc = (bandwidth-OAC_BANDWIDTH_NARROWBAND)<<5;
-       toc |= (period-2)<<3;
-   } else if (mode == MODE_CELT_ONLY)
-   {
-       int tmp = bandwidth-OAC_BANDWIDTH_MEDIUMBAND;
-       if (tmp < 0)
-           tmp = 0;
-       toc = 0x80;
-       toc |= tmp << 5;
-       toc |= period<<3;
-   } else /* Hybrid */
-   {
-       toc = 0x60;
-       toc |= (bandwidth-OAC_BANDWIDTH_SUPERWIDEBAND)<<4;
-       toc |= (period-2)<<3;
-   }
-   toc |= (channels==2)<<2;
-   return toc;
+static unsigned char gen_toc(int mode, int framerate, int bandwidth, int channels) {
+    int period;
+    unsigned char toc;
+    period = 0;
+    while (framerate < 400) {
+        framerate <<= 1;
+        period++;
+    }
+    if (mode == MODE_SILK_ONLY) {
+        toc = (bandwidth - OAC_BANDWIDTH_NARROWBAND)<<5;
+        toc |= (period - 2)<<3;
+    } else if (mode == MODE_CELT_ONLY) {
+        int tmp = bandwidth - OAC_BANDWIDTH_MEDIUMBAND;
+        if (tmp < 0)
+            tmp = 0;
+        toc = 0x80;
+        toc |= tmp<<5;
+        toc |= period<<3;
+    } else { /* Hybrid */
+        toc = 0x60;
+        toc |= (bandwidth - OAC_BANDWIDTH_SUPERWIDEBAND)<<4;
+        toc |= (period - 2)<<3;
+    }
+    toc |= (channels == 2)<<2;
+    return toc;
 }
 
 #ifdef FIXED_POINT
@@ -364,21 +355,19 @@ void silk_biquad_res(
     const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
     oac_int32                  *S,                 /* I/O   State vector [2]                                           */
     oac_res                    *out,               /* O     output signal                                              */
-    const oac_int32            len,                /* I     signal length (must be even)                               */
-    int stride
-)
-{
+    const oac_int32 len,                           /* I     signal length (must be even)                               */
+    int stride) {
     /* DIRECT FORM II TRANSPOSED (uses 2 element state vector) */
-    oac_int   k;
+    oac_int k;
     oac_int32 inval, A0_U_Q28, A0_L_Q28, A1_U_Q28, A1_L_Q28, out32_Q14;
 
     /* Negate A_Q28 values and split in two parts */
-    A0_L_Q28 = ( -A_Q28[ 0 ] ) & 0x00003FFF;        /* lower part */
+    A0_L_Q28 = (-A_Q28[ 0 ])&0x00003FFF;            /* lower part */
     A0_U_Q28 = silk_RSHIFT( -A_Q28[ 0 ], 14 );      /* upper part */
-    A1_L_Q28 = ( -A_Q28[ 1 ] ) & 0x00003FFF;        /* lower part */
+    A1_L_Q28 = (-A_Q28[ 1 ])&0x00003FFF;            /* lower part */
     A1_U_Q28 = silk_RSHIFT( -A_Q28[ 1 ], 14 );      /* upper part */
 
-    for( k = 0; k < len; k++ ) {
+    for (k = 0; k < len; k++) {
         /* S[ 0 ], S[ 1 ]: Q12 */
         inval = RES2INT16(in[ k*stride ]);
         out32_Q14 = silk_LSHIFT( silk_SMLAWB( S[ 0 ], B_Q28[ 0 ], inval ), 2 );
@@ -392,7 +381,7 @@ void silk_biquad_res(
         S[ 1 ] = silk_SMLAWB( S[ 1 ], B_Q28[ 2 ], inval );
 
         /* Scale back to Q0 and saturate */
-        out[ k*stride ] = INT16TORES( silk_SAT16( silk_RSHIFT( out32_Q14 + (1<<14) - 1, 14 ) ) );
+        out[ k*stride ] = INT16TORES( silk_SAT16( silk_RSHIFT( out32_Q14 + (1<<14) - 1, 14 )));
     }
 }
 #else
@@ -402,32 +391,30 @@ static void silk_biquad_res(
     const oac_int32      *A_Q28,         /* I:    AR coefficients [2]            */
     oac_val32            *S,             /* I/O:  State vector [2]               */
     oac_res              *out,           /* O:    Output signal                  */
-    const oac_int32      len,            /* I:    Signal length (must be even)   */
-    int stride
-)
-{
+    const oac_int32 len,                 /* I:    Signal length (must be even)   */
+    int stride) {
     /* DIRECT FORM II TRANSPOSED (uses 2 element state vector) */
-    oac_int   k;
+    oac_int k;
     oac_val32 vout;
     oac_val32 inval;
     oac_val32 A[2], B[3];
 
-    A[0] = (oac_val32)(A_Q28[0] * (1.f/((oac_int32)1<<28)));
-    A[1] = (oac_val32)(A_Q28[1] * (1.f/((oac_int32)1<<28)));
-    B[0] = (oac_val32)(B_Q28[0] * (1.f/((oac_int32)1<<28)));
-    B[1] = (oac_val32)(B_Q28[1] * (1.f/((oac_int32)1<<28)));
-    B[2] = (oac_val32)(B_Q28[2] * (1.f/((oac_int32)1<<28)));
+    A[0] = (oac_val32)(A_Q28[0]*(1.f/((oac_int32)1<<28)));
+    A[1] = (oac_val32)(A_Q28[1]*(1.f/((oac_int32)1<<28)));
+    B[0] = (oac_val32)(B_Q28[0]*(1.f/((oac_int32)1<<28)));
+    B[1] = (oac_val32)(B_Q28[1]*(1.f/((oac_int32)1<<28)));
+    B[2] = (oac_val32)(B_Q28[2]*(1.f/((oac_int32)1<<28)));
 
     /* Negate A_Q28 values and split in two parts */
 
-    for( k = 0; k < len; k++ ) {
+    for (k = 0; k < len; k++) {
         /* S[ 0 ], S[ 1 ]: Q12 */
         inval = in[ k*stride ];
         vout = S[ 0 ] + B[0]*inval;
 
         S[ 0 ] = S[1] - vout*A[0] + B[1]*inval;
 
-        S[ 1 ] = - vout*A[1] + B[2]*inval + VERY_SMALL;
+        S[ 1 ] = -vout*A[1] + B[2]*inval + VERY_SMALL;
 
         /* Scale back to Q0 and saturate */
         out[ k*stride ] = vout;
@@ -435,664 +422,614 @@ static void silk_biquad_res(
 }
 #endif
 
-static void hp_cutoff(const oac_res *in, oac_int32 cutoff_Hz, oac_res *out, oac_val32 *hp_mem, int len, int channels, oac_int32 Fs, int arch)
-{
-   oac_int32 B_Q28[ 3 ], A_Q28[ 2 ];
-   oac_int32 Fc_Q19, r_Q28, r_Q22;
-   (void)arch;
-
-   silk_assert( cutoff_Hz <= silk_int32_MAX / SILK_FIX_CONST( 1.5 * 3.14159 / 1000, 19 ) );
-   Fc_Q19 = silk_DIV32_16( silk_SMULBB( SILK_FIX_CONST( 1.5 * 3.14159 / 1000, 19 ), cutoff_Hz ), Fs/1000 );
-   silk_assert( Fc_Q19 > 0 && Fc_Q19 < 32768 );
-
-   r_Q28 = SILK_FIX_CONST( 1.0, 28 ) - silk_MUL( SILK_FIX_CONST( 0.92, 9 ), Fc_Q19 );
-
-   /* b = r * [ 1; -2; 1 ]; */
-   /* a = [ 1; -2 * r * ( 1 - 0.5 * Fc^2 ); r^2 ]; */
-   B_Q28[ 0 ] = r_Q28;
-   B_Q28[ 1 ] = silk_LSHIFT( -r_Q28, 1 );
-   B_Q28[ 2 ] = r_Q28;
-
-   /* -r * ( 2 - Fc * Fc ); */
-   r_Q22  = silk_RSHIFT( r_Q28, 6 );
-   A_Q28[ 0 ] = silk_SMULWW( r_Q22, silk_SMULWW( Fc_Q19, Fc_Q19 ) - SILK_FIX_CONST( 2.0,  22 ) );
-   A_Q28[ 1 ] = silk_SMULWW( r_Q22, r_Q22 );
-
-   silk_biquad_res( in, B_Q28, A_Q28, hp_mem, out, len, channels );
-   if( channels == 2 ) {
-       silk_biquad_res( in+1, B_Q28, A_Q28, hp_mem+2, out+1, len, channels );
-   }
+static void hp_cutoff(const oac_res *in, oac_int32 cutoff_Hz, oac_res *out, oac_val32 *hp_mem, int len, int channels,
+                      oac_int32 Fs, int arch) {
+    oac_int32 B_Q28[ 3 ], A_Q28[ 2 ];
+    oac_int32 Fc_Q19, r_Q28, r_Q22;
+    (void)arch;
+
+    silk_assert( cutoff_Hz <= silk_int32_MAX/SILK_FIX_CONST( 1.5*3.14159/1000, 19 ));
+    Fc_Q19 = silk_DIV32_16( silk_SMULBB( SILK_FIX_CONST( 1.5*3.14159/1000, 19 ), cutoff_Hz ), Fs/1000 );
+    silk_assert( Fc_Q19 > 0 && Fc_Q19 < 32768 );
+
+    r_Q28 = SILK_FIX_CONST( 1.0, 28 ) - silk_MUL( SILK_FIX_CONST( 0.92, 9 ), Fc_Q19 );
+
+    /* b = r * [ 1; -2; 1 ]; */
+    /* a = [ 1; -2 * r * ( 1 - 0.5 * Fc^2 ); r^2 ]; */
+    B_Q28[ 0 ] = r_Q28;
+    B_Q28[ 1 ] = silk_LSHIFT( -r_Q28, 1 );
+    B_Q28[ 2 ] = r_Q28;
+
+    /* -r * ( 2 - Fc * Fc ); */
+    r_Q22  = silk_RSHIFT( r_Q28, 6 );
+    A_Q28[ 0 ] = silk_SMULWW( r_Q22, silk_SMULWW( Fc_Q19, Fc_Q19 ) - SILK_FIX_CONST( 2.0,  22 ));
+    A_Q28[ 1 ] = silk_SMULWW( r_Q22, r_Q22 );
+
+    silk_biquad_res( in, B_Q28, A_Q28, hp_mem, out, len, channels );
+    if (channels == 2) {
+        silk_biquad_res( in + 1, B_Q28, A_Q28, hp_mem + 2, out + 1, len, channels );
+    }
 }
 
 #ifdef FIXED_POINT
-static void dc_reject(const oac_res *in, oac_int32 cutoff_Hz, oac_res *out, oac_val32 *hp_mem, int len, int channels, oac_int32 Fs)
-{
-   int c, i;
-   int shift;
-
-   /* Approximates -round(log2(6.3*cutoff_Hz/Fs)) */
-   shift=celt_ilog2(Fs/(cutoff_Hz*4));
-   for (c=0;c<channels;c++)
-   {
-      for (i=0;i<len;i++)
-      {
-         oac_val32 x, y;
-         /* Saturate at +6 dBFS to avoid any wrap-around. */
-         x = SATURATE((oac_val32)in[channels*i+c], (1<<16<<RES_SHIFT)-1);
-         x = SHL32(x, 14-RES_SHIFT);
-         y = x-hp_mem[2*c];
-         hp_mem[2*c] = hp_mem[2*c] + PSHR32(x - hp_mem[2*c], shift);
-         /* Don't saturate if we have the headroom to avoid it. */
-         out[channels*i+c] = PSHR32(y, 14-RES_SHIFT);
-      }
-   }
+static void dc_reject(const oac_res *in, oac_int32 cutoff_Hz, oac_res *out, oac_val32 *hp_mem, int len, int channels,
+                      oac_int32 Fs) {
+    int c, i;
+    int shift;
+
+    /* Approximates -round(log2(6.3*cutoff_Hz/Fs)) */
+    shift = celt_ilog2(Fs/(cutoff_Hz*4));
+    for (c = 0; c < channels; c++) {
+        for (i = 0; i < len; i++) {
+            oac_val32 x, y;
+            /* Saturate at +6 dBFS to avoid any wrap-around. */
+            x = SATURATE((oac_val32)in[channels*i + c], (1<<16<<RES_SHIFT) - 1);
+            x = SHL32(x, 14 - RES_SHIFT);
+            y = x - hp_mem[2*c];
+            hp_mem[2*c] = hp_mem[2*c] + PSHR32(x - hp_mem[2*c], shift);
+            /* Don't saturate if we have the headroom to avoid it. */
+            out[channels*i + c] = PSHR32(y, 14 - RES_SHIFT);
+        }
+    }
 }
 
 #else
-static void dc_reject(const oac_val16 *in, oac_int32 cutoff_Hz, oac_val16 *out, oac_val32 *hp_mem, int len, int channels, oac_int32 Fs)
-{
-   int i;
-   float coef, coef2;
-   coef = 6.3f*cutoff_Hz/Fs;
-   coef2 = 1-coef;
-   if (channels==2)
-   {
-      float m0, m2;
-      m0 = hp_mem[0];
-      m2 = hp_mem[2];
-      for (i=0;i<len;i++)
-      {
-         oac_val32 x0, x1, out0, out1;
-         x0 = in[2*i+0];
-         x1 = in[2*i+1];
-         out0 = x0-m0;
-         out1 = x1-m2;
-         m0 = coef*x0 + VERY_SMALL + coef2*m0;
-         m2 = coef*x1 + VERY_SMALL + coef2*m2;
-         out[2*i+0] = out0;
-         out[2*i+1] = out1;
-      }
-      hp_mem[0] = m0;
-      hp_mem[2] = m2;
-   } else {
-      float m0;
-      m0 = hp_mem[0];
-      for (i=0;i<len;i++)
-      {
-         oac_val32 x, y;
-         x = in[i];
-         y = x-m0;
-         m0 = coef*x + VERY_SMALL + coef2*m0;
-         out[i] = y;
-      }
-      hp_mem[0] = m0;
-   }
+static void dc_reject(const oac_val16 *in, oac_int32 cutoff_Hz, oac_val16 *out, oac_val32 *hp_mem, int len,
+                      int channels, oac_int32 Fs) {
+    int i;
+    float coef, coef2;
+    coef = 6.3f*cutoff_Hz/Fs;
+    coef2 = 1 - coef;
+    if (channels == 2) {
+        float m0, m2;
+        m0 = hp_mem[0];
+        m2 = hp_mem[2];
+        for (i = 0; i < len; i++) {
+            oac_val32 x0, x1, out0, out1;
+            x0 = in[2*i + 0];
+            x1 = in[2*i + 1];
+            out0 = x0 - m0;
+            out1 = x1 - m2;
+            m0 = coef*x0 + VERY_SMALL + coef2*m0;
+            m2 = coef*x1 + VERY_SMALL + coef2*m2;
+            out[2*i + 0] = out0;
+            out[2*i + 1] = out1;
+        }
+        hp_mem[0] = m0;
+        hp_mem[2] = m2;
+    } else {
+        float m0;
+        m0 = hp_mem[0];
+        for (i = 0; i < len; i++) {
+            oac_val32 x, y;
+            x = in[i];
+            y = x - m0;
+            m0 = coef*x + VERY_SMALL + coef2*m0;
+            out[i] = y;
+        }
+        hp_mem[0] = m0;
+    }
 }
 #endif
 
 static void stereo_fade(const oac_res *in, oac_res *out, oac_val16 g1, oac_val16 g2,
-        int overlap48, int frame_size, int channels, const celt_coef *window, oac_int32 Fs)
-{
+                        int overlap48, int frame_size, int channels, const celt_coef *window, oac_int32 Fs) {
     int i;
     int overlap;
     int inc;
     inc = IMAX(1, 48000/Fs);
-    overlap=overlap48/inc;
-    g1 = Q15ONE-g1;
-    g2 = Q15ONE-g2;
-    for (i=0;i<overlap;i++)
-    {
-       oac_val32 diff;
-       oac_val16 g, w;
-       w = COEF2VAL16(window[i*inc]);
-       w = MULT16_16_Q15(w, w);
-       g = SHR32(MAC16_16(MULT16_16(w,g2),
-             Q15ONE-w, g1), 15);
-       diff = HALF32((oac_val32)in[i*channels] - (oac_val32)in[i*channels+1]);
-       diff = MULT16_RES_Q15(g, diff);
-       out[i*channels] = out[i*channels] - diff;
-       out[i*channels+1] = out[i*channels+1] + diff;
-    }
-    for (;i<frame_size;i++)
-    {
-       oac_val32 diff;
-       diff = HALF32((oac_val32)in[i*channels] - (oac_val32)in[i*channels+1]);
-       diff = MULT16_RES_Q15(g2, diff);
-       out[i*channels] = out[i*channels] - diff;
-       out[i*channels+1] = out[i*channels+1] + diff;
+    overlap = overlap48/inc;
+    g1 = Q15ONE - g1;
+    g2 = Q15ONE - g2;
+    for (i = 0; i < overlap; i++) {
+        oac_val32 diff;
+        oac_val16 g, w;
+        w = COEF2VAL16(window[i*inc]);
+        w = MULT16_16_Q15(w, w);
+        g = SHR32(MAC16_16(MULT16_16(w, g2),
+             Q15ONE - w, g1), 15);
+        diff = HALF32((oac_val32)in[i*channels] - (oac_val32)in[i*channels + 1]);
+        diff = MULT16_RES_Q15(g, diff);
+        out[i*channels] = out[i*channels] - diff;
+        out[i*channels + 1] = out[i*channels + 1] + diff;
+    }
+    for (; i < frame_size; i++) {
+        oac_val32 diff;
+        diff = HALF32((oac_val32)in[i*channels] - (oac_val32)in[i*channels + 1]);
+        diff = MULT16_RES_Q15(g2, diff);
+        out[i*channels] = out[i*channels] - diff;
+        out[i*channels + 1] = out[i*channels + 1] + diff;
     }
 }
 
 static void gain_fade(const oac_res *in, oac_res *out, oac_val16 g1, oac_val16 g2,
-        int overlap48, int frame_size, int channels, const celt_coef *window, oac_int32 Fs)
-{
+                      int overlap48, int frame_size, int channels, const celt_coef *window, oac_int32 Fs) {
     int i;
     int inc;
     int overlap;
     int c;
     inc = IMAX(1, 48000/Fs);
-    overlap=overlap48/inc;
-    if (channels==1)
-    {
-       for (i=0;i<overlap;i++)
-       {
-          oac_val16 g, w;
-          w = COEF2VAL16(window[i*inc]);
-          w = MULT16_16_Q15(w, w);
-          g = SHR32(MAC16_16(MULT16_16(w,g2),
-                Q15ONE-w, g1), 15);
-          out[i] = MULT16_RES_Q15(g, in[i]);
-       }
+    overlap = overlap48/inc;
+    if (channels == 1) {
+        for (i = 0; i < overlap; i++) {
+            oac_val16 g, w;
+            w = COEF2VAL16(window[i*inc]);
+            w = MULT16_16_Q15(w, w);
+            g = SHR32(MAC16_16(MULT16_16(w, g2),
+                Q15ONE - w, g1), 15);
+            out[i] = MULT16_RES_Q15(g, in[i]);
+        }
     } else {
-       for (i=0;i<overlap;i++)
-       {
-          oac_val16 g, w;
-          w = COEF2VAL16(window[i*inc]);
-          w = MULT16_16_Q15(w, w);
-          g = SHR32(MAC16_16(MULT16_16(w,g2),
-                Q15ONE-w, g1), 15);
-          out[i*2] = MULT16_RES_Q15(g, in[i*2]);
-          out[i*2+1] = MULT16_RES_Q15(g, in[i*2+1]);
-       }
-    }
-    c=0;do {
-       for (i=overlap;i<frame_size;i++)
-       {
-          out[i*channels+c] = MULT16_RES_Q15(g2, in[i*channels+c]);
-       }
-    }
-    while (++c<channels);
+        for (i = 0; i < overlap; i++) {
+            oac_val16 g, w;
+            w = COEF2VAL16(window[i*inc]);
+            w = MULT16_16_Q15(w, w);
+            g = SHR32(MAC16_16(MULT16_16(w, g2),
+                Q15ONE - w, g1), 15);
+            out[i*2] = MULT16_RES_Q15(g, in[i*2]);
+            out[i*2 + 1] = MULT16_RES_Q15(g, in[i*2 + 1]);
+        }
+    }
+    c = 0; do {
+        for (i = overlap; i < frame_size; i++) {
+            out[i*channels + c] = MULT16_RES_Q15(g2, in[i*channels + c]);
+        }
+    } while (++c < channels);
 }
 
-OacEncoder *oac_encoder_create(oac_int32 Fs, int channels, int application, int *error)
-{
-   int ret;
-   OacEncoder *st;
-   int size;
-   if((Fs!=48000&&Fs!=24000&&Fs!=16000&&Fs!=12000&&Fs!=8000
+OacEncoder *oac_encoder_create(oac_int32 Fs, int channels, int application, int *error) {
+    int ret;
+    OacEncoder *st;
+    int size;
+    if ((Fs != 48000 && Fs != 24000 && Fs != 16000 && Fs != 12000 && Fs != 8000
 #ifdef ENABLE_QEXT
-         &&Fs!=96000
-#endif
-         )||(channels!=1&&channels!=2)||
-       (application != OAC_APPLICATION_VOIP && application != OAC_APPLICATION_AUDIO
-       && application != OAC_APPLICATION_RESTRICTED_LOWDELAY
-       && application != OAC_APPLICATION_RESTRICTED_SILK
-       && application != OAC_APPLICATION_RESTRICTED_CELT))
-   {
-      if (error)
-         *error = OAC_BAD_ARG;
-      return NULL;
-   }
-   size = oac_encoder_init(NULL, Fs, channels, application);
-   if (size <= 0)
-   {
-      if (error)
-         *error = OAC_INTERNAL_ERROR;
-      return NULL;
-   }
-   st = (OacEncoder *)oac_alloc(size);
-   if (st == NULL)
-   {
-      if (error)
-         *error = OAC_ALLOC_FAIL;
-      return NULL;
-   }
-   ret = oac_encoder_init(st, Fs, channels, application);
-   if (error)
-      *error = ret;
-   if (ret != OAC_OK)
-   {
-      oac_free(st);
-      st = NULL;
-   }
-   return st;
+         && Fs != 96000
+#endif
+         ) || (channels != 1 && channels != 2)
+        || (application != OAC_APPLICATION_VOIP && application != OAC_APPLICATION_AUDIO
+            && application != OAC_APPLICATION_RESTRICTED_LOWDELAY
+            && application != OAC_APPLICATION_RESTRICTED_SILK
+            && application != OAC_APPLICATION_RESTRICTED_CELT)) {
+        if (error)
+            *error = OAC_BAD_ARG;
+        return NULL;
+    }
+    size = oac_encoder_init(NULL, Fs, channels, application);
+    if (size <= 0) {
+        if (error)
+            *error = OAC_INTERNAL_ERROR;
+        return NULL;
+    }
+    st = (OacEncoder *)oac_alloc(size);
+    if (st == NULL) {
+        if (error)
+            *error = OAC_ALLOC_FAIL;
+        return NULL;
+    }
+    ret = oac_encoder_init(st, Fs, channels, application);
+    if (error)
+        *error = ret;
+    if (ret != OAC_OK) {
+        oac_free(st);
+        st = NULL;
+    }
+    return st;
 }
 
 #ifdef ENABLE_DRED
 
-static const float dred_bits_table[16] = {73.2f, 68.1f, 62.5f, 57.0f, 51.5f, 45.7f, 39.9f, 32.4f, 26.4f, 20.4f, 16.3f, 13.f, 9.3f, 8.2f, 7.2f, 6.4f};
+static const float dred_bits_table[16] = {73.2f, 68.1f, 62.5f, 57.0f, 51.5f, 45.7f, 39.9f, 32.4f, 26.4f, 20.4f, 16.3f,
+                                          13.f, 9.3f, 8.2f, 7.2f, 6.4f};
 static int estimate_dred_bitrate(int q0, int dQ, int qmax, int duration, oac_int32 target_bits, int *target_chunks) {
-   int dred_chunks;
-   int i;
-   float bits;
-   /* Signaling DRED costs 3 bytes. */
-   bits = 8*(3+DRED_EXPERIMENTAL_BYTES);
-   /* Approximation for the size of the IS. */
-   bits += 50.f+dred_bits_table[q0];
-   dred_chunks = IMIN((duration+5)/4, DRED_NUM_REDUNDANCY_FRAMES/2);
-   if (target_chunks != NULL) *target_chunks = 0;
-   for (i=0;i<dred_chunks;i++) {
-      int q = compute_quantizer(q0, dQ, qmax, i);
-      bits += dred_bits_table[q];
-      if (target_chunks != NULL && bits < target_bits) *target_chunks = i+1;
-   }
-   return (int)floor(.5f+bits);
+    int dred_chunks;
+    int i;
+    float bits;
+    /* Signaling DRED costs 3 bytes. */
+    bits = 8*(3 + DRED_EXPERIMENTAL_BYTES);
+    /* Approximation for the size of the IS. */
+    bits += 50.f + dred_bits_table[q0];
+    dred_chunks = IMIN((duration + 5)/4, DRED_NUM_REDUNDANCY_FRAMES/2);
+    if (target_chunks != NULL) *target_chunks = 0;
+    for (i = 0; i < dred_chunks; i++) {
+        int q = compute_quantizer(q0, dQ, qmax, i);
+        bits += dred_bits_table[q];
+        if (target_chunks != NULL && bits < target_bits) *target_chunks = i + 1;
+    }
+    return (int)floor(.5f + bits);
 }
 
-static oac_int32 compute_dred_bitrate(OacEncoder *st, oac_int32 bitrate_bps, int frame_size)
-{
-   float dred_frac;
-   int bitrate_offset;
-   oac_int32 dred_bitrate;
-   oac_int32 target_dred_bitrate;
-   int target_chunks;
-   oac_int32 max_dred_bits;
-   int q0, dQ, qmax;
-   if (st->silk_mode.useInBandFEC) {
-      dred_frac = MIN16(.7f, 3.f*st->silk_mode.packetLossPercentage/100.f);
-      bitrate_offset = 20000;
-   } else {
-      if (st->silk_mode.packetLossPercentage > 5) {
-         dred_frac = MIN16(.8f, .55f + st->silk_mode.packetLossPercentage/100.f);
-      } else {
-         dred_frac = 12*st->silk_mode.packetLossPercentage/100.f;
-      }
-      bitrate_offset = 12000;
-   }
-   /* Account for the fact that longer packets require less redundancy. */
-   dred_frac = dred_frac/(dred_frac + (1-dred_frac)*(frame_size*50.f)/st->Fs);
-   /* Approximate fit based on a few experiments. Could probably be improved. */
-   q0 = IMIN(15, IMAX(4, 51 - 3*EC_ILOG(IMAX(1, bitrate_bps-bitrate_offset))));
-   dQ = bitrate_bps-bitrate_offset > 36000 ? 3 : 5;
-   qmax = 15;
-   target_dred_bitrate = IMAX(0, (int)(dred_frac*(bitrate_bps-bitrate_offset)));
-   if (st->dred_duration > 0) {
-      oac_int32 target_bits = bitrate_to_bits(target_dred_bitrate, st->Fs, frame_size);
-      max_dred_bits = estimate_dred_bitrate(q0, dQ, qmax, st->dred_duration, target_bits, &target_chunks);
-   } else {
-      max_dred_bits = 0;
-      target_chunks=0;
-   }
-   dred_bitrate = IMIN(target_dred_bitrate, bits_to_bitrate(max_dred_bits, st->Fs, frame_size));
-   /* If we can't afford enough bits, don't bother with DRED at all. */
-   if (target_chunks < 2)
-      dred_bitrate = 0;
-   st->dred_q0 = q0;
-   st->dred_dQ = dQ;
-   st->dred_qmax = qmax;
-   st->dred_target_chunks = target_chunks;
-   return dred_bitrate;
+static oac_int32 compute_dred_bitrate(OacEncoder *st, oac_int32 bitrate_bps, int frame_size) {
+    float dred_frac;
+    int bitrate_offset;
+    oac_int32 dred_bitrate;
+    oac_int32 target_dred_bitrate;
+    int target_chunks;
+    oac_int32 max_dred_bits;
+    int q0, dQ, qmax;
+    if (st->silk_mode.useInBandFEC) {
+        dred_frac = MIN16(.7f, 3.f*st->silk_mode.packetLossPercentage/100.f);
+        bitrate_offset = 20000;
+    } else {
+        if (st->silk_mode.packetLossPercentage > 5) {
+            dred_frac = MIN16(.8f, .55f + st->silk_mode.packetLossPercentage/100.f);
+        } else {
+            dred_frac = 12*st->silk_mode.packetLossPercentage/100.f;
+        }
+        bitrate_offset = 12000;
+    }
+    /* Account for the fact that longer packets require less redundancy. */
+    dred_frac = dred_frac/(dred_frac + (1 - dred_frac)*(frame_size*50.f)/st->Fs);
+    /* Approximate fit based on a few experiments. Could probably be improved. */
+    q0 = IMIN(15, IMAX(4, 51 - 3*EC_ILOG(IMAX(1, bitrate_bps - bitrate_offset))));
+    dQ = bitrate_bps - bitrate_offset > 36000 ? 3 : 5;
+    qmax = 15;
+    target_dred_bitrate = IMAX(0, (int)(dred_frac*(bitrate_bps - bitrate_offset)));
+    if (st->dred_duration > 0) {
+        oac_int32 target_bits = bitrate_to_bits(target_dred_bitrate, st->Fs, frame_size);
+        max_dred_bits = estimate_dred_bitrate(q0, dQ, qmax, st->dred_duration, target_bits, &target_chunks);
+    } else {
+        max_dred_bits = 0;
+        target_chunks = 0;
+    }
+    dred_bitrate = IMIN(target_dred_bitrate, bits_to_bitrate(max_dred_bits, st->Fs, frame_size));
+    /* If we can't afford enough bits, don't bother with DRED at all. */
+    if (target_chunks < 2)
+        dred_bitrate = 0;
+    st->dred_q0 = q0;
+    st->dred_dQ = dQ;
+    st->dred_qmax = qmax;
+    st->dred_target_chunks = target_chunks;
+    return dred_bitrate;
 }
 #endif
 
-static oac_int32 user_bitrate_to_bitrate(OacEncoder *st, int frame_size, int max_data_bytes)
-{
-  oac_int32 max_bitrate, user_bitrate;
-  if(!frame_size)frame_size=st->Fs/400;
-  max_bitrate = bits_to_bitrate(max_data_bytes*8, st->Fs, frame_size);
-  if (st->user_bitrate_bps==OAC_AUTO)
-     user_bitrate = 60*st->Fs/frame_size + st->Fs*st->channels;
-  else if (st->user_bitrate_bps==OAC_BITRATE_MAX)
-     user_bitrate = 1500000;
-  else
-     user_bitrate = st->user_bitrate_bps;
-  return IMIN(user_bitrate, max_bitrate);
+static oac_int32 user_bitrate_to_bitrate(OacEncoder *st, int frame_size, int max_data_bytes) {
+    oac_int32 max_bitrate, user_bitrate;
+    if (!frame_size) frame_size = st->Fs/400;
+    max_bitrate = bits_to_bitrate(max_data_bytes*8, st->Fs, frame_size);
+    if (st->user_bitrate_bps == OAC_AUTO)
+        user_bitrate = 60*st->Fs/frame_size + st->Fs*st->channels;
+    else if (st->user_bitrate_bps == OAC_BITRATE_MAX)
+        user_bitrate = 1500000;
+    else
+        user_bitrate = st->user_bitrate_bps;
+    return IMIN(user_bitrate, max_bitrate);
 }
 
 #ifndef DISABLE_FLOAT_API
-void downmix_float(const void *_x, oac_val32 *y, int subframe, int offset, int c1, int c2, int C)
-{
-   const float *x;
-   int j;
-
-   x = (const float *)_x;
-   for (j=0;j<subframe;j++)
-      y[j] = FLOAT2SIG(x[(j+offset)*C+c1]);
-   if (c2>-1)
-   {
-      for (j=0;j<subframe;j++)
-         y[j] += FLOAT2SIG(x[(j+offset)*C+c2]);
-   } else if (c2==-2)
-   {
-      int c;
-      for (c=1;c<C;c++)
-      {
-         for (j=0;j<subframe;j++)
-            y[j] += FLOAT2SIG(x[(j+offset)*C+c]);
-      }
-   }
-#ifndef FIXED_POINT
-   /* Cap signal to +6 dBFS to avoid problems in the analysis. */
-   for (j=0;j<subframe;j++)
-   {
-      if (y[j] < -65536.f) y[j] = -65536.f;
-      if (y[j] >  65536.f) y[j] =  65536.f;
-      if (celt_isnan(y[j])) y[j] = 0;
-   }
-#endif
+void downmix_float(const void *_x, oac_val32 *y, int subframe, int offset, int c1, int c2, int C) {
+    const float *x;
+    int j;
+
+    x = (const float *)_x;
+    for (j = 0; j < subframe; j++)
+        y[j] = FLOAT2SIG(x[(j + offset)*C + c1]);
+    if (c2 > -1) {
+        for (j = 0; j < subframe; j++)
+            y[j] += FLOAT2SIG(x[(j + offset)*C + c2]);
+    } else if (c2 == -2) {
+        int c;
+        for (c = 1; c < C; c++) {
+            for (j = 0; j < subframe; j++)
+                y[j] += FLOAT2SIG(x[(j + offset)*C + c]);
+        }
+    }
+# ifndef FIXED_POINT
+    /* Cap signal to +6 dBFS to avoid problems in the analysis. */
+    for (j = 0; j < subframe; j++) {
+        if (y[j] < -65536.f) y[j] = -65536.f;
+        if (y[j] >  65536.f) y[j] =  65536.f;
+        if (celt_isnan(y[j])) y[j] = 0;
+    }
+# endif
 }
 #endif
 
-void downmix_int(const void *_x, oac_val32 *y, int subframe, int offset, int c1, int c2, int C)
-{
-   const oac_int16 *x;
-   int j;
-
-   x = (const oac_int16 *)_x;
-   for (j=0;j<subframe;j++)
-      y[j] = INT16TOSIG(x[(j+offset)*C+c1]);
-   if (c2>-1)
-   {
-      for (j=0;j<subframe;j++)
-         y[j] += INT16TOSIG(x[(j+offset)*C+c2]);
-   } else if (c2==-2)
-   {
-      int c;
-      for (c=1;c<C;c++)
-      {
-         for (j=0;j<subframe;j++)
-            y[j] += INT16TOSIG(x[(j+offset)*C+c]);
-      }
-   }
+void downmix_int(const void *_x, oac_val32 *y, int subframe, int offset, int c1, int c2, int C) {
+    const oac_int16 *x;
+    int j;
+
+    x = (const oac_int16 *)_x;
+    for (j = 0; j < subframe; j++)
+        y[j] = INT16TOSIG(x[(j + offset)*C + c1]);
+    if (c2 > -1) {
+        for (j = 0; j < subframe; j++)
+            y[j] += INT16TOSIG(x[(j + offset)*C + c2]);
+    } else if (c2 == -2) {
+        int c;
+        for (c = 1; c < C; c++) {
+            for (j = 0; j < subframe; j++)
+                y[j] += INT16TOSIG(x[(j + offset)*C + c]);
+        }
+    }
 }
 
-void downmix_int24(const void *_x, oac_val32 *y, int subframe, int offset, int c1, int c2, int C)
-{
-   const oac_int32 *x;
-   int j;
-
-   x = (const oac_int32 *)_x;
-   for (j=0;j<subframe;j++)
-      y[j] = INT24TOSIG(x[(j+offset)*C+c1]);
-   if (c2>-1)
-   {
-      for (j=0;j<subframe;j++)
-         y[j] += INT24TOSIG(x[(j+offset)*C+c2]);
-   } else if (c2==-2)
-   {
-      int c;
-      for (c=1;c<C;c++)
-      {
-         for (j=0;j<subframe;j++)
-            y[j] += INT24TOSIG(x[(j+offset)*C+c]);
-      }
-   }
+void downmix_int24(const void *_x, oac_val32 *y, int subframe, int offset, int c1, int c2, int C) {
+    const oac_int32 *x;
+    int j;
+
+    x = (const oac_int32 *)_x;
+    for (j = 0; j < subframe; j++)
+        y[j] = INT24TOSIG(x[(j + offset)*C + c1]);
+    if (c2 > -1) {
+        for (j = 0; j < subframe; j++)
+            y[j] += INT24TOSIG(x[(j + offset)*C + c2]);
+    } else if (c2 == -2) {
+        int c;
+        for (c = 1; c < C; c++) {
+            for (j = 0; j < subframe; j++)
+                y[j] += INT24TOSIG(x[(j + offset)*C + c]);
+        }
+    }
 }
 
-oac_int32 frame_size_select(int application, oac_int32 frame_size, int variable_duration, oac_int32 Fs)
-{
-   int new_size;
-   if (frame_size<Fs/400)
-      return -1;
-   if (variable_duration == OAC_FRAMESIZE_ARG)
-      new_size = frame_size;
-   else if (variable_duration >= OAC_FRAMESIZE_2_5_MS && variable_duration <= OAC_FRAMESIZE_120_MS)
-   {
-      if (variable_duration <= OAC_FRAMESIZE_40_MS)
-         new_size = (Fs/400)<<(variable_duration-OAC_FRAMESIZE_2_5_MS);
-      else
-         new_size = (variable_duration-OAC_FRAMESIZE_2_5_MS-2)*Fs/50;
-   }
-   else
-      return -1;
-   if (new_size>frame_size)
-      return -1;
-   if (400*new_size!=Fs   && 200*new_size!=Fs   && 100*new_size!=Fs   &&
-        50*new_size!=Fs   &&  25*new_size!=Fs   &&  50*new_size!=3*Fs &&
-        50*new_size!=4*Fs &&  50*new_size!=5*Fs &&  50*new_size!=6*Fs)
-      return -1;
-   if (application == OAC_APPLICATION_RESTRICTED_SILK && new_size < Fs/100)
-      return -1;
-   return new_size;
+oac_int32 frame_size_select(int application, oac_int32 frame_size, int variable_duration, oac_int32 Fs) {
+    int new_size;
+    if (frame_size < Fs/400)
+        return -1;
+    if (variable_duration == OAC_FRAMESIZE_ARG)
+        new_size = frame_size;
+    else if (variable_duration >= OAC_FRAMESIZE_2_5_MS && variable_duration <= OAC_FRAMESIZE_120_MS) {
+        if (variable_duration <= OAC_FRAMESIZE_40_MS)
+            new_size = (Fs/400)<<(variable_duration - OAC_FRAMESIZE_2_5_MS);
+        else
+            new_size = (variable_duration - OAC_FRAMESIZE_2_5_MS - 2)*Fs/50;
+    } else
+        return -1;
+    if (new_size > frame_size)
+        return -1;
+    if (400*new_size != Fs   && 200*new_size != Fs   && 100*new_size != Fs
+        && 50*new_size != Fs   &&  25*new_size != Fs   &&  50*new_size != 3*Fs
+        && 50*new_size != 4*Fs &&  50*new_size != 5*Fs &&  50*new_size != 6*Fs)
+        return -1;
+    if (application == OAC_APPLICATION_RESTRICTED_SILK && new_size < Fs/100)
+        return -1;
+    return new_size;
 }
 
-oac_val16 compute_stereo_width(const oac_res *pcm, int frame_size, oac_int32 Fs, StereoWidthState *mem)
-{
-   oac_val32 xx, xy, yy;
-   oac_val16 sqrt_xx, sqrt_yy;
-   oac_val16 qrrt_xx, qrrt_yy;
-   int frame_rate;
-   int i;
-   oac_val16 short_alpha;
+oac_val16 compute_stereo_width(const oac_res *pcm, int frame_size, oac_int32 Fs, StereoWidthState *mem) {
+    oac_val32 xx, xy, yy;
+    oac_val16 sqrt_xx, sqrt_yy;
+    oac_val16 qrrt_xx, qrrt_yy;
+    int frame_rate;
+    int i;
+    oac_val16 short_alpha;
 #ifdef FIXED_POINT
-   int shift = celt_ilog2(frame_size)-2;
-#endif
-   frame_rate = Fs/frame_size;
-   short_alpha = MULT16_16(25, Q15ONE)/IMAX(50,frame_rate);
-   xx=xy=yy=0;
-   /* Unroll by 4. The frame size is always a multiple of 4 *except* for
-      2.5 ms frames at 12 kHz. Since this setting is very rare (and very
-      stupid), we just discard the last two samples. */
-   for (i=0;i<frame_size-3;i+=4)
-   {
-      oac_val32 pxx=0;
-      oac_val32 pxy=0;
-      oac_val32 pyy=0;
-      oac_val16 x, y;
-      x = RES2VAL16(pcm[2*i]);
-      y = RES2VAL16(pcm[2*i+1]);
-      pxx = SHR32(MULT16_16(x,x),2);
-      pxy = SHR32(MULT16_16(x,y),2);
-      pyy = SHR32(MULT16_16(y,y),2);
-      x = RES2VAL16(pcm[2*i+2]);
-      y = RES2VAL16(pcm[2*i+3]);
-      pxx += SHR32(MULT16_16(x,x),2);
-      pxy += SHR32(MULT16_16(x,y),2);
-      pyy += SHR32(MULT16_16(y,y),2);
-      x = RES2VAL16(pcm[2*i+4]);
-      y = RES2VAL16(pcm[2*i+5]);
-      pxx += SHR32(MULT16_16(x,x),2);
-      pxy += SHR32(MULT16_16(x,y),2);
-      pyy += SHR32(MULT16_16(y,y),2);
-      x = RES2VAL16(pcm[2*i+6]);
-      y = RES2VAL16(pcm[2*i+7]);
-      pxx += SHR32(MULT16_16(x,x),2);
-      pxy += SHR32(MULT16_16(x,y),2);
-      pyy += SHR32(MULT16_16(y,y),2);
-
-      xx += SHR32(pxx, shift);
-      xy += SHR32(pxy, shift);
-      yy += SHR32(pyy, shift);
-   }
+    int shift = celt_ilog2(frame_size) - 2;
+#endif
+    frame_rate = Fs/frame_size;
+    short_alpha = MULT16_16(25, Q15ONE)/IMAX(50, frame_rate);
+    xx = xy = yy = 0;
+    /* Unroll by 4. The frame size is always a multiple of 4 *except* for
+       2.5 ms frames at 12 kHz. Since this setting is very rare (and very
+       stupid), we just discard the last two samples. */
+    for (i = 0; i < frame_size - 3; i += 4) {
+        oac_val32 pxx = 0;
+        oac_val32 pxy = 0;
+        oac_val32 pyy = 0;
+        oac_val16 x, y;
+        x = RES2VAL16(pcm[2*i]);
+        y = RES2VAL16(pcm[2*i + 1]);
+        pxx = SHR32(MULT16_16(x, x), 2);
+        pxy = SHR32(MULT16_16(x, y), 2);
+        pyy = SHR32(MULT16_16(y, y), 2);
+        x = RES2VAL16(pcm[2*i + 2]);
+        y = RES2VAL16(pcm[2*i + 3]);
+        pxx += SHR32(MULT16_16(x, x), 2);
+        pxy += SHR32(MULT16_16(x, y), 2);
+        pyy += SHR32(MULT16_16(y, y), 2);
+        x = RES2VAL16(pcm[2*i + 4]);
+        y = RES2VAL16(pcm[2*i + 5]);
+        pxx += SHR32(MULT16_16(x, x), 2);
+        pxy += SHR32(MULT16_16(x, y), 2);
+        pyy += SHR32(MULT16_16(y, y), 2);
+        x = RES2VAL16(pcm[2*i + 6]);
+        y = RES2VAL16(pcm[2*i + 7]);
+        pxx += SHR32(MULT16_16(x, x), 2);
+        pxy += SHR32(MULT16_16(x, y), 2);
+        pyy += SHR32(MULT16_16(y, y), 2);
+
+        xx += SHR32(pxx, shift);
+        xy += SHR32(pxy, shift);
+        yy += SHR32(pyy, shift);
+    }
 #ifndef FIXED_POINT
-   if (!(xx < 1e9f) || celt_isnan(xx) || !(yy < 1e9f) || celt_isnan(yy))
-   {
-      xy = xx = yy = 0;
-   }
+    if (!(xx < 1e9f) || celt_isnan(xx) || !(yy < 1e9f) || celt_isnan(yy)) {
+        xy = xx = yy = 0;
+    }
 #endif
-   mem->XX += MULT16_32_Q15(short_alpha, xx-mem->XX);
-   /*mem->XY += MULT16_32_Q15(short_alpha, xy-mem->XY);*/
-   /* Rewritten to avoid overflows on abrupt sign change. */
-   mem->XY = MULT16_32_Q15(Q15ONE - short_alpha, mem->XY) + MULT16_32_Q15(short_alpha, xy);
-   mem->YY += MULT16_32_Q15(short_alpha, yy-mem->YY);
-   mem->XX = MAX32(0, mem->XX);
-   mem->XY = MAX32(0, mem->XY);
-   mem->YY = MAX32(0, mem->YY);
-   if (MAX32(mem->XX, mem->YY)>QCONST16(8e-4f, 18))
-   {
-      oac_val16 corr;
-      oac_val16 ldiff;
-      oac_val16 width;
-      sqrt_xx = celt_sqrt(mem->XX);
-      sqrt_yy = celt_sqrt(mem->YY);
-      qrrt_xx = celt_sqrt(sqrt_xx);
-      qrrt_yy = celt_sqrt(sqrt_yy);
-      /* Inter-channel correlation */
-      mem->XY = MIN32(mem->XY, sqrt_xx*sqrt_yy);
-      corr = SHR32(frac_div32(mem->XY,EPSILON+MULT16_16(sqrt_xx,sqrt_yy)),16);
-      /* Approximate loudness difference */
-      ldiff = MULT16_16(Q15ONE, ABS16(qrrt_xx-qrrt_yy))/(EPSILON+qrrt_xx+qrrt_yy);
-      width = MULT16_16_Q15(MIN16(Q15ONE, celt_sqrt(QCONST32(1.f,30)-MULT16_16(corr,corr))), ldiff);
-      /* Smoothing over one second */
-      mem->smoothed_width += (width-mem->smoothed_width)/frame_rate;
-      /* Peak follower */
-      mem->max_follower = MAX16(mem->max_follower-QCONST16(.02f,15)/frame_rate, mem->smoothed_width);
-   }
-   /*printf("%f %f %f %f %f ", corr/(float)Q15ONE, ldiff/(float)Q15ONE, width/(float)Q15ONE, mem->smoothed_width/(float)Q15ONE, mem->max_follower/(float)Q15ONE);*/
-   return EXTRACT16(MIN32(Q15ONE, MULT16_16(20, mem->max_follower)));
+    mem->XX += MULT16_32_Q15(short_alpha, xx - mem->XX);
+    /*mem->XY += MULT16_32_Q15(short_alpha, xy-mem->XY);*/
+    /* Rewritten to avoid overflows on abrupt sign change. */
+    mem->XY = MULT16_32_Q15(Q15ONE - short_alpha, mem->XY) + MULT16_32_Q15(short_alpha, xy);
+    mem->YY += MULT16_32_Q15(short_alpha, yy - mem->YY);
+    mem->XX = MAX32(0, mem->XX);
+    mem->XY = MAX32(0, mem->XY);
+    mem->YY = MAX32(0, mem->YY);
+    if (MAX32(mem->XX, mem->YY) > QCONST16(8e-4f, 18)) {
+        oac_val16 corr;
+        oac_val16 ldiff;
+        oac_val16 width;
+        sqrt_xx = celt_sqrt(mem->XX);
+        sqrt_yy = celt_sqrt(mem->YY);
+        qrrt_xx = celt_sqrt(sqrt_xx);
+        qrrt_yy = celt_sqrt(sqrt_yy);
+        /* Inter-channel correlation */
+        mem->XY = MIN32(mem->XY, sqrt_xx*sqrt_yy);
+        corr = SHR32(frac_div32(mem->XY, EPSILON + MULT16_16(sqrt_xx, sqrt_yy)), 16);
+        /* Approximate loudness difference */
+        ldiff = MULT16_16(Q15ONE, ABS16(qrrt_xx - qrrt_yy))/(EPSILON + qrrt_xx + qrrt_yy);
+        width = MULT16_16_Q15(MIN16(Q15ONE, celt_sqrt(QCONST32(1.f, 30) - MULT16_16(corr, corr))), ldiff);
+        /* Smoothing over one second */
+        mem->smoothed_width += (width - mem->smoothed_width)/frame_rate;
+        /* Peak follower */
+        mem->max_follower = MAX16(mem->max_follower - QCONST16(.02f, 15)/frame_rate, mem->smoothed_width);
+    }
+    /*printf("%f %f %f %f %f ", corr/(float)Q15ONE, ldiff/(float)Q15ONE, width/(float)Q15ONE, mem->smoothed_width/(float)Q15ONE, mem->max_follower/(float)Q15ONE);*/
+    return EXTRACT16(MIN32(Q15ONE, MULT16_16(20, mem->max_follower)));
 }
 
-static int decide_fec(int useInBandFEC, int PacketLoss_perc, int last_fec, int mode, int *bandwidth, oac_int32 rate)
-{
-   int orig_bandwidth;
-   if (!useInBandFEC || PacketLoss_perc == 0 || mode == MODE_CELT_ONLY)
-      return 0;
-   orig_bandwidth = *bandwidth;
-   for (;;)
-   {
-      oac_int32 hysteresis;
-      oac_int32 LBRR_rate_thres_bps;
-      /* Compute threshold for using FEC at the current bandwidth setting */
-      LBRR_rate_thres_bps = fec_thresholds[2*(*bandwidth - OAC_BANDWIDTH_NARROWBAND)];
-      hysteresis = fec_thresholds[2*(*bandwidth - OAC_BANDWIDTH_NARROWBAND) + 1];
-      if (last_fec == 1) LBRR_rate_thres_bps -= hysteresis;
-      if (last_fec == 0) LBRR_rate_thres_bps += hysteresis;
-      LBRR_rate_thres_bps = silk_SMULWB( silk_MUL( LBRR_rate_thres_bps,
-            125 - silk_min( PacketLoss_perc, 25 ) ), SILK_FIX_CONST( 0.01, 16 ) );
-      /* If loss <= 5%, we look at whether we have enough rate to enable FEC.
-         If loss > 5%, we decrease the bandwidth until we can enable FEC. */
-      if (rate > LBRR_rate_thres_bps)
-         return 1;
-      else if (PacketLoss_perc <= 5)
-         return 0;
-      else if (*bandwidth > OAC_BANDWIDTH_NARROWBAND)
-         (*bandwidth)--;
-      else
-         break;
-   }
-   /* Couldn't find any bandwidth to enable FEC, keep original bandwidth. */
-   *bandwidth = orig_bandwidth;
-   return 0;
+static int decide_fec(int useInBandFEC, int PacketLoss_perc, int last_fec, int mode, int *bandwidth, oac_int32 rate) {
+    int orig_bandwidth;
+    if (!useInBandFEC || PacketLoss_perc == 0 || mode == MODE_CELT_ONLY)
+        return 0;
+    orig_bandwidth = *bandwidth;
+    for (;;) {
+        oac_int32 hysteresis;
+        oac_int32 LBRR_rate_thres_bps;
+        /* Compute threshold for using FEC at the current bandwidth setting */
+        LBRR_rate_thres_bps = fec_thresholds[2*(*bandwidth - OAC_BANDWIDTH_NARROWBAND)];
+        hysteresis = fec_thresholds[2*(*bandwidth - OAC_BANDWIDTH_NARROWBAND) + 1];
+        if (last_fec == 1) LBRR_rate_thres_bps -= hysteresis;
+        if (last_fec == 0) LBRR_rate_thres_bps += hysteresis;
+        LBRR_rate_thres_bps = silk_SMULWB( silk_MUL( LBRR_rate_thres_bps,
+            125 - silk_min( PacketLoss_perc, 25 )), SILK_FIX_CONST( 0.01, 16 ));
+        /* If loss <= 5%, we look at whether we have enough rate to enable FEC.
+           If loss > 5%, we decrease the bandwidth until we can enable FEC. */
+        if (rate > LBRR_rate_thres_bps)
+            return 1;
+        else if (PacketLoss_perc <= 5)
+            return 0;
+        else if (*bandwidth > OAC_BANDWIDTH_NARROWBAND)
+            (*bandwidth)--;
+        else
+            break;
+    }
+    /* Couldn't find any bandwidth to enable FEC, keep original bandwidth. */
+    *bandwidth = orig_bandwidth;
+    return 0;
 }
 
 static int compute_silk_rate_for_hybrid(int rate, int bandwidth, int frame20ms, int vbr, int fec, int channels) {
-   int entry;
-   int i;
-   int N;
-   int silk_rate;
-   static const int rate_table[][5] = {
-  /*  |total| |-------- SILK------------|
-              |-- No FEC -| |--- FEC ---|
-               10ms   20ms   10ms   20ms */
-      {    0,     0,     0,     0,     0},
-      {12000, 10000, 10000, 11000, 11000},
-      {16000, 13500, 13500, 15000, 15000},
-      {20000, 16000, 16000, 18000, 18000},
-      {24000, 18000, 18000, 21000, 21000},
-      {32000, 22000, 22000, 28000, 28000},
-      {64000, 38000, 38000, 50000, 50000}
-   };
-   /* Do the allocation per-channel. */
-   rate /= channels;
-   entry = 1 + frame20ms + 2*fec;
-   N = sizeof(rate_table)/sizeof(rate_table[0]);
-   for (i=1;i<N;i++)
-   {
-      if (rate_table[i][0] > rate) break;
-   }
-   if (i == N)
-   {
-      silk_rate = rate_table[i-1][entry];
-      /* For now, just give 50% of the extra bits to SILK. */
-      silk_rate += (rate-rate_table[i-1][0])/2;
-   } else {
-      oac_int32 lo, hi, x0, x1;
-      lo = rate_table[i-1][entry];
-      hi = rate_table[i][entry];
-      x0 = rate_table[i-1][0];
-      x1 = rate_table[i][0];
-      silk_rate = (lo*(x1-rate) + hi*(rate-x0))/(x1-x0);
-   }
-   if (!vbr)
-   {
-      /* Tiny boost to SILK for CBR. We should probably tune this better. */
-      silk_rate += 100;
-   }
-   if (bandwidth==OAC_BANDWIDTH_SUPERWIDEBAND)
-      silk_rate += 300;
-   silk_rate *= channels;
-   /* Small adjustment for stereo (calibrated for 32 kb/s, haven't tried other bitrates). */
-   if (channels == 2 && rate >= 12000)
-      silk_rate -= 1000;
-   return silk_rate;
+    int entry;
+    int i;
+    int N;
+    int silk_rate;
+    static const int rate_table[][5] = {
+        /*  |total| |-------- SILK------------|
+         |-- No FEC -| |--- FEC ---|
+                     10ms   20ms   10ms   20ms */
+        {    0,     0,     0,     0,     0},
+        {12000, 10000, 10000, 11000, 11000},
+        {16000, 13500, 13500, 15000, 15000},
+        {20000, 16000, 16000, 18000, 18000},
+        {24000, 18000, 18000, 21000, 21000},
+        {32000, 22000, 22000, 28000, 28000},
+        {64000, 38000, 38000, 50000, 50000}
+    };
+    /* Do the allocation per-channel. */
+    rate /= channels;
+    entry = 1 + frame20ms + 2*fec;
+    N = sizeof(rate_table)/sizeof(rate_table[0]);
+    for (i = 1; i < N; i++) {
+        if (rate_table[i][0] > rate) break;
+    }
+    if (i == N) {
+        silk_rate = rate_table[i - 1][entry];
+        /* For now, just give 50% of the extra bits to SILK. */
+        silk_rate += (rate - rate_table[i - 1][0])/2;
+    } else {
+        oac_int32 lo, hi, x0, x1;
+        lo = rate_table[i - 1][entry];
+        hi = rate_table[i][entry];
+        x0 = rate_table[i - 1][0];
+        x1 = rate_table[i][0];
+        silk_rate = (lo*(x1 - rate) + hi*(rate - x0))/(x1 - x0);
+    }
+    if (!vbr) {
+        /* Tiny boost to SILK for CBR. We should probably tune this better. */
+        silk_rate += 100;
+    }
+    if (bandwidth == OAC_BANDWIDTH_SUPERWIDEBAND)
+        silk_rate += 300;
+    silk_rate *= channels;
+    /* Small adjustment for stereo (calibrated for 32 kb/s, haven't tried other bitrates). */
+    if (channels == 2 && rate >= 12000)
+        silk_rate -= 1000;
+    return silk_rate;
 }
 
 /* Returns the equivalent bitrate corresponding to 20 ms frames,
    complexity 10 VBR operation. */
 static oac_int32 compute_equiv_rate(oac_int32 bitrate, int channels,
-      int frame_rate, int vbr, int mode, int complexity, int loss)
-{
-   oac_int32 equiv;
-   equiv = bitrate;
-   /* Take into account overhead from smaller frames. */
-   if (frame_rate > 50)
-      equiv -= (40*channels+20)*(frame_rate - 50);
-   /* CBR is about a 8% penalty for both SILK and CELT. */
-   if (!vbr)
-      equiv -= equiv/12;
-   /* Complexity makes about 10% difference (from 0 to 10) in general. */
-   equiv = equiv * (90+complexity)/100;
-   if (mode == MODE_SILK_ONLY || mode == MODE_HYBRID)
-   {
-      /* SILK complexity 0-1 uses the non-delayed-decision NSQ, which
-         costs about 20%. */
-      if (complexity<2)
-         equiv = equiv*4/5;
-      equiv -= equiv*loss/(6*loss + 10);
-   } else if (mode == MODE_CELT_ONLY) {
-      /* CELT complexity 0-4 doesn't have the pitch filter, which costs
-         about 10%. */
-      if (complexity<5)
-         equiv = equiv*9/10;
-   } else {
-      /* Mode not known yet */
-      /* Half the SILK loss*/
-      equiv -= equiv*loss/(12*loss + 20);
-   }
-   return equiv;
+                                    int frame_rate, int vbr, int mode, int complexity, int loss) {
+    oac_int32 equiv;
+    equiv = bitrate;
+    /* Take into account overhead from smaller frames. */
+    if (frame_rate > 50)
+        equiv -= (40*channels + 20)*(frame_rate - 50);
+    /* CBR is about a 8% penalty for both SILK and CELT. */
+    if (!vbr)
+        equiv -= equiv/12;
+    /* Complexity makes about 10% difference (from 0 to 10) in general. */
+    equiv = equiv*(90 + complexity)/100;
+    if (mode == MODE_SILK_ONLY || mode == MODE_HYBRID) {
+        /* SILK complexity 0-1 uses the non-delayed-decision NSQ, which
+           costs about 20%. */
+        if (complexity < 2)
+            equiv = equiv*4/5;
+        equiv -= equiv*loss/(6*loss + 10);
+    } else if (mode == MODE_CELT_ONLY) {
+        /* CELT complexity 0-4 doesn't have the pitch filter, which costs
+           about 10%. */
+        if (complexity < 5)
+            equiv = equiv*9/10;
+    } else {
+        /* Mode not known yet */
+        /* Half the SILK loss*/
+        equiv -= equiv*loss/(12*loss + 20);
+    }
+    return equiv;
 }
 
-int is_digital_silence(const oac_res* pcm, int frame_size, int channels, int lsb_depth)
-{
-   int silence = 0;
-   oac_val32 sample_max = 0;
+int is_digital_silence(const oac_res* pcm, int frame_size, int channels, int lsb_depth) {
+    int silence = 0;
+    oac_val32 sample_max = 0;
 #ifdef MLP_TRAINING
-   return 0;
+    return 0;
 #endif
-   sample_max = celt_maxabs_res(pcm, frame_size*channels);
+    sample_max = celt_maxabs_res(pcm, frame_size*channels);
 
 #ifdef FIXED_POINT
-   silence = (sample_max == 0);
-   (void)lsb_depth;
+    silence = (sample_max == 0);
+    (void)lsb_depth;
 #else
-   silence = (sample_max <= (oac_val16) 1 / (1 << lsb_depth));
+    silence = (sample_max <= (oac_val16) 1/(1<<lsb_depth));
 #endif
 
-   return silence;
+    return silence;
 }
 
 #ifdef FIXED_POINT
-static oac_val32 compute_frame_energy(const oac_res *pcm, int frame_size, int channels, int arch)
-{
-   int i;
-   oac_val32 sample_max;
-   int max_shift;
-   int shift;
-   oac_val32 energy = 0;
-   int len = frame_size*channels;
-   (void)arch;
-   /* Max amplitude in the signal */
-   sample_max = RES2INT16(celt_maxabs_res(pcm, len));
-
-   /* Compute the right shift required in the MAC to avoid an overflow */
-   max_shift = celt_ilog2(len);
-   shift = IMAX(0, (celt_ilog2(1+sample_max) << 1) + max_shift - 28);
-
-   /* Compute the energy */
-   for (i=0; i<len; i++)
-      energy += SHR32(MULT16_16(RES2INT16(pcm[i]), RES2INT16(pcm[i])), shift);
-
-   /* Normalize energy by the frame size and left-shift back to the original position */
-   energy /= len;
-   energy = SHL32(energy, shift);
-
-   return energy;
+static oac_val32 compute_frame_energy(const oac_res *pcm, int frame_size, int channels, int arch) {
+    int i;
+    oac_val32 sample_max;
+    int max_shift;
+    int shift;
+    oac_val32 energy = 0;
+    int len = frame_size*channels;
+    (void)arch;
+    /* Max amplitude in the signal */
+    sample_max = RES2INT16(celt_maxabs_res(pcm, len));
+
+    /* Compute the right shift required in the MAC to avoid an overflow */
+    max_shift = celt_ilog2(len);
+    shift = IMAX(0, (celt_ilog2(1 + sample_max)<<1) + max_shift - 28);
+
+    /* Compute the energy */
+    for (i = 0; i < len; i++)
+        energy += SHR32(MULT16_16(RES2INT16(pcm[i]), RES2INT16(pcm[i])), shift);
+
+    /* Normalize energy by the frame size and left-shift back to the original position */
+    energy /= len;
+    energy = SHL32(energy, shift);
+
+    return energy;
 }
 #else
-static oac_val32 compute_frame_energy(const oac_val16 *pcm, int frame_size, int channels, int arch)
-{
-   int len = frame_size*channels;
-   return celt_inner_prod(pcm, pcm, len, arch)/len;
+static oac_val32 compute_frame_energy(const oac_val16 *pcm, int frame_size, int channels, int arch) {
+    int len = frame_size*channels;
+    return celt_inner_prod(pcm, pcm, len, arch)/len;
 }
 #endif
 
@@ -1100,80 +1037,74 @@ static oac_val32 compute_frame_energy(const oac_val16 *pcm, int frame_size, int
 static int decide_dtx_mode(oac_int activity,            /* indicates if this frame contains speech/music */
                            int *nb_no_activity_ms_Q1,    /* number of consecutive milliseconds with no activity, in Q1 */
                            int frame_size_ms_Q1          /* number of milliseconds in this update, in Q1 */
-                           )
-
-{
-   if (!activity)
-   {
-      /* The number of consecutive DTX frames should be within the allowed bounds.
-         Note that the allowed bound is defined in the SILK headers and assumes 20 ms
-         frames. As this function can be called with any frame length, a conversion to
-         milliseconds is done before the comparisons. */
-      (*nb_no_activity_ms_Q1) += frame_size_ms_Q1;
-      if (*nb_no_activity_ms_Q1 > NB_SPEECH_FRAMES_BEFORE_DTX*20*2)
-      {
-         if (*nb_no_activity_ms_Q1 <= (NB_SPEECH_FRAMES_BEFORE_DTX + MAX_CONSECUTIVE_DTX)*20*2)
-            /* Valid frame for DTX! */
-            return 1;
-         else
-            (*nb_no_activity_ms_Q1) = NB_SPEECH_FRAMES_BEFORE_DTX*20*2;
-      }
-   } else
-      (*nb_no_activity_ms_Q1) = 0;
+                           ) {
+    if (!activity) {
+        /* The number of consecutive DTX frames should be within the allowed bounds.
+           Note that the allowed bound is defined in the SILK headers and assumes 20 ms
+           frames. As this function can be called with any frame length, a conversion to
+           milliseconds is done before the comparisons. */
+        (*nb_no_activity_ms_Q1) += frame_size_ms_Q1;
+        if (*nb_no_activity_ms_Q1 > NB_SPEECH_FRAMES_BEFORE_DTX*20*2) {
+            if (*nb_no_activity_ms_Q1 <= (NB_SPEECH_FRAMES_BEFORE_DTX + MAX_CONSECUTIVE_DTX)*20*2)
+                /* Valid frame for DTX! */
+                return 1;
+            else
+                (*nb_no_activity_ms_Q1) = NB_SPEECH_FRAMES_BEFORE_DTX*20*2;
+        }
+    } else
+        (*nb_no_activity_ms_Q1) = 0;
 
-   return 0;
+    return 0;
 }
 
-static int compute_redundancy_bytes(oac_int32 max_data_bytes, oac_int32 bitrate_bps, int frame_rate, int channels)
-{
-   int redundancy_bytes_cap;
-   int redundancy_bytes;
-   oac_int32 redundancy_rate;
-   int base_bits;
-   oac_int32 available_bits;
-   base_bits = (40*channels+20);
-
-   /* Equivalent rate for 5 ms frames. */
-   redundancy_rate = bitrate_bps + base_bits*(200 - frame_rate);
-   /* For VBR, further increase the bitrate if we can afford it. It's pretty short
-      and we'll avoid artefacts. */
-   redundancy_rate = 3*redundancy_rate/2;
-   redundancy_bytes = redundancy_rate/1600;
-
-   /* Compute the max rate we can use given CBR or VBR with cap. */
-   available_bits = max_data_bytes*8 - 2*base_bits;
-   redundancy_bytes_cap = (available_bits*240/(240+48000/frame_rate) + base_bits)/8;
-   redundancy_bytes = IMIN(redundancy_bytes, redundancy_bytes_cap);
-   /* It we can't get enough bits for redundancy to be worth it, rely on the decoder PLC. */
-   if (redundancy_bytes > 4 + 8*channels)
-      redundancy_bytes = IMIN(257, redundancy_bytes);
-   else
-      redundancy_bytes = 0;
-   return redundancy_bytes;
+static int compute_redundancy_bytes(oac_int32 max_data_bytes, oac_int32 bitrate_bps, int frame_rate, int channels) {
+    int redundancy_bytes_cap;
+    int redundancy_bytes;
+    oac_int32 redundancy_rate;
+    int base_bits;
+    oac_int32 available_bits;
+    base_bits = (40*channels + 20);
+
+    /* Equivalent rate for 5 ms frames. */
+    redundancy_rate = bitrate_bps + base_bits*(200 - frame_rate);
+    /* For VBR, further increase the bitrate if we can afford it. It's pretty short
+       and we'll avoid artefacts. */
+    redundancy_rate = 3*redundancy_rate/2;
+    redundancy_bytes = redundancy_rate/1600;
+
+    /* Compute the max rate we can use given CBR or VBR with cap. */
+    available_bits = max_data_bytes*8 - 2*base_bits;
+    redundancy_bytes_cap = (available_bits*240/(240 + 48000/frame_rate) + base_bits)/8;
+    redundancy_bytes = IMIN(redundancy_bytes, redundancy_bytes_cap);
+    /* It we can't get enough bits for redundancy to be worth it, rely on the decoder PLC. */
+    if (redundancy_bytes > 4 + 8*channels)
+        redundancy_bytes = IMIN(257, redundancy_bytes);
+    else
+        redundancy_bytes = 0;
+    return redundancy_bytes;
 }
 
 static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int frame_size,
-                unsigned char *data, oac_int32 max_data_bytes,
-                int float_api, int first_frame,
+    unsigned char *data, oac_int32 max_data_bytes,
+    int float_api, int first_frame,
 #ifdef ENABLE_DRED
-                oac_int32 dred_bitrate_bps,
+    oac_int32 dred_bitrate_bps,
 #endif
 #ifndef DISABLE_FLOAT_API
-                AnalysisInfo *analysis_info,
+    AnalysisInfo *analysis_info,
 #endif
-                int is_silence, int redundancy, int celt_to_silk, int prefill,
-                oac_int32 equiv_rate, int to_celt);
+    int is_silence, int redundancy, int celt_to_silk, int prefill,
+    oac_int32 equiv_rate, int to_celt);
 
 oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
-                unsigned char *data, oac_int32 out_data_bytes, int lsb_depth,
-                const void *analysis_pcm, oac_int32 analysis_size, int c1, int c2,
-                int analysis_channels, downmix_func downmix, int float_api)
-{
-    void *silk_enc=NULL;
-    CELTEncoder *celt_enc=NULL;
+                            unsigned char *data, oac_int32 out_data_bytes, int lsb_depth,
+                            const void *analysis_pcm, oac_int32 analysis_size, int c1, int c2,
+                            int analysis_channels, downmix_func downmix, int float_api) {
+    void *silk_enc = NULL;
+    CELTEncoder *celt_enc = NULL;
     int i;
-    int ret=0;
-    int prefill=0;
+    int ret = 0;
+    int prefill = 0;
     int redundancy = 0;
     int celt_to_silk = 0;
     int to_celt = 0;
@@ -1183,14 +1114,14 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
     oac_int32 max_rate; /* Max bitrate we're allowed to use */
     int curr_bandwidth;
     oac_int32 max_data_bytes; /* Max number of bytes we're allowed to use */
-    oac_int32 cbr_bytes=-1;
+    oac_int32 cbr_bytes = -1;
     oac_val16 stereo_width;
-    const CELTMode *celt_mode=NULL;
+    const CELTMode *celt_mode = NULL;
     int packet_size_cap = 1276;
 #ifndef DISABLE_FLOAT_API
     AnalysisInfo analysis_info;
-    int analysis_read_pos_bak=-1;
-    int analysis_read_subframe_bak=-1;
+    int analysis_read_pos_bak = -1;
+    int analysis_read_subframe_bak = -1;
 #endif
     int is_silence = 0;
 #ifdef ENABLE_DRED
@@ -1202,23 +1133,21 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
     max_data_bytes = IMIN(packet_size_cap*6, out_data_bytes);
 
     st->rangeFinal = 0;
-    if (frame_size <= 0 || max_data_bytes <= 0)
-    {
-       RESTORE_STACK;
-       return OAC_BAD_ARG;
+    if (frame_size <= 0 || max_data_bytes <= 0) {
+        RESTORE_STACK;
+        return OAC_BAD_ARG;
     }
 
     /* Cannot encode 100 ms in 1 byte */
-    if (max_data_bytes==1 && st->Fs==(frame_size*10))
-    {
-      RESTORE_STACK;
-      return OAC_BUFFER_TOO_SMALL;
+    if (max_data_bytes == 1 && st->Fs == (frame_size*10)) {
+        RESTORE_STACK;
+        return OAC_BUFFER_TOO_SMALL;
     }
 
     if (st->application != OAC_APPLICATION_RESTRICTED_CELT)
-        silk_enc = (char*)st+st->silk_enc_offset;
+        silk_enc = (char*)st + st->silk_enc_offset;
     if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
-        celt_enc = (CELTEncoder*)((char*)st+st->celt_enc_offset);
+        celt_enc = (CELTEncoder*)((char*)st + st->celt_enc_offset);
 
     lsb_depth = IMIN(lsb_depth, st->lsb_depth);
 
@@ -1227,20 +1156,22 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
     is_silence = is_digital_silence(pcm, frame_size, st->channels, lsb_depth);
 #ifndef DISABLE_FLOAT_API
     analysis_info.valid = 0;
-#ifdef FIXED_POINT
-    if (st->silk_mode.complexity >= 10 && st->Fs>=16000 && st->Fs<=48000 && st->application != OAC_APPLICATION_RESTRICTED_SILK)
-#else
-    if (st->silk_mode.complexity >= 7 && st->Fs>=16000 && st->Fs<=48000 && st->application != OAC_APPLICATION_RESTRICTED_SILK)
-#endif
+# ifdef FIXED_POINT
+    if (st->silk_mode.complexity >= 10 && st->Fs >= 16000 && st->Fs <= 48000
+        && st->application != OAC_APPLICATION_RESTRICTED_SILK)
+# else
+    if (st->silk_mode.complexity >= 7 && st->Fs >= 16000 && st->Fs <= 48000
+        && st->application != OAC_APPLICATION_RESTRICTED_SILK)
+# endif
     {
-       analysis_read_pos_bak = st->analysis.read_pos;
-       analysis_read_subframe_bak = st->analysis.read_subframe;
-       run_analysis(&st->analysis, celt_mode, analysis_pcm, analysis_size, frame_size,
+        analysis_read_pos_bak = st->analysis.read_pos;
+        analysis_read_subframe_bak = st->analysis.read_subframe;
+        run_analysis(&st->analysis, celt_mode, analysis_pcm, analysis_size, frame_size,
              c1, c2, analysis_channels, st->Fs,
              lsb_depth, downmix, &analysis_info);
 
     } else if (st->analysis.initialized) {
-       tonality_analysis_reset(&st->analysis);
+        tonality_analysis_reset(&st->analysis);
     }
 #else
     (void)analysis_pcm;
@@ -1254,35 +1185,33 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
     /* Reset voice_ratio if this frame is not silent or if analysis is disabled.
      * Otherwise, preserve voice_ratio from the last non-silent frame */
     if (!is_silence)
-      st->voice_ratio = -1;
+        st->voice_ratio = -1;
 #ifndef DISABLE_FLOAT_API
     st->detected_bandwidth = 0;
-    if (analysis_info.valid)
-    {
-       int analysis_bandwidth;
-       if (st->signal_type == OAC_AUTO)
-       {
-          float prob;
-          if (st->prev_mode == 0)
-             prob = analysis_info.music_prob;
-          else if (st->prev_mode == MODE_CELT_ONLY)
-             prob = analysis_info.music_prob_max;
-          else
-             prob = analysis_info.music_prob_min;
-          st->voice_ratio = (int)floor(.5+100*(1-prob));
-       }
-
-       analysis_bandwidth = analysis_info.bandwidth;
-       if (analysis_bandwidth<=12)
-          st->detected_bandwidth = OAC_BANDWIDTH_NARROWBAND;
-       else if (analysis_bandwidth<=14)
-          st->detected_bandwidth = OAC_BANDWIDTH_MEDIUMBAND;
-       else if (analysis_bandwidth<=16)
-          st->detected_bandwidth = OAC_BANDWIDTH_WIDEBAND;
-       else if (analysis_bandwidth<=18)
-          st->detected_bandwidth = OAC_BANDWIDTH_SUPERWIDEBAND;
-       else
-          st->detected_bandwidth = OAC_BANDWIDTH_FULLBAND;
+    if (analysis_info.valid) {
+        int analysis_bandwidth;
+        if (st->signal_type == OAC_AUTO) {
+            float prob;
+            if (st->prev_mode == 0)
+                prob = analysis_info.music_prob;
+            else if (st->prev_mode == MODE_CELT_ONLY)
+                prob = analysis_info.music_prob_max;
+            else
+                prob = analysis_info.music_prob_min;
+            st->voice_ratio = (int)floor(.5 + 100*(1 - prob));
+        }
+
+        analysis_bandwidth = analysis_info.bandwidth;
+        if (analysis_bandwidth <= 12)
+            st->detected_bandwidth = OAC_BANDWIDTH_NARROWBAND;
+        else if (analysis_bandwidth <= 14)
+            st->detected_bandwidth = OAC_BANDWIDTH_MEDIUMBAND;
+        else if (analysis_bandwidth <= 16)
+            st->detected_bandwidth = OAC_BANDWIDTH_WIDEBAND;
+        else if (analysis_bandwidth <= 18)
+            st->detected_bandwidth = OAC_BANDWIDTH_SUPERWIDEBAND;
+        else
+            st->detected_bandwidth = OAC_BANDWIDTH_FULLBAND;
     }
 #else
     st->voice_ratio = -1;
@@ -1293,97 +1222,88 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
     if (!analysis_info.valid || analysis_info.activity_probability > DTX_ACTIVITY_THRESHOLD)
 #endif
     {
-       if (!is_silence)
-       {
-          st->peak_signal_energy = MAX32(MULT16_32_Q15(QCONST16(0.999f, 15), st->peak_signal_energy),
+        if (!is_silence) {
+            st->peak_signal_energy = MAX32(MULT16_32_Q15(QCONST16(0.999f, 15), st->peak_signal_energy),
                 compute_frame_energy(pcm, frame_size, st->channels, st->arch));
-       }
+        }
     }
-    if (st->channels==2 && st->force_channels!=1)
-       stereo_width = compute_stereo_width(pcm, frame_size, st->Fs, &st->width_mem);
+    if (st->channels == 2 && st->force_channels != 1)
+        stereo_width = compute_stereo_width(pcm, frame_size, st->Fs, &st->width_mem);
     else
-       stereo_width = 0;
+        stereo_width = 0;
     st->bitrate_bps = user_bitrate_to_bitrate(st, frame_size, max_data_bytes);
 
     frame_rate = st->Fs/frame_size;
-    if (!st->use_vbr)
-    {
-       cbr_bytes = IMIN((bitrate_to_bits(st->bitrate_bps, st->Fs, frame_size)+4)/8, max_data_bytes);
-       st->bitrate_bps = bits_to_bitrate(cbr_bytes*8, st->Fs, frame_size);
-       /* Make sure we provide at least one byte to avoid failing. */
-       max_data_bytes = IMAX(1, cbr_bytes);
+    if (!st->use_vbr) {
+        cbr_bytes = IMIN((bitrate_to_bits(st->bitrate_bps, st->Fs, frame_size) + 4)/8, max_data_bytes);
+        st->bitrate_bps = bits_to_bitrate(cbr_bytes*8, st->Fs, frame_size);
+        /* Make sure we provide at least one byte to avoid failing. */
+        max_data_bytes = IMAX(1, cbr_bytes);
     }
 #ifdef ENABLE_DRED
     /* Allocate some of the bits to DRED if needed. */
     dred_bitrate_bps = compute_dred_bitrate(st, st->bitrate_bps, frame_size);
     st->bitrate_bps -= dred_bitrate_bps;
 #endif
-    if (max_data_bytes<3 || st->bitrate_bps < 3*frame_rate*8
-       || (frame_rate<50 && (max_data_bytes*(oac_int32)frame_rate<300 || st->bitrate_bps < 2400)))
-    {
-       /*If the space is too low to do something useful, emit 'PLC' frames.*/
-       int tocmode = st->mode;
-       int bw = st->bandwidth == 0 ? OAC_BANDWIDTH_NARROWBAND : st->bandwidth;
-       int packet_code = 0;
-       int num_multiframes = 0;
-
-       if (tocmode==0)
-          tocmode = MODE_SILK_ONLY;
-       if (frame_rate>100)
-          tocmode = MODE_CELT_ONLY;
-       /* 40 ms -> 2 x 20 ms if in CELT_ONLY or HYBRID mode */
-       if (frame_rate==25 && tocmode!=MODE_SILK_ONLY)
-       {
-          frame_rate = 50;
-          packet_code = 1;
-       }
-
-       /* >= 60 ms frames */
-       if (frame_rate<=16)
-       {
-          /* 1 x 60 ms, 2 x 40 ms, 2 x 60 ms */
-          if (out_data_bytes==1 || (tocmode==MODE_SILK_ONLY && frame_rate!=10))
-          {
-             tocmode = MODE_SILK_ONLY;
-
-             packet_code = frame_rate <= 12;
-             frame_rate = frame_rate == 12 ? 25 : 16;
-          }
-          else
-          {
-             num_multiframes = 50/frame_rate;
-             frame_rate = 50;
-             packet_code = 3;
-          }
-       }
-
-       if(tocmode==MODE_SILK_ONLY&&bw>OAC_BANDWIDTH_WIDEBAND)
-          bw=OAC_BANDWIDTH_WIDEBAND;
-       else if (tocmode==MODE_CELT_ONLY&&bw==OAC_BANDWIDTH_MEDIUMBAND)
-          bw=OAC_BANDWIDTH_NARROWBAND;
-       else if (tocmode==MODE_HYBRID&&bw<=OAC_BANDWIDTH_SUPERWIDEBAND)
-          bw=OAC_BANDWIDTH_SUPERWIDEBAND;
-
-       data[0] = gen_toc(tocmode, frame_rate, bw, st->stream_channels);
-       data[0] |= packet_code;
-
-       ret = packet_code <= 1 ? 1 : 2;
-
-       max_data_bytes = IMAX(max_data_bytes, ret);
-
-       if (packet_code==3)
-          data[1] = num_multiframes;
-
-       if (!st->use_vbr)
-       {
-          ret = oac_packet_pad(data, ret, max_data_bytes);
-          if (ret == OAC_OK)
-             ret = max_data_bytes;
-          else
-             ret = OAC_INTERNAL_ERROR;
-       }
-       RESTORE_STACK;
-       return ret;
+    if (max_data_bytes < 3 || st->bitrate_bps < 3*frame_rate*8
+        || (frame_rate < 50 && (max_data_bytes*(oac_int32)frame_rate < 300 || st->bitrate_bps < 2400))) {
+        /*If the space is too low to do something useful, emit 'PLC' frames.*/
+        int tocmode = st->mode;
+        int bw = st->bandwidth == 0 ? OAC_BANDWIDTH_NARROWBAND : st->bandwidth;
+        int packet_code = 0;
+        int num_multiframes = 0;
+
+        if (tocmode == 0)
+            tocmode = MODE_SILK_ONLY;
+        if (frame_rate > 100)
+            tocmode = MODE_CELT_ONLY;
+        /* 40 ms -> 2 x 20 ms if in CELT_ONLY or HYBRID mode */
+        if (frame_rate == 25 && tocmode != MODE_SILK_ONLY) {
+            frame_rate = 50;
+            packet_code = 1;
+        }
+
+        /* >= 60 ms frames */
+        if (frame_rate <= 16) {
+            /* 1 x 60 ms, 2 x 40 ms, 2 x 60 ms */
+            if (out_data_bytes == 1 || (tocmode == MODE_SILK_ONLY && frame_rate != 10)) {
+                tocmode = MODE_SILK_ONLY;
+
+                packet_code = frame_rate <= 12;
+                frame_rate = frame_rate == 12 ? 25 : 16;
+            } else {
+                num_multiframes = 50/frame_rate;
+                frame_rate = 50;
+                packet_code = 3;
+            }
+        }
+
+        if (tocmode == MODE_SILK_ONLY && bw > OAC_BANDWIDTH_WIDEBAND)
+            bw = OAC_BANDWIDTH_WIDEBAND;
+        else if (tocmode == MODE_CELT_ONLY && bw == OAC_BANDWIDTH_MEDIUMBAND)
+            bw = OAC_BANDWIDTH_NARROWBAND;
+        else if (tocmode == MODE_HYBRID && bw <= OAC_BANDWIDTH_SUPERWIDEBAND)
+            bw = OAC_BANDWIDTH_SUPERWIDEBAND;
+
+        data[0] = gen_toc(tocmode, frame_rate, bw, st->stream_channels);
+        data[0] |= packet_code;
+
+        ret = packet_code <= 1 ? 1 : 2;
+
+        max_data_bytes = IMAX(max_data_bytes, ret);
+
+        if (packet_code == 3)
+            data[1] = num_multiframes;
+
+        if (!st->use_vbr) {
+            ret = oac_packet_pad(data, ret, max_data_bytes);
+            if (ret == OAC_OK)
+                ret = max_data_bytes;
+            else
+                ret = OAC_INTERNAL_ERROR;
+        }
+        RESTORE_STACK;
+        return ret;
     }
     max_rate = bits_to_bitrate(max_data_bytes*8, st->Fs, frame_size);
 
@@ -1392,44 +1312,42 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
           st->use_vbr, 0, st->silk_mode.complexity, st->silk_mode.packetLossPercentage);
 
     if (st->signal_type == OAC_SIGNAL_VOICE)
-       voice_est = 127;
+        voice_est = 127;
     else if (st->signal_type == OAC_SIGNAL_MUSIC)
-       voice_est = 0;
-    else if (st->voice_ratio >= 0)
-    {
-       voice_est = st->voice_ratio*327>>8;
-       /* For AUDIO, never be more than 90% confident of having speech */
-       if (st->application == OAC_APPLICATION_AUDIO)
-          voice_est = IMIN(voice_est, 115);
+        voice_est = 0;
+    else if (st->voice_ratio >= 0) {
+        voice_est = st->voice_ratio*327>>8;
+        /* For AUDIO, never be more than 90% confident of having speech */
+        if (st->application == OAC_APPLICATION_AUDIO)
+            voice_est = IMIN(voice_est, 115);
     } else if (st->application == OAC_APPLICATION_VOIP)
-       voice_est = 115;
+        voice_est = 115;
     else
-       voice_est = 48;
+        voice_est = 48;
 
-    if (st->force_channels!=OAC_AUTO && st->channels == 2)
-    {
+    if (st->force_channels != OAC_AUTO && st->channels == 2) {
         st->stream_channels = st->force_channels;
     } else {
 #ifdef FUZZING
         (void)stereo_music_threshold;
         (void)stereo_voice_threshold;
-       /* Random mono/stereo decision */
-       if (st->channels == 2 && (rand()&0x1F)==0)
-          st->stream_channels = 3-st->stream_channels;
+        /* Random mono/stereo decision */
+        if (st->channels == 2 && (rand()&0x1F) == 0)
+            st->stream_channels = 3 - st->stream_channels;
 #else
-       /* Rate-dependent mono-stereo decision */
-       if (st->channels == 2)
-       {
-          oac_int32 stereo_threshold;
-          stereo_threshold = stereo_music_threshold + ((voice_est*voice_est*(stereo_voice_threshold-stereo_music_threshold))>>14);
-          if (st->stream_channels == 2)
-             stereo_threshold -= 1000;
-          else
-             stereo_threshold += 1000;
-          st->stream_channels = (equiv_rate > stereo_threshold) ? 2 : 1;
-       } else {
-          st->stream_channels = st->channels;
-       }
+        /* Rate-dependent mono-stereo decision */
+        if (st->channels == 2) {
+            oac_int32 stereo_threshold;
+            stereo_threshold = stereo_music_threshold
+                               + ((voice_est*voice_est*(stereo_voice_threshold - stereo_music_threshold))>>14);
+            if (st->stream_channels == 2)
+                stereo_threshold -= 1000;
+            else
+                stereo_threshold += 1000;
+            st->stream_channels = (equiv_rate > stereo_threshold) ? 2 : 1;
+        } else {
+            st->stream_channels = st->channels;
+        }
 #endif
     }
     /* Update equivalent rate for channels decision. */
@@ -1445,149 +1363,138 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
 #endif
 
     /* Mode selection depending on application and signal type */
-    if (st->application == OAC_APPLICATION_RESTRICTED_SILK)
-    {
-       st->mode = MODE_SILK_ONLY;
-    } else if (st->application == OAC_APPLICATION_RESTRICTED_LOWDELAY || st->application == OAC_APPLICATION_RESTRICTED_CELT)
-    {
-       st->mode = MODE_CELT_ONLY;
-    } else if (st->user_forced_mode == OAC_AUTO)
-    {
+    if (st->application == OAC_APPLICATION_RESTRICTED_SILK) {
+        st->mode = MODE_SILK_ONLY;
+    } else if (st->application == OAC_APPLICATION_RESTRICTED_LOWDELAY
+               || st->application == OAC_APPLICATION_RESTRICTED_CELT) {
+        st->mode = MODE_CELT_ONLY;
+    } else if (st->user_forced_mode == OAC_AUTO) {
 #ifdef FUZZING
         (void)stereo_width;
         (void)mode_thresholds;
-       /* Random mode switching */
-       if ((rand()&0xF)==0)
-       {
-          if ((rand()&0x1)==0)
-             st->mode = MODE_CELT_ONLY;
-          else
-             st->mode = MODE_SILK_ONLY;
-       } else {
-          if (st->prev_mode==MODE_CELT_ONLY)
-             st->mode = MODE_CELT_ONLY;
-          else
-             st->mode = MODE_SILK_ONLY;
-       }
+        /* Random mode switching */
+        if ((rand()&0xF) == 0) {
+            if ((rand()&0x1) == 0)
+                st->mode = MODE_CELT_ONLY;
+            else
+                st->mode = MODE_SILK_ONLY;
+        } else {
+            if (st->prev_mode == MODE_CELT_ONLY)
+                st->mode = MODE_CELT_ONLY;
+            else
+                st->mode = MODE_SILK_ONLY;
+        }
 #else
-       oac_int32 mode_voice, mode_music;
-       oac_int32 threshold;
-
-       /* Interpolate based on stereo width */
-       mode_voice = (oac_int32)(MULT16_32_Q15(Q15ONE-stereo_width,mode_thresholds[0][0])
-             + MULT16_32_Q15(stereo_width,mode_thresholds[1][0]));
-       mode_music = (oac_int32)(MULT16_32_Q15(Q15ONE-stereo_width,mode_thresholds[1][1])
-             + MULT16_32_Q15(stereo_width,mode_thresholds[1][1]));
-       /* Interpolate based on speech/music probability */
-       threshold = mode_music + ((voice_est*voice_est*(mode_voice-mode_music))>>14);
-       /* Bias towards SILK for VoIP because of some useful features */
-       if (st->application == OAC_APPLICATION_VOIP)
-          threshold += 8000;
-
-       /*printf("%f %d\n", stereo_width/(float)Q15ONE, threshold);*/
-       /* Hysteresis */
-       if (st->prev_mode == MODE_CELT_ONLY)
-           threshold -= 4000;
-       else if (st->prev_mode>0)
-           threshold += 4000;
-
-       st->mode = (equiv_rate >= threshold) ? MODE_CELT_ONLY: MODE_SILK_ONLY;
-
-       /* When FEC is enabled and there's enough packet loss, use SILK.
-          Unless the FEC is set to 2, in which case we don't switch to SILK if we're confident we have music. */
-       if (st->silk_mode.useInBandFEC && st->silk_mode.packetLossPercentage > (128-voice_est)>>4 && (st->fec_config != 2 || voice_est > 25))
-          st->mode = MODE_SILK_ONLY;
-       /* When encoding voice and DTX is enabled but the generalized DTX cannot be used,
-          use SILK in order to make use of its DTX. */
-       if (st->silk_mode.useDTX && voice_est > 100)
-          st->mode = MODE_SILK_ONLY;
-#endif
-
-       /* If max_data_bytes represents less than 6 kb/s, switch to CELT-only mode */
-       if (max_data_bytes < bitrate_to_bits(frame_rate > 50 ? 9000 : 6000, st->Fs, frame_size)/8)
-          st->mode = MODE_CELT_ONLY;
+        oac_int32 mode_voice, mode_music;
+        oac_int32 threshold;
+
+        /* Interpolate based on stereo width */
+        mode_voice = (oac_int32)(MULT16_32_Q15(Q15ONE - stereo_width, mode_thresholds[0][0])
+                                 + MULT16_32_Q15(stereo_width, mode_thresholds[1][0]));
+        mode_music = (oac_int32)(MULT16_32_Q15(Q15ONE - stereo_width, mode_thresholds[1][1])
+                                 + MULT16_32_Q15(stereo_width, mode_thresholds[1][1]));
+        /* Interpolate based on speech/music probability */
+        threshold = mode_music + ((voice_est*voice_est*(mode_voice - mode_music))>>14);
+        /* Bias towards SILK for VoIP because of some useful features */
+        if (st->application == OAC_APPLICATION_VOIP)
+            threshold += 8000;
+
+        /*printf("%f %d\n", stereo_width/(float)Q15ONE, threshold);*/
+        /* Hysteresis */
+        if (st->prev_mode == MODE_CELT_ONLY)
+            threshold -= 4000;
+        else if (st->prev_mode > 0)
+            threshold += 4000;
+
+        st->mode = (equiv_rate >= threshold) ? MODE_CELT_ONLY: MODE_SILK_ONLY;
+
+        /* When FEC is enabled and there's enough packet loss, use SILK.
+           Unless the FEC is set to 2, in which case we don't switch to SILK if we're confident we have music. */
+        if (st->silk_mode.useInBandFEC && st->silk_mode.packetLossPercentage > (128 - voice_est)>>4
+            && (st->fec_config != 2 || voice_est > 25))
+            st->mode = MODE_SILK_ONLY;
+        /* When encoding voice and DTX is enabled but the generalized DTX cannot be used,
+           use SILK in order to make use of its DTX. */
+        if (st->silk_mode.useDTX && voice_est > 100)
+            st->mode = MODE_SILK_ONLY;
+#endif
+
+        /* If max_data_bytes represents less than 6 kb/s, switch to CELT-only mode */
+        if (max_data_bytes < bitrate_to_bits(frame_rate > 50 ? 9000 : 6000, st->Fs, frame_size)/8)
+            st->mode = MODE_CELT_ONLY;
     } else {
-       st->mode = st->user_forced_mode;
+        st->mode = st->user_forced_mode;
     }
 
     /* Override the chosen mode to make sure we meet the requested frame size */
-    if (st->mode != MODE_CELT_ONLY && frame_size < st->Fs/100)
-    {
-       celt_assert(st->application != OAC_APPLICATION_RESTRICTED_SILK);
-       st->mode = MODE_CELT_ONLY;
+    if (st->mode != MODE_CELT_ONLY && frame_size < st->Fs/100) {
+        celt_assert(st->application != OAC_APPLICATION_RESTRICTED_SILK);
+        st->mode = MODE_CELT_ONLY;
     }
     if (st->lfe && st->application != OAC_APPLICATION_RESTRICTED_SILK)
-       st->mode = MODE_CELT_ONLY;
+        st->mode = MODE_CELT_ONLY;
 
-    if (st->prev_mode > 0 &&
-        ((st->mode != MODE_CELT_ONLY && st->prev_mode == MODE_CELT_ONLY) ||
-    (st->mode == MODE_CELT_ONLY && st->prev_mode != MODE_CELT_ONLY)))
-    {
+    if (st->prev_mode > 0
+        && ((st->mode != MODE_CELT_ONLY && st->prev_mode == MODE_CELT_ONLY)
+            || (st->mode == MODE_CELT_ONLY && st->prev_mode != MODE_CELT_ONLY))) {
         redundancy = 1;
         celt_to_silk = (st->mode != MODE_CELT_ONLY);
-        if (!celt_to_silk)
-        {
+        if (!celt_to_silk) {
             /* Switch to SILK/hybrid if frame size is 10 ms or more*/
-            if (frame_size >= st->Fs/100)
-            {
+            if (frame_size >= st->Fs/100) {
                 st->mode = st->prev_mode;
                 to_celt = 1;
             } else {
-                redundancy=0;
+                redundancy = 0;
             }
         }
     }
 
     /* When encoding multiframes, we can ask for a switch to CELT only in the last frame. This switch
      * is processed above as the requested mode shouldn't interrupt stereo->mono transition. */
-    if (st->stream_channels == 1 && st->prev_channels ==2 && st->silk_mode.toMono==0
-          && st->mode != MODE_CELT_ONLY && st->prev_mode != MODE_CELT_ONLY)
-    {
-       /* Delay stereo->mono transition by two frames so that SILK can do a smooth downmix */
-       st->silk_mode.toMono = 1;
-       st->stream_channels = 2;
+    if (st->stream_channels == 1 && st->prev_channels == 2 && st->silk_mode.toMono == 0
+        && st->mode != MODE_CELT_ONLY && st->prev_mode != MODE_CELT_ONLY) {
+        /* Delay stereo->mono transition by two frames so that SILK can do a smooth downmix */
+        st->silk_mode.toMono = 1;
+        st->stream_channels = 2;
     } else {
-       st->silk_mode.toMono = 0;
+        st->silk_mode.toMono = 0;
     }
 
     /* Update equivalent rate with mode decision. */
     equiv_rate = compute_equiv_rate(st->bitrate_bps, st->stream_channels, st->Fs/frame_size,
           st->use_vbr, st->mode, st->silk_mode.complexity, st->silk_mode.packetLossPercentage);
 
-    if (st->mode != MODE_CELT_ONLY && st->prev_mode == MODE_CELT_ONLY)
-    {
+    if (st->mode != MODE_CELT_ONLY && st->prev_mode == MODE_CELT_ONLY) {
         silk_EncControlStruct dummy;
         silk_InitEncoder( silk_enc, st->channels, st->arch, &dummy);
-        prefill=1;
+        prefill = 1;
     }
 
     /* Automatic (rate-dependent) bandwidth selection */
-    if (st->mode == MODE_CELT_ONLY || st->first || st->silk_mode.allowBandwidthSwitch)
-    {
+    if (st->mode == MODE_CELT_ONLY || st->first || st->silk_mode.allowBandwidthSwitch) {
         const oac_int32 *voice_bandwidth_thresholds, *music_bandwidth_thresholds;
         oac_int32 bandwidth_thresholds[8];
         int bandwidth = OAC_BANDWIDTH_FULLBAND;
 
-        if (st->channels==2 && st->force_channels!=1)
-        {
-           voice_bandwidth_thresholds = stereo_voice_bandwidth_thresholds;
-           music_bandwidth_thresholds = stereo_music_bandwidth_thresholds;
+        if (st->channels == 2 && st->force_channels != 1) {
+            voice_bandwidth_thresholds = stereo_voice_bandwidth_thresholds;
+            music_bandwidth_thresholds = stereo_music_bandwidth_thresholds;
         } else {
-           voice_bandwidth_thresholds = mono_voice_bandwidth_thresholds;
-           music_bandwidth_thresholds = mono_music_bandwidth_thresholds;
+            voice_bandwidth_thresholds = mono_voice_bandwidth_thresholds;
+            music_bandwidth_thresholds = mono_music_bandwidth_thresholds;
         }
         /* Interpolate bandwidth thresholds depending on voice estimation */
-        for (i=0;i<8;i++)
-        {
-           bandwidth_thresholds[i] = music_bandwidth_thresholds[i]
-                    + ((voice_est*voice_est*(voice_bandwidth_thresholds[i]-music_bandwidth_thresholds[i]))>>14);
+        for (i = 0; i < 8; i++) {
+            bandwidth_thresholds[i] = music_bandwidth_thresholds[i]
+                                      + ((voice_est*voice_est
+                                          *(voice_bandwidth_thresholds[i] - music_bandwidth_thresholds[i]))>>14);
         }
         do {
             int threshold, hysteresis;
-            threshold = bandwidth_thresholds[2*(bandwidth-OAC_BANDWIDTH_MEDIUMBAND)];
-            hysteresis = bandwidth_thresholds[2*(bandwidth-OAC_BANDWIDTH_MEDIUMBAND)+1];
-            if (!st->first)
-            {
+            threshold = bandwidth_thresholds[2*(bandwidth - OAC_BANDWIDTH_MEDIUMBAND)];
+            hysteresis = bandwidth_thresholds[2*(bandwidth - OAC_BANDWIDTH_MEDIUMBAND) + 1];
+            if (!st->first) {
                 if (st->auto_bandwidth >= bandwidth)
                     threshold -= hysteresis;
                 else
@@ -1595,28 +1502,28 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
             }
             if (equiv_rate >= threshold)
                 break;
-        } while (--bandwidth>OAC_BANDWIDTH_NARROWBAND);
+        } while (--bandwidth > OAC_BANDWIDTH_NARROWBAND);
         /* We don't use mediumband anymore, except when explicitly requested or during
            mode transitions. */
         if (bandwidth == OAC_BANDWIDTH_MEDIUMBAND)
-           bandwidth = OAC_BANDWIDTH_WIDEBAND;
+            bandwidth = OAC_BANDWIDTH_WIDEBAND;
         st->bandwidth = st->auto_bandwidth = bandwidth;
         /* Prevents any transition to SWB/FB until the SILK layer has fully
            switched to WB mode and turned the variable LP filter off */
-        if (!st->first && st->mode != MODE_CELT_ONLY && !st->silk_mode.inWBmodeWithoutVariableLP && st->bandwidth > OAC_BANDWIDTH_WIDEBAND)
+        if (!st->first && st->mode != MODE_CELT_ONLY && !st->silk_mode.inWBmodeWithoutVariableLP
+            && st->bandwidth > OAC_BANDWIDTH_WIDEBAND)
             st->bandwidth = OAC_BANDWIDTH_WIDEBAND;
     }
 
-    if (st->bandwidth>st->max_bandwidth)
-       st->bandwidth = st->max_bandwidth;
+    if (st->bandwidth > st->max_bandwidth)
+        st->bandwidth = st->max_bandwidth;
 
     if (st->user_bandwidth != OAC_AUTO)
         st->bandwidth = st->user_bandwidth;
 
     /* This prevents us from using hybrid at unsafe CBR/max rates */
-    if (st->mode != MODE_CELT_ONLY && max_rate < 15000)
-    {
-       st->bandwidth = IMIN(st->bandwidth, OAC_BANDWIDTH_WIDEBAND);
+    if (st->mode != MODE_CELT_ONLY && max_rate < 15000) {
+        st->bandwidth = IMIN(st->bandwidth, OAC_BANDWIDTH_WIDEBAND);
     }
 
     /* Prevents Oac from wasting bits on frequencies that are above
@@ -1631,26 +1538,25 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
         st->bandwidth = OAC_BANDWIDTH_NARROWBAND;
 #ifndef DISABLE_FLOAT_API
     /* Use detected bandwidth to reduce the encoded bandwidth. */
-    if (st->detected_bandwidth && st->user_bandwidth == OAC_AUTO)
-    {
-       int min_detected_bandwidth;
-       /* Makes bandwidth detection more conservative just in case the detector
-          gets it wrong when we could have coded a high bandwidth transparently.
-          When operating in SILK/hybrid mode, we don't go below wideband to avoid
-          more complicated switches that require redundancy. */
-       if (equiv_rate <= 18000*st->stream_channels && st->mode == MODE_CELT_ONLY)
-          min_detected_bandwidth = OAC_BANDWIDTH_NARROWBAND;
-       else if (equiv_rate <= 24000*st->stream_channels && st->mode == MODE_CELT_ONLY)
-          min_detected_bandwidth = OAC_BANDWIDTH_MEDIUMBAND;
-       else if (equiv_rate <= 30000*st->stream_channels)
-          min_detected_bandwidth = OAC_BANDWIDTH_WIDEBAND;
-       else if (equiv_rate <= 44000*st->stream_channels)
-          min_detected_bandwidth = OAC_BANDWIDTH_SUPERWIDEBAND;
-       else
-          min_detected_bandwidth = OAC_BANDWIDTH_FULLBAND;
-
-       st->detected_bandwidth = IMAX(st->detected_bandwidth, min_detected_bandwidth);
-       st->bandwidth = IMIN(st->bandwidth, st->detected_bandwidth);
+    if (st->detected_bandwidth && st->user_bandwidth == OAC_AUTO) {
+        int min_detected_bandwidth;
+        /* Makes bandwidth detection more conservative just in case the detector
+           gets it wrong when we could have coded a high bandwidth transparently.
+           When operating in SILK/hybrid mode, we don't go below wideband to avoid
+           more complicated switches that require redundancy. */
+        if (equiv_rate <= 18000*st->stream_channels && st->mode == MODE_CELT_ONLY)
+            min_detected_bandwidth = OAC_BANDWIDTH_NARROWBAND;
+        else if (equiv_rate <= 24000*st->stream_channels && st->mode == MODE_CELT_ONLY)
+            min_detected_bandwidth = OAC_BANDWIDTH_MEDIUMBAND;
+        else if (equiv_rate <= 30000*st->stream_channels)
+            min_detected_bandwidth = OAC_BANDWIDTH_WIDEBAND;
+        else if (equiv_rate <= 44000*st->stream_channels)
+            min_detected_bandwidth = OAC_BANDWIDTH_SUPERWIDEBAND;
+        else
+            min_detected_bandwidth = OAC_BANDWIDTH_FULLBAND;
+
+        st->detected_bandwidth = IMAX(st->detected_bandwidth, min_detected_bandwidth);
+        st->bandwidth = IMIN(st->bandwidth, st->detected_bandwidth);
     }
 #endif
     st->silk_mode.LBRR_coded = decide_fec(st->silk_mode.useInBandFEC, st->silk_mode.packetLossPercentage,
@@ -1662,115 +1568,113 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
     if (st->mode == MODE_CELT_ONLY && st->bandwidth == OAC_BANDWIDTH_MEDIUMBAND)
         st->bandwidth = OAC_BANDWIDTH_WIDEBAND;
     if (st->lfe)
-       st->bandwidth = OAC_BANDWIDTH_NARROWBAND;
+        st->bandwidth = OAC_BANDWIDTH_NARROWBAND;
 
     curr_bandwidth = st->bandwidth;
 
     if (st->application == OAC_APPLICATION_RESTRICTED_SILK && curr_bandwidth > OAC_BANDWIDTH_WIDEBAND)
-       st->bandwidth = curr_bandwidth = OAC_BANDWIDTH_WIDEBAND;
+        st->bandwidth = curr_bandwidth = OAC_BANDWIDTH_WIDEBAND;
     /* Chooses the appropriate mode for speech
-       *NEVER* switch to/from CELT-only mode here as this will invalidate some assumptions */
+     * NEVER* switch to/from CELT-only mode here as this will invalidate some assumptions */
     if (st->mode == MODE_SILK_ONLY && curr_bandwidth > OAC_BANDWIDTH_WIDEBAND)
         st->mode = MODE_HYBRID;
     if (st->mode == MODE_HYBRID && curr_bandwidth <= OAC_BANDWIDTH_WIDEBAND)
         st->mode = MODE_SILK_ONLY;
 
     /* Can't support higher than >60 ms frames, and >20 ms when in Hybrid or CELT-only modes */
-    if ((frame_size > st->Fs/50 && (st->mode != MODE_SILK_ONLY)) || frame_size > 3*st->Fs/50)
-    {
-       int enc_frame_size;
-       int nb_frames;
-       VARDECL(unsigned char, tmp_data);
-       VARDECL(OacRepacketizer, rp);
-       int max_header_bytes;
-       oac_int32 repacketize_len;
-       oac_int32 max_len_sum;
-       oac_int32 tot_size=0;
-       unsigned char *curr_data;
-       int tmp_len;
-       int dtx_count = 0;
-       int bak_to_mono;
-
-       if (st->mode == MODE_SILK_ONLY)
-       {
-         if (frame_size == 2*st->Fs/25)  /* 80 ms -> 2x 40 ms */
-           enc_frame_size = st->Fs/25;
-         else if (frame_size == 3*st->Fs/25)  /* 120 ms -> 2x 60 ms */
-           enc_frame_size = 3*st->Fs/50;
-         else                            /* 100 ms -> 5x 20 ms */
-           enc_frame_size = st->Fs/50;
-       }
-       else
-         enc_frame_size = st->Fs/50;
-
-       nb_frames = frame_size/enc_frame_size;
+    if ((frame_size > st->Fs/50 && (st->mode != MODE_SILK_ONLY)) || frame_size > 3*st->Fs/50) {
+        int enc_frame_size;
+        int nb_frames;
+        VARDECL(unsigned char, tmp_data);
+        VARDECL(OacRepacketizer, rp);
+        int max_header_bytes;
+        oac_int32 repacketize_len;
+        oac_int32 max_len_sum;
+        oac_int32 tot_size = 0;
+        unsigned char *curr_data;
+        int tmp_len;
+        int dtx_count = 0;
+        int bak_to_mono;
+
+        if (st->mode == MODE_SILK_ONLY) {
+            if (frame_size == 2*st->Fs/25) /* 80 ms -> 2x 40 ms */
+                enc_frame_size = st->Fs/25;
+            else if (frame_size == 3*st->Fs/25) /* 120 ms -> 2x 60 ms */
+                enc_frame_size = 3*st->Fs/50;
+            else                         /* 100 ms -> 5x 20 ms */
+                enc_frame_size = st->Fs/50;
+        } else
+            enc_frame_size = st->Fs/50;
+
+        nb_frames = frame_size/enc_frame_size;
 
 #ifndef DISABLE_FLOAT_API
-       if (analysis_read_pos_bak!= -1)
-       {
-          /* Reset analysis position to the beginning of the first frame so we
-             can use it one frame at a time. */
-          st->analysis.read_pos = analysis_read_pos_bak;
-          st->analysis.read_subframe = analysis_read_subframe_bak;
-       }
-#endif
-
-       /* Worst cases:
-        * 2 frames: Code 2 with different compressed sizes
-        * >2 frames: Code 3 VBR */
-       max_header_bytes = nb_frames == 2 ? 3 : (2+(nb_frames-1)*2);
-
-       if (st->use_vbr || st->user_bitrate_bps==OAC_BITRATE_MAX)
-          repacketize_len = out_data_bytes;
-       else {
-          celt_assert(cbr_bytes>=0);
-          repacketize_len = IMIN(cbr_bytes, out_data_bytes);
-       }
-       max_len_sum = nb_frames + repacketize_len - max_header_bytes;
-
-       ALLOC(tmp_data, max_len_sum, unsigned char);
-       curr_data = tmp_data;
-       ALLOC(rp, 1, OacRepacketizer);
-       oac_repacketizer_init(rp);
-
-
-       bak_to_mono = st->silk_mode.toMono;
-       if (bak_to_mono)
-          st->force_channels = 1;
-       else
-          st->prev_channels = st->stream_channels;
-
-       for (i=0;i<nb_frames;i++)
-       {
-          int first_frame;
-          int frame_to_celt;
-          int frame_redundancy;
-          oac_int32 curr_max;
-          /* Attempt DRED encoding until we have a non-DTX frame. In case of DTX refresh,
-             that allows for DRED not to be in the first frame. */
-          first_frame = (i == 0) || (i == dtx_count);
-          st->silk_mode.toMono = 0;
-          st->nonfinal_frame = i<(nb_frames-1);
-
-          /* When switching from SILK/Hybrid to CELT, only ask for a switch at the last frame */
-          frame_to_celt = to_celt && i==nb_frames-1;
-          frame_redundancy = redundancy && (frame_to_celt || (!to_celt && i==0));
-
-          curr_max = IMIN(bitrate_to_bits(st->bitrate_bps, st->Fs, enc_frame_size)/8, max_len_sum/nb_frames);
+        if (analysis_read_pos_bak != -1) {
+            /* Reset analysis position to the beginning of the first frame so we
+               can use it one frame at a time. */
+            st->analysis.read_pos = analysis_read_pos_bak;
+            st->analysis.read_subframe = analysis_read_subframe_bak;
+        }
+#endif
+
+        /* Worst cases:
+         * 2 frames: Code 2 with different compressed sizes
+         * >2 frames: Code 3 VBR */
+        max_header_bytes = nb_frames == 2 ? 3 : (2 + (nb_frames - 1)*2);
+
+        if (st->use_vbr || st->user_bitrate_bps == OAC_BITRATE_MAX)
+            repacketize_len = out_data_bytes;
+        else {
+            celt_assert(cbr_bytes >= 0);
+            repacketize_len = IMIN(cbr_bytes, out_data_bytes);
+        }
+        max_len_sum = nb_frames + repacketize_len - max_header_bytes;
+
+        ALLOC(tmp_data, max_len_sum, unsigned char);
+        curr_data = tmp_data;
+        ALLOC(rp, 1, OacRepacketizer);
+        oac_repacketizer_init(rp);
+
+
+        bak_to_mono = st->silk_mode.toMono;
+        if (bak_to_mono)
+            st->force_channels = 1;
+        else
+            st->prev_channels = st->stream_channels;
+
+        for (i = 0; i < nb_frames; i++) {
+            int first_frame;
+            int frame_to_celt;
+            int frame_redundancy;
+            oac_int32 curr_max;
+            /* Attempt DRED encoding until we have a non-DTX frame. In case of DTX refresh,
+               that allows for DRED not to be in the first frame. */
+            first_frame = (i == 0) || (i == dtx_count);
+            st->silk_mode.toMono = 0;
+            st->nonfinal_frame = i < (nb_frames - 1);
+
+            /* When switching from SILK/Hybrid to CELT, only ask for a switch at the last frame */
+            frame_to_celt = to_celt && i == nb_frames - 1;
+            frame_redundancy = redundancy && (frame_to_celt || (!to_celt && i == 0));
+
+            curr_max = IMIN(bitrate_to_bits(st->bitrate_bps, st->Fs, enc_frame_size)/8, max_len_sum/nb_frames);
 #ifdef ENABLE_DRED
-          curr_max = IMIN(curr_max, (max_len_sum-bitrate_to_bits(dred_bitrate_bps, st->Fs, frame_size)/8)/nb_frames);
-          if (first_frame) curr_max += bitrate_to_bits(dred_bitrate_bps, st->Fs, frame_size)/8;
+            curr_max = IMIN(curr_max,
+                (max_len_sum - bitrate_to_bits(dred_bitrate_bps, st->Fs, frame_size)/8)/nb_frames);
+            if (first_frame) curr_max += bitrate_to_bits(dred_bitrate_bps, st->Fs, frame_size)/8;
 #endif
-          curr_max = IMIN(max_len_sum-tot_size, curr_max);
+            curr_max = IMIN(max_len_sum - tot_size, curr_max);
 #ifndef DISABLE_FLOAT_API
-          if (analysis_read_pos_bak != -1) {
-            /* Get analysis for current frame. */
-            tonality_get_info(&st->analysis, &analysis_info, enc_frame_size);
-          }
+            if (analysis_read_pos_bak != -1) {
+                /* Get analysis for current frame. */
+                tonality_get_info(&st->analysis, &analysis_info, enc_frame_size);
+            }
 #endif
-          is_silence = is_digital_silence(pcm+i*(st->channels*enc_frame_size), enc_frame_size, st->channels, lsb_depth);
+            is_silence = is_digital_silence(pcm + i*(st->channels*enc_frame_size), enc_frame_size, st->channels,
+            lsb_depth);
 
-          tmp_len = oac_encode_frame_native(st, pcm+i*(st->channels*enc_frame_size), enc_frame_size, curr_data, curr_max, float_api, first_frame,
+            tmp_len = oac_encode_frame_native(st, pcm + i*(st->channels*enc_frame_size), enc_frame_size, curr_data,
+            curr_max, float_api, first_frame,
 #ifdef ENABLE_DRED
                     dred_bitrate_bps,
 #endif
@@ -1779,34 +1683,32 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
 #endif
                     is_silence, frame_redundancy, celt_to_silk, prefill,
                     equiv_rate, frame_to_celt
-              );
-          if (tmp_len<0)
-          {
-             RESTORE_STACK;
-             return OAC_INTERNAL_ERROR;
-          } else if (tmp_len==1) {
-             dtx_count++;
-          }
-          ret = oac_repacketizer_cat(rp, curr_data, tmp_len);
-
-          if (ret<0)
-          {
-             RESTORE_STACK;
-             return OAC_INTERNAL_ERROR;
-          }
-          tot_size += tmp_len;
-          curr_data += tmp_len;
-       }
-       ret = oac_repacketizer_out_range_impl(rp, 0, nb_frames, data, repacketize_len, 0, !st->use_vbr && (dtx_count != nb_frames), NULL, 0);
-       if (ret<0)
-       {
-          ret = OAC_INTERNAL_ERROR;
-       }
-       st->silk_mode.toMono = bak_to_mono;
-       RESTORE_STACK;
-       return ret;
+                );
+            if (tmp_len < 0) {
+                RESTORE_STACK;
+                return OAC_INTERNAL_ERROR;
+            } else if (tmp_len == 1) {
+                dtx_count++;
+            }
+            ret = oac_repacketizer_cat(rp, curr_data, tmp_len);
+
+            if (ret < 0) {
+                RESTORE_STACK;
+                return OAC_INTERNAL_ERROR;
+            }
+            tot_size += tmp_len;
+            curr_data += tmp_len;
+        }
+        ret = oac_repacketizer_out_range_impl(rp, 0, nb_frames, data, repacketize_len, 0,
+        !st->use_vbr && (dtx_count != nb_frames), NULL, 0);
+        if (ret < 0) {
+            ret = OAC_INTERNAL_ERROR;
+        }
+        st->silk_mode.toMono = bak_to_mono;
+        RESTORE_STACK;
+        return ret;
     } else {
-      ret = oac_encode_frame_native(st, pcm, frame_size, data, max_data_bytes, float_api, 1,
+        ret = oac_encode_frame_native(st, pcm, frame_size, data, max_data_bytes, float_api, 1,
 #ifdef ENABLE_DRED
                 dred_bitrate_bps,
 #endif
@@ -1815,29 +1717,28 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
 #endif
                 is_silence, redundancy, celt_to_silk, prefill,
                 equiv_rate, to_celt
-          );
-      RESTORE_STACK;
-      return ret;
+            );
+        RESTORE_STACK;
+        return ret;
     }
 }
 
 static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int frame_size,
-                unsigned char *data, oac_int32 orig_max_data_bytes,
-                int float_api, int first_frame,
+                                         unsigned char *data, oac_int32 orig_max_data_bytes,
+                                         int float_api, int first_frame,
 #ifdef ENABLE_DRED
-                oac_int32 dred_bitrate_bps,
+                                         oac_int32 dred_bitrate_bps,
 #endif
 #ifndef DISABLE_FLOAT_API
-                AnalysisInfo *analysis_info,
+                                         AnalysisInfo *analysis_info,
 #endif
-                int is_silence, int redundancy, int celt_to_silk, int prefill,
-                oac_int32 equiv_rate, int to_celt)
-{
-    void *silk_enc=NULL;
-    CELTEncoder *celt_enc=NULL;
-    const CELTMode *celt_mode=NULL;
+                                         int is_silence, int redundancy, int celt_to_silk, int prefill,
+                                         oac_int32 equiv_rate, int to_celt) {
+    void *silk_enc = NULL;
+    CELTEncoder *celt_enc = NULL;
+    const CELTMode *celt_mode = NULL;
     int i;
-    int ret=0;
+    int ret = 0;
     int max_data_bytes;
     oac_int32 nBytes;
     ec_enc enc;
@@ -1862,50 +1763,47 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
     max_data_bytes = IMIN(orig_max_data_bytes, 1276);
     st->rangeFinal = 0;
     if (st->application != OAC_APPLICATION_RESTRICTED_CELT)
-       silk_enc = (char*)st+st->silk_enc_offset;
-    if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
-    {
-       celt_enc = (CELTEncoder*)((char*)st+st->celt_enc_offset);
-       celt_encoder_ctl(celt_enc, CELT_GET_MODE(&celt_mode));
+        silk_enc = (char*)st + st->silk_enc_offset;
+    if (st->application != OAC_APPLICATION_RESTRICTED_SILK) {
+        celt_enc = (CELTEncoder*)((char*)st + st->celt_enc_offset);
+        celt_encoder_ctl(celt_enc, CELT_GET_MODE(&celt_mode));
     }
     curr_bandwidth = st->bandwidth;
-    if (st->application == OAC_APPLICATION_RESTRICTED_LOWDELAY || st->application == OAC_APPLICATION_RESTRICTED_CELT || st->application == OAC_APPLICATION_RESTRICTED_SILK)
-       delay_compensation = 0;
+    if (st->application == OAC_APPLICATION_RESTRICTED_LOWDELAY || st->application == OAC_APPLICATION_RESTRICTED_CELT
+        || st->application == OAC_APPLICATION_RESTRICTED_SILK)
+        delay_compensation = 0;
     else
-       delay_compensation = st->delay_compensation;
+        delay_compensation = st->delay_compensation;
     total_buffer = delay_compensation;
 
     frame_rate = st->Fs/frame_size;
 
-    if (is_silence)
-    {
-       activity = !is_silence;
+    if (is_silence) {
+        activity = !is_silence;
     }
 #ifndef DISABLE_FLOAT_API
     else if (analysis_info->valid) {
-       activity = analysis_info->activity_probability >= DTX_ACTIVITY_THRESHOLD;
-       if (!activity)
-       {
-           /* Mark as active if this noise frame is sufficiently loud */
-           oac_val32 noise_energy = compute_frame_energy(pcm, frame_size, st->channels, st->arch);
-           activity = st->peak_signal_energy < (PSEUDO_SNR_THRESHOLD * noise_energy);
-       }
+        activity = analysis_info->activity_probability >= DTX_ACTIVITY_THRESHOLD;
+        if (!activity) {
+            /* Mark as active if this noise frame is sufficiently loud */
+            oac_val32 noise_energy = compute_frame_energy(pcm, frame_size, st->channels, st->arch);
+            activity = st->peak_signal_energy < (PSEUDO_SNR_THRESHOLD*noise_energy);
+        }
     }
 #endif
     else if (st->mode == MODE_CELT_ONLY) {
-       oac_val32 noise_energy = compute_frame_energy(pcm, frame_size, st->channels, st->arch);
-       /* Boosting peak energy a bit because we didn't just average the active frames. */
-       activity = st->peak_signal_energy < (QCONST16(PSEUDO_SNR_THRESHOLD, 0) * (oac_val64)HALF32(noise_energy));
+        oac_val32 noise_energy = compute_frame_energy(pcm, frame_size, st->channels, st->arch);
+        /* Boosting peak energy a bit because we didn't just average the active frames. */
+        activity = st->peak_signal_energy < (QCONST16(PSEUDO_SNR_THRESHOLD, 0)*(oac_val64)HALF32(noise_energy));
     }
 
     /* For the first frame at a new SILK bandwidth */
-    if (st->silk_bw_switch)
-    {
-       redundancy = 1;
-       celt_to_silk = 1;
-       st->silk_bw_switch = 0;
-       /* Do a prefill without resetting the sampling rate control. */
-       prefill=2;
+    if (st->silk_bw_switch) {
+        redundancy = 1;
+        celt_to_silk = 1;
+        st->silk_bw_switch = 0;
+        /* Do a prefill without resetting the sampling rate control. */
+        prefill = 2;
     }
 
     /* If we decided to go with CELT, make sure redundancy is off, no matter what
@@ -1913,76 +1811,71 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
     if (st->mode == MODE_CELT_ONLY)
         redundancy = 0;
 
-    if (redundancy)
-    {
-       redundancy_bytes = compute_redundancy_bytes(max_data_bytes, st->bitrate_bps, frame_rate, st->stream_channels);
-       if (redundancy_bytes == 0)
-          redundancy = 0;
+    if (redundancy) {
+        redundancy_bytes = compute_redundancy_bytes(max_data_bytes, st->bitrate_bps, frame_rate, st->stream_channels);
+        if (redundancy_bytes == 0)
+            redundancy = 0;
     }
-    if (st->application == OAC_APPLICATION_RESTRICTED_SILK)
-    {
-       redundancy = 0;
-       redundancy_bytes = 0;
+    if (st->application == OAC_APPLICATION_RESTRICTED_SILK) {
+        redundancy = 0;
+        redundancy_bytes = 0;
     }
 
     /* printf("%d %d %d %d\n", st->bitrate_bps, st->stream_channels, st->mode, curr_bandwidth); */
-    bits_target = IMIN(8*(max_data_bytes-redundancy_bytes), bitrate_to_bits(st->bitrate_bps, st->Fs, frame_size)) - 8;
+    bits_target = IMIN(8*(max_data_bytes - redundancy_bytes), bitrate_to_bits(st->bitrate_bps, st->Fs, frame_size)) - 8;
 
     data += 1;
 
-    ec_enc_init(&enc, data, orig_max_data_bytes-1);
+    ec_enc_init(&enc, data, orig_max_data_bytes - 1);
 
-    ALLOC(pcm_buf, (total_buffer+frame_size)*st->channels, oac_res);
-    OAC_COPY(pcm_buf, &st->delay_buffer[(st->encoder_buffer-total_buffer)*st->channels], total_buffer*st->channels);
+    ALLOC(pcm_buf, (total_buffer + frame_size)*st->channels, oac_res);
+    OAC_COPY(pcm_buf, &st->delay_buffer[(st->encoder_buffer - total_buffer)*st->channels], total_buffer*st->channels);
 
     if (st->mode == MODE_CELT_ONLY)
-       hp_freq_smth1 = silk_LSHIFT( silk_lin2log( VARIABLE_HP_MIN_CUTOFF_HZ ), 8 );
+        hp_freq_smth1 = silk_LSHIFT( silk_lin2log( VARIABLE_HP_MIN_CUTOFF_HZ ), 8 );
     else
-       hp_freq_smth1 = ((silk_encoder*)silk_enc)->state_Fxx[0].sCmn.variable_HP_smth1_Q15;
+        hp_freq_smth1 = ((silk_encoder*)silk_enc)->state_Fxx[0].sCmn.variable_HP_smth1_Q15;
 
     st->variable_HP_smth2_Q15 = silk_SMLAWB( st->variable_HP_smth2_Q15,
-          hp_freq_smth1 - st->variable_HP_smth2_Q15, SILK_FIX_CONST( VARIABLE_HP_SMTH_COEF2, 16 ) );
+          hp_freq_smth1 - st->variable_HP_smth2_Q15, SILK_FIX_CONST( VARIABLE_HP_SMTH_COEF2, 16 ));
 
     /* convert from log scale to Hertz */
-    cutoff_Hz = silk_log2lin( silk_RSHIFT( st->variable_HP_smth2_Q15, 8 ) );
+    cutoff_Hz = silk_log2lin( silk_RSHIFT( st->variable_HP_smth2_Q15, 8 ));
 
-    if (st->application == OAC_APPLICATION_VOIP)
-    {
-       hp_cutoff(pcm, cutoff_Hz, &pcm_buf[total_buffer*st->channels], st->hp_mem, frame_size, st->channels, st->Fs, st->arch);
+    if (st->application == OAC_APPLICATION_VOIP) {
+        hp_cutoff(pcm, cutoff_Hz, &pcm_buf[total_buffer*st->channels], st->hp_mem, frame_size, st->channels, st->Fs,
+        st->arch);
 
 #ifdef ENABLE_OSCE_TRAINING_DATA
-       /* write out high pass filtered clean signal*/
-       static FILE *fout =NULL;
-       if (fout == NULL)
-       {
-         fout = fopen("clean_hp.s16", "wb");
-       }
-
-       {
-         int idx;
-         oac_int16 tmp;
-         for (idx = 0; idx < frame_size; idx++)
-         {
-            tmp = (oac_int16) (32768 * pcm_buf[total_buffer + idx] + 0.5f);
-            fwrite(&tmp, sizeof(tmp), 1, fout);
-         }
-       }
+        /* write out high pass filtered clean signal*/
+        static FILE *fout = NULL;
+        if (fout == NULL) {
+            fout = fopen("clean_hp.s16", "wb");
+        }
+
+        {
+            int idx;
+            oac_int16 tmp;
+            for (idx = 0; idx < frame_size; idx++) {
+                tmp = (oac_int16) (32768*pcm_buf[total_buffer + idx] + 0.5f);
+                fwrite(&tmp, sizeof(tmp), 1, fout);
+            }
+        }
 #endif
     } else {
-       dc_reject(pcm, 3, &pcm_buf[total_buffer*st->channels], st->hp_mem, frame_size, st->channels, st->Fs);
+        dc_reject(pcm, 3, &pcm_buf[total_buffer*st->channels], st->hp_mem, frame_size, st->channels, st->Fs);
     }
 #ifndef FIXED_POINT
-    if (float_api)
-    {
-       oac_val32 sum;
-       sum = celt_inner_prod(&pcm_buf[total_buffer*st->channels], &pcm_buf[total_buffer*st->channels], frame_size*st->channels, st->arch);
-       /* This should filter out both NaNs and ridiculous signals that could
-          cause NaNs further down. */
-       if (!(sum < 1e9f) || celt_isnan(sum))
-       {
-          OAC_CLEAR(&pcm_buf[total_buffer*st->channels], frame_size*st->channels);
-          st->hp_mem[0] = st->hp_mem[1] = st->hp_mem[2] = st->hp_mem[3] = 0;
-       }
+    if (float_api) {
+        oac_val32 sum;
+        sum = celt_inner_prod(&pcm_buf[total_buffer*st->channels], &pcm_buf[total_buffer*st->channels],
+        frame_size*st->channels, st->arch);
+        /* This should filter out both NaNs and ridiculous signals that could
+           cause NaNs further down. */
+        if (!(sum < 1e9f) || celt_isnan(sum)) {
+            OAC_CLEAR(&pcm_buf[total_buffer*st->channels], frame_size*st->channels);
+            st->hp_mem[0] = st->hp_mem[1] = st->hp_mem[2] = st->hp_mem[3] = 0;
+        }
     }
 #else
     (void)float_api;
@@ -1990,14 +1883,15 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
 
 #ifdef ENABLE_DRED
     /* Compute the DRED features. Needs to be before SILK because of DTX. */
-    if ( st->dred_duration > 0 && st->dred_encoder.loaded ) {
+    if (st->dred_duration > 0 && st->dred_encoder.loaded) {
         int frame_size_400Hz;
         /* DRED Encoder */
-        dred_compute_latents( &st->dred_encoder, &pcm_buf[total_buffer*st->channels], frame_size, total_buffer, st->arch );
+        dred_compute_latents( &st->dred_encoder, &pcm_buf[total_buffer*st->channels], frame_size, total_buffer,
+        st->arch );
         frame_size_400Hz = frame_size*400/st->Fs;
-        OAC_MOVE(&st->activity_mem[frame_size_400Hz], st->activity_mem, 4*DRED_MAX_FRAMES-frame_size_400Hz);
-        for (i=0;i<frame_size_400Hz;i++)
-           st->activity_mem[i] = activity;
+        OAC_MOVE(&st->activity_mem[frame_size_400Hz], st->activity_mem, 4*DRED_MAX_FRAMES - frame_size_400Hz);
+        for (i = 0; i < frame_size_400Hz; i++)
+            st->activity_mem[i] = activity;
     } else {
         st->dred_encoder.latents_buffer_fill = 0;
         OAC_CLEAR(st->activity_mem, 4*DRED_MAX_FRAMES);
@@ -2006,23 +1900,21 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
 
     /* SILK processing */
     HB_gain = Q15ONE;
-    if (st->mode != MODE_CELT_ONLY)
-    {
+    if (st->mode != MODE_CELT_ONLY) {
         oac_int32 total_bitRate, celt_rate;
         const oac_res *pcm_silk;
 
         /* Distribute bits between SILK and CELT */
         total_bitRate = bits_to_bitrate(bits_target, st->Fs, frame_size);
-        if( st->mode == MODE_HYBRID ) {
+        if (st->mode == MODE_HYBRID) {
             /* Base rate for SILK */
             st->silk_mode.bitRate = compute_silk_rate_for_hybrid(total_bitRate,
-                  curr_bandwidth, st->Fs == 50 * frame_size, st->use_vbr, st->silk_mode.LBRR_coded,
+                  curr_bandwidth, st->Fs == 50*frame_size, st->use_vbr, st->silk_mode.LBRR_coded,
                   st->stream_channels);
-            if (!st->energy_masking)
-            {
-               /* Increasingly attenuate high band when it gets allocated fewer bits */
-               celt_rate = total_bitRate - st->silk_mode.bitRate;
-               HB_gain = Q15ONE - SHR32(celt_exp2(-celt_rate * QCONST16(1.f/1024, 10)), 1);
+            if (!st->energy_masking) {
+                /* Increasingly attenuate high band when it gets allocated fewer bits */
+                celt_rate = total_bitRate - st->silk_mode.bitRate;
+                HB_gain = Q15ONE - SHR32(celt_exp2(-celt_rate*QCONST16(1.f/1024, 10)), 1);
             }
         } else {
             /* SILK gets all bits */
@@ -2030,48 +1922,43 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
         }
 
         /* Surround masking for SILK */
-        if (st->energy_masking && st->use_vbr && !st->lfe)
-        {
-           oac_val32 mask_sum=0;
-           celt_glog masking_depth;
-           oac_int32 rate_offset;
-           int c;
-           int end = 17;
-           oac_int16 srate = 16000;
-           if (st->bandwidth == OAC_BANDWIDTH_NARROWBAND)
-           {
-              end = 13;
-              srate = 8000;
-           } else if (st->bandwidth == OAC_BANDWIDTH_MEDIUMBAND)
-           {
-              end = 15;
-              srate = 12000;
-           }
-           for (c=0;c<st->channels;c++)
-           {
-              for(i=0;i<end;i++)
-              {
-                 celt_glog mask;
-                 mask = MAXG(MING(st->energy_masking[21*c+i],
+        if (st->energy_masking && st->use_vbr && !st->lfe) {
+            oac_val32 mask_sum = 0;
+            celt_glog masking_depth;
+            oac_int32 rate_offset;
+            int c;
+            int end = 17;
+            oac_int16 srate = 16000;
+            if (st->bandwidth == OAC_BANDWIDTH_NARROWBAND) {
+                end = 13;
+                srate = 8000;
+            } else if (st->bandwidth == OAC_BANDWIDTH_MEDIUMBAND) {
+                end = 15;
+                srate = 12000;
+            }
+            for (c = 0; c < st->channels; c++) {
+                for (i = 0; i < end; i++) {
+                    celt_glog mask;
+                    mask = MAXG(MING(st->energy_masking[21*c + i],
                         GCONST(.5f)), -GCONST(2.0f));
-                 if (mask > 0)
-                    mask = HALF32(mask);
-                 mask_sum += mask;
-              }
-           }
-           /* Conservative rate reduction, we cut the masking in half */
-           masking_depth = mask_sum / end*st->channels;
-           masking_depth += GCONST(.2f);
-           rate_offset = (oac_int32)PSHR32(MULT16_16(srate, SHR32(masking_depth, DB_SHIFT-10)), 10);
-           rate_offset = MAX32(rate_offset, -2*st->silk_mode.bitRate/3);
-           /* Split the rate change between the SILK and CELT part for hybrid. */
-           if (st->bandwidth==OAC_BANDWIDTH_SUPERWIDEBAND || st->bandwidth==OAC_BANDWIDTH_FULLBAND)
-              st->silk_mode.bitRate += 3*rate_offset/5;
-           else
-              st->silk_mode.bitRate += rate_offset;
-        }
-
-        st->silk_mode.payloadSize_ms = 1000 * frame_size / st->Fs;
+                    if (mask > 0)
+                        mask = HALF32(mask);
+                    mask_sum += mask;
+                }
+            }
+            /* Conservative rate reduction, we cut the masking in half */
+            masking_depth = mask_sum/end*st->channels;
+            masking_depth += GCONST(.2f);
+            rate_offset = (oac_int32)PSHR32(MULT16_16(srate, SHR32(masking_depth, DB_SHIFT - 10)), 10);
+            rate_offset = MAX32(rate_offset, -2*st->silk_mode.bitRate/3);
+            /* Split the rate change between the SILK and CELT part for hybrid. */
+            if (st->bandwidth == OAC_BANDWIDTH_SUPERWIDEBAND || st->bandwidth == OAC_BANDWIDTH_FULLBAND)
+                st->silk_mode.bitRate += 3*rate_offset/5;
+            else
+                st->silk_mode.bitRate += rate_offset;
+        }
+
+        st->silk_mode.payloadSize_ms = 1000*frame_size/st->Fs;
         st->silk_mode.nChannelsAPI = st->channels;
         st->silk_mode.nChannelsInternal = st->stream_channels;
         if (curr_bandwidth == OAC_BANDWIDTH_NARROWBAND) {
@@ -2082,7 +1969,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
             celt_assert( st->mode == MODE_HYBRID || curr_bandwidth == OAC_BANDWIDTH_WIDEBAND );
             st->silk_mode.desiredInternalSampleRate = 16000;
         }
-        if( st->mode == MODE_HYBRID ) {
+        if (st->mode == MODE_HYBRID) {
             /* Don't allow bandwidth reduction at lowest bitrates in hybrid mode */
             st->silk_mode.minInternalSampleRate = 16000;
         } else {
@@ -2090,24 +1977,21 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
         }
 
         st->silk_mode.maxInternalSampleRate = 16000;
-        if (st->mode == MODE_SILK_ONLY)
-        {
-           oac_int32 effective_max_rate = bits_to_bitrate(max_data_bytes*8, st->Fs, frame_size);
-           if (frame_rate > 50)
-              effective_max_rate = effective_max_rate*2/3;
-           if (effective_max_rate < 8000)
-           {
-              st->silk_mode.maxInternalSampleRate = 12000;
-              st->silk_mode.desiredInternalSampleRate = IMIN(12000, st->silk_mode.desiredInternalSampleRate);
-           }
-           if (effective_max_rate < 7000)
-           {
-              st->silk_mode.maxInternalSampleRate = 8000;
-              st->silk_mode.desiredInternalSampleRate = IMIN(8000, st->silk_mode.desiredInternalSampleRate);
-           }
+        if (st->mode == MODE_SILK_ONLY) {
+            oac_int32 effective_max_rate = bits_to_bitrate(max_data_bytes*8, st->Fs, frame_size);
+            if (frame_rate > 50)
+                effective_max_rate = effective_max_rate*2/3;
+            if (effective_max_rate < 8000) {
+                st->silk_mode.maxInternalSampleRate = 12000;
+                st->silk_mode.desiredInternalSampleRate = IMIN(12000, st->silk_mode.desiredInternalSampleRate);
+            }
+            if (effective_max_rate < 7000) {
+                st->silk_mode.maxInternalSampleRate = 8000;
+                st->silk_mode.desiredInternalSampleRate = IMIN(8000, st->silk_mode.desiredInternalSampleRate);
+            }
 #ifdef ENABLE_QEXT
-           /* At 96 kHz, we don't have the input resampler to do 8 or 12 kHz. */
-           if (st->Fs==96000) st->silk_mode.maxInternalSampleRate = st->silk_mode.desiredInternalSampleRate = 16000;
+            /* At 96 kHz, we don't have the input resampler to do 8 or 12 kHz. */
+            if (st->Fs == 96000) st->silk_mode.maxInternalSampleRate = st->silk_mode.desiredInternalSampleRate = 16000;
 #endif
         }
 
@@ -2116,45 +2000,41 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
         /* Call SILK encoder for the low band */
 
         /* Max bits for SILK, counting ToC, redundancy bytes, and optionally redundancy. */
-        st->silk_mode.maxBits = (max_data_bytes-1)*8;
-        if (redundancy && redundancy_bytes >= 2)
-        {
-           /* Counting 1 bit for redundancy position and 20 bits for flag+size (only for hybrid). */
-           st->silk_mode.maxBits -= redundancy_bytes*8 + 1;
-           if (st->mode == MODE_HYBRID)
-              st->silk_mode.maxBits -= 20;
+        st->silk_mode.maxBits = (max_data_bytes - 1)*8;
+        if (redundancy && redundancy_bytes >= 2) {
+            /* Counting 1 bit for redundancy position and 20 bits for flag+size (only for hybrid). */
+            st->silk_mode.maxBits -= redundancy_bytes*8 + 1;
+            if (st->mode == MODE_HYBRID)
+                st->silk_mode.maxBits -= 20;
         }
-        if (st->silk_mode.useCBR)
-        {
-           /* When we're in CBR mode, but we have non-SILK data to encode, switch SILK to VBR with cap to
-              save on complexity. Any variations will be absorbed by CELT and/or DRED and we can still
-              produce a constant bitrate without wasting bits. */
+        if (st->silk_mode.useCBR) {
+            /* When we're in CBR mode, but we have non-SILK data to encode, switch SILK to VBR with cap to
+               save on complexity. Any variations will be absorbed by CELT and/or DRED and we can still
+               produce a constant bitrate without wasting bits. */
 #ifdef ENABLE_DRED
-           if (st->mode == MODE_HYBRID || dred_bitrate_bps > 0)
+            if (st->mode == MODE_HYBRID || dred_bitrate_bps > 0)
 #else
-           if (st->mode == MODE_HYBRID)
+            if (st->mode == MODE_HYBRID)
 #endif
-           {
-              /* Allow SILK to steal up to 25% of the remaining bits */
-              oac_int16 other_bits = IMAX(0, st->silk_mode.maxBits - st->silk_mode.bitRate * frame_size / st->Fs);
-              st->silk_mode.maxBits = IMAX(0, st->silk_mode.maxBits - other_bits*3/4);
-              st->silk_mode.useCBR = 0;
-           }
+            {
+                /* Allow SILK to steal up to 25% of the remaining bits */
+                oac_int16 other_bits = IMAX(0, st->silk_mode.maxBits - st->silk_mode.bitRate*frame_size/st->Fs);
+                st->silk_mode.maxBits = IMAX(0, st->silk_mode.maxBits - other_bits*3/4);
+                st->silk_mode.useCBR = 0;
+            }
         } else {
-           /* Constrained VBR. */
-           if (st->mode == MODE_HYBRID)
-           {
-              /* Compute SILK bitrate corresponding to the max total bits available */
-              oac_int32 maxBitRate = compute_silk_rate_for_hybrid(st->silk_mode.maxBits*st->Fs / frame_size,
-                    curr_bandwidth, st->Fs == 50 * frame_size, st->use_vbr, st->silk_mode.LBRR_coded,
+            /* Constrained VBR. */
+            if (st->mode == MODE_HYBRID) {
+                /* Compute SILK bitrate corresponding to the max total bits available */
+                oac_int32 maxBitRate = compute_silk_rate_for_hybrid(st->silk_mode.maxBits*st->Fs/frame_size,
+                    curr_bandwidth, st->Fs == 50*frame_size, st->use_vbr, st->silk_mode.LBRR_coded,
                     st->stream_channels);
-              st->silk_mode.maxBits = bitrate_to_bits(maxBitRate, st->Fs, frame_size);
-           }
+                st->silk_mode.maxBits = bitrate_to_bits(maxBitRate, st->Fs, frame_size);
+            }
         }
 
-        if (prefill && st->application != OAC_APPLICATION_RESTRICTED_SILK)
-        {
-            oac_int32 zero=0;
+        if (prefill && st->application != OAC_APPLICATION_RESTRICTED_SILK) {
+            oac_int32 zero = 0;
             int prefill_offset;
             /* Use a smooth onset for the SILK prefill to avoid the encoder trying to encode
                a discontinuity. The exact location is what we need to avoid leaving any "gap"
@@ -2162,8 +2042,8 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
                overwrite st->delay_buffer because the only thing that uses it before it gets
                rewritten is tmp_prefill[] and even then only the part after the ramp really
                gets used (rather than sent to the encoder and discarded) */
-            prefill_offset = st->channels*(st->encoder_buffer-st->delay_compensation-st->Fs/400);
-            gain_fade(st->delay_buffer+prefill_offset, st->delay_buffer+prefill_offset,
+            prefill_offset = st->channels*(st->encoder_buffer - st->delay_compensation - st->Fs/400);
+            gain_fade(st->delay_buffer + prefill_offset, st->delay_buffer + prefill_offset,
                   0, Q15ONE, celt_mode->overlap, st->Fs/400, st->channels, celt_mode->window, st->Fs);
             OAC_CLEAR(st->delay_buffer, prefill_offset);
             pcm_silk = st->delay_buffer;
@@ -2172,23 +2052,23 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
             st->silk_mode.oacCanSwitch = 0;
         }
 
-        pcm_silk = pcm_buf+total_buffer*st->channels;
+        pcm_silk = pcm_buf + total_buffer*st->channels;
         ret = silk_Encode( silk_enc, &st->silk_mode, pcm_silk, frame_size, &enc, &nBytes, 0, activity );
-        if( ret ) {
+        if (ret) {
             /*fprintf (stderr, "SILK encode error: %d\n", ret);*/
             /* Handle error */
-           RESTORE_STACK;
-           return OAC_INTERNAL_ERROR;
+            RESTORE_STACK;
+            return OAC_INTERNAL_ERROR;
         }
 
         /* Extract SILK internal bandwidth for signaling in first byte */
-        if( st->mode == MODE_SILK_ONLY ) {
-            if( st->silk_mode.internalSampleRate == 8000 ) {
-               curr_bandwidth = OAC_BANDWIDTH_NARROWBAND;
-            } else if( st->silk_mode.internalSampleRate == 12000 ) {
-               curr_bandwidth = OAC_BANDWIDTH_MEDIUMBAND;
-            } else if( st->silk_mode.internalSampleRate == 16000 ) {
-               curr_bandwidth = OAC_BANDWIDTH_WIDEBAND;
+        if (st->mode == MODE_SILK_ONLY) {
+            if (st->silk_mode.internalSampleRate == 8000) {
+                curr_bandwidth = OAC_BANDWIDTH_NARROWBAND;
+            } else if (st->silk_mode.internalSampleRate == 12000) {
+                curr_bandwidth = OAC_BANDWIDTH_MEDIUMBAND;
+            } else if (st->silk_mode.internalSampleRate == 16000) {
+                curr_bandwidth = OAC_BANDWIDTH_WIDEBAND;
             }
         } else {
             celt_assert( st->silk_mode.internalSampleRate == 16000 );
@@ -2197,40 +2077,36 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
         st->silk_mode.oacCanSwitch = st->silk_mode.switchReady && !st->nonfinal_frame;
 
         if (activity == VAD_NO_DECISION) {
-           activity = (st->silk_mode.signalType != TYPE_NO_VOICE_ACTIVITY);
+            activity = (st->silk_mode.signalType != TYPE_NO_VOICE_ACTIVITY);
 #ifdef ENABLE_DRED
-           for (i=0;i<frame_size*400/st->Fs;i++)
-              st->activity_mem[i] = activity;
+            for (i = 0; i < frame_size*400/st->Fs; i++)
+                st->activity_mem[i] = activity;
 #endif
         }
-        if (nBytes==0)
-        {
-           st->rangeFinal = 0;
-           data[-1] = gen_toc(st->mode, st->Fs/frame_size, curr_bandwidth, st->stream_channels);
-           RESTORE_STACK;
-           return 1;
+        if (nBytes == 0) {
+            st->rangeFinal = 0;
+            data[-1] = gen_toc(st->mode, st->Fs/frame_size, curr_bandwidth, st->stream_channels);
+            RESTORE_STACK;
+            return 1;
         }
 
         /* FIXME: How do we allocate the redundancy for CBR? */
-        if (st->silk_mode.oacCanSwitch)
-        {
-           if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
-           {
-              redundancy_bytes = compute_redundancy_bytes(max_data_bytes, st->bitrate_bps, frame_rate, st->stream_channels);
-              redundancy = (redundancy_bytes != 0);
-           }
-           celt_to_silk = 0;
-           st->silk_bw_switch = 1;
+        if (st->silk_mode.oacCanSwitch) {
+            if (st->application != OAC_APPLICATION_RESTRICTED_SILK) {
+                redundancy_bytes = compute_redundancy_bytes(max_data_bytes, st->bitrate_bps, frame_rate,
+                st->stream_channels);
+                redundancy = (redundancy_bytes != 0);
+            }
+            celt_to_silk = 0;
+            st->silk_bw_switch = 1;
         }
     }
 
     /* CELT processing */
-    if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
-    {
-        int endband=21;
+    if (st->application != OAC_APPLICATION_RESTRICTED_SILK) {
+        int endband = 21;
 
-        switch(curr_bandwidth)
-        {
+        switch (curr_bandwidth) {
             case OAC_BANDWIDTH_NARROWBAND:
                 endband = 13;
                 break;
@@ -2249,62 +2125,60 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
         celt_encoder_ctl(celt_enc, CELT_SET_CHANNELS(st->stream_channels));
         celt_encoder_ctl(celt_enc, OAC_SET_BITRATE(OAC_BITRATE_MAX));
     }
-    if (st->mode != MODE_SILK_ONLY)
-    {
-        oac_val32 celt_pred=2;
+    if (st->mode != MODE_SILK_ONLY) {
+        oac_val32 celt_pred = 2;
         /* We may still decide to disable prediction later */
         if (st->silk_mode.reducedDependency)
-           celt_pred = 0;
+            celt_pred = 0;
         celt_encoder_ctl(celt_enc, CELT_SET_PREDICTION(celt_pred));
     }
 
     ALLOC(tmp_prefill, st->channels*st->Fs/400, oac_res);
     if (st->mode != MODE_SILK_ONLY && st->mode != st->prev_mode && st->prev_mode > 0
-          && st->application != OAC_APPLICATION_RESTRICTED_CELT)
-    {
-       OAC_COPY(tmp_prefill, &st->delay_buffer[(st->encoder_buffer-total_buffer-st->Fs/400)*st->channels], st->channels*st->Fs/400);
+        && st->application != OAC_APPLICATION_RESTRICTED_CELT) {
+        OAC_COPY(tmp_prefill, &st->delay_buffer[(st->encoder_buffer - total_buffer - st->Fs/400)*st->channels],
+        st->channels*st->Fs/400);
     }
 
-    if (st->channels*(st->encoder_buffer-(frame_size+total_buffer)) > 0)
-    {
-       OAC_MOVE(st->delay_buffer, &st->delay_buffer[st->channels*frame_size], st->channels*(st->encoder_buffer-frame_size-total_buffer));
-       OAC_COPY(&st->delay_buffer[st->channels*(st->encoder_buffer-frame_size-total_buffer)],
+    if (st->channels*(st->encoder_buffer - (frame_size + total_buffer)) > 0) {
+        OAC_MOVE(st->delay_buffer, &st->delay_buffer[st->channels*frame_size],
+        st->channels*(st->encoder_buffer - frame_size - total_buffer));
+        OAC_COPY(&st->delay_buffer[st->channels*(st->encoder_buffer - frame_size - total_buffer)],
              &pcm_buf[0],
-             (frame_size+total_buffer)*st->channels);
+            (frame_size + total_buffer)*st->channels);
     } else {
-       OAC_COPY(st->delay_buffer, &pcm_buf[(frame_size+total_buffer-st->encoder_buffer)*st->channels], st->encoder_buffer*st->channels);
+        OAC_COPY(st->delay_buffer, &pcm_buf[(frame_size + total_buffer - st->encoder_buffer)*st->channels],
+        st->encoder_buffer*st->channels);
     }
     /* gain_fade() and stereo_fade() need to be after the buffer copying
        because we don't want any of this to affect the SILK part */
-    if( ( st->prev_HB_gain < Q15ONE || HB_gain < Q15ONE ) && celt_mode != NULL ) {
-       gain_fade(pcm_buf, pcm_buf,
+    if ((st->prev_HB_gain < Q15ONE || HB_gain < Q15ONE) && celt_mode != NULL) {
+        gain_fade(pcm_buf, pcm_buf,
              st->prev_HB_gain, HB_gain, celt_mode->overlap, frame_size, st->channels, celt_mode->window, st->Fs);
     }
     st->prev_HB_gain = HB_gain;
-    if (st->mode != MODE_HYBRID || st->stream_channels==1)
-    {
-       if (equiv_rate > 32000)
-          st->silk_mode.stereoWidth_Q14 = 16384;
-       else if (equiv_rate < 16000)
-          st->silk_mode.stereoWidth_Q14 = 0;
-       else
-          st->silk_mode.stereoWidth_Q14 = 16384 - 2048*(oac_int32)(32000-equiv_rate)/(equiv_rate-14000);
-    }
-    if( !st->energy_masking && st->channels == 2 ) {
+    if (st->mode != MODE_HYBRID || st->stream_channels == 1) {
+        if (equiv_rate > 32000)
+            st->silk_mode.stereoWidth_Q14 = 16384;
+        else if (equiv_rate < 16000)
+            st->silk_mode.stereoWidth_Q14 = 0;
+        else
+            st->silk_mode.stereoWidth_Q14 = 16384 - 2048*(oac_int32)(32000 - equiv_rate)/(equiv_rate - 14000);
+    }
+    if (!st->energy_masking && st->channels == 2) {
         /* Apply stereo width reduction (at low bitrates) */
-        if( st->hybrid_stereo_width_Q14 < (1 << 14) || st->silk_mode.stereoWidth_Q14 < (1 << 14) ) {
+        if (st->hybrid_stereo_width_Q14 < (1<<14) || st->silk_mode.stereoWidth_Q14 < (1<<14)) {
             oac_val16 g1, g2;
             g1 = st->hybrid_stereo_width_Q14;
             g2 = (oac_val16)(st->silk_mode.stereoWidth_Q14);
 #ifdef FIXED_POINT
-            g1 = g1==16384 ? Q15ONE : SHL16(g1,1);
-            g2 = g2==16384 ? Q15ONE : SHL16(g2,1);
+            g1 = g1 == 16384 ? Q15ONE : SHL16(g1, 1);
+            g2 = g2 == 16384 ? Q15ONE : SHL16(g2, 1);
 #else
             g1 *= (1.f/16384);
             g2 *= (1.f/16384);
 #endif
-            if ( celt_mode != NULL )
-            {
+            if (celt_mode != NULL) {
                 stereo_fade(pcm_buf, pcm_buf, g1, g2, celt_mode->overlap,
                      frame_size, st->channels, celt_mode->window, st->Fs);
             }
@@ -2312,58 +2186,51 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
         }
     }
 
-    if ( st->mode != MODE_CELT_ONLY && ec_tell(&enc)+17+20*(st->mode == MODE_HYBRID) <= 8*(max_data_bytes-1))
-    {
+    if (st->mode != MODE_CELT_ONLY && ec_tell(&enc) + 17 + 20*(st->mode == MODE_HYBRID) <= 8*(max_data_bytes - 1)) {
         /* For SILK mode, the redundancy is inferred from the length */
         if (st->mode == MODE_HYBRID)
-           ec_enc_bit_logp(&enc, redundancy, 12);
-        if (redundancy)
-        {
+            ec_enc_bit_logp(&enc, redundancy, 12);
+        if (redundancy) {
             int max_redundancy;
             ec_enc_bit_logp(&enc, celt_to_silk, 1);
-            if (st->mode == MODE_HYBRID)
-            {
-               /* Reserve the 8 bits needed for the redundancy length,
-                  and at least a few bits for CELT if possible */
-               max_redundancy = (max_data_bytes-1)-((ec_tell(&enc)+8+3+7)>>3);
-            }
-            else
-               max_redundancy = (max_data_bytes-1)-((ec_tell(&enc)+7)>>3);
+            if (st->mode == MODE_HYBRID) {
+                /* Reserve the 8 bits needed for the redundancy length,
+                   and at least a few bits for CELT if possible */
+                max_redundancy = (max_data_bytes - 1) - ((ec_tell(&enc) + 8 + 3 + 7)>>3);
+            } else
+                max_redundancy = (max_data_bytes - 1) - ((ec_tell(&enc) + 7)>>3);
             /* Target the same bit-rate for redundancy as for the rest,
                up to a max of 257 bytes */
             redundancy_bytes = IMIN(max_redundancy, redundancy_bytes);
             redundancy_bytes = IMIN(257, IMAX(2, redundancy_bytes));
             if (st->mode == MODE_HYBRID)
-                ec_enc_uint(&enc, redundancy_bytes-2, 256);
+                ec_enc_uint(&enc, redundancy_bytes - 2, 256);
         }
     } else {
         redundancy = 0;
     }
 
-    if (!redundancy)
-    {
-       st->silk_bw_switch = 0;
-       redundancy_bytes = 0;
+    if (!redundancy) {
+        st->silk_bw_switch = 0;
+        redundancy_bytes = 0;
     }
-    if (st->mode != MODE_CELT_ONLY)start_band=17;
+    if (st->mode != MODE_CELT_ONLY)start_band = 17;
 
-    if (st->mode == MODE_SILK_ONLY)
-    {
-        ret = (ec_tell(&enc)+7)>>3;
+    if (st->mode == MODE_SILK_ONLY) {
+        ret = (ec_tell(&enc) + 7)>>3;
         ec_enc_done(&enc);
         nb_compr_bytes = ret;
     } else {
-        nb_compr_bytes = (max_data_bytes-1)-redundancy_bytes;
+        nb_compr_bytes = (max_data_bytes - 1) - redundancy_bytes;
 #ifdef ENABLE_DRED
-        if (st->dred_duration > 0)
-        {
+        if (st->dred_duration > 0) {
             int max_celt_bytes;
             oac_int32 dred_bytes = bitrate_to_bits(dred_bitrate_bps, st->Fs, frame_size)/8;
             /* Allow CELT to steal up to 25% of the remaining bits. */
             max_celt_bytes = nb_compr_bytes - dred_bytes*3/4;
             /* But try to give CELT at least 5 bytes to prevent a mismatch with
                the redundancy signaling. */
-            max_celt_bytes = IMAX((ec_tell(&enc)+7)/8 + 5, max_celt_bytes);
+            max_celt_bytes = IMAX((ec_tell(&enc) + 7)/8 + 5, max_celt_bytes);
             /* Subject to the original max. */
             nb_compr_bytes = IMIN(nb_compr_bytes, max_celt_bytes);
         }
@@ -2373,48 +2240,43 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
 
 #ifndef DISABLE_FLOAT_API
     if (redundancy || st->mode != MODE_SILK_ONLY)
-       celt_encoder_ctl(celt_enc, CELT_SET_ANALYSIS(analysis_info));
+        celt_encoder_ctl(celt_enc, CELT_SET_ANALYSIS(analysis_info));
 #endif
     if (st->mode == MODE_HYBRID) {
-       SILKInfo info;
-       info.signalType = st->silk_mode.signalType;
-       info.offset = st->silk_mode.offset;
-       celt_encoder_ctl(celt_enc, CELT_SET_SILK_INFO(&info));
+        SILKInfo info;
+        info.signalType = st->silk_mode.signalType;
+        info.offset = st->silk_mode.offset;
+        celt_encoder_ctl(celt_enc, CELT_SET_SILK_INFO(&info));
     }
 
     /* 5 ms redundant frame for CELT->SILK */
-    if (redundancy && celt_to_silk)
-    {
+    if (redundancy && celt_to_silk) {
         int err;
         celt_encoder_ctl(celt_enc, CELT_SET_START_BAND(0));
         celt_encoder_ctl(celt_enc, OAC_SET_VBR(0));
         celt_encoder_ctl(celt_enc, OAC_SET_BITRATE(OAC_BITRATE_MAX));
-        err = celt_encode_with_ec(celt_enc, pcm_buf, st->Fs/200, data+nb_compr_bytes, redundancy_bytes, NULL);
-        if (err < 0)
-        {
-           RESTORE_STACK;
-           return OAC_INTERNAL_ERROR;
+        err = celt_encode_with_ec(celt_enc, pcm_buf, st->Fs/200, data + nb_compr_bytes, redundancy_bytes, NULL);
+        if (err < 0) {
+            RESTORE_STACK;
+            return OAC_INTERNAL_ERROR;
         }
         celt_encoder_ctl(celt_enc, OAC_GET_FINAL_RANGE(&redundant_rng));
         celt_encoder_ctl(celt_enc, OAC_RESET_STATE);
     }
 
     if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
-       celt_encoder_ctl(celt_enc, CELT_SET_START_BAND(start_band));
+        celt_encoder_ctl(celt_enc, CELT_SET_START_BAND(start_band));
 
     data[-1] = 0;
-    if (st->mode != MODE_SILK_ONLY)
-    {
+    if (st->mode != MODE_SILK_ONLY) {
         celt_encoder_ctl(celt_enc, OAC_SET_VBR(st->use_vbr));
-        if (st->mode == MODE_HYBRID)
-        {
-            if( st->use_vbr ) {
-                celt_encoder_ctl(celt_enc, OAC_SET_BITRATE(st->bitrate_bps-st->silk_mode.bitRate));
+        if (st->mode == MODE_HYBRID) {
+            if (st->use_vbr) {
+                celt_encoder_ctl(celt_enc, OAC_SET_BITRATE(st->bitrate_bps - st->silk_mode.bitRate));
                 celt_encoder_ctl(celt_enc, OAC_SET_VBR_CONSTRAINT(0));
             }
         } else {
-            if (st->use_vbr)
-            {
+            if (st->use_vbr) {
                 celt_encoder_ctl(celt_enc, OAC_SET_VBR(1));
                 celt_encoder_ctl(celt_enc, OAC_SET_VBR_CONSTRAINT(st->vbr_constraint));
                 celt_encoder_ctl(celt_enc, OAC_SET_BITRATE(st->bitrate_bps));
@@ -2422,8 +2284,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
         }
 #ifdef ENABLE_DRED
         /* When Using DRED CBR, we can actually make the CELT part VBR and have DRED pick up the slack. */
-        if (!st->use_vbr && st->dred_duration > 0)
-        {
+        if (!st->use_vbr && st->dred_duration > 0) {
             oac_int32 celt_bitrate = st->bitrate_bps;
             celt_encoder_ctl(celt_enc, OAC_SET_VBR(1));
             celt_encoder_ctl(celt_enc, OAC_SET_VBR_CONSTRAINT(0));
@@ -2433,39 +2294,34 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
             celt_encoder_ctl(celt_enc, OAC_SET_BITRATE(celt_bitrate));
         }
 #endif
-        if (st->mode != st->prev_mode && st->prev_mode > 0 && st->application != OAC_APPLICATION_RESTRICTED_CELT)
-        {
-           unsigned char dummy[2];
-           celt_encoder_ctl(celt_enc, OAC_RESET_STATE);
+        if (st->mode != st->prev_mode && st->prev_mode > 0 && st->application != OAC_APPLICATION_RESTRICTED_CELT) {
+            unsigned char dummy[2];
+            celt_encoder_ctl(celt_enc, OAC_RESET_STATE);
 
-           /* Prefilling */
-           celt_encode_with_ec(celt_enc, tmp_prefill, st->Fs/400, dummy, 2, NULL);
-           celt_encoder_ctl(celt_enc, CELT_SET_PREDICTION(0));
+            /* Prefilling */
+            celt_encode_with_ec(celt_enc, tmp_prefill, st->Fs/400, dummy, 2, NULL);
+            celt_encoder_ctl(celt_enc, CELT_SET_PREDICTION(0));
         }
         /* If false, we already busted the budget and we'll end up with a "PLC frame" */
-        if (ec_tell(&enc) <= 8*nb_compr_bytes)
-        {
-           ret = celt_encode_with_ec(celt_enc, pcm_buf, frame_size, NULL, nb_compr_bytes, &enc);
-           if (ret < 0)
-           {
-              RESTORE_STACK;
-              return OAC_INTERNAL_ERROR;
-           }
-           /* Put CELT->SILK redundancy data in the right place. */
-           if (redundancy && celt_to_silk && st->mode==MODE_HYBRID && nb_compr_bytes != ret)
-           {
-              OAC_MOVE(data+ret, data+nb_compr_bytes, redundancy_bytes);
-              nb_compr_bytes = ret+redundancy_bytes;
-           }
+        if (ec_tell(&enc) <= 8*nb_compr_bytes) {
+            ret = celt_encode_with_ec(celt_enc, pcm_buf, frame_size, NULL, nb_compr_bytes, &enc);
+            if (ret < 0) {
+                RESTORE_STACK;
+                return OAC_INTERNAL_ERROR;
+            }
+            /* Put CELT->SILK redundancy data in the right place. */
+            if (redundancy && celt_to_silk && st->mode == MODE_HYBRID && nb_compr_bytes != ret) {
+                OAC_MOVE(data + ret, data + nb_compr_bytes, redundancy_bytes);
+                nb_compr_bytes = ret + redundancy_bytes;
+            }
         }
         celt_encoder_ctl(celt_enc, OAC_GET_FINAL_RANGE(&st->rangeFinal));
     } else {
-       st->rangeFinal = enc.rng;
+        st->rangeFinal = enc.rng;
     }
 
     /* 5 ms redundant frame for SILK->CELT */
-    if (redundancy && !celt_to_silk)
-    {
+    if (redundancy && !celt_to_silk) {
         int err;
         unsigned char dummy[2];
         int N2, N4;
@@ -2478,20 +2334,19 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
         celt_encoder_ctl(celt_enc, OAC_SET_VBR(0));
         celt_encoder_ctl(celt_enc, OAC_SET_BITRATE(OAC_BITRATE_MAX));
 
-        if (st->mode == MODE_HYBRID)
-        {
-           /* Shrink packet to what the encoder actually used. */
-           nb_compr_bytes = ret;
-           ec_enc_shrink(&enc, nb_compr_bytes);
+        if (st->mode == MODE_HYBRID) {
+            /* Shrink packet to what the encoder actually used. */
+            nb_compr_bytes = ret;
+            ec_enc_shrink(&enc, nb_compr_bytes);
         }
         /* NOTE: We could speed this up slightly (at the expense of code size) by just adding a function that prefills the buffer */
-        celt_encode_with_ec(celt_enc, pcm_buf+st->channels*(frame_size-N2-N4), N4, dummy, 2, NULL);
+        celt_encode_with_ec(celt_enc, pcm_buf + st->channels*(frame_size - N2 - N4), N4, dummy, 2, NULL);
 
-        err = celt_encode_with_ec(celt_enc, pcm_buf+st->channels*(frame_size-N2), N2, data+nb_compr_bytes, redundancy_bytes, NULL);
-        if (err < 0)
-        {
-           RESTORE_STACK;
-           return OAC_INTERNAL_ERROR;
+        err = celt_encode_with_ec(celt_enc, pcm_buf + st->channels*(frame_size - N2), N2, data + nb_compr_bytes,
+        redundancy_bytes, NULL);
+        if (err < 0) {
+            RESTORE_STACK;
+            return OAC_INTERNAL_ERROR;
         }
         celt_encoder_ctl(celt_enc, OAC_GET_FINAL_RANGE(&redundant_rng));
     }
@@ -2514,95 +2369,88 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
     st->first = 0;
 
     /* DTX decision */
-    if (st->use_dtx && !st->silk_mode.useDTX)
-    {
-       if (decide_dtx_mode(activity, &st->nb_no_activity_ms_Q1, 2*1000*frame_size/st->Fs))
-       {
-          st->rangeFinal = 0;
-          data[0] = gen_toc(st->mode, st->Fs/frame_size, curr_bandwidth, st->stream_channels);
-          RESTORE_STACK;
-          return 1;
-       }
+    if (st->use_dtx && !st->silk_mode.useDTX) {
+        if (decide_dtx_mode(activity, &st->nb_no_activity_ms_Q1, 2*1000*frame_size/st->Fs)) {
+            st->rangeFinal = 0;
+            data[0] = gen_toc(st->mode, st->Fs/frame_size, curr_bandwidth, st->stream_channels);
+            RESTORE_STACK;
+            return 1;
+        }
     } else {
-       st->nb_no_activity_ms_Q1 = 0;
+        st->nb_no_activity_ms_Q1 = 0;
     }
 
     /* In the unlikely case that the SILK encoder busted its target, tell
        the decoder to call the PLC */
-    if (ec_tell(&enc) > (max_data_bytes-1)*8)
-    {
-       if (max_data_bytes < 2)
-       {
-          RESTORE_STACK;
-          return OAC_BUFFER_TOO_SMALL;
-       }
-       data[1] = 0;
-       ret = 1;
-       st->rangeFinal = 0;
-    } else if (st->mode==MODE_SILK_ONLY&&!redundancy)
-    {
-       /*When in LPC only mode it's perfectly
-         reasonable to strip off trailing zero bytes as
-         the required range decoder behavior is to
-         fill these in. This can't be done when the MDCT
-         modes are used because the decoder needs to know
-         the actual length for allocation purposes.*/
-       while(ret>2&&data[ret]==0)ret--;
+    if (ec_tell(&enc) > (max_data_bytes - 1)*8) {
+        if (max_data_bytes < 2) {
+            RESTORE_STACK;
+            return OAC_BUFFER_TOO_SMALL;
+        }
+        data[1] = 0;
+        ret = 1;
+        st->rangeFinal = 0;
+    } else if (st->mode == MODE_SILK_ONLY && !redundancy) {
+        /*When in LPC only mode it's perfectly
+           reasonable to strip off trailing zero bytes as
+           the required range decoder behavior is to
+           fill these in. This can't be done when the MDCT
+           modes are used because the decoder needs to know
+           the actual length for allocation purposes.*/
+        while (ret > 2 && data[ret] == 0) ret--;
     }
     /* Count ToC and redundancy */
-    ret += 1+redundancy_bytes;
+    ret += 1 + redundancy_bytes;
     apply_padding = !st->use_vbr;
 #ifdef ENABLE_DRED
     if (st->dred_duration > 0 && st->dred_encoder.loaded && first_frame) {
-       oac_extension_data extension;
-       unsigned char buf[DRED_MAX_DATA_SIZE];
-       int dred_chunks;
-       int dred_bytes_left;
-       dred_chunks = IMIN((st->dred_duration+5)/4, DRED_NUM_REDUNDANCY_FRAMES/2);
-       if (st->use_vbr) dred_chunks = IMIN(dred_chunks, st->dred_target_chunks);
-       /* Remaining space for DRED, accounting for cost the 3 extra bytes for code 3, padding length, and extension number. */
-       dred_bytes_left = IMIN(DRED_MAX_DATA_SIZE, orig_max_data_bytes-ret-3);
-       /* Account for the extra bytes required to signal large padding length. */
-       dred_bytes_left -= (dred_bytes_left+1+DRED_EXPERIMENTAL_BYTES)/255;
-       /* Check whether we actually have something to encode. */
-       if (dred_chunks >= 1 && dred_bytes_left >= DRED_MIN_BYTES+DRED_EXPERIMENTAL_BYTES) {
-           int dred_bytes;
-#ifdef DRED_EXPERIMENTAL_VERSION
-           /* Add temporary extension type and version.
-              These bytes will be removed once extension is finalized. */
-           buf[0] = 'D';
-           buf[1] = DRED_EXPERIMENTAL_VERSION;
-#endif
-           dred_bytes = dred_encode_silk_frame(&st->dred_encoder, buf+DRED_EXPERIMENTAL_BYTES, dred_chunks, dred_bytes_left-DRED_EXPERIMENTAL_BYTES,
+        oac_extension_data extension;
+        unsigned char buf[DRED_MAX_DATA_SIZE];
+        int dred_chunks;
+        int dred_bytes_left;
+        dred_chunks = IMIN((st->dred_duration + 5)/4, DRED_NUM_REDUNDANCY_FRAMES/2);
+        if (st->use_vbr) dred_chunks = IMIN(dred_chunks, st->dred_target_chunks);
+        /* Remaining space for DRED, accounting for cost the 3 extra bytes for code 3, padding length, and extension number. */
+        dred_bytes_left = IMIN(DRED_MAX_DATA_SIZE, orig_max_data_bytes - ret - 3);
+        /* Account for the extra bytes required to signal large padding length. */
+        dred_bytes_left -= (dred_bytes_left + 1 + DRED_EXPERIMENTAL_BYTES)/255;
+        /* Check whether we actually have something to encode. */
+        if (dred_chunks >= 1 && dred_bytes_left >= DRED_MIN_BYTES + DRED_EXPERIMENTAL_BYTES) {
+            int dred_bytes;
+# ifdef DRED_EXPERIMENTAL_VERSION
+            /* Add temporary extension type and version.
+               These bytes will be removed once extension is finalized. */
+            buf[0] = 'D';
+            buf[1] = DRED_EXPERIMENTAL_VERSION;
+# endif
+            dred_bytes = dred_encode_silk_frame(&st->dred_encoder, buf + DRED_EXPERIMENTAL_BYTES, dred_chunks,
+            dred_bytes_left - DRED_EXPERIMENTAL_BYTES,
                                                st->dred_q0, st->dred_dQ, st->dred_qmax, st->activity_mem, st->arch);
-           if (dred_bytes > 0) {
-              dred_bytes += DRED_EXPERIMENTAL_BYTES;
-              celt_assert(dred_bytes <= dred_bytes_left);
-              extension.id = DRED_EXTENSION_ID;
-              extension.frame = 0;
-              extension.data = buf;
-              extension.len = dred_bytes;
-              ret = oac_packet_pad_impl(data, ret, orig_max_data_bytes, !st->use_vbr, &extension, 1);
-              if (ret < 0)
-              {
-                 RESTORE_STACK;
-                 return OAC_INTERNAL_ERROR;
-              }
-              apply_padding = 0;
-           }
-       }
+            if (dred_bytes > 0) {
+                dred_bytes += DRED_EXPERIMENTAL_BYTES;
+                celt_assert(dred_bytes <= dred_bytes_left);
+                extension.id = DRED_EXTENSION_ID;
+                extension.frame = 0;
+                extension.data = buf;
+                extension.len = dred_bytes;
+                ret = oac_packet_pad_impl(data, ret, orig_max_data_bytes, !st->use_vbr, &extension, 1);
+                if (ret < 0) {
+                    RESTORE_STACK;
+                    return OAC_INTERNAL_ERROR;
+                }
+                apply_padding = 0;
+            }
+        }
     }
 #else
     (void)first_frame; /* Avoids a warning about first_frame being unused. */
 #endif
-    if (apply_padding)
-    {
-       if (oac_packet_pad(data, ret, orig_max_data_bytes) != OAC_OK)
-       {
-          RESTORE_STACK;
-          return OAC_INTERNAL_ERROR;
-       }
-       ret = orig_max_data_bytes;
+    if (apply_padding) {
+        if (oac_packet_pad(data, ret, orig_max_data_bytes) != OAC_OK) {
+            RESTORE_STACK;
+            return OAC_INTERNAL_ERROR;
+        }
+        ret = orig_max_data_bytes;
     }
     RESTORE_STACK;
     return ret;
@@ -2611,61 +2459,56 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
 
 
 oac_int32 oac_encode(OacEncoder *st, const oac_int16 *pcm, int analysis_frame_size,
-                unsigned char *data, oac_int32 max_data_bytes)
-{
-   int i, ret;
-   int frame_size;
-   VARDECL(oac_res, in);
-   ALLOC_STACK;
-
-   frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
-   if (frame_size <= 0)
-   {
-      RESTORE_STACK;
-      return OAC_BAD_ARG;
-   }
-   ALLOC(in, frame_size*st->channels, oac_res);
-
-   for (i=0;i<frame_size*st->channels;i++)
-      in[i] = INT16TORES(pcm[i]);
-   ret = oac_encode_native(st, in, frame_size, data, max_data_bytes, 16,
+                     unsigned char *data, oac_int32 max_data_bytes) {
+    int i, ret;
+    int frame_size;
+    VARDECL(oac_res, in);
+    ALLOC_STACK;
+
+    frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
+    if (frame_size <= 0) {
+        RESTORE_STACK;
+        return OAC_BAD_ARG;
+    }
+    ALLOC(in, frame_size*st->channels, oac_res);
+
+    for (i = 0; i < frame_size*st->channels; i++)
+        in[i] = INT16TORES(pcm[i]);
+    ret = oac_encode_native(st, in, frame_size, data, max_data_bytes, 16,
                             pcm, analysis_frame_size, 0, -2, st->channels, downmix_int, 1);
-   RESTORE_STACK;
-   return ret;
+    RESTORE_STACK;
+    return ret;
 }
 
 #if defined(FIXED_POINT)
 oac_int32 oac_encode24(OacEncoder *st, const oac_int32 *pcm, int analysis_frame_size,
-                unsigned char *data, oac_int32 max_data_bytes)
-{
-   int frame_size;
-   frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
-   return oac_encode_native(st, pcm, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH,
+                       unsigned char *data, oac_int32 max_data_bytes) {
+    int frame_size;
+    frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
+    return oac_encode_native(st, pcm, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH,
                              pcm, analysis_frame_size, 0, -2, st->channels, downmix_int24, 0);
 }
 #else
 oac_int32 oac_encode24(OacEncoder *st, const oac_int32 *pcm, int analysis_frame_size,
-                unsigned char *data, oac_int32 max_data_bytes)
-{
-   int i, ret;
-   int frame_size;
-   VARDECL(oac_res, in);
-   ALLOC_STACK;
-
-   frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
-   if (frame_size <= 0)
-   {
-      RESTORE_STACK;
-      return OAC_BAD_ARG;
-   }
-   ALLOC(in, frame_size*st->channels, oac_res);
-
-   for (i=0;i<frame_size*st->channels;i++)
-      in[i] = INT24TORES(pcm[i]);
-   ret = oac_encode_native(st, in, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH,
+                       unsigned char *data, oac_int32 max_data_bytes) {
+    int i, ret;
+    int frame_size;
+    VARDECL(oac_res, in);
+    ALLOC_STACK;
+
+    frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
+    if (frame_size <= 0) {
+        RESTORE_STACK;
+        return OAC_BAD_ARG;
+    }
+    ALLOC(in, frame_size*st->channels, oac_res);
+
+    for (i = 0; i < frame_size*st->channels; i++)
+        in[i] = INT24TORES(pcm[i]);
+    ret = oac_encode_native(st, in, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH,
                             pcm, analysis_frame_size, 0, -2, st->channels, downmix_int24, 1);
-   RESTORE_STACK;
-   return ret;
+    RESTORE_STACK;
+    return ret;
 }
 #endif
 
@@ -2674,70 +2517,64 @@ oac_int32 oac_encode24(OacEncoder *st, const oac_int32 *pcm, int analysis_frame_
 
 # if !defined(FIXED_POINT)
 oac_int32 oac_encode_float(OacEncoder *st, const float *pcm, int analysis_frame_size,
-                      unsigned char *data, oac_int32 out_data_bytes)
-{
-   int frame_size;
-   frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
-   return oac_encode_native(st, pcm, frame_size, data, out_data_bytes, MAX_ENCODING_DEPTH,
+                           unsigned char *data, oac_int32 out_data_bytes) {
+    int frame_size;
+    frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
+    return oac_encode_native(st, pcm, frame_size, data, out_data_bytes, MAX_ENCODING_DEPTH,
                              pcm, analysis_frame_size, 0, -2, st->channels, downmix_float, 1);
 }
 # else
 oac_int32 oac_encode_float(OacEncoder *st, const float *pcm, int analysis_frame_size,
-      unsigned char *data, oac_int32 max_data_bytes)
-{
-   int i, ret;
-   int frame_size;
-   VARDECL(oac_res, in);
-   ALLOC_STACK;
-
-   frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
-   if (frame_size <= 0)
-   {
-      RESTORE_STACK;
-      return OAC_BAD_ARG;
-   }
-   ALLOC(in, frame_size*st->channels, oac_res);
-
-   for (i=0;i<frame_size*st->channels;i++)
-      in[i] = FLOAT2RES(pcm[i]);
-   ret = oac_encode_native(st, in, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH,
+                           unsigned char *data, oac_int32 max_data_bytes) {
+    int i, ret;
+    int frame_size;
+    VARDECL(oac_res, in);
+    ALLOC_STACK;
+
+    frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
+    if (frame_size <= 0) {
+        RESTORE_STACK;
+        return OAC_BAD_ARG;
+    }
+    ALLOC(in, frame_size*st->channels, oac_res);
+
+    for (i = 0; i < frame_size*st->channels; i++)
+        in[i] = FLOAT2RES(pcm[i]);
+    ret = oac_encode_native(st, in, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH,
                             pcm, analysis_frame_size, 0, -2, st->channels, downmix_float, 1);
-   RESTORE_STACK;
-   return ret;
+    RESTORE_STACK;
+    return ret;
 }
 # endif
 
 #endif
 
 
-int oac_encoder_ctl(OacEncoder *st, int request, ...)
-{
+int oac_encoder_ctl(OacEncoder *st, int request, ...) {
     int ret;
-    CELTEncoder *celt_enc=NULL;
+    CELTEncoder *celt_enc = NULL;
     va_list ap;
 
     ret = OAC_OK;
     va_start(ap, request);
 
     if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
-       celt_enc = (CELTEncoder*)((char*)st+st->celt_enc_offset);
+        celt_enc = (CELTEncoder*)((char*)st + st->celt_enc_offset);
 
-    switch (request)
-    {
+    switch (request) {
         case OAC_SET_APPLICATION_REQUEST:
         {
             oac_int32 value = va_arg(ap, oac_int32);
-            if (st->application == OAC_APPLICATION_RESTRICTED_SILK || st->application == OAC_APPLICATION_RESTRICTED_CELT)
-            {
-               ret = OAC_BAD_ARG;
-               break;
+            if (st->application == OAC_APPLICATION_RESTRICTED_SILK
+                || st->application == OAC_APPLICATION_RESTRICTED_CELT) {
+                ret = OAC_BAD_ARG;
+                break;
             }
-            if (   (value != OAC_APPLICATION_VOIP && value != OAC_APPLICATION_AUDIO
+            if ((value != OAC_APPLICATION_VOIP && value != OAC_APPLICATION_AUDIO
                  && value != OAC_APPLICATION_RESTRICTED_LOWDELAY)
-               || (!st->first && st->application != value))
-            {
-               ret = OAC_BAD_ARG;
-               break;
+                || (!st->first && st->application != value)) {
+                ret = OAC_BAD_ARG;
+                break;
             }
             st->application = value;
 #ifndef DISABLE_FLOAT_API
@@ -2748,9 +2585,8 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_GET_APPLICATION_REQUEST:
         {
             oac_int32 *value = va_arg(ap, oac_int32*);
-            if (!value)
-            {
-               goto bad_arg;
+            if (!value) {
+                goto bad_arg;
             }
             *value = st->application;
         }
@@ -2758,8 +2594,7 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_SET_BITRATE_REQUEST:
         {
             oac_int32 value = va_arg(ap, oac_int32);
-            if (value != OAC_AUTO && value != OAC_BITRATE_MAX)
-            {
+            if (value != OAC_AUTO && value != OAC_BITRATE_MAX) {
                 if (value <= 0)
                     goto bad_arg;
                 else if (value <= 500)
@@ -2773,9 +2608,8 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_GET_BITRATE_REQUEST:
         {
             oac_int32 *value = va_arg(ap, oac_int32*);
-            if (!value)
-            {
-               goto bad_arg;
+            if (!value) {
+                goto bad_arg;
             }
             *value = user_bitrate_to_bitrate(st, st->prev_framesize, 1276);
         }
@@ -2783,9 +2617,8 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_SET_FORCE_CHANNELS_REQUEST:
         {
             oac_int32 value = va_arg(ap, oac_int32);
-            if((value<1 || value>st->channels) && value != OAC_AUTO)
-            {
-               goto bad_arg;
+            if ((value < 1 || value > st->channels) && value != OAC_AUTO) {
+                goto bad_arg;
             }
             st->force_channels = value;
         }
@@ -2793,9 +2626,8 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_GET_FORCE_CHANNELS_REQUEST:
         {
             oac_int32 *value = va_arg(ap, oac_int32*);
-            if (!value)
-            {
-               goto bad_arg;
+            if (!value) {
+                goto bad_arg;
             }
             *value = st->force_channels;
         }
@@ -2803,9 +2635,8 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_SET_MAX_BANDWIDTH_REQUEST:
         {
             oac_int32 value = va_arg(ap, oac_int32);
-            if (value < OAC_BANDWIDTH_NARROWBAND || value > OAC_BANDWIDTH_FULLBAND)
-            {
-               goto bad_arg;
+            if (value < OAC_BANDWIDTH_NARROWBAND || value > OAC_BANDWIDTH_FULLBAND) {
+                goto bad_arg;
             }
             st->max_bandwidth = value;
             if (st->max_bandwidth == OAC_BANDWIDTH_NARROWBAND) {
@@ -2820,9 +2651,8 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_GET_MAX_BANDWIDTH_REQUEST:
         {
             oac_int32 *value = va_arg(ap, oac_int32*);
-            if (!value)
-            {
-               goto bad_arg;
+            if (!value) {
+                goto bad_arg;
             }
             *value = st->max_bandwidth;
         }
@@ -2830,9 +2660,8 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_SET_BANDWIDTH_REQUEST:
         {
             oac_int32 value = va_arg(ap, oac_int32);
-            if ((value < OAC_BANDWIDTH_NARROWBAND || value > OAC_BANDWIDTH_FULLBAND) && value != OAC_AUTO)
-            {
-               goto bad_arg;
+            if ((value < OAC_BANDWIDTH_NARROWBAND || value > OAC_BANDWIDTH_FULLBAND) && value != OAC_AUTO) {
+                goto bad_arg;
             }
             st->user_bandwidth = value;
             if (st->user_bandwidth == OAC_BANDWIDTH_NARROWBAND) {
@@ -2847,9 +2676,8 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_GET_BANDWIDTH_REQUEST:
         {
             oac_int32 *value = va_arg(ap, oac_int32*);
-            if (!value)
-            {
-               goto bad_arg;
+            if (!value) {
+                goto bad_arg;
             }
             *value = st->bandwidth;
         }
@@ -2857,9 +2685,8 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_SET_DTX_REQUEST:
         {
             oac_int32 value = va_arg(ap, oac_int32);
-            if(value<0 || value>1)
-            {
-               goto bad_arg;
+            if (value < 0 || value > 1) {
+                goto bad_arg;
             }
             st->use_dtx = value;
         }
@@ -2867,9 +2694,8 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_GET_DTX_REQUEST:
         {
             oac_int32 *value = va_arg(ap, oac_int32*);
-            if (!value)
-            {
-               goto bad_arg;
+            if (!value) {
+                goto bad_arg;
             }
             *value = st->use_dtx;
         }
@@ -2877,21 +2703,19 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_SET_COMPLEXITY_REQUEST:
         {
             oac_int32 value = va_arg(ap, oac_int32);
-            if(value<0 || value>10)
-            {
-               goto bad_arg;
+            if (value < 0 || value > 10) {
+                goto bad_arg;
             }
             st->silk_mode.complexity = value;
             if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
-               celt_encoder_ctl(celt_enc, OAC_SET_COMPLEXITY(value));
+                celt_encoder_ctl(celt_enc, OAC_SET_COMPLEXITY(value));
         }
         break;
         case OAC_GET_COMPLEXITY_REQUEST:
         {
             oac_int32 *value = va_arg(ap, oac_int32*);
-            if (!value)
-            {
-               goto bad_arg;
+            if (!value) {
+                goto bad_arg;
             }
             *value = st->silk_mode.complexity;
         }
@@ -2899,9 +2723,8 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_SET_INBAND_FEC_REQUEST:
         {
             oac_int32 value = va_arg(ap, oac_int32);
-            if(value<0 || value>2)
-            {
-               goto bad_arg;
+            if (value < 0 || value > 2) {
+                goto bad_arg;
             }
             st->fec_config = value;
             st->silk_mode.useInBandFEC = (value != 0);
@@ -2910,9 +2733,8 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_GET_INBAND_FEC_REQUEST:
         {
             oac_int32 *value = va_arg(ap, oac_int32*);
-            if (!value)
-            {
-               goto bad_arg;
+            if (!value) {
+                goto bad_arg;
             }
             *value = st->fec_config;
         }
@@ -2920,21 +2742,19 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_SET_PACKET_LOSS_PERC_REQUEST:
         {
             oac_int32 value = va_arg(ap, oac_int32);
-            if (value < 0 || value > 100)
-            {
-               goto bad_arg;
+            if (value < 0 || value > 100) {
+                goto bad_arg;
             }
             st->silk_mode.packetLossPercentage = value;
             if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
-               celt_encoder_ctl(celt_enc, OAC_SET_PACKET_LOSS_PERC(value));
+                celt_encoder_ctl(celt_enc, OAC_SET_PACKET_LOSS_PERC(value));
         }
         break;
         case OAC_GET_PACKET_LOSS_PERC_REQUEST:
         {
             oac_int32 *value = va_arg(ap, oac_int32*);
-            if (!value)
-            {
-               goto bad_arg;
+            if (!value) {
+                goto bad_arg;
             }
             *value = st->silk_mode.packetLossPercentage;
         }
@@ -2942,20 +2762,18 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_SET_VBR_REQUEST:
         {
             oac_int32 value = va_arg(ap, oac_int32);
-            if(value<0 || value>1)
-            {
-               goto bad_arg;
+            if (value < 0 || value > 1) {
+                goto bad_arg;
             }
             st->use_vbr = value;
-            st->silk_mode.useCBR = 1-value;
+            st->silk_mode.useCBR = 1 - value;
         }
         break;
         case OAC_GET_VBR_REQUEST:
         {
             oac_int32 *value = va_arg(ap, oac_int32*);
-            if (!value)
-            {
-               goto bad_arg;
+            if (!value) {
+                goto bad_arg;
             }
             *value = st->use_vbr;
         }
@@ -2963,9 +2781,8 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_SET_VOICE_RATIO_REQUEST:
         {
             oac_int32 value = va_arg(ap, oac_int32);
-            if (value<-1 || value>100)
-            {
-               goto bad_arg;
+            if (value < -1 || value > 100) {
+                goto bad_arg;
             }
             st->voice_ratio = value;
         }
@@ -2973,9 +2790,8 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_GET_VOICE_RATIO_REQUEST:
         {
             oac_int32 *value = va_arg(ap, oac_int32*);
-            if (!value)
-            {
-               goto bad_arg;
+            if (!value) {
+                goto bad_arg;
             }
             *value = st->voice_ratio;
         }
@@ -2983,9 +2799,8 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_SET_VBR_CONSTRAINT_REQUEST:
         {
             oac_int32 value = va_arg(ap, oac_int32);
-            if(value<0 || value>1)
-            {
-               goto bad_arg;
+            if (value < 0 || value > 1) {
+                goto bad_arg;
             }
             st->vbr_constraint = value;
         }
@@ -2993,9 +2808,8 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_GET_VBR_CONSTRAINT_REQUEST:
         {
             oac_int32 *value = va_arg(ap, oac_int32*);
-            if (!value)
-            {
-               goto bad_arg;
+            if (!value) {
+                goto bad_arg;
             }
             *value = st->vbr_constraint;
         }
@@ -3003,9 +2817,8 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_SET_SIGNAL_REQUEST:
         {
             oac_int32 value = va_arg(ap, oac_int32);
-            if(value!=OAC_AUTO && value!=OAC_SIGNAL_VOICE && value!=OAC_SIGNAL_MUSIC)
-            {
-               goto bad_arg;
+            if (value != OAC_AUTO && value != OAC_SIGNAL_VOICE && value != OAC_SIGNAL_MUSIC) {
+                goto bad_arg;
             }
             st->signal_type = value;
         }
@@ -3013,9 +2826,8 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_GET_SIGNAL_REQUEST:
         {
             oac_int32 *value = va_arg(ap, oac_int32*);
-            if (!value)
-            {
-               goto bad_arg;
+            if (!value) {
+                goto bad_arg;
             }
             *value = st->signal_type;
         }
@@ -3023,21 +2835,20 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_GET_LOOKAHEAD_REQUEST:
         {
             oac_int32 *value = va_arg(ap, oac_int32*);
-            if (!value)
-            {
-               goto bad_arg;
+            if (!value) {
+                goto bad_arg;
             }
             *value = st->Fs/400;
-            if (st->application != OAC_APPLICATION_RESTRICTED_LOWDELAY && st->application != OAC_APPLICATION_RESTRICTED_CELT)
+            if (st->application != OAC_APPLICATION_RESTRICTED_LOWDELAY
+                && st->application != OAC_APPLICATION_RESTRICTED_CELT)
                 *value += st->delay_compensation;
         }
         break;
         case OAC_GET_SAMPLE_RATE_REQUEST:
         {
             oac_int32 *value = va_arg(ap, oac_int32*);
-            if (!value)
-            {
-               goto bad_arg;
+            if (!value) {
+                goto bad_arg;
             }
             *value = st->Fs;
         }
@@ -3045,9 +2856,8 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_GET_FINAL_RANGE_REQUEST:
         {
             oac_uint32 *value = va_arg(ap, oac_uint32*);
-            if (!value)
-            {
-               goto bad_arg;
+            if (!value) {
+                goto bad_arg;
             }
             *value = st->rangeFinal;
         }
@@ -3055,19 +2865,17 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_SET_LSB_DEPTH_REQUEST:
         {
             oac_int32 value = va_arg(ap, oac_int32);
-            if (value<8 || value>24)
-            {
-               goto bad_arg;
+            if (value < 8 || value > 24) {
+                goto bad_arg;
             }
-            st->lsb_depth=value;
+            st->lsb_depth = value;
         }
         break;
         case OAC_GET_LSB_DEPTH_REQUEST:
         {
             oac_int32 *value = va_arg(ap, oac_int32*);
-            if (!value)
-            {
-               goto bad_arg;
+            if (!value) {
+                goto bad_arg;
             }
             *value = st->lsb_depth;
         }
@@ -3075,13 +2883,12 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_SET_EXPERT_FRAME_DURATION_REQUEST:
         {
             oac_int32 value = va_arg(ap, oac_int32);
-            if (value != OAC_FRAMESIZE_ARG    && value != OAC_FRAMESIZE_2_5_MS &&
-                value != OAC_FRAMESIZE_5_MS   && value != OAC_FRAMESIZE_10_MS  &&
-                value != OAC_FRAMESIZE_20_MS  && value != OAC_FRAMESIZE_40_MS  &&
-                value != OAC_FRAMESIZE_60_MS  && value != OAC_FRAMESIZE_80_MS  &&
-                value != OAC_FRAMESIZE_100_MS && value != OAC_FRAMESIZE_120_MS)
-            {
-               goto bad_arg;
+            if (value != OAC_FRAMESIZE_ARG    && value != OAC_FRAMESIZE_2_5_MS
+                && value != OAC_FRAMESIZE_5_MS   && value != OAC_FRAMESIZE_10_MS
+                && value != OAC_FRAMESIZE_20_MS  && value != OAC_FRAMESIZE_40_MS
+                && value != OAC_FRAMESIZE_60_MS  && value != OAC_FRAMESIZE_80_MS
+                && value != OAC_FRAMESIZE_100_MS && value != OAC_FRAMESIZE_120_MS) {
+                goto bad_arg;
             }
             st->variable_duration = value;
         }
@@ -3089,60 +2896,56 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_GET_EXPERT_FRAME_DURATION_REQUEST:
         {
             oac_int32 *value = va_arg(ap, oac_int32*);
-            if (!value)
-            {
-               goto bad_arg;
+            if (!value) {
+                goto bad_arg;
             }
             *value = st->variable_duration;
         }
         break;
         case OAC_SET_PREDICTION_DISABLED_REQUEST:
         {
-           oac_int32 value = va_arg(ap, oac_int32);
-           if (value > 1 || value < 0)
-              goto bad_arg;
-           st->silk_mode.reducedDependency = value;
+            oac_int32 value = va_arg(ap, oac_int32);
+            if (value > 1 || value < 0)
+                goto bad_arg;
+            st->silk_mode.reducedDependency = value;
         }
         break;
         case OAC_GET_PREDICTION_DISABLED_REQUEST:
         {
-           oac_int32 *value = va_arg(ap, oac_int32*);
-           if (!value)
-              goto bad_arg;
-           *value = st->silk_mode.reducedDependency;
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            if (!value)
+                goto bad_arg;
+            *value = st->silk_mode.reducedDependency;
         }
         break;
         case OAC_SET_PHASE_INVERSION_DISABLED_REQUEST:
         {
             oac_int32 value = va_arg(ap, oac_int32);
-            if(value<0 || value>1)
-            {
-               goto bad_arg;
+            if (value < 0 || value > 1) {
+                goto bad_arg;
             }
             if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
-               celt_encoder_ctl(celt_enc, OAC_SET_PHASE_INVERSION_DISABLED(value));
+                celt_encoder_ctl(celt_enc, OAC_SET_PHASE_INVERSION_DISABLED(value));
         }
         break;
         case OAC_GET_PHASE_INVERSION_DISABLED_REQUEST:
         {
             oac_int32 *value = va_arg(ap, oac_int32*);
-            if (!value)
-            {
-               goto bad_arg;
+            if (!value) {
+                goto bad_arg;
             }
             if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
-               celt_encoder_ctl(celt_enc, OAC_GET_PHASE_INVERSION_DISABLED(value));
+                celt_encoder_ctl(celt_enc, OAC_GET_PHASE_INVERSION_DISABLED(value));
             else
-               *value = 0;
+                *value = 0;
         }
         break;
 #ifdef ENABLE_DRED
         case OAC_SET_DRED_DURATION_REQUEST:
         {
             oac_int32 value = va_arg(ap, oac_int32);
-            if(value<0 || value>DRED_MAX_FRAMES)
-            {
-               goto bad_arg;
+            if (value < 0 || value > DRED_MAX_FRAMES) {
+                goto bad_arg;
             }
             st->dred_duration = value;
             st->silk_mode.useDRED = !!value;
@@ -3151,9 +2954,8 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         case OAC_GET_DRED_DURATION_REQUEST:
         {
             oac_int32 *value = va_arg(ap, oac_int32*);
-            if (!value)
-            {
-               goto bad_arg;
+            if (!value) {
+                goto bad_arg;
             }
             *value = st->dred_duration;
         }
@@ -3161,40 +2963,39 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
 #endif
         case OAC_RESET_STATE:
         {
-           void *silk_enc;
-           silk_EncControlStruct dummy;
-           char *start;
-           silk_enc = (char*)st+st->silk_enc_offset;
+            void *silk_enc;
+            silk_EncControlStruct dummy;
+            char *start;
+            silk_enc = (char*)st + st->silk_enc_offset;
 #ifndef DISABLE_FLOAT_API
-           tonality_analysis_reset(&st->analysis);
+            tonality_analysis_reset(&st->analysis);
 #endif
 
-           start = (char*)&st->OAC_ENCODER_RESET_START;
-           OAC_CLEAR(start, st->silk_enc_offset - (start - (char*)st));
+            start = (char*)&st->OAC_ENCODER_RESET_START;
+            OAC_CLEAR(start, st->silk_enc_offset - (start - (char*)st));
 
-           if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
-              celt_encoder_ctl(celt_enc, OAC_RESET_STATE);
-           if (st->application != OAC_APPLICATION_RESTRICTED_CELT)
-              silk_InitEncoder( silk_enc, st->channels, st->arch, &dummy );
+            if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
+                celt_encoder_ctl(celt_enc, OAC_RESET_STATE);
+            if (st->application != OAC_APPLICATION_RESTRICTED_CELT)
+                silk_InitEncoder( silk_enc, st->channels, st->arch, &dummy );
 #ifdef ENABLE_DRED
-           /* Initialize DRED Encoder */
-           dred_encoder_reset( &st->dred_encoder );
+            /* Initialize DRED Encoder */
+            dred_encoder_reset( &st->dred_encoder );
 #endif
-           st->stream_channels = st->channels;
-           st->hybrid_stereo_width_Q14 = 1 << 14;
-           st->prev_HB_gain = Q15ONE;
-           st->first = 1;
-           st->mode = MODE_HYBRID;
-           st->bandwidth = OAC_BANDWIDTH_FULLBAND;
-           st->variable_HP_smth2_Q15 = silk_LSHIFT( silk_lin2log( VARIABLE_HP_MIN_CUTOFF_HZ ), 8 );
+            st->stream_channels = st->channels;
+            st->hybrid_stereo_width_Q14 = 1<<14;
+            st->prev_HB_gain = Q15ONE;
+            st->first = 1;
+            st->mode = MODE_HYBRID;
+            st->bandwidth = OAC_BANDWIDTH_FULLBAND;
+            st->variable_HP_smth2_Q15 = silk_LSHIFT( silk_lin2log( VARIABLE_HP_MIN_CUTOFF_HZ ), 8 );
         }
         break;
         case OAC_SET_FORCE_MODE_REQUEST:
         {
             oac_int32 value = va_arg(ap, oac_int32);
-            if ((value < MODE_SILK_ONLY || value > MODE_CELT_ONLY) && value != OAC_AUTO)
-            {
-               goto bad_arg;
+            if ((value < MODE_SILK_ONLY || value > MODE_CELT_ONLY) && value != OAC_AUTO) {
+                goto bad_arg;
             }
             st->user_forced_mode = value;
         }
@@ -3204,7 +3005,7 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
             oac_int32 value = va_arg(ap, oac_int32);
             st->lfe = value;
             if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
-               ret = celt_encoder_ctl(celt_enc, OAC_SET_LFE(value));
+                ret = celt_encoder_ctl(celt_enc, OAC_SET_LFE(value));
         }
         break;
         case OAC_SET_ENERGY_MASK_REQUEST:
@@ -3212,30 +3013,27 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
             celt_glog *value = va_arg(ap, celt_glog*);
             st->energy_masking = value;
             if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
-               ret = celt_encoder_ctl(celt_enc, OAC_SET_ENERGY_MASK(value));
+                ret = celt_encoder_ctl(celt_enc, OAC_SET_ENERGY_MASK(value));
         }
         break;
         case OAC_GET_IN_DTX_REQUEST:
         {
             oac_int32 *value = va_arg(ap, oac_int32*);
-            if (!value)
-            {
+            if (!value) {
                 goto bad_arg;
             }
             if (st->silk_mode.useDTX && (st->prev_mode == MODE_SILK_ONLY || st->prev_mode == MODE_HYBRID)) {
                 /* DTX determined by Silk. */
-                silk_encoder *silk_enc = (silk_encoder*)(void *)((char*)st+st->silk_enc_offset);
+                silk_encoder *silk_enc = (silk_encoder*)(void *)((char*)st + st->silk_enc_offset);
                 *value = silk_enc->state_Fxx[0].sCmn.noSpeechCounter >= NB_SPEECH_FRAMES_BEFORE_DTX;
                 /* Stereo: check second channel unless only the middle channel was encoded. */
-                if(*value == 1 && st->silk_mode.nChannelsInternal == 2 && silk_enc->prev_decode_only_middle == 0) {
+                if (*value == 1 && st->silk_mode.nChannelsInternal == 2 && silk_enc->prev_decode_only_middle == 0) {
                     *value = silk_enc->state_Fxx[1].sCmn.noSpeechCounter >= NB_SPEECH_FRAMES_BEFORE_DTX;
                 }
-            }
-            else if (st->use_dtx) {
+            } else if (st->use_dtx) {
                 /* DTX determined by Oac. */
                 *value = st->nb_no_activity_ms_Q1 >= NB_SPEECH_FRAMES_BEFORE_DTX*20*2;
-            }
-            else {
+            } else {
                 *value = 0;
             }
         }
@@ -3245,25 +3043,23 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
         {
             const unsigned char *data = va_arg(ap, const unsigned char *);
             oac_int32 len = va_arg(ap, oac_int32);
-            if(len<0 || data == NULL)
-            {
-               goto bad_arg;
+            if (len < 0 || data == NULL) {
+                goto bad_arg;
             }
-#ifdef ENABLE_DRED
+# ifdef ENABLE_DRED
             ret = dred_encoder_load_model(&st->dred_encoder, data, len);
-#endif
+# endif
         }
         break;
 #endif
         case CELT_GET_MODE_REQUEST:
         {
-           const CELTMode ** value = va_arg(ap, const CELTMode**);
-           if (!value)
-           {
-              goto bad_arg;
-           }
-           celt_assert(celt_enc != NULL);
-           ret = celt_encoder_ctl(celt_enc, CELT_GET_MODE(value));
+            const CELTMode ** value = va_arg(ap, const CELTMode**);
+            if (!value) {
+                goto bad_arg;
+            }
+            celt_assert(celt_enc != NULL);
+            ret = celt_encoder_ctl(celt_enc, CELT_GET_MODE(value));
         }
         break;
         default:
@@ -3278,7 +3074,6 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...)
     return OAC_BAD_ARG;
 }
 
-void oac_encoder_destroy(OacEncoder *st)
-{
+void oac_encoder_destroy(OacEncoder *st) {
     oac_free(st);
 }
diff --git a/src/oac_multistream.c b/src/oac_multistream.c
index d9eca4b7a..24588f872 100644
--- a/src/oac_multistream.c
+++ b/src/oac_multistream.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "oac_multistream.h"
@@ -38,54 +38,46 @@
 #include "os_support.h"
 
 
-int validate_layout(const ChannelLayout *layout)
-{
-   int i, max_channel;
+int validate_layout(const ChannelLayout *layout) {
+    int i, max_channel;
 
-   max_channel = layout->nb_streams+layout->nb_coupled_streams;
-   if (max_channel>255)
-      return 0;
-   for (i=0;i<layout->nb_channels;i++)
-   {
-      if (layout->mapping[i] >= max_channel && layout->mapping[i] != 255)
-         return 0;
-   }
-   return 1;
+    max_channel = layout->nb_streams + layout->nb_coupled_streams;
+    if (max_channel > 255)
+        return 0;
+    for (i = 0; i < layout->nb_channels; i++) {
+        if (layout->mapping[i] >= max_channel && layout->mapping[i] != 255)
+            return 0;
+    }
+    return 1;
 }
 
 
-int get_left_channel(const ChannelLayout *layout, int stream_id, int prev)
-{
-   int i;
-   i = (prev<0) ? 0 : prev+1;
-   for (;i<layout->nb_channels;i++)
-   {
-      if (layout->mapping[i]==stream_id*2)
-         return i;
-   }
-   return -1;
+int get_left_channel(const ChannelLayout *layout, int stream_id, int prev) {
+    int i;
+    i = (prev < 0) ? 0 : prev + 1;
+    for (; i < layout->nb_channels; i++) {
+        if (layout->mapping[i] == stream_id*2)
+            return i;
+    }
+    return -1;
 }
 
-int get_right_channel(const ChannelLayout *layout, int stream_id, int prev)
-{
-   int i;
-   i = (prev<0) ? 0 : prev+1;
-   for (;i<layout->nb_channels;i++)
-   {
-      if (layout->mapping[i]==stream_id*2+1)
-         return i;
-   }
-   return -1;
+int get_right_channel(const ChannelLayout *layout, int stream_id, int prev) {
+    int i;
+    i = (prev < 0) ? 0 : prev + 1;
+    for (; i < layout->nb_channels; i++) {
+        if (layout->mapping[i] == stream_id*2 + 1)
+            return i;
+    }
+    return -1;
 }
 
-int get_mono_channel(const ChannelLayout *layout, int stream_id, int prev)
-{
-   int i;
-   i = (prev<0) ? 0 : prev+1;
-   for (;i<layout->nb_channels;i++)
-   {
-      if (layout->mapping[i]==stream_id+layout->nb_coupled_streams)
-         return i;
-   }
-   return -1;
+int get_mono_channel(const ChannelLayout *layout, int stream_id, int prev) {
+    int i;
+    i = (prev < 0) ? 0 : prev + 1;
+    for (; i < layout->nb_channels; i++) {
+        if (layout->mapping[i] == stream_id + layout->nb_coupled_streams)
+            return i;
+    }
+    return -1;
 }
diff --git a/src/oac_multistream_decoder.c b/src/oac_multistream_decoder.c
index 1598fae17..2e35851a6 100644
--- a/src/oac_multistream_decoder.c
+++ b/src/oac_multistream_decoder.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "oac_multistream.h"
@@ -40,526 +40,466 @@
 /* DECODER */
 
 #if defined(ENABLE_HARDENING) || defined(ENABLE_ASSERTIONS)
-static void validate_ms_decoder(OacMSDecoder *st)
-{
-   validate_layout(&st->layout);
+static void validate_ms_decoder(OacMSDecoder *st) {
+    validate_layout(&st->layout);
 }
-#define VALIDATE_MS_DECODER(st) validate_ms_decoder(st)
+# define VALIDATE_MS_DECODER(st) validate_ms_decoder(st)
 #else
-#define VALIDATE_MS_DECODER(st)
+# define VALIDATE_MS_DECODER(st)
 #endif
 
 
-oac_int32 oac_multistream_decoder_get_size(int nb_streams, int nb_coupled_streams)
-{
-   int coupled_size;
-   int mono_size;
+oac_int32 oac_multistream_decoder_get_size(int nb_streams, int nb_coupled_streams) {
+    int coupled_size;
+    int mono_size;
 
-   if(nb_streams<1||nb_coupled_streams>nb_streams||nb_coupled_streams<0)return 0;
-   coupled_size = oac_decoder_get_size(2);
-   mono_size = oac_decoder_get_size(1);
-   return align(sizeof(OacMSDecoder))
-         + nb_coupled_streams * align(coupled_size)
-         + (nb_streams-nb_coupled_streams) * align(mono_size);
+    if (nb_streams < 1 || nb_coupled_streams > nb_streams || nb_coupled_streams < 0) return 0;
+    coupled_size = oac_decoder_get_size(2);
+    mono_size = oac_decoder_get_size(1);
+    return align(sizeof(OacMSDecoder))
+           + nb_coupled_streams*align(coupled_size)
+           + (nb_streams - nb_coupled_streams)*align(mono_size);
 }
 
 int oac_multistream_decoder_init(
-      OacMSDecoder *st,
-      oac_int32 Fs,
-      int channels,
-      int streams,
-      int coupled_streams,
-      const unsigned char *mapping
-)
-{
-   int coupled_size;
-   int mono_size;
-   int i, ret;
-   char *ptr;
-
-   if ((channels>255) || (channels<1) || (coupled_streams>streams) ||
-       (streams<1) || (coupled_streams<0) || (streams>255-coupled_streams))
-      return OAC_BAD_ARG;
-
-   st->layout.nb_channels = channels;
-   st->layout.nb_streams = streams;
-   st->layout.nb_coupled_streams = coupled_streams;
-
-   for (i=0;i<st->layout.nb_channels;i++)
-      st->layout.mapping[i] = mapping[i];
-   if (!validate_layout(&st->layout))
-      return OAC_BAD_ARG;
-
-   ptr = (char*)st + align(sizeof(OacMSDecoder));
-   coupled_size = oac_decoder_get_size(2);
-   mono_size = oac_decoder_get_size(1);
-
-   for (i=0;i<st->layout.nb_coupled_streams;i++)
-   {
-      ret=oac_decoder_init((OacDecoder*)ptr, Fs, 2);
-      if(ret!=OAC_OK)return ret;
-      ptr += align(coupled_size);
-   }
-   for (;i<st->layout.nb_streams;i++)
-   {
-      ret=oac_decoder_init((OacDecoder*)ptr, Fs, 1);
-      if(ret!=OAC_OK)return ret;
-      ptr += align(mono_size);
-   }
-   return OAC_OK;
+    OacMSDecoder *st,
+    oac_int32 Fs,
+    int channels,
+    int streams,
+    int coupled_streams,
+    const unsigned char *mapping) {
+    int coupled_size;
+    int mono_size;
+    int i, ret;
+    char *ptr;
+
+    if ((channels > 255) || (channels < 1) || (coupled_streams > streams)
+        || (streams < 1) || (coupled_streams < 0) || (streams > 255 - coupled_streams))
+        return OAC_BAD_ARG;
+
+    st->layout.nb_channels = channels;
+    st->layout.nb_streams = streams;
+    st->layout.nb_coupled_streams = coupled_streams;
+
+    for (i = 0; i < st->layout.nb_channels; i++)
+        st->layout.mapping[i] = mapping[i];
+    if (!validate_layout(&st->layout))
+        return OAC_BAD_ARG;
+
+    ptr = (char*)st + align(sizeof(OacMSDecoder));
+    coupled_size = oac_decoder_get_size(2);
+    mono_size = oac_decoder_get_size(1);
+
+    for (i = 0; i < st->layout.nb_coupled_streams; i++) {
+        ret = oac_decoder_init((OacDecoder*)ptr, Fs, 2);
+        if (ret != OAC_OK) return ret;
+        ptr += align(coupled_size);
+    }
+    for (; i < st->layout.nb_streams; i++) {
+        ret = oac_decoder_init((OacDecoder*)ptr, Fs, 1);
+        if (ret != OAC_OK) return ret;
+        ptr += align(mono_size);
+    }
+    return OAC_OK;
 }
 
 
 OacMSDecoder *oac_multistream_decoder_create(
-      oac_int32 Fs,
-      int channels,
-      int streams,
-      int coupled_streams,
-      const unsigned char *mapping,
-      int *error
-)
-{
-   int ret;
-   OacMSDecoder *st;
-   if ((channels>255) || (channels<1) || (coupled_streams>streams) ||
-       (streams<1) || (coupled_streams<0) || (streams>255-coupled_streams))
-   {
-      if (error)
-         *error = OAC_BAD_ARG;
-      return NULL;
-   }
-   st = (OacMSDecoder *)oac_alloc(oac_multistream_decoder_get_size(streams, coupled_streams));
-   if (st==NULL)
-   {
-      if (error)
-         *error = OAC_ALLOC_FAIL;
-      return NULL;
-   }
-   ret = oac_multistream_decoder_init(st, Fs, channels, streams, coupled_streams, mapping);
-   if (error)
-      *error = ret;
-   if (ret != OAC_OK)
-   {
-      oac_free(st);
-      st = NULL;
-   }
-   return st;
+    oac_int32 Fs,
+    int channels,
+    int streams,
+    int coupled_streams,
+    const unsigned char *mapping,
+    int *error) {
+    int ret;
+    OacMSDecoder *st;
+    if ((channels > 255) || (channels < 1) || (coupled_streams > streams)
+        || (streams < 1) || (coupled_streams < 0) || (streams > 255 - coupled_streams)) {
+        if (error)
+            *error = OAC_BAD_ARG;
+        return NULL;
+    }
+    st = (OacMSDecoder *)oac_alloc(oac_multistream_decoder_get_size(streams, coupled_streams));
+    if (st == NULL) {
+        if (error)
+            *error = OAC_ALLOC_FAIL;
+        return NULL;
+    }
+    ret = oac_multistream_decoder_init(st, Fs, channels, streams, coupled_streams, mapping);
+    if (error)
+        *error = ret;
+    if (ret != OAC_OK) {
+        oac_free(st);
+        st = NULL;
+    }
+    return st;
 }
 
 static int oac_multistream_packet_validate(const unsigned char *data,
-      oac_int32 len, int nb_streams, oac_int32 Fs)
-{
-   int s;
-   int count;
-   unsigned char toc;
-   oac_int16 size[48];
-   int samples=0;
-   oac_int32 packet_offset;
-
-   for (s=0;s<nb_streams;s++)
-   {
-      int tmp_samples;
-      if (len<=0)
-         return OAC_INVALID_PACKET;
-      count = oac_packet_parse_impl(data, len, s!=nb_streams-1, &toc, NULL,
+                                           oac_int32 len, int nb_streams, oac_int32 Fs) {
+    int s;
+    int count;
+    unsigned char toc;
+    oac_int16 size[48];
+    int samples = 0;
+    oac_int32 packet_offset;
+
+    for (s = 0; s < nb_streams; s++) {
+        int tmp_samples;
+        if (len <= 0)
+            return OAC_INVALID_PACKET;
+        count = oac_packet_parse_impl(data, len, s != nb_streams - 1, &toc, NULL,
                                      size, NULL, &packet_offset, NULL, NULL);
-      if (count<0)
-         return count;
-      tmp_samples = oac_packet_get_nb_samples(data, packet_offset, Fs);
-      if (s!=0 && samples != tmp_samples)
-         return OAC_INVALID_PACKET;
-      samples = tmp_samples;
-      data += packet_offset;
-      len -= packet_offset;
-   }
-   return samples;
+        if (count < 0)
+            return count;
+        tmp_samples = oac_packet_get_nb_samples(data, packet_offset, Fs);
+        if (s != 0 && samples != tmp_samples)
+            return OAC_INVALID_PACKET;
+        samples = tmp_samples;
+        data += packet_offset;
+        len -= packet_offset;
+    }
+    return samples;
 }
 
 int oac_multistream_decode_native(
-      OacMSDecoder *st,
-      const unsigned char *data,
-      oac_int32 len,
-      void *pcm,
-      oac_copy_channel_out_func copy_channel_out,
-      int frame_size,
-      int decode_fec,
-      int soft_clip,
-      void *user_data
-)
-{
-   oac_int32 Fs;
-   int coupled_size;
-   int mono_size;
-   int s, c;
-   char *ptr;
-   int do_plc=0;
-   VARDECL(oac_res, buf);
-   ALLOC_STACK;
-
-   VALIDATE_MS_DECODER(st);
-   if (frame_size <= 0)
-   {
-      RESTORE_STACK;
-      return OAC_BAD_ARG;
-   }
-   /* Limit frame_size to avoid excessive stack allocations. */
-   MUST_SUCCEED(oac_multistream_decoder_ctl(st, OAC_GET_SAMPLE_RATE(&Fs)));
-   frame_size = IMIN(frame_size, Fs/25*3);
-   ALLOC(buf, 2*frame_size, oac_res);
-   ptr = (char*)st + align(sizeof(OacMSDecoder));
-   coupled_size = oac_decoder_get_size(2);
-   mono_size = oac_decoder_get_size(1);
-
-   if (len==0)
-      do_plc = 1;
-   if (len < 0)
-   {
-      RESTORE_STACK;
-      return OAC_BAD_ARG;
-   }
-   if (!do_plc && len < 2*st->layout.nb_streams-1)
-   {
-      RESTORE_STACK;
-      return OAC_INVALID_PACKET;
-   }
-   if (!do_plc)
-   {
-      int ret = oac_multistream_packet_validate(data, len, st->layout.nb_streams, Fs);
-      if (ret < 0)
-      {
-         RESTORE_STACK;
-         return ret;
-      } else if (ret > frame_size)
-      {
-         RESTORE_STACK;
-         return OAC_BUFFER_TOO_SMALL;
-      }
-   }
-   for (s=0;s<st->layout.nb_streams;s++)
-   {
-      OacDecoder *dec;
-      oac_int32 packet_offset;
-      int ret;
-
-      dec = (OacDecoder*)ptr;
-      ptr += (s < st->layout.nb_coupled_streams) ? align(coupled_size) : align(mono_size);
-
-      if (!do_plc && len<=0)
-      {
-         RESTORE_STACK;
-         return OAC_INTERNAL_ERROR;
-      }
-      packet_offset = 0;
-      ret = oac_decode_native(dec, data, len, buf, frame_size, decode_fec, s!=st->layout.nb_streams-1, &packet_offset, soft_clip, NULL, 0);
-      if (!do_plc)
-      {
-        data += packet_offset;
-        len -= packet_offset;
-      }
-      if (ret <= 0)
-      {
-         RESTORE_STACK;
-         return ret;
-      }
-      frame_size = ret;
-      if (s < st->layout.nb_coupled_streams)
-      {
-         int chan, prev;
-         prev = -1;
-         /* Copy "left" audio to the channel(s) where it belongs */
-         while ( (chan = get_left_channel(&st->layout, s, prev)) != -1)
-         {
-            (*copy_channel_out)(pcm, st->layout.nb_channels, chan,
+    OacMSDecoder *st,
+    const unsigned char *data,
+    oac_int32 len,
+    void *pcm,
+    oac_copy_channel_out_func copy_channel_out,
+    int frame_size,
+    int decode_fec,
+    int soft_clip,
+    void *user_data) {
+    oac_int32 Fs;
+    int coupled_size;
+    int mono_size;
+    int s, c;
+    char *ptr;
+    int do_plc = 0;
+    VARDECL(oac_res, buf);
+    ALLOC_STACK;
+
+    VALIDATE_MS_DECODER(st);
+    if (frame_size <= 0) {
+        RESTORE_STACK;
+        return OAC_BAD_ARG;
+    }
+    /* Limit frame_size to avoid excessive stack allocations. */
+    MUST_SUCCEED(oac_multistream_decoder_ctl(st, OAC_GET_SAMPLE_RATE(&Fs)));
+    frame_size = IMIN(frame_size, Fs/25*3);
+    ALLOC(buf, 2*frame_size, oac_res);
+    ptr = (char*)st + align(sizeof(OacMSDecoder));
+    coupled_size = oac_decoder_get_size(2);
+    mono_size = oac_decoder_get_size(1);
+
+    if (len == 0)
+        do_plc = 1;
+    if (len < 0) {
+        RESTORE_STACK;
+        return OAC_BAD_ARG;
+    }
+    if (!do_plc && len < 2*st->layout.nb_streams - 1) {
+        RESTORE_STACK;
+        return OAC_INVALID_PACKET;
+    }
+    if (!do_plc) {
+        int ret = oac_multistream_packet_validate(data, len, st->layout.nb_streams, Fs);
+        if (ret < 0) {
+            RESTORE_STACK;
+            return ret;
+        } else if (ret > frame_size) {
+            RESTORE_STACK;
+            return OAC_BUFFER_TOO_SMALL;
+        }
+    }
+    for (s = 0; s < st->layout.nb_streams; s++) {
+        OacDecoder *dec;
+        oac_int32 packet_offset;
+        int ret;
+
+        dec = (OacDecoder*)ptr;
+        ptr += (s < st->layout.nb_coupled_streams) ? align(coupled_size) : align(mono_size);
+
+        if (!do_plc && len <= 0) {
+            RESTORE_STACK;
+            return OAC_INTERNAL_ERROR;
+        }
+        packet_offset = 0;
+        ret = oac_decode_native(dec, data, len, buf, frame_size, decode_fec, s != st->layout.nb_streams - 1,
+        &packet_offset, soft_clip, NULL, 0);
+        if (!do_plc) {
+            data += packet_offset;
+            len -= packet_offset;
+        }
+        if (ret <= 0) {
+            RESTORE_STACK;
+            return ret;
+        }
+        frame_size = ret;
+        if (s < st->layout.nb_coupled_streams) {
+            int chan, prev;
+            prev = -1;
+            /* Copy "left" audio to the channel(s) where it belongs */
+            while ((chan = get_left_channel(&st->layout, s, prev)) != -1) {
+                (*copy_channel_out)(pcm, st->layout.nb_channels, chan,
                buf, 2, frame_size, user_data);
-            prev = chan;
-         }
-         prev = -1;
-         /* Copy "right" audio to the channel(s) where it belongs */
-         while ( (chan = get_right_channel(&st->layout, s, prev)) != -1)
-         {
-            (*copy_channel_out)(pcm, st->layout.nb_channels, chan,
-               buf+1, 2, frame_size, user_data);
-            prev = chan;
-         }
-      } else {
-         int chan, prev;
-         prev = -1;
-         /* Copy audio to the channel(s) where it belongs */
-         while ( (chan = get_mono_channel(&st->layout, s, prev)) != -1)
-         {
-            (*copy_channel_out)(pcm, st->layout.nb_channels, chan,
+                prev = chan;
+            }
+            prev = -1;
+            /* Copy "right" audio to the channel(s) where it belongs */
+            while ((chan = get_right_channel(&st->layout, s, prev)) != -1) {
+                (*copy_channel_out)(pcm, st->layout.nb_channels, chan,
+               buf + 1, 2, frame_size, user_data);
+                prev = chan;
+            }
+        } else {
+            int chan, prev;
+            prev = -1;
+            /* Copy audio to the channel(s) where it belongs */
+            while ((chan = get_mono_channel(&st->layout, s, prev)) != -1) {
+                (*copy_channel_out)(pcm, st->layout.nb_channels, chan,
                buf, 1, frame_size, user_data);
-            prev = chan;
-         }
-      }
-   }
-   /* Handle muted channels */
-   for (c=0;c<st->layout.nb_channels;c++)
-   {
-      if (st->layout.mapping[c] == 255)
-      {
-         (*copy_channel_out)(pcm, st->layout.nb_channels, c,
+                prev = chan;
+            }
+        }
+    }
+    /* Handle muted channels */
+    for (c = 0; c < st->layout.nb_channels; c++) {
+        if (st->layout.mapping[c] == 255) {
+            (*copy_channel_out)(pcm, st->layout.nb_channels, c,
             NULL, 0, frame_size, user_data);
-      }
-   }
-   RESTORE_STACK;
-   return frame_size;
+        }
+    }
+    RESTORE_STACK;
+    return frame_size;
 }
 
 #if !defined(DISABLE_FLOAT_API)
 static void oac_copy_channel_out_float(
-  void *dst,
-  int dst_stride,
-  int dst_channel,
-  const oac_res *src,
-  int src_stride,
-  int frame_size,
-  void *user_data
-)
-{
-   float *float_dst;
-   oac_int32 i;
-   (void)user_data;
-   float_dst = (float*)dst;
-   if (src != NULL)
-   {
-      for (i=0;i<frame_size;i++)
-         float_dst[i*dst_stride+dst_channel] = RES2FLOAT(src[i*src_stride]);
-   }
-   else
-   {
-      for (i=0;i<frame_size;i++)
-         float_dst[i*dst_stride+dst_channel] = 0;
-   }
+    void *dst,
+    int dst_stride,
+    int dst_channel,
+    const oac_res *src,
+    int src_stride,
+    int frame_size,
+    void *user_data) {
+    float *float_dst;
+    oac_int32 i;
+    (void)user_data;
+    float_dst = (float*)dst;
+    if (src != NULL) {
+        for (i = 0; i < frame_size; i++)
+            float_dst[i*dst_stride + dst_channel] = RES2FLOAT(src[i*src_stride]);
+    } else {
+        for (i = 0; i < frame_size; i++)
+            float_dst[i*dst_stride + dst_channel] = 0;
+    }
 }
 #endif
 
 static void oac_copy_channel_out_short(
-  void *dst,
-  int dst_stride,
-  int dst_channel,
-  const oac_res *src,
-  int src_stride,
-  int frame_size,
-  void *user_data
-)
-{
-   oac_int16 *short_dst;
-   oac_int32 i;
-   (void)user_data;
-   short_dst = (oac_int16*)dst;
-   if (src != NULL)
-   {
-      for (i=0;i<frame_size;i++)
-         short_dst[i*dst_stride+dst_channel] = RES2INT16(src[i*src_stride]);
-   }
-   else
-   {
-      for (i=0;i<frame_size;i++)
-         short_dst[i*dst_stride+dst_channel] = 0;
-   }
+    void *dst,
+    int dst_stride,
+    int dst_channel,
+    const oac_res *src,
+    int src_stride,
+    int frame_size,
+    void *user_data) {
+    oac_int16 *short_dst;
+    oac_int32 i;
+    (void)user_data;
+    short_dst = (oac_int16*)dst;
+    if (src != NULL) {
+        for (i = 0; i < frame_size; i++)
+            short_dst[i*dst_stride + dst_channel] = RES2INT16(src[i*src_stride]);
+    } else {
+        for (i = 0; i < frame_size; i++)
+            short_dst[i*dst_stride + dst_channel] = 0;
+    }
 }
 
 static void oac_copy_channel_out_int24(
-  void *dst,
-  int dst_stride,
-  int dst_channel,
-  const oac_res *src,
-  int src_stride,
-  int frame_size,
-  void *user_data
-)
-{
-   oac_int32 *short_dst;
-   oac_int32 i;
-   (void)user_data;
-   short_dst = (oac_int32*)dst;
-   if (src != NULL)
-   {
-      for (i=0;i<frame_size;i++)
-         short_dst[i*dst_stride+dst_channel] = RES2INT24(src[i*src_stride]);
-   }
-   else
-   {
-      for (i=0;i<frame_size;i++)
-         short_dst[i*dst_stride+dst_channel] = 0;
-   }
+    void *dst,
+    int dst_stride,
+    int dst_channel,
+    const oac_res *src,
+    int src_stride,
+    int frame_size,
+    void *user_data) {
+    oac_int32 *short_dst;
+    oac_int32 i;
+    (void)user_data;
+    short_dst = (oac_int32*)dst;
+    if (src != NULL) {
+        for (i = 0; i < frame_size; i++)
+            short_dst[i*dst_stride + dst_channel] = RES2INT24(src[i*src_stride]);
+    } else {
+        for (i = 0; i < frame_size; i++)
+            short_dst[i*dst_stride + dst_channel] = 0;
+    }
 }
 
 #ifdef FIXED_POINT
-#define OPTIONAL_CLIP 0
+# define OPTIONAL_CLIP 0
 #else
-#define OPTIONAL_CLIP 1
+# define OPTIONAL_CLIP 1
 #endif
 
 int oac_multistream_decode(
-      OacMSDecoder *st,
-      const unsigned char *data,
-      oac_int32 len,
-      oac_int16 *pcm,
-      int frame_size,
-      int decode_fec
-)
-{
-   return oac_multistream_decode_native(st, data, len,
+    OacMSDecoder *st,
+    const unsigned char *data,
+    oac_int32 len,
+    oac_int16 *pcm,
+    int frame_size,
+    int decode_fec) {
+    return oac_multistream_decode_native(st, data, len,
        pcm, oac_copy_channel_out_short, frame_size, decode_fec, OPTIONAL_CLIP, NULL);
 }
 
 int oac_multistream_decode24(
-      OacMSDecoder *st,
-      const unsigned char *data,
-      oac_int32 len,
-      oac_int32 *pcm,
-      int frame_size,
-      int decode_fec
-)
-{
-   return oac_multistream_decode_native(st, data, len,
+    OacMSDecoder *st,
+    const unsigned char *data,
+    oac_int32 len,
+    oac_int32 *pcm,
+    int frame_size,
+    int decode_fec) {
+    return oac_multistream_decode_native(st, data, len,
        pcm, oac_copy_channel_out_int24, frame_size, decode_fec, 0, NULL);
 }
 
 #ifndef DISABLE_FLOAT_API
 int oac_multistream_decode_float(OacMSDecoder *st, const unsigned char *data,
-      oac_int32 len, float *pcm, int frame_size, int decode_fec)
-{
-   return oac_multistream_decode_native(st, data, len,
+                                 oac_int32 len, float *pcm, int frame_size, int decode_fec) {
+    return oac_multistream_decode_native(st, data, len,
        pcm, oac_copy_channel_out_float, frame_size, decode_fec, 0, NULL);
 }
 #endif
 
 int oac_multistream_decoder_ctl_va_list(OacMSDecoder *st, int request,
-                                         va_list ap)
-{
-   int coupled_size, mono_size;
-   char *ptr;
-   int ret = OAC_OK;
-
-   coupled_size = oac_decoder_get_size(2);
-   mono_size = oac_decoder_get_size(1);
-   ptr = (char*)st + align(sizeof(OacMSDecoder));
-   switch (request)
-   {
-       case OAC_GET_BANDWIDTH_REQUEST:
-       case OAC_GET_SAMPLE_RATE_REQUEST:
-       case OAC_GET_GAIN_REQUEST:
-       case OAC_GET_LAST_PACKET_DURATION_REQUEST:
-       case OAC_GET_PHASE_INVERSION_DISABLED_REQUEST:
-       case OAC_GET_COMPLEXITY_REQUEST:
-       {
-          OacDecoder *dec;
-          /* For int32* GET params, just query the first stream */
-          oac_int32 *value = va_arg(ap, oac_int32*);
-          dec = (OacDecoder*)ptr;
-          ret = oac_decoder_ctl(dec, request, value);
-       }
-       break;
-       case OAC_GET_FINAL_RANGE_REQUEST:
-       {
-          int s;
-          oac_uint32 *value = va_arg(ap, oac_uint32*);
-          oac_uint32 tmp;
-          if (!value)
-          {
-             goto bad_arg;
-          }
-          *value = 0;
-          for (s=0;s<st->layout.nb_streams;s++)
-          {
-             OacDecoder *dec;
-             dec = (OacDecoder*)ptr;
-             if (s < st->layout.nb_coupled_streams)
-                ptr += align(coupled_size);
-             else
-                ptr += align(mono_size);
-             ret = oac_decoder_ctl(dec, request, &tmp);
-             if (ret != OAC_OK) break;
-             *value ^= tmp;
-          }
-       }
-       break;
-       case OAC_RESET_STATE:
-       {
-          int s;
-          for (s=0;s<st->layout.nb_streams;s++)
-          {
-             OacDecoder *dec;
-
-             dec = (OacDecoder*)ptr;
-             if (s < st->layout.nb_coupled_streams)
-                ptr += align(coupled_size);
-             else
-                ptr += align(mono_size);
-             ret = oac_decoder_ctl(dec, OAC_RESET_STATE);
-             if (ret != OAC_OK)
-                break;
-          }
-       }
-       break;
-       case OAC_MULTISTREAM_GET_DECODER_STATE_REQUEST:
-       {
-          int s;
-          oac_int32 stream_id;
-          OacDecoder **value;
-          stream_id = va_arg(ap, oac_int32);
-          if (stream_id<0 || stream_id >= st->layout.nb_streams)
-             goto bad_arg;
-          value = va_arg(ap, OacDecoder**);
-          if (!value)
-          {
-             goto bad_arg;
-          }
-          for (s=0;s<stream_id;s++)
-          {
-             if (s < st->layout.nb_coupled_streams)
-                ptr += align(coupled_size);
-             else
-                ptr += align(mono_size);
-          }
-          *value = (OacDecoder*)ptr;
-       }
-       break;
-       case OAC_SET_GAIN_REQUEST:
-       case OAC_SET_COMPLEXITY_REQUEST:
-       case OAC_SET_PHASE_INVERSION_DISABLED_REQUEST:
-       {
-          int s;
-          /* This works for int32 params */
-          oac_int32 value = va_arg(ap, oac_int32);
-          for (s=0;s<st->layout.nb_streams;s++)
-          {
-             OacDecoder *dec;
-
-             dec = (OacDecoder*)ptr;
-             if (s < st->layout.nb_coupled_streams)
-                ptr += align(coupled_size);
-             else
-                ptr += align(mono_size);
-             ret = oac_decoder_ctl(dec, request, value);
-             if (ret != OAC_OK)
-                break;
-          }
-       }
-       break;
-       default:
-          ret = OAC_UNIMPLEMENTED;
-       break;
-   }
-   return ret;
+                                        va_list ap) {
+    int coupled_size, mono_size;
+    char *ptr;
+    int ret = OAC_OK;
+
+    coupled_size = oac_decoder_get_size(2);
+    mono_size = oac_decoder_get_size(1);
+    ptr = (char*)st + align(sizeof(OacMSDecoder));
+    switch (request) {
+        case OAC_GET_BANDWIDTH_REQUEST:
+        case OAC_GET_SAMPLE_RATE_REQUEST:
+        case OAC_GET_GAIN_REQUEST:
+        case OAC_GET_LAST_PACKET_DURATION_REQUEST:
+        case OAC_GET_PHASE_INVERSION_DISABLED_REQUEST:
+        case OAC_GET_COMPLEXITY_REQUEST:
+        {
+            OacDecoder *dec;
+            /* For int32* GET params, just query the first stream */
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            dec = (OacDecoder*)ptr;
+            ret = oac_decoder_ctl(dec, request, value);
+        }
+        break;
+        case OAC_GET_FINAL_RANGE_REQUEST:
+        {
+            int s;
+            oac_uint32 *value = va_arg(ap, oac_uint32*);
+            oac_uint32 tmp;
+            if (!value) {
+                goto bad_arg;
+            }
+            *value = 0;
+            for (s = 0; s < st->layout.nb_streams; s++) {
+                OacDecoder *dec;
+                dec = (OacDecoder*)ptr;
+                if (s < st->layout.nb_coupled_streams)
+                    ptr += align(coupled_size);
+                else
+                    ptr += align(mono_size);
+                ret = oac_decoder_ctl(dec, request, &tmp);
+                if (ret != OAC_OK) break;
+                *value ^= tmp;
+            }
+        }
+        break;
+        case OAC_RESET_STATE:
+        {
+            int s;
+            for (s = 0; s < st->layout.nb_streams; s++) {
+                OacDecoder *dec;
+
+                dec = (OacDecoder*)ptr;
+                if (s < st->layout.nb_coupled_streams)
+                    ptr += align(coupled_size);
+                else
+                    ptr += align(mono_size);
+                ret = oac_decoder_ctl(dec, OAC_RESET_STATE);
+                if (ret != OAC_OK)
+                    break;
+            }
+        }
+        break;
+        case OAC_MULTISTREAM_GET_DECODER_STATE_REQUEST:
+        {
+            int s;
+            oac_int32 stream_id;
+            OacDecoder **value;
+            stream_id = va_arg(ap, oac_int32);
+            if (stream_id < 0 || stream_id >= st->layout.nb_streams)
+                goto bad_arg;
+            value = va_arg(ap, OacDecoder**);
+            if (!value) {
+                goto bad_arg;
+            }
+            for (s = 0; s < stream_id; s++) {
+                if (s < st->layout.nb_coupled_streams)
+                    ptr += align(coupled_size);
+                else
+                    ptr += align(mono_size);
+            }
+            *value = (OacDecoder*)ptr;
+        }
+        break;
+        case OAC_SET_GAIN_REQUEST:
+        case OAC_SET_COMPLEXITY_REQUEST:
+        case OAC_SET_PHASE_INVERSION_DISABLED_REQUEST:
+        {
+            int s;
+            /* This works for int32 params */
+            oac_int32 value = va_arg(ap, oac_int32);
+            for (s = 0; s < st->layout.nb_streams; s++) {
+                OacDecoder *dec;
+
+                dec = (OacDecoder*)ptr;
+                if (s < st->layout.nb_coupled_streams)
+                    ptr += align(coupled_size);
+                else
+                    ptr += align(mono_size);
+                ret = oac_decoder_ctl(dec, request, value);
+                if (ret != OAC_OK)
+                    break;
+            }
+        }
+        break;
+        default:
+            ret = OAC_UNIMPLEMENTED;
+            break;
+    }
+    return ret;
 bad_arg:
-   return OAC_BAD_ARG;
+    return OAC_BAD_ARG;
 }
 
-int oac_multistream_decoder_ctl(OacMSDecoder *st, int request, ...)
-{
-   int ret;
-   va_list ap;
-   va_start(ap, request);
-   ret = oac_multistream_decoder_ctl_va_list(st, request, ap);
-   va_end(ap);
-   return ret;
+int oac_multistream_decoder_ctl(OacMSDecoder *st, int request, ...) {
+    int ret;
+    va_list ap;
+    va_start(ap, request);
+    ret = oac_multistream_decoder_ctl_va_list(st, request, ap);
+    va_end(ap);
+    return ret;
 }
 
-void oac_multistream_decoder_destroy(OacMSDecoder *st)
-{
+void oac_multistream_decoder_destroy(OacMSDecoder *st) {
     oac_free(st);
 }
diff --git a/src/oac_multistream_encoder.c b/src/oac_multistream_encoder.c
index f049a2412..11df0bc7d 100644
--- a/src/oac_multistream_encoder.c
+++ b/src/oac_multistream_encoder.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "oac_multistream.h"
@@ -44,795 +44,718 @@
 #include "pitch.h"
 
 typedef struct {
-   int nb_streams;
-   int nb_coupled_streams;
-   unsigned char mapping[8];
+    int nb_streams;
+    int nb_coupled_streams;
+    unsigned char mapping[8];
 } VorbisLayout;
 
 /* Index is nb_channel-1*/
 static const VorbisLayout vorbis_mappings[8] = {
-      {1, 0, {0}},                      /* 1: mono */
-      {1, 1, {0, 1}},                   /* 2: stereo */
-      {2, 1, {0, 2, 1}},                /* 3: 1-d surround */
-      {2, 2, {0, 1, 2, 3}},             /* 4: quadraphonic surround */
-      {3, 2, {0, 4, 1, 2, 3}},          /* 5: 5-channel surround */
-      {4, 2, {0, 4, 1, 2, 3, 5}},       /* 6: 5.1 surround */
-      {4, 3, {0, 4, 1, 2, 3, 5, 6}},    /* 7: 6.1 surround */
-      {5, 3, {0, 6, 1, 2, 3, 4, 5, 7}}, /* 8: 7.1 surround */
+    {1, 0, {0}},                        /* 1: mono */
+    {1, 1, {0, 1}},                     /* 2: stereo */
+    {2, 1, {0, 2, 1}},                  /* 3: 1-d surround */
+    {2, 2, {0, 1, 2, 3}},               /* 4: quadraphonic surround */
+    {3, 2, {0, 4, 1, 2, 3}},            /* 5: 5-channel surround */
+    {4, 2, {0, 4, 1, 2, 3, 5}},         /* 6: 5.1 surround */
+    {4, 3, {0, 4, 1, 2, 3, 5, 6}},      /* 7: 6.1 surround */
+    {5, 3, {0, 6, 1, 2, 3, 4, 5, 7}},   /* 8: 7.1 surround */
 };
 
 #ifdef ENABLE_QEXT
-#define MAX_OVERLAP 240
+# define MAX_OVERLAP 240
 #else
-#define MAX_OVERLAP 120
+# define MAX_OVERLAP 120
 #endif
 
-static oac_val32 *ms_get_preemph_mem(OacMSEncoder *st)
-{
-   int s;
-   char *ptr;
-   int coupled_size, mono_size;
-
-   coupled_size = oac_encoder_init(NULL, st->Fs, 2, st->application);
-   mono_size = oac_encoder_init(NULL, st->Fs, 1, st->application);
-   ptr = (char*)st + align(sizeof(OacMSEncoder));
-   for (s=0;s<st->layout.nb_streams;s++)
-   {
-      if (s < st->layout.nb_coupled_streams)
-         ptr += align(coupled_size);
-      else
-         ptr += align(mono_size);
-   }
-   /* void* cast avoids clang -Wcast-align warning */
-   return (oac_val32*)(void*)(ptr+st->layout.nb_channels*MAX_OVERLAP*sizeof(oac_val32));
+static oac_val32 *ms_get_preemph_mem(OacMSEncoder *st) {
+    int s;
+    char *ptr;
+    int coupled_size, mono_size;
+
+    coupled_size = oac_encoder_init(NULL, st->Fs, 2, st->application);
+    mono_size = oac_encoder_init(NULL, st->Fs, 1, st->application);
+    ptr = (char*)st + align(sizeof(OacMSEncoder));
+    for (s = 0; s < st->layout.nb_streams; s++) {
+        if (s < st->layout.nb_coupled_streams)
+            ptr += align(coupled_size);
+        else
+            ptr += align(mono_size);
+    }
+    /* void* cast avoids clang -Wcast-align warning */
+    return (oac_val32*)(void*)(ptr + st->layout.nb_channels*MAX_OVERLAP*sizeof(oac_val32));
 }
 
-static oac_val32 *ms_get_window_mem(OacMSEncoder *st)
-{
-   int s;
-   char *ptr;
-   int coupled_size, mono_size;
-
-   coupled_size = oac_encoder_init(NULL, st->Fs, 2, st->application);
-   mono_size = oac_encoder_init(NULL, st->Fs, 1, st->application);
-   ptr = (char*)st + align(sizeof(OacMSEncoder));
-   for (s=0;s<st->layout.nb_streams;s++)
-   {
-      if (s < st->layout.nb_coupled_streams)
-         ptr += align(coupled_size);
-      else
-         ptr += align(mono_size);
-   }
-   /* void* cast avoids clang -Wcast-align warning */
-   return (oac_val32*)(void*)ptr;
+static oac_val32 *ms_get_window_mem(OacMSEncoder *st) {
+    int s;
+    char *ptr;
+    int coupled_size, mono_size;
+
+    coupled_size = oac_encoder_init(NULL, st->Fs, 2, st->application);
+    mono_size = oac_encoder_init(NULL, st->Fs, 1, st->application);
+    ptr = (char*)st + align(sizeof(OacMSEncoder));
+    for (s = 0; s < st->layout.nb_streams; s++) {
+        if (s < st->layout.nb_coupled_streams)
+            ptr += align(coupled_size);
+        else
+            ptr += align(mono_size);
+    }
+    /* void* cast avoids clang -Wcast-align warning */
+    return (oac_val32*)(void*)ptr;
 }
 
-static int validate_ambisonics(int nb_channels, int *nb_streams, int *nb_coupled_streams)
-{
-   int order_plus_one;
-   int acn_channels;
-   int nondiegetic_channels;
+static int validate_ambisonics(int nb_channels, int *nb_streams, int *nb_coupled_streams) {
+    int order_plus_one;
+    int acn_channels;
+    int nondiegetic_channels;
 
-   if (nb_channels < 1 || nb_channels > 227)
-      return 0;
+    if (nb_channels < 1 || nb_channels > 227)
+        return 0;
 
-   order_plus_one = isqrt32(nb_channels);
-   acn_channels = order_plus_one * order_plus_one;
-   nondiegetic_channels = nb_channels - acn_channels;
+    order_plus_one = isqrt32(nb_channels);
+    acn_channels = order_plus_one*order_plus_one;
+    nondiegetic_channels = nb_channels - acn_channels;
 
-   if (nondiegetic_channels != 0 && nondiegetic_channels != 2)
-      return 0;
+    if (nondiegetic_channels != 0 && nondiegetic_channels != 2)
+        return 0;
 
-   if (nb_streams)
-      *nb_streams = acn_channels + (nondiegetic_channels != 0);
-   if (nb_coupled_streams)
-      *nb_coupled_streams = nondiegetic_channels != 0;
-   return 1;
+    if (nb_streams)
+        *nb_streams = acn_channels + (nondiegetic_channels != 0);
+    if (nb_coupled_streams)
+        *nb_coupled_streams = nondiegetic_channels != 0;
+    return 1;
 }
 
-static int validate_encoder_layout(const ChannelLayout *layout)
-{
-   int s;
-   for (s=0;s<layout->nb_streams;s++)
-   {
-      if (s < layout->nb_coupled_streams)
-      {
-         if (get_left_channel(layout, s, -1)==-1)
-            return 0;
-         if (get_right_channel(layout, s, -1)==-1)
-            return 0;
-      } else {
-         if (get_mono_channel(layout, s, -1)==-1)
-            return 0;
-      }
-   }
-   return 1;
+static int validate_encoder_layout(const ChannelLayout *layout) {
+    int s;
+    for (s = 0; s < layout->nb_streams; s++) {
+        if (s < layout->nb_coupled_streams) {
+            if (get_left_channel(layout, s, -1) == -1)
+                return 0;
+            if (get_right_channel(layout, s, -1) == -1)
+                return 0;
+        } else {
+            if (get_mono_channel(layout, s, -1) == -1)
+                return 0;
+        }
+    }
+    return 1;
 }
 
-static void channel_pos(int channels, int pos[8])
-{
-   /* Position in the mix: 0 don't mix, 1: left, 2: center, 3:right */
-   if (channels==4)
-   {
-      pos[0]=1;
-      pos[1]=3;
-      pos[2]=1;
-      pos[3]=3;
-   } else if (channels==3||channels==5||channels==6)
-   {
-      pos[0]=1;
-      pos[1]=2;
-      pos[2]=3;
-      pos[3]=1;
-      pos[4]=3;
-      pos[5]=0;
-   } else if (channels==7)
-   {
-      pos[0]=1;
-      pos[1]=2;
-      pos[2]=3;
-      pos[3]=1;
-      pos[4]=3;
-      pos[5]=2;
-      pos[6]=0;
-   } else if (channels==8)
-   {
-      pos[0]=1;
-      pos[1]=2;
-      pos[2]=3;
-      pos[3]=1;
-      pos[4]=3;
-      pos[5]=1;
-      pos[6]=3;
-      pos[7]=0;
-   }
+static void channel_pos(int channels, int pos[8]) {
+    /* Position in the mix: 0 don't mix, 1: left, 2: center, 3:right */
+    if (channels == 4) {
+        pos[0] = 1;
+        pos[1] = 3;
+        pos[2] = 1;
+        pos[3] = 3;
+    } else if (channels == 3 || channels == 5 || channels == 6) {
+        pos[0] = 1;
+        pos[1] = 2;
+        pos[2] = 3;
+        pos[3] = 1;
+        pos[4] = 3;
+        pos[5] = 0;
+    } else if (channels == 7) {
+        pos[0] = 1;
+        pos[1] = 2;
+        pos[2] = 3;
+        pos[3] = 1;
+        pos[4] = 3;
+        pos[5] = 2;
+        pos[6] = 0;
+    } else if (channels == 8) {
+        pos[0] = 1;
+        pos[1] = 2;
+        pos[2] = 3;
+        pos[3] = 1;
+        pos[4] = 3;
+        pos[5] = 1;
+        pos[6] = 3;
+        pos[7] = 0;
+    }
 }
 
 #if 1
 /* Computes a rough approximation of log2(2^a + 2^b) */
-static oac_val16 logSum(celt_glog a, celt_glog b)
-{
-   celt_glog max;
-   celt_glog diff;
-   celt_glog frac;
-   static const celt_glog diff_table[17] = {
-         GCONST(0.5000000f), GCONST(0.2924813f), GCONST(0.1609640f), GCONST(0.0849625f),
-         GCONST(0.0437314f), GCONST(0.0221971f), GCONST(0.0111839f), GCONST(0.0056136f),
-         GCONST(0.0028123f)
-   };
-   int low;
-   if (a>b)
-   {
-      max = a;
-      diff = SUB32(a,b);
-   } else {
-      max = b;
-      diff = SUB32(b,a);
-   }
-   if (!(diff < GCONST(8.f)))  /* inverted to catch NaNs */
-      return max;
-#ifdef FIXED_POINT
-   low = SHR32(diff, DB_SHIFT-1);
-   frac = VSHR32(diff - SHL32(low, DB_SHIFT-1), DB_SHIFT-16);
-#else
-   low = (int)floor(2*diff);
-   frac = 2*diff - low;
-#endif
-   return max + diff_table[low] + MULT16_32_Q15(frac, SUB32(diff_table[low+1], diff_table[low]));
+static oac_val16 logSum(celt_glog a, celt_glog b) {
+    celt_glog max;
+    celt_glog diff;
+    celt_glog frac;
+    static const celt_glog diff_table[17] = {
+        GCONST(0.5000000f), GCONST(0.2924813f), GCONST(0.1609640f), GCONST(0.0849625f),
+        GCONST(0.0437314f), GCONST(0.0221971f), GCONST(0.0111839f), GCONST(0.0056136f),
+        GCONST(0.0028123f)
+    };
+    int low;
+    if (a > b) {
+        max = a;
+        diff = SUB32(a, b);
+    } else {
+        max = b;
+        diff = SUB32(b, a);
+    }
+    if (!(diff < GCONST(8.f))) /* inverted to catch NaNs */
+        return max;
+# ifdef FIXED_POINT
+    low = SHR32(diff, DB_SHIFT - 1);
+    frac = VSHR32(diff - SHL32(low, DB_SHIFT - 1), DB_SHIFT - 16);
+# else
+    low = (int)floor(2*diff);
+    frac = 2*diff - low;
+# endif
+    return max + diff_table[low] + MULT16_32_Q15(frac, SUB32(diff_table[low + 1], diff_table[low]));
 }
 #else
-oac_val16 logSum(oac_val16 a, oac_val16 b)
-{
-   return log2(pow(4, a)+ pow(4, b))/2;
+oac_val16 logSum(oac_val16 a, oac_val16 b) {
+    return log2(pow(4, a) + pow(4, b))/2;
 }
 #endif
 
-void surround_analysis(const CELTMode *celt_mode, const void *pcm, celt_glog *bandLogE, oac_val32 *mem, oac_val32 *preemph_mem,
-      int len, int overlap, int channels, int rate, oac_copy_channel_in_func copy_channel_in, int arch
-)
-{
-   int c;
-   int i;
-   int LM;
-   int pos[8] = {0};
-   int upsample;
-   int frame_size;
-   int freq_size;
-   oac_val16 channel_offset;
-   oac_val32 bandE[21];
-   celt_glog maskLogE[3][21];
-   VARDECL(oac_val32, in);
-   VARDECL(oac_res, x);
-   VARDECL(oac_val32, freq);
-   SAVE_STACK;
-
-   upsample = resampling_factor(rate);
-   frame_size = len*upsample;
-
-   /* LM = log2(frame_size / 120) */
-   for (LM=0;LM<celt_mode->maxLM;LM++)
-      if (celt_mode->shortMdctSize<<LM==frame_size)
-         break;
-
-   freq_size = celt_mode->shortMdctSize<<LM;
-
-   ALLOC(in, frame_size+overlap, oac_val32);
-   ALLOC(x, len, oac_res);
-   ALLOC(freq, freq_size, oac_val32);
-
-   channel_pos(channels, pos);
-
-   for (c=0;c<3;c++)
-      for (i=0;i<21;i++)
-         maskLogE[c][i] = -GCONST(28.f);
-
-   for (c=0;c<channels;c++)
-   {
-      int frame;
-      int nb_frames = frame_size/freq_size;
-      celt_assert(nb_frames*freq_size == frame_size);
-      OAC_COPY(in, mem+c*overlap, overlap);
-      (*copy_channel_in)(x, 1, pcm, channels, c, len, NULL);
-      celt_preemphasis(x, in+overlap, frame_size, 1, upsample, celt_mode->preemph, preemph_mem+c, 0);
+void surround_analysis(const CELTMode *celt_mode, const void *pcm, celt_glog *bandLogE, oac_val32 *mem,
+                       oac_val32 *preemph_mem,
+                       int len, int overlap, int channels, int rate, oac_copy_channel_in_func copy_channel_in,
+                       int arch) {
+    int c;
+    int i;
+    int LM;
+    int pos[8] = {0};
+    int upsample;
+    int frame_size;
+    int freq_size;
+    oac_val16 channel_offset;
+    oac_val32 bandE[21];
+    celt_glog maskLogE[3][21];
+    VARDECL(oac_val32, in);
+    VARDECL(oac_res, x);
+    VARDECL(oac_val32, freq);
+    SAVE_STACK;
+
+    upsample = resampling_factor(rate);
+    frame_size = len*upsample;
+
+    /* LM = log2(frame_size / 120) */
+    for (LM = 0; LM < celt_mode->maxLM; LM++)
+        if (celt_mode->shortMdctSize<<LM == frame_size)
+            break;
+
+    freq_size = celt_mode->shortMdctSize<<LM;
+
+    ALLOC(in, frame_size + overlap, oac_val32);
+    ALLOC(x, len, oac_res);
+    ALLOC(freq, freq_size, oac_val32);
+
+    channel_pos(channels, pos);
+
+    for (c = 0; c < 3; c++)
+        for (i = 0; i < 21; i++)
+            maskLogE[c][i] = -GCONST(28.f);
+
+    for (c = 0; c < channels; c++) {
+        int frame;
+        int nb_frames = frame_size/freq_size;
+        celt_assert(nb_frames*freq_size == frame_size);
+        OAC_COPY(in, mem + c*overlap, overlap);
+        (*copy_channel_in)(x, 1, pcm, channels, c, len, NULL);
+        celt_preemphasis(x, in + overlap, frame_size, 1, upsample, celt_mode->preemph, preemph_mem + c, 0);
 #ifndef FIXED_POINT
-      {
-         oac_val32 sum;
-         sum = celt_inner_prod(in, in, frame_size+overlap, 0);
-         /* This should filter out both NaNs and ridiculous signals that could
-            cause NaNs further down. */
-         if (!(sum < 1e18f) || celt_isnan(sum))
-         {
-            OAC_CLEAR(in, frame_size+overlap);
-            preemph_mem[c] = 0;
-         }
-      }
+        {
+            oac_val32 sum;
+            sum = celt_inner_prod(in, in, frame_size + overlap, 0);
+            /* This should filter out both NaNs and ridiculous signals that could
+               cause NaNs further down. */
+            if (!(sum < 1e18f) || celt_isnan(sum)) {
+                OAC_CLEAR(in, frame_size + overlap);
+                preemph_mem[c] = 0;
+            }
+        }
 #endif
-      OAC_CLEAR(bandE, 21);
-      for (frame=0;frame<nb_frames;frame++)
-      {
-         oac_val32 tmpE[21];
-         clt_mdct_forward(&celt_mode->mdct, in+freq_size*frame, freq, celt_mode->window,
-               overlap, celt_mode->maxLM-LM, 1, arch);
-         if (upsample != 1)
-         {
-            int bound = freq_size/upsample;
-            for (i=0;i<bound;i++)
-               freq[i] *= upsample;
-            for (;i<freq_size;i++)
-               freq[i] = 0;
-         }
-
-         compute_band_energies(celt_mode, freq, tmpE, 21, 1, LM, arch);
-         /* If we have multiple frames, take the max energy. */
-         for (i=0;i<21;i++)
-            bandE[i] = MAX32(bandE[i], tmpE[i]);
-      }
-      amp2Log2(celt_mode, 21, 21, bandE, bandLogE+21*c, 1);
-      /* Apply spreading function with -6 dB/band going up and -12 dB/band going down. */
-      for (i=1;i<21;i++)
-         bandLogE[21*c+i] = MAXG(bandLogE[21*c+i], bandLogE[21*c+i-1]-GCONST(1.f));
-      for (i=19;i>=0;i--)
-         bandLogE[21*c+i] = MAXG(bandLogE[21*c+i], bandLogE[21*c+i+1]-GCONST(2.f));
-      if (pos[c]==1)
-      {
-         for (i=0;i<21;i++)
-            maskLogE[0][i] = logSum(maskLogE[0][i], bandLogE[21*c+i]);
-      } else if (pos[c]==3)
-      {
-         for (i=0;i<21;i++)
-            maskLogE[2][i] = logSum(maskLogE[2][i], bandLogE[21*c+i]);
-      } else if (pos[c]==2)
-      {
-         for (i=0;i<21;i++)
-         {
-            maskLogE[0][i] = logSum(maskLogE[0][i], bandLogE[21*c+i]-GCONST(.5f));
-            maskLogE[2][i] = logSum(maskLogE[2][i], bandLogE[21*c+i]-GCONST(.5f));
-         }
-      }
+        OAC_CLEAR(bandE, 21);
+        for (frame = 0; frame < nb_frames; frame++) {
+            oac_val32 tmpE[21];
+            clt_mdct_forward(&celt_mode->mdct, in + freq_size*frame, freq, celt_mode->window,
+               overlap, celt_mode->maxLM - LM, 1, arch);
+            if (upsample != 1) {
+                int bound = freq_size/upsample;
+                for (i = 0; i < bound; i++)
+                    freq[i] *= upsample;
+                for (; i < freq_size; i++)
+                    freq[i] = 0;
+            }
+
+            compute_band_energies(celt_mode, freq, tmpE, 21, 1, LM, arch);
+            /* If we have multiple frames, take the max energy. */
+            for (i = 0; i < 21; i++)
+                bandE[i] = MAX32(bandE[i], tmpE[i]);
+        }
+        amp2Log2(celt_mode, 21, 21, bandE, bandLogE + 21*c, 1);
+        /* Apply spreading function with -6 dB/band going up and -12 dB/band going down. */
+        for (i = 1; i < 21; i++)
+            bandLogE[21*c + i] = MAXG(bandLogE[21*c + i], bandLogE[21*c + i - 1] - GCONST(1.f));
+        for (i = 19; i >= 0; i--)
+            bandLogE[21*c + i] = MAXG(bandLogE[21*c + i], bandLogE[21*c + i + 1] - GCONST(2.f));
+        if (pos[c] == 1) {
+            for (i = 0; i < 21; i++)
+                maskLogE[0][i] = logSum(maskLogE[0][i], bandLogE[21*c + i]);
+        } else if (pos[c] == 3) {
+            for (i = 0; i < 21; i++)
+                maskLogE[2][i] = logSum(maskLogE[2][i], bandLogE[21*c + i]);
+        } else if (pos[c] == 2) {
+            for (i = 0; i < 21; i++) {
+                maskLogE[0][i] = logSum(maskLogE[0][i], bandLogE[21*c + i] - GCONST(.5f));
+                maskLogE[2][i] = logSum(maskLogE[2][i], bandLogE[21*c + i] - GCONST(.5f));
+            }
+        }
 #if 0
-      for (i=0;i<21;i++)
-         printf("%f ", bandLogE[21*c+i]);
-      float sum=0;
-      for (i=0;i<21;i++)
-         sum += bandLogE[21*c+i];
-      printf("%f ", sum/21);
+        for (i = 0; i < 21; i++)
+            printf("%f ", bandLogE[21*c + i]);
+        float sum = 0;
+        for (i = 0; i < 21; i++)
+            sum += bandLogE[21*c + i];
+        printf("%f ", sum/21);
 #endif
-      OAC_COPY(mem+c*overlap, in+frame_size, overlap);
-   }
-   for (i=0;i<21;i++)
-      maskLogE[1][i] = MIN32(maskLogE[0][i],maskLogE[2][i]);
-   channel_offset = HALF16(celt_log2(QCONST32(2.f,14)/(channels-1)));
-   for (c=0;c<3;c++)
-      for (i=0;i<21;i++)
-         maskLogE[c][i] += channel_offset;
+        OAC_COPY(mem + c*overlap, in + frame_size, overlap);
+    }
+    for (i = 0; i < 21; i++)
+        maskLogE[1][i] = MIN32(maskLogE[0][i], maskLogE[2][i]);
+    channel_offset = HALF16(celt_log2(QCONST32(2.f, 14)/(channels - 1)));
+    for (c = 0; c < 3; c++)
+        for (i = 0; i < 21; i++)
+            maskLogE[c][i] += channel_offset;
 #if 0
-   for (c=0;c<3;c++)
-   {
-      for (i=0;i<21;i++)
-         printf("%f ", maskLogE[c][i]);
-   }
+    for (c = 0; c < 3; c++) {
+        for (i = 0; i < 21; i++)
+            printf("%f ", maskLogE[c][i]);
+    }
 #endif
-   for (c=0;c<channels;c++)
-   {
-      celt_glog *mask;
-      if (pos[c]!=0)
-      {
-         mask = &maskLogE[pos[c]-1][0];
-         for (i=0;i<21;i++)
-            bandLogE[21*c+i] = bandLogE[21*c+i] - mask[i];
-      } else {
-         for (i=0;i<21;i++)
-            bandLogE[21*c+i] = 0;
-      }
+    for (c = 0; c < channels; c++) {
+        celt_glog *mask;
+        if (pos[c] != 0) {
+            mask = &maskLogE[pos[c] - 1][0];
+            for (i = 0; i < 21; i++)
+                bandLogE[21*c + i] = bandLogE[21*c + i] - mask[i];
+        } else {
+            for (i = 0; i < 21; i++)
+                bandLogE[21*c + i] = 0;
+        }
 #if 0
-      for (i=0;i<21;i++)
-         printf("%f ", bandLogE[21*c+i]);
-      printf("\n");
+        for (i = 0; i < 21; i++)
+            printf("%f ", bandLogE[21*c + i]);
+        printf("\n");
 #endif
 #if 0
-      float sum=0;
-      for (i=0;i<21;i++)
-         sum += bandLogE[21*c+i];
-      printf("%f ", sum/(float)QCONST32(21.f, DB_SHIFT));
-      printf("\n");
+        float sum = 0;
+        for (i = 0; i < 21; i++)
+            sum += bandLogE[21*c + i];
+        printf("%f ", sum/(float)QCONST32(21.f, DB_SHIFT));
+        printf("\n");
 #endif
-   }
-   RESTORE_STACK;
+    }
+    RESTORE_STACK;
 }
 
-oac_int32 oac_multistream_encoder_get_size(int nb_streams, int nb_coupled_streams)
-{
-   int coupled_size;
-   int mono_size;
-
-   if(nb_streams<1||nb_coupled_streams>nb_streams||nb_coupled_streams<0)return 0;
-   coupled_size = oac_encoder_get_size(2);
-   mono_size = oac_encoder_get_size(1);
-   return align(sizeof(OacMSEncoder))
-        + nb_coupled_streams * align(coupled_size)
-        + (nb_streams-nb_coupled_streams) * align(mono_size);
+oac_int32 oac_multistream_encoder_get_size(int nb_streams, int nb_coupled_streams) {
+    int coupled_size;
+    int mono_size;
+
+    if (nb_streams < 1 || nb_coupled_streams > nb_streams || nb_coupled_streams < 0) return 0;
+    coupled_size = oac_encoder_get_size(2);
+    mono_size = oac_encoder_get_size(1);
+    return align(sizeof(OacMSEncoder))
+           + nb_coupled_streams*align(coupled_size)
+           + (nb_streams - nb_coupled_streams)*align(mono_size);
 }
 
-oac_int32 oac_multistream_surround_encoder_get_size(int channels, int mapping_family)
-{
-   int nb_streams;
-   int nb_coupled_streams;
-   oac_int32 size;
-
-   if (mapping_family==0)
-   {
-      if (channels==1)
-      {
-         nb_streams=1;
-         nb_coupled_streams=0;
-      } else if (channels==2)
-      {
-         nb_streams=1;
-         nb_coupled_streams=1;
-      } else
-         return 0;
-   } else if (mapping_family==1 && channels<=8 && channels>=1)
-   {
-      nb_streams=vorbis_mappings[channels-1].nb_streams;
-      nb_coupled_streams=vorbis_mappings[channels-1].nb_coupled_streams;
-   } else if (mapping_family==255)
-   {
-      nb_streams=channels;
-      nb_coupled_streams=0;
-   } else if (mapping_family==2)
-   {
-      if (!validate_ambisonics(channels, &nb_streams, &nb_coupled_streams))
-         return 0;
-   } else
-      return 0;
-   size = oac_multistream_encoder_get_size(nb_streams, nb_coupled_streams);
-   if (channels>2)
-   {
-      size += channels*(MAX_OVERLAP*sizeof(oac_val32) + sizeof(oac_val32));
-   }
-   return size;
+oac_int32 oac_multistream_surround_encoder_get_size(int channels, int mapping_family) {
+    int nb_streams;
+    int nb_coupled_streams;
+    oac_int32 size;
+
+    if (mapping_family == 0) {
+        if (channels == 1) {
+            nb_streams = 1;
+            nb_coupled_streams = 0;
+        } else if (channels == 2) {
+            nb_streams = 1;
+            nb_coupled_streams = 1;
+        } else
+            return 0;
+    } else if (mapping_family == 1 && channels <= 8 && channels >= 1) {
+        nb_streams = vorbis_mappings[channels - 1].nb_streams;
+        nb_coupled_streams = vorbis_mappings[channels - 1].nb_coupled_streams;
+    } else if (mapping_family == 255) {
+        nb_streams = channels;
+        nb_coupled_streams = 0;
+    } else if (mapping_family == 2) {
+        if (!validate_ambisonics(channels, &nb_streams, &nb_coupled_streams))
+            return 0;
+    } else
+        return 0;
+    size = oac_multistream_encoder_get_size(nb_streams, nb_coupled_streams);
+    if (channels > 2) {
+        size += channels*(MAX_OVERLAP*sizeof(oac_val32) + sizeof(oac_val32));
+    }
+    return size;
 }
 
 static int oac_multistream_encoder_init_impl(
-      OacMSEncoder *st,
-      oac_int32 Fs,
-      int channels,
-      int streams,
-      int coupled_streams,
-      const unsigned char *mapping,
-      int application,
-      MappingType mapping_type
-)
-{
-   int coupled_size;
-   int mono_size;
-   int i, ret;
-   char *ptr;
-
-   if ((channels>255) || (channels<1) || (coupled_streams>streams) ||
-       (streams<1) || (coupled_streams<0) || (streams>255-coupled_streams) ||
-       (streams+coupled_streams>channels))
-      return OAC_BAD_ARG;
-
-   coupled_size = oac_encoder_init(NULL, Fs, 2, application);
-   if (coupled_size < 0)
-      return coupled_size;
-   mono_size = oac_encoder_init(NULL, Fs, 1, application);
-   if (mono_size < 0)
-      return mono_size;
-   if (st == NULL)
-   {
-      int surround_size=0;
-      if (mapping_type == MAPPING_TYPE_SURROUND) {
-         surround_size = channels*(MAX_OVERLAP*sizeof(oac_val32) + sizeof(oac_val32));
-      }
-
-      return align(sizeof(OacMSEncoder)) + coupled_streams*align(coupled_size)
-             + (streams-coupled_streams)*align(mono_size) + surround_size;
-   }
-
-   st->arch = oac_select_arch();
-   st->layout.nb_channels = channels;
-   st->layout.nb_streams = streams;
-   st->layout.nb_coupled_streams = coupled_streams;
-   if (mapping_type != MAPPING_TYPE_SURROUND)
-      st->lfe_stream = -1;
-   st->bitrate_bps = OAC_AUTO;
-   st->application = application;
-   st->Fs = Fs;
-   st->variable_duration = OAC_FRAMESIZE_ARG;
-   for (i=0;i<st->layout.nb_channels;i++)
-      st->layout.mapping[i] = mapping[i];
-   if (!validate_layout(&st->layout))
-      return OAC_BAD_ARG;
-   if (!validate_encoder_layout(&st->layout))
-      return OAC_BAD_ARG;
-   if (mapping_type == MAPPING_TYPE_AMBISONICS &&
-       !validate_ambisonics(st->layout.nb_channels, NULL, NULL))
-      return OAC_BAD_ARG;
-   ptr = (char*)st + align(sizeof(OacMSEncoder));
-   for (i=0;i<st->layout.nb_coupled_streams;i++)
-   {
-      ret = oac_encoder_init((OacEncoder*)ptr, Fs, 2, application);
-      if(ret!=OAC_OK)return ret;
-      if (i==st->lfe_stream)
-         oac_encoder_ctl((OacEncoder*)ptr, OAC_SET_LFE(1));
-      ptr += align(coupled_size);
-   }
-   for (;i<st->layout.nb_streams;i++)
-   {
-      ret = oac_encoder_init((OacEncoder*)ptr, Fs, 1, application);
-      if(ret!=OAC_OK)return ret;
-      if (i==st->lfe_stream)
-         oac_encoder_ctl((OacEncoder*)ptr, OAC_SET_LFE(1));
-      ptr += align(mono_size);
-   }
-   if (mapping_type == MAPPING_TYPE_SURROUND)
-   {
-      OAC_CLEAR(ms_get_preemph_mem(st), channels);
-      OAC_CLEAR(ms_get_window_mem(st), channels*MAX_OVERLAP);
-   }
-   st->mapping_type = mapping_type;
-   return OAC_OK;
+    OacMSEncoder *st,
+    oac_int32 Fs,
+    int channels,
+    int streams,
+    int coupled_streams,
+    const unsigned char *mapping,
+    int application,
+    MappingType mapping_type) {
+    int coupled_size;
+    int mono_size;
+    int i, ret;
+    char *ptr;
+
+    if ((channels > 255) || (channels < 1) || (coupled_streams > streams)
+        || (streams < 1) || (coupled_streams < 0) || (streams > 255 - coupled_streams)
+        || (streams + coupled_streams > channels))
+        return OAC_BAD_ARG;
+
+    coupled_size = oac_encoder_init(NULL, Fs, 2, application);
+    if (coupled_size < 0)
+        return coupled_size;
+    mono_size = oac_encoder_init(NULL, Fs, 1, application);
+    if (mono_size < 0)
+        return mono_size;
+    if (st == NULL) {
+        int surround_size = 0;
+        if (mapping_type == MAPPING_TYPE_SURROUND) {
+            surround_size = channels*(MAX_OVERLAP*sizeof(oac_val32) + sizeof(oac_val32));
+        }
+
+        return align(sizeof(OacMSEncoder)) + coupled_streams*align(coupled_size)
+               + (streams - coupled_streams)*align(mono_size) + surround_size;
+    }
+
+    st->arch = oac_select_arch();
+    st->layout.nb_channels = channels;
+    st->layout.nb_streams = streams;
+    st->layout.nb_coupled_streams = coupled_streams;
+    if (mapping_type != MAPPING_TYPE_SURROUND)
+        st->lfe_stream = -1;
+    st->bitrate_bps = OAC_AUTO;
+    st->application = application;
+    st->Fs = Fs;
+    st->variable_duration = OAC_FRAMESIZE_ARG;
+    for (i = 0; i < st->layout.nb_channels; i++)
+        st->layout.mapping[i] = mapping[i];
+    if (!validate_layout(&st->layout))
+        return OAC_BAD_ARG;
+    if (!validate_encoder_layout(&st->layout))
+        return OAC_BAD_ARG;
+    if (mapping_type == MAPPING_TYPE_AMBISONICS
+        && !validate_ambisonics(st->layout.nb_channels, NULL, NULL))
+        return OAC_BAD_ARG;
+    ptr = (char*)st + align(sizeof(OacMSEncoder));
+    for (i = 0; i < st->layout.nb_coupled_streams; i++) {
+        ret = oac_encoder_init((OacEncoder*)ptr, Fs, 2, application);
+        if (ret != OAC_OK) return ret;
+        if (i == st->lfe_stream)
+            oac_encoder_ctl((OacEncoder*)ptr, OAC_SET_LFE(1));
+        ptr += align(coupled_size);
+    }
+    for (; i < st->layout.nb_streams; i++) {
+        ret = oac_encoder_init((OacEncoder*)ptr, Fs, 1, application);
+        if (ret != OAC_OK) return ret;
+        if (i == st->lfe_stream)
+            oac_encoder_ctl((OacEncoder*)ptr, OAC_SET_LFE(1));
+        ptr += align(mono_size);
+    }
+    if (mapping_type == MAPPING_TYPE_SURROUND) {
+        OAC_CLEAR(ms_get_preemph_mem(st), channels);
+        OAC_CLEAR(ms_get_window_mem(st), channels*MAX_OVERLAP);
+    }
+    st->mapping_type = mapping_type;
+    return OAC_OK;
 }
 
 int oac_multistream_encoder_init(
-      OacMSEncoder *st,
-      oac_int32 Fs,
-      int channels,
-      int streams,
-      int coupled_streams,
-      const unsigned char *mapping,
-      int application
-)
-{
-   return oac_multistream_encoder_init_impl(st, Fs, channels, streams,
+    OacMSEncoder *st,
+    oac_int32 Fs,
+    int channels,
+    int streams,
+    int coupled_streams,
+    const unsigned char *mapping,
+    int application) {
+    return oac_multistream_encoder_init_impl(st, Fs, channels, streams,
                                              coupled_streams, mapping,
                                              application, MAPPING_TYPE_NONE);
 }
 
 int oac_multistream_surround_encoder_init(
-      OacMSEncoder *st,
-      oac_int32 Fs,
-      int channels,
-      int mapping_family,
-      int *streams,
-      int *coupled_streams,
-      unsigned char *mapping,
-      int application
-)
-{
-   MappingType mapping_type;
-   int lfe_stream;
-
-   if ((channels>255) || (channels<1))
-      return OAC_BAD_ARG;
-   lfe_stream = -1;
-   if (mapping_family==0)
-   {
-      if (channels==1)
-      {
-         *streams=1;
-         *coupled_streams=0;
-         mapping[0]=0;
-      } else if (channels==2)
-      {
-         *streams=1;
-         *coupled_streams=1;
-         mapping[0]=0;
-         mapping[1]=1;
-      } else
-         return OAC_UNIMPLEMENTED;
-   } else if (mapping_family==1 && channels<=8 && channels>=1)
-   {
-      int i;
-      *streams=vorbis_mappings[channels-1].nb_streams;
-      *coupled_streams=vorbis_mappings[channels-1].nb_coupled_streams;
-      for (i=0;i<channels;i++)
-         mapping[i] = vorbis_mappings[channels-1].mapping[i];
-      if (channels>=6)
-         lfe_stream = *streams-1;
-   } else if (mapping_family==255)
-   {
-      int i;
-      *streams=channels;
-      *coupled_streams=0;
-      for(i=0;i<channels;i++)
-         mapping[i] = i;
-   } else if (mapping_family==2)
-   {
-      int i;
-      if (!validate_ambisonics(channels, streams, coupled_streams))
-         return OAC_BAD_ARG;
-      for(i = 0; i < (*streams - *coupled_streams); i++)
-         mapping[i] = i + (*coupled_streams * 2);
-      for(i = 0; i < *coupled_streams * 2; i++)
-         mapping[i + (*streams - *coupled_streams)] = i;
-   } else
-      return OAC_UNIMPLEMENTED;
-
-   if (channels>2 && mapping_family==1) {
-      mapping_type = MAPPING_TYPE_SURROUND;
-   } else if (mapping_family==2)
-   {
-      mapping_type = MAPPING_TYPE_AMBISONICS;
-   } else
-   {
-      mapping_type = MAPPING_TYPE_NONE;
-   }
-   if (st != NULL) {
-      st->lfe_stream = lfe_stream;
-   }
-   return oac_multistream_encoder_init_impl(st, Fs, channels, *streams,
+    OacMSEncoder *st,
+    oac_int32 Fs,
+    int channels,
+    int mapping_family,
+    int *streams,
+    int *coupled_streams,
+    unsigned char *mapping,
+    int application) {
+    MappingType mapping_type;
+    int lfe_stream;
+
+    if ((channels > 255) || (channels < 1))
+        return OAC_BAD_ARG;
+    lfe_stream = -1;
+    if (mapping_family == 0) {
+        if (channels == 1) {
+            *streams = 1;
+            *coupled_streams = 0;
+            mapping[0] = 0;
+        } else if (channels == 2) {
+            *streams = 1;
+            *coupled_streams = 1;
+            mapping[0] = 0;
+            mapping[1] = 1;
+        } else
+            return OAC_UNIMPLEMENTED;
+    } else if (mapping_family == 1 && channels <= 8 && channels >= 1) {
+        int i;
+        *streams = vorbis_mappings[channels - 1].nb_streams;
+        *coupled_streams = vorbis_mappings[channels - 1].nb_coupled_streams;
+        for (i = 0; i < channels; i++)
+            mapping[i] = vorbis_mappings[channels - 1].mapping[i];
+        if (channels >= 6)
+            lfe_stream = *streams - 1;
+    } else if (mapping_family == 255) {
+        int i;
+        *streams = channels;
+        *coupled_streams = 0;
+        for (i = 0; i < channels; i++)
+            mapping[i] = i;
+    } else if (mapping_family == 2) {
+        int i;
+        if (!validate_ambisonics(channels, streams, coupled_streams))
+            return OAC_BAD_ARG;
+        for (i = 0; i < (*streams - *coupled_streams); i++)
+            mapping[i] = i + (*coupled_streams*2);
+        for (i = 0; i < *coupled_streams*2; i++)
+            mapping[i + (*streams - *coupled_streams)] = i;
+    } else
+        return OAC_UNIMPLEMENTED;
+
+    if (channels > 2 && mapping_family == 1) {
+        mapping_type = MAPPING_TYPE_SURROUND;
+    } else if (mapping_family == 2) {
+        mapping_type = MAPPING_TYPE_AMBISONICS;
+    } else {
+        mapping_type = MAPPING_TYPE_NONE;
+    }
+    if (st != NULL) {
+        st->lfe_stream = lfe_stream;
+    }
+    return oac_multistream_encoder_init_impl(st, Fs, channels, *streams,
                                              *coupled_streams, mapping,
                                              application, mapping_type);
 }
 
 OacMSEncoder *oac_multistream_encoder_create(
-      oac_int32 Fs,
-      int channels,
-      int streams,
-      int coupled_streams,
-      const unsigned char *mapping,
-      int application,
-      int *error
-)
-{
-   int ret;
-   OacMSEncoder *st;
-   oac_int32 size;
-   if ((channels>255) || (channels<1) || (coupled_streams>streams) ||
-       (streams<1) || (coupled_streams<0) || (streams>255-coupled_streams) ||
-       (streams+coupled_streams>channels))
-   {
-      if (error)
-         *error = OAC_BAD_ARG;
-      return NULL;
-   }
-   size = oac_multistream_encoder_init(NULL, Fs, channels, streams, coupled_streams, mapping, application);
-   if (size < 0)
-   {
-      if (error)
-         *error = size;
-      return NULL;
-   }
-   st = (OacMSEncoder *)oac_alloc(size);
-   if (st==NULL)
-   {
-      if (error)
-         *error = OAC_ALLOC_FAIL;
-      return NULL;
-   }
-   ret = oac_multistream_encoder_init(st, Fs, channels, streams, coupled_streams, mapping, application);
-   if (ret != OAC_OK)
-   {
-      oac_free(st);
-      st = NULL;
-   }
-   if (error)
-      *error = ret;
-   return st;
+    oac_int32 Fs,
+    int channels,
+    int streams,
+    int coupled_streams,
+    const unsigned char *mapping,
+    int application,
+    int *error) {
+    int ret;
+    OacMSEncoder *st;
+    oac_int32 size;
+    if ((channels > 255) || (channels < 1) || (coupled_streams > streams)
+        || (streams < 1) || (coupled_streams < 0) || (streams > 255 - coupled_streams)
+        || (streams + coupled_streams > channels)) {
+        if (error)
+            *error = OAC_BAD_ARG;
+        return NULL;
+    }
+    size = oac_multistream_encoder_init(NULL, Fs, channels, streams, coupled_streams, mapping, application);
+    if (size < 0) {
+        if (error)
+            *error = size;
+        return NULL;
+    }
+    st = (OacMSEncoder *)oac_alloc(size);
+    if (st == NULL) {
+        if (error)
+            *error = OAC_ALLOC_FAIL;
+        return NULL;
+    }
+    ret = oac_multistream_encoder_init(st, Fs, channels, streams, coupled_streams, mapping, application);
+    if (ret != OAC_OK) {
+        oac_free(st);
+        st = NULL;
+    }
+    if (error)
+        *error = ret;
+    return st;
 }
 
 OacMSEncoder *oac_multistream_surround_encoder_create(
-      oac_int32 Fs,
-      int channels,
-      int mapping_family,
-      int *streams,
-      int *coupled_streams,
-      unsigned char *mapping,
-      int application,
-      int *error
-)
-{
-   int ret;
-   oac_int32 size;
-   OacMSEncoder *st;
-   if ((channels>255) || (channels<1))
-   {
-      if (error)
-         *error = OAC_BAD_ARG;
-      return NULL;
-   }
-   size = oac_multistream_surround_encoder_init(NULL, Fs, channels, mapping_family, streams, coupled_streams, mapping, application);
-   if (size < 0)
-   {
-      if (error)
-         *error = size;
-      return NULL;
-   }
-   st = (OacMSEncoder *)oac_alloc(size);
-   if (st==NULL)
-   {
-      if (error)
-         *error = OAC_ALLOC_FAIL;
-      return NULL;
-   }
-   ret = oac_multistream_surround_encoder_init(st, Fs, channels, mapping_family, streams, coupled_streams, mapping, application);
-   if (ret != OAC_OK)
-   {
-      oac_free(st);
-      st = NULL;
-   }
-   if (error)
-      *error = ret;
-   return st;
+    oac_int32 Fs,
+    int channels,
+    int mapping_family,
+    int *streams,
+    int *coupled_streams,
+    unsigned char *mapping,
+    int application,
+    int *error) {
+    int ret;
+    oac_int32 size;
+    OacMSEncoder *st;
+    if ((channels > 255) || (channels < 1)) {
+        if (error)
+            *error = OAC_BAD_ARG;
+        return NULL;
+    }
+    size = oac_multistream_surround_encoder_init(NULL, Fs, channels, mapping_family, streams, coupled_streams, mapping,
+    application);
+    if (size < 0) {
+        if (error)
+            *error = size;
+        return NULL;
+    }
+    st = (OacMSEncoder *)oac_alloc(size);
+    if (st == NULL) {
+        if (error)
+            *error = OAC_ALLOC_FAIL;
+        return NULL;
+    }
+    ret = oac_multistream_surround_encoder_init(st, Fs, channels, mapping_family, streams, coupled_streams, mapping,
+    application);
+    if (ret != OAC_OK) {
+        oac_free(st);
+        st = NULL;
+    }
+    if (error)
+        *error = ret;
+    return st;
 }
 
 static void surround_rate_allocation(
-      OacMSEncoder *st,
-      oac_int32 *rate,
-      int frame_size,
-      oac_int32 Fs
-      )
-{
-   int i;
-   oac_int32 channel_rate;
-   int stream_offset;
-   int lfe_offset;
-   int coupled_ratio; /* Q8 */
-   int lfe_ratio;     /* Q8 */
-   int nb_lfe;
-   int nb_uncoupled;
-   int nb_coupled;
-   int nb_normal;
-   oac_int32 channel_offset;
-   oac_int32 bitrate;
-   int total;
-
-   nb_lfe = (st->lfe_stream!=-1);
-   nb_coupled = st->layout.nb_coupled_streams;
-   nb_uncoupled = st->layout.nb_streams-nb_coupled-nb_lfe;
-   nb_normal = 2*nb_coupled + nb_uncoupled;
-
-   /* Give each non-LFE channel enough bits per channel for coding band energy. */
-   channel_offset = 40*IMAX(50, Fs/frame_size);
-
-   if (st->bitrate_bps==OAC_AUTO)
-   {
-      bitrate = nb_normal*(channel_offset + Fs + 10000) + 8000*nb_lfe;
-   } else if (st->bitrate_bps==OAC_BITRATE_MAX)
-   {
-      bitrate = nb_normal*750000 + nb_lfe*128000;
-   } else {
-      bitrate = st->bitrate_bps;
-   }
-
-   /* Give LFE some basic stream_channel allocation but never exceed 1/20 of the
-      total rate for the non-energy part to avoid problems at really low rate. */
-   lfe_offset = IMIN(bitrate/20, 3000) + 15*IMAX(50, Fs/frame_size);
-
-   /* We give each stream (coupled or uncoupled) a starting bitrate.
-      This models the main saving of coupled channels over uncoupled. */
-   stream_offset = (bitrate - channel_offset*nb_normal - lfe_offset*nb_lfe)/nb_normal/2;
-   stream_offset = IMAX(0, IMIN(20000, stream_offset));
-
-   /* Coupled streams get twice the mono rate after the offset is allocated. */
-   coupled_ratio = 512;
-   /* Should depend on the bitrate, for now we assume LFE gets 1/8 the bits of mono */
-   lfe_ratio = 32;
-
-   total = (nb_uncoupled<<8)         /* mono */
-         + coupled_ratio*nb_coupled /* stereo */
-         + nb_lfe*lfe_ratio;
-   channel_rate = 256*(oac_int64)(bitrate - lfe_offset*nb_lfe - stream_offset*(nb_coupled+nb_uncoupled) - channel_offset*nb_normal)/total;
-
-   for (i=0;i<st->layout.nb_streams;i++)
-   {
-      if (i<st->layout.nb_coupled_streams)
-         rate[i] = 2*channel_offset + IMAX(0, stream_offset+(channel_rate*coupled_ratio>>8));
-      else if (i!=st->lfe_stream)
-         rate[i] = channel_offset + IMAX(0, stream_offset + channel_rate);
-      else
-         rate[i] = IMAX(0, lfe_offset+(channel_rate*lfe_ratio>>8));
-   }
+    OacMSEncoder *st,
+    oac_int32 *rate,
+    int frame_size,
+    oac_int32 Fs) {
+    int i;
+    oac_int32 channel_rate;
+    int stream_offset;
+    int lfe_offset;
+    int coupled_ratio; /* Q8 */
+    int lfe_ratio;    /* Q8 */
+    int nb_lfe;
+    int nb_uncoupled;
+    int nb_coupled;
+    int nb_normal;
+    oac_int32 channel_offset;
+    oac_int32 bitrate;
+    int total;
+
+    nb_lfe = (st->lfe_stream != -1);
+    nb_coupled = st->layout.nb_coupled_streams;
+    nb_uncoupled = st->layout.nb_streams - nb_coupled - nb_lfe;
+    nb_normal = 2*nb_coupled + nb_uncoupled;
+
+    /* Give each non-LFE channel enough bits per channel for coding band energy. */
+    channel_offset = 40*IMAX(50, Fs/frame_size);
+
+    if (st->bitrate_bps == OAC_AUTO) {
+        bitrate = nb_normal*(channel_offset + Fs + 10000) + 8000*nb_lfe;
+    } else if (st->bitrate_bps == OAC_BITRATE_MAX) {
+        bitrate = nb_normal*750000 + nb_lfe*128000;
+    } else {
+        bitrate = st->bitrate_bps;
+    }
+
+    /* Give LFE some basic stream_channel allocation but never exceed 1/20 of the
+       total rate for the non-energy part to avoid problems at really low rate. */
+    lfe_offset = IMIN(bitrate/20, 3000) + 15*IMAX(50, Fs/frame_size);
+
+    /* We give each stream (coupled or uncoupled) a starting bitrate.
+       This models the main saving of coupled channels over uncoupled. */
+    stream_offset = (bitrate - channel_offset*nb_normal - lfe_offset*nb_lfe)/nb_normal/2;
+    stream_offset = IMAX(0, IMIN(20000, stream_offset));
+
+    /* Coupled streams get twice the mono rate after the offset is allocated. */
+    coupled_ratio = 512;
+    /* Should depend on the bitrate, for now we assume LFE gets 1/8 the bits of mono */
+    lfe_ratio = 32;
+
+    total = (nb_uncoupled<<8)        /* mono */
+            + coupled_ratio*nb_coupled /* stereo */
+            + nb_lfe*lfe_ratio;
+    channel_rate = 256
+                   *(oac_int64)(bitrate - lfe_offset*nb_lfe - stream_offset*(nb_coupled + nb_uncoupled)
+                                - channel_offset*nb_normal)/total;
+
+    for (i = 0; i < st->layout.nb_streams; i++) {
+        if (i < st->layout.nb_coupled_streams)
+            rate[i] = 2*channel_offset + IMAX(0, stream_offset + (channel_rate*coupled_ratio>>8));
+        else if (i != st->lfe_stream)
+            rate[i] = channel_offset + IMAX(0, stream_offset + channel_rate);
+        else
+            rate[i] = IMAX(0, lfe_offset + (channel_rate*lfe_ratio>>8));
+    }
 }
 
 static void ambisonics_rate_allocation(
-      OacMSEncoder *st,
-      oac_int32 *rate,
-      int frame_size,
-      oac_int32 Fs
-      )
-{
-   int i;
-   oac_int32 total_rate;
-   oac_int32 per_stream_rate;
-
-   const int nb_channels = st->layout.nb_streams + st->layout.nb_coupled_streams;
-
-   if (st->bitrate_bps==OAC_AUTO)
-   {
-      total_rate = (st->layout.nb_coupled_streams + st->layout.nb_streams) *
-         (Fs+60*Fs/frame_size) + st->layout.nb_streams * (oac_int32)15000;
-   } else if (st->bitrate_bps==OAC_BITRATE_MAX)
-   {
-      total_rate = nb_channels * 750000;
-   } else
-   {
-      total_rate = st->bitrate_bps;
-   }
-
-   /* Allocate equal number of bits to Ambisonic (uncoupled) and non-diegetic
-    * (coupled) streams */
-   per_stream_rate = total_rate / st->layout.nb_streams;
-   for (i = 0; i < st->layout.nb_streams; i++)
-   {
-     rate[i] = per_stream_rate;
-   }
+    OacMSEncoder *st,
+    oac_int32 *rate,
+    int frame_size,
+    oac_int32 Fs) {
+    int i;
+    oac_int32 total_rate;
+    oac_int32 per_stream_rate;
+
+    const int nb_channels = st->layout.nb_streams + st->layout.nb_coupled_streams;
+
+    if (st->bitrate_bps == OAC_AUTO) {
+        total_rate = (st->layout.nb_coupled_streams + st->layout.nb_streams)
+                     *(Fs + 60*Fs/frame_size) + st->layout.nb_streams*(oac_int32)15000;
+    } else if (st->bitrate_bps == OAC_BITRATE_MAX) {
+        total_rate = nb_channels*750000;
+    } else {
+        total_rate = st->bitrate_bps;
+    }
+
+    /* Allocate equal number of bits to Ambisonic (uncoupled) and non-diegetic
+     * (coupled) streams */
+    per_stream_rate = total_rate/st->layout.nb_streams;
+    for (i = 0; i < st->layout.nb_streams; i++) {
+        rate[i] = per_stream_rate;
+    }
 }
 
 static oac_int32 rate_allocation(
-      OacMSEncoder *st,
-      oac_int32 *rate,
-      int frame_size
-      )
-{
-   int i;
-   oac_int32 rate_sum=0;
-   oac_int32 Fs;
-   char *ptr;
-
-   ptr = (char*)st + align(sizeof(OacMSEncoder));
-   oac_encoder_ctl((OacEncoder*)ptr, OAC_GET_SAMPLE_RATE(&Fs));
-
-   if (st->mapping_type == MAPPING_TYPE_AMBISONICS) {
-     ambisonics_rate_allocation(st, rate, frame_size, Fs);
-   } else
-   {
-     surround_rate_allocation(st, rate, frame_size, Fs);
-   }
-
-   for (i=0;i<st->layout.nb_streams;i++)
-   {
-      rate[i] = IMAX(rate[i], 500);
-      rate_sum += rate[i];
-   }
-   return rate_sum;
+    OacMSEncoder *st,
+    oac_int32 *rate,
+    int frame_size) {
+    int i;
+    oac_int32 rate_sum = 0;
+    oac_int32 Fs;
+    char *ptr;
+
+    ptr = (char*)st + align(sizeof(OacMSEncoder));
+    oac_encoder_ctl((OacEncoder*)ptr, OAC_GET_SAMPLE_RATE(&Fs));
+
+    if (st->mapping_type == MAPPING_TYPE_AMBISONICS) {
+        ambisonics_rate_allocation(st, rate, frame_size, Fs);
+    } else {
+        surround_rate_allocation(st, rate, frame_size, Fs);
+    }
+
+    for (i = 0; i < st->layout.nb_streams; i++) {
+        rate[i] = IMAX(rate[i], 500);
+        rate_sum += rate[i];
+    }
+    return rate_sum;
 }
 
 /* Max size in case the encoder decides to return six frames (6 x 20 ms = 120 ms) */
-#define MS_FRAME_TMP (6*1275+12)
+#define MS_FRAME_TMP (6*1275 + 12)
 
 int oac_multistream_encode_native
 (
@@ -845,263 +768,239 @@ int oac_multistream_encode_native
     int lsb_depth,
     downmix_func downmix,
     int float_api,
-    void *user_data
-)
-{
-   oac_int32 Fs;
-   int coupled_size;
-   int mono_size;
-   int s;
-   char *ptr;
-   int tot_size;
-   VARDECL(oac_res, buf);
-   VARDECL(celt_glog, bandSMR);
-   unsigned char tmp_data[MS_FRAME_TMP];
-   OacRepacketizer rp;
-   oac_int32 vbr;
-   const CELTMode *celt_mode=NULL;
-   oac_int32 bitrates[256];
-   celt_glog bandLogE[42];
-   oac_val32 *mem = NULL;
-   oac_val32 *preemph_mem=NULL;
-   int frame_size;
-   oac_int32 rate_sum;
-   oac_int32 smallest_packet;
-   ALLOC_STACK;
-
-   if (st->mapping_type == MAPPING_TYPE_SURROUND)
-   {
-      preemph_mem = ms_get_preemph_mem(st);
-      mem = ms_get_window_mem(st);
-   }
-
-   ptr = (char*)st + align(sizeof(OacMSEncoder));
-   oac_encoder_ctl((OacEncoder*)ptr, OAC_GET_SAMPLE_RATE(&Fs));
-   oac_encoder_ctl((OacEncoder*)ptr, OAC_GET_VBR(&vbr));
-   if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
-      oac_encoder_ctl((OacEncoder*)ptr, CELT_GET_MODE(&celt_mode));
-
-   frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, Fs);
-   if (frame_size <= 0)
-   {
-      RESTORE_STACK;
-      return OAC_BAD_ARG;
-   }
-
-   /* Smallest packet the encoder can produce. */
-   smallest_packet = st->layout.nb_streams*2-1;
-   /* 100 ms needs an extra byte per stream for the ToC. */
-   if (Fs/frame_size == 10)
-     smallest_packet += st->layout.nb_streams;
-   if (max_data_bytes < smallest_packet)
-   {
-      RESTORE_STACK;
-      return OAC_BUFFER_TOO_SMALL;
-   }
-   ALLOC(buf, 2*frame_size, oac_res);
-   coupled_size = oac_encoder_init(NULL, st->Fs, 2, st->application);
-   mono_size = oac_encoder_init(NULL, st->Fs, 1, st->application);
-
-   ALLOC(bandSMR, 21*st->layout.nb_channels, celt_glog);
-   if (st->mapping_type == MAPPING_TYPE_SURROUND && st->application != OAC_APPLICATION_RESTRICTED_SILK)
-   {
-      surround_analysis(celt_mode, pcm, bandSMR, mem, preemph_mem, frame_size, celt_mode->overlap, st->layout.nb_channels, Fs, copy_channel_in, st->arch);
-   }
-
-   /* Compute bitrate allocation between streams (this could be a lot better) */
-   rate_sum = rate_allocation(st, bitrates, frame_size);
-
-   if (!vbr)
-   {
-      if (st->bitrate_bps == OAC_AUTO)
-      {
-         max_data_bytes = IMIN(max_data_bytes, (bitrate_to_bits(rate_sum, Fs, frame_size)+4)/8);
-      } else if (st->bitrate_bps != OAC_BITRATE_MAX)
-      {
-         max_data_bytes = IMIN(max_data_bytes, IMAX(smallest_packet,
-                          (bitrate_to_bits(st->bitrate_bps, Fs, frame_size)+4)/8));
-      }
-   }
-   ptr = (char*)st + align(sizeof(OacMSEncoder));
-   for (s=0;s<st->layout.nb_streams;s++)
-   {
-      OacEncoder *enc;
-      enc = (OacEncoder*)ptr;
-      if (s < st->layout.nb_coupled_streams)
-         ptr += align(coupled_size);
-      else
-         ptr += align(mono_size);
-      oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrates[s]));
-      if (st->mapping_type == MAPPING_TYPE_SURROUND)
-      {
-         oac_int32 equiv_rate;
-         equiv_rate = st->bitrate_bps;
-         if (frame_size*50 < Fs)
-            equiv_rate -= 60*(Fs/frame_size - 50)*st->layout.nb_channels;
-         if (equiv_rate > 10000*st->layout.nb_channels)
-            oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_BANDWIDTH_FULLBAND));
-         else if (equiv_rate > 7000*st->layout.nb_channels)
-            oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_BANDWIDTH_SUPERWIDEBAND));
-         else if (equiv_rate > 5000*st->layout.nb_channels)
-            oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_BANDWIDTH_WIDEBAND));
-         else
-            oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_BANDWIDTH_NARROWBAND));
-         if (s < st->layout.nb_coupled_streams)
-         {
-            /* To preserve the spatial image, force stereo CELT on coupled streams */
+    void *user_data) {
+    oac_int32 Fs;
+    int coupled_size;
+    int mono_size;
+    int s;
+    char *ptr;
+    int tot_size;
+    VARDECL(oac_res, buf);
+    VARDECL(celt_glog, bandSMR);
+    unsigned char tmp_data[MS_FRAME_TMP];
+    OacRepacketizer rp;
+    oac_int32 vbr;
+    const CELTMode *celt_mode = NULL;
+    oac_int32 bitrates[256];
+    celt_glog bandLogE[42];
+    oac_val32 *mem = NULL;
+    oac_val32 *preemph_mem = NULL;
+    int frame_size;
+    oac_int32 rate_sum;
+    oac_int32 smallest_packet;
+    ALLOC_STACK;
+
+    if (st->mapping_type == MAPPING_TYPE_SURROUND) {
+        preemph_mem = ms_get_preemph_mem(st);
+        mem = ms_get_window_mem(st);
+    }
+
+    ptr = (char*)st + align(sizeof(OacMSEncoder));
+    oac_encoder_ctl((OacEncoder*)ptr, OAC_GET_SAMPLE_RATE(&Fs));
+    oac_encoder_ctl((OacEncoder*)ptr, OAC_GET_VBR(&vbr));
+    if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
+        oac_encoder_ctl((OacEncoder*)ptr, CELT_GET_MODE(&celt_mode));
+
+    frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, Fs);
+    if (frame_size <= 0) {
+        RESTORE_STACK;
+        return OAC_BAD_ARG;
+    }
+
+    /* Smallest packet the encoder can produce. */
+    smallest_packet = st->layout.nb_streams*2 - 1;
+    /* 100 ms needs an extra byte per stream for the ToC. */
+    if (Fs/frame_size == 10)
+        smallest_packet += st->layout.nb_streams;
+    if (max_data_bytes < smallest_packet) {
+        RESTORE_STACK;
+        return OAC_BUFFER_TOO_SMALL;
+    }
+    ALLOC(buf, 2*frame_size, oac_res);
+    coupled_size = oac_encoder_init(NULL, st->Fs, 2, st->application);
+    mono_size = oac_encoder_init(NULL, st->Fs, 1, st->application);
+
+    ALLOC(bandSMR, 21*st->layout.nb_channels, celt_glog);
+    if (st->mapping_type == MAPPING_TYPE_SURROUND && st->application != OAC_APPLICATION_RESTRICTED_SILK) {
+        surround_analysis(celt_mode, pcm, bandSMR, mem, preemph_mem, frame_size, celt_mode->overlap,
+        st->layout.nb_channels, Fs, copy_channel_in, st->arch);
+    }
+
+    /* Compute bitrate allocation between streams (this could be a lot better) */
+    rate_sum = rate_allocation(st, bitrates, frame_size);
+
+    if (!vbr) {
+        if (st->bitrate_bps == OAC_AUTO) {
+            max_data_bytes = IMIN(max_data_bytes, (bitrate_to_bits(rate_sum, Fs, frame_size) + 4)/8);
+        } else if (st->bitrate_bps != OAC_BITRATE_MAX) {
+            max_data_bytes = IMIN(max_data_bytes, IMAX(smallest_packet,
+                (bitrate_to_bits(st->bitrate_bps, Fs, frame_size) + 4)/8));
+        }
+    }
+    ptr = (char*)st + align(sizeof(OacMSEncoder));
+    for (s = 0; s < st->layout.nb_streams; s++) {
+        OacEncoder *enc;
+        enc = (OacEncoder*)ptr;
+        if (s < st->layout.nb_coupled_streams)
+            ptr += align(coupled_size);
+        else
+            ptr += align(mono_size);
+        oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrates[s]));
+        if (st->mapping_type == MAPPING_TYPE_SURROUND) {
+            oac_int32 equiv_rate;
+            equiv_rate = st->bitrate_bps;
+            if (frame_size*50 < Fs)
+                equiv_rate -= 60*(Fs/frame_size - 50)*st->layout.nb_channels;
+            if (equiv_rate > 10000*st->layout.nb_channels)
+                oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_BANDWIDTH_FULLBAND));
+            else if (equiv_rate > 7000*st->layout.nb_channels)
+                oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_BANDWIDTH_SUPERWIDEBAND));
+            else if (equiv_rate > 5000*st->layout.nb_channels)
+                oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_BANDWIDTH_WIDEBAND));
+            else
+                oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_BANDWIDTH_NARROWBAND));
+            if (s < st->layout.nb_coupled_streams) {
+                /* To preserve the spatial image, force stereo CELT on coupled streams */
+                oac_encoder_ctl(enc, OAC_SET_FORCE_MODE(MODE_CELT_ONLY));
+                oac_encoder_ctl(enc, OAC_SET_FORCE_CHANNELS(2));
+            }
+        } else if (st->mapping_type == MAPPING_TYPE_AMBISONICS) {
             oac_encoder_ctl(enc, OAC_SET_FORCE_MODE(MODE_CELT_ONLY));
-            oac_encoder_ctl(enc, OAC_SET_FORCE_CHANNELS(2));
-         }
-      }
-      else if (st->mapping_type == MAPPING_TYPE_AMBISONICS) {
-        oac_encoder_ctl(enc, OAC_SET_FORCE_MODE(MODE_CELT_ONLY));
-      }
-   }
-
-   ptr = (char*)st + align(sizeof(OacMSEncoder));
-   /* Counting ToC */
-   tot_size = 0;
-   for (s=0;s<st->layout.nb_streams;s++)
-   {
-      OacEncoder *enc;
-      int len;
-      int curr_max;
-      int c1, c2;
-      int ret;
-
-      oac_repacketizer_init(&rp);
-      enc = (OacEncoder*)ptr;
-      if (s < st->layout.nb_coupled_streams)
-      {
-         int i;
-         int left, right;
-         left = get_left_channel(&st->layout, s, -1);
-         right = get_right_channel(&st->layout, s, -1);
-         (*copy_channel_in)(buf, 2,
+        }
+    }
+
+    ptr = (char*)st + align(sizeof(OacMSEncoder));
+    /* Counting ToC */
+    tot_size = 0;
+    for (s = 0; s < st->layout.nb_streams; s++) {
+        OacEncoder *enc;
+        int len;
+        int curr_max;
+        int c1, c2;
+        int ret;
+
+        oac_repacketizer_init(&rp);
+        enc = (OacEncoder*)ptr;
+        if (s < st->layout.nb_coupled_streams) {
+            int i;
+            int left, right;
+            left = get_left_channel(&st->layout, s, -1);
+            right = get_right_channel(&st->layout, s, -1);
+            (*copy_channel_in)(buf, 2,
             pcm, st->layout.nb_channels, left, frame_size, user_data);
-         (*copy_channel_in)(buf+1, 2,
+            (*copy_channel_in)(buf + 1, 2,
             pcm, st->layout.nb_channels, right, frame_size, user_data);
-         ptr += align(coupled_size);
-         if (st->mapping_type == MAPPING_TYPE_SURROUND && st->application != OAC_APPLICATION_RESTRICTED_SILK)
-         {
-            for (i=0;i<21;i++)
-            {
-               bandLogE[i] = bandSMR[21*left+i];
-               bandLogE[21+i] = bandSMR[21*right+i];
+            ptr += align(coupled_size);
+            if (st->mapping_type == MAPPING_TYPE_SURROUND && st->application != OAC_APPLICATION_RESTRICTED_SILK) {
+                for (i = 0; i < 21; i++) {
+                    bandLogE[i] = bandSMR[21*left + i];
+                    bandLogE[21 + i] = bandSMR[21*right + i];
+                }
             }
-         }
-         c1 = left;
-         c2 = right;
-      } else {
-         int i;
-         int chan = get_mono_channel(&st->layout, s, -1);
-         (*copy_channel_in)(buf, 1,
+            c1 = left;
+            c2 = right;
+        } else {
+            int i;
+            int chan = get_mono_channel(&st->layout, s, -1);
+            (*copy_channel_in)(buf, 1,
             pcm, st->layout.nb_channels, chan, frame_size, user_data);
-         ptr += align(mono_size);
-         if (st->mapping_type == MAPPING_TYPE_SURROUND && st->application != OAC_APPLICATION_RESTRICTED_SILK)
-         {
-            for (i=0;i<21;i++)
-               bandLogE[i] = bandSMR[21*chan+i];
-         }
-         c1 = chan;
-         c2 = -1;
-      }
-      if (st->mapping_type == MAPPING_TYPE_SURROUND && st->application != OAC_APPLICATION_RESTRICTED_SILK)
-         oac_encoder_ctl(enc, OAC_SET_ENERGY_MASK(bandLogE));
-      /* number of bytes left (+Toc) */
-      curr_max = max_data_bytes - tot_size;
-      /* Reserve one byte for the last stream and two for the others */
-      curr_max -= IMAX(0,2*(st->layout.nb_streams-s-1)-1);
-      /* For 100 ms, reserve an extra byte per stream for the ToC */
-      if (Fs/frame_size == 10)
-        curr_max -= st->layout.nb_streams-s-1;
-      curr_max = IMIN(curr_max,MS_FRAME_TMP);
-      /* Repacketizer will add one or two bytes for self-delimited frames */
-      if (s != st->layout.nb_streams-1) curr_max -=  curr_max>253 ? 2 : 1;
-      if (!vbr && s == st->layout.nb_streams-1)
-         oac_encoder_ctl(enc, OAC_SET_BITRATE(bits_to_bitrate(curr_max*8, Fs, frame_size)));
-      len = oac_encode_native(enc, buf, frame_size, tmp_data, curr_max, lsb_depth,
+            ptr += align(mono_size);
+            if (st->mapping_type == MAPPING_TYPE_SURROUND && st->application != OAC_APPLICATION_RESTRICTED_SILK) {
+                for (i = 0; i < 21; i++)
+                    bandLogE[i] = bandSMR[21*chan + i];
+            }
+            c1 = chan;
+            c2 = -1;
+        }
+        if (st->mapping_type == MAPPING_TYPE_SURROUND && st->application != OAC_APPLICATION_RESTRICTED_SILK)
+            oac_encoder_ctl(enc, OAC_SET_ENERGY_MASK(bandLogE));
+        /* number of bytes left (+Toc) */
+        curr_max = max_data_bytes - tot_size;
+        /* Reserve one byte for the last stream and two for the others */
+        curr_max -= IMAX(0, 2*(st->layout.nb_streams - s - 1) - 1);
+        /* For 100 ms, reserve an extra byte per stream for the ToC */
+        if (Fs/frame_size == 10)
+            curr_max -= st->layout.nb_streams - s - 1;
+        curr_max = IMIN(curr_max, MS_FRAME_TMP);
+        /* Repacketizer will add one or two bytes for self-delimited frames */
+        if (s != st->layout.nb_streams - 1) curr_max -= curr_max > 253 ? 2 : 1;
+        if (!vbr && s == st->layout.nb_streams - 1)
+            oac_encoder_ctl(enc, OAC_SET_BITRATE(bits_to_bitrate(curr_max*8, Fs, frame_size)));
+        len = oac_encode_native(enc, buf, frame_size, tmp_data, curr_max, lsb_depth,
             pcm, analysis_frame_size, c1, c2, st->layout.nb_channels, downmix, float_api);
-      if (len<0)
-      {
-         RESTORE_STACK;
-         return len;
-      }
-      /* We need to use the repacketizer to add the self-delimiting lengths
-         while taking into account the fact that the encoder can now return
-         more than one frame at a time (e.g. 60 ms CELT-only) */
-      ret = oac_repacketizer_cat(&rp, tmp_data, len);
-      /* If the oac_repacketizer_cat() fails, then something's seriously wrong
-         with the encoder. */
-      if (ret != OAC_OK)
-      {
-         RESTORE_STACK;
-         return OAC_INTERNAL_ERROR;
-      }
-      len = oac_repacketizer_out_range_impl(&rp, 0, oac_repacketizer_get_nb_frames(&rp),
-            data, max_data_bytes-tot_size, s != st->layout.nb_streams-1, !vbr && s == st->layout.nb_streams-1, NULL, 0);
-      data += len;
-      tot_size += len;
-   }
-   /*printf("\n");*/
-   RESTORE_STACK;
-   return tot_size;
+        if (len < 0) {
+            RESTORE_STACK;
+            return len;
+        }
+        /* We need to use the repacketizer to add the self-delimiting lengths
+           while taking into account the fact that the encoder can now return
+           more than one frame at a time (e.g. 60 ms CELT-only) */
+        ret = oac_repacketizer_cat(&rp, tmp_data, len);
+        /* If the oac_repacketizer_cat() fails, then something's seriously wrong
+           with the encoder. */
+        if (ret != OAC_OK) {
+            RESTORE_STACK;
+            return OAC_INTERNAL_ERROR;
+        }
+        len = oac_repacketizer_out_range_impl(&rp, 0, oac_repacketizer_get_nb_frames(&rp),
+            data, max_data_bytes - tot_size, s != st->layout.nb_streams - 1, !vbr && s == st->layout.nb_streams - 1,
+        NULL, 0);
+        data += len;
+        tot_size += len;
+    }
+    /*printf("\n");*/
+    RESTORE_STACK;
+    return tot_size;
 }
 
 #if !defined(DISABLE_FLOAT_API)
 static void oac_copy_channel_in_float(
-  oac_res *dst,
-  int dst_stride,
-  const void *src,
-  int src_stride,
-  int src_channel,
-  int frame_size,
-  void *user_data
-)
-{
-   const float *float_src;
-   oac_int32 i;
-   (void)user_data;
-   float_src = (const float *)src;
-   for (i=0;i<frame_size;i++)
-      dst[i*dst_stride] = FLOAT2RES(float_src[i*src_stride+src_channel]);
+    oac_res *dst,
+    int dst_stride,
+    const void *src,
+    int src_stride,
+    int src_channel,
+    int frame_size,
+    void *user_data) {
+    const float *float_src;
+    oac_int32 i;
+    (void)user_data;
+    float_src = (const float *)src;
+    for (i = 0; i < frame_size; i++)
+        dst[i*dst_stride] = FLOAT2RES(float_src[i*src_stride + src_channel]);
 }
 #endif
 
 static void oac_copy_channel_in_short(
-  oac_res *dst,
-  int dst_stride,
-  const void *src,
-  int src_stride,
-  int src_channel,
-  int frame_size,
-  void *user_data
-)
-{
-   const oac_int16 *short_src;
-   oac_int32 i;
-   (void)user_data;
-   short_src = (const oac_int16 *)src;
-   for (i=0;i<frame_size;i++)
-      dst[i*dst_stride] = INT16TORES(short_src[i*src_stride+src_channel]);
+    oac_res *dst,
+    int dst_stride,
+    const void *src,
+    int src_stride,
+    int src_channel,
+    int frame_size,
+    void *user_data) {
+    const oac_int16 *short_src;
+    oac_int32 i;
+    (void)user_data;
+    short_src = (const oac_int16 *)src;
+    for (i = 0; i < frame_size; i++)
+        dst[i*dst_stride] = INT16TORES(short_src[i*src_stride + src_channel]);
 }
 
 static void oac_copy_channel_in_int24(
-  oac_res *dst,
-  int dst_stride,
-  const void *src,
-  int src_stride,
-  int src_channel,
-  int frame_size,
-  void *user_data
-)
-{
-   const oac_int32 *short_src;
-   oac_int32 i;
-   (void)user_data;
-   short_src = (const oac_int32 *)src;
-   for (i=0;i<frame_size;i++)
-      dst[i*dst_stride] = INT24TORES(short_src[i*src_stride+src_channel]);
+    oac_res *dst,
+    int dst_stride,
+    const void *src,
+    int src_stride,
+    int src_channel,
+    int frame_size,
+    void *user_data) {
+    const oac_int32 *short_src;
+    oac_int32 i;
+    (void)user_data;
+    short_src = (const oac_int32 *)src;
+    for (i = 0; i < frame_size; i++)
+        dst[i*dst_stride] = INT24TORES(short_src[i*src_stride + src_channel]);
 }
 
 int oac_multistream_encode(
@@ -1109,10 +1008,8 @@ int oac_multistream_encode(
     const oac_int16 *pcm,
     int frame_size,
     unsigned char *data,
-    oac_int32 max_data_bytes
-)
-{
-   return oac_multistream_encode_native(st, oac_copy_channel_in_short,
+    oac_int32 max_data_bytes) {
+    return oac_multistream_encode_native(st, oac_copy_channel_in_short,
       pcm, frame_size, data, max_data_bytes, 16, downmix_int, 0, NULL);
 }
 
@@ -1121,10 +1018,8 @@ int oac_multistream_encode24(
     const oac_int32 *pcm,
     int frame_size,
     unsigned char *data,
-    oac_int32 max_data_bytes
-)
-{
-   return oac_multistream_encode_native(st, oac_copy_channel_in_int24,
+    oac_int32 max_data_bytes) {
+    return oac_multistream_encode_native(st, oac_copy_channel_in_int24,
       pcm, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH, downmix_int24, 0, NULL);
 }
 
@@ -1134,224 +1029,207 @@ int oac_multistream_encode_float(
     const float *pcm,
     int frame_size,
     unsigned char *data,
-    oac_int32 max_data_bytes
-)
-{
-   return oac_multistream_encode_native(st, oac_copy_channel_in_float,
+    oac_int32 max_data_bytes) {
+    return oac_multistream_encode_native(st, oac_copy_channel_in_float,
       pcm, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH, downmix_float, 1, NULL);
 }
 #endif
 
 int oac_multistream_encoder_ctl_va_list(OacMSEncoder *st, int request,
-                                         va_list ap)
-{
-   int coupled_size, mono_size;
-   char *ptr;
-   int ret = OAC_OK;
-
-   coupled_size = oac_encoder_init(NULL, st->Fs, 2, st->application);
-   mono_size = oac_encoder_init(NULL, st->Fs, 1, st->application);
-   ptr = (char*)st + align(sizeof(OacMSEncoder));
-   switch (request)
-   {
-   case OAC_SET_BITRATE_REQUEST:
-   {
-      oac_int32 value = va_arg(ap, oac_int32);
-      if (value != OAC_AUTO && value != OAC_BITRATE_MAX)
-      {
-         if (value <= 0)
-            goto bad_arg;
-         value = IMIN(750000*st->layout.nb_channels, IMAX(500*st->layout.nb_channels, value));
-      }
-      st->bitrate_bps = value;
-   }
-   break;
-   case OAC_GET_BITRATE_REQUEST:
-   {
-      int s;
-      oac_int32 *value = va_arg(ap, oac_int32*);
-      if (!value)
-      {
-         goto bad_arg;
-      }
-      *value = 0;
-      for (s=0;s<st->layout.nb_streams;s++)
-      {
-         oac_int32 rate;
-         OacEncoder *enc;
-         enc = (OacEncoder*)ptr;
-         if (s < st->layout.nb_coupled_streams)
-            ptr += align(coupled_size);
-         else
-            ptr += align(mono_size);
-         oac_encoder_ctl(enc, request, &rate);
-         *value += rate;
-      }
-   }
-   break;
-   case OAC_GET_LSB_DEPTH_REQUEST:
-   case OAC_GET_VBR_REQUEST:
-   case OAC_GET_APPLICATION_REQUEST:
-   case OAC_GET_BANDWIDTH_REQUEST:
-   case OAC_GET_COMPLEXITY_REQUEST:
-   case OAC_GET_PACKET_LOSS_PERC_REQUEST:
-   case OAC_GET_DTX_REQUEST:
-   case OAC_GET_VOICE_RATIO_REQUEST:
-   case OAC_GET_VBR_CONSTRAINT_REQUEST:
-   case OAC_GET_SIGNAL_REQUEST:
-   case OAC_GET_LOOKAHEAD_REQUEST:
-   case OAC_GET_SAMPLE_RATE_REQUEST:
-   case OAC_GET_INBAND_FEC_REQUEST:
-   case OAC_GET_FORCE_CHANNELS_REQUEST:
-   case OAC_GET_PREDICTION_DISABLED_REQUEST:
-   case OAC_GET_PHASE_INVERSION_DISABLED_REQUEST:
-   {
-      OacEncoder *enc;
-      /* For int32* GET params, just query the first stream */
-      oac_int32 *value = va_arg(ap, oac_int32*);
-      enc = (OacEncoder*)ptr;
-      ret = oac_encoder_ctl(enc, request, value);
-   }
-   break;
-   case OAC_GET_FINAL_RANGE_REQUEST:
-   {
-      int s;
-      oac_uint32 *value = va_arg(ap, oac_uint32*);
-      oac_uint32 tmp;
-      if (!value)
-      {
-         goto bad_arg;
-      }
-      *value=0;
-      for (s=0;s<st->layout.nb_streams;s++)
-      {
-         OacEncoder *enc;
-         enc = (OacEncoder*)ptr;
-         if (s < st->layout.nb_coupled_streams)
-            ptr += align(coupled_size);
-         else
-            ptr += align(mono_size);
-         ret = oac_encoder_ctl(enc, request, &tmp);
-         if (ret != OAC_OK) break;
-         *value ^= tmp;
-      }
-   }
-   break;
-   case OAC_SET_LSB_DEPTH_REQUEST:
-   case OAC_SET_COMPLEXITY_REQUEST:
-   case OAC_SET_VBR_REQUEST:
-   case OAC_SET_VBR_CONSTRAINT_REQUEST:
-   case OAC_SET_MAX_BANDWIDTH_REQUEST:
-   case OAC_SET_BANDWIDTH_REQUEST:
-   case OAC_SET_SIGNAL_REQUEST:
-   case OAC_SET_APPLICATION_REQUEST:
-   case OAC_SET_INBAND_FEC_REQUEST:
-   case OAC_SET_PACKET_LOSS_PERC_REQUEST:
-   case OAC_SET_DTX_REQUEST:
-   case OAC_SET_FORCE_MODE_REQUEST:
-   case OAC_SET_FORCE_CHANNELS_REQUEST:
-   case OAC_SET_PREDICTION_DISABLED_REQUEST:
-   case OAC_SET_PHASE_INVERSION_DISABLED_REQUEST:
-   {
-      int s;
-      /* This works for int32 params */
-      oac_int32 value = va_arg(ap, oac_int32);
-      for (s=0;s<st->layout.nb_streams;s++)
-      {
-         OacEncoder *enc;
-
-         enc = (OacEncoder*)ptr;
-         if (s < st->layout.nb_coupled_streams)
-            ptr += align(coupled_size);
-         else
-            ptr += align(mono_size);
-         ret = oac_encoder_ctl(enc, request, value);
-         if (ret != OAC_OK)
-            break;
-      }
-   }
-   break;
-   case OAC_MULTISTREAM_GET_ENCODER_STATE_REQUEST:
-   {
-      int s;
-      oac_int32 stream_id;
-      OacEncoder **value;
-      stream_id = va_arg(ap, oac_int32);
-      if (stream_id<0 || stream_id >= st->layout.nb_streams)
-         goto bad_arg;
-      value = va_arg(ap, OacEncoder**);
-      if (!value)
-      {
-         goto bad_arg;
-      }
-      for (s=0;s<stream_id;s++)
-      {
-         if (s < st->layout.nb_coupled_streams)
-            ptr += align(coupled_size);
-         else
-            ptr += align(mono_size);
-      }
-      *value = (OacEncoder*)ptr;
-   }
-   break;
-   case OAC_SET_EXPERT_FRAME_DURATION_REQUEST:
-   {
-       oac_int32 value = va_arg(ap, oac_int32);
-       st->variable_duration = value;
-   }
-   break;
-   case OAC_GET_EXPERT_FRAME_DURATION_REQUEST:
-   {
-       oac_int32 *value = va_arg(ap, oac_int32*);
-       if (!value)
-       {
-          goto bad_arg;
-       }
-       *value = st->variable_duration;
-   }
-   break;
-   case OAC_RESET_STATE:
-   {
-      int s;
-      if (st->mapping_type == MAPPING_TYPE_SURROUND)
-      {
-         OAC_CLEAR(ms_get_preemph_mem(st), st->layout.nb_channels);
-         OAC_CLEAR(ms_get_window_mem(st), st->layout.nb_channels*MAX_OVERLAP);
-      }
-      for (s=0;s<st->layout.nb_streams;s++)
-      {
-         OacEncoder *enc;
-         enc = (OacEncoder*)ptr;
-         if (s < st->layout.nb_coupled_streams)
-            ptr += align(coupled_size);
-         else
-            ptr += align(mono_size);
-         ret = oac_encoder_ctl(enc, OAC_RESET_STATE);
-         if (ret != OAC_OK)
+                                        va_list ap) {
+    int coupled_size, mono_size;
+    char *ptr;
+    int ret = OAC_OK;
+
+    coupled_size = oac_encoder_init(NULL, st->Fs, 2, st->application);
+    mono_size = oac_encoder_init(NULL, st->Fs, 1, st->application);
+    ptr = (char*)st + align(sizeof(OacMSEncoder));
+    switch (request) {
+        case OAC_SET_BITRATE_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            if (value != OAC_AUTO && value != OAC_BITRATE_MAX) {
+                if (value <= 0)
+                    goto bad_arg;
+                value = IMIN(750000*st->layout.nb_channels, IMAX(500*st->layout.nb_channels, value));
+            }
+            st->bitrate_bps = value;
+        }
+        break;
+        case OAC_GET_BITRATE_REQUEST:
+        {
+            int s;
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            if (!value) {
+                goto bad_arg;
+            }
+            *value = 0;
+            for (s = 0; s < st->layout.nb_streams; s++) {
+                oac_int32 rate;
+                OacEncoder *enc;
+                enc = (OacEncoder*)ptr;
+                if (s < st->layout.nb_coupled_streams)
+                    ptr += align(coupled_size);
+                else
+                    ptr += align(mono_size);
+                oac_encoder_ctl(enc, request, &rate);
+                *value += rate;
+            }
+        }
+        break;
+        case OAC_GET_LSB_DEPTH_REQUEST:
+        case OAC_GET_VBR_REQUEST:
+        case OAC_GET_APPLICATION_REQUEST:
+        case OAC_GET_BANDWIDTH_REQUEST:
+        case OAC_GET_COMPLEXITY_REQUEST:
+        case OAC_GET_PACKET_LOSS_PERC_REQUEST:
+        case OAC_GET_DTX_REQUEST:
+        case OAC_GET_VOICE_RATIO_REQUEST:
+        case OAC_GET_VBR_CONSTRAINT_REQUEST:
+        case OAC_GET_SIGNAL_REQUEST:
+        case OAC_GET_LOOKAHEAD_REQUEST:
+        case OAC_GET_SAMPLE_RATE_REQUEST:
+        case OAC_GET_INBAND_FEC_REQUEST:
+        case OAC_GET_FORCE_CHANNELS_REQUEST:
+        case OAC_GET_PREDICTION_DISABLED_REQUEST:
+        case OAC_GET_PHASE_INVERSION_DISABLED_REQUEST:
+        {
+            OacEncoder *enc;
+            /* For int32* GET params, just query the first stream */
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            enc = (OacEncoder*)ptr;
+            ret = oac_encoder_ctl(enc, request, value);
+        }
+        break;
+        case OAC_GET_FINAL_RANGE_REQUEST:
+        {
+            int s;
+            oac_uint32 *value = va_arg(ap, oac_uint32*);
+            oac_uint32 tmp;
+            if (!value) {
+                goto bad_arg;
+            }
+            *value = 0;
+            for (s = 0; s < st->layout.nb_streams; s++) {
+                OacEncoder *enc;
+                enc = (OacEncoder*)ptr;
+                if (s < st->layout.nb_coupled_streams)
+                    ptr += align(coupled_size);
+                else
+                    ptr += align(mono_size);
+                ret = oac_encoder_ctl(enc, request, &tmp);
+                if (ret != OAC_OK) break;
+                *value ^= tmp;
+            }
+        }
+        break;
+        case OAC_SET_LSB_DEPTH_REQUEST:
+        case OAC_SET_COMPLEXITY_REQUEST:
+        case OAC_SET_VBR_REQUEST:
+        case OAC_SET_VBR_CONSTRAINT_REQUEST:
+        case OAC_SET_MAX_BANDWIDTH_REQUEST:
+        case OAC_SET_BANDWIDTH_REQUEST:
+        case OAC_SET_SIGNAL_REQUEST:
+        case OAC_SET_APPLICATION_REQUEST:
+        case OAC_SET_INBAND_FEC_REQUEST:
+        case OAC_SET_PACKET_LOSS_PERC_REQUEST:
+        case OAC_SET_DTX_REQUEST:
+        case OAC_SET_FORCE_MODE_REQUEST:
+        case OAC_SET_FORCE_CHANNELS_REQUEST:
+        case OAC_SET_PREDICTION_DISABLED_REQUEST:
+        case OAC_SET_PHASE_INVERSION_DISABLED_REQUEST:
+        {
+            int s;
+            /* This works for int32 params */
+            oac_int32 value = va_arg(ap, oac_int32);
+            for (s = 0; s < st->layout.nb_streams; s++) {
+                OacEncoder *enc;
+
+                enc = (OacEncoder*)ptr;
+                if (s < st->layout.nb_coupled_streams)
+                    ptr += align(coupled_size);
+                else
+                    ptr += align(mono_size);
+                ret = oac_encoder_ctl(enc, request, value);
+                if (ret != OAC_OK)
+                    break;
+            }
+        }
+        break;
+        case OAC_MULTISTREAM_GET_ENCODER_STATE_REQUEST:
+        {
+            int s;
+            oac_int32 stream_id;
+            OacEncoder **value;
+            stream_id = va_arg(ap, oac_int32);
+            if (stream_id < 0 || stream_id >= st->layout.nb_streams)
+                goto bad_arg;
+            value = va_arg(ap, OacEncoder**);
+            if (!value) {
+                goto bad_arg;
+            }
+            for (s = 0; s < stream_id; s++) {
+                if (s < st->layout.nb_coupled_streams)
+                    ptr += align(coupled_size);
+                else
+                    ptr += align(mono_size);
+            }
+            *value = (OacEncoder*)ptr;
+        }
+        break;
+        case OAC_SET_EXPERT_FRAME_DURATION_REQUEST:
+        {
+            oac_int32 value = va_arg(ap, oac_int32);
+            st->variable_duration = value;
+        }
+        break;
+        case OAC_GET_EXPERT_FRAME_DURATION_REQUEST:
+        {
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            if (!value) {
+                goto bad_arg;
+            }
+            *value = st->variable_duration;
+        }
+        break;
+        case OAC_RESET_STATE:
+        {
+            int s;
+            if (st->mapping_type == MAPPING_TYPE_SURROUND) {
+                OAC_CLEAR(ms_get_preemph_mem(st), st->layout.nb_channels);
+                OAC_CLEAR(ms_get_window_mem(st), st->layout.nb_channels*MAX_OVERLAP);
+            }
+            for (s = 0; s < st->layout.nb_streams; s++) {
+                OacEncoder *enc;
+                enc = (OacEncoder*)ptr;
+                if (s < st->layout.nb_coupled_streams)
+                    ptr += align(coupled_size);
+                else
+                    ptr += align(mono_size);
+                ret = oac_encoder_ctl(enc, OAC_RESET_STATE);
+                if (ret != OAC_OK)
+                    break;
+            }
+        }
+        break;
+        default:
+            ret = OAC_UNIMPLEMENTED;
             break;
-      }
-   }
-   break;
-   default:
-      ret = OAC_UNIMPLEMENTED;
-      break;
-   }
-   return ret;
+    }
+    return ret;
 bad_arg:
-   return OAC_BAD_ARG;
+    return OAC_BAD_ARG;
 }
 
-int oac_multistream_encoder_ctl(OacMSEncoder *st, int request, ...)
-{
-   int ret;
-   va_list ap;
-   va_start(ap, request);
-   ret = oac_multistream_encoder_ctl_va_list(st, request, ap);
-   va_end(ap);
-   return ret;
+int oac_multistream_encoder_ctl(OacMSEncoder *st, int request, ...) {
+    int ret;
+    va_list ap;
+    va_start(ap, request);
+    ret = oac_multistream_encoder_ctl_va_list(st, request, ap);
+    va_end(ap);
+    return ret;
 }
 
-void oac_multistream_encoder_destroy(OacMSEncoder *st)
-{
+void oac_multistream_encoder_destroy(OacMSEncoder *st) {
     oac_free(st);
 }
diff --git a/src/oac_private.h b/src/oac_private.h
index 6ad68bbff..d503c4bcd 100644
--- a/src/oac_private.h
+++ b/src/oac_private.h
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 
 #ifndef OAC_PRIVATE_H
@@ -37,88 +37,88 @@
 #include <stddef.h> /* offsetof */
 
 struct OacRepacketizer {
-   unsigned char toc;
-   int nb_frames;
-   const unsigned char *frames[48];
-   oac_int16 len[48];
-   int framesize;
-   const unsigned char *paddings[48];
-   oac_int32 padding_len[48];
-   unsigned char padding_nb_frames[48];
+    unsigned char toc;
+    int nb_frames;
+    const unsigned char *frames[48];
+    oac_int16 len[48];
+    int framesize;
+    const unsigned char *paddings[48];
+    oac_int32 padding_len[48];
+    unsigned char padding_nb_frames[48];
 };
 
 typedef struct OacExtensionIterator {
-   const unsigned char *data;
-   const unsigned char *curr_data;
-   const unsigned char *repeat_data;
-   const unsigned char *last_long;
-   const unsigned char *src_data;
-   oac_int32 len;
-   oac_int32 curr_len;
-   oac_int32 repeat_len;
-   oac_int32 src_len;
-   oac_int32 trailing_short_len;
-   int nb_frames;
-   int frame_max;
-   int curr_frame;
-   int repeat_frame;
-   unsigned char repeat_l;
+    const unsigned char *data;
+    const unsigned char *curr_data;
+    const unsigned char *repeat_data;
+    const unsigned char *last_long;
+    const unsigned char *src_data;
+    oac_int32 len;
+    oac_int32 curr_len;
+    oac_int32 repeat_len;
+    oac_int32 src_len;
+    oac_int32 trailing_short_len;
+    int nb_frames;
+    int frame_max;
+    int curr_frame;
+    int repeat_frame;
+    unsigned char repeat_l;
 } OacExtensionIterator;
 
 typedef struct {
-   int id;
-   int frame;
-   const unsigned char *data;
-   oac_int32 len;
+    int id;
+    int frame;
+    const unsigned char *data;
+    oac_int32 len;
 } oac_extension_data;
 
 void oac_extension_iterator_init(OacExtensionIterator *iter,
- const unsigned char *data, oac_int32 len, oac_int32 nb_frames);
+    const unsigned char *data, oac_int32 len, oac_int32 nb_frames);
 
 void oac_extension_iterator_reset(OacExtensionIterator *iter);
 void oac_extension_iterator_set_frame_max(OacExtensionIterator *iter,
- int frame_max);
+    int frame_max);
 int oac_extension_iterator_next(OacExtensionIterator *iter,
- oac_extension_data *ext);
+    oac_extension_data *ext);
 int oac_extension_iterator_find(OacExtensionIterator *iter,
- oac_extension_data *ext, int id);
+    oac_extension_data *ext, int id);
 
 typedef struct ChannelLayout {
-   int nb_channels;
-   int nb_streams;
-   int nb_coupled_streams;
-   unsigned char mapping[256];
+    int nb_channels;
+    int nb_streams;
+    int nb_coupled_streams;
+    unsigned char mapping[256];
 } ChannelLayout;
 
 typedef enum {
-  MAPPING_TYPE_NONE,
-  MAPPING_TYPE_SURROUND,
-  MAPPING_TYPE_AMBISONICS
+    MAPPING_TYPE_NONE,
+    MAPPING_TYPE_SURROUND,
+    MAPPING_TYPE_AMBISONICS
 } MappingType;
 
 struct OacMSEncoder {
-   ChannelLayout layout;
-   int arch;
-   int lfe_stream;
-   int application;
-   oac_int32 Fs;
-   int variable_duration;
-   MappingType mapping_type;
-   oac_int32 bitrate_bps;
-   /* Encoder states go here */
-   /* then oac_val32 window_mem[channels*120]; */
-   /* then oac_val32 preemph_mem[channels]; */
+    ChannelLayout layout;
+    int arch;
+    int lfe_stream;
+    int application;
+    oac_int32 Fs;
+    int variable_duration;
+    MappingType mapping_type;
+    oac_int32 bitrate_bps;
+    /* Encoder states go here */
+    /* then oac_val32 window_mem[channels*120]; */
+    /* then oac_val32 preemph_mem[channels]; */
 };
 
 struct OacMSDecoder {
-   ChannelLayout layout;
-   /* Decoder states go here */
+    ChannelLayout layout;
+    /* Decoder states go here */
 };
 
 int oac_multistream_encoder_ctl_va_list(struct OacMSEncoder *st, int request,
-  va_list ap);
+    va_list ap);
 int oac_multistream_decoder_ctl_va_list(struct OacMSDecoder *st, int request,
-  va_list ap);
+    va_list ap);
 
 int validate_layout(const ChannelLayout *layout);
 int get_left_channel(const ChannelLayout *layout, int stream_id, int prev);
@@ -126,24 +126,22 @@ int get_right_channel(const ChannelLayout *layout, int stream_id, int prev);
 int get_mono_channel(const ChannelLayout *layout, int stream_id, int prev);
 
 typedef void (*oac_copy_channel_in_func)(
-  oac_res *dst,
-  int dst_stride,
-  const void *src,
-  int src_stride,
-  int src_channel,
-  int frame_size,
-  void *user_data
-);
+    oac_res *dst,
+    int dst_stride,
+    const void *src,
+    int src_stride,
+    int src_channel,
+    int frame_size,
+    void *user_data);
 
 typedef void (*oac_copy_channel_out_func)(
-  void *dst,
-  int dst_stride,
-  int dst_channel,
-  const oac_res *src,
-  int src_stride,
-  int frame_size,
-  void *user_data
-);
+    void *dst,
+    int dst_stride,
+    int dst_channel,
+    const oac_res *src,
+    int src_stride,
+    int frame_size,
+    void *user_data);
 
 #define MODE_SILK_ONLY          1000
 #define MODE_HYBRID             1001
@@ -153,19 +151,19 @@ typedef void (*oac_copy_channel_out_func)(
 #define OAC_GET_VOICE_RATIO_REQUEST         11019
 
 /** Configures the encoder's expected percentage of voice
-  * opposed to music or other signals.
-  *
-  * @note This interface is currently more aspiration than actuality. It's
-  * ultimately expected to bias an automatic signal classifier, but it currently
-  * just shifts the static bitrate to mode mapping around a little bit.
-  *
-  * @param[in] x <tt>int</tt>:   Voice percentage in the range 0-100, inclusive.
-  * @hideinitializer */
+ * opposed to music or other signals.
+ *
+ * @note This interface is currently more aspiration than actuality. It's
+ * ultimately expected to bias an automatic signal classifier, but it currently
+ * just shifts the static bitrate to mode mapping around a little bit.
+ *
+ * @param[in] x <tt>int</tt>:   Voice percentage in the range 0-100, inclusive.
+ * @hideinitializer */
 #define OAC_SET_VOICE_RATIO(x) OAC_SET_VOICE_RATIO_REQUEST, oac_check_int(x)
 /** Gets the encoder's configured voice ratio value, @see OAC_SET_VOICE_RATIO
-  *
-  * @param[out] x <tt>int*</tt>:  Voice percentage in the range 0-100, inclusive.
-  * @hideinitializer */
+ *
+ * @param[out] x <tt>int*</tt>:  Voice percentage in the range 0-100, inclusive.
+ * @hideinitializer */
 #define OAC_GET_VOICE_RATIO(x) OAC_GET_VOICE_RATIO_REQUEST, oac_check_int_ptr(x)
 
 
@@ -185,82 +183,79 @@ int encode_size(int size, unsigned char *data);
 oac_int32 frame_size_select(int application, oac_int32 frame_size, int variable_duration, oac_int32 Fs);
 
 oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
-      unsigned char *data, oac_int32 out_data_bytes, int lsb_depth,
-      const void *analysis_pcm, oac_int32 analysis_size, int c1, int c2,
-      int analysis_channels, downmix_func downmix, int float_api);
+    unsigned char *data, oac_int32 out_data_bytes, int lsb_depth,
+    const void *analysis_pcm, oac_int32 analysis_size, int c1, int c2,
+    int analysis_channels, downmix_func downmix, int float_api);
 
 int oac_decode_native(OacDecoder *st, const unsigned char *data, oac_int32 len,
-      oac_res *pcm, int frame_size, int decode_fec, int self_delimited,
-      oac_int32 *packet_offset, int soft_clip, const OacDRED *dred, oac_int32 dred_offset);
+    oac_res *pcm, int frame_size, int decode_fec, int self_delimited,
+    oac_int32 *packet_offset, int soft_clip, const OacDRED *dred, oac_int32 dred_offset);
 
 /* Make sure everything is properly aligned. */
-static OAC_INLINE int align(int i)
-{
+static OAC_INLINE int align(int i) {
     struct foo {char c; union { void* p; oac_int32 i; oac_val32 v; } u;};
 
     unsigned int alignment = offsetof(struct foo, u);
 
     /* Optimizing compilers should optimize div and multiply into and
        for all sensible alignment values. */
-    return ((i + alignment - 1) / alignment) * alignment;
+    return ((i + alignment - 1)/alignment)*alignment;
 }
 
 int oac_packet_parse_impl(const unsigned char *data, oac_int32 len,
-      int self_delimited, unsigned char *out_toc,
-      const unsigned char *frames[48], oac_int16 size[48],
-      int *payload_offset, oac_int32 *packet_offset,
-      const unsigned char **padding, oac_int32 *padding_len);
+    int self_delimited, unsigned char *out_toc,
+    const unsigned char *frames[48], oac_int16 size[48],
+    int *payload_offset, oac_int32 *packet_offset,
+    const unsigned char **padding, oac_int32 *padding_len);
 
 oac_int32 oac_repacketizer_out_range_impl(OacRepacketizer *rp, int begin, int end,
-      unsigned char *data, oac_int32 maxlen, int self_delimited, int pad,
-      const oac_extension_data *extensions, int nb_extensions);
+    unsigned char *data, oac_int32 maxlen, int self_delimited, int pad,
+    const oac_extension_data *extensions, int nb_extensions);
 
 int pad_frame(unsigned char *data, oac_int32 len, oac_int32 new_len);
 
-int oac_multistream_encode_native
-(
-  struct OacMSEncoder *st,
-  oac_copy_channel_in_func copy_channel_in,
-  const void *pcm,
-  int analysis_frame_size,
-  unsigned char *data,
-  oac_int32 max_data_bytes,
-  int lsb_depth,
-  downmix_func downmix,
-  int float_api,
-  void *user_data
-);
+int oac_multistream_encode_native(
+    struct OacMSEncoder *st,
+    oac_copy_channel_in_func copy_channel_in,
+    const void *pcm,
+    int analysis_frame_size,
+    unsigned char *data,
+    oac_int32 max_data_bytes,
+    int lsb_depth,
+    downmix_func downmix,
+    int float_api,
+    void *user_data);
 
 int oac_multistream_decode_native(
-  struct OacMSDecoder *st,
-  const unsigned char *data,
-  oac_int32 len,
-  void *pcm,
-  oac_copy_channel_out_func copy_channel_out,
-  int frame_size,
-  int decode_fec,
-  int soft_clip,
-  void *user_data
-);
+    struct OacMSDecoder *st,
+    const unsigned char *data,
+    oac_int32 len,
+    void *pcm,
+    oac_copy_channel_out_func copy_channel_out,
+    int frame_size,
+    int decode_fec,
+    int soft_clip,
+    void *user_data);
 
 oac_int32 oac_packet_extensions_parse(const unsigned char *data,
- oac_int32 len, oac_extension_data *extensions, oac_int32 *nb_extensions,
- int nb_frames);
+    oac_int32 len, oac_extension_data *extensions, oac_int32 *nb_extensions,
+    int nb_frames);
 
 oac_int32 oac_packet_extensions_parse_ext(const unsigned char *data,
- oac_int32 len, oac_extension_data *extensions, oac_int32 *nb_extensions,
- const oac_int32 *nb_frame_exts, int nb_frames);
+    oac_int32 len, oac_extension_data *extensions, oac_int32 *nb_extensions,
+    const oac_int32 *nb_frame_exts, int nb_frames);
 
 oac_int32 oac_packet_extensions_generate(unsigned char *data, oac_int32 len,
- const oac_extension_data *extensions, oac_int32 nb_extensions,
- int nb_frames, int pad);
+    const oac_extension_data *extensions, oac_int32 nb_extensions,
+    int nb_frames, int pad);
 
 oac_int32 oac_packet_extensions_count(const unsigned char *data,
- oac_int32 len, int nb_frames);
+    oac_int32 len, int nb_frames);
 
 oac_int32 oac_packet_extensions_count_ext(const unsigned char *data,
- oac_int32 len, oac_int32 *nb_frame_exts, int nb_frames);
+    oac_int32 len, oac_int32 *nb_frame_exts, int nb_frames);
 
-oac_int32 oac_packet_pad_impl(unsigned char *data, oac_int32 len, oac_int32 new_len, int pad, const oac_extension_data  *extensions, int nb_extensions);
+oac_int32 oac_packet_pad_impl(unsigned char *data, oac_int32 len, oac_int32 new_len, int pad,
+    const oac_extension_data  *extensions, int nb_extensions);
 
 #endif /* OAC_PRIVATE_H */
diff --git a/src/oac_projection_decoder.c b/src/oac_projection_decoder.c
index 478c13084..44b009c39 100644
--- a/src/oac_projection_decoder.c
+++ b/src/oac_projection_decoder.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "mathops.h"
@@ -38,245 +38,226 @@
 #include "mapping_matrix.h"
 #include "stack_alloc.h"
 
-struct OacProjectionDecoder
-{
-  oac_int32 demixing_matrix_size_in_bytes;
-  /* Encoder states go here */
+struct OacProjectionDecoder {
+    oac_int32 demixing_matrix_size_in_bytes;
+    /* Encoder states go here */
 };
 
 #if !defined(DISABLE_FLOAT_API)
 static void oac_projection_copy_channel_out_float(
-  void *dst,
-  int dst_stride,
-  int dst_channel,
-  const oac_res *src,
-  int src_stride,
-  int frame_size,
-  void *user_data)
-{
-  float *float_dst;
-  const MappingMatrix *matrix;
-  float_dst = (float *)dst;
-  matrix = (const MappingMatrix *)user_data;
-
-  if (dst_channel == 0)
-    OAC_CLEAR(float_dst, frame_size * dst_stride);
-
-  if (src != NULL)
-    mapping_matrix_multiply_channel_out_float(matrix, src, dst_channel,
+    void *dst,
+    int dst_stride,
+    int dst_channel,
+    const oac_res *src,
+    int src_stride,
+    int frame_size,
+    void *user_data) {
+    float *float_dst;
+    const MappingMatrix *matrix;
+    float_dst = (float *)dst;
+    matrix = (const MappingMatrix *)user_data;
+
+    if (dst_channel == 0)
+        OAC_CLEAR(float_dst, frame_size*dst_stride);
+
+    if (src != NULL)
+        mapping_matrix_multiply_channel_out_float(matrix, src, dst_channel,
       src_stride, float_dst, dst_stride, frame_size);
 }
 #endif
 
 static void oac_projection_copy_channel_out_short(
-  void *dst,
-  int dst_stride,
-  int dst_channel,
-  const oac_res *src,
-  int src_stride,
-  int frame_size,
-  void *user_data)
-{
-  oac_int16 *short_dst;
-  const MappingMatrix *matrix;
-  short_dst = (oac_int16 *)dst;
-  matrix = (const MappingMatrix *)user_data;
-  if (dst_channel == 0)
-    OAC_CLEAR(short_dst, frame_size * dst_stride);
-
-  if (src != NULL)
-    mapping_matrix_multiply_channel_out_short(matrix, src, dst_channel,
+    void *dst,
+    int dst_stride,
+    int dst_channel,
+    const oac_res *src,
+    int src_stride,
+    int frame_size,
+    void *user_data) {
+    oac_int16 *short_dst;
+    const MappingMatrix *matrix;
+    short_dst = (oac_int16 *)dst;
+    matrix = (const MappingMatrix *)user_data;
+    if (dst_channel == 0)
+        OAC_CLEAR(short_dst, frame_size*dst_stride);
+
+    if (src != NULL)
+        mapping_matrix_multiply_channel_out_short(matrix, src, dst_channel,
       src_stride, short_dst, dst_stride, frame_size);
 }
 
 static void oac_projection_copy_channel_out_int24(
-  void *dst,
-  int dst_stride,
-  int dst_channel,
-  const oac_res *src,
-  int src_stride,
-  int frame_size,
-  void *user_data)
-{
-  oac_int32 *short_dst;
-  const MappingMatrix *matrix;
-  short_dst = (oac_int32 *)dst;
-  matrix = (const MappingMatrix *)user_data;
-  if (dst_channel == 0)
-    OAC_CLEAR(short_dst, frame_size * dst_stride);
-
-  if (src != NULL)
-    mapping_matrix_multiply_channel_out_int24(matrix, src, dst_channel,
+    void *dst,
+    int dst_stride,
+    int dst_channel,
+    const oac_res *src,
+    int src_stride,
+    int frame_size,
+    void *user_data) {
+    oac_int32 *short_dst;
+    const MappingMatrix *matrix;
+    short_dst = (oac_int32 *)dst;
+    matrix = (const MappingMatrix *)user_data;
+    if (dst_channel == 0)
+        OAC_CLEAR(short_dst, frame_size*dst_stride);
+
+    if (src != NULL)
+        mapping_matrix_multiply_channel_out_int24(matrix, src, dst_channel,
       src_stride, short_dst, dst_stride, frame_size);
 }
 
-static MappingMatrix *get_dec_demixing_matrix(OacProjectionDecoder *st)
-{
-  /* void* cast avoids clang -Wcast-align warning */
-  return (MappingMatrix*)(void*)((char*)st +
-    align(sizeof(OacProjectionDecoder)));
+static MappingMatrix *get_dec_demixing_matrix(OacProjectionDecoder *st) {
+    /* void* cast avoids clang -Wcast-align warning */
+    return (MappingMatrix*)(void*)((char*)st
+                                   + align(sizeof(OacProjectionDecoder)));
 }
 
-static OacMSDecoder *get_multistream_decoder(OacProjectionDecoder *st)
-{
-  /* void* cast avoids clang -Wcast-align warning */
-  return (OacMSDecoder*)(void*)((char*)st +
-    align(sizeof(OacProjectionDecoder) +
-    st->demixing_matrix_size_in_bytes));
+static OacMSDecoder *get_multistream_decoder(OacProjectionDecoder *st) {
+    /* void* cast avoids clang -Wcast-align warning */
+    return (OacMSDecoder*)(void*)((char*)st
+                                  + align(sizeof(OacProjectionDecoder)
+                                      + st->demixing_matrix_size_in_bytes));
 }
 
 oac_int32 oac_projection_decoder_get_size(int channels, int streams,
-                                            int coupled_streams)
-{
-  oac_int32 matrix_size;
-  oac_int32 decoder_size;
+                                          int coupled_streams) {
+    oac_int32 matrix_size;
+    oac_int32 decoder_size;
 
-  matrix_size =
-    mapping_matrix_get_size(streams + coupled_streams, channels);
-  if (!matrix_size)
-    return 0;
+    matrix_size =
+        mapping_matrix_get_size(streams + coupled_streams, channels);
+    if (!matrix_size)
+        return 0;
 
-  decoder_size = oac_multistream_decoder_get_size(streams, coupled_streams);
-  if (!decoder_size)
-    return 0;
+    decoder_size = oac_multistream_decoder_get_size(streams, coupled_streams);
+    if (!decoder_size)
+        return 0;
 
-  return align(sizeof(OacProjectionDecoder)) + matrix_size + decoder_size;
+    return align(sizeof(OacProjectionDecoder)) + matrix_size + decoder_size;
 }
 
 int oac_projection_decoder_init(OacProjectionDecoder *st, oac_int32 Fs,
-  int channels, int streams, int coupled_streams,
-  unsigned char *demixing_matrix, oac_int32 demixing_matrix_size)
-{
-  int nb_input_streams;
-  oac_int32 expected_matrix_size;
-  int i, ret;
-  unsigned char mapping[255];
-  VARDECL(oac_int16, buf);
-  ALLOC_STACK;
-
-  /* Verify supplied matrix size. */
-  nb_input_streams = streams + coupled_streams;
-  expected_matrix_size = nb_input_streams * channels * sizeof(oac_int16);
-  if (expected_matrix_size != demixing_matrix_size)
-  {
-    RESTORE_STACK;
-    return OAC_BAD_ARG;
-  }
-
-  /* Convert demixing matrix input into internal format. */
-  ALLOC(buf, nb_input_streams * channels, oac_int16);
-  for (i = 0; i < nb_input_streams * channels; i++)
-  {
-    int s = demixing_matrix[2*i + 1] << 8 | demixing_matrix[2*i];
-    s = ((s & 0xFFFF) ^ 0x8000) - 0x8000;
-    buf[i] = (oac_int16)s;
-  }
-
-  /* Assign demixing matrix. */
-  st->demixing_matrix_size_in_bytes =
-    mapping_matrix_get_size(channels, nb_input_streams);
-  if (!st->demixing_matrix_size_in_bytes)
-  {
-    RESTORE_STACK;
-    return OAC_BAD_ARG;
-  }
-
-  mapping_matrix_init(get_dec_demixing_matrix(st), channels, nb_input_streams, 0,
+                                int channels, int streams, int coupled_streams,
+                                unsigned char *demixing_matrix, oac_int32 demixing_matrix_size) {
+    int nb_input_streams;
+    oac_int32 expected_matrix_size;
+    int i, ret;
+    unsigned char mapping[255];
+    VARDECL(oac_int16, buf);
+    ALLOC_STACK;
+
+    /* Verify supplied matrix size. */
+    nb_input_streams = streams + coupled_streams;
+    expected_matrix_size = nb_input_streams*channels*sizeof(oac_int16);
+    if (expected_matrix_size != demixing_matrix_size) {
+        RESTORE_STACK;
+        return OAC_BAD_ARG;
+    }
+
+    /* Convert demixing matrix input into internal format. */
+    ALLOC(buf, nb_input_streams*channels, oac_int16);
+    for (i = 0; i < nb_input_streams*channels; i++) {
+        int s = demixing_matrix[2*i + 1]<<8|demixing_matrix[2*i];
+        s = ((s&0xFFFF)^0x8000) - 0x8000;
+        buf[i] = (oac_int16)s;
+    }
+
+    /* Assign demixing matrix. */
+    st->demixing_matrix_size_in_bytes =
+        mapping_matrix_get_size(channels, nb_input_streams);
+    if (!st->demixing_matrix_size_in_bytes) {
+        RESTORE_STACK;
+        return OAC_BAD_ARG;
+    }
+
+    mapping_matrix_init(get_dec_demixing_matrix(st), channels, nb_input_streams, 0,
     buf, demixing_matrix_size);
 
-  /* Set trivial mapping so each input channel pairs with a matrix column. */
-  for (i = 0; i < channels; i++)
-    mapping[i] = i;
+    /* Set trivial mapping so each input channel pairs with a matrix column. */
+    for (i = 0; i < channels; i++)
+        mapping[i] = i;
 
-  ret = oac_multistream_decoder_init(
+    ret = oac_multistream_decoder_init(
     get_multistream_decoder(st), Fs, channels, streams, coupled_streams, mapping);
-  RESTORE_STACK;
-  return ret;
+    RESTORE_STACK;
+    return ret;
 }
 
 OacProjectionDecoder *oac_projection_decoder_create(
-  oac_int32 Fs, int channels, int streams, int coupled_streams,
-  unsigned char *demixing_matrix, oac_int32 demixing_matrix_size, int *error)
-{
-  int size;
-  int ret;
-  OacProjectionDecoder *st;
-
-  /* Allocate space for the projection decoder. */
-  size = oac_projection_decoder_get_size(channels, streams, coupled_streams);
-  if (!size) {
-    if (error)
-      *error = OAC_ALLOC_FAIL;
-    return NULL;
-  }
-  st = (OacProjectionDecoder *)oac_alloc(size);
-  if (!st)
-  {
-    if (error)
-      *error = OAC_ALLOC_FAIL;
-    return NULL;
-  }
-
-  /* Initialize projection decoder with provided settings. */
-  ret = oac_projection_decoder_init(st, Fs, channels, streams, coupled_streams,
+    oac_int32 Fs, int channels, int streams, int coupled_streams,
+    unsigned char *demixing_matrix, oac_int32 demixing_matrix_size, int *error) {
+    int size;
+    int ret;
+    OacProjectionDecoder *st;
+
+    /* Allocate space for the projection decoder. */
+    size = oac_projection_decoder_get_size(channels, streams, coupled_streams);
+    if (!size) {
+        if (error)
+            *error = OAC_ALLOC_FAIL;
+        return NULL;
+    }
+    st = (OacProjectionDecoder *)oac_alloc(size);
+    if (!st) {
+        if (error)
+            *error = OAC_ALLOC_FAIL;
+        return NULL;
+    }
+
+    /* Initialize projection decoder with provided settings. */
+    ret = oac_projection_decoder_init(st, Fs, channels, streams, coupled_streams,
                                      demixing_matrix, demixing_matrix_size);
-  if (ret != OAC_OK)
-  {
-    oac_free(st);
-    st = NULL;
-  }
-  if (error)
-    *error = ret;
-  return st;
+    if (ret != OAC_OK) {
+        oac_free(st);
+        st = NULL;
+    }
+    if (error)
+        *error = ret;
+    return st;
 }
 
 #ifdef FIXED_POINT
-#define OPTIONAL_CLIP 0
+# define OPTIONAL_CLIP 0
 #else
-#define OPTIONAL_CLIP 1
+# define OPTIONAL_CLIP 1
 #endif
 
 int oac_projection_decode(OacProjectionDecoder *st, const unsigned char *data,
-                           oac_int32 len, oac_int16 *pcm, int frame_size,
-                           int decode_fec)
-{
-  return oac_multistream_decode_native(get_multistream_decoder(st), data, len,
+                          oac_int32 len, oac_int16 *pcm, int frame_size,
+                          int decode_fec) {
+    return oac_multistream_decode_native(get_multistream_decoder(st), data, len,
     pcm, oac_projection_copy_channel_out_short, frame_size, decode_fec, OPTIONAL_CLIP,
     get_dec_demixing_matrix(st));
 }
 
 int oac_projection_decode24(OacProjectionDecoder *st, const unsigned char *data,
-                           oac_int32 len, oac_int32 *pcm, int frame_size,
-                           int decode_fec)
-{
-  return oac_multistream_decode_native(get_multistream_decoder(st), data, len,
+                            oac_int32 len, oac_int32 *pcm, int frame_size,
+                            int decode_fec) {
+    return oac_multistream_decode_native(get_multistream_decoder(st), data, len,
     pcm, oac_projection_copy_channel_out_int24, frame_size, decode_fec, 0,
     get_dec_demixing_matrix(st));
 }
 
 #ifndef DISABLE_FLOAT_API
 int oac_projection_decode_float(OacProjectionDecoder *st, const unsigned char *data,
-                                 oac_int32 len, float *pcm, int frame_size, int decode_fec)
-{
-  return oac_multistream_decode_native(get_multistream_decoder(st), data, len,
+                                oac_int32 len, float *pcm, int frame_size, int decode_fec) {
+    return oac_multistream_decode_native(get_multistream_decoder(st), data, len,
     pcm, oac_projection_copy_channel_out_float, frame_size, decode_fec, 0,
     get_dec_demixing_matrix(st));
 }
 #endif
 
-int oac_projection_decoder_ctl(OacProjectionDecoder *st, int request, ...)
-{
-  va_list ap;
-  int ret = OAC_OK;
+int oac_projection_decoder_ctl(OacProjectionDecoder *st, int request, ...) {
+    va_list ap;
+    int ret = OAC_OK;
 
-  va_start(ap, request);
-  ret = oac_multistream_decoder_ctl_va_list(get_multistream_decoder(st),
+    va_start(ap, request);
+    ret = oac_multistream_decoder_ctl_va_list(get_multistream_decoder(st),
     request, ap);
-  va_end(ap);
-  return ret;
+    va_end(ap);
+    return ret;
 }
 
-void oac_projection_decoder_destroy(OacProjectionDecoder *st)
-{
-  oac_free(st);
+void oac_projection_decoder_destroy(OacProjectionDecoder *st) {
+    oac_free(st);
 }
diff --git a/src/oac_projection_encoder.c b/src/oac_projection_encoder.c
index dfc54ca9b..eacf11421 100644
--- a/src/oac_projection_encoder.c
+++ b/src/oac_projection_encoder.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "mathops.h"
@@ -38,484 +38,424 @@
 #include "stack_alloc.h"
 #include "mapping_matrix.h"
 
-struct OacProjectionEncoder
-{
-  oac_int32 mixing_matrix_size_in_bytes;
-  oac_int32 demixing_matrix_size_in_bytes;
-  /* Encoder states go here */
+struct OacProjectionEncoder {
+    oac_int32 mixing_matrix_size_in_bytes;
+    oac_int32 demixing_matrix_size_in_bytes;
+    /* Encoder states go here */
 };
 
 #if !defined(DISABLE_FLOAT_API)
 static void oac_projection_copy_channel_in_float(
-  oac_res *dst,
-  int dst_stride,
-  const void *src,
-  int src_stride,
-  int src_channel,
-  int frame_size,
-  void *user_data
-)
-{
-  mapping_matrix_multiply_channel_in_float((const MappingMatrix*)user_data,
-    (const float*)src, src_stride, dst, src_channel, dst_stride, frame_size);
+    oac_res *dst,
+    int dst_stride,
+    const void *src,
+    int src_stride,
+    int src_channel,
+    int frame_size,
+    void *user_data)                  {
+    mapping_matrix_multiply_channel_in_float((const MappingMatrix*)user_data,
+        (const float*)src, src_stride, dst, src_channel, dst_stride, frame_size);
 }
 #endif
 
 static void oac_projection_copy_channel_in_short(
-  oac_res *dst,
-  int dst_stride,
-  const void *src,
-  int src_stride,
-  int src_channel,
-  int frame_size,
-  void *user_data
-)
-{
-  mapping_matrix_multiply_channel_in_short((const MappingMatrix*)user_data,
-    (const oac_int16*)src, src_stride, dst, src_channel, dst_stride, frame_size);
+    oac_res *dst,
+    int dst_stride,
+    const void *src,
+    int src_stride,
+    int src_channel,
+    int frame_size,
+    void *user_data)                  {
+    mapping_matrix_multiply_channel_in_short((const MappingMatrix*)user_data,
+        (const oac_int16*)src, src_stride, dst, src_channel, dst_stride, frame_size);
 }
 
 static void oac_projection_copy_channel_in_int24(
-  oac_res *dst,
-  int dst_stride,
-  const void *src,
-  int src_stride,
-  int src_channel,
-  int frame_size,
-  void *user_data
-)
-{
-  mapping_matrix_multiply_channel_in_int24((const MappingMatrix*)user_data,
-    (const oac_int32*)src, src_stride, dst, src_channel, dst_stride, frame_size);
+    oac_res *dst,
+    int dst_stride,
+    const void *src,
+    int src_stride,
+    int src_channel,
+    int frame_size,
+    void *user_data)                  {
+    mapping_matrix_multiply_channel_in_int24((const MappingMatrix*)user_data,
+        (const oac_int32*)src, src_stride, dst, src_channel, dst_stride, frame_size);
 }
 
-static int get_order_plus_one_from_channels(int channels, int *order_plus_one)
-{
-  int order_plus_one_;
-  int acn_channels;
-  int nondiegetic_channels;
-
-  /* Allowed numbers of channels:
-   * (1 + n)^2 + 2j, for n = 0...14 and j = 0 or 1.
-   */
-  if (channels < 1 || channels > 227)
-    return OAC_BAD_ARG;
-
-  order_plus_one_ = isqrt32(channels);
-  acn_channels = order_plus_one_ * order_plus_one_;
-  nondiegetic_channels = channels - acn_channels;
-  if (nondiegetic_channels != 0 && nondiegetic_channels != 2)
-    return OAC_BAD_ARG;
-
-  if (order_plus_one)
-    *order_plus_one = order_plus_one_;
-  return OAC_OK;
+static int get_order_plus_one_from_channels(int channels, int *order_plus_one) {
+    int order_plus_one_;
+    int acn_channels;
+    int nondiegetic_channels;
+
+    /* Allowed numbers of channels:
+     * (1 + n)^2 + 2j, for n = 0...14 and j = 0 or 1.
+     */
+    if (channels < 1 || channels > 227)
+        return OAC_BAD_ARG;
+
+    order_plus_one_ = isqrt32(channels);
+    acn_channels = order_plus_one_*order_plus_one_;
+    nondiegetic_channels = channels - acn_channels;
+    if (nondiegetic_channels != 0 && nondiegetic_channels != 2)
+        return OAC_BAD_ARG;
+
+    if (order_plus_one)
+        *order_plus_one = order_plus_one_;
+    return OAC_OK;
 }
 
 static int get_streams_from_channels(int channels, int mapping_family,
                                      int *streams, int *coupled_streams,
-                                     int *order_plus_one)
-{
-  if (mapping_family == 3)
-  {
-    if (get_order_plus_one_from_channels(channels, order_plus_one) != OAC_OK)
-      return OAC_BAD_ARG;
-    if (streams)
-      *streams = (channels + 1) / 2;
-    if (coupled_streams)
-      *coupled_streams = channels / 2;
-    return OAC_OK;
-  }
-  return OAC_BAD_ARG;
+                                     int *order_plus_one) {
+    if (mapping_family == 3) {
+        if (get_order_plus_one_from_channels(channels, order_plus_one) != OAC_OK)
+            return OAC_BAD_ARG;
+        if (streams)
+            *streams = (channels + 1)/2;
+        if (coupled_streams)
+            *coupled_streams = channels/2;
+        return OAC_OK;
+    }
+    return OAC_BAD_ARG;
 }
 
-static MappingMatrix *get_mixing_matrix(OacProjectionEncoder *st)
-{
-  /* void* cast avoids clang -Wcast-align warning */
-  return (MappingMatrix *)(void*)((char*)st +
-    align(sizeof(OacProjectionEncoder)));
+static MappingMatrix *get_mixing_matrix(OacProjectionEncoder *st) {
+    /* void* cast avoids clang -Wcast-align warning */
+    return (MappingMatrix *)(void*)((char*)st
+                                    + align(sizeof(OacProjectionEncoder)));
 }
 
-static MappingMatrix *get_enc_demixing_matrix(OacProjectionEncoder *st)
-{
-  /* void* cast avoids clang -Wcast-align warning */
-  return (MappingMatrix *)(void*)((char*)st +
-    align(sizeof(OacProjectionEncoder) +
-    st->mixing_matrix_size_in_bytes));
+static MappingMatrix *get_enc_demixing_matrix(OacProjectionEncoder *st) {
+    /* void* cast avoids clang -Wcast-align warning */
+    return (MappingMatrix *)(void*)((char*)st
+                                    + align(sizeof(OacProjectionEncoder)
+                                        + st->mixing_matrix_size_in_bytes));
 }
 
-static OacMSEncoder *get_multistream_encoder(OacProjectionEncoder *st)
-{
-  /* void* cast avoids clang -Wcast-align warning */
-  return (OacMSEncoder *)(void*)((char*)st +
-    align(sizeof(OacProjectionEncoder) +
-    st->mixing_matrix_size_in_bytes +
-    st->demixing_matrix_size_in_bytes));
+static OacMSEncoder *get_multistream_encoder(OacProjectionEncoder *st) {
+    /* void* cast avoids clang -Wcast-align warning */
+    return (OacMSEncoder *)(void*)((char*)st
+                                   + align(sizeof(OacProjectionEncoder)
+                                       + st->mixing_matrix_size_in_bytes
+                                       + st->demixing_matrix_size_in_bytes));
 }
 
 oac_int32 oac_projection_ambisonics_encoder_get_size(int channels,
-                                                       int mapping_family)
-{
-  int nb_streams;
-  int nb_coupled_streams;
-  int order_plus_one;
-  int mixing_matrix_rows, mixing_matrix_cols;
-  int demixing_matrix_rows, demixing_matrix_cols;
-  oac_int32 mixing_matrix_size, demixing_matrix_size;
-  oac_int32 encoder_size;
-  int ret;
-
-  ret = get_streams_from_channels(channels, mapping_family, &nb_streams,
+                                                     int mapping_family) {
+    int nb_streams;
+    int nb_coupled_streams;
+    int order_plus_one;
+    int mixing_matrix_rows, mixing_matrix_cols;
+    int demixing_matrix_rows, demixing_matrix_cols;
+    oac_int32 mixing_matrix_size, demixing_matrix_size;
+    oac_int32 encoder_size;
+    int ret;
+
+    ret = get_streams_from_channels(channels, mapping_family, &nb_streams,
                                   &nb_coupled_streams, &order_plus_one);
-  if (ret != OAC_OK)
-    return 0;
-
-  if (order_plus_one == 2)
-  {
-    mixing_matrix_rows = mapping_matrix_foa_mixing.rows;
-    mixing_matrix_cols = mapping_matrix_foa_mixing.cols;
-    demixing_matrix_rows = mapping_matrix_foa_demixing.rows;
-    demixing_matrix_cols = mapping_matrix_foa_demixing.cols;
-  }
-  else if (order_plus_one == 3)
-  {
-    mixing_matrix_rows = mapping_matrix_soa_mixing.rows;
-    mixing_matrix_cols = mapping_matrix_soa_mixing.cols;
-    demixing_matrix_rows = mapping_matrix_soa_demixing.rows;
-    demixing_matrix_cols = mapping_matrix_soa_demixing.cols;
-  }
-  else if (order_plus_one == 4)
-  {
-    mixing_matrix_rows = mapping_matrix_toa_mixing.rows;
-    mixing_matrix_cols = mapping_matrix_toa_mixing.cols;
-    demixing_matrix_rows = mapping_matrix_toa_demixing.rows;
-    demixing_matrix_cols = mapping_matrix_toa_demixing.cols;
-  }
-  else if (order_plus_one == 5)
-  {
-    mixing_matrix_rows = mapping_matrix_fourthoa_mixing.rows;
-    mixing_matrix_cols = mapping_matrix_fourthoa_mixing.cols;
-    demixing_matrix_rows = mapping_matrix_fourthoa_demixing.rows;
-    demixing_matrix_cols = mapping_matrix_fourthoa_demixing.cols;
-  }
-  else if (order_plus_one == 6)
-  {
-    mixing_matrix_rows = mapping_matrix_fifthoa_mixing.rows;
-    mixing_matrix_cols = mapping_matrix_fifthoa_mixing.cols;
-    demixing_matrix_rows = mapping_matrix_fifthoa_demixing.rows;
-    demixing_matrix_cols = mapping_matrix_fifthoa_demixing.cols;
-  }
-  else
-    return 0;
-
-  mixing_matrix_size =
-    mapping_matrix_get_size(mixing_matrix_rows, mixing_matrix_cols);
-  if (!mixing_matrix_size)
-    return 0;
-
-  demixing_matrix_size =
-    mapping_matrix_get_size(demixing_matrix_rows, demixing_matrix_cols);
-  if (!demixing_matrix_size)
-    return 0;
-
-  encoder_size =
-      oac_multistream_encoder_get_size(nb_streams, nb_coupled_streams);
-  if (!encoder_size)
-    return 0;
-
-  return align(sizeof(OacProjectionEncoder)) +
-    mixing_matrix_size + demixing_matrix_size + encoder_size;
+    if (ret != OAC_OK)
+        return 0;
+
+    if (order_plus_one == 2) {
+        mixing_matrix_rows = mapping_matrix_foa_mixing.rows;
+        mixing_matrix_cols = mapping_matrix_foa_mixing.cols;
+        demixing_matrix_rows = mapping_matrix_foa_demixing.rows;
+        demixing_matrix_cols = mapping_matrix_foa_demixing.cols;
+    } else if (order_plus_one == 3)   {
+        mixing_matrix_rows = mapping_matrix_soa_mixing.rows;
+        mixing_matrix_cols = mapping_matrix_soa_mixing.cols;
+        demixing_matrix_rows = mapping_matrix_soa_demixing.rows;
+        demixing_matrix_cols = mapping_matrix_soa_demixing.cols;
+    } else if (order_plus_one == 4)   {
+        mixing_matrix_rows = mapping_matrix_toa_mixing.rows;
+        mixing_matrix_cols = mapping_matrix_toa_mixing.cols;
+        demixing_matrix_rows = mapping_matrix_toa_demixing.rows;
+        demixing_matrix_cols = mapping_matrix_toa_demixing.cols;
+    } else if (order_plus_one == 5)   {
+        mixing_matrix_rows = mapping_matrix_fourthoa_mixing.rows;
+        mixing_matrix_cols = mapping_matrix_fourthoa_mixing.cols;
+        demixing_matrix_rows = mapping_matrix_fourthoa_demixing.rows;
+        demixing_matrix_cols = mapping_matrix_fourthoa_demixing.cols;
+    } else if (order_plus_one == 6)   {
+        mixing_matrix_rows = mapping_matrix_fifthoa_mixing.rows;
+        mixing_matrix_cols = mapping_matrix_fifthoa_mixing.cols;
+        demixing_matrix_rows = mapping_matrix_fifthoa_demixing.rows;
+        demixing_matrix_cols = mapping_matrix_fifthoa_demixing.cols;
+    } else
+        return 0;
+
+    mixing_matrix_size =
+        mapping_matrix_get_size(mixing_matrix_rows, mixing_matrix_cols);
+    if (!mixing_matrix_size)
+        return 0;
+
+    demixing_matrix_size =
+        mapping_matrix_get_size(demixing_matrix_rows, demixing_matrix_cols);
+    if (!demixing_matrix_size)
+        return 0;
+
+    encoder_size =
+        oac_multistream_encoder_get_size(nb_streams, nb_coupled_streams);
+    if (!encoder_size)
+        return 0;
+
+    return align(sizeof(OacProjectionEncoder))
+           + mixing_matrix_size + demixing_matrix_size + encoder_size;
 }
 
 int oac_projection_ambisonics_encoder_init(OacProjectionEncoder *st, oac_int32 Fs,
-                                            int channels, int mapping_family,
-                                            int *streams, int *coupled_streams,
-                                            int application)
-{
-  MappingMatrix *mixing_matrix;
-  MappingMatrix *demixing_matrix;
-  OacMSEncoder *ms_encoder;
-  int i;
-  int ret;
-  int order_plus_one;
-  unsigned char mapping[255];
-
-  if (streams == NULL || coupled_streams == NULL) {
-    return OAC_BAD_ARG;
-  }
+                                           int channels, int mapping_family,
+                                           int *streams, int *coupled_streams,
+                                           int application) {
+    MappingMatrix *mixing_matrix;
+    MappingMatrix *demixing_matrix;
+    OacMSEncoder *ms_encoder;
+    int i;
+    int ret;
+    int order_plus_one;
+    unsigned char mapping[255];
+
+    if (streams == NULL || coupled_streams == NULL) {
+        return OAC_BAD_ARG;
+    }
 
-  if (get_streams_from_channels(channels, mapping_family, streams,
+    if (get_streams_from_channels(channels, mapping_family, streams,
     coupled_streams, &order_plus_one) != OAC_OK)
-    return OAC_BAD_ARG;
+        return OAC_BAD_ARG;
 
-  if (mapping_family == 3)
-  {
-    /* Assign mixing matrix based on available pre-computed matrices. */
-    mixing_matrix = get_mixing_matrix(st);
-    if (order_plus_one == 2)
-    {
-      mapping_matrix_init(mixing_matrix, mapping_matrix_foa_mixing.rows,
+    if (mapping_family == 3) {
+        /* Assign mixing matrix based on available pre-computed matrices. */
+        mixing_matrix = get_mixing_matrix(st);
+        if (order_plus_one == 2) {
+            mapping_matrix_init(mixing_matrix, mapping_matrix_foa_mixing.rows,
         mapping_matrix_foa_mixing.cols, mapping_matrix_foa_mixing.gain,
         mapping_matrix_foa_mixing_data,
         sizeof(mapping_matrix_foa_mixing_data));
-    }
-    else if (order_plus_one == 3)
-    {
-      mapping_matrix_init(mixing_matrix, mapping_matrix_soa_mixing.rows,
+        } else if (order_plus_one == 3)   {
+            mapping_matrix_init(mixing_matrix, mapping_matrix_soa_mixing.rows,
         mapping_matrix_soa_mixing.cols, mapping_matrix_soa_mixing.gain,
         mapping_matrix_soa_mixing_data,
         sizeof(mapping_matrix_soa_mixing_data));
-    }
-    else if (order_plus_one == 4)
-    {
-      mapping_matrix_init(mixing_matrix, mapping_matrix_toa_mixing.rows,
+        } else if (order_plus_one == 4)   {
+            mapping_matrix_init(mixing_matrix, mapping_matrix_toa_mixing.rows,
         mapping_matrix_toa_mixing.cols, mapping_matrix_toa_mixing.gain,
         mapping_matrix_toa_mixing_data,
         sizeof(mapping_matrix_toa_mixing_data));
-    }
-    else if (order_plus_one == 5)
-    {
-      mapping_matrix_init(mixing_matrix, mapping_matrix_fourthoa_mixing.rows,
+        } else if (order_plus_one == 5)   {
+            mapping_matrix_init(mixing_matrix, mapping_matrix_fourthoa_mixing.rows,
         mapping_matrix_fourthoa_mixing.cols, mapping_matrix_fourthoa_mixing.gain,
         mapping_matrix_fourthoa_mixing_data,
         sizeof(mapping_matrix_fourthoa_mixing_data));
-    }
-    else if (order_plus_one == 6)
-    {
-      mapping_matrix_init(mixing_matrix, mapping_matrix_fifthoa_mixing.rows,
+        } else if (order_plus_one == 6)   {
+            mapping_matrix_init(mixing_matrix, mapping_matrix_fifthoa_mixing.rows,
         mapping_matrix_fifthoa_mixing.cols, mapping_matrix_fifthoa_mixing.gain,
         mapping_matrix_fifthoa_mixing_data,
         sizeof(mapping_matrix_fifthoa_mixing_data));
-    }
-    else
-      return OAC_BAD_ARG;
+        } else
+            return OAC_BAD_ARG;
 
-    st->mixing_matrix_size_in_bytes = mapping_matrix_get_size(
+        st->mixing_matrix_size_in_bytes = mapping_matrix_get_size(
       mixing_matrix->rows, mixing_matrix->cols);
-    if (!st->mixing_matrix_size_in_bytes)
-      return OAC_BAD_ARG;
+        if (!st->mixing_matrix_size_in_bytes)
+            return OAC_BAD_ARG;
 
-    /* Assign demixing matrix based on available pre-computed matrices. */
-    demixing_matrix = get_enc_demixing_matrix(st);
-    if (order_plus_one == 2)
-    {
-      mapping_matrix_init(demixing_matrix, mapping_matrix_foa_demixing.rows,
+        /* Assign demixing matrix based on available pre-computed matrices. */
+        demixing_matrix = get_enc_demixing_matrix(st);
+        if (order_plus_one == 2) {
+            mapping_matrix_init(demixing_matrix, mapping_matrix_foa_demixing.rows,
         mapping_matrix_foa_demixing.cols, mapping_matrix_foa_demixing.gain,
         mapping_matrix_foa_demixing_data,
         sizeof(mapping_matrix_foa_demixing_data));
-    }
-    else if (order_plus_one == 3)
-    {
-      mapping_matrix_init(demixing_matrix, mapping_matrix_soa_demixing.rows,
+        } else if (order_plus_one == 3)   {
+            mapping_matrix_init(demixing_matrix, mapping_matrix_soa_demixing.rows,
         mapping_matrix_soa_demixing.cols, mapping_matrix_soa_demixing.gain,
         mapping_matrix_soa_demixing_data,
         sizeof(mapping_matrix_soa_demixing_data));
-    }
-    else if (order_plus_one == 4)
-    {
-      mapping_matrix_init(demixing_matrix, mapping_matrix_toa_demixing.rows,
+        } else if (order_plus_one == 4)   {
+            mapping_matrix_init(demixing_matrix, mapping_matrix_toa_demixing.rows,
         mapping_matrix_toa_demixing.cols, mapping_matrix_toa_demixing.gain,
         mapping_matrix_toa_demixing_data,
         sizeof(mapping_matrix_toa_demixing_data));
-    }
-      else if (order_plus_one == 5)
-    {
-      mapping_matrix_init(demixing_matrix, mapping_matrix_fourthoa_demixing.rows,
+        } else if (order_plus_one == 5) {
+            mapping_matrix_init(demixing_matrix, mapping_matrix_fourthoa_demixing.rows,
         mapping_matrix_fourthoa_demixing.cols, mapping_matrix_fourthoa_demixing.gain,
         mapping_matrix_fourthoa_demixing_data,
         sizeof(mapping_matrix_fourthoa_demixing_data));
-    }
-    else if (order_plus_one == 6)
-    {
-      mapping_matrix_init(demixing_matrix, mapping_matrix_fifthoa_demixing.rows,
+        } else if (order_plus_one == 6)   {
+            mapping_matrix_init(demixing_matrix, mapping_matrix_fifthoa_demixing.rows,
         mapping_matrix_fifthoa_demixing.cols, mapping_matrix_fifthoa_demixing.gain,
         mapping_matrix_fifthoa_demixing_data,
         sizeof(mapping_matrix_fifthoa_demixing_data));
-    }
-    else
-      return OAC_BAD_ARG;
+        } else
+            return OAC_BAD_ARG;
 
-    st->demixing_matrix_size_in_bytes = mapping_matrix_get_size(
+        st->demixing_matrix_size_in_bytes = mapping_matrix_get_size(
       demixing_matrix->rows, demixing_matrix->cols);
-    if (!st->demixing_matrix_size_in_bytes)
-      return OAC_BAD_ARG;
-  }
-  else
-    return OAC_UNIMPLEMENTED;
-
-  /* Ensure matrices are large enough for desired coding scheme. */
-  if (*streams + *coupled_streams > mixing_matrix->rows ||
-      channels > mixing_matrix->cols ||
-      channels > demixing_matrix->rows ||
-      *streams + *coupled_streams > demixing_matrix->cols)
-    return OAC_BAD_ARG;
-
-  /* Set trivial mapping so each input channel pairs with a matrix column. */
-  for (i = 0; i < channels; i++)
-    mapping[i] = i;
-
-  /* Initialize multistream encoder with provided settings. */
-  ms_encoder = get_multistream_encoder(st);
-  ret = oac_multistream_encoder_init(ms_encoder, Fs, channels, *streams,
+        if (!st->demixing_matrix_size_in_bytes)
+            return OAC_BAD_ARG;
+    } else
+        return OAC_UNIMPLEMENTED;
+
+    /* Ensure matrices are large enough for desired coding scheme. */
+    if (*streams + *coupled_streams > mixing_matrix->rows
+        || channels > mixing_matrix->cols
+        || channels > demixing_matrix->rows
+        || *streams + *coupled_streams > demixing_matrix->cols)
+        return OAC_BAD_ARG;
+
+    /* Set trivial mapping so each input channel pairs with a matrix column. */
+    for (i = 0; i < channels; i++)
+        mapping[i] = i;
+
+    /* Initialize multistream encoder with provided settings. */
+    ms_encoder = get_multistream_encoder(st);
+    ret = oac_multistream_encoder_init(ms_encoder, Fs, channels, *streams,
                                       *coupled_streams, mapping, application);
-  return ret;
+    return ret;
 }
 
 OacProjectionEncoder *oac_projection_ambisonics_encoder_create(
     oac_int32 Fs, int channels, int mapping_family, int *streams,
-    int *coupled_streams, int application, int *error)
-{
-  int size;
-  int ret;
-  OacProjectionEncoder *st;
-
-  /* Allocate space for the projection encoder. */
-  size = oac_projection_ambisonics_encoder_get_size(channels, mapping_family);
-  if (!size) {
-    if (error)
-      *error = OAC_ALLOC_FAIL;
-    return NULL;
-  }
-  st = (OacProjectionEncoder *)oac_alloc(size);
-  if (!st)
-  {
-    if (error)
-      *error = OAC_ALLOC_FAIL;
-    return NULL;
-  }
+    int *coupled_streams, int application, int *error) {
+    int size;
+    int ret;
+    OacProjectionEncoder *st;
+
+    /* Allocate space for the projection encoder. */
+    size = oac_projection_ambisonics_encoder_get_size(channels, mapping_family);
+    if (!size) {
+        if (error)
+            *error = OAC_ALLOC_FAIL;
+        return NULL;
+    }
+    st = (OacProjectionEncoder *)oac_alloc(size);
+    if (!st) {
+        if (error)
+            *error = OAC_ALLOC_FAIL;
+        return NULL;
+    }
 
-  /* Initialize projection encoder with provided settings. */
-  ret = oac_projection_ambisonics_encoder_init(st, Fs, channels,
+    /* Initialize projection encoder with provided settings. */
+    ret = oac_projection_ambisonics_encoder_init(st, Fs, channels,
      mapping_family, streams, coupled_streams, application);
-  if (ret != OAC_OK)
-  {
-    oac_free(st);
-    st = NULL;
-  }
-  if (error)
-    *error = ret;
-  return st;
+    if (ret != OAC_OK) {
+        oac_free(st);
+        st = NULL;
+    }
+    if (error)
+        *error = ret;
+    return st;
 }
 
 int oac_projection_encode(OacProjectionEncoder *st, const oac_int16 *pcm,
-                           int frame_size, unsigned char *data,
-                           oac_int32 max_data_bytes)
-{
-  return oac_multistream_encode_native(get_multistream_encoder(st),
+                          int frame_size, unsigned char *data,
+                          oac_int32 max_data_bytes) {
+    return oac_multistream_encode_native(get_multistream_encoder(st),
     oac_projection_copy_channel_in_short, pcm, frame_size, data,
     max_data_bytes, 16, downmix_int, 0, get_mixing_matrix(st));
 }
 
 int oac_projection_encode24(OacProjectionEncoder *st, const oac_int32 *pcm,
-                           int frame_size, unsigned char *data,
-                           oac_int32 max_data_bytes)
-{
-  return oac_multistream_encode_native(get_multistream_encoder(st),
+                            int frame_size, unsigned char *data,
+                            oac_int32 max_data_bytes) {
+    return oac_multistream_encode_native(get_multistream_encoder(st),
     oac_projection_copy_channel_in_int24, pcm, frame_size, data,
     max_data_bytes, MAX_ENCODING_DEPTH, downmix_int, 0, get_mixing_matrix(st));
 }
 
 #ifndef DISABLE_FLOAT_API
 int oac_projection_encode_float(OacProjectionEncoder *st, const float *pcm,
-                                 int frame_size, unsigned char *data,
-                                 oac_int32 max_data_bytes)
-{
-  return oac_multistream_encode_native(get_multistream_encoder(st),
+                                int frame_size, unsigned char *data,
+                                oac_int32 max_data_bytes) {
+    return oac_multistream_encode_native(get_multistream_encoder(st),
     oac_projection_copy_channel_in_float, pcm, frame_size, data,
     max_data_bytes, MAX_ENCODING_DEPTH, downmix_float, 1, get_mixing_matrix(st));
 }
 #endif
 
-void oac_projection_encoder_destroy(OacProjectionEncoder *st)
-{
-  oac_free(st);
+void oac_projection_encoder_destroy(OacProjectionEncoder *st) {
+    oac_free(st);
 }
 
-int oac_projection_encoder_ctl(OacProjectionEncoder *st, int request, ...)
-{
-  va_list ap;
-  MappingMatrix *demixing_matrix;
-  OacMSEncoder *ms_encoder;
-  int ret = OAC_OK;
-
-  ms_encoder = get_multistream_encoder(st);
-  demixing_matrix = get_enc_demixing_matrix(st);
-
-  va_start(ap, request);
-  switch(request)
-  {
-  case OAC_PROJECTION_GET_DEMIXING_MATRIX_SIZE_REQUEST:
-  {
-    oac_int32 *value = va_arg(ap, oac_int32*);
-    if (!value)
-    {
-      goto bad_arg;
-    }
-    *value =
-      ms_encoder->layout.nb_channels * (ms_encoder->layout.nb_streams
-      + ms_encoder->layout.nb_coupled_streams) * sizeof(oac_int16);
-  }
-  break;
-  case OAC_PROJECTION_GET_DEMIXING_MATRIX_GAIN_REQUEST:
-  {
-    oac_int32 *value = va_arg(ap, oac_int32*);
-    if (!value)
-    {
-      goto bad_arg;
-    }
-    *value = demixing_matrix->gain;
-  }
-  break;
-  case OAC_PROJECTION_GET_DEMIXING_MATRIX_REQUEST:
-  {
-    int i, j, k, l;
-    int nb_input_streams;
-    int nb_output_streams;
-    unsigned char *external_char;
-    oac_int16 *internal_short;
-    oac_int32 external_size;
-    oac_int32 internal_size;
-
-    /* (I/O is in relation to the decoder's perspective). */
-    nb_input_streams = ms_encoder->layout.nb_streams +
-      ms_encoder->layout.nb_coupled_streams;
-    nb_output_streams = ms_encoder->layout.nb_channels;
-
-    external_char = va_arg(ap, unsigned char *);
-    external_size = va_arg(ap, oac_int32);
-    if (!external_char)
-    {
-      goto bad_arg;
-    }
-    internal_short = mapping_matrix_get_data(demixing_matrix);
-    internal_size = nb_input_streams * nb_output_streams * sizeof(oac_int16);
-    if (external_size != internal_size)
-    {
-      goto bad_arg;
-    }
+int oac_projection_encoder_ctl(OacProjectionEncoder *st, int request, ...) {
+    va_list ap;
+    MappingMatrix *demixing_matrix;
+    OacMSEncoder *ms_encoder;
+    int ret = OAC_OK;
 
-    /* Copy demixing matrix subset to output destination. */
-    l = 0;
-    for (i = 0; i < nb_input_streams; i++) {
-      for (j = 0; j < nb_output_streams; j++) {
-        k = demixing_matrix->rows * i + j;
-        external_char[2*l] = (unsigned char)internal_short[k];
-        external_char[2*l+1] = (unsigned char)(internal_short[k] >> 8);
-        l++;
-      }
+    ms_encoder = get_multistream_encoder(st);
+    demixing_matrix = get_enc_demixing_matrix(st);
+
+    va_start(ap, request);
+    switch (request) {
+        case OAC_PROJECTION_GET_DEMIXING_MATRIX_SIZE_REQUEST:
+        {
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            if (!value) {
+                goto bad_arg;
+            }
+            *value =
+                ms_encoder->layout.nb_channels*(ms_encoder->layout.nb_streams
+                                                + ms_encoder->layout.nb_coupled_streams)*sizeof(oac_int16);
+        }
+        break;
+        case OAC_PROJECTION_GET_DEMIXING_MATRIX_GAIN_REQUEST:
+        {
+            oac_int32 *value = va_arg(ap, oac_int32*);
+            if (!value) {
+                goto bad_arg;
+            }
+            *value = demixing_matrix->gain;
+        }
+        break;
+        case OAC_PROJECTION_GET_DEMIXING_MATRIX_REQUEST:
+        {
+            int i, j, k, l;
+            int nb_input_streams;
+            int nb_output_streams;
+            unsigned char *external_char;
+            oac_int16 *internal_short;
+            oac_int32 external_size;
+            oac_int32 internal_size;
+
+            /* (I/O is in relation to the decoder's perspective). */
+            nb_input_streams = ms_encoder->layout.nb_streams
+                               + ms_encoder->layout.nb_coupled_streams;
+            nb_output_streams = ms_encoder->layout.nb_channels;
+
+            external_char = va_arg(ap, unsigned char *);
+            external_size = va_arg(ap, oac_int32);
+            if (!external_char) {
+                goto bad_arg;
+            }
+            internal_short = mapping_matrix_get_data(demixing_matrix);
+            internal_size = nb_input_streams*nb_output_streams*sizeof(oac_int16);
+            if (external_size != internal_size) {
+                goto bad_arg;
+            }
+
+            /* Copy demixing matrix subset to output destination. */
+            l = 0;
+            for (i = 0; i < nb_input_streams; i++) {
+                for (j = 0; j < nb_output_streams; j++) {
+                    k = demixing_matrix->rows*i + j;
+                    external_char[2*l] = (unsigned char)internal_short[k];
+                    external_char[2*l + 1] = (unsigned char)(internal_short[k]>>8);
+                    l++;
+                }
+            }
+        }
+        break;
+        default:
+        {
+            ret = oac_multistream_encoder_ctl_va_list(ms_encoder, request, ap);
+        }
+        break;
     }
-  }
-  break;
-  default:
-  {
-    ret = oac_multistream_encoder_ctl_va_list(ms_encoder, request, ap);
-  }
-  break;
-  }
-  va_end(ap);
-  return ret;
+    va_end(ap);
+    return ret;
 
 bad_arg:
-  va_end(ap);
-  return OAC_BAD_ARG;
+    va_end(ap);
+    return OAC_BAD_ARG;
 }
diff --git a/src/qext_compare.c b/src/qext_compare.c
index 035746cc8..a04c89376 100644
--- a/src/qext_compare.c
+++ b/src/qext_compare.c
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,26 +31,26 @@
 #include <string.h>
 #include "mini_kfft.c"
 
-#define MAX(a,b) ((a)>(b) ? (a) : (b))
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
 #define OAC_PI (3.14159265F)
 
 #define OAC_COSF(_x)        ((float)cos(_x))
 #define OAC_SINF(_x)        ((float)sin(_x))
 
-static void *check_alloc(void *_ptr){
-  if(_ptr==NULL){
-    fprintf(stderr,"Out of memory.\n");
-    exit(EXIT_FAILURE);
-  }
-  return _ptr;
+static void *check_alloc(void *_ptr) {
+    if (_ptr == NULL) {
+        fprintf(stderr, "Out of memory.\n");
+        exit(EXIT_FAILURE);
+    }
+    return _ptr;
 }
 
-static void *oac_malloc(size_t _size){
-  return check_alloc(malloc(_size));
+static void *oac_malloc(size_t _size) {
+    return check_alloc(malloc(_size));
 }
 
-static void *oac_realloc(void *_ptr,size_t _size){
-  return check_alloc(realloc(_ptr,_size));
+static void *oac_realloc(void *_ptr, size_t _size) {
+    return check_alloc(realloc(_ptr, _size));
 }
 
 #define FORMAT_S16_LE 0
@@ -69,462 +69,468 @@ typedef union {
 } float_bits;
 
 
-static size_t read_pcm(float **_samples,FILE *_fin,int _nchannels, int format){
-  unsigned char  buf[1024];
-  float         *samples;
-  size_t         nsamples;
-  size_t         csamples;
-  size_t         xi;
-  size_t         nread;
-  samples=NULL;
-  nsamples=csamples=0;
-  int size = format_size[format];
+static size_t read_pcm(float **_samples, FILE *_fin, int _nchannels, int format) {
+    unsigned char buf[1024];
+    float         *samples;
+    size_t nsamples;
+    size_t csamples;
+    size_t xi;
+    size_t nread;
+    samples = NULL;
+    nsamples = csamples = 0;
+    int size = format_size[format];
 
-  for(;;){
-    nread=fread(buf,size*_nchannels,1024/(size*_nchannels),_fin);
-    if(nread<=0)break;
-    if(nsamples+nread>csamples){
-      do csamples=csamples<<1|1;
-      while(nsamples+nread>csamples);
-      samples=(float *)oac_realloc(samples,
+    for (;;) {
+        nread = fread(buf, size*_nchannels, 1024/(size*_nchannels), _fin);
+        if (nread <= 0) break;
+        if (nsamples + nread > csamples) {
+            do csamples = csamples<<1|1;
+            while (nsamples + nread > csamples);
+            samples = (float *)oac_realloc(samples,
        _nchannels*csamples*sizeof(*samples));
-    }
-    if (format==FORMAT_S16_LE) {
-      for(xi=0;xi<nread;xi++){
-        int ci;
-        for(ci=0;ci<_nchannels;ci++){
-          int s;
-          s=buf[2*(xi*_nchannels+ci)+1]<<8|buf[2*(xi*_nchannels+ci)];
-          s=((s&0xFFFF)^0x8000)-0x8000;
-          samples[(nsamples+xi)*_nchannels+ci]=s;
         }
-      }
-    } else if (format==FORMAT_S24_LE) {
-       for(xi=0;xi<nread;xi++){
-         int ci;
-         for(ci=0;ci<_nchannels;ci++){
-           int s;
-           s=buf[3*(xi*_nchannels+ci)+2]<<16|buf[3*(xi*_nchannels+ci)+1]<<8|buf[3*(xi*_nchannels+ci)];
-           s=((s&0xFFFFFF)^0x800000)-0x800000;
-           samples[(nsamples+xi)*_nchannels+ci]=(1.f/256.f)*s;
-         }
-       }
-     } else if (format==FORMAT_F32_LE) {
-        for(xi=0;xi<nread;xi++){
-          int ci;
-          for(ci=0;ci<_nchannels;ci++){
-            float_bits s;
-            s.i=(unsigned)buf[4*(xi*_nchannels+ci)+3]<<24|buf[4*(xi*_nchannels+ci)+2]<<16|buf[4*(xi*_nchannels+ci)+1]<<8|buf[4*(xi*_nchannels+ci)];
-            samples[(nsamples+xi)*_nchannels+ci] = s.f*32768;
-          }
+        if (format == FORMAT_S16_LE) {
+            for (xi = 0; xi < nread; xi++) {
+                int ci;
+                for (ci = 0; ci < _nchannels; ci++) {
+                    int s;
+                    s = buf[2*(xi*_nchannels + ci) + 1]<<8|buf[2*(xi*_nchannels + ci)];
+                    s = ((s&0xFFFF)^0x8000) - 0x8000;
+                    samples[(nsamples + xi)*_nchannels + ci] = s;
+                }
+            }
+        } else if (format == FORMAT_S24_LE) {
+            for (xi = 0; xi < nread; xi++) {
+                int ci;
+                for (ci = 0; ci < _nchannels; ci++) {
+                    int s;
+                    s = buf[3*(xi*_nchannels + ci) + 2]<<16|buf[3*(xi*_nchannels + ci) + 1]<<
+                    8|buf[3*(xi*_nchannels + ci)];
+                    s = ((s&0xFFFFFF)^0x800000) - 0x800000;
+                    samples[(nsamples + xi)*_nchannels + ci] = (1.f/256.f)*s;
+                }
+            }
+        } else if (format == FORMAT_F32_LE) {
+            for (xi = 0; xi < nread; xi++) {
+                int ci;
+                for (ci = 0; ci < _nchannels; ci++) {
+                    float_bits s;
+                    s.i = (unsigned)buf[4*(xi*_nchannels + ci) + 3]<<24|buf[4*(xi*_nchannels + ci) + 2]<<
+                    16|buf[4*(xi*_nchannels + ci) + 1]<<8|buf[4*(xi*_nchannels + ci)];
+                    samples[(nsamples + xi)*_nchannels + ci] = s.f*32768;
+                }
+            }
+        } else {
+            exit(1);
         }
-      } else {
-        exit(1);
-      }
-    nsamples+=nread;
-  }
-  *_samples=(float *)oac_realloc(samples,
+        nsamples += nread;
+    }
+    *_samples = (float *)oac_realloc(samples,
    _nchannels*nsamples*sizeof(*samples));
-  return nsamples;
+    return nsamples;
 }
 
-static void band_energy(float *_out,float *_ps,const int *_bands,int _nbands,
- const float *_in,int _nchannels,size_t _nframes,int _window_sz,
- int _step,int _downsample){
-  float window[TEST_WIN_SIZE];
-  float x[TEST_WIN_SIZE];
-  size_t xi;
-  int    xj;
-  int    ps_sz;
-  mini_kiss_fft_cpx X[2][NFREQS+1];
-  mini_kiss_fftr_cfg kfft;
-  ps_sz=_window_sz/2;
-  /* Blackman-Harris window. */
-  for(xj=0;xj<_window_sz;xj++){
-    double n = (xj+.5)/_window_sz;
-    window[xj]=0.35875 - 0.48829*cos(2*OAC_PI*n) + 0.14128*cos(4*OAC_PI*n) - 0.01168*cos(6*OAC_PI*n);
-  }
-  kfft = mini_kiss_fftr_alloc(_window_sz, 0, NULL, NULL);
-  for(xi=0;xi<_nframes;xi++){
-    int ci;
-    int xk;
-    int bi;
-    for(ci=0;ci<_nchannels;ci++){
-      for(xk=0;xk<_window_sz;xk++){
-        x[xk]=window[xk]*_in[(xi*_step+xk)*_nchannels+ci];
-      }
-      mini_kiss_fftr(kfft, x, X[ci]);
+static void band_energy(float *_out, float *_ps, const int *_bands, int _nbands,
+                        const float *_in, int _nchannels, size_t _nframes, int _window_sz,
+                        int _step, int _downsample) {
+    float window[TEST_WIN_SIZE];
+    float x[TEST_WIN_SIZE];
+    size_t xi;
+    int xj;
+    int ps_sz;
+    mini_kiss_fft_cpx X[2][NFREQS + 1];
+    mini_kiss_fftr_cfg kfft;
+    ps_sz = _window_sz/2;
+    /* Blackman-Harris window. */
+    for (xj = 0; xj < _window_sz; xj++) {
+        double n = (xj + .5)/_window_sz;
+        window[xj] = 0.35875 - 0.48829*cos(2*OAC_PI*n) + 0.14128*cos(4*OAC_PI*n) - 0.01168*cos(6*OAC_PI*n);
     }
-    for(bi=xj=0;bi<_nbands;bi++){
-      float p[2]={0};
-      for(;xj<_bands[bi+1];xj++){
-        for(ci=0;ci<_nchannels;ci++){
-          float re;
-          float im;
-          re = X[ci][xj].r*_downsample;
-          im = X[ci][xj].i*_downsample;
-          _ps[(xi*ps_sz+xj)*_nchannels+ci]=re*re+im*im+.1;
-          p[ci]+=_ps[(xi*ps_sz+xj)*_nchannels+ci];
+    kfft = mini_kiss_fftr_alloc(_window_sz, 0, NULL, NULL);
+    for (xi = 0; xi < _nframes; xi++) {
+        int ci;
+        int xk;
+        int bi;
+        for (ci = 0; ci < _nchannels; ci++) {
+            for (xk = 0; xk < _window_sz; xk++) {
+                x[xk] = window[xk]*_in[(xi*_step + xk)*_nchannels + ci];
+            }
+            mini_kiss_fftr(kfft, x, X[ci]);
         }
-      }
-      if(_out){
-        _out[(xi*_nbands+bi)*_nchannels]=p[0]/(_bands[bi+1]-_bands[bi]);
-        if(_nchannels==2){
-          _out[(xi*_nbands+bi)*_nchannels+1]=p[1]/(_bands[bi+1]-_bands[bi]);
+        for (bi = xj = 0; bi < _nbands; bi++) {
+            float p[2] = {0};
+            for (; xj < _bands[bi + 1]; xj++) {
+                for (ci = 0; ci < _nchannels; ci++) {
+                    float re;
+                    float im;
+                    re = X[ci][xj].r*_downsample;
+                    im = X[ci][xj].i*_downsample;
+                    _ps[(xi*ps_sz + xj)*_nchannels + ci] = re*re + im*im + .1;
+                    p[ci] += _ps[(xi*ps_sz + xj)*_nchannels + ci];
+                }
+            }
+            if (_out) {
+                _out[(xi*_nbands + bi)*_nchannels] = p[0]/(_bands[bi + 1] - _bands[bi]);
+                if (_nchannels == 2) {
+                    _out[(xi*_nbands + bi)*_nchannels + 1] = p[1]/(_bands[bi + 1] - _bands[bi]);
+                }
+            }
         }
-      }
     }
-  }
-  free(kfft);
+    free(kfft);
 }
 
 
 /*Bands on which we compute the pseudo-NMR (Bark-derived
-  CELT bands).*/
-static const int BANDS[NBANDS+1]={
-  0,2,4,6,8,10,12,14,16,20,24,28,32,40,48,56,68,80,96,120,156,200, 240,280,320,360,400,440,480
+   CELT bands).*/
+static const int BANDS[NBANDS + 1] = {
+    0, 2, 4, 6, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56, 68, 80, 96, 120, 156, 200, 240, 280, 320, 360, 400, 440,
+    480
 };
 
 
 void usage(const char *_argv0) {
-   fprintf(stderr,"Usage: %s [-s] [-48k] [-s16|-s24|-f32] [-r rate2] [-thresholds err4 err16 rms] <file1.sw> <file2.sw>\n",
+    fprintf(stderr,
+    "Usage: %s [-s] [-48k] [-s16|-s24|-f32] [-r rate2] [-thresholds err4 err16 rms] <file1.sw> <file2.sw>\n",
     _argv0);
 }
 
-int main(int _argc,const char **_argv){
-  FILE    *fin1;
-  FILE    *fin2;
-  float   *x;
-  float   *y;
-  float   *xb;
-  float   *X;
-  float   *Y;
-  double    err4;
-  double    err16;
-  size_t   xlength;
-  size_t   ylength;
-  size_t   nframes;
-  size_t   xi;
-  int      ci;
-  int      xj;
-  int      bi;
-  int      nchannels;
-  unsigned rate;
-  unsigned base_rate;
-  int      downsample;
-  int      nbands;
-  int      ybands;
-  int      nfreqs;
-  int      yfreqs;
-  size_t   test_win_size;
-  size_t   test_win_step;
-  int      max_compare;
-  int      format;
-  int      skip=0;
-  double rms=-1;
-  const char *argv0 = _argv[0];
-  double err4_threshold=-1, err16_threshold=-1, rms_threshold=-1;
-  int compare_thresholds=0;
-  if(_argc<3){
-    usage(argv0);
-    return EXIT_FAILURE;
-  }
-  nchannels=1;
-  base_rate=96000;
-  rate=0;
-  nbands=NBANDS;
-  nfreqs=NFREQS;
-  test_win_size=TEST_WIN_SIZE;
-  test_win_step=TEST_WIN_STEP;
-  downsample=1;
-  format=FORMAT_S16_LE;
-  while (_argc > 3) {
-    if(strcmp(_argv[1],"-s")==0){
-      nchannels=2;
-      _argv++;
-      _argc--;
-    } else if(strcmp(_argv[1],"-48k")==0){
-      base_rate=48000;
-      _argv++;
-      _argc--;
-    } else if(strcmp(_argv[1],"-s16")==0){
-      format=FORMAT_S16_LE;
-      _argv++;
-      _argc--;
-    } else if(strcmp(_argv[1],"-s24")==0){
-      format=FORMAT_S24_LE;
-      _argv++;
-      _argc--;
-    } else if(strcmp(_argv[1],"-f32")==0){
-      format=FORMAT_F32_LE;
-      _argv++;
-      _argc--;
-    } else if(strcmp(_argv[1],"-skip")==0){
-      skip=atoi(_argv[2]);
-      _argv+=2;
-      _argc-=2;
-    } else if(strcmp(_argv[1],"-thresholds")==0){
-      if (_argc < 7) {
+int main(int _argc, const char **_argv) {
+    FILE    *fin1;
+    FILE    *fin2;
+    float   *x;
+    float   *y;
+    float   *xb;
+    float   *X;
+    float   *Y;
+    double err4;
+    double err16;
+    size_t xlength;
+    size_t ylength;
+    size_t nframes;
+    size_t xi;
+    int ci;
+    int xj;
+    int bi;
+    int nchannels;
+    unsigned rate;
+    unsigned base_rate;
+    int downsample;
+    int nbands;
+    int ybands;
+    int nfreqs;
+    int yfreqs;
+    size_t test_win_size;
+    size_t test_win_step;
+    int max_compare;
+    int format;
+    int skip = 0;
+    double rms = -1;
+    const char *argv0 = _argv[0];
+    double err4_threshold = -1, err16_threshold = -1, rms_threshold = -1;
+    int compare_thresholds = 0;
+    if (_argc < 3) {
         usage(argv0);
         return EXIT_FAILURE;
-      }
-      err4_threshold=atof(_argv[2]);
-      err16_threshold=atof(_argv[3]);
-      rms_threshold=atof(_argv[4]);
-      compare_thresholds=1;
-      _argv+=4;
-      _argc-=4;
-    } else if(strcmp(_argv[1],"-r")==0){
-      rate=atoi(_argv[2]);
-      if(rate!=8000&&rate!=12000&&rate!=16000&&rate!=24000&&rate!=48000&&rate!=96000){
-        fprintf(stderr,
+    }
+    nchannels = 1;
+    base_rate = 96000;
+    rate = 0;
+    nbands = NBANDS;
+    nfreqs = NFREQS;
+    test_win_size = TEST_WIN_SIZE;
+    test_win_step = TEST_WIN_STEP;
+    downsample = 1;
+    format = FORMAT_S16_LE;
+    while (_argc > 3) {
+        if (strcmp(_argv[1], "-s") == 0) {
+            nchannels = 2;
+            _argv++;
+            _argc--;
+        } else if (strcmp(_argv[1], "-48k") == 0) {
+            base_rate = 48000;
+            _argv++;
+            _argc--;
+        } else if (strcmp(_argv[1], "-s16") == 0) {
+            format = FORMAT_S16_LE;
+            _argv++;
+            _argc--;
+        } else if (strcmp(_argv[1], "-s24") == 0) {
+            format = FORMAT_S24_LE;
+            _argv++;
+            _argc--;
+        } else if (strcmp(_argv[1], "-f32") == 0) {
+            format = FORMAT_F32_LE;
+            _argv++;
+            _argc--;
+        } else if (strcmp(_argv[1], "-skip") == 0) {
+            skip = atoi(_argv[2]);
+            _argv += 2;
+            _argc -= 2;
+        } else if (strcmp(_argv[1], "-thresholds") == 0) {
+            if (_argc < 7) {
+                usage(argv0);
+                return EXIT_FAILURE;
+            }
+            err4_threshold = atof(_argv[2]);
+            err16_threshold = atof(_argv[3]);
+            rms_threshold = atof(_argv[4]);
+            compare_thresholds = 1;
+            _argv += 4;
+            _argc -= 4;
+        } else if (strcmp(_argv[1], "-r") == 0) {
+            rate = atoi(_argv[2]);
+            if (rate != 8000 && rate != 12000 && rate != 16000 && rate != 24000 && rate != 48000 && rate != 96000) {
+                fprintf(stderr,
               "Sampling rate must be 8000, 12000, 16000, 24000, 48000, or 96000\n");
+                return EXIT_FAILURE;
+            }
+            _argv += 2;
+            _argc -= 2;
+        } else {
+            usage(argv0);
+            return EXIT_FAILURE;
+        }
+    }
+    if (_argc != 3) {
+        usage(argv0);
         return EXIT_FAILURE;
-      }
-      _argv+=2;
-      _argc-=2;
-    } else {
-      usage(argv0);
-      return EXIT_FAILURE;
     }
-  }
-  if(_argc!=3){
-    usage(argv0);
-    return EXIT_FAILURE;
-  }
-  if (rate==0) rate=base_rate;
-  if (base_rate == 48000) {
-    test_win_size/=2;
-    test_win_step/=2;
-    nfreqs/=2;
-    nbands=22;
-  }
-  switch(rate){
-    case  8000:ybands=13;break;
-    case 12000:ybands=15;break;
-    case 16000:ybands=17;break;
-    case 24000:ybands=19;break;
-    case 48000:ybands=22;break;
-    case 96000:ybands=NBANDS;break;
-    default:
-      usage(argv0);
-      return EXIT_FAILURE;
-  }
-  downsample=base_rate/rate;
-  yfreqs=nfreqs/downsample;
-  fin1=fopen(_argv[1],"rb");
-  if(fin1==NULL){
-    fprintf(stderr,"Error opening '%s'.\n",_argv[1]);
-    return EXIT_FAILURE;
-  }
-  fin2=fopen(_argv[2],"rb");
-  if(fin2==NULL){
-    fprintf(stderr,"Error opening '%s'.\n",_argv[2]);
-    fclose(fin1);
-    return EXIT_FAILURE;
-  }
-  /*Read in the data and allocate scratch space.*/
-  xlength=read_pcm(&x,fin1,2,format);
-  if(nchannels==1){
-    for(xi=0;xi<xlength;xi++)x[xi]=.5*(x[2*xi]+x[2*xi+1]);
-  }
-  fclose(fin1);
-  ylength=read_pcm(&y,fin2,nchannels,format);
-  fclose(fin2);
-  skip *= nchannels;
-  y += skip/downsample;
-  ylength -= skip/downsample;
-  if (skip && ylength*downsample > xlength) ylength = xlength/downsample;
-  if(xlength!=ylength*downsample){
-    fprintf(stderr,"Sample counts do not match (%lu!=%lu).\n",
-     (unsigned long)xlength,(unsigned long)ylength*downsample);
-    return EXIT_FAILURE;
-  }
-  if(xlength<test_win_size){
-    fprintf(stderr,"Insufficient sample data (%lu<%lu).\n",
-     (unsigned long)xlength,(unsigned long)test_win_size);
-    return EXIT_FAILURE;
-  }
-  if (nchannels==2 && downsample==1){
-    size_t i;
-    rms=0;
-    for (i=0;i<xlength*nchannels;i++){
-      double e=x[i]-y[i];
-      rms+=e*e;
+    if (rate == 0) rate = base_rate;
+    if (base_rate == 48000) {
+        test_win_size /= 2;
+        test_win_step /= 2;
+        nfreqs /= 2;
+        nbands = 22;
     }
-    rms=sqrt(rms/(xlength*nchannels));
-  }
-  nframes=(xlength-test_win_size+test_win_step)/test_win_step;
-  xb=(float *)oac_malloc(nframes*nbands*nchannels*sizeof(*xb));
-  X=(float *)oac_malloc(nframes*nfreqs*nchannels*sizeof(*X));
-  Y=(float *)oac_malloc(nframes*yfreqs*nchannels*sizeof(*Y));
-  /*Compute the per-band spectral energy of the original signal
-     and the error.*/
-  band_energy(xb,X,BANDS,nbands,x,nchannels,nframes,
-        test_win_size,test_win_step,1);
-  free(x);
-  band_energy(NULL,Y,BANDS,ybands,y,nchannels,nframes,
-        test_win_size/downsample,test_win_step/downsample,downsample);
-  free(y-skip/downsample);
-  for(xi=0;xi<nframes;xi++){
-    float maxE[2]={0};
-    for(bi=0;bi<nbands;bi++){
-      for(ci=0;ci<nchannels;ci++){
-        maxE[ci] = MAX(maxE[ci], xb[(xi*nbands+bi)*nchannels+ci]);
-      }
+    switch (rate) {
+        case  8000: ybands = 13; break;
+        case 12000: ybands = 15; break;
+        case 16000: ybands = 17; break;
+        case 24000: ybands = 19; break;
+        case 48000: ybands = 22; break;
+        case 96000: ybands = NBANDS; break;
+        default:
+            usage(argv0);
+            return EXIT_FAILURE;
     }
-    /* Allow for up to 105 dB instantaneous dynamic range (95dB here + 10dB in mask application). */
-    for(bi=0;bi<nbands;bi++){
-      for(ci=0;ci<nchannels;ci++){
-        xb[(xi*nbands+bi)*nchannels+ci] = MAX(3.16e-10*maxE[ci], xb[(xi*nbands+bi)*nchannels+ci]);
-      }
+    downsample = base_rate/rate;
+    yfreqs = nfreqs/downsample;
+    fin1 = fopen(_argv[1], "rb");
+    if (fin1 == NULL) {
+        fprintf(stderr, "Error opening '%s'.\n", _argv[1]);
+        return EXIT_FAILURE;
     }
-
-    /*Frequency masking (low to high): 10 dB/Bark slope.*/
-    for(bi=1;bi<nbands;bi++){
-      for(ci=0;ci<nchannels;ci++){
-        xb[(xi*nbands+bi)*nchannels+ci]+=
-         0.1F*xb[(xi*nbands+bi-1)*nchannels+ci];
-      }
+    fin2 = fopen(_argv[2], "rb");
+    if (fin2 == NULL) {
+        fprintf(stderr, "Error opening '%s'.\n", _argv[2]);
+        fclose(fin1);
+        return EXIT_FAILURE;
     }
-    /*Frequency masking (high to low): 15 dB/Bark slope.*/
-    for(bi=nbands-2;bi-->0;){
-      for(ci=0;ci<nchannels;ci++){
-        xb[(xi*nbands+bi)*nchannels+ci]+=
-         0.03F*xb[(xi*nbands+bi+1)*nchannels+ci];
-      }
+    /*Read in the data and allocate scratch space.*/
+    xlength = read_pcm(&x, fin1, 2, format);
+    if (nchannels == 1) {
+        for (xi = 0; xi < xlength; xi++) x[xi] = .5*(x[2*xi] + x[2*xi + 1]);
     }
-    if(xi>0){
-      /* Forward temporal masking: -3 dB/2.5ms slope.*/
-      for(bi=0;bi<nbands;bi++){
-        for(ci=0;ci<nchannels;ci++){
-          xb[(xi*nbands+bi)*nchannels+ci]+=
-           0.5F*xb[((xi-1)*nbands+bi)*nchannels+ci];
+    fclose(fin1);
+    ylength = read_pcm(&y, fin2, nchannels, format);
+    fclose(fin2);
+    skip *= nchannels;
+    y += skip/downsample;
+    ylength -= skip/downsample;
+    if (skip && ylength*downsample > xlength) ylength = xlength/downsample;
+    if (xlength != ylength*downsample) {
+        fprintf(stderr, "Sample counts do not match (%lu!=%lu).\n",
+            (unsigned long)xlength, (unsigned long)ylength*downsample);
+        return EXIT_FAILURE;
+    }
+    if (xlength < test_win_size) {
+        fprintf(stderr, "Insufficient sample data (%lu<%lu).\n",
+            (unsigned long)xlength, (unsigned long)test_win_size);
+        return EXIT_FAILURE;
+    }
+    if (nchannels == 2 && downsample == 1) {
+        size_t i;
+        rms = 0;
+        for (i = 0; i < xlength*nchannels; i++) {
+            double e = x[i] - y[i];
+            rms += e*e;
+        }
+        rms = sqrt(rms/(xlength*nchannels));
+    }
+    nframes = (xlength - test_win_size + test_win_step)/test_win_step;
+    xb = (float *)oac_malloc(nframes*nbands*nchannels*sizeof(*xb));
+    X = (float *)oac_malloc(nframes*nfreqs*nchannels*sizeof(*X));
+    Y = (float *)oac_malloc(nframes*yfreqs*nchannels*sizeof(*Y));
+    /*Compute the per-band spectral energy of the original signal
+       and the error.*/
+    band_energy(xb, X, BANDS, nbands, x, nchannels, nframes,
+        test_win_size, test_win_step, 1);
+    free(x);
+    band_energy(NULL, Y, BANDS, ybands, y, nchannels, nframes,
+        test_win_size/downsample, test_win_step/downsample, downsample);
+    free(y - skip/downsample);
+    for (xi = 0; xi < nframes; xi++) {
+        float maxE[2] = {0};
+        for (bi = 0; bi < nbands; bi++) {
+            for (ci = 0; ci < nchannels; ci++) {
+                maxE[ci] = MAX(maxE[ci], xb[(xi*nbands + bi)*nchannels + ci]);
+            }
+        }
+        /* Allow for up to 105 dB instantaneous dynamic range (95dB here + 10dB in mask application). */
+        for (bi = 0; bi < nbands; bi++) {
+            for (ci = 0; ci < nchannels; ci++) {
+                xb[(xi*nbands + bi)*nchannels + ci] = MAX(3.16e-10*maxE[ci], xb[(xi*nbands + bi)*nchannels + ci]);
+            }
+        }
+
+        /*Frequency masking (low to high): 10 dB/Bark slope.*/
+        for (bi = 1; bi < nbands; bi++) {
+            for (ci = 0; ci < nchannels; ci++) {
+                xb[(xi*nbands + bi)*nchannels + ci] +=
+                    0.1F*xb[(xi*nbands + bi - 1)*nchannels + ci];
+            }
+        }
+        /*Frequency masking (high to low): 15 dB/Bark slope.*/
+        for (bi = nbands - 2; bi-- > 0;) {
+            for (ci = 0; ci < nchannels; ci++) {
+                xb[(xi*nbands + bi)*nchannels + ci] +=
+                    0.03F*xb[(xi*nbands + bi + 1)*nchannels + ci];
+            }
+        }
+        if (xi > 0) {
+            /* Forward temporal masking: -3 dB/2.5ms slope.*/
+            for (bi = 0; bi < nbands; bi++) {
+                for (ci = 0; ci < nchannels; ci++) {
+                    xb[(xi*nbands + bi)*nchannels + ci] +=
+                        0.5F*xb[((xi - 1)*nbands + bi)*nchannels + ci];
+                }
+            }
         }
-      }
     }
-  }
-  /*Backward temporal masking: -10 dB/2.5ms slope.*/
-  for(xi=nframes-2;xi-->0;){
-     for(bi=0;bi<nbands;bi++){
-       for(ci=0;ci<nchannels;ci++){
-         xb[(xi*nbands+bi)*nchannels+ci]+=
-          0.1F*xb[((xi+1)*nbands+bi)*nchannels+ci];
-       }
-     }
-  }
-  for(xi=0;xi<nframes;xi++){
-    /* Allowing some cross-talk */
-    if(nchannels==2){
-      for(bi=0;bi<nbands;bi++){
-        float l,r;
-        l=xb[(xi*nbands+bi)*nchannels+0];
-        r=xb[(xi*nbands+bi)*nchannels+1];
-        xb[(xi*nbands+bi)*nchannels+0]+=0.000001F*r;
-        xb[(xi*nbands+bi)*nchannels+1]+=0.000001F*l;
-      }
+    /*Backward temporal masking: -10 dB/2.5ms slope.*/
+    for (xi = nframes - 2; xi-- > 0;) {
+        for (bi = 0; bi < nbands; bi++) {
+            for (ci = 0; ci < nchannels; ci++) {
+                xb[(xi*nbands + bi)*nchannels + ci] +=
+                    0.1F*xb[((xi + 1)*nbands + bi)*nchannels + ci];
+            }
+        }
     }
+    for (xi = 0; xi < nframes; xi++) {
+        /* Allowing some cross-talk */
+        if (nchannels == 2) {
+            for (bi = 0; bi < nbands; bi++) {
+                float l, r;
+                l = xb[(xi*nbands + bi)*nchannels + 0];
+                r = xb[(xi*nbands + bi)*nchannels + 1];
+                xb[(xi*nbands + bi)*nchannels + 0] += 0.000001F*r;
+                xb[(xi*nbands + bi)*nchannels + 1] += 0.000001F*l;
+            }
+        }
 
-    /* Apply masking */
-    for(bi=0;bi<ybands;bi++){
-      for(xj=BANDS[bi];xj<BANDS[bi+1];xj++){
-        for(ci=0;ci<nchannels;ci++){
-          X[(xi*nfreqs+xj)*nchannels+ci]+=
-           0.1F*xb[(xi*nbands+bi)*nchannels+ci];
-          Y[(xi*yfreqs+xj)*nchannels+ci]+=
-           0.1F*xb[(xi*nbands+bi)*nchannels+ci];
+        /* Apply masking */
+        for (bi = 0; bi < ybands; bi++) {
+            for (xj = BANDS[bi]; xj < BANDS[bi + 1]; xj++) {
+                for (ci = 0; ci < nchannels; ci++) {
+                    X[(xi*nfreqs + xj)*nchannels + ci] +=
+                        0.1F*xb[(xi*nbands + bi)*nchannels + ci];
+                    Y[(xi*yfreqs + xj)*nchannels + ci] +=
+                        0.1F*xb[(xi*nbands + bi)*nchannels + ci];
+                }
+            }
         }
-      }
     }
-  }
 
-  /* Average of consecutive frames to make comparison slightly less sensitive */
-  for(bi=0;bi<ybands;bi++){
-    for(xj=BANDS[bi];xj<BANDS[bi+1];xj++){
-      for(ci=0;ci<nchannels;ci++){
-         float xtmp;
-         float ytmp;
-         xtmp = X[xj*nchannels+ci];
-         ytmp = Y[xj*nchannels+ci];
-         for(xi=1;xi<nframes;xi++){
-           float xtmp2;
-           float ytmp2;
-           xtmp2 = X[(xi*nfreqs+xj)*nchannels+ci];
-           ytmp2 = Y[(xi*yfreqs+xj)*nchannels+ci];
-           X[(xi*nfreqs+xj)*nchannels+ci] += xtmp;
-           Y[(xi*yfreqs+xj)*nchannels+ci] += ytmp;
-           xtmp = xtmp2;
-           ytmp = ytmp2;
-         }
-      }
+    /* Average of consecutive frames to make comparison slightly less sensitive */
+    for (bi = 0; bi < ybands; bi++) {
+        for (xj = BANDS[bi]; xj < BANDS[bi + 1]; xj++) {
+            for (ci = 0; ci < nchannels; ci++) {
+                float xtmp;
+                float ytmp;
+                xtmp = X[xj*nchannels + ci];
+                ytmp = Y[xj*nchannels + ci];
+                for (xi = 1; xi < nframes; xi++) {
+                    float xtmp2;
+                    float ytmp2;
+                    xtmp2 = X[(xi*nfreqs + xj)*nchannels + ci];
+                    ytmp2 = Y[(xi*yfreqs + xj)*nchannels + ci];
+                    X[(xi*nfreqs + xj)*nchannels + ci] += xtmp;
+                    Y[(xi*yfreqs + xj)*nchannels + ci] += ytmp;
+                    xtmp = xtmp2;
+                    ytmp = ytmp2;
+                }
+            }
+        }
     }
-  }
 
-  /*If working at a lower sampling rate, don't take into account the last
-     300 Hz to allow for different transition bands.
-    For 12 kHz, we don't skip anything, because the last band already skips
-     400 Hz.*/
-  if(rate==base_rate)max_compare=BANDS[nbands];
-  else if(rate==12000)max_compare=BANDS[ybands];
-  else max_compare=BANDS[ybands]-3;
-  err4=0;
-  err16=0;
-  for(xi=0;xi<nframes;xi++){
-    double Ef2, Ef4;
-    Ef2=0;
-    Ef4=0;
-    for(bi=0;bi<ybands;bi++){
-      double Eb2, Eb4;
-      double w;
-      Eb2=Eb4=0;
-      w = .5+.5*tanh(.5*(22-bi));
-      for(xj=BANDS[bi];xj<BANDS[bi+1]&&xj<max_compare;xj++){
-        float f, thresh;
-        f = xj*OAC_PI/240;
-        /* Shape the lower threshold similar to 1/(1 - 0.85*z^-1) deemphasis filter at 48 kHz. */
-        thresh = .1/(.15*.15 + f*f);
-        for(ci=0;ci<nchannels;ci++){
-          float re;
-          float im;
-          re=(Y[(xi*yfreqs+xj)*nchannels+ci]+thresh)/(X[(xi*nfreqs+xj)*nchannels+ci]+thresh);
-          im=re-log(re)-1;
-          /* Per-band error weighting. */
-          im *= w;
-          Eb2+=im;
-          /* Same for 4th power, but make it less sensitive to very low energies. */
-          re=(Y[(xi*yfreqs+xj)*nchannels+ci]+10*thresh)/(X[(xi*nfreqs+xj)*nchannels+ci]+10*thresh);
-          im=re-log(re)-1;
-          /* Per-band error weighting. */
-          im *= w;
-          Eb4+=im;
+    /*If working at a lower sampling rate, don't take into account the last
+       300 Hz to allow for different transition bands.
+       For 12 kHz, we don't skip anything, because the last band already skips
+       400 Hz.*/
+    if (rate == base_rate) max_compare = BANDS[nbands];
+    else if (rate == 12000) max_compare = BANDS[ybands];
+    else max_compare = BANDS[ybands] - 3;
+    err4 = 0;
+    err16 = 0;
+    for (xi = 0; xi < nframes; xi++) {
+        double Ef2, Ef4;
+        Ef2 = 0;
+        Ef4 = 0;
+        for (bi = 0; bi < ybands; bi++) {
+            double Eb2, Eb4;
+            double w;
+            Eb2 = Eb4 = 0;
+            w = .5 + .5*tanh(.5*(22 - bi));
+            for (xj = BANDS[bi]; xj < BANDS[bi + 1] && xj < max_compare; xj++) {
+                float f, thresh;
+                f = xj*OAC_PI/240;
+                /* Shape the lower threshold similar to 1/(1 - 0.85*z^-1) deemphasis filter at 48 kHz. */
+                thresh = .1/(.15*.15 + f*f);
+                for (ci = 0; ci < nchannels; ci++) {
+                    float re;
+                    float im;
+                    re = (Y[(xi*yfreqs + xj)*nchannels + ci] + thresh)/(X[(xi*nfreqs + xj)*nchannels + ci] + thresh);
+                    im = re - log(re) - 1;
+                    /* Per-band error weighting. */
+                    im *= w;
+                    Eb2 += im;
+                    /* Same for 4th power, but make it less sensitive to very low energies. */
+                    re = (Y[(xi*yfreqs + xj)*nchannels + ci] + 10*thresh)
+                         /(X[(xi*nfreqs + xj)*nchannels + ci] + 10*thresh);
+                    im = re - log(re) - 1;
+                    /* Per-band error weighting. */
+                    im *= w;
+                    Eb4 += im;
+                }
+            }
+            Eb2 /= (BANDS[bi + 1] - BANDS[bi])*nchannels;
+            Eb4 /= (BANDS[bi + 1] - BANDS[bi])*nchannels;
+            Ef2 += Eb2;
+            Ef4 += Eb4*Eb4;
         }
-      }
-      Eb2 /= (BANDS[bi+1]-BANDS[bi])*nchannels;
-      Eb4 /= (BANDS[bi+1]-BANDS[bi])*nchannels;
-      Ef2 += Eb2;
-      Ef4 += Eb4*Eb4;
+        /*Using a fixed normalization value means we're willing to accept slightly
+           lower quality for lower sampling rates.*/
+        Ef2 /= nbands;
+        Ef4 /= nbands;
+        Ef4 *= Ef4;
+        err4 += Ef2*Ef2;
+        err16 += Ef4*Ef4;
     }
-    /*Using a fixed normalization value means we're willing to accept slightly
-       lower quality for lower sampling rates.*/
-    Ef2/=nbands;
-    Ef4/=nbands;
-    Ef4*=Ef4;
-    err4+=Ef2*Ef2;
-    err16+=Ef4*Ef4;
-  }
-  free(xb);
-  free(X);
-  free(Y);
-  err4=pow(err4/nframes,1.0/4);
-  err16=pow(err16/nframes,1.0/16);
-  fprintf(stderr, "err4 = %f, err16 = %f, rms = %f\n", err4, err16, rms);
-  if (compare_thresholds) {
-    if (err4 <= err4_threshold && err16 <= err16_threshold && rms <= rms_threshold) {
-      fprintf(stderr, "Comparison PASSED\n");
-    } else {
-      fprintf(stderr, "*** Comparison FAILED *** (thresholds were %f %f %f)\n", err4_threshold, err16_threshold, rms_threshold);
-      return EXIT_FAILURE;
+    free(xb);
+    free(X);
+    free(Y);
+    err4 = pow(err4/nframes, 1.0/4);
+    err16 = pow(err16/nframes, 1.0/16);
+    fprintf(stderr, "err4 = %f, err16 = %f, rms = %f\n", err4, err16, rms);
+    if (compare_thresholds) {
+        if (err4 <= err4_threshold && err16 <= err16_threshold && rms <= rms_threshold) {
+            fprintf(stderr, "Comparison PASSED\n");
+        } else {
+            fprintf(stderr, "*** Comparison FAILED *** (thresholds were %f %f %f)\n", err4_threshold, err16_threshold,
+            rms_threshold);
+            return EXIT_FAILURE;
+        }
     }
-  }
-  return EXIT_SUCCESS;
+    return EXIT_SUCCESS;
 }
diff --git a/src/repacketizer.c b/src/repacketizer.c
index bf7539aa7..35603227d 100644
--- a/src/repacketizer.c
+++ b/src/repacketizer.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "oac.h"
@@ -35,434 +35,393 @@
 #include "stack_alloc.h"
 
 
-int oac_repacketizer_get_size(void)
-{
-   return sizeof(OacRepacketizer);
+int oac_repacketizer_get_size(void) {
+    return sizeof(OacRepacketizer);
 }
 
-OacRepacketizer *oac_repacketizer_init(OacRepacketizer *rp)
-{
-   rp->nb_frames = 0;
-   return rp;
+OacRepacketizer *oac_repacketizer_init(OacRepacketizer *rp) {
+    rp->nb_frames = 0;
+    return rp;
 }
 
-OacRepacketizer *oac_repacketizer_create(void)
-{
-   OacRepacketizer *rp;
-   rp=(OacRepacketizer *)oac_alloc(oac_repacketizer_get_size());
-   if(rp==NULL)return NULL;
-   return oac_repacketizer_init(rp);
+OacRepacketizer *oac_repacketizer_create(void) {
+    OacRepacketizer *rp;
+    rp = (OacRepacketizer *)oac_alloc(oac_repacketizer_get_size());
+    if (rp == NULL) return NULL;
+    return oac_repacketizer_init(rp);
 }
 
-void oac_repacketizer_destroy(OacRepacketizer *rp)
-{
-   oac_free(rp);
+void oac_repacketizer_destroy(OacRepacketizer *rp) {
+    oac_free(rp);
 }
 
-static int oac_repacketizer_cat_impl(OacRepacketizer *rp, const unsigned char *data, oac_int32 len, int self_delimited)
-{
-   unsigned char tmp_toc;
-   int curr_nb_frames,ret;
-   /* Set of check ToC */
-   if (len<1) return OAC_INVALID_PACKET;
-   if (rp->nb_frames == 0)
-   {
-      rp->toc = data[0];
-      rp->framesize = oac_packet_get_samples_per_frame(data, 8000);
-   } else if ((rp->toc&0xFC) != (data[0]&0xFC))
-   {
-      /*fprintf(stderr, "toc mismatch: 0x%x vs 0x%x\n", rp->toc, data[0]);*/
-      return OAC_INVALID_PACKET;
-   }
-   curr_nb_frames = oac_packet_get_nb_frames(data, len);
-   if(curr_nb_frames<1) return OAC_INVALID_PACKET;
-
-   /* Check the 120 ms maximum packet size */
-   if ((curr_nb_frames+rp->nb_frames)*rp->framesize > 960)
-   {
-      return OAC_INVALID_PACKET;
-   }
-
-   ret=oac_packet_parse_impl(data, len, self_delimited, &tmp_toc, &rp->frames[rp->nb_frames], &rp->len[rp->nb_frames],
+static int oac_repacketizer_cat_impl(OacRepacketizer *rp, const unsigned char *data, oac_int32 len,
+                                     int self_delimited) {
+    unsigned char tmp_toc;
+    int curr_nb_frames, ret;
+    /* Set of check ToC */
+    if (len < 1) return OAC_INVALID_PACKET;
+    if (rp->nb_frames == 0) {
+        rp->toc = data[0];
+        rp->framesize = oac_packet_get_samples_per_frame(data, 8000);
+    } else if ((rp->toc&0xFC) != (data[0]&0xFC)) {
+        /*fprintf(stderr, "toc mismatch: 0x%x vs 0x%x\n", rp->toc, data[0]);*/
+        return OAC_INVALID_PACKET;
+    }
+    curr_nb_frames = oac_packet_get_nb_frames(data, len);
+    if (curr_nb_frames < 1) return OAC_INVALID_PACKET;
+
+    /* Check the 120 ms maximum packet size */
+    if ((curr_nb_frames + rp->nb_frames)*rp->framesize > 960) {
+        return OAC_INVALID_PACKET;
+    }
+
+    ret = oac_packet_parse_impl(data, len, self_delimited, &tmp_toc, &rp->frames[rp->nb_frames],
+    &rp->len[rp->nb_frames],
        NULL, NULL, &rp->paddings[rp->nb_frames], &rp->padding_len[rp->nb_frames]);
-   if(ret<1)return ret;
-   rp->padding_nb_frames[rp->nb_frames]=ret;
-
-   /* set padding length to zero for all but the first frame */
-   while (curr_nb_frames > 1)
-   {
-      rp->nb_frames++;
-      rp->padding_len[rp->nb_frames] = 0;
-      rp->padding_nb_frames[rp->nb_frames] = 0;
-      rp->paddings[rp->nb_frames] = NULL;
-      curr_nb_frames--;
-   }
-   rp->nb_frames++;
-   return OAC_OK;
+    if (ret < 1) return ret;
+    rp->padding_nb_frames[rp->nb_frames] = ret;
+
+    /* set padding length to zero for all but the first frame */
+    while (curr_nb_frames > 1) {
+        rp->nb_frames++;
+        rp->padding_len[rp->nb_frames] = 0;
+        rp->padding_nb_frames[rp->nb_frames] = 0;
+        rp->paddings[rp->nb_frames] = NULL;
+        curr_nb_frames--;
+    }
+    rp->nb_frames++;
+    return OAC_OK;
 }
 
-int oac_repacketizer_cat(OacRepacketizer *rp, const unsigned char *data, oac_int32 len)
-{
-   return oac_repacketizer_cat_impl(rp, data, len, 0);
+int oac_repacketizer_cat(OacRepacketizer *rp, const unsigned char *data, oac_int32 len) {
+    return oac_repacketizer_cat_impl(rp, data, len, 0);
 }
 
-int oac_repacketizer_get_nb_frames(OacRepacketizer *rp)
-{
-   return rp->nb_frames;
+int oac_repacketizer_get_nb_frames(OacRepacketizer *rp) {
+    return rp->nb_frames;
 }
 
 oac_int32 oac_repacketizer_out_range_impl(OacRepacketizer *rp, int begin, int end,
-      unsigned char *data, oac_int32 maxlen, int self_delimited, int pad, const oac_extension_data *extensions, int nb_extensions)
-{
-   int i, count;
-   oac_int32 tot_size;
-   oac_int16 *len;
-   const unsigned char **frames;
-   unsigned char * ptr;
-   int ones_begin=0, ones_end=0;
-   int ext_begin=0, ext_len=0;
-   int ext_count, total_ext_count;
-   VARDECL(oac_extension_data, all_extensions);
-   SAVE_STACK;
-
-   if (begin<0 || begin>=end || end>rp->nb_frames)
-   {
-      /*fprintf(stderr, "%d %d %d\n", begin, end, rp->nb_frames);*/
-      RESTORE_STACK;
-      return OAC_BAD_ARG;
-   }
-   count = end-begin;
-
-   len = rp->len+begin;
-   frames = rp->frames+begin;
-   if (self_delimited)
-      tot_size = 1 + (len[count-1]>=252);
-   else
-      tot_size = 0;
-
-   /* figure out total number of extensions */
-   total_ext_count = nb_extensions;
-   for (i=begin;i<end;i++)
-   {
-      int n = oac_packet_extensions_count(rp->paddings[i], rp->padding_len[i],
+                                          unsigned char *data, oac_int32 maxlen, int self_delimited, int pad,
+                                          const oac_extension_data *extensions, int nb_extensions) {
+    int i, count;
+    oac_int32 tot_size;
+    oac_int16 *len;
+    const unsigned char **frames;
+    unsigned char * ptr;
+    int ones_begin = 0, ones_end = 0;
+    int ext_begin = 0, ext_len = 0;
+    int ext_count, total_ext_count;
+    VARDECL(oac_extension_data, all_extensions);
+    SAVE_STACK;
+
+    if (begin < 0 || begin >= end || end > rp->nb_frames) {
+        /*fprintf(stderr, "%d %d %d\n", begin, end, rp->nb_frames);*/
+        RESTORE_STACK;
+        return OAC_BAD_ARG;
+    }
+    count = end - begin;
+
+    len = rp->len + begin;
+    frames = rp->frames + begin;
+    if (self_delimited)
+        tot_size = 1 + (len[count - 1] >= 252);
+    else
+        tot_size = 0;
+
+    /* figure out total number of extensions */
+    total_ext_count = nb_extensions;
+    for (i = begin; i < end; i++) {
+        int n = oac_packet_extensions_count(rp->paddings[i], rp->padding_len[i],
        rp->padding_nb_frames[i]);
-      if (n > 0) total_ext_count += n;
-   }
-   ALLOC(all_extensions, total_ext_count ? total_ext_count : ALLOC_NONE, oac_extension_data);
-   /* copy over any extensions that were passed in */
-   for (ext_count=0;ext_count<nb_extensions;ext_count++)
-   {
-      all_extensions[ext_count] = extensions[ext_count];
-   }
-
-   /* incorporate any extensions from the repacketizer padding */
-   for (i=begin;i<end;i++)
-   {
-      int j, ret;
-      oac_int32 frame_ext_count;
-      frame_ext_count = total_ext_count - ext_count;
-      ret = oac_packet_extensions_parse(rp->paddings[i], rp->padding_len[i],
+        if (n > 0) total_ext_count += n;
+    }
+    ALLOC(all_extensions, total_ext_count ? total_ext_count : ALLOC_NONE, oac_extension_data);
+    /* copy over any extensions that were passed in */
+    for (ext_count = 0; ext_count < nb_extensions; ext_count++) {
+        all_extensions[ext_count] = extensions[ext_count];
+    }
+
+    /* incorporate any extensions from the repacketizer padding */
+    for (i = begin; i < end; i++) {
+        int j, ret;
+        oac_int32 frame_ext_count;
+        frame_ext_count = total_ext_count - ext_count;
+        ret = oac_packet_extensions_parse(rp->paddings[i], rp->padding_len[i],
          &all_extensions[ext_count], &frame_ext_count, rp->padding_nb_frames[i]);
-      if (ret<0)
-      {
-         RESTORE_STACK;
-         return OAC_INTERNAL_ERROR;
-      }
-      /* renumber the extension frame numbers */
-      for (j=0;j<frame_ext_count;j++)
-      {
-         all_extensions[ext_count+j].frame += i-begin;
-      }
-      ext_count += frame_ext_count;
-   }
-
-   ptr = data;
-   if (count==1)
-   {
-      /* Code 0 */
-      tot_size += len[0]+1;
-      if (tot_size > maxlen)
-      {
-         RESTORE_STACK;
-         return OAC_BUFFER_TOO_SMALL;
-      }
-      *ptr++ = rp->toc&0xFC;
-   } else if (count==2)
-   {
-      if (len[1] == len[0])
-      {
-         /* Code 1 */
-         tot_size += 2*len[0]+1;
-         if (tot_size > maxlen)
-         {
+        if (ret < 0) {
             RESTORE_STACK;
-            return OAC_BUFFER_TOO_SMALL;
-         }
-         *ptr++ = (rp->toc&0xFC) | 0x1;
-      } else {
-         /* Code 2 */
-         tot_size += len[0]+len[1]+2+(len[0]>=252);
-         if (tot_size > maxlen)
-         {
-            RESTORE_STACK;
-            return OAC_BUFFER_TOO_SMALL;
-         }
-         *ptr++ = (rp->toc&0xFC) | 0x2;
-         ptr += encode_size(len[0], ptr);
-      }
-   }
-   if (count > 2 || (pad && tot_size < maxlen) || ext_count > 0)
-   {
-      /* Code 3 */
-      int vbr;
-      int pad_amount=0;
-
-      /* Restart the process for the padding case */
-      ptr = data;
-      if (self_delimited)
-         tot_size = 1 + (len[count-1]>=252);
-      else
-         tot_size = 0;
-      vbr = 0;
-      for (i=1;i<count;i++)
-      {
-         if (len[i] != len[0])
-         {
-            vbr=1;
-            break;
-         }
-      }
-      if (vbr)
-      {
-         tot_size += 2;
-         for (i=0;i<count-1;i++)
-            tot_size += 1 + (len[i]>=252) + len[i];
-         tot_size += len[count-1];
-
-         if (tot_size > maxlen)
-         {
+            return OAC_INTERNAL_ERROR;
+        }
+        /* renumber the extension frame numbers */
+        for (j = 0; j < frame_ext_count; j++) {
+            all_extensions[ext_count + j].frame += i - begin;
+        }
+        ext_count += frame_ext_count;
+    }
+
+    ptr = data;
+    if (count == 1) {
+        /* Code 0 */
+        tot_size += len[0] + 1;
+        if (tot_size > maxlen) {
             RESTORE_STACK;
             return OAC_BUFFER_TOO_SMALL;
-         }
-         *ptr++ = (rp->toc&0xFC) | 0x3;
-         *ptr++ = count | 0x80;
-      } else {
-         tot_size += count*len[0]+2;
-         if (tot_size > maxlen)
-         {
-            RESTORE_STACK;
-            return OAC_BUFFER_TOO_SMALL;
-         }
-         *ptr++ = (rp->toc&0xFC) | 0x3;
-         *ptr++ = count;
-      }
-      pad_amount = pad ? (maxlen-tot_size) : 0;
-      if (ext_count>0)
-      {
-         /* figure out how much space we need for the extensions */
-         ext_len = oac_packet_extensions_generate(NULL, maxlen-tot_size,
+        }
+        *ptr++ = rp->toc&0xFC;
+    } else if (count == 2) {
+        if (len[1] == len[0]) {
+            /* Code 1 */
+            tot_size += 2*len[0] + 1;
+            if (tot_size > maxlen) {
+                RESTORE_STACK;
+                return OAC_BUFFER_TOO_SMALL;
+            }
+            *ptr++ = (rp->toc&0xFC)|0x1;
+        } else {
+            /* Code 2 */
+            tot_size += len[0] + len[1] + 2 + (len[0] >= 252);
+            if (tot_size > maxlen) {
+                RESTORE_STACK;
+                return OAC_BUFFER_TOO_SMALL;
+            }
+            *ptr++ = (rp->toc&0xFC)|0x2;
+            ptr += encode_size(len[0], ptr);
+        }
+    }
+    if (count > 2 || (pad && tot_size < maxlen) || ext_count > 0) {
+        /* Code 3 */
+        int vbr;
+        int pad_amount = 0;
+
+        /* Restart the process for the padding case */
+        ptr = data;
+        if (self_delimited)
+            tot_size = 1 + (len[count - 1] >= 252);
+        else
+            tot_size = 0;
+        vbr = 0;
+        for (i = 1; i < count; i++) {
+            if (len[i] != len[0]) {
+                vbr = 1;
+                break;
+            }
+        }
+        if (vbr) {
+            tot_size += 2;
+            for (i = 0; i < count - 1; i++)
+                tot_size += 1 + (len[i] >= 252) + len[i];
+            tot_size += len[count - 1];
+
+            if (tot_size > maxlen) {
+                RESTORE_STACK;
+                return OAC_BUFFER_TOO_SMALL;
+            }
+            *ptr++ = (rp->toc&0xFC)|0x3;
+            *ptr++ = count|0x80;
+        } else {
+            tot_size += count*len[0] + 2;
+            if (tot_size > maxlen) {
+                RESTORE_STACK;
+                return OAC_BUFFER_TOO_SMALL;
+            }
+            *ptr++ = (rp->toc&0xFC)|0x3;
+            *ptr++ = count;
+        }
+        pad_amount = pad ? (maxlen - tot_size) : 0;
+        if (ext_count > 0) {
+            /* figure out how much space we need for the extensions */
+            ext_len = oac_packet_extensions_generate(NULL, maxlen - tot_size,
           all_extensions, ext_count, count, 0);
-         if (ext_len < 0) return ext_len;
-         if (!pad)
-            pad_amount = ext_len + (ext_len ? (ext_len+253)/254 : 1);
-      }
-      if (pad_amount != 0)
-      {
-         int nb_255s;
-         data[1] |= 0x40;
-         nb_255s = (pad_amount-1)/255;
-         if (tot_size + ext_len + nb_255s + 1 > maxlen)
-         {
-            RESTORE_STACK;
-            return OAC_BUFFER_TOO_SMALL;
-         }
-         ext_begin = tot_size+pad_amount-ext_len;
-         /* Prepend 0x01 padding */
-         ones_begin = tot_size+nb_255s+1;
-         ones_end = tot_size+pad_amount-ext_len;
-         for (i=0;i<nb_255s;i++)
-            *ptr++ = 255;
-         *ptr++ = pad_amount-255*nb_255s-1;
-         tot_size += pad_amount;
-      }
-      if (vbr)
-      {
-         for (i=0;i<count-1;i++)
-            ptr += encode_size(len[i], ptr);
-      }
-   }
-   if (self_delimited) {
-      int sdlen = encode_size(len[count-1], ptr);
-      ptr += sdlen;
-   }
-   /* Copy the actual data */
-   for (i=0;i<count;i++)
-   {
-      /* Using OAC_MOVE() instead of OAC_COPY() in case we're doing in-place
-         padding from oac_packet_pad or oac_packet_unpad(). */
-      /* assert disabled because it's not valid in C. */
-      /* celt_assert(frames[i] + len[i] <= data || ptr <= frames[i]); */
-      OAC_MOVE(ptr, frames[i], len[i]);
-      ptr += len[i];
-   }
-   if (ext_len > 0) {
-      int ret = oac_packet_extensions_generate(&data[ext_begin], ext_len,
+            if (ext_len < 0) return ext_len;
+            if (!pad)
+                pad_amount = ext_len + (ext_len ? (ext_len + 253)/254 : 1);
+        }
+        if (pad_amount != 0) {
+            int nb_255s;
+            data[1] |= 0x40;
+            nb_255s = (pad_amount - 1)/255;
+            if (tot_size + ext_len + nb_255s + 1 > maxlen) {
+                RESTORE_STACK;
+                return OAC_BUFFER_TOO_SMALL;
+            }
+            ext_begin = tot_size + pad_amount - ext_len;
+            /* Prepend 0x01 padding */
+            ones_begin = tot_size + nb_255s + 1;
+            ones_end = tot_size + pad_amount - ext_len;
+            for (i = 0; i < nb_255s; i++)
+                *ptr++ = 255;
+            *ptr++ = pad_amount - 255*nb_255s - 1;
+            tot_size += pad_amount;
+        }
+        if (vbr) {
+            for (i = 0; i < count - 1; i++)
+                ptr += encode_size(len[i], ptr);
+        }
+    }
+    if (self_delimited) {
+        int sdlen = encode_size(len[count - 1], ptr);
+        ptr += sdlen;
+    }
+    /* Copy the actual data */
+    for (i = 0; i < count; i++) {
+        /* Using OAC_MOVE() instead of OAC_COPY() in case we're doing in-place
+           padding from oac_packet_pad or oac_packet_unpad(). */
+        /* assert disabled because it's not valid in C. */
+        /* celt_assert(frames[i] + len[i] <= data || ptr <= frames[i]); */
+        OAC_MOVE(ptr, frames[i], len[i]);
+        ptr += len[i];
+    }
+    if (ext_len > 0) {
+        int ret = oac_packet_extensions_generate(&data[ext_begin], ext_len,
        all_extensions, ext_count, count, 0);
-      celt_assert(ret == ext_len);
-   }
-   for (i=ones_begin;i<ones_end;i++)
-      data[i] = 0x01;
-   if (pad && ext_count==0)
-   {
-      /* Fill padding with zeros. */
-      while (ptr<data+maxlen)
-         *ptr++=0;
-   }
-   RESTORE_STACK;
-   return tot_size;
+        celt_assert(ret == ext_len);
+    }
+    for (i = ones_begin; i < ones_end; i++)
+        data[i] = 0x01;
+    if (pad && ext_count == 0) {
+        /* Fill padding with zeros. */
+        while (ptr < data + maxlen)
+            *ptr++ = 0;
+    }
+    RESTORE_STACK;
+    return tot_size;
 }
 
-oac_int32 oac_repacketizer_out_range(OacRepacketizer *rp, int begin, int end, unsigned char *data, oac_int32 maxlen)
-{
-   return oac_repacketizer_out_range_impl(rp, begin, end, data, maxlen, 0, 0, NULL, 0);
+oac_int32 oac_repacketizer_out_range(OacRepacketizer *rp, int begin, int end, unsigned char *data, oac_int32 maxlen) {
+    return oac_repacketizer_out_range_impl(rp, begin, end, data, maxlen, 0, 0, NULL, 0);
 }
 
-oac_int32 oac_repacketizer_out(OacRepacketizer *rp, unsigned char *data, oac_int32 maxlen)
-{
-   return oac_repacketizer_out_range_impl(rp, 0, rp->nb_frames, data, maxlen, 0, 0, NULL, 0);
+oac_int32 oac_repacketizer_out(OacRepacketizer *rp, unsigned char *data, oac_int32 maxlen) {
+    return oac_repacketizer_out_range_impl(rp, 0, rp->nb_frames, data, maxlen, 0, 0, NULL, 0);
 }
 
-oac_int32 oac_packet_pad_impl(unsigned char *data, oac_int32 len, oac_int32 new_len, int pad, const oac_extension_data  *extensions, int nb_extensions)
-{
-   OacRepacketizer rp;
-   oac_int32 ret;
-   VARDECL(unsigned char, copy);
-   SAVE_STACK;
-   if (len < 1)
-      return OAC_BAD_ARG;
-   if (len==new_len)
-      return OAC_OK;
-   else if (len > new_len)
-      return OAC_BAD_ARG;
-   ALLOC(copy, len, unsigned char);
-   oac_repacketizer_init(&rp);
-   /* Moving payload to the end of the packet so we can do in-place padding */
-   OAC_COPY(copy, data, len);
-   ret = oac_repacketizer_cat(&rp, copy, len);
-   if (ret != OAC_OK)
-      return ret;
-   ret = oac_repacketizer_out_range_impl(&rp, 0, rp.nb_frames, data, new_len, 0, pad, extensions, nb_extensions);
-   RESTORE_STACK;
-   return ret;
+oac_int32 oac_packet_pad_impl(unsigned char *data, oac_int32 len, oac_int32 new_len, int pad,
+                              const oac_extension_data  *extensions, int nb_extensions) {
+    OacRepacketizer rp;
+    oac_int32 ret;
+    VARDECL(unsigned char, copy);
+    SAVE_STACK;
+    if (len < 1)
+        return OAC_BAD_ARG;
+    if (len == new_len)
+        return OAC_OK;
+    else if (len > new_len)
+        return OAC_BAD_ARG;
+    ALLOC(copy, len, unsigned char);
+    oac_repacketizer_init(&rp);
+    /* Moving payload to the end of the packet so we can do in-place padding */
+    OAC_COPY(copy, data, len);
+    ret = oac_repacketizer_cat(&rp, copy, len);
+    if (ret != OAC_OK)
+        return ret;
+    ret = oac_repacketizer_out_range_impl(&rp, 0, rp.nb_frames, data, new_len, 0, pad, extensions, nb_extensions);
+    RESTORE_STACK;
+    return ret;
 }
 
-int oac_packet_pad(unsigned char *data, oac_int32 len, oac_int32 new_len)
-{
-   oac_int32 ret;
-   ALLOC_STACK;
-   ret = oac_packet_pad_impl(data, len, new_len, 1, NULL, 0);
-   RESTORE_STACK;
-   if (ret > 0)
-      return OAC_OK;
-   else
-      return ret;
+int oac_packet_pad(unsigned char *data, oac_int32 len, oac_int32 new_len) {
+    oac_int32 ret;
+    ALLOC_STACK;
+    ret = oac_packet_pad_impl(data, len, new_len, 1, NULL, 0);
+    RESTORE_STACK;
+    if (ret > 0)
+        return OAC_OK;
+    else
+        return ret;
 }
 
-oac_int32 oac_packet_unpad(unsigned char *data, oac_int32 len)
-{
-   OacRepacketizer rp;
-   oac_int32 ret;
-   int i;
-   if (len < 1)
-      return OAC_BAD_ARG;
-   oac_repacketizer_init(&rp);
-   ret = oac_repacketizer_cat(&rp, data, len);
-   if (ret < 0)
-      return ret;
-   /* Discard all padding and extensions. */
-   for (i=0;i<rp.nb_frames;i++) {
-      rp.padding_len[i] = 0;
-      rp.paddings[i] = NULL;
-   }
-   ret = oac_repacketizer_out_range_impl(&rp, 0, rp.nb_frames, data, len, 0, 0, NULL, 0);
-   celt_assert(ret > 0 && ret <= len);
-   return ret;
+oac_int32 oac_packet_unpad(unsigned char *data, oac_int32 len) {
+    OacRepacketizer rp;
+    oac_int32 ret;
+    int i;
+    if (len < 1)
+        return OAC_BAD_ARG;
+    oac_repacketizer_init(&rp);
+    ret = oac_repacketizer_cat(&rp, data, len);
+    if (ret < 0)
+        return ret;
+    /* Discard all padding and extensions. */
+    for (i = 0; i < rp.nb_frames; i++) {
+        rp.padding_len[i] = 0;
+        rp.paddings[i] = NULL;
+    }
+    ret = oac_repacketizer_out_range_impl(&rp, 0, rp.nb_frames, data, len, 0, 0, NULL, 0);
+    celt_assert(ret > 0 && ret <= len);
+    return ret;
 }
 
-int oac_multistream_packet_pad(unsigned char *data, oac_int32 len, oac_int32 new_len, int nb_streams)
-{
-   int s;
-   int count;
-   unsigned char toc;
-   oac_int16 size[48];
-   oac_int32 packet_offset;
-   oac_int32 amount;
-
-   if (len < 1)
-      return OAC_BAD_ARG;
-   if (len==new_len)
-      return OAC_OK;
-   else if (len > new_len)
-      return OAC_BAD_ARG;
-   amount = new_len - len;
-   /* Seek to last stream */
-   for (s=0;s<nb_streams-1;s++)
-   {
-      if (len<=0)
-         return OAC_INVALID_PACKET;
-      count = oac_packet_parse_impl(data, len, 1, &toc, NULL,
+int oac_multistream_packet_pad(unsigned char *data, oac_int32 len, oac_int32 new_len, int nb_streams) {
+    int s;
+    int count;
+    unsigned char toc;
+    oac_int16 size[48];
+    oac_int32 packet_offset;
+    oac_int32 amount;
+
+    if (len < 1)
+        return OAC_BAD_ARG;
+    if (len == new_len)
+        return OAC_OK;
+    else if (len > new_len)
+        return OAC_BAD_ARG;
+    amount = new_len - len;
+    /* Seek to last stream */
+    for (s = 0; s < nb_streams - 1; s++) {
+        if (len <= 0)
+            return OAC_INVALID_PACKET;
+        count = oac_packet_parse_impl(data, len, 1, &toc, NULL,
                                      size, NULL, &packet_offset, NULL, NULL);
-      if (count<0)
-         return count;
-      data += packet_offset;
-      len -= packet_offset;
-   }
-   return oac_packet_pad(data, len, len+amount);
+        if (count < 0)
+            return count;
+        data += packet_offset;
+        len -= packet_offset;
+    }
+    return oac_packet_pad(data, len, len + amount);
 }
 
-oac_int32 oac_multistream_packet_unpad(unsigned char *data, oac_int32 len, int nb_streams)
-{
-   int s;
-   unsigned char toc;
-   oac_int16 size[48];
-   oac_int32 packet_offset;
-   OacRepacketizer rp;
-   unsigned char *dst;
-   oac_int32 dst_len;
-
-   if (len < 1)
-      return OAC_BAD_ARG;
-   dst = data;
-   dst_len = 0;
-   /* Unpad all frames */
-   for (s=0;s<nb_streams;s++)
-   {
-      oac_int32 ret;
-      int i;
-      int self_delimited = s!=nb_streams-1;
-      if (len<=0)
-         return OAC_INVALID_PACKET;
-      oac_repacketizer_init(&rp);
-      ret = oac_packet_parse_impl(data, len, self_delimited, &toc, NULL,
+oac_int32 oac_multistream_packet_unpad(unsigned char *data, oac_int32 len, int nb_streams) {
+    int s;
+    unsigned char toc;
+    oac_int16 size[48];
+    oac_int32 packet_offset;
+    OacRepacketizer rp;
+    unsigned char *dst;
+    oac_int32 dst_len;
+
+    if (len < 1)
+        return OAC_BAD_ARG;
+    dst = data;
+    dst_len = 0;
+    /* Unpad all frames */
+    for (s = 0; s < nb_streams; s++) {
+        oac_int32 ret;
+        int i;
+        int self_delimited = s != nb_streams - 1;
+        if (len <= 0)
+            return OAC_INVALID_PACKET;
+        oac_repacketizer_init(&rp);
+        ret = oac_packet_parse_impl(data, len, self_delimited, &toc, NULL,
                                      size, NULL, &packet_offset, NULL, NULL);
-      if (ret<0)
-         return ret;
-      ret = oac_repacketizer_cat_impl(&rp, data, packet_offset, self_delimited);
-      if (ret < 0)
-         return ret;
-      /* Discard all padding and extensions. */
-      for (i=0;i<rp.nb_frames;i++) {
-         rp.padding_len[i] = 0;
-         rp.paddings[i] = NULL;
-      }
-      ret = oac_repacketizer_out_range_impl(&rp, 0, rp.nb_frames, dst, len, self_delimited, 0, NULL, 0);
-      if (ret < 0)
-         return ret;
-      else
-         dst_len += ret;
-      dst += ret;
-      data += packet_offset;
-      len -= packet_offset;
-   }
-   return dst_len;
+        if (ret < 0)
+            return ret;
+        ret = oac_repacketizer_cat_impl(&rp, data, packet_offset, self_delimited);
+        if (ret < 0)
+            return ret;
+        /* Discard all padding and extensions. */
+        for (i = 0; i < rp.nb_frames; i++) {
+            rp.padding_len[i] = 0;
+            rp.paddings[i] = NULL;
+        }
+        ret = oac_repacketizer_out_range_impl(&rp, 0, rp.nb_frames, dst, len, self_delimited, 0, NULL, 0);
+        if (ret < 0)
+            return ret;
+        else
+            dst_len += ret;
+        dst += ret;
+        data += packet_offset;
+        len -= packet_offset;
+    }
+    return dst_len;
 }
diff --git a/src/repacketizer_demo.c b/src/repacketizer_demo.c
index 87a7f38da..9b8078029 100644
--- a/src/repacketizer_demo.c
+++ b/src/repacketizer_demo.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "oac.h"
@@ -36,212 +36,188 @@
 
 #define MAX_PACKETOUT 32000
 
-void usage(char *argv0)
-{
-   fprintf(stderr, "usage: %s [options] input_file output_file\n", argv0);
+void usage(char *argv0) {
+    fprintf(stderr, "usage: %s [options] input_file output_file\n", argv0);
 }
 
-static void int_to_char(oac_uint32 i, unsigned char ch[4])
-{
+static void int_to_char(oac_uint32 i, unsigned char ch[4]) {
     ch[0] = i>>24;
     ch[1] = (i>>16)&0xFF;
     ch[2] = (i>>8)&0xFF;
     ch[3] = i&0xFF;
 }
 
-static oac_uint32 char_to_int(unsigned char ch[4])
-{
-    return ((oac_uint32)ch[0]<<24) | ((oac_uint32)ch[1]<<16)
-         | ((oac_uint32)ch[2]<< 8) |  (oac_uint32)ch[3];
+static oac_uint32 char_to_int(unsigned char ch[4]) {
+    return ((oac_uint32)ch[0]<<24)|((oac_uint32)ch[1]<<16)
+           |((oac_uint32)ch[2]<<8)|(oac_uint32)ch[3];
 }
 
-int main(int argc, char *argv[])
-{
-   int i, eof=0;
-   FILE *fin, *fout;
-   unsigned char packets[48][1500];
-   int len[48];
-   int rng[48];
-   OacRepacketizer *rp;
-   unsigned char output_packet[MAX_PACKETOUT];
-   int merge = 1, split=0;
-
-   if (argc < 3)
-   {
-      usage(argv[0]);
-      return EXIT_FAILURE;
-   }
-   for (i=1;i<argc-2;i++)
-   {
-      if (strcmp(argv[i], "-merge")==0)
-      {
-         merge = atoi(argv[i+1]);
-         if(merge<1)
-         {
-            fprintf(stderr, "-merge parameter must be at least 1.\n");
-            return EXIT_FAILURE;
-         }
-         if(merge>48)
-         {
-            fprintf(stderr, "-merge parameter must be less than 48.\n");
-            return EXIT_FAILURE;
-         }
-         i++;
-      } else if (strcmp(argv[i], "-split")==0)
-         split = 1;
-      else
-      {
-         fprintf(stderr, "Unknown option: %s\n", argv[i]);
-         usage(argv[0]);
-         return EXIT_FAILURE;
-      }
-   }
-   fin = fopen(argv[argc-2], "r");
-   if(fin==NULL)
-   {
-     fprintf(stderr, "Error opening input file: %s\n", argv[argc-2]);
-     return EXIT_FAILURE;
-   }
-   fout = fopen(argv[argc-1], "w");
-   if(fout==NULL)
-   {
-     fprintf(stderr, "Error opening output file: %s\n", argv[argc-1]);
-     fclose(fin);
-     return EXIT_FAILURE;
-   }
-
-   rp = oac_repacketizer_create();
-   while (!eof)
-   {
-      int err;
-      int nb_packets=merge;
-      oac_repacketizer_init(rp);
-      for (i=0;i<nb_packets;i++)
-      {
-         unsigned char ch[4];
-         if (fread(ch, 1, 4, fin)!=4)
-         {
-             if (feof(fin))
-             {
-                eof = 1;
-             } else {
-                fprintf(stderr, "Error reading payload length.\n");
-                fclose(fin);
-                fclose(fout);
-                return EXIT_FAILURE;
-             }
-             break;
-         }
-         len[i] = char_to_int(ch);
-         /*fprintf(stderr, "in len = %d\n", len[i]);*/
-         if (len[i]>1500 || len[i]<0)
-         {
-             if (feof(fin))
-             {
-                eof = 1;
-             } else {
-                fprintf(stderr, "Invalid payload length\n");
-                fclose(fin);
-                fclose(fout);
-                return EXIT_FAILURE;
-             }
-             break;
-         }
-         if (fread(ch, 1, 4, fin)!=4)
-         {
-             if (feof(fin))
-             {
-                eof = 1;
-             } else {
-                fprintf(stderr, "Error reading.\n");
-                fclose(fin);
-                fclose(fout);
+int main(int argc, char *argv[]) {
+    int i, eof = 0;
+    FILE *fin, *fout;
+    unsigned char packets[48][1500];
+    int len[48];
+    int rng[48];
+    OacRepacketizer *rp;
+    unsigned char output_packet[MAX_PACKETOUT];
+    int merge = 1, split = 0;
+
+    if (argc < 3) {
+        usage(argv[0]);
+        return EXIT_FAILURE;
+    }
+    for (i = 1; i < argc - 2; i++) {
+        if (strcmp(argv[i], "-merge") == 0) {
+            merge = atoi(argv[i + 1]);
+            if (merge < 1) {
+                fprintf(stderr, "-merge parameter must be at least 1.\n");
                 return EXIT_FAILURE;
-             }
-             break;
-         }
-         rng[i] = char_to_int(ch);
-         if (fread(packets[i], len[i], 1, fin)!=1) {
-             if (feof(fin))
-             {
-                eof = 1;
-             } else {
-                fprintf(stderr, "Error reading packet of %u bytes.\n", len[i]);
-                fclose(fin);
-                fclose(fout);
+            }
+            if (merge > 48) {
+                fprintf(stderr, "-merge parameter must be less than 48.\n");
                 return EXIT_FAILURE;
-             }
-             break;
-         }
-         err = oac_repacketizer_cat(rp, packets[i], len[i]);
-         if (err!=OAC_OK)
-         {
-            fprintf(stderr, "oac_repacketizer_cat() failed: %s\n", oac_strerror(err));
-            break;
-         }
-      }
-      nb_packets = i;
-
-      if (eof)
-         break;
-
-      if (!split)
-      {
-         err = oac_repacketizer_out(rp, output_packet, MAX_PACKETOUT);
-         if (err>0) {
-            unsigned char int_field[4];
-            int_to_char(err, int_field);
-            if(fwrite(int_field, 1, 4, fout)!=4){
-               fprintf(stderr, "Error writing.\n");
-               return EXIT_FAILURE;
             }
-            int_to_char(rng[nb_packets-1], int_field);
-            if (fwrite(int_field, 1, 4, fout)!=4) {
-               fprintf(stderr, "Error writing.\n");
-               return EXIT_FAILURE;
+            i++;
+        } else if (strcmp(argv[i], "-split") == 0)
+            split = 1;
+        else {
+            fprintf(stderr, "Unknown option: %s\n", argv[i]);
+            usage(argv[0]);
+            return EXIT_FAILURE;
+        }
+    }
+    fin = fopen(argv[argc - 2], "r");
+    if (fin == NULL) {
+        fprintf(stderr, "Error opening input file: %s\n", argv[argc - 2]);
+        return EXIT_FAILURE;
+    }
+    fout = fopen(argv[argc - 1], "w");
+    if (fout == NULL) {
+        fprintf(stderr, "Error opening output file: %s\n", argv[argc - 1]);
+        fclose(fin);
+        return EXIT_FAILURE;
+    }
+
+    rp = oac_repacketizer_create();
+    while (!eof) {
+        int err;
+        int nb_packets = merge;
+        oac_repacketizer_init(rp);
+        for (i = 0; i < nb_packets; i++) {
+            unsigned char ch[4];
+            if (fread(ch, 1, 4, fin) != 4) {
+                if (feof(fin)) {
+                    eof = 1;
+                } else {
+                    fprintf(stderr, "Error reading payload length.\n");
+                    fclose(fin);
+                    fclose(fout);
+                    return EXIT_FAILURE;
+                }
+                break;
+            }
+            len[i] = char_to_int(ch);
+            /*fprintf(stderr, "in len = %d\n", len[i]);*/
+            if (len[i] > 1500 || len[i] < 0) {
+                if (feof(fin)) {
+                    eof = 1;
+                } else {
+                    fprintf(stderr, "Invalid payload length\n");
+                    fclose(fin);
+                    fclose(fout);
+                    return EXIT_FAILURE;
+                }
+                break;
+            }
+            if (fread(ch, 1, 4, fin) != 4) {
+                if (feof(fin)) {
+                    eof = 1;
+                } else {
+                    fprintf(stderr, "Error reading.\n");
+                    fclose(fin);
+                    fclose(fout);
+                    return EXIT_FAILURE;
+                }
+                break;
             }
-            if (fwrite(output_packet, 1, err, fout)!=(unsigned)err) {
-               fprintf(stderr, "Error writing.\n");
-               return EXIT_FAILURE;
+            rng[i] = char_to_int(ch);
+            if (fread(packets[i], len[i], 1, fin) != 1) {
+                if (feof(fin)) {
+                    eof = 1;
+                } else {
+                    fprintf(stderr, "Error reading packet of %u bytes.\n", len[i]);
+                    fclose(fin);
+                    fclose(fout);
+                    return EXIT_FAILURE;
+                }
+                break;
             }
-            /*fprintf(stderr, "out len = %d\n", err);*/
-         } else {
-            fprintf(stderr, "oac_repacketizer_out() failed: %s\n", oac_strerror(err));
-         }
-      } else {
-         int nb_frames = oac_repacketizer_get_nb_frames(rp);
-         for (i=0;i<nb_frames;i++)
-         {
-            err = oac_repacketizer_out_range(rp, i, i+1, output_packet, MAX_PACKETOUT);
-            if (err>0) {
-               unsigned char int_field[4];
-               int_to_char(err, int_field);
-               if (fwrite(int_field, 1, 4, fout)!=4) {
-                  fprintf(stderr, "Error writing.\n");
-                  return EXIT_FAILURE;
-               }
-               if (i==nb_frames-1)
-                  int_to_char(rng[nb_packets-1], int_field);
-               else
-                  int_to_char(0, int_field);
-               if (fwrite(int_field, 1, 4, fout)!=4) {
-                  fprintf(stderr, "Error writing.\n");
-                  return EXIT_FAILURE;
-               }
-               if (fwrite(output_packet, 1, err, fout)!=(unsigned)err) {
-                  fprintf(stderr, "Error writing.\n");
-                  return EXIT_FAILURE;
-               }
-               /*fprintf(stderr, "out len = %d\n", err);*/
+            err = oac_repacketizer_cat(rp, packets[i], len[i]);
+            if (err != OAC_OK) {
+                fprintf(stderr, "oac_repacketizer_cat() failed: %s\n", oac_strerror(err));
+                break;
+            }
+        }
+        nb_packets = i;
+
+        if (eof)
+            break;
+
+        if (!split) {
+            err = oac_repacketizer_out(rp, output_packet, MAX_PACKETOUT);
+            if (err > 0) {
+                unsigned char int_field[4];
+                int_to_char(err, int_field);
+                if (fwrite(int_field, 1, 4, fout) != 4) {
+                    fprintf(stderr, "Error writing.\n");
+                    return EXIT_FAILURE;
+                }
+                int_to_char(rng[nb_packets - 1], int_field);
+                if (fwrite(int_field, 1, 4, fout) != 4) {
+                    fprintf(stderr, "Error writing.\n");
+                    return EXIT_FAILURE;
+                }
+                if (fwrite(output_packet, 1, err, fout) != (unsigned)err) {
+                    fprintf(stderr, "Error writing.\n");
+                    return EXIT_FAILURE;
+                }
+                /*fprintf(stderr, "out len = %d\n", err);*/
             } else {
-               fprintf(stderr, "oac_repacketizer_out() failed: %s\n", oac_strerror(err));
+                fprintf(stderr, "oac_repacketizer_out() failed: %s\n", oac_strerror(err));
             }
+        } else {
+            int nb_frames = oac_repacketizer_get_nb_frames(rp);
+            for (i = 0; i < nb_frames; i++) {
+                err = oac_repacketizer_out_range(rp, i, i + 1, output_packet, MAX_PACKETOUT);
+                if (err > 0) {
+                    unsigned char int_field[4];
+                    int_to_char(err, int_field);
+                    if (fwrite(int_field, 1, 4, fout) != 4) {
+                        fprintf(stderr, "Error writing.\n");
+                        return EXIT_FAILURE;
+                    }
+                    if (i == nb_frames - 1)
+                        int_to_char(rng[nb_packets - 1], int_field);
+                    else
+                        int_to_char(0, int_field);
+                    if (fwrite(int_field, 1, 4, fout) != 4) {
+                        fprintf(stderr, "Error writing.\n");
+                        return EXIT_FAILURE;
+                    }
+                    if (fwrite(output_packet, 1, err, fout) != (unsigned)err) {
+                        fprintf(stderr, "Error writing.\n");
+                        return EXIT_FAILURE;
+                    }
+                    /*fprintf(stderr, "out len = %d\n", err);*/
+                } else {
+                    fprintf(stderr, "oac_repacketizer_out() failed: %s\n", oac_strerror(err));
+                }
 
-         }
-      }
-   }
+            }
+        }
+    }
 
-   fclose(fin);
-   fclose(fout);
-   return EXIT_SUCCESS;
+    fclose(fin);
+    fclose(fout);
+    return EXIT_SUCCESS;
 }
diff --git a/src/tansig_table.h b/src/tansig_table.h
index c76f844a7..4261fab7d 100644
--- a/src/tansig_table.h
+++ b/src/tansig_table.h
@@ -1,45 +1,45 @@
 /* This file is auto-generated by gen_tables */
 
 static const float tansig_table[201] = {
-0.000000f, 0.039979f, 0.079830f, 0.119427f, 0.158649f,
-0.197375f, 0.235496f, 0.272905f, 0.309507f, 0.345214f,
-0.379949f, 0.413644f, 0.446244f, 0.477700f, 0.507977f,
-0.537050f, 0.564900f, 0.591519f, 0.616909f, 0.641077f,
-0.664037f, 0.685809f, 0.706419f, 0.725897f, 0.744277f,
-0.761594f, 0.777888f, 0.793199f, 0.807569f, 0.821040f,
-0.833655f, 0.845456f, 0.856485f, 0.866784f, 0.876393f,
-0.885352f, 0.893698f, 0.901468f, 0.908698f, 0.915420f,
-0.921669f, 0.927473f, 0.932862f, 0.937863f, 0.942503f,
-0.946806f, 0.950795f, 0.954492f, 0.957917f, 0.961090f,
-0.964028f, 0.966747f, 0.969265f, 0.971594f, 0.973749f,
-0.975743f, 0.977587f, 0.979293f, 0.980869f, 0.982327f,
-0.983675f, 0.984921f, 0.986072f, 0.987136f, 0.988119f,
-0.989027f, 0.989867f, 0.990642f, 0.991359f, 0.992020f,
-0.992631f, 0.993196f, 0.993718f, 0.994199f, 0.994644f,
-0.995055f, 0.995434f, 0.995784f, 0.996108f, 0.996407f,
-0.996682f, 0.996937f, 0.997172f, 0.997389f, 0.997590f,
-0.997775f, 0.997946f, 0.998104f, 0.998249f, 0.998384f,
-0.998508f, 0.998623f, 0.998728f, 0.998826f, 0.998916f,
-0.999000f, 0.999076f, 0.999147f, 0.999213f, 0.999273f,
-0.999329f, 0.999381f, 0.999428f, 0.999472f, 0.999513f,
-0.999550f, 0.999585f, 0.999617f, 0.999646f, 0.999673f,
-0.999699f, 0.999722f, 0.999743f, 0.999763f, 0.999781f,
-0.999798f, 0.999813f, 0.999828f, 0.999841f, 0.999853f,
-0.999865f, 0.999875f, 0.999885f, 0.999893f, 0.999902f,
-0.999909f, 0.999916f, 0.999923f, 0.999929f, 0.999934f,
-0.999939f, 0.999944f, 0.999948f, 0.999952f, 0.999956f,
-0.999959f, 0.999962f, 0.999965f, 0.999968f, 0.999970f,
-0.999973f, 0.999975f, 0.999977f, 0.999978f, 0.999980f,
-0.999982f, 0.999983f, 0.999984f, 0.999986f, 0.999987f,
-0.999988f, 0.999989f, 0.999990f, 0.999990f, 0.999991f,
-0.999992f, 0.999992f, 0.999993f, 0.999994f, 0.999994f,
-0.999994f, 0.999995f, 0.999995f, 0.999996f, 0.999996f,
-0.999996f, 0.999997f, 0.999997f, 0.999997f, 0.999997f,
-0.999997f, 0.999998f, 0.999998f, 0.999998f, 0.999998f,
-0.999998f, 0.999998f, 0.999999f, 0.999999f, 0.999999f,
-0.999999f, 0.999999f, 0.999999f, 0.999999f, 0.999999f,
-0.999999f, 0.999999f, 0.999999f, 0.999999f, 0.999999f,
-1.000000f, 1.000000f, 1.000000f, 1.000000f, 1.000000f,
-1.000000f, 1.000000f, 1.000000f, 1.000000f, 1.000000f,
-1.000000f,
+    0.000000f, 0.039979f, 0.079830f, 0.119427f, 0.158649f,
+    0.197375f, 0.235496f, 0.272905f, 0.309507f, 0.345214f,
+    0.379949f, 0.413644f, 0.446244f, 0.477700f, 0.507977f,
+    0.537050f, 0.564900f, 0.591519f, 0.616909f, 0.641077f,
+    0.664037f, 0.685809f, 0.706419f, 0.725897f, 0.744277f,
+    0.761594f, 0.777888f, 0.793199f, 0.807569f, 0.821040f,
+    0.833655f, 0.845456f, 0.856485f, 0.866784f, 0.876393f,
+    0.885352f, 0.893698f, 0.901468f, 0.908698f, 0.915420f,
+    0.921669f, 0.927473f, 0.932862f, 0.937863f, 0.942503f,
+    0.946806f, 0.950795f, 0.954492f, 0.957917f, 0.961090f,
+    0.964028f, 0.966747f, 0.969265f, 0.971594f, 0.973749f,
+    0.975743f, 0.977587f, 0.979293f, 0.980869f, 0.982327f,
+    0.983675f, 0.984921f, 0.986072f, 0.987136f, 0.988119f,
+    0.989027f, 0.989867f, 0.990642f, 0.991359f, 0.992020f,
+    0.992631f, 0.993196f, 0.993718f, 0.994199f, 0.994644f,
+    0.995055f, 0.995434f, 0.995784f, 0.996108f, 0.996407f,
+    0.996682f, 0.996937f, 0.997172f, 0.997389f, 0.997590f,
+    0.997775f, 0.997946f, 0.998104f, 0.998249f, 0.998384f,
+    0.998508f, 0.998623f, 0.998728f, 0.998826f, 0.998916f,
+    0.999000f, 0.999076f, 0.999147f, 0.999213f, 0.999273f,
+    0.999329f, 0.999381f, 0.999428f, 0.999472f, 0.999513f,
+    0.999550f, 0.999585f, 0.999617f, 0.999646f, 0.999673f,
+    0.999699f, 0.999722f, 0.999743f, 0.999763f, 0.999781f,
+    0.999798f, 0.999813f, 0.999828f, 0.999841f, 0.999853f,
+    0.999865f, 0.999875f, 0.999885f, 0.999893f, 0.999902f,
+    0.999909f, 0.999916f, 0.999923f, 0.999929f, 0.999934f,
+    0.999939f, 0.999944f, 0.999948f, 0.999952f, 0.999956f,
+    0.999959f, 0.999962f, 0.999965f, 0.999968f, 0.999970f,
+    0.999973f, 0.999975f, 0.999977f, 0.999978f, 0.999980f,
+    0.999982f, 0.999983f, 0.999984f, 0.999986f, 0.999987f,
+    0.999988f, 0.999989f, 0.999990f, 0.999990f, 0.999991f,
+    0.999992f, 0.999992f, 0.999993f, 0.999994f, 0.999994f,
+    0.999994f, 0.999995f, 0.999995f, 0.999996f, 0.999996f,
+    0.999996f, 0.999997f, 0.999997f, 0.999997f, 0.999997f,
+    0.999997f, 0.999998f, 0.999998f, 0.999998f, 0.999998f,
+    0.999998f, 0.999998f, 0.999999f, 0.999999f, 0.999999f,
+    0.999999f, 0.999999f, 0.999999f, 0.999999f, 0.999999f,
+    0.999999f, 0.999999f, 0.999999f, 0.999999f, 0.999999f,
+    1.000000f, 1.000000f, 1.000000f, 1.000000f, 1.000000f,
+    1.000000f, 1.000000f, 1.000000f, 1.000000f, 1.000000f,
+    1.000000f,
 };
diff --git a/tests/oac_decode_fuzzer.c b/tests/oac_decode_fuzzer.c
index d2d6b3e91..b6ab4bd22 100644
--- a/tests/oac_decode_fuzzer.c
+++ b/tests/oac_decode_fuzzer.c
@@ -22,10 +22,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdint.h>
@@ -83,22 +83,22 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         return 0;
     }
 
-    pcm = (oac_int16*) malloc(sizeof(*pcm) * MAX_FRAME_SAMP * toc.channels);
+    pcm = (oac_int16*) malloc(sizeof(*pcm)*MAX_FRAME_SAMP*toc.channels);
 
     while (i + SETUP_BYTE_COUNT < size && num_decodes++ < MAX_DECODES) {
         int len, fec;
 
-        len = (oac_uint32) data[i    ] << 24 |
-              (oac_uint32) data[i + 1] << 16 |
-              (oac_uint32) data[i + 2] <<  8 |
-              (oac_uint32) data[i + 3];
+        len = (oac_uint32) data[i    ]<<24
+              |(oac_uint32) data[i + 1]<<16
+              |(oac_uint32) data[i + 2]<<8
+              |(oac_uint32) data[i + 3];
         if (len > MAX_PACKET || len < 0 || i + SETUP_BYTE_COUNT + len > size) {
             break;
         }
 
         /* Bytes 4..7 represent encoder final range, but are unused here.
          * Instead, byte 4 is repurposed to determine if FEC is used. */
-        fec = data[i + 4] & 1;
+        fec = data[i + 4]&1;
 
         if (len == 0) {
             /* Lost packet */
diff --git a/tests/oac_encode_regressions.c b/tests/oac_encode_regressions.c
index e33e2f2f3..d8c599b28 100644
--- a/tests/oac_encode_regressions.c
+++ b/tests/oac_encode_regressions.c
@@ -22,11 +22,11 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdio.h>
@@ -41,8 +41,7 @@
 #include "test_oac_common.h"
 
 
-static int celt_ec_internal_error(void)
-{
+static int celt_ec_internal_error(void) {
     OacMSEncoder *enc;
     int err;
     unsigned char data[2460];
@@ -68,42 +67,42 @@ static int celt_ec_internal_error(void)
     {
         static const short pcm[320] =
         {
-                 0,     0,     0,     0,     0,     0,     0,     0,     0,
-                 0,     0,     0,     0,     0,     0,  1792,  1799,  1799,
-              1799,  1799,  1799,  1799,  1799,  1799,  1799,  1799,  1799,
-              1799,  1799,  1799,  1799,  1799,     0, 25600,  1799,  1799,
-              1799,  1799,  1799,  1799,  1799,  1799,  1799,  1799,  1799,
-              1799,  1799,  1799,  1799,     7,     0,   255,     0,     0,
-                 0,     0,     0,     0,     0,     0,     0, 32767,    -1,
-                 0,     0,     0,   100,     0, 16384,     0,     0,     0,
-                 0,     0,     0,     4,     0,     0,  -256,   255,     0,
-                 0,     0,     0,     0,     0,     0,     0,     0,     0,
-                 0,     0,     0,     0,     0,     0,     0,     0,     0,
-                 0,     0,-32768,     0,     0,     0,     0,     0,     0,
-                 0,     0,     0,     0,     0,     0,     0,     0,     0,
-                 0,     0,     0,     0,     0,     0,     0,     0,     0,
-                 0,     0,     0,     0,   128,     0,     0,     0,     0,
-                 0,     0,     0,     0,  -256,     0,     0,    32,     0,
-                 0,     0,     0,     0,     0,     0,  4352,     4,   228,
-                 0,     0,     0,     0,     0,     0,     0,     0,     0,
-                 0,     0,     0,     0,     0,     0,  5632,     0,     0,
-                 0,     0,-32768,     0,     0,     0,     0,     0,     0,
-                 0,     0,     0,     0,     0,     0,     0,     0,     0,
-                 0,     0,     0,     0,     0,     0,     0,     0,     0,
-                 0,     0,     0,   256,     0,     0,     0,     0,     0,
-                 0,     0,     0,     0,     0,     0,     0,     0,     0,
-             -3944, 10500,  4285, 10459, -6474, 10204, -6539, 11601, -6824,
-             13385, -7142, 13872,-11553, 13670, -7725, 13463, -6887,  7874,
-             -5580, 12600, -4964, 12480,  3254, 11741, -4210,  9741, -3155,
-              7558, -5468,  5431, -1073,  3641, -1304,     0,    -1,   343,
-                26,     0,     0,   150,     0,     0,     0,     0,     0,
-                 0,     0,     0,     0,     0,     0,     0,     0,     0,
-                 0,     0,     0,     0,     0,     0,     0,     0,     0,
-                 0,     0,     0,     0,     0,     0,     0,     0,     0,
-                 0,     0,     0,     0,     0,     0,     0,     0,     0,
-                 0,     0,     0,  1799,  1799,  1799,  1799,  1799, -2553,
-                 7,  1792,  1799,  1799,  1799,  1799,  1799,  1799,  1799,
-              1799,  1799,  1799,  1799, -9721
+            0,     0,     0,     0,     0,     0,     0,     0,     0,
+            0,     0,     0,     0,     0,     0,  1792,  1799,  1799,
+            1799,  1799,  1799,  1799,  1799,  1799,  1799,  1799,  1799,
+            1799,  1799,  1799,  1799,  1799,     0, 25600,  1799,  1799,
+            1799,  1799,  1799,  1799,  1799,  1799,  1799,  1799,  1799,
+            1799,  1799,  1799,  1799,     7,     0,   255,     0,     0,
+            0,     0,     0,     0,     0,     0,     0, 32767,    -1,
+            0,     0,     0,   100,     0, 16384,     0,     0,     0,
+            0,     0,     0,     4,     0,     0,  -256,   255,     0,
+            0,     0,     0,     0,     0,     0,     0,     0,     0,
+            0,     0,     0,     0,     0,     0,     0,     0,     0,
+            0,     0, -32768,     0,     0,     0,     0,     0,     0,
+            0,     0,     0,     0,     0,     0,     0,     0,     0,
+            0,     0,     0,     0,     0,     0,     0,     0,     0,
+            0,     0,     0,     0,   128,     0,     0,     0,     0,
+            0,     0,     0,     0,  -256,     0,     0,    32,     0,
+            0,     0,     0,     0,     0,     0,  4352,     4,   228,
+            0,     0,     0,     0,     0,     0,     0,     0,     0,
+            0,     0,     0,     0,     0,     0,  5632,     0,     0,
+            0,     0, -32768,     0,     0,     0,     0,     0,     0,
+            0,     0,     0,     0,     0,     0,     0,     0,     0,
+            0,     0,     0,     0,     0,     0,     0,     0,     0,
+            0,     0,     0,   256,     0,     0,     0,     0,     0,
+            0,     0,     0,     0,     0,     0,     0,     0,     0,
+            -3944, 10500,  4285, 10459, -6474, 10204, -6539, 11601, -6824,
+            13385, -7142, 13872, -11553, 13670, -7725, 13463, -6887,  7874,
+            -5580, 12600, -4964, 12480,  3254, 11741, -4210,  9741, -3155,
+            7558, -5468,  5431, -1073,  3641, -1304,     0,    -1,   343,
+            26,     0,     0,   150,     0,     0,     0,     0,     0,
+            0,     0,     0,     0,     0,     0,     0,     0,     0,
+            0,     0,     0,     0,     0,     0,     0,     0,     0,
+            0,     0,     0,     0,     0,     0,     0,     0,     0,
+            0,     0,     0,     0,     0,     0,     0,     0,     0,
+            0,     0,     0,  1799,  1799,  1799,  1799,  1799, -2553,
+            7,  1792,  1799,  1799,  1799,  1799,  1799,  1799,  1799,
+            1799,  1799,  1799,  1799, -9721
         };
         err = oac_multistream_encode(enc, pcm, 320, data, 2460);
         oac_test_assert(err > 0);
@@ -124,24 +123,24 @@ static int celt_ec_internal_error(void)
     {
         static const short pcm[160] =
         {
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9526, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, 25600, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9526, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, 25600, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510
         };
         err = oac_multistream_encode(enc, pcm, 160, data, 2460);
         oac_test_assert(err > 0);
@@ -162,24 +161,24 @@ static int celt_ec_internal_error(void)
     {
         static const short pcm[160] =
         {
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9494, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9494, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510
         };
         err = oac_multistream_encode(enc, pcm, 160, data, 2460);
         oac_test_assert(err > 0);
@@ -200,24 +199,24 @@ static int celt_ec_internal_error(void)
     {
         static const short pcm[160] =
         {
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9479, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
-             -9510, -9510, -9510, -9510, -9510, -9510, -9510
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9479, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510, -9510,
+            -9510, -9510, -9510, -9510, -9510, -9510, -9510
         };
         err = oac_multistream_encode(enc, pcm, 160, data, 2460);
         oac_test_assert(err > 0);
@@ -238,22 +237,22 @@ static int celt_ec_internal_error(void)
     {
         static const short pcm[160] =
         {
-             -9510, -9510,  1799,  1799,  1799,  1799,  1799,  1799,  1799,
-              1799,  1799,  1799,  1799,  1799,  1799,  1799,  1799,     0,
-                 0,     0,     0,     0,     0,     0,     0,     0,     0,
-                 0,     0,     0,     0,     0,     0,     0,     0,     0,
-                 0,     0,     0,     0,     0,     0,     0,     0,     0,
-              -256,   255,     0,     0,     0,     0,     0,     0,     0,
-                 0,     0,     0,     0,     0,     0,     0,     0,     0,
-                 0,     0,     0,     0,     0,     0,     0,     0,     0,
-                 0,     0,     0,     0,     0,     0,     0,     0,     0,
-                 0,     0,     0,     0,     0,     0,     0,     0,     0,
-                 0,     0,     0,     0,     0,     0,     0,   128,     0,
-                 0,     0,     0,     0,     0,     0,     0,     0,     0,
-                 0,    32,     0,     0,     0,     0,     0,     0,     0,
-              4352,     4,     0,     0,     0,     0,     0,     0,     0,
-                 0,     0,     0,     0,   148,     0,     0,     0,     0,
-              5632
+            -9510, -9510,  1799,  1799,  1799,  1799,  1799,  1799,  1799,
+            1799,  1799,  1799,  1799,  1799,  1799,  1799,  1799,     0,
+            0,     0,     0,     0,     0,     0,     0,     0,     0,
+            0,     0,     0,     0,     0,     0,     0,     0,     0,
+            0,     0,     0,     0,     0,     0,     0,     0,     0,
+            -256,   255,     0,     0,     0,     0,     0,     0,     0,
+            0,     0,     0,     0,     0,     0,     0,     0,     0,
+            0,     0,     0,     0,     0,     0,     0,     0,     0,
+            0,     0,     0,     0,     0,     0,     0,     0,     0,
+            0,     0,     0,     0,     0,     0,     0,     0,     0,
+            0,     0,     0,     0,     0,     0,     0,   128,     0,
+            0,     0,     0,     0,     0,     0,     0,     0,     0,
+            0,    32,     0,     0,     0,     0,     0,     0,     0,
+            4352,     4,     0,     0,     0,     0,     0,     0,     0,
+            0,     0,     0,     0,   148,     0,     0,     0,     0,
+            5632
         };
         err = oac_multistream_encode(enc, pcm, 160, data, 2460);
         oac_test_assert(err > 0);
@@ -274,11 +273,11 @@ static int celt_ec_internal_error(void)
     {
         static const short pcm[40] =
         {
-             10459, -6474, 10204, -6539, 11601, -6824, 13385, -7142, 13872,
+            10459, -6474, 10204, -6539, 11601, -6824, 13385, -7142, 13872,
             -11553, 13670, -7725, 13463, -6887, 12482, -5580, 12600, -4964,
-             12480,  3254, 11741, -4210,  9741, -3155,  7558, -5468,  5431,
-             -1073,  3641, -1304,     0,    -1,   343,    26,     0,     0,
-                 0,     0,  -256,   226
+            12480,  3254, 11741, -4210,  9741, -3155,  7558, -5468,  5431,
+            -1073,  3641, -1304,     0,    -1,   343,    26,     0,     0,
+            0,     0,  -256,   226
         };
         err = oac_multistream_encode(enc, pcm, 40, data, 2460);
         oac_test_assert(err > 0);
@@ -288,28 +287,27 @@ static int celt_ec_internal_error(void)
     return 0;
 }
 
-static int mscbr_encode_fail10(void)
-{
+static int mscbr_encode_fail10(void) {
     OacMSEncoder *enc;
     int err;
     unsigned char data[627300];
     static const unsigned char mapping[255] =
     {
-          0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16,
-         17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
-         34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
-         51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
-         68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
-         85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,100,101,
-        102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,
-        119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,
-        136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,
-        153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,
-        170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,
-        187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,
-        204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,
-        221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,
-        238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254
+        0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16,
+        17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+        34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+        51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+        68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
+        85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
+        102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
+        119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135,
+        136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+        153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
+        170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
+        187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203,
+        204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220,
+        221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237,
+        238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254
     };
 
     enc = oac_multistream_encoder_create(8000, 255, 254, 1, mapping,
@@ -331,7 +329,7 @@ static int mscbr_encode_fail10(void)
     {
         static const short pcm[20*255] =
         {
-                 0
+            0
         };
         err = oac_multistream_encode(enc, pcm, 20, data, 627300);
         oac_test_assert(err > 0);
@@ -341,25 +339,24 @@ static int mscbr_encode_fail10(void)
     return 0;
 }
 
-static int mscbr_encode_fail(void)
-{
+static int mscbr_encode_fail(void) {
     OacMSEncoder *enc;
     int err;
     unsigned char data[472320];
     static const unsigned char mapping[192] =
     {
-          0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16,
-         17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
-         34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
-         51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
-         68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
-         85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,100,101,
-        102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,
-        119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,
-        136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,
-        153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,
-        170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,
-        187,188,189,190,191
+        0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16,
+        17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+        34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+        51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+        68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
+        85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
+        102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
+        119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135,
+        136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+        153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
+        170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
+        187, 188, 189, 190, 191
     };
 
     enc = oac_multistream_encoder_create(8000, 192, 189, 3, mapping,
@@ -381,7 +378,7 @@ static int mscbr_encode_fail(void)
     {
         static const short pcm[20*192] =
         {
-                 0
+            0
         };
         err = oac_multistream_encode(enc, pcm, 20, data, 472320);
         oac_test_assert(err > 0);
@@ -391,8 +388,7 @@ static int mscbr_encode_fail(void)
     return 0;
 }
 
-static int surround_analysis_uninit(void)
-{
+static int surround_analysis_uninit(void) {
     OacMSEncoder *enc;
     int err;
     unsigned char data[7380];
@@ -418,326 +414,326 @@ static int surround_analysis_uninit(void)
     {
         static const short pcm[960*3] =
         {
-             -6896,  4901, -6158,  4120, -5164,  3631, -4442,  3153, -4070,
-              3349, -4577,  4474, -5541,  5058, -6701,  3881, -7933,  1863,
-             -8041,   697, -6738,-31464, 14330,-12523,  4096, -6130, 29178,
-              -250,-21252, 10467, 16907, -3359, -6644, 31965, 14607,-21544,
-            -32497, 24020, 12557,-26926,-18421, -1842, 24587, 19659,  4878,
-             10954, 23060,  8907,-10215,-16179, 31772,-11825,-15590,-23089,
-             17173,-25903,-17387, 11733,  4884, 10204,-16476,-14367,   516,
-             20453,-16898, 20967,-23813,   -20, 22011,-17167,  9459, 32499,
+            -6896,  4901, -6158,  4120, -5164,  3631, -4442,  3153, -4070,
+            3349, -4577,  4474, -5541,  5058, -6701,  3881, -7933,  1863,
+            -8041,   697, -6738, -31464, 14330, -12523,  4096, -6130, 29178,
+            -250, -21252, 10467, 16907, -3359, -6644, 31965, 14607, -21544,
+            -32497, 24020, 12557, -26926, -18421, -1842, 24587, 19659,  4878,
+            10954, 23060,  8907, -10215, -16179, 31772, -11825, -15590, -23089,
+            17173, -25903, -17387, 11733,  4884, 10204, -16476, -14367,   516,
+            20453, -16898, 20967, -23813,   -20, 22011, -17167,  9459, 32499,
             -25855,  -523, -3883,  -390, -4206,   634, -3767,  2325, -2751,
-              3115, -2392,  2746, -2173,  2317, -1147,  2326, 23142, 11314,
-            -15350,-24529,  3026,  6146,  2150,  2476,  1105,  -830,  1775,
-             -3425,  3674,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-              4293,-14023,  3879,-15553,  3158,-16161,  2629, 18433,-12535,
-             -6645,-20735,-32763,-13824,-20992, 25859, 13052, -8731,  2292,
-             -3860, 24049, 10225,-19220, 10478,-22294, 22773, 28137, 13816,
-             30953,-25863,-24598, 16888,-14612,-28942, 20974,-27397,-18944,
-            -18690, 20991,-16638,  5632,-14330, 28911,-25594, 17408, 29958,
-              -517,-20984, -1800, 11281,  9977,-21221,-14854, 23840, -9477,
-              3362,-12805,-22493, 32507,   156, 16384, -1163,  2301, -1874,
-              4600, -1748,  6950, 16557,  8192, -7372, -1033, -3278,  2806,
-             20275,  3317,  -717,  9792,  -767,  9099,  -613,  8362,  5027,
-              7774,  2597,  8549,  5278,  8743,  9343,  6940, 13038,  4826,
-             14086,  2964, 13215,  1355, 11596,   455,  9850,  -519, 10680,
-             -2287, 12551, -3736, 13639, -4291, 13790, -2722, 14544,  -866,
-             15050,  -304, 22833, -1196, 13520, -2063, 13051, -2317, 13066,
-             -2737, 13773, -2664, 14105, -3447, 13854, 24589, 24672, -5280,
-             10388, -4933,  7543, -4149,  3654, -1552,  1726,   661,    57,
-              2922,  -751,  3917,  8419,  3840, -5218,  3435,  5540, -1073,
-              4153, -6656,  1649,  -769, -7276,-13072,  6380, -7948, 20717,
-             18425, 17392, 14335,-18190, -1842, 24587, 19659, 11790, 10954,
-             23060,  8907,-10215,-16179, 31772,-11825,-15590,-23101, 17173,
-            -25903,-17387, 11733,  4884, 10192,-16627,-14367,   516, 20453,
-            -16898, 20967,-23813,   -20, 22011,-17167,  9468, 32499,-25607,
-              -523, -3883,  -390, -4206,   634, -3767,  2325, -2751,  3115,
-             -2392,  2746, -2161,  2317, -1147,  2326, 23142, 11314,-15350,
-            -29137,  3026,-15056,  -491,-15170,  -386,-16015,  -641,-16505,
-              -930,-16206,  -717,-16175, -2839,-16374, -4558,-16237, -5207,
+            3115, -2392,  2746, -2173,  2317, -1147,  2326, 23142, 11314,
+            -15350, -24529,  3026,  6146,  2150,  2476,  1105,  -830,  1775,
+            -3425,  3674, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            4293, -14023,  3879, -15553,  3158, -16161,  2629, 18433, -12535,
+            -6645, -20735, -32763, -13824, -20992, 25859, 13052, -8731,  2292,
+            -3860, 24049, 10225, -19220, 10478, -22294, 22773, 28137, 13816,
+            30953, -25863, -24598, 16888, -14612, -28942, 20974, -27397, -18944,
+            -18690, 20991, -16638,  5632, -14330, 28911, -25594, 17408, 29958,
+            -517, -20984, -1800, 11281,  9977, -21221, -14854, 23840, -9477,
+            3362, -12805, -22493, 32507,   156, 16384, -1163,  2301, -1874,
+            4600, -1748,  6950, 16557,  8192, -7372, -1033, -3278,  2806,
+            20275,  3317,  -717,  9792,  -767,  9099,  -613,  8362,  5027,
+            7774,  2597,  8549,  5278,  8743,  9343,  6940, 13038,  4826,
+            14086,  2964, 13215,  1355, 11596,   455,  9850,  -519, 10680,
+            -2287, 12551, -3736, 13639, -4291, 13790, -2722, 14544,  -866,
+            15050,  -304, 22833, -1196, 13520, -2063, 13051, -2317, 13066,
+            -2737, 13773, -2664, 14105, -3447, 13854, 24589, 24672, -5280,
+            10388, -4933,  7543, -4149,  3654, -1552,  1726,   661,    57,
+            2922,  -751,  3917,  8419,  3840, -5218,  3435,  5540, -1073,
+            4153, -6656,  1649,  -769, -7276, -13072,  6380, -7948, 20717,
+            18425, 17392, 14335, -18190, -1842, 24587, 19659, 11790, 10954,
+            23060,  8907, -10215, -16179, 31772, -11825, -15590, -23101, 17173,
+            -25903, -17387, 11733,  4884, 10192, -16627, -14367,   516, 20453,
+            -16898, 20967, -23813,   -20, 22011, -17167,  9468, 32499, -25607,
+            -523, -3883,  -390, -4206,   634, -3767,  2325, -2751,  3115,
+            -2392,  2746, -2161,  2317, -1147,  2326, 23142, 11314, -15350,
+            -29137,  3026, -15056,  -491, -15170,  -386, -16015,  -641, -16505,
+            -930, -16206,  -717, -16175, -2839, -16374, -4558, -16237, -5207,
             -15903, -6421,  6373, -1403,  5431, -1073,  3641, -1304, -4495,
-              -769, -7276,  2856, -7870,  3314, -8730,  3964,-10183,  4011,
-            -11135,  3421,-11727,  2966,-12360,  2818,-13472,  3660,-13805,
-              5162,-13478,  6434,-12840,  7335,-12420,  6865,-12349,  5541,
-            -11965,  5530,-10820,  5132, -9197,  3367, -7745,  1223, -6910,
-              -433, -6211, -1711, -4958, -1025, -3755,  -836, -3292, -1666,
-             -2661,-10755, 31472,-27906, 31471, 18690,  5617, 16649, 11253,
-            -22516,-17674,-31990,  3575,-31479,  5883, 26121, 12890, -6612,
-             12228,-11634,   523, 26136,-21496, 20745,-15868, -4100,-24826,
-             23282, 22798,   491, -1774, 15075,-27373,-13094,  6417,-29487,
-             14608, 10185, 16143, 22211, -8436,  4288, -8694,  2375,  3023,
-               486,  1455,   128,   202,   942,  -923,  2068, -1233,  -717,
-             -1042, -2167, 32255, -4632,   310, -4458, -3639, -5258,  2106,
-             -6857,  2681, -7497,  2765, -6601,  1945, -5219, 19154, -4877,
-               619, -5719, -1928, -6208,  -121,   593,   188,  1558, -4152,
-              1648,   156,  1604, -3664, -6862, -2851, -5112, -3600, -3747,
-             -5081, -4428, -5592, 20974,-27397,-18944,-18690, 20991,-17406,
-              5632,-14330, 28911, 15934, 15934, 15934, 15934, 15934, 15934,
-             15934, 15934, 15934, 15934, 15934, 15934,-25594, 17408, 29958,
-             -7173,-16888,  9098,  -613,  8362,   675,  7774,  2597,  8549,
-              5278,  8743,  9375,  6940, 13038,  4826, 14598,  7721,-24308,
-            -29905,-19703,-17106,-16124, -3287,-26118,-19709,-10769, 24353,
-             28648,  6946, -1363, 12485, -1187, 26074,-25055, 10004,-24798,
-              7204, -4581, -9678,  1554, 10553,  3102, 12193,  2443, 11955,
-              1213, 10689, -1293,   921, -4173, 10709, -6049,  8815, -7128,
-              8147, -8308,  6847, -2977,  4920,-11447,-22426,-11794,  3514,
+            -769, -7276,  2856, -7870,  3314, -8730,  3964, -10183,  4011,
+            -11135,  3421, -11727,  2966, -12360,  2818, -13472,  3660, -13805,
+            5162, -13478,  6434, -12840,  7335, -12420,  6865, -12349,  5541,
+            -11965,  5530, -10820,  5132, -9197,  3367, -7745,  1223, -6910,
+            -433, -6211, -1711, -4958, -1025, -3755,  -836, -3292, -1666,
+            -2661, -10755, 31472, -27906, 31471, 18690,  5617, 16649, 11253,
+            -22516, -17674, -31990,  3575, -31479,  5883, 26121, 12890, -6612,
+            12228, -11634,   523, 26136, -21496, 20745, -15868, -4100, -24826,
+            23282, 22798,   491, -1774, 15075, -27373, -13094,  6417, -29487,
+            14608, 10185, 16143, 22211, -8436,  4288, -8694,  2375,  3023,
+            486,  1455,   128,   202,   942,  -923,  2068, -1233,  -717,
+            -1042, -2167, 32255, -4632,   310, -4458, -3639, -5258,  2106,
+            -6857,  2681, -7497,  2765, -6601,  1945, -5219, 19154, -4877,
+            619, -5719, -1928, -6208,  -121,   593,   188,  1558, -4152,
+            1648,   156,  1604, -3664, -6862, -2851, -5112, -3600, -3747,
+            -5081, -4428, -5592, 20974, -27397, -18944, -18690, 20991, -17406,
+            5632, -14330, 28911, 15934, 15934, 15934, 15934, 15934, 15934,
+            15934, 15934, 15934, 15934, 15934, 15934, -25594, 17408, 29958,
+            -7173, -16888,  9098,  -613,  8362,   675,  7774,  2597,  8549,
+            5278,  8743,  9375,  6940, 13038,  4826, 14598,  7721, -24308,
+            -29905, -19703, -17106, -16124, -3287, -26118, -19709, -10769, 24353,
+            28648,  6946, -1363, 12485, -1187, 26074, -25055, 10004, -24798,
+            7204, -4581, -9678,  1554, 10553,  3102, 12193,  2443, 11955,
+            1213, 10689, -1293,   921, -4173, 10709, -6049,  8815, -7128,
+            8147, -8308,  6847, -2977,  4920, -11447, -22426, -11794,  3514,
             -10220,  3430, -7993,  1926, -7072,   327, -7569,  -608, -7605,
-              3695, -6271, -1579, -4877, -1419, -3103, -2197,   128, -3904,
-              3760, -5401,  4906, -6051,  4250, -6272,  3492, -6343,  3197,
-             -6397,  4041, -6341,  6255, -6381,  7905, 16504,     0, -6144,
-              8062, -5606,  8622, -5555,    -9,    -1,  7423,     0,     1,
-               238,  5148,  1309,  4700,  2218,  4403,  2573,  3568, 28303,
-              1758,  3454, -1247,  3434, -4912,  2862, -7844,  1718,-10095,
-               369,-12631,   128, -3904,  3632, -5401,  4906, -6051,  4250,
-             -6272,  3492, -6343,  3197, -6397,  4041, -6341,  6255, -6381,
-              7905, 16504,     0, -6144,  8062, -5606,  8622, -5555,  8439,
-             -3382,  7398, -1170,  6132,   238,  5148,  1309,  4700,  2218,
-              4403,  2573,  3568,  2703,  1758,  3454, -1247,  3434, -4912,
-              2862, -7844,  1718,-10095,   369,-12631,  -259,-14632,   234,
-            -15056,  -521,-15170,  -386,-16015,  -641,-16505,  -930,-16206,
-             -1209,-16146, -2839,-16374, -4558,-16218, -5207,-15903, -6421,
-            -15615, -6925,-14871, -6149,-13759, -5233,-12844, 18313, -4357,
-             -5696,  2804, 12992,-22802, -6720, -9770, -7088, -8998, 14330,
-            -12523, 14843, -6130, 29178,  -250,-27396, 10467, 16907, -3359,
-             -6644, 31965, 14607,-21544,-32497, 24020, 12557,-26926,  -173,
-              -129, -6401,  -130,-25089, -3841, -4916, -3048,   224,  -237,
-             -3969,  -189, -3529,  -535, -3464,-14863,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14395,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,     0, 32512,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,  9925,  -718,  9753,  -767,
-              9099,  -613,  8362,   675,  7774,  2597,  8549,  5278,  8743,
-              9375,  6940, 13038,  4826, 14598,  7721,-24308,-29905,-19703,
-            -17106,-16124, -3287,-26118,-19709,     0, 24353, 28648, 10274,
-            -11292,-29665,-16417, 24346, 14553, 18707, 26323, -4596,-17711,
-              5133, 26328,    13,-31168, 24583, 18404,-28927,-24350, 19453,
-             28642,  1019,-10777, -3079, 30188, -7686, 27635,-32521,-16384,
-             12528, -6386, 10986, 23827,-25880,-32752,-23321, 14605, 32231,
-               780,-13849, 15119, 28647,  4888, -7705, 30750,    64,     0,
-             32488,  6687,-20758, 19745, -2070,-13792, -6414, 28188, -2821,
-             -4585,  7168,  7444, 23557,-21998, 13064,  3345, -4086,-28915,
-             -8694, 32262,  8461, 27387,-12275, 12012, 23563,-18719,-28410,
-             29144,-22271,  -562, -9986, -5434, 12288,  5573,-16642, 32448,
-             29182, 32705,-30723, 24255,-19716, 18368, -4357, -5696,  2804,
-             12992,-22802,-22080, -7701, -5183,   486, -3133, -5660, -1083,
-             16871,-28726,-11029,-30259, -1209,-16146, -2839,-16374, -4558,
-            -16218,-10523, 20697, -9500, -1316,  5431, -1073,  3641, -1304,
-              1649,  -769, -7276,  2856, -7870,  3314, -8730,  3964,-10183,
-              4011,-11135,  3421,-11727, 21398, 32767,    -1, 32486,    -1,
-              6301,-13071,  6380, -7948,    -1, 32767,   240, 14081, -5646,
-             30973, -3598,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907, 32767,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,  8901,  9375,  6940, 13038,  4826, 14598,  7721,-24308,
-            -29905,-19703,-17106,-16124, -3287,-26118,-19709,-10769, 24361,
-             28648, 10274,-11292,-29665,-16417, 24346, 14580, 18707, 26323,
-             -4440,-17711,  5133, 26328,-14579,-31008, 24583, 18404, 28417,
-            -24350, 19453, 28642,-32513,-10777, -3079, 30188, -7686, 27635,
-            -32521,-16384,-20240, -6386, 10986, 23827,-25880,-32752,-23321,
-             14605, 32231,   780,-13849, 15119, 28647,  4888, -7705,-15074,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,  8192,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14897,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -15931,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907, 26121, 12890,  2604,
-             12228,-11634, 12299,  5573,-16642, 32452, 29182, 32705,-30723,
-             24255,-19716, 13248,-11779, -5696,  2804, 12992,-27666,-22080,
-             -7701, -5183, -6682,-31464, 14330,-12523, 14843, -6130, 29178,
-               -18,-27396, 10467, 16907, -3359, -6644, 31965, 14607,-21544,
-            -32497, 24020, 12557,-26926,-18421,   706, 24587, 19659,  4878,
-             10954, 23060,  8907,-10215,-22579, 31772,-11825,-15590,-23089,
-             17173,-25903,-17387,  3285,  4884, 10204,-16627,-14367,   516,
-             20453,-16898, 20967,-23815,   -20, 22011,-17167,  9468, 32499,
+            3695, -6271, -1579, -4877, -1419, -3103, -2197,   128, -3904,
+            3760, -5401,  4906, -6051,  4250, -6272,  3492, -6343,  3197,
+            -6397,  4041, -6341,  6255, -6381,  7905, 16504,     0, -6144,
+            8062, -5606,  8622, -5555,    -9,    -1,  7423,     0,     1,
+            238,  5148,  1309,  4700,  2218,  4403,  2573,  3568, 28303,
+            1758,  3454, -1247,  3434, -4912,  2862, -7844,  1718, -10095,
+            369, -12631,   128, -3904,  3632, -5401,  4906, -6051,  4250,
+            -6272,  3492, -6343,  3197, -6397,  4041, -6341,  6255, -6381,
+            7905, 16504,     0, -6144,  8062, -5606,  8622, -5555,  8439,
+            -3382,  7398, -1170,  6132,   238,  5148,  1309,  4700,  2218,
+            4403,  2573,  3568,  2703,  1758,  3454, -1247,  3434, -4912,
+            2862, -7844,  1718, -10095,   369, -12631,  -259, -14632,   234,
+            -15056,  -521, -15170,  -386, -16015,  -641, -16505,  -930, -16206,
+            -1209, -16146, -2839, -16374, -4558, -16218, -5207, -15903, -6421,
+            -15615, -6925, -14871, -6149, -13759, -5233, -12844, 18313, -4357,
+            -5696,  2804, 12992, -22802, -6720, -9770, -7088, -8998, 14330,
+            -12523, 14843, -6130, 29178,  -250, -27396, 10467, 16907, -3359,
+            -6644, 31965, 14607, -21544, -32497, 24020, 12557, -26926,  -173,
+            -129, -6401,  -130, -25089, -3841, -4916, -3048,   224,  -237,
+            -3969,  -189, -3529,  -535, -3464, -14863, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14395, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907,     0, 32512, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907,  9925,  -718,  9753,  -767,
+            9099,  -613,  8362,   675,  7774,  2597,  8549,  5278,  8743,
+            9375,  6940, 13038,  4826, 14598,  7721, -24308, -29905, -19703,
+            -17106, -16124, -3287, -26118, -19709,     0, 24353, 28648, 10274,
+            -11292, -29665, -16417, 24346, 14553, 18707, 26323, -4596, -17711,
+            5133, 26328,    13, -31168, 24583, 18404, -28927, -24350, 19453,
+            28642,  1019, -10777, -3079, 30188, -7686, 27635, -32521, -16384,
+            12528, -6386, 10986, 23827, -25880, -32752, -23321, 14605, 32231,
+            780, -13849, 15119, 28647,  4888, -7705, 30750,    64,     0,
+            32488,  6687, -20758, 19745, -2070, -13792, -6414, 28188, -2821,
+            -4585,  7168,  7444, 23557, -21998, 13064,  3345, -4086, -28915,
+            -8694, 32262,  8461, 27387, -12275, 12012, 23563, -18719, -28410,
+            29144, -22271,  -562, -9986, -5434, 12288,  5573, -16642, 32448,
+            29182, 32705, -30723, 24255, -19716, 18368, -4357, -5696,  2804,
+            12992, -22802, -22080, -7701, -5183,   486, -3133, -5660, -1083,
+            16871, -28726, -11029, -30259, -1209, -16146, -2839, -16374, -4558,
+            -16218, -10523, 20697, -9500, -1316,  5431, -1073,  3641, -1304,
+            1649,  -769, -7276,  2856, -7870,  3314, -8730,  3964, -10183,
+            4011, -11135,  3421, -11727, 21398, 32767,    -1, 32486,    -1,
+            6301, -13071,  6380, -7948,    -1, 32767,   240, 14081, -5646,
+            30973, -3598, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, 32767, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907,  8901,  9375,  6940, 13038,  4826, 14598,  7721, -24308,
+            -29905, -19703, -17106, -16124, -3287, -26118, -19709, -10769, 24361,
+            28648, 10274, -11292, -29665, -16417, 24346, 14580, 18707, 26323,
+            -4440, -17711,  5133, 26328, -14579, -31008, 24583, 18404, 28417,
+            -24350, 19453, 28642, -32513, -10777, -3079, 30188, -7686, 27635,
+            -32521, -16384, -20240, -6386, 10986, 23827, -25880, -32752, -23321,
+            14605, 32231,   780, -13849, 15119, 28647,  4888, -7705, -15074,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907,  8192, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14897, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -15931, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, 26121, 12890,  2604,
+            12228, -11634, 12299,  5573, -16642, 32452, 29182, 32705, -30723,
+            24255, -19716, 13248, -11779, -5696,  2804, 12992, -27666, -22080,
+            -7701, -5183, -6682, -31464, 14330, -12523, 14843, -6130, 29178,
+            -18, -27396, 10467, 16907, -3359, -6644, 31965, 14607, -21544,
+            -32497, 24020, 12557, -26926, -18421,   706, 24587, 19659,  4878,
+            10954, 23060,  8907, -10215, -22579, 31772, -11825, -15590, -23089,
+            17173, -25903, -17387,  3285,  4884, 10204, -16627, -14367,   516,
+            20453, -16898, 20967, -23815,   -20, 22011, -17167,  9468, 32499,
             -25607,  -523, -3883,  -390, -4206,   634, -3767,  2325, -2751,
-              3115, -2392,  2746, -2173,  2317, -1147,  2326, 23142, 11314,
-            -15130,-29137,  3026,  6146,  2150,  2476,  1105,  -830,  1775,
-             -3425,  3674, -5287,  4609, -7175,  4922, -9579,  4556,-12007,
-              4236,-14023,  3879,-15553,  3158,-16161,  2576, 18398,-12535,
-             -6645,-20735,-32763,-13824,-20992, 25859,  5372, 12040, 13307,
-             -4355,-30213,    -9, -6019, 14061,-31487,-13842, 30449, 15083,
-             14088, 31205,-18678,-12830, 14090,-26138,-25337,-11541, -3254,
-             27628,-22270, 30953,-16136,-30745, 20991,-17406,  5632,-14330,
-             28911,-25594, 17408,-20474, 13041, -8731,  2292, -3860, 24049,
-             10225,-19220, 10478, -4374, -1199,   148,  -330,   -74,   593,
-               188,  1558, -4152, 15984, 15934, 15934, 15934, 15934, 15934,
-             15934, 15934, 15934, 15934, 15934, 15934,  1598,   156,  1604,
-             -1163,  2278,-30018,-25821,-21763,-23776, 24066,  9502, 25866,
-            -25055, 10004,-24798,  7204, -4581, -9678,  1554, 10553,  3102,
-             12193,  2443, 11955,  1213, 10689, -1293,   921, -4173,  8661,
-             -6049,  8815,-21221,-14854, 23840, -9477,  8549,  5278,  8743,
-              9375,  6940, 13038,  4826, 14598,  7721,-24308,-29905,-19703,
-            -17106,-16124, -3287,-26118,-19709,-10769, 24361, 28648, 10274,
-            -11292,-29665,-16417, 24346, 14580, 18707, 26323, -4410,-17711,
-              5133, 26328,-14579,-31008, 24583, 18404, 28417,-24350, 19453,
-             28642,-32513,-10777, -3079, 30188, -7686, 27635,-32521,-16384,
-            -20240, -6386, 10986, 23827,-25880,-32752,-23321, 14605, 32231,
-               780,-13849, 15119, 28647,  4888, -7705, 30750,    64,     0,
-             32488,  6687,-20758, 19745, -2070,    -1,    -1,    28,   256,
-             -4608,  7168,  7444, 23557,-21998, 13064,  3345, -4086,-28915,
-             -8594, 32262,  8461, 27387,-12275, 12012, 23563,-18719,-28410,
-             29144,-22271,-32562,-16384, 12528, -6386, 10986, 23827,-25880,
-            -32752,-23321, 14605, 32231,   780,-13849, 15119, 28647,  4888,
-             -7705, 30750,    64,     0, 32488,  6687,-20758, 19745, -2070,
-            -13792, -6414, 28188, -2821, -4585,  7168,  7444, 23557,-21998,
-             13064,  3345, -4086,-28915, -8694, 32262,  8461, 27387,-12275,
-             12012, 23563,-18719,-28410, 29144,-22271,  -562, -9986, -5434,
-             12288, -2107,-16643, 32452, 29182, 32705,-30723, 24255,-19716,
-             18368, -4357, -5696,  2804, 12992,-22802,-22080, -7701, -5183,
-               486, -3133, -5660, -1083, 16871,-28726,-11029,-30259, -1209,
-            -16146, -2839,-16374, -4558,-16218,-10523, 20697, -9500, -1316,
-              5431, -1073,  3641, -1304,  1649,  -769, -7276,  2856, -7870,
-              3314, -8730,  3964,-10183,  4011,-11135,  3421,-11727, 21398,
-             32767,    -1, 32486,    -1,   -99,-13072,  6380, -7948,  4864,
-             32767, 17392, 14335, -5646, 30973, -3598,-10299,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14905,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-19771,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-16443,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-15931,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,    -1,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,  7877,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  -994, -7276,  2856, -7870,
-              3314, -8730,  3964,-10183,  4011,-11135,  3421,-11727, 21398,
-             32767,    -1, 32486,    -1,   -99,-13072,  6380, -7948,  4864,
-             32767, 17392, 14335, -5646, 30973, -3598,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14905,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,   197,     0,-14977,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907, 12838,  6653,   294,
-            -29699,-25821,-21763,-23776, 24066,  9502, 25866,-25055, 10004,
+            3115, -2392,  2746, -2173,  2317, -1147,  2326, 23142, 11314,
+            -15130, -29137,  3026,  6146,  2150,  2476,  1105,  -830,  1775,
+            -3425,  3674, -5287,  4609, -7175,  4922, -9579,  4556, -12007,
+            4236, -14023,  3879, -15553,  3158, -16161,  2576, 18398, -12535,
+            -6645, -20735, -32763, -13824, -20992, 25859,  5372, 12040, 13307,
+            -4355, -30213,    -9, -6019, 14061, -31487, -13842, 30449, 15083,
+            14088, 31205, -18678, -12830, 14090, -26138, -25337, -11541, -3254,
+            27628, -22270, 30953, -16136, -30745, 20991, -17406,  5632, -14330,
+            28911, -25594, 17408, -20474, 13041, -8731,  2292, -3860, 24049,
+            10225, -19220, 10478, -4374, -1199,   148,  -330,   -74,   593,
+            188,  1558, -4152, 15984, 15934, 15934, 15934, 15934, 15934,
+            15934, 15934, 15934, 15934, 15934, 15934,  1598,   156,  1604,
+            -1163,  2278, -30018, -25821, -21763, -23776, 24066,  9502, 25866,
+            -25055, 10004, -24798,  7204, -4581, -9678,  1554, 10553,  3102,
+            12193,  2443, 11955,  1213, 10689, -1293,   921, -4173,  8661,
+            -6049,  8815, -21221, -14854, 23840, -9477,  8549,  5278,  8743,
+            9375,  6940, 13038,  4826, 14598,  7721, -24308, -29905, -19703,
+            -17106, -16124, -3287, -26118, -19709, -10769, 24361, 28648, 10274,
+            -11292, -29665, -16417, 24346, 14580, 18707, 26323, -4410, -17711,
+            5133, 26328, -14579, -31008, 24583, 18404, 28417, -24350, 19453,
+            28642, -32513, -10777, -3079, 30188, -7686, 27635, -32521, -16384,
+            -20240, -6386, 10986, 23827, -25880, -32752, -23321, 14605, 32231,
+            780, -13849, 15119, 28647,  4888, -7705, 30750,    64,     0,
+            32488,  6687, -20758, 19745, -2070,    -1,    -1,    28,   256,
+            -4608,  7168,  7444, 23557, -21998, 13064,  3345, -4086, -28915,
+            -8594, 32262,  8461, 27387, -12275, 12012, 23563, -18719, -28410,
+            29144, -22271, -32562, -16384, 12528, -6386, 10986, 23827, -25880,
+            -32752, -23321, 14605, 32231,   780, -13849, 15119, 28647,  4888,
+            -7705, 30750,    64,     0, 32488,  6687, -20758, 19745, -2070,
+            -13792, -6414, 28188, -2821, -4585,  7168,  7444, 23557, -21998,
+            13064,  3345, -4086, -28915, -8694, 32262,  8461, 27387, -12275,
+            12012, 23563, -18719, -28410, 29144, -22271,  -562, -9986, -5434,
+            12288, -2107, -16643, 32452, 29182, 32705, -30723, 24255, -19716,
+            18368, -4357, -5696,  2804, 12992, -22802, -22080, -7701, -5183,
+            486, -3133, -5660, -1083, 16871, -28726, -11029, -30259, -1209,
+            -16146, -2839, -16374, -4558, -16218, -10523, 20697, -9500, -1316,
+            5431, -1073,  3641, -1304,  1649,  -769, -7276,  2856, -7870,
+            3314, -8730,  3964, -10183,  4011, -11135,  3421, -11727, 21398,
+            32767,    -1, 32486,    -1,   -99, -13072,  6380, -7948,  4864,
+            32767, 17392, 14335, -5646, 30973, -3598, -10299, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14905, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -19771, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -16443, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -15931, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907,    -1, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907,  7877,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  -994, -7276,  2856, -7870,
+            3314, -8730,  3964, -10183,  4011, -11135,  3421, -11727, 21398,
+            32767,    -1, 32486,    -1,   -99, -13072,  6380, -7948,  4864,
+            32767, 17392, 14335, -5646, 30973, -3598, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14905, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907,   197,     0, -14977, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, 12838,  6653,   294,
+            -29699, -25821, -21763, -23776, 24066,  9502, 25866, -25055, 10004,
             -24798,  7204, -4581, -9678,  1554, 10553,  3102, 12193,  2443,
-             11955,  1213, 10689, -1293,   921,   179,  8448, -6049,  8815,
-             -7128,  8147, -8308,  6847, -9889,  4920,-11447,  3174,-11794,
-              3514,-10220,  3430, 16384,  1926, -7072,   327, -7537,  -608,
-             -7605, -1169, -6397, -1579, -4877, -1419, -3103, -2197,   128,
-             -3904,  3632, -5401,  4906, -6051,  4250, -6272,  3492, -6343,
-              3197, -6397,  4041, -6341,  6255, -6381,  7905, 16504,     0,
-             -6144,  8062, -5606,  8622, -5555,  8439, -3382,  7398, -1170,
-              6132,   238,  5148,  1309,  4700,  2218,  4403,  2573,  3568,
-              2703,  1758,  3454, -1247,  3434, -4912,  2862, -7844,  1718,
-            -10095,   369,-12631,  -259,-14632,   234,-15056,  -491,-16194,
-              -386,-16015,  -641,-16505,  -930,-16206, -1209,-16146, -2839,
-            -16374, -4558,-16218, -5207,-15903, -6421,-15615, -6925,-14871,
-             -6149,-13759, -5233,-12844, 18313, -4357, -5696,  2804, 12992,
-            -22802, -6720, -9770, -7088, -8998, 14330,-12523, 14843, -6130,
-             29178,  -250,-27396, 10467, 16907, -3359, -6644, 31965, 14607,
-            -21544,-32497, 24020, 12557,-26926,  -173,  -129, -6401,  -130,
+            11955,  1213, 10689, -1293,   921,   179,  8448, -6049,  8815,
+            -7128,  8147, -8308,  6847, -9889,  4920, -11447,  3174, -11794,
+            3514, -10220,  3430, 16384,  1926, -7072,   327, -7537,  -608,
+            -7605, -1169, -6397, -1579, -4877, -1419, -3103, -2197,   128,
+            -3904,  3632, -5401,  4906, -6051,  4250, -6272,  3492, -6343,
+            3197, -6397,  4041, -6341,  6255, -6381,  7905, 16504,     0,
+            -6144,  8062, -5606,  8622, -5555,  8439, -3382,  7398, -1170,
+            6132,   238,  5148,  1309,  4700,  2218,  4403,  2573,  3568,
+            2703,  1758,  3454, -1247,  3434, -4912,  2862, -7844,  1718,
+            -10095,   369, -12631,  -259, -14632,   234, -15056,  -491, -16194,
+            -386, -16015,  -641, -16505,  -930, -16206, -1209, -16146, -2839,
+            -16374, -4558, -16218, -5207, -15903, -6421, -15615, -6925, -14871,
+            -6149, -13759, -5233, -12844, 18313, -4357, -5696,  2804, 12992,
+            -22802, -6720, -9770, -7088, -8998, 14330, -12523, 14843, -6130,
+            29178,  -250, -27396, 10467, 16907, -3359, -6644, 31965, 14607,
+            -21544, -32497, 24020, 12557, -26926,  -173,  -129, -6401,  -130,
             -25089, -3816, -4916, -3048,   -32,    -1, -3969,   256, -3529,
-              -535, -3464,-14863,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-             -1209,-16146, -2839,-16374, -4558,-16218,-10523, 20697, -9500,
-             -1316,  5431, -1073,  3641, -1304,  1649,  -769, -7276,  2856,
-             -7870,  3314, -8730,  3964,-10183,  4011,-11135,  3421,-11727,
-             21398, 32767,    -1, 32486,    -1,  6301,-13071,  6380, -7948,
-                -1, 32767,   240, 14081, -5646, 30973, -3598,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-             32767,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,  8901,  9375,  6940,
-             13038,  4826, 14598,  7721,-24308,-29905,-19703,-17106,-16124,
-             -3287,-26118,-19709,-10769, 24361, 28648, 10274,-11292,-29665,
-            -16417, 24346, 14580, 18707, 26323, -4440,-17711,  5133, 26328,
-            -14579,-31008, 24583, 18404, 28417,-24350, 19453, 28642,-32513,
-            -10777, -3079, 30188, -7686, 27635,-32521,-16384,-20240, -6386,
-             10986, 23827,-25880,-32752,-23321, 14605, 32231,   780,-13849,
-             15119, 28647,  4888, -7705,-15074,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,  8192,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14897,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-15931,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907, 26121, 12890,  2604, 12228,-11634, 12299,  5573,
-            -16642, 32452, 29182, 32705,-30723, 24255,-19716, 13248,-11779,
-             -5696,  2804, 12992,-27666,-22080, -7701, -5183, -6682,-31464,
-             14330,-12523, 14843, -6130, 29178,   -18,-27396, 10467, 16907,
-             -3359, -6644, 31965, 14607,-21544,-32497, 24020, 12557,-26926,
-            -18421,   706, 24587, 19659,  4878, 10954, 23060,  8907,-10215,
-            -22579, 31772,-11825,-15590,-23089, 17173,-25903,-17387,  3285,
-              4884, 10204,-16627,-14367,   516, 20453,-16898, 20967,-23815,
-               -20, 22011,-17167,  9468, 32499,-25607,  -523, -3883,  -390,
-             -4206,   634, -3767,  2325, -2751,  3115, -2392,  2746, -2173,
-              2317, -1147,  2326, 23142, 11314,-15130,-29137,  3026,  6146,
-              2150,  2476,  1105,  -830,  1775, -3425,  3674, -5287,  4609,
-             -7175,  4922, -9579,  4556,-12007,  4236,-14023,  3879,-15553,
-              3158,-16161,  2576, 18398,-12535, -6645,-20735,-32763,-13824,
-            -20992, 25859,  5372, 12040, 13307, -4355,-30213,    -9, -6019
+            -535, -3464, -14863, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -1209, -16146, -2839, -16374, -4558, -16218, -10523, 20697, -9500,
+            -1316,  5431, -1073,  3641, -1304,  1649,  -769, -7276,  2856,
+            -7870,  3314, -8730,  3964, -10183,  4011, -11135,  3421, -11727,
+            21398, 32767,    -1, 32486,    -1,  6301, -13071,  6380, -7948,
+            -1, 32767,   240, 14081, -5646, 30973, -3598, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            32767, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907,  8901,  9375,  6940,
+            13038,  4826, 14598,  7721, -24308, -29905, -19703, -17106, -16124,
+            -3287, -26118, -19709, -10769, 24361, 28648, 10274, -11292, -29665,
+            -16417, 24346, 14580, 18707, 26323, -4440, -17711,  5133, 26328,
+            -14579, -31008, 24583, 18404, 28417, -24350, 19453, 28642, -32513,
+            -10777, -3079, 30188, -7686, 27635, -32521, -16384, -20240, -6386,
+            10986, 23827, -25880, -32752, -23321, 14605, 32231,   780, -13849,
+            15119, 28647,  4888, -7705, -15074, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,  8192,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14897,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -15931, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, 26121, 12890,  2604, 12228, -11634, 12299,  5573,
+            -16642, 32452, 29182, 32705, -30723, 24255, -19716, 13248, -11779,
+            -5696,  2804, 12992, -27666, -22080, -7701, -5183, -6682, -31464,
+            14330, -12523, 14843, -6130, 29178,   -18, -27396, 10467, 16907,
+            -3359, -6644, 31965, 14607, -21544, -32497, 24020, 12557, -26926,
+            -18421,   706, 24587, 19659,  4878, 10954, 23060,  8907, -10215,
+            -22579, 31772, -11825, -15590, -23089, 17173, -25903, -17387,  3285,
+            4884, 10204, -16627, -14367,   516, 20453, -16898, 20967, -23815,
+            -20, 22011, -17167,  9468, 32499, -25607,  -523, -3883,  -390,
+            -4206,   634, -3767,  2325, -2751,  3115, -2392,  2746, -2173,
+            2317, -1147,  2326, 23142, 11314, -15130, -29137,  3026,  6146,
+            2150,  2476,  1105,  -830,  1775, -3425,  3674, -5287,  4609,
+            -7175,  4922, -9579,  4556, -12007,  4236, -14023,  3879, -15553,
+            3158, -16161,  2576, 18398, -12535, -6645, -20735, -32763, -13824,
+            -20992, 25859,  5372, 12040, 13307, -4355, -30213,    -9, -6019
         };
         err = oac_multistream_encode(enc, pcm, 960, data, 7380);
         oac_test_assert(err > 0);
@@ -759,128 +755,128 @@ static int surround_analysis_uninit(void)
     {
         static const short pcm[1440*3] =
         {
-             30449, 15083, 14088, 31205,-18678,-12830, 14090,-26138,-25337,
-            -11541, -3254, 27628,-22270, 30953,-16136,-30745, 20991,-17406,
-              5632,-14330, 28911,-25594, 17408,-20474, 13041, -8731,  2292,
-             -3860, 24049, 10225,-19220, 10478, -4374, -1199,   148,  -330,
-               -74,   593,   188,  1558, -4152, 15984, 15934, 15934, 15934,
-             15934, 15934, 15934, 15934, 15934, 15934, 15934, 15934,  1598,
-               156,  1604, -1163,  2278,-30018,-25821,-21763,-23776, 24066,
-              9502, 25866,-25055, 10004,-24798,  7204, -4581, -9678,  1554,
-             10553,  3102, 12193,  2443, 11955,  1213, 10689, -1293,   921,
-             -4173,  8661, -6049,  8815,-21221,-14854, 23840, -9477,  8549,
-              5278,  8743,  9375,  6940, 13038,  4826, 14598,  7721,-24308,
-            -29905,-19703,-17106,-16124, -3287,-26118,-19709,-10769, 24361,
-             28648, 10274,-11292,-29665,-16417, 24346, 14580, 18707, 26323,
-             -4410,-17711,  5133, 26328,-14579,-31008, 24583, 18404, 28417,
-            -24350, 19453, 28642,-32513,-10777, -3079, 30188, -7686, 27635,
-            -32521,-16384,-20240, -6386, 10986, 23827,-25880,-32752,-23321,
-             14605, 32231,   780,-13849, 15119, 28647,  4888, -7705, 30750,
-                64,     0, 32488,  6687,-20758, 19745, -2070,    -1,    -1,
-                28,   256, -4608,  7168,  7444, 23557,-21998, 13064,  3345,
-             -4086,-28915, -8594, 32262,  8461, 27387,-12275, 12012, 23563,
-            -18719,-28410, 29144,-22271,-32562,-16384, 12528, -6386, 10986,
-             23827,-25880,-32752,-23321, 14605, 32231,   780,-13849, 15119,
-             28647,  4888, -7705, 30750,    64,     0, 32488,  6687,-20758,
-             19745, -2070,-13792, -6414, 28188, -2821, -4585,  7168,  7444,
-             23557,-21998, 13064,  3345, -4086,-28915, -8694, 32262,  8461,
-            -14853,-14907,-14907,-14907,-14907, 32767,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14891,-14907,-14907,-14907,
-            -14907,-14907,  8901,  9375,  6940, 13038,  4826, 14598,  7721,
-            -24308,-29905,-19703,-17106,-16124, -3287,-26118,-19709,-10769,
-             24361, 28648, 10274,-11292,-29665,-16417, 24346, 14580, 18707,
-             26323, -4440,-17711,  5133, 26328,-14579,-31008, 24583, 18404,
-             28417,-24350, 19453, 28642,-32513,-10777, -3079, 30188, -7686,
-             27635,-32521,-16384,-20240, -6386, 10986, 23827,-25880,-32752,
-            -23321, 14605, 32231,   780,-13849, 15119, 28647,  4888, -7705,
-            -15074,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,  8192,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14897,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-15931,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907, 26121, 12890,
-              2604, 12228,-11634, 12299,  5573,-16642, 32452, 29182,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
-              7710,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-10811,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14917,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14938,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,-14907,
-            -14907,-14907,-14907,-14907,  -571, -9986,   -58, 12542,-18491,
-             32507, 12838,  6653,   294,    -1,     0,-19968, 18368, -4357,
-             -5696,  2804, 12998,-22802,-22080, -7701, -5183,   486, -3133,
-             -5660, -1083, 13799,-28726,-11029,   205,-14848, 32464,    -1,
-              -129,-13072,  6380, -7948, 20717, 18425, 17392, 14335, -5646,
-             30973, -3598,  7188, -3867,  3055, -4247,  5597, -4011,-26427,
-               -11,-30418,  7922,  2614,   237, -5839,-27413,-17624,-29716,
-            -13539,   239, 20991, 18164, -4082,-16647,-27386, 19458, 20224,
-              4619, 19728, -7409,-18186,-25073, 27627,-23539, -7945,-31464,
-             14330,-12523,-22021, -7701, -5183,   486, -3133, -5660, -1083,
-             13799,-28726,-11029,   205,-14848, 32464,    -1,  -129,-13072,
-              6380, -7948, 20717, 18425, 17392, 14093, -5646, 30973, -3598,
-              7188, -3867,  3055,  3689, -5401,  4906, -6051,  4250, -6272,
-              3492, -6343,  3197, -6397,  4041, -6341,  6255, -6381,   239,
-             20991, 18164, -4082,-16647,-27386, 19458, 20224,  4619, 19728,
-             -7409,-18186,-25073, 27627,-23539, -7945,-31464, 14330,-12523,
-             14843, -6130, 30202,  -250,-28420, 10467, 16907, -3359, -6644,
-             31965,  3343,-11727,  2966,-12616,  3064,-13472,  6732,-12349,
-              5541,-11965,  5530,-10820, -1912, -3637, 32285, -4607,   310,
+            30449, 15083, 14088, 31205, -18678, -12830, 14090, -26138, -25337,
+            -11541, -3254, 27628, -22270, 30953, -16136, -30745, 20991, -17406,
+            5632, -14330, 28911, -25594, 17408, -20474, 13041, -8731,  2292,
+            -3860, 24049, 10225, -19220, 10478, -4374, -1199,   148,  -330,
+            -74,   593,   188,  1558, -4152, 15984, 15934, 15934, 15934,
+            15934, 15934, 15934, 15934, 15934, 15934, 15934, 15934,  1598,
+            156,  1604, -1163,  2278, -30018, -25821, -21763, -23776, 24066,
+            9502, 25866, -25055, 10004, -24798,  7204, -4581, -9678,  1554,
+            10553,  3102, 12193,  2443, 11955,  1213, 10689, -1293,   921,
+            -4173,  8661, -6049,  8815, -21221, -14854, 23840, -9477,  8549,
+            5278,  8743,  9375,  6940, 13038,  4826, 14598,  7721, -24308,
+            -29905, -19703, -17106, -16124, -3287, -26118, -19709, -10769, 24361,
+            28648, 10274, -11292, -29665, -16417, 24346, 14580, 18707, 26323,
+            -4410, -17711,  5133, 26328, -14579, -31008, 24583, 18404, 28417,
+            -24350, 19453, 28642, -32513, -10777, -3079, 30188, -7686, 27635,
+            -32521, -16384, -20240, -6386, 10986, 23827, -25880, -32752, -23321,
+            14605, 32231,   780, -13849, 15119, 28647,  4888, -7705, 30750,
+            64,     0, 32488,  6687, -20758, 19745, -2070,    -1,    -1,
+            28,   256, -4608,  7168,  7444, 23557, -21998, 13064,  3345,
+            -4086, -28915, -8594, 32262,  8461, 27387, -12275, 12012, 23563,
+            -18719, -28410, 29144, -22271, -32562, -16384, 12528, -6386, 10986,
+            23827, -25880, -32752, -23321, 14605, 32231,   780, -13849, 15119,
+            28647,  4888, -7705, 30750,    64,     0, 32488,  6687, -20758,
+            19745, -2070, -13792, -6414, 28188, -2821, -4585,  7168,  7444,
+            23557, -21998, 13064,  3345, -4086, -28915, -8694, 32262,  8461,
+            -14853, -14907, -14907, -14907, -14907, 32767, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14891, -14907, -14907, -14907,
+            -14907, -14907,  8901,  9375,  6940, 13038,  4826, 14598,  7721,
+            -24308, -29905, -19703, -17106, -16124, -3287, -26118, -19709, -10769,
+            24361, 28648, 10274, -11292, -29665, -16417, 24346, 14580, 18707,
+            26323, -4440, -17711,  5133, 26328, -14579, -31008, 24583, 18404,
+            28417, -24350, 19453, 28642, -32513, -10777, -3079, 30188, -7686,
+            27635, -32521, -16384, -20240, -6386, 10986, 23827, -25880, -32752,
+            -23321, 14605, 32231,   780, -13849, 15119, 28647,  4888, -7705,
+            -15074, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907,  8192, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14897, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -15931, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, 26121, 12890,
+            2604, 12228, -11634, 12299,  5573, -16642, 32452, 29182,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,  7710,
+            7710, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -10811, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14917, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14938, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907, -14907,
+            -14907, -14907, -14907, -14907,  -571, -9986,   -58, 12542, -18491,
+            32507, 12838,  6653,   294,    -1,     0, -19968, 18368, -4357,
+            -5696,  2804, 12998, -22802, -22080, -7701, -5183,   486, -3133,
+            -5660, -1083, 13799, -28726, -11029,   205, -14848, 32464,    -1,
+            -129, -13072,  6380, -7948, 20717, 18425, 17392, 14335, -5646,
+            30973, -3598,  7188, -3867,  3055, -4247,  5597, -4011, -26427,
+            -11, -30418,  7922,  2614,   237, -5839, -27413, -17624, -29716,
+            -13539,   239, 20991, 18164, -4082, -16647, -27386, 19458, 20224,
+            4619, 19728, -7409, -18186, -25073, 27627, -23539, -7945, -31464,
+            14330, -12523, -22021, -7701, -5183,   486, -3133, -5660, -1083,
+            13799, -28726, -11029,   205, -14848, 32464,    -1,  -129, -13072,
+            6380, -7948, 20717, 18425, 17392, 14093, -5646, 30973, -3598,
+            7188, -3867,  3055,  3689, -5401,  4906, -6051,  4250, -6272,
+            3492, -6343,  3197, -6397,  4041, -6341,  6255, -6381,   239,
+            20991, 18164, -4082, -16647, -27386, 19458, 20224,  4619, 19728,
+            -7409, -18186, -25073, 27627, -23539, -7945, -31464, 14330, -12523,
+            14843, -6130, 30202,  -250, -28420, 10467, 16907, -3359, -6644,
+            31965,  3343, -11727,  2966, -12616,  3064, -13472,  6732, -12349,
+            5541, -11965,  5530, -10820, -1912, -3637, 32285, -4607,   310,
             -32768,     0, -5258,  2106, -6857,  2681, -5449, -3606, -6717,
-             -5482, -3606, -1853,  4082, -7631, -9808, -1742, -2851, -5112,
-                64,  -868,-13546,-13365,-13365,-13365,-13365,-13365,-13365,
-            -13365,-13365,-13365,-13365,-13365,-13365,-13365,-13365,-13365,
-            -13365,-13365,-13365,-13365,-13365,-13365,-13365,-13365,-13365,
-            -13365,-13365,-13365,-13365,-13365,-13365,-13365,-13365,-13365,
-            -13365,-13365,-13365,-13365,-13365,-13365,-13365,  7883, -2316,
-              9086, -3944, 10500,  4285, 10459, -6474, 10204, -6539, 11601,
-             -6824, 13385, -7142, 13872, -7457, 13670, -7725, 13463, -6887,
-             12482, -5580, 12600, -4964, 12480,  3254, 11741, -4210,-24819,
-             23282, 22798,   491, -1774, -1073,  3641, -1304, 28928,  -250,
-            -27396,  6657, -8961, 22524, 19987, 10231,  1791,  8947,-32763,
-            -26385,-31227,  -792,-30461,  8926,  4866, 27863, 27756, 27756,
-             27756, 27756, 27756, 27756, 27756, 27756,  5630,-11070,-16136,
-             20671,-11530, 27328,  8179,  5059,-31503,-24379,-19472, 17863,
+            -5482, -3606, -1853,  4082, -7631, -9808, -1742, -2851, -5112,
+            64,  -868, -13546, -13365, -13365, -13365, -13365, -13365, -13365,
+            -13365, -13365, -13365, -13365, -13365, -13365, -13365, -13365, -13365,
+            -13365, -13365, -13365, -13365, -13365, -13365, -13365, -13365, -13365,
+            -13365, -13365, -13365, -13365, -13365, -13365, -13365, -13365, -13365,
+            -13365, -13365, -13365, -13365, -13365, -13365, -13365,  7883, -2316,
+            9086, -3944, 10500,  4285, 10459, -6474, 10204, -6539, 11601,
+            -6824, 13385, -7142, 13872, -7457, 13670, -7725, 13463, -6887,
+            12482, -5580, 12600, -4964, 12480,  3254, 11741, -4210, -24819,
+            23282, 22798,   491, -1774, -1073,  3641, -1304, 28928,  -250,
+            -27396,  6657, -8961, 22524, 19987, 10231,  1791,  8947, -32763,
+            -26385, -31227,  -792, -30461,  8926,  4866, 27863, 27756, 27756,
+            27756, 27756, 27756, 27756, 27756, 27756,  5630, -11070, -16136,
+            20671, -11530, 27328,  8179,  5059, -31503, -24379, -19472, 17863,
             -29202, 22986,   -23,  8909,  8422, 10450
         };
         err = oac_multistream_encode(enc, pcm, 1440, data, 7380);
@@ -891,8 +887,7 @@ static int surround_analysis_uninit(void)
     return 0;
 }
 
-static int ec_enc_shrink_assert(void)
-{
+static int ec_enc_shrink_assert(void) {
     OacEncoder *enc;
     int err;
     int data_len;
@@ -900,33 +895,33 @@ static int ec_enc_shrink_assert(void)
     static const short pcm1[960] = { 5140 };
     static const short pcm2[2880] =
     {
-          -256,-12033,     0, -2817,  6912,     0, -5359,  5200,  3061,
-             0, -2903,  5652, -1281,-24656,-14433,-24678,    32,-29793,
-          2870,     0,  4096,  5120,  5140,  -234,-20230,-24673,-24633,
-        -24673,-24705,     0,-32768,-25444,-25444,     0,-25444,-25444,
-           156,-20480, -7948, -5920, -7968, -7968,   224,     0, 20480,
-            11, 20496,    13, 20496,    11,-20480,  2292,-20240,   244,
-         20480,    11, 20496,    11,-20480,   244,-20240,  7156, 20456,
-          -246,-20243,   244,   128,   244, 20480,    11, 20496,    11,
-        -20480,   244,-20256,   244, 20480,   256,     0,  -246, 16609,
-          -176,     0, 29872, -4096, -2888,   516,  2896,  4096,  2896,
-        -20480, -3852, -2896, -1025,-31056,-14433,   244,  1792,  -256,
+        -256, -12033,     0, -2817,  6912,     0, -5359,  5200,  3061,
+        0, -2903,  5652, -1281, -24656, -14433, -24678,    32, -29793,
+        2870,     0,  4096,  5120,  5140,  -234, -20230, -24673, -24633,
+        -24673, -24705,     0, -32768, -25444, -25444,     0, -25444, -25444,
+        156, -20480, -7948, -5920, -7968, -7968,   224,     0, 20480,
+        11, 20496,    13, 20496,    11, -20480,  2292, -20240,   244,
+        20480,    11, 20496,    11, -20480,   244, -20240,  7156, 20456,
+        -246, -20243,   244,   128,   244, 20480,    11, 20496,    11,
+        -20480,   244, -20256,   244, 20480,   256,     0,  -246, 16609,
+        -176,     0, 29872, -4096, -2888,   516,  2896,  4096,  2896,
+        -20480, -3852, -2896, -1025, -31056, -14433,   244,  1792,  -256,
         -12033,     0, -2817,     0,     0, -5359,  5200,  3061,    16,
-         -2903,  5652, -1281,-24656,-14433,-24678,    32,-29793,  2870,
-             0,  4096,  5120,  5140,  -234,-20230,-24673,-24633,-24673,
-        -24705,     0,-32768,-25444,-25444,     0,-25444,-25444,   156,
+        -2903,  5652, -1281, -24656, -14433, -24678,    32, -29793,  2870,
+        0,  4096,  5120,  5140,  -234, -20230, -24673, -24633, -24673,
+        -24705,     0, -32768, -25444, -25444,     0, -25444, -25444,   156,
         -20480, -7973, -5920, -7968, -7968,   224,     0, 20480,    11,
-         20496,    11, 20496,    11,-20480,  2292,-20213,   244, 20480,
-            11, 20496,    11,-24698, -2873,     0,     7,    -1,   208,
-          -256,   244,     0,  4352, 20715, -2796,    11,-22272,  5364,
-          -234,-20230,-24673,-25913,  8351,-24832, 13963,    11,     0,
-            16,  5140,  5652, -1281,-24656,-14433,-24673, 32671,   159,
-             0,-25472,-25444,   156,-25600,-25444,-25444,     0, -2896,
-         -7968, -7960, -7968, -7968,     0,     0,  2896,  4096,  2896,
-          4096,  2896,     0, -2896, -4088, -2896,     0,  2896,     0,
-         -2896, -4096, -2896,    11,  2640, -4609, -2896,-32768, -3072,
-             0,  2896,  4096,  2896,     0, -2896, -4096, -2896,     0,
-            80,     1,  2816,     0, 20656,   255,-20480,   116,-18192
+        20496,    11, 20496,    11, -20480,  2292, -20213,   244, 20480,
+        11, 20496,    11, -24698, -2873,     0,     7,    -1,   208,
+        -256,   244,     0,  4352, 20715, -2796,    11, -22272,  5364,
+        -234, -20230, -24673, -25913,  8351, -24832, 13963,    11,     0,
+        16,  5140,  5652, -1281, -24656, -14433, -24673, 32671,   159,
+        0, -25472, -25444,   156, -25600, -25444, -25444,     0, -2896,
+        -7968, -7960, -7968, -7968,     0,     0,  2896,  4096,  2896,
+        4096,  2896,     0, -2896, -4088, -2896,     0,  2896,     0,
+        -2896, -4096, -2896,    11,  2640, -4609, -2896, -32768, -3072,
+        0,  2896,  4096,  2896,     0, -2896, -4096, -2896,     0,
+        80,     1,  2816,     0, 20656,   255, -20480,   116, -18192
     };
     static const short pcm3[2880] = { 0 };
 
@@ -954,8 +949,7 @@ static int ec_enc_shrink_assert(void)
     return 0;
 }
 
-static int ec_enc_shrink_assert2(void)
-{
+static int ec_enc_shrink_assert2(void) {
     OacEncoder *enc;
     int err;
     int data_len;
@@ -986,8 +980,7 @@ static int ec_enc_shrink_assert2(void)
     return 0;
 }
 
-static int silk_gain_assert(void)
-{
+static int silk_gain_assert(void) {
     OacEncoder *enc;
     int err;
     int data_len;
@@ -1023,8 +1016,7 @@ static int silk_gain_assert(void)
 }
 
 #ifndef DISABLE_FLOAT_API
-int analysis_overflow(void)
-{
+int analysis_overflow(void) {
     OacEncoder *enc;
     int err;
     unsigned char data[200];
@@ -1039,8 +1031,7 @@ int analysis_overflow(void)
     return 0;
 }
 
-int projection_overflow2(void)
-{
+int projection_overflow2(void) {
     OacProjectionEncoder *enc;
     int err;
     unsigned char data[480];
@@ -1086,37 +1077,35 @@ int projection_overflow2(void)
     return 0;
 }
 
-int projection_overflow3(void)
-{
-   OacProjectionEncoder *enc;
-   int err;
-   int i;
-   int data_len;
-   int streams;
-   int coupled_streams;
-   float pcm[60*4];
-   unsigned char data[500];
+int projection_overflow3(void) {
+    OacProjectionEncoder *enc;
+    int err;
+    int i;
+    int data_len;
+    int streams;
+    int coupled_streams;
+    float pcm[60*4];
+    unsigned char data[500];
 
-   enc = oac_projection_ambisonics_encoder_create(24000, 4, 3, &streams,
+    enc = oac_projection_ambisonics_encoder_create(24000, 4, 3, &streams,
        &coupled_streams, OAC_APPLICATION_AUDIO, &err);
 
-   for (i = 0; i < 60*4; ++i)
-       pcm[i] = -1e38;
-   data_len = oac_projection_encode_float(enc, pcm, 60, data, 500);
-   oac_test_assert(data_len >= 5 && data_len <= 500);
+    for (i = 0; i < 60*4; ++i)
+        pcm[i] = -1e38;
+    data_len = oac_projection_encode_float(enc, pcm, 60, data, 500);
+    oac_test_assert(data_len >= 5 && data_len <= 500);
 
-   for (i = 0; i < 60*4; ++i)
-       pcm[i] = 1e38;
-   data_len = oac_projection_encode_float(enc, pcm, 60, data, 500);
-   oac_test_assert(data_len >= 5 && data_len <= 500);
+    for (i = 0; i < 60*4; ++i)
+        pcm[i] = 1e38;
+    data_len = oac_projection_encode_float(enc, pcm, 60, data, 500);
+    oac_test_assert(data_len >= 5 && data_len <= 500);
 
-   oac_projection_encoder_destroy(enc);
-   return 0;
+    oac_projection_encoder_destroy(enc);
+    return 0;
 }
 #endif
 
-int projection_overflow(void)
-{
+int projection_overflow(void) {
     OacProjectionEncoder *enc;
     int err;
     unsigned char data[10000];
@@ -1125,26 +1114,26 @@ int projection_overflow(void)
     int coupled_streams;
     static const short pcm[1920*36] =
     {
-     -6426, -6426, -6426, -6426, -7962, 20498,  -245, -5637,  5969,
-      2571,  2595, 11786,-32768,  -246,   255,-20446, -2828, -2828,
-         0,-32453, 32659,-11334,-21846,-21846,-21846, 12000, 25563,
-     30307,-32583, -3829,-31489, -1025, 20969,  2839, 25406, 25443,
-     25421,  3921,-18169,-32768,     0,   203, -2289,    -1, 32767,
-     -8449, 16384, 16384, 20852,   222,  5952, 29760,  4096,   116,
-      4096,  2560,   736,  2872,  2781,  1802,-32758,-32640,-32640,
-    -32640,-32640,-32640,-32640,-32640,-32640,-32640,-32640,-32640,
-    -32640,-32640,-32640,-32640,-32640,-32640,-32640,-32640,-32640,
-    -32640,-32640,-32640,-32640,-32640,-32640,-32640,-32640,-32640,
-    -32640,-32640,-32640,-32640,-32640,-32640,-32640,-32640,-32640,
-    -32640,-32640,-32640,-32640,  8970,-22006, 12000, 31097, 31353,
-     31097, 31097, 31097, 31097, 31097, 31097, 31097, 31097, 31097,
-     31097, 31097, 31097, 31097, 31097, 31097, 31097, 31097, 31097,
-     31097, 31097, 31097, 31097, 31097, 31097, 31097, 31097, 31097,
-     31097,-29831, -2973,-21846,-21821,-21846, 12000,     0,   255,
-     29712,     0, 12340, -8181, 20482, -5365,  2570, 32519,  -514,
-    -17793,-21805,-18077,-22005, -9373,-21846, -8064,-21970,-21898,
-       -16,  -124, -5637,  5969, 24587, 24655, 26703, 18767, 20303,
-     20303, 20303, 20559, 20303, -5041,   176, -2896, -5873,    21
+        -6426, -6426, -6426, -6426, -7962, 20498,  -245, -5637,  5969,
+        2571,  2595, 11786, -32768,  -246,   255, -20446, -2828, -2828,
+        0, -32453, 32659, -11334, -21846, -21846, -21846, 12000, 25563,
+        30307, -32583, -3829, -31489, -1025, 20969,  2839, 25406, 25443,
+        25421,  3921, -18169, -32768,     0,   203, -2289,    -1, 32767,
+        -8449, 16384, 16384, 20852,   222,  5952, 29760,  4096,   116,
+        4096,  2560,   736,  2872,  2781,  1802, -32758, -32640, -32640,
+        -32640, -32640, -32640, -32640, -32640, -32640, -32640, -32640, -32640,
+        -32640, -32640, -32640, -32640, -32640, -32640, -32640, -32640, -32640,
+        -32640, -32640, -32640, -32640, -32640, -32640, -32640, -32640, -32640,
+        -32640, -32640, -32640, -32640, -32640, -32640, -32640, -32640, -32640,
+        -32640, -32640, -32640, -32640,  8970, -22006, 12000, 31097, 31353,
+        31097, 31097, 31097, 31097, 31097, 31097, 31097, 31097, 31097,
+        31097, 31097, 31097, 31097, 31097, 31097, 31097, 31097, 31097,
+        31097, 31097, 31097, 31097, 31097, 31097, 31097, 31097, 31097,
+        31097, -29831, -2973, -21846, -21821, -21846, 12000,     0,   255,
+        29712,     0, 12340, -8181, 20482, -5365,  2570, 32519,  -514,
+        -17793, -21805, -18077, -22005, -9373, -21846, -8064, -21970, -21898,
+        -16,  -124, -5637,  5969, 24587, 24655, 26703, 18767, 20303,
+        20303, 20303, 20559, 20303, -5041,   176, -2896, -5873,    21
     };
 
     enc = oac_projection_ambisonics_encoder_create(96000, 36, 3, &streams,
@@ -1161,8 +1150,7 @@ int projection_overflow(void)
 
 
 #ifdef ENABLE_QEXT
-int projection_overflow4(void)
-{
+int projection_overflow4(void) {
     OacProjectionEncoder *enc;
     int err;
     unsigned char data[1000];
@@ -1171,22 +1159,22 @@ int projection_overflow4(void)
     int coupled_streams;
     static const short pcm[480*36] =
     {
-          5760, -3050,   -25,     1, -6144,-32583,-32640,-32641,-32640,
-        -32640,-30080,-32640,-32640,-32384,-32640,-32640,-32640,-32640,
-        -32640,-21984,-15446,-32640,-32640,-32513,-32640,-18048,  2944,
-        -26624,    -1, 32767,-15105, 12031,     0, 32639, -2593,    16,
-         -8182,  3858,  3855,  3855,  3855,  3855,  3855,     0,     0,
-          3855,  3855,  3855,  3855,   176, 32512,   176,  4608, 32732,
-            -1,  8704, -2896, -2828,   244, 15104,-27775,-18049,  2944,
-        -26624,    -1, -7937, -9426, 25443,-18058,  2944, 27648,   204,
-         -2289, -1025, 32767, -8449, 16384, 13312, 20852,   -34,    64,
-         29760,  4096,   116,  4096,  2560,   736,  2896,  2781, 25610,
-        -32717,  8970,-22006, 12000, 31097, 31097, 31157, 25465,  8291,
-        -21846,-21821, -6742, 12000,     0, 32767,  -514, 20320, 20320,
-         20328, 20297,-32640,-32640,-21075,-21111,-13139,-32640,-32640,
-        -32640,-32640,-32640,-32640,-32640,-32640,-32640,-32640,-27520,
-        -32640,-32640,-32640,-32640,-32640,-32640,-32640,-32640,-32640,
-        -32640,-32640,-32640,-32640,-32640,-32640,-32513,-32640,-18048
+        5760, -3050,   -25,     1, -6144, -32583, -32640, -32641, -32640,
+        -32640, -30080, -32640, -32640, -32384, -32640, -32640, -32640, -32640,
+        -32640, -21984, -15446, -32640, -32640, -32513, -32640, -18048,  2944,
+        -26624,    -1, 32767, -15105, 12031,     0, 32639, -2593,    16,
+        -8182,  3858,  3855,  3855,  3855,  3855,  3855,     0,     0,
+        3855,  3855,  3855,  3855,   176, 32512,   176,  4608, 32732,
+        -1,  8704, -2896, -2828,   244, 15104, -27775, -18049,  2944,
+        -26624,    -1, -7937, -9426, 25443, -18058,  2944, 27648,   204,
+        -2289, -1025, 32767, -8449, 16384, 13312, 20852,   -34,    64,
+        29760,  4096,   116,  4096,  2560,   736,  2896,  2781, 25610,
+        -32717,  8970, -22006, 12000, 31097, 31097, 31157, 25465,  8291,
+        -21846, -21821, -6742, 12000,     0, 32767,  -514, 20320, 20320,
+        20328, 20297, -32640, -32640, -21075, -21111, -13139, -32640, -32640,
+        -32640, -32640, -32640, -32640, -32640, -32640, -32640, -32640, -27520,
+        -32640, -32640, -32640, -32640, -32640, -32640, -32640, -32640, -32640,
+        -32640, -32640, -32640, -32640, -32640, -32640, -32513, -32640, -18048
     };
 
     enc = oac_projection_ambisonics_encoder_create(96000, 36, 3, &streams,
@@ -1199,14 +1187,13 @@ int projection_overflow4(void)
     return 0;
 }
 
-int qext_repacketize_fail(void)
-{
+int qext_repacketize_fail(void) {
     OacEncoder *enc;
     int err;
     unsigned char data[9000];
     int data_len;
     static const short pcm[960] =
-        { -20454, -7680,-12281,  -250, -1809,-22758,-22784,-20480,     3 };
+    { -20454, -7680, -12281,  -250, -1809, -22758, -22784, -20480,     3 };
 
     enc = oac_encoder_create(16000, 1, OAC_APPLICATION_VOIP, &err);
     oac_encoder_ctl(enc, OAC_SET_VBR(0));
@@ -1218,8 +1205,7 @@ int qext_repacketize_fail(void)
     return 0;
 }
 
-int qext_stereo_overflow(void)
-{
+int qext_stereo_overflow(void) {
     OacEncoder *enc;
     int err;
     unsigned char data[2000];
@@ -1237,9 +1223,8 @@ int qext_stereo_overflow(void)
 }
 
 
-#ifdef ENABLE_DRED
-int qext_dred_combination(void)
-{
+# ifdef ENABLE_DRED
+int qext_dred_combination(void) {
     OacMSEncoder *enc;
     OacEncoder *stream_enc;
     int err;
@@ -1250,9 +1235,9 @@ int qext_dred_combination(void)
     unsigned char mapping[5];
     static const short pcm[320*5] =
     {
-             0,     1, 15934,  -128,  -194,     0,     0,  1000,     0,
-        -22758, 15872,    16,     0,  1000,     0,-22758, 15872, -2304,
-         -2057, -2057, -2057, -2057, -2057, -2057, -2057
+        0,     1, 15934,  -128,  -194,     0,     0,  1000,     0,
+        -22758, 15872,    16,     0,  1000,     0, -22758, 15872, -2304,
+        -2057, -2057, -2057, -2057, -2057, -2057, -2057
     };
 
     enc = oac_multistream_surround_encoder_create(16000, 5, 1, &streams,
@@ -1268,32 +1253,31 @@ int qext_dred_combination(void)
     oac_multistream_encoder_destroy(enc);
     return 0;
 }
-#endif
+# endif
 #endif
 
 
-void regression_test(void)
-{
-   fprintf(stderr, "Running simple tests for bugs that have been fixed previously\n");
-   celt_ec_internal_error();
-   mscbr_encode_fail10();
-   mscbr_encode_fail();
-   surround_analysis_uninit();
-   ec_enc_shrink_assert();
-   ec_enc_shrink_assert2();
-   silk_gain_assert();
+void regression_test(void) {
+    fprintf(stderr, "Running simple tests for bugs that have been fixed previously\n");
+    celt_ec_internal_error();
+    mscbr_encode_fail10();
+    mscbr_encode_fail();
+    surround_analysis_uninit();
+    ec_enc_shrink_assert();
+    ec_enc_shrink_assert2();
+    silk_gain_assert();
 #ifndef DISABLE_FLOAT_API
-   analysis_overflow();
-   projection_overflow2();
-   projection_overflow3();
+    analysis_overflow();
+    projection_overflow2();
+    projection_overflow3();
 #endif
-   projection_overflow();
+    projection_overflow();
 #ifdef ENABLE_QEXT
-   projection_overflow4();
-   qext_repacketize_fail();
-   qext_stereo_overflow();
-#ifdef ENABLE_DRED
-   qext_dred_combination();
-#endif
+    projection_overflow4();
+    qext_repacketize_fail();
+    qext_stereo_overflow();
+# ifdef ENABLE_DRED
+    qext_dred_combination();
+# endif
 #endif
 }
diff --git a/tests/test_oac_api.c b/tests/test_oac_api.c
index a6a75ef1a..ef320cda7 100644
--- a/tests/test_oac_api.c
+++ b/tests/test_oac_api.c
@@ -23,7 +23,7 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 /* This tests the API presented by the liboac system.
    It does not attempt to extensively exercise the codec internals.
@@ -42,7 +42,7 @@
    run inside valgrind. Malloc failure testing requires glibc. */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdio.h>
@@ -55,656 +55,673 @@
 #include "test_oac_common.h"
 
 #ifdef VALGRIND
-#include <valgrind/memcheck.h>
-#define VG_UNDEF(x,y) VALGRIND_MAKE_MEM_UNDEFINED((x),(y))
-#define VG_CHECK(x,y) VALGRIND_CHECK_MEM_IS_DEFINED((x),(y))
+# include <valgrind/memcheck.h>
+# define VG_UNDEF(x, y) VALGRIND_MAKE_MEM_UNDEFINED((x), (y))
+# define VG_CHECK(x, y) VALGRIND_CHECK_MEM_IS_DEFINED((x), (y))
 #else
-#define VG_UNDEF(x,y)
-#define VG_CHECK(x,y)
+# define VG_UNDEF(x, y)
+# define VG_CHECK(x, y)
 #endif
 
 #if defined(HAVE___MALLOC_HOOK)
-#define MALLOC_FAIL
-#include "os_support.h"
-#include <malloc.h>
+# define MALLOC_FAIL
+# include "os_support.h"
+# include <malloc.h>
 
 static const oac_int32 oac_apps[3] = {OAC_APPLICATION_VOIP,
-       OAC_APPLICATION_AUDIO,OAC_APPLICATION_RESTRICTED_LOWDELAY};
+                                      OAC_APPLICATION_AUDIO, OAC_APPLICATION_RESTRICTED_LOWDELAY};
 
 void *malloc_hook(__attribute__((unused)) size_t size,
-                  __attribute__((unused)) const void *caller)
-{
-   return 0;
+                  __attribute__((unused)) const void *caller) {
+    return 0;
 }
 #endif
 
 oac_int32 *null_int_ptr = (oac_int32 *)NULL;
 oac_uint32 *null_uint_ptr = (oac_uint32 *)NULL;
 
-static const oac_int32 oac_rates[5] = {48000,24000,16000,12000,8000};
+static const oac_int32 oac_rates[5] = {48000, 24000, 16000, 12000, 8000};
 
-oac_int32 test_dec_api(void)
-{
-   oac_uint32 dec_final_range;
-   OacDecoder *dec;
-   OacDecoder *dec2;
-   oac_int32 i,j,cfgs;
-   unsigned char packet[1276];
+oac_int32 test_dec_api(void) {
+    oac_uint32 dec_final_range;
+    OacDecoder *dec;
+    OacDecoder *dec2;
+    oac_int32 i, j, cfgs;
+    unsigned char packet[1276];
 #ifndef DISABLE_FLOAT_API
-   float fbuf[960*2];
+    float fbuf[960*2];
 #endif
-   short sbuf[960*2];
-   int c,err;
-
-   cfgs=0;
-   /*First test invalid configurations which should fail*/
-   fprintf(stdout,"\n  Decoder basic API tests\n");
-   fprintf(stdout,"  ---------------------------------------------------\n");
-   for(c=0;c<4;c++)
-   {
-      i=oac_decoder_get_size(c);
-      if(((c==1||c==2)&&(i<=2048||i>1<<18))||((c!=1&&c!=2)&&i!=0))test_failed();
-      fprintf(stdout,"    oac_decoder_get_size(%d)=%d ...............%s OK.\n",c,i,i>0?"":"....");
-      cfgs++;
-   }
-
-   /*Test with unsupported sample rates*/
-   for(c=0;c<4;c++)
-   {
-      for(i=-7;i<=96000;i++)
-      {
-         int fs;
-         if((i==8000||i==12000||i==16000||i==24000||i==48000
+    short sbuf[960*2];
+    int c, err;
+
+    cfgs = 0;
+    /*First test invalid configurations which should fail*/
+    fprintf(stdout, "\n  Decoder basic API tests\n");
+    fprintf(stdout, "  ---------------------------------------------------\n");
+    for (c = 0; c < 4; c++) {
+        i = oac_decoder_get_size(c);
+        if (((c == 1 || c == 2) && (i <= 2048 || i > 1<<18)) || ((c != 1 && c != 2) && i != 0)) test_failed();
+        fprintf(stdout, "    oac_decoder_get_size(%d)=%d ...............%s OK.\n", c, i, i > 0?"":"....");
+        cfgs++;
+    }
+
+    /*Test with unsupported sample rates*/
+    for (c = 0; c < 4; c++) {
+        for (i = -7; i <= 96000; i++) {
+            int fs;
+            if ((i == 8000 || i == 12000 || i == 16000 || i == 24000 || i == 48000
 #ifdef ENABLE_QEXT
-               ||i==96000
+                 || i == 96000
 #endif
-               )&&(c==1||c==2))continue;
-         switch(i)
-         {
-           case(-5):fs=-8000;break;
-           case(-6):fs=INT32_MAX;break;
-           case(-7):fs=INT32_MIN;break;
-           default:fs=i;
-         }
-         err = OAC_OK;
-         VG_UNDEF(&err,sizeof(err));
-         dec = oac_decoder_create(fs, c, &err);
-         if(err!=OAC_BAD_ARG || dec!=NULL)test_failed();
-         cfgs++;
-         dec = oac_decoder_create(fs, c, 0);
-         if(dec!=NULL)test_failed();
-         cfgs++;
-         dec=(OacDecoder*)malloc(oac_decoder_get_size(2));
-         if(dec==NULL)test_failed();
-         err = oac_decoder_init(dec,fs,c);
-         if(err!=OAC_BAD_ARG)test_failed();
-         cfgs++;
-         free(dec);
-      }
-   }
-
-   VG_UNDEF(&err,sizeof(err));
-   dec = oac_decoder_create(48000, 2, &err);
-   if(err!=OAC_OK || dec==NULL)test_failed();
-   VG_CHECK(dec,oac_decoder_get_size(2));
-   cfgs++;
-
-   fprintf(stdout,"    oac_decoder_create() ........................ OK.\n");
-   fprintf(stdout,"    oac_decoder_init() .......................... OK.\n");
-
-   err=oac_decoder_ctl(dec, OAC_GET_FINAL_RANGE(null_uint_ptr));
-   if(err != OAC_BAD_ARG)test_failed();
-   VG_UNDEF(&dec_final_range,sizeof(dec_final_range));
-   err=oac_decoder_ctl(dec, OAC_GET_FINAL_RANGE(&dec_final_range));
-   if(err!=OAC_OK)test_failed();
-   VG_CHECK(&dec_final_range,sizeof(dec_final_range));
-   fprintf(stdout,"    OAC_GET_FINAL_RANGE ......................... OK.\n");
-   cfgs++;
-
-   err=oac_decoder_ctl(dec,OAC_UNIMPLEMENTED);
-   if(err!=OAC_UNIMPLEMENTED)test_failed();
-   fprintf(stdout,"    OAC_UNIMPLEMENTED ........................... OK.\n");
-   cfgs++;
-
-   err=oac_decoder_ctl(dec, OAC_GET_BANDWIDTH(null_int_ptr));
-   if(err != OAC_BAD_ARG)test_failed();
-   VG_UNDEF(&i,sizeof(i));
-   err=oac_decoder_ctl(dec, OAC_GET_BANDWIDTH(&i));
-   if(err != OAC_OK || i!=0)test_failed();
-   fprintf(stdout,"    OAC_GET_BANDWIDTH ........................... OK.\n");
-   cfgs++;
-
-   err=oac_decoder_ctl(dec, OAC_GET_SAMPLE_RATE(null_int_ptr));
-   if(err != OAC_BAD_ARG)test_failed();
-   VG_UNDEF(&i,sizeof(i));
-   err=oac_decoder_ctl(dec, OAC_GET_SAMPLE_RATE(&i));
-   if(err != OAC_OK || i!=48000)test_failed();
-   fprintf(stdout,"    OAC_GET_SAMPLE_RATE ......................... OK.\n");
-   cfgs++;
-
-   /*GET_PITCH has different execution paths depending on the previously decoded frame.*/
-   err=oac_decoder_ctl(dec, OAC_GET_PITCH(null_int_ptr));
-   if(err!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   VG_UNDEF(&i,sizeof(i));
-   err=oac_decoder_ctl(dec, OAC_GET_PITCH(&i));
-   if(err != OAC_OK || i>0 || i<-1)test_failed();
-   cfgs++;
-   VG_UNDEF(packet,sizeof(packet));
-   packet[0]=63<<2;packet[1]=packet[2]=0;
-   if(oac_decode(dec, packet, 3, sbuf, 960, 0)!=960)test_failed();
-   cfgs++;
-   VG_UNDEF(&i,sizeof(i));
-   err=oac_decoder_ctl(dec, OAC_GET_PITCH(&i));
-   if(err != OAC_OK || i>0 || i<-1)test_failed();
-   cfgs++;
-   packet[0]=1;
-   if(oac_decode(dec, packet, 1, sbuf, 960, 0)!=960)test_failed();
-   cfgs++;
-   VG_UNDEF(&i,sizeof(i));
-   err=oac_decoder_ctl(dec, OAC_GET_PITCH(&i));
-   if(err != OAC_OK || i>0 || i<-1)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OAC_GET_PITCH ............................... OK.\n");
-
-   err=oac_decoder_ctl(dec, OAC_GET_LAST_PACKET_DURATION(null_int_ptr));
-   if(err != OAC_BAD_ARG)test_failed();
-   VG_UNDEF(&i,sizeof(i));
-   err=oac_decoder_ctl(dec, OAC_GET_LAST_PACKET_DURATION(&i));
-   if(err != OAC_OK || i!=960)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OAC_GET_LAST_PACKET_DURATION ................ OK.\n");
-
-   VG_UNDEF(&i,sizeof(i));
-   err=oac_decoder_ctl(dec, OAC_GET_GAIN(&i));
-   VG_CHECK(&i,sizeof(i));
-   if(err != OAC_OK || i!=0)test_failed();
-   cfgs++;
-   err=oac_decoder_ctl(dec, OAC_GET_GAIN(null_int_ptr));
-   if(err != OAC_BAD_ARG)test_failed();
-   cfgs++;
-   err=oac_decoder_ctl(dec, OAC_SET_GAIN(-32769));
-   if(err != OAC_BAD_ARG)test_failed();
-   cfgs++;
-   err=oac_decoder_ctl(dec, OAC_SET_GAIN(32768));
-   if(err != OAC_BAD_ARG)test_failed();
-   cfgs++;
-   err=oac_decoder_ctl(dec, OAC_SET_GAIN(-15));
-   if(err != OAC_OK)test_failed();
-   cfgs++;
-   VG_UNDEF(&i,sizeof(i));
-   err=oac_decoder_ctl(dec, OAC_GET_GAIN(&i));
-   VG_CHECK(&i,sizeof(i));
-   if(err != OAC_OK || i!=-15)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OAC_SET_GAIN ................................ OK.\n");
-   fprintf(stdout,"    OAC_GET_GAIN ................................ OK.\n");
-
-   /*Reset the decoder*/
-   dec2=(OacDecoder*)malloc(oac_decoder_get_size(2));
-   memcpy(dec2,dec,oac_decoder_get_size(2));
-   if(oac_decoder_ctl(dec, OAC_RESET_STATE)!=OAC_OK)test_failed();
-   if(memcmp(dec2,dec,oac_decoder_get_size(2))==0)test_failed();
-   free(dec2);
-   fprintf(stdout,"    OAC_RESET_STATE ............................. OK.\n");
-   cfgs++;
-
-   VG_UNDEF(packet,sizeof(packet));
-   packet[0]=0;
-   if(oac_decoder_get_nb_samples(dec,packet,1)!=480)test_failed();
-   if(oac_packet_get_nb_samples(packet,1,48000)!=480)test_failed();
-   if(oac_packet_get_nb_samples(packet,1,96000)!=960)test_failed();
-   if(oac_packet_get_nb_samples(packet,1,32000)!=320)test_failed();
-   if(oac_packet_get_nb_samples(packet,1,8000)!=80)test_failed();
-   packet[0]=3;
-   if(oac_packet_get_nb_samples(packet,1,24000)!=OAC_INVALID_PACKET)test_failed();
-   packet[0]=(63<<2)|3;
-   packet[1]=63;
-   if(oac_packet_get_nb_samples(packet,0,24000)!=OAC_BAD_ARG)test_failed();
-   if(oac_packet_get_nb_samples(packet,2,48000)!=OAC_INVALID_PACKET)test_failed();
-   if(oac_decoder_get_nb_samples(dec,packet,2)!=OAC_INVALID_PACKET)test_failed();
-   fprintf(stdout,"    oac_{packet,decoder}_get_nb_samples() ....... OK.\n");
-   cfgs+=9;
-
-   if(OAC_BAD_ARG!=oac_packet_get_nb_frames(packet,0))test_failed();
-   for(i=0;i<256;i++) {
-     int l1res[4]={1,2,2,OAC_INVALID_PACKET};
-     packet[0]=i;
-     if(l1res[packet[0]&3]!=oac_packet_get_nb_frames(packet,1))test_failed();
-     cfgs++;
-     for(j=0;j<256;j++) {
-       packet[1]=j;
-       if(((packet[0]&3)!=3?l1res[packet[0]&3]:packet[1]&63)!=oac_packet_get_nb_frames(packet,2))test_failed();
-       cfgs++;
-     }
-   }
-   fprintf(stdout,"    oac_packet_get_nb_frames() .................. OK.\n");
-
-   for(i=0;i<256;i++) {
-     int bw;
-     packet[0]=i;
-     bw=packet[0]>>4;
-     bw=OAC_BANDWIDTH_NARROWBAND+(((((bw&7)*9)&(63-(bw&8)))+2+12*((bw&8)!=0))>>4);
-     if(bw!=oac_packet_get_bandwidth(packet))test_failed();
-     cfgs++;
-   }
-   fprintf(stdout,"    oac_packet_get_bandwidth() .................. OK.\n");
-
-   for(i=0;i<256;i++) {
-     int fp3s,rate;
-     packet[0]=i;
-     fp3s=packet[0]>>3;
-     fp3s=((((3-(fp3s&3))*13&119)+9)>>2)*((fp3s>13)*(3-((fp3s&3)==3))+1)*25;
-     for(rate=0;rate<5;rate++) {
-       if((oac_rates[rate]*3/fp3s)!=oac_packet_get_samples_per_frame(packet,oac_rates[rate]))test_failed();
-       cfgs++;
-     }
-   }
-   fprintf(stdout,"    oac_packet_get_samples_per_frame() .......... OK.\n");
-
-   packet[0]=(63<<2)+3;
-   packet[1]=49;
-   for(j=2;j<51;j++)packet[j]=0;
-   VG_UNDEF(sbuf,sizeof(sbuf));
-   if(oac_decode(dec, packet, 51, sbuf, 960, 0)!=OAC_INVALID_PACKET)test_failed();
-   cfgs++;
-   packet[0]=(63<<2);
-   packet[1]=packet[2]=0;
-   if(oac_decode(dec, packet, -1, sbuf, 960, 0)!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   if(oac_decode(dec, packet, 3, sbuf, 60, 0)!=OAC_BUFFER_TOO_SMALL)test_failed();
-   cfgs++;
-   if(oac_decode(dec, packet, 3, sbuf, 480, 0)!=OAC_BUFFER_TOO_SMALL)test_failed();
-   cfgs++;
-   if(oac_decode(dec, packet, 3, sbuf, 960, 0)!=960)test_failed();
-   cfgs++;
-   fprintf(stdout,"    oac_decode() ................................ OK.\n");
+                 ) && (c == 1 || c == 2)) continue;
+            switch (i) {
+                case (-5): fs = -8000; break;
+                case (-6): fs = INT32_MAX; break;
+                case (-7): fs = INT32_MIN; break;
+                default: fs = i;
+            }
+            err = OAC_OK;
+            VG_UNDEF(&err, sizeof(err));
+            dec = oac_decoder_create(fs, c, &err);
+            if (err != OAC_BAD_ARG || dec != NULL) test_failed();
+            cfgs++;
+            dec = oac_decoder_create(fs, c, 0);
+            if (dec != NULL) test_failed();
+            cfgs++;
+            dec = (OacDecoder*)malloc(oac_decoder_get_size(2));
+            if (dec == NULL) test_failed();
+            err = oac_decoder_init(dec, fs, c);
+            if (err != OAC_BAD_ARG) test_failed();
+            cfgs++;
+            free(dec);
+        }
+    }
+
+    VG_UNDEF(&err, sizeof(err));
+    dec = oac_decoder_create(48000, 2, &err);
+    if (err != OAC_OK || dec == NULL) test_failed();
+    VG_CHECK(dec, oac_decoder_get_size(2));
+    cfgs++;
+
+    fprintf(stdout, "    oac_decoder_create() ........................ OK.\n");
+    fprintf(stdout, "    oac_decoder_init() .......................... OK.\n");
+
+    err = oac_decoder_ctl(dec, OAC_GET_FINAL_RANGE(null_uint_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    VG_UNDEF(&dec_final_range, sizeof(dec_final_range));
+    err = oac_decoder_ctl(dec, OAC_GET_FINAL_RANGE(&dec_final_range));
+    if (err != OAC_OK) test_failed();
+    VG_CHECK(&dec_final_range, sizeof(dec_final_range));
+    fprintf(stdout, "    OAC_GET_FINAL_RANGE ......................... OK.\n");
+    cfgs++;
+
+    err = oac_decoder_ctl(dec, OAC_UNIMPLEMENTED);
+    if (err != OAC_UNIMPLEMENTED) test_failed();
+    fprintf(stdout, "    OAC_UNIMPLEMENTED ........................... OK.\n");
+    cfgs++;
+
+    err = oac_decoder_ctl(dec, OAC_GET_BANDWIDTH(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    VG_UNDEF(&i, sizeof(i));
+    err = oac_decoder_ctl(dec, OAC_GET_BANDWIDTH(&i));
+    if (err != OAC_OK || i != 0) test_failed();
+    fprintf(stdout, "    OAC_GET_BANDWIDTH ........................... OK.\n");
+    cfgs++;
+
+    err = oac_decoder_ctl(dec, OAC_GET_SAMPLE_RATE(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    VG_UNDEF(&i, sizeof(i));
+    err = oac_decoder_ctl(dec, OAC_GET_SAMPLE_RATE(&i));
+    if (err != OAC_OK || i != 48000) test_failed();
+    fprintf(stdout, "    OAC_GET_SAMPLE_RATE ......................... OK.\n");
+    cfgs++;
+
+    /*GET_PITCH has different execution paths depending on the previously decoded frame.*/
+    err = oac_decoder_ctl(dec, OAC_GET_PITCH(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    VG_UNDEF(&i, sizeof(i));
+    err = oac_decoder_ctl(dec, OAC_GET_PITCH(&i));
+    if (err != OAC_OK || i > 0 || i < -1) test_failed();
+    cfgs++;
+    VG_UNDEF(packet, sizeof(packet));
+    packet[0] = 63<<2; packet[1] = packet[2] = 0;
+    if (oac_decode(dec, packet, 3, sbuf, 960, 0) != 960) test_failed();
+    cfgs++;
+    VG_UNDEF(&i, sizeof(i));
+    err = oac_decoder_ctl(dec, OAC_GET_PITCH(&i));
+    if (err != OAC_OK || i > 0 || i < -1) test_failed();
+    cfgs++;
+    packet[0] = 1;
+    if (oac_decode(dec, packet, 1, sbuf, 960, 0) != 960) test_failed();
+    cfgs++;
+    VG_UNDEF(&i, sizeof(i));
+    err = oac_decoder_ctl(dec, OAC_GET_PITCH(&i));
+    if (err != OAC_OK || i > 0 || i < -1) test_failed();
+    cfgs++;
+    fprintf(stdout, "    OAC_GET_PITCH ............................... OK.\n");
+
+    err = oac_decoder_ctl(dec, OAC_GET_LAST_PACKET_DURATION(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    VG_UNDEF(&i, sizeof(i));
+    err = oac_decoder_ctl(dec, OAC_GET_LAST_PACKET_DURATION(&i));
+    if (err != OAC_OK || i != 960) test_failed();
+    cfgs++;
+    fprintf(stdout, "    OAC_GET_LAST_PACKET_DURATION ................ OK.\n");
+
+    VG_UNDEF(&i, sizeof(i));
+    err = oac_decoder_ctl(dec, OAC_GET_GAIN(&i));
+    VG_CHECK(&i, sizeof(i));
+    if (err != OAC_OK || i != 0) test_failed();
+    cfgs++;
+    err = oac_decoder_ctl(dec, OAC_GET_GAIN(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    err = oac_decoder_ctl(dec, OAC_SET_GAIN(-32769));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    err = oac_decoder_ctl(dec, OAC_SET_GAIN(32768));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    err = oac_decoder_ctl(dec, OAC_SET_GAIN(-15));
+    if (err != OAC_OK) test_failed();
+    cfgs++;
+    VG_UNDEF(&i, sizeof(i));
+    err = oac_decoder_ctl(dec, OAC_GET_GAIN(&i));
+    VG_CHECK(&i, sizeof(i));
+    if (err != OAC_OK || i != -15) test_failed();
+    cfgs++;
+    fprintf(stdout, "    OAC_SET_GAIN ................................ OK.\n");
+    fprintf(stdout, "    OAC_GET_GAIN ................................ OK.\n");
+
+    /*Reset the decoder*/
+    dec2 = (OacDecoder*)malloc(oac_decoder_get_size(2));
+    memcpy(dec2, dec, oac_decoder_get_size(2));
+    if (oac_decoder_ctl(dec, OAC_RESET_STATE) != OAC_OK) test_failed();
+    if (memcmp(dec2, dec, oac_decoder_get_size(2)) == 0) test_failed();
+    free(dec2);
+    fprintf(stdout, "    OAC_RESET_STATE ............................. OK.\n");
+    cfgs++;
+
+    VG_UNDEF(packet, sizeof(packet));
+    packet[0] = 0;
+    if (oac_decoder_get_nb_samples(dec, packet, 1) != 480) test_failed();
+    if (oac_packet_get_nb_samples(packet, 1, 48000) != 480) test_failed();
+    if (oac_packet_get_nb_samples(packet, 1, 96000) != 960) test_failed();
+    if (oac_packet_get_nb_samples(packet, 1, 32000) != 320) test_failed();
+    if (oac_packet_get_nb_samples(packet, 1, 8000) != 80) test_failed();
+    packet[0] = 3;
+    if (oac_packet_get_nb_samples(packet, 1, 24000) != OAC_INVALID_PACKET) test_failed();
+    packet[0] = (63<<2)|3;
+    packet[1] = 63;
+    if (oac_packet_get_nb_samples(packet, 0, 24000) != OAC_BAD_ARG) test_failed();
+    if (oac_packet_get_nb_samples(packet, 2, 48000) != OAC_INVALID_PACKET) test_failed();
+    if (oac_decoder_get_nb_samples(dec, packet, 2) != OAC_INVALID_PACKET) test_failed();
+    fprintf(stdout, "    oac_{packet,decoder}_get_nb_samples() ....... OK.\n");
+    cfgs += 9;
+
+    if (OAC_BAD_ARG != oac_packet_get_nb_frames(packet, 0)) test_failed();
+    for (i = 0; i < 256; i++) {
+        int l1res[4] = {1, 2, 2, OAC_INVALID_PACKET};
+        packet[0] = i;
+        if (l1res[packet[0]&3] != oac_packet_get_nb_frames(packet, 1)) test_failed();
+        cfgs++;
+        for (j = 0; j < 256; j++) {
+            packet[1] = j;
+            if (((packet[0]&3) != 3?l1res[packet[0]&3]:packet[1]&63) != oac_packet_get_nb_frames(packet,
+            2)) test_failed();
+            cfgs++;
+        }
+    }
+    fprintf(stdout, "    oac_packet_get_nb_frames() .................. OK.\n");
+
+    for (i = 0; i < 256; i++) {
+        int bw;
+        packet[0] = i;
+        bw = packet[0]>>4;
+        bw = OAC_BANDWIDTH_NARROWBAND + (((((bw&7)*9)&(63 - (bw&8))) + 2 + 12*((bw&8) != 0))>>4);
+        if (bw != oac_packet_get_bandwidth(packet)) test_failed();
+        cfgs++;
+    }
+    fprintf(stdout, "    oac_packet_get_bandwidth() .................. OK.\n");
+
+    for (i = 0; i < 256; i++) {
+        int fp3s, rate;
+        packet[0] = i;
+        fp3s = packet[0]>>3;
+        fp3s = ((((3 - (fp3s&3))*13&119) + 9)>>2)*((fp3s > 13)*(3 - ((fp3s&3) == 3)) + 1)*25;
+        for (rate = 0; rate < 5; rate++) {
+            if ((oac_rates[rate]*3/fp3s) != oac_packet_get_samples_per_frame(packet, oac_rates[rate])) test_failed();
+            cfgs++;
+        }
+    }
+    fprintf(stdout, "    oac_packet_get_samples_per_frame() .......... OK.\n");
+
+    packet[0] = (63<<2) + 3;
+    packet[1] = 49;
+    for (j = 2; j < 51; j++) packet[j] = 0;
+    VG_UNDEF(sbuf, sizeof(sbuf));
+    if (oac_decode(dec, packet, 51, sbuf, 960, 0) != OAC_INVALID_PACKET) test_failed();
+    cfgs++;
+    packet[0] = (63<<2);
+    packet[1] = packet[2] = 0;
+    if (oac_decode(dec, packet, -1, sbuf, 960, 0) != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    if (oac_decode(dec, packet, 3, sbuf, 60, 0) != OAC_BUFFER_TOO_SMALL) test_failed();
+    cfgs++;
+    if (oac_decode(dec, packet, 3, sbuf, 480, 0) != OAC_BUFFER_TOO_SMALL) test_failed();
+    cfgs++;
+    if (oac_decode(dec, packet, 3, sbuf, 960, 0) != 960) test_failed();
+    cfgs++;
+    fprintf(stdout, "    oac_decode() ................................ OK.\n");
 #ifndef DISABLE_FLOAT_API
-   VG_UNDEF(fbuf,sizeof(fbuf));
-   if(oac_decode_float(dec, packet, 3, fbuf, 960, 0)!=960)test_failed();
-   cfgs++;
-   fprintf(stdout,"    oac_decode_float() .......................... OK.\n");
+    VG_UNDEF(fbuf, sizeof(fbuf));
+    if (oac_decode_float(dec, packet, 3, fbuf, 960, 0) != 960) test_failed();
+    cfgs++;
+    fprintf(stdout, "    oac_decode_float() .......................... OK.\n");
 #endif
 
 #if 0
-   /*These tests are disabled because the library crashes with null states*/
-   if(oac_decoder_ctl(0,OAC_RESET_STATE)         !=OAC_INVALID_STATE)test_failed();
-   if(oac_decoder_init(0,48000,1)                 !=OAC_INVALID_STATE)test_failed();
-   if(oac_decode(0,packet,1,outbuf,2880,0)        !=OAC_INVALID_STATE)test_failed();
-   if(oac_decode_float(0,packet,1,0,2880,0)       !=OAC_INVALID_STATE)test_failed();
-   if(oac_decoder_get_nb_samples(0,packet,1)      !=OAC_INVALID_STATE)test_failed();
-   if(oac_packet_get_nb_frames(NULL,1)            !=OAC_BAD_ARG)test_failed();
-   if(oac_packet_get_bandwidth(NULL)              !=OAC_BAD_ARG)test_failed();
-   if(oac_packet_get_samples_per_frame(NULL,48000)!=OAC_BAD_ARG)test_failed();
+    /*These tests are disabled because the library crashes with null states*/
+    if (oac_decoder_ctl(0, OAC_RESET_STATE)         != OAC_INVALID_STATE)test_failed();
+    if (oac_decoder_init(0, 48000, 1)                 != OAC_INVALID_STATE)test_failed();
+    if (oac_decode(0, packet, 1, outbuf, 2880, 0)        != OAC_INVALID_STATE)test_failed();
+    if (oac_decode_float(0, packet, 1, 0, 2880, 0)       != OAC_INVALID_STATE)test_failed();
+    if (oac_decoder_get_nb_samples(0, packet, 1)      != OAC_INVALID_STATE)test_failed();
+    if (oac_packet_get_nb_frames(NULL, 1)            != OAC_BAD_ARG)test_failed();
+    if (oac_packet_get_bandwidth(NULL)              != OAC_BAD_ARG)test_failed();
+    if (oac_packet_get_samples_per_frame(NULL, 48000) != OAC_BAD_ARG) test_failed();
 #endif
-   oac_decoder_destroy(dec);
-   cfgs++;
-   fprintf(stdout,"                   All decoder interface tests passed\n");
-   fprintf(stdout,"                             (%6d API invocations)\n",cfgs);
-   return cfgs;
+    oac_decoder_destroy(dec);
+    cfgs++;
+    fprintf(stdout, "                   All decoder interface tests passed\n");
+    fprintf(stdout, "                             (%6d API invocations)\n", cfgs);
+    return cfgs;
 }
 
-oac_int32 test_msdec_api(void)
-{
-   oac_uint32 dec_final_range;
-   OacMSDecoder *dec;
-   OacDecoder *streamdec;
-   oac_int32 i,j,cfgs;
-   unsigned char packet[1276];
-   unsigned char mapping[256];
+oac_int32 test_msdec_api(void) {
+    oac_uint32 dec_final_range;
+    OacMSDecoder *dec;
+    OacDecoder *streamdec;
+    oac_int32 i, j, cfgs;
+    unsigned char packet[1276];
+    unsigned char mapping[256];
 #ifndef DISABLE_FLOAT_API
-   float fbuf[960*2];
+    float fbuf[960*2];
 #endif
-   short sbuf[960*2];
-   int a,b,c,err;
-
-   mapping[0]=0;
-   mapping[1]=1;
-   for(i=2;i<256;i++)VG_UNDEF(&mapping[i],sizeof(unsigned char));
-
-   cfgs=0;
-   /*First test invalid configurations which should fail*/
-   fprintf(stdout,"\n  Multistream decoder basic API tests\n");
-   fprintf(stdout,"  ---------------------------------------------------\n");
-   for(a=-1;a<4;a++)
-   {
-      for(b=-1;b<4;b++)
-      {
-         i=oac_multistream_decoder_get_size(a,b);
-         if(((a>0&&b<=a&&b>=0)&&(i<=2048||i>((1<<18)*a)))||((a<1||b>a||b<0)&&i!=0))test_failed();
-         fprintf(stdout,"    oac_multistream_decoder_get_size(%2d,%2d)=%d %sOK.\n",a,b,i,i>0?"":"... ");
-         cfgs++;
-      }
-   }
-
-   /*Test with unsupported sample rates*/
-   for(c=1;c<3;c++)
-   {
-      for(i=-7;i<=96000;i++)
-      {
-         int fs;
-         if((i==8000||i==12000||i==16000||i==24000||i==48000
+    short sbuf[960*2];
+    int a, b, c, err;
+
+    mapping[0] = 0;
+    mapping[1] = 1;
+    for (i = 2; i < 256; i++) VG_UNDEF(&mapping[i], sizeof(unsigned char));
+
+    cfgs = 0;
+    /*First test invalid configurations which should fail*/
+    fprintf(stdout, "\n  Multistream decoder basic API tests\n");
+    fprintf(stdout, "  ---------------------------------------------------\n");
+    for (a = -1; a < 4; a++) {
+        for (b = -1; b < 4; b++) {
+            i = oac_multistream_decoder_get_size(a, b);
+            if (((a > 0 && b <= a && b >= 0) && (i <= 2048 || i > ((1<<18)*a)))
+                || ((a < 1 || b > a || b < 0) && i != 0)) test_failed();
+            fprintf(stdout, "    oac_multistream_decoder_get_size(%2d,%2d)=%d %sOK.\n", a, b, i, i > 0?"":"... ");
+            cfgs++;
+        }
+    }
+
+    /*Test with unsupported sample rates*/
+    for (c = 1; c < 3; c++) {
+        for (i = -7; i <= 96000; i++) {
+            int fs;
+            if ((i == 8000 || i == 12000 || i == 16000 || i == 24000 || i == 48000
 #ifdef ENABLE_QEXT
-               ||i==96000
+                 || i == 96000
 #endif
-               )&&(c==1||c==2))continue;
-         switch(i)
-         {
-           case(-5):fs=-8000;break;
-           case(-6):fs=INT32_MAX;break;
-           case(-7):fs=INT32_MIN;break;
-           default:fs=i;
-         }
-         err = OAC_OK;
-         VG_UNDEF(&err,sizeof(err));
-         dec = oac_multistream_decoder_create(fs, c, 1, c-1, mapping, &err);
-         if(err!=OAC_BAD_ARG || dec!=NULL)test_failed();
-         cfgs++;
-         dec = oac_multistream_decoder_create(fs, c, 1, c-1, mapping, 0);
-         if(dec!=NULL)test_failed();
-         cfgs++;
-         dec=(OacMSDecoder*)malloc(oac_multistream_decoder_get_size(1,1));
-         if(dec==NULL)test_failed();
-         err = oac_multistream_decoder_init(dec,fs,c,1,c-1, mapping);
-         if(err!=OAC_BAD_ARG)test_failed();
-         cfgs++;
-         free(dec);
-      }
-   }
-
-   for(c=0;c<2;c++)
-   {
-      int *ret_err;
-      ret_err = c?0:&err;
-
-      mapping[0]=0;
-      mapping[1]=1;
-      for(i=2;i<256;i++)VG_UNDEF(&mapping[i],sizeof(unsigned char));
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      dec = oac_multistream_decoder_create(48000, 2, 1, 0, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OAC_BAD_ARG) || dec!=NULL)test_failed();
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      mapping[0]=mapping[1]=0;
-      dec = oac_multistream_decoder_create(48000, 2, 1, 0, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OAC_OK) || dec==NULL)test_failed();
-      cfgs++;
-      oac_multistream_decoder_destroy(dec);
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      dec = oac_multistream_decoder_create(48000, 1, 4, 1, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OAC_OK) || dec==NULL)test_failed();
-      cfgs++;
-
-      err = oac_multistream_decoder_init(dec,48000, 1, 0, 0, mapping);
-      if(err!=OAC_BAD_ARG)test_failed();
-      cfgs++;
-
-      err = oac_multistream_decoder_init(dec,48000, 1, 1, -1, mapping);
-      if(err!=OAC_BAD_ARG)test_failed();
-      cfgs++;
-
-      oac_multistream_decoder_destroy(dec);
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      dec = oac_multistream_decoder_create(48000, 2, 1, 1, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OAC_OK) || dec==NULL)test_failed();
-      cfgs++;
-      oac_multistream_decoder_destroy(dec);
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      dec = oac_multistream_decoder_create(48000, 255, 255, 1, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OAC_BAD_ARG) || dec!=NULL)test_failed();
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      dec = oac_multistream_decoder_create(48000, -1, 1, 1, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OAC_BAD_ARG) || dec!=NULL)test_failed();
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      dec = oac_multistream_decoder_create(48000, 0, 1, 1, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OAC_BAD_ARG) || dec!=NULL)test_failed();
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      dec = oac_multistream_decoder_create(48000, 1, -1, 2, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OAC_BAD_ARG) || dec!=NULL)test_failed();
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      dec = oac_multistream_decoder_create(48000, 1, -1, -1, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OAC_BAD_ARG) || dec!=NULL)test_failed();
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      dec = oac_multistream_decoder_create(48000, 256, 255, 1, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OAC_BAD_ARG) || dec!=NULL)test_failed();
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      dec = oac_multistream_decoder_create(48000, 256, 255, 0, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OAC_BAD_ARG) || dec!=NULL)test_failed();
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      mapping[0]=255;
-      mapping[1]=1;
-      mapping[2]=2;
-      dec = oac_multistream_decoder_create(48000, 3, 2, 0, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OAC_BAD_ARG) || dec!=NULL)test_failed();
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      mapping[0]=0;
-      mapping[1]=0;
-      mapping[2]=0;
-      dec = oac_multistream_decoder_create(48000, 3, 2, 1, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OAC_OK) || dec==NULL)test_failed();
-      cfgs++;
-      oac_multistream_decoder_destroy(dec);
-      cfgs++;
-
-      VG_UNDEF(ret_err,sizeof(*ret_err));
-      mapping[0]=0;
-      mapping[1]=255;
-      mapping[2]=1;
-      mapping[3]=2;
-      mapping[4]=3;
-      dec = oac_multistream_decoder_create(48001, 5, 4, 1, mapping, ret_err);
-      if(ret_err){VG_CHECK(ret_err,sizeof(*ret_err));}
-      if((ret_err && *ret_err!=OAC_BAD_ARG) || dec!=NULL)test_failed();
-      cfgs++;
-   }
-
-   VG_UNDEF(&err,sizeof(err));
-   mapping[0]=0;
-   mapping[1]=255;
-   mapping[2]=1;
-   mapping[3]=2;
-   dec = oac_multistream_decoder_create(48000, 4, 2, 1, mapping, &err);
-   VG_CHECK(&err,sizeof(err));
-   if(err!=OAC_OK || dec==NULL)test_failed();
-   cfgs++;
+                 ) && (c == 1 || c == 2)) continue;
+            switch (i) {
+                case (-5): fs = -8000; break;
+                case (-6): fs = INT32_MAX; break;
+                case (-7): fs = INT32_MIN; break;
+                default: fs = i;
+            }
+            err = OAC_OK;
+            VG_UNDEF(&err, sizeof(err));
+            dec = oac_multistream_decoder_create(fs, c, 1, c - 1, mapping, &err);
+            if (err != OAC_BAD_ARG || dec != NULL) test_failed();
+            cfgs++;
+            dec = oac_multistream_decoder_create(fs, c, 1, c - 1, mapping, 0);
+            if (dec != NULL) test_failed();
+            cfgs++;
+            dec = (OacMSDecoder*)malloc(oac_multistream_decoder_get_size(1, 1));
+            if (dec == NULL) test_failed();
+            err = oac_multistream_decoder_init(dec, fs, c, 1, c - 1, mapping);
+            if (err != OAC_BAD_ARG) test_failed();
+            cfgs++;
+            free(dec);
+        }
+    }
 
-   fprintf(stdout,"    oac_multistream_decoder_create() ............ OK.\n");
-   fprintf(stdout,"    oac_multistream_decoder_init() .............. OK.\n");
+    for (c = 0; c < 2; c++) {
+        int *ret_err;
+        ret_err = c?0:&err;
 
-   VG_UNDEF(&dec_final_range,sizeof(dec_final_range));
-   err=oac_multistream_decoder_ctl(dec, OAC_GET_FINAL_RANGE(&dec_final_range));
-   if(err!=OAC_OK)test_failed();
-   VG_CHECK(&dec_final_range,sizeof(dec_final_range));
-   fprintf(stdout,"    OAC_GET_FINAL_RANGE ......................... OK.\n");
-   cfgs++;
+        mapping[0] = 0;
+        mapping[1] = 1;
+        for (i = 2; i < 256; i++) VG_UNDEF(&mapping[i], sizeof(unsigned char));
 
-   streamdec=0;
-   VG_UNDEF(&streamdec,sizeof(streamdec));
-   err=oac_multistream_decoder_ctl(dec, OAC_MULTISTREAM_GET_DECODER_STATE(-1,&streamdec));
-   if(err!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   err=oac_multistream_decoder_ctl(dec, OAC_MULTISTREAM_GET_DECODER_STATE(1,&streamdec));
-   if(err!=OAC_OK||streamdec==NULL)test_failed();
-   VG_CHECK(streamdec,oac_decoder_get_size(1));
-   cfgs++;
-   err=oac_multistream_decoder_ctl(dec, OAC_MULTISTREAM_GET_DECODER_STATE(2,&streamdec));
-   if(err!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   err=oac_multistream_decoder_ctl(dec, OAC_MULTISTREAM_GET_DECODER_STATE(0,&streamdec));
-   if(err!=OAC_OK||streamdec==NULL)test_failed();
-   VG_CHECK(streamdec,oac_decoder_get_size(1));
-   fprintf(stdout,"    OAC_MULTISTREAM_GET_DECODER_STATE ........... OK.\n");
-   cfgs++;
+        VG_UNDEF(ret_err, sizeof(*ret_err));
+        dec = oac_multistream_decoder_create(48000, 2, 1, 0, mapping, ret_err);
+        if (ret_err) {
+            VG_CHECK(ret_err, sizeof(*ret_err));
+        }
+        if ((ret_err && *ret_err != OAC_BAD_ARG) || dec != NULL) test_failed();
+        cfgs++;
 
-   for(j=0;j<2;j++)
-   {
-      OacDecoder *od;
-      err=oac_multistream_decoder_ctl(dec,OAC_MULTISTREAM_GET_DECODER_STATE(j,&od));
-      if(err != OAC_OK)test_failed();
-      VG_UNDEF(&i,sizeof(i));
-      err=oac_decoder_ctl(od, OAC_GET_GAIN(&i));
-      VG_CHECK(&i,sizeof(i));
-      if(err != OAC_OK || i!=0)test_failed();
-      cfgs++;
-   }
-   err=oac_multistream_decoder_ctl(dec,OAC_SET_GAIN(15));
-   if(err!=OAC_OK)test_failed();
-   fprintf(stdout,"    OAC_SET_GAIN ................................ OK.\n");
-   for(j=0;j<2;j++)
-   {
-      OacDecoder *od;
-      err=oac_multistream_decoder_ctl(dec,OAC_MULTISTREAM_GET_DECODER_STATE(j,&od));
-      if(err != OAC_OK)test_failed();
-      VG_UNDEF(&i,sizeof(i));
-      err=oac_decoder_ctl(od, OAC_GET_GAIN(&i));
-      VG_CHECK(&i,sizeof(i));
-      if(err != OAC_OK || i!=15)test_failed();
-      cfgs++;
-   }
-   fprintf(stdout,"    OAC_GET_GAIN ................................ OK.\n");
-
-   VG_UNDEF(&i,sizeof(i));
-   err=oac_multistream_decoder_ctl(dec, OAC_GET_BANDWIDTH(&i));
-   if(err != OAC_OK || i!=0)test_failed();
-   fprintf(stdout,"    OAC_GET_BANDWIDTH ........................... OK.\n");
-   cfgs++;
+        VG_UNDEF(ret_err, sizeof(*ret_err));
+        mapping[0] = mapping[1] = 0;
+        dec = oac_multistream_decoder_create(48000, 2, 1, 0, mapping, ret_err);
+        if (ret_err) {
+            VG_CHECK(ret_err, sizeof(*ret_err));
+        }
+        if ((ret_err && *ret_err != OAC_OK) || dec == NULL) test_failed();
+        cfgs++;
+        oac_multistream_decoder_destroy(dec);
+        cfgs++;
 
-   err=oac_multistream_decoder_ctl(dec,OAC_UNIMPLEMENTED);
-   if(err!=OAC_UNIMPLEMENTED)test_failed();
-   fprintf(stdout,"    OAC_UNIMPLEMENTED ........................... OK.\n");
-   cfgs++;
+        VG_UNDEF(ret_err, sizeof(*ret_err));
+        dec = oac_multistream_decoder_create(48000, 1, 4, 1, mapping, ret_err);
+        if (ret_err) {
+            VG_CHECK(ret_err, sizeof(*ret_err));
+        }
+        if ((ret_err && *ret_err != OAC_OK) || dec == NULL) test_failed();
+        cfgs++;
 
-#if 0
-   /*Currently unimplemented for multistream*/
-   /*GET_PITCH has different execution paths depending on the previously decoded frame.*/
-   err=oac_multistream_decoder_ctl(dec, OAC_GET_PITCH(null_int_ptr));
-   if(err!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   VG_UNDEF(&i,sizeof(i));
-   err=oac_multistream_decoder_ctl(dec, OAC_GET_PITCH(&i));
-   if(err != OAC_OK || i>0 || i<-1)test_failed();
-   cfgs++;
-   VG_UNDEF(packet,sizeof(packet));
-   packet[0]=63<<2;packet[1]=packet[2]=0;
-   if(oac_multistream_decode(dec, packet, 3, sbuf, 960, 0)!=960)test_failed();
-   cfgs++;
-   VG_UNDEF(&i,sizeof(i));
-   err=oac_multistream_decoder_ctl(dec, OAC_GET_PITCH(&i));
-   if(err != OAC_OK || i>0 || i<-1)test_failed();
-   cfgs++;
-   packet[0]=1;
-   if(oac_multistream_decode(dec, packet, 1, sbuf, 960, 0)!=960)test_failed();
-   cfgs++;
-   VG_UNDEF(&i,sizeof(i));
-   err=oac_multistream_decoder_ctl(dec, OAC_GET_PITCH(&i));
-   if(err != OAC_OK || i>0 || i<-1)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OAC_GET_PITCH ............................... OK.\n");
-#endif
+        err = oac_multistream_decoder_init(dec, 48000, 1, 0, 0, mapping);
+        if (err != OAC_BAD_ARG) test_failed();
+        cfgs++;
 
-   /*Reset the decoder*/
-   if(oac_multistream_decoder_ctl(dec, OAC_RESET_STATE)!=OAC_OK)test_failed();
-   fprintf(stdout,"    OAC_RESET_STATE ............................. OK.\n");
-   cfgs++;
+        err = oac_multistream_decoder_init(dec, 48000, 1, 1, -1, mapping);
+        if (err != OAC_BAD_ARG) test_failed();
+        cfgs++;
 
-   oac_multistream_decoder_destroy(dec);
-   cfgs++;
-   VG_UNDEF(&err,sizeof(err));
-   dec = oac_multistream_decoder_create(48000, 2, 1, 1, mapping, &err);
-   if(err!=OAC_OK || dec==NULL)test_failed();
-   cfgs++;
+        oac_multistream_decoder_destroy(dec);
+        cfgs++;
 
-   packet[0]=(63<<2)+3;
-   packet[1]=49;
-   for(j=2;j<51;j++)packet[j]=0;
-   VG_UNDEF(sbuf,sizeof(sbuf));
-   if(oac_multistream_decode(dec, packet, 51, sbuf, 960, 0)!=OAC_INVALID_PACKET)test_failed();
-   cfgs++;
-   packet[0]=(63<<2);
-   packet[1]=packet[2]=0;
-   if(oac_multistream_decode(dec, packet, -1, sbuf, 960, 0)!=OAC_BAD_ARG){printf("%d\n",oac_multistream_decode(dec, packet, -1, sbuf, 960, 0));test_failed();}
-   cfgs++;
-   if(oac_multistream_decode(dec, packet, 3, sbuf, -960, 0)!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   if(oac_multistream_decode(dec, packet, 3, sbuf, 60, 0)!=OAC_BUFFER_TOO_SMALL)test_failed();
-   cfgs++;
-   if(oac_multistream_decode(dec, packet, 3, sbuf, 480, 0)!=OAC_BUFFER_TOO_SMALL)test_failed();
-   cfgs++;
-   if(oac_multistream_decode(dec, packet, 3, sbuf, 960, 0)!=960)test_failed();
-   cfgs++;
-   fprintf(stdout,"    oac_multistream_decode() .................... OK.\n");
+        VG_UNDEF(ret_err, sizeof(*ret_err));
+        dec = oac_multistream_decoder_create(48000, 2, 1, 1, mapping, ret_err);
+        if (ret_err) {
+            VG_CHECK(ret_err, sizeof(*ret_err));
+        }
+        if ((ret_err && *ret_err != OAC_OK) || dec == NULL) test_failed();
+        cfgs++;
+        oac_multistream_decoder_destroy(dec);
+        cfgs++;
+
+        VG_UNDEF(ret_err, sizeof(*ret_err));
+        dec = oac_multistream_decoder_create(48000, 255, 255, 1, mapping, ret_err);
+        if (ret_err) {
+            VG_CHECK(ret_err, sizeof(*ret_err));
+        }
+        if ((ret_err && *ret_err != OAC_BAD_ARG) || dec != NULL) test_failed();
+        cfgs++;
+
+        VG_UNDEF(ret_err, sizeof(*ret_err));
+        dec = oac_multistream_decoder_create(48000, -1, 1, 1, mapping, ret_err);
+        if (ret_err) {
+            VG_CHECK(ret_err, sizeof(*ret_err));
+        }
+        if ((ret_err && *ret_err != OAC_BAD_ARG) || dec != NULL) test_failed();
+        cfgs++;
+
+        VG_UNDEF(ret_err, sizeof(*ret_err));
+        dec = oac_multistream_decoder_create(48000, 0, 1, 1, mapping, ret_err);
+        if (ret_err) {
+            VG_CHECK(ret_err, sizeof(*ret_err));
+        }
+        if ((ret_err && *ret_err != OAC_BAD_ARG) || dec != NULL) test_failed();
+        cfgs++;
+
+        VG_UNDEF(ret_err, sizeof(*ret_err));
+        dec = oac_multistream_decoder_create(48000, 1, -1, 2, mapping, ret_err);
+        if (ret_err) {
+            VG_CHECK(ret_err, sizeof(*ret_err));
+        }
+        if ((ret_err && *ret_err != OAC_BAD_ARG) || dec != NULL) test_failed();
+        cfgs++;
+
+        VG_UNDEF(ret_err, sizeof(*ret_err));
+        dec = oac_multistream_decoder_create(48000, 1, -1, -1, mapping, ret_err);
+        if (ret_err) {
+            VG_CHECK(ret_err, sizeof(*ret_err));
+        }
+        if ((ret_err && *ret_err != OAC_BAD_ARG) || dec != NULL) test_failed();
+        cfgs++;
+
+        VG_UNDEF(ret_err, sizeof(*ret_err));
+        dec = oac_multistream_decoder_create(48000, 256, 255, 1, mapping, ret_err);
+        if (ret_err) {
+            VG_CHECK(ret_err, sizeof(*ret_err));
+        }
+        if ((ret_err && *ret_err != OAC_BAD_ARG) || dec != NULL) test_failed();
+        cfgs++;
+
+        VG_UNDEF(ret_err, sizeof(*ret_err));
+        dec = oac_multistream_decoder_create(48000, 256, 255, 0, mapping, ret_err);
+        if (ret_err) {
+            VG_CHECK(ret_err, sizeof(*ret_err));
+        }
+        if ((ret_err && *ret_err != OAC_BAD_ARG) || dec != NULL) test_failed();
+        cfgs++;
+
+        VG_UNDEF(ret_err, sizeof(*ret_err));
+        mapping[0] = 255;
+        mapping[1] = 1;
+        mapping[2] = 2;
+        dec = oac_multistream_decoder_create(48000, 3, 2, 0, mapping, ret_err);
+        if (ret_err) {
+            VG_CHECK(ret_err, sizeof(*ret_err));
+        }
+        if ((ret_err && *ret_err != OAC_BAD_ARG) || dec != NULL) test_failed();
+        cfgs++;
+
+        VG_UNDEF(ret_err, sizeof(*ret_err));
+        mapping[0] = 0;
+        mapping[1] = 0;
+        mapping[2] = 0;
+        dec = oac_multistream_decoder_create(48000, 3, 2, 1, mapping, ret_err);
+        if (ret_err) {
+            VG_CHECK(ret_err, sizeof(*ret_err));
+        }
+        if ((ret_err && *ret_err != OAC_OK) || dec == NULL) test_failed();
+        cfgs++;
+        oac_multistream_decoder_destroy(dec);
+        cfgs++;
+
+        VG_UNDEF(ret_err, sizeof(*ret_err));
+        mapping[0] = 0;
+        mapping[1] = 255;
+        mapping[2] = 1;
+        mapping[3] = 2;
+        mapping[4] = 3;
+        dec = oac_multistream_decoder_create(48001, 5, 4, 1, mapping, ret_err);
+        if (ret_err) {
+            VG_CHECK(ret_err, sizeof(*ret_err));
+        }
+        if ((ret_err && *ret_err != OAC_BAD_ARG) || dec != NULL) test_failed();
+        cfgs++;
+    }
+
+    VG_UNDEF(&err, sizeof(err));
+    mapping[0] = 0;
+    mapping[1] = 255;
+    mapping[2] = 1;
+    mapping[3] = 2;
+    dec = oac_multistream_decoder_create(48000, 4, 2, 1, mapping, &err);
+    VG_CHECK(&err, sizeof(err));
+    if (err != OAC_OK || dec == NULL) test_failed();
+    cfgs++;
+
+    fprintf(stdout, "    oac_multistream_decoder_create() ............ OK.\n");
+    fprintf(stdout, "    oac_multistream_decoder_init() .............. OK.\n");
+
+    VG_UNDEF(&dec_final_range, sizeof(dec_final_range));
+    err = oac_multistream_decoder_ctl(dec, OAC_GET_FINAL_RANGE(&dec_final_range));
+    if (err != OAC_OK) test_failed();
+    VG_CHECK(&dec_final_range, sizeof(dec_final_range));
+    fprintf(stdout, "    OAC_GET_FINAL_RANGE ......................... OK.\n");
+    cfgs++;
+
+    streamdec = 0;
+    VG_UNDEF(&streamdec, sizeof(streamdec));
+    err = oac_multistream_decoder_ctl(dec, OAC_MULTISTREAM_GET_DECODER_STATE(-1, &streamdec));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    err = oac_multistream_decoder_ctl(dec, OAC_MULTISTREAM_GET_DECODER_STATE(1, &streamdec));
+    if (err != OAC_OK || streamdec == NULL) test_failed();
+    VG_CHECK(streamdec, oac_decoder_get_size(1));
+    cfgs++;
+    err = oac_multistream_decoder_ctl(dec, OAC_MULTISTREAM_GET_DECODER_STATE(2, &streamdec));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    err = oac_multistream_decoder_ctl(dec, OAC_MULTISTREAM_GET_DECODER_STATE(0, &streamdec));
+    if (err != OAC_OK || streamdec == NULL) test_failed();
+    VG_CHECK(streamdec, oac_decoder_get_size(1));
+    fprintf(stdout, "    OAC_MULTISTREAM_GET_DECODER_STATE ........... OK.\n");
+    cfgs++;
+
+    for (j = 0; j < 2; j++) {
+        OacDecoder *od;
+        err = oac_multistream_decoder_ctl(dec, OAC_MULTISTREAM_GET_DECODER_STATE(j, &od));
+        if (err != OAC_OK) test_failed();
+        VG_UNDEF(&i, sizeof(i));
+        err = oac_decoder_ctl(od, OAC_GET_GAIN(&i));
+        VG_CHECK(&i, sizeof(i));
+        if (err != OAC_OK || i != 0) test_failed();
+        cfgs++;
+    }
+    err = oac_multistream_decoder_ctl(dec, OAC_SET_GAIN(15));
+    if (err != OAC_OK) test_failed();
+    fprintf(stdout, "    OAC_SET_GAIN ................................ OK.\n");
+    for (j = 0; j < 2; j++) {
+        OacDecoder *od;
+        err = oac_multistream_decoder_ctl(dec, OAC_MULTISTREAM_GET_DECODER_STATE(j, &od));
+        if (err != OAC_OK) test_failed();
+        VG_UNDEF(&i, sizeof(i));
+        err = oac_decoder_ctl(od, OAC_GET_GAIN(&i));
+        VG_CHECK(&i, sizeof(i));
+        if (err != OAC_OK || i != 15) test_failed();
+        cfgs++;
+    }
+    fprintf(stdout, "    OAC_GET_GAIN ................................ OK.\n");
+
+    VG_UNDEF(&i, sizeof(i));
+    err = oac_multistream_decoder_ctl(dec, OAC_GET_BANDWIDTH(&i));
+    if (err != OAC_OK || i != 0) test_failed();
+    fprintf(stdout, "    OAC_GET_BANDWIDTH ........................... OK.\n");
+    cfgs++;
+
+    err = oac_multistream_decoder_ctl(dec, OAC_UNIMPLEMENTED);
+    if (err != OAC_UNIMPLEMENTED) test_failed();
+    fprintf(stdout, "    OAC_UNIMPLEMENTED ........................... OK.\n");
+    cfgs++;
+
+#if 0
+    /*Currently unimplemented for multistream*/
+    /*GET_PITCH has different execution paths depending on the previously decoded frame.*/
+    err = oac_multistream_decoder_ctl(dec, OAC_GET_PITCH(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    VG_UNDEF(&i, sizeof(i));
+    err = oac_multistream_decoder_ctl(dec, OAC_GET_PITCH(&i));
+    if (err != OAC_OK || i > 0 || i < -1) test_failed();
+    cfgs++;
+    VG_UNDEF(packet, sizeof(packet));
+    packet[0] = 63<<2; packet[1] = packet[2] = 0;
+    if (oac_multistream_decode(dec, packet, 3, sbuf, 960, 0) != 960) test_failed();
+    cfgs++;
+    VG_UNDEF(&i, sizeof(i));
+    err = oac_multistream_decoder_ctl(dec, OAC_GET_PITCH(&i));
+    if (err != OAC_OK || i > 0 || i < -1) test_failed();
+    cfgs++;
+    packet[0] = 1;
+    if (oac_multistream_decode(dec, packet, 1, sbuf, 960, 0) != 960) test_failed();
+    cfgs++;
+    VG_UNDEF(&i, sizeof(i));
+    err = oac_multistream_decoder_ctl(dec, OAC_GET_PITCH(&i));
+    if (err != OAC_OK || i > 0 || i < -1) test_failed();
+    cfgs++;
+    fprintf(stdout, "    OAC_GET_PITCH ............................... OK.\n");
+#endif
+
+    /*Reset the decoder*/
+    if (oac_multistream_decoder_ctl(dec, OAC_RESET_STATE) != OAC_OK) test_failed();
+    fprintf(stdout, "    OAC_RESET_STATE ............................. OK.\n");
+    cfgs++;
+
+    oac_multistream_decoder_destroy(dec);
+    cfgs++;
+    VG_UNDEF(&err, sizeof(err));
+    dec = oac_multistream_decoder_create(48000, 2, 1, 1, mapping, &err);
+    if (err != OAC_OK || dec == NULL) test_failed();
+    cfgs++;
+
+    packet[0] = (63<<2) + 3;
+    packet[1] = 49;
+    for (j = 2; j < 51; j++) packet[j] = 0;
+    VG_UNDEF(sbuf, sizeof(sbuf));
+    if (oac_multistream_decode(dec, packet, 51, sbuf, 960, 0) != OAC_INVALID_PACKET) test_failed();
+    cfgs++;
+    packet[0] = (63<<2);
+    packet[1] = packet[2] = 0;
+    if (oac_multistream_decode(dec, packet, -1, sbuf, 960, 0) != OAC_BAD_ARG) {
+        printf("%d\n", oac_multistream_decode(dec, packet, -1, sbuf, 960, 0)); test_failed();
+    }
+    cfgs++;
+    if (oac_multistream_decode(dec, packet, 3, sbuf, -960, 0) != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    if (oac_multistream_decode(dec, packet, 3, sbuf, 60, 0) != OAC_BUFFER_TOO_SMALL) test_failed();
+    cfgs++;
+    if (oac_multistream_decode(dec, packet, 3, sbuf, 480, 0) != OAC_BUFFER_TOO_SMALL) test_failed();
+    cfgs++;
+    if (oac_multistream_decode(dec, packet, 3, sbuf, 960, 0) != 960) test_failed();
+    cfgs++;
+    fprintf(stdout, "    oac_multistream_decode() .................... OK.\n");
 #ifndef DISABLE_FLOAT_API
-   VG_UNDEF(fbuf,sizeof(fbuf));
-   if(oac_multistream_decode_float(dec, packet, 3, fbuf, 960, 0)!=960)test_failed();
-   cfgs++;
-   fprintf(stdout,"    oac_multistream_decode_float() .............. OK.\n");
+    VG_UNDEF(fbuf, sizeof(fbuf));
+    if (oac_multistream_decode_float(dec, packet, 3, fbuf, 960, 0) != 960) test_failed();
+    cfgs++;
+    fprintf(stdout, "    oac_multistream_decode_float() .............. OK.\n");
 #endif
 
 #if 0
-   /*These tests are disabled because the library crashes with null states*/
-   if(oac_multistream_decoder_ctl(0,OAC_RESET_STATE)         !=OAC_INVALID_STATE)test_failed();
-   if(oac_multistream_decoder_init(0,48000,1)                 !=OAC_INVALID_STATE)test_failed();
-   if(oac_multistream_decode(0,packet,1,outbuf,2880,0)        !=OAC_INVALID_STATE)test_failed();
-   if(oac_multistream_decode_float(0,packet,1,0,2880,0)       !=OAC_INVALID_STATE)test_failed();
-   if(oac_multistream_decoder_get_nb_samples(0,packet,1)      !=OAC_INVALID_STATE)test_failed();
+    /*These tests are disabled because the library crashes with null states*/
+    if (oac_multistream_decoder_ctl(0, OAC_RESET_STATE)         != OAC_INVALID_STATE)test_failed();
+    if (oac_multistream_decoder_init(0, 48000, 1)                 != OAC_INVALID_STATE)test_failed();
+    if (oac_multistream_decode(0, packet, 1, outbuf, 2880, 0)        != OAC_INVALID_STATE)test_failed();
+    if (oac_multistream_decode_float(0, packet, 1, 0, 2880, 0)       != OAC_INVALID_STATE)test_failed();
+    if (oac_multistream_decoder_get_nb_samples(0, packet, 1)      != OAC_INVALID_STATE)test_failed();
 #endif
-   oac_multistream_decoder_destroy(dec);
-   cfgs++;
-   fprintf(stdout,"       All multistream decoder interface tests passed\n");
-   fprintf(stdout,"                             (%6d API invocations)\n",cfgs);
-   return cfgs;
+    oac_multistream_decoder_destroy(dec);
+    cfgs++;
+    fprintf(stdout, "       All multistream decoder interface tests passed\n");
+    fprintf(stdout, "                             (%6d API invocations)\n", cfgs);
+    return cfgs;
 }
 
 #ifdef VALGRIND
-#define UNDEFINE_FOR_PARSE  toc=-1; \
-   frames[0]=(unsigned char *)0; \
-   frames[1]=(unsigned char *)0; \
-   payload_offset=-1; \
-   VG_UNDEF(&toc,sizeof(toc)); \
-   VG_UNDEF(frames,sizeof(frames));\
-   VG_UNDEF(&payload_offset,sizeof(payload_offset));
+# define UNDEFINE_FOR_PARSE  toc = -1; \
+        frames[0] = (unsigned char *)0; \
+        frames[1] = (unsigned char *)0; \
+        payload_offset = -1; \
+        VG_UNDEF(&toc, sizeof(toc)); \
+        VG_UNDEF(frames, sizeof(frames)); \
+        VG_UNDEF(&payload_offset, sizeof(payload_offset));
 #else
-#define UNDEFINE_FOR_PARSE  toc=-1; \
-   frames[0]=(unsigned char *)0; \
-   frames[1]=(unsigned char *)0; \
-   payload_offset=-1;
+# define UNDEFINE_FOR_PARSE  toc = -1; \
+        frames[0] = (unsigned char *)0; \
+        frames[1] = (unsigned char *)0; \
+        payload_offset = -1;
 #endif
 
 /* This test exercises the heck out of the liboac parser.
@@ -712,622 +729,596 @@ oac_int32 test_msdec_api(void)
    it tries to hit a lot of corner cases that could never
    fail with the liboac code, but might be problematic for
    other implementations. */
-oac_int32 test_parse(void)
-{
-   oac_int32 i,j,jj,sz;
-   unsigned char packet[1276];
-   oac_int32 cfgs,cfgs_total;
-   unsigned char toc;
-   const unsigned char *frames[48];
-   short size[48];
-   int payload_offset, ret;
-   fprintf(stdout,"\n  Packet header parsing tests\n");
-   fprintf(stdout,"  ---------------------------------------------------\n");
-   memset(packet,0,sizeof(char)*1276);
-   packet[0]=63<<2;
-   if(oac_packet_parse(packet,1,&toc,frames,0,&payload_offset)!=OAC_BAD_ARG)test_failed();
-   cfgs_total=cfgs=1;
-   /*code 0*/
-   for(i=0;i<64;i++)
-   {
-      packet[0]=i<<2;
-      UNDEFINE_FOR_PARSE
-      ret=oac_packet_parse(packet,4,&toc,frames,size,&payload_offset);
-      cfgs++;
-      if(ret!=1)test_failed();
-      if(size[0]!=3)test_failed();
-      if(frames[0]!=packet+1)test_failed();
-   }
-   fprintf(stdout,"    code 0 (%2d cases) ............................ OK.\n",cfgs);
-   cfgs_total+=cfgs;cfgs=0;
-
-   /*code 1, two frames of the same size*/
-   for(i=0;i<64;i++)
-   {
-      packet[0]=(i<<2)+1;
-      for(jj=0;jj<=1275*2+3;jj++)
-      {
-         UNDEFINE_FOR_PARSE
-         ret=oac_packet_parse(packet,jj,&toc,frames,size,&payload_offset);
-         cfgs++;
-         if((jj&1)==1 && jj<=2551)
-         {
-            /* Must pass if payload length even (packet length odd) and
-               size<=2551, must fail otherwise. */
-            if(ret!=2)test_failed();
-            if(size[0]!=size[1] || size[0]!=((jj-1)>>1))test_failed();
-            if(frames[0]!=packet+1)test_failed();
-            if(frames[1]!=frames[0]+size[0])test_failed();
-            if((toc>>2)!=i)test_failed();
-         } else if(ret!=OAC_INVALID_PACKET)test_failed();
-      }
-   }
-   fprintf(stdout,"    code 1 (%6d cases) ........................ OK.\n",cfgs);
-   cfgs_total+=cfgs;cfgs=0;
-
-   for(i=0;i<64;i++)
-   {
-      /*code 2, length code overflow*/
-      packet[0]=(i<<2)+2;
-      UNDEFINE_FOR_PARSE
-      ret=oac_packet_parse(packet,1,&toc,frames,size,&payload_offset);
-      cfgs++;
-      if(ret!=OAC_INVALID_PACKET)test_failed();
-      packet[1]=252;
-      UNDEFINE_FOR_PARSE
-      ret=oac_packet_parse(packet,2,&toc,frames,size,&payload_offset);
-      cfgs++;
-      if(ret!=OAC_INVALID_PACKET)test_failed();
-      for(j=0;j<1275;j++)
-      {
-         if(j<252)packet[1]=j;
-         else{packet[1]=252+(j&3);packet[2]=(j-252)>>2;}
-         /*Code 2, one too short*/
-         UNDEFINE_FOR_PARSE
-         ret=oac_packet_parse(packet,j+(j<252?2:3)-1,&toc,frames,size,&payload_offset);
-         cfgs++;
-         if(ret!=OAC_INVALID_PACKET)test_failed();
-         /*Code 2, one too long*/
-         UNDEFINE_FOR_PARSE
-         ret=oac_packet_parse(packet,j+(j<252?2:3)+1276,&toc,frames,size,&payload_offset);
-         cfgs++;
-         if(ret!=OAC_INVALID_PACKET)test_failed();
-         /*Code 2, second zero*/
-         UNDEFINE_FOR_PARSE
-         ret=oac_packet_parse(packet,j+(j<252?2:3),&toc,frames,size,&payload_offset);
-         cfgs++;
-         if(ret!=2)test_failed();
-         if(size[0]!=j||size[1]!=0)test_failed();
-         if(frames[1]!=frames[0]+size[0])test_failed();
-         if((toc>>2)!=i)test_failed();
-         /*Code 2, normal*/
-         UNDEFINE_FOR_PARSE
-         ret=oac_packet_parse(packet,(j<<1)+4,&toc,frames,size,&payload_offset);
-         cfgs++;
-         if(ret!=2)test_failed();
-         if(size[0]!=j||size[1]!=(j<<1)+3-j-(j<252?1:2))test_failed();
-         if(frames[1]!=frames[0]+size[0])test_failed();
-         if((toc>>2)!=i)test_failed();
-      }
-   }
-   fprintf(stdout,"    code 2 (%6d cases) ........................ OK.\n",cfgs);
-   cfgs_total+=cfgs;cfgs=0;
-
-   for(i=0;i<64;i++)
-   {
-      packet[0]=(i<<2)+3;
-      /*code 3, length code overflow*/
-      UNDEFINE_FOR_PARSE
-      ret=oac_packet_parse(packet,1,&toc,frames,size,&payload_offset);
-      cfgs++;
-      if(ret!=OAC_INVALID_PACKET)test_failed();
-   }
-   fprintf(stdout,"    code 3 m-truncation (%2d cases) ............... OK.\n",cfgs);
-   cfgs_total+=cfgs;cfgs=0;
-
-   for(i=0;i<64;i++)
-   {
-      /*code 3, m is zero or 49-63*/
-      packet[0]=(i<<2)+3;
-      for(jj=49;jj<=64;jj++)
-      {
-        packet[1]=0+(jj&63); /*CBR, no padding*/
+oac_int32 test_parse(void) {
+    oac_int32 i, j, jj, sz;
+    unsigned char packet[1276];
+    oac_int32 cfgs, cfgs_total;
+    unsigned char toc;
+    const unsigned char *frames[48];
+    short size[48];
+    int payload_offset, ret;
+    fprintf(stdout, "\n  Packet header parsing tests\n");
+    fprintf(stdout, "  ---------------------------------------------------\n");
+    memset(packet, 0, sizeof(char)*1276);
+    packet[0] = 63<<2;
+    if (oac_packet_parse(packet, 1, &toc, frames, 0, &payload_offset) != OAC_BAD_ARG) test_failed();
+    cfgs_total = cfgs = 1;
+    /*code 0*/
+    for (i = 0; i < 64; i++) {
+        packet[0] = i<<2;
+        UNDEFINE_FOR_PARSE
+            ret = oac_packet_parse(packet, 4, &toc, frames, size, &payload_offset);
+        cfgs++;
+        if (ret != 1) test_failed();
+        if (size[0] != 3) test_failed();
+        if (frames[0] != packet + 1) test_failed();
+    }
+    fprintf(stdout, "    code 0 (%2d cases) ............................ OK.\n", cfgs);
+    cfgs_total += cfgs; cfgs = 0;
+
+    /*code 1, two frames of the same size*/
+    for (i = 0; i < 64; i++) {
+        packet[0] = (i<<2) + 1;
+        for (jj = 0; jj <= 1275*2 + 3; jj++) {
+            UNDEFINE_FOR_PARSE
+                ret = oac_packet_parse(packet, jj, &toc, frames, size, &payload_offset);
+            cfgs++;
+            if ((jj&1) == 1 && jj <= 2551) {
+                /* Must pass if payload length even (packet length odd) and
+                   size<=2551, must fail otherwise. */
+                if (ret != 2) test_failed();
+                if (size[0] != size[1] || size[0] != ((jj - 1)>>1)) test_failed();
+                if (frames[0] != packet + 1) test_failed();
+                if (frames[1] != frames[0] + size[0]) test_failed();
+                if ((toc>>2) != i) test_failed();
+            } else if (ret != OAC_INVALID_PACKET) test_failed();
+        }
+    }
+    fprintf(stdout, "    code 1 (%6d cases) ........................ OK.\n", cfgs);
+    cfgs_total += cfgs; cfgs = 0;
+
+    for (i = 0; i < 64; i++) {
+        /*code 2, length code overflow*/
+        packet[0] = (i<<2) + 2;
         UNDEFINE_FOR_PARSE
-        ret=oac_packet_parse(packet,1275,&toc,frames,size,&payload_offset);
+            ret = oac_packet_parse(packet, 1, &toc, frames, size, &payload_offset);
         cfgs++;
-        if(ret!=OAC_INVALID_PACKET)test_failed();
-        packet[1]=128+(jj&63); /*VBR, no padding*/
+        if (ret != OAC_INVALID_PACKET) test_failed();
+        packet[1] = 252;
         UNDEFINE_FOR_PARSE
-        ret=oac_packet_parse(packet,1275,&toc,frames,size,&payload_offset);
+            ret = oac_packet_parse(packet, 2, &toc, frames, size, &payload_offset);
         cfgs++;
-        if(ret!=OAC_INVALID_PACKET)test_failed();
-        packet[1]=64+(jj&63); /*CBR, padding*/
+        if (ret != OAC_INVALID_PACKET) test_failed();
+        for (j = 0; j < 1275; j++) {
+            if (j < 252) packet[1] = j;
+            else {
+                packet[1] = 252 + (j&3); packet[2] = (j - 252)>>2;
+            }
+            /*Code 2, one too short*/
+            UNDEFINE_FOR_PARSE
+                ret = oac_packet_parse(packet, j + (j < 252?2:3) - 1, &toc, frames, size, &payload_offset);
+            cfgs++;
+            if (ret != OAC_INVALID_PACKET) test_failed();
+            /*Code 2, one too long*/
+            UNDEFINE_FOR_PARSE
+                ret = oac_packet_parse(packet, j + (j < 252?2:3) + 1276, &toc, frames, size, &payload_offset);
+            cfgs++;
+            if (ret != OAC_INVALID_PACKET) test_failed();
+            /*Code 2, second zero*/
+            UNDEFINE_FOR_PARSE
+                ret = oac_packet_parse(packet, j + (j < 252?2:3), &toc, frames, size, &payload_offset);
+            cfgs++;
+            if (ret != 2) test_failed();
+            if (size[0] != j || size[1] != 0) test_failed();
+            if (frames[1] != frames[0] + size[0]) test_failed();
+            if ((toc>>2) != i) test_failed();
+            /*Code 2, normal*/
+            UNDEFINE_FOR_PARSE
+                ret = oac_packet_parse(packet, (j<<1) + 4, &toc, frames, size, &payload_offset);
+            cfgs++;
+            if (ret != 2) test_failed();
+            if (size[0] != j || size[1] != (j<<1) + 3 - j - (j < 252?1:2)) test_failed();
+            if (frames[1] != frames[0] + size[0]) test_failed();
+            if ((toc>>2) != i) test_failed();
+        }
+    }
+    fprintf(stdout, "    code 2 (%6d cases) ........................ OK.\n", cfgs);
+    cfgs_total += cfgs; cfgs = 0;
+
+    for (i = 0; i < 64; i++) {
+        packet[0] = (i<<2) + 3;
+        /*code 3, length code overflow*/
+        UNDEFINE_FOR_PARSE
+            ret = oac_packet_parse(packet, 1, &toc, frames, size, &payload_offset);
+        cfgs++;
+        if (ret != OAC_INVALID_PACKET) test_failed();
+    }
+    fprintf(stdout, "    code 3 m-truncation (%2d cases) ............... OK.\n", cfgs);
+    cfgs_total += cfgs; cfgs = 0;
+
+    for (i = 0; i < 64; i++) {
+        /*code 3, m is zero or 49-63*/
+        packet[0] = (i<<2) + 3;
+        for (jj = 49; jj <= 64; jj++) {
+            packet[1] = 0 + (jj&63); /*CBR, no padding*/
+            UNDEFINE_FOR_PARSE
+                ret = oac_packet_parse(packet, 1275, &toc, frames, size, &payload_offset);
+            cfgs++;
+            if (ret != OAC_INVALID_PACKET) test_failed();
+            packet[1] = 128 + (jj&63); /*VBR, no padding*/
+            UNDEFINE_FOR_PARSE
+                ret = oac_packet_parse(packet, 1275, &toc, frames, size, &payload_offset);
+            cfgs++;
+            if (ret != OAC_INVALID_PACKET) test_failed();
+            packet[1] = 64 + (jj&63); /*CBR, padding*/
+            UNDEFINE_FOR_PARSE
+                ret = oac_packet_parse(packet, 1275, &toc, frames, size, &payload_offset);
+            cfgs++;
+            if (ret != OAC_INVALID_PACKET) test_failed();
+            packet[1] = 128 + 64 + (jj&63); /*VBR, padding*/
+            UNDEFINE_FOR_PARSE
+                ret = oac_packet_parse(packet, 1275, &toc, frames, size, &payload_offset);
+            cfgs++;
+            if (ret != OAC_INVALID_PACKET) test_failed();
+        }
+    }
+    fprintf(stdout, "    code 3 m=0,49-64 (%2d cases) ................ OK.\n", cfgs);
+    cfgs_total += cfgs; cfgs = 0;
+
+    for (i = 0; i < 64; i++) {
+        packet[0] = (i<<2) + 3;
+        /*code 3, m is one, cbr*/
+        packet[1] = 1;
+        for (j = 0; j < 1276; j++) {
+            UNDEFINE_FOR_PARSE
+                ret = oac_packet_parse(packet, j + 2, &toc, frames, size, &payload_offset);
+            cfgs++;
+            if (ret != 1) test_failed();
+            if (size[0] != j) test_failed();
+            if ((toc>>2) != i) test_failed();
+        }
         UNDEFINE_FOR_PARSE
-        ret=oac_packet_parse(packet,1275,&toc,frames,size,&payload_offset);
+            ret = oac_packet_parse(packet, 1276 + 2, &toc, frames, size, &payload_offset);
         cfgs++;
-        if(ret!=OAC_INVALID_PACKET)test_failed();
-        packet[1]=128+64+(jj&63); /*VBR, padding*/
+        if (ret != OAC_INVALID_PACKET) test_failed();
+    }
+    fprintf(stdout, "    code 3 m=1 CBR (%2d cases) ................. OK.\n", cfgs);
+    cfgs_total += cfgs; cfgs = 0;
+
+    for (i = 0; i < 64; i++) {
+        int frame_samp;
+        /*code 3, m>1 CBR*/
+        packet[0] = (i<<2) + 3;
+        frame_samp = oac_packet_get_samples_per_frame(packet, 48000);
+        for (j = 2; j < 49; j++) {
+            packet[1] = j;
+            for (sz = 2; sz < ((j + 2)*1275); sz++) {
+                UNDEFINE_FOR_PARSE
+                    ret = oac_packet_parse(packet, sz, &toc, frames, size, &payload_offset);
+                cfgs++;
+                /*Must be <=120ms, must be evenly divisible, can't have frames>1275 bytes*/
+                if (frame_samp*j <= 5760 && (sz - 2)%j == 0 && (sz - 2)/j < 1276) {
+                    if (ret != j) test_failed();
+                    for (jj = 1; jj < ret; jj++) if (frames[jj] != frames[jj - 1] + size[jj - 1]) test_failed();
+                    if ((toc>>2) != i) test_failed();
+                } else if (ret != OAC_INVALID_PACKET) test_failed();
+            }
+        }
+        /*Super jumbo packets*/
+        packet[1] = 5760/frame_samp;
         UNDEFINE_FOR_PARSE
-        ret=oac_packet_parse(packet,1275,&toc,frames,size,&payload_offset);
+            ret = oac_packet_parse(packet, 1275*packet[1] + 2, &toc, frames, size, &payload_offset);
         cfgs++;
-        if(ret!=OAC_INVALID_PACKET)test_failed();
-      }
-   }
-   fprintf(stdout,"    code 3 m=0,49-64 (%2d cases) ................ OK.\n",cfgs);
-   cfgs_total+=cfgs;cfgs=0;
-
-   for(i=0;i<64;i++)
-   {
-      packet[0]=(i<<2)+3;
-      /*code 3, m is one, cbr*/
-      packet[1]=1;
-      for(j=0;j<1276;j++)
-      {
+        if (ret != packet[1]) test_failed();
+        for (jj = 0; jj < ret; jj++) if (size[jj] != 1275) test_failed();
+    }
+    fprintf(stdout, "    code 3 m=1-48 CBR (%2d cases) .......... OK.\n", cfgs);
+    cfgs_total += cfgs; cfgs = 0;
+
+    for (i = 0; i < 64; i++) {
+        int frame_samp;
+        /*Code 3 VBR, m one*/
+        packet[0] = (i<<2) + 3;
+        packet[1] = 128 + 1;
+        frame_samp = oac_packet_get_samples_per_frame(packet, 48000);
+        for (jj = 0; jj < 1276; jj++) {
+            UNDEFINE_FOR_PARSE
+                ret = oac_packet_parse(packet, 2 + jj, &toc, frames, size, &payload_offset);
+            cfgs++;
+            if (ret != 1) test_failed();
+            if (size[0] != jj) test_failed();
+            if ((toc>>2) != i) test_failed();
+        }
         UNDEFINE_FOR_PARSE
-        ret=oac_packet_parse(packet,j+2,&toc,frames,size,&payload_offset);
+            ret = oac_packet_parse(packet, 2 + 1276, &toc, frames, size, &payload_offset);
         cfgs++;
-        if(ret!=1)test_failed();
-        if(size[0]!=j)test_failed();
-        if((toc>>2)!=i)test_failed();
-      }
-      UNDEFINE_FOR_PARSE
-      ret=oac_packet_parse(packet,1276+2,&toc,frames,size,&payload_offset);
-      cfgs++;
-      if(ret!=OAC_INVALID_PACKET)test_failed();
-   }
-   fprintf(stdout,"    code 3 m=1 CBR (%2d cases) ................. OK.\n",cfgs);
-   cfgs_total+=cfgs;cfgs=0;
-
-   for(i=0;i<64;i++)
-   {
-      int frame_samp;
-      /*code 3, m>1 CBR*/
-      packet[0]=(i<<2)+3;
-      frame_samp=oac_packet_get_samples_per_frame(packet,48000);
-      for(j=2;j<49;j++)
-      {
-         packet[1]=j;
-         for(sz=2;sz<((j+2)*1275);sz++)
-         {
+        if (ret != OAC_INVALID_PACKET) test_failed();
+        for (j = 2; j < 49; j++) {
+            packet[1] = 128 + j;
+            /*Length code overflow*/
             UNDEFINE_FOR_PARSE
-            ret=oac_packet_parse(packet,sz,&toc,frames,size,&payload_offset);
+                ret = oac_packet_parse(packet, 2 + j - 2, &toc, frames, size, &payload_offset);
             cfgs++;
-            /*Must be <=120ms, must be evenly divisible, can't have frames>1275 bytes*/
-            if(frame_samp*j<=5760 && (sz-2)%j==0 && (sz-2)/j<1276)
-            {
-               if(ret!=j)test_failed();
-               for(jj=1;jj<ret;jj++)if(frames[jj]!=frames[jj-1]+size[jj-1])test_failed();
-               if((toc>>2)!=i)test_failed();
-            } else if(ret!=OAC_INVALID_PACKET)test_failed();
-         }
-      }
-      /*Super jumbo packets*/
-      packet[1]=5760/frame_samp;
-      UNDEFINE_FOR_PARSE
-      ret=oac_packet_parse(packet,1275*packet[1]+2,&toc,frames,size,&payload_offset);
-      cfgs++;
-      if(ret!=packet[1])test_failed();
-      for(jj=0;jj<ret;jj++)if(size[jj]!=1275)test_failed();
-   }
-   fprintf(stdout,"    code 3 m=1-48 CBR (%2d cases) .......... OK.\n",cfgs);
-   cfgs_total+=cfgs;cfgs=0;
-
-   for(i=0;i<64;i++)
-   {
-      int frame_samp;
-      /*Code 3 VBR, m one*/
-      packet[0]=(i<<2)+3;
-      packet[1]=128+1;
-      frame_samp=oac_packet_get_samples_per_frame(packet,48000);
-      for(jj=0;jj<1276;jj++)
-      {
-         UNDEFINE_FOR_PARSE
-         ret=oac_packet_parse(packet,2+jj,&toc,frames,size,&payload_offset);
-         cfgs++;
-         if(ret!=1)test_failed();
-         if(size[0]!=jj)test_failed();
-         if((toc>>2)!=i)test_failed();
-      }
-      UNDEFINE_FOR_PARSE
-      ret=oac_packet_parse(packet,2+1276,&toc,frames,size,&payload_offset);
-      cfgs++;
-      if(ret!=OAC_INVALID_PACKET)test_failed();
-      for(j=2;j<49;j++)
-      {
-         packet[1]=128+j;
-         /*Length code overflow*/
-         UNDEFINE_FOR_PARSE
-         ret=oac_packet_parse(packet,2+j-2,&toc,frames,size,&payload_offset);
-         cfgs++;
-         if(ret!=OAC_INVALID_PACKET)test_failed();
-         packet[2]=252;
-         packet[3]=0;
-         for(jj=4;jj<2+j;jj++)packet[jj]=0;
-         UNDEFINE_FOR_PARSE
-         ret=oac_packet_parse(packet,2+j,&toc,frames,size,&payload_offset);
-         cfgs++;
-         if(ret!=OAC_INVALID_PACKET)test_failed();
-         /*One byte too short*/
-         for(jj=2;jj<2+j;jj++)packet[jj]=0;
-         UNDEFINE_FOR_PARSE
-         ret=oac_packet_parse(packet,2+j-2,&toc,frames,size,&payload_offset);
-         cfgs++;
-         if(ret!=OAC_INVALID_PACKET)test_failed();
-         /*One byte too short thanks to length coding*/
-         packet[2]=252;
-         packet[3]=0;
-         for(jj=4;jj<2+j;jj++)packet[jj]=0;
-         UNDEFINE_FOR_PARSE
-         ret=oac_packet_parse(packet,2+j+252-1,&toc,frames,size,&payload_offset);
-         cfgs++;
-         if(ret!=OAC_INVALID_PACKET)test_failed();
-         /*Most expensive way of coding zeros*/
-         for(jj=2;jj<2+j;jj++)packet[jj]=0;
-         UNDEFINE_FOR_PARSE
-         ret=oac_packet_parse(packet,2+j-1,&toc,frames,size,&payload_offset);
-         cfgs++;
-         if(frame_samp*j<=5760){
-            if(ret!=j)test_failed();
-            for(jj=0;jj<j;jj++)if(size[jj]!=0)test_failed();
-            if((toc>>2)!=i)test_failed();
-         } else if(ret!=OAC_INVALID_PACKET)test_failed();
-         /*Quasi-CBR use of mode 3*/
-         for(sz=0;sz<8;sz++)
-         {
-            const int tsz[8]={50,201,403,700,1472,5110,20400,61298};
-            int pos=0;
-            int as=(tsz[sz]+i-j-2)/j;
-            for(jj=0;jj<j-1;jj++)
-            {
-              if(as<252){packet[2+pos]=as;pos++;}
-              else{packet[2+pos]=252+(as&3);packet[3+pos]=(as-252)>>2;pos+=2;}
-            }
+            if (ret != OAC_INVALID_PACKET) test_failed();
+            packet[2] = 252;
+            packet[3] = 0;
+            for (jj = 4; jj < 2 + j; jj++) packet[jj] = 0;
             UNDEFINE_FOR_PARSE
-            ret=oac_packet_parse(packet,tsz[sz]+i,&toc,frames,size,&payload_offset);
+                ret = oac_packet_parse(packet, 2 + j, &toc, frames, size, &payload_offset);
             cfgs++;
-            if(frame_samp*j<=5760 && as<1276 && (tsz[sz]+i-2-pos-as*(j-1))<1276){
-               if(ret!=j)test_failed();
-               for(jj=0;jj<j-1;jj++)if(size[jj]!=as)test_failed();
-               if(size[j-1]!=(tsz[sz]+i-2-pos-as*(j-1)))test_failed();
-               if((toc>>2)!=i)test_failed();
-            } else if(ret!=OAC_INVALID_PACKET)test_failed();
-         }
-      }
-   }
-   fprintf(stdout,"    code 3 m=1-48 VBR (%2d cases) ............. OK.\n",cfgs);
-   cfgs_total+=cfgs;cfgs=0;
-
-   for(i=0;i<64;i++)
-   {
-      packet[0]=(i<<2)+3;
-      /*Padding*/
-      packet[1]=128+1+64;
-      /*Overflow the length coding*/
-      for(jj=2;jj<127;jj++)packet[jj]=255;
-      UNDEFINE_FOR_PARSE
-      ret=oac_packet_parse(packet,127,&toc,frames,size,&payload_offset);
-      cfgs++;
-      if(ret!=OAC_INVALID_PACKET)test_failed();
-
-      for(sz=0;sz<4;sz++)
-      {
-         const int tsz[4]={0,72,512,1275};
-         for(jj=sz;jj<65025;jj+=11)
-         {
-            int pos;
-            for(pos=0;pos<jj/254;pos++)packet[2+pos]=255;
-            packet[2+pos]=jj%254;
-            pos++;
-            if(sz==0&&i==63)
-            {
-               /*Code more padding than there is room in the packet*/
-               UNDEFINE_FOR_PARSE
-               ret=oac_packet_parse(packet,2+jj+pos-1,&toc,frames,size,&payload_offset);
-               cfgs++;
-               if(ret!=OAC_INVALID_PACKET)test_failed();
-            }
+            if (ret != OAC_INVALID_PACKET) test_failed();
+            /*One byte too short*/
+            for (jj = 2; jj < 2 + j; jj++) packet[jj] = 0;
+            UNDEFINE_FOR_PARSE
+                ret = oac_packet_parse(packet, 2 + j - 2, &toc, frames, size, &payload_offset);
+            cfgs++;
+            if (ret != OAC_INVALID_PACKET) test_failed();
+            /*One byte too short thanks to length coding*/
+            packet[2] = 252;
+            packet[3] = 0;
+            for (jj = 4; jj < 2 + j; jj++) packet[jj] = 0;
             UNDEFINE_FOR_PARSE
-            ret=oac_packet_parse(packet,2+jj+tsz[sz]+i+pos,&toc,frames,size,&payload_offset);
+                ret = oac_packet_parse(packet, 2 + j + 252 - 1, &toc, frames, size, &payload_offset);
             cfgs++;
-            if(tsz[sz]+i<1276)
-            {
-               if(ret!=1)test_failed();
-               if(size[0]!=tsz[sz]+i)test_failed();
-               if((toc>>2)!=i)test_failed();
-            } else if (ret!=OAC_INVALID_PACKET)test_failed();
-         }
-      }
-   }
-   fprintf(stdout,"    code 3 padding (%2d cases) ............... OK.\n",cfgs);
-   cfgs_total+=cfgs;
-   fprintf(stdout,"    oac_packet_parse ............................ OK.\n");
-   fprintf(stdout,"                      All packet parsing tests passed\n");
-   fprintf(stdout,"                          (%d API invocations)\n",cfgs_total);
-   return cfgs_total;
+            if (ret != OAC_INVALID_PACKET) test_failed();
+            /*Most expensive way of coding zeros*/
+            for (jj = 2; jj < 2 + j; jj++) packet[jj] = 0;
+            UNDEFINE_FOR_PARSE
+                ret = oac_packet_parse(packet, 2 + j - 1, &toc, frames, size, &payload_offset);
+            cfgs++;
+            if (frame_samp*j <= 5760) {
+                if (ret != j) test_failed();
+                for (jj = 0; jj < j; jj++) if (size[jj] != 0) test_failed();
+                if ((toc>>2) != i) test_failed();
+            } else if (ret != OAC_INVALID_PACKET) test_failed();
+            /*Quasi-CBR use of mode 3*/
+            for (sz = 0; sz < 8; sz++) {
+                const int tsz[8] = {50, 201, 403, 700, 1472, 5110, 20400, 61298};
+                int pos = 0;
+                int as = (tsz[sz] + i - j - 2)/j;
+                for (jj = 0; jj < j - 1; jj++) {
+                    if (as < 252) {
+                        packet[2 + pos] = as; pos++;
+                    } else {
+                        packet[2 + pos] = 252 + (as&3); packet[3 + pos] = (as - 252)>>2; pos += 2;
+                    }
+                }
+                UNDEFINE_FOR_PARSE
+                    ret = oac_packet_parse(packet, tsz[sz] + i, &toc, frames, size, &payload_offset);
+                cfgs++;
+                if (frame_samp*j <= 5760 && as < 1276 && (tsz[sz] + i - 2 - pos - as*(j - 1)) < 1276) {
+                    if (ret != j) test_failed();
+                    for (jj = 0; jj < j - 1; jj++) if (size[jj] != as) test_failed();
+                    if (size[j - 1] != (tsz[sz] + i - 2 - pos - as*(j - 1))) test_failed();
+                    if ((toc>>2) != i) test_failed();
+                } else if (ret != OAC_INVALID_PACKET) test_failed();
+            }
+        }
+    }
+    fprintf(stdout, "    code 3 m=1-48 VBR (%2d cases) ............. OK.\n", cfgs);
+    cfgs_total += cfgs; cfgs = 0;
+
+    for (i = 0; i < 64; i++) {
+        packet[0] = (i<<2) + 3;
+        /*Padding*/
+        packet[1] = 128 + 1 + 64;
+        /*Overflow the length coding*/
+        for (jj = 2; jj < 127; jj++) packet[jj] = 255;
+        UNDEFINE_FOR_PARSE
+            ret = oac_packet_parse(packet, 127, &toc, frames, size, &payload_offset);
+        cfgs++;
+        if (ret != OAC_INVALID_PACKET) test_failed();
+
+        for (sz = 0; sz < 4; sz++) {
+            const int tsz[4] = {0, 72, 512, 1275};
+            for (jj = sz; jj < 65025; jj += 11) {
+                int pos;
+                for (pos = 0; pos < jj/254; pos++) packet[2 + pos] = 255;
+                packet[2 + pos] = jj%254;
+                pos++;
+                if (sz == 0 && i == 63) {
+                    /*Code more padding than there is room in the packet*/
+                    UNDEFINE_FOR_PARSE
+                        ret = oac_packet_parse(packet, 2 + jj + pos - 1, &toc, frames, size, &payload_offset);
+                    cfgs++;
+                    if (ret != OAC_INVALID_PACKET) test_failed();
+                }
+                UNDEFINE_FOR_PARSE
+                    ret = oac_packet_parse(packet, 2 + jj + tsz[sz] + i + pos, &toc, frames, size, &payload_offset);
+                cfgs++;
+                if (tsz[sz] + i < 1276) {
+                    if (ret != 1) test_failed();
+                    if (size[0] != tsz[sz] + i) test_failed();
+                    if ((toc>>2) != i) test_failed();
+                } else if (ret != OAC_INVALID_PACKET) test_failed();
+            }
+        }
+    }
+    fprintf(stdout, "    code 3 padding (%2d cases) ............... OK.\n", cfgs);
+    cfgs_total += cfgs;
+    fprintf(stdout, "    oac_packet_parse ............................ OK.\n");
+    fprintf(stdout, "                      All packet parsing tests passed\n");
+    fprintf(stdout, "                          (%d API invocations)\n", cfgs_total);
+    return cfgs_total;
 }
 
 /* This is a helper macro for the encoder tests.
    The encoder api tests all have a pattern of set-must-fail, set-must-fail,
    set-must-pass, get-and-compare, set-must-pass, get-and-compare. */
-#define CHECK_SETGET(setcall,getcall,badv,badv2,goodv,goodv2,sok,gok) \
-   i=(badv);\
-   if(oac_encoder_ctl(enc,setcall)==OAC_OK)test_failed();\
-   i=(badv2);\
-   if(oac_encoder_ctl(enc,setcall)==OAC_OK)test_failed();\
-   j=i=(goodv);\
-   if(oac_encoder_ctl(enc,setcall)!=OAC_OK)test_failed();\
-   i=-12345;\
-   VG_UNDEF(&i,sizeof(i)); \
-   err=oac_encoder_ctl(enc,getcall);\
-   if(err!=OAC_OK || i!=j)test_failed();\
-   j=i=(goodv2);\
-   if(oac_encoder_ctl(enc,setcall)!=OAC_OK)test_failed();\
-   fprintf(stdout,sok);\
-   i=-12345;\
-   VG_UNDEF(&i,sizeof(i)); \
-   err=oac_encoder_ctl(enc,getcall);\
-   if(err!=OAC_OK || i!=j)test_failed();\
-   fprintf(stdout,gok);\
-   cfgs+=6;
-
-oac_int32 test_enc_api(void)
-{
-   oac_uint32 enc_final_range;
-   OacEncoder *enc;
-   oac_int32 i,j;
-   unsigned char packet[1276];
+#define CHECK_SETGET(setcall, getcall, badv, badv2, goodv, goodv2, sok, gok) \
+        i = (badv); \
+        if (oac_encoder_ctl(enc, setcall) == OAC_OK) test_failed(); \
+        i = (badv2); \
+        if (oac_encoder_ctl(enc, setcall) == OAC_OK) test_failed(); \
+        j = i = (goodv); \
+        if (oac_encoder_ctl(enc, setcall) != OAC_OK) test_failed(); \
+        i = -12345; \
+        VG_UNDEF(&i, sizeof(i)); \
+        err = oac_encoder_ctl(enc, getcall); \
+        if (err != OAC_OK || i != j) test_failed(); \
+        j = i = (goodv2); \
+        if (oac_encoder_ctl(enc, setcall) != OAC_OK) test_failed(); \
+        fprintf(stdout, sok); \
+        i = -12345; \
+        VG_UNDEF(&i, sizeof(i)); \
+        err = oac_encoder_ctl(enc, getcall); \
+        if (err != OAC_OK || i != j) test_failed(); \
+        fprintf(stdout, gok); \
+        cfgs += 6;
+
+oac_int32 test_enc_api(void) {
+    oac_uint32 enc_final_range;
+    OacEncoder *enc;
+    oac_int32 i, j;
+    unsigned char packet[1276];
 #ifndef DISABLE_FLOAT_API
-   float fbuf[960*2];
+    float fbuf[960*2];
 #endif
-   short sbuf[960*2];
-   int c,err,cfgs;
-
-   cfgs=0;
-   /*First test invalid configurations which should fail*/
-   fprintf(stdout,"\n  Encoder basic API tests\n");
-   fprintf(stdout,"  ---------------------------------------------------\n");
-   for(c=0;c<4;c++)
-   {
-      i=oac_encoder_get_size(c);
-      if(((c==1||c==2)&&(i<=2048||i>1<<18))||((c!=1&&c!=2)&&i!=0))test_failed();
-      fprintf(stdout,"    oac_encoder_get_size(%d)=%d ...............%s OK.\n",c,i,i>0?"":"....");
-      cfgs++;
-   }
-
-   /*Test with unsupported sample rates, channel counts*/
-   for(c=0;c<4;c++)
-   {
-      for(i=-7;i<=96000;i++)
-      {
-         int fs;
-         if((i==8000||i==12000||i==16000||i==24000||i==48000
+    short sbuf[960*2];
+    int c, err, cfgs;
+
+    cfgs = 0;
+    /*First test invalid configurations which should fail*/
+    fprintf(stdout, "\n  Encoder basic API tests\n");
+    fprintf(stdout, "  ---------------------------------------------------\n");
+    for (c = 0; c < 4; c++) {
+        i = oac_encoder_get_size(c);
+        if (((c == 1 || c == 2) && (i <= 2048 || i > 1<<18)) || ((c != 1 && c != 2) && i != 0)) test_failed();
+        fprintf(stdout, "    oac_encoder_get_size(%d)=%d ...............%s OK.\n", c, i, i > 0?"":"....");
+        cfgs++;
+    }
+
+    /*Test with unsupported sample rates, channel counts*/
+    for (c = 0; c < 4; c++) {
+        for (i = -7; i <= 96000; i++) {
+            int fs;
+            if ((i == 8000 || i == 12000 || i == 16000 || i == 24000 || i == 48000
 #ifdef ENABLE_QEXT
-               ||i==96000
+                 || i == 96000
 #endif
-               )&&(c==1||c==2))continue;
-         switch(i)
-         {
-           case(-5):fs=-8000;break;
-           case(-6):fs=INT32_MAX;break;
-           case(-7):fs=INT32_MIN;break;
-           default:fs=i;
-         }
-         err = OAC_OK;
-         VG_UNDEF(&err,sizeof(err));
-         enc = oac_encoder_create(fs, c, OAC_APPLICATION_VOIP, &err);
-         if(err!=OAC_BAD_ARG || enc!=NULL)test_failed();
-         cfgs++;
-         enc = oac_encoder_create(fs, c, OAC_APPLICATION_VOIP, 0);
-         if(enc!=NULL)test_failed();
-         cfgs++;
-         oac_encoder_destroy(enc);
-         enc=(OacEncoder*)malloc(oac_encoder_get_size(2));
-         if(enc==NULL)test_failed();
-         err = oac_encoder_init(enc, fs, c, OAC_APPLICATION_VOIP);
-         if(err!=OAC_BAD_ARG)test_failed();
-         cfgs++;
-         free(enc);
-      }
-   }
-
-   enc = oac_encoder_create(48000, 2, OAC_AUTO, NULL);
-   if(enc!=NULL)test_failed();
-   cfgs++;
-
-   VG_UNDEF(&err,sizeof(err));
-   enc = oac_encoder_create(48000, 2, OAC_AUTO, &err);
-   if(err!=OAC_BAD_ARG || enc!=NULL)test_failed();
-   cfgs++;
-
-   VG_UNDEF(&err,sizeof(err));
-   enc = oac_encoder_create(48000, 2, OAC_APPLICATION_VOIP, NULL);
-   if(enc==NULL)test_failed();
-   oac_encoder_destroy(enc);
-   cfgs++;
-
-   VG_UNDEF(&err,sizeof(err));
-   enc = oac_encoder_create(48000, 2, OAC_APPLICATION_RESTRICTED_LOWDELAY, &err);
-   if(err!=OAC_OK || enc==NULL)test_failed();
-   cfgs++;
-   err=oac_encoder_ctl(enc,OAC_GET_LOOKAHEAD(&i));
-   if(err!=OAC_OK || i<0 || i>32766)test_failed();
-   cfgs++;
-   oac_encoder_destroy(enc);
-
-   VG_UNDEF(&err,sizeof(err));
-   enc = oac_encoder_create(48000, 2, OAC_APPLICATION_AUDIO, &err);
-   if(err!=OAC_OK || enc==NULL)test_failed();
-   cfgs++;
-   err=oac_encoder_ctl(enc,OAC_GET_LOOKAHEAD(&i));
-   if(err!=OAC_OK || i<0 || i>32766)test_failed();
-   oac_encoder_destroy(enc);
-   cfgs++;
-
-   VG_UNDEF(&err,sizeof(err));
-   enc = oac_encoder_create(48000, 2, OAC_APPLICATION_VOIP, &err);
-   if(err!=OAC_OK || enc==NULL)test_failed();
-   cfgs++;
-
-   fprintf(stdout,"    oac_encoder_create() ........................ OK.\n");
-   fprintf(stdout,"    oac_encoder_init() .......................... OK.\n");
-
-   i=-12345;
-   VG_UNDEF(&i,sizeof(i));
-   err=oac_encoder_ctl(enc,OAC_GET_LOOKAHEAD(&i));
-   if(err!=OAC_OK || i<0 || i>32766)test_failed();
-   cfgs++;
-   err=oac_encoder_ctl(enc,OAC_GET_LOOKAHEAD(null_int_ptr));
-   if(err!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OAC_GET_LOOKAHEAD ........................... OK.\n");
-
-   err=oac_encoder_ctl(enc,OAC_GET_SAMPLE_RATE(&i));
-   if(err!=OAC_OK || i!=48000)test_failed();
-   cfgs++;
-   err=oac_encoder_ctl(enc,OAC_GET_SAMPLE_RATE(null_int_ptr));
-   if(err!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OAC_GET_SAMPLE_RATE ......................... OK.\n");
-
-   if(oac_encoder_ctl(enc,OAC_UNIMPLEMENTED)!=OAC_UNIMPLEMENTED)test_failed();
-   fprintf(stdout,"    OAC_UNIMPLEMENTED ........................... OK.\n");
-   cfgs++;
-
-   err=oac_encoder_ctl(enc,OAC_GET_APPLICATION(null_int_ptr));
-   if(err!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OAC_SET_APPLICATION(i),OAC_GET_APPLICATION(&i),-1,OAC_AUTO,
-     OAC_APPLICATION_AUDIO,OAC_APPLICATION_RESTRICTED_LOWDELAY,
+                 ) && (c == 1 || c == 2)) continue;
+            switch (i) {
+                case (-5): fs = -8000; break;
+                case (-6): fs = INT32_MAX; break;
+                case (-7): fs = INT32_MIN; break;
+                default: fs = i;
+            }
+            err = OAC_OK;
+            VG_UNDEF(&err, sizeof(err));
+            enc = oac_encoder_create(fs, c, OAC_APPLICATION_VOIP, &err);
+            if (err != OAC_BAD_ARG || enc != NULL) test_failed();
+            cfgs++;
+            enc = oac_encoder_create(fs, c, OAC_APPLICATION_VOIP, 0);
+            if (enc != NULL) test_failed();
+            cfgs++;
+            oac_encoder_destroy(enc);
+            enc = (OacEncoder*)malloc(oac_encoder_get_size(2));
+            if (enc == NULL) test_failed();
+            err = oac_encoder_init(enc, fs, c, OAC_APPLICATION_VOIP);
+            if (err != OAC_BAD_ARG) test_failed();
+            cfgs++;
+            free(enc);
+        }
+    }
+
+    enc = oac_encoder_create(48000, 2, OAC_AUTO, NULL);
+    if (enc != NULL) test_failed();
+    cfgs++;
+
+    VG_UNDEF(&err, sizeof(err));
+    enc = oac_encoder_create(48000, 2, OAC_AUTO, &err);
+    if (err != OAC_BAD_ARG || enc != NULL) test_failed();
+    cfgs++;
+
+    VG_UNDEF(&err, sizeof(err));
+    enc = oac_encoder_create(48000, 2, OAC_APPLICATION_VOIP, NULL);
+    if (enc == NULL) test_failed();
+    oac_encoder_destroy(enc);
+    cfgs++;
+
+    VG_UNDEF(&err, sizeof(err));
+    enc = oac_encoder_create(48000, 2, OAC_APPLICATION_RESTRICTED_LOWDELAY, &err);
+    if (err != OAC_OK || enc == NULL) test_failed();
+    cfgs++;
+    err = oac_encoder_ctl(enc, OAC_GET_LOOKAHEAD(&i));
+    if (err != OAC_OK || i < 0 || i > 32766) test_failed();
+    cfgs++;
+    oac_encoder_destroy(enc);
+
+    VG_UNDEF(&err, sizeof(err));
+    enc = oac_encoder_create(48000, 2, OAC_APPLICATION_AUDIO, &err);
+    if (err != OAC_OK || enc == NULL) test_failed();
+    cfgs++;
+    err = oac_encoder_ctl(enc, OAC_GET_LOOKAHEAD(&i));
+    if (err != OAC_OK || i < 0 || i > 32766) test_failed();
+    oac_encoder_destroy(enc);
+    cfgs++;
+
+    VG_UNDEF(&err, sizeof(err));
+    enc = oac_encoder_create(48000, 2, OAC_APPLICATION_VOIP, &err);
+    if (err != OAC_OK || enc == NULL) test_failed();
+    cfgs++;
+
+    fprintf(stdout, "    oac_encoder_create() ........................ OK.\n");
+    fprintf(stdout, "    oac_encoder_init() .......................... OK.\n");
+
+    i = -12345;
+    VG_UNDEF(&i, sizeof(i));
+    err = oac_encoder_ctl(enc, OAC_GET_LOOKAHEAD(&i));
+    if (err != OAC_OK || i < 0 || i > 32766) test_failed();
+    cfgs++;
+    err = oac_encoder_ctl(enc, OAC_GET_LOOKAHEAD(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    fprintf(stdout, "    OAC_GET_LOOKAHEAD ........................... OK.\n");
+
+    err = oac_encoder_ctl(enc, OAC_GET_SAMPLE_RATE(&i));
+    if (err != OAC_OK || i != 48000) test_failed();
+    cfgs++;
+    err = oac_encoder_ctl(enc, OAC_GET_SAMPLE_RATE(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    fprintf(stdout, "    OAC_GET_SAMPLE_RATE ......................... OK.\n");
+
+    if (oac_encoder_ctl(enc, OAC_UNIMPLEMENTED) != OAC_UNIMPLEMENTED) test_failed();
+    fprintf(stdout, "    OAC_UNIMPLEMENTED ........................... OK.\n");
+    cfgs++;
+
+    err = oac_encoder_ctl(enc, OAC_GET_APPLICATION(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    CHECK_SETGET(OAC_SET_APPLICATION(i), OAC_GET_APPLICATION(&i), -1, OAC_AUTO,
+     OAC_APPLICATION_AUDIO, OAC_APPLICATION_RESTRICTED_LOWDELAY,
      "    OAC_SET_APPLICATION ......................... OK.\n",
      "    OAC_GET_APPLICATION ......................... OK.\n")
 
-   err=oac_encoder_ctl(enc,OAC_GET_BITRATE(null_int_ptr));
-   if(err!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   if(oac_encoder_ctl(enc,OAC_SET_BITRATE(1073741832))!=OAC_OK)test_failed();
-   cfgs++;
-   VG_UNDEF(&i,sizeof(i));
-   if(oac_encoder_ctl(enc,OAC_GET_BITRATE(&i))!=OAC_OK)test_failed();
-   if(i>1700000||i<256000)test_failed();
-   cfgs++;
-   CHECK_SETGET(OAC_SET_BITRATE(i),OAC_GET_BITRATE(&i),-12345,0,
-     500,256000,
+    err = oac_encoder_ctl(enc, OAC_GET_BITRATE(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    if (oac_encoder_ctl(enc, OAC_SET_BITRATE(1073741832)) != OAC_OK) test_failed();
+    cfgs++;
+    VG_UNDEF(&i, sizeof(i));
+    if (oac_encoder_ctl(enc, OAC_GET_BITRATE(&i)) != OAC_OK) test_failed();
+    if (i > 1700000 || i < 256000) test_failed();
+    cfgs++;
+    CHECK_SETGET(OAC_SET_BITRATE(i), OAC_GET_BITRATE(&i), -12345, 0,
+     500, 256000,
      "    OAC_SET_BITRATE ............................. OK.\n",
      "    OAC_GET_BITRATE ............................. OK.\n")
 
-   err=oac_encoder_ctl(enc,OAC_GET_FORCE_CHANNELS(null_int_ptr));
-   if(err!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OAC_SET_FORCE_CHANNELS(i),OAC_GET_FORCE_CHANNELS(&i),-1,3,
-     1,OAC_AUTO,
+    err = oac_encoder_ctl(enc, OAC_GET_FORCE_CHANNELS(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    CHECK_SETGET(OAC_SET_FORCE_CHANNELS(i), OAC_GET_FORCE_CHANNELS(&i), -1, 3,
+     1, OAC_AUTO,
      "    OAC_SET_FORCE_CHANNELS ...................... OK.\n",
      "    OAC_GET_FORCE_CHANNELS ...................... OK.\n")
 
-   i=-2;
-   if(oac_encoder_ctl(enc,OAC_SET_BANDWIDTH(i))==OAC_OK)test_failed();
-   cfgs++;
-   i=OAC_BANDWIDTH_FULLBAND+1;
-   if(oac_encoder_ctl(enc,OAC_SET_BANDWIDTH(i))==OAC_OK)test_failed();
-   cfgs++;
-   i=OAC_BANDWIDTH_NARROWBAND;
-   if(oac_encoder_ctl(enc,OAC_SET_BANDWIDTH(i))!=OAC_OK)test_failed();
-   cfgs++;
-   i=OAC_BANDWIDTH_FULLBAND;
-   if(oac_encoder_ctl(enc,OAC_SET_BANDWIDTH(i))!=OAC_OK)test_failed();
-   cfgs++;
-   i=OAC_BANDWIDTH_WIDEBAND;
-   if(oac_encoder_ctl(enc,OAC_SET_BANDWIDTH(i))!=OAC_OK)test_failed();
-   cfgs++;
-   i=OAC_BANDWIDTH_MEDIUMBAND;
-   if(oac_encoder_ctl(enc,OAC_SET_BANDWIDTH(i))!=OAC_OK)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OAC_SET_BANDWIDTH ........................... OK.\n");
-   /*We don't test if the bandwidth has actually changed.
-     because the change may be delayed until the encoder is advanced.*/
-   i=-12345;
-   VG_UNDEF(&i,sizeof(i));
-   err=oac_encoder_ctl(enc,OAC_GET_BANDWIDTH(&i));
-   if(err!=OAC_OK || (i!=OAC_BANDWIDTH_NARROWBAND&&
-      i!=OAC_BANDWIDTH_MEDIUMBAND&&i!=OAC_BANDWIDTH_WIDEBAND&&
-      i!=OAC_BANDWIDTH_FULLBAND&&i!=OAC_AUTO))test_failed();
-   cfgs++;
-   if(oac_encoder_ctl(enc,OAC_SET_BANDWIDTH(OAC_AUTO))!=OAC_OK)test_failed();
-   cfgs++;
-   err=oac_encoder_ctl(enc,OAC_GET_BANDWIDTH(null_int_ptr));
-   if(err!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OAC_GET_BANDWIDTH ........................... OK.\n");
-
-   i=-2;
-   if(oac_encoder_ctl(enc,OAC_SET_MAX_BANDWIDTH(i))==OAC_OK)test_failed();
-   cfgs++;
-   i=OAC_BANDWIDTH_FULLBAND+1;
-   if(oac_encoder_ctl(enc,OAC_SET_MAX_BANDWIDTH(i))==OAC_OK)test_failed();
-   cfgs++;
-   i=OAC_BANDWIDTH_NARROWBAND;
-   if(oac_encoder_ctl(enc,OAC_SET_MAX_BANDWIDTH(i))!=OAC_OK)test_failed();
-   cfgs++;
-   i=OAC_BANDWIDTH_FULLBAND;
-   if(oac_encoder_ctl(enc,OAC_SET_MAX_BANDWIDTH(i))!=OAC_OK)test_failed();
-   cfgs++;
-   i=OAC_BANDWIDTH_WIDEBAND;
-   if(oac_encoder_ctl(enc,OAC_SET_MAX_BANDWIDTH(i))!=OAC_OK)test_failed();
-   cfgs++;
-   i=OAC_BANDWIDTH_MEDIUMBAND;
-   if(oac_encoder_ctl(enc,OAC_SET_MAX_BANDWIDTH(i))!=OAC_OK)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OAC_SET_MAX_BANDWIDTH ....................... OK.\n");
-   /*We don't test if the bandwidth has actually changed.
-     because the change may be delayed until the encoder is advanced.*/
-   i=-12345;
-   VG_UNDEF(&i,sizeof(i));
-   err=oac_encoder_ctl(enc,OAC_GET_MAX_BANDWIDTH(&i));
-   if(err!=OAC_OK || (i!=OAC_BANDWIDTH_NARROWBAND&&
-      i!=OAC_BANDWIDTH_MEDIUMBAND&&i!=OAC_BANDWIDTH_WIDEBAND&&
-      i!=OAC_BANDWIDTH_FULLBAND))test_failed();
-   cfgs++;
-   err=oac_encoder_ctl(enc,OAC_GET_MAX_BANDWIDTH(null_int_ptr));
-   if(err!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OAC_GET_MAX_BANDWIDTH ....................... OK.\n");
-
-   err=oac_encoder_ctl(enc,OAC_GET_DTX(null_int_ptr));
-   if(err!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OAC_SET_DTX(i),OAC_GET_DTX(&i),-1,2,
-     1,0,
+    i = -2;
+    if (oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(i)) == OAC_OK) test_failed();
+    cfgs++;
+    i = OAC_BANDWIDTH_FULLBAND + 1;
+    if (oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(i)) == OAC_OK) test_failed();
+    cfgs++;
+    i = OAC_BANDWIDTH_NARROWBAND;
+    if (oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(i)) != OAC_OK) test_failed();
+    cfgs++;
+    i = OAC_BANDWIDTH_FULLBAND;
+    if (oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(i)) != OAC_OK) test_failed();
+    cfgs++;
+    i = OAC_BANDWIDTH_WIDEBAND;
+    if (oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(i)) != OAC_OK) test_failed();
+    cfgs++;
+    i = OAC_BANDWIDTH_MEDIUMBAND;
+    if (oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(i)) != OAC_OK) test_failed();
+    cfgs++;
+    fprintf(stdout, "    OAC_SET_BANDWIDTH ........................... OK.\n");
+    /*We don't test if the bandwidth has actually changed.
+       because the change may be delayed until the encoder is advanced.*/
+    i = -12345;
+    VG_UNDEF(&i, sizeof(i));
+    err = oac_encoder_ctl(enc, OAC_GET_BANDWIDTH(&i));
+    if (err != OAC_OK || (i != OAC_BANDWIDTH_NARROWBAND
+                          && i != OAC_BANDWIDTH_MEDIUMBAND && i != OAC_BANDWIDTH_WIDEBAND
+                          && i != OAC_BANDWIDTH_FULLBAND && i != OAC_AUTO)) test_failed();
+    cfgs++;
+    if (oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_AUTO)) != OAC_OK) test_failed();
+    cfgs++;
+    err = oac_encoder_ctl(enc, OAC_GET_BANDWIDTH(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    fprintf(stdout, "    OAC_GET_BANDWIDTH ........................... OK.\n");
+
+    i = -2;
+    if (oac_encoder_ctl(enc, OAC_SET_MAX_BANDWIDTH(i)) == OAC_OK) test_failed();
+    cfgs++;
+    i = OAC_BANDWIDTH_FULLBAND + 1;
+    if (oac_encoder_ctl(enc, OAC_SET_MAX_BANDWIDTH(i)) == OAC_OK) test_failed();
+    cfgs++;
+    i = OAC_BANDWIDTH_NARROWBAND;
+    if (oac_encoder_ctl(enc, OAC_SET_MAX_BANDWIDTH(i)) != OAC_OK) test_failed();
+    cfgs++;
+    i = OAC_BANDWIDTH_FULLBAND;
+    if (oac_encoder_ctl(enc, OAC_SET_MAX_BANDWIDTH(i)) != OAC_OK) test_failed();
+    cfgs++;
+    i = OAC_BANDWIDTH_WIDEBAND;
+    if (oac_encoder_ctl(enc, OAC_SET_MAX_BANDWIDTH(i)) != OAC_OK) test_failed();
+    cfgs++;
+    i = OAC_BANDWIDTH_MEDIUMBAND;
+    if (oac_encoder_ctl(enc, OAC_SET_MAX_BANDWIDTH(i)) != OAC_OK) test_failed();
+    cfgs++;
+    fprintf(stdout, "    OAC_SET_MAX_BANDWIDTH ....................... OK.\n");
+    /*We don't test if the bandwidth has actually changed.
+       because the change may be delayed until the encoder is advanced.*/
+    i = -12345;
+    VG_UNDEF(&i, sizeof(i));
+    err = oac_encoder_ctl(enc, OAC_GET_MAX_BANDWIDTH(&i));
+    if (err != OAC_OK || (i != OAC_BANDWIDTH_NARROWBAND
+                          && i != OAC_BANDWIDTH_MEDIUMBAND && i != OAC_BANDWIDTH_WIDEBAND
+                          && i != OAC_BANDWIDTH_FULLBAND)) test_failed();
+    cfgs++;
+    err = oac_encoder_ctl(enc, OAC_GET_MAX_BANDWIDTH(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    fprintf(stdout, "    OAC_GET_MAX_BANDWIDTH ....................... OK.\n");
+
+    err = oac_encoder_ctl(enc, OAC_GET_DTX(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    CHECK_SETGET(OAC_SET_DTX(i), OAC_GET_DTX(&i), -1, 2,
+     1, 0,
      "    OAC_SET_DTX ................................. OK.\n",
      "    OAC_GET_DTX ................................. OK.\n")
 
-   err=oac_encoder_ctl(enc,OAC_GET_COMPLEXITY(null_int_ptr));
-   if(err!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OAC_SET_COMPLEXITY(i),OAC_GET_COMPLEXITY(&i),-1,11,
-     0,10,
+    err = oac_encoder_ctl(enc, OAC_GET_COMPLEXITY(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    CHECK_SETGET(OAC_SET_COMPLEXITY(i), OAC_GET_COMPLEXITY(&i), -1, 11,
+     0, 10,
      "    OAC_SET_COMPLEXITY .......................... OK.\n",
      "    OAC_GET_COMPLEXITY .......................... OK.\n")
 
-   err=oac_encoder_ctl(enc,OAC_GET_INBAND_FEC(null_int_ptr));
-   if(err!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OAC_SET_INBAND_FEC(i),OAC_GET_INBAND_FEC(&i),-1,3,
-     1,0,
+    err = oac_encoder_ctl(enc, OAC_GET_INBAND_FEC(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    CHECK_SETGET(OAC_SET_INBAND_FEC(i), OAC_GET_INBAND_FEC(&i), -1, 3,
+     1, 0,
      "    OAC_SET_INBAND_FEC .......................... OK.\n",
      "    OAC_GET_INBAND_FEC .......................... OK.\n")
 
-   err=oac_encoder_ctl(enc,OAC_GET_PACKET_LOSS_PERC(null_int_ptr));
-   if(err!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OAC_SET_PACKET_LOSS_PERC(i),OAC_GET_PACKET_LOSS_PERC(&i),-1,101,
-     100,0,
+    err = oac_encoder_ctl(enc, OAC_GET_PACKET_LOSS_PERC(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    CHECK_SETGET(OAC_SET_PACKET_LOSS_PERC(i), OAC_GET_PACKET_LOSS_PERC(&i), -1, 101,
+     100, 0,
      "    OAC_SET_PACKET_LOSS_PERC .................... OK.\n",
      "    OAC_GET_PACKET_LOSS_PERC .................... OK.\n")
 
-   err=oac_encoder_ctl(enc,OAC_GET_VBR(null_int_ptr));
-   if(err!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OAC_SET_VBR(i),OAC_GET_VBR(&i),-1,2,
-     1,0,
+    err = oac_encoder_ctl(enc, OAC_GET_VBR(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    CHECK_SETGET(OAC_SET_VBR(i), OAC_GET_VBR(&i), -1, 2,
+     1, 0,
      "    OAC_SET_VBR ................................. OK.\n",
      "    OAC_GET_VBR ................................. OK.\n")
 
@@ -1339,425 +1330,414 @@ oac_int32 test_enc_api(void)
      "    OAC_SET_VOICE_RATIO ......................... OK.\n",
      "    OAC_GET_VOICE_RATIO ......................... OK.\n")*/
 
-   err=oac_encoder_ctl(enc,OAC_GET_VBR_CONSTRAINT(null_int_ptr));
-   if(err!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OAC_SET_VBR_CONSTRAINT(i),OAC_GET_VBR_CONSTRAINT(&i),-1,2,
-     1,0,
+    err = oac_encoder_ctl(enc, OAC_GET_VBR_CONSTRAINT(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    CHECK_SETGET(OAC_SET_VBR_CONSTRAINT(i), OAC_GET_VBR_CONSTRAINT(&i), -1, 2,
+     1, 0,
      "    OAC_SET_VBR_CONSTRAINT ...................... OK.\n",
      "    OAC_GET_VBR_CONSTRAINT ...................... OK.\n")
 
-   err=oac_encoder_ctl(enc,OAC_GET_SIGNAL(null_int_ptr));
-   if(err!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OAC_SET_SIGNAL(i),OAC_GET_SIGNAL(&i),-12345,0x7FFFFFFF,
-     OAC_SIGNAL_MUSIC,OAC_AUTO,
+    err = oac_encoder_ctl(enc, OAC_GET_SIGNAL(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    CHECK_SETGET(OAC_SET_SIGNAL(i), OAC_GET_SIGNAL(&i), -12345, 0x7FFFFFFF,
+     OAC_SIGNAL_MUSIC, OAC_AUTO,
      "    OAC_SET_SIGNAL .............................. OK.\n",
      "    OAC_GET_SIGNAL .............................. OK.\n")
 
-   err=oac_encoder_ctl(enc,OAC_GET_LSB_DEPTH(null_int_ptr));
-   if(err!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OAC_SET_LSB_DEPTH(i),OAC_GET_LSB_DEPTH(&i),7,25,16,24,
+    err = oac_encoder_ctl(enc, OAC_GET_LSB_DEPTH(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    CHECK_SETGET(OAC_SET_LSB_DEPTH(i), OAC_GET_LSB_DEPTH(&i), 7, 25, 16, 24,
      "    OAC_SET_LSB_DEPTH ........................... OK.\n",
      "    OAC_GET_LSB_DEPTH ........................... OK.\n")
 
-   err=oac_encoder_ctl(enc,OAC_GET_PREDICTION_DISABLED(&i));
-   if(i!=0)test_failed();
-   cfgs++;
-   err=oac_encoder_ctl(enc,OAC_GET_PREDICTION_DISABLED(null_int_ptr));
-   if(err!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   CHECK_SETGET(OAC_SET_PREDICTION_DISABLED(i),OAC_GET_PREDICTION_DISABLED(&i),-1,2,1,0,
+    err = oac_encoder_ctl(enc, OAC_GET_PREDICTION_DISABLED(&i));
+    if (i != 0) test_failed();
+    cfgs++;
+    err = oac_encoder_ctl(enc, OAC_GET_PREDICTION_DISABLED(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    CHECK_SETGET(OAC_SET_PREDICTION_DISABLED(i), OAC_GET_PREDICTION_DISABLED(&i), -1, 2, 1, 0,
      "    OAC_SET_PREDICTION_DISABLED ................. OK.\n",
      "    OAC_GET_PREDICTION_DISABLED ................. OK.\n")
 
-   err=oac_encoder_ctl(enc,OAC_GET_EXPERT_FRAME_DURATION(null_int_ptr));
-   if(err!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   err=oac_encoder_ctl(enc,OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_2_5_MS));
-   if(err!=OAC_OK)test_failed();
-   cfgs++;
-   err=oac_encoder_ctl(enc,OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_5_MS));
-   if(err!=OAC_OK)test_failed();
-   cfgs++;
-   err=oac_encoder_ctl(enc,OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_10_MS));
-   if(err!=OAC_OK)test_failed();
-   cfgs++;
-   err=oac_encoder_ctl(enc,OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_20_MS));
-   if(err!=OAC_OK)test_failed();
-   cfgs++;
-   err=oac_encoder_ctl(enc,OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_40_MS));
-   if(err!=OAC_OK)test_failed();
-   cfgs++;
-   err=oac_encoder_ctl(enc,OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_60_MS));
-   if(err!=OAC_OK)test_failed();
-   cfgs++;
-   err=oac_encoder_ctl(enc,OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_80_MS));
-   if(err!=OAC_OK)test_failed();
-   cfgs++;
-   err=oac_encoder_ctl(enc,OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_100_MS));
-   if(err!=OAC_OK)test_failed();
-   cfgs++;
-   err=oac_encoder_ctl(enc,OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_120_MS));
-   if(err!=OAC_OK)test_failed();
-   cfgs++;
-   CHECK_SETGET(OAC_SET_EXPERT_FRAME_DURATION(i),OAC_GET_EXPERT_FRAME_DURATION(&i),0,-1,
-         OAC_FRAMESIZE_60_MS,OAC_FRAMESIZE_ARG,
+    err = oac_encoder_ctl(enc, OAC_GET_EXPERT_FRAME_DURATION(null_int_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    err = oac_encoder_ctl(enc, OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_2_5_MS));
+    if (err != OAC_OK) test_failed();
+    cfgs++;
+    err = oac_encoder_ctl(enc, OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_5_MS));
+    if (err != OAC_OK) test_failed();
+    cfgs++;
+    err = oac_encoder_ctl(enc, OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_10_MS));
+    if (err != OAC_OK) test_failed();
+    cfgs++;
+    err = oac_encoder_ctl(enc, OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_20_MS));
+    if (err != OAC_OK) test_failed();
+    cfgs++;
+    err = oac_encoder_ctl(enc, OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_40_MS));
+    if (err != OAC_OK) test_failed();
+    cfgs++;
+    err = oac_encoder_ctl(enc, OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_60_MS));
+    if (err != OAC_OK) test_failed();
+    cfgs++;
+    err = oac_encoder_ctl(enc, OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_80_MS));
+    if (err != OAC_OK) test_failed();
+    cfgs++;
+    err = oac_encoder_ctl(enc, OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_100_MS));
+    if (err != OAC_OK) test_failed();
+    cfgs++;
+    err = oac_encoder_ctl(enc, OAC_SET_EXPERT_FRAME_DURATION(OAC_FRAMESIZE_120_MS));
+    if (err != OAC_OK) test_failed();
+    cfgs++;
+    CHECK_SETGET(OAC_SET_EXPERT_FRAME_DURATION(i), OAC_GET_EXPERT_FRAME_DURATION(&i), 0, -1,
+         OAC_FRAMESIZE_60_MS, OAC_FRAMESIZE_ARG,
      "    OAC_SET_EXPERT_FRAME_DURATION ............... OK.\n",
      "    OAC_GET_EXPERT_FRAME_DURATION ............... OK.\n")
 
-   /*OAC_SET_FORCE_MODE is not tested here because it's not a public API, however the encoder tests use it*/
-
-   err=oac_encoder_ctl(enc,OAC_GET_FINAL_RANGE(null_uint_ptr));
-   if(err!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   if(oac_encoder_ctl(enc,OAC_GET_FINAL_RANGE(&enc_final_range))!=OAC_OK)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OAC_GET_FINAL_RANGE ......................... OK.\n");
-
-   /*Reset the encoder*/
-   if(oac_encoder_ctl(enc, OAC_RESET_STATE)!=OAC_OK)test_failed();
-   cfgs++;
-   fprintf(stdout,"    OAC_RESET_STATE ............................. OK.\n");
-
-   memset(sbuf,0,sizeof(short)*2*960);
-   VG_UNDEF(packet,sizeof(packet));
-   i=oac_encode(enc, sbuf, 960, packet, sizeof(packet));
-   if(i<1 || (i>(oac_int32)sizeof(packet)))test_failed();
-   VG_CHECK(packet,i);
-   cfgs++;
-   fprintf(stdout,"    oac_encode() ................................ OK.\n");
+    /*OAC_SET_FORCE_MODE is not tested here because it's not a public API, however the encoder tests use it*/
+
+    err = oac_encoder_ctl(enc, OAC_GET_FINAL_RANGE(null_uint_ptr));
+    if (err != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    if (oac_encoder_ctl(enc, OAC_GET_FINAL_RANGE(&enc_final_range)) != OAC_OK) test_failed();
+    cfgs++;
+    fprintf(stdout, "    OAC_GET_FINAL_RANGE ......................... OK.\n");
+
+    /*Reset the encoder*/
+    if (oac_encoder_ctl(enc, OAC_RESET_STATE) != OAC_OK) test_failed();
+    cfgs++;
+    fprintf(stdout, "    OAC_RESET_STATE ............................. OK.\n");
+
+    memset(sbuf, 0, sizeof(short)*2*960);
+    VG_UNDEF(packet, sizeof(packet));
+    i = oac_encode(enc, sbuf, 960, packet, sizeof(packet));
+    if (i < 1 || (i > (oac_int32)sizeof(packet))) test_failed();
+    VG_CHECK(packet, i);
+    cfgs++;
+    fprintf(stdout, "    oac_encode() ................................ OK.\n");
 #ifndef DISABLE_FLOAT_API
-   memset(fbuf,0,sizeof(float)*2*960);
-   VG_UNDEF(packet,sizeof(packet));
-   i=oac_encode_float(enc, fbuf, 960, packet, sizeof(packet));
-   if(i<1 || (i>(oac_int32)sizeof(packet)))test_failed();
-   VG_CHECK(packet,i);
-   cfgs++;
-   fprintf(stdout,"    oac_encode_float() .......................... OK.\n");
+    memset(fbuf, 0, sizeof(float)*2*960);
+    VG_UNDEF(packet, sizeof(packet));
+    i = oac_encode_float(enc, fbuf, 960, packet, sizeof(packet));
+    if (i < 1 || (i > (oac_int32)sizeof(packet))) test_failed();
+    VG_CHECK(packet, i);
+    cfgs++;
+    fprintf(stdout, "    oac_encode_float() .......................... OK.\n");
 #endif
 
 #if 0
-   /*These tests are disabled because the library crashes with null states*/
-   if(oac_encoder_ctl(0,OAC_RESET_STATE)               !=OAC_INVALID_STATE)test_failed();
-   if(oac_encoder_init(0,48000,1,OAC_APPLICATION_VOIP) !=OAC_INVALID_STATE)test_failed();
-   if(oac_encode(0,sbuf,960,packet,sizeof(packet))      !=OAC_INVALID_STATE)test_failed();
-   if(oac_encode_float(0,fbuf,960,packet,sizeof(packet))!=OAC_INVALID_STATE)test_failed();
+    /*These tests are disabled because the library crashes with null states*/
+    if (oac_encoder_ctl(0, OAC_RESET_STATE)               != OAC_INVALID_STATE)test_failed();
+    if (oac_encoder_init(0, 48000, 1, OAC_APPLICATION_VOIP) != OAC_INVALID_STATE) test_failed();
+    if (oac_encode(0, sbuf, 960, packet, sizeof(packet))      != OAC_INVALID_STATE)test_failed();
+    if (oac_encode_float(0, fbuf, 960, packet, sizeof(packet)) != OAC_INVALID_STATE) test_failed();
 #endif
-   oac_encoder_destroy(enc);
-   cfgs++;
-   fprintf(stdout,"                   All encoder interface tests passed\n");
-   fprintf(stdout,"                             (%d API invocations)\n",cfgs);
-   return cfgs;
+    oac_encoder_destroy(enc);
+    cfgs++;
+    fprintf(stdout, "                   All encoder interface tests passed\n");
+    fprintf(stdout, "                             (%d API invocations)\n", cfgs);
+    return cfgs;
 }
 
-#define max_out (1276*48+48*2+2)
-int test_repacketizer_api(void)
-{
-   int ret,cfgs,i,j,k;
-   OacRepacketizer *rp;
-   unsigned char *packet;
-   unsigned char *po;
-   cfgs=0;
-   fprintf(stdout,"\n  Repacketizer tests\n");
-   fprintf(stdout,"  ---------------------------------------------------\n");
-
-   packet=(unsigned char *)malloc(max_out);
-   if(packet==NULL)test_failed();
-   memset(packet,0,max_out);
-   po=(unsigned char *)malloc(max_out+256);
-   if(po==NULL)test_failed();
-
-   i=oac_repacketizer_get_size();
-   if(i<=0)test_failed();
-   cfgs++;
-   fprintf(stdout,"    oac_repacketizer_get_size()=%d ............. OK.\n",i);
-
-   rp=(OacRepacketizer*)malloc(i);
-   rp=oac_repacketizer_init(rp);
-   if(rp==NULL)test_failed();
-   cfgs++;
-   free(rp);
-   fprintf(stdout,"    oac_repacketizer_init ....................... OK.\n");
-
-   rp=oac_repacketizer_create();
-   if(rp==NULL)test_failed();
-   cfgs++;
-   fprintf(stdout,"    oac_repacketizer_create ..................... OK.\n");
-
-   if(oac_repacketizer_get_nb_frames(rp)!=0)test_failed();
-   cfgs++;
-   fprintf(stdout,"    oac_repacketizer_get_nb_frames .............. OK.\n");
-
-   /*Length overflows*/
-   VG_UNDEF(packet,4);
-   if(oac_repacketizer_cat(rp,packet,0)!=OAC_INVALID_PACKET)test_failed(); /* Zero len */
-   cfgs++;
-   packet[0]=1;
-   if(oac_repacketizer_cat(rp,packet,2)!=OAC_INVALID_PACKET)test_failed(); /* Odd payload code 1 */
-   cfgs++;
-   packet[0]=2;
-   if(oac_repacketizer_cat(rp,packet,1)!=OAC_INVALID_PACKET)test_failed(); /* Code 2 overflow one */
-   cfgs++;
-   packet[0]=3;
-   if(oac_repacketizer_cat(rp,packet,1)!=OAC_INVALID_PACKET)test_failed(); /* Code 3 no count */
-   cfgs++;
-   packet[0]=2;
-   packet[1]=255;
-   if(oac_repacketizer_cat(rp,packet,2)!=OAC_INVALID_PACKET)test_failed(); /* Code 2 overflow two */
-   cfgs++;
-   packet[0]=2;
-   packet[1]=250;
-   if(oac_repacketizer_cat(rp,packet,251)!=OAC_INVALID_PACKET)test_failed(); /* Code 2 overflow three */
-   cfgs++;
-   packet[0]=3;
-   packet[1]=0;
-   if(oac_repacketizer_cat(rp,packet,2)!=OAC_INVALID_PACKET)test_failed(); /* Code 3 m=0 */
-   cfgs++;
-   packet[1]=49;
-   if(oac_repacketizer_cat(rp,packet,100)!=OAC_INVALID_PACKET)test_failed(); /* Code 3 m=49 */
-   cfgs++;
-   packet[0]=0;
-   if(oac_repacketizer_cat(rp,packet,3)!=OAC_OK)test_failed();
-   cfgs++;
-   packet[0]=1<<2;
-   if(oac_repacketizer_cat(rp,packet,3)!=OAC_INVALID_PACKET)test_failed(); /* Change in TOC */
-   cfgs++;
-
-   /* Code 0,1,3 CBR -> Code 0,1,3 CBR */
-   oac_repacketizer_init(rp);
-   for(j=0;j<32;j++)
-   {
-      /* TOC types, test half with stereo */
-      int maxi;
-      packet[0]=((j<<1)+(j&1))<<2;
-      maxi=960/oac_packet_get_samples_per_frame(packet,8000);
-      for(i=1;i<=maxi;i++)
-      {
-         /* Number of CBR frames in the input packets */
-         int maxp;
-         packet[0]=((j<<1)+(j&1))<<2;
-         if(i>1)packet[0]+=i==2?1:3;
-         packet[1]=i>2?i:0;
-         maxp=960/(i*oac_packet_get_samples_per_frame(packet,8000));
-         for(k=0;k<=(1275+75);k+=3)
-         {
-            /*Payload size*/
-            oac_int32 cnt,rcnt;
-            if(k%i!=0)continue; /* Only testing CBR here, payload must be a multiple of the count */
-            for(cnt=0;cnt<maxp+2;cnt++)
-            {
-               if(cnt>0)
-               {
-                  ret=oac_repacketizer_cat(rp,packet,k+(i>2?2:1));
-                  if((cnt<=maxp&&k<=(1275*i))?ret!=OAC_OK:ret!=OAC_INVALID_PACKET)test_failed();
-                  cfgs++;
-               }
-               rcnt=k<=(1275*i)?(cnt<maxp?cnt:maxp):0;
-               if(oac_repacketizer_get_nb_frames(rp)!=rcnt*i)test_failed();
-               cfgs++;
-               ret=oac_repacketizer_out_range(rp,0,rcnt*i,po,max_out);
-               if(rcnt>0)
-               {
-                  int len;
-                  len=k*rcnt+((rcnt*i)>2?2:1);
-                  if(ret!=len)test_failed();
-                  if((rcnt*i)<2&&(po[0]&3)!=0)test_failed();                      /* Code 0 */
-                  if((rcnt*i)==2&&(po[0]&3)!=1)test_failed();                     /* Code 1 */
-                  if((rcnt*i)>2&&(((po[0]&3)!=3)||(po[1]!=rcnt*i)))test_failed(); /* Code 3 CBR */
-                  cfgs++;
-                  if(oac_repacketizer_out(rp,po,len)!=len)test_failed();
-                  cfgs++;
-                  if(oac_packet_unpad(po,len)!=len)test_failed();
-                  cfgs++;
-                  if(oac_packet_pad(po,len,len+1)!=OAC_OK)test_failed();
-                  cfgs++;
-                  if(oac_packet_pad(po,len+1,len+256)!=OAC_OK)test_failed();
-                  cfgs++;
-                  if(oac_packet_unpad(po,len+256)!=len)test_failed();
-                  cfgs++;
-                  if(oac_multistream_packet_unpad(po,len,1)!=len)test_failed();
-                  cfgs++;
-                  if(oac_multistream_packet_pad(po,len,len+1,1)!=OAC_OK)test_failed();
-                  cfgs++;
-                  if(oac_multistream_packet_pad(po,len+1,len+256,1)!=OAC_OK)test_failed();
-                  cfgs++;
-                  if(oac_multistream_packet_unpad(po,len+256,1)!=len)test_failed();
-                  cfgs++;
-                  if(oac_repacketizer_out(rp,po,len-1)!=OAC_BUFFER_TOO_SMALL)test_failed();
-                  cfgs++;
-                  if(len>1)
-                  {
-                     if(oac_repacketizer_out(rp,po,1)!=OAC_BUFFER_TOO_SMALL)test_failed();
-                     cfgs++;
-                  }
-                  if(oac_repacketizer_out(rp,po,0)!=OAC_BUFFER_TOO_SMALL)test_failed();
-                  cfgs++;
-               } else if (ret!=OAC_BAD_ARG)test_failed();                        /* M must not be 0 */
+#define max_out (1276*48 + 48*2 + 2)
+int test_repacketizer_api(void) {
+    int ret, cfgs, i, j, k;
+    OacRepacketizer *rp;
+    unsigned char *packet;
+    unsigned char *po;
+    cfgs = 0;
+    fprintf(stdout, "\n  Repacketizer tests\n");
+    fprintf(stdout, "  ---------------------------------------------------\n");
+
+    packet = (unsigned char *)malloc(max_out);
+    if (packet == NULL) test_failed();
+    memset(packet, 0, max_out);
+    po = (unsigned char *)malloc(max_out + 256);
+    if (po == NULL) test_failed();
+
+    i = oac_repacketizer_get_size();
+    if (i <= 0) test_failed();
+    cfgs++;
+    fprintf(stdout, "    oac_repacketizer_get_size()=%d ............. OK.\n", i);
+
+    rp = (OacRepacketizer*)malloc(i);
+    rp = oac_repacketizer_init(rp);
+    if (rp == NULL) test_failed();
+    cfgs++;
+    free(rp);
+    fprintf(stdout, "    oac_repacketizer_init ....................... OK.\n");
+
+    rp = oac_repacketizer_create();
+    if (rp == NULL) test_failed();
+    cfgs++;
+    fprintf(stdout, "    oac_repacketizer_create ..................... OK.\n");
+
+    if (oac_repacketizer_get_nb_frames(rp) != 0) test_failed();
+    cfgs++;
+    fprintf(stdout, "    oac_repacketizer_get_nb_frames .............. OK.\n");
+
+    /*Length overflows*/
+    VG_UNDEF(packet, 4);
+    if (oac_repacketizer_cat(rp, packet, 0) != OAC_INVALID_PACKET) test_failed(); /* Zero len */
+    cfgs++;
+    packet[0] = 1;
+    if (oac_repacketizer_cat(rp, packet, 2) != OAC_INVALID_PACKET) test_failed(); /* Odd payload code 1 */
+    cfgs++;
+    packet[0] = 2;
+    if (oac_repacketizer_cat(rp, packet, 1) != OAC_INVALID_PACKET) test_failed(); /* Code 2 overflow one */
+    cfgs++;
+    packet[0] = 3;
+    if (oac_repacketizer_cat(rp, packet, 1) != OAC_INVALID_PACKET) test_failed(); /* Code 3 no count */
+    cfgs++;
+    packet[0] = 2;
+    packet[1] = 255;
+    if (oac_repacketizer_cat(rp, packet, 2) != OAC_INVALID_PACKET) test_failed(); /* Code 2 overflow two */
+    cfgs++;
+    packet[0] = 2;
+    packet[1] = 250;
+    if (oac_repacketizer_cat(rp, packet, 251) != OAC_INVALID_PACKET) test_failed(); /* Code 2 overflow three */
+    cfgs++;
+    packet[0] = 3;
+    packet[1] = 0;
+    if (oac_repacketizer_cat(rp, packet, 2) != OAC_INVALID_PACKET) test_failed(); /* Code 3 m=0 */
+    cfgs++;
+    packet[1] = 49;
+    if (oac_repacketizer_cat(rp, packet, 100) != OAC_INVALID_PACKET) test_failed(); /* Code 3 m=49 */
+    cfgs++;
+    packet[0] = 0;
+    if (oac_repacketizer_cat(rp, packet, 3) != OAC_OK) test_failed();
+    cfgs++;
+    packet[0] = 1<<2;
+    if (oac_repacketizer_cat(rp, packet, 3) != OAC_INVALID_PACKET) test_failed(); /* Change in TOC */
+    cfgs++;
+
+    /* Code 0,1,3 CBR -> Code 0,1,3 CBR */
+    oac_repacketizer_init(rp);
+    for (j = 0; j < 32; j++) {
+        /* TOC types, test half with stereo */
+        int maxi;
+        packet[0] = ((j<<1) + (j&1))<<2;
+        maxi = 960/oac_packet_get_samples_per_frame(packet, 8000);
+        for (i = 1; i <= maxi; i++) {
+            /* Number of CBR frames in the input packets */
+            int maxp;
+            packet[0] = ((j<<1) + (j&1))<<2;
+            if (i > 1) packet[0] += i == 2?1:3;
+            packet[1] = i > 2?i:0;
+            maxp = 960/(i*oac_packet_get_samples_per_frame(packet, 8000));
+            for (k = 0; k <= (1275 + 75); k += 3) {
+                /*Payload size*/
+                oac_int32 cnt, rcnt;
+                if (k%i != 0) continue; /* Only testing CBR here, payload must be a multiple of the count */
+                for (cnt = 0; cnt < maxp + 2; cnt++) {
+                    if (cnt > 0) {
+                        ret = oac_repacketizer_cat(rp, packet, k + (i > 2?2:1));
+                        if ((cnt <= maxp && k <= (1275*i))?ret != OAC_OK:ret != OAC_INVALID_PACKET) test_failed();
+                        cfgs++;
+                    }
+                    rcnt = k <= (1275*i)?(cnt < maxp?cnt:maxp):0;
+                    if (oac_repacketizer_get_nb_frames(rp) != rcnt*i) test_failed();
+                    cfgs++;
+                    ret = oac_repacketizer_out_range(rp, 0, rcnt*i, po, max_out);
+                    if (rcnt > 0) {
+                        int len;
+                        len = k*rcnt + ((rcnt*i) > 2?2:1);
+                        if (ret != len) test_failed();
+                        if ((rcnt*i) < 2 && (po[0]&3) != 0) test_failed();        /* Code 0 */
+                        if ((rcnt*i) == 2 && (po[0]&3) != 1) test_failed();       /* Code 1 */
+                        if ((rcnt*i) > 2 && (((po[0]&3) != 3) || (po[1] != rcnt*i))) test_failed(); /* Code 3 CBR */
+                        cfgs++;
+                        if (oac_repacketizer_out(rp, po, len) != len) test_failed();
+                        cfgs++;
+                        if (oac_packet_unpad(po, len) != len) test_failed();
+                        cfgs++;
+                        if (oac_packet_pad(po, len, len + 1) != OAC_OK) test_failed();
+                        cfgs++;
+                        if (oac_packet_pad(po, len + 1, len + 256) != OAC_OK) test_failed();
+                        cfgs++;
+                        if (oac_packet_unpad(po, len + 256) != len) test_failed();
+                        cfgs++;
+                        if (oac_multistream_packet_unpad(po, len, 1) != len) test_failed();
+                        cfgs++;
+                        if (oac_multistream_packet_pad(po, len, len + 1, 1) != OAC_OK) test_failed();
+                        cfgs++;
+                        if (oac_multistream_packet_pad(po, len + 1, len + 256, 1) != OAC_OK) test_failed();
+                        cfgs++;
+                        if (oac_multistream_packet_unpad(po, len + 256, 1) != len) test_failed();
+                        cfgs++;
+                        if (oac_repacketizer_out(rp, po, len - 1) != OAC_BUFFER_TOO_SMALL) test_failed();
+                        cfgs++;
+                        if (len > 1) {
+                            if (oac_repacketizer_out(rp, po, 1) != OAC_BUFFER_TOO_SMALL) test_failed();
+                            cfgs++;
+                        }
+                        if (oac_repacketizer_out(rp, po, 0) != OAC_BUFFER_TOO_SMALL) test_failed();
+                        cfgs++;
+                    } else if (ret != OAC_BAD_ARG) test_failed();                /* M must not be 0 */
+                }
+                oac_repacketizer_init(rp);
             }
-            oac_repacketizer_init(rp);
-         }
-      }
-   }
-
-   /*Change in input count code, CBR out*/
-   oac_repacketizer_init(rp);
-   packet[0]=0;
-   if(oac_repacketizer_cat(rp,packet,5)!=OAC_OK)test_failed();
-   cfgs++;
-   packet[0]+=1;
-   if(oac_repacketizer_cat(rp,packet,9)!=OAC_OK)test_failed();
-   cfgs++;
-   i=oac_repacketizer_out(rp,po,max_out);
-   if((i!=(4+8+2))||((po[0]&3)!=3)||((po[1]&63)!=3)||((po[1]>>7)!=0))test_failed();
-   cfgs++;
-   i=oac_repacketizer_out_range(rp,0,1,po,max_out);
-   if(i!=5||(po[0]&3)!=0)test_failed();
-   cfgs++;
-   i=oac_repacketizer_out_range(rp,1,2,po,max_out);
-   if(i!=5||(po[0]&3)!=0)test_failed();
-   cfgs++;
-
-   /*Change in input count code, VBR out*/
-   oac_repacketizer_init(rp);
-   packet[0]=1;
-   if(oac_repacketizer_cat(rp,packet,9)!=OAC_OK)test_failed();
-   cfgs++;
-   packet[0]=0;
-   if(oac_repacketizer_cat(rp,packet,3)!=OAC_OK)test_failed();
-   cfgs++;
-   i=oac_repacketizer_out(rp,po,max_out);
-   if((i!=(2+8+2+2))||((po[0]&3)!=3)||((po[1]&63)!=3)||((po[1]>>7)!=1))test_failed();
-   cfgs++;
-
-   /*VBR in, VBR out*/
-   oac_repacketizer_init(rp);
-   packet[0]=2;
-   packet[1]=4;
-   if(oac_repacketizer_cat(rp,packet,8)!=OAC_OK)test_failed();
-   cfgs++;
-   if(oac_repacketizer_cat(rp,packet,8)!=OAC_OK)test_failed();
-   cfgs++;
-   i=oac_repacketizer_out(rp,po,max_out);
-   if((i!=(2+1+1+1+4+2+4+2))||((po[0]&3)!=3)||((po[1]&63)!=4)||((po[1]>>7)!=1))test_failed();
-   cfgs++;
-
-   /*VBR in, CBR out*/
-   oac_repacketizer_init(rp);
-   packet[0]=2;
-   packet[1]=4;
-   if(oac_repacketizer_cat(rp,packet,10)!=OAC_OK)test_failed();
-   cfgs++;
-   if(oac_repacketizer_cat(rp,packet,10)!=OAC_OK)test_failed();
-   cfgs++;
-   i=oac_repacketizer_out(rp,po,max_out);
-   if((i!=(2+4+4+4+4))||((po[0]&3)!=3)||((po[1]&63)!=4)||((po[1]>>7)!=0))test_failed();
-   cfgs++;
-
-   /*Count 0 in, VBR out*/
-   for(j=0;j<32;j++)
-   {
-      /* TOC types, test half with stereo */
-      int maxi,sum,rcnt;
-      packet[0]=((j<<1)+(j&1))<<2;
-      maxi=960/oac_packet_get_samples_per_frame(packet,8000);
-      sum=0;
-      rcnt=0;
-      oac_repacketizer_init(rp);
-      for(i=1;i<=maxi+2;i++)
-      {
-         int len;
-         ret=oac_repacketizer_cat(rp,packet,i);
-         if(rcnt<maxi)
-         {
-            if(ret!=OAC_OK)test_failed();
-            rcnt++;
-            sum+=i-1;
-         } else if (ret!=OAC_INVALID_PACKET)test_failed();
-         cfgs++;
-         len=sum+(rcnt<2?1:rcnt<3?2:2+rcnt-1);
-         if(oac_repacketizer_out(rp,po,max_out)!=len)test_failed();
-         if(rcnt>2&&(po[1]&63)!=rcnt)test_failed();
-         if(rcnt==2&&(po[0]&3)!=2)test_failed();
-         if(rcnt==1&&(po[0]&3)!=0)test_failed();
-         cfgs++;
-         if(oac_repacketizer_out(rp,po,len)!=len)test_failed();
-         cfgs++;
-         if(oac_packet_unpad(po,len)!=len)test_failed();
-         cfgs++;
-         if(oac_packet_pad(po,len,len+1)!=OAC_OK)test_failed();
-         cfgs++;
-         if(oac_packet_pad(po,len+1,len+256)!=OAC_OK)test_failed();
-         cfgs++;
-         if(oac_packet_unpad(po,len+256)!=len)test_failed();
-         cfgs++;
-         if(oac_multistream_packet_unpad(po,len,1)!=len)test_failed();
-         cfgs++;
-         if(oac_multistream_packet_pad(po,len,len+1,1)!=OAC_OK)test_failed();
-         cfgs++;
-         if(oac_multistream_packet_pad(po,len+1,len+256,1)!=OAC_OK)test_failed();
-         cfgs++;
-         if(oac_multistream_packet_unpad(po,len+256,1)!=len)test_failed();
-         cfgs++;
-         if(oac_repacketizer_out(rp,po,len-1)!=OAC_BUFFER_TOO_SMALL)test_failed();
-         cfgs++;
-         if(len>1)
-         {
-            if(oac_repacketizer_out(rp,po,1)!=OAC_BUFFER_TOO_SMALL)test_failed();
+        }
+    }
+
+    /*Change in input count code, CBR out*/
+    oac_repacketizer_init(rp);
+    packet[0] = 0;
+    if (oac_repacketizer_cat(rp, packet, 5) != OAC_OK) test_failed();
+    cfgs++;
+    packet[0] += 1;
+    if (oac_repacketizer_cat(rp, packet, 9) != OAC_OK) test_failed();
+    cfgs++;
+    i = oac_repacketizer_out(rp, po, max_out);
+    if ((i != (4 + 8 + 2)) || ((po[0]&3) != 3) || ((po[1]&63) != 3) || ((po[1]>>7) != 0)) test_failed();
+    cfgs++;
+    i = oac_repacketizer_out_range(rp, 0, 1, po, max_out);
+    if (i != 5 || (po[0]&3) != 0) test_failed();
+    cfgs++;
+    i = oac_repacketizer_out_range(rp, 1, 2, po, max_out);
+    if (i != 5 || (po[0]&3) != 0) test_failed();
+    cfgs++;
+
+    /*Change in input count code, VBR out*/
+    oac_repacketizer_init(rp);
+    packet[0] = 1;
+    if (oac_repacketizer_cat(rp, packet, 9) != OAC_OK) test_failed();
+    cfgs++;
+    packet[0] = 0;
+    if (oac_repacketizer_cat(rp, packet, 3) != OAC_OK) test_failed();
+    cfgs++;
+    i = oac_repacketizer_out(rp, po, max_out);
+    if ((i != (2 + 8 + 2 + 2)) || ((po[0]&3) != 3) || ((po[1]&63) != 3) || ((po[1]>>7) != 1)) test_failed();
+    cfgs++;
+
+    /*VBR in, VBR out*/
+    oac_repacketizer_init(rp);
+    packet[0] = 2;
+    packet[1] = 4;
+    if (oac_repacketizer_cat(rp, packet, 8) != OAC_OK) test_failed();
+    cfgs++;
+    if (oac_repacketizer_cat(rp, packet, 8) != OAC_OK) test_failed();
+    cfgs++;
+    i = oac_repacketizer_out(rp, po, max_out);
+    if ((i != (2 + 1 + 1 + 1 + 4 + 2 + 4 + 2)) || ((po[0]&3) != 3) || ((po[1]&63) != 4)
+        || ((po[1]>>7) != 1)) test_failed();
+    cfgs++;
+
+    /*VBR in, CBR out*/
+    oac_repacketizer_init(rp);
+    packet[0] = 2;
+    packet[1] = 4;
+    if (oac_repacketizer_cat(rp, packet, 10) != OAC_OK) test_failed();
+    cfgs++;
+    if (oac_repacketizer_cat(rp, packet, 10) != OAC_OK) test_failed();
+    cfgs++;
+    i = oac_repacketizer_out(rp, po, max_out);
+    if ((i != (2 + 4 + 4 + 4 + 4)) || ((po[0]&3) != 3) || ((po[1]&63) != 4) || ((po[1]>>7) != 0)) test_failed();
+    cfgs++;
+
+    /*Count 0 in, VBR out*/
+    for (j = 0; j < 32; j++) {
+        /* TOC types, test half with stereo */
+        int maxi, sum, rcnt;
+        packet[0] = ((j<<1) + (j&1))<<2;
+        maxi = 960/oac_packet_get_samples_per_frame(packet, 8000);
+        sum = 0;
+        rcnt = 0;
+        oac_repacketizer_init(rp);
+        for (i = 1; i <= maxi + 2; i++) {
+            int len;
+            ret = oac_repacketizer_cat(rp, packet, i);
+            if (rcnt < maxi) {
+                if (ret != OAC_OK) test_failed();
+                rcnt++;
+                sum += i - 1;
+            } else if (ret != OAC_INVALID_PACKET) test_failed();
             cfgs++;
-         }
-         if(oac_repacketizer_out(rp,po,0)!=OAC_BUFFER_TOO_SMALL)test_failed();
-         cfgs++;
-      }
-   }
-
-   po[0]='O';
-   po[1]='p';
-   if(oac_packet_pad(po,4,4)!=OAC_OK)test_failed();
-   cfgs++;
-   if(oac_multistream_packet_pad(po,4,4,1)!=OAC_OK)test_failed();
-   cfgs++;
-   if(oac_packet_pad(po,4,5)!=OAC_INVALID_PACKET)test_failed();
-   cfgs++;
-   if(oac_multistream_packet_pad(po,4,5,1)!=OAC_INVALID_PACKET)test_failed();
-   cfgs++;
-   if(oac_packet_pad(po,0,5)!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   if(oac_multistream_packet_pad(po,0,5,1)!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   if(oac_packet_unpad(po,0)!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   if(oac_multistream_packet_unpad(po,0,1)!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   if(oac_packet_unpad(po,4)!=OAC_INVALID_PACKET)test_failed();
-   cfgs++;
-   if(oac_multistream_packet_unpad(po,4,1)!=OAC_INVALID_PACKET)test_failed();
-   cfgs++;
-   po[0]=0;
-   po[1]=0;
-   po[2]=0;
-   if(oac_packet_pad(po,5,4)!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-   if(oac_multistream_packet_pad(po,5,4,1)!=OAC_BAD_ARG)test_failed();
-   cfgs++;
-
-   fprintf(stdout,"    oac_repacketizer_cat ........................ OK.\n");
-   fprintf(stdout,"    oac_repacketizer_out ........................ OK.\n");
-   fprintf(stdout,"    oac_repacketizer_out_range .................. OK.\n");
-   fprintf(stdout,"    oac_packet_pad .............................. OK.\n");
-   fprintf(stdout,"    oac_packet_unpad ............................ OK.\n");
-   fprintf(stdout,"    oac_multistream_packet_pad .................. OK.\n");
-   fprintf(stdout,"    oac_multistream_packet_unpad ................ OK.\n");
-
-   oac_repacketizer_destroy(rp);
-   cfgs++;
-   free(packet);
-   free(po);
-   fprintf(stdout,"                        All repacketizer tests passed\n");
-   fprintf(stdout,"                            (%7d API invocations)\n",cfgs);
-
-   return cfgs;
+            len = sum + (rcnt < 2?1:rcnt < 3?2:2 + rcnt - 1);
+            if (oac_repacketizer_out(rp, po, max_out) != len) test_failed();
+            if (rcnt > 2 && (po[1]&63) != rcnt) test_failed();
+            if (rcnt == 2 && (po[0]&3) != 2) test_failed();
+            if (rcnt == 1 && (po[0]&3) != 0) test_failed();
+            cfgs++;
+            if (oac_repacketizer_out(rp, po, len) != len) test_failed();
+            cfgs++;
+            if (oac_packet_unpad(po, len) != len) test_failed();
+            cfgs++;
+            if (oac_packet_pad(po, len, len + 1) != OAC_OK) test_failed();
+            cfgs++;
+            if (oac_packet_pad(po, len + 1, len + 256) != OAC_OK) test_failed();
+            cfgs++;
+            if (oac_packet_unpad(po, len + 256) != len) test_failed();
+            cfgs++;
+            if (oac_multistream_packet_unpad(po, len, 1) != len) test_failed();
+            cfgs++;
+            if (oac_multistream_packet_pad(po, len, len + 1, 1) != OAC_OK) test_failed();
+            cfgs++;
+            if (oac_multistream_packet_pad(po, len + 1, len + 256, 1) != OAC_OK) test_failed();
+            cfgs++;
+            if (oac_multistream_packet_unpad(po, len + 256, 1) != len) test_failed();
+            cfgs++;
+            if (oac_repacketizer_out(rp, po, len - 1) != OAC_BUFFER_TOO_SMALL) test_failed();
+            cfgs++;
+            if (len > 1) {
+                if (oac_repacketizer_out(rp, po, 1) != OAC_BUFFER_TOO_SMALL) test_failed();
+                cfgs++;
+            }
+            if (oac_repacketizer_out(rp, po, 0) != OAC_BUFFER_TOO_SMALL) test_failed();
+            cfgs++;
+        }
+    }
+
+    po[0] = 'O';
+    po[1] = 'p';
+    if (oac_packet_pad(po, 4, 4) != OAC_OK) test_failed();
+    cfgs++;
+    if (oac_multistream_packet_pad(po, 4, 4, 1) != OAC_OK) test_failed();
+    cfgs++;
+    if (oac_packet_pad(po, 4, 5) != OAC_INVALID_PACKET) test_failed();
+    cfgs++;
+    if (oac_multistream_packet_pad(po, 4, 5, 1) != OAC_INVALID_PACKET) test_failed();
+    cfgs++;
+    if (oac_packet_pad(po, 0, 5) != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    if (oac_multistream_packet_pad(po, 0, 5, 1) != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    if (oac_packet_unpad(po, 0) != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    if (oac_multistream_packet_unpad(po, 0, 1) != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    if (oac_packet_unpad(po, 4) != OAC_INVALID_PACKET) test_failed();
+    cfgs++;
+    if (oac_multistream_packet_unpad(po, 4, 1) != OAC_INVALID_PACKET) test_failed();
+    cfgs++;
+    po[0] = 0;
+    po[1] = 0;
+    po[2] = 0;
+    if (oac_packet_pad(po, 5, 4) != OAC_BAD_ARG) test_failed();
+    cfgs++;
+    if (oac_multistream_packet_pad(po, 5, 4, 1) != OAC_BAD_ARG) test_failed();
+    cfgs++;
+
+    fprintf(stdout, "    oac_repacketizer_cat ........................ OK.\n");
+    fprintf(stdout, "    oac_repacketizer_out ........................ OK.\n");
+    fprintf(stdout, "    oac_repacketizer_out_range .................. OK.\n");
+    fprintf(stdout, "    oac_packet_pad .............................. OK.\n");
+    fprintf(stdout, "    oac_packet_unpad ............................ OK.\n");
+    fprintf(stdout, "    oac_multistream_packet_pad .................. OK.\n");
+    fprintf(stdout, "    oac_multistream_packet_unpad ................ OK.\n");
+
+    oac_repacketizer_destroy(rp);
+    cfgs++;
+    free(packet);
+    free(po);
+    fprintf(stdout, "                        All repacketizer tests passed\n");
+    fprintf(stdout, "                            (%7d API invocations)\n", cfgs);
+
+    return cfgs;
 }
 
 #ifdef MALLOC_FAIL
@@ -1766,151 +1746,136 @@ int test_repacketizer_api(void)
  * handling in our codebase, and the lack of thread safety isn't an
  * issue here. We therefore disable the warning for this function.
  */
-#if OAC_GNUC_PREREQ(4,6)
+# if OAC_GNUC_PREREQ(4, 6)
 /* Save the current warning settings */
-#pragma GCC diagnostic push
-#endif
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#  pragma GCC diagnostic push
+# endif
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
 typedef void *(*mhook)(size_t __size, __const void *);
 #endif
 
-int test_malloc_fail(void)
-{
+int test_malloc_fail(void) {
 #ifdef MALLOC_FAIL
-   OacDecoder *dec;
-   OacEncoder *enc;
-   OacRepacketizer *rp;
-   unsigned char mapping[256] = {0,1};
-   OacMSDecoder *msdec;
-   OacMSEncoder *msenc;
-   int rate,c,app,cfgs,err,useerr;
-   int *ep;
-   mhook orig_malloc;
-   cfgs=0;
+    OacDecoder *dec;
+    OacEncoder *enc;
+    OacRepacketizer *rp;
+    unsigned char mapping[256] = {0, 1};
+    OacMSDecoder *msdec;
+    OacMSEncoder *msenc;
+    int rate, c, app, cfgs, err, useerr;
+    int *ep;
+    mhook orig_malloc;
+    cfgs = 0;
 #endif
-   fprintf(stdout,"\n  malloc() failure tests\n");
-   fprintf(stdout,"  ---------------------------------------------------\n");
+    fprintf(stdout, "\n  malloc() failure tests\n");
+    fprintf(stdout, "  ---------------------------------------------------\n");
 #ifdef MALLOC_FAIL
-   orig_malloc=__malloc_hook;
-   __malloc_hook=malloc_hook;
-   ep=(int *)oac_alloc(sizeof(int));
-   if(ep!=NULL)
-   {
-      if(ep)free(ep);
-      __malloc_hook=orig_malloc;
+    orig_malloc = __malloc_hook;
+    __malloc_hook = malloc_hook;
+    ep = (int *)oac_alloc(sizeof(int));
+    if (ep != NULL) {
+        if (ep) free(ep);
+        __malloc_hook = orig_malloc;
 #endif
-      fprintf(stdout,"    oac_decoder_create() ................... SKIPPED.\n");
-      fprintf(stdout,"    oac_encoder_create() ................... SKIPPED.\n");
-      fprintf(stdout,"    oac_repacketizer_create() .............. SKIPPED.\n");
-      fprintf(stdout,"    oac_multistream_decoder_create() ....... SKIPPED.\n");
-      fprintf(stdout,"    oac_multistream_encoder_create() ....... SKIPPED.\n");
-      fprintf(stdout,"(Test only supported with GLIBC and without valgrind)\n");
-      return 0;
+    fprintf(stdout, "    oac_decoder_create() ................... SKIPPED.\n");
+    fprintf(stdout, "    oac_encoder_create() ................... SKIPPED.\n");
+    fprintf(stdout, "    oac_repacketizer_create() .............. SKIPPED.\n");
+    fprintf(stdout, "    oac_multistream_decoder_create() ....... SKIPPED.\n");
+    fprintf(stdout, "    oac_multistream_encoder_create() ....... SKIPPED.\n");
+    fprintf(stdout, "(Test only supported with GLIBC and without valgrind)\n");
+    return 0;
 #ifdef MALLOC_FAIL
-   }
-   for(useerr=0;useerr<2;useerr++)
-   {
-      ep=useerr?&err:0;
-      for(rate=0;rate<5;rate++)
-      {
-        for(c=1;c<3;c++)
-        {
-           err=1;
-           if(useerr)
-           {
-              VG_UNDEF(&err,sizeof(err));
-           }
-           dec=oac_decoder_create(oac_rates[rate], c, ep);
-           if(dec!=NULL||(useerr&&err!=OAC_ALLOC_FAIL))
-           {
-              __malloc_hook=orig_malloc;
-              test_failed();
-           }
-           cfgs++;
-           msdec=oac_multistream_decoder_create(oac_rates[rate], c, 1, c-1, mapping, ep);
-           if(msdec!=NULL||(useerr&&err!=OAC_ALLOC_FAIL))
-           {
-              __malloc_hook=orig_malloc;
-              test_failed();
-           }
-           cfgs++;
-           for(app=0;app<3;app++)
-           {
-              if(useerr)
-              {
-                 VG_UNDEF(&err,sizeof(err));
-              }
-              enc=oac_encoder_create(oac_rates[rate], c, oac_apps[app],ep);
-              if(enc!=NULL||(useerr&&err!=OAC_ALLOC_FAIL))
-              {
-                 __malloc_hook=orig_malloc;
-                 test_failed();
-              }
-              cfgs++;
-              msenc=oac_multistream_encoder_create(oac_rates[rate], c, 1, c-1, mapping, oac_apps[app],ep);
-              if(msenc!=NULL||(useerr&&err!=OAC_ALLOC_FAIL))
-              {
-                 __malloc_hook=orig_malloc;
-                 test_failed();
-              }
-              cfgs++;
-           }
+}
+for (useerr = 0; useerr < 2; useerr++) {
+    ep = useerr?&err:0;
+    for (rate = 0; rate < 5; rate++) {
+        for (c = 1; c < 3; c++) {
+            err = 1;
+            if (useerr) {
+                VG_UNDEF(&err, sizeof(err));
+            }
+            dec = oac_decoder_create(oac_rates[rate], c, ep);
+            if (dec != NULL || (useerr && err != OAC_ALLOC_FAIL)) {
+                __malloc_hook = orig_malloc;
+                test_failed();
+            }
+            cfgs++;
+            msdec = oac_multistream_decoder_create(oac_rates[rate], c, 1, c - 1, mapping, ep);
+            if (msdec != NULL || (useerr && err != OAC_ALLOC_FAIL)) {
+                __malloc_hook = orig_malloc;
+                test_failed();
+            }
+            cfgs++;
+            for (app = 0; app < 3; app++) {
+                if (useerr) {
+                    VG_UNDEF(&err, sizeof(err));
+                }
+                enc = oac_encoder_create(oac_rates[rate], c, oac_apps[app], ep);
+                if (enc != NULL || (useerr && err != OAC_ALLOC_FAIL)) {
+                    __malloc_hook = orig_malloc;
+                    test_failed();
+                }
+                cfgs++;
+                msenc = oac_multistream_encoder_create(oac_rates[rate], c, 1, c - 1, mapping, oac_apps[app], ep);
+                if (msenc != NULL || (useerr && err != OAC_ALLOC_FAIL)) {
+                    __malloc_hook = orig_malloc;
+                    test_failed();
+                }
+                cfgs++;
+            }
         }
-     }
-   }
-   rp=oac_repacketizer_create();
-   if(rp!=NULL)
-   {
-      __malloc_hook=orig_malloc;
-      test_failed();
-   }
-   cfgs++;
-   __malloc_hook=orig_malloc;
-   fprintf(stdout,"    oac_decoder_create() ........................ OK.\n");
-   fprintf(stdout,"    oac_encoder_create() ........................ OK.\n");
-   fprintf(stdout,"    oac_repacketizer_create() ................... OK.\n");
-   fprintf(stdout,"    oac_multistream_decoder_create() ............ OK.\n");
-   fprintf(stdout,"    oac_multistream_encoder_create() ............ OK.\n");
-   fprintf(stdout,"                      All malloc failure tests passed\n");
-   fprintf(stdout,"                                 (%2d API invocations)\n",cfgs);
-   return cfgs;
+    }
+}
+rp = oac_repacketizer_create();
+if (rp != NULL) {
+    __malloc_hook = orig_malloc;
+    test_failed();
+}
+cfgs++;
+__malloc_hook = orig_malloc;
+fprintf(stdout, "    oac_decoder_create() ........................ OK.\n");
+fprintf(stdout, "    oac_encoder_create() ........................ OK.\n");
+fprintf(stdout, "    oac_repacketizer_create() ................... OK.\n");
+fprintf(stdout, "    oac_multistream_decoder_create() ............ OK.\n");
+fprintf(stdout, "    oac_multistream_encoder_create() ............ OK.\n");
+fprintf(stdout, "                      All malloc failure tests passed\n");
+fprintf(stdout, "                                 (%2d API invocations)\n", cfgs);
+return cfgs;
 #endif
 }
 
 #ifdef MALLOC_FAIL
-#if __GNUC_PREREQ(4,6)
-#pragma GCC diagnostic pop /* restore -Wdeprecated-declarations */
-#endif
+# if __GNUC_PREREQ(4, 6)
+#  pragma GCC diagnostic pop /* restore -Wdeprecated-declarations */
+# endif
 #endif
 
-int main(int _argc, char **_argv)
-{
-   oac_int32 total;
-   const char * oversion;
-   if(_argc>1)
-   {
-      fprintf(stderr,"Usage: %s\n",_argv[0]);
-      return 1;
-   }
-   iseed=0;
-
-   oversion=oac_get_version_string();
-   if(!oversion)test_failed();
-   fprintf(stderr,"Testing the %s API deterministically\n", oversion);
-   if(oac_strerror(-32768)==NULL)test_failed();
-   if(oac_strerror(32767)==NULL)test_failed();
-   if(strlen(oac_strerror(0))<1)test_failed();
-   total=4;
-
-   total+=test_dec_api();
-   total+=test_msdec_api();
-   total+=test_parse();
-   total+=test_enc_api();
-   total+=test_repacketizer_api();
-   total+=test_malloc_fail();
-
-   fprintf(stderr,"\nAll API tests passed.\nThe liboac API was invoked %d times.\n",total);
-
-   return 0;
+int main(int _argc, char **_argv) {
+    oac_int32 total;
+    const char * oversion;
+    if (_argc > 1) {
+        fprintf(stderr, "Usage: %s\n", _argv[0]);
+        return 1;
+    }
+    iseed = 0;
+
+    oversion = oac_get_version_string();
+    if (!oversion) test_failed();
+    fprintf(stderr, "Testing the %s API deterministically\n", oversion);
+    if (oac_strerror(-32768) == NULL) test_failed();
+    if (oac_strerror(32767) == NULL) test_failed();
+    if (strlen(oac_strerror(0)) < 1) test_failed();
+    total = 4;
+
+    total += test_dec_api();
+    total += test_msdec_api();
+    total += test_parse();
+    total += test_enc_api();
+    total += test_repacketizer_api();
+    total += test_malloc_fail();
+
+    fprintf(stderr, "\nAll API tests passed.\nThe liboac API was invoked %d times.\n", total);
+
+    return 0;
 }
diff --git a/tests/test_oac_common.h b/tests/test_oac_common.h
index 6437b186e..5be1a9857 100644
--- a/tests/test_oac_common.h
+++ b/tests/test_oac_common.h
@@ -23,42 +23,39 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
-static OAC_INLINE void deb2_impl(unsigned char *_t,unsigned char **_p,int _k,int _x,int _y)
-{
-  int i;
-  if(_x>2){
-     if(_y<3)for(i=0;i<_y;i++)*(--*_p)=_t[i+1];
-  }else{
-     _t[_x]=_t[_x-_y];
-     deb2_impl(_t,_p,_k,_x+1,_y);
-     for(i=_t[_x-_y]+1;i<_k;i++){
-       _t[_x]=i;
-       deb2_impl(_t,_p,_k,_x+1,_x);
-     }
-  }
+static OAC_INLINE void deb2_impl(unsigned char *_t, unsigned char **_p, int _k, int _x, int _y) {
+    int i;
+    if (_x > 2) {
+        if (_y < 3) for (i = 0; i < _y; i++) *(--*_p) = _t[i + 1];
+    } else  {
+        _t[_x] = _t[_x - _y];
+        deb2_impl(_t, _p, _k, _x + 1, _y);
+        for (i = _t[_x - _y] + 1; i < _k; i++) {
+            _t[_x] = i;
+            deb2_impl(_t, _p, _k, _x + 1, _x);
+        }
+    }
 }
 
 /*Generates a De Bruijn sequence (k,2) with length k^2*/
-static OAC_INLINE void debruijn2(int _k, unsigned char *_res)
-{
-   unsigned char *p;
-   unsigned char *t;
-   t=(unsigned char *)malloc(sizeof(unsigned char)*_k*2);
-   memset(t,0,sizeof(unsigned char)*_k*2);
-   p=&_res[_k*_k];
-   deb2_impl(t,&p,_k,1,1);
-   free(t);
+static OAC_INLINE void debruijn2(int _k, unsigned char *_res) {
+    unsigned char *p;
+    unsigned char *t;
+    t = (unsigned char *)malloc(sizeof(unsigned char)*_k*2);
+    memset(t, 0, sizeof(unsigned char)*_k*2);
+    p = &_res[_k*_k];
+    deb2_impl(t, &p, _k, 1, 1);
+    free(t);
 }
 
 /*MWC RNG of George Marsaglia*/
 static oac_uint32 Rz, Rw;
-static OAC_INLINE oac_uint32 fast_rand(void)
-{
-  Rz=36969*(Rz&65535)+(Rz>>16);
-  Rw=18000*(Rw&65535)+(Rw>>16);
-  return (Rz<<16)+Rw;
+static OAC_INLINE oac_uint32 fast_rand(void) {
+    Rz = 36969*(Rz&65535) + (Rz>>16);
+    Rw = 18000*(Rw&65535) + (Rw>>16);
+    return (Rz<<16) + Rw;
 }
 static oac_uint32 iseed;
 
@@ -67,18 +64,17 @@ __attribute__((noreturn))
 #elif defined(_MSC_VER)
 __declspec(noreturn)
 #endif
-static OAC_INLINE void _test_failed(const char *file, int line)
-{
-  fprintf(stderr,"\n ***************************************************\n");
-  fprintf(stderr," ***         A fatal error was detected.         ***\n");
-  fprintf(stderr," ***************************************************\n");
-  fprintf(stderr,"Please report this failure and include\n");
-  fprintf(stderr,"'make check SEED=%u fails %s at line %d for %s'\n",iseed,file,line,oac_get_version_string());
-  fprintf(stderr,"and any relevant details about your system.\n\n");
+static OAC_INLINE void _test_failed(const char *file, int line) {
+    fprintf(stderr, "\n ***************************************************\n");
+    fprintf(stderr, " ***         A fatal error was detected.         ***\n");
+    fprintf(stderr, " ***************************************************\n");
+    fprintf(stderr, "Please report this failure and include\n");
+    fprintf(stderr, "'make check SEED=%u fails %s at line %d for %s'\n", iseed, file, line, oac_get_version_string());
+    fprintf(stderr, "and any relevant details about your system.\n\n");
 #if defined(_MSC_VER)
-   _set_abort_behavior( 0, _WRITE_ABORT_MSG);
+    _set_abort_behavior( 0, _WRITE_ABORT_MSG);
 #endif
-  abort();
+    abort();
 }
 #define test_failed() _test_failed(__FILE__, __LINE__);
 #define oac_test_assert(cond) {if (!(cond)) {test_failed();}}
diff --git a/tests/test_oac_custom.c b/tests/test_oac_custom.c
index 8c149cf5e..cbfa905f9 100644
--- a/tests/test_oac_custom.c
+++ b/tests/test_oac_custom.c
@@ -1,10 +1,10 @@
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 /* FIXME: Is there a better way to get access to oac_custom_decoder_get_size()? */
 #ifdef OAC_BUILD
-#undef OAC_BUILD
+# undef OAC_BUILD
 #endif
 
 #include <stdio.h>
@@ -14,10 +14,10 @@
 #include <string.h>
 #include <time.h>
 #if (!defined WIN32 && !defined _WIN32) || defined(__MINGW32__)
-#include <unistd.h>
+# include <unistd.h>
 #else
-#include <process.h>
-#define getpid _getpid
+# include <process.h>
+# define getpid _getpid
 #endif
 #include "oac_multistream.h"
 #include "oac.h"
@@ -26,120 +26,119 @@
 
 #define MAX_PACKET (1500)
 #define PI (3.141592653589793238462643)
-#define RAND_SAMPLE(a) (a[fast_rand() % sizeof(a)/sizeof(a[0])])
+#define RAND_SAMPLE(a) (a[fast_rand()%sizeof(a)/sizeof(a[0])])
 #define RMS_THRESH (3e-6)
 
 #define SINE_SWEEP_AMPLITUDE (0.5f)
 #define SINE_SWEEP_DURATION_S (60.0f)
 
 typedef struct {
-   void* encoder;
-   void* decoder;
-   OacCustomMode *mode;
-   int sample_rate;
-   int num_channels;
-   int frame_size;
-   int float_encode;
-   int float_decode;
-   int custom_encode;
-   int custom_decode;
-   int encoder_bit_depth;
-   int decoder_bit_depth;
+    void* encoder;
+    void* decoder;
+    OacCustomMode *mode;
+    int sample_rate;
+    int num_channels;
+    int frame_size;
+    int float_encode;
+    int float_decode;
+    int custom_encode;
+    int custom_decode;
+    int encoder_bit_depth;
+    int decoder_bit_depth;
 #ifdef ENABLE_QEXT
-   int qext;
+    int qext;
 #endif
 } TestCustomParams;
 
-void* generate_sine_sweep(double amplitude, int bit_depth, int sample_rate, int channels, int use_float, double duration_seconds, int* num_samples_out) {
-   int i;
-   int num_samples;
-   double start_freq = 100.0;
-   double end_freq = sample_rate / 2.0;
-   void *output_buffer;
-   int bytes_per_sample;
-   /* Calculate the maximum sample value based on bit depth. */
-   oac_int32 max_sample_value = (1L << (bit_depth - 1)) - 1;
-
-   num_samples = (int)floor(.5f + duration_seconds * sample_rate);
-
-   /* Allocate memory for the output buffer. */
-   if (use_float) bit_depth = 32;
-   bytes_per_sample = (bit_depth == 16) ? 2 : 4;
-   output_buffer = malloc(num_samples * channels * bytes_per_sample);
-   if (output_buffer == NULL) {
-      fprintf(stderr, "Error allocating memory for output buffer.\n");
-      *num_samples_out = 0;
-      return NULL;
-   }
-
-   /* Generate the sine sweep/ */
-   for (i = 0; i < num_samples; i++) {
-      /* Calculate the time in seconds for the current sample */
-      double t = (double)i / sample_rate;
-
-      /* Calculate the frequency at this time point */
-      double b = log((end_freq + start_freq) / start_freq) / duration_seconds;
-      double a = start_freq / b;
-
-      double sample = amplitude * sin(2 * PI * a * exp(b * t) - (b * t) - 1);
-
-      if (use_float) {
-         float* output = (float*)output_buffer;
-         output[i * channels] = (float)sample;
-         if (channels == 2) {
-            output[i * channels + 1] = output[i * channels];
-         }
-      }
-      else {
-         /* Scale and convert to the appropriate integer type based on bit depth */
-         if (bit_depth == 16) {
-            oac_int16* output = (oac_int16*)output_buffer;
-            output[i * channels] = (oac_int16)floor(.5f + sample * max_sample_value);
+void* generate_sine_sweep(double amplitude, int bit_depth, int sample_rate, int channels, int use_float,
+                          double duration_seconds, int* num_samples_out) {
+    int i;
+    int num_samples;
+    double start_freq = 100.0;
+    double end_freq = sample_rate/2.0;
+    void *output_buffer;
+    int bytes_per_sample;
+    /* Calculate the maximum sample value based on bit depth. */
+    oac_int32 max_sample_value = (1L<<(bit_depth - 1)) - 1;
+
+    num_samples = (int)floor(.5f + duration_seconds*sample_rate);
+
+    /* Allocate memory for the output buffer. */
+    if (use_float) bit_depth = 32;
+    bytes_per_sample = (bit_depth == 16) ? 2 : 4;
+    output_buffer = malloc(num_samples*channels*bytes_per_sample);
+    if (output_buffer == NULL) {
+        fprintf(stderr, "Error allocating memory for output buffer.\n");
+        *num_samples_out = 0;
+        return NULL;
+    }
+
+    /* Generate the sine sweep/ */
+    for (i = 0; i < num_samples; i++) {
+        /* Calculate the time in seconds for the current sample */
+        double t = (double)i/sample_rate;
+
+        /* Calculate the frequency at this time point */
+        double b = log((end_freq + start_freq)/start_freq)/duration_seconds;
+        double a = start_freq/b;
+
+        double sample = amplitude*sin(2*PI*a*exp(b*t) - (b*t) - 1);
+
+        if (use_float) {
+            float* output = (float*)output_buffer;
+            output[i*channels] = (float)sample;
             if (channels == 2) {
-               output[i * channels + 1] = output[i * channels];
+                output[i*channels + 1] = output[i*channels];
             }
-         }
-         else if (bit_depth == 24) {
-            /* Assuming 24-bit samples are stored in 32-bit integers. */
-            oac_int32* output = (oac_int32*)output_buffer;
-            output[i * channels] = (oac_int32)floor(.5f + sample * max_sample_value);
-            if (channels == 2) {
-               output[i * channels + 1] = output[i * channels];
+        } else {
+            /* Scale and convert to the appropriate integer type based on bit depth */
+            if (bit_depth == 16) {
+                oac_int16* output = (oac_int16*)output_buffer;
+                output[i*channels] = (oac_int16)floor(.5f + sample*max_sample_value);
+                if (channels == 2) {
+                    output[i*channels + 1] = output[i*channels];
+                }
+            } else if (bit_depth == 24) {
+                /* Assuming 24-bit samples are stored in 32-bit integers. */
+                oac_int32* output = (oac_int32*)output_buffer;
+                output[i*channels] = (oac_int32)floor(.5f + sample*max_sample_value);
+                if (channels == 2) {
+                    output[i*channels + 1] = output[i*channels];
+                }
             }
-         }
-      }
-   }
+        }
+    }
 
-   *num_samples_out = num_samples;
-   return output_buffer;
+    *num_samples_out = num_samples;
+    return output_buffer;
 }
 
 int test_encode(TestCustomParams params) {
-   int samp_count = 0;
-   void *inbuf;
-   void *outbuf;
-   OacEncoder* enc = NULL;
-   OacDecoder* dec = NULL;
-   OacDecoder* dec_copy = NULL;
-   OacCustomEncoder* encC = NULL;
-   OacCustomDecoder* decC = NULL;
-   OacCustomDecoder* decC_copy = NULL;
-   unsigned char packet[MAX_PACKET+257];
-   unsigned char packet_corrupt[MAX_PACKET+257];
-   int len;
-   int input_samples;
-   int samples_decoded;
-   int ret = 0;
+    int samp_count = 0;
+    void *inbuf;
+    void *outbuf;
+    OacEncoder* enc = NULL;
+    OacDecoder* dec = NULL;
+    OacDecoder* dec_copy = NULL;
+    OacCustomEncoder* encC = NULL;
+    OacCustomDecoder* decC = NULL;
+    OacCustomDecoder* decC_copy = NULL;
+    unsigned char packet[MAX_PACKET + 257];
+    unsigned char packet_corrupt[MAX_PACKET + 257];
+    int len;
+    int input_samples;
+    int samples_decoded;
+    int ret = 0;
 #ifdef RESYNTH
-   int i;
-   double rmsd = 0;
+    int i;
+    double rmsd = 0;
 #endif
 
-   int num_channels = params.num_channels;
-   int frame_size = params.frame_size;
+    int num_channels = params.num_channels;
+    int frame_size = params.frame_size;
 
-   /* Generate input data */
-   inbuf = generate_sine_sweep(SINE_SWEEP_AMPLITUDE,
+    /* Generate input data */
+    inbuf = generate_sine_sweep(SINE_SWEEP_AMPLITUDE,
                                params.encoder_bit_depth,
                                params.sample_rate,
                                num_channels,
@@ -147,558 +146,540 @@ int test_encode(TestCustomParams params) {
                                SINE_SWEEP_DURATION_S,
                                &input_samples);
 
-   /* Allocate memory for output data */
-   if (params.float_decode || params.decoder_bit_depth == 24) {
-       outbuf = malloc(input_samples*num_channels*sizeof(float));
-   }
-   else {
-       outbuf = malloc(input_samples*num_channels*sizeof(oac_int16));
-   }
-
-   if (params.custom_encode) {
-      encC = (OacCustomEncoder*)params.encoder;
-   }
-   else {
-      enc = (OacEncoder*)params.encoder;
-   }
-
-   if (params.custom_decode) {
-      int size = oac_custom_decoder_get_size(params.mode, params.num_channels);
-      decC = (OacCustomDecoder*)params.decoder;
-      decC_copy = malloc(size);
-      memcpy(decC_copy, decC, size);
-   }
-   else {
-      int size = oac_decoder_get_size(params.num_channels);
-      dec = (OacDecoder*)params.decoder;
-      dec_copy = malloc(size);
-      memcpy(dec_copy, dec, size);
-   }
-
-   /* Encode data, then decode for sanity check */
-   do {
+    /* Allocate memory for output data */
+    if (params.float_decode || params.decoder_bit_depth == 24) {
+        outbuf = malloc(input_samples*num_channels*sizeof(float));
+    } else {
+        outbuf = malloc(input_samples*num_channels*sizeof(oac_int16));
+    }
+
+    if (params.custom_encode) {
+        encC = (OacCustomEncoder*)params.encoder;
+    } else {
+        enc = (OacEncoder*)params.encoder;
+    }
+
+    if (params.custom_decode) {
+        int size = oac_custom_decoder_get_size(params.mode, params.num_channels);
+        decC = (OacCustomDecoder*)params.decoder;
+        decC_copy = malloc(size);
+        memcpy(decC_copy, decC, size);
+    } else {
+        int size = oac_decoder_get_size(params.num_channels);
+        dec = (OacDecoder*)params.decoder;
+        dec_copy = malloc(size);
+        memcpy(dec_copy, dec, size);
+    }
+
+    /* Encode data, then decode for sanity check */
+    do {
 #ifndef DISABLE_FLOAT_API
-      if (params.float_encode) {
-         float* input = (float*)inbuf;
-         if (params.custom_encode) {
-            len = oac_custom_encode_float(encC,
+        if (params.float_encode) {
+            float* input = (float*)inbuf;
+            if (params.custom_encode) {
+                len = oac_custom_encode_float(encC,
                                            &input[samp_count*num_channels],
                                            frame_size,
                                            packet,
                                            MAX_PACKET);
-            if (len <= 0) {
-                fprintf(stderr, "oac_custom_encode_float() failed: %s\n", oac_strerror(len));
-                ret = -1;
-                break;
-            }
-         }
-         else {
-            len = oac_encode_float(enc,
+                if (len <= 0) {
+                    fprintf(stderr, "oac_custom_encode_float() failed: %s\n", oac_strerror(len));
+                    ret = -1;
+                    break;
+                }
+            } else {
+                len = oac_encode_float(enc,
                                     &input[samp_count*num_channels],
                                     frame_size,
                                     packet,
                                     MAX_PACKET);
-            if (len <= 0) {
-                fprintf(stderr, "oac_encode_float() failed: %s\n", oac_strerror(len));
-                ret = -1;
-                break;
+                if (len <= 0) {
+                    fprintf(stderr, "oac_encode_float() failed: %s\n", oac_strerror(len));
+                    ret = -1;
+                    break;
+                }
             }
-         }
-      } else
+        } else
 #endif
-      {
-         if (params.custom_encode) {
-            if (params.encoder_bit_depth == 24) {
-               oac_int32* input = (oac_int32*)inbuf;
-               len = oac_custom_encode24(encC,
+        {
+            if (params.custom_encode) {
+                if (params.encoder_bit_depth == 24) {
+                    oac_int32* input = (oac_int32*)inbuf;
+                    len = oac_custom_encode24(encC,
                                           &input[samp_count*num_channels],
                                           frame_size,
                                           packet,
                                           MAX_PACKET);
-               if (len <= 0) {
-                  fprintf(stderr, "oac_custom_encode24() failed: %s\n", oac_strerror(len));
-                  ret = -1;
-                  break;
-               }
-            }
-            else {
-               oac_int16* input = (oac_int16*)inbuf;
-               len = oac_custom_encode(encC,
+                    if (len <= 0) {
+                        fprintf(stderr, "oac_custom_encode24() failed: %s\n", oac_strerror(len));
+                        ret = -1;
+                        break;
+                    }
+                } else {
+                    oac_int16* input = (oac_int16*)inbuf;
+                    len = oac_custom_encode(encC,
                                         &input[samp_count*num_channels],
                                         frame_size,
                                         packet,
                                         MAX_PACKET);
-               if (len <= 0) {
-                  fprintf(stderr, "oac_custom_encode() failed: %s\n", oac_strerror(len));
-                  ret = -1;
-                  break;
-               }
-            }
-         }
-         else {
-            if (params.encoder_bit_depth == 24) {
-               oac_int32* input = (oac_int32*)inbuf;
-               len = oac_encode24(enc,
+                    if (len <= 0) {
+                        fprintf(stderr, "oac_custom_encode() failed: %s\n", oac_strerror(len));
+                        ret = -1;
+                        break;
+                    }
+                }
+            } else {
+                if (params.encoder_bit_depth == 24) {
+                    oac_int32* input = (oac_int32*)inbuf;
+                    len = oac_encode24(enc,
                                    &input[samp_count*num_channels],
                                    frame_size,
                                    packet,
                                    MAX_PACKET);
-               if (len <= 0) {
-                  fprintf(stderr, "oac_encode24() failed: %s\n", oac_strerror(len));
-                  ret = -1;
-                  break;
-               }
-            }
-            else {
-               oac_int16* input = (oac_int16*)inbuf;
-               len = oac_encode(enc,
+                    if (len <= 0) {
+                        fprintf(stderr, "oac_encode24() failed: %s\n", oac_strerror(len));
+                        ret = -1;
+                        break;
+                    }
+                } else {
+                    oac_int16* input = (oac_int16*)inbuf;
+                    len = oac_encode(enc,
                                  &input[samp_count*num_channels],
                                  frame_size,
                                  packet,
                                  MAX_PACKET);
-               if (len <= 0) {
-                   fprintf(stderr, "oac_encode() failed: %s\n", oac_strerror(len));
-                   ret = -1;
-                   break;
-               }
+                    if (len <= 0) {
+                        fprintf(stderr, "oac_encode() failed: %s\n", oac_strerror(len));
+                        ret = -1;
+                        break;
+                    }
+                }
+            }
+        }
+
+        /* Generate bit/byte errors and check that nothing bad happens. */
+        {
+            int error_pos;
+            int len2;
+            /* Draw the inverse bit error rate from an exponential distribution. */
+            int ber_1 = 1 - 100*log(1e-10 + fast_rand()/4294967296.);
+            oac_int16 scratch[1920*6];
+            memcpy(packet_corrupt, packet, sizeof(packet));
+            /* Randomly flip the 5 first bytes. */
+            for (error_pos = 0; error_pos < 5; error_pos++) {
+                /* 25% chance of flipping each byte. */
+                if (error_pos < len && fast_rand()%5 == 0) packet_corrupt[error_pos] = fast_rand()&0xFF;
             }
-         }
-      }
-
-      /* Generate bit/byte errors and check that nothing bad happens. */
-      {
-         int error_pos;
-         int len2;
-         /* Draw the inverse bit error rate from an exponential distribution. */
-         int ber_1 = 1 - 100*log(1e-10 + fast_rand()/4294967296.);
-         oac_int16 scratch[1920*6];
-         memcpy(packet_corrupt, packet, sizeof(packet));
-         /* Randomly flip the 5 first bytes. */
-         for (error_pos=0;error_pos<5;error_pos++) {
-            /* 25% chance of flipping each byte. */
-            if (error_pos<len && fast_rand()%5 == 0) packet_corrupt[error_pos] = fast_rand()&0xFF;
-         }
-         /* Arbitrarily truncate the packet. */
-         len2 = (int)(1-len*log(1e-10 + fast_rand()/4294967296.));
-         len2 = IMIN(len, len2);
-         error_pos=0;
-         /* Generate bit errors using "run-length" flipping. */
-         while (1) {
-            error_pos += (int)-ber_1*log(1e-10 + fast_rand()/4294967296.);
-            if (error_pos >= len2*8) break;
-            packet_corrupt[error_pos/8] ^= (1<<(error_pos&7));
-         }
-         if (params.custom_decode) {
-            int error = oac_custom_decode(decC_copy,
+            /* Arbitrarily truncate the packet. */
+            len2 = (int)(1 - len*log(1e-10 + fast_rand()/4294967296.));
+            len2 = IMIN(len, len2);
+            error_pos = 0;
+            /* Generate bit errors using "run-length" flipping. */
+            while (1) {
+                error_pos += (int)-ber_1*log(1e-10 + fast_rand()/4294967296.);
+                if (error_pos >= len2*8) break;
+                packet_corrupt[error_pos/8] ^= (1<<(error_pos&7));
+            }
+            if (params.custom_decode) {
+                int error = oac_custom_decode(decC_copy,
                   packet_corrupt,
                   len2,
                   scratch,
                   frame_size);
-            if (!(error > 0 || error == OAC_BAD_ARG || error == OAC_INVALID_PACKET || error == OAC_BUFFER_TOO_SMALL)) {
-               fprintf(stderr, "oac_custom_decode() with corrupt stream failed with: %s\n", oac_strerror(error));
-               test_failed();
-            }
-         } else {
-            int error = oac_decode(dec_copy,
+                if (!(error > 0 || error == OAC_BAD_ARG || error == OAC_INVALID_PACKET
+                      || error == OAC_BUFFER_TOO_SMALL)) {
+                    fprintf(stderr, "oac_custom_decode() with corrupt stream failed with: %s\n", oac_strerror(error));
+                    test_failed();
+                }
+            } else {
+                int error = oac_decode(dec_copy,
                   packet_corrupt,
                   len2,
                   scratch,
                   frame_size,
                   0);
-            if (!(error > 0 || error == OAC_BAD_ARG || error == OAC_INVALID_PACKET || error == OAC_BUFFER_TOO_SMALL)) {
-               fprintf(stderr, "oac_custom_decode() with corrupt stream failed with: %s\n", oac_strerror(error));
-               test_failed();
+                if (!(error > 0 || error == OAC_BAD_ARG || error == OAC_INVALID_PACKET
+                      || error == OAC_BUFFER_TOO_SMALL)) {
+                    fprintf(stderr, "oac_custom_decode() with corrupt stream failed with: %s\n", oac_strerror(error));
+                    test_failed();
+                }
             }
-         }
-      }
+        }
 #ifndef DISABLE_FLOAT_API
-      if (params.float_decode) {
-         float* output = (float*)outbuf;
-         if (params.custom_decode) {
-            samples_decoded = oac_custom_decode_float(decC,
+        if (params.float_decode) {
+            float* output = (float*)outbuf;
+            if (params.custom_decode) {
+                samples_decoded = oac_custom_decode_float(decC,
                                                        packet,
                                                        len,
                                                        &output[samp_count*num_channels],
                                                        frame_size);
-            if (samples_decoded != frame_size) {
-                fprintf(stderr, "oac_custom_decode_float() returned %d\n", samples_decoded);
-                ret = -1;
-                break;
-            }
-
-         }
-         else {
-            samples_decoded = oac_decode_float(dec,
+                if (samples_decoded != frame_size) {
+                    fprintf(stderr, "oac_custom_decode_float() returned %d\n", samples_decoded);
+                    ret = -1;
+                    break;
+                }
+
+            } else {
+                samples_decoded = oac_decode_float(dec,
                                                 packet,
                                                 len,
                                                 &output[samp_count*num_channels],
                                                 frame_size,
                                                 0);
-            if (samples_decoded != frame_size) {
-                fprintf(stderr, "oac_decode_float() returned %d\n", samples_decoded);
-                ret = -1;
-                break;
+                if (samples_decoded != frame_size) {
+                    fprintf(stderr, "oac_decode_float() returned %d\n", samples_decoded);
+                    ret = -1;
+                    break;
+                }
             }
-         }
-      } else
+        } else
 #endif
-      {
-         if (params.custom_decode) {
-            if (params.decoder_bit_depth == 24) {
-               oac_int32* output = (oac_int32*)outbuf;
-               samples_decoded = oac_custom_decode24(decC,
+        {
+            if (params.custom_decode) {
+                if (params.decoder_bit_depth == 24) {
+                    oac_int32* output = (oac_int32*)outbuf;
+                    samples_decoded = oac_custom_decode24(decC,
                                                       packet,
                                                       len,
                                                       &output[samp_count*num_channels],
                                                       frame_size);
 
-               if (samples_decoded != frame_size) {
-                  fprintf(stderr, "oac_custom_decode24() returned %d\n", samples_decoded);
-                  ret = -1;
-                  break;
-               }
-            }
-            else {
-               oac_int16* output = (oac_int16*)outbuf;
-               samples_decoded = oac_custom_decode(decC,
+                    if (samples_decoded != frame_size) {
+                        fprintf(stderr, "oac_custom_decode24() returned %d\n", samples_decoded);
+                        ret = -1;
+                        break;
+                    }
+                } else {
+                    oac_int16* output = (oac_int16*)outbuf;
+                    samples_decoded = oac_custom_decode(decC,
                                                     packet,
                                                     len,
                                                     &output[samp_count*num_channels],
                                                     frame_size);
 
-               if (samples_decoded != frame_size) {
-                  fprintf(stderr, "oac_custom_decode() returned %d\n", samples_decoded);
-                  ret = -1;
-                  break;
-               }
-            }
-         }
-         else {
-            if (params.decoder_bit_depth == 24) {
-               oac_int32* output = (oac_int32*)outbuf;
-               samples_decoded = oac_decode24(dec,
+                    if (samples_decoded != frame_size) {
+                        fprintf(stderr, "oac_custom_decode() returned %d\n", samples_decoded);
+                        ret = -1;
+                        break;
+                    }
+                }
+            } else {
+                if (params.decoder_bit_depth == 24) {
+                    oac_int32* output = (oac_int32*)outbuf;
+                    samples_decoded = oac_decode24(dec,
                                                packet,
                                                len,
                                                &output[samp_count*num_channels],
                                                frame_size,
                                                0);
 
-               if (samples_decoded != frame_size) {
-                  fprintf(stderr, "oac_decode24() returned %d\n", samples_decoded);
-                  ret = -1;
-                  break;
-               }
-            }
-            else {
-               oac_int16* output = (oac_int16*)outbuf;
-               samples_decoded = oac_decode(dec,
+                    if (samples_decoded != frame_size) {
+                        fprintf(stderr, "oac_decode24() returned %d\n", samples_decoded);
+                        ret = -1;
+                        break;
+                    }
+                } else {
+                    oac_int16* output = (oac_int16*)outbuf;
+                    samples_decoded = oac_decode(dec,
                                              packet,
                                              len,
                                              &output[samp_count*num_channels],
                                              frame_size,
                                              0);
-               if (samples_decoded != frame_size) {
-                   fprintf(stderr, "oac_decode() returned %d\n", samples_decoded);
-                   ret = -1;
-                   break;
-               }
+                    if (samples_decoded != frame_size) {
+                        fprintf(stderr, "oac_decode() returned %d\n", samples_decoded);
+                        ret = -1;
+                        break;
+                    }
+                }
             }
-         }
-      }
+        }
 
-      samp_count += frame_size;
-   } while (samp_count + frame_size <= input_samples);
+        samp_count += frame_size;
+    } while (samp_count + frame_size <= input_samples);
 
 #ifdef RESYNTH
-   /* Resynth only works with OacCustom encoder. Also, we don't enable it if there's
-      a 16-bit bottleneck in the decoder that can cause clipping. */
-   if (params.custom_encode && (params.custom_decode || params.decoder_bit_depth > 16)) {
-      if (params.float_encode) {
-         float* input = (float*)inbuf;
-         float* output = (float*)outbuf;
-         for (i = 0; i < samp_count * num_channels; i++) {
-            rmsd += (input[i]-output[i])*(input[i]-output[i]);
-         }
-         rmsd = sqrt(rmsd/(num_channels*samp_count));
-      }
-      else if (params.decoder_bit_depth == 24) {
-         oac_int32* input = (oac_int32*)inbuf;
-         oac_int32* output = (oac_int32*)outbuf;
-         for (i = 0; i < samp_count * num_channels; i++) {
-            rmsd += (input[i]-output[i])*(double)(input[i]-output[i]);
-         }
-         rmsd = sqrt(rmsd/((double)num_channels*samp_count));
-         rmsd /= 8388608;
-      }
-      else {
-         oac_int16* input = (oac_int16*)inbuf;
-         oac_int16* output = (oac_int16*)outbuf;
-         for (i = 0; i < samp_count * num_channels; i++) {
-            rmsd += (input[i]-output[i])*(double)(input[i]-output[i]);
-         }
-         rmsd = sqrt(rmsd/((double)num_channels*samp_count));
-         rmsd /= 32768;
-      }
-
-      if (rmsd > RMS_THRESH) {
-         fprintf(stderr, "Error: encoder doesn't match decoder\n");
-         fprintf(stderr, "RMS mismatch is %g\n", rmsd);
-         ret = -1;
-      }
-      else {
-         fprintf(stderr, "Encoder matches decoder (rms %g)\n", rmsd);
-      }
-   }
+    /* Resynth only works with OacCustom encoder. Also, we don't enable it if there's
+       a 16-bit bottleneck in the decoder that can cause clipping. */
+    if (params.custom_encode && (params.custom_decode || params.decoder_bit_depth > 16)) {
+        if (params.float_encode) {
+            float* input = (float*)inbuf;
+            float* output = (float*)outbuf;
+            for (i = 0; i < samp_count*num_channels; i++) {
+                rmsd += (input[i] - output[i])*(input[i] - output[i]);
+            }
+            rmsd = sqrt(rmsd/(num_channels*samp_count));
+        } else if (params.decoder_bit_depth == 24) {
+            oac_int32* input = (oac_int32*)inbuf;
+            oac_int32* output = (oac_int32*)outbuf;
+            for (i = 0; i < samp_count*num_channels; i++) {
+                rmsd += (input[i] - output[i])*(double)(input[i] - output[i]);
+            }
+            rmsd = sqrt(rmsd/((double)num_channels*samp_count));
+            rmsd /= 8388608;
+        } else {
+            oac_int16* input = (oac_int16*)inbuf;
+            oac_int16* output = (oac_int16*)outbuf;
+            for (i = 0; i < samp_count*num_channels; i++) {
+                rmsd += (input[i] - output[i])*(double)(input[i] - output[i]);
+            }
+            rmsd = sqrt(rmsd/((double)num_channels*samp_count));
+            rmsd /= 32768;
+        }
+
+        if (rmsd > RMS_THRESH) {
+            fprintf(stderr, "Error: encoder doesn't match decoder\n");
+            fprintf(stderr, "RMS mismatch is %g\n", rmsd);
+            ret = -1;
+        } else {
+            fprintf(stderr, "Encoder matches decoder (rms %g)\n", rmsd);
+        }
+    }
 #endif
 
-   if (dec_copy) free(dec_copy);
-   if (decC_copy) free(decC_copy);
-   /* Clean up */
-   free(inbuf);
-   free(outbuf);
-   return ret;
+    if (dec_copy) free(dec_copy);
+    if (decC_copy) free(decC_copy);
+    /* Clean up */
+    free(inbuf);
+    free(outbuf);
+    return ret;
 }
 
 void test_oac_custom(const int num_encoders, const int num_setting_changes) {
-   OacCustomMode* mode = NULL;
-   OacCustomEncoder* encC = NULL;
-   OacCustomDecoder* decC = NULL;
-   OacEncoder* enc = NULL;
-   OacDecoder* dec = NULL;
-   int i, j, err;
-   TestCustomParams params = {0};
-
-   /* Parameters to fuzz. Some values are duplicated to increase their probability of being tested. */
-   int sampling_rates[] = {
+    OacCustomMode* mode = NULL;
+    OacCustomEncoder* encC = NULL;
+    OacCustomDecoder* decC = NULL;
+    OacEncoder* enc = NULL;
+    OacDecoder* dec = NULL;
+    int i, j, err;
+    TestCustomParams params = {0};
+
+    /* Parameters to fuzz. Some values are duplicated to increase their probability of being tested. */
+    int sampling_rates[] = {
 #ifdef CUSTOM_MODEES
-         8000, 12000, 16000, 24000,
+        8000, 12000, 16000, 24000,
 #endif
-         48000,
+        48000,
 #ifdef ENABLE_QEXT
-         96000
+        96000
 #endif
-         };
-   int channels[2] = { 1, 2 };
-   int bitrates[10] = { 6000, 12000, 16000, 24000, 32000, 48000, 64000, 96000, 510000, OAC_BITRATE_MAX };
-   int use_vbr[3] = { 0, 1, 1 };
-   int vbr_constraints[3] = { 0, 1, 1 };
-   int complexities[11] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
-   int packet_loss_perc[4] = { 0, 1, 2, 5 };
-   int lsb_depths[2] = { 8, 24 };
-   int frame_sizes_ms_x2[4] = { 5, 10, 20, 40 };  /* x2 to avoid 2.5 ms */
+    };
+    int channels[2] = { 1, 2 };
+    int bitrates[10] = { 6000, 12000, 16000, 24000, 32000, 48000, 64000, 96000, 510000, OAC_BITRATE_MAX };
+    int use_vbr[3] = { 0, 1, 1 };
+    int vbr_constraints[3] = { 0, 1, 1 };
+    int complexities[11] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
+    int packet_loss_perc[4] = { 0, 1, 2, 5 };
+    int lsb_depths[2] = { 8, 24 };
+    int frame_sizes_ms_x2[4] = { 5, 10, 20, 40 }; /* x2 to avoid 2.5 ms */
 #ifndef DISABLE_FLOAT_API
-   int use_float_encode[2] = {0, 1};
-   int use_float_decode[2] = {0, 1};
+    int use_float_encode[2] = {0, 1};
+    int use_float_decode[2] = {0, 1};
 #endif
-   int use_custom_encode[2] = {0, 1};
-   int use_custom_decode[2] = {0, 1};
-   int encoder_bit_depths[2] = {16, 24};
-   int decoder_bit_depths[2] = {16, 24};
-
-   for (i = 0; i < num_encoders; i++) {
-      int frame_size_ms_x2;
-      params.sample_rate = RAND_SAMPLE(sampling_rates);
-      params.custom_encode = 1;
-      params.custom_decode = 1;
-      /* Can only mix and match Oac and OacCustom with 48kHz (and optionally 96 kHz). */
-      if (params.sample_rate == 48000 || params.sample_rate == 96000) {
-         params.custom_encode = RAND_SAMPLE(use_custom_encode);
-         params.custom_decode = RAND_SAMPLE(use_custom_decode);
-
-         /* No point in testing this as OacCustom isn't involved */
-         if (!(params.custom_encode || params.custom_decode))
+    int use_custom_encode[2] = {0, 1};
+    int use_custom_decode[2] = {0, 1};
+    int encoder_bit_depths[2] = {16, 24};
+    int decoder_bit_depths[2] = {16, 24};
+
+    for (i = 0; i < num_encoders; i++) {
+        int frame_size_ms_x2;
+        params.sample_rate = RAND_SAMPLE(sampling_rates);
+        params.custom_encode = 1;
+        params.custom_decode = 1;
+        /* Can only mix and match Oac and OacCustom with 48kHz (and optionally 96 kHz). */
+        if (params.sample_rate == 48000 || params.sample_rate == 96000) {
+            params.custom_encode = RAND_SAMPLE(use_custom_encode);
+            params.custom_decode = RAND_SAMPLE(use_custom_decode);
+
+            /* No point in testing this as OacCustom isn't involved */
+            if (!(params.custom_encode || params.custom_decode))
+                continue;
+        }
+        params.num_channels = RAND_SAMPLE(channels);
+        frame_size_ms_x2 = RAND_SAMPLE(frame_sizes_ms_x2);
+        params.frame_size = frame_size_ms_x2*params.sample_rate/2000;
+
+        /* OacCustom isn't supporting this case at the moment (frame < 40) */
+        if ((params.sample_rate == 8000 || params.sample_rate == 12000) && frame_size_ms_x2 == 5)
             continue;
-      }
-      params.num_channels = RAND_SAMPLE(channels);
-      frame_size_ms_x2 = RAND_SAMPLE(frame_sizes_ms_x2);
-      params.frame_size = frame_size_ms_x2 * params.sample_rate / 2000;
-
-      /* OacCustom isn't supporting this case at the moment (frame < 40) */
-      if ((params.sample_rate == 8000 || params.sample_rate == 12000) && frame_size_ms_x2 == 5)
-         continue;
-
-      if (params.custom_encode || params.custom_decode) {
-         mode = oac_custom_mode_create(params.sample_rate, params.frame_size, &err);
-         if (err != OAC_OK || mode == NULL) {
-            fprintf(stderr,
+
+        if (params.custom_encode || params.custom_decode) {
+            mode = oac_custom_mode_create(params.sample_rate, params.frame_size, &err);
+            if (err != OAC_OK || mode == NULL) {
+                fprintf(stderr,
                     "test_oac_custom error: %d kHz, %d ch, "
                     "custom_encode: %d, custom_decode: %d, (%d/2) ms\n",
-                    params.sample_rate / 1000, params.num_channels,
+                    params.sample_rate/1000, params.num_channels,
                     params.custom_encode, params.custom_decode, frame_size_ms_x2);
-            test_failed();
-         }
-         params.mode = mode;
-      } else {
-         params.mode = NULL;
-      }
-
-      if (params.custom_decode) {
-         decC = oac_custom_decoder_create(mode, params.num_channels, &err);
-         if (err != OAC_OK || decC == NULL) {
-            fprintf(stderr,
+                test_failed();
+            }
+            params.mode = mode;
+        } else {
+            params.mode = NULL;
+        }
+
+        if (params.custom_decode) {
+            decC = oac_custom_decoder_create(mode, params.num_channels, &err);
+            if (err != OAC_OK || decC == NULL) {
+                fprintf(stderr,
                     "test_oac_custom error: %d kHz, %d ch, "
                     "custom_encode: %d, custom_decode: %d, (%d/2) ms\n",
-                    params.sample_rate / 1000, params.num_channels,
+                    params.sample_rate/1000, params.num_channels,
                     params.custom_encode, params.custom_decode, frame_size_ms_x2);
-            test_failed();
-         }
-         params.decoder = (void*)decC;
-      }
-      else {
-         dec = oac_decoder_create(params.sample_rate, params.num_channels, &err);
-         if (err != OAC_OK || dec == NULL) {
-            fprintf(stderr,
+                test_failed();
+            }
+            params.decoder = (void*)decC;
+        } else {
+            dec = oac_decoder_create(params.sample_rate, params.num_channels, &err);
+            if (err != OAC_OK || dec == NULL) {
+                fprintf(stderr,
                     "test_oac_custom error: %d kHz, %d ch, "
                     "custom_encode: %d, custom_decode: %d, (%d/2) ms\n",
-                    params.sample_rate / 1000, params.num_channels,
+                    params.sample_rate/1000, params.num_channels,
                     params.custom_encode, params.custom_decode, frame_size_ms_x2);
-            test_failed();
-         }
-         params.decoder = (void*)dec;
-      }
-
-      if (params.custom_encode) {
-         encC = oac_custom_encoder_create(mode, params.num_channels, &err);
-         if (err != OAC_OK || encC == NULL) {
-            fprintf(stderr,
+                test_failed();
+            }
+            params.decoder = (void*)dec;
+        }
+
+        if (params.custom_encode) {
+            encC = oac_custom_encoder_create(mode, params.num_channels, &err);
+            if (err != OAC_OK || encC == NULL) {
+                fprintf(stderr,
                     "test_oac_custom error: %d kHz, %d ch, "
                     "custom_encode: %d, custom_decode: %d, (%d/2) ms\n",
-                    params.sample_rate / 1000, params.num_channels,
+                    params.sample_rate/1000, params.num_channels,
                     params.custom_encode, params.custom_decode, frame_size_ms_x2);
-            test_failed();
-         }
-         params.encoder = (void*)encC;
-      }
-      else {
-         enc = oac_encoder_create(params.sample_rate, params.num_channels, OAC_APPLICATION_RESTRICTED_LOWDELAY, &err);
-         if (err != OAC_OK || enc == NULL) {
-            fprintf(stderr,
+                test_failed();
+            }
+            params.encoder = (void*)encC;
+        } else {
+            enc = oac_encoder_create(params.sample_rate, params.num_channels, OAC_APPLICATION_RESTRICTED_LOWDELAY,
+            &err);
+            if (err != OAC_OK || enc == NULL) {
+                fprintf(stderr,
                     "test_oac_custom error: %d kHz, %d ch, "
                     "custom_encode: %d, custom_decode: %d, (%d/2) ms\n",
-                    params.sample_rate / 1000, params.num_channels,
+                    params.sample_rate/1000, params.num_channels,
                     params.custom_encode, params.custom_decode, frame_size_ms_x2);
-            test_failed();
-         }
-         params.encoder = (void*)enc;
-      }
-
-      for (j = 0; j < num_setting_changes; j++) {
-         int bitrate = RAND_SAMPLE(bitrates);
-         int vbr = RAND_SAMPLE(use_vbr);
-         int vbr_constraint = RAND_SAMPLE(vbr_constraints);
-         int complexity = RAND_SAMPLE(complexities);
-         int pkt_loss = RAND_SAMPLE(packet_loss_perc);
-         int lsb_depth = RAND_SAMPLE(lsb_depths);
+                test_failed();
+            }
+            params.encoder = (void*)enc;
+        }
+
+        for (j = 0; j < num_setting_changes; j++) {
+            int bitrate = RAND_SAMPLE(bitrates);
+            int vbr = RAND_SAMPLE(use_vbr);
+            int vbr_constraint = RAND_SAMPLE(vbr_constraints);
+            int complexity = RAND_SAMPLE(complexities);
+            int pkt_loss = RAND_SAMPLE(packet_loss_perc);
+            int lsb_depth = RAND_SAMPLE(lsb_depths);
 #ifndef DISABLE_FLOAT_API
-         params.float_encode = RAND_SAMPLE(use_float_encode);
-         params.float_decode = RAND_SAMPLE(use_float_decode);
+            params.float_encode = RAND_SAMPLE(use_float_encode);
+            params.float_decode = RAND_SAMPLE(use_float_decode);
 #else
-         params.float_encode = 0;
-         params.float_decode = 0;
+            params.float_encode = 0;
+            params.float_decode = 0;
 #endif
-         params.encoder_bit_depth = RAND_SAMPLE(encoder_bit_depths);
-         params.decoder_bit_depth = RAND_SAMPLE(decoder_bit_depths);
+            params.encoder_bit_depth = RAND_SAMPLE(encoder_bit_depths);
+            params.decoder_bit_depth = RAND_SAMPLE(decoder_bit_depths);
 #ifdef RESYNTH
-         /* Resynth logic works best when encoder/decoder use same datatype */
-         params.float_decode = params.float_encode;
-         params.decoder_bit_depth = params.encoder_bit_depth;
+            /* Resynth logic works best when encoder/decoder use same datatype */
+            params.float_decode = params.float_encode;
+            params.decoder_bit_depth = params.encoder_bit_depth;
 #endif
 #ifdef ENABLE_QEXT
-         params.qext = fast_rand()&1;
+            params.qext = fast_rand()&1;
 #endif
 
-         if (params.custom_encode) {
-            if (oac_custom_encoder_ctl(encC, OAC_SET_BITRATE(bitrate)) != OAC_OK) test_failed();
-            if (oac_custom_encoder_ctl(encC, OAC_SET_VBR(vbr)) != OAC_OK) test_failed();
-            if (oac_custom_encoder_ctl(encC, OAC_SET_VBR_CONSTRAINT(vbr_constraint)) != OAC_OK) test_failed();
-            if (oac_custom_encoder_ctl(encC, OAC_SET_COMPLEXITY(complexity)) != OAC_OK) test_failed();
-            if (oac_custom_encoder_ctl(encC, OAC_SET_PACKET_LOSS_PERC(pkt_loss)) != OAC_OK) test_failed();
-            if (oac_custom_encoder_ctl(encC, OAC_SET_LSB_DEPTH(lsb_depth)) != OAC_OK) test_failed();
-         }
-         else {
-            if (oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrate)) != OAC_OK) test_failed();
-            if (oac_encoder_ctl(enc, OAC_SET_VBR(vbr)) != OAC_OK) test_failed();
-            if (oac_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(vbr_constraint)) != OAC_OK) test_failed();
-            if (oac_encoder_ctl(enc, OAC_SET_COMPLEXITY(complexity)) != OAC_OK) test_failed();
-            if (oac_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(pkt_loss)) != OAC_OK) test_failed();
-            if (oac_encoder_ctl(enc, OAC_SET_LSB_DEPTH(lsb_depth)) != OAC_OK) test_failed();
-         }
-         fprintf(stderr,
+            if (params.custom_encode) {
+                if (oac_custom_encoder_ctl(encC, OAC_SET_BITRATE(bitrate)) != OAC_OK) test_failed();
+                if (oac_custom_encoder_ctl(encC, OAC_SET_VBR(vbr)) != OAC_OK) test_failed();
+                if (oac_custom_encoder_ctl(encC, OAC_SET_VBR_CONSTRAINT(vbr_constraint)) != OAC_OK) test_failed();
+                if (oac_custom_encoder_ctl(encC, OAC_SET_COMPLEXITY(complexity)) != OAC_OK) test_failed();
+                if (oac_custom_encoder_ctl(encC, OAC_SET_PACKET_LOSS_PERC(pkt_loss)) != OAC_OK) test_failed();
+                if (oac_custom_encoder_ctl(encC, OAC_SET_LSB_DEPTH(lsb_depth)) != OAC_OK) test_failed();
+            } else {
+                if (oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrate)) != OAC_OK) test_failed();
+                if (oac_encoder_ctl(enc, OAC_SET_VBR(vbr)) != OAC_OK) test_failed();
+                if (oac_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(vbr_constraint)) != OAC_OK) test_failed();
+                if (oac_encoder_ctl(enc, OAC_SET_COMPLEXITY(complexity)) != OAC_OK) test_failed();
+                if (oac_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(pkt_loss)) != OAC_OK) test_failed();
+                if (oac_encoder_ctl(enc, OAC_SET_LSB_DEPTH(lsb_depth)) != OAC_OK) test_failed();
+            }
+            fprintf(stderr,
                  "test_oac_custom: %d kHz, %d ch, float_encode: %d, float_decode: %d, "
                  "encoder_bit_depth: %d, "
                  "decoder_bit_depth: %d, "
                  "custom_encode: %d, custom_decode: %d, %d bps, vbr: %d, vbr constraint: %d, complexity: %d, "
                  "pkt loss: %d%%, lsb depth: %d, (%d/2) ms\n",
-                 params.sample_rate / 1000, params.num_channels, params.float_encode, params.float_decode,
+                 params.sample_rate/1000, params.num_channels, params.float_encode, params.float_decode,
                  params.encoder_bit_depth, params.decoder_bit_depth,
                  params.custom_encode, params.custom_decode, bitrate, vbr, vbr_constraint, complexity,
                  pkt_loss, lsb_depth, frame_size_ms_x2);
-         if (test_encode(params)) {
-            fprintf(stderr,
+            if (test_encode(params)) {
+                fprintf(stderr,
                     "test_oac_custom error: %d kHz, %d ch, float_encode: %d, float_decode: %d, "
                     "encoder_bit_depth: %d, "
                     "decoder_bit_depth: %d, "
                     "custom_encode: %d, custom_decode: %d, %d bps, vbr: %d, vbr constraint: %d, complexity: %d, "
                     "pkt loss: %d%%, lsb depth: %d, (%d/2) ms\n",
-                    params.sample_rate / 1000, params.num_channels, params.float_encode, params.float_decode,
+                    params.sample_rate/1000, params.num_channels, params.float_encode, params.float_decode,
                     params.encoder_bit_depth, params.decoder_bit_depth,
                     params.custom_encode, params.custom_decode, bitrate, vbr, vbr_constraint, complexity,
                     pkt_loss, lsb_depth, frame_size_ms_x2);
-            test_failed();
-         }
-      }
-
-      if (params.custom_encode || params.custom_decode) {
-         oac_custom_mode_destroy(mode);
-      }
-      if (params.custom_decode) {
-         oac_custom_decoder_destroy(decC);
-      }
-      else {
-         oac_decoder_destroy(dec);
-      }
-      if (params.custom_encode) {
-         oac_custom_encoder_destroy(encC);
-      }
-      else {
-         oac_encoder_destroy(enc);
-      }
-   }
+                test_failed();
+            }
+        }
+
+        if (params.custom_encode || params.custom_decode) {
+            oac_custom_mode_destroy(mode);
+        }
+        if (params.custom_decode) {
+            oac_custom_decoder_destroy(decC);
+        } else {
+            oac_decoder_destroy(dec);
+        }
+        if (params.custom_encode) {
+            oac_custom_encoder_destroy(encC);
+        } else {
+            oac_encoder_destroy(enc);
+        }
+    }
 }
 
 int main(int _argc, char **_argv) {
-   char * strtol_str = NULL;
-   const char * env_seed;
-   int env_used;
-   int num_encoders_to_fuzz = 5;
-   int num_setting_changes = 40;
-
-   /* Seed the random fuzz settings */
-   env_used=0;
-   env_seed=getenv("SEED");
-   if (_argc > 1)
-       iseed = strtol(_argv[1], &strtol_str, 10);  /* the first input argument might be the seed */
-   if(strtol_str!=NULL && strtol_str[0]=='\0') {
-      /* iseed is a valid number */
-   }
-   else if(env_seed) {
-      iseed=atoi(env_seed);
-      env_used=1;
-   }
-   else iseed=(oac_uint32)time(NULL)^(((oac_uint32)getpid()&65535)<<16);
-   Rw=Rz=iseed;
-
-   fprintf(stderr,"Testing extensions. Random seed: %u (%.4X)\n", iseed, fast_rand() % 65535);
-   if(env_used)fprintf(stderr,"  Random seed set from the environment (SEED=%s).\n", env_seed);
-
-   fprintf(stderr,"Testing various Oac/OacCustom combinations "
+    char * strtol_str = NULL;
+    const char * env_seed;
+    int env_used;
+    int num_encoders_to_fuzz = 5;
+    int num_setting_changes = 40;
+
+    /* Seed the random fuzz settings */
+    env_used = 0;
+    env_seed = getenv("SEED");
+    if (_argc > 1)
+        iseed = strtol(_argv[1], &strtol_str, 10); /* the first input argument might be the seed */
+    if (strtol_str != NULL && strtol_str[0] == '\0') {
+        /* iseed is a valid number */
+    } else if (env_seed) {
+        iseed = atoi(env_seed);
+        env_used = 1;
+    } else iseed = (oac_uint32)time(NULL)^(((oac_uint32)getpid()&65535)<<16);
+    Rw = Rz = iseed;
+
+    fprintf(stderr, "Testing extensions. Random seed: %u (%.4X)\n", iseed, fast_rand()%65535);
+    if (env_used) fprintf(stderr, "  Random seed set from the environment (SEED=%s).\n", env_seed);
+
+    fprintf(stderr, "Testing various Oac/OacCustom combinations "
 #ifdef RESYNTH
            "with RMS validation "
 #endif
            "across %d encoder(s) and %d setting change(s) each.\n", num_encoders_to_fuzz, num_setting_changes);
-   test_oac_custom(num_encoders_to_fuzz, num_setting_changes);
+    test_oac_custom(num_encoders_to_fuzz, num_setting_changes);
 
-   fprintf(stderr,"Tests completed successfully.\n");
+    fprintf(stderr, "Tests completed successfully.\n");
 
-   return 0;
+    return 0;
 }
diff --git a/tests/test_oac_decode.c b/tests/test_oac_decode.c
index ea4ae94ed..afabb1353 100644
--- a/tests/test_oac_decode.c
+++ b/tests/test_oac_decode.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdio.h>
@@ -37,10 +37,10 @@
 #include <string.h>
 #include <time.h>
 #ifndef _WIN32
-#include <unistd.h>
+# include <unistd.h>
 #else
-#include <process.h>
-#define getpid _getpid
+# include <process.h>
+# define getpid _getpid
 #endif
 #include "oac.h"
 #include "test_oac_common.h"
@@ -48,434 +48,404 @@
 #define MAX_PACKET (1500)
 #define MAX_FRAME_SAMP (5760)
 
-int test_decoder_code0(int no_fuzz)
-{
-   static const oac_int32 fsv[5]={48000,24000,16000,12000,8000};
-   int err,skip,plen;
-   int out_samples,fec;
-   int t;
-   oac_int32 i;
-   OacDecoder *dec[5*2];
-   oac_int32 decsize;
-   OacDecoder *decbak;
-   oac_uint32 dec_final_range1,dec_final_range2,dec_final_acc;
-   unsigned char *packet;
-   unsigned char modes[4096];
-   short *outbuf_int;
-   short *outbuf;
-
-   dec_final_range1=dec_final_range2=2;
-
-   packet=(unsigned char *)malloc(sizeof(unsigned char)*MAX_PACKET);
-   if(packet==NULL)test_failed();
-
-   outbuf_int=(short *)malloc(sizeof(short)*(MAX_FRAME_SAMP+16)*2);
-   for(i=0;i<(MAX_FRAME_SAMP+16)*2;i++)outbuf_int[i]=32749;
-   outbuf=&outbuf_int[8*2];
-
-   fprintf(stdout,"  Starting %d decoders...\n",5*2);
-   for(t=0;t<5*2;t++)
-   {
-      int fs=fsv[t>>1];
-      int c=(t&1)+1;
-      err=OAC_INTERNAL_ERROR;
-      dec[t] = oac_decoder_create(fs, c, &err);
-      if(err!=OAC_OK || dec[t]==NULL)test_failed();
-      fprintf(stdout,"    oac_decoder_create(%5d,%d) OK. Copy ",fs,c);
-      {
-         OacDecoder *dec2;
-         /*The oac state structures contain no pointers and can be freely copied*/
-         dec2=(OacDecoder *)malloc(oac_decoder_get_size(c));
-         if(dec2==NULL)test_failed();
-         memcpy(dec2,dec[t],oac_decoder_get_size(c));
-         memset(dec[t],255,oac_decoder_get_size(c));
-         oac_decoder_destroy(dec[t]);
-         printf("OK.\n");
-         dec[t]=dec2;
-      }
-   }
-
-   decsize=oac_decoder_get_size(1);
-   decbak=(OacDecoder *)malloc(decsize);
-   if(decbak==NULL)test_failed();
-
-   for(t=0;t<5*2;t++)
-   {
-      int factor=48000/fsv[t>>1];
-      for(fec=0;fec<2;fec++)
-      {
-         oac_int32 dur;
+int test_decoder_code0(int no_fuzz) {
+    static const oac_int32 fsv[5] = {48000, 24000, 16000, 12000, 8000};
+    int err, skip, plen;
+    int out_samples, fec;
+    int t;
+    oac_int32 i;
+    OacDecoder *dec[5*2];
+    oac_int32 decsize;
+    OacDecoder *decbak;
+    oac_uint32 dec_final_range1, dec_final_range2, dec_final_acc;
+    unsigned char *packet;
+    unsigned char modes[4096];
+    short *outbuf_int;
+    short *outbuf;
+
+    dec_final_range1 = dec_final_range2 = 2;
+
+    packet = (unsigned char *)malloc(sizeof(unsigned char)*MAX_PACKET);
+    if (packet == NULL) test_failed();
+
+    outbuf_int = (short *)malloc(sizeof(short)*(MAX_FRAME_SAMP + 16)*2);
+    for (i = 0; i < (MAX_FRAME_SAMP + 16)*2; i++) outbuf_int[i] = 32749;
+    outbuf = &outbuf_int[8*2];
+
+    fprintf(stdout, "  Starting %d decoders...\n", 5*2);
+    for (t = 0; t < 5*2; t++) {
+        int fs = fsv[t>>1];
+        int c = (t&1) + 1;
+        err = OAC_INTERNAL_ERROR;
+        dec[t] = oac_decoder_create(fs, c, &err);
+        if (err != OAC_OK || dec[t] == NULL) test_failed();
+        fprintf(stdout, "    oac_decoder_create(%5d,%d) OK. Copy ", fs, c);
+        {
+            OacDecoder *dec2;
+            /*The oac state structures contain no pointers and can be freely copied*/
+            dec2 = (OacDecoder *)malloc(oac_decoder_get_size(c));
+            if (dec2 == NULL) test_failed();
+            memcpy(dec2, dec[t], oac_decoder_get_size(c));
+            memset(dec[t], 255, oac_decoder_get_size(c));
+            oac_decoder_destroy(dec[t]);
+            printf("OK.\n");
+            dec[t] = dec2;
+        }
+    }
+
+    decsize = oac_decoder_get_size(1);
+    decbak = (OacDecoder *)malloc(decsize);
+    if (decbak == NULL) test_failed();
+
+    for (t = 0; t < 5*2; t++) {
+        int factor = 48000/fsv[t>>1];
+        for (fec = 0; fec < 2; fec++) {
+            oac_int32 dur;
 #if defined(ENABLE_OSCE) || defined(ENABLE_DEEP_PLC)
-         oac_decoder_ctl(dec[t], OAC_SET_COMPLEXITY(fast_rand()%11));
+            oac_decoder_ctl(dec[t], OAC_SET_COMPLEXITY(fast_rand()%11));
 #endif
-         /*Test PLC on a fresh decoder*/
-         out_samples = oac_decode(dec[t], 0, 0, outbuf, 120/factor, fec);
-         if(out_samples!=120/factor)test_failed();
-         if(oac_decoder_ctl(dec[t], OAC_GET_LAST_PACKET_DURATION(&dur))!=OAC_OK)test_failed();
-         if(dur!=120/factor)test_failed();
-
-         /*Test on a size which isn't a multiple of 2.5ms*/
-         out_samples = oac_decode(dec[t], 0, 0, outbuf, 120/factor+2, fec);
-         if(out_samples!=OAC_BAD_ARG)test_failed();
-
-         /*Test null pointer input*/
-         out_samples = oac_decode(dec[t], 0, -1, outbuf, 120/factor, fec);
-         if(out_samples!=120/factor)test_failed();
-         out_samples = oac_decode(dec[t], 0, 1, outbuf, 120/factor, fec);
-         if(out_samples!=120/factor)test_failed();
-         out_samples = oac_decode(dec[t], 0, 10, outbuf, 120/factor, fec);
-         if(out_samples!=120/factor)test_failed();
-         out_samples = oac_decode(dec[t], 0, fast_rand(), outbuf, 120/factor, fec);
-         if(out_samples!=120/factor)test_failed();
-         if(oac_decoder_ctl(dec[t], OAC_GET_LAST_PACKET_DURATION(&dur))!=OAC_OK)test_failed();
-         if(dur!=120/factor)test_failed();
-
-         /*Zero lengths*/
-         out_samples = oac_decode(dec[t], packet, 0, outbuf, 120/factor, fec);
-         if(out_samples!=120/factor)test_failed();
-
-         /*Zero buffer*/
-         outbuf[0]=32749;
-         out_samples = oac_decode(dec[t], packet, 0, outbuf, 0, fec);
-         if(out_samples>0)test_failed();
+            /*Test PLC on a fresh decoder*/
+            out_samples = oac_decode(dec[t], 0, 0, outbuf, 120/factor, fec);
+            if (out_samples != 120/factor) test_failed();
+            if (oac_decoder_ctl(dec[t], OAC_GET_LAST_PACKET_DURATION(&dur)) != OAC_OK) test_failed();
+            if (dur != 120/factor) test_failed();
+
+            /*Test on a size which isn't a multiple of 2.5ms*/
+            out_samples = oac_decode(dec[t], 0, 0, outbuf, 120/factor + 2, fec);
+            if (out_samples != OAC_BAD_ARG) test_failed();
+
+            /*Test null pointer input*/
+            out_samples = oac_decode(dec[t], 0, -1, outbuf, 120/factor, fec);
+            if (out_samples != 120/factor) test_failed();
+            out_samples = oac_decode(dec[t], 0, 1, outbuf, 120/factor, fec);
+            if (out_samples != 120/factor) test_failed();
+            out_samples = oac_decode(dec[t], 0, 10, outbuf, 120/factor, fec);
+            if (out_samples != 120/factor) test_failed();
+            out_samples = oac_decode(dec[t], 0, fast_rand(), outbuf, 120/factor, fec);
+            if (out_samples != 120/factor) test_failed();
+            if (oac_decoder_ctl(dec[t], OAC_GET_LAST_PACKET_DURATION(&dur)) != OAC_OK) test_failed();
+            if (dur != 120/factor) test_failed();
+
+            /*Zero lengths*/
+            out_samples = oac_decode(dec[t], packet, 0, outbuf, 120/factor, fec);
+            if (out_samples != 120/factor) test_failed();
+
+            /*Zero buffer*/
+            outbuf[0] = 32749;
+            out_samples = oac_decode(dec[t], packet, 0, outbuf, 0, fec);
+            if (out_samples > 0) test_failed();
 #if !defined(OAC_BUILD) && (OAC_GNUC_PREREQ(4, 6) || (defined(__clang_major__) && __clang_major__ >= 3))
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnonnull"
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wnonnull"
 #endif
-         out_samples = oac_decode(dec[t], packet, 0, 0, 0, fec);
+            out_samples = oac_decode(dec[t], packet, 0, 0, 0, fec);
 #if !defined(OAC_BUILD) && (OAC_GNUC_PREREQ(4, 6) || (defined(__clang_major__) && __clang_major__ >= 3))
-#pragma GCC diagnostic pop
+# pragma GCC diagnostic pop
 #endif
-         if(out_samples>0)test_failed();
-         if(outbuf[0]!=32749)test_failed();
-
-         /*Invalid lengths*/
-         out_samples = oac_decode(dec[t], packet, -1, outbuf, MAX_FRAME_SAMP, fec);
-         if(out_samples>=0)test_failed();
-         out_samples = oac_decode(dec[t], packet, INT_MIN, outbuf, MAX_FRAME_SAMP, fec);
-         if(out_samples>=0)test_failed();
-         out_samples = oac_decode(dec[t], packet, -1, outbuf, -1, fec);
-         if(out_samples>=0)test_failed();
-
-         /*Crazy FEC values*/
-         out_samples = oac_decode(dec[t], packet, 1, outbuf, MAX_FRAME_SAMP, fec?-1:2);
-         if(out_samples>=0)test_failed();
-
-         /*Reset the decoder*/
-         if(oac_decoder_ctl(dec[t], OAC_RESET_STATE)!=OAC_OK)test_failed();
-      }
-   }
-   fprintf(stdout,"  dec[all] initial frame PLC OK.\n");
-
-   /*Count code 0 tests*/
-   for(i=0;i<64;i++)
-   {
-      oac_int32 dur;
-      int j,expected[5*2];
-      packet[0]=i<<2;
-      packet[1]=255;
-      packet[2]=255;
-      err=oac_packet_get_nb_channels(packet);
-      if(err!=(i&1)+1)test_failed();
-
-      for(t=0;t<5*2;t++){
-         expected[t]=oac_decoder_get_nb_samples(dec[t],packet,1);
-         if(expected[t]>2880)test_failed();
-      }
-
-      for(j=0;j<256;j++)
-      {
-         packet[1]=j;
-         for(t=0;t<5*2;t++)
-         {
+            if (out_samples > 0) test_failed();
+            if (outbuf[0] != 32749) test_failed();
+
+            /*Invalid lengths*/
+            out_samples = oac_decode(dec[t], packet, -1, outbuf, MAX_FRAME_SAMP, fec);
+            if (out_samples >= 0) test_failed();
+            out_samples = oac_decode(dec[t], packet, INT_MIN, outbuf, MAX_FRAME_SAMP, fec);
+            if (out_samples >= 0) test_failed();
+            out_samples = oac_decode(dec[t], packet, -1, outbuf, -1, fec);
+            if (out_samples >= 0) test_failed();
+
+            /*Crazy FEC values*/
+            out_samples = oac_decode(dec[t], packet, 1, outbuf, MAX_FRAME_SAMP, fec?-1:2);
+            if (out_samples >= 0) test_failed();
+
+            /*Reset the decoder*/
+            if (oac_decoder_ctl(dec[t], OAC_RESET_STATE) != OAC_OK) test_failed();
+        }
+    }
+    fprintf(stdout, "  dec[all] initial frame PLC OK.\n");
+
+    /*Count code 0 tests*/
+    for (i = 0; i < 64; i++) {
+        oac_int32 dur;
+        int j, expected[5*2];
+        packet[0] = i<<2;
+        packet[1] = 255;
+        packet[2] = 255;
+        err = oac_packet_get_nb_channels(packet);
+        if (err != (i&1) + 1) test_failed();
+
+        for (t = 0; t < 5*2; t++) {
+            expected[t] = oac_decoder_get_nb_samples(dec[t], packet, 1);
+            if (expected[t] > 2880) test_failed();
+        }
+
+        for (j = 0; j < 256; j++) {
+            packet[1] = j;
+            for (t = 0; t < 5*2; t++) {
 #if defined(ENABLE_OSCE) || defined(ENABLE_DEEP_PLC)
-            oac_decoder_ctl(dec[t], OAC_SET_COMPLEXITY(fast_rand()%11));
+                oac_decoder_ctl(dec[t], OAC_SET_COMPLEXITY(fast_rand()%11));
 #endif
-            out_samples = oac_decode(dec[t], packet, 3, outbuf, MAX_FRAME_SAMP, 0);
-            if(out_samples!=expected[t])test_failed();
-            if(oac_decoder_ctl(dec[t], OAC_GET_LAST_PACKET_DURATION(&dur))!=OAC_OK)test_failed();
-            if(dur!=out_samples)test_failed();
-            oac_decoder_ctl(dec[t], OAC_GET_FINAL_RANGE(&dec_final_range1));
-            if(t==0)dec_final_range2=dec_final_range1;
-            else if(dec_final_range1!=dec_final_range2)test_failed();
-         }
-      }
-
-      for(t=0;t<5*2;t++){
-         int factor=48000/fsv[t>>1];
-         /* The PLC is run for 6 frames in order to get better PLC coverage. */
-         for(j=0;j<6;j++)
-         {
+                out_samples = oac_decode(dec[t], packet, 3, outbuf, MAX_FRAME_SAMP, 0);
+                if (out_samples != expected[t]) test_failed();
+                if (oac_decoder_ctl(dec[t], OAC_GET_LAST_PACKET_DURATION(&dur)) != OAC_OK) test_failed();
+                if (dur != out_samples) test_failed();
+                oac_decoder_ctl(dec[t], OAC_GET_FINAL_RANGE(&dec_final_range1));
+                if (t == 0) dec_final_range2 = dec_final_range1;
+                else if (dec_final_range1 != dec_final_range2) test_failed();
+            }
+        }
+
+        for (t = 0; t < 5*2; t++) {
+            int factor = 48000/fsv[t>>1];
+            /* The PLC is run for 6 frames in order to get better PLC coverage. */
+            for (j = 0; j < 6; j++) {
 #if defined(ENABLE_OSCE) || defined(ENABLE_DEEP_PLC)
-            oac_decoder_ctl(dec[t], OAC_SET_COMPLEXITY(fast_rand()%11));
+                oac_decoder_ctl(dec[t], OAC_SET_COMPLEXITY(fast_rand()%11));
 #endif
-            out_samples = oac_decode(dec[t], 0, 0, outbuf, expected[t], 0);
-            if(out_samples!=expected[t])test_failed();
-            if(oac_decoder_ctl(dec[t], OAC_GET_LAST_PACKET_DURATION(&dur))!=OAC_OK)test_failed();
-            if(dur!=out_samples)test_failed();
-         }
-         /* Run the PLC once at 2.5ms, as a simulation of someone trying to
-            do small drift corrections. */
-         if(expected[t]!=120/factor)
-         {
-            out_samples = oac_decode(dec[t], 0, 0, outbuf, 120/factor, 0);
-            if(out_samples!=120/factor)test_failed();
-            if(oac_decoder_ctl(dec[t], OAC_GET_LAST_PACKET_DURATION(&dur))!=OAC_OK)test_failed();
-            if(dur!=out_samples)test_failed();
-         }
-         out_samples = oac_decode(dec[t], packet, 2, outbuf, expected[t]-1, 0);
-         if(out_samples>0)test_failed();
-      }
-   }
-   fprintf(stdout,"  dec[all] all 2-byte prefix for length 3 and PLC, all modes (64) OK.\n");
-
-   if(no_fuzz)
-   {
-      fprintf(stdout,"  Skipping many tests which fuzz the decoder as requested.\n");
-      free(decbak);
-      for(t=0;t<5*2;t++)oac_decoder_destroy(dec[t]);
-      printf("  Decoders stopped.\n");
-
-      err=0;
-      for(i=0;i<8*2;i++)err|=outbuf_int[i]!=32749;
-      for(i=MAX_FRAME_SAMP*2;i<(MAX_FRAME_SAMP+8)*2;i++)err|=outbuf[i]!=32749;
-      if(err)test_failed();
-
-      free(outbuf_int);
-      free(packet);
-      return 0;
-   }
-
-   {
-     /*We only test a subset of the modes here simply because the longer
-       durations end up taking a long time.*/
-      static const int cmodes[4]={16,20,24,28};
-      static const oac_uint32 cres[4]={116290185,2172123586u,2172123586u,2172123586u};
-      static const oac_uint32 lres[3]={3285687739u,1481572662,694350475};
-      static const int lmodes[3]={0,4,8};
-      int mode=fast_rand()%4;
-
-      packet[0]=cmodes[mode]<<3;
-      dec_final_acc=0;
-      t=fast_rand()%10;
-
-      for(i=0;i<65536;i++)
-      {
-         int factor=48000/fsv[t>>1];
-         packet[1]=i>>8;
-         packet[2]=i&255;
-         packet[3]=255;
-         out_samples = oac_decode(dec[t], packet, 4, outbuf, MAX_FRAME_SAMP, 0);
-         if(out_samples!=120/factor)test_failed();
-         oac_decoder_ctl(dec[t], OAC_GET_FINAL_RANGE(&dec_final_range1));
-         dec_final_acc+=dec_final_range1;
-      }
-      if(dec_final_acc!=cres[mode])test_failed();
-      fprintf(stdout,"  dec[%3d] all 3-byte prefix for length 4, mode %2d OK.\n",t,cmodes[mode]);
-
-      mode=fast_rand()%3;
-      packet[0]=lmodes[mode]<<3;
-      dec_final_acc=0;
-      t=fast_rand()%10;
-      for(i=0;i<65536;i++)
-      {
-         int factor=48000/fsv[t>>1];
-         packet[1]=i>>8;
-         packet[2]=i&255;
-         packet[3]=255;
-         out_samples = oac_decode(dec[t], packet, 4, outbuf, MAX_FRAME_SAMP, 0);
-         if(out_samples!=480/factor)test_failed();
-         oac_decoder_ctl(dec[t], OAC_GET_FINAL_RANGE(&dec_final_range1));
-         dec_final_acc+=dec_final_range1;
-      }
-      if(dec_final_acc!=lres[mode])test_failed();
-      fprintf(stdout,"  dec[%3d] all 3-byte prefix for length 4, mode %2d OK.\n",t,lmodes[mode]);
-   }
-
-   skip=fast_rand()%7;
-   for(i=0;i<64;i++)
-   {
-      int j,expected[5*2];
-      packet[0]=i<<2;
-      for(t=0;t<5*2;t++)expected[t]=oac_decoder_get_nb_samples(dec[t],packet,1);
-      for(j=2+skip;j<1275;j+=4)
-      {
-         int jj;
-         for(jj=0;jj<j;jj++)packet[jj+1]=fast_rand()&255;
-         for(t=0;t<5*2;t++)
-         {
+                out_samples = oac_decode(dec[t], 0, 0, outbuf, expected[t], 0);
+                if (out_samples != expected[t]) test_failed();
+                if (oac_decoder_ctl(dec[t], OAC_GET_LAST_PACKET_DURATION(&dur)) != OAC_OK) test_failed();
+                if (dur != out_samples) test_failed();
+            }
+            /* Run the PLC once at 2.5ms, as a simulation of someone trying to
+               do small drift corrections. */
+            if (expected[t] != 120/factor) {
+                out_samples = oac_decode(dec[t], 0, 0, outbuf, 120/factor, 0);
+                if (out_samples != 120/factor) test_failed();
+                if (oac_decoder_ctl(dec[t], OAC_GET_LAST_PACKET_DURATION(&dur)) != OAC_OK) test_failed();
+                if (dur != out_samples) test_failed();
+            }
+            out_samples = oac_decode(dec[t], packet, 2, outbuf, expected[t] - 1, 0);
+            if (out_samples > 0) test_failed();
+        }
+    }
+    fprintf(stdout, "  dec[all] all 2-byte prefix for length 3 and PLC, all modes (64) OK.\n");
+
+    if (no_fuzz) {
+        fprintf(stdout, "  Skipping many tests which fuzz the decoder as requested.\n");
+        free(decbak);
+        for (t = 0; t < 5*2; t++) oac_decoder_destroy(dec[t]);
+        printf("  Decoders stopped.\n");
+
+        err = 0;
+        for (i = 0; i < 8*2; i++) err |= outbuf_int[i] != 32749;
+        for (i = MAX_FRAME_SAMP*2; i < (MAX_FRAME_SAMP + 8)*2; i++) err |= outbuf[i] != 32749;
+        if (err) test_failed();
+
+        free(outbuf_int);
+        free(packet);
+        return 0;
+    }
+
+    {
+        /*We only test a subset of the modes here simply because the longer
+           durations end up taking a long time.*/
+        static const int cmodes[4] = {16, 20, 24, 28};
+        static const oac_uint32 cres[4] = {116290185, 2172123586u, 2172123586u, 2172123586u};
+        static const oac_uint32 lres[3] = {3285687739u, 1481572662, 694350475};
+        static const int lmodes[3] = {0, 4, 8};
+        int mode = fast_rand()%4;
+
+        packet[0] = cmodes[mode]<<3;
+        dec_final_acc = 0;
+        t = fast_rand()%10;
+
+        for (i = 0; i < 65536; i++) {
+            int factor = 48000/fsv[t>>1];
+            packet[1] = i>>8;
+            packet[2] = i&255;
+            packet[3] = 255;
+            out_samples = oac_decode(dec[t], packet, 4, outbuf, MAX_FRAME_SAMP, 0);
+            if (out_samples != 120/factor) test_failed();
+            oac_decoder_ctl(dec[t], OAC_GET_FINAL_RANGE(&dec_final_range1));
+            dec_final_acc += dec_final_range1;
+        }
+        if (dec_final_acc != cres[mode]) test_failed();
+        fprintf(stdout, "  dec[%3d] all 3-byte prefix for length 4, mode %2d OK.\n", t, cmodes[mode]);
+
+        mode = fast_rand()%3;
+        packet[0] = lmodes[mode]<<3;
+        dec_final_acc = 0;
+        t = fast_rand()%10;
+        for (i = 0; i < 65536; i++) {
+            int factor = 48000/fsv[t>>1];
+            packet[1] = i>>8;
+            packet[2] = i&255;
+            packet[3] = 255;
+            out_samples = oac_decode(dec[t], packet, 4, outbuf, MAX_FRAME_SAMP, 0);
+            if (out_samples != 480/factor) test_failed();
+            oac_decoder_ctl(dec[t], OAC_GET_FINAL_RANGE(&dec_final_range1));
+            dec_final_acc += dec_final_range1;
+        }
+        if (dec_final_acc != lres[mode]) test_failed();
+        fprintf(stdout, "  dec[%3d] all 3-byte prefix for length 4, mode %2d OK.\n", t, lmodes[mode]);
+    }
+
+    skip = fast_rand()%7;
+    for (i = 0; i < 64; i++) {
+        int j, expected[5*2];
+        packet[0] = i<<2;
+        for (t = 0; t < 5*2; t++) expected[t] = oac_decoder_get_nb_samples(dec[t], packet, 1);
+        for (j = 2 + skip; j < 1275; j += 4) {
+            int jj;
+            for (jj = 0; jj < j; jj++) packet[jj + 1] = fast_rand()&255;
+            for (t = 0; t < 5*2; t++) {
 #if defined(ENABLE_OSCE) || defined(ENABLE_DEEP_PLC)
-            oac_decoder_ctl(dec[t], OAC_SET_COMPLEXITY(fast_rand()%11));
+                oac_decoder_ctl(dec[t], OAC_SET_COMPLEXITY(fast_rand()%11));
 #endif
-            out_samples = oac_decode(dec[t], packet, j+1, outbuf, MAX_FRAME_SAMP, 0);
-            if(out_samples!=expected[t])test_failed();
-            oac_decoder_ctl(dec[t], OAC_GET_FINAL_RANGE(&dec_final_range1));
-            if(t==0)dec_final_range2=dec_final_range1;
-            else if(dec_final_range1!=dec_final_range2)test_failed();
-         }
-      }
-   }
-   fprintf(stdout,"  dec[all] random packets, all modes (64), every 8th size from from %d bytes to maximum OK.\n",2+skip);
-
-   debruijn2(64,modes);
-   plen=(fast_rand()%18+3)*8+skip+3;
-   for(i=0;i<4096;i++)
-   {
-      int j,expected[5*2];
-      packet[0]=modes[i]<<2;
-      for(t=0;t<5*2;t++)expected[t]=oac_decoder_get_nb_samples(dec[t],packet,plen);
-      for(j=0;j<plen;j++)packet[j+1]=(fast_rand()|fast_rand())&255;
-      memcpy(decbak,dec[0],decsize);
-      if(oac_decode(decbak, packet, plen+1, outbuf, expected[0], 1)!=expected[0])test_failed();
-      memcpy(decbak,dec[0],decsize);
-      if(oac_decode(decbak,  0, 0, outbuf, MAX_FRAME_SAMP, 1)<20)test_failed();
-      memcpy(decbak,dec[0],decsize);
-      if(oac_decode(decbak,  0, 0, outbuf, MAX_FRAME_SAMP, 0)<20)test_failed();
-      for(t=0;t<5*2;t++)
-      {
-         oac_int32 dur;
+                out_samples = oac_decode(dec[t], packet, j + 1, outbuf, MAX_FRAME_SAMP, 0);
+                if (out_samples != expected[t]) test_failed();
+                oac_decoder_ctl(dec[t], OAC_GET_FINAL_RANGE(&dec_final_range1));
+                if (t == 0) dec_final_range2 = dec_final_range1;
+                else if (dec_final_range1 != dec_final_range2) test_failed();
+            }
+        }
+    }
+    fprintf(stdout, "  dec[all] random packets, all modes (64), every 8th size from from %d bytes to maximum OK.\n",
+    2 + skip);
+
+    debruijn2(64, modes);
+    plen = (fast_rand()%18 + 3)*8 + skip + 3;
+    for (i = 0; i < 4096; i++) {
+        int j, expected[5*2];
+        packet[0] = modes[i]<<2;
+        for (t = 0; t < 5*2; t++) expected[t] = oac_decoder_get_nb_samples(dec[t], packet, plen);
+        for (j = 0; j < plen; j++) packet[j + 1] = (fast_rand()|fast_rand())&255;
+        memcpy(decbak, dec[0], decsize);
+        if (oac_decode(decbak, packet, plen + 1, outbuf, expected[0], 1) != expected[0]) test_failed();
+        memcpy(decbak, dec[0], decsize);
+        if (oac_decode(decbak,  0, 0, outbuf, MAX_FRAME_SAMP, 1) < 20)test_failed();
+        memcpy(decbak, dec[0], decsize);
+        if (oac_decode(decbak,  0, 0, outbuf, MAX_FRAME_SAMP, 0) < 20)test_failed();
+        for (t = 0; t < 5*2; t++) {
+            oac_int32 dur;
 #if defined(ENABLE_OSCE) || defined(ENABLE_DEEP_PLC)
-         oac_decoder_ctl(dec[t], OAC_SET_COMPLEXITY(fast_rand()%11));
+            oac_decoder_ctl(dec[t], OAC_SET_COMPLEXITY(fast_rand()%11));
 #endif
-         out_samples = oac_decode(dec[t], packet, plen+1, outbuf, MAX_FRAME_SAMP, 0);
-         if(out_samples!=expected[t])test_failed();
-         if(t==0)dec_final_range2=dec_final_range1;
-         else if(dec_final_range1!=dec_final_range2)test_failed();
-         if(oac_decoder_ctl(dec[t], OAC_GET_LAST_PACKET_DURATION(&dur))!=OAC_OK)test_failed();
-         if(dur!=out_samples)test_failed();
-      }
-   }
-   fprintf(stdout,"  dec[all] random packets, all mode pairs (4096), %d bytes/frame OK.\n",plen+1);
-
-   plen=(fast_rand()%18+3)*8+skip+3;
-   t=rand()&3;
-   for(i=0;i<4096;i++)
-   {
-      int count,j,expected;
-      packet[0]=modes[i]<<2;
-      expected=oac_decoder_get_nb_samples(dec[t],packet,plen);
-      for(count=0;count<10;count++)
-      {
+            out_samples = oac_decode(dec[t], packet, plen + 1, outbuf, MAX_FRAME_SAMP, 0);
+            if (out_samples != expected[t]) test_failed();
+            if (t == 0) dec_final_range2 = dec_final_range1;
+            else if (dec_final_range1 != dec_final_range2) test_failed();
+            if (oac_decoder_ctl(dec[t], OAC_GET_LAST_PACKET_DURATION(&dur)) != OAC_OK) test_failed();
+            if (dur != out_samples) test_failed();
+        }
+    }
+    fprintf(stdout, "  dec[all] random packets, all mode pairs (4096), %d bytes/frame OK.\n", plen + 1);
+
+    plen = (fast_rand()%18 + 3)*8 + skip + 3;
+    t = rand()&3;
+    for (i = 0; i < 4096; i++) {
+        int count, j, expected;
+        packet[0] = modes[i]<<2;
+        expected = oac_decoder_get_nb_samples(dec[t], packet, plen);
+        for (count = 0; count < 10; count++) {
 #if defined(ENABLE_OSCE) || defined(ENABLE_DEEP_PLC)
-         oac_decoder_ctl(dec[t], OAC_SET_COMPLEXITY(fast_rand()%11));
+            oac_decoder_ctl(dec[t], OAC_SET_COMPLEXITY(fast_rand()%11));
 #endif
-         for(j=0;j<plen;j++)packet[j+1]=(fast_rand()|fast_rand())&255;
-         out_samples = oac_decode(dec[t], packet, plen+1, outbuf, MAX_FRAME_SAMP, 0);
-         if(out_samples!=expected)test_failed();
-      }
-   }
-   fprintf(stdout,"  dec[%3d] random packets, all mode pairs (4096)*10, %d bytes/frame OK.\n",t,plen+1);
-
-   {
-      int tmodes[1]={25<<2};
-      oac_uint32 tseeds[1]={140441};
-      int tlen[1]={157};
-      oac_int32 tret[1]={480};
-      t=fast_rand()&1;
-      for(i=0;i<1;i++)
-      {
-         int j;
-         packet[0]=tmodes[i];
-         Rw=Rz=tseeds[i];
-         for(j=1;j<tlen[i];j++)packet[j]=fast_rand()&255;
-         out_samples=oac_decode(dec[t], packet, tlen[i], outbuf, MAX_FRAME_SAMP, 0);
-         if(out_samples!=tret[i])test_failed();
-      }
-      fprintf(stdout,"  dec[%3d] pre-selected random packets OK.\n",t);
-   }
-
-   free(decbak);
-   for(t=0;t<5*2;t++)oac_decoder_destroy(dec[t]);
-   printf("  Decoders stopped.\n");
-
-   err=0;
-   for(i=0;i<8*2;i++)err|=outbuf_int[i]!=32749;
-   for(i=MAX_FRAME_SAMP*2;i<(MAX_FRAME_SAMP+8)*2;i++)err|=outbuf[i]!=32749;
-   if(err)test_failed();
-
-   free(outbuf_int);
-   free(packet);
-   return 0;
+            for (j = 0; j < plen; j++) packet[j + 1] = (fast_rand()|fast_rand())&255;
+            out_samples = oac_decode(dec[t], packet, plen + 1, outbuf, MAX_FRAME_SAMP, 0);
+            if (out_samples != expected) test_failed();
+        }
+    }
+    fprintf(stdout, "  dec[%3d] random packets, all mode pairs (4096)*10, %d bytes/frame OK.\n", t, plen + 1);
+
+    {
+        int tmodes[1] = {25<<2};
+        oac_uint32 tseeds[1] = {140441};
+        int tlen[1] = {157};
+        oac_int32 tret[1] = {480};
+        t = fast_rand()&1;
+        for (i = 0; i < 1; i++) {
+            int j;
+            packet[0] = tmodes[i];
+            Rw = Rz = tseeds[i];
+            for (j = 1; j < tlen[i]; j++) packet[j] = fast_rand()&255;
+            out_samples = oac_decode(dec[t], packet, tlen[i], outbuf, MAX_FRAME_SAMP, 0);
+            if (out_samples != tret[i]) test_failed();
+        }
+        fprintf(stdout, "  dec[%3d] pre-selected random packets OK.\n", t);
+    }
+
+    free(decbak);
+    for (t = 0; t < 5*2; t++) oac_decoder_destroy(dec[t]);
+    printf("  Decoders stopped.\n");
+
+    err = 0;
+    for (i = 0; i < 8*2; i++) err |= outbuf_int[i] != 32749;
+    for (i = MAX_FRAME_SAMP*2; i < (MAX_FRAME_SAMP + 8)*2; i++) err |= outbuf[i] != 32749;
+    if (err) test_failed();
+
+    free(outbuf_int);
+    free(packet);
+    return 0;
 }
 
 #ifndef DISABLE_FLOAT_API
-void test_soft_clip(void)
-{
-   int i,j;
-   float x[1024];
-   float s[8] = {0, 0, 0, 0, 0, 0, 0, 0};
-   fprintf(stdout,"  Testing oac_pcm_soft_clip... ");
-   for(i=0;i<1024;i++)
-   {
-      for (j=0;j<1024;j++)
-      {
-        x[j]=(j&255)*(1/32.f)-4.f;
-      }
-      oac_pcm_soft_clip(&x[i],1024-i,1,s);
-      for (j=i;j<1024;j++)
-      {
-        if(x[j]>1.f)test_failed();
-        if(x[j]<-1.f)test_failed();
-      }
-   }
-   for(i=1;i<9;i++)
-   {
-      for (j=0;j<1024;j++)
-      {
-        x[j]=(j&255)*(1/32.f)-4.f;
-      }
-      oac_pcm_soft_clip(x,1024/i,i,s);
-      for (j=0;j<(1024/i)*i;j++)
-      {
-        if(x[j]>1.f)test_failed();
-        if(x[j]<-1.f)test_failed();
-      }
-   }
-   oac_pcm_soft_clip(x,0,1,s);
-   oac_pcm_soft_clip(x,1,0,s);
-   oac_pcm_soft_clip(x,1,1,0);
-   oac_pcm_soft_clip(x,1,-1,s);
-   oac_pcm_soft_clip(x,-1,1,s);
-   oac_pcm_soft_clip(0,1,1,s);
-   printf("OK.\n");
+void test_soft_clip(void) {
+    int i, j;
+    float x[1024];
+    float s[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+    fprintf(stdout, "  Testing oac_pcm_soft_clip... ");
+    for (i = 0; i < 1024; i++) {
+        for (j = 0; j < 1024; j++) {
+            x[j] = (j&255)*(1/32.f) - 4.f;
+        }
+        oac_pcm_soft_clip(&x[i], 1024 - i, 1, s);
+        for (j = i; j < 1024; j++) {
+            if (x[j] > 1.f) test_failed();
+            if (x[j] < -1.f) test_failed();
+        }
+    }
+    for (i = 1; i < 9; i++) {
+        for (j = 0; j < 1024; j++) {
+            x[j] = (j&255)*(1/32.f) - 4.f;
+        }
+        oac_pcm_soft_clip(x, 1024/i, i, s);
+        for (j = 0; j < (1024/i)*i; j++) {
+            if (x[j] > 1.f) test_failed();
+            if (x[j] < -1.f) test_failed();
+        }
+    }
+    oac_pcm_soft_clip(x, 0, 1, s);
+    oac_pcm_soft_clip(x, 1, 0, s);
+    oac_pcm_soft_clip(x, 1, 1, 0);
+    oac_pcm_soft_clip(x, 1, -1, s);
+    oac_pcm_soft_clip(x, -1, 1, s);
+    oac_pcm_soft_clip(0, 1, 1, s);
+    printf("OK.\n");
 }
 #endif
 
-int main(int _argc, char **_argv)
-{
-   const char * oversion;
-   const char * env_seed;
-   int env_used;
-
-   if(_argc>2)
-   {
-      fprintf(stderr,"Usage: %s [<seed>]\n",_argv[0]);
-      return 1;
-   }
-
-   env_used=0;
-   env_seed=getenv("SEED");
-   if(_argc>1)iseed=atoi(_argv[1]);
-   else if(env_seed)
-   {
-      iseed=atoi(env_seed);
-      env_used=1;
-   }
-   else iseed=(oac_uint32)time(NULL)^(((oac_uint32)getpid()&65535)<<16);
-   Rw=Rz=iseed;
-
-   oversion=oac_get_version_string();
-   if(!oversion)test_failed();
-   fprintf(stderr,"Testing %s decoder. Random seed: %u (%.4X)\n", oversion, iseed, fast_rand() % 65535);
-   if(env_used)fprintf(stderr,"  Random seed set from the environment (SEED=%s).\n", env_seed);
-
-   /*Setting TEST_OAC_NOFUZZ tells the tool not to send garbage data
-     into the decoders. This is helpful because garbage data
-     may cause the decoders to clip, which angers CLANG IOC.*/
-   test_decoder_code0(getenv("TEST_OAC_NOFUZZ")!=NULL);
+int main(int _argc, char **_argv) {
+    const char * oversion;
+    const char * env_seed;
+    int env_used;
+
+    if (_argc > 2) {
+        fprintf(stderr, "Usage: %s [<seed>]\n", _argv[0]);
+        return 1;
+    }
+
+    env_used = 0;
+    env_seed = getenv("SEED");
+    if (_argc > 1) iseed = atoi(_argv[1]);
+    else if (env_seed) {
+        iseed = atoi(env_seed);
+        env_used = 1;
+    } else iseed = (oac_uint32)time(NULL)^(((oac_uint32)getpid()&65535)<<16);
+    Rw = Rz = iseed;
+
+    oversion = oac_get_version_string();
+    if (!oversion) test_failed();
+    fprintf(stderr, "Testing %s decoder. Random seed: %u (%.4X)\n", oversion, iseed, fast_rand()%65535);
+    if (env_used) fprintf(stderr, "  Random seed set from the environment (SEED=%s).\n", env_seed);
+
+    /*Setting TEST_OAC_NOFUZZ tells the tool not to send garbage data
+       into the decoders. This is helpful because garbage data
+       may cause the decoders to clip, which angers CLANG IOC.*/
+    test_decoder_code0(getenv("TEST_OAC_NOFUZZ") != NULL);
 #ifndef DISABLE_FLOAT_API
-   test_soft_clip();
+    test_soft_clip();
 #endif
 
-   return 0;
+    return 0;
 }
diff --git a/tests/test_oac_dred.c b/tests/test_oac_dred.c
index 67fbaa8ff..0de78ee58 100644
--- a/tests/test_oac_dred.c
+++ b/tests/test_oac_dred.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdio.h>
@@ -34,10 +34,10 @@
 #include <string.h>
 #include <time.h>
 #ifndef _WIN32
-#include <unistd.h>
+# include <unistd.h>
 #else
-#include <process.h>
-#define getpid _getpid
+# include <process.h>
+# define getpid _getpid
 #endif
 
 /* including sources directly to test internal APIs */
@@ -51,57 +51,51 @@
 #define MAX_EXTENSION_SIZE 200
 #define MAX_NB_EXTENSIONS 100
 
-void test_random_dred(void)
-{
-   int error;
-   int i;
-   OacDREDDecoder *dred_dec;
-   OacDRED *dred;
-   dred_dec = oac_dred_decoder_create(&error);
-   expect_true(error == OAC_OK, "oac_dred_decoder_create() failed");
-   dred = oac_dred_alloc(&error);
-   expect_true(error == OAC_OK, "oac_dred_create() failed");
-   for (i=0;i<NB_RANDOM_EXTENSIONS;i++)
-   {
-      unsigned char payload[MAX_EXTENSION_SIZE];
-      int len;
-      int j;
-      int res1, res2;
-      int dred_end;
-      len = fast_rand()%(MAX_EXTENSION_SIZE+1);
-      for (j=0;j<len;j++)
-         payload[j] = fast_rand()&0xFF;
-      res1 = oac_dred_parse(dred_dec, dred, payload, len, 48000, 48000, &dred_end, fast_rand()&0x1);
-      if (res1 > 0)
-      {
-         res2 = oac_dred_process(dred_dec, dred, dred);
-         expect_true(res2 == OAC_OK, "process should succeed if parse succeeds");
-         expect_true(res1 >= dred_end, "end before beginning");
-      }
-   }
-   oac_dred_free(dred);
-   oac_dred_decoder_destroy(dred_dec);
+void test_random_dred(void) {
+    int error;
+    int i;
+    OacDREDDecoder *dred_dec;
+    OacDRED *dred;
+    dred_dec = oac_dred_decoder_create(&error);
+    expect_true(error == OAC_OK, "oac_dred_decoder_create() failed");
+    dred = oac_dred_alloc(&error);
+    expect_true(error == OAC_OK, "oac_dred_create() failed");
+    for (i = 0; i < NB_RANDOM_EXTENSIONS; i++) {
+        unsigned char payload[MAX_EXTENSION_SIZE];
+        int len;
+        int j;
+        int res1, res2;
+        int dred_end;
+        len = fast_rand()%(MAX_EXTENSION_SIZE + 1);
+        for (j = 0; j < len; j++)
+            payload[j] = fast_rand()&0xFF;
+        res1 = oac_dred_parse(dred_dec, dred, payload, len, 48000, 48000, &dred_end, fast_rand()&0x1);
+        if (res1 > 0) {
+            res2 = oac_dred_process(dred_dec, dred, dred);
+            expect_true(res2 == OAC_OK, "process should succeed if parse succeeds");
+            expect_true(res1 >= dred_end, "end before beginning");
+        }
+    }
+    oac_dred_free(dred);
+    oac_dred_decoder_destroy(dred_dec);
 }
 
-int main(int argc, char **argv)
-{
-   int env_used;
-   char *env_seed;
-   env_used=0;
-   env_seed=getenv("SEED");
-   if(argc>1)iseed=atoi(argv[1]);
-   else if(env_seed)
-   {
-      iseed=atoi(env_seed);
-      env_used=1;
-   }
-   else iseed=(oac_uint32)time(NULL)^(((oac_uint32)getpid()&65535)<<16);
-   Rw=Rz=iseed;
+int main(int argc, char **argv) {
+    int env_used;
+    char *env_seed;
+    env_used = 0;
+    env_seed = getenv("SEED");
+    if (argc > 1) iseed = atoi(argv[1]);
+    else if (env_seed) {
+        iseed = atoi(env_seed);
+        env_used = 1;
+    } else iseed = (oac_uint32)time(NULL)^(((oac_uint32)getpid()&65535)<<16);
+    Rw = Rz = iseed;
 
-   fprintf(stderr,"Testing dred. Random seed: %u (%.4X)\n", iseed, fast_rand() % 65535);
-   if(env_used)fprintf(stderr,"  Random seed set from the environment (SEED=%s).\n", env_seed);
+    fprintf(stderr, "Testing dred. Random seed: %u (%.4X)\n", iseed, fast_rand()%65535);
+    if (env_used) fprintf(stderr, "  Random seed set from the environment (SEED=%s).\n", env_seed);
 
-   test_random_dred();
-   fprintf(stderr,"Tests completed successfully.\n");
-   return 0;
+    test_random_dred();
+    fprintf(stderr, "Tests completed successfully.\n");
+    return 0;
 }
diff --git a/tests/test_oac_encode.c b/tests/test_oac_encode.c
index 814a850d4..682e33ca7 100644
--- a/tests/test_oac_encode.c
+++ b/tests/test_oac_encode.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdio.h>
@@ -37,10 +37,10 @@
 #include <string.h>
 #include <time.h>
 #if (!defined WIN32 && !defined _WIN32) || defined(__MINGW32__)
-#include <unistd.h>
+# include <unistd.h>
 #else
-#include <process.h>
-#define getpid _getpid
+# include <process.h>
+# define getpid _getpid
 #endif
 #include "oac_multistream.h"
 #include "oac.h"
@@ -52,235 +52,228 @@
 #define SSAMPLES (SAMPLES/3)
 #define MAX_FRAME_SAMP (5760)
 #define PI (3.141592653589793238462643f)
-#define RAND_SAMPLE(a) (a[fast_rand() % sizeof(a)/sizeof(a[0])])
-
-void generate_music(short *buf, oac_int32 len)
-{
-   oac_int32 a1,b1,a2,b2;
-   oac_int32 c1,c2,d1,d2;
-   oac_int32 i,j;
-   a1=b1=a2=b2=0;
-   c1=c2=d1=d2=0;
-   j=0;
-   /*60ms silence*/
-   for(i=0;i<2880;i++)buf[i*2]=buf[i*2+1]=0;
-   for(i=2880;i<len;i++)
-   {
-     oac_uint32 r;
-     oac_int32 v1,v2;
-     v1=v2=(((j*((j>>12)^((j>>10|j>>12)&26&j>>7)))&128)+128)<<15;
-     r=fast_rand();v1+=r&65535;v1-=r>>16;
-     r=fast_rand();v2+=r&65535;v2-=r>>16;
-     b1=v1-a1+((b1*61+32)>>6);a1=v1;
-     b2=v2-a2+((b2*61+32)>>6);a2=v2;
-     c1=(30*(c1+b1+d1)+32)>>6;d1=b1;
-     c2=(30*(c2+b2+d2)+32)>>6;d2=b2;
-     v1=(c1+128)>>8;
-     v2=(c2+128)>>8;
-     buf[i*2]=v1>32767?32767:(v1<-32768?-32768:v1);
-     buf[i*2+1]=v2>32767?32767:(v2<-32768?-32768:v2);
-     if(i%6==0)j++;
-   }
+#define RAND_SAMPLE(a) (a[fast_rand()%sizeof(a)/sizeof(a[0])])
+
+void generate_music(short *buf, oac_int32 len) {
+    oac_int32 a1, b1, a2, b2;
+    oac_int32 c1, c2, d1, d2;
+    oac_int32 i, j;
+    a1 = b1 = a2 = b2 = 0;
+    c1 = c2 = d1 = d2 = 0;
+    j = 0;
+    /*60ms silence*/
+    for (i = 0; i < 2880; i++) buf[i*2] = buf[i*2 + 1] = 0;
+    for (i = 2880; i < len; i++) {
+        oac_uint32 r;
+        oac_int32 v1, v2;
+        v1 = v2 = (((j*((j>>12)^((j>>10|j>>12)&26&j>>7)))&128) + 128)<<15;
+        r = fast_rand(); v1 += r&65535; v1 -= r>>16;
+        r = fast_rand(); v2 += r&65535; v2 -= r>>16;
+        b1 = v1 - a1 + ((b1*61 + 32)>>6); a1 = v1;
+        b2 = v2 - a2 + ((b2*61 + 32)>>6); a2 = v2;
+        c1 = (30*(c1 + b1 + d1) + 32)>>6; d1 = b1;
+        c2 = (30*(c2 + b2 + d2) + 32)>>6; d2 = b2;
+        v1 = (c1 + 128)>>8;
+        v2 = (c2 + 128)>>8;
+        buf[i*2] = v1 > 32767?32767:(v1 < -32768?-32768:v1);
+        buf[i*2 + 1] = v2 > 32767?32767:(v2 < -32768?-32768:v2);
+        if (i%6 == 0) j++;
+    }
 }
 
 #if 0
 static int save_ctr = 0;
-static void int_to_char(oac_uint32 i, unsigned char ch[4])
-{
+static void int_to_char(oac_uint32 i, unsigned char ch[4]) {
     ch[0] = i>>24;
     ch[1] = (i>>16)&0xFF;
     ch[2] = (i>>8)&0xFF;
     ch[3] = i&0xFF;
 }
 
-static OAC_INLINE void save_packet(unsigned char* p, int len, oac_uint32 rng)
-{
-   FILE *fout;
-   unsigned char int_field[4];
-   char name[256];
-   snprintf(name,255,"test_oac_encode.%llu.%d.bit",(unsigned long long)iseed,save_ctr);
-   fprintf(stdout,"writing %d byte packet to %s\n",len,name);
-   fout=fopen(name, "wb+");
-   if(fout==NULL)test_failed();
-   int_to_char(len, int_field);
-   fwrite(int_field, 1, 4, fout);
-   int_to_char(rng, int_field);
-   fwrite(int_field, 1, 4, fout);
-   fwrite(p, 1, len, fout);
-   fclose(fout);
-   save_ctr++;
+static OAC_INLINE void save_packet(unsigned char* p, int len, oac_uint32 rng) {
+    FILE *fout;
+    unsigned char int_field[4];
+    char name[256];
+    snprintf(name, 255, "test_oac_encode.%llu.%d.bit", (unsigned long long)iseed, save_ctr);
+    fprintf(stdout, "writing %d byte packet to %s\n", len, name);
+    fout = fopen(name, "wb+");
+    if (fout == NULL) test_failed();
+    int_to_char(len, int_field);
+    fwrite(int_field, 1, 4, fout);
+    int_to_char(rng, int_field);
+    fwrite(int_field, 1, 4, fout);
+    fwrite(p, 1, len, fout);
+    fclose(fout);
+    save_ctr++;
 }
 #endif
 
-int get_frame_size_enum(int frame_size, int sampling_rate)
-{
-   int frame_size_enum;
-
-   if(frame_size==sampling_rate/400)
-      frame_size_enum = OAC_FRAMESIZE_2_5_MS;
-   else if(frame_size==sampling_rate/200)
-      frame_size_enum = OAC_FRAMESIZE_5_MS;
-   else if(frame_size==sampling_rate/100)
-      frame_size_enum = OAC_FRAMESIZE_10_MS;
-   else if(frame_size==sampling_rate/50)
-      frame_size_enum = OAC_FRAMESIZE_20_MS;
-   else if(frame_size==sampling_rate/25)
-      frame_size_enum = OAC_FRAMESIZE_40_MS;
-   else if(frame_size==3*sampling_rate/50)
-      frame_size_enum = OAC_FRAMESIZE_60_MS;
-   else if(frame_size==4*sampling_rate/50)
-      frame_size_enum = OAC_FRAMESIZE_80_MS;
-   else if(frame_size==5*sampling_rate/50)
-      frame_size_enum = OAC_FRAMESIZE_100_MS;
-   else if(frame_size==6*sampling_rate/50)
-      frame_size_enum = OAC_FRAMESIZE_120_MS;
-   else
-      test_failed();
-
-   return frame_size_enum;
+int get_frame_size_enum(int frame_size, int sampling_rate) {
+    int frame_size_enum;
+
+    if (frame_size == sampling_rate/400)
+        frame_size_enum = OAC_FRAMESIZE_2_5_MS;
+    else if (frame_size == sampling_rate/200)
+        frame_size_enum = OAC_FRAMESIZE_5_MS;
+    else if (frame_size == sampling_rate/100)
+        frame_size_enum = OAC_FRAMESIZE_10_MS;
+    else if (frame_size == sampling_rate/50)
+        frame_size_enum = OAC_FRAMESIZE_20_MS;
+    else if (frame_size == sampling_rate/25)
+        frame_size_enum = OAC_FRAMESIZE_40_MS;
+    else if (frame_size == 3*sampling_rate/50)
+        frame_size_enum = OAC_FRAMESIZE_60_MS;
+    else if (frame_size == 4*sampling_rate/50)
+        frame_size_enum = OAC_FRAMESIZE_80_MS;
+    else if (frame_size == 5*sampling_rate/50)
+        frame_size_enum = OAC_FRAMESIZE_100_MS;
+    else if (frame_size == 6*sampling_rate/50)
+        frame_size_enum = OAC_FRAMESIZE_120_MS;
+    else
+        test_failed();
+
+    return frame_size_enum;
 }
 
-int test_encode(OacEncoder *enc, int channels, int frame_size, OacDecoder *dec)
-{
-   int samp_count = 0;
-   oac_int16 *inbuf;
-   unsigned char packet[MAX_PACKET+257];
-   int len;
-   oac_int16 *outbuf;
-   int out_samples;
-   int ret = 0;
+int test_encode(OacEncoder *enc, int channels, int frame_size, OacDecoder *dec) {
+    int samp_count = 0;
+    oac_int16 *inbuf;
+    unsigned char packet[MAX_PACKET + 257];
+    int len;
+    oac_int16 *outbuf;
+    int out_samples;
+    int ret = 0;
 #ifdef ENABLE_DRED
-   OacDREDDecoder *dred_dec;
-   OacDRED *dred;
-   int dred_end;
-   int dred_amount;
-   int dred_ret;
-   dred_dec = oac_dred_decoder_create(&dred_ret);
-   dred = oac_dred_alloc(&dred_ret);
+    OacDREDDecoder *dred_dec;
+    OacDRED *dred;
+    int dred_end;
+    int dred_amount;
+    int dred_ret;
+    dred_dec = oac_dred_decoder_create(&dred_ret);
+    dred = oac_dred_alloc(&dred_ret);
 #endif
-   /* Generate input data */
-   inbuf = (oac_int16*)malloc(sizeof(*inbuf)*SSAMPLES);
-   generate_music(inbuf, SSAMPLES/2);
-
-   /* Allocate memory for output data */
-   outbuf = (oac_int16*)malloc(sizeof(*outbuf)*MAX_FRAME_SAMP*3);
-
-   /* Encode data, then decode for sanity check */
-   do {
-      len = oac_encode(enc, &inbuf[samp_count*channels], frame_size, packet, MAX_PACKET);
-      if(len<0 || len>MAX_PACKET) {
-         fprintf(stderr,"oac_encode() returned %d\n",len);
-         ret = -1;
-         break;
-      }
+    /* Generate input data */
+    inbuf = (oac_int16*)malloc(sizeof(*inbuf)*SSAMPLES);
+    generate_music(inbuf, SSAMPLES/2);
+
+    /* Allocate memory for output data */
+    outbuf = (oac_int16*)malloc(sizeof(*outbuf)*MAX_FRAME_SAMP*3);
+
+    /* Encode data, then decode for sanity check */
+    do {
+        len = oac_encode(enc, &inbuf[samp_count*channels], frame_size, packet, MAX_PACKET);
+        if (len < 0 || len > MAX_PACKET) {
+            fprintf(stderr, "oac_encode() returned %d\n", len);
+            ret = -1;
+            break;
+        }
 #ifdef ENABLE_DRED
-      dred_amount = oac_dred_parse(dred_dec, dred, packet, len, 48000, 48000, &dred_end, 0);
-      if(dred_amount<0) {
-         fprintf(stderr,"oac_dred_parse() returned %d\n",dred_amount);
-         ret = -1;
-         break;
-      }
-      if (dred_amount >= frame_size && (fast_rand()&1)) {
-         dred_ret = oac_decoder_dred_decode(dec, dred, frame_size, outbuf, frame_size);
-         if(dred_ret<0) {
-            fprintf(stderr,"oac_decoder_dred_decode() returned %d\n",dred_ret);
+        dred_amount = oac_dred_parse(dred_dec, dred, packet, len, 48000, 48000, &dred_end, 0);
+        if (dred_amount < 0) {
+            fprintf(stderr, "oac_dred_parse() returned %d\n", dred_amount);
             ret = -1;
             break;
-         }
-      }
+        }
+        if (dred_amount >= frame_size && (fast_rand()&1)) {
+            dred_ret = oac_decoder_dred_decode(dec, dred, frame_size, outbuf, frame_size);
+            if (dred_ret < 0) {
+                fprintf(stderr, "oac_decoder_dred_decode() returned %d\n", dred_ret);
+                ret = -1;
+                break;
+            }
+        }
 #endif
-      out_samples = oac_decode(dec, packet, len, outbuf, MAX_FRAME_SAMP, 0);
-      if(out_samples!=frame_size) {
-         fprintf(stderr,"oac_decode() returned %d\n",out_samples);
-         ret = -1;
-         break;
-      }
-
-      samp_count += frame_size;
-   } while (samp_count < ((SSAMPLES/2)-MAX_FRAME_SAMP));
+        out_samples = oac_decode(dec, packet, len, outbuf, MAX_FRAME_SAMP, 0);
+        if (out_samples != frame_size) {
+            fprintf(stderr, "oac_decode() returned %d\n", out_samples);
+            ret = -1;
+            break;
+        }
+
+        samp_count += frame_size;
+    } while (samp_count < ((SSAMPLES/2) - MAX_FRAME_SAMP));
 #ifdef ENABLE_DRED
-   oac_dred_decoder_destroy(dred_dec);
-   oac_dred_free(dred);
+    oac_dred_decoder_destroy(dred_dec);
+    oac_dred_free(dred);
 #endif
-   /* Clean up */
-   free(inbuf);
-   free(outbuf);
-   return ret;
+    /* Clean up */
+    free(inbuf);
+    free(outbuf);
+    return ret;
 }
 
-void fuzz_encoder_settings(const int num_encoders, const int num_setting_changes)
-{
-   OacEncoder *enc;
-   OacDecoder *dec;
-   int i,j,err;
-
-   /* Parameters to fuzz. Some values are duplicated to increase their probability of being tested. */
-   int sampling_rates[5] = {8000, 12000, 16000, 24000, 48000};
-   int channels[2] = {1, 2};
-   int applications[3] = {OAC_APPLICATION_AUDIO, OAC_APPLICATION_VOIP, OAC_APPLICATION_RESTRICTED_LOWDELAY};
-   int bitrates[11] = {6000, 12000, 16000, 24000, 32000, 48000, 64000, 96000, 510000, OAC_AUTO, OAC_BITRATE_MAX};
-   int force_channels[4] = {OAC_AUTO, OAC_AUTO, 1, 2};
-   int use_vbr[3] = {0, 1, 1};
-   int vbr_constraints[3] = {0, 1, 1};
-   int complexities[11] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-   int max_bandwidths[6] = {OAC_BANDWIDTH_NARROWBAND, OAC_BANDWIDTH_MEDIUMBAND,
-                            OAC_BANDWIDTH_WIDEBAND, OAC_BANDWIDTH_SUPERWIDEBAND,
-                            OAC_BANDWIDTH_FULLBAND, OAC_BANDWIDTH_FULLBAND};
-   int signals[4] = {OAC_AUTO, OAC_AUTO, OAC_SIGNAL_VOICE, OAC_SIGNAL_MUSIC};
-   int inband_fecs[3] = {0, 0, 1};
-   int packet_loss_perc[4] = {0, 1, 2, 5};
-   int lsb_depths[2] = {8, 24};
-   int prediction_disabled[3] = {0, 0, 1};
-   int use_dtx[2] = {0, 1};
-   int frame_sizes_ms_x2[9] = {5, 10, 20, 40, 80, 120, 160, 200, 240};  /* x2 to avoid 2.5 ms */
-
-   for (i=0; i<num_encoders; i++) {
-      int sampling_rate = RAND_SAMPLE(sampling_rates);
-      int num_channels = RAND_SAMPLE(channels);
-      int application = RAND_SAMPLE(applications);
-
-      dec = oac_decoder_create(sampling_rate, num_channels, &err);
-      if(err!=OAC_OK || dec==NULL)test_failed();
-
-      enc = oac_encoder_create(sampling_rate, num_channels, application, &err);
-      if(err!=OAC_OK || enc==NULL)test_failed();
-
-      for (j=0; j<num_setting_changes; j++) {
-         int bitrate = RAND_SAMPLE(bitrates);
-         int force_channel = RAND_SAMPLE(force_channels);
-         int vbr = RAND_SAMPLE(use_vbr);
-         int vbr_constraint = RAND_SAMPLE(vbr_constraints);
-         int complexity = RAND_SAMPLE(complexities);
-         int max_bw = RAND_SAMPLE(max_bandwidths);
-         int sig = RAND_SAMPLE(signals);
-         int inband_fec = RAND_SAMPLE(inband_fecs);
-         int pkt_loss = RAND_SAMPLE(packet_loss_perc);
-         int lsb_depth = RAND_SAMPLE(lsb_depths);
-         int pred_disabled = RAND_SAMPLE(prediction_disabled);
-         int dtx = RAND_SAMPLE(use_dtx);
-         int frame_size_ms_x2 = RAND_SAMPLE(frame_sizes_ms_x2);
-         int frame_size = frame_size_ms_x2*sampling_rate/2000;
-         int frame_size_enum = get_frame_size_enum(frame_size, sampling_rate);
-         force_channel = IMIN(force_channel, num_channels);
-
-         if(oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrate)) != OAC_OK) test_failed();
-         if(oac_encoder_ctl(enc, OAC_SET_FORCE_CHANNELS(force_channel)) != OAC_OK) test_failed();
-         if(oac_encoder_ctl(enc, OAC_SET_VBR(vbr)) != OAC_OK) test_failed();
-         if(oac_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(vbr_constraint)) != OAC_OK) test_failed();
-         if(oac_encoder_ctl(enc, OAC_SET_COMPLEXITY(complexity)) != OAC_OK) test_failed();
-         if(oac_encoder_ctl(enc, OAC_SET_MAX_BANDWIDTH(max_bw)) != OAC_OK) test_failed();
-         if(oac_encoder_ctl(enc, OAC_SET_SIGNAL(sig)) != OAC_OK) test_failed();
-         if(oac_encoder_ctl(enc, OAC_SET_INBAND_FEC(inband_fec)) != OAC_OK) test_failed();
-         if(oac_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(pkt_loss)) != OAC_OK) test_failed();
-         if(oac_encoder_ctl(enc, OAC_SET_LSB_DEPTH(lsb_depth)) != OAC_OK) test_failed();
-         if(oac_encoder_ctl(enc, OAC_SET_PREDICTION_DISABLED(pred_disabled)) != OAC_OK) test_failed();
-         if(oac_encoder_ctl(enc, OAC_SET_DTX(dtx)) != OAC_OK) test_failed();
-         if(oac_encoder_ctl(enc, OAC_SET_EXPERT_FRAME_DURATION(frame_size_enum)) != OAC_OK) test_failed();
+void fuzz_encoder_settings(const int num_encoders, const int num_setting_changes) {
+    OacEncoder *enc;
+    OacDecoder *dec;
+    int i, j, err;
+
+    /* Parameters to fuzz. Some values are duplicated to increase their probability of being tested. */
+    int sampling_rates[5] = {8000, 12000, 16000, 24000, 48000};
+    int channels[2] = {1, 2};
+    int applications[3] = {OAC_APPLICATION_AUDIO, OAC_APPLICATION_VOIP, OAC_APPLICATION_RESTRICTED_LOWDELAY};
+    int bitrates[11] = {6000, 12000, 16000, 24000, 32000, 48000, 64000, 96000, 510000, OAC_AUTO, OAC_BITRATE_MAX};
+    int force_channels[4] = {OAC_AUTO, OAC_AUTO, 1, 2};
+    int use_vbr[3] = {0, 1, 1};
+    int vbr_constraints[3] = {0, 1, 1};
+    int complexities[11] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
+    int max_bandwidths[6] = {OAC_BANDWIDTH_NARROWBAND, OAC_BANDWIDTH_MEDIUMBAND,
+                             OAC_BANDWIDTH_WIDEBAND, OAC_BANDWIDTH_SUPERWIDEBAND,
+                             OAC_BANDWIDTH_FULLBAND, OAC_BANDWIDTH_FULLBAND};
+    int signals[4] = {OAC_AUTO, OAC_AUTO, OAC_SIGNAL_VOICE, OAC_SIGNAL_MUSIC};
+    int inband_fecs[3] = {0, 0, 1};
+    int packet_loss_perc[4] = {0, 1, 2, 5};
+    int lsb_depths[2] = {8, 24};
+    int prediction_disabled[3] = {0, 0, 1};
+    int use_dtx[2] = {0, 1};
+    int frame_sizes_ms_x2[9] = {5, 10, 20, 40, 80, 120, 160, 200, 240}; /* x2 to avoid 2.5 ms */
+
+    for (i = 0; i < num_encoders; i++) {
+        int sampling_rate = RAND_SAMPLE(sampling_rates);
+        int num_channels = RAND_SAMPLE(channels);
+        int application = RAND_SAMPLE(applications);
+
+        dec = oac_decoder_create(sampling_rate, num_channels, &err);
+        if (err != OAC_OK || dec == NULL) test_failed();
+
+        enc = oac_encoder_create(sampling_rate, num_channels, application, &err);
+        if (err != OAC_OK || enc == NULL) test_failed();
+
+        for (j = 0; j < num_setting_changes; j++) {
+            int bitrate = RAND_SAMPLE(bitrates);
+            int force_channel = RAND_SAMPLE(force_channels);
+            int vbr = RAND_SAMPLE(use_vbr);
+            int vbr_constraint = RAND_SAMPLE(vbr_constraints);
+            int complexity = RAND_SAMPLE(complexities);
+            int max_bw = RAND_SAMPLE(max_bandwidths);
+            int sig = RAND_SAMPLE(signals);
+            int inband_fec = RAND_SAMPLE(inband_fecs);
+            int pkt_loss = RAND_SAMPLE(packet_loss_perc);
+            int lsb_depth = RAND_SAMPLE(lsb_depths);
+            int pred_disabled = RAND_SAMPLE(prediction_disabled);
+            int dtx = RAND_SAMPLE(use_dtx);
+            int frame_size_ms_x2 = RAND_SAMPLE(frame_sizes_ms_x2);
+            int frame_size = frame_size_ms_x2*sampling_rate/2000;
+            int frame_size_enum = get_frame_size_enum(frame_size, sampling_rate);
+            force_channel = IMIN(force_channel, num_channels);
+
+            if (oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrate)) != OAC_OK) test_failed();
+            if (oac_encoder_ctl(enc, OAC_SET_FORCE_CHANNELS(force_channel)) != OAC_OK) test_failed();
+            if (oac_encoder_ctl(enc, OAC_SET_VBR(vbr)) != OAC_OK) test_failed();
+            if (oac_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(vbr_constraint)) != OAC_OK) test_failed();
+            if (oac_encoder_ctl(enc, OAC_SET_COMPLEXITY(complexity)) != OAC_OK) test_failed();
+            if (oac_encoder_ctl(enc, OAC_SET_MAX_BANDWIDTH(max_bw)) != OAC_OK) test_failed();
+            if (oac_encoder_ctl(enc, OAC_SET_SIGNAL(sig)) != OAC_OK) test_failed();
+            if (oac_encoder_ctl(enc, OAC_SET_INBAND_FEC(inband_fec)) != OAC_OK) test_failed();
+            if (oac_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(pkt_loss)) != OAC_OK) test_failed();
+            if (oac_encoder_ctl(enc, OAC_SET_LSB_DEPTH(lsb_depth)) != OAC_OK) test_failed();
+            if (oac_encoder_ctl(enc, OAC_SET_PREDICTION_DISABLED(pred_disabled)) != OAC_OK) test_failed();
+            if (oac_encoder_ctl(enc, OAC_SET_DTX(dtx)) != OAC_OK) test_failed();
+            if (oac_encoder_ctl(enc, OAC_SET_EXPERT_FRAME_DURATION(frame_size_enum)) != OAC_OK) test_failed();
 #ifdef ENABLE_DRED
-         if(oac_encoder_ctl(enc, OAC_SET_DRED_DURATION(fast_rand()%101)) != OAC_OK) test_failed();
+            if (oac_encoder_ctl(enc, OAC_SET_DRED_DURATION(fast_rand()%101)) != OAC_OK) test_failed();
 #endif
-         if(test_encode(enc, num_channels, frame_size, dec)) {
-            fprintf(stderr,
+            if (test_encode(enc, num_channels, frame_size, dec)) {
+                fprintf(stderr,
                "fuzz_encoder_settings: %d kHz, %d ch, application: %d, "
                "%d bps, force ch: %d, vbr: %d, vbr constraint: %d, complexity: %d, "
                "max bw: %d, signal: %d, inband fec: %d, pkt loss: %d%%, lsb depth: %d, "
@@ -288,451 +281,438 @@ void fuzz_encoder_settings(const int num_encoders, const int num_setting_changes
                sampling_rate/1000, num_channels, application, bitrate,
                force_channel, vbr, vbr_constraint, complexity, max_bw, sig, inband_fec,
                pkt_loss, lsb_depth, pred_disabled, dtx, frame_size_ms_x2);
-            test_failed();
-         }
-      }
+                test_failed();
+            }
+        }
 
-      oac_encoder_destroy(enc);
-      oac_decoder_destroy(dec);
-   }
+        oac_encoder_destroy(enc);
+        oac_decoder_destroy(dec);
+    }
 }
 
-int run_test1(int no_fuzz)
-{
-   static const int fsizes[6]={960*3,960*2,120,240,480,960};
-   static const char *mstrings[3] = {"    LP","Hybrid","  MDCT"};
-   unsigned char mapping[256] = {0,1,255};
-   unsigned char db62[36];
-   oac_int32 i,j;
-   int rc,err;
-   OacEncoder *enc;
-   OacMSEncoder *MSenc;
-   OacDecoder *dec;
-   OacMSDecoder *MSdec;
-   OacMSDecoder *MSdec_err;
-   OacDecoder *dec_err[10];
-   short *inbuf;
-   short *outbuf;
-   short *out2buf;
-   oac_int32 bitrate_bps;
-   unsigned char packet[MAX_PACKET+257];
-   oac_uint32 enc_final_range;
-   oac_uint32 dec_final_range;
-   int fswitch;
-   int fsize;
-   int count;
-
-  /*FIXME: encoder api tests, fs!=48k, mono, VBR*/
-
-   fprintf(stdout,"  Encode+Decode tests.\n");
-   fflush(stdout);
-
-   enc = oac_encoder_create(48000, 2, OAC_APPLICATION_VOIP, &err);
-   if(err != OAC_OK || enc==NULL)test_failed();
-
-   for(i=0;i<2;i++)
-   {
-      int *ret_err;
-      ret_err = i?0:&err;
-      MSenc = oac_multistream_encoder_create(8000, 2, 2, 0, mapping, OAC_UNIMPLEMENTED, ret_err);
-      if((ret_err && *ret_err != OAC_BAD_ARG) || MSenc!=NULL)test_failed();
-
-      MSenc = oac_multistream_encoder_create(8000, 0, 1, 0, mapping, OAC_APPLICATION_VOIP, ret_err);
-      if((ret_err && *ret_err != OAC_BAD_ARG) || MSenc!=NULL)test_failed();
-
-      MSenc = oac_multistream_encoder_create(44100, 2, 2, 0, mapping, OAC_APPLICATION_VOIP, ret_err);
-      if((ret_err && *ret_err != OAC_BAD_ARG) || MSenc!=NULL)test_failed();
-
-      MSenc = oac_multistream_encoder_create(8000, 2, 2, 3, mapping, OAC_APPLICATION_VOIP, ret_err);
-      if((ret_err && *ret_err != OAC_BAD_ARG) || MSenc!=NULL)test_failed();
-
-      MSenc = oac_multistream_encoder_create(8000, 2, -1, 0, mapping, OAC_APPLICATION_VOIP, ret_err);
-      if((ret_err && *ret_err != OAC_BAD_ARG) || MSenc!=NULL)test_failed();
-
-      MSenc = oac_multistream_encoder_create(8000, 256, 2, 0, mapping, OAC_APPLICATION_VOIP, ret_err);
-      if((ret_err && *ret_err != OAC_BAD_ARG) || MSenc!=NULL)test_failed();
-   }
-
-   MSenc = oac_multistream_encoder_create(8000, 2, 2, 0, mapping, OAC_APPLICATION_AUDIO, &err);
-   if(err != OAC_OK || MSenc==NULL)test_failed();
-
-   /*Some multistream encoder API tests*/
-   if(oac_multistream_encoder_ctl(MSenc, OAC_GET_BITRATE(&i))!=OAC_OK)test_failed();
-   if(oac_multistream_encoder_ctl(MSenc, OAC_GET_LSB_DEPTH(&i))!=OAC_OK)test_failed();
-   if(i<16)test_failed();
-
-   {
-      OacEncoder *tmp_enc;
-      if(oac_multistream_encoder_ctl(MSenc,  OAC_MULTISTREAM_GET_ENCODER_STATE(1,&tmp_enc))!=OAC_OK)test_failed();
-      if(oac_encoder_ctl(tmp_enc, OAC_GET_LSB_DEPTH(&j))!=OAC_OK)test_failed();
-      if(i!=j)test_failed();
-      if(oac_multistream_encoder_ctl(MSenc,  OAC_MULTISTREAM_GET_ENCODER_STATE(2,&tmp_enc))!=OAC_BAD_ARG)test_failed();
-   }
-
-   dec = oac_decoder_create(48000, 2, &err);
-   if(err != OAC_OK || dec==NULL)test_failed();
-
-   MSdec = oac_multistream_decoder_create(48000, 2, 2, 0, mapping, &err);
-   if(err != OAC_OK || MSdec==NULL)test_failed();
-
-   MSdec_err = oac_multistream_decoder_create(48000, 3, 2, 0, mapping, &err);
-   if(err != OAC_OK || MSdec_err==NULL)test_failed();
-
-   dec_err[0]=(OacDecoder *)malloc(oac_decoder_get_size(2));
-   memcpy(dec_err[0],dec,oac_decoder_get_size(2));
-   dec_err[1] = oac_decoder_create(48000, 1, &err);
-   dec_err[2] = oac_decoder_create(24000, 2, &err);
-   dec_err[3] = oac_decoder_create(24000, 1, &err);
-   dec_err[4] = oac_decoder_create(16000, 2, &err);
-   dec_err[5] = oac_decoder_create(16000, 1, &err);
-   dec_err[6] = oac_decoder_create(12000, 2, &err);
-   dec_err[7] = oac_decoder_create(12000, 1, &err);
-   dec_err[8] = oac_decoder_create(8000, 2, &err);
-   dec_err[9] = oac_decoder_create(8000, 1, &err);
-   for(i=0;i<10;i++)if(dec_err[i]==NULL)test_failed();
-
-   {
-      OacEncoder *enccpy;
-      /*The oac state structures contain no pointers and can be freely copied*/
-      enccpy=(OacEncoder *)malloc(oac_encoder_get_size(2));
-      memcpy(enccpy,enc,oac_encoder_get_size(2));
-      memset(enc,255,oac_encoder_get_size(2));
-      oac_encoder_destroy(enc);
-      enc=enccpy;
-   }
-
-   inbuf=(short *)malloc(sizeof(short)*SAMPLES*2);
-   outbuf=(short *)malloc(sizeof(short)*SAMPLES*2);
-   out2buf=(short *)malloc(sizeof(short)*MAX_FRAME_SAMP*3);
-   if(inbuf==NULL || outbuf==NULL || out2buf==NULL)test_failed();
-
-   generate_music(inbuf,SAMPLES);
+int run_test1(int no_fuzz) {
+    static const int fsizes[6] = {960*3, 960*2, 120, 240, 480, 960};
+    static const char *mstrings[3] = {"    LP", "Hybrid", "  MDCT"};
+    unsigned char mapping[256] = {0, 1, 255};
+    unsigned char db62[36];
+    oac_int32 i, j;
+    int rc, err;
+    OacEncoder *enc;
+    OacMSEncoder *MSenc;
+    OacDecoder *dec;
+    OacMSDecoder *MSdec;
+    OacMSDecoder *MSdec_err;
+    OacDecoder *dec_err[10];
+    short *inbuf;
+    short *outbuf;
+    short *out2buf;
+    oac_int32 bitrate_bps;
+    unsigned char packet[MAX_PACKET + 257];
+    oac_uint32 enc_final_range;
+    oac_uint32 dec_final_range;
+    int fswitch;
+    int fsize;
+    int count;
+
+    /*FIXME: encoder api tests, fs!=48k, mono, VBR*/
+
+    fprintf(stdout, "  Encode+Decode tests.\n");
+    fflush(stdout);
+
+    enc = oac_encoder_create(48000, 2, OAC_APPLICATION_VOIP, &err);
+    if (err != OAC_OK || enc == NULL) test_failed();
+
+    for (i = 0; i < 2; i++) {
+        int *ret_err;
+        ret_err = i?0:&err;
+        MSenc = oac_multistream_encoder_create(8000, 2, 2, 0, mapping, OAC_UNIMPLEMENTED, ret_err);
+        if ((ret_err && *ret_err != OAC_BAD_ARG) || MSenc != NULL) test_failed();
+
+        MSenc = oac_multistream_encoder_create(8000, 0, 1, 0, mapping, OAC_APPLICATION_VOIP, ret_err);
+        if ((ret_err && *ret_err != OAC_BAD_ARG) || MSenc != NULL) test_failed();
+
+        MSenc = oac_multistream_encoder_create(44100, 2, 2, 0, mapping, OAC_APPLICATION_VOIP, ret_err);
+        if ((ret_err && *ret_err != OAC_BAD_ARG) || MSenc != NULL) test_failed();
+
+        MSenc = oac_multistream_encoder_create(8000, 2, 2, 3, mapping, OAC_APPLICATION_VOIP, ret_err);
+        if ((ret_err && *ret_err != OAC_BAD_ARG) || MSenc != NULL) test_failed();
+
+        MSenc = oac_multistream_encoder_create(8000, 2, -1, 0, mapping, OAC_APPLICATION_VOIP, ret_err);
+        if ((ret_err && *ret_err != OAC_BAD_ARG) || MSenc != NULL) test_failed();
+
+        MSenc = oac_multistream_encoder_create(8000, 256, 2, 0, mapping, OAC_APPLICATION_VOIP, ret_err);
+        if ((ret_err && *ret_err != OAC_BAD_ARG) || MSenc != NULL) test_failed();
+    }
+
+    MSenc = oac_multistream_encoder_create(8000, 2, 2, 0, mapping, OAC_APPLICATION_AUDIO, &err);
+    if (err != OAC_OK || MSenc == NULL) test_failed();
+
+    /*Some multistream encoder API tests*/
+    if (oac_multistream_encoder_ctl(MSenc, OAC_GET_BITRATE(&i)) != OAC_OK) test_failed();
+    if (oac_multistream_encoder_ctl(MSenc, OAC_GET_LSB_DEPTH(&i)) != OAC_OK) test_failed();
+    if (i < 16) test_failed();
+
+    {
+        OacEncoder *tmp_enc;
+        if (oac_multistream_encoder_ctl(MSenc,  OAC_MULTISTREAM_GET_ENCODER_STATE(1, &tmp_enc)) != OAC_OK)test_failed();
+        if (oac_encoder_ctl(tmp_enc, OAC_GET_LSB_DEPTH(&j)) != OAC_OK) test_failed();
+        if (i != j) test_failed();
+        if (oac_multistream_encoder_ctl(MSenc,
+        OAC_MULTISTREAM_GET_ENCODER_STATE(2, &tmp_enc)) != OAC_BAD_ARG) test_failed();
+    }
+
+    dec = oac_decoder_create(48000, 2, &err);
+    if (err != OAC_OK || dec == NULL) test_failed();
+
+    MSdec = oac_multistream_decoder_create(48000, 2, 2, 0, mapping, &err);
+    if (err != OAC_OK || MSdec == NULL) test_failed();
+
+    MSdec_err = oac_multistream_decoder_create(48000, 3, 2, 0, mapping, &err);
+    if (err != OAC_OK || MSdec_err == NULL) test_failed();
+
+    dec_err[0] = (OacDecoder *)malloc(oac_decoder_get_size(2));
+    memcpy(dec_err[0], dec, oac_decoder_get_size(2));
+    dec_err[1] = oac_decoder_create(48000, 1, &err);
+    dec_err[2] = oac_decoder_create(24000, 2, &err);
+    dec_err[3] = oac_decoder_create(24000, 1, &err);
+    dec_err[4] = oac_decoder_create(16000, 2, &err);
+    dec_err[5] = oac_decoder_create(16000, 1, &err);
+    dec_err[6] = oac_decoder_create(12000, 2, &err);
+    dec_err[7] = oac_decoder_create(12000, 1, &err);
+    dec_err[8] = oac_decoder_create(8000, 2, &err);
+    dec_err[9] = oac_decoder_create(8000, 1, &err);
+    for (i = 0; i < 10; i++) if (dec_err[i] == NULL) test_failed();
+
+    {
+        OacEncoder *enccpy;
+        /*The oac state structures contain no pointers and can be freely copied*/
+        enccpy = (OacEncoder *)malloc(oac_encoder_get_size(2));
+        memcpy(enccpy, enc, oac_encoder_get_size(2));
+        memset(enc, 255, oac_encoder_get_size(2));
+        oac_encoder_destroy(enc);
+        enc = enccpy;
+    }
+
+    inbuf = (short *)malloc(sizeof(short)*SAMPLES*2);
+    outbuf = (short *)malloc(sizeof(short)*SAMPLES*2);
+    out2buf = (short *)malloc(sizeof(short)*MAX_FRAME_SAMP*3);
+    if (inbuf == NULL || outbuf == NULL || out2buf == NULL) test_failed();
+
+    generate_music(inbuf, SAMPLES);
 
 /*   FILE *foo;
    foo = fopen("foo.sw", "wb+");
    fwrite(inbuf, 1, SAMPLES*2*2, foo);
    fclose(foo);*/
 
-   if(oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_AUTO))!=OAC_OK)test_failed();
-   if(oac_encoder_ctl(enc, OAC_SET_FORCE_MODE(-2))!=OAC_BAD_ARG)test_failed();
-   if(oac_encode(enc, inbuf, 500, packet, MAX_PACKET)!=OAC_BAD_ARG)test_failed();
+    if (oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(OAC_AUTO)) != OAC_OK) test_failed();
+    if (oac_encoder_ctl(enc, OAC_SET_FORCE_MODE(-2)) != OAC_BAD_ARG) test_failed();
+    if (oac_encode(enc, inbuf, 500, packet, MAX_PACKET) != OAC_BAD_ARG) test_failed();
 
-   for(rc=0;rc<3;rc++)
-   {
-      if(oac_encoder_ctl(enc, OAC_SET_VBR(rc<2))!=OAC_OK)test_failed();
-      if(oac_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(rc==1))!=OAC_OK)test_failed();
-      if(oac_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(rc==1))!=OAC_OK)test_failed();
-      if(oac_encoder_ctl(enc, OAC_SET_INBAND_FEC(rc==0))!=OAC_OK)test_failed();
+    for (rc = 0; rc < 3; rc++) {
+        if (oac_encoder_ctl(enc, OAC_SET_VBR(rc < 2)) != OAC_OK) test_failed();
+        if (oac_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(rc == 1)) != OAC_OK) test_failed();
+        if (oac_encoder_ctl(enc, OAC_SET_VBR_CONSTRAINT(rc == 1)) != OAC_OK) test_failed();
+        if (oac_encoder_ctl(enc, OAC_SET_INBAND_FEC(rc == 0)) != OAC_OK) test_failed();
 #ifdef ENABLE_DRED
-      if(oac_encoder_ctl(enc, OAC_SET_DRED_DURATION(fast_rand()%101)) != OAC_OK) test_failed();
+        if (oac_encoder_ctl(enc, OAC_SET_DRED_DURATION(fast_rand()%101)) != OAC_OK) test_failed();
 #endif
-      for(j=0;j<13;j++)
-      {
-         int rate;
-         int modes[13]={0,0,0,1,1,1,1,2,2,2,2,2,2};
-         int rates[13]={6000,12000,48000,16000,32000,48000,64000,512000,13000,24000,48000,64000,96000};
-         int frame[13]={960*2,960,480,960,960,960,480,960*3,960*3,960,480,240,120};
-         rate=rates[j]+fast_rand()%rates[j];
-         count=i=0;
-         do {
-            int bw,len,out_samples,frame_size;
-            frame_size=frame[j];
-            if((fast_rand()&255)==0)
-            {
-               if(oac_encoder_ctl(enc, OAC_RESET_STATE)!=OAC_OK)test_failed();
-               if(oac_decoder_ctl(dec, OAC_RESET_STATE)!=OAC_OK)test_failed();
-               if((fast_rand()&1)!=0)
-               {
-                  if(oac_decoder_ctl(dec_err[fast_rand()&1], OAC_RESET_STATE)!=OAC_OK)test_failed();
-               }
-            }
-            if((fast_rand()&127)==0)
-            {
-               if(oac_decoder_ctl(dec_err[fast_rand()&1], OAC_RESET_STATE)!=OAC_OK)test_failed();
-            }
-            if(fast_rand()%10==0){
-               int complex=fast_rand()%11;
-               if(oac_encoder_ctl(enc, OAC_SET_COMPLEXITY(complex))!=OAC_OK)test_failed();
-            }
-            if(fast_rand()%50==0)oac_decoder_ctl(dec, OAC_RESET_STATE);
-            if(oac_encoder_ctl(enc, OAC_SET_INBAND_FEC(rc==0))!=OAC_OK)test_failed();
-            if(oac_encoder_ctl(enc, OAC_SET_FORCE_MODE(MODE_SILK_ONLY+modes[j]))!=OAC_OK)test_failed();
-            if(oac_encoder_ctl(enc, OAC_SET_DTX(fast_rand()&1))!=OAC_OK)test_failed();
-            if(oac_encoder_ctl(enc, OAC_SET_BITRATE(rate))!=OAC_OK)test_failed();
-            if(oac_encoder_ctl(enc, OAC_SET_FORCE_CHANNELS((rates[j]>=64000?2:1)))!=OAC_OK)test_failed();
-            if(oac_encoder_ctl(enc, OAC_SET_COMPLEXITY((count>>2)%11))!=OAC_OK)test_failed();
-            if(oac_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC((fast_rand()&15)&(fast_rand()%15)))!=OAC_OK)test_failed();
-            bw=modes[j]==0?OAC_BANDWIDTH_NARROWBAND+(fast_rand()%3):
-               modes[j]==1?OAC_BANDWIDTH_SUPERWIDEBAND+(fast_rand()&1):
-                           OAC_BANDWIDTH_NARROWBAND+(fast_rand()%5);
-            if(modes[j]==2&&bw==OAC_BANDWIDTH_MEDIUMBAND)bw+=3;
-            if(oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(bw))!=OAC_OK)test_failed();
-            len = oac_encode(enc, &inbuf[i<<1], frame_size, packet, MAX_PACKET);
-            if(len<0 || len>MAX_PACKET)test_failed();
-            if(oac_encoder_ctl(enc, OAC_GET_FINAL_RANGE(&enc_final_range))!=OAC_OK)test_failed();
-            if((fast_rand()&3)==0)
-            {
-               if(oac_packet_pad(packet,len,len+1)!=OAC_OK)test_failed();
-               len++;
-            }
-            if((fast_rand()&7)==0)
-            {
-               if(oac_packet_pad(packet,len,len+256)!=OAC_OK)test_failed();
-               len+=256;
-            }
-            if((fast_rand()&3)==0)
-            {
-               len=oac_packet_unpad(packet,len);
-               if(len<1)test_failed();
-            }
-            out_samples = oac_decode(dec, packet, len, &outbuf[i<<1], MAX_FRAME_SAMP, 0);
-            if(out_samples!=frame_size)test_failed();
-            if(oac_decoder_ctl(dec, OAC_GET_FINAL_RANGE(&dec_final_range))!=OAC_OK)test_failed();
-            if(enc_final_range!=dec_final_range)test_failed();
-            /*LBRR decode*/
-            out_samples = oac_decode(dec_err[0], packet, len, out2buf, frame_size, (fast_rand()&3)!=0);
-            if(out_samples!=frame_size)test_failed();
-            out_samples = oac_decode(dec_err[1], packet, (fast_rand()&3)==0?0:len, out2buf, MAX_FRAME_SAMP, (fast_rand()&7)!=0);
-            if(out_samples<120)test_failed();
-            i+=frame_size;
-            count++;
-         }while(i<(SSAMPLES-MAX_FRAME_SAMP));
-         fprintf(stdout,"    Mode %s FB encode %s, %6d bps OK.\n",mstrings[modes[j]],rc==0?" VBR":rc==1?"CVBR":" CBR",rate);
-         fflush(stdout);
-      }
-   }
-
-   if(oac_encoder_ctl(enc, OAC_SET_FORCE_MODE(OAC_AUTO))!=OAC_OK)test_failed();
-   if(oac_encoder_ctl(enc, OAC_SET_FORCE_CHANNELS(OAC_AUTO))!=OAC_OK)test_failed();
-   if(oac_encoder_ctl(enc, OAC_SET_INBAND_FEC(0))!=OAC_OK)test_failed();
-   if(oac_encoder_ctl(enc, OAC_SET_DTX(0))!=OAC_OK)test_failed();
-
-   for(rc=0;rc<3;rc++)
-   {
-      if(oac_multistream_encoder_ctl(MSenc, OAC_SET_VBR(rc<2))!=OAC_OK)test_failed();
-      if(oac_multistream_encoder_ctl(MSenc, OAC_SET_VBR_CONSTRAINT(rc==1))!=OAC_OK)test_failed();
-      if(oac_multistream_encoder_ctl(MSenc, OAC_SET_VBR_CONSTRAINT(rc==1))!=OAC_OK)test_failed();
-      if(oac_multistream_encoder_ctl(MSenc, OAC_SET_INBAND_FEC(rc==0))!=OAC_OK)test_failed();
-      for(j=0;j<16;j++)
-      {
-         int rate;
-         int modes[16]={0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2};
-         int rates[16]={4000,12000,32000,8000,16000,32000,48000,88000,4000,12000,32000,8000,16000,32000,48000,288000};
-         int frame[16]={160*1,160,80,160,160,80,40,20,160*1,160,80,160,160,80,40,20};
-         if(oac_multistream_encoder_ctl(MSenc, OAC_SET_INBAND_FEC(rc==0&&j==1))!=OAC_OK)test_failed();
-         if(oac_multistream_encoder_ctl(MSenc, OAC_SET_FORCE_MODE(MODE_SILK_ONLY+modes[j]))!=OAC_OK)test_failed();
-         rate=rates[j]+fast_rand()%rates[j];
-         if(oac_multistream_encoder_ctl(MSenc, OAC_SET_DTX(fast_rand()&1))!=OAC_OK)test_failed();
-         if(oac_multistream_encoder_ctl(MSenc, OAC_SET_BITRATE(rate))!=OAC_OK)test_failed();
-         count=i=0;
-         do {
-            int len,out_samples,frame_size,loss;
-            oac_int32 pred;
-            if(oac_multistream_encoder_ctl(MSenc, OAC_GET_PREDICTION_DISABLED(&pred))!=OAC_OK)test_failed();
-            if(oac_multistream_encoder_ctl(MSenc, OAC_SET_PREDICTION_DISABLED((int)(fast_rand()&15)<(pred?11:4)))!=OAC_OK)test_failed();
-            frame_size=frame[j];
-            if(oac_multistream_encoder_ctl(MSenc, OAC_SET_COMPLEXITY((count>>2)%11))!=OAC_OK)test_failed();
-            if(oac_multistream_encoder_ctl(MSenc, OAC_SET_PACKET_LOSS_PERC((fast_rand()&15)&(fast_rand()%15)))!=OAC_OK)test_failed();
-            if((fast_rand()&255)==0)
-            {
-               if(oac_multistream_encoder_ctl(MSenc, OAC_RESET_STATE)!=OAC_OK)test_failed();
-               if(oac_multistream_decoder_ctl(MSdec, OAC_RESET_STATE)!=OAC_OK)test_failed();
-               if((fast_rand()&3)!=0)
-               {
-                  if(oac_multistream_decoder_ctl(MSdec_err, OAC_RESET_STATE)!=OAC_OK)test_failed();
-               }
-            }
-            if((fast_rand()&255)==0)
-            {
-               if(oac_multistream_decoder_ctl(MSdec_err, OAC_RESET_STATE)!=OAC_OK)test_failed();
-            }
-            len = oac_multistream_encode(MSenc, &inbuf[i<<1], frame_size, packet, MAX_PACKET);
-            if(len<0 || len>MAX_PACKET)test_failed();
-            if(oac_multistream_encoder_ctl(MSenc, OAC_GET_FINAL_RANGE(&enc_final_range))!=OAC_OK)test_failed();
-            if((fast_rand()&3)==0)
-            {
-               if(oac_multistream_packet_pad(packet,len,len+1,2)!=OAC_OK)test_failed();
-               len++;
-            }
-            if((fast_rand()&7)==0)
-            {
-               if(oac_multistream_packet_pad(packet,len,len+256,2)!=OAC_OK)test_failed();
-               len+=256;
-            }
-            if((fast_rand()&3)==0)
-            {
-               len=oac_multistream_packet_unpad(packet,len,2);
-               if(len<1)test_failed();
-            }
-            out_samples = oac_multistream_decode(MSdec, packet, len, out2buf, MAX_FRAME_SAMP, 0);
-            if(out_samples!=frame_size*6)test_failed();
-            if(oac_multistream_decoder_ctl(MSdec, OAC_GET_FINAL_RANGE(&dec_final_range))!=OAC_OK)test_failed();
-            if(enc_final_range!=dec_final_range)test_failed();
-            /*LBRR decode*/
-            loss=(fast_rand()&63)==0;
-            out_samples = oac_multistream_decode(MSdec_err, packet, loss?0:len, out2buf, frame_size*6, (fast_rand()&3)!=0);
-            if(out_samples!=(frame_size*6))test_failed();
-            i+=frame_size;
-            count++;
-         }while(i<(SSAMPLES/12-MAX_FRAME_SAMP));
-         fprintf(stdout," MS Mode %s NB dual-mono MS encode %s, %6d bps OK.\n",mstrings[modes[j]],rc==0?" VBR":rc==1?"CVBR":" CBR",rate);
-         fflush(stdout);
-      }
-   }
-
-   bitrate_bps=512000;
-   fsize=fast_rand()%31;
-   fswitch=100;
-
-   debruijn2(6,db62);
-   count=i=0;
-   do {
-      unsigned char toc;
-      const unsigned char *frames[48];
-      short size[48];
-      int payload_offset;
-      oac_uint32 dec_final_range2;
-      int jj,dec2;
-      int len,out_samples;
-      int frame_size=fsizes[db62[fsize]];
-      oac_int32 offset=i%(SAMPLES-MAX_FRAME_SAMP);
-
-      oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrate_bps));
-
-      len = oac_encode(enc, &inbuf[offset<<1], frame_size, packet, MAX_PACKET);
-      if(len<0 || len>MAX_PACKET)test_failed();
-      count++;
-
-      oac_encoder_ctl(enc, OAC_GET_FINAL_RANGE(&enc_final_range));
-
-      out_samples = oac_decode(dec, packet, len, &outbuf[offset<<1], MAX_FRAME_SAMP, 0);
-      if(out_samples!=frame_size)test_failed();
-
-      oac_decoder_ctl(dec, OAC_GET_FINAL_RANGE(&dec_final_range));
-
-      /* compare final range encoder rng values of encoder and decoder */
-      if(dec_final_range!=enc_final_range)test_failed();
-
-      /* We fuzz the packet, but take care not to only corrupt the payload
-         Corrupted headers are tested elsewhere and we need to actually run
-         the decoders in order to compare them. */
-      if(oac_packet_parse(packet,len,&toc,frames,size,&payload_offset)<=0)test_failed();
-      if((fast_rand()&1023)==0)len=0;
-      for(j=(oac_int32)(frames[0]-packet);j<len;j++)for(jj=0;jj<8;jj++)packet[j]^=((!no_fuzz)&&((fast_rand()&1023)==0))<<jj;
-      out_samples = oac_decode(dec_err[0], len>0?packet:NULL, len, out2buf, MAX_FRAME_SAMP, 0);
-      if(out_samples<0||out_samples>MAX_FRAME_SAMP)test_failed();
-      if((len>0&&out_samples!=frame_size))test_failed(); /*FIXME use lastframe*/
-
-      oac_decoder_ctl(dec_err[0], OAC_GET_FINAL_RANGE(&dec_final_range));
-
-      /*randomly select one of the decoders to compare with*/
-      dec2=fast_rand()%9+1;
-      out_samples = oac_decode(dec_err[dec2], len>0?packet:NULL, len, out2buf, MAX_FRAME_SAMP, 0);
-      if(out_samples<0||out_samples>MAX_FRAME_SAMP)test_failed(); /*FIXME, use factor, lastframe for loss*/
-
-      oac_decoder_ctl(dec_err[dec2], OAC_GET_FINAL_RANGE(&dec_final_range2));
-      if(len>0&&dec_final_range!=dec_final_range2)test_failed();
-
-      fswitch--;
-      if(fswitch<1)
-      {
-        int new_size;
-        fsize=(fsize+1)%36;
-        new_size=fsizes[db62[fsize]];
-        if(new_size==960||new_size==480)fswitch=2880/new_size*(fast_rand()%19+1);
-        else fswitch=(fast_rand()%(2880/new_size))+1;
-      }
-      bitrate_bps=((fast_rand()%508000+4000)+bitrate_bps)>>1;
-      i+=frame_size;
-   }while(i<SAMPLES*4);
-   fprintf(stdout,"    All framesize pairs switching encode, %d frames OK.\n",count);
-   fflush(stdout);
-
-   if(oac_encoder_ctl(enc, OAC_RESET_STATE)!=OAC_OK)test_failed();
-   oac_encoder_destroy(enc);
-   if(oac_multistream_encoder_ctl(MSenc, OAC_RESET_STATE)!=OAC_OK)test_failed();
-   oac_multistream_encoder_destroy(MSenc);
-   if(oac_decoder_ctl(dec, OAC_RESET_STATE)!=OAC_OK)test_failed();
-   oac_decoder_destroy(dec);
-   if(oac_multistream_decoder_ctl(MSdec, OAC_RESET_STATE)!=OAC_OK)test_failed();
-   oac_multistream_decoder_destroy(MSdec);
-   oac_multistream_decoder_destroy(MSdec_err);
-   for(i=0;i<10;i++)oac_decoder_destroy(dec_err[i]);
-   free(inbuf);
-   free(outbuf);
-   free(out2buf);
-   return 0;
+        for (j = 0; j < 13; j++) {
+            int rate;
+            int modes[13] = {0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2};
+            int rates[13] = {6000, 12000, 48000, 16000, 32000, 48000, 64000, 512000, 13000, 24000, 48000, 64000, 96000};
+            int frame[13] = {960*2, 960, 480, 960, 960, 960, 480, 960*3, 960*3, 960, 480, 240, 120};
+            rate = rates[j] + fast_rand()%rates[j];
+            count = i = 0;
+            do {
+                int bw, len, out_samples, frame_size;
+                frame_size = frame[j];
+                if ((fast_rand()&255) == 0) {
+                    if (oac_encoder_ctl(enc, OAC_RESET_STATE) != OAC_OK) test_failed();
+                    if (oac_decoder_ctl(dec, OAC_RESET_STATE) != OAC_OK) test_failed();
+                    if ((fast_rand()&1) != 0) {
+                        if (oac_decoder_ctl(dec_err[fast_rand()&1], OAC_RESET_STATE) != OAC_OK) test_failed();
+                    }
+                }
+                if ((fast_rand()&127) == 0) {
+                    if (oac_decoder_ctl(dec_err[fast_rand()&1], OAC_RESET_STATE) != OAC_OK) test_failed();
+                }
+                if (fast_rand()%10 == 0) {
+                    int complex = fast_rand()%11;
+                    if (oac_encoder_ctl(enc, OAC_SET_COMPLEXITY(complex)) != OAC_OK) test_failed();
+                }
+                if (fast_rand()%50 == 0) oac_decoder_ctl(dec, OAC_RESET_STATE);
+                if (oac_encoder_ctl(enc, OAC_SET_INBAND_FEC(rc == 0)) != OAC_OK) test_failed();
+                if (oac_encoder_ctl(enc, OAC_SET_FORCE_MODE(MODE_SILK_ONLY + modes[j])) != OAC_OK) test_failed();
+                if (oac_encoder_ctl(enc, OAC_SET_DTX(fast_rand()&1)) != OAC_OK) test_failed();
+                if (oac_encoder_ctl(enc, OAC_SET_BITRATE(rate)) != OAC_OK) test_failed();
+                if (oac_encoder_ctl(enc, OAC_SET_FORCE_CHANNELS((rates[j] >= 64000?2:1))) != OAC_OK) test_failed();
+                if (oac_encoder_ctl(enc, OAC_SET_COMPLEXITY((count>>2)%11)) != OAC_OK) test_failed();
+                if (oac_encoder_ctl(enc,
+                OAC_SET_PACKET_LOSS_PERC((fast_rand()&15)&(fast_rand()%15))) != OAC_OK) test_failed();
+                bw = modes[j] == 0?OAC_BANDWIDTH_NARROWBAND + (fast_rand()%3):
+                     modes[j] == 1?OAC_BANDWIDTH_SUPERWIDEBAND + (fast_rand()&1):
+                     OAC_BANDWIDTH_NARROWBAND + (fast_rand()%5);
+                if (modes[j] == 2 && bw == OAC_BANDWIDTH_MEDIUMBAND) bw += 3;
+                if (oac_encoder_ctl(enc, OAC_SET_BANDWIDTH(bw)) != OAC_OK) test_failed();
+                len = oac_encode(enc, &inbuf[i<<1], frame_size, packet, MAX_PACKET);
+                if (len < 0 || len > MAX_PACKET) test_failed();
+                if (oac_encoder_ctl(enc, OAC_GET_FINAL_RANGE(&enc_final_range)) != OAC_OK) test_failed();
+                if ((fast_rand()&3) == 0) {
+                    if (oac_packet_pad(packet, len, len + 1) != OAC_OK) test_failed();
+                    len++;
+                }
+                if ((fast_rand()&7) == 0) {
+                    if (oac_packet_pad(packet, len, len + 256) != OAC_OK) test_failed();
+                    len += 256;
+                }
+                if ((fast_rand()&3) == 0) {
+                    len = oac_packet_unpad(packet, len);
+                    if (len < 1) test_failed();
+                }
+                out_samples = oac_decode(dec, packet, len, &outbuf[i<<1], MAX_FRAME_SAMP, 0);
+                if (out_samples != frame_size) test_failed();
+                if (oac_decoder_ctl(dec, OAC_GET_FINAL_RANGE(&dec_final_range)) != OAC_OK) test_failed();
+                if (enc_final_range != dec_final_range) test_failed();
+                /*LBRR decode*/
+                out_samples = oac_decode(dec_err[0], packet, len, out2buf, frame_size, (fast_rand()&3) != 0);
+                if (out_samples != frame_size) test_failed();
+                out_samples = oac_decode(dec_err[1], packet, (fast_rand()&3) == 0?0:len, out2buf, MAX_FRAME_SAMP,
+                    (fast_rand()&7) != 0);
+                if (out_samples < 120) test_failed();
+                i += frame_size;
+                count++;
+            } while (i < (SSAMPLES - MAX_FRAME_SAMP));
+            fprintf(stdout, "    Mode %s FB encode %s, %6d bps OK.\n", mstrings[modes[j]],
+            rc == 0?" VBR":rc == 1?"CVBR":" CBR", rate);
+            fflush(stdout);
+        }
+    }
+
+    if (oac_encoder_ctl(enc, OAC_SET_FORCE_MODE(OAC_AUTO)) != OAC_OK) test_failed();
+    if (oac_encoder_ctl(enc, OAC_SET_FORCE_CHANNELS(OAC_AUTO)) != OAC_OK) test_failed();
+    if (oac_encoder_ctl(enc, OAC_SET_INBAND_FEC(0)) != OAC_OK) test_failed();
+    if (oac_encoder_ctl(enc, OAC_SET_DTX(0)) != OAC_OK) test_failed();
+
+    for (rc = 0; rc < 3; rc++) {
+        if (oac_multistream_encoder_ctl(MSenc, OAC_SET_VBR(rc < 2)) != OAC_OK) test_failed();
+        if (oac_multistream_encoder_ctl(MSenc, OAC_SET_VBR_CONSTRAINT(rc == 1)) != OAC_OK) test_failed();
+        if (oac_multistream_encoder_ctl(MSenc, OAC_SET_VBR_CONSTRAINT(rc == 1)) != OAC_OK) test_failed();
+        if (oac_multistream_encoder_ctl(MSenc, OAC_SET_INBAND_FEC(rc == 0)) != OAC_OK) test_failed();
+        for (j = 0; j < 16; j++) {
+            int rate;
+            int modes[16] = {0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2};
+            int rates[16] = {4000, 12000, 32000, 8000, 16000, 32000, 48000, 88000, 4000, 12000, 32000, 8000, 16000,
+                             32000, 48000, 288000};
+            int frame[16] = {160*1, 160, 80, 160, 160, 80, 40, 20, 160*1, 160, 80, 160, 160, 80, 40, 20};
+            if (oac_multistream_encoder_ctl(MSenc, OAC_SET_INBAND_FEC(rc == 0 && j == 1)) != OAC_OK) test_failed();
+            if (oac_multistream_encoder_ctl(MSenc,
+            OAC_SET_FORCE_MODE(MODE_SILK_ONLY + modes[j])) != OAC_OK) test_failed();
+            rate = rates[j] + fast_rand()%rates[j];
+            if (oac_multistream_encoder_ctl(MSenc, OAC_SET_DTX(fast_rand()&1)) != OAC_OK) test_failed();
+            if (oac_multistream_encoder_ctl(MSenc, OAC_SET_BITRATE(rate)) != OAC_OK) test_failed();
+            count = i = 0;
+            do {
+                int len, out_samples, frame_size, loss;
+                oac_int32 pred;
+                if (oac_multistream_encoder_ctl(MSenc, OAC_GET_PREDICTION_DISABLED(&pred)) != OAC_OK) test_failed();
+                if (oac_multistream_encoder_ctl(MSenc,
+                OAC_SET_PREDICTION_DISABLED((int)(fast_rand()&15) < (pred?11:4))) != OAC_OK) test_failed();
+                frame_size = frame[j];
+                if (oac_multistream_encoder_ctl(MSenc, OAC_SET_COMPLEXITY((count>>2)%11)) != OAC_OK) test_failed();
+                if (oac_multistream_encoder_ctl(MSenc,
+                OAC_SET_PACKET_LOSS_PERC((fast_rand()&15)&(fast_rand()%15))) != OAC_OK) test_failed();
+                if ((fast_rand()&255) == 0) {
+                    if (oac_multistream_encoder_ctl(MSenc, OAC_RESET_STATE) != OAC_OK) test_failed();
+                    if (oac_multistream_decoder_ctl(MSdec, OAC_RESET_STATE) != OAC_OK) test_failed();
+                    if ((fast_rand()&3) != 0) {
+                        if (oac_multistream_decoder_ctl(MSdec_err, OAC_RESET_STATE) != OAC_OK) test_failed();
+                    }
+                }
+                if ((fast_rand()&255) == 0) {
+                    if (oac_multistream_decoder_ctl(MSdec_err, OAC_RESET_STATE) != OAC_OK) test_failed();
+                }
+                len = oac_multistream_encode(MSenc, &inbuf[i<<1], frame_size, packet, MAX_PACKET);
+                if (len < 0 || len > MAX_PACKET) test_failed();
+                if (oac_multistream_encoder_ctl(MSenc, OAC_GET_FINAL_RANGE(&enc_final_range)) != OAC_OK) test_failed();
+                if ((fast_rand()&3) == 0) {
+                    if (oac_multistream_packet_pad(packet, len, len + 1, 2) != OAC_OK) test_failed();
+                    len++;
+                }
+                if ((fast_rand()&7) == 0) {
+                    if (oac_multistream_packet_pad(packet, len, len + 256, 2) != OAC_OK) test_failed();
+                    len += 256;
+                }
+                if ((fast_rand()&3) == 0) {
+                    len = oac_multistream_packet_unpad(packet, len, 2);
+                    if (len < 1) test_failed();
+                }
+                out_samples = oac_multistream_decode(MSdec, packet, len, out2buf, MAX_FRAME_SAMP, 0);
+                if (out_samples != frame_size*6) test_failed();
+                if (oac_multistream_decoder_ctl(MSdec, OAC_GET_FINAL_RANGE(&dec_final_range)) != OAC_OK) test_failed();
+                if (enc_final_range != dec_final_range) test_failed();
+                /*LBRR decode*/
+                loss = (fast_rand()&63) == 0;
+                out_samples = oac_multistream_decode(MSdec_err, packet, loss?0:len, out2buf, frame_size*6,
+                    (fast_rand()&3) != 0);
+                if (out_samples != (frame_size*6)) test_failed();
+                i += frame_size;
+                count++;
+            } while (i < (SSAMPLES/12 - MAX_FRAME_SAMP));
+            fprintf(stdout, " MS Mode %s NB dual-mono MS encode %s, %6d bps OK.\n", mstrings[modes[j]],
+            rc == 0?" VBR":rc == 1?"CVBR":" CBR", rate);
+            fflush(stdout);
+        }
+    }
+
+    bitrate_bps = 512000;
+    fsize = fast_rand()%31;
+    fswitch = 100;
+
+    debruijn2(6, db62);
+    count = i = 0;
+    do {
+        unsigned char toc;
+        const unsigned char *frames[48];
+        short size[48];
+        int payload_offset;
+        oac_uint32 dec_final_range2;
+        int jj, dec2;
+        int len, out_samples;
+        int frame_size = fsizes[db62[fsize]];
+        oac_int32 offset = i%(SAMPLES - MAX_FRAME_SAMP);
+
+        oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrate_bps));
+
+        len = oac_encode(enc, &inbuf[offset<<1], frame_size, packet, MAX_PACKET);
+        if (len < 0 || len > MAX_PACKET) test_failed();
+        count++;
+
+        oac_encoder_ctl(enc, OAC_GET_FINAL_RANGE(&enc_final_range));
+
+        out_samples = oac_decode(dec, packet, len, &outbuf[offset<<1], MAX_FRAME_SAMP, 0);
+        if (out_samples != frame_size) test_failed();
+
+        oac_decoder_ctl(dec, OAC_GET_FINAL_RANGE(&dec_final_range));
+
+        /* compare final range encoder rng values of encoder and decoder */
+        if (dec_final_range != enc_final_range) test_failed();
+
+        /* We fuzz the packet, but take care not to only corrupt the payload
+           Corrupted headers are tested elsewhere and we need to actually run
+           the decoders in order to compare them. */
+        if (oac_packet_parse(packet, len, &toc, frames, size, &payload_offset) <= 0) test_failed();
+        if ((fast_rand()&1023) == 0) len = 0;
+        for (j = (oac_int32)(frames[0] - packet); j < len;
+             j++) for (jj = 0; jj < 8; jj++) packet[j] ^= ((!no_fuzz) && ((fast_rand()&1023) == 0))<<jj;
+        out_samples = oac_decode(dec_err[0], len > 0?packet:NULL, len, out2buf, MAX_FRAME_SAMP, 0);
+        if (out_samples < 0 || out_samples > MAX_FRAME_SAMP) test_failed();
+        if ((len > 0 && out_samples != frame_size)) test_failed(); /*FIXME use lastframe*/
+
+        oac_decoder_ctl(dec_err[0], OAC_GET_FINAL_RANGE(&dec_final_range));
+
+        /*randomly select one of the decoders to compare with*/
+        dec2 = fast_rand()%9 + 1;
+        out_samples = oac_decode(dec_err[dec2], len > 0?packet:NULL, len, out2buf, MAX_FRAME_SAMP, 0);
+        if (out_samples < 0 || out_samples > MAX_FRAME_SAMP) test_failed(); /*FIXME, use factor, lastframe for loss*/
+
+        oac_decoder_ctl(dec_err[dec2], OAC_GET_FINAL_RANGE(&dec_final_range2));
+        if (len > 0 && dec_final_range != dec_final_range2) test_failed();
+
+        fswitch--;
+        if (fswitch < 1) {
+            int new_size;
+            fsize = (fsize + 1)%36;
+            new_size = fsizes[db62[fsize]];
+            if (new_size == 960 || new_size == 480) fswitch = 2880/new_size*(fast_rand()%19 + 1);
+            else fswitch = (fast_rand()%(2880/new_size)) + 1;
+        }
+        bitrate_bps = ((fast_rand()%508000 + 4000) + bitrate_bps)>>1;
+        i += frame_size;
+    } while (i < SAMPLES*4);
+    fprintf(stdout, "    All framesize pairs switching encode, %d frames OK.\n", count);
+    fflush(stdout);
+
+    if (oac_encoder_ctl(enc, OAC_RESET_STATE) != OAC_OK) test_failed();
+    oac_encoder_destroy(enc);
+    if (oac_multistream_encoder_ctl(MSenc, OAC_RESET_STATE) != OAC_OK) test_failed();
+    oac_multistream_encoder_destroy(MSenc);
+    if (oac_decoder_ctl(dec, OAC_RESET_STATE) != OAC_OK) test_failed();
+    oac_decoder_destroy(dec);
+    if (oac_multistream_decoder_ctl(MSdec, OAC_RESET_STATE) != OAC_OK) test_failed();
+    oac_multistream_decoder_destroy(MSdec);
+    oac_multistream_decoder_destroy(MSdec_err);
+    for (i = 0; i < 10; i++) oac_decoder_destroy(dec_err[i]);
+    free(inbuf);
+    free(outbuf);
+    free(out2buf);
+    return 0;
 }
 
-void print_usage(char* _argv[])
-{
-   fprintf(stderr,"Usage: %s [<seed>] [-fuzz <num_encoders> <num_settings_per_encoder>]\n",_argv[0]);
+void print_usage(char* _argv[]) {
+    fprintf(stderr, "Usage: %s [<seed>] [-fuzz <num_encoders> <num_settings_per_encoder>]\n", _argv[0]);
 }
 
-int main(int _argc, char **_argv)
-{
-   int args=1;
-   char * strtol_str=NULL;
-   const char * oversion;
-   const char * env_seed;
-   int env_used;
-   int num_encoders_to_fuzz=5;
-   int num_setting_changes=40;
-
-   env_used=0;
-   env_seed=getenv("SEED");
-   if(_argc>1)
-      iseed=strtol(_argv[1], &strtol_str, 10);  /* the first input argument might be the seed */
-   if(strtol_str!=NULL && strtol_str[0]=='\0')   /* iseed is a valid number */
-      args++;
-   else if(env_seed) {
-      iseed=atoi(env_seed);
-      env_used=1;
-   }
-   else iseed=(oac_uint32)time(NULL)^(((oac_uint32)getpid()&65535)<<16);
-   Rw=Rz=iseed;
-
-   while(args<_argc)
-   {
-      if(strcmp(_argv[args], "-fuzz")==0 && _argc==(args+3)) {
-         num_encoders_to_fuzz=strtol(_argv[args+1], &strtol_str, 10);
-         if(strtol_str[0]!='\0' || num_encoders_to_fuzz<=0) {
-            print_usage(_argv);
-            return EXIT_FAILURE;
-         }
-         num_setting_changes=strtol(_argv[args+2], &strtol_str, 10);
-         if(strtol_str[0]!='\0' || num_setting_changes<=0) {
+int main(int _argc, char **_argv) {
+    int args = 1;
+    char * strtol_str = NULL;
+    const char * oversion;
+    const char * env_seed;
+    int env_used;
+    int num_encoders_to_fuzz = 5;
+    int num_setting_changes = 40;
+
+    env_used = 0;
+    env_seed = getenv("SEED");
+    if (_argc > 1)
+        iseed = strtol(_argv[1], &strtol_str, 10); /* the first input argument might be the seed */
+    if (strtol_str != NULL && strtol_str[0] == '\0') /* iseed is a valid number */
+        args++;
+    else if (env_seed) {
+        iseed = atoi(env_seed);
+        env_used = 1;
+    } else iseed = (oac_uint32)time(NULL)^(((oac_uint32)getpid()&65535)<<16);
+    Rw = Rz = iseed;
+
+    while (args < _argc) {
+        if (strcmp(_argv[args], "-fuzz") == 0 && _argc == (args + 3)) {
+            num_encoders_to_fuzz = strtol(_argv[args + 1], &strtol_str, 10);
+            if (strtol_str[0] != '\0' || num_encoders_to_fuzz <= 0) {
+                print_usage(_argv);
+                return EXIT_FAILURE;
+            }
+            num_setting_changes = strtol(_argv[args + 2], &strtol_str, 10);
+            if (strtol_str[0] != '\0' || num_setting_changes <= 0) {
+                print_usage(_argv);
+                return EXIT_FAILURE;
+            }
+            args += 3;
+        } else {
             print_usage(_argv);
             return EXIT_FAILURE;
-         }
-         args+=3;
-      }
-      else {
-        print_usage(_argv);
-        return EXIT_FAILURE;
-      }
-   }
-
-   oversion=oac_get_version_string();
-   if(!oversion)test_failed();
-   fprintf(stderr,"Testing %s encoder. Random seed: %u (%.4X)\n", oversion, iseed, fast_rand() % 65535);
-   if(env_used)fprintf(stderr,"  Random seed set from the environment (SEED=%s).\n", env_seed);
-
-   regression_test();
-
-   /*Setting TEST_OAC_NOFUZZ tells the tool not to send garbage data
-     into the decoders. This is helpful because garbage data
-     may cause the decoders to clip, which angers CLANG IOC.*/
-   run_test1(getenv("TEST_OAC_NOFUZZ")!=NULL);
-
-   /* Fuzz encoder settings online */
-   if(getenv("TEST_OAC_NOFUZZ")==NULL) {
-      fprintf(stderr,"Running fuzz_encoder_settings with %d encoder(s) and %d setting change(s) each.\n",
+        }
+    }
+
+    oversion = oac_get_version_string();
+    if (!oversion) test_failed();
+    fprintf(stderr, "Testing %s encoder. Random seed: %u (%.4X)\n", oversion, iseed, fast_rand()%65535);
+    if (env_used) fprintf(stderr, "  Random seed set from the environment (SEED=%s).\n", env_seed);
+
+    regression_test();
+
+    /*Setting TEST_OAC_NOFUZZ tells the tool not to send garbage data
+       into the decoders. This is helpful because garbage data
+       may cause the decoders to clip, which angers CLANG IOC.*/
+    run_test1(getenv("TEST_OAC_NOFUZZ") != NULL);
+
+    /* Fuzz encoder settings online */
+    if (getenv("TEST_OAC_NOFUZZ") == NULL) {
+        fprintf(stderr, "Running fuzz_encoder_settings with %d encoder(s) and %d setting change(s) each.\n",
               num_encoders_to_fuzz, num_setting_changes);
-      fuzz_encoder_settings(num_encoders_to_fuzz, num_setting_changes);
-   }
+        fuzz_encoder_settings(num_encoders_to_fuzz, num_setting_changes);
+    }
 
-   fprintf(stderr,"Tests completed successfully.\n");
+    fprintf(stderr, "Tests completed successfully.\n");
 
-   return 0;
+    return 0;
 }
diff --git a/tests/test_oac_extensions.c b/tests/test_oac_extensions.c
index 4303c0bbf..0d65e0773 100644
--- a/tests/test_oac_extensions.c
+++ b/tests/test_oac_extensions.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdio.h>
@@ -34,539 +34,522 @@
 #include <string.h>
 #include <time.h>
 #ifndef _WIN32
-#include <unistd.h>
+# include <unistd.h>
 #else
-#include <process.h>
-#define getpid _getpid
+# include <process.h>
+# define getpid _getpid
 #endif
 
 #include "../src/oac_private.h"
 #include "test_oac_common.h"
 
-void test_extensions_generate_success(void)
-{
-   static const oac_extension_data ext[] = {
-      {3, 0, (const unsigned char *)"a", 1},
-      {32, 10, (const unsigned char *)"DRED", 4},
-      {33, 1, (const unsigned char *)"NOT DRED", 8},
-      {4, 4, (const unsigned char *)NULL, 0}
-   };
-
-   int result;
-   unsigned char packet[32];
-   const unsigned char *p = packet;
-   result = oac_packet_extensions_generate(packet, 23+4, ext, 4, 11, 1);
-   expect_true(result == 23+4, "expected length 23+4");
-
-   /* expect padding */
-   expect_true(p[0] == 1 && p[1] == 1 && p[2] == 1 && p[3] == 1, "expected padding");
-   p += 4;
-
-   /* extension ID=3 */
-   expect_true((p[0] >> 1) == 3, "expected extension id 3");
-   /* For extension IDs 1 through 31, L=0 means that no data follows the
-      extension, whereas L=1 means that exactly one byte of extension data follows. */
-   expect_true((p[0] & 0x01) == 1, "expected L-bit set");
-   /* content */
-   expect_true(p[1] == 'a', "expected extension content");
-   p += 2;
-
-   /* next byte should increment the frame count, ID=1, L=0 */
-   expect_true(p[0] == 0x02, "bad frame separator");
-   p += 1;
-   /* extension ID=33 */
-   expect_true((p[0] >> 1) == 33, "expected extension id 33");
-   /* For IDs 32 to 127, L=0 signals that the extension data takes up the
-      rest of the padding, and L=1 signals that a length indicator follows. */
-   expect_true((p[0] & 0x01) == 1, "expected L-bit set");
-   /* content */
-   expect_true(p[1] == ext[2].len, "expected length");
-   p += 2;
-   expect_true(0 == memcmp(p, ext[2].data, ext[2].len), "expected extension content");
-   p += ext[2].len;
-
-   /* advance to frame 4, increment by 3 */
-   /* next byte should increment the frame count, ID=1, L=1 */
-   expect_true(p[0] == 0x03, "bad frame separator");
-   expect_true(p[1] == 0x03, "bad frame increment");
-   p += 2;
-   /* extension ID=4 */
-   expect_true((p[0] >> 1) == 4, "expected extension id 4");
-   /* For extension IDs 1 through 31, L=0 means that no data follows the
-      extension, whereas L=1 means that exactly one byte of extension data follows. */
-   expect_true((p[0] & 0x01) == 0, "expected L-bit unset");
-   p += 1;
-
-   /* advance to frame 10, increment by 6 */
-   /* next byte should increment the frame count, ID=1, L=1 */
-   expect_true(p[0] == 0x03, "bad frame separator");
-   expect_true(p[1] == 0x06, "bad frame increment");
-   p += 2;
-   /* extension ID=32 */
-   expect_true((p[0] >> 1) == 32, "expected extension id 32");
-   /* For IDs 32 to 127, L=0 signals that the extension data takes up the
-      rest of the padding */
-   expect_true((p[0] & 0x01) == 0, "expected L-bit unset");
-   p += 1;
-   expect_true(0 == memcmp(p, ext[1].data, ext[1].len), "expected extension content");
+void test_extensions_generate_success(void) {
+    static const oac_extension_data ext[] = {
+        {3, 0, (const unsigned char *)"a", 1},
+        {32, 10, (const unsigned char *)"DRED", 4},
+        {33, 1, (const unsigned char *)"NOT DRED", 8},
+        {4, 4, (const unsigned char *)NULL, 0}
+    };
+
+    int result;
+    unsigned char packet[32];
+    const unsigned char *p = packet;
+    result = oac_packet_extensions_generate(packet, 23 + 4, ext, 4, 11, 1);
+    expect_true(result == 23 + 4, "expected length 23+4");
+
+    /* expect padding */
+    expect_true(p[0] == 1 && p[1] == 1 && p[2] == 1 && p[3] == 1, "expected padding");
+    p += 4;
+
+    /* extension ID=3 */
+    expect_true((p[0]>>1) == 3, "expected extension id 3");
+    /* For extension IDs 1 through 31, L=0 means that no data follows the
+       extension, whereas L=1 means that exactly one byte of extension data follows. */
+    expect_true((p[0]&0x01) == 1, "expected L-bit set");
+    /* content */
+    expect_true(p[1] == 'a', "expected extension content");
+    p += 2;
+
+    /* next byte should increment the frame count, ID=1, L=0 */
+    expect_true(p[0] == 0x02, "bad frame separator");
+    p += 1;
+    /* extension ID=33 */
+    expect_true((p[0]>>1) == 33, "expected extension id 33");
+    /* For IDs 32 to 127, L=0 signals that the extension data takes up the
+       rest of the padding, and L=1 signals that a length indicator follows. */
+    expect_true((p[0]&0x01) == 1, "expected L-bit set");
+    /* content */
+    expect_true(p[1] == ext[2].len, "expected length");
+    p += 2;
+    expect_true(0 == memcmp(p, ext[2].data, ext[2].len), "expected extension content");
+    p += ext[2].len;
+
+    /* advance to frame 4, increment by 3 */
+    /* next byte should increment the frame count, ID=1, L=1 */
+    expect_true(p[0] == 0x03, "bad frame separator");
+    expect_true(p[1] == 0x03, "bad frame increment");
+    p += 2;
+    /* extension ID=4 */
+    expect_true((p[0]>>1) == 4, "expected extension id 4");
+    /* For extension IDs 1 through 31, L=0 means that no data follows the
+       extension, whereas L=1 means that exactly one byte of extension data follows. */
+    expect_true((p[0]&0x01) == 0, "expected L-bit unset");
+    p += 1;
+
+    /* advance to frame 10, increment by 6 */
+    /* next byte should increment the frame count, ID=1, L=1 */
+    expect_true(p[0] == 0x03, "bad frame separator");
+    expect_true(p[1] == 0x06, "bad frame increment");
+    p += 2;
+    /* extension ID=32 */
+    expect_true((p[0]>>1) == 32, "expected extension id 32");
+    /* For IDs 32 to 127, L=0 signals that the extension data takes up the
+       rest of the padding */
+    expect_true((p[0]&0x01) == 0, "expected L-bit unset");
+    p += 1;
+    expect_true(0 == memcmp(p, ext[1].data, ext[1].len), "expected extension content");
 }
 
-void test_extensions_generate_zero(void)
-{
-   int result;
-   unsigned char packet[32];
+void test_extensions_generate_zero(void) {
+    int result;
+    unsigned char packet[32];
 
-   /* zero length packet, zero extensions */
-   result = oac_packet_extensions_generate(packet, 0, NULL, 0, 0, 1);
-   expect_true(result == 0, "expected length 0");
+    /* zero length packet, zero extensions */
+    result = oac_packet_extensions_generate(packet, 0, NULL, 0, 0, 1);
+    expect_true(result == 0, "expected length 0");
 }
 
-void test_extensions_generate_no_padding(void)
-{
-   static const oac_extension_data ext[] = {
-      {3, 0, (const unsigned char *)"a", 1},
-      {32, 10, (const unsigned char *)"DRED", 4},
-      {33, 1, (const unsigned char *)"NOT DRED", 8},
-      {4, 4, (const unsigned char *)NULL, 0}
-   };
-
-   int result;
-   unsigned char packet[32];
-   result =
-    oac_packet_extensions_generate(packet, sizeof(packet), ext, 4, 11, 0);
-   expect_true(result == 23, "expected length 23");
+void test_extensions_generate_no_padding(void) {
+    static const oac_extension_data ext[] = {
+        {3, 0, (const unsigned char *)"a", 1},
+        {32, 10, (const unsigned char *)"DRED", 4},
+        {33, 1, (const unsigned char *)"NOT DRED", 8},
+        {4, 4, (const unsigned char *)NULL, 0}
+    };
+
+    int result;
+    unsigned char packet[32];
+    result =
+        oac_packet_extensions_generate(packet, sizeof(packet), ext, 4, 11, 0);
+    expect_true(result == 23, "expected length 23");
 }
 
-void test_extensions_generate_fail(void)
-{
-   static const oac_extension_data ext[] = {
-      {3, 0, (const unsigned char *)"a", 1},
-      {32, 10, (const unsigned char *)"DRED", 4},
-      {33, 1, (const unsigned char *)"NOT DRED", 8},
-      {4, 4, (const unsigned char *)NULL, 0}
-   };
-
-   int result;
-   unsigned char packet[100];
-
-   /* buffer too small */
-   {
-      oac_int32 len;
-      /* this failure can occur at lots of points, so iterate to check as many
-          as possible */
-      for (len=0;len<23;len++)
-      {
-         size_t i;
-         for (i=len;i<sizeof(packet);i++) packet[i] = 0xFE;
-         result = oac_packet_extensions_generate(packet, len, ext, 4, 11, 1);
-         expect_true(result == OAC_BUFFER_TOO_SMALL,
+void test_extensions_generate_fail(void) {
+    static const oac_extension_data ext[] = {
+        {3, 0, (const unsigned char *)"a", 1},
+        {32, 10, (const unsigned char *)"DRED", 4},
+        {33, 1, (const unsigned char *)"NOT DRED", 8},
+        {4, 4, (const unsigned char *)NULL, 0}
+    };
+
+    int result;
+    unsigned char packet[100];
+
+    /* buffer too small */
+    {
+        oac_int32 len;
+        /* this failure can occur at lots of points, so iterate to check as many
+            as possible */
+        for (len = 0; len < 23; len++) {
+            size_t i;
+            for (i = len; i < sizeof(packet); i++) packet[i] = 0xFE;
+            result = oac_packet_extensions_generate(packet, len, ext, 4, 11, 1);
+            expect_true(result == OAC_BUFFER_TOO_SMALL,
           "expected OAC_BUFFER_TOO_SMALL");
-         for (i=len;i<sizeof(packet);i++)
-         {
-            expect_true(packet[i] == 0xFE,
+            for (i = len; i < sizeof(packet); i++) {
+                expect_true(packet[i] == 0xFE,
              "expected 0xFE padding to be undisturbed");
-         }
-      }
-   }
-
-   /* invalid id */
-   {
-      static const oac_extension_data id_too_big[] = {
-         {256, 0, (const unsigned char *)"a", 1},
-      };
-      result = oac_packet_extensions_generate(packet, sizeof(packet),
+            }
+        }
+    }
+
+    /* invalid id */
+    {
+        static const oac_extension_data id_too_big[] = {
+            {256, 0, (const unsigned char *)"a", 1},
+        };
+        result = oac_packet_extensions_generate(packet, sizeof(packet),
        id_too_big, 1, 11, 1);
-      expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
-   }
-
-   /* invalid id */
-   {
-      static const oac_extension_data id_too_small[] = {
-         {2, 0, (const unsigned char *)"a", 1},
-      };
-      result = oac_packet_extensions_generate(packet, sizeof(packet),
+        expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
+    }
+
+    /* invalid id */
+    {
+        static const oac_extension_data id_too_small[] = {
+            {2, 0, (const unsigned char *)"a", 1},
+        };
+        result = oac_packet_extensions_generate(packet, sizeof(packet),
        id_too_small, 1, 11, 1);
-      expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
-   }
-
-   /* frame count too big */
-   {
-      static const oac_extension_data frame_too_big[] = {
-         {33, 11, (const unsigned char *)"a", 1},
-      };
-      result = oac_packet_extensions_generate(packet, sizeof(packet),
+        expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
+    }
+
+    /* frame count too big */
+    {
+        static const oac_extension_data frame_too_big[] = {
+            {33, 11, (const unsigned char *)"a", 1},
+        };
+        result = oac_packet_extensions_generate(packet, sizeof(packet),
        frame_too_big, 1, 49, 1);
-      expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
-   }
-
-   /* frame index too small */
-   {
-      static const oac_extension_data frame_too_big[] = {
-         {33, -1, (const unsigned char *)"a", 1},
-      };
-      result = oac_packet_extensions_generate(packet, sizeof(packet),
+        expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
+    }
+
+    /* frame index too small */
+    {
+        static const oac_extension_data frame_too_big[] = {
+            {33, -1, (const unsigned char *)"a", 1},
+        };
+        result = oac_packet_extensions_generate(packet, sizeof(packet),
        frame_too_big, 1, 11, 1);
-      expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
-   }
-
-   /* frame index too big */
-   {
-      static const oac_extension_data frame_too_big[] = {
-         {33, 11, (const unsigned char *)"a", 1},
-      };
-      result = oac_packet_extensions_generate(packet, sizeof(packet),
+        expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
+    }
+
+    /* frame index too big */
+    {
+        static const oac_extension_data frame_too_big[] = {
+            {33, 11, (const unsigned char *)"a", 1},
+        };
+        result = oac_packet_extensions_generate(packet, sizeof(packet),
        frame_too_big, 1, 11, 1);
-      expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
-   }
-
-   /* size too big for extension IDs 1 through 31 */
-   {
-      static const oac_extension_data size_too_big[] = {
-         {3, 0, (const unsigned char *)"abcd", 4},
-      };
-      result = oac_packet_extensions_generate(packet, sizeof(packet),
+        expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
+    }
+
+    /* size too big for extension IDs 1 through 31 */
+    {
+        static const oac_extension_data size_too_big[] = {
+            {3, 0, (const unsigned char *)"abcd", 4},
+        };
+        result = oac_packet_extensions_generate(packet, sizeof(packet),
        size_too_big, 1, 1, 1);
-      expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
-   }
-
-   /* negative size for extension IDs 1 through 31 */
-   {
-      static const oac_extension_data neg_size[] = {
-         {3, 0, NULL, -4},
-      };
-      result = oac_packet_extensions_generate(packet, sizeof(packet),
+        expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
+    }
+
+    /* negative size for extension IDs 1 through 31 */
+    {
+        static const oac_extension_data neg_size[] = {
+            {3, 0, NULL, -4},
+        };
+        result = oac_packet_extensions_generate(packet, sizeof(packet),
        neg_size, 1, 1, 1);
-      expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
-   }
-
-   /* negative size for extension IDs 32 through 127 */
-   {
-      static const oac_extension_data neg_size_33[] = {
-         {33, 0, NULL, -4},
-      };
-      result = oac_packet_extensions_generate(packet, sizeof(packet),
+        expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
+    }
+
+    /* negative size for extension IDs 32 through 127 */
+    {
+        static const oac_extension_data neg_size_33[] = {
+            {33, 0, NULL, -4},
+        };
+        result = oac_packet_extensions_generate(packet, sizeof(packet),
        neg_size_33, 1, 1, 1);
-      expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
-   }
+        expect_true(result == OAC_BAD_ARG, "expected OAC_BAD_ARG");
+    }
 }
 
-void test_extensions_parse_success(void)
-{
-   static const oac_extension_data ext[] = {
-      {3, 0, (const unsigned char *)"a", 1},
-      {32, 10, (const unsigned char *)"DRED", 4},
-      {33, 1, (const unsigned char *)"NOT DRED", 8},
-      {4, 4, (const unsigned char *)NULL, 0}
-   };
-   oac_extension_data ext_out[10];
-   oac_int32 nb_ext;
-   int nb_frames;
-   int len, result;
-   unsigned char packet[32];
-
-   nb_ext = 10;
-   nb_frames = 11;
-   len = oac_packet_extensions_generate(packet, 32, ext, 4, 11, 1);
-   expect_true(len == 32, "expected length 32");
-   result = oac_packet_extensions_count(packet, len, nb_frames);
-   expect_true(result == 4, "expected oac_packet_extensions_count 4");
-   result = oac_packet_extensions_parse(packet, len, ext_out, &nb_ext,
+void test_extensions_parse_success(void) {
+    static const oac_extension_data ext[] = {
+        {3, 0, (const unsigned char *)"a", 1},
+        {32, 10, (const unsigned char *)"DRED", 4},
+        {33, 1, (const unsigned char *)"NOT DRED", 8},
+        {4, 4, (const unsigned char *)NULL, 0}
+    };
+    oac_extension_data ext_out[10];
+    oac_int32 nb_ext;
+    int nb_frames;
+    int len, result;
+    unsigned char packet[32];
+
+    nb_ext = 10;
+    nb_frames = 11;
+    len = oac_packet_extensions_generate(packet, 32, ext, 4, 11, 1);
+    expect_true(len == 32, "expected length 32");
+    result = oac_packet_extensions_count(packet, len, nb_frames);
+    expect_true(result == 4, "expected oac_packet_extensions_count 4");
+    result = oac_packet_extensions_parse(packet, len, ext_out, &nb_ext,
     nb_frames);
-   expect_true(nb_ext == 4, "expected 4 extensions");
-
-   expect_true(ext_out[0].id == 3, "expected id 3");
-   expect_true(ext_out[0].frame == 0, "expected frame 0");
-   expect_true(ext_out[0].len == 1, "expected len 1");
-   expect_true(0 == memcmp(ext_out[0].data, ext[0].data, 1), "expected data");
-
-   expect_true(ext_out[1].id == 33, "expected id 33");
-   expect_true(ext_out[1].frame == 1, "expected frame 1");
-   expect_true(ext_out[1].len == 8, "expected len 8");
-   expect_true(0 == memcmp(ext_out[1].data, ext[2].data, 8), "expected data");
-
-   expect_true(ext_out[2].id == 4, "expected id 4");
-   expect_true(ext_out[2].frame == 4, "expected frame 4");
-   expect_true(ext_out[2].len == 0, "expected len 0");
-
-   expect_true(ext_out[3].id == 32, "expected id 32");
-   expect_true(ext_out[3].frame == 10, "expected frame 10");
-   expect_true(ext_out[3].len == 4, "expected len 4");
-   expect_true(0 == memcmp(ext_out[3].data, ext[1].data, 4), "expected data");
+    expect_true(nb_ext == 4, "expected 4 extensions");
+
+    expect_true(ext_out[0].id == 3, "expected id 3");
+    expect_true(ext_out[0].frame == 0, "expected frame 0");
+    expect_true(ext_out[0].len == 1, "expected len 1");
+    expect_true(0 == memcmp(ext_out[0].data, ext[0].data, 1), "expected data");
+
+    expect_true(ext_out[1].id == 33, "expected id 33");
+    expect_true(ext_out[1].frame == 1, "expected frame 1");
+    expect_true(ext_out[1].len == 8, "expected len 8");
+    expect_true(0 == memcmp(ext_out[1].data, ext[2].data, 8), "expected data");
+
+    expect_true(ext_out[2].id == 4, "expected id 4");
+    expect_true(ext_out[2].frame == 4, "expected frame 4");
+    expect_true(ext_out[2].len == 0, "expected len 0");
+
+    expect_true(ext_out[3].id == 32, "expected id 32");
+    expect_true(ext_out[3].frame == 10, "expected frame 10");
+    expect_true(ext_out[3].len == 4, "expected len 4");
+    expect_true(0 == memcmp(ext_out[3].data, ext[1].data, 4), "expected data");
 }
 
-void test_extensions_parse_zero(void)
-{
-   static const oac_extension_data ext[] = {
-      {32, 1, (const unsigned char *)"DRED", 4},
-   };
-   oac_int32 nb_ext;
-   int nb_frames;
-   int len, result;
-   unsigned char packet[32];
-
-   len = oac_packet_extensions_generate(packet, 32, ext, 1, 2, 1);
-   expect_true(len == 32, "expected length 32");
-
-   nb_ext = 0;
-   nb_frames = 2;
-   result = oac_packet_extensions_parse(packet, len, NULL, &nb_ext, nb_frames);
-   expect_true(result == OAC_BUFFER_TOO_SMALL, "expected OAC_BUFFER_TOO_SMALL");
+void test_extensions_parse_zero(void) {
+    static const oac_extension_data ext[] = {
+        {32, 1, (const unsigned char *)"DRED", 4},
+    };
+    oac_int32 nb_ext;
+    int nb_frames;
+    int len, result;
+    unsigned char packet[32];
+
+    len = oac_packet_extensions_generate(packet, 32, ext, 1, 2, 1);
+    expect_true(len == 32, "expected length 32");
+
+    nb_ext = 0;
+    nb_frames = 2;
+    result = oac_packet_extensions_parse(packet, len, NULL, &nb_ext, nb_frames);
+    expect_true(result == OAC_BUFFER_TOO_SMALL, "expected OAC_BUFFER_TOO_SMALL");
 }
 
-void test_extensions_parse_fail(void)
-{
-   static const oac_extension_data ext[] = {
-      {3, 0, (const unsigned char *)"a", 1},
-      {33, 1, (const unsigned char *)"NOT DRED", 8},
-      {4, 4, (const unsigned char *)NULL, 0},
-      {32, 10, (const unsigned char *)"DRED", 4},
-      {32, 9, (const unsigned char *)"DRED", 4},
-      {4, 9, (const unsigned char *)"b", 1},
-      {4, 10, (const unsigned char *)"c", 1}
-   };
-   oac_extension_data ext_out[10];
-   oac_int32 nb_ext;
-   int nb_frames;
-   int len, result;
-   unsigned char packet[32];
-
-   /* create invalid length */
-   len = oac_packet_extensions_generate(packet, sizeof(packet), ext, 4, 11, 0);
-   packet[4] = 255;
-   nb_ext = 10;
-   nb_frames = 11;
-   result = oac_packet_extensions_parse(packet, len, ext_out, &nb_ext,
+void test_extensions_parse_fail(void) {
+    static const oac_extension_data ext[] = {
+        {3, 0, (const unsigned char *)"a", 1},
+        {33, 1, (const unsigned char *)"NOT DRED", 8},
+        {4, 4, (const unsigned char *)NULL, 0},
+        {32, 10, (const unsigned char *)"DRED", 4},
+        {32, 9, (const unsigned char *)"DRED", 4},
+        {4, 9, (const unsigned char *)"b", 1},
+        {4, 10, (const unsigned char *)"c", 1}
+    };
+    oac_extension_data ext_out[10];
+    oac_int32 nb_ext;
+    int nb_frames;
+    int len, result;
+    unsigned char packet[32];
+
+    /* create invalid length */
+    len = oac_packet_extensions_generate(packet, sizeof(packet), ext, 4, 11, 0);
+    packet[4] = 255;
+    nb_ext = 10;
+    nb_frames = 11;
+    result = oac_packet_extensions_parse(packet, len, ext_out, &nb_ext,
     nb_frames);
-   expect_true(result == OAC_INVALID_PACKET, "expected OAC_INVALID_PACKET");
-   /* note, oac_packet_extensions_count stops at the invalid frame increment
-      and tells us that we have 1 extension */
-   result = oac_packet_extensions_count(packet, len, nb_frames);
-   expect_true(result == 1, "expected oac_packet_extensions_count to return 1");
-
-   /* create invalid frame increment */
-   nb_ext = 10;
-   len = oac_packet_extensions_generate(packet, sizeof(packet), ext, 4, 11, 0);
-   /* first by reducing the number of frames */
-   result = oac_packet_extensions_parse(packet, len, ext_out, &nb_ext, 5);
-   expect_true(result == OAC_INVALID_PACKET, "expected OAC_INVALID_PACKET");
-
-   /* note, oac_packet_extensions_count stops at the invalid frame increment
-      and tells us that we have 3 extensions */
-   result = oac_packet_extensions_count(packet, len, 5);
-   expect_true(result == 3, "expected oac_packet_extensions_count to return 3");
-
-   /* then by increasing the increment */
-   packet[14] = 255;
-   result = oac_packet_extensions_parse(packet, len, ext_out, &nb_ext,
+    expect_true(result == OAC_INVALID_PACKET, "expected OAC_INVALID_PACKET");
+    /* note, oac_packet_extensions_count stops at the invalid frame increment
+       and tells us that we have 1 extension */
+    result = oac_packet_extensions_count(packet, len, nb_frames);
+    expect_true(result == 1, "expected oac_packet_extensions_count to return 1");
+
+    /* create invalid frame increment */
+    nb_ext = 10;
+    len = oac_packet_extensions_generate(packet, sizeof(packet), ext, 4, 11, 0);
+    /* first by reducing the number of frames */
+    result = oac_packet_extensions_parse(packet, len, ext_out, &nb_ext, 5);
+    expect_true(result == OAC_INVALID_PACKET, "expected OAC_INVALID_PACKET");
+
+    /* note, oac_packet_extensions_count stops at the invalid frame increment
+       and tells us that we have 3 extensions */
+    result = oac_packet_extensions_count(packet, len, 5);
+    expect_true(result == 3, "expected oac_packet_extensions_count to return 3");
+
+    /* then by increasing the increment */
+    packet[14] = 255;
+    result = oac_packet_extensions_parse(packet, len, ext_out, &nb_ext,
     nb_frames);
-   expect_true(result == OAC_INVALID_PACKET, "expected OAC_INVALID_PACKET");
+    expect_true(result == OAC_INVALID_PACKET, "expected OAC_INVALID_PACKET");
 
-   /* note, oac_packet_extensions_count stops at the invalid frame increment
-      and tells us that we have 2 extensions */
-   result = oac_packet_extensions_count(packet, len, nb_frames);
-   expect_true(result == 2, "expected oac_packet_extensions_count to return 2");
+    /* note, oac_packet_extensions_count stops at the invalid frame increment
+       and tells us that we have 2 extensions */
+    result = oac_packet_extensions_count(packet, len, nb_frames);
+    expect_true(result == 2, "expected oac_packet_extensions_count to return 2");
 
-   /* not enough space */
-   nb_ext = 1;
-   len = oac_packet_extensions_generate(packet, sizeof(packet), ext, 4, 11, 0);
-   result = oac_packet_extensions_parse(packet, len, ext_out, &nb_ext,
+    /* not enough space */
+    nb_ext = 1;
+    len = oac_packet_extensions_generate(packet, sizeof(packet), ext, 4, 11, 0);
+    result = oac_packet_extensions_parse(packet, len, ext_out, &nb_ext,
     nb_frames);
-   expect_true(result == OAC_BUFFER_TOO_SMALL, "expected OAC_BUFFER_TOO_SMALL");
-
-   /* create repeated L=0 long extension without enough room for all of the
-       short extension payloads that need to follow it */
-   len = oac_packet_extensions_generate(packet, sizeof(packet), ext, 7, 11, 0);
-   len -= 5;
-   nb_ext = 10;
-   nb_frames = 11;
-   result = oac_packet_extensions_parse(packet, len, ext_out, &nb_ext,
+    expect_true(result == OAC_BUFFER_TOO_SMALL, "expected OAC_BUFFER_TOO_SMALL");
+
+    /* create repeated L=0 long extension without enough room for all of the
+        short extension payloads that need to follow it */
+    len = oac_packet_extensions_generate(packet, sizeof(packet), ext, 7, 11, 0);
+    len -= 5;
+    nb_ext = 10;
+    nb_frames = 11;
+    result = oac_packet_extensions_parse(packet, len, ext_out, &nb_ext,
     nb_frames);
-   expect_true(result == OAC_INVALID_PACKET, "expected OAC_INVALID_PACKET");
-   /* note, oac_packet_extensions_count stops at the invalid long extension
-       and tells us that we have 5 extensions */
-   result = oac_packet_extensions_count(packet, len, nb_frames);
-   expect_true(result == 5, "expected oac_packet_extensions_count to return 5");
-
-   /* overflow for long extension length */
-   {
-      /* about 8 MB */
+    expect_true(result == OAC_INVALID_PACKET, "expected OAC_INVALID_PACKET");
+    /* note, oac_packet_extensions_count stops at the invalid long extension
+        and tells us that we have 5 extensions */
+    result = oac_packet_extensions_count(packet, len, nb_frames);
+    expect_true(result == 5, "expected oac_packet_extensions_count to return 5");
+
+    /* overflow for long extension length */
+    {
+        /* about 8 MB */
 #define LENSIZE ((1U<<31)/255 + 1)
-      unsigned char *buf = (unsigned char *)malloc(LENSIZE+1);
-      len = LENSIZE+1;
-      buf[0] = 33<<1 | 1;
-      memset(buf + 1, 0xFF, LENSIZE - 1);
-      buf[LENSIZE] = 0xFE;
-      result = oac_packet_extensions_parse(buf, len, ext_out, &nb_ext, 1);
-      expect_true(result == OAC_INVALID_PACKET, "expected OAC_INVALID_PACKET");
-      free(buf);
-   }
+        unsigned char *buf = (unsigned char *)malloc(LENSIZE + 1);
+        len = LENSIZE + 1;
+        buf[0] = 33<<1|1;
+        memset(buf + 1, 0xFF, LENSIZE - 1);
+        buf[LENSIZE] = 0xFE;
+        result = oac_packet_extensions_parse(buf, len, ext_out, &nb_ext, 1);
+        expect_true(result == OAC_INVALID_PACKET, "expected OAC_INVALID_PACKET");
+        free(buf);
+    }
 }
 
 /* Check that the same extensions with the same data appear in both ext_in and
     ext_out, with extensions in ext_out appearing in frame order, and the order
     within a frame matching the order within a frame in ext_in. */
 static void check_ext_data(const oac_extension_data *ext_in,
- const oac_extension_data *ext_out, oac_int32 nb_ext)
-{
-   oac_int32 i;
-   oac_int32 j;
-   int prev_frame;
-   prev_frame = -1;
-   j = 0;
-   for (i=0;i<nb_ext;i++)
-   {
-      expect_true(ext_out[i].frame >= prev_frame,
+                           const oac_extension_data *ext_out, oac_int32 nb_ext) {
+    oac_int32 i;
+    oac_int32 j;
+    int prev_frame;
+    prev_frame = -1;
+    j = 0;
+    for (i = 0; i < nb_ext; i++) {
+        expect_true(ext_out[i].frame >= prev_frame,
        "expected parsed extensions to be returned in frame order");
-      if (ext_out[i].frame > prev_frame) {
-         j = 0;
-      }
-      while (j < nb_ext && ext_in[j].frame != ext_out[i].frame) j++;
-      expect_true(j < nb_ext,
+        if (ext_out[i].frame > prev_frame) {
+            j = 0;
+        }
+        while (j < nb_ext && ext_in[j].frame != ext_out[i].frame) j++;
+        expect_true(j < nb_ext,
        "expected enough extensions matching this frame");
-      expect_true(ext_in[j].id == ext_out[i].id,
+        expect_true(ext_in[j].id == ext_out[i].id,
        "expected extension IDs to match");
-      expect_true(ext_in[j].len == ext_out[i].len,
+        expect_true(ext_in[j].len == ext_out[i].len,
        "expected extension lengths to match");
-      /* The len check allows ext_in[j].data to be NULL without triggering
-          undefined behavior. */
-      expect_true(ext_in[j].len == 0 ||
-       memcmp(ext_in[j].data, ext_out[i].data, ext_out[i].len) == 0,
+        /* The len check allows ext_in[j].data to be NULL without triggering
+            undefined behavior. */
+        expect_true(ext_in[j].len == 0
+            || memcmp(ext_in[j].data, ext_out[i].data, ext_out[i].len) == 0,
        "expected extension data to match");
-      prev_frame = ext_out[i].frame;
-      j++;
-   }
+        prev_frame = ext_out[i].frame;
+        j++;
+    }
 }
 
 #define NB_EXT (13)
 
-void test_extensions_repeating(void)
-{
-   static const oac_extension_data ext[] = {
-      {3, 0, (const unsigned char *)"a", 1},
-      {3, 1, (const unsigned char *)"b", 1},
-      {3, 2, (const unsigned char *)"c", 1},
-      {4, 0, (const unsigned char *)"d", 1},
-      {4, 1, (const unsigned char *)NULL, 0},
-      {4, 2, (const unsigned char *)NULL, 0},
-      {32, 2, (const unsigned char *)"DRED2", 5},
-      {32, 1, (const unsigned char *)"DRED", 4},
-      {5, 1, (const unsigned char *)NULL, 0},
-      {5, 2, (const unsigned char *)NULL, 0},
-      {6, 2, (const unsigned char *)"f", 1},
-      {6, 1, (const unsigned char *)"e", 1},
-      {32, 2, (const unsigned char *)"DREDthree", 9}
-   };
-   static const oac_int32 encoded_len[] = {
-      0,
-      2,
-      /* nb_ext = 2: don't try to repeat if the same extension is not used in
-          every frame */
-      5,
-      /* nb_ext = 3: do repeat if the same extension is used in every frame */
-      5,
-      7,
-      9,
-      /* nb_ext = 6: do not repeat short extensions if the lengths do not match
-          ... but do repeat after the first frame when the lengths do match. */
-      10,
-      /* nb_ext = 7: code repeated extensions with L=0 to skip a frame
-          separator because they are all short extensions. */
-      16,
-      /* nb_ext = 8: repeat multiple extensions in the same frame.
-         code the last repeated extension with L=0 if it is a long
-          extension. */
-      21,
-      23,
-      /* nb_ext = 10: code the last repeated long extension with L=0 even if it
-          is followed by repeated short extensions with L=0. */
-      22,
-      /* nb_ext = 11: don't use L=0 to skip a frame separator if repeats end
-          on a short extension if there was a preceding L=0 long extension. */
-      26,
-      /* nb_ext = 12: code the last repeated long extension with L=0 even if
-          it is followed by repeated short extensions with L=1. */
-      25,
-      /* nb_ext = 13: don't use L=0 to skip a frame separator if repeats end
-          on a short extension if there was a preceding L=1 long extension. */
-      37
-   };
-   oac_int32 nb_ext;
-   for (nb_ext = 0; nb_ext <= NB_EXT; nb_ext++) {
-      oac_extension_data ext_out[NB_EXT];
-      oac_int32 nb_frame_exts[48];
-      oac_int32 nb_ext_out;
-      int len, result;
-      unsigned char packet[64];
-      len = oac_packet_extensions_generate(packet, sizeof(packet), ext,
+void test_extensions_repeating(void) {
+    static const oac_extension_data ext[] = {
+        {3, 0, (const unsigned char *)"a", 1},
+        {3, 1, (const unsigned char *)"b", 1},
+        {3, 2, (const unsigned char *)"c", 1},
+        {4, 0, (const unsigned char *)"d", 1},
+        {4, 1, (const unsigned char *)NULL, 0},
+        {4, 2, (const unsigned char *)NULL, 0},
+        {32, 2, (const unsigned char *)"DRED2", 5},
+        {32, 1, (const unsigned char *)"DRED", 4},
+        {5, 1, (const unsigned char *)NULL, 0},
+        {5, 2, (const unsigned char *)NULL, 0},
+        {6, 2, (const unsigned char *)"f", 1},
+        {6, 1, (const unsigned char *)"e", 1},
+        {32, 2, (const unsigned char *)"DREDthree", 9}
+    };
+    static const oac_int32 encoded_len[] = {
+        0,
+        2,
+        /* nb_ext = 2: don't try to repeat if the same extension is not used in
+            every frame */
+        5,
+        /* nb_ext = 3: do repeat if the same extension is used in every frame */
+        5,
+        7,
+        9,
+        /* nb_ext = 6: do not repeat short extensions if the lengths do not match
+            ... but do repeat after the first frame when the lengths do match. */
+        10,
+        /* nb_ext = 7: code repeated extensions with L=0 to skip a frame
+            separator because they are all short extensions. */
+        16,
+        /* nb_ext = 8: repeat multiple extensions in the same frame.
+           code the last repeated extension with L=0 if it is a long
+            extension. */
+        21,
+        23,
+        /* nb_ext = 10: code the last repeated long extension with L=0 even if it
+            is followed by repeated short extensions with L=0. */
+        22,
+        /* nb_ext = 11: don't use L=0 to skip a frame separator if repeats end
+            on a short extension if there was a preceding L=0 long extension. */
+        26,
+        /* nb_ext = 12: code the last repeated long extension with L=0 even if
+            it is followed by repeated short extensions with L=1. */
+        25,
+        /* nb_ext = 13: don't use L=0 to skip a frame separator if repeats end
+            on a short extension if there was a preceding L=1 long extension. */
+        37
+    };
+    oac_int32 nb_ext;
+    for (nb_ext = 0; nb_ext <= NB_EXT; nb_ext++) {
+        oac_extension_data ext_out[NB_EXT];
+        oac_int32 nb_frame_exts[48];
+        oac_int32 nb_ext_out;
+        int len, result;
+        unsigned char packet[64];
+        len = oac_packet_extensions_generate(packet, sizeof(packet), ext,
        nb_ext, 3, 0);
-      expect_true(len == encoded_len[nb_ext],
+        expect_true(len == encoded_len[nb_ext],
        "expected extension encoding length to match");
-      result = oac_packet_extensions_count_ext(packet, len, nb_frame_exts, 3);
-      expect_true(result == nb_ext, "expected extension count to match");
-      nb_ext_out = NB_EXT;
-      result = oac_packet_extensions_parse_ext(packet, len, ext_out,
+        result = oac_packet_extensions_count_ext(packet, len, nb_frame_exts, 3);
+        expect_true(result == nb_ext, "expected extension count to match");
+        nb_ext_out = NB_EXT;
+        result = oac_packet_extensions_parse_ext(packet, len, ext_out,
        &nb_ext_out, nb_frame_exts, 3);
-      expect_true(result == 0, "expected extension parsing to succeed");
-      expect_true(nb_ext_out == nb_ext, "expected extension count to match");
-      check_ext_data(ext, ext_out, nb_ext);
-      /* Special case some modifications to test things our generator will
-          never produce. */
-      if (nb_ext == 6) {
-         /* allow a repeat in the last frame, as well as trailing junk after an
-             L=0 repeat that MUST be ignored. */
-         packet[len++] = 2<<1|0;
-         packet[len++] = 3<<1|0;
-      }
-      else if (nb_ext == 8) {
-         /* insert padding before the repeat indicator */
-         memmove(packet+16, packet+15, len-15);
-         packet[15] = 0x1;
-         len++;
-         /* don't repeat the padding and continue decoding last extension with
-             L=0 */
-      }
-      else if (nb_ext == 10) {
-         /* use a frame separator with an increment of 0 as padding.
-            This should _not_ change which extensions get repeated. */
-         memmove(packet+17, packet+15, len-15);
-         packet[15] = 0x3;
-         packet[16] = 0;
-         len += 2;
-      }
-      else if (nb_ext == 13) {
-         /* use L=0 to skip a frame separator if a repeat has no extensions at
-             all */
-         packet[26] = 2<<1|0;
-      }
-      else continue;
-      result = oac_packet_extensions_count_ext(packet, len, nb_frame_exts, 3);
-      expect_true(result == nb_ext, "expected extension count to match");
-      nb_ext_out = NB_EXT;
-      result = oac_packet_extensions_parse_ext(packet, len, ext_out,
+        expect_true(result == 0, "expected extension parsing to succeed");
+        expect_true(nb_ext_out == nb_ext, "expected extension count to match");
+        check_ext_data(ext, ext_out, nb_ext);
+        /* Special case some modifications to test things our generator will
+            never produce. */
+        if (nb_ext == 6) {
+            /* allow a repeat in the last frame, as well as trailing junk after an
+                L=0 repeat that MUST be ignored. */
+            packet[len++] = 2<<1|0;
+            packet[len++] = 3<<1|0;
+        } else if (nb_ext == 8) {
+            /* insert padding before the repeat indicator */
+            memmove(packet + 16, packet + 15, len - 15);
+            packet[15] = 0x1;
+            len++;
+            /* don't repeat the padding and continue decoding last extension with
+                L=0 */
+        } else if (nb_ext == 10) {
+            /* use a frame separator with an increment of 0 as padding.
+               This should _not_ change which extensions get repeated. */
+            memmove(packet + 17, packet + 15, len - 15);
+            packet[15] = 0x3;
+            packet[16] = 0;
+            len += 2;
+        } else if (nb_ext == 13) {
+            /* use L=0 to skip a frame separator if a repeat has no extensions at
+                all */
+            packet[26] = 2<<1|0;
+        } else continue;
+        result = oac_packet_extensions_count_ext(packet, len, nb_frame_exts, 3);
+        expect_true(result == nb_ext, "expected extension count to match");
+        nb_ext_out = NB_EXT;
+        result = oac_packet_extensions_parse_ext(packet, len, ext_out,
        &nb_ext_out, nb_frame_exts, 3);
-      expect_true(result == 0, "expected extension parsing to succeed");
-      expect_true(nb_ext_out == nb_ext, "expected extension count to match");
-      check_ext_data(ext, ext_out, nb_ext);
-      if (nb_ext == 8) {
-         /* allow multiple repeat indicators in the same frame */
-         memmove(packet+10, packet+9, len-9);
-         packet[9] = 2<<1|1;
-         len++;
-         /* even when there are no new extensions to repeat */
-         memmove(packet+6, packet+5, len-5);
-         packet[5] = 2<<1|1;
-         len++;
-      }
-      else continue;
-      result = oac_packet_extensions_count_ext(packet, len, nb_frame_exts, 3);
-      expect_true(result == nb_ext, "expected extension count to match");
-      nb_ext_out = NB_EXT;
-      result = oac_packet_extensions_parse_ext(packet, len, ext_out,
+        expect_true(result == 0, "expected extension parsing to succeed");
+        expect_true(nb_ext_out == nb_ext, "expected extension count to match");
+        check_ext_data(ext, ext_out, nb_ext);
+        if (nb_ext == 8) {
+            /* allow multiple repeat indicators in the same frame */
+            memmove(packet + 10, packet + 9, len - 9);
+            packet[9] = 2<<1|1;
+            len++;
+            /* even when there are no new extensions to repeat */
+            memmove(packet + 6, packet + 5, len - 5);
+            packet[5] = 2<<1|1;
+            len++;
+        } else continue;
+        result = oac_packet_extensions_count_ext(packet, len, nb_frame_exts, 3);
+        expect_true(result == nb_ext, "expected extension count to match");
+        nb_ext_out = NB_EXT;
+        result = oac_packet_extensions_parse_ext(packet, len, ext_out,
        &nb_ext_out, nb_frame_exts, 3);
-      expect_true(result == 0, "expected extension parsing to succeed");
-      expect_true(nb_ext_out == nb_ext, "expected extension count to match");
-      check_ext_data(ext, ext_out, nb_ext);
-   }
+        expect_true(result == 0, "expected extension parsing to succeed");
+        expect_true(nb_ext_out == nb_ext, "expected extension count to match");
+        check_ext_data(ext, ext_out, nb_ext);
+    }
 }
 
 #define NB_RANDOM_EXTENSIONS 100000000
@@ -575,109 +558,107 @@ void test_extensions_repeating(void)
     extensions followed by an RTE. */
 #define MAX_NB_EXTENSIONS ((MAX_EXTENSION_SIZE - 1)*48)
 
-void test_random_extensions_parse(void)
-{
-   int i;
-   for (i=0;i<NB_RANDOM_EXTENSIONS;i++)
-   {
-      oac_extension_data ext_out[MAX_NB_EXTENSIONS];
-      int nb_frames;
-      oac_int32 nb_ext;
-      unsigned char payload[MAX_EXTENSION_SIZE];
-      int len;
-      int j;
-      int result;
-      len = fast_rand()%(MAX_EXTENSION_SIZE+1);
-      for (j=0;j<len;j++)
-         payload[j] = fast_rand()&0xFF;
-      nb_ext = fast_rand()%(MAX_NB_EXTENSIONS+1);
-      /* The success rate is near 60.4% almost independent of the number of
-          frames we choose, so pick it randomly.
-         nb_frames == 1 is slightly (~0.2%) less likely to succeed, while
-          nb_frames == 2 is slightly (~0.1%) more likely to succeed, followed
-          by nb_frames == 3 being very slightly (~0.02%) more likely. */
-      nb_frames = (fast_rand()%48) + 1;
-      result =
-       oac_packet_extensions_parse(payload, len, ext_out, &nb_ext, nb_frames);
-      expect_true(result == OAC_OK || result == OAC_BUFFER_TOO_SMALL || result == OAC_INVALID_PACKET, "expected OAC_OK, OAC_BUFFER_TOO_SMALL or OAC_INVALID_PACKET");
-      /* Even if parsing fails, check that the extensions that got extracted make sense. */
-      for (j=0;j<nb_ext;j++)
-      {
-         expect_true(ext_out[j].frame >= 0 && ext_out[j].frame < nb_frames,
+void test_random_extensions_parse(void) {
+    int i;
+    for (i = 0; i < NB_RANDOM_EXTENSIONS; i++) {
+        oac_extension_data ext_out[MAX_NB_EXTENSIONS];
+        int nb_frames;
+        oac_int32 nb_ext;
+        unsigned char payload[MAX_EXTENSION_SIZE];
+        int len;
+        int j;
+        int result;
+        len = fast_rand()%(MAX_EXTENSION_SIZE + 1);
+        for (j = 0; j < len; j++)
+            payload[j] = fast_rand()&0xFF;
+        nb_ext = fast_rand()%(MAX_NB_EXTENSIONS + 1);
+        /* The success rate is near 60.4% almost independent of the number of
+            frames we choose, so pick it randomly.
+           nb_frames == 1 is slightly (~0.2%) less likely to succeed, while
+            nb_frames == 2 is slightly (~0.1%) more likely to succeed, followed
+            by nb_frames == 3 being very slightly (~0.02%) more likely. */
+        nb_frames = (fast_rand()%48) + 1;
+        result =
+            oac_packet_extensions_parse(payload, len, ext_out, &nb_ext, nb_frames);
+        expect_true(result == OAC_OK || result == OAC_BUFFER_TOO_SMALL || result == OAC_INVALID_PACKET,
+        "expected OAC_OK, OAC_BUFFER_TOO_SMALL or OAC_INVALID_PACKET");
+        /* Even if parsing fails, check that the extensions that got extracted make sense. */
+        for (j = 0; j < nb_ext; j++) {
+            expect_true(ext_out[j].frame >= 0 && ext_out[j].frame < nb_frames,
           "expected frame between 0 and nb_frames-1");
-         expect_true(ext_out[j].id >= 2 && ext_out[j].id <= 127, "expected id between 2 and 127");
-         expect_true(ext_out[j].data >= payload && ext_out[j].data+ext_out[j].len <= payload+len, "expected data to be within packet");
-      }
-      /* If parsing succeeds, check to see if we can round-trip these
-          extensions. */
-      if (result == OAC_OK) {
-         oac_extension_data ext_out2[MAX_NB_EXTENSIONS];
-         unsigned char payload2[MAX_EXTENSION_SIZE+1];
-         oac_int32 nb_frame_exts[48];
-         oac_int32 nb_ext_out;
-         len = oac_packet_extensions_generate(payload2, sizeof(payload2),
+            expect_true(ext_out[j].id >= 2 && ext_out[j].id <= 127, "expected id between 2 and 127");
+            expect_true(ext_out[j].data >= payload && ext_out[j].data + ext_out[j].len <= payload + len,
+            "expected data to be within packet");
+        }
+        /* If parsing succeeds, check to see if we can round-trip these
+            extensions. */
+        if (result == OAC_OK) {
+            oac_extension_data ext_out2[MAX_NB_EXTENSIONS];
+            unsigned char payload2[MAX_EXTENSION_SIZE + 1];
+            oac_int32 nb_frame_exts[48];
+            oac_int32 nb_ext_out;
+            len = oac_packet_extensions_generate(payload2, sizeof(payload2),
           ext_out, nb_ext, nb_frames, 0);
-         expect_true(len >= 0, "expected extension generation to succeed");
-         result = oac_packet_extensions_count_ext(payload2, len,
+            expect_true(len >= 0, "expected extension generation to succeed");
+            result = oac_packet_extensions_count_ext(payload2, len,
           nb_frame_exts, nb_frames);
-         expect_true(result == nb_ext, "expected extension count to match");
-         nb_ext_out = MAX_NB_EXTENSIONS;
-         result = oac_packet_extensions_parse_ext(payload2, len, ext_out2,
+            expect_true(result == nb_ext, "expected extension count to match");
+            nb_ext_out = MAX_NB_EXTENSIONS;
+            result = oac_packet_extensions_parse_ext(payload2, len, ext_out2,
           &nb_ext_out, nb_frame_exts, nb_frames);
-         expect_true(result == OAC_OK,
+            expect_true(result == OAC_OK,
           "expected extension parsing to succeed");
-         expect_true(nb_ext == nb_ext_out,
+            expect_true(nb_ext == nb_ext_out,
           "expected extension count to match");
-         check_ext_data(ext_out, ext_out2, nb_ext);
-      }
-   }
+            check_ext_data(ext_out, ext_out2, nb_ext);
+        }
+    }
 }
 
-void test_oac_repacketizer_out_range_impl(void)
-{
-   OacRepacketizer rp;
-   unsigned char packet[1024];
-   unsigned char packet_out[1024];
-   oac_int16 size[48];
-   const unsigned char *padding;
-   oac_int32 padding_len;
-   oac_extension_data ext_out[10];
-   int i;
-   oac_int32 nb_ext;
-   int res, len;
-   int first_count = 0, second_count = 0;
-   static const oac_extension_data ext[] = {
-      {33, 0, (const unsigned char *)"abcdefg", 7},
-      {100, 0, (const unsigned char *)"uvwxyz", 6},
-   };
-
-   oac_repacketizer_init(&rp);
-
-   memset(packet, 0, sizeof(packet));
-   /* Hybrid Packet with 20 msec frames, Code 3 */
-   packet[0] = (15 << 3) | 3;
-   /* Code 3, padding bit set, 1 frame */
-   packet[1] = 1 << 6 | 1;
-   packet[2] = 0;
-   packet[3] = 0;
-
-   /* generate 2 extensions, id 33 and 100 */
-   len = oac_packet_extensions_generate(&packet[4], sizeof(packet)-4, ext, 2,
+void test_oac_repacketizer_out_range_impl(void) {
+    OacRepacketizer rp;
+    unsigned char packet[1024];
+    unsigned char packet_out[1024];
+    oac_int16 size[48];
+    const unsigned char *padding;
+    oac_int32 padding_len;
+    oac_extension_data ext_out[10];
+    int i;
+    oac_int32 nb_ext;
+    int res, len;
+    int first_count = 0, second_count = 0;
+    static const oac_extension_data ext[] = {
+        {33, 0, (const unsigned char *)"abcdefg", 7},
+        {100, 0, (const unsigned char *)"uvwxyz", 6},
+    };
+
+    oac_repacketizer_init(&rp);
+
+    memset(packet, 0, sizeof(packet));
+    /* Hybrid Packet with 20 msec frames, Code 3 */
+    packet[0] = (15<<3)|3;
+    /* Code 3, padding bit set, 1 frame */
+    packet[1] = 1<<6|1;
+    packet[2] = 0;
+    packet[3] = 0;
+
+    /* generate 2 extensions, id 33 and 100 */
+    len = oac_packet_extensions_generate(&packet[4], sizeof(packet) - 4, ext, 2,
     1, 0);
-   /* update the padding length */
-   packet[2] = len;
-
-   /* concatenate 3 frames */
-   res = oac_repacketizer_cat(&rp, packet, 4+len);
-   /* for the middle frame, no padding, no extensions */
-   packet[1] = 1;
-   res = oac_repacketizer_cat(&rp, packet, 4);
-   /* switch back to extensions for the last frame extensions */
-   packet[1] = 1 << 6 | 1;
-   res = oac_repacketizer_cat(&rp, packet, 4+len);
-
-   expect_true(rp.nb_frames == 3, "Expected 3 frames");
-   res = oac_repacketizer_out_range_impl(&rp,
+    /* update the padding length */
+    packet[2] = len;
+
+    /* concatenate 3 frames */
+    res = oac_repacketizer_cat(&rp, packet, 4 + len);
+    /* for the middle frame, no padding, no extensions */
+    packet[1] = 1;
+    res = oac_repacketizer_cat(&rp, packet, 4);
+    /* switch back to extensions for the last frame extensions */
+    packet[1] = 1<<6|1;
+    res = oac_repacketizer_cat(&rp, packet, 4 + len);
+
+    expect_true(rp.nb_frames == 3, "Expected 3 frames");
+    res = oac_repacketizer_out_range_impl(&rp,
       0, 3, /* begin, end */
       packet_out, /* unsigned char *data */
       sizeof(packet_out), /* oac_int32 maxlen */
@@ -685,68 +666,60 @@ void test_oac_repacketizer_out_range_impl(void)
       0, /* int pad */
       NULL, /* const oac_extension_data *extensions */
       0 /* int nb_extensions */);
-   expect_true(res > 0, "expected valid packet length");
+    expect_true(res > 0, "expected valid packet length");
 
-   /* now verify that we have the expected extensions */
-   res = oac_packet_parse_impl(packet_out, res, 0, NULL, NULL, size,
+    /* now verify that we have the expected extensions */
+    res = oac_packet_parse_impl(packet_out, res, 0, NULL, NULL, size,
       NULL, NULL, &padding, &padding_len);
-   nb_ext = 10;
-   res = oac_packet_extensions_parse(padding, padding_len, ext_out, &nb_ext,
+    nb_ext = 10;
+    res = oac_packet_extensions_parse(padding, padding_len, ext_out, &nb_ext,
     3);
-   expect_true(nb_ext == 4, "Expected 4 extensions");
-   for (i = 0 ; i < nb_ext; i++)
-   {
-      if (ext_out[i].id == 33)
-      {
-         oac_test_assert(ext_out[i].len == ext[0].len);
-         oac_test_assert(0 == memcmp(ext_out[i].data, ext[0].data, ext[0].len));
-         first_count++;
-      }
-      else if (ext_out[i].id == 100)
-      {
-         oac_test_assert(ext_out[i].len == ext[1].len);
-         oac_test_assert(0 == memcmp(ext_out[i].data, ext[1].data, ext[1].len));
-         second_count++;
-      }
-      if (i < 2)
-      {
-         oac_test_assert(ext_out[i].frame == 0);
-      } else {
-         oac_test_assert(ext_out[i].frame == 2);
-      }
-   }
-   oac_test_assert(first_count == 2);
-   oac_test_assert(second_count == 2);
+    expect_true(nb_ext == 4, "Expected 4 extensions");
+    for (i = 0 ; i < nb_ext; i++) {
+        if (ext_out[i].id == 33) {
+            oac_test_assert(ext_out[i].len == ext[0].len);
+            oac_test_assert(0 == memcmp(ext_out[i].data, ext[0].data, ext[0].len));
+            first_count++;
+        } else if (ext_out[i].id == 100) {
+            oac_test_assert(ext_out[i].len == ext[1].len);
+            oac_test_assert(0 == memcmp(ext_out[i].data, ext[1].data, ext[1].len));
+            second_count++;
+        }
+        if (i < 2) {
+            oac_test_assert(ext_out[i].frame == 0);
+        } else {
+            oac_test_assert(ext_out[i].frame == 2);
+        }
+    }
+    oac_test_assert(first_count == 2);
+    oac_test_assert(second_count == 2);
 }
 
-int main(int argc, char **argv)
-{
-   int env_used;
-   char *env_seed;
-   env_used=0;
-   env_seed=getenv("SEED");
-   if(argc>1)iseed=atoi(argv[1]);
-   else if(env_seed)
-   {
-      iseed=atoi(env_seed);
-      env_used=1;
-   }
-   else iseed=(oac_uint32)time(NULL)^(((oac_uint32)getpid()&65535)<<16);
-   Rw=Rz=iseed;
-
-   fprintf(stderr,"Testing extensions. Random seed: %u (%.4X)\n", iseed, fast_rand() % 65535);
-   if(env_used)fprintf(stderr,"  Random seed set from the environment (SEED=%s).\n", env_seed);
-
-   test_extensions_generate_success();
-   test_extensions_generate_zero();
-   test_extensions_generate_no_padding();
-   test_extensions_generate_fail();
-   test_extensions_parse_success();
-   test_extensions_parse_zero();
-   test_extensions_parse_fail();
-   test_extensions_repeating();
-   test_random_extensions_parse();
-   test_oac_repacketizer_out_range_impl();
-   fprintf(stderr,"Tests completed successfully.\n");
-   return 0;
+int main(int argc, char **argv) {
+    int env_used;
+    char *env_seed;
+    env_used = 0;
+    env_seed = getenv("SEED");
+    if (argc > 1) iseed = atoi(argv[1]);
+    else if (env_seed) {
+        iseed = atoi(env_seed);
+        env_used = 1;
+    } else iseed = (oac_uint32)time(NULL)^(((oac_uint32)getpid()&65535)<<16);
+    Rw = Rz = iseed;
+
+    fprintf(stderr, "Testing extensions. Random seed: %u (%.4X)\n", iseed, fast_rand()%65535);
+    if (env_used) fprintf(stderr, "  Random seed set from the environment (SEED=%s).\n", env_seed);
+
+    test_extensions_generate_success();
+    test_extensions_generate_zero();
+    test_extensions_generate_no_padding();
+    test_extensions_generate_fail();
+    test_extensions_parse_success();
+    test_extensions_parse_zero();
+    test_extensions_parse_fail();
+    test_extensions_repeating();
+    test_random_extensions_parse();
+    test_oac_repacketizer_out_range_impl();
+    fprintf(stderr, "Tests completed successfully.\n");
+    return 0;
 }
diff --git a/tests/test_oac_padding.c b/tests/test_oac_padding.c
index a4e23e0e0..835c53d98 100644
--- a/tests/test_oac_padding.c
+++ b/tests/test_oac_padding.c
@@ -23,14 +23,14 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 /* Check for overflow in reading the padding length.
  * http://lists.xiph.org/pipermail/oac/2012-November/001834.html
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdio.h>
@@ -43,52 +43,50 @@
 #define CHANNELS 2
 #define FRAMESIZE 5760
 
-void test_overflow(void)
-{
-  OacDecoder *decoder;
-  int result;
-  int error;
-
-  unsigned char *in = (unsigned char *)malloc(PACKETSIZE);
-  oac_int16 *out = (oac_int16 *)malloc(FRAMESIZE*CHANNELS*sizeof(*out));
-
-  fprintf(stderr, "  Checking for padding overflow... ");
-  if (!in || !out) {
-    fprintf(stderr, "FAIL (out of memory)\n");
-    test_failed();
-  }
-  in[0] = 0xff;
-  in[1] = 0x41;
-  memset(in + 2, 0xff, PACKETSIZE - 3);
-  in[PACKETSIZE-1] = 0x0b;
-
-  decoder = oac_decoder_create(48000, CHANNELS, &error);
-  result = oac_decode(decoder, in, PACKETSIZE, out, FRAMESIZE, 0);
-  oac_decoder_destroy(decoder);
-
-  free(in);
-  free(out);
-
-  if (result != OAC_INVALID_PACKET) {
-    fprintf(stderr, "FAIL!\n");
-    test_failed();
-  }
-
-  fprintf(stderr, "OK.\n");
+void test_overflow(void) {
+    OacDecoder *decoder;
+    int result;
+    int error;
+
+    unsigned char *in = (unsigned char *)malloc(PACKETSIZE);
+    oac_int16 *out = (oac_int16 *)malloc(FRAMESIZE*CHANNELS*sizeof(*out));
+
+    fprintf(stderr, "  Checking for padding overflow... ");
+    if (!in || !out) {
+        fprintf(stderr, "FAIL (out of memory)\n");
+        test_failed();
+    }
+    in[0] = 0xff;
+    in[1] = 0x41;
+    memset(in + 2, 0xff, PACKETSIZE - 3);
+    in[PACKETSIZE - 1] = 0x0b;
+
+    decoder = oac_decoder_create(48000, CHANNELS, &error);
+    result = oac_decode(decoder, in, PACKETSIZE, out, FRAMESIZE, 0);
+    oac_decoder_destroy(decoder);
+
+    free(in);
+    free(out);
+
+    if (result != OAC_INVALID_PACKET) {
+        fprintf(stderr, "FAIL!\n");
+        test_failed();
+    }
+
+    fprintf(stderr, "OK.\n");
 }
 
-int main(void)
-{
-  const char *oversion;
+int main(void) {
+    const char *oversion;
 
-  iseed = 0;
-  oversion = oac_get_version_string();
-  if (!oversion) test_failed();
-  fprintf(stderr, "Testing %s padding.\n", oversion);
+    iseed = 0;
+    oversion = oac_get_version_string();
+    if (!oversion) test_failed();
+    fprintf(stderr, "Testing %s padding.\n", oversion);
 
-  test_overflow();
+    test_overflow();
 
-  fprintf(stderr, "All padding tests passed.\n");
+    fprintf(stderr, "All padding tests passed.\n");
 
-  return 0;
+    return 0;
 }
diff --git a/tests/test_oac_projection.c b/tests/test_oac_projection.c
index a9b226ced..59e871dfa 100644
--- a/tests/test_oac_projection.c
+++ b/tests/test_oac_projection.c
@@ -23,10 +23,10 @@
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include <stdio.h>
@@ -52,332 +52,314 @@
 #define SIMPLE_MATRIX_OUTPUT_SIZE 40
 
 int assert_is_equal(
-  const oac_res *a, const oac_int16 *b, int size, oac_int16 tolerance)
-{
-  int i;
-  for (i = 0; i < size; i++)
-  {
-    if (abs(RES2INT16(a[i]) - b[i]) > tolerance)
-      return 1;
-  }
-  return 0;
+    const oac_res *a, const oac_int16 *b, int size, oac_int16 tolerance) {
+    int i;
+    for (i = 0; i < size; i++) {
+        if (abs(RES2INT16(a[i]) - b[i]) > tolerance)
+            return 1;
+    }
+    return 0;
 }
 
 int assert_is_equal_short(
-  const oac_int16 *a, const oac_int16 *b, int size, oac_int16 tolerance)
-{
-  int i;
-  for (i = 0; i < size; i++)
-    if (abs(a[i] - b[i]) > tolerance)
-      return 1;
-  return 0;
+    const oac_int16 *a, const oac_int16 *b, int size, oac_int16 tolerance) {
+    int i;
+    for (i = 0; i < size; i++)
+        if (abs(a[i] - b[i]) > tolerance)
+            return 1;
+    return 0;
 }
 
-void test_simple_matrix(void)
-{
-  const MappingMatrix simple_matrix_params = {4, 3, 0};
-  const oac_int16 simple_matrix_data[SIMPLE_MATRIX_SIZE] = {0, 32767, 0, 0, 32767, 0, 0, 0, 0, 0, 0, 32767};
-  const oac_int16 input_int16[SIMPLE_MATRIX_INPUT_SIZE] = {
-    32767, 0, -32768, 29491, -3277, -29491, 26214, -6554, -26214, 22938, -9830,
-    -22938, 19661, -13107, -19661, 16384, -16384, -16384, 13107, -19661, -13107,
-    9830, -22938, -9830, 6554, -26214, -6554, 3277, -29491, -3277};
-  const oac_int16 expected_output_int16[SIMPLE_MATRIX_OUTPUT_SIZE] = {
-    0, 32767, 0, -32768, -3277, 29491, 0, -29491, -6554, 26214, 0, -26214,
-    -9830, 22938, 0, -22938, -13107, 19661, 0, -19661, -16384, 16384, 0, -16384,
-    -19661, 13107, 0, -13107, -22938, 9830, 0, -9830, -26214, 6554, 0, -6554,
-    -29491, 3277, 0, -3277};
-
-  int i, ret;
-  oac_int32 simple_matrix_size;
-  oac_res *input_pcm;
-  oac_res *output_pcm;
-  oac_int16 *output_int16;
-  MappingMatrix *simple_matrix;
-
-  /* Allocate input/output buffers. */
-  input_pcm = (oac_res *)oac_alloc(sizeof(oac_res) * SIMPLE_MATRIX_INPUT_SIZE);
-  output_int16 = (oac_int16 *)oac_alloc(sizeof(oac_int16) * SIMPLE_MATRIX_OUTPUT_SIZE);
-  output_pcm = (oac_res *)oac_alloc(sizeof(oac_res) * SIMPLE_MATRIX_OUTPUT_SIZE);
-
-  /* Initialize matrix */
-  simple_matrix_size = mapping_matrix_get_size(simple_matrix_params.rows,
+void test_simple_matrix(void) {
+    const MappingMatrix simple_matrix_params = {4, 3, 0};
+    const oac_int16 simple_matrix_data[SIMPLE_MATRIX_SIZE] = {0, 32767, 0, 0, 32767, 0, 0, 0, 0, 0, 0, 32767};
+    const oac_int16 input_int16[SIMPLE_MATRIX_INPUT_SIZE] = {
+        32767, 0, -32768, 29491, -3277, -29491, 26214, -6554, -26214, 22938, -9830,
+        -22938, 19661, -13107, -19661, 16384, -16384, -16384, 13107, -19661, -13107,
+        9830, -22938, -9830, 6554, -26214, -6554, 3277, -29491, -3277
+    };
+    const oac_int16 expected_output_int16[SIMPLE_MATRIX_OUTPUT_SIZE] = {
+        0, 32767, 0, -32768, -3277, 29491, 0, -29491, -6554, 26214, 0, -26214,
+        -9830, 22938, 0, -22938, -13107, 19661, 0, -19661, -16384, 16384, 0, -16384,
+        -19661, 13107, 0, -13107, -22938, 9830, 0, -9830, -26214, 6554, 0, -6554,
+        -29491, 3277, 0, -3277
+    };
+
+    int i, ret;
+    oac_int32 simple_matrix_size;
+    oac_res *input_pcm;
+    oac_res *output_pcm;
+    oac_int16 *output_int16;
+    MappingMatrix *simple_matrix;
+
+    /* Allocate input/output buffers. */
+    input_pcm = (oac_res *)oac_alloc(sizeof(oac_res)*SIMPLE_MATRIX_INPUT_SIZE);
+    output_int16 = (oac_int16 *)oac_alloc(sizeof(oac_int16)*SIMPLE_MATRIX_OUTPUT_SIZE);
+    output_pcm = (oac_res *)oac_alloc(sizeof(oac_res)*SIMPLE_MATRIX_OUTPUT_SIZE);
+
+    /* Initialize matrix */
+    simple_matrix_size = mapping_matrix_get_size(simple_matrix_params.rows,
     simple_matrix_params.cols);
-  if (!simple_matrix_size)
-    test_failed();
+    if (!simple_matrix_size)
+        test_failed();
 
-  simple_matrix = (MappingMatrix *)oac_alloc(simple_matrix_size);
-  mapping_matrix_init(simple_matrix, simple_matrix_params.rows,
+    simple_matrix = (MappingMatrix *)oac_alloc(simple_matrix_size);
+    mapping_matrix_init(simple_matrix, simple_matrix_params.rows,
     simple_matrix_params.cols, simple_matrix_params.gain, simple_matrix_data,
     sizeof(simple_matrix_data));
 
-  /* Copy inputs. */
-  for (i = 0; i < SIMPLE_MATRIX_INPUT_SIZE; i++)
-  {
-    input_pcm[i] = INT16TORES(input_int16[i]);
-  }
-
-  /* _in_short */
-  for (i = 0; i < SIMPLE_MATRIX_OUTPUT_SIZE; i++)
-    output_pcm[i] = 0;
-  for (i = 0; i < simple_matrix->rows; i++)
-  {
-    mapping_matrix_multiply_channel_in_short(simple_matrix,
+    /* Copy inputs. */
+    for (i = 0; i < SIMPLE_MATRIX_INPUT_SIZE; i++) {
+        input_pcm[i] = INT16TORES(input_int16[i]);
+    }
+
+    /* _in_short */
+    for (i = 0; i < SIMPLE_MATRIX_OUTPUT_SIZE; i++)
+        output_pcm[i] = 0;
+    for (i = 0; i < simple_matrix->rows; i++) {
+        mapping_matrix_multiply_channel_in_short(simple_matrix,
       input_int16, simple_matrix->cols, &output_pcm[i], i,
       simple_matrix->rows, SIMPLE_MATRIX_FRAME_SIZE);
-  }
-  ret = assert_is_equal(output_pcm, expected_output_int16, SIMPLE_MATRIX_OUTPUT_SIZE, ERROR_TOLERANCE);
-  if (ret)
-    test_failed();
-
-  /* _out_short */
-  for (i = 0; i < SIMPLE_MATRIX_OUTPUT_SIZE; i++)
-    output_int16[i] = 0;
-  for (i = 0; i < simple_matrix->cols; i++)
-  {
-    mapping_matrix_multiply_channel_out_short(simple_matrix,
+    }
+    ret = assert_is_equal(output_pcm, expected_output_int16, SIMPLE_MATRIX_OUTPUT_SIZE, ERROR_TOLERANCE);
+    if (ret)
+        test_failed();
+
+    /* _out_short */
+    for (i = 0; i < SIMPLE_MATRIX_OUTPUT_SIZE; i++)
+        output_int16[i] = 0;
+    for (i = 0; i < simple_matrix->cols; i++) {
+        mapping_matrix_multiply_channel_out_short(simple_matrix,
       &input_pcm[i], i, simple_matrix->cols, output_int16,
       simple_matrix->rows, SIMPLE_MATRIX_FRAME_SIZE);
-  }
-  ret = assert_is_equal_short(output_int16, expected_output_int16, SIMPLE_MATRIX_OUTPUT_SIZE, ERROR_TOLERANCE);
-  if (ret)
-    test_failed();
+    }
+    ret = assert_is_equal_short(output_int16, expected_output_int16, SIMPLE_MATRIX_OUTPUT_SIZE, ERROR_TOLERANCE);
+    if (ret)
+        test_failed();
 
 #if !defined(DISABLE_FLOAT_API) && !defined(FIXED_POINT)
-  /* _in_float */
-  for (i = 0; i < SIMPLE_MATRIX_OUTPUT_SIZE; i++)
-    output_pcm[i] = 0;
-  for (i = 0; i < simple_matrix->rows; i++)
-  {
-    mapping_matrix_multiply_channel_in_float(simple_matrix,
+    /* _in_float */
+    for (i = 0; i < SIMPLE_MATRIX_OUTPUT_SIZE; i++)
+        output_pcm[i] = 0;
+    for (i = 0; i < simple_matrix->rows; i++) {
+        mapping_matrix_multiply_channel_in_float(simple_matrix,
       input_pcm, simple_matrix->cols, &output_pcm[i], i,
       simple_matrix->rows, SIMPLE_MATRIX_FRAME_SIZE);
-  }
-  ret = assert_is_equal(output_pcm, expected_output_int16, SIMPLE_MATRIX_OUTPUT_SIZE, ERROR_TOLERANCE);
-  if (ret)
-    test_failed();
-
-  /* _out_float */
-  for (i = 0; i < SIMPLE_MATRIX_OUTPUT_SIZE; i++)
-    output_pcm[i] = 0;
-  for (i = 0; i < simple_matrix->cols; i++)
-  {
-    mapping_matrix_multiply_channel_out_float(simple_matrix,
+    }
+    ret = assert_is_equal(output_pcm, expected_output_int16, SIMPLE_MATRIX_OUTPUT_SIZE, ERROR_TOLERANCE);
+    if (ret)
+        test_failed();
+
+    /* _out_float */
+    for (i = 0; i < SIMPLE_MATRIX_OUTPUT_SIZE; i++)
+        output_pcm[i] = 0;
+    for (i = 0; i < simple_matrix->cols; i++) {
+        mapping_matrix_multiply_channel_out_float(simple_matrix,
       &input_pcm[i], i, simple_matrix->cols, output_pcm,
       simple_matrix->rows, SIMPLE_MATRIX_FRAME_SIZE);
-  }
-  ret = assert_is_equal(output_pcm, expected_output_int16, SIMPLE_MATRIX_OUTPUT_SIZE, ERROR_TOLERANCE);
-  if (ret)
-    test_failed();
+    }
+    ret = assert_is_equal(output_pcm, expected_output_int16, SIMPLE_MATRIX_OUTPUT_SIZE, ERROR_TOLERANCE);
+    if (ret)
+        test_failed();
 #endif
 
-  oac_free(input_pcm);
-  oac_free(output_int16);
-  oac_free(output_pcm);
-  oac_free(simple_matrix);
+    oac_free(input_pcm);
+    oac_free(output_int16);
+    oac_free(output_pcm);
+    oac_free(simple_matrix);
 }
 
-void test_creation_arguments(const int channels, const int mapping_family)
-{
-  int streams;
-  int coupled_streams;
-  int enc_error;
-  int dec_error;
-  int ret;
-  OacProjectionEncoder *st_enc = NULL;
-  OacProjectionDecoder *st_dec = NULL;
+void test_creation_arguments(const int channels, const int mapping_family) {
+    int streams;
+    int coupled_streams;
+    int enc_error;
+    int dec_error;
+    int ret;
+    OacProjectionEncoder *st_enc = NULL;
+    OacProjectionDecoder *st_dec = NULL;
 
-  const oac_int32 Fs = 48000;
-  const int application = OAC_APPLICATION_AUDIO;
+    const oac_int32 Fs = 48000;
+    const int application = OAC_APPLICATION_AUDIO;
 
-  int order_plus_one = (int)floor(sqrt((float)channels));
-  int nondiegetic_channels = channels - order_plus_one * order_plus_one;
+    int order_plus_one = (int)floor(sqrt((float)channels));
+    int nondiegetic_channels = channels - order_plus_one*order_plus_one;
 
-  int is_channels_valid = 0;
-  int is_projection_valid = 0;
+    int is_channels_valid = 0;
+    int is_projection_valid = 0;
 
-  st_enc = oac_projection_ambisonics_encoder_create(Fs, channels,
+    st_enc = oac_projection_ambisonics_encoder_create(Fs, channels,
     mapping_family, &streams, &coupled_streams, application, &enc_error);
-  if (st_enc != NULL)
-  {
-    oac_int32 matrix_size;
-    unsigned char *matrix;
+    if (st_enc != NULL) {
+        oac_int32 matrix_size;
+        unsigned char *matrix;
 
-    ret = oac_projection_encoder_ctl(st_enc,
+        ret = oac_projection_encoder_ctl(st_enc,
       OAC_PROJECTION_GET_DEMIXING_MATRIX_SIZE_REQUEST, &matrix_size);
-    if (ret != OAC_OK || !matrix_size)
-      test_failed();
+        if (ret != OAC_OK || !matrix_size)
+            test_failed();
 
-    matrix = (unsigned char *)oac_alloc(matrix_size);
-    ret = oac_projection_encoder_ctl(st_enc,
+        matrix = (unsigned char *)oac_alloc(matrix_size);
+        ret = oac_projection_encoder_ctl(st_enc,
       OAC_PROJECTION_GET_DEMIXING_MATRIX_REQUEST, matrix, matrix_size);
 
-    oac_projection_encoder_destroy(st_enc);
+        oac_projection_encoder_destroy(st_enc);
 
-    st_dec = oac_projection_decoder_create(Fs, channels, streams,
+        st_dec = oac_projection_decoder_create(Fs, channels, streams,
       coupled_streams, matrix, matrix_size, &dec_error);
-    if (st_dec != NULL)
-    {
-      oac_projection_decoder_destroy(st_dec);
+        if (st_dec != NULL) {
+            oac_projection_decoder_destroy(st_dec);
+        }
+        oac_free(matrix);
     }
-    oac_free(matrix);
-  }
-
-  is_channels_valid = (order_plus_one >= 2 && order_plus_one <= 6) &&
-    (nondiegetic_channels == 0 || nondiegetic_channels == 2);
-  is_projection_valid = (enc_error == OAC_OK && dec_error == OAC_OK);
-  if (is_channels_valid ^ is_projection_valid)
-  {
-    fprintf(stderr, "Channels: %d, Family: %d\n", channels, mapping_family);
-    fprintf(stderr, "Order+1: %d, Non-diegetic Channels: %d\n",
+
+    is_channels_valid = (order_plus_one >= 2 && order_plus_one <= 6)
+                        && (nondiegetic_channels == 0 || nondiegetic_channels == 2);
+    is_projection_valid = (enc_error == OAC_OK && dec_error == OAC_OK);
+    if (is_channels_valid^is_projection_valid) {
+        fprintf(stderr, "Channels: %d, Family: %d\n", channels, mapping_family);
+        fprintf(stderr, "Order+1: %d, Non-diegetic Channels: %d\n",
       order_plus_one, nondiegetic_channels);
-    fprintf(stderr, "Streams: %d, Coupled Streams: %d\n",
+        fprintf(stderr, "Streams: %d, Coupled Streams: %d\n",
       streams, coupled_streams);
-    test_failed();
-  }
+        test_failed();
+    }
 }
 
-void generate_music(short *buf, oac_int32 len, oac_int32 channels)
-{
-   oac_int32 i,j,k;
-   oac_int32 *a,*b,*c,*d;
-   a = (oac_int32 *)malloc(sizeof(oac_int32) * channels);
-   b = (oac_int32 *)malloc(sizeof(oac_int32) * channels);
-   c = (oac_int32 *)malloc(sizeof(oac_int32) * channels);
-   d = (oac_int32 *)malloc(sizeof(oac_int32) * channels);
-   memset(a, 0, sizeof(oac_int32) * channels);
-   memset(b, 0, sizeof(oac_int32) * channels);
-   memset(c, 0, sizeof(oac_int32) * channels);
-   memset(d, 0, sizeof(oac_int32) * channels);
-   j=0;
-
-   for(i=0;i<len;i++)
-   {
-     for(k=0;k<channels;k++)
-     {
-      oac_uint32 r;
-      oac_int32 v;
-      v=(((j*((j>>12)^((j>>10|j>>12)&26&j>>7)))&128)+128)<<15;
-      r=fast_rand();v+=r&65535;v-=r>>16;
-      b[k]=v-a[k]+((b[k]*61+32)>>6);a[k]=v;
-      c[k]=(30*(c[k]+b[k]+d[k])+32)>>6;d[k]=b[k];
-      v=(c[k]+128)>>8;
-      buf[i*channels+k]=v>32767?32767:(v<-32768?-32768:v);
-      if(i%6==0)j++;
-     }
-   }
-
-   free(a);
-   free(b);
-   free(c);
-   free(d);
+void generate_music(short *buf, oac_int32 len, oac_int32 channels) {
+    oac_int32 i, j, k;
+    oac_int32 *a, *b, *c, *d;
+    a = (oac_int32 *)malloc(sizeof(oac_int32)*channels);
+    b = (oac_int32 *)malloc(sizeof(oac_int32)*channels);
+    c = (oac_int32 *)malloc(sizeof(oac_int32)*channels);
+    d = (oac_int32 *)malloc(sizeof(oac_int32)*channels);
+    memset(a, 0, sizeof(oac_int32)*channels);
+    memset(b, 0, sizeof(oac_int32)*channels);
+    memset(c, 0, sizeof(oac_int32)*channels);
+    memset(d, 0, sizeof(oac_int32)*channels);
+    j = 0;
+
+    for (i = 0; i < len; i++) {
+        for (k = 0; k < channels; k++) {
+            oac_uint32 r;
+            oac_int32 v;
+            v = (((j*((j>>12)^((j>>10|j>>12)&26&j>>7)))&128) + 128)<<15;
+            r = fast_rand(); v += r&65535; v -= r>>16;
+            b[k] = v - a[k] + ((b[k]*61 + 32)>>6); a[k] = v;
+            c[k] = (30*(c[k] + b[k] + d[k]) + 32)>>6; d[k] = b[k];
+            v = (c[k] + 128)>>8;
+            buf[i*channels + k] = v > 32767?32767:(v < -32768?-32768:v);
+            if (i%6 == 0) j++;
+        }
+    }
+
+    free(a);
+    free(b);
+    free(c);
+    free(d);
 }
 
 void test_encode_decode(oac_int32 bitrate, oac_int32 channels,
-                        const int mapping_family)
-{
-  const oac_int32 Fs = 48000;
-  const int application = OAC_APPLICATION_AUDIO;
-
-  OacProjectionEncoder *st_enc;
-  OacProjectionDecoder *st_dec;
-  int streams;
-  int coupled;
-  int error;
-  short *buffer_in;
-  short *buffer_out;
-  unsigned char data[MAX_DATA_BYTES] = { 0 };
-  int len;
-  int out_samples;
-  oac_int32 matrix_size = 0;
-  unsigned char *matrix = NULL;
-
-  buffer_in = (short *)malloc(sizeof(short) * BUFFER_SIZE * channels);
-  buffer_out = (short *)malloc(sizeof(short) * BUFFER_SIZE * channels);
-
-  st_enc = oac_projection_ambisonics_encoder_create(Fs, channels,
+                        const int mapping_family) {
+    const oac_int32 Fs = 48000;
+    const int application = OAC_APPLICATION_AUDIO;
+
+    OacProjectionEncoder *st_enc;
+    OacProjectionDecoder *st_dec;
+    int streams;
+    int coupled;
+    int error;
+    short *buffer_in;
+    short *buffer_out;
+    unsigned char data[MAX_DATA_BYTES] = { 0 };
+    int len;
+    int out_samples;
+    oac_int32 matrix_size = 0;
+    unsigned char *matrix = NULL;
+
+    buffer_in = (short *)malloc(sizeof(short)*BUFFER_SIZE*channels);
+    buffer_out = (short *)malloc(sizeof(short)*BUFFER_SIZE*channels);
+
+    st_enc = oac_projection_ambisonics_encoder_create(Fs, channels,
     mapping_family, &streams, &coupled, application, &error);
-  if (error != OAC_OK) {
-    fprintf(stderr,
+    if (error != OAC_OK) {
+        fprintf(stderr,
       "Couldn\'t create encoder with %d channels and mapping family %d.\n",
       channels, mapping_family);
-    free(buffer_in);
-    free(buffer_out);
-    test_failed();
-  }
+        free(buffer_in);
+        free(buffer_out);
+        test_failed();
+    }
 
-  error = oac_projection_encoder_ctl(st_enc,
-    OAC_SET_BITRATE(bitrate * 1000 * (streams + coupled)));
-  if (error != OAC_OK)
-  {
-    goto bad_cleanup;
-  }
+    error = oac_projection_encoder_ctl(st_enc,
+    OAC_SET_BITRATE(bitrate*1000*(streams + coupled)));
+    if (error != OAC_OK) {
+        goto bad_cleanup;
+    }
 
-  error = oac_projection_encoder_ctl(st_enc,
+    error = oac_projection_encoder_ctl(st_enc,
     OAC_PROJECTION_GET_DEMIXING_MATRIX_SIZE_REQUEST, &matrix_size);
-  if (error != OAC_OK || !matrix_size)
-  {
-    goto bad_cleanup;
-  }
+    if (error != OAC_OK || !matrix_size) {
+        goto bad_cleanup;
+    }
 
-  matrix = (unsigned char *)oac_alloc(matrix_size);
-  error = oac_projection_encoder_ctl(st_enc,
+    matrix = (unsigned char *)oac_alloc(matrix_size);
+    error = oac_projection_encoder_ctl(st_enc,
     OAC_PROJECTION_GET_DEMIXING_MATRIX_REQUEST, matrix, matrix_size);
 
-  st_dec = oac_projection_decoder_create(Fs, channels, streams, coupled,
+    st_dec = oac_projection_decoder_create(Fs, channels, streams, coupled,
     matrix, matrix_size, &error);
-  oac_free(matrix);
+    oac_free(matrix);
 
-  if (error != OAC_OK) {
-    fprintf(stderr,
+    if (error != OAC_OK) {
+        fprintf(stderr,
       "Couldn\'t create decoder with %d channels, %d streams "
       "and %d coupled streams.\n", channels, streams, coupled);
-    goto bad_cleanup;
-  }
+        goto bad_cleanup;
+    }
 
-  generate_music(buffer_in, BUFFER_SIZE, channels);
+    generate_music(buffer_in, BUFFER_SIZE, channels);
 
-  len = oac_projection_encode(
+    len = oac_projection_encode(
     st_enc, buffer_in, BUFFER_SIZE, data, MAX_DATA_BYTES);
-  if(len<0 || len>MAX_DATA_BYTES) {
-    fprintf(stderr,"oac_encode() returned %d\n", len);
-    goto bad_cleanup;
-  }
+    if (len < 0 || len > MAX_DATA_BYTES) {
+        fprintf(stderr, "oac_encode() returned %d\n", len);
+        goto bad_cleanup;
+    }
 
-  out_samples = oac_projection_decode(
+    out_samples = oac_projection_decode(
     st_dec, data, len, buffer_out, MAX_FRAME_SAMPLES, 0);
-  if(out_samples!=BUFFER_SIZE) {
-    fprintf(stderr,"oac_decode() returned %d\n", out_samples);
-    goto bad_cleanup;
-  }
-
-  oac_projection_decoder_destroy(st_dec);
-  oac_projection_encoder_destroy(st_enc);
-  free(buffer_in);
-  free(buffer_out);
-  return;
+    if (out_samples != BUFFER_SIZE) {
+        fprintf(stderr, "oac_decode() returned %d\n", out_samples);
+        goto bad_cleanup;
+    }
+
+    oac_projection_decoder_destroy(st_dec);
+    oac_projection_encoder_destroy(st_enc);
+    free(buffer_in);
+    free(buffer_out);
+    return;
 bad_cleanup:
-  free(buffer_in);
-  free(buffer_out);
-  test_failed();
+    free(buffer_in);
+    free(buffer_out);
+    test_failed();
 }
 
-int main(int _argc, char **_argv)
-{
-  unsigned int i;
+int main(int _argc, char **_argv) {
+    unsigned int i;
 
-  (void)_argc;
-  (void)_argv;
+    (void)_argc;
+    (void)_argv;
 
-  /* Test simple matrix multiplication routines. */
-  test_simple_matrix();
+    /* Test simple matrix multiplication routines. */
+    test_simple_matrix();
 
-  /* Test full range of channels in creation arguments. */
-  for (i = 0; i < 255; i++)
-    test_creation_arguments(i, 3);
+    /* Test full range of channels in creation arguments. */
+    for (i = 0; i < 255; i++)
+        test_creation_arguments(i, 3);
 
-  /* Test encode/decode pipeline. */
-  test_encode_decode(64 * 18, 18, 3);
+    /* Test encode/decode pipeline. */
+    test_encode_decode(64*18, 18, 3);
 
-  fprintf(stderr, "All projection tests passed.\n");
-  return 0;
+    fprintf(stderr, "All projection tests passed.\n");
+    return 0;
 }

From 520f8ce677dc611589c42bd87ce00198486d6ed1 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jeanmarcv@google.com>
Date: Tue, 13 Jan 2026 16:04:05 -0500
Subject: [PATCH 09/28] Remove pre-rfc8251 compatibility

---
 celt/bands.c            | 13 -------------
 celt/celt_decoder.c     |  4 ----
 configure.ac            |  9 ---------
 tests/oac_build_test.sh |  5 ++---
 tests/random_config.sh  | 10 ++--------
 5 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/celt/bands.c b/celt/bands.c
index f97b1d613..eceb44f8c 100644
--- a/celt/bands.c
+++ b/celt/bands.c
@@ -1363,7 +1363,6 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
     return cm;
 }
 
-#ifndef DISABLE_UPDATE_DRAFT
 static void special_hybrid_folding(const CELTMode *m, celt_norm *norm, celt_norm *norm2, int start, int M,
                                    int dual_stereo) {
     int n1, n2;
@@ -1376,7 +1375,6 @@ static void special_hybrid_folding(const CELTMode *m, celt_norm *norm, celt_norm
     if (dual_stereo)
         OAC_COPY(&norm2[n1], &norm2[2*n1 - n2], n2 - n1);
 }
-#endif
 
 void quant_all_bands(int encode, const CELTMode *m, int start, int end,
                      celt_norm *X_, celt_norm *Y_, unsigned char *collapse_masks,
@@ -1492,16 +1490,11 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
             b = 0;
         }
 
-#ifndef DISABLE_UPDATE_DRAFT
         if (resynth && (M*eBands[i] - N >= M*eBands[start] || i == start + 1)
             && (update_lowband || lowband_offset == 0))
             lowband_offset = i;
         if (i == start + 1)
             special_hybrid_folding(m, norm, norm2, start, M, dual_stereo);
-#else
-        if (resynth && M*eBands[i] - N >= M*eBands[start] && (update_lowband || lowband_offset == 0))
-            lowband_offset = i;
-#endif
 
         tf_change = tf_res[i];
         ctx.tf_change = tf_change;
@@ -1525,11 +1518,7 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
             fold_start = lowband_offset;
             while (M*eBands[--fold_start] > effective_lowband + norm_offset) ;
             fold_end = lowband_offset - 1;
-#ifndef DISABLE_UPDATE_DRAFT
             while (++fold_end < i && M*eBands[fold_end] < effective_lowband + norm_offset + N) ;
-#else
-            while (M*eBands[++fold_end] < effective_lowband + norm_offset + N) ;
-#endif
             x_cm = y_cm = 0;
             fold_i = fold_start; do {
                 x_cm |= collapse_masks[fold_i*C + 0];
@@ -1601,10 +1590,8 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
                     ctx = ctx_save;
                     OAC_COPY(X, X_save, N);
                     OAC_COPY(Y, Y_save, N);
-#ifndef DISABLE_UPDATE_DRAFT
                     if (i == start + 1)
                         special_hybrid_folding(m, norm, norm2, start, M, dual_stereo);
-#endif
                     /* Encode and round up. */
                     ctx.theta_round = 1;
                     x_cm = quant_band_stereo(&ctx, X, Y, N, b, B,
diff --git a/celt/celt_decoder.c b/celt/celt_decoder.c
index 79ca65538..5ff6993e9 100644
--- a/celt/celt_decoder.c
+++ b/celt/celt_decoder.c
@@ -246,11 +246,7 @@ OAC_CUSTOM_NOSTATIC int oac_custom_decoder_init(CELTDecoder *st, const CELTMode
     st->start = 0;
     st->end = st->mode->effEBands;
     st->signalling = 1;
-#ifndef DISABLE_UPDATE_DRAFT
     st->disable_inv = channels == 1;
-#else
-    st->disable_inv = 0;
-#endif
     st->arch = oac_select_arch();
 
 #ifdef ENABLE_QEXT
diff --git a/configure.ac b/configure.ac
index bcd4be4d8..c2de9f3c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -975,15 +975,6 @@ AC_ARG_ENABLE([extra-programs],
 AM_CONDITIONAL([EXTRA_PROGRAMS], [test "$enable_extra_programs" = "yes"])
 
 
-AC_ARG_ENABLE([rfc8251],
-	      AS_HELP_STRING([--disable-rfc8251], [disable bitstream fixes from RFC 8251]),,
-  [enable_rfc8251=yes])
-
-AS_IF([test "$enable_rfc8251" = "no"], [
-       AC_DEFINE([DISABLE_UPDATE_DRAFT], [1], [Disable bitstream fixes from RFC 8251])
-])
-
-
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -fvisibility=hidden"
 AC_MSG_CHECKING([if ${CC} supports -fvisibility=hidden])
diff --git a/tests/oac_build_test.sh b/tests/oac_build_test.sh
index f3c659f81..9b8600e0d 100755
--- a/tests/oac_build_test.sh
+++ b/tests/oac_build_test.sh
@@ -2,8 +2,7 @@
 
 tarball=`realpath "$1"`
 nb_tests="$2"
-oldvectors=`realpath "$3"`
-newvectors=`realpath "$4"`
+vectors=`realpath "$3"`
 base=`basename "$tarball" .tar.gz`
 
 tar xvzf "$tarball" > /dev/null 2>&1
@@ -18,7 +17,7 @@ fi
 mkdir build_tests
 
 configure_dir=`pwd`
-seq -w "$nb_tests" | parallel --halt now,fail=10 -j +2 -q ../random_config.sh "build_tests/run_{}" "$configure_dir" "$oldvectors" "$newvectors"
+seq -w "$nb_tests" | parallel --halt now,fail=10 -j +2 -q ../random_config.sh "build_tests/run_{}" "$configure_dir" "$vectors"
 
 if [ $? -ne 0 ]
 then
diff --git a/tests/random_config.sh b/tests/random_config.sh
index b81e59328..48db5f19d 100755
--- a/tests/random_config.sh
+++ b/tests/random_config.sh
@@ -64,19 +64,13 @@ assert=`echo -e "\n--enable-assertions" | shuf -n1`
 harden=`echo -e "\n--enable-hardening\n--disable-hardening" | shuf -n1`
 fuzz=`echo -e "\n--enable-fuzzing" | shuf -n1`
 checkasm=`echo -e "\n--enable-check-asm" | shuf -n1`
-rfc8251=`echo -e "\n--disable-rfc8251" | shuf -n1`
 lossgen=`echo -e "\n--enable-lossgen" | shuf -n1`
 
-if [ "$rfc8251" = --disable-rfc8251 ]
-then
-        vectors="$3"
-else
-        vectors="$4"
-fi
+vectors="$3"
 echo using testvectors at "$vectors" >> "$config"
 
 
-config_opt="$lib $arithmetic $custom $res $asm $assert $harden $fuzz $checkasm $rfc8251 $approx $lossgen"
+config_opt="$lib $arithmetic $custom $res $asm $assert $harden $fuzz $checkasm $approx $lossgen"
 
 echo configure $config_opt >> "$config"
 

From b65aabe19e9cf1400c3291251bd7db0e39149044 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jeanmarcv@google.com>
Date: Wed, 14 Jan 2026 11:57:41 -0500
Subject: [PATCH 10/28] README update

---
 README | 94 ++++++++++------------------------------------------------
 1 file changed, 16 insertions(+), 78 deletions(-)

diff --git a/README b/README
index bcf2376db..21ed3b397 100644
--- a/README
+++ b/README
@@ -1,67 +1,15 @@
-== Opus audio codec ==
+== OAC audio codec ==
 
-Opus is a codec for interactive speech and audio transmission over the Internet.
+OAC is the Alliance for Open Media's planned successor to Opus. It is
+currently a work in progress.
 
-  Opus can handle a wide range of interactive audio applications, including
-Voice over IP, videoconferencing, in-game  chat, and even remote live music
-performances. It can scale from low bit-rate narrowband speech to very high
-quality stereo music.
-
-  Opus, when coupled with an appropriate container format, is also suitable
-for non-realtime  stored-file applications such as music distribution, game
-soundtracks, portable music players, jukeboxes, and other applications that
-have historically used high latency formats such as MP3, AAC, or Vorbis.
-
-                    Opus is specified by IETF RFC 6716:
-                    https://tools.ietf.org/html/rfc6716
-
-  The Opus format and this implementation of it are subject to the royalty-
-free patent and copyright licenses specified in the file COPYING.
-
-This package implements a shared library for encoding and decoding raw Opus
-bitstreams. Raw Opus bitstreams should be used over RTP according to
- https://tools.ietf.org/html/rfc7587
-
-The package also includes a number of test tools used for testing the
+This package implements a shared library for encoding and decoding raw OAC
+bitstreams. It also includes a number of test tools used for testing the
 correct operation of the library. The bitstreams read/written by these
-tools should not be used for Opus file distribution: They include
+tools should not be used for OAC file distribution: they include
 additional debugging data and cannot support seeking.
 
-Opus stored in files should use the Ogg encapsulation for Opus which is
-described at:
- https://tools.ietf.org/html/rfc7845
-
-An opus-tools package is available which provides encoding and decoding of
-Ogg encapsulated Opus files and includes a number of useful features.
-
-Opus-tools can be found at:
- https://gitlab.xiph.org/xiph/opus-tools.git
-or on the main Opus website:
- https://opus-codec.org/
-
-== Deep Learning and Opus ==
-
-Lossy networks continue to be a challenge for real-time communications.
-While the original implementation of Opus provides an excellent packet loss
-concealment mechanism, the team has continued to advance the methodology used
-to improve audio quality in challenge network environments.
-
-In Opus 1.5, we added a deep learning based redundancy encoder that enhances
-audio in lossy networks by embedding one second of recovery data in the padding
-data of each packet. The underlying algorithm behind encoding and decoding the
-recovery data is called the deep redundancy (DRED) algorithm. By leveraging
-the padding data within the packet, Opus 1.5 is fully backward compatible with
-prior revisions of Opus. Please see the README under the "dnn" subdirectory to
-understand DRED.
-
-DRED was developed by a team that Amazon Web Services initially sponsored,
-who open-sourced the implementation as well as began the
-standardization process at the IETF:
-  https://datatracker.ietf.org/doc/draft-ietf-mlcodec-opus-extension/
-The license behind Opus or the intellectual property position of Opus does
-not change with Opus 1.5.
-
-== Compiling libopus ==
+== Compiling liboac ==
 
 To build from a distribution tarball, you only need to do the following:
 
@@ -90,8 +38,8 @@ On Apple macOS, install Xcode and brew.sh, then in the Terminal enter:
 
 1) Clone the repository:
 
-    % git clone https://gitlab.xiph.org/xiph/opus.git
-    % cd opus
+    % git clone https://github.com/AOMediaCodec/oac.git
+    % cd oac
 
 2) Compiling the source
 
@@ -105,12 +53,12 @@ On x86, it's a good idea to use a -march= option that allows the use of AVX2.
 
     % sudo make install
 
-Once you have compiled the codec, there will be a opus_demo executable
+Once you have compiled the codec, there will be a oac_demo executable
 in the top directory.
 
-Usage: opus_demo [-e] <application> <sampling rate (Hz)> <channels (1/2)>
+Usage: oac_demo [-e] <application> <sampling rate (Hz)> <channels (1/2)>
          <bits per second> [options] <input> <output>
-       opus_demo -d <sampling rate (Hz)> <channels (1/2)> [options]
+       oac_demo -d <sampling rate (Hz)> <channels (1/2)> [options]
          <input> <output>
 
 mode: voip | audio | restricted-lowdelay
@@ -134,8 +82,8 @@ options:
   -dtx              : enable SILK DTX
   -loss <perc>      : simulate packet loss, in percent (0-100); default: 0
 
-input and output are little-endian signed 16-bit PCM files or opus
-bitstreams with simple opus_demo proprietary framing.
+input and output are little-endian signed 16-bit PCM files or OAC
+bitstreams with simple oac_demo custom framing.
 
 == Testing ==
 
@@ -147,17 +95,7 @@ To run the integrated tests:
 
     % make check
 
-There is also collection of standard test vectors which are not
-included in this package for size reasons but can be obtained from:
-https://opus-codec.org/docs/opus_testvectors-rfc8251.tar.gz
-
-To run compare the code to these test vectors:
-
-    % curl -OL https://opus-codec.org/docs/opus_testvectors-rfc8251.tar.gz
-    % tar -zxf opus_testvectors-rfc8251.tar.gz
-    % ./tests/run_vectors.sh ./ opus_newvectors 48000
-
-== Compiling libopus for Windows and alternative build systems ==
+== Compiling liboac for Windows and alternative build systems ==
 
 See cmake/README.md or meson/README.md.
 
@@ -170,7 +108,7 @@ The fixed point implementation has somewhat lower audio quality and is
 slower on platforms with fast FPUs, it is normally only used in embedded
 environments.
 
-The implementation can be compiled with either a C89 or a C99 compiler.
+The implementation can be compiled with any compiler supporting C89 or later.
 While it does not rely on any _undefined behavior_ as defined by C89 or
 C99, it relies on common _implementation-defined behavior_ for two's
 complement architectures:

From 7a9dc21e5d1ed787988ccb6e0a1f8b45bbd6ef7e Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jeanmarcv@google.com>
Date: Wed, 14 Jan 2026 15:04:04 -0500
Subject: [PATCH 11/28] Fix gitlab references

---
 cmake/README.md | 4 ++--
 meson/README.md | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmake/README.md b/cmake/README.md
index 1deac73d1..1fee11524 100644
--- a/cmake/README.md
+++ b/cmake/README.md
@@ -19,7 +19,7 @@ Follow the steps below to build the Oac project using CMake:
 1. Clone the Oac repository using Git:
 
     ```shell
-    git clone https://gitlab.xiph.org/xiph/oac
+    git clone https://github.com/AOMediaCodec/oac.git
     ```
 
 2. Create a build directory within the Oac repository:
@@ -87,7 +87,7 @@ CMake aims to provide broad platform support, allowing the Oac project to be bui
 
 CMake achieves platform support by generating platform-specific build files (e.g., Makefiles, Visual Studio projects) based on the target platform. This allows developers to build and configure the Oac project consistently across different operating systems and environments.
 
-While CMake strives to ensure compatibility and stability across platforms, bugs or issues may still arise in specific configurations. If you encounter any problems during the configuration process or while building the Oac project, we encourage you to file an issue in the [project's issue tracker](https://gitlab.xiph.org/xiph/oac/-/issues).
+While CMake strives to ensure compatibility and stability across platforms, bugs or issues may still arise in specific configurations. If you encounter any problems during the configuration process or while building the Oac project, we encourage you to file an issue in the [project's issue tracker](https://github.com/AOMediaCodec/oac/issues).
 
 When reporting an issue, please provide the following information to help us understand and reproduce the configuration problem effectively:
 
diff --git a/meson/README.md b/meson/README.md
index ffbe75978..2fe0f935f 100644
--- a/meson/README.md
+++ b/meson/README.md
@@ -21,7 +21,7 @@ Follow the steps below to build the Oac project using Meson.
 Clone the Oac repository using Git:
 
 ```shell
-git clone https://gitlab.xiph.org/xiph/oac
+git clone https://github.com/AOMediaCodec/oac.git
 cd oac
 ```
 
@@ -56,7 +56,7 @@ meson test -C builddir
 
 The Oac Meson build system aims to provide support for the same platforms as [GStreamer](https://gstreamer.freedesktop.org/), a widely used multimedia framework. GStreamer supports a wide range of operating systems and platforms, including Linux, Windows (MSVC and MingW), Android, macOS, iOS, and various BSD systems.
 
-While efforts are made to ensure compatibility and stability across these platforms, bugs or issues may still arise in specific configurations. If you encounter any problems during the configuration process or while building the Oac project, we encourage you to file an issue in the [project's issue tracker](https://gitlab.xiph.org/xiph/oac/-/issues).
+While efforts are made to ensure compatibility and stability across these platforms, bugs or issues may still arise in specific configurations. If you encounter any problems during the configuration process or while building the Oac project, we encourage you to file an issue in the [project's issue tracker](https://github.com/AOMediaCodec/oac/issues).
 
 When reporting an issue, please provide the following information to help us understand and effectively reproduce the configuration problem:
 
@@ -85,4 +85,4 @@ You can find the Visual Studio Command Prompt by searching from the Start Menu.
 meson setup builddir -Dtests=enabled --backend vs
 ```
 
-For more information about the Visual Studio backend options and additional customization, please refer to the [Using with Visual Studio](https://mesonbuild.com/Using-with-Visual-Studio.html) documentation.
\ No newline at end of file
+For more information about the Visual Studio backend options and additional customization, please refer to the [Using with Visual Studio](https://mesonbuild.com/Using-with-Visual-Studio.html) documentation.

From 51bdcf37f3b0305c8cf6b09b6fb4e6ff839eb727 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jeanmarcv@google.com>
Date: Sat, 24 Jan 2026 11:03:31 -0500
Subject: [PATCH 12/28] Add Windows rename script

---
 dnn/download_model.bat   |  2 ++
 dnn/rename_downloads.bat | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 dnn/rename_downloads.bat

diff --git a/dnn/download_model.bat b/dnn/download_model.bat
index f49eaa59d..c4522ff4e 100644
--- a/dnn/download_model.bat
+++ b/dnn/download_model.bat
@@ -7,3 +7,5 @@ if not exist %model% (
 )
 
 tar -xvzf %model%
+
+call dnn\rename_downloads.bat
diff --git a/dnn/rename_downloads.bat b/dnn/rename_downloads.bat
new file mode 100644
index 000000000..3ad2a52fe
--- /dev/null
+++ b/dnn/rename_downloads.bat
@@ -0,0 +1,18 @@
+@echo off
+setlocal
+
+echo changing files
+
+powershell -NoProfile -ExecutionPolicy Bypass -Command ^
+    "$files = Get-ChildItem -Path 'dnn' -Recurse -Include '*_data.c', '*_data.h' | Where-Object { $_.Name -notmatch 'dump_data' }; " ^
+    "foreach ($file in $files) { " ^
+    "    (Get-Content $file.FullName) | ForEach-Object { " ^
+    "        $_ -creplace 'OPUS', 'OAC' " ^
+    "           -creplace 'Opus', 'Oac' " ^
+    "           -creplace 'opus_', 'oac_' " ^
+    "           -creplace 'opus', 'oac' " ^
+    "    } | Set-Content -Path $file.FullName " ^
+    "}"
+
+echo Done.
+pause

From c581f50955bc69682faa24f9a37a00bd4fa102cf Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jeanmarcv@google.com>
Date: Fri, 16 Jan 2026 16:03:07 -0500
Subject: [PATCH 13/28] Remove outdated MIPS optimization

We now use 32-bit precision, but MIPS code matches older 16-bit
implementation.
---
 celt/_kiss_fft_guts.h       |   3 -
 celt/celt.c                 |   5 -
 celt/mdct.c                 |   4 -
 celt/mips/celt_mipsr1.h     | 193 -------------------
 celt/mips/kiss_fft_mipsr1.h | 268 --------------------------
 celt/mips/mdct_mipsr1.h     | 371 ------------------------------------
 celt_headers.mk             |   3 -
 7 files changed, 847 deletions(-)
 delete mode 100644 celt/mips/celt_mipsr1.h
 delete mode 100644 celt/mips/kiss_fft_mipsr1.h
 delete mode 100644 celt/mips/mdct_mipsr1.h

diff --git a/celt/_kiss_fft_guts.h b/celt/_kiss_fft_guts.h
index 0af0a62b6..82ce76035 100644
--- a/celt/_kiss_fft_guts.h
+++ b/celt/_kiss_fft_guts.h
@@ -97,9 +97,6 @@
 # if defined(OAC_ARM_INLINE_EDSP)
 #  include "arm/kiss_fft_armv5e.h"
 # endif
-# if defined(__mips)
-#  include "mips/kiss_fft_mipsr1.h"
-# endif
 
 #else  /* not FIXED_POINT*/
 
diff --git a/celt/celt.c b/celt/celt.c
index ade589a34..f0b6ba5e3 100644
--- a/celt/celt.c
+++ b/celt/celt.c
@@ -54,11 +54,6 @@
 # define PACKAGE_VERSION "unknown"
 #endif
 
-#if defined(FIXED_POINT) && defined(__mips)
-# include "mips/celt_mipsr1.h"
-#endif
-
-
 int resampling_factor(oac_int32 rate) {
     int ret;
     switch (rate) {
diff --git a/celt/mdct.c b/celt/mdct.c
index 1ce1608cc..90d1feece 100644
--- a/celt/mdct.c
+++ b/celt/mdct.c
@@ -53,10 +53,6 @@
 #include "mathops.h"
 #include "stack_alloc.h"
 
-#if defined(FIXED_POINT) && defined(__mips) && __mips == 32
-# include "mips/mdct_mipsr1.h"
-#endif
-
 #ifndef M_PI
 # define M_PI 3.141592653
 #endif
diff --git a/celt/mips/celt_mipsr1.h b/celt/mips/celt_mipsr1.h
deleted file mode 100644
index 608b6d75a..000000000
--- a/celt/mips/celt_mipsr1.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/* Copyright (c) 2007-2008 CSIRO
-   Copyright (c) 2007-2010 Xiph.Org Foundation
-   Copyright (c) 2008 Gregory Maxwell
-   Written by Jean-Marc Valin and Gregory Maxwell */
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef CELT_MIPSR1_H__
-#define CELT_MIPSR1_H__
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#define CELT_C
-
-#if defined (__mips_dsp) && __mips == 32
-
-# define OVERRIDE_COMB_FILTER_CONST
-# define OVERRIDE_comb_filter
-#elif defined(__mips_isa_rev) && __mips_isa_rev < 6
-
-# define OVERRIDE_COMB_FILTER_CONST
-# define OVERRIDE_comb_filter
-#endif
-
-#include "os_support.h"
-#include "mdct.h"
-#include <math.h>
-#include "celt.h"
-#include "pitch.h"
-#include "bands.h"
-#include "modes.h"
-#include "entcode.h"
-#include "quant_bands.h"
-#include "rate.h"
-#include "stack_alloc.h"
-#include "mathops.h"
-#include "float_cast.h"
-#include <stdarg.h>
-#include "celt_lpc.h"
-#include "vq.h"
-
-#if defined (__mips_dsp) && __mips == 32
-
-# define MIPS_MULT __builtin_mips_mult
-# define MIPS_MADD __builtin_mips_madd
-# define MIPS_EXTR __builtin_mips_extr_w
-
-#elif defined(__mips_isa_rev) && __mips_isa_rev < 6
-
-static inline long long MIPS_MULT(int a, int b) {
-    long long acc;
-
-    asm volatile (
-        "mult %[a], %[b]  \n"
-        : [acc] "=x" (acc)
-        : [a] "r" (a), [b] "r" (b)
-        :
-        );
-    return acc;
-}
-
-static inline long long MIPS_MADD(long long acc, int a, int b) {
-    asm volatile (
-        "madd %[a], %[b]  \n"
-        : [acc] "+x" (acc)
-        : [a] "r" (a), [b] "r" (b)
-        :
-        );
-    return acc;
-}
-
-static inline oac_val32 MIPS_EXTR(long long acc, int shift) {
-    return (oac_val32)(acc>>shift);
-}
-
-#endif
-
-#if defined (OVERRIDE_comb_filter)
-void comb_filter(oac_val32 *y, oac_val32 *x, int T0, int T1, int N,
-                 oac_val16 g0, oac_val16 g1, int tapset0, int tapset1,
-                 const oac_val16 *window, int overlap, int arch) {
-    int i;
-    oac_val32 x0, x1, x2, x3, x4;
-
-    (void)arch;
-
-    /* printf ("%d %d %f %f\n", T0, T1, g0, g1); */
-    oac_val16 g00, g01, g02, g10, g11, g12;
-    static const oac_val16 gains[3][3] = {
-        {QCONST16(0.3066406250f, 15), QCONST16(0.2170410156f, 15), QCONST16(0.1296386719f, 15)},
-        {QCONST16(0.4638671875f, 15), QCONST16(0.2680664062f, 15), QCONST16(0.f, 15)},
-        {QCONST16(0.7998046875f, 15), QCONST16(0.1000976562f, 15), QCONST16(0.f, 15)}};
-
-    if (g0 == 0 && g1 == 0) {
-        /* OPT: Happens to work without the OAC_MOVE(), but only because the current encoder already copies x to y */
-        if (x != y)
-            OAC_MOVE(y, x, N);
-        return;
-    }
-
-    g00 = MULT16_16_P15(g0, gains[tapset0][0]);
-    g01 = MULT16_16_P15(g0, gains[tapset0][1]);
-    g02 = MULT16_16_P15(g0, gains[tapset0][2]);
-    g10 = MULT16_16_P15(g1, gains[tapset1][0]);
-    g11 = MULT16_16_P15(g1, gains[tapset1][1]);
-    g12 = MULT16_16_P15(g1, gains[tapset1][2]);
-    x1 = x[-T1 + 1];
-    x2 = x[-T1  ];
-    x3 = x[-T1 - 1];
-    x4 = x[-T1 - 2];
-    /* If the filter didn't change, we don't need the overlap */
-    if (g0 == g1 && T0 == T1 && tapset0 == tapset1)
-        overlap = 0;
-
-    for (i = 0; i < overlap; i++) {
-        oac_val16 f;
-        oac_val32 res;
-        long long acc;
-        f = MULT16_16_Q15(window[i], window[i]);
-        x0 = x[i - T1 + 2];
-
-        acc = MIPS_MULT((int)MULT16_16_Q15((Q15ONE - f), g00), (int)x[i - T0]);
-        acc = MIPS_MADD(acc, (int)MULT16_16_Q15((Q15ONE - f), g01), (int)ADD32(x[i - T0 - 1], x[i - T0 + 1]));
-        acc = MIPS_MADD(acc, (int)MULT16_16_Q15((Q15ONE - f), g02), (int)ADD32(x[i - T0 - 2], x[i - T0 + 2]));
-        acc = MIPS_MADD(acc, (int)MULT16_16_Q15(f, g10), (int)x2);
-        acc = MIPS_MADD(acc, (int)MULT16_16_Q15(f, g11), (int)ADD32(x3, x1));
-        acc = MIPS_MADD(acc, (int)MULT16_16_Q15(f, g12), (int)ADD32(x4, x0));
-        res = MIPS_EXTR(acc, 15);
-
-        y[i] = x[i] + res;
-
-        x4 = x3;
-        x3 = x2;
-        x2 = x1;
-        x1 = x0;
-    }
-
-    x4 = x[i - T1 - 2];
-    x3 = x[i - T1 - 1];
-    x2 = x[i - T1];
-    x1 = x[i - T1 + 1];
-
-    if (g1 == 0) {
-        /* OPT: Happens to work without the OAC_MOVE(), but only because the current encoder already copies x to y */
-        if (x != y)
-            OAC_MOVE(y + overlap, x + overlap, N - overlap);
-        return;
-    }
-
-    for (i = overlap; i < N; i++) {
-        oac_val32 res;
-        long long acc;
-        x0 = x[i - T1 + 2];
-
-        acc = MIPS_MULT((int)g10, (int)x2);
-        acc = MIPS_MADD(acc, (int)g11, (int)ADD32(x3, x1));
-        acc = MIPS_MADD(acc, (int)g12, (int)ADD32(x4, x0));
-        res = MIPS_EXTR(acc, 15);
-
-        y[i] = x[i] + res;
-        x4 = x3;
-        x3 = x2;
-        x2 = x1;
-        x1 = x0;
-    }
-}
-#endif /* OVERRIDE_comb_filter */
-
-#endif /* CELT_MIPSR1_H__ */
diff --git a/celt/mips/kiss_fft_mipsr1.h b/celt/mips/kiss_fft_mipsr1.h
deleted file mode 100644
index 4b47ff407..000000000
--- a/celt/mips/kiss_fft_mipsr1.h
+++ /dev/null
@@ -1,268 +0,0 @@
-/*Copyright (c) 2013, Xiph.Org Foundation and contributors.
-
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.*/
-
-#ifndef KISS_FFT_MIPSR1_H
-#define KISS_FFT_MIPSR1_H
-
-#if !defined(KISS_FFT_GUTS_H)
-# error "This file should only be included from _kiss_fft_guts.h"
-#endif
-
-#ifdef FIXED_POINT
-
-# if __mips == 32 && defined (__mips_dsp)
-
-static inline int S_MUL_ADD(int a, int b, int c, int d) {
-    long long acc = __builtin_mips_mult(a, b);
-    acc = __builtin_mips_madd(acc, c, d);
-    return __builtin_mips_extr_w(acc, 15);
-}
-
-static inline int S_MUL_SUB(int a, int b, int c, int d) {
-    long long acc = __builtin_mips_mult(a, b);
-    acc = __builtin_mips_msub(acc, c, d);
-    return __builtin_mips_extr_w(acc, 15);
-}
-
-#  undef C_MUL
-#  define C_MUL(m, a, b) (m = C_MUL_fun(a, b))
-static inline kiss_fft_cpx C_MUL_fun(kiss_fft_cpx a, kiss_twiddle_cpx b) {
-    kiss_fft_cpx m;
-
-    long long acc1 = __builtin_mips_mult((int)a.r, (int)b.r);
-    long long acc2 = __builtin_mips_mult((int)a.r, (int)b.i);
-    acc1 = __builtin_mips_msub(acc1, (int)a.i, (int)b.i);
-    acc2 = __builtin_mips_madd(acc2, (int)a.i, (int)b.r);
-    m.r = __builtin_mips_extr_w(acc1, 15);
-    m.i = __builtin_mips_extr_w(acc2, 15);
-    return m;
-}
-#  undef C_MULC
-#  define C_MULC(m, a, b) (m = C_MULC_fun(a, b))
-static inline kiss_fft_cpx C_MULC_fun(kiss_fft_cpx a, kiss_twiddle_cpx b) {
-    kiss_fft_cpx m;
-
-    long long acc1 = __builtin_mips_mult((int)a.r, (int)b.r);
-    long long acc2 = __builtin_mips_mult((int)a.i, (int)b.r);
-    acc1 = __builtin_mips_madd(acc1, (int)a.i, (int)b.i);
-    acc2 = __builtin_mips_msub(acc2, (int)a.r, (int)b.i);
-    m.r = __builtin_mips_extr_w(acc1, 15);
-    m.i = __builtin_mips_extr_w(acc2, 15);
-    return m;
-}
-
-#  define OVERRIDE_kf_bfly5
-
-# elif __mips == 32 && defined(__mips_isa_rev) && __mips_isa_rev < 6
-
-static inline int S_MUL_ADD(int a, int b, int c, int d) {
-    long long acc;
-
-    asm volatile (
-        "mult %[a], %[b]  \n"
-        "madd %[c], %[d]  \n"
-        : [acc] "=x" (acc)
-        : [a] "r" (a), [b] "r" (b), [c] "r" (c), [d] "r" (d)
-        :
-        );
-    return (int)(acc>>15);
-}
-
-static inline int S_MUL_SUB(int a, int b, int c, int d) {
-    long long acc;
-
-    asm volatile (
-        "mult %[a], %[b]  \n"
-        "msub %[c], %[d]  \n"
-        : [acc] "=x" (acc)
-        : [a] "r" (a), [b] "r" (b), [c] "r" (c), [d] "r" (d)
-        :
-        );
-    return (int)(acc>>15);
-}
-
-#  undef C_MUL
-#  define C_MUL(m, a, b) (m = C_MUL_fun(a, b))
-static inline kiss_fft_cpx C_MUL_fun(kiss_fft_cpx a, kiss_twiddle_cpx b) {
-    kiss_fft_cpx m;
-
-    m.r = S_MUL_SUB(a.r, b.r, a.i, b.i);
-    m.i = S_MUL_ADD(a.r, b.i, a.i, b.r);
-
-    return m;
-}
-
-#  undef C_MULC
-#  define C_MULC(m, a, b) (m = C_MULC_fun(a, b))
-static inline kiss_fft_cpx C_MULC_fun(kiss_fft_cpx a, kiss_twiddle_cpx b) {
-    kiss_fft_cpx m;
-
-    m.r = S_MUL_ADD(a.r, b.r, a.i, b.i);
-    m.i = S_MUL_SUB(a.i, b.r, a.r, b.i);
-
-    return m;
-}
-
-#  define OVERRIDE_kf_bfly5
-
-# endif
-
-#endif /* FIXED_POINT */
-
-#if defined(OVERRIDE_kf_bfly5)
-
-static void kf_bfly5(
-    kiss_fft_cpx * Fout,
-    const size_t fstride,
-    const kiss_fft_state *st,
-    int m,
-    int N,
-    int mm)        {
-    kiss_fft_cpx *Fout0, *Fout1, *Fout2, *Fout3, *Fout4;
-    int i, u;
-    kiss_fft_cpx scratch[13];
-
-    const kiss_twiddle_cpx *tw;
-    kiss_twiddle_cpx ya, yb;
-    kiss_fft_cpx * Fout_beg = Fout;
-
-# ifdef FIXED_POINT
-    ya.r = 10126;
-    ya.i = -31164;
-    yb.r = -26510;
-    yb.i = -19261;
-# else
-    ya = st->twiddles[fstride*m];
-    yb = st->twiddles[fstride*2*m];
-# endif
-
-    tw = st->twiddles;
-
-    for (i = 0; i < N; i++) {
-        Fout = Fout_beg + i*mm;
-        Fout0 = Fout;
-        Fout1 = Fout0 + m;
-        Fout2 = Fout0 + 2*m;
-        Fout3 = Fout0 + 3*m;
-        Fout4 = Fout0 + 4*m;
-
-        /* For non-custom modes, m is guaranteed to be a multiple of 4. */
-        for (u = 0; u < m; ++u) {
-            scratch[0] = *Fout0;
-
-
-            C_MUL(scratch[1], *Fout1, tw[u*fstride]);
-            C_MUL(scratch[2], *Fout2, tw[2*u*fstride]);
-            C_MUL(scratch[3], *Fout3, tw[3*u*fstride]);
-            C_MUL(scratch[4], *Fout4, tw[4*u*fstride]);
-
-            C_ADD( scratch[7], scratch[1], scratch[4]);
-            C_SUB( scratch[10], scratch[1], scratch[4]);
-            C_ADD( scratch[8], scratch[2], scratch[3]);
-            C_SUB( scratch[9], scratch[2], scratch[3]);
-
-            Fout0->r += scratch[7].r + scratch[8].r;
-            Fout0->i += scratch[7].i + scratch[8].i;
-            scratch[5].r = scratch[0].r + S_MUL_ADD(scratch[7].r, ya.r, scratch[8].r, yb.r);
-            scratch[5].i = scratch[0].i + S_MUL_ADD(scratch[7].i, ya.r, scratch[8].i, yb.r);
-
-            scratch[6].r =  S_MUL_ADD(scratch[10].i, ya.i, scratch[9].i, yb.i);
-            scratch[6].i =  -S_MUL_ADD(scratch[10].r, ya.i, scratch[9].r, yb.i);
-
-            C_SUB(*Fout1, scratch[5], scratch[6]);
-            C_ADD(*Fout4, scratch[5], scratch[6]);
-
-            scratch[11].r = scratch[0].r + S_MUL_ADD(scratch[7].r, yb.r, scratch[8].r, ya.r);
-            scratch[11].i = scratch[0].i + S_MUL_ADD(scratch[7].i, yb.r, scratch[8].i, ya.r);
-
-            scratch[12].r =  S_MUL_SUB(scratch[9].i, ya.i, scratch[10].i, yb.i);
-            scratch[12].i =  S_MUL_SUB(scratch[10].r, yb.i, scratch[9].r, ya.i);
-
-            C_ADD(*Fout2, scratch[11], scratch[12]);
-            C_SUB(*Fout3, scratch[11], scratch[12]);
-
-            ++Fout0; ++Fout1; ++Fout2; ++Fout3; ++Fout4;
-        }
-    }
-}
-
-#endif /* defined(OVERRIDE_kf_bfly5) */
-
-#define OVERRIDE_fft_downshift
-/* Just unroll tight loop, should be ok for any mips */
-static void fft_downshift(kiss_fft_cpx *x, int N, int *total, int step) {
-    int shift;
-    shift = IMIN(step, *total);
-    *total -= shift;
-    if (shift == 1) {
-        int i;
-        for (i = 0; i < N - 1; i += 2) {
-            x[i].r   = SHR32(x[i].r,   1);
-            x[i].i   = SHR32(x[i].i,   1);
-            x[i + 1].r = SHR32(x[i + 1].r, 1);
-            x[i + 1].i = SHR32(x[i + 1].i, 1);
-        }
-        if (N&1) {
-            x[i].r = SHR32(x[i].r, 1);
-            x[i].i = SHR32(x[i].i, 1);
-        }
-    } else if (shift > 0) {
-        int i;
-        for (i = 0; i < N - 3; i += 4) {
-            x[i].r   = PSHR32(x[i].r,   shift);
-            x[i].i   = PSHR32(x[i].i,   shift);
-            x[i + 1].r = PSHR32(x[i + 1].r, shift);
-            x[i + 1].i = PSHR32(x[i + 1].i, shift);
-            x[i + 2].r = PSHR32(x[i + 2].r, shift);
-            x[i + 2].i = PSHR32(x[i + 2].i, shift);
-            x[i + 3].r = PSHR32(x[i + 3].r, shift);
-            x[i + 3].i = PSHR32(x[i + 3].i, shift);
-        }
-        switch (N&3) {
-            case 3:
-                x[i].r   = PSHR32(x[i].r,   shift);
-                x[i].i   = PSHR32(x[i].i,   shift);
-                x[i + 1].r = PSHR32(x[i + 1].r, shift);
-                x[i + 1].i = PSHR32(x[i + 1].i, shift);
-                x[i + 2].r = PSHR32(x[i + 2].r, shift);
-                x[i + 2].i = PSHR32(x[i + 2].i, shift);
-                break;
-            case 2:
-                x[i].r   = PSHR32(x[i].r,   shift);
-                x[i].i   = PSHR32(x[i].i,   shift);
-                x[i + 1].r = PSHR32(x[i + 1].r, shift);
-                x[i + 1].i = PSHR32(x[i + 1].i, shift);
-                break;
-            case 1:
-                x[i].r   = PSHR32(x[i].r,   shift);
-                x[i].i   = PSHR32(x[i].i,   shift);
-                break;
-            case 0:
-                break;
-        }
-    }
-}
-
-#endif /* KISS_FFT_MIPSR1_H */
diff --git a/celt/mips/mdct_mipsr1.h b/celt/mips/mdct_mipsr1.h
deleted file mode 100644
index 0b0040432..000000000
--- a/celt/mips/mdct_mipsr1.h
+++ /dev/null
@@ -1,371 +0,0 @@
-/* Copyright (c) 2007-2008 CSIRO
-   Copyright (c) 2007-2008 Xiph.Org Foundation
-   Written by Jean-Marc Valin */
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* This is a simple MDCT implementation that uses a N/4 complex FFT
-   to do most of the work. It should be relatively straightforward to
-   plug in pretty much and FFT here.
-
-   This replaces the Vorbis FFT (and uses the exact same API), which
-   was a bit too messy and that was ending up duplicating code
-   (might as well use the same FFT everywhere).
-
-   The algorithm is similar to (and inspired from) Fabrice Bellard's
-   MDCT implementation in FFMPEG, but has differences in signs, ordering
-   and scaling in many places.
- */
-#ifndef MDCT_MIPSR1_H__
-#define MDCT_MIPSR1_H__
-
-#ifndef SKIP_CONFIG_H
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-#endif
-
-#include "mdct.h"
-#include "kiss_fft.h"
-#include "_kiss_fft_guts.h"
-#include <math.h>
-#include "os_support.h"
-#include "mathops.h"
-#include "stack_alloc.h"
-
-#if defined (__mips_dsp)
-static inline int S_MUL_ADD_PSR(int a, int b, int c, int d, int shift) {
-    long long acc = __builtin_mips_mult(a, b);
-    acc = __builtin_mips_madd(acc, c, d);
-    return __builtin_mips_extr_w(acc, 15 + shift);
-}
-
-static inline int S_MUL_SUB_PSR(int a, int b, int c, int d, int shift) {
-    long long acc = __builtin_mips_mult(a, b);
-    acc = __builtin_mips_msub(acc, c, d);
-    return __builtin_mips_extr_w(acc, 15 + shift);
-}
-
-# define OVERRIDE_clt_mdct_forward
-# define OVERRIDE_clt_mdct_backward
-
-#elif defined(__mips_isa_rev) && __mips_isa_rev < 6
-
-static inline int S_MUL_ADD_PSR(int a, int b, int c, int d, int shift) {
-    long long acc;
-
-    asm volatile (
-        "mult %[a], %[b]  \n"
-        "madd %[c], %[d]  \n"
-        : [acc] "=x" (acc)
-        : [a] "r" (a), [b] "r" (b), [c] "r" (c), [d] "r" (d)
-        :
-        );
-    return (int)(acc>>(15 + shift));
-}
-
-static inline int S_MUL_SUB_PSR(int a, int b, int c, int d, int shift) {
-    long long acc;
-
-    asm volatile (
-        "mult %[a], %[b]  \n"
-        "msub %[c], %[d]  \n"
-        : [acc] "=x" (acc)
-        : [a] "r" (a), [b] "r" (b), [c] "r" (c), [d] "r" (d)
-        :
-        );
-    return (int)(acc>>(15 + shift));
-}
-
-# define OVERRIDE_clt_mdct_forward
-# define OVERRIDE_clt_mdct_backward
-
-#endif
-
-#if defined (OVERRIDE_clt_mdct_forward)
-
-/* Forward MDCT trashes the input array */
-void clt_mdct_forward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * OAC_RESTRICT out,
-                      const celt_coef *window, int overlap, int shift, int stride, int arch) {
-    int i;
-    int N, N2, N4;
-    VARDECL(kiss_fft_scalar, f);
-    VARDECL(kiss_fft_cpx, f2);
-    const kiss_fft_state *st = l->kfft[shift];
-    const kiss_twiddle_scalar *trig;
-    celt_coef scale;
-# ifdef FIXED_POINT
-    /* Allows us to scale with MULT16_32_Q16(), which is faster than
-       MULT16_32_Q15() on ARM. */
-    int scale_shift = st->scale_shift - 1;
-    int headroom;
-# endif
-    SAVE_STACK;
-    (void)arch;
-    scale = st->scale;
-
-    N = l->n;
-    trig = l->trig;
-    for (i = 0; i < shift; i++) {
-        N >>= 1;
-        trig += N;
-    }
-    N2 = N>>1;
-    N4 = N>>2;
-
-    ALLOC(f, N2, kiss_fft_scalar);
-    ALLOC(f2, N4, kiss_fft_cpx);
-
-    /* Consider the input to be composed of four blocks: [a, b, c, d] */
-    /* Window, shuffle, fold */
-    {
-        /* Temp pointers to make it really clear to the compiler what we're doing */
-        const kiss_fft_scalar * OAC_RESTRICT xp1 = in + (overlap>>1);
-        const kiss_fft_scalar * OAC_RESTRICT xp2 = in + N2 - 1 + (overlap>>1);
-        kiss_fft_scalar * OAC_RESTRICT yp = f;
-        const celt_coef * OAC_RESTRICT wp1 = window + (overlap>>1);
-        const celt_coef * OAC_RESTRICT wp2 = window + (overlap>>1) - 1;
-        for (i = 0; i < ((overlap + 3)>>2); i++) {
-            /* Real part arranged as -d-cR, Imag part arranged as -b+aR*/
-            *yp++ = S_MUL_ADD(*wp2, xp1[N2], *wp1, *xp2);
-            *yp++ = S_MUL_SUB(*wp1, *xp1, *wp2, xp2[-N2]);
-            xp1 += 2;
-            xp2 -= 2;
-            wp1 += 2;
-            wp2 -= 2;
-        }
-        wp1 = window;
-        wp2 = window + overlap - 1;
-        for (; i < N4 - ((overlap + 3)>>2); i++) {
-            /* Real part arranged as a-bR, Imag part arranged as -c-dR */
-            *yp++ = *xp2;
-            *yp++ = *xp1;
-            xp1 += 2;
-            xp2 -= 2;
-        }
-        for (; i < N4; i++) {
-            /* Real part arranged as a-bR, Imag part arranged as -c-dR */
-            *yp++ = S_MUL_SUB(*wp2, *xp2, *wp1, xp1[-N2]);
-            *yp++ = S_MUL_ADD(*wp2, *xp1, *wp1, xp2[N2]);
-            xp1 += 2;
-            xp2 -= 2;
-            wp1 += 2;
-            wp2 -= 2;
-        }
-    }
-    /* Pre-rotation */
-    {
-        kiss_fft_scalar * OAC_RESTRICT yp = f;
-        const kiss_twiddle_scalar *t = &trig[0];
-# ifdef FIXED_POINT
-        oac_val32 maxval = 1;
-# endif
-        for (i = 0; i < N4; i++) {
-            kiss_fft_cpx yc;
-            kiss_twiddle_scalar t0, t1;
-            kiss_fft_scalar re, im, yr, yi;
-            t0 = t[i];
-            t1 = t[N4 + i];
-            re = *yp++;
-            im = *yp++;
-            yr = S_MUL_SUB(re, t0, im, t1);
-            yi = S_MUL_ADD(im, t0, re, t1);
-            /* For QEXT, it's best to scale before the FFT, but otherwise it's best to scale after.
-               For floating-point it doesn't matter. */
-# ifdef ENABLE_QEXT
-            yc.r = yr;
-            yc.i = yi;
-# else
-            yc.r = S_MUL2(yr, scale);
-            yc.i = S_MUL2(yi, scale);
-# endif
-# ifdef FIXED_POINT
-            maxval = MAX32(maxval, MAX32(ABS32(yc.r), ABS32(yc.i)));
-# endif
-            f2[st->bitrev[i]] = yc;
-        }
-# ifdef FIXED_POINT
-        headroom = IMAX(0, IMIN(scale_shift, 28 - celt_ilog2(maxval)));
-# endif
-    }
-
-    /* N/4 complex FFT, does not downscale anymore */
-    oac_fft_impl(st, f2 ARG_FIXED(scale_shift - headroom));
-
-    /* Post-rotate */
-    {
-        /* Temp pointers to make it really clear to the compiler what we're doing */
-        const kiss_fft_cpx * OAC_RESTRICT fp = f2;
-        kiss_fft_scalar * OAC_RESTRICT yp1 = out;
-        kiss_fft_scalar * OAC_RESTRICT yp2 = out + stride*(N2 - 1);
-        const kiss_twiddle_scalar *t = &trig[0];
-        /* Temp pointers to make it really clear to the compiler what we're doing */
-        for (i = 0; i < N4; i++) {
-            kiss_fft_scalar yr, yi;
-            kiss_fft_scalar t0, t1;
-# ifdef ENABLE_QEXT
-            t0 = S_MUL2(t[i], scale);
-            t1 = S_MUL2(t[N4 + i], scale);
-# else
-            t0 = t[i];
-            t1 = t[N4 + i];
-# endif
-            yr = S_MUL_SUB_PSR(fp->i, t1, fp->r, t0, headroom);
-            yi = S_MUL_ADD_PSR(fp->r, t1, fp->i, t0, headroom);
-            *yp1 = yr;
-            *yp2 = yi;
-            fp++;
-            yp1 += 2*stride;
-            yp2 -= 2*stride;
-        }
-    }
-    RESTORE_STACK;
-}
-
-#endif /* OVERRIDE_clt_mdct_forward */
-
-#if defined(OVERRIDE_clt_mdct_backward)
-
-void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * OAC_RESTRICT out,
-                       const celt_coef * OAC_RESTRICT window, int overlap, int shift, int stride, int arch) {
-    int i;
-    int N, N2, N4;
-    const kiss_twiddle_scalar *trig;
-# ifdef FIXED_POINT
-    int pre_shift, post_shift, fft_shift;
-# endif
-    (void) arch;
-
-    N = l->n;
-    trig = l->trig;
-    for (i = 0; i < shift; i++) {
-        N >>= 1;
-        trig += N;
-    }
-    N2 = N>>1;
-    N4 = N>>2;
-
-# ifdef FIXED_POINT
-    {
-        oac_val32 sumval = N2;
-        oac_val32 maxval = 0;
-        for (i = 0; i < N2; i++) {
-            maxval = MAX32(maxval, ABS32(in[i*stride]));
-            sumval = ADD32_ovflw(sumval, ABS32(SHR32(in[i*stride], 11)));
-        }
-        pre_shift = IMAX(0, 29 - celt_zlog2(1 + maxval));
-        /* Worst-case where all the energy goes to a single sample. */
-        post_shift = IMAX(0, 19 - celt_ilog2(ABS32(sumval)));
-        post_shift = IMIN(post_shift, pre_shift);
-        fft_shift = pre_shift - post_shift;
-    }
-# endif
-    /* Pre-rotate */
-    {
-        /* Temp pointers to make it really clear to the compiler what we're doing */
-        const kiss_fft_scalar * OAC_RESTRICT xp1 = in;
-        const kiss_fft_scalar * OAC_RESTRICT xp2 = in + stride*(N2 - 1);
-        kiss_fft_scalar * OAC_RESTRICT yp = out + (overlap>>1);
-        const kiss_twiddle_scalar * OAC_RESTRICT t = &trig[0];
-        const oac_int16 * OAC_RESTRICT bitrev = l->kfft[shift]->bitrev;
-        for (i = 0; i < N4; i++) {
-            int rev;
-            kiss_fft_scalar yr, yi;
-            oac_val32 x1, x2;
-            rev = *bitrev++;
-            x1 = SHL32_ovflw(*xp1, pre_shift);
-            x2 = SHL32_ovflw(*xp2, pre_shift);
-            yr = S_MUL_ADD(x2, t[i], x1, t[N4 + i]);
-            yi = S_MUL_SUB(x1, t[i], x2, t[N4 + i]);
-            /* We swap real and imag because we use an FFT instead of an IFFT. */
-            yp[2*rev + 1] = yr;
-            yp[2*rev] = yi;
-            /* Storing the pre-rotation directly in the bitrev order. */
-            xp1 += 2*stride;
-            xp2 -= 2*stride;
-        }
-    }
-
-    oac_fft_impl(l->kfft[shift], (kiss_fft_cpx*)(out + (overlap>>1))ARG_FIXED(fft_shift));
-
-    /* Post-rotate and de-shuffle from both ends of the buffer at once to make
-       it in-place. */
-    {
-        kiss_fft_scalar * yp0 = out + (overlap>>1);
-        kiss_fft_scalar * yp1 = out + (overlap>>1) + N2 - 2;
-        const kiss_twiddle_scalar *t = &trig[0];
-        /* Loop to (N4+1)>>1 to handle odd N4. When N4 is odd, the
-           middle pair will be computed twice. */
-        for (i = 0; i < (N4 + 1)>>1; i++) {
-            kiss_fft_scalar re, im, yr, yi;
-            kiss_twiddle_scalar t0, t1;
-            /* We swap real and imag because we're using an FFT instead of an IFFT. */
-            re = yp0[1];
-            im = yp0[0];
-            t0 = t[i];
-            t1 = t[N4 + i];
-            /* We'd scale up by 2 here, but instead it's done when mixing the windows */
-            yr = S_MUL_ADD_PSR(re, t0, im, t1, post_shift);
-            yi = S_MUL_SUB_PSR(re, t1, im, t0, post_shift);
-            /* We swap real and imag because we're using an FFT instead of an IFFT. */
-            re = yp1[1];
-            im = yp1[0];
-            yp0[0] = yr;
-            yp1[1] = yi;
-
-            t0 = t[(N4 - i - 1)];
-            t1 = t[(N2 - i - 1)];
-            /* We'd scale up by 2 here, but instead it's done when mixing the windows */
-            yr = S_MUL_ADD_PSR(re, t0, im, t1, post_shift);
-            yi = S_MUL_SUB_PSR(re, t1, im, t0, post_shift);
-            yp1[0] = yr;
-            yp0[1] = yi;
-            yp0 += 2;
-            yp1 -= 2;
-        }
-    }
-
-    /* Mirror on both sides for TDAC */
-    {
-        kiss_fft_scalar * OAC_RESTRICT xp1 = out + overlap - 1;
-        kiss_fft_scalar * OAC_RESTRICT yp1 = out;
-        const celt_coef * OAC_RESTRICT wp1 = window;
-        const celt_coef * OAC_RESTRICT wp2 = window + overlap - 1;
-
-        for (i = 0; i < overlap/2; i++) {
-            kiss_fft_scalar x1, x2;
-            x1 = *xp1;
-            x2 = *yp1;
-            *yp1++ = S_MUL_SUB(x2, *wp2, x1, *wp1);
-            *xp1-- = S_MUL_ADD(x2, *wp1, x1, *wp2);
-            wp1++;
-            wp2--;
-        }
-    }
-}
-
-#endif /* OVERRIDE_clt_mdct_backward */
-
-#endif /* MDCT_MIPSR1_H__ */
diff --git a/celt_headers.mk b/celt_headers.mk
index 0ee88ea4a..704bb1885 100644
--- a/celt_headers.mk
+++ b/celt_headers.mk
@@ -43,10 +43,7 @@ celt/arm/mathops_arm.h \
 celt/arm/pitch_arm.h \
 celt/arm/fft_arm.h \
 celt/arm/mdct_arm.h \
-celt/mips/celt_mipsr1.h \
 celt/mips/fixed_generic_mipsr1.h \
-celt/mips/kiss_fft_mipsr1.h \
-celt/mips/mdct_mipsr1.h \
 celt/mips/pitch_mipsr1.h \
 celt/x86/pitch_sse.h \
 celt/x86/vq_sse.h \

From 5542712a6e98868c8bcf3acf5eed1c5a138d104b Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jeanmarcv@google.com>
Date: Wed, 21 Jan 2026 14:20:30 -0500
Subject: [PATCH 14/28] Disable decoder fixed final range checks

These will break every time we change the bitstream
---
 tests/test_oac_decode.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/test_oac_decode.c b/tests/test_oac_decode.c
index afabb1353..97a1ed68a 100644
--- a/tests/test_oac_decode.c
+++ b/tests/test_oac_decode.c
@@ -236,7 +236,10 @@ int test_decoder_code0(int no_fuzz) {
         return 0;
     }
 
-    {
+    /* Disabling these tests for now because the final range is hardcoded based on the assumption
+       of a frozen bit-stream. This can be re-enabled with different cres/lres values once
+       the bitstream stabilizes. */
+    if (0) {
         /*We only test a subset of the modes here simply because the longer
            durations end up taking a long time.*/
         static const int cmodes[4] = {16, 20, 24, 28};

From c60d1a2757abcc9c214c1a5b46298708ba8ec689 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jeanmarcv@google.com>
Date: Fri, 16 Jan 2026 11:25:15 -0500
Subject: [PATCH 15/28] Cleaning up remaining bits calculations

Now always using ec_tell_frac() to check the number of remaining bits
instead of attempting our own accounting, which is more complicated and
could (in extremely rare cases) fail.
---
 celt/bands.c | 53 +++++++++++++++++++++++-----------------------------
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/celt/bands.c b/celt/bands.c
index eceb44f8c..7776f0efc 100644
--- a/celt/bands.c
+++ b/celt/bands.c
@@ -625,7 +625,7 @@ struct band_ctx {
     int spread;
     int tf_change;
     ec_ctx *ec;
-    oac_int32 remaining_bits;
+    oac_int32 total_bits;
     const celt_ener *bandE;
     oac_uint32 seed;
     int arch;
@@ -641,7 +641,6 @@ struct split_ctx {
     int delta;
     int itheta;
     int itheta_q30;
-    int qalloc;
 };
 
 static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
@@ -794,7 +793,7 @@ static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
             }
             intensity_stereo(m, X, Y, bandE, i, N);
         }
-        if (*b > 2<<BITRES && ctx->remaining_bits > 2<<BITRES) {
+        if (*b > 2<<BITRES && ctx->total_bits - tell > 2<<BITRES) {
             if (encode)
                 ec_enc_bit_logp(ec, inv, 2);
             else
@@ -834,7 +833,6 @@ static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
     sctx->delta = delta;
     sctx->itheta = itheta;
     sctx->itheta_q30 = itheta_q30;
-    sctx->qalloc = qalloc;
 }
 static unsigned quant_band_n1(struct band_ctx *ctx, celt_norm *X, celt_norm *Y,
                               celt_norm *lowband_out) {
@@ -850,14 +848,13 @@ static unsigned quant_band_n1(struct band_ctx *ctx, celt_norm *X, celt_norm *Y,
     stereo = Y != NULL;
     c = 0; do {
         int sign = 0;
-        if (ctx->remaining_bits >= 1<<BITRES) {
+        if (ctx->total_bits - ec_tell_frac(ec) > 1<<BITRES) {
             if (encode) {
                 sign = x[0] < 0;
                 ec_enc_bits(ec, sign, 1);
             } else {
                 sign = ec_dec_bits(ec, 1);
             }
-            ctx->remaining_bits -= 1<<BITRES;
         }
         if (ctx->resynth)
             x[0] = sign ? -NORM_SCALING : NORM_SCALING;
@@ -889,6 +886,7 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
     int i;
     int spread;
     ec_ctx *ec;
+    oac_int32 tell;
 
     encode = ctx->encode;
     m = ctx->m;
@@ -901,7 +899,6 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
     if (LM != -1 && b > cache[cache[0]] + 12 && N > 2) {
         int mbits, sbits, delta;
         int itheta;
-        int qalloc;
         struct split_ctx sctx;
         celt_norm *next_lowband2 = NULL;
         oac_int32 rebalance;
@@ -918,7 +915,6 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
         iside = sctx.iside;
         delta = sctx.delta;
         itheta = sctx.itheta;
-        qalloc = sctx.qalloc;
         (void)imid;
         (void)iside;
 #ifdef FIXED_POINT
@@ -940,16 +936,15 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
         }
         mbits = IMAX(0, IMIN(b, (b - delta)/2));
         sbits = b - mbits;
-        ctx->remaining_bits -= qalloc;
 
         if (lowband)
             next_lowband2 = lowband + N; /* >32-bit split case */
 
-        rebalance = ctx->remaining_bits;
+        tell = ec_tell_frac(ec);
         if (mbits >= sbits) {
             cm = quant_partition(ctx, X, N, mbits, B, lowband, LM,
                MULT32_32_Q31(gain, mid), fill);
-            rebalance = mbits - (rebalance - ctx->remaining_bits);
+            rebalance = mbits - (ec_tell_frac(ec) - tell);
             if (rebalance > 3<<BITRES && itheta != 0)
                 sbits += rebalance - (3<<BITRES);
             cm |= quant_partition(ctx, Y, N, sbits, B, next_lowband2, LM,
@@ -957,24 +952,26 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
         } else {
             cm = quant_partition(ctx, Y, N, sbits, B, next_lowband2, LM,
                MULT32_32_Q31(gain, side), fill>>B)<<(B0>>1);
-            rebalance = sbits - (rebalance - ctx->remaining_bits);
+            rebalance = sbits - (ec_tell_frac(ec) - tell);
             if (rebalance > 3<<BITRES && itheta != 16384)
                 mbits += rebalance - (3<<BITRES);
             cm |= quant_partition(ctx, X, N, mbits, B, lowband, LM,
                MULT32_32_Q31(gain, mid), fill);
         }
     } else {
+        oac_int32 remaining_bits;
         /* This is the basic no-split case */
         q = bits2pulses(m, i, LM, b);
         curr_bits = pulses2bits(m, i, LM, q);
-        ctx->remaining_bits -= curr_bits;
+        remaining_bits = ctx->total_bits - ec_tell_frac(ec) - 1;
+        remaining_bits -= curr_bits;
 
         /* Ensures we can never bust the budget */
-        while (ctx->remaining_bits < 0 && q > 0) {
-            ctx->remaining_bits += curr_bits;
+        while (remaining_bits < 0 && q > 0) {
+            remaining_bits += curr_bits;
             q--;
             curr_bits = pulses2bits(m, i, LM, q);
-            ctx->remaining_bits -= curr_bits;
+            remaining_bits -= curr_bits;
         }
 
         if (q != 0) {
@@ -1029,19 +1026,18 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
 
 unsigned cubic_quant_partition(struct band_ctx *ctx, celt_norm *X, int N, int b, int B, ec_ctx *ec, int LM,
                                oac_val32 gain, int resynth, int encode) {
+    oac_int32 remaining_bits = ctx->total_bits - ec_tell_frac(ctx->ec) - 1;
     celt_assert(LM >= 0);
-    ctx->remaining_bits = ctx->ec->storage*8*8 - ec_tell_frac(ctx->ec);
-    b = IMIN(b, ctx->remaining_bits);
+    b = IMIN(b, remaining_bits);
     /* As long as we have at least two bits of depth, split all the way to LM=0 (not -1 like PVQ). */
     if (LM == 0 || b <= 2*N<<BITRES) {
         int res, ret;
-        b = IMIN(b + ((N - 1)<<BITRES)/2, ctx->remaining_bits);
+        b = IMIN(b + ((N - 1)<<BITRES)/2, remaining_bits);
         /* Resolution left after taking into account coding the cube face. */
         res = (b - (1<<BITRES) - ctx->m->logN[ctx->i] - (LM<<BITRES) - 1)/(N - 1)>>BITRES;
         res = IMIN(14, IMAX(0, res));
         if (encode) ret = cubic_quant(X, N, res, B, ec, gain, resynth);
         else ret = cubic_unquant(X, N, res, B, ec, gain);
-        ctx->remaining_bits = ctx->ec->storage*8*8 - ec_tell_frac(ctx->ec);
         return ret;
     } else {
         celt_norm *Y;
@@ -1225,7 +1221,6 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
     unsigned cm = 0;
     int mbits, sbits, delta;
     int itheta;
-    int qalloc;
     struct split_ctx sctx;
     int orig_fill;
     int encode;
@@ -1253,7 +1248,6 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
     iside = sctx.iside;
     delta = sctx.delta;
     itheta = sctx.itheta;
-    qalloc = sctx.qalloc;
     (void)imid;
     (void)iside;
 #ifdef FIXED_POINT
@@ -1278,7 +1272,6 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
             sbits = 1<<BITRES;
         mbits -= sbits;
         c = itheta > 8192;
-        ctx->remaining_bits -= qalloc + sbits;
 
         x2 = c ? Y : X;
         y2 = c ? X : Y;
@@ -1316,19 +1309,19 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
         }
     } else {
         /* "Normal" split code */
+        oac_int32 tell;
         oac_int32 rebalance;
 
         mbits = IMAX(0, IMIN(b, (b - delta)/2));
         sbits = b - mbits;
-        ctx->remaining_bits -= qalloc;
+        tell = ec_tell_frac(ec);
 
-        rebalance = ctx->remaining_bits;
         if (mbits >= sbits) {
             /* In stereo mode, we do not apply a scaling to the mid because we need the normalized
                mid for folding later. */
             cm = quant_band(ctx, X, N, mbits, B, lowband, LM, lowband_out, Q31ONE,
                lowband_scratch, fill);
-            rebalance = mbits - (rebalance - ctx->remaining_bits);
+            rebalance = mbits - (ec_tell_frac(ec) - tell);
             if (rebalance > 3<<BITRES && itheta != 0)
                 sbits += rebalance - (3<<BITRES);
 
@@ -1339,7 +1332,7 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
             /* For a stereo split, the high bits of fill are always zero, so no
                folding will be done to the side. */
             cm = quant_band(ctx, Y, N, sbits, B, NULL, LM, NULL, side, NULL, fill>>B);
-            rebalance = sbits - (rebalance - ctx->remaining_bits);
+            rebalance = sbits - (ec_tell_frac(ec) - tell);
             if (rebalance > 3<<BITRES && itheta != 16384)
                 mbits += rebalance - (3<<BITRES);
             /* In stereo mode, we do not apply a scaling to the mid because we need the normalized
@@ -1481,11 +1474,11 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
         /* Compute how many bits we want to allocate to this band */
         if (i != start)
             balance -= tell;
-        remaining_bits = total_bits - tell - 1;
-        ctx.remaining_bits = remaining_bits;
+        remaining_bits = total_bits - tell;
+        ctx.total_bits = total_bits;
         if (i <= codedBands - 1) {
             curr_balance = celt_sudiv(balance, IMIN(3, codedBands - i));
-            b = IMAX(0, IMIN(16383, IMIN(remaining_bits + 1, pulses[i] + curr_balance)));
+            b = IMAX(0, IMIN(16383, IMIN(remaining_bits, pulses[i] + curr_balance)));
         } else {
             b = 0;
         }

From ff2d47d405d385952ef9b5a156091421f082dbc3 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jeanmarcv@google.com>
Date: Fri, 16 Jan 2026 14:31:48 -0500
Subject: [PATCH 16/28] Tune spreading CDF

---
 celt/celt.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/celt/celt.h b/celt/celt.h
index 9ef8b3b53..d50561f94 100644
--- a/celt/celt.h
+++ b/celt/celt.h
@@ -183,8 +183,8 @@ int celt_decode_with_ec(OacCustomDecoder * OAC_RESTRICT st, const unsigned char
 #endif
 
 static const unsigned char trim_icdf[11] = {126, 124, 119, 109, 87, 41, 19, 9, 4, 2, 0};
-/* Probs: NONE: 21.875%, LIGHT: 6.25%, NORMAL: 65.625%, AGGRESSIVE: 6.25% */
-static const unsigned char spread_icdf[4] = {25, 23, 2, 0};
+/* Probs: NONE: 6.25%, LIGHT: 6.25%, NORMAL: 50%, AGGRESSIVE: 37.5% */
+static const unsigned char spread_icdf[4] = {30, 28, 12, 0};
 
 static const unsigned char tapset_icdf[3] = {2, 1, 0};
 

From 80408d654572cc38410a2c914b99543f19a67761 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jeanmarcv@google.com>
Date: Fri, 16 Jan 2026 14:54:19 -0500
Subject: [PATCH 17/28] Tune the trim CDF

Also update condition for coding the trim symbol
---
 celt/celt.h         | 2 +-
 celt/celt_decoder.c | 2 +-
 celt/celt_encoder.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/celt/celt.h b/celt/celt.h
index d50561f94..022944388 100644
--- a/celt/celt.h
+++ b/celt/celt.h
@@ -182,7 +182,7 @@ int celt_decode_with_ec(OacCustomDecoder * OAC_RESTRICT st, const unsigned char
 # define OAC_CUSTOM_NOSTATIC static OAC_INLINE
 #endif
 
-static const unsigned char trim_icdf[11] = {126, 124, 119, 109, 87, 41, 19, 9, 4, 2, 0};
+static const unsigned char trim_icdf[11] = {119, 109, 85, 53, 30, 14, 6, 3, 2, 1, 0};
 /* Probs: NONE: 6.25%, LIGHT: 6.25%, NORMAL: 50%, AGGRESSIVE: 37.5% */
 static const unsigned char spread_icdf[4] = {30, 28, 12, 0};
 
diff --git a/celt/celt_decoder.c b/celt/celt_decoder.c
index 5ff6993e9..7c4ccd3bf 100644
--- a/celt/celt_decoder.c
+++ b/celt/celt_decoder.c
@@ -1311,7 +1311,7 @@ int celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char
     }
 
     ALLOC(fine_quant, nbEBands, int);
-    alloc_trim = tell + (6<<BITRES) <= total_bits ?
+    alloc_trim = tell + (7<<BITRES) <= total_bits ?
                  ec_dec_icdf(dec, trim_icdf, 7) : 5;
 
     bits = (((oac_int32)len*8)<<BITRES) - (oac_int32)ec_tell_frac(dec) - 1;
diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c
index e7af0fc4d..74882e8a6 100644
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -2242,7 +2242,7 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
     }
 
     alloc_trim = 5;
-    if (tell + (6<<BITRES) <= total_bits - total_boost) {
+    if (tell + (7<<BITRES) <= total_bits - total_boost) {
         if (start > 0 || st->lfe) {
             st->stereo_saving = 0;
             alloc_trim = 5;

From 8ee3a055d728a9108571ea31cbdb6e36e2d5320f Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jeanmarcv@google.com>
Date: Fri, 16 Jan 2026 15:36:46 -0500
Subject: [PATCH 18/28] Tuning tapset CDF

Also update condition for coding the pitch symbols
---
 celt/celt.h         | 2 +-
 celt/celt_decoder.c | 4 ++--
 celt/celt_encoder.c | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/celt/celt.h b/celt/celt.h
index 022944388..53596d786 100644
--- a/celt/celt.h
+++ b/celt/celt.h
@@ -186,7 +186,7 @@ static const unsigned char trim_icdf[11] = {119, 109, 85, 53, 30, 14, 6, 3, 2, 1
 /* Probs: NONE: 6.25%, LIGHT: 6.25%, NORMAL: 50%, AGGRESSIVE: 37.5% */
 static const unsigned char spread_icdf[4] = {30, 28, 12, 0};
 
-static const unsigned char tapset_icdf[3] = {2, 1, 0};
+static const unsigned char tapset_icdf[3] = {3, 2, 0};
 
 #if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
 static const unsigned char toOacTable[20] = {
diff --git a/celt/celt_decoder.c b/celt/celt_decoder.c
index 7c4ccd3bf..536221eb6 100644
--- a/celt/celt_decoder.c
+++ b/celt/celt_decoder.c
@@ -1207,14 +1207,14 @@ int celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char
     postfilter_gain = 0;
     postfilter_pitch = 0;
     postfilter_tapset = 0;
-    if (start == 0 && tell + 16 <= total_bits) {
+    if (start == 0 && tell + 18 <= total_bits) {
         if (ec_dec_bit_logp(dec, 1)) {
             int qg, octave;
             octave = ec_dec_uint(dec, 6);
             postfilter_pitch = (16<<octave) + ec_dec_bits(dec, 4 + octave) - 1;
             qg = ec_dec_bits(dec, 3);
             if (ec_tell(dec) + 2 <= total_bits)
-                postfilter_tapset = ec_dec_icdf(dec, tapset_icdf, 2);
+                postfilter_tapset = ec_dec_icdf(dec, tapset_icdf, 4);
             postfilter_gain = QCONST16(.09375f, 15)*(qg + 1);
         }
         tell = ec_tell(dec);
diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c
index 74882e8a6..b0bb75445 100644
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -1905,7 +1905,7 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
             && (pitch_index > 1.26*st->prefilter_period || pitch_index < .79*st->prefilter_period))
             pitch_change = 1;
         if (pf_on == 0) {
-            if (!hybrid && tell + 16 <= total_bits)
+            if (!hybrid && tell + 18 <= total_bits)
                 ec_enc_bit_logp(enc, 0, 1);
         } else {
             /*This block is not gated by a total bits check only because
@@ -1918,7 +1918,7 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
             ec_enc_bits(enc, pitch_index - (16<<octave), 4 + octave);
             pitch_index -= 1;
             ec_enc_bits(enc, qg, 3);
-            ec_enc_icdf(enc, prefilter_tapset, tapset_icdf, 2);
+            ec_enc_icdf(enc, prefilter_tapset, tapset_icdf, 4);
         }
     }
     if (LM > 0 && ec_tell(enc) + 3 <= total_bits) {

From 5468b2c5761cb2226f22d88f53e235c11b36672c Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jeanmarcv@google.com>
Date: Wed, 21 Jan 2026 13:00:02 -0500
Subject: [PATCH 19/28] Fix sample_max computation

Backport from Opus commit a3f0ec02 (gitlab MR 190)
---
 celt/celt_encoder.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c
index b0bb75445..0b99170fe 100644
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -1836,8 +1836,8 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
 
     ALLOC(in, CC*(N + overlap), celt_sig);
 
-    sample_max = MAX32(st->overlap_max, celt_maxabs_res(pcm, C*(N - overlap)/st->upsample));
-    st->overlap_max = celt_maxabs_res(pcm + C*(N - overlap)/st->upsample, C*overlap/st->upsample);
+    sample_max = MAX32(st->overlap_max, celt_maxabs_res(pcm, CC*(N - overlap)/st->upsample));
+    st->overlap_max = celt_maxabs_res(pcm + CC*(N - overlap)/st->upsample, CC*overlap/st->upsample);
     sample_max = MAX32(sample_max, st->overlap_max);
 #ifdef FIXED_POINT
     silence = (sample_max == 0);

From d8c8e0c7da03f6dc8e86912c699d3e6274d89496 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jeanmarcv@google.com>
Date: Fri, 23 Jan 2026 23:14:23 -0500
Subject: [PATCH 20/28] Renaming internal symbols to have an oaci_ prefix

---
 celt/_kiss_fft_guts.h                         |   4 +-
 celt/arch.h                                   |   8 +-
 celt/arm/arm_celt_map.c                       |  84 ++++----
 celt/arm/celt_mdct_ne10.c                     |   4 +-
 celt/arm/celt_neon_intr.c                     |  14 +-
 celt/arm/celt_pitch_xcorr_arm.s               |  14 +-
 celt/arm/mathops_arm.h                        |   6 +-
 celt/arm/mdct_arm.h                           |  12 +-
 celt/arm/pitch_arm.h                          |  48 ++---
 celt/arm/pitch_neon_intr.c                    |  32 +--
 celt/bands.c                                  | 184 ++++++++---------
 celt/bands.h                                  |  22 +-
 celt/celt.c                                   |  24 +--
 celt/celt.h                                   |  32 +--
 celt/celt_decoder.c                           | 148 +++++++-------
 celt/celt_encoder.c                           | 190 +++++++++---------
 celt/celt_lpc.c                               |  22 +-
 celt/celt_lpc.h                               |  12 +-
 celt/cwrs.c                                   |  26 +--
 celt/cwrs.h                                   |   8 +-
 celt/entcode.c                                |  10 +-
 celt/entcode.h                                |   8 +-
 celt/entdec.c                                 |  28 +--
 celt/entdec.h                                 |  38 ++--
 celt/entenc.c                                 |  28 +--
 celt/entenc.h                                 |  24 +--
 celt/laplace.c                                |  32 +--
 celt/laplace.h                                |   8 +-
 celt/mathops.c                                |  38 ++--
 celt/mathops.h                                |  56 +++---
 celt/mdct.c                                   |  16 +-
 celt/mdct.h                                   |  20 +-
 celt/mips/pitch_mipsr1.h                      |  10 +-
 celt/modes.c                                  |   8 +-
 celt/pitch.c                                  |  34 ++--
 celt/pitch.h                                  |  36 ++--
 celt/quant_bands.c                            |  46 ++---
 celt/quant_bands.h                            |  18 +-
 celt/rate.c                                   |  24 +--
 celt/rate.h                                   |   4 +-
 celt/tests/test_unit_entropy.c                | 162 +++++++--------
 celt/tests/test_unit_laplace.c                |  10 +-
 celt/tests/test_unit_mathops.c                |  56 +++---
 celt/tests/test_unit_mdct.c                   |  10 +-
 celt/tests/test_unit_rotation.c               |   4 +-
 celt/vq.c                                     | 104 +++++-----
 celt/vq.h                                     |  36 ++--
 celt/x86/celt_lpc_sse.h                       |  12 +-
 celt/x86/celt_lpc_sse4_1.c                    |   6 +-
 celt/x86/pitch_avx.c                          |  10 +-
 celt/x86/pitch_sse.c                          |   8 +-
 celt/x86/pitch_sse.h                          |  68 +++----
 celt/x86/pitch_sse2.c                         |   2 +-
 celt/x86/pitch_sse4_1.c                       |   6 +-
 celt/x86/vq_sse.h                             |   8 +-
 celt/x86/vq_sse2.c                            |   2 +-
 celt/x86/x86_celt_map.c                       | 102 +++++-----
 dnn/adaconvtest.c                             |  26 +--
 dnn/arm/arm_dnn_map.c                         |  36 ++--
 dnn/arm/dnn_arm.h                             |  42 ++--
 dnn/burg.c                                    |  12 +-
 dnn/burg.h                                    |   2 +-
 dnn/bwe_demo.c                                |   6 +-
 dnn/dred_coding.c                             |   2 +-
 dnn/dred_coding.h                             |   2 +-
 dnn/dred_compare.c                            |   8 +-
 dnn/dred_decoder.c                            |  40 ++--
 dnn/dred_decoder.h                            |   2 +-
 dnn/dred_encoder.c                            |  98 ++++-----
 dnn/dred_encoder.h                            |  10 +-
 dnn/dred_rdovae_dec.c                         |  58 +++---
 dnn/dred_rdovae_dec.h                         |   6 +-
 dnn/dred_rdovae_enc.c                         |  40 ++--
 dnn/dred_rdovae_enc.h                         |   2 +-
 dnn/dump_data.c                               |  10 +-
 dnn/dump_lpcnet_tables.c                      |  44 ++--
 dnn/fargan.c                                  |  50 ++---
 dnn/fargan.h                                  |  10 +-
 dnn/fargan_demo.c                             |  44 ++--
 dnn/freq.c                                    |  32 +--
 dnn/freq.h                                    |  22 +-
 dnn/fwgan.c                                   |  58 +++---
 dnn/lossgen.c                                 |  28 +--
 dnn/lpcnet.c                                  |   8 +-
 dnn/lpcnet.h                                  |  34 ++--
 dnn/lpcnet_enc.c                              |  56 +++---
 dnn/lpcnet_plc.c                              |  48 ++---
 dnn/lpcnet_private.h                          |   4 +-
 dnn/lpcnet_tables.c                           |   6 +-
 dnn/nndsp.c                                   |  40 ++--
 dnn/nndsp.h                                   |  14 +-
 dnn/nnet.c                                    |  34 ++--
 dnn/nnet.h                                    |  52 ++---
 dnn/nnet_arch.h                               |   8 +-
 dnn/osce.c                                    | 150 +++++++-------
 dnn/osce.h                                    |  10 +-
 dnn/osce_features.c                           |  14 +-
 dnn/osce_features.h                           |   8 +-
 dnn/parse_lpcnet_weights.c                    |  12 +-
 dnn/pitchdnn.c                                |  26 +--
 dnn/pitchdnn.h                                |   6 +-
 dnn/rename_downloads.bat                      |   5 +
 dnn/rename_downloads.sh                       |   2 +-
 dnn/write_lpcnet_weights.c                    |  14 +-
 dnn/x86/dnn_x86.h                             |  66 +++---
 dnn/x86/x86_dnn_map.c                         |  36 ++--
 silk/A2NLSF.c                                 |  12 +-
 silk/API.h                                    |  16 +-
 silk/CNG.c                                    |   8 +-
 silk/HP_variable_cutoff.c                     |  10 +-
 silk/LPC_analysis_filter.c                    |   6 +-
 silk/LPC_fit.c                                |   6 +-
 silk/LPC_inv_pred_gain.c                      |   2 +-
 silk/LP_variable_cutoff.c                     |  36 ++--
 silk/NLSF2A.c                                 |  12 +-
 silk/NLSF_VQ.c                                |   2 +-
 silk/NLSF_VQ_weights_laroia.c                 |   2 +-
 silk/NLSF_decode.c                            |   6 +-
 silk/NLSF_del_dec_quant.c                     |   2 +-
 silk/NLSF_encode.c                            |  18 +-
 silk/NLSF_stabilize.c                         |   4 +-
 silk/NLSF_unpack.c                            |   2 +-
 silk/NSQ.c                                    |  14 +-
 silk/NSQ_del_dec.c                            |   6 +-
 silk/PLC.c                                    |  28 +--
 silk/PLC.h                                    |   6 +-
 silk/SigProc_FIX.h                            |  96 ++++-----
 silk/VAD.c                                    |  26 +--
 silk/VQ_WMat_EC.c                             |   4 +-
 silk/ana_filt_bank_1.c                        |   2 +-
 silk/arm/LPC_inv_pred_gain_arm.h              |  18 +-
 silk/arm/LPC_inv_pred_gain_neon_intr.c        |  10 +-
 silk/arm/NSQ_del_dec_arm.h                    |  24 +--
 silk/arm/NSQ_del_dec_neon_intr.c              |  10 +-
 silk/arm/arm_silk_map.c                       |  42 ++--
 silk/arm/biquad_alt_arm.h                     |  20 +-
 silk/arm/biquad_alt_neon_intr.c               |  12 +-
 silk/biquad_alt.c                             |   4 +-
 silk/bwexpander.c                             |   2 +-
 silk/bwexpander_32.c                          |   4 +-
 silk/check_control_input.c                    |   2 +-
 silk/code_signs.c                             |  14 +-
 silk/control.h                                |   2 +-
 silk/control_SNR.c                            |   2 +-
 silk/control_audio_bandwidth.c                |   2 +-
 silk/control_codec.c                          |  40 ++--
 silk/dec_API.c                                |  66 +++---
 silk/decode_core.c                            |   6 +-
 silk/decode_frame.c                           |  22 +-
 silk/decode_indices.c                         |  46 ++---
 silk/decode_parameters.c                      |  20 +-
 silk/decode_pitch.c                           |  10 +-
 silk/decode_pulses.c                          |  18 +-
 silk/decoder_set_fs.c                         |  22 +-
 silk/enc_API.c                                |  54 ++---
 silk/encode_indices.c                         |  48 ++---
 silk/encode_pulses.c                          |  34 ++--
 silk/fixed/LTP_analysis_filter_FIX.c          |   2 +-
 silk/fixed/LTP_scale_ctrl_FIX.c               |   8 +-
 silk/fixed/apply_sine_window_FIX.c            |   2 +-
 .../arm/warped_autocorrelation_FIX_arm.h      |  20 +-
 .../warped_autocorrelation_FIX_neon_intr.c    |   6 +-
 silk/fixed/autocorr_FIX.c                     |   4 +-
 silk/fixed/burg_modified_FIX.c                |  12 +-
 silk/fixed/corrMatrix_FIX.c                   |  10 +-
 silk/fixed/encode_frame_FIX.c                 |  40 ++--
 silk/fixed/find_LPC_FIX.c                     |  20 +-
 silk/fixed/find_LTP_FIX.c                     |   8 +-
 silk/fixed/find_pitch_lags_FIX.c              |  18 +-
 silk/fixed/find_pred_coefs_FIX.c              |  20 +-
 silk/fixed/k2a_FIX.c                          |   2 +-
 silk/fixed/k2a_Q16_FIX.c                      |   2 +-
 silk/fixed/main_FIX.h                         |  46 ++---
 .../mips/warped_autocorrelation_FIX_mipsr1.h  |  10 +-
 silk/fixed/noise_shape_analysis_FIX.c         |  30 +--
 silk/fixed/pitch_analysis_core_FIX.c          |  70 +++----
 silk/fixed/process_gains_FIX.c                |  10 +-
 silk/fixed/regularize_correlations_FIX.c      |   2 +-
 silk/fixed/residual_energy16_FIX.c            |   2 +-
 silk/fixed/residual_energy_FIX.c              |   6 +-
 silk/fixed/schur64_FIX.c                      |   2 +-
 silk/fixed/schur_FIX.c                        |   2 +-
 silk/fixed/vector_ops_FIX.c                   |  10 +-
 silk/fixed/warped_autocorrelation_FIX.c       |   6 +-
 silk/fixed/x86/burg_modified_FIX_sse4_1.c     |  14 +-
 silk/fixed/x86/vector_ops_FIX_sse4_1.c        |   4 +-
 silk/float/LPC_analysis_filter_FLP.c          |   2 +-
 silk/float/LPC_inv_pred_gain_FLP.c            |   2 +-
 silk/float/LTP_analysis_filter_FLP.c          |   2 +-
 silk/float/LTP_scale_ctrl_FLP.c               |   8 +-
 silk/float/SigProc_FLP.h                      |  28 +--
 silk/float/apply_sine_window_FLP.c            |   2 +-
 silk/float/autocorrelation_FLP.c              |   4 +-
 silk/float/burg_modified_FLP.c                |   8 +-
 silk/float/bwexpander_FLP.c                   |   2 +-
 silk/float/corrMatrix_FLP.c                   |  10 +-
 silk/float/encode_frame_FLP.c                 |  36 ++--
 silk/float/energy_FLP.c                       |   2 +-
 silk/float/find_LPC_FLP.c                     |  20 +-
 silk/float/find_LTP_FLP.c                     |  12 +-
 silk/float/find_pitch_lags_FLP.c              |  18 +-
 silk/float/find_pred_coefs_FLP.c              |  18 +-
 silk/float/inner_product_FLP.c                |   2 +-
 silk/float/k2a_FLP.c                          |   2 +-
 silk/float/main_FLP.h                         |  54 ++---
 silk/float/noise_shape_analysis_FLP.c         |  22 +-
 silk/float/pitch_analysis_core_FLP.c          |  60 +++---
 silk/float/process_gains_FLP.c                |   6 +-
 silk/float/regularize_correlations_FLP.c      |   2 +-
 silk/float/residual_energy_FLP.c              |  16 +-
 silk/float/scale_copy_vector_FLP.c            |   2 +-
 silk/float/scale_vector_FLP.c                 |   2 +-
 silk/float/schur_FLP.c                        |   2 +-
 silk/float/sort_FLP.c                         |   2 +-
 silk/float/warped_autocorrelation_FLP.c       |   2 +-
 silk/float/wrappers_FLP.c                     |  24 +--
 silk/float/x86/inner_product_FLP_avx2.c       |   2 +-
 silk/gain_quant.c                             |  12 +-
 silk/init_decoder.c                           |  12 +-
 silk/init_encoder.c                           |   6 +-
 silk/inner_prod_aligned.c                     |   2 +-
 silk/interpolate.c                            |   2 +-
 silk/lin2log.c                                |   4 +-
 silk/log2lin.c                                |   4 +-
 silk/main.h                                   | 110 +++++-----
 silk/pitch_est_defines.h                      |  14 +-
 silk/pitch_est_tables.c                       |  14 +-
 silk/process_NLSFs.c                          |  16 +-
 silk/quant_LTP_gains.c                        |  20 +-
 silk/resampler.c                              |  28 +--
 silk/resampler_down2.c                        |   2 +-
 silk/resampler_down2_3.c                      |  22 +-
 silk/resampler_private.h                      |  10 +-
 silk/resampler_private_AR2.c                  |   2 +-
 silk/resampler_private_IIR_FIR.c              |  20 +-
 silk/resampler_private_down_FIR.c             |   4 +-
 silk/resampler_private_up2_HQ.c               |   6 +-
 silk/resampler_rom.c                          |  16 +-
 silk/resampler_rom.h                          |  16 +-
 silk/shell_coder.c                            |  68 +++----
 silk/sigm_Q15.c                               |   2 +-
 silk/sort.c                                   |   6 +-
 silk/stereo_LR_to_MS.c                        |  16 +-
 silk/stereo_MS_to_LR.c                        |   2 +-
 silk/stereo_decode_pred.c                     |  16 +-
 silk/stereo_encode_pred.c                     |  12 +-
 silk/stereo_find_predictor.c                  |   8 +-
 silk/stereo_quant_pred.c                      |   6 +-
 silk/sum_sqr_shift.c                          |   2 +-
 silk/table_LSF_cos.c                          |   2 +-
 silk/tables.h                                 |  94 ++++-----
 silk/tables_LTP.c                             |  12 +-
 silk/tables_NLSF_CB_NB_MB.c                   |   2 +-
 silk/tables_NLSF_CB_WB.c                      |   2 +-
 silk/tables_gain.c                            |   4 +-
 silk/tables_other.c                           |  38 ++--
 silk/tables_pitch_lag.c                       |  12 +-
 silk/tables_pulses_per_block.c                |  22 +-
 silk/tests/test_unit_LPC_inv_pred_gain.c      |   8 +-
 silk/x86/NSQ_del_dec_avx2.c                   |   8 +-
 silk/x86/NSQ_del_dec_sse4_1.c                 |   8 +-
 silk/x86/NSQ_sse4_1.c                         |  10 +-
 silk/x86/SigProc_FIX_sse.h                    |  32 +--
 silk/x86/VAD_sse4_1.c                         |  22 +-
 silk/x86/VQ_WMat_EC_sse4_1.c                  |   6 +-
 silk/x86/main_sse.h                           |  86 ++++----
 silk/x86/x86_silk_map.c                       |  84 ++++----
 src/analysis.c                                |  46 ++---
 src/analysis.h                                |  10 +-
 src/mapping_matrix.c                          |  72 +++----
 src/mapping_matrix.h                          |  58 +++---
 src/mlp.c                                     |   4 +-
 src/mlp.h                                     |  10 +-
 src/mlp_data.c                                |   6 +-
 src/oac.c                                     |   2 +-
 src/oac_decoder.c                             |  62 +++---
 src/oac_encoder.c                             | 140 ++++++-------
 src/oac_multistream.c                         |   8 +-
 src/oac_multistream_decoder.c                 |  10 +-
 src/oac_multistream_encoder.c                 |  44 ++--
 src/oac_private.h                             |  24 +--
 src/oac_projection_decoder.c                  |  12 +-
 src/oac_projection_encoder.c                  | 144 ++++++-------
 src/qext_compare.c                            |   8 +-
 src/repacketizer.c                            |   6 +-
 tests/test_oac_projection.c                   |  12 +-
 286 files changed, 3293 insertions(+), 3288 deletions(-)

diff --git a/celt/_kiss_fft_guts.h b/celt/_kiss_fft_guts.h
index 82ce76035..0db357668 100644
--- a/celt/_kiss_fft_guts.h
+++ b/celt/_kiss_fft_guts.h
@@ -173,8 +173,8 @@
 
 #define  kf_cexp2(x, phase) \
         do { \
-            (x)->r = TRIG_UPSCALE*celt_cos_norm((phase)); \
-            (x)->i = TRIG_UPSCALE*celt_cos_norm((phase) - 32768); \
+            (x)->r = TRIG_UPSCALE*oaci_celt_cos_norm((phase)); \
+            (x)->i = TRIG_UPSCALE*oaci_celt_cos_norm((phase) - 32768); \
         } while (0)
 
 #endif /* KISS_FFT_GUTS_H */
diff --git a/celt/arch.h b/celt/arch.h
index 916cfa9e1..b0a59f959 100644
--- a/celt/arch.h
+++ b/celt/arch.h
@@ -56,21 +56,21 @@
 
 #define CELT_SIG_SCALE 32768.f
 
-#define CELT_FATAL(str) celt_fatal(str, __FILE__, __LINE__)
+#define CELT_FATAL(str) oaci_celt_fatal(str, __FILE__, __LINE__)
 
 #if defined(ENABLE_ASSERTIONS) || defined(ENABLE_HARDENING)
 # ifdef __GNUC__
 __attribute__((noreturn))
 # endif
-void celt_fatal(const char *str, const char *file, int line);
+void oaci_celt_fatal(const char *str, const char *file, int line);
 
-# if defined(CELT_C) && !defined(OVERRIDE_celt_fatal)
+# if defined(CELT_C) && !defined(OVERRIDE_oaci_celt_fatal)
 #  include <stdio.h>
 #  include <stdlib.h>
 #  ifdef __GNUC__
 __attribute__((noreturn))
 #  endif
-void celt_fatal(const char *str, const char *file, int line) {
+void oaci_celt_fatal(const char *str, const char *file, int line) {
     fprintf (stderr, "Fatal (internal) error in %s, line %d: %s\n", file, line, str);
 #  if defined(_MSC_VER)
     _set_abort_behavior( 0, _WRITE_ABORT_MSG);
diff --git a/celt/arm/arm_celt_map.c b/celt/arm/arm_celt_map.c
index fe39e2296..04a9c8ae7 100644
--- a/celt/arm/arm_celt_map.c
+++ b/celt/arm/arm_celt_map.c
@@ -41,11 +41,11 @@
 #  if defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR)
 void (*const CELT_FLOAT2INT16_IMPL[OAC_ARCHMASK + 1])(const float * OAC_RESTRICT in, short * OAC_RESTRICT out,
 int cnt) = {
-    celt_float2int16_c, /* ARMv4 */
-    celt_float2int16_c, /* EDSP */
-    celt_float2int16_c, /* Media */
-    celt_float2int16_neon,/* NEON */
-    celt_float2int16_neon /* DOTPROD */
+    oaci_celt_float2int16_c, /* ARMv4 */
+    oaci_celt_float2int16_c, /* EDSP */
+    oaci_celt_float2int16_c, /* Media */
+    oaci_celt_float2int16_neon,/* NEON */
+    oaci_celt_float2int16_neon /* DOTPROD */
 };
 
 int (*const OAC_LIMIT2_CHECKWITHIN1_IMPL[OAC_ARCHMASK + 1])(float * samples, int cnt) = {
@@ -59,21 +59,21 @@ int (*const OAC_LIMIT2_CHECKWITHIN1_IMPL[OAC_ARCHMASK + 1])(float * samples, int
 # endif
 
 # if defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR)
-oac_val32 (*const CELT_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(const oac_val16 *x, const oac_val16 *y, int N) = {
-    celt_inner_prod_c, /* ARMv4 */
-    celt_inner_prod_c, /* EDSP */
-    celt_inner_prod_c, /* Media */
-    celt_inner_prod_neon,/* NEON */
-    celt_inner_prod_neon /* DOTPROD */
+oac_val32 (*const oaci_CELT_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(const oac_val16 *x, const oac_val16 *y, int N) = {
+    oaci_celt_inner_prod_c, /* ARMv4 */
+    oaci_celt_inner_prod_c, /* EDSP */
+    oaci_celt_inner_prod_c, /* Media */
+    oaci_celt_inner_prod_neon,/* NEON */
+    oaci_celt_inner_prod_neon /* DOTPROD */
 };
 
 void (*const DUAL_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
       int N, oac_val32 *xy1, oac_val32 *xy2) = {
-    dual_inner_prod_c, /* ARMv4 */
-    dual_inner_prod_c, /* EDSP */
-    dual_inner_prod_c, /* Media */
-    dual_inner_prod_neon,/* NEON */
-    dual_inner_prod_neon /* DOTPROD */
+    oaci_dual_inner_prod_c, /* ARMv4 */
+    oaci_dual_inner_prod_c, /* EDSP */
+    oaci_dual_inner_prod_c, /* Media */
+    oaci_dual_inner_prod_neon,/* NEON */
+    oaci_dual_inner_prod_neon /* DOTPROD */
 };
 # endif
 
@@ -83,11 +83,11 @@ void (*const DUAL_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(const oac_val16 *x, const o
     (defined(OAC_ARM_MAY_HAVE_EDSP) && !defined(OAC_ARM_PRESUME_EDSP)))
 oac_val32 (*const CELT_PITCH_XCORR_IMPL[OAC_ARCHMASK + 1])(const oac_val16 *,
     const oac_val16 *, oac_val32 *, int, int, int) = {
-    celt_pitch_xcorr_c,             /* ARMv4 */
-    MAY_HAVE_EDSP(celt_pitch_xcorr), /* EDSP */
-    MAY_HAVE_MEDIA(celt_pitch_xcorr), /* Media */
-    MAY_HAVE_NEON(celt_pitch_xcorr), /* NEON */
-    MAY_HAVE_NEON(celt_pitch_xcorr) /* DOTPROD */
+    oaci_celt_pitch_xcorr_c,             /* ARMv4 */
+    MAY_HAVE_EDSP(oaci_celt_pitch_xcorr), /* EDSP */
+    MAY_HAVE_MEDIA(oaci_celt_pitch_xcorr), /* Media */
+    MAY_HAVE_NEON(oaci_celt_pitch_xcorr), /* NEON */
+    MAY_HAVE_NEON(oaci_celt_pitch_xcorr) /* DOTPROD */
 };
 
 #  endif
@@ -95,11 +95,11 @@ oac_val32 (*const CELT_PITCH_XCORR_IMPL[OAC_ARCHMASK + 1])(const oac_val16 *,
 #  if defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR)
 void (*const CELT_PITCH_XCORR_IMPL[OAC_ARCHMASK + 1])(const oac_val16 *,
     const oac_val16 *, oac_val32 *, int, int, int) = {
-    celt_pitch_xcorr_c,            /* ARMv4 */
-    celt_pitch_xcorr_c,            /* EDSP */
-    celt_pitch_xcorr_c,            /* Media */
-    celt_pitch_xcorr_float_neon,   /* Neon */
-    celt_pitch_xcorr_float_neon    /* DOTPROD */
+    oaci_celt_pitch_xcorr_c,            /* ARMv4 */
+    oaci_celt_pitch_xcorr_c,            /* EDSP */
+    oaci_celt_pitch_xcorr_c,            /* Media */
+    oaci_celt_pitch_xcorr_float_neon,   /* Neon */
+    oaci_celt_pitch_xcorr_float_neon    /* DOTPROD */
 };
 #  endif
 # endif /* FIXED_POINT */
@@ -107,17 +107,17 @@ void (*const CELT_PITCH_XCORR_IMPL[OAC_ARCHMASK + 1])(const oac_val16 *,
 # if defined(FIXED_POINT) && defined(OAC_HAVE_RTCD) && \
     defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR)
 
-void (*const XCORR_KERNEL_IMPL[OAC_ARCHMASK + 1])(
+void (*const oaci_XCORR_KERNEL_IMPL[OAC_ARCHMASK + 1])(
          const oac_val16 *x,
          const oac_val16 *y,
          oac_val32 sum[4],
          int len
     ) = {
-    xcorr_kernel_c,              /* ARMv4 */
-    xcorr_kernel_c,              /* EDSP */
-    xcorr_kernel_c,              /* Media */
-    xcorr_kernel_neon_fixed,     /* Neon */
-    xcorr_kernel_neon_fixed      /* DOTPROD */
+    oaci_xcorr_kernel_c,              /* ARMv4 */
+    oaci_xcorr_kernel_c,              /* EDSP */
+    oaci_xcorr_kernel_c,              /* Media */
+    oaci_xcorr_kernel_neon_fixed,     /* Neon */
+    oaci_xcorr_kernel_neon_fixed      /* DOTPROD */
 };
 
 # endif
@@ -168,11 +168,11 @@ void (*const CLT_MDCT_FORWARD_IMPL[OAC_ARCHMASK + 1])(const mdct_lookup *l,
                                                      const oac_val16 *window,
                                                      int overlap, int shift,
                                                      int stride, int arch) = {
-    clt_mdct_forward_c,          /* ARMv4 */
-    clt_mdct_forward_c,          /* EDSP */
-    clt_mdct_forward_c,          /* Media */
-    clt_mdct_forward_neon,       /* Neon with NE10 */
-    clt_mdct_forward_neon        /* DOTPROD with NE10 */
+    oaci_clt_mdct_forward_c,          /* ARMv4 */
+    oaci_clt_mdct_forward_c,          /* EDSP */
+    oaci_clt_mdct_forward_c,          /* Media */
+    oaci_clt_mdct_forward_neon,       /* Neon with NE10 */
+    oaci_clt_mdct_forward_neon        /* DOTPROD with NE10 */
 };
 
 void (*const CLT_MDCT_BACKWARD_IMPL[OAC_ARCHMASK + 1])(const mdct_lookup *l,
@@ -181,11 +181,11 @@ void (*const CLT_MDCT_BACKWARD_IMPL[OAC_ARCHMASK + 1])(const mdct_lookup *l,
                                                       const oac_val16 *window,
                                                       int overlap, int shift,
                                                       int stride, int arch) = {
-    clt_mdct_backward_c,          /* ARMv4 */
-    clt_mdct_backward_c,          /* EDSP */
-    clt_mdct_backward_c,          /* Media */
-    clt_mdct_backward_neon,       /* Neon with NE10 */
-    clt_mdct_backward_neon        /* DOTPROD with NE10 */
+    oaci_clt_mdct_backward_c,          /* ARMv4 */
+    oaci_clt_mdct_backward_c,          /* EDSP */
+    oaci_clt_mdct_backward_c,          /* Media */
+    oaci_clt_mdct_backward_neon,       /* Neon with NE10 */
+    oaci_clt_mdct_backward_neon        /* DOTPROD with NE10 */
 };
 
 #  endif /* HAVE_ARM_NE10 */
diff --git a/celt/arm/celt_mdct_ne10.c b/celt/arm/celt_mdct_ne10.c
index 398696a7e..a5f6980f4 100644
--- a/celt/arm/celt_mdct_ne10.c
+++ b/celt/arm/celt_mdct_ne10.c
@@ -41,7 +41,7 @@
 #include "mdct.h"
 #include "stack_alloc.h"
 
-void clt_mdct_forward_neon(const mdct_lookup *l,
+void oaci_clt_mdct_forward_neon(const mdct_lookup *l,
                            kiss_fft_scalar *in,
                            kiss_fft_scalar * OAC_RESTRICT out,
                            const oac_val16 *window,
@@ -148,7 +148,7 @@ void clt_mdct_forward_neon(const mdct_lookup *l,
     RESTORE_STACK;
 }
 
-void clt_mdct_backward_neon(const mdct_lookup *l,
+void oaci_clt_mdct_backward_neon(const mdct_lookup *l,
                             kiss_fft_scalar *in,
                             kiss_fft_scalar * OAC_RESTRICT out,
                             const oac_val16 * OAC_RESTRICT window,
diff --git a/celt/arm/celt_neon_intr.c b/celt/arm/celt_neon_intr.c
index 569519e24..cef8e9a89 100644
--- a/celt/arm/celt_neon_intr.c
+++ b/celt/arm/celt_neon_intr.c
@@ -46,7 +46,7 @@
 
 #if !defined(DISABLE_FLOAT_API) && defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 
-void celt_float2int16_neon(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt) {
+void oaci_celt_float2int16_neon(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt) {
     int i = 0;
 
 # if defined(__ARM_NEON)
@@ -160,7 +160,7 @@ int oac_limit2_checkwithin1_neon(float *samples, int cnt) {
 #if defined(FIXED_POINT)
 # include <string.h>
 
-void xcorr_kernel_neon_fixed(const oac_val16 * x, const oac_val16 * y, oac_val32 sum[4], int len) {
+void oaci_xcorr_kernel_neon_fixed(const oac_val16 * x, const oac_val16 * y, oac_val32 sum[4], int len) {
     int j;
     int32x4_t a = vld1q_s32(sum);
     /* Load y[0...3] */
@@ -277,11 +277,11 @@ void xcorr_kernel_neon_fixed(const oac_val16 * x, const oac_val16 * y, oac_val32
 
 
 /*
- * Function: xcorr_kernel_neon_float
+ * Function: oaci_xcorr_kernel_neon_float
  * ---------------------------------
  * Computes 4 correlation values and stores them in sum[4]
  */
-static void xcorr_kernel_neon_float(const float32_t *x, const float32_t *y,
+static void oaci_xcorr_kernel_neon_float(const float32_t *x, const float32_t *y,
                                     float32_t sum[4], int len) {
     float32x4_t YY[3];
     float32x4_t YEXT[3];
@@ -370,7 +370,7 @@ static void xcorr_kernel_neon_float(const float32_t *x, const float32_t *y,
     vst1q_f32(sum, SUMM);
 }
 
-void celt_pitch_xcorr_float_neon(const oac_val16 *_x, const oac_val16 *_y,
+void oaci_celt_pitch_xcorr_float_neon(const oac_val16 *_x, const oac_val16 *_y,
                                  oac_val32 *xcorr, int len, int max_pitch, int arch) {
     int i;
     (void)arch;
@@ -378,13 +378,13 @@ void celt_pitch_xcorr_float_neon(const oac_val16 *_x, const oac_val16 *_y,
     celt_sig_assert((((size_t)_x)&3) == 0);
 
     for (i = 0; i < (max_pitch - 3); i += 4) {
-        xcorr_kernel_neon_float((const float32_t *)_x, (const float32_t *)_y + i,
+        oaci_xcorr_kernel_neon_float((const float32_t *)_x, (const float32_t *)_y + i,
             (float32_t *)xcorr + i, len);
     }
 
     /* In case max_pitch isn't a multiple of 4, do non-unrolled version. */
     for (; i < max_pitch; i++) {
-        xcorr[i] = celt_inner_prod_neon(_x, _y + i, len);
+        xcorr[i] = oaci_celt_inner_prod_neon(_x, _y + i, len);
     }
 }
 #endif
diff --git a/celt/arm/celt_pitch_xcorr_arm.s b/celt/arm/celt_pitch_xcorr_arm.s
index 41c9fa18f..fa5987d77 100644
--- a/celt/arm/celt_pitch_xcorr_arm.s
+++ b/celt/arm/celt_pitch_xcorr_arm.s
@@ -31,17 +31,17 @@
   GET    celt/arm/armopts.s
 
 IF OAC_ARM_MAY_HAVE_EDSP
-  EXPORT celt_pitch_xcorr_edsp
+  EXPORT oaci_celt_pitch_xcorr_edsp
 ENDIF
 
 IF OAC_ARM_MAY_HAVE_NEON
-  EXPORT celt_pitch_xcorr_neon
+  EXPORT oaci_celt_pitch_xcorr_neon
 ENDIF
 
 IF OAC_ARM_MAY_HAVE_NEON
 
 ; Compute sum[k]=sum(x[j]*y[j+k],j=0...len-1), k=0...3
-xcorr_kernel_neon PROC
+oaci_xcorr_kernel_neon PROC
 xcorr_kernel_neon_start
   ; input:
   ;   r3     = int         len
@@ -152,9 +152,9 @@ xcorr_kernel_neon_process1
   MOV          pc, lr
   ENDP
 
-; oac_val32 celt_pitch_xcorr_neon(oac_val16 *_x, oac_val16 *_y,
+; oac_val32 oaci_celt_pitch_xcorr_neon(oac_val16 *_x, oac_val16 *_y,
 ;  oac_val32 *xcorr, int len, int max_pitch, int arch)
-celt_pitch_xcorr_neon PROC
+oaci_celt_pitch_xcorr_neon PROC
   ; input:
   ;   r0  = oac_val16 *_x
   ;   r1  = oac_val16 *_y
@@ -259,7 +259,7 @@ IF OAC_ARM_MAY_HAVE_EDSP
 
 ; This will get used on ARMv7 devices without NEON, so it has been optimized
 ; to take advantage of dual-issuing where possible.
-xcorr_kernel_edsp PROC
+oaci_xcorr_kernel_edsp PROC
 xcorr_kernel_edsp_start
   ; input:
   ;   r3      = int         len
@@ -343,7 +343,7 @@ xcorr_kernel_edsp_done
   LDMFD        sp!, {r2,r4,r5,pc}
   ENDP
 
-celt_pitch_xcorr_edsp PROC
+oaci_celt_pitch_xcorr_edsp PROC
   ; input:
   ;   r0  = oac_val16 *_x (must be 32-bit aligned)
   ;   r1  = oac_val16 *_y (only needs to be 16-bit aligned)
diff --git a/celt/arm/mathops_arm.h b/celt/arm/mathops_arm.h
index d33f7a540..3139c8e29 100644
--- a/celt/arm/mathops_arm.h
+++ b/celt/arm/mathops_arm.h
@@ -67,19 +67,19 @@ static inline float vmaxvf(float32x4_t a) {
 # endif
 }
 
-void celt_float2int16_neon(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt);
+void oaci_celt_float2int16_neon(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt);
 # if defined(OAC_HAVE_RTCD) && \
     (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
 extern void
 (*const CELT_FLOAT2INT16_IMPL[OAC_ARCHMASK + 1])(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt);
 
 #  define OVERRIDE_FLOAT2INT16 (1)
-#  define celt_float2int16(in, out, cnt, arch) \
+#  define oaci_celt_float2int16(in, out, cnt, arch) \
         ((*CELT_FLOAT2INT16_IMPL[(arch)&OAC_ARCHMASK])(in, out, cnt))
 
 # elif defined(OAC_ARM_PRESUME_NEON_INTR)
 #  define OVERRIDE_FLOAT2INT16 (1)
-#  define celt_float2int16(in, out, cnt, arch) ((void)(arch), celt_float2int16_neon(in, out, cnt))
+#  define oaci_celt_float2int16(in, out, cnt, arch) ((void)(arch), oaci_celt_float2int16_neon(in, out, cnt))
 # endif
 
 int oac_limit2_checkwithin1_neon(float * samples, int cnt);
diff --git a/celt/arm/mdct_arm.h b/celt/arm/mdct_arm.h
index 5b68642db..1fb2488d9 100644
--- a/celt/arm/mdct_arm.h
+++ b/celt/arm/mdct_arm.h
@@ -37,22 +37,22 @@
 
 #if defined(HAVE_ARM_NE10)
 /** Compute a forward MDCT and scale by 4/N, trashes the input array */
-void clt_mdct_forward_neon(const mdct_lookup *l, kiss_fft_scalar *in,
+void oaci_clt_mdct_forward_neon(const mdct_lookup *l, kiss_fft_scalar *in,
     kiss_fft_scalar * OAC_RESTRICT out,
     const oac_val16 *window, int overlap,
     int shift, int stride, int arch);
 
-void clt_mdct_backward_neon(const mdct_lookup *l, kiss_fft_scalar *in,
+void oaci_clt_mdct_backward_neon(const mdct_lookup *l, kiss_fft_scalar *in,
     kiss_fft_scalar * OAC_RESTRICT out,
     const oac_val16 *window, int overlap,
     int shift, int stride, int arch);
 
 # if !defined(OAC_HAVE_RTCD)
 #  define OVERRIDE_OAC_MDCT (1)
-#  define clt_mdct_forward(_l, _in, _out, _window, _int, _shift, _stride, _arch) \
-        clt_mdct_forward_neon(_l, _in, _out, _window, _int, _shift, _stride, _arch)
-#  define clt_mdct_backward(_l, _in, _out, _window, _int, _shift, _stride, _arch) \
-        clt_mdct_backward_neon(_l, _in, _out, _window, _int, _shift, _stride, _arch)
+#  define oaci_clt_mdct_forward(_l, _in, _out, _window, _int, _shift, _stride, _arch) \
+        oaci_clt_mdct_forward_neon(_l, _in, _out, _window, _int, _shift, _stride, _arch)
+#  define oaci_clt_mdct_backward(_l, _in, _out, _window, _int, _shift, _stride, _arch) \
+        oaci_clt_mdct_backward_neon(_l, _in, _out, _window, _int, _shift, _stride, _arch)
 # endif /* OAC_HAVE_RTCD */
 #endif /* HAVE_ARM_NE10 */
 
diff --git a/celt/arm/pitch_arm.h b/celt/arm/pitch_arm.h
index 05923cdad..403e36e5e 100644
--- a/celt/arm/pitch_arm.h
+++ b/celt/arm/pitch_arm.h
@@ -31,27 +31,27 @@
 #include "armcpu.h"
 
 #if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
-oac_val32 celt_inner_prod_neon(const oac_val16 *x, const oac_val16 *y, int N);
-void dual_inner_prod_neon(const oac_val16 *x, const oac_val16 *y01,
+oac_val32 oaci_celt_inner_prod_neon(const oac_val16 *x, const oac_val16 *y, int N);
+void oaci_dual_inner_prod_neon(const oac_val16 *x, const oac_val16 *y01,
     const oac_val16 *y02, int N, oac_val32 *xy1, oac_val32 *xy2);
 
 # if !defined(OAC_HAVE_RTCD) && defined(OAC_ARM_PRESUME_NEON)
 #  define OVERRIDE_CELT_INNER_PROD (1)
 #  define OVERRIDE_DUAL_INNER_PROD (1)
-#  define celt_inner_prod(x, y, N, arch) ((void)(arch), PRESUME_NEON(celt_inner_prod)(x, y, N))
-#  define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) ((void)(arch), \
-                                                           PRESUME_NEON(dual_inner_prod)(x, y01, y02, N, xy1, xy2))
+#  define oaci_celt_inner_prod(x, y, N, arch) ((void)(arch), PRESUME_NEON(oaci_celt_inner_prod)(x, y, N))
+#  define oaci_dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) ((void)(arch), \
+                                                           PRESUME_NEON(oaci_dual_inner_prod)(x, y01, y02, N, xy1, xy2))
 # endif
 #endif
 
 #if !defined(OVERRIDE_CELT_INNER_PROD)
 # if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
-extern oac_val32 (*const CELT_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(const oac_val16 *x, const oac_val16 *y, int N);
+extern oac_val32 (*const oaci_CELT_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(const oac_val16 *x, const oac_val16 *y, int N);
 #  define OVERRIDE_CELT_INNER_PROD (1)
-#  define celt_inner_prod(x, y, N, arch) ((*CELT_INNER_PROD_IMPL[(arch)&OAC_ARCHMASK])(x, y, N))
+#  define oaci_celt_inner_prod(x, y, N, arch) ((*oaci_CELT_INNER_PROD_IMPL[(arch)&OAC_ARCHMASK])(x, y, N))
 # elif defined(OAC_ARM_PRESUME_NEON_INTR)
 #  define OVERRIDE_CELT_INNER_PROD (1)
-#  define celt_inner_prod(x, y, N, arch) ((void)(arch), celt_inner_prod_neon(x, y, N))
+#  define oaci_celt_inner_prod(x, y, N, arch) ((void)(arch), oaci_celt_inner_prod_neon(x, y, N))
 # endif
 #endif
 
@@ -60,27 +60,27 @@ extern oac_val32 (*const CELT_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(const oac_val16
 extern void (*const DUAL_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(const oac_val16 *x,
         const oac_val16 *y01, const oac_val16 *y02, int N, oac_val32 *xy1, oac_val32 *xy2);
 #  define OVERRIDE_DUAL_INNER_PROD (1)
-#  define dual_inner_prod(x, y01, y02, N, xy1, xy2, \
+#  define oaci_dual_inner_prod(x, y01, y02, N, xy1, xy2, \
                           arch) ((*DUAL_INNER_PROD_IMPL[(arch)&OAC_ARCHMASK])(x, y01, y02, N, xy1, xy2))
 # elif defined(OAC_ARM_PRESUME_NEON_INTR)
 #  define OVERRIDE_DUAL_INNER_PROD (1)
-#  define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) ((void)(arch), dual_inner_prod_neon(x, y01, y02, N, xy1, xy2))
+#  define oaci_dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) ((void)(arch), oaci_dual_inner_prod_neon(x, y01, y02, N, xy1, xy2))
 # endif
 #endif
 
 #if defined(FIXED_POINT)
 
 # if defined(OAC_ARM_MAY_HAVE_NEON)
-oac_val32 celt_pitch_xcorr_neon(const oac_val16 *_x, const oac_val16 *_y,
+oac_val32 oaci_celt_pitch_xcorr_neon(const oac_val16 *_x, const oac_val16 *_y,
     oac_val32 *xcorr, int len, int max_pitch, int arch);
 # endif
 
 # if defined(OAC_ARM_MAY_HAVE_MEDIA)
-#  define celt_pitch_xcorr_media MAY_HAVE_EDSP(celt_pitch_xcorr)
+#  define oaci_celt_pitch_xcorr_media MAY_HAVE_EDSP(oaci_celt_pitch_xcorr)
 # endif
 
 # if defined(OAC_ARM_MAY_HAVE_EDSP)
-oac_val32 celt_pitch_xcorr_edsp(const oac_val16 *_x, const oac_val16 *_y,
+oac_val32 oaci_celt_pitch_xcorr_edsp(const oac_val16 *_x, const oac_val16 *_y,
     oac_val32 *xcorr, int len, int max_pitch, int arch);
 # endif
 
@@ -92,7 +92,7 @@ extern oac_val32
 (*const CELT_PITCH_XCORR_IMPL[OAC_ARCHMASK + 1])(const oac_val16 *,
       const oac_val16 *, oac_val32 *, int, int, int);
 #  define OVERRIDE_PITCH_XCORR (1)
-#  define celt_pitch_xcorr(_x, _y, xcorr, len, max_pitch, arch) \
+#  define oaci_celt_pitch_xcorr(_x, _y, xcorr, len, max_pitch, arch) \
         ((*CELT_PITCH_XCORR_IMPL[(arch)&OAC_ARCHMASK])(_x, _y, \
                                                        xcorr, len, max_pitch, arch))
 
@@ -100,12 +100,12 @@ extern oac_val32
     defined(OAC_ARM_PRESUME_MEDIA) || \
     defined(OAC_ARM_PRESUME_NEON)
 #  define OVERRIDE_PITCH_XCORR (1)
-#  define celt_pitch_xcorr (PRESUME_NEON(celt_pitch_xcorr))
+#  define oaci_celt_pitch_xcorr (PRESUME_NEON(oaci_celt_pitch_xcorr))
 
 # endif
 
 # if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
-void xcorr_kernel_neon_fixed(
+void oaci_xcorr_kernel_neon_fixed(
     const oac_val16 *x,
     const oac_val16 *y,
     oac_val32 sum[4],
@@ -115,27 +115,27 @@ void xcorr_kernel_neon_fixed(
 # if defined(OAC_HAVE_RTCD) && \
     (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
 
-extern void (*const XCORR_KERNEL_IMPL[OAC_ARCHMASK + 1])(
+extern void (*const oaci_XCORR_KERNEL_IMPL[OAC_ARCHMASK + 1])(
                     const oac_val16 *x,
                     const oac_val16 *y,
                     oac_val32 sum[4],
                     int len);
 
 #  define OVERRIDE_XCORR_KERNEL (1)
-#  define xcorr_kernel(x, y, sum, len, arch) \
-        ((*XCORR_KERNEL_IMPL[(arch)&OAC_ARCHMASK])(x, y, sum, len))
+#  define oaci_xcorr_kernel(x, y, sum, len, arch) \
+        ((*oaci_XCORR_KERNEL_IMPL[(arch)&OAC_ARCHMASK])(x, y, sum, len))
 
 # elif defined(OAC_ARM_PRESUME_NEON_INTR)
 #  define OVERRIDE_XCORR_KERNEL (1)
-#  define xcorr_kernel(x, y, sum, len, arch) \
-        ((void)arch, xcorr_kernel_neon_fixed(x, y, sum, len))
+#  define oaci_xcorr_kernel(x, y, sum, len, arch) \
+        ((void)arch, oaci_xcorr_kernel_neon_fixed(x, y, sum, len))
 
 # endif
 
 #else /* Start !FIXED_POINT */
 /* Float case */
 # if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
-void celt_pitch_xcorr_float_neon(const oac_val16 *_x, const oac_val16 *_y,
+void oaci_celt_pitch_xcorr_float_neon(const oac_val16 *_x, const oac_val16 *_y,
     oac_val32 *xcorr, int len, int max_pitch, int arch);
 # endif
 
@@ -146,14 +146,14 @@ extern void
       const oac_val16 *, oac_val32 *, int, int, int);
 
 #  define OVERRIDE_PITCH_XCORR (1)
-#  define celt_pitch_xcorr(_x, _y, xcorr, len, max_pitch, arch) \
+#  define oaci_celt_pitch_xcorr(_x, _y, xcorr, len, max_pitch, arch) \
         ((*CELT_PITCH_XCORR_IMPL[(arch)&OAC_ARCHMASK])(_x, _y, \
                                                        xcorr, len, max_pitch, arch))
 
 # elif defined(OAC_ARM_PRESUME_NEON_INTR)
 
 #  define OVERRIDE_PITCH_XCORR (1)
-#  define celt_pitch_xcorr celt_pitch_xcorr_float_neon
+#  define oaci_celt_pitch_xcorr oaci_celt_pitch_xcorr_float_neon
 
 # endif
 
diff --git a/celt/arm/pitch_neon_intr.c b/celt/arm/pitch_neon_intr.c
index f6ea791b3..c55f32e97 100644
--- a/celt/arm/pitch_neon_intr.c
+++ b/celt/arm/pitch_neon_intr.c
@@ -34,7 +34,7 @@
 
 #ifdef FIXED_POINT
 
-oac_val32 celt_inner_prod_neon(const oac_val16 *x, const oac_val16 *y, int N) {
+oac_val32 oaci_celt_inner_prod_neon(const oac_val16 *x, const oac_val16 *y, int N) {
     int i;
     oac_val32 xy;
     int16x8_t x_s16x8, y_s16x8;
@@ -65,13 +65,13 @@ oac_val32 celt_inner_prod_neon(const oac_val16 *x, const oac_val16 *y, int N) {
     }
 
 # ifdef OAC_CHECK_ASM
-    celt_assert(celt_inner_prod_c(x, y, N) == xy);
+    celt_assert(oaci_celt_inner_prod_c(x, y, N) == xy);
 # endif
 
     return xy;
 }
 
-void dual_inner_prod_neon(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
+void oaci_dual_inner_prod_neon(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
                           int N, oac_val32 *xy1, oac_val32 *xy2) {
     int i;
     oac_val32 xy01, xy02;
@@ -117,7 +117,7 @@ void dual_inner_prod_neon(const oac_val16 *x, const oac_val16 *y01, const oac_va
 # ifdef OAC_CHECK_ASM
     {
         oac_val32 xy1_c, xy2_c;
-        dual_inner_prod_c(x, y01, y02, N, &xy1_c, &xy2_c);
+        oaci_dual_inner_prod_c(x, y01, y02, N, &xy1_c, &xy2_c);
         celt_assert(xy1_c == *xy1);
         celt_assert(xy2_c == *xy2);
     }
@@ -139,10 +139,10 @@ void dual_inner_prod_neon(const oac_val16 *x, const oac_val16 *y01, const oac_va
 
 /* This part of code simulates floating-point NEON operations. */
 
-/* celt_inner_prod_neon_float_c_simulation() simulates the floating-point   */
-/* operations of celt_inner_prod_neon(), and both functions should have bit */
+/* oaci_celt_inner_prod_neon_float_c_simulation() simulates the floating-point   */
+/* operations of oaci_celt_inner_prod_neon(), and both functions should have bit */
 /* exact output.                                                            */
-static oac_val32 celt_inner_prod_neon_float_c_simulation(const oac_val16 *x, const oac_val16 *y, float *err, int N) {
+static oac_val32 oaci_celt_inner_prod_neon_float_c_simulation(const oac_val16 *x, const oac_val16 *y, float *err, int N) {
     int i;
     *err = 0;
     oac_val32 xy, xy0 = 0, xy1 = 0, xy2 = 0, xy3 = 0;
@@ -165,20 +165,20 @@ static oac_val32 celt_inner_prod_neon_float_c_simulation(const oac_val16 *x, con
     return xy;
 }
 
-/* dual_inner_prod_neon_float_c_simulation() simulates the floating-point   */
-/* operations of dual_inner_prod_neon(), and both functions should have bit */
+/* oaci_dual_inner_prod_neon_float_c_simulation() simulates the floating-point   */
+/* operations of oaci_dual_inner_prod_neon(), and both functions should have bit */
 /* exact output.                                                            */
-static void dual_inner_prod_neon_float_c_simulation(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
+static void oaci_dual_inner_prod_neon_float_c_simulation(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
                                                     int N, oac_val32 *xy1, oac_val32 *xy2, float *err) {
-    *xy1 = celt_inner_prod_neon_float_c_simulation(x, y01, &err[0], N);
-    *xy2 = celt_inner_prod_neon_float_c_simulation(x, y02, &err[1], N);
+    *xy1 = oaci_celt_inner_prod_neon_float_c_simulation(x, y01, &err[0], N);
+    *xy2 = oaci_celt_inner_prod_neon_float_c_simulation(x, y02, &err[1], N);
 }
 
 # endif /* OAC_CHECK_ASM */
 
 /* ========================================================================== */
 
-oac_val32 celt_inner_prod_neon(const oac_val16 *x, const oac_val16 *y, int N) {
+oac_val32 oaci_celt_inner_prod_neon(const oac_val16 *x, const oac_val16 *y, int N) {
     int i;
     oac_val32 xy;
     float32x4_t xy_f32x4 = vdupq_n_f32(0);
@@ -212,7 +212,7 @@ oac_val32 celt_inner_prod_neon(const oac_val16 *x, const oac_val16 *y, int N) {
 # ifdef OAC_CHECK_ASM
     {
         float err, res;
-        res = celt_inner_prod_neon_float_c_simulation(x, y, &err, N);
+        res = oaci_celt_inner_prod_neon_float_c_simulation(x, y, &err, N);
         /*if (ABS32(res - xy) > err) fprintf(stderr, "%g %g %g\n", res, xy, err);*/
         celt_assert(ABS32(res - xy) <= err);
     }
@@ -221,7 +221,7 @@ oac_val32 celt_inner_prod_neon(const oac_val16 *x, const oac_val16 *y, int N) {
     return xy;
 }
 
-void dual_inner_prod_neon(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
+void oaci_dual_inner_prod_neon(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
                           int N, oac_val32 *xy1, oac_val32 *xy2) {
     int i;
     oac_val32 xy01, xy02;
@@ -270,7 +270,7 @@ void dual_inner_prod_neon(const oac_val16 *x, const oac_val16 *y01, const oac_va
     {
         oac_val32 xy1_c, xy2_c;
         float err[2];
-        dual_inner_prod_neon_float_c_simulation(x, y01, y02, N, &xy1_c, &xy2_c, err);
+        oaci_dual_inner_prod_neon_float_c_simulation(x, y01, y02, N, &xy1_c, &xy2_c, err);
         /*if (ABS32(xy1_c - *xy1) > err[0]) fprintf(stderr, "dual1 fail: %g %g %g\n", xy1_c, *xy1, err[0]);
            if (ABS32(xy2_c - *xy2) > err[1]) fprintf(stderr, "dual2 fail: %g %g %g\n", xy2_c, *xy2, err[1]);*/
         celt_assert(ABS32(xy1_c - *xy1) <= err[0]);
diff --git a/celt/bands.c b/celt/bands.c
index 7776f0efc..7d649736b 100644
--- a/celt/bands.c
+++ b/celt/bands.c
@@ -43,7 +43,7 @@
 #include "quant_bands.h"
 #include "pitch.h"
 
-int hysteresis_decision(oac_val16 val, const oac_val16 *thresholds, const oac_val16 *hysteresis, int N, int prev) {
+int oaci_hysteresis_decision(oac_val16 val, const oac_val16 *thresholds, const oac_val16 *hysteresis, int N, int prev) {
     int i;
     for (i = 0; i < N; i++) {
         if (val < thresholds[i])
@@ -56,13 +56,13 @@ int hysteresis_decision(oac_val16 val, const oac_val16 *thresholds, const oac_va
     return i;
 }
 
-oac_uint32 celt_lcg_rand(oac_uint32 seed) {
+oac_uint32 oaci_celt_lcg_rand(oac_uint32 seed) {
     return 1664525*seed + 1013904223;
 }
 
 /* This is a cos() approximation designed to be bit-exact on any platform. Bit exactness
    with this approximation is important because it has an impact on the bit allocation */
-oac_int16 bitexact_cos(oac_int16 x) {
+oac_int16 oaci_bitexact_cos(oac_int16 x) {
     oac_int32 tmp;
     oac_int16 x2;
     tmp = (4096 + ((oac_int32)(x)*(x)))>>13;
@@ -73,7 +73,7 @@ oac_int16 bitexact_cos(oac_int16 x) {
     return 1 + x2;
 }
 
-int bitexact_log2tan(int isin, int icos) {
+int oaci_bitexact_log2tan(int isin, int icos) {
     int lc;
     int ls;
     lc = EC_ILOG(icos);
@@ -87,7 +87,7 @@ int bitexact_log2tan(int isin, int icos) {
 
 #ifdef FIXED_POINT
 /* Compute the amplitude (sqrt energy) in each of the bands */
-void compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *bandE, int end, int C, int LM, int arch) {
+void oaci_compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *bandE, int end, int C, int LM, int arch) {
     int i, c, N;
     const oac_int16 *eBands = m->eBands;
     (void)arch;
@@ -106,7 +106,7 @@ void compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *band
                     oac_val32 x = SHL32(X[j + c*N], shift);
                     sum = ADD32(sum, MULT32_32_Q31(x, x));
                 } while (++j < eBands[i + 1]<<LM);
-                bandE[i + c*m->nbEBands] = MAX32(maxval, PSHR32(celt_sqrt32(SHR32(sum, 1)), shift));
+                bandE[i + c*m->nbEBands] = MAX32(maxval, PSHR32(oaci_celt_sqrt32(SHR32(sum, 1)), shift));
             } else {
                 bandE[i + c*m->nbEBands] = EPSILON;
             }
@@ -115,7 +115,7 @@ void compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *band
 }
 
 /* Normalise each band such that the energy is one. */
-void normalise_bands(const CELTMode *m, const celt_sig * OAC_RESTRICT freq, celt_norm * OAC_RESTRICT X,
+void oaci_normalise_bands(const CELTMode *m, const celt_sig * OAC_RESTRICT freq, celt_norm * OAC_RESTRICT X,
                      const celt_ener *bandE, int end, int C, int M) {
     int i, c, N;
     const oac_int16 *eBands = m->eBands;
@@ -131,7 +131,7 @@ void normalise_bands(const CELTMode *m, const celt_sig * OAC_RESTRICT freq, celt
             if (E < 10) E += EPSILON;
             shift = 30 - celt_zlog2(E);
             E = SHL32(E, shift);
-            g = celt_rcp_norm32(E);
+            g = oaci_celt_rcp_norm32(E);
             j = M*eBands[i]; do {
                 X[j + c*N] = PSHR32(MULT32_32_Q31(g, SHL32(freq[j + c*N], shift)), 30 - NORM_SHIFT);
             } while (++j < M*eBands[i + 1]);
@@ -141,16 +141,16 @@ void normalise_bands(const CELTMode *m, const celt_sig * OAC_RESTRICT freq, celt
 
 #else /* FIXED_POINT */
 /* Compute the amplitude (sqrt energy) in each of the bands */
-void compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *bandE, int end, int C, int LM, int arch) {
+void oaci_compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *bandE, int end, int C, int LM, int arch) {
     int i, c, N;
     const oac_int16 *eBands = m->eBands;
     N = m->shortMdctSize<<LM;
     c = 0; do {
         for (i = 0; i < end; i++) {
             oac_val32 sum;
-            sum = 1e-27f + celt_inner_prod(&X[c*N + (eBands[i]<<LM)], &X[c*N + (eBands[i]<<LM)],
+            sum = 1e-27f + oaci_celt_inner_prod(&X[c*N + (eBands[i]<<LM)], &X[c*N + (eBands[i]<<LM)],
                 (eBands[i + 1] - eBands[i])<<LM, arch);
-            bandE[i + c*m->nbEBands] = celt_sqrt(sum);
+            bandE[i + c*m->nbEBands] = oaci_celt_sqrt(sum);
             /*printf ("%f ", bandE[i+c*m->nbEBands]);*/
         }
     } while (++c < C);
@@ -158,7 +158,7 @@ void compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *band
 }
 
 /* Normalise each band such that the energy is one. */
-void normalise_bands(const CELTMode *m, const celt_sig * OAC_RESTRICT freq, celt_norm * OAC_RESTRICT X,
+void oaci_normalise_bands(const CELTMode *m, const celt_sig * OAC_RESTRICT freq, celt_norm * OAC_RESTRICT X,
                      const celt_ener *bandE, int end, int C, int M) {
     int i, c, N;
     const oac_int16 *eBands = m->eBands;
@@ -176,7 +176,7 @@ void normalise_bands(const CELTMode *m, const celt_sig * OAC_RESTRICT freq, celt
 #endif /* FIXED_POINT */
 
 /* De-normalise the energy to produce the synthesis from the unit-energy bands */
-void denormalise_bands(const CELTMode *m, const celt_norm * OAC_RESTRICT X,
+void oaci_denormalise_bands(const CELTMode *m, const celt_norm * OAC_RESTRICT X,
                        celt_sig * OAC_RESTRICT freq, const celt_glog *bandLogE, int start,
                        int end, int M, int downsample, int silence) {
     int i, N;
@@ -209,7 +209,7 @@ void denormalise_bands(const CELTMode *m, const celt_norm * OAC_RESTRICT X,
 #endif
         j = M*eBands[i];
         band_end = M*eBands[i + 1];
-        lg = ADD32(bandLogE[i], SHL32((oac_val32)eMeans[i], DB_SHIFT - 4));
+        lg = ADD32(bandLogE[i], SHL32((oac_val32)oaci_eMeans[i], DB_SHIFT - 4));
 #ifndef FIXED_POINT
         g = celt_exp2_db(MIN32(32.f, lg));
 #else
@@ -241,7 +241,7 @@ void denormalise_bands(const CELTMode *m, const celt_norm * OAC_RESTRICT X,
 }
 
 /* This prevents energy collapse for transients with multiple short MDCTs */
-void anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collapse_masks, int LM, int C, int size,
+void oaci_anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collapse_masks, int LM, int C, int size,
                    int start, int end, const celt_glog *logE, const celt_glog *prev1logE,
                    const celt_glog *prev2logE, const int *pulses, oac_uint32 seed, int encode, int arch) {
     int c, i, j, k;
@@ -267,11 +267,11 @@ void anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collapse_mas
             t = N0<<LM;
             shift = celt_ilog2(t)>>1;
             t = SHL32(t, (7 - shift)<<1);
-            sqrt_1 = celt_rsqrt_norm(t);
+            sqrt_1 = oaci_celt_rsqrt_norm(t);
         }
 #else
         thresh = .5f*celt_exp2(-.125f*depth);
-        sqrt_1 = celt_rsqrt(N0<<LM);
+        sqrt_1 = oaci_celt_rsqrt(N0<<LM);
 #endif
 
         c = 0; do {
@@ -316,7 +316,7 @@ void anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collapse_mas
                 if (!(collapse_masks[i*C + c]&1<<k)) {
                     /* Fill with noise */
                     for (j = 0; j < N0; j++) {
-                        seed = celt_lcg_rand(seed);
+                        seed = oaci_celt_lcg_rand(seed);
                         X[(j<<LM) + k] = (seed&0x8000 ? r : -r);
                     }
                     renormalize = 1;
@@ -324,7 +324,7 @@ void anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collapse_mas
             }
             /* We just added some energy, so we need to renormalise */
             if (renormalize)
-                renormalise_vector(X, N0<<LM, Q31ONE, arch);
+                oaci_renormalise_vector(X, N0<<LM, Q31ONE, arch);
         } while (++c < C);
     }
 }
@@ -364,7 +364,7 @@ static void intensity_stereo(const CELTMode *m, celt_norm * OAC_RESTRICT X, cons
 #endif
     left = VSHR32(bandE[i], shift);
     right = VSHR32(bandE[i + m->nbEBands], shift);
-    norm = EPSILON + celt_sqrt(EPSILON + MULT16_16(left, left) + MULT16_16(right, right));
+    norm = EPSILON + oaci_celt_sqrt(EPSILON + MULT16_16(left, left) + MULT16_16(right, right));
 #ifdef FIXED_POINT
     left = MIN32(left, norm - 1);
     right = MIN32(right, norm - 1);
@@ -398,8 +398,8 @@ static void stereo_merge(celt_norm * OAC_RESTRICT X, celt_norm * OAC_RESTRICT Y,
     oac_val32 t, lgain, rgain;
 
     /* Compute the norm of X+Y and X-Y as |X|^2 + |Y|^2 +/- sum(xy) */
-    xp = celt_inner_prod_norm_shift(Y, X, N, arch);
-    side = celt_inner_prod_norm_shift(Y, Y, N, arch);
+    xp = oaci_celt_inner_prod_norm_shift(Y, X, N, arch);
+    side = oaci_celt_inner_prod_norm_shift(Y, Y, N, arch);
     /* Compensating for the mid normalization */
     xp = MULT32_32_Q31(mid, xp);
     /* mid and side are in Q15, not Q14 like X and Y */
@@ -415,9 +415,9 @@ static void stereo_merge(celt_norm * OAC_RESTRICT X, celt_norm * OAC_RESTRICT Y,
     kr = celt_ilog2(Er)>>1;
 #endif
     t = VSHR32(El, (kl<<1) - 29);
-    lgain = celt_rsqrt_norm32(t);
+    lgain = oaci_celt_rsqrt_norm32(t);
     t = VSHR32(Er, (kr<<1) - 29);
-    rgain = celt_rsqrt_norm32(t);
+    rgain = oaci_celt_rsqrt_norm32(t);
 
 #ifdef FIXED_POINT
     if (kl < 7)
@@ -437,7 +437,7 @@ static void stereo_merge(celt_norm * OAC_RESTRICT X, celt_norm * OAC_RESTRICT Y,
 }
 
 /* Decide whether we should spread the pulses in the current frame */
-int spreading_decision(const CELTMode *m, const celt_norm *X, int *average,
+int oaci_spreading_decision(const CELTMode *m, const celt_norm *X, int *average,
                        int last_decision, int *hf_average, int *tapset_decision, int update_hf,
                        int end, int C, int M, const int *spread_weight) {
     int i, c, N0;
@@ -578,7 +578,7 @@ static void interleave_hadamard(celt_norm *X, int N0, int stride, int hadamard)
     RESTORE_STACK;
 }
 
-void haar1(celt_norm *X, int N0, int stride) {
+void oaci_haar1(celt_norm *X, int N0, int stride) {
     int i, j;
     N0 >>= 1;
     for (i = 0; i < stride; i++)
@@ -682,10 +682,10 @@ static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
            side and mid. With just that parameter, we can re-scale both
            mid and side because we know that 1) they have unit norm and
            2) they are orthogonal. */
-        itheta_q30 = stereo_itheta(X, Y, stereo, N, ctx->arch);
+        itheta_q30 = oaci_stereo_itheta(X, Y, stereo, N, ctx->arch);
         itheta = itheta_q30>>16;
     }
-    tell = ec_tell_frac(ec);
+    tell = oaci_ec_tell_frac(ec);
     if (qn != 1) {
         if (encode) {
             if (!stereo || ctx->theta_round == 0) {
@@ -695,9 +695,9 @@ static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
                        to inject noise on one side. If so, make sure the energy of that side
                        is zero. */
                     int unquantized = celt_udiv((oac_int32)itheta*16384, qn);
-                    imid = bitexact_cos((oac_int16)unquantized);
-                    iside = bitexact_cos((oac_int16)(16384 - unquantized));
-                    delta = FRAC_MUL16((N - 1)<<7, bitexact_log2tan(iside, imid));
+                    imid = oaci_bitexact_cos((oac_int16)unquantized);
+                    iside = oaci_bitexact_cos((oac_int16)(16384 - unquantized));
+                    delta = FRAC_MUL16((N - 1)<<7, oaci_bitexact_log2tan(iside, imid));
                     if (delta > *b)
                         itheta = qn;
                     else if (delta < -*b)
@@ -723,24 +723,24 @@ static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
             int ft = p0*(x0 + 1) + x0;
             /* Use a probability of p0 up to itheta=8192 and then use 1 after */
             if (encode) {
-                ec_encode(ec, x <= x0?p0*x:(x - 1 - x0) + (x0 + 1)*p0, x <= x0?p0*(x + 1):(x - x0) + (x0 + 1)*p0, ft);
+                oaci_ec_encode(ec, x <= x0?p0*x:(x - 1 - x0) + (x0 + 1)*p0, x <= x0?p0*(x + 1):(x - x0) + (x0 + 1)*p0, ft);
             } else {
                 int fs;
-                fs = ec_decode(ec, ft);
+                fs = oaci_ec_decode(ec, ft);
                 if (fs < (x0 + 1)*p0)
                     x = fs/p0;
                 else
                     x = x0 + 1 + (fs - (x0 + 1)*p0);
-                ec_dec_update(ec, x <= x0?p0*x:(x - 1 - x0) + (x0 + 1)*p0, x <= x0?p0*(x + 1):(x - x0) + (x0 + 1)*p0,
+                oaci_ec_dec_update(ec, x <= x0?p0*x:(x - 1 - x0) + (x0 + 1)*p0, x <= x0?p0*(x + 1):(x - x0) + (x0 + 1)*p0,
                 ft);
                 itheta = x;
             }
         } else if (B0 > 1 || stereo) {
             /* Uniform pdf */
             if (encode)
-                ec_enc_uint(ec, itheta, qn + 1);
+                oaci_ec_enc_uint(ec, itheta, qn + 1);
             else
-                itheta = ec_dec_uint(ec, qn + 1);
+                itheta = oaci_ec_dec_uint(ec, qn + 1);
         } else {
             int fs = 1, ft;
             ft = ((qn>>1) + 1)*((qn>>1) + 1);
@@ -751,25 +751,25 @@ static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
                 fl = itheta <= (qn>>1) ? itheta*(itheta + 1)>>1 :
                      ft - ((qn + 1 - itheta)*(qn + 2 - itheta)>>1);
 
-                ec_encode(ec, fl, fl + fs, ft);
+                oaci_ec_encode(ec, fl, fl + fs, ft);
             } else {
                 /* Triangular pdf */
                 int fl = 0;
                 int fm;
-                fm = ec_decode(ec, ft);
+                fm = oaci_ec_decode(ec, ft);
 
                 if (fm < ((qn>>1)*((qn>>1) + 1)>>1)) {
-                    itheta = (isqrt32(8*(oac_uint32)fm + 1) - 1)>>1;
+                    itheta = (oaci_isqrt32(8*(oac_uint32)fm + 1) - 1)>>1;
                     fs = itheta + 1;
                     fl = itheta*(itheta + 1)>>1;
                 } else {
                     itheta = (2*(qn + 1)
-                              - isqrt32(8*(oac_uint32)(ft - fm - 1) + 1))>>1;
+                              - oaci_isqrt32(8*(oac_uint32)(ft - fm - 1) + 1))>>1;
                     fs = qn + 1 - itheta;
                     fl = ft - ((qn + 1 - itheta)*(qn + 2 - itheta)>>1);
                 }
 
-                ec_dec_update(ec, fl, fl + fs, ft);
+                oaci_ec_dec_update(ec, fl, fl + fs, ft);
             }
         }
         celt_assert(itheta >= 0);
@@ -795,9 +795,9 @@ static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
         }
         if (*b > 2<<BITRES && ctx->total_bits - tell > 2<<BITRES) {
             if (encode)
-                ec_enc_bit_logp(ec, inv, 2);
+                oaci_ec_enc_bit_logp(ec, inv, 2);
             else
-                inv = ec_dec_bit_logp(ec, 2);
+                inv = oaci_ec_dec_bit_logp(ec, 2);
         } else
             inv = 0;
         /* inv flag override to avoid problems with downmixing. */
@@ -806,7 +806,7 @@ static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
         itheta = 0;
         itheta_q30 = 0;
     }
-    qalloc = ec_tell_frac(ec) - tell;
+    qalloc = oaci_ec_tell_frac(ec) - tell;
     *b -= qalloc;
 
     if (itheta == 0) {
@@ -820,11 +820,11 @@ static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
         *fill &= ((1<<B) - 1)<<B;
         delta = 16384;
     } else {
-        imid = bitexact_cos((oac_int16)itheta);
-        iside = bitexact_cos((oac_int16)(16384 - itheta));
+        imid = oaci_bitexact_cos((oac_int16)itheta);
+        iside = oaci_bitexact_cos((oac_int16)(16384 - itheta));
         /* This is the mid vs side allocation that minimizes squared error
            in that band. */
-        delta = FRAC_MUL16((N - 1)<<7, bitexact_log2tan(iside, imid));
+        delta = FRAC_MUL16((N - 1)<<7, oaci_bitexact_log2tan(iside, imid));
     }
 
     sctx->inv = inv;
@@ -848,12 +848,12 @@ static unsigned quant_band_n1(struct band_ctx *ctx, celt_norm *X, celt_norm *Y,
     stereo = Y != NULL;
     c = 0; do {
         int sign = 0;
-        if (ctx->total_bits - ec_tell_frac(ec) > 1<<BITRES) {
+        if (ctx->total_bits - oaci_ec_tell_frac(ec) > 1<<BITRES) {
             if (encode) {
                 sign = x[0] < 0;
-                ec_enc_bits(ec, sign, 1);
+                oaci_ec_enc_bits(ec, sign, 1);
             } else {
-                sign = ec_dec_bits(ec, 1);
+                sign = oaci_ec_dec_bits(ec, 1);
             }
         }
         if (ctx->resynth)
@@ -918,8 +918,8 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
         (void)imid;
         (void)iside;
 #ifdef FIXED_POINT
-        mid = celt_cos_norm32(sctx.itheta_q30);
-        side = celt_cos_norm32((1<<30) - sctx.itheta_q30);
+        mid = oaci_celt_cos_norm32(sctx.itheta_q30);
+        side = oaci_celt_cos_norm32((1<<30) - sctx.itheta_q30);
 #else
         mid = celt_cos_norm2(sctx.itheta_q30*(1.f/(1<<30)));
         side = celt_cos_norm2(1.f - sctx.itheta_q30*(1.f/(1<<30)));
@@ -940,11 +940,11 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
         if (lowband)
             next_lowband2 = lowband + N; /* >32-bit split case */
 
-        tell = ec_tell_frac(ec);
+        tell = oaci_ec_tell_frac(ec);
         if (mbits >= sbits) {
             cm = quant_partition(ctx, X, N, mbits, B, lowband, LM,
                MULT32_32_Q31(gain, mid), fill);
-            rebalance = mbits - (ec_tell_frac(ec) - tell);
+            rebalance = mbits - (oaci_ec_tell_frac(ec) - tell);
             if (rebalance > 3<<BITRES && itheta != 0)
                 sbits += rebalance - (3<<BITRES);
             cm |= quant_partition(ctx, Y, N, sbits, B, next_lowband2, LM,
@@ -952,7 +952,7 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
         } else {
             cm = quant_partition(ctx, Y, N, sbits, B, next_lowband2, LM,
                MULT32_32_Q31(gain, side), fill>>B)<<(B0>>1);
-            rebalance = sbits - (ec_tell_frac(ec) - tell);
+            rebalance = sbits - (oaci_ec_tell_frac(ec) - tell);
             if (rebalance > 3<<BITRES && itheta != 16384)
                 mbits += rebalance - (3<<BITRES);
             cm |= quant_partition(ctx, X, N, mbits, B, lowband, LM,
@@ -963,7 +963,7 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
         /* This is the basic no-split case */
         q = bits2pulses(m, i, LM, b);
         curr_bits = pulses2bits(m, i, LM, q);
-        remaining_bits = ctx->total_bits - ec_tell_frac(ec) - 1;
+        remaining_bits = ctx->total_bits - oaci_ec_tell_frac(ec) - 1;
         remaining_bits -= curr_bits;
 
         /* Ensures we can never bust the budget */
@@ -979,10 +979,10 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
 
             /* Finally do the actual quantization */
             if (encode) {
-                cm = alg_quant(X, N, K, spread, B, ec, gain, ctx->resynth,
+                cm = oaci_alg_quant(X, N, K, spread, B, ec, gain, ctx->resynth,
                            ctx->arch);
             } else {
-                cm = alg_unquant(X, N, K, spread, B, ec, gain);
+                cm = oaci_alg_unquant(X, N, K, spread, B, ec, gain);
             }
         } else {
             /* If there's no pulse, fill the band anyway */
@@ -999,7 +999,7 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
                     if (lowband == NULL) {
                         /* Noise */
                         for (j = 0; j < N; j++) {
-                            ctx->seed = celt_lcg_rand(ctx->seed);
+                            ctx->seed = oaci_celt_lcg_rand(ctx->seed);
                             X[j] = SHL32((celt_norm)((oac_int32)ctx->seed>>20), NORM_SHIFT - 14);
                         }
                         cm = cm_mask;
@@ -1007,7 +1007,7 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
                         /* Folded spectrum */
                         for (j = 0; j < N; j++) {
                             oac_val16 tmp;
-                            ctx->seed = celt_lcg_rand(ctx->seed);
+                            ctx->seed = oaci_celt_lcg_rand(ctx->seed);
                             /* About 48 dB below the "normal" folding level */
                             tmp = QCONST16(1.0f/256, NORM_SHIFT - 4);
                             tmp = (ctx->seed)&0x8000 ? tmp : -tmp;
@@ -1015,7 +1015,7 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
                         }
                         cm = fill;
                     }
-                    renormalise_vector(X, N, gain, ctx->arch);
+                    oaci_renormalise_vector(X, N, gain, ctx->arch);
                 }
             }
         }
@@ -1024,9 +1024,9 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
     return cm;
 }
 
-unsigned cubic_quant_partition(struct band_ctx *ctx, celt_norm *X, int N, int b, int B, ec_ctx *ec, int LM,
+unsigned oaci_cubic_quant_partition(struct band_ctx *ctx, celt_norm *X, int N, int b, int B, ec_ctx *ec, int LM,
                                oac_val32 gain, int resynth, int encode) {
-    oac_int32 remaining_bits = ctx->total_bits - ec_tell_frac(ctx->ec) - 1;
+    oac_int32 remaining_bits = ctx->total_bits - oaci_ec_tell_frac(ctx->ec) - 1;
     celt_assert(LM >= 0);
     b = IMIN(b, remaining_bits);
     /* As long as we have at least two bits of depth, split all the way to LM=0 (not -1 like PVQ). */
@@ -1036,8 +1036,8 @@ unsigned cubic_quant_partition(struct band_ctx *ctx, celt_norm *X, int N, int b,
         /* Resolution left after taking into account coding the cube face. */
         res = (b - (1<<BITRES) - ctx->m->logN[ctx->i] - (LM<<BITRES) - 1)/(N - 1)>>BITRES;
         res = IMIN(14, IMAX(0, res));
-        if (encode) ret = cubic_quant(X, N, res, B, ec, gain, resynth);
-        else ret = cubic_unquant(X, N, res, B, ec, gain);
+        if (encode) ret = oaci_cubic_quant(X, N, res, B, ec, gain, resynth);
+        else ret = oaci_cubic_unquant(X, N, res, B, ec, gain);
         return ret;
     } else {
         celt_norm *Y;
@@ -1056,19 +1056,19 @@ unsigned cubic_quant_partition(struct band_ctx *ctx, celt_norm *X, int N, int b,
         B = (B + 1)>>1;
         theta_res = IMIN(16, (b>>BITRES)/(N0 - 1) + 1);
         if (encode) {
-            itheta_q30 = stereo_itheta(X, Y, 0, N, ctx->arch);
+            itheta_q30 = oaci_stereo_itheta(X, Y, 0, N, ctx->arch);
             qtheta = (itheta_q30 + (1<<(29 - theta_res)))>>(30 - theta_res);
-            ec_enc_uint(ec, qtheta, (1<<theta_res) + 1);
+            oaci_ec_enc_uint(ec, qtheta, (1<<theta_res) + 1);
         } else {
-            qtheta = ec_dec_uint(ec, (1<<theta_res) + 1);
+            qtheta = oaci_ec_dec_uint(ec, (1<<theta_res) + 1);
         }
         itheta_q30 = qtheta<<(30 - theta_res);
         b -= theta_res<<BITRES;
         delta = (N0 - 1)*23*((itheta_q30>>16) - 8192)>>(17 - BITRES);
 
 #ifdef FIXED_POINT
-        g1 = celt_cos_norm32(itheta_q30);
-        g2 = celt_cos_norm32((1<<30) - itheta_q30);
+        g1 = oaci_celt_cos_norm32(itheta_q30);
+        g2 = oaci_celt_cos_norm32((1<<30) - itheta_q30);
 #else
         g1 = celt_cos_norm2(itheta_q30*(1.f/(1<<30)));
         g2 = celt_cos_norm2(1.f - itheta_q30*(1.f/(1<<30)));
@@ -1083,8 +1083,8 @@ unsigned cubic_quant_partition(struct band_ctx *ctx, celt_norm *X, int N, int b,
             b1 = IMIN(b, IMAX(0, (b - delta)/2));
             b2 = b - b1;
         }
-        cm  = cubic_quant_partition(ctx, X, N, b1, B, ec, LM, MULT32_32_Q31(gain, g1), resynth, encode);
-        cm |= cubic_quant_partition(ctx, Y, N, b2, B, ec, LM, MULT32_32_Q31(gain, g2), resynth, encode);
+        cm  = oaci_cubic_quant_partition(ctx, X, N, b1, B, ec, LM, MULT32_32_Q31(gain, g1), resynth, encode);
+        cm |= oaci_cubic_quant_partition(ctx, Y, N, b2, B, ec, LM, MULT32_32_Q31(gain, g2), resynth, encode);
         return cm;
     }
 }
@@ -1132,9 +1132,9 @@ static unsigned quant_band(struct band_ctx *ctx, celt_norm *X,
             0, 1, 1, 1, 2, 3, 3, 3, 2, 3, 3, 3, 2, 3, 3, 3
         };
         if (encode)
-            haar1(X, N>>k, 1<<k);
+            oaci_haar1(X, N>>k, 1<<k);
         if (lowband)
-            haar1(lowband, N>>k, 1<<k);
+            oaci_haar1(lowband, N>>k, 1<<k);
         fill = bit_interleave_table[fill&0xF]|bit_interleave_table[fill>>4]<<2;
     }
     B >>= recombine;
@@ -1143,9 +1143,9 @@ static unsigned quant_band(struct band_ctx *ctx, celt_norm *X,
     /* Increasing the time resolution */
     while ((N_B&1) == 0 && tf_change < 0) {
         if (encode)
-            haar1(X, N_B, B);
+            oaci_haar1(X, N_B, B);
         if (lowband)
-            haar1(lowband, N_B, B);
+            oaci_haar1(lowband, N_B, B);
         fill |= fill<<B;
         B <<= 1;
         N_B >>= 1;
@@ -1178,7 +1178,7 @@ static unsigned quant_band(struct band_ctx *ctx, celt_norm *X,
             B >>= 1;
             N_B <<= 1;
             cm |= cm>>B;
-            haar1(X, N_B, B);
+            oaci_haar1(X, N_B, B);
         }
 
         for (k = 0; k < recombine; k++) {
@@ -1187,7 +1187,7 @@ static unsigned quant_band(struct band_ctx *ctx, celt_norm *X,
                 0xC0, 0xC3, 0xCC, 0xCF, 0xF0, 0xF3, 0xFC, 0xFF
             };
             cm = bit_deinterleave_table[cm];
-            haar1(X, N0>>k, 1<<k);
+            oaci_haar1(X, N0>>k, 1<<k);
         }
         B <<= recombine;
 
@@ -1195,7 +1195,7 @@ static unsigned quant_band(struct band_ctx *ctx, celt_norm *X,
         if (lowband_out) {
             int j;
             oac_val16 n;
-            n = celt_sqrt(SHL32(EXTEND32(N0), 22));
+            n = oaci_celt_sqrt(SHL32(EXTEND32(N0), 22));
             for (j = 0; j < N0; j++)
                 lowband_out[j] = MULT16_32_Q15(n, X[j]);
         }
@@ -1251,8 +1251,8 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
     (void)imid;
     (void)iside;
 #ifdef FIXED_POINT
-    mid = celt_cos_norm32(sctx.itheta_q30);
-    side = celt_cos_norm32((1<<30) - sctx.itheta_q30);
+    mid = oaci_celt_cos_norm32(sctx.itheta_q30);
+    side = oaci_celt_cos_norm32((1<<30) - sctx.itheta_q30);
 #else
     mid = celt_cos_norm2(sctx.itheta_q30*(1.f/(1<<30)));
     side = celt_cos_norm2(1.f - sctx.itheta_q30*(1.f/(1<<30)));
@@ -1280,9 +1280,9 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
                 /* Here we only need to encode a sign for the side. */
                 /* FIXME: Need to increase fixed-point precision? */
                 sign = MULT32_32_Q31(x2[0], y2[1]) - MULT32_32_Q31(x2[1], y2[0]) < 0;
-                ec_enc_bits(ec, sign, 1);
+                oaci_ec_enc_bits(ec, sign, 1);
             } else {
-                sign = ec_dec_bits(ec, 1);
+                sign = oaci_ec_dec_bits(ec, 1);
             }
         }
         sign = 1 - 2*sign;
@@ -1314,14 +1314,14 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
 
         mbits = IMAX(0, IMIN(b, (b - delta)/2));
         sbits = b - mbits;
-        tell = ec_tell_frac(ec);
+        tell = oaci_ec_tell_frac(ec);
 
         if (mbits >= sbits) {
             /* In stereo mode, we do not apply a scaling to the mid because we need the normalized
                mid for folding later. */
             cm = quant_band(ctx, X, N, mbits, B, lowband, LM, lowband_out, Q31ONE,
                lowband_scratch, fill);
-            rebalance = mbits - (ec_tell_frac(ec) - tell);
+            rebalance = mbits - (oaci_ec_tell_frac(ec) - tell);
             if (rebalance > 3<<BITRES && itheta != 0)
                 sbits += rebalance - (3<<BITRES);
 
@@ -1332,7 +1332,7 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
             /* For a stereo split, the high bits of fill are always zero, so no
                folding will be done to the side. */
             cm = quant_band(ctx, Y, N, sbits, B, NULL, LM, NULL, side, NULL, fill>>B);
-            rebalance = sbits - (ec_tell_frac(ec) - tell);
+            rebalance = sbits - (oaci_ec_tell_frac(ec) - tell);
             if (rebalance > 3<<BITRES && itheta != 16384)
                 mbits += rebalance - (3<<BITRES);
             /* In stereo mode, we do not apply a scaling to the mid because we need the normalized
@@ -1369,7 +1369,7 @@ static void special_hybrid_folding(const CELTMode *m, celt_norm *norm, celt_norm
         OAC_COPY(&norm2[n1], &norm2[2*n1 - n2], n2 - n1);
 }
 
-void quant_all_bands(int encode, const CELTMode *m, int start, int end,
+void oaci_quant_all_bands(int encode, const CELTMode *m, int start, int end,
                      celt_norm *X_, celt_norm *Y_, unsigned char *collapse_masks,
                      const celt_ener *bandE, int *pulses, int shortBlocks, int spread,
                      int dual_stereo, int intensity, int *tf_res, oac_int32 total_bits,
@@ -1469,7 +1469,7 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
             Y = NULL;
         N = M*eBands[i + 1] - M*eBands[i];
         celt_assert(N > 0);
-        tell = ec_tell_frac(ec);
+        tell = oaci_ec_tell_frac(ec);
 
         /* Compute how many bits we want to allocate to this band */
         if (i != start)
@@ -1561,8 +1561,8 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
                     x_cm = quant_band_stereo(&ctx, X, Y, N, b, B,
                      effective_lowband != -1 ? norm + effective_lowband : NULL, LM,
                      last?NULL:norm + M*eBands[i] - norm_offset, lowband_scratch, cm);
-                    dist0 = MULT16_32_Q15(w[0], celt_inner_prod_norm_shift(X_save, X, N, arch)) + MULT16_32_Q15(w[1],
-                    celt_inner_prod_norm_shift(Y_save, Y, N, arch));
+                    dist0 = MULT16_32_Q15(w[0], oaci_celt_inner_prod_norm_shift(X_save, X, N, arch)) + MULT16_32_Q15(w[1],
+                    oaci_celt_inner_prod_norm_shift(Y_save, Y, N, arch));
 
                     /* Save first result. */
                     cm2 = x_cm;
@@ -1590,8 +1590,8 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
                     x_cm = quant_band_stereo(&ctx, X, Y, N, b, B,
                      effective_lowband != -1 ? norm + effective_lowband : NULL, LM,
                      last?NULL:norm + M*eBands[i] - norm_offset, lowband_scratch, cm);
-                    dist1 = MULT16_32_Q15(w[0], celt_inner_prod_norm_shift(X_save, X, N, arch)) + MULT16_32_Q15(w[1],
-                    celt_inner_prod_norm_shift(Y_save, Y, N, arch));
+                    dist1 = MULT16_32_Q15(w[0], oaci_celt_inner_prod_norm_shift(X_save, X, N, arch)) + MULT16_32_Q15(w[1],
+                    oaci_celt_inner_prod_norm_shift(Y_save, Y, N, arch));
                     if (dist0 >= dist1) {
                         x_cm = cm2;
                         *ec = ec_save2;
diff --git a/celt/bands.h b/celt/bands.h
index 5a83cb817..71a801cf2 100644
--- a/celt/bands.h
+++ b/celt/bands.h
@@ -36,15 +36,15 @@
 #include "entdec.h"
 #include "rate.h"
 
-oac_int16 bitexact_cos(oac_int16 x);
-int bitexact_log2tan(int isin, int icos);
+oac_int16 oaci_bitexact_cos(oac_int16 x);
+int oaci_bitexact_log2tan(int isin, int icos);
 
 /** Compute the amplitude (sqrt energy) in each of the bands
  * @param m Mode data
  * @param X Spectrum
  * @param bandE Square root of the energy for each band (returned)
  */
-void compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *bandE, int end, int C, int LM, int arch);
+void oaci_compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *bandE, int end, int C, int LM, int arch);
 
 /*void compute_noise_energies(const CELTMode *m, const celt_sig *X, const oac_val16 *tonality, celt_ener *bandE);*/
 
@@ -54,7 +54,7 @@ void compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *band
  * @param X Spectrum (returned normalised)
  * @param bandE Square root of the energy for each band
  */
-void normalise_bands(const CELTMode *m, const celt_sig * OAC_RESTRICT freq, celt_norm * OAC_RESTRICT X,
+void oaci_normalise_bands(const CELTMode *m, const celt_sig * OAC_RESTRICT freq, celt_norm * OAC_RESTRICT X,
     const celt_ener *bandE, int end, int C, int M);
 
 /** Denormalise each band of X to restore full amplitude
@@ -62,7 +62,7 @@ void normalise_bands(const CELTMode *m, const celt_sig * OAC_RESTRICT freq, celt
  * @param X Spectrum (returned de-normalised)
  * @param bandE Square root of the energy for each band
  */
-void denormalise_bands(const CELTMode *m, const celt_norm * OAC_RESTRICT X,
+void oaci_denormalise_bands(const CELTMode *m, const celt_norm * OAC_RESTRICT X,
     celt_sig * OAC_RESTRICT freq, const celt_glog *bandE, int start,
     int end, int M, int downsample, int silence);
 
@@ -71,7 +71,7 @@ void denormalise_bands(const CELTMode *m, const celt_norm * OAC_RESTRICT X,
 #define SPREAD_NORMAL     (2)
 #define SPREAD_AGGRESSIVE (3)
 
-int spreading_decision(const CELTMode *m, const celt_norm *X, int *average,
+int oaci_spreading_decision(const CELTMode *m, const celt_norm *X, int *average,
     int last_decision, int *hf_average, int *tapset_decision, int update_hf,
     int end, int C, int M, const int *spread_weight);
 
@@ -79,7 +79,7 @@ int spreading_decision(const CELTMode *m, const celt_norm *X, int *average,
 void measure_norm_mse(const CELTMode *m, float *X, float *X0, float *bandE, float *bandE0, int M, int N, int C);
 #endif
 
-void haar1(celt_norm *X, int N0, int stride);
+void oaci_haar1(celt_norm *X, int N0, int stride);
 
 /** Quantisation/encoding of the residual spectrum
  * @param encode flag that indicates whether we're encoding (1) or decoding (0)
@@ -104,21 +104,21 @@ void haar1(celt_norm *X, int N0, int stride);
  * @param seed Random generator seed
  * @param arch Run-time architecture (see oac_select_arch())
  */
-void quant_all_bands(int encode, const CELTMode *m, int start, int end,
+void oaci_quant_all_bands(int encode, const CELTMode *m, int start, int end,
     celt_norm * X, celt_norm * Y, unsigned char *collapse_masks,
     const celt_ener *bandE, int *pulses, int shortBlocks, int spread,
     int dual_stereo, int intensity, int *tf_res, oac_int32 total_bits,
     oac_int32 balance, ec_ctx *ec, int M, int codedBands, oac_uint32 *seed,
     int complexity, int arch, int disable_inv);
 
-void anti_collapse(const CELTMode *m, celt_norm *X_,
+void oaci_anti_collapse(const CELTMode *m, celt_norm *X_,
     unsigned char *collapse_masks, int LM, int C, int size, int start,
     int end, const celt_glog *logE, const celt_glog *prev1logE,
     const celt_glog *prev2logE, const int *pulses, oac_uint32 seed,
     int encode, int arch);
 
-oac_uint32 celt_lcg_rand(oac_uint32 seed);
+oac_uint32 oaci_celt_lcg_rand(oac_uint32 seed);
 
-int hysteresis_decision(oac_val16 val, const oac_val16 *thresholds, const oac_val16 *hysteresis, int N, int prev);
+int oaci_hysteresis_decision(oac_val16 val, const oac_val16 *thresholds, const oac_val16 *hysteresis, int N, int prev);
 
 #endif /* BANDS_H */
diff --git a/celt/celt.c b/celt/celt.c
index f0b6ba5e3..b75b413fe 100644
--- a/celt/celt.c
+++ b/celt/celt.c
@@ -54,7 +54,7 @@
 # define PACKAGE_VERSION "unknown"
 #endif
 
-int resampling_factor(oac_int32 rate) {
+int oaci_resampling_factor(oac_int32 rate) {
     int ret;
     switch (rate) {
 #ifdef ENABLE_QEXT
@@ -92,7 +92,7 @@ int resampling_factor(oac_int32 rate) {
 #  ifndef NON_STATIC_COMB_FILTER_CONST_C
 static
 #  endif
-void comb_filter_const_c(oac_val32 *y, oac_val32 *x, int T, int N,
+void oaci_comb_filter_const_c(oac_val32 *y, oac_val32 *x, int T, int N,
                          celt_coef g10, celt_coef g11, celt_coef g12) {
     oac_val32 x0, x1, x2, x3, x4;
     int i;
@@ -153,7 +153,7 @@ void comb_filter_const_c(oac_val32 *y, oac_val32 *x, int T, int N,
 #  ifndef NON_STATIC_COMB_FILTER_CONST_C
 static
 #  endif
-void comb_filter_const_c(oac_val32 *y, oac_val32 *x, int T, int N,
+void oaci_comb_filter_const_c(oac_val32 *y, oac_val32 *x, int T, int N,
                          celt_coef g10, celt_coef g11, celt_coef g12) {
     oac_val32 x0, x1, x2, x3, x4;
     int i;
@@ -183,7 +183,7 @@ void comb_filter_const_c(oac_val32 *y, oac_val32 *x, int T, int N,
 #endif
 
 #ifdef ENABLE_QEXT
-void comb_filter_qext(oac_val32 *y, oac_val32 *x, int T0, int T1, int N,
+void oaci_comb_filter_qext(oac_val32 *y, oac_val32 *x, int T0, int T1, int N,
                       oac_val16 g0, oac_val16 g1, int tapset0, int tapset1,
                       const celt_coef *window, int overlap, int arch) {
     VARDECL(oac_val32, mem_buf);
@@ -213,7 +213,7 @@ void comb_filter_qext(oac_val32 *y, oac_val32 *x, int T0, int T1, int N,
             for (i = 0; i < N2; i++) buf[i] = y[2*i + s];
             yptr = buf;
         }
-        comb_filter(yptr, mem_buf + COMBFILTER_MAXPERIOD, T0, T1, N2, g0, g1, tapset0, tapset1, new_window, overlap2,
+        oaci_comb_filter(yptr, mem_buf + COMBFILTER_MAXPERIOD, T0, T1, N2, g0, g1, tapset0, tapset1, new_window, overlap2,
         arch);
         for (i = 0; i < N2; i++) y[2*i + s] = yptr[i];
     }
@@ -222,8 +222,8 @@ void comb_filter_qext(oac_val32 *y, oac_val32 *x, int T0, int T1, int N,
 }
 #endif
 
-#ifndef OVERRIDE_comb_filter
-void comb_filter(oac_val32 *y, oac_val32 *x, int T0, int T1, int N,
+#ifndef OVERRIDE_oaci_comb_filter
+void oaci_comb_filter(oac_val32 *y, oac_val32 *x, int T0, int T1, int N,
                  oac_val16 g0, oac_val16 g1, int tapset0, int tapset1,
                  const celt_coef *window, int overlap, int arch) {
     int i;
@@ -237,7 +237,7 @@ void comb_filter(oac_val32 *y, oac_val32 *x, int T0, int T1, int N,
     };
 # ifdef ENABLE_QEXT
     if (overlap == 240) {
-        comb_filter_qext(y, x, T0, T1, N, g0, g1, tapset0, tapset1, window, overlap, arch);
+        oaci_comb_filter_qext(y, x, T0, T1, N, g0, g1, tapset0, tapset1, window, overlap, arch);
         return;
     }
 # endif
@@ -294,15 +294,15 @@ void comb_filter(oac_val32 *y, oac_val32 *x, int T0, int T1, int N,
     }
 
     /* Compute the part with the constant filter. */
-    comb_filter_const(y + i, x + i, T1, N - i, g10, g11, g12, arch);
+    oaci_comb_filter_const(y + i, x + i, T1, N - i, g10, g11, g12, arch);
 }
-#endif /* OVERRIDE_comb_filter */
+#endif /* OVERRIDE_oaci_comb_filter */
 
 /* TF change table. Positive values mean better frequency resolution (longer
    effective window), whereas negative values mean better time resolution
    (shorter effective window). The second index is computed as:
    4*isTransient + 2*tf_select + per_band_flag */
-const signed char tf_select_table[4][8] = {
+const signed char oaci_tf_select_table[4][8] = {
     /*isTransient=0     isTransient=1 */
     {0, -1, 0, -1,    0, -1, 0, -1}, /* 2.5 ms */
     {0, -1, 0, -2,    1, 0, 1, -1},  /* 5 ms */
@@ -311,7 +311,7 @@ const signed char tf_select_table[4][8] = {
 };
 
 
-void init_caps(const CELTMode *m, int *cap, int LM, int C) {
+void oaci_init_caps(const CELTMode *m, int *cap, int LM, int C) {
     int i;
     for (i = 0; i < m->nbEBands; i++) {
         int N;
diff --git a/celt/celt.h b/celt/celt.h
index 53596d786..9fe340e60 100644
--- a/celt/celt.h
+++ b/celt/celt.h
@@ -145,31 +145,31 @@ static OAC_INLINE oac_int32 bitrate_to_bits(oac_int32 bitrate, oac_int32 Fs, oac
 
 /* Encoder stuff */
 
-int celt_encoder_get_size(int channels);
+int oaci_celt_encoder_get_size(int channels);
 
-int celt_encode_with_ec(OacCustomEncoder * OAC_RESTRICT st, const oac_res * pcm, int frame_size,
+int oaci_celt_encode_with_ec(OacCustomEncoder * OAC_RESTRICT st, const oac_res * pcm, int frame_size,
     unsigned char *compressed, int nbCompressedBytes, ec_enc *enc);
 
-int celt_encoder_init(CELTEncoder *st, oac_int32 sampling_rate, int channels,
+int oaci_celt_encoder_init(CELTEncoder *st, oac_int32 sampling_rate, int channels,
     int arch);
 
 
 
 /* Decoder stuff */
 
-int celt_decoder_get_size(int channels);
+int oaci_celt_decoder_get_size(int channels);
 
 
-int celt_decoder_init(CELTDecoder *st, oac_int32 sampling_rate, int channels);
+int oaci_celt_decoder_init(CELTDecoder *st, oac_int32 sampling_rate, int channels);
 
-int celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char *data,
+int oaci_celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char *data,
     int len, oac_res * OAC_RESTRICT pcm, int frame_size, ec_dec *dec, int accum
 #ifdef ENABLE_DEEP_PLC
     , LPCNetPLCState *lpcnet
 #endif
     );
 
-int celt_decode_with_ec(OacCustomDecoder * OAC_RESTRICT st, const unsigned char *data,
+int oaci_celt_decode_with_ec(OacCustomDecoder * OAC_RESTRICT st, const unsigned char *data,
     int len, oac_res * OAC_RESTRICT pcm, int frame_size, ec_dec *dec, int accum);
 
 #define celt_encoder_ctl oac_custom_encoder_ctl
@@ -225,30 +225,30 @@ static OAC_INLINE int fromOac(unsigned char c) {
 #define COMBFILTER_MAXPERIOD 1024
 #define COMBFILTER_MINPERIOD 15
 
-extern const signed char tf_select_table[4][8];
+extern const signed char oaci_tf_select_table[4][8];
 
 #if defined(ENABLE_HARDENING) || defined(ENABLE_ASSERTIONS)
-void validate_celt_decoder(CELTDecoder *st);
-# define VALIDATE_CELT_DECODER(st) validate_celt_decoder(st)
+void oaci_validate_celt_decoder(CELTDecoder *st);
+# define VALIDATE_CELT_DECODER(st) oaci_validate_celt_decoder(st)
 #else
 # define VALIDATE_CELT_DECODER(st)
 #endif
 
-int resampling_factor(oac_int32 rate);
+int oaci_resampling_factor(oac_int32 rate);
 
-void celt_preemphasis(const oac_res * OAC_RESTRICT pcmp, celt_sig * OAC_RESTRICT inp,
+void oaci_celt_preemphasis(const oac_res * OAC_RESTRICT pcmp, celt_sig * OAC_RESTRICT inp,
     int N, int CC, int upsample, const oac_val16 *coef, celt_sig *mem, int clip);
 
-void comb_filter(oac_val32 *y, oac_val32 *x, int T0, int T1, int N,
+void oaci_comb_filter(oac_val32 *y, oac_val32 *x, int T0, int T1, int N,
     oac_val16 g0, oac_val16 g1, int tapset0, int tapset1,
     const celt_coef *window, int overlap, int arch);
 
-void init_caps(const CELTMode *m, int *cap, int LM, int C);
+void oaci_init_caps(const CELTMode *m, int *cap, int LM, int C);
 
 #ifdef RESYNTH
-void deemphasis(celt_sig *in[], oac_res *pcm, int N, int C, int downsample, const oac_val16 *coef, celt_sig *mem,
+void oaci_deemphasis(celt_sig *in[], oac_res *pcm, int N, int C, int downsample, const oac_val16 *coef, celt_sig *mem,
     int accum);
-void celt_synthesis(const CELTMode *mode, celt_norm *X, celt_sig * out_syn[],
+void oaci_celt_synthesis(const CELTMode *mode, celt_norm *X, celt_sig * out_syn[],
     celt_glog *oldBandE, int start, int effEnd, int C, int CC, int isTransient,
     int LM, int downsample, int silence, int arch);
 #endif
diff --git a/celt/celt_decoder.c b/celt/celt_decoder.c
index 536221eb6..68e695b27 100644
--- a/celt/celt_decoder.c
+++ b/celt/celt_decoder.c
@@ -137,7 +137,7 @@ struct OacCustomDecoder {
 #if defined(ENABLE_HARDENING) || defined(ENABLE_ASSERTIONS)
 /* Make basic checks on the CELT state to ensure we don't end
    up writing all over memory. */
-void validate_celt_decoder(CELTDecoder *st) {
+void oaci_validate_celt_decoder(CELTDecoder *st) {
 # if !defined(CUSTOM_MODES) && !defined(ENABLE_OAC_CUSTOM_API) && !defined(ENABLE_QEXT)
     celt_assert(st->mode == oac_custom_mode_create(48000, 960, NULL));
     celt_assert(st->overlap == 120);
@@ -173,7 +173,7 @@ void validate_celt_decoder(CELTDecoder *st) {
 }
 #endif
 
-int celt_decoder_get_size(int channels) {
+int oaci_celt_decoder_get_size(int channels) {
 #ifdef ENABLE_QEXT
     const CELTMode *mode = oac_custom_mode_create(96000, 960, NULL);
 #else
@@ -212,7 +212,7 @@ CELTDecoder *oac_custom_decoder_create(const CELTMode *mode, int channels, int *
 }
 #endif /* CUSTOM_MODES */
 
-int celt_decoder_init(CELTDecoder *st, oac_int32 sampling_rate, int channels) {
+int oaci_celt_decoder_init(CELTDecoder *st, oac_int32 sampling_rate, int channels) {
     int ret;
 #ifdef ENABLE_QEXT
     if (sampling_rate == 96000) {
@@ -222,7 +222,7 @@ int celt_decoder_init(CELTDecoder *st, oac_int32 sampling_rate, int channels) {
     ret = oac_custom_decoder_init(st, oac_custom_mode_create(48000, 960, NULL), channels);
     if (ret != OAC_OK)
         return ret;
-    st->downsample = resampling_factor(sampling_rate);
+    st->downsample = oaci_resampling_factor(sampling_rate);
     if (st->downsample == 0)
         return OAC_BAD_ARG;
     else
@@ -297,7 +297,7 @@ static void deemphasis_stereo_simple(celt_sig *in[], oac_res *pcm, int N, const
 #ifndef RESYNTH
 static
 #endif
-void deemphasis(celt_sig *in[], oac_res *pcm, int N, int C, int downsample, const oac_val16 *coef,
+void oaci_deemphasis(celt_sig *in[], oac_res *pcm, int N, int C, int downsample, const oac_val16 *coef,
                 celt_sig *mem, int accum) {
     int c;
     int Nd;
@@ -379,7 +379,7 @@ void deemphasis(celt_sig *in[], oac_res *pcm, int N, int C, int downsample, cons
 #ifndef RESYNTH
 static
 #endif
-void celt_synthesis(const CELTMode *mode, celt_norm *X, celt_sig * out_syn[],
+void oaci_celt_synthesis(const CELTMode *mode, celt_norm *X, celt_sig * out_syn[],
                     celt_glog *oldBandE, int start, int effEnd, int C, int CC,
                     int isTransient, int LM, int downsample,
                     int silence, int arch) {
@@ -413,35 +413,35 @@ void celt_synthesis(const CELTMode *mode, celt_norm *X, celt_sig * out_syn[],
     if (CC == 2 && C == 1) {
         /* Copying a mono streams to two channels */
         celt_sig *freq2;
-        denormalise_bands(mode, X, freq, oldBandE, start, effEnd, M,
+        oaci_denormalise_bands(mode, X, freq, oldBandE, start, effEnd, M,
             downsample, silence);
         /* Store a temporary copy in the output buffer because the IMDCT destroys its input. */
         freq2 = out_syn[1] + overlap/2;
         OAC_COPY(freq2, freq, N);
         for (b = 0; b < B; b++)
-            clt_mdct_backward(&mode->mdct, &freq2[b], out_syn[0] + NB*b, mode->window, overlap, shift, B, arch);
+            oaci_clt_mdct_backward(&mode->mdct, &freq2[b], out_syn[0] + NB*b, mode->window, overlap, shift, B, arch);
         for (b = 0; b < B; b++)
-            clt_mdct_backward(&mode->mdct, &freq[b], out_syn[1] + NB*b, mode->window, overlap, shift, B, arch);
+            oaci_clt_mdct_backward(&mode->mdct, &freq[b], out_syn[1] + NB*b, mode->window, overlap, shift, B, arch);
     } else if (CC == 1 && C == 2) {
         /* Downmixing a stereo stream to mono */
         celt_sig *freq2;
         freq2 = out_syn[0] + overlap/2;
-        denormalise_bands(mode, X, freq, oldBandE, start, effEnd, M,
+        oaci_denormalise_bands(mode, X, freq, oldBandE, start, effEnd, M,
             downsample, silence);
         /* Use the output buffer as temp array before downmixing. */
-        denormalise_bands(mode, X + N, freq2, oldBandE + nbEBands, start, effEnd, M,
+        oaci_denormalise_bands(mode, X + N, freq2, oldBandE + nbEBands, start, effEnd, M,
             downsample, silence);
         for (i = 0; i < N; i++)
             freq[i] = ADD32(HALF32(freq[i]), HALF32(freq2[i]));
         for (b = 0; b < B; b++)
-            clt_mdct_backward(&mode->mdct, &freq[b], out_syn[0] + NB*b, mode->window, overlap, shift, B, arch);
+            oaci_clt_mdct_backward(&mode->mdct, &freq[b], out_syn[0] + NB*b, mode->window, overlap, shift, B, arch);
     } else {
         /* Normal case (mono or stereo) */
         c = 0; do {
-            denormalise_bands(mode, X + c*N, freq, oldBandE + c*nbEBands, start, effEnd, M,
+            oaci_denormalise_bands(mode, X + c*N, freq, oldBandE + c*nbEBands, start, effEnd, M,
                downsample, silence);
             for (b = 0; b < B; b++)
-                clt_mdct_backward(&mode->mdct, &freq[b], out_syn[c] + NB*b, mode->window, overlap, shift, B, arch);
+                oaci_clt_mdct_backward(&mode->mdct, &freq[b], out_syn[c] + NB*b, mode->window, overlap, shift, B, arch);
         } while (++c < CC);
     }
     /* Saturate IMDCT output so that we can't overflow in the pitch postfilter
@@ -469,7 +469,7 @@ static void tf_decode(int start, int end, int isTransient, int *tf_res, int LM,
     tf_changed = curr = 0;
     for (i = start; i < end; i++) {
         if (tell + logp <= budget) {
-            curr ^= ec_dec_bit_logp(dec, logp);
+            curr ^= oaci_ec_dec_bit_logp(dec, logp);
             tell = ec_tell(dec);
             tf_changed |= curr;
         }
@@ -478,12 +478,12 @@ static void tf_decode(int start, int end, int isTransient, int *tf_res, int LM,
     }
     tf_select = 0;
     if (tf_select_rsv
-        && tf_select_table[LM][4*isTransient + 0 + tf_changed] !=
-        tf_select_table[LM][4*isTransient + 2 + tf_changed]) {
-        tf_select = ec_dec_bit_logp(dec, 1);
+        && oaci_tf_select_table[LM][4*isTransient + 0 + tf_changed] !=
+        oaci_tf_select_table[LM][4*isTransient + 2 + tf_changed]) {
+        tf_select = oaci_ec_dec_bit_logp(dec, 1);
     }
     for (i = start; i < end; i++) {
-        tf_res[i] = tf_select_table[LM][4*isTransient + 2*tf_select + tf_res[i]];
+        tf_res[i] = oaci_tf_select_table[LM][4*isTransient + 2*tf_select + tf_res[i]];
     }
 }
 
@@ -500,9 +500,9 @@ static int celt_plc_pitch_search(CELTDecoder *st, celt_sig *decode_mem[2], int C
     (void)st;
 #endif
     ALLOC( lp_pitch_buf, DECODE_BUFFER_SIZE>>1, oac_val16 );
-    pitch_downsample(decode_mem, lp_pitch_buf,
+    oaci_pitch_downsample(decode_mem, lp_pitch_buf,
          DECODE_BUFFER_SIZE>>1, C, QEXT_SCALE(2), arch);
-    pitch_search(lp_pitch_buf + (PLC_PITCH_LAG_MAX>>1), lp_pitch_buf,
+    oaci_pitch_search(lp_pitch_buf + (PLC_PITCH_LAG_MAX>>1), lp_pitch_buf,
          DECODE_BUFFER_SIZE - PLC_PITCH_LAG_MAX,
          PLC_PITCH_LAG_MAX - PLC_PITCH_LAG_MIN, &pitch_index, arch);
     pitch_index = PLC_PITCH_LAG_MAX - pitch_index;
@@ -539,7 +539,7 @@ static void prefilter_and_fold(CELTDecoder * OAC_RESTRICT st, int N) {
         /* Apply the pre-filter to the MDCT overlap for the next frame because
            the post-filter will be re-applied in the decoder after the MDCT
            overlap. */
-        comb_filter(etmp, decode_mem[c] + decode_buffer_size - N,
+        oaci_comb_filter(etmp, decode_mem[c] + decode_buffer_size - N,
          st->postfilter_period_old, st->postfilter_period, overlap,
          -st->postfilter_gain_old, -st->postfilter_gain,
          st->postfilter_tapset_old, st->postfilter_tapset, NULL, 0, st->arch);
@@ -571,7 +571,7 @@ static const float sinc_filter[SINC_ORDER + 1] = {
     4.2931e-05f
 };
 
-void update_plc_state(LPCNetPLCState *lpcnet, celt_sig *decode_mem[2], float *plc_preemphasis_mem, int CC) {
+void oaci_update_plc_state(LPCNetPLCState *lpcnet, celt_sig *decode_mem[2], float *plc_preemphasis_mem, int CC) {
     int i;
     int tmp_read_post, tmp_fec_skip;
     int offset;
@@ -599,7 +599,7 @@ void update_plc_state(LPCNetPLCState *lpcnet, celt_sig *decode_mem[2], float *pl
     tmp_read_post = lpcnet->fec_read_pos;
     tmp_fec_skip = lpcnet->fec_skip;
     for (i = 0; i < PLC_UPDATE_FRAMES; i++) {
-        lpcnet_plc_update(lpcnet, &buf16k[FRAME_SIZE*i]);
+        oaci_lpcnet_plc_update(lpcnet, &buf16k[FRAME_SIZE*i]);
     }
     lpcnet->fec_read_pos = tmp_read_post;
     lpcnet->fec_skip = tmp_fec_skip;
@@ -702,25 +702,25 @@ static void celt_decode_lost(CELTDecoder * OAC_RESTRICT st, int N, int LM
                 boffs = N*c + (eBands[i]<<LM);
                 blen = (eBands[i + 1] - eBands[i])<<LM;
                 for (j = 0; j < blen; j++) {
-                    seed = celt_lcg_rand(seed);
+                    seed = oaci_celt_lcg_rand(seed);
                     X[boffs + j] = SHL32((celt_norm)((oac_int32)seed>>20), NORM_SHIFT - 14);
                 }
-                renormalise_vector(X + boffs, blen, Q31ONE, st->arch);
+                oaci_renormalise_vector(X + boffs, blen, Q31ONE, st->arch);
             }
         }
         st->rng = seed;
 
-        celt_synthesis(mode, X, out_syn, oldBandE, start, effEnd, C, C, 0, LM, st->downsample, 0, st->arch);
+        oaci_celt_synthesis(mode, X, out_syn, oldBandE, start, effEnd, C, C, 0, LM, st->downsample, 0, st->arch);
 
         /* Run the postfilter with the last parameters. */
         c = 0; do {
             st->postfilter_period = IMAX(st->postfilter_period, COMBFILTER_MINPERIOD);
             st->postfilter_period_old = IMAX(st->postfilter_period_old, COMBFILTER_MINPERIOD);
-            comb_filter(out_syn[c], out_syn[c], st->postfilter_period_old, st->postfilter_period, mode->shortMdctSize,
+            oaci_comb_filter(out_syn[c], out_syn[c], st->postfilter_period_old, st->postfilter_period, mode->shortMdctSize,
                st->postfilter_gain_old, st->postfilter_gain, st->postfilter_tapset_old, st->postfilter_tapset,
                mode->window, overlap, st->arch);
             if (LM != 0)
-                comb_filter(out_syn[c] + mode->shortMdctSize, out_syn[c] + mode->shortMdctSize, st->postfilter_period,
+                oaci_comb_filter(out_syn[c] + mode->shortMdctSize, out_syn[c] + mode->shortMdctSize, st->postfilter_period,
                 st->postfilter_period, N - mode->shortMdctSize,
                   st->postfilter_gain, st->postfilter_gain, st->postfilter_tapset, st->postfilter_tapset,
                   mode->window, overlap, st->arch);
@@ -754,7 +754,7 @@ static void celt_decode_lost(CELTDecoder * OAC_RESTRICT st, int N, int LM
             fade = QCONST16(.8f, 15);
         }
 #ifdef ENABLE_DEEP_PLC
-        if (curr_neural && !last_neural) update_plc_state(lpcnet, decode_mem, &st->plc_preemphasis_mem, C);
+        if (curr_neural && !last_neural) oaci_update_plc_state(lpcnet, decode_mem, &st->plc_preemphasis_mem, C);
 #endif
 
         /* We want the excitation for 2 pitch periods in order to look for a
@@ -783,7 +783,7 @@ static void celt_decode_lost(CELTDecoder * OAC_RESTRICT st, int N, int LM
                 oac_val32 ac[CELT_LPC_ORDER + 1];
                 /* Compute LPC coefficients for the last MAX_PERIOD samples before
                    the first loss so we can work in the excitation-filter domain. */
-                _celt_autocorr(exc, ac, window, overlap,
+                oaci_celt_autocorr(exc, ac, window, overlap,
                    CELT_LPC_ORDER, max_period, st->arch);
                 /* Add a noise floor of -40 dB. */
 #ifdef FIXED_POINT
@@ -800,7 +800,7 @@ static void celt_decode_lost(CELTDecoder * OAC_RESTRICT st, int N, int LM
                     ac[i] -= ac[i]*(0.008f*0.008f)*i*i;
 #endif
                 }
-                _celt_lpc(lpc + c*CELT_LPC_ORDER, ac, CELT_LPC_ORDER);
+                oaci_celt_lpc(lpc + c*CELT_LPC_ORDER, ac, CELT_LPC_ORDER);
 #ifdef FIXED_POINT
                 /* For fixed-point, apply bandwidth expansion until we can guarantee that
                    no overflow can happen in the IIR filter. This means:
@@ -822,8 +822,8 @@ static void celt_decode_lost(CELTDecoder * OAC_RESTRICT st, int N, int LM
                of the region for which we're computing the excitation. */
             {
                 /* Compute the excitation for exc_length samples before the loss. We need the copy
-                   because celt_fir() cannot filter in-place. */
-                celt_fir(exc + max_period - exc_length, lpc + c*CELT_LPC_ORDER,
+                   because oaci_celt_fir() cannot filter in-place. */
+                oaci_celt_fir(exc + max_period - exc_length, lpc + c*CELT_LPC_ORDER,
                   fir_tmp, exc_length, CELT_LPC_ORDER, st->arch);
                 OAC_COPY(exc + max_period - exc_length, fir_tmp, exc_length);
             }
@@ -849,7 +849,7 @@ static void celt_decode_lost(CELTDecoder * OAC_RESTRICT st, int N, int LM
                     E2 += SHR32(MULT16_16(e, e), shift);
                 }
                 E1 = MIN32(E1, E2);
-                decay = celt_sqrt(frac_div32(SHR32(E1, 1), E2));
+                decay = oaci_celt_sqrt(oaci_frac_div32(SHR32(E1, 1), E2));
             }
 
             /* Move the decoder memory one frame to the left to give us room to
@@ -890,7 +890,7 @@ static void celt_decode_lost(CELTDecoder * OAC_RESTRICT st, int N, int LM
                     lpc_mem[i] = SROUND16(buf[decode_buffer_size - N - 1 - i], SIG_SHIFT);
                 /* Apply the synthesis filter to convert the excitation back into
                    the signal domain. */
-                celt_iir(buf + decode_buffer_size - N, lpc + c*CELT_LPC_ORDER,
+                oaci_celt_iir(buf + decode_buffer_size - N, lpc + c*CELT_LPC_ORDER,
                   buf + decode_buffer_size - N, extrapolation_len, CELT_LPC_ORDER,
                   lpc_mem, st->arch);
 #ifdef FIXED_POINT
@@ -920,7 +920,7 @@ static void celt_decode_lost(CELTDecoder * OAC_RESTRICT st, int N, int LM
                     for (i = 0; i < extrapolation_len; i++)
                         buf[decode_buffer_size - N + i] = 0;
                 } else if (S1 < S2) {
-                    oac_val16 ratio = celt_sqrt(frac_div32(SHR32(S1, 1) + 1, S2 + 1));
+                    oac_val16 ratio = oaci_celt_sqrt(oaci_frac_div32(SHR32(S1, 1) + 1, S2 + 1));
                     for (i = 0; i < overlap; i++) {
                         oac_val16 tmp_g = Q15ONE
                                           - MULT16_16_Q15(COEF2VAL16(window[i]), Q15ONE - ratio);
@@ -955,7 +955,7 @@ static void celt_decode_lost(CELTDecoder * OAC_RESTRICT st, int N, int LM
                 st->plc_fill = 0;
             }
             while (st->plc_fill < samples_needed16k) {
-                lpcnet_plc_conceal(lpcnet, &st->plc_pcm[st->plc_fill]);
+                oaci_lpcnet_plc_conceal(lpcnet, &st->plc_pcm[st->plc_fill]);
                 st->plc_fill += FRAME_SIZE;
             }
             /* Resample to 48 kHz. */
@@ -1011,7 +1011,7 @@ static void celt_decode_lost(CELTDecoder * OAC_RESTRICT st, int N, int LM
     RESTORE_STACK;
 }
 
-int celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char *data,
+int oaci_celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char *data,
                              int len, oac_res * OAC_RESTRICT pcm, int frame_size, ec_dec *dec, int accum
 #ifdef ENABLE_DEEP_PLC
                              , LPCNetPLCState *lpcnet
@@ -1164,7 +1164,7 @@ int celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char
             , lpcnet
 #endif
             );
-        deemphasis(out_syn, pcm, N, CC, st->downsample, mode->preemph, st->preemph_memD, accum);
+        oaci_deemphasis(out_syn, pcm, N, CC, st->downsample, mode->preemph, st->preemph_memD, accum);
         RESTORE_STACK;
         return frame_size/st->downsample;
     }
@@ -1180,7 +1180,7 @@ int celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char
     if (st->loss_duration == 0) st->skip_plc = 0;
 
     if (dec == NULL) {
-        ec_dec_init(&_dec, (unsigned char*)data, len);
+        oaci_ec_dec_init(&_dec, (unsigned char*)data, len);
         dec = &_dec;
     }
 
@@ -1195,7 +1195,7 @@ int celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char
     if (tell >= total_bits)
         silence = 1;
     else if (tell == 1)
-        silence = ec_dec_bit_logp(dec, 15);
+        silence = oaci_ec_dec_bit_logp(dec, 15);
     else
         silence = 0;
     if (silence) {
@@ -1208,20 +1208,20 @@ int celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char
     postfilter_pitch = 0;
     postfilter_tapset = 0;
     if (start == 0 && tell + 18 <= total_bits) {
-        if (ec_dec_bit_logp(dec, 1)) {
+        if (oaci_ec_dec_bit_logp(dec, 1)) {
             int qg, octave;
-            octave = ec_dec_uint(dec, 6);
-            postfilter_pitch = (16<<octave) + ec_dec_bits(dec, 4 + octave) - 1;
-            qg = ec_dec_bits(dec, 3);
+            octave = oaci_ec_dec_uint(dec, 6);
+            postfilter_pitch = (16<<octave) + oaci_ec_dec_bits(dec, 4 + octave) - 1;
+            qg = oaci_ec_dec_bits(dec, 3);
             if (ec_tell(dec) + 2 <= total_bits)
-                postfilter_tapset = ec_dec_icdf(dec, tapset_icdf, 4);
+                postfilter_tapset = oaci_ec_dec_icdf(dec, tapset_icdf, 4);
             postfilter_gain = QCONST16(.09375f, 15)*(qg + 1);
         }
         tell = ec_tell(dec);
     }
 
     if (LM > 0 && tell + 3 <= total_bits) {
-        isTransient = ec_dec_bit_logp(dec, 3);
+        isTransient = oaci_ec_dec_bit_logp(dec, 3);
         tell = ec_tell(dec);
     } else
         isTransient = 0;
@@ -1232,7 +1232,7 @@ int celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char
         shortBlocks = 0;
 
     /* Decode the global flags (first symbols in the stream) */
-    intra_ener = tell + 3 <= total_bits ? ec_dec_bit_logp(dec, 3) : 0;
+    intra_ener = tell + 3 <= total_bits ? oaci_ec_dec_bit_logp(dec, 3) : 0;
     /* If recovering from packet loss, make sure we make the energy prediction safe to reduce the
        risk of getting loud artifacts. */
     if (!intra_ener && st->loss_duration != 0) {
@@ -1264,7 +1264,7 @@ int celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char
         } while (++c < 2);
     }
     /* Get band energies */
-    unquant_coarse_energy(mode, start, end, oldBandE,
+    oaci_unquant_coarse_energy(mode, start, end, oldBandE,
          intra_ener, dec, C, LM);
 
     ALLOC(tf_res, nbEBands, int);
@@ -1273,17 +1273,17 @@ int celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char
     tell = ec_tell(dec);
     spread_decision = SPREAD_NORMAL;
     if (tell + 4 <= total_bits)
-        spread_decision = ec_dec_icdf(dec, spread_icdf, 5);
+        spread_decision = oaci_ec_dec_icdf(dec, spread_icdf, 5);
 
     ALLOC(cap, nbEBands, int);
 
-    init_caps(mode, cap, LM, C);
+    oaci_init_caps(mode, cap, LM, C);
 
     ALLOC(offsets, nbEBands, int);
 
     dynalloc_logp = 6;
     total_bits <<= BITRES;
-    tell = ec_tell_frac(dec);
+    tell = oaci_ec_tell_frac(dec);
     for (i = start; i < end; i++) {
         int width, quanta;
         int dynalloc_loop_logp;
@@ -1296,8 +1296,8 @@ int celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char
         boost = 0;
         while (tell + (dynalloc_loop_logp<<BITRES) < total_bits && boost < cap[i]) {
             int flag;
-            flag = ec_dec_bit_logp(dec, dynalloc_loop_logp);
-            tell = ec_tell_frac(dec);
+            flag = oaci_ec_dec_bit_logp(dec, dynalloc_loop_logp);
+            tell = oaci_ec_tell_frac(dec);
             if (!flag)
                 break;
             boost += quanta;
@@ -1312,20 +1312,20 @@ int celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char
 
     ALLOC(fine_quant, nbEBands, int);
     alloc_trim = tell + (7<<BITRES) <= total_bits ?
-                 ec_dec_icdf(dec, trim_icdf, 7) : 5;
+                 oaci_ec_dec_icdf(dec, trim_icdf, 7) : 5;
 
-    bits = (((oac_int32)len*8)<<BITRES) - (oac_int32)ec_tell_frac(dec) - 1;
+    bits = (((oac_int32)len*8)<<BITRES) - (oac_int32)oaci_ec_tell_frac(dec) - 1;
     anti_collapse_rsv = isTransient && LM >= 2 && bits >= ((LM + 2)<<BITRES) ? (1<<BITRES) : 0;
     bits -= anti_collapse_rsv;
 
     ALLOC(pulses, nbEBands, int);
     ALLOC(fine_priority, nbEBands, int);
 
-    codedBands = clt_compute_allocation(mode, start, end, offsets, cap,
+    codedBands = oaci_clt_compute_allocation(mode, start, end, offsets, cap,
          alloc_trim, &intensity, &dual_stereo, bits, &balance, pulses,
          fine_quant, fine_priority, C, LM, dec, 0, 0, 0);
 
-    unquant_fine_energy(mode, start, end, oldBandE, NULL, fine_quant, dec, C);
+    oaci_unquant_fine_energy(mode, start, end, oldBandE, NULL, fine_quant, dec, C);
 
     c = 0; do {
         OAC_MOVE(decode_mem[c], decode_mem[c] + N, decode_buffer_size - N + overlap);
@@ -1336,20 +1336,20 @@ int celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char
 
     ALLOC(X, C*N, celt_norm);  /**< Interleaved normalised MDCTs */
 
-    quant_all_bands(0, mode, start, end, X, C == 2 ? X + N : NULL, collapse_masks,
+    oaci_quant_all_bands(0, mode, start, end, X, C == 2 ? X + N : NULL, collapse_masks,
          NULL, pulses, shortBlocks, spread_decision, dual_stereo, intensity, tf_res,
          len*(8<<BITRES) - anti_collapse_rsv, balance, dec, LM, codedBands, &st->rng, 0,
          st->arch, st->disable_inv);
 
     if (anti_collapse_rsv > 0) {
-        anti_collapse_on = ec_dec_bits(dec, 1);
+        anti_collapse_on = oaci_ec_dec_bits(dec, 1);
     }
 
-    unquant_energy_finalise(mode, start, end, oldBandE,
+    oaci_unquant_energy_finalise(mode, start, end, oldBandE,
          fine_quant, fine_priority, len*8 - ec_tell(dec), dec, C);
 
     if (anti_collapse_on)
-        anti_collapse(mode, X, collapse_masks, LM, C, N,
+        oaci_anti_collapse(mode, X, collapse_masks, LM, C, N,
             start, end, oldBandE, oldLogE, oldLogE2, pulses, st->rng, 0, st->arch);
 
     if (silence) {
@@ -1359,17 +1359,17 @@ int celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char
     if (st->prefilter_and_fold) {
         prefilter_and_fold(st, N);
     }
-    celt_synthesis(mode, X, out_syn, oldBandE, start, effEnd,
+    oaci_celt_synthesis(mode, X, out_syn, oldBandE, start, effEnd,
                   C, CC, isTransient, LM, st->downsample, silence, st->arch);
 
     c = 0; do {
         st->postfilter_period = IMAX(st->postfilter_period, COMBFILTER_MINPERIOD);
         st->postfilter_period_old = IMAX(st->postfilter_period_old, COMBFILTER_MINPERIOD);
-        comb_filter(out_syn[c], out_syn[c], st->postfilter_period_old, st->postfilter_period, mode->shortMdctSize,
+        oaci_comb_filter(out_syn[c], out_syn[c], st->postfilter_period_old, st->postfilter_period, mode->shortMdctSize,
             st->postfilter_gain_old, st->postfilter_gain, st->postfilter_tapset_old, st->postfilter_tapset,
             mode->window, overlap, st->arch);
         if (LM != 0)
-            comb_filter(out_syn[c] + mode->shortMdctSize, out_syn[c] + mode->shortMdctSize, st->postfilter_period,
+            oaci_comb_filter(out_syn[c] + mode->shortMdctSize, out_syn[c] + mode->shortMdctSize, st->postfilter_period,
             postfilter_pitch, N - mode->shortMdctSize,
                st->postfilter_gain, postfilter_gain, st->postfilter_tapset, postfilter_tapset,
                mode->window, overlap, st->arch);
@@ -1416,7 +1416,7 @@ int celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char
     } while (++c < 2);
     st->rng = dec->rng;
 
-    deemphasis(out_syn, pcm, N, CC, st->downsample, mode->preemph, st->preemph_memD, accum);
+    oaci_deemphasis(out_syn, pcm, N, CC, st->downsample, mode->preemph, st->preemph_memD, accum);
     st->loss_duration = 0;
     st->plc_duration = 0;
     st->last_frame_type = FRAME_NORMAL;
@@ -1429,9 +1429,9 @@ int celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned char
     return frame_size/st->downsample;
 }
 
-int celt_decode_with_ec(CELTDecoder * OAC_RESTRICT st, const unsigned char *data,
+int oaci_celt_decode_with_ec(CELTDecoder * OAC_RESTRICT st, const unsigned char *data,
                         int len, oac_res * OAC_RESTRICT pcm, int frame_size, ec_dec *dec, int accum) {
-    return celt_decode_with_ec_dred(st, data, len, pcm, frame_size, dec, accum
+    return oaci_celt_decode_with_ec_dred(st, data, len, pcm, frame_size, dec, accum
 #ifdef ENABLE_DEEP_PLC
         , NULL
 #endif
@@ -1453,7 +1453,7 @@ int oac_custom_decode(CELTDecoder * OAC_RESTRICT st, const unsigned char *data,
     N = frame_size;
 
     ALLOC(out, C*N, oac_res);
-    ret = celt_decode_with_ec(st, data, len, out, frame_size, NULL, 0);
+    ret = oaci_celt_decode_with_ec(st, data, len, out, frame_size, NULL, 0);
     if (ret > 0)
         for (j = 0; j < C*ret; j++)
             pcm[j] = RES2INT16(out[j]);
@@ -1465,7 +1465,7 @@ int oac_custom_decode(CELTDecoder * OAC_RESTRICT st, const unsigned char *data,
 # if defined(FIXED_POINT)
 int oac_custom_decode24(CELTDecoder * OAC_RESTRICT st, const unsigned char *data, int len, oac_int32 * OAC_RESTRICT pcm,
                         int frame_size) {
-    return celt_decode_with_ec(st, data, len, pcm, frame_size, NULL, 0);
+    return oaci_celt_decode_with_ec(st, data, len, pcm, frame_size, NULL, 0);
 }
 # else
 int oac_custom_decode24(CELTDecoder * OAC_RESTRICT st, const unsigned char *data, int len, oac_int32 * OAC_RESTRICT pcm,
@@ -1481,7 +1481,7 @@ int oac_custom_decode24(CELTDecoder * OAC_RESTRICT st, const unsigned char *data
     N = frame_size;
 
     ALLOC(out, C*N, oac_res);
-    ret = celt_decode_with_ec(st, data, len, out, frame_size, NULL, 0);
+    ret = oaci_celt_decode_with_ec(st, data, len, out, frame_size, NULL, 0);
     if (ret > 0)
         for (j = 0; j < C*ret; j++)
             pcm[j] = RES2INT24(out[j]);
@@ -1497,7 +1497,7 @@ int oac_custom_decode24(CELTDecoder * OAC_RESTRICT st, const unsigned char *data
 #  if !defined(FIXED_POINT)
 int oac_custom_decode_float(CELTDecoder * OAC_RESTRICT st, const unsigned char *data, int len, float * OAC_RESTRICT pcm,
                             int frame_size) {
-    return celt_decode_with_ec(st, data, len, pcm, frame_size, NULL, 0);
+    return oaci_celt_decode_with_ec(st, data, len, pcm, frame_size, NULL, 0);
 }
 #  else
 int oac_custom_decode_float(CELTDecoder * OAC_RESTRICT st, const unsigned char *data, int len, float * OAC_RESTRICT pcm,
@@ -1513,7 +1513,7 @@ int oac_custom_decode_float(CELTDecoder * OAC_RESTRICT st, const unsigned char *
     N = frame_size;
 
     ALLOC(out, C*N, oac_res);
-    ret = celt_decode_with_ec(st, data, len, out, frame_size, NULL, 0);
+    ret = oaci_celt_decode_with_ec(st, data, len, out, frame_size, NULL, 0);
     if (ret > 0)
         for (j = 0; j < C*ret; j++)
             pcm[j] = RES2FLOAT(out[j]);
diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c
index 0b99170fe..38361c604 100644
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -140,7 +140,7 @@ struct OacCustomEncoder {
     /* celt_glog energyError[],  Size = channels*mode->nbEBands */
 };
 
-int celt_encoder_get_size(int channels) {
+int oaci_celt_encoder_get_size(int channels) {
 #ifdef ENABLE_QEXT
     CELTMode *mode = oac_custom_mode_create(96000, 1920, NULL);
 #else
@@ -227,7 +227,7 @@ int oac_custom_encoder_init(CELTEncoder *st, const CELTMode *mode, int channels)
 }
 #endif
 
-int celt_encoder_init(CELTEncoder *st, oac_int32 sampling_rate, int channels,
+int oaci_celt_encoder_init(CELTEncoder *st, oac_int32 sampling_rate, int channels,
                       int arch) {
     int ret;
 #ifdef ENABLE_QEXT
@@ -241,7 +241,7 @@ int celt_encoder_init(CELTEncoder *st, oac_int32 sampling_rate, int channels,
            oac_custom_mode_create(48000, 960, NULL), channels, arch);
     if (ret != OAC_OK)
         return ret;
-    st->upsample = resampling_factor(sampling_rate);
+    st->upsample = oaci_resampling_factor(sampling_rate);
     return OAC_OK;
 }
 
@@ -388,9 +388,9 @@ static int transient_analysis(const oac_val32 * OAC_RESTRICT in, int len, int C,
            geometric mean of the energy and half the max */
 #ifdef FIXED_POINT
         /* Costs two sqrt() to avoid overflows */
-        mean = MULT16_16(celt_sqrt(mean), celt_sqrt(MULT16_16(maxE, len2>>1)));
+        mean = MULT16_16(oaci_celt_sqrt(mean), oaci_celt_sqrt(MULT16_16(maxE, len2>>1)));
 #else
-        mean = celt_sqrt(mean*maxE*.5*len2);
+        mean = oaci_celt_sqrt(mean*maxE*.5*len2);
 #endif
         /* Inverse of the mean energy in Q15+6 */
         norm = SHL32(EXTEND32(len2), 6 + 14)/ADD32(EPSILON, SHR32(mean, 1));
@@ -434,9 +434,9 @@ static int transient_analysis(const oac_val32 * OAC_RESTRICT in, int len, int C,
         *weak_transient = 1;
     }
     /* Arbitrary metric for VBR boost */
-    tf_max = MAX16(0, celt_sqrt(27*mask_metric) - 42);
+    tf_max = MAX16(0, oaci_celt_sqrt(27*mask_metric) - 42);
     /* *tf_estimate = 1 + MIN16(1, sqrt(MAX16(0, tf_max-30))/20); */
-    *tf_estimate = celt_sqrt(MAX32(0,
+    *tf_estimate = oaci_celt_sqrt(MAX32(0,
     SHL32(MULT16_16(QCONST16(0.0069, 14), MIN16(163, tf_max)), 14) - QCONST32(0.139, 28)));
     /*printf("%d %f\n", tf_max, mask_metric);*/
     RESTORE_STACK;
@@ -504,7 +504,7 @@ static void compute_mdcts(const CELTMode *mode, int shortBlocks, celt_sig * OAC_
     c = 0; do {
         for (b = 0; b < B; b++) {
             /* Interleaving the sub-frames while doing the MDCTs */
-            clt_mdct_forward(&mode->mdct, in + c*(B*N + overlap) + b*N,
+            oaci_clt_mdct_forward(&mode->mdct, in + c*(B*N + overlap) + b*N,
                           &out[b + c*N*B], mode->window, overlap, shift, B,
                           arch);
         }
@@ -524,7 +524,7 @@ static void compute_mdcts(const CELTMode *mode, int shortBlocks, celt_sig * OAC_
 }
 
 
-void celt_preemphasis(const oac_res * OAC_RESTRICT pcmp, celt_sig * OAC_RESTRICT inp,
+void oaci_celt_preemphasis(const oac_res * OAC_RESTRICT pcmp, celt_sig * OAC_RESTRICT inp,
                       int N, int CC, int upsample, const oac_val16 *coef, celt_sig *mem, int clip) {
     int i;
     oac_val16 coef0;
@@ -652,7 +652,7 @@ static int tf_analysis(const CELTMode *m, int len, int isTransient,
         /* Check the -1 case for transients */
         if (isTransient && !narrow) {
             OAC_COPY(tmp_1, tmp, N);
-            haar1(tmp_1, N>>LM, 1<<LM);
+            oaci_haar1(tmp_1, N>>LM, 1<<LM);
             L1 = l1_metric(tmp_1, N, LM + 1, bias);
             if (L1 < best_L1) {
                 best_L1 = L1;
@@ -668,7 +668,7 @@ static int tf_analysis(const CELTMode *m, int len, int isTransient,
             else
                 B = k + 1;
 
-            haar1(tmp, N>>k, 1<<k);
+            oaci_haar1(tmp, N>>k, 1<<k);
 
             L1 = l1_metric(tmp, N, B, bias);
 
@@ -693,15 +693,15 @@ static int tf_analysis(const CELTMode *m, int len, int isTransient,
     /* Search for the optimal tf resolution, including tf_select */
     tf_select = 0;
     for (sel = 0; sel < 2; sel++) {
-        cost0 = importance[0]*abs(metric[0] - 2*tf_select_table[LM][4*isTransient + 2*sel + 0]);
-        cost1 = importance[0]*abs(metric[0] - 2*tf_select_table[LM][4*isTransient + 2*sel + 1])
+        cost0 = importance[0]*abs(metric[0] - 2*oaci_tf_select_table[LM][4*isTransient + 2*sel + 0]);
+        cost1 = importance[0]*abs(metric[0] - 2*oaci_tf_select_table[LM][4*isTransient + 2*sel + 1])
                 + (isTransient ? 0 : lambda);
         for (i = 1; i < len; i++) {
             int curr0, curr1;
             curr0 = IMIN(cost0, cost1 + lambda);
             curr1 = IMIN(cost0 + lambda, cost1);
-            cost0 = curr0 + importance[i]*abs(metric[i] - 2*tf_select_table[LM][4*isTransient + 2*sel + 0]);
-            cost1 = curr1 + importance[i]*abs(metric[i] - 2*tf_select_table[LM][4*isTransient + 2*sel + 1]);
+            cost0 = curr0 + importance[i]*abs(metric[i] - 2*oaci_tf_select_table[LM][4*isTransient + 2*sel + 0]);
+            cost1 = curr1 + importance[i]*abs(metric[i] - 2*oaci_tf_select_table[LM][4*isTransient + 2*sel + 1]);
         }
         cost0 = IMIN(cost0, cost1);
         selcost[sel] = cost0;
@@ -710,8 +710,8 @@ static int tf_analysis(const CELTMode *m, int len, int isTransient,
      * If tests confirm it's useful for non-transients, we could allow it. */
     if (selcost[1] < selcost[0] && isTransient)
         tf_select = 1;
-    cost0 = importance[0]*abs(metric[0] - 2*tf_select_table[LM][4*isTransient + 2*tf_select + 0]);
-    cost1 = importance[0]*abs(metric[0] - 2*tf_select_table[LM][4*isTransient + 2*tf_select + 1])
+    cost0 = importance[0]*abs(metric[0] - 2*oaci_tf_select_table[LM][4*isTransient + 2*tf_select + 0]);
+    cost1 = importance[0]*abs(metric[0] - 2*oaci_tf_select_table[LM][4*isTransient + 2*tf_select + 1])
             + (isTransient ? 0 : lambda);
     /* Viterbi forward pass */
     for (i = 1; i < len; i++) {
@@ -737,8 +737,8 @@ static int tf_analysis(const CELTMode *m, int len, int isTransient,
             curr1 = from1;
             path1[i] = 1;
         }
-        cost0 = curr0 + importance[i]*abs(metric[i] - 2*tf_select_table[LM][4*isTransient + 2*tf_select + 0]);
-        cost1 = curr1 + importance[i]*abs(metric[i] - 2*tf_select_table[LM][4*isTransient + 2*tf_select + 1]);
+        cost0 = curr0 + importance[i]*abs(metric[i] - 2*oaci_tf_select_table[LM][4*isTransient + 2*tf_select + 0]);
+        cost1 = curr1 + importance[i]*abs(metric[i] - 2*oaci_tf_select_table[LM][4*isTransient + 2*tf_select + 1]);
     }
     tf_res[len - 1] = cost0 < cost1 ? 0 : 1;
     /* Viterbi backward pass to check the decisions */
@@ -775,7 +775,7 @@ static void tf_encode(int start, int end, int isTransient, int *tf_res, int LM,
     curr = tf_changed = 0;
     for (i = start; i < end; i++) {
         if (tell + logp <= budget) {
-            ec_enc_bit_logp(enc, tf_res[i]^curr, logp);
+            oaci_ec_enc_bit_logp(enc, tf_res[i]^curr, logp);
             tell = ec_tell(enc);
             curr = tf_res[i];
             tf_changed |= curr;
@@ -785,13 +785,13 @@ static void tf_encode(int start, int end, int isTransient, int *tf_res, int LM,
     }
     /* Only code tf_select if it would actually make a difference. */
     if (tf_select_rsv
-        && tf_select_table[LM][4*isTransient + 0 + tf_changed] !=
-        tf_select_table[LM][4*isTransient + 2 + tf_changed])
-        ec_enc_bit_logp(enc, tf_select, 1);
+        && oaci_tf_select_table[LM][4*isTransient + 0 + tf_changed] !=
+        oaci_tf_select_table[LM][4*isTransient + 2 + tf_changed])
+        oaci_ec_enc_bit_logp(enc, tf_select, 1);
     else
         tf_select = 0;
     for (i = start; i < end; i++)
-        tf_res[i] = tf_select_table[LM][4*isTransient + 2*tf_select + tf_res[i]];
+        tf_res[i] = oaci_tf_select_table[LM][4*isTransient + 2*tf_select + tf_res[i]];
     /*for(i=0;i<end;i++)printf("%d ", isTransient ? tf_res[i] : LM+tf_res[i]);printf("\n");*/
 }
 
@@ -820,7 +820,7 @@ static int alloc_trim_analysis(const CELTMode *m, const celt_norm *X,
         /* Compute inter-channel correlation for low frequencies */
         for (i = 0; i < 8; i++) {
             oac_val32 partial;
-            partial = celt_inner_prod_norm_shift(&X[m->eBands[i]<<LM], &X[N0 + (m->eBands[i]<<LM)],
+            partial = oaci_celt_inner_prod_norm_shift(&X[m->eBands[i]<<LM], &X[N0 + (m->eBands[i]<<LM)],
                 (m->eBands[i + 1] - m->eBands[i])<<LM, arch);
             sum = ADD16(sum, EXTRACT16(SHR32(partial, 18)));
         }
@@ -829,7 +829,7 @@ static int alloc_trim_analysis(const CELTMode *m, const celt_norm *X,
         minXC = sum;
         for (i = 8; i < intensity; i++) {
             oac_val32 partial;
-            partial = celt_inner_prod_norm_shift(&X[m->eBands[i]<<LM], &X[N0 + (m->eBands[i]<<LM)],
+            partial = oaci_celt_inner_prod_norm_shift(&X[m->eBands[i]<<LM], &X[N0 + (m->eBands[i]<<LM)],
                 (m->eBands[i + 1] - m->eBands[i])<<LM, arch);
             minXC = MIN16(minXC, ABS16(EXTRACT16(SHR32(partial, 18))));
         }
@@ -991,10 +991,10 @@ static celt_glog dynalloc_analysis(const celt_glog *bandLogE, const celt_glog *b
     /* Dynamic allocation code */
     maxDepth = -GCONST(31.9f);
     for (i = 0; i < end; i++) {
-        /* Noise floor must take into account eMeans, the depth, the width of the bands
+        /* Noise floor must take into account oaci_eMeans, the depth, the width of the bands
            and the preemphasis filter (approx. square of bark band ID) */
         noise_floor[i] = GCONST(0.0625f)*logN[i]
-                         + GCONST(.5f) + SHL32(9 - lsb_depth, DB_SHIFT) - SHL32(eMeans[i], DB_SHIFT - 4)
+                         + GCONST(.5f) + SHL32(9 - lsb_depth, DB_SHIFT) - SHL32(oaci_eMeans[i], DB_SHIFT - 4)
                          + GCONST(.0062f)*(i + 5)*(i + 5);
     }
     c = 0; do {
@@ -1182,7 +1182,7 @@ static celt_glog dynalloc_analysis(const celt_glog *bandLogE, const celt_glog *b
 }
 
 #ifdef FIXED_POINT
-void normalize_tone_input(oac_val16 *x, int len) {
+void oaci_normalize_tone_input(oac_val16 *x, int len) {
     oac_val32 ac0 = len;
     int i;
     int shift;
@@ -1196,7 +1196,7 @@ void normalize_tone_input(oac_val16 *x, int len) {
         }
     }
 }
-int acos_approx(oac_val32 x) {
+int oaci_acos_approx(oac_val32 x) {
     oac_val16 x14;
     oac_val32 tmp;
     int flip = x < 0;
@@ -1204,7 +1204,7 @@ int acos_approx(oac_val32 x) {
     x14 = x>>15;
     tmp = (762*x14>>14) - 3308;
     tmp = (tmp*x14>>14) + 25726;
-    tmp = tmp*celt_sqrt(IMAX(0, (1<<30) - (x<<1)))>>16;
+    tmp = tmp*oaci_celt_sqrt(IMAX(0, (1<<30) - (x<<1)))>>16;
     if (flip) tmp = 25736 - tmp;
     return tmp;
 }
@@ -1260,11 +1260,11 @@ static int tone_lpc(const oac_val16 *x, int len, int delay, oac_val32 *lpc) {
     num1 = MULT32_32_Q31(r02, r11) - MULT32_32_Q31(r01, r12);
     if (num1 >= den) lpc[1] = QCONST32(1.f, 29);
     else if (num1 <= -den) lpc[1] = -QCONST32(1.f, 29);
-    else lpc[1] = frac_div32_q29(num1, den);
+    else lpc[1] = oaci_frac_div32_q29(num1, den);
     num0 = MULT32_32_Q31(r00, r12) - MULT32_32_Q31(r02, r01);
     if (HALF32(num0) >= den) lpc[0] = QCONST32(1.999999f, 29);
     else if (HALF32(num0) <= -den) lpc[0] = -QCONST32(1.999999f, 29);
-    else lpc[0] = frac_div32_q29(num0, den);
+    else lpc[0] = oaci_frac_div32_q29(num0, den);
     /*printf("%f %f\n", lpc[0], lpc[1]);*/
     return 0;
 }
@@ -1286,7 +1286,7 @@ static oac_val16 tone_detect(const celt_sig *in, int CC, int N, oac_val32 *tonei
         for (i = 0; i < N; i++) x[i] = PSHR32(in[i], SIG_SHIFT + 2);
     }
 #ifdef FIXED_POINT
-    normalize_tone_input(x, N);
+    oaci_normalize_tone_input(x, N);
 #endif
     fail = tone_lpc(x, N, delay, lpc);
     /* If our LPC filter resonates too close to DC, retry the analysis with down-sampling. */
@@ -1299,7 +1299,7 @@ static oac_val16 tone_detect(const celt_sig *in, int CC, int N, oac_val32 *tonei
         /* Squared radius of the poles. */
         *toneishness = -lpc[1];
 #ifdef FIXED_POINT
-        freq = (acos_approx(lpc[0]>>1) + delay/2)/delay;
+        freq = (oaci_acos_approx(lpc[0]>>1) + delay/2)/delay;
 #else
         freq = acos(.5f*lpc[0])/delay;
 #endif
@@ -1379,15 +1379,15 @@ static int run_prefilter(CELTEncoder *st, celt_sig *in, celt_sig *prefilter_mem,
         VARDECL(oac_val16, pitch_buf);
         ALLOC(pitch_buf, (max_period + N)>>1, oac_val16);
 
-        pitch_downsample(pre, pitch_buf, (max_period + N)>>1, CC, 2, st->arch);
+        oaci_pitch_downsample(pre, pitch_buf, (max_period + N)>>1, CC, 2, st->arch);
         /* Don't search for the fir last 1.5 octave of the range because
            there's too many false-positives due to short-term correlation */
-        pitch_search(pitch_buf + (max_period>>1), pitch_buf, N,
+        oaci_pitch_search(pitch_buf + (max_period>>1), pitch_buf, N,
             max_period - 3*min_period, &pitch_index,
             st->arch);
         pitch_index = max_period - pitch_index;
 
-        gain1 = remove_doubling(pitch_buf, max_period, min_period,
+        gain1 = oaci_remove_doubling(pitch_buf, max_period, min_period,
             N, &pitch_index, st->prefilter_period, st->prefilter_gain, st->arch);
         if (pitch_index > max_period - QEXT_SCALE(2))
             pitch_index = max_period - QEXT_SCALE(2);
@@ -1461,11 +1461,11 @@ static int run_prefilter(CELTEncoder *st, celt_sig *in, celt_sig *prefilter_mem,
         OAC_COPY(in + c*(N + overlap), st->in_mem + c*(overlap), overlap);
         for (i = 0; i < N; i++) before[c] += ABS32(SHR32(in[c*(N + overlap) + overlap + i], 12));
         if (offset)
-            comb_filter(in + c*(N + overlap) + overlap, pre[c] + max_period,
+            oaci_comb_filter(in + c*(N + overlap) + overlap, pre[c] + max_period,
                st->prefilter_period, st->prefilter_period, offset, -st->prefilter_gain, -st->prefilter_gain,
                st->prefilter_tapset, st->prefilter_tapset, NULL, 0, st->arch);
 
-        comb_filter(in + c*(N + overlap) + overlap + offset, pre[c] + max_period + offset,
+        oaci_comb_filter(in + c*(N + overlap) + overlap + offset, pre[c] + max_period + offset,
             st->prefilter_period, pitch_index, N - offset, -st->prefilter_gain, -gain1,
             st->prefilter_tapset, prefilter_tapset, mode->window, overlap, st->arch);
         for (i = 0; i < N; i++) after[c] += ABS32(SHR32(in[c*(N + overlap) + overlap + i], 12));
@@ -1490,7 +1490,7 @@ static int run_prefilter(CELTEncoder *st, celt_sig *in, celt_sig *prefilter_mem,
         c = 0; do {
             int offset = mode->shortMdctSize - overlap;
             OAC_COPY(in + c*(N + overlap) + overlap, pre[c] + max_period, N);
-            comb_filter(in + c*(N + overlap) + overlap + offset, pre[c] + max_period + offset,
+            oaci_comb_filter(in + c*(N + overlap) + overlap + offset, pre[c] + max_period + offset,
                      st->prefilter_period, pitch_index, overlap, -st->prefilter_gain, -0,
                      st->prefilter_tapset, prefilter_tapset, mode->window, overlap, st->arch);
         } while (++c < CC);
@@ -1623,7 +1623,7 @@ static int compute_vbr(const CELTMode *mode, AnalysisInfo *analysis, oac_int32 b
     return target;
 }
 
-int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int frame_size, unsigned char *compressed,
+int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int frame_size, unsigned char *compressed,
                         int nbCompressedBytes, ec_enc *enc) {
     int i, c, N;
     oac_int32 bits;
@@ -1740,7 +1740,7 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
         tell0_frac = tell = 1;
         nbFilledBytes = 0;
     } else {
-        tell0_frac = ec_tell_frac(enc);
+        tell0_frac = oaci_ec_tell_frac(enc);
         tell = ec_tell(enc);
         nbFilledBytes = (tell + 4)>>3;
     }
@@ -1791,7 +1791,7 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
             nbCompressedBytes = IMAX(2, IMIN(nbCompressedBytes,
                 (tmp + 4*mode->Fs)/(8*mode->Fs) - !!st->signalling));
             if (enc != NULL)
-                ec_enc_shrink(enc, nbCompressedBytes);
+                oaci_ec_enc_shrink(enc, nbCompressedBytes);
         }
         effectiveBytes = nbCompressedBytes - nbFilledBytes;
     }
@@ -1801,7 +1801,7 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
         equiv_rate = IMIN(equiv_rate, st->bitrate - (40*C + 20)*((400>>LM) - 50));
 
     if (enc == NULL) {
-        ec_enc_init(&_enc, compressed, nbCompressedBytes);
+        oaci_ec_enc_init(&_enc, compressed, nbCompressedBytes);
         enc = &_enc;
     }
 
@@ -1824,7 +1824,7 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
             if (max_allowed < nbAvailableBytes) {
                 nbCompressedBytes = nbFilledBytes + max_allowed;
                 nbAvailableBytes = max_allowed;
-                ec_enc_shrink(enc, nbCompressedBytes);
+                oaci_ec_enc_shrink(enc, nbCompressedBytes);
             }
         }
     }
@@ -1849,7 +1849,7 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
         silence = 1;
 #endif
     if (tell == 1)
-        ec_enc_bit_logp(enc, silence, 15);
+        oaci_ec_enc_bit_logp(enc, silence, 15);
     else
         silence = 0;
     if (silence) {
@@ -1858,7 +1858,7 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
             effectiveBytes = nbCompressedBytes = IMIN(nbCompressedBytes, nbFilledBytes + 2);
             total_bits = nbCompressedBytes*8;
             nbAvailableBytes = 2;
-            ec_enc_shrink(enc, nbCompressedBytes);
+            oaci_ec_enc_shrink(enc, nbCompressedBytes);
         }
         /* Pretend we've filled all the remaining bits with zeros
               (that's what the initialiser did anyway) */
@@ -1872,7 +1872,7 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
 #else
         need_clip = st->clip && sample_max > 65536.f;
 #endif
-        celt_preemphasis(pcm + c, in + c*(N + overlap) + overlap, N, CC, st->upsample,
+        oaci_celt_preemphasis(pcm + c, in + c*(N + overlap) + overlap, N, CC, st->upsample,
                   mode->preemph, st->preemph_memE + c, need_clip);
         OAC_COPY(in + c*(N + overlap), &prefilter_mem[(1 + c)*QEXT_SCALE(COMBFILTER_MAXPERIOD) - overlap], overlap);
     } while (++c < CC);
@@ -1906,19 +1906,19 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
             pitch_change = 1;
         if (pf_on == 0) {
             if (!hybrid && tell + 18 <= total_bits)
-                ec_enc_bit_logp(enc, 0, 1);
+                oaci_ec_enc_bit_logp(enc, 0, 1);
         } else {
             /*This block is not gated by a total bits check only because
                of the nbAvailableBytes check above.*/
             int octave;
-            ec_enc_bit_logp(enc, 1, 1);
+            oaci_ec_enc_bit_logp(enc, 1, 1);
             pitch_index += 1;
             octave = EC_ILOG(pitch_index) - 5;
-            ec_enc_uint(enc, octave, 6);
-            ec_enc_bits(enc, pitch_index - (16<<octave), 4 + octave);
+            oaci_ec_enc_uint(enc, octave, 6);
+            oaci_ec_enc_bits(enc, pitch_index - (16<<octave), 4 + octave);
             pitch_index -= 1;
-            ec_enc_bits(enc, qg, 3);
-            ec_enc_icdf(enc, prefilter_tapset, tapset_icdf, 4);
+            oaci_ec_enc_bits(enc, qg, 3);
+            oaci_ec_enc_icdf(enc, prefilter_tapset, tapset_icdf, 4);
         }
     }
     if (LM > 0 && ec_tell(enc) + 3 <= total_bits) {
@@ -1937,8 +1937,8 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
     ALLOC(bandLogE2, C*nbEBands, celt_glog);
     if (secondMdct) {
         compute_mdcts(mode, 0, in, freq, C, CC, LM, st->upsample, st->arch);
-        compute_band_energies(mode, freq, bandE, effEnd, C, LM, st->arch);
-        amp2Log2(mode, effEnd, end, bandE, bandLogE2, C);
+        oaci_compute_band_energies(mode, freq, bandE, effEnd, C, LM, st->arch);
+        oaci_amp2Log2(mode, effEnd, end, bandE, bandLogE2, C);
         for (c = 0; c < C; c++) {
             for (i = 0; i < end; i++)
                 bandLogE2[nbEBands*c + i] += HALF32(SHL32(LM, DB_SHIFT));
@@ -1951,7 +1951,7 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
     celt_assert(!celt_isnan(freq[0]) && (C == 1 || !celt_isnan(freq[N])));
     if (CC == 2 && C == 1)
         tf_chan = 0;
-    compute_band_energies(mode, freq, bandE, effEnd, C, LM, st->arch);
+    oaci_compute_band_energies(mode, freq, bandE, effEnd, C, LM, st->arch);
 
     if (st->lfe) {
         for (i = 2; i < end; i++) {
@@ -1959,7 +1959,7 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
             bandE[i] = MAX32(bandE[i], EPSILON);
         }
     }
-    amp2Log2(mode, effEnd, end, bandE, bandLogE, C);
+    oaci_amp2Log2(mode, effEnd, end, bandE, bandLogE, C);
 
     ALLOC(surround_dynalloc, C*nbEBands, celt_glog);
     OAC_CLEAR(surround_dynalloc, end);
@@ -2063,8 +2063,8 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
             isTransient = 1;
             shortBlocks = M;
             compute_mdcts(mode, shortBlocks, in, freq, C, CC, LM, st->upsample, st->arch);
-            compute_band_energies(mode, freq, bandE, effEnd, C, LM, st->arch);
-            amp2Log2(mode, effEnd, end, bandE, bandLogE, C);
+            oaci_compute_band_energies(mode, freq, bandE, effEnd, C, LM, st->arch);
+            oaci_amp2Log2(mode, effEnd, end, bandE, bandLogE, C);
             /* Compensate for the scaling of short vs long mdcts */
             for (c = 0; c < C; c++) {
                 for (i = 0; i < end; i++)
@@ -2075,12 +2075,12 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
     }
 
     if (LM > 0 && ec_tell(enc) + 3 <= total_bits)
-        ec_enc_bit_logp(enc, isTransient, 3);
+        oaci_ec_enc_bit_logp(enc, isTransient, 3);
 
     ALLOC(X, C*N, celt_norm);        /**< Interleaved normalised MDCTs */
 
     /* Band normalisation */
-    normalise_bands(mode, freq, X, bandE, effEnd, C, M);
+    oaci_normalise_bands(mode, freq, X, bandE, effEnd, C, M);
 
     enable_tf_analysis = effectiveBytes >= 15*C && !hybrid && st->complexity >= 2 && !st->lfe
                          && toneishness < QCONST32(.98f, 29);
@@ -2132,7 +2132,7 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
             }
         }
     } while (++c < C);
-    quant_coarse_energy(mode, start, end, effEnd, bandLogE,
+    oaci_quant_coarse_energy(mode, start, end, effEnd, bandLogE,
          oldBandE, total_bits, error, enc,
          C, LM, nbAvailableBytes, st->force_intra,
          &st->delayedIntra, st->complexity >= 4, st->loss_rate, st->lfe);
@@ -2157,7 +2157,7 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
                 st->spread_decision = SPREAD_NORMAL;
         } else {
             /* Disable new spreading+tapset estimator until we can show it works
-               better than the old one. So far it seems like spreading_decision()
+               better than the old one. So far it seems like oaci_spreading_decision()
                works best. */
 #if 0
             if (st->analysis.valid) {
@@ -2167,21 +2167,21 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
                                                                QCONST16(.02f, 15)};
                 static const oac_val16 tapset_thresholds[2] = {QCONST16(.0f, 15), QCONST16(.15f, 15)};
                 static const oac_val16 tapset_histeresis[2] = {QCONST16(.1f, 15), QCONST16(.05f, 15)};
-                st->spread_decision = hysteresis_decision(-st->analysis.tonality, spread_thresholds, spread_histeresis,
+                st->spread_decision = oaci_hysteresis_decision(-st->analysis.tonality, spread_thresholds, spread_histeresis,
                 3, st->spread_decision);
-                st->tapset_decision = hysteresis_decision(st->analysis.tonality_slope, tapset_thresholds,
+                st->tapset_decision = oaci_hysteresis_decision(st->analysis.tonality_slope, tapset_thresholds,
                 tapset_histeresis, 2, st->tapset_decision);
             } else
 #endif
             {
-                st->spread_decision = spreading_decision(mode, X,
+                st->spread_decision = oaci_spreading_decision(mode, X,
                   &st->tonal_average, st->spread_decision, &st->hf_average,
                   &st->tapset_decision, pf_on && !shortBlocks, effEnd, C, M, spread_weight);
             }
             /*printf("%d %d\n", st->tapset_decision, st->spread_decision);*/
             /*printf("%f %d %f %d\n\n", st->analysis.tonality, st->spread_decision, st->analysis.tonality_slope, st->tapset_decision);*/
         }
-        ec_enc_icdf(enc, st->spread_decision, spread_icdf, 5);
+        oaci_ec_enc_icdf(enc, st->spread_decision, spread_icdf, 5);
     } else {
         st->spread_decision = SPREAD_NORMAL;
     }
@@ -2190,12 +2190,12 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
     if (st->lfe)
         offsets[0] = IMIN(8, effectiveBytes/3);
     ALLOC(cap, nbEBands, int);
-    init_caps(mode, cap, LM, C);
+    oaci_init_caps(mode, cap, LM, C);
 
     dynalloc_logp = 6;
     total_bits <<= BITRES;
     total_boost = 0;
-    tell = ec_tell_frac(enc);
+    tell = oaci_ec_tell_frac(enc);
     for (i = start; i < end; i++) {
         int width, quanta;
         int dynalloc_loop_logp;
@@ -2211,8 +2211,8 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
              && boost < cap[i]; j++) {
             int flag;
             flag = j < offsets[i];
-            ec_enc_bit_logp(enc, flag, dynalloc_loop_logp);
-            tell = ec_tell_frac(enc);
+            oaci_ec_enc_bit_logp(enc, flag, dynalloc_loop_logp);
+            tell = oaci_ec_tell_frac(enc);
             if (!flag)
                 break;
             boost += quanta;
@@ -2236,7 +2236,7 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
         if (LM != 0)
             dual_stereo = stereo_analysis(mode, X, LM, N);
 
-        st->intensity = hysteresis_decision((oac_val16)(equiv_rate/1000),
+        st->intensity = oaci_hysteresis_decision((oac_val16)(equiv_rate/1000),
             intensity_thresholds, intensity_histeresis, 21, st->intensity);
         st->intensity = IMIN(end, IMAX(start, st->intensity));
     }
@@ -2251,8 +2251,8 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
             end, LM, C, N, &st->analysis, &st->stereo_saving, tf_estimate,
             st->intensity, surround_trim, equiv_rate, st->arch);
         }
-        ec_enc_icdf(enc, alloc_trim, trim_icdf, 7);
-        tell = ec_tell_frac(enc);
+        oaci_ec_enc_icdf(enc, alloc_trim, trim_icdf, 7);
+        tell = oaci_ec_tell_frac(enc);
     }
 
     /* In VBR mode the frame size must not be reduced so much that it would
@@ -2331,7 +2331,7 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
 
         if (st->vbr_count < 970) {
             st->vbr_count++;
-            alpha = celt_rcp(SHL32(EXTEND32(st->vbr_count + 20), 16));
+            alpha = oaci_celt_rcp(SHL32(EXTEND32(st->vbr_count + 20), 16));
         } else
             alpha = QCONST16(.001f, 15);
         /* How many bits have we used in excess of what we're allowed */
@@ -2357,7 +2357,7 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
         nbCompressedBytes = IMIN(nbCompressedBytes, nbAvailableBytes);
         /*printf("%d\n", nbCompressedBytes*50*8);*/
         /* This moves the raw bits to take into account the new compressed size */
-        ec_enc_shrink(enc, nbCompressedBytes);
+        oaci_ec_enc_shrink(enc, nbCompressedBytes);
     }
 
     /* Bit allocation */
@@ -2366,7 +2366,7 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
     ALLOC(fine_priority, nbEBands, int);
 
     /* bits =           packet size                    - where we are - safety*/
-    bits = (((oac_int32)nbCompressedBytes*8)<<BITRES) - (oac_int32)ec_tell_frac(enc) - 1;
+    bits = (((oac_int32)nbCompressedBytes*8)<<BITRES) - (oac_int32)oaci_ec_tell_frac(enc) - 1;
     anti_collapse_rsv = isTransient && LM >= 2 && bits >= ((LM + 2)<<BITRES) ? (1<<BITRES) : 0;
     bits -= anti_collapse_rsv;
     signalBandwidth = end - 1;
@@ -2388,7 +2388,7 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
 #endif
     if (st->lfe)
         signalBandwidth = 1;
-    codedBands = clt_compute_allocation(mode, start, end, offsets, cap,
+    codedBands = oaci_clt_compute_allocation(mode, start, end, offsets, cap,
          alloc_trim, &st->intensity, &dual_stereo, bits, &balance, pulses,
          fine_quant, fine_priority, C, LM, enc, 1, st->lastCodedBands, signalBandwidth);
     if (st->lastCodedBands)
@@ -2396,12 +2396,12 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
     else
         st->lastCodedBands = codedBands;
 
-    quant_fine_energy(mode, start, end, oldBandE, error, NULL, fine_quant, enc, C);
+    oaci_quant_fine_energy(mode, start, end, oldBandE, error, NULL, fine_quant, enc, C);
     OAC_CLEAR(energyError, nbEBands*CC);
 
     /* Residual quantisation */
     ALLOC(collapse_masks, C*nbEBands, unsigned char);
-    quant_all_bands(1, mode, start, end, X, C == 2 ? X + N : NULL, collapse_masks,
+    oaci_quant_all_bands(1, mode, start, end, X, C == 2 ? X + N : NULL, collapse_masks,
          bandE, pulses, shortBlocks, st->spread_decision,
          dual_stereo, st->intensity, tf_res, nbCompressedBytes*(8<<BITRES) - anti_collapse_rsv,
          balance, enc, LM, codedBands, &st->rng, st->complexity, st->arch, st->disable_inv);
@@ -2411,9 +2411,9 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
 #ifdef FUZZING
         anti_collapse_on = rand()&0x1;
 #endif
-        ec_enc_bits(enc, anti_collapse_on, 1);
+        oaci_ec_enc_bits(enc, anti_collapse_on, 1);
     }
-    quant_energy_finalise(mode, start, end, oldBandE, error, fine_quant, fine_priority,
+    oaci_quant_energy_finalise(mode, start, end, oldBandE, error, fine_quant, fine_priority,
     nbCompressedBytes*8 - ec_tell(enc), enc, C);
     c = 0;
     do {
@@ -2433,7 +2433,7 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
         celt_sig *out_mem[2];
 
         if (anti_collapse_on) {
-            anti_collapse(mode, X, collapse_masks, LM, C, N,
+            oaci_anti_collapse(mode, X, collapse_masks, LM, C, N,
                start, end, oldBandE, oldLogE, oldLogE2, pulses, st->rng, 1, st->arch);
         }
 
@@ -2445,24 +2445,24 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
             out_mem[c] = st->syn_mem[c] + QEXT_SCALE(DEC_PITCH_BUF_SIZE) - N;
         } while (++c < CC);
 
-        celt_synthesis(mode, X, out_mem, oldBandE, start, effEnd,
+        oaci_celt_synthesis(mode, X, out_mem, oldBandE, start, effEnd,
                      C, CC, isTransient, LM, st->upsample, silence, st->arch);
 
         c = 0; do {
             st->prefilter_period = IMAX(st->prefilter_period, COMBFILTER_MINPERIOD);
             st->prefilter_period_old = IMAX(st->prefilter_period_old, COMBFILTER_MINPERIOD);
-            comb_filter(out_mem[c], out_mem[c], st->prefilter_period_old, st->prefilter_period, mode->shortMdctSize,
+            oaci_comb_filter(out_mem[c], out_mem[c], st->prefilter_period_old, st->prefilter_period, mode->shortMdctSize,
                st->prefilter_gain_old, st->prefilter_gain, st->prefilter_tapset_old, st->prefilter_tapset,
                mode->window, overlap, st->arch);
             if (LM != 0)
-                comb_filter(out_mem[c] + mode->shortMdctSize, out_mem[c] + mode->shortMdctSize, st->prefilter_period,
+                oaci_comb_filter(out_mem[c] + mode->shortMdctSize, out_mem[c] + mode->shortMdctSize, st->prefilter_period,
                 pitch_index, N - mode->shortMdctSize,
                   st->prefilter_gain, gain1, st->prefilter_tapset, prefilter_tapset,
                   mode->window, overlap, st->arch);
         } while (++c < CC);
 
         /* We reuse freq[] as scratch space for the de-emphasis */
-        deemphasis(out_mem, (oac_res*)pcm, N, CC, st->upsample, mode->preemph, st->preemph_memD, 0);
+        oaci_deemphasis(out_mem, (oac_res*)pcm, N, CC, st->upsample, mode->preemph, st->preemph_memD, 0);
         st->prefilter_period_old = st->prefilter_period;
         st->prefilter_gain_old = st->prefilter_gain;
         st->prefilter_tapset_old = st->prefilter_tapset;
@@ -2511,7 +2511,7 @@ int celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm, int
 
     /* If there's any room left (can only happen for very high rates),
        it's already filled with zeros */
-    ec_enc_done(enc);
+    oaci_ec_enc_done(enc);
 #if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
     if (st->signalling)
         nbCompressedBytes++;
@@ -2543,7 +2543,7 @@ int oac_custom_encode(CELTEncoder * OAC_RESTRICT st, const oac_int16 * pcm, int
     for (j = 0; j < C*N; j++)
         in[j] = INT16TORES(pcm[j]);
 
-    ret = celt_encode_with_ec(st, in, frame_size, compressed, nbCompressedBytes, NULL);
+    ret = oaci_celt_encode_with_ec(st, in, frame_size, compressed, nbCompressedBytes, NULL);
 # ifdef RESYNTH
     for (j = 0; j < C*N; j++)
         ((oac_int16*)pcm)[j] = RES2INT16(in[j]);
@@ -2556,7 +2556,7 @@ int oac_custom_encode(CELTEncoder * OAC_RESTRICT st, const oac_int16 * pcm, int
 # if defined(FIXED_POINT)
 int oac_custom_encode24(CELTEncoder * OAC_RESTRICT st, const oac_int32 * pcm, int frame_size, unsigned char *compressed,
                         int nbCompressedBytes) {
-    return celt_encode_with_ec(st, pcm, frame_size, compressed, nbCompressedBytes, NULL);
+    return oaci_celt_encode_with_ec(st, pcm, frame_size, compressed, nbCompressedBytes, NULL);
 }
 # else
 int oac_custom_encode24(CELTEncoder * OAC_RESTRICT st, const oac_int32 * pcm, int frame_size, unsigned char *compressed,
@@ -2575,7 +2575,7 @@ int oac_custom_encode24(CELTEncoder * OAC_RESTRICT st, const oac_int32 * pcm, in
     for (j = 0; j < C*N; j++)
         in[j] = INT24TORES(pcm[j]);
 
-    ret = celt_encode_with_ec(st, in, frame_size, compressed, nbCompressedBytes, NULL);
+    ret = oaci_celt_encode_with_ec(st, in, frame_size, compressed, nbCompressedBytes, NULL);
 #  ifdef RESYNTH
     for (j = 0; j < C*N; j++)
         ((oac_int32*)pcm)[j] = RES2INT24(in[j]);
@@ -2591,7 +2591,7 @@ int oac_custom_encode24(CELTEncoder * OAC_RESTRICT st, const oac_int32 * pcm, in
 #  if !defined(FIXED_POINT)
 int oac_custom_encode_float(CELTEncoder * OAC_RESTRICT st, const float * pcm, int frame_size, unsigned char *compressed,
                             int nbCompressedBytes) {
-    return celt_encode_with_ec(st, pcm, frame_size, compressed, nbCompressedBytes, NULL);
+    return oaci_celt_encode_with_ec(st, pcm, frame_size, compressed, nbCompressedBytes, NULL);
 }
 #  else
 int oac_custom_encode_float(CELTEncoder * OAC_RESTRICT st, const float * pcm, int frame_size, unsigned char *compressed,
@@ -2610,7 +2610,7 @@ int oac_custom_encode_float(CELTEncoder * OAC_RESTRICT st, const float * pcm, in
     for (j = 0; j < C*N; j++)
         in[j] = FLOAT2RES(pcm[j]);
 
-    ret = celt_encode_with_ec(st, in, frame_size, compressed, nbCompressedBytes, NULL);
+    ret = oaci_celt_encode_with_ec(st, in, frame_size, compressed, nbCompressedBytes, NULL);
 #   ifdef RESYNTH
     for (j = 0; j < C*N; j++)
         ((float*)pcm)[j] = RES2FLOAT(in[j]);
diff --git a/celt/celt_lpc.c b/celt/celt_lpc.c
index e3591398f..8776a5bcc 100644
--- a/celt/celt_lpc.c
+++ b/celt/celt_lpc.c
@@ -34,7 +34,7 @@
 #include "mathops.h"
 #include "pitch.h"
 
-void _celt_lpc(
+void oaci_celt_lpc(
     oac_val16       *_lpc,   /* out: [0...p-1] LPC coefficients      */
     const oac_val32 *ac, /* in:  [0...p] autocorrelation values  */
     int p)               {
@@ -67,7 +67,7 @@ void _celt_lpc(
                 rr += MULT32_32_Q31(lpc[j], ac[i - j]);
 #endif
             rr += SHR32(ac[i + 1], 6);
-            r = -frac_div32(SHL32(rr, 6), error);
+            r = -oaci_frac_div32(SHL32(rr, 6), error);
             /*  Update LPC coefficients and total error */
             lpc[i] = SHR32(r, 6);
             for (j = 0; j < (i + 1)>>1; j++) {
@@ -92,7 +92,7 @@ void _celt_lpc(
 #ifdef FIXED_POINT
     {
         /* Convert the int32 lpcs to int16 and ensure there are no wrap-arounds.
-           This reuses the logic in silk_LPC_fit() and silk_bwexpander_32(). Any bug
+           This reuses the logic in oaci_silk_LPC_fit() and oaci_silk_bwexpander_32(). Any bug
            fixes should also be applied there. */
         int iter, idx = 0;
         oac_val32 maxabs, absval, chirp_Q16, chirp_minus_one_Q16;
@@ -140,7 +140,7 @@ void _celt_lpc(
 }
 
 
-void celt_fir_c(
+void oaci_celt_fir_c(
     const oac_val16 *x,
     const oac_val16 *num,
     oac_val16 *y,
@@ -164,9 +164,9 @@ void celt_fir_c(
         {
             oac_val32 sum_c[4];
             memcpy(sum_c, sum, sizeof(sum_c));
-            xcorr_kernel_c(rnum, x + i - ord, sum_c, ord);
+            oaci_xcorr_kernel_c(rnum, x + i - ord, sum_c, ord);
 #endif
-        xcorr_kernel(rnum, x + i - ord, sum, ord, arch);
+        oaci_xcorr_kernel(rnum, x + i - ord, sum, ord, arch);
 #if defined(OAC_CHECK_ASM) && defined(FIXED_POINT)
         celt_assert(memcmp(sum, sum_c, sizeof(sum)) == 0);
     }
@@ -185,7 +185,7 @@ void celt_fir_c(
     RESTORE_STACK;
 }
 
-void celt_iir(const oac_val32 *_x,
+void oaci_celt_iir(const oac_val32 *_x,
               const oac_val16 *den,
               oac_val32 *_y,
               int N,
@@ -232,9 +232,9 @@ void celt_iir(const oac_val32 *_x,
         {
             oac_val32 sum_c[4];
             memcpy(sum_c, sum, sizeof(sum_c));
-            xcorr_kernel_c(rden, y + i, sum_c, ord);
+            oaci_xcorr_kernel_c(rden, y + i, sum_c, ord);
 # endif
-        xcorr_kernel(rden, y + i, sum, ord, arch);
+        oaci_xcorr_kernel(rden, y + i, sum, ord, arch);
 # if defined(OAC_CHECK_ASM) && defined(FIXED_POINT)
         celt_assert(memcmp(sum, sum_c, sizeof(sum)) == 0);
     }
@@ -269,7 +269,7 @@ void celt_iir(const oac_val32 *_x,
 #endif
 }
 
-int _celt_autocorr(
+int oaci_celt_autocorr(
     const oac_val16 *x,                  /*  in: [0...n-1] samples x   */
     oac_val32       *ac,                 /* out: [0...lag-1] ac values */
     const celt_coef  *window,
@@ -323,7 +323,7 @@ int _celt_autocorr(
             shift = 0;
     }
 #endif
-    celt_pitch_xcorr(xptr, xptr, ac, fastN, lag + 1, arch);
+    oaci_celt_pitch_xcorr(xptr, xptr, ac, fastN, lag + 1, arch);
     for (k = 0; k <= lag; k++) {
         for (i = k + fastN, d = 0; i < n; i++)
             d = MAC16_16(d, xptr[i], xptr[i - k]);
diff --git a/celt/celt_lpc.h b/celt/celt_lpc.h
index 9e7246c90..4bef47f5b 100644
--- a/celt/celt_lpc.h
+++ b/celt/celt_lpc.h
@@ -37,9 +37,9 @@
 
 #define CELT_LPC_ORDER 24
 
-void _celt_lpc(oac_val16 *_lpc, const oac_val32 *ac, int p);
+void oaci_celt_lpc(oac_val16 *_lpc, const oac_val32 *ac, int p);
 
-void celt_fir_c(
+void oaci_celt_fir_c(
     const oac_val16 *x,
     const oac_val16 *num,
     oac_val16 *y,
@@ -48,11 +48,11 @@ void celt_fir_c(
     int arch);
 
 #if !defined(OVERRIDE_CELT_FIR)
-# define celt_fir(x, num, y, N, ord, arch) \
-        (celt_fir_c(x, num, y, N, ord, arch))
+# define oaci_celt_fir(x, num, y, N, ord, arch) \
+        (oaci_celt_fir_c(x, num, y, N, ord, arch))
 #endif
 
-void celt_iir(const oac_val32 *x,
+void oaci_celt_iir(const oac_val32 *x,
     const oac_val16 *den,
     oac_val32 *y,
     int N,
@@ -60,7 +60,7 @@ void celt_iir(const oac_val32 *x,
     oac_val16 *mem,
     int arch);
 
-int _celt_autocorr(const oac_val16 *x, oac_val32 *ac,
+int oaci_celt_autocorr(const oac_val16 *x, oac_val32 *ac,
     const celt_coef *window, int overlap, int lag, int n, int arch);
 
 #endif /* CELT_LPC_H */
diff --git a/celt/cwrs.c b/celt/cwrs.c
index a3429d42e..bdd86b05d 100644
--- a/celt/cwrs.c
+++ b/celt/cwrs.c
@@ -46,7 +46,7 @@
    with frac bits of fractional precision.
    Tested for all possible 32-bit inputs with frac=4, where the maximum
    overestimation is 0.06254243 bits.*/
-int log2_frac(oac_uint32 val, int frac) {
+int oaci_log2_frac(oac_uint32 val, int frac) {
     int l;
     l = EC_ILOG(val);
     if (val&(val - 1)) {
@@ -430,12 +430,12 @@ static const oac_uint32 *const CELT_PVQ_U_ROW[15] = {
 # endif
 
 # if defined(CUSTOM_MODES)
-void get_required_bits(oac_int16 *_bits, int _n, int _maxk, int _frac) {
+void oaci_get_required_bits(oac_int16 *_bits, int _n, int _maxk, int _frac) {
     int k;
     /*_maxk==0 => there's nothing to do.*/
     celt_assert(_maxk > 0);
     _bits[0] = 0;
-    for (k = 1; k <= _maxk; k++) _bits[k] = log2_frac(CELT_PVQ_V(_n, k), _frac);
+    for (k = 1; k <= _maxk; k++) _bits[k] = oaci_log2_frac(CELT_PVQ_V(_n, k), _frac);
 }
 # endif
 
@@ -456,9 +456,9 @@ static oac_uint32 icwrs(int _n, const int *_y) {
     return i;
 }
 
-void encode_pulses(const int *_y, int _n, int _k, ec_enc *_enc) {
+void oaci_encode_pulses(const int *_y, int _n, int _k, ec_enc *_enc) {
     celt_assert(_k > 0);
-    ec_enc_uint(_enc, icwrs(_n, _y), CELT_PVQ_V(_n, _k));
+    oaci_ec_enc_uint(_enc, icwrs(_n, _y), CELT_PVQ_V(_n, _k));
 }
 
 static oac_val32 cwrsi(int _n, int _k, oac_uint32 _i, int *_y) {
@@ -535,8 +535,8 @@ static oac_val32 cwrsi(int _n, int _k, oac_uint32 _i, int *_y) {
     return yy;
 }
 
-oac_val32 decode_pulses(int *_y, int _n, int _k, ec_dec *_dec) {
-    return cwrsi(_n, _k, ec_dec_uint(_dec, CELT_PVQ_V(_n, _k)), _y);
+oac_val32 oaci_decode_pulses(int *_y, int _n, int _k, ec_dec *_dec) {
+    return cwrsi(_n, _k, oaci_ec_dec_uint(_dec, CELT_PVQ_V(_n, _k)), _y);
 }
 
 #else /* SMALL_FOOTPRINT */
@@ -665,7 +665,7 @@ static OAC_INLINE oac_uint32 icwrs(int _n, int _k, oac_uint32 *_nc, const int *_
 }
 
 # if defined(CUSTOM_MODES)
-void get_required_bits(oac_int16 *_bits, int _n, int _maxk, int _frac) {
+void oaci_get_required_bits(oac_int16 *_bits, int _n, int _maxk, int _frac) {
     int k;
     /*_maxk==0 => there's nothing to do.*/
     celt_assert(_maxk > 0);
@@ -679,13 +679,13 @@ void get_required_bits(oac_int16 *_bits, int _n, int _maxk, int _frac) {
         ALLOC(u, _maxk + 2U, oac_uint32);
         ncwrs_urow(_n, _maxk, u);
         for (k = 1; k <= _maxk; k++)
-            _bits[k] = log2_frac(u[k] + u[k + 1], _frac);
+            _bits[k] = oaci_log2_frac(u[k] + u[k + 1], _frac);
         RESTORE_STACK;
     }
 }
 # endif /* CUSTOM_MODES */
 
-void encode_pulses(const int *_y, int _n, int _k, ec_enc *_enc) {
+void oaci_encode_pulses(const int *_y, int _n, int _k, ec_enc *_enc) {
     oac_uint32 i;
     VARDECL(oac_uint32, u);
     oac_uint32 nc;
@@ -693,17 +693,17 @@ void encode_pulses(const int *_y, int _n, int _k, ec_enc *_enc) {
     celt_assert(_k > 0);
     ALLOC(u, _k + 2U, oac_uint32);
     i = icwrs(_n, _k, &nc, _y, u);
-    ec_enc_uint(_enc, i, nc);
+    oaci_ec_enc_uint(_enc, i, nc);
     RESTORE_STACK;
 }
 
-oac_val32 decode_pulses(int *_y, int _n, int _k, ec_dec *_dec) {
+oac_val32 oaci_decode_pulses(int *_y, int _n, int _k, ec_dec *_dec) {
     VARDECL(oac_uint32, u);
     int ret;
     SAVE_STACK;
     celt_assert(_k > 0);
     ALLOC(u, _k + 2U, oac_uint32);
-    ret = cwrsi(_n, _k, ec_dec_uint(_dec, ncwrs_urow(_n, _k, u)), _y, u);
+    ret = cwrsi(_n, _k, oaci_ec_dec_uint(_dec, ncwrs_urow(_n, _k, u)), _y, u);
     RESTORE_STACK;
     return ret;
 }
diff --git a/celt/cwrs.h b/celt/cwrs.h
index d1792433f..143ec5f64 100644
--- a/celt/cwrs.h
+++ b/celt/cwrs.h
@@ -36,13 +36,13 @@
 #include "entdec.h"
 
 #ifdef CUSTOM_MODES
-int log2_frac(oac_uint32 val, int frac);
+int oaci_log2_frac(oac_uint32 val, int frac);
 #endif
 
-void get_required_bits(oac_int16 *bits, int N, int K, int frac);
+void oaci_get_required_bits(oac_int16 *bits, int N, int K, int frac);
 
-void encode_pulses(const int *_y, int N, int K, ec_enc *enc);
+void oaci_encode_pulses(const int *_y, int N, int K, ec_enc *enc);
 
-oac_val32 decode_pulses(int *_y, int N, int K, ec_dec *dec);
+oac_val32 oaci_decode_pulses(int *_y, int N, int K, ec_dec *dec);
 
 #endif /* CWRS_H */
diff --git a/celt/entcode.c b/celt/entcode.c
index e52c8ebcf..a65f15ad5 100644
--- a/celt/entcode.c
+++ b/celt/entcode.c
@@ -63,10 +63,10 @@ int ec_ilog(oac_uint32 _v) {
 #endif
 
 #if 1
-/* This is a faster version of ec_tell_frac() that takes advantage
+/* This is a faster version of oaci_ec_tell_frac() that takes advantage
    of the low (1/8 bit) resolution to use just a linear function
    followed by a lookup to determine the exact transition thresholds. */
-oac_uint32 ec_tell_frac(ec_ctx *_this) {
+oac_uint32 oaci_ec_tell_frac(ec_ctx *_this) {
     static const unsigned correction[8] =
     {35733, 38967, 42495, 46340,
      50535, 55109, 60097, 65535};
@@ -83,7 +83,7 @@ oac_uint32 ec_tell_frac(ec_ctx *_this) {
     return nbits - l;
 }
 #else
-oac_uint32 ec_tell_frac(ec_ctx *_this) {
+oac_uint32 oaci_ec_tell_frac(ec_ctx *_this) {
     oac_uint32 nbits;
     oac_uint32 r;
     int l;
@@ -94,7 +94,7 @@ oac_uint32 ec_tell_frac(ec_ctx *_this) {
        subsequent bits.
        The computation here is independent of val itself (the decoder does not
        even track that value), even though the real number of bits used after
-       ec_enc_done() may be 1 smaller if rng is a power of two and the
+       oaci_ec_enc_done() may be 1 smaller if rng is a power of two and the
        corresponding trailing bits of val are all zeros.
        If we did try to track that special case, then coding a value with a
        probability of 1/(1<<n) might sometimes appear to use more than n bits.
@@ -116,7 +116,7 @@ oac_uint32 ec_tell_frac(ec_ctx *_this) {
 
 #ifdef USE_SMALL_DIV_TABLE
 /* Result of 2^32/(2*i+1), except for i=0. */
-const oac_uint32 SMALL_DIV_TABLE[129] = {
+const oac_uint32 OACI_SMALL_DIV_TABLE[129] = {
     0xFFFFFFFF, 0x55555555, 0x33333333, 0x24924924,
     0x1C71C71C, 0x1745D174, 0x13B13B13, 0x11111111,
     0x0F0F0F0F, 0x0D79435E, 0x0C30C30C, 0x0B21642C,
diff --git a/celt/entcode.h b/celt/entcode.h
index 96b7b669f..13e8ff5f5 100644
--- a/celt/entcode.h
+++ b/celt/entcode.h
@@ -34,7 +34,7 @@
 # include <stddef.h>
 # include "ecintrin.h"
 
-extern const oac_uint32 SMALL_DIV_TABLE[129];
+extern const oac_uint32 OACI_SMALL_DIV_TABLE[129];
 
 # ifdef OAC_ARM_ASM
 #  define USE_SMALL_DIV_TABLE
@@ -81,7 +81,7 @@ struct ec_ctx {
        the input value, minus one.
        In the encoder: the low end of the current range.*/
     oac_uint32 val;
-    /*In the decoder: the saved normalization factor from ec_decode().
+    /*In the decoder: the saved normalization factor from oaci_ec_decode().
        In the encoder: the number of outstanding carry propagating symbols.*/
     oac_uint32 ext;
     /*A buffered input/output symbol, awaiting carry propagation.*/
@@ -118,7 +118,7 @@ static OAC_INLINE int ec_tell(ec_ctx *_this) {
    Return: The number of bits scaled by 2**BITRES.
           This will always be slightly larger than the exact value (e.g., all
            rounding error is in the positive direction).*/
-oac_uint32 ec_tell_frac(ec_ctx *_this);
+oac_uint32 oaci_ec_tell_frac(ec_ctx *_this);
 
 /* Tested exhaustively for all n and for 1<=d<=256 */
 static OAC_INLINE oac_uint32 celt_udiv(oac_uint32 n, oac_uint32 d) {
@@ -129,7 +129,7 @@ static OAC_INLINE oac_uint32 celt_udiv(oac_uint32 n, oac_uint32 d) {
     else {
         oac_uint32 t, q;
         t = EC_ILOG(d& -d);
-        q = (oac_uint64)SMALL_DIV_TABLE[d>>t]*(n>>(t - 1))>>32;
+        q = (oac_uint64)OACI_SMALL_DIV_TABLE[d>>t]*(n>>(t - 1))>>32;
         return q + (n - q*d >= d);
     }
 # else
diff --git a/celt/entdec.c b/celt/entdec.c
index b86dec455..548150bf9 100644
--- a/celt/entdec.c
+++ b/celt/entdec.c
@@ -116,7 +116,7 @@ static void ec_dec_normalize(ec_dec *_this) {
     }
 }
 
-void ec_dec_init(ec_dec *_this, unsigned char *_buf, oac_uint32 _storage) {
+void oaci_ec_dec_init(ec_dec *_this, unsigned char *_buf, oac_uint32 _storage) {
     _this->buf = _buf;
     _this->storage = _storage;
     _this->end_offs = 0;
@@ -136,21 +136,21 @@ void ec_dec_init(ec_dec *_this, unsigned char *_buf, oac_uint32 _storage) {
     ec_dec_normalize(_this);
 }
 
-unsigned ec_decode(ec_dec *_this, unsigned _ft) {
+unsigned oaci_ec_decode(ec_dec *_this, unsigned _ft) {
     unsigned s;
     _this->ext = celt_udiv(_this->rng, _ft);
     s = (unsigned)(_this->val/_this->ext);
     return _ft - EC_MINI(s + 1, _ft);
 }
 
-unsigned ec_decode_bin(ec_dec *_this, unsigned _bits) {
+unsigned oaci_ec_decode_bin(ec_dec *_this, unsigned _bits) {
     unsigned s;
     _this->ext = _this->rng>>_bits;
     s = (unsigned)(_this->val/_this->ext);
     return (1U<<_bits) - EC_MINI(s + 1U, 1U<<_bits);
 }
 
-void ec_dec_update(ec_dec *_this, unsigned _fl, unsigned _fh, unsigned _ft) {
+void oaci_ec_dec_update(ec_dec *_this, unsigned _fl, unsigned _fh, unsigned _ft) {
     oac_uint32 s;
     s = IMUL32(_this->ext, _ft - _fh);
     _this->val -= s;
@@ -159,7 +159,7 @@ void ec_dec_update(ec_dec *_this, unsigned _fl, unsigned _fh, unsigned _ft) {
 }
 
 /*The probability of having a "one" is 1/(1<<_logp).*/
-int ec_dec_bit_logp(ec_dec *_this, unsigned _logp) {
+int oaci_ec_dec_bit_logp(ec_dec *_this, unsigned _logp) {
     oac_uint32 r;
     oac_uint32 d;
     oac_uint32 s;
@@ -174,7 +174,7 @@ int ec_dec_bit_logp(ec_dec *_this, unsigned _logp) {
     return ret;
 }
 
-int ec_dec_icdf(ec_dec *_this, const unsigned char *_icdf, unsigned _ftb) {
+int oaci_ec_dec_icdf(ec_dec *_this, const unsigned char *_icdf, unsigned _ftb) {
     oac_uint32 r;
     oac_uint32 d;
     oac_uint32 s;
@@ -194,7 +194,7 @@ int ec_dec_icdf(ec_dec *_this, const unsigned char *_icdf, unsigned _ftb) {
     return ret;
 }
 
-int ec_dec_icdf16(ec_dec *_this, const oac_uint16 *_icdf, unsigned _ftb) {
+int oaci_ec_dec_icdf16(ec_dec *_this, const oac_uint16 *_icdf, unsigned _ftb) {
     oac_uint32 r;
     oac_uint32 d;
     oac_uint32 s;
@@ -214,7 +214,7 @@ int ec_dec_icdf16(ec_dec *_this, const oac_uint16 *_icdf, unsigned _ftb) {
     return ret;
 }
 
-oac_uint32 ec_dec_uint(ec_dec *_this, oac_uint32 _ft) {
+oac_uint32 oaci_ec_dec_uint(ec_dec *_this, oac_uint32 _ft) {
     unsigned ft;
     unsigned s;
     int ftb;
@@ -226,21 +226,21 @@ oac_uint32 ec_dec_uint(ec_dec *_this, oac_uint32 _ft) {
         oac_uint32 t;
         ftb -= EC_UINT_BITS;
         ft = (unsigned)(_ft>>ftb) + 1;
-        s = ec_decode(_this, ft);
-        ec_dec_update(_this, s, s + 1, ft);
-        t = (oac_uint32)s<<ftb|ec_dec_bits(_this, ftb);
+        s = oaci_ec_decode(_this, ft);
+        oaci_ec_dec_update(_this, s, s + 1, ft);
+        t = (oac_uint32)s<<ftb|oaci_ec_dec_bits(_this, ftb);
         if (t <= _ft) return t;
         _this->error = 1;
         return _ft;
     } else   {
         _ft++;
-        s = ec_decode(_this, (unsigned)_ft);
-        ec_dec_update(_this, s, s + 1, (unsigned)_ft);
+        s = oaci_ec_decode(_this, (unsigned)_ft);
+        oaci_ec_dec_update(_this, s, s + 1, (unsigned)_ft);
         return s;
     }
 }
 
-oac_uint32 ec_dec_bits(ec_dec *_this, unsigned _bits) {
+oac_uint32 oaci_ec_dec_bits(ec_dec *_this, unsigned _bits) {
     ec_window window;
     int available;
     oac_uint32 ret;
diff --git a/celt/entdec.h b/celt/entdec.h
index df095a932..1e51b927f 100644
--- a/celt/entdec.h
+++ b/celt/entdec.h
@@ -33,14 +33,14 @@
 /*Initializes the decoder.
    _buf: The input buffer to use.
    Return: 0 on success, or a negative value on error.*/
-void ec_dec_init(ec_dec *_this, unsigned char *_buf, oac_uint32 _storage);
+void oaci_ec_dec_init(ec_dec *_this, unsigned char *_buf, oac_uint32 _storage);
 
 /*Calculates the cumulative frequency for the next symbol.
    This can then be fed into the probability model to determine what that
    symbol is, and the additional frequency information required to advance to
    the next symbol.
    This function cannot be called more than once without a corresponding call to
-   ec_dec_update(), or decoding will not proceed correctly.
+   oaci_ec_dec_update(), or decoding will not proceed correctly.
    _ft: The total frequency of the symbols in the alphabet the next symbol was
         encoded with.
    Return: A cumulative frequency representing the encoded symbol.
@@ -48,14 +48,14 @@ void ec_dec_init(ec_dec *_this, unsigned char *_buf, oac_uint32 _storage);
            was encoded was fl, and the cumulative frequency of all the symbols
            up to and including the one encoded is fh, then the returned value
            will fall in the range [fl,fh).*/
-unsigned ec_decode(ec_dec *_this, unsigned _ft);
+unsigned oaci_ec_decode(ec_dec *_this, unsigned _ft);
 
-/*Equivalent to ec_decode() with _ft==1<<_bits.*/
-unsigned ec_decode_bin(ec_dec *_this, unsigned _bits);
+/*Equivalent to oaci_ec_decode() with _ft==1<<_bits.*/
+unsigned oaci_ec_decode_bin(ec_dec *_this, unsigned _bits);
 
 /*Advance the decoder past the next symbol using the frequency information the
    symbol was encoded with.
-   Exactly one call to ec_decode() must have been made so that all necessary
+   Exactly one call to oaci_ec_decode() must have been made so that all necessary
    intermediate calculations are performed.
    _fl:  The cumulative frequency of all symbols that come before the symbol
          decoded.
@@ -65,46 +65,46 @@ unsigned ec_decode_bin(ec_dec *_this, unsigned _bits);
          returned above must fall.
    _ft:  The total frequency of the symbols in the alphabet the symbol decoded
          was encoded in.
-        This must be the same as passed to the preceding call to ec_decode().*/
-void ec_dec_update(ec_dec *_this, unsigned _fl, unsigned _fh, unsigned _ft);
+        This must be the same as passed to the preceding call to oaci_ec_decode().*/
+void oaci_ec_dec_update(ec_dec *_this, unsigned _fl, unsigned _fh, unsigned _ft);
 
 /* Decode a bit that has a 1/(1<<_logp) probability of being a one */
-int ec_dec_bit_logp(ec_dec *_this, unsigned _logp);
+int oaci_ec_dec_bit_logp(ec_dec *_this, unsigned _logp);
 
 /*Decodes a symbol given an "inverse" CDF table.
-   No call to ec_dec_update() is necessary after this call.
+   No call to oaci_ec_dec_update() is necessary after this call.
    _icdf: The "inverse" CDF, such that symbol s falls in the range
           [s>0?ft-_icdf[s-1]:0,ft-_icdf[s]), where ft=1<<_ftb.
          The values must be monotonically non-increasing, and the last value
           must be 0.
    _ftb: The number of bits of precision in the cumulative distribution.
    Return: The decoded symbol s.*/
-int ec_dec_icdf(ec_dec *_this, const unsigned char *_icdf, unsigned _ftb);
+int oaci_ec_dec_icdf(ec_dec *_this, const unsigned char *_icdf, unsigned _ftb);
 
 /*Decodes a symbol given an "inverse" CDF table.
-   No call to ec_dec_update() is necessary after this call.
+   No call to oaci_ec_dec_update() is necessary after this call.
    _icdf: The "inverse" CDF, such that symbol s falls in the range
           [s>0?ft-_icdf[s-1]:0,ft-_icdf[s]), where ft=1<<_ftb.
          The values must be monotonically non-increasing, and the last value
           must be 0.
    _ftb: The number of bits of precision in the cumulative distribution.
    Return: The decoded symbol s.*/
-int ec_dec_icdf16(ec_dec *_this, const oac_uint16 *_icdf, unsigned _ftb);
+int oaci_ec_dec_icdf16(ec_dec *_this, const oac_uint16 *_icdf, unsigned _ftb);
 
 /*Extracts a raw unsigned integer with a non-power-of-2 range from the stream.
-   The bits must have been encoded with ec_enc_uint().
-   No call to ec_dec_update() is necessary after this call.
+   The bits must have been encoded with oaci_ec_enc_uint().
+   No call to oaci_ec_dec_update() is necessary after this call.
    _ft: The number of integers that can be decoded (one more than the max).
        This must be at least 2, and no more than 2**32-1.
    Return: The decoded bits.*/
-oac_uint32 ec_dec_uint(ec_dec *_this, oac_uint32 _ft);
+oac_uint32 oaci_ec_dec_uint(ec_dec *_this, oac_uint32 _ft);
 
 /*Extracts a sequence of raw bits from the stream.
-   The bits must have been encoded with ec_enc_bits().
-   No call to ec_dec_update() is necessary after this call.
+   The bits must have been encoded with oaci_ec_enc_bits().
+   No call to oaci_ec_dec_update() is necessary after this call.
    _ftb: The number of bits to extract.
         This must be between 0 and 25, inclusive.
    Return: The decoded bits.*/
-oac_uint32 ec_dec_bits(ec_dec *_this, unsigned _ftb);
+oac_uint32 oaci_ec_dec_bits(ec_dec *_this, unsigned _ftb);
 
 #endif
diff --git a/celt/entenc.c b/celt/entenc.c
index ef48761ab..77a583e02 100644
--- a/celt/entenc.c
+++ b/celt/entenc.c
@@ -108,7 +108,7 @@ static OAC_INLINE void ec_enc_normalize(ec_enc *_this) {
     }
 }
 
-void ec_enc_init(ec_enc *_this, unsigned char *_buf, oac_uint32 _size) {
+void oaci_ec_enc_init(ec_enc *_this, unsigned char *_buf, oac_uint32 _size) {
     _this->buf = _buf;
     _this->end_offs = 0;
     _this->end_window = 0;
@@ -124,7 +124,7 @@ void ec_enc_init(ec_enc *_this, unsigned char *_buf, oac_uint32 _size) {
     _this->error = 0;
 }
 
-void ec_encode(ec_enc *_this, unsigned _fl, unsigned _fh, unsigned _ft) {
+void oaci_ec_encode(ec_enc *_this, unsigned _fl, unsigned _fh, unsigned _ft) {
     oac_uint32 r;
     r = celt_udiv(_this->rng, _ft);
     if (_fl > 0) {
@@ -134,7 +134,7 @@ void ec_encode(ec_enc *_this, unsigned _fl, unsigned _fh, unsigned _ft) {
     ec_enc_normalize(_this);
 }
 
-void ec_encode_bin(ec_enc *_this, unsigned _fl, unsigned _fh, unsigned _bits) {
+void oaci_ec_encode_bin(ec_enc *_this, unsigned _fl, unsigned _fh, unsigned _bits) {
     oac_uint32 r;
     r = _this->rng>>_bits;
     if (_fl > 0) {
@@ -145,7 +145,7 @@ void ec_encode_bin(ec_enc *_this, unsigned _fl, unsigned _fh, unsigned _bits) {
 }
 
 /*The probability of having a "one" is 1/(1<<_logp).*/
-void ec_enc_bit_logp(ec_enc *_this, int _val, unsigned _logp) {
+void oaci_ec_enc_bit_logp(ec_enc *_this, int _val, unsigned _logp) {
     oac_uint32 r;
     oac_uint32 s;
     oac_uint32 l;
@@ -158,7 +158,7 @@ void ec_enc_bit_logp(ec_enc *_this, int _val, unsigned _logp) {
     ec_enc_normalize(_this);
 }
 
-void ec_enc_icdf(ec_enc *_this, int _s, const unsigned char *_icdf, unsigned _ftb) {
+void oaci_ec_enc_icdf(ec_enc *_this, int _s, const unsigned char *_icdf, unsigned _ftb) {
     oac_uint32 r;
     r = _this->rng>>_ftb;
     if (_s > 0) {
@@ -168,7 +168,7 @@ void ec_enc_icdf(ec_enc *_this, int _s, const unsigned char *_icdf, unsigned _ft
     ec_enc_normalize(_this);
 }
 
-void ec_enc_icdf16(ec_enc *_this, int _s, const oac_uint16 *_icdf, unsigned _ftb) {
+void oaci_ec_enc_icdf16(ec_enc *_this, int _s, const oac_uint16 *_icdf, unsigned _ftb) {
     oac_uint32 r;
     r = _this->rng>>_ftb;
     if (_s > 0) {
@@ -178,7 +178,7 @@ void ec_enc_icdf16(ec_enc *_this, int _s, const oac_uint16 *_icdf, unsigned _ftb
     ec_enc_normalize(_this);
 }
 
-void ec_enc_uint(ec_enc *_this, oac_uint32 _fl, oac_uint32 _ft) {
+void oaci_ec_enc_uint(ec_enc *_this, oac_uint32 _fl, oac_uint32 _ft) {
     unsigned ft;
     unsigned fl;
     int ftb;
@@ -190,12 +190,12 @@ void ec_enc_uint(ec_enc *_this, oac_uint32 _fl, oac_uint32 _ft) {
         ftb -= EC_UINT_BITS;
         ft = (_ft>>ftb) + 1;
         fl = (unsigned)(_fl>>ftb);
-        ec_encode(_this, fl, fl + 1, ft);
-        ec_enc_bits(_this, _fl&(((oac_uint32)1<<ftb) - 1U), ftb);
-    } else ec_encode(_this, _fl, _fl + 1, _ft + 1);
+        oaci_ec_encode(_this, fl, fl + 1, ft);
+        oaci_ec_enc_bits(_this, _fl&(((oac_uint32)1<<ftb) - 1U), ftb);
+    } else oaci_ec_encode(_this, _fl, _fl + 1, _ft + 1);
 }
 
-void ec_enc_bits(ec_enc *_this, oac_uint32 _fl, unsigned _bits) {
+void oaci_ec_enc_bits(ec_enc *_this, oac_uint32 _fl, unsigned _bits) {
     ec_window window;
     int used;
     window = _this->end_window;
@@ -215,7 +215,7 @@ void ec_enc_bits(ec_enc *_this, oac_uint32 _fl, unsigned _bits) {
     _this->nbits_total += _bits;
 }
 
-void ec_enc_patch_initial_bits(ec_enc *_this, unsigned _val, unsigned _nbits) {
+void oaci_ec_enc_patch_initial_bits(ec_enc *_this, unsigned _val, unsigned _nbits) {
     int shift;
     unsigned mask;
     celt_assert(_nbits <= EC_SYM_BITS);
@@ -236,14 +236,14 @@ void ec_enc_patch_initial_bits(ec_enc *_this, unsigned _val, unsigned _nbits) {
     else _this->error = -1;
 }
 
-void ec_enc_shrink(ec_enc *_this, oac_uint32 _size) {
+void oaci_ec_enc_shrink(ec_enc *_this, oac_uint32 _size) {
     celt_assert(_this->offs + _this->end_offs <= _size);
     OAC_MOVE(_this->buf + _size - _this->end_offs,
    _this->buf + _this->storage - _this->end_offs, _this->end_offs);
     _this->storage = _size;
 }
 
-void ec_enc_done(ec_enc *_this) {
+void oaci_ec_enc_done(ec_enc *_this) {
     ec_window window;
     int used;
     oac_uint32 msk;
diff --git a/celt/entenc.h b/celt/entenc.h
index 60a13e4a0..c4b519987 100644
--- a/celt/entenc.h
+++ b/celt/entenc.h
@@ -33,7 +33,7 @@
 /*Initializes the encoder.
    _buf:  The buffer to store output bytes in.
    _size: The size of the buffer, in chars.*/
-void ec_enc_init(ec_enc *_this, unsigned char *_buf, oac_uint32 _size);
+void oaci_ec_enc_init(ec_enc *_this, unsigned char *_buf, oac_uint32 _size);
 /*Encodes a symbol given its frequency information.
    The frequency information must be discernible by the decoder, assuming it
    has read only the previous symbols from the stream.
@@ -47,13 +47,13 @@ void ec_enc_init(ec_enc *_this, unsigned char *_buf, oac_uint32 _size);
        Together with _fl, this defines the range [_fl,_fh) in which the
         decoded value will fall.
    _ft: The sum of the frequencies of all the symbols*/
-void ec_encode(ec_enc *_this, unsigned _fl, unsigned _fh, unsigned _ft);
+void oaci_ec_encode(ec_enc *_this, unsigned _fl, unsigned _fh, unsigned _ft);
 
-/*Equivalent to ec_encode() with _ft==1<<_bits.*/
-void ec_encode_bin(ec_enc *_this, unsigned _fl, unsigned _fh, unsigned _bits);
+/*Equivalent to oaci_ec_encode() with _ft==1<<_bits.*/
+void oaci_ec_encode_bin(ec_enc *_this, unsigned _fl, unsigned _fh, unsigned _bits);
 
 /* Encode a bit that has a 1/(1<<_logp) probability of being a one */
-void ec_enc_bit_logp(ec_enc *_this, int _val, unsigned _logp);
+void oaci_ec_enc_bit_logp(ec_enc *_this, int _val, unsigned _logp);
 
 /*Encodes a symbol given an "inverse" CDF table.
    _s:    The index of the symbol to encode.
@@ -62,7 +62,7 @@ void ec_enc_bit_logp(ec_enc *_this, int _val, unsigned _logp);
          The values must be monotonically non-increasing, and the last value
           must be 0.
    _ftb: The number of bits of precision in the cumulative distribution.*/
-void ec_enc_icdf(ec_enc *_this, int _s, const unsigned char *_icdf, unsigned _ftb);
+void oaci_ec_enc_icdf(ec_enc *_this, int _s, const unsigned char *_icdf, unsigned _ftb);
 
 /*Encodes a symbol given an "inverse" CDF table.
    _s:    The index of the symbol to encode.
@@ -71,19 +71,19 @@ void ec_enc_icdf(ec_enc *_this, int _s, const unsigned char *_icdf, unsigned _ft
          The values must be monotonically non-increasing, and the last value
           must be 0.
    _ftb: The number of bits of precision in the cumulative distribution.*/
-void ec_enc_icdf16(ec_enc *_this, int _s, const oac_uint16 *_icdf, unsigned _ftb);
+void oaci_ec_enc_icdf16(ec_enc *_this, int _s, const oac_uint16 *_icdf, unsigned _ftb);
 
 /*Encodes a raw unsigned integer in the stream.
    _fl: The integer to encode.
    _ft: The number of integers that can be encoded (one more than the max).
        This must be at least 2, and no more than 2**32-1.*/
-void ec_enc_uint(ec_enc *_this, oac_uint32 _fl, oac_uint32 _ft);
+void oaci_ec_enc_uint(ec_enc *_this, oac_uint32 _fl, oac_uint32 _ft);
 
 /*Encodes a sequence of raw bits in the stream.
    _fl:  The bits to encode.
    _ftb: The number of bits to encode.
         This must be between 1 and 25, inclusive.*/
-void ec_enc_bits(ec_enc *_this, oac_uint32 _fl, unsigned _ftb);
+void oaci_ec_enc_bits(ec_enc *_this, oac_uint32 _fl, unsigned _ftb);
 
 /*Overwrites a few bits at the very start of an existing stream, after they
    have already been encoded.
@@ -99,7 +99,7 @@ void ec_enc_bits(ec_enc *_this, oac_uint32 _fl, unsigned _ftb);
           They will be decoded in order from most-significant to least.
    _nbits: The number of bits to overwrite.
           This must be no more than 8.*/
-void ec_enc_patch_initial_bits(ec_enc *_this, unsigned _val, unsigned _nbits);
+void oaci_ec_enc_patch_initial_bits(ec_enc *_this, unsigned _val, unsigned _nbits);
 
 /*Compacts the data to fit in the target size.
    This moves up the raw bits at the end of the current buffer so they are at
@@ -109,11 +109,11 @@ void ec_enc_patch_initial_bits(ec_enc *_this, unsigned _val, unsigned _nbits);
    _size: The number of bytes in the new buffer.
          This must be large enough to contain the bits already written, and
           must be no larger than the existing size.*/
-void ec_enc_shrink(ec_enc *_this, oac_uint32 _size);
+void oaci_ec_enc_shrink(ec_enc *_this, oac_uint32 _size);
 
 /*Indicates that there are no more symbols to encode.
    All remaining output bytes are flushed to the output buffer.
    ec_enc_init() must be called before the encoder can be used again.*/
-void ec_enc_done(ec_enc *_this);
+void oaci_ec_enc_done(ec_enc *_this);
 
 #endif
diff --git a/celt/laplace.c b/celt/laplace.c
index b2ee022df..614f6feb0 100644
--- a/celt/laplace.c
+++ b/celt/laplace.c
@@ -47,7 +47,7 @@ static unsigned ec_laplace_get_freq1(unsigned fs0, int decay) {
     return ft*(oac_int32)(16384 - decay)>>15;
 }
 
-void ec_laplace_encode(ec_enc *enc, int *value, unsigned fs, int decay) {
+void oaci_ec_laplace_encode(ec_enc *enc, int *value, unsigned fs, int decay) {
     unsigned fl;
     int val = *value;
     fl = 0;
@@ -81,14 +81,14 @@ void ec_laplace_encode(ec_enc *enc, int *value, unsigned fs, int decay) {
         celt_assert(fl + fs <= 32768);
         celt_assert(fs > 0);
     }
-    ec_encode_bin(enc, fl, fl + fs, 15);
+    oaci_ec_encode_bin(enc, fl, fl + fs, 15);
 }
 
-int ec_laplace_decode(ec_dec *dec, unsigned fs, int decay) {
+int oaci_ec_laplace_decode(ec_dec *dec, unsigned fs, int decay) {
     int val = 0;
     unsigned fl;
     unsigned fm;
-    fm = ec_decode_bin(dec, 15);
+    fm = oaci_ec_decode_bin(dec, 15);
     fl = 0;
     if (fm >= fs) {
         val++;
@@ -118,18 +118,18 @@ int ec_laplace_decode(ec_dec *dec, unsigned fs, int decay) {
     celt_assert(fs > 0);
     celt_assert(fl <= fm);
     celt_assert(fm < IMIN(fl + fs, 32768));
-    ec_dec_update(dec, fl, IMIN(fl + fs, 32768), 32768);
+    oaci_ec_dec_update(dec, fl, IMIN(fl + fs, 32768), 32768);
     return val;
 }
 
-void ec_laplace_encode_p0(ec_enc *enc, int value, oac_uint16 p0, oac_uint16 decay) {
+void oaci_ec_laplace_encode_p0(ec_enc *enc, int value, oac_uint16 p0, oac_uint16 decay) {
     int s;
     oac_uint16 sign_icdf[3];
     sign_icdf[0] = 32768 - p0;
     sign_icdf[1] = sign_icdf[0]/2;
     sign_icdf[2] = 0;
     s = value == 0 ? 0 : (value > 0 ? 1 : 2);
-    ec_enc_icdf16(enc, s, sign_icdf, 15);
+    oaci_ec_enc_icdf16(enc, s, sign_icdf, 15);
     value = abs(value);
     if (value) {
         int i;
@@ -141,20 +141,20 @@ void ec_laplace_encode_p0(ec_enc *enc, int value, oac_uint16 p0, oac_uint16 deca
         icdf[7] = 0;
         value--;
         do {
-            ec_enc_icdf16(enc, IMIN(value, 7), icdf, 15);
+            oaci_ec_enc_icdf16(enc, IMIN(value, 7), icdf, 15);
             value -= 7;
         } while (value >= 0);
     }
 }
 
-int ec_laplace_decode_p0(ec_dec *dec, oac_uint16 p0, oac_uint16 decay) {
+int oaci_ec_laplace_decode_p0(ec_dec *dec, oac_uint16 p0, oac_uint16 decay) {
     int s;
     int value;
     oac_uint16 sign_icdf[3];
     sign_icdf[0] = 32768 - p0;
     sign_icdf[1] = sign_icdf[0]/2;
     sign_icdf[2] = 0;
-    s = ec_dec_icdf16(dec, sign_icdf, 15);
+    s = oaci_ec_dec_icdf16(dec, sign_icdf, 15);
     if (s == 2) s = -1;
     if (s != 0) {
         int i;
@@ -167,7 +167,7 @@ int ec_laplace_decode_p0(ec_dec *dec, oac_uint16 p0, oac_uint16 decay) {
         icdf[7] = 0;
         value = 1;
         do {
-            v = ec_dec_icdf16(dec, icdf, 15);
+            v = oaci_ec_dec_icdf16(dec, icdf, 15);
             value += v;
         } while (v == 7);
         return s*value;
@@ -193,21 +193,21 @@ int main() {
     p0 = 16000;
     decay = 16000;
     ptr = (unsigned char *)malloc(DATA_SIZE);
-    ec_enc_init(&enc, ptr, DATA_SIZE);
+    oaci_ec_enc_init(&enc, ptr, DATA_SIZE);
     for (i = 0; i < NB_VALS; i++) {
         printf("%d ", val[i]);
     }
     printf("\n");
     for (i = 0; i < NB_VALS; i++) {
-        ec_laplace_encode_p0(&enc, val[i], p0, decay);
+        oaci_ec_laplace_encode_p0(&enc, val[i], p0, decay);
     }
 
-    ec_enc_done(&enc);
+    oaci_ec_enc_done(&enc);
 
-    ec_dec_init(&dec, ec_get_buffer(&enc), ec_range_bytes(&enc));
+    oaci_ec_dec_init(&dec, ec_get_buffer(&enc), ec_range_bytes(&enc));
 
     for (i = 0; i < NB_VALS; i++) {
-        val[i] = ec_laplace_decode_p0(&dec, p0, decay);
+        val[i] = oaci_ec_laplace_decode_p0(&dec, p0, decay);
     }
     for (i = 0; i < NB_VALS; i++) {
         printf("%d ", val[i]);
diff --git a/celt/laplace.h b/celt/laplace.h
index a651064d2..3f13ed14c 100644
--- a/celt/laplace.h
+++ b/celt/laplace.h
@@ -39,7 +39,7 @@
    @param fs Probability of 0, multiplied by 32768
    @param decay Probability of the value +/- 1, multiplied by 16384
  */
-void ec_laplace_encode(ec_enc *enc, int *value, unsigned fs, int decay);
+void oaci_ec_laplace_encode(ec_enc *enc, int *value, unsigned fs, int decay);
 
 /** Decode a value that is assumed to be the realisation of a
     Laplace-distributed random process
@@ -48,10 +48,10 @@ void ec_laplace_encode(ec_enc *enc, int *value, unsigned fs, int decay);
    @param decay Probability of the value +/- 1, multiplied by 16384
    @return Value decoded
  */
-int ec_laplace_decode(ec_dec *dec, unsigned fs, int decay);
+int oaci_ec_laplace_decode(ec_dec *dec, unsigned fs, int decay);
 
 
-int ec_laplace_decode_p0(ec_dec *dec, oac_uint16 p0, oac_uint16 decay);
-void ec_laplace_encode_p0(ec_enc *enc, int value, oac_uint16 p0, oac_uint16 decay);
+int oaci_ec_laplace_decode_p0(ec_dec *dec, oac_uint16 p0, oac_uint16 decay);
+void oaci_ec_laplace_encode_p0(ec_enc *enc, int value, oac_uint16 p0, oac_uint16 decay);
 
 #endif
diff --git a/celt/mathops.c b/celt/mathops.c
index 9ea7166fc..e2345fd22 100644
--- a/celt/mathops.c
+++ b/celt/mathops.c
@@ -42,7 +42,7 @@
 /*Compute floor(sqrt(_val)) with exact arithmetic.
    _val must be greater than 0.
    This has been tested on all possible 32-bit inputs greater than 0.*/
-unsigned isqrt32(oac_uint32 _val) {
+unsigned oaci_isqrt32(oac_uint32 _val) {
     unsigned b;
     unsigned g;
     int bshift;
@@ -68,22 +68,22 @@ unsigned isqrt32(oac_uint32 _val) {
 
 #ifdef FIXED_POINT
 
-oac_val32 frac_div32_q29(oac_val32 a, oac_val32 b) {
+oac_val32 oaci_frac_div32_q29(oac_val32 a, oac_val32 b) {
     oac_val16 rcp;
     oac_val32 result, rem;
     int shift = celt_ilog2(b) - 29;
     a = VSHR32(a, shift);
     b = VSHR32(b, shift);
     /* 16-bit reciprocal */
-    rcp = ROUND16(celt_rcp(ROUND16(b, 16)), 3);
+    rcp = ROUND16(oaci_celt_rcp(ROUND16(b, 16)), 3);
     result = MULT16_32_Q15(rcp, a);
     rem = PSHR32(a, 2) - MULT32_32_Q31(result, b);
     result = ADD32(result, SHL32(MULT16_32_Q15(rcp, rem), 2));
     return result;
 }
 
-oac_val32 frac_div32(oac_val32 a, oac_val32 b) {
-    oac_val32 result = frac_div32_q29(a, b);
+oac_val32 oaci_frac_div32(oac_val32 a, oac_val32 b) {
+    oac_val32 result = oaci_frac_div32_q29(a, b);
     if (result >= 536870912)      /*  2^29 */
         return 2147483647;        /*  2^31 - 1 */
     else if (result <= -536870912) /* -2^29 */
@@ -93,7 +93,7 @@ oac_val32 frac_div32(oac_val32 a, oac_val32 b) {
 }
 
 /** Reciprocal sqrt approximation in the range [0.25,1) (Q16 in, Q14 out) */
-oac_val16 celt_rsqrt_norm(oac_val32 x) {
+oac_val16 oaci_celt_rsqrt_norm(oac_val32 x) {
     oac_val16 n;
     oac_val16 r;
     oac_val16 r2;
@@ -120,11 +120,11 @@ oac_val16 celt_rsqrt_norm(oac_val32 x) {
 }
 
 /** Reciprocal sqrt approximation in the range [0.25,1) (Q31 in, Q29 out) */
-oac_val32 celt_rsqrt_norm32(oac_val32 x) {
+oac_val32 oaci_celt_rsqrt_norm32(oac_val32 x) {
     oac_int32 tmp;
     /* Use the first-order Newton-Raphson method to refine the root estimate.
      * r = r * (1.5 - 0.5*x*r*r) */
-    oac_int32 r_q29 = SHL32(celt_rsqrt_norm(SHR32(x, 31 - 16)), 15);
+    oac_int32 r_q29 = SHL32(oaci_celt_rsqrt_norm(SHR32(x, 31 - 16)), 15);
     /* Split evaluation in steps to avoid exploding macro expansion. */
     tmp = MULT32_32_Q31(r_q29, r_q29);
     tmp = MULT32_32_Q31(1073741824 /* Q31 */, tmp);
@@ -133,7 +133,7 @@ oac_val32 celt_rsqrt_norm32(oac_val32 x) {
 }
 
 /** Sqrt approximation (QX input, QX/2 output) */
-oac_val32 celt_sqrt(oac_val32 x) {
+oac_val32 oaci_celt_sqrt(oac_val32 x) {
     int k;
     oac_val16 n;
     oac_val32 rt;
@@ -156,7 +156,7 @@ oac_val32 celt_sqrt(oac_val32 x) {
 
 /* Perform fixed-point arithmetic to approximate the square root. When the input
  * is in Qx format, the output will be in Q(x/2 + 16) format. */
-oac_val32 celt_sqrt32(oac_val32 x) {
+oac_val32 oaci_celt_sqrt32(oac_val32 x) {
     int k;
     oac_int32 x_frac;
     if (x == 0)
@@ -165,7 +165,7 @@ oac_val32 celt_sqrt32(oac_val32 x) {
         return 2147483647; /* 2^31 -1 */
     k = (celt_ilog2(x)>>1);
     x_frac = VSHR32(x, 2*(k - 14) - 1);
-    x_frac = MULT32_32_Q31(celt_rsqrt_norm32(x_frac), x_frac);
+    x_frac = MULT32_32_Q31(oaci_celt_rsqrt_norm32(x_frac), x_frac);
     if (k < 12) return PSHR32(x_frac, 12 - k);
     else return SHL32(x_frac, k - 12);
 }
@@ -189,7 +189,7 @@ static OAC_INLINE oac_val16 _celt_cos_pi_2(oac_val16 x) {
 # undef L3
 # undef L4
 
-oac_val16 celt_cos_norm(oac_val32 x) {
+oac_val16 oaci_celt_cos_norm(oac_val32 x) {
     x = x&0x0001ffff;
     if (x > SHL32(EXTEND32(1), 16))
         x = SUB32(SHL32(EXTEND32(1), 17), x);
@@ -211,7 +211,7 @@ oac_val16 celt_cos_norm(oac_val32 x) {
 
 /* Calculates the cosine of (PI*0.5*x) where the input x ranges from -1 to 1 and
  * is in Q30 format. The output will also be in Q31 format. */
-oac_val32 celt_cos_norm32(oac_val32 x) {
+oac_val32 oaci_celt_cos_norm32(oac_val32 x) {
     static const oac_val32 COS_NORM_COEFF_A0 = 134217720;  /* Q27 */
     static const oac_val32 COS_NORM_COEFF_A1 = -662336704; /* Q29 */
     static const oac_val32 COS_NORM_COEFF_A2 = 544710848;  /* Q31 */
@@ -232,7 +232,7 @@ oac_val32 celt_cos_norm32(oac_val32 x) {
 
 /* Computes a 16 bit approximate reciprocal (1/x) for a normalized Q15 input,
  * resulting in a Q15 output. */
-oac_val16 celt_rcp_norm16(oac_val16 x) {
+oac_val16 oaci_celt_rcp_norm16(oac_val16 x) {
     oac_val16 r;
     /* Start with a linear approximation:
        r = 1.8823529411764706-0.9411764705882353*n.
@@ -252,10 +252,10 @@ oac_val16 celt_rcp_norm16(oac_val16 x) {
 /* Computes a 32 bit approximated reciprocal (1/x) for a normalized Q31 input,
  * resulting in a Q30 output. The expected input range is [0.5f, 1.0f) in Q31
  * and the expected output range is [1.0f, 2.0f) in Q30. */
-oac_val32 celt_rcp_norm32(oac_val32 x) {
+oac_val32 oaci_celt_rcp_norm32(oac_val32 x) {
     oac_val32 r_q30;
     celt_sig_assert(x >= 1073741824);
-    r_q30 = SHL32(EXTEND32(celt_rcp_norm16(SHR32(x, 15) - 32768)), 16);
+    r_q30 = SHL32(EXTEND32(oaci_celt_rcp_norm16(SHR32(x, 15) - 32768)), 16);
     /* Solving f(y) = a - 1/y using the Newton Method
      * Note: f(y)' = 1/y^2
      * r = r - f(r)/f(r)' = r - (x * r*r - r)
@@ -272,14 +272,14 @@ oac_val32 celt_rcp_norm32(oac_val32 x) {
 }
 
 /** Reciprocal approximation (Q15 input, Q16 output) */
-oac_val32 celt_rcp(oac_val32 x) {
+oac_val32 oaci_celt_rcp(oac_val32 x) {
     int i;
     oac_val16 r;
     celt_sig_assert(x > 0);
     i = celt_ilog2(x);
 
     /* Compute the reciprocal of a Q15 number in the range [0, 1). */
-    r = celt_rcp_norm16(VSHR32(x, i - 15) - 32768);
+    r = oaci_celt_rcp_norm16(VSHR32(x, i - 15) - 32768);
 
     /* r is now the Q15 solution to 2/(n+1), with a maximum relative error
         of 7.05346E-5, a (relative) RMSE of 2.14418E-5, and a peak absolute
@@ -291,7 +291,7 @@ oac_val32 celt_rcp(oac_val32 x) {
 
 #ifndef DISABLE_FLOAT_API
 
-void celt_float2int16_c(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt) {
+void oaci_celt_float2int16_c(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt) {
     int i;
     for (i = 0; i < cnt; i++) {
         out[i] = FLOAT2INT16(in[i]);
diff --git a/celt/mathops.h b/celt/mathops.h
index 9e981ce49..7c5ab3e3b 100644
--- a/celt/mathops.h
+++ b/celt/mathops.h
@@ -49,7 +49,7 @@
 /* Multiplies two 16-bit fractional values. Bit-exactness of this macro is important */
 #define FRAC_MUL16(a, b) ((16384 + ((oac_int32)(oac_int16)(a)*(oac_int16)(b)))>>15)
 
-unsigned isqrt32(oac_uint32 _val);
+unsigned oaci_isqrt32(oac_uint32 _val);
 
 /* CELT doesn't need it for fixed-point, by analysis.c does. */
 #if !defined(FIXED_POINT) || defined(ANALYSIS_C)
@@ -210,16 +210,16 @@ static OAC_INLINE float celt_cos_norm2(float x) {
 
 #ifndef FIXED_POINT
 
-# define celt_sqrt(x) ((float)sqrt(x))
-# define celt_sqrt32(x) ((float)sqrt(x))
-# define celt_rsqrt(x) (1.f/celt_sqrt(x))
-# define celt_rsqrt_norm(x) (celt_rsqrt(x))
-# define celt_rsqrt_norm32(x) (celt_rsqrt(x))
-# define celt_cos_norm(x) ((float)cos((.5f*PI)*(x)))
-# define celt_rcp(x) (1.f/(x))
-# define celt_div(a, b) ((a)/(b))
-# define frac_div32(a, b) ((float)(a)/(b))
-# define frac_div32_q29(a, b) frac_div32(a, b)
+# define oaci_celt_sqrt(x) ((float)sqrt(x))
+# define oaci_celt_sqrt32(x) ((float)sqrt(x))
+# define oaci_celt_rsqrt(x) (1.f/oaci_celt_sqrt(x))
+# define oaci_celt_rsqrt_norm(x) (oaci_celt_rsqrt(x))
+# define oaci_celt_rsqrt_norm32(x) (oaci_celt_rsqrt(x))
+# define oaci_celt_cos_norm(x) ((float)cos((.5f*PI)*(x)))
+# define oaci_celt_rcp(x) (1.f/(x))
+# define oaci_celt_div(a, b) ((a)/(b))
+# define oaci_frac_div32(a, b) ((float)(a)/(b))
+# define oaci_frac_div32_q29(a, b) oaci_frac_div32(a, b)
 
 # ifdef FLOAT_APPROX
 /* Calculates the base-2 logarithm (log2(x)) of a number. It is designed for
@@ -360,17 +360,17 @@ static OAC_INLINE oac_int16 celt_zlog2(oac_val32 x) {
     return x <= 0 ? 0 : celt_ilog2(x);
 }
 
-oac_val16 celt_rsqrt_norm(oac_val32 x);
+oac_val16 oaci_celt_rsqrt_norm(oac_val32 x);
 
-oac_val32 celt_rsqrt_norm32(oac_val32 x);
+oac_val32 oaci_celt_rsqrt_norm32(oac_val32 x);
 
-oac_val32 celt_sqrt(oac_val32 x);
+oac_val32 oaci_celt_sqrt(oac_val32 x);
 
-oac_val32 celt_sqrt32(oac_val32 x);
+oac_val32 oaci_celt_sqrt32(oac_val32 x);
 
-oac_val16 celt_cos_norm(oac_val32 x);
+oac_val16 oaci_celt_cos_norm(oac_val32 x);
 
-oac_val32 celt_cos_norm32(oac_val32 x);
+oac_val32 oaci_celt_cos_norm32(oac_val32 x);
 
 /** Base-2 logarithm approximation (log2(x)). (Q14 input, Q10 output) */
 static OAC_INLINE oac_val16 celt_log2(oac_val32 x) {
@@ -506,13 +506,13 @@ static OAC_INLINE oac_val32 celt_exp2_db(oac_val32 x) {
 
 
 
-oac_val32 celt_rcp(oac_val32 x);
-oac_val32 celt_rcp_norm32(oac_val32 x);
+oac_val32 oaci_celt_rcp(oac_val32 x);
+oac_val32 oaci_celt_rcp_norm32(oac_val32 x);
 
-# define celt_div(a, b) MULT32_32_Q31((oac_val32)(a), celt_rcp(b))
+# define oaci_celt_div(a, b) MULT32_32_Q31((oac_val32)(a), oaci_celt_rcp(b))
 
-oac_val32 frac_div32_q29(oac_val32 a, oac_val32 b);
-oac_val32 frac_div32(oac_val32 a, oac_val32 b);
+oac_val32 oaci_frac_div32_q29(oac_val32 a, oac_val32 b);
+oac_val32 oaci_frac_div32(oac_val32 a, oac_val32 b);
 
 /* Computes atan(x) multiplied by 2/PI. The input value (x) should be within the
  * range of -1 to 1 and represented in Q30 format. The function will return the
@@ -564,11 +564,11 @@ static OAC_INLINE oac_val32 celt_atan2p_norm(oac_val32 y, oac_val32 x) {
     if (y == 0 && x == 0) {
         return 0;
     } else if (y < x) {
-        return celt_atan_norm(SHR32(frac_div32(y, x), 1));
+        return celt_atan_norm(SHR32(oaci_frac_div32(y, x), 1));
     } else {
         celt_sig_assert(y > 0);
         return 1073741824 /* 1.0f Q30 */
-               - celt_atan_norm(SHR32(frac_div32(x, y), 1));
+               - celt_atan_norm(SHR32(oaci_frac_div32(x, y), 1));
     }
 }
 
@@ -594,13 +594,13 @@ static OAC_INLINE oac_val16 celt_atan2p(oac_val16 y, oac_val16 x) {
         return 0;
     } else if (y < x) {
         oac_val32 arg;
-        arg = celt_div(SHL32(EXTEND32(y), 15), x);
+        arg = oaci_celt_div(SHL32(EXTEND32(y), 15), x);
         if (arg >= 32767)
             arg = 32767;
         return SHR16(celt_atan01(EXTRACT16(arg)), 1);
     } else {
         oac_val32 arg;
-        arg = celt_div(SHL32(EXTEND32(x), 15), y);
+        arg = oaci_celt_div(SHL32(EXTEND32(x), 15), y);
         if (arg >= 32767)
             arg = 32767;
         return 25736 - SHR16(celt_atan01(EXTRACT16(arg)), 1);
@@ -611,10 +611,10 @@ static OAC_INLINE oac_val16 celt_atan2p(oac_val16 y, oac_val16 x) {
 
 #ifndef DISABLE_FLOAT_API
 
-void celt_float2int16_c(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt);
+void oaci_celt_float2int16_c(const float * OAC_RESTRICT in, short * OAC_RESTRICT out, int cnt);
 
 # ifndef OVERRIDE_FLOAT2INT16
-#  define celt_float2int16(in, out, cnt, arch) ((void)(arch), celt_float2int16_c(in, out, cnt))
+#  define oaci_celt_float2int16(in, out, cnt, arch) ((void)(arch), oaci_celt_float2int16_c(in, out, cnt))
 # endif
 
 int oac_limit2_checkwithin1_c(float *samples, int cnt);
diff --git a/celt/mdct.c b/celt/mdct.c
index 90d1feece..71444806e 100644
--- a/celt/mdct.c
+++ b/celt/mdct.c
@@ -59,7 +59,7 @@
 
 #ifdef CUSTOM_MODES
 
-int clt_mdct_init(mdct_lookup *l, int N, int maxshift, int arch) {
+int oaci_clt_mdct_init(mdct_lookup *l, int N, int maxshift, int arch) {
     int i;
     kiss_twiddle_scalar *trig;
     int shift;
@@ -96,7 +96,7 @@ int clt_mdct_init(mdct_lookup *l, int N, int maxshift, int arch) {
     return 1;
 }
 
-void clt_mdct_clear(mdct_lookup *l, int arch) {
+void oaci_clt_mdct_clear(mdct_lookup *l, int arch) {
     int i;
     for (i = 0; i <= l->maxshift; i++)
         oac_fft_free(l->kfft[i], arch);
@@ -106,8 +106,8 @@ void clt_mdct_clear(mdct_lookup *l, int arch) {
 #endif /* CUSTOM_MODES */
 
 /* Forward MDCT trashes the input array */
-#ifndef OVERRIDE_clt_mdct_forward
-void clt_mdct_forward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * OAC_RESTRICT out,
+#ifndef OVERRIDE_oaci_clt_mdct_forward
+void oaci_clt_mdct_forward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * OAC_RESTRICT out,
                         const celt_coef *window, int overlap, int shift, int stride, int arch) {
     int i;
     int N, N2, N4;
@@ -231,10 +231,10 @@ void clt_mdct_forward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scal
     }
     RESTORE_STACK;
 }
-#endif /* OVERRIDE_clt_mdct_forward */
+#endif /* OVERRIDE_oaci_clt_mdct_forward */
 
-#ifndef OVERRIDE_clt_mdct_backward
-void clt_mdct_backward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * OAC_RESTRICT out,
+#ifndef OVERRIDE_oaci_clt_mdct_backward
+void oaci_clt_mdct_backward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * OAC_RESTRICT out,
                          const celt_coef * OAC_RESTRICT window, int overlap, int shift, int stride, int arch) {
     int i;
     int N, N2, N4;
@@ -351,4 +351,4 @@ void clt_mdct_backward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_sca
         }
     }
 }
-#endif /* OVERRIDE_clt_mdct_backward */
+#endif /* OVERRIDE_oaci_clt_mdct_backward */
diff --git a/celt/mdct.h b/celt/mdct.h
index 37bc4ea9d..73bf3b8eb 100644
--- a/celt/mdct.h
+++ b/celt/mdct.h
@@ -57,18 +57,18 @@ typedef struct {
 # include "arm/mdct_arm.h"
 #endif
 
-int clt_mdct_init(mdct_lookup *l, int N, int maxshift, int arch);
-void clt_mdct_clear(mdct_lookup *l, int arch);
+int oaci_clt_mdct_init(mdct_lookup *l, int N, int maxshift, int arch);
+void oaci_clt_mdct_clear(mdct_lookup *l, int arch);
 
 /** Compute a forward MDCT and scale by 4/N, trashes the input array */
-void clt_mdct_forward_c(const mdct_lookup *l, kiss_fft_scalar *in,
+void oaci_clt_mdct_forward_c(const mdct_lookup *l, kiss_fft_scalar *in,
     kiss_fft_scalar * OAC_RESTRICT out,
     const celt_coef *window, int overlap,
     int shift, int stride, int arch);
 
 /** Compute a backward MDCT (no scaling) and performs weighted overlap-add
     (scales implicitly by 1/2) */
-void clt_mdct_backward_c(const mdct_lookup *l, kiss_fft_scalar *in,
+void oaci_clt_mdct_backward_c(const mdct_lookup *l, kiss_fft_scalar *in,
     kiss_fft_scalar * OAC_RESTRICT out,
     const celt_coef * OAC_RESTRICT window,
     int overlap, int shift, int stride, int arch);
@@ -82,7 +82,7 @@ extern void (*const CLT_MDCT_FORWARD_IMPL[OAC_ARCHMASK + 1])(
       kiss_fft_scalar * OAC_RESTRICT out, const celt_coef *window,
       int overlap, int shift, int stride, int arch);
 
-#  define clt_mdct_forward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
+#  define oaci_clt_mdct_forward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
         ((*CLT_MDCT_FORWARD_IMPL[(arch)&OAC_ARCHMASK])(_l, _in, _out, \
                                                        _window, _overlap, _shift, \
                                                        _stride, _arch))
@@ -92,18 +92,18 @@ extern void (*const CLT_MDCT_BACKWARD_IMPL[OAC_ARCHMASK + 1])(
       kiss_fft_scalar * OAC_RESTRICT out, const celt_coef *window,
       int overlap, int shift, int stride, int arch);
 
-#  define clt_mdct_backward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
+#  define oaci_clt_mdct_backward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
         (*CLT_MDCT_BACKWARD_IMPL[(arch)&OAC_ARCHMASK])(_l, _in, _out, \
                                                        _window, _overlap, _shift, \
                                                        _stride, _arch)
 
 # else /* if defined(OAC_HAVE_RTCD) && defined(HAVE_ARM_NE10) */
 
-#  define clt_mdct_forward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
-        clt_mdct_forward_c(_l, _in, _out, _window, _overlap, _shift, _stride, _arch)
+#  define oaci_clt_mdct_forward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
+        oaci_clt_mdct_forward_c(_l, _in, _out, _window, _overlap, _shift, _stride, _arch)
 
-#  define clt_mdct_backward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
-        clt_mdct_backward_c(_l, _in, _out, _window, _overlap, _shift, _stride, _arch)
+#  define oaci_clt_mdct_backward(_l, _in, _out, _window, _overlap, _shift, _stride, _arch) \
+        oaci_clt_mdct_backward_c(_l, _in, _out, _window, _overlap, _shift, _stride, _arch)
 
 # endif /* end if defined(OAC_HAVE_RTCD) && defined(HAVE_ARM_NE10) && !defined(FIXED_POINT) */
 #endif /* end if !defined(OVERRIDE_OAC_MDCT) */
diff --git a/celt/mips/pitch_mipsr1.h b/celt/mips/pitch_mipsr1.h
index 648cf1de1..2049a845a 100644
--- a/celt/mips/pitch_mipsr1.h
+++ b/celt/mips/pitch_mipsr1.h
@@ -64,7 +64,7 @@
 
 #if defined(OVERRIDE_CELT_INNER_PROD)
 
-static OAC_INLINE oac_val32 celt_inner_prod(const oac_val16 *x,
+static OAC_INLINE oac_val32 oaci_celt_inner_prod(const oac_val16 *x,
                                             const oac_val16 *y, int N, int arch) {
     int j;
     accumulator_t acc = 0;
@@ -158,7 +158,7 @@ static OAC_INLINE oac_val32 celt_inner_prod(const oac_val16 *x,
 #endif /* OVERRIDE_CELT_INNER_PROD */
 
 #if defined(OVERRIDE_DUAL_INNER_PROD)
-static inline void dual_inner_prod(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
+static inline void oaci_dual_inner_prod(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
                                    int N, oac_val32 *xy1, oac_val32 *xy2, int arch) {
     int j;
     accumulator_t acc1 = 0;
@@ -246,7 +246,7 @@ static inline void dual_inner_prod(const oac_val16 *x, const oac_val16 *y01, con
 
 #if defined(OVERRIDE_XCORR_KERNEL)
 
-static inline void xcorr_kernel_mips(const oac_val16 * x,
+static inline void oaci_xcorr_kernel_mips(const oac_val16 * x,
                                      const oac_val16 * y, oac_val32 sum[4], int len) {
     int j;
     oac_val16 y_0, y_1, y_2, y_3;
@@ -340,8 +340,8 @@ static inline void xcorr_kernel_mips(const oac_val16 * x,
     sum[3] = (oac_val32)sum_3;
 }
 
-# define xcorr_kernel(x, y, sum, len, arch) \
-        ((void)(arch), xcorr_kernel_mips(x, y, sum, len))
+# define oaci_xcorr_kernel(x, y, sum, len, arch) \
+        ((void)(arch), oaci_xcorr_kernel_mips(x, y, sum, len))
 
 # undef accumulator_t
 # undef MIPS_MAC
diff --git a/celt/modes.c b/celt/modes.c
index 5a06ecd29..43b7f648d 100644
--- a/celt/modes.c
+++ b/celt/modes.c
@@ -375,12 +375,12 @@ CELTMode *oac_custom_mode_create(oac_int32 Fs, int frame_size, int *error) {
         goto failure;
 
     for (i = 0; i < mode->nbEBands; i++)
-        logN[i] = log2_frac(mode->eBands[i + 1] - mode->eBands[i], BITRES);
+        logN[i] = oaci_log2_frac(mode->eBands[i + 1] - mode->eBands[i], BITRES);
     mode->logN = logN;
 
-    compute_pulse_cache(mode, mode->maxLM);
+    oaci_compute_pulse_cache(mode, mode->maxLM);
 
-    if (clt_mdct_init(&mode->mdct, 2*mode->shortMdctSize*mode->nbShortMdcts,
+    if (oaci_clt_mdct_init(&mode->mdct, 2*mode->shortMdctSize*mode->nbShortMdcts,
            mode->maxLM, arch) == 0)
         goto failure;
 
@@ -423,7 +423,7 @@ void oac_custom_mode_destroy(CELTMode *mode) {
     oac_free((oac_int16*)mode->cache.index);
     oac_free((unsigned char*)mode->cache.bits);
     oac_free((unsigned char*)mode->cache.caps);
-    clt_mdct_clear(&mode->mdct, arch);
+    oaci_clt_mdct_clear(&mode->mdct, arch);
 
     oac_free((CELTMode *)mode);
 # else
diff --git a/celt/pitch.c b/celt/pitch.c
index 142b5f3e9..a368677a6 100644
--- a/celt/pitch.c
+++ b/celt/pitch.c
@@ -130,7 +130,7 @@ static void celt_fir5(oac_val16 *x,
 }
 
 
-void pitch_downsample(celt_sig * OAC_RESTRICT x[], oac_val16 * OAC_RESTRICT x_lp,
+void oaci_pitch_downsample(celt_sig * OAC_RESTRICT x[], oac_val16 * OAC_RESTRICT x_lp,
                       int len, int C, int factor, int arch) {
     int i;
     oac_val32 ac[5];
@@ -177,7 +177,7 @@ void pitch_downsample(celt_sig * OAC_RESTRICT x[], oac_val16 * OAC_RESTRICT x_lp
         x_lp[0] += .25f*x[1][offset] + .5f*x[1][0];
     }
 #endif
-    _celt_autocorr(x_lp, ac, NULL, 0,
+    oaci_celt_autocorr(x_lp, ac, NULL, 0,
                   4, len, arch);
 
     /* Noise floor -40 dB */
@@ -196,7 +196,7 @@ void pitch_downsample(celt_sig * OAC_RESTRICT x[], oac_val16 * OAC_RESTRICT x_lp
 #endif
     }
 
-    _celt_lpc(lpc, ac, 4);
+    oaci_celt_lpc(lpc, ac, 4);
     for (i = 0; i < 4; i++) {
         tmp = MULT16_16_Q15(QCONST16(.9f, 15), tmp);
         lpc[i] = MULT16_16_Q15(lpc[i], tmp);
@@ -216,7 +216,7 @@ oac_val32
 #else
 void
 #endif
-celt_pitch_xcorr_c(const oac_val16 *_x, const oac_val16 *_y,
+oaci_celt_pitch_xcorr_c(const oac_val16 *_x, const oac_val16 *_y,
                    oac_val32 *xcorr, int len, int max_pitch, int arch) {
 
 #if 0 /* This is a simple version of the pitch correlation that should work
@@ -256,9 +256,9 @@ celt_pitch_xcorr_c(const oac_val16 *_x, const oac_val16 *_y,
 # if defined(OAC_CHECK_ASM) && defined(FIXED_POINT)
         {
             oac_val32 sum_c[4] = {0, 0, 0, 0};
-            xcorr_kernel_c(_x, _y + i, sum_c, len);
+            oaci_xcorr_kernel_c(_x, _y + i, sum_c, len);
 # endif
-        xcorr_kernel(_x, _y + i, sum, len, arch);
+        oaci_xcorr_kernel(_x, _y + i, sum, len, arch);
 # if defined(OAC_CHECK_ASM) && defined(FIXED_POINT)
         celt_assert(memcmp(sum, sum_c, sizeof(sum)) == 0);
     }
@@ -277,7 +277,7 @@ celt_pitch_xcorr_c(const oac_val16 *_x, const oac_val16 *_y,
     /* In case max_pitch isn't a multiple of 4, do non-unrolled version. */
     for (; i < max_pitch; i++) {
         oac_val32 sum;
-        sum = celt_inner_prod(_x, _y + i, len, arch);
+        sum = oaci_celt_inner_prod(_x, _y + i, len, arch);
         xcorr[i] = sum;
 # ifdef FIXED_POINT
         maxcorr = MAX32(maxcorr, sum);
@@ -289,7 +289,7 @@ celt_pitch_xcorr_c(const oac_val16 *_x, const oac_val16 *_y,
 #endif
 }
 
-void pitch_search(const oac_val16 * OAC_RESTRICT x_lp, oac_val16 * OAC_RESTRICT y,
+void oaci_pitch_search(const oac_val16 * OAC_RESTRICT x_lp, oac_val16 * OAC_RESTRICT y,
                   int len, int max_pitch, int *pitch, int arch) {
     int i, j;
     int lag;
@@ -341,7 +341,7 @@ void pitch_search(const oac_val16 * OAC_RESTRICT x_lp, oac_val16 * OAC_RESTRICT
 #ifdef FIXED_POINT
     maxcorr =
 #endif
-    celt_pitch_xcorr(x_lp4, y_lp4, xcorr, len>>2, max_pitch>>2, arch);
+    oaci_celt_pitch_xcorr(x_lp4, y_lp4, xcorr, len>>2, max_pitch>>2, arch);
 
     find_best_pitch(xcorr, y_lp4, len>>2, max_pitch>>2, best_pitch
 #ifdef FIXED_POINT
@@ -363,7 +363,7 @@ void pitch_search(const oac_val16 * OAC_RESTRICT x_lp, oac_val16 * OAC_RESTRICT
         for (j = 0; j < len>>1; j++)
             sum += SHR32(MULT16_16(x_lp[j], y[i + j]), shift);
 #else
-        sum = celt_inner_prod(x_lp, y + i, len>>1, arch);
+        sum = oaci_celt_inner_prod(x_lp, y + i, len>>1, arch);
 #endif
         xcorr[i] = MAX32(-1, sum);
 #ifdef FIXED_POINT
@@ -417,19 +417,19 @@ static oac_val16 compute_pitch_gain(oac_val32 xy, oac_val32 xx, oac_val32 yy) {
             shift++;
         }
     }
-    den = celt_rsqrt_norm(x2y2);
+    den = oaci_celt_rsqrt_norm(x2y2);
     g = MULT16_32_Q15(den, xy);
     g = VSHR32(g, (shift>>1) - 1);
     return EXTRACT16(MAX32(-Q15ONE, MIN32(g, Q15ONE)));
 }
 #else
 static oac_val16 compute_pitch_gain(oac_val32 xy, oac_val32 xx, oac_val32 yy) {
-    return xy/celt_sqrt(1 + xx*yy);
+    return xy/oaci_celt_sqrt(1 + xx*yy);
 }
 #endif
 
 static const int second_check[16] = {0, 0, 3, 2, 3, 2, 5, 2, 3, 2, 3, 2, 5, 2, 3, 2};
-oac_val16 remove_doubling(oac_val16 *x, int maxperiod, int minperiod,
+oac_val16 oaci_remove_doubling(oac_val16 *x, int maxperiod, int minperiod,
                           int N, int *T0_, int prev_period, oac_val16 prev_gain, int arch) {
     int k, i, T, T0;
     oac_val16 g, g0;
@@ -454,7 +454,7 @@ oac_val16 remove_doubling(oac_val16 *x, int maxperiod, int minperiod,
 
     T = T0 = *T0_;
     ALLOC(yy_lookup, maxperiod + 1, oac_val32);
-    dual_inner_prod(x, x, x - T0, N, &xx, &xy, arch);
+    oaci_dual_inner_prod(x, x, x - T0, N, &xx, &xy, arch);
     yy_lookup[0] = xx;
     yy = xx;
     for (i = 1; i <= maxperiod; i++) {
@@ -483,7 +483,7 @@ oac_val16 remove_doubling(oac_val16 *x, int maxperiod, int minperiod,
         } else {
             T1b = celt_udiv(2*second_check[k]*T0 + k, 2*k);
         }
-        dual_inner_prod(x, &x[-T1], &x[-T1b], N, &xy, &xy2, arch);
+        oaci_dual_inner_prod(x, &x[-T1], &x[-T1b], N, &xy, &xy2, arch);
         xy = HALF32(xy + xy2);
         yy = HALF32(yy_lookup[T1] + yy_lookup[T1b]);
         g1 = compute_pitch_gain(xy, xx, yy);
@@ -511,10 +511,10 @@ oac_val16 remove_doubling(oac_val16 *x, int maxperiod, int minperiod,
     if (best_yy <= best_xy)
         pg = Q15ONE;
     else
-        pg = SHR32(frac_div32(best_xy, best_yy + 1), 16);
+        pg = SHR32(oaci_frac_div32(best_xy, best_yy + 1), 16);
 
     for (k = 0; k < 3; k++)
-        xcorr[k] = celt_inner_prod(x, x - (T + k - 1), N, arch);
+        xcorr[k] = oaci_celt_inner_prod(x, x - (T + k - 1), N, arch);
     if ((xcorr[2] - xcorr[0]) > MULT16_32_Q15(QCONST16(.7f, 15), xcorr[1] - xcorr[0]))
         offset = 1;
     else if ((xcorr[0] - xcorr[2]) > MULT16_32_Q15(QCONST16(.7f, 15), xcorr[1] - xcorr[2]))
diff --git a/celt/pitch.h b/celt/pitch.h
index 94bb9b0f4..3f939e7b4 100644
--- a/celt/pitch.h
+++ b/celt/pitch.h
@@ -50,19 +50,19 @@
 # include "arm/pitch_arm.h"
 #endif
 
-void pitch_downsample(celt_sig * OAC_RESTRICT x[], oac_val16 * OAC_RESTRICT x_lp,
+void oaci_pitch_downsample(celt_sig * OAC_RESTRICT x[], oac_val16 * OAC_RESTRICT x_lp,
     int len, int C, int factor, int arch);
 
-void pitch_search(const oac_val16 * OAC_RESTRICT x_lp, oac_val16 * OAC_RESTRICT y,
+void oaci_pitch_search(const oac_val16 * OAC_RESTRICT x_lp, oac_val16 * OAC_RESTRICT y,
     int len, int max_pitch, int *pitch, int arch);
 
-oac_val16 remove_doubling(oac_val16 *x, int maxperiod, int minperiod,
+oac_val16 oaci_remove_doubling(oac_val16 *x, int maxperiod, int minperiod,
     int N, int *T0, int prev_period, oac_val16 prev_gain, int arch);
 
 
 /* OPT: This is the kernel you really want to optimize. It gets used a lot
    by the prefilter and by the PLC. */
-static OAC_INLINE void xcorr_kernel_c(const oac_val16 * x, const oac_val16 * y, oac_val32 sum[4], int len) {
+static OAC_INLINE void oaci_xcorr_kernel_c(const oac_val16 * x, const oac_val16 * y, oac_val32 sum[4], int len) {
     int j;
     oac_val16 y_0, y_1, y_2, y_3;
     celt_assert(len >= 3);
@@ -124,12 +124,12 @@ static OAC_INLINE void xcorr_kernel_c(const oac_val16 * x, const oac_val16 * y,
 }
 
 #ifndef OVERRIDE_XCORR_KERNEL
-# define xcorr_kernel(x, y, sum, len, arch) \
-        ((void)(arch), xcorr_kernel_c(x, y, sum, len))
+# define oaci_xcorr_kernel(x, y, sum, len, arch) \
+        ((void)(arch), oaci_xcorr_kernel_c(x, y, sum, len))
 #endif /* OVERRIDE_XCORR_KERNEL */
 
 
-static OAC_INLINE void dual_inner_prod_c(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
+static OAC_INLINE void oaci_dual_inner_prod_c(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
                                          int N, oac_val32 *xy1, oac_val32 *xy2) {
     int i;
     oac_val32 xy01 = 0;
@@ -143,13 +143,13 @@ static OAC_INLINE void dual_inner_prod_c(const oac_val16 *x, const oac_val16 *y0
 }
 
 #ifndef OVERRIDE_DUAL_INNER_PROD
-# define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) \
-        ((void)(arch), dual_inner_prod_c(x, y01, y02, N, xy1, xy2))
+# define oaci_dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) \
+        ((void)(arch), oaci_dual_inner_prod_c(x, y01, y02, N, xy1, xy2))
 #endif
 
 /*We make sure a C version is always available for cases where the overhead of
    vectorization and passing around an arch flag aren't worth it.*/
-static OAC_INLINE oac_val32 celt_inner_prod_c(const oac_val16 *x,
+static OAC_INLINE oac_val32 oaci_celt_inner_prod_c(const oac_val16 *x,
                                               const oac_val16 *y, int N) {
     int i;
     oac_val32 xy = 0;
@@ -159,12 +159,12 @@ static OAC_INLINE oac_val32 celt_inner_prod_c(const oac_val16 *x,
 }
 
 #if !defined(OVERRIDE_CELT_INNER_PROD)
-# define celt_inner_prod(x, y, N, arch) \
-        ((void)(arch), celt_inner_prod_c(x, y, N))
+# define oaci_celt_inner_prod(x, y, N, arch) \
+        ((void)(arch), oaci_celt_inner_prod_c(x, y, N))
 #endif
 
 #ifdef NON_STATIC_COMB_FILTER_CONST_C
-void comb_filter_const_c(oac_val32 *y, oac_val32 *x, int T, int N,
+void oaci_comb_filter_const_c(oac_val32 *y, oac_val32 *x, int T, int N,
     oac_val16 g10, oac_val16 g11, oac_val16 g12);
 #endif
 
@@ -174,21 +174,21 @@ oac_val32
 #else
 void
 #endif
-celt_pitch_xcorr_c(const oac_val16 *_x, const oac_val16 *_y,
+oaci_celt_pitch_xcorr_c(const oac_val16 *_x, const oac_val16 *_y,
     oac_val32 *xcorr, int len, int max_pitch, int arch);
 
 #ifndef OVERRIDE_PITCH_XCORR
-# define celt_pitch_xcorr celt_pitch_xcorr_c
+# define oaci_celt_pitch_xcorr oaci_celt_pitch_xcorr_c
 #endif
 
 #ifdef NON_STATIC_COMB_FILTER_CONST_C
-void comb_filter_const_c(oac_val32 *y, oac_val32 *x, int T, int N,
+void oaci_comb_filter_const_c(oac_val32 *y, oac_val32 *x, int T, int N,
     oac_val16 g10, oac_val16 g11, oac_val16 g12);
 #endif
 
 #ifndef OVERRIDE_COMB_FILTER_CONST
-# define comb_filter_const(y, x, T, N, g10, g11, g12, arch) \
-        ((void)(arch), comb_filter_const_c(y, x, T, N, g10, g11, g12))
+# define oaci_comb_filter_const(y, x, T, N, g10, g11, g12, arch) \
+        ((void)(arch), oaci_comb_filter_const_c(y, x, T, N, g10, g11, g12))
 #endif
 
 
diff --git a/celt/quant_bands.c b/celt/quant_bands.c
index 4b9417153..d8e32f9d1 100644
--- a/celt/quant_bands.c
+++ b/celt/quant_bands.c
@@ -41,7 +41,7 @@
 
 #ifdef FIXED_POINT
 /* Mean energy in each band quantized in Q4 */
-const signed char eMeans[25] = {
+const signed char oaci_eMeans[25] = {
     103, 100, 92, 85, 81,
     77, 72, 70, 78, 75,
     73, 71, 78, 74, 69,
@@ -50,7 +50,7 @@ const signed char eMeans[25] = {
 };
 #else
 /* Mean energy in each band quantized in Q4 and converted back to float */
-const oac_val16 eMeans[25] = {
+const oac_val16 oaci_eMeans[25] = {
     6.437500f, 6.250000f, 5.750000f, 5.312500f, 5.062500f,
     4.812500f, 4.500000f, 4.375000f, 4.875000f, 4.687500f,
     4.562500f, 4.437500f, 4.875000f, 4.625000f, 4.312500f,
@@ -163,7 +163,7 @@ static int quant_coarse_energy_impl(const CELTMode *m, int start, int end,
     oac_val16 beta;
 
     if (tell + 3 <= budget)
-        ec_enc_bit_logp(enc, intra, 3);
+        oaci_ec_enc_bit_logp(enc, intra, 3);
     if (intra) {
         coef = 0;
         beta = beta_intra;
@@ -219,14 +219,14 @@ static int quant_coarse_energy_impl(const CELTMode *m, int start, int end,
             if (budget - tell >= 15) {
                 int pi;
                 pi = 2*IMIN(i, 20);
-                ec_laplace_encode(enc, &qi,
+                oaci_ec_laplace_encode(enc, &qi,
                   prob_model[pi]<<7, prob_model[pi + 1]<<6);
             } else if (budget - tell >= 2) {
                 qi = IMAX(-1, IMIN(qi, 1));
-                ec_enc_icdf(enc, 2*qi^-(qi < 0), small_energy_icdf, 2);
+                oaci_ec_enc_icdf(enc, 2*qi^-(qi < 0), small_energy_icdf, 2);
             } else if (budget - tell >= 1) {
                 qi = IMIN(0, qi);
-                ec_enc_bit_logp(enc, -qi, 1);
+                oaci_ec_enc_bit_logp(enc, -qi, 1);
             } else
                 qi = -1;
             error[i + c*m->nbEBands] = f - SHL32(qi, DB_SHIFT);
@@ -244,7 +244,7 @@ static int quant_coarse_energy_impl(const CELTMode *m, int start, int end,
     return lfe ? 0 : badness;
 }
 
-void quant_coarse_energy(const CELTMode *m, int start, int end, int effEnd,
+void oaci_quant_coarse_energy(const CELTMode *m, int start, int end, int effEnd,
                          const celt_glog *eBands, celt_glog *oldEBands, oac_uint32 budget,
                          celt_glog *error, ec_enc *enc, int C, int LM, int nbAvailableBytes,
                          int force_intra, oac_val32 *delayedIntra, int two_pass, int loss_rate, int lfe) {
@@ -298,7 +298,7 @@ void quant_coarse_energy(const CELTMode *m, int start, int end, int effEnd,
         int badness2;
         VARDECL(unsigned char, intra_bits);
 
-        tell_intra = ec_tell_frac(enc);
+        tell_intra = oaci_ec_tell_frac(enc);
 
         enc_intra_state = *enc;
 
@@ -319,7 +319,7 @@ void quant_coarse_energy(const CELTMode *m, int start, int end, int effEnd,
 
         if (two_pass
             && (badness1 < badness2
-                || (badness1 == badness2 && ((oac_int32)ec_tell_frac(enc)) + intra_bias > tell_intra))) {
+                || (badness1 == badness2 && ((oac_int32)oaci_ec_tell_frac(enc)) + intra_bias > tell_intra))) {
             *enc = enc_intra_state;
             /* Copy intra bits to bit-stream */
             OAC_COPY(intra_buf, intra_bits, nintra_bytes - nstart_bytes);
@@ -341,7 +341,7 @@ void quant_coarse_energy(const CELTMode *m, int start, int end, int effEnd,
     RESTORE_STACK;
 }
 
-void quant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, celt_glog *error, int *prev_quant,
+void oaci_quant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, celt_glog *error, int *prev_quant,
                        int *extra_quant, ec_enc *enc, int C) {
     int i, c;
     /* Encode finer resolution */
@@ -366,7 +366,7 @@ void quant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEBan
                 q2 = extra - 1;
             if (q2 < 0)
                 q2 = 0;
-            ec_enc_bits(enc, q2, extra_quant[i]);
+            oaci_ec_enc_bits(enc, q2, extra_quant[i]);
 #ifdef FIXED_POINT
             offset = SUB32(VSHR32(2*q2 + 1, extra_quant[i] - DB_SHIFT + 1), GCONST(.5f));
             offset = SHR32(offset, prev);
@@ -381,7 +381,7 @@ void quant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEBan
     }
 }
 
-void quant_energy_finalise(const CELTMode *m, int start, int end, celt_glog *oldEBands, celt_glog *error,
+void oaci_quant_energy_finalise(const CELTMode *m, int start, int end, celt_glog *oldEBands, celt_glog *error,
                            int *fine_quant, int *fine_priority, int bits_left, ec_enc *enc, int C) {
     int i, prio, c;
 
@@ -395,7 +395,7 @@ void quant_energy_finalise(const CELTMode *m, int start, int end, celt_glog *old
                 int q2;
                 celt_glog offset;
                 q2 = error[i + c*m->nbEBands] < 0 ? 0 : 1;
-                ec_enc_bits(enc, q2, 1);
+                oaci_ec_enc_bits(enc, q2, 1);
 #ifdef FIXED_POINT
                 offset = SHR32(SHL32(q2, DB_SHIFT) - GCONST(.5f), fine_quant[i] + 1);
 #else
@@ -409,7 +409,7 @@ void quant_energy_finalise(const CELTMode *m, int start, int end, celt_glog *old
     }
 }
 
-void unquant_coarse_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, int intra, ec_dec *dec, int C,
+void oaci_unquant_coarse_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, int intra, ec_dec *dec, int C,
                            int LM) {
     const unsigned char *prob_model = e_prob_model[LM][intra];
     int i, c;
@@ -444,13 +444,13 @@ void unquant_coarse_energy(const CELTMode *m, int start, int end, celt_glog *old
             if (budget - tell >= 15) {
                 int pi;
                 pi = 2*IMIN(i, 20);
-                qi = ec_laplace_decode(dec,
+                qi = oaci_ec_laplace_decode(dec,
                   prob_model[pi]<<7, prob_model[pi + 1]<<6);
             } else if (budget - tell >= 2) {
-                qi = ec_dec_icdf(dec, small_energy_icdf, 2);
+                qi = oaci_ec_dec_icdf(dec, small_energy_icdf, 2);
                 qi = (qi>>1)^-(qi&1);
             } else if (budget - tell >= 1) {
-                qi = -ec_dec_bit_logp(dec, 1);
+                qi = -oaci_ec_dec_bit_logp(dec, 1);
             } else
                 qi = -1;
             q = (oac_val32)SHL32(EXTEND32(qi), DB_SHIFT);
@@ -466,7 +466,7 @@ void unquant_coarse_energy(const CELTMode *m, int start, int end, celt_glog *old
     }
 }
 
-void unquant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, int *prev_quant, int *extra_quant,
+void oaci_unquant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, int *prev_quant, int *extra_quant,
                          ec_dec *dec, int C) {
     int i, c;
     /* Decode finer resolution */
@@ -481,7 +481,7 @@ void unquant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEB
         do {
             int q2;
             celt_glog offset;
-            q2 = ec_dec_bits(dec, extra);
+            q2 = oaci_ec_dec_bits(dec, extra);
 #ifdef FIXED_POINT
             offset = SUB32(VSHR32(2*q2 + 1, extra - DB_SHIFT + 1), GCONST(.5f));
             offset = SHR32(offset, prev);
@@ -494,7 +494,7 @@ void unquant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEB
     }
 }
 
-void unquant_energy_finalise(const CELTMode *m, int start, int end, celt_glog *oldEBands, int *fine_quant,
+void oaci_unquant_energy_finalise(const CELTMode *m, int start, int end, celt_glog *oldEBands, int *fine_quant,
                              int *fine_priority, int bits_left, ec_dec *dec, int C) {
     int i, prio, c;
 
@@ -507,7 +507,7 @@ void unquant_energy_finalise(const CELTMode *m, int start, int end, celt_glog *o
             do {
                 int q2;
                 celt_glog offset;
-                q2 = ec_dec_bits(dec, 1);
+                q2 = oaci_ec_dec_bits(dec, 1);
 #ifdef FIXED_POINT
                 offset = SHR32(SHL32(q2, DB_SHIFT) - GCONST(.5f), fine_quant[i] + 1);
 #else
@@ -520,7 +520,7 @@ void unquant_energy_finalise(const CELTMode *m, int start, int end, celt_glog *o
     }
 }
 
-void amp2Log2(const CELTMode *m, int effEnd, int end,
+void oaci_amp2Log2(const CELTMode *m, int effEnd, int end,
               celt_ener *bandE, celt_glog *bandLogE, int C) {
     int c, i;
     c = 0;
@@ -528,7 +528,7 @@ void amp2Log2(const CELTMode *m, int effEnd, int end,
         for (i = 0; i < effEnd; i++) {
             bandLogE[i + c*m->nbEBands] =
                 celt_log2_db(bandE[i + c*m->nbEBands])
-                - SHL32((celt_glog)eMeans[i], DB_SHIFT - 4);
+                - SHL32((celt_glog)oaci_eMeans[i], DB_SHIFT - 4);
 #ifdef FIXED_POINT
             /* Compensate for bandE[] being Q12 but celt_log2() taking a Q14 input. */
             bandLogE[i + c*m->nbEBands] += GCONST(2.f);
diff --git a/celt/quant_bands.h b/celt/quant_bands.h
index 528fa29b4..f35c25d99 100644
--- a/celt/quant_bands.h
+++ b/celt/quant_bands.h
@@ -36,36 +36,36 @@
 #include "mathops.h"
 
 #ifdef FIXED_POINT
-extern const signed char eMeans[25];
+extern const signed char oaci_eMeans[25];
 #else
-extern const oac_val16 eMeans[25];
+extern const oac_val16 oaci_eMeans[25];
 #endif
 
-void amp2Log2(const CELTMode *m, int effEnd, int end,
+void oaci_amp2Log2(const CELTMode *m, int effEnd, int end,
     celt_ener *bandE, celt_glog *bandLogE, int C);
 
 void log2Amp(const CELTMode *m, int start, int end,
     celt_ener *eBands, const celt_glog *oldEBands, int C);
 
-void quant_coarse_energy(const CELTMode *m, int start, int end, int effEnd,
+void oaci_quant_coarse_energy(const CELTMode *m, int start, int end, int effEnd,
     const celt_glog *eBands, celt_glog *oldEBands, oac_uint32 budget,
     celt_glog *error, ec_enc *enc, int C, int LM,
     int nbAvailableBytes, int force_intra, oac_val32 *delayedIntra,
     int two_pass, int loss_rate, int lfe);
 
-void quant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, celt_glog *error, int *fine_quant,
+void oaci_quant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, celt_glog *error, int *fine_quant,
     int *extra_quant, ec_enc *enc, int C);
 
-void quant_energy_finalise(const CELTMode *m, int start, int end, celt_glog *oldEBands, celt_glog *error,
+void oaci_quant_energy_finalise(const CELTMode *m, int start, int end, celt_glog *oldEBands, celt_glog *error,
     int *fine_quant, int *fine_priority, int bits_left, ec_enc *enc, int C);
 
-void unquant_coarse_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, int intra, ec_dec *dec, int C,
+void oaci_unquant_coarse_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, int intra, ec_dec *dec, int C,
     int LM);
 
-void unquant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, int *fine_quant, int *extra_quant,
+void oaci_unquant_fine_energy(const CELTMode *m, int start, int end, celt_glog *oldEBands, int *fine_quant, int *extra_quant,
     ec_dec *dec, int C);
 
-void unquant_energy_finalise(const CELTMode *m, int start, int end, celt_glog *oldEBands, int *fine_quant,
+void oaci_unquant_energy_finalise(const CELTMode *m, int start, int end, celt_glog *oldEBands, int *fine_quant,
     int *fine_priority, int bits_left, ec_dec *dec, int C);
 
 #endif /* QUANT_BANDS */
diff --git a/celt/rate.c b/celt/rate.c
index 28d17b38d..1420b7f40 100644
--- a/celt/rate.c
+++ b/celt/rate.c
@@ -70,7 +70,7 @@ static int fits_in32(int _n, int _k) {
     }
 }
 
-void compute_pulse_cache(CELTMode *m, int LM) {
+void oaci_compute_pulse_cache(CELTMode *m, int LM) {
     int C;
     int i;
     int j;
@@ -124,7 +124,7 @@ void compute_pulse_cache(CELTMode *m, int LM) {
     for (i = 0; i < nbEntries; i++) {
         unsigned char *ptr = bits + entryI[i];
         oac_int16 tmp[CELT_MAX_PULSES + 1];
-        get_required_bits(tmp, entryN[i], get_pulses(entryK[i]), BITRES);
+        oaci_get_required_bits(tmp, entryN[i], get_pulses(entryK[i]), BITRES);
         for (j = 1; j <= entryK[i]; j++)
             ptr[j] = tmp[get_pulses(j)] - 1;
         ptr[0] = entryK[i];
@@ -342,11 +342,11 @@ static OAC_INLINE int interp_bits2pulses(const CELTMode *m, int start, int end,
                     || (band_bits > (depth_threshold*band_width<<LM<<BITRES)>>4 && j <= signalBandwidth))
 #endif
                 {
-                    ec_enc_bit_logp(ec, 1, 1);
+                    oaci_ec_enc_bit_logp(ec, 1, 1);
                     break;
                 }
-                ec_enc_bit_logp(ec, 0, 1);
-            } else if (ec_dec_bit_logp(ec, 1)) {
+                oaci_ec_enc_bit_logp(ec, 0, 1);
+            } else if (oaci_ec_dec_bit_logp(ec, 1)) {
                 break;
             }
             /*We used a bit to skip this band.*/
@@ -373,9 +373,9 @@ static OAC_INLINE int interp_bits2pulses(const CELTMode *m, int start, int end,
     if (intensity_rsv > 0) {
         if (encode) {
             *intensity = IMIN(*intensity, codedBands);
-            ec_enc_uint(ec, *intensity - start, codedBands + 1 - start);
+            oaci_ec_enc_uint(ec, *intensity - start, codedBands + 1 - start);
         } else
-            *intensity = start + ec_dec_uint(ec, codedBands + 1 - start);
+            *intensity = start + oaci_ec_dec_uint(ec, codedBands + 1 - start);
     } else
         *intensity = 0;
     if (*intensity <= start) {
@@ -384,9 +384,9 @@ static OAC_INLINE int interp_bits2pulses(const CELTMode *m, int start, int end,
     }
     if (dual_stereo_rsv > 0) {
         if (encode)
-            ec_enc_bit_logp(ec, *dual_stereo, 1);
+            oaci_ec_enc_bit_logp(ec, *dual_stereo, 1);
         else
-            *dual_stereo = ec_dec_bit_logp(ec, 1);
+            *dual_stereo = oaci_ec_dec_bit_logp(ec, 1);
     } else
         *dual_stereo = 0;
 
@@ -466,7 +466,7 @@ static OAC_INLINE int interp_bits2pulses(const CELTMode *m, int start, int end,
         }
 
         /* Fine energy can't take advantage of the re-balancing in
-            quant_all_bands().
+            oaci_quant_all_bands().
            Instead, do the re-balancing here.*/
         if (excess > 0) {
             int extra_fine;
@@ -483,7 +483,7 @@ static OAC_INLINE int interp_bits2pulses(const CELTMode *m, int start, int end,
         celt_assert(ebits[j] >= 0);
     }
     /* Save any remaining bits over the cap for the rebalancing in
-        quant_all_bands(). */
+        oaci_quant_all_bands(). */
     *_balance = balance;
 
     /* The skipped bands use all their bits for fine energy. */
@@ -497,7 +497,7 @@ static OAC_INLINE int interp_bits2pulses(const CELTMode *m, int start, int end,
     return codedBands;
 }
 
-int clt_compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim,
+int oaci_clt_compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim,
                            int *intensity, int *dual_stereo,
                            oac_int32 total, oac_int32 *balance, int *pulses, int *ebits, int *fine_priority, int C,
                            int LM, ec_ctx *ec, int encode, int prev, int signalBandwidth) {
diff --git a/celt/rate.h b/celt/rate.h
index b122fe83c..84503ca51 100644
--- a/celt/rate.h
+++ b/celt/rate.h
@@ -43,7 +43,7 @@
 #include "cwrs.h"
 #include "modes.h"
 
-void compute_pulse_cache(CELTMode *m, int LM);
+void oaci_compute_pulse_cache(CELTMode *m, int LM);
 
 static OAC_INLINE int get_pulses(int i) {
     return i < 8 ? i : (8 + (i&7))<<((i>>3) - 1);
@@ -91,7 +91,7 @@ static OAC_INLINE int pulses2bits(const CELTMode *m, int band, int LM, int pulse
    @param pulses Number of pulses per band (returned)
    @return Total number of bits allocated
  */
-int clt_compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim,
+int oaci_clt_compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim,
     int *intensity, int *dual_stereo,
     oac_int32 total, oac_int32 *balance, int *pulses, int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec,
     int encode, int prev, int signalBandwidth);
diff --git a/celt/tests/test_unit_entropy.c b/celt/tests/test_unit_entropy.c
index 681d9be92..7da9f0020 100644
--- a/celt/tests/test_unit_entropy.c
+++ b/celt/tests/test_unit_entropy.c
@@ -80,11 +80,11 @@ int main(int _argc, char **_argv) {
         seed = time(NULL);
     /*Testing encoding of raw bit values.*/
     ptr = (unsigned char *)malloc(DATA_SIZE);
-    ec_enc_init(&enc, ptr, DATA_SIZE);
+    oaci_ec_enc_init(&enc, ptr, DATA_SIZE);
     for (ft = 2; ft < 1024; ft++) {
         for (i = 0; i < ft; i++) {
             entropy += log(ft)*M_LOG2E;
-            ec_enc_uint(&enc, i, ft);
+            oaci_ec_enc_uint(&enc, i, ft);
         }
     }
     /*Testing encoding of raw bit values.*/
@@ -92,7 +92,7 @@ int main(int _argc, char **_argv) {
         for (i = 0; i < (1<<ftb); i++) {
             entropy += ftb;
             nbits = ec_tell(&enc);
-            ec_enc_bits(&enc, i, ftb);
+            oaci_ec_enc_bits(&enc, i, ftb);
             nbits2 = ec_tell(&enc);
             if (nbits2 - nbits != ftb) {
                 fprintf(stderr, "Used %li bits to encode %i bits directly.\n",
@@ -101,16 +101,16 @@ int main(int _argc, char **_argv) {
             }
         }
     }
-    nbits = ec_tell_frac(&enc);
-    ec_enc_done(&enc);
+    nbits = oaci_ec_tell_frac(&enc);
+    oaci_ec_enc_done(&enc);
     fprintf(stderr,
    "Encoded %0.2f bits of entropy to %0.2f bits (%0.3f%% wasted).\n",
    entropy, ldexp(nbits, -3), 100*(nbits - ldexp(entropy, 3))/nbits);
     fprintf(stderr, "Packed to %li bytes.\n", (long)ec_range_bytes(&enc));
-    ec_dec_init(&dec, ptr, DATA_SIZE);
+    oaci_ec_dec_init(&dec, ptr, DATA_SIZE);
     for (ft = 2; ft < 1024; ft++) {
         for (i = 0; i < ft; i++) {
-            sym = ec_dec_uint(&dec, ft);
+            sym = oaci_ec_dec_uint(&dec, ft);
             if (sym != (unsigned)i) {
                 fprintf(stderr, "Decoded %i instead of %i with ft of %i.\n", sym, i, ft);
                 ret = -1;
@@ -119,14 +119,14 @@ int main(int _argc, char **_argv) {
     }
     for (ftb = 1; ftb < 16; ftb++) {
         for (i = 0; i < (1<<ftb); i++) {
-            sym = ec_dec_bits(&dec, ftb);
+            sym = oaci_ec_dec_bits(&dec, ftb);
             if (sym != (unsigned)i) {
                 fprintf(stderr, "Decoded %i instead of %i with ftb of %i.\n", sym, i, ftb);
                 ret = -1;
             }
         }
     }
-    nbits2 = ec_tell_frac(&dec);
+    nbits2 = oaci_ec_tell_frac(&dec);
     if (nbits != nbits2) {
         fprintf(stderr,
      "Reported number of bits used was %0.2f, should be %0.2f.\n",
@@ -139,28 +139,28 @@ int main(int _argc, char **_argv) {
        get used in practice.
        It's mostly here for code coverage completeness.*/
     /*Start with a 16-bit buffer.*/
-    ec_enc_init(&enc, ptr, 2);
+    oaci_ec_enc_init(&enc, ptr, 2);
     /*Write 7 raw bits.*/
-    ec_enc_bits(&enc, 0x55, 7);
+    oaci_ec_enc_bits(&enc, 0x55, 7);
     /*Write 12.3 bits of range coder data.*/
-    ec_enc_uint(&enc, 1, 2);
-    ec_enc_uint(&enc, 1, 3);
-    ec_enc_uint(&enc, 1, 4);
-    ec_enc_uint(&enc, 1, 5);
-    ec_enc_uint(&enc, 2, 6);
-    ec_enc_uint(&enc, 6, 7);
-    ec_enc_done(&enc);
-    ec_dec_init(&dec, ptr, 2);
+    oaci_ec_enc_uint(&enc, 1, 2);
+    oaci_ec_enc_uint(&enc, 1, 3);
+    oaci_ec_enc_uint(&enc, 1, 4);
+    oaci_ec_enc_uint(&enc, 1, 5);
+    oaci_ec_enc_uint(&enc, 2, 6);
+    oaci_ec_enc_uint(&enc, 6, 7);
+    oaci_ec_enc_done(&enc);
+    oaci_ec_dec_init(&dec, ptr, 2);
     if (!enc.error
         /*The raw bits should have been overwritten by the range coder data.*/
-        || ec_dec_bits(&dec, 7) != 0x05
+        || oaci_ec_dec_bits(&dec, 7) != 0x05
         /*And all the range coder data should have been encoded correctly.*/
-        || ec_dec_uint(&dec, 2) != 1
-        || ec_dec_uint(&dec, 3) != 1
-        || ec_dec_uint(&dec, 4) != 1
-        || ec_dec_uint(&dec, 5) != 1
-        || ec_dec_uint(&dec, 6) != 2
-        || ec_dec_uint(&dec, 7) != 6) {
+        || oaci_ec_dec_uint(&dec, 2) != 1
+        || oaci_ec_dec_uint(&dec, 3) != 1
+        || oaci_ec_dec_uint(&dec, 4) != 1
+        || oaci_ec_dec_uint(&dec, 5) != 1
+        || oaci_ec_dec_uint(&dec, 6) != 2
+        || oaci_ec_dec_uint(&dec, 7) != 6) {
         fprintf(stderr, "Encoder bust overwrote range coder data with raw bits.\n");
         ret = -1;
     }
@@ -176,24 +176,24 @@ int main(int _argc, char **_argv) {
         sz = rand()/((RAND_MAX>>(rand()%9U)) + 1U);
         data = (unsigned *)malloc(sz*sizeof(*data));
         tell = (unsigned *)malloc((sz + 1)*sizeof(*tell));
-        ec_enc_init(&enc, ptr, DATA_SIZE2);
+        oaci_ec_enc_init(&enc, ptr, DATA_SIZE2);
         zeros = rand()%13 == 0;
-        tell[0] = ec_tell_frac(&enc);
+        tell[0] = oaci_ec_tell_frac(&enc);
         for (j = 0; j < sz; j++) {
             if (zeros)
                 data[j] = 0;
             else
                 data[j] = rand()%ft;
-            ec_enc_uint(&enc, data[j], ft);
-            tell[j + 1] = ec_tell_frac(&enc);
+            oaci_ec_enc_uint(&enc, data[j], ft);
+            tell[j + 1] = oaci_ec_tell_frac(&enc);
         }
         if (rand()%2 == 0)
             while (ec_tell(&enc)%8 != 0)
-                ec_enc_uint(&enc, rand()%2, 2);
+                oaci_ec_enc_uint(&enc, rand()%2, 2);
         tell_bits = ec_tell(&enc);
-        ec_enc_done(&enc);
+        oaci_ec_enc_done(&enc);
         if (tell_bits != (unsigned)ec_tell(&enc)) {
-            fprintf(stderr, "ec_tell() changed after ec_enc_done(): %i instead of %i (Random seed: %u)\n",
+            fprintf(stderr, "ec_tell() changed after oaci_ec_enc_done(): %i instead of %i (Random seed: %u)\n",
        ec_tell(&enc), tell_bits, seed);
             ret = -1;
         }
@@ -202,24 +202,24 @@ int main(int _argc, char **_argv) {
                ec_range_bytes(&enc), (tell_bits + 7)/8, seed);
             ret = -1;
         }
-        ec_dec_init(&dec, ptr, DATA_SIZE2);
-        if (ec_tell_frac(&dec) != tell[0]) {
+        oaci_ec_dec_init(&dec, ptr, DATA_SIZE2);
+        if (oaci_ec_tell_frac(&dec) != tell[0]) {
             fprintf(stderr,
        "Tell mismatch between encoder and decoder at symbol %i: %i instead of %i (Random seed: %u).\n",
-       0, ec_tell_frac(&dec), tell[0], seed);
+       0, oaci_ec_tell_frac(&dec), tell[0], seed);
         }
         for (j = 0; j < sz; j++) {
-            sym = ec_dec_uint(&dec, ft);
+            sym = oaci_ec_dec_uint(&dec, ft);
             if (sym != data[j]) {
                 fprintf(stderr,
          "Decoded %i instead of %i with ft of %i at position %i of %i (Random seed: %u).\n",
          sym, data[j], ft, j, sz, seed);
                 ret = -1;
             }
-            if (ec_tell_frac(&dec) != tell[j + 1]) {
+            if (oaci_ec_tell_frac(&dec) != tell[j + 1]) {
                 fprintf(stderr,
          "Tell mismatch between encoder and decoder at symbol %i: %i instead of %i (Random seed: %u).\n",
-         j + 1, ec_tell_frac(&dec), tell[j + 1], seed);
+         j + 1, oaci_ec_tell_frac(&dec), tell[j + 1], seed);
             }
         }
         free(tell);
@@ -237,44 +237,44 @@ int main(int _argc, char **_argv) {
         data = (unsigned *)malloc(sz*sizeof(*data));
         tell = (unsigned *)malloc((sz + 1)*sizeof(*tell));
         enc_method = (unsigned *)malloc(sz*sizeof(*enc_method));
-        ec_enc_init(&enc, ptr, DATA_SIZE2);
-        tell[0] = ec_tell_frac(&enc);
+        oaci_ec_enc_init(&enc, ptr, DATA_SIZE2);
+        tell[0] = oaci_ec_tell_frac(&enc);
         for (j = 0; j < sz; j++) {
             data[j] = rand()/((RAND_MAX>>1) + 1);
             logp1[j] = (rand()%15) + 1;
             enc_method[j] = rand()/((RAND_MAX>>2) + 1);
             switch (enc_method[j]) {
                 case 0: {
-                    ec_encode(&enc, data[j]?(1<<logp1[j]) - 1:0,
+                    oaci_ec_encode(&enc, data[j]?(1<<logp1[j]) - 1:0,
                         (1<<logp1[j]) - (data[j]?0:1), 1<<logp1[j]);
                 } break;
                 case 1: {
-                    ec_encode_bin(&enc, data[j]?(1<<logp1[j]) - 1:0,
+                    oaci_ec_encode_bin(&enc, data[j]?(1<<logp1[j]) - 1:0,
                         (1<<logp1[j]) - (data[j]?0:1), logp1[j]);
                 } break;
                 case 2: {
-                    ec_enc_bit_logp(&enc, data[j], logp1[j]);
+                    oaci_ec_enc_bit_logp(&enc, data[j], logp1[j]);
                 } break;
                 case 3: {
                     unsigned char icdf[2];
                     icdf[0] = 1;
                     icdf[1] = 0;
-                    ec_enc_icdf(&enc, data[j], icdf, logp1[j]);
+                    oaci_ec_enc_icdf(&enc, data[j], icdf, logp1[j]);
                 } break;
             }
-            tell[j + 1] = ec_tell_frac(&enc);
+            tell[j + 1] = oaci_ec_tell_frac(&enc);
         }
-        ec_enc_done(&enc);
+        oaci_ec_enc_done(&enc);
         if ((ec_tell(&enc) + 7U)/8U < ec_range_bytes(&enc)) {
             fprintf(stderr, "tell() lied, there's %i bytes instead of %d (Random seed: %u)\n",
        ec_range_bytes(&enc), (ec_tell(&enc) + 7)/8, seed);
             ret = -1;
         }
-        ec_dec_init(&dec, ptr, DATA_SIZE2);
-        if (ec_tell_frac(&dec) != tell[0]) {
+        oaci_ec_dec_init(&dec, ptr, DATA_SIZE2);
+        if (oaci_ec_tell_frac(&dec) != tell[0]) {
             fprintf(stderr,
        "Tell mismatch between encoder and decoder at symbol %i: %i instead of %i (Random seed: %u).\n",
-       0, ec_tell_frac(&dec), tell[0], seed);
+       0, oaci_ec_tell_frac(&dec), tell[0], seed);
         }
         for (j = 0; j < sz; j++) {
             int fs;
@@ -282,25 +282,25 @@ int main(int _argc, char **_argv) {
             dec_method = rand()/((RAND_MAX>>2) + 1);
             switch (dec_method) {
                 case 0: {
-                    fs = ec_decode(&dec, 1<<logp1[j]);
+                    fs = oaci_ec_decode(&dec, 1<<logp1[j]);
                     sym = fs >= (1<<logp1[j]) - 1;
-                    ec_dec_update(&dec, sym?(1<<logp1[j]) - 1:0,
+                    oaci_ec_dec_update(&dec, sym?(1<<logp1[j]) - 1:0,
                         (1<<logp1[j]) - (sym?0:1), 1<<logp1[j]);
                 } break;
                 case 1: {
-                    fs = ec_decode_bin(&dec, logp1[j]);
+                    fs = oaci_ec_decode_bin(&dec, logp1[j]);
                     sym = fs >= (1<<logp1[j]) - 1;
-                    ec_dec_update(&dec, sym?(1<<logp1[j]) - 1:0,
+                    oaci_ec_dec_update(&dec, sym?(1<<logp1[j]) - 1:0,
                         (1<<logp1[j]) - (sym?0:1), 1<<logp1[j]);
                 } break;
                 case 2: {
-                    sym = ec_dec_bit_logp(&dec, logp1[j]);
+                    sym = oaci_ec_dec_bit_logp(&dec, logp1[j]);
                 } break;
                 case 3: {
                     unsigned char icdf[2];
                     icdf[0] = 1;
                     icdf[1] = 0;
-                    sym = ec_dec_icdf(&dec, icdf, logp1[j]);
+                    sym = oaci_ec_dec_icdf(&dec, icdf, logp1[j]);
                 } break;
             }
             if (sym != data[j]) {
@@ -311,10 +311,10 @@ int main(int _argc, char **_argv) {
          enc_method[j], dec_method);
                 ret = -1;
             }
-            if (ec_tell_frac(&dec) != tell[j + 1]) {
+            if (oaci_ec_tell_frac(&dec) != tell[j + 1]) {
                 fprintf(stderr,
          "Tell mismatch between encoder and decoder at symbol %i: %i instead of %i (Random seed: %u).\n",
-         j + 1, ec_tell_frac(&dec), tell[j + 1], seed);
+         j + 1, oaci_ec_tell_frac(&dec), tell[j + 1], seed);
             }
         }
         free(enc_method);
@@ -322,57 +322,57 @@ int main(int _argc, char **_argv) {
         free(data);
         free(logp1);
     }
-    ec_enc_init(&enc, ptr, DATA_SIZE2);
-    ec_enc_bit_logp(&enc, 0, 1);
-    ec_enc_bit_logp(&enc, 0, 1);
-    ec_enc_bit_logp(&enc, 0, 1);
-    ec_enc_bit_logp(&enc, 0, 1);
-    ec_enc_bit_logp(&enc, 0, 2);
-    ec_enc_patch_initial_bits(&enc, 3, 2);
+    oaci_ec_enc_init(&enc, ptr, DATA_SIZE2);
+    oaci_ec_enc_bit_logp(&enc, 0, 1);
+    oaci_ec_enc_bit_logp(&enc, 0, 1);
+    oaci_ec_enc_bit_logp(&enc, 0, 1);
+    oaci_ec_enc_bit_logp(&enc, 0, 1);
+    oaci_ec_enc_bit_logp(&enc, 0, 2);
+    oaci_ec_enc_patch_initial_bits(&enc, 3, 2);
     if (enc.error) {
         fprintf(stderr, "patch_initial_bits failed");
         ret = -1;
     }
-    ec_enc_patch_initial_bits(&enc, 0, 5);
+    oaci_ec_enc_patch_initial_bits(&enc, 0, 5);
     if (!enc.error) {
         fprintf(stderr, "patch_initial_bits didn't fail when it should have");
         ret = -1;
     }
-    ec_enc_done(&enc);
+    oaci_ec_enc_done(&enc);
     if (ec_range_bytes(&enc) != 1 || ptr[0] != 192) {
         fprintf(stderr, "Got %d when expecting 192 for patch_initial_bits", ptr[0]);
         ret = -1;
     }
-    ec_enc_init(&enc, ptr, DATA_SIZE2);
-    ec_enc_bit_logp(&enc, 0, 1);
-    ec_enc_bit_logp(&enc, 0, 1);
-    ec_enc_bit_logp(&enc, 1, 6);
-    ec_enc_bit_logp(&enc, 0, 2);
-    ec_enc_patch_initial_bits(&enc, 0, 2);
+    oaci_ec_enc_init(&enc, ptr, DATA_SIZE2);
+    oaci_ec_enc_bit_logp(&enc, 0, 1);
+    oaci_ec_enc_bit_logp(&enc, 0, 1);
+    oaci_ec_enc_bit_logp(&enc, 1, 6);
+    oaci_ec_enc_bit_logp(&enc, 0, 2);
+    oaci_ec_enc_patch_initial_bits(&enc, 0, 2);
     if (enc.error) {
         fprintf(stderr, "patch_initial_bits failed");
         ret = -1;
     }
-    ec_enc_done(&enc);
+    oaci_ec_enc_done(&enc);
     if (ec_range_bytes(&enc) != 2 || ptr[0] != 63) {
         fprintf(stderr, "Got %d when expecting 63 for patch_initial_bits", ptr[0]);
         ret = -1;
     }
-    ec_enc_init(&enc, ptr, 2);
-    ec_enc_bit_logp(&enc, 0, 2);
+    oaci_ec_enc_init(&enc, ptr, 2);
+    oaci_ec_enc_bit_logp(&enc, 0, 2);
     for (i = 0; i < 48; i++) {
-        ec_enc_bits(&enc, 0, 1);
+        oaci_ec_enc_bits(&enc, 0, 1);
     }
-    ec_enc_done(&enc);
+    oaci_ec_enc_done(&enc);
     if (!enc.error) {
         fprintf(stderr, "Raw bits overfill didn't fail when it should have");
         ret = -1;
     }
-    ec_enc_init(&enc, ptr, 2);
+    oaci_ec_enc_init(&enc, ptr, 2);
     for (i = 0; i < 17; i++) {
-        ec_enc_bits(&enc, 0, 1);
+        oaci_ec_enc_bits(&enc, 0, 1);
     }
-    ec_enc_done(&enc);
+    oaci_ec_enc_done(&enc);
     if (!enc.error) {
         fprintf(stderr, "17 raw bits encoded in two bytes");
         ret = -1;
diff --git a/celt/tests/test_unit_laplace.c b/celt/tests/test_unit_laplace.c
index 185fd5091..8273d22af 100644
--- a/celt/tests/test_unit_laplace.c
+++ b/celt/tests/test_unit_laplace.c
@@ -57,7 +57,7 @@ int main(void) {
     int val[10000], decay[10000];
     ALLOC_STACK;
     ptr = (unsigned char *)malloc(DATA_SIZE);
-    ec_enc_init(&enc, ptr, DATA_SIZE);
+    oaci_ec_enc_init(&enc, ptr, DATA_SIZE);
 
     val[0] = 3; decay[0] = 6000;
     val[1] = 0; decay[1] = 5800;
@@ -67,15 +67,15 @@ int main(void) {
         decay[i] = rand()%11000 + 5000;
     }
     for (i = 0; i < 10000; i++)
-        ec_laplace_encode(&enc, &val[i],
+        oaci_ec_laplace_encode(&enc, &val[i],
             ec_laplace_get_start_freq(decay[i]), decay[i]);
 
-    ec_enc_done(&enc);
+    oaci_ec_enc_done(&enc);
 
-    ec_dec_init(&dec, ec_get_buffer(&enc), ec_range_bytes(&enc));
+    oaci_ec_dec_init(&dec, ec_get_buffer(&enc), ec_range_bytes(&enc));
 
     for (i = 0; i < 10000; i++) {
-        int d = ec_laplace_decode(&dec,
+        int d = oaci_ec_laplace_decode(&dec,
             ec_laplace_get_start_freq(decay[i]), decay[i]);
         if (d != val[i]) {
             fprintf (stderr, "Got %d instead of %d\n", d, val[i]);
diff --git a/celt/tests/test_unit_mathops.c b/celt/tests/test_unit_mathops.c
index dded70a3e..899dbc14c 100644
--- a/celt/tests/test_unit_mathops.c
+++ b/celt/tests/test_unit_mathops.c
@@ -58,7 +58,7 @@ void testdiv(void) {
     for (i = 1; i <= 327670; i++) {
         double prod;
         oac_val32 val;
-        val = celt_rcp(i);
+        val = oaci_celt_rcp(i);
 #ifdef FIXED_POINT
         prod = (1./32768./65526.)*val*i;
 #else
@@ -76,7 +76,7 @@ void testsqrt(void) {
     for (i = 1; i <= 1000000000; i++) {
         double ratio;
         oac_val16 val;
-        val = celt_sqrt(i);
+        val = oaci_celt_sqrt(i);
         ratio = val/sqrt(i);
         if (fabs(ratio - 1) > .0005 && fabs(val - sqrt(i)) > 2) {
             fprintf (stderr, "sqrt failed: sqrt(%d)=" WORD " (ratio = %f)\n", i, val, ratio);
@@ -93,16 +93,16 @@ void testbitexactcos(void) {
     last = min_d = 32767;
     for (i = 64; i <= 16320; i++) {
         oac_int32 d;
-        oac_int32 q = bitexact_cos(i);
+        oac_int32 q = oaci_bitexact_cos(i);
         chk ^= q*i;
         d = last - q;
         if (d > max_d) max_d = d;
         if (d < min_d) min_d = d;
         last = q;
     }
-    if ((chk != 89408644) || (max_d != 5) || (min_d != 0) || (bitexact_cos(64) != 32767)
-        || (bitexact_cos(16320) != 200) || (bitexact_cos(8192) != 23171)) {
-        fprintf (stderr, "bitexact_cos failed\n");
+    if ((chk != 89408644) || (max_d != 5) || (min_d != 0) || (oaci_bitexact_cos(64) != 32767)
+        || (oaci_bitexact_cos(16320) != 200) || (oaci_bitexact_cos(8192) != 23171)) {
+        fprintf (stderr, "oaci_bitexact_cos failed\n");
         ret = 1;
     }
 }
@@ -114,21 +114,21 @@ void testbitexactlog2tan(void) {
     last = min_d = 15059;
     for (i = 64; i < 8193; i++) {
         oac_int32 d;
-        oac_int32 mid = bitexact_cos(i);
-        oac_int32 side = bitexact_cos(16384 - i);
-        oac_int32 q = bitexact_log2tan(mid, side);
+        oac_int32 mid = oaci_bitexact_cos(i);
+        oac_int32 side = oaci_bitexact_cos(16384 - i);
+        oac_int32 q = oaci_bitexact_log2tan(mid, side);
         chk ^= q*i;
         d = last - q;
-        if (q != -1*bitexact_log2tan(side, mid))
+        if (q != -1*oaci_bitexact_log2tan(side, mid))
             fail = 1;
         if (d > max_d) max_d = d;
         if (d < min_d) min_d = d;
         last = q;
     }
     if ((chk != 15821257) || (max_d != 61) || (min_d != -2) || fail
-        || (bitexact_log2tan(32767, 200) != 15059) || (bitexact_log2tan(30274, 12540) != 2611)
-        || (bitexact_log2tan(23171, 23171) != 0)) {
-        fprintf (stderr, "bitexact_log2tan failed\n");
+        || (oaci_bitexact_log2tan(32767, 200) != 15059) || (oaci_bitexact_log2tan(30274, 12540) != 2611)
+        || (oaci_bitexact_log2tan(23171, 23171) != 0)) {
+        fprintf (stderr, "oaci_bitexact_log2tan failed\n");
         ret = 1;
     }
 }
@@ -368,21 +368,21 @@ void testrsqrt(void) {
     for (fx = 0.25; fx < 1.0f; fx += 0.007f) {
         x = DOUBLE_TO_FIX_INT(fx, 31);
         quantized_fx = FIX_INT_TO_DOUBLE(x, 31);
-        error = fabs(FIX_INT_TO_DOUBLE(celt_rsqrt_norm32(x), 29)
+        error = fabs(FIX_INT_TO_DOUBLE(oaci_celt_rsqrt_norm32(x), 29)
             - 1/sqrt((double)quantized_fx));
         if (max_error < error) {
             max_error = error;
         }
         if (error > error_threshold) {
             fprintf (stderr,
-                  "celt_rsqrt_norm32 failed: "
-                  "fabs((1/sqrt(x))-celt_rsqrt_norm32(x))>%15.25e "
+                  "oaci_celt_rsqrt_norm32 failed: "
+                  "fabs((1/sqrt(x))-oaci_celt_rsqrt_norm32(x))>%15.25e "
                   "(x = %f, error = %15.25e)\n",
                   error_threshold, quantized_fx, error);
             ret = 1;
         }
     }
-    fprintf (stdout, "celt_rsqrt_norm32 max_error: %.7e\n", max_error);
+    fprintf (stdout, "oaci_celt_rsqrt_norm32 max_error: %.7e\n", max_error);
 }
 
 void testsqrt32(void) {
@@ -391,12 +391,12 @@ void testsqrt32(void) {
     float two_LSBs = FIX_INT_TO_DOUBLE(2, 16);
     float relative_error_threshold;
     for (i = 0; i <= 1073741824 + 64; i++) {
-        absolute_error = fabs(sqrt(i) - FIX_INT_TO_DOUBLE(celt_sqrt32(i), 16));
+        absolute_error = fabs(sqrt(i) - FIX_INT_TO_DOUBLE(oaci_celt_sqrt32(i), 16));
         relative_error_threshold = 8e-8*sqrt(i);
         if (absolute_error > two_LSBs
             && absolute_error > relative_error_threshold) {
             fprintf(stderr,
-                 "celt_sqrt32 failed: "
+                 "oaci_celt_sqrt32 failed: "
                  "absolute_error: [%.5e > %.5e] "
                  "relative_error: [%.5e > %.5e] (x = %d)\n",
                  absolute_error, two_LSBs,
@@ -484,18 +484,18 @@ void test_cos_norm32(void) {
     for (fx = -1.0f; fx <= 1.0f; fx += 0.007f) {
         x = DOUBLE_TO_FIX_INT(fx, q_input);
         error = fabs(cos(1.5707963267948966*FIX_INT_TO_DOUBLE(x, q_input))
-            - FIX_INT_TO_DOUBLE(celt_cos_norm32(x), q_output));
+            - FIX_INT_TO_DOUBLE(oaci_celt_cos_norm32(x), q_output));
         if (error > max_error) {
             max_error = error;
         }
         if (error > error_threshold) {
             fprintf(stderr,
-                 "celt_cos_norm32 failed: error: [%.5e > %.5e] (x = %f)\n",
+                 "oaci_celt_cos_norm32 failed: error: [%.5e > %.5e] (x = %f)\n",
                  error, error_threshold, FIX_INT_TO_DOUBLE(x, DB_SHIFT));
             ret = 1;
         }
     }
-    fprintf(stdout, "celt_cos_norm32 max_error: %.7e\n", max_error);
+    fprintf(stdout, "oaci_celt_cos_norm32 max_error: %.7e\n", max_error);
 }
 
 void test_cos(void) {
@@ -519,7 +519,7 @@ void test_rcp_norm32(void) {
         quantized_fx = FIX_INT_TO_DOUBLE(x, q_input);
         ground_truth = 1/quantized_fx;
         absolute_error = fabs(ground_truth
-            - FIX_INT_TO_DOUBLE(celt_rcp_norm32(x), 30));
+            - FIX_INT_TO_DOUBLE(oaci_celt_rcp_norm32(x), 30));
         relative_error = absolute_error/ground_truth;
         if (max_relative_error < relative_error) {
             max_relative_error = relative_error;
@@ -527,7 +527,7 @@ void test_rcp_norm32(void) {
         if (absolute_error > two_LSBs
             && absolute_error > relative_error_threshold*ground_truth) {
             fprintf(stderr,
-                 "celt_rcp_norm32 failed: "
+                 "oaci_celt_rcp_norm32 failed: "
                  "absolute_error: [%.5e > %.5e] "
                  "relative_error: [%.5e > %.5e] (x = %f)\n",
                  absolute_error, two_LSBs,
@@ -535,7 +535,7 @@ void test_rcp_norm32(void) {
             ret = 1;
         }
     }
-    fprintf(stdout, "celt_rcp_norm32 max_rel_error: %.7e\n", max_relative_error);
+    fprintf(stdout, "oaci_celt_rcp_norm32 max_rel_error: %.7e\n", max_relative_error);
 }
 #endif
 
@@ -587,16 +587,16 @@ void testcelt_float2int16(int use_ref_impl, int buffer_size) {
     }
 
     if (use_ref_impl) {
-        celt_float2int16_c(floatsToConvert, results, cnt);
+        oaci_celt_float2int16_c(floatsToConvert, results, cnt);
     } else {
-        celt_float2int16(floatsToConvert, results, cnt, oac_select_arch());
+        oaci_celt_float2int16(floatsToConvert, results, cnt, oac_select_arch());
     }
 
     for (i = 0; i < cnt; ++i) {
         const float expected = FLOAT2INT16(floatsToConvert[i]);
         if (results[i] != expected) {
             fprintf (stderr,
-            "testcelt_float2int16 failed: celt_float2int16 converted %f (index: %d) to %d (x*32768=%f, expected: %d, cnt: %d, ref: %d)\n",
+            "testcelt_float2int16 failed: oaci_celt_float2int16 converted %f (index: %d) to %d (x*32768=%f, expected: %d, cnt: %d, ref: %d)\n",
                floatsToConvert[i], i, (int)results[i], floatsToConvert[i]*32768.0f, (int)expected, buffer_size,
             use_ref_impl);
             ret = 1;
diff --git a/celt/tests/test_unit_mdct.c b/celt/tests/test_unit_mdct.c
index 77b4aae3d..b7877a50c 100644
--- a/celt/tests/test_unit_mdct.c
+++ b/celt/tests/test_unit_mdct.c
@@ -113,7 +113,7 @@ void test1d(int nfft, int isinverse, int arch) {
     int shift = 0;
     const mdct_lookup *cfg;
     mdct_lookup _cfg;
-    clt_mdct_init(&_cfg, nfft, 0, arch);
+    oaci_clt_mdct_init(&_cfg, nfft, 0, arch);
     cfg = &_cfg;
 #else
     int shift;
@@ -156,13 +156,13 @@ void test1d(int nfft, int isinverse, int arch) {
     if (isinverse) {
         for (k = 0; k < nfft; ++k)
             out[k] = 0;
-        clt_mdct_backward(cfg, in, out, window, nfft/2, shift, 1, arch);
-        /* apply TDAC because clt_mdct_backward() no longer does that */
+        oaci_clt_mdct_backward(cfg, in, out, window, nfft/2, shift, 1, arch);
+        /* apply TDAC because oaci_clt_mdct_backward() no longer does that */
         for (k = 0; k < nfft/4; ++k)
             out[nfft - k - 1] = out[nfft/2 + k];
         check_inv(in, out, nfft, isinverse);
     } else {
-        clt_mdct_forward(cfg, in, out, window, nfft/2, shift, 1, arch);
+        oaci_clt_mdct_forward(cfg, in, out, window, nfft/2, shift, 1, arch);
         check(in_copy, out, nfft, isinverse);
     }
     /*for (k=0;k<nfft;++k) printf("%d %d ", out[k].r, out[k].i);printf("\n");*/
@@ -173,7 +173,7 @@ void test1d(int nfft, int isinverse, int arch) {
     free(out);
     free(window);
 #ifdef CUSTOM_MODES
-    clt_mdct_clear(&_cfg, arch);
+    oaci_clt_mdct_clear(&_cfg, arch);
 #endif
 }
 
diff --git a/celt/tests/test_unit_rotation.c b/celt/tests/test_unit_rotation.c
index e4ab76a48..c763b7e77 100644
--- a/celt/tests/test_unit_rotation.c
+++ b/celt/tests/test_unit_rotation.c
@@ -51,14 +51,14 @@ void test_rotation(int N, int K) {
     celt_norm x1[MAX_SIZE];
     for (i = 0; i < N; i++)
         x1[i] = x0[i] = rand()%16777215 - 8388608;
-    exp_rotation(x1, N, 1, 1, K, SPREAD_NORMAL);
+    oaci_exp_rotation(x1, N, 1, 1, K, SPREAD_NORMAL);
     for (i = 0; i < N; i++) {
         err += (x0[i] - (double)x1[i])*(x0[i] - (double)x1[i]);
         ener += x0[i]*(double)x0[i];
     }
     snr0 = 20*log10(ener/err);
     err = ener = 0;
-    exp_rotation(x1, N, -1, 1, K, SPREAD_NORMAL);
+    oaci_exp_rotation(x1, N, -1, 1, K, SPREAD_NORMAL);
     for (i = 0; i < N; i++) {
         err += (x0[i] - (double)x1[i])*(x0[i] - (double)x1[i]);
         ener += x0[i]*(double)x0[i];
diff --git a/celt/vq.c b/celt/vq.c
index 60bcfb2ce..5651629d0 100644
--- a/celt/vq.c
+++ b/celt/vq.c
@@ -40,28 +40,28 @@
 #include "pitch.h"
 
 #if defined(FIXED_POINT)
-void norm_scaleup(celt_norm *X, int N, int shift) {
+void oaci_norm_scaleup(celt_norm *X, int N, int shift) {
     int i;
     celt_assert(shift >= 0);
     if (shift <= 0) return;
     for (i = 0; i < N; i++) X[i] = SHL32(X[i], shift);
 }
 
-void norm_scaledown(celt_norm *X, int N, int shift) {
+void oaci_norm_scaledown(celt_norm *X, int N, int shift) {
     int i;
     celt_assert(shift >= 0);
     if (shift <= 0) return;
     for (i = 0; i < N; i++) X[i] = PSHR32(X[i], shift);
 }
 
-oac_val32 celt_inner_prod_norm(const celt_norm *x, const celt_norm *y, int len, int arch) {
+oac_val32 oaci_celt_inner_prod_norm(const celt_norm *x, const celt_norm *y, int len, int arch) {
     int i;
     oac_val32 sum = 0;
     (void)arch;
     for (i = 0; i < len; i++) sum += x[i]*y[i];
     return sum;
 }
-oac_val32 celt_inner_prod_norm_shift(const celt_norm *x, const celt_norm *y, int len, int arch) {
+oac_val32 oaci_celt_inner_prod_norm_shift(const celt_norm *x, const celt_norm *y, int len, int arch) {
     int i;
     oac_val64 sum = 0;
     (void)arch;
@@ -77,7 +77,7 @@ static void exp_rotation1(celt_norm *X, int len, int stride, oac_val16 c, oac_va
     celt_norm *Xptr;
     Xptr = X;
     ms = NEG16(s);
-    norm_scaledown(X, len, NORM_SHIFT - 14);
+    oaci_norm_scaledown(X, len, NORM_SHIFT - 14);
     for (i = 0; i < len - stride; i++) {
         celt_norm x1, x2;
         x1 = Xptr[0];
@@ -93,11 +93,11 @@ static void exp_rotation1(celt_norm *X, int len, int stride, oac_val16 c, oac_va
         Xptr[stride] = EXTRACT16(PSHR32(MAC16_16(MULT16_16(c, x2),  s, x1), 15));
         *Xptr--      = EXTRACT16(PSHR32(MAC16_16(MULT16_16(c, x1), ms, x2), 15));
     }
-    norm_scaleup(X, len, NORM_SHIFT - 14);
+    oaci_norm_scaleup(X, len, NORM_SHIFT - 14);
 }
 #endif /* OVERRIDE_vq_exp_rotation1 */
 
-void exp_rotation(celt_norm *X, int len, int dir, int stride, int K, int spread) {
+void oaci_exp_rotation(celt_norm *X, int len, int dir, int stride, int K, int spread) {
     static const int SPREAD_FACTOR[3] = {15, 10, 5};
     int i;
     oac_val16 c, s;
@@ -109,11 +109,11 @@ void exp_rotation(celt_norm *X, int len, int dir, int stride, int K, int spread)
         return;
     factor = SPREAD_FACTOR[spread - 1];
 
-    gain = celt_div((oac_val32)MULT16_16(Q15_ONE, len), (oac_val32)(len + factor*K));
+    gain = oaci_celt_div((oac_val32)MULT16_16(Q15_ONE, len), (oac_val32)(len + factor*K));
     theta = HALF16(MULT16_16_Q15(gain, gain));
 
-    c = celt_cos_norm(EXTEND32(theta));
-    s = celt_cos_norm(EXTEND32(SUB16(Q15ONE, theta))); /*  sin(theta) */
+    c = oaci_celt_cos_norm(EXTEND32(theta));
+    s = oaci_celt_cos_norm(EXTEND32(SUB16(Q15ONE, theta))); /*  sin(theta) */
 
     if (len >= 8*stride) {
         stride2 = 1;
@@ -152,7 +152,7 @@ static void normalise_residual(int * OAC_RESTRICT iy, celt_norm * OAC_RESTRICT X
     k = celt_ilog2(Ryy)>>1;
 #endif
     t = VSHR32(Ryy, 2*(k - 7) - 15);
-    g = MULT32_32_Q31(celt_rsqrt_norm32(t), gain);
+    g = MULT32_32_Q31(oaci_celt_rsqrt_norm32(t), gain);
     i = 0;
     (void)shift;
 #if defined(FIXED_POINT)
@@ -178,7 +178,7 @@ static unsigned extract_collapse_mask(int *iy, int N, int B) {
     if (B <= 1)
         return 1;
     /*NOTE: As a minor optimization, we could be passing around log2(B), not B, for both this and for
-       exp_rotation().*/
+       oaci_exp_rotation().*/
     N0 = celt_udiv(N, B);
     collapse_mask = 0;
     i = 0; do {
@@ -192,7 +192,7 @@ static unsigned extract_collapse_mask(int *iy, int N, int B) {
     return collapse_mask;
 }
 
-oac_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch) {
+oac_val16 oaci_op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch) {
     VARDECL(celt_norm, y);
     VARDECL(int, signx);
     int i, j;
@@ -207,9 +207,9 @@ oac_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch) {
     ALLOC(signx, N, int);
 #ifdef FIXED_POINT
     {
-        int shift = (celt_ilog2(1 + celt_inner_prod_norm_shift(X, X, N, arch)) + 1)/2;
+        int shift = (celt_ilog2(1 + oaci_celt_inner_prod_norm_shift(X, X, N, arch)) + 1)/2;
         shift = IMAX(0, shift + (NORM_SHIFT - 14) - 14);
-        norm_scaledown(X, N, shift);
+        oaci_norm_scaledown(X, N, shift);
     }
 #endif
     /* Get rid of the sign */
@@ -249,10 +249,10 @@ oac_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch) {
             sum = QCONST16(1.f, 14);
         }
 #ifdef FIXED_POINT
-        rcp = EXTRACT16(MULT16_32_Q16(K, celt_rcp(sum)));
+        rcp = EXTRACT16(MULT16_32_Q16(K, oaci_celt_rcp(sum)));
 #else
         /* Using K+e with e < 1 guarantees we cannot get more than K pulses. */
-        rcp = EXTRACT16(MULT16_32_Q16(K + 0.8f, celt_rcp(sum)));
+        rcp = EXTRACT16(MULT16_32_Q16(K + 0.8f, oaci_celt_rcp(sum)));
 #endif
         j = 0; do {
 #ifdef FIXED_POINT
@@ -361,28 +361,28 @@ oac_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch) {
 RESTORE_STACK;
 RESTORE_STACK;
 RESTORE_STACK;
-unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
+unsigned oaci_alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
                    oac_val32 gain, int resynth, int arch) {
     VARDECL(int, iy);
     oac_val32 yy;
     unsigned collapse_mask;
     SAVE_STACK;
 
-    celt_assert2(K > 0, "alg_quant() needs at least one pulse");
-    celt_assert2(N > 1, "alg_quant() needs at least two dimensions");
+    celt_assert2(K > 0, "oaci_alg_quant() needs at least one pulse");
+    celt_assert2(N > 1, "oaci_alg_quant() needs at least two dimensions");
 
     /* Covers vectorization by up to 4. */
     ALLOC(iy, N + 3, int);
 
-    exp_rotation(X, N, 1, B, K, spread);
+    oaci_exp_rotation(X, N, 1, B, K, spread);
 
-    yy = op_pvq_search(X, iy, K, N, arch);
+    yy = oaci_op_pvq_search(X, iy, K, N, arch);
     collapse_mask = extract_collapse_mask(iy, N, B);
-    encode_pulses(iy, N, K, enc);
+    oaci_encode_pulses(iy, N, K, enc);
     if (resynth) normalise_residual(iy, X, N, yy, gain, 0);
 
     if (resynth)
-        exp_rotation(X, N, -1, B, K, spread);
+        oaci_exp_rotation(X, N, -1, B, K, spread);
 
     RESTORE_STACK;
     return collapse_mask;
@@ -390,7 +390,7 @@ unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
 
 /** Decode pulse vector and combine the result with the pitch vector to produce
     the final normalised signal in the current band. */
-unsigned alg_unquant(celt_norm *X, int N, int K, int spread, int B,
+unsigned oaci_alg_unquant(celt_norm *X, int N, int K, int spread, int B,
                      ec_dec *dec, oac_val32 gain) {
     oac_val32 Ryy;
     unsigned collapse_mask;
@@ -398,19 +398,19 @@ unsigned alg_unquant(celt_norm *X, int N, int K, int spread, int B,
     int yy_shift = 0;
     SAVE_STACK;
 
-    celt_assert2(K > 0, "alg_unquant() needs at least one pulse");
-    celt_assert2(N > 1, "alg_unquant() needs at least two dimensions");
+    celt_assert2(K > 0, "oaci_alg_unquant() needs at least one pulse");
+    celt_assert2(N > 1, "oaci_alg_unquant() needs at least two dimensions");
     ALLOC(iy, N, int);
-    Ryy = decode_pulses(iy, N, K, dec);
+    Ryy = oaci_decode_pulses(iy, N, K, dec);
     normalise_residual(iy, X, N, Ryy, gain, yy_shift);
-    exp_rotation(X, N, -1, B, K, spread);
+    oaci_exp_rotation(X, N, -1, B, K, spread);
     collapse_mask = extract_collapse_mask(iy, N, B);
     RESTORE_STACK;
     return collapse_mask;
 }
 
-#ifndef OVERRIDE_renormalise_vector
-void renormalise_vector(celt_norm *X, int N, oac_val32 gain, int arch) {
+#ifndef OVERRIDE_oaci_renormalise_vector
+void oaci_renormalise_vector(celt_norm *X, int N, oac_val32 gain, int arch) {
     int i;
 # ifdef FIXED_POINT
     int k;
@@ -419,25 +419,25 @@ void renormalise_vector(celt_norm *X, int N, oac_val32 gain, int arch) {
     oac_val16 g;
     oac_val32 t;
     celt_norm *xptr;
-    norm_scaledown(X, N, NORM_SHIFT - 14);
-    E = EPSILON + celt_inner_prod_norm(X, X, N, arch);
+    oaci_norm_scaledown(X, N, NORM_SHIFT - 14);
+    E = EPSILON + oaci_celt_inner_prod_norm(X, X, N, arch);
 # ifdef FIXED_POINT
     k = celt_ilog2(E)>>1;
 # endif
     t = VSHR32(E, 2*(k - 7));
-    g = MULT32_32_Q31(celt_rsqrt_norm(t), gain);
+    g = MULT32_32_Q31(oaci_celt_rsqrt_norm(t), gain);
 
     xptr = X;
     for (i = 0; i < N; i++) {
         *xptr = EXTRACT16(PSHR32(MULT16_16(g, *xptr), k + 15 - 14));
         xptr++;
     }
-    norm_scaleup(X, N, NORM_SHIFT - 14);
-    /*return celt_sqrt(E);*/
+    oaci_norm_scaleup(X, N, NORM_SHIFT - 14);
+    /*return oaci_celt_sqrt(E);*/
 }
-#endif /* OVERRIDE_renormalise_vector */
+#endif /* OVERRIDE_oaci_renormalise_vector */
 
-oac_int32 stereo_itheta(const celt_norm *X, const celt_norm *Y, int stereo, int N, int arch) {
+oac_int32 oaci_stereo_itheta(const celt_norm *X, const celt_norm *Y, int stereo, int N, int arch) {
     int i;
     int itheta;
     oac_val32 mid, side;
@@ -453,11 +453,11 @@ oac_int32 stereo_itheta(const celt_norm *X, const celt_norm *Y, int stereo, int
             Eside = MAC16_16(Eside, s, s);
         }
     } else {
-        Emid += celt_inner_prod_norm_shift(X, X, N, arch);
-        Eside += celt_inner_prod_norm_shift(Y, Y, N, arch);
+        Emid += oaci_celt_inner_prod_norm_shift(X, X, N, arch);
+        Eside += oaci_celt_inner_prod_norm_shift(Y, Y, N, arch);
     }
-    mid = celt_sqrt32(Emid);
-    side = celt_sqrt32(Eside);
+    mid = oaci_celt_sqrt32(Emid);
+    side = oaci_celt_sqrt32(Eside);
 #if defined(FIXED_POINT)
     itheta = celt_atan2p_norm(side, mid);
 #else
@@ -484,7 +484,7 @@ static void cubic_synthesis(celt_norm *X, int *iy, int N, int K, int face, int s
     }
 #ifdef FIXED_POINT
     sum_shift = (29 - celt_ilog2(sum))>>1;
-    mag = celt_rsqrt_norm32(SHL32(sum, 2*sum_shift + 1));
+    mag = oaci_celt_rsqrt_norm32(SHL32(sum, 2*sum_shift + 1));
     for (i = 0; i < N; i++) {
         X[i] = VSHR32(MULT16_32_Q15(X[i], MULT32_32_Q31(mag, gain)), shift - sum_shift + 29 - NORM_SHIFT);
     }
@@ -496,7 +496,7 @@ static void cubic_synthesis(celt_norm *X, int *iy, int N, int K, int face, int s
 #endif
 }
 
-unsigned cubic_quant(celt_norm *X, int N, int res, int B, ec_enc *enc, oac_val32 gain, int resynth) {
+unsigned oaci_cubic_quant(celt_norm *X, int N, int res, int B, ec_enc *enc, oac_val32 gain, int resynth) {
     int i;
     int face = 0;
     int K;
@@ -521,12 +521,12 @@ unsigned cubic_quant(celt_norm *X, int N, int res, int B, ec_enc *enc, oac_val32
         }
     }
     sign = X[face] < 0;
-    ec_enc_uint(enc, face, N);
-    ec_enc_bits(enc, sign, 1);
+    oaci_ec_enc_uint(enc, face, N);
+    oaci_ec_enc_bits(enc, sign, 1);
 #ifdef FIXED_POINT
     if (faceval != 0) {
         int face_shift = 30 - celt_ilog2(faceval);
-        norm = celt_rcp_norm32(SHL32(faceval, face_shift));
+        norm = oaci_celt_rcp_norm32(SHL32(faceval, face_shift));
         norm = MULT16_32_Q15(K, norm);
         for (i = 0; i < N; i++) {
             /* By computing X[i]+faceval inside the shift, the result is guaranteed non-negative. */
@@ -542,7 +542,7 @@ unsigned cubic_quant(celt_norm *X, int N, int res, int B, ec_enc *enc, oac_val32
     }
 #endif
     for (i = 0; i < N; i++) {
-        if (i != face) ec_enc_bits(enc, iy[i], res);
+        if (i != face) oaci_ec_enc_bits(enc, iy[i], res);
     }
     if (resynth) {
         cubic_synthesis(X, iy, N, K, face, sign, gain);
@@ -551,7 +551,7 @@ unsigned cubic_quant(celt_norm *X, int N, int res, int B, ec_enc *enc, oac_val32
     return (1<<B) - 1;
 }
 
-unsigned cubic_unquant(celt_norm *X, int N, int res, int B, ec_dec *dec, oac_val32 gain) {
+unsigned oaci_cubic_unquant(celt_norm *X, int N, int res, int B, ec_dec *dec, oac_val32 gain) {
     int i;
     int face;
     int sign;
@@ -567,10 +567,10 @@ unsigned cubic_unquant(celt_norm *X, int N, int res, int B, ec_dec *dec, oac_val
         RESTORE_STACK;
         return 0;
     }
-    face = ec_dec_uint(dec, N);
-    sign = ec_dec_bits(dec, 1);
+    face = oaci_ec_dec_uint(dec, N);
+    sign = oaci_ec_dec_bits(dec, 1);
     for (i = 0; i < N; i++) {
-        if (i != face) iy[i] = ec_dec_bits(dec, res);
+        if (i != face) iy[i] = oaci_ec_dec_bits(dec, res);
     }
     iy[face] = 0;
     cubic_synthesis(X, iy, N, K, face, sign, gain);
diff --git a/celt/vq.h b/celt/vq.h
index 55d1bc369..c76c46308 100644
--- a/celt/vq.h
+++ b/celt/vq.h
@@ -42,26 +42,26 @@
 #endif
 
 #if defined(FIXED_POINT)
-oac_val32 celt_inner_prod_norm(const celt_norm *x, const celt_norm *y, int len, int arch);
-oac_val32 celt_inner_prod_norm_shift(const celt_norm *x, const celt_norm *y, int len, int arch);
+oac_val32 oaci_celt_inner_prod_norm(const celt_norm *x, const celt_norm *y, int len, int arch);
+oac_val32 oaci_celt_inner_prod_norm_shift(const celt_norm *x, const celt_norm *y, int len, int arch);
 
-void norm_scaleup(celt_norm *X, int N, int shift);
-void norm_scaledown(celt_norm *X, int N, int shift);
+void oaci_norm_scaleup(celt_norm *X, int N, int shift);
+void oaci_norm_scaledown(celt_norm *X, int N, int shift);
 
 #else
-# define celt_inner_prod_norm celt_inner_prod
-# define celt_inner_prod_norm_shift celt_inner_prod
-# define norm_scaleup(X, N, shift)
-# define norm_scaledown(X, N, shift)
+# define oaci_celt_inner_prod_norm oaci_celt_inner_prod
+# define oaci_celt_inner_prod_norm_shift oaci_celt_inner_prod
+# define oaci_norm_scaleup(X, N, shift)
+# define oaci_norm_scaledown(X, N, shift)
 #endif
 
-void exp_rotation(celt_norm *X, int len, int dir, int stride, int K, int spread);
+void oaci_exp_rotation(celt_norm *X, int len, int dir, int stride, int K, int spread);
 
-oac_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch);
+oac_val16 oaci_op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch);
 
 #if !defined(OVERRIDE_OP_PVQ_SEARCH)
-# define op_pvq_search(x, iy, K, N, arch) \
-        (op_pvq_search_c(x, iy, K, N, arch))
+# define oaci_op_pvq_search(x, iy, K, N, arch) \
+        (oaci_op_pvq_search_c(x, iy, K, N, arch))
 #endif
 
 /** Algebraic pulse-vector quantiser. The signal x is replaced by the sum of
@@ -73,7 +73,7 @@ oac_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch);
  * @param enc Entropy encoder state
  * @ret A mask indicating which blocks in the band received pulses
  */
-unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
+unsigned oaci_alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
     oac_val32 gain, int resynth, int arch);
 
 /** Algebraic pulse decoder
@@ -83,14 +83,14 @@ unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
  * @param dec Entropy decoder state
  * @ret A mask indicating which blocks in the band received pulses
  */
-unsigned alg_unquant(celt_norm *X, int N, int K, int spread, int B,
+unsigned oaci_alg_unquant(celt_norm *X, int N, int K, int spread, int B,
     ec_dec *dec, oac_val32 gain);
 
-void renormalise_vector(celt_norm *X, int N, oac_val32 gain, int arch);
+void oaci_renormalise_vector(celt_norm *X, int N, oac_val32 gain, int arch);
 
-oac_int32 stereo_itheta(const celt_norm *X, const celt_norm *Y, int stereo, int N, int arch);
+oac_int32 oaci_stereo_itheta(const celt_norm *X, const celt_norm *Y, int stereo, int N, int arch);
 
-unsigned cubic_quant(celt_norm *X, int N, int K, int B, ec_enc *enc, oac_val32 gain, int resynth);
-unsigned cubic_unquant(celt_norm *X, int N, int K, int B, ec_dec *dec, oac_val32 gain);
+unsigned oaci_cubic_quant(celt_norm *X, int N, int K, int B, ec_enc *enc, oac_val32 gain, int resynth);
+unsigned oaci_cubic_unquant(celt_norm *X, int N, int K, int B, ec_dec *dec, oac_val32 gain);
 
 #endif /* VQ_H */
diff --git a/celt/x86/celt_lpc_sse.h b/celt/x86/celt_lpc_sse.h
index 4eac33018..cfee3b951 100644
--- a/celt/x86/celt_lpc_sse.h
+++ b/celt/x86/celt_lpc_sse.h
@@ -34,7 +34,7 @@
 
 #if defined(OAC_X86_MAY_HAVE_SSE4_1) && defined(FIXED_POINT)
 
-void celt_fir_sse4_1(
+void oaci_celt_fir_sse4_1(
     const oac_val16 *x,
     const oac_val16 *num,
     oac_val16 *y,
@@ -44,12 +44,12 @@ void celt_fir_sse4_1(
 
 # if defined(OAC_X86_PRESUME_SSE4_1)
 #  define OVERRIDE_CELT_FIR
-#  define celt_fir(x, num, y, N, ord, arch) \
-        ((void)arch, celt_fir_sse4_1(x, num, y, N, ord, arch))
+#  define oaci_celt_fir(x, num, y, N, ord, arch) \
+        ((void)arch, oaci_celt_fir_sse4_1(x, num, y, N, ord, arch))
 
 # elif defined(OAC_HAVE_RTCD)
 
-extern void (*const CELT_FIR_IMPL[OAC_ARCHMASK + 1])(
+extern void (*const oaci_CELT_FIR_IMPL[OAC_ARCHMASK + 1])(
          const oac_val16 *x,
          const oac_val16 *num,
          oac_val16 *y,
@@ -58,8 +58,8 @@ extern void (*const CELT_FIR_IMPL[OAC_ARCHMASK + 1])(
          int arch);
 
 #  define OVERRIDE_CELT_FIR
-#  define celt_fir(x, num, y, N, ord, arch) \
-        ((*CELT_FIR_IMPL[(arch)&OAC_ARCHMASK])(x, num, y, N, ord, arch))
+#  define oaci_celt_fir(x, num, y, N, ord, arch) \
+        ((*oaci_CELT_FIR_IMPL[(arch)&OAC_ARCHMASK])(x, num, y, N, ord, arch))
 
 # endif
 #endif
diff --git a/celt/x86/celt_lpc_sse4_1.c b/celt/x86/celt_lpc_sse4_1.c
index 851e6f4ec..b075bd783 100644
--- a/celt/x86/celt_lpc_sse4_1.c
+++ b/celt/x86/celt_lpc_sse4_1.c
@@ -40,7 +40,7 @@
 
 #if defined(FIXED_POINT)
 
-void celt_fir_sse4_1(const oac_val16 *x,
+void oaci_celt_fir_sse4_1(const oac_val16 *x,
                      const oac_val16 *num,
                      oac_val16 *y,
                      int N,
@@ -65,9 +65,9 @@ void celt_fir_sse4_1(const oac_val16 *x,
 # if defined(OAC_CHECK_ASM)
         {
             oac_val32 sums_c[4] = {0};
-            xcorr_kernel_c(rnum, x + i - ord, sums_c, ord);
+            oaci_xcorr_kernel_c(rnum, x + i - ord, sums_c, ord);
 # endif
-        xcorr_kernel(rnum, x + i - ord, sums, ord, arch);
+        oaci_xcorr_kernel(rnum, x + i - ord, sums, ord, arch);
 # if defined(OAC_CHECK_ASM)
         celt_assert(memcmp(sums, sums_c, sizeof(sums)) == 0);
     }
diff --git a/celt/x86/pitch_avx.c b/celt/x86/pitch_avx.c
index 672d842e0..f480cb32c 100644
--- a/celt/x86/pitch_avx.c
+++ b/celt/x86/pitch_avx.c
@@ -35,8 +35,8 @@
 
 #if defined(OAC_X86_MAY_HAVE_AVX2) && !defined(FIXED_POINT)
 
-/* Like the "regular" xcorr_kernel(), but computes 8 results at a time. */
-static void xcorr_kernel_avx(const float *x, const float *y, float sum[8], int len) {
+/* Like the "regular" oaci_xcorr_kernel(), but computes 8 results at a time. */
+static void oaci_xcorr_kernel_avx(const float *x, const float *y, float sum[8], int len) {
     __m256 xsum0, xsum1, xsum2, xsum3, xsum4, xsum5, xsum6, xsum7;
     xsum7 = xsum6 = xsum5 = xsum4 = xsum3 = xsum2 = xsum1 = xsum0 = _mm256_setzero_ps();
     int i;
@@ -81,15 +81,15 @@ static void xcorr_kernel_avx(const float *x, const float *y, float sum[8], int l
     _mm256_storeu_ps(sum, xsum0);
 }
 
-void celt_pitch_xcorr_avx2(const float *_x, const float *_y, float *xcorr, int len, int max_pitch, int arch) {
+void oaci_celt_pitch_xcorr_avx2(const float *_x, const float *_y, float *xcorr, int len, int max_pitch, int arch) {
     int i;
     celt_assert(max_pitch > 0);
     (void)arch;
     for (i = 0; i < max_pitch - 7; i += 8) {
-        xcorr_kernel_avx(_x, _y + i, &xcorr[i], len);
+        oaci_xcorr_kernel_avx(_x, _y + i, &xcorr[i], len);
     }
     for (; i < max_pitch; i++) {
-        xcorr[i] = celt_inner_prod(_x, _y + i, len, arch);
+        xcorr[i] = oaci_celt_inner_prod(_x, _y + i, len, arch);
     }
 }
 
diff --git a/celt/x86/pitch_sse.c b/celt/x86/pitch_sse.c
index 8fa47d330..103949956 100644
--- a/celt/x86/pitch_sse.c
+++ b/celt/x86/pitch_sse.c
@@ -40,7 +40,7 @@
 # include <xmmintrin.h>
 # include "arch.h"
 
-void xcorr_kernel_sse(const oac_val16 *x, const oac_val16 *y, oac_val32 sum[4], int len) {
+void oaci_xcorr_kernel_sse(const oac_val16 *x, const oac_val16 *y, oac_val32 sum[4], int len) {
     int j;
     __m128 xsum1, xsum2;
     xsum1 = _mm_loadu_ps(sum);
@@ -71,7 +71,7 @@ void xcorr_kernel_sse(const oac_val16 *x, const oac_val16 *y, oac_val32 sum[4],
 }
 
 
-void dual_inner_prod_sse(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
+void oaci_dual_inner_prod_sse(const oac_val16 *x, const oac_val16 *y01, const oac_val16 *y02,
                          int N, oac_val32 *xy1, oac_val32 *xy2) {
     int i;
     __m128 xsum1, xsum2;
@@ -97,7 +97,7 @@ void dual_inner_prod_sse(const oac_val16 *x, const oac_val16 *y01, const oac_val
     }
 }
 
-oac_val32 celt_inner_prod_sse(const oac_val16 *x, const oac_val16 *y,
+oac_val32 oaci_celt_inner_prod_sse(const oac_val16 *x, const oac_val16 *y,
                               int N) {
     int i;
     float xy;
@@ -119,7 +119,7 @@ oac_val32 celt_inner_prod_sse(const oac_val16 *x, const oac_val16 *y,
     return xy;
 }
 
-void comb_filter_const_sse(oac_val32 *y, oac_val32 *x, int T, int N,
+void oaci_comb_filter_const_sse(oac_val32 *y, oac_val32 *x, int T, int N,
                            oac_val16 g10, oac_val16 g11, oac_val16 g12) {
     int i;
     __m128 x0v;
diff --git a/celt/x86/pitch_sse.h b/celt/x86/pitch_sse.h
index da0988dd4..065ce0944 100644
--- a/celt/x86/pitch_sse.h
+++ b/celt/x86/pitch_sse.h
@@ -38,7 +38,7 @@
 #endif
 
 #if defined(OAC_X86_MAY_HAVE_SSE4_1) && defined(FIXED_POINT)
-void xcorr_kernel_sse4_1(
+void oaci_xcorr_kernel_sse4_1(
     const oac_int16 *x,
     const oac_int16 *y,
     oac_val32 sum[4],
@@ -46,7 +46,7 @@ void xcorr_kernel_sse4_1(
 #endif
 
 #if defined(OAC_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)
-void xcorr_kernel_sse(
+void oaci_xcorr_kernel_sse(
     const oac_val16 *x,
     const oac_val16 *y,
     oac_val32 sum[4],
@@ -55,45 +55,45 @@ void xcorr_kernel_sse(
 
 #if defined(OAC_X86_PRESUME_SSE4_1) && defined(FIXED_POINT)
 # define OVERRIDE_XCORR_KERNEL
-# define xcorr_kernel(x, y, sum, len, arch) \
-        ((void)arch, xcorr_kernel_sse4_1(x, y, sum, len))
+# define oaci_xcorr_kernel(x, y, sum, len, arch) \
+        ((void)arch, oaci_xcorr_kernel_sse4_1(x, y, sum, len))
 
 #elif defined(OAC_X86_PRESUME_SSE) && !defined(FIXED_POINT)
 # define OVERRIDE_XCORR_KERNEL
-# define xcorr_kernel(x, y, sum, len, arch) \
-        ((void)arch, xcorr_kernel_sse(x, y, sum, len))
+# define oaci_xcorr_kernel(x, y, sum, len, arch) \
+        ((void)arch, oaci_xcorr_kernel_sse(x, y, sum, len))
 
 #elif defined(OAC_HAVE_RTCD) &&  ((defined(OAC_X86_MAY_HAVE_SSE4_1) && defined(FIXED_POINT)) \
     || (defined(OAC_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)))
 
-extern void (*const XCORR_KERNEL_IMPL[OAC_ARCHMASK + 1])(
+extern void (*const oaci_XCORR_KERNEL_IMPL[OAC_ARCHMASK + 1])(
                     const oac_val16 *x,
                     const oac_val16 *y,
                     oac_val32 sum[4],
                     int len);
 
 # define OVERRIDE_XCORR_KERNEL
-# define xcorr_kernel(x, y, sum, len, arch) \
-        ((*XCORR_KERNEL_IMPL[(arch)&OAC_ARCHMASK])(x, y, sum, len))
+# define oaci_xcorr_kernel(x, y, sum, len, arch) \
+        ((*oaci_XCORR_KERNEL_IMPL[(arch)&OAC_ARCHMASK])(x, y, sum, len))
 
 #endif
 
 #if defined(OAC_X86_MAY_HAVE_SSE4_1) && defined(FIXED_POINT)
-oac_val32 celt_inner_prod_sse4_1(
+oac_val32 oaci_celt_inner_prod_sse4_1(
     const oac_int16 *x,
     const oac_int16 *y,
     int N);
 #endif
 
 #if defined(OAC_X86_MAY_HAVE_SSE2) && defined(FIXED_POINT)
-oac_val32 celt_inner_prod_sse2(
+oac_val32 oaci_celt_inner_prod_sse2(
     const oac_int16 *x,
     const oac_int16 *y,
     int N);
 #endif
 
 #if defined(OAC_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)
-oac_val32 celt_inner_prod_sse(
+oac_val32 oaci_celt_inner_prod_sse(
     const oac_val16 *x,
     const oac_val16 *y,
     int N);
@@ -102,45 +102,45 @@ oac_val32 celt_inner_prod_sse(
 
 #if defined(OAC_X86_PRESUME_SSE4_1) && defined(FIXED_POINT)
 # define OVERRIDE_CELT_INNER_PROD
-# define celt_inner_prod(x, y, N, arch) \
-        ((void)arch, celt_inner_prod_sse4_1(x, y, N))
+# define oaci_celt_inner_prod(x, y, N, arch) \
+        ((void)arch, oaci_celt_inner_prod_sse4_1(x, y, N))
 
 #elif defined(OAC_X86_PRESUME_SSE2) && defined(FIXED_POINT) && !defined(OAC_X86_MAY_HAVE_SSE4_1)
 # define OVERRIDE_CELT_INNER_PROD
-# define celt_inner_prod(x, y, N, arch) \
-        ((void)arch, celt_inner_prod_sse2(x, y, N))
+# define oaci_celt_inner_prod(x, y, N, arch) \
+        ((void)arch, oaci_celt_inner_prod_sse2(x, y, N))
 
 #elif defined(OAC_X86_PRESUME_SSE) && !defined(FIXED_POINT)
 # define OVERRIDE_CELT_INNER_PROD
-# define celt_inner_prod(x, y, N, arch) \
-        ((void)arch, celt_inner_prod_sse(x, y, N))
+# define oaci_celt_inner_prod(x, y, N, arch) \
+        ((void)arch, oaci_celt_inner_prod_sse(x, y, N))
 
 
 #elif defined(OAC_HAVE_RTCD) && (((defined(OAC_X86_MAY_HAVE_SSE4_1) || defined(OAC_X86_MAY_HAVE_SSE2)) \
     && defined(FIXED_POINT)) || \
     (defined(OAC_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)))
 
-extern oac_val32 (*const CELT_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(
+extern oac_val32 (*const oaci_CELT_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(
                     const oac_val16 *x,
                     const oac_val16 *y,
                     int N);
 
 # define OVERRIDE_CELT_INNER_PROD
-# define celt_inner_prod(x, y, N, arch) \
-        ((*CELT_INNER_PROD_IMPL[(arch)&OAC_ARCHMASK])(x, y, N))
+# define oaci_celt_inner_prod(x, y, N, arch) \
+        ((*oaci_CELT_INNER_PROD_IMPL[(arch)&OAC_ARCHMASK])(x, y, N))
 
 #endif
 
 #if defined(OAC_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT)
 
-void dual_inner_prod_sse(const oac_val16 *x,
+void oaci_dual_inner_prod_sse(const oac_val16 *x,
     const oac_val16 *y01,
     const oac_val16 *y02,
     int N,
     oac_val32       *xy1,
     oac_val32       *xy2);
 
-void comb_filter_const_sse(oac_val32 *y,
+void oaci_comb_filter_const_sse(oac_val32 *y,
     oac_val32 *x,
     int T,
     int N,
@@ -152,11 +152,11 @@ void comb_filter_const_sse(oac_val32 *y,
 # if defined(OAC_X86_PRESUME_SSE)
 #  define OVERRIDE_DUAL_INNER_PROD
 #  define OVERRIDE_COMB_FILTER_CONST
-#  define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) \
-        ((void)(arch), dual_inner_prod_sse(x, y01, y02, N, xy1, xy2))
+#  define oaci_dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) \
+        ((void)(arch), oaci_dual_inner_prod_sse(x, y01, y02, N, xy1, xy2))
 
-#  define comb_filter_const(y, x, T, N, g10, g11, g12, arch) \
-        ((void)(arch), comb_filter_const_sse(y, x, T, N, g10, g11, g12))
+#  define oaci_comb_filter_const(y, x, T, N, g10, g11, g12, arch) \
+        ((void)(arch), oaci_comb_filter_const_sse(y, x, T, N, g10, g11, g12))
 # elif defined(OAC_HAVE_RTCD)
 
 #  define OVERRIDE_DUAL_INNER_PROD
@@ -169,7 +169,7 @@ extern void (*const DUAL_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(
               oac_val32       *xy1,
               oac_val32       *xy2);
 
-#  define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) \
+#  define oaci_dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) \
         ((*DUAL_INNER_PROD_IMPL[(arch)&OAC_ARCHMASK])(x, y01, y02, N, xy1, xy2))
 
 extern void (*const COMB_FILTER_CONST_IMPL[OAC_ARCHMASK + 1])(
@@ -181,24 +181,24 @@ extern void (*const COMB_FILTER_CONST_IMPL[OAC_ARCHMASK + 1])(
               oac_val16 g11,
               oac_val16 g12);
 
-#  define comb_filter_const(y, x, T, N, g10, g11, g12, arch) \
+#  define oaci_comb_filter_const(y, x, T, N, g10, g11, g12, arch) \
         ((*COMB_FILTER_CONST_IMPL[(arch)&OAC_ARCHMASK])(y, x, T, N, g10, g11, g12))
 
 #  define NON_STATIC_COMB_FILTER_CONST_C
 
 # endif
 
-void celt_pitch_xcorr_avx2(const float *_x, const float *_y, float *xcorr, int len, int max_pitch, int arch);
+void oaci_celt_pitch_xcorr_avx2(const float *_x, const float *_y, float *xcorr, int len, int max_pitch, int arch);
 
 # if defined(OAC_X86_PRESUME_AVX2)
 
 #  define OVERRIDE_PITCH_XCORR
-#  define celt_pitch_xcorr celt_pitch_xcorr_avx2
+#  define oaci_celt_pitch_xcorr oaci_celt_pitch_xcorr_avx2
 
 # elif defined(OAC_HAVE_RTCD) && defined(OAC_X86_MAY_HAVE_AVX2)
 
 #  define OVERRIDE_PITCH_XCORR
-extern void (*const PITCH_XCORR_IMPL[OAC_ARCHMASK + 1])(
+extern void (*const oaci_PITCH_XCORR_IMPL[OAC_ARCHMASK + 1])(
               const float *_x,
               const float *_y,
               float *xcorr,
@@ -207,8 +207,8 @@ extern void (*const PITCH_XCORR_IMPL[OAC_ARCHMASK + 1])(
               int arch
     );
 
-#  define celt_pitch_xcorr(_x, _y, xcorr, len, max_pitch, arch) \
-        ((*PITCH_XCORR_IMPL[(arch)&OAC_ARCHMASK])(_x, _y, xcorr, len, max_pitch, arch))
+#  define oaci_celt_pitch_xcorr(_x, _y, xcorr, len, max_pitch, arch) \
+        ((*oaci_PITCH_XCORR_IMPL[(arch)&OAC_ARCHMASK])(_x, _y, xcorr, len, max_pitch, arch))
 
 
 # endif /* OAC_X86_PRESUME_AVX2 && !OAC_HAVE_RTCD */
diff --git a/celt/x86/pitch_sse2.c b/celt/x86/pitch_sse2.c
index 800d15e92..624f8b34a 100644
--- a/celt/x86/pitch_sse2.c
+++ b/celt/x86/pitch_sse2.c
@@ -39,7 +39,7 @@
 #include "pitch.h"
 
 #if defined(OAC_X86_MAY_HAVE_SSE2) && defined(FIXED_POINT)
-oac_val32 celt_inner_prod_sse2(const oac_val16 *x, const oac_val16 *y,
+oac_val32 oaci_celt_inner_prod_sse2(const oac_val16 *x, const oac_val16 *y,
                                int N) {
     oac_int i, dataSize16;
     oac_int32 sum;
diff --git a/celt/x86/pitch_sse4_1.c b/celt/x86/pitch_sse4_1.c
index 5d03705f2..a1215bb55 100644
--- a/celt/x86/pitch_sse4_1.c
+++ b/celt/x86/pitch_sse4_1.c
@@ -42,7 +42,7 @@
 # include <smmintrin.h>
 # include "x86cpu.h"
 
-oac_val32 celt_inner_prod_sse4_1(const oac_val16 *x, const oac_val16 *y,
+oac_val32 oaci_celt_inner_prod_sse4_1(const oac_val16 *x, const oac_val16 *y,
                                  int N) {
     oac_int i, dataSize16;
     oac_int32 sum;
@@ -104,7 +104,7 @@ oac_val32 celt_inner_prod_sse4_1(const oac_val16 *x, const oac_val16 *y,
     return sum;
 }
 
-void xcorr_kernel_sse4_1(const oac_val16 * x, const oac_val16 * y, oac_val32 sum[ 4 ], int len) {
+void oaci_xcorr_kernel_sse4_1(const oac_val16 * x, const oac_val16 * y, oac_val32 sum[ 4 ], int len) {
     int j;
 
     __m128i vecX, vecX0, vecX1, vecX2, vecX3;
@@ -117,7 +117,7 @@ void xcorr_kernel_sse4_1(const oac_val16 * x, const oac_val16 * y, oac_val32 sum
     for (j = 0; j < 4; j++) {
         sum_c[j] = sum[j];
     }
-    xcorr_kernel_c(x, y, sum_c, len);
+    oaci_xcorr_kernel_c(x, y, sum_c, len);
 # endif
 
     celt_assert(len >= 3);
diff --git a/celt/x86/vq_sse.h b/celt/x86/vq_sse.h
index 343c95115..5a418ec05 100644
--- a/celt/x86/vq_sse.h
+++ b/celt/x86/vq_sse.h
@@ -29,13 +29,13 @@
 
 #if defined(OAC_X86_MAY_HAVE_SSE2) && !defined(FIXED_POINT)
 
-oac_val16 op_pvq_search_sse2(celt_norm *_X, int *iy, int K, int N, int arch);
+oac_val16 oaci_op_pvq_search_sse2(celt_norm *_X, int *iy, int K, int N, int arch);
 
 # if defined(OAC_X86_PRESUME_SSE2)
 
 #  define OVERRIDE_OP_PVQ_SEARCH
-#  define op_pvq_search(x, iy, K, N, arch) \
-        (op_pvq_search_sse2(x, iy, K, N, arch))
+#  define oaci_op_pvq_search(x, iy, K, N, arch) \
+        (oaci_op_pvq_search_sse2(x, iy, K, N, arch))
 
 # elif defined(OAC_HAVE_RTCD)
 
@@ -43,7 +43,7 @@ oac_val16 op_pvq_search_sse2(celt_norm *_X, int *iy, int K, int N, int arch);
 extern oac_val16 (*const OP_PVQ_SEARCH_IMPL[OAC_ARCHMASK + 1])(
       celt_norm *_X, int *iy, int K, int N, int arch);
 
-#  define op_pvq_search(X, iy, K, N, arch) \
+#  define oaci_op_pvq_search(X, iy, K, N, arch) \
         ((*OP_PVQ_SEARCH_IMPL[(arch)&OAC_ARCHMASK])(X, iy, K, N, arch))
 
 # endif
diff --git a/celt/x86/vq_sse2.c b/celt/x86/vq_sse2.c
index c1b6018f1..6e52b1dba 100644
--- a/celt/x86/vq_sse2.c
+++ b/celt/x86/vq_sse2.c
@@ -41,7 +41,7 @@
 
 #ifndef FIXED_POINT
 
-oac_val16 op_pvq_search_sse2(celt_norm *_X, int *iy, int K, int N, int arch) {
+oac_val16 oaci_op_pvq_search_sse2(celt_norm *_X, int *iy, int K, int N, int arch) {
     int i, j;
     int pulsesLeft;
     float xy, yy;
diff --git a/celt/x86/x86_celt_map.c b/celt/x86/x86_celt_map.c
index 10b11f8c3..34199de70 100644
--- a/celt/x86/x86_celt_map.c
+++ b/celt/x86/x86_celt_map.c
@@ -41,7 +41,7 @@
 
 #  if defined(OAC_X86_MAY_HAVE_SSE4_1) && !defined(OAC_X86_PRESUME_SSE4_1)
 
-void (*const CELT_FIR_IMPL[OAC_ARCHMASK + 1])(
+void (*const oaci_CELT_FIR_IMPL[OAC_ARCHMASK + 1])(
          const oac_val16 *x,
          const oac_val16 *num,
          oac_val16       *y,
@@ -49,24 +49,24 @@ void (*const CELT_FIR_IMPL[OAC_ARCHMASK + 1])(
          int ord,
          int arch
     ) = {
-    celt_fir_c,              /* non-sse */
-    celt_fir_c,
-    celt_fir_c,
-    MAY_HAVE_SSE4_1(celt_fir), /* sse4.1  */
-    MAY_HAVE_SSE4_1(celt_fir) /* avx  */
+    oaci_celt_fir_c,              /* non-sse */
+    oaci_celt_fir_c,
+    oaci_celt_fir_c,
+    MAY_HAVE_SSE4_1(oaci_celt_fir), /* sse4.1  */
+    MAY_HAVE_SSE4_1(oaci_celt_fir) /* avx  */
 };
 
-void (*const XCORR_KERNEL_IMPL[OAC_ARCHMASK + 1])(
+void (*const oaci_XCORR_KERNEL_IMPL[OAC_ARCHMASK + 1])(
          const oac_val16 *x,
          const oac_val16 *y,
          oac_val32 sum[4],
          int len
     ) = {
-    xcorr_kernel_c,              /* non-sse */
-    xcorr_kernel_c,
-    xcorr_kernel_c,
-    MAY_HAVE_SSE4_1(xcorr_kernel), /* sse4.1  */
-    MAY_HAVE_SSE4_1(xcorr_kernel) /* avx  */
+    oaci_xcorr_kernel_c,              /* non-sse */
+    oaci_xcorr_kernel_c,
+    oaci_xcorr_kernel_c,
+    MAY_HAVE_SSE4_1(oaci_xcorr_kernel), /* sse4.1  */
+    MAY_HAVE_SSE4_1(oaci_xcorr_kernel) /* avx  */
 };
 
 #  endif
@@ -74,16 +74,16 @@ void (*const XCORR_KERNEL_IMPL[OAC_ARCHMASK + 1])(
 #  if (defined(OAC_X86_MAY_HAVE_SSE4_1) && !defined(OAC_X86_PRESUME_SSE4_1)) ||  \
     (!defined(OAC_X86_MAY_HAVE_SSE_4_1) && defined(OAC_X86_MAY_HAVE_SSE2) && !defined(OAC_X86_PRESUME_SSE2))
 
-oac_val32 (*const CELT_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(
+oac_val32 (*const oaci_CELT_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(
          const oac_val16 *x,
          const oac_val16 *y,
          int N
     ) = {
-    celt_inner_prod_c,              /* non-sse */
-    celt_inner_prod_c,
-    MAY_HAVE_SSE2(celt_inner_prod),
-    MAY_HAVE_SSE4_1(celt_inner_prod), /* sse4.1  */
-    MAY_HAVE_SSE4_1(celt_inner_prod) /* avx  */
+    oaci_celt_inner_prod_c,              /* non-sse */
+    oaci_celt_inner_prod_c,
+    MAY_HAVE_SSE2(oaci_celt_inner_prod),
+    MAY_HAVE_SSE4_1(oaci_celt_inner_prod), /* sse4.1  */
+    MAY_HAVE_SSE4_1(oaci_celt_inner_prod) /* avx  */
 };
 
 #  endif
@@ -92,7 +92,7 @@ oac_val32 (*const CELT_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(
 
 #  if defined(OAC_X86_MAY_HAVE_AVX2) && !defined(OAC_X86_PRESUME_AVX2)
 
-void (*const PITCH_XCORR_IMPL[OAC_ARCHMASK + 1])(
+void (*const oaci_PITCH_XCORR_IMPL[OAC_ARCHMASK + 1])(
          const float *_x,
          const float *_y,
          float *xcorr,
@@ -100,11 +100,11 @@ void (*const PITCH_XCORR_IMPL[OAC_ARCHMASK + 1])(
          int max_pitch,
          int arch
     ) = {
-    celt_pitch_xcorr_c,              /* non-sse */
-    celt_pitch_xcorr_c,
-    celt_pitch_xcorr_c,
-    celt_pitch_xcorr_c,
-    MAY_HAVE_AVX2(celt_pitch_xcorr)
+    oaci_celt_pitch_xcorr_c,              /* non-sse */
+    oaci_celt_pitch_xcorr_c,
+    oaci_celt_pitch_xcorr_c,
+    oaci_celt_pitch_xcorr_c,
+    MAY_HAVE_AVX2(oaci_celt_pitch_xcorr)
 };
 
 #  endif
@@ -112,29 +112,29 @@ void (*const PITCH_XCORR_IMPL[OAC_ARCHMASK + 1])(
 
 #  if defined(OAC_X86_MAY_HAVE_SSE) && !defined(OAC_X86_PRESUME_SSE)
 
-void (*const XCORR_KERNEL_IMPL[OAC_ARCHMASK + 1])(
+void (*const oaci_XCORR_KERNEL_IMPL[OAC_ARCHMASK + 1])(
          const oac_val16 *x,
          const oac_val16 *y,
          oac_val32 sum[4],
          int len
     ) = {
-    xcorr_kernel_c,              /* non-sse */
-    MAY_HAVE_SSE(xcorr_kernel),
-    MAY_HAVE_SSE(xcorr_kernel),
-    MAY_HAVE_SSE(xcorr_kernel),
-    MAY_HAVE_SSE(xcorr_kernel)
+    oaci_xcorr_kernel_c,              /* non-sse */
+    MAY_HAVE_SSE(oaci_xcorr_kernel),
+    MAY_HAVE_SSE(oaci_xcorr_kernel),
+    MAY_HAVE_SSE(oaci_xcorr_kernel),
+    MAY_HAVE_SSE(oaci_xcorr_kernel)
 };
 
-oac_val32 (*const CELT_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(
+oac_val32 (*const oaci_CELT_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(
          const oac_val16 *x,
          const oac_val16 *y,
          int N
     ) = {
-    celt_inner_prod_c,              /* non-sse */
-    MAY_HAVE_SSE(celt_inner_prod),
-    MAY_HAVE_SSE(celt_inner_prod),
-    MAY_HAVE_SSE(celt_inner_prod),
-    MAY_HAVE_SSE(celt_inner_prod)
+    oaci_celt_inner_prod_c,              /* non-sse */
+    MAY_HAVE_SSE(oaci_celt_inner_prod),
+    MAY_HAVE_SSE(oaci_celt_inner_prod),
+    MAY_HAVE_SSE(oaci_celt_inner_prod),
+    MAY_HAVE_SSE(oaci_celt_inner_prod)
 };
 
 void (*const DUAL_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(
@@ -145,11 +145,11 @@ void (*const DUAL_INNER_PROD_IMPL[OAC_ARCHMASK + 1])(
                     oac_val32       *xy1,
                     oac_val32       *xy2
     ) = {
-    dual_inner_prod_c,              /* non-sse */
-    MAY_HAVE_SSE(dual_inner_prod),
-    MAY_HAVE_SSE(dual_inner_prod),
-    MAY_HAVE_SSE(dual_inner_prod),
-    MAY_HAVE_SSE(dual_inner_prod)
+    oaci_dual_inner_prod_c,              /* non-sse */
+    MAY_HAVE_SSE(oaci_dual_inner_prod),
+    MAY_HAVE_SSE(oaci_dual_inner_prod),
+    MAY_HAVE_SSE(oaci_dual_inner_prod),
+    MAY_HAVE_SSE(oaci_dual_inner_prod)
 };
 
 void (*const COMB_FILTER_CONST_IMPL[OAC_ARCHMASK + 1])(
@@ -161,11 +161,11 @@ void (*const COMB_FILTER_CONST_IMPL[OAC_ARCHMASK + 1])(
               oac_val16 g11,
               oac_val16 g12
     ) = {
-    comb_filter_const_c,              /* non-sse */
-    MAY_HAVE_SSE(comb_filter_const),
-    MAY_HAVE_SSE(comb_filter_const),
-    MAY_HAVE_SSE(comb_filter_const),
-    MAY_HAVE_SSE(comb_filter_const)
+    oaci_comb_filter_const_c,              /* non-sse */
+    MAY_HAVE_SSE(oaci_comb_filter_const),
+    MAY_HAVE_SSE(oaci_comb_filter_const),
+    MAY_HAVE_SSE(oaci_comb_filter_const),
+    MAY_HAVE_SSE(oaci_comb_filter_const)
 };
 
 
@@ -175,11 +175,11 @@ void (*const COMB_FILTER_CONST_IMPL[OAC_ARCHMASK + 1])(
 oac_val16 (*const OP_PVQ_SEARCH_IMPL[OAC_ARCHMASK + 1])(
       celt_norm *_X, int *iy, int K, int N, int arch
     ) = {
-    op_pvq_search_c,              /* non-sse */
-    op_pvq_search_c,
-    MAY_HAVE_SSE2(op_pvq_search),
-    MAY_HAVE_SSE2(op_pvq_search),
-    MAY_HAVE_SSE2(op_pvq_search)
+    oaci_op_pvq_search_c,              /* non-sse */
+    oaci_op_pvq_search_c,
+    MAY_HAVE_SSE2(oaci_op_pvq_search),
+    MAY_HAVE_SSE2(oaci_op_pvq_search),
+    MAY_HAVE_SSE2(oaci_op_pvq_search)
 };
 #  endif
 
diff --git a/dnn/adaconvtest.c b/dnn/adaconvtest.c
index 55751e12a..72d282bf5 100644
--- a/dnn/adaconvtest.c
+++ b/dnn/adaconvtest.c
@@ -9,8 +9,8 @@
 #include <math.h>
 
 
-extern const WeightArray lacelayers_arrays[];
-extern const WeightArray nolacelayers_arrays[];
+extern const WeightArray oaci_lacelayers_arrays[];
+extern const WeightArray oaci_nolacelayers_arrays[];
 
 void adaconv_compare(
     const char * prefix,
@@ -40,8 +40,8 @@ void adaconv_compare(
     float x_out[512];
     float window[40];
 
-    init_adaconv_state(hAdaConv);
-    compute_overlap_window(window, 40);
+    oaci_init_adaconv_state(hAdaConv);
+    oaci_compute_overlap_window(window, 40);
 
     FILE *f_features, *f_x_in, *f_x_out;
 
@@ -88,7 +88,7 @@ void adaconv_compare(
             exit(1);
         }
 
-        adaconv_process_frame(hAdaConv, x_out, x_in, features, kernel_layer, gain_layer, feature_dim,
+        oaci_adaconv_process_frame(hAdaConv, x_out, x_in, features, kernel_layer, gain_layer, feature_dim,
             frame_size, overlap_size, in_channels, out_channels, kernel_size, left_padding,
             filter_gain_a, filter_gain_b, shape_gain, window, 0);
 
@@ -132,8 +132,8 @@ void adacomb_compare(
     int pitch_lag;
     float window[40];
 
-    init_adacomb_state(hAdaComb);
-    compute_overlap_window(window, 40);
+    oaci_init_adacomb_state(hAdaComb);
+    oaci_compute_overlap_window(window, 40);
 
     FILE *f_features, *f_x_in, *f_p_in, *f_x_out;
 
@@ -194,7 +194,7 @@ void adacomb_compare(
             exit(1);
         }
 
-        adacomb_process_frame(hAdaComb, x_out, x_in, features, kernel_layer, gain_layer, global_gain_layer,
+        oaci_adacomb_process_frame(hAdaComb, x_out, x_in, features, kernel_layer, gain_layer, global_gain_layer,
             pitch_lag, feature_dim, frame_size, overlap_size, kernel_size, left_padding, filter_gain_a, filter_gain_b,
         log_gain_limit, window, 0);
 
@@ -229,7 +229,7 @@ void adashape_compare(
     float x_out_ref[512];
     float x_out[512];
 
-    init_adashape_state(hAdaShape);
+    oaci_init_adashape_state(hAdaShape);
 
     FILE *f_features, *f_x_in, *f_x_out;
 
@@ -276,7 +276,7 @@ void adashape_compare(
             exit(1);
         }
 
-        adashape_process_frame(hAdaShape, x_out, x_in, features, alpha1, alpha2, feature_dim,
+        oaci_adashape_process_frame(hAdaShape, x_out, x_in, features, alpha1, alpha2, feature_dim,
             frame_size, avg_pool_k, 0);
 
         mse = 0;
@@ -298,10 +298,10 @@ int main() {
     AdaCombState hAdaComb;
     AdaShapeState hAdaShape;
 
-    init_adaconv_state(&hAdaConv);
+    oaci_init_adaconv_state(&hAdaConv);
 
-    init_lacelayers(&hLACE, lacelayers_arrays);
-    init_nolacelayers(&hNoLACE, nolacelayers_arrays);
+    oaci_init_lacelayers(&hLACE, oaci_lacelayers_arrays);
+    oaci_init_nolacelayers(&hNoLACE, oaci_nolacelayers_arrays);
 
     printf("\ntesting lace.af1 (1 in, 1 out)...\n");
     adaconv_compare(
diff --git a/dnn/arm/arm_dnn_map.c b/dnn/arm/arm_dnn_map.c
index 5a4e5edca..ea48a6eb2 100644
--- a/dnn/arm/arm_dnn_map.c
+++ b/dnn/arm/arm_dnn_map.c
@@ -36,36 +36,36 @@
 
 # if (defined(OAC_ARM_MAY_HAVE_DOTPROD) && !defined(OAC_ARM_PRESUME_DOTPROD))
 
-void (*const DNN_COMPUTE_LINEAR_IMPL[OAC_ARCHMASK + 1])(
+void (*const oaci_DNN_COMPUTE_LINEAR_IMPL[OAC_ARCHMASK + 1])(
          const LinearLayer *linear,
          float *out,
          const float *in
     ) = {
-    compute_linear_c,              /* default */
-    compute_linear_c,
-    compute_linear_c,
-    MAY_HAVE_NEON(compute_linear), /* neon  */
-    MAY_HAVE_DOTPROD(compute_linear) /* dotprod  */
+    oaci_compute_linear_c,              /* default */
+    oaci_compute_linear_c,
+    oaci_compute_linear_c,
+    MAY_HAVE_NEON(oaci_compute_linear), /* neon  */
+    MAY_HAVE_DOTPROD(oaci_compute_linear) /* dotprod  */
 };
 
 # endif
 
 # if (defined(OAC_ARM_MAY_HAVE_DOTPROD) || defined(OAC_ARM_MAY_HAVE_NEON)) && !defined(OAC_ARM_PRESUME_NEON)
 
-void (*const DNN_COMPUTE_ACTIVATION_IMPL[OAC_ARCHMASK + 1])(
+void (*const oaci_DNN_COMPUTE_ACTIVATION_IMPL[OAC_ARCHMASK + 1])(
          float *output,
          const float *input,
          int N,
          int activation
     ) = {
-    compute_activation_c,                /* default */
-    compute_activation_c,
-    compute_activation_c,
-    MAY_HAVE_NEON(compute_activation),   /* neon  */
-    MAY_HAVE_DOTPROD(compute_activation) /* dotprod  */
+    oaci_compute_activation_c,                /* default */
+    oaci_compute_activation_c,
+    oaci_compute_activation_c,
+    MAY_HAVE_NEON(oaci_compute_activation),   /* neon  */
+    MAY_HAVE_DOTPROD(oaci_compute_activation) /* dotprod  */
 };
 
-void (*const DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
+void (*const oaci_DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
          const Conv2dLayer *conv,
          float *out,
          float *mem,
@@ -74,11 +74,11 @@ void (*const DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
          int hstride,
          int activation
     ) = {
-    compute_conv2d_c,                /* default */
-    compute_conv2d_c,
-    compute_conv2d_c,
-    MAY_HAVE_NEON(compute_conv2d),   /* neon  */
-    MAY_HAVE_DOTPROD(compute_conv2d) /* dotprod  */
+    oaci_compute_conv2d_c,                /* default */
+    oaci_compute_conv2d_c,
+    oaci_compute_conv2d_c,
+    MAY_HAVE_NEON(oaci_compute_conv2d),   /* neon  */
+    MAY_HAVE_DOTPROD(oaci_compute_conv2d) /* dotprod  */
 };
 
 
diff --git a/dnn/arm/dnn_arm.h b/dnn/arm/dnn_arm.h
index 3d28d7677..28a61d7f7 100644
--- a/dnn/arm/dnn_arm.h
+++ b/dnn/arm/dnn_arm.h
@@ -31,37 +31,37 @@
 #include "cpu_support.h"
 #include "oac_types.h"
 
-void compute_linear_dotprod(const LinearLayer *linear, float *out, const float *in);
-void compute_linear_neon(const LinearLayer *linear, float *out, const float *in);
+void oaci_compute_linear_dotprod(const LinearLayer *linear, float *out, const float *in);
+void oaci_compute_linear_neon(const LinearLayer *linear, float *out, const float *in);
 
-void compute_activation_neon(float *output, const float *input, int N, int activation);
-void compute_activation_dotprod(float *output, const float *input, int N, int activation);
+void oaci_compute_activation_neon(float *output, const float *input, int N, int activation);
+void oaci_compute_activation_dotprod(float *output, const float *input, int N, int activation);
 
-void compute_conv2d_neon(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride,
+void oaci_compute_conv2d_neon(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride,
     int activation);
-void compute_conv2d_dotprod(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride,
+void oaci_compute_conv2d_dotprod(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride,
     int activation);
 
 #if defined(OAC_ARM_PRESUME_DOTPROD)
 
 # define OVERRIDE_COMPUTE_LINEAR
-# define compute_linear(linear, out, in, arch) ((void)(arch), compute_linear_dotprod(linear, out, in))
+# define oaci_compute_linear(linear, out, in, arch) ((void)(arch), oaci_compute_linear_dotprod(linear, out, in))
 
 #elif defined(OAC_ARM_PRESUME_NEON_INTR) && !defined(OAC_ARM_MAY_HAVE_DOTPROD)
 
 # define OVERRIDE_COMPUTE_LINEAR
-# define compute_linear(linear, out, in, arch) ((void)(arch), compute_linear_neon(linear, out, in))
+# define oaci_compute_linear(linear, out, in, arch) ((void)(arch), oaci_compute_linear_neon(linear, out, in))
 
 #elif defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_DOTPROD) || defined(OAC_ARM_MAY_HAVE_NEON))
 
-extern void (*const DNN_COMPUTE_LINEAR_IMPL[OAC_ARCHMASK + 1])(
+extern void (*const oaci_DNN_COMPUTE_LINEAR_IMPL[OAC_ARCHMASK + 1])(
                     const LinearLayer *linear,
                     float *out,
                     const float *in
     );
 # define OVERRIDE_COMPUTE_LINEAR
-# define compute_linear(linear, out, in, arch) \
-        ((*DNN_COMPUTE_LINEAR_IMPL[(arch)&OAC_ARCHMASK])(linear, out, in))
+# define oaci_compute_linear(linear, out, in, arch) \
+        ((*oaci_DNN_COMPUTE_LINEAR_IMPL[(arch)&OAC_ARCHMASK])(linear, out, in))
 
 
 #endif
@@ -69,27 +69,27 @@ extern void (*const DNN_COMPUTE_LINEAR_IMPL[OAC_ARCHMASK + 1])(
 #if defined(OAC_ARM_PRESUME_NEON)
 
 # define OVERRIDE_COMPUTE_ACTIVATION
-# define compute_activation(output, input, N, activation, arch) ((void)(arch), \
-                                                                 compute_activation_neon(output, input, N, activation))
+# define oaci_compute_activation(output, input, N, activation, arch) ((void)(arch), \
+                                                                 oaci_compute_activation_neon(output, input, N, activation))
 # define OVERRIDE_COMPUTE_CONV2D
-# define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch), \
-                                                                                compute_conv2d_neon(conv, out, mem, in, \
+# define oaci_compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch), \
+                                                                                oaci_compute_conv2d_neon(conv, out, mem, in, \
     height, hstride, activation))
 
 #elif defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_DOTPROD) || defined(OAC_ARM_MAY_HAVE_NEON))
 
-extern void (*const DNN_COMPUTE_ACTIVATION_IMPL[OAC_ARCHMASK + 1])(
+extern void (*const oaci_DNN_COMPUTE_ACTIVATION_IMPL[OAC_ARCHMASK + 1])(
                     float *output,
                     const float *input,
                     int N,
                     int activation
     );
 # define OVERRIDE_COMPUTE_ACTIVATION
-# define compute_activation(output, input, N, activation, arch) \
-        ((*DNN_COMPUTE_ACTIVATION_IMPL[(arch)&OAC_ARCHMASK])(output, input, N, activation))
+# define oaci_compute_activation(output, input, N, activation, arch) \
+        ((*oaci_DNN_COMPUTE_ACTIVATION_IMPL[(arch)&OAC_ARCHMASK])(output, input, N, activation))
 
 
-extern void (*const DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
+extern void (*const oaci_DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
                     const Conv2dLayer *conv,
                     float *out,
                     float *mem,
@@ -99,8 +99,8 @@ extern void (*const DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
                     int activation
     );
 # define OVERRIDE_COMPUTE_CONV2D
-# define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) \
-        ((*DNN_COMPUTE_CONV2D_IMPL[(arch)&OAC_ARCHMASK])(conv, out, mem, in, height, hstride, activation))
+# define oaci_compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) \
+        ((*oaci_DNN_COMPUTE_CONV2D_IMPL[(arch)&OAC_ARCHMASK])(conv, out, mem, in, height, hstride, activation))
 
 
 #endif
diff --git a/dnn/burg.c b/dnn/burg.c
index ffb2f371d..327d1d9f3 100644
--- a/dnn/burg.c
+++ b/dnn/burg.c
@@ -41,7 +41,7 @@
 #define FIND_LPC_COND_FAC           1e-5f
 
 /* sum of squares of a silk_float array, with result as double */
-static double silk_energy_FLP(
+static double oaci_silk_energy_FLP(
     const float    *data,
     int dataSize)                            {
     int i;
@@ -66,7 +66,7 @@ static double silk_energy_FLP(
 }
 
 /* inner product of two silk_float arrays, with result as double */
-static double silk_inner_product_FLP(
+static double oaci_silk_inner_product_FLP(
     const float    *data1,
     const float    *data2,
     int dataSize)                            {
@@ -92,7 +92,7 @@ static double silk_inner_product_FLP(
 
 
 /* Compute reflection coefficients from input signal */
-float silk_burg_analysis(              /* O    returns residual energy                                     */
+float oaci_silk_burg_analysis(              /* O    returns residual energy                                     */
     float A[],                         /* O    prediction coefficients (length order)                      */
     const float x[],                   /* I    input signal, length: nb_subfr*(D+L_sub)                    */
     const float minInvGain,            /* I    minimum inverse prediction gain                             */
@@ -110,12 +110,12 @@ float silk_burg_analysis(              /* O    returns residual energy
     assert( subfr_length*nb_subfr <= MAX_FRAME_SIZE );
 
     /* Compute autocorrelations, added over subframes */
-    C0 = silk_energy_FLP( x, nb_subfr*subfr_length );
+    C0 = oaci_silk_energy_FLP( x, nb_subfr*subfr_length );
     memset( C_first_row, 0, SILK_MAX_ORDER_LPC*sizeof(double));
     for (s = 0; s < nb_subfr; s++) {
         x_ptr = x + s*subfr_length;
         for (n = 1; n < D + 1; n++) {
-            C_first_row[ n - 1 ] += silk_inner_product_FLP( x_ptr, x_ptr + n, subfr_length - n );
+            C_first_row[ n - 1 ] += oaci_silk_inner_product_FLP( x_ptr, x_ptr + n, subfr_length - n );
         }
     }
     memcpy( C_last_row, C_first_row, SILK_MAX_ORDER_LPC*sizeof(double));
@@ -219,7 +219,7 @@ float silk_burg_analysis(              /* O    returns residual energy
         }
         /* Subtract energy of preceding samples from C0 */
         for (s = 0; s < nb_subfr; s++) {
-            C0 -= silk_energy_FLP( x + s*subfr_length, D );
+            C0 -= oaci_silk_energy_FLP( x + s*subfr_length, D );
         }
         /* Approximate residual energy */
         nrg_f = C0*invGain;
diff --git a/dnn/burg.h b/dnn/burg.h
index 0af32fe88..b80e9871a 100644
--- a/dnn/burg.h
+++ b/dnn/burg.h
@@ -29,7 +29,7 @@
 #define BURG_H
 
 
-float silk_burg_analysis(              /* O    returns residual energy                                     */
+float oaci_silk_burg_analysis(              /* O    returns residual energy                                     */
     float A[],                         /* O    prediction coefficients (length order)                      */
     const float x[],                   /* I    input signal, length: nb_subfr*(D+L_sub)                    */
     const float minInvGain,            /* I    minimum inverse prediction gain                             */
diff --git a/dnn/bwe_demo.c b/dnn/bwe_demo.c
index d8bbcc196..81f5afb50 100644
--- a/dnn/bwe_demo.c
+++ b/dnn/bwe_demo.c
@@ -59,8 +59,8 @@ int main(int argc, char **argv) {
     arch = oac_select_arch();
     hOSCEBWE = (silk_OSCE_BWE_struct *)calloc(1, sizeof(*hOSCEBWE));
     osce = (OSCEModel *)calloc(1, sizeof(*osce));
-    osce_load_models(osce, NULL, arch);
-    osce_bwe_reset(hOSCEBWE);
+    oaci_osce_load_models(osce, NULL, arch);
+    oaci_osce_bwe_reset(hOSCEBWE);
 
     if (argc != 3) usage();
     fin = fopen(argv[1], "rb");
@@ -80,7 +80,7 @@ int main(int argc, char **argv) {
 
 
     while (fread(x_in, sizeof(x_in[0]), BWE_FRAME_SIZE, fin) == BWE_FRAME_SIZE) {
-        osce_bwe(
+        oaci_osce_bwe(
             osce,
             hOSCEBWE,
             x_out,
diff --git a/dnn/dred_coding.c b/dnn/dred_coding.c
index 3c6a90fc3..9b7b597b6 100644
--- a/dnn/dred_coding.c
+++ b/dnn/dred_coding.c
@@ -36,7 +36,7 @@
 #include "dred_config.h"
 #include "dred_coding.h"
 
-int compute_quantizer(int q0, int dQ, int qmax, int i) {
+int oaci_compute_quantizer(int q0, int dQ, int qmax, int i) {
     int quant;
     static const int dQ_table[8] = {0, 2, 3, 4, 6, 8, 12, 16};
     quant = q0 + (dQ_table[dQ]*i + 8)/16;
diff --git a/dnn/dred_coding.h b/dnn/dred_coding.h
index 1ab87b352..791787c70 100644
--- a/dnn/dred_coding.h
+++ b/dnn/dred_coding.h
@@ -31,6 +31,6 @@
 #include "oac_types.h"
 #include "entcode.h"
 
-int compute_quantizer(int q0, int dQ, int qmax, int i);
+int oaci_compute_quantizer(int q0, int dQ, int qmax, int i);
 
 #endif
diff --git a/dnn/dred_compare.c b/dnn/dred_compare.c
index 48f37b4fd..f27a64b00 100644
--- a/dnn/dred_compare.c
+++ b/dnn/dred_compare.c
@@ -171,7 +171,7 @@ static void spectrum(float *_ps, const int *_bands, int _nbands,
     int xj;
     int ps_sz;
     mini_kiss_fft_cpx X[2][NFREQS + 1];
-    mini_kiss_fftr_cfg kfft;
+    mini_kiss_fftr_cfg oaci_kfft;
     ps_sz = _window_sz/2;
     /* Blackman-Harris window. */
     for (xj = 0; xj < _window_sz; xj++) {
@@ -179,7 +179,7 @@ static void spectrum(float *_ps, const int *_bands, int _nbands,
         window[xj] = 0.35875 - 0.48829*cos(2*OAC_PI*n)
                      + 0.14128*cos(4*OAC_PI*n) - 0.01168*cos(6*OAC_PI*n);
     }
-    kfft = mini_kiss_fftr_alloc(_window_sz, 0, NULL, NULL);
+    oaci_kfft = mini_kiss_fftr_alloc(_window_sz, 0, NULL, NULL);
     for (xi = 0; xi < _nframes; xi++) {
         int ci;
         int xk;
@@ -188,7 +188,7 @@ static void spectrum(float *_ps, const int *_bands, int _nbands,
             for (xk = 0; xk < _window_sz; xk++) {
                 x[xk] = window[xk]*_in[(xi*_step + xk)*_nchannels + ci];
             }
-            mini_kiss_fftr(kfft, x, X[ci]);
+            mini_kiss_fftr(oaci_kfft, x, X[ci]);
         }
         for (bi = xj = 0; bi < _nbands; bi++) {
             float p[2] = {0};
@@ -204,7 +204,7 @@ static void spectrum(float *_ps, const int *_bands, int _nbands,
             }
         }
     }
-    free(kfft);
+    free(oaci_kfft);
 }
 
 
diff --git a/dnn/dred_decoder.c b/dnn/dred_decoder.c
index 003462e5c..889b20674 100644
--- a/dnn/dred_decoder.c
+++ b/dnn/dred_decoder.c
@@ -39,18 +39,18 @@
 #include "dred_rdovae_stats_data.h"
 #include "dred_rdovae_constants.h"
 
-void dred_decode_latents(ec_dec *dec, float *x, const oac_uint8 *scale, const oac_uint8 *r, const oac_uint8 *p0,
+void oaci_dred_decode_latents(ec_dec *dec, float *x, const oac_uint8 *scale, const oac_uint8 *r, const oac_uint8 *p0,
                          int dim) {
     int i;
     for (i = 0; i < dim; i++) {
         int q;
         if (r[i] == 0 || p0[i] == 255) q = 0;
-        else q = ec_laplace_decode_p0(dec, p0[i]<<7, r[i]<<7);
+        else q = oaci_ec_laplace_decode_p0(dec, p0[i]<<7, r[i]<<7);
         x[i] = q*256.f/(scale[i] == 0 ? 1 : scale[i]);
     }
 }
 
-int dred_ec_decode(OacDRED *dec, const oac_uint8 *bytes, int num_bytes, int min_feature_frames, int dred_frame_offset) {
+int oaci_dred_ec_decode(OacDRED *dec, const oac_uint8 *bytes, int num_bytes, int min_feature_frames, int dred_frame_offset) {
     ec_dec ec;
     int q_level;
     int i;
@@ -65,13 +65,13 @@ int dred_ec_decode(OacDRED *dec, const oac_uint8 *bytes, int num_bytes, int min_
     celt_assert(DRED_NUM_REDUNDANCY_FRAMES%2 == 0);
 
     /* decode initial state and initialize RDOVAE decoder */
-    ec_dec_init(&ec, (unsigned char*)bytes, num_bytes);
-    q0 = ec_dec_uint(&ec, 16);
-    dQ = ec_dec_uint(&ec, 8);
-    if (ec_dec_uint(&ec, 2)) extra_offset = 32*ec_dec_uint(&ec, 256);
+    oaci_ec_dec_init(&ec, (unsigned char*)bytes, num_bytes);
+    q0 = oaci_ec_dec_uint(&ec, 16);
+    dQ = oaci_ec_dec_uint(&ec, 8);
+    if (oaci_ec_dec_uint(&ec, 2)) extra_offset = 32*oaci_ec_dec_uint(&ec, 256);
     else extra_offset = 0;
     /* Compute total offset, including DRED position in a multiframe packet. */
-    dec->dred_offset = 16 - ec_dec_uint(&ec, 32) - extra_offset + dred_frame_offset;
+    dec->dred_offset = 16 - oaci_ec_dec_uint(&ec, 32) - extra_offset + dred_frame_offset;
     /*printf("%d %d %d\n", dred_offset, q0, dQ);*/
     qmax = 15;
     if (q0 < 14 && dQ > 0) {
@@ -86,21 +86,21 @@ int dred_ec_decode(OacDRED *dec, const oac_uint8 *bytes, int num_bytes, int min_
             15, but combined into a single symbol. */
         nvals = 15 - (q0 + 1);
         ft = 2*nvals;
-        s = ec_decode(&ec, ft);
+        s = oaci_ec_decode(&ec, ft);
         if (s >= nvals) {
             qmax = q0 + (s - nvals) + 1;
-            ec_dec_update(&ec, s, s + 1, ft);
+            oaci_ec_dec_update(&ec, s, s + 1, ft);
         } else {
-            ec_dec_update(&ec, 0, nvals, ft);
+            oaci_ec_dec_update(&ec, 0, nvals, ft);
         }
     }
     state_qoffset = q0*DRED_STATE_DIM;
-    dred_decode_latents(
+    oaci_dred_decode_latents(
       &ec,
       dec->state,
-      dred_state_quant_scales_q8 + state_qoffset,
-      dred_state_r_q8 + state_qoffset,
-      dred_state_p0_q8 + state_qoffset,
+      oaci_dred_state_quant_scales_q8 + state_qoffset,
+      oaci_dred_state_r_q8 + state_qoffset,
+      oaci_dred_state_p0_q8 + state_qoffset,
       DRED_STATE_DIM);
 
     /* decode newest to oldest and store oldest to newest */
@@ -108,14 +108,14 @@ int dred_ec_decode(OacDRED *dec, const oac_uint8 *bytes, int num_bytes, int min_
         /* FIXME: Figure out how to avoid missing a last frame that would take up < 8 bits. */
         if (8*num_bytes - ec_tell(&ec) <= 7)
             break;
-        q_level = compute_quantizer(q0, dQ, qmax, i/2);
+        q_level = oaci_compute_quantizer(q0, dQ, qmax, i/2);
         offset = q_level*DRED_LATENT_DIM;
-        dred_decode_latents(
+        oaci_dred_decode_latents(
           &ec,
           &dec->latents[(i/2)*(DRED_LATENT_DIM + 1)],
-          dred_latent_quant_scales_q8 + offset,
-          dred_latent_r_q8 + offset,
-          dred_latent_p0_q8 + offset,
+          oaci_dred_latent_quant_scales_q8 + offset,
+          oaci_dred_latent_r_q8 + offset,
+          oaci_dred_latent_p0_q8 + offset,
           DRED_LATENT_DIM
             );
         dec->latents[(i/2)*(DRED_LATENT_DIM + 1) + DRED_LATENT_DIM] = q_level*.125 - 1;
diff --git a/dnn/dred_decoder.h b/dnn/dred_decoder.h
index f7b77d651..38fb53c32 100644
--- a/dnn/dred_decoder.h
+++ b/dnn/dred_decoder.h
@@ -44,6 +44,6 @@ struct OacDRED {
 };
 
 
-int dred_ec_decode(OacDRED *dec, const oac_uint8 *bytes, int num_bytes, int min_feature_frames, int dred_frame_offset);
+int oaci_dred_ec_decode(OacDRED *dec, const oac_uint8 *bytes, int num_bytes, int min_feature_frames, int dred_frame_offset);
 
 #endif
diff --git a/dnn/dred_encoder.c b/dnn/dred_encoder.c
index 30a5e6d65..7afc8942f 100644
--- a/dnn/dred_encoder.c
+++ b/dnn/dred_encoder.c
@@ -51,36 +51,36 @@ static void DRED_rdovae_init_encoder(RDOVAEEncState *enc_state) {
     memset(enc_state, 0, sizeof(*enc_state));
 }
 
-int dred_encoder_load_model(DREDEnc* enc, const void *data, int len) {
+int oaci_dred_encoder_load_model(DREDEnc* enc, const void *data, int len) {
     WeightArray *list;
     int ret;
-    parse_weights(&list, data, len);
-    ret = init_rdovaeenc(&enc->model, list);
+    oaci_parse_weights(&list, data, len);
+    ret = oaci_init_rdovaeenc(&enc->model, list);
     oac_free(list);
     if (ret == 0) {
-        ret = lpcnet_encoder_load_model(&enc->lpcnet_enc_state, data, len);
+        ret = oaci_lpcnet_encoder_load_model(&enc->lpcnet_enc_state, data, len);
     }
     if (ret == 0) enc->loaded = 1;
     return (ret == 0) ? OAC_OK : OAC_BAD_ARG;
 }
 
-void dred_encoder_reset(DREDEnc* enc) {
+void oaci_dred_encoder_reset(DREDEnc* enc) {
     OAC_CLEAR((char*)&enc->DREDENC_RESET_START,
               sizeof(DREDEnc)
         - ((char*)&enc->DREDENC_RESET_START - (char*)enc));
     enc->input_buffer_fill = DRED_SILK_ENCODER_DELAY;
-    lpcnet_encoder_init(&enc->lpcnet_enc_state);
+    oaci_lpcnet_encoder_init(&enc->lpcnet_enc_state);
     DRED_rdovae_init_encoder(&enc->rdovae_enc);
 }
 
-void dred_encoder_init(DREDEnc* enc, oac_int32 Fs, int channels) {
+void oaci_dred_encoder_init(DREDEnc* enc, oac_int32 Fs, int channels) {
     enc->Fs = Fs;
     enc->channels = channels;
     enc->loaded = 0;
 #ifndef USE_WEIGHTS_FILE
-    if (init_rdovaeenc(&enc->model, rdovaeenc_arrays) == 0) enc->loaded = 1;
+    if (oaci_init_rdovaeenc(&enc->model, oaci_rdovaeenc_arrays) == 0) enc->loaded = 1;
 #endif
-    dred_encoder_reset(enc);
+    oaci_dred_encoder_reset(enc);
 }
 
 static void dred_process_frame(DREDEnc *enc, int arch) {
@@ -93,8 +93,8 @@ static void dred_process_frame(DREDEnc *enc, int arch) {
     OAC_MOVE(enc->state_buffer + DRED_STATE_DIM, enc->state_buffer, (DRED_MAX_FRAMES - 1)*DRED_STATE_DIM);
 
     /* calculate LPCNet features */
-    lpcnet_compute_single_frame_features_float(&enc->lpcnet_enc_state, enc->input_buffer, feature_buffer, arch);
-    lpcnet_compute_single_frame_features_float(&enc->lpcnet_enc_state, enc->input_buffer + DRED_FRAME_SIZE,
+    oaci_lpcnet_compute_single_frame_features_float(&enc->lpcnet_enc_state, enc->input_buffer, feature_buffer, arch);
+    oaci_lpcnet_compute_single_frame_features_float(&enc->lpcnet_enc_state, enc->input_buffer + DRED_FRAME_SIZE,
     feature_buffer + 36, arch);
 
     /* prepare input buffer (discard LPC coefficients) */
@@ -102,12 +102,12 @@ static void dred_process_frame(DREDEnc *enc, int arch) {
     OAC_COPY(input_buffer + DRED_NUM_FEATURES, feature_buffer + 36, DRED_NUM_FEATURES);
 
     /* run RDOVAE encoder */
-    dred_rdovae_encode_dframe(&enc->rdovae_enc, &enc->model, enc->latents_buffer, enc->state_buffer, input_buffer,
+    oaci_dred_rdovae_encode_dframe(&enc->rdovae_enc, &enc->model, enc->latents_buffer, enc->state_buffer, input_buffer,
     arch);
     enc->latents_buffer_fill = IMIN(enc->latents_buffer_fill + 1, DRED_NUM_REDUNDANCY_FRAMES);
 }
 
-void filter_df2t(const float *in, float *out, int len, float b0, const float *b, const float *a, int order,
+void oaci_filter_df2t(const float *in, float *out, int len, float b0, const float *b, const float *a, int order,
                  float *mem) {
     int i;
     for (i = 0; i < len; i++) {
@@ -130,7 +130,7 @@ void filter_df2t(const float *in, float *out, int len, float b0, const float *b,
 # define MAX_DOWNMIX_BUFFER (960*2)
 #endif
 static void dred_convert_to_16k(DREDEnc *enc, const float *in, int in_len, float *out, int out_len) {
-    float downmix[MAX_DOWNMIX_BUFFER];
+    float oaci_downmix[MAX_DOWNMIX_BUFFER];
     int i;
     int up;
     celt_assert(enc->channels*in_len <= MAX_DOWNMIX_BUFFER);
@@ -160,14 +160,14 @@ static void dred_convert_to_16k(DREDEnc *enc, const float *in, int in_len, float
             celt_assert(0);
     }
     celt_assert(up*in_len <= MAX_DOWNMIX_BUFFER);
-    OAC_CLEAR(downmix, up*in_len);
+    OAC_CLEAR(oaci_downmix, up*in_len);
     if (enc->channels == 1) {
-        for (i = 0; i < in_len; i++)downmix[up*i] = FLOAT2INT16(up*in[i]) + VERY_SMALL;
+        for (i = 0; i < in_len; i++)oaci_downmix[up*i] = FLOAT2INT16(up*in[i]) + VERY_SMALL;
     } else {
-        for (i = 0; i < in_len; i++)downmix[up*i] = FLOAT2INT16(.5*up*(in[2*i] + in[2*i + 1])) + VERY_SMALL;
+        for (i = 0; i < in_len; i++)oaci_downmix[up*i] = FLOAT2INT16(.5*up*(in[2*i] + in[2*i + 1])) + VERY_SMALL;
     }
     if (enc->Fs == 16000) {
-        OAC_COPY(out, downmix, out_len);
+        OAC_COPY(out, oaci_downmix, out_len);
     } else if (enc->Fs == 48000 || enc->Fs == 24000) {
         /* ellip(7, .2, 70, 7750/24000) */
 
@@ -176,8 +176,8 @@ static void dred_convert_to_16k(DREDEnc *enc, const float *in, int in_len, float
         static const float filter_a[8] = {-3.878718597768f, 7.748834257468f, -9.653651699533f, 8.007342726666f,
                                           -4.379450178552f, 1.463182111810f, -0.231720677804f, 0.f};
         float b0 = 0.004523418224f;
-        filter_df2t(downmix, downmix, up*in_len, b0, filter_b, filter_a, RESAMPLING_ORDER, enc->resample_mem);
-        for (i = 0; i < out_len; i++)out[i] = downmix[3*i];
+        oaci_filter_df2t(oaci_downmix, oaci_downmix, up*in_len, b0, filter_b, filter_a, RESAMPLING_ORDER, enc->resample_mem);
+        for (i = 0; i < out_len; i++)out[i] = oaci_downmix[3*i];
     } else if (enc->Fs == 12000) {
         /* ellip(7, .2, 70, 5800/24000) */
         static const float filter_b[8] = {-0.001017101081f,  0.003673127243f,   0.001009165267f,  0.001009165267f,
@@ -185,8 +185,8 @@ static void dred_convert_to_16k(DREDEnc *enc, const float *in, int in_len, float
         static const float filter_a[8] = {-4.930414411612f, 11.291643096504f, -15.322037343815f, 13.216403930898f,
                                           -7.220409219553f,  2.310550142771f, -0.334338618782f, 0.f};
         float b0 = 0.002033596776f;
-        filter_df2t(downmix, downmix, up*in_len, b0, filter_b, filter_a, RESAMPLING_ORDER, enc->resample_mem);
-        for (i = 0; i < out_len; i++)out[i] = downmix[3*i];
+        oaci_filter_df2t(oaci_downmix, oaci_downmix, up*in_len, b0, filter_b, filter_a, RESAMPLING_ORDER, enc->resample_mem);
+        for (i = 0; i < out_len; i++)out[i] = oaci_downmix[3*i];
     } else if (enc->Fs == 8000) {
         /* ellip(7, .2, 70, 3900/8000) */
         static const float filter_b[8] = { 0.081670120929f, 0.180401598565f,  0.259391051971f, 0.259391051971f,
@@ -194,7 +194,7 @@ static void dred_convert_to_16k(DREDEnc *enc, const float *in, int in_len, float
         static const float filter_a[8] = {-1.393651933659f, 2.609789872676f, -2.403541968806f, 2.056814957331f,
                                           -1.148908574570f, 0.473001413788f, -0.110359852412f, 0.f};
         float b0 = 0.020109185709f;
-        filter_df2t(downmix, out, out_len, b0, filter_b, filter_a, RESAMPLING_ORDER, enc->resample_mem);
+        oaci_filter_df2t(oaci_downmix, out, out_len, b0, filter_b, filter_a, RESAMPLING_ORDER, enc->resample_mem);
 #ifdef ENABLE_QEXT
     } else if (enc->Fs == 96000) {
         /* ellip(7, .2, 70, 7750/48000) */
@@ -203,15 +203,15 @@ static void dred_convert_to_16k(DREDEnc *enc, const float *in, int in_len, float
         static const float filter_a[8] = {-5.813483928050f, 14.932091805554f, -21.900933283269f, 19.774128964756f,
                                           -10.978028462771f, 3.467650469467f, -0.480641240411f, 0.f};
         float b0 = 0.000880286074f;
-        filter_df2t(downmix, downmix, up*in_len, b0, filter_b, filter_a, RESAMPLING_ORDER, enc->resample_mem);
-        for (i = 0; i < out_len; i++)out[i] = downmix[6*i];
+        oaci_filter_df2t(oaci_downmix, oaci_downmix, up*in_len, b0, filter_b, filter_a, RESAMPLING_ORDER, enc->resample_mem);
+        for (i = 0; i < out_len; i++)out[i] = oaci_downmix[6*i];
 #endif
     } else {
         celt_assert(0);
     }
 }
 
-void dred_compute_latents(DREDEnc *enc, const float *pcm, int frame_size, int extra_delay, int arch) {
+void oaci_dred_compute_latents(DREDEnc *enc, const float *pcm, int frame_size, int extra_delay, int arch) {
     int curr_offset16k;
     int frame_size16k = frame_size*16000/enc->Fs;
     celt_assert(enc->loaded);
@@ -258,7 +258,7 @@ static void dred_encode_latents(ec_enc *enc, const float *x, const oac_uint8 *sc
         xq[i] = x[i]*scale[i]*(1.f/256.f);
         deadzone[i] = xq[i]/(delta[i] + eps);
     }
-    compute_activation(deadzone, deadzone, dim, ACTIVATION_TANH, arch);
+    oaci_compute_activation(deadzone, deadzone, dim, ACTIVATION_TANH, arch);
     for (i = 0; i < dim; i++) {
         xq[i] = xq[i] - delta[i]*deadzone[i];
         q[i] = (int)floor(.5f + xq[i]);
@@ -266,7 +266,7 @@ static void dred_encode_latents(ec_enc *enc, const float *x, const oac_uint8 *sc
     for (i = 0; i < dim; i++) {
         /* Make the impossible actually impossible. */
         if (r[i] == 0 || p0[i] == 255) q[i] = 0;
-        else ec_laplace_encode_p0(enc, q[i], p0[i]<<7, r[i]<<7);
+        else oaci_ec_laplace_encode_p0(enc, q[i], p0[i]<<7, r[i]<<7);
     }
 }
 
@@ -278,7 +278,7 @@ static int dred_voice_active(const unsigned char *activity_mem, int offset) {
     return 0;
 }
 
-int dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks, int max_bytes, int q0, int dQ, int qmax,
+int oaci_dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks, int max_bytes, int q0, int dQ, int qmax,
                            unsigned char *activity_mem, int arch) {
     ec_enc ec_encoder;
 
@@ -310,18 +310,18 @@ int dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks, int
     if (!delayed_dred) enc->last_extra_dred_offset = extra_dred_offset;
 
     /* entropy coding of state and latents */
-    ec_enc_init(&ec_encoder, buf, max_bytes);
-    ec_enc_uint(&ec_encoder, q0, 16);
-    ec_enc_uint(&ec_encoder, dQ, 8);
+    oaci_ec_enc_init(&ec_encoder, buf, max_bytes);
+    oaci_ec_enc_uint(&ec_encoder, q0, 16);
+    oaci_ec_enc_uint(&ec_encoder, dQ, 8);
     total_offset = 16 - (enc->dred_offset - extra_dred_offset*8);
     celt_assert(total_offset >= 0);
     if (total_offset > 31) {
-        ec_enc_uint(&ec_encoder, 1, 2);
-        ec_enc_uint(&ec_encoder, total_offset>>5, 256);
-        ec_enc_uint(&ec_encoder, total_offset&31, 32);
+        oaci_ec_enc_uint(&ec_encoder, 1, 2);
+        oaci_ec_enc_uint(&ec_encoder, total_offset>>5, 256);
+        oaci_ec_enc_uint(&ec_encoder, total_offset&31, 32);
     } else {
-        ec_enc_uint(&ec_encoder, 0, 2);
-        ec_enc_uint(&ec_encoder, total_offset, 32);
+        oaci_ec_enc_uint(&ec_encoder, 0, 2);
+        oaci_ec_enc_uint(&ec_encoder, total_offset, 32);
     }
     celt_assert(qmax >= q0);
     if (q0 < 14 && dQ > 0) {
@@ -329,17 +329,17 @@ int dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks, int
         /* If you want to use qmax == q0, you should have set dQ = 0. */
         celt_assert(qmax > q0);
         nvals = 15 - (q0 + 1);
-        ec_encode(&ec_encoder, qmax >= 15 ? 0 : nvals + qmax - (q0 + 1),
+        oaci_ec_encode(&ec_encoder, qmax >= 15 ? 0 : nvals + qmax - (q0 + 1),
         qmax >= 15 ? nvals : nvals + qmax - q0, 2*nvals);
     }
     state_qoffset = q0*DRED_STATE_DIM;
     dred_encode_latents(
         &ec_encoder,
         &enc->state_buffer[latent_offset*DRED_STATE_DIM],
-        dred_state_quant_scales_q8 + state_qoffset,
-        dred_state_dead_zone_q8 + state_qoffset,
-        dred_state_r_q8 + state_qoffset,
-        dred_state_p0_q8 + state_qoffset,
+        oaci_dred_state_quant_scales_q8 + state_qoffset,
+        oaci_dred_state_dead_zone_q8 + state_qoffset,
+        oaci_dred_state_r_q8 + state_qoffset,
+        oaci_dred_state_p0_q8 + state_qoffset,
         DRED_STATE_DIM,
         arch);
     if (ec_tell(&ec_encoder) > 8*max_bytes) {
@@ -348,16 +348,16 @@ int dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks, int
     ec_bak = ec_encoder;
     for (i = 0; i < IMIN(2*max_chunks, enc->latents_buffer_fill - latent_offset - 1); i += 2) {
         int active;
-        q_level = compute_quantizer(q0, dQ, qmax, i/2);
+        q_level = oaci_compute_quantizer(q0, dQ, qmax, i/2);
         offset = q_level*DRED_LATENT_DIM;
 
         dred_encode_latents(
             &ec_encoder,
             enc->latents_buffer + (i + latent_offset)*DRED_LATENT_DIM,
-            dred_latent_quant_scales_q8 + offset,
-            dred_latent_dead_zone_q8 + offset,
-            dred_latent_r_q8 + offset,
-            dred_latent_p0_q8 + offset,
+            oaci_dred_latent_quant_scales_q8 + offset,
+            oaci_dred_latent_dead_zone_q8 + offset,
+            oaci_dred_latent_r_q8 + offset,
+            oaci_dred_latent_p0_q8 + offset,
             DRED_LATENT_DIM,
             arch
             );
@@ -378,7 +378,7 @@ int dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks, int
     ec_encoder = ec_bak;
 
     ec_buffer_fill = (ec_tell(&ec_encoder) + 7)/8;
-    ec_enc_shrink(&ec_encoder, ec_buffer_fill);
-    ec_enc_done(&ec_encoder);
+    oaci_ec_enc_shrink(&ec_encoder, ec_buffer_fill);
+    oaci_ec_enc_done(&ec_encoder);
     return ec_buffer_fill;
 }
diff --git a/dnn/dred_encoder.h b/dnn/dred_encoder.h
index bf3dd531d..03b977915 100644
--- a/dnn/dred_encoder.h
+++ b/dnn/dred_encoder.h
@@ -58,15 +58,15 @@ typedef struct {
     float resample_mem[RESAMPLING_ORDER + 1];
 } DREDEnc;
 
-int dred_encoder_load_model(DREDEnc* enc, const void *data, int len);
-void dred_encoder_init(DREDEnc* enc, oac_int32 Fs, int channels);
-void dred_encoder_reset(DREDEnc* enc);
+int oaci_dred_encoder_load_model(DREDEnc* enc, const void *data, int len);
+void oaci_dred_encoder_init(DREDEnc* enc, oac_int32 Fs, int channels);
+void oaci_dred_encoder_reset(DREDEnc* enc);
 
 void dred_deinit_encoder(DREDEnc *enc);
 
-void dred_compute_latents(DREDEnc *enc, const float *pcm, int frame_size, int extra_delay, int arch);
+void oaci_dred_compute_latents(DREDEnc *enc, const float *pcm, int frame_size, int extra_delay, int arch);
 
-int dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks, int max_bytes, int q0, int dQ, int qmax,
+int oaci_dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks, int max_bytes, int q0, int dQ, int qmax,
     unsigned char *activity_mem, int arch);
 
 #endif
diff --git a/dnn/dred_rdovae_dec.c b/dnn/dred_rdovae_dec.c
index 8efc3ef73..6b21defc0 100644
--- a/dnn/dred_rdovae_dec.c
+++ b/dnn/dred_rdovae_dec.c
@@ -41,14 +41,14 @@ static void conv1_cond_init(float *mem, int len, int dilation, int *init) {
     *init = 1;
 }
 
-void DRED_rdovae_decode_all(const RDOVAEDec *model, float *features, const float *state, const float *latents,
+void oaci_DRED_rdovae_decode_all(const RDOVAEDec *model, float *features, const float *state, const float *latents,
                             int nb_latents, int arch) {
     int i;
     RDOVAEDecState dec;
     memset(&dec, 0, sizeof(dec));
-    dred_rdovae_dec_init_states(&dec, model, state, arch);
+    oaci_dred_rdovae_dec_init_states(&dec, model, state, arch);
     for (i = 0; i < 2*nb_latents; i += 2) {
-        dred_rdovae_decode_qframe(
+        oaci_dred_rdovae_decode_qframe(
             &dec,
             model,
             &features[2*i*DRED_NUM_FEATURES],
@@ -57,7 +57,7 @@ void DRED_rdovae_decode_all(const RDOVAEDec *model, float *features, const float
     }
 }
 
-void dred_rdovae_dec_init_states(
+void oaci_dred_rdovae_dec_init_states(
     RDOVAEDecState *h,            /* io: state buffer handle */
     const RDOVAEDec *model,
     const float *initial_state,  /* i: initial state */
@@ -66,8 +66,8 @@ void dred_rdovae_dec_init_states(
     float state_init[DEC_GRU1_STATE_SIZE + DEC_GRU2_STATE_SIZE + DEC_GRU3_STATE_SIZE + DEC_GRU4_STATE_SIZE
                      + DEC_GRU5_STATE_SIZE];
     int counter = 0;
-    compute_generic_dense(&model->dec_hidden_init, hidden, initial_state, ACTIVATION_TANH, arch);
-    compute_generic_dense(&model->dec_gru_init, state_init, hidden, ACTIVATION_TANH, arch);
+    oaci_compute_generic_dense(&model->dec_hidden_init, hidden, initial_state, ACTIVATION_TANH, arch);
+    oaci_compute_generic_dense(&model->dec_gru_init, state_init, hidden, ACTIVATION_TANH, arch);
     OAC_COPY(h->gru1_state, state_init, DEC_GRU1_STATE_SIZE);
     counter += DEC_GRU1_STATE_SIZE;
     OAC_COPY(h->gru2_state, &state_init[counter], DEC_GRU2_STATE_SIZE);
@@ -81,7 +81,7 @@ void dred_rdovae_dec_init_states(
 }
 
 
-void dred_rdovae_decode_qframe(
+void oaci_dred_rdovae_decode_qframe(
     RDOVAEDecState *dec_state,       /* io: state buffer handle */
     const RDOVAEDec *model,
     float *qframe,              /* o: quadruple feature frame (four concatenated frames in reverse order) */
@@ -95,53 +95,53 @@ void dred_rdovae_decode_qframe(
     int output_index = 0;
 
     /* run encoder stack and concatenate output in buffer*/
-    compute_generic_dense(&model->dec_dense1, &buffer[output_index], input, ACTIVATION_TANH, arch);
+    oaci_compute_generic_dense(&model->dec_dense1, &buffer[output_index], input, ACTIVATION_TANH, arch);
     output_index += DEC_DENSE1_OUT_SIZE;
 
-    compute_generic_gru(&model->dec_gru1_input, &model->dec_gru1_recurrent, dec_state->gru1_state, buffer, arch);
-    compute_glu(&model->dec_glu1, &buffer[output_index], dec_state->gru1_state, arch);
+    oaci_compute_generic_gru(&model->dec_gru1_input, &model->dec_gru1_recurrent, dec_state->gru1_state, buffer, arch);
+    oaci_compute_glu(&model->dec_glu1, &buffer[output_index], dec_state->gru1_state, arch);
     output_index += DEC_GRU1_OUT_SIZE;
     conv1_cond_init(dec_state->conv1_state, DEC_CONV1_IN_SIZE, 1, &dec_state->initialized);
-    compute_generic_dense(&model->dec_conv_dense1, conv_tmp, buffer, ACTIVATION_TANH, arch);
-    compute_generic_conv1d(&model->dec_conv1, &buffer[output_index], dec_state->conv1_state, conv_tmp,
+    oaci_compute_generic_dense(&model->dec_conv_dense1, conv_tmp, buffer, ACTIVATION_TANH, arch);
+    oaci_compute_generic_conv1d(&model->dec_conv1, &buffer[output_index], dec_state->conv1_state, conv_tmp,
     DEC_CONV1_OUT_SIZE, ACTIVATION_TANH, arch);
     output_index += DEC_CONV1_OUT_SIZE;
 
-    compute_generic_gru(&model->dec_gru2_input, &model->dec_gru2_recurrent, dec_state->gru2_state, buffer, arch);
-    compute_glu(&model->dec_glu2, &buffer[output_index], dec_state->gru2_state, arch);
+    oaci_compute_generic_gru(&model->dec_gru2_input, &model->dec_gru2_recurrent, dec_state->gru2_state, buffer, arch);
+    oaci_compute_glu(&model->dec_glu2, &buffer[output_index], dec_state->gru2_state, arch);
     output_index += DEC_GRU2_OUT_SIZE;
     conv1_cond_init(dec_state->conv2_state, DEC_CONV2_IN_SIZE, 1, &dec_state->initialized);
-    compute_generic_dense(&model->dec_conv_dense2, conv_tmp, buffer, ACTIVATION_TANH, arch);
-    compute_generic_conv1d(&model->dec_conv2, &buffer[output_index], dec_state->conv2_state, conv_tmp,
+    oaci_compute_generic_dense(&model->dec_conv_dense2, conv_tmp, buffer, ACTIVATION_TANH, arch);
+    oaci_compute_generic_conv1d(&model->dec_conv2, &buffer[output_index], dec_state->conv2_state, conv_tmp,
     DEC_CONV2_OUT_SIZE, ACTIVATION_TANH, arch);
     output_index += DEC_CONV2_OUT_SIZE;
 
-    compute_generic_gru(&model->dec_gru3_input, &model->dec_gru3_recurrent, dec_state->gru3_state, buffer, arch);
-    compute_glu(&model->dec_glu3, &buffer[output_index], dec_state->gru3_state, arch);
+    oaci_compute_generic_gru(&model->dec_gru3_input, &model->dec_gru3_recurrent, dec_state->gru3_state, buffer, arch);
+    oaci_compute_glu(&model->dec_glu3, &buffer[output_index], dec_state->gru3_state, arch);
     output_index += DEC_GRU3_OUT_SIZE;
     conv1_cond_init(dec_state->conv3_state, DEC_CONV3_IN_SIZE, 1, &dec_state->initialized);
-    compute_generic_dense(&model->dec_conv_dense3, conv_tmp, buffer, ACTIVATION_TANH, arch);
-    compute_generic_conv1d(&model->dec_conv3, &buffer[output_index], dec_state->conv3_state, conv_tmp,
+    oaci_compute_generic_dense(&model->dec_conv_dense3, conv_tmp, buffer, ACTIVATION_TANH, arch);
+    oaci_compute_generic_conv1d(&model->dec_conv3, &buffer[output_index], dec_state->conv3_state, conv_tmp,
     DEC_CONV3_OUT_SIZE, ACTIVATION_TANH, arch);
     output_index += DEC_CONV3_OUT_SIZE;
 
-    compute_generic_gru(&model->dec_gru4_input, &model->dec_gru4_recurrent, dec_state->gru4_state, buffer, arch);
-    compute_glu(&model->dec_glu4, &buffer[output_index], dec_state->gru4_state, arch);
+    oaci_compute_generic_gru(&model->dec_gru4_input, &model->dec_gru4_recurrent, dec_state->gru4_state, buffer, arch);
+    oaci_compute_glu(&model->dec_glu4, &buffer[output_index], dec_state->gru4_state, arch);
     output_index += DEC_GRU4_OUT_SIZE;
     conv1_cond_init(dec_state->conv4_state, DEC_CONV4_IN_SIZE, 1, &dec_state->initialized);
-    compute_generic_dense(&model->dec_conv_dense4, conv_tmp, buffer, ACTIVATION_TANH, arch);
-    compute_generic_conv1d(&model->dec_conv4, &buffer[output_index], dec_state->conv4_state, conv_tmp,
+    oaci_compute_generic_dense(&model->dec_conv_dense4, conv_tmp, buffer, ACTIVATION_TANH, arch);
+    oaci_compute_generic_conv1d(&model->dec_conv4, &buffer[output_index], dec_state->conv4_state, conv_tmp,
     DEC_CONV4_OUT_SIZE, ACTIVATION_TANH, arch);
     output_index += DEC_CONV4_OUT_SIZE;
 
-    compute_generic_gru(&model->dec_gru5_input, &model->dec_gru5_recurrent, dec_state->gru5_state, buffer, arch);
-    compute_glu(&model->dec_glu5, &buffer[output_index], dec_state->gru5_state, arch);
+    oaci_compute_generic_gru(&model->dec_gru5_input, &model->dec_gru5_recurrent, dec_state->gru5_state, buffer, arch);
+    oaci_compute_glu(&model->dec_glu5, &buffer[output_index], dec_state->gru5_state, arch);
     output_index += DEC_GRU5_OUT_SIZE;
     conv1_cond_init(dec_state->conv5_state, DEC_CONV5_IN_SIZE, 1, &dec_state->initialized);
-    compute_generic_dense(&model->dec_conv_dense5, conv_tmp, buffer, ACTIVATION_TANH, arch);
-    compute_generic_conv1d(&model->dec_conv5, &buffer[output_index], dec_state->conv5_state, conv_tmp,
+    oaci_compute_generic_dense(&model->dec_conv_dense5, conv_tmp, buffer, ACTIVATION_TANH, arch);
+    oaci_compute_generic_conv1d(&model->dec_conv5, &buffer[output_index], dec_state->conv5_state, conv_tmp,
     DEC_CONV5_OUT_SIZE, ACTIVATION_TANH, arch);
     output_index += DEC_CONV5_OUT_SIZE;
 
-    compute_generic_dense(&model->dec_output, qframe, buffer, ACTIVATION_LINEAR, arch);
+    oaci_compute_generic_dense(&model->dec_output, qframe, buffer, ACTIVATION_LINEAR, arch);
 }
diff --git a/dnn/dred_rdovae_dec.h b/dnn/dred_rdovae_dec.h
index 546c6990d..05f173523 100644
--- a/dnn/dred_rdovae_dec.h
+++ b/dnn/dred_rdovae_dec.h
@@ -46,9 +46,9 @@ struct RDOVAEDecStruct {
     float conv5_state[DEC_CONV5_STATE_SIZE];
 };
 
-void dred_rdovae_dec_init_states(RDOVAEDecState *h, const RDOVAEDec *model, const float * initial_state, int arch);
-void dred_rdovae_decode_qframe(RDOVAEDecState *h, const RDOVAEDec *model, float *qframe, const float * z, int arch);
-void DRED_rdovae_decode_all(const RDOVAEDec *model, float *features, const float *state, const float *latents,
+void oaci_dred_rdovae_dec_init_states(RDOVAEDecState *h, const RDOVAEDec *model, const float * initial_state, int arch);
+void oaci_dred_rdovae_decode_qframe(RDOVAEDecState *h, const RDOVAEDec *model, float *qframe, const float * z, int arch);
+void oaci_DRED_rdovae_decode_all(const RDOVAEDec *model, float *features, const float *state, const float *latents,
     int nb_latents, int arch);
 
 #endif
diff --git a/dnn/dred_rdovae_enc.c b/dnn/dred_rdovae_enc.c
index 1db172c23..81b11cc98 100644
--- a/dnn/dred_rdovae_enc.c
+++ b/dnn/dred_rdovae_enc.c
@@ -44,7 +44,7 @@ static void conv1_cond_init(float *mem, int len, int dilation, int *init) {
     *init = 1;
 }
 
-void dred_rdovae_encode_dframe(
+void oaci_dred_rdovae_encode_dframe(
     RDOVAEEncState *enc_state,           /* io: encoder state */
     const RDOVAEEnc *model,
     float *latents,                 /* o: latent vector */
@@ -62,59 +62,59 @@ void dred_rdovae_encode_dframe(
     int output_index = 0;
 
     /* run encoder stack and concatenate output in buffer*/
-    compute_generic_dense(&model->enc_dense1, &buffer[output_index], input, ACTIVATION_TANH, arch);
+    oaci_compute_generic_dense(&model->enc_dense1, &buffer[output_index], input, ACTIVATION_TANH, arch);
     output_index += ENC_DENSE1_OUT_SIZE;
 
-    compute_generic_gru(&model->enc_gru1_input, &model->enc_gru1_recurrent, enc_state->gru1_state, buffer, arch);
+    oaci_compute_generic_gru(&model->enc_gru1_input, &model->enc_gru1_recurrent, enc_state->gru1_state, buffer, arch);
     OAC_COPY(&buffer[output_index], enc_state->gru1_state, ENC_GRU1_OUT_SIZE);
     output_index += ENC_GRU1_OUT_SIZE;
     conv1_cond_init(enc_state->conv1_state, ENC_CONV1_IN_SIZE, 1, &enc_state->initialized);
-    compute_generic_dense(&model->enc_conv_dense1, conv_tmp, buffer, ACTIVATION_TANH, arch);
-    compute_generic_conv1d(&model->enc_conv1, &buffer[output_index], enc_state->conv1_state, conv_tmp,
+    oaci_compute_generic_dense(&model->enc_conv_dense1, conv_tmp, buffer, ACTIVATION_TANH, arch);
+    oaci_compute_generic_conv1d(&model->enc_conv1, &buffer[output_index], enc_state->conv1_state, conv_tmp,
     ENC_CONV1_OUT_SIZE, ACTIVATION_TANH, arch);
     output_index += ENC_CONV1_OUT_SIZE;
 
-    compute_generic_gru(&model->enc_gru2_input, &model->enc_gru2_recurrent, enc_state->gru2_state, buffer, arch);
+    oaci_compute_generic_gru(&model->enc_gru2_input, &model->enc_gru2_recurrent, enc_state->gru2_state, buffer, arch);
     OAC_COPY(&buffer[output_index], enc_state->gru2_state, ENC_GRU2_OUT_SIZE);
     output_index += ENC_GRU2_OUT_SIZE;
     conv1_cond_init(enc_state->conv2_state, ENC_CONV2_IN_SIZE, 2, &enc_state->initialized);
-    compute_generic_dense(&model->enc_conv_dense2, conv_tmp, buffer, ACTIVATION_TANH, arch);
-    compute_generic_conv1d_dilation(&model->enc_conv2, &buffer[output_index], enc_state->conv2_state, conv_tmp,
+    oaci_compute_generic_dense(&model->enc_conv_dense2, conv_tmp, buffer, ACTIVATION_TANH, arch);
+    oaci_compute_generic_conv1d_dilation(&model->enc_conv2, &buffer[output_index], enc_state->conv2_state, conv_tmp,
     ENC_CONV2_OUT_SIZE, 2, ACTIVATION_TANH, arch);
     output_index += ENC_CONV2_OUT_SIZE;
 
-    compute_generic_gru(&model->enc_gru3_input, &model->enc_gru3_recurrent, enc_state->gru3_state, buffer, arch);
+    oaci_compute_generic_gru(&model->enc_gru3_input, &model->enc_gru3_recurrent, enc_state->gru3_state, buffer, arch);
     OAC_COPY(&buffer[output_index], enc_state->gru3_state, ENC_GRU3_OUT_SIZE);
     output_index += ENC_GRU3_OUT_SIZE;
     conv1_cond_init(enc_state->conv3_state, ENC_CONV3_IN_SIZE, 2, &enc_state->initialized);
-    compute_generic_dense(&model->enc_conv_dense3, conv_tmp, buffer, ACTIVATION_TANH, arch);
-    compute_generic_conv1d_dilation(&model->enc_conv3, &buffer[output_index], enc_state->conv3_state, conv_tmp,
+    oaci_compute_generic_dense(&model->enc_conv_dense3, conv_tmp, buffer, ACTIVATION_TANH, arch);
+    oaci_compute_generic_conv1d_dilation(&model->enc_conv3, &buffer[output_index], enc_state->conv3_state, conv_tmp,
     ENC_CONV3_OUT_SIZE, 2, ACTIVATION_TANH, arch);
     output_index += ENC_CONV3_OUT_SIZE;
 
-    compute_generic_gru(&model->enc_gru4_input, &model->enc_gru4_recurrent, enc_state->gru4_state, buffer, arch);
+    oaci_compute_generic_gru(&model->enc_gru4_input, &model->enc_gru4_recurrent, enc_state->gru4_state, buffer, arch);
     OAC_COPY(&buffer[output_index], enc_state->gru4_state, ENC_GRU4_OUT_SIZE);
     output_index += ENC_GRU4_OUT_SIZE;
     conv1_cond_init(enc_state->conv4_state, ENC_CONV4_IN_SIZE, 2, &enc_state->initialized);
-    compute_generic_dense(&model->enc_conv_dense4, conv_tmp, buffer, ACTIVATION_TANH, arch);
-    compute_generic_conv1d_dilation(&model->enc_conv4, &buffer[output_index], enc_state->conv4_state, conv_tmp,
+    oaci_compute_generic_dense(&model->enc_conv_dense4, conv_tmp, buffer, ACTIVATION_TANH, arch);
+    oaci_compute_generic_conv1d_dilation(&model->enc_conv4, &buffer[output_index], enc_state->conv4_state, conv_tmp,
     ENC_CONV4_OUT_SIZE, 2, ACTIVATION_TANH, arch);
     output_index += ENC_CONV4_OUT_SIZE;
 
-    compute_generic_gru(&model->enc_gru5_input, &model->enc_gru5_recurrent, enc_state->gru5_state, buffer, arch);
+    oaci_compute_generic_gru(&model->enc_gru5_input, &model->enc_gru5_recurrent, enc_state->gru5_state, buffer, arch);
     OAC_COPY(&buffer[output_index], enc_state->gru5_state, ENC_GRU5_OUT_SIZE);
     output_index += ENC_GRU5_OUT_SIZE;
     conv1_cond_init(enc_state->conv5_state, ENC_CONV5_IN_SIZE, 2, &enc_state->initialized);
-    compute_generic_dense(&model->enc_conv_dense5, conv_tmp, buffer, ACTIVATION_TANH, arch);
-    compute_generic_conv1d_dilation(&model->enc_conv5, &buffer[output_index], enc_state->conv5_state, conv_tmp,
+    oaci_compute_generic_dense(&model->enc_conv_dense5, conv_tmp, buffer, ACTIVATION_TANH, arch);
+    oaci_compute_generic_conv1d_dilation(&model->enc_conv5, &buffer[output_index], enc_state->conv5_state, conv_tmp,
     ENC_CONV5_OUT_SIZE, 2, ACTIVATION_TANH, arch);
     output_index += ENC_CONV5_OUT_SIZE;
 
-    compute_generic_dense(&model->enc_zdense, padded_latents, buffer, ACTIVATION_LINEAR, arch);
+    oaci_compute_generic_dense(&model->enc_zdense, padded_latents, buffer, ACTIVATION_LINEAR, arch);
     OAC_COPY(latents, padded_latents, DRED_LATENT_DIM);
 
     /* next, calculate initial state */
-    compute_generic_dense(&model->gdense1, state_hidden, buffer, ACTIVATION_TANH, arch);
-    compute_generic_dense(&model->gdense2, padded_state, state_hidden, ACTIVATION_LINEAR, arch);
+    oaci_compute_generic_dense(&model->gdense1, state_hidden, buffer, ACTIVATION_TANH, arch);
+    oaci_compute_generic_dense(&model->gdense2, padded_state, state_hidden, ACTIVATION_LINEAR, arch);
     OAC_COPY(initial_state, padded_state, DRED_STATE_DIM);
 }
diff --git a/dnn/dred_rdovae_enc.h b/dnn/dred_rdovae_enc.h
index ebb777c39..bb311a22c 100644
--- a/dnn/dred_rdovae_enc.h
+++ b/dnn/dred_rdovae_enc.h
@@ -46,7 +46,7 @@ struct RDOVAEEncStruct {
     float conv5_state[2*ENC_CONV5_STATE_SIZE];
 };
 
-void dred_rdovae_encode_dframe(RDOVAEEncState *enc_state, const RDOVAEEnc *model, float *latents, float *initial_state,
+void oaci_dred_rdovae_encode_dframe(RDOVAEEncState *enc_state, const RDOVAEEnc *model, float *latents, float *initial_state,
     const float *input, int arch);
 
 
diff --git a/dnn/dump_data.c b/dnn/dump_data.c
index d035e240d..37e343ae8 100644
--- a/dnn/dump_data.c
+++ b/dnn/dump_data.c
@@ -264,7 +264,7 @@ int main(int argc, char **argv) {
 #endif
     srand(getpid());
     arch = oac_select_arch();
-    st = lpcnet_encoder_create();
+    st = oaci_lpcnet_encoder_create();
     argv0 = argv[0];
     if (argc == 5 && strcmp(argv[1], "-btrain") == 0) {
         burg = 1;
@@ -446,13 +446,13 @@ int main(int argc, char **argv) {
             float *xf = &xn[frame*FRAME_SIZE];
             if (burg) {
                 float ceps[2*NB_BANDS];
-                burg_cepstral_analysis(ceps, xf);
+                oaci_burg_cepstral_analysis(ceps, xf);
                 fwrite(ceps, sizeof(float), 2*NB_BANDS, ffeat);
             }
-            preemphasis(xf, &mem_preemph, xf, PREEMPHASIS, FRAME_SIZE);
+            oaci_preemphasis(xf, &mem_preemph, xf, PREEMPHASIS, FRAME_SIZE);
             /* PCM is delayed by 1/2 frame to make the features centered on the frames. */
             for (i = 0; i < FRAME_SIZE - TRAINING_OFFSET; i++) pcm[i + TRAINING_OFFSET] = float2short(xf[i]);
-            compute_frame_features(st, xf, arch);
+            oaci_compute_frame_features(st, xf, arch);
 
             if (pitch) {
                 signed char pitch_features[PITCH_MAX_PERIOD - PITCH_MIN_PERIOD + PITCH_IF_FEATURES];
@@ -477,6 +477,6 @@ int main(int argc, char **argv) {
     fclose(f2);
     fclose(ffeat);
     if (fpcm) fclose(fpcm);
-    lpcnet_encoder_destroy(st);
+    oaci_lpcnet_encoder_destroy(st);
     return 0;
 }
diff --git a/dnn/dump_lpcnet_tables.c b/dnn/dump_lpcnet_tables.c
index 7c9555ff7..6f0481cda 100644
--- a/dnn/dump_lpcnet_tables.c
+++ b/dnn/dump_lpcnet_tables.c
@@ -38,9 +38,9 @@
 int main(void) {
     int i;
     FILE *file;
-    kiss_fft_state *kfft;
-    float half_window[OVERLAP_SIZE];
-    float dct_table[NB_BANDS*NB_BANDS];
+    kiss_fft_state *oaci_kfft;
+    float oaci_half_window[OVERLAP_SIZE];
+    float oaci_dct_table[NB_BANDS*NB_BANDS];
 
     file = fopen("lpcnet_tables.c", "wb");
     fprintf(file, "/* The contents of this file was automatically generated by dump_lpcnet_tables.c*/\n\n");
@@ -50,28 +50,28 @@ int main(void) {
 
     fprintf(file, "#include \"kiss_fft.h\"\n\n");
 
-    kfft = oac_fft_alloc_twiddles(WINDOW_SIZE, NULL, NULL, NULL, 0);
+    oaci_kfft = oac_fft_alloc_twiddles(WINDOW_SIZE, NULL, NULL, NULL, 0);
 
     fprintf(file, "static const arch_fft_state arch_fft = {0, NULL};\n\n");
 
-    fprintf (file, "static const oac_int16 fft_bitrev[%d] = {\n", kfft->nfft);
-    for (i = 0; i < kfft->nfft; i++)
-        fprintf (file, "%d,%c", kfft->bitrev[i], (i + 16)%15 == 0?'\n':' ');
+    fprintf (file, "static const oac_int16 fft_bitrev[%d] = {\n", oaci_kfft->nfft);
+    for (i = 0; i < oaci_kfft->nfft; i++)
+        fprintf (file, "%d,%c", oaci_kfft->bitrev[i], (i + 16)%15 == 0?'\n':' ');
     fprintf (file, "};\n\n");
 
-    fprintf (file, "static const kiss_twiddle_cpx fft_twiddles[%d] = {\n", kfft->nfft);
-    for (i = 0; i < kfft->nfft; i++)
-        fprintf (file, "{%#0.9gf, %#0.9gf},%c", kfft->twiddles[i].r, kfft->twiddles[i].i, (i + 3)%2 == 0?'\n':' ');
+    fprintf (file, "static const kiss_twiddle_cpx fft_twiddles[%d] = {\n", oaci_kfft->nfft);
+    for (i = 0; i < oaci_kfft->nfft; i++)
+        fprintf (file, "{%#0.9gf, %#0.9gf},%c", oaci_kfft->twiddles[i].r, oaci_kfft->twiddles[i].i, (i + 3)%2 == 0?'\n':' ');
     fprintf (file, "};\n\n");
 
 
-    fprintf(file, "const kiss_fft_state kfft = {\n");
-    fprintf(file, "%d, /* nfft */\n", kfft->nfft);
-    fprintf(file, "%#0.8gf, /* scale */\n", kfft->scale);
-    fprintf(file, "%d, /* shift */\n", kfft->shift);
+    fprintf(file, "const kiss_fft_state oaci_kfft = {\n");
+    fprintf(file, "%d, /* nfft */\n", oaci_kfft->nfft);
+    fprintf(file, "%#0.8gf, /* scale */\n", oaci_kfft->scale);
+    fprintf(file, "%d, /* shift */\n", oaci_kfft->shift);
     fprintf(file, "{");
     for (i = 0; i < 2*MAXFACTORS; i++) {
-        fprintf(file, "%d, ", kfft->factors[i]);
+        fprintf(file, "%d, ", oaci_kfft->factors[i]);
     }
     fprintf(file, "}, /* factors */\n");
     fprintf(file, "fft_bitrev, /* bitrev*/\n");
@@ -81,22 +81,22 @@ int main(void) {
     fprintf(file, "};\n\n");
 
     for (i = 0; i < OVERLAP_SIZE; i++)
-        half_window[i] = sin(.5*M_PI*sin(.5*M_PI*(i + .5)/OVERLAP_SIZE)*sin(.5*M_PI*(i + .5)/OVERLAP_SIZE));
-    fprintf(file, "const float half_window[] = {\n");
+        oaci_half_window[i] = sin(.5*M_PI*sin(.5*M_PI*(i + .5)/OVERLAP_SIZE)*sin(.5*M_PI*(i + .5)/OVERLAP_SIZE));
+    fprintf(file, "const float oaci_half_window[] = {\n");
     for (i = 0; i < OVERLAP_SIZE; i++)
-        fprintf (file, "%#0.9gf,%c", half_window[i], (i + 6)%5 == 0?'\n':' ');
+        fprintf (file, "%#0.9gf,%c", oaci_half_window[i], (i + 6)%5 == 0?'\n':' ');
     fprintf(file, "};\n\n");
 
     for (i = 0; i < NB_BANDS; i++) {
         int j;
         for (j = 0; j < NB_BANDS; j++) {
-            dct_table[i*NB_BANDS + j] = cos((i + .5)*j*M_PI/NB_BANDS);
-            if (j == 0) dct_table[i*NB_BANDS + j] *= sqrt(.5);
+            oaci_dct_table[i*NB_BANDS + j] = cos((i + .5)*j*M_PI/NB_BANDS);
+            if (j == 0) oaci_dct_table[i*NB_BANDS + j] *= sqrt(.5);
         }
     }
-    fprintf(file, "const float dct_table[] = {\n");
+    fprintf(file, "const float oaci_dct_table[] = {\n");
     for (i = 0; i < NB_BANDS*NB_BANDS; i++)
-        fprintf (file, "%#0.9gf,%c", dct_table[i], (i + 6)%5 == 0?'\n':' ');
+        fprintf (file, "%#0.9gf,%c", oaci_dct_table[i], (i + 6)%5 == 0?'\n':' ');
     fprintf(file, "};\n");
 
     fclose(file);
diff --git a/dnn/fargan.c b/dnn/fargan.c
index 70bd2a39d..5046732f3 100644
--- a/dnn/fargan.c
+++ b/dnn/fargan.c
@@ -54,10 +54,10 @@ static void compute_fargan_cond(FARGANState *st, float *cond, const float *featu
     COND_NET_PEMBED_OUT_SIZE);
     OAC_COPY(dense_in, features, NB_FEATURES);
 
-    compute_generic_dense(&model->cond_net_fdense1, conv1_in, dense_in, ACTIVATION_TANH, st->arch);
-    compute_generic_conv1d(&model->cond_net_fconv1, fdense2_in, st->cond_conv1_state, conv1_in, COND_NET_FCONV1_IN_SIZE,
+    oaci_compute_generic_dense(&model->cond_net_fdense1, conv1_in, dense_in, ACTIVATION_TANH, st->arch);
+    oaci_compute_generic_conv1d(&model->cond_net_fconv1, fdense2_in, st->cond_conv1_state, conv1_in, COND_NET_FCONV1_IN_SIZE,
     ACTIVATION_TANH, st->arch);
-    compute_generic_dense(&model->cond_net_fdense2, cond, fdense2_in, ACTIVATION_TANH, st->arch);
+    oaci_compute_generic_dense(&model->cond_net_fdense2, cond, fdense2_in, ACTIVATION_TANH, st->arch);
 }
 
 static void fargan_deemphasis(float *pcm, float *deemph_mem) {
@@ -86,7 +86,7 @@ static void run_fargan_subframe(FARGANState *st, float *pcm, const float *cond,
     celt_assert(st->cont_initialized);
     model = &st->model;
 
-    compute_generic_dense(&model->sig_net_cond_gain_dense, &gain, cond, ACTIVATION_LINEAR, st->arch);
+    oaci_compute_generic_dense(&model->sig_net_cond_gain_dense, &gain, cond, ACTIVATION_LINEAR, st->arch);
     gain = exp(gain);
     gain_1 = 1.f/(1e-5f + gain);
 
@@ -103,27 +103,27 @@ static void run_fargan_subframe(FARGANState *st, float *pcm, const float *cond,
     OAC_COPY(&fwc0_in[FARGAN_COND_SIZE], pred, FARGAN_SUBFRAME_SIZE + 4);
     OAC_COPY(&fwc0_in[FARGAN_COND_SIZE + FARGAN_SUBFRAME_SIZE + 4], prev, FARGAN_SUBFRAME_SIZE);
 
-    compute_generic_conv1d(&model->sig_net_fwc0_conv, gru1_in, st->fwc0_mem, fwc0_in, SIG_NET_INPUT_SIZE,
+    oaci_compute_generic_conv1d(&model->sig_net_fwc0_conv, gru1_in, st->fwc0_mem, fwc0_in, SIG_NET_INPUT_SIZE,
     ACTIVATION_TANH, st->arch);
     celt_assert(SIG_NET_FWC0_GLU_GATE_OUT_SIZE == model->sig_net_fwc0_glu_gate.nb_outputs);
-    compute_glu(&model->sig_net_fwc0_glu_gate, gru1_in, gru1_in, st->arch);
+    oaci_compute_glu(&model->sig_net_fwc0_glu_gate, gru1_in, gru1_in, st->arch);
 
-    compute_generic_dense(&model->sig_net_gain_dense_out, pitch_gate, gru1_in, ACTIVATION_SIGMOID, st->arch);
+    oaci_compute_generic_dense(&model->sig_net_gain_dense_out, pitch_gate, gru1_in, ACTIVATION_SIGMOID, st->arch);
 
     for (i = 0; i < FARGAN_SUBFRAME_SIZE; i++) gru1_in[SIG_NET_FWC0_GLU_GATE_OUT_SIZE + i] = pitch_gate[0]*pred[i + 2];
     OAC_COPY(&gru1_in[SIG_NET_FWC0_GLU_GATE_OUT_SIZE + FARGAN_SUBFRAME_SIZE], prev, FARGAN_SUBFRAME_SIZE);
-    compute_generic_gru(&model->sig_net_gru1_input, &model->sig_net_gru1_recurrent, st->gru1_state, gru1_in, st->arch);
-    compute_glu(&model->sig_net_gru1_glu_gate, gru2_in, st->gru1_state, st->arch);
+    oaci_compute_generic_gru(&model->sig_net_gru1_input, &model->sig_net_gru1_recurrent, st->gru1_state, gru1_in, st->arch);
+    oaci_compute_glu(&model->sig_net_gru1_glu_gate, gru2_in, st->gru1_state, st->arch);
 
     for (i = 0; i < FARGAN_SUBFRAME_SIZE; i++) gru2_in[SIG_NET_GRU1_OUT_SIZE + i] = pitch_gate[1]*pred[i + 2];
     OAC_COPY(&gru2_in[SIG_NET_GRU1_OUT_SIZE + FARGAN_SUBFRAME_SIZE], prev, FARGAN_SUBFRAME_SIZE);
-    compute_generic_gru(&model->sig_net_gru2_input, &model->sig_net_gru2_recurrent, st->gru2_state, gru2_in, st->arch);
-    compute_glu(&model->sig_net_gru2_glu_gate, gru3_in, st->gru2_state, st->arch);
+    oaci_compute_generic_gru(&model->sig_net_gru2_input, &model->sig_net_gru2_recurrent, st->gru2_state, gru2_in, st->arch);
+    oaci_compute_glu(&model->sig_net_gru2_glu_gate, gru3_in, st->gru2_state, st->arch);
 
     for (i = 0; i < FARGAN_SUBFRAME_SIZE; i++) gru3_in[SIG_NET_GRU2_OUT_SIZE + i] = pitch_gate[2]*pred[i + 2];
     OAC_COPY(&gru3_in[SIG_NET_GRU2_OUT_SIZE + FARGAN_SUBFRAME_SIZE], prev, FARGAN_SUBFRAME_SIZE);
-    compute_generic_gru(&model->sig_net_gru3_input, &model->sig_net_gru3_recurrent, st->gru3_state, gru3_in, st->arch);
-    compute_glu(&model->sig_net_gru3_glu_gate, &skip_cat[SIG_NET_GRU1_OUT_SIZE + SIG_NET_GRU2_OUT_SIZE], st->gru3_state,
+    oaci_compute_generic_gru(&model->sig_net_gru3_input, &model->sig_net_gru3_recurrent, st->gru3_state, gru3_in, st->arch);
+    oaci_compute_glu(&model->sig_net_gru3_glu_gate, &skip_cat[SIG_NET_GRU1_OUT_SIZE + SIG_NET_GRU2_OUT_SIZE], st->gru3_state,
     st->arch);
 
     OAC_COPY(skip_cat, gru2_in, SIG_NET_GRU1_OUT_SIZE);
@@ -136,10 +136,10 @@ static void run_fargan_subframe(FARGANState *st, float *pcm, const float *cond,
     OAC_COPY(&skip_cat[SIG_NET_GRU1_OUT_SIZE + SIG_NET_GRU2_OUT_SIZE + SIG_NET_GRU3_OUT_SIZE
                        + SIG_NET_FWC0_CONV_OUT_SIZE + FARGAN_SUBFRAME_SIZE], prev, FARGAN_SUBFRAME_SIZE);
 
-    compute_generic_dense(&model->sig_net_skip_dense, skip_out, skip_cat, ACTIVATION_TANH, st->arch);
-    compute_glu(&model->sig_net_skip_glu_gate, skip_out, skip_out, st->arch);
+    oaci_compute_generic_dense(&model->sig_net_skip_dense, skip_out, skip_cat, ACTIVATION_TANH, st->arch);
+    oaci_compute_glu(&model->sig_net_skip_glu_gate, skip_out, skip_out, st->arch);
 
-    compute_generic_dense(&model->sig_net_sig_dense_out, pcm, skip_out, ACTIVATION_TANH, st->arch);
+    oaci_compute_generic_dense(&model->sig_net_sig_dense_out, pcm, skip_out, ACTIVATION_TANH, st->arch);
     for (i = 0; i < FARGAN_SUBFRAME_SIZE; i++) pcm[i] *= gain;
 
     OAC_MOVE(st->pitch_buf, &st->pitch_buf[FARGAN_SUBFRAME_SIZE], PITCH_MAX_PERIOD - FARGAN_SUBFRAME_SIZE);
@@ -147,7 +147,7 @@ static void run_fargan_subframe(FARGANState *st, float *pcm, const float *cond,
     fargan_deemphasis(pcm, &st->deemph_mem);
 }
 
-void fargan_cont(FARGANState *st, const float *pcm0, const float *features0) {
+void oaci_fargan_cont(FARGANState *st, const float *pcm0, const float *features0) {
     int i;
     float cond[COND_NET_FDENSE2_OUT_SIZE];
     float x0[FARGAN_CONT_SAMPLES];
@@ -179,23 +179,23 @@ void fargan_cont(FARGANState *st, const float *pcm0, const float *features0) {
 }
 
 
-void fargan_init(FARGANState *st) {
+void oaci_fargan_init(FARGANState *st) {
     int ret;
     OAC_CLEAR(st, 1);
     st->arch = oac_select_arch();
 #ifndef USE_WEIGHTS_FILE
-    ret = init_fargan(&st->model, fargan_arrays);
+    ret = oaci_init_fargan(&st->model, oaci_fargan_arrays);
 #else
     ret = 0;
 #endif
     celt_assert(ret == 0);
 }
 
-int fargan_load_model(FARGANState *st, const void *data, int len) {
+int oaci_fargan_load_model(FARGANState *st, const void *data, int len) {
     WeightArray *list;
     int ret;
-    parse_weights(&list, data, len);
-    ret = init_fargan(&st->model, list);
+    oaci_parse_weights(&list, data, len);
+    ret = oaci_init_fargan(&st->model, list);
     oac_free(list);
     if (ret == 0) return 0;
     else return -1;
@@ -217,13 +217,13 @@ static void fargan_synthesize_impl(FARGANState *st, float *pcm, const float *fea
     st->last_period = period;
 }
 
-void fargan_synthesize(FARGANState *st, float *pcm, const float *features) {
+void oaci_fargan_synthesize(FARGANState *st, float *pcm, const float *features) {
     fargan_synthesize_impl(st, pcm, features);
 }
 
-void fargan_synthesize_int(FARGANState *st, oac_int16 *pcm, const float *features) {
+void oaci_fargan_synthesize_int(FARGANState *st, oac_int16 *pcm, const float *features) {
     int i;
     float fpcm[FARGAN_FRAME_SIZE];
-    fargan_synthesize(st, fpcm, features);
+    oaci_fargan_synthesize(st, fpcm, features);
     for (i = 0; i < LPCNET_FRAME_SIZE; i++) pcm[i] = (int)floor(.5 + MIN32(32767, MAX32(-32767, 32768.f*fpcm[i])));
 }
diff --git a/dnn/fargan.h b/dnn/fargan.h
index d0dc3655f..2d0832d48 100644
--- a/dnn/fargan.h
+++ b/dnn/fargan.h
@@ -56,13 +56,13 @@ typedef struct {
     int last_period;
 } FARGANState;
 
-void fargan_init(FARGANState *st);
-int fargan_load_model(FARGANState *st, const void *data, int len);
+void oaci_fargan_init(FARGANState *st);
+int oaci_fargan_load_model(FARGANState *st, const void *data, int len);
 
-void fargan_cont(FARGANState *st, const float *pcm0, const float *features0);
+void oaci_fargan_cont(FARGANState *st, const float *pcm0, const float *features0);
 
-void fargan_synthesize(FARGANState *st, float *pcm, const float *features);
-void fargan_synthesize_int(FARGANState *st, oac_int16 *pcm, const float *features);
+void oaci_fargan_synthesize(FARGANState *st, float *pcm, const float *features);
+void oaci_fargan_synthesize_int(FARGANState *st, oac_int16 *pcm, const float *features);
 
 
 #endif /* FARGAN_H */
diff --git a/dnn/fargan_demo.c b/dnn/fargan_demo.c
index 9c9b75047..7323df8bd 100644
--- a/dnn/fargan_demo.c
+++ b/dnn/fargan_demo.c
@@ -130,7 +130,7 @@ void usage(void) {
 }
 
 #ifdef ENABLE_DRED
-void dred_decode_latents(ec_dec *dec, float *x, const oac_uint8 *scale, const oac_uint8 *r, const oac_uint8 *p0,
+void oaci_dred_decode_latents(ec_dec *dec, float *x, const oac_uint8 *scale, const oac_uint8 *r, const oac_uint8 *p0,
     int dim);
 
 static oac_uint32 char_to_int(unsigned char ch[4]) {
@@ -178,17 +178,17 @@ int main(int argc, char **argv) {
 #endif
     if (mode == MODE_FEATURES) {
         LPCNetEncState *net;
-        net = lpcnet_encoder_create();
+        net = oaci_lpcnet_encoder_create();
         while (1) {
             float features[NB_TOTAL_FEATURES];
             oac_int16 pcm[LPCNET_FRAME_SIZE];
             size_t ret;
             ret = fread(pcm, sizeof(pcm[0]), LPCNET_FRAME_SIZE, fin);
             if (feof(fin) || ret != LPCNET_FRAME_SIZE) break;
-            lpcnet_compute_single_frame_features(net, pcm, features, arch);
+            oaci_lpcnet_compute_single_frame_features(net, pcm, features, arch);
             fwrite(features, sizeof(float), NB_FEATURES, fout);
         }
-        lpcnet_encoder_destroy(net);
+        oaci_lpcnet_encoder_destroy(net);
     } else if (mode == MODE_FARGAN_SYNTHESIS) {
         FARGANState fargan;
         size_t ret, i;
@@ -196,16 +196,16 @@ int main(int argc, char **argv) {
         int stop = 0;
         float in_features[5*NB_FEATURES];
         float zeros[320] = {0};
-        fargan_init(&fargan);
+        oaci_fargan_init(&fargan);
 #ifdef USE_WEIGHTS_FILE
-        fargan_load_model(&fargan, data, len);
+        oaci_fargan_load_model(&fargan, data, len);
 #endif
         /* uncomment the following to align with Python code */
         ret = fread(&in_features[0], sizeof(in_features[0]), NB_FEATURES, fin);
         for (i = 1; i < 5; i++) {
             OAC_COPY(&in_features[i*NB_FEATURES], &in_features[0], NB_FEATURES);
         }
-        fargan_cont(&fargan, zeros, in_features);
+        oaci_fargan_cont(&fargan, zeros, in_features);
         while (1) {
             float features[NB_FEATURES];
             float fpcm[LPCNET_FRAME_SIZE];
@@ -216,7 +216,7 @@ int main(int argc, char **argv) {
             } else {
                 OAC_COPY(features, in_features, NB_FEATURES);
             }
-            fargan_synthesize(&fargan, fpcm, features);
+            oaci_fargan_synthesize(&fargan, fpcm, features);
             for (i = 0; i < LPCNET_FRAME_SIZE; i++)pcm[i] = (int)floor(.5 + MIN32(32767, MAX32(-32767, 32768.f*fpcm[i])));
             if (stop == 2) {
                 fwrite(pcm + skip, sizeof(pcm[0]), LPCNET_FRAME_SIZE/2, fout);
@@ -238,10 +238,10 @@ int main(int argc, char **argv) {
         RDOVAEDec rdovae_dec_model;
         int q0 = -1;
 # ifdef USE_WEIGHTS_FILE
-        WeightArray *rdovaedec_arrays;
-        parse_weights(&rdovaedec_arrays, data, len);
+        WeightArray *oaci_rdovaedec_arrays;
+        oaci_parse_weights(&oaci_rdovaedec_arrays, data, len);
 # endif
-        init_rdovaedec(&rdovae_dec_model, rdovaedec_arrays);
+        oaci_init_rdovaedec(&rdovae_dec_model, oaci_rdovaedec_arrays);
         while (1) {
             unsigned char ch[4];
             int nb_bytes;
@@ -265,33 +265,33 @@ int main(int argc, char **argv) {
             ret = fread(bits, 1, nb_bytes, fin);
             if (feof(fin) || (int)ret != nb_bytes) break;
 
-            ec_dec_init(&dec,  bits, nb_bytes);
+            oaci_ec_dec_init(&dec,  bits, nb_bytes);
             memset(&rdovae_dec, 0, sizeof(rdovae_dec));
-            dred_decode_latents(
+            oaci_dred_decode_latents(
                  &dec,
                  initial_state,
-                 dred_state_quant_scales_q8 + state_qoffset,
-                 dred_state_r_q8 + state_qoffset,
-                 dred_state_p0_q8 + state_qoffset,
+                 oaci_dred_state_quant_scales_q8 + state_qoffset,
+                 oaci_dred_state_r_q8 + state_qoffset,
+                 oaci_dred_state_p0_q8 + state_qoffset,
                  DRED_STATE_DIM);
 
-            dred_rdovae_dec_init_states(&rdovae_dec, &rdovae_dec_model, initial_state, arch);
+            oaci_dred_rdovae_dec_init_states(&rdovae_dec, &rdovae_dec_model, initial_state, arch);
             for (i = nb_chunks - 1; i >= 0; i -= 2) {
                 int k;
                 float dec_tmp[4*DRED_NUM_FEATURES];
                 int offset = q0*DRED_LATENT_DIM;
 
-                dred_decode_latents(
+                oaci_dred_decode_latents(
                     &dec,
                     &latents[i*(DRED_LATENT_DIM + 1)],
-                    dred_latent_quant_scales_q8 + offset,
-                    dred_latent_r_q8 + offset,
-                    dred_latent_p0_q8 + offset,
+                    oaci_dred_latent_quant_scales_q8 + offset,
+                    oaci_dred_latent_r_q8 + offset,
+                    oaci_dred_latent_p0_q8 + offset,
                     DRED_LATENT_DIM
                     );
                 latents[i*(DRED_LATENT_DIM + 1) + DRED_LATENT_DIM] = q0*.125 - 1;
 
-                dred_rdovae_decode_qframe(
+                oaci_dred_rdovae_decode_qframe(
                     &rdovae_dec,
                     &rdovae_dec_model,
                     dec_tmp,
diff --git a/dnn/freq.c b/dnn/freq.c
index 7f89c3e41..e45931c76 100644
--- a/dnn/freq.c
+++ b/dnn/freq.c
@@ -118,7 +118,7 @@ static float lpcn_lpc(
 
 
 
-void lpcn_compute_band_energy(float *bandE, const kiss_fft_cpx *X) {
+void oaci_lpcn_compute_band_energy(float *bandE, const kiss_fft_cpx *X) {
     int i;
     float sum[NB_BANDS] = {0};
     for (i = 0; i < NB_BANDS - 1; i++) {
@@ -155,12 +155,12 @@ static void compute_burg_cepstrum(const float *pcm, float *burg_cepstrum, int le
     assert(order <= LPC_ORDER);
     assert(len <= FRAME_SIZE);
     for (i = 0; i < len - 1; i++) burg_in[i] = pcm[i + 1] - PREEMPHASIS*pcm[i];
-    g = silk_burg_analysis(burg_lpc, burg_in, 1e-3, len - 1, 1, order);
+    g = oaci_silk_burg_analysis(burg_lpc, burg_in, 1e-3, len - 1, 1, order);
     g /= len - 2*(order - 1);
     OAC_CLEAR(x, WINDOW_SIZE);
     x[0] = 1;
     for (i = 0; i < order; i++) x[i + 1] = -burg_lpc[i]*pow(.995, i + 1);
-    forward_transform(LPC, x);
+    oaci_forward_transform(LPC, x);
     compute_band_energy_inverse(Eburg, LPC);
     for (i = 0; i < NB_BANDS; i++) Eburg[i] *= .45*g*(1.f/((float)WINDOW_SIZE*WINDOW_SIZE*WINDOW_SIZE));
     for (i = 0; i < NB_BANDS; i++) {
@@ -169,11 +169,11 @@ static void compute_burg_cepstrum(const float *pcm, float *burg_cepstrum, int le
         logMax = MAX16(logMax, Ly[i]);
         follow = MAX16(follow - 2.5, Ly[i]);
     }
-    dct(burg_cepstrum, Ly);
+    oaci_dct(burg_cepstrum, Ly);
     burg_cepstrum[0] += -4;
 }
 
-void burg_cepstral_analysis(float *ceps, const float *x) {
+void oaci_burg_cepstral_analysis(float *ceps, const float *x) {
     int i;
     compute_burg_cepstrum(x,                &ceps[0       ], FRAME_SIZE/2, LPC_ORDER);
     compute_burg_cepstrum(&x[FRAME_SIZE/2], &ceps[NB_BANDS], FRAME_SIZE/2, LPC_ORDER);
@@ -202,13 +202,13 @@ static void interp_band_gain(float *g, const float *bandE) {
 }
 
 
-void dct(float *out, const float *in) {
+void oaci_dct(float *out, const float *in) {
     int i;
     for (i = 0; i < NB_BANDS; i++) {
         int j;
         float sum = 0;
         for (j = 0; j < NB_BANDS; j++) {
-            sum += in[j]*dct_table[j*NB_BANDS + i];
+            sum += in[j]*oaci_dct_table[j*NB_BANDS + i];
         }
         out[i] = sum*sqrt(2./NB_BANDS);
     }
@@ -220,13 +220,13 @@ static void idct(float *out, const float *in) {
         int j;
         float sum = 0;
         for (j = 0; j < NB_BANDS; j++) {
-            sum += in[j]*dct_table[i*NB_BANDS + j];
+            sum += in[j]*oaci_dct_table[i*NB_BANDS + j];
         }
         out[i] = sum*sqrt(2./NB_BANDS);
     }
 }
 
-void forward_transform(kiss_fft_cpx *out, const float *in) {
+void oaci_forward_transform(kiss_fft_cpx *out, const float *in) {
     int i;
     kiss_fft_cpx x[WINDOW_SIZE];
     kiss_fft_cpx y[WINDOW_SIZE];
@@ -234,7 +234,7 @@ void forward_transform(kiss_fft_cpx *out, const float *in) {
         x[i].r = in[i];
         x[i].i = 0;
     }
-    oac_fft(&kfft, x, y, 0);
+    oac_fft(&oaci_kfft, x, y, 0);
     for (i = 0; i < FREQ_SIZE; i++) {
         out[i] = y[i];
     }
@@ -251,7 +251,7 @@ static void inverse_transform(float *out, const kiss_fft_cpx *in) {
         x[i].r = x[WINDOW_SIZE - i].r;
         x[i].i = -x[WINDOW_SIZE - i].i;
     }
-    oac_fft(&kfft, x, y, 0);
+    oac_fft(&oaci_kfft, x, y, 0);
     /* output in reverse order for IFFT. */
     out[0] = WINDOW_SIZE*y[0].r;
     for (i = 1; i < WINDOW_SIZE; i++) {
@@ -282,7 +282,7 @@ static float lpc_from_bands(float *lpc, const float *Ex) {
     return e;
 }
 
-void lpc_weighting(float *lpc, float gamma) {
+void oaci_lpc_weighting(float *lpc, float gamma) {
     int i;
     float gamma_i = gamma;
     for (i = 0; i < LPC_ORDER; i++) {
@@ -291,7 +291,7 @@ void lpc_weighting(float *lpc, float gamma) {
     }
 }
 
-float lpc_from_cepstrum(float *lpc, const float *cepstrum) {
+float oaci_lpc_from_cepstrum(float *lpc, const float *cepstrum) {
     int i;
     float Ex[NB_BANDS];
     float tmp[NB_BANDS];
@@ -302,10 +302,10 @@ float lpc_from_cepstrum(float *lpc, const float *cepstrum) {
     return lpc_from_bands(lpc, Ex);
 }
 
-void apply_window(float *x) {
+void oaci_apply_window(float *x) {
     int i;
     for (i = 0; i < OVERLAP_SIZE; i++) {
-        x[i] *= half_window[i];
-        x[WINDOW_SIZE - 1 - i] *= half_window[i];
+        x[i] *= oaci_half_window[i];
+        x[WINDOW_SIZE - 1 - i] *= oaci_half_window[i];
     }
 }
diff --git a/dnn/freq.h b/dnn/freq.h
index f3209fe0a..50dc744e0 100644
--- a/dnn/freq.h
+++ b/dnn/freq.h
@@ -48,18 +48,18 @@
 #define NB_BANDS 18
 #define NB_BANDS_1 (NB_BANDS - 1)
 
-extern const kiss_fft_state kfft;
-extern const float half_window[OVERLAP_SIZE];
-extern const float dct_table[NB_BANDS*NB_BANDS];
+extern const kiss_fft_state oaci_kfft;
+extern const float oaci_half_window[OVERLAP_SIZE];
+extern const float oaci_dct_table[NB_BANDS*NB_BANDS];
 
-void lpcn_compute_band_energy(float *bandE, const kiss_fft_cpx *X);
-void burg_cepstral_analysis(float *ceps, const float *x);
+void oaci_lpcn_compute_band_energy(float *bandE, const kiss_fft_cpx *X);
+void oaci_burg_cepstral_analysis(float *ceps, const float *x);
 
-void apply_window(float *x);
-void dct(float *out, const float *in);
-void forward_transform(kiss_fft_cpx *out, const float *in);
-float lpc_from_cepstrum(float *lpc, const float *cepstrum);
-void apply_window(float *x);
-void lpc_weighting(float *lpc, float gamma);
+void oaci_apply_window(float *x);
+void oaci_dct(float *out, const float *in);
+void oaci_forward_transform(kiss_fft_cpx *out, const float *in);
+float oaci_lpc_from_cepstrum(float *lpc, const float *cepstrum);
+void oaci_apply_window(float *x);
+void oaci_lpc_weighting(float *lpc, float gamma);
 
 #endif
diff --git a/dnn/fwgan.c b/dnn/fwgan.c
index 590039a1a..8098e35e1 100644
--- a/dnn/fwgan.c
+++ b/dnn/fwgan.c
@@ -74,7 +74,7 @@ static void pitch_embeddings(float *pembed, float *phase, double w0) {
 static void compute_wlpc(float lpc[LPC_ORDER], const float *features) {
     float lpc_weight;
     int i;
-    lpc_from_cepstrum(lpc, features);
+    oaci_lpc_from_cepstrum(lpc, features);
     lpc_weight = 1.f;
     for (i = 0; i < LPC_ORDER; i++) {
         lpc_weight *= FWGAN_GAMMA;
@@ -87,7 +87,7 @@ static void run_fwgan_upsampler(FWGANState *st, float *cond, const float *featur
     model = &st->model;
     celt_assert(FWGAN_FEATURES == model->bfcc_with_corr_upsampler_fc.nb_inputs);
     celt_assert(BFCC_WITH_CORR_UPSAMPLER_FC_OUT_SIZE == model->bfcc_with_corr_upsampler_fc.nb_outputs);
-    compute_generic_dense(&model->bfcc_with_corr_upsampler_fc, cond, features, ACTIVATION_TANH);
+    oaci_compute_generic_dense(&model->bfcc_with_corr_upsampler_fc, cond, features, ACTIVATION_TANH);
 }
 
 static void fwgan_synthesize_impl(FWGANState *st, float *pcm, const float *lpc, const float *features);
@@ -107,7 +107,7 @@ void fwgan_cont(FWGANState *st, const float *pcm0, const float *features0) {
     /* Deemphasis memory is just the last continuation sample. */
     st->deemph_mem = pcm0[CONT_PCM_INPUTS - 1];
 
-    /* Apply analysis filter, considering that the preemphasis and deemphasis filter
+    /* Apply analysis filter, considering that the oaci_preemphasis and deemphasis filter
        cancel each other in this case since the LPC filter is constant across that boundary.
      */
     for (i = LPC_ORDER; i < CONT_PCM_INPUTS; i++) {
@@ -119,44 +119,44 @@ void fwgan_cont(FWGANState *st, const float *pcm0, const float *features0) {
     for (i = 0; i < LPC_ORDER; i++) wpcm0[i] = wpcm0[LPC_ORDER];
 
     /* The memory of the pre-empahsis is the last sample of the weighted signal
-       (ignoring preemphasis+deemphasis combination). */
+       (ignoring oaci_preemphasis+deemphasis combination). */
     st->preemph_mem = wpcm0[CONT_PCM_INPUTS - 1];
     /* The memory of the synthesis filter is the pre-emphasized continuation. */
     for (i = 0; i < LPC_ORDER;
          i++) st->syn_mem[i] = pcm0[CONT_PCM_INPUTS - 1 - i] - FWGAN_DEEMPHASIS*pcm0[CONT_PCM_INPUTS - 2 - i];
 
-    norm2 = celt_inner_prod(wpcm0, wpcm0, CONT_PCM_INPUTS, st->arch);
+    norm2 = oaci_celt_inner_prod(wpcm0, wpcm0, CONT_PCM_INPUTS, st->arch);
     norm_1 = 1.f/sqrt(1e-8f + norm2);
     for (i = 0; i < CONT_PCM_INPUTS; i++) cont_inputs[i + 1] = norm_1*wpcm0[i];
     cont_inputs[0] = log(sqrt(norm2) + 1e-7f);
 
     /* Continuation network */
-    compute_generic_dense(&model->cont_net_0, tmp1, cont_inputs, ACTIVATION_TANH);
-    compute_generic_dense(&model->cont_net_2, tmp2, tmp1, ACTIVATION_TANH);
-    compute_generic_dense(&model->cont_net_4, tmp1, tmp2, ACTIVATION_TANH);
-    compute_generic_dense(&model->cont_net_6, tmp2, tmp1, ACTIVATION_TANH);
-    compute_generic_dense(&model->cont_net_8, tmp1, tmp2, ACTIVATION_TANH);
+    oaci_compute_generic_dense(&model->cont_net_0, tmp1, cont_inputs, ACTIVATION_TANH);
+    oaci_compute_generic_dense(&model->cont_net_2, tmp2, tmp1, ACTIVATION_TANH);
+    oaci_compute_generic_dense(&model->cont_net_4, tmp1, tmp2, ACTIVATION_TANH);
+    oaci_compute_generic_dense(&model->cont_net_6, tmp2, tmp1, ACTIVATION_TANH);
+    oaci_compute_generic_dense(&model->cont_net_8, tmp1, tmp2, ACTIVATION_TANH);
     celt_assert(CONT_NET_10_OUT_SIZE == model->cont_net_10.nb_outputs);
-    compute_generic_dense(&model->cont_net_10, st->cont, tmp1, ACTIVATION_TANH);
+    oaci_compute_generic_dense(&model->cont_net_10, st->cont, tmp1, ACTIVATION_TANH);
 
     /* Computing continuation for each layer. */
     celt_assert(RNN_GRU_STATE_SIZE == model->rnn_cont_fc_0.nb_outputs);
-    compute_generic_dense(&model->rnn_cont_fc_0, st->rnn_state, st->cont, ACTIVATION_TANH);
+    oaci_compute_generic_dense(&model->rnn_cont_fc_0, st->rnn_state, st->cont, ACTIVATION_TANH);
 
     celt_assert(FWC1_STATE_SIZE == model->fwc1_cont_fc_0.nb_outputs);
-    compute_generic_dense(&model->fwc1_cont_fc_0, st->fwc1_state, st->cont, ACTIVATION_TANH);
+    oaci_compute_generic_dense(&model->fwc1_cont_fc_0, st->fwc1_state, st->cont, ACTIVATION_TANH);
     celt_assert(FWC2_STATE_SIZE == model->fwc2_cont_fc_0.nb_outputs);
-    compute_generic_dense(&model->fwc2_cont_fc_0, st->fwc2_state, st->cont, ACTIVATION_TANH);
+    oaci_compute_generic_dense(&model->fwc2_cont_fc_0, st->fwc2_state, st->cont, ACTIVATION_TANH);
     celt_assert(FWC3_STATE_SIZE == model->fwc3_cont_fc_0.nb_outputs);
-    compute_generic_dense(&model->fwc3_cont_fc_0, st->fwc3_state, st->cont, ACTIVATION_TANH);
+    oaci_compute_generic_dense(&model->fwc3_cont_fc_0, st->fwc3_state, st->cont, ACTIVATION_TANH);
     celt_assert(FWC4_STATE_SIZE == model->fwc4_cont_fc_0.nb_outputs);
-    compute_generic_dense(&model->fwc4_cont_fc_0, st->fwc4_state, st->cont, ACTIVATION_TANH);
+    oaci_compute_generic_dense(&model->fwc4_cont_fc_0, st->fwc4_state, st->cont, ACTIVATION_TANH);
     celt_assert(FWC5_STATE_SIZE == model->fwc5_cont_fc_0.nb_outputs);
-    compute_generic_dense(&model->fwc5_cont_fc_0, st->fwc5_state, st->cont, ACTIVATION_TANH);
+    oaci_compute_generic_dense(&model->fwc5_cont_fc_0, st->fwc5_state, st->cont, ACTIVATION_TANH);
     celt_assert(FWC6_STATE_SIZE == model->fwc6_cont_fc_0.nb_outputs);
-    compute_generic_dense(&model->fwc6_cont_fc_0, st->fwc6_state, st->cont, ACTIVATION_TANH);
+    oaci_compute_generic_dense(&model->fwc6_cont_fc_0, st->fwc6_state, st->cont, ACTIVATION_TANH);
     celt_assert(FWC7_STATE_SIZE == model->fwc7_cont_fc_0.nb_outputs);
-    compute_generic_dense(&model->fwc7_cont_fc_0, st->fwc7_state, st->cont, ACTIVATION_TANH);
+    oaci_compute_generic_dense(&model->fwc7_cont_fc_0, st->fwc7_state, st->cont, ACTIVATION_TANH);
 
     st->cont_initialized = 1;
     /* Process the first frame, discard the first subframe, and keep the rest for the first
@@ -214,7 +214,7 @@ static void run_fwgan_subframe(FWGANState *st, float *pcm, const float *cond, do
     OAC_COPY(&feat_in[BFCC_WITH_CORR_UPSAMPLER_FC_OUT_SIZE/4], &cond[0], BFCC_WITH_CORR_UPSAMPLER_FC_OUT_SIZE/4);
     OAC_COPY(&feat_in[0], &pembed[0], FWGAN_FRAME_SIZE/2);
 
-    compute_generic_conv1d(&model->feat_in_conv1_conv, rnn_in, st->cont_conv1_mem, feat_in, FEAT_IN_CONV1_CONV_IN_SIZE,
+    oaci_compute_generic_conv1d(&model->feat_in_conv1_conv, rnn_in, st->cont_conv1_mem, feat_in, FEAT_IN_CONV1_CONV_IN_SIZE,
     ACTIVATION_LINEAR);
     celt_assert(FEAT_IN_NL1_GATE_OUT_SIZE == model->feat_in_nl1_gate.nb_outputs);
     compute_gated_activation(&model->feat_in_nl1_gate, rnn_in, rnn_in, ACTIVATION_TANH);
@@ -229,29 +229,29 @@ static void run_fwgan_subframe(FWGANState *st, float *pcm, const float *cond, do
         return;
     }
 
-    compute_generic_gru(&model->rnn_gru_input, &model->rnn_gru_recurrent, st->rnn_state, rnn_in);
+    oaci_compute_generic_gru(&model->rnn_gru_input, &model->rnn_gru_recurrent, st->rnn_state, rnn_in);
     celt_assert(IMAX(RNN_GRU_STATE_SIZE, FWC2_FC_0_OUT_SIZE) >= model->rnn_nl_gate.nb_outputs);
     compute_gated_activation(&model->rnn_nl_gate, tmp2, st->rnn_state, ACTIVATION_TANH);
 
-    compute_generic_conv1d(&model->fwc1_fc_0, tmp1, st->fwc1_state, tmp2, RNN_GRU_STATE_SIZE, ACTIVATION_LINEAR);
+    oaci_compute_generic_conv1d(&model->fwc1_fc_0, tmp1, st->fwc1_state, tmp2, RNN_GRU_STATE_SIZE, ACTIVATION_LINEAR);
     compute_gated_activation(&model->fwc1_fc_1_gate, tmp1, tmp1, ACTIVATION_TANH);
 
-    compute_generic_conv1d(&model->fwc2_fc_0, tmp2, st->fwc2_state, tmp1, FWC1_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
+    oaci_compute_generic_conv1d(&model->fwc2_fc_0, tmp2, st->fwc2_state, tmp1, FWC1_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
     compute_gated_activation(&model->fwc2_fc_1_gate, tmp2, tmp2, ACTIVATION_TANH);
 
-    compute_generic_conv1d(&model->fwc3_fc_0, tmp1, st->fwc3_state, tmp2, FWC2_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
+    oaci_compute_generic_conv1d(&model->fwc3_fc_0, tmp1, st->fwc3_state, tmp2, FWC2_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
     compute_gated_activation(&model->fwc3_fc_1_gate, tmp1, tmp1, ACTIVATION_TANH);
 
-    compute_generic_conv1d(&model->fwc4_fc_0, tmp2, st->fwc4_state, tmp1, FWC3_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
+    oaci_compute_generic_conv1d(&model->fwc4_fc_0, tmp2, st->fwc4_state, tmp1, FWC3_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
     compute_gated_activation(&model->fwc4_fc_1_gate, tmp2, tmp2, ACTIVATION_TANH);
 
-    compute_generic_conv1d(&model->fwc5_fc_0, tmp1, st->fwc5_state, tmp2, FWC4_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
+    oaci_compute_generic_conv1d(&model->fwc5_fc_0, tmp1, st->fwc5_state, tmp2, FWC4_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
     compute_gated_activation(&model->fwc5_fc_1_gate, tmp1, tmp1, ACTIVATION_TANH);
 
-    compute_generic_conv1d(&model->fwc6_fc_0, tmp2, st->fwc6_state, tmp1, FWC5_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
+    oaci_compute_generic_conv1d(&model->fwc6_fc_0, tmp2, st->fwc6_state, tmp1, FWC5_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
     compute_gated_activation(&model->fwc6_fc_1_gate, tmp2, tmp2, ACTIVATION_TANH);
 
-    compute_generic_conv1d(&model->fwc7_fc_0, tmp1, st->fwc7_state, tmp2, FWC6_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
+    oaci_compute_generic_conv1d(&model->fwc7_fc_0, tmp1, st->fwc7_state, tmp2, FWC6_FC_0_OUT_SIZE, ACTIVATION_LINEAR);
     compute_gated_activation(&model->fwc7_fc_1_gate, pcm, tmp1, ACTIVATION_TANH);
 
     apply_gain(pcm, c0, &st->last_gain);
@@ -271,7 +271,7 @@ void fwgan_init(FWGANState *st) {
 int fwgan_load_model(FWGANState *st, const unsigned char *data, int len) {
     WeightArray *list;
     int ret;
-    parse_weights(&list, data, len);
+    oaci_parse_weights(&list, data, len);
     ret = init_fwgan(&st->model, list);
     oac_free(list);
     if (ret == 0) return 0;
diff --git a/dnn/lossgen.c b/dnn/lossgen.c
index ecdbb9b71..5b2a412a0 100644
--- a/dnn/lossgen.c
+++ b/dnn/lossgen.c
@@ -70,13 +70,13 @@
 #include "parse_lpcnet_weights.c"
 #include "nnet_arch.h"
 
-#undef compute_linear
-#undef compute_activation
+#undef oaci_compute_linear
+#undef oaci_compute_activation
 
 /* Force the C version since the SIMD versions may be hidden. */
-#define compute_linear(linear, out, in, arch) ((void)(arch), compute_linear_c(linear, out, in))
-#define compute_activation(output, input, N, activation, arch) ((void)(arch), \
-                                                                compute_activation_c(output, input, N, activation))
+#define oaci_compute_linear(linear, out, in, arch) ((void)(arch), oaci_compute_linear_c(linear, out, in))
+#define oaci_compute_activation(output, input, N, activation, arch) ((void)(arch), \
+                                                                oaci_compute_activation_c(output, input, N, activation))
 
 #define MAX_RNN_NEURONS_ALL IMAX(LOSSGEN_GRU1_STATE_SIZE, LOSSGEN_GRU2_STATE_SIZE)
 
@@ -98,14 +98,14 @@ void compute_generic_gru_lossgen(const LinearLayer *input_weights, const LinearL
     h = &zrh[2*N];
     celt_assert(recurrent_weights->nb_outputs <= 3*MAX_RNN_NEURONS_ALL);
     celt_assert(in != state);
-    compute_linear(input_weights, zrh, in, arch);
-    compute_linear(recurrent_weights, recur, state, arch);
+    oaci_compute_linear(input_weights, zrh, in, arch);
+    oaci_compute_linear(recurrent_weights, recur, state, arch);
     for (i = 0; i < 2*N; i++)
         zrh[i] += recur[i];
-    compute_activation(zrh, zrh, 2*N, ACTIVATION_SIGMOID, arch);
+    oaci_compute_activation(zrh, zrh, 2*N, ACTIVATION_SIGMOID, arch);
     for (i = 0; i < N; i++)
         h[i] += recur[2*N + i]*r[i];
-    compute_activation(h, h, N, ACTIVATION_TANH, arch);
+    oaci_compute_activation(h, h, N, ACTIVATION_TANH, arch);
     for (i = 0; i < N; i++)
         h[i] = z[i]*state[i] + (1 - z[i])*h[i];
     for (i = 0; i < N; i++)
@@ -115,8 +115,8 @@ void compute_generic_gru_lossgen(const LinearLayer *input_weights, const LinearL
 
 void compute_generic_dense_lossgen(const LinearLayer *layer, float *output, const float *input, int activation,
                                    int arch) {
-    compute_linear(layer, output, input, arch);
-    compute_activation(output, output, layer->nb_outputs, activation, arch);
+    oaci_compute_linear(layer, output, input, arch);
+    oaci_compute_activation(output, output, layer->nb_outputs, activation, arch);
 }
 
 
@@ -156,7 +156,7 @@ int sample_loss(
 void lossgen_init(LossGenState *st) {
     int ret;
     OAC_CLEAR(st, 1);
-    ret = init_lossgen(&st->model, lossgen_arrays);
+    ret = oaci_init_lossgen(&st->model, oaci_lossgen_arrays);
     celt_assert(ret == 0);
     (void)ret;
 }
@@ -164,8 +164,8 @@ void lossgen_init(LossGenState *st) {
 int lossgen_load_model(LossGenState *st, const void *data, int len) {
     WeightArray *list;
     int ret;
-    parse_weights(&list, data, len);
-    ret = init_lossgen(&st->model, list);
+    oaci_parse_weights(&list, data, len);
+    ret = oaci_init_lossgen(&st->model, list);
     oac_free(list);
     if (ret == 0) return 0;
     else return -1;
diff --git a/dnn/lpcnet.c b/dnn/lpcnet.c
index 4f3e0775a..8a80bd63b 100644
--- a/dnn/lpcnet.c
+++ b/dnn/lpcnet.c
@@ -104,12 +104,12 @@ void run_frame_network(LPCNetState *lpcnet, float *gru_a_condition, float *gru_b
 #elif FEATURES_DELAY > 0
     memcpy(lpc, lpcnet->old_lpc[FEATURES_DELAY - 1], LPC_ORDER*sizeof(lpc[0]));
     memmove(lpcnet->old_lpc[1], lpcnet->old_lpc[0], (FEATURES_DELAY - 1)*LPC_ORDER*sizeof(lpc[0]));
-    lpc_from_cepstrum(lpcnet->old_lpc[0], features);
+    oaci_lpc_from_cepstrum(lpcnet->old_lpc[0], features);
 #else
-    lpc_from_cepstrum(lpc, features);
+    oaci_lpc_from_cepstrum(lpc, features);
 #endif
 #ifdef LPC_GAMMA
-    lpc_weighting(lpc, LPC_GAMMA);
+    oaci_lpc_weighting(lpc, LPC_GAMMA);
 #endif
     if (lpcnet->frame_count < 1000) lpcnet->frame_count++;
 }
@@ -193,7 +193,7 @@ int lpcnet_init(LPCNetState *lpcnet) {
 int lpcnet_load_model(LPCNetState *st, const unsigned char *data, int len) {
     WeightArray *list;
     int ret;
-    parse_weights(&list, data, len);
+    oaci_parse_weights(&list, data, len);
     ret = init_lpcnet_model(&st->model, list);
     oac_free(list);
     if (ret == 0) return 0;
diff --git a/dnn/lpcnet.h b/dnn/lpcnet.h
index c0c86211c..bd9d6f9a3 100644
--- a/dnn/lpcnet.h
+++ b/dnn/lpcnet.h
@@ -83,28 +83,28 @@ int lpcnet_decode(LPCNetDecState *st, const unsigned char *buf, oac_int16 *pcm);
 /** Gets the size of an <code>LPCNetEncState</code> structure.
  * @returns The size in bytes.
  */
-int lpcnet_encoder_get_size(void);
+int oaci_lpcnet_encoder_get_size(void);
 
 /** Initializes a previously allocated encoder state
- * The memory pointed to by st must be at least the size returned by lpcnet_encoder_get_size().
+ * The memory pointed to by st must be at least the size returned by oaci_lpcnet_encoder_get_size().
  * This is intended for applications which use their own allocator instead of malloc.
- * @see lpcnet_encoder_create(),lpcnet_encoder_get_size()
+ * @see oaci_lpcnet_encoder_create(),oaci_lpcnet_encoder_get_size()
  * @param [in] st <tt>LPCNetEncState*</tt>: Encoder state
  * @retval 0 Success
  */
-int lpcnet_encoder_init(LPCNetEncState *st);
+int oaci_lpcnet_encoder_init(LPCNetEncState *st);
 
-int lpcnet_encoder_load_model(LPCNetEncState *st, const void *data, int len);
+int oaci_lpcnet_encoder_load_model(LPCNetEncState *st, const void *data, int len);
 
 /** Allocates and initializes an encoder state.
  *  @returns The newly created state
  */
-LPCNetEncState *lpcnet_encoder_create(void);
+LPCNetEncState *oaci_lpcnet_encoder_create(void);
 
-/** Frees an <code>LPCNetEncState</code> allocated by lpcnet_encoder_create().
+/** Frees an <code>LPCNetEncState</code> allocated by oaci_lpcnet_encoder_create().
  * @param[in] st <tt>LPCNetEncState*</tt>: State to be freed.
  */
-void lpcnet_encoder_destroy(LPCNetEncState *st);
+void oaci_lpcnet_encoder_destroy(LPCNetEncState *st);
 
 /** Encodes LPCNET_PACKET_SAMPLES speech samples (currently 640) into a packet of LPCNET_COMPRESSED_SIZE bytes (currently 8).
  * @param [in] st <tt>LPCNetDecState*</tt>: Encoder state
@@ -120,7 +120,7 @@ int lpcnet_encode(LPCNetEncState *st, const oac_int16 *pcm, unsigned char *buf);
  * @param [out] features <tt>float[NB_TOTAL_FEATURES]</tt>: Four feature vectors
  * @retval 0 Success
  */
-int lpcnet_compute_single_frame_features(LPCNetEncState *st, const oac_int16 *pcm, float features[NB_TOTAL_FEATURES],
+int oaci_lpcnet_compute_single_frame_features(LPCNetEncState *st, const oac_int16 *pcm, float features[NB_TOTAL_FEATURES],
     int arch);
 
 
@@ -130,7 +130,7 @@ int lpcnet_compute_single_frame_features(LPCNetEncState *st, const oac_int16 *pc
  * @param [out] features <tt>float[NB_TOTAL_FEATURES]</tt>: Four feature vectors
  * @retval 0 Success
  */
-int lpcnet_compute_single_frame_features_float(LPCNetEncState *st, const float *pcm, float features[NB_TOTAL_FEATURES],
+int oaci_lpcnet_compute_single_frame_features_float(LPCNetEncState *st, const float *pcm, float features[NB_TOTAL_FEATURES],
     int arch);
 
 /** Gets the size of an <code>LPCNetState</code> structure.
@@ -168,18 +168,18 @@ void lpcnet_synthesize(LPCNetState *st, const float *features, oac_int16 *output
 
 
 
-int lpcnet_plc_init(LPCNetPLCState *st);
-void lpcnet_plc_reset(LPCNetPLCState *st);
+int oaci_lpcnet_plc_init(LPCNetPLCState *st);
+void oaci_lpcnet_plc_reset(LPCNetPLCState *st);
 
-int lpcnet_plc_update(LPCNetPLCState *st, oac_int16 *pcm);
+int oaci_lpcnet_plc_update(LPCNetPLCState *st, oac_int16 *pcm);
 
-int lpcnet_plc_conceal(LPCNetPLCState *st, oac_int16 *pcm);
+int oaci_lpcnet_plc_conceal(LPCNetPLCState *st, oac_int16 *pcm);
 
-void lpcnet_plc_fec_add(LPCNetPLCState *st, const float *features);
+void oaci_lpcnet_plc_fec_add(LPCNetPLCState *st, const float *features);
 
-void lpcnet_plc_fec_clear(LPCNetPLCState *st);
+void oaci_lpcnet_plc_fec_clear(LPCNetPLCState *st);
 
 int lpcnet_load_model(LPCNetState *st, const void *data, int len);
-int lpcnet_plc_load_model(LPCNetPLCState *st, const void *data, int len);
+int oaci_lpcnet_plc_load_model(LPCNetPLCState *st, const void *data, int len);
 
 #endif
diff --git a/dnn/lpcnet_enc.c b/dnn/lpcnet_enc.c
index 4b687e27d..0ab1fad3f 100644
--- a/dnn/lpcnet_enc.c
+++ b/dnn/lpcnet_enc.c
@@ -46,28 +46,28 @@
 #include "mathops.h"
 
 
-int lpcnet_encoder_get_size(void) {
+int oaci_lpcnet_encoder_get_size(void) {
     return sizeof(LPCNetEncState);
 }
 
-int lpcnet_encoder_init(LPCNetEncState *st) {
+int oaci_lpcnet_encoder_init(LPCNetEncState *st) {
     memset(st, 0, sizeof(*st));
-    pitchdnn_init(&st->pitchdnn);
+    oaci_pitchdnn_init(&st->pitchdnn);
     return 0;
 }
 
-int lpcnet_encoder_load_model(LPCNetEncState *st, const void *data, int len) {
-    return pitchdnn_load_model(&st->pitchdnn, data, len);
+int oaci_lpcnet_encoder_load_model(LPCNetEncState *st, const void *data, int len) {
+    return oaci_pitchdnn_load_model(&st->pitchdnn, data, len);
 }
 
-LPCNetEncState *lpcnet_encoder_create(void) {
+LPCNetEncState *oaci_lpcnet_encoder_create(void) {
     LPCNetEncState *st;
-    st = (LPCNetEncState*)oac_alloc(lpcnet_encoder_get_size());
-    lpcnet_encoder_init(st);
+    st = (LPCNetEncState*)oac_alloc(oaci_lpcnet_encoder_get_size());
+    oaci_lpcnet_encoder_init(st);
     return st;
 }
 
-void lpcnet_encoder_destroy(LPCNetEncState *st) {
+void oaci_lpcnet_encoder_destroy(LPCNetEncState *st) {
     oac_free(st);
 }
 
@@ -76,9 +76,9 @@ static void frame_analysis(LPCNetEncState *st, kiss_fft_cpx *X, float *Ex, const
     OAC_COPY(x, st->analysis_mem, OVERLAP_SIZE);
     OAC_COPY(&x[OVERLAP_SIZE], in, FRAME_SIZE);
     OAC_COPY(st->analysis_mem, &in[FRAME_SIZE - OVERLAP_SIZE], OVERLAP_SIZE);
-    apply_window(x);
-    forward_transform(X, x);
-    lpcn_compute_band_energy(Ex, X);
+    oaci_apply_window(x);
+    oaci_forward_transform(X, x);
+    oaci_lpcn_compute_band_energy(Ex, X);
 }
 
 static void biquad(float *y, float mem[2], const float *x, const float *b, const float *a, int N) {
@@ -106,7 +106,7 @@ static void biquad(float *y, float mem[2], const float *x, const float *b, const
 
 #define celt_log10(x) (0.3010299957f*celt_log2(x))
 
-void compute_frame_features(LPCNetEncState *st, const float *in, int arch) {
+void oaci_compute_frame_features(LPCNetEncState *st, const float *in, int arch) {
     float aligned_in[FRAME_SIZE];
     int i;
     float Ly[NB_BANDS];
@@ -148,9 +148,9 @@ void compute_frame_features(LPCNetEncState *st, const float *in, int arch) {
         logMax = MAX16(logMax, Ly[i]);
         follow = MAX16(follow - 2.5f, Ly[i]);
     }
-    dct(st->features, Ly);
+    oaci_dct(st->features, Ly);
     st->features[0] -= 4;
-    lpc_from_cepstrum(st->lpc, st->features);
+    oaci_lpc_from_cepstrum(st->lpc, st->features);
     for (i = 0; i < LPC_ORDER; i++) st->features[NB_BANDS + 2 + i] = st->lpc[i];
     OAC_MOVE(st->exc_buf, &st->exc_buf[FRAME_SIZE], PITCH_MAX_PERIOD);
     OAC_MOVE(st->lp_buf, &st->lp_buf[FRAME_SIZE], PITCH_MAX_PERIOD);
@@ -158,7 +158,7 @@ void compute_frame_features(LPCNetEncState *st, const float *in, int arch) {
     OAC_COPY(&x[0], st->pitch_mem, LPC_ORDER);
     OAC_COPY(&x[LPC_ORDER], aligned_in, FRAME_SIZE);
     OAC_COPY(st->pitch_mem, &aligned_in[FRAME_SIZE - LPC_ORDER], LPC_ORDER);
-    celt_fir(&x[LPC_ORDER], st->lpc, &st->lp_buf[PITCH_MAX_PERIOD], FRAME_SIZE, LPC_ORDER, arch);
+    oaci_celt_fir(&x[LPC_ORDER], st->lpc, &st->lp_buf[PITCH_MAX_PERIOD], FRAME_SIZE, LPC_ORDER, arch);
     for (i = 0; i < FRAME_SIZE; i++) {
         st->exc_buf[PITCH_MAX_PERIOD + i] = st->lp_buf[PITCH_MAX_PERIOD + i] + .7f*st->pitch_filt;
         st->pitch_filt = st->lp_buf[PITCH_MAX_PERIOD + i];
@@ -168,9 +168,9 @@ void compute_frame_features(LPCNetEncState *st, const float *in, int arch) {
     {
         double ener1;
         float *buf = st->exc_buf;
-        celt_pitch_xcorr(&buf[PITCH_MAX_PERIOD], buf, xcorr, FRAME_SIZE, PITCH_MAX_PERIOD - PITCH_MIN_PERIOD, arch);
-        ener0 = celt_inner_prod(&buf[PITCH_MAX_PERIOD], &buf[PITCH_MAX_PERIOD], FRAME_SIZE, arch);
-        ener1 = celt_inner_prod(&buf[0], &buf[0], FRAME_SIZE, arch);
+        oaci_celt_pitch_xcorr(&buf[PITCH_MAX_PERIOD], buf, xcorr, FRAME_SIZE, PITCH_MAX_PERIOD - PITCH_MIN_PERIOD, arch);
+        ener0 = oaci_celt_inner_prod(&buf[PITCH_MAX_PERIOD], &buf[PITCH_MAX_PERIOD], FRAME_SIZE, arch);
+        ener1 = oaci_celt_inner_prod(&buf[0], &buf[0], FRAME_SIZE, arch);
         /*printf("%f\n", st->frame_weight[sub]);*/
         for (i = 0; i < PITCH_MAX_PERIOD - PITCH_MIN_PERIOD; i++) {
             ener = 1 + ener0 + ener1;
@@ -185,12 +185,12 @@ void compute_frame_features(LPCNetEncState *st, const float *in, int arch) {
         }
         /*printf("\n");*/
     }
-    st->dnn_pitch = compute_pitchdnn(&st->pitchdnn, st->if_features, st->xcorr_features, arch);
+    st->dnn_pitch = oaci_compute_pitchdnn(&st->pitchdnn, st->if_features, st->xcorr_features, arch);
     pitch = (int)floor(.5 + 256./pow(2.f, ((1./60.)*((st->dnn_pitch + 1.5)*60))));
-    xx = celt_inner_prod(&st->lp_buf[PITCH_MAX_PERIOD], &st->lp_buf[PITCH_MAX_PERIOD], FRAME_SIZE, arch);
-    yy = celt_inner_prod(&st->lp_buf[PITCH_MAX_PERIOD - pitch], &st->lp_buf[PITCH_MAX_PERIOD - pitch], FRAME_SIZE,
+    xx = oaci_celt_inner_prod(&st->lp_buf[PITCH_MAX_PERIOD], &st->lp_buf[PITCH_MAX_PERIOD], FRAME_SIZE, arch);
+    yy = oaci_celt_inner_prod(&st->lp_buf[PITCH_MAX_PERIOD - pitch], &st->lp_buf[PITCH_MAX_PERIOD - pitch], FRAME_SIZE,
     arch);
-    xy = celt_inner_prod(&st->lp_buf[PITCH_MAX_PERIOD], &st->lp_buf[PITCH_MAX_PERIOD - pitch], FRAME_SIZE, arch);
+    xy = oaci_celt_inner_prod(&st->lp_buf[PITCH_MAX_PERIOD], &st->lp_buf[PITCH_MAX_PERIOD - pitch], FRAME_SIZE, arch);
     /*printf("%f %f\n", frame_corr, xy/sqrt(1e-15+xx*yy));*/
     frame_corr = xy/sqrt(1 + xx*yy);
     frame_corr = log(1.f + exp(5.f*frame_corr))/log(1 + exp(5.f));
@@ -198,7 +198,7 @@ void compute_frame_features(LPCNetEncState *st, const float *in, int arch) {
     st->features[NB_BANDS + 1] = frame_corr - .5f;
 }
 
-void preemphasis(float *y, float *mem, const float *x, float coef, int N) {
+void oaci_preemphasis(float *y, float *mem, const float *x, float coef, int N) {
     int i;
     for (i = 0; i < N; i++) {
         float yi;
@@ -210,13 +210,13 @@ void preemphasis(float *y, float *mem, const float *x, float coef, int N) {
 
 static int lpcnet_compute_single_frame_features_impl(LPCNetEncState *st, float *x, float features[NB_TOTAL_FEATURES],
                                                      int arch) {
-    preemphasis(x, &st->mem_preemph, x, PREEMPHASIS, FRAME_SIZE);
-    compute_frame_features(st, x, arch);
+    oaci_preemphasis(x, &st->mem_preemph, x, PREEMPHASIS, FRAME_SIZE);
+    oaci_compute_frame_features(st, x, arch);
     OAC_COPY(features, &st->features[0], NB_TOTAL_FEATURES);
     return 0;
 }
 
-int lpcnet_compute_single_frame_features(LPCNetEncState *st, const oac_int16 *pcm, float features[NB_TOTAL_FEATURES],
+int oaci_lpcnet_compute_single_frame_features(LPCNetEncState *st, const oac_int16 *pcm, float features[NB_TOTAL_FEATURES],
                                          int arch) {
     int i;
     float x[FRAME_SIZE];
@@ -225,7 +225,7 @@ int lpcnet_compute_single_frame_features(LPCNetEncState *st, const oac_int16 *pc
     return 0;
 }
 
-int lpcnet_compute_single_frame_features_float(LPCNetEncState *st, const float *pcm, float features[NB_TOTAL_FEATURES],
+int oaci_lpcnet_compute_single_frame_features_float(LPCNetEncState *st, const float *pcm, float features[NB_TOTAL_FEATURES],
                                                int arch) {
     int i;
     float x[FRAME_SIZE];
diff --git a/dnn/lpcnet_plc.c b/dnn/lpcnet_plc.c
index 4b8e9d30d..44d6eebaa 100644
--- a/dnn/lpcnet_plc.c
+++ b/dnn/lpcnet_plc.c
@@ -42,11 +42,11 @@
 /* Comment this out to have LPCNet update its state on every good packet (slow). */
 #define PLC_SKIP_UPDATES
 
-void lpcnet_plc_reset(LPCNetPLCState *st) {
+void oaci_lpcnet_plc_reset(LPCNetPLCState *st) {
     OAC_CLEAR((char*)&st->LPCNET_PLC_RESET_START,
           sizeof(LPCNetPLCState)
         - ((char*)&st->LPCNET_PLC_RESET_START - (char*)st));
-    lpcnet_encoder_init(&st->enc);
+    oaci_lpcnet_encoder_init(&st->enc);
     OAC_CLEAR(st->pcm, PLC_BUF_SIZE);
     st->blend = 0;
     st->loss_count = 0;
@@ -55,40 +55,40 @@ void lpcnet_plc_reset(LPCNetPLCState *st) {
     st->predict_pos = PLC_BUF_SIZE;
 }
 
-int lpcnet_plc_init(LPCNetPLCState *st) {
+int oaci_lpcnet_plc_init(LPCNetPLCState *st) {
     int ret;
     st->arch = oac_select_arch();
-    fargan_init(&st->fargan);
-    lpcnet_encoder_init(&st->enc);
+    oaci_fargan_init(&st->fargan);
+    oaci_lpcnet_encoder_init(&st->enc);
     st->loaded = 0;
 #ifndef USE_WEIGHTS_FILE
-    ret = init_plcmodel(&st->model, plcmodel_arrays);
+    ret = oaci_init_plcmodel(&st->model, oaci_plcmodel_arrays);
     if (ret == 0) st->loaded = 1;
 #else
     ret = 0;
 #endif
     celt_assert(ret == 0);
-    lpcnet_plc_reset(st);
+    oaci_lpcnet_plc_reset(st);
     return ret;
 }
 
-int lpcnet_plc_load_model(LPCNetPLCState *st, const void *data, int len) {
+int oaci_lpcnet_plc_load_model(LPCNetPLCState *st, const void *data, int len) {
     WeightArray *list;
     int ret;
-    parse_weights(&list, data, len);
-    ret = init_plcmodel(&st->model, list);
+    oaci_parse_weights(&list, data, len);
+    ret = oaci_init_plcmodel(&st->model, list);
     oac_free(list);
     if (ret == 0) {
-        ret = lpcnet_encoder_load_model(&st->enc, data, len);
+        ret = oaci_lpcnet_encoder_load_model(&st->enc, data, len);
     }
     if (ret == 0) {
-        ret = fargan_load_model(&st->fargan, data, len);
+        ret = oaci_fargan_load_model(&st->fargan, data, len);
     }
     if (ret == 0) st->loaded = 1;
     return ret;
 }
 
-void lpcnet_plc_fec_add(LPCNetPLCState *st, const float *features) {
+void oaci_lpcnet_plc_fec_add(LPCNetPLCState *st, const float *features) {
     if (features == NULL) {
         st->fec_skip++;
         return;
@@ -98,7 +98,7 @@ void lpcnet_plc_fec_add(LPCNetPLCState *st, const float *features) {
     st->fec_fill_pos++;
 }
 
-void lpcnet_plc_fec_clear(LPCNetPLCState *st) {
+void oaci_lpcnet_plc_fec_clear(LPCNetPLCState *st) {
     st->fec_read_pos = st->fec_fill_pos = st->fec_skip = 0;
 }
 
@@ -108,10 +108,10 @@ static void compute_plc_pred(LPCNetPLCState *st, float *out, const float *in) {
     PLCModel *model = &st->model;
     PLCNetState *net = &st->plc_net;
     celt_assert(st->loaded);
-    compute_generic_dense(&model->plc_dense_in, tmp, in, ACTIVATION_TANH, st->arch);
-    compute_generic_gru(&model->plc_gru1_input, &model->plc_gru1_recurrent, net->gru1_state, tmp, st->arch);
-    compute_generic_gru(&model->plc_gru2_input, &model->plc_gru2_recurrent, net->gru2_state, net->gru1_state, st->arch);
-    compute_generic_dense(&model->plc_dense_out, out, net->gru2_state, ACTIVATION_LINEAR, st->arch);
+    oaci_compute_generic_dense(&model->plc_dense_in, tmp, in, ACTIVATION_TANH, st->arch);
+    oaci_compute_generic_gru(&model->plc_gru1_input, &model->plc_gru1_recurrent, net->gru1_state, tmp, st->arch);
+    oaci_compute_generic_gru(&model->plc_gru2_input, &model->plc_gru2_recurrent, net->gru2_state, net->gru1_state, st->arch);
+    oaci_compute_generic_dense(&model->plc_dense_out, out, net->gru2_state, ACTIVATION_LINEAR, st->arch);
 }
 
 static int get_fec_or_pred(LPCNetPLCState *st, float *out) {
@@ -141,7 +141,7 @@ static void queue_features(LPCNetPLCState *st, const float *features) {
 /* In this causal version of the code, the DNN model implemented by compute_plc_pred()
    needs to generate two feature vectors to conceal the first lost packet.*/
 
-int lpcnet_plc_update(LPCNetPLCState *st, oac_int16 *pcm) {
+int oaci_lpcnet_plc_update(LPCNetPLCState *st, oac_int16 *pcm) {
     int i;
     if (st->analysis_pos - FRAME_SIZE >= 0) st->analysis_pos -= FRAME_SIZE;
     else st->analysis_gap = 1;
@@ -154,7 +154,7 @@ int lpcnet_plc_update(LPCNetPLCState *st, oac_int16 *pcm) {
 }
 
 static const float att_table[10] = {0, 0,  -.2, -.2,  -.4, -.4,  -.8, -.8, -1.6, -1.6};
-int lpcnet_plc_conceal(LPCNetPLCState *st, oac_int16 *pcm) {
+int oaci_lpcnet_plc_conceal(LPCNetPLCState *st, oac_int16 *pcm) {
     int i;
     celt_assert(st->loaded);
     if (st->blend == 0) {
@@ -165,8 +165,8 @@ int lpcnet_plc_conceal(LPCNetPLCState *st, oac_int16 *pcm) {
             float plc_features[2*NB_BANDS + NB_FEATURES + 1];
             celt_assert(st->analysis_pos >= 0);
             for (i = 0; i < FRAME_SIZE; i++) x[i] = 32768.f*st->pcm[st->analysis_pos + i];
-            burg_cepstral_analysis(plc_features, x);
-            lpcnet_compute_single_frame_features_float(&st->enc, x, st->features, st->arch);
+            oaci_burg_cepstral_analysis(plc_features, x);
+            oaci_lpcnet_compute_single_frame_features_float(&st->enc, x, st->features, st->arch);
             if ((!st->analysis_gap || count > 0) && st->analysis_pos >= st->predict_pos) {
                 queue_features(st, st->features);
                 OAC_COPY(&plc_features[2*NB_BANDS], st->features, NB_FEATURES);
@@ -186,7 +186,7 @@ int lpcnet_plc_conceal(LPCNetPLCState *st, oac_int16 *pcm) {
         st->plc_bak[1] = st->plc_net;
         get_fec_or_pred(st, st->features);
         queue_features(st, st->features);
-        fargan_cont(&st->fargan, &st->pcm[PLC_BUF_SIZE - FARGAN_CONT_SAMPLES], st->cont_features);
+        oaci_fargan_cont(&st->fargan, &st->pcm[PLC_BUF_SIZE - FARGAN_CONT_SAMPLES], st->cont_features);
         st->analysis_gap = 0;
     }
     st->plc_bak[0] = st->plc_bak[1];
@@ -195,7 +195,7 @@ int lpcnet_plc_conceal(LPCNetPLCState *st, oac_int16 *pcm) {
     else st->loss_count++;
     if (st->loss_count >= 10) st->features[0] = MAX16(-15, st->features[0] + att_table[9] - 2*(st->loss_count - 9));
     else st->features[0] = MAX16(-15, st->features[0] + att_table[st->loss_count]);
-    fargan_synthesize_int(&st->fargan, pcm, &st->features[0]);
+    oaci_fargan_synthesize_int(&st->fargan, pcm, &st->features[0]);
     queue_features(st, st->features);
     if (st->analysis_pos - FRAME_SIZE >= 0) st->analysis_pos -= FRAME_SIZE;
     else st->analysis_gap = 1;
diff --git a/dnn/lpcnet_private.h b/dnn/lpcnet_private.h
index 0af48d3cc..ec7963d7d 100644
--- a/dnn/lpcnet_private.h
+++ b/dnn/lpcnet_private.h
@@ -71,9 +71,9 @@ struct LPCNetPLCState {
     PLCNetState plc_bak[2];
 };
 
-void preemphasis(float *y, float *mem, const float *x, float coef, int N);
+void oaci_preemphasis(float *y, float *mem, const float *x, float coef, int N);
 
-void compute_frame_features(LPCNetEncState *st, const float *in, int arch);
+void oaci_compute_frame_features(LPCNetEncState *st, const float *in, int arch);
 
 void lpcnet_reset_signal(LPCNetState *lpcnet);
 void run_frame_network(LPCNetState *lpcnet, float *gru_a_condition, float *gru_b_condition, float *lpc,
diff --git a/dnn/lpcnet_tables.c b/dnn/lpcnet_tables.c
index 239223474..1cf0fb9cc 100644
--- a/dnn/lpcnet_tables.c
+++ b/dnn/lpcnet_tables.c
@@ -196,7 +196,7 @@ static const kiss_twiddle_cpx fft_twiddles[320] = {
     {0.999229014f, 0.0392598175f}, {0.999807239f, 0.0196336918f},
 };
 
-const kiss_fft_state kfft = {
+const kiss_fft_state oaci_kfft = {
     320, /* nfft */
     0.0031250000f, /* scale */
     -1, /* shift */
@@ -206,7 +206,7 @@ const kiss_fft_state kfft = {
     (arch_fft_state *)&arch_fft, /* arch_fft*/
 };
 
-const float half_window[] = {
+const float oaci_half_window[] = {
     3.78491532e-05f, 0.000340620492f, 0.000946046319f, 0.00185389258f, 0.00306380726f,
     0.00457531959f, 0.00638783723f, 0.00850064680f, 0.0109129101f, 0.0136236614f,
     0.0166318044f, 0.0199361145f, 0.0235352255f, 0.0274276342f, 0.0316116922f,
@@ -241,7 +241,7 @@ const float half_window[] = {
     0.999995291f, 0.999998271f, 0.999999523f, 0.999999940f, 1.00000000f,
 };
 
-const float dct_table[] = {
+const float oaci_dct_table[] = {
     0.707106769f, 0.996194720f, 0.984807730f, 0.965925813f, 0.939692616f,
     0.906307817f, 0.866025388f, 0.819152057f, 0.766044438f, 0.707106769f,
     0.642787635f, 0.573576450f, 0.500000000f, 0.422618270f, 0.342020154f,
diff --git a/dnn/nndsp.c b/dnn/nndsp.c
index 9989a5f9a..3d950ebad 100644
--- a/dnn/nndsp.c
+++ b/dnn/nndsp.c
@@ -46,19 +46,19 @@
 #define KERNEL_INDEX(i_out_channels, i_in_channels, \
                      i_kernel) ((((i_out_channels)*in_channels) + (i_in_channels))*kernel_size + (i_kernel))
 
-void init_adaconv_state(AdaConvState *hAdaConv) {
+void oaci_init_adaconv_state(AdaConvState *hAdaConv) {
     OAC_CLEAR(hAdaConv, 1);
 }
 
-void init_adacomb_state(AdaCombState *hAdaComb) {
+void oaci_init_adacomb_state(AdaCombState *hAdaComb) {
     OAC_CLEAR(hAdaComb, 1);
 }
 
-void init_adashape_state(AdaShapeState *hAdaShape) {
+void oaci_init_adashape_state(AdaShapeState *hAdaShape) {
     OAC_CLEAR(hAdaShape, 1);
 }
 
-void compute_overlap_window(float *window, int overlap_size) {
+void oaci_compute_overlap_window(float *window, int overlap_size) {
     int i_sample;
     for (i_sample = 0; i_sample < overlap_size; i_sample++) {
         window[i_sample] = 0.5f + 0.5f*cos(M_PI*(i_sample + 0.5f)/overlap_size);
@@ -115,7 +115,7 @@ static void transform_gains(
     }
 }
 
-void adaconv_process_frame(
+void oaci_adaconv_process_frame(
     AdaConvState* hAdaConv,
     float *x_out,
     const float *x_in,
@@ -170,8 +170,8 @@ void adaconv_process_frame(
 
 
     /* calculate new kernel and new gain */
-    compute_generic_dense(kernel_layer, kernel_buffer, features, ACTIVATION_LINEAR, arch);
-    compute_generic_dense(gain_layer, gain_buffer, features, ACTIVATION_TANH, arch);
+    oaci_compute_generic_dense(kernel_layer, kernel_buffer, features, ACTIVATION_LINEAR, arch);
+    oaci_compute_generic_dense(gain_layer, gain_buffer, features, ACTIVATION_TANH, arch);
 #ifdef DEBUG_NNDSP
     print_float_vector("features", features, feature_dim);
     print_float_vector("adaconv_kernel_raw", kernel_buffer, in_channels*out_channels*kernel_size);
@@ -194,9 +194,9 @@ void adaconv_process_frame(
 
             OAC_COPY(kernel0, hAdaConv->last_kernel + KERNEL_INDEX(i_out_channels, i_in_channels, 0), kernel_size);
             OAC_COPY(kernel1, kernel_buffer + KERNEL_INDEX(i_out_channels, i_in_channels, 0), kernel_size);
-            celt_pitch_xcorr(kernel0, p_input + i_in_channels*(frame_size + kernel_size) - left_padding,
+            oaci_celt_pitch_xcorr(kernel0, p_input + i_in_channels*(frame_size + kernel_size) - left_padding,
             channel_buffer0, ADACONV_MAX_KERNEL_SIZE, overlap_size, arch);
-            celt_pitch_xcorr(kernel1, p_input + i_in_channels*(frame_size + kernel_size) - left_padding,
+            oaci_celt_pitch_xcorr(kernel1, p_input + i_in_channels*(frame_size + kernel_size) - left_padding,
             channel_buffer1, ADACONV_MAX_KERNEL_SIZE, frame_size, arch);
             for (i_sample = 0; i_sample < overlap_size; i_sample++) {
                 output_buffer[i_sample + i_out_channels*frame_size] +=  window[i_sample]*channel_buffer0[i_sample];
@@ -223,7 +223,7 @@ void adaconv_process_frame(
     OAC_COPY(hAdaConv->last_kernel, kernel_buffer, kernel_size*in_channels*out_channels);
 }
 
-void adacomb_process_frame(
+void oaci_adacomb_process_frame(
     AdaCombState* hAdaComb,
     float *x_out,
     const float *x_in,
@@ -263,9 +263,9 @@ void adacomb_process_frame(
     p_input = input_buffer + kernel_size + ADACOMB_MAX_LAG;
 
     /* calculate new kernel and new gain */
-    compute_generic_dense(kernel_layer, kernel_buffer, features, ACTIVATION_LINEAR, arch);
-    compute_generic_dense(gain_layer, &gain, features, ACTIVATION_RELU, arch);
-    compute_generic_dense(global_gain_layer, &global_gain, features, ACTIVATION_TANH, arch);
+    oaci_compute_generic_dense(kernel_layer, kernel_buffer, features, ACTIVATION_LINEAR, arch);
+    oaci_compute_generic_dense(gain_layer, &gain, features, ACTIVATION_RELU, arch);
+    oaci_compute_generic_dense(global_gain_layer, &global_gain, features, ACTIVATION_TANH, arch);
 #ifdef DEBUG_NNDSP
     print_float_vector("features", features, feature_dim);
     print_float_vector("adacomb_kernel_raw", kernel_buffer, kernel_size);
@@ -286,10 +286,10 @@ void adacomb_process_frame(
     OAC_COPY(kernel, kernel_buffer, kernel_size);
     OAC_COPY(last_kernel, hAdaComb->last_kernel, kernel_size);
 
-    celt_pitch_xcorr(last_kernel, &p_input[-left_padding - hAdaComb->last_pitch_lag], output_buffer_last,
+    oaci_celt_pitch_xcorr(last_kernel, &p_input[-left_padding - hAdaComb->last_pitch_lag], output_buffer_last,
     ADACOMB_MAX_KERNEL_SIZE, overlap_size, arch);
 
-    celt_pitch_xcorr(kernel, &p_input[-left_padding - pitch_lag], output_buffer, ADACOMB_MAX_KERNEL_SIZE, frame_size,
+    oaci_celt_pitch_xcorr(kernel, &p_input[-left_padding - pitch_lag], output_buffer, ADACOMB_MAX_KERNEL_SIZE, frame_size,
     arch);
     for (i_sample = 0; i_sample < overlap_size; i_sample++) {
         output_buffer[i_sample] = hAdaComb->last_global_gain*window[i_sample]*output_buffer_last[i_sample]
@@ -318,7 +318,7 @@ void adacomb_process_frame(
 }
 
 
-void adashape_process_frame(
+void oaci_adashape_process_frame(
     AdaShapeState *hAdaShape,
     float *x_out,
     const float *x_in,
@@ -373,9 +373,9 @@ void adashape_process_frame(
 #ifdef DEBUG_NNDSP
     print_float_vector("alpha1_in", in_buffer, feature_dim + tenv_size + 1);
 #endif
-    compute_generic_conv1d(alpha1f, out_buffer, hAdaShape->conv_alpha1f_state, in_buffer, feature_dim,
+    oaci_compute_generic_conv1d(alpha1f, out_buffer, hAdaShape->conv_alpha1f_state, in_buffer, feature_dim,
     ACTIVATION_LINEAR, arch);
-    compute_generic_conv1d(alpha1t, tmp_buffer, hAdaShape->conv_alpha1t_state, tenv, tenv_size + 1, ACTIVATION_LINEAR,
+    oaci_compute_generic_conv1d(alpha1t, tmp_buffer, hAdaShape->conv_alpha1t_state, tenv, tenv_size + 1, ACTIVATION_LINEAR,
     arch);
 #ifdef DEBUG_NNDSP
     print_float_vector("alpha1_out", out_buffer, frame_size);
@@ -388,7 +388,7 @@ void adashape_process_frame(
 #ifdef DEBUG_NNDSP
     print_float_vector("post_alpha1", in_buffer, frame_size);
 #endif
-    compute_generic_conv1d(alpha2, tmp_buffer, hAdaShape->conv_alpha2_state, in_buffer, hidden_dim, ACTIVATION_LINEAR,
+    oaci_compute_generic_conv1d(alpha2, tmp_buffer, hAdaShape->conv_alpha2_state, in_buffer, hidden_dim, ACTIVATION_LINEAR,
     arch);
 
 #ifdef DEBUG_NNDSP
@@ -408,7 +408,7 @@ void adashape_process_frame(
     print_float_vector("interpolate_out", out_buffer, frame_size);
 #endif
 
-    compute_activation(out_buffer, out_buffer, frame_size, ACTIVATION_EXP, arch);
+    oaci_compute_activation(out_buffer, out_buffer, frame_size, ACTIVATION_EXP, arch);
     /* shape signal */
     for (i = 0; i < frame_size; i++) {
         x_out[i] = out_buffer[i]*x_in[i];
diff --git a/dnn/nndsp.h b/dnn/nndsp.h
index 4fadc4d52..5533f7894 100644
--- a/dnn/nndsp.h
+++ b/dnn/nndsp.h
@@ -77,15 +77,15 @@ typedef struct {
     float interpolate_state[1];
 } AdaShapeState;
 
-void init_adaconv_state(AdaConvState *hAdaConv);
+void oaci_init_adaconv_state(AdaConvState *hAdaConv);
 
-void init_adacomb_state(AdaCombState *hAdaComb);
+void oaci_init_adacomb_state(AdaCombState *hAdaComb);
 
-void init_adashape_state(AdaShapeState *hAdaShape);
+void oaci_init_adashape_state(AdaShapeState *hAdaShape);
 
-void compute_overlap_window(float *window, int overlap_size);
+void oaci_compute_overlap_window(float *window, int overlap_size);
 
-void adaconv_process_frame(
+void oaci_adaconv_process_frame(
     AdaConvState* hAdaConv,
     float *x_out,
     const float *x_in,
@@ -105,7 +105,7 @@ void adaconv_process_frame(
     float *window,
     int arch);
 
-void adacomb_process_frame(
+void oaci_adacomb_process_frame(
     AdaCombState* hAdaComb,
     float *x_out,
     const float *x_in,
@@ -125,7 +125,7 @@ void adacomb_process_frame(
     float *window,
     int arch);
 
-void adashape_process_frame(
+void oaci_adashape_process_frame(
     AdaShapeState *hAdaShape,
     float *x_out,
     const float *x_in,
diff --git a/dnn/nnet.c b/dnn/nnet.c
index d32723f00..fd8843b7f 100644
--- a/dnn/nnet.c
+++ b/dnn/nnet.c
@@ -57,9 +57,9 @@
 #define SOFTMAX_HACK
 
 
-void compute_generic_dense(const LinearLayer *layer, float *output, const float *input, int activation, int arch) {
-    compute_linear(layer, output, input, arch);
-    compute_activation(output, output, layer->nb_outputs, activation, arch);
+void oaci_compute_generic_dense(const LinearLayer *layer, float *output, const float *input, int activation, int arch) {
+    oaci_compute_linear(layer, output, input, arch);
+    oaci_compute_activation(output, output, layer->nb_outputs, activation, arch);
 }
 
 #ifdef ENABLE_OSCE
@@ -74,7 +74,7 @@ void compute_generic_dense(const LinearLayer *layer, float *output, const float
 # define MAX_RNN_NEURONS_ALL IMAX(IMAX(FARGAN_MAX_RNN_NEURONS, PLC_MAX_RNN_UNITS), DRED_MAX_RNN_NEURONS)
 #endif
 
-void compute_generic_gru(const LinearLayer *input_weights, const LinearLayer *recurrent_weights, float *state,
+void oaci_compute_generic_gru(const LinearLayer *input_weights, const LinearLayer *recurrent_weights, float *state,
                          const float *in, int arch) {
     int i;
     int N;
@@ -91,26 +91,26 @@ void compute_generic_gru(const LinearLayer *input_weights, const LinearLayer *re
     h = &zrh[2*N];
     celt_assert(recurrent_weights->nb_outputs <= 3*MAX_RNN_NEURONS_ALL);
     celt_assert(in != state);
-    compute_linear(input_weights, zrh, in, arch);
-    compute_linear(recurrent_weights, recur, state, arch);
+    oaci_compute_linear(input_weights, zrh, in, arch);
+    oaci_compute_linear(recurrent_weights, recur, state, arch);
     for (i = 0; i < 2*N; i++)
         zrh[i] += recur[i];
-    compute_activation(zrh, zrh, 2*N, ACTIVATION_SIGMOID, arch);
+    oaci_compute_activation(zrh, zrh, 2*N, ACTIVATION_SIGMOID, arch);
     for (i = 0; i < N; i++)
         h[i] += recur[2*N + i]*r[i];
-    compute_activation(h, h, N, ACTIVATION_TANH, arch);
+    oaci_compute_activation(h, h, N, ACTIVATION_TANH, arch);
     for (i = 0; i < N; i++)
         h[i] = z[i]*state[i] + (1 - z[i])*h[i];
     for (i = 0; i < N; i++)
         state[i] = h[i];
 }
 
-void compute_glu(const LinearLayer *layer, float *output, const float *input, int arch) {
+void oaci_compute_glu(const LinearLayer *layer, float *output, const float *input, int arch) {
     int i;
     float act2[MAX_INPUTS];
     celt_assert(layer->nb_inputs == layer->nb_outputs);
-    compute_linear(layer, act2, input, arch);
-    compute_activation(act2, act2, layer->nb_outputs, ACTIVATION_SIGMOID, arch);
+    oaci_compute_linear(layer, act2, input, arch);
+    oaci_compute_activation(act2, act2, layer->nb_outputs, ACTIVATION_SIGMOID, arch);
     if (input == output) {
         /* Give a vectorization hint to the compiler for the in-place case. */
         for (i = 0; i < layer->nb_outputs; i++) output[i] = output[i]*act2[i];
@@ -121,19 +121,19 @@ void compute_glu(const LinearLayer *layer, float *output, const float *input, in
 
 #define MAX_CONV_INPUTS_ALL IMAX(DRED_MAX_CONV_INPUTS, 1024)
 
-void compute_generic_conv1d(const LinearLayer *layer, float *output, float *mem, const float *input, int input_size,
+void oaci_compute_generic_conv1d(const LinearLayer *layer, float *output, float *mem, const float *input, int input_size,
                             int activation, int arch) {
     float tmp[MAX_CONV_INPUTS_ALL];
     celt_assert(input != output);
     celt_assert(layer->nb_inputs <= MAX_CONV_INPUTS_ALL);
     if (layer->nb_inputs != input_size) OAC_COPY(tmp, mem, layer->nb_inputs - input_size);
     OAC_COPY(&tmp[layer->nb_inputs - input_size], input, input_size);
-    compute_linear(layer, output, tmp, arch);
-    compute_activation(output, output, layer->nb_outputs, activation, arch);
+    oaci_compute_linear(layer, output, tmp, arch);
+    oaci_compute_activation(output, output, layer->nb_outputs, activation, arch);
     if (layer->nb_inputs != input_size) OAC_COPY(mem, &tmp[input_size], layer->nb_inputs - input_size);
 }
 
-void compute_generic_conv1d_dilation(const LinearLayer *layer, float *output, float *mem, const float *input,
+void oaci_compute_generic_conv1d_dilation(const LinearLayer *layer, float *output, float *mem, const float *input,
                                      int input_size, int dilation, int activation, int arch) {
     float tmp[MAX_CONV_INPUTS_ALL];
     int ksize = layer->nb_inputs/input_size;
@@ -143,8 +143,8 @@ void compute_generic_conv1d_dilation(const LinearLayer *layer, float *output, fl
     if (dilation == 1) OAC_COPY(tmp, mem, layer->nb_inputs - input_size);
     else for (i = 0; i < ksize - 1; i++) OAC_COPY(&tmp[i*input_size], &mem[i*input_size*dilation], input_size);
     OAC_COPY(&tmp[layer->nb_inputs - input_size], input, input_size);
-    compute_linear(layer, output, tmp, arch);
-    compute_activation(output, output, layer->nb_outputs, activation, arch);
+    oaci_compute_linear(layer, output, tmp, arch);
+    oaci_compute_activation(output, output, layer->nb_outputs, activation, arch);
     if (dilation == 1) OAC_COPY(mem, &tmp[input_size], layer->nb_inputs - input_size);
     else {
         OAC_COPY(mem, &mem[input_size], input_size*dilation*(ksize - 1) - input_size);
diff --git a/dnn/nnet.h b/dnn/nnet.h
index f8e085a65..867ab5e77 100644
--- a/dnn/nnet.h
+++ b/dnn/nnet.h
@@ -86,33 +86,33 @@ typedef struct {
 } Conv2dLayer;
 
 
-void compute_generic_dense(const LinearLayer *layer, float *output, const float *input, int activation, int arch);
-void compute_generic_gru(const LinearLayer *input_weights, const LinearLayer *recurrent_weights, float *state,
+void oaci_compute_generic_dense(const LinearLayer *layer, float *output, const float *input, int activation, int arch);
+void oaci_compute_generic_gru(const LinearLayer *input_weights, const LinearLayer *recurrent_weights, float *state,
     const float *in, int arch);
-void compute_generic_conv1d(const LinearLayer *layer, float *output, float *mem, const float *input, int input_size,
+void oaci_compute_generic_conv1d(const LinearLayer *layer, float *output, float *mem, const float *input, int input_size,
     int activation, int arch);
-void compute_generic_conv1d_dilation(const LinearLayer *layer, float *output, float *mem, const float *input,
+void oaci_compute_generic_conv1d_dilation(const LinearLayer *layer, float *output, float *mem, const float *input,
     int input_size, int dilation, int activation, int arch);
-void compute_glu(const LinearLayer *layer, float *output, const float *input, int arch);
+void oaci_compute_glu(const LinearLayer *layer, float *output, const float *input, int arch);
 void compute_gated_activation(const LinearLayer *layer, float *output, const float *input, int activation, int arch);
 
 
-int parse_weights(WeightArray **list, const void *data, int len);
+int oaci_parse_weights(WeightArray **list, const void *data, int len);
 
 
 extern const WeightArray lpcnet_arrays[];
-extern const WeightArray plcmodel_arrays[];
-extern const WeightArray rdovaeenc_arrays[];
-extern const WeightArray rdovaedec_arrays[];
+extern const WeightArray oaci_plcmodel_arrays[];
+extern const WeightArray oaci_rdovaeenc_arrays[];
+extern const WeightArray oaci_rdovaedec_arrays[];
 extern const WeightArray fwgan_arrays[];
-extern const WeightArray fargan_arrays[];
-extern const WeightArray pitchdnn_arrays[];
-extern const WeightArray lossgen_arrays[];
-extern const WeightArray lacelayers_arrays[];
-extern const WeightArray nolacelayers_arrays[];
-extern const WeightArray bbwenetlayers_arrays[];
-
-int linear_init(LinearLayer *layer, const WeightArray *arrays,
+extern const WeightArray oaci_fargan_arrays[];
+extern const WeightArray oaci_pitchdnn_arrays[];
+extern const WeightArray oaci_lossgen_arrays[];
+extern const WeightArray oaci_lacelayers_arrays[];
+extern const WeightArray oaci_nolacelayers_arrays[];
+extern const WeightArray oaci_bbwenetlayers_arrays[];
+
+int oaci_linear_init(LinearLayer *layer, const WeightArray *arrays,
     const char *bias,
     const char *subias,
     const char *weights,
@@ -123,7 +123,7 @@ int linear_init(LinearLayer *layer, const WeightArray *arrays,
     int nb_inputs,
     int nb_outputs);
 
-int conv2d_init(Conv2dLayer *layer, const WeightArray *arrays,
+int oaci_conv2d_init(Conv2dLayer *layer, const WeightArray *arrays,
     const char *bias,
     const char *float_weights,
     int in_channels,
@@ -132,9 +132,9 @@ int conv2d_init(Conv2dLayer *layer, const WeightArray *arrays,
     int kheight);
 
 
-void compute_linear_c(const LinearLayer *linear, float *out, const float *in);
-void compute_activation_c(float *output, const float *input, int N, int activation);
-void compute_conv2d_c(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride,
+void oaci_compute_linear_c(const LinearLayer *linear, float *out, const float *in);
+void oaci_compute_activation_c(float *output, const float *input, int N, int activation);
+void oaci_compute_conv2d_c(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride,
     int activation);
 
 
@@ -147,17 +147,17 @@ void compute_conv2d_c(const Conv2dLayer *conv, float *out, float *mem, const flo
 #endif
 
 #ifndef OVERRIDE_COMPUTE_LINEAR
-# define compute_linear(linear, out, in, arch) ((void)(arch), compute_linear_c(linear, out, in))
+# define oaci_compute_linear(linear, out, in, arch) ((void)(arch), oaci_compute_linear_c(linear, out, in))
 #endif
 
 #ifndef OVERRIDE_COMPUTE_ACTIVATION
-# define compute_activation(output, input, N, activation, arch) ((void)(arch), \
-                                                                 compute_activation_c(output, input, N, activation))
+# define oaci_compute_activation(output, input, N, activation, arch) ((void)(arch), \
+                                                                 oaci_compute_activation_c(output, input, N, activation))
 #endif
 
 #ifndef OVERRIDE_COMPUTE_CONV2D
-# define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch), \
-                                                                                compute_conv2d_c(conv, out, mem, in, \
+# define oaci_compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch), \
+                                                                                oaci_compute_conv2d_c(conv, out, mem, in, \
     height, hstride, activation))
 #endif
 
diff --git a/dnn/nnet_arch.h b/dnn/nnet_arch.h
index e9f7f3b1a..03dcc09df 100644
--- a/dnn/nnet_arch.h
+++ b/dnn/nnet_arch.h
@@ -64,7 +64,7 @@ static OAC_INLINE float relu(float x) {
 
 /*#define HIGH_ACCURACY */
 
-void RTCD_SUF(compute_activation_)(float *output, const float *input, int N, int activation)
+void RTCD_SUF(oaci_compute_activation_)(float *output, const float *input, int N, int activation)
 {
    int i;
    if (activation == ACTIVATION_SIGMOID) {
@@ -115,7 +115,7 @@ void RTCD_SUF(compute_activation_)(float *output, const float *input, int N, int
 }
 
 
-void RTCD_SUF(compute_linear_) (const LinearLayer *linear, float *out, const float *in)
+void RTCD_SUF(oaci_compute_linear_) (const LinearLayer *linear, float *out, const float *in)
 {
    int i, M, N;
    const float *bias;
@@ -219,7 +219,7 @@ static void conv2d_3x3_float(float *out, const float *weights, int in_channels,
 
 #define MAX_CONV2D_INPUTS 8192
 
-void RTCD_SUF(compute_conv2d_)(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height,
+void RTCD_SUF(oaci_compute_conv2d_)(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height,
 int hstride, int activation)
 {
    int i;
@@ -245,7 +245,7 @@ int hstride, int activation)
         }
    }
    for (i = 0; i < conv->out_channels; i++) {
-        RTCD_SUF(compute_activation_)(&out[i*hstride], &out[i*hstride], height, activation);
+        RTCD_SUF(oaci_compute_activation_)(&out[i*hstride], &out[i*hstride], height, activation);
    }
 }
 
diff --git a/dnn/osce.c b/dnn/osce.c
index 7dfea712d..3bf2824ba 100644
--- a/dnn/osce.c
+++ b/dnn/osce.c
@@ -120,9 +120,9 @@ static void print_linear_layer(FILE *fid, const char *name, LinearLayer *layer)
 
 #define CLIP(a, min, max) (((a) < (min) ? (min) : (a)) > (max) ? (max) : (a))
 
-extern const WeightArray lacelayers_arrays[];
-extern const WeightArray nolacelayers_arrays[];
-extern const WeightArray bbwenetlayers_arrays[];
+extern const WeightArray oaci_lacelayers_arrays[];
+extern const WeightArray oaci_nolacelayers_arrays[];
+extern const WeightArray oaci_bbwenetlayers_arrays[];
 
 /* LACE */
 
@@ -152,9 +152,9 @@ static int init_lace(LACE *hLACE, const WeightArray *weights) {
     OAC_CLEAR(hLACE, 1);
     celt_assert(weights != NULL);
 
-    ret = init_lacelayers(&hLACE->layers, weights);
+    ret = oaci_init_lacelayers(&hLACE->layers, weights);
 
-    compute_overlap_window(hLACE->window, LACE_OVERLAP_SIZE);
+    oaci_compute_overlap_window(hLACE->window, LACE_OVERLAP_SIZE);
 
     return ret;
 }
@@ -162,9 +162,9 @@ static int init_lace(LACE *hLACE, const WeightArray *weights) {
 static void reset_lace_state(LACEState *state) {
     OAC_CLEAR(state, 1);
 
-    init_adacomb_state(&state->cf1_state);
-    init_adacomb_state(&state->cf2_state);
-    init_adaconv_state(&state->af1_state);
+    oaci_init_adacomb_state(&state->cf1_state);
+    oaci_init_adacomb_state(&state->cf2_state);
+    oaci_init_adaconv_state(&state->af1_state);
 }
 
 static void lace_feature_net(
@@ -196,7 +196,7 @@ static void lace_feature_net(
         OAC_COPY(input_buffer + LACE_NUM_FEATURES + LACE_PITCH_EMBEDDING_DIM, numbits_embedded,
         2*LACE_NUMBITS_EMBEDDING_DIM);
 
-        compute_generic_conv1d(
+        oaci_compute_generic_conv1d(
             &hLACE->layers.lace_fnet_conv1,
             output_buffer + i_subframe*LACE_HIDDEN_FEATURE_DIM,
             NULL,
@@ -208,7 +208,7 @@ static void lace_feature_net(
 
     /* subframe accumulation */
     OAC_COPY(input_buffer, output_buffer, 4*LACE_HIDDEN_FEATURE_DIM);
-    compute_generic_conv1d(
+    oaci_compute_generic_conv1d(
         &hLACE->layers.lace_fnet_conv2,
         output_buffer,
         state->feature_net_conv2_state,
@@ -220,7 +220,7 @@ static void lace_feature_net(
 
     /* tconv upsampling */
     OAC_COPY(input_buffer, output_buffer, 4*LACE_COND_DIM);
-    compute_generic_dense(
+    oaci_compute_generic_dense(
         &hLACE->layers.lace_fnet_tconv,
         output_buffer,
         input_buffer,
@@ -231,7 +231,7 @@ static void lace_feature_net(
     /* GRU */
     OAC_COPY(input_buffer, output_buffer, 4*LACE_COND_DIM);
     for (i_subframe = 0; i_subframe < 4; i_subframe++) {
-        compute_generic_gru(
+        oaci_compute_generic_gru(
             &hLACE->layers.lace_fnet_gru_input,
             &hLACE->layers.lace_fnet_gru_recurrent,
             state->feature_net_gru_state,
@@ -293,7 +293,7 @@ static void lace_process_20ms_frame(
 
     /* 1st comb filtering stage */
     for (i_subframe = 0; i_subframe < 4; i_subframe++) {
-        adacomb_process_frame(
+        oaci_adacomb_process_frame(
             &state->cf1_state,
             output_buffer + i_subframe*LACE_FRAME_SIZE,
             output_buffer + i_subframe*LACE_FRAME_SIZE,
@@ -320,7 +320,7 @@ static void lace_process_20ms_frame(
 
     /* 2nd comb filtering stage */
     for (i_subframe = 0; i_subframe < 4; i_subframe++) {
-        adacomb_process_frame(
+        oaci_adacomb_process_frame(
             &state->cf2_state,
             output_buffer + i_subframe*LACE_FRAME_SIZE,
             output_buffer + i_subframe*LACE_FRAME_SIZE,
@@ -346,7 +346,7 @@ static void lace_process_20ms_frame(
 
     /* final adaptive filtering stage */
     for (i_subframe = 0; i_subframe < 4; i_subframe++) {
-        adaconv_process_frame(
+        oaci_adaconv_process_frame(
             &state->af1_state,
             output_buffer + i_subframe*LACE_FRAME_SIZE,
             output_buffer + i_subframe*LACE_FRAME_SIZE,
@@ -409,9 +409,9 @@ static int init_nolace(NoLACE *hNoLACE, const WeightArray *weights) {
     OAC_CLEAR(hNoLACE, 1);
     celt_assert(weights != NULL);
 
-    ret = init_nolacelayers(&hNoLACE->layers, weights);
+    ret = oaci_init_nolacelayers(&hNoLACE->layers, weights);
 
-    compute_overlap_window(hNoLACE->window, NOLACE_OVERLAP_SIZE);
+    oaci_compute_overlap_window(hNoLACE->window, NOLACE_OVERLAP_SIZE);
 
     return ret;
 }
@@ -419,15 +419,15 @@ static int init_nolace(NoLACE *hNoLACE, const WeightArray *weights) {
 static void reset_nolace_state(NoLACEState *state) {
     OAC_CLEAR(state, 1);
 
-    init_adacomb_state(&state->cf1_state);
-    init_adacomb_state(&state->cf2_state);
-    init_adaconv_state(&state->af1_state);
-    init_adaconv_state(&state->af2_state);
-    init_adaconv_state(&state->af3_state);
-    init_adaconv_state(&state->af4_state);
-    init_adashape_state(&state->tdshape1_state);
-    init_adashape_state(&state->tdshape2_state);
-    init_adashape_state(&state->tdshape3_state);
+    oaci_init_adacomb_state(&state->cf1_state);
+    oaci_init_adacomb_state(&state->cf2_state);
+    oaci_init_adaconv_state(&state->af1_state);
+    oaci_init_adaconv_state(&state->af2_state);
+    oaci_init_adaconv_state(&state->af3_state);
+    oaci_init_adaconv_state(&state->af4_state);
+    oaci_init_adashape_state(&state->tdshape1_state);
+    oaci_init_adashape_state(&state->tdshape2_state);
+    oaci_init_adashape_state(&state->tdshape3_state);
 }
 
 static void nolace_feature_net(
@@ -458,7 +458,7 @@ static void nolace_feature_net(
         OAC_COPY(input_buffer + NOLACE_NUM_FEATURES + NOLACE_PITCH_EMBEDDING_DIM, numbits_embedded,
         2*NOLACE_NUMBITS_EMBEDDING_DIM);
 
-        compute_generic_conv1d(
+        oaci_compute_generic_conv1d(
             &hNoLACE->layers.nolace_fnet_conv1,
             output_buffer + i_subframe*NOLACE_HIDDEN_FEATURE_DIM,
             NULL,
@@ -470,7 +470,7 @@ static void nolace_feature_net(
 
     /* subframe accumulation */
     OAC_COPY(input_buffer, output_buffer, 4*NOLACE_HIDDEN_FEATURE_DIM);
-    compute_generic_conv1d(
+    oaci_compute_generic_conv1d(
         &hNoLACE->layers.nolace_fnet_conv2,
         output_buffer,
         state->feature_net_conv2_state,
@@ -482,7 +482,7 @@ static void nolace_feature_net(
 
     /* tconv upsampling */
     OAC_COPY(input_buffer, output_buffer, 4*NOLACE_COND_DIM);
-    compute_generic_dense(
+    oaci_compute_generic_dense(
         &hNoLACE->layers.nolace_fnet_tconv,
         output_buffer,
         input_buffer,
@@ -493,7 +493,7 @@ static void nolace_feature_net(
     /* GRU */
     OAC_COPY(input_buffer, output_buffer, 4*NOLACE_COND_DIM);
     for (i_subframe = 0; i_subframe < 4; i_subframe++) {
-        compute_generic_gru(
+        oaci_compute_generic_gru(
             &hNoLACE->layers.nolace_fnet_gru_input,
             &hNoLACE->layers.nolace_fnet_gru_recurrent,
             state->feature_net_gru_state,
@@ -560,7 +560,7 @@ static void nolace_process_20ms_frame(
     /* 1st comb filtering stage */
     for (i_subframe = 0; i_subframe < 4; i_subframe++) {
         /* modifies signal in place */
-        adacomb_process_frame(
+        oaci_adacomb_process_frame(
             &state->cf1_state,
             x_buffer1 + i_subframe*NOLACE_FRAME_SIZE,
             x_buffer1 + i_subframe*NOLACE_FRAME_SIZE,
@@ -580,7 +580,7 @@ static void nolace_process_20ms_frame(
             hNoLACE->window,
             arch);
 
-        compute_generic_conv1d(
+        oaci_compute_generic_conv1d(
             &layers->nolace_post_cf1,
             feature_transform_buffer + i_subframe*NOLACE_COND_DIM,
             state->post_cf1_state,
@@ -600,7 +600,7 @@ static void nolace_process_20ms_frame(
     /* 2nd comb filtering stage */
     for (i_subframe = 0; i_subframe < 4; i_subframe++) {
         /* modifies signal in place */
-        adacomb_process_frame(
+        oaci_adacomb_process_frame(
             &state->cf2_state,
             x_buffer1 + i_subframe*NOLACE_FRAME_SIZE,
             x_buffer1 + i_subframe*NOLACE_FRAME_SIZE,
@@ -620,7 +620,7 @@ static void nolace_process_20ms_frame(
             hNoLACE->window,
             arch);
 
-        compute_generic_conv1d(
+        oaci_compute_generic_conv1d(
             &layers->nolace_post_cf2,
             feature_transform_buffer + i_subframe*NOLACE_COND_DIM,
             state->post_cf2_state,
@@ -639,7 +639,7 @@ static void nolace_process_20ms_frame(
 
     /* final adaptive filtering stage */
     for (i_subframe = 0; i_subframe < 4; i_subframe++) {
-        adaconv_process_frame(
+        oaci_adaconv_process_frame(
             &state->af1_state,
             x_buffer2 + i_subframe*NOLACE_FRAME_SIZE*NOLACE_AF1_OUT_CHANNELS,
             x_buffer1 + i_subframe*NOLACE_FRAME_SIZE,
@@ -659,7 +659,7 @@ static void nolace_process_20ms_frame(
             hNoLACE->window,
             arch);
 
-        compute_generic_conv1d(
+        oaci_compute_generic_conv1d(
             &layers->nolace_post_af1,
             feature_transform_buffer + i_subframe*NOLACE_COND_DIM,
             state->post_af1_state,
@@ -680,7 +680,7 @@ static void nolace_process_20ms_frame(
     for (i_subframe = 0; i_subframe < 4; i_subframe++) {
         celt_assert(NOLACE_AF1_OUT_CHANNELS == 2);
         /* modifies second channel in place */
-        adashape_process_frame(
+        oaci_adashape_process_frame(
             &state->tdshape1_state,
             x_buffer2 + i_subframe*NOLACE_AF1_OUT_CHANNELS*NOLACE_FRAME_SIZE + NOLACE_FRAME_SIZE,
             x_buffer2 + i_subframe*NOLACE_AF1_OUT_CHANNELS*NOLACE_FRAME_SIZE + NOLACE_FRAME_SIZE,
@@ -695,7 +695,7 @@ static void nolace_process_20ms_frame(
             arch
             );
 
-        adaconv_process_frame(
+        oaci_adaconv_process_frame(
             &state->af2_state,
             x_buffer1 + i_subframe*NOLACE_FRAME_SIZE*NOLACE_AF2_OUT_CHANNELS,
             x_buffer2 + i_subframe*NOLACE_FRAME_SIZE*NOLACE_AF2_IN_CHANNELS,
@@ -715,7 +715,7 @@ static void nolace_process_20ms_frame(
             hNoLACE->window,
             arch);
 
-        compute_generic_conv1d(
+        oaci_compute_generic_conv1d(
             &layers->nolace_post_af2,
             feature_transform_buffer + i_subframe*NOLACE_COND_DIM,
             state->post_af2_state,
@@ -736,7 +736,7 @@ static void nolace_process_20ms_frame(
     for (i_subframe = 0; i_subframe < 4; i_subframe++) {
         celt_assert(NOLACE_AF2_OUT_CHANNELS == 2);
         /* modifies second channel in place */
-        adashape_process_frame(
+        oaci_adashape_process_frame(
             &state->tdshape2_state,
             x_buffer1 + i_subframe*NOLACE_AF2_OUT_CHANNELS*NOLACE_FRAME_SIZE + NOLACE_FRAME_SIZE,
             x_buffer1 + i_subframe*NOLACE_AF2_OUT_CHANNELS*NOLACE_FRAME_SIZE + NOLACE_FRAME_SIZE,
@@ -751,7 +751,7 @@ static void nolace_process_20ms_frame(
             arch
             );
 
-        adaconv_process_frame(
+        oaci_adaconv_process_frame(
             &state->af3_state,
             x_buffer2 + i_subframe*NOLACE_FRAME_SIZE*NOLACE_AF3_OUT_CHANNELS,
             x_buffer1 + i_subframe*NOLACE_FRAME_SIZE*NOLACE_AF3_IN_CHANNELS,
@@ -771,7 +771,7 @@ static void nolace_process_20ms_frame(
             hNoLACE->window,
             arch);
 
-        compute_generic_conv1d(
+        oaci_compute_generic_conv1d(
             &layers->nolace_post_af3,
             feature_transform_buffer + i_subframe*NOLACE_COND_DIM,
             state->post_af3_state,
@@ -788,7 +788,7 @@ static void nolace_process_20ms_frame(
     for (i_subframe = 0; i_subframe < 4; i_subframe++) {
         celt_assert(NOLACE_AF3_OUT_CHANNELS == 2);
         /* modifies second channel in place */
-        adashape_process_frame(
+        oaci_adashape_process_frame(
             &state->tdshape3_state,
             x_buffer2 + i_subframe*NOLACE_AF3_OUT_CHANNELS*NOLACE_FRAME_SIZE + NOLACE_FRAME_SIZE,
             x_buffer2 + i_subframe*NOLACE_AF3_OUT_CHANNELS*NOLACE_FRAME_SIZE + NOLACE_FRAME_SIZE,
@@ -803,7 +803,7 @@ static void nolace_process_20ms_frame(
             arch
             );
 
-        adaconv_process_frame(
+        oaci_adaconv_process_frame(
             &state->af4_state,
             x_buffer1 + i_subframe*NOLACE_FRAME_SIZE*NOLACE_AF4_OUT_CHANNELS,
             x_buffer2 + i_subframe*NOLACE_FRAME_SIZE*NOLACE_AF4_IN_CHANNELS,
@@ -872,7 +872,7 @@ static void bbwe_feature_net(
 
     /* first conv layer */
     for (i_frame = 0; i_frame < num_frames; i_frame++) {
-        compute_generic_conv1d(
+        oaci_compute_generic_conv1d(
             &hBBWENET->layers.bbwenet_fnet_conv1,
             output_buffer + i_frame*BBWENET_FNET_CONV1_OUT_SIZE,
             state->feature_net_conv1_state,
@@ -890,7 +890,7 @@ static void bbwe_feature_net(
 
     /* second conv layer */
     for (i_frame = 0; i_frame < num_frames; i_frame++) {
-        compute_generic_conv1d(
+        oaci_compute_generic_conv1d(
             &hBBWENET->layers.bbwenet_fnet_conv2,
             output_buffer + i_frame*BBWENET_FNET_CONV2_OUT_SIZE,
             state->feature_net_conv2_state,
@@ -908,7 +908,7 @@ static void bbwe_feature_net(
 
     /* tconv upsampling*/
     for (i_frame = 0; i_frame < num_frames; i_frame++) {
-        compute_generic_dense(
+        oaci_compute_generic_dense(
             &hBBWENET->layers.bbwenet_fnet_tconv,
             output_buffer + i_frame*BBWENET_FNET_TCONV_OUT_CHANNELS*BBWENET_FNET_TCONV_STRIDE,
             input_buffer + i_frame*BBWENET_FNET_CONV2_OUT_SIZE,
@@ -925,7 +925,7 @@ static void bbwe_feature_net(
     /* GRU */
     celt_assert(BBWENET_FNET_TCONV_STRIDE == 2);
     for (i_subframe = 0; i_subframe < BBWENET_FNET_TCONV_STRIDE*num_frames; i_subframe++) {
-        compute_generic_gru(
+        oaci_compute_generic_gru(
             &hBBWENET->layers.bbwenet_fnet_gru_input,
             &hBBWENET->layers.bbwenet_fnet_gru_recurrent,
             state->feature_net_gru_state,
@@ -1131,7 +1131,7 @@ static void bbwenet_process_frames(
     /* signal net
      * first adaptive filtering stage, three output channels */
     for (i_subframe = 0; i_subframe < num_subframes; i_subframe++) {
-        adaconv_process_frame(
+        oaci_adaconv_process_frame(
             &state->af1_state,
             x_buffer1 + i_subframe*BBWENET_AF1_FRAME_SIZE*BBWENET_AF1_OUT_CHANNELS,
             x_in + i_subframe*BBWENET_AF1_FRAME_SIZE,
@@ -1188,7 +1188,7 @@ static void bbwenet_process_frames(
 #  endif
 
         /* tdshape on second channel (in place) */
-        adashape_process_frame(
+        oaci_adashape_process_frame(
             &state->tdshape1_state,
             x_buffer2 + i_subframe*BBWENET_AF1_OUT_CHANNELS*BBWENET_TDSHAPE1_FRAME_SIZE + BBWENET_TDSHAPE1_FRAME_SIZE,
             x_buffer2 + i_subframe*BBWENET_AF1_OUT_CHANNELS*BBWENET_TDSHAPE1_FRAME_SIZE + BBWENET_TDSHAPE1_FRAME_SIZE,
@@ -1222,7 +1222,7 @@ static void bbwenet_process_frames(
 
     /* mixing */
     for (i_subframe = 0; i_subframe < num_subframes; i_subframe++) {
-        adaconv_process_frame(
+        oaci_adaconv_process_frame(
             &state->af2_state,
             x_buffer1 + i_subframe*BBWENET_AF2_FRAME_SIZE*BBWENET_AF2_OUT_CHANNELS,
             x_buffer2 + i_subframe*BBWENET_AF2_FRAME_SIZE*BBWENET_AF1_OUT_CHANNELS,
@@ -1277,7 +1277,7 @@ static void bbwenet_process_frames(
 #  endif
 
         /* tdshape on second channel (in place) */
-        adashape_process_frame(
+        oaci_adashape_process_frame(
             &state->tdshape2_state,
             x_buffer2 + i_subframe*BBWENET_AF2_OUT_CHANNELS*BBWENET_TDSHAPE2_FRAME_SIZE + BBWENET_TDSHAPE2_FRAME_SIZE,
             x_buffer2 + i_subframe*BBWENET_AF2_OUT_CHANNELS*BBWENET_TDSHAPE2_FRAME_SIZE + BBWENET_TDSHAPE2_FRAME_SIZE,
@@ -1311,7 +1311,7 @@ static void bbwenet_process_frames(
     /* final mixing */
     celt_assert(BBWENET_AF3_OUT_CHANNELS == 1);
     for (i_subframe = 0; i_subframe < num_subframes; i_subframe++) {
-        adaconv_process_frame(
+        oaci_adaconv_process_frame(
             &state->af3_state,
             x_out + i_subframe*BBWENET_AF3_FRAME_SIZE,
             x_buffer2 + i_subframe*BBWENET_TDSHAPE2_FRAME_SIZE*BBWENET_AF2_OUT_CHANNELS,
@@ -1340,11 +1340,11 @@ static void bbwenet_process_frames(
 static void reset_bbwenet_state(BBWENetState *state) {
     OAC_CLEAR(state, 1);
 
-    init_adaconv_state(&state->af1_state);
-    init_adaconv_state(&state->af2_state);
-    init_adaconv_state(&state->af3_state);
-    init_adashape_state(&state->tdshape1_state);
-    init_adashape_state(&state->tdshape2_state);
+    oaci_init_adaconv_state(&state->af1_state);
+    oaci_init_adaconv_state(&state->af2_state);
+    oaci_init_adaconv_state(&state->af3_state);
+    oaci_init_adashape_state(&state->tdshape1_state);
+    oaci_init_adashape_state(&state->tdshape2_state);
 }
 
 static int init_bbwenet(BBWENet *hBBWENET, const WeightArray *weights) {
@@ -1352,11 +1352,11 @@ static int init_bbwenet(BBWENet *hBBWENET, const WeightArray *weights) {
     OAC_CLEAR(hBBWENET, 1);
     celt_assert(weights != NULL);
 
-    ret = init_bbwenetlayers(&hBBWENET->layers, weights);
+    ret = oaci_init_bbwenetlayers(&hBBWENET->layers, weights);
 
-    compute_overlap_window(hBBWENET->window16, BBWENET_AF1_OVERLAP_SIZE);
-    compute_overlap_window(hBBWENET->window32, BBWENET_AF2_OVERLAP_SIZE);
-    compute_overlap_window(hBBWENET->window48, BBWENET_AF3_OVERLAP_SIZE);
+    oaci_compute_overlap_window(hBBWENET->window16, BBWENET_AF1_OVERLAP_SIZE);
+    oaci_compute_overlap_window(hBBWENET->window32, BBWENET_AF2_OVERLAP_SIZE);
+    oaci_compute_overlap_window(hBBWENET->window48, BBWENET_AF3_OVERLAP_SIZE);
 
     return ret;
 }
@@ -1366,7 +1366,7 @@ static int init_bbwenet(BBWENet *hBBWENET, const WeightArray *weights) {
 
 /* API */
 
-void osce_reset(silk_OSCE_struct *hOSCE, int method) {
+void oaci_osce_reset(silk_OSCE_struct *hOSCE, int method) {
     OSCEState *state = &hOSCE->state;
 
     OAC_CLEAR(&hOSCE->features, 1);
@@ -1393,7 +1393,7 @@ void osce_reset(silk_OSCE_struct *hOSCE, int method) {
 
 #ifdef ENABLE_OSCE_BWE
 
-void osce_bwe_reset(silk_OSCE_BWE_struct *hOSCEBWE) {
+void oaci_osce_bwe_reset(silk_OSCE_BWE_struct *hOSCEBWE) {
     int k;
     OAC_CLEAR(&hOSCEBWE->features, 1);
 # if 1
@@ -1409,13 +1409,13 @@ void osce_bwe_reset(silk_OSCE_BWE_struct *hOSCEBWE) {
 
 
 
-int osce_load_models(OSCEModel *model, const void *data, int len) {
+int oaci_osce_load_models(OSCEModel *model, const void *data, int len) {
     int ret = 0;
     WeightArray *list;
 
     if (data != NULL  && len) {
         /* init from buffer */
-        parse_weights(&list, data, len);
+        oaci_parse_weights(&list, data, len);
 
 #ifndef DISABLE_LACE
         if (ret == 0) {
@@ -1443,20 +1443,20 @@ int osce_load_models(OSCEModel *model, const void *data, int len) {
 #else
 # ifndef DISABLE_LACE
         if (ret == 0) {
-            ret = init_lace(&model->lace, lacelayers_arrays);
+            ret = init_lace(&model->lace, oaci_lacelayers_arrays);
         }
 # endif
 
 # ifndef DISABLE_NOLACE
         if (ret == 0) {
-            ret = init_nolace(&model->nolace, nolacelayers_arrays);
+            ret = init_nolace(&model->nolace, oaci_nolacelayers_arrays);
         }
 # endif
 
 # ifdef ENABLE_OSCE_BWE
 #  ifndef DISABLE_BBWENET
         if (ret == 0) {
-            ret = init_bbwenet(&model->bbwenet, bbwenetlayers_arrays);
+            ret = init_bbwenet(&model->bbwenet, oaci_bbwenetlayers_arrays);
         }
 #  endif
 # endif /* ENABLE_OSCE_BWE */
@@ -1468,7 +1468,7 @@ int osce_load_models(OSCEModel *model, const void *data, int len) {
 }
 
 #ifdef ENABLE_OSCE_BWE
-void osce_bwe(
+void oaci_osce_bwe(
     OSCEModel                   *model,                         /* I    OSCE model struct                           */
     silk_OSCE_BWE_struct        *psOSCEBWE,                     /* I/O  OSCE BWE state                              */
     oac_int16 xq48[],                                          /* O    bandwidth-extended speech                   */
@@ -1491,7 +1491,7 @@ void osce_bwe(
         in_buffer[i] = ((float) xq16[i])*(1.f/32768.f);
     }
 
-    osce_bwe_calculate_features(&psOSCEBWE->features, features, xq16, xq16_len);
+    oaci_osce_bwe_calculate_features(&psOSCEBWE->features, features, xq16, xq16_len);
 
 # if 0
     /* just upsampling for now */
@@ -1532,7 +1532,7 @@ void osce_bwe(
 
 #endif
 
-void osce_enhance_frame(
+void oaci_osce_enhance_frame(
     OSCEModel                   *model,                         /* I    OSCE model struct                           */
     silk_decoder_state          *psDec,                         /* I/O  Decoder state                               */
     silk_decoder_control        *psDecCtrl,                     /* I    Decoder control                             */
@@ -1550,11 +1550,11 @@ void osce_enhance_frame(
 
     /* enhancement only implemented for 20 ms frame at 16kHz */
     if (psDec->fs_kHz != 16 || psDec->nb_subfr != 4) {
-        osce_reset(&psDec->osce, psDec->osce.method);
+        oaci_osce_reset(&psDec->osce, psDec->osce.method);
         return;
     }
 
-    osce_calculate_features(psDec, psDecCtrl, features, numbits, periods, xq, num_bits);
+    oaci_osce_calculate_features(psDec, psDecCtrl, features, numbits, periods, xq, num_bits);
 
     /* scale input */
     for (i = 0; i < 320; i++) {
@@ -1660,7 +1660,7 @@ void osce_enhance_frame(
         OAC_COPY(out_buffer, in_buffer, 320);
         psDec->osce.features.reset--;
     } else if (psDec->osce.features.reset) {
-        osce_cross_fade_10ms(out_buffer, in_buffer, 320);
+        oaci_osce_cross_fade_10ms(out_buffer, in_buffer, 320);
         psDec->osce.features.reset = 0;
     }
 
diff --git a/dnn/osce.h b/dnn/osce.h
index 2449fb90c..81b5a50e7 100644
--- a/dnn/osce.h
+++ b/dnn/osce.h
@@ -76,7 +76,7 @@
 /* API */
 
 
-void osce_enhance_frame(
+void oaci_osce_enhance_frame(
     OSCEModel                   *model,                         /* I    OSCE model struct                           */
     silk_decoder_state          *psDec,                         /* I/O  Decoder state                               */
     silk_decoder_control        *psDecCtrl,                     /* I    Decoder control                             */
@@ -86,11 +86,11 @@ void osce_enhance_frame(
     );
 
 
-int osce_load_models(OSCEModel *hModel, const void *data, int len);
-void osce_reset(silk_OSCE_struct *hOSCE, int method);
+int oaci_osce_load_models(OSCEModel *hModel, const void *data, int len);
+void oaci_osce_reset(silk_OSCE_struct *hOSCE, int method);
 
 #ifdef ENABLE_OSCE_BWE
-void osce_bwe(
+void oaci_osce_bwe(
     OSCEModel                   *model,                        /* I    OSCE model struct                           */
     silk_OSCE_BWE_struct        *psOSCEBWE,                    /* I/O  OSCE BWE state                              */
     oac_int16 xq48[],                                         /* O    bandwidth-extended speech                   */
@@ -99,7 +99,7 @@ void osce_bwe(
     int arch                                                   /* I    Run-time architecture                       */
     );
 
-void osce_bwe_reset(silk_OSCE_BWE_struct *hOSCEBWE);
+void oaci_osce_bwe_reset(silk_OSCE_BWE_struct *hOSCEBWE);
 #endif /* ENABLE_OSCE_BWE */
 
 
diff --git a/dnn/osce_features.c b/dnn/osce_features.c
index ec122f604..ac4fdeb7e 100644
--- a/dnn/osce_features.c
+++ b/dnn/osce_features.c
@@ -210,7 +210,7 @@ static void mag_spec_320_onesided(float *out, float *in) {
     celt_assert(OSCE_SPEC_WINDOW_SIZE == 320);
     kiss_fft_cpx buffer[OSCE_SPEC_WINDOW_SIZE];
     int k;
-    forward_transform(buffer, in);
+    oaci_forward_transform(buffer, in);
 
     for (k = 0; k < OSCE_SPEC_NUM_FREQS; k++) {
         out[k] = OSCE_SPEC_WINDOW_SIZE*sqrt(buffer[k].r*buffer[k].r + buffer[k].i*buffer[k].i);
@@ -274,7 +274,7 @@ static void calculate_cepstrum(float *cepstrum, float *signal) {
 
     /* DCT-II (orthonormal) */
     celt_assert(OSCE_NOISY_SPEC_NUM_BANDS == NB_BANDS);
-    dct(cepstrum, spec);
+    oaci_dct(cepstrum, spec);
 }
 
 static void calculate_acorr(float *acorr, float *signal, int lag) {
@@ -341,7 +341,7 @@ static int pitch_postprocessing(OSCEFeatureState *psFeatures, int lag, int type)
     return new_lag;
 }
 
-void osce_calculate_features(
+void oaci_osce_calculate_features(
     silk_decoder_state          *psDec,                         /* I/O  Decoder state                               */
     silk_decoder_control        *psDecCtrl,                     /* I    Decoder control                             */
     float                       *features,                      /* O    input features                              */
@@ -427,7 +427,7 @@ void osce_calculate_features(
 
 
 #ifdef ENABLE_OSCE_BWE
-void osce_bwe_calculate_features(
+void oaci_osce_bwe_calculate_features(
     OSCEBWEFeatureState         *psFeatures,                    /* I/O  BWE feature state                          */
     float                       *features,                      /* O    input features                              */
     const oac_int16 xq[],                                      /* I    Decoded speech                              */
@@ -467,7 +467,7 @@ void osce_bwe_calculate_features(
         }
 
         /* DFT */
-        forward_transform(fft_buffer, buffer);
+        oaci_forward_transform(fft_buffer, buffer);
 
         /* instafreq */
         for (k = 0; k <= OSCE_BWE_MAX_INSTAFREQ_BIN; k++) {
@@ -503,7 +503,7 @@ void osce_bwe_calculate_features(
 }
 #endif /* ENABLE_OSCE_BWE */
 
-void osce_cross_fade_10ms(float *x_enhanced, float *x_in, int length) {
+void oaci_osce_cross_fade_10ms(float *x_enhanced, float *x_in, int length) {
     int i;
     celt_assert(length >= 160);
 
@@ -513,7 +513,7 @@ void osce_cross_fade_10ms(float *x_enhanced, float *x_in, int length) {
 }
 
 
-void osce_bwe_cross_fade_10ms(oac_int16 *x_fadein, oac_int16 *x_fadeout, int length) {
+void oaci_osce_bwe_cross_fade_10ms(oac_int16 *x_fadein, oac_int16 *x_fadeout, int length) {
     int i;
     celt_assert(length >= 480);
     float f = 1.f/3;
diff --git a/dnn/osce_features.h b/dnn/osce_features.h
index b470bf5a2..62b79f73f 100644
--- a/dnn/osce_features.h
+++ b/dnn/osce_features.h
@@ -34,7 +34,7 @@
 
 #define OSCE_NUMBITS_BUGFIX
 
-void osce_calculate_features(
+void oaci_osce_calculate_features(
     silk_decoder_state          *psDec,                         /* I/O  Decoder state                               */
     silk_decoder_control        *psDecCtrl,                     /* I    Decoder control                             */
     float                       *features,                      /* O    input features                              */
@@ -45,7 +45,7 @@ void osce_calculate_features(
     );
 
 #ifdef ENABLE_OSCE_BWE
-void osce_bwe_calculate_features(
+void oaci_osce_bwe_calculate_features(
     OSCEBWEFeatureState         *psFeatures,                   /* I/O  BWE feature state                           */
     float                       *features,                     /* O    input features                              */
     const oac_int16 xq[],                                     /* I    Decoded speech                              */
@@ -53,6 +53,6 @@ void osce_bwe_calculate_features(
     );
 #endif
 
-void osce_cross_fade_10ms(float *x_enhanced, float *x_in, int length);
-void osce_bwe_cross_fade_10ms(oac_int16 *x_fadein, oac_int16* x_fadeout, int length);
+void oaci_osce_cross_fade_10ms(float *x_enhanced, float *x_in, int length);
+void oaci_osce_bwe_cross_fade_10ms(oac_int16 *x_fadein, oac_int16* x_fadeout, int length);
 #endif
diff --git a/dnn/parse_lpcnet_weights.c b/dnn/parse_lpcnet_weights.c
index b339a712d..f2daa845e 100644
--- a/dnn/parse_lpcnet_weights.c
+++ b/dnn/parse_lpcnet_weights.c
@@ -35,7 +35,7 @@
 
 #define SPARSE_BLOCK_SIZE 32
 
-int parse_record(const void **data, int *len, WeightArray *array) {
+int oaci_parse_record(const void **data, int *len, WeightArray *array) {
     WeightHead *h = (WeightHead *)*data;
     if (*len < WEIGHT_BLOCK_SIZE) return -1;
     if (h->block_size < h->size) return -1;
@@ -52,14 +52,14 @@ int parse_record(const void **data, int *len, WeightArray *array) {
     return array->size;
 }
 
-int parse_weights(WeightArray **list, const void *data, int len) {
+int oaci_parse_weights(WeightArray **list, const void *data, int len) {
     int nb_arrays = 0;
     int capacity = 20;
     *list = (WeightArray*)oac_alloc(capacity*sizeof(WeightArray));
     while (len > 0) {
         int ret;
         WeightArray array = {NULL, 0, 0, 0};
-        ret = parse_record(&data, &len, &array);
+        ret = oaci_parse_record(&data, &len, &array);
         if (ret > 0) {
             if (nb_arrays + 1 >= capacity) {
                 /* Make sure there's room for the ending NULL element too. */
@@ -121,7 +121,7 @@ static const void *find_idx_check(const WeightArray *arrays, const char *name, i
     return a->data;
 }
 
-int linear_init(LinearLayer *layer, const WeightArray *arrays,
+int oaci_linear_init(LinearLayer *layer, const WeightArray *arrays,
                 const char *bias,
                 const char *subias,
                 const char *weights,
@@ -184,7 +184,7 @@ int linear_init(LinearLayer *layer, const WeightArray *arrays,
     return 0;
 }
 
-int conv2d_init(Conv2dLayer *layer, const WeightArray *arrays,
+int oaci_conv2d_init(Conv2dLayer *layer, const WeightArray *arrays,
                 const char *bias,
                 const char *float_weights,
                 int in_channels,
@@ -233,7 +233,7 @@ int main() {
     fd = open(filename, O_RDONLY);
     data = mmap(NULL, len, PROT_READ, MAP_SHARED, fd, 0);
     printf("size is %d\n", len);
-    nb_arrays = parse_weights(&list, data, len);
+    nb_arrays = oaci_parse_weights(&list, data, len);
     for (i = 0; i < nb_arrays; i++) {
         printf("found %s: size %d\n", list[i].name, list[i].size);
     }
diff --git a/dnn/pitchdnn.c b/dnn/pitchdnn.c
index 913f01e33..f324957a5 100644
--- a/dnn/pitchdnn.c
+++ b/dnn/pitchdnn.c
@@ -9,7 +9,7 @@
 #include "lpcnet_private.h"
 
 
-float compute_pitchdnn(
+float oaci_compute_pitchdnn(
     PitchDNNState *st,
     const float *if_features,
     const float *xcorr_features,
@@ -27,19 +27,19 @@ float compute_pitchdnn(
     float count = 0;
     PitchDNN *model = &st->model;
     /* IF */
-    compute_generic_dense(&model->dense_if_upsampler_1, if1_out, if_features, ACTIVATION_TANH, arch);
-    compute_generic_dense(&model->dense_if_upsampler_2, &downsampler_in[NB_XCORR_FEATURES], if1_out, ACTIVATION_TANH,
+    oaci_compute_generic_dense(&model->dense_if_upsampler_1, if1_out, if_features, ACTIVATION_TANH, arch);
+    oaci_compute_generic_dense(&model->dense_if_upsampler_2, &downsampler_in[NB_XCORR_FEATURES], if1_out, ACTIVATION_TANH,
     arch);
     /* xcorr*/
     OAC_COPY(&conv1_tmp1[1], xcorr_features, NB_XCORR_FEATURES);
-    compute_conv2d(&model->conv2d_1, &conv1_tmp2[1], st->xcorr_mem1, conv1_tmp1, NB_XCORR_FEATURES,
+    oaci_compute_conv2d(&model->conv2d_1, &conv1_tmp2[1], st->xcorr_mem1, conv1_tmp1, NB_XCORR_FEATURES,
     NB_XCORR_FEATURES + 2, ACTIVATION_TANH, arch);
-    compute_conv2d(&model->conv2d_2, downsampler_in, st->xcorr_mem2, conv1_tmp2, NB_XCORR_FEATURES, NB_XCORR_FEATURES,
+    oaci_compute_conv2d(&model->conv2d_2, downsampler_in, st->xcorr_mem2, conv1_tmp2, NB_XCORR_FEATURES, NB_XCORR_FEATURES,
     ACTIVATION_TANH, arch);
 
-    compute_generic_dense(&model->dense_downsampler, downsampler_out, downsampler_in, ACTIVATION_TANH, arch);
-    compute_generic_gru(&model->gru_1_input, &model->gru_1_recurrent, st->gru_state, downsampler_out, arch);
-    compute_generic_dense(&model->dense_final_upsampler, output, st->gru_state, ACTIVATION_LINEAR, arch);
+    oaci_compute_generic_dense(&model->dense_downsampler, downsampler_out, downsampler_in, ACTIVATION_TANH, arch);
+    oaci_compute_generic_gru(&model->gru_1_input, &model->gru_1_recurrent, st->gru_state, downsampler_out, arch);
+    oaci_compute_generic_dense(&model->dense_final_upsampler, output, st->gru_state, ACTIVATION_LINEAR, arch);
     for (i = 0; i < 180; i++) {
         if (output[i] > maxval) {
             pos = i;
@@ -57,22 +57,22 @@ float compute_pitchdnn(
 }
 
 
-void pitchdnn_init(PitchDNNState *st) {
+void oaci_pitchdnn_init(PitchDNNState *st) {
     int ret;
     OAC_CLEAR(st, 1);
 #ifndef USE_WEIGHTS_FILE
-    ret = init_pitchdnn(&st->model, pitchdnn_arrays);
+    ret = oaci_init_pitchdnn(&st->model, oaci_pitchdnn_arrays);
 #else
     ret = 0;
 #endif
     celt_assert(ret == 0);
 }
 
-int pitchdnn_load_model(PitchDNNState *st, const void *data, int len) {
+int oaci_pitchdnn_load_model(PitchDNNState *st, const void *data, int len) {
     WeightArray *list;
     int ret;
-    parse_weights(&list, data, len);
-    ret = init_pitchdnn(&st->model, list);
+    oaci_parse_weights(&list, data, len);
+    ret = oaci_init_pitchdnn(&st->model, list);
     oac_free(list);
     if (ret == 0) return 0;
     else return -1;
diff --git a/dnn/pitchdnn.h b/dnn/pitchdnn.h
index 108a47db6..172089916 100644
--- a/dnn/pitchdnn.h
+++ b/dnn/pitchdnn.h
@@ -21,10 +21,10 @@ typedef struct {
 } PitchDNNState;
 
 
-void pitchdnn_init(PitchDNNState *st);
-int pitchdnn_load_model(PitchDNNState *st, const void *data, int len);
+void oaci_pitchdnn_init(PitchDNNState *st);
+int oaci_pitchdnn_load_model(PitchDNNState *st, const void *data, int len);
 
-float compute_pitchdnn(
+float oaci_compute_pitchdnn(
     PitchDNNState *st,
     const float *if_features,
     const float *xcorr_features,
diff --git a/dnn/rename_downloads.bat b/dnn/rename_downloads.bat
index 3ad2a52fe..e67896723 100644
--- a/dnn/rename_downloads.bat
+++ b/dnn/rename_downloads.bat
@@ -11,6 +11,11 @@ powershell -NoProfile -ExecutionPolicy Bypass -Command ^
     "           -creplace 'Opus', 'Oac' " ^
     "           -creplace 'opus_', 'oac_' " ^
     "           -creplace 'opus', 'oac' " ^
+    "           -creplace 'linear_init', 'oaci_linear_init' " ^
+    "           -creplace '^const WeightArray ', 'const WeightArray oaci_' " ^
+    "           -creplace '^int init_', 'int oaci_init_' " ^
+    "           -creplace 'oac_uint8 dred_', 'oac_uint8 oaci_dred_' " ^
+    "           -creplace 'conv2d_init', 'oaci_conv2d_init' " ^
     "    } | Set-Content -Path $file.FullName " ^
     "}"
 
diff --git a/dnn/rename_downloads.sh b/dnn/rename_downloads.sh
index 1f069fe40..c543ff177 100755
--- a/dnn/rename_downloads.sh
+++ b/dnn/rename_downloads.sh
@@ -3,6 +3,6 @@
 echo changing files
 for i in `find dnn | grep "_data\.[ch]" | grep -v dump_data`
 do
-	cat $i | sed -e 's/OPUS/OAC/g' -e 's/Opus/Oac/g' -e 's/opus_/oac_/g' -e 's/opus/oac/g' > tmp.c
+	cat $i | sed -e 's/OPUS/OAC/g' -e 's/Opus/Oac/g' -e 's/opus_/oac_/g' -e 's/opus/oac/g' -e 's/linear_init/oaci_linear_init/' -e 's/^const WeightArray /const WeightArray oaci_/' -e 's/^int init_/int oaci_init_/' -e 's/oac_uint8 dred_/oac_uint8 oaci_dred_/' -e 's/conv2d_init/oaci_conv2d_init/' > tmp.c
 	cp tmp.c $i; rm tmp.c
 done
diff --git a/dnn/write_lpcnet_weights.c b/dnn/write_lpcnet_weights.c
index 698304533..15e009ffb 100644
--- a/dnn/write_lpcnet_weights.c
+++ b/dnn/write_lpcnet_weights.c
@@ -77,17 +77,17 @@ void write_weights(const WeightArray *list, FILE *fout) {
 
 int main(void) {
     FILE *fout = fopen("weights_blob.bin", "w");
-    write_weights(pitchdnn_arrays, fout);
-    write_weights(fargan_arrays, fout);
-    write_weights(plcmodel_arrays, fout);
-    write_weights(rdovaeenc_arrays, fout);
-    write_weights(rdovaedec_arrays, fout);
+    write_weights(oaci_pitchdnn_arrays, fout);
+    write_weights(oaci_fargan_arrays, fout);
+    write_weights(oaci_plcmodel_arrays, fout);
+    write_weights(oaci_rdovaeenc_arrays, fout);
+    write_weights(oaci_rdovaedec_arrays, fout);
 #ifdef ENABLE_OSCE
 # ifndef DISABLE_LACE
-    write_weights(lacelayers_arrays, fout);
+    write_weights(oaci_lacelayers_arrays, fout);
 # endif
 # ifndef DISABLE_NOLACE
-    write_weights(nolacelayers_arrays, fout);
+    write_weights(oaci_nolacelayers_arrays, fout);
 # endif
 #endif
     fclose(fout);
diff --git a/dnn/x86/dnn_x86.h b/dnn/x86/dnn_x86.h
index 7fe26cde1..0aa531b26 100644
--- a/dnn/x86/dnn_x86.h
+++ b/dnn/x86/dnn_x86.h
@@ -32,23 +32,23 @@
 #include "oac_types.h"
 
 #if defined(OAC_X86_MAY_HAVE_SSE2)
-void compute_linear_sse2(const LinearLayer *linear, float *out, const float *in);
-void compute_activation_sse2(float *output, const float *input, int N, int activation);
-void compute_conv2d_sse2(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride,
+void oaci_compute_linear_sse2(const LinearLayer *linear, float *out, const float *in);
+void oaci_compute_activation_sse2(float *output, const float *input, int N, int activation);
+void oaci_compute_conv2d_sse2(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride,
     int activation);
 #endif
 
 #if defined(OAC_X86_MAY_HAVE_SSE4_1)
-void compute_linear_sse4_1(const LinearLayer *linear, float *out, const float *in);
-void compute_activation_sse4_1(float *output, const float *input, int N, int activation);
-void compute_conv2d_sse4_1(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride,
+void oaci_compute_linear_sse4_1(const LinearLayer *linear, float *out, const float *in);
+void oaci_compute_activation_sse4_1(float *output, const float *input, int N, int activation);
+void oaci_compute_conv2d_sse4_1(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride,
     int activation);
 #endif
 
 #if defined(OAC_X86_MAY_HAVE_AVX2)
-void compute_linear_avx2(const LinearLayer *linear, float *out, const float *in);
-void compute_activation_avx2(float *output, const float *input, int N, int activation);
-void compute_conv2d_avx2(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride,
+void oaci_compute_linear_avx2(const LinearLayer *linear, float *out, const float *in);
+void oaci_compute_activation_avx2(float *output, const float *input, int N, int activation);
+void oaci_compute_conv2d_avx2(const Conv2dLayer *conv, float *out, float *mem, const float *in, int height, int hstride,
     int activation);
 #endif
 
@@ -56,65 +56,65 @@ void compute_conv2d_avx2(const Conv2dLayer *conv, float *out, float *mem, const
 #if defined(OAC_X86_PRESUME_AVX2)
 
 # define OVERRIDE_COMPUTE_LINEAR
-# define compute_linear(linear, out, in, arch) ((void)(arch), compute_linear_avx2(linear, out, in))
+# define oaci_compute_linear(linear, out, in, arch) ((void)(arch), oaci_compute_linear_avx2(linear, out, in))
 # define OVERRIDE_COMPUTE_ACTIVATION
-# define compute_activation(output, input, N, activation, arch) ((void)(arch), \
-                                                                 compute_activation_avx2(output, input, N, activation))
+# define oaci_compute_activation(output, input, N, activation, arch) ((void)(arch), \
+                                                                 oaci_compute_activation_avx2(output, input, N, activation))
 # define OVERRIDE_COMPUTE_CONV2D
-# define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch), \
-                                                                                compute_conv2d_avx2(conv, out, mem, in, \
+# define oaci_compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch), \
+                                                                                oaci_compute_conv2d_avx2(conv, out, mem, in, \
     height, hstride, activation))
 
 #elif defined(OAC_X86_PRESUME_SSE4_1) && !defined(OAC_X86_MAY_HAVE_AVX2)
 
 # define OVERRIDE_COMPUTE_LINEAR
-# define compute_linear(linear, out, in, arch) ((void)(arch), compute_linear_sse4_1(linear, out, in))
+# define oaci_compute_linear(linear, out, in, arch) ((void)(arch), oaci_compute_linear_sse4_1(linear, out, in))
 # define OVERRIDE_COMPUTE_ACTIVATION
-# define compute_activation(output, input, N, activation, arch) ((void)(arch), \
-                                                                 compute_activation_sse4_1(output, input, N, \
+# define oaci_compute_activation(output, input, N, activation, arch) ((void)(arch), \
+                                                                 oaci_compute_activation_sse4_1(output, input, N, \
     activation))
 # define OVERRIDE_COMPUTE_CONV2D
-# define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch), \
-                                                                                compute_conv2d_sse4_1(conv, out, mem, \
+# define oaci_compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch), \
+                                                                                oaci_compute_conv2d_sse4_1(conv, out, mem, \
     in, height, hstride, activation))
 
 #elif defined(OAC_X86_PRESUME_SSE2) && !defined(OAC_X86_MAY_HAVE_AVX2) && !defined(OAC_X86_MAY_HAVE_SSE4_1)
 
 # define OVERRIDE_COMPUTE_LINEAR
-# define compute_linear(linear, out, in, arch) ((void)(arch), compute_linear_sse2(linear, out, in))
+# define oaci_compute_linear(linear, out, in, arch) ((void)(arch), oaci_compute_linear_sse2(linear, out, in))
 # define OVERRIDE_COMPUTE_ACTIVATION
-# define compute_activation(output, input, N, activation, arch) ((void)(arch), \
-                                                                 compute_activation_sse2(output, input, N, activation))
+# define oaci_compute_activation(output, input, N, activation, arch) ((void)(arch), \
+                                                                 oaci_compute_activation_sse2(output, input, N, activation))
 # define OVERRIDE_COMPUTE_CONV2D
-# define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch), \
-                                                                                compute_conv2d_sse2(conv, out, mem, in, \
+# define oaci_compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) ((void)(arch), \
+                                                                                oaci_compute_conv2d_sse2(conv, out, mem, in, \
     height, hstride, activation))
 
 #elif defined(OAC_HAVE_RTCD) && (defined(OAC_X86_MAY_HAVE_AVX2) || defined(OAC_X86_MAY_HAVE_SSE4_1) \
     || defined(OAC_X86_MAY_HAVE_SSE2))
 
-extern void (*const DNN_COMPUTE_LINEAR_IMPL[OAC_ARCHMASK + 1])(
+extern void (*const oaci_DNN_COMPUTE_LINEAR_IMPL[OAC_ARCHMASK + 1])(
                     const LinearLayer *linear,
                     float *out,
                     const float *in
     );
 # define OVERRIDE_COMPUTE_LINEAR
-# define compute_linear(linear, out, in, arch) \
-        ((*DNN_COMPUTE_LINEAR_IMPL[(arch)&OAC_ARCHMASK])(linear, out, in))
+# define oaci_compute_linear(linear, out, in, arch) \
+        ((*oaci_DNN_COMPUTE_LINEAR_IMPL[(arch)&OAC_ARCHMASK])(linear, out, in))
 
 
-extern void (*const DNN_COMPUTE_ACTIVATION_IMPL[OAC_ARCHMASK + 1])(
+extern void (*const oaci_DNN_COMPUTE_ACTIVATION_IMPL[OAC_ARCHMASK + 1])(
                     float *output,
                     const float *input,
                     int N,
                     int activation
     );
 # define OVERRIDE_COMPUTE_ACTIVATION
-# define compute_activation(output, input, N, activation, arch) \
-        ((*DNN_COMPUTE_ACTIVATION_IMPL[(arch)&OAC_ARCHMASK])(output, input, N, activation))
+# define oaci_compute_activation(output, input, N, activation, arch) \
+        ((*oaci_DNN_COMPUTE_ACTIVATION_IMPL[(arch)&OAC_ARCHMASK])(output, input, N, activation))
 
 
-extern void (*const DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
+extern void (*const oaci_DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
                     const Conv2dLayer *conv,
                     float *out,
                     float *mem,
@@ -124,8 +124,8 @@ extern void (*const DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
                     int activation
     );
 # define OVERRIDE_COMPUTE_CONV2D
-# define compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) \
-        ((*DNN_COMPUTE_CONV2D_IMPL[(arch)&OAC_ARCHMASK])(conv, out, mem, in, height, hstride, activation))
+# define oaci_compute_conv2d(conv, out, mem, in, height, hstride, activation, arch) \
+        ((*oaci_DNN_COMPUTE_CONV2D_IMPL[(arch)&OAC_ARCHMASK])(conv, out, mem, in, height, hstride, activation))
 
 
 #endif
diff --git a/dnn/x86/x86_dnn_map.c b/dnn/x86/x86_dnn_map.c
index 16a92555b..a9bc06b58 100644
--- a/dnn/x86/x86_dnn_map.c
+++ b/dnn/x86/x86_dnn_map.c
@@ -36,32 +36,32 @@
 
 # if (defined(OAC_X86_MAY_HAVE_SSE2) && !defined(OAC_X86_PRESUME_AVX2))
 
-void (*const DNN_COMPUTE_LINEAR_IMPL[OAC_ARCHMASK + 1])(
+void (*const oaci_DNN_COMPUTE_LINEAR_IMPL[OAC_ARCHMASK + 1])(
          const LinearLayer *linear,
          float *out,
          const float *in
     ) = {
-    compute_linear_c,              /* non-sse */
-    compute_linear_c,
-    MAY_HAVE_SSE2(compute_linear),
-    MAY_HAVE_SSE4_1(compute_linear), /* sse4.1  */
-    MAY_HAVE_AVX2(compute_linear) /* avx  */
+    oaci_compute_linear_c,              /* non-sse */
+    oaci_compute_linear_c,
+    MAY_HAVE_SSE2(oaci_compute_linear),
+    MAY_HAVE_SSE4_1(oaci_compute_linear), /* sse4.1  */
+    MAY_HAVE_AVX2(oaci_compute_linear) /* avx  */
 };
 
-void (*const DNN_COMPUTE_ACTIVATION_IMPL[OAC_ARCHMASK + 1])(
+void (*const oaci_DNN_COMPUTE_ACTIVATION_IMPL[OAC_ARCHMASK + 1])(
          float *output,
          const float *input,
          int N,
          int activation
     ) = {
-    compute_activation_c,              /* non-sse */
-    compute_activation_c,
-    MAY_HAVE_SSE2(compute_activation),
-    MAY_HAVE_SSE4_1(compute_activation), /* sse4.1  */
-    MAY_HAVE_AVX2(compute_activation) /* avx  */
+    oaci_compute_activation_c,              /* non-sse */
+    oaci_compute_activation_c,
+    MAY_HAVE_SSE2(oaci_compute_activation),
+    MAY_HAVE_SSE4_1(oaci_compute_activation), /* sse4.1  */
+    MAY_HAVE_AVX2(oaci_compute_activation) /* avx  */
 };
 
-void (*const DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
+void (*const oaci_DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
          const Conv2dLayer *conv,
          float *out,
          float *mem,
@@ -70,11 +70,11 @@ void (*const DNN_COMPUTE_CONV2D_IMPL[OAC_ARCHMASK + 1])(
          int hstride,
          int activation
     ) = {
-    compute_conv2d_c,              /* non-sse */
-    compute_conv2d_c,
-    MAY_HAVE_SSE2(compute_conv2d),
-    MAY_HAVE_SSE4_1(compute_conv2d), /* sse4.1  */
-    MAY_HAVE_AVX2(compute_conv2d) /* avx  */
+    oaci_compute_conv2d_c,              /* non-sse */
+    oaci_compute_conv2d_c,
+    MAY_HAVE_SSE2(oaci_compute_conv2d),
+    MAY_HAVE_SSE4_1(oaci_compute_conv2d), /* sse4.1  */
+    MAY_HAVE_AVX2(oaci_compute_conv2d) /* avx  */
 };
 
 # endif
diff --git a/silk/A2NLSF.c b/silk/A2NLSF.c
index 5362367f8..470a4d6b1 100644
--- a/silk/A2NLSF.c
+++ b/silk/A2NLSF.c
@@ -117,7 +117,7 @@ static OAC_INLINE void silk_A2NLSF_init(
 
 /* Compute Normalized Line Spectral Frequencies (NLSFs) from whitening filter coefficients      */
 /* If not all roots are found, the a_Q16 coefficients are bandwidth expanded until convergence. */
-void silk_A2NLSF(
+void oaci_silk_A2NLSF(
     oac_int16                  *NLSF,              /* O    Normalized Line Spectral Frequencies in Q15 (0..2^15-1) [d] */
     oac_int32                  *a_Q16,             /* I/O  Monic whitening filter coefficients in Q16 [d]              */
     const oac_int d                                /* I    Filter order (must be even)                                 */
@@ -142,7 +142,7 @@ void silk_A2NLSF(
     /* Find roots, alternating between P and Q */
     p = P;                          /* Pointer to polynomial */
 
-    xlo = silk_LSFCosTab_FIX_Q12[ 0 ]; /* Q12*/
+    xlo = oaci_silk_LSFCosTab_FIX_Q12[ 0 ]; /* Q12*/
     ylo = silk_A2NLSF_eval_poly( p, xlo, dd );
 
     if (ylo < 0) {
@@ -159,7 +159,7 @@ void silk_A2NLSF(
     thr = 0;
     while (1) {
         /* Evaluate polynomial */
-        xhi = silk_LSFCosTab_FIX_Q12[ k ]; /* Q12 */
+        xhi = oaci_silk_LSFCosTab_FIX_Q12[ k ]; /* Q12 */
         yhi = silk_A2NLSF_eval_poly( p, xhi, dd );
 
         /* Detect zero crossing */
@@ -216,7 +216,7 @@ void silk_A2NLSF(
             p = PQ[ root_ix&1 ];
 
             /* Evaluate polynomial */
-            xlo = silk_LSFCosTab_FIX_Q12[ k - 1 ]; /* Q12*/
+            xlo = oaci_silk_LSFCosTab_FIX_Q12[ k - 1 ]; /* Q12*/
             ylo = silk_LSHIFT( 1 - (root_ix&2), 12 );
         } else {
             /* Increment loop counter */
@@ -237,11 +237,11 @@ void silk_A2NLSF(
                 }
 
                 /* Error: Apply progressively more bandwidth expansion and run again */
-                silk_bwexpander_32( a_Q16, d, 65536 - silk_LSHIFT( 1, i ));
+                oaci_silk_bwexpander_32( a_Q16, d, 65536 - silk_LSHIFT( 1, i ));
 
                 silk_A2NLSF_init( a_Q16, P, Q, dd );
                 p = P;                            /* Pointer to polynomial */
-                xlo = silk_LSFCosTab_FIX_Q12[ 0 ]; /* Q12*/
+                xlo = oaci_silk_LSFCosTab_FIX_Q12[ 0 ]; /* Q12*/
                 ylo = silk_A2NLSF_eval_poly( p, xlo, dd );
                 if (ylo < 0) {
                     /* Set the first NLSF to zero and move on to the next */
diff --git a/silk/API.h b/silk/API.h
index e5f7ffb0d..1994ae267 100644
--- a/silk/API.h
+++ b/silk/API.h
@@ -54,7 +54,7 @@ typedef struct {
 /***********************************************/
 /* Get size in bytes of the Silk encoder state */
 /***********************************************/
-oac_int silk_Get_Encoder_Size(                         /* O    Returns error code                              */
+oac_int oaci_silk_Get_Encoder_Size(                         /* O    Returns error code                              */
     oac_int                        *encSizeBytes,      /* O    Number of bytes in SILK encoder state           */
     oac_int channels                                   /* I    Number of channels                              */
     );
@@ -62,7 +62,7 @@ oac_int silk_Get_Encoder_Size(                         /* O    Returns error cod
 /*************************/
 /* Init or reset encoder */
 /*************************/
-oac_int silk_InitEncoder(                              /* O    Returns error code                              */
+oac_int oaci_silk_InitEncoder(                              /* O    Returns error code                              */
     void                            *encState,          /* I/O  State                                           */
     int channels,                                       /* I    Number of channels                              */
     int arch,                                           /* I    Run-time architecture                           */
@@ -74,7 +74,7 @@ oac_int silk_InitEncoder(                              /* O    Returns error cod
 /**************************/
 /* Note: if prefillFlag is set, the input must contain 10 ms of audio, irrespective of what                     */
 /* encControl->payloadSize_ms is set to                                                                         */
-oac_int silk_Encode(                                   /* O    Returns error code                              */
+oac_int oaci_silk_Encode(                                   /* O    Returns error code                              */
     void                            *encState,          /* I/O  State                                           */
     silk_EncControlStruct           *encControl,        /* I    Control status                                  */
     const oac_res                  *samplesIn,         /* I    Speech sample input vector                      */
@@ -93,7 +93,7 @@ oac_int silk_Encode(                                   /* O    Returns error cod
 /***********************************************/
 /* Load OSCE models from external data pointer */
 /***********************************************/
-oac_int silk_LoadOSCEModels(
+oac_int oaci_silk_LoadOSCEModels(
     void *decState,                                     /* O    I/O State                                       */
     const unsigned char *data,                          /* I    pointer to binary blob                          */
     int len                                             /* I    length of binary blob data                      */
@@ -102,25 +102,25 @@ oac_int silk_LoadOSCEModels(
 /***********************************************/
 /* Get size in bytes of the Silk decoder state */
 /***********************************************/
-oac_int silk_Get_Decoder_Size(                         /* O    Returns error code                              */
+oac_int oaci_silk_Get_Decoder_Size(                         /* O    Returns error code                              */
     oac_int                        *decSizeBytes       /* O    Number of bytes in SILK decoder state           */
     );
 
 /*************************/
 /* Init and Reset decoder */
 /*************************/
-oac_int silk_ResetDecoder(                              /* O    Returns error code                              */
+oac_int oaci_silk_ResetDecoder(                              /* O    Returns error code                              */
     void                            *decState            /* I/O  State                                           */
     );
 
-oac_int silk_InitDecoder(                              /* O    Returns error code                              */
+oac_int oaci_silk_InitDecoder(                              /* O    Returns error code                              */
     void                            *decState           /* I/O  State                                           */
     );
 
 /******************/
 /* Decode a frame */
 /******************/
-oac_int silk_Decode(                                   /* O    Returns error code                              */
+oac_int oaci_silk_Decode(                                   /* O    Returns error code                              */
     void*                           decState,           /* I/O  State                                           */
     silk_DecControlStruct*decControl,                   /* I/O  Control Structure                               */
     oac_int lostFlag,                                  /* I    0: no loss, 1 loss, 2 decode fec                */
diff --git a/silk/CNG.c b/silk/CNG.c
index 2c0df33a4..6505d9b7a 100644
--- a/silk/CNG.c
+++ b/silk/CNG.c
@@ -58,7 +58,7 @@ static OAC_INLINE void silk_CNG_exc(
     *rand_seed = seed;
 }
 
-void silk_CNG_Reset(
+void oaci_silk_CNG_Reset(
     silk_decoder_state          *psDec                          /* I/O  Decoder state                               */
     ) {
     oac_int i, NLSF_step_Q15, NLSF_acc_Q15;
@@ -74,7 +74,7 @@ void silk_CNG_Reset(
 }
 
 /* Updates CNG estimate, and applies the CNG when packet was lost   */
-void silk_CNG(
+void oaci_silk_CNG(
     silk_decoder_state          *psDec,                         /* I/O  Decoder state                               */
     silk_decoder_control        *psDecCtrl,                     /* I/O  Decoder control                             */
     oac_int16 frame[],                                         /* I/O  Signal                                      */
@@ -88,7 +88,7 @@ void silk_CNG(
 
     if (psDec->fs_kHz != psCNG->fs_kHz) {
         /* Reset state */
-        silk_CNG_Reset( psDec );
+        oaci_silk_CNG_Reset( psDec );
 
         psCNG->fs_kHz = psDec->fs_kHz;
     }
@@ -149,7 +149,7 @@ void silk_CNG(
         silk_CNG_exc( CNG_sig_Q14 + MAX_LPC_ORDER, psCNG->CNG_exc_buf_Q14, length, &psCNG->rand_seed );
 
         /* Convert CNG NLSF to filter representation */
-        silk_NLSF2A( A_Q12, psCNG->CNG_smth_NLSF_Q15, psDec->LPC_order, psDec->arch );
+        oaci_silk_NLSF2A( A_Q12, psCNG->CNG_smth_NLSF_Q15, psDec->LPC_order, psDec->arch );
 
         /* Generate CNG signal, by synthesis filtering */
         silk_memcpy( CNG_sig_Q14, psCNG->CNG_synth_state, MAX_LPC_ORDER*sizeof(oac_int32));
diff --git a/silk/HP_variable_cutoff.c b/silk/HP_variable_cutoff.c
index f883abbf3..fac860a8a 100644
--- a/silk/HP_variable_cutoff.c
+++ b/silk/HP_variable_cutoff.c
@@ -36,7 +36,7 @@
 #include "tuning_parameters.h"
 
 /* High-pass filter with cutoff frequency adaptation based on pitch lag statistics */
-void silk_HP_variable_cutoff(
+void oaci_silk_HP_variable_cutoff(
     silk_encoder_state_Fxx state_Fxx[]                                  /* I/O  Encoder states                              */
     ) {
     oac_int quality_Q15;
@@ -47,12 +47,12 @@ void silk_HP_variable_cutoff(
     if (psEncC1->prevSignalType == TYPE_VOICED) {
         /* difference, in log domain */
         pitch_freq_Hz_Q16 = silk_DIV32_16( silk_LSHIFT( silk_MUL( psEncC1->fs_kHz, 1000 ), 16 ), psEncC1->prevLag );
-        pitch_freq_log_Q7 = silk_lin2log( pitch_freq_Hz_Q16 ) - (16<<7);
+        pitch_freq_log_Q7 = oaci_silk_lin2log( pitch_freq_Hz_Q16 ) - (16<<7);
 
         /* adjustment based on quality */
         quality_Q15 = psEncC1->input_quality_bands_Q15[ 0 ];
         pitch_freq_log_Q7 = silk_SMLAWB( pitch_freq_log_Q7, silk_SMULWB( silk_LSHIFT( -quality_Q15, 2 ), quality_Q15 ),
-            pitch_freq_log_Q7 - (silk_lin2log( SILK_FIX_CONST( VARIABLE_HP_MIN_CUTOFF_HZ, 16 )) - (16<<7)));
+            pitch_freq_log_Q7 - (oaci_silk_lin2log( SILK_FIX_CONST( VARIABLE_HP_MIN_CUTOFF_HZ, 16 )) - (16<<7)));
 
         /* delta_freq = pitch_freq_log - psEnc->variable_HP_smth1; */
         delta_freq_Q7 = pitch_freq_log_Q7 - silk_RSHIFT( psEncC1->variable_HP_smth1_Q15, 8 );
@@ -71,7 +71,7 @@ void silk_HP_variable_cutoff(
 
         /* limit frequency range */
         psEncC1->variable_HP_smth1_Q15 = silk_LIMIT_32( psEncC1->variable_HP_smth1_Q15,
-            silk_LSHIFT( silk_lin2log( VARIABLE_HP_MIN_CUTOFF_HZ ), 8 ),
-            silk_LSHIFT( silk_lin2log( VARIABLE_HP_MAX_CUTOFF_HZ ), 8 ));
+            silk_LSHIFT( oaci_silk_lin2log( VARIABLE_HP_MIN_CUTOFF_HZ ), 8 ),
+            silk_LSHIFT( oaci_silk_lin2log( VARIABLE_HP_MAX_CUTOFF_HZ ), 8 ));
     }
 }
diff --git a/silk/LPC_analysis_filter.c b/silk/LPC_analysis_filter.c
index 2200839bc..3671c84ed 100644
--- a/silk/LPC_analysis_filter.c
+++ b/silk/LPC_analysis_filter.c
@@ -39,14 +39,14 @@
 /* first d output samples are set to zero  */
 /*******************************************/
 
-/* OPT: Using celt_fir() for this function should be faster, but it may cause
+/* OPT: Using oaci_celt_fir() for this function should be faster, but it may cause
    integer overflows in intermediate values (not final results), which the
    current implementation silences by casting to unsigned. Enabling
    this should be safe in pretty much all cases, even though it is not technically
    C89-compliant. */
 #define USE_CELT_FIR 0
 
-void silk_LPC_analysis_filter(
+void oaci_silk_LPC_analysis_filter(
     oac_int16                  *out,               /* O    Output signal                                               */
     const oac_int16            *in,                /* I    Input signal                                                */
     const oac_int16            *B,                 /* I    MA prediction coefficients, Q12 [order]                     */
@@ -72,7 +72,7 @@ void silk_LPC_analysis_filter(
     for (j = 0; j < d; j++) {
         num[ j ] = -B[ j ];
     }
-    celt_fir( in + d, num, out + d, len - d, d, arch );
+    oaci_celt_fir( in + d, num, out + d, len - d, d, arch );
     for (j = 0; j < d; j++) {
         out[ j ] = 0;
     }
diff --git a/silk/LPC_fit.c b/silk/LPC_fit.c
index e6370b075..010c930c9 100644
--- a/silk/LPC_fit.c
+++ b/silk/LPC_fit.c
@@ -32,8 +32,8 @@
 #include "SigProc_FIX.h"
 
 /* Convert int32 coefficients to int16 coefs and make sure there's no wrap-around.
-   This logic is reused in _celt_lpc(). Any bug fixes should also be applied there. */
-void silk_LPC_fit(
+   This logic is reused in oaci_celt_lpc(). Any bug fixes should also be applied there. */
+void oaci_silk_LPC_fit(
     oac_int16                  *a_QOUT,            /* O    Output signal                                               */
     oac_int32                    *a_QIN,             /* I/O  Input signal                                                */
     const oac_int QOUT,                            /* I    Input Q domain                                              */
@@ -61,7 +61,7 @@ void silk_LPC_fit(
             maxabs = silk_min( maxabs, 163838 );  /* ( silk_int32_MAX >> 14 ) + silk_int16_MAX = 163838 */
             chirp_Q16 = SILK_FIX_CONST( 0.999, 16 ) - silk_DIV32( silk_LSHIFT( maxabs - silk_int16_MAX, 14 ),
                                         silk_RSHIFT32( silk_MUL( maxabs, idx + 1), 2 ));
-            silk_bwexpander_32( a_QIN, d, chirp_Q16 );
+            oaci_silk_bwexpander_32( a_QIN, d, chirp_Q16 );
         } else {
             break;
         }
diff --git a/silk/LPC_inv_pred_gain.c b/silk/LPC_inv_pred_gain.c
index 10d5f22cb..ea558f611 100644
--- a/silk/LPC_inv_pred_gain.c
+++ b/silk/LPC_inv_pred_gain.c
@@ -118,7 +118,7 @@ static oac_int32 LPC_inverse_pred_gain_QA_c(               /* O   Returns invers
 }
 
 /* For input in Q12 domain */
-oac_int32 silk_LPC_inverse_pred_gain_c(            /* O   Returns inverse prediction gain in energy domain, Q30        */
+oac_int32 oaci_silk_LPC_inverse_pred_gain_c(            /* O   Returns inverse prediction gain in energy domain, Q30        */
     const oac_int16            *A_Q12,             /* I   Prediction coefficients, Q12 [order]                         */
     const oac_int order                            /* I   Prediction order                                             */
     ) {
diff --git a/silk/LP_variable_cutoff.c b/silk/LP_variable_cutoff.c
index 981dffa31..6666aca9b 100644
--- a/silk/LP_variable_cutoff.c
+++ b/silk/LP_variable_cutoff.c
@@ -51,16 +51,16 @@ static OAC_INLINE void silk_LP_interpolate_filter_taps(
                 /* Piece-wise linear interpolation of B and A */
                 for (nb = 0; nb < TRANSITION_NB; nb++) {
                     B_Q28[ nb ] = silk_SMLAWB(
-                        silk_Transition_LP_B_Q28[ ind     ][ nb ],
-                        silk_Transition_LP_B_Q28[ ind + 1 ][ nb ]
-                        - silk_Transition_LP_B_Q28[ ind     ][ nb ],
+                        oaci_silk_Transition_LP_B_Q28[ ind     ][ nb ],
+                        oaci_silk_Transition_LP_B_Q28[ ind + 1 ][ nb ]
+                        - oaci_silk_Transition_LP_B_Q28[ ind     ][ nb ],
                         fac_Q16 );
                 }
                 for (na = 0; na < TRANSITION_NA; na++) {
                     A_Q28[ na ] = silk_SMLAWB(
-                        silk_Transition_LP_A_Q28[ ind     ][ na ],
-                        silk_Transition_LP_A_Q28[ ind + 1 ][ na ]
-                        - silk_Transition_LP_A_Q28[ ind     ][ na ],
+                        oaci_silk_Transition_LP_A_Q28[ ind     ][ na ],
+                        oaci_silk_Transition_LP_A_Q28[ ind + 1 ][ na ]
+                        - oaci_silk_Transition_LP_A_Q28[ ind     ][ na ],
                         fac_Q16 );
                 }
             } else { /* ( fac_Q16 - ( 1 << 16 ) ) is in range of a 16-bit int */
@@ -68,26 +68,26 @@ static OAC_INLINE void silk_LP_interpolate_filter_taps(
                 /* Piece-wise linear interpolation of B and A */
                 for (nb = 0; nb < TRANSITION_NB; nb++) {
                     B_Q28[ nb ] = silk_SMLAWB(
-                        silk_Transition_LP_B_Q28[ ind + 1 ][ nb ],
-                        silk_Transition_LP_B_Q28[ ind + 1 ][ nb ]
-                        - silk_Transition_LP_B_Q28[ ind     ][ nb ],
+                        oaci_silk_Transition_LP_B_Q28[ ind + 1 ][ nb ],
+                        oaci_silk_Transition_LP_B_Q28[ ind + 1 ][ nb ]
+                        - oaci_silk_Transition_LP_B_Q28[ ind     ][ nb ],
                         fac_Q16 - ((oac_int32)1<<16));
                 }
                 for (na = 0; na < TRANSITION_NA; na++) {
                     A_Q28[ na ] = silk_SMLAWB(
-                        silk_Transition_LP_A_Q28[ ind + 1 ][ na ],
-                        silk_Transition_LP_A_Q28[ ind + 1 ][ na ]
-                        - silk_Transition_LP_A_Q28[ ind     ][ na ],
+                        oaci_silk_Transition_LP_A_Q28[ ind + 1 ][ na ],
+                        oaci_silk_Transition_LP_A_Q28[ ind + 1 ][ na ]
+                        - oaci_silk_Transition_LP_A_Q28[ ind     ][ na ],
                         fac_Q16 - ((oac_int32)1<<16));
                 }
             }
         } else {
-            silk_memcpy( B_Q28, silk_Transition_LP_B_Q28[ ind ], TRANSITION_NB*sizeof(oac_int32));
-            silk_memcpy( A_Q28, silk_Transition_LP_A_Q28[ ind ], TRANSITION_NA*sizeof(oac_int32));
+            silk_memcpy( B_Q28, oaci_silk_Transition_LP_B_Q28[ ind ], TRANSITION_NB*sizeof(oac_int32));
+            silk_memcpy( A_Q28, oaci_silk_Transition_LP_A_Q28[ ind ], TRANSITION_NA*sizeof(oac_int32));
         }
     } else {
-        silk_memcpy( B_Q28, silk_Transition_LP_B_Q28[ TRANSITION_INT_NUM - 1 ], TRANSITION_NB*sizeof(oac_int32));
-        silk_memcpy( A_Q28, silk_Transition_LP_A_Q28[ TRANSITION_INT_NUM - 1 ], TRANSITION_NA*sizeof(oac_int32));
+        silk_memcpy( B_Q28, oaci_silk_Transition_LP_B_Q28[ TRANSITION_INT_NUM - 1 ], TRANSITION_NB*sizeof(oac_int32));
+        silk_memcpy( A_Q28, oaci_silk_Transition_LP_A_Q28[ TRANSITION_INT_NUM - 1 ], TRANSITION_NA*sizeof(oac_int32));
     }
 }
 
@@ -95,7 +95,7 @@ static OAC_INLINE void silk_LP_interpolate_filter_taps(
 /* piece-wise linear interpolation between elliptic filters */
 /* Start by setting psEncC->mode <> 0;                      */
 /* Deactivate by setting psEncC->mode = 0;                  */
-void silk_LP_variable_cutoff(
+void oaci_silk_LP_variable_cutoff(
     silk_LP_state               *psLP,                          /* I/O  LP filter state                             */
     oac_int16                  *frame,                         /* I/O  Low-pass filtered output signal             */
     const oac_int frame_length                                 /* I    Frame length                                */
@@ -127,6 +127,6 @@ void silk_LP_variable_cutoff(
 
         /* ARMA low-pass filtering */
         silk_assert( TRANSITION_NB == 3 && TRANSITION_NA == 2 );
-        silk_biquad_alt_stride1( frame, B_Q28, A_Q28, psLP->In_LP_State, frame, frame_length);
+        oaci_silk_biquad_alt_stride1( frame, B_Q28, A_Q28, psLP->In_LP_State, frame, frame_length);
     }
 }
diff --git a/silk/NLSF2A.c b/silk/NLSF2A.c
index ff31b6ac6..fce54d618 100644
--- a/silk/NLSF2A.c
+++ b/silk/NLSF2A.c
@@ -62,7 +62,7 @@ static OAC_INLINE void silk_NLSF2A_find_poly(
 }
 
 /* compute whitening filter coefficients from normalized line spectral frequencies */
-void silk_NLSF2A(
+void oaci_silk_NLSF2A(
     oac_int16                  *a_Q12,             /* O    monic whitening filter coefficients in Q12,  [ d ]          */
     const oac_int16            *NLSF,              /* I    normalized line spectral frequencies in Q15, [ d ]          */
     const oac_int d,                               /* I    filter order (should be even)                               */
@@ -101,8 +101,8 @@ void silk_NLSF2A(
         silk_assert(f_int < LSF_COS_TAB_SZ_FIX );
 
         /* Read start and end value from table */
-        cos_val = silk_LSFCosTab_FIX_Q12[ f_int ];                /* Q12 */
-        delta   = silk_LSFCosTab_FIX_Q12[ f_int + 1 ] - cos_val;  /* Q12, with a range of 0..200 */
+        cos_val = oaci_silk_LSFCosTab_FIX_Q12[ f_int ];                /* Q12 */
+        delta   = oaci_silk_LSFCosTab_FIX_Q12[ f_int + 1 ] - cos_val;  /* Q12, with a range of 0..200 */
 
         /* Linear interpolation */
         cos_LSF_QA[ordering[k]] = silk_RSHIFT_ROUND( silk_LSHIFT( cos_val, 8 ) + silk_MUL( delta, f_frac ), 20 - QA ); /* QA */
@@ -125,12 +125,12 @@ void silk_NLSF2A(
     }
 
     /* Convert int32 coefficients to Q12 int16 coefs */
-    silk_LPC_fit( a_Q12, a32_QA1, 12, QA + 1, d );
+    oaci_silk_LPC_fit( a_Q12, a32_QA1, 12, QA + 1, d );
 
-    for (i = 0; silk_LPC_inverse_pred_gain( a_Q12, d, arch ) == 0 && i < MAX_LPC_STABILIZE_ITERATIONS; i++) {
+    for (i = 0; oaci_silk_LPC_inverse_pred_gain( a_Q12, d, arch ) == 0 && i < MAX_LPC_STABILIZE_ITERATIONS; i++) {
         /* Prediction coefficients are (too close to) unstable; apply bandwidth expansion   */
         /* on the unscaled coefficients, convert to Q12 and measure again                   */
-        silk_bwexpander_32( a32_QA1, d, 65536 - silk_LSHIFT( 2, i ));
+        oaci_silk_bwexpander_32( a32_QA1, d, 65536 - silk_LSHIFT( 2, i ));
         for (k = 0; k < d; k++) {
             a_Q12[ k ] = (oac_int16)silk_RSHIFT_ROUND( a32_QA1[ k ], QA + 1 - 12 );            /* QA+1 -> Q12 */
         }
diff --git a/silk/NLSF_VQ.c b/silk/NLSF_VQ.c
index 3e825fd66..9558d049a 100644
--- a/silk/NLSF_VQ.c
+++ b/silk/NLSF_VQ.c
@@ -32,7 +32,7 @@
 #include "main.h"
 
 /* Compute quantization errors for an LPC_order element input vector for a VQ codebook */
-void silk_NLSF_VQ(
+void oaci_silk_NLSF_VQ(
     oac_int32 err_Q24[],                                       /* O    Quantization errors [K]                     */
     const oac_int16 in_Q15[],                                  /* I    Input vectors to be quantized [LPC_order]   */
     const oac_uint8 pCB_Q8[],                                  /* I    Codebook vectors [K*LPC_order]              */
diff --git a/silk/NLSF_VQ_weights_laroia.c b/silk/NLSF_VQ_weights_laroia.c
index 2b74875de..340b6f273 100644
--- a/silk/NLSF_VQ_weights_laroia.c
+++ b/silk/NLSF_VQ_weights_laroia.c
@@ -39,7 +39,7 @@
  */
 
 /* Laroia low complexity NLSF weights */
-void silk_NLSF_VQ_weights_laroia(
+void oaci_silk_NLSF_VQ_weights_laroia(
     oac_int16                  *pNLSFW_Q_OUT,      /* O     Pointer to input vector weights [D]                        */
     const oac_int16            *pNLSF_Q15,         /* I     Pointer to input vector         [D]                        */
     const oac_int D                                /* I     Input vector dimension (even)                              */
diff --git a/silk/NLSF_decode.c b/silk/NLSF_decode.c
index d37ccaa60..2591e43f3 100644
--- a/silk/NLSF_decode.c
+++ b/silk/NLSF_decode.c
@@ -59,7 +59,7 @@ static OAC_INLINE void silk_NLSF_residual_dequant(          /* O    Returns RD v
 /***********************/
 /* NLSF vector decoder */
 /***********************/
-void silk_NLSF_decode(
+void oaci_silk_NLSF_decode(
     oac_int16            *pNLSF_Q15,                           /* O    Quantized NLSF vector [ LPC_ORDER ]         */
     oac_int8             *NLSFIndices,                         /* I    Codebook path vector [ LPC_ORDER + 1 ]      */
     const silk_NLSF_CB_struct   *psNLSF_CB                      /* I    Codebook object                             */
@@ -73,7 +73,7 @@ void silk_NLSF_decode(
     const oac_int16 *pCB_Wght_Q9;
 
     /* Unpack entropy table indices and predictor for current CB1 index */
-    silk_NLSF_unpack( ec_ix, pred_Q8, psNLSF_CB, NLSFIndices[ 0 ] );
+    oaci_silk_NLSF_unpack( ec_ix, pred_Q8, psNLSF_CB, NLSFIndices[ 0 ] );
 
     /* Predictive residual dequantizer */
     silk_NLSF_residual_dequant( res_Q10, &NLSFIndices[ 1 ], pred_Q8, psNLSF_CB->quantStepSize_Q16, psNLSF_CB->order );
@@ -88,5 +88,5 @@ void silk_NLSF_decode(
     }
 
     /* NLSF stabilization */
-    silk_NLSF_stabilize( pNLSF_Q15, psNLSF_CB->deltaMin_Q15, psNLSF_CB->order );
+    oaci_silk_NLSF_stabilize( pNLSF_Q15, psNLSF_CB->deltaMin_Q15, psNLSF_CB->order );
 }
diff --git a/silk/NLSF_del_dec_quant.c b/silk/NLSF_del_dec_quant.c
index 83f9cca34..e85d850c3 100644
--- a/silk/NLSF_del_dec_quant.c
+++ b/silk/NLSF_del_dec_quant.c
@@ -32,7 +32,7 @@
 #include "main.h"
 
 /* Delayed-decision quantizer for NLSF residuals */
-oac_int32 silk_NLSF_del_dec_quant(                             /* O    Returns RD value in Q25                     */
+oac_int32 oaci_silk_NLSF_del_dec_quant(                             /* O    Returns RD value in Q25                     */
     oac_int8 indices[],                                        /* O    Quantization indices [ order ]              */
     const oac_int16 x_Q10[],                                   /* I    Input [ order ]                             */
     const oac_int16 w_Q5[],                                    /* I    Weights [ order ]                           */
diff --git a/silk/NLSF_encode.c b/silk/NLSF_encode.c
index 7aa48bf9e..27b539b51 100644
--- a/silk/NLSF_encode.c
+++ b/silk/NLSF_encode.c
@@ -35,7 +35,7 @@
 /***********************/
 /* NLSF vector encoder */
 /***********************/
-oac_int32 silk_NLSF_encode(                                    /* O    Returns RD value in Q25                     */
+oac_int32 oaci_silk_NLSF_encode(                                    /* O    Returns RD value in Q25                     */
     oac_int8             *NLSFIndices,                         /* I    Codebook path vector [ LPC_ORDER + 1 ]      */
     oac_int16            *pNLSF_Q15,                           /* I/O  (Un)quantized NLSF vector [ LPC_ORDER ]     */
     const silk_NLSF_CB_struct   *psNLSF_CB,                     /* I    Codebook object                             */
@@ -63,16 +63,16 @@ oac_int32 silk_NLSF_encode(                                    /* O    Returns R
     silk_assert( NLSF_mu_Q20 <= 32767 && NLSF_mu_Q20 >= 0 );
 
     /* NLSF stabilization */
-    silk_NLSF_stabilize( pNLSF_Q15, psNLSF_CB->deltaMin_Q15, psNLSF_CB->order );
+    oaci_silk_NLSF_stabilize( pNLSF_Q15, psNLSF_CB->deltaMin_Q15, psNLSF_CB->order );
 
     /* First stage: VQ */
     ALLOC( err_Q24, psNLSF_CB->nVectors, oac_int32 );
-    silk_NLSF_VQ( err_Q24, pNLSF_Q15, psNLSF_CB->CB1_NLSF_Q8, psNLSF_CB->CB1_Wght_Q9, psNLSF_CB->nVectors,
+    oaci_silk_NLSF_VQ( err_Q24, pNLSF_Q15, psNLSF_CB->CB1_NLSF_Q8, psNLSF_CB->CB1_Wght_Q9, psNLSF_CB->nVectors,
     psNLSF_CB->order );
 
     /* Sort the quantization errors */
     ALLOC( tempIndices1, nSurvivors, oac_int );
-    silk_insertion_sort_increasing( err_Q24, tempIndices1, psNLSF_CB->nVectors, nSurvivors );
+    oaci_silk_insertion_sort_increasing( err_Q24, tempIndices1, psNLSF_CB->nVectors, nSurvivors );
 
     ALLOC( RD_Q25, nSurvivors, oac_int32 );
     ALLOC( tempIndices2, nSurvivors*MAX_LPC_ORDER, oac_int8 );
@@ -92,10 +92,10 @@ oac_int32 silk_NLSF_encode(                                    /* O    Returns R
         }
 
         /* Unpack entropy table indices and predictor for current CB1 index */
-        silk_NLSF_unpack( ec_ix, pred_Q8, psNLSF_CB, ind1 );
+        oaci_silk_NLSF_unpack( ec_ix, pred_Q8, psNLSF_CB, ind1 );
 
         /* Trellis quantizer */
-        RD_Q25[ s ] = silk_NLSF_del_dec_quant( &tempIndices2[ s*MAX_LPC_ORDER ], res_Q10, W_adj_Q5, pred_Q8, ec_ix,
+        RD_Q25[ s ] = oaci_silk_NLSF_del_dec_quant( &tempIndices2[ s*MAX_LPC_ORDER ], res_Q10, W_adj_Q5, pred_Q8, ec_ix,
             psNLSF_CB->ec_Rates_Q5, psNLSF_CB->quantStepSize_Q16, psNLSF_CB->invQuantStepSize_Q6, NLSF_mu_Q20,
         psNLSF_CB->order );
 
@@ -106,18 +106,18 @@ oac_int32 silk_NLSF_encode(                                    /* O    Returns R
         } else {
             prob_Q8 = iCDF_ptr[ ind1 - 1 ] - iCDF_ptr[ ind1 ];
         }
-        bits_q7 = (8<<7) - silk_lin2log( prob_Q8 );
+        bits_q7 = (8<<7) - oaci_silk_lin2log( prob_Q8 );
         RD_Q25[ s ] = silk_SMLABB( RD_Q25[ s ], bits_q7, silk_RSHIFT( NLSF_mu_Q20, 2 ));
     }
 
     /* Find the lowest rate-distortion error */
-    silk_insertion_sort_increasing( RD_Q25, &bestIndex, nSurvivors, 1 );
+    oaci_silk_insertion_sort_increasing( RD_Q25, &bestIndex, nSurvivors, 1 );
 
     NLSFIndices[ 0 ] = (oac_int8)tempIndices1[ bestIndex ];
     silk_memcpy( &NLSFIndices[ 1 ], &tempIndices2[ bestIndex*MAX_LPC_ORDER ], psNLSF_CB->order*sizeof(oac_int8));
 
     /* Decode */
-    silk_NLSF_decode( pNLSF_Q15, NLSFIndices, psNLSF_CB );
+    oaci_silk_NLSF_decode( pNLSF_Q15, NLSFIndices, psNLSF_CB );
 
     ret = RD_Q25[ 0 ];
     RESTORE_STACK;
diff --git a/silk/NLSF_stabilize.c b/silk/NLSF_stabilize.c
index 278bed595..4a2eb6f45 100644
--- a/silk/NLSF_stabilize.c
+++ b/silk/NLSF_stabilize.c
@@ -44,7 +44,7 @@
 #define MAX_LOOPS        20
 
 /* NLSF stabilizer, for a single input data vector */
-void silk_NLSF_stabilize(
+void oaci_silk_NLSF_stabilize(
     oac_int16            *NLSF_Q15,                /* I/O   Unstable/stabilized normalized LSF vector in Q15 [L]       */
     const oac_int16            *NDeltaMin_Q15,     /* I     Min distance vector, NDeltaMin_Q15[L] must be >= 1 [L+1]   */
     const oac_int L                                /* I     Number of NLSF parameters in the input vector              */
@@ -122,7 +122,7 @@ void silk_NLSF_stabilize(
         /* Insertion sort (fast for already almost sorted arrays):   */
         /* Best case:  O(n)   for an already sorted array            */
         /* Worst case: O(n^2) for an inversely sorted array          */
-        silk_insertion_sort_increasing_all_values_int16( &NLSF_Q15[0], L );
+        oaci_silk_insertion_sort_increasing_all_values_int16( &NLSF_Q15[0], L );
 
         /* First NLSF should be no less than NDeltaMin[0] */
         NLSF_Q15[0] = silk_max_int( NLSF_Q15[0], NDeltaMin_Q15[0] );
diff --git a/silk/NLSF_unpack.c b/silk/NLSF_unpack.c
index 415025632..5e24f2516 100644
--- a/silk/NLSF_unpack.c
+++ b/silk/NLSF_unpack.c
@@ -32,7 +32,7 @@
 #include "main.h"
 
 /* Unpack predictor values and indices for entropy coding tables */
-void silk_NLSF_unpack(
+void oaci_silk_NLSF_unpack(
     oac_int16 ec_ix[],                                         /* O    Indices to entropy tables [ LPC_ORDER ]     */
     oac_uint8 pred_Q8[],                                       /* O    LSF predictor [ LPC_ORDER ]                 */
     const silk_NLSF_CB_struct   *psNLSF_CB,                     /* I    Codebook object                             */
diff --git a/silk/NSQ.c b/silk/NSQ.c
index 4f5eac36c..526bfb43f 100644
--- a/silk/NSQ.c
+++ b/silk/NSQ.c
@@ -49,7 +49,7 @@ static OAC_INLINE void silk_nsq_scale_states(
     );
 
 #if !defined(OAC_X86_MAY_HAVE_SSE4_1)
-static OAC_INLINE void silk_noise_shape_quantizer(
+static OAC_INLINE void oaci_silk_noise_shape_quantizer(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                       */
     oac_int signalType,                        /* I    Signal type                     */
     const oac_int32 x_sc_Q10[],                /* I                                    */
@@ -73,7 +73,7 @@ static OAC_INLINE void silk_noise_shape_quantizer(
     );
 #endif
 
-void silk_NSQ_c
+void oaci_silk_NSQ_c
 (
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
@@ -108,7 +108,7 @@ void silk_NSQ_c
 
     silk_assert( NSQ->prev_gain_Q16 != 0 );
 
-    offset_Q10 = silk_Quantization_Offsets_Q10[ psIndices->signalType>>1 ][ psIndices->quantOffsetType ];
+    offset_Q10 = oaci_silk_Quantization_Offsets_Q10[ psIndices->signalType>>1 ][ psIndices->quantOffsetType ];
 
     if (psIndices->NLSFInterpCoef_Q2 == 4) {
         LSF_interpolation_flag = 0;
@@ -144,7 +144,7 @@ void silk_NSQ_c
                 start_idx = psEncC->ltp_mem_length - lag - psEncC->predictLPCOrder - LTP_ORDER/2;
                 celt_assert( start_idx > 0 );
 
-                silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k*psEncC->subfr_length ],
+                oaci_silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k*psEncC->subfr_length ],
                     A_Q12, psEncC->ltp_mem_length - start_idx, psEncC->predictLPCOrder, psEncC->arch );
 
                 NSQ->rewhite_flag = 1;
@@ -155,7 +155,7 @@ void silk_NSQ_c
         silk_nsq_scale_states( psEncC, NSQ, x16, x_sc_Q10, sLTP, sLTP_Q15, k, LTP_scale_Q14, Gains_Q16, pitchL,
         psIndices->signalType );
 
-        silk_noise_shape_quantizer( NSQ, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15, A_Q12, B_Q14,
+        oaci_silk_noise_shape_quantizer( NSQ, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15, A_Q12, B_Q14,
             AR_shp_Q13, lag, HarmShapeFIRPacked_Q14, Tilt_Q14[ k ], LF_shp_Q14[ k ], Gains_Q16[ k ], Lambda_Q10,
             offset_Q10, psEncC->subfr_length, psEncC->shapingLPCOrder, psEncC->predictLPCOrder, psEncC->arch );
 
@@ -176,13 +176,13 @@ void silk_NSQ_c
 }
 
 /******************************/
-/* silk_noise_shape_quantizer */
+/* oaci_silk_noise_shape_quantizer */
 /******************************/
 
 #if !defined(OAC_X86_MAY_HAVE_SSE4_1)
 static OAC_INLINE
 #endif
-void silk_noise_shape_quantizer(
+void oaci_silk_noise_shape_quantizer(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                       */
     oac_int signalType,                        /* I    Signal type                     */
     const oac_int32 x_sc_Q10[],                /* I                                    */
diff --git a/silk/NSQ_del_dec.c b/silk/NSQ_del_dec.c
index 6b0da0a94..7f382f5af 100644
--- a/silk/NSQ_del_dec.c
+++ b/silk/NSQ_del_dec.c
@@ -111,7 +111,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
     int arch                                    /* I                                        */
     );
 
-void silk_NSQ_del_dec_c(
+void oaci_silk_NSQ_del_dec_c(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
@@ -163,7 +163,7 @@ void silk_NSQ_del_dec_c(
         silk_memcpy( psDD->sAR2_Q14, NSQ->sAR2_Q14, sizeof(NSQ->sAR2_Q14));
     }
 
-    offset_Q10   = silk_Quantization_Offsets_Q10[ psIndices->signalType>>1 ][ psIndices->quantOffsetType ];
+    offset_Q10   = oaci_silk_Quantization_Offsets_Q10[ psIndices->signalType>>1 ][ psIndices->quantOffsetType ];
     smpl_buf_idx = 0; /* index of oldest samples */
 
     decisionDelay = silk_min_int( DECISION_DELAY, psEncC->subfr_length );
@@ -250,7 +250,7 @@ void silk_NSQ_del_dec_c(
                 start_idx = psEncC->ltp_mem_length - lag - psEncC->predictLPCOrder - LTP_ORDER/2;
                 celt_assert( start_idx > 0 );
 
-                silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k*psEncC->subfr_length ],
+                oaci_silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k*psEncC->subfr_length ],
                     A_Q12, psEncC->ltp_mem_length - start_idx, psEncC->predictLPCOrder, psEncC->arch );
 
                 NSQ->sLTP_buf_idx = psEncC->ltp_mem_length;
diff --git a/silk/PLC.c b/silk/PLC.c
index af2e2cc00..cf56b106f 100644
--- a/silk/PLC.c
+++ b/silk/PLC.c
@@ -58,7 +58,7 @@ static OAC_INLINE void silk_PLC_conceal(
     );
 
 
-void silk_PLC_Reset(
+void oaci_silk_PLC_Reset(
     silk_decoder_state                  *psDec              /* I/O Decoder state        */
     ) {
     psDec->sPLC.pitchL_Q8 = silk_LSHIFT( psDec->frame_length, 8 - 1 );
@@ -68,7 +68,7 @@ void silk_PLC_Reset(
     psDec->sPLC.nb_subfr = 2;
 }
 
-void silk_PLC(
+void oaci_silk_PLC(
     silk_decoder_state                  *psDec,             /* I/O Decoder state        */
     silk_decoder_control                *psDecCtrl,         /* I/O Decoder control      */
     oac_int16 frame[],                                     /* I/O  signal              */
@@ -80,7 +80,7 @@ void silk_PLC(
     ) {
     /* PLC control function */
     if (psDec->fs_kHz != psDec->sPLC.fs_kHz) {
-        silk_PLC_Reset( psDec );
+        oaci_silk_PLC_Reset( psDec );
         psDec->sPLC.fs_kHz = psDec->fs_kHz;
     }
 
@@ -104,7 +104,7 @@ void silk_PLC(
         if (lpcnet != NULL && psDec->sPLC.fs_kHz == 16) {
             int k;
             for (k = 0; k < psDec->nb_subfr; k += 2) {
-                lpcnet_plc_update( lpcnet, frame + k*psDec->subfr_length );
+                oaci_lpcnet_plc_update( lpcnet, frame + k*psDec->subfr_length );
             }
         }
 #endif
@@ -205,8 +205,8 @@ static OAC_INLINE void silk_PLC_energy(oac_int32 *energy1, oac_int *shift1, oac_
         exc_buf_ptr += subfr_length;
     }
     /* Find the subframe with lowest energy of the last two and use that as random noise generator */
-    silk_sum_sqr_shift( energy1, shift1, exc_buf,                  subfr_length );
-    silk_sum_sqr_shift( energy2, shift2, &exc_buf[ subfr_length ], subfr_length );
+    oaci_silk_sum_sqr_shift( energy1, shift1, exc_buf,                  subfr_length );
+    oaci_silk_sum_sqr_shift( energy2, shift2, &exc_buf[ subfr_length ], subfr_length );
     RESTORE_STACK;
 }
 
@@ -277,7 +277,7 @@ static OAC_INLINE void silk_PLC_conceal(
     }
 
     /* LPC concealment. Apply BWE to previous LPC */
-    silk_bwexpander( psPLC->prevLPC_Q12, psDec->LPC_order, SILK_FIX_CONST( BWE_COEF, 16 ));
+    oaci_silk_bwexpander( psPLC->prevLPC_Q12, psDec->LPC_order, SILK_FIX_CONST( BWE_COEF, 16 ));
 
     /* Preload LPC coefficients to array on stack. Gives small performance gain */
     silk_memcpy( A_Q12, psPLC->prevLPC_Q12, psDec->LPC_order*sizeof(oac_int16));
@@ -297,7 +297,7 @@ static OAC_INLINE void silk_PLC_conceal(
             /* Reduce random noise for unvoiced frames with high LPC gain */
             oac_int32 invGain_Q30, down_scale_Q30;
 
-            invGain_Q30 = silk_LPC_inverse_pred_gain( psPLC->prevLPC_Q12, psDec->LPC_order, arch );
+            invGain_Q30 = oaci_silk_LPC_inverse_pred_gain( psPLC->prevLPC_Q12, psDec->LPC_order, arch );
 
             down_scale_Q30 = silk_min_32( silk_RSHIFT((oac_int32)1<<30, LOG2_INV_LPC_GAIN_HIGH_THRES ), invGain_Q30 );
             down_scale_Q30 = silk_max_32( silk_RSHIFT((oac_int32)1<<30, LOG2_INV_LPC_GAIN_LOW_THRES ), down_scale_Q30 );
@@ -314,7 +314,7 @@ static OAC_INLINE void silk_PLC_conceal(
     /* Rewhiten LTP state */
     idx = psDec->ltp_mem_length - lag - psDec->LPC_order - LTP_ORDER/2;
     celt_assert( idx > 0 );
-    silk_LPC_analysis_filter( &sLTP[ idx ], &psDec->outBuf[ idx ], A_Q12, psDec->ltp_mem_length - idx, psDec->LPC_order,
+    oaci_silk_LPC_analysis_filter( &sLTP[ idx ], &psDec->outBuf[ idx ], A_Q12, psDec->ltp_mem_length - idx, psDec->LPC_order,
     arch );
     /* Scale LTP state */
     inv_gain_Q30 = silk_INVERSE32_varQ( psPLC->prevGain_Q16[ 1 ], 46 );
@@ -402,7 +402,7 @@ static OAC_INLINE void silk_PLC_conceal(
         int run_deep_plc = psDec->sPLC.enable_deep_plc || lpcnet->fec_fill_pos != 0;
         if (run_deep_plc) {
             for (k = 0; k < psDec->nb_subfr; k += 2) {
-                lpcnet_plc_conceal( lpcnet, frame + k*psDec->subfr_length );
+                oaci_lpcnet_plc_conceal( lpcnet, frame + k*psDec->subfr_length );
             }
             /* We *should* be able to copy only from psDec->frame_length-MAX_LPC_ORDER, i.e. the last MAX_LPC_ORDER samples. */
             for (i = 0; i < psDec->frame_length; i++) {
@@ -410,7 +410,7 @@ static OAC_INLINE void silk_PLC_conceal(
             }
         } else {
             for (k = 0; k < psDec->nb_subfr; k += 2) {
-                lpcnet_plc_update( lpcnet, frame + k*psDec->subfr_length );
+                oaci_lpcnet_plc_update( lpcnet, frame + k*psDec->subfr_length );
             }
         }
     }
@@ -431,7 +431,7 @@ static OAC_INLINE void silk_PLC_conceal(
 }
 
 /* Glues concealed frames with new good received frames */
-void silk_PLC_glue_frames(
+void oaci_silk_PLC_glue_frames(
     silk_decoder_state                  *psDec,             /* I/O decoder state        */
     oac_int16 frame[],                                     /* I/O signal               */
     oac_int length                                         /* I length of signal       */
@@ -443,13 +443,13 @@ void silk_PLC_glue_frames(
 
     if (psDec->lossCnt) {
         /* Calculate energy in concealed residual */
-        silk_sum_sqr_shift( &psPLC->conc_energy, &psPLC->conc_energy_shift, frame, length );
+        oaci_silk_sum_sqr_shift( &psPLC->conc_energy, &psPLC->conc_energy_shift, frame, length );
 
         psPLC->last_frame_lost = 1;
     } else {
         if (psDec->sPLC.last_frame_lost) {
             /* Calculate residual in decoded signal if last frame was lost */
-            silk_sum_sqr_shift( &energy, &energy_shift, frame, length );
+            oaci_silk_sum_sqr_shift( &energy, &energy_shift, frame, length );
 
             /* Normalize energies */
             if (energy_shift > psPLC->conc_energy_shift) {
diff --git a/silk/PLC.h b/silk/PLC.h
index 7ac8c609d..d04b59306 100644
--- a/silk/PLC.h
+++ b/silk/PLC.h
@@ -40,11 +40,11 @@
 #define LOG2_INV_LPC_GAIN_LOW_THRES     8                   /* 2^8 = 24 dB LPC gain     */
 #define PITCH_DRIFT_FAC_Q16             655                 /* 0.01 in Q16              */
 
-void silk_PLC_Reset(
+void oaci_silk_PLC_Reset(
     silk_decoder_state                  *psDec              /* I/O Decoder state        */
     );
 
-void silk_PLC(
+void oaci_silk_PLC(
     silk_decoder_state*psDec,                               /* I/O Decoder state        */
     silk_decoder_control*psDecCtrl,                         /* I/O Decoder control      */
     oac_int16 frame[],                                     /* I/O  signal              */
@@ -55,7 +55,7 @@ void silk_PLC(
     int arch                                                /* I Run-time architecture  */
     );
 
-void silk_PLC_glue_frames(
+void oaci_silk_PLC_glue_frames(
     silk_decoder_state                  *psDec,             /* I/O decoder state        */
     oac_int16 frame[],                                     /* I/O signal               */
     oac_int length                                         /* I length of signal       */
diff --git a/silk/SigProc_FIX.h b/silk/SigProc_FIX.h
index 6c9d45787..3db28a5b6 100644
--- a/silk/SigProc_FIX.h
+++ b/silk/SigProc_FIX.h
@@ -55,7 +55,7 @@
 /*!
  * Initialize/reset the resampler state for a given pair of input/output sampling rates
  */
-oac_int silk_resampler_init(
+oac_int oaci_silk_resampler_init(
     silk_resampler_state_struct *S,                 /* I/O  Resampler state                                             */
     oac_int32 Fs_Hz_in,                            /* I    Input sampling rate (Hz)                                    */
     oac_int32 Fs_Hz_out,                           /* I    Output sampling rate (Hz)                                   */
@@ -65,7 +65,7 @@ oac_int silk_resampler_init(
 /*!
  * Resampler: convert from one sampling rate to another
  */
-oac_int silk_resampler(
+oac_int oaci_silk_resampler(
     silk_resampler_state_struct *S,                 /* I/O  Resampler state                                             */
     oac_int16 out[],                               /* O    Output signal                                               */
     const oac_int16 in[],                          /* I    Input signal                                                */
@@ -75,7 +75,7 @@ oac_int silk_resampler(
 /*!
  * Downsample 2x, mediocre quality
  */
-void silk_resampler_down2(
+void oaci_silk_resampler_down2(
     oac_int32                  *S,                 /* I/O  State vector [ 2 ]                                          */
     oac_int16                  *out,               /* O    Output signal [ len ]                                       */
     const oac_int16            *in,                /* I    Input signal [ floor(len/2) ]                               */
@@ -85,7 +85,7 @@ void silk_resampler_down2(
 /*!
  * Downsample by a factor 2/3, low quality
  */
-void silk_resampler_down2_3(
+void oaci_silk_resampler_down2_3(
     oac_int32                  *S,                 /* I/O  State vector [ 6 ]                                          */
     oac_int16                  *out,               /* O    Output signal [ floor(2*inLen/3) ]                          */
     const oac_int16            *in,                /* I    Input signal [ inLen ]                                      */
@@ -97,7 +97,7 @@ void silk_resampler_down2_3(
  * slower than biquad() but uses more precise coefficients
  * can handle (slowly) varying coefficients
  */
-void silk_biquad_alt_stride1(
+void oaci_silk_biquad_alt_stride1(
     const oac_int16            *in,                /* I     input signal                                               */
     const oac_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
     const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
@@ -106,7 +106,7 @@ void silk_biquad_alt_stride1(
     const oac_int32 len                            /* I     signal length (must be even)                               */
     );
 
-void silk_biquad_alt_stride2_c(
+void oaci_silk_biquad_alt_stride2_c(
     const oac_int16            *in,                /* I     input signal                                               */
     const oac_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
     const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
@@ -116,7 +116,7 @@ void silk_biquad_alt_stride2_c(
     );
 
 /* Variable order MA prediction error filter. */
-void silk_LPC_analysis_filter(
+void oaci_silk_LPC_analysis_filter(
     oac_int16                  *out,               /* O    Output signal                                               */
     const oac_int16            *in,                /* I    Input signal                                                */
     const oac_int16            *B,                 /* I    MA prediction coefficients, Q12 [order]                     */
@@ -126,14 +126,14 @@ void silk_LPC_analysis_filter(
     );
 
 /* Chirp (bandwidth expand) LP AR filter */
-void silk_bwexpander(
+void oaci_silk_bwexpander(
     oac_int16                  *ar,                /* I/O  AR filter to be expanded (without leading 1)                */
     const oac_int d,                               /* I    Length of ar                                                */
     oac_int32 chirp_Q16                            /* I    Chirp factor (typically in the range 0 to 1)                */
     );
 
 /* Chirp (bandwidth expand) LP AR filter */
-void silk_bwexpander_32(
+void oaci_silk_bwexpander_32(
     oac_int32                  *ar,                /* I/O  AR filter to be expanded (without leading 1)                */
     const oac_int d,                               /* I    Length of ar                                                */
     oac_int32 chirp_Q16                            /* I    Chirp factor in Q16                                         */
@@ -141,13 +141,13 @@ void silk_bwexpander_32(
 
 /* Compute inverse of LPC prediction gain, and                           */
 /* test if LPC coefficients are stable (all poles within unit circle)    */
-oac_int32 silk_LPC_inverse_pred_gain_c(            /* O   Returns inverse prediction gain in energy domain, Q30        */
+oac_int32 oaci_silk_LPC_inverse_pred_gain_c(            /* O   Returns inverse prediction gain in energy domain, Q30        */
     const oac_int16            *A_Q12,             /* I   Prediction coefficients, Q12 [order]                         */
     const oac_int order                            /* I   Prediction order                                             */
     );
 
 /* Split signal in two decimated bands using first-order allpass filters */
-void silk_ana_filt_bank_1(
+void oaci_silk_ana_filt_bank_1(
     const oac_int16            *in,                /* I    Input signal [N]                                            */
     oac_int32                  *S,                 /* I/O  State vector [2]                                            */
     oac_int16                  *outL,              /* O    Low band [N/2]                                              */
@@ -155,14 +155,14 @@ void silk_ana_filt_bank_1(
     const oac_int32 N                              /* I    Number of input samples                                     */
     );
 
-#if !defined(OVERRIDE_silk_biquad_alt_stride2)
-# define silk_biquad_alt_stride2(in, B_Q28, A_Q28, S, out, len, arch) ((void)(arch), \
-                                                                       silk_biquad_alt_stride2_c(in, B_Q28, A_Q28, S, \
+#if !defined(OVERRIDE_oaci_silk_biquad_alt_stride2)
+# define oaci_silk_biquad_alt_stride2(in, B_Q28, A_Q28, S, out, len, arch) ((void)(arch), \
+                                                                       oaci_silk_biquad_alt_stride2_c(in, B_Q28, A_Q28, S, \
     out, len))
 #endif
 
-#if !defined(OVERRIDE_silk_LPC_inverse_pred_gain)
-# define silk_LPC_inverse_pred_gain(A_Q12, order, arch)     ((void)(arch), silk_LPC_inverse_pred_gain_c(A_Q12, order))
+#if !defined(OVERRIDE_oaci_silk_LPC_inverse_pred_gain)
+# define oaci_silk_LPC_inverse_pred_gain(A_Q12, order, arch)     ((void)(arch), oaci_silk_LPC_inverse_pred_gain_c(A_Q12, order))
 #endif
 
 /********************************************************************/
@@ -171,24 +171,24 @@ void silk_ana_filt_bank_1(
 
 /* Approximation of 128 * log2() (exact inverse of approx 2^() below) */
 /* Convert input to a log scale    */
-oac_int32 silk_lin2log(
+oac_int32 oaci_silk_lin2log(
     const oac_int32 inLin                          /* I  input in linear scale                                         */
     );
 
 /* Approximation of a sigmoid function */
-oac_int silk_sigm_Q15(
+oac_int oaci_silk_sigm_Q15(
     oac_int in_Q5                                  /* I                                                                */
     );
 
 /* Approximation of 2^() (exact inverse of approx log2() above) */
 /* Convert input to a linear scale */
-oac_int32 silk_log2lin(
+oac_int32 oaci_silk_log2lin(
     const oac_int32 inLog_Q7                       /* I  input on log scale                                            */
     );
 
 /* Compute number of bits to right shift the sum of squares of a vector    */
 /* of int16s to make it fit in an int32                                    */
-void silk_sum_sqr_shift(
+void oaci_silk_sum_sqr_shift(
     oac_int32                  *energy,            /* O   Energy of x, after shifting to the right                     */
     oac_int                    *shift,             /* O   Number of bits right shift applied to energy                 */
     const oac_int16            *x,                 /* I   Input vector                                                 */
@@ -198,7 +198,7 @@ void silk_sum_sqr_shift(
 /* Calculates the reflection coefficients from the correlation sequence    */
 /* Faster than schur64(), but much less accurate.                          */
 /* uses SMLAWB(), requiring armv5E and higher.                             */
-oac_int32 silk_schur(                              /* O    Returns residual energy                                     */
+oac_int32 oaci_silk_schur(                              /* O    Returns residual energy                                     */
     oac_int16                  *rc_Q15,            /* O    reflection coefficients [order] Q15                         */
     const oac_int32            *c,                 /* I    correlations [order+1]                                      */
     const oac_int32 order                          /* I    prediction order                                            */
@@ -207,21 +207,21 @@ oac_int32 silk_schur(                              /* O    Returns residual ener
 /* Calculates the reflection coefficients from the correlation sequence    */
 /* Slower than schur(), but more accurate.                                 */
 /* Uses SMULL(), available on armv4                                        */
-oac_int32 silk_schur64(                            /* O    returns residual energy                                     */
+oac_int32 oaci_silk_schur64(                            /* O    returns residual energy                                     */
     oac_int32 rc_Q16[],                            /* O    Reflection coefficients [order] Q16                         */
     const oac_int32 c[],                           /* I    Correlations [order+1]                                      */
     oac_int32 order                                /* I    Prediction order                                            */
     );
 
 /* Step up function, converts reflection coefficients to prediction coefficients */
-void silk_k2a(
+void oaci_silk_k2a(
     oac_int32                  *A_Q24,             /* O    Prediction coefficients [order] Q24                         */
     const oac_int16            *rc_Q15,            /* I    Reflection coefficients [order] Q15                         */
     const oac_int32 order                          /* I    Prediction order                                            */
     );
 
 /* Step up function, converts reflection coefficients to prediction coefficients */
-void silk_k2a_Q16(
+void oaci_silk_k2a_Q16(
     oac_int32                  *A_Q24,             /* O    Prediction coefficients [order] Q24                         */
     const oac_int32            *rc_Q16,            /* I    Reflection coefficients [order] Q16                         */
     const oac_int32 order                          /* I    Prediction order                                            */
@@ -232,7 +232,7 @@ void silk_k2a_Q16(
 /*    1 -> sine window from 0 to pi/2                               */
 /*    2 -> sine window from pi/2 to pi                              */
 /* every other sample of window is linearly interpolated, for speed */
-void silk_apply_sine_window(
+void oaci_silk_apply_sine_window(
     oac_int16 px_win[],                            /* O    Pointer to windowed signal                                  */
     const oac_int16 px[],                          /* I    Pointer to input signal                                     */
     const oac_int win_type,                        /* I    Selects a window type                                       */
@@ -240,7 +240,7 @@ void silk_apply_sine_window(
     );
 
 /* Compute autocorrelation */
-void silk_autocorr(
+void oaci_silk_autocorr(
     oac_int32                  *results,           /* O    Result (length correlationCount)                            */
     oac_int                    *scale,             /* O    Scaling of the correlation vector                           */
     const oac_int16            *inputData,         /* I    Input data to correlate                                     */
@@ -249,7 +249,7 @@ void silk_autocorr(
     int arch                                        /* I    Run-time architecture                                       */
     );
 
-void silk_decode_pitch(
+void oaci_silk_decode_pitch(
     oac_int16 lagIndex,                            /* I                                                                */
     oac_int8 contourIndex,                         /* O                                                                */
     oac_int pitch_lags[],                          /* O    4 pitch values                                              */
@@ -257,7 +257,7 @@ void silk_decode_pitch(
     const oac_int nb_subfr                         /* I    number of sub frames                                        */
     );
 
-oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 voiced, 1 unvoiced                      */
+oac_int oaci_silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 voiced, 1 unvoiced                      */
     const oac_int16            *frame,             /* I    Signal of length PE_FRAME_LENGTH_MS*Fs_kHz                  */
     oac_int                    *pitch_out,         /* O    4 pitch lag values                                          */
     oac_int16                  *lagIndex,          /* O    Lag Index                                                   */
@@ -274,14 +274,14 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
 
 /* Compute Normalized Line Spectral Frequencies (NLSFs) from whitening filter coefficients      */
 /* If not all roots are found, the a_Q16 coefficients are bandwidth expanded until convergence. */
-void silk_A2NLSF(
+void oaci_silk_A2NLSF(
     oac_int16                  *NLSF,              /* O    Normalized Line Spectral Frequencies in Q15 (0..2^15-1) [d] */
     oac_int32                  *a_Q16,             /* I/O  Monic whitening filter coefficients in Q16 [d]              */
     const oac_int d                                /* I    Filter order (must be even)                                 */
     );
 
 /* compute whitening filter coefficients from normalized line spectral frequencies */
-void silk_NLSF2A(
+void oaci_silk_NLSF2A(
     oac_int16                  *a_Q12,             /* O    monic whitening filter coefficients in Q12,  [ d ]          */
     const oac_int16            *NLSF,              /* I    normalized line spectral frequencies in Q15, [ d ]          */
     const oac_int d,                               /* I    filter order (should be even)                               */
@@ -289,7 +289,7 @@ void silk_NLSF2A(
     );
 
 /* Convert int32 coefficients to int16 coefs and make sure there's no wrap-around */
-void silk_LPC_fit(
+void oaci_silk_LPC_fit(
     oac_int16                  *a_QOUT,            /* O    Output signal                                               */
     oac_int32                  *a_QIN,             /* I/O  Input signal                                                */
     const oac_int QOUT,                            /* I    Input Q domain                                              */
@@ -297,41 +297,41 @@ void silk_LPC_fit(
     const oac_int d                                /* I    Filter order                                                */
     );
 
-void silk_insertion_sort_increasing(
+void oaci_silk_insertion_sort_increasing(
     oac_int32                  *a,                 /* I/O   Unsorted / Sorted vector                                   */
     oac_int                    *idx,               /* O     Index vector for the sorted elements                       */
     const oac_int L,                               /* I     Vector length                                              */
     const oac_int K                                /* I     Number of correctly sorted positions                       */
     );
 
-void silk_insertion_sort_decreasing_int16(
+void oaci_silk_insertion_sort_decreasing_int16(
     oac_int16                  *a,                 /* I/O   Unsorted / Sorted vector                                   */
     oac_int                    *idx,               /* O     Index vector for the sorted elements                       */
     const oac_int L,                               /* I     Vector length                                              */
     const oac_int K                                /* I     Number of correctly sorted positions                       */
     );
 
-void silk_insertion_sort_increasing_all_values_int16(
+void oaci_silk_insertion_sort_increasing_all_values_int16(
     oac_int16                 *a,                  /* I/O   Unsorted / Sorted vector                                   */
     const oac_int L                                /* I     Vector length                                              */
     );
 
 /* NLSF stabilizer, for a single input data vector */
-void silk_NLSF_stabilize(
+void oaci_silk_NLSF_stabilize(
     oac_int16            *NLSF_Q15,                /* I/O   Unstable/stabilized normalized LSF vector in Q15 [L]       */
     const oac_int16            *NDeltaMin_Q15,     /* I     Min distance vector, NDeltaMin_Q15[L] must be >= 1 [L+1]   */
     const oac_int L                                /* I     Number of NLSF parameters in the input vector              */
     );
 
 /* Laroia low complexity NLSF weights */
-void silk_NLSF_VQ_weights_laroia(
+void oaci_silk_NLSF_VQ_weights_laroia(
     oac_int16                  *pNLSFW_Q_OUT,      /* O     Pointer to input vector weights [D]                        */
     const oac_int16            *pNLSF_Q15,         /* I     Pointer to input vector         [D]                        */
     const oac_int D                                /* I     Input vector dimension (even)                              */
     );
 
 /* Compute reflection coefficients from input signal */
-void silk_burg_modified_c(
+void oaci_silk_burg_modified_c(
     oac_int32                  *res_nrg,           /* O    Residual energy                                             */
     oac_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
     oac_int32 A_Q16[],                             /* O    Prediction coefficients (length order)                      */
@@ -344,7 +344,7 @@ void silk_burg_modified_c(
     );
 
 /* Copy and multiply a vector by a constant */
-void silk_scale_copy_vector16(
+void oaci_silk_scale_copy_vector16(
     oac_int16                  *data_out,
     const oac_int16            *data_in,
     oac_int32 gain_Q16,                            /* I    Gain in Q16                                                 */
@@ -352,7 +352,7 @@ void silk_scale_copy_vector16(
     );
 
 /* Some for the LTP related function requires Q26 to work.*/
-void silk_scale_vector32_Q26_lshift_18(
+void oaci_silk_scale_vector32_Q26_lshift_18(
     oac_int32                  *data1,             /* I/O  Q0/Q18                                                      */
     oac_int32 gain_Q26,                            /* I    Q26                                                         */
     oac_int dataSize                               /* I    length                                                      */
@@ -364,7 +364,7 @@ void silk_scale_vector32_Q26_lshift_18(
 
 /*    return sum( inVec1[i] * inVec2[i] ) */
 
-oac_int32 silk_inner_prod_aligned(
+oac_int32 oaci_silk_inner_prod_aligned(
     const oac_int16 *const inVec1,                 /*    I input vector 1                                              */
     const oac_int16 *const inVec2,                 /*    I input vector 2                                              */
     const oac_int len,                             /*    I vector lengths                                              */
@@ -372,14 +372,14 @@ oac_int32 silk_inner_prod_aligned(
     );
 
 
-oac_int32 silk_inner_prod_aligned_scale(
+oac_int32 oaci_silk_inner_prod_aligned_scale(
     const oac_int16 *const inVec1,                 /*    I input vector 1                                              */
     const oac_int16 *const inVec2,                 /*    I input vector 2                                              */
     const oac_int scale,                           /*    I number of bits to shift                                     */
     const oac_int len                              /*    I vector lengths                                              */
     );
 
-oac_int64 silk_inner_prod16_c(
+oac_int64 oaci_silk_inner_prod16_c(
     const oac_int16            *inVec1,            /*    I input vector 1                                              */
     const oac_int16            *inVec2,            /*    I input vector 2                                              */
     const oac_int len                              /*    I vector lengths                                              */
@@ -609,15 +609,15 @@ static OAC_INLINE oac_int64 silk_max_64(oac_int64 a, oac_int64 b) {
 /* the following seems faster on x86 */
 #define silk_SMMUL(a32, b32)                (oac_int32)silk_RSHIFT64(silk_SMULL((a32), (b32)), 32)
 
-#if !defined(OVERRIDE_silk_burg_modified)
-# define silk_burg_modified(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch) \
+#if !defined(OVERRIDE_oaci_silk_burg_modified)
+# define oaci_silk_burg_modified(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch) \
         ((void)(arch), \
-         silk_burg_modified_c(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch))
+         oaci_silk_burg_modified_c(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch))
 #endif
 
-#if !defined(OVERRIDE_silk_inner_prod16)
-# define silk_inner_prod16(inVec1, inVec2, len, arch) \
-        ((void)(arch), silk_inner_prod16_c(inVec1, inVec2, len))
+#if !defined(OVERRIDE_oaci_silk_inner_prod16)
+# define oaci_silk_inner_prod16(inVec1, inVec2, len, arch) \
+        ((void)(arch), oaci_silk_inner_prod16_c(inVec1, inVec2, len))
 #endif
 
 #include "Inlines.h"
diff --git a/silk/VAD.c b/silk/VAD.c
index 4feb1fbb7..a319cc360 100644
--- a/silk/VAD.c
+++ b/silk/VAD.c
@@ -34,7 +34,7 @@
 
 /* Silk VAD noise level estimation */
 #if !defined(OAC_X86_MAY_HAVE_SSE4_1)
-static OAC_INLINE void silk_VAD_GetNoiseLevels(
+static OAC_INLINE void oaci_silk_VAD_GetNoiseLevels(
     const oac_int32 pX[ VAD_N_BANDS ],             /* I    subband energies                            */
     silk_VAD_state              *psSilk_VAD         /* I/O  Pointer to Silk VAD state                   */
     );
@@ -43,7 +43,7 @@ static OAC_INLINE void silk_VAD_GetNoiseLevels(
 /**********************************/
 /* Initialization of the Silk VAD */
 /**********************************/
-oac_int silk_VAD_Init(                                         /* O    Return value, 0 if success                  */
+oac_int oaci_silk_VAD_Init(                                         /* O    Return value, 0 if success                  */
     silk_VAD_state              *psSilk_VAD                     /* I/O  Pointer to Silk VAD state                   */
     ) {
     oac_int b, ret = 0;
@@ -78,7 +78,7 @@ static const oac_int32 tiltWeights[ VAD_N_BANDS ] = { 30000, 6000, -12000, -1200
 /***************************************/
 /* Get the speech activity level in Q8 */
 /***************************************/
-oac_int silk_VAD_GetSA_Q8_c(                                   /* O    Return value, 0 if success                  */
+oac_int oaci_silk_VAD_GetSA_Q8_c(                                   /* O    Return value, 0 if success                  */
     silk_encoder_state          *psEncC,                        /* I/O  Encoder state                               */
     const oac_int16 pIn[]                                      /* I    PCM input                                   */
     ) {
@@ -125,15 +125,15 @@ oac_int silk_VAD_GetSA_Q8_c(                                   /* O    Return va
     ALLOC( X, X_offset[ 3 ] + decimated_framelength1, oac_int16 );
 
     /* 0-8 kHz to 0-4 kHz and 4-8 kHz */
-    silk_ana_filt_bank_1( pIn, &psSilk_VAD->AnaState[  0 ],
+    oaci_silk_ana_filt_bank_1( pIn, &psSilk_VAD->AnaState[  0 ],
         X, &X[ X_offset[ 3 ] ], psEncC->frame_length );
 
     /* 0-4 kHz to 0-2 kHz and 2-4 kHz */
-    silk_ana_filt_bank_1( X, &psSilk_VAD->AnaState1[ 0 ],
+    oaci_silk_ana_filt_bank_1( X, &psSilk_VAD->AnaState1[ 0 ],
         X, &X[ X_offset[ 2 ] ], decimated_framelength1 );
 
     /* 0-2 kHz to 0-1 kHz and 1-2 kHz */
-    silk_ana_filt_bank_1( X, &psSilk_VAD->AnaState2[ 0 ],
+    oaci_silk_ana_filt_bank_1( X, &psSilk_VAD->AnaState2[ 0 ],
         X, &X[ X_offset[ 1 ] ], decimated_framelength2 );
 
     /*********************************************/
@@ -191,7 +191,7 @@ oac_int silk_VAD_GetSA_Q8_c(                                   /* O    Return va
     /********************/
     /* Noise estimation */
     /********************/
-    silk_VAD_GetNoiseLevels( &Xnrg[ 0 ], psSilk_VAD );
+    oaci_silk_VAD_GetNoiseLevels( &Xnrg[ 0 ], psSilk_VAD );
 
     /***********************************************/
     /* Signal-plus-noise to noise ratio estimation */
@@ -209,7 +209,7 @@ oac_int silk_VAD_GetSA_Q8_c(                                   /* O    Return va
             }
 
             /* Convert to log domain */
-            SNR_Q7 = silk_lin2log( NrgToNoiseRatio_Q8[ b ] ) - 8*128;
+            SNR_Q7 = oaci_silk_lin2log( NrgToNoiseRatio_Q8[ b ] ) - 8*128;
 
             /* Sum-of-squares */
             sumSquared = silk_SMLABB( sumSquared, SNR_Q7, SNR_Q7 );          /* Q14 */
@@ -234,12 +234,12 @@ oac_int silk_VAD_GetSA_Q8_c(                                   /* O    Return va
     /*********************************/
     /* Speech Probability Estimation */
     /*********************************/
-    SA_Q15 = silk_sigm_Q15( silk_SMULWB( VAD_SNR_FACTOR_Q16, pSNR_dB_Q7 ) - VAD_NEGATIVE_OFFSET_Q5 );
+    SA_Q15 = oaci_silk_sigm_Q15( silk_SMULWB( VAD_SNR_FACTOR_Q16, pSNR_dB_Q7 ) - VAD_NEGATIVE_OFFSET_Q5 );
 
     /**************************/
     /* Frequency Tilt Measure */
     /**************************/
-    psEncC->input_tilt_Q15 = silk_LSHIFT( silk_sigm_Q15( input_tilt ) - 16384, 1 );
+    psEncC->input_tilt_Q15 = silk_LSHIFT( oaci_silk_sigm_Q15( input_tilt ) - 16384, 1 );
 
     /**************************************************/
     /* Scale the sigmoid output based on power levels */
@@ -283,9 +283,9 @@ oac_int silk_VAD_GetSA_Q8_c(                                   /* O    Return va
             NrgToNoiseRatio_Q8[ b ] - psSilk_VAD->NrgRatioSmth_Q8[ b ], smooth_coef_Q16 );
 
         /* signal to noise ratio in dB per band */
-        SNR_Q7 = 3*(silk_lin2log( psSilk_VAD->NrgRatioSmth_Q8[b] ) - 8*128);
+        SNR_Q7 = 3*(oaci_silk_lin2log( psSilk_VAD->NrgRatioSmth_Q8[b] ) - 8*128);
         /* quality = sigmoid( 0.25 * ( SNR_dB - 16 ) ); */
-        psEncC->input_quality_bands_Q15[ b ] = silk_sigm_Q15( silk_RSHIFT( SNR_Q7 - 16*128, 4 ));
+        psEncC->input_quality_bands_Q15[ b ] = oaci_silk_sigm_Q15( silk_RSHIFT( SNR_Q7 - 16*128, 4 ));
     }
 
     RESTORE_STACK;
@@ -298,7 +298,7 @@ oac_int silk_VAD_GetSA_Q8_c(                                   /* O    Return va
 #if  !defined(OAC_X86_MAY_HAVE_SSE4_1)
 static OAC_INLINE
 #endif
-void silk_VAD_GetNoiseLevels(
+void oaci_silk_VAD_GetNoiseLevels(
     const oac_int32 pX[ VAD_N_BANDS ],             /* I    subband energies                            */
     silk_VAD_state              *psSilk_VAD         /* I/O  Pointer to Silk VAD state                   */
     ) {
diff --git a/silk/VQ_WMat_EC.c b/silk/VQ_WMat_EC.c
index c45ed9452..6eecefbc1 100644
--- a/silk/VQ_WMat_EC.c
+++ b/silk/VQ_WMat_EC.c
@@ -32,7 +32,7 @@
 #include "main.h"
 
 /* Entropy constrained matrix-weighted VQ, hard-coded to 5-element vectors, for a single input data vector */
-void silk_VQ_WMat_EC_c(
+void oaci_silk_VQ_WMat_EC_c(
     oac_int8                   *ind,                           /* O    index of best codebook vector               */
     oac_int32                  *res_nrg_Q15,                   /* O    best residual energy                        */
     oac_int32                  *rate_dist_Q8,                  /* O    best total bitrate                          */
@@ -113,7 +113,7 @@ void silk_VQ_WMat_EC_c(
         /* find best */
         if (sum1_Q15 >= 0) {
             /* Translate residual energy to bits using high-rate assumption (6 dB ==> 1 bit/sample) */
-            bits_res_Q8 = silk_SMULBB( subfr_len, silk_lin2log( sum1_Q15 + penalty) - (15<<7));
+            bits_res_Q8 = silk_SMULBB( subfr_len, oaci_silk_lin2log( sum1_Q15 + penalty) - (15<<7));
             /* In the following line we reduce the codelength component by half ("-1"); seems to slightly improve quality */
             bits_tot_Q8 = silk_ADD_LSHIFT32( bits_res_Q8, cl_Q5[ k ], 3 - 1 );
             if (bits_tot_Q8 <= *rate_dist_Q8) {
diff --git a/silk/ana_filt_bank_1.c b/silk/ana_filt_bank_1.c
index 5c835ac9f..5bdcd07d5 100644
--- a/silk/ana_filt_bank_1.c
+++ b/silk/ana_filt_bank_1.c
@@ -36,7 +36,7 @@ static const oac_int16 A_fb1_20 = 5394<<1;
 static const oac_int16 A_fb1_21 = -24290; /* (oac_int16)(20623 << 1) */
 
 /* Split signal into two decimated bands using first-order allpass filters */
-void silk_ana_filt_bank_1(
+void oaci_silk_ana_filt_bank_1(
     const oac_int16            *in,                /* I    Input signal [N]                                            */
     oac_int32                  *S,                 /* I/O  State vector [2]                                            */
     oac_int16                  *outL,              /* O    Low band [N/2]                                              */
diff --git a/silk/arm/LPC_inv_pred_gain_arm.h b/silk/arm/LPC_inv_pred_gain_arm.h
index 031d8488c..e6e3f53f7 100644
--- a/silk/arm/LPC_inv_pred_gain_arm.h
+++ b/silk/arm/LPC_inv_pred_gain_arm.h
@@ -31,29 +31,29 @@
 #include "celt/arm/armcpu.h"
 
 #if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
-oac_int32 silk_LPC_inverse_pred_gain_neon(         /* O   Returns inverse prediction gain in energy domain, Q30        */
+oac_int32 oaci_silk_LPC_inverse_pred_gain_neon(         /* O   Returns inverse prediction gain in energy domain, Q30        */
     const oac_int16            *A_Q12,             /* I   Prediction coefficients, Q12 [order]                         */
     const oac_int order                            /* I   Prediction order                                             */
     );
 
 # if !defined(OAC_HAVE_RTCD) && defined(OAC_ARM_PRESUME_NEON)
-#  define OVERRIDE_silk_LPC_inverse_pred_gain            (1)
-#  define silk_LPC_inverse_pred_gain(A_Q12, order, arch) ((void)(arch), \
-                                                          PRESUME_NEON(silk_LPC_inverse_pred_gain)(A_Q12, order))
+#  define OVERRIDE_oaci_silk_LPC_inverse_pred_gain            (1)
+#  define oaci_silk_LPC_inverse_pred_gain(A_Q12, order, arch) ((void)(arch), \
+                                                          PRESUME_NEON(oaci_silk_LPC_inverse_pred_gain)(A_Q12, order))
 # endif
 #endif
 
-#if !defined(OVERRIDE_silk_LPC_inverse_pred_gain)
+#if !defined(OVERRIDE_oaci_silk_LPC_inverse_pred_gain)
 /*Is run-time CPU detection enabled on this platform?*/
 # if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
 extern oac_int32 (*const SILK_LPC_INVERSE_PRED_GAIN_IMPL[OAC_ARCHMASK + 1])(const oac_int16 *A_Q12,
 const oac_int order);
-#  define OVERRIDE_silk_LPC_inverse_pred_gain            (1)
-#  define silk_LPC_inverse_pred_gain(A_Q12, order, \
+#  define OVERRIDE_oaci_silk_LPC_inverse_pred_gain            (1)
+#  define oaci_silk_LPC_inverse_pred_gain(A_Q12, order, \
                                      arch) ((*SILK_LPC_INVERSE_PRED_GAIN_IMPL[(arch)&OAC_ARCHMASK])(A_Q12, order))
 # elif defined(OAC_ARM_PRESUME_NEON_INTR)
-#  define OVERRIDE_silk_LPC_inverse_pred_gain            (1)
-#  define silk_LPC_inverse_pred_gain(A_Q12, order, arch) ((void)(arch), silk_LPC_inverse_pred_gain_neon(A_Q12, order))
+#  define OVERRIDE_oaci_silk_LPC_inverse_pred_gain            (1)
+#  define oaci_silk_LPC_inverse_pred_gain(A_Q12, order, arch) ((void)(arch), oaci_silk_LPC_inverse_pred_gain_neon(A_Q12, order))
 # endif
 #endif
 
diff --git a/silk/arm/LPC_inv_pred_gain_neon_intr.c b/silk/arm/LPC_inv_pred_gain_neon_intr.c
index 065666486..c322604df 100644
--- a/silk/arm/LPC_inv_pred_gain_neon_intr.c
+++ b/silk/arm/LPC_inv_pred_gain_neon_intr.c
@@ -52,7 +52,7 @@
 
 /* Compute inverse of LPC prediction gain, and                          */
 /* test if LPC coefficients are stable (all poles within unit circle)   */
-static OAC_INLINE oac_int32 LPC_inverse_pred_gain_QA_neon( /* O   Returns inverse prediction gain in energy domain, Q30    */
+static OAC_INLINE oac_int32 oaci_LPC_inverse_pred_gain_QA_neon( /* O   Returns inverse prediction gain in energy domain, Q30    */
     oac_int32 A_QA[ SILK_MAX_ORDER_LPC ],                   /* I   Prediction coefficients                                  */
     const oac_int order                                     /* I   Prediction order                                         */
     ) {
@@ -186,17 +186,17 @@ static OAC_INLINE oac_int32 LPC_inverse_pred_gain_QA_neon( /* O   Returns invers
 }
 
 /* For input in Q12 domain */
-oac_int32 silk_LPC_inverse_pred_gain_neon(         /* O   Returns inverse prediction gain in energy domain, Q30        */
+oac_int32 oaci_silk_LPC_inverse_pred_gain_neon(         /* O   Returns inverse prediction gain in energy domain, Q30        */
     const oac_int16            *A_Q12,             /* I   Prediction coefficients, Q12 [order]                         */
     const oac_int order                            /* I   Prediction order                                             */
     ) {
 #ifdef OAC_CHECK_ASM
-    const oac_int32 invGain_Q30_c = silk_LPC_inverse_pred_gain_c( A_Q12, order );
+    const oac_int32 invGain_Q30_c = oaci_silk_LPC_inverse_pred_gain_c( A_Q12, order );
 #endif
 
     oac_int32 invGain_Q30;
     if ((SILK_MAX_ORDER_LPC != 24) || (order&1)) {
-        invGain_Q30 = silk_LPC_inverse_pred_gain_c( A_Q12, order );
+        invGain_Q30 = oaci_silk_LPC_inverse_pred_gain_c( A_Q12, order );
     } else   {
         oac_int32 Atmp_QA[ SILK_MAX_ORDER_LPC ];
         oac_int32 DC_resp;
@@ -271,7 +271,7 @@ oac_int32 silk_LPC_inverse_pred_gain_neon(         /* O   Returns inverse predic
         if (DC_resp >= 4096) {
             invGain_Q30 = 0;
         } else {
-            invGain_Q30 = LPC_inverse_pred_gain_QA_neon( Atmp_QA, order );
+            invGain_Q30 = oaci_LPC_inverse_pred_gain_QA_neon( Atmp_QA, order );
         }
     }
 
diff --git a/silk/arm/NSQ_del_dec_arm.h b/silk/arm/NSQ_del_dec_arm.h
index d87162db2..19c09a671 100644
--- a/silk/arm/NSQ_del_dec_arm.h
+++ b/silk/arm/NSQ_del_dec_arm.h
@@ -31,7 +31,7 @@
 #include "celt/arm/armcpu.h"
 
 #if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
-void silk_NSQ_del_dec_neon(
+void oaci_silk_NSQ_del_dec_neon(
     const silk_encoder_state *psEncC, silk_nsq_state *NSQ,
     SideInfoIndices *psIndices, const oac_int16 x16[], oac_int8 pulses[],
     const oac_int16 *PredCoef_Q12,
@@ -45,24 +45,24 @@ void silk_NSQ_del_dec_neon(
     const oac_int LTP_scale_Q14);
 
 # if !defined(OAC_HAVE_RTCD)
-#  define OVERRIDE_silk_NSQ_del_dec (1)
-#  define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12,  \
+#  define OVERRIDE_oaci_silk_NSQ_del_dec (1)
+#  define oaci_silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12,  \
                            LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14, Tilt_Q14,   \
                            LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10,          \
                            LTP_scale_Q14, arch)                                \
         ((void)(arch),                                                           \
-         PRESUME_NEON(silk_NSQ_del_dec)(                                         \
+         PRESUME_NEON(oaci_silk_NSQ_del_dec)(                                         \
              psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14,     \
              AR_Q13, HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, \
              Lambda_Q10, LTP_scale_Q14))
 # endif
 #endif
 
-#if !defined(OVERRIDE_silk_NSQ_del_dec)
+#if !defined(OVERRIDE_oaci_silk_NSQ_del_dec)
 /*Is run-time CPU detection enabled on this platform?*/
 # if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && \
     !defined(OAC_ARM_PRESUME_NEON_INTR))
-extern void (*const SILK_NSQ_DEL_DEC_IMPL[OAC_ARCHMASK + 1])(
+extern void (*const oaci_SILK_NSQ_DEL_DEC_IMPL[OAC_ARCHMASK + 1])(
     const silk_encoder_state *psEncC, silk_nsq_state *NSQ,
     SideInfoIndices *psIndices, const oac_int16 x16[], oac_int8 pulses[],
     const oac_int16 *PredCoef_Q12,
@@ -74,23 +74,23 @@ extern void (*const SILK_NSQ_DEL_DEC_IMPL[OAC_ARCHMASK + 1])(
     const oac_int32 Gains_Q16[MAX_NB_SUBFR],
     const oac_int pitchL[MAX_NB_SUBFR], const oac_int Lambda_Q10,
     const oac_int LTP_scale_Q14);
-#  define OVERRIDE_silk_NSQ_del_dec (1)
-#  define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, \
+#  define OVERRIDE_oaci_silk_NSQ_del_dec (1)
+#  define oaci_silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, \
                            LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14, Tilt_Q14,  \
                            LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10,         \
                            LTP_scale_Q14, arch)                               \
-        ((*SILK_NSQ_DEL_DEC_IMPL[(arch)&OAC_ARCHMASK])(                        \
+        ((*oaci_SILK_NSQ_DEL_DEC_IMPL[(arch)&OAC_ARCHMASK])(                        \
              psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14,     \
              AR_Q13, HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, \
              Lambda_Q10, LTP_scale_Q14))
 # elif defined(OAC_ARM_PRESUME_NEON_INTR)
-#  define OVERRIDE_silk_NSQ_del_dec (1)
-#  define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12,   \
+#  define OVERRIDE_oaci_silk_NSQ_del_dec (1)
+#  define oaci_silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12,   \
                            LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14, Tilt_Q14,    \
                            LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10,           \
                            LTP_scale_Q14, arch)                                 \
         ((void)(arch),                                                            \
-         silk_NSQ_del_dec_neon(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, \
+         oaci_silk_NSQ_del_dec_neon(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, \
                            LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14, Tilt_Q14,  \
                            LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10,         \
                            LTP_scale_Q14))
diff --git a/silk/arm/NSQ_del_dec_neon_intr.c b/silk/arm/NSQ_del_dec_neon_intr.c
index 5db221148..c337e1e1c 100644
--- a/silk/arm/NSQ_del_dec_neon_intr.c
+++ b/silk/arm/NSQ_del_dec_neon_intr.c
@@ -223,7 +223,7 @@ static OAC_INLINE void copy_winner_state(
     }
 }
 
-void silk_NSQ_del_dec_neon(
+void oaci_silk_NSQ_del_dec_neon(
     const silk_encoder_state    *psEncC,                                    /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                       /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                 /* I/O  Quantization Indices            */
@@ -250,7 +250,7 @@ void silk_NSQ_del_dec_neon(
     silk_memcpy( &NSQ_c, NSQ, sizeof(NSQ_c));
     silk_memcpy( &psIndices_c, psIndices, sizeof(psIndices_c));
     silk_memcpy( pulses_c, pulses, sizeof(pulses_c));
-    silk_NSQ_del_dec_c( psEncC, &NSQ_c, &psIndices_c, x16, pulses_c, PredCoef_Q12, LTPCoef_Q14, AR_Q13,
+    oaci_silk_NSQ_del_dec_c( psEncC, &NSQ_c, &psIndices_c, x16, pulses_c, PredCoef_Q12, LTPCoef_Q14, AR_Q13,
     HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16,
                        pitchL, Lambda_Q10, LTP_scale_Q14 );
 #endif
@@ -263,7 +263,7 @@ void silk_NSQ_del_dec_neon(
         /* optimization, and C function is called.                                                 */
         /* When the number of delay decision states is 2, it's better to specialize another        */
         /* structure NSQ_del_dec2_struct and optimize with shorter NEON registers. (Low priority)  */
-        silk_NSQ_del_dec_c( psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14,
+        oaci_silk_NSQ_del_dec_c( psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14,
             Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14 );
     } else {
         oac_int i, k, lag, start_idx, LSF_interpolation_flag, Winner_ind, subfr;
@@ -306,7 +306,7 @@ void silk_NSQ_del_dec_neon(
             vst1q_s32( psDelDec->sAR2_Q14[ i ], vld1q_dup_s32( &NSQ->sAR2_Q14[ i ] ));
         }
 
-        offset_Q10   = silk_Quantization_Offsets_Q10[ psIndices->signalType>>1 ][ psIndices->quantOffsetType ];
+        offset_Q10   = oaci_silk_Quantization_Offsets_Q10[ psIndices->signalType>>1 ][ psIndices->quantOffsetType ];
         smpl_buf_idx = 0; /* index of oldest samples */
 
         decisionDelay = silk_min_int( DECISION_DELAY, psEncC->subfr_length );
@@ -384,7 +384,7 @@ void silk_NSQ_del_dec_neon(
                     start_idx = psEncC->ltp_mem_length - lag - psEncC->predictLPCOrder - LTP_ORDER/2;
                     silk_assert( start_idx > 0 );
 
-                    silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k*psEncC->subfr_length ],
+                    oaci_silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k*psEncC->subfr_length ],
                         A_Q12, psEncC->ltp_mem_length - start_idx, psEncC->predictLPCOrder, psEncC->arch );
 
                     NSQ->sLTP_buf_idx = psEncC->ltp_mem_length;
diff --git a/silk/arm/arm_silk_map.c b/silk/arm/arm_silk_map.c
index d65fa5e74..fb6f3a175 100644
--- a/silk/arm/arm_silk_map.c
+++ b/silk/arm/arm_silk_map.c
@@ -45,25 +45,25 @@ void (*const SILK_BIQUAD_ALT_STRIDE2_IMPL[OAC_ARCHMASK + 1])(
         oac_int16                  *out,               /* O     output signal                                              */
         const oac_int32 len                            /* I     signal length (must be even)                               */
     ) = {
-    silk_biquad_alt_stride2_c,      /* ARMv4 */
-    silk_biquad_alt_stride2_c,      /* EDSP */
-    silk_biquad_alt_stride2_c,      /* Media */
-    silk_biquad_alt_stride2_neon,   /* Neon */
-    silk_biquad_alt_stride2_neon,   /* dotprod */
+    oaci_silk_biquad_alt_stride2_c,      /* ARMv4 */
+    oaci_silk_biquad_alt_stride2_c,      /* EDSP */
+    oaci_silk_biquad_alt_stride2_c,      /* Media */
+    oaci_silk_biquad_alt_stride2_neon,   /* Neon */
+    oaci_silk_biquad_alt_stride2_neon,   /* dotprod */
 };
 
 oac_int32 (*const SILK_LPC_INVERSE_PRED_GAIN_IMPL[OAC_ARCHMASK + 1])( /* O   Returns inverse prediction gain in energy domain, Q30        */
         const oac_int16            *A_Q12,                             /* I   Prediction coefficients, Q12 [order]                         */
         const oac_int order                                            /* I   Prediction order                                             */
     ) = {
-    silk_LPC_inverse_pred_gain_c,      /* ARMv4 */
-    silk_LPC_inverse_pred_gain_c,      /* EDSP */
-    silk_LPC_inverse_pred_gain_c,      /* Media */
-    silk_LPC_inverse_pred_gain_neon,   /* Neon */
-    silk_LPC_inverse_pred_gain_neon,   /* dotprod */
+    oaci_silk_LPC_inverse_pred_gain_c,      /* ARMv4 */
+    oaci_silk_LPC_inverse_pred_gain_c,      /* EDSP */
+    oaci_silk_LPC_inverse_pred_gain_c,      /* Media */
+    oaci_silk_LPC_inverse_pred_gain_neon,   /* Neon */
+    oaci_silk_LPC_inverse_pred_gain_neon,   /* dotprod */
 };
 
-void  (*const SILK_NSQ_DEL_DEC_IMPL[OAC_ARCHMASK + 1])(
+void  (*const oaci_SILK_NSQ_DEL_DEC_IMPL[OAC_ARCHMASK + 1])(
         const silk_encoder_state    *psEncC,                                    /* I    Encoder State                   */
         silk_nsq_state              *NSQ,                                       /* I/O  NSQ state                       */
         SideInfoIndices             *psIndices,                                 /* I/O  Quantization Indices            */
@@ -80,11 +80,11 @@ void  (*const SILK_NSQ_DEL_DEC_IMPL[OAC_ARCHMASK + 1])(
         const oac_int Lambda_Q10,                                              /* I    Rate/distortion tradeoff        */
         const oac_int LTP_scale_Q14                                            /* I    LTP state scaling               */
     ) = {
-    silk_NSQ_del_dec_c,      /* ARMv4 */
-    silk_NSQ_del_dec_c,      /* EDSP */
-    silk_NSQ_del_dec_c,      /* Media */
-    silk_NSQ_del_dec_neon,   /* Neon */
-    silk_NSQ_del_dec_neon,   /* dotprod */
+    oaci_silk_NSQ_del_dec_c,      /* ARMv4 */
+    oaci_silk_NSQ_del_dec_c,      /* EDSP */
+    oaci_silk_NSQ_del_dec_c,      /* Media */
+    oaci_silk_NSQ_del_dec_neon,   /* Neon */
+    oaci_silk_NSQ_del_dec_neon,   /* dotprod */
 };
 
 /*There is no table for silk_noise_shape_quantizer_short_prediction because the
@@ -116,11 +116,11 @@ void (*const SILK_WARPED_AUTOCORRELATION_FIX_IMPL[OAC_ARCHMASK + 1])(
     const oac_int length,                                                  /* I    Length of input                                                             */
     const oac_int order                                                    /* I    Correlation order (even)                                                    */
     ) = {
-    silk_warped_autocorrelation_FIX_c,      /* ARMv4 */
-    silk_warped_autocorrelation_FIX_c,      /* EDSP */
-    silk_warped_autocorrelation_FIX_c,      /* Media */
-    silk_warped_autocorrelation_FIX_neon,   /* Neon */
-    silk_warped_autocorrelation_FIX_neon,   /* dotprod */
+    oaci_silk_warped_autocorrelation_FIX_c,      /* ARMv4 */
+    oaci_silk_warped_autocorrelation_FIX_c,      /* EDSP */
+    oaci_silk_warped_autocorrelation_FIX_c,      /* Media */
+    oaci_silk_warped_autocorrelation_FIX_neon,   /* Neon */
+    oaci_silk_warped_autocorrelation_FIX_neon,   /* dotprod */
 };
 
 # endif
diff --git a/silk/arm/biquad_alt_arm.h b/silk/arm/biquad_alt_arm.h
index da873cb98..5b0729cb2 100644
--- a/silk/arm/biquad_alt_arm.h
+++ b/silk/arm/biquad_alt_arm.h
@@ -31,7 +31,7 @@
 #include "celt/arm/armcpu.h"
 
 #if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
-void silk_biquad_alt_stride2_neon(
+void oaci_silk_biquad_alt_stride2_neon(
     const oac_int16            *in,                /* I     input signal                                               */
     const oac_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
     const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
@@ -41,15 +41,15 @@ void silk_biquad_alt_stride2_neon(
     );
 
 # if !defined(OAC_HAVE_RTCD) && defined(OAC_ARM_PRESUME_NEON)
-#  define OVERRIDE_silk_biquad_alt_stride2                   (1)
-#  define silk_biquad_alt_stride2(in, B_Q28, A_Q28, S, out, len, arch) ((void)(arch), \
-                                                                        PRESUME_NEON(silk_biquad_alt_stride2)(in, B_Q28, \
+#  define OVERRIDE_oaci_silk_biquad_alt_stride2                   (1)
+#  define oaci_silk_biquad_alt_stride2(in, B_Q28, A_Q28, S, out, len, arch) ((void)(arch), \
+                                                                        PRESUME_NEON(oaci_silk_biquad_alt_stride2)(in, B_Q28, \
                                                                                                               A_Q28, S, \
                                                                                                               out, len))
 # endif
 #endif
 
-#if !defined(OVERRIDE_silk_biquad_alt_stride2)
+#if !defined(OVERRIDE_oaci_silk_biquad_alt_stride2)
 /*Is run-time CPU detection enabled on this platform?*/
 # if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
 extern void (*const SILK_BIQUAD_ALT_STRIDE2_IMPL[OAC_ARCHMASK + 1])(
@@ -60,14 +60,14 @@ extern void (*const SILK_BIQUAD_ALT_STRIDE2_IMPL[OAC_ARCHMASK + 1])(
         oac_int16                  *out,               /* O     output signal                                              */
         const oac_int32 len                            /* I     signal length (must be even)                               */
     );
-#  define OVERRIDE_silk_biquad_alt_stride2                  (1)
-#  define silk_biquad_alt_stride2(in, B_Q28, A_Q28, S, out, len, \
+#  define OVERRIDE_oaci_silk_biquad_alt_stride2                  (1)
+#  define oaci_silk_biquad_alt_stride2(in, B_Q28, A_Q28, S, out, len, \
                                   arch) ((*SILK_BIQUAD_ALT_STRIDE2_IMPL[(arch)&OAC_ARCHMASK])(in, B_Q28, A_Q28, S, out, \
                                                                                               len))
 # elif defined(OAC_ARM_PRESUME_NEON_INTR)
-#  define OVERRIDE_silk_biquad_alt_stride2                  (1)
-#  define silk_biquad_alt_stride2(in, B_Q28, A_Q28, S, out, len, arch) ((void)(arch), \
-                                                                        silk_biquad_alt_stride2_neon(in, B_Q28, A_Q28, \
+#  define OVERRIDE_oaci_silk_biquad_alt_stride2                  (1)
+#  define oaci_silk_biquad_alt_stride2(in, B_Q28, A_Q28, S, out, len, arch) ((void)(arch), \
+                                                                        oaci_silk_biquad_alt_stride2_neon(in, B_Q28, A_Q28, \
     S, out, len))
 # endif
 #endif
diff --git a/silk/arm/biquad_alt_neon_intr.c b/silk/arm/biquad_alt_neon_intr.c
index e8ee2e091..39ba2563b 100644
--- a/silk/arm/biquad_alt_neon_intr.c
+++ b/silk/arm/biquad_alt_neon_intr.c
@@ -36,7 +36,7 @@
 #endif
 #include "SigProc_FIX.h"
 
-static inline void silk_biquad_alt_stride2_kernel( const int32x4_t A_L_s32x4, const int32x4_t A_U_s32x4,
+static inline void oaci_silk_biquad_alt_stride2_kernel( const int32x4_t A_L_s32x4, const int32x4_t A_U_s32x4,
                                                    const int32x4_t B_Q28_s32x4, const int32x2_t t_s32x2,
                                                    const int32x4_t in_s32x4, int32x4_t *S_s32x4,
                                                    int32x2_t *out32_Q14_s32x2 ) {
@@ -54,7 +54,7 @@ static inline void silk_biquad_alt_stride2_kernel( const int32x4_t A_L_s32x4, co
     *S_s32x4         = vaddq_s32( *S_s32x4, t_s32x4 );                             /* S0 = silk_SMLAWB( S0, B_Q28[ {1,1,2,2} ], in{0,1,0,1} );                        */
 }
 
-void silk_biquad_alt_stride2_neon(
+void oaci_silk_biquad_alt_stride2_neon(
     const oac_int16            *in,                /* I     input signal                                               */
     const oac_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
     const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
@@ -79,7 +79,7 @@ void silk_biquad_alt_stride2_neon(
     ALLOC( out_c, 2*len, oac_int16 );
 
     silk_memcpy( &S_c, S, sizeof(S_c));
-    silk_biquad_alt_stride2_c( in, B_Q28, A_Q28, S_c, out_c, len );
+    oaci_silk_biquad_alt_stride2_c( in, B_Q28, A_Q28, S_c, out_c, len );
 #endif
 
     /* Negate A_Q28 values and split in two parts */
@@ -113,9 +113,9 @@ void silk_biquad_alt_stride2_neon(
         t_s32x4       = vqdmulhq_lane_s32( in_s32x4[ 0 ], B_Q28_s32x2, 0 );                             /* silk_SMULWB( B_Q28[ 0 ], in{0,1,2,3} ) */
         in_s32x4[ 1 ] = vcombine_s32( vget_high_s32( in_s32x4[ 0 ] ), vget_high_s32( in_s32x4[ 0 ] ));  /* in{2,3,2,3} << 15                      */
         in_s32x4[ 0 ] = vcombine_s32( vget_low_s32 ( in_s32x4[ 0 ] ), vget_low_s32 ( in_s32x4[ 0 ] ));  /* in{0,1,0,1} << 15                      */
-        silk_biquad_alt_stride2_kernel( A_L_s32x4, A_U_s32x4, B_Q28_s32x4, vget_low_s32 ( t_s32x4 ), in_s32x4[ 0 ],
+        oaci_silk_biquad_alt_stride2_kernel( A_L_s32x4, A_U_s32x4, B_Q28_s32x4, vget_low_s32 ( t_s32x4 ), in_s32x4[ 0 ],
         &S_s32x4, &out32_Q14_s32x2[ 0 ] );
-        silk_biquad_alt_stride2_kernel( A_L_s32x4, A_U_s32x4, B_Q28_s32x4, vget_high_s32( t_s32x4 ), in_s32x4[ 1 ],
+        oaci_silk_biquad_alt_stride2_kernel( A_L_s32x4, A_U_s32x4, B_Q28_s32x4, vget_high_s32( t_s32x4 ), in_s32x4[ 1 ],
         &S_s32x4, &out32_Q14_s32x2[ 1 ] );
 
         /* Scale back to Q0 and saturate */
@@ -136,7 +136,7 @@ void silk_biquad_alt_stride2_neon(
         in_s32x4     = vshll_n_s16( in_s16x4, 15 );                                                     /* in{0,1} << 15                      */
         t_s32x2      = vqdmulh_lane_s32( vget_low_s32( in_s32x4 ), B_Q28_s32x2, 0 );                    /* silk_SMULWB( B_Q28[ 0 ], in{0,1} ) */
         in_s32x4     = vcombine_s32( vget_low_s32( in_s32x4 ), vget_low_s32( in_s32x4 ));               /* in{0,1,0,1} << 15                  */
-        silk_biquad_alt_stride2_kernel( A_L_s32x4, A_U_s32x4, B_Q28_s32x4, t_s32x2, in_s32x4, &S_s32x4,
+        oaci_silk_biquad_alt_stride2_kernel( A_L_s32x4, A_U_s32x4, B_Q28_s32x4, t_s32x2, in_s32x4, &S_s32x4,
         &out32_Q14_s32x2 );
 
         /* Scale back to Q0 and saturate */
diff --git a/silk/biquad_alt.c b/silk/biquad_alt.c
index e715f8ef4..02e58edbd 100644
--- a/silk/biquad_alt.c
+++ b/silk/biquad_alt.c
@@ -39,7 +39,7 @@
 #include "SigProc_FIX.h"
 
 /* Second order ARMA filter, alternative implementation */
-void silk_biquad_alt_stride1(
+void oaci_silk_biquad_alt_stride1(
     const oac_int16            *in,                /* I     input signal                                               */
     const oac_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
     const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
@@ -75,7 +75,7 @@ void silk_biquad_alt_stride1(
     }
 }
 
-void silk_biquad_alt_stride2_c(
+void oaci_silk_biquad_alt_stride2_c(
     const oac_int16            *in,                /* I     input signal                                               */
     const oac_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
     const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
diff --git a/silk/bwexpander.c b/silk/bwexpander.c
index 7d3552332..46d5f0058 100644
--- a/silk/bwexpander.c
+++ b/silk/bwexpander.c
@@ -32,7 +32,7 @@
 #include "SigProc_FIX.h"
 
 /* Chirp (bandwidth expand) LP AR filter */
-void silk_bwexpander(
+void oaci_silk_bwexpander(
     oac_int16                  *ar,                /* I/O  AR filter to be expanded (without leading 1)                */
     const oac_int d,                               /* I    Length of ar                                                */
     oac_int32 chirp_Q16                            /* I    Chirp factor (typically in the range 0 to 1)                */
diff --git a/silk/bwexpander_32.c b/silk/bwexpander_32.c
index 9f30c0346..13d13db83 100644
--- a/silk/bwexpander_32.c
+++ b/silk/bwexpander_32.c
@@ -32,8 +32,8 @@
 #include "SigProc_FIX.h"
 
 /* Chirp (bandwidth expand) LP AR filter.
-   This logic is reused in _celt_lpc(). Any bug fixes should also be applied there. */
-void silk_bwexpander_32(
+   This logic is reused in oaci_celt_lpc(). Any bug fixes should also be applied there. */
+void oaci_silk_bwexpander_32(
     oac_int32                  *ar,                /* I/O  AR filter to be expanded (without leading 1)                */
     const oac_int d,                               /* I    Length of ar                                                */
     oac_int32 chirp_Q16                            /* I    Chirp factor in Q16                                         */
diff --git a/silk/check_control_input.c b/silk/check_control_input.c
index cfe278f9d..bc8c73d28 100644
--- a/silk/check_control_input.c
+++ b/silk/check_control_input.c
@@ -34,7 +34,7 @@
 #include "errors.h"
 
 /* Check encoder control struct */
-oac_int check_control_input(
+oac_int oaci_check_control_input(
     silk_EncControlStruct        *encControl                    /* I    Control structure                           */
     ) {
     celt_assert( encControl != NULL );
diff --git a/silk/code_signs.c b/silk/code_signs.c
index 7cd02418e..18060e54d 100644
--- a/silk/code_signs.c
+++ b/silk/code_signs.c
@@ -38,7 +38,7 @@
 #define silk_dec_map(a)                  (silk_LSHIFT((a),  1 ) - 1)
 
 /* Encodes signs of excitation */
-void silk_encode_signs(
+void oaci_silk_encode_signs(
     ec_enc                      *psRangeEnc,                        /* I/O  Compressor data structure                   */
     const oac_int8 pulses[],                                       /* I    pulse signal                                */
     oac_int length,                                                /* I    length of input                             */
@@ -54,7 +54,7 @@ void silk_encode_signs(
     icdf[ 1 ] = 0;
     q_ptr = pulses;
     i = silk_SMULBB( 7, silk_ADD_LSHIFT( quantOffsetType, signalType, 1 ));
-    icdf_ptr = &silk_sign_iCDF[ i ];
+    icdf_ptr = &oaci_silk_sign_iCDF[ i ];
     length = silk_RSHIFT( length + SHELL_CODEC_FRAME_LENGTH/2, LOG2_SHELL_CODEC_FRAME_LENGTH );
     for (i = 0; i < length; i++) {
         p = sum_pulses[ i ];
@@ -62,7 +62,7 @@ void silk_encode_signs(
             icdf[ 0 ] = icdf_ptr[ silk_min( p&0x1F, 6 ) ];
             for (j = 0; j < SHELL_CODEC_FRAME_LENGTH; j++) {
                 if (q_ptr[ j ] != 0) {
-                    ec_enc_icdf( psRangeEnc, silk_enc_map( q_ptr[ j ]), icdf, 8 );
+                    oaci_ec_enc_icdf( psRangeEnc, silk_enc_map( q_ptr[ j ]), icdf, 8 );
                 }
             }
         }
@@ -71,7 +71,7 @@ void silk_encode_signs(
 }
 
 /* Decodes signs of excitation */
-void silk_decode_signs(
+void oaci_silk_decode_signs(
     ec_dec                      *psRangeDec,                        /* I/O  Compressor data structure                   */
     oac_int16 pulses[],                                            /* I/O  pulse signal                                */
     oac_int length,                                                /* I    length of input                             */
@@ -87,7 +87,7 @@ void silk_decode_signs(
     icdf[ 1 ] = 0;
     q_ptr = pulses;
     i = silk_SMULBB( 7, silk_ADD_LSHIFT( quantOffsetType, signalType, 1 ));
-    icdf_ptr = &silk_sign_iCDF[ i ];
+    icdf_ptr = &oaci_silk_sign_iCDF[ i ];
     length = silk_RSHIFT( length + SHELL_CODEC_FRAME_LENGTH/2, LOG2_SHELL_CODEC_FRAME_LENGTH );
     for (i = 0; i < length; i++) {
         p = sum_pulses[ i ];
@@ -98,12 +98,12 @@ void silk_decode_signs(
                     /* attach sign */
 #if 0
                     /* conditional implementation */
-                    if (ec_dec_icdf( psRangeDec, icdf, 8 ) == 0) {
+                    if (oaci_ec_dec_icdf( psRangeDec, icdf, 8 ) == 0) {
                         q_ptr[ j ] = -q_ptr[ j ];
                     }
 #else
                     /* implementation with shift, subtraction, multiplication */
-                    q_ptr[ j ] *= silk_dec_map( ec_dec_icdf( psRangeDec, icdf, 8 ));
+                    q_ptr[ j ] *= silk_dec_map( oaci_ec_dec_icdf( psRangeDec, icdf, 8 ));
 #endif
                 }
             }
diff --git a/silk/control.h b/silk/control.h
index d3c247d90..5b8f08570 100644
--- a/silk/control.h
+++ b/silk/control.h
@@ -88,7 +88,7 @@ typedef struct {
     /* I:   Maximum number of bits allowed for the frame                                    */
     oac_int maxBits;
 
-    /* I:   Causes a smooth downmix to mono                                                 */
+    /* I:   Causes a smooth oaci_downmix to mono                                                 */
     oac_int toMono;
 
     /* I:   Oac encoder is allowing us to switch bandwidth                                 */
diff --git a/silk/control_SNR.c b/silk/control_SNR.c
index 79f9ef903..02ca92a69 100644
--- a/silk/control_SNR.c
+++ b/silk/control_SNR.c
@@ -79,7 +79,7 @@ static const unsigned char silk_TargetRate_WB_21[201 - 10] = {
 };
 
 /* Control SNR of residual quantizer */
-oac_int silk_control_SNR(
+oac_int oaci_silk_control_SNR(
     silk_encoder_state          *psEncC,                        /* I/O  Pointer to Silk encoder state               */
     oac_int32 TargetRate_bps                                   /* I    Target max bitrate (bps)                    */
     ) {
diff --git a/silk/control_audio_bandwidth.c b/silk/control_audio_bandwidth.c
index 4590d6f58..d342d8095 100644
--- a/silk/control_audio_bandwidth.c
+++ b/silk/control_audio_bandwidth.c
@@ -33,7 +33,7 @@
 #include "tuning_parameters.h"
 
 /* Control internal sampling rate */
-oac_int silk_control_audio_bandwidth(
+oac_int oaci_silk_control_audio_bandwidth(
     silk_encoder_state          *psEncC,                        /* I/O  Pointer to Silk encoder state               */
     silk_EncControlStruct       *encControl                     /* I    Control structure                           */
     ) {
diff --git a/silk/control_codec.c b/silk/control_codec.c
index 2a777db49..c5f94008c 100644
--- a/silk/control_codec.c
+++ b/silk/control_codec.c
@@ -62,7 +62,7 @@ static OAC_INLINE oac_int silk_setup_LBRR(
 
 
 /* Control encoder */
-oac_int silk_control_encoder(
+oac_int oaci_silk_control_encoder(
     silk_encoder_state_Fxx          *psEnc,                                 /* I/O  Pointer to Silk encoder state                                               */
     silk_EncControlStruct           *encControl,                            /* I    Control structure                                                           */
     const oac_int allow_bw_switch,                                         /* I    Flag to allow switching audio bandwidth                                     */
@@ -95,7 +95,7 @@ oac_int silk_control_encoder(
     /********************************************/
     /* Determine internal sampling rate         */
     /********************************************/
-    fs_kHz = silk_control_audio_bandwidth( &psEnc->sCmn, encControl );
+    fs_kHz = oaci_silk_control_audio_bandwidth( &psEnc->sCmn, encControl );
     if (force_fs_kHz) {
         fs_kHz = force_fs_kHz;
     }
@@ -139,7 +139,7 @@ static oac_int silk_setup_resamplers(
     if (psEnc->sCmn.fs_kHz != fs_kHz || psEnc->sCmn.prev_API_fs_Hz != psEnc->sCmn.API_fs_Hz) {
         if (psEnc->sCmn.fs_kHz == 0) {
             /* Initialize the resampler for enc_API.c preparing resampling from API_fs_Hz to fs_kHz */
-            ret += silk_resampler_init( &psEnc->sCmn.resampler_state, psEnc->sCmn.API_fs_Hz, fs_kHz*1000, 1 );
+            ret += oaci_silk_resampler_init( &psEnc->sCmn.resampler_state, psEnc->sCmn.API_fs_Hz, fs_kHz*1000, 1 );
         } else {
             VARDECL( oac_int16, x_buf_API_fs_Hz );
             VARDECL( silk_resampler_state_struct, temp_resampler_state );
@@ -165,7 +165,7 @@ static oac_int silk_setup_resamplers(
 
             /* Initialize resampler for temporary resampling of x_buf data to API_fs_Hz */
             ALLOC( temp_resampler_state, 1, silk_resampler_state_struct );
-            ret += silk_resampler_init( temp_resampler_state, silk_SMULBB( psEnc->sCmn.fs_kHz, 1000 ),
+            ret += oaci_silk_resampler_init( temp_resampler_state, silk_SMULBB( psEnc->sCmn.fs_kHz, 1000 ),
             psEnc->sCmn.API_fs_Hz, 0 );
 
             /* Calculate number of samples to temporarily upsample */
@@ -173,14 +173,14 @@ static oac_int silk_setup_resamplers(
 
             /* Temporary resampling of x_buf data to API_fs_Hz */
             ALLOC( x_buf_API_fs_Hz, api_buf_samples, oac_int16 );
-            ret += silk_resampler( temp_resampler_state, x_buf_API_fs_Hz, x_bufFIX, old_buf_samples );
+            ret += oaci_silk_resampler( temp_resampler_state, x_buf_API_fs_Hz, x_bufFIX, old_buf_samples );
 
             /* Initialize the resampler for enc_API.c preparing resampling from API_fs_Hz to fs_kHz */
-            ret += silk_resampler_init( &psEnc->sCmn.resampler_state, psEnc->sCmn.API_fs_Hz,
+            ret += oaci_silk_resampler_init( &psEnc->sCmn.resampler_state, psEnc->sCmn.API_fs_Hz,
             silk_SMULBB( fs_kHz, 1000 ), 1 );
 
             /* Correct resampler state by resampling buffered data from API_fs_Hz to fs_kHz */
-            ret += silk_resampler( &psEnc->sCmn.resampler_state, x_bufFIX, x_buf_API_fs_Hz, api_buf_samples );
+            ret += oaci_silk_resampler( &psEnc->sCmn.resampler_state, x_bufFIX, x_buf_API_fs_Hz, api_buf_samples );
 
 #ifndef FIXED_POINT
             silk_short2float_array( psEnc->x_buf, x_bufFIX, new_buf_samples);
@@ -215,9 +215,9 @@ static oac_int silk_setup_fs(
             psEnc->sCmn.frame_length = silk_SMULBB( PacketSize_ms, fs_kHz );
             psEnc->sCmn.pitch_LPC_win_length = silk_SMULBB( FIND_PITCH_LPC_WIN_MS_2_SF, fs_kHz );
             if (psEnc->sCmn.fs_kHz == 8) {
-                psEnc->sCmn.pitch_contour_iCDF = silk_pitch_contour_10_ms_NB_iCDF;
+                psEnc->sCmn.pitch_contour_iCDF = oaci_silk_pitch_contour_10_ms_NB_iCDF;
             } else {
-                psEnc->sCmn.pitch_contour_iCDF = silk_pitch_contour_10_ms_iCDF;
+                psEnc->sCmn.pitch_contour_iCDF = oaci_silk_pitch_contour_10_ms_iCDF;
             }
         } else {
             psEnc->sCmn.nFramesPerPacket = silk_DIV32_16( PacketSize_ms, MAX_FRAME_LENGTH_MS );
@@ -225,9 +225,9 @@ static oac_int silk_setup_fs(
             psEnc->sCmn.frame_length = silk_SMULBB( 20, fs_kHz );
             psEnc->sCmn.pitch_LPC_win_length = silk_SMULBB( FIND_PITCH_LPC_WIN_MS, fs_kHz );
             if (psEnc->sCmn.fs_kHz == 8) {
-                psEnc->sCmn.pitch_contour_iCDF = silk_pitch_contour_NB_iCDF;
+                psEnc->sCmn.pitch_contour_iCDF = oaci_silk_pitch_contour_NB_iCDF;
             } else {
-                psEnc->sCmn.pitch_contour_iCDF = silk_pitch_contour_iCDF;
+                psEnc->sCmn.pitch_contour_iCDF = oaci_silk_pitch_contour_iCDF;
             }
         }
         psEnc->sCmn.PacketSize_ms  = PacketSize_ms;
@@ -258,23 +258,23 @@ static oac_int silk_setup_fs(
         psEnc->sCmn.fs_kHz = fs_kHz;
         if (psEnc->sCmn.fs_kHz == 8) {
             if (psEnc->sCmn.nb_subfr == MAX_NB_SUBFR) {
-                psEnc->sCmn.pitch_contour_iCDF = silk_pitch_contour_NB_iCDF;
+                psEnc->sCmn.pitch_contour_iCDF = oaci_silk_pitch_contour_NB_iCDF;
             } else {
-                psEnc->sCmn.pitch_contour_iCDF = silk_pitch_contour_10_ms_NB_iCDF;
+                psEnc->sCmn.pitch_contour_iCDF = oaci_silk_pitch_contour_10_ms_NB_iCDF;
             }
         } else {
             if (psEnc->sCmn.nb_subfr == MAX_NB_SUBFR) {
-                psEnc->sCmn.pitch_contour_iCDF = silk_pitch_contour_iCDF;
+                psEnc->sCmn.pitch_contour_iCDF = oaci_silk_pitch_contour_iCDF;
             } else {
-                psEnc->sCmn.pitch_contour_iCDF = silk_pitch_contour_10_ms_iCDF;
+                psEnc->sCmn.pitch_contour_iCDF = oaci_silk_pitch_contour_10_ms_iCDF;
             }
         }
         if (psEnc->sCmn.fs_kHz == 8 || psEnc->sCmn.fs_kHz == 12) {
             psEnc->sCmn.predictLPCOrder = MIN_LPC_ORDER;
-            psEnc->sCmn.psNLSF_CB  = &silk_NLSF_CB_NB_MB;
+            psEnc->sCmn.psNLSF_CB  = &oaci_silk_NLSF_CB_NB_MB;
         } else {
             psEnc->sCmn.predictLPCOrder = MAX_LPC_ORDER;
-            psEnc->sCmn.psNLSF_CB  = &silk_NLSF_CB_WB;
+            psEnc->sCmn.psNLSF_CB  = &oaci_silk_NLSF_CB_WB;
         }
         psEnc->sCmn.subfr_length   = SUB_FRAME_LENGTH_MS*fs_kHz;
         psEnc->sCmn.frame_length   = silk_SMULBB( psEnc->sCmn.subfr_length, psEnc->sCmn.nb_subfr );
@@ -287,11 +287,11 @@ static oac_int silk_setup_fs(
             psEnc->sCmn.pitch_LPC_win_length = silk_SMULBB( FIND_PITCH_LPC_WIN_MS_2_SF, fs_kHz );
         }
         if (psEnc->sCmn.fs_kHz == 16) {
-            psEnc->sCmn.pitch_lag_low_bits_iCDF = silk_uniform8_iCDF;
+            psEnc->sCmn.pitch_lag_low_bits_iCDF = oaci_silk_uniform8_iCDF;
         } else if (psEnc->sCmn.fs_kHz == 12) {
-            psEnc->sCmn.pitch_lag_low_bits_iCDF = silk_uniform6_iCDF;
+            psEnc->sCmn.pitch_lag_low_bits_iCDF = oaci_silk_uniform6_iCDF;
         } else {
-            psEnc->sCmn.pitch_lag_low_bits_iCDF = silk_uniform4_iCDF;
+            psEnc->sCmn.pitch_lag_low_bits_iCDF = oaci_silk_uniform4_iCDF;
         }
     }
 
diff --git a/silk/dec_API.c b/silk/dec_API.c
index 5e7c6b7bd..64fff9a03 100644
--- a/silk/dec_API.c
+++ b/silk/dec_API.c
@@ -61,11 +61,11 @@ typedef struct {
 
 
 
-oac_int silk_LoadOSCEModels(void *decState, const unsigned char *data, int len) {
+oac_int oaci_silk_LoadOSCEModels(void *decState, const unsigned char *data, int len) {
 #ifdef ENABLE_OSCE
     oac_int ret = SILK_NO_ERROR;
 
-    ret = osce_load_models(&((silk_decoder *)decState)->osce_model, data, len);
+    ret = oaci_osce_load_models(&((silk_decoder *)decState)->osce_model, data, len);
     ((silk_decoder *)decState)->osce_model.loaded = (ret == 0);
     return ret;
 #else
@@ -76,7 +76,7 @@ oac_int silk_LoadOSCEModels(void *decState, const unsigned char *data, int len)
 #endif
 }
 
-oac_int silk_Get_Decoder_Size(                         /* O    Returns error code                              */
+oac_int oaci_silk_Get_Decoder_Size(                         /* O    Returns error code                              */
     oac_int                        *decSizeBytes       /* O    Number of bytes in SILK decoder state           */
     ) {
     oac_int ret = SILK_NO_ERROR;
@@ -87,14 +87,14 @@ oac_int silk_Get_Decoder_Size(                         /* O    Returns error cod
 }
 
 /* Reset decoder state */
-oac_int silk_ResetDecoder(                              /* O    Returns error code                              */
+oac_int oaci_silk_ResetDecoder(                              /* O    Returns error code                              */
     void                            *decState           /* I/O  State                                           */
     ) {
     oac_int n, ret = SILK_NO_ERROR;
     silk_decoder_state *channel_state = ((silk_decoder *)decState)->channel_state;
 
     for (n = 0; n < DECODER_NUM_CHANNELS; n++) {
-        ret  = silk_reset_decoder( &channel_state[ n ] );
+        ret  = oaci_silk_reset_decoder( &channel_state[ n ] );
     }
     silk_memset(&((silk_decoder *)decState)->sStereo, 0, sizeof(((silk_decoder *)decState)->sStereo));
     /* Not strictly needed, but it's cleaner that way */
@@ -104,7 +104,7 @@ oac_int silk_ResetDecoder(                              /* O    Returns error co
 }
 
 
-oac_int silk_InitDecoder(                              /* O    Returns error code                              */
+oac_int oaci_silk_InitDecoder(                              /* O    Returns error code                              */
     void                            *decState           /* I/O  State                                           */
     ) {
     oac_int n, ret = SILK_NO_ERROR;
@@ -114,11 +114,11 @@ oac_int silk_InitDecoder(                              /* O    Returns error cod
 #endif
 #ifndef USE_WEIGHTS_FILE
     /* load osce models */
-    silk_LoadOSCEModels(decState, NULL, 0);
+    oaci_silk_LoadOSCEModels(decState, NULL, 0);
 #endif
 
     for (n = 0; n < DECODER_NUM_CHANNELS; n++) {
-        ret  = silk_init_decoder( &channel_state[ n ] );
+        ret  = oaci_silk_init_decoder( &channel_state[ n ] );
     }
     silk_memset(&((silk_decoder *)decState)->sStereo, 0, sizeof(((silk_decoder *)decState)->sStereo));
     /* Not strictly needed, but it's cleaner that way */
@@ -128,7 +128,7 @@ oac_int silk_InitDecoder(                              /* O    Returns error cod
 }
 
 /* Decode a frame */
-oac_int silk_Decode(                                   /* O    Returns error code                              */
+oac_int oaci_silk_Decode(                                   /* O    Returns error code                              */
     void*                           decState,           /* I/O  State                                           */
     silk_DecControlStruct*          decControl,         /* I/O  Control Structure                               */
     oac_int lostFlag,                                  /* I    0: no loss, 1 loss, 2 decode fec                */
@@ -170,7 +170,7 @@ oac_int silk_Decode(                                   /* O    Returns error cod
 
     /* If Mono -> Stereo transition in bitstream: init state of second channel */
     if (decControl->nChannelsInternal > psDec->nChannelsInternal) {
-        ret += silk_init_decoder( &channel_state[ 1 ] );
+        ret += oaci_silk_init_decoder( &channel_state[ 1 ] );
     }
 
     stereo_to_mono = decControl->nChannelsInternal == 1 && psDec->nChannelsInternal == 2
@@ -206,7 +206,7 @@ oac_int silk_Decode(                                   /* O    Returns error cod
                 RESTORE_STACK;
                 return SILK_DEC_INVALID_SAMPLING_FREQUENCY;
             }
-            ret += silk_decoder_set_fs( &channel_state[ n ], fs_kHz_dec, decControl->API_sampleRate );
+            ret += oaci_silk_decoder_set_fs( &channel_state[ n ], fs_kHz_dec, decControl->API_sampleRate );
         }
     }
 
@@ -231,9 +231,9 @@ oac_int silk_Decode(                                   /* O    Returns error cod
         /* Decode VAD flags and LBRR flag */
         for (n = 0; n < decControl->nChannelsInternal; n++) {
             for (i = 0; i < channel_state[ n ].nFramesPerPacket; i++) {
-                channel_state[ n ].VAD_flags[ i ] = ec_dec_bit_logp(psRangeDec, 1);
+                channel_state[ n ].VAD_flags[ i ] = oaci_ec_dec_bit_logp(psRangeDec, 1);
             }
-            channel_state[ n ].LBRR_flag = ec_dec_bit_logp(psRangeDec, 1);
+            channel_state[ n ].LBRR_flag = oaci_ec_dec_bit_logp(psRangeDec, 1);
         }
         /* Decode LBRR flags */
         for (n = 0; n < decControl->nChannelsInternal; n++) {
@@ -242,8 +242,8 @@ oac_int silk_Decode(                                   /* O    Returns error cod
                 if (channel_state[ n ].nFramesPerPacket == 1) {
                     channel_state[ n ].LBRR_flags[ 0 ] = 1;
                 } else {
-                    LBRR_symbol = ec_dec_icdf( psRangeDec,
-                    silk_LBRR_flags_iCDF_ptr[ channel_state[ n ].nFramesPerPacket - 2 ], 8 ) + 1;
+                    LBRR_symbol = oaci_ec_dec_icdf( psRangeDec,
+                    oaci_silk_LBRR_flags_iCDF_ptr[ channel_state[ n ].nFramesPerPacket - 2 ], 8 ) + 1;
                     for (i = 0; i < channel_state[ n ].nFramesPerPacket; i++) {
                         channel_state[ n ].LBRR_flags[ i ] = silk_RSHIFT( LBRR_symbol, i )&1;
                     }
@@ -260,9 +260,9 @@ oac_int silk_Decode(                                   /* O    Returns error cod
                         oac_int condCoding;
 
                         if (decControl->nChannelsInternal == 2 && n == 0) {
-                            silk_stereo_decode_pred( psRangeDec, MS_pred_Q13 );
+                            oaci_silk_stereo_decode_pred( psRangeDec, MS_pred_Q13 );
                             if (channel_state[ 1 ].LBRR_flags[ i ] == 0) {
-                                silk_stereo_decode_mid_only( psRangeDec, &decode_only_middle );
+                                oaci_silk_stereo_decode_mid_only( psRangeDec, &decode_only_middle );
                             }
                         }
                         /* Use conditional coding if previous frame available */
@@ -271,8 +271,8 @@ oac_int silk_Decode(                                   /* O    Returns error cod
                         } else {
                             condCoding = CODE_INDEPENDENTLY;
                         }
-                        silk_decode_indices( &channel_state[ n ], psRangeDec, i, 1, condCoding );
-                        silk_decode_pulses( psRangeDec, pulses, channel_state[ n ].indices.signalType,
+                        oaci_silk_decode_indices( &channel_state[ n ], psRangeDec, i, 1, condCoding );
+                        oaci_silk_decode_pulses( psRangeDec, pulses, channel_state[ n ].indices.signalType,
                             channel_state[ n ].indices.quantOffsetType, channel_state[ n ].frame_length );
                     }
                 }
@@ -285,13 +285,13 @@ oac_int silk_Decode(                                   /* O    Returns error cod
         if (lostFlag == FLAG_DECODE_NORMAL
             || (lostFlag == FLAG_DECODE_LBRR
                 && channel_state[ 0 ].LBRR_flags[ channel_state[ 0 ].nFramesDecoded ] == 1)) {
-            silk_stereo_decode_pred( psRangeDec, MS_pred_Q13 );
+            oaci_silk_stereo_decode_pred( psRangeDec, MS_pred_Q13 );
             /* For LBRR data, decode mid-only flag only if side-channel's LBRR flag is false */
             if ((lostFlag == FLAG_DECODE_NORMAL
                  && channel_state[ 1 ].VAD_flags[ channel_state[ 0 ].nFramesDecoded ] == 0)
                 || (lostFlag == FLAG_DECODE_LBRR
                     && channel_state[ 1 ].LBRR_flags[ channel_state[ 0 ].nFramesDecoded ] == 0)) {
-                silk_stereo_decode_mid_only( psRangeDec, &decode_only_middle );
+                oaci_silk_stereo_decode_mid_only( psRangeDec, &decode_only_middle );
             } else {
                 decode_only_middle = 0;
             }
@@ -349,10 +349,10 @@ oac_int silk_Decode(                                   /* O    Returns error cod
             }
 #ifdef ENABLE_OSCE
             if (channel_state[n].osce.method != decControl->osce_method) {
-                osce_reset( &channel_state[n].osce, decControl->osce_method );
+                oaci_osce_reset( &channel_state[n].osce, decControl->osce_method );
             }
 #endif
-            ret += silk_decode_frame( &channel_state[ n ], psRangeDec, &samplesOut1_tmp[ n ][ 2 ], &nSamplesOutDec,
+            ret += oaci_silk_decode_frame( &channel_state[ n ], psRangeDec, &samplesOut1_tmp[ n ][ 2 ], &nSamplesOutDec,
             lostFlag, condCoding,
 #ifdef ENABLE_DEEP_PLC
                 n == 0 ? lpcnet : NULL,
@@ -369,7 +369,7 @@ oac_int silk_Decode(                                   /* O    Returns error cod
 
     if (decControl->nChannelsAPI == 2 && decControl->nChannelsInternal == 2) {
         /* Convert Mid/Side to Left/Right */
-        silk_stereo_MS_to_LR( &psDec->sStereo, samplesOut1_tmp[ 0 ], samplesOut1_tmp[ 1 ], MS_pred_Q13,
+        oaci_silk_stereo_MS_to_LR( &psDec->sStereo, samplesOut1_tmp[ 0 ], samplesOut1_tmp[ 1 ], MS_pred_Q13,
         channel_state[ 0 ].fs_kHz, nSamplesOutDec );
     } else {
         /* Buffering */
@@ -398,33 +398,33 @@ oac_int silk_Decode(                                   /* O    Returns error cod
 
             if (decControl->prev_osce_extended_mode != OSCE_MODE_SILK_BBWE) {
                 /* Reset the BWE state */
-                osce_bwe_reset( &channel_state[ n ].osce_bwe );
+                oaci_osce_bwe_reset( &channel_state[ n ].osce_bwe );
             }
 
-            osce_bwe(&psDec->osce_model, &channel_state[ n ].osce_bwe,
+            oaci_osce_bwe(&psDec->osce_model, &channel_state[ n ].osce_bwe,
                 resample_out_ptr, &samplesOut1_tmp[ n ][ 1 ], nSamplesOutDec, arch);
 
             if (decControl->prev_osce_extended_mode == OSCE_MODE_SILK_ONLY
                 || decControl->prev_osce_extended_mode == OSCE_MODE_HYBRID) {
                 /* cross-fade with upsampled signal */
-                silk_resampler( &channel_state[ n ].resampler_state, resamp_buffer, &samplesOut1_tmp[ n ][ 1 ],
+                oaci_silk_resampler( &channel_state[ n ].resampler_state, resamp_buffer, &samplesOut1_tmp[ n ][ 1 ],
                 nSamplesOutDec );
-                osce_bwe_cross_fade_10ms(resample_out_ptr, resamp_buffer, 480);
+                oaci_osce_bwe_cross_fade_10ms(resample_out_ptr, resamp_buffer, 480);
             }
         } else {
-            ret += silk_resampler( &channel_state[ n ].resampler_state, resample_out_ptr, &samplesOut1_tmp[ n ][ 1 ],
+            ret += oaci_silk_resampler( &channel_state[ n ].resampler_state, resample_out_ptr, &samplesOut1_tmp[ n ][ 1 ],
             nSamplesOutDec );
             if (decControl->prev_osce_extended_mode == OSCE_MODE_SILK_BBWE && decControl->internalSampleRate == 16000) {
                 /* fade out if internal sample rate did not change */
-                osce_bwe(&psDec->osce_model, &channel_state[ n ].osce_bwe,
+                oaci_osce_bwe(&psDec->osce_model, &channel_state[ n ].osce_bwe,
                     resamp_buffer, &samplesOut1_tmp[ n ][ 1 ], nSamplesOutDec, arch);
                 /* cross-fade with upsampled signal */
-                osce_bwe_cross_fade_10ms(resample_out_ptr, resamp_buffer, 480);
+                oaci_osce_bwe_cross_fade_10ms(resample_out_ptr, resamp_buffer, 480);
             }
         }
 #else
         /* Resample decoded signal to API_sampleRate */
-        ret += silk_resampler( &channel_state[ n ].resampler_state, resample_out_ptr, &samplesOut1_tmp[ n ][ 1 ],
+        ret += oaci_silk_resampler( &channel_state[ n ].resampler_state, resample_out_ptr, &samplesOut1_tmp[ n ][ 1 ],
         nSamplesOutDec );
 #endif
         /* Interleave if stereo output and stereo stream */
@@ -448,7 +448,7 @@ oac_int silk_Decode(                                   /* O    Returns error cod
         if (stereo_to_mono) {
             /* Resample right channel for newly collapsed stereo just in case
                we weren't doing collapsing when switching to mono */
-            ret += silk_resampler( &channel_state[ 1 ].resampler_state, resample_out_ptr, &samplesOut1_tmp[ 0 ][ 1 ],
+            ret += oaci_silk_resampler( &channel_state[ 1 ].resampler_state, resample_out_ptr, &samplesOut1_tmp[ 0 ][ 1 ],
             nSamplesOutDec );
 
             for (i = 0; i < *nSamplesOut; i++) {
diff --git a/silk/decode_core.c b/silk/decode_core.c
index e53874941..f3b27243c 100644
--- a/silk/decode_core.c
+++ b/silk/decode_core.c
@@ -35,7 +35,7 @@
 /**********************************************************/
 /* Core decoder. Performs inverse NSQ operation LTP + LPC */
 /**********************************************************/
-void silk_decode_core(
+void oaci_silk_decode_core(
     silk_decoder_state          *psDec,                         /* I/O  Decoder state                               */
     silk_decoder_control        *psDecCtrl,                     /* I    Decoder control                             */
     oac_int16 xq[],                                            /* O    Decoded speech                              */
@@ -65,7 +65,7 @@ void silk_decode_core(
     ALLOC( sLPC_Q14, psDec->subfr_length + MAX_LPC_ORDER, oac_int32 );
 #endif
 
-    offset_Q10 = silk_Quantization_Offsets_Q10[ psDec->indices.signalType>>1 ][ psDec->indices.quantOffsetType ];
+    offset_Q10 = oaci_silk_Quantization_Offsets_Q10[ psDec->indices.signalType>>1 ][ psDec->indices.quantOffsetType ];
 
     if (psDec->indices.NLSFInterpCoef_Q2 < 1<<2) {
         NLSF_interpolation_flag = 1;
@@ -151,7 +151,7 @@ void silk_decode_core(
                     silk_memcpy( &psDec->outBuf[ psDec->ltp_mem_length ], xq, 2*psDec->subfr_length*sizeof(oac_int16));
                 }
 
-                silk_LPC_analysis_filter( &sLTP[ start_idx ], &psDec->outBuf[ start_idx + k*psDec->subfr_length ],
+                oaci_silk_LPC_analysis_filter( &sLTP[ start_idx ], &psDec->outBuf[ start_idx + k*psDec->subfr_length ],
                     A_Q12, psDec->ltp_mem_length - start_idx, psDec->LPC_order, arch );
 
                 /* After rewhitening the LTP state is unscaled */
diff --git a/silk/decode_frame.c b/silk/decode_frame.c
index f21b5fad8..42b1607b7 100644
--- a/silk/decode_frame.c
+++ b/silk/decode_frame.c
@@ -40,7 +40,7 @@
 /****************/
 /* Decode frame */
 /****************/
-oac_int silk_decode_frame(
+oac_int oaci_silk_decode_frame(
     silk_decoder_state          *psDec,                         /* I/O  Pointer to Silk decoder state               */
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
     oac_int16 pOut[],                                          /* O    Pointer to output speech frame              */
@@ -78,23 +78,23 @@ oac_int silk_decode_frame(
         /*********************************************/
         /* Decode quantization indices of side info  */
         /*********************************************/
-        silk_decode_indices( psDec, psRangeDec, psDec->nFramesDecoded, lostFlag, condCoding );
+        oaci_silk_decode_indices( psDec, psRangeDec, psDec->nFramesDecoded, lostFlag, condCoding );
 
         /*********************************************/
         /* Decode quantization indices of excitation */
         /*********************************************/
-        silk_decode_pulses( psRangeDec, pulses, psDec->indices.signalType,
+        oaci_silk_decode_pulses( psRangeDec, pulses, psDec->indices.signalType,
                 psDec->indices.quantOffsetType, psDec->frame_length );
 
         /********************************************/
         /* Decode parameters and pulse signal       */
         /********************************************/
-        silk_decode_parameters( psDec, psDecCtrl, condCoding );
+        oaci_silk_decode_parameters( psDec, psDecCtrl, condCoding );
 
         /********************************************************/
         /* Run inverse NSQ                                      */
         /********************************************************/
-        silk_decode_core( psDec, psDecCtrl, pOut, pulses, arch );
+        oaci_silk_decode_core( psDec, psDecCtrl, pOut, pulses, arch );
 
         /*************************/
         /* Update output buffer. */
@@ -108,13 +108,13 @@ oac_int silk_decode_frame(
         /********************************************************/
         /* Run SILK enhancer                                    */
         /********************************************************/
-        osce_enhance_frame( osce_model, psDec, psDecCtrl, pOut, ec_tell(psRangeDec) - ec_start, arch );
+        oaci_osce_enhance_frame( osce_model, psDec, psDecCtrl, pOut, ec_tell(psRangeDec) - ec_start, arch );
 #endif
 
         /********************************************************/
         /* Update PLC state                                     */
         /********************************************************/
-        silk_PLC( psDec, psDecCtrl, pOut, 0,
+        oaci_silk_PLC( psDec, psDecCtrl, pOut, 0,
 #ifdef ENABLE_DEEP_PLC
             lpcnet,
 #endif
@@ -128,14 +128,14 @@ oac_int silk_decode_frame(
         psDec->first_frame_after_reset = 0;
     } else {
         /* Handle packet loss by extrapolation */
-        silk_PLC( psDec, psDecCtrl, pOut, 1,
+        oaci_silk_PLC( psDec, psDecCtrl, pOut, 1,
 #ifdef ENABLE_DEEP_PLC
             lpcnet,
 #endif
             arch );
 
 #ifdef ENABLE_OSCE
-        osce_reset( &psDec->osce, psDec->osce.method );
+        oaci_osce_reset( &psDec->osce, psDec->osce.method );
 #endif
         /*************************/
         /* Update output buffer. */
@@ -149,12 +149,12 @@ oac_int silk_decode_frame(
     /************************************************/
     /* Comfort noise generation / estimation        */
     /************************************************/
-    silk_CNG( psDec, psDecCtrl, pOut, L );
+    oaci_silk_CNG( psDec, psDecCtrl, pOut, L );
 
     /****************************************************************/
     /* Ensure smooth connection of extrapolated and good frames     */
     /****************************************************************/
-    silk_PLC_glue_frames( psDec, pOut, L );
+    oaci_silk_PLC_glue_frames( psDec, pOut, L );
 
     /* Update some decoder state variables */
     psDec->lagPrev = psDecCtrl->pitchL[ psDec->nb_subfr - 1 ];
diff --git a/silk/decode_indices.c b/silk/decode_indices.c
index 2f8fffdb7..431325aef 100644
--- a/silk/decode_indices.c
+++ b/silk/decode_indices.c
@@ -32,7 +32,7 @@
 #include "main.h"
 
 /* Decode side-information parameters from payload */
-void silk_decode_indices(
+void oaci_silk_decode_indices(
     silk_decoder_state          *psDec,                         /* I/O  State                                       */
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
     oac_int FrameIndex,                                        /* I    Frame number                                */
@@ -48,9 +48,9 @@ void silk_decode_indices(
     /* Decode signal type and quantizer offset */
     /*******************************************/
     if (decode_LBRR || psDec->VAD_flags[ FrameIndex ]) {
-        Ix = ec_dec_icdf( psRangeDec, silk_type_offset_VAD_iCDF, 8 ) + 2;
+        Ix = oaci_ec_dec_icdf( psRangeDec, oaci_silk_type_offset_VAD_iCDF, 8 ) + 2;
     } else {
-        Ix = ec_dec_icdf( psRangeDec, silk_type_offset_no_VAD_iCDF, 8 );
+        Ix = oaci_ec_dec_icdf( psRangeDec, oaci_silk_type_offset_no_VAD_iCDF, 8 );
     }
     psDec->indices.signalType      = (oac_int8)silk_RSHIFT( Ix, 1 );
     psDec->indices.quantOffsetType = (oac_int8)(Ix&1);
@@ -61,39 +61,39 @@ void silk_decode_indices(
     /* First subframe */
     if (condCoding == CODE_CONDITIONALLY) {
         /* Conditional coding */
-        psDec->indices.GainsIndices[ 0 ] = (oac_int8)ec_dec_icdf( psRangeDec, silk_delta_gain_iCDF, 8 );
+        psDec->indices.GainsIndices[ 0 ] = (oac_int8)oaci_ec_dec_icdf( psRangeDec, oaci_silk_delta_gain_iCDF, 8 );
     } else {
         /* Independent coding, in two stages: MSB bits followed by 3 LSBs */
-        psDec->indices.GainsIndices[ 0 ]  = (oac_int8)silk_LSHIFT( ec_dec_icdf( psRangeDec,
-        silk_gain_iCDF[ psDec->indices.signalType ], 8 ), 3 );
-        psDec->indices.GainsIndices[ 0 ] += (oac_int8)ec_dec_icdf( psRangeDec, silk_uniform8_iCDF, 8 );
+        psDec->indices.GainsIndices[ 0 ]  = (oac_int8)silk_LSHIFT( oaci_ec_dec_icdf( psRangeDec,
+        oaci_silk_gain_iCDF[ psDec->indices.signalType ], 8 ), 3 );
+        psDec->indices.GainsIndices[ 0 ] += (oac_int8)oaci_ec_dec_icdf( psRangeDec, oaci_silk_uniform8_iCDF, 8 );
     }
 
     /* Remaining subframes */
     for (i = 1; i < psDec->nb_subfr; i++) {
-        psDec->indices.GainsIndices[ i ] = (oac_int8)ec_dec_icdf( psRangeDec, silk_delta_gain_iCDF, 8 );
+        psDec->indices.GainsIndices[ i ] = (oac_int8)oaci_ec_dec_icdf( psRangeDec, oaci_silk_delta_gain_iCDF, 8 );
     }
 
     /**********************/
     /* Decode LSF Indices */
     /**********************/
-    psDec->indices.NLSFIndices[ 0 ] = (oac_int8)ec_dec_icdf( psRangeDec,
+    psDec->indices.NLSFIndices[ 0 ] = (oac_int8)oaci_ec_dec_icdf( psRangeDec,
     &psDec->psNLSF_CB->CB1_iCDF[ (psDec->indices.signalType>>1)*psDec->psNLSF_CB->nVectors ], 8 );
-    silk_NLSF_unpack( ec_ix, pred_Q8, psDec->psNLSF_CB, psDec->indices.NLSFIndices[ 0 ] );
+    oaci_silk_NLSF_unpack( ec_ix, pred_Q8, psDec->psNLSF_CB, psDec->indices.NLSFIndices[ 0 ] );
     celt_assert( psDec->psNLSF_CB->order == psDec->LPC_order );
     for (i = 0; i < psDec->psNLSF_CB->order; i++) {
-        Ix = ec_dec_icdf( psRangeDec, &psDec->psNLSF_CB->ec_iCDF[ ec_ix[ i ] ], 8 );
+        Ix = oaci_ec_dec_icdf( psRangeDec, &psDec->psNLSF_CB->ec_iCDF[ ec_ix[ i ] ], 8 );
         if (Ix == 0) {
-            Ix -= ec_dec_icdf( psRangeDec, silk_NLSF_EXT_iCDF, 8 );
+            Ix -= oaci_ec_dec_icdf( psRangeDec, oaci_silk_NLSF_EXT_iCDF, 8 );
         } else if (Ix == 2*NLSF_QUANT_MAX_AMPLITUDE) {
-            Ix += ec_dec_icdf( psRangeDec, silk_NLSF_EXT_iCDF, 8 );
+            Ix += oaci_ec_dec_icdf( psRangeDec, oaci_silk_NLSF_EXT_iCDF, 8 );
         }
         psDec->indices.NLSFIndices[ i + 1 ] = (oac_int8)(Ix - NLSF_QUANT_MAX_AMPLITUDE);
     }
 
     /* Decode LSF interpolation factor */
     if (psDec->nb_subfr == MAX_NB_SUBFR) {
-        psDec->indices.NLSFInterpCoef_Q2 = (oac_int8)ec_dec_icdf( psRangeDec, silk_NLSF_interpolation_factor_iCDF, 8 );
+        psDec->indices.NLSFInterpCoef_Q2 = (oac_int8)oaci_ec_dec_icdf( psRangeDec, oaci_silk_NLSF_interpolation_factor_iCDF, 8 );
     } else {
         psDec->indices.NLSFInterpCoef_Q2 = 4;
     }
@@ -106,7 +106,7 @@ void silk_decode_indices(
         decode_absolute_lagIndex = 1;
         if (condCoding == CODE_CONDITIONALLY && psDec->ec_prevSignalType == TYPE_VOICED) {
             /* Decode Delta index */
-            delta_lagIndex = (oac_int16)ec_dec_icdf( psRangeDec, silk_pitch_delta_iCDF, 8 );
+            delta_lagIndex = (oac_int16)oaci_ec_dec_icdf( psRangeDec, oaci_silk_pitch_delta_iCDF, 8 );
             if (delta_lagIndex > 0) {
                 delta_lagIndex = delta_lagIndex - 9;
                 psDec->indices.lagIndex = (oac_int16)(psDec->ec_prevLagIndex + delta_lagIndex);
@@ -115,31 +115,31 @@ void silk_decode_indices(
         }
         if (decode_absolute_lagIndex) {
             /* Absolute decoding */
-            psDec->indices.lagIndex  = (oac_int16)ec_dec_icdf( psRangeDec, silk_pitch_lag_iCDF,
+            psDec->indices.lagIndex  = (oac_int16)oaci_ec_dec_icdf( psRangeDec, oaci_silk_pitch_lag_iCDF,
             8 )*silk_RSHIFT( psDec->fs_kHz, 1 );
-            psDec->indices.lagIndex += (oac_int16)ec_dec_icdf( psRangeDec, psDec->pitch_lag_low_bits_iCDF, 8 );
+            psDec->indices.lagIndex += (oac_int16)oaci_ec_dec_icdf( psRangeDec, psDec->pitch_lag_low_bits_iCDF, 8 );
         }
         psDec->ec_prevLagIndex = psDec->indices.lagIndex;
 
         /* Get contour index */
-        psDec->indices.contourIndex = (oac_int8)ec_dec_icdf( psRangeDec, psDec->pitch_contour_iCDF, 8 );
+        psDec->indices.contourIndex = (oac_int8)oaci_ec_dec_icdf( psRangeDec, psDec->pitch_contour_iCDF, 8 );
 
         /********************/
         /* Decode LTP gains */
         /********************/
         /* Decode PERIndex value */
-        psDec->indices.PERIndex = (oac_int8)ec_dec_icdf( psRangeDec, silk_LTP_per_index_iCDF, 8 );
+        psDec->indices.PERIndex = (oac_int8)oaci_ec_dec_icdf( psRangeDec, oaci_silk_LTP_per_index_iCDF, 8 );
 
         for (k = 0; k < psDec->nb_subfr; k++) {
-            psDec->indices.LTPIndex[ k ] = (oac_int8)ec_dec_icdf( psRangeDec,
-            silk_LTP_gain_iCDF_ptrs[ psDec->indices.PERIndex ], 8 );
+            psDec->indices.LTPIndex[ k ] = (oac_int8)oaci_ec_dec_icdf( psRangeDec,
+            oaci_silk_LTP_gain_iCDF_ptrs[ psDec->indices.PERIndex ], 8 );
         }
 
         /**********************/
         /* Decode LTP scaling */
         /**********************/
         if (condCoding == CODE_INDEPENDENTLY) {
-            psDec->indices.LTP_scaleIndex = (oac_int8)ec_dec_icdf( psRangeDec, silk_LTPscale_iCDF, 8 );
+            psDec->indices.LTP_scaleIndex = (oac_int8)oaci_ec_dec_icdf( psRangeDec, oaci_silk_LTPscale_iCDF, 8 );
         } else {
             psDec->indices.LTP_scaleIndex = 0;
         }
@@ -149,5 +149,5 @@ void silk_decode_indices(
     /***************/
     /* Decode seed */
     /***************/
-    psDec->indices.Seed = (oac_int8)ec_dec_icdf( psRangeDec, silk_uniform4_iCDF, 8 );
+    psDec->indices.Seed = (oac_int8)oaci_ec_dec_icdf( psRangeDec, oaci_silk_uniform4_iCDF, 8 );
 }
diff --git a/silk/decode_parameters.c b/silk/decode_parameters.c
index f65ae88c5..ea69a17aa 100644
--- a/silk/decode_parameters.c
+++ b/silk/decode_parameters.c
@@ -32,7 +32,7 @@
 #include "main.h"
 
 /* Decode parameters from payload */
-void silk_decode_parameters(
+void oaci_silk_decode_parameters(
     silk_decoder_state          *psDec,                         /* I/O  State                                       */
     silk_decoder_control        *psDecCtrl,                     /* I/O  Decoder control                             */
     oac_int condCoding                                         /* I    The type of conditional coding to use       */
@@ -42,16 +42,16 @@ void silk_decode_parameters(
     const oac_int8 *cbk_ptr_Q7;
 
     /* Dequant Gains */
-    silk_gains_dequant( psDecCtrl->Gains_Q16, psDec->indices.GainsIndices,
+    oaci_silk_gains_dequant( psDecCtrl->Gains_Q16, psDec->indices.GainsIndices,
         &psDec->LastGainIndex, condCoding == CODE_CONDITIONALLY, psDec->nb_subfr );
 
     /****************/
     /* Decode NLSFs */
     /****************/
-    silk_NLSF_decode( pNLSF_Q15, psDec->indices.NLSFIndices, psDec->psNLSF_CB );
+    oaci_silk_NLSF_decode( pNLSF_Q15, psDec->indices.NLSFIndices, psDec->psNLSF_CB );
 
     /* Convert NLSF parameters to AR prediction filter coefficients */
-    silk_NLSF2A( psDecCtrl->PredCoef_Q12[ 1 ], pNLSF_Q15, psDec->LPC_order, psDec->arch );
+    oaci_silk_NLSF2A( psDecCtrl->PredCoef_Q12[ 1 ], pNLSF_Q15, psDec->LPC_order, psDec->arch );
 
     /* If just reset, e.g., because internal Fs changed, do not allow interpolation */
     /* improves the case of packet loss in the first frame after a switch           */
@@ -68,7 +68,7 @@ void silk_decode_parameters(
         }
 
         /* Convert NLSF parameters to AR prediction filter coefficients */
-        silk_NLSF2A( psDecCtrl->PredCoef_Q12[ 0 ], pNLSF0_Q15, psDec->LPC_order, psDec->arch );
+        oaci_silk_NLSF2A( psDecCtrl->PredCoef_Q12[ 0 ], pNLSF0_Q15, psDec->LPC_order, psDec->arch );
     } else {
         /* Copy LPC coefficients for first half from second half */
         silk_memcpy( psDecCtrl->PredCoef_Q12[ 0 ], psDecCtrl->PredCoef_Q12[ 1 ], psDec->LPC_order*sizeof(oac_int16));
@@ -78,8 +78,8 @@ void silk_decode_parameters(
 
     /* After a packet loss do BWE of LPC coefs */
     if (psDec->lossCnt) {
-        silk_bwexpander( psDecCtrl->PredCoef_Q12[ 0 ], psDec->LPC_order, BWE_AFTER_LOSS_Q16 );
-        silk_bwexpander( psDecCtrl->PredCoef_Q12[ 1 ], psDec->LPC_order, BWE_AFTER_LOSS_Q16 );
+        oaci_silk_bwexpander( psDecCtrl->PredCoef_Q12[ 0 ], psDec->LPC_order, BWE_AFTER_LOSS_Q16 );
+        oaci_silk_bwexpander( psDecCtrl->PredCoef_Q12[ 1 ], psDec->LPC_order, BWE_AFTER_LOSS_Q16 );
     }
 
     if (psDec->indices.signalType == TYPE_VOICED) {
@@ -88,11 +88,11 @@ void silk_decode_parameters(
         /*********************/
 
         /* Decode pitch values */
-        silk_decode_pitch( psDec->indices.lagIndex, psDec->indices.contourIndex, psDecCtrl->pitchL, psDec->fs_kHz,
+        oaci_silk_decode_pitch( psDec->indices.lagIndex, psDec->indices.contourIndex, psDecCtrl->pitchL, psDec->fs_kHz,
         psDec->nb_subfr );
 
         /* Decode Codebook Index */
-        cbk_ptr_Q7 = silk_LTP_vq_ptrs_Q7[ psDec->indices.PERIndex ]; /* set pointer to start of codebook */
+        cbk_ptr_Q7 = oaci_silk_LTP_vq_ptrs_Q7[ psDec->indices.PERIndex ]; /* set pointer to start of codebook */
 
         for (k = 0; k < psDec->nb_subfr; k++) {
             Ix = psDec->indices.LTPIndex[ k ];
@@ -105,7 +105,7 @@ void silk_decode_parameters(
         /* Decode LTP scaling */
         /**********************/
         Ix = psDec->indices.LTP_scaleIndex;
-        psDecCtrl->LTP_scale_Q14 = silk_LTPScales_table_Q14[ Ix ];
+        psDecCtrl->LTP_scale_Q14 = oaci_silk_LTPScales_table_Q14[ Ix ];
     } else {
         silk_memset( psDecCtrl->pitchL,      0,             psDec->nb_subfr*sizeof(oac_int));
         silk_memset( psDecCtrl->LTPCoef_Q14, 0, LTP_ORDER*psDec->nb_subfr*sizeof(oac_int16));
diff --git a/silk/decode_pitch.c b/silk/decode_pitch.c
index 0983e0603..37a76d356 100644
--- a/silk/decode_pitch.c
+++ b/silk/decode_pitch.c
@@ -35,7 +35,7 @@
 #include "SigProc_FIX.h"
 #include "pitch_est_defines.h"
 
-void silk_decode_pitch(
+void oaci_silk_decode_pitch(
     oac_int16 lagIndex,                            /* I                                                                */
     oac_int8 contourIndex,                         /* O                                                                */
     oac_int pitch_lags[],                          /* O    4 pitch values                                              */
@@ -47,20 +47,20 @@ void silk_decode_pitch(
 
     if (Fs_kHz == 8) {
         if (nb_subfr == PE_MAX_NB_SUBFR) {
-            Lag_CB_ptr = &silk_CB_lags_stage2[ 0 ][ 0 ];
+            Lag_CB_ptr = &oaci_silk_CB_lags_stage2[ 0 ][ 0 ];
             cbk_size   = PE_NB_CBKS_STAGE2_EXT;
         } else {
             celt_assert( nb_subfr == PE_MAX_NB_SUBFR>>1 );
-            Lag_CB_ptr = &silk_CB_lags_stage2_10_ms[ 0 ][ 0 ];
+            Lag_CB_ptr = &oaci_silk_CB_lags_stage2_10_ms[ 0 ][ 0 ];
             cbk_size   = PE_NB_CBKS_STAGE2_10MS;
         }
     } else {
         if (nb_subfr == PE_MAX_NB_SUBFR) {
-            Lag_CB_ptr = &silk_CB_lags_stage3[ 0 ][ 0 ];
+            Lag_CB_ptr = &oaci_silk_CB_lags_stage3[ 0 ][ 0 ];
             cbk_size   = PE_NB_CBKS_STAGE3_MAX;
         } else {
             celt_assert( nb_subfr == PE_MAX_NB_SUBFR>>1 );
-            Lag_CB_ptr = &silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
+            Lag_CB_ptr = &oaci_silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
             cbk_size   = PE_NB_CBKS_STAGE3_10MS;
         }
     }
diff --git a/silk/decode_pulses.c b/silk/decode_pulses.c
index 7fbe142d5..0a70629ac 100644
--- a/silk/decode_pulses.c
+++ b/silk/decode_pulses.c
@@ -34,7 +34,7 @@
 /*********************************************/
 /* Decode quantization indices of excitation */
 /*********************************************/
-void silk_decode_pulses(
+void oaci_silk_decode_pulses(
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
     oac_int16 pulses[],                                        /* O    Excitation signal                           */
     const oac_int signalType,                                  /* I    Sigtype                                     */
@@ -49,7 +49,7 @@ void silk_decode_pulses(
     /*********************/
     /* Decode rate level */
     /*********************/
-    RateLevelIndex = ec_dec_icdf( psRangeDec, silk_rate_levels_iCDF[ signalType>>1 ], 8 );
+    RateLevelIndex = oaci_ec_dec_icdf( psRangeDec, oaci_silk_rate_levels_iCDF[ signalType>>1 ], 8 );
 
     /* Calculate number of shell blocks */
     silk_assert( 1<<LOG2_SHELL_CODEC_FRAME_LENGTH == SHELL_CODEC_FRAME_LENGTH );
@@ -62,17 +62,17 @@ void silk_decode_pulses(
     /***************************************************/
     /* Sum-Weighted-Pulses Decoding                    */
     /***************************************************/
-    cdf_ptr = silk_pulses_per_block_iCDF[ RateLevelIndex ];
+    cdf_ptr = oaci_silk_pulses_per_block_iCDF[ RateLevelIndex ];
     for (i = 0; i < iter; i++) {
         nLshifts[ i ] = 0;
-        sum_pulses[ i ] = ec_dec_icdf( psRangeDec, cdf_ptr, 8 );
+        sum_pulses[ i ] = oaci_ec_dec_icdf( psRangeDec, cdf_ptr, 8 );
 
         /* LSB indication */
         while (sum_pulses[ i ] == SILK_MAX_PULSES + 1) {
             nLshifts[ i ]++;
             /* When we've already got 10 LSBs, we shift the table to not allow (SILK_MAX_PULSES + 1) */
-            sum_pulses[ i ] = ec_dec_icdf( psRangeDec,
-                    silk_pulses_per_block_iCDF[ N_RATE_LEVELS - 1] + (nLshifts[ i ] == 10), 8 );
+            sum_pulses[ i ] = oaci_ec_dec_icdf( psRangeDec,
+                    oaci_silk_pulses_per_block_iCDF[ N_RATE_LEVELS - 1] + (nLshifts[ i ] == 10), 8 );
         }
     }
 
@@ -81,7 +81,7 @@ void silk_decode_pulses(
     /***************************************************/
     for (i = 0; i < iter; i++) {
         if (sum_pulses[ i ] > 0) {
-            silk_shell_decoder( &pulses[ silk_SMULBB( i, SHELL_CODEC_FRAME_LENGTH ) ], psRangeDec, sum_pulses[ i ] );
+            oaci_silk_shell_decoder( &pulses[ silk_SMULBB( i, SHELL_CODEC_FRAME_LENGTH ) ], psRangeDec, sum_pulses[ i ] );
         } else {
             silk_memset( &pulses[ silk_SMULBB( i, SHELL_CODEC_FRAME_LENGTH ) ], 0,
             SHELL_CODEC_FRAME_LENGTH*sizeof(pulses[0]));
@@ -99,7 +99,7 @@ void silk_decode_pulses(
                 abs_q = pulses_ptr[ k ];
                 for (j = 0; j < nLS; j++) {
                     abs_q = silk_LSHIFT( abs_q, 1 );
-                    abs_q += ec_dec_icdf( psRangeDec, silk_lsb_iCDF, 8 );
+                    abs_q += oaci_ec_dec_icdf( psRangeDec, oaci_silk_lsb_iCDF, 8 );
                 }
                 pulses_ptr[ k ] = abs_q;
             }
@@ -111,5 +111,5 @@ void silk_decode_pulses(
     /****************************************/
     /* Decode and add signs to pulse signal */
     /****************************************/
-    silk_decode_signs( psRangeDec, pulses, frame_length, signalType, quantOffsetType, sum_pulses );
+    oaci_silk_decode_signs( psRangeDec, pulses, frame_length, signalType, quantOffsetType, sum_pulses );
 }
diff --git a/silk/decoder_set_fs.c b/silk/decoder_set_fs.c
index cdf54f83b..8f3b804eb 100644
--- a/silk/decoder_set_fs.c
+++ b/silk/decoder_set_fs.c
@@ -32,7 +32,7 @@
 #include "main.h"
 
 /* Set decoder sampling rate */
-oac_int silk_decoder_set_fs(
+oac_int oaci_silk_decoder_set_fs(
     silk_decoder_state          *psDec,                         /* I/O  Decoder state pointer                       */
     oac_int fs_kHz,                                            /* I    Sampling frequency (kHz)                    */
     oac_int32 fs_API_Hz                                        /* I    API Sampling frequency (Hz)                 */
@@ -49,7 +49,7 @@ oac_int silk_decoder_set_fs(
     /* Initialize resampler when switching internal or external sampling frequency */
     if (psDec->fs_kHz != fs_kHz || psDec->fs_API_hz != fs_API_Hz) {
         /* Initialize the resampler for dec_API.c preparing resampling from fs_kHz to API_fs_Hz */
-        ret += silk_resampler_init( &psDec->resampler_state, silk_SMULBB( fs_kHz, 1000 ), fs_API_Hz, 0 );
+        ret += oaci_silk_resampler_init( &psDec->resampler_state, silk_SMULBB( fs_kHz, 1000 ), fs_API_Hz, 0 );
 
         psDec->fs_API_hz = fs_API_Hz;
     }
@@ -57,32 +57,32 @@ oac_int silk_decoder_set_fs(
     if (psDec->fs_kHz != fs_kHz || frame_length != psDec->frame_length) {
         if (fs_kHz == 8) {
             if (psDec->nb_subfr == MAX_NB_SUBFR) {
-                psDec->pitch_contour_iCDF = silk_pitch_contour_NB_iCDF;
+                psDec->pitch_contour_iCDF = oaci_silk_pitch_contour_NB_iCDF;
             } else {
-                psDec->pitch_contour_iCDF = silk_pitch_contour_10_ms_NB_iCDF;
+                psDec->pitch_contour_iCDF = oaci_silk_pitch_contour_10_ms_NB_iCDF;
             }
         } else {
             if (psDec->nb_subfr == MAX_NB_SUBFR) {
-                psDec->pitch_contour_iCDF = silk_pitch_contour_iCDF;
+                psDec->pitch_contour_iCDF = oaci_silk_pitch_contour_iCDF;
             } else {
-                psDec->pitch_contour_iCDF = silk_pitch_contour_10_ms_iCDF;
+                psDec->pitch_contour_iCDF = oaci_silk_pitch_contour_10_ms_iCDF;
             }
         }
         if (psDec->fs_kHz != fs_kHz) {
             psDec->ltp_mem_length = silk_SMULBB( LTP_MEM_LENGTH_MS, fs_kHz );
             if (fs_kHz == 8 || fs_kHz == 12) {
                 psDec->LPC_order = MIN_LPC_ORDER;
-                psDec->psNLSF_CB = &silk_NLSF_CB_NB_MB;
+                psDec->psNLSF_CB = &oaci_silk_NLSF_CB_NB_MB;
             } else {
                 psDec->LPC_order = MAX_LPC_ORDER;
-                psDec->psNLSF_CB = &silk_NLSF_CB_WB;
+                psDec->psNLSF_CB = &oaci_silk_NLSF_CB_WB;
             }
             if (fs_kHz == 16) {
-                psDec->pitch_lag_low_bits_iCDF = silk_uniform8_iCDF;
+                psDec->pitch_lag_low_bits_iCDF = oaci_silk_uniform8_iCDF;
             } else if (fs_kHz == 12) {
-                psDec->pitch_lag_low_bits_iCDF = silk_uniform6_iCDF;
+                psDec->pitch_lag_low_bits_iCDF = oaci_silk_uniform6_iCDF;
             } else if (fs_kHz == 8) {
-                psDec->pitch_lag_low_bits_iCDF = silk_uniform4_iCDF;
+                psDec->pitch_lag_low_bits_iCDF = oaci_silk_uniform4_iCDF;
             } else {
                 /* unsupported sampling rate */
                 celt_assert( 0 );
diff --git a/silk/enc_API.c b/silk/enc_API.c
index 996561894..1c5a29f07 100644
--- a/silk/enc_API.c
+++ b/silk/enc_API.c
@@ -57,7 +57,7 @@ static oac_int silk_QueryEncoder(                      /* O    Returns error cod
 /* Encoder functions                    */
 /****************************************/
 
-oac_int silk_Get_Encoder_Size(                         /* O    Returns error code                              */
+oac_int oaci_silk_Get_Encoder_Size(                         /* O    Returns error code                              */
     oac_int                        *encSizeBytes,      /* O    Number of bytes in SILK encoder state           */
     oac_int channels                                   /* I    Number of channels                              */
     ) {
@@ -75,7 +75,7 @@ oac_int silk_Get_Encoder_Size(                         /* O    Returns error cod
 /*************************/
 /* Init or Reset encoder */
 /*************************/
-oac_int silk_InitEncoder(                              /* O    Returns error code                              */
+oac_int oaci_silk_InitEncoder(                              /* O    Returns error code                              */
     void                            *encState,          /* I/O  State                                           */
     int channels,                                       /* I    Number of channels                              */
     int arch,                                           /* I    Run-time architecture                           */
@@ -89,7 +89,7 @@ oac_int silk_InitEncoder(                              /* O    Returns error cod
     /* Reset encoder. Skip second encoder state for mono. */
     silk_memset( psEnc, 0, sizeof(silk_encoder) - (channels == 1)*sizeof(silk_encoder_state_Fxx));
     for (n = 0; n < channels; n++) {
-        if (ret += silk_init_encoder( &psEnc->state_Fxx[ n ], arch )) {
+        if (ret += oaci_silk_init_encoder( &psEnc->state_Fxx[ n ], arch )) {
             celt_assert( 0 );
         }
     }
@@ -144,7 +144,7 @@ static oac_int silk_QueryEncoder(                      /* O    Returns error cod
 /**************************/
 /* Note: if prefillFlag is set, the input must contain 10 ms of audio, irrespective of what                     */
 /* encControl->payloadSize_ms is set to                                                                         */
-oac_int silk_Encode(                                   /* O    Returns error code                              */
+oac_int oaci_silk_Encode(                                   /* O    Returns error code                              */
     void                            *encState,          /* I/O  State                                           */
     silk_EncControlStruct           *encControl,        /* I    Control status                                  */
     const oac_res                  *samplesIn,         /* I    Speech sample input vector                      */
@@ -175,7 +175,7 @@ oac_int silk_Encode(                                   /* O    Returns error cod
         psEnc->state_Fxx[ n ].sCmn.nFramesEncoded = 0;
     }
     /* Check values in encoder control structure */
-    if ((ret = check_control_input( encControl )) != 0) {
+    if ((ret = oaci_check_control_input( encControl )) != 0) {
         celt_assert( 0 );
         RESTORE_STACK;
         return ret;
@@ -185,7 +185,7 @@ oac_int silk_Encode(                                   /* O    Returns error cod
 
     if (encControl->nChannelsInternal > psEnc->nChannelsInternal) {
         /* Mono -> Stereo transition: init state of second channel and stereo state */
-        ret += silk_init_encoder( &psEnc->state_Fxx[ 1 ], psEnc->state_Fxx[ 0 ].sCmn.arch );
+        ret += oaci_silk_init_encoder( &psEnc->state_Fxx[ 1 ], psEnc->state_Fxx[ 0 ].sCmn.arch );
         silk_memset( psEnc->sStereo.pred_prev_Q13, 0, sizeof(psEnc->sStereo.pred_prev_Q13));
         silk_memset( psEnc->sStereo.sSide, 0, sizeof(psEnc->sStereo.sSide));
         psEnc->sStereo.mid_side_amp_Q0[ 0 ] = 0;
@@ -226,7 +226,7 @@ oac_int silk_Encode(                                   /* O    Returns error cod
         }
         /* Reset Encoder */
         for (n = 0; n < encControl->nChannelsInternal; n++) {
-            ret = silk_init_encoder( &psEnc->state_Fxx[ n ], psEnc->state_Fxx[ n ].sCmn.arch );
+            ret = oaci_silk_init_encoder( &psEnc->state_Fxx[ n ], psEnc->state_Fxx[ n ].sCmn.arch );
             /* Restore the variable LP state. */
             if (prefillFlag == 2) {
                 psEnc->state_Fxx[ n ].sCmn.sLP = save_LP;
@@ -259,7 +259,7 @@ oac_int silk_Encode(                                   /* O    Returns error cod
     for (n = 0; n < encControl->nChannelsInternal; n++) {
         /* Force the side channel to the same rate as the mid */
         oac_int force_fs_kHz = (n == 1) ? psEnc->state_Fxx[0].sCmn.fs_kHz : 0;
-        if ((ret = silk_control_encoder( &psEnc->state_Fxx[ n ], encControl, psEnc->allowBandwidthSwitch, n,
+        if ((ret = oaci_silk_control_encoder( &psEnc->state_Fxx[ n ], encControl, psEnc->allowBandwidthSwitch, n,
         force_fs_kHz )) != 0) {
             silk_assert( 0 );
             RESTORE_STACK;
@@ -301,7 +301,7 @@ oac_int silk_Encode(                                   /* O    Returns error cod
                 sizeof(psEnc->state_Fxx[ 1 ].sCmn.resampler_state));
             }
 
-            ret += silk_resampler( &psEnc->state_Fxx[ 0 ].sCmn.resampler_state,
+            ret += oaci_silk_resampler( &psEnc->state_Fxx[ 0 ].sCmn.resampler_state,
                 &psEnc->state_Fxx[ 0 ].sCmn.inputBuf[ psEnc->state_Fxx[ 0 ].sCmn.inputBufIx + 2 ], buf,
             nSamplesFromInput );
             psEnc->state_Fxx[ 0 ].sCmn.inputBufIx += nSamplesToBuffer;
@@ -311,7 +311,7 @@ oac_int silk_Encode(                                   /* O    Returns error cod
             for (n = 0; n < nSamplesFromInput; n++) {
                 buf[ n ] = RES2INT16(samplesIn[ 2*n + 1 ]);
             }
-            ret += silk_resampler( &psEnc->state_Fxx[ 1 ].sCmn.resampler_state,
+            ret += oaci_silk_resampler( &psEnc->state_Fxx[ 1 ].sCmn.resampler_state,
                 &psEnc->state_Fxx[ 1 ].sCmn.inputBuf[ psEnc->state_Fxx[ 1 ].sCmn.inputBufIx + 2 ], buf,
             nSamplesFromInput );
 
@@ -322,12 +322,12 @@ oac_int silk_Encode(                                   /* O    Returns error cod
                 sum = RES2INT16(samplesIn[ 2*n ] + samplesIn[ 2*n + 1 ]);
                 buf[ n ] = (oac_int16)silk_RSHIFT_ROUND( sum,  1 );
             }
-            ret += silk_resampler( &psEnc->state_Fxx[ 0 ].sCmn.resampler_state,
+            ret += oaci_silk_resampler( &psEnc->state_Fxx[ 0 ].sCmn.resampler_state,
                 &psEnc->state_Fxx[ 0 ].sCmn.inputBuf[ psEnc->state_Fxx[ 0 ].sCmn.inputBufIx + 2 ], buf,
             nSamplesFromInput );
             /* On the first mono frame, average the results for the two resampler states  */
             if (psEnc->nPrevChannelsInternal == 2 && psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded == 0) {
-                ret += silk_resampler( &psEnc->state_Fxx[ 1 ].sCmn.resampler_state,
+                ret += oaci_silk_resampler( &psEnc->state_Fxx[ 1 ].sCmn.resampler_state,
                    &psEnc->state_Fxx[ 1 ].sCmn.inputBuf[ psEnc->state_Fxx[ 1 ].sCmn.inputBufIx + 2 ], buf,
                 nSamplesFromInput );
                 for (n = 0; n < psEnc->state_Fxx[ 0 ].sCmn.frame_length; n++) {
@@ -342,7 +342,7 @@ oac_int silk_Encode(                                   /* O    Returns error cod
             for (n = 0; n < nSamplesFromInput; n++) {
                 buf[n] = RES2INT16(samplesIn[n]);
             }
-            ret += silk_resampler( &psEnc->state_Fxx[ 0 ].sCmn.resampler_state,
+            ret += oaci_silk_resampler( &psEnc->state_Fxx[ 0 ].sCmn.resampler_state,
                 &psEnc->state_Fxx[ 0 ].sCmn.inputBuf[ psEnc->state_Fxx[ 0 ].sCmn.inputBufIx + 2 ], buf,
             nSamplesFromInput );
             psEnc->state_Fxx[ 0 ].sCmn.inputBufIx += nSamplesToBuffer;
@@ -367,7 +367,7 @@ oac_int silk_Encode(                                   /* O    Returns error cod
                 oac_uint8 iCDF[ 2 ] = { 0, 0 };
                 iCDF[ 0 ] = 256 - silk_RSHIFT( 256,
                     (psEnc->state_Fxx[ 0 ].sCmn.nFramesPerPacket + 1)*encControl->nChannelsInternal );
-                ec_enc_icdf( psRangeEnc, 0, iCDF, 8 );
+                oaci_ec_enc_icdf( psRangeEnc, 0, iCDF, 8 );
                 curr_nBitsUsedLBRR = ec_tell( psRangeEnc );
 
                 /* Encode any LBRR data from previous packet */
@@ -379,8 +379,8 @@ oac_int silk_Encode(                                   /* O    Returns error cod
                     }
                     psEnc->state_Fxx[ n ].sCmn.LBRR_flag = LBRR_symbol > 0 ? 1 : 0;
                     if (LBRR_symbol && psEnc->state_Fxx[ n ].sCmn.nFramesPerPacket > 1) {
-                        ec_enc_icdf( psRangeEnc, LBRR_symbol - 1,
-                        silk_LBRR_flags_iCDF_ptr[ psEnc->state_Fxx[ n ].sCmn.nFramesPerPacket - 2 ], 8 );
+                        oaci_ec_enc_icdf( psRangeEnc, LBRR_symbol - 1,
+                        oaci_silk_LBRR_flags_iCDF_ptr[ psEnc->state_Fxx[ n ].sCmn.nFramesPerPacket - 2 ], 8 );
                     }
                 }
 
@@ -391,10 +391,10 @@ oac_int silk_Encode(                                   /* O    Returns error cod
                             oac_int condCoding;
 
                             if (encControl->nChannelsInternal == 2 && n == 0) {
-                                silk_stereo_encode_pred( psRangeEnc, psEnc->sStereo.predIx[ i ] );
+                                oaci_silk_stereo_encode_pred( psRangeEnc, psEnc->sStereo.predIx[ i ] );
                                 /* For LBRR data there's no need to code the mid-only flag if the side-channel LBRR flag is set */
                                 if (psEnc->state_Fxx[ 1 ].sCmn.LBRR_flags[ i ] == 0) {
-                                    silk_stereo_encode_mid_only( psRangeEnc, psEnc->sStereo.mid_only_flags[ i ] );
+                                    oaci_silk_stereo_encode_mid_only( psRangeEnc, psEnc->sStereo.mid_only_flags[ i ] );
                                 }
                             }
                             /* Use conditional coding if previous frame available */
@@ -403,8 +403,8 @@ oac_int silk_Encode(                                   /* O    Returns error cod
                             } else {
                                 condCoding = CODE_INDEPENDENTLY;
                             }
-                            silk_encode_indices( &psEnc->state_Fxx[ n ].sCmn, psRangeEnc, i, 1, condCoding );
-                            silk_encode_pulses( psRangeEnc, psEnc->state_Fxx[ n ].sCmn.indices_LBRR[i].signalType,
+                            oaci_silk_encode_indices( &psEnc->state_Fxx[ n ].sCmn, psRangeEnc, i, 1, condCoding );
+                            oaci_silk_encode_pulses( psRangeEnc, psEnc->state_Fxx[ n ].sCmn.indices_LBRR[i].signalType,
                             psEnc->state_Fxx[ n ].sCmn.indices_LBRR[i].quantOffsetType,
                                 psEnc->state_Fxx[ n ].sCmn.pulses_LBRR[ i ], psEnc->state_Fxx[ n ].sCmn.frame_length );
                         }
@@ -419,7 +419,7 @@ oac_int silk_Encode(                                   /* O    Returns error cod
                 curr_nBitsUsedLBRR = ec_tell( psRangeEnc ) - curr_nBitsUsedLBRR;
             }
 
-            silk_HP_variable_cutoff( psEnc->state_Fxx );
+            oaci_silk_HP_variable_cutoff( psEnc->state_Fxx );
 
             /* Total target bits for packet */
             nBits = silk_DIV32_16( silk_MUL( encControl->bitRate, encControl->payloadSize_ms ), 1000 );
@@ -458,7 +458,7 @@ oac_int silk_Encode(                                   /* O    Returns error cod
 
             /* Convert Left/Right to Mid/Side */
             if (encControl->nChannelsInternal == 2) {
-                silk_stereo_LR_to_MS( &psEnc->sStereo, &psEnc->state_Fxx[ 0 ].sCmn.inputBuf[ 2 ],
+                oaci_silk_stereo_LR_to_MS( &psEnc->sStereo, &psEnc->state_Fxx[ 0 ].sCmn.inputBuf[ 2 ],
                 &psEnc->state_Fxx[ 1 ].sCmn.inputBuf[ 2 ],
                     psEnc->sStereo.predIx[ psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded ],
                 &psEnc->sStereo.mid_only_flags[ psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded ],
@@ -488,10 +488,10 @@ oac_int silk_Encode(                                   /* O    Returns error cod
                     psEnc->state_Fxx[ 1 ].sCmn.VAD_flags[ psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded ] = 0;
                 }
                 if (!prefillFlag) {
-                    silk_stereo_encode_pred( psRangeEnc,
+                    oaci_silk_stereo_encode_pred( psRangeEnc,
                     psEnc->sStereo.predIx[ psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded ] );
                     if (psEnc->state_Fxx[ 1 ].sCmn.VAD_flags[ psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded ] == 0) {
-                        silk_stereo_encode_mid_only( psRangeEnc,
+                        oaci_silk_stereo_encode_mid_only( psRangeEnc,
                         psEnc->sStereo.mid_only_flags[ psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded ] );
                     }
                 }
@@ -534,7 +534,7 @@ oac_int silk_Encode(                                   /* O    Returns error cod
                 if (channelRate_bps > 0) {
                     oac_int condCoding;
 
-                    silk_control_SNR( &psEnc->state_Fxx[ n ].sCmn, channelRate_bps );
+                    oaci_silk_control_SNR( &psEnc->state_Fxx[ n ].sCmn, channelRate_bps );
 
                     /* Use independent coding if no previous frame available */
                     if (psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded - n <= 0) {
@@ -571,7 +571,7 @@ oac_int silk_Encode(                                   /* O    Returns error cod
                     flags |= psEnc->state_Fxx[ n ].sCmn.LBRR_flag;
                 }
                 if (!prefillFlag) {
-                    ec_enc_patch_initial_bits( psRangeEnc, flags,
+                    oaci_ec_enc_patch_initial_bits( psRangeEnc, flags,
                         (psEnc->state_Fxx[ 0 ].sCmn.nFramesPerPacket + 1)*encControl->nChannelsInternal );
                 }
 
@@ -625,7 +625,7 @@ oac_int silk_Encode(                                   /* O    Returns error cod
     }
 
     encControl->signalType = psEnc->state_Fxx[0].sCmn.indices.signalType;
-    encControl->offset = silk_Quantization_Offsets_Q10
+    encControl->offset = oaci_silk_Quantization_Offsets_Q10
                          [ psEnc->state_Fxx[0].sCmn.indices.signalType>>1 ]
                          [ psEnc->state_Fxx[0].sCmn.indices.quantOffsetType ];
     RESTORE_STACK;
diff --git a/silk/encode_indices.c b/silk/encode_indices.c
index 6158afd73..1c4d7e74d 100644
--- a/silk/encode_indices.c
+++ b/silk/encode_indices.c
@@ -32,7 +32,7 @@
 #include "main.h"
 
 /* Encode side-information parameters to payload */
-void silk_encode_indices(
+void oaci_silk_encode_indices(
     silk_encoder_state          *psEncC,                        /* I/O  Encoder state                               */
     ec_enc                      *psRangeEnc,                    /* I/O  Compressor data structure                   */
     oac_int FrameIndex,                                        /* I    Frame number                                */
@@ -58,9 +58,9 @@ void silk_encode_indices(
     celt_assert( typeOffset >= 0 && typeOffset < 6 );
     celt_assert( encode_LBRR == 0 || typeOffset >= 2 );
     if (encode_LBRR || typeOffset >= 2) {
-        ec_enc_icdf( psRangeEnc, typeOffset - 2, silk_type_offset_VAD_iCDF, 8 );
+        oaci_ec_enc_icdf( psRangeEnc, typeOffset - 2, oaci_silk_type_offset_VAD_iCDF, 8 );
     } else {
-        ec_enc_icdf( psRangeEnc, typeOffset, silk_type_offset_no_VAD_iCDF, 8 );
+        oaci_ec_enc_icdf( psRangeEnc, typeOffset, oaci_silk_type_offset_no_VAD_iCDF, 8 );
     }
 
     /****************/
@@ -71,40 +71,40 @@ void silk_encode_indices(
         /* conditional coding */
         silk_assert( psIndices->GainsIndices[ 0 ] >= 0
             && psIndices->GainsIndices[ 0 ] < MAX_DELTA_GAIN_QUANT - MIN_DELTA_GAIN_QUANT + 1 );
-        ec_enc_icdf( psRangeEnc, psIndices->GainsIndices[ 0 ], silk_delta_gain_iCDF, 8 );
+        oaci_ec_enc_icdf( psRangeEnc, psIndices->GainsIndices[ 0 ], oaci_silk_delta_gain_iCDF, 8 );
     } else {
         /* independent coding, in two stages: MSB bits followed by 3 LSBs */
         silk_assert( psIndices->GainsIndices[ 0 ] >= 0 && psIndices->GainsIndices[ 0 ] < N_LEVELS_QGAIN );
-        ec_enc_icdf( psRangeEnc, silk_RSHIFT( psIndices->GainsIndices[ 0 ], 3 ),
-        silk_gain_iCDF[ psIndices->signalType ], 8 );
-        ec_enc_icdf( psRangeEnc, psIndices->GainsIndices[ 0 ]&7, silk_uniform8_iCDF, 8 );
+        oaci_ec_enc_icdf( psRangeEnc, silk_RSHIFT( psIndices->GainsIndices[ 0 ], 3 ),
+        oaci_silk_gain_iCDF[ psIndices->signalType ], 8 );
+        oaci_ec_enc_icdf( psRangeEnc, psIndices->GainsIndices[ 0 ]&7, oaci_silk_uniform8_iCDF, 8 );
     }
 
     /* remaining subframes */
     for (i = 1; i < psEncC->nb_subfr; i++) {
         silk_assert( psIndices->GainsIndices[ i ] >= 0
             && psIndices->GainsIndices[ i ] < MAX_DELTA_GAIN_QUANT - MIN_DELTA_GAIN_QUANT + 1 );
-        ec_enc_icdf( psRangeEnc, psIndices->GainsIndices[ i ], silk_delta_gain_iCDF, 8 );
+        oaci_ec_enc_icdf( psRangeEnc, psIndices->GainsIndices[ i ], oaci_silk_delta_gain_iCDF, 8 );
     }
 
     /****************/
     /* Encode NLSFs */
     /****************/
-    ec_enc_icdf( psRangeEnc, psIndices->NLSFIndices[ 0 ],
+    oaci_ec_enc_icdf( psRangeEnc, psIndices->NLSFIndices[ 0 ],
     &psEncC->psNLSF_CB->CB1_iCDF[ (psIndices->signalType>>1)*psEncC->psNLSF_CB->nVectors ], 8 );
-    silk_NLSF_unpack( ec_ix, pred_Q8, psEncC->psNLSF_CB, psIndices->NLSFIndices[ 0 ] );
+    oaci_silk_NLSF_unpack( ec_ix, pred_Q8, psEncC->psNLSF_CB, psIndices->NLSFIndices[ 0 ] );
     celt_assert( psEncC->psNLSF_CB->order == psEncC->predictLPCOrder );
     for (i = 0; i < psEncC->psNLSF_CB->order; i++) {
         if (psIndices->NLSFIndices[ i + 1 ] >= NLSF_QUANT_MAX_AMPLITUDE) {
-            ec_enc_icdf( psRangeEnc, 2*NLSF_QUANT_MAX_AMPLITUDE, &psEncC->psNLSF_CB->ec_iCDF[ ec_ix[ i ] ], 8 );
-            ec_enc_icdf( psRangeEnc, psIndices->NLSFIndices[ i + 1 ] - NLSF_QUANT_MAX_AMPLITUDE, silk_NLSF_EXT_iCDF,
+            oaci_ec_enc_icdf( psRangeEnc, 2*NLSF_QUANT_MAX_AMPLITUDE, &psEncC->psNLSF_CB->ec_iCDF[ ec_ix[ i ] ], 8 );
+            oaci_ec_enc_icdf( psRangeEnc, psIndices->NLSFIndices[ i + 1 ] - NLSF_QUANT_MAX_AMPLITUDE, oaci_silk_NLSF_EXT_iCDF,
             8 );
         } else if (psIndices->NLSFIndices[ i + 1 ] <= -NLSF_QUANT_MAX_AMPLITUDE) {
-            ec_enc_icdf( psRangeEnc, 0, &psEncC->psNLSF_CB->ec_iCDF[ ec_ix[ i ] ], 8 );
-            ec_enc_icdf( psRangeEnc, -psIndices->NLSFIndices[ i + 1 ] - NLSF_QUANT_MAX_AMPLITUDE, silk_NLSF_EXT_iCDF,
+            oaci_ec_enc_icdf( psRangeEnc, 0, &psEncC->psNLSF_CB->ec_iCDF[ ec_ix[ i ] ], 8 );
+            oaci_ec_enc_icdf( psRangeEnc, -psIndices->NLSFIndices[ i + 1 ] - NLSF_QUANT_MAX_AMPLITUDE, oaci_silk_NLSF_EXT_iCDF,
             8 );
         } else {
-            ec_enc_icdf( psRangeEnc, psIndices->NLSFIndices[ i + 1 ] + NLSF_QUANT_MAX_AMPLITUDE,
+            oaci_ec_enc_icdf( psRangeEnc, psIndices->NLSFIndices[ i + 1 ] + NLSF_QUANT_MAX_AMPLITUDE,
             &psEncC->psNLSF_CB->ec_iCDF[ ec_ix[ i ] ], 8 );
         }
     }
@@ -112,7 +112,7 @@ void silk_encode_indices(
     /* Encode NLSF interpolation factor */
     if (psEncC->nb_subfr == MAX_NB_SUBFR) {
         silk_assert( psIndices->NLSFInterpCoef_Q2 >= 0 && psIndices->NLSFInterpCoef_Q2 < 5 );
-        ec_enc_icdf( psRangeEnc, psIndices->NLSFInterpCoef_Q2, silk_NLSF_interpolation_factor_iCDF, 8 );
+        oaci_ec_enc_icdf( psRangeEnc, psIndices->NLSFInterpCoef_Q2, oaci_silk_NLSF_interpolation_factor_iCDF, 8 );
     }
 
     if (psIndices->signalType == TYPE_VOICED) {
@@ -131,7 +131,7 @@ void silk_encode_indices(
                 encode_absolute_lagIndex = 0; /* Only use delta */
             }
             silk_assert( delta_lagIndex >= 0 && delta_lagIndex < 21 );
-            ec_enc_icdf( psRangeEnc, delta_lagIndex, silk_pitch_delta_iCDF, 8 );
+            oaci_ec_enc_icdf( psRangeEnc, delta_lagIndex, oaci_silk_pitch_delta_iCDF, 8 );
         }
         if (encode_absolute_lagIndex) {
             /* Absolute encoding */
@@ -140,8 +140,8 @@ void silk_encode_indices(
             pitch_low_bits = psIndices->lagIndex - silk_SMULBB( pitch_high_bits, silk_RSHIFT( psEncC->fs_kHz, 1 ));
             silk_assert( pitch_low_bits < psEncC->fs_kHz/2 );
             silk_assert( pitch_high_bits < 32 );
-            ec_enc_icdf( psRangeEnc, pitch_high_bits, silk_pitch_lag_iCDF, 8 );
-            ec_enc_icdf( psRangeEnc, pitch_low_bits, psEncC->pitch_lag_low_bits_iCDF, 8 );
+            oaci_ec_enc_icdf( psRangeEnc, pitch_high_bits, oaci_silk_pitch_lag_iCDF, 8 );
+            oaci_ec_enc_icdf( psRangeEnc, pitch_low_bits, psEncC->pitch_lag_low_bits_iCDF, 8 );
         }
         psEncC->ec_prevLagIndex = psIndices->lagIndex;
 
@@ -151,19 +151,19 @@ void silk_encode_indices(
             || (psIndices->contourIndex < 11 && psEncC->fs_kHz == 8 && psEncC->nb_subfr == 4)
             || (psIndices->contourIndex < 12 && psEncC->fs_kHz  > 8 && psEncC->nb_subfr == 2)
             || (psIndices->contourIndex <  3 && psEncC->fs_kHz == 8 && psEncC->nb_subfr == 2));
-        ec_enc_icdf( psRangeEnc, psIndices->contourIndex, psEncC->pitch_contour_iCDF, 8 );
+        oaci_ec_enc_icdf( psRangeEnc, psIndices->contourIndex, psEncC->pitch_contour_iCDF, 8 );
 
         /********************/
         /* Encode LTP gains */
         /********************/
         /* PERIndex value */
         silk_assert( psIndices->PERIndex >= 0 && psIndices->PERIndex < 3 );
-        ec_enc_icdf( psRangeEnc, psIndices->PERIndex, silk_LTP_per_index_iCDF, 8 );
+        oaci_ec_enc_icdf( psRangeEnc, psIndices->PERIndex, oaci_silk_LTP_per_index_iCDF, 8 );
 
         /* Codebook Indices */
         for (k = 0; k < psEncC->nb_subfr; k++) {
             silk_assert( psIndices->LTPIndex[ k ] >= 0 && psIndices->LTPIndex[ k ] < (8<<psIndices->PERIndex));
-            ec_enc_icdf( psRangeEnc, psIndices->LTPIndex[ k ], silk_LTP_gain_iCDF_ptrs[ psIndices->PERIndex ], 8 );
+            oaci_ec_enc_icdf( psRangeEnc, psIndices->LTPIndex[ k ], oaci_silk_LTP_gain_iCDF_ptrs[ psIndices->PERIndex ], 8 );
         }
 
         /**********************/
@@ -171,7 +171,7 @@ void silk_encode_indices(
         /**********************/
         if (condCoding == CODE_INDEPENDENTLY) {
             silk_assert( psIndices->LTP_scaleIndex >= 0 && psIndices->LTP_scaleIndex < 3 );
-            ec_enc_icdf( psRangeEnc, psIndices->LTP_scaleIndex, silk_LTPscale_iCDF, 8 );
+            oaci_ec_enc_icdf( psRangeEnc, psIndices->LTP_scaleIndex, oaci_silk_LTPscale_iCDF, 8 );
         }
         silk_assert( !condCoding || psIndices->LTP_scaleIndex == 0 );
     }
@@ -182,5 +182,5 @@ void silk_encode_indices(
     /* Encode seed */
     /***************/
     silk_assert( psIndices->Seed >= 0 && psIndices->Seed < 4 );
-    ec_enc_icdf( psRangeEnc, psIndices->Seed, silk_uniform4_iCDF, 8 );
+    oaci_ec_enc_icdf( psRangeEnc, psIndices->Seed, oaci_silk_uniform4_iCDF, 8 );
 }
diff --git a/silk/encode_pulses.c b/silk/encode_pulses.c
index c7364deab..fe8fe8f08 100644
--- a/silk/encode_pulses.c
+++ b/silk/encode_pulses.c
@@ -56,7 +56,7 @@ static OAC_INLINE oac_int combine_and_check(    /* return ok
 }
 
 /* Encode quantization indices of excitation */
-void silk_encode_pulses(
+void oaci_silk_encode_pulses(
     ec_enc                      *psRangeEnc,                    /* I/O  compressor data structure                   */
     const oac_int signalType,                                  /* I    Signal type                                 */
     const oac_int quantOffsetType,                             /* I    quantOffsetType                             */
@@ -108,13 +108,13 @@ void silk_encode_pulses(
 
         while (1) {
             /* 1+1 -> 2 */
-            scale_down = combine_and_check( pulses_comb, abs_pulses_ptr, silk_max_pulses_table[ 0 ], 8 );
+            scale_down = combine_and_check( pulses_comb, abs_pulses_ptr, oaci_silk_max_pulses_table[ 0 ], 8 );
             /* 2+2 -> 4 */
-            scale_down += combine_and_check( pulses_comb, pulses_comb, silk_max_pulses_table[ 1 ], 4 );
+            scale_down += combine_and_check( pulses_comb, pulses_comb, oaci_silk_max_pulses_table[ 1 ], 4 );
             /* 4+4 -> 8 */
-            scale_down += combine_and_check( pulses_comb, pulses_comb, silk_max_pulses_table[ 2 ], 2 );
+            scale_down += combine_and_check( pulses_comb, pulses_comb, oaci_silk_max_pulses_table[ 2 ], 2 );
             /* 8+8 -> 16 */
-            scale_down += combine_and_check( &sum_pulses[ i ], pulses_comb, silk_max_pulses_table[ 3 ], 1 );
+            scale_down += combine_and_check( &sum_pulses[ i ], pulses_comb, oaci_silk_max_pulses_table[ 3 ], 1 );
 
             if (scale_down) {
                 /* We need to downscale the quantization signal */
@@ -136,8 +136,8 @@ void silk_encode_pulses(
     /* find rate level that leads to fewest bits for coding of pulses per block info */
     minSumBits_Q5 = silk_int32_MAX;
     for (k = 0; k < N_RATE_LEVELS - 1; k++) {
-        nBits_ptr  = silk_pulses_per_block_BITS_Q5[ k ];
-        sumBits_Q5 = silk_rate_levels_BITS_Q5[ signalType>>1 ][ k ];
+        nBits_ptr  = oaci_silk_pulses_per_block_BITS_Q5[ k ];
+        sumBits_Q5 = oaci_silk_rate_levels_BITS_Q5[ signalType>>1 ][ k ];
         for (i = 0; i < iter; i++) {
             if (nRshifts[ i ] > 0) {
                 sumBits_Q5 += nBits_ptr[ SILK_MAX_PULSES + 1 ];
@@ -150,21 +150,21 @@ void silk_encode_pulses(
             RateLevelIndex = k;
         }
     }
-    ec_enc_icdf( psRangeEnc, RateLevelIndex, silk_rate_levels_iCDF[ signalType>>1 ], 8 );
+    oaci_ec_enc_icdf( psRangeEnc, RateLevelIndex, oaci_silk_rate_levels_iCDF[ signalType>>1 ], 8 );
 
     /***************************************************/
     /* Sum-Weighted-Pulses Encoding                    */
     /***************************************************/
-    cdf_ptr = silk_pulses_per_block_iCDF[ RateLevelIndex ];
+    cdf_ptr = oaci_silk_pulses_per_block_iCDF[ RateLevelIndex ];
     for (i = 0; i < iter; i++) {
         if (nRshifts[ i ] == 0) {
-            ec_enc_icdf( psRangeEnc, sum_pulses[ i ], cdf_ptr, 8 );
+            oaci_ec_enc_icdf( psRangeEnc, sum_pulses[ i ], cdf_ptr, 8 );
         } else {
-            ec_enc_icdf( psRangeEnc, SILK_MAX_PULSES + 1, cdf_ptr, 8 );
+            oaci_ec_enc_icdf( psRangeEnc, SILK_MAX_PULSES + 1, cdf_ptr, 8 );
             for (k = 0; k < nRshifts[ i ] - 1; k++) {
-                ec_enc_icdf( psRangeEnc, SILK_MAX_PULSES + 1, silk_pulses_per_block_iCDF[ N_RATE_LEVELS - 1 ], 8 );
+                oaci_ec_enc_icdf( psRangeEnc, SILK_MAX_PULSES + 1, oaci_silk_pulses_per_block_iCDF[ N_RATE_LEVELS - 1 ], 8 );
             }
-            ec_enc_icdf( psRangeEnc, sum_pulses[ i ], silk_pulses_per_block_iCDF[ N_RATE_LEVELS - 1 ], 8 );
+            oaci_ec_enc_icdf( psRangeEnc, sum_pulses[ i ], oaci_silk_pulses_per_block_iCDF[ N_RATE_LEVELS - 1 ], 8 );
         }
     }
 
@@ -173,7 +173,7 @@ void silk_encode_pulses(
     /******************/
     for (i = 0; i < iter; i++) {
         if (sum_pulses[ i ] > 0) {
-            silk_shell_encoder( psRangeEnc, &abs_pulses[ i*SHELL_CODEC_FRAME_LENGTH ] );
+            oaci_silk_shell_encoder( psRangeEnc, &abs_pulses[ i*SHELL_CODEC_FRAME_LENGTH ] );
         }
     }
 
@@ -188,10 +188,10 @@ void silk_encode_pulses(
                 abs_q = (oac_int8)silk_abs( pulses_ptr[ k ] );
                 for (j = nLS; j > 0; j--) {
                     bit = silk_RSHIFT( abs_q, j )&1;
-                    ec_enc_icdf( psRangeEnc, bit, silk_lsb_iCDF, 8 );
+                    oaci_ec_enc_icdf( psRangeEnc, bit, oaci_silk_lsb_iCDF, 8 );
                 }
                 bit = abs_q&1;
-                ec_enc_icdf( psRangeEnc, bit, silk_lsb_iCDF, 8 );
+                oaci_ec_enc_icdf( psRangeEnc, bit, oaci_silk_lsb_iCDF, 8 );
             }
         }
     }
@@ -199,6 +199,6 @@ void silk_encode_pulses(
     /****************/
     /* Encode signs */
     /****************/
-    silk_encode_signs( psRangeEnc, pulses, frame_length, signalType, quantOffsetType, sum_pulses );
+    oaci_silk_encode_signs( psRangeEnc, pulses, frame_length, signalType, quantOffsetType, sum_pulses );
     RESTORE_STACK;
 }
diff --git a/silk/fixed/LTP_analysis_filter_FIX.c b/silk/fixed/LTP_analysis_filter_FIX.c
index 8fa52e7b0..634164f8e 100644
--- a/silk/fixed/LTP_analysis_filter_FIX.c
+++ b/silk/fixed/LTP_analysis_filter_FIX.c
@@ -31,7 +31,7 @@
 
 #include "main_FIX.h"
 
-void silk_LTP_analysis_filter_FIX(
+void oaci_silk_LTP_analysis_filter_FIX(
     oac_int16                      *LTP_res,                               /* O    LTP residual signal of length MAX_NB_SUBFR * ( pre_length + subfr_length )  */
     const oac_int16                *x,                                     /* I    Pointer to input signal with at least max( pitchL ) preceding samples       */
     const oac_int16 LTPCoef_Q14[ LTP_ORDER*MAX_NB_SUBFR ],                 /* I    LTP_ORDER LTP coefficients for each MAX_NB_SUBFR subframe                   */
diff --git a/silk/fixed/LTP_scale_ctrl_FIX.c b/silk/fixed/LTP_scale_ctrl_FIX.c
index 7a4d359dd..aabe518fe 100644
--- a/silk/fixed/LTP_scale_ctrl_FIX.c
+++ b/silk/fixed/LTP_scale_ctrl_FIX.c
@@ -32,7 +32,7 @@
 #include "main_FIX.h"
 
 /* Calculation of LTP state scaling */
-void silk_LTP_scale_ctrl_FIX(
+void oaci_silk_LTP_scale_ctrl_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  encoder control                                                             */
     oac_int condCoding                                                     /* I    The type of conditional coding to use                                       */
@@ -48,12 +48,12 @@ void silk_LTP_scale_ctrl_FIX(
             round_loss = 2 + silk_SMULBB( round_loss, round_loss )/100;
         }
         psEnc->sCmn.indices.LTP_scaleIndex = silk_SMULBB( psEncCtrl->LTPredCodGain_Q7,
-        round_loss ) > silk_log2lin( 128*7 + 2900 - psEnc->sCmn.SNR_dB_Q7 );
+        round_loss ) > oaci_silk_log2lin( 128*7 + 2900 - psEnc->sCmn.SNR_dB_Q7 );
         psEnc->sCmn.indices.LTP_scaleIndex += silk_SMULBB( psEncCtrl->LTPredCodGain_Q7,
-        round_loss ) > silk_log2lin( 128*7 + 3900 - psEnc->sCmn.SNR_dB_Q7 );
+        round_loss ) > oaci_silk_log2lin( 128*7 + 3900 - psEnc->sCmn.SNR_dB_Q7 );
     } else {
         /* Default is minimum scaling */
         psEnc->sCmn.indices.LTP_scaleIndex = 0;
     }
-    psEncCtrl->LTP_scale_Q14 = silk_LTPScales_table_Q14[ psEnc->sCmn.indices.LTP_scaleIndex ];
+    psEncCtrl->LTP_scale_Q14 = oaci_silk_LTPScales_table_Q14[ psEnc->sCmn.indices.LTP_scaleIndex ];
 }
diff --git a/silk/fixed/apply_sine_window_FIX.c b/silk/fixed/apply_sine_window_FIX.c
index 3711ce07b..725189bf4 100644
--- a/silk/fixed/apply_sine_window_FIX.c
+++ b/silk/fixed/apply_sine_window_FIX.c
@@ -47,7 +47,7 @@ static const oac_int16 freq_table_Q16[ 27 ] = {
     2313,    2214,    2123,    2038,    1961,    1889,    1822,    1760,    1702,
 };
 
-void silk_apply_sine_window(
+void oaci_silk_apply_sine_window(
     oac_int16 px_win[],                            /* O    Pointer to windowed signal                                  */
     const oac_int16 px[],                          /* I    Pointer to input signal                                     */
     const oac_int win_type,                        /* I    Selects a window type                                       */
diff --git a/silk/fixed/arm/warped_autocorrelation_FIX_arm.h b/silk/fixed/arm/warped_autocorrelation_FIX_arm.h
index 546fa90e2..12e9339a8 100644
--- a/silk/fixed/arm/warped_autocorrelation_FIX_arm.h
+++ b/silk/fixed/arm/warped_autocorrelation_FIX_arm.h
@@ -33,7 +33,7 @@
 #if defined(FIXED_POINT)
 
 # if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
-void silk_warped_autocorrelation_FIX_neon(
+void oaci_silk_warped_autocorrelation_FIX_neon(
     oac_int32                *corr,                                        /* O    Result [order + 1]                                                          */
     oac_int                  *scale,                                       /* O    Scaling of the correlation vector                                           */
     const oac_int16                *input,                                 /* I    Input data to correlate                                                     */
@@ -43,24 +43,24 @@ void silk_warped_autocorrelation_FIX_neon(
     );
 
 #  if !defined(OAC_HAVE_RTCD) && defined(OAC_ARM_PRESUME_NEON)
-#   define OVERRIDE_silk_warped_autocorrelation_FIX (1)
-#   define silk_warped_autocorrelation_FIX(corr, scale, input, warping_Q16, length, order, arch) \
-        ((void)(arch), PRESUME_NEON(silk_warped_autocorrelation_FIX)(corr, scale, input, warping_Q16, length, order))
+#   define OVERRIDE_oaci_silk_warped_autocorrelation_FIX (1)
+#   define oaci_silk_warped_autocorrelation_FIX(corr, scale, input, warping_Q16, length, order, arch) \
+        ((void)(arch), PRESUME_NEON(oaci_silk_warped_autocorrelation_FIX)(corr, scale, input, warping_Q16, length, order))
 #  endif
 # endif
 
-# if !defined(OVERRIDE_silk_warped_autocorrelation_FIX)
+# if !defined(OVERRIDE_oaci_silk_warped_autocorrelation_FIX)
 /*Is run-time CPU detection enabled on this platform?*/
 #  if defined(OAC_HAVE_RTCD) && (defined(OAC_ARM_MAY_HAVE_NEON_INTR) && !defined(OAC_ARM_PRESUME_NEON_INTR))
 extern void (*const SILK_WARPED_AUTOCORRELATION_FIX_IMPL[OAC_ARCHMASK + 1])(oac_int32*, oac_int*, const oac_int16*,
 const oac_int, const oac_int, const oac_int);
-#   define OVERRIDE_silk_warped_autocorrelation_FIX (1)
-#   define silk_warped_autocorrelation_FIX(corr, scale, input, warping_Q16, length, order, arch) \
+#   define OVERRIDE_oaci_silk_warped_autocorrelation_FIX (1)
+#   define oaci_silk_warped_autocorrelation_FIX(corr, scale, input, warping_Q16, length, order, arch) \
         ((*SILK_WARPED_AUTOCORRELATION_FIX_IMPL[(arch)&OAC_ARCHMASK])(corr, scale, input, warping_Q16, length, order))
 #  elif defined(OAC_ARM_PRESUME_NEON_INTR)
-#   define OVERRIDE_silk_warped_autocorrelation_FIX (1)
-#   define silk_warped_autocorrelation_FIX(corr, scale, input, warping_Q16, length, order, arch) \
-        ((void)(arch), silk_warped_autocorrelation_FIX_neon(corr, scale, input, warping_Q16, length, order))
+#   define OVERRIDE_oaci_silk_warped_autocorrelation_FIX (1)
+#   define oaci_silk_warped_autocorrelation_FIX(corr, scale, input, warping_Q16, length, order, arch) \
+        ((void)(arch), oaci_silk_warped_autocorrelation_FIX_neon(corr, scale, input, warping_Q16, length, order))
 #  endif
 # endif
 
diff --git a/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c b/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c
index 7f84aa6a1..8aa3a35dc 100644
--- a/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c
+++ b/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c
@@ -57,7 +57,7 @@ static OAC_INLINE int32x4_t calc_state( const int32x4_t state_QS0_s32x4, const i
     return vaddq_s32( state_QS1_1_s32x4, t_s32x4 );
 }
 
-void silk_warped_autocorrelation_FIX_neon(
+void oaci_silk_warped_autocorrelation_FIX_neon(
     oac_int32                *corr,                                        /* O    Result [order + 1]                                                          */
     oac_int                  *scale,                                       /* O    Scaling of the correlation vector                                           */
     const oac_int16                *input,                                 /* I    Input data to correlate                                                     */
@@ -66,7 +66,7 @@ void silk_warped_autocorrelation_FIX_neon(
     const oac_int order                                                    /* I    Correlation order (even)                                                    */
     ) {
     if ((MAX_SHAPE_LPC_ORDER > 24) || (order < 6)) {
-        silk_warped_autocorrelation_FIX_c( corr, scale, input, warping_Q16, length, order );
+        oaci_silk_warped_autocorrelation_FIX_c( corr, scale, input, warping_Q16, length, order );
     } else {
         oac_int n, i, lsh;
         oac_int64 corr_QC[ MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };     /* In reverse order */
@@ -259,7 +259,7 @@ void silk_warped_autocorrelation_FIX_neon(
     {
         oac_int32 corr_c[ MAX_SHAPE_LPC_ORDER + 1 ];
         oac_int scale_c;
-        silk_warped_autocorrelation_FIX_c( corr_c, &scale_c, input, warping_Q16, length, order );
+        oaci_silk_warped_autocorrelation_FIX_c( corr_c, &scale_c, input, warping_Q16, length, order );
         silk_assert( !memcmp( corr_c, corr, sizeof(corr_c[ 0 ])*(order + 1)));
         silk_assert( scale_c == *scale );
     }
diff --git a/silk/fixed/autocorr_FIX.c b/silk/fixed/autocorr_FIX.c
index 85be77921..5df1d9ac3 100644
--- a/silk/fixed/autocorr_FIX.c
+++ b/silk/fixed/autocorr_FIX.c
@@ -33,7 +33,7 @@
 #include "celt_lpc.h"
 
 /* Compute autocorrelation */
-void silk_autocorr(
+void oaci_silk_autocorr(
     oac_int32                  *results,           /* O    Result (length correlationCount)                            */
     oac_int                    *scale,             /* O    Scaling of the correlation vector                           */
     const oac_int16            *inputData,         /* I    Input data to correlate                                     */
@@ -43,5 +43,5 @@ void silk_autocorr(
     ) {
     oac_int corrCount;
     corrCount = silk_min_int( inputDataSize, correlationCount );
-    *scale = _celt_autocorr(inputData, results, NULL, 0, corrCount - 1, inputDataSize, arch);
+    *scale = oaci_celt_autocorr(inputData, results, NULL, 0, corrCount - 1, inputDataSize, arch);
 }
diff --git a/silk/fixed/burg_modified_FIX.c b/silk/fixed/burg_modified_FIX.c
index ec67c72c6..0decf84d1 100644
--- a/silk/fixed/burg_modified_FIX.c
+++ b/silk/fixed/burg_modified_FIX.c
@@ -42,7 +42,7 @@
 #define MAX_RSHIFTS                 (32 - QA)
 
 /* Compute reflection coefficients from input signal */
-void silk_burg_modified_c(
+void oaci_silk_burg_modified_c(
     oac_int32                  *res_nrg,           /* O    Residual energy                                             */
     oac_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
     oac_int32 A_Q16[],                             /* O    Prediction coefficients (length order)                      */
@@ -67,7 +67,7 @@ void silk_burg_modified_c(
     celt_assert( subfr_length*nb_subfr <= MAX_FRAME_SIZE );
 
     /* Compute autocorrelations, added over subframes */
-    C0_64 = silk_inner_prod16( x, x, subfr_length*nb_subfr, arch );
+    C0_64 = oaci_silk_inner_prod16( x, x, subfr_length*nb_subfr, arch );
     lz = silk_CLZ64(C0_64);
     rshifts = 32 + 1 + N_BITS_HEAD_ROOM - lz;
     if (rshifts > MAX_RSHIFTS) rshifts = MAX_RSHIFTS;
@@ -86,7 +86,7 @@ void silk_burg_modified_c(
             x_ptr = x + s*subfr_length;
             for (n = 1; n < D + 1; n++) {
                 C_first_row[ n - 1 ] += (oac_int32)silk_RSHIFT64(
-                    silk_inner_prod16( x_ptr, x_ptr + n, subfr_length - n, arch ), rshifts );
+                    oaci_silk_inner_prod16( x_ptr, x_ptr + n, subfr_length - n, arch ), rshifts );
             }
         }
     } else {
@@ -94,7 +94,7 @@ void silk_burg_modified_c(
             int i;
             oac_int32 d;
             x_ptr = x + s*subfr_length;
-            celt_pitch_xcorr(x_ptr, x_ptr + 1, xcorr, subfr_length - D, D, arch );
+            oaci_celt_pitch_xcorr(x_ptr, x_ptr + 1, xcorr, subfr_length - D, D, arch );
             for (n = 1; n < D + 1; n++) {
                 for (i = n + subfr_length - D, d = 0; i < subfr_length; i++)
                     d = MAC16_16( d, x_ptr[ i ], x_ptr[ i - n ] );
@@ -252,12 +252,12 @@ void silk_burg_modified_c(
         if (rshifts > 0) {
             for (s = 0; s < nb_subfr; s++) {
                 x_ptr = x + s*subfr_length;
-                C0 -= (oac_int32)silk_RSHIFT64( silk_inner_prod16( x_ptr, x_ptr, D, arch ), rshifts );
+                C0 -= (oac_int32)silk_RSHIFT64( oaci_silk_inner_prod16( x_ptr, x_ptr, D, arch ), rshifts );
             }
         } else {
             for (s = 0; s < nb_subfr; s++) {
                 x_ptr = x + s*subfr_length;
-                C0 -= silk_LSHIFT32( silk_inner_prod_aligned( x_ptr, x_ptr, D, arch), -rshifts);
+                C0 -= silk_LSHIFT32( oaci_silk_inner_prod_aligned( x_ptr, x_ptr, D, arch), -rshifts);
             }
         }
         /* Approximate residual energy */
diff --git a/silk/fixed/corrMatrix_FIX.c b/silk/fixed/corrMatrix_FIX.c
index d27ddd20d..b1dfe68ec 100644
--- a/silk/fixed/corrMatrix_FIX.c
+++ b/silk/fixed/corrMatrix_FIX.c
@@ -36,7 +36,7 @@
 #include "main_FIX.h"
 
 /* Calculates correlation vector X'*t */
-void silk_corrVector_FIX(
+void oaci_silk_corrVector_FIX(
     const oac_int16                *x,                                     /* I    x vector [L + order - 1] used to form data matrix X                         */
     const oac_int16                *t,                                     /* I    Target vector [L]                                                           */
     const oac_int L,                                                       /* I    Length of vectors                                                           */
@@ -65,14 +65,14 @@ void silk_corrVector_FIX(
     } else {
         silk_assert( rshifts == 0 );
         for (lag = 0; lag < order; lag++) {
-            Xt[ lag ] = silk_inner_prod_aligned( ptr1, ptr2, L, arch ); /* X[:,lag]'*t */
+            Xt[ lag ] = oaci_silk_inner_prod_aligned( ptr1, ptr2, L, arch ); /* X[:,lag]'*t */
             ptr1--; /* Go to next column of X */
         }
     }
 }
 
 /* Calculates correlation matrix X'*X */
-void silk_corrMatrix_FIX(
+void oaci_silk_corrMatrix_FIX(
     const oac_int16                *x,                                     /* I    x vector [L + order - 1] used to form data matrix X                         */
     const oac_int L,                                                       /* I    Length of vectors                                                           */
     const oac_int order,                                                   /* I    Max lag for correlation                                                     */
@@ -86,7 +86,7 @@ void silk_corrMatrix_FIX(
     const oac_int16 *ptr1, *ptr2;
 
     /* Calculate energy to find shift used to fit in 32 bits */
-    silk_sum_sqr_shift( nrg, rshifts, x, L + order - 1 );
+    oaci_silk_sum_sqr_shift( nrg, rshifts, x, L + order - 1 );
     energy = *nrg;
 
     /* Calculate energy of first column (0) of X: X[:,0]'*X[:,0] */
@@ -131,7 +131,7 @@ void silk_corrMatrix_FIX(
     } else {
         for (lag = 1; lag < order; lag++) {
             /* Inner product of column 0 and column lag: X[:,0]'*X[:,lag] */
-            energy = silk_inner_prod_aligned( ptr1, ptr2, L, arch );
+            energy = oaci_silk_inner_prod_aligned( ptr1, ptr2, L, arch );
             matrix_ptr( XX, lag, 0, order ) = energy;
             matrix_ptr( XX, 0, lag, order ) = energy;
             /* Calculate remaining off diagonal: X[:,j]'*X[:,j + lag] */
diff --git a/silk/fixed/encode_frame_FIX.c b/silk/fixed/encode_frame_FIX.c
index b29f06492..3a780049f 100644
--- a/silk/fixed/encode_frame_FIX.c
+++ b/silk/fixed/encode_frame_FIX.c
@@ -42,7 +42,7 @@ static OAC_INLINE void silk_LBRR_encode_FIX(
     oac_int condCoding                                                     /* I    The type of conditional coding used so far for this frame                   */
     );
 
-void silk_encode_do_VAD_FIX(
+void oaci_silk_encode_do_VAD_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
     oac_int activity                                                       /* I    Decision of Oac voice activity detector                                    */
     ) {
@@ -51,7 +51,7 @@ void silk_encode_do_VAD_FIX(
     /****************************/
     /* Voice Activity Detection */
     /****************************/
-    silk_VAD_GetSA_Q8( &psEnc->sCmn, psEnc->sCmn.inputBuf + 1, psEnc->sCmn.arch );
+    oaci_silk_VAD_GetSA_Q8( &psEnc->sCmn, psEnc->sCmn.inputBuf + 1, psEnc->sCmn.arch );
     /* If Oac VAD is inactive and Silk VAD is active: lower Silk VAD to just under the threshold */
     if (activity == VAD_NO_ACTIVITY && psEnc->sCmn.speech_activity_Q8 >= activity_threshold) {
         psEnc->sCmn.speech_activity_Q8 = activity_threshold - 1;
@@ -81,7 +81,7 @@ void silk_encode_do_VAD_FIX(
 /****************/
 /* Encode frame */
 /****************/
-oac_int silk_encode_frame_FIX(
+oac_int oaci_silk_encode_frame_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
     oac_int32                      *pnBytesOut,                            /* O    Pointer to number of payload bytes;                                         */
     ec_enc                          *psRangeEnc,                            /* I/O  compressor data structure                                                   */
@@ -126,7 +126,7 @@ oac_int silk_encode_frame_FIX(
     /***************************************/
     /* Ensure smooth bandwidth transitions */
     /***************************************/
-    silk_LP_variable_cutoff( &psEnc->sCmn.sLP, psEnc->sCmn.inputBuf + 1, psEnc->sCmn.frame_length );
+    oaci_silk_LP_variable_cutoff( &psEnc->sCmn.sLP, psEnc->sCmn.inputBuf + 1, psEnc->sCmn.frame_length );
 
     /*******************************************/
     /* Copy new frame to front of input buffer */
@@ -148,22 +148,22 @@ oac_int silk_encode_frame_FIX(
         /*****************************************/
         /* Find pitch lags, initial LPC analysis */
         /*****************************************/
-        silk_find_pitch_lags_FIX( psEnc, &sEncCtrl, res_pitch, x_frame - psEnc->sCmn.ltp_mem_length, psEnc->sCmn.arch );
+        oaci_silk_find_pitch_lags_FIX( psEnc, &sEncCtrl, res_pitch, x_frame - psEnc->sCmn.ltp_mem_length, psEnc->sCmn.arch );
 
         /************************/
         /* Noise shape analysis */
         /************************/
-        silk_noise_shape_analysis_FIX( psEnc, &sEncCtrl, res_pitch_frame, x_frame, psEnc->sCmn.arch );
+        oaci_silk_noise_shape_analysis_FIX( psEnc, &sEncCtrl, res_pitch_frame, x_frame, psEnc->sCmn.arch );
 
         /***************************************************/
         /* Find linear prediction coefficients (LPC + LTP) */
         /***************************************************/
-        silk_find_pred_coefs_FIX( psEnc, &sEncCtrl, res_pitch_frame, x_frame, condCoding );
+        oaci_silk_find_pred_coefs_FIX( psEnc, &sEncCtrl, res_pitch_frame, x_frame, condCoding );
 
         /****************************************/
         /* Process gains                        */
         /****************************************/
-        silk_process_gains_FIX( psEnc, &sEncCtrl, condCoding );
+        oaci_silk_process_gains_FIX( psEnc, &sEncCtrl, condCoding );
 
         /****************************************/
         /* Low Bitrate Redundant Encoding       */
@@ -175,7 +175,7 @@ oac_int silk_encode_frame_FIX(
         gainMult_Q8 = SILK_FIX_CONST( 1, 8 );
         found_lower = 0;
         found_upper = 0;
-        gainsID = silk_gains_ID( psEnc->sCmn.indices.GainsIndices, psEnc->sCmn.nb_subfr );
+        gainsID = oaci_silk_gains_ID( psEnc->sCmn.indices.GainsIndices, psEnc->sCmn.nb_subfr );
         gainsID_lower = -1;
         gainsID_upper = -1;
         /* Copy part of the input state */
@@ -204,7 +204,7 @@ oac_int silk_encode_frame_FIX(
                 /* Noise shaping quantization            */
                 /*****************************************/
                 if (psEnc->sCmn.nStatesDelayedDecision > 1 || psEnc->sCmn.warping_Q16 > 0) {
-                    silk_NSQ_del_dec( &psEnc->sCmn, &psEnc->sCmn.sNSQ, &psEnc->sCmn.indices, x_frame,
+                    oaci_silk_NSQ_del_dec( &psEnc->sCmn, &psEnc->sCmn.sNSQ, &psEnc->sCmn.indices, x_frame,
                     psEnc->sCmn.pulses,
                            sEncCtrl.PredCoef_Q12[ 0 ], sEncCtrl.LTPCoef_Q14, sEncCtrl.AR_Q13,
                     sEncCtrl.HarmShapeGain_Q14,
@@ -212,7 +212,7 @@ oac_int silk_encode_frame_FIX(
                     sEncCtrl.Lambda_Q10, sEncCtrl.LTP_scale_Q14,
                            psEnc->sCmn.arch );
                 } else {
-                    silk_NSQ( &psEnc->sCmn, &psEnc->sCmn.sNSQ, &psEnc->sCmn.indices, x_frame, psEnc->sCmn.pulses,
+                    oaci_silk_NSQ( &psEnc->sCmn, &psEnc->sCmn.sNSQ, &psEnc->sCmn.indices, x_frame, psEnc->sCmn.pulses,
                             sEncCtrl.PredCoef_Q12[ 0 ], sEncCtrl.LTPCoef_Q14, sEncCtrl.AR_Q13,
                     sEncCtrl.HarmShapeGain_Q14,
                             sEncCtrl.Tilt_Q14, sEncCtrl.LF_shp_Q14, sEncCtrl.Gains_Q16, sEncCtrl.pitchL,
@@ -227,12 +227,12 @@ oac_int silk_encode_frame_FIX(
                 /****************************************/
                 /* Encode Parameters                    */
                 /****************************************/
-                silk_encode_indices( &psEnc->sCmn, psRangeEnc, psEnc->sCmn.nFramesEncoded, 0, condCoding );
+                oaci_silk_encode_indices( &psEnc->sCmn, psRangeEnc, psEnc->sCmn.nFramesEncoded, 0, condCoding );
 
                 /****************************************/
                 /* Encode Excitation Signal             */
                 /****************************************/
-                silk_encode_pulses( psRangeEnc, psEnc->sCmn.indices.signalType, psEnc->sCmn.indices.quantOffsetType,
+                oaci_silk_encode_pulses( psRangeEnc, psEnc->sCmn.indices.signalType, psEnc->sCmn.indices.quantOffsetType,
                     psEnc->sCmn.pulses, psEnc->sCmn.frame_length );
 
                 nBits = ec_tell( psRangeEnc );
@@ -256,9 +256,9 @@ oac_int silk_encode_frame_FIX(
                         psEnc->sCmn.pulses[ i ] = 0;
                     }
 
-                    silk_encode_indices( &psEnc->sCmn, psRangeEnc, psEnc->sCmn.nFramesEncoded, 0, condCoding );
+                    oaci_silk_encode_indices( &psEnc->sCmn, psRangeEnc, psEnc->sCmn.nFramesEncoded, 0, condCoding );
 
-                    silk_encode_pulses( psRangeEnc, psEnc->sCmn.indices.signalType, psEnc->sCmn.indices.quantOffsetType,
+                    oaci_silk_encode_pulses( psRangeEnc, psEnc->sCmn.indices.signalType, psEnc->sCmn.indices.quantOffsetType,
                         psEnc->sCmn.pulses, psEnc->sCmn.frame_length );
 
                     nBits = ec_tell( psRangeEnc );
@@ -358,11 +358,11 @@ oac_int silk_encode_frame_FIX(
 
             /* Quantize gains */
             psEnc->sShape.LastGainIndex = sEncCtrl.lastGainIndexPrev;
-            silk_gains_quant( psEnc->sCmn.indices.GainsIndices, sEncCtrl.Gains_Q16,
+            oaci_silk_gains_quant( psEnc->sCmn.indices.GainsIndices, sEncCtrl.Gains_Q16,
                   &psEnc->sShape.LastGainIndex, condCoding == CODE_CONDITIONALLY, psEnc->sCmn.nb_subfr );
 
             /* Unique identifier of gains vector */
-            gainsID = silk_gains_ID( psEnc->sCmn.indices.GainsIndices, psEnc->sCmn.nb_subfr );
+            gainsID = oaci_silk_gains_ID( psEnc->sCmn.indices.GainsIndices, psEnc->sCmn.nb_subfr );
         }
     }
 
@@ -433,21 +433,21 @@ static OAC_INLINE void silk_LBRR_encode_FIX(
 
         /* Decode to get gains in sync with decoder         */
         /* Overwrite unquantized gains with quantized gains */
-        silk_gains_dequant( psEncCtrl->Gains_Q16, psIndices_LBRR->GainsIndices,
+        oaci_silk_gains_dequant( psEncCtrl->Gains_Q16, psIndices_LBRR->GainsIndices,
             &psEnc->sCmn.LBRRprevLastGainIndex, condCoding == CODE_CONDITIONALLY, psEnc->sCmn.nb_subfr );
 
         /*****************************************/
         /* Noise shaping quantization            */
         /*****************************************/
         if (psEnc->sCmn.nStatesDelayedDecision > 1 || psEnc->sCmn.warping_Q16 > 0) {
-            silk_NSQ_del_dec( &psEnc->sCmn, &sNSQ_LBRR[0], psIndices_LBRR, x16,
+            oaci_silk_NSQ_del_dec( &psEnc->sCmn, &sNSQ_LBRR[0], psIndices_LBRR, x16,
                 psEnc->sCmn.pulses_LBRR[ psEnc->sCmn.nFramesEncoded ], psEncCtrl->PredCoef_Q12[ 0 ],
             psEncCtrl->LTPCoef_Q14,
                 psEncCtrl->AR_Q13, psEncCtrl->HarmShapeGain_Q14, psEncCtrl->Tilt_Q14, psEncCtrl->LF_shp_Q14,
                 psEncCtrl->Gains_Q16, psEncCtrl->pitchL, psEncCtrl->Lambda_Q10, psEncCtrl->LTP_scale_Q14,
             psEnc->sCmn.arch );
         } else {
-            silk_NSQ( &psEnc->sCmn, &sNSQ_LBRR[0], psIndices_LBRR, x16,
+            oaci_silk_NSQ( &psEnc->sCmn, &sNSQ_LBRR[0], psIndices_LBRR, x16,
                 psEnc->sCmn.pulses_LBRR[ psEnc->sCmn.nFramesEncoded ], psEncCtrl->PredCoef_Q12[ 0 ],
             psEncCtrl->LTPCoef_Q14,
                 psEncCtrl->AR_Q13, psEncCtrl->HarmShapeGain_Q14, psEncCtrl->Tilt_Q14, psEncCtrl->LF_shp_Q14,
diff --git a/silk/fixed/find_LPC_FIX.c b/silk/fixed/find_LPC_FIX.c
index 8091c4863..220f0b1b9 100644
--- a/silk/fixed/find_LPC_FIX.c
+++ b/silk/fixed/find_LPC_FIX.c
@@ -34,7 +34,7 @@
 #include "tuning_parameters.h"
 
 /* Finds LPC vector from correlations, and converts to NLSF */
-void silk_find_LPC_FIX(
+void oaci_silk_find_LPC_FIX(
     silk_encoder_state              *psEncC,                                /* I/O  Encoder state                                                               */
     oac_int16 NLSF_Q15[],                                                  /* O    NLSFs                                                                       */
     const oac_int16 x[],                                                   /* I    Input signal                                                                */
@@ -59,14 +59,14 @@ void silk_find_LPC_FIX(
     psEncC->indices.NLSFInterpCoef_Q2 = 4;
 
     /* Burg AR analysis for the full frame */
-    silk_burg_modified( &res_nrg, &res_nrg_Q, a_Q16, x, minInvGain_Q30, subfr_length, psEncC->nb_subfr,
+    oaci_silk_burg_modified( &res_nrg, &res_nrg_Q, a_Q16, x, minInvGain_Q30, subfr_length, psEncC->nb_subfr,
     psEncC->predictLPCOrder, psEncC->arch );
 
     if (psEncC->useInterpolatedNLSFs && !psEncC->first_frame_after_reset && psEncC->nb_subfr == MAX_NB_SUBFR) {
         VARDECL( oac_int16, LPC_res );
 
         /* Optimal solution for last 10 ms */
-        silk_burg_modified( &res_tmp_nrg, &res_tmp_nrg_Q, a_tmp_Q16, x + 2*subfr_length, minInvGain_Q30, subfr_length,
+        oaci_silk_burg_modified( &res_tmp_nrg, &res_tmp_nrg_Q, a_tmp_Q16, x + 2*subfr_length, minInvGain_Q30, subfr_length,
         2, psEncC->predictLPCOrder, psEncC->arch );
 
         /* subtract residual energy here, as that's easier than adding it to the    */
@@ -83,24 +83,24 @@ void silk_find_LPC_FIX(
         }
 
         /* Convert to NLSFs */
-        silk_A2NLSF( NLSF_Q15, a_tmp_Q16, psEncC->predictLPCOrder );
+        oaci_silk_A2NLSF( NLSF_Q15, a_tmp_Q16, psEncC->predictLPCOrder );
 
         ALLOC( LPC_res, 2*subfr_length, oac_int16 );
 
         /* Search over interpolation indices to find the one with lowest residual energy */
         for (k = 3; k >= 0; k--) {
             /* Interpolate NLSFs for first half */
-            silk_interpolate( NLSF0_Q15, psEncC->prev_NLSFq_Q15, NLSF_Q15, k, psEncC->predictLPCOrder );
+            oaci_silk_interpolate( NLSF0_Q15, psEncC->prev_NLSFq_Q15, NLSF_Q15, k, psEncC->predictLPCOrder );
 
             /* Convert to LPC for residual energy evaluation */
-            silk_NLSF2A( a_tmp_Q12, NLSF0_Q15, psEncC->predictLPCOrder, psEncC->arch );
+            oaci_silk_NLSF2A( a_tmp_Q12, NLSF0_Q15, psEncC->predictLPCOrder, psEncC->arch );
 
             /* Calculate residual energy with NLSF interpolation */
-            silk_LPC_analysis_filter( LPC_res, x, a_tmp_Q12, 2*subfr_length, psEncC->predictLPCOrder, psEncC->arch );
+            oaci_silk_LPC_analysis_filter( LPC_res, x, a_tmp_Q12, 2*subfr_length, psEncC->predictLPCOrder, psEncC->arch );
 
-            silk_sum_sqr_shift( &res_nrg0, &rshift0, LPC_res + psEncC->predictLPCOrder,
+            oaci_silk_sum_sqr_shift( &res_nrg0, &rshift0, LPC_res + psEncC->predictLPCOrder,
             subfr_length - psEncC->predictLPCOrder );
-            silk_sum_sqr_shift( &res_nrg1, &rshift1, LPC_res + psEncC->predictLPCOrder + subfr_length,
+            oaci_silk_sum_sqr_shift( &res_nrg1, &rshift1, LPC_res + psEncC->predictLPCOrder + subfr_length,
             subfr_length - psEncC->predictLPCOrder );
 
             /* Add subframe energies from first half frame */
@@ -146,7 +146,7 @@ void silk_find_LPC_FIX(
 
     if (psEncC->indices.NLSFInterpCoef_Q2 == 4) {
         /* NLSF interpolation is currently inactive, calculate NLSFs from full frame AR coefficients */
-        silk_A2NLSF( NLSF_Q15, a_Q16, psEncC->predictLPCOrder );
+        oaci_silk_A2NLSF( NLSF_Q15, a_Q16, psEncC->predictLPCOrder );
     }
 
     celt_assert( psEncC->indices.NLSFInterpCoef_Q2 == 4
diff --git a/silk/fixed/find_LTP_FIX.c b/silk/fixed/find_LTP_FIX.c
index c4ae8d493..766371ac3 100644
--- a/silk/fixed/find_LTP_FIX.c
+++ b/silk/fixed/find_LTP_FIX.c
@@ -32,7 +32,7 @@
 #include "main_FIX.h"
 #include "tuning_parameters.h"
 
-void silk_find_LTP_FIX(
+void oaci_silk_find_LTP_FIX(
     oac_int32 XXLTP_Q17[ MAX_NB_SUBFR*LTP_ORDER*LTP_ORDER ],                          /* O    Correlation matrix                                               */
     oac_int32 xXLTP_Q17[ MAX_NB_SUBFR*LTP_ORDER ],                         /* O    Correlation vector                                                          */
     const oac_int16 r_ptr[],                                               /* I    Residual signal after LPC                                                   */
@@ -52,8 +52,8 @@ void silk_find_LTP_FIX(
     for (k = 0; k < nb_subfr; k++) {
         lag_ptr = r_ptr - (lag[ k ] + LTP_ORDER/2);
 
-        silk_sum_sqr_shift( &xx, &xx_shifts, r_ptr, subfr_length + LTP_ORDER );                            /* xx in Q( -xx_shifts ) */
-        silk_corrMatrix_FIX( lag_ptr, subfr_length, LTP_ORDER, XXLTP_Q17_ptr, &nrg, &XX_shifts, arch );    /* XXLTP_Q17_ptr and nrg in Q( -XX_shifts ) */
+        oaci_silk_sum_sqr_shift( &xx, &xx_shifts, r_ptr, subfr_length + LTP_ORDER );                            /* xx in Q( -xx_shifts ) */
+        oaci_silk_corrMatrix_FIX( lag_ptr, subfr_length, LTP_ORDER, XXLTP_Q17_ptr, &nrg, &XX_shifts, arch );    /* XXLTP_Q17_ptr and nrg in Q( -XX_shifts ) */
         extra_shifts = xx_shifts - XX_shifts;
         if (extra_shifts > 0) {
             /* Shift XX */
@@ -69,7 +69,7 @@ void silk_find_LTP_FIX(
         } else {
             xX_shifts = xx_shifts;
         }
-        silk_corrVector_FIX( lag_ptr, r_ptr, subfr_length, LTP_ORDER, xXLTP_Q17_ptr, xX_shifts, arch );    /* xXLTP_Q17_ptr in Q( -xX_shifts ) */
+        oaci_silk_corrVector_FIX( lag_ptr, r_ptr, subfr_length, LTP_ORDER, xXLTP_Q17_ptr, xX_shifts, arch );    /* xXLTP_Q17_ptr in Q( -xX_shifts ) */
 
         /* At this point all correlations are in Q(-xX_shifts) */
         temp = silk_SMLAWB( 1, nrg, SILK_FIX_CONST( LTP_CORR_INV_MAX, 16 ));
diff --git a/silk/fixed/find_pitch_lags_FIX.c b/silk/fixed/find_pitch_lags_FIX.c
index d239f2dcf..31891debd 100644
--- a/silk/fixed/find_pitch_lags_FIX.c
+++ b/silk/fixed/find_pitch_lags_FIX.c
@@ -34,7 +34,7 @@
 #include "tuning_parameters.h"
 
 /* Find pitch lags */
-void silk_find_pitch_lags_FIX(
+void oaci_silk_find_pitch_lags_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  encoder control                                                             */
     oac_int16 res[],                                                       /* O    residual                                                                    */
@@ -71,7 +71,7 @@ void silk_find_pitch_lags_FIX(
     /* First LA_LTP samples */
     x_ptr = x + buf_len - psEnc->sCmn.pitch_LPC_win_length;
     Wsig_ptr  = Wsig;
-    silk_apply_sine_window( Wsig_ptr, x_ptr, 1, psEnc->sCmn.la_pitch );
+    oaci_silk_apply_sine_window( Wsig_ptr, x_ptr, 1, psEnc->sCmn.la_pitch );
 
     /* Middle un - windowed samples */
     Wsig_ptr  += psEnc->sCmn.la_pitch;
@@ -82,10 +82,10 @@ void silk_find_pitch_lags_FIX(
     /* Last LA_LTP samples */
     Wsig_ptr  += psEnc->sCmn.pitch_LPC_win_length - silk_LSHIFT( psEnc->sCmn.la_pitch, 1 );
     x_ptr += psEnc->sCmn.pitch_LPC_win_length - silk_LSHIFT( psEnc->sCmn.la_pitch, 1 );
-    silk_apply_sine_window( Wsig_ptr, x_ptr, 2, psEnc->sCmn.la_pitch );
+    oaci_silk_apply_sine_window( Wsig_ptr, x_ptr, 2, psEnc->sCmn.la_pitch );
 
     /* Calculate autocorrelation sequence */
-    silk_autocorr( auto_corr, &scale, Wsig, psEnc->sCmn.pitch_LPC_win_length, psEnc->sCmn.pitchEstimationLPCOrder + 1,
+    oaci_silk_autocorr( auto_corr, &scale, Wsig, psEnc->sCmn.pitch_LPC_win_length, psEnc->sCmn.pitchEstimationLPCOrder + 1,
     arch );
 
     /* Add white noise, as fraction of energy */
@@ -93,13 +93,13 @@ void silk_find_pitch_lags_FIX(
     SILK_FIX_CONST( FIND_PITCH_WHITE_NOISE_FRACTION, 16 )) + 1;
 
     /* Calculate the reflection coefficients using schur */
-    res_nrg = silk_schur( rc_Q15, auto_corr, psEnc->sCmn.pitchEstimationLPCOrder );
+    res_nrg = oaci_silk_schur( rc_Q15, auto_corr, psEnc->sCmn.pitchEstimationLPCOrder );
 
     /* Prediction gain */
     psEncCtrl->predGain_Q16 = silk_DIV32_varQ( auto_corr[ 0 ], silk_max_int( res_nrg, 1 ), 16 );
 
     /* Convert reflection coefficients to prediction coefficients */
-    silk_k2a( A_Q24, rc_Q15, psEnc->sCmn.pitchEstimationLPCOrder );
+    oaci_silk_k2a( A_Q24, rc_Q15, psEnc->sCmn.pitchEstimationLPCOrder );
 
     /* Convert From 32 bit Q24 to 16 bit Q12 coefs */
     for (i = 0; i < psEnc->sCmn.pitchEstimationLPCOrder; i++) {
@@ -107,12 +107,12 @@ void silk_find_pitch_lags_FIX(
     }
 
     /* Do BWE */
-    silk_bwexpander( A_Q12, psEnc->sCmn.pitchEstimationLPCOrder, SILK_FIX_CONST( FIND_PITCH_BANDWIDTH_EXPANSION, 16 ));
+    oaci_silk_bwexpander( A_Q12, psEnc->sCmn.pitchEstimationLPCOrder, SILK_FIX_CONST( FIND_PITCH_BANDWIDTH_EXPANSION, 16 ));
 
     /*****************************************/
     /* LPC analysis filtering                */
     /*****************************************/
-    silk_LPC_analysis_filter( res, x, A_Q12, buf_len, psEnc->sCmn.pitchEstimationLPCOrder, psEnc->sCmn.arch );
+    oaci_silk_LPC_analysis_filter( res, x, A_Q12, buf_len, psEnc->sCmn.pitchEstimationLPCOrder, psEnc->sCmn.arch );
 
     if (psEnc->sCmn.indices.signalType != TYPE_NO_VOICE_ACTIVITY && psEnc->sCmn.first_frame_after_reset == 0) {
         /* Threshold for pitch estimator */
@@ -127,7 +127,7 @@ void silk_find_pitch_lags_FIX(
         /*****************************************/
         /* Call pitch estimator                  */
         /*****************************************/
-        if (silk_pitch_analysis_core( res, psEncCtrl->pitchL, &psEnc->sCmn.indices.lagIndex,
+        if (oaci_silk_pitch_analysis_core( res, psEncCtrl->pitchL, &psEnc->sCmn.indices.lagIndex,
         &psEnc->sCmn.indices.contourIndex,
                 &psEnc->LTPCorr_Q15, psEnc->sCmn.prevLag, psEnc->sCmn.pitchEstimationThreshold_Q16,
             (oac_int)thrhld_Q13, psEnc->sCmn.fs_kHz, psEnc->sCmn.pitchEstimationComplexity, psEnc->sCmn.nb_subfr,
diff --git a/silk/fixed/find_pred_coefs_FIX.c b/silk/fixed/find_pred_coefs_FIX.c
index c4561d99a..c4bae63e3 100644
--- a/silk/fixed/find_pred_coefs_FIX.c
+++ b/silk/fixed/find_pred_coefs_FIX.c
@@ -32,7 +32,7 @@
 #include "main_FIX.h"
 #include "stack_alloc.h"
 
-void silk_find_pred_coefs_FIX(
+void oaci_silk_find_pred_coefs_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  encoder control                                                             */
     const oac_int16 res_pitch[],                                           /* I    Residual from pitch analysis                                                */
@@ -86,19 +86,19 @@ void silk_find_pred_coefs_FIX(
         ALLOC( XXLTP_Q17, psEnc->sCmn.nb_subfr*LTP_ORDER*LTP_ORDER, oac_int32 );
 
         /* LTP analysis */
-        silk_find_LTP_FIX( XXLTP_Q17, xXLTP_Q17, res_pitch,
+        oaci_silk_find_LTP_FIX( XXLTP_Q17, xXLTP_Q17, res_pitch,
             psEncCtrl->pitchL, psEnc->sCmn.subfr_length, psEnc->sCmn.nb_subfr, psEnc->sCmn.arch );
 
         /* Quantize LTP gain parameters */
-        silk_quant_LTP_gains( psEncCtrl->LTPCoef_Q14, psEnc->sCmn.indices.LTPIndex, &psEnc->sCmn.indices.PERIndex,
+        oaci_silk_quant_LTP_gains( psEncCtrl->LTPCoef_Q14, psEnc->sCmn.indices.LTPIndex, &psEnc->sCmn.indices.PERIndex,
             &psEnc->sCmn.sum_log_gain_Q7, &psEncCtrl->LTPredCodGain_Q7, XXLTP_Q17, xXLTP_Q17, psEnc->sCmn.subfr_length,
         psEnc->sCmn.nb_subfr, psEnc->sCmn.arch );
 
         /* Control LTP scaling */
-        silk_LTP_scale_ctrl_FIX( psEnc, psEncCtrl, condCoding );
+        oaci_silk_LTP_scale_ctrl_FIX( psEnc, psEncCtrl, condCoding );
 
         /* Create LTP residual */
-        silk_LTP_analysis_filter_FIX( LPC_in_pre, x - psEnc->sCmn.predictLPCOrder, psEncCtrl->LTPCoef_Q14,
+        oaci_silk_LTP_analysis_filter_FIX( LPC_in_pre, x - psEnc->sCmn.predictLPCOrder, psEncCtrl->LTPCoef_Q14,
             psEncCtrl->pitchL, invGains_Q16, psEnc->sCmn.subfr_length, psEnc->sCmn.nb_subfr,
         psEnc->sCmn.predictLPCOrder );
 
@@ -110,7 +110,7 @@ void silk_find_pred_coefs_FIX(
         x_ptr     = x - psEnc->sCmn.predictLPCOrder;
         x_pre_ptr = LPC_in_pre;
         for (i = 0; i < psEnc->sCmn.nb_subfr; i++) {
-            silk_scale_copy_vector16( x_pre_ptr, x_ptr, invGains_Q16[ i ],
+            oaci_silk_scale_copy_vector16( x_pre_ptr, x_ptr, invGains_Q16[ i ],
                 psEnc->sCmn.subfr_length + psEnc->sCmn.predictLPCOrder );
             x_pre_ptr += psEnc->sCmn.subfr_length + psEnc->sCmn.predictLPCOrder;
             x_ptr     += psEnc->sCmn.subfr_length;
@@ -126,7 +126,7 @@ void silk_find_pred_coefs_FIX(
     if (psEnc->sCmn.first_frame_after_reset) {
         minInvGain_Q30 = SILK_FIX_CONST( 1.0f/MAX_PREDICTION_POWER_GAIN_AFTER_RESET, 30 );
     } else {
-        minInvGain_Q30 = silk_log2lin( silk_SMLAWB( 16<<7, (oac_int32)psEncCtrl->LTPredCodGain_Q7,
+        minInvGain_Q30 = oaci_silk_log2lin( silk_SMLAWB( 16<<7, (oac_int32)psEncCtrl->LTPredCodGain_Q7,
         SILK_FIX_CONST( 1.0/3, 16 )));                                                                                                       /* Q16 */
         minInvGain_Q30 = silk_DIV32_varQ( minInvGain_Q30,
             silk_SMULWW( SILK_FIX_CONST( MAX_PREDICTION_POWER_GAIN, 0 ),
@@ -135,13 +135,13 @@ void silk_find_pred_coefs_FIX(
     }
 
     /* LPC_in_pre contains the LTP-filtered input for voiced, and the unfiltered input for unvoiced */
-    silk_find_LPC_FIX( &psEnc->sCmn, NLSF_Q15, LPC_in_pre, minInvGain_Q30 );
+    oaci_silk_find_LPC_FIX( &psEnc->sCmn, NLSF_Q15, LPC_in_pre, minInvGain_Q30 );
 
     /* Quantize LSFs */
-    silk_process_NLSFs( &psEnc->sCmn, psEncCtrl->PredCoef_Q12, NLSF_Q15, psEnc->sCmn.prev_NLSFq_Q15 );
+    oaci_silk_process_NLSFs( &psEnc->sCmn, psEncCtrl->PredCoef_Q12, NLSF_Q15, psEnc->sCmn.prev_NLSFq_Q15 );
 
     /* Calculate residual energy using quantized LPC coefficients */
-    silk_residual_energy_FIX( psEncCtrl->ResNrg, psEncCtrl->ResNrgQ, LPC_in_pre, psEncCtrl->PredCoef_Q12, local_gains,
+    oaci_silk_residual_energy_FIX( psEncCtrl->ResNrg, psEncCtrl->ResNrgQ, LPC_in_pre, psEncCtrl->PredCoef_Q12, local_gains,
         psEnc->sCmn.subfr_length, psEnc->sCmn.nb_subfr, psEnc->sCmn.predictLPCOrder, psEnc->sCmn.arch );
 
     /* Copy to prediction struct for use in next frame for interpolation */
diff --git a/silk/fixed/k2a_FIX.c b/silk/fixed/k2a_FIX.c
index 2e6ec35c2..499af5444 100644
--- a/silk/fixed/k2a_FIX.c
+++ b/silk/fixed/k2a_FIX.c
@@ -32,7 +32,7 @@
 #include "SigProc_FIX.h"
 
 /* Step up function, converts reflection coefficients to prediction coefficients */
-void silk_k2a(
+void oaci_silk_k2a(
     oac_int32                  *A_Q24,             /* O    Prediction coefficients [order] Q24                         */
     const oac_int16            *rc_Q15,            /* I    Reflection coefficients [order] Q15                         */
     const oac_int32 order                          /* I    Prediction order                                            */
diff --git a/silk/fixed/k2a_Q16_FIX.c b/silk/fixed/k2a_Q16_FIX.c
index b45858b12..27edce453 100644
--- a/silk/fixed/k2a_Q16_FIX.c
+++ b/silk/fixed/k2a_Q16_FIX.c
@@ -32,7 +32,7 @@
 #include "SigProc_FIX.h"
 
 /* Step up function, converts reflection coefficients to prediction coefficients */
-void silk_k2a_Q16(
+void oaci_silk_k2a_Q16(
     oac_int32                  *A_Q24,             /* O    Prediction coefficients [order] Q24                         */
     const oac_int32            *rc_Q16,            /* I    Reflection coefficients [order] Q16                         */
     const oac_int32 order                          /* I    Prediction order                                            */
diff --git a/silk/fixed/main_FIX.h b/silk/fixed/main_FIX.h
index 58b6d1738..6f47fa273 100644
--- a/silk/fixed/main_FIX.h
+++ b/silk/fixed/main_FIX.h
@@ -43,8 +43,8 @@
 
 
 #define silk_encoder_state_Fxx      silk_encoder_state_FIX
-#define silk_encode_do_VAD_Fxx      silk_encode_do_VAD_FIX
-#define silk_encode_frame_Fxx       silk_encode_frame_FIX
+#define silk_encode_do_VAD_Fxx      oaci_silk_encode_do_VAD_FIX
+#define silk_encode_frame_Fxx       oaci_silk_encode_frame_FIX
 
 #define QC  10
 #define QS  13
@@ -54,18 +54,18 @@
 /*********************/
 
 /* High-pass filter with cutoff frequency adaptation based on pitch lag statistics */
-void silk_HP_variable_cutoff(
+void oaci_silk_HP_variable_cutoff(
     silk_encoder_state_Fxx state_Fxx[]                                      /* I/O  Encoder states                                                              */
     );
 
 /* Encoder main function */
-void silk_encode_do_VAD_FIX(
+void oaci_silk_encode_do_VAD_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
     oac_int activity                                                       /* I    Decision of Oac voice activity detector                                    */
     );
 
 /* Encoder main function */
-oac_int silk_encode_frame_FIX(
+oac_int oaci_silk_encode_frame_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
     oac_int32                      *pnBytesOut,                            /* O    Pointer to number of payload bytes;                                         */
     ec_enc                          *psRangeEnc,                            /* I/O  compressor data structure                                                   */
@@ -75,13 +75,13 @@ oac_int silk_encode_frame_FIX(
     );
 
 /* Initializes the Silk encoder state */
-oac_int silk_init_encoder(
+oac_int oaci_silk_init_encoder(
     silk_encoder_state_Fxx          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
     int arch                                                                /* I    Run-time architecture                                                       */
     );
 
 /* Control the Silk encoder */
-oac_int silk_control_encoder(
+oac_int oaci_silk_control_encoder(
     silk_encoder_state_Fxx          *psEnc,                                 /* I/O  Pointer to Silk encoder state                                               */
     silk_EncControlStruct           *encControl,                            /* I    Control structure                                                           */
     const oac_int allow_bw_switch,                                         /* I    Flag to allow switching audio bandwidth                                     */
@@ -92,7 +92,7 @@ oac_int silk_control_encoder(
 /* Noise shaping analysis */
 /**************************/
 /* Compute noise shaping coefficients and initial gain values */
-void silk_noise_shape_analysis_FIX(
+void oaci_silk_noise_shape_analysis_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Encoder state FIX                                                           */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  Encoder control FIX                                                         */
     const oac_int16                *pitch_res,                             /* I    LPC residual from pitch analysis                                            */
@@ -101,7 +101,7 @@ void silk_noise_shape_analysis_FIX(
     );
 
 /* Autocorrelations for a warped frequency axis */
-void silk_warped_autocorrelation_FIX_c(
+void oaci_silk_warped_autocorrelation_FIX_c(
     oac_int32                *corr,                                        /* O    Result [order + 1]                                                          */
     oac_int                  *scale,                                       /* O    Scaling of the correlation vector                                           */
     const oac_int16                *input,                                 /* I    Input data to correlate                                                     */
@@ -110,13 +110,13 @@ void silk_warped_autocorrelation_FIX_c(
     const oac_int order                                                    /* I    Correlation order (even)                                                    */
     );
 
-#if !defined(OVERRIDE_silk_warped_autocorrelation_FIX)
-# define silk_warped_autocorrelation_FIX(corr, scale, input, warping_Q16, length, order, arch) \
-        ((void)(arch), silk_warped_autocorrelation_FIX_c(corr, scale, input, warping_Q16, length, order))
+#if !defined(OVERRIDE_oaci_silk_warped_autocorrelation_FIX)
+# define oaci_silk_warped_autocorrelation_FIX(corr, scale, input, warping_Q16, length, order, arch) \
+        ((void)(arch), oaci_silk_warped_autocorrelation_FIX_c(corr, scale, input, warping_Q16, length, order))
 #endif
 
 /* Calculation of LTP state scaling */
-void silk_LTP_scale_ctrl_FIX(
+void oaci_silk_LTP_scale_ctrl_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  encoder control                                                             */
     oac_int condCoding                                                     /* I    The type of conditional coding to use                                       */
@@ -126,7 +126,7 @@ void silk_LTP_scale_ctrl_FIX(
 /* Prediction Analysis                        */
 /**********************************************/
 /* Find pitch lags */
-void silk_find_pitch_lags_FIX(
+void oaci_silk_find_pitch_lags_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  encoder control                                                             */
     oac_int16 res[],                                                       /* O    residual                                                                    */
@@ -135,7 +135,7 @@ void silk_find_pitch_lags_FIX(
     );
 
 /* Find LPC and LTP coefficients */
-void silk_find_pred_coefs_FIX(
+void oaci_silk_find_pred_coefs_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  encoder control                                                             */
     const oac_int16 res_pitch[],                                           /* I    Residual from pitch analysis                                                */
@@ -144,7 +144,7 @@ void silk_find_pred_coefs_FIX(
     );
 
 /* LPC analysis */
-void silk_find_LPC_FIX(
+void oaci_silk_find_LPC_FIX(
     silk_encoder_state              *psEncC,                                /* I/O  Encoder state                                                               */
     oac_int16 NLSF_Q15[],                                                  /* O    NLSFs                                                                       */
     const oac_int16 x[],                                                   /* I    Input signal                                                                */
@@ -152,7 +152,7 @@ void silk_find_LPC_FIX(
     );
 
 /* LTP analysis */
-void silk_find_LTP_FIX(
+void oaci_silk_find_LTP_FIX(
     oac_int32 XXLTP_Q17[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ],                      /* O    Correlation matrix                                               */
     oac_int32 xXLTP_Q17[ MAX_NB_SUBFR * LTP_ORDER ],                       /* O    Correlation vector                                                          */
     const oac_int16 r_lpc[],                                               /* I    Residual signal after LPC                                                   */
@@ -162,7 +162,7 @@ void silk_find_LTP_FIX(
     int arch                                                                /* I    Run-time architecture                                                       */
     );
 
-void silk_LTP_analysis_filter_FIX(
+void oaci_silk_LTP_analysis_filter_FIX(
     oac_int16                      *LTP_res,                               /* O    LTP residual signal of length MAX_NB_SUBFR * ( pre_length + subfr_length )  */
     const oac_int16                *x,                                     /* I    Pointer to input signal with at least max( pitchL ) preceding samples       */
     const oac_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ],               /* I    LTP_ORDER LTP coefficients for each MAX_NB_SUBFR subframe                   */
@@ -175,7 +175,7 @@ void silk_LTP_analysis_filter_FIX(
 
 /* Calculates residual energies of input subframes where all subframes have LPC_order   */
 /* of preceding samples                                                                 */
-void silk_residual_energy_FIX(
+void oaci_silk_residual_energy_FIX(
     oac_int32 nrgs[ MAX_NB_SUBFR ],                                        /* O    Residual energy per subframe                                                */
     oac_int nrgsQ[ MAX_NB_SUBFR ],                                         /* O    Q value per subframe                                                        */
     const oac_int16 x[],                                                   /* I    Input signal                                                                */
@@ -188,7 +188,7 @@ void silk_residual_energy_FIX(
     );
 
 /* Residual energy: nrg = wxx - 2 * wXx * c + c' * wXX * c */
-oac_int32 silk_residual_energy16_covar_FIX(
+oac_int32 oaci_silk_residual_energy16_covar_FIX(
     const oac_int16                *c,                                     /* I    Prediction vector                                                           */
     const oac_int32                *wXX,                                   /* I    Correlation matrix                                                          */
     const oac_int32                *wXx,                                   /* I    Correlation vector                                                          */
@@ -198,7 +198,7 @@ oac_int32 silk_residual_energy16_covar_FIX(
     );
 
 /* Processing of gains */
-void silk_process_gains_FIX(
+void oaci_silk_process_gains_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  Encoder control                                                             */
     oac_int condCoding                                                     /* I    The type of conditional coding to use                                       */
@@ -208,7 +208,7 @@ void silk_process_gains_FIX(
 /* Linear Algebra */
 /******************/
 /* Calculates correlation matrix X'*X */
-void silk_corrMatrix_FIX(
+void oaci_silk_corrMatrix_FIX(
     const oac_int16                *x,                                     /* I    x vector [L + order - 1] used to form data matrix X                         */
     const oac_int L,                                                       /* I    Length of vectors                                                           */
     const oac_int order,                                                   /* I    Max lag for correlation                                                     */
@@ -219,7 +219,7 @@ void silk_corrMatrix_FIX(
     );
 
 /* Calculates correlation vector X'*t */
-void silk_corrVector_FIX(
+void oaci_silk_corrVector_FIX(
     const oac_int16                *x,                                     /* I    x vector [L + order - 1] used to form data matrix X                         */
     const oac_int16                *t,                                     /* I    Target vector [L]                                                           */
     const oac_int L,                                                       /* I    Length of vectors                                                           */
diff --git a/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h b/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h
index ad91d38aa..22c6658a9 100644
--- a/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h
+++ b/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h
@@ -39,7 +39,7 @@
 # define MIPS_MADD __builtin_mips_madd
 # define MIPS_SHILO __builtin_mips_shilo
 
-# define OVERRIDE_silk_warped_autocorrelation_FIX_c
+# define OVERRIDE_oaci_silk_warped_autocorrelation_FIX_c
 
 #elif defined (__mips_isa_rev) && __mips == 32
 
@@ -51,12 +51,12 @@ static inline long long MIPS_SHILO(long long acc, int sh) {
     return (sh >= 0) ? (acc>>sh) : (acc<< -sh);
 }
 
-# define OVERRIDE_silk_warped_autocorrelation_FIX_c
+# define OVERRIDE_oaci_silk_warped_autocorrelation_FIX_c
 
 #endif
 
 /* Autocorrelations for a warped frequency axis */
-#if defined (OVERRIDE_silk_warped_autocorrelation_FIX_c)
+#if defined (OVERRIDE_oaci_silk_warped_autocorrelation_FIX_c)
 
 # undef QC
 # define QC  10
@@ -64,7 +64,7 @@ static inline long long MIPS_SHILO(long long acc, int sh) {
 # undef QS
 # define QS  14
 
-void silk_warped_autocorrelation_FIX_c(
+void oaci_silk_warped_autocorrelation_FIX_c(
     oac_int32                *corr,                                        /* O    Result [order + 1]                                                          */
     oac_int                  *scale,                                       /* O    Scaling of the correlation vector                                           */
     const oac_int16                *input,                                 /* I    Input data to correlate                                                     */
@@ -184,6 +184,6 @@ void silk_warped_autocorrelation_FIX_c(
 
     silk_assert( corr_QC[ 0 ] >= 0 );  /* If breaking, decrease QC*/
 }
-#endif /* OVERRIDE_silk_warped_autocorrelation_FIX_c */
+#endif /* OVERRIDE_oaci_silk_warped_autocorrelation_FIX_c */
 
 #endif /* __WARPED_AUTOCORRELATION_FIX_MIPSR1_H__ */
diff --git a/silk/fixed/noise_shape_analysis_FIX.c b/silk/fixed/noise_shape_analysis_FIX.c
index 4af2414d3..268bfc6f0 100644
--- a/silk/fixed/noise_shape_analysis_FIX.c
+++ b/silk/fixed/noise_shape_analysis_FIX.c
@@ -109,7 +109,7 @@ static OAC_INLINE void limit_warped_coefs(
             silk_SMULWB( maxabs_Q20 - limit_Q20,
         silk_SMLABB( SILK_FIX_CONST( 0.8, 10 ), SILK_FIX_CONST( 0.1, 10 ), iter )),
             silk_MUL( maxabs_Q20, ind + 1 ), 22 );
-        silk_bwexpander_32( coefs_Q24, order, chirp_Q16 );
+        oaci_silk_bwexpander_32( coefs_Q24, order, chirp_Q16 );
 
         /* Convert to monic warped coefficients */
         lambda_Q16 = -lambda_Q16;
@@ -130,7 +130,7 @@ static OAC_INLINE void limit_warped_coefs(
 /**************************************************************/
 /* Compute noise shaping coefficients and initial gain values */
 /**************************************************************/
-void silk_noise_shape_analysis_FIX(
+void oaci_silk_noise_shape_analysis_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Encoder state FIX                                                           */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  Encoder control FIX                                                         */
     const oac_int16                *pitch_res,                             /* I    LPC residual from pitch analysis                                            */
@@ -162,7 +162,7 @@ void silk_noise_shape_analysis_FIX(
         + psEnc->sCmn.input_quality_bands_Q15[ 1 ], 2 );
 
     /* Coding quality level, between 0.0_Q0 and 1.0_Q0, but in Q14 */
-    psEncCtrl->coding_quality_Q14 = silk_RSHIFT( silk_sigm_Q15( silk_RSHIFT_ROUND( SNR_adj_dB_Q7
+    psEncCtrl->coding_quality_Q14 = silk_RSHIFT( oaci_silk_sigm_Q15( silk_RSHIFT_ROUND( SNR_adj_dB_Q7
         - SILK_FIX_CONST( 20.0, 7 ), 4 )), 1 );
 
     /* Reduce coding SNR during low speech activity */
@@ -199,10 +199,10 @@ void silk_noise_shape_analysis_FIX(
         pitch_res_ptr = pitch_res;
         nSegs = silk_SMULBB( SUB_FRAME_LENGTH_MS, psEnc->sCmn.nb_subfr )/2;
         for (k = 0; k < nSegs; k++) {
-            silk_sum_sqr_shift( &nrg, &scale, pitch_res_ptr, nSamples );
+            oaci_silk_sum_sqr_shift( &nrg, &scale, pitch_res_ptr, nSamples );
             nrg += silk_RSHIFT( nSamples, scale );           /* Q(-scale)*/
 
-            log_energy_Q7 = silk_lin2log( nrg );
+            log_energy_Q7 = oaci_silk_lin2log( nrg );
             if (k > 0) {
                 energy_variation_Q7 += silk_abs( log_energy_Q7 - log_energy_prev_Q7 );
             }
@@ -244,22 +244,22 @@ void silk_noise_shape_analysis_FIX(
         flat_part = psEnc->sCmn.fs_kHz*3;
         slope_part = silk_RSHIFT( psEnc->sCmn.shapeWinLength - flat_part, 1 );
 
-        silk_apply_sine_window( x_windowed, x_ptr, 1, slope_part );
+        oaci_silk_apply_sine_window( x_windowed, x_ptr, 1, slope_part );
         shift = slope_part;
         silk_memcpy( x_windowed + shift, x_ptr + shift, flat_part*sizeof(oac_int16));
         shift += flat_part;
-        silk_apply_sine_window( x_windowed + shift, x_ptr + shift, 2, slope_part );
+        oaci_silk_apply_sine_window( x_windowed + shift, x_ptr + shift, 2, slope_part );
 
         /* Update pointer: next LPC analysis block */
         x_ptr += psEnc->sCmn.subfr_length;
 
         if (psEnc->sCmn.warping_Q16 > 0) {
             /* Calculate warped auto correlation */
-            silk_warped_autocorrelation_FIX( auto_corr, &scale, x_windowed, warping_Q16, psEnc->sCmn.shapeWinLength,
+            oaci_silk_warped_autocorrelation_FIX( auto_corr, &scale, x_windowed, warping_Q16, psEnc->sCmn.shapeWinLength,
             psEnc->sCmn.shapingLPCOrder, arch );
         } else {
             /* Calculate regular auto correlation */
-            silk_autocorr( auto_corr, &scale, x_windowed, psEnc->sCmn.shapeWinLength, psEnc->sCmn.shapingLPCOrder + 1,
+            oaci_silk_autocorr( auto_corr, &scale, x_windowed, psEnc->sCmn.shapeWinLength, psEnc->sCmn.shapingLPCOrder + 1,
             arch );
         }
 
@@ -268,11 +268,11 @@ void silk_noise_shape_analysis_FIX(
             SILK_FIX_CONST( SHAPE_WHITE_NOISE_FRACTION, 20 )), 1 ));
 
         /* Calculate the reflection coefficients using schur */
-        nrg = silk_schur64( refl_coef_Q16, auto_corr, psEnc->sCmn.shapingLPCOrder );
+        nrg = oaci_silk_schur64( refl_coef_Q16, auto_corr, psEnc->sCmn.shapingLPCOrder );
         silk_assert( nrg >= 0 );
 
         /* Convert reflection coefficients to prediction coefficients */
-        silk_k2a_Q16( AR_Q24, refl_coef_Q16, psEnc->sCmn.shapingLPCOrder );
+        oaci_silk_k2a_Q16( AR_Q24, refl_coef_Q16, psEnc->sCmn.shapingLPCOrder );
 
         Qnrg = -scale;          /* range: -12...30*/
         silk_assert( Qnrg >= -12 );
@@ -308,7 +308,7 @@ void silk_noise_shape_analysis_FIX(
         }
 
         /* Bandwidth expansion */
-        silk_bwexpander_32( AR_Q24, psEnc->sCmn.shapingLPCOrder, BWExp_Q16 );
+        oaci_silk_bwexpander_32( AR_Q24, psEnc->sCmn.shapingLPCOrder, BWExp_Q16 );
 
         if (psEnc->sCmn.warping_Q16 > 0) {
             /* Convert to monic warped prediction coefficients and limit absolute values */
@@ -320,7 +320,7 @@ void silk_noise_shape_analysis_FIX(
                 11 ));
             }
         } else {
-            silk_LPC_fit( &psEncCtrl->AR_Q13[ k*MAX_SHAPE_LPC_ORDER ], AR_Q24, 13, 24, psEnc->sCmn.shapingLPCOrder );
+            oaci_silk_LPC_fit( &psEncCtrl->AR_Q13[ k*MAX_SHAPE_LPC_ORDER ], AR_Q24, 13, 24, psEnc->sCmn.shapingLPCOrder );
         }
     }
 
@@ -328,8 +328,8 @@ void silk_noise_shape_analysis_FIX(
     /* Gain tweaking */
     /*****************/
     /* Increase gains during low speech activity and put lower limit on gains */
-    gain_mult_Q16 = silk_log2lin( -silk_SMLAWB( -SILK_FIX_CONST( 16.0, 7 ), SNR_adj_dB_Q7, SILK_FIX_CONST( 0.16, 16 )));
-    gain_add_Q16  = silk_log2lin(  silk_SMLAWB(  SILK_FIX_CONST( 16.0, 7 ), SILK_FIX_CONST( MIN_QGAIN_DB, 7 ),
+    gain_mult_Q16 = oaci_silk_log2lin( -silk_SMLAWB( -SILK_FIX_CONST( 16.0, 7 ), SNR_adj_dB_Q7, SILK_FIX_CONST( 0.16, 16 )));
+    gain_add_Q16  = oaci_silk_log2lin(  silk_SMLAWB(  SILK_FIX_CONST( 16.0, 7 ), SILK_FIX_CONST( MIN_QGAIN_DB, 7 ),
     SILK_FIX_CONST( 0.16, 16 )));
     silk_assert( gain_mult_Q16 > 0 );
     for (k = 0; k < psEnc->sCmn.nb_subfr; k++) {
diff --git a/silk/fixed/pitch_analysis_core_FIX.c b/silk/fixed/pitch_analysis_core_FIX.c
index 1f4635375..455796d04 100644
--- a/silk/fixed/pitch_analysis_core_FIX.c
+++ b/silk/fixed/pitch_analysis_core_FIX.c
@@ -79,7 +79,7 @@ static void silk_P_Ana_calc_energy_st3(
 /*************************************************************/
 /*      FIXED POINT CORE PITCH ANALYSIS FUNCTION             */
 /*************************************************************/
-oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 voiced, 1 unvoiced                      */
+oac_int oaci_silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 voiced, 1 unvoiced                      */
     const oac_int16            *frame_unscaled,    /* I    Signal of length PE_FRAME_LENGTH_MS*Fs_kHz                  */
     oac_int                    *pitch_out,         /* O    4 pitch lag values                                          */
     oac_int16                  *lagIndex,          /* O    Lag Index                                                   */
@@ -139,7 +139,7 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
     max_lag           = PE_MAX_LAG_MS*Fs_kHz - 1;
 
     /* Downscale input if necessary */
-    silk_sum_sqr_shift( &energy, &shift, frame_unscaled, frame_length );
+    oaci_silk_sum_sqr_shift( &energy, &shift, frame_unscaled, frame_length );
     shift += 3 - silk_CLZ32( energy );        /* at least two bits headroom */
     ALLOC( frame_scaled, frame_length, oac_int16 );
     if (shift > 0) {
@@ -156,11 +156,11 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
     /* Resample from input sampled at Fs_kHz to 8 kHz */
     if (Fs_kHz == 16) {
         silk_memset( filt_state, 0, 2*sizeof(oac_int32));
-        silk_resampler_down2( filt_state, frame_8kHz_buf, frame, frame_length );
+        oaci_silk_resampler_down2( filt_state, frame_8kHz_buf, frame, frame_length );
         frame_8kHz = frame_8kHz_buf;
     } else if (Fs_kHz == 12) {
         silk_memset( filt_state, 0, 6*sizeof(oac_int32));
-        silk_resampler_down2_3( filt_state, frame_8kHz_buf, frame, frame_length );
+        oaci_silk_resampler_down2_3( filt_state, frame_8kHz_buf, frame, frame_length );
         frame_8kHz = frame_8kHz_buf;
     } else {
         celt_assert( Fs_kHz == 8 );
@@ -170,7 +170,7 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
     /* Decimate again to 4 kHz */
     silk_memset( filt_state, 0, 2*sizeof(oac_int32));     /* Set state to zero */
     ALLOC( frame_4kHz, frame_length_4kHz, oac_int16 );
-    silk_resampler_down2( filt_state, frame_4kHz, frame_8kHz, frame_length_8kHz );
+    oaci_silk_resampler_down2( filt_state, frame_4kHz, frame_8kHz, frame_length_8kHz );
 
     /* Low-pass filter */
     for (i = frame_length_4kHz - 1; i > 0; i--) {
@@ -196,13 +196,13 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
         celt_assert( basis_ptr >= frame_4kHz );
         celt_assert( basis_ptr + SF_LENGTH_8KHZ <= frame_4kHz + frame_length_4kHz );
 
-        celt_pitch_xcorr( target_ptr, target_ptr - MAX_LAG_4KHZ, xcorr32, SF_LENGTH_8KHZ,
+        oaci_celt_pitch_xcorr( target_ptr, target_ptr - MAX_LAG_4KHZ, xcorr32, SF_LENGTH_8KHZ,
         MAX_LAG_4KHZ - MIN_LAG_4KHZ + 1, arch );
 
         /* Calculate first vector products before loop */
         cross_corr = xcorr32[ MAX_LAG_4KHZ - MIN_LAG_4KHZ ];
-        normalizer = silk_inner_prod_aligned( target_ptr, target_ptr, SF_LENGTH_8KHZ, arch );
-        normalizer = silk_ADD32( normalizer, silk_inner_prod_aligned( basis_ptr,  basis_ptr, SF_LENGTH_8KHZ, arch ));
+        normalizer = oaci_silk_inner_prod_aligned( target_ptr, target_ptr, SF_LENGTH_8KHZ, arch );
+        normalizer = silk_ADD32( normalizer, oaci_silk_inner_prod_aligned( basis_ptr,  basis_ptr, SF_LENGTH_8KHZ, arch ));
         normalizer = silk_ADD32( normalizer, silk_SMULBB( SF_LENGTH_8KHZ, 4000 ));
 
         matrix_ptr( C, k, 0, CSTRIDE_4KHZ ) =
@@ -250,7 +250,7 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
     /* Sort */
     length_d_srch = silk_ADD_LSHIFT32( 4, complexity, 1 );
     celt_assert( 3*length_d_srch <= PE_D_SRCH_LENGTH );
-    silk_insertion_sort_decreasing_int16( C, d_srch, CSTRIDE_4KHZ,
+    oaci_silk_insertion_sort_decreasing_int16( C, d_srch, CSTRIDE_4KHZ,
                                           length_d_srch );
 
     /* Escape if correlation is very low already here */
@@ -328,7 +328,7 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
         celt_assert( target_ptr >= frame_8kHz );
         celt_assert( target_ptr + SF_LENGTH_8KHZ <= frame_8kHz + frame_length_8kHz );
 
-        energy_target = silk_ADD32( silk_inner_prod_aligned( target_ptr, target_ptr, SF_LENGTH_8KHZ, arch ), 1 );
+        energy_target = silk_ADD32( oaci_silk_inner_prod_aligned( target_ptr, target_ptr, SF_LENGTH_8KHZ, arch ), 1 );
         for (j = 0; j < length_d_comp; j++) {
             d = d_comp[ j ];
             basis_ptr = target_ptr - d;
@@ -337,9 +337,9 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
             silk_assert( basis_ptr >= frame_8kHz );
             silk_assert( basis_ptr + SF_LENGTH_8KHZ <= frame_8kHz + frame_length_8kHz );
 
-            cross_corr = silk_inner_prod_aligned( target_ptr, basis_ptr, SF_LENGTH_8KHZ, arch );
+            cross_corr = oaci_silk_inner_prod_aligned( target_ptr, basis_ptr, SF_LENGTH_8KHZ, arch );
             if (cross_corr > 0) {
-                energy_basis = silk_inner_prod_aligned( basis_ptr, basis_ptr, SF_LENGTH_8KHZ, arch );
+                energy_basis = oaci_silk_inner_prod_aligned( basis_ptr, basis_ptr, SF_LENGTH_8KHZ, arch );
                 matrix_ptr( C, k, d - (MIN_LAG_8KHZ - 2), CSTRIDE_8KHZ ) =
                     (oac_int16)silk_DIV32_varQ( cross_corr,
                                                  silk_ADD32( energy_target,
@@ -367,7 +367,7 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
         } else if (Fs_kHz == 16) {
             prevLag = silk_RSHIFT( prevLag, 1 );
         }
-        prevLag_log2_Q7 = silk_lin2log((oac_int32)prevLag );
+        prevLag_log2_Q7 = oaci_silk_lin2log((oac_int32)prevLag );
     } else {
         prevLag_log2_Q7 = 0;
     }
@@ -375,7 +375,7 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
     /* Set up stage 2 codebook based on number of subframes */
     if (nb_subfr == PE_MAX_NB_SUBFR) {
         cbk_size   = PE_NB_CBKS_STAGE2_EXT;
-        Lag_CB_ptr = &silk_CB_lags_stage2[ 0 ][ 0 ];
+        Lag_CB_ptr = &oaci_silk_CB_lags_stage2[ 0 ][ 0 ];
         if (Fs_kHz == 8 && complexity > SILK_PE_MIN_COMPLEX) {
             /* If input is 8 khz use a larger codebook here because it is last stage */
             nb_cbk_search = PE_NB_CBKS_STAGE2_EXT;
@@ -384,7 +384,7 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
         }
     } else {
         cbk_size       = PE_NB_CBKS_STAGE2_10MS;
-        Lag_CB_ptr     = &silk_CB_lags_stage2_10_ms[ 0 ][ 0 ];
+        Lag_CB_ptr     = &oaci_silk_CB_lags_stage2_10_ms[ 0 ][ 0 ];
         nb_cbk_search  = PE_NB_CBKS_STAGE2_10MS;
     }
 
@@ -413,7 +413,7 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
         }
 
         /* Bias towards shorter lags */
-        lag_log2_Q7 = silk_lin2log( d ); /* Q7 */
+        lag_log2_Q7 = oaci_silk_lin2log( d ); /* Q7 */
         silk_assert( lag_log2_Q7 == silk_SAT16( lag_log2_Q7 ));
         silk_assert( nb_subfr*SILK_FIX_CONST( PE_SHORTLAG_BIAS,
         13 ) == silk_SAT16( nb_subfr*SILK_FIX_CONST( PE_SHORTLAG_BIAS, 13 )));
@@ -436,7 +436,7 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
 
         if (CCmax_new_b > CCmax_b                                       /* Find maximum biased correlation                  */
             && CCmax_new > silk_SMULBB( nb_subfr, search_thres2_Q13 )   /* Correlation needs to be high enough to be voiced */
-            && silk_CB_lags_stage2[ 0 ][ CBimax_new ] <= MIN_LAG_8KHZ   /* Lag must be in range                             */
+            && oaci_silk_CB_lags_stage2[ 0 ][ CBimax_new ] <= MIN_LAG_8KHZ   /* Lag must be in range                             */
             ) {
             CCmax_b = CCmax_new_b;
             CCmax   = CCmax_new;
@@ -482,18 +482,18 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
         CCmax = silk_int32_MIN;
         /* pitch lags according to second stage */
         for (k = 0; k < nb_subfr; k++) {
-            pitch_out[ k ] = lag + 2*silk_CB_lags_stage2[ k ][ CBimax_old ];
+            pitch_out[ k ] = lag + 2*oaci_silk_CB_lags_stage2[ k ][ CBimax_old ];
         }
 
         /* Set up codebook parameters according to complexity setting and frame length */
         if (nb_subfr == PE_MAX_NB_SUBFR) {
-            nb_cbk_search   = (oac_int)silk_nb_cbk_searchs_stage3[ complexity ];
+            nb_cbk_search   = (oac_int)oaci_silk_nb_cbk_searchs_stage3[ complexity ];
             cbk_size        = PE_NB_CBKS_STAGE3_MAX;
-            Lag_CB_ptr      = &silk_CB_lags_stage3[ 0 ][ 0 ];
+            Lag_CB_ptr      = &oaci_silk_CB_lags_stage3[ 0 ][ 0 ];
         } else {
             nb_cbk_search   = PE_NB_CBKS_STAGE3_10MS;
             cbk_size        = PE_NB_CBKS_STAGE3_10MS;
-            Lag_CB_ptr      = &silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
+            Lag_CB_ptr      = &oaci_silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
         }
 
         /* Calculate the correlations and energies needed in stage 3 */
@@ -507,7 +507,7 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
         contour_bias_Q15 = silk_DIV32_16( SILK_FIX_CONST( PE_FLATCONTOUR_BIAS, 15 ), lag );
 
         target_ptr = &frame[ PE_LTP_MEM_LENGTH_MS*Fs_kHz ];
-        energy_target = silk_ADD32( silk_inner_prod_aligned( target_ptr, target_ptr, nb_subfr*sf_length, arch ), 1 );
+        energy_target = silk_ADD32( oaci_silk_inner_prod_aligned( target_ptr, target_ptr, nb_subfr*sf_length, arch ), 1 );
         for (d = start_lag; d <= end_lag; d++) {
             for (j = 0; j < nb_cbk_search; j++) {
                 cross_corr = 0;
@@ -531,7 +531,7 @@ oac_int silk_pitch_analysis_core(                  /* O    Voicing estimate: 0 v
                     CCmax_new = 0;
                 }
 
-                if (CCmax_new > CCmax && (d + silk_CB_lags_stage3[ 0 ][ j ]) <= max_lag) {
+                if (CCmax_new > CCmax && (d + oaci_silk_CB_lags_stage3[ 0 ][ j ]) <= max_lag) {
                     CCmax   = CCmax_new;
                     lag_new = d;
                     CBimax  = j;
@@ -595,14 +595,14 @@ static void silk_P_Ana_calc_corr_st3(
     celt_assert( complexity <= SILK_PE_MAX_COMPLEX );
 
     if (nb_subfr == PE_MAX_NB_SUBFR) {
-        Lag_range_ptr = &silk_Lag_range_stage3[ complexity ][ 0 ][ 0 ];
-        Lag_CB_ptr    = &silk_CB_lags_stage3[ 0 ][ 0 ];
-        nb_cbk_search = silk_nb_cbk_searchs_stage3[ complexity ];
+        Lag_range_ptr = &oaci_silk_Lag_range_stage3[ complexity ][ 0 ][ 0 ];
+        Lag_CB_ptr    = &oaci_silk_CB_lags_stage3[ 0 ][ 0 ];
+        nb_cbk_search = oaci_silk_nb_cbk_searchs_stage3[ complexity ];
         cbk_size      = PE_NB_CBKS_STAGE3_MAX;
     } else {
         celt_assert( nb_subfr == PE_MAX_NB_SUBFR>>1);
-        Lag_range_ptr = &silk_Lag_range_stage3_10_ms[ 0 ][ 0 ];
-        Lag_CB_ptr    = &silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
+        Lag_range_ptr = &oaci_silk_Lag_range_stage3_10_ms[ 0 ][ 0 ];
+        Lag_CB_ptr    = &oaci_silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
         nb_cbk_search = PE_NB_CBKS_STAGE3_10MS;
         cbk_size      = PE_NB_CBKS_STAGE3_10MS;
     }
@@ -617,7 +617,7 @@ static void silk_P_Ana_calc_corr_st3(
         lag_low  = matrix_ptr( Lag_range_ptr, k, 0, 2 );
         lag_high = matrix_ptr( Lag_range_ptr, k, 1, 2 );
         celt_assert(lag_high - lag_low + 1 <= SCRATCH_SIZE);
-        celt_pitch_xcorr( target_ptr, target_ptr - start_lag - lag_high, xcorr32, sf_length, lag_high - lag_low + 1,
+        oaci_celt_pitch_xcorr( target_ptr, target_ptr - start_lag - lag_high, xcorr32, sf_length, lag_high - lag_low + 1,
         arch );
         for (j = lag_low; j <= lag_high; j++) {
             silk_assert( lag_counter < SCRATCH_SIZE );
@@ -667,14 +667,14 @@ static void silk_P_Ana_calc_energy_st3(
     celt_assert( complexity <= SILK_PE_MAX_COMPLEX );
 
     if (nb_subfr == PE_MAX_NB_SUBFR) {
-        Lag_range_ptr = &silk_Lag_range_stage3[ complexity ][ 0 ][ 0 ];
-        Lag_CB_ptr    = &silk_CB_lags_stage3[ 0 ][ 0 ];
-        nb_cbk_search = silk_nb_cbk_searchs_stage3[ complexity ];
+        Lag_range_ptr = &oaci_silk_Lag_range_stage3[ complexity ][ 0 ][ 0 ];
+        Lag_CB_ptr    = &oaci_silk_CB_lags_stage3[ 0 ][ 0 ];
+        nb_cbk_search = oaci_silk_nb_cbk_searchs_stage3[ complexity ];
         cbk_size      = PE_NB_CBKS_STAGE3_MAX;
     } else {
         celt_assert( nb_subfr == PE_MAX_NB_SUBFR>>1);
-        Lag_range_ptr = &silk_Lag_range_stage3_10_ms[ 0 ][ 0 ];
-        Lag_CB_ptr    = &silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
+        Lag_range_ptr = &oaci_silk_Lag_range_stage3_10_ms[ 0 ][ 0 ];
+        Lag_CB_ptr    = &oaci_silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
         nb_cbk_search = PE_NB_CBKS_STAGE3_10MS;
         cbk_size      = PE_NB_CBKS_STAGE3_10MS;
     }
@@ -686,7 +686,7 @@ static void silk_P_Ana_calc_energy_st3(
 
         /* Calculate the energy for first lag */
         basis_ptr = target_ptr - (start_lag + matrix_ptr( Lag_range_ptr, k, 0, 2 ));
-        energy = silk_inner_prod_aligned( basis_ptr, basis_ptr, sf_length, arch );
+        energy = oaci_silk_inner_prod_aligned( basis_ptr, basis_ptr, sf_length, arch );
         silk_assert( energy >= 0 );
         scratch_mem[ lag_counter ] = energy;
         lag_counter++;
diff --git a/silk/fixed/process_gains_FIX.c b/silk/fixed/process_gains_FIX.c
index 028fa5235..b59d18afb 100644
--- a/silk/fixed/process_gains_FIX.c
+++ b/silk/fixed/process_gains_FIX.c
@@ -33,7 +33,7 @@
 #include "tuning_parameters.h"
 
 /* Processing of gains */
-void silk_process_gains_FIX(
+void oaci_silk_process_gains_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Encoder state                                                               */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  Encoder control                                                             */
     oac_int condCoding                                                     /* I    The type of conditional coding to use                                       */
@@ -45,7 +45,7 @@ void silk_process_gains_FIX(
     /* Gain reduction when LTP coding gain is high */
     if (psEnc->sCmn.indices.signalType == TYPE_VOICED) {
         /*s = -0.5f * silk_sigmoid( 0.25f * ( psEncCtrl->LTPredCodGain - 12.0f ) ); */
-        s_Q16 = -silk_sigm_Q15( silk_RSHIFT_ROUND( psEncCtrl->LTPredCodGain_Q7 - SILK_FIX_CONST( 12.0, 7 ), 4 ));
+        s_Q16 = -oaci_silk_sigm_Q15( silk_RSHIFT_ROUND( psEncCtrl->LTPredCodGain_Q7 - SILK_FIX_CONST( 12.0, 7 ), 4 ));
         for (k = 0; k < psEnc->sCmn.nb_subfr; k++) {
             psEncCtrl->Gains_Q16[ k ] = silk_SMLAWB( psEncCtrl->Gains_Q16[ k ], psEncCtrl->Gains_Q16[ k ], s_Q16 );
         }
@@ -53,7 +53,7 @@ void silk_process_gains_FIX(
 
     /* Limit the quantized signal */
     /* InvMaxSqrVal = pow( 2.0f, 0.33f * ( 21.0f - SNR_dB ) ) / subfr_length; */
-    InvMaxSqrVal_Q16 = silk_DIV32_16( silk_log2lin(
+    InvMaxSqrVal_Q16 = silk_DIV32_16( oaci_silk_log2lin(
         silk_SMULWB( SILK_FIX_CONST( 21 + 16/0.33, 7 ) - psEnc->sCmn.SNR_dB_Q7, SILK_FIX_CONST( 0.33, 16 ))),
     psEnc->sCmn.subfr_length );
 
@@ -91,7 +91,7 @@ void silk_process_gains_FIX(
     psEncCtrl->lastGainIndexPrev = psShapeSt->LastGainIndex;
 
     /* Quantize gains */
-    silk_gains_quant( psEnc->sCmn.indices.GainsIndices, psEncCtrl->Gains_Q16,
+    oaci_silk_gains_quant( psEnc->sCmn.indices.GainsIndices, psEncCtrl->Gains_Q16,
         &psShapeSt->LastGainIndex, condCoding == CODE_CONDITIONALLY, psEnc->sCmn.nb_subfr );
 
     /* Set quantizer offset for voiced signals. Larger offset when LTP coding gain is low or tilt is high (ie low-pass) */
@@ -104,7 +104,7 @@ void silk_process_gains_FIX(
     }
 
     /* Quantizer boundary adjustment */
-    quant_offset_Q10 = silk_Quantization_Offsets_Q10[ psEnc->sCmn.indices.signalType>>
+    quant_offset_Q10 = oaci_silk_Quantization_Offsets_Q10[ psEnc->sCmn.indices.signalType>>
                                                       1 ][ psEnc->sCmn.indices.quantOffsetType ];
     psEncCtrl->Lambda_Q10 = SILK_FIX_CONST( LAMBDA_OFFSET, 10 )
                             + silk_SMULBB( SILK_FIX_CONST( LAMBDA_DELAYED_DECISIONS, 10 ),
diff --git a/silk/fixed/regularize_correlations_FIX.c b/silk/fixed/regularize_correlations_FIX.c
index 3fc26e528..aee936221 100644
--- a/silk/fixed/regularize_correlations_FIX.c
+++ b/silk/fixed/regularize_correlations_FIX.c
@@ -32,7 +32,7 @@
 #include "main_FIX.h"
 
 /* Add noise to matrix diagonal */
-void silk_regularize_correlations_FIX(
+void oaci_silk_regularize_correlations_FIX(
     oac_int32                      *XX,                                    /* I/O  Correlation matrices                                                        */
     oac_int32                      *xx,                                    /* I/O  Correlation values                                                          */
     oac_int32 noise,                                                       /* I    Noise to add                                                                */
diff --git a/silk/fixed/residual_energy16_FIX.c b/silk/fixed/residual_energy16_FIX.c
index d5f9c80b8..ce9dadf64 100644
--- a/silk/fixed/residual_energy16_FIX.c
+++ b/silk/fixed/residual_energy16_FIX.c
@@ -32,7 +32,7 @@
 #include "main_FIX.h"
 
 /* Residual energy: nrg = wxx - 2 * wXx * c + c' * wXX * c */
-oac_int32 silk_residual_energy16_covar_FIX(
+oac_int32 oaci_silk_residual_energy16_covar_FIX(
     const oac_int16                *c,                                     /* I    Prediction vector                                                           */
     const oac_int32                *wXX,                                   /* I    Correlation matrix                                                          */
     const oac_int32                *wXx,                                   /* I    Correlation vector                                                          */
diff --git a/silk/fixed/residual_energy_FIX.c b/silk/fixed/residual_energy_FIX.c
index dd5479d71..74403fd0b 100644
--- a/silk/fixed/residual_energy_FIX.c
+++ b/silk/fixed/residual_energy_FIX.c
@@ -34,7 +34,7 @@
 
 /* Calculates residual energies of input subframes where all subframes have LPC_order   */
 /* of preceding samples                                                                 */
-void silk_residual_energy_FIX(
+void oaci_silk_residual_energy_FIX(
     oac_int32 nrgs[ MAX_NB_SUBFR ],                                        /* O    Residual energy per subframe                                                */
     oac_int nrgsQ[ MAX_NB_SUBFR ],                                         /* O    Q value per subframe                                                        */
     const oac_int16 x[],                                                   /* I    Input signal                                                                */
@@ -60,13 +60,13 @@ void silk_residual_energy_FIX(
     celt_assert((nb_subfr>>1)*(MAX_NB_SUBFR>>1) == nb_subfr );
     for (i = 0; i < nb_subfr>>1; i++) {
         /* Calculate half frame LPC residual signal including preceding samples */
-        silk_LPC_analysis_filter( LPC_res, x_ptr, a_Q12[ i ], (MAX_NB_SUBFR>>1)*offset, LPC_order, arch );
+        oaci_silk_LPC_analysis_filter( LPC_res, x_ptr, a_Q12[ i ], (MAX_NB_SUBFR>>1)*offset, LPC_order, arch );
 
         /* Point to first subframe of the just calculated LPC residual signal */
         LPC_res_ptr = LPC_res + LPC_order;
         for (j = 0; j < (MAX_NB_SUBFR>>1); j++) {
             /* Measure subframe energy */
-            silk_sum_sqr_shift( &nrgs[ i*(MAX_NB_SUBFR>>1) + j ], &rshift, LPC_res_ptr, subfr_length );
+            oaci_silk_sum_sqr_shift( &nrgs[ i*(MAX_NB_SUBFR>>1) + j ], &rshift, LPC_res_ptr, subfr_length );
 
             /* Set Q values for the measured energy */
             nrgsQ[ i*(MAX_NB_SUBFR>>1) + j ] = -rshift;
diff --git a/silk/fixed/schur64_FIX.c b/silk/fixed/schur64_FIX.c
index b01ab2e37..8d995686e 100644
--- a/silk/fixed/schur64_FIX.c
+++ b/silk/fixed/schur64_FIX.c
@@ -33,7 +33,7 @@
 
 /* Slower than schur(), but more accurate.                              */
 /* Uses SMULL(), available on armv4                                     */
-oac_int32 silk_schur64(                            /* O    returns residual energy                                     */
+oac_int32 oaci_silk_schur64(                            /* O    returns residual energy                                     */
     oac_int32 rc_Q16[],                            /* O    Reflection coefficients [order] Q16                         */
     const oac_int32 c[],                           /* I    Correlations [order+1]                                      */
     oac_int32 order                                /* I    Prediction order                                            */
diff --git a/silk/fixed/schur_FIX.c b/silk/fixed/schur_FIX.c
index b3d26d2f8..fd89c8dac 100644
--- a/silk/fixed/schur_FIX.c
+++ b/silk/fixed/schur_FIX.c
@@ -33,7 +33,7 @@
 
 /* Faster than schur64(), but much less accurate.                       */
 /* uses SMLAWB(), requiring armv5E and higher.                          */
-oac_int32 silk_schur(                              /* O    Returns residual energy                                     */
+oac_int32 oaci_silk_schur(                              /* O    Returns residual energy                                     */
     oac_int16                  *rc_Q15,            /* O    reflection coefficients [order] Q15                         */
     const oac_int32            *c,                 /* I    correlations [order+1]                                      */
     const oac_int32 order                          /* I    prediction order                                            */
diff --git a/silk/fixed/vector_ops_FIX.c b/silk/fixed/vector_ops_FIX.c
index e3c14901e..d41c6691f 100644
--- a/silk/fixed/vector_ops_FIX.c
+++ b/silk/fixed/vector_ops_FIX.c
@@ -33,7 +33,7 @@
 #include "pitch.h"
 
 /* Copy and multiply a vector by a constant */
-void silk_scale_copy_vector16(
+void oaci_silk_scale_copy_vector16(
     oac_int16                  *data_out,
     const oac_int16            *data_in,
     oac_int32 gain_Q16,                            /* I    Gain in Q16                                                 */
@@ -49,7 +49,7 @@ void silk_scale_copy_vector16(
 }
 
 /* Multiply a vector by a constant */
-void silk_scale_vector32_Q26_lshift_18(
+void oaci_silk_scale_vector32_Q26_lshift_18(
     oac_int32                  *data1,             /* I/O  Q0/Q18                                                      */
     oac_int32 gain_Q26,                            /* I    Q26                                                         */
     oac_int dataSize                               /* I    length                                                      */
@@ -66,14 +66,14 @@ void silk_scale_vector32_Q26_lshift_18(
 /*        * inVec1 and inVec2 should be at least 2 byte aligned.                */
 /*        * len should be positive 16bit integer.                               */
 /*        * only when len>6, memory access can be reduced by half.              */
-oac_int32 silk_inner_prod_aligned(
+oac_int32 oaci_silk_inner_prod_aligned(
     const oac_int16 *const inVec1,                 /*    I input vector 1                                              */
     const oac_int16 *const inVec2,                 /*    I input vector 2                                              */
     const oac_int len,                             /*    I vector lengths                                              */
     int arch                                        /*    I Run-time architecture                                       */
     ) {
 #ifdef FIXED_POINT
-    return celt_inner_prod(inVec1, inVec2, len, arch);
+    return oaci_celt_inner_prod(inVec1, inVec2, len, arch);
 #else
     oac_int i;
     oac_int32 sum = 0;
@@ -84,7 +84,7 @@ oac_int32 silk_inner_prod_aligned(
 #endif
 }
 
-oac_int64 silk_inner_prod16_c(
+oac_int64 oaci_silk_inner_prod16_c(
     const oac_int16            *inVec1,            /*    I input vector 1                                              */
     const oac_int16            *inVec2,            /*    I input vector 2                                              */
     const oac_int len                              /*    I vector lengths                                              */
diff --git a/silk/fixed/warped_autocorrelation_FIX.c b/silk/fixed/warped_autocorrelation_FIX.c
index 8d4ac4bdc..e00c8d133 100644
--- a/silk/fixed/warped_autocorrelation_FIX.c
+++ b/silk/fixed/warped_autocorrelation_FIX.c
@@ -37,8 +37,8 @@
 
 
 /* Autocorrelations for a warped frequency axis */
-#ifndef OVERRIDE_silk_warped_autocorrelation_FIX_c
-void silk_warped_autocorrelation_FIX_c(
+#ifndef OVERRIDE_oaci_silk_warped_autocorrelation_FIX_c
+void oaci_silk_warped_autocorrelation_FIX_c(
     oac_int32                *corr,                                        /* O    Result [order + 1]                                                          */
     oac_int                  *scale,                                       /* O    Scaling of the correlation vector                                           */
     const oac_int16                *input,                                 /* I    Input data to correlate                                                     */
@@ -88,4 +88,4 @@ void silk_warped_autocorrelation_FIX_c(
     }
     silk_assert( corr_QC[ 0 ] >= 0 ); /* If breaking, decrease QC*/
 }
-#endif /* OVERRIDE_silk_warped_autocorrelation_FIX_c */
+#endif /* OVERRIDE_oaci_silk_warped_autocorrelation_FIX_c */
diff --git a/silk/fixed/x86/burg_modified_FIX_sse4_1.c b/silk/fixed/x86/burg_modified_FIX_sse4_1.c
index d47876ea3..3851950bf 100644
--- a/silk/fixed/x86/burg_modified_FIX_sse4_1.c
+++ b/silk/fixed/x86/burg_modified_FIX_sse4_1.c
@@ -47,7 +47,7 @@
 #define MAX_RSHIFTS                 (32 - QA)
 
 /* Compute reflection coefficients from input signal */
-void silk_burg_modified_sse4_1(
+void oaci_silk_burg_modified_sse4_1(
     oac_int32                  *res_nrg,           /* O    Residual energy                                             */
     oac_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
     oac_int32 A_Q16[],                             /* O    Prediction coefficients (length order)                      */
@@ -76,7 +76,7 @@ void silk_burg_modified_sse4_1(
     celt_assert( subfr_length*nb_subfr <= MAX_FRAME_SIZE );
 
     /* Compute autocorrelations, added over subframes */
-    C0_64 = silk_inner_prod16( x, x, subfr_length*nb_subfr, arch );
+    C0_64 = oaci_silk_inner_prod16( x, x, subfr_length*nb_subfr, arch );
     lz = silk_CLZ64(C0_64);
     rshifts = 32 + 1 + N_BITS_HEAD_ROOM - lz;
     if (rshifts > MAX_RSHIFTS) rshifts = MAX_RSHIFTS;
@@ -95,7 +95,7 @@ void silk_burg_modified_sse4_1(
             x_ptr = x + s*subfr_length;
             for (n = 1; n < D + 1; n++) {
                 C_first_row[ n - 1 ] += (oac_int32)silk_RSHIFT64(
-                    silk_inner_prod16( x_ptr, x_ptr + n, subfr_length - n, arch ), rshifts );
+                    oaci_silk_inner_prod16( x_ptr, x_ptr + n, subfr_length - n, arch ), rshifts );
             }
         }
     } else {
@@ -103,7 +103,7 @@ void silk_burg_modified_sse4_1(
             int i;
             oac_int32 d;
             x_ptr = x + s*subfr_length;
-            celt_pitch_xcorr(x_ptr, x_ptr + 1, xcorr, subfr_length - D, D, arch );
+            oaci_celt_pitch_xcorr(x_ptr, x_ptr + 1, xcorr, subfr_length - D, D, arch );
             for (n = 1; n < D + 1; n++) {
                 for (i = n + subfr_length - D, d = 0; i < subfr_length; i++)
                     d = MAC16_16( d, x_ptr[ i ], x_ptr[ i - n ] );
@@ -349,12 +349,12 @@ void silk_burg_modified_sse4_1(
         if (rshifts > 0) {
             for (s = 0; s < nb_subfr; s++) {
                 x_ptr = x + s*subfr_length;
-                C0 -= (oac_int32)silk_RSHIFT64( silk_inner_prod16( x_ptr, x_ptr, D, arch ), rshifts );
+                C0 -= (oac_int32)silk_RSHIFT64( oaci_silk_inner_prod16( x_ptr, x_ptr, D, arch ), rshifts );
             }
         } else {
             for (s = 0; s < nb_subfr; s++) {
                 x_ptr = x + s*subfr_length;
-                C0 -= silk_LSHIFT32( silk_inner_prod_aligned( x_ptr, x_ptr, D, arch ), -rshifts );
+                C0 -= silk_LSHIFT32( oaci_silk_inner_prod_aligned( x_ptr, x_ptr, D, arch ), -rshifts );
             }
         }
         /* Approximate residual energy */
@@ -380,7 +380,7 @@ void silk_burg_modified_sse4_1(
         oac_int res_nrg_Q_c = 0;
         oac_int32 A_Q16_c[ MAX_LPC_ORDER ] = {0};
 
-        silk_burg_modified_c(
+        oaci_silk_burg_modified_c(
             &res_nrg_c,
             &res_nrg_Q_c,
             A_Q16_c,
diff --git a/silk/fixed/x86/vector_ops_FIX_sse4_1.c b/silk/fixed/x86/vector_ops_FIX_sse4_1.c
index 8eae66204..27ad46db5 100644
--- a/silk/fixed/x86/vector_ops_FIX_sse4_1.c
+++ b/silk/fixed/x86/vector_ops_FIX_sse4_1.c
@@ -38,7 +38,7 @@
 #include "pitch.h"
 #include "celt/x86/x86cpu.h"
 
-oac_int64 silk_inner_prod16_sse4_1(
+oac_int64 oaci_silk_inner_prod16_sse4_1(
     const oac_int16            *inVec1,            /*    I input vector 1                                              */
     const oac_int16            *inVec2,            /*    I input vector 2                                              */
     const oac_int len                              /*    I vector lengths                                              */
@@ -83,7 +83,7 @@ oac_int64 silk_inner_prod16_sse4_1(
 
 #ifdef OAC_CHECK_ASM
     {
-        oac_int64 sum_c = silk_inner_prod16_c( inVec1, inVec2, len );
+        oac_int64 sum_c = oaci_silk_inner_prod16_c( inVec1, inVec2, len );
         silk_assert( sum == sum_c );
     }
 #endif
diff --git a/silk/float/LPC_analysis_filter_FLP.c b/silk/float/LPC_analysis_filter_FLP.c
index 33a212a20..50df91e2a 100644
--- a/silk/float/LPC_analysis_filter_FLP.c
+++ b/silk/float/LPC_analysis_filter_FLP.c
@@ -202,7 +202,7 @@ static OAC_INLINE void silk_LPC_analysis_filter6_FLP(
 /* filter always starts with zero state         */
 /* first Order output samples are set to zero   */
 /************************************************/
-void silk_LPC_analysis_filter_FLP(
+void oaci_silk_LPC_analysis_filter_FLP(
     silk_float r_LPC[],                                                 /* O    LPC residual signal                         */
     const silk_float PredCoef[],                                        /* I    LPC coefficients                            */
     const silk_float s[],                                               /* I    Input signal                                */
diff --git a/silk/float/LPC_inv_pred_gain_FLP.c b/silk/float/LPC_inv_pred_gain_FLP.c
index 848296c0a..95c774e25 100644
--- a/silk/float/LPC_inv_pred_gain_FLP.c
+++ b/silk/float/LPC_inv_pred_gain_FLP.c
@@ -36,7 +36,7 @@
 /* compute inverse of LPC prediction gain, and                          */
 /* test if LPC coefficients are stable (all poles within unit circle)   */
 /* this code is based on silk_a2k_FLP()                                 */
-silk_float silk_LPC_inverse_pred_gain_FLP(  /* O    return inverse prediction gain, energy domain               */
+silk_float oaci_silk_LPC_inverse_pred_gain_FLP(  /* O    return inverse prediction gain, energy domain               */
     const silk_float    *A,                 /* I    prediction coefficients [order]                             */
     oac_int32 order                        /* I    prediction order                                            */
     ) {
diff --git a/silk/float/LTP_analysis_filter_FLP.c b/silk/float/LTP_analysis_filter_FLP.c
index a47dce895..af56006e7 100644
--- a/silk/float/LTP_analysis_filter_FLP.c
+++ b/silk/float/LTP_analysis_filter_FLP.c
@@ -31,7 +31,7 @@
 
 #include "main_FLP.h"
 
-void silk_LTP_analysis_filter_FLP(
+void oaci_silk_LTP_analysis_filter_FLP(
     silk_float                      *LTP_res,                           /* O    LTP res MAX_NB_SUBFR*(pre_lgth+subfr_lngth) */
     const silk_float                *x,                                 /* I    Input signal, with preceding samples        */
     const silk_float B[ LTP_ORDER*MAX_NB_SUBFR ],                       /* I    LTP coefficients for each subframe          */
diff --git a/silk/float/LTP_scale_ctrl_FLP.c b/silk/float/LTP_scale_ctrl_FLP.c
index 910cba9ea..4eb19b4f1 100644
--- a/silk/float/LTP_scale_ctrl_FLP.c
+++ b/silk/float/LTP_scale_ctrl_FLP.c
@@ -31,7 +31,7 @@
 
 #include "main_FLP.h"
 
-void silk_LTP_scale_ctrl_FLP(
+void oaci_silk_LTP_scale_ctrl_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     oac_int condCoding                                                 /* I    The type of conditional coding to use       */
@@ -47,13 +47,13 @@ void silk_LTP_scale_ctrl_FLP(
             round_loss = 2 + silk_SMULBB( round_loss, round_loss)/100;
         }
         psEnc->sCmn.indices.LTP_scaleIndex = silk_SMULBB( psEncCtrl->LTPredCodGain,
-        round_loss ) > silk_log2lin( 2900 - psEnc->sCmn.SNR_dB_Q7 );
+        round_loss ) > oaci_silk_log2lin( 2900 - psEnc->sCmn.SNR_dB_Q7 );
         psEnc->sCmn.indices.LTP_scaleIndex += silk_SMULBB( psEncCtrl->LTPredCodGain,
-        round_loss ) > silk_log2lin( 3900 - psEnc->sCmn.SNR_dB_Q7 );
+        round_loss ) > oaci_silk_log2lin( 3900 - psEnc->sCmn.SNR_dB_Q7 );
     } else {
         /* Default is minimum scaling */
         psEnc->sCmn.indices.LTP_scaleIndex = 0;
     }
 
-    psEncCtrl->LTP_scale = (silk_float)silk_LTPScales_table_Q14[ psEnc->sCmn.indices.LTP_scaleIndex ]/16384.0f;
+    psEncCtrl->LTP_scale = (silk_float)oaci_silk_LTPScales_table_Q14[ psEnc->sCmn.indices.LTP_scaleIndex ]/16384.0f;
 }
diff --git a/silk/float/SigProc_FLP.h b/silk/float/SigProc_FLP.h
index 208757d34..6c2a366e0 100644
--- a/silk/float/SigProc_FLP.h
+++ b/silk/float/SigProc_FLP.h
@@ -39,7 +39,7 @@
 /********************************************************************/
 
 /* Chirp (bw expand) LP AR filter */
-void silk_bwexpander_FLP(
+void oaci_silk_bwexpander_FLP(
     silk_float          *ar,                /* I/O  AR filter to be expanded (without leading 1)                */
     const oac_int d,                       /* I    length of ar                                                */
     const silk_float chirp                  /* I    chirp factor (typically in range (0..1) )                   */
@@ -48,32 +48,32 @@ void silk_bwexpander_FLP(
 /* compute inverse of LPC prediction gain, and                          */
 /* test if LPC coefficients are stable (all poles within unit circle)   */
 /* this code is based on silk_FLP_a2k()                                 */
-silk_float silk_LPC_inverse_pred_gain_FLP(  /* O    return inverse prediction gain, energy domain               */
+silk_float oaci_silk_LPC_inverse_pred_gain_FLP(  /* O    return inverse prediction gain, energy domain               */
     const silk_float    *A,                 /* I    prediction coefficients [order]                             */
     oac_int32 order                        /* I    prediction order                                            */
     );
 
-silk_float silk_schur_FLP(                  /* O    returns residual energy                                     */
+silk_float oaci_silk_schur_FLP(                  /* O    returns residual energy                                     */
     silk_float refl_coef[],                 /* O    reflection coefficients (length order)                      */
     const silk_float auto_corr[],           /* I    autocorrelation sequence (length order+1)                   */
     oac_int order                          /* I    order                                                       */
     );
 
-void silk_k2a_FLP(
+void oaci_silk_k2a_FLP(
     silk_float          *A,                 /* O     prediction coefficients [order]                            */
     const silk_float    *rc,                /* I     reflection coefficients [order]                            */
     oac_int32 order                        /* I     prediction order                                           */
     );
 
 /* compute autocorrelation */
-void silk_autocorrelation_FLP(
+void oaci_silk_autocorrelation_FLP(
     silk_float          *results,           /* O    result (length correlationCount)                            */
     const silk_float    *inputData,         /* I    input data to correlate                                     */
     oac_int inputDataSize,                 /* I    length of input                                             */
     oac_int correlationCount,               /* I    number of correlation taps to compute                       */
     int arch);
 
-oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1 unvoiced                      */
+oac_int oaci_silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1 unvoiced                      */
     const silk_float    *frame,             /* I    Signal of length PE_FRAME_LENGTH_MS*Fs_kHz                  */
     oac_int            *pitch_out,         /* O    Pitch lag values [nb_subfr]                                 */
     oac_int16          *lagIndex,          /* O    Lag Index                                                   */
@@ -88,7 +88,7 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
     int arch                                /* I    Run-time architecture                                       */
     );
 
-void silk_insertion_sort_decreasing_FLP(
+void oaci_silk_insertion_sort_decreasing_FLP(
     silk_float          *a,                 /* I/O  Unsorted / Sorted vector                                    */
     oac_int            *idx,               /* O    Index vector for the sorted elements                        */
     const oac_int L,                       /* I    Vector length                                               */
@@ -96,7 +96,7 @@ void silk_insertion_sort_decreasing_FLP(
     );
 
 /* Compute reflection coefficients from input signal */
-silk_float silk_burg_modified_FLP(          /* O    returns residual energy                                     */
+silk_float oaci_silk_burg_modified_FLP(          /* O    returns residual energy                                     */
     silk_float A[],                         /* O    prediction coefficients (length order)                      */
     const silk_float x[],                   /* I    input signal, length: nb_subfr*(D+L_sub)                    */
     const silk_float minInvGain,            /* I    minimum inverse prediction gain                             */
@@ -106,32 +106,32 @@ silk_float silk_burg_modified_FLP(          /* O    returns residual energy
     int arch);
 
 /* multiply a vector by a constant */
-void silk_scale_vector_FLP(
+void oaci_silk_scale_vector_FLP(
     silk_float          *data1,
     silk_float gain,
     oac_int dataSize);
 
 /* copy and multiply a vector by a constant */
-void silk_scale_copy_vector_FLP(
+void oaci_silk_scale_copy_vector_FLP(
     silk_float          *data_out,
     const silk_float    *data_in,
     silk_float gain,
     oac_int dataSize);
 
 /* inner product of two silk_float arrays, with result as double */
-double silk_inner_product_FLP_c(
+double oaci_silk_inner_product_FLP_c(
     const silk_float    *data1,
     const silk_float    *data2,
     oac_int dataSize);
 
 #ifndef OVERRIDE_inner_product_FLP
-# define silk_inner_product_FLP(data1, data2, dataSize, arch) ((void)arch, \
-                                                               silk_inner_product_FLP_c(data1, data2, dataSize))
+# define oaci_silk_inner_product_FLP(data1, data2, dataSize, arch) ((void)arch, \
+                                                               oaci_silk_inner_product_FLP_c(data1, data2, dataSize))
 #endif
 
 
 /* sum of squares of a silk_float array, with result as double */
-double silk_energy_FLP(
+double oaci_silk_energy_FLP(
     const silk_float    *data,
     oac_int dataSize);
 
diff --git a/silk/float/apply_sine_window_FLP.c b/silk/float/apply_sine_window_FLP.c
index 49d991dd1..883b5165e 100644
--- a/silk/float/apply_sine_window_FLP.c
+++ b/silk/float/apply_sine_window_FLP.c
@@ -35,7 +35,7 @@
 /* Window types:                        */
 /*  1 -> sine window from 0 to pi/2     */
 /*  2 -> sine window from pi/2 to pi    */
-void silk_apply_sine_window_FLP(
+void oaci_silk_apply_sine_window_FLP(
     silk_float px_win[],                                                /* O    Pointer to windowed signal                  */
     const silk_float px[],                                              /* I    Pointer to input signal                     */
     const oac_int win_type,                                            /* I    Selects a window type                       */
diff --git a/silk/float/autocorrelation_FLP.c b/silk/float/autocorrelation_FLP.c
index 2229742d3..30318d89a 100644
--- a/silk/float/autocorrelation_FLP.c
+++ b/silk/float/autocorrelation_FLP.c
@@ -33,7 +33,7 @@
 #include "SigProc_FLP.h"
 
 /* compute autocorrelation */
-void silk_autocorrelation_FLP(
+void oaci_silk_autocorrelation_FLP(
     silk_float          *results,           /* O    result (length correlationCount)                            */
     const silk_float    *inputData,         /* I    input data to correlate                                     */
     oac_int inputDataSize,                 /* I    length of input                                             */
@@ -46,6 +46,6 @@ void silk_autocorrelation_FLP(
     }
 
     for (i = 0; i < correlationCount; i++) {
-        results[ i ] =  (silk_float)silk_inner_product_FLP( inputData, inputData + i, inputDataSize - i, arch );
+        results[ i ] =  (silk_float)oaci_silk_inner_product_FLP( inputData, inputData + i, inputDataSize - i, arch );
     }
 }
diff --git a/silk/float/burg_modified_FLP.c b/silk/float/burg_modified_FLP.c
index dffa91663..7aa5f52ed 100644
--- a/silk/float/burg_modified_FLP.c
+++ b/silk/float/burg_modified_FLP.c
@@ -36,7 +36,7 @@
 #define MAX_FRAME_SIZE              384 /* subfr_length * nb_subfr = ( 0.005 * 16000 + 16 ) * 4 = 384*/
 
 /* Compute reflection coefficients from input signal */
-silk_float silk_burg_modified_FLP(          /* O    returns residual energy                                     */
+silk_float oaci_silk_burg_modified_FLP(          /* O    returns residual energy                                     */
     silk_float A[],                         /* O    prediction coefficients (length order)                      */
     const silk_float x[],                   /* I    input signal, length: nb_subfr*(D+L_sub)                    */
     const silk_float minInvGain,            /* I    minimum inverse prediction gain                             */
@@ -54,12 +54,12 @@ silk_float silk_burg_modified_FLP(          /* O    returns residual energy
     celt_assert( subfr_length*nb_subfr <= MAX_FRAME_SIZE );
 
     /* Compute autocorrelations, added over subframes */
-    C0 = silk_energy_FLP( x, nb_subfr*subfr_length );
+    C0 = oaci_silk_energy_FLP( x, nb_subfr*subfr_length );
     silk_memset( C_first_row, 0, SILK_MAX_ORDER_LPC*sizeof(double));
     for (s = 0; s < nb_subfr; s++) {
         x_ptr = x + s*subfr_length;
         for (n = 1; n < D + 1; n++) {
-            C_first_row[ n - 1 ] += silk_inner_product_FLP( x_ptr, x_ptr + n, subfr_length - n, arch );
+            C_first_row[ n - 1 ] += oaci_silk_inner_product_FLP( x_ptr, x_ptr + n, subfr_length - n, arch );
         }
     }
     silk_memcpy( C_last_row, C_first_row, SILK_MAX_ORDER_LPC*sizeof(double));
@@ -163,7 +163,7 @@ silk_float silk_burg_modified_FLP(          /* O    returns residual energy
         }
         /* Subtract energy of preceding samples from C0 */
         for (s = 0; s < nb_subfr; s++) {
-            C0 -= silk_energy_FLP( x + s*subfr_length, D );
+            C0 -= oaci_silk_energy_FLP( x + s*subfr_length, D );
         }
         /* Approximate residual energy */
         nrg_f = C0*invGain;
diff --git a/silk/float/bwexpander_FLP.c b/silk/float/bwexpander_FLP.c
index f760b0cc8..3d61c9e9e 100644
--- a/silk/float/bwexpander_FLP.c
+++ b/silk/float/bwexpander_FLP.c
@@ -32,7 +32,7 @@
 #include "SigProc_FLP.h"
 
 /* Chirp (bw expand) LP AR filter */
-void silk_bwexpander_FLP(
+void oaci_silk_bwexpander_FLP(
     silk_float          *ar,                /* I/O  AR filter to be expanded (without leading 1)                */
     const oac_int d,                       /* I    length of ar                                                */
     const silk_float chirp                  /* I    chirp factor (typically in range (0..1) )                   */
diff --git a/silk/float/corrMatrix_FLP.c b/silk/float/corrMatrix_FLP.c
index ca765be18..5d22a327a 100644
--- a/silk/float/corrMatrix_FLP.c
+++ b/silk/float/corrMatrix_FLP.c
@@ -36,7 +36,7 @@
 #include "main_FLP.h"
 
 /* Calculates correlation vector X'*t */
-void silk_corrVector_FLP(
+void oaci_silk_corrVector_FLP(
     const silk_float                *x,                                 /* I    x vector [L+order-1] used to create X       */
     const silk_float                *t,                                 /* I    Target vector [L]                           */
     const oac_int L,                                                   /* I    Length of vecors                            */
@@ -49,13 +49,13 @@ void silk_corrVector_FLP(
     ptr1 = &x[ Order - 1 ];                     /* Points to first sample of column 0 of X: X[:,0] */
     for (lag = 0; lag < Order; lag++) {
         /* Calculate X[:,lag]'*t */
-        Xt[ lag ] = (silk_float)silk_inner_product_FLP( ptr1, t, L, arch );
+        Xt[ lag ] = (silk_float)oaci_silk_inner_product_FLP( ptr1, t, L, arch );
         ptr1--;                                 /* Next column of X */
     }
 }
 
 /* Calculates correlation matrix X'*X */
-void silk_corrMatrix_FLP(
+void oaci_silk_corrMatrix_FLP(
     const silk_float                *x,                                 /* I    x vector [ L+order-1 ] used to create X     */
     const oac_int L,                                                   /* I    Length of vectors                           */
     const oac_int Order,                                               /* I    Max lag for correlation                     */
@@ -66,7 +66,7 @@ void silk_corrMatrix_FLP(
     const silk_float *ptr1, *ptr2;
 
     ptr1 = &x[ Order - 1 ];                     /* First sample of column 0 of X */
-    energy = silk_energy_FLP( ptr1, L );  /* X[:,0]'*X[:,0] */
+    energy = oaci_silk_energy_FLP( ptr1, L );  /* X[:,0]'*X[:,0] */
     matrix_ptr( XX, 0, 0, Order ) = ( silk_float )energy;
     for (j = 1; j < Order; j++) {
         /* Calculate X[:,j]'*X[:,j] */
@@ -77,7 +77,7 @@ void silk_corrMatrix_FLP(
     ptr2 = &x[ Order - 2 ];                     /* First sample of column 1 of X */
     for (lag = 1; lag < Order; lag++) {
         /* Calculate X[:,0]'*X[:,lag] */
-        energy = silk_inner_product_FLP( ptr1, ptr2, L, arch );
+        energy = oaci_silk_inner_product_FLP( ptr1, ptr2, L, arch );
         matrix_ptr( XX, lag, 0, Order ) = ( silk_float )energy;
         matrix_ptr( XX, 0, lag, Order ) = ( silk_float )energy;
         /* Calculate X[:,j]'*X[:,j + lag] */
diff --git a/silk/float/encode_frame_FLP.c b/silk/float/encode_frame_FLP.c
index 11ccb4052..678e2c410 100644
--- a/silk/float/encode_frame_FLP.c
+++ b/silk/float/encode_frame_FLP.c
@@ -42,7 +42,7 @@ static OAC_INLINE void silk_LBRR_encode_FLP(
     oac_int condCoding                                                 /* I    The type of conditional coding used so far for this frame */
     );
 
-void silk_encode_do_VAD_FLP(
+void oaci_silk_encode_do_VAD_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     oac_int activity                                                   /* I    Decision of Oac voice activity detector    */
     ) {
@@ -51,7 +51,7 @@ void silk_encode_do_VAD_FLP(
     /****************************/
     /* Voice Activity Detection */
     /****************************/
-    silk_VAD_GetSA_Q8( &psEnc->sCmn, psEnc->sCmn.inputBuf + 1, psEnc->sCmn.arch );
+    oaci_silk_VAD_GetSA_Q8( &psEnc->sCmn, psEnc->sCmn.inputBuf + 1, psEnc->sCmn.arch );
     /* If Oac VAD is inactive and Silk VAD is active: lower Silk VAD to just under the threshold */
     if (activity == VAD_NO_ACTIVITY && psEnc->sCmn.speech_activity_Q8 >= activity_threshold) {
         psEnc->sCmn.speech_activity_Q8 = activity_threshold - 1;
@@ -81,7 +81,7 @@ void silk_encode_do_VAD_FLP(
 /****************/
 /* Encode frame */
 /****************/
-oac_int silk_encode_frame_FLP(
+oac_int oaci_silk_encode_frame_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     oac_int32                      *pnBytesOut,                        /* O    Number of payload bytes;                    */
     ec_enc                          *psRangeEnc,                        /* I/O  compressor data structure                   */
@@ -129,7 +129,7 @@ oac_int silk_encode_frame_FLP(
     /***************************************/
     /* Ensure smooth bandwidth transitions */
     /***************************************/
-    silk_LP_variable_cutoff( &psEnc->sCmn.sLP, psEnc->sCmn.inputBuf + 1, psEnc->sCmn.frame_length );
+    oaci_silk_LP_variable_cutoff( &psEnc->sCmn.sLP, psEnc->sCmn.inputBuf + 1, psEnc->sCmn.frame_length );
 
     /*******************************************/
     /* Copy new frame to front of input buffer */
@@ -147,22 +147,22 @@ oac_int silk_encode_frame_FLP(
         /*****************************************/
         /* Find pitch lags, initial LPC analysis */
         /*****************************************/
-        silk_find_pitch_lags_FLP( psEnc, &sEncCtrl, res_pitch, x_frame, psEnc->sCmn.arch );
+        oaci_silk_find_pitch_lags_FLP( psEnc, &sEncCtrl, res_pitch, x_frame, psEnc->sCmn.arch );
 
         /************************/
         /* Noise shape analysis */
         /************************/
-        silk_noise_shape_analysis_FLP( psEnc, &sEncCtrl, res_pitch_frame, x_frame );
+        oaci_silk_noise_shape_analysis_FLP( psEnc, &sEncCtrl, res_pitch_frame, x_frame );
 
         /***************************************************/
         /* Find linear prediction coefficients (LPC + LTP) */
         /***************************************************/
-        silk_find_pred_coefs_FLP( psEnc, &sEncCtrl, res_pitch_frame, x_frame, condCoding );
+        oaci_silk_find_pred_coefs_FLP( psEnc, &sEncCtrl, res_pitch_frame, x_frame, condCoding );
 
         /****************************************/
         /* Process gains                        */
         /****************************************/
-        silk_process_gains_FLP( psEnc, &sEncCtrl, condCoding );
+        oaci_silk_process_gains_FLP( psEnc, &sEncCtrl, condCoding );
 
         /****************************************/
         /* Low Bitrate Redundant Encoding       */
@@ -174,7 +174,7 @@ oac_int silk_encode_frame_FLP(
         gainMult_Q8 = SILK_FIX_CONST( 1, 8 );
         found_lower = 0;
         found_upper = 0;
-        gainsID = silk_gains_ID( psEnc->sCmn.indices.GainsIndices, psEnc->sCmn.nb_subfr );
+        gainsID = oaci_silk_gains_ID( psEnc->sCmn.indices.GainsIndices, psEnc->sCmn.nb_subfr );
         gainsID_lower = -1;
         gainsID_upper = -1;
         /* Copy part of the input state */
@@ -202,7 +202,7 @@ oac_int silk_encode_frame_FLP(
                 /*****************************************/
                 /* Noise shaping quantization            */
                 /*****************************************/
-                silk_NSQ_wrapper_FLP( psEnc, &sEncCtrl, &psEnc->sCmn.indices, &psEnc->sCmn.sNSQ, psEnc->sCmn.pulses,
+                oaci_silk_NSQ_wrapper_FLP( psEnc, &sEncCtrl, &psEnc->sCmn.indices, &psEnc->sCmn.sNSQ, psEnc->sCmn.pulses,
                 x_frame );
 
                 if (iter == maxIter && !found_lower) {
@@ -212,12 +212,12 @@ oac_int silk_encode_frame_FLP(
                 /****************************************/
                 /* Encode Parameters                    */
                 /****************************************/
-                silk_encode_indices( &psEnc->sCmn, psRangeEnc, psEnc->sCmn.nFramesEncoded, 0, condCoding );
+                oaci_silk_encode_indices( &psEnc->sCmn, psRangeEnc, psEnc->sCmn.nFramesEncoded, 0, condCoding );
 
                 /****************************************/
                 /* Encode Excitation Signal             */
                 /****************************************/
-                silk_encode_pulses( psRangeEnc, psEnc->sCmn.indices.signalType, psEnc->sCmn.indices.quantOffsetType,
+                oaci_silk_encode_pulses( psRangeEnc, psEnc->sCmn.indices.signalType, psEnc->sCmn.indices.quantOffsetType,
                       psEnc->sCmn.pulses, psEnc->sCmn.frame_length );
 
                 nBits = ec_tell( psRangeEnc );
@@ -241,9 +241,9 @@ oac_int silk_encode_frame_FLP(
                         psEnc->sCmn.pulses[ i ] = 0;
                     }
 
-                    silk_encode_indices( &psEnc->sCmn, psRangeEnc, psEnc->sCmn.nFramesEncoded, 0, condCoding );
+                    oaci_silk_encode_indices( &psEnc->sCmn, psRangeEnc, psEnc->sCmn.nFramesEncoded, 0, condCoding );
 
-                    silk_encode_pulses( psRangeEnc, psEnc->sCmn.indices.signalType, psEnc->sCmn.indices.quantOffsetType,
+                    oaci_silk_encode_pulses( psRangeEnc, psEnc->sCmn.indices.signalType, psEnc->sCmn.indices.quantOffsetType,
                         psEnc->sCmn.pulses, psEnc->sCmn.frame_length );
 
                     nBits = ec_tell( psRangeEnc );
@@ -345,11 +345,11 @@ oac_int silk_encode_frame_FLP(
 
             /* Quantize gains */
             psEnc->sShape.LastGainIndex = sEncCtrl.lastGainIndexPrev;
-            silk_gains_quant( psEnc->sCmn.indices.GainsIndices, pGains_Q16,
+            oaci_silk_gains_quant( psEnc->sCmn.indices.GainsIndices, pGains_Q16,
                   &psEnc->sShape.LastGainIndex, condCoding == CODE_CONDITIONALLY, psEnc->sCmn.nb_subfr );
 
             /* Unique identifier of gains vector */
-            gainsID = silk_gains_ID( psEnc->sCmn.indices.GainsIndices, psEnc->sCmn.nb_subfr );
+            gainsID = oaci_silk_gains_ID( psEnc->sCmn.indices.GainsIndices, psEnc->sCmn.nb_subfr );
 
             /* Overwrite unquantized gains with quantized gains and convert back to Q0 from Q16 */
             for (i = 0; i < psEnc->sCmn.nb_subfr; i++) {
@@ -426,7 +426,7 @@ static OAC_INLINE void silk_LBRR_encode_FLP(
         }
 
         /* Decode to get gains in sync with decoder */
-        silk_gains_dequant( Gains_Q16, psIndices_LBRR->GainsIndices,
+        oaci_silk_gains_dequant( Gains_Q16, psIndices_LBRR->GainsIndices,
             &psEnc->sCmn.LBRRprevLastGainIndex, condCoding == CODE_CONDITIONALLY, psEnc->sCmn.nb_subfr );
 
         /* Overwrite unquantized gains with quantized gains and convert back to Q0 from Q16 */
@@ -437,7 +437,7 @@ static OAC_INLINE void silk_LBRR_encode_FLP(
         /*****************************************/
         /* Noise shaping quantization            */
         /*****************************************/
-        silk_NSQ_wrapper_FLP( psEnc, psEncCtrl, psIndices_LBRR, &sNSQ_LBRR[0],
+        oaci_silk_NSQ_wrapper_FLP( psEnc, psEncCtrl, psIndices_LBRR, &sNSQ_LBRR[0],
             psEnc->sCmn.pulses_LBRR[ psEnc->sCmn.nFramesEncoded ], xfw );
 
         /* Restore original gains */
diff --git a/silk/float/energy_FLP.c b/silk/float/energy_FLP.c
index 1825a90a5..e02e15ab6 100644
--- a/silk/float/energy_FLP.c
+++ b/silk/float/energy_FLP.c
@@ -32,7 +32,7 @@
 #include "SigProc_FLP.h"
 
 /* sum of squares of a silk_float array, with result as double */
-double silk_energy_FLP(
+double oaci_silk_energy_FLP(
     const silk_float    *data,
     oac_int dataSize)                                {
     oac_int i;
diff --git a/silk/float/find_LPC_FLP.c b/silk/float/find_LPC_FLP.c
index 5766459f2..6049a5383 100644
--- a/silk/float/find_LPC_FLP.c
+++ b/silk/float/find_LPC_FLP.c
@@ -34,7 +34,7 @@
 #include "tuning_parameters.h"
 
 /* LPC analysis */
-void silk_find_LPC_FLP(
+void oaci_silk_find_LPC_FLP(
     silk_encoder_state              *psEncC,                            /* I/O  Encoder state                               */
     oac_int16 NLSF_Q15[],                                              /* O    NLSFs                                       */
     const silk_float x[],                                               /* I    Input signal                                */
@@ -55,32 +55,32 @@ void silk_find_LPC_FLP(
     psEncC->indices.NLSFInterpCoef_Q2 = 4;
 
     /* Burg AR analysis for the full frame */
-    res_nrg = silk_burg_modified_FLP( a, x, minInvGain, subfr_length, psEncC->nb_subfr, psEncC->predictLPCOrder, arch );
+    res_nrg = oaci_silk_burg_modified_FLP( a, x, minInvGain, subfr_length, psEncC->nb_subfr, psEncC->predictLPCOrder, arch );
 
     if (psEncC->useInterpolatedNLSFs && !psEncC->first_frame_after_reset && psEncC->nb_subfr == MAX_NB_SUBFR) {
         /* Optimal solution for last 10 ms; subtract residual energy here, as that's easier than        */
         /* adding it to the residual energy of the first 10 ms in each iteration of the search below    */
-        res_nrg -= silk_burg_modified_FLP( a_tmp, x + (MAX_NB_SUBFR/2)*subfr_length, minInvGain, subfr_length,
+        res_nrg -= oaci_silk_burg_modified_FLP( a_tmp, x + (MAX_NB_SUBFR/2)*subfr_length, minInvGain, subfr_length,
         MAX_NB_SUBFR/2, psEncC->predictLPCOrder, arch );
 
         /* Convert to NLSFs */
-        silk_A2NLSF_FLP( NLSF_Q15, a_tmp, psEncC->predictLPCOrder );
+        oaci_silk_A2NLSF_FLP( NLSF_Q15, a_tmp, psEncC->predictLPCOrder );
 
         /* Search over interpolation indices to find the one with lowest residual energy */
         res_nrg_2nd = silk_float_MAX;
         for (k = 3; k >= 0; k--) {
             /* Interpolate NLSFs for first half */
-            silk_interpolate( NLSF0_Q15, psEncC->prev_NLSFq_Q15, NLSF_Q15, k, psEncC->predictLPCOrder );
+            oaci_silk_interpolate( NLSF0_Q15, psEncC->prev_NLSFq_Q15, NLSF_Q15, k, psEncC->predictLPCOrder );
 
             /* Convert to LPC for residual energy evaluation */
-            silk_NLSF2A_FLP( a_tmp, NLSF0_Q15, psEncC->predictLPCOrder, psEncC->arch );
+            oaci_silk_NLSF2A_FLP( a_tmp, NLSF0_Q15, psEncC->predictLPCOrder, psEncC->arch );
 
             /* Calculate residual energy with LSF interpolation */
-            silk_LPC_analysis_filter_FLP( LPC_res, a_tmp, x, 2*subfr_length, psEncC->predictLPCOrder );
+            oaci_silk_LPC_analysis_filter_FLP( LPC_res, a_tmp, x, 2*subfr_length, psEncC->predictLPCOrder );
             res_nrg_interp = (silk_float)(
-                silk_energy_FLP( LPC_res + psEncC->predictLPCOrder,
+                oaci_silk_energy_FLP( LPC_res + psEncC->predictLPCOrder,
             subfr_length - psEncC->predictLPCOrder )
-                + silk_energy_FLP( LPC_res + psEncC->predictLPCOrder + subfr_length,
+                + oaci_silk_energy_FLP( LPC_res + psEncC->predictLPCOrder + subfr_length,
             subfr_length - psEncC->predictLPCOrder ));
 
             /* Determine whether current interpolated NLSFs are best so far */
@@ -98,7 +98,7 @@ void silk_find_LPC_FLP(
 
     if (psEncC->indices.NLSFInterpCoef_Q2 == 4) {
         /* NLSF interpolation is currently inactive, calculate NLSFs from full frame AR coefficients */
-        silk_A2NLSF_FLP( NLSF_Q15, a, psEncC->predictLPCOrder );
+        oaci_silk_A2NLSF_FLP( NLSF_Q15, a, psEncC->predictLPCOrder );
     }
 
     celt_assert( psEncC->indices.NLSFInterpCoef_Q2 == 4
diff --git a/silk/float/find_LTP_FLP.c b/silk/float/find_LTP_FLP.c
index 917625eaf..cf53cf982 100644
--- a/silk/float/find_LTP_FLP.c
+++ b/silk/float/find_LTP_FLP.c
@@ -32,7 +32,7 @@
 #include "main_FLP.h"
 #include "tuning_parameters.h"
 
-void silk_find_LTP_FLP(
+void oaci_silk_find_LTP_FLP(
     silk_float XX[ MAX_NB_SUBFR*LTP_ORDER*LTP_ORDER ],                          /* O    Weight for LTP quantization         */
     silk_float xX[ MAX_NB_SUBFR*LTP_ORDER ],                            /* O    Weight for LTP quantization                 */
     const silk_float r_ptr[],                                           /* I    LPC residual                                */
@@ -49,12 +49,12 @@ void silk_find_LTP_FLP(
     XX_ptr = XX;
     for (k = 0; k < nb_subfr; k++) {
         lag_ptr = r_ptr - (lag[ k ] + LTP_ORDER/2);
-        silk_corrMatrix_FLP( lag_ptr, subfr_length, LTP_ORDER, XX_ptr, arch );
-        silk_corrVector_FLP( lag_ptr, r_ptr, subfr_length, LTP_ORDER, xX_ptr, arch );
-        xx = ( silk_float )silk_energy_FLP( r_ptr, subfr_length + LTP_ORDER );
+        oaci_silk_corrMatrix_FLP( lag_ptr, subfr_length, LTP_ORDER, XX_ptr, arch );
+        oaci_silk_corrVector_FLP( lag_ptr, r_ptr, subfr_length, LTP_ORDER, xX_ptr, arch );
+        xx = ( silk_float )oaci_silk_energy_FLP( r_ptr, subfr_length + LTP_ORDER );
         temp = 1.0f/silk_max( xx, LTP_CORR_INV_MAX*0.5f*(XX_ptr[ 0 ] + XX_ptr[ 24 ]) + 1.0f );
-        silk_scale_vector_FLP( XX_ptr, temp, LTP_ORDER*LTP_ORDER );
-        silk_scale_vector_FLP( xX_ptr, temp, LTP_ORDER );
+        oaci_silk_scale_vector_FLP( XX_ptr, temp, LTP_ORDER*LTP_ORDER );
+        oaci_silk_scale_vector_FLP( xX_ptr, temp, LTP_ORDER );
 
         r_ptr  += subfr_length;
         XX_ptr += LTP_ORDER*LTP_ORDER;
diff --git a/silk/float/find_pitch_lags_FLP.c b/silk/float/find_pitch_lags_FLP.c
index b6e8bdcda..d9bd3feae 100644
--- a/silk/float/find_pitch_lags_FLP.c
+++ b/silk/float/find_pitch_lags_FLP.c
@@ -33,7 +33,7 @@
 #include "main_FLP.h"
 #include "tuning_parameters.h"
 
-void silk_find_pitch_lags_FLP(
+void oaci_silk_find_pitch_lags_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     silk_float res[],                                                   /* O    Residual                                    */
@@ -68,7 +68,7 @@ void silk_find_pitch_lags_FLP(
     /* First LA_LTP samples */
     x_buf_ptr = x_buf + buf_len - psEnc->sCmn.pitch_LPC_win_length;
     Wsig_ptr  = Wsig;
-    silk_apply_sine_window_FLP( Wsig_ptr, x_buf_ptr, 1, psEnc->sCmn.la_pitch );
+    oaci_silk_apply_sine_window_FLP( Wsig_ptr, x_buf_ptr, 1, psEnc->sCmn.la_pitch );
 
     /* Middle non-windowed samples */
     Wsig_ptr  += psEnc->sCmn.la_pitch;
@@ -79,31 +79,31 @@ void silk_find_pitch_lags_FLP(
     /* Last LA_LTP samples */
     Wsig_ptr  += psEnc->sCmn.pitch_LPC_win_length - (psEnc->sCmn.la_pitch<<1);
     x_buf_ptr += psEnc->sCmn.pitch_LPC_win_length - (psEnc->sCmn.la_pitch<<1);
-    silk_apply_sine_window_FLP( Wsig_ptr, x_buf_ptr, 2, psEnc->sCmn.la_pitch );
+    oaci_silk_apply_sine_window_FLP( Wsig_ptr, x_buf_ptr, 2, psEnc->sCmn.la_pitch );
 
     /* Calculate autocorrelation sequence */
-    silk_autocorrelation_FLP( auto_corr, Wsig, psEnc->sCmn.pitch_LPC_win_length,
+    oaci_silk_autocorrelation_FLP( auto_corr, Wsig, psEnc->sCmn.pitch_LPC_win_length,
     psEnc->sCmn.pitchEstimationLPCOrder + 1, arch );
 
     /* Add white noise, as a fraction of the energy */
     auto_corr[ 0 ] += auto_corr[ 0 ]*FIND_PITCH_WHITE_NOISE_FRACTION + 1;
 
     /* Calculate the reflection coefficients using Schur */
-    res_nrg = silk_schur_FLP( refl_coef, auto_corr, psEnc->sCmn.pitchEstimationLPCOrder );
+    res_nrg = oaci_silk_schur_FLP( refl_coef, auto_corr, psEnc->sCmn.pitchEstimationLPCOrder );
 
     /* Prediction gain */
     psEncCtrl->predGain = auto_corr[ 0 ]/silk_max_float( res_nrg, 1.0f );
 
     /* Convert reflection coefficients to prediction coefficients */
-    silk_k2a_FLP( A, refl_coef, psEnc->sCmn.pitchEstimationLPCOrder );
+    oaci_silk_k2a_FLP( A, refl_coef, psEnc->sCmn.pitchEstimationLPCOrder );
 
     /* Bandwidth expansion */
-    silk_bwexpander_FLP( A, psEnc->sCmn.pitchEstimationLPCOrder, FIND_PITCH_BANDWIDTH_EXPANSION );
+    oaci_silk_bwexpander_FLP( A, psEnc->sCmn.pitchEstimationLPCOrder, FIND_PITCH_BANDWIDTH_EXPANSION );
 
     /*****************************************/
     /* LPC analysis filtering                */
     /*****************************************/
-    silk_LPC_analysis_filter_FLP( res, A, x_buf, buf_len, psEnc->sCmn.pitchEstimationLPCOrder );
+    oaci_silk_LPC_analysis_filter_FLP( res, A, x_buf, buf_len, psEnc->sCmn.pitchEstimationLPCOrder );
 
     if (psEnc->sCmn.indices.signalType != TYPE_NO_VOICE_ACTIVITY && psEnc->sCmn.first_frame_after_reset == 0) {
         /* Threshold for pitch estimator */
@@ -116,7 +116,7 @@ void silk_find_pitch_lags_FLP(
         /*****************************************/
         /* Call Pitch estimator                  */
         /*****************************************/
-        if (silk_pitch_analysis_core_FLP( res, psEncCtrl->pitchL, &psEnc->sCmn.indices.lagIndex,
+        if (oaci_silk_pitch_analysis_core_FLP( res, psEncCtrl->pitchL, &psEnc->sCmn.indices.lagIndex,
             &psEnc->sCmn.indices.contourIndex, &psEnc->LTPCorr, psEnc->sCmn.prevLag,
         psEnc->sCmn.pitchEstimationThreshold_Q16/65536.0f,
             thrhld, psEnc->sCmn.fs_kHz, psEnc->sCmn.pitchEstimationComplexity, psEnc->sCmn.nb_subfr, arch ) == 0) {
diff --git a/silk/float/find_pred_coefs_FLP.c b/silk/float/find_pred_coefs_FLP.c
index 3fc6d88e1..490cc0b1e 100644
--- a/silk/float/find_pred_coefs_FLP.c
+++ b/silk/float/find_pred_coefs_FLP.c
@@ -32,7 +32,7 @@
 #include "main_FLP.h"
 
 /* Find LPC and LTP coefficients */
-void silk_find_pred_coefs_FLP(
+void oaci_silk_find_pred_coefs_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     const silk_float res_pitch[],                                       /* I    Residual from pitch analysis                */
@@ -62,19 +62,19 @@ void silk_find_pred_coefs_FLP(
         celt_assert( psEnc->sCmn.ltp_mem_length - psEnc->sCmn.predictLPCOrder >= psEncCtrl->pitchL[ 0 ] + LTP_ORDER/2 );
 
         /* LTP analysis */
-        silk_find_LTP_FLP( XXLTP, xXLTP, res_pitch, psEncCtrl->pitchL, psEnc->sCmn.subfr_length, psEnc->sCmn.nb_subfr,
+        oaci_silk_find_LTP_FLP( XXLTP, xXLTP, res_pitch, psEncCtrl->pitchL, psEnc->sCmn.subfr_length, psEnc->sCmn.nb_subfr,
         psEnc->sCmn.arch );
 
         /* Quantize LTP gain parameters */
-        silk_quant_LTP_gains_FLP( psEncCtrl->LTPCoef, psEnc->sCmn.indices.LTPIndex, &psEnc->sCmn.indices.PERIndex,
+        oaci_silk_quant_LTP_gains_FLP( psEncCtrl->LTPCoef, psEnc->sCmn.indices.LTPIndex, &psEnc->sCmn.indices.PERIndex,
             &psEnc->sCmn.sum_log_gain_Q7, &psEncCtrl->LTPredCodGain, XXLTP, xXLTP, psEnc->sCmn.subfr_length,
         psEnc->sCmn.nb_subfr, psEnc->sCmn.arch );
 
         /* Control LTP scaling */
-        silk_LTP_scale_ctrl_FLP( psEnc, psEncCtrl, condCoding );
+        oaci_silk_LTP_scale_ctrl_FLP( psEnc, psEncCtrl, condCoding );
 
         /* Create LTP residual */
-        silk_LTP_analysis_filter_FLP( LPC_in_pre, x - psEnc->sCmn.predictLPCOrder, psEncCtrl->LTPCoef,
+        oaci_silk_LTP_analysis_filter_FLP( LPC_in_pre, x - psEnc->sCmn.predictLPCOrder, psEncCtrl->LTPCoef,
             psEncCtrl->pitchL, invGains, psEnc->sCmn.subfr_length, psEnc->sCmn.nb_subfr, psEnc->sCmn.predictLPCOrder );
     } else {
         /************/
@@ -84,7 +84,7 @@ void silk_find_pred_coefs_FLP(
         x_ptr     = x - psEnc->sCmn.predictLPCOrder;
         x_pre_ptr = LPC_in_pre;
         for (i = 0; i < psEnc->sCmn.nb_subfr; i++) {
-            silk_scale_copy_vector_FLP( x_pre_ptr, x_ptr, invGains[ i ],
+            oaci_silk_scale_copy_vector_FLP( x_pre_ptr, x_ptr, invGains[ i ],
                 psEnc->sCmn.subfr_length + psEnc->sCmn.predictLPCOrder );
             x_pre_ptr += psEnc->sCmn.subfr_length + psEnc->sCmn.predictLPCOrder;
             x_ptr     += psEnc->sCmn.subfr_length;
@@ -103,13 +103,13 @@ void silk_find_pred_coefs_FLP(
     }
 
     /* LPC_in_pre contains the LTP-filtered input for voiced, and the unfiltered input for unvoiced */
-    silk_find_LPC_FLP( &psEnc->sCmn, NLSF_Q15, LPC_in_pre, minInvGain, psEnc->sCmn.arch );
+    oaci_silk_find_LPC_FLP( &psEnc->sCmn, NLSF_Q15, LPC_in_pre, minInvGain, psEnc->sCmn.arch );
 
     /* Quantize LSFs */
-    silk_process_NLSFs_FLP( &psEnc->sCmn, psEncCtrl->PredCoef, NLSF_Q15, psEnc->sCmn.prev_NLSFq_Q15 );
+    oaci_silk_process_NLSFs_FLP( &psEnc->sCmn, psEncCtrl->PredCoef, NLSF_Q15, psEnc->sCmn.prev_NLSFq_Q15 );
 
     /* Calculate residual energy using quantized LPC coefficients */
-    silk_residual_energy_FLP( psEncCtrl->ResNrg, LPC_in_pre, psEncCtrl->PredCoef, psEncCtrl->Gains,
+    oaci_silk_residual_energy_FLP( psEncCtrl->ResNrg, LPC_in_pre, psEncCtrl->PredCoef, psEncCtrl->Gains,
         psEnc->sCmn.subfr_length, psEnc->sCmn.nb_subfr, psEnc->sCmn.predictLPCOrder );
 
     /* Copy to prediction struct for use in next frame for interpolation */
diff --git a/silk/float/inner_product_FLP.c b/silk/float/inner_product_FLP.c
index 75e8d2b44..9ebb0fb1d 100644
--- a/silk/float/inner_product_FLP.c
+++ b/silk/float/inner_product_FLP.c
@@ -32,7 +32,7 @@
 #include "SigProc_FLP.h"
 
 /* inner product of two silk_float arrays, with result as double */
-double silk_inner_product_FLP_c(
+double oaci_silk_inner_product_FLP_c(
     const silk_float    *data1,
     const silk_float    *data2,
     oac_int dataSize)                                {
diff --git a/silk/float/k2a_FLP.c b/silk/float/k2a_FLP.c
index cd383f35d..7f0bca3c6 100644
--- a/silk/float/k2a_FLP.c
+++ b/silk/float/k2a_FLP.c
@@ -32,7 +32,7 @@
 #include "SigProc_FLP.h"
 
 /* step up function, converts reflection coefficients to prediction coefficients */
-void silk_k2a_FLP(
+void oaci_silk_k2a_FLP(
     silk_float          *A,                 /* O     prediction coefficients [order]                            */
     const silk_float    *rc,                /* I     reflection coefficients [order]                            */
     oac_int32 order                        /* I     prediction order                                           */
diff --git a/silk/float/main_FLP.h b/silk/float/main_FLP.h
index 54dcd24cf..ed66077a6 100644
--- a/silk/float/main_FLP.h
+++ b/silk/float/main_FLP.h
@@ -38,26 +38,26 @@
 
 
 #define silk_encoder_state_Fxx      silk_encoder_state_FLP
-#define silk_encode_do_VAD_Fxx      silk_encode_do_VAD_FLP
-#define silk_encode_frame_Fxx       silk_encode_frame_FLP
+#define silk_encode_do_VAD_Fxx      oaci_silk_encode_do_VAD_FLP
+#define silk_encode_frame_Fxx       oaci_silk_encode_frame_FLP
 
 /*********************/
 /* Encoder Functions */
 /*********************/
 
 /* High-pass filter with cutoff frequency adaptation based on pitch lag statistics */
-void silk_HP_variable_cutoff(
+void oaci_silk_HP_variable_cutoff(
     silk_encoder_state_Fxx state_Fxx[]                                  /* I/O  Encoder states                              */
     );
 
 /* Encoder main function */
-void silk_encode_do_VAD_FLP(
+void oaci_silk_encode_do_VAD_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     oac_int activity                                                   /* I    Decision of Oac voice activity detector    */
     );
 
 /* Encoder main function */
-oac_int silk_encode_frame_FLP(
+oac_int oaci_silk_encode_frame_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     oac_int32                      *pnBytesOut,                        /* O    Number of payload bytes;                    */
     ec_enc                          *psRangeEnc,                        /* I/O  compressor data structure                   */
@@ -67,13 +67,13 @@ oac_int silk_encode_frame_FLP(
     );
 
 /* Initializes the Silk encoder state */
-oac_int silk_init_encoder(
+oac_int oaci_silk_init_encoder(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     int arch                                                            /* I    Run-tim architecture                        */
     );
 
 /* Control the Silk encoder */
-oac_int silk_control_encoder(
+oac_int oaci_silk_control_encoder(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Pointer to Silk encoder state FLP           */
     silk_EncControlStruct           *encControl,                        /* I    Control structure                           */
     const oac_int allow_bw_switch,                                     /* I    Flag to allow switching audio bandwidth     */
@@ -84,7 +84,7 @@ oac_int silk_control_encoder(
 /* Noise shaping analysis */
 /**************************/
 /* Compute noise shaping coefficients and initial gain values */
-void silk_noise_shape_analysis_FLP(
+void oaci_silk_noise_shape_analysis_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     const silk_float                *pitch_res,                         /* I    LPC residual from pitch analysis            */
@@ -92,7 +92,7 @@ void silk_noise_shape_analysis_FLP(
     );
 
 /* Autocorrelations for a warped frequency axis */
-void silk_warped_autocorrelation_FLP(
+void oaci_silk_warped_autocorrelation_FLP(
     silk_float                      *corr,                              /* O    Result [order + 1]                          */
     const silk_float                *input,                             /* I    Input data to correlate                     */
     const silk_float warping,                                           /* I    Warping coefficient                         */
@@ -101,7 +101,7 @@ void silk_warped_autocorrelation_FLP(
     );
 
 /* Calculation of LTP state scaling */
-void silk_LTP_scale_ctrl_FLP(
+void oaci_silk_LTP_scale_ctrl_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     oac_int condCoding                                                 /* I    The type of conditional coding to use       */
@@ -111,7 +111,7 @@ void silk_LTP_scale_ctrl_FLP(
 /* Prediction Analysis                        */
 /**********************************************/
 /* Find pitch lags */
-void silk_find_pitch_lags_FLP(
+void oaci_silk_find_pitch_lags_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     silk_float res[],                                                   /* O    Residual                                    */
@@ -120,7 +120,7 @@ void silk_find_pitch_lags_FLP(
     );
 
 /* Find LPC and LTP coefficients */
-void silk_find_pred_coefs_FLP(
+void oaci_silk_find_pred_coefs_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     const silk_float res_pitch[],                                       /* I    Residual from pitch analysis                */
@@ -129,7 +129,7 @@ void silk_find_pred_coefs_FLP(
     );
 
 /* LPC analysis */
-void silk_find_LPC_FLP(
+void oaci_silk_find_LPC_FLP(
     silk_encoder_state              *psEncC,                            /* I/O  Encoder state                               */
     oac_int16 NLSF_Q15[],                                              /* O    NLSFs                                       */
     const silk_float x[],                                               /* I    Input signal                                */
@@ -137,7 +137,7 @@ void silk_find_LPC_FLP(
     int arch);
 
 /* LTP analysis */
-void silk_find_LTP_FLP(
+void oaci_silk_find_LTP_FLP(
     silk_float XX[ MAX_NB_SUBFR*LTP_ORDER*LTP_ORDER ],                          /* O    Weight for LTP quantization         */
     silk_float xX[ MAX_NB_SUBFR*LTP_ORDER ],                            /* O    Weight for LTP quantization                 */
     const silk_float r_ptr[],                                           /* I    LPC residual                                */
@@ -146,7 +146,7 @@ void silk_find_LTP_FLP(
     const oac_int nb_subfr,                                            /* I    number of subframes                         */
     int arch);
 
-void silk_LTP_analysis_filter_FLP(
+void oaci_silk_LTP_analysis_filter_FLP(
     silk_float                      *LTP_res,                           /* O    LTP res MAX_NB_SUBFR*(pre_lgth+subfr_lngth) */
     const silk_float                *x,                                 /* I    Input signal, with preceding samples        */
     const silk_float B[ LTP_ORDER*MAX_NB_SUBFR ],                       /* I    LTP coefficients for each subframe          */
@@ -159,7 +159,7 @@ void silk_LTP_analysis_filter_FLP(
 
 /* Calculates residual energies of input subframes where all subframes have LPC_order   */
 /* of preceding samples                                                                 */
-void silk_residual_energy_FLP(
+void oaci_silk_residual_energy_FLP(
     silk_float nrgs[ MAX_NB_SUBFR ],                                    /* O    Residual energy per subframe                */
     const silk_float x[],                                               /* I    Input signal                                */
     silk_float a[ 2 ][ MAX_LPC_ORDER ],                                 /* I    AR coefs for each frame half                */
@@ -170,7 +170,7 @@ void silk_residual_energy_FLP(
     );
 
 /* 16th order LPC analysis filter */
-void silk_LPC_analysis_filter_FLP(
+void oaci_silk_LPC_analysis_filter_FLP(
     silk_float r_LPC[],                                                 /* O    LPC residual signal                         */
     const silk_float PredCoef[],                                        /* I    LPC coefficients                            */
     const silk_float s[],                                               /* I    Input signal                                */
@@ -179,7 +179,7 @@ void silk_LPC_analysis_filter_FLP(
     );
 
 /* LTP tap quantizer */
-void silk_quant_LTP_gains_FLP(
+void oaci_silk_quant_LTP_gains_FLP(
     silk_float B[ MAX_NB_SUBFR*LTP_ORDER ],                             /* O    Quantized LTP gains                         */
     oac_int8 cbk_index[ MAX_NB_SUBFR ],                                /* O    Codebook index                              */
     oac_int8                       *periodicity_index,                 /* O    Periodicity index                           */
@@ -193,7 +193,7 @@ void silk_quant_LTP_gains_FLP(
     );
 
 /* Residual energy: nrg = wxx - 2 * wXx * c + c' * wXX * c */
-silk_float silk_residual_energy_covar_FLP(                              /* O    Weighted residual energy                    */
+silk_float oaci_silk_residual_energy_covar_FLP(                              /* O    Weighted residual energy                    */
     const silk_float                *c,                                 /* I    Filter coefficients                         */
     silk_float                      *wXX,                               /* I/O  Weighted correlation matrix, reg. out       */
     const silk_float                *wXx,                               /* I    Weighted correlation vector                 */
@@ -202,7 +202,7 @@ silk_float silk_residual_energy_covar_FLP(                              /* O
     );
 
 /* Processing of gains */
-void silk_process_gains_FLP(
+void oaci_silk_process_gains_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     oac_int condCoding                                                 /* I    The type of conditional coding to use       */
@@ -212,7 +212,7 @@ void silk_process_gains_FLP(
 /* Linear Algebra */
 /******************/
 /* Calculates correlation matrix X'*X */
-void silk_corrMatrix_FLP(
+void oaci_silk_corrMatrix_FLP(
     const silk_float                *x,                                 /* I    x vector [ L+order-1 ] used to create X     */
     const oac_int L,                                                   /* I    Length of vectors                           */
     const oac_int Order,                                               /* I    Max lag for correlation                     */
@@ -220,7 +220,7 @@ void silk_corrMatrix_FLP(
     int arch);
 
 /* Calculates correlation vector X'*t */
-void silk_corrVector_FLP(
+void oaci_silk_corrVector_FLP(
     const silk_float                *x,                                 /* I    x vector [L+order-1] used to create X       */
     const silk_float                *t,                                 /* I    Target vector [L]                           */
     const oac_int L,                                                   /* I    Length of vecors                            */
@@ -232,7 +232,7 @@ void silk_corrVector_FLP(
 /* Window types:                        */
 /*  1 -> sine window from 0 to pi/2     */
 /*  2 -> sine window from pi/2 to pi    */
-void silk_apply_sine_window_FLP(
+void oaci_silk_apply_sine_window_FLP(
     silk_float px_win[],                                                /* O    Pointer to windowed signal                  */
     const silk_float px[],                                              /* I    Pointer to input signal                     */
     const oac_int win_type,                                            /* I    Selects a window type                       */
@@ -242,14 +242,14 @@ void silk_apply_sine_window_FLP(
 /* Wrapper functions. Call flp / fix code */
 
 /* Convert AR filter coefficients to NLSF parameters */
-void silk_A2NLSF_FLP(
+void oaci_silk_A2NLSF_FLP(
     oac_int16                      *NLSF_Q15,                          /* O    NLSF vector      [ LPC_order ]              */
     const silk_float                *pAR,                               /* I    LPC coefficients [ LPC_order ]              */
     const oac_int LPC_order                                            /* I    LPC order                                   */
     );
 
 /* Convert NLSF parameters to AR prediction filter coefficients */
-void silk_NLSF2A_FLP(
+void oaci_silk_NLSF2A_FLP(
     silk_float                      *pAR,                               /* O    LPC coefficients [ LPC_order ]              */
     const oac_int16                *NLSF_Q15,                          /* I    NLSF vector      [ LPC_order ]              */
     const oac_int LPC_order,                                           /* I    LPC order                                   */
@@ -257,7 +257,7 @@ void silk_NLSF2A_FLP(
     );
 
 /* Limit, stabilize, and quantize NLSFs */
-void silk_process_NLSFs_FLP(
+void oaci_silk_process_NLSFs_FLP(
     silk_encoder_state              *psEncC,                            /* I/O  Encoder state                               */
     silk_float PredCoef[ 2 ][ MAX_LPC_ORDER ],                          /* O    Prediction coefficients                     */
     oac_int16 NLSF_Q15[      MAX_LPC_ORDER ],                          /* I/O  Normalized LSFs (quant out) (0 - (2^15-1))  */
@@ -265,7 +265,7 @@ void silk_process_NLSFs_FLP(
     );
 
 /* Floating-point Silk NSQ wrapper      */
-void silk_NSQ_wrapper_FLP(
+void oaci_silk_NSQ_wrapper_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     SideInfoIndices                 *psIndices,                         /* I/O  Quantization indices                        */
diff --git a/silk/float/noise_shape_analysis_FLP.c b/silk/float/noise_shape_analysis_FLP.c
index f94ceab4d..634b52017 100644
--- a/silk/float/noise_shape_analysis_FLP.c
+++ b/silk/float/noise_shape_analysis_FLP.c
@@ -97,7 +97,7 @@ static OAC_INLINE void warped_true2monic_coefs(
 
         /* Apply bandwidth expansion */
         chirp = 0.99f - (0.8f + 0.1f*iter)*(maxabs - limit)/(maxabs*(ind + 1));
-        silk_bwexpander_FLP( coefs, order, chirp );
+        oaci_silk_bwexpander_FLP( coefs, order, chirp );
 
         /* Convert to monic warped coefficients */
         for (i = order - 1; i > 0; i--) {
@@ -135,13 +135,13 @@ static OAC_INLINE void limit_coefs(
 
         /* Apply bandwidth expansion */
         chirp = 0.99f - (0.8f + 0.1f*iter)*(maxabs - limit)/(maxabs*(ind + 1));
-        silk_bwexpander_FLP( coefs, order, chirp );
+        oaci_silk_bwexpander_FLP( coefs, order, chirp );
     }
     silk_assert( 0 );
 }
 
 /* Compute noise shaping coefficients and initial gain values */
-void silk_noise_shape_analysis_FLP(
+void oaci_silk_noise_shape_analysis_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     const silk_float                *pitch_res,                         /* I    LPC residual from pitch analysis            */
@@ -202,7 +202,7 @@ void silk_noise_shape_analysis_FLP(
         pitch_res_ptr = pitch_res;
         nSegs = silk_SMULBB( SUB_FRAME_LENGTH_MS, psEnc->sCmn.nb_subfr )/2;
         for (k = 0; k < nSegs; k++) {
-            nrg = ( silk_float )nSamples + ( silk_float )silk_energy_FLP( pitch_res_ptr, nSamples );
+            nrg = ( silk_float )nSamples + ( silk_float )oaci_silk_energy_FLP( pitch_res_ptr, nSamples );
             log_energy = silk_log2( nrg );
             if (k > 0) {
                 energy_variation += silk_abs_float( log_energy - log_energy_prev );
@@ -238,22 +238,22 @@ void silk_noise_shape_analysis_FLP(
         flat_part = psEnc->sCmn.fs_kHz*3;
         slope_part = (psEnc->sCmn.shapeWinLength - flat_part)/2;
 
-        silk_apply_sine_window_FLP( x_windowed, x_ptr, 1, slope_part );
+        oaci_silk_apply_sine_window_FLP( x_windowed, x_ptr, 1, slope_part );
         shift = slope_part;
         silk_memcpy( x_windowed + shift, x_ptr + shift, flat_part*sizeof(silk_float));
         shift += flat_part;
-        silk_apply_sine_window_FLP( x_windowed + shift, x_ptr + shift, 2, slope_part );
+        oaci_silk_apply_sine_window_FLP( x_windowed + shift, x_ptr + shift, 2, slope_part );
 
         /* Update pointer: next LPC analysis block */
         x_ptr += psEnc->sCmn.subfr_length;
 
         if (psEnc->sCmn.warping_Q16 > 0) {
             /* Calculate warped auto correlation */
-            silk_warped_autocorrelation_FLP( auto_corr, x_windowed, warping,
+            oaci_silk_warped_autocorrelation_FLP( auto_corr, x_windowed, warping,
                 psEnc->sCmn.shapeWinLength, psEnc->sCmn.shapingLPCOrder );
         } else {
             /* Calculate regular auto correlation */
-            silk_autocorrelation_FLP( auto_corr, x_windowed, psEnc->sCmn.shapeWinLength,
+            oaci_silk_autocorrelation_FLP( auto_corr, x_windowed, psEnc->sCmn.shapeWinLength,
             psEnc->sCmn.shapingLPCOrder + 1, psEnc->sCmn.arch );
         }
 
@@ -261,8 +261,8 @@ void silk_noise_shape_analysis_FLP(
         auto_corr[ 0 ] += auto_corr[ 0 ]*SHAPE_WHITE_NOISE_FRACTION + 1.0f;
 
         /* Convert correlations to prediction coefficients, and compute residual energy */
-        nrg = silk_schur_FLP( rc, auto_corr, psEnc->sCmn.shapingLPCOrder );
-        silk_k2a_FLP( &psEncCtrl->AR[ k*MAX_SHAPE_LPC_ORDER ], rc, psEnc->sCmn.shapingLPCOrder );
+        nrg = oaci_silk_schur_FLP( rc, auto_corr, psEnc->sCmn.shapingLPCOrder );
+        oaci_silk_k2a_FLP( &psEncCtrl->AR[ k*MAX_SHAPE_LPC_ORDER ], rc, psEnc->sCmn.shapingLPCOrder );
         psEncCtrl->Gains[ k ] = ( silk_float )sqrt( nrg );
 
         if (psEnc->sCmn.warping_Q16 > 0) {
@@ -272,7 +272,7 @@ void silk_noise_shape_analysis_FLP(
         }
 
         /* Bandwidth expansion for synthesis filter shaping */
-        silk_bwexpander_FLP( &psEncCtrl->AR[ k*MAX_SHAPE_LPC_ORDER ], psEnc->sCmn.shapingLPCOrder, BWExp );
+        oaci_silk_bwexpander_FLP( &psEncCtrl->AR[ k*MAX_SHAPE_LPC_ORDER ], psEnc->sCmn.shapingLPCOrder, BWExp );
 
         if (psEnc->sCmn.warping_Q16 > 0) {
             /* Convert to monic warped prediction coefficients and limit absolute values */
diff --git a/silk/float/pitch_analysis_core_FLP.c b/silk/float/pitch_analysis_core_FLP.c
index 8ff25b7a4..b89850d5f 100644
--- a/silk/float/pitch_analysis_core_FLP.c
+++ b/silk/float/pitch_analysis_core_FLP.c
@@ -64,7 +64,7 @@ static void silk_P_Ana_calc_energy_st3(
 /************************************************************/
 /* CORE PITCH ANALYSIS FUNCTION                             */
 /************************************************************/
-oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1 unvoiced                      */
+oac_int oaci_silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1 unvoiced                      */
     const silk_float    *frame,             /* I    Signal of length PE_FRAME_LENGTH_MS*Fs_kHz                  */
     oac_int            *pitch_out,         /* O    Pitch lag values [nb_subfr]                                 */
     oac_int16          *lagIndex,          /* O    Lag Index                                                   */
@@ -137,14 +137,14 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
         oac_int16 frame_16_FIX[ 16*PE_MAX_FRAME_LENGTH_MS ];
         silk_float2short_array( frame_16_FIX, frame, frame_length );
         silk_memset( filt_state, 0, 2*sizeof(oac_int32));
-        silk_resampler_down2( filt_state, frame_8_FIX, frame_16_FIX, frame_length );
+        oaci_silk_resampler_down2( filt_state, frame_8_FIX, frame_16_FIX, frame_length );
         silk_short2float_array( frame_8kHz, frame_8_FIX, frame_length_8kHz );
     } else if (Fs_kHz == 12) {
         /* Resample to 12 -> 8 khz */
         oac_int16 frame_12_FIX[ 12*PE_MAX_FRAME_LENGTH_MS ];
         silk_float2short_array( frame_12_FIX, frame, frame_length );
         silk_memset( filt_state, 0, 6*sizeof(oac_int32));
-        silk_resampler_down2_3( filt_state, frame_8_FIX, frame_12_FIX, frame_length );
+        oaci_silk_resampler_down2_3( filt_state, frame_8_FIX, frame_12_FIX, frame_length );
         silk_short2float_array( frame_8kHz, frame_8_FIX, frame_length_8kHz );
     } else {
         celt_assert( Fs_kHz == 8 );
@@ -153,7 +153,7 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
 
     /* Decimate again to 4 kHz */
     silk_memset( filt_state, 0, 2*sizeof(oac_int32));
-    silk_resampler_down2( filt_state, frame_4_FIX, frame_8_FIX, frame_length_8kHz );
+    oaci_silk_resampler_down2( filt_state, frame_4_FIX, frame_8_FIX, frame_length_8kHz );
     silk_short2float_array( frame_4kHz, frame_4_FIX, frame_length_4kHz );
 
     /* Low-pass filter */
@@ -177,13 +177,13 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
         celt_assert( basis_ptr >= frame_4kHz );
         celt_assert( basis_ptr + sf_length_8kHz <= frame_4kHz + frame_length_4kHz );
 
-        celt_pitch_xcorr( target_ptr, target_ptr - max_lag_4kHz, xcorr, sf_length_8kHz, max_lag_4kHz - min_lag_4kHz + 1,
+        oaci_celt_pitch_xcorr( target_ptr, target_ptr - max_lag_4kHz, xcorr, sf_length_8kHz, max_lag_4kHz - min_lag_4kHz + 1,
         arch );
 
         /* Calculate first vector products before loop */
         cross_corr = xcorr[ max_lag_4kHz - min_lag_4kHz ];
-        normalizer = silk_energy_FLP( target_ptr, sf_length_8kHz )
-                     + silk_energy_FLP( basis_ptr,  sf_length_8kHz )
+        normalizer = oaci_silk_energy_FLP( target_ptr, sf_length_8kHz )
+                     + oaci_silk_energy_FLP( basis_ptr,  sf_length_8kHz )
                      + sf_length_8kHz*4000.0f;
 
         C[ 0 ][ min_lag_4kHz ] += (silk_float)(2*cross_corr/normalizer);
@@ -216,7 +216,7 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
     /* Sort */
     length_d_srch = 4 + 2*complexity;
     celt_assert( 3*length_d_srch <= PE_D_SRCH_LENGTH );
-    silk_insertion_sort_decreasing_FLP( &C[ 0 ][ min_lag_4kHz ], d_srch, max_lag_4kHz - min_lag_4kHz + 1,
+    oaci_silk_insertion_sort_decreasing_FLP( &C[ 0 ][ min_lag_4kHz ], d_srch, max_lag_4kHz - min_lag_4kHz + 1,
     length_d_srch );
 
     /* Escape if correlation is very low already here */
@@ -288,13 +288,13 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
         target_ptr = &frame_8kHz[ PE_LTP_MEM_LENGTH_MS*8 ];
     }
     for (k = 0; k < nb_subfr; k++) {
-        energy_tmp = silk_energy_FLP( target_ptr, sf_length_8kHz ) + 1.0;
+        energy_tmp = oaci_silk_energy_FLP( target_ptr, sf_length_8kHz ) + 1.0;
         for (j = 0; j < length_d_comp; j++) {
             d = d_comp[ j ];
             basis_ptr = target_ptr - d;
-            cross_corr = silk_inner_product_FLP( basis_ptr, target_ptr, sf_length_8kHz, arch );
+            cross_corr = oaci_silk_inner_product_FLP( basis_ptr, target_ptr, sf_length_8kHz, arch );
             if (cross_corr > 0.0f) {
-                energy = silk_energy_FLP( basis_ptr, sf_length_8kHz );
+                energy = oaci_silk_energy_FLP( basis_ptr, sf_length_8kHz );
                 C[ k ][ d ] = (silk_float)(2*cross_corr/(energy + energy_tmp));
             } else {
                 C[ k ][ d ] = 0.0f;
@@ -326,7 +326,7 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
     /* Set up stage 2 codebook based on number of subframes */
     if (nb_subfr == PE_MAX_NB_SUBFR) {
         cbk_size   = PE_NB_CBKS_STAGE2_EXT;
-        Lag_CB_ptr = &silk_CB_lags_stage2[ 0 ][ 0 ];
+        Lag_CB_ptr = &oaci_silk_CB_lags_stage2[ 0 ][ 0 ];
         if (Fs_kHz == 8 && complexity > SILK_PE_MIN_COMPLEX) {
             /* If input is 8 khz use a larger codebook here because it is last stage */
             nb_cbk_search = PE_NB_CBKS_STAGE2_EXT;
@@ -335,7 +335,7 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
         }
     } else {
         cbk_size       = PE_NB_CBKS_STAGE2_10MS;
-        Lag_CB_ptr     = &silk_CB_lags_stage2_10_ms[ 0 ][ 0 ];
+        Lag_CB_ptr     = &oaci_silk_CB_lags_stage2_10_ms[ 0 ][ 0 ];
         nb_cbk_search  = PE_NB_CBKS_STAGE2_10MS;
     }
 
@@ -421,17 +421,17 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
 
         /* Set up cbk parameters according to complexity setting and frame length */
         if (nb_subfr == PE_MAX_NB_SUBFR) {
-            nb_cbk_search = (oac_int)silk_nb_cbk_searchs_stage3[ complexity ];
+            nb_cbk_search = (oac_int)oaci_silk_nb_cbk_searchs_stage3[ complexity ];
             cbk_size      = PE_NB_CBKS_STAGE3_MAX;
-            Lag_CB_ptr    = &silk_CB_lags_stage3[ 0 ][ 0 ];
+            Lag_CB_ptr    = &oaci_silk_CB_lags_stage3[ 0 ][ 0 ];
         } else {
             nb_cbk_search = PE_NB_CBKS_STAGE3_10MS;
             cbk_size      = PE_NB_CBKS_STAGE3_10MS;
-            Lag_CB_ptr    = &silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
+            Lag_CB_ptr    = &oaci_silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
         }
 
         target_ptr = &frame[ PE_LTP_MEM_LENGTH_MS*Fs_kHz ];
-        energy_tmp = silk_energy_FLP( target_ptr, nb_subfr*sf_length ) + 1.0;
+        energy_tmp = oaci_silk_energy_FLP( target_ptr, nb_subfr*sf_length ) + 1.0;
         for (d = start_lag; d <= end_lag; d++) {
             for (j = 0; j < nb_cbk_search; j++) {
                 cross_corr = 0.0;
@@ -448,7 +448,7 @@ oac_int silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voiced, 1
                     CCmax_new = 0.0f;
                 }
 
-                if (CCmax_new > CCmax && (d + (oac_int)silk_CB_lags_stage3[ 0 ][ j ]) <= max_lag) {
+                if (CCmax_new > CCmax && (d + (oac_int)oaci_silk_CB_lags_stage3[ 0 ][ j ]) <= max_lag) {
                     CCmax   = CCmax_new;
                     lag_new = d;
                     CBimax  = j;
@@ -510,14 +510,14 @@ static void silk_P_Ana_calc_corr_st3(
     celt_assert( complexity <= SILK_PE_MAX_COMPLEX );
 
     if (nb_subfr == PE_MAX_NB_SUBFR) {
-        Lag_range_ptr = &silk_Lag_range_stage3[ complexity ][ 0 ][ 0 ];
-        Lag_CB_ptr    = &silk_CB_lags_stage3[ 0 ][ 0 ];
-        nb_cbk_search = silk_nb_cbk_searchs_stage3[ complexity ];
+        Lag_range_ptr = &oaci_silk_Lag_range_stage3[ complexity ][ 0 ][ 0 ];
+        Lag_CB_ptr    = &oaci_silk_CB_lags_stage3[ 0 ][ 0 ];
+        nb_cbk_search = oaci_silk_nb_cbk_searchs_stage3[ complexity ];
         cbk_size      = PE_NB_CBKS_STAGE3_MAX;
     } else {
         celt_assert( nb_subfr == PE_MAX_NB_SUBFR>>1);
-        Lag_range_ptr = &silk_Lag_range_stage3_10_ms[ 0 ][ 0 ];
-        Lag_CB_ptr    = &silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
+        Lag_range_ptr = &oaci_silk_Lag_range_stage3_10_ms[ 0 ][ 0 ];
+        Lag_CB_ptr    = &oaci_silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
         nb_cbk_search = PE_NB_CBKS_STAGE3_10MS;
         cbk_size      = PE_NB_CBKS_STAGE3_10MS;
     }
@@ -530,7 +530,7 @@ static void silk_P_Ana_calc_corr_st3(
         lag_low  = matrix_ptr( Lag_range_ptr, k, 0, 2 );
         lag_high = matrix_ptr( Lag_range_ptr, k, 1, 2 );
         silk_assert(lag_high - lag_low + 1 <= SCRATCH_SIZE);
-        celt_pitch_xcorr( target_ptr, target_ptr - start_lag - lag_high, xcorr, sf_length, lag_high - lag_low + 1,
+        oaci_celt_pitch_xcorr( target_ptr, target_ptr - start_lag - lag_high, xcorr, sf_length, lag_high - lag_low + 1,
         arch );
         for (j = lag_low; j <= lag_high; j++) {
             silk_assert( lag_counter < SCRATCH_SIZE );
@@ -576,14 +576,14 @@ static void silk_P_Ana_calc_energy_st3(
     celt_assert( complexity <= SILK_PE_MAX_COMPLEX );
 
     if (nb_subfr == PE_MAX_NB_SUBFR) {
-        Lag_range_ptr = &silk_Lag_range_stage3[ complexity ][ 0 ][ 0 ];
-        Lag_CB_ptr    = &silk_CB_lags_stage3[ 0 ][ 0 ];
-        nb_cbk_search = silk_nb_cbk_searchs_stage3[ complexity ];
+        Lag_range_ptr = &oaci_silk_Lag_range_stage3[ complexity ][ 0 ][ 0 ];
+        Lag_CB_ptr    = &oaci_silk_CB_lags_stage3[ 0 ][ 0 ];
+        nb_cbk_search = oaci_silk_nb_cbk_searchs_stage3[ complexity ];
         cbk_size      = PE_NB_CBKS_STAGE3_MAX;
     } else {
         celt_assert( nb_subfr == PE_MAX_NB_SUBFR>>1);
-        Lag_range_ptr = &silk_Lag_range_stage3_10_ms[ 0 ][ 0 ];
-        Lag_CB_ptr    = &silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
+        Lag_range_ptr = &oaci_silk_Lag_range_stage3_10_ms[ 0 ][ 0 ];
+        Lag_CB_ptr    = &oaci_silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
         nb_cbk_search = PE_NB_CBKS_STAGE3_10MS;
         cbk_size      = PE_NB_CBKS_STAGE3_10MS;
     }
@@ -594,7 +594,7 @@ static void silk_P_Ana_calc_energy_st3(
 
         /* Calculate the energy for first lag */
         basis_ptr = target_ptr - (start_lag + matrix_ptr( Lag_range_ptr, k, 0, 2 ));
-        energy = silk_energy_FLP( basis_ptr, sf_length ) + 1e-3;
+        energy = oaci_silk_energy_FLP( basis_ptr, sf_length ) + 1e-3;
         silk_assert( energy >= 0.0 );
         scratch_mem[lag_counter] = (silk_float)energy;
         lag_counter++;
diff --git a/silk/float/process_gains_FLP.c b/silk/float/process_gains_FLP.c
index 63b1748ea..475d45747 100644
--- a/silk/float/process_gains_FLP.c
+++ b/silk/float/process_gains_FLP.c
@@ -33,7 +33,7 @@
 #include "tuning_parameters.h"
 
 /* Processing of gains */
-void silk_process_gains_FLP(
+void oaci_silk_process_gains_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     oac_int condCoding                                                 /* I    The type of conditional coding to use       */
@@ -72,7 +72,7 @@ void silk_process_gains_FLP(
     psEncCtrl->lastGainIndexPrev = psShapeSt->LastGainIndex;
 
     /* Quantize gains */
-    silk_gains_quant( psEnc->sCmn.indices.GainsIndices, pGains_Q16,
+    oaci_silk_gains_quant( psEnc->sCmn.indices.GainsIndices, pGains_Q16,
             &psShapeSt->LastGainIndex, condCoding == CODE_CONDITIONALLY, psEnc->sCmn.nb_subfr );
 
     /* Overwrite unquantized gains with quantized gains and convert back to Q0 from Q16 */
@@ -90,7 +90,7 @@ void silk_process_gains_FLP(
     }
 
     /* Quantizer boundary adjustment */
-    quant_offset = silk_Quantization_Offsets_Q10[ psEnc->sCmn.indices.signalType>>
+    quant_offset = oaci_silk_Quantization_Offsets_Q10[ psEnc->sCmn.indices.signalType>>
                                                   1 ][ psEnc->sCmn.indices.quantOffsetType ]/1024.0f;
     psEncCtrl->Lambda = LAMBDA_OFFSET
                         + LAMBDA_DELAYED_DECISIONS*psEnc->sCmn.nStatesDelayedDecision
diff --git a/silk/float/regularize_correlations_FLP.c b/silk/float/regularize_correlations_FLP.c
index 02fcab593..fdb8af115 100644
--- a/silk/float/regularize_correlations_FLP.c
+++ b/silk/float/regularize_correlations_FLP.c
@@ -32,7 +32,7 @@
 #include "main_FLP.h"
 
 /* Add noise to matrix diagonal */
-void silk_regularize_correlations_FLP(
+void oaci_silk_regularize_correlations_FLP(
     silk_float                      *XX,                                /* I/O  Correlation matrices                        */
     silk_float                      *xx,                                /* I/O  Correlation values                          */
     const silk_float noise,                                             /* I    Noise energy to add                         */
diff --git a/silk/float/residual_energy_FLP.c b/silk/float/residual_energy_FLP.c
index 672934922..d7e19d0d3 100644
--- a/silk/float/residual_energy_FLP.c
+++ b/silk/float/residual_energy_FLP.c
@@ -35,7 +35,7 @@
 #define REGULARIZATION_FACTOR               1e-8f
 
 /* Residual energy: nrg = wxx - 2 * wXx * c + c' * wXX * c */
-silk_float silk_residual_energy_covar_FLP(                              /* O    Weighted residual energy                    */
+silk_float oaci_silk_residual_energy_covar_FLP(                              /* O    Weighted residual energy                    */
     const silk_float                *c,                                 /* I    Filter coefficients                         */
     silk_float                      *wXX,                               /* I/O  Weighted correlation matrix, reg. out       */
     const silk_float                *wXx,                               /* I    Weighted correlation vector                 */
@@ -87,7 +87,7 @@ silk_float silk_residual_energy_covar_FLP(                              /* O
 
 /* Calculates residual energies of input subframes where all subframes have LPC_order   */
 /* of preceding samples                                                                 */
-void silk_residual_energy_FLP(
+void oaci_silk_residual_energy_FLP(
     silk_float nrgs[ MAX_NB_SUBFR ],                                    /* O    Residual energy per subframe                */
     const silk_float x[],                                               /* I    Input signal                                */
     silk_float a[ 2 ][ MAX_LPC_ORDER ],                                 /* I    AR coefs for each frame half                */
@@ -103,13 +103,13 @@ void silk_residual_energy_FLP(
     shift = LPC_order + subfr_length;
 
     /* Filter input to create the LPC residual for each frame half, and measure subframe energies */
-    silk_LPC_analysis_filter_FLP( LPC_res, a[ 0 ], x + 0*shift, 2*shift, LPC_order );
-    nrgs[ 0 ] = ( silk_float )(gains[ 0 ]*gains[ 0 ]*silk_energy_FLP( LPC_res_ptr + 0*shift, subfr_length ));
-    nrgs[ 1 ] = ( silk_float )(gains[ 1 ]*gains[ 1 ]*silk_energy_FLP( LPC_res_ptr + 1*shift, subfr_length ));
+    oaci_silk_LPC_analysis_filter_FLP( LPC_res, a[ 0 ], x + 0*shift, 2*shift, LPC_order );
+    nrgs[ 0 ] = ( silk_float )(gains[ 0 ]*gains[ 0 ]*oaci_silk_energy_FLP( LPC_res_ptr + 0*shift, subfr_length ));
+    nrgs[ 1 ] = ( silk_float )(gains[ 1 ]*gains[ 1 ]*oaci_silk_energy_FLP( LPC_res_ptr + 1*shift, subfr_length ));
 
     if (nb_subfr == MAX_NB_SUBFR) {
-        silk_LPC_analysis_filter_FLP( LPC_res, a[ 1 ], x + 2*shift, 2*shift, LPC_order );
-        nrgs[ 2 ] = ( silk_float )(gains[ 2 ]*gains[ 2 ]*silk_energy_FLP( LPC_res_ptr + 0*shift, subfr_length ));
-        nrgs[ 3 ] = ( silk_float )(gains[ 3 ]*gains[ 3 ]*silk_energy_FLP( LPC_res_ptr + 1*shift, subfr_length ));
+        oaci_silk_LPC_analysis_filter_FLP( LPC_res, a[ 1 ], x + 2*shift, 2*shift, LPC_order );
+        nrgs[ 2 ] = ( silk_float )(gains[ 2 ]*gains[ 2 ]*oaci_silk_energy_FLP( LPC_res_ptr + 0*shift, subfr_length ));
+        nrgs[ 3 ] = ( silk_float )(gains[ 3 ]*gains[ 3 ]*oaci_silk_energy_FLP( LPC_res_ptr + 1*shift, subfr_length ));
     }
 }
diff --git a/silk/float/scale_copy_vector_FLP.c b/silk/float/scale_copy_vector_FLP.c
index cb0b9cedd..f3419ebc0 100644
--- a/silk/float/scale_copy_vector_FLP.c
+++ b/silk/float/scale_copy_vector_FLP.c
@@ -32,7 +32,7 @@
 #include "SigProc_FLP.h"
 
 /* copy and multiply a vector by a constant */
-void silk_scale_copy_vector_FLP(
+void oaci_silk_scale_copy_vector_FLP(
     silk_float          *data_out,
     const silk_float    *data_in,
     silk_float gain,
diff --git a/silk/float/scale_vector_FLP.c b/silk/float/scale_vector_FLP.c
index 0add05d26..359a85f18 100644
--- a/silk/float/scale_vector_FLP.c
+++ b/silk/float/scale_vector_FLP.c
@@ -32,7 +32,7 @@
 #include "SigProc_FLP.h"
 
 /* multiply a vector by a constant */
-void silk_scale_vector_FLP(
+void oaci_silk_scale_vector_FLP(
     silk_float          *data1,
     silk_float gain,
     oac_int dataSize)                                {
diff --git a/silk/float/schur_FLP.c b/silk/float/schur_FLP.c
index d6623de3f..af92cab5a 100644
--- a/silk/float/schur_FLP.c
+++ b/silk/float/schur_FLP.c
@@ -31,7 +31,7 @@
 
 #include "SigProc_FLP.h"
 
-silk_float silk_schur_FLP(                  /* O    returns residual energy                                     */
+silk_float oaci_silk_schur_FLP(                  /* O    returns residual energy                                     */
     silk_float refl_coef[],                 /* O    reflection coefficients (length order)                      */
     const silk_float auto_corr[],           /* I    autocorrelation sequence (length order+1)                   */
     oac_int order                          /* I    order                                                       */
diff --git a/silk/float/sort_FLP.c b/silk/float/sort_FLP.c
index 82be72b38..fbfb6c469 100644
--- a/silk/float/sort_FLP.c
+++ b/silk/float/sort_FLP.c
@@ -36,7 +36,7 @@
 #include "typedef.h"
 #include "SigProc_FLP.h"
 
-void silk_insertion_sort_decreasing_FLP(
+void oaci_silk_insertion_sort_decreasing_FLP(
     silk_float          *a,                 /* I/O  Unsorted / Sorted vector                                    */
     oac_int            *idx,               /* O    Index vector for the sorted elements                        */
     const oac_int L,                       /* I    Vector length                                               */
diff --git a/silk/float/warped_autocorrelation_FLP.c b/silk/float/warped_autocorrelation_FLP.c
index 571a9c936..4927bdb9e 100644
--- a/silk/float/warped_autocorrelation_FLP.c
+++ b/silk/float/warped_autocorrelation_FLP.c
@@ -32,7 +32,7 @@
 #include "main_FLP.h"
 
 /* Autocorrelations for a warped frequency axis */
-void silk_warped_autocorrelation_FLP(
+void oaci_silk_warped_autocorrelation_FLP(
     silk_float                      *corr,                              /* O    Result [order + 1]                          */
     const silk_float                *input,                             /* I    Input data to correlate                     */
     const silk_float warping,                                           /* I    Warping coefficient                         */
diff --git a/silk/float/wrappers_FLP.c b/silk/float/wrappers_FLP.c
index 5b9dc429f..e6e93b06b 100644
--- a/silk/float/wrappers_FLP.c
+++ b/silk/float/wrappers_FLP.c
@@ -34,7 +34,7 @@
 /* Wrappers. Calls flp / fix code */
 
 /* Convert AR filter coefficients to NLSF parameters */
-void silk_A2NLSF_FLP(
+void oaci_silk_A2NLSF_FLP(
     oac_int16                      *NLSF_Q15,                          /* O    NLSF vector      [ LPC_order ]              */
     const silk_float                *pAR,                               /* I    LPC coefficients [ LPC_order ]              */
     const oac_int LPC_order                                            /* I    LPC order                                   */
@@ -46,11 +46,11 @@ void silk_A2NLSF_FLP(
         a_fix_Q16[ i ] = silk_float2int( pAR[ i ]*65536.0f );
     }
 
-    silk_A2NLSF( NLSF_Q15, a_fix_Q16, LPC_order );
+    oaci_silk_A2NLSF( NLSF_Q15, a_fix_Q16, LPC_order );
 }
 
 /* Convert LSF parameters to AR prediction filter coefficients */
-void silk_NLSF2A_FLP(
+void oaci_silk_NLSF2A_FLP(
     silk_float                      *pAR,                               /* O    LPC coefficients [ LPC_order ]              */
     const oac_int16                *NLSF_Q15,                          /* I    NLSF vector      [ LPC_order ]              */
     const oac_int LPC_order,                                           /* I    LPC order                                   */
@@ -59,7 +59,7 @@ void silk_NLSF2A_FLP(
     oac_int i;
     oac_int16 a_fix_Q12[ MAX_LPC_ORDER ];
 
-    silk_NLSF2A( a_fix_Q12, NLSF_Q15, LPC_order, arch );
+    oaci_silk_NLSF2A( a_fix_Q12, NLSF_Q15, LPC_order, arch );
 
     for (i = 0; i < LPC_order; i++) {
         pAR[ i ] = ( silk_float )a_fix_Q12[ i ]*(1.0f/4096.0f);
@@ -69,7 +69,7 @@ void silk_NLSF2A_FLP(
 /******************************************/
 /* Floating-point NLSF processing wrapper */
 /******************************************/
-void silk_process_NLSFs_FLP(
+void oaci_silk_process_NLSFs_FLP(
     silk_encoder_state              *psEncC,                            /* I/O  Encoder state                               */
     silk_float PredCoef[ 2 ][ MAX_LPC_ORDER ],                          /* O    Prediction coefficients                     */
     oac_int16 NLSF_Q15[      MAX_LPC_ORDER ],                          /* I/O  Normalized LSFs (quant out) (0 - (2^15-1))  */
@@ -78,7 +78,7 @@ void silk_process_NLSFs_FLP(
     oac_int i, j;
     oac_int16 PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ];
 
-    silk_process_NLSFs( psEncC, PredCoef_Q12, NLSF_Q15, prev_NLSF_Q15);
+    oaci_silk_process_NLSFs( psEncC, PredCoef_Q12, NLSF_Q15, prev_NLSF_Q15);
 
     for (j = 0; j < 2; j++) {
         for (i = 0; i < psEncC->predictLPCOrder; i++) {
@@ -90,7 +90,7 @@ void silk_process_NLSFs_FLP(
 /****************************************/
 /* Floating-point Silk NSQ wrapper      */
 /****************************************/
-void silk_NSQ_wrapper_FLP(
+void oaci_silk_NSQ_wrapper_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     SideInfoIndices                 *psIndices,                         /* I/O  Quantization indices                        */
@@ -145,7 +145,7 @@ void silk_NSQ_wrapper_FLP(
     }
 
     if (psIndices->signalType == TYPE_VOICED) {
-        LTP_scale_Q14 = silk_LTPScales_table_Q14[ psIndices->LTP_scaleIndex ];
+        LTP_scale_Q14 = oaci_silk_LTPScales_table_Q14[ psIndices->LTP_scaleIndex ];
     } else {
         LTP_scale_Q14 = 0;
     }
@@ -157,11 +157,11 @@ void silk_NSQ_wrapper_FLP(
 
     /* Call NSQ */
     if (psEnc->sCmn.nStatesDelayedDecision > 1 || psEnc->sCmn.warping_Q16 > 0) {
-        silk_NSQ_del_dec( &psEnc->sCmn, psNSQ, psIndices, x16, pulses, PredCoef_Q12[ 0 ], LTPCoef_Q14,
+        oaci_silk_NSQ_del_dec( &psEnc->sCmn, psNSQ, psIndices, x16, pulses, PredCoef_Q12[ 0 ], LTPCoef_Q14,
             AR_Q13, HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, psEncCtrl->pitchL, Lambda_Q10, LTP_scale_Q14,
         psEnc->sCmn.arch );
     } else {
-        silk_NSQ( &psEnc->sCmn, psNSQ, psIndices, x16, pulses, PredCoef_Q12[ 0 ], LTPCoef_Q14,
+        oaci_silk_NSQ( &psEnc->sCmn, psNSQ, psIndices, x16, pulses, PredCoef_Q12[ 0 ], LTPCoef_Q14,
             AR_Q13, HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, psEncCtrl->pitchL, Lambda_Q10, LTP_scale_Q14,
         psEnc->sCmn.arch );
     }
@@ -170,7 +170,7 @@ void silk_NSQ_wrapper_FLP(
 /***********************************************/
 /* Floating-point Silk LTP quantiation wrapper */
 /***********************************************/
-void silk_quant_LTP_gains_FLP(
+void oaci_silk_quant_LTP_gains_FLP(
     silk_float B[ MAX_NB_SUBFR * LTP_ORDER ],                           /* O    Quantized LTP gains                            */
     oac_int8 cbk_index[ MAX_NB_SUBFR ],                                /* O    Codebook index                              */
     oac_int8                       *periodicity_index,                 /* O    Periodicity index                           */
@@ -196,7 +196,7 @@ void silk_quant_LTP_gains_FLP(
         xX_Q17[ i ] = (oac_int32)silk_float2int( xX[ i ]*131072.0f );
     } while (++i < nb_subfr*LTP_ORDER);
 
-    silk_quant_LTP_gains( B_Q14, cbk_index, periodicity_index, sum_log_gain_Q7, &pred_gain_dB_Q7, XX_Q17, xX_Q17,
+    oaci_silk_quant_LTP_gains( B_Q14, cbk_index, periodicity_index, sum_log_gain_Q7, &pred_gain_dB_Q7, XX_Q17, xX_Q17,
     subfr_len, nb_subfr, arch );
 
     for (i = 0; i < nb_subfr*LTP_ORDER; i++) {
diff --git a/silk/float/x86/inner_product_FLP_avx2.c b/silk/float/x86/inner_product_FLP_avx2.c
index 054387bf0..abe21e4c4 100644
--- a/silk/float/x86/inner_product_FLP_avx2.c
+++ b/silk/float/x86/inner_product_FLP_avx2.c
@@ -35,7 +35,7 @@
 
 
 /* inner product of two silk_float arrays, with result as double */
-double silk_inner_product_FLP_avx2(
+double oaci_silk_inner_product_FLP_avx2(
     const silk_float    *data1,
     const silk_float    *data2,
     oac_int dataSize)                                {
diff --git a/silk/gain_quant.c b/silk/gain_quant.c
index 7606b1aee..20eb6774e 100644
--- a/silk/gain_quant.c
+++ b/silk/gain_quant.c
@@ -36,7 +36,7 @@
 #define INV_SCALE_Q16           ((65536*(((MAX_QGAIN_DB - MIN_QGAIN_DB)*128)/6))/(N_LEVELS_QGAIN - 1))
 
 /* Gain scalar quantization with hysteresis, uniform on log scale */
-void silk_gains_quant(
+void oaci_silk_gains_quant(
     oac_int8 ind[ MAX_NB_SUBFR ],                              /* O    gain indices                                */
     oac_int32 gain_Q16[ MAX_NB_SUBFR ],                        /* I/O  gains (quantized out)                       */
     oac_int8                   *prev_ind,                      /* I/O  last index in previous frame                */
@@ -47,7 +47,7 @@ void silk_gains_quant(
 
     for (k = 0; k < nb_subfr; k++) {
         /* Convert to log scale, scale, floor() */
-        ind[ k ] = silk_SMULWB( SCALE_Q16, silk_lin2log( gain_Q16[ k ] ) - OFFSET );
+        ind[ k ] = silk_SMULWB( SCALE_Q16, oaci_silk_lin2log( gain_Q16[ k ] ) - OFFSET );
 
         /* Round towards previous quantized gain (hysteresis) */
         if (ind[ k ] < *prev_ind) {
@@ -85,12 +85,12 @@ void silk_gains_quant(
         }
 
         /* Scale and convert to linear scale */
-        gain_Q16[ k ] = silk_log2lin( silk_min_32( silk_SMULWB( INV_SCALE_Q16, *prev_ind ) + OFFSET, 3967 ));  /* 3967 = 31 in Q7 */
+        gain_Q16[ k ] = oaci_silk_log2lin( silk_min_32( silk_SMULWB( INV_SCALE_Q16, *prev_ind ) + OFFSET, 3967 ));  /* 3967 = 31 in Q7 */
     }
 }
 
 /* Gains scalar dequantization, uniform on log scale */
-void silk_gains_dequant(
+void oaci_silk_gains_dequant(
     oac_int32 gain_Q16[ MAX_NB_SUBFR ],                        /* O    quantized gains                             */
     const oac_int8 ind[ MAX_NB_SUBFR ],                        /* I    gain indices                                */
     oac_int8                   *prev_ind,                      /* I/O  last index in previous frame                */
@@ -118,12 +118,12 @@ void silk_gains_dequant(
         *prev_ind = silk_LIMIT_int( *prev_ind, 0, N_LEVELS_QGAIN - 1 );
 
         /* Scale and convert to linear scale */
-        gain_Q16[ k ] = silk_log2lin( silk_min_32( silk_SMULWB( INV_SCALE_Q16, *prev_ind ) + OFFSET, 3967 ));  /* 3967 = 31 in Q7 */
+        gain_Q16[ k ] = oaci_silk_log2lin( silk_min_32( silk_SMULWB( INV_SCALE_Q16, *prev_ind ) + OFFSET, 3967 ));  /* 3967 = 31 in Q7 */
     }
 }
 
 /* Compute unique identifier of gain indices vector */
-oac_int32 silk_gains_ID(                                       /* O    returns unique identifier of gains          */
+oac_int32 oaci_silk_gains_ID(                                       /* O    returns unique identifier of gains          */
     const oac_int8 ind[ MAX_NB_SUBFR ],                        /* I    gain indices                                */
     const oac_int nb_subfr                                     /* I    number of subframes                         */
     ) {
diff --git a/silk/init_decoder.c b/silk/init_decoder.c
index c57238e15..6a37d3a9a 100644
--- a/silk/init_decoder.c
+++ b/silk/init_decoder.c
@@ -40,7 +40,7 @@
 /************************/
 /* Reset Decoder State  */
 /************************/
-oac_int silk_reset_decoder(
+oac_int oaci_silk_reset_decoder(
     silk_decoder_state          *psDec                          /* I/O  Decoder state pointer                       */
     ) {
     /* Clear the entire encoder state, except anything copied */
@@ -53,14 +53,14 @@ oac_int silk_reset_decoder(
     psDec->arch = oac_select_arch();
 
     /* Reset CNG state */
-    silk_CNG_Reset( psDec );
+    oaci_silk_CNG_Reset( psDec );
 
     /* Reset PLC state */
-    silk_PLC_Reset( psDec );
+    oaci_silk_PLC_Reset( psDec );
 
 #ifdef ENABLE_OSCE
     /* Reset OSCE state and method */
-    osce_reset(&psDec->osce, OSCE_DEFAULT_METHOD);
+    oaci_osce_reset(&psDec->osce, OSCE_DEFAULT_METHOD);
 #endif
 
     return 0;
@@ -70,13 +70,13 @@ oac_int silk_reset_decoder(
 /************************/
 /* Init Decoder State   */
 /************************/
-oac_int silk_init_decoder(
+oac_int oaci_silk_init_decoder(
     silk_decoder_state          *psDec                          /* I/O  Decoder state pointer                       */
     ) {
     /* Clear the entire encoder state, except anything copied */
     silk_memset( psDec, 0, sizeof(silk_decoder_state));
 
-    silk_reset_decoder( psDec );
+    oaci_silk_reset_decoder( psDec );
 
     return 0;
 }
diff --git a/silk/init_encoder.c b/silk/init_encoder.c
index 730bc2e93..ee92014d3 100644
--- a/silk/init_encoder.c
+++ b/silk/init_encoder.c
@@ -43,7 +43,7 @@
 /*********************************/
 /* Initialize Silk Encoder state */
 /*********************************/
-oac_int silk_init_encoder(
+oac_int oaci_silk_init_encoder(
     silk_encoder_state_Fxx          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
     int arch                                                                /* I    Run-time architecture                                                       */
     ) {
@@ -54,7 +54,7 @@ oac_int silk_init_encoder(
 
     psEnc->sCmn.arch = arch;
 
-    psEnc->sCmn.variable_HP_smth1_Q15 = silk_LSHIFT( silk_lin2log( SILK_FIX_CONST( VARIABLE_HP_MIN_CUTOFF_HZ,
+    psEnc->sCmn.variable_HP_smth1_Q15 = silk_LSHIFT( oaci_silk_lin2log( SILK_FIX_CONST( VARIABLE_HP_MIN_CUTOFF_HZ,
     16 )) - (16<<7), 8 );
     psEnc->sCmn.variable_HP_smth2_Q15 = psEnc->sCmn.variable_HP_smth1_Q15;
 
@@ -62,7 +62,7 @@ oac_int silk_init_encoder(
     psEnc->sCmn.first_frame_after_reset = 1;
 
     /* Initialize Silk VAD */
-    ret += silk_VAD_Init( &psEnc->sCmn.sVAD );
+    ret += oaci_silk_VAD_Init( &psEnc->sCmn.sVAD );
 
     return ret;
 }
diff --git a/silk/inner_prod_aligned.c b/silk/inner_prod_aligned.c
index b82867b7d..7e47d2aa1 100644
--- a/silk/inner_prod_aligned.c
+++ b/silk/inner_prod_aligned.c
@@ -31,7 +31,7 @@
 
 #include "SigProc_FIX.h"
 
-oac_int32 silk_inner_prod_aligned_scale(
+oac_int32 oaci_silk_inner_prod_aligned_scale(
     const oac_int16 *const inVec1,                 /*    I input vector 1                                              */
     const oac_int16 *const inVec2,                 /*    I input vector 2                                              */
     const oac_int scale,                           /*    I number of bits to shift                                     */
diff --git a/silk/interpolate.c b/silk/interpolate.c
index 5ba59a38e..00d6117e5 100644
--- a/silk/interpolate.c
+++ b/silk/interpolate.c
@@ -32,7 +32,7 @@
 #include "main.h"
 
 /* Interpolate two vectors */
-void silk_interpolate(
+void oaci_silk_interpolate(
     oac_int16 xi[ MAX_LPC_ORDER ],                             /* O    interpolated vector                         */
     const oac_int16 x0[ MAX_LPC_ORDER ],                       /* I    first vector                                */
     const oac_int16 x1[ MAX_LPC_ORDER ],                       /* I    second vector                               */
diff --git a/silk/lin2log.c b/silk/lin2log.c
index 3c67dded2..f132da94f 100644
--- a/silk/lin2log.c
+++ b/silk/lin2log.c
@@ -30,9 +30,9 @@
 #endif
 
 #include "SigProc_FIX.h"
-/* Approximation of 128 * log2() (very close inverse of silk_log2lin()) */
+/* Approximation of 128 * log2() (very close inverse of oaci_silk_log2lin()) */
 /* Convert input to a log scale    */
-oac_int32 silk_lin2log(
+oac_int32 oaci_silk_lin2log(
     const oac_int32 inLin                          /* I  input in linear scale                                         */
     ) {
     oac_int32 lz, frac_Q7;
diff --git a/silk/log2lin.c b/silk/log2lin.c
index 3a05fc8d7..3f0c3b67a 100644
--- a/silk/log2lin.c
+++ b/silk/log2lin.c
@@ -31,9 +31,9 @@
 
 #include "SigProc_FIX.h"
 
-/* Approximation of 2^() (very close inverse of silk_lin2log()) */
+/* Approximation of 2^() (very close inverse of oaci_silk_lin2log()) */
 /* Convert input to a linear scale    */
-oac_int32 silk_log2lin(
+oac_int32 oaci_silk_log2lin(
     const oac_int32 inLog_Q7                       /* I  input on log scale                                            */
     ) {
     oac_int32 out, frac_Q7;
diff --git a/silk/main.h b/silk/main.h
index 3bc24024e..47cd588a0 100644
--- a/silk/main.h
+++ b/silk/main.h
@@ -47,7 +47,7 @@
 #endif
 
 /* Convert Left/Right stereo signal to adaptive Mid/Side representation */
-void silk_stereo_LR_to_MS(
+void oaci_silk_stereo_LR_to_MS(
     stereo_enc_state            *state,                         /* I/O  State                                       */
     oac_int16 x1[],                                            /* I/O  Left input signal, becomes mid signal       */
     oac_int16 x2[],                                            /* I/O  Right input signal, becomes side signal     */
@@ -62,7 +62,7 @@ void silk_stereo_LR_to_MS(
     );
 
 /* Convert adaptive Mid/Side representation to Left/Right stereo signal */
-void silk_stereo_MS_to_LR(
+void oaci_silk_stereo_MS_to_LR(
     stereo_dec_state            *state,                         /* I/O  State                                       */
     oac_int16 x1[],                                            /* I/O  Left input signal, becomes mid signal       */
     oac_int16 x2[],                                            /* I/O  Right input signal, becomes side signal     */
@@ -72,7 +72,7 @@ void silk_stereo_MS_to_LR(
     );
 
 /* Find least-squares prediction gain for one signal based on another and quantize it */
-oac_int32 silk_stereo_find_predictor(                          /* O    Returns predictor in Q13                    */
+oac_int32 oaci_silk_stereo_find_predictor(                          /* O    Returns predictor in Q13                    */
     oac_int32                  *ratio_Q14,                     /* O    Ratio of residual and mid energies          */
     const oac_int16 x[],                                       /* I    Basis signal                                */
     const oac_int16 y[],                                       /* I    Target signal                               */
@@ -82,36 +82,36 @@ oac_int32 silk_stereo_find_predictor(                          /* O    Returns p
     );
 
 /* Quantize mid/side predictors */
-void silk_stereo_quant_pred(
+void oaci_silk_stereo_quant_pred(
     oac_int32 pred_Q13[],                                      /* I/O  Predictors (out: quantized)                 */
     oac_int8 ix[ 2 ][ 3 ]                                      /* O    Quantization indices                        */
     );
 
 /* Entropy code the mid/side quantization indices */
-void silk_stereo_encode_pred(
+void oaci_silk_stereo_encode_pred(
     ec_enc                      *psRangeEnc,                    /* I/O  Compressor data structure                   */
     oac_int8 ix[ 2 ][ 3 ]                                      /* I    Quantization indices                        */
     );
 
 /* Entropy code the mid-only flag */
-void silk_stereo_encode_mid_only(
+void oaci_silk_stereo_encode_mid_only(
     ec_enc                      *psRangeEnc,                    /* I/O  Compressor data structure                   */
     oac_int8 mid_only_flag);
 
 /* Decode mid/side predictors */
-void silk_stereo_decode_pred(
+void oaci_silk_stereo_decode_pred(
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
     oac_int32 pred_Q13[]                                       /* O    Predictors                                  */
     );
 
 /* Decode mid-only flag */
-void silk_stereo_decode_mid_only(
+void oaci_silk_stereo_decode_mid_only(
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
     oac_int                    *decode_only_mid                /* O    Flag that only mid channel has been coded   */
     );
 
 /* Encodes signs of excitation */
-void silk_encode_signs(
+void oaci_silk_encode_signs(
     ec_enc                      *psRangeEnc,                        /* I/O  Compressor data structure               */
     const oac_int8 pulses[],                                       /* I    pulse signal                            */
     oac_int length,                                                /* I    length of input                         */
@@ -121,7 +121,7 @@ void silk_encode_signs(
     );
 
 /* Decodes signs of excitation */
-void silk_decode_signs(
+void oaci_silk_decode_signs(
     ec_dec                      *psRangeDec,                        /* I/O  Compressor data structure               */
     oac_int16 pulses[],                                            /* I/O  pulse signal                            */
     oac_int length,                                                /* I    length of input                         */
@@ -131,18 +131,18 @@ void silk_decode_signs(
     );
 
 /* Check encoder control struct */
-oac_int check_control_input(
+oac_int oaci_check_control_input(
     silk_EncControlStruct        *encControl                    /* I    Control structure                           */
     );
 
 /* Control internal sampling rate */
-oac_int silk_control_audio_bandwidth(
+oac_int oaci_silk_control_audio_bandwidth(
     silk_encoder_state          *psEncC,                        /* I/O  Pointer to Silk encoder state               */
     silk_EncControlStruct       *encControl                     /* I    Control structure                           */
     );
 
 /* Control SNR of residual quantizer */
-oac_int silk_control_SNR(
+oac_int oaci_silk_control_SNR(
     silk_encoder_state          *psEncC,                        /* I/O  Pointer to Silk encoder state               */
     oac_int32 TargetRate_bps                                   /* I    Target max bitrate (bps)                    */
     );
@@ -152,7 +152,7 @@ oac_int silk_control_SNR(
 /***************/
 
 /* Encode quantization indices of excitation */
-void silk_encode_pulses(
+void oaci_silk_encode_pulses(
     ec_enc                      *psRangeEnc,                    /* I/O  compressor data structure                   */
     const oac_int signalType,                                  /* I    Signal type                                 */
     const oac_int quantOffsetType,                             /* I    quantOffsetType                             */
@@ -161,20 +161,20 @@ void silk_encode_pulses(
     );
 
 /* Shell encoder, operates on one shell code frame of 16 pulses */
-void silk_shell_encoder(
+void oaci_silk_shell_encoder(
     ec_enc                      *psRangeEnc,                    /* I/O  compressor data structure                   */
     const oac_int              *pulses0                        /* I    data: nonnegative pulse amplitudes          */
     );
 
 /* Shell decoder, operates on one shell code frame of 16 pulses */
-void silk_shell_decoder(
+void oaci_silk_shell_decoder(
     oac_int16                  *pulses0,                       /* O    data: nonnegative pulse amplitudes          */
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
     const oac_int pulses4                                      /* I    number of pulses per pulse-subframe         */
     );
 
 /* Gain scalar quantization with hysteresis, uniform on log scale */
-void silk_gains_quant(
+void oaci_silk_gains_quant(
     oac_int8 ind[ MAX_NB_SUBFR ],                              /* O    gain indices                                */
     oac_int32 gain_Q16[ MAX_NB_SUBFR ],                        /* I/O  gains (quantized out)                       */
     oac_int8                   *prev_ind,                      /* I/O  last index in previous frame                */
@@ -183,7 +183,7 @@ void silk_gains_quant(
     );
 
 /* Gains scalar dequantization, uniform on log scale */
-void silk_gains_dequant(
+void oaci_silk_gains_dequant(
     oac_int32 gain_Q16[ MAX_NB_SUBFR ],                        /* O    quantized gains                             */
     const oac_int8 ind[ MAX_NB_SUBFR ],                        /* I    gain indices                                */
     oac_int8                   *prev_ind,                      /* I/O  last index in previous frame                */
@@ -192,13 +192,13 @@ void silk_gains_dequant(
     );
 
 /* Compute unique identifier of gain indices vector */
-oac_int32 silk_gains_ID(                                       /* O    returns unique identifier of gains          */
+oac_int32 oaci_silk_gains_ID(                                       /* O    returns unique identifier of gains          */
     const oac_int8 ind[ MAX_NB_SUBFR ],                        /* I    gain indices                                */
     const oac_int nb_subfr                                     /* I    number of subframes                         */
     );
 
 /* Interpolate two vectors */
-void silk_interpolate(
+void oaci_silk_interpolate(
     oac_int16 xi[ MAX_LPC_ORDER ],                             /* O    interpolated vector                         */
     const oac_int16 x0[ MAX_LPC_ORDER ],                       /* I    first vector                                */
     const oac_int16 x1[ MAX_LPC_ORDER ],                       /* I    second vector                               */
@@ -207,7 +207,7 @@ void silk_interpolate(
     );
 
 /* LTP tap quantizer */
-void silk_quant_LTP_gains(
+void oaci_silk_quant_LTP_gains(
     oac_int16 B_Q14[ MAX_NB_SUBFR*LTP_ORDER ],                             /* O    Quantized LTP gains             */
     oac_int8 cbk_index[ MAX_NB_SUBFR ],                                    /* O    Codebook Index                  */
     oac_int8                   *periodicity_index,                         /* O    Periodicity Index               */
@@ -221,7 +221,7 @@ void silk_quant_LTP_gains(
     );
 
 /* Entropy constrained matrix-weighted VQ, for a single input data vector */
-void silk_VQ_WMat_EC_c(
+void oaci_silk_VQ_WMat_EC_c(
     oac_int8                   *ind,                           /* O    index of best codebook vector               */
     oac_int32                  *res_nrg_Q15,                   /* O    best residual energy                        */
     oac_int32                  *rate_dist_Q8,                  /* O    best total bitrate                          */
@@ -236,11 +236,11 @@ void silk_VQ_WMat_EC_c(
     const oac_int L                                            /* I    number of vectors in codebook               */
     );
 
-#if !defined(OVERRIDE_silk_VQ_WMat_EC)
-# define silk_VQ_WMat_EC(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, subfr_len, \
+#if !defined(OVERRIDE_oaci_silk_VQ_WMat_EC)
+# define oaci_silk_VQ_WMat_EC(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, subfr_len, \
                          max_gain_Q7, L, arch) \
         ((void)(arch), \
-         silk_VQ_WMat_EC_c(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, subfr_len, \
+         oaci_silk_VQ_WMat_EC_c(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, subfr_len, \
     max_gain_Q7, L))
 #endif
 
@@ -248,7 +248,7 @@ void silk_VQ_WMat_EC_c(
 /* Noise shaping quantization (NSQ) */
 /************************************/
 
-void silk_NSQ_c(
+void oaci_silk_NSQ_c(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
@@ -266,15 +266,15 @@ void silk_NSQ_c(
     const oac_int LTP_scale_Q14                                              /* I    LTP state scaling               */
     );
 
-#if !defined(OVERRIDE_silk_NSQ)
-# define silk_NSQ(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
+#if !defined(OVERRIDE_oaci_silk_NSQ)
+# define oaci_silk_NSQ(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
                   HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
-        ((void)(arch), silk_NSQ_c(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
+        ((void)(arch), oaci_silk_NSQ_c(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
                    HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14))
 #endif
 
 /* Noise shaping using delayed decision */
-void silk_NSQ_del_dec_c(
+void oaci_silk_NSQ_del_dec_c(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
@@ -292,10 +292,10 @@ void silk_NSQ_del_dec_c(
     const oac_int LTP_scale_Q14                                              /* I    LTP state scaling               */
     );
 
-#if !defined(OVERRIDE_silk_NSQ_del_dec)
-# define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
+#if !defined(OVERRIDE_oaci_silk_NSQ_del_dec)
+# define oaci_silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
                           HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
-        ((void)(arch), silk_NSQ_del_dec_c(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
+        ((void)(arch), oaci_silk_NSQ_del_dec_c(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
                            HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14))
 #endif
 
@@ -303,24 +303,24 @@ void silk_NSQ_del_dec_c(
 /* Silk VAD */
 /************/
 /* Initialize the Silk VAD */
-oac_int silk_VAD_Init(                                         /* O    Return value, 0 if success                  */
+oac_int oaci_silk_VAD_Init(                                         /* O    Return value, 0 if success                  */
     silk_VAD_state              *psSilk_VAD                     /* I/O  Pointer to Silk VAD state                   */
     );
 
 /* Get speech activity level in Q8 */
-oac_int silk_VAD_GetSA_Q8_c(                                   /* O    Return value, 0 if success                  */
+oac_int oaci_silk_VAD_GetSA_Q8_c(                                   /* O    Return value, 0 if success                  */
     silk_encoder_state          *psEncC,                        /* I/O  Encoder state                               */
     const oac_int16 pIn[]                                      /* I    PCM input                                   */
     );
 
-#if !defined(OVERRIDE_silk_VAD_GetSA_Q8)
-# define silk_VAD_GetSA_Q8(psEnC, pIn, arch) ((void)(arch), silk_VAD_GetSA_Q8_c(psEnC, pIn))
+#if !defined(OVERRIDE_oaci_silk_VAD_GetSA_Q8)
+# define oaci_silk_VAD_GetSA_Q8(psEnC, pIn, arch) ((void)(arch), oaci_silk_VAD_GetSA_Q8_c(psEnC, pIn))
 #endif
 
 /* Low-pass filter with variable cutoff frequency based on  */
 /* piece-wise linear interpolation between elliptic filters */
 /* Start by setting transition_frame_no = 1;                */
-void silk_LP_variable_cutoff(
+void oaci_silk_LP_variable_cutoff(
     silk_LP_state               *psLP,                          /* I/O  LP filter state                             */
     oac_int16                  *frame,                         /* I/O  Low-pass filtered output signal             */
     const oac_int frame_length                                 /* I    Frame length                                */
@@ -330,14 +330,14 @@ void silk_LP_variable_cutoff(
 /* NLSF Quantizer */
 /******************/
 /* Limit, stabilize, convert and quantize NLSFs */
-void silk_process_NLSFs(
+void oaci_silk_process_NLSFs(
     silk_encoder_state          *psEncC,                            /* I/O  Encoder state                               */
     oac_int16 PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ],                  /* O    Prediction coefficients                     */
     oac_int16 pNLSF_Q15[         MAX_LPC_ORDER ],                  /* I/O  Normalized LSFs (quant out) (0 - (2^15-1))  */
     const oac_int16 prev_NLSFq_Q15[    MAX_LPC_ORDER ]             /* I    Previous Normalized LSFs (0 - (2^15-1))     */
     );
 
-oac_int32 silk_NLSF_encode(                                    /* O    Returns RD value in Q25                     */
+oac_int32 oaci_silk_NLSF_encode(                                    /* O    Returns RD value in Q25                     */
     oac_int8             *NLSFIndices,                         /* I    Codebook path vector [ LPC_ORDER + 1 ]      */
     oac_int16            *pNLSF_Q15,                           /* I/O  Quantized NLSF vector [ LPC_ORDER ]         */
     const silk_NLSF_CB_struct   *psNLSF_CB,                     /* I    Codebook object                             */
@@ -348,7 +348,7 @@ oac_int32 silk_NLSF_encode(                                    /* O    Returns R
     );
 
 /* Compute quantization errors for an LPC_order element input vector for a VQ codebook */
-void silk_NLSF_VQ(
+void oaci_silk_NLSF_VQ(
     oac_int32 err_Q26[],                                       /* O    Quantization errors [K]                     */
     const oac_int16 in_Q15[],                                  /* I    Input vectors to be quantized [LPC_order]   */
     const oac_uint8 pCB_Q8[],                                  /* I    Codebook vectors [K*LPC_order]              */
@@ -358,7 +358,7 @@ void silk_NLSF_VQ(
     );
 
 /* Delayed-decision quantizer for NLSF residuals */
-oac_int32 silk_NLSF_del_dec_quant(                             /* O    Returns RD value in Q25                     */
+oac_int32 oaci_silk_NLSF_del_dec_quant(                             /* O    Returns RD value in Q25                     */
     oac_int8 indices[],                                        /* O    Quantization indices [ order ]              */
     const oac_int16 x_Q10[],                                   /* I    Input [ order ]                             */
     const oac_int16 w_Q5[],                                    /* I    Weights [ order ]                           */
@@ -372,7 +372,7 @@ oac_int32 silk_NLSF_del_dec_quant(                             /* O    Returns R
     );
 
 /* Unpack predictor values and indices for entropy coding tables */
-void silk_NLSF_unpack(
+void oaci_silk_NLSF_unpack(
     oac_int16 ec_ix[],                                         /* O    Indices to entropy tables [ LPC_ORDER ]     */
     oac_uint8 pred_Q8[],                                       /* O    LSF predictor [ LPC_ORDER ]                 */
     const silk_NLSF_CB_struct   *psNLSF_CB,                     /* I    Codebook object                             */
@@ -382,7 +382,7 @@ void silk_NLSF_unpack(
 /***********************/
 /* NLSF vector decoder */
 /***********************/
-void silk_NLSF_decode(
+void oaci_silk_NLSF_decode(
     oac_int16            *pNLSF_Q15,                           /* O    Quantized NLSF vector [ LPC_ORDER ]         */
     oac_int8             *NLSFIndices,                         /* I    Codebook path vector [ LPC_ORDER + 1 ]      */
     const silk_NLSF_CB_struct   *psNLSF_CB                      /* I    Codebook object                             */
@@ -391,16 +391,16 @@ void silk_NLSF_decode(
 /****************************************************/
 /* Decoder Functions                                */
 /****************************************************/
-oac_int silk_reset_decoder(
+oac_int oaci_silk_reset_decoder(
     silk_decoder_state          *psDec                          /* I/O  Decoder state pointer                       */
     );
 
-oac_int silk_init_decoder(
+oac_int oaci_silk_init_decoder(
     silk_decoder_state          *psDec                          /* I/O  Decoder state pointer                       */
     );
 
 /* Set decoder sampling rate */
-oac_int silk_decoder_set_fs(
+oac_int oaci_silk_decoder_set_fs(
     silk_decoder_state          *psDec,                         /* I/O  Decoder state pointer                       */
     oac_int fs_kHz,                                            /* I    Sampling frequency (kHz)                    */
     oac_int32 fs_API_Hz                                        /* I    API Sampling frequency (Hz)                 */
@@ -409,7 +409,7 @@ oac_int silk_decoder_set_fs(
 /****************/
 /* Decode frame */
 /****************/
-oac_int silk_decode_frame(
+oac_int oaci_silk_decode_frame(
     silk_decoder_state*psDec,                                   /* I/O  Pointer to Silk decoder state               */
     ec_dec*psRangeDec,                                          /* I/O  Compressor data structure                   */
     oac_int16 pOut[],                                          /* O    Pointer to output speech frame              */
@@ -426,7 +426,7 @@ oac_int silk_decode_frame(
     );
 
 /* Decode indices from bitstream */
-void silk_decode_indices(
+void oaci_silk_decode_indices(
     silk_decoder_state          *psDec,                         /* I/O  State                                       */
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
     oac_int FrameIndex,                                        /* I    Frame number                                */
@@ -435,14 +435,14 @@ void silk_decode_indices(
     );
 
 /* Decode parameters from payload */
-void silk_decode_parameters(
+void oaci_silk_decode_parameters(
     silk_decoder_state          *psDec,                         /* I/O  State                                       */
     silk_decoder_control        *psDecCtrl,                     /* I/O  Decoder control                             */
     oac_int condCoding                                         /* I    The type of conditional coding to use       */
     );
 
 /* Core decoder. Performs inverse NSQ operation LTP + LPC */
-void silk_decode_core(
+void oaci_silk_decode_core(
     silk_decoder_state          *psDec,                         /* I/O  Decoder state                               */
     silk_decoder_control        *psDecCtrl,                     /* I    Decoder control                             */
     oac_int16 xq[],                                            /* O    Decoded speech                              */
@@ -451,7 +451,7 @@ void silk_decode_core(
     );
 
 /* Decode quantization indices of excitation (Shell coding) */
-void silk_decode_pulses(
+void oaci_silk_decode_pulses(
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
     oac_int16 pulses[],                                        /* O    Excitation signal                           */
     const oac_int signalType,                                  /* I    Sigtype                                     */
@@ -464,12 +464,12 @@ void silk_decode_pulses(
 /******************/
 
 /* Reset CNG */
-void silk_CNG_Reset(
+void oaci_silk_CNG_Reset(
     silk_decoder_state          *psDec                          /* I/O  Decoder state                               */
     );
 
 /* Updates CNG estimate, and applies the CNG when packet was lost */
-void silk_CNG(
+void oaci_silk_CNG(
     silk_decoder_state          *psDec,                         /* I/O  Decoder state                               */
     silk_decoder_control        *psDecCtrl,                     /* I/O  Decoder control                             */
     oac_int16 frame[],                                         /* I/O  Signal                                      */
@@ -477,7 +477,7 @@ void silk_CNG(
     );
 
 /* Encoding of various parameters */
-void silk_encode_indices(
+void oaci_silk_encode_indices(
     silk_encoder_state          *psEncC,                        /* I/O  Encoder state                               */
     ec_enc                      *psRangeEnc,                    /* I/O  Compressor data structure                   */
     oac_int FrameIndex,                                        /* I    Frame number                                */
diff --git a/silk/pitch_est_defines.h b/silk/pitch_est_defines.h
index 287fdd5ab..b6cbddf7d 100644
--- a/silk/pitch_est_defines.h
+++ b/silk/pitch_est_defines.h
@@ -74,14 +74,14 @@
 #define SILK_PE_MAX_COMPLEX         2
 
 /* Tables for 20 ms frames */
-extern const oac_int8 silk_CB_lags_stage2[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE2_EXT ];
-extern const oac_int8 silk_CB_lags_stage3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ];
-extern const oac_int8 silk_Lag_range_stage3[ SILK_PE_MAX_COMPLEX + 1 ] [ PE_MAX_NB_SUBFR ][ 2 ];
-extern const oac_int8 silk_nb_cbk_searchs_stage3[ SILK_PE_MAX_COMPLEX + 1 ];
+extern const oac_int8 oaci_silk_CB_lags_stage2[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE2_EXT ];
+extern const oac_int8 oaci_silk_CB_lags_stage3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ];
+extern const oac_int8 oaci_silk_Lag_range_stage3[ SILK_PE_MAX_COMPLEX + 1 ] [ PE_MAX_NB_SUBFR ][ 2 ];
+extern const oac_int8 oaci_silk_nb_cbk_searchs_stage3[ SILK_PE_MAX_COMPLEX + 1 ];
 
 /* Tables for 10 ms frames */
-extern const oac_int8 silk_CB_lags_stage2_10_ms[ PE_MAX_NB_SUBFR>>1][ 3 ];
-extern const oac_int8 silk_CB_lags_stage3_10_ms[ PE_MAX_NB_SUBFR>>1 ][ 12 ];
-extern const oac_int8 silk_Lag_range_stage3_10_ms[ PE_MAX_NB_SUBFR>>1 ][ 2 ];
+extern const oac_int8 oaci_silk_CB_lags_stage2_10_ms[ PE_MAX_NB_SUBFR>>1][ 3 ];
+extern const oac_int8 oaci_silk_CB_lags_stage3_10_ms[ PE_MAX_NB_SUBFR>>1 ][ 12 ];
+extern const oac_int8 oaci_silk_Lag_range_stage3_10_ms[ PE_MAX_NB_SUBFR>>1 ][ 2 ];
 
 #endif
diff --git a/silk/pitch_est_tables.c b/silk/pitch_est_tables.c
index ef8578030..77705b527 100644
--- a/silk/pitch_est_tables.c
+++ b/silk/pitch_est_tables.c
@@ -32,25 +32,25 @@
 #include "typedef.h"
 #include "pitch_est_defines.h"
 
-const oac_int8 silk_CB_lags_stage2_10_ms[ PE_MAX_NB_SUBFR>>1][ PE_NB_CBKS_STAGE2_10MS ] =
+const oac_int8 oaci_silk_CB_lags_stage2_10_ms[ PE_MAX_NB_SUBFR>>1][ PE_NB_CBKS_STAGE2_10MS ] =
 {
     {0, 1, 0},
     {0, 0, 1}
 };
 
-const oac_int8 silk_CB_lags_stage3_10_ms[ PE_MAX_NB_SUBFR>>1 ][ PE_NB_CBKS_STAGE3_10MS ] =
+const oac_int8 oaci_silk_CB_lags_stage3_10_ms[ PE_MAX_NB_SUBFR>>1 ][ PE_NB_CBKS_STAGE3_10MS ] =
 {
     { 0, 0, 1, -1, 1, -1, 2, -2, 2, -2, 3, -3},
     { 0, 1, 0, 1, -1, 2, -1, 2, -2, 3, -2, 3}
 };
 
-const oac_int8 silk_Lag_range_stage3_10_ms[ PE_MAX_NB_SUBFR>>1 ][ 2 ] =
+const oac_int8 oaci_silk_Lag_range_stage3_10_ms[ PE_MAX_NB_SUBFR>>1 ][ 2 ] =
 {
     {-3, 7},
     {-2, 7}
 };
 
-const oac_int8 silk_CB_lags_stage2[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE2_EXT ] =
+const oac_int8 oaci_silk_CB_lags_stage2[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE2_EXT ] =
 {
     {0, 2, -1, -1, -1, 0, 0, 1, 1, 0, 1},
     {0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0},
@@ -58,7 +58,7 @@ const oac_int8 silk_CB_lags_stage2[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE2_EXT ] =
     {0, -1, 2, 1, 0, 1, 1, 0, 0, -1, -1}
 };
 
-const oac_int8 silk_CB_lags_stage3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ] =
+const oac_int8 oaci_silk_CB_lags_stage3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ] =
 {
     {0, 0, 1, -1, 0, 1, -1, 0, -1, 1, -2, 2, -2, -2, 2, -3, 2, 3, -3, -4, 3, -4, 4, 4, -5, 5, -6, -5, 6, -7, 6, 5, 8,
      -9},
@@ -67,7 +67,7 @@ const oac_int8 silk_CB_lags_stage3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ] =
     {0, 1, 0, 0, 1, 0, 1, -1, 2, -1, 2, -1, 2, 3, -2, 3, -2, -2, 4, 4, -3, 5, -3, -4, 6, -4, 6, 5, -5, 8, -6, -5, -7, 9}
 };
 
-const oac_int8 silk_Lag_range_stage3[ SILK_PE_MAX_COMPLEX + 1 ] [ PE_MAX_NB_SUBFR ][ 2 ] =
+const oac_int8 oaci_silk_Lag_range_stage3[ SILK_PE_MAX_COMPLEX + 1 ] [ PE_MAX_NB_SUBFR ][ 2 ] =
 {
     /* Lags to search for low number of stage3 cbks */
     {
@@ -92,7 +92,7 @@ const oac_int8 silk_Lag_range_stage3[ SILK_PE_MAX_COMPLEX + 1 ] [ PE_MAX_NB_SUBF
     }
 };
 
-const oac_int8 silk_nb_cbk_searchs_stage3[ SILK_PE_MAX_COMPLEX + 1 ] =
+const oac_int8 oaci_silk_nb_cbk_searchs_stage3[ SILK_PE_MAX_COMPLEX + 1 ] =
 {
     PE_NB_CBKS_STAGE3_MIN,
     PE_NB_CBKS_STAGE3_MID,
diff --git a/silk/process_NLSFs.c b/silk/process_NLSFs.c
index b2b0d1deb..e165a5c6c 100644
--- a/silk/process_NLSFs.c
+++ b/silk/process_NLSFs.c
@@ -32,7 +32,7 @@
 #include "main.h"
 
 /* Limit, stabilize, convert and quantize NLSFs */
-void silk_process_NLSFs(
+void oaci_silk_process_NLSFs(
     silk_encoder_state          *psEncC,                            /* I/O  Encoder state                               */
     oac_int16 PredCoef_Q12[ 2 ][ MAX_LPC_ORDER ],                  /* O    Prediction coefficients                     */
     oac_int16 pNLSF_Q15[         MAX_LPC_ORDER ],                  /* I/O  Normalized LSFs (quant out) (0 - (2^15-1))  */
@@ -63,17 +63,17 @@ void silk_process_NLSFs(
     silk_assert( NLSF_mu_Q20 <= SILK_FIX_CONST( 0.005, 20 ));
 
     /* Calculate NLSF weights */
-    silk_NLSF_VQ_weights_laroia( pNLSFW_QW, pNLSF_Q15, psEncC->predictLPCOrder );
+    oaci_silk_NLSF_VQ_weights_laroia( pNLSFW_QW, pNLSF_Q15, psEncC->predictLPCOrder );
 
     /* Update NLSF weights for interpolated NLSFs */
     doInterpolate = (psEncC->useInterpolatedNLSFs == 1) && (psEncC->indices.NLSFInterpCoef_Q2 < 4);
     if (doInterpolate) {
         /* Calculate the interpolated NLSF vector for the first half */
-        silk_interpolate( pNLSF0_temp_Q15, prev_NLSFq_Q15, pNLSF_Q15,
+        oaci_silk_interpolate( pNLSF0_temp_Q15, prev_NLSFq_Q15, pNLSF_Q15,
             psEncC->indices.NLSFInterpCoef_Q2, psEncC->predictLPCOrder );
 
         /* Calculate first half NLSF weights for the interpolated NLSFs */
-        silk_NLSF_VQ_weights_laroia( pNLSFW0_temp_QW, pNLSF0_temp_Q15, psEncC->predictLPCOrder );
+        oaci_silk_NLSF_VQ_weights_laroia( pNLSFW0_temp_QW, pNLSF0_temp_Q15, psEncC->predictLPCOrder );
 
         /* Update NLSF weights with contribution from first half */
         i_sqr_Q15 = silk_LSHIFT( silk_SMULBB( psEncC->indices.NLSFInterpCoef_Q2, psEncC->indices.NLSFInterpCoef_Q2 ),
@@ -85,19 +85,19 @@ void silk_process_NLSFs(
         }
     }
 
-    silk_NLSF_encode( psEncC->indices.NLSFIndices, pNLSF_Q15, psEncC->psNLSF_CB, pNLSFW_QW,
+    oaci_silk_NLSF_encode( psEncC->indices.NLSFIndices, pNLSF_Q15, psEncC->psNLSF_CB, pNLSFW_QW,
         NLSF_mu_Q20, psEncC->NLSF_MSVQ_Survivors, psEncC->indices.signalType );
 
     /* Convert quantized NLSFs back to LPC coefficients */
-    silk_NLSF2A( PredCoef_Q12[ 1 ], pNLSF_Q15, psEncC->predictLPCOrder, psEncC->arch );
+    oaci_silk_NLSF2A( PredCoef_Q12[ 1 ], pNLSF_Q15, psEncC->predictLPCOrder, psEncC->arch );
 
     if (doInterpolate) {
         /* Calculate the interpolated, quantized LSF vector for the first half */
-        silk_interpolate( pNLSF0_temp_Q15, prev_NLSFq_Q15, pNLSF_Q15,
+        oaci_silk_interpolate( pNLSF0_temp_Q15, prev_NLSFq_Q15, pNLSF_Q15,
             psEncC->indices.NLSFInterpCoef_Q2, psEncC->predictLPCOrder );
 
         /* Convert back to LPC coefficients */
-        silk_NLSF2A( PredCoef_Q12[ 0 ], pNLSF0_temp_Q15, psEncC->predictLPCOrder, psEncC->arch );
+        oaci_silk_NLSF2A( PredCoef_Q12[ 0 ], pNLSF0_temp_Q15, psEncC->predictLPCOrder, psEncC->arch );
 
     } else {
         /* Copy LPC coefficients for first half from second half */
diff --git a/silk/quant_LTP_gains.c b/silk/quant_LTP_gains.c
index d0fb73420..4c701df90 100644
--- a/silk/quant_LTP_gains.c
+++ b/silk/quant_LTP_gains.c
@@ -32,7 +32,7 @@
 #include "main.h"
 #include "tuning_parameters.h"
 
-void silk_quant_LTP_gains(
+void oaci_silk_quant_LTP_gains(
     oac_int16 B_Q14[ MAX_NB_SUBFR*LTP_ORDER ],                             /* O    Quantized LTP gains             */
     oac_int8 cbk_index[ MAX_NB_SUBFR ],                                    /* O    Codebook Index                  */
     oac_int8                   *periodicity_index,                         /* O    Periodicity Index               */
@@ -65,10 +65,10 @@ void silk_quant_LTP_gains(
            such as state rescaling/rewhitening. */
         oac_int32 gain_safety = SILK_FIX_CONST( 0.4, 7 );
 
-        cl_ptr_Q5  = silk_LTP_gain_BITS_Q5_ptrs[ k ];
-        cbk_ptr_Q7 = silk_LTP_vq_ptrs_Q7[        k ];
-        cbk_gain_ptr_Q7 = silk_LTP_vq_gain_ptrs_Q7[ k ];
-        cbk_size   = silk_LTP_vq_sizes[          k ];
+        cl_ptr_Q5  = oaci_silk_LTP_gain_BITS_Q5_ptrs[ k ];
+        cbk_ptr_Q7 = oaci_silk_LTP_vq_ptrs_Q7[        k ];
+        cbk_gain_ptr_Q7 = oaci_silk_LTP_vq_gain_ptrs_Q7[ k ];
+        cbk_size   = oaci_silk_LTP_vq_sizes[          k ];
 
         /* Set up pointers to first subframe */
         XX_Q17_ptr = XX_Q17;
@@ -78,9 +78,9 @@ void silk_quant_LTP_gains(
         rate_dist_Q7 = 0;
         sum_log_gain_tmp_Q7 = *sum_log_gain_Q7;
         for (j = 0; j < nb_subfr; j++) {
-            max_gain_Q7 = silk_log2lin((SILK_FIX_CONST( MAX_SUM_LOG_GAIN_DB/6.0, 7 ) - sum_log_gain_tmp_Q7)
+            max_gain_Q7 = oaci_silk_log2lin((SILK_FIX_CONST( MAX_SUM_LOG_GAIN_DB/6.0, 7 ) - sum_log_gain_tmp_Q7)
                 + SILK_FIX_CONST( 7, 7 )) - gain_safety;
-            silk_VQ_WMat_EC(
+            oaci_silk_VQ_WMat_EC(
                 &temp_idx[ j ],         /* O    index of best codebook vector                           */
                 &res_nrg_Q15_subfr,     /* O    residual energy                                         */
                 &rate_dist_Q7_subfr,    /* O    best weighted quantization error + mu * rate            */
@@ -99,7 +99,7 @@ void silk_quant_LTP_gains(
             res_nrg_Q15  = silk_ADD_POS_SAT32( res_nrg_Q15, res_nrg_Q15_subfr );
             rate_dist_Q7 = silk_ADD_POS_SAT32( rate_dist_Q7, rate_dist_Q7_subfr );
             sum_log_gain_tmp_Q7 = silk_max(0, sum_log_gain_tmp_Q7
-                + silk_lin2log( gain_safety + gain_Q7 ) - SILK_FIX_CONST( 7, 7 ));
+                + oaci_silk_lin2log( gain_safety + gain_Q7 ) - SILK_FIX_CONST( 7, 7 ));
 
             XX_Q17_ptr += LTP_ORDER*LTP_ORDER;
             xX_Q17_ptr += LTP_ORDER;
@@ -113,7 +113,7 @@ void silk_quant_LTP_gains(
         }
     }
 
-    cbk_ptr_Q7 = silk_LTP_vq_ptrs_Q7[ *periodicity_index ];
+    cbk_ptr_Q7 = oaci_silk_LTP_vq_ptrs_Q7[ *periodicity_index ];
     for (j = 0; j < nb_subfr; j++) {
         for (k = 0; k < LTP_ORDER; k++) {
             B_Q14[ j*LTP_ORDER + k ] = silk_LSHIFT( cbk_ptr_Q7[ cbk_index[ j ]*LTP_ORDER + k ], 7 );
@@ -127,5 +127,5 @@ void silk_quant_LTP_gains(
     }
 
     *sum_log_gain_Q7 = best_sum_log_gain_Q7;
-    *pred_gain_dB_Q7 = (oac_int)silk_SMULBB( -3, silk_lin2log( res_nrg_Q15 ) - (15<<7));
+    *pred_gain_dB_Q7 = (oac_int)silk_SMULBB( -3, oaci_silk_lin2log( res_nrg_Q15 ) - (15<<7));
 }
diff --git a/silk/resampler.c b/silk/resampler.c
index b7d86183e..28a1946d3 100644
--- a/silk/resampler.c
+++ b/silk/resampler.c
@@ -76,7 +76,7 @@ static const oac_int8 delay_matrix_dec[ 3 ][ 6 ] = {
 #define USE_silk_resampler_private_down_FIR         (3)
 
 /* Initialize/reset the resampler state for a given pair of input/output sampling rates */
-oac_int silk_resampler_init(
+oac_int oaci_silk_resampler_init(
     silk_resampler_state_struct *S,                 /* I/O  Resampler state                                             */
     oac_int32 Fs_Hz_in,                            /* I    Input sampling rate (Hz)                                    */
     oac_int32 Fs_Hz_out,                           /* I    Output sampling rate (Hz)                                   */
@@ -137,27 +137,27 @@ oac_int silk_resampler_init(
         if (silk_MUL( Fs_Hz_out, 4 ) == silk_MUL( Fs_Hz_in, 3 )) {              /* Fs_out : Fs_in = 3 : 4 */
             S->FIR_Fracs = 3;
             S->FIR_Order = RESAMPLER_DOWN_ORDER_FIR0;
-            S->Coefs = silk_Resampler_3_4_COEFS;
+            S->Coefs = oaci_silk_Resampler_3_4_COEFS;
         } else if (silk_MUL( Fs_Hz_out, 3 ) == silk_MUL( Fs_Hz_in, 2 )) {       /* Fs_out : Fs_in = 2 : 3 */
             S->FIR_Fracs = 2;
             S->FIR_Order = RESAMPLER_DOWN_ORDER_FIR0;
-            S->Coefs = silk_Resampler_2_3_COEFS;
+            S->Coefs = oaci_silk_Resampler_2_3_COEFS;
         } else if (silk_MUL( Fs_Hz_out, 2 ) == Fs_Hz_in) {                      /* Fs_out : Fs_in = 1 : 2 */
             S->FIR_Fracs = 1;
             S->FIR_Order = RESAMPLER_DOWN_ORDER_FIR1;
-            S->Coefs = silk_Resampler_1_2_COEFS;
+            S->Coefs = oaci_silk_Resampler_1_2_COEFS;
         } else if (silk_MUL( Fs_Hz_out, 3 ) == Fs_Hz_in) {                      /* Fs_out : Fs_in = 1 : 3 */
             S->FIR_Fracs = 1;
             S->FIR_Order = RESAMPLER_DOWN_ORDER_FIR2;
-            S->Coefs = silk_Resampler_1_3_COEFS;
+            S->Coefs = oaci_silk_Resampler_1_3_COEFS;
         } else if (silk_MUL( Fs_Hz_out, 4 ) == Fs_Hz_in) {                      /* Fs_out : Fs_in = 1 : 4 */
             S->FIR_Fracs = 1;
             S->FIR_Order = RESAMPLER_DOWN_ORDER_FIR2;
-            S->Coefs = silk_Resampler_1_4_COEFS;
+            S->Coefs = oaci_silk_Resampler_1_4_COEFS;
         } else if (silk_MUL( Fs_Hz_out, 6 ) == Fs_Hz_in) {                      /* Fs_out : Fs_in = 1 : 6 */
             S->FIR_Fracs = 1;
             S->FIR_Order = RESAMPLER_DOWN_ORDER_FIR2;
-            S->Coefs = silk_Resampler_1_6_COEFS;
+            S->Coefs = oaci_silk_Resampler_1_6_COEFS;
         } else {
             /* None available */
             celt_assert( 0 );
@@ -180,7 +180,7 @@ oac_int silk_resampler_init(
 
 /* Resampler: convert from one sampling rate to another */
 /* Input and output sampling rate are at most 48000 Hz  */
-oac_int silk_resampler(
+oac_int oaci_silk_resampler(
     silk_resampler_state_struct *S,                 /* I/O  Resampler state                                             */
     oac_int16 out[],                               /* O    Output signal                                               */
     const oac_int16 in[],                          /* I    Input signal                                                */
@@ -200,16 +200,16 @@ oac_int silk_resampler(
 
     switch (S->resampler_function) {
         case USE_silk_resampler_private_up2_HQ_wrapper:
-            silk_resampler_private_up2_HQ_wrapper( S, out, S->delayBuf, S->Fs_in_kHz );
-            silk_resampler_private_up2_HQ_wrapper( S, &out[ S->Fs_out_kHz ], &in[ nSamples ], inLen - S->Fs_in_kHz );
+            oaci_silk_resampler_private_up2_HQ_wrapper( S, out, S->delayBuf, S->Fs_in_kHz );
+            oaci_silk_resampler_private_up2_HQ_wrapper( S, &out[ S->Fs_out_kHz ], &in[ nSamples ], inLen - S->Fs_in_kHz );
             break;
         case USE_silk_resampler_private_IIR_FIR:
-            silk_resampler_private_IIR_FIR( S, out, S->delayBuf, S->Fs_in_kHz );
-            silk_resampler_private_IIR_FIR( S, &out[ S->Fs_out_kHz ], &in[ nSamples ], inLen - S->Fs_in_kHz );
+            oaci_silk_resampler_private_IIR_FIR( S, out, S->delayBuf, S->Fs_in_kHz );
+            oaci_silk_resampler_private_IIR_FIR( S, &out[ S->Fs_out_kHz ], &in[ nSamples ], inLen - S->Fs_in_kHz );
             break;
         case USE_silk_resampler_private_down_FIR:
-            silk_resampler_private_down_FIR( S, out, S->delayBuf, S->Fs_in_kHz );
-            silk_resampler_private_down_FIR( S, &out[ S->Fs_out_kHz ], &in[ nSamples ], inLen - S->Fs_in_kHz );
+            oaci_silk_resampler_private_down_FIR( S, out, S->delayBuf, S->Fs_in_kHz );
+            oaci_silk_resampler_private_down_FIR( S, &out[ S->Fs_out_kHz ], &in[ nSamples ], inLen - S->Fs_in_kHz );
             break;
         default:
             silk_memcpy( out, S->delayBuf, S->Fs_in_kHz*sizeof(oac_int16));
diff --git a/silk/resampler_down2.c b/silk/resampler_down2.c
index 41c22d3af..37f5571b4 100644
--- a/silk/resampler_down2.c
+++ b/silk/resampler_down2.c
@@ -33,7 +33,7 @@
 #include "resampler_rom.h"
 
 /* Downsample by a factor 2 */
-void silk_resampler_down2(
+void oaci_silk_resampler_down2(
     oac_int32                  *S,                 /* I/O  State vector [ 2 ]                                          */
     oac_int16                  *out,               /* O    Output signal [ floor(len/2) ]                              */
     const oac_int16            *in,                /* I    Input signal [ len ]                                        */
diff --git a/silk/resampler_down2_3.c b/silk/resampler_down2_3.c
index e9747c46b..5b6d20940 100644
--- a/silk/resampler_down2_3.c
+++ b/silk/resampler_down2_3.c
@@ -36,7 +36,7 @@
 #define ORDER_FIR                   4
 
 /* Downsample by a factor 2/3, low quality */
-void silk_resampler_down2_3(
+void oaci_silk_resampler_down2_3(
     oac_int32                  *S,                 /* I/O  State vector [ 6 ]                                          */
     oac_int16                  *out,               /* O    Output signal [ floor(2*inLen/3) ]                          */
     const oac_int16            *in,                /* I    Input signal [ inLen ]                                      */
@@ -57,26 +57,26 @@ void silk_resampler_down2_3(
         nSamplesIn = silk_min( inLen, RESAMPLER_MAX_BATCH_SIZE_IN );
 
         /* Second-order AR filter (output in Q8) */
-        silk_resampler_private_AR2( &S[ ORDER_FIR ], &buf[ ORDER_FIR ], in,
-            silk_Resampler_2_3_COEFS_LQ, nSamplesIn );
+        oaci_silk_resampler_private_AR2( &S[ ORDER_FIR ], &buf[ ORDER_FIR ], in,
+            oaci_silk_Resampler_2_3_COEFS_LQ, nSamplesIn );
 
         /* Interpolate filtered signal */
         buf_ptr = buf;
         counter = nSamplesIn;
         while (counter > 2) {
             /* Inner product */
-            res_Q6 = silk_SMULWB(         buf_ptr[ 0 ], silk_Resampler_2_3_COEFS_LQ[ 2 ] );
-            res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 1 ], silk_Resampler_2_3_COEFS_LQ[ 3 ] );
-            res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 2 ], silk_Resampler_2_3_COEFS_LQ[ 5 ] );
-            res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 3 ], silk_Resampler_2_3_COEFS_LQ[ 4 ] );
+            res_Q6 = silk_SMULWB(         buf_ptr[ 0 ], oaci_silk_Resampler_2_3_COEFS_LQ[ 2 ] );
+            res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 1 ], oaci_silk_Resampler_2_3_COEFS_LQ[ 3 ] );
+            res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 2 ], oaci_silk_Resampler_2_3_COEFS_LQ[ 5 ] );
+            res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 3 ], oaci_silk_Resampler_2_3_COEFS_LQ[ 4 ] );
 
             /* Scale down, saturate and store in output array */
             *out++ = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q6, 6 ));
 
-            res_Q6 = silk_SMULWB(         buf_ptr[ 1 ], silk_Resampler_2_3_COEFS_LQ[ 4 ] );
-            res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 2 ], silk_Resampler_2_3_COEFS_LQ[ 5 ] );
-            res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 3 ], silk_Resampler_2_3_COEFS_LQ[ 3 ] );
-            res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 4 ], silk_Resampler_2_3_COEFS_LQ[ 2 ] );
+            res_Q6 = silk_SMULWB(         buf_ptr[ 1 ], oaci_silk_Resampler_2_3_COEFS_LQ[ 4 ] );
+            res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 2 ], oaci_silk_Resampler_2_3_COEFS_LQ[ 5 ] );
+            res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 3 ], oaci_silk_Resampler_2_3_COEFS_LQ[ 3 ] );
+            res_Q6 = silk_SMLAWB( res_Q6, buf_ptr[ 4 ], oaci_silk_Resampler_2_3_COEFS_LQ[ 2 ] );
 
             /* Scale down, saturate and store in output array */
             *out++ = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q6, 6 ));
diff --git a/silk/resampler_private.h b/silk/resampler_private.h
index ce00ba907..b7fbf52c9 100644
--- a/silk/resampler_private.h
+++ b/silk/resampler_private.h
@@ -38,7 +38,7 @@
 #define RESAMPLER_MAX_BATCH_SIZE_IN             (RESAMPLER_MAX_BATCH_SIZE_MS*RESAMPLER_MAX_FS_KHZ)
 
 /* Description: Hybrid IIR/FIR polyphase implementation of resampling */
-void silk_resampler_private_IIR_FIR(
+void oaci_silk_resampler_private_IIR_FIR(
     void                            *SS,            /* I/O  Resampler state             */
     oac_int16 out[],                               /* O    Output signal               */
     const oac_int16 in[],                          /* I    Input signal                */
@@ -46,7 +46,7 @@ void silk_resampler_private_IIR_FIR(
     );
 
 /* Description: Hybrid IIR/FIR polyphase implementation of resampling */
-void silk_resampler_private_down_FIR(
+void oaci_silk_resampler_private_down_FIR(
     void                            *SS,            /* I/O  Resampler state             */
     oac_int16 out[],                               /* O    Output signal               */
     const oac_int16 in[],                          /* I    Input signal                */
@@ -54,7 +54,7 @@ void silk_resampler_private_down_FIR(
     );
 
 /* Upsample by a factor 2, high quality */
-void silk_resampler_private_up2_HQ_wrapper(
+void oaci_silk_resampler_private_up2_HQ_wrapper(
     void                            *SS,            /* I/O  Resampler state (unused)    */
     oac_int16                      *out,           /* O    Output signal [ 2 * len ]   */
     const oac_int16                *in,            /* I    Input signal [ len ]        */
@@ -62,7 +62,7 @@ void silk_resampler_private_up2_HQ_wrapper(
     );
 
 /* Upsample by a factor 2, high quality */
-void silk_resampler_private_up2_HQ(
+void oaci_silk_resampler_private_up2_HQ(
     oac_int32                      *S,             /* I/O  Resampler state [ 6 ]       */
     oac_int16                      *out,           /* O    Output signal [ 2 * len ]   */
     const oac_int16                *in,            /* I    Input signal [ len ]        */
@@ -70,7 +70,7 @@ void silk_resampler_private_up2_HQ(
     );
 
 /* Second order AR filter */
-void silk_resampler_private_AR2(
+void oaci_silk_resampler_private_AR2(
     oac_int32 S[],                                 /* I/O  State vector [ 2 ]          */
     oac_int32 out_Q8[],                            /* O    Output signal               */
     const oac_int16 in[],                          /* I    Input signal                */
diff --git a/silk/resampler_private_AR2.c b/silk/resampler_private_AR2.c
index 4afdfadaf..cf50c2a79 100644
--- a/silk/resampler_private_AR2.c
+++ b/silk/resampler_private_AR2.c
@@ -33,7 +33,7 @@
 #include "resampler_private.h"
 
 /* Second order AR filter with single delay elements */
-void silk_resampler_private_AR2(
+void oaci_silk_resampler_private_AR2(
     oac_int32 S[],                                 /* I/O  State vector [ 2 ]          */
     oac_int32 out_Q8[],                            /* O    Output signal               */
     const oac_int16 in[],                          /* I    Input signal                */
diff --git a/silk/resampler_private_IIR_FIR.c b/silk/resampler_private_IIR_FIR.c
index 9eb1a1c43..cfdfe7c14 100644
--- a/silk/resampler_private_IIR_FIR.c
+++ b/silk/resampler_private_IIR_FIR.c
@@ -47,20 +47,20 @@ static OAC_INLINE oac_int16 *silk_resampler_private_IIR_FIR_INTERPOL(
         table_index = silk_SMULWB( index_Q16&0xFFFF, 12 );
         buf_ptr = &buf[ index_Q16>>16 ];
 
-        res_Q15 = silk_SMULBB(          buf_ptr[ 0 ], silk_resampler_frac_FIR_12[      table_index ][ 0 ] );
-        res_Q15 = silk_SMLABB( res_Q15, buf_ptr[ 1 ], silk_resampler_frac_FIR_12[      table_index ][ 1 ] );
-        res_Q15 = silk_SMLABB( res_Q15, buf_ptr[ 2 ], silk_resampler_frac_FIR_12[      table_index ][ 2 ] );
-        res_Q15 = silk_SMLABB( res_Q15, buf_ptr[ 3 ], silk_resampler_frac_FIR_12[      table_index ][ 3 ] );
-        res_Q15 = silk_SMLABB( res_Q15, buf_ptr[ 4 ], silk_resampler_frac_FIR_12[ 11 - table_index ][ 3 ] );
-        res_Q15 = silk_SMLABB( res_Q15, buf_ptr[ 5 ], silk_resampler_frac_FIR_12[ 11 - table_index ][ 2 ] );
-        res_Q15 = silk_SMLABB( res_Q15, buf_ptr[ 6 ], silk_resampler_frac_FIR_12[ 11 - table_index ][ 1 ] );
-        res_Q15 = silk_SMLABB( res_Q15, buf_ptr[ 7 ], silk_resampler_frac_FIR_12[ 11 - table_index ][ 0 ] );
+        res_Q15 = silk_SMULBB(          buf_ptr[ 0 ], oaci_silk_resampler_frac_FIR_12[      table_index ][ 0 ] );
+        res_Q15 = silk_SMLABB( res_Q15, buf_ptr[ 1 ], oaci_silk_resampler_frac_FIR_12[      table_index ][ 1 ] );
+        res_Q15 = silk_SMLABB( res_Q15, buf_ptr[ 2 ], oaci_silk_resampler_frac_FIR_12[      table_index ][ 2 ] );
+        res_Q15 = silk_SMLABB( res_Q15, buf_ptr[ 3 ], oaci_silk_resampler_frac_FIR_12[      table_index ][ 3 ] );
+        res_Q15 = silk_SMLABB( res_Q15, buf_ptr[ 4 ], oaci_silk_resampler_frac_FIR_12[ 11 - table_index ][ 3 ] );
+        res_Q15 = silk_SMLABB( res_Q15, buf_ptr[ 5 ], oaci_silk_resampler_frac_FIR_12[ 11 - table_index ][ 2 ] );
+        res_Q15 = silk_SMLABB( res_Q15, buf_ptr[ 6 ], oaci_silk_resampler_frac_FIR_12[ 11 - table_index ][ 1 ] );
+        res_Q15 = silk_SMLABB( res_Q15, buf_ptr[ 7 ], oaci_silk_resampler_frac_FIR_12[ 11 - table_index ][ 0 ] );
         *out++ = (oac_int16)silk_SAT16( silk_RSHIFT_ROUND( res_Q15, 15 ));
     }
     return out;
 }
 /* Upsample using a combination of allpass-based 2x upsampling and FIR interpolation */
-void silk_resampler_private_IIR_FIR(
+void oaci_silk_resampler_private_IIR_FIR(
     void                            *SS,            /* I/O  Resampler state             */
     oac_int16 out[],                               /* O    Output signal               */
     const oac_int16 in[],                          /* I    Input signal                */
@@ -83,7 +83,7 @@ void silk_resampler_private_IIR_FIR(
         nSamplesIn = silk_min( inLen, S->batchSize );
 
         /* Upsample 2x */
-        silk_resampler_private_up2_HQ( S->sIIR, &buf[ RESAMPLER_ORDER_FIR_12 ], in, nSamplesIn );
+        oaci_silk_resampler_private_up2_HQ( S->sIIR, &buf[ RESAMPLER_ORDER_FIR_12 ], in, nSamplesIn );
 
         max_index_Q16 = silk_LSHIFT32( nSamplesIn, 16 + 1 );         /* + 1 because 2x upsampling */
         out = silk_resampler_private_IIR_FIR_INTERPOL( out, buf, max_index_Q16, index_increment_Q16 );
diff --git a/silk/resampler_private_down_FIR.c b/silk/resampler_private_down_FIR.c
index 512e090d3..7c2fb88d7 100644
--- a/silk/resampler_private_down_FIR.c
+++ b/silk/resampler_private_down_FIR.c
@@ -140,7 +140,7 @@ static OAC_INLINE oac_int16 *silk_resampler_private_down_FIR_INTERPOL(
 }
 
 /* Resample with a 2nd order AR filter followed by FIR interpolation */
-void silk_resampler_private_down_FIR(
+void oaci_silk_resampler_private_down_FIR(
     void                            *SS,            /* I/O  Resampler state             */
     oac_int16 out[],                               /* O    Output signal               */
     const oac_int16 in[],                          /* I    Input signal                */
@@ -166,7 +166,7 @@ void silk_resampler_private_down_FIR(
         nSamplesIn = silk_min( inLen, S->batchSize );
 
         /* Second-order AR filter (output in Q8) */
-        silk_resampler_private_AR2( S->sIIR, &buf[ S->FIR_Order ], in, S->Coefs, nSamplesIn );
+        oaci_silk_resampler_private_AR2( S->sIIR, &buf[ S->FIR_Order ], in, S->Coefs, nSamplesIn );
 
         max_index_Q16 = silk_LSHIFT32( nSamplesIn, 16 );
 
diff --git a/silk/resampler_private_up2_HQ.c b/silk/resampler_private_up2_HQ.c
index 29ce980e7..298384772 100644
--- a/silk/resampler_private_up2_HQ.c
+++ b/silk/resampler_private_up2_HQ.c
@@ -35,7 +35,7 @@
 /* Upsample by a factor 2, high quality */
 /* Uses 2nd order allpass filters for the 2x upsampling, followed by a      */
 /* notch filter just above Nyquist.                                         */
-void silk_resampler_private_up2_HQ(
+void oaci_silk_resampler_private_up2_HQ(
     oac_int32                      *S,             /* I/O  Resampler state [ 6 ]       */
     oac_int16                      *out,           /* O    Output signal [ 2 * len ]   */
     const oac_int16                *in,            /* I    Input signal [ len ]        */
@@ -100,12 +100,12 @@ void silk_resampler_private_up2_HQ(
     }
 }
 
-void silk_resampler_private_up2_HQ_wrapper(
+void oaci_silk_resampler_private_up2_HQ_wrapper(
     void                            *SS,            /* I/O  Resampler state (unused)    */
     oac_int16                      *out,           /* O    Output signal [ 2 * len ]   */
     const oac_int16                *in,            /* I    Input signal [ len ]        */
     oac_int32 len                                  /* I    Number of input samples     */
     ) {
     silk_resampler_state_struct *S = (silk_resampler_state_struct *)SS;
-    silk_resampler_private_up2_HQ( S->sIIR, out, in, len );
+    oaci_silk_resampler_private_up2_HQ( S->sIIR, out, in, len );
 }
diff --git a/silk/resampler_rom.c b/silk/resampler_rom.c
index e6f87ce3e..e262ab467 100644
--- a/silk/resampler_rom.c
+++ b/silk/resampler_rom.c
@@ -40,50 +40,50 @@
 /* const oac_int16 silk_resampler_up2_hq_notch[ 4 ] = { 9634,  -7012,   7209,  30474 }; */
 
 /* Tables with IIR and FIR coefficients for fractional downsamplers (123 Words) */
-silk_DWORD_ALIGN const oac_int16 silk_Resampler_3_4_COEFS[ 2 + 3*RESAMPLER_DOWN_ORDER_FIR0/2 ] = {
+silk_DWORD_ALIGN const oac_int16 oaci_silk_Resampler_3_4_COEFS[ 2 + 3*RESAMPLER_DOWN_ORDER_FIR0/2 ] = {
     -20694, -13867,
     -49,     64,     17,   -157,    353,   -496,    163,  11047,  22205,
     -39,      6,     91,   -170,    186,     23,   -896,   6336,  19928,
     -19,    -36,    102,    -89,    -24,    328,   -951,   2568,  15909,
 };
 
-silk_DWORD_ALIGN const oac_int16 silk_Resampler_2_3_COEFS[ 2 + 2*RESAMPLER_DOWN_ORDER_FIR0/2 ] = {
+silk_DWORD_ALIGN const oac_int16 oaci_silk_Resampler_2_3_COEFS[ 2 + 2*RESAMPLER_DOWN_ORDER_FIR0/2 ] = {
     -14457, -14019,
     64,    128,   -122,     36,    310,   -768,    584,   9267,  17733,
     12,    128,     18,   -142,    288,   -117,   -865,   4123,  14459,
 };
 
-silk_DWORD_ALIGN const oac_int16 silk_Resampler_1_2_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR1/2 ] = {
+silk_DWORD_ALIGN const oac_int16 oaci_silk_Resampler_1_2_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR1/2 ] = {
     616, -14323,
     -10,     39,     58,    -46,    -84,    120,    184,   -315,   -541,   1284,   5380,   9024,
 };
 
-silk_DWORD_ALIGN const oac_int16 silk_Resampler_1_3_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR2/2 ] = {
+silk_DWORD_ALIGN const oac_int16 oaci_silk_Resampler_1_3_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR2/2 ] = {
     16102, -15162,
     -13,      0,     20,     26,      5,    -31,    -43,     -4,     65,     90,      7,   -157,   -248,    -44,    593,
     1583,   2612,   3271,
 };
 
-silk_DWORD_ALIGN const oac_int16 silk_Resampler_1_4_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR2/2 ] = {
+silk_DWORD_ALIGN const oac_int16 oaci_silk_Resampler_1_4_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR2/2 ] = {
     22500, -15099,
     3,    -14,    -20,    -15,      2,     25,     37,     25,    -16,    -71,   -107,    -79,     50,    292,    623,
     982,   1288,   1464,
 };
 
-silk_DWORD_ALIGN const oac_int16 silk_Resampler_1_6_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR2/2 ] = {
+silk_DWORD_ALIGN const oac_int16 oaci_silk_Resampler_1_6_COEFS[ 2 + RESAMPLER_DOWN_ORDER_FIR2/2 ] = {
     27540, -15257,
     17,     12,      8,      1,    -10,    -22,    -30,    -32,    -22,      3,     44,    100,    168,    243,    317,
     381,    429,    455,
 };
 
-silk_DWORD_ALIGN const oac_int16 silk_Resampler_2_3_COEFS_LQ[ 2 + 2*2 ] = {
+silk_DWORD_ALIGN const oac_int16 oaci_silk_Resampler_2_3_COEFS_LQ[ 2 + 2*2 ] = {
     -2797,  -6507,
     4697,  10739,
     1567,   8276,
 };
 
 /* Table with interplation fractions of 1/24, 3/24, 5/24, ... , 23/24 : 23/24 (46 Words) */
-silk_DWORD_ALIGN const oac_int16 silk_resampler_frac_FIR_12[ 12 ][ RESAMPLER_ORDER_FIR_12/2 ] = {
+silk_DWORD_ALIGN const oac_int16 oaci_silk_resampler_frac_FIR_12[ 12 ][ RESAMPLER_ORDER_FIR_12/2 ] = {
     {  189,  -600,   617, 30567 },
     {  117,  -159, -1070, 29704 },
     {   52,   221, -2392, 28276 },
diff --git a/silk/resampler_rom.h b/silk/resampler_rom.h
index a41aec60d..fecb74719 100644
--- a/silk/resampler_rom.h
+++ b/silk/resampler_rom.h
@@ -46,15 +46,15 @@ static const oac_int16 silk_resampler_up2_hq_0[ 3 ] = { 1746, 14986, 39083 - 655
 static const oac_int16 silk_resampler_up2_hq_1[ 3 ] = { 6854, 25769, 55542 - 65536 };
 
 /* Tables with IIR and FIR coefficients for fractional downsamplers */
-extern const oac_int16 silk_Resampler_3_4_COEFS[ 2 + 3*RESAMPLER_DOWN_ORDER_FIR0/2 ];
-extern const oac_int16 silk_Resampler_2_3_COEFS[ 2 + 2*RESAMPLER_DOWN_ORDER_FIR0/2 ];
-extern const oac_int16 silk_Resampler_1_2_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR1/2 ];
-extern const oac_int16 silk_Resampler_1_3_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR2/2 ];
-extern const oac_int16 silk_Resampler_1_4_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR2/2 ];
-extern const oac_int16 silk_Resampler_1_6_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR2/2 ];
-extern const oac_int16 silk_Resampler_2_3_COEFS_LQ[ 2 + 2*2 ];
+extern const oac_int16 oaci_silk_Resampler_3_4_COEFS[ 2 + 3*RESAMPLER_DOWN_ORDER_FIR0/2 ];
+extern const oac_int16 oaci_silk_Resampler_2_3_COEFS[ 2 + 2*RESAMPLER_DOWN_ORDER_FIR0/2 ];
+extern const oac_int16 oaci_silk_Resampler_1_2_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR1/2 ];
+extern const oac_int16 oaci_silk_Resampler_1_3_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR2/2 ];
+extern const oac_int16 oaci_silk_Resampler_1_4_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR2/2 ];
+extern const oac_int16 oaci_silk_Resampler_1_6_COEFS[ 2 +     RESAMPLER_DOWN_ORDER_FIR2/2 ];
+extern const oac_int16 oaci_silk_Resampler_2_3_COEFS_LQ[ 2 + 2*2 ];
 
 /* Table with interplation fractions of 1/24, 3/24, ..., 23/24 */
-extern const oac_int16 silk_resampler_frac_FIR_12[ 12 ][ RESAMPLER_ORDER_FIR_12/2 ];
+extern const oac_int16 oaci_silk_resampler_frac_FIR_12[ 12 ][ RESAMPLER_ORDER_FIR_12/2 ];
 
 #endif /* SILK_FIX_RESAMPLER_ROM_H */
diff --git a/silk/shell_coder.c b/silk/shell_coder.c
index a872e2f10..6ed81c827 100644
--- a/silk/shell_coder.c
+++ b/silk/shell_coder.c
@@ -51,7 +51,7 @@ static OAC_INLINE void encode_split(
     const oac_uint8            *shell_table    /* I    table of shell cdfs                         */
     ) {
     if (p > 0) {
-        ec_enc_icdf( psRangeEnc, p_child1, &shell_table[ silk_shell_code_table_offsets[ p ] ], 8 );
+        oaci_ec_enc_icdf( psRangeEnc, p_child1, &shell_table[ oaci_silk_shell_code_table_offsets[ p ] ], 8 );
     }
 }
 
@@ -63,7 +63,7 @@ static OAC_INLINE void decode_split(
     const oac_uint8            *shell_table    /* I    table of shell cdfs                         */
     ) {
     if (p > 0) {
-        p_child1[ 0 ] = ec_dec_icdf( psRangeDec, &shell_table[ silk_shell_code_table_offsets[ p ] ], 8 );
+        p_child1[ 0 ] = oaci_ec_dec_icdf( psRangeDec, &shell_table[ oaci_silk_shell_code_table_offsets[ p ] ], 8 );
         p_child2[ 0 ] = p - p_child1[ 0 ];
     } else {
         p_child1[ 0 ] = 0;
@@ -72,7 +72,7 @@ static OAC_INLINE void decode_split(
 }
 
 /* Shell encoder, operates on one shell code frame of 16 pulses */
-void silk_shell_encoder(
+void oaci_silk_shell_encoder(
     ec_enc                      *psRangeEnc,                    /* I/O  compressor data structure                   */
     const oac_int              *pulses0                        /* I    data: nonnegative pulse amplitudes          */
     ) {
@@ -87,32 +87,32 @@ void silk_shell_encoder(
     combine_pulses( pulses3, pulses2, 2 );
     combine_pulses( pulses4, pulses3, 1 );
 
-    encode_split( psRangeEnc, pulses3[  0 ], pulses4[ 0 ], silk_shell_code_table3 );
+    encode_split( psRangeEnc, pulses3[  0 ], pulses4[ 0 ], oaci_silk_shell_code_table3 );
 
-    encode_split( psRangeEnc, pulses2[  0 ], pulses3[ 0 ], silk_shell_code_table2 );
+    encode_split( psRangeEnc, pulses2[  0 ], pulses3[ 0 ], oaci_silk_shell_code_table2 );
 
-    encode_split( psRangeEnc, pulses1[  0 ], pulses2[ 0 ], silk_shell_code_table1 );
-    encode_split( psRangeEnc, pulses0[  0 ], pulses1[ 0 ], silk_shell_code_table0 );
-    encode_split( psRangeEnc, pulses0[  2 ], pulses1[ 1 ], silk_shell_code_table0 );
+    encode_split( psRangeEnc, pulses1[  0 ], pulses2[ 0 ], oaci_silk_shell_code_table1 );
+    encode_split( psRangeEnc, pulses0[  0 ], pulses1[ 0 ], oaci_silk_shell_code_table0 );
+    encode_split( psRangeEnc, pulses0[  2 ], pulses1[ 1 ], oaci_silk_shell_code_table0 );
 
-    encode_split( psRangeEnc, pulses1[  2 ], pulses2[ 1 ], silk_shell_code_table1 );
-    encode_split( psRangeEnc, pulses0[  4 ], pulses1[ 2 ], silk_shell_code_table0 );
-    encode_split( psRangeEnc, pulses0[  6 ], pulses1[ 3 ], silk_shell_code_table0 );
+    encode_split( psRangeEnc, pulses1[  2 ], pulses2[ 1 ], oaci_silk_shell_code_table1 );
+    encode_split( psRangeEnc, pulses0[  4 ], pulses1[ 2 ], oaci_silk_shell_code_table0 );
+    encode_split( psRangeEnc, pulses0[  6 ], pulses1[ 3 ], oaci_silk_shell_code_table0 );
 
-    encode_split( psRangeEnc, pulses2[  2 ], pulses3[ 1 ], silk_shell_code_table2 );
+    encode_split( psRangeEnc, pulses2[  2 ], pulses3[ 1 ], oaci_silk_shell_code_table2 );
 
-    encode_split( psRangeEnc, pulses1[  4 ], pulses2[ 2 ], silk_shell_code_table1 );
-    encode_split( psRangeEnc, pulses0[  8 ], pulses1[ 4 ], silk_shell_code_table0 );
-    encode_split( psRangeEnc, pulses0[ 10 ], pulses1[ 5 ], silk_shell_code_table0 );
+    encode_split( psRangeEnc, pulses1[  4 ], pulses2[ 2 ], oaci_silk_shell_code_table1 );
+    encode_split( psRangeEnc, pulses0[  8 ], pulses1[ 4 ], oaci_silk_shell_code_table0 );
+    encode_split( psRangeEnc, pulses0[ 10 ], pulses1[ 5 ], oaci_silk_shell_code_table0 );
 
-    encode_split( psRangeEnc, pulses1[  6 ], pulses2[ 3 ], silk_shell_code_table1 );
-    encode_split( psRangeEnc, pulses0[ 12 ], pulses1[ 6 ], silk_shell_code_table0 );
-    encode_split( psRangeEnc, pulses0[ 14 ], pulses1[ 7 ], silk_shell_code_table0 );
+    encode_split( psRangeEnc, pulses1[  6 ], pulses2[ 3 ], oaci_silk_shell_code_table1 );
+    encode_split( psRangeEnc, pulses0[ 12 ], pulses1[ 6 ], oaci_silk_shell_code_table0 );
+    encode_split( psRangeEnc, pulses0[ 14 ], pulses1[ 7 ], oaci_silk_shell_code_table0 );
 }
 
 
 /* Shell decoder, operates on one shell code frame of 16 pulses */
-void silk_shell_decoder(
+void oaci_silk_shell_decoder(
     oac_int16                  *pulses0,                       /* O    data: nonnegative pulse amplitudes          */
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
     const oac_int pulses4                                      /* I    number of pulses per pulse-subframe         */
@@ -122,25 +122,25 @@ void silk_shell_decoder(
     /* this function operates on one shell code frame of 16 pulses */
     silk_assert( SHELL_CODEC_FRAME_LENGTH == 16 );
 
-    decode_split( &pulses3[  0 ], &pulses3[  1 ], psRangeDec, pulses4,      silk_shell_code_table3 );
+    decode_split( &pulses3[  0 ], &pulses3[  1 ], psRangeDec, pulses4,      oaci_silk_shell_code_table3 );
 
-    decode_split( &pulses2[  0 ], &pulses2[  1 ], psRangeDec, pulses3[ 0 ], silk_shell_code_table2 );
+    decode_split( &pulses2[  0 ], &pulses2[  1 ], psRangeDec, pulses3[ 0 ], oaci_silk_shell_code_table2 );
 
-    decode_split( &pulses1[  0 ], &pulses1[  1 ], psRangeDec, pulses2[ 0 ], silk_shell_code_table1 );
-    decode_split( &pulses0[  0 ], &pulses0[  1 ], psRangeDec, pulses1[ 0 ], silk_shell_code_table0 );
-    decode_split( &pulses0[  2 ], &pulses0[  3 ], psRangeDec, pulses1[ 1 ], silk_shell_code_table0 );
+    decode_split( &pulses1[  0 ], &pulses1[  1 ], psRangeDec, pulses2[ 0 ], oaci_silk_shell_code_table1 );
+    decode_split( &pulses0[  0 ], &pulses0[  1 ], psRangeDec, pulses1[ 0 ], oaci_silk_shell_code_table0 );
+    decode_split( &pulses0[  2 ], &pulses0[  3 ], psRangeDec, pulses1[ 1 ], oaci_silk_shell_code_table0 );
 
-    decode_split( &pulses1[  2 ], &pulses1[  3 ], psRangeDec, pulses2[ 1 ], silk_shell_code_table1 );
-    decode_split( &pulses0[  4 ], &pulses0[  5 ], psRangeDec, pulses1[ 2 ], silk_shell_code_table0 );
-    decode_split( &pulses0[  6 ], &pulses0[  7 ], psRangeDec, pulses1[ 3 ], silk_shell_code_table0 );
+    decode_split( &pulses1[  2 ], &pulses1[  3 ], psRangeDec, pulses2[ 1 ], oaci_silk_shell_code_table1 );
+    decode_split( &pulses0[  4 ], &pulses0[  5 ], psRangeDec, pulses1[ 2 ], oaci_silk_shell_code_table0 );
+    decode_split( &pulses0[  6 ], &pulses0[  7 ], psRangeDec, pulses1[ 3 ], oaci_silk_shell_code_table0 );
 
-    decode_split( &pulses2[  2 ], &pulses2[  3 ], psRangeDec, pulses3[ 1 ], silk_shell_code_table2 );
+    decode_split( &pulses2[  2 ], &pulses2[  3 ], psRangeDec, pulses3[ 1 ], oaci_silk_shell_code_table2 );
 
-    decode_split( &pulses1[  4 ], &pulses1[  5 ], psRangeDec, pulses2[ 2 ], silk_shell_code_table1 );
-    decode_split( &pulses0[  8 ], &pulses0[  9 ], psRangeDec, pulses1[ 4 ], silk_shell_code_table0 );
-    decode_split( &pulses0[ 10 ], &pulses0[ 11 ], psRangeDec, pulses1[ 5 ], silk_shell_code_table0 );
+    decode_split( &pulses1[  4 ], &pulses1[  5 ], psRangeDec, pulses2[ 2 ], oaci_silk_shell_code_table1 );
+    decode_split( &pulses0[  8 ], &pulses0[  9 ], psRangeDec, pulses1[ 4 ], oaci_silk_shell_code_table0 );
+    decode_split( &pulses0[ 10 ], &pulses0[ 11 ], psRangeDec, pulses1[ 5 ], oaci_silk_shell_code_table0 );
 
-    decode_split( &pulses1[  6 ], &pulses1[  7 ], psRangeDec, pulses2[ 3 ], silk_shell_code_table1 );
-    decode_split( &pulses0[ 12 ], &pulses0[ 13 ], psRangeDec, pulses1[ 6 ], silk_shell_code_table0 );
-    decode_split( &pulses0[ 14 ], &pulses0[ 15 ], psRangeDec, pulses1[ 7 ], silk_shell_code_table0 );
+    decode_split( &pulses1[  6 ], &pulses1[  7 ], psRangeDec, pulses2[ 3 ], oaci_silk_shell_code_table1 );
+    decode_split( &pulses0[ 12 ], &pulses0[ 13 ], psRangeDec, pulses1[ 6 ], oaci_silk_shell_code_table0 );
+    decode_split( &pulses0[ 14 ], &pulses0[ 15 ], psRangeDec, pulses1[ 7 ], oaci_silk_shell_code_table0 );
 }
diff --git a/silk/sigm_Q15.c b/silk/sigm_Q15.c
index 40673e845..8cac7ef73 100644
--- a/silk/sigm_Q15.c
+++ b/silk/sigm_Q15.c
@@ -46,7 +46,7 @@ static const oac_int32 sigm_LUT_neg_Q15[ 6 ] = {
     16384, 8812, 3906, 1554, 589, 219
 };
 
-oac_int silk_sigm_Q15(
+oac_int oaci_silk_sigm_Q15(
     oac_int in_Q5                                  /* I                                                                */
     ) {
     oac_int ind;
diff --git a/silk/sort.c b/silk/sort.c
index 63271e6c3..24f86e214 100644
--- a/silk/sort.c
+++ b/silk/sort.c
@@ -37,7 +37,7 @@
 
 #include "SigProc_FIX.h"
 
-void silk_insertion_sort_increasing(
+void oaci_silk_insertion_sort_increasing(
     oac_int32           *a,             /* I/O   Unsorted / Sorted vector               */
     oac_int             *idx,           /* O     Index vector for the sorted elements   */
     const oac_int L,                    /* I     Vector length                          */
@@ -84,7 +84,7 @@ void silk_insertion_sort_increasing(
 
 #ifdef FIXED_POINT
 /* This function is only used by the fixed-point build */
-void silk_insertion_sort_decreasing_int16(
+void oaci_silk_insertion_sort_decreasing_int16(
     oac_int16                  *a,                 /* I/O   Unsorted / Sorted vector                                   */
     oac_int                    *idx,               /* O     Index vector for the sorted elements                       */
     const oac_int L,                               /* I     Vector length                                              */
@@ -130,7 +130,7 @@ void silk_insertion_sort_decreasing_int16(
 }
 #endif
 
-void silk_insertion_sort_increasing_all_values_int16(
+void oaci_silk_insertion_sort_increasing_all_values_int16(
     oac_int16                 *a,                  /* I/O   Unsorted / Sorted vector                                   */
     const oac_int L                                /* I     Vector length                                              */
     ) {
diff --git a/silk/stereo_LR_to_MS.c b/silk/stereo_LR_to_MS.c
index 4f5cce660..cfed32f5f 100644
--- a/silk/stereo_LR_to_MS.c
+++ b/silk/stereo_LR_to_MS.c
@@ -33,7 +33,7 @@
 #include "stack_alloc.h"
 
 /* Convert Left/Right stereo signal to adaptive Mid/Side representation */
-void silk_stereo_LR_to_MS(
+void oaci_silk_stereo_LR_to_MS(
     stereo_enc_state            *state,                         /* I/O  State                                       */
     oac_int16 x1[],                                            /* I/O  Left input signal, becomes mid signal       */
     oac_int16 x2[],                                            /* I/O  Right input signal, becomes side signal     */
@@ -97,9 +97,9 @@ void silk_stereo_LR_to_MS(
                       SILK_FIX_CONST( STEREO_RATIO_SMOOTH_COEF,     16 );
     smooth_coef_Q16 = silk_SMULWB( silk_SMULBB( prev_speech_act_Q8, prev_speech_act_Q8 ), smooth_coef_Q16 );
 
-    pred_Q13[ 0 ] = silk_stereo_find_predictor( &LP_ratio_Q14, LP_mid, LP_side, &state->mid_side_amp_Q0[ 0 ],
+    pred_Q13[ 0 ] = oaci_silk_stereo_find_predictor( &LP_ratio_Q14, LP_mid, LP_side, &state->mid_side_amp_Q0[ 0 ],
     frame_length, smooth_coef_Q16 );
-    pred_Q13[ 1 ] = silk_stereo_find_predictor( &HP_ratio_Q14, HP_mid, HP_side, &state->mid_side_amp_Q0[ 2 ],
+    pred_Q13[ 1 ] = oaci_silk_stereo_find_predictor( &HP_ratio_Q14, HP_mid, HP_side, &state->mid_side_amp_Q0[ 2 ],
     frame_length, smooth_coef_Q16 );
     /* Ratio of the norms of residual and mid signals */
     frac_Q16 = silk_SMLABB( HP_ratio_Q14, LP_ratio_Q14, 3 );
@@ -139,7 +139,7 @@ void silk_stereo_LR_to_MS(
         width_Q14 = 0;
         pred_Q13[ 0 ] = 0;
         pred_Q13[ 1 ] = 0;
-        silk_stereo_quant_pred( pred_Q13, ix );
+        oaci_silk_stereo_quant_pred( pred_Q13, ix );
     } else if (state->width_prev_Q14 == 0
                && (8*total_rate_bps < 13*min_mid_rate_bps || silk_SMULWB( frac_Q16,
     state->smth_width_Q14 ) < SILK_FIX_CONST( 0.05, 14 ))) {
@@ -147,7 +147,7 @@ void silk_stereo_LR_to_MS(
         /* Scale down and quantize predictors */
         pred_Q13[ 0 ] = silk_RSHIFT( silk_SMULBB( state->smth_width_Q14, pred_Q13[ 0 ] ), 14 );
         pred_Q13[ 1 ] = silk_RSHIFT( silk_SMULBB( state->smth_width_Q14, pred_Q13[ 1 ] ), 14 );
-        silk_stereo_quant_pred( pred_Q13, ix );
+        oaci_silk_stereo_quant_pred( pred_Q13, ix );
         /* Collapse stereo width */
         width_Q14 = 0;
         pred_Q13[ 0 ] = 0;
@@ -162,20 +162,20 @@ void silk_stereo_LR_to_MS(
         /* Scale down and quantize predictors */
         pred_Q13[ 0 ] = silk_RSHIFT( silk_SMULBB( state->smth_width_Q14, pred_Q13[ 0 ] ), 14 );
         pred_Q13[ 1 ] = silk_RSHIFT( silk_SMULBB( state->smth_width_Q14, pred_Q13[ 1 ] ), 14 );
-        silk_stereo_quant_pred( pred_Q13, ix );
+        oaci_silk_stereo_quant_pred( pred_Q13, ix );
         /* Collapse stereo width */
         width_Q14 = 0;
         pred_Q13[ 0 ] = 0;
         pred_Q13[ 1 ] = 0;
     } else if (state->smth_width_Q14 > SILK_FIX_CONST( 0.95, 14 )) {
         /* Full-width stereo coding */
-        silk_stereo_quant_pred( pred_Q13, ix );
+        oaci_silk_stereo_quant_pred( pred_Q13, ix );
         width_Q14 = SILK_FIX_CONST( 1, 14 );
     } else {
         /* Reduced-width stereo coding; scale down and quantize predictors */
         pred_Q13[ 0 ] = silk_RSHIFT( silk_SMULBB( state->smth_width_Q14, pred_Q13[ 0 ] ), 14 );
         pred_Q13[ 1 ] = silk_RSHIFT( silk_SMULBB( state->smth_width_Q14, pred_Q13[ 1 ] ), 14 );
-        silk_stereo_quant_pred( pred_Q13, ix );
+        oaci_silk_stereo_quant_pred( pred_Q13, ix );
         width_Q14 = state->smth_width_Q14;
     }
 
diff --git a/silk/stereo_MS_to_LR.c b/silk/stereo_MS_to_LR.c
index a858f5511..773c904fa 100644
--- a/silk/stereo_MS_to_LR.c
+++ b/silk/stereo_MS_to_LR.c
@@ -32,7 +32,7 @@
 #include "main.h"
 
 /* Convert adaptive Mid/Side representation to Left/Right stereo signal */
-void silk_stereo_MS_to_LR(
+void oaci_silk_stereo_MS_to_LR(
     stereo_dec_state            *state,                         /* I/O  State                                       */
     oac_int16 x1[],                                            /* I/O  Left input signal, becomes mid signal       */
     oac_int16 x2[],                                            /* I/O  Right input signal, becomes side signal     */
diff --git a/silk/stereo_decode_pred.c b/silk/stereo_decode_pred.c
index d85ac5ab6..355b58d99 100644
--- a/silk/stereo_decode_pred.c
+++ b/silk/stereo_decode_pred.c
@@ -32,7 +32,7 @@
 #include "main.h"
 
 /* Decode mid/side predictors */
-void silk_stereo_decode_pred(
+void oaci_silk_stereo_decode_pred(
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
     oac_int32 pred_Q13[]                                       /* O    Predictors                                  */
     ) {
@@ -40,19 +40,19 @@ void silk_stereo_decode_pred(
     oac_int32 low_Q13, step_Q13;
 
     /* Entropy decoding */
-    n = ec_dec_icdf( psRangeDec, silk_stereo_pred_joint_iCDF, 8 );
+    n = oaci_ec_dec_icdf( psRangeDec, oaci_silk_stereo_pred_joint_iCDF, 8 );
     ix[ 0 ][ 2 ] = silk_DIV32_16( n, 5 );
     ix[ 1 ][ 2 ] = n - 5*ix[ 0 ][ 2 ];
     for (n = 0; n < 2; n++) {
-        ix[ n ][ 0 ] = ec_dec_icdf( psRangeDec, silk_uniform3_iCDF, 8 );
-        ix[ n ][ 1 ] = ec_dec_icdf( psRangeDec, silk_uniform5_iCDF, 8 );
+        ix[ n ][ 0 ] = oaci_ec_dec_icdf( psRangeDec, oaci_silk_uniform3_iCDF, 8 );
+        ix[ n ][ 1 ] = oaci_ec_dec_icdf( psRangeDec, oaci_silk_uniform5_iCDF, 8 );
     }
 
     /* Dequantize */
     for (n = 0; n < 2; n++) {
         ix[ n ][ 0 ] += 3*ix[ n ][ 2 ];
-        low_Q13 = silk_stereo_pred_quant_Q13[ ix[ n ][ 0 ] ];
-        step_Q13 = silk_SMULWB( silk_stereo_pred_quant_Q13[ ix[ n ][ 0 ] + 1 ] - low_Q13,
+        low_Q13 = oaci_silk_stereo_pred_quant_Q13[ ix[ n ][ 0 ] ];
+        step_Q13 = silk_SMULWB( oaci_silk_stereo_pred_quant_Q13[ ix[ n ][ 0 ] + 1 ] - low_Q13,
             SILK_FIX_CONST( 0.5/STEREO_QUANT_SUB_STEPS, 16 ));
         pred_Q13[ n ] = silk_SMLABB( low_Q13, step_Q13, 2*ix[ n ][ 1 ] + 1 );
     }
@@ -62,10 +62,10 @@ void silk_stereo_decode_pred(
 }
 
 /* Decode mid-only flag */
-void silk_stereo_decode_mid_only(
+void oaci_silk_stereo_decode_mid_only(
     ec_dec                      *psRangeDec,                    /* I/O  Compressor data structure                   */
     oac_int                    *decode_only_mid                /* O    Flag that only mid channel has been coded   */
     ) {
     /* Decode flag that only mid channel is coded */
-    *decode_only_mid = ec_dec_icdf( psRangeDec, silk_stereo_only_code_mid_iCDF, 8 );
+    *decode_only_mid = oaci_ec_dec_icdf( psRangeDec, oaci_silk_stereo_only_code_mid_iCDF, 8 );
 }
diff --git a/silk/stereo_encode_pred.c b/silk/stereo_encode_pred.c
index 9edce7b10..d9bec42c6 100644
--- a/silk/stereo_encode_pred.c
+++ b/silk/stereo_encode_pred.c
@@ -32,7 +32,7 @@
 #include "main.h"
 
 /* Entropy code the mid/side quantization indices */
-void silk_stereo_encode_pred(
+void oaci_silk_stereo_encode_pred(
     ec_enc                      *psRangeEnc,                    /* I/O  Compressor data structure                   */
     oac_int8 ix[ 2 ][ 3 ]                                      /* I    Quantization indices                        */
     ) {
@@ -41,19 +41,19 @@ void silk_stereo_encode_pred(
     /* Entropy coding */
     n = 5*ix[ 0 ][ 2 ] + ix[ 1 ][ 2 ];
     celt_assert( n < 25 );
-    ec_enc_icdf( psRangeEnc, n, silk_stereo_pred_joint_iCDF, 8 );
+    oaci_ec_enc_icdf( psRangeEnc, n, oaci_silk_stereo_pred_joint_iCDF, 8 );
     for (n = 0; n < 2; n++) {
         celt_assert( ix[ n ][ 0 ] < 3 );
         celt_assert( ix[ n ][ 1 ] < STEREO_QUANT_SUB_STEPS );
-        ec_enc_icdf( psRangeEnc, ix[ n ][ 0 ], silk_uniform3_iCDF, 8 );
-        ec_enc_icdf( psRangeEnc, ix[ n ][ 1 ], silk_uniform5_iCDF, 8 );
+        oaci_ec_enc_icdf( psRangeEnc, ix[ n ][ 0 ], oaci_silk_uniform3_iCDF, 8 );
+        oaci_ec_enc_icdf( psRangeEnc, ix[ n ][ 1 ], oaci_silk_uniform5_iCDF, 8 );
     }
 }
 
 /* Entropy code the mid-only flag */
-void silk_stereo_encode_mid_only(
+void oaci_silk_stereo_encode_mid_only(
     ec_enc                      *psRangeEnc,                    /* I/O  Compressor data structure                   */
     oac_int8 mid_only_flag)                                             {
     /* Encode flag that only mid channel is coded */
-    ec_enc_icdf( psRangeEnc, mid_only_flag, silk_stereo_only_code_mid_iCDF, 8 );
+    oaci_ec_enc_icdf( psRangeEnc, mid_only_flag, oaci_silk_stereo_only_code_mid_iCDF, 8 );
 }
diff --git a/silk/stereo_find_predictor.c b/silk/stereo_find_predictor.c
index f90fd9e8a..a73996c6b 100644
--- a/silk/stereo_find_predictor.c
+++ b/silk/stereo_find_predictor.c
@@ -32,7 +32,7 @@
 #include "main.h"
 
 /* Find least-squares prediction gain for one signal based on another and quantize it */
-oac_int32 silk_stereo_find_predictor(                          /* O    Returns predictor in Q13                    */
+oac_int32 oaci_silk_stereo_find_predictor(                          /* O    Returns predictor in Q13                    */
     oac_int32                  *ratio_Q14,                     /* O    Ratio of residual and mid energies          */
     const oac_int16 x[],                                       /* I    Basis signal                                */
     const oac_int16 y[],                                       /* I    Target signal                               */
@@ -44,14 +44,14 @@ oac_int32 silk_stereo_find_predictor(                          /* O    Returns p
     oac_int32 nrgx, nrgy, corr, pred_Q13, pred2_Q10;
 
     /* Find  predictor */
-    silk_sum_sqr_shift( &nrgx, &scale1, x, length );
-    silk_sum_sqr_shift( &nrgy, &scale2, y, length );
+    oaci_silk_sum_sqr_shift( &nrgx, &scale1, x, length );
+    oaci_silk_sum_sqr_shift( &nrgy, &scale2, y, length );
     scale = silk_max_int( scale1, scale2 );
     scale = scale + (scale&1);              /* make even */
     nrgy = silk_RSHIFT32( nrgy, scale - scale2 );
     nrgx = silk_RSHIFT32( nrgx, scale - scale1 );
     nrgx = silk_max_int( nrgx, 1 );
-    corr = silk_inner_prod_aligned_scale( x, y, scale, length );
+    corr = oaci_silk_inner_prod_aligned_scale( x, y, scale, length );
     pred_Q13 = silk_DIV32_varQ( corr, nrgx, 13 );
     pred_Q13 = silk_LIMIT( pred_Q13, -(1<<14), 1<<14 );
     pred2_Q10 = silk_SMULWB( pred_Q13, pred_Q13 );
diff --git a/silk/stereo_quant_pred.c b/silk/stereo_quant_pred.c
index 5747e83a7..da5a2f8f7 100644
--- a/silk/stereo_quant_pred.c
+++ b/silk/stereo_quant_pred.c
@@ -32,7 +32,7 @@
 #include "main.h"
 
 /* Quantize mid/side predictors */
-void silk_stereo_quant_pred(
+void oaci_silk_stereo_quant_pred(
     oac_int32 pred_Q13[],                                      /* I/O  Predictors (out: quantized)                 */
     oac_int8 ix[ 2 ][ 3 ]                                      /* O    Quantization indices                        */
     ) {
@@ -44,8 +44,8 @@ void silk_stereo_quant_pred(
         /* Brute-force search over quantization levels */
         err_min_Q13 = silk_int32_MAX;
         for (i = 0; i < STEREO_QUANT_TAB_SIZE - 1; i++) {
-            low_Q13 = silk_stereo_pred_quant_Q13[ i ];
-            step_Q13 = silk_SMULWB( silk_stereo_pred_quant_Q13[ i + 1 ] - low_Q13,
+            low_Q13 = oaci_silk_stereo_pred_quant_Q13[ i ];
+            step_Q13 = silk_SMULWB( oaci_silk_stereo_pred_quant_Q13[ i + 1 ] - low_Q13,
                 SILK_FIX_CONST( 0.5/STEREO_QUANT_SUB_STEPS, 16 ));
             for (j = 0; j < STEREO_QUANT_SUB_STEPS; j++) {
                 lvl_Q13 = silk_SMLABB( low_Q13, step_Q13, 2*j + 1 );
diff --git a/silk/sum_sqr_shift.c b/silk/sum_sqr_shift.c
index fd9e50631..62a509b96 100644
--- a/silk/sum_sqr_shift.c
+++ b/silk/sum_sqr_shift.c
@@ -33,7 +33,7 @@
 
 /* Compute number of bits to right shift the sum of squares of a vector */
 /* of int16s to make it fit in an int32                                 */
-void silk_sum_sqr_shift(
+void oaci_silk_sum_sqr_shift(
     oac_int32                  *energy,            /* O   Energy of x, after shifting to the right                     */
     oac_int                    *shift,             /* O   Number of bits right shift applied to energy                 */
     const oac_int16            *x,                 /* I   Input vector                                                 */
diff --git a/silk/table_LSF_cos.c b/silk/table_LSF_cos.c
index 442dd7d56..7373ae420 100644
--- a/silk/table_LSF_cos.c
+++ b/silk/table_LSF_cos.c
@@ -33,7 +33,7 @@
 
 /* Cosine approximation table for LSF conversion */
 /* Q12 values (even) */
-const oac_int16 silk_LSFCosTab_FIX_Q12[ LSF_COS_TAB_SZ_FIX + 1 ] = {
+const oac_int16 oaci_silk_LSFCosTab_FIX_Q12[ LSF_COS_TAB_SZ_FIX + 1 ] = {
     8192,             8190,             8182,             8170,
     8152,             8130,             8104,             8072,
     8034,             7994,             7946,             7896,
diff --git a/silk/tables.h b/silk/tables.h
index d80c7ed18..eef96f54a 100644
--- a/silk/tables.h
+++ b/silk/tables.h
@@ -33,74 +33,74 @@
 
 
 /* Entropy coding tables (with size in bytes indicated) */
-extern const oac_uint8 silk_gain_iCDF[ 3 ][ N_LEVELS_QGAIN/8 ];                                    /* 24 */
-extern const oac_uint8 silk_delta_gain_iCDF[ MAX_DELTA_GAIN_QUANT - MIN_DELTA_GAIN_QUANT + 1 ];    /* 41 */
+extern const oac_uint8 oaci_silk_gain_iCDF[ 3 ][ N_LEVELS_QGAIN/8 ];                                    /* 24 */
+extern const oac_uint8 oaci_silk_delta_gain_iCDF[ MAX_DELTA_GAIN_QUANT - MIN_DELTA_GAIN_QUANT + 1 ];    /* 41 */
 
-extern const oac_uint8 silk_pitch_lag_iCDF[ 2*(PITCH_EST_MAX_LAG_MS - PITCH_EST_MIN_LAG_MS) ];     /* 32 */
-extern const oac_uint8 silk_pitch_delta_iCDF[ 21 ];                                                /*  21 */
-extern const oac_uint8 silk_pitch_contour_iCDF[ 34 ];                                              /*  34 */
-extern const oac_uint8 silk_pitch_contour_NB_iCDF[ 11 ];                                           /*  11 */
-extern const oac_uint8 silk_pitch_contour_10_ms_iCDF[ 12 ];                                        /*  12 */
-extern const oac_uint8 silk_pitch_contour_10_ms_NB_iCDF[ 3 ];                                      /*   3 */
+extern const oac_uint8 oaci_silk_pitch_lag_iCDF[ 2*(PITCH_EST_MAX_LAG_MS - PITCH_EST_MIN_LAG_MS) ];     /* 32 */
+extern const oac_uint8 oaci_silk_pitch_delta_iCDF[ 21 ];                                                /*  21 */
+extern const oac_uint8 oaci_silk_pitch_contour_iCDF[ 34 ];                                              /*  34 */
+extern const oac_uint8 oaci_silk_pitch_contour_NB_iCDF[ 11 ];                                           /*  11 */
+extern const oac_uint8 oaci_silk_pitch_contour_10_ms_iCDF[ 12 ];                                        /*  12 */
+extern const oac_uint8 oaci_silk_pitch_contour_10_ms_NB_iCDF[ 3 ];                                      /*   3 */
 
-extern const oac_uint8 silk_pulses_per_block_iCDF[ N_RATE_LEVELS ][ SILK_MAX_PULSES + 2 ];         /* 180 */
-extern const oac_uint8 silk_pulses_per_block_BITS_Q5[ N_RATE_LEVELS - 1 ][ SILK_MAX_PULSES + 2 ];  /* 162 */
+extern const oac_uint8 oaci_silk_pulses_per_block_iCDF[ N_RATE_LEVELS ][ SILK_MAX_PULSES + 2 ];         /* 180 */
+extern const oac_uint8 oaci_silk_pulses_per_block_BITS_Q5[ N_RATE_LEVELS - 1 ][ SILK_MAX_PULSES + 2 ];  /* 162 */
 
-extern const oac_uint8 silk_rate_levels_iCDF[ 2 ][ N_RATE_LEVELS - 1 ];                            /*  18 */
-extern const oac_uint8 silk_rate_levels_BITS_Q5[ 2 ][ N_RATE_LEVELS - 1 ];                         /*  18 */
+extern const oac_uint8 oaci_silk_rate_levels_iCDF[ 2 ][ N_RATE_LEVELS - 1 ];                            /*  18 */
+extern const oac_uint8 oaci_silk_rate_levels_BITS_Q5[ 2 ][ N_RATE_LEVELS - 1 ];                         /*  18 */
 
-extern const oac_uint8 silk_max_pulses_table[ 4 ];                                                 /*   4 */
+extern const oac_uint8 oaci_silk_max_pulses_table[ 4 ];                                                 /*   4 */
 
-extern const oac_uint8 silk_shell_code_table0[ 152 ];                                              /* 152 */
-extern const oac_uint8 silk_shell_code_table1[ 152 ];                                              /* 152 */
-extern const oac_uint8 silk_shell_code_table2[ 152 ];                                              /* 152 */
-extern const oac_uint8 silk_shell_code_table3[ 152 ];                                              /* 152 */
-extern const oac_uint8 silk_shell_code_table_offsets[ SILK_MAX_PULSES + 1 ];                       /*  17 */
+extern const oac_uint8 oaci_silk_shell_code_table0[ 152 ];                                              /* 152 */
+extern const oac_uint8 oaci_silk_shell_code_table1[ 152 ];                                              /* 152 */
+extern const oac_uint8 oaci_silk_shell_code_table2[ 152 ];                                              /* 152 */
+extern const oac_uint8 oaci_silk_shell_code_table3[ 152 ];                                              /* 152 */
+extern const oac_uint8 oaci_silk_shell_code_table_offsets[ SILK_MAX_PULSES + 1 ];                       /*  17 */
 
-extern const oac_uint8 silk_lsb_iCDF[ 2 ];                                                         /*   2 */
+extern const oac_uint8 oaci_silk_lsb_iCDF[ 2 ];                                                         /*   2 */
 
-extern const oac_uint8 silk_sign_iCDF[ 42 ];                                                       /*  42 */
+extern const oac_uint8 oaci_silk_sign_iCDF[ 42 ];                                                       /*  42 */
 
-extern const oac_uint8 silk_uniform3_iCDF[ 3 ];                                                    /*   3 */
-extern const oac_uint8 silk_uniform4_iCDF[ 4 ];                                                    /*   4 */
-extern const oac_uint8 silk_uniform5_iCDF[ 5 ];                                                    /*   5 */
-extern const oac_uint8 silk_uniform6_iCDF[ 6 ];                                                    /*   6 */
-extern const oac_uint8 silk_uniform8_iCDF[ 8 ];                                                    /*   8 */
+extern const oac_uint8 oaci_silk_uniform3_iCDF[ 3 ];                                                    /*   3 */
+extern const oac_uint8 oaci_silk_uniform4_iCDF[ 4 ];                                                    /*   4 */
+extern const oac_uint8 oaci_silk_uniform5_iCDF[ 5 ];                                                    /*   5 */
+extern const oac_uint8 oaci_silk_uniform6_iCDF[ 6 ];                                                    /*   6 */
+extern const oac_uint8 oaci_silk_uniform8_iCDF[ 8 ];                                                    /*   8 */
 
-extern const oac_uint8 silk_NLSF_EXT_iCDF[ 7 ];                                                    /*   7 */
+extern const oac_uint8 oaci_silk_NLSF_EXT_iCDF[ 7 ];                                                    /*   7 */
 
-extern const oac_uint8 silk_LTP_per_index_iCDF[ 3 ];                                               /*   3 */
-extern const oac_uint8  * const silk_LTP_gain_iCDF_ptrs[ NB_LTP_CBKS ];                            /*   3 */
-extern const oac_uint8  * const silk_LTP_gain_BITS_Q5_ptrs[ NB_LTP_CBKS ];                         /*   3 */
-extern const oac_int8   * const silk_LTP_vq_ptrs_Q7[ NB_LTP_CBKS ];                                /* 168 */
-extern const oac_uint8  * const silk_LTP_vq_gain_ptrs_Q7[NB_LTP_CBKS];
-extern const oac_int8 silk_LTP_vq_sizes[ NB_LTP_CBKS ];                                            /*   3 */
+extern const oac_uint8 oaci_silk_LTP_per_index_iCDF[ 3 ];                                               /*   3 */
+extern const oac_uint8  * const oaci_silk_LTP_gain_iCDF_ptrs[ NB_LTP_CBKS ];                            /*   3 */
+extern const oac_uint8  * const oaci_silk_LTP_gain_BITS_Q5_ptrs[ NB_LTP_CBKS ];                         /*   3 */
+extern const oac_int8   * const oaci_silk_LTP_vq_ptrs_Q7[ NB_LTP_CBKS ];                                /* 168 */
+extern const oac_uint8  * const oaci_silk_LTP_vq_gain_ptrs_Q7[NB_LTP_CBKS];
+extern const oac_int8 oaci_silk_LTP_vq_sizes[ NB_LTP_CBKS ];                                            /*   3 */
 
-extern const oac_uint8 silk_LTPscale_iCDF[ 3 ];                                                    /*   4 */
-extern const oac_int16 silk_LTPScales_table_Q14[ 3 ];                                              /*   6 */
+extern const oac_uint8 oaci_silk_LTPscale_iCDF[ 3 ];                                                    /*   4 */
+extern const oac_int16 oaci_silk_LTPScales_table_Q14[ 3 ];                                              /*   6 */
 
-extern const oac_uint8 silk_type_offset_VAD_iCDF[ 4 ];                                             /*   4 */
-extern const oac_uint8 silk_type_offset_no_VAD_iCDF[ 2 ];                                          /*   2 */
+extern const oac_uint8 oaci_silk_type_offset_VAD_iCDF[ 4 ];                                             /*   4 */
+extern const oac_uint8 oaci_silk_type_offset_no_VAD_iCDF[ 2 ];                                          /*   2 */
 
-extern const oac_int16 silk_stereo_pred_quant_Q13[ STEREO_QUANT_TAB_SIZE ];                        /*  32 */
-extern const oac_uint8 silk_stereo_pred_joint_iCDF[ 25 ];                                          /*  25 */
-extern const oac_uint8 silk_stereo_only_code_mid_iCDF[ 2 ];                                        /*   2 */
+extern const oac_int16 oaci_silk_stereo_pred_quant_Q13[ STEREO_QUANT_TAB_SIZE ];                        /*  32 */
+extern const oac_uint8 oaci_silk_stereo_pred_joint_iCDF[ 25 ];                                          /*  25 */
+extern const oac_uint8 oaci_silk_stereo_only_code_mid_iCDF[ 2 ];                                        /*   2 */
 
-extern const oac_uint8  * const silk_LBRR_flags_iCDF_ptr[ 2 ];                                     /*  10 */
+extern const oac_uint8  * const oaci_silk_LBRR_flags_iCDF_ptr[ 2 ];                                     /*  10 */
 
-extern const oac_uint8 silk_NLSF_interpolation_factor_iCDF[ 5 ];                                   /*   5 */
+extern const oac_uint8 oaci_silk_NLSF_interpolation_factor_iCDF[ 5 ];                                   /*   5 */
 
-extern const silk_NLSF_CB_struct silk_NLSF_CB_WB;                                                   /* 1040 */
-extern const silk_NLSF_CB_struct silk_NLSF_CB_NB_MB;                                                /* 728 */
+extern const silk_NLSF_CB_struct oaci_silk_NLSF_CB_WB;                                                   /* 1040 */
+extern const silk_NLSF_CB_struct oaci_silk_NLSF_CB_NB_MB;                                                /* 728 */
 
 /* Quantization offsets */
-extern const oac_int16 silk_Quantization_Offsets_Q10[ 2 ][ 2 ];                                    /*   8 */
+extern const oac_int16 oaci_silk_Quantization_Offsets_Q10[ 2 ][ 2 ];                                    /*   8 */
 
 /* Interpolation points for filter coefficients used in the bandwidth transition smoother */
-extern const oac_int32 silk_Transition_LP_B_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NB ];            /*  60 */
-extern const oac_int32 silk_Transition_LP_A_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NA ];            /*  60 */
+extern const oac_int32 oaci_silk_Transition_LP_B_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NB ];            /*  60 */
+extern const oac_int32 oaci_silk_Transition_LP_A_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NA ];            /*  60 */
 
 /* Rom table with cosine values */
-extern const oac_int16 silk_LSFCosTab_FIX_Q12[ LSF_COS_TAB_SZ_FIX + 1 ];                           /* 258 */
+extern const oac_int16 oaci_silk_LSFCosTab_FIX_Q12[ LSF_COS_TAB_SZ_FIX + 1 ];                           /* 258 */
 
 #endif
diff --git a/silk/tables_LTP.c b/silk/tables_LTP.c
index ffb4ddafb..044567c9d 100644
--- a/silk/tables_LTP.c
+++ b/silk/tables_LTP.c
@@ -31,7 +31,7 @@
 
 #include "tables.h"
 
-const oac_uint8 silk_LTP_per_index_iCDF[3] = {
+const oac_uint8 oaci_silk_LTP_per_index_iCDF[3] = {
     179,     99,      0
 };
 
@@ -67,13 +67,13 @@ static const oac_uint8 silk_LTP_gain_BITS_Q5_2[32] = {
     182,    192,    192,    192,    205,    192,    205,    224
 };
 
-const oac_uint8 * const silk_LTP_gain_iCDF_ptrs[NB_LTP_CBKS] = {
+const oac_uint8 * const oaci_silk_LTP_gain_iCDF_ptrs[NB_LTP_CBKS] = {
     silk_LTP_gain_iCDF_0,
     silk_LTP_gain_iCDF_1,
     silk_LTP_gain_iCDF_2
 };
 
-const oac_uint8 * const silk_LTP_gain_BITS_Q5_ptrs[NB_LTP_CBKS] = {
+const oac_uint8 * const oaci_silk_LTP_gain_BITS_Q5_ptrs[NB_LTP_CBKS] = {
     silk_LTP_gain_BITS_Q5_0,
     silk_LTP_gain_BITS_Q5_1,
     silk_LTP_gain_BITS_Q5_2
@@ -259,7 +259,7 @@ static const oac_int8 silk_LTP_gain_vq_2[32][5] =
     }
 };
 
-const oac_int8 * const silk_LTP_vq_ptrs_Q7[NB_LTP_CBKS] = {
+const oac_int8 * const oaci_silk_LTP_vq_ptrs_Q7[NB_LTP_CBKS] = {
     (oac_int8 *)&silk_LTP_gain_vq_0[0][0],
     (oac_int8 *)&silk_LTP_gain_vq_1[0][0],
     (oac_int8 *)&silk_LTP_gain_vq_2[0][0]
@@ -283,12 +283,12 @@ static const oac_uint8 silk_LTP_gain_vq_2_gain[32] = {
     124,    120,    123,    119,    170,    173,    107,    109
 };
 
-const oac_uint8 * const silk_LTP_vq_gain_ptrs_Q7[NB_LTP_CBKS] = {
+const oac_uint8 * const oaci_silk_LTP_vq_gain_ptrs_Q7[NB_LTP_CBKS] = {
     &silk_LTP_gain_vq_0_gain[0],
     &silk_LTP_gain_vq_1_gain[0],
     &silk_LTP_gain_vq_2_gain[0]
 };
 
-const oac_int8 silk_LTP_vq_sizes[NB_LTP_CBKS] = {
+const oac_int8 oaci_silk_LTP_vq_sizes[NB_LTP_CBKS] = {
     8, 16, 32
 };
diff --git a/silk/tables_NLSF_CB_NB_MB.c b/silk/tables_NLSF_CB_NB_MB.c
index 1e3abc1ba..d8f969c3f 100644
--- a/silk/tables_NLSF_CB_NB_MB.c
+++ b/silk/tables_NLSF_CB_NB_MB.c
@@ -178,7 +178,7 @@ static const oac_int16 silk_NLSF_DELTA_MIN_NB_MB_Q15[ 11 ] = {
     3,      3,    461
 };
 
-const silk_NLSF_CB_struct silk_NLSF_CB_NB_MB =
+const silk_NLSF_CB_struct oaci_silk_NLSF_CB_NB_MB =
 {
     32,
     10,
diff --git a/silk/tables_NLSF_CB_WB.c b/silk/tables_NLSF_CB_WB.c
index 75e0eb7d8..b7850721f 100644
--- a/silk/tables_NLSF_CB_WB.c
+++ b/silk/tables_NLSF_CB_WB.c
@@ -216,7 +216,7 @@ static const oac_int16 silk_NLSF_DELTA_MIN_WB_Q15[ 17 ] = {
     347
 };
 
-const silk_NLSF_CB_struct silk_NLSF_CB_WB =
+const silk_NLSF_CB_struct oaci_silk_NLSF_CB_WB =
 {
     32,
     16,
diff --git a/silk/tables_gain.c b/silk/tables_gain.c
index f7c1f2287..49d25e5e0 100644
--- a/silk/tables_gain.c
+++ b/silk/tables_gain.c
@@ -32,7 +32,7 @@
 #include "tables.h"
 
 
-const oac_uint8 silk_gain_iCDF[ 3 ][ N_LEVELS_QGAIN/8 ] =
+const oac_uint8 oaci_silk_gain_iCDF[ 3 ][ N_LEVELS_QGAIN/8 ] =
 {
     {
         224,    112,     44,     15,      3,      2,      1,      0
@@ -45,7 +45,7 @@ const oac_uint8 silk_gain_iCDF[ 3 ][ N_LEVELS_QGAIN/8 ] =
     }
 };
 
-const oac_uint8 silk_delta_gain_iCDF[ MAX_DELTA_GAIN_QUANT - MIN_DELTA_GAIN_QUANT + 1 ] = {
+const oac_uint8 oaci_silk_delta_gain_iCDF[ MAX_DELTA_GAIN_QUANT - MIN_DELTA_GAIN_QUANT + 1 ] = {
     250,    245,    234,    203,     71,     50,     42,     38,
     35,     33,     31,     29,     28,     27,     26,     25,
     24,     23,     22,     21,     20,     19,     18,     17,
diff --git a/silk/tables_other.c b/silk/tables_other.c
index 6bafd635a..279fbe745 100644
--- a/silk/tables_other.c
+++ b/silk/tables_other.c
@@ -35,67 +35,67 @@
 
 
 /* Tables for stereo predictor coding */
-const oac_int16 silk_stereo_pred_quant_Q13[ STEREO_QUANT_TAB_SIZE ] = {
+const oac_int16 oaci_silk_stereo_pred_quant_Q13[ STEREO_QUANT_TAB_SIZE ] = {
     -13732, -10050, -8266, -7526, -6500, -5000, -2950,  -820,
     820,   2950,  5000,  6500,  7526,  8266, 10050, 13732
 };
-const oac_uint8 silk_stereo_pred_joint_iCDF[ 25 ] = {
+const oac_uint8 oaci_silk_stereo_pred_joint_iCDF[ 25 ] = {
     249, 247, 246, 245, 244,
     234, 210, 202, 201, 200,
     197, 174,  82,  59,  56,
     55,  54,  46,  22,  12,
     11,  10,   9,   7,   0
 };
-const oac_uint8 silk_stereo_only_code_mid_iCDF[ 2 ] = { 64, 0 };
+const oac_uint8 oaci_silk_stereo_only_code_mid_iCDF[ 2 ] = { 64, 0 };
 
 /* Tables for LBRR flags */
 static const oac_uint8 silk_LBRR_flags_2_iCDF[ 3 ] = { 203, 150, 0 };
 static const oac_uint8 silk_LBRR_flags_3_iCDF[ 7 ] = { 215, 195, 166, 125, 110, 82, 0 };
-const oac_uint8 * const silk_LBRR_flags_iCDF_ptr[ 2 ] = {
+const oac_uint8 * const oaci_silk_LBRR_flags_iCDF_ptr[ 2 ] = {
     silk_LBRR_flags_2_iCDF,
     silk_LBRR_flags_3_iCDF
 };
 
 /* Table for LSB coding */
-const oac_uint8 silk_lsb_iCDF[ 2 ] = { 120, 0 };
+const oac_uint8 oaci_silk_lsb_iCDF[ 2 ] = { 120, 0 };
 
 /* Tables for LTPScale */
-const oac_uint8 silk_LTPscale_iCDF[ 3 ] = { 128, 64, 0 };
+const oac_uint8 oaci_silk_LTPscale_iCDF[ 3 ] = { 128, 64, 0 };
 
 /* Tables for signal type and offset coding */
-const oac_uint8 silk_type_offset_VAD_iCDF[ 4 ] = {
+const oac_uint8 oaci_silk_type_offset_VAD_iCDF[ 4 ] = {
     232,    158,    10,      0
 };
-const oac_uint8 silk_type_offset_no_VAD_iCDF[ 2 ] = {
+const oac_uint8 oaci_silk_type_offset_no_VAD_iCDF[ 2 ] = {
     230,      0
 };
 
 /* Tables for NLSF interpolation factor */
-const oac_uint8 silk_NLSF_interpolation_factor_iCDF[ 5 ] = { 243, 221, 192, 181, 0 };
+const oac_uint8 oaci_silk_NLSF_interpolation_factor_iCDF[ 5 ] = { 243, 221, 192, 181, 0 };
 
 /* Quantization offsets */
-const oac_int16 silk_Quantization_Offsets_Q10[ 2 ][ 2 ] = {
+const oac_int16 oaci_silk_Quantization_Offsets_Q10[ 2 ][ 2 ] = {
     { OFFSET_UVL_Q10, OFFSET_UVH_Q10 }, { OFFSET_VL_Q10, OFFSET_VH_Q10 }
 };
 
 /* Table for LTPScale */
-const oac_int16 silk_LTPScales_table_Q14[ 3 ] = { 15565, 12288, 8192 };
+const oac_int16 oaci_silk_LTPScales_table_Q14[ 3 ] = { 15565, 12288, 8192 };
 
 /* Uniform entropy tables */
-const oac_uint8 silk_uniform3_iCDF[ 3 ] = { 171, 85, 0 };
-const oac_uint8 silk_uniform4_iCDF[ 4 ] = { 192, 128, 64, 0 };
-const oac_uint8 silk_uniform5_iCDF[ 5 ] = { 205, 154, 102, 51, 0 };
-const oac_uint8 silk_uniform6_iCDF[ 6 ] = { 213, 171, 128, 85, 43, 0 };
-const oac_uint8 silk_uniform8_iCDF[ 8 ] = { 224, 192, 160, 128, 96, 64, 32, 0 };
+const oac_uint8 oaci_silk_uniform3_iCDF[ 3 ] = { 171, 85, 0 };
+const oac_uint8 oaci_silk_uniform4_iCDF[ 4 ] = { 192, 128, 64, 0 };
+const oac_uint8 oaci_silk_uniform5_iCDF[ 5 ] = { 205, 154, 102, 51, 0 };
+const oac_uint8 oaci_silk_uniform6_iCDF[ 6 ] = { 213, 171, 128, 85, 43, 0 };
+const oac_uint8 oaci_silk_uniform8_iCDF[ 8 ] = { 224, 192, 160, 128, 96, 64, 32, 0 };
 
-const oac_uint8 silk_NLSF_EXT_iCDF[ 7 ] = { 100, 40, 16, 7, 3, 1, 0 };
+const oac_uint8 oaci_silk_NLSF_EXT_iCDF[ 7 ] = { 100, 40, 16, 7, 3, 1, 0 };
 
 /*  Elliptic/Cauer filters designed with 0.1 dB passband ripple,
         80 dB minimum stopband attenuation, and
         [0.95 : 0.15 : 0.35] normalized cut off frequencies. */
 
 /* Interpolation points for filter coefficients used in the bandwidth transition smoother */
-const oac_int32 silk_Transition_LP_B_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NB ] =
+const oac_int32 oaci_silk_Transition_LP_B_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NB ] =
 {
     {    250767114,  501534038,  250767114  },
     {    209867381,  419732057,  209867381  },
@@ -105,7 +105,7 @@ const oac_int32 silk_Transition_LP_B_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NB ]
 };
 
 /* Interpolation points for filter coefficients used in the bandwidth transition smoother */
-const oac_int32 silk_Transition_LP_A_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NA ] =
+const oac_int32 oaci_silk_Transition_LP_A_Q28[ TRANSITION_INT_NUM ][ TRANSITION_NA ] =
 {
     {    506393414,  239854379  },
     {    411067935,  169683996  },
diff --git a/silk/tables_pitch_lag.c b/silk/tables_pitch_lag.c
index 8cb3a07b2..811254b5c 100644
--- a/silk/tables_pitch_lag.c
+++ b/silk/tables_pitch_lag.c
@@ -31,20 +31,20 @@
 
 #include "tables.h"
 
-const oac_uint8 silk_pitch_lag_iCDF[ 2*(PITCH_EST_MAX_LAG_MS - PITCH_EST_MIN_LAG_MS) ] = {
+const oac_uint8 oaci_silk_pitch_lag_iCDF[ 2*(PITCH_EST_MAX_LAG_MS - PITCH_EST_MIN_LAG_MS) ] = {
     253,    250,    244,    233,    212,    182,    150,    131,
     120,    110,     98,     85,     72,     60,     49,     40,
     32,     25,     19,     15,     13,     11,      9,      8,
     7,      6,      5,      4,      3,      2,      1,      0
 };
 
-const oac_uint8 silk_pitch_delta_iCDF[21] = {
+const oac_uint8 oaci_silk_pitch_delta_iCDF[21] = {
     210,    208,    206,    203,    199,    193,    183,    168,
     142,    104,     74,     52,     37,     27,     20,     14,
     10,      6,      4,      2,      0
 };
 
-const oac_uint8 silk_pitch_contour_iCDF[34] = {
+const oac_uint8 oaci_silk_pitch_contour_iCDF[34] = {
     223,    201,    183,    167,    152,    138,    124,    111,
     98,     88,     79,     70,     62,     56,     50,     44,
     39,     35,     31,     27,     24,     21,     18,     16,
@@ -52,16 +52,16 @@ const oac_uint8 silk_pitch_contour_iCDF[34] = {
     1,      0
 };
 
-const oac_uint8 silk_pitch_contour_NB_iCDF[11] = {
+const oac_uint8 oaci_silk_pitch_contour_NB_iCDF[11] = {
     188,    176,    155,    138,    119,     97,     67,     43,
     26,     10,      0
 };
 
-const oac_uint8 silk_pitch_contour_10_ms_iCDF[12] = {
+const oac_uint8 oaci_silk_pitch_contour_10_ms_iCDF[12] = {
     165,    119,     80,     61,     47,     35,     27,     20,
     14,      9,      4,      0
 };
 
-const oac_uint8 silk_pitch_contour_10_ms_NB_iCDF[3] = {
+const oac_uint8 oaci_silk_pitch_contour_10_ms_NB_iCDF[3] = {
     113,     63,      0
 };
diff --git a/silk/tables_pulses_per_block.c b/silk/tables_pulses_per_block.c
index 0f2008b8a..0943d2b95 100644
--- a/silk/tables_pulses_per_block.c
+++ b/silk/tables_pulses_per_block.c
@@ -31,11 +31,11 @@
 
 #include "tables.h"
 
-const oac_uint8 silk_max_pulses_table[ 4 ] = {
+const oac_uint8 oaci_silk_max_pulses_table[ 4 ] = {
     8,     10,     12,     16
 };
 
-const oac_uint8 silk_pulses_per_block_iCDF[ 10 ][ 18 ] = {
+const oac_uint8 oaci_silk_pulses_per_block_iCDF[ 10 ][ 18 ] = {
     {
         125,     51,     26,     18,     15,     12,     11,     10,
         9,      8,      7,      6,      5,      4,      3,      2,
@@ -88,7 +88,7 @@ const oac_uint8 silk_pulses_per_block_iCDF[ 10 ][ 18 ] = {
     }
 };
 
-const oac_uint8 silk_pulses_per_block_BITS_Q5[ 9 ][ 18 ] = {
+const oac_uint8 oaci_silk_pulses_per_block_BITS_Q5[ 9 ][ 18 ] = {
     {
         31,     57,    107,    160,    205,    205,    255,    255,
         255,    255,    255,    255,    255,    255,    255,    255,
@@ -136,7 +136,7 @@ const oac_uint8 silk_pulses_per_block_BITS_Q5[ 9 ][ 18 ] = {
     }
 };
 
-const oac_uint8 silk_rate_levels_iCDF[ 2 ][ 9 ] =
+const oac_uint8 oaci_silk_rate_levels_iCDF[ 2 ][ 9 ] =
 {
     {
         241,    190,    178,    132,     87,     74,     41,     14,
@@ -148,7 +148,7 @@ const oac_uint8 silk_rate_levels_iCDF[ 2 ][ 9 ] =
     }
 };
 
-const oac_uint8 silk_rate_levels_BITS_Q5[ 2 ][ 9 ] =
+const oac_uint8 oaci_silk_rate_levels_BITS_Q5[ 2 ][ 9 ] =
 {
     {
         131,     74,    141,     79,     80,    138,     95,    104,
@@ -160,7 +160,7 @@ const oac_uint8 silk_rate_levels_BITS_Q5[ 2 ][ 9 ] =
     }
 };
 
-const oac_uint8 silk_shell_code_table0[ 152 ] = {
+const oac_uint8 oaci_silk_shell_code_table0[ 152 ] = {
     128,      0,    214,     42,      0,    235,    128,     21,
     0,    244,    184,     72,     11,      0,    248,    214,
     128,     42,      7,      0,    248,    225,    170,     80,
@@ -182,7 +182,7 @@ const oac_uint8 silk_shell_code_table0[ 152 ] = {
     76,     48,     27,     14,      7,      3,      1,      0
 };
 
-const oac_uint8 silk_shell_code_table1[ 152 ] = {
+const oac_uint8 oaci_silk_shell_code_table1[ 152 ] = {
     129,      0,    207,     50,      0,    236,    129,     20,
     0,    245,    185,     72,     10,      0,    249,    213,
     129,     42,      6,      0,    250,    226,    169,     87,
@@ -204,7 +204,7 @@ const oac_uint8 silk_shell_code_table1[ 152 ] = {
     79,     51,     30,     15,      6,      2,      1,      0
 };
 
-const oac_uint8 silk_shell_code_table2[ 152 ] = {
+const oac_uint8 oaci_silk_shell_code_table2[ 152 ] = {
     129,      0,    203,     54,      0,    234,    129,     23,
     0,    245,    184,     73,     10,      0,    250,    215,
     129,     41,      5,      0,    252,    232,    173,     86,
@@ -226,7 +226,7 @@ const oac_uint8 silk_shell_code_table2[ 152 ] = {
     73,     43,     22,     10,      4,      2,      1,      0
 };
 
-const oac_uint8 silk_shell_code_table3[ 152 ] = {
+const oac_uint8 oaci_silk_shell_code_table3[ 152 ] = {
     130,      0,    200,     58,      0,    231,    130,     26,
     0,    244,    184,     76,     12,      0,    249,    214,
     130,     43,      6,      0,    252,    232,    173,     87,
@@ -248,13 +248,13 @@ const oac_uint8 silk_shell_code_table3[ 152 ] = {
     76,     42,     18,      4,      3,      2,      1,      0
 };
 
-const oac_uint8 silk_shell_code_table_offsets[ 17 ] = {
+const oac_uint8 oaci_silk_shell_code_table_offsets[ 17 ] = {
     0,      0,      2,      5,      9,     14,     20,     27,
     35,     44,     54,     65,     77,     90,    104,    119,
     135
 };
 
-const oac_uint8 silk_sign_iCDF[ 42 ] = {
+const oac_uint8 oaci_silk_sign_iCDF[ 42 ] = {
     254,     49,     67,     77,     82,     93,     99,
     198,     11,     18,     24,     31,     36,     45,
     255,     46,     66,     78,     87,     94,    104,
diff --git a/silk/tests/test_unit_LPC_inv_pred_gain.c b/silk/tests/test_unit_LPC_inv_pred_gain.c
index 80137cbaa..9f80e3006 100644
--- a/silk/tests/test_unit_LPC_inv_pred_gain.c
+++ b/silk/tests/test_unit_LPC_inv_pred_gain.c
@@ -98,7 +98,7 @@ int main(void) {
        so we get wider coverage. */
     srand(0);
 
-    printf("Testing silk_LPC_inverse_pred_gain() optimization ...\n");
+    printf("Testing oaci_silk_LPC_inverse_pred_gain() optimization ...\n");
     for (count = 0; count < loop_num; count++) {
         unsigned int i;
         oac_int order;
@@ -111,8 +111,8 @@ int main(void) {
                 for (i = 0; i < SILK_MAX_ORDER_LPC; i++) {
                     A_Q12[i] = ((oac_int16)rand())>>shift;
                 }
-                gain = silk_LPC_inverse_pred_gain(A_Q12, order, arch);
-                /* Look for filters that silk_LPC_inverse_pred_gain() thinks are
+                gain = oaci_silk_LPC_inverse_pred_gain(A_Q12, order, arch);
+                /* Look for filters that oaci_silk_LPC_inverse_pred_gain() thinks are
                    stable but definitely aren't. */
                 if (gain != 0 && !check_stability(A_Q12, order)) {
                     fprintf(stderr, "**Loop %4d failed!**\n", count);
@@ -124,7 +124,7 @@ int main(void) {
             printf("Loop %4d passed\n", count);
         }
     }
-    printf("silk_LPC_inverse_pred_gain() optimization passed\n");
+    printf("oaci_silk_LPC_inverse_pred_gain() optimization passed\n");
     RESTORE_STACK;
     return 0;
 }
diff --git a/silk/x86/NSQ_del_dec_avx2.c b/silk/x86/NSQ_del_dec_avx2.c
index 653388aa9..3876b9b9f 100644
--- a/silk/x86/NSQ_del_dec_avx2.c
+++ b/silk/x86/NSQ_del_dec_avx2.c
@@ -331,7 +331,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
     oac_int decisionDelay                      /* I                                       */
     );
 
-void silk_NSQ_del_dec_avx2(
+void oaci_silk_NSQ_del_dec_avx2(
     const silk_encoder_state *psEncC,                            /* I    Encoder State               */
     silk_nsq_state *NSQ,                                         /* I/O  NSQ state                   */
     SideInfoIndices *psIndices,                                  /* I/O  Quantization Indices        */
@@ -357,13 +357,13 @@ void silk_NSQ_del_dec_avx2(
     silk_memcpy(&NSQ_c, NSQ, sizeof(NSQ_c));
     silk_memcpy(&psIndices_c, psIndices, sizeof(psIndices_c));
     silk_memcpy(pulses_c, pulses, sizeof(pulses_c));
-    silk_NSQ_del_dec_c(psEncC, &NSQ_c, &psIndices_c, x16, pulses_c, PredCoef_Q12, LTPCoef_Q14, AR_Q13,
+    oaci_silk_NSQ_del_dec_c(psEncC, &NSQ_c, &psIndices_c, x16, pulses_c, PredCoef_Q12, LTPCoef_Q14, AR_Q13,
     HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16,
                        pitchL, Lambda_Q10, LTP_scale_Q14);
 #endif
 
     if (!verify_assumptions(psEncC)) {
-        silk_NSQ_del_dec_c(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14,
+        oaci_silk_NSQ_del_dec_c(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14,
         Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14);
         return;
     }
@@ -405,7 +405,7 @@ void silk_NSQ_del_dec_avx2(
         psDelDec.sAR2_Q14[i] = _mm_set1_epi32(NSQ->sAR2_Q14[i]);
     }
 
-    offset_Q10 = silk_Quantization_Offsets_Q10[psIndices->signalType>>1][psIndices->quantOffsetType];
+    offset_Q10 = oaci_silk_Quantization_Offsets_Q10[psIndices->signalType>>1][psIndices->quantOffsetType];
     smpl_buf_idx = 0; /* index of oldest samples */
 
     decisionDelay = silk_min_int(DECISION_DELAY, psEncC->subfr_length);
diff --git a/silk/x86/NSQ_del_dec_sse4_1.c b/silk/x86/NSQ_del_dec_sse4_1.c
index 7851b28b9..441049272 100644
--- a/silk/x86/NSQ_del_dec_sse4_1.c
+++ b/silk/x86/NSQ_del_dec_sse4_1.c
@@ -113,7 +113,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
     oac_int decisionDelay                      /* I                                        */
     );
 
-void silk_NSQ_del_dec_sse4_1(
+void oaci_silk_NSQ_del_dec_sse4_1(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
@@ -157,7 +157,7 @@ void silk_NSQ_del_dec_sse4_1(
     silk_memcpy( &psIndices_c, psIndices, sizeof(psIndices_c));
     silk_assert( psEncC->nb_subfr*psEncC->subfr_length <= MAX_FRAME_LENGTH );
     silk_memcpy( pulses_c, pulses, psEncC->nb_subfr*psEncC->subfr_length*sizeof(pulses[0]));
-    silk_NSQ_del_dec_c(
+    oaci_silk_NSQ_del_dec_c(
         psEncC,
         &NSQ_c,
         &psIndices_c,
@@ -196,7 +196,7 @@ void silk_NSQ_del_dec_sse4_1(
         silk_memcpy( psDD->sAR2_Q14, NSQ->sAR2_Q14, sizeof(NSQ->sAR2_Q14));
     }
 
-    offset_Q10   = silk_Quantization_Offsets_Q10[ psIndices->signalType>>1 ][ psIndices->quantOffsetType ];
+    offset_Q10   = oaci_silk_Quantization_Offsets_Q10[ psIndices->signalType>>1 ][ psIndices->quantOffsetType ];
     smpl_buf_idx = 0; /* index of oldest samples */
 
     decisionDelay = silk_min_int( DECISION_DELAY, psEncC->subfr_length );
@@ -283,7 +283,7 @@ void silk_NSQ_del_dec_sse4_1(
                 start_idx = psEncC->ltp_mem_length - lag - psEncC->predictLPCOrder - LTP_ORDER/2;
                 celt_assert( start_idx > 0 );
 
-                silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k*psEncC->subfr_length ],
+                oaci_silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k*psEncC->subfr_length ],
                     A_Q12, psEncC->ltp_mem_length - start_idx, psEncC->predictLPCOrder, psEncC->arch );
 
                 NSQ->sLTP_buf_idx = psEncC->ltp_mem_length;
diff --git a/silk/x86/NSQ_sse4_1.c b/silk/x86/NSQ_sse4_1.c
index 683be4a78..37b87db67 100644
--- a/silk/x86/NSQ_sse4_1.c
+++ b/silk/x86/NSQ_sse4_1.c
@@ -71,7 +71,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
     oac_int32 table[][4]                       /* I                                    */
     );
 
-void silk_NSQ_sse4_1(
+void oaci_silk_NSQ_sse4_1(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
@@ -117,7 +117,7 @@ void silk_NSQ_sse4_1(
     silk_assert( psEncC->nb_subfr*psEncC->subfr_length <= MAX_FRAME_LENGTH );
     silk_memcpy( pulses_c, pulses, psEncC->nb_subfr*psEncC->subfr_length*sizeof(pulses[0]));
 
-    silk_NSQ_c(
+    oaci_silk_NSQ_c(
         psEncC,
         &NSQ_c,
         &psIndices_c,
@@ -143,7 +143,7 @@ void silk_NSQ_sse4_1(
 
     silk_assert( NSQ->prev_gain_Q16 != 0 );
 
-    offset_Q10 = silk_Quantization_Offsets_Q10[ psIndices->signalType>>1 ][ psIndices->quantOffsetType ];
+    offset_Q10 = oaci_silk_Quantization_Offsets_Q10[ psIndices->signalType>>1 ][ psIndices->quantOffsetType ];
 
     /* 0 */
     q1_Q10  = offset_Q10;
@@ -231,7 +231,7 @@ void silk_NSQ_sse4_1(
                 start_idx = psEncC->ltp_mem_length - lag - psEncC->predictLPCOrder - LTP_ORDER/2;
                 celt_assert( start_idx > 0 );
 
-                silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k*psEncC->subfr_length ],
+                oaci_silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k*psEncC->subfr_length ],
                     A_Q12, psEncC->ltp_mem_length - start_idx, psEncC->predictLPCOrder, psEncC->arch );
 
                 NSQ->rewhite_flag = 1;
@@ -248,7 +248,7 @@ void silk_NSQ_sse4_1(
                 AR_shp_Q13, lag, HarmShapeFIRPacked_Q14, Tilt_Q14[ k ], LF_shp_Q14[ k ], Gains_Q16[ k ], Lambda_Q10,
                 offset_Q10, psEncC->subfr_length, &(table[32]));
         } else {
-            silk_noise_shape_quantizer( NSQ, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15, A_Q12, B_Q14,
+            oaci_silk_noise_shape_quantizer( NSQ, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15, A_Q12, B_Q14,
                 AR_shp_Q13, lag, HarmShapeFIRPacked_Q14, Tilt_Q14[ k ], LF_shp_Q14[ k ], Gains_Q16[ k ], Lambda_Q10,
                 offset_Q10, psEncC->subfr_length, psEncC->shapingLPCOrder, psEncC->predictLPCOrder, psEncC->arch );
         }
diff --git a/silk/x86/SigProc_FIX_sse.h b/silk/x86/SigProc_FIX_sse.h
index 3de5e3f4a..0f16f16e2 100644
--- a/silk/x86/SigProc_FIX_sse.h
+++ b/silk/x86/SigProc_FIX_sse.h
@@ -33,7 +33,7 @@
 #endif
 
 #if defined(OAC_X86_MAY_HAVE_SSE4_1)
-void silk_burg_modified_sse4_1(
+void oaci_silk_burg_modified_sse4_1(
     oac_int32                  *res_nrg,           /* O    Residual energy                                             */
     oac_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
     oac_int32 A_Q16[],                             /* O    Prediction coefficients (length order)                      */
@@ -47,14 +47,14 @@ void silk_burg_modified_sse4_1(
 
 # if defined(OAC_X86_PRESUME_SSE4_1)
 
-#  define OVERRIDE_silk_burg_modified
-#  define silk_burg_modified(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch) \
+#  define OVERRIDE_oaci_silk_burg_modified
+#  define oaci_silk_burg_modified(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch) \
         ((void)(arch), \
-         silk_burg_modified_sse4_1(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch))
+         oaci_silk_burg_modified_sse4_1(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch))
 
 # elif defined(OAC_HAVE_RTCD)
 
-extern void (*const SILK_BURG_MODIFIED_IMPL[OAC_ARCHMASK + 1])(
+extern void (*const oaci_SILK_BURG_MODIFIED_IMPL[OAC_ARCHMASK + 1])(
     oac_int32                  *res_nrg,           /* O    Residual energy                                             */
     oac_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
     oac_int32 A_Q16[],                             /* O    Prediction coefficients (length order)                      */
@@ -65,14 +65,14 @@ extern void (*const SILK_BURG_MODIFIED_IMPL[OAC_ARCHMASK + 1])(
     const oac_int D,                               /* I    Order                                                       */
     int arch /* I    Run-time architecture                                       */);
 
-#  define OVERRIDE_silk_burg_modified
-#  define silk_burg_modified(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch) \
-        ((*SILK_BURG_MODIFIED_IMPL[(arch)&OAC_ARCHMASK])(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, \
+#  define OVERRIDE_oaci_silk_burg_modified
+#  define oaci_silk_burg_modified(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch) \
+        ((*oaci_SILK_BURG_MODIFIED_IMPL[(arch)&OAC_ARCHMASK])(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, \
                                                          nb_subfr, D, arch))
 
 # endif
 
-oac_int64 silk_inner_prod16_sse4_1(
+oac_int64 oaci_silk_inner_prod16_sse4_1(
     const oac_int16 *inVec1,
     const oac_int16 *inVec2,
     const oac_int len);
@@ -80,20 +80,20 @@ oac_int64 silk_inner_prod16_sse4_1(
 
 # if defined(OAC_X86_PRESUME_SSE4_1)
 
-#  define OVERRIDE_silk_inner_prod16
-#  define silk_inner_prod16(inVec1, inVec2, len, arch) \
-        ((void)(arch), silk_inner_prod16_sse4_1(inVec1, inVec2, len))
+#  define OVERRIDE_oaci_silk_inner_prod16
+#  define oaci_silk_inner_prod16(inVec1, inVec2, len, arch) \
+        ((void)(arch), oaci_silk_inner_prod16_sse4_1(inVec1, inVec2, len))
 
 # elif defined(OAC_HAVE_RTCD)
 
-extern oac_int64 (*const SILK_INNER_PROD16_IMPL[OAC_ARCHMASK + 1])(
+extern oac_int64 (*const oaci_SILK_INNER_PROD16_IMPL[OAC_ARCHMASK + 1])(
                     const oac_int16 *inVec1,
                     const oac_int16 *inVec2,
                     const oac_int len);
 
-#  define OVERRIDE_silk_inner_prod16
-#  define silk_inner_prod16(inVec1, inVec2, len, arch) \
-        ((*SILK_INNER_PROD16_IMPL[(arch)&OAC_ARCHMASK])(inVec1, inVec2, len))
+#  define OVERRIDE_oaci_silk_inner_prod16
+#  define oaci_silk_inner_prod16(inVec1, inVec2, len, arch) \
+        ((*oaci_SILK_INNER_PROD16_IMPL[(arch)&OAC_ARCHMASK])(inVec1, inVec2, len))
 
 # endif
 #endif
diff --git a/silk/x86/VAD_sse4_1.c b/silk/x86/VAD_sse4_1.c
index 0633fc74b..a1d79bc4c 100644
--- a/silk/x86/VAD_sse4_1.c
+++ b/silk/x86/VAD_sse4_1.c
@@ -42,7 +42,7 @@ static const oac_int32 tiltWeights[ VAD_N_BANDS ] = { 30000, 6000, -12000, -1200
 /***************************************/
 /* Get the speech activity level in Q8 */
 /***************************************/
-oac_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if success                  */
+oac_int oaci_silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if success                  */
     silk_encoder_state          *psEncC,            /* I/O  Encoder state                               */
     const oac_int16 pIn[]                          /* I    PCM input                                   */
     ) {
@@ -67,7 +67,7 @@ oac_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if su
     oac_int ret_c;
 
     silk_memcpy( &psEncC_c, psEncC, sizeof(psEncC_c));
-    ret_c = silk_VAD_GetSA_Q8_c( &psEncC_c, pIn );
+    ret_c = oaci_silk_VAD_GetSA_Q8_c( &psEncC_c, pIn );
 #endif
 
     /* Safety checks */
@@ -98,15 +98,15 @@ oac_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if su
     ALLOC( X, X_offset[ 3 ] + decimated_framelength1, oac_int16 );
 
     /* 0-8 kHz to 0-4 kHz and 4-8 kHz */
-    silk_ana_filt_bank_1( pIn, &psSilk_VAD->AnaState[  0 ],
+    oaci_silk_ana_filt_bank_1( pIn, &psSilk_VAD->AnaState[  0 ],
         X, &X[ X_offset[ 3 ] ], psEncC->frame_length );
 
     /* 0-4 kHz to 0-2 kHz and 2-4 kHz */
-    silk_ana_filt_bank_1( X, &psSilk_VAD->AnaState1[ 0 ],
+    oaci_silk_ana_filt_bank_1( X, &psSilk_VAD->AnaState1[ 0 ],
         X, &X[ X_offset[ 2 ] ], decimated_framelength1 );
 
     /* 0-2 kHz to 0-1 kHz and 1-2 kHz */
-    silk_ana_filt_bank_1( X, &psSilk_VAD->AnaState2[ 0 ],
+    oaci_silk_ana_filt_bank_1( X, &psSilk_VAD->AnaState2[ 0 ],
         X, &X[ X_offset[ 1 ] ], decimated_framelength2 );
 
     /*********************************************/
@@ -180,7 +180,7 @@ oac_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if su
     /********************/
     /* Noise estimation */
     /********************/
-    silk_VAD_GetNoiseLevels( &Xnrg[ 0 ], psSilk_VAD );
+    oaci_silk_VAD_GetNoiseLevels( &Xnrg[ 0 ], psSilk_VAD );
 
     /***********************************************/
     /* Signal-plus-noise to noise ratio estimation */
@@ -198,7 +198,7 @@ oac_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if su
             }
 
             /* Convert to log domain */
-            SNR_Q7 = silk_lin2log( NrgToNoiseRatio_Q8[ b ] ) - 8*128;
+            SNR_Q7 = oaci_silk_lin2log( NrgToNoiseRatio_Q8[ b ] ) - 8*128;
 
             /* Sum-of-squares */
             sumSquared = silk_SMLABB( sumSquared, SNR_Q7, SNR_Q7 );          /* Q14 */
@@ -223,12 +223,12 @@ oac_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if su
     /*********************************/
     /* Speech Probability Estimation */
     /*********************************/
-    SA_Q15 = silk_sigm_Q15( silk_SMULWB( VAD_SNR_FACTOR_Q16, pSNR_dB_Q7 ) - VAD_NEGATIVE_OFFSET_Q5 );
+    SA_Q15 = oaci_silk_sigm_Q15( silk_SMULWB( VAD_SNR_FACTOR_Q16, pSNR_dB_Q7 ) - VAD_NEGATIVE_OFFSET_Q5 );
 
     /**************************/
     /* Frequency Tilt Measure */
     /**************************/
-    psEncC->input_tilt_Q15 = silk_LSHIFT( silk_sigm_Q15( input_tilt ) - 16384, 1 );
+    psEncC->input_tilt_Q15 = silk_LSHIFT( oaci_silk_sigm_Q15( input_tilt ) - 16384, 1 );
 
     /**************************************************/
     /* Scale the sigmoid output based on power levels */
@@ -272,9 +272,9 @@ oac_int silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0 if su
             NrgToNoiseRatio_Q8[ b ] - psSilk_VAD->NrgRatioSmth_Q8[ b ], smooth_coef_Q16 );
 
         /* signal to noise ratio in dB per band */
-        SNR_Q7 = 3*(silk_lin2log( psSilk_VAD->NrgRatioSmth_Q8[b] ) - 8*128);
+        SNR_Q7 = 3*(oaci_silk_lin2log( psSilk_VAD->NrgRatioSmth_Q8[b] ) - 8*128);
         /* quality = sigmoid( 0.25 * ( SNR_dB - 16 ) ); */
-        psEncC->input_quality_bands_Q15[ b ] = silk_sigm_Q15( silk_RSHIFT( SNR_Q7 - 16*128, 4 ));
+        psEncC->input_quality_bands_Q15[ b ] = oaci_silk_sigm_Q15( silk_RSHIFT( SNR_Q7 - 16*128, 4 ));
     }
 
 #ifdef OAC_CHECK_ASM
diff --git a/silk/x86/VQ_WMat_EC_sse4_1.c b/silk/x86/VQ_WMat_EC_sse4_1.c
index bd92a9730..052401eec 100644
--- a/silk/x86/VQ_WMat_EC_sse4_1.c
+++ b/silk/x86/VQ_WMat_EC_sse4_1.c
@@ -36,7 +36,7 @@
 #include "celt/x86/x86cpu.h"
 
 /* Entropy constrained matrix-weighted VQ, hard-coded to 5-element vectors, for a single input data vector */
-void silk_VQ_WMat_EC_sse4_1(
+void oaci_silk_VQ_WMat_EC_sse4_1(
     oac_int8                   *ind,                           /* O    index of best codebook vector               */
     oac_int32                  *res_nrg_Q15,                   /* O    best residual energy                        */
     oac_int32                  *rate_dist_Q8,                  /* O    best total bitrate                          */
@@ -126,7 +126,7 @@ void silk_VQ_WMat_EC_sse4_1(
         /* find best */
         if (sum1_Q15 >= 0) {
             /* Translate residual energy to bits using high-rate assumption (6 dB ==> 1 bit/sample) */
-            bits_res_Q8 = silk_SMULBB( subfr_len, silk_lin2log( sum1_Q15 + penalty) - (15<<7));
+            bits_res_Q8 = silk_SMULBB( subfr_len, oaci_silk_lin2log( sum1_Q15 + penalty) - (15<<7));
             /* In the following line we reduce the codelength component by half ("-1"); seems to slightly improve quality */
             bits_tot_Q8 = silk_ADD_LSHIFT32( bits_res_Q8, cl_Q5[ k ], 3 - 1 );
             if (bits_tot_Q8 <= *rate_dist_Q8) {
@@ -148,7 +148,7 @@ void silk_VQ_WMat_EC_sse4_1(
         oac_int32 rate_dist_Q8_c = 0;
         oac_int gain_Q7_c = 0;
 
-        silk_VQ_WMat_EC_c(
+        oaci_silk_VQ_WMat_EC_c(
             &ind_c,
             &res_nrg_Q15_c,
             &rate_dist_Q8_c,
diff --git a/silk/x86/main_sse.h b/silk/x86/main_sse.h
index 2bb7e073a..c05ff18e4 100644
--- a/silk/x86/main_sse.h
+++ b/silk/x86/main_sse.h
@@ -34,7 +34,7 @@
 
 #if defined(OAC_X86_MAY_HAVE_SSE4_1)
 
-void silk_VQ_WMat_EC_sse4_1(
+void oaci_silk_VQ_WMat_EC_sse4_1(
     oac_int8                   *ind,                           /* O    index of best codebook vector               */
     oac_int32                  *res_nrg_Q15,                   /* O    best residual energy                        */
     oac_int32                  *rate_dist_Q8,                  /* O    best total bitrate                          */
@@ -51,16 +51,16 @@ void silk_VQ_WMat_EC_sse4_1(
 
 # if defined OAC_X86_PRESUME_SSE4_1
 
-#  define OVERRIDE_silk_VQ_WMat_EC
-#  define silk_VQ_WMat_EC(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, \
+#  define OVERRIDE_oaci_silk_VQ_WMat_EC
+#  define oaci_silk_VQ_WMat_EC(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, \
                           subfr_len, max_gain_Q7, L, arch) \
         ((void)(arch), \
-         silk_VQ_WMat_EC_sse4_1(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, \
+         oaci_silk_VQ_WMat_EC_sse4_1(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, \
                           subfr_len, max_gain_Q7, L))
 
 # elif defined(OAC_HAVE_RTCD)
 
-extern void (*const SILK_VQ_WMAT_EC_IMPL[OAC_ARCHMASK + 1])(
+extern void (*const oaci_SILK_VQ_WMAT_EC_IMPL[OAC_ARCHMASK + 1])(
     oac_int8                   *ind,                           /* O    index of best codebook vector               */
     oac_int32                  *res_nrg_Q15,                   /* O    best residual energy                        */
     oac_int32                  *rate_dist_Q8,                  /* O    best total bitrate                          */
@@ -75,16 +75,16 @@ extern void (*const SILK_VQ_WMAT_EC_IMPL[OAC_ARCHMASK + 1])(
     const oac_int L                                            /* I    number of vectors in codebook               */
     );
 
-#  define OVERRIDE_silk_VQ_WMat_EC
-#  define silk_VQ_WMat_EC(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, \
+#  define OVERRIDE_oaci_silk_VQ_WMat_EC
+#  define oaci_silk_VQ_WMat_EC(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, \
                           subfr_len, max_gain_Q7, L, arch) \
-        ((*SILK_VQ_WMAT_EC_IMPL[(arch)&OAC_ARCHMASK])(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, \
+        ((*oaci_SILK_VQ_WMAT_EC_IMPL[(arch)&OAC_ARCHMASK])(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, \
                                                       cb_gain_Q7, cl_Q5, \
                                                       subfr_len, max_gain_Q7, L))
 
 # endif
 
-void silk_NSQ_sse4_1(
+void oaci_silk_NSQ_sse4_1(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
@@ -104,15 +104,15 @@ void silk_NSQ_sse4_1(
 
 # if defined OAC_X86_PRESUME_SSE4_1
 
-#  define OVERRIDE_silk_NSQ
-#  define silk_NSQ(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \
+#  define OVERRIDE_oaci_silk_NSQ
+#  define oaci_silk_NSQ(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \
                    HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
-        ((void)(arch), silk_NSQ_sse4_1(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \
+        ((void)(arch), oaci_silk_NSQ_sse4_1(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \
                    HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14))
 
 # elif defined(OAC_HAVE_RTCD)
 
-extern void (*const SILK_NSQ_IMPL[OAC_ARCHMASK + 1])(
+extern void (*const oaci_SILK_NSQ_IMPL[OAC_ARCHMASK + 1])(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
@@ -130,16 +130,16 @@ extern void (*const SILK_NSQ_IMPL[OAC_ARCHMASK + 1])(
     const oac_int LTP_scale_Q14                                              /* I    LTP state scaling               */
     );
 
-#  define OVERRIDE_silk_NSQ
-#  define silk_NSQ(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \
+#  define OVERRIDE_oaci_silk_NSQ
+#  define oaci_silk_NSQ(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \
                    HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
-        ((*SILK_NSQ_IMPL[(arch)&OAC_ARCHMASK])(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \
+        ((*oaci_SILK_NSQ_IMPL[(arch)&OAC_ARCHMASK])(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \
                                                HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, \
                                                LTP_scale_Q14))
 
 # endif
 
-void silk_NSQ_del_dec_sse4_1(
+void oaci_silk_NSQ_del_dec_sse4_1(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
@@ -157,7 +157,7 @@ void silk_NSQ_del_dec_sse4_1(
     const oac_int LTP_scale_Q14                                              /* I    LTP state scaling               */
     );
 
-void silk_NSQ_del_dec_avx2(
+void oaci_silk_NSQ_del_dec_avx2(
     const silk_encoder_state *psEncC,                            /* I    Encoder State               */
     silk_nsq_state *NSQ,                                         /* I/O  NSQ state                   */
     SideInfoIndices *psIndices,                                  /* I/O  Quantization Indices        */
@@ -177,23 +177,23 @@ void silk_NSQ_del_dec_avx2(
 
 # if defined (OAC_X86_PRESUME_AVX2)
 
-#  define OVERRIDE_silk_NSQ_del_dec
-#  define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
+#  define OVERRIDE_oaci_silk_NSQ_del_dec
+#  define oaci_silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
                            HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
-        ((void)(arch), silk_NSQ_del_dec_avx2(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
+        ((void)(arch), oaci_silk_NSQ_del_dec_avx2(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
                            HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14))
 
 # elif defined (OAC_X86_PRESUME_SSE4_1) && !defined(OAC_X86_MAY_HAVE_AVX2)
 
-#  define OVERRIDE_silk_NSQ_del_dec
-#  define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
+#  define OVERRIDE_oaci_silk_NSQ_del_dec
+#  define oaci_silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
                            HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
-        ((void)(arch), silk_NSQ_del_dec_sse4_1(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
+        ((void)(arch), oaci_silk_NSQ_del_dec_sse4_1(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
                            HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14))
 
 # elif defined(OAC_HAVE_RTCD)
 
-extern void (*const SILK_NSQ_DEL_DEC_IMPL[OAC_ARCHMASK + 1])(
+extern void (*const oaci_SILK_NSQ_DEL_DEC_IMPL[OAC_ARCHMASK + 1])(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
@@ -211,17 +211,17 @@ extern void (*const SILK_NSQ_DEL_DEC_IMPL[OAC_ARCHMASK + 1])(
     const oac_int LTP_scale_Q14                                              /* I    LTP state scaling               */
     );
 
-#  define OVERRIDE_silk_NSQ_del_dec
-#  define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
+#  define OVERRIDE_oaci_silk_NSQ_del_dec
+#  define oaci_silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \
                            HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \
-        ((*SILK_NSQ_DEL_DEC_IMPL[(arch)&OAC_ARCHMASK])(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, \
+        ((*oaci_SILK_NSQ_DEL_DEC_IMPL[(arch)&OAC_ARCHMASK])(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, \
                                                        AR_Q13, \
                                                        HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, \
                                                        Lambda_Q10, LTP_scale_Q14))
 
 # endif
 
-void silk_noise_shape_quantizer(
+void oaci_silk_noise_shape_quantizer(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                       */
     oac_int signalType,                        /* I    Signal type                     */
     const oac_int32 x_sc_Q10[],                /* I                                    */
@@ -247,34 +247,34 @@ void silk_noise_shape_quantizer(
 /**************************/
 /* Noise level estimation */
 /**************************/
-void silk_VAD_GetNoiseLevels(
+void oaci_silk_VAD_GetNoiseLevels(
     const oac_int32 pX[ VAD_N_BANDS ],             /* I    subband energies                            */
     silk_VAD_state              *psSilk_VAD         /* I/O  Pointer to Silk VAD state                   */
     );
 
-oac_int silk_VAD_GetSA_Q8_sse4_1(
+oac_int oaci_silk_VAD_GetSA_Q8_sse4_1(
     silk_encoder_state *psEnC,
     const oac_int16 pIn[]);
 
 # if defined(OAC_X86_PRESUME_SSE4_1)
 
-#  define OVERRIDE_silk_VAD_GetSA_Q8
-#  define silk_VAD_GetSA_Q8(psEnC, pIn, arch) ((void)(arch), silk_VAD_GetSA_Q8_sse4_1(psEnC, pIn))
+#  define OVERRIDE_oaci_silk_VAD_GetSA_Q8
+#  define oaci_silk_VAD_GetSA_Q8(psEnC, pIn, arch) ((void)(arch), oaci_silk_VAD_GetSA_Q8_sse4_1(psEnC, pIn))
 
 # elif defined(OAC_HAVE_RTCD)
 
-extern oac_int (*const SILK_VAD_GETSA_Q8_IMPL[OAC_ARCHMASK + 1])(
+extern oac_int (*const oaci_SILK_VAD_GETSA_Q8_IMPL[OAC_ARCHMASK + 1])(
      silk_encoder_state *psEnC,
      const oac_int16 pIn[]);
 
-#  define OVERRIDE_silk_VAD_GetSA_Q8
-#  define silk_VAD_GetSA_Q8(psEnC, pIn, arch) \
-        ((*SILK_VAD_GETSA_Q8_IMPL[(arch)&OAC_ARCHMASK])(psEnC, pIn))
+#  define OVERRIDE_oaci_silk_VAD_GetSA_Q8
+#  define oaci_silk_VAD_GetSA_Q8(psEnC, pIn, arch) \
+        ((*oaci_SILK_VAD_GETSA_Q8_IMPL[(arch)&OAC_ARCHMASK])(psEnC, pIn))
 
 # endif
 
 # ifndef FIXED_POINT
-double silk_inner_product_FLP_avx2(
+double oaci_silk_inner_product_FLP_avx2(
     const silk_float    *data1,
     const silk_float    *data2,
     oac_int dataSize);
@@ -282,20 +282,20 @@ double silk_inner_product_FLP_avx2(
 #  if defined (OAC_X86_PRESUME_AVX2)
 
 #   define OVERRIDE_inner_product_FLP
-#   define silk_inner_product_FLP(data1, data2, dataSize, arch) ((void)arch, \
-                                                                 silk_inner_product_FLP_avx2(data1, data2, dataSize))
+#   define oaci_silk_inner_product_FLP(data1, data2, dataSize, arch) ((void)arch, \
+                                                                 oaci_silk_inner_product_FLP_avx2(data1, data2, dataSize))
 
 #  elif defined(OAC_HAVE_RTCD) && defined(OAC_X86_MAY_HAVE_AVX2)
 
 #   define OVERRIDE_inner_product_FLP
-extern double (*const SILK_INNER_PRODUCT_FLP_IMPL[OAC_ARCHMASK + 1])(
+extern double (*const oaci_SILK_INNER_PRODUCT_FLP_IMPL[OAC_ARCHMASK + 1])(
     const silk_float    *data1,
     const silk_float    *data2,
     oac_int dataSize
     );
 
-#   define silk_inner_product_FLP(data1, data2, dataSize, arch) ((void)arch, \
-                                                                 (*SILK_INNER_PRODUCT_FLP_IMPL[(arch) \
+#   define oaci_silk_inner_product_FLP(data1, data2, dataSize, arch) ((void)arch, \
+                                                                 (*oaci_SILK_INNER_PRODUCT_FLP_IMPL[(arch) \
                                                                                                &OAC_ARCHMASK])(data1, \
                                                                                                                data2, \
                                                                                                                dataSize))
diff --git a/silk/x86/x86_silk_map.c b/silk/x86/x86_silk_map.c
index 514c5a941..091709ce3 100644
--- a/silk/x86/x86_silk_map.c
+++ b/silk/x86/x86_silk_map.c
@@ -44,32 +44,32 @@
 
 #  include "fixed/main_FIX.h"
 
-oac_int64 (*const SILK_INNER_PROD16_IMPL[ OAC_ARCHMASK + 1 ] )(
+oac_int64 (*const oaci_SILK_INNER_PROD16_IMPL[ OAC_ARCHMASK + 1 ] )(
     const oac_int16 *inVec1,
     const oac_int16 *inVec2,
     const oac_int len
     ) = {
-    silk_inner_prod16_c,                /* non-sse */
-    silk_inner_prod16_c,
-    silk_inner_prod16_c,
-    MAY_HAVE_SSE4_1( silk_inner_prod16 ), /* sse4.1 */
-    MAY_HAVE_SSE4_1( silk_inner_prod16 ) /* avx */
+    oaci_silk_inner_prod16_c,                /* non-sse */
+    oaci_silk_inner_prod16_c,
+    oaci_silk_inner_prod16_c,
+    MAY_HAVE_SSE4_1( oaci_silk_inner_prod16 ), /* sse4.1 */
+    MAY_HAVE_SSE4_1( oaci_silk_inner_prod16 ) /* avx */
 };
 
 # endif
 
-oac_int (*const SILK_VAD_GETSA_Q8_IMPL[ OAC_ARCHMASK + 1 ] )(
+oac_int (*const oaci_SILK_VAD_GETSA_Q8_IMPL[ OAC_ARCHMASK + 1 ] )(
     silk_encoder_state *psEncC,
     const oac_int16 pIn[]
     ) = {
-    silk_VAD_GetSA_Q8_c,                /* non-sse */
-    silk_VAD_GetSA_Q8_c,
-    silk_VAD_GetSA_Q8_c,
-    MAY_HAVE_SSE4_1( silk_VAD_GetSA_Q8 ), /* sse4.1 */
-    MAY_HAVE_SSE4_1( silk_VAD_GetSA_Q8 ) /* avx */
+    oaci_silk_VAD_GetSA_Q8_c,                /* non-sse */
+    oaci_silk_VAD_GetSA_Q8_c,
+    oaci_silk_VAD_GetSA_Q8_c,
+    MAY_HAVE_SSE4_1( oaci_silk_VAD_GetSA_Q8 ), /* sse4.1 */
+    MAY_HAVE_SSE4_1( oaci_silk_VAD_GetSA_Q8 ) /* avx */
 };
 
-void (*const SILK_NSQ_IMPL[ OAC_ARCHMASK + 1 ] )(
+void (*const oaci_SILK_NSQ_IMPL[ OAC_ARCHMASK + 1 ] )(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
@@ -86,14 +86,14 @@ void (*const SILK_NSQ_IMPL[ OAC_ARCHMASK + 1 ] )(
     const oac_int Lambda_Q10,                                                /* I    Rate/distortion tradeoff        */
     const oac_int LTP_scale_Q14                                              /* I    LTP state scaling               */
     ) = {
-    silk_NSQ_c,                /* non-sse */
-    silk_NSQ_c,
-    silk_NSQ_c,
-    MAY_HAVE_SSE4_1( silk_NSQ ), /* sse4.1 */
-    MAY_HAVE_SSE4_1( silk_NSQ ) /* avx */
+    oaci_silk_NSQ_c,                /* non-sse */
+    oaci_silk_NSQ_c,
+    oaci_silk_NSQ_c,
+    MAY_HAVE_SSE4_1( oaci_silk_NSQ ), /* sse4.1 */
+    MAY_HAVE_SSE4_1( oaci_silk_NSQ ) /* avx */
 };
 
-void (*const SILK_VQ_WMAT_EC_IMPL[ OAC_ARCHMASK + 1 ] )(
+void (*const oaci_SILK_VQ_WMAT_EC_IMPL[ OAC_ARCHMASK + 1 ] )(
     oac_int8                   *ind,                           /* O    index of best codebook vector               */
     oac_int32                  *res_nrg_Q15,                   /* O    best residual energy                        */
     oac_int32                  *rate_dist_Q8,                  /* O    best total bitrate                          */
@@ -107,14 +107,14 @@ void (*const SILK_VQ_WMAT_EC_IMPL[ OAC_ARCHMASK + 1 ] )(
     const oac_int32 max_gain_Q7,                               /* I    maximum sum of absolute LTP coefficients    */
     const oac_int L                                            /* I    number of vectors in codebook               */
     ) = {
-    silk_VQ_WMat_EC_c,                /* non-sse */
-    silk_VQ_WMat_EC_c,
-    silk_VQ_WMat_EC_c,
-    MAY_HAVE_SSE4_1( silk_VQ_WMat_EC ), /* sse4.1 */
-    MAY_HAVE_SSE4_1( silk_VQ_WMat_EC ) /* avx */
+    oaci_silk_VQ_WMat_EC_c,                /* non-sse */
+    oaci_silk_VQ_WMat_EC_c,
+    oaci_silk_VQ_WMat_EC_c,
+    MAY_HAVE_SSE4_1( oaci_silk_VQ_WMat_EC ), /* sse4.1 */
+    MAY_HAVE_SSE4_1( oaci_silk_VQ_WMat_EC ) /* avx */
 };
 
-void (*const SILK_NSQ_DEL_DEC_IMPL[ OAC_ARCHMASK + 1 ] )(
+void (*const oaci_SILK_NSQ_DEL_DEC_IMPL[ OAC_ARCHMASK + 1 ] )(
     const silk_encoder_state    *psEncC,                                      /* I    Encoder State                   */
     silk_nsq_state              *NSQ,                                         /* I/O  NSQ state                       */
     SideInfoIndices             *psIndices,                                   /* I/O  Quantization Indices            */
@@ -131,16 +131,16 @@ void (*const SILK_NSQ_DEL_DEC_IMPL[ OAC_ARCHMASK + 1 ] )(
     const oac_int Lambda_Q10,                                                /* I    Rate/distortion tradeoff        */
     const oac_int LTP_scale_Q14                                              /* I    LTP state scaling               */
     ) = {
-    silk_NSQ_del_dec_c,                /* non-sse */
-    silk_NSQ_del_dec_c,
-    silk_NSQ_del_dec_c,
-    MAY_HAVE_SSE4_1( silk_NSQ_del_dec ), /* sse4.1 */
-    MAY_HAVE_AVX2( silk_NSQ_del_dec ) /* avx */
+    oaci_silk_NSQ_del_dec_c,                /* non-sse */
+    oaci_silk_NSQ_del_dec_c,
+    oaci_silk_NSQ_del_dec_c,
+    MAY_HAVE_SSE4_1( oaci_silk_NSQ_del_dec ), /* sse4.1 */
+    MAY_HAVE_AVX2( oaci_silk_NSQ_del_dec ) /* avx */
 };
 
 # if defined(FIXED_POINT)
 
-void (*const SILK_BURG_MODIFIED_IMPL[ OAC_ARCHMASK + 1 ] )(
+void (*const oaci_SILK_BURG_MODIFIED_IMPL[ OAC_ARCHMASK + 1 ] )(
     oac_int32                  *res_nrg,           /* O    Residual energy                                             */
     oac_int                    *res_nrg_Q,         /* O    Residual energy Q value                                     */
     oac_int32 A_Q16[],                             /* O    Prediction coefficients (length order)                      */
@@ -151,27 +151,27 @@ void (*const SILK_BURG_MODIFIED_IMPL[ OAC_ARCHMASK + 1 ] )(
     const oac_int D,                               /* I    Order                                                       */
     int arch                                        /* I    Run-time architecture                                       */
     ) = {
-    silk_burg_modified_c,                /* non-sse */
-    silk_burg_modified_c,
-    silk_burg_modified_c,
-    MAY_HAVE_SSE4_1( silk_burg_modified ), /* sse4.1 */
-    MAY_HAVE_SSE4_1( silk_burg_modified ) /* avx */
+    oaci_silk_burg_modified_c,                /* non-sse */
+    oaci_silk_burg_modified_c,
+    oaci_silk_burg_modified_c,
+    MAY_HAVE_SSE4_1( oaci_silk_burg_modified ), /* sse4.1 */
+    MAY_HAVE_SSE4_1( oaci_silk_burg_modified ) /* avx */
 };
 
 # endif
 
 # ifndef FIXED_POINT
 
-double (*const SILK_INNER_PRODUCT_FLP_IMPL[ OAC_ARCHMASK + 1 ] )(
+double (*const oaci_SILK_INNER_PRODUCT_FLP_IMPL[ OAC_ARCHMASK + 1 ] )(
     const silk_float    *data1,
     const silk_float    *data2,
     oac_int dataSize
     ) = {
-    silk_inner_product_FLP_c,                /* non-sse */
-    silk_inner_product_FLP_c,
-    silk_inner_product_FLP_c,
-    silk_inner_product_FLP_c, /* sse4.1 */
-    MAY_HAVE_AVX2( silk_inner_product_FLP ) /* avx */
+    oaci_silk_inner_product_FLP_c,                /* non-sse */
+    oaci_silk_inner_product_FLP_c,
+    oaci_silk_inner_product_FLP_c,
+    oaci_silk_inner_product_FLP_c, /* sse4.1 */
+    MAY_HAVE_AVX2( oaci_silk_inner_product_FLP ) /* avx */
 };
 
 # endif
diff --git a/src/analysis.c b/src/analysis.c
index f483ca860..d0291e9ad 100644
--- a/src/analysis.c
+++ b/src/analysis.c
@@ -54,7 +54,7 @@
 
 # define TRANSITION_PENALTY 10
 
-static const float dct_table[128] = {
+static const float oaci_dct_table[128] = {
     0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f,
     0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f, 0.250000f,
     0.351851f, 0.338330f, 0.311806f, 0.273300f, 0.224292f, 0.166664f, 0.102631f, 0.034654f,
@@ -161,7 +161,7 @@ static oac_val32 silk_resampler_down2_hp(
     return (oac_val32)hp_ener;
 }
 
-static oac_val32 downmix_and_resample(downmix_func downmix, const void *_x, oac_val32 *y, oac_val32 S[3], int subframe,
+static oac_val32 downmix_and_resample(downmix_func oaci_downmix, const void *_x, oac_val32 *y, oac_val32 S[3], int subframe,
                                       int offset, int c1, int c2, int C, int Fs) {
     VARDECL(oac_val32, tmp);
     int j;
@@ -178,7 +178,7 @@ static oac_val32 downmix_and_resample(downmix_func downmix, const void *_x, oac_
     } else if (Fs != 24000) celt_assert(0);
     ALLOC(tmp, subframe, oac_val32);
 
-    downmix(_x, tmp, subframe, offset, c1, c2, C);
+    oaci_downmix(_x, tmp, subframe, offset, c1, c2, C);
     if ((c2 == -2 && C == 2) || c2 > -1) {
         for (j = 0; j < subframe; j++) {
             tmp[j] = HALF32(tmp[j]);
@@ -208,21 +208,21 @@ static oac_val32 downmix_and_resample(downmix_func downmix, const void *_x, oac_
     return ret;
 }
 
-void tonality_analysis_init(TonalityAnalysisState *tonal, oac_int32 Fs) {
+void oaci_tonality_analysis_init(TonalityAnalysisState *tonal, oac_int32 Fs) {
     /* Initialize reusable fields. */
     tonal->arch = oac_select_arch();
     tonal->Fs = Fs;
     /* Clear remaining fields. */
-    tonality_analysis_reset(tonal);
+    oaci_tonality_analysis_reset(tonal);
 }
 
-void tonality_analysis_reset(TonalityAnalysisState *tonal) {
+void oaci_tonality_analysis_reset(TonalityAnalysisState *tonal) {
     /* Clear non-reusable fields. */
     char *start = (char*)&tonal->TONALITY_ANALYSIS_RESET_START;
     OAC_CLEAR(start, sizeof(TonalityAnalysisState) - (start - (char*)tonal));
 }
 
-void tonality_get_info(TonalityAnalysisState *tonal, AnalysisInfo *info_out, int len) {
+void oaci_tonality_get_info(TonalityAnalysisState *tonal, AnalysisInfo *info_out, int len) {
     int pos;
     int curr_lookahead;
     float tonality_max;
@@ -422,14 +422,14 @@ static int is_digital_silence32(const oac_val32* pcm, int frame_size, int channe
     return silence;
 }
 # else
-#  define is_digital_silence32(pcm, frame_size, channels, lsb_depth) is_digital_silence(pcm, frame_size, channels, \
+#  define is_digital_silence32(pcm, frame_size, channels, lsb_depth) oaci_is_digital_silence(pcm, frame_size, channels, \
     lsb_depth)
 # endif
 
 static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt_mode, const void *x, int len,
-                              int offset, int c1, int c2, int C, int lsb_depth, downmix_func downmix) {
+                              int offset, int c1, int c2, int C, int lsb_depth, downmix_func oaci_downmix) {
     int i, b;
-    const kiss_fft_state *kfft;
+    const kiss_fft_state *oaci_kfft;
     VARDECL(kiss_fft_cpx, in);
     VARDECL(kiss_fft_cpx, out);
     int N = 480, N2 = 240;
@@ -492,8 +492,8 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
         offset = 3*offset/2;
     }
 
-    kfft = celt_mode->mdct.kfft[0];
-    tonal->hp_ener_accum += (float)downmix_and_resample(downmix, x,
+    oaci_kfft = celt_mode->mdct.kfft[0];
+    tonal->hp_ener_accum += (float)downmix_and_resample(oaci_downmix, x,
           &tonal->inmem[tonal->mem_fill], tonal->downmix_state,
           IMIN(len, ANALYSIS_BUF_SIZE - tonal->mem_fill), offset, c1, c2, C, tonal->Fs);
     if (tonal->mem_fill + len < ANALYSIS_BUF_SIZE) {
@@ -522,7 +522,7 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
     }
     OAC_MOVE(tonal->inmem, tonal->inmem + ANALYSIS_BUF_SIZE - 240, 240);
     remaining = len - (ANALYSIS_BUF_SIZE - tonal->mem_fill);
-    tonal->hp_ener_accum = (float)downmix_and_resample(downmix, x,
+    tonal->hp_ener_accum = (float)downmix_and_resample(oaci_downmix, x,
           &tonal->inmem[240], tonal->downmix_state, remaining,
           offset + ANALYSIS_BUF_SIZE - tonal->mem_fill, c1, c2, C, tonal->Fs);
     tonal->mem_fill = 240 + remaining;
@@ -535,7 +535,7 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
         RESTORE_STACK;
         return;
     }
-    oac_fft(kfft, in, out, tonal->arch);
+    oac_fft(oaci_kfft, in, out, tonal->arch);
 # ifndef FIXED_POINT
     /* If there's any NaN on the input, the entire output will be NaN, so we only need to check one value. */
     if (celt_isnan(out[0].r)) {
@@ -816,13 +816,13 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
     for (i = 0; i < 8; i++) {
         float sum = 0;
         for (b = 0; b < 16; b++)
-            sum += dct_table[i*16 + b]*logE[b];
+            sum += oaci_dct_table[i*16 + b]*logE[b];
         BFCC[i] = sum;
     }
     for (i = 0; i < 8; i++) {
         float sum = 0;
         for (b = 0; b < 16; b++)
-            sum += dct_table[i*16 + b]*.5f*(tonal->highE[b] + tonal->lowE[b]);
+            sum += oaci_dct_table[i*16 + b]*.5f*(tonal->highE[b] + tonal->lowE[b]);
         midE[i] = sum;
     }
 
@@ -882,9 +882,9 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
     features[23] = info->tonality_slope + 0.069216f;
     features[24] = tonal->lowECount - 0.067930f;
 
-    analysis_compute_dense(&layer0, layer_out, features);
-    analysis_compute_gru(&layer1, tonal->rnn_state, layer_out);
-    analysis_compute_dense(&layer2, frame_probs, tonal->rnn_state);
+    oaci_analysis_compute_dense(&oaci_layer0, layer_out, features);
+    oaci_analysis_compute_gru(&oaci_layer1, tonal->rnn_state, layer_out);
+    oaci_analysis_compute_dense(&oaci_layer2, frame_probs, tonal->rnn_state);
 
     /* Probability of speech or music vs noise */
     info->activity_probability = frame_probs[1];
@@ -905,9 +905,9 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
     RESTORE_STACK;
 }
 
-void run_analysis(TonalityAnalysisState *analysis, const CELTMode *celt_mode, const void *analysis_pcm,
+void oaci_run_analysis(TonalityAnalysisState *analysis, const CELTMode *celt_mode, const void *analysis_pcm,
                   int analysis_frame_size, int frame_size, int c1, int c2, int C, oac_int32 Fs,
-                  int lsb_depth, downmix_func downmix, AnalysisInfo *analysis_info) {
+                  int lsb_depth, downmix_func oaci_downmix, AnalysisInfo *analysis_info) {
     int offset;
     int pcm_len;
 
@@ -920,7 +920,7 @@ void run_analysis(TonalityAnalysisState *analysis, const CELTMode *celt_mode, co
         offset = analysis->analysis_offset;
         while (pcm_len > 0) {
             tonality_analysis(analysis, celt_mode, analysis_pcm, IMIN(Fs/50, pcm_len), offset, c1, c2, C, lsb_depth,
-            downmix);
+            oaci_downmix);
             offset += Fs/50;
             pcm_len -= Fs/50;
         }
@@ -929,7 +929,7 @@ void run_analysis(TonalityAnalysisState *analysis, const CELTMode *celt_mode, co
         analysis->analysis_offset -= frame_size;
     }
 
-    tonality_get_info(analysis, analysis_info, frame_size);
+    oaci_tonality_get_info(analysis, analysis_info, frame_size);
 }
 
 #endif /* DISABLE_FLOAT_API */
diff --git a/src/analysis.h b/src/analysis.h
index 0e55ea980..9affc94c8 100644
--- a/src/analysis.h
+++ b/src/analysis.h
@@ -86,18 +86,18 @@ typedef struct {
  * not be repeated every analysis step. No allocated memory is retained
  * by the state struct, so no cleanup call is required.
  */
-void tonality_analysis_init(TonalityAnalysisState *analysis, oac_int32 Fs);
+void oaci_tonality_analysis_init(TonalityAnalysisState *analysis, oac_int32 Fs);
 
 /** Reset a TonalityAnalysisState struct.
  *
  * Call this when there's a discontinuity in the data.
  */
-void tonality_analysis_reset(TonalityAnalysisState *analysis);
+void oaci_tonality_analysis_reset(TonalityAnalysisState *analysis);
 
-void tonality_get_info(TonalityAnalysisState *tonal, AnalysisInfo *info_out, int len);
+void oaci_tonality_get_info(TonalityAnalysisState *tonal, AnalysisInfo *info_out, int len);
 
-void run_analysis(TonalityAnalysisState *analysis, const CELTMode *celt_mode, const void *analysis_pcm,
+void oaci_run_analysis(TonalityAnalysisState *analysis, const CELTMode *celt_mode, const void *analysis_pcm,
     int analysis_frame_size, int frame_size, int c1, int c2, int C, oac_int32 Fs,
-    int lsb_depth, downmix_func downmix, AnalysisInfo *analysis_info);
+    int lsb_depth, downmix_func oaci_downmix, AnalysisInfo *analysis_info);
 
 #endif
diff --git a/src/mapping_matrix.c b/src/mapping_matrix.c
index 38f0e0f9c..68e6a1e4a 100644
--- a/src/mapping_matrix.c
+++ b/src/mapping_matrix.c
@@ -37,7 +37,7 @@
 
 #define MATRIX_INDEX(nb_rows, row, col) (nb_rows*col + row)
 
-oac_int32 mapping_matrix_get_size(int rows, int cols) {
+oac_int32 oaci_mapping_matrix_get_size(int rows, int cols) {
     oac_int32 size;
 
     /* Mapping Matrix must only support up to 255 channels in or out.
@@ -53,12 +53,12 @@ oac_int32 mapping_matrix_get_size(int rows, int cols) {
     return align(sizeof(MappingMatrix)) + align(size);
 }
 
-oac_int16 *mapping_matrix_get_data(const MappingMatrix *matrix) {
+oac_int16 *oaci_mapping_matrix_get_data(const MappingMatrix *matrix) {
     /* void* cast avoids clang -Wcast-align warning */
     return (oac_int16*)(void*)((char*)matrix + align(sizeof(MappingMatrix)));
 }
 
-void mapping_matrix_init(MappingMatrix * const matrix,
+void oaci_mapping_matrix_init(MappingMatrix * const matrix,
                          int rows, int cols, int gain, const oac_int16 *data, oac_int32 data_size) {
     int i;
     oac_int16 *ptr;
@@ -71,14 +71,14 @@ void mapping_matrix_init(MappingMatrix * const matrix,
     matrix->rows = rows;
     matrix->cols = cols;
     matrix->gain = gain;
-    ptr = mapping_matrix_get_data(matrix);
+    ptr = oaci_mapping_matrix_get_data(matrix);
     for (i = 0; i < rows*cols; i++) {
         ptr[i] = data[i];
     }
 }
 
 #ifndef DISABLE_FLOAT_API
-void mapping_matrix_multiply_channel_in_float(
+void oaci_mapping_matrix_multiply_channel_in_float(
     const MappingMatrix *matrix,
     const float *input,
     int input_rows,
@@ -92,7 +92,7 @@ void mapping_matrix_multiply_channel_in_float(
 
     celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
 
-    matrix_data = mapping_matrix_get_data(matrix);
+    matrix_data = oaci_mapping_matrix_get_data(matrix);
 
     for (i = 0; i < frame_size; i++) {
         float tmp = 0;
@@ -105,7 +105,7 @@ void mapping_matrix_multiply_channel_in_float(
     }
 }
 
-void mapping_matrix_multiply_channel_out_float(
+void oaci_mapping_matrix_multiply_channel_out_float(
     const MappingMatrix *matrix,
     const oac_res *input,
     int input_row,
@@ -120,7 +120,7 @@ void mapping_matrix_multiply_channel_out_float(
 
     celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
 
-    matrix_data = mapping_matrix_get_data(matrix);
+    matrix_data = oaci_mapping_matrix_get_data(matrix);
 
     for (i = 0; i < frame_size; i++) {
         input_sample = RES2FLOAT(input[input_rows*i]);
@@ -134,7 +134,7 @@ void mapping_matrix_multiply_channel_out_float(
 }
 #endif /* DISABLE_FLOAT_API */
 
-void mapping_matrix_multiply_channel_in_short(
+void oaci_mapping_matrix_multiply_channel_in_short(
     const MappingMatrix *matrix,
     const oac_int16 *input,
     int input_rows,
@@ -148,7 +148,7 @@ void mapping_matrix_multiply_channel_in_short(
 
     celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
 
-    matrix_data = mapping_matrix_get_data(matrix);
+    matrix_data = oaci_mapping_matrix_get_data(matrix);
 
     for (i = 0; i < frame_size; i++) {
         oac_val32 tmp = 0;
@@ -171,7 +171,7 @@ void mapping_matrix_multiply_channel_in_short(
     }
 }
 
-void mapping_matrix_multiply_channel_out_short(
+void oaci_mapping_matrix_multiply_channel_out_short(
     const MappingMatrix *matrix,
     const oac_res *input,
     int input_row,
@@ -186,7 +186,7 @@ void mapping_matrix_multiply_channel_out_short(
 
     celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
 
-    matrix_data = mapping_matrix_get_data(matrix);
+    matrix_data = oaci_mapping_matrix_get_data(matrix);
 
     for (i = 0; i < frame_size; i++) {
         input_sample = RES2INT16(input[input_rows*i]);
@@ -199,7 +199,7 @@ void mapping_matrix_multiply_channel_out_short(
     }
 }
 
-void mapping_matrix_multiply_channel_in_int24(
+void oaci_mapping_matrix_multiply_channel_in_int24(
     const MappingMatrix *matrix,
     const oac_int32 *input,
     int input_rows,
@@ -213,7 +213,7 @@ void mapping_matrix_multiply_channel_in_int24(
 
     celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
 
-    matrix_data = mapping_matrix_get_data(matrix);
+    matrix_data = oaci_mapping_matrix_get_data(matrix);
 
     for (i = 0; i < frame_size; i++) {
         oac_val64 tmp = 0;
@@ -230,7 +230,7 @@ void mapping_matrix_multiply_channel_in_int24(
     }
 }
 
-void mapping_matrix_multiply_channel_out_int24(
+void oaci_mapping_matrix_multiply_channel_out_int24(
     const MappingMatrix *matrix,
     const oac_res *input,
     int input_row,
@@ -245,7 +245,7 @@ void mapping_matrix_multiply_channel_out_int24(
 
     celt_assert(input_rows <= matrix->cols && output_rows <= matrix->rows);
 
-    matrix_data = mapping_matrix_get_data(matrix);
+    matrix_data = oaci_mapping_matrix_get_data(matrix);
 
     for (i = 0; i < frame_size; i++) {
         input_sample = RES2INT24(input[input_rows*i]);
@@ -259,8 +259,8 @@ void mapping_matrix_multiply_channel_out_int24(
 }
 
 
-const MappingMatrix mapping_matrix_foa_mixing = { 6, 6, 0 };
-const oac_int16 mapping_matrix_foa_mixing_data[36] = {
+const MappingMatrix oaci_mapping_matrix_foa_mixing = { 6, 6, 0 };
+const oac_int16 oaci_mapping_matrix_foa_mixing_data[36] = {
     16384,      0, -16384,  23170,      0,      0,  16384,  23170,
     16384,      0,      0,      0,  16384,      0, -16384, -23170,
     0,      0,  16384, -23170,  16384,      0,      0,      0,
@@ -268,8 +268,8 @@ const oac_int16 mapping_matrix_foa_mixing_data[36] = {
     0,      0,      0,  32767
 };
 
-const MappingMatrix mapping_matrix_soa_mixing = { 11, 11, 0 };
-const oac_int16 mapping_matrix_soa_mixing_data[121] = {
+const MappingMatrix oaci_mapping_matrix_soa_mixing = { 11, 11, 0 };
+const oac_int16 oaci_mapping_matrix_soa_mixing_data[121] = {
     10923,   7723,  13377, -13377,  11585,   9459,   7723, -16384,
     -6689,      0,      0,  10923,   7723,  13377,  13377, -11585,
     9459,   7723,  16384,  -6689,      0,      0,  10923, -15447,
@@ -288,8 +288,8 @@ const oac_int16 mapping_matrix_soa_mixing_data[121] = {
     32767
 };
 
-const MappingMatrix mapping_matrix_toa_mixing = { 18, 18, 0 };
-const oac_int16 mapping_matrix_toa_mixing_data[324] = {
+const MappingMatrix oaci_mapping_matrix_toa_mixing = { 18, 18, 0 };
+const oac_int16 oaci_mapping_matrix_toa_mixing_data[324] = {
     8208,      0,   -881,  14369,      0,      0,  -8192,  -4163,
     13218,      0,      0,      0,  11095,  -8836,  -6218,  14833,
     0,      0,   8208, -10161,    881,  10161, -13218,  -2944,
@@ -333,8 +333,8 @@ const oac_int16 mapping_matrix_toa_mixing_data[324] = {
     0,      0,      0,  32767
 };
 
-const MappingMatrix mapping_matrix_fourthoa_mixing = { 27, 27, 0 };
-const oac_int16 mapping_matrix_fourthoa_mixing_data[729] = {
+const MappingMatrix oaci_mapping_matrix_fourthoa_mixing = { 27, 27, 0 };
+const oac_int16 oaci_mapping_matrix_fourthoa_mixing_data[729] = {
     9243,      0,  16010,      0,      0,      0,  20669,      0,
     0,      0,      0,      0,  24456,      0,      0,      0,
     0,      0,      0,      0,  27731,      0,      0,      0,
@@ -429,8 +429,8 @@ const oac_int16 mapping_matrix_fourthoa_mixing_data[729] = {
     32767
 };
 
-const MappingMatrix mapping_matrix_fifthoa_mixing = { 38, 38, 0 };
-const oac_int16 mapping_matrix_fifthoa_mixing_data[1444] = {
+const MappingMatrix oaci_mapping_matrix_fifthoa_mixing = { 38, 38, 0 };
+const oac_int16 oaci_mapping_matrix_fifthoa_mixing_data[1444] = {
     9243,      0,  16010,      0,      0,      0,  20669,      0,
     0,      0,      0,      0,  24456,      0,      0,      0,
     0,      0,      0,      0,  27731,      0,      0,      0,
@@ -614,8 +614,8 @@ const oac_int16 mapping_matrix_fifthoa_mixing_data[1444] = {
     0,      0,      0,  32767
 };
 
-const MappingMatrix mapping_matrix_foa_demixing = { 6, 6, 0 };
-const oac_int16 mapping_matrix_foa_demixing_data[36] = {
+const MappingMatrix oaci_mapping_matrix_foa_demixing = { 6, 6, 0 };
+const oac_int16 oaci_mapping_matrix_foa_demixing_data[36] = {
     16384,  16384,  16384,  16384,      0,      0,      0,  23170,
     0, -23170,      0,      0, -16384,  16384, -16384,  16384,
     0,      0,  23170,      0, -23170,      0,      0,      0,
@@ -623,8 +623,8 @@ const oac_int16 mapping_matrix_foa_demixing_data[36] = {
     0,      0,      0,  32767
 };
 
-const MappingMatrix mapping_matrix_soa_demixing = { 11, 11, 3050 };
-const oac_int16 mapping_matrix_soa_demixing_data[121] = {
+const MappingMatrix oaci_mapping_matrix_soa_demixing = { 11, 11, 3050 };
+const oac_int16 oaci_mapping_matrix_soa_demixing_data[121] = {
     2771,   2771,   2771,   2771,   2771,   2771,   2771,   2771,
     2771,      0,      0,  10033,  10033, -20066,  10033,  14189,
     14189, -28378,  10033, -20066,      0,      0,   3393,   3393,
@@ -643,8 +643,8 @@ const oac_int16 mapping_matrix_soa_demixing_data[121] = {
     8312
 };
 
-const MappingMatrix mapping_matrix_toa_demixing = { 18, 18, 0 };
-const oac_int16 mapping_matrix_toa_demixing_data[324] = {
+const MappingMatrix oaci_mapping_matrix_toa_demixing = { 18, 18, 0 };
+const oac_int16 oaci_mapping_matrix_toa_demixing_data[324] = {
     8192,   8192,   8192,   8192,   8192,   8192,   8192,   8192,
     8192,   8192,   8192,   8192,   8192,   8192,   8192,   8192,
     0,      0,      0,  -9779,   9779,   6263,   8857,      0,
@@ -688,8 +688,8 @@ const oac_int16 mapping_matrix_toa_demixing_data[324] = {
     0,      0,      0,  32767
 };
 
-const MappingMatrix mapping_matrix_fourthoa_demixing = { 27, 27, 0 };
-const oac_int16 mapping_matrix_fourthoa_demixing_data[729] = {
+const MappingMatrix oaci_mapping_matrix_fourthoa_demixing = { 27, 27, 0 };
+const oac_int16 oaci_mapping_matrix_fourthoa_demixing_data[729] = {
     4870,   4484,   4870,   4347,   4440,   4726,   4683,   4821,
     4883,   4842,   4603,   4484,   4683,   4698,   4234,   4368,
     4603,   4783,   4783,   4820,   4821,   4347,   4820,   4440,
@@ -784,8 +784,8 @@ const oac_int16 mapping_matrix_fourthoa_demixing_data[729] = {
     32767
 };
 
-const MappingMatrix mapping_matrix_fifthoa_demixing = { 38, 38, 0 };
-const oac_int16 mapping_matrix_fifthoa_demixing_data[1444] = {
+const MappingMatrix oaci_mapping_matrix_fifthoa_demixing = { 38, 38, 0 };
+const oac_int16 oaci_mapping_matrix_fifthoa_demixing_data[1444] = {
     3188,   3247,   3268,   3368,   3368,   3138,   3268,   3099,
     3211,   3368,   3099,   3247,   3211,   3368,   3368,   3368,
     3149,   3268,   3247,   3211,   3099,   3188,   3138,   3149,
diff --git a/src/mapping_matrix.h b/src/mapping_matrix.h
index 9aa16b3d5..c81dc0bfe 100644
--- a/src/mapping_matrix.h
+++ b/src/mapping_matrix.h
@@ -43,11 +43,11 @@ typedef struct MappingMatrix {
     /* Matrix cell data goes here using col-wise ordering. */
 } MappingMatrix;
 
-oac_int32 mapping_matrix_get_size(int rows, int cols);
+oac_int32 oaci_mapping_matrix_get_size(int rows, int cols);
 
-oac_int16 *mapping_matrix_get_data(const MappingMatrix *matrix);
+oac_int16 *oaci_mapping_matrix_get_data(const MappingMatrix *matrix);
 
-void mapping_matrix_init(
+void oaci_mapping_matrix_init(
     MappingMatrix * const matrix,
     int rows,
     int cols,
@@ -56,7 +56,7 @@ void mapping_matrix_init(
     oac_int32 data_size);
 
 #ifndef DISABLE_FLOAT_API
-void mapping_matrix_multiply_channel_in_float(
+void oaci_mapping_matrix_multiply_channel_in_float(
     const MappingMatrix *matrix,
     const float *input,
     int input_rows,
@@ -65,7 +65,7 @@ void mapping_matrix_multiply_channel_in_float(
     int output_rows,
     int frame_size);
 
-void mapping_matrix_multiply_channel_out_float(
+void oaci_mapping_matrix_multiply_channel_out_float(
     const MappingMatrix *matrix,
     const oac_res *input,
     int input_row,
@@ -75,7 +75,7 @@ void mapping_matrix_multiply_channel_out_float(
     int frame_size);
 #endif /* DISABLE_FLOAT_API */
 
-void mapping_matrix_multiply_channel_in_short(
+void oaci_mapping_matrix_multiply_channel_in_short(
     const MappingMatrix *matrix,
     const oac_int16 *input,
     int input_rows,
@@ -84,7 +84,7 @@ void mapping_matrix_multiply_channel_in_short(
     int output_rows,
     int frame_size);
 
-void mapping_matrix_multiply_channel_out_short(
+void oaci_mapping_matrix_multiply_channel_out_short(
     const MappingMatrix *matrix,
     const oac_res *input,
     int input_row,
@@ -94,7 +94,7 @@ void mapping_matrix_multiply_channel_out_short(
     int frame_size);
 
 
-void mapping_matrix_multiply_channel_in_int24(
+void oaci_mapping_matrix_multiply_channel_in_int24(
     const MappingMatrix *matrix,
     const oac_int32 *input,
     int input_rows,
@@ -103,7 +103,7 @@ void mapping_matrix_multiply_channel_in_int24(
     int output_rows,
     int frame_size);
 
-void mapping_matrix_multiply_channel_out_int24(
+void oaci_mapping_matrix_multiply_channel_out_int24(
     const MappingMatrix *matrix,
     const oac_res *input,
     int input_row,
@@ -116,34 +116,34 @@ void mapping_matrix_multiply_channel_out_int24(
  *   soa: second-order ambisonics
  *   toa: third-order ambisonics
  */
-extern const MappingMatrix mapping_matrix_foa_mixing;
-extern const oac_int16 mapping_matrix_foa_mixing_data[36];
+extern const MappingMatrix oaci_mapping_matrix_foa_mixing;
+extern const oac_int16 oaci_mapping_matrix_foa_mixing_data[36];
 
-extern const MappingMatrix mapping_matrix_soa_mixing;
-extern const oac_int16 mapping_matrix_soa_mixing_data[121];
+extern const MappingMatrix oaci_mapping_matrix_soa_mixing;
+extern const oac_int16 oaci_mapping_matrix_soa_mixing_data[121];
 
-extern const MappingMatrix mapping_matrix_toa_mixing;
-extern const oac_int16 mapping_matrix_toa_mixing_data[324];
+extern const MappingMatrix oaci_mapping_matrix_toa_mixing;
+extern const oac_int16 oaci_mapping_matrix_toa_mixing_data[324];
 
-extern const MappingMatrix mapping_matrix_fourthoa_mixing;
-extern const oac_int16 mapping_matrix_fourthoa_mixing_data[729];
+extern const MappingMatrix oaci_mapping_matrix_fourthoa_mixing;
+extern const oac_int16 oaci_mapping_matrix_fourthoa_mixing_data[729];
 
-extern const MappingMatrix mapping_matrix_fifthoa_mixing;
-extern const oac_int16 mapping_matrix_fifthoa_mixing_data[1444];
+extern const MappingMatrix oaci_mapping_matrix_fifthoa_mixing;
+extern const oac_int16 oaci_mapping_matrix_fifthoa_mixing_data[1444];
 
-extern const MappingMatrix mapping_matrix_foa_demixing;
-extern const oac_int16 mapping_matrix_foa_demixing_data[36];
+extern const MappingMatrix oaci_mapping_matrix_foa_demixing;
+extern const oac_int16 oaci_mapping_matrix_foa_demixing_data[36];
 
-extern const MappingMatrix mapping_matrix_soa_demixing;
-extern const oac_int16 mapping_matrix_soa_demixing_data[121];
+extern const MappingMatrix oaci_mapping_matrix_soa_demixing;
+extern const oac_int16 oaci_mapping_matrix_soa_demixing_data[121];
 
-extern const MappingMatrix mapping_matrix_toa_demixing;
-extern const oac_int16 mapping_matrix_toa_demixing_data[324];
+extern const MappingMatrix oaci_mapping_matrix_toa_demixing;
+extern const oac_int16 oaci_mapping_matrix_toa_demixing_data[324];
 
-extern const MappingMatrix mapping_matrix_fourthoa_demixing;
-extern const oac_int16 mapping_matrix_fourthoa_demixing_data[729];
+extern const MappingMatrix oaci_mapping_matrix_fourthoa_demixing;
+extern const oac_int16 oaci_mapping_matrix_fourthoa_demixing_data[729];
 
-extern const MappingMatrix mapping_matrix_fifthoa_demixing;
-extern const oac_int16 mapping_matrix_fifthoa_demixing_data[1444];
+extern const MappingMatrix oaci_mapping_matrix_fifthoa_demixing;
+extern const oac_int16 oaci_mapping_matrix_fifthoa_demixing_data[1444];
 
 #endif /* MAPPING_MATRIX_H */
diff --git a/src/mlp.c b/src/mlp.c
index ebce7b98d..cc202a5e4 100644
--- a/src/mlp.c
+++ b/src/mlp.c
@@ -63,7 +63,7 @@ static void gemm_accum(float *out, const oac_int8 *weights, int rows, int cols,
     }
 }
 
-void analysis_compute_dense(const AnalysisDenseLayer *layer, float *output, const float *input) {
+void oaci_analysis_compute_dense(const AnalysisDenseLayer *layer, float *output, const float *input) {
     int i;
     int N, M;
     int stride;
@@ -84,7 +84,7 @@ void analysis_compute_dense(const AnalysisDenseLayer *layer, float *output, cons
     }
 }
 
-void analysis_compute_gru(const AnalysisGRULayer *gru, float *state, const float *input) {
+void oaci_analysis_compute_gru(const AnalysisGRULayer *gru, float *state, const float *input) {
     int i;
     int N, M;
     int stride;
diff --git a/src/mlp.h b/src/mlp.h
index afc8ea158..d06c40845 100644
--- a/src/mlp.h
+++ b/src/mlp.h
@@ -49,12 +49,12 @@ typedef struct {
     int nb_neurons;
 } AnalysisGRULayer;
 
-extern const AnalysisDenseLayer layer0;
-extern const AnalysisGRULayer layer1;
-extern const AnalysisDenseLayer layer2;
+extern const AnalysisDenseLayer oaci_layer0;
+extern const AnalysisGRULayer oaci_layer1;
+extern const AnalysisDenseLayer oaci_layer2;
 
-void analysis_compute_dense(const AnalysisDenseLayer *layer, float *output, const float *input);
+void oaci_analysis_compute_dense(const AnalysisDenseLayer *layer, float *output, const float *input);
 
-void analysis_compute_gru(const AnalysisGRULayer *gru, float *state, const float *input);
+void oaci_analysis_compute_gru(const AnalysisGRULayer *gru, float *state, const float *input);
 
 #endif /* MLP_H_ */
diff --git a/src/mlp_data.c b/src/mlp_data.c
index 2721d228d..f10fea778 100644
--- a/src/mlp_data.c
+++ b/src/mlp_data.c
@@ -651,20 +651,20 @@ static const oac_int8 layer2_bias[2] = {
     14, 117
 };
 
-const AnalysisDenseLayer layer0 = {
+const AnalysisDenseLayer oaci_layer0 = {
     layer0_bias,
     layer0_weights,
     25, 32, 0
 };
 
-const AnalysisGRULayer layer1 = {
+const AnalysisGRULayer oaci_layer1 = {
     layer1_bias,
     layer1_weights,
     layer1_recur_weights,
     32, 24
 };
 
-const AnalysisDenseLayer layer2 = {
+const AnalysisDenseLayer oaci_layer2 = {
     layer2_bias,
     layer2_weights,
     24, 2, 1
diff --git a/src/oac.c b/src/oac.c
index 656631c54..cd9c96dd6 100644
--- a/src/oac.c
+++ b/src/oac.c
@@ -155,7 +155,7 @@ OAC_EXPORT void oac_pcm_soft_clip(float *_x, int N, int C, float *declip_mem) {
 
 #endif
 
-int encode_size(int size, unsigned char *data) {
+int oaci_encode_size(int size, unsigned char *data) {
     if (size < 252) {
         data[0] = size;
         return 1;
diff --git a/src/oac_decoder.c b/src/oac_decoder.c
index 96cd4fc7d..c17fdd3a2 100644
--- a/src/oac_decoder.c
+++ b/src/oac_decoder.c
@@ -128,11 +128,11 @@ int oac_decoder_get_size(int channels) {
     int ret;
     if (channels < 1 || channels > 2)
         return 0;
-    ret = silk_Get_Decoder_Size( &silkDecSizeBytes );
+    ret = oaci_silk_Get_Decoder_Size( &silkDecSizeBytes );
     if (ret)
         return 0;
     silkDecSizeBytes = align(silkDecSizeBytes);
-    celtDecSizeBytes = celt_decoder_get_size(channels);
+    celtDecSizeBytes = oaci_celt_decoder_get_size(channels);
     return align(sizeof(OacDecoder)) + silkDecSizeBytes + celtDecSizeBytes;
 }
 
@@ -151,7 +151,7 @@ int oac_decoder_init(OacDecoder *st, oac_int32 Fs, int channels) {
 
     OAC_CLEAR((char*)st, oac_decoder_get_size(channels));
     /* Initialize SILK decoder */
-    ret = silk_Get_Decoder_Size(&silkDecSizeBytes);
+    ret = oaci_silk_Get_Decoder_Size(&silkDecSizeBytes);
     if (ret)
         return OAC_INTERNAL_ERROR;
 
@@ -168,11 +168,11 @@ int oac_decoder_init(OacDecoder *st, oac_int32 Fs, int channels) {
     st->DecControl.nChannelsAPI      = st->channels;
 
     /* Reset decoder */
-    ret = silk_InitDecoder( silk_dec );
+    ret = oaci_silk_InitDecoder( silk_dec );
     if (ret) return OAC_INTERNAL_ERROR;
 
     /* Initialize CELT decoder */
-    ret = celt_decoder_init(celt_dec, Fs, channels);
+    ret = oaci_celt_decoder_init(celt_dec, Fs, channels);
     if (ret != OAC_OK) return OAC_INTERNAL_ERROR;
 
     celt_decoder_ctl(celt_dec, CELT_SET_SIGNALLING(0));
@@ -180,7 +180,7 @@ int oac_decoder_init(OacDecoder *st, oac_int32 Fs, int channels) {
     st->prev_mode = 0;
     st->frame_size = Fs/400;
 #ifdef ENABLE_DEEP_PLC
-    lpcnet_plc_init( &st->lpcnet);
+    oaci_lpcnet_plc_init( &st->lpcnet);
 #endif
     st->arch = oac_select_arch();
     return OAC_OK;
@@ -293,7 +293,7 @@ static int oac_decode_frame(OacDecoder *st, const unsigned char *data,
         audiosize = st->frame_size;
         mode = st->mode;
         bandwidth = st->bandwidth;
-        ec_dec_init(&dec, (unsigned char*)data, len);
+        oaci_ec_dec_init(&dec, (unsigned char*)data, len);
     } else {
         audiosize = frame_size;
         /* Run PLC using last used mode (CELT if we ended with CELT redundancy) */
@@ -377,7 +377,7 @@ static int oac_decode_frame(OacDecoder *st, const unsigned char *data,
             pcm_ptr = pcm;
 
         if (st->prev_mode == MODE_CELT_ONLY)
-            silk_ResetDecoder( silk_dec );
+            oaci_silk_ResetDecoder( silk_dec );
 
         /* The SILK PLC cannot produce frames of less than 10 ms */
         st->DecControl.payloadSize_ms = IMAX(10, 1000*audiosize/st->Fs);
@@ -435,7 +435,7 @@ static int oac_decode_frame(OacDecoder *st, const unsigned char *data,
         do {
             /* Call SILK decoder */
             int first_frame = decoded_samples == 0;
-            silk_ret = silk_Decode( silk_dec, &st->DecControl,
+            silk_ret = oaci_silk_Decode( silk_dec, &st->DecControl,
                                 lost_flag, first_frame, &dec, pcm_ptr, &silk_frame_size,
 #ifdef ENABLE_DEEP_PLC
                                 &st->lpcnet,
@@ -465,15 +465,15 @@ static int oac_decode_frame(OacDecoder *st, const unsigned char *data,
         && ec_tell(&dec) + 17 + 20*(mode == MODE_HYBRID) <= 8*len) {
         /* Check if we have a redundant 0-8 kHz band */
         if (mode == MODE_HYBRID)
-            redundancy = ec_dec_bit_logp(&dec, 12);
+            redundancy = oaci_ec_dec_bit_logp(&dec, 12);
         else
             redundancy = 1;
         if (redundancy) {
-            celt_to_silk = ec_dec_bit_logp(&dec, 1);
+            celt_to_silk = oaci_ec_dec_bit_logp(&dec, 1);
             /* redundancy_bytes will be at least two, in the non-hybrid
                case due to the ec_tell() check above */
             redundancy_bytes = mode == MODE_HYBRID ?
-                               (oac_int32)ec_dec_uint(&dec, 256) + 2 :
+                               (oac_int32)oaci_ec_dec_uint(&dec, 256) + 2 :
                                len - ((ec_tell(&dec) + 7)>>3);
             len -= redundancy_bytes;
             /* This is a sanity check. It should never happen for a valid
@@ -540,7 +540,7 @@ static int oac_decode_frame(OacDecoder *st, const unsigned char *data,
            the final range is still needed (for testing), so the redundancy is
            always decoded but the decoded audio may not be used */
         MUST_SUCCEED(celt_decoder_ctl(celt_dec, CELT_SET_START_BAND(0)));
-        celt_decode_with_ec(celt_dec, data + len, redundancy_bytes,
+        oaci_celt_decode_with_ec(celt_dec, data + len, redundancy_bytes,
                           redundant_audio, F5, NULL, 0);
         MUST_SUCCEED(celt_decoder_ctl(celt_dec, OAC_GET_FINAL_RANGE(&redundant_rng)));
     }
@@ -559,7 +559,7 @@ static int oac_decode_frame(OacDecoder *st, const unsigned char *data,
         if (mode != st->prev_mode && st->prev_mode > 0 && !st->prev_redundancy)
             MUST_SUCCEED(celt_decoder_ctl(celt_dec, OAC_RESET_STATE));
         /* Decode CELT */
-        celt_ret = celt_decode_with_ec_dred(celt_dec, decode_fec ? NULL : data,
+        celt_ret = oaci_celt_decode_with_ec_dred(celt_dec, decode_fec ? NULL : data,
                                      len, pcm, celt_frame_size, &dec, celt_accum
 #ifdef ENABLE_DEEP_PLC
             , &st->lpcnet
@@ -576,7 +576,7 @@ static int oac_decode_frame(OacDecoder *st, const unsigned char *data,
            do a fade-out by decoding a silence frame */
         if (st->prev_mode == MODE_HYBRID && !(redundancy && celt_to_silk && st->prev_redundancy)) {
             MUST_SUCCEED(celt_decoder_ctl(celt_dec, CELT_SET_START_BAND(0)));
-            celt_decode_with_ec(celt_dec, silence, 2, pcm, F2_5, NULL, celt_accum);
+            oaci_celt_decode_with_ec(celt_dec, silence, 2, pcm, F2_5, NULL, celt_accum);
         }
         st->rangeFinal = dec.rng;
     }
@@ -592,7 +592,7 @@ static int oac_decode_frame(OacDecoder *st, const unsigned char *data,
         MUST_SUCCEED(celt_decoder_ctl(celt_dec, OAC_RESET_STATE));
         MUST_SUCCEED(celt_decoder_ctl(celt_dec, CELT_SET_START_BAND(0)));
 
-        celt_decode_with_ec(celt_dec, data + len, redundancy_bytes, redundant_audio, F5, NULL, 0);
+        oaci_celt_decode_with_ec(celt_dec, data + len, redundancy_bytes, redundant_audio, F5, NULL, 0);
         MUST_SUCCEED(celt_decoder_ctl(celt_dec, OAC_GET_FINAL_RANGE(&redundant_rng)));
         smooth_fade(pcm + st->channels*(frame_size - F2_5), redundant_audio + st->channels*F2_5,
                   pcm + st->channels*(frame_size - F2_5), F2_5, st->channels, window, st->Fs);
@@ -680,7 +680,7 @@ int oac_decode_native(OacDecoder *st, const unsigned char *data,
         int features_per_frame;
         int needed_feature_frames;
         int init_frames;
-        lpcnet_plc_fec_clear(&st->lpcnet);
+        oaci_lpcnet_plc_fec_clear(&st->lpcnet);
         F10 = st->Fs/100;
         /* if blend==0, the last PLC call was "update" and we need to feed two extra 10-ms frames. */
         init_frames = (st->lpcnet.blend == 0) ? 2 : 0;
@@ -691,9 +691,9 @@ int oac_decode_native(OacDecoder *st, const unsigned char *data,
             /* We floor instead of rounding because 5-ms overlap compensates for the missing 0.5 rounding offset. */
             feature_offset = init_frames - i - 2 + (int)floor(((float)dred_offset + dred->dred_offset*F10/4)/F10);
             if (feature_offset <= 4*dred->nb_latents - 1 && feature_offset >= 0) {
-                lpcnet_plc_fec_add(&st->lpcnet, dred->fec_features + feature_offset*DRED_NUM_FEATURES);
+                oaci_lpcnet_plc_fec_add(&st->lpcnet, dred->fec_features + feature_offset*DRED_NUM_FEATURES);
             } else {
-                if (feature_offset >= 0) lpcnet_plc_fec_add(&st->lpcnet, NULL);
+                if (feature_offset >= 0) oaci_lpcnet_plc_fec_add(&st->lpcnet, NULL);
             }
 
         }
@@ -834,7 +834,7 @@ int oac_decode(OacDecoder *st, const unsigned char *data,
         for (i = 0; i < ret*st->channels; i++)
             pcm[i] = RES2INT16(out[i]);
 #else
-        celt_float2int16(out, pcm, ret*st->channels, st->arch);
+        oaci_celt_float2int16(out, pcm, ret*st->channels, st->arch);
 #endif
     }
     RESTORE_STACK;
@@ -1004,11 +1004,11 @@ int oac_decoder_ctl(OacDecoder *st, int request, ...) {
                 - ((char*)&st->OAC_DECODER_RESET_START - (char*)st));
 
             celt_decoder_ctl(celt_dec, OAC_RESET_STATE);
-            silk_ResetDecoder( silk_dec );
+            oaci_silk_ResetDecoder( silk_dec );
             st->stream_channels = st->channels;
             st->frame_size = st->Fs/400;
 #ifdef ENABLE_DEEP_PLC
-            lpcnet_plc_reset( &st->lpcnet );
+            oaci_lpcnet_plc_reset( &st->lpcnet );
 #endif
         }
         break;
@@ -1104,8 +1104,8 @@ int oac_decoder_ctl(OacDecoder *st, int request, ...) {
             if (len < 0 || data == NULL) {
                 goto bad_arg;
             }
-            ret = lpcnet_plc_load_model(&st->lpcnet, data, len);
-            ret = silk_LoadOSCEModels(silk_dec, data, len) || ret;
+            ret = oaci_lpcnet_plc_load_model(&st->lpcnet, data, len);
+            ret = oaci_silk_LoadOSCEModels(silk_dec, data, len) || ret;
         }
         break;
 #endif
@@ -1236,11 +1236,11 @@ int oac_dred_decoder_get_size(void) {
 }
 
 #ifdef ENABLE_DRED
-int dred_decoder_load_model(OacDREDDecoder *dec, const unsigned char *data, int len) {
+int oaci_dred_decoder_load_model(OacDREDDecoder *dec, const unsigned char *data, int len) {
     WeightArray *list;
     int ret;
-    parse_weights(&list, data, len);
-    ret = init_rdovaedec(&dec->model, list);
+    oaci_parse_weights(&list, data, len);
+    ret = oaci_init_rdovaedec(&dec->model, list);
     oac_free(list);
     if (ret == 0) dec->loaded = 1;
     return (ret == 0) ? OAC_OK : OAC_BAD_ARG;
@@ -1251,7 +1251,7 @@ int oac_dred_decoder_init(OacDREDDecoder *dec) {
     int ret = 0;
     dec->loaded = 0;
 #if defined(ENABLE_DRED) && !defined(USE_WEIGHTS_FILE)
-    ret = init_rdovaedec(&dec->model, rdovaedec_arrays);
+    ret = oaci_init_rdovaedec(&dec->model, oaci_rdovaedec_arrays);
     if (ret == 0) dec->loaded = 1;
 #endif
     dec->arch = oac_select_arch();
@@ -1300,7 +1300,7 @@ int oac_dred_decoder_ctl(OacDREDDecoder *dred_dec, int request, ...) {
             if (len < 0 || data == NULL) {
                 goto bad_arg;
             }
-            return dred_decoder_load_model(dred_dec, data, len);
+            return oaci_dred_decoder_load_model(dred_dec, data, len);
         }
         break;
 # endif
@@ -1419,7 +1419,7 @@ int oac_dred_parse(OacDREDDecoder *dred_dec, OacDRED *dred, const unsigned char
         int min_feature_frames;
         offset = 100*max_dred_samples/sampling_rate;
         min_feature_frames = IMIN(2 + offset, 2*DRED_NUM_REDUNDANCY_FRAMES);
-        dred_ec_decode(dred, payload, payload_len, min_feature_frames, dred_frame_offset);
+        oaci_dred_ec_decode(dred, payload, payload_len, min_feature_frames, dred_frame_offset);
         if (!defer_processing)
             oac_dred_process(dred_dec, dred, dred);
         if (dred_end) *dred_end = IMAX(0, -dred->dred_offset*sampling_rate/400);
@@ -1450,7 +1450,7 @@ int oac_dred_process(OacDREDDecoder *dred_dec, const OacDRED *src, OacDRED *dst)
         OAC_COPY(dst, src, 1);
     if (dst->process_stage == 2)
         return OAC_OK;
-    DRED_rdovae_decode_all(&dred_dec->model, dst->fec_features, dst->state, dst->latents, dst->nb_latents,
+    oaci_DRED_rdovae_decode_all(&dred_dec->model, dst->fec_features, dst->state, dst->latents, dst->nb_latents,
     dred_dec->arch);
     dst->process_stage = 2;
     return OAC_OK;
diff --git a/src/oac_encoder.c b/src/oac_encoder.c
index 1b87cf3a5..261a4da69 100644
--- a/src/oac_encoder.c
+++ b/src/oac_encoder.c
@@ -217,14 +217,14 @@ int oac_encoder_init(OacEncoder* st, oac_int32 Fs, int channels, int application
         return OAC_BAD_ARG;
 
     /* Create SILK encoder */
-    ret = silk_Get_Encoder_Size( &silkEncSizeBytes, channels );
+    ret = oaci_silk_Get_Encoder_Size( &silkEncSizeBytes, channels );
     if (ret)
         return OAC_BAD_ARG;
     silkEncSizeBytes = align(silkEncSizeBytes);
     if (application == OAC_APPLICATION_RESTRICTED_CELT)
         silkEncSizeBytes = 0;
     if (application != OAC_APPLICATION_RESTRICTED_SILK)
-        celtEncSizeBytes = celt_encoder_get_size(channels);
+        celtEncSizeBytes = oaci_celt_encoder_get_size(channels);
     base_size = align(sizeof(OacEncoder));
     if (application == OAC_APPLICATION_RESTRICTED_SILK || application == OAC_APPLICATION_RESTRICTED_CELT) {
         base_size = align(base_size - MAX_ENCODER_BUFFER*2*sizeof(oac_res));
@@ -246,7 +246,7 @@ int oac_encoder_init(OacEncoder* st, oac_int32 Fs, int channels, int application
 
     if (application != OAC_APPLICATION_RESTRICTED_CELT) {
         silk_enc = (char*)st + st->silk_enc_offset;
-        ret = silk_InitEncoder( silk_enc, st->channels, st->arch, &st->silk_mode );
+        ret = oaci_silk_InitEncoder( silk_enc, st->channels, st->arch, &st->silk_mode );
     }
     if (ret)return OAC_INTERNAL_ERROR;
 
@@ -271,7 +271,7 @@ int oac_encoder_init(OacEncoder* st, oac_int32 Fs, int channels, int application
     /* Initialize CELT encoder */
     if (application != OAC_APPLICATION_RESTRICTED_SILK) {
         celt_enc = (CELTEncoder*)((char*)st + st->celt_enc_offset);
-        err = celt_encoder_init(celt_enc, Fs, channels, st->arch);
+        err = oaci_celt_encoder_init(celt_enc, Fs, channels, st->arch);
         if (err != OAC_OK) return OAC_INTERNAL_ERROR;
         celt_encoder_ctl(celt_enc, CELT_SET_SIGNALLING(0));
         celt_encoder_ctl(celt_enc, OAC_SET_COMPLEXITY(st->silk_mode.complexity));
@@ -279,7 +279,7 @@ int oac_encoder_init(OacEncoder* st, oac_int32 Fs, int channels, int application
 
 #ifdef ENABLE_DRED
     /* Initialize DRED Encoder */
-    dred_encoder_init( &st->dred_encoder, Fs, channels );
+    oaci_dred_encoder_init( &st->dred_encoder, Fs, channels );
 #endif
 
     st->use_vbr = 1;
@@ -307,13 +307,13 @@ int oac_encoder_init(OacEncoder* st, oac_int32 Fs, int channels, int application
 
     st->hybrid_stereo_width_Q14 = 1<<14;
     st->prev_HB_gain = Q15ONE;
-    st->variable_HP_smth2_Q15 = silk_LSHIFT( silk_lin2log( VARIABLE_HP_MIN_CUTOFF_HZ ), 8 );
+    st->variable_HP_smth2_Q15 = silk_LSHIFT( oaci_silk_lin2log( VARIABLE_HP_MIN_CUTOFF_HZ ), 8 );
     st->first = 1;
     st->mode = MODE_HYBRID;
     st->bandwidth = OAC_BANDWIDTH_FULLBAND;
 
 #ifndef DISABLE_FLOAT_API
-    tonality_analysis_init(&st->analysis, st->Fs);
+    oaci_tonality_analysis_init(&st->analysis, st->Fs);
     st->analysis.application = st->application;
 #endif
 
@@ -349,7 +349,7 @@ static unsigned char gen_toc(int mode, int framerate, int bandwidth, int channel
 
 #ifdef FIXED_POINT
 /* Second order ARMA filter, alternative implementation */
-void silk_biquad_res(
+void oaci_silk_biquad_res(
     const oac_res              *in,                /* I     input signal                                               */
     const oac_int32            *B_Q28,             /* I     MA coefficients [3]                                        */
     const oac_int32            *A_Q28,             /* I     AR coefficients [2]                                        */
@@ -385,7 +385,7 @@ void silk_biquad_res(
     }
 }
 #else
-static void silk_biquad_res(
+static void oaci_silk_biquad_res(
     const oac_res        *in,            /* I:    Input signal                   */
     const oac_int32      *B_Q28,         /* I:    MA coefficients [3]            */
     const oac_int32      *A_Q28,         /* I:    AR coefficients [2]            */
@@ -445,9 +445,9 @@ static void hp_cutoff(const oac_res *in, oac_int32 cutoff_Hz, oac_res *out, oac_
     A_Q28[ 0 ] = silk_SMULWW( r_Q22, silk_SMULWW( Fc_Q19, Fc_Q19 ) - SILK_FIX_CONST( 2.0,  22 ));
     A_Q28[ 1 ] = silk_SMULWW( r_Q22, r_Q22 );
 
-    silk_biquad_res( in, B_Q28, A_Q28, hp_mem, out, len, channels );
+    oaci_silk_biquad_res( in, B_Q28, A_Q28, hp_mem, out, len, channels );
     if (channels == 2) {
-        silk_biquad_res( in + 1, B_Q28, A_Q28, hp_mem + 2, out + 1, len, channels );
+        oaci_silk_biquad_res( in + 1, B_Q28, A_Q28, hp_mem + 2, out + 1, len, channels );
     }
 }
 
@@ -631,7 +631,7 @@ static int estimate_dred_bitrate(int q0, int dQ, int qmax, int duration, oac_int
     dred_chunks = IMIN((duration + 5)/4, DRED_NUM_REDUNDANCY_FRAMES/2);
     if (target_chunks != NULL) *target_chunks = 0;
     for (i = 0; i < dred_chunks; i++) {
-        int q = compute_quantizer(q0, dQ, qmax, i);
+        int q = oaci_compute_quantizer(q0, dQ, qmax, i);
         bits += dred_bits_table[q];
         if (target_chunks != NULL && bits < target_bits) *target_chunks = i + 1;
     }
@@ -697,7 +697,7 @@ static oac_int32 user_bitrate_to_bitrate(OacEncoder *st, int frame_size, int max
 }
 
 #ifndef DISABLE_FLOAT_API
-void downmix_float(const void *_x, oac_val32 *y, int subframe, int offset, int c1, int c2, int C) {
+void oaci_downmix_float(const void *_x, oac_val32 *y, int subframe, int offset, int c1, int c2, int C) {
     const float *x;
     int j;
 
@@ -725,7 +725,7 @@ void downmix_float(const void *_x, oac_val32 *y, int subframe, int offset, int c
 }
 #endif
 
-void downmix_int(const void *_x, oac_val32 *y, int subframe, int offset, int c1, int c2, int C) {
+void oaci_downmix_int(const void *_x, oac_val32 *y, int subframe, int offset, int c1, int c2, int C) {
     const oac_int16 *x;
     int j;
 
@@ -744,7 +744,7 @@ void downmix_int(const void *_x, oac_val32 *y, int subframe, int offset, int c1,
     }
 }
 
-void downmix_int24(const void *_x, oac_val32 *y, int subframe, int offset, int c1, int c2, int C) {
+void oaci_downmix_int24(const void *_x, oac_val32 *y, int subframe, int offset, int c1, int c2, int C) {
     const oac_int32 *x;
     int j;
 
@@ -763,7 +763,7 @@ void downmix_int24(const void *_x, oac_val32 *y, int subframe, int offset, int c
     }
 }
 
-oac_int32 frame_size_select(int application, oac_int32 frame_size, int variable_duration, oac_int32 Fs) {
+oac_int32 oaci_frame_size_select(int application, oac_int32 frame_size, int variable_duration, oac_int32 Fs) {
     int new_size;
     if (frame_size < Fs/400)
         return -1;
@@ -787,7 +787,7 @@ oac_int32 frame_size_select(int application, oac_int32 frame_size, int variable_
     return new_size;
 }
 
-oac_val16 compute_stereo_width(const oac_res *pcm, int frame_size, oac_int32 Fs, StereoWidthState *mem) {
+oac_val16 oaci_compute_stereo_width(const oac_res *pcm, int frame_size, oac_int32 Fs, StereoWidthState *mem) {
     oac_val32 xx, xy, yy;
     oac_val16 sqrt_xx, sqrt_yy;
     oac_val16 qrrt_xx, qrrt_yy;
@@ -850,16 +850,16 @@ oac_val16 compute_stereo_width(const oac_res *pcm, int frame_size, oac_int32 Fs,
         oac_val16 corr;
         oac_val16 ldiff;
         oac_val16 width;
-        sqrt_xx = celt_sqrt(mem->XX);
-        sqrt_yy = celt_sqrt(mem->YY);
-        qrrt_xx = celt_sqrt(sqrt_xx);
-        qrrt_yy = celt_sqrt(sqrt_yy);
+        sqrt_xx = oaci_celt_sqrt(mem->XX);
+        sqrt_yy = oaci_celt_sqrt(mem->YY);
+        qrrt_xx = oaci_celt_sqrt(sqrt_xx);
+        qrrt_yy = oaci_celt_sqrt(sqrt_yy);
         /* Inter-channel correlation */
         mem->XY = MIN32(mem->XY, sqrt_xx*sqrt_yy);
-        corr = SHR32(frac_div32(mem->XY, EPSILON + MULT16_16(sqrt_xx, sqrt_yy)), 16);
+        corr = SHR32(oaci_frac_div32(mem->XY, EPSILON + MULT16_16(sqrt_xx, sqrt_yy)), 16);
         /* Approximate loudness difference */
         ldiff = MULT16_16(Q15ONE, ABS16(qrrt_xx - qrrt_yy))/(EPSILON + qrrt_xx + qrrt_yy);
-        width = MULT16_16_Q15(MIN16(Q15ONE, celt_sqrt(QCONST32(1.f, 30) - MULT16_16(corr, corr))), ldiff);
+        width = MULT16_16_Q15(MIN16(Q15ONE, oaci_celt_sqrt(QCONST32(1.f, 30) - MULT16_16(corr, corr))), ldiff);
         /* Smoothing over one second */
         mem->smoothed_width += (width - mem->smoothed_width)/frame_rate;
         /* Peak follower */
@@ -982,7 +982,7 @@ static oac_int32 compute_equiv_rate(oac_int32 bitrate, int channels,
     return equiv;
 }
 
-int is_digital_silence(const oac_res* pcm, int frame_size, int channels, int lsb_depth) {
+int oaci_is_digital_silence(const oac_res* pcm, int frame_size, int channels, int lsb_depth) {
     int silence = 0;
     oac_val32 sample_max = 0;
 #ifdef MLP_TRAINING
@@ -1029,7 +1029,7 @@ static oac_val32 compute_frame_energy(const oac_res *pcm, int frame_size, int ch
 #else
 static oac_val32 compute_frame_energy(const oac_val16 *pcm, int frame_size, int channels, int arch) {
     int len = frame_size*channels;
-    return celt_inner_prod(pcm, pcm, len, arch)/len;
+    return oaci_celt_inner_prod(pcm, pcm, len, arch)/len;
 }
 #endif
 
@@ -1099,7 +1099,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
 oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
                             unsigned char *data, oac_int32 out_data_bytes, int lsb_depth,
                             const void *analysis_pcm, oac_int32 analysis_size, int c1, int c2,
-                            int analysis_channels, downmix_func downmix, int float_api) {
+                            int analysis_channels, downmix_func oaci_downmix, int float_api) {
     void *silk_enc = NULL;
     CELTEncoder *celt_enc = NULL;
     int i;
@@ -1153,7 +1153,7 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
 
     if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
         celt_encoder_ctl(celt_enc, CELT_GET_MODE(&celt_mode));
-    is_silence = is_digital_silence(pcm, frame_size, st->channels, lsb_depth);
+    is_silence = oaci_is_digital_silence(pcm, frame_size, st->channels, lsb_depth);
 #ifndef DISABLE_FLOAT_API
     analysis_info.valid = 0;
 # ifdef FIXED_POINT
@@ -1166,12 +1166,12 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
     {
         analysis_read_pos_bak = st->analysis.read_pos;
         analysis_read_subframe_bak = st->analysis.read_subframe;
-        run_analysis(&st->analysis, celt_mode, analysis_pcm, analysis_size, frame_size,
+        oaci_run_analysis(&st->analysis, celt_mode, analysis_pcm, analysis_size, frame_size,
              c1, c2, analysis_channels, st->Fs,
-             lsb_depth, downmix, &analysis_info);
+             lsb_depth, oaci_downmix, &analysis_info);
 
     } else if (st->analysis.initialized) {
-        tonality_analysis_reset(&st->analysis);
+        oaci_tonality_analysis_reset(&st->analysis);
     }
 #else
     (void)analysis_pcm;
@@ -1179,7 +1179,7 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
     (void)c1;
     (void)c2;
     (void)analysis_channels;
-    (void)downmix;
+    (void)oaci_downmix;
 #endif
 
     /* Reset voice_ratio if this frame is not silent or if analysis is disabled.
@@ -1228,7 +1228,7 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
         }
     }
     if (st->channels == 2 && st->force_channels != 1)
-        stereo_width = compute_stereo_width(pcm, frame_size, st->Fs, &st->width_mem);
+        stereo_width = oaci_compute_stereo_width(pcm, frame_size, st->Fs, &st->width_mem);
     else
         stereo_width = 0;
     st->bitrate_bps = user_bitrate_to_bitrate(st, frame_size, max_data_bytes);
@@ -1454,7 +1454,7 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
      * is processed above as the requested mode shouldn't interrupt stereo->mono transition. */
     if (st->stream_channels == 1 && st->prev_channels == 2 && st->silk_mode.toMono == 0
         && st->mode != MODE_CELT_ONLY && st->prev_mode != MODE_CELT_ONLY) {
-        /* Delay stereo->mono transition by two frames so that SILK can do a smooth downmix */
+        /* Delay stereo->mono transition by two frames so that SILK can do a smooth oaci_downmix */
         st->silk_mode.toMono = 1;
         st->stream_channels = 2;
     } else {
@@ -1467,7 +1467,7 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
 
     if (st->mode != MODE_CELT_ONLY && st->prev_mode == MODE_CELT_ONLY) {
         silk_EncControlStruct dummy;
-        silk_InitEncoder( silk_enc, st->channels, st->arch, &dummy);
+        oaci_silk_InitEncoder( silk_enc, st->channels, st->arch, &dummy);
         prefill = 1;
     }
 
@@ -1667,10 +1667,10 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
 #ifndef DISABLE_FLOAT_API
             if (analysis_read_pos_bak != -1) {
                 /* Get analysis for current frame. */
-                tonality_get_info(&st->analysis, &analysis_info, enc_frame_size);
+                oaci_tonality_get_info(&st->analysis, &analysis_info, enc_frame_size);
             }
 #endif
-            is_silence = is_digital_silence(pcm + i*(st->channels*enc_frame_size), enc_frame_size, st->channels,
+            is_silence = oaci_is_digital_silence(pcm + i*(st->channels*enc_frame_size), enc_frame_size, st->channels,
             lsb_depth);
 
             tmp_len = oac_encode_frame_native(st, pcm + i*(st->channels*enc_frame_size), enc_frame_size, curr_data,
@@ -1826,13 +1826,13 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
 
     data += 1;
 
-    ec_enc_init(&enc, data, orig_max_data_bytes - 1);
+    oaci_ec_enc_init(&enc, data, orig_max_data_bytes - 1);
 
     ALLOC(pcm_buf, (total_buffer + frame_size)*st->channels, oac_res);
     OAC_COPY(pcm_buf, &st->delay_buffer[(st->encoder_buffer - total_buffer)*st->channels], total_buffer*st->channels);
 
     if (st->mode == MODE_CELT_ONLY)
-        hp_freq_smth1 = silk_LSHIFT( silk_lin2log( VARIABLE_HP_MIN_CUTOFF_HZ ), 8 );
+        hp_freq_smth1 = silk_LSHIFT( oaci_silk_lin2log( VARIABLE_HP_MIN_CUTOFF_HZ ), 8 );
     else
         hp_freq_smth1 = ((silk_encoder*)silk_enc)->state_Fxx[0].sCmn.variable_HP_smth1_Q15;
 
@@ -1840,7 +1840,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
           hp_freq_smth1 - st->variable_HP_smth2_Q15, SILK_FIX_CONST( VARIABLE_HP_SMTH_COEF2, 16 ));
 
     /* convert from log scale to Hertz */
-    cutoff_Hz = silk_log2lin( silk_RSHIFT( st->variable_HP_smth2_Q15, 8 ));
+    cutoff_Hz = oaci_silk_log2lin( silk_RSHIFT( st->variable_HP_smth2_Q15, 8 ));
 
     if (st->application == OAC_APPLICATION_VOIP) {
         hp_cutoff(pcm, cutoff_Hz, &pcm_buf[total_buffer*st->channels], st->hp_mem, frame_size, st->channels, st->Fs,
@@ -1868,7 +1868,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
 #ifndef FIXED_POINT
     if (float_api) {
         oac_val32 sum;
-        sum = celt_inner_prod(&pcm_buf[total_buffer*st->channels], &pcm_buf[total_buffer*st->channels],
+        sum = oaci_celt_inner_prod(&pcm_buf[total_buffer*st->channels], &pcm_buf[total_buffer*st->channels],
         frame_size*st->channels, st->arch);
         /* This should filter out both NaNs and ridiculous signals that could
            cause NaNs further down. */
@@ -1886,7 +1886,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
     if (st->dred_duration > 0 && st->dred_encoder.loaded) {
         int frame_size_400Hz;
         /* DRED Encoder */
-        dred_compute_latents( &st->dred_encoder, &pcm_buf[total_buffer*st->channels], frame_size, total_buffer,
+        oaci_dred_compute_latents( &st->dred_encoder, &pcm_buf[total_buffer*st->channels], frame_size, total_buffer,
         st->arch );
         frame_size_400Hz = frame_size*400/st->Fs;
         OAC_MOVE(&st->activity_mem[frame_size_400Hz], st->activity_mem, 4*DRED_MAX_FRAMES - frame_size_400Hz);
@@ -2047,13 +2047,13 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
                   0, Q15ONE, celt_mode->overlap, st->Fs/400, st->channels, celt_mode->window, st->Fs);
             OAC_CLEAR(st->delay_buffer, prefill_offset);
             pcm_silk = st->delay_buffer;
-            silk_Encode( silk_enc, &st->silk_mode, pcm_silk, st->encoder_buffer, NULL, &zero, prefill, activity );
+            oaci_silk_Encode( silk_enc, &st->silk_mode, pcm_silk, st->encoder_buffer, NULL, &zero, prefill, activity );
             /* Prevent a second switch in the real encode call. */
             st->silk_mode.oacCanSwitch = 0;
         }
 
         pcm_silk = pcm_buf + total_buffer*st->channels;
-        ret = silk_Encode( silk_enc, &st->silk_mode, pcm_silk, frame_size, &enc, &nBytes, 0, activity );
+        ret = oaci_silk_Encode( silk_enc, &st->silk_mode, pcm_silk, frame_size, &enc, &nBytes, 0, activity );
         if (ret) {
             /*fprintf (stderr, "SILK encode error: %d\n", ret);*/
             /* Handle error */
@@ -2189,10 +2189,10 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
     if (st->mode != MODE_CELT_ONLY && ec_tell(&enc) + 17 + 20*(st->mode == MODE_HYBRID) <= 8*(max_data_bytes - 1)) {
         /* For SILK mode, the redundancy is inferred from the length */
         if (st->mode == MODE_HYBRID)
-            ec_enc_bit_logp(&enc, redundancy, 12);
+            oaci_ec_enc_bit_logp(&enc, redundancy, 12);
         if (redundancy) {
             int max_redundancy;
-            ec_enc_bit_logp(&enc, celt_to_silk, 1);
+            oaci_ec_enc_bit_logp(&enc, celt_to_silk, 1);
             if (st->mode == MODE_HYBRID) {
                 /* Reserve the 8 bits needed for the redundancy length,
                    and at least a few bits for CELT if possible */
@@ -2204,7 +2204,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
             redundancy_bytes = IMIN(max_redundancy, redundancy_bytes);
             redundancy_bytes = IMIN(257, IMAX(2, redundancy_bytes));
             if (st->mode == MODE_HYBRID)
-                ec_enc_uint(&enc, redundancy_bytes - 2, 256);
+                oaci_ec_enc_uint(&enc, redundancy_bytes - 2, 256);
         }
     } else {
         redundancy = 0;
@@ -2218,7 +2218,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
 
     if (st->mode == MODE_SILK_ONLY) {
         ret = (ec_tell(&enc) + 7)>>3;
-        ec_enc_done(&enc);
+        oaci_ec_enc_done(&enc);
         nb_compr_bytes = ret;
     } else {
         nb_compr_bytes = (max_data_bytes - 1) - redundancy_bytes;
@@ -2235,7 +2235,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
             nb_compr_bytes = IMIN(nb_compr_bytes, max_celt_bytes);
         }
 #endif
-        ec_enc_shrink(&enc, nb_compr_bytes);
+        oaci_ec_enc_shrink(&enc, nb_compr_bytes);
     }
 
 #ifndef DISABLE_FLOAT_API
@@ -2255,7 +2255,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
         celt_encoder_ctl(celt_enc, CELT_SET_START_BAND(0));
         celt_encoder_ctl(celt_enc, OAC_SET_VBR(0));
         celt_encoder_ctl(celt_enc, OAC_SET_BITRATE(OAC_BITRATE_MAX));
-        err = celt_encode_with_ec(celt_enc, pcm_buf, st->Fs/200, data + nb_compr_bytes, redundancy_bytes, NULL);
+        err = oaci_celt_encode_with_ec(celt_enc, pcm_buf, st->Fs/200, data + nb_compr_bytes, redundancy_bytes, NULL);
         if (err < 0) {
             RESTORE_STACK;
             return OAC_INTERNAL_ERROR;
@@ -2299,12 +2299,12 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
             celt_encoder_ctl(celt_enc, OAC_RESET_STATE);
 
             /* Prefilling */
-            celt_encode_with_ec(celt_enc, tmp_prefill, st->Fs/400, dummy, 2, NULL);
+            oaci_celt_encode_with_ec(celt_enc, tmp_prefill, st->Fs/400, dummy, 2, NULL);
             celt_encoder_ctl(celt_enc, CELT_SET_PREDICTION(0));
         }
         /* If false, we already busted the budget and we'll end up with a "PLC frame" */
         if (ec_tell(&enc) <= 8*nb_compr_bytes) {
-            ret = celt_encode_with_ec(celt_enc, pcm_buf, frame_size, NULL, nb_compr_bytes, &enc);
+            ret = oaci_celt_encode_with_ec(celt_enc, pcm_buf, frame_size, NULL, nb_compr_bytes, &enc);
             if (ret < 0) {
                 RESTORE_STACK;
                 return OAC_INTERNAL_ERROR;
@@ -2337,12 +2337,12 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
         if (st->mode == MODE_HYBRID) {
             /* Shrink packet to what the encoder actually used. */
             nb_compr_bytes = ret;
-            ec_enc_shrink(&enc, nb_compr_bytes);
+            oaci_ec_enc_shrink(&enc, nb_compr_bytes);
         }
         /* NOTE: We could speed this up slightly (at the expense of code size) by just adding a function that prefills the buffer */
-        celt_encode_with_ec(celt_enc, pcm_buf + st->channels*(frame_size - N2 - N4), N4, dummy, 2, NULL);
+        oaci_celt_encode_with_ec(celt_enc, pcm_buf + st->channels*(frame_size - N2 - N4), N4, dummy, 2, NULL);
 
-        err = celt_encode_with_ec(celt_enc, pcm_buf + st->channels*(frame_size - N2), N2, data + nb_compr_bytes,
+        err = oaci_celt_encode_with_ec(celt_enc, pcm_buf + st->channels*(frame_size - N2), N2, data + nb_compr_bytes,
         redundancy_bytes, NULL);
         if (err < 0) {
             RESTORE_STACK;
@@ -2423,7 +2423,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
             buf[0] = 'D';
             buf[1] = DRED_EXPERIMENTAL_VERSION;
 # endif
-            dred_bytes = dred_encode_silk_frame(&st->dred_encoder, buf + DRED_EXPERIMENTAL_BYTES, dred_chunks,
+            dred_bytes = oaci_dred_encode_silk_frame(&st->dred_encoder, buf + DRED_EXPERIMENTAL_BYTES, dred_chunks,
             dred_bytes_left - DRED_EXPERIMENTAL_BYTES,
                                                st->dred_q0, st->dred_dQ, st->dred_qmax, st->activity_mem, st->arch);
             if (dred_bytes > 0) {
@@ -2465,7 +2465,7 @@ oac_int32 oac_encode(OacEncoder *st, const oac_int16 *pcm, int analysis_frame_si
     VARDECL(oac_res, in);
     ALLOC_STACK;
 
-    frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
+    frame_size = oaci_frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
     if (frame_size <= 0) {
         RESTORE_STACK;
         return OAC_BAD_ARG;
@@ -2475,7 +2475,7 @@ oac_int32 oac_encode(OacEncoder *st, const oac_int16 *pcm, int analysis_frame_si
     for (i = 0; i < frame_size*st->channels; i++)
         in[i] = INT16TORES(pcm[i]);
     ret = oac_encode_native(st, in, frame_size, data, max_data_bytes, 16,
-                            pcm, analysis_frame_size, 0, -2, st->channels, downmix_int, 1);
+                            pcm, analysis_frame_size, 0, -2, st->channels, oaci_downmix_int, 1);
     RESTORE_STACK;
     return ret;
 }
@@ -2484,9 +2484,9 @@ oac_int32 oac_encode(OacEncoder *st, const oac_int16 *pcm, int analysis_frame_si
 oac_int32 oac_encode24(OacEncoder *st, const oac_int32 *pcm, int analysis_frame_size,
                        unsigned char *data, oac_int32 max_data_bytes) {
     int frame_size;
-    frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
+    frame_size = oaci_frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
     return oac_encode_native(st, pcm, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH,
-                             pcm, analysis_frame_size, 0, -2, st->channels, downmix_int24, 0);
+                             pcm, analysis_frame_size, 0, -2, st->channels, oaci_downmix_int24, 0);
 }
 #else
 oac_int32 oac_encode24(OacEncoder *st, const oac_int32 *pcm, int analysis_frame_size,
@@ -2496,7 +2496,7 @@ oac_int32 oac_encode24(OacEncoder *st, const oac_int32 *pcm, int analysis_frame_
     VARDECL(oac_res, in);
     ALLOC_STACK;
 
-    frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
+    frame_size = oaci_frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
     if (frame_size <= 0) {
         RESTORE_STACK;
         return OAC_BAD_ARG;
@@ -2506,7 +2506,7 @@ oac_int32 oac_encode24(OacEncoder *st, const oac_int32 *pcm, int analysis_frame_
     for (i = 0; i < frame_size*st->channels; i++)
         in[i] = INT24TORES(pcm[i]);
     ret = oac_encode_native(st, in, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH,
-                            pcm, analysis_frame_size, 0, -2, st->channels, downmix_int24, 1);
+                            pcm, analysis_frame_size, 0, -2, st->channels, oaci_downmix_int24, 1);
     RESTORE_STACK;
     return ret;
 }
@@ -2519,9 +2519,9 @@ oac_int32 oac_encode24(OacEncoder *st, const oac_int32 *pcm, int analysis_frame_
 oac_int32 oac_encode_float(OacEncoder *st, const float *pcm, int analysis_frame_size,
                            unsigned char *data, oac_int32 out_data_bytes) {
     int frame_size;
-    frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
+    frame_size = oaci_frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
     return oac_encode_native(st, pcm, frame_size, data, out_data_bytes, MAX_ENCODING_DEPTH,
-                             pcm, analysis_frame_size, 0, -2, st->channels, downmix_float, 1);
+                             pcm, analysis_frame_size, 0, -2, st->channels, oaci_downmix_float, 1);
 }
 # else
 oac_int32 oac_encode_float(OacEncoder *st, const float *pcm, int analysis_frame_size,
@@ -2531,7 +2531,7 @@ oac_int32 oac_encode_float(OacEncoder *st, const float *pcm, int analysis_frame_
     VARDECL(oac_res, in);
     ALLOC_STACK;
 
-    frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
+    frame_size = oaci_frame_size_select(st->application, analysis_frame_size, st->variable_duration, st->Fs);
     if (frame_size <= 0) {
         RESTORE_STACK;
         return OAC_BAD_ARG;
@@ -2541,7 +2541,7 @@ oac_int32 oac_encode_float(OacEncoder *st, const float *pcm, int analysis_frame_
     for (i = 0; i < frame_size*st->channels; i++)
         in[i] = FLOAT2RES(pcm[i]);
     ret = oac_encode_native(st, in, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH,
-                            pcm, analysis_frame_size, 0, -2, st->channels, downmix_float, 1);
+                            pcm, analysis_frame_size, 0, -2, st->channels, oaci_downmix_float, 1);
     RESTORE_STACK;
     return ret;
 }
@@ -2968,7 +2968,7 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...) {
             char *start;
             silk_enc = (char*)st + st->silk_enc_offset;
 #ifndef DISABLE_FLOAT_API
-            tonality_analysis_reset(&st->analysis);
+            oaci_tonality_analysis_reset(&st->analysis);
 #endif
 
             start = (char*)&st->OAC_ENCODER_RESET_START;
@@ -2977,10 +2977,10 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...) {
             if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
                 celt_encoder_ctl(celt_enc, OAC_RESET_STATE);
             if (st->application != OAC_APPLICATION_RESTRICTED_CELT)
-                silk_InitEncoder( silk_enc, st->channels, st->arch, &dummy );
+                oaci_silk_InitEncoder( silk_enc, st->channels, st->arch, &dummy );
 #ifdef ENABLE_DRED
             /* Initialize DRED Encoder */
-            dred_encoder_reset( &st->dred_encoder );
+            oaci_dred_encoder_reset( &st->dred_encoder );
 #endif
             st->stream_channels = st->channels;
             st->hybrid_stereo_width_Q14 = 1<<14;
@@ -2988,7 +2988,7 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...) {
             st->first = 1;
             st->mode = MODE_HYBRID;
             st->bandwidth = OAC_BANDWIDTH_FULLBAND;
-            st->variable_HP_smth2_Q15 = silk_LSHIFT( silk_lin2log( VARIABLE_HP_MIN_CUTOFF_HZ ), 8 );
+            st->variable_HP_smth2_Q15 = silk_LSHIFT( oaci_silk_lin2log( VARIABLE_HP_MIN_CUTOFF_HZ ), 8 );
         }
         break;
         case OAC_SET_FORCE_MODE_REQUEST:
@@ -3047,7 +3047,7 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...) {
                 goto bad_arg;
             }
 # ifdef ENABLE_DRED
-            ret = dred_encoder_load_model(&st->dred_encoder, data, len);
+            ret = oaci_dred_encoder_load_model(&st->dred_encoder, data, len);
 # endif
         }
         break;
diff --git a/src/oac_multistream.c b/src/oac_multistream.c
index 24588f872..3e9dd2b84 100644
--- a/src/oac_multistream.c
+++ b/src/oac_multistream.c
@@ -38,7 +38,7 @@
 #include "os_support.h"
 
 
-int validate_layout(const ChannelLayout *layout) {
+int oaci_validate_layout(const ChannelLayout *layout) {
     int i, max_channel;
 
     max_channel = layout->nb_streams + layout->nb_coupled_streams;
@@ -52,7 +52,7 @@ int validate_layout(const ChannelLayout *layout) {
 }
 
 
-int get_left_channel(const ChannelLayout *layout, int stream_id, int prev) {
+int oaci_get_left_channel(const ChannelLayout *layout, int stream_id, int prev) {
     int i;
     i = (prev < 0) ? 0 : prev + 1;
     for (; i < layout->nb_channels; i++) {
@@ -62,7 +62,7 @@ int get_left_channel(const ChannelLayout *layout, int stream_id, int prev) {
     return -1;
 }
 
-int get_right_channel(const ChannelLayout *layout, int stream_id, int prev) {
+int oaci_get_right_channel(const ChannelLayout *layout, int stream_id, int prev) {
     int i;
     i = (prev < 0) ? 0 : prev + 1;
     for (; i < layout->nb_channels; i++) {
@@ -72,7 +72,7 @@ int get_right_channel(const ChannelLayout *layout, int stream_id, int prev) {
     return -1;
 }
 
-int get_mono_channel(const ChannelLayout *layout, int stream_id, int prev) {
+int oaci_get_mono_channel(const ChannelLayout *layout, int stream_id, int prev) {
     int i;
     i = (prev < 0) ? 0 : prev + 1;
     for (; i < layout->nb_channels; i++) {
diff --git a/src/oac_multistream_decoder.c b/src/oac_multistream_decoder.c
index 2e35851a6..192b70547 100644
--- a/src/oac_multistream_decoder.c
+++ b/src/oac_multistream_decoder.c
@@ -41,7 +41,7 @@
 
 #if defined(ENABLE_HARDENING) || defined(ENABLE_ASSERTIONS)
 static void validate_ms_decoder(OacMSDecoder *st) {
-    validate_layout(&st->layout);
+    oaci_validate_layout(&st->layout);
 }
 # define VALIDATE_MS_DECODER(st) validate_ms_decoder(st)
 #else
@@ -83,7 +83,7 @@ int oac_multistream_decoder_init(
 
     for (i = 0; i < st->layout.nb_channels; i++)
         st->layout.mapping[i] = mapping[i];
-    if (!validate_layout(&st->layout))
+    if (!oaci_validate_layout(&st->layout))
         return OAC_BAD_ARG;
 
     ptr = (char*)st + align(sizeof(OacMSDecoder));
@@ -242,14 +242,14 @@ int oac_multistream_decode_native(
             int chan, prev;
             prev = -1;
             /* Copy "left" audio to the channel(s) where it belongs */
-            while ((chan = get_left_channel(&st->layout, s, prev)) != -1) {
+            while ((chan = oaci_get_left_channel(&st->layout, s, prev)) != -1) {
                 (*copy_channel_out)(pcm, st->layout.nb_channels, chan,
                buf, 2, frame_size, user_data);
                 prev = chan;
             }
             prev = -1;
             /* Copy "right" audio to the channel(s) where it belongs */
-            while ((chan = get_right_channel(&st->layout, s, prev)) != -1) {
+            while ((chan = oaci_get_right_channel(&st->layout, s, prev)) != -1) {
                 (*copy_channel_out)(pcm, st->layout.nb_channels, chan,
                buf + 1, 2, frame_size, user_data);
                 prev = chan;
@@ -258,7 +258,7 @@ int oac_multistream_decode_native(
             int chan, prev;
             prev = -1;
             /* Copy audio to the channel(s) where it belongs */
-            while ((chan = get_mono_channel(&st->layout, s, prev)) != -1) {
+            while ((chan = oaci_get_mono_channel(&st->layout, s, prev)) != -1) {
                 (*copy_channel_out)(pcm, st->layout.nb_channels, chan,
                buf, 1, frame_size, user_data);
                 prev = chan;
diff --git a/src/oac_multistream_encoder.c b/src/oac_multistream_encoder.c
index 11df0bc7d..9efb8e134 100644
--- a/src/oac_multistream_encoder.c
+++ b/src/oac_multistream_encoder.c
@@ -111,7 +111,7 @@ static int validate_ambisonics(int nb_channels, int *nb_streams, int *nb_coupled
     if (nb_channels < 1 || nb_channels > 227)
         return 0;
 
-    order_plus_one = isqrt32(nb_channels);
+    order_plus_one = oaci_isqrt32(nb_channels);
     acn_channels = order_plus_one*order_plus_one;
     nondiegetic_channels = nb_channels - acn_channels;
 
@@ -129,12 +129,12 @@ static int validate_encoder_layout(const ChannelLayout *layout) {
     int s;
     for (s = 0; s < layout->nb_streams; s++) {
         if (s < layout->nb_coupled_streams) {
-            if (get_left_channel(layout, s, -1) == -1)
+            if (oaci_get_left_channel(layout, s, -1) == -1)
                 return 0;
-            if (get_right_channel(layout, s, -1) == -1)
+            if (oaci_get_right_channel(layout, s, -1) == -1)
                 return 0;
         } else {
-            if (get_mono_channel(layout, s, -1) == -1)
+            if (oaci_get_mono_channel(layout, s, -1) == -1)
                 return 0;
         }
     }
@@ -211,7 +211,7 @@ oac_val16 logSum(oac_val16 a, oac_val16 b) {
 }
 #endif
 
-void surround_analysis(const CELTMode *celt_mode, const void *pcm, celt_glog *bandLogE, oac_val32 *mem,
+void oaci_surround_analysis(const CELTMode *celt_mode, const void *pcm, celt_glog *bandLogE, oac_val32 *mem,
                        oac_val32 *preemph_mem,
                        int len, int overlap, int channels, int rate, oac_copy_channel_in_func copy_channel_in,
                        int arch) {
@@ -230,7 +230,7 @@ void surround_analysis(const CELTMode *celt_mode, const void *pcm, celt_glog *ba
     VARDECL(oac_val32, freq);
     SAVE_STACK;
 
-    upsample = resampling_factor(rate);
+    upsample = oaci_resampling_factor(rate);
     frame_size = len*upsample;
 
     /* LM = log2(frame_size / 120) */
@@ -256,11 +256,11 @@ void surround_analysis(const CELTMode *celt_mode, const void *pcm, celt_glog *ba
         celt_assert(nb_frames*freq_size == frame_size);
         OAC_COPY(in, mem + c*overlap, overlap);
         (*copy_channel_in)(x, 1, pcm, channels, c, len, NULL);
-        celt_preemphasis(x, in + overlap, frame_size, 1, upsample, celt_mode->preemph, preemph_mem + c, 0);
+        oaci_celt_preemphasis(x, in + overlap, frame_size, 1, upsample, celt_mode->preemph, preemph_mem + c, 0);
 #ifndef FIXED_POINT
         {
             oac_val32 sum;
-            sum = celt_inner_prod(in, in, frame_size + overlap, 0);
+            sum = oaci_celt_inner_prod(in, in, frame_size + overlap, 0);
             /* This should filter out both NaNs and ridiculous signals that could
                cause NaNs further down. */
             if (!(sum < 1e18f) || celt_isnan(sum)) {
@@ -272,7 +272,7 @@ void surround_analysis(const CELTMode *celt_mode, const void *pcm, celt_glog *ba
         OAC_CLEAR(bandE, 21);
         for (frame = 0; frame < nb_frames; frame++) {
             oac_val32 tmpE[21];
-            clt_mdct_forward(&celt_mode->mdct, in + freq_size*frame, freq, celt_mode->window,
+            oaci_clt_mdct_forward(&celt_mode->mdct, in + freq_size*frame, freq, celt_mode->window,
                overlap, celt_mode->maxLM - LM, 1, arch);
             if (upsample != 1) {
                 int bound = freq_size/upsample;
@@ -282,12 +282,12 @@ void surround_analysis(const CELTMode *celt_mode, const void *pcm, celt_glog *ba
                     freq[i] = 0;
             }
 
-            compute_band_energies(celt_mode, freq, tmpE, 21, 1, LM, arch);
+            oaci_compute_band_energies(celt_mode, freq, tmpE, 21, 1, LM, arch);
             /* If we have multiple frames, take the max energy. */
             for (i = 0; i < 21; i++)
                 bandE[i] = MAX32(bandE[i], tmpE[i]);
         }
-        amp2Log2(celt_mode, 21, 21, bandE, bandLogE + 21*c, 1);
+        oaci_amp2Log2(celt_mode, 21, 21, bandE, bandLogE + 21*c, 1);
         /* Apply spreading function with -6 dB/band going up and -12 dB/band going down. */
         for (i = 1; i < 21; i++)
             bandLogE[21*c + i] = MAXG(bandLogE[21*c + i], bandLogE[21*c + i - 1] - GCONST(1.f));
@@ -444,7 +444,7 @@ static int oac_multistream_encoder_init_impl(
     st->variable_duration = OAC_FRAMESIZE_ARG;
     for (i = 0; i < st->layout.nb_channels; i++)
         st->layout.mapping[i] = mapping[i];
-    if (!validate_layout(&st->layout))
+    if (!oaci_validate_layout(&st->layout))
         return OAC_BAD_ARG;
     if (!validate_encoder_layout(&st->layout))
         return OAC_BAD_ARG;
@@ -766,7 +766,7 @@ int oac_multistream_encode_native
     unsigned char *data,
     oac_int32 max_data_bytes,
     int lsb_depth,
-    downmix_func downmix,
+    downmix_func oaci_downmix,
     int float_api,
     void *user_data) {
     oac_int32 Fs;
@@ -801,7 +801,7 @@ int oac_multistream_encode_native
     if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
         oac_encoder_ctl((OacEncoder*)ptr, CELT_GET_MODE(&celt_mode));
 
-    frame_size = frame_size_select(st->application, analysis_frame_size, st->variable_duration, Fs);
+    frame_size = oaci_frame_size_select(st->application, analysis_frame_size, st->variable_duration, Fs);
     if (frame_size <= 0) {
         RESTORE_STACK;
         return OAC_BAD_ARG;
@@ -822,7 +822,7 @@ int oac_multistream_encode_native
 
     ALLOC(bandSMR, 21*st->layout.nb_channels, celt_glog);
     if (st->mapping_type == MAPPING_TYPE_SURROUND && st->application != OAC_APPLICATION_RESTRICTED_SILK) {
-        surround_analysis(celt_mode, pcm, bandSMR, mem, preemph_mem, frame_size, celt_mode->overlap,
+        oaci_surround_analysis(celt_mode, pcm, bandSMR, mem, preemph_mem, frame_size, celt_mode->overlap,
         st->layout.nb_channels, Fs, copy_channel_in, st->arch);
     }
 
@@ -884,8 +884,8 @@ int oac_multistream_encode_native
         if (s < st->layout.nb_coupled_streams) {
             int i;
             int left, right;
-            left = get_left_channel(&st->layout, s, -1);
-            right = get_right_channel(&st->layout, s, -1);
+            left = oaci_get_left_channel(&st->layout, s, -1);
+            right = oaci_get_right_channel(&st->layout, s, -1);
             (*copy_channel_in)(buf, 2,
             pcm, st->layout.nb_channels, left, frame_size, user_data);
             (*copy_channel_in)(buf + 1, 2,
@@ -901,7 +901,7 @@ int oac_multistream_encode_native
             c2 = right;
         } else {
             int i;
-            int chan = get_mono_channel(&st->layout, s, -1);
+            int chan = oaci_get_mono_channel(&st->layout, s, -1);
             (*copy_channel_in)(buf, 1,
             pcm, st->layout.nb_channels, chan, frame_size, user_data);
             ptr += align(mono_size);
@@ -927,7 +927,7 @@ int oac_multistream_encode_native
         if (!vbr && s == st->layout.nb_streams - 1)
             oac_encoder_ctl(enc, OAC_SET_BITRATE(bits_to_bitrate(curr_max*8, Fs, frame_size)));
         len = oac_encode_native(enc, buf, frame_size, tmp_data, curr_max, lsb_depth,
-            pcm, analysis_frame_size, c1, c2, st->layout.nb_channels, downmix, float_api);
+            pcm, analysis_frame_size, c1, c2, st->layout.nb_channels, oaci_downmix, float_api);
         if (len < 0) {
             RESTORE_STACK;
             return len;
@@ -1010,7 +1010,7 @@ int oac_multistream_encode(
     unsigned char *data,
     oac_int32 max_data_bytes) {
     return oac_multistream_encode_native(st, oac_copy_channel_in_short,
-      pcm, frame_size, data, max_data_bytes, 16, downmix_int, 0, NULL);
+      pcm, frame_size, data, max_data_bytes, 16, oaci_downmix_int, 0, NULL);
 }
 
 int oac_multistream_encode24(
@@ -1020,7 +1020,7 @@ int oac_multistream_encode24(
     unsigned char *data,
     oac_int32 max_data_bytes) {
     return oac_multistream_encode_native(st, oac_copy_channel_in_int24,
-      pcm, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH, downmix_int24, 0, NULL);
+      pcm, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH, oaci_downmix_int24, 0, NULL);
 }
 
 #ifndef DISABLE_FLOAT_API
@@ -1031,7 +1031,7 @@ int oac_multistream_encode_float(
     unsigned char *data,
     oac_int32 max_data_bytes) {
     return oac_multistream_encode_native(st, oac_copy_channel_in_float,
-      pcm, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH, downmix_float, 1, NULL);
+      pcm, frame_size, data, max_data_bytes, MAX_ENCODING_DEPTH, oaci_downmix_float, 1, NULL);
 }
 #endif
 
diff --git a/src/oac_private.h b/src/oac_private.h
index d503c4bcd..bcb13a789 100644
--- a/src/oac_private.h
+++ b/src/oac_private.h
@@ -120,10 +120,10 @@ int oac_multistream_encoder_ctl_va_list(struct OacMSEncoder *st, int request,
 int oac_multistream_decoder_ctl_va_list(struct OacMSDecoder *st, int request,
     va_list ap);
 
-int validate_layout(const ChannelLayout *layout);
-int get_left_channel(const ChannelLayout *layout, int stream_id, int prev);
-int get_right_channel(const ChannelLayout *layout, int stream_id, int prev);
-int get_mono_channel(const ChannelLayout *layout, int stream_id, int prev);
+int oaci_validate_layout(const ChannelLayout *layout);
+int oaci_get_left_channel(const ChannelLayout *layout, int stream_id, int prev);
+int oaci_get_right_channel(const ChannelLayout *layout, int stream_id, int prev);
+int oaci_get_mono_channel(const ChannelLayout *layout, int stream_id, int prev);
 
 typedef void (*oac_copy_channel_in_func)(
     oac_res *dst,
@@ -171,21 +171,21 @@ typedef void (*oac_copy_channel_out_func)(
 #define OAC_SET_FORCE_MODE(x) OAC_SET_FORCE_MODE_REQUEST, oac_check_int(x)
 
 typedef void (*downmix_func)(const void *, oac_val32 *, int, int, int, int, int);
-void downmix_float(const void *_x, oac_val32 *sub, int subframe, int offset, int c1, int c2, int C);
-void downmix_int(const void *_x, oac_val32 *sub, int subframe, int offset, int c1, int c2, int C);
-void downmix_int24(const void *_x, oac_val32 *sub, int subframe, int offset, int c1, int c2, int C);
-int is_digital_silence(const oac_res* pcm, int frame_size, int channels, int lsb_depth);
+void oaci_downmix_float(const void *_x, oac_val32 *sub, int subframe, int offset, int c1, int c2, int C);
+void oaci_downmix_int(const void *_x, oac_val32 *sub, int subframe, int offset, int c1, int c2, int C);
+void oaci_downmix_int24(const void *_x, oac_val32 *sub, int subframe, int offset, int c1, int c2, int C);
+int oaci_is_digital_silence(const oac_res* pcm, int frame_size, int channels, int lsb_depth);
 
 void oac_pcm_soft_clip_impl(float *_x, int N, int C, float *declip_mem, int arch);
 
-int encode_size(int size, unsigned char *data);
+int oaci_encode_size(int size, unsigned char *data);
 
-oac_int32 frame_size_select(int application, oac_int32 frame_size, int variable_duration, oac_int32 Fs);
+oac_int32 oaci_frame_size_select(int application, oac_int32 frame_size, int variable_duration, oac_int32 Fs);
 
 oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
     unsigned char *data, oac_int32 out_data_bytes, int lsb_depth,
     const void *analysis_pcm, oac_int32 analysis_size, int c1, int c2,
-    int analysis_channels, downmix_func downmix, int float_api);
+    int analysis_channels, downmix_func oaci_downmix, int float_api);
 
 int oac_decode_native(OacDecoder *st, const unsigned char *data, oac_int32 len,
     oac_res *pcm, int frame_size, int decode_fec, int self_delimited,
@@ -222,7 +222,7 @@ int oac_multistream_encode_native(
     unsigned char *data,
     oac_int32 max_data_bytes,
     int lsb_depth,
-    downmix_func downmix,
+    downmix_func oaci_downmix,
     int float_api,
     void *user_data);
 
diff --git a/src/oac_projection_decoder.c b/src/oac_projection_decoder.c
index 44b009c39..9b471291e 100644
--- a/src/oac_projection_decoder.c
+++ b/src/oac_projection_decoder.c
@@ -61,7 +61,7 @@ static void oac_projection_copy_channel_out_float(
         OAC_CLEAR(float_dst, frame_size*dst_stride);
 
     if (src != NULL)
-        mapping_matrix_multiply_channel_out_float(matrix, src, dst_channel,
+        oaci_mapping_matrix_multiply_channel_out_float(matrix, src, dst_channel,
       src_stride, float_dst, dst_stride, frame_size);
 }
 #endif
@@ -82,7 +82,7 @@ static void oac_projection_copy_channel_out_short(
         OAC_CLEAR(short_dst, frame_size*dst_stride);
 
     if (src != NULL)
-        mapping_matrix_multiply_channel_out_short(matrix, src, dst_channel,
+        oaci_mapping_matrix_multiply_channel_out_short(matrix, src, dst_channel,
       src_stride, short_dst, dst_stride, frame_size);
 }
 
@@ -102,7 +102,7 @@ static void oac_projection_copy_channel_out_int24(
         OAC_CLEAR(short_dst, frame_size*dst_stride);
 
     if (src != NULL)
-        mapping_matrix_multiply_channel_out_int24(matrix, src, dst_channel,
+        oaci_mapping_matrix_multiply_channel_out_int24(matrix, src, dst_channel,
       src_stride, short_dst, dst_stride, frame_size);
 }
 
@@ -125,7 +125,7 @@ oac_int32 oac_projection_decoder_get_size(int channels, int streams,
     oac_int32 decoder_size;
 
     matrix_size =
-        mapping_matrix_get_size(streams + coupled_streams, channels);
+        oaci_mapping_matrix_get_size(streams + coupled_streams, channels);
     if (!matrix_size)
         return 0;
 
@@ -164,13 +164,13 @@ int oac_projection_decoder_init(OacProjectionDecoder *st, oac_int32 Fs,
 
     /* Assign demixing matrix. */
     st->demixing_matrix_size_in_bytes =
-        mapping_matrix_get_size(channels, nb_input_streams);
+        oaci_mapping_matrix_get_size(channels, nb_input_streams);
     if (!st->demixing_matrix_size_in_bytes) {
         RESTORE_STACK;
         return OAC_BAD_ARG;
     }
 
-    mapping_matrix_init(get_dec_demixing_matrix(st), channels, nb_input_streams, 0,
+    oaci_mapping_matrix_init(get_dec_demixing_matrix(st), channels, nb_input_streams, 0,
     buf, demixing_matrix_size);
 
     /* Set trivial mapping so each input channel pairs with a matrix column. */
diff --git a/src/oac_projection_encoder.c b/src/oac_projection_encoder.c
index eacf11421..6df632d9f 100644
--- a/src/oac_projection_encoder.c
+++ b/src/oac_projection_encoder.c
@@ -53,7 +53,7 @@ static void oac_projection_copy_channel_in_float(
     int src_channel,
     int frame_size,
     void *user_data)                  {
-    mapping_matrix_multiply_channel_in_float((const MappingMatrix*)user_data,
+    oaci_mapping_matrix_multiply_channel_in_float((const MappingMatrix*)user_data,
         (const float*)src, src_stride, dst, src_channel, dst_stride, frame_size);
 }
 #endif
@@ -66,7 +66,7 @@ static void oac_projection_copy_channel_in_short(
     int src_channel,
     int frame_size,
     void *user_data)                  {
-    mapping_matrix_multiply_channel_in_short((const MappingMatrix*)user_data,
+    oaci_mapping_matrix_multiply_channel_in_short((const MappingMatrix*)user_data,
         (const oac_int16*)src, src_stride, dst, src_channel, dst_stride, frame_size);
 }
 
@@ -78,7 +78,7 @@ static void oac_projection_copy_channel_in_int24(
     int src_channel,
     int frame_size,
     void *user_data)                  {
-    mapping_matrix_multiply_channel_in_int24((const MappingMatrix*)user_data,
+    oaci_mapping_matrix_multiply_channel_in_int24((const MappingMatrix*)user_data,
         (const oac_int32*)src, src_stride, dst, src_channel, dst_stride, frame_size);
 }
 
@@ -93,7 +93,7 @@ static int get_order_plus_one_from_channels(int channels, int *order_plus_one) {
     if (channels < 1 || channels > 227)
         return OAC_BAD_ARG;
 
-    order_plus_one_ = isqrt32(channels);
+    order_plus_one_ = oaci_isqrt32(channels);
     acn_channels = order_plus_one_*order_plus_one_;
     nondiegetic_channels = channels - acn_channels;
     if (nondiegetic_channels != 0 && nondiegetic_channels != 2)
@@ -157,40 +157,40 @@ oac_int32 oac_projection_ambisonics_encoder_get_size(int channels,
         return 0;
 
     if (order_plus_one == 2) {
-        mixing_matrix_rows = mapping_matrix_foa_mixing.rows;
-        mixing_matrix_cols = mapping_matrix_foa_mixing.cols;
-        demixing_matrix_rows = mapping_matrix_foa_demixing.rows;
-        demixing_matrix_cols = mapping_matrix_foa_demixing.cols;
+        mixing_matrix_rows = oaci_mapping_matrix_foa_mixing.rows;
+        mixing_matrix_cols = oaci_mapping_matrix_foa_mixing.cols;
+        demixing_matrix_rows = oaci_mapping_matrix_foa_demixing.rows;
+        demixing_matrix_cols = oaci_mapping_matrix_foa_demixing.cols;
     } else if (order_plus_one == 3)   {
-        mixing_matrix_rows = mapping_matrix_soa_mixing.rows;
-        mixing_matrix_cols = mapping_matrix_soa_mixing.cols;
-        demixing_matrix_rows = mapping_matrix_soa_demixing.rows;
-        demixing_matrix_cols = mapping_matrix_soa_demixing.cols;
+        mixing_matrix_rows = oaci_mapping_matrix_soa_mixing.rows;
+        mixing_matrix_cols = oaci_mapping_matrix_soa_mixing.cols;
+        demixing_matrix_rows = oaci_mapping_matrix_soa_demixing.rows;
+        demixing_matrix_cols = oaci_mapping_matrix_soa_demixing.cols;
     } else if (order_plus_one == 4)   {
-        mixing_matrix_rows = mapping_matrix_toa_mixing.rows;
-        mixing_matrix_cols = mapping_matrix_toa_mixing.cols;
-        demixing_matrix_rows = mapping_matrix_toa_demixing.rows;
-        demixing_matrix_cols = mapping_matrix_toa_demixing.cols;
+        mixing_matrix_rows = oaci_mapping_matrix_toa_mixing.rows;
+        mixing_matrix_cols = oaci_mapping_matrix_toa_mixing.cols;
+        demixing_matrix_rows = oaci_mapping_matrix_toa_demixing.rows;
+        demixing_matrix_cols = oaci_mapping_matrix_toa_demixing.cols;
     } else if (order_plus_one == 5)   {
-        mixing_matrix_rows = mapping_matrix_fourthoa_mixing.rows;
-        mixing_matrix_cols = mapping_matrix_fourthoa_mixing.cols;
-        demixing_matrix_rows = mapping_matrix_fourthoa_demixing.rows;
-        demixing_matrix_cols = mapping_matrix_fourthoa_demixing.cols;
+        mixing_matrix_rows = oaci_mapping_matrix_fourthoa_mixing.rows;
+        mixing_matrix_cols = oaci_mapping_matrix_fourthoa_mixing.cols;
+        demixing_matrix_rows = oaci_mapping_matrix_fourthoa_demixing.rows;
+        demixing_matrix_cols = oaci_mapping_matrix_fourthoa_demixing.cols;
     } else if (order_plus_one == 6)   {
-        mixing_matrix_rows = mapping_matrix_fifthoa_mixing.rows;
-        mixing_matrix_cols = mapping_matrix_fifthoa_mixing.cols;
-        demixing_matrix_rows = mapping_matrix_fifthoa_demixing.rows;
-        demixing_matrix_cols = mapping_matrix_fifthoa_demixing.cols;
+        mixing_matrix_rows = oaci_mapping_matrix_fifthoa_mixing.rows;
+        mixing_matrix_cols = oaci_mapping_matrix_fifthoa_mixing.cols;
+        demixing_matrix_rows = oaci_mapping_matrix_fifthoa_demixing.rows;
+        demixing_matrix_cols = oaci_mapping_matrix_fifthoa_demixing.cols;
     } else
         return 0;
 
     mixing_matrix_size =
-        mapping_matrix_get_size(mixing_matrix_rows, mixing_matrix_cols);
+        oaci_mapping_matrix_get_size(mixing_matrix_rows, mixing_matrix_cols);
     if (!mixing_matrix_size)
         return 0;
 
     demixing_matrix_size =
-        mapping_matrix_get_size(demixing_matrix_rows, demixing_matrix_cols);
+        oaci_mapping_matrix_get_size(demixing_matrix_rows, demixing_matrix_cols);
     if (!demixing_matrix_size)
         return 0;
 
@@ -227,34 +227,34 @@ int oac_projection_ambisonics_encoder_init(OacProjectionEncoder *st, oac_int32 F
         /* Assign mixing matrix based on available pre-computed matrices. */
         mixing_matrix = get_mixing_matrix(st);
         if (order_plus_one == 2) {
-            mapping_matrix_init(mixing_matrix, mapping_matrix_foa_mixing.rows,
-        mapping_matrix_foa_mixing.cols, mapping_matrix_foa_mixing.gain,
-        mapping_matrix_foa_mixing_data,
-        sizeof(mapping_matrix_foa_mixing_data));
+            oaci_mapping_matrix_init(mixing_matrix, oaci_mapping_matrix_foa_mixing.rows,
+        oaci_mapping_matrix_foa_mixing.cols, oaci_mapping_matrix_foa_mixing.gain,
+        oaci_mapping_matrix_foa_mixing_data,
+        sizeof(oaci_mapping_matrix_foa_mixing_data));
         } else if (order_plus_one == 3)   {
-            mapping_matrix_init(mixing_matrix, mapping_matrix_soa_mixing.rows,
-        mapping_matrix_soa_mixing.cols, mapping_matrix_soa_mixing.gain,
-        mapping_matrix_soa_mixing_data,
-        sizeof(mapping_matrix_soa_mixing_data));
+            oaci_mapping_matrix_init(mixing_matrix, oaci_mapping_matrix_soa_mixing.rows,
+        oaci_mapping_matrix_soa_mixing.cols, oaci_mapping_matrix_soa_mixing.gain,
+        oaci_mapping_matrix_soa_mixing_data,
+        sizeof(oaci_mapping_matrix_soa_mixing_data));
         } else if (order_plus_one == 4)   {
-            mapping_matrix_init(mixing_matrix, mapping_matrix_toa_mixing.rows,
-        mapping_matrix_toa_mixing.cols, mapping_matrix_toa_mixing.gain,
-        mapping_matrix_toa_mixing_data,
-        sizeof(mapping_matrix_toa_mixing_data));
+            oaci_mapping_matrix_init(mixing_matrix, oaci_mapping_matrix_toa_mixing.rows,
+        oaci_mapping_matrix_toa_mixing.cols, oaci_mapping_matrix_toa_mixing.gain,
+        oaci_mapping_matrix_toa_mixing_data,
+        sizeof(oaci_mapping_matrix_toa_mixing_data));
         } else if (order_plus_one == 5)   {
-            mapping_matrix_init(mixing_matrix, mapping_matrix_fourthoa_mixing.rows,
-        mapping_matrix_fourthoa_mixing.cols, mapping_matrix_fourthoa_mixing.gain,
-        mapping_matrix_fourthoa_mixing_data,
-        sizeof(mapping_matrix_fourthoa_mixing_data));
+            oaci_mapping_matrix_init(mixing_matrix, oaci_mapping_matrix_fourthoa_mixing.rows,
+        oaci_mapping_matrix_fourthoa_mixing.cols, oaci_mapping_matrix_fourthoa_mixing.gain,
+        oaci_mapping_matrix_fourthoa_mixing_data,
+        sizeof(oaci_mapping_matrix_fourthoa_mixing_data));
         } else if (order_plus_one == 6)   {
-            mapping_matrix_init(mixing_matrix, mapping_matrix_fifthoa_mixing.rows,
-        mapping_matrix_fifthoa_mixing.cols, mapping_matrix_fifthoa_mixing.gain,
-        mapping_matrix_fifthoa_mixing_data,
-        sizeof(mapping_matrix_fifthoa_mixing_data));
+            oaci_mapping_matrix_init(mixing_matrix, oaci_mapping_matrix_fifthoa_mixing.rows,
+        oaci_mapping_matrix_fifthoa_mixing.cols, oaci_mapping_matrix_fifthoa_mixing.gain,
+        oaci_mapping_matrix_fifthoa_mixing_data,
+        sizeof(oaci_mapping_matrix_fifthoa_mixing_data));
         } else
             return OAC_BAD_ARG;
 
-        st->mixing_matrix_size_in_bytes = mapping_matrix_get_size(
+        st->mixing_matrix_size_in_bytes = oaci_mapping_matrix_get_size(
       mixing_matrix->rows, mixing_matrix->cols);
         if (!st->mixing_matrix_size_in_bytes)
             return OAC_BAD_ARG;
@@ -262,34 +262,34 @@ int oac_projection_ambisonics_encoder_init(OacProjectionEncoder *st, oac_int32 F
         /* Assign demixing matrix based on available pre-computed matrices. */
         demixing_matrix = get_enc_demixing_matrix(st);
         if (order_plus_one == 2) {
-            mapping_matrix_init(demixing_matrix, mapping_matrix_foa_demixing.rows,
-        mapping_matrix_foa_demixing.cols, mapping_matrix_foa_demixing.gain,
-        mapping_matrix_foa_demixing_data,
-        sizeof(mapping_matrix_foa_demixing_data));
+            oaci_mapping_matrix_init(demixing_matrix, oaci_mapping_matrix_foa_demixing.rows,
+        oaci_mapping_matrix_foa_demixing.cols, oaci_mapping_matrix_foa_demixing.gain,
+        oaci_mapping_matrix_foa_demixing_data,
+        sizeof(oaci_mapping_matrix_foa_demixing_data));
         } else if (order_plus_one == 3)   {
-            mapping_matrix_init(demixing_matrix, mapping_matrix_soa_demixing.rows,
-        mapping_matrix_soa_demixing.cols, mapping_matrix_soa_demixing.gain,
-        mapping_matrix_soa_demixing_data,
-        sizeof(mapping_matrix_soa_demixing_data));
+            oaci_mapping_matrix_init(demixing_matrix, oaci_mapping_matrix_soa_demixing.rows,
+        oaci_mapping_matrix_soa_demixing.cols, oaci_mapping_matrix_soa_demixing.gain,
+        oaci_mapping_matrix_soa_demixing_data,
+        sizeof(oaci_mapping_matrix_soa_demixing_data));
         } else if (order_plus_one == 4)   {
-            mapping_matrix_init(demixing_matrix, mapping_matrix_toa_demixing.rows,
-        mapping_matrix_toa_demixing.cols, mapping_matrix_toa_demixing.gain,
-        mapping_matrix_toa_demixing_data,
-        sizeof(mapping_matrix_toa_demixing_data));
+            oaci_mapping_matrix_init(demixing_matrix, oaci_mapping_matrix_toa_demixing.rows,
+        oaci_mapping_matrix_toa_demixing.cols, oaci_mapping_matrix_toa_demixing.gain,
+        oaci_mapping_matrix_toa_demixing_data,
+        sizeof(oaci_mapping_matrix_toa_demixing_data));
         } else if (order_plus_one == 5) {
-            mapping_matrix_init(demixing_matrix, mapping_matrix_fourthoa_demixing.rows,
-        mapping_matrix_fourthoa_demixing.cols, mapping_matrix_fourthoa_demixing.gain,
-        mapping_matrix_fourthoa_demixing_data,
-        sizeof(mapping_matrix_fourthoa_demixing_data));
+            oaci_mapping_matrix_init(demixing_matrix, oaci_mapping_matrix_fourthoa_demixing.rows,
+        oaci_mapping_matrix_fourthoa_demixing.cols, oaci_mapping_matrix_fourthoa_demixing.gain,
+        oaci_mapping_matrix_fourthoa_demixing_data,
+        sizeof(oaci_mapping_matrix_fourthoa_demixing_data));
         } else if (order_plus_one == 6)   {
-            mapping_matrix_init(demixing_matrix, mapping_matrix_fifthoa_demixing.rows,
-        mapping_matrix_fifthoa_demixing.cols, mapping_matrix_fifthoa_demixing.gain,
-        mapping_matrix_fifthoa_demixing_data,
-        sizeof(mapping_matrix_fifthoa_demixing_data));
+            oaci_mapping_matrix_init(demixing_matrix, oaci_mapping_matrix_fifthoa_demixing.rows,
+        oaci_mapping_matrix_fifthoa_demixing.cols, oaci_mapping_matrix_fifthoa_demixing.gain,
+        oaci_mapping_matrix_fifthoa_demixing_data,
+        sizeof(oaci_mapping_matrix_fifthoa_demixing_data));
         } else
             return OAC_BAD_ARG;
 
-        st->demixing_matrix_size_in_bytes = mapping_matrix_get_size(
+        st->demixing_matrix_size_in_bytes = oaci_mapping_matrix_get_size(
       demixing_matrix->rows, demixing_matrix->cols);
         if (!st->demixing_matrix_size_in_bytes)
             return OAC_BAD_ARG;
@@ -352,7 +352,7 @@ int oac_projection_encode(OacProjectionEncoder *st, const oac_int16 *pcm,
                           oac_int32 max_data_bytes) {
     return oac_multistream_encode_native(get_multistream_encoder(st),
     oac_projection_copy_channel_in_short, pcm, frame_size, data,
-    max_data_bytes, 16, downmix_int, 0, get_mixing_matrix(st));
+    max_data_bytes, 16, oaci_downmix_int, 0, get_mixing_matrix(st));
 }
 
 int oac_projection_encode24(OacProjectionEncoder *st, const oac_int32 *pcm,
@@ -360,7 +360,7 @@ int oac_projection_encode24(OacProjectionEncoder *st, const oac_int32 *pcm,
                             oac_int32 max_data_bytes) {
     return oac_multistream_encode_native(get_multistream_encoder(st),
     oac_projection_copy_channel_in_int24, pcm, frame_size, data,
-    max_data_bytes, MAX_ENCODING_DEPTH, downmix_int, 0, get_mixing_matrix(st));
+    max_data_bytes, MAX_ENCODING_DEPTH, oaci_downmix_int, 0, get_mixing_matrix(st));
 }
 
 #ifndef DISABLE_FLOAT_API
@@ -369,7 +369,7 @@ int oac_projection_encode_float(OacProjectionEncoder *st, const float *pcm,
                                 oac_int32 max_data_bytes) {
     return oac_multistream_encode_native(get_multistream_encoder(st),
     oac_projection_copy_channel_in_float, pcm, frame_size, data,
-    max_data_bytes, MAX_ENCODING_DEPTH, downmix_float, 1, get_mixing_matrix(st));
+    max_data_bytes, MAX_ENCODING_DEPTH, oaci_downmix_float, 1, get_mixing_matrix(st));
 }
 #endif
 
@@ -428,7 +428,7 @@ int oac_projection_encoder_ctl(OacProjectionEncoder *st, int request, ...) {
             if (!external_char) {
                 goto bad_arg;
             }
-            internal_short = mapping_matrix_get_data(demixing_matrix);
+            internal_short = oaci_mapping_matrix_get_data(demixing_matrix);
             internal_size = nb_input_streams*nb_output_streams*sizeof(oac_int16);
             if (external_size != internal_size) {
                 goto bad_arg;
diff --git a/src/qext_compare.c b/src/qext_compare.c
index a04c89376..cc4417590 100644
--- a/src/qext_compare.c
+++ b/src/qext_compare.c
@@ -139,14 +139,14 @@ static void band_energy(float *_out, float *_ps, const int *_bands, int _nbands,
     int xj;
     int ps_sz;
     mini_kiss_fft_cpx X[2][NFREQS + 1];
-    mini_kiss_fftr_cfg kfft;
+    mini_kiss_fftr_cfg oaci_kfft;
     ps_sz = _window_sz/2;
     /* Blackman-Harris window. */
     for (xj = 0; xj < _window_sz; xj++) {
         double n = (xj + .5)/_window_sz;
         window[xj] = 0.35875 - 0.48829*cos(2*OAC_PI*n) + 0.14128*cos(4*OAC_PI*n) - 0.01168*cos(6*OAC_PI*n);
     }
-    kfft = mini_kiss_fftr_alloc(_window_sz, 0, NULL, NULL);
+    oaci_kfft = mini_kiss_fftr_alloc(_window_sz, 0, NULL, NULL);
     for (xi = 0; xi < _nframes; xi++) {
         int ci;
         int xk;
@@ -155,7 +155,7 @@ static void band_energy(float *_out, float *_ps, const int *_bands, int _nbands,
             for (xk = 0; xk < _window_sz; xk++) {
                 x[xk] = window[xk]*_in[(xi*_step + xk)*_nchannels + ci];
             }
-            mini_kiss_fftr(kfft, x, X[ci]);
+            mini_kiss_fftr(oaci_kfft, x, X[ci]);
         }
         for (bi = xj = 0; bi < _nbands; bi++) {
             float p[2] = {0};
@@ -177,7 +177,7 @@ static void band_energy(float *_out, float *_ps, const int *_bands, int _nbands,
             }
         }
     }
-    free(kfft);
+    free(oaci_kfft);
 }
 
 
diff --git a/src/repacketizer.c b/src/repacketizer.c
index 35603227d..73a037160 100644
--- a/src/repacketizer.c
+++ b/src/repacketizer.c
@@ -187,7 +187,7 @@ oac_int32 oac_repacketizer_out_range_impl(OacRepacketizer *rp, int begin, int en
                 return OAC_BUFFER_TOO_SMALL;
             }
             *ptr++ = (rp->toc&0xFC)|0x2;
-            ptr += encode_size(len[0], ptr);
+            ptr += oaci_encode_size(len[0], ptr);
         }
     }
     if (count > 2 || (pad && tot_size < maxlen) || ext_count > 0) {
@@ -257,11 +257,11 @@ oac_int32 oac_repacketizer_out_range_impl(OacRepacketizer *rp, int begin, int en
         }
         if (vbr) {
             for (i = 0; i < count - 1; i++)
-                ptr += encode_size(len[i], ptr);
+                ptr += oaci_encode_size(len[i], ptr);
         }
     }
     if (self_delimited) {
-        int sdlen = encode_size(len[count - 1], ptr);
+        int sdlen = oaci_encode_size(len[count - 1], ptr);
         ptr += sdlen;
     }
     /* Copy the actual data */
diff --git a/tests/test_oac_projection.c b/tests/test_oac_projection.c
index 59e871dfa..9f6f92c24 100644
--- a/tests/test_oac_projection.c
+++ b/tests/test_oac_projection.c
@@ -98,13 +98,13 @@ void test_simple_matrix(void) {
     output_pcm = (oac_res *)oac_alloc(sizeof(oac_res)*SIMPLE_MATRIX_OUTPUT_SIZE);
 
     /* Initialize matrix */
-    simple_matrix_size = mapping_matrix_get_size(simple_matrix_params.rows,
+    simple_matrix_size = oaci_mapping_matrix_get_size(simple_matrix_params.rows,
     simple_matrix_params.cols);
     if (!simple_matrix_size)
         test_failed();
 
     simple_matrix = (MappingMatrix *)oac_alloc(simple_matrix_size);
-    mapping_matrix_init(simple_matrix, simple_matrix_params.rows,
+    oaci_mapping_matrix_init(simple_matrix, simple_matrix_params.rows,
     simple_matrix_params.cols, simple_matrix_params.gain, simple_matrix_data,
     sizeof(simple_matrix_data));
 
@@ -117,7 +117,7 @@ void test_simple_matrix(void) {
     for (i = 0; i < SIMPLE_MATRIX_OUTPUT_SIZE; i++)
         output_pcm[i] = 0;
     for (i = 0; i < simple_matrix->rows; i++) {
-        mapping_matrix_multiply_channel_in_short(simple_matrix,
+        oaci_mapping_matrix_multiply_channel_in_short(simple_matrix,
       input_int16, simple_matrix->cols, &output_pcm[i], i,
       simple_matrix->rows, SIMPLE_MATRIX_FRAME_SIZE);
     }
@@ -129,7 +129,7 @@ void test_simple_matrix(void) {
     for (i = 0; i < SIMPLE_MATRIX_OUTPUT_SIZE; i++)
         output_int16[i] = 0;
     for (i = 0; i < simple_matrix->cols; i++) {
-        mapping_matrix_multiply_channel_out_short(simple_matrix,
+        oaci_mapping_matrix_multiply_channel_out_short(simple_matrix,
       &input_pcm[i], i, simple_matrix->cols, output_int16,
       simple_matrix->rows, SIMPLE_MATRIX_FRAME_SIZE);
     }
@@ -142,7 +142,7 @@ void test_simple_matrix(void) {
     for (i = 0; i < SIMPLE_MATRIX_OUTPUT_SIZE; i++)
         output_pcm[i] = 0;
     for (i = 0; i < simple_matrix->rows; i++) {
-        mapping_matrix_multiply_channel_in_float(simple_matrix,
+        oaci_mapping_matrix_multiply_channel_in_float(simple_matrix,
       input_pcm, simple_matrix->cols, &output_pcm[i], i,
       simple_matrix->rows, SIMPLE_MATRIX_FRAME_SIZE);
     }
@@ -154,7 +154,7 @@ void test_simple_matrix(void) {
     for (i = 0; i < SIMPLE_MATRIX_OUTPUT_SIZE; i++)
         output_pcm[i] = 0;
     for (i = 0; i < simple_matrix->cols; i++) {
-        mapping_matrix_multiply_channel_out_float(simple_matrix,
+        oaci_mapping_matrix_multiply_channel_out_float(simple_matrix,
       &input_pcm[i], i, simple_matrix->cols, output_pcm,
       simple_matrix->rows, SIMPLE_MATRIX_FRAME_SIZE);
     }

From ce3f7ed770b2f2af4a46f90f4b4a6bfa858b3a26 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jeanmarcv@google.com>
Date: Sat, 24 Jan 2026 01:05:15 -0500
Subject: [PATCH 21/28] Renaming static symbols to have an oaci_ prefix

---
 celt/bands.c                          | 116 +++++++++++++-------------
 celt/celt_decoder.c                   |  40 ++++-----
 celt/celt_encoder.c                   | 102 +++++++++++-----------
 celt/celt_lpc.c                       |   4 +-
 celt/cwrs.c                           |  12 +--
 celt/entcode.h                        |   4 +-
 celt/entdec.c                         |  26 +++---
 celt/entenc.c                         |  34 ++++----
 celt/fixed_c5x.h                      |   4 +-
 celt/fixed_c6x.h                      |   4 +-
 celt/kiss_fft.c                       |  50 +++++------
 celt/laplace.c                        |   6 +-
 celt/mathops.c                        |  14 ++--
 celt/mathops.h                        |  68 +++++++--------
 celt/mdct.c                           |   6 +-
 celt/mini_kfft.c                      |  16 ++--
 celt/mips/fixed_generic_mipsr1.h      |   2 +-
 celt/modes.c                          |   8 +-
 celt/pitch.c                          |  28 +++----
 celt/quant_bands.c                    |  24 +++---
 celt/rate.c                           |  12 +--
 celt/rate.h                           |   6 +-
 celt/tests/test_unit_cwrs32.c         |   4 +-
 celt/tests/test_unit_entropy.c        |  20 ++---
 celt/tests/test_unit_mathops.c        |  58 ++++++-------
 celt/vq.c                             |  44 +++++-----
 dnn/dred_compare.c                    |   2 +-
 dnn/dred_decoder.c                    |   2 +-
 dnn/dred_encoder.c                    |  20 ++---
 dnn/dred_rdovae_dec.c                 |  12 +--
 dnn/dred_rdovae_enc.c                 |  12 +--
 dnn/fargan.c                          |  20 ++---
 dnn/freq.c                            |  26 +++---
 dnn/fwgan.c                           |   4 +-
 dnn/lpcnet_enc.c                      |   8 +-
 dnn/lpcnet_plc.c                      |  28 +++----
 dnn/nndsp.c                           |   6 +-
 dnn/nnet_arch.h                       |  30 +++----
 dnn/osce.c                            |  98 +++++++++++-----------
 dnn/osce_features.c                   |  26 +++---
 dnn/parse_lpcnet_weights.c            |  32 +++----
 dnn/test_vec.c                        |  16 ++--
 dnn/vec.h                             |  40 ++++-----
 dnn/vec_avx.h                         |  62 +++++++-------
 dnn/vec_neon.h                        |  46 +++++-----
 silk/A2NLSF.c                         |  26 +++---
 silk/CNG.c                            |   4 +-
 silk/LP_variable_cutoff.c             |   4 +-
 silk/NLSF2A.c                         |   8 +-
 silk/NLSF_decode.c                    |   4 +-
 silk/NSQ.c                            |  10 +--
 silk/NSQ.h                            |  12 +--
 silk/NSQ_del_dec.c                    |  18 ++--
 silk/PLC.c                            |  12 +--
 silk/arm/NSQ_del_dec_neon_intr.c      |  18 ++--
 silk/arm/NSQ_neon.c                   |  12 +--
 silk/arm/NSQ_neon.h                   |  30 +++----
 silk/arm/arm_silk_map.c               |  12 +--
 silk/control_codec.c                  |   8 +-
 silk/decode_frame.c                   |   4 +-
 silk/enc_API.c                        |   6 +-
 silk/fixed/encode_frame_FIX.c         |   6 +-
 silk/fixed/noise_shape_analysis_FIX.c |   4 +-
 silk/float/encode_frame_FLP.c         |   6 +-
 silk/mips/NSQ_mips.h                  |  32 +++----
 silk/resampler_private_down_FIR.c     |   4 +-
 silk/shell_coder.c                    |  74 ++++++++--------
 silk/typedef.h                        |   4 +-
 silk/x86/NSQ_del_dec_avx2.c           |  20 ++---
 silk/x86/NSQ_del_dec_sse4_1.c         |  12 +--
 silk/x86/NSQ_sse4_1.c                 |   8 +-
 src/analysis.c                        |  18 ++--
 src/extensions.c                      |  18 ++--
 src/mlp.c                             |  32 +++----
 src/oac.c                             |   8 +-
 src/oac_decoder.c                     |  28 +++----
 src/oac_encoder.c                     |  82 +++++++++---------
 src/oac_multistream_encoder.c         |  38 ++++-----
 src/oac_projection_decoder.c          |  12 +--
 src/oac_projection_encoder.c          |  16 ++--
 80 files changed, 906 insertions(+), 906 deletions(-)

diff --git a/celt/bands.c b/celt/bands.c
index 7d649736b..6774c6e81 100644
--- a/celt/bands.c
+++ b/celt/bands.c
@@ -101,7 +101,7 @@ void oaci_compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener
             maxval = celt_maxabs32(&X[c*N + (eBands[i]<<LM)], (eBands[i + 1] - eBands[i])<<LM);
             if (maxval > 0) {
                 int shift = IMAX(0,
-                30 - celt_ilog2(maxval + (maxval>>14) + 1) - ((((m->logN[i] + 7)>>BITRES) + LM + 1)>>1));
+                30 - oaci_celt_ilog2(maxval + (maxval>>14) + 1) - ((((m->logN[i] + 7)>>BITRES) + LM + 1)>>1));
                 j = eBands[i]<<LM; do {
                     oac_val32 x = SHL32(X[j + c*N], shift);
                     sum = ADD32(sum, MULT32_32_Q31(x, x));
@@ -129,7 +129,7 @@ void oaci_normalise_bands(const CELTMode *m, const celt_sig * OAC_RESTRICT freq,
             /* For very low energies, we need this to make sure not to prevent energy rounding from
                blowing up the normalized signal. */
             if (E < 10) E += EPSILON;
-            shift = 30 - celt_zlog2(E);
+            shift = 30 - oaci_celt_zlog2(E);
             E = SHL32(E, shift);
             g = oaci_celt_rcp_norm32(E);
             j = M*eBands[i]; do {
@@ -220,7 +220,7 @@ void oaci_denormalise_bands(const CELTMode *m, const celt_norm * OAC_RESTRICT X,
             g = 0;
         } else {
             /* Handle the fractional part. */
-            g = SHL32(celt_exp2_db_frac((lg&((1<<DB_SHIFT) - 1))), 2);
+            g = SHL32(oaci_celt_exp2_db_frac((lg&((1<<DB_SHIFT) - 1))), 2);
         }
         /* Handle extreme gains with negative shift. */
         if (shift < 0) {
@@ -260,17 +260,17 @@ void oaci_anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collaps
         depth = celt_udiv(1 + pulses[i], (m->eBands[i + 1] - m->eBands[i]))>>LM;
 
 #ifdef FIXED_POINT
-        thresh32 = SHR32(celt_exp2(-SHL16(depth, 10 - BITRES)), 1);
+        thresh32 = SHR32(oaci_celt_exp2(-SHL16(depth, 10 - BITRES)), 1);
         thresh = MULT16_32_Q15(QCONST16(0.5f, 15), MIN32(32767, thresh32));
         {
             oac_val32 t;
             t = N0<<LM;
-            shift = celt_ilog2(t)>>1;
+            shift = oaci_celt_ilog2(t)>>1;
             t = SHL32(t, (7 - shift)<<1);
             sqrt_1 = oaci_celt_rsqrt_norm(t);
         }
 #else
-        thresh = .5f*celt_exp2(-.125f*depth);
+        thresh = .5f*oaci_celt_exp2(-.125f*depth);
         sqrt_1 = oaci_celt_rsqrt(N0<<LM);
 #endif
 
@@ -336,7 +336,7 @@ void oaci_anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collaps
    corresponds to some quick-and-dirty perceptual experiments I ran to
    measure inter-aural masking (there doesn't seem to be any published data
    on the topic). */
-static void compute_channel_weights(celt_ener Ex, celt_ener Ey, oac_val16 w[2]) {
+static void oaci_compute_channel_weights(celt_ener Ex, celt_ener Ey, oac_val16 w[2]) {
     celt_ener minE;
 #ifdef FIXED_POINT
     int shift;
@@ -346,13 +346,13 @@ static void compute_channel_weights(celt_ener Ex, celt_ener Ey, oac_val16 w[2])
     Ex = ADD32(Ex, minE/3);
     Ey = ADD32(Ey, minE/3);
 #ifdef FIXED_POINT
-    shift = celt_ilog2(EPSILON + MAX32(Ex, Ey)) - 14;
+    shift = oaci_celt_ilog2(EPSILON + MAX32(Ex, Ey)) - 14;
 #endif
     w[0] = VSHR32(Ex, shift);
     w[1] = VSHR32(Ey, shift);
 }
 
-static void intensity_stereo(const CELTMode *m, celt_norm * OAC_RESTRICT X, const celt_norm * OAC_RESTRICT Y,
+static void oaci_intensity_stereo(const CELTMode *m, celt_norm * OAC_RESTRICT X, const celt_norm * OAC_RESTRICT Y,
                              const celt_ener *bandE, int bandID, int N) {
     int i = bandID;
     int j;
@@ -360,7 +360,7 @@ static void intensity_stereo(const CELTMode *m, celt_norm * OAC_RESTRICT X, cons
     oac_val16 left, right;
     oac_val16 norm;
 #ifdef FIXED_POINT
-    int shift = celt_zlog2(MAX32(bandE[i], bandE[i + m->nbEBands])) - 13;
+    int shift = oaci_celt_zlog2(MAX32(bandE[i], bandE[i + m->nbEBands])) - 13;
 #endif
     left = VSHR32(bandE[i], shift);
     right = VSHR32(bandE[i + m->nbEBands], shift);
@@ -377,7 +377,7 @@ static void intensity_stereo(const CELTMode *m, celt_norm * OAC_RESTRICT X, cons
     }
 }
 
-static void stereo_split(celt_norm * OAC_RESTRICT X, celt_norm * OAC_RESTRICT Y, int N) {
+static void oaci_stereo_split(celt_norm * OAC_RESTRICT X, celt_norm * OAC_RESTRICT Y, int N) {
     int j;
     for (j = 0; j < N; j++) {
         oac_val32 r, l;
@@ -388,7 +388,7 @@ static void stereo_split(celt_norm * OAC_RESTRICT X, celt_norm * OAC_RESTRICT Y,
     }
 }
 
-static void stereo_merge(celt_norm * OAC_RESTRICT X, celt_norm * OAC_RESTRICT Y, oac_val32 mid, int N, int arch) {
+static void oaci_stereo_merge(celt_norm * OAC_RESTRICT X, celt_norm * OAC_RESTRICT Y, oac_val32 mid, int N, int arch) {
     int j;
     oac_val32 xp = 0, side = 0;
     oac_val32 El, Er;
@@ -411,8 +411,8 @@ static void stereo_merge(celt_norm * OAC_RESTRICT X, celt_norm * OAC_RESTRICT Y,
     }
 
 #ifdef FIXED_POINT
-    kl = celt_ilog2(El)>>1;
-    kr = celt_ilog2(Er)>>1;
+    kl = oaci_celt_ilog2(El)>>1;
+    kr = oaci_celt_ilog2(Er)>>1;
 #endif
     t = VSHR32(El, (kl<<1) - 29);
     lgain = oaci_celt_rsqrt_norm32(t);
@@ -534,7 +534,7 @@ static const int ordery_table[] = {
     15,  0,  8,  7, 12,  3, 11,  4, 14,  1,  9,  6, 13,  2, 10,  5,
 };
 
-static void deinterleave_hadamard(celt_norm *X, int N0, int stride, int hadamard) {
+static void oaci_deinterleave_hadamard(celt_norm *X, int N0, int stride, int hadamard) {
     int i, j;
     VARDECL(celt_norm, tmp);
     int N;
@@ -557,7 +557,7 @@ static void deinterleave_hadamard(celt_norm *X, int N0, int stride, int hadamard
     RESTORE_STACK;
 }
 
-static void interleave_hadamard(celt_norm *X, int N0, int stride, int hadamard) {
+static void oaci_interleave_hadamard(celt_norm *X, int N0, int stride, int hadamard) {
     int i, j;
     VARDECL(celt_norm, tmp);
     int N;
@@ -591,7 +591,7 @@ void oaci_haar1(celt_norm *X, int N0, int stride) {
         }
 }
 
-static int compute_qn(int N, int b, int offset, int pulse_cap, int stereo) {
+static int oaci_compute_qn(int N, int b, int offset, int pulse_cap, int stereo) {
     static const oac_int16 exp2_table8[8] =
     {16384, 17866, 19483, 21247, 23170, 25267, 27554, 30048};
     int qn, qb;
@@ -643,7 +643,7 @@ struct split_ctx {
     int itheta_q30;
 };
 
-static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
+static void oaci_compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
                           celt_norm *X, celt_norm *Y, int N, int *b, int B, int B0,
                           int LM,
                           int stereo, int *fill) {
@@ -674,7 +674,7 @@ static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
     /* Decide on the resolution to give to the split parameter theta */
     pulse_cap = m->logN[i] + LM*(1<<BITRES);
     offset = (pulse_cap>>1) - (stereo && N == 2 ? QTHETA_OFFSET_TWOPHASE : QTHETA_OFFSET);
-    qn = compute_qn(N, *b, offset, pulse_cap, stereo);
+    qn = oaci_compute_qn(N, *b, offset, pulse_cap, stereo);
     if (stereo && i >= intensity)
         qn = 1;
     if (encode) {
@@ -777,9 +777,9 @@ static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
         itheta_q30 = (oac_int32)itheta<<16;
         if (encode && stereo) {
             if (itheta == 0)
-                intensity_stereo(m, X, Y, bandE, i, N);
+                oaci_intensity_stereo(m, X, Y, bandE, i, N);
             else
-                stereo_split(X, Y, N);
+                oaci_stereo_split(X, Y, N);
         }
         /* NOTE: Renormalising X and Y *may* help fixed-point a bit at very high rate.
                  Let's do that at higher complexity */
@@ -791,7 +791,7 @@ static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
                 for (j = 0; j < N; j++)
                     Y[j] = -Y[j];
             }
-            intensity_stereo(m, X, Y, bandE, i, N);
+            oaci_intensity_stereo(m, X, Y, bandE, i, N);
         }
         if (*b > 2<<BITRES && ctx->total_bits - tell > 2<<BITRES) {
             if (encode)
@@ -834,7 +834,7 @@ static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
     sctx->itheta = itheta;
     sctx->itheta_q30 = itheta_q30;
 }
-static unsigned quant_band_n1(struct band_ctx *ctx, celt_norm *X, celt_norm *Y,
+static unsigned oaci_quant_band_n1(struct band_ctx *ctx, celt_norm *X, celt_norm *Y,
                               celt_norm *lowband_out) {
     int c;
     int stereo;
@@ -869,7 +869,7 @@ static unsigned quant_band_n1(struct band_ctx *ctx, celt_norm *X, celt_norm *Y,
    It can split the band in two and transmit the energy difference with
    the two half-bands. It can be called recursively so bands can end up being
    split in 8 parts. */
-static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
+static unsigned oaci_quant_partition(struct band_ctx *ctx, celt_norm *X,
                                 int N, int b, int B, celt_norm *lowband,
                                 int LM,
                                 oac_val32 gain, int fill) {
@@ -910,7 +910,7 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
             fill = (fill&1)|(fill<<1);
         B = (B + 1)>>1;
 
-        compute_theta(ctx, &sctx, X, Y, N, &b, B, B0, LM, 0, &fill);
+        oaci_compute_theta(ctx, &sctx, X, Y, N, &b, B, B0, LM, 0, &fill);
         imid = sctx.imid;
         iside = sctx.iside;
         delta = sctx.delta;
@@ -942,27 +942,27 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
 
         tell = oaci_ec_tell_frac(ec);
         if (mbits >= sbits) {
-            cm = quant_partition(ctx, X, N, mbits, B, lowband, LM,
+            cm = oaci_quant_partition(ctx, X, N, mbits, B, lowband, LM,
                MULT32_32_Q31(gain, mid), fill);
             rebalance = mbits - (oaci_ec_tell_frac(ec) - tell);
             if (rebalance > 3<<BITRES && itheta != 0)
                 sbits += rebalance - (3<<BITRES);
-            cm |= quant_partition(ctx, Y, N, sbits, B, next_lowband2, LM,
+            cm |= oaci_quant_partition(ctx, Y, N, sbits, B, next_lowband2, LM,
                MULT32_32_Q31(gain, side), fill>>B)<<(B0>>1);
         } else {
-            cm = quant_partition(ctx, Y, N, sbits, B, next_lowband2, LM,
+            cm = oaci_quant_partition(ctx, Y, N, sbits, B, next_lowband2, LM,
                MULT32_32_Q31(gain, side), fill>>B)<<(B0>>1);
             rebalance = sbits - (oaci_ec_tell_frac(ec) - tell);
             if (rebalance > 3<<BITRES && itheta != 16384)
                 mbits += rebalance - (3<<BITRES);
-            cm |= quant_partition(ctx, X, N, mbits, B, lowband, LM,
+            cm |= oaci_quant_partition(ctx, X, N, mbits, B, lowband, LM,
                MULT32_32_Q31(gain, mid), fill);
         }
     } else {
         oac_int32 remaining_bits;
         /* This is the basic no-split case */
-        q = bits2pulses(m, i, LM, b);
-        curr_bits = pulses2bits(m, i, LM, q);
+        q = oaci_bits2pulses(m, i, LM, b);
+        curr_bits = oaci_pulses2bits(m, i, LM, q);
         remaining_bits = ctx->total_bits - oaci_ec_tell_frac(ec) - 1;
         remaining_bits -= curr_bits;
 
@@ -970,12 +970,12 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
         while (remaining_bits < 0 && q > 0) {
             remaining_bits += curr_bits;
             q--;
-            curr_bits = pulses2bits(m, i, LM, q);
+            curr_bits = oaci_pulses2bits(m, i, LM, q);
             remaining_bits -= curr_bits;
         }
 
         if (q != 0) {
-            int K = get_pulses(q);
+            int K = oaci_get_pulses(q);
 
             /* Finally do the actual quantization */
             if (encode) {
@@ -1090,7 +1090,7 @@ unsigned oaci_cubic_quant_partition(struct band_ctx *ctx, celt_norm *X, int N, i
 }
 
 /* This function is responsible for encoding and decoding a band for the mono case. */
-static unsigned quant_band(struct band_ctx *ctx, celt_norm *X,
+static unsigned oaci_quant_band(struct band_ctx *ctx, celt_norm *X,
                            int N, int b, int B, celt_norm *lowband,
                            int LM, celt_norm *lowband_out,
                            oac_val32 gain, celt_norm *lowband_scratch, int fill) {
@@ -1115,7 +1115,7 @@ static unsigned quant_band(struct band_ctx *ctx, celt_norm *X,
 
     /* Special case for one sample */
     if (N == 1) {
-        return quant_band_n1(ctx, X, NULL, lowband_out);
+        return oaci_quant_band_n1(ctx, X, NULL, lowband_out);
     }
 
     if (tf_change > 0)
@@ -1158,18 +1158,18 @@ static unsigned quant_band(struct band_ctx *ctx, celt_norm *X,
     /* Reorganize the samples in time order instead of frequency order */
     if (B0 > 1) {
         if (encode)
-            deinterleave_hadamard(X, N_B>>recombine, B0<<recombine, longBlocks);
+            oaci_deinterleave_hadamard(X, N_B>>recombine, B0<<recombine, longBlocks);
         if (lowband)
-            deinterleave_hadamard(lowband, N_B>>recombine, B0<<recombine, longBlocks);
+            oaci_deinterleave_hadamard(lowband, N_B>>recombine, B0<<recombine, longBlocks);
     }
 
-    cm = quant_partition(ctx, X, N, b, B, lowband, LM, gain, fill);
+    cm = oaci_quant_partition(ctx, X, N, b, B, lowband, LM, gain, fill);
 
     /* This code is used by the decoder and by the resynthesis-enabled encoder */
     if (ctx->resynth) {
         /* Undo the sample reorganization going from time order to frequency order */
         if (B0 > 1)
-            interleave_hadamard(X, N_B>>recombine, B0<<recombine, longBlocks);
+            oaci_interleave_hadamard(X, N_B>>recombine, B0<<recombine, longBlocks);
 
         /* Undo time-freq changes that we did earlier */
         N_B = N_B0;
@@ -1211,7 +1211,7 @@ static unsigned quant_band(struct band_ctx *ctx, celt_norm *X,
 #endif
 
 /* This function is responsible for encoding and decoding a band for the stereo case. */
-static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm *Y,
+static unsigned oaci_quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm *Y,
                                   int N, int b, int B, celt_norm *lowband,
                                   int LM, celt_norm *lowband_out,
                                   celt_norm *lowband_scratch, int fill) {
@@ -1231,7 +1231,7 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
 
     /* Special case for one sample */
     if (N == 1) {
-        return quant_band_n1(ctx, X, Y, lowband_out);
+        return oaci_quant_band_n1(ctx, X, Y, lowband_out);
     }
 
     orig_fill = fill;
@@ -1242,7 +1242,7 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
             else OAC_COPY(X, Y, N);
         }
     }
-    compute_theta(ctx, &sctx, X, Y, N, &b, B, B, LM, 1, &fill);
+    oaci_compute_theta(ctx, &sctx, X, Y, N, &b, B, B, LM, 1, &fill);
     inv = sctx.inv;
     imid = sctx.imid;
     iside = sctx.iside;
@@ -1288,7 +1288,7 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
         sign = 1 - 2*sign;
         /* We use orig_fill here because we want to fold the side, but if
            itheta==16384, we'll have cleared the low bits of fill. */
-        cm = quant_band(ctx, x2, N, mbits, B, lowband, LM, lowband_out, Q31ONE,
+        cm = oaci_quant_band(ctx, x2, N, mbits, B, lowband, LM, lowband_out, Q31ONE,
             lowband_scratch, orig_fill);
         /* We don't split N=2 bands, so cm is either 1 or 0 (for a fold-collapse),
            and there's no need to worry about mixing with the other channel. */
@@ -1319,7 +1319,7 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
         if (mbits >= sbits) {
             /* In stereo mode, we do not apply a scaling to the mid because we need the normalized
                mid for folding later. */
-            cm = quant_band(ctx, X, N, mbits, B, lowband, LM, lowband_out, Q31ONE,
+            cm = oaci_quant_band(ctx, X, N, mbits, B, lowband, LM, lowband_out, Q31ONE,
                lowband_scratch, fill);
             rebalance = mbits - (oaci_ec_tell_frac(ec) - tell);
             if (rebalance > 3<<BITRES && itheta != 0)
@@ -1327,17 +1327,17 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
 
             /* For a stereo split, the high bits of fill are always zero, so no
                folding will be done to the side. */
-            cm |= quant_band(ctx, Y, N, sbits, B, NULL, LM, NULL, side, NULL, fill>>B);
+            cm |= oaci_quant_band(ctx, Y, N, sbits, B, NULL, LM, NULL, side, NULL, fill>>B);
         } else {
             /* For a stereo split, the high bits of fill are always zero, so no
                folding will be done to the side. */
-            cm = quant_band(ctx, Y, N, sbits, B, NULL, LM, NULL, side, NULL, fill>>B);
+            cm = oaci_quant_band(ctx, Y, N, sbits, B, NULL, LM, NULL, side, NULL, fill>>B);
             rebalance = sbits - (oaci_ec_tell_frac(ec) - tell);
             if (rebalance > 3<<BITRES && itheta != 16384)
                 mbits += rebalance - (3<<BITRES);
             /* In stereo mode, we do not apply a scaling to the mid because we need the normalized
                mid for folding later. */
-            cm |= quant_band(ctx, X, N, mbits, B, lowband, LM, lowband_out, Q31ONE,
+            cm |= oaci_quant_band(ctx, X, N, mbits, B, lowband, LM, lowband_out, Q31ONE,
                lowband_scratch, fill);
         }
     }
@@ -1346,7 +1346,7 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
     /* This code is used by the decoder and by the resynthesis-enabled encoder */
     if (ctx->resynth) {
         if (N != 2)
-            stereo_merge(X, Y, mid, N, ctx->arch);
+            oaci_stereo_merge(X, Y, mid, N, ctx->arch);
         if (inv) {
             int j;
             for (j = 0; j < N; j++)
@@ -1356,7 +1356,7 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm
     return cm;
 }
 
-static void special_hybrid_folding(const CELTMode *m, celt_norm *norm, celt_norm *norm2, int start, int M,
+static void oaci_special_hybrid_folding(const CELTMode *m, celt_norm *norm, celt_norm *norm2, int start, int M,
                                    int dual_stereo) {
     int n1, n2;
     const oac_int16 * OAC_RESTRICT eBands = m->eBands;
@@ -1487,7 +1487,7 @@ void oaci_quant_all_bands(int encode, const CELTMode *m, int start, int end,
             && (update_lowband || lowband_offset == 0))
             lowband_offset = i;
         if (i == start + 1)
-            special_hybrid_folding(m, norm, norm2, start, M, dual_stereo);
+            oaci_special_hybrid_folding(m, norm, norm2, start, M, dual_stereo);
 
         tf_change = tf_res[i];
         ctx.tf_change = tf_change;
@@ -1533,10 +1533,10 @@ void oaci_quant_all_bands(int encode, const CELTMode *m, int start, int end,
                     norm[j] = HALF32(norm[j] + norm2[j]);
         }
         if (dual_stereo) {
-            x_cm = quant_band(&ctx, X, N, b/2, B,
+            x_cm = oaci_quant_band(&ctx, X, N, b/2, B,
                effective_lowband != -1 ? norm + effective_lowband : NULL, LM,
                last?NULL:norm + M*eBands[i] - norm_offset, Q31ONE, lowband_scratch, x_cm);
-            y_cm = quant_band(&ctx, Y, N, b/2, B,
+            y_cm = oaci_quant_band(&ctx, Y, N, b/2, B,
                effective_lowband != -1 ? norm2 + effective_lowband : NULL, LM,
                last?NULL:norm2 + M*eBands[i] - norm_offset, Q31ONE, lowband_scratch, y_cm);
         } else {
@@ -1549,7 +1549,7 @@ void oaci_quant_all_bands(int encode, const CELTMode *m, int start, int end,
                     int nstart_bytes, nend_bytes, save_bytes;
                     unsigned char *bytes_buf;
                     oac_val16 w[2];
-                    compute_channel_weights(bandE[i], bandE[i + m->nbEBands], w);
+                    oaci_compute_channel_weights(bandE[i], bandE[i + m->nbEBands], w);
                     /* Make a copy. */
                     cm = x_cm|y_cm;
                     ec_save = *ec;
@@ -1558,7 +1558,7 @@ void oaci_quant_all_bands(int encode, const CELTMode *m, int start, int end,
                     OAC_COPY(Y_save, Y, N);
                     /* Encode and round down. */
                     ctx.theta_round = -1;
-                    x_cm = quant_band_stereo(&ctx, X, Y, N, b, B,
+                    x_cm = oaci_quant_band_stereo(&ctx, X, Y, N, b, B,
                      effective_lowband != -1 ? norm + effective_lowband : NULL, LM,
                      last?NULL:norm + M*eBands[i] - norm_offset, lowband_scratch, cm);
                     dist0 = MULT16_32_Q15(w[0], oaci_celt_inner_prod_norm_shift(X_save, X, N, arch)) + MULT16_32_Q15(w[1],
@@ -1584,10 +1584,10 @@ void oaci_quant_all_bands(int encode, const CELTMode *m, int start, int end,
                     OAC_COPY(X, X_save, N);
                     OAC_COPY(Y, Y_save, N);
                     if (i == start + 1)
-                        special_hybrid_folding(m, norm, norm2, start, M, dual_stereo);
+                        oaci_special_hybrid_folding(m, norm, norm2, start, M, dual_stereo);
                     /* Encode and round up. */
                     ctx.theta_round = 1;
-                    x_cm = quant_band_stereo(&ctx, X, Y, N, b, B,
+                    x_cm = oaci_quant_band_stereo(&ctx, X, Y, N, b, B,
                      effective_lowband != -1 ? norm + effective_lowband : NULL, LM,
                      last?NULL:norm + M*eBands[i] - norm_offset, lowband_scratch, cm);
                     dist1 = MULT16_32_Q15(w[0], oaci_celt_inner_prod_norm_shift(X_save, X, N, arch)) + MULT16_32_Q15(w[1],
@@ -1604,12 +1604,12 @@ void oaci_quant_all_bands(int encode, const CELTMode *m, int start, int end,
                     }
                 } else {
                     ctx.theta_round = 0;
-                    x_cm = quant_band_stereo(&ctx, X, Y, N, b, B,
+                    x_cm = oaci_quant_band_stereo(&ctx, X, Y, N, b, B,
                      effective_lowband != -1 ? norm + effective_lowband : NULL, LM,
                      last?NULL:norm + M*eBands[i] - norm_offset, lowband_scratch, x_cm|y_cm);
                 }
             } else {
-                x_cm = quant_band(&ctx, X, N, b, B,
+                x_cm = oaci_quant_band(&ctx, X, N, b, B,
                   effective_lowband != -1 ? norm + effective_lowband : NULL, LM,
                   last?NULL:norm + M*eBands[i] - norm_offset, Q31ONE, lowband_scratch, x_cm|y_cm);
             }
diff --git a/celt/celt_decoder.c b/celt/celt_decoder.c
index 68e695b27..c5785bef4 100644
--- a/celt/celt_decoder.c
+++ b/celt/celt_decoder.c
@@ -453,7 +453,7 @@ void oaci_celt_synthesis(const CELTMode *mode, celt_norm *X, celt_sig * out_syn[
     RESTORE_STACK;
 }
 
-static void tf_decode(int start, int end, int isTransient, int *tf_res, int LM, ec_dec *dec) {
+static void oaci_tf_decode(int start, int end, int isTransient, int *tf_res, int LM, ec_dec *dec) {
     int i, curr, tf_select;
     int tf_select_rsv;
     int tf_changed;
@@ -462,7 +462,7 @@ static void tf_decode(int start, int end, int isTransient, int *tf_res, int LM,
     oac_uint32 tell;
 
     budget = dec->storage*8;
-    tell = ec_tell(dec);
+    tell = oaci_ec_tell(dec);
     logp = isTransient ? 2 : 4;
     tf_select_rsv = LM > 0 && tell + logp + 1 <= budget;
     budget -= tf_select_rsv;
@@ -470,7 +470,7 @@ static void tf_decode(int start, int end, int isTransient, int *tf_res, int LM,
     for (i = start; i < end; i++) {
         if (tell + logp <= budget) {
             curr ^= oaci_ec_dec_bit_logp(dec, logp);
-            tell = ec_tell(dec);
+            tell = oaci_ec_tell(dec);
             tf_changed |= curr;
         }
         tf_res[i] = curr;
@@ -487,7 +487,7 @@ static void tf_decode(int start, int end, int isTransient, int *tf_res, int LM,
     }
 }
 
-static int celt_plc_pitch_search(CELTDecoder *st, celt_sig *decode_mem[2], int C, int arch) {
+static int oaci_celt_plc_pitch_search(CELTDecoder *st, celt_sig *decode_mem[2], int C, int arch) {
     int pitch_index;
 #ifdef ENABLE_QEXT
     int qext_scale;
@@ -510,7 +510,7 @@ static int celt_plc_pitch_search(CELTDecoder *st, celt_sig *decode_mem[2], int C
     return QEXT_SCALE(pitch_index);
 }
 
-static void prefilter_and_fold(CELTDecoder * OAC_RESTRICT st, int N) {
+static void oaci_prefilter_and_fold(CELTDecoder * OAC_RESTRICT st, int N) {
     int c;
     int CC;
     int i;
@@ -606,7 +606,7 @@ void oaci_update_plc_state(LPCNetPLCState *lpcnet, celt_sig *decode_mem[2], floa
 }
 #endif
 
-static void celt_decode_lost(CELTDecoder * OAC_RESTRICT st, int N, int LM
+static void oaci_celt_decode_lost(CELTDecoder * OAC_RESTRICT st, int N, int LM
 #ifdef ENABLE_DEEP_PLC
                              , LPCNetPLCState *lpcnet
 #endif
@@ -684,7 +684,7 @@ static void celt_decode_lost(CELTDecoder * OAC_RESTRICT st, int N, int LM
         } while (++c < C);
 
         if (st->prefilter_and_fold) {
-            prefilter_and_fold(st, N);
+            oaci_prefilter_and_fold(st, N);
         }
 
         /* Energy decay */
@@ -748,7 +748,7 @@ static void celt_decode_lost(CELTDecoder * OAC_RESTRICT st, int N, int LM
         curr_neural = curr_frame_type == FRAME_PLC_NEURAL || curr_frame_type == FRAME_DRED;
         last_neural = st->last_frame_type == FRAME_PLC_NEURAL || st->last_frame_type == FRAME_DRED;
         if (st->last_frame_type != FRAME_PLC_PERIODIC && !(last_neural && curr_neural)) {
-            st->last_pitch_index = pitch_index = celt_plc_pitch_search(st, decode_mem, C, st->arch);
+            st->last_pitch_index = pitch_index = oaci_celt_plc_pitch_search(st, decode_mem, C, st->arch);
         } else {
             pitch_index = st->last_pitch_index;
             fade = QCONST16(.8f, 15);
@@ -835,7 +835,7 @@ static void celt_decode_lost(CELTDecoder * OAC_RESTRICT st, int N, int LM
                 oac_val32 E1 = 1, E2 = 1;
                 int decay_length;
 #ifdef FIXED_POINT
-                int shift = IMAX(0, 2*celt_zlog2(celt_maxabs16(&exc[max_period - exc_length], exc_length)) - 20);
+                int shift = IMAX(0, 2*oaci_celt_zlog2(oaci_celt_maxabs16(&exc[max_period - exc_length], exc_length)) - 20);
 # ifdef ENABLE_QEXT
                 if (st->qext_scale == 2) shift++;
 # endif
@@ -1159,7 +1159,7 @@ int oaci_celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned
         effEnd = mode->effEBands;
 
     if (data == NULL || len <= 1) {
-        celt_decode_lost(st, N, LM
+        oaci_celt_decode_lost(st, N, LM
 #ifdef ENABLE_DEEP_PLC
             , lpcnet
 #endif
@@ -1190,7 +1190,7 @@ int oaci_celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned
     }
 
     total_bits = len*8;
-    tell = ec_tell(dec);
+    tell = oaci_ec_tell(dec);
 
     if (tell >= total_bits)
         silence = 1;
@@ -1201,7 +1201,7 @@ int oaci_celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned
     if (silence) {
         /* Pretend we've read all the remaining bits */
         tell = len*8;
-        dec->nbits_total += tell - ec_tell(dec);
+        dec->nbits_total += tell - oaci_ec_tell(dec);
     }
 
     postfilter_gain = 0;
@@ -1213,16 +1213,16 @@ int oaci_celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned
             octave = oaci_ec_dec_uint(dec, 6);
             postfilter_pitch = (16<<octave) + oaci_ec_dec_bits(dec, 4 + octave) - 1;
             qg = oaci_ec_dec_bits(dec, 3);
-            if (ec_tell(dec) + 2 <= total_bits)
+            if (oaci_ec_tell(dec) + 2 <= total_bits)
                 postfilter_tapset = oaci_ec_dec_icdf(dec, tapset_icdf, 4);
             postfilter_gain = QCONST16(.09375f, 15)*(qg + 1);
         }
-        tell = ec_tell(dec);
+        tell = oaci_ec_tell(dec);
     }
 
     if (LM > 0 && tell + 3 <= total_bits) {
         isTransient = oaci_ec_dec_bit_logp(dec, 3);
-        tell = ec_tell(dec);
+        tell = oaci_ec_tell(dec);
     } else
         isTransient = 0;
 
@@ -1268,9 +1268,9 @@ int oaci_celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned
          intra_ener, dec, C, LM);
 
     ALLOC(tf_res, nbEBands, int);
-    tf_decode(start, end, isTransient, tf_res, LM, dec);
+    oaci_tf_decode(start, end, isTransient, tf_res, LM, dec);
 
-    tell = ec_tell(dec);
+    tell = oaci_ec_tell(dec);
     spread_decision = SPREAD_NORMAL;
     if (tell + 4 <= total_bits)
         spread_decision = oaci_ec_dec_icdf(dec, spread_icdf, 5);
@@ -1346,7 +1346,7 @@ int oaci_celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned
     }
 
     oaci_unquant_energy_finalise(mode, start, end, oldBandE,
-         fine_quant, fine_priority, len*8 - ec_tell(dec), dec, C);
+         fine_quant, fine_priority, len*8 - oaci_ec_tell(dec), dec, C);
 
     if (anti_collapse_on)
         oaci_anti_collapse(mode, X, collapse_masks, LM, C, N,
@@ -1357,7 +1357,7 @@ int oaci_celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned
             oldBandE[i] = -GCONST(28.f);
     }
     if (st->prefilter_and_fold) {
-        prefilter_and_fold(st, N);
+        oaci_prefilter_and_fold(st, N);
     }
     oaci_celt_synthesis(mode, X, out_syn, oldBandE, start, effEnd,
                   C, CC, isTransient, LM, st->downsample, silence, st->arch);
@@ -1422,7 +1422,7 @@ int oaci_celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned
     st->last_frame_type = FRAME_NORMAL;
     st->prefilter_and_fold = 0;
     RESTORE_STACK;
-    if (ec_tell(dec) > 8*len)
+    if (oaci_ec_tell(dec) > 8*len)
         return OAC_INTERNAL_ERROR;
     if (ec_get_error(dec))
         st->error = 1;
diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c
index 38361c604..7db749794 100644
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -252,7 +252,7 @@ void oac_custom_encoder_destroy(CELTEncoder *st) {
 #endif /* CUSTOM_MODES */
 
 
-static int transient_analysis(const oac_val32 * OAC_RESTRICT in, int len, int C,
+static int oaci_transient_analysis(const oac_val32 * OAC_RESTRICT in, int len, int C,
                               oac_val16 *tf_estimate, int *tf_chan, int allow_weak_transients,
                               int *weak_transient, oac_val16 tone_freq, oac_val32 toneishness) {
     int i;
@@ -282,7 +282,7 @@ static int transient_analysis(const oac_val32 * OAC_RESTRICT in, int len, int C,
     };
     SAVE_STACK;
 #ifdef FIXED_POINT
-    int in_shift = IMAX(0, celt_ilog2(1 + celt_maxabs32(in, C*len)) - 14);
+    int in_shift = IMAX(0, oaci_celt_ilog2(1 + celt_maxabs32(in, C*len)) - 14);
 #endif
     ALLOC(tmp, len, oac_val16);
 
@@ -337,7 +337,7 @@ static int transient_analysis(const oac_val32 * OAC_RESTRICT in, int len, int C,
         /* Normalize tmp to max range */
         {
             int shift = 0;
-            shift = 14 - celt_ilog2(MAX16(1, celt_maxabs16(tmp, len)));
+            shift = 14 - oaci_celt_ilog2(MAX16(1, oaci_celt_maxabs16(tmp, len)));
             if (shift != 0) {
                 for (i = 0; i < len; i++)
                     tmp[i] = SHL16(tmp[i], shift);
@@ -449,7 +449,7 @@ static int transient_analysis(const oac_val32 * OAC_RESTRICT in, int len, int C,
 
 /* Looks for sudden increases of energy to decide whether we need to patch
    the transient decision */
-static int patch_transient_decision(celt_glog *newE, celt_glog *oldE, int nbEBands,
+static int oaci_patch_transient_decision(celt_glog *newE, celt_glog *oldE, int nbEBands,
                                     int start, int end, int C) {
     int i, c;
     oac_val32 mean_diff = 0;
@@ -484,7 +484,7 @@ static int patch_transient_decision(celt_glog *newE, celt_glog *oldE, int nbEBan
 
 /** 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 * OAC_RESTRICT in,
+static void oaci_compute_mdcts(const CELTMode *mode, int shortBlocks, celt_sig * OAC_RESTRICT in,
                           celt_sig * OAC_RESTRICT out, int C, int CC, int LM, int upsample,
                           int arch) {
     const int overlap = mode->overlap;
@@ -596,7 +596,7 @@ void oaci_celt_preemphasis(const oac_res * OAC_RESTRICT pcmp, celt_sig * OAC_RES
 
 
 
-static oac_val32 l1_metric(const celt_norm *tmp, int N, int LM, oac_val16 bias) {
+static oac_val32 oaci_l1_metric(const celt_norm *tmp, int N, int LM, oac_val16 bias) {
     int i;
     oac_val32 L1;
     L1 = 0;
@@ -608,7 +608,7 @@ static oac_val32 l1_metric(const celt_norm *tmp, int N, int LM, oac_val16 bias)
 
 }
 
-static int tf_analysis(const CELTMode *m, int len, int isTransient,
+static int oaci_tf_analysis(const CELTMode *m, int len, int isTransient,
                        int *tf_res, int lambda, celt_norm *X, int N0, int LM,
                        oac_val16 tf_estimate, int tf_chan, int *importance) {
     int i;
@@ -647,13 +647,13 @@ static int tf_analysis(const CELTMode *m, int len, int isTransient,
         /*if (C==2)
            for (j=0;j<N;j++)
               tmp[j] = ADD16(SHR16(tmp[j], 1),SHR16(X[N0+j+(m->eBands[i]<<LM)], 1));*/
-        L1 = l1_metric(tmp, N, isTransient ? LM : 0, bias);
+        L1 = oaci_l1_metric(tmp, N, isTransient ? LM : 0, bias);
         best_L1 = L1;
         /* Check the -1 case for transients */
         if (isTransient && !narrow) {
             OAC_COPY(tmp_1, tmp, N);
             oaci_haar1(tmp_1, N>>LM, 1<<LM);
-            L1 = l1_metric(tmp_1, N, LM + 1, bias);
+            L1 = oaci_l1_metric(tmp_1, N, LM + 1, bias);
             if (L1 < best_L1) {
                 best_L1 = L1;
                 best_level = -1;
@@ -670,7 +670,7 @@ static int tf_analysis(const CELTMode *m, int len, int isTransient,
 
             oaci_haar1(tmp, N>>k, 1<<k);
 
-            L1 = l1_metric(tmp, N, B, bias);
+            L1 = oaci_l1_metric(tmp, N, B, bias);
 
             if (L1 < best_L1) {
                 best_L1 = L1;
@@ -759,7 +759,7 @@ static int tf_analysis(const CELTMode *m, int len, int isTransient,
     return tf_select;
 }
 
-static void tf_encode(int start, int end, int isTransient, int *tf_res, int LM, int tf_select, ec_enc *enc) {
+static void oaci_tf_encode(int start, int end, int isTransient, int *tf_res, int LM, int tf_select, ec_enc *enc) {
     int curr, i;
     int tf_select_rsv;
     int tf_changed;
@@ -767,7 +767,7 @@ static void tf_encode(int start, int end, int isTransient, int *tf_res, int LM,
     oac_uint32 budget;
     oac_uint32 tell;
     budget = enc->storage*8;
-    tell = ec_tell(enc);
+    tell = oaci_ec_tell(enc);
     logp = isTransient ? 2 : 4;
     /* Reserve space to code the tf_select decision. */
     tf_select_rsv = LM > 0 && tell + logp + 1 <= budget;
@@ -776,7 +776,7 @@ static void tf_encode(int start, int end, int isTransient, int *tf_res, int LM,
     for (i = start; i < end; i++) {
         if (tell + logp <= budget) {
             oaci_ec_enc_bit_logp(enc, tf_res[i]^curr, logp);
-            tell = ec_tell(enc);
+            tell = oaci_ec_tell(enc);
             curr = tf_res[i];
             tf_changed |= curr;
         } else
@@ -796,7 +796,7 @@ static void tf_encode(int start, int end, int isTransient, int *tf_res, int LM,
 }
 
 
-static int alloc_trim_analysis(const CELTMode *m, const celt_norm *X,
+static int oaci_alloc_trim_analysis(const CELTMode *m, const celt_norm *X,
                                const celt_glog *bandLogE, int end, int LM, int C, int N0,
                                AnalysisInfo *analysis, oac_val16 *stereo_saving, oac_val16 tf_estimate,
                                int intensity, celt_glog surround_trim, oac_int32 equiv_rate, int arch) {
@@ -836,9 +836,9 @@ static int alloc_trim_analysis(const CELTMode *m, const celt_norm *X,
         minXC = MIN16(QCONST16(1.f, 10), ABS16(minXC));
         /*printf ("%f\n", sum);*/
         /* mid-side savings estimations based on the LF average*/
-        logXC = celt_log2(QCONST32(1.001f, 20) - MULT16_16(sum, sum));
+        logXC = oaci_celt_log2(QCONST32(1.001f, 20) - MULT16_16(sum, sum));
         /* mid-side savings estimations based on min correlation */
-        logXC2 = MAX16(HALF16(logXC), celt_log2(QCONST32(1.001f, 20) - MULT16_16(minXC, minXC)));
+        logXC2 = MAX16(HALF16(logXC), oaci_celt_log2(QCONST32(1.001f, 20) - MULT16_16(minXC, minXC)));
 #ifdef FIXED_POINT
         /* Compensate for Q20 vs Q14 input and convert output to Q8 */
         logXC = PSHR32(logXC - QCONST16(6.f, 10), 10 - 8);
@@ -883,7 +883,7 @@ static int alloc_trim_analysis(const CELTMode *m, const celt_norm *X,
     return trim_index;
 }
 
-static int stereo_analysis(const CELTMode *m, const celt_norm *X,
+static int oaci_stereo_analysis(const CELTMode *m, const celt_norm *X,
                            int LM, int N0) {
     int i;
     int thetas;
@@ -913,7 +913,7 @@ static int stereo_analysis(const CELTMode *m, const celt_norm *X,
 }
 
 #define MSWAP(a, b) do {celt_glog tmp = a; a = b; b = tmp;} while (0)
-static celt_glog median_of_5(const celt_glog *x) {
+static celt_glog oaci_median_of_5(const celt_glog *x) {
     celt_glog t0, t1, t2, t3, t4;
     t2 = x[2];
     if (x[0] > x[1]) {
@@ -947,7 +947,7 @@ static celt_glog median_of_5(const celt_glog *x) {
     }
 }
 
-static celt_glog median_of_3(const celt_glog *x) {
+static celt_glog oaci_median_of_3(const celt_glog *x) {
     celt_glog t0, t1, t2;
     if (x[0] > x[1]) {
         t0 = x[1];
@@ -965,7 +965,7 @@ static celt_glog median_of_3(const celt_glog *x) {
         return t0;
 }
 
-static celt_glog dynalloc_analysis(const celt_glog *bandLogE, const celt_glog *bandLogE2, const celt_glog *oldBandE,
+static celt_glog oaci_dynalloc_analysis(const celt_glog *bandLogE, const celt_glog *bandLogE2, const celt_glog *oldBandE,
                                    int nbEBands, int start, int end, int C, int *offsets, int lsb_depth,
                                    const oac_int16 *logN,
                                    int isTransient, int vbr, int constrained_vbr, const oac_int16 *eBands, int LM,
@@ -1071,11 +1071,11 @@ static celt_glog dynalloc_analysis(const celt_glog *bandLogE, const celt_glog *b
                reduces the impact of the median filter and makes dynalloc use more bits. */
             offset = GCONST(1.f);
             for (i = 2; i < end - 2; i++)
-                f[i] = MAXG(f[i], median_of_5(&bandLogE3[i - 2]) - offset);
-            tmp = median_of_3(&bandLogE3[0]) - offset;
+                f[i] = MAXG(f[i], oaci_median_of_5(&bandLogE3[i - 2]) - offset);
+            tmp = oaci_median_of_3(&bandLogE3[0]) - offset;
             f[0] = MAXG(f[0], tmp);
             f[1] = MAXG(f[1], tmp);
-            tmp = median_of_3(&bandLogE3[end - 3]) - offset;
+            tmp = oaci_median_of_3(&bandLogE3[end - 3]) - offset;
             f[end - 2] = MAXG(f[end - 2], tmp);
             f[end - 1] = MAXG(f[end - 1], tmp);
 
@@ -1189,7 +1189,7 @@ void oaci_normalize_tone_input(oac_val16 *x, int len) {
     for (i = 0; i < len; i++) {
         ac0 = ADD32(ac0, SHR32(MULT16_16(x[i], x[i]), 10));
     }
-    shift = 5 - (28 - celt_ilog2(ac0))/2;
+    shift = 5 - (28 - oaci_celt_ilog2(ac0))/2;
     if (shift > 0) {
         for (i = 0; i < len; i++) {
             x[i] = PSHR32(x[i], shift);
@@ -1211,7 +1211,7 @@ int oaci_acos_approx(oac_val32 x) {
 #endif
 
 /* Compute the LPC coefficients using a least-squares fit for both forward and backward prediction. */
-static int tone_lpc(const oac_val16 *x, int len, int delay, oac_val32 *lpc) {
+static int oaci_tone_lpc(const oac_val16 *x, int len, int delay, oac_val32 *lpc) {
     int i;
     oac_val32 r00 = 0, r01 = 0, r11 = 0, r02 = 0, r12 = 0, r22 = 0;
     oac_val32 edges;
@@ -1270,7 +1270,7 @@ static int tone_lpc(const oac_val16 *x, int len, int delay, oac_val32 *lpc) {
 }
 
 /* Detects pure of nearly pure tones so we can prevent them from causing problems with the encoder. */
-static oac_val16 tone_detect(const celt_sig *in, int CC, int N, oac_val32 *toneishness, oac_int32 Fs) {
+static oac_val16 oaci_tone_detect(const celt_sig *in, int CC, int N, oac_val32 *toneishness, oac_int32 Fs) {
     int i;
     int delay = 1;
     int fail;
@@ -1288,11 +1288,11 @@ static oac_val16 tone_detect(const celt_sig *in, int CC, int N, oac_val32 *tonei
 #ifdef FIXED_POINT
     oaci_normalize_tone_input(x, N);
 #endif
-    fail = tone_lpc(x, N, delay, lpc);
+    fail = oaci_tone_lpc(x, N, delay, lpc);
     /* If our LPC filter resonates too close to DC, retry the analysis with down-sampling. */
     while (delay <= Fs/3000 && (fail || (lpc[0] > QCONST32(1.f, 29) && lpc[1] < 0))) {
         delay *= 2;
-        fail = tone_lpc(x, N, delay, lpc);
+        fail = oaci_tone_lpc(x, N, delay, lpc);
     }
     /* Check that our filter has complex roots. */
     if (!fail && MULT32_32_Q31(lpc[0], lpc[0]) + MULT32_32_Q31(QCONST32(3.999999, 29), lpc[1]) < 0) {
@@ -1312,7 +1312,7 @@ static oac_val16 tone_detect(const celt_sig *in, int CC, int N, oac_val32 *tonei
     return freq;
 }
 
-static int run_prefilter(CELTEncoder *st, celt_sig *in, celt_sig *prefilter_mem, int CC, int N,
+static int oaci_run_prefilter(CELTEncoder *st, celt_sig *in, celt_sig *prefilter_mem, int CC, int N,
                          int prefilter_tapset, int *pitch, oac_val16 *gain, int *qgain, int enabled, int complexity,
                          oac_val16 tf_estimate,
                          int nbAvailableBytes, AnalysisInfo *analysis, oac_val16 tone_freq, oac_val32 toneishness,
@@ -1517,7 +1517,7 @@ static int run_prefilter(CELTEncoder *st, celt_sig *in, celt_sig *prefilter_mem,
     return pf_on;
 }
 
-static int compute_vbr(const CELTMode *mode, AnalysisInfo *analysis, oac_int32 base_target,
+static int oaci_compute_vbr(const CELTMode *mode, AnalysisInfo *analysis, oac_int32 base_target,
                        int LM, oac_int32 bitrate, int lastCodedBands, int C, int intensity,
                        int constrained_vbr, oac_val16 stereo_saving, int tot_boost,
                        oac_val16 tf_estimate, int pitch_change, celt_glog maxDepth,
@@ -1596,7 +1596,7 @@ static int compute_vbr(const CELTMode *mode, AnalysisInfo *analysis, oac_int32 b
         oac_int32 floor_depth;
         int bins;
         bins = eBands[nbEBands - 2]<<LM;
-        /*floor_depth = SHR32(MULT16_16((C*bins<<BITRES),celt_log2(SHL32(MAX16(1,sample_max),13))), DB_SHIFT);*/
+        /*floor_depth = SHR32(MULT16_16((C*bins<<BITRES),oaci_celt_log2(SHL32(MAX16(1,sample_max),13))), DB_SHIFT);*/
         floor_depth = (oac_int32)SHR32(MULT16_32_Q15((C*bins<<BITRES), maxDepth), DB_SHIFT - 15);
         floor_depth = IMAX(floor_depth, target>>2);
         target = IMIN(target, floor_depth);
@@ -1741,7 +1741,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
         nbFilledBytes = 0;
     } else {
         tell0_frac = oaci_ec_tell_frac(enc);
-        tell = ec_tell(enc);
+        tell = oaci_ec_tell(enc);
         nbFilledBytes = (tell + 4)>>3;
     }
 
@@ -1863,7 +1863,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
         /* Pretend we've filled all the remaining bits with zeros
               (that's what the initialiser did anyway) */
         tell = nbCompressedBytes*8;
-        enc->nbits_total += tell - ec_tell(enc);
+        enc->nbits_total += tell - oaci_ec_tell(enc);
     }
     c = 0; do {
         int need_clip = 0;
@@ -1878,7 +1878,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
     } while (++c < CC);
 
 
-    tone_freq = tone_detect(in, CC, N + overlap, &toneishness, mode->Fs);
+    tone_freq = oaci_tone_detect(in, CC, N + overlap, &toneishness, mode->Fs);
     isTransient = 0;
     shortBlocks = 0;
     if (st->complexity >= 1 && !st->lfe) {
@@ -1886,7 +1886,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
            in hybrid mode. It seems like we still want to have real transients on vowels
            though (small SILK quantization offset value). */
         int allow_weak_transients = hybrid && effectiveBytes < 15 && st->silk_info.signalType != 2;
-        isTransient = transient_analysis(in, N + overlap, CC,
+        isTransient = oaci_transient_analysis(in, N + overlap, CC,
             &tf_estimate, &tf_chan, allow_weak_transients, &weak_transient, tone_freq, toneishness);
     }
     toneishness = MIN32(toneishness, QCONST32(1.f, 29) - SHL32(tf_estimate, 15));
@@ -1898,7 +1898,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
                   && tell + 16 <= total_bits && !st->disable_pf;
 
         prefilter_tapset = st->tapset_decision;
-        pf_on = run_prefilter(st, in, prefilter_mem, CC, N, prefilter_tapset, &pitch_index, &gain1, &qg, enabled,
+        pf_on = oaci_run_prefilter(st, in, prefilter_mem, CC, N, prefilter_tapset, &pitch_index, &gain1, &qg, enabled,
         st->complexity, tf_estimate, nbAvailableBytes, &st->analysis, tone_freq, toneishness, qext_scale);
         if ((gain1 > QCONST16(.4f, 15) || st->prefilter_gain > QCONST16(.4f,
         15)) && (!st->analysis.valid || st->analysis.tonality > .3)
@@ -1921,7 +1921,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
             oaci_ec_enc_icdf(enc, prefilter_tapset, tapset_icdf, 4);
         }
     }
-    if (LM > 0 && ec_tell(enc) + 3 <= total_bits) {
+    if (LM > 0 && oaci_ec_tell(enc) + 3 <= total_bits) {
         if (isTransient)
             shortBlocks = M;
     } else {
@@ -1936,7 +1936,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
     secondMdct = shortBlocks && st->complexity >= 8;
     ALLOC(bandLogE2, C*nbEBands, celt_glog);
     if (secondMdct) {
-        compute_mdcts(mode, 0, in, freq, C, CC, LM, st->upsample, st->arch);
+        oaci_compute_mdcts(mode, 0, in, freq, C, CC, LM, st->upsample, st->arch);
         oaci_compute_band_energies(mode, freq, bandE, effEnd, C, LM, st->arch);
         oaci_amp2Log2(mode, effEnd, end, bandE, bandLogE2, C);
         for (c = 0; c < C; c++) {
@@ -1945,7 +1945,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
         }
     }
 
-    compute_mdcts(mode, shortBlocks, in, freq, C, CC, LM, st->upsample, st->arch);
+    oaci_compute_mdcts(mode, shortBlocks, in, freq, C, CC, LM, st->upsample, st->arch);
     /* This should catch any NaN in the CELT input. Since we're not supposed to see any (they're filtered
        at the Oac layer), just abort. */
     celt_assert(!celt_isnan(freq[0]) && (C == 1 || !celt_isnan(freq[N])));
@@ -2058,11 +2058,11 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
 
     /* Last chance to catch any transient we might have missed in the
        time-domain analysis */
-    if (LM > 0 && ec_tell(enc) + 3 <= total_bits && !isTransient && st->complexity >= 5 && !st->lfe && !hybrid) {
-        if (patch_transient_decision(bandLogE, oldBandE, nbEBands, start, end, C)) {
+    if (LM > 0 && oaci_ec_tell(enc) + 3 <= total_bits && !isTransient && st->complexity >= 5 && !st->lfe && !hybrid) {
+        if (oaci_patch_transient_decision(bandLogE, oldBandE, nbEBands, start, end, C)) {
             isTransient = 1;
             shortBlocks = M;
-            compute_mdcts(mode, shortBlocks, in, freq, C, CC, LM, st->upsample, st->arch);
+            oaci_compute_mdcts(mode, shortBlocks, in, freq, C, CC, LM, st->upsample, st->arch);
             oaci_compute_band_energies(mode, freq, bandE, effEnd, C, LM, st->arch);
             oaci_amp2Log2(mode, effEnd, end, bandE, bandLogE, C);
             /* Compensate for the scaling of short vs long mdcts */
@@ -2074,7 +2074,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
         }
     }
 
-    if (LM > 0 && ec_tell(enc) + 3 <= total_bits)
+    if (LM > 0 && oaci_ec_tell(enc) + 3 <= total_bits)
         oaci_ec_enc_bit_logp(enc, isTransient, 3);
 
     ALLOC(X, C*N, celt_norm);        /**< Interleaved normalised MDCTs */
@@ -2089,7 +2089,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
     ALLOC(importance, nbEBands, int);
     ALLOC(spread_weight, nbEBands, int);
 
-    maxDepth = dynalloc_analysis(bandLogE, bandLogE2, oldBandE, nbEBands, start, end, C, offsets,
+    maxDepth = oaci_dynalloc_analysis(bandLogE, bandLogE2, oldBandE, nbEBands, start, end, C, offsets,
          st->lsb_depth, mode->logN, isTransient, st->vbr, st->constrained_vbr,
          eBands, LM, effectiveBytes, &tot_boost, st->lfe, surround_dynalloc, &st->analysis, importance, spread_weight,
     tone_freq, toneishness, qext_scale);
@@ -2099,7 +2099,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
     if (enable_tf_analysis) {
         int lambda;
         lambda = IMAX(80, 20480/effectiveBytes + 2);
-        tf_select = tf_analysis(mode, effEnd, isTransient, tf_res, lambda, X, N, LM, tf_estimate, tf_chan, importance);
+        tf_select = oaci_tf_analysis(mode, effEnd, isTransient, tf_res, lambda, X, N, LM, tf_estimate, tf_chan, importance);
         for (i = effEnd; i < end; i++)
             tf_res[i] = tf_res[effEnd - 1];
     } else if (hybrid && weak_transient) {
@@ -2137,9 +2137,9 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
          C, LM, nbAvailableBytes, st->force_intra,
          &st->delayedIntra, st->complexity >= 4, st->loss_rate, st->lfe);
 
-    tf_encode(start, end, isTransient, tf_res, LM, tf_select, enc);
+    oaci_tf_encode(start, end, isTransient, tf_res, LM, tf_select, enc);
 
-    if (ec_tell(enc) + 4 <= total_bits) {
+    if (oaci_ec_tell(enc) + 4 <= total_bits) {
         if (st->lfe) {
             st->tapset_decision = 0;
             st->spread_decision = SPREAD_NORMAL;
@@ -2234,7 +2234,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
 
         /* Always use MS for 2.5 ms frames until we can do a better analysis */
         if (LM != 0)
-            dual_stereo = stereo_analysis(mode, X, LM, N);
+            dual_stereo = oaci_stereo_analysis(mode, X, LM, N);
 
         st->intensity = oaci_hysteresis_decision((oac_val16)(equiv_rate/1000),
             intensity_thresholds, intensity_histeresis, 21, st->intensity);
@@ -2247,7 +2247,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
             st->stereo_saving = 0;
             alloc_trim = 5;
         } else {
-            alloc_trim = alloc_trim_analysis(mode, X, bandLogE,
+            alloc_trim = oaci_alloc_trim_analysis(mode, X, bandLogE,
             end, LM, C, N, &st->analysis, &st->stereo_saving, tf_estimate,
             st->intensity, surround_trim, equiv_rate, st->arch);
         }
@@ -2287,7 +2287,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
             base_target += (st->vbr_offset>>lm_diff);
 
         if (!hybrid) {
-            target = compute_vbr(mode, &st->analysis, base_target, LM, equiv_rate,
+            target = oaci_compute_vbr(mode, &st->analysis, base_target, LM, equiv_rate,
            st->lastCodedBands, C, st->intensity, st->constrained_vbr,
            st->stereo_saving, tot_boost, tf_estimate, pitch_change, maxDepth,
            st->lfe, st->energy_mask != NULL, surround_masking,
@@ -2414,7 +2414,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
         oaci_ec_enc_bits(enc, anti_collapse_on, 1);
     }
     oaci_quant_energy_finalise(mode, start, end, oldBandE, error, fine_quant, fine_priority,
-    nbCompressedBytes*8 - ec_tell(enc), enc, C);
+    nbCompressedBytes*8 - oaci_ec_tell(enc), enc, C);
     c = 0;
     do {
         for (i = start; i < end; i++) {
diff --git a/celt/celt_lpc.c b/celt/celt_lpc.c
index 8776a5bcc..291138bcc 100644
--- a/celt/celt_lpc.c
+++ b/celt/celt_lpc.c
@@ -303,7 +303,7 @@ int oaci_celt_autocorr(
 #ifdef FIXED_POINT
     {
         oac_val32 ac0;
-        int ac0_shift = celt_ilog2(n + (n>>4));
+        int ac0_shift = oaci_celt_ilog2(n + (n>>4));
         ac0 = 1 + (n<<7);
         if (n&1) ac0 += SHR32(MULT16_16(xptr[0], xptr[0]), ac0_shift);
         for (i = (n&1); i < n; i += 2) {
@@ -313,7 +313,7 @@ int oaci_celt_autocorr(
         /* Consider the effect of rounding-to-nearest when scaling the signal. */
         ac0 += SHR32(ac0, 7);
 
-        shift = celt_ilog2(ac0) - 30 + ac0_shift + 1;
+        shift = oaci_celt_ilog2(ac0) - 30 + ac0_shift + 1;
         shift = (shift)/2;
         if (shift > 0) {
             for (i = 0; i < n; i++)
diff --git a/celt/cwrs.c b/celt/cwrs.c
index bdd86b05d..d0d1c1c91 100644
--- a/celt/cwrs.c
+++ b/celt/cwrs.c
@@ -544,7 +544,7 @@ oac_val32 oaci_decode_pulses(int *_y, int _n, int _k, ec_dec *_dec) {
 /*Computes the next row/column of any recurrence that obeys the relation
    u[i][j]=u[i-1][j]+u[i][j-1]+u[i-1][j-1].
    _ui0 is the base case for the new row/column.*/
-static OAC_INLINE void unext(oac_uint32 *_ui, unsigned _len, oac_uint32 _ui0) {
+static OAC_INLINE void oaci_unext(oac_uint32 *_ui, unsigned _len, oac_uint32 _ui0) {
     oac_uint32 ui1;
     unsigned j;
     /*This do-while will overrun the array if we don't have storage for at least
@@ -575,7 +575,7 @@ static OAC_INLINE void uprev(oac_uint32 *_ui, unsigned _n, oac_uint32 _ui0) {
 
 /*Compute V(_n,_k), as well as U(_n,0..._k+1).
    _u: On exit, _u[i] contains U(_n,i) for i in [0..._k+1].*/
-static oac_uint32 ncwrs_urow(unsigned _n, unsigned _k, oac_uint32 *_u) {
+static oac_uint32 oaci_ncwrs_urow(unsigned _n, unsigned _k, oac_uint32 *_u) {
     oac_uint32 um2;
     unsigned len;
     unsigned k;
@@ -592,7 +592,7 @@ static oac_uint32 ncwrs_urow(unsigned _n, unsigned _k, oac_uint32 *_u) {
     k = 2;
     do _u[k] = (k<<1) - 1;
     while (++k < len);
-    for (k = 2; k < _n; k++) unext(_u + 1, _k + 1, 1);
+    for (k = 2; k < _n; k++) oaci_unext(_u + 1, _k + 1, 1);
     return _u[_k] + _u[_k + 1];
 }
 
@@ -655,7 +655,7 @@ static OAC_INLINE oac_uint32 icwrs(int _n, int _k, oac_uint32 *_nc, const int *_
     k += abs(_y[j]);
     if (_y[j] < 0) i += _u[k + 1];
     while (j-- > 0) {
-        unext(_u, _k + 2, 0);
+        oaci_unext(_u, _k + 2, 0);
         i += _u[k];
         k += abs(_y[j]);
         if (_y[j] < 0) i += _u[k + 1];
@@ -677,7 +677,7 @@ void oaci_get_required_bits(oac_int16 *_bits, int _n, int _maxk, int _frac) {
         VARDECL(oac_uint32, u);
         SAVE_STACK;
         ALLOC(u, _maxk + 2U, oac_uint32);
-        ncwrs_urow(_n, _maxk, u);
+        oaci_ncwrs_urow(_n, _maxk, u);
         for (k = 1; k <= _maxk; k++)
             _bits[k] = oaci_log2_frac(u[k] + u[k + 1], _frac);
         RESTORE_STACK;
@@ -703,7 +703,7 @@ oac_val32 oaci_decode_pulses(int *_y, int _n, int _k, ec_dec *_dec) {
     SAVE_STACK;
     celt_assert(_k > 0);
     ALLOC(u, _k + 2U, oac_uint32);
-    ret = cwrsi(_n, _k, oaci_ec_dec_uint(_dec, ncwrs_urow(_n, _k, u)), _y, u);
+    ret = cwrsi(_n, _k, oaci_ec_dec_uint(_dec, oaci_ncwrs_urow(_n, _k, u)), _y, u);
     RESTORE_STACK;
     return ret;
 }
diff --git a/celt/entcode.h b/celt/entcode.h
index 13e8ff5f5..6a5179352 100644
--- a/celt/entcode.h
+++ b/celt/entcode.h
@@ -57,7 +57,7 @@ typedef struct ec_ctx ec_dec;
 # define BITRES 3
 
 /*The entropy encoder/decoder context.
-   We use the same structure for both, so that common functions like ec_tell()
+   We use the same structure for both, so that common functions like oaci_ec_tell()
    can be used on either one.*/
 struct ec_ctx {
     /*Buffered input/output.*/
@@ -108,7 +108,7 @@ static OAC_INLINE int ec_get_error(ec_ctx *_this) {
    Return: The number of bits.
           This will always be slightly larger than the exact value (e.g., all
            rounding error is in the positive direction).*/
-static OAC_INLINE int ec_tell(ec_ctx *_this) {
+static OAC_INLINE int oaci_ec_tell(ec_ctx *_this) {
     return _this->nbits_total - EC_ILOG(_this->rng);
 }
 
diff --git a/celt/entdec.c b/celt/entdec.c
index 548150bf9..8add976a6 100644
--- a/celt/entdec.c
+++ b/celt/entdec.c
@@ -88,18 +88,18 @@
    URL="http://www.stanford.edu/class/ee398a/handouts/papers/Moffat98ArithmCoding.pdf"
    }*/
 
-static int ec_read_byte(ec_dec *_this) {
+static int oaci_ec_read_byte(ec_dec *_this) {
     return _this->offs < _this->storage?_this->buf[_this->offs++]:0;
 }
 
-static int ec_read_byte_from_end(ec_dec *_this) {
+static int oaci_ec_read_byte_from_end(ec_dec *_this) {
     return _this->end_offs < _this->storage?
            _this->buf[_this->storage - ++(_this->end_offs)]:0;
 }
 
 /*Normalizes the contents of val and rng so that rng lies entirely in the
    high-order symbol.*/
-static void ec_dec_normalize(ec_dec *_this) {
+static void oaci_ec_dec_normalize(ec_dec *_this) {
     /*If the range is too small, rescale it and input some bits.*/
     while (_this->rng <= EC_CODE_BOT) {
         int sym;
@@ -108,7 +108,7 @@ static void ec_dec_normalize(ec_dec *_this) {
         /*Use up the remaining bits from our last symbol.*/
         sym = _this->rem;
         /*Read the next value from the input.*/
-        _this->rem = ec_read_byte(_this);
+        _this->rem = oaci_ec_read_byte(_this);
         /*Take the rest of the bits we need from this new symbol.*/
         sym = (sym<<EC_SYM_BITS|_this->rem)>>(EC_SYM_BITS - EC_CODE_EXTRA);
         /*And subtract them from val, capped to be less than EC_CODE_TOP.*/
@@ -122,18 +122,18 @@ void oaci_ec_dec_init(ec_dec *_this, unsigned char *_buf, oac_uint32 _storage) {
     _this->end_offs = 0;
     _this->end_window = 0;
     _this->nend_bits = 0;
-    /*This is the offset from which ec_tell() will subtract partial bits.
-       The final value after the ec_dec_normalize() call will be the same as in
+    /*This is the offset from which oaci_ec_tell() will subtract partial bits.
+       The final value after the oaci_ec_dec_normalize() call will be the same as in
        the encoder, but we have to compensate for the bits that are added there.*/
     _this->nbits_total = EC_CODE_BITS + 1
                          - ((EC_CODE_BITS - EC_CODE_EXTRA)/EC_SYM_BITS)*EC_SYM_BITS;
     _this->offs = 0;
     _this->rng = 1U<<EC_CODE_EXTRA;
-    _this->rem = ec_read_byte(_this);
+    _this->rem = oaci_ec_read_byte(_this);
     _this->val = _this->rng - 1 - (_this->rem>>(EC_SYM_BITS - EC_CODE_EXTRA));
     _this->error = 0;
     /*Normalize the interval.*/
-    ec_dec_normalize(_this);
+    oaci_ec_dec_normalize(_this);
 }
 
 unsigned oaci_ec_decode(ec_dec *_this, unsigned _ft) {
@@ -155,7 +155,7 @@ void oaci_ec_dec_update(ec_dec *_this, unsigned _fl, unsigned _fh, unsigned _ft)
     s = IMUL32(_this->ext, _ft - _fh);
     _this->val -= s;
     _this->rng = _fl > 0?IMUL32(_this->ext, _fh - _fl):_this->rng - s;
-    ec_dec_normalize(_this);
+    oaci_ec_dec_normalize(_this);
 }
 
 /*The probability of having a "one" is 1/(1<<_logp).*/
@@ -170,7 +170,7 @@ int oaci_ec_dec_bit_logp(ec_dec *_this, unsigned _logp) {
     ret = d < s;
     if (!ret) _this->val = d - s;
     _this->rng = ret?s:r - s;
-    ec_dec_normalize(_this);
+    oaci_ec_dec_normalize(_this);
     return ret;
 }
 
@@ -190,7 +190,7 @@ int oaci_ec_dec_icdf(ec_dec *_this, const unsigned char *_icdf, unsigned _ftb) {
     } while (d < s);
     _this->val = d - s;
     _this->rng = t - s;
-    ec_dec_normalize(_this);
+    oaci_ec_dec_normalize(_this);
     return ret;
 }
 
@@ -210,7 +210,7 @@ int oaci_ec_dec_icdf16(ec_dec *_this, const oac_uint16 *_icdf, unsigned _ftb) {
     } while (d < s);
     _this->val = d - s;
     _this->rng = t - s;
-    ec_dec_normalize(_this);
+    oaci_ec_dec_normalize(_this);
     return ret;
 }
 
@@ -248,7 +248,7 @@ oac_uint32 oaci_ec_dec_bits(ec_dec *_this, unsigned _bits) {
     available = _this->nend_bits;
     if ((unsigned)available < _bits) {
         do {
-            window |= (ec_window)ec_read_byte_from_end(_this)<<available;
+            window |= (ec_window)oaci_ec_read_byte_from_end(_this)<<available;
             available += EC_SYM_BITS;
         } while (available <= EC_WINDOW_SIZE - EC_SYM_BITS);
     }
diff --git a/celt/entenc.c b/celt/entenc.c
index 77a583e02..e1958fc58 100644
--- a/celt/entenc.c
+++ b/celt/entenc.c
@@ -57,13 +57,13 @@
    URL="http://www.stanford.edu/class/ee398/handouts/papers/Moffat98ArithmCoding.pdf"
    }*/
 
-static int ec_write_byte(ec_enc *_this, unsigned _value) {
+static int oaci_ec_write_byte(ec_enc *_this, unsigned _value) {
     if (_this->offs + _this->end_offs >= _this->storage) return -1;
     _this->buf[_this->offs++] = (unsigned char)_value;
     return 0;
 }
 
-static int ec_write_byte_at_end(ec_enc *_this, unsigned _value) {
+static int oaci_ec_write_byte_at_end(ec_enc *_this, unsigned _value) {
     if (_this->offs + _this->end_offs >= _this->storage) return -1;
     _this->buf[_this->storage - ++(_this->end_offs)] = (unsigned char)_value;
     return 0;
@@ -79,28 +79,28 @@ static int ec_write_byte_at_end(ec_enc *_this, unsigned _value) {
    32-bit systems.
    The alternative is to truncate the range in order to force a carry, but
    requires similar carry tracking in the decoder, needlessly slowing it down.*/
-static void ec_enc_carry_out(ec_enc *_this, int _c) {
+static void oaci_ec_enc_carry_out(ec_enc *_this, int _c) {
     if (_c != EC_SYM_MAX) {
         /*No further carry propagation possible, flush buffer.*/
         int carry;
         carry = _c>>EC_SYM_BITS;
         /*Don't output a byte on the first write.
            This compare should be taken care of by branch-prediction thereafter.*/
-        if (_this->rem >= 0) _this->error |= ec_write_byte(_this, _this->rem + carry);
+        if (_this->rem >= 0) _this->error |= oaci_ec_write_byte(_this, _this->rem + carry);
         if (_this->ext > 0) {
             unsigned sym;
             sym = (EC_SYM_MAX + carry)&EC_SYM_MAX;
-            do _this->error |= ec_write_byte(_this, sym);
+            do _this->error |= oaci_ec_write_byte(_this, sym);
             while (--(_this->ext) > 0);
         }
         _this->rem = _c&EC_SYM_MAX;
     } else _this->ext++;
 }
 
-static OAC_INLINE void ec_enc_normalize(ec_enc *_this) {
+static OAC_INLINE void oaci_ec_enc_normalize(ec_enc *_this) {
     /*If the range is too small, output some bits and rescale it.*/
     while (_this->rng <= EC_CODE_BOT) {
-        ec_enc_carry_out(_this, (int)(_this->val>>EC_CODE_SHIFT));
+        oaci_ec_enc_carry_out(_this, (int)(_this->val>>EC_CODE_SHIFT));
         /*Move the next-to-high-order symbol into the high-order position.*/
         _this->val = (_this->val<<EC_SYM_BITS)&(EC_CODE_TOP - 1);
         _this->rng <<= EC_SYM_BITS;
@@ -113,7 +113,7 @@ void oaci_ec_enc_init(ec_enc *_this, unsigned char *_buf, oac_uint32 _size) {
     _this->end_offs = 0;
     _this->end_window = 0;
     _this->nend_bits = 0;
-    /*This is the offset from which ec_tell() will subtract partial bits.*/
+    /*This is the offset from which oaci_ec_tell() will subtract partial bits.*/
     _this->nbits_total = EC_CODE_BITS + 1;
     _this->offs = 0;
     _this->rng = EC_CODE_TOP;
@@ -131,7 +131,7 @@ void oaci_ec_encode(ec_enc *_this, unsigned _fl, unsigned _fh, unsigned _ft) {
         _this->val += _this->rng - IMUL32(r, (_ft - _fl));
         _this->rng = IMUL32(r, (_fh - _fl));
     } else _this->rng -= IMUL32(r, (_ft - _fh));
-    ec_enc_normalize(_this);
+    oaci_ec_enc_normalize(_this);
 }
 
 void oaci_ec_encode_bin(ec_enc *_this, unsigned _fl, unsigned _fh, unsigned _bits) {
@@ -141,7 +141,7 @@ void oaci_ec_encode_bin(ec_enc *_this, unsigned _fl, unsigned _fh, unsigned _bit
         _this->val += _this->rng - IMUL32(r, ((1U<<_bits) - _fl));
         _this->rng = IMUL32(r, (_fh - _fl));
     } else _this->rng -= IMUL32(r, ((1U<<_bits) - _fh));
-    ec_enc_normalize(_this);
+    oaci_ec_enc_normalize(_this);
 }
 
 /*The probability of having a "one" is 1/(1<<_logp).*/
@@ -155,7 +155,7 @@ void oaci_ec_enc_bit_logp(ec_enc *_this, int _val, unsigned _logp) {
     r -= s;
     if (_val) _this->val = l + r;
     _this->rng = _val?s:r;
-    ec_enc_normalize(_this);
+    oaci_ec_enc_normalize(_this);
 }
 
 void oaci_ec_enc_icdf(ec_enc *_this, int _s, const unsigned char *_icdf, unsigned _ftb) {
@@ -165,7 +165,7 @@ void oaci_ec_enc_icdf(ec_enc *_this, int _s, const unsigned char *_icdf, unsigne
         _this->val += _this->rng - IMUL32(r, _icdf[_s - 1]);
         _this->rng = IMUL32(r, _icdf[_s - 1] - _icdf[_s]);
     } else _this->rng -= IMUL32(r, _icdf[_s]);
-    ec_enc_normalize(_this);
+    oaci_ec_enc_normalize(_this);
 }
 
 void oaci_ec_enc_icdf16(ec_enc *_this, int _s, const oac_uint16 *_icdf, unsigned _ftb) {
@@ -175,7 +175,7 @@ void oaci_ec_enc_icdf16(ec_enc *_this, int _s, const oac_uint16 *_icdf, unsigned
         _this->val += _this->rng - IMUL32(r, _icdf[_s - 1]);
         _this->rng = IMUL32(r, _icdf[_s - 1] - _icdf[_s]);
     } else _this->rng -= IMUL32(r, _icdf[_s]);
-    ec_enc_normalize(_this);
+    oaci_ec_enc_normalize(_this);
 }
 
 void oaci_ec_enc_uint(ec_enc *_this, oac_uint32 _fl, oac_uint32 _ft) {
@@ -203,7 +203,7 @@ void oaci_ec_enc_bits(ec_enc *_this, oac_uint32 _fl, unsigned _bits) {
     celt_assert(_bits > 0);
     if (used + _bits > EC_WINDOW_SIZE) {
         do {
-            _this->error |= ec_write_byte_at_end(_this, (unsigned)window&EC_SYM_MAX);
+            _this->error |= oaci_ec_write_byte_at_end(_this, (unsigned)window&EC_SYM_MAX);
             window >>= EC_SYM_BITS;
             used -= EC_SYM_BITS;
         } while (used >= EC_SYM_BITS);
@@ -260,17 +260,17 @@ void oaci_ec_enc_done(ec_enc *_this) {
         end = (_this->val + msk)&~msk;
     }
     while (l > 0) {
-        ec_enc_carry_out(_this, (int)(end>>EC_CODE_SHIFT));
+        oaci_ec_enc_carry_out(_this, (int)(end>>EC_CODE_SHIFT));
         end = (end<<EC_SYM_BITS)&(EC_CODE_TOP - 1);
         l -= EC_SYM_BITS;
     }
     /*If we have a buffered byte flush it into the output buffer.*/
-    if (_this->rem >= 0 || _this->ext > 0) ec_enc_carry_out(_this, 0);
+    if (_this->rem >= 0 || _this->ext > 0) oaci_ec_enc_carry_out(_this, 0);
     /*If we have buffered extra bits, flush them as well.*/
     window = _this->end_window;
     used = _this->nend_bits;
     while (used >= EC_SYM_BITS) {
-        _this->error |= ec_write_byte_at_end(_this, (unsigned)window&EC_SYM_MAX);
+        _this->error |= oaci_ec_write_byte_at_end(_this, (unsigned)window&EC_SYM_MAX);
         window >>= EC_SYM_BITS;
         used -= EC_SYM_BITS;
     }
diff --git a/celt/fixed_c5x.h b/celt/fixed_c5x.h
index b4787e944..d128e5d0b 100644
--- a/celt/fixed_c5x.h
+++ b/celt/fixed_c5x.h
@@ -69,10 +69,10 @@ static OAC_INLINE long IMUL32(long i, long j) {
 #undef MULT16_32_Q15
 #define MULT16_32_Q15(a, b) ADD32(SHL(MULT16_16((a), SHR((b), 16)), 1), SHR(MULT16_16SU((a), (b)), 15))
 
-#define celt_ilog2(x) (30 - _lnorm(x))
+#define oaci_celt_ilog2(x) (30 - _lnorm(x))
 #define OVERRIDE_CELT_ILOG2
 
-#define celt_maxabs16(x, len) MAX32(EXTEND32(maxval((DATA *)x, len)), -EXTEND32(minval((DATA *)x, len)))
+#define oaci_celt_maxabs16(x, len) MAX32(EXTEND32(maxval((DATA *)x, len)), -EXTEND32(minval((DATA *)x, len)))
 #define OVERRIDE_CELT_MAXABS16
 
 #endif /* FIXED_C5X_H */
diff --git a/celt/fixed_c6x.h b/celt/fixed_c6x.h
index c77b974a4..90b5879f9 100644
--- a/celt/fixed_c6x.h
+++ b/celt/fixed_c6x.h
@@ -37,7 +37,7 @@
 # undef MULT_16_16
 # define MULT_16_16(a, b) _mpy(a, b)
 
-# define celt_ilog2(x) (30 - _norm(x))
+# define oaci_celt_ilog2(x) (30 - _norm(x))
 # define OVERRIDE_CELT_ILOG2
 
 # undef MULT16_32_Q15
@@ -64,7 +64,7 @@
 #  undef MULT16_16_Q15
 #  define MULT16_16_Q15(a, b) (_smpy(a, b))
 
-#  define celt_maxabs16(x, len) MAX32(EXTEND32(maxval((DATA *)x, len)), -EXTEND32(minval((DATA *)x, len)))
+#  define oaci_celt_maxabs16(x, len) MAX32(EXTEND32(maxval((DATA *)x, len)), -EXTEND32(minval((DATA *)x, len)))
 #  define OVERRIDE_CELT_MAXABS16
 
 # endif /* FIXED_C6X_H */
diff --git a/celt/kiss_fft.c b/celt/kiss_fft.c
index a78feedb7..ef14aa5f1 100644
--- a/celt/kiss_fft.c
+++ b/celt/kiss_fft.c
@@ -49,7 +49,7 @@
    complex numbers.  It also declares the kf_ internal functions.
  */
 
-static void kf_bfly2(
+static void oaci_kf_bfly2(
     kiss_fft_cpx * Fout,
     int m,
     int N) {
@@ -100,7 +100,7 @@ static void kf_bfly2(
     }
 }
 
-static void kf_bfly4(
+static void oaci_kf_bfly4(
     kiss_fft_cpx * Fout,
     const size_t fstride,
     const kiss_fft_state *st,
@@ -166,7 +166,7 @@ static void kf_bfly4(
 
 #ifndef RADIX_TWO_ONLY
 
-static void kf_bfly3(
+static void oaci_kf_bfly3(
     kiss_fft_cpx * Fout,
     const size_t fstride,
     const kiss_fft_state *st,
@@ -221,8 +221,8 @@ static void kf_bfly3(
 }
 
 
-# ifndef OVERRIDE_kf_bfly5
-static void kf_bfly5(
+# ifndef OVERRIDE_oaci_kf_bfly5
+static void oaci_kf_bfly5(
     kiss_fft_cpx * Fout,
     const size_t fstride,
     const kiss_fft_state *st,
@@ -295,7 +295,7 @@ static void kf_bfly5(
         }
     }
 }
-# endif /* OVERRIDE_kf_bfly5 */
+# endif /* OVERRIDE_oaci_kf_bfly5 */
 
 
 #endif
@@ -304,7 +304,7 @@ static void kf_bfly5(
 #ifdef CUSTOM_MODES
 
 static
-void compute_bitrev_table(
+void oaci_compute_bitrev_table(
     int Fout,
     oac_int16 *f,
     const size_t fstride,
@@ -324,7 +324,7 @@ void compute_bitrev_table(
     } else {
         int j;
         for (j = 0; j < p; j++) {
-            compute_bitrev_table( Fout, f, fstride*p, in_stride, factors, st);
+            oaci_compute_bitrev_table( Fout, f, fstride*p, in_stride, factors, st);
             f += fstride*in_stride;
             Fout += m;
         }
@@ -386,7 +386,7 @@ int kf_factor(int n, oac_int16 * facbuf) {
     return 1;
 }
 
-static void compute_twiddles(kiss_twiddle_cpx *twiddles, int nfft) {
+static void oaci_compute_twiddles(kiss_twiddle_cpx *twiddles, int nfft) {
     int i;
 # ifdef FIXED_POINT
     for (i = 0; i < nfft; ++i) {
@@ -432,7 +432,7 @@ kiss_fft_state *oac_fft_alloc_twiddles(int nfft, void * mem, size_t * lenmem,
 
         st->nfft = nfft;
 # ifdef FIXED_POINT
-        st->scale_shift = celt_ilog2(st->nfft);
+        st->scale_shift = oaci_celt_ilog2(st->nfft);
         if (st->nfft == 1<<st->scale_shift)
             st->scale = QCONST32(1.0f, 30);
         else
@@ -449,7 +449,7 @@ kiss_fft_state *oac_fft_alloc_twiddles(int nfft, void * mem, size_t * lenmem,
                 goto fail;
         } else {
             st->twiddles = twiddles = (kiss_twiddle_cpx*)KISS_FFT_MALLOC(sizeof(kiss_twiddle_cpx)*nfft);
-            compute_twiddles(twiddles, nfft);
+            oaci_compute_twiddles(twiddles, nfft);
             st->shift = -1;
         }
         if (!kf_factor(nfft, st->factors)) {
@@ -460,7 +460,7 @@ kiss_fft_state *oac_fft_alloc_twiddles(int nfft, void * mem, size_t * lenmem,
         st->bitrev = bitrev = (oac_int16*)KISS_FFT_MALLOC(sizeof(oac_int16)*nfft);
         if (st->bitrev == NULL)
             goto fail;
-        compute_bitrev_table(0, bitrev, 1, 1, st->factors, st);
+        oaci_compute_bitrev_table(0, bitrev, 1, 1, st->factors, st);
 
         /* Initialize architecture specific fft parameters */
         if (oac_fft_alloc_arch(st, arch))
@@ -493,8 +493,8 @@ void oac_fft_free(const kiss_fft_state *cfg, int arch) {
 #endif /* CUSTOM_MODES */
 
 #ifdef FIXED_POINT
-# ifndef OVERRIDE_fft_downshift
-static void fft_downshift(kiss_fft_cpx *x, int N, int *total, int step) {
+# ifndef OVERRIDE_oaci_fft_downshift
+static void oaci_fft_downshift(kiss_fft_cpx *x, int N, int *total, int step) {
     int shift;
     shift = IMIN(step, *total);
     *total -= shift;
@@ -512,9 +512,9 @@ static void fft_downshift(kiss_fft_cpx *x, int N, int *total, int step) {
         }
     }
 }
-# endif /* OVERRIDE_fft_downshift */
+# endif /* OVERRIDE_oaci_fft_downshift */
 #else
-# define fft_downshift(x, N, total, step)
+# define oaci_fft_downshift(x, N, total, step)
 #endif
 
 void oac_fft_impl(const kiss_fft_state *st, kiss_fft_cpx *fout ARG_FIXED(int downshift)) {
@@ -544,27 +544,27 @@ void oac_fft_impl(const kiss_fft_state *st, kiss_fft_cpx *fout ARG_FIXED(int dow
             m2 = 1;
         switch (st->factors[2*i]) {
             case 2:
-                fft_downshift(fout, st->nfft, &downshift, 1);
-                kf_bfly2(fout, m, fstride[i]);
+                oaci_fft_downshift(fout, st->nfft, &downshift, 1);
+                oaci_kf_bfly2(fout, m, fstride[i]);
                 break;
             case 4:
-                fft_downshift(fout, st->nfft, &downshift, 2);
-                kf_bfly4(fout, fstride[i]<<shift, st, m, fstride[i], m2);
+                oaci_fft_downshift(fout, st->nfft, &downshift, 2);
+                oaci_kf_bfly4(fout, fstride[i]<<shift, st, m, fstride[i], m2);
                 break;
 #ifndef RADIX_TWO_ONLY
             case 3:
-                fft_downshift(fout, st->nfft, &downshift, 2);
-                kf_bfly3(fout, fstride[i]<<shift, st, m, fstride[i], m2);
+                oaci_fft_downshift(fout, st->nfft, &downshift, 2);
+                oaci_kf_bfly3(fout, fstride[i]<<shift, st, m, fstride[i], m2);
                 break;
             case 5:
-                fft_downshift(fout, st->nfft, &downshift, 3);
-                kf_bfly5(fout, fstride[i]<<shift, st, m, fstride[i], m2);
+                oaci_fft_downshift(fout, st->nfft, &downshift, 3);
+                oaci_kf_bfly5(fout, fstride[i]<<shift, st, m, fstride[i], m2);
                 break;
 #endif
         }
         m = m2;
     }
-    fft_downshift(fout, st->nfft, &downshift, downshift);
+    oaci_fft_downshift(fout, st->nfft, &downshift, downshift);
 }
 
 void oac_fft_c(const kiss_fft_state *st, const kiss_fft_cpx *fin, kiss_fft_cpx *fout) {
diff --git a/celt/laplace.c b/celt/laplace.c
index 614f6feb0..6d03a9d5f 100644
--- a/celt/laplace.c
+++ b/celt/laplace.c
@@ -41,7 +41,7 @@
 #define LAPLACE_NMIN (16)
 
 /* When called, decay is positive and at most 11456. */
-static unsigned ec_laplace_get_freq1(unsigned fs0, int decay) {
+static unsigned oaci_ec_laplace_get_freq1(unsigned fs0, int decay) {
     unsigned ft;
     ft = 32768 - LAPLACE_MINP*(2*LAPLACE_NMIN) - fs0;
     return ft*(oac_int32)(16384 - decay)>>15;
@@ -57,7 +57,7 @@ void oaci_ec_laplace_encode(ec_enc *enc, int *value, unsigned fs, int decay) {
         s = -(val < 0);
         val = (val + s)^s;
         fl = fs;
-        fs = ec_laplace_get_freq1(fs, decay);
+        fs = oaci_ec_laplace_get_freq1(fs, decay);
         /* Search the decaying part of the PDF.*/
         for (i = 1; fs > 0 && i < val; i++) {
             fs *= 2;
@@ -93,7 +93,7 @@ int oaci_ec_laplace_decode(ec_dec *dec, unsigned fs, int decay) {
     if (fm >= fs) {
         val++;
         fl = fs;
-        fs = ec_laplace_get_freq1(fs, decay) + LAPLACE_MINP;
+        fs = oaci_ec_laplace_get_freq1(fs, decay) + LAPLACE_MINP;
         /* Search the decaying part of the PDF.*/
         while (fs > LAPLACE_MINP && fm >= fl + 2*fs) {
             fs *= 2;
diff --git a/celt/mathops.c b/celt/mathops.c
index e2345fd22..fcfe7c97f 100644
--- a/celt/mathops.c
+++ b/celt/mathops.c
@@ -71,7 +71,7 @@ unsigned oaci_isqrt32(oac_uint32 _val) {
 oac_val32 oaci_frac_div32_q29(oac_val32 a, oac_val32 b) {
     oac_val16 rcp;
     oac_val32 result, rem;
-    int shift = celt_ilog2(b) - 29;
+    int shift = oaci_celt_ilog2(b) - 29;
     a = VSHR32(a, shift);
     b = VSHR32(b, shift);
     /* 16-bit reciprocal */
@@ -145,7 +145,7 @@ oac_val32 oaci_celt_sqrt(oac_val32 x) {
         return 0;
     else if (x >= 1073741824)
         return 32767;
-    k = (celt_ilog2(x)>>1) - 7;
+    k = (oaci_celt_ilog2(x)>>1) - 7;
     x = VSHR32(x, 2*k);
     n = x - 32768;
     rt = ADD32(C[0], MULT16_16_Q15(n, ADD16(C[1], MULT16_16_Q15(n, ADD16(C[2],
@@ -163,7 +163,7 @@ oac_val32 oaci_celt_sqrt32(oac_val32 x) {
         return 0;
     else if (x >= 1073741824)
         return 2147483647; /* 2^31 -1 */
-    k = (celt_ilog2(x)>>1);
+    k = (oaci_celt_ilog2(x)>>1);
     x_frac = VSHR32(x, 2*(k - 14) - 1);
     x_frac = MULT32_32_Q31(oaci_celt_rsqrt_norm32(x_frac), x_frac);
     if (k < 12) return PSHR32(x_frac, 12 - k);
@@ -175,7 +175,7 @@ oac_val32 oaci_celt_sqrt32(oac_val32 x) {
 # define L3 8277
 # define L4 -626
 
-static OAC_INLINE oac_val16 _celt_cos_pi_2(oac_val16 x) {
+static OAC_INLINE oac_val16 oaci_celt_cos_pi_2(oac_val16 x) {
     oac_val16 x2;
 
     x2 = MULT16_16_P15(x, x);
@@ -195,9 +195,9 @@ oac_val16 oaci_celt_cos_norm(oac_val32 x) {
         x = SUB32(SHL32(EXTEND32(1), 17), x);
     if (x&0x00007fff) {
         if (x < SHL32(EXTEND32(1), 15)) {
-            return _celt_cos_pi_2(EXTRACT16(x));
+            return oaci_celt_cos_pi_2(EXTRACT16(x));
         } else {
-            return NEG16(_celt_cos_pi_2(EXTRACT16(65536 - x)));
+            return NEG16(oaci_celt_cos_pi_2(EXTRACT16(65536 - x)));
         }
     } else {
         if (x&0x0000ffff)
@@ -276,7 +276,7 @@ oac_val32 oaci_celt_rcp(oac_val32 x) {
     int i;
     oac_val16 r;
     celt_sig_assert(x > 0);
-    i = celt_ilog2(x);
+    i = oaci_celt_ilog2(x);
 
     /* Compute the reciprocal of a Q15 number in the range [0, 1). */
     r = oaci_celt_rcp_norm16(VSHR32(x, i - 15) - 32768);
diff --git a/celt/mathops.h b/celt/mathops.h
index 7c5ab3e3b..45fbc8287 100644
--- a/celt/mathops.h
+++ b/celt/mathops.h
@@ -82,7 +82,7 @@ static OAC_INLINE float fast_atan2f(float y, float x) {
 
 
 #ifndef OVERRIDE_CELT_MAXABS16
-static OAC_INLINE oac_val32 celt_maxabs16(const oac_val16 *x, int len) {
+static OAC_INLINE oac_val32 oaci_celt_maxabs16(const oac_val16 *x, int len) {
     int i;
     oac_val16 maxval = 0;
     oac_val16 minval = 0;
@@ -108,7 +108,7 @@ static OAC_INLINE oac_res celt_maxabs_res(const oac_res *x, int len) {
     return MAX32(maxval, -minval);
 }
 #else
-# define celt_maxabs_res celt_maxabs16
+# define celt_maxabs_res oaci_celt_maxabs16
 #endif
 
 
@@ -125,14 +125,14 @@ static OAC_INLINE oac_val32 celt_maxabs32(const oac_val32 *x, int len) {
     return MAX32(maxval, -minval);
 }
 # else
-#  define celt_maxabs32(x, len) celt_maxabs16(x, len)
+#  define celt_maxabs32(x, len) oaci_celt_maxabs16(x, len)
 # endif
 #endif
 
 #ifndef FIXED_POINT
 /* Calculates the arctangent of x using a Remez approximation of order 15,
  * incorporating only odd-powered terms. */
-static OAC_INLINE float celt_atan_norm(float x) {
+static OAC_INLINE float oaci_celt_atan_norm(float x) {
 # define ATAN2_2_OVER_PI 0.636619772367581f
     float x_sq = x*x;
 
@@ -168,9 +168,9 @@ static OAC_INLINE float celt_atan2p_norm(float y, float x) {
     }
 
     if (y < x) {
-        return celt_atan_norm(y/x);
+        return oaci_celt_atan_norm(y/x);
     } else {
-        return 1.f - celt_atan_norm(x/y);
+        return 1.f - oaci_celt_atan_norm(x/y);
     }
 }
 #endif
@@ -257,7 +257,7 @@ static const float log2_y_norm_coeff[8] = {
     5.849624872207641601562500e-01f, 7.004396915435791015625000e-01f,
     8.073549270629882812500000e-01f, 9.068905711174011230468750e-01f};
 
-static OAC_INLINE float celt_log2(float x) {
+static OAC_INLINE float oaci_celt_log2(float x) {
     oac_int32 integer;
     oac_int32 range_idx;
     union {
@@ -297,7 +297,7 @@ static OAC_INLINE float celt_log2(float x) {
  * of order 5, ensuring a controlled relative error.
  * exp2(x) = exp2(integer + fraction)
  *         = exp2(integer) * exp2(fraction) */
-static OAC_INLINE float celt_exp2(float x) {
+static OAC_INLINE float oaci_celt_exp2(float x) {
     oac_int32 integer;
     float frac;
     union {
@@ -329,16 +329,16 @@ static OAC_INLINE float celt_exp2(float x) {
 }
 
 # else
-#  define celt_log2(x) ((float)(1.442695040888963387*log(x)))
-#  define celt_exp2(x) ((float)exp(0.6931471805599453094*(x)))
+#  define oaci_celt_log2(x) ((float)(1.442695040888963387*log(x)))
+#  define oaci_celt_exp2(x) ((float)exp(0.6931471805599453094*(x)))
 # endif
 
-# define celt_exp2_db celt_exp2
-# define celt_log2_db celt_log2
+# define celt_exp2_db oaci_celt_exp2
+# define oaci_celt_log2_db oaci_celt_log2
 
-# define celt_sin(x) celt_cos_norm2((0.5f*PI)*(x) - 1.0f)
-# define celt_log(x) (celt_log2(x)*0.6931471805599453f)
-# define celt_exp(x) (celt_exp2((x)*1.4426950408889634f))
+# define oaci_celt_sin(x) celt_cos_norm2((0.5f*PI)*(x) - 1.0f)
+# define celt_log(x) (oaci_celt_log2(x)*0.6931471805599453f)
+# define celt_exp(x) (oaci_celt_exp2((x)*1.4426950408889634f))
 
 #endif
 
@@ -348,7 +348,7 @@ static OAC_INLINE float celt_exp2(float x) {
 
 # ifndef OVERRIDE_CELT_ILOG2
 /** Integer log in base2. Undefined for zero and negative numbers */
-static OAC_INLINE oac_int16 celt_ilog2(oac_int32 x) {
+static OAC_INLINE oac_int16 oaci_celt_ilog2(oac_int32 x) {
     celt_sig_assert(x > 0);
     return EC_ILOG(x) - 1;
 }
@@ -356,8 +356,8 @@ static OAC_INLINE oac_int16 celt_ilog2(oac_int32 x) {
 
 
 /** Integer log in base2. Defined for zero, but not for negative numbers */
-static OAC_INLINE oac_int16 celt_zlog2(oac_val32 x) {
-    return x <= 0 ? 0 : celt_ilog2(x);
+static OAC_INLINE oac_int16 oaci_celt_zlog2(oac_val32 x) {
+    return x <= 0 ? 0 : oaci_celt_ilog2(x);
 }
 
 oac_val16 oaci_celt_rsqrt_norm(oac_val32 x);
@@ -373,7 +373,7 @@ oac_val16 oaci_celt_cos_norm(oac_val32 x);
 oac_val32 oaci_celt_cos_norm32(oac_val32 x);
 
 /** Base-2 logarithm approximation (log2(x)). (Q14 input, Q10 output) */
-static OAC_INLINE oac_val16 celt_log2(oac_val32 x) {
+static OAC_INLINE oac_val16 oaci_celt_log2(oac_val32 x) {
     int i;
     oac_val16 n, frac;
     /* -0.41509302963303146, 0.9609890551383969, -0.31836011537636605,
@@ -381,7 +381,7 @@ static OAC_INLINE oac_val16 celt_log2(oac_val32 x) {
     static const oac_val16 C[5] = {-6801 + (1<<(13 - 10)), 15746, -5217, 2545, -1401};
     if (x == 0)
         return -32767;
-    i = celt_ilog2(x);
+    i = oaci_celt_ilog2(x);
     n = VSHR32(x, i - 15) - 32768 - 16384;
     frac = ADD16(C[0],
     MULT16_16_Q15(n,
@@ -400,7 +400,7 @@ static OAC_INLINE oac_val16 celt_log2(oac_val32 x) {
 # define D2 14819
 # define D3 10204
 
-static OAC_INLINE oac_val32 celt_exp2_frac(oac_val16 x) {
+static OAC_INLINE oac_val32 oaci_celt_exp2_frac(oac_val16 x) {
     oac_val16 frac;
     frac = SHL16(x, 4);
     return ADD16(D0, MULT16_16_Q15(frac, ADD16(D1, MULT16_16_Q15(frac, ADD16(D2, MULT16_16_Q15(D3, frac))))));
@@ -412,7 +412,7 @@ static OAC_INLINE oac_val32 celt_exp2_frac(oac_val16 x) {
 # undef D3
 
 /** Base-2 exponential approximation (2^x). (Q10 input, Q16 output) */
-static OAC_INLINE oac_val32 celt_exp2(oac_val16 x) {
+static OAC_INLINE oac_val32 oaci_celt_exp2(oac_val16 x) {
     int integer;
     oac_val16 frac;
     integer = SHR16(x, 10);
@@ -420,13 +420,13 @@ static OAC_INLINE oac_val32 celt_exp2(oac_val16 x) {
         return 0x7f000000;
     else if (integer < -15)
         return 0;
-    frac = celt_exp2_frac(x - SHL16(integer, 10));
+    frac = oaci_celt_exp2_frac(x - SHL16(integer, 10));
     return VSHR32(EXTEND32(frac), -integer - 2);
 }
 
 /* Calculates the base-2 logarithm of a Q14 input value. The result is returned
  * in Q(DB_SHIFT). If the input value is 0, the function will output -32.0f. */
-static OAC_INLINE oac_val32 celt_log2_db(oac_val32 x) {
+static OAC_INLINE oac_val32 oaci_celt_log2_db(oac_val32 x) {
     /* Q30 */
     static const oac_val32 log2_x_norm_coeff[8] = {
         1073741824, 954437184, 858993472, 780903168,
@@ -446,7 +446,7 @@ static OAC_INLINE oac_val32 celt_log2_db(oac_val32 x) {
     if (x == 0) {
         return -536870912; /* -32.0f */
     }
-    integer =  SUB32(celt_ilog2(x), 14); /* Q0 */
+    integer =  SUB32(oaci_celt_ilog2(x), 14); /* Q0 */
     mantissa = VSHR32(x, integer + 14 - 29); /* Q29 */
     norm_coeff_idx = SHR32(mantissa, 29 - 3)&0x7;
     /* mantissa is in Q28 (29 + Q_NORM_CONST - 31 where Q_NORM_CONST is Q30)
@@ -471,7 +471,7 @@ static OAC_INLINE oac_val32 celt_log2_db(oac_val32 x) {
 
 /* Calculates exp2 for Q28 within a specific range (0 to 1.0) using fixed-point
  * arithmetic. The input number must be adjusted for Q DB_SHIFT. */
-static OAC_INLINE oac_val32 celt_exp2_db_frac(oac_val32 x) {
+static OAC_INLINE oac_val32 oaci_celt_exp2_db_frac(oac_val32 x) {
     /* Approximation constants. */
     static const oac_int32 EXP2_COEFF_A0 = 268435440;  /* Q28 */
     static const oac_int32 EXP2_COEFF_A1 = 744267456;  /* Q30 */
@@ -500,7 +500,7 @@ static OAC_INLINE oac_val32 celt_exp2_db(oac_val32 x) {
         return 0x7f000000;
     else if (integer <= -17)
         return 0;
-    frac = celt_exp2_db_frac(x - SHL32(integer, DB_SHIFT)); /* Q28 */
+    frac = oaci_celt_exp2_db_frac(x - SHL32(integer, DB_SHIFT)); /* Q28 */
     return VSHR32(frac, -integer + 28 - 16); /* Q16 */
 }
 
@@ -517,7 +517,7 @@ oac_val32 oaci_frac_div32(oac_val32 a, oac_val32 b);
 /* Computes atan(x) multiplied by 2/PI. The input value (x) should be within the
  * range of -1 to 1 and represented in Q30 format. The function will return the
  * result in Q30 format. */
-static OAC_INLINE oac_val32 celt_atan_norm(oac_val32 x) {
+static OAC_INLINE oac_val32 oaci_celt_atan_norm(oac_val32 x) {
     /* Approximation constants. */
     static const oac_int32 ATAN_2_OVER_PI = 1367130551;  /* Q31 */
     static const oac_int32 ATAN_COEFF_A03 = -715791936;  /* Q31 */
@@ -564,11 +564,11 @@ static OAC_INLINE oac_val32 celt_atan2p_norm(oac_val32 y, oac_val32 x) {
     if (y == 0 && x == 0) {
         return 0;
     } else if (y < x) {
-        return celt_atan_norm(SHR32(oaci_frac_div32(y, x), 1));
+        return oaci_celt_atan_norm(SHR32(oaci_frac_div32(y, x), 1));
     } else {
         celt_sig_assert(y > 0);
         return 1073741824 /* 1.0f Q30 */
-               - celt_atan_norm(SHR32(oaci_frac_div32(x, y), 1));
+               - oaci_celt_atan_norm(SHR32(oaci_frac_div32(x, y), 1));
     }
 }
 
@@ -579,7 +579,7 @@ static OAC_INLINE oac_val32 celt_atan2p_norm(oac_val32 y, oac_val32 x) {
 
 /* Atan approximation using a 4th order polynomial. Input is in Q15 format
    and normalized by pi/4. Output is in Q15 format */
-static OAC_INLINE oac_val16 celt_atan01(oac_val16 x) {
+static OAC_INLINE oac_val16 oaci_celt_atan01(oac_val16 x) {
     return MULT16_16_P15(x, ADD32(M1, MULT16_16_P15(x, ADD32(M2, MULT16_16_P15(x, ADD32(M3, MULT16_16_P15(M4, x)))))));
 }
 
@@ -589,7 +589,7 @@ static OAC_INLINE oac_val16 celt_atan01(oac_val16 x) {
 # undef M4
 
 /* atan2() approximation valid for positive input values */
-static OAC_INLINE oac_val16 celt_atan2p(oac_val16 y, oac_val16 x) {
+static OAC_INLINE oac_val16 oaci_celt_atan2p(oac_val16 y, oac_val16 x) {
     if (x == 0 && y == 0) {
         return 0;
     } else if (y < x) {
@@ -597,13 +597,13 @@ static OAC_INLINE oac_val16 celt_atan2p(oac_val16 y, oac_val16 x) {
         arg = oaci_celt_div(SHL32(EXTEND32(y), 15), x);
         if (arg >= 32767)
             arg = 32767;
-        return SHR16(celt_atan01(EXTRACT16(arg)), 1);
+        return SHR16(oaci_celt_atan01(EXTRACT16(arg)), 1);
     } else {
         oac_val32 arg;
         arg = oaci_celt_div(SHL32(EXTEND32(x), 15), y);
         if (arg >= 32767)
             arg = 32767;
-        return 25736 - SHR16(celt_atan01(EXTRACT16(arg)), 1);
+        return 25736 - SHR16(oaci_celt_atan01(EXTRACT16(arg)), 1);
     }
 }
 
diff --git a/celt/mdct.c b/celt/mdct.c
index 71444806e..c474b21f2 100644
--- a/celt/mdct.c
+++ b/celt/mdct.c
@@ -200,7 +200,7 @@ void oaci_clt_mdct_forward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft
             f2[st->bitrev[i]] = yc;
         }
 # ifdef FIXED_POINT
-        headroom = IMAX(0, IMIN(scale_shift, 28 - celt_ilog2(maxval)));
+        headroom = IMAX(0, IMIN(scale_shift, 28 - oaci_celt_ilog2(maxval)));
 # endif
     }
 
@@ -261,9 +261,9 @@ void oaci_clt_mdct_backward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_ff
             maxval = MAX32(maxval, ABS32(in[i*stride]));
             sumval = ADD32_ovflw(sumval, ABS32(SHR32(in[i*stride], 11)));
         }
-        pre_shift = IMAX(0, 29 - celt_zlog2(1 + maxval));
+        pre_shift = IMAX(0, 29 - oaci_celt_zlog2(1 + maxval));
         /* Worst-case where all the energy goes to a single sample. */
-        post_shift = IMAX(0, 19 - celt_ilog2(ABS32(sumval)));
+        post_shift = IMAX(0, 19 - oaci_celt_ilog2(ABS32(sumval)));
         post_shift = IMIN(post_shift, pre_shift);
         fft_shift = pre_shift - post_shift;
     }
diff --git a/celt/mini_kfft.c b/celt/mini_kfft.c
index 290568773..a270f2a09 100644
--- a/celt/mini_kfft.c
+++ b/celt/mini_kfft.c
@@ -98,7 +98,7 @@ typedef struct mini_kiss_fft_state {
 
 
 
-static void kf_bfly2(
+static void oaci_kf_bfly2(
     mini_kiss_fft_cpx * Fout,
     const size_t fstride,
     const mini_kiss_fft_cfg st,
@@ -119,7 +119,7 @@ static void kf_bfly2(
     } while (--m);
 }
 
-static void kf_bfly4(
+static void oaci_kf_bfly4(
     mini_kiss_fft_cpx * Fout,
     const size_t fstride,
     const mini_kiss_fft_cfg st,
@@ -165,7 +165,7 @@ static void kf_bfly4(
     } while (--k);
 }
 
-static void kf_bfly3(
+static void oaci_kf_bfly3(
     mini_kiss_fft_cpx * Fout,
     const size_t fstride,
     const mini_kiss_fft_cfg st,
@@ -207,7 +207,7 @@ static void kf_bfly3(
     } while (--k);
 }
 
-static void kf_bfly5(
+static void oaci_kf_bfly5(
     mini_kiss_fft_cpx * Fout,
     const size_t fstride,
     const mini_kiss_fft_cfg st,
@@ -300,10 +300,10 @@ void kf_work(
 
     /* recombine the p smaller DFTs*/
     switch (p) {
-        case 2: kf_bfly2(Fout, fstride, st, m); break;
-        case 3: kf_bfly3(Fout, fstride, st, m); break;
-        case 4: kf_bfly4(Fout, fstride, st, m); break;
-        case 5: kf_bfly5(Fout, fstride, st, m); break;
+        case 2: oaci_kf_bfly2(Fout, fstride, st, m); break;
+        case 3: oaci_kf_bfly3(Fout, fstride, st, m); break;
+        case 4: oaci_kf_bfly4(Fout, fstride, st, m); break;
+        case 5: oaci_kf_bfly5(Fout, fstride, st, m); break;
         default: assert(0);
     }
 }
diff --git a/celt/mips/fixed_generic_mipsr1.h b/celt/mips/fixed_generic_mipsr1.h
index fac6f15ee..e59e494a5 100644
--- a/celt/mips/fixed_generic_mipsr1.h
+++ b/celt/mips/fixed_generic_mipsr1.h
@@ -74,7 +74,7 @@ static inline int MULT16_16_P15(int a, int b) {
 }
 
 # define OVERRIDE_CELT_MAXABS16
-static OAC_INLINE oac_val32 celt_maxabs16(const oac_val16 *x, int len) {
+static OAC_INLINE oac_val32 oaci_celt_maxabs16(const oac_val16 *x, int len) {
     int i;
     v2i16 v2max = (v2i16) { 0, 0 };
     v2i16 x01, x23;
diff --git a/celt/modes.c b/celt/modes.c
index 43b7f648d..3f06a596b 100644
--- a/celt/modes.c
+++ b/celt/modes.c
@@ -88,7 +88,7 @@ static const oac_int16 bark_freq[BARK_BANDS + 1] = {
     20000
 };
 
-static oac_int16 *compute_ebands(oac_int32 Fs, int frame_size, int res, int *nbEBands) {
+static oac_int16 *oaci_compute_ebands(oac_int32 Fs, int frame_size, int res, int *nbEBands) {
     oac_int16 *eBands;
     int i, j, lin, low, high, nBark, offset = 0;
 
@@ -159,7 +159,7 @@ static oac_int16 *compute_ebands(oac_int32 Fs, int frame_size, int res, int *nbE
     return eBands;
 }
 
-static void compute_allocation_table(CELTMode *mode) {
+static void oaci_compute_allocation_table(CELTMode *mode) {
     int i, j;
     unsigned char *allocVectors;
     int maxBands = sizeof(eband5ms)/sizeof(eband5ms[0]) - 1;
@@ -333,7 +333,7 @@ CELTMode *oac_custom_mode_create(oac_int32 Fs, int frame_size, int *error) {
     mode->shortMdctSize = frame_size/mode->nbShortMdcts;
     res = (mode->Fs + mode->shortMdctSize)/(2*mode->shortMdctSize);
 
-    mode->eBands = compute_ebands(Fs, mode->shortMdctSize, res, &mode->nbEBands);
+    mode->eBands = oaci_compute_ebands(Fs, mode->shortMdctSize, res, &mode->nbEBands);
     if (mode->eBands == NULL)
         goto failure;
 # if !defined(SMALL_FOOTPRINT)
@@ -352,7 +352,7 @@ CELTMode *oac_custom_mode_create(oac_int32 Fs, int frame_size, int *error) {
     /* Overlap must be divisible by 4 */
     mode->overlap = ((mode->shortMdctSize>>2)<<2);
 
-    compute_allocation_table(mode);
+    oaci_compute_allocation_table(mode);
     if (mode->allocVectors == NULL)
         goto failure;
 
diff --git a/celt/pitch.c b/celt/pitch.c
index a368677a6..0318ee5a8 100644
--- a/celt/pitch.c
+++ b/celt/pitch.c
@@ -42,7 +42,7 @@
 #include "mathops.h"
 #include "celt_lpc.h"
 
-static void find_best_pitch(oac_val32 *xcorr, oac_val16 *y, int len,
+static void oaci_find_best_pitch(oac_val32 *xcorr, oac_val16 *y, int len,
                             int max_pitch, int *best_pitch
 #ifdef FIXED_POINT
                             , int yshift, oac_val32 maxcorr
@@ -55,7 +55,7 @@ static void find_best_pitch(oac_val32 *xcorr, oac_val16 *y, int len,
 #ifdef FIXED_POINT
     int xshift;
 
-    xshift = celt_ilog2(maxcorr) - 14;
+    xshift = oaci_celt_ilog2(maxcorr) - 14;
 #endif
 
     best_num[0] = -1;
@@ -152,7 +152,7 @@ void oaci_pitch_downsample(celt_sig * OAC_RESTRICT x[], oac_val16 * OAC_RESTRICT
     }
     if (maxabs < 1)
         maxabs = 1;
-    shift = celt_ilog2(maxabs) - 10;
+    shift = oaci_celt_ilog2(maxabs) - 10;
     if (shift < 0)
         shift = 0;
     if (C == 2)
@@ -321,9 +321,9 @@ void oaci_pitch_search(const oac_val16 * OAC_RESTRICT x_lp, oac_val16 * OAC_REST
         y_lp4[j] = y[2*j];
 
 #ifdef FIXED_POINT
-    xmax = celt_maxabs16(x_lp4, len>>2);
-    ymax = celt_maxabs16(y_lp4, lag>>2);
-    shift = celt_ilog2(MAX32(1, MAX32(xmax, ymax))) - 14 + celt_ilog2(len)/2;
+    xmax = oaci_celt_maxabs16(x_lp4, len>>2);
+    ymax = oaci_celt_maxabs16(y_lp4, lag>>2);
+    shift = oaci_celt_ilog2(MAX32(1, MAX32(xmax, ymax))) - 14 + oaci_celt_ilog2(len)/2;
     if (shift > 0) {
         for (j = 0; j < len>>2; j++)
             x_lp4[j] = SHR16(x_lp4[j], shift);
@@ -343,7 +343,7 @@ void oaci_pitch_search(const oac_val16 * OAC_RESTRICT x_lp, oac_val16 * OAC_REST
 #endif
     oaci_celt_pitch_xcorr(x_lp4, y_lp4, xcorr, len>>2, max_pitch>>2, arch);
 
-    find_best_pitch(xcorr, y_lp4, len>>2, max_pitch>>2, best_pitch
+    oaci_find_best_pitch(xcorr, y_lp4, len>>2, max_pitch>>2, best_pitch
 #ifdef FIXED_POINT
         , 0, maxcorr
 #endif
@@ -370,7 +370,7 @@ void oaci_pitch_search(const oac_val16 * OAC_RESTRICT x_lp, oac_val16 * OAC_REST
         maxcorr = MAX32(maxcorr, sum);
 #endif
     }
-    find_best_pitch(xcorr, y, len>>1, max_pitch>>1, best_pitch
+    oaci_find_best_pitch(xcorr, y, len>>1, max_pitch>>1, best_pitch
 #ifdef FIXED_POINT
         , shift + 1, maxcorr
 #endif
@@ -397,15 +397,15 @@ void oaci_pitch_search(const oac_val16 * OAC_RESTRICT x_lp, oac_val16 * OAC_REST
 }
 
 #ifdef FIXED_POINT
-static oac_val16 compute_pitch_gain(oac_val32 xy, oac_val32 xx, oac_val32 yy) {
+static oac_val16 oaci_compute_pitch_gain(oac_val32 xy, oac_val32 xx, oac_val32 yy) {
     oac_val32 x2y2;
     int sx, sy, shift;
     oac_val32 g;
     oac_val16 den;
     if (xy == 0 || xx == 0 || yy == 0)
         return 0;
-    sx = celt_ilog2(xx) - 14;
-    sy = celt_ilog2(yy) - 14;
+    sx = oaci_celt_ilog2(xx) - 14;
+    sy = oaci_celt_ilog2(yy) - 14;
     shift = sx + sy;
     x2y2 = SHR32(MULT16_16(VSHR32(xx, sx), VSHR32(yy, sy)), 14);
     if (shift&1) {
@@ -423,7 +423,7 @@ static oac_val16 compute_pitch_gain(oac_val32 xy, oac_val32 xx, oac_val32 yy) {
     return EXTRACT16(MAX32(-Q15ONE, MIN32(g, Q15ONE)));
 }
 #else
-static oac_val16 compute_pitch_gain(oac_val32 xy, oac_val32 xx, oac_val32 yy) {
+static oac_val16 oaci_compute_pitch_gain(oac_val32 xy, oac_val32 xx, oac_val32 yy) {
     return xy/oaci_celt_sqrt(1 + xx*yy);
 }
 #endif
@@ -464,7 +464,7 @@ oac_val16 oaci_remove_doubling(oac_val16 *x, int maxperiod, int minperiod,
     yy = yy_lookup[T0];
     best_xy = xy;
     best_yy = yy;
-    g = g0 = compute_pitch_gain(xy, xx, yy);
+    g = g0 = oaci_compute_pitch_gain(xy, xx, yy);
     /* Look for any pitch at T/k */
     for (k = 2; k <= 15; k++) {
         int T1, T1b;
@@ -486,7 +486,7 @@ oac_val16 oaci_remove_doubling(oac_val16 *x, int maxperiod, int minperiod,
         oaci_dual_inner_prod(x, &x[-T1], &x[-T1b], N, &xy, &xy2, arch);
         xy = HALF32(xy + xy2);
         yy = HALF32(yy_lookup[T1] + yy_lookup[T1b]);
-        g1 = compute_pitch_gain(xy, xx, yy);
+        g1 = oaci_compute_pitch_gain(xy, xx, yy);
         if (abs(T1 - prev_period) <= 1)
             cont = prev_gain;
         else if (abs(T1 - prev_period) <= 2 && 5*k*k < T0)
diff --git a/celt/quant_bands.c b/celt/quant_bands.c
index d8e32f9d1..5b657885c 100644
--- a/celt/quant_bands.c
+++ b/celt/quant_bands.c
@@ -139,7 +139,7 @@ static const unsigned char e_prob_model[4][2][42] = {
 
 static const unsigned char small_energy_icdf[3] = {2, 1, 0};
 
-static oac_val32 loss_distortion(const celt_glog *eBands, celt_glog *oldEBands, int start, int end, int len, int C) {
+static oac_val32 oaci_loss_distortion(const celt_glog *eBands, celt_glog *oldEBands, int start, int end, int len, int C) {
     int c, i;
     oac_val32 dist = 0;
     c = 0; do {
@@ -151,7 +151,7 @@ static oac_val32 loss_distortion(const celt_glog *eBands, celt_glog *oldEBands,
     return MIN32(200, SHR32(dist, 14));
 }
 
-static int quant_coarse_energy_impl(const CELTMode *m, int start, int end,
+static int oaci_quant_coarse_energy_impl(const CELTMode *m, int start, int end,
                                     const celt_glog *eBands, celt_glog *oldEBands,
                                     oac_int32 budget, oac_int32 tell,
                                     const unsigned char *prob_model, celt_glog *error, ec_enc *enc,
@@ -206,7 +206,7 @@ static int quant_coarse_energy_impl(const CELTMode *m, int start, int end,
             qi0 = qi;
             /* If we don't have enough bits to encode all the energy, just assume
                 something safe. */
-            tell = ec_tell(enc);
+            tell = oaci_ec_tell(enc);
             bits_left = budget - tell - 3*C*(end - i);
             if (i != start && bits_left < 30) {
                 if (bits_left < 24)
@@ -261,9 +261,9 @@ void oaci_quant_coarse_energy(const CELTMode *m, int start, int end, int effEnd,
 
     intra = force_intra || (!two_pass && *delayedIntra > 2*C*(end - start) && nbAvailableBytes > (end - start)*C);
     intra_bias = (oac_int32)((budget**delayedIntra*loss_rate)/(C*512));
-    new_distortion = loss_distortion(eBands, oldEBands, start, effEnd, m->nbEBands, C);
+    new_distortion = oaci_loss_distortion(eBands, oldEBands, start, effEnd, m->nbEBands, C);
 
-    tell = ec_tell(enc);
+    tell = oaci_ec_tell(enc);
     if (tell + 3 > budget)
         two_pass = intra = 0;
 
@@ -284,7 +284,7 @@ void oaci_quant_coarse_energy(const CELTMode *m, int start, int end, int effEnd,
     OAC_COPY(oldEBands_intra, oldEBands, C*m->nbEBands);
 
     if (two_pass || intra) {
-        badness1 = quant_coarse_energy_impl(m, start, end, eBands, oldEBands_intra, budget,
+        badness1 = oaci_quant_coarse_energy_impl(m, start, end, eBands, oldEBands_intra, budget,
             tell, e_prob_model[LM][1], error_intra, enc, C, LM, 1, max_decay, lfe);
     }
 
@@ -314,7 +314,7 @@ void oaci_quant_coarse_energy(const CELTMode *m, int start, int end, int effEnd,
 
         *enc = enc_start_state;
 
-        badness2 = quant_coarse_energy_impl(m, start, end, eBands, oldEBands, budget,
+        badness2 = oaci_quant_coarse_energy_impl(m, start, end, eBands, oldEBands, budget,
             tell, e_prob_model[LM][intra], error, enc, C, LM, 0, max_decay, lfe);
 
         if (two_pass
@@ -350,7 +350,7 @@ void oaci_quant_fine_energy(const CELTMode *m, int start, int end, celt_glog *ol
         extra = 1<<extra_quant[i];
         if (extra_quant[i] <= 0)
             continue;
-        if (ec_tell(enc) + C*extra_quant[i] > (oac_int32)enc->storage*8) continue;
+        if (oaci_ec_tell(enc) + C*extra_quant[i] > (oac_int32)enc->storage*8) continue;
         prev = (prev_quant != NULL) ? prev_quant[i] : 0;
         c = 0;
         do {
@@ -440,7 +440,7 @@ void oaci_unquant_coarse_energy(const CELTMode *m, int start, int end, celt_glog
                test on C at function entry, but that isn't enough
                to make the static analyzer happy. */
             celt_sig_assert(c < 2);
-            tell = ec_tell(dec);
+            tell = oaci_ec_tell(dec);
             if (budget - tell >= 15) {
                 int pi;
                 pi = 2*IMIN(i, 20);
@@ -475,7 +475,7 @@ void oaci_unquant_fine_energy(const CELTMode *m, int start, int end, celt_glog *
         extra = extra_quant[i];
         if (extra_quant[i] <= 0)
             continue;
-        if (ec_tell(dec) + C*extra_quant[i] > (oac_int32)dec->storage*8) continue;
+        if (oaci_ec_tell(dec) + C*extra_quant[i] > (oac_int32)dec->storage*8) continue;
         prev = (prev_quant != NULL) ? prev_quant[i] : 0;
         c = 0;
         do {
@@ -527,10 +527,10 @@ void oaci_amp2Log2(const CELTMode *m, int effEnd, int end,
     do {
         for (i = 0; i < effEnd; i++) {
             bandLogE[i + c*m->nbEBands] =
-                celt_log2_db(bandE[i + c*m->nbEBands])
+                oaci_celt_log2_db(bandE[i + c*m->nbEBands])
                 - SHL32((celt_glog)oaci_eMeans[i], DB_SHIFT - 4);
 #ifdef FIXED_POINT
-            /* Compensate for bandE[] being Q12 but celt_log2() taking a Q14 input. */
+            /* Compensate for bandE[] being Q12 but oaci_celt_log2() taking a Q14 input. */
             bandLogE[i + c*m->nbEBands] += GCONST(2.f);
 #endif
         }
diff --git a/celt/rate.c b/celt/rate.c
index 1420b7f40..7dc8fa8cd 100644
--- a/celt/rate.c
+++ b/celt/rate.c
@@ -51,7 +51,7 @@ static const unsigned char LOG2_FRAC_TABLE[24] = {
 
 /*Determines if V(N,K) fits in a 32-bit unsigned integer.
    N and K are themselves limited to 15 bits.*/
-static int fits_in32(int _n, int _k) {
+static int oaci_fits_in32(int _n, int _k) {
     static const oac_int16 maxN[15] = {
         32767, 32767, 32767, 1476, 283, 109,  60,  40,
         29,  24,  20,  18,  16,  14,  13
@@ -106,7 +106,7 @@ void oaci_compute_pulse_cache(CELTMode *m, int LM) {
                 int K;
                 entryN[nbEntries] = N;
                 K = 0;
-                while (fits_in32(N, get_pulses(K + 1)) && K < MAX_PSEUDO)
+                while (oaci_fits_in32(N, oaci_get_pulses(K + 1)) && K < MAX_PSEUDO)
                     K++;
                 entryK[nbEntries] = K;
                 cindex[i*m->nbEBands + j] = curr;
@@ -124,9 +124,9 @@ void oaci_compute_pulse_cache(CELTMode *m, int LM) {
     for (i = 0; i < nbEntries; i++) {
         unsigned char *ptr = bits + entryI[i];
         oac_int16 tmp[CELT_MAX_PULSES + 1];
-        oaci_get_required_bits(tmp, entryN[i], get_pulses(entryK[i]), BITRES);
+        oaci_get_required_bits(tmp, entryN[i], oaci_get_pulses(entryK[i]), BITRES);
         for (j = 1; j <= entryK[i]; j++)
-            ptr[j] = tmp[get_pulses(j)] - 1;
+            ptr[j] = tmp[oaci_get_pulses(j)] - 1;
         ptr[0] = entryK[i];
     }
 
@@ -230,7 +230,7 @@ void oaci_compute_pulse_cache(CELTMode *m, int LM) {
 
 #define ALLOC_STEPS 6
 
-static OAC_INLINE int interp_bits2pulses(const CELTMode *m, int start, int end, int skip_start,
+static OAC_INLINE int oaci_interp_bits2pulses(const CELTMode *m, int start, int end, int skip_start,
                                          const int *bits1, const int *bits2, const int *thresh, const int *cap,
                                          oac_int32 total, oac_int32 *_balance,
                                          int skip_rsv, int *intensity, int intensity_rsv, int *dual_stereo,
@@ -596,7 +596,7 @@ int oaci_clt_compute_allocation(const CELTMode *m, int start, int end, const int
         bits1[j] = bits1j;
         bits2[j] = bits2j;
     }
-    codedBands = interp_bits2pulses(m, start, end, skip_start, bits1, bits2, thresh, cap,
+    codedBands = oaci_interp_bits2pulses(m, start, end, skip_start, bits1, bits2, thresh, cap,
          total, balance, skip_rsv, intensity, intensity_rsv, dual_stereo, dual_stereo_rsv,
          pulses, ebits, fine_priority, C, LM, ec, encode, prev, signalBandwidth);
     RESTORE_STACK;
diff --git a/celt/rate.h b/celt/rate.h
index 84503ca51..8e352c8ac 100644
--- a/celt/rate.h
+++ b/celt/rate.h
@@ -45,11 +45,11 @@
 
 void oaci_compute_pulse_cache(CELTMode *m, int LM);
 
-static OAC_INLINE int get_pulses(int i) {
+static OAC_INLINE int oaci_get_pulses(int i) {
     return i < 8 ? i : (8 + (i&7))<<((i>>3) - 1);
 }
 
-static OAC_INLINE int bits2pulses(const CELTMode *m, int band, int LM, int bits) {
+static OAC_INLINE int oaci_bits2pulses(const CELTMode *m, int band, int LM, int bits) {
     int i;
     int lo, hi;
     const unsigned char *cache;
@@ -74,7 +74,7 @@ static OAC_INLINE int bits2pulses(const CELTMode *m, int band, int LM, int bits)
         return hi;
 }
 
-static OAC_INLINE int pulses2bits(const CELTMode *m, int band, int LM, int pulses) {
+static OAC_INLINE int oaci_pulses2bits(const CELTMode *m, int band, int LM, int pulses) {
     const unsigned char *cache;
 
     LM++;
diff --git a/celt/tests/test_unit_cwrs32.c b/celt/tests/test_unit_cwrs32.c
index 0173124f2..ca3e12b8d 100644
--- a/celt/tests/test_unit_cwrs32.c
+++ b/celt/tests/test_unit_cwrs32.c
@@ -100,11 +100,11 @@ int main(void) {
             oac_uint32 inc;
             oac_uint32 nc;
             oac_uint32 i;
-            k = get_pulses(pseudo);
+            k = oaci_get_pulses(pseudo);
             if (k > pkmax[t]) break;
             printf("Testing CWRS with N=%i, K=%i...\n", n, k);
 #if defined(SMALL_FOOTPRINT)
-            nc = ncwrs_urow(n, k, uu);
+            nc = oaci_ncwrs_urow(n, k, uu);
 #else
             nc = CELT_PVQ_V(n, k);
 #endif
diff --git a/celt/tests/test_unit_entropy.c b/celt/tests/test_unit_entropy.c
index 7da9f0020..18dafc48e 100644
--- a/celt/tests/test_unit_entropy.c
+++ b/celt/tests/test_unit_entropy.c
@@ -91,9 +91,9 @@ int main(int _argc, char **_argv) {
     for (ftb = 1; ftb < 16; ftb++) {
         for (i = 0; i < (1<<ftb); i++) {
             entropy += ftb;
-            nbits = ec_tell(&enc);
+            nbits = oaci_ec_tell(&enc);
             oaci_ec_enc_bits(&enc, i, ftb);
-            nbits2 = ec_tell(&enc);
+            nbits2 = oaci_ec_tell(&enc);
             if (nbits2 - nbits != ftb) {
                 fprintf(stderr, "Used %li bits to encode %i bits directly.\n",
          nbits2 - nbits, ftb);
@@ -188,17 +188,17 @@ int main(int _argc, char **_argv) {
             tell[j + 1] = oaci_ec_tell_frac(&enc);
         }
         if (rand()%2 == 0)
-            while (ec_tell(&enc)%8 != 0)
+            while (oaci_ec_tell(&enc)%8 != 0)
                 oaci_ec_enc_uint(&enc, rand()%2, 2);
-        tell_bits = ec_tell(&enc);
+        tell_bits = oaci_ec_tell(&enc);
         oaci_ec_enc_done(&enc);
-        if (tell_bits != (unsigned)ec_tell(&enc)) {
-            fprintf(stderr, "ec_tell() changed after oaci_ec_enc_done(): %i instead of %i (Random seed: %u)\n",
-       ec_tell(&enc), tell_bits, seed);
+        if (tell_bits != (unsigned)oaci_ec_tell(&enc)) {
+            fprintf(stderr, "oaci_ec_tell() changed after oaci_ec_enc_done(): %i instead of %i (Random seed: %u)\n",
+       oaci_ec_tell(&enc), tell_bits, seed);
             ret = -1;
         }
         if ((tell_bits + 7)/8 < ec_range_bytes(&enc)) {
-            fprintf (stderr, "ec_tell() lied, there's %i bytes instead of %d (Random seed: %u)\n",
+            fprintf (stderr, "oaci_ec_tell() lied, there's %i bytes instead of %d (Random seed: %u)\n",
                ec_range_bytes(&enc), (tell_bits + 7)/8, seed);
             ret = -1;
         }
@@ -265,9 +265,9 @@ int main(int _argc, char **_argv) {
             tell[j + 1] = oaci_ec_tell_frac(&enc);
         }
         oaci_ec_enc_done(&enc);
-        if ((ec_tell(&enc) + 7U)/8U < ec_range_bytes(&enc)) {
+        if ((oaci_ec_tell(&enc) + 7U)/8U < ec_range_bytes(&enc)) {
             fprintf(stderr, "tell() lied, there's %i bytes instead of %d (Random seed: %u)\n",
-       ec_range_bytes(&enc), (ec_tell(&enc) + 7)/8, seed);
+       ec_range_bytes(&enc), (oaci_ec_tell(&enc) + 7)/8, seed);
             ret = -1;
         }
         oaci_ec_dec_init(&dec, ptr, DATA_SIZE2);
diff --git a/celt/tests/test_unit_mathops.c b/celt/tests/test_unit_mathops.c
index 899dbc14c..ce451dd15 100644
--- a/celt/tests/test_unit_mathops.c
+++ b/celt/tests/test_unit_mathops.c
@@ -139,20 +139,20 @@ void testlog2(void) {
     float error_threshold = 2.2e-06;
     float max_error = 0;
     for (x = 0.001f; x < 1677700.0; x += (x/8.0)) {
-        float error = fabs((1.442695040888963387*log(x)) - celt_log2(x));
+        float error = fabs((1.442695040888963387*log(x)) - oaci_celt_log2(x));
         if (max_error < error) {
             max_error = error;
         }
 
         if (error > error_threshold) {
             fprintf (stderr,
-                  "celt_log2 failed: "
-                  "fabs((1.442695040888963387*log(x))-celt_log2(x))>%15.25e "
+                  "oaci_celt_log2 failed: "
+                  "fabs((1.442695040888963387*log(x))-oaci_celt_log2(x))>%15.25e "
                   "(x = %f, error = %15.25e)\n", error_threshold, x, error);
             ret = 1;
         }
     }
-    fprintf (stdout, "celt_log2 max_error: %15.25e\n", max_error);
+    fprintf (stdout, "oaci_celt_log2 max_error: %15.25e\n", max_error);
 }
 
 void testexp2(void) {
@@ -160,20 +160,20 @@ void testexp2(void) {
     float error_threshold = 2.3e-07;
     float max_error = 0;
     for (x = -11.0; x < 24.0; x += 0.0007f) {
-        float error = fabs(x - (1.442695040888963387*log((double)celt_exp2(x))));
+        float error = fabs(x - (1.442695040888963387*log((double)oaci_celt_exp2(x))));
         if (max_error < error) {
             max_error = error;
         }
 
         if (error > error_threshold) {
             fprintf (stderr,
-                  "celt_exp2 failed: "
-                  "fabs(x-(1.442695040888963387*log(celt_exp2(x))))>%15.25e "
+                  "oaci_celt_exp2 failed: "
+                  "fabs(x-(1.442695040888963387*log(oaci_celt_exp2(x))))>%15.25e "
                   "(x = %f, error = %15.25e)\n", error_threshold, x, error);
             ret = 1;
         }
     }
-    fprintf (stdout, "celt_exp2 max_error: %15.25e\n", max_error);
+    fprintf (stdout, "oaci_celt_exp2 max_error: %15.25e\n", max_error);
 }
 
 void testexp2log2(void) {
@@ -181,20 +181,20 @@ void testexp2log2(void) {
     float error_threshold = 2.0e-06;
     float max_error = 0;
     for (x = -11.0; x < 24.0; x += 0.0007f) {
-        float error = fabs(x - (celt_log2(celt_exp2(x))));
+        float error = fabs(x - (oaci_celt_log2(oaci_celt_exp2(x))));
         if (max_error < error) {
             max_error = error;
         }
 
         if (error > error_threshold) {
             fprintf (stderr,
-                  "celt_log2/celt_exp2 failed: "
-                  "fabs(x-(celt_log2(celt_exp2(x))))>%15.25e "
+                  "oaci_celt_log2/oaci_celt_exp2 failed: "
+                  "fabs(x-(oaci_celt_log2(oaci_celt_exp2(x))))>%15.25e "
                   "(x = %f, error = %15.25e)\n", error_threshold, x, error);
             ret = 1;
         }
     }
-    fprintf (stdout, "celt_exp2, celt_log2 max_error: %15.25e\n", max_error);
+    fprintf (stdout, "oaci_celt_exp2, oaci_celt_log2 max_error: %15.25e\n", max_error);
 }
 
 void test_cos(void) {
@@ -249,7 +249,7 @@ void test_atan2(void) {
 #else
 
 void testlog2_db(void) {
-    /* celt_log2_db test */
+    /* oaci_celt_log2_db test */
     float error = -1;
     float max_error = -2;
     float error_threshold = 2.e-07;
@@ -257,25 +257,25 @@ void testlog2_db(void) {
     int q_input = 14;
     for (x = 8; x < 1073741824; x += (x>>3)) {
         error = fabs((1.442695040888963387*log(FIX_INT_TO_DOUBLE(x, q_input)))
-            - FIX_INT_TO_DOUBLE(celt_log2_db(x), DB_SHIFT));
+            - FIX_INT_TO_DOUBLE(oaci_celt_log2_db(x), DB_SHIFT));
         if (error > max_error) {
             max_error = error;
         }
         if (error > error_threshold) {
-            fprintf(stderr, "celt_log2_db failed: error: [%.5e > %.5e] (x = %f)\n",
+            fprintf(stderr, "oaci_celt_log2_db failed: error: [%.5e > %.5e] (x = %f)\n",
                  error, error_threshold, FIX_INT_TO_DOUBLE(x, DB_SHIFT));
             ret = 1;
         }
     }
-    fprintf(stdout, "celt_log2_db max_error: %.7e\n", max_error);
+    fprintf(stdout, "oaci_celt_log2_db max_error: %.7e\n", max_error);
 }
 
 void testlog2(void) {
     oac_val32 x;
     for (x = 8; x < 1073741824; x += (x>>3)) {
-        float error = fabs((1.442695040888963387*log(x/16384.0)) - celt_log2(x)/1024.0);
+        float error = fabs((1.442695040888963387*log(x/16384.0)) - oaci_celt_log2(x)/1024.0);
         if (error > 0.003) {
-            fprintf (stderr, "celt_log2 failed: x = %ld, error = %f\n", (long)x, error);
+            fprintf (stderr, "oaci_celt_log2 failed: x = %ld, error = %f\n", (long)x, error);
             ret = 1;
         }
     }
@@ -284,10 +284,10 @@ void testlog2(void) {
 void testexp2(void) {
     oac_val16 x;
     for (x = -32768; x < 15360; x++) {
-        float error1 = fabs(x/1024.0 - (1.442695040888963387*log(celt_exp2(x)/65536.0)));
-        float error2 = fabs(exp(0.6931471805599453094*x/1024.0) - celt_exp2(x)/65536.0);
+        float error1 = fabs(x/1024.0 - (1.442695040888963387*log(oaci_celt_exp2(x)/65536.0)));
+        float error2 = fabs(exp(0.6931471805599453094*x/1024.0) - oaci_celt_exp2(x)/65536.0);
         if (error1 > 0.0002 && error2 > 0.00004) {
-            fprintf (stderr, "celt_exp2 failed: x = " WORD ", error1 = %f, error2 = %f\n", x, error1, error2);
+            fprintf (stderr, "oaci_celt_exp2 failed: x = " WORD ", error1 = %f, error2 = %f\n", x, error1, error2);
             ret = 1;
         }
     }
@@ -327,10 +327,10 @@ void testexp2_db(void) {
 void testexp2log2(void) {
     oac_val32 x;
     for (x = 8; x < 65536; x += (x>>3)) {
-        float error = fabs(x - 0.25*celt_exp2(celt_log2(x)))/16384;
+        float error = fabs(x - 0.25*oaci_celt_exp2(oaci_celt_log2(x)))/16384;
         if (error > 0.004) {
             fprintf (stderr,
-            "celt_log2/celt_exp2 failed: fabs(x-(celt_exp2(celt_log2(x))))>0.001 (x = %ld, error = %f)\n", (long)x,
+            "oaci_celt_log2/oaci_celt_exp2 failed: fabs(x-(oaci_celt_exp2(oaci_celt_log2(x))))>0.001 (x = %ld, error = %f)\n", (long)x,
             error);
             ret = 1;
         }
@@ -343,15 +343,15 @@ void testilog2(void) {
         oac_val32 lg;
         oac_val32 y;
 
-        lg = celt_ilog2(x);
+        lg = oaci_celt_ilog2(x);
         if (lg < 0 || lg >= 31) {
-            printf("celt_ilog2 failed: 0<=celt_ilog2(x)<31 (x = %d, celt_ilog2(x) = %d)\n", x, lg);
+            printf("oaci_celt_ilog2 failed: 0<=oaci_celt_ilog2(x)<31 (x = %d, oaci_celt_ilog2(x) = %d)\n", x, lg);
             ret = 1;
         }
         y = 1<<lg;
 
         if (x < y || (x>>1) >= y) {
-            printf("celt_ilog2 failed: 2**celt_ilog2(x)<=x<2**(celt_ilog2(x)+1) (x = %d, 2**celt_ilog2(x) = %d)\n", x,
+            printf("oaci_celt_ilog2 failed: 2**oaci_celt_ilog2(x)<=x<2**(oaci_celt_ilog2(x)+1) (x = %d, 2**oaci_celt_ilog2(x) = %d)\n", x,
             y);
             ret = 1;
         }
@@ -419,18 +419,18 @@ void testatan_norm(void) {
     for (fx = -1.0f; fx <= 1.0f; fx += 0.007f) {
         x = DOUBLE_TO_FIX_INT(fx, q_input);
         error = fabs(atan(FIX_INT_TO_DOUBLE(x, q_input))*ATAN2_2_OVER_PI
-            - FIX_INT_TO_DOUBLE(celt_atan_norm(x), q_output));
+            - FIX_INT_TO_DOUBLE(oaci_celt_atan_norm(x), q_output));
         if (error > max_error) {
             max_error = error;
         }
         if (error > error_threshold) {
             fprintf(stderr,
-                 "celt_atan_norm failed: error: [%.5e > %.5e] (x = %f)\n",
+                 "oaci_celt_atan_norm failed: error: [%.5e > %.5e] (x = %f)\n",
                  error, error_threshold, FIX_INT_TO_DOUBLE(x, DB_SHIFT));
             ret = 1;
         }
     }
-    fprintf(stdout, "celt_atan_norm max_error: %.7e\n", max_error);
+    fprintf(stdout, "oaci_celt_atan_norm max_error: %.7e\n", max_error);
 }
 
 void testatan2p_norm(void) {
diff --git a/celt/vq.c b/celt/vq.c
index 5651629d0..44a570ce8 100644
--- a/celt/vq.c
+++ b/celt/vq.c
@@ -71,7 +71,7 @@ oac_val32 oaci_celt_inner_prod_norm_shift(const celt_norm *x, const celt_norm *y
 #endif
 
 #ifndef OVERRIDE_vq_exp_rotation1
-static void exp_rotation1(celt_norm *X, int len, int stride, oac_val16 c, oac_val16 s) {
+static void oaci_exp_rotation1(celt_norm *X, int len, int stride, oac_val16 c, oac_val16 s) {
     int i;
     oac_val16 ms;
     celt_norm *Xptr;
@@ -123,23 +123,23 @@ void oaci_exp_rotation(celt_norm *X, int len, int dir, int stride, int K, int sp
             stride2++;
     }
     /*NOTE: As a minor optimization, we could be passing around log2(B), not B, for both this and for
-       extract_collapse_mask().*/
+       oaci_extract_collapse_mask().*/
     len = celt_udiv(len, stride);
     for (i = 0; i < stride; i++) {
         if (dir < 0) {
             if (stride2)
-                exp_rotation1(X + i*len, len, stride2, s, c);
-            exp_rotation1(X + i*len, len, 1, c, s);
+                oaci_exp_rotation1(X + i*len, len, stride2, s, c);
+            oaci_exp_rotation1(X + i*len, len, 1, c, s);
         } else {
-            exp_rotation1(X + i*len, len, 1, c, -s);
+            oaci_exp_rotation1(X + i*len, len, 1, c, -s);
             if (stride2)
-                exp_rotation1(X + i*len, len, stride2, s, -c);
+                oaci_exp_rotation1(X + i*len, len, stride2, s, -c);
         }
     }
 }
 
 /** Normalizes the decoded integer pvq codeword to unit norm. */
-static void normalise_residual(int * OAC_RESTRICT iy, celt_norm * OAC_RESTRICT X,
+static void oaci_normalise_residual(int * OAC_RESTRICT iy, celt_norm * OAC_RESTRICT X,
                                int N, oac_val32 Ryy, oac_val32 gain, int shift) {
     int i;
 #ifdef FIXED_POINT
@@ -149,7 +149,7 @@ static void normalise_residual(int * OAC_RESTRICT iy, celt_norm * OAC_RESTRICT X
     oac_val32 g;
 
 #ifdef FIXED_POINT
-    k = celt_ilog2(Ryy)>>1;
+    k = oaci_celt_ilog2(Ryy)>>1;
 #endif
     t = VSHR32(Ryy, 2*(k - 7) - 15);
     g = MULT32_32_Q31(oaci_celt_rsqrt_norm32(t), gain);
@@ -171,7 +171,7 @@ static void normalise_residual(int * OAC_RESTRICT iy, celt_norm * OAC_RESTRICT X
     while (++i < N);
 }
 
-static unsigned extract_collapse_mask(int *iy, int N, int B) {
+static unsigned oaci_extract_collapse_mask(int *iy, int N, int B) {
     unsigned collapse_mask;
     int N0;
     int i;
@@ -207,7 +207,7 @@ oac_val16 oaci_op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch) {
     ALLOC(signx, N, int);
 #ifdef FIXED_POINT
     {
-        int shift = (celt_ilog2(1 + oaci_celt_inner_prod_norm_shift(X, X, N, arch)) + 1)/2;
+        int shift = (oaci_celt_ilog2(1 + oaci_celt_inner_prod_norm_shift(X, X, N, arch)) + 1)/2;
         shift = IMAX(0, shift + (NORM_SHIFT - 14) - 14);
         oaci_norm_scaledown(X, N, shift);
     }
@@ -292,7 +292,7 @@ oac_val16 oaci_op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch) {
         int rshift;
 #endif
 #ifdef FIXED_POINT
-        rshift = 1 + celt_ilog2(K - pulsesLeft + i + 1);
+        rshift = 1 + oaci_celt_ilog2(K - pulsesLeft + i + 1);
 #endif
         best_id = 0;
         /* The squared magnitude term gets added anyway, so we might as well
@@ -377,9 +377,9 @@ unsigned oaci_alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *e
     oaci_exp_rotation(X, N, 1, B, K, spread);
 
     yy = oaci_op_pvq_search(X, iy, K, N, arch);
-    collapse_mask = extract_collapse_mask(iy, N, B);
+    collapse_mask = oaci_extract_collapse_mask(iy, N, B);
     oaci_encode_pulses(iy, N, K, enc);
-    if (resynth) normalise_residual(iy, X, N, yy, gain, 0);
+    if (resynth) oaci_normalise_residual(iy, X, N, yy, gain, 0);
 
     if (resynth)
         oaci_exp_rotation(X, N, -1, B, K, spread);
@@ -402,9 +402,9 @@ unsigned oaci_alg_unquant(celt_norm *X, int N, int K, int spread, int B,
     celt_assert2(N > 1, "oaci_alg_unquant() needs at least two dimensions");
     ALLOC(iy, N, int);
     Ryy = oaci_decode_pulses(iy, N, K, dec);
-    normalise_residual(iy, X, N, Ryy, gain, yy_shift);
+    oaci_normalise_residual(iy, X, N, Ryy, gain, yy_shift);
     oaci_exp_rotation(X, N, -1, B, K, spread);
-    collapse_mask = extract_collapse_mask(iy, N, B);
+    collapse_mask = oaci_extract_collapse_mask(iy, N, B);
     RESTORE_STACK;
     return collapse_mask;
 }
@@ -422,7 +422,7 @@ void oaci_renormalise_vector(celt_norm *X, int N, oac_val32 gain, int arch) {
     oaci_norm_scaledown(X, N, NORM_SHIFT - 14);
     E = EPSILON + oaci_celt_inner_prod_norm(X, X, N, arch);
 # ifdef FIXED_POINT
-    k = celt_ilog2(E)>>1;
+    k = oaci_celt_ilog2(E)>>1;
 # endif
     t = VSHR32(E, 2*(k - 7));
     g = MULT32_32_Q31(oaci_celt_rsqrt_norm(t), gain);
@@ -467,13 +467,13 @@ oac_int32 oaci_stereo_itheta(const celt_norm *X, const celt_norm *Y, int stereo,
     return itheta;
 }
 
-static void cubic_synthesis(celt_norm *X, int *iy, int N, int K, int face, int sign, oac_val32 gain) {
+static void oaci_cubic_synthesis(celt_norm *X, int *iy, int N, int K, int face, int sign, oac_val32 gain) {
     int i;
     oac_val32 sum = 0;
     oac_val32 mag;
 #ifdef FIXED_POINT
     int sum_shift;
-    int shift = IMAX(celt_ilog2(K) + celt_ilog2(N)/2 - 13, 0);
+    int shift = IMAX(oaci_celt_ilog2(K) + oaci_celt_ilog2(N)/2 - 13, 0);
 #endif
     for (i = 0; i < N; i++) {
         X[i] = (1 + 2*iy[i]) - K;
@@ -483,7 +483,7 @@ static void cubic_synthesis(celt_norm *X, int *iy, int N, int K, int face, int s
         sum += PSHR32(MULT16_16(X[i], X[i]), 2*shift);
     }
 #ifdef FIXED_POINT
-    sum_shift = (29 - celt_ilog2(sum))>>1;
+    sum_shift = (29 - oaci_celt_ilog2(sum))>>1;
     mag = oaci_celt_rsqrt_norm32(SHL32(sum, 2*sum_shift + 1));
     for (i = 0; i < N; i++) {
         X[i] = VSHR32(MULT16_32_Q15(X[i], MULT32_32_Q31(mag, gain)), shift - sum_shift + 29 - NORM_SHIFT);
@@ -525,7 +525,7 @@ unsigned oaci_cubic_quant(celt_norm *X, int N, int res, int B, ec_enc *enc, oac_
     oaci_ec_enc_bits(enc, sign, 1);
 #ifdef FIXED_POINT
     if (faceval != 0) {
-        int face_shift = 30 - celt_ilog2(faceval);
+        int face_shift = 30 - oaci_celt_ilog2(faceval);
         norm = oaci_celt_rcp_norm32(SHL32(faceval, face_shift));
         norm = MULT16_32_Q15(K, norm);
         for (i = 0; i < N; i++) {
@@ -545,7 +545,7 @@ unsigned oaci_cubic_quant(celt_norm *X, int N, int res, int B, ec_enc *enc, oac_
         if (i != face) oaci_ec_enc_bits(enc, iy[i], res);
     }
     if (resynth) {
-        cubic_synthesis(X, iy, N, K, face, sign, gain);
+        oaci_cubic_synthesis(X, iy, N, K, face, sign, gain);
     }
     RESTORE_STACK;
     return (1<<B) - 1;
@@ -573,7 +573,7 @@ unsigned oaci_cubic_unquant(celt_norm *X, int N, int res, int B, ec_dec *dec, oa
         if (i != face) iy[i] = oaci_ec_dec_bits(dec, res);
     }
     iy[face] = 0;
-    cubic_synthesis(X, iy, N, K, face, sign, gain);
+    oaci_cubic_synthesis(X, iy, N, K, face, sign, gain);
     RESTORE_STACK;
     return (1<<B) - 1;
 }
diff --git a/dnn/dred_compare.c b/dnn/dred_compare.c
index f27a64b00..241f4b2fe 100644
--- a/dnn/dred_compare.c
+++ b/dnn/dred_compare.c
@@ -493,7 +493,7 @@ int compare_audio(int _argc, const char **_argv, const char *argv0) {
                 float f, thresh;
                 f = xj*OAC_PI/960;
                 /* Shape the lower threshold similar to 1/(1 - 0.85*z^-1)
-                   deemphasis filter at 48 kHz. */
+                   oaci_deemphasis filter at 48 kHz. */
                 thresh = .1/(.15*.15 + f*f);
                 for (ci = 0; ci < nchannels; ci++) {
                     float re;
diff --git a/dnn/dred_decoder.c b/dnn/dred_decoder.c
index 889b20674..e2325e967 100644
--- a/dnn/dred_decoder.c
+++ b/dnn/dred_decoder.c
@@ -106,7 +106,7 @@ int oaci_dred_ec_decode(OacDRED *dec, const oac_uint8 *bytes, int num_bytes, int
     /* decode newest to oldest and store oldest to newest */
     for (i = 0; i < IMIN(DRED_NUM_REDUNDANCY_FRAMES, (min_feature_frames + 1)/2); i += 2) {
         /* FIXME: Figure out how to avoid missing a last frame that would take up < 8 bits. */
-        if (8*num_bytes - ec_tell(&ec) <= 7)
+        if (8*num_bytes - oaci_ec_tell(&ec) <= 7)
             break;
         q_level = oaci_compute_quantizer(q0, dQ, qmax, i/2);
         offset = q_level*DRED_LATENT_DIM;
diff --git a/dnn/dred_encoder.c b/dnn/dred_encoder.c
index 7afc8942f..b806856b7 100644
--- a/dnn/dred_encoder.c
+++ b/dnn/dred_encoder.c
@@ -83,7 +83,7 @@ void oaci_dred_encoder_init(DREDEnc* enc, oac_int32 Fs, int channels) {
     oaci_dred_encoder_reset(enc);
 }
 
-static void dred_process_frame(DREDEnc *enc, int arch) {
+static void oaci_dred_process_frame(DREDEnc *enc, int arch) {
     float feature_buffer[2*36];
     float input_buffer[2*DRED_NUM_FEATURES] = {0};
 
@@ -129,7 +129,7 @@ void oaci_filter_df2t(const float *in, float *out, int len, float b0, const floa
 #else
 # define MAX_DOWNMIX_BUFFER (960*2)
 #endif
-static void dred_convert_to_16k(DREDEnc *enc, const float *in, int in_len, float *out, int out_len) {
+static void oaci_dred_convert_to_16k(DREDEnc *enc, const float *in, int in_len, float *out, int out_len) {
     float oaci_downmix[MAX_DOWNMIX_BUFFER];
     int i;
     int up;
@@ -223,11 +223,11 @@ void oaci_dred_compute_latents(DREDEnc *enc, const float *pcm, int frame_size, i
         int process_size;
         process_size16k = IMIN(2*DRED_FRAME_SIZE, frame_size16k);
         process_size = process_size16k*enc->Fs/16000;
-        dred_convert_to_16k(enc, pcm, process_size, &enc->input_buffer[enc->input_buffer_fill], process_size16k);
+        oaci_dred_convert_to_16k(enc, pcm, process_size, &enc->input_buffer[enc->input_buffer_fill], process_size16k);
         enc->input_buffer_fill += process_size16k;
         if (enc->input_buffer_fill >= 2*DRED_FRAME_SIZE) {
             curr_offset16k += 320;
-            dred_process_frame(enc, arch);
+            oaci_dred_process_frame(enc, arch);
             enc->input_buffer_fill -= 2*DRED_FRAME_SIZE;
             OAC_MOVE(&enc->input_buffer[0], &enc->input_buffer[2*DRED_FRAME_SIZE], enc->input_buffer_fill);
             /* 15 ms (6*2.5 ms) is the ideal offset for DRED because it corresponds to our vocoder look-ahead. */
@@ -243,7 +243,7 @@ void oaci_dred_compute_latents(DREDEnc *enc, const float *pcm, int frame_size, i
     }
 }
 
-static void dred_encode_latents(ec_enc *enc, const float *x, const oac_uint8 *scale, const oac_uint8 *dzone,
+static void oaci_dred_encode_latents(ec_enc *enc, const float *x, const oac_uint8 *scale, const oac_uint8 *dzone,
                                 const oac_uint8 *r, const oac_uint8 *p0, int dim, int arch) {
     int i;
     int q[IMAX(DRED_LATENT_DIM, DRED_STATE_DIM)];
@@ -333,7 +333,7 @@ int oaci_dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks
         qmax >= 15 ? nvals : nvals + qmax - q0, 2*nvals);
     }
     state_qoffset = q0*DRED_STATE_DIM;
-    dred_encode_latents(
+    oaci_dred_encode_latents(
         &ec_encoder,
         &enc->state_buffer[latent_offset*DRED_STATE_DIM],
         oaci_dred_state_quant_scales_q8 + state_qoffset,
@@ -342,7 +342,7 @@ int oaci_dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks
         oaci_dred_state_p0_q8 + state_qoffset,
         DRED_STATE_DIM,
         arch);
-    if (ec_tell(&ec_encoder) > 8*max_bytes) {
+    if (oaci_ec_tell(&ec_encoder) > 8*max_bytes) {
         return 0;
     }
     ec_bak = ec_encoder;
@@ -351,7 +351,7 @@ int oaci_dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks
         q_level = oaci_compute_quantizer(q0, dQ, qmax, i/2);
         offset = q_level*DRED_LATENT_DIM;
 
-        dred_encode_latents(
+        oaci_dred_encode_latents(
             &ec_encoder,
             enc->latents_buffer + (i + latent_offset)*DRED_LATENT_DIM,
             oaci_dred_latent_quant_scales_q8 + offset,
@@ -361,7 +361,7 @@ int oaci_dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks
             DRED_LATENT_DIM,
             arch
             );
-        if (ec_tell(&ec_encoder) > 8*max_bytes) {
+        if (oaci_ec_tell(&ec_encoder) > 8*max_bytes) {
             /* If we haven't been able to code one chunk, give up on DRED completely. */
             if (i == 0) return 0;
             break;
@@ -377,7 +377,7 @@ int oaci_dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks
     if (dred_encoded == 0 || (dred_encoded <= 2 && extra_dred_offset))return 0;
     ec_encoder = ec_bak;
 
-    ec_buffer_fill = (ec_tell(&ec_encoder) + 7)/8;
+    ec_buffer_fill = (oaci_ec_tell(&ec_encoder) + 7)/8;
     oaci_ec_enc_shrink(&ec_encoder, ec_buffer_fill);
     oaci_ec_enc_done(&ec_encoder);
     return ec_buffer_fill;
diff --git a/dnn/dred_rdovae_dec.c b/dnn/dred_rdovae_dec.c
index 6b21defc0..de1695b2a 100644
--- a/dnn/dred_rdovae_dec.c
+++ b/dnn/dred_rdovae_dec.c
@@ -33,7 +33,7 @@
 #include "dred_rdovae_constants.h"
 #include "os_support.h"
 
-static void conv1_cond_init(float *mem, int len, int dilation, int *init) {
+static void oaci_conv1_cond_init(float *mem, int len, int dilation, int *init) {
     if (!*init) {
         int i;
         for (i = 0; i < dilation; i++)OAC_CLEAR(&mem[i*len], len);
@@ -101,7 +101,7 @@ void oaci_dred_rdovae_decode_qframe(
     oaci_compute_generic_gru(&model->dec_gru1_input, &model->dec_gru1_recurrent, dec_state->gru1_state, buffer, arch);
     oaci_compute_glu(&model->dec_glu1, &buffer[output_index], dec_state->gru1_state, arch);
     output_index += DEC_GRU1_OUT_SIZE;
-    conv1_cond_init(dec_state->conv1_state, DEC_CONV1_IN_SIZE, 1, &dec_state->initialized);
+    oaci_conv1_cond_init(dec_state->conv1_state, DEC_CONV1_IN_SIZE, 1, &dec_state->initialized);
     oaci_compute_generic_dense(&model->dec_conv_dense1, conv_tmp, buffer, ACTIVATION_TANH, arch);
     oaci_compute_generic_conv1d(&model->dec_conv1, &buffer[output_index], dec_state->conv1_state, conv_tmp,
     DEC_CONV1_OUT_SIZE, ACTIVATION_TANH, arch);
@@ -110,7 +110,7 @@ void oaci_dred_rdovae_decode_qframe(
     oaci_compute_generic_gru(&model->dec_gru2_input, &model->dec_gru2_recurrent, dec_state->gru2_state, buffer, arch);
     oaci_compute_glu(&model->dec_glu2, &buffer[output_index], dec_state->gru2_state, arch);
     output_index += DEC_GRU2_OUT_SIZE;
-    conv1_cond_init(dec_state->conv2_state, DEC_CONV2_IN_SIZE, 1, &dec_state->initialized);
+    oaci_conv1_cond_init(dec_state->conv2_state, DEC_CONV2_IN_SIZE, 1, &dec_state->initialized);
     oaci_compute_generic_dense(&model->dec_conv_dense2, conv_tmp, buffer, ACTIVATION_TANH, arch);
     oaci_compute_generic_conv1d(&model->dec_conv2, &buffer[output_index], dec_state->conv2_state, conv_tmp,
     DEC_CONV2_OUT_SIZE, ACTIVATION_TANH, arch);
@@ -119,7 +119,7 @@ void oaci_dred_rdovae_decode_qframe(
     oaci_compute_generic_gru(&model->dec_gru3_input, &model->dec_gru3_recurrent, dec_state->gru3_state, buffer, arch);
     oaci_compute_glu(&model->dec_glu3, &buffer[output_index], dec_state->gru3_state, arch);
     output_index += DEC_GRU3_OUT_SIZE;
-    conv1_cond_init(dec_state->conv3_state, DEC_CONV3_IN_SIZE, 1, &dec_state->initialized);
+    oaci_conv1_cond_init(dec_state->conv3_state, DEC_CONV3_IN_SIZE, 1, &dec_state->initialized);
     oaci_compute_generic_dense(&model->dec_conv_dense3, conv_tmp, buffer, ACTIVATION_TANH, arch);
     oaci_compute_generic_conv1d(&model->dec_conv3, &buffer[output_index], dec_state->conv3_state, conv_tmp,
     DEC_CONV3_OUT_SIZE, ACTIVATION_TANH, arch);
@@ -128,7 +128,7 @@ void oaci_dred_rdovae_decode_qframe(
     oaci_compute_generic_gru(&model->dec_gru4_input, &model->dec_gru4_recurrent, dec_state->gru4_state, buffer, arch);
     oaci_compute_glu(&model->dec_glu4, &buffer[output_index], dec_state->gru4_state, arch);
     output_index += DEC_GRU4_OUT_SIZE;
-    conv1_cond_init(dec_state->conv4_state, DEC_CONV4_IN_SIZE, 1, &dec_state->initialized);
+    oaci_conv1_cond_init(dec_state->conv4_state, DEC_CONV4_IN_SIZE, 1, &dec_state->initialized);
     oaci_compute_generic_dense(&model->dec_conv_dense4, conv_tmp, buffer, ACTIVATION_TANH, arch);
     oaci_compute_generic_conv1d(&model->dec_conv4, &buffer[output_index], dec_state->conv4_state, conv_tmp,
     DEC_CONV4_OUT_SIZE, ACTIVATION_TANH, arch);
@@ -137,7 +137,7 @@ void oaci_dred_rdovae_decode_qframe(
     oaci_compute_generic_gru(&model->dec_gru5_input, &model->dec_gru5_recurrent, dec_state->gru5_state, buffer, arch);
     oaci_compute_glu(&model->dec_glu5, &buffer[output_index], dec_state->gru5_state, arch);
     output_index += DEC_GRU5_OUT_SIZE;
-    conv1_cond_init(dec_state->conv5_state, DEC_CONV5_IN_SIZE, 1, &dec_state->initialized);
+    oaci_conv1_cond_init(dec_state->conv5_state, DEC_CONV5_IN_SIZE, 1, &dec_state->initialized);
     oaci_compute_generic_dense(&model->dec_conv_dense5, conv_tmp, buffer, ACTIVATION_TANH, arch);
     oaci_compute_generic_conv1d(&model->dec_conv5, &buffer[output_index], dec_state->conv5_state, conv_tmp,
     DEC_CONV5_OUT_SIZE, ACTIVATION_TANH, arch);
diff --git a/dnn/dred_rdovae_enc.c b/dnn/dred_rdovae_enc.c
index 81b11cc98..a6645e4b4 100644
--- a/dnn/dred_rdovae_enc.c
+++ b/dnn/dred_rdovae_enc.c
@@ -36,7 +36,7 @@
 #include "os_support.h"
 #include "dred_rdovae_constants.h"
 
-static void conv1_cond_init(float *mem, int len, int dilation, int *init) {
+static void oaci_conv1_cond_init(float *mem, int len, int dilation, int *init) {
     if (!*init) {
         int i;
         for (i = 0; i < dilation; i++)OAC_CLEAR(&mem[i*len], len);
@@ -68,7 +68,7 @@ void oaci_dred_rdovae_encode_dframe(
     oaci_compute_generic_gru(&model->enc_gru1_input, &model->enc_gru1_recurrent, enc_state->gru1_state, buffer, arch);
     OAC_COPY(&buffer[output_index], enc_state->gru1_state, ENC_GRU1_OUT_SIZE);
     output_index += ENC_GRU1_OUT_SIZE;
-    conv1_cond_init(enc_state->conv1_state, ENC_CONV1_IN_SIZE, 1, &enc_state->initialized);
+    oaci_conv1_cond_init(enc_state->conv1_state, ENC_CONV1_IN_SIZE, 1, &enc_state->initialized);
     oaci_compute_generic_dense(&model->enc_conv_dense1, conv_tmp, buffer, ACTIVATION_TANH, arch);
     oaci_compute_generic_conv1d(&model->enc_conv1, &buffer[output_index], enc_state->conv1_state, conv_tmp,
     ENC_CONV1_OUT_SIZE, ACTIVATION_TANH, arch);
@@ -77,7 +77,7 @@ void oaci_dred_rdovae_encode_dframe(
     oaci_compute_generic_gru(&model->enc_gru2_input, &model->enc_gru2_recurrent, enc_state->gru2_state, buffer, arch);
     OAC_COPY(&buffer[output_index], enc_state->gru2_state, ENC_GRU2_OUT_SIZE);
     output_index += ENC_GRU2_OUT_SIZE;
-    conv1_cond_init(enc_state->conv2_state, ENC_CONV2_IN_SIZE, 2, &enc_state->initialized);
+    oaci_conv1_cond_init(enc_state->conv2_state, ENC_CONV2_IN_SIZE, 2, &enc_state->initialized);
     oaci_compute_generic_dense(&model->enc_conv_dense2, conv_tmp, buffer, ACTIVATION_TANH, arch);
     oaci_compute_generic_conv1d_dilation(&model->enc_conv2, &buffer[output_index], enc_state->conv2_state, conv_tmp,
     ENC_CONV2_OUT_SIZE, 2, ACTIVATION_TANH, arch);
@@ -86,7 +86,7 @@ void oaci_dred_rdovae_encode_dframe(
     oaci_compute_generic_gru(&model->enc_gru3_input, &model->enc_gru3_recurrent, enc_state->gru3_state, buffer, arch);
     OAC_COPY(&buffer[output_index], enc_state->gru3_state, ENC_GRU3_OUT_SIZE);
     output_index += ENC_GRU3_OUT_SIZE;
-    conv1_cond_init(enc_state->conv3_state, ENC_CONV3_IN_SIZE, 2, &enc_state->initialized);
+    oaci_conv1_cond_init(enc_state->conv3_state, ENC_CONV3_IN_SIZE, 2, &enc_state->initialized);
     oaci_compute_generic_dense(&model->enc_conv_dense3, conv_tmp, buffer, ACTIVATION_TANH, arch);
     oaci_compute_generic_conv1d_dilation(&model->enc_conv3, &buffer[output_index], enc_state->conv3_state, conv_tmp,
     ENC_CONV3_OUT_SIZE, 2, ACTIVATION_TANH, arch);
@@ -95,7 +95,7 @@ void oaci_dred_rdovae_encode_dframe(
     oaci_compute_generic_gru(&model->enc_gru4_input, &model->enc_gru4_recurrent, enc_state->gru4_state, buffer, arch);
     OAC_COPY(&buffer[output_index], enc_state->gru4_state, ENC_GRU4_OUT_SIZE);
     output_index += ENC_GRU4_OUT_SIZE;
-    conv1_cond_init(enc_state->conv4_state, ENC_CONV4_IN_SIZE, 2, &enc_state->initialized);
+    oaci_conv1_cond_init(enc_state->conv4_state, ENC_CONV4_IN_SIZE, 2, &enc_state->initialized);
     oaci_compute_generic_dense(&model->enc_conv_dense4, conv_tmp, buffer, ACTIVATION_TANH, arch);
     oaci_compute_generic_conv1d_dilation(&model->enc_conv4, &buffer[output_index], enc_state->conv4_state, conv_tmp,
     ENC_CONV4_OUT_SIZE, 2, ACTIVATION_TANH, arch);
@@ -104,7 +104,7 @@ void oaci_dred_rdovae_encode_dframe(
     oaci_compute_generic_gru(&model->enc_gru5_input, &model->enc_gru5_recurrent, enc_state->gru5_state, buffer, arch);
     OAC_COPY(&buffer[output_index], enc_state->gru5_state, ENC_GRU5_OUT_SIZE);
     output_index += ENC_GRU5_OUT_SIZE;
-    conv1_cond_init(enc_state->conv5_state, ENC_CONV5_IN_SIZE, 2, &enc_state->initialized);
+    oaci_conv1_cond_init(enc_state->conv5_state, ENC_CONV5_IN_SIZE, 2, &enc_state->initialized);
     oaci_compute_generic_dense(&model->enc_conv_dense5, conv_tmp, buffer, ACTIVATION_TANH, arch);
     oaci_compute_generic_conv1d_dilation(&model->enc_conv5, &buffer[output_index], enc_state->conv5_state, conv_tmp,
     ENC_CONV5_OUT_SIZE, 2, ACTIVATION_TANH, arch);
diff --git a/dnn/fargan.c b/dnn/fargan.c
index 5046732f3..06e93ae4f 100644
--- a/dnn/fargan.c
+++ b/dnn/fargan.c
@@ -40,7 +40,7 @@
 
 #define FARGAN_FEATURES (NB_FEATURES)
 
-static void compute_fargan_cond(FARGANState *st, float *cond, const float *features, int period) {
+static void oaci_compute_fargan_cond(FARGANState *st, float *cond, const float *features, int period) {
     FARGAN *model;
     float dense_in[NB_FEATURES + COND_NET_PEMBED_OUT_SIZE];
     float conv1_in[COND_NET_FCONV1_IN_SIZE];
@@ -60,7 +60,7 @@ static void compute_fargan_cond(FARGANState *st, float *cond, const float *featu
     oaci_compute_generic_dense(&model->cond_net_fdense2, cond, fdense2_in, ACTIVATION_TANH, st->arch);
 }
 
-static void fargan_deemphasis(float *pcm, float *deemph_mem) {
+static void oaci_fargan_deemphasis(float *pcm, float *deemph_mem) {
     int i;
     for (i = 0; i < FARGAN_SUBFRAME_SIZE; i++) {
         pcm[i] += FARGAN_DEEMPHASIS**deemph_mem;
@@ -68,7 +68,7 @@ static void fargan_deemphasis(float *pcm, float *deemph_mem) {
     }
 }
 
-static void run_fargan_subframe(FARGANState *st, float *pcm, const float *cond, int period) {
+static void oaci_run_fargan_subframe(FARGANState *st, float *pcm, const float *cond, int period) {
     int i, pos;
     float fwc0_in[SIG_NET_INPUT_SIZE];
     float gru1_in[SIG_NET_FWC0_CONV_OUT_SIZE + 2*FARGAN_SUBFRAME_SIZE];
@@ -144,7 +144,7 @@ static void run_fargan_subframe(FARGANState *st, float *pcm, const float *cond,
 
     OAC_MOVE(st->pitch_buf, &st->pitch_buf[FARGAN_SUBFRAME_SIZE], PITCH_MAX_PERIOD - FARGAN_SUBFRAME_SIZE);
     OAC_COPY(&st->pitch_buf[PITCH_MAX_PERIOD - FARGAN_SUBFRAME_SIZE], pcm, FARGAN_SUBFRAME_SIZE);
-    fargan_deemphasis(pcm, &st->deemph_mem);
+    oaci_fargan_deemphasis(pcm, &st->deemph_mem);
 }
 
 void oaci_fargan_cont(FARGANState *st, const float *pcm0, const float *features0) {
@@ -159,7 +159,7 @@ void oaci_fargan_cont(FARGANState *st, const float *pcm0, const float *features0
         const float *features = &features0[i*NB_FEATURES];
         st->last_period = period;
         period = (int)floor(.5 + 256./pow(2.f, ((1./60.)*((features[NB_BANDS] + 1.5)*60))));
-        compute_fargan_cond(st, cond, features, period);
+        oaci_compute_fargan_cond(st, cond, features, period);
     }
 
     x0[0] = 0;
@@ -171,7 +171,7 @@ void oaci_fargan_cont(FARGANState *st, const float *pcm0, const float *features0
     st->cont_initialized = 1;
 
     for (i = 0; i < FARGAN_NB_SUBFRAMES; i++) {
-        run_fargan_subframe(st, dummy, &cond[i*FARGAN_COND_SIZE], st->last_period);
+        oaci_run_fargan_subframe(st, dummy, &cond[i*FARGAN_COND_SIZE], st->last_period);
         OAC_COPY(&st->pitch_buf[PITCH_MAX_PERIOD - FARGAN_SUBFRAME_SIZE],
         &x0[FARGAN_FRAME_SIZE + i*FARGAN_SUBFRAME_SIZE], FARGAN_SUBFRAME_SIZE);
     }
@@ -201,24 +201,24 @@ int oaci_fargan_load_model(FARGANState *st, const void *data, int len) {
     else return -1;
 }
 
-static void fargan_synthesize_impl(FARGANState *st, float *pcm, const float *features) {
+static void oaci_fargan_synthesize_impl(FARGANState *st, float *pcm, const float *features) {
     int subframe;
     float cond[COND_NET_FDENSE2_OUT_SIZE];
     int period;
     celt_assert(st->cont_initialized);
 
     period = (int)floor(.5 + 256./pow(2.f, ((1./60.)*((features[NB_BANDS] + 1.5)*60))));
-    compute_fargan_cond(st, cond, features, period);
+    oaci_compute_fargan_cond(st, cond, features, period);
     for (subframe = 0; subframe < FARGAN_NB_SUBFRAMES; subframe++) {
         float *sub_cond;
         sub_cond = &cond[subframe*FARGAN_COND_SIZE];
-        run_fargan_subframe(st, &pcm[subframe*FARGAN_SUBFRAME_SIZE], sub_cond, st->last_period);
+        oaci_run_fargan_subframe(st, &pcm[subframe*FARGAN_SUBFRAME_SIZE], sub_cond, st->last_period);
     }
     st->last_period = period;
 }
 
 void oaci_fargan_synthesize(FARGANState *st, float *pcm, const float *features) {
-    fargan_synthesize_impl(st, pcm, features);
+    oaci_fargan_synthesize_impl(st, pcm, features);
 }
 
 void oaci_fargan_synthesize_int(FARGANState *st, oac_int16 *pcm, const float *features) {
diff --git a/dnn/freq.c b/dnn/freq.c
index e45931c76..7609e860b 100644
--- a/dnn/freq.c
+++ b/dnn/freq.c
@@ -53,7 +53,7 @@ static const float compensation[] = {
 };
 
 
-static void compute_band_energy_inverse(float *bandE, const kiss_fft_cpx *X) {
+static void oaci_compute_band_energy_inverse(float *bandE, const kiss_fft_cpx *X) {
     int i;
     float sum[NB_BANDS] = {0};
     for (i = 0; i < NB_BANDS - 1; i++) {
@@ -77,7 +77,7 @@ static void compute_band_energy_inverse(float *bandE, const kiss_fft_cpx *X) {
     }
 }
 
-static float lpcn_lpc(
+static float oaci_lpcn_lpc(
     oac_val16 *lpc,   /* out: [0...p-1] LPC coefficients      */
     oac_val16 *rc,
     const oac_val32 *ac, /* in:  [0...p] autocorrelation values  */
@@ -141,7 +141,7 @@ void oaci_lpcn_compute_band_energy(float *bandE, const kiss_fft_cpx *X) {
     }
 }
 
-static void compute_burg_cepstrum(const float *pcm, float *burg_cepstrum, int len, int order) {
+static void oaci_compute_burg_cepstrum(const float *pcm, float *burg_cepstrum, int len, int order) {
     int i;
     float burg_in[FRAME_SIZE];
     float burg_lpc[LPC_ORDER];
@@ -161,7 +161,7 @@ static void compute_burg_cepstrum(const float *pcm, float *burg_cepstrum, int le
     x[0] = 1;
     for (i = 0; i < order; i++) x[i + 1] = -burg_lpc[i]*pow(.995, i + 1);
     oaci_forward_transform(LPC, x);
-    compute_band_energy_inverse(Eburg, LPC);
+    oaci_compute_band_energy_inverse(Eburg, LPC);
     for (i = 0; i < NB_BANDS; i++) Eburg[i] *= .45*g*(1.f/((float)WINDOW_SIZE*WINDOW_SIZE*WINDOW_SIZE));
     for (i = 0; i < NB_BANDS; i++) {
         Ly[i] = log10(1e-2 + Eburg[i]);
@@ -175,8 +175,8 @@ static void compute_burg_cepstrum(const float *pcm, float *burg_cepstrum, int le
 
 void oaci_burg_cepstral_analysis(float *ceps, const float *x) {
     int i;
-    compute_burg_cepstrum(x,                &ceps[0       ], FRAME_SIZE/2, LPC_ORDER);
-    compute_burg_cepstrum(&x[FRAME_SIZE/2], &ceps[NB_BANDS], FRAME_SIZE/2, LPC_ORDER);
+    oaci_compute_burg_cepstrum(x,                &ceps[0       ], FRAME_SIZE/2, LPC_ORDER);
+    oaci_compute_burg_cepstrum(&x[FRAME_SIZE/2], &ceps[NB_BANDS], FRAME_SIZE/2, LPC_ORDER);
     for (i = 0; i < NB_BANDS; i++) {
         float c0, c1;
         c0 = ceps[i];
@@ -214,7 +214,7 @@ void oaci_dct(float *out, const float *in) {
     }
 }
 
-static void idct(float *out, const float *in) {
+static void oaci_idct(float *out, const float *in) {
     int i;
     for (i = 0; i < NB_BANDS; i++) {
         int j;
@@ -240,7 +240,7 @@ void oaci_forward_transform(kiss_fft_cpx *out, const float *in) {
     }
 }
 
-static void inverse_transform(float *out, const kiss_fft_cpx *in) {
+static void oaci_inverse_transform(float *out, const kiss_fft_cpx *in) {
     int i;
     kiss_fft_cpx x[WINDOW_SIZE];
     kiss_fft_cpx y[WINDOW_SIZE];
@@ -259,7 +259,7 @@ static void inverse_transform(float *out, const kiss_fft_cpx *in) {
     }
 }
 
-static float lpc_from_bands(float *lpc, const float *Ex) {
+static float oaci_lpc_from_bands(float *lpc, const float *Ex) {
     int i;
     float e;
     float ac[LPC_ORDER + 1];
@@ -271,14 +271,14 @@ static float lpc_from_bands(float *lpc, const float *Ex) {
     Xr[FREQ_SIZE - 1] = 0;
     OAC_CLEAR(X_auto, FREQ_SIZE);
     for (i = 0; i < FREQ_SIZE; i++) X_auto[i].r = Xr[i];
-    inverse_transform(x_auto, X_auto);
+    oaci_inverse_transform(x_auto, X_auto);
     for (i = 0; i < LPC_ORDER + 1; i++) ac[i] = x_auto[i];
 
     /* -40 dB noise floor. */
     ac[0] += ac[0]*1e-4 + 320/12/38.;
     /* Lag windowing. */
     for (i = 1; i < LPC_ORDER + 1; i++) ac[i] *= (1 - 6e-5*i*i);
-    e = lpcn_lpc(lpc, rc, ac, LPC_ORDER);
+    e = oaci_lpcn_lpc(lpc, rc, ac, LPC_ORDER);
     return e;
 }
 
@@ -297,9 +297,9 @@ float oaci_lpc_from_cepstrum(float *lpc, const float *cepstrum) {
     float tmp[NB_BANDS];
     OAC_COPY(tmp, cepstrum, NB_BANDS);
     tmp[0] += 4;
-    idct(Ex, tmp);
+    oaci_idct(Ex, tmp);
     for (i = 0; i < NB_BANDS; i++) Ex[i] = pow(10.f, Ex[i])*compensation[i];
-    return lpc_from_bands(lpc, Ex);
+    return oaci_lpc_from_bands(lpc, Ex);
 }
 
 void oaci_apply_window(float *x) {
diff --git a/dnn/fwgan.c b/dnn/fwgan.c
index 8098e35e1..8c1f2ba38 100644
--- a/dnn/fwgan.c
+++ b/dnn/fwgan.c
@@ -107,7 +107,7 @@ void fwgan_cont(FWGANState *st, const float *pcm0, const float *features0) {
     /* Deemphasis memory is just the last continuation sample. */
     st->deemph_mem = pcm0[CONT_PCM_INPUTS - 1];
 
-    /* Apply analysis filter, considering that the oaci_preemphasis and deemphasis filter
+    /* Apply analysis filter, considering that the oaci_preemphasis and oaci_deemphasis filter
        cancel each other in this case since the LPC filter is constant across that boundary.
      */
     for (i = LPC_ORDER; i < CONT_PCM_INPUTS; i++) {
@@ -119,7 +119,7 @@ void fwgan_cont(FWGANState *st, const float *pcm0, const float *features0) {
     for (i = 0; i < LPC_ORDER; i++) wpcm0[i] = wpcm0[LPC_ORDER];
 
     /* The memory of the pre-empahsis is the last sample of the weighted signal
-       (ignoring oaci_preemphasis+deemphasis combination). */
+       (ignoring oaci_preemphasis+oaci_deemphasis combination). */
     st->preemph_mem = wpcm0[CONT_PCM_INPUTS - 1];
     /* The memory of the synthesis filter is the pre-emphasized continuation. */
     for (i = 0; i < LPC_ORDER;
diff --git a/dnn/lpcnet_enc.c b/dnn/lpcnet_enc.c
index 0ab1fad3f..07dd63776 100644
--- a/dnn/lpcnet_enc.c
+++ b/dnn/lpcnet_enc.c
@@ -104,7 +104,7 @@ static void biquad(float *y, float mem[2], const float *x, const float *b, const
     mem[1] = mem1;
 }
 
-#define celt_log10(x) (0.3010299957f*celt_log2(x))
+#define celt_log10(x) (0.3010299957f*oaci_celt_log2(x))
 
 void oaci_compute_frame_features(LPCNetEncState *st, const float *in, int arch) {
     float aligned_in[FRAME_SIZE];
@@ -208,7 +208,7 @@ void oaci_preemphasis(float *y, float *mem, const float *x, float coef, int N) {
     }
 }
 
-static int lpcnet_compute_single_frame_features_impl(LPCNetEncState *st, float *x, float features[NB_TOTAL_FEATURES],
+static int oaci_lpcnet_compute_single_frame_features_impl(LPCNetEncState *st, float *x, float features[NB_TOTAL_FEATURES],
                                                      int arch) {
     oaci_preemphasis(x, &st->mem_preemph, x, PREEMPHASIS, FRAME_SIZE);
     oaci_compute_frame_features(st, x, arch);
@@ -221,7 +221,7 @@ int oaci_lpcnet_compute_single_frame_features(LPCNetEncState *st, const oac_int1
     int i;
     float x[FRAME_SIZE];
     for (i = 0; i < FRAME_SIZE; i++) x[i] = pcm[i];
-    lpcnet_compute_single_frame_features_impl(st, x, features, arch);
+    oaci_lpcnet_compute_single_frame_features_impl(st, x, features, arch);
     return 0;
 }
 
@@ -230,6 +230,6 @@ int oaci_lpcnet_compute_single_frame_features_float(LPCNetEncState *st, const fl
     int i;
     float x[FRAME_SIZE];
     for (i = 0; i < FRAME_SIZE; i++) x[i] = pcm[i];
-    lpcnet_compute_single_frame_features_impl(st, x, features, arch);
+    oaci_lpcnet_compute_single_frame_features_impl(st, x, features, arch);
     return 0;
 }
diff --git a/dnn/lpcnet_plc.c b/dnn/lpcnet_plc.c
index 44d6eebaa..2212b69ee 100644
--- a/dnn/lpcnet_plc.c
+++ b/dnn/lpcnet_plc.c
@@ -103,7 +103,7 @@ void oaci_lpcnet_plc_fec_clear(LPCNetPLCState *st) {
 }
 
 
-static void compute_plc_pred(LPCNetPLCState *st, float *out, const float *in) {
+static void oaci_compute_plc_pred(LPCNetPLCState *st, float *out, const float *in) {
     float tmp[PLC_DENSE_IN_OUT_SIZE];
     PLCModel *model = &st->model;
     PLCNetState *net = &st->plc_net;
@@ -114,7 +114,7 @@ static void compute_plc_pred(LPCNetPLCState *st, float *out, const float *in) {
     oaci_compute_generic_dense(&model->plc_dense_out, out, net->gru2_state, ACTIVATION_LINEAR, st->arch);
 }
 
-static int get_fec_or_pred(LPCNetPLCState *st, float *out) {
+static int oaci_get_fec_or_pred(LPCNetPLCState *st, float *out) {
     if (st->fec_read_pos != st->fec_fill_pos && st->fec_skip == 0) {
         float plc_features[2*NB_BANDS + NB_FEATURES + 1] = {0};
         float discard[NB_FEATURES];
@@ -123,22 +123,22 @@ static int get_fec_or_pred(LPCNetPLCState *st, float *out) {
         /* Update PLC state using FEC, so without Burg features. */
         OAC_COPY(&plc_features[2*NB_BANDS], out, NB_FEATURES);
         plc_features[2*NB_BANDS + NB_FEATURES] = -1;
-        compute_plc_pred(st, discard, plc_features);
+        oaci_compute_plc_pred(st, discard, plc_features);
         return 1;
     } else {
         float zeros[2*NB_BANDS + NB_FEATURES + 1] = {0};
-        compute_plc_pred(st, out, zeros);
+        oaci_compute_plc_pred(st, out, zeros);
         if (st->fec_skip > 0) st->fec_skip--;
         return 0;
     }
 }
 
-static void queue_features(LPCNetPLCState *st, const float *features) {
+static void oaci_queue_features(LPCNetPLCState *st, const float *features) {
     OAC_MOVE(&st->cont_features[0], &st->cont_features[NB_FEATURES], (CONT_VECTORS - 1)*NB_FEATURES);
     OAC_COPY(&st->cont_features[(CONT_VECTORS - 1)*NB_FEATURES], features, NB_FEATURES);
 }
 
-/* In this causal version of the code, the DNN model implemented by compute_plc_pred()
+/* In this causal version of the code, the DNN model implemented by oaci_compute_plc_pred()
    needs to generate two feature vectors to conceal the first lost packet.*/
 
 int oaci_lpcnet_plc_update(LPCNetPLCState *st, oac_int16 *pcm) {
@@ -168,35 +168,35 @@ int oaci_lpcnet_plc_conceal(LPCNetPLCState *st, oac_int16 *pcm) {
             oaci_burg_cepstral_analysis(plc_features, x);
             oaci_lpcnet_compute_single_frame_features_float(&st->enc, x, st->features, st->arch);
             if ((!st->analysis_gap || count > 0) && st->analysis_pos >= st->predict_pos) {
-                queue_features(st, st->features);
+                oaci_queue_features(st, st->features);
                 OAC_COPY(&plc_features[2*NB_BANDS], st->features, NB_FEATURES);
                 plc_features[2*NB_BANDS + NB_FEATURES] = 1;
                 st->plc_bak[0] = st->plc_bak[1];
                 st->plc_bak[1] = st->plc_net;
-                compute_plc_pred(st, st->features, plc_features);
+                oaci_compute_plc_pred(st, st->features, plc_features);
             }
             st->analysis_pos += FRAME_SIZE;
             count++;
         }
         st->plc_bak[0] = st->plc_bak[1];
         st->plc_bak[1] = st->plc_net;
-        get_fec_or_pred(st, st->features);
-        queue_features(st, st->features);
+        oaci_get_fec_or_pred(st, st->features);
+        oaci_queue_features(st, st->features);
         st->plc_bak[0] = st->plc_bak[1];
         st->plc_bak[1] = st->plc_net;
-        get_fec_or_pred(st, st->features);
-        queue_features(st, st->features);
+        oaci_get_fec_or_pred(st, st->features);
+        oaci_queue_features(st, st->features);
         oaci_fargan_cont(&st->fargan, &st->pcm[PLC_BUF_SIZE - FARGAN_CONT_SAMPLES], st->cont_features);
         st->analysis_gap = 0;
     }
     st->plc_bak[0] = st->plc_bak[1];
     st->plc_bak[1] = st->plc_net;
-    if (get_fec_or_pred(st, st->features)) st->loss_count = 0;
+    if (oaci_get_fec_or_pred(st, st->features)) st->loss_count = 0;
     else st->loss_count++;
     if (st->loss_count >= 10) st->features[0] = MAX16(-15, st->features[0] + att_table[9] - 2*(st->loss_count - 9));
     else st->features[0] = MAX16(-15, st->features[0] + att_table[st->loss_count]);
     oaci_fargan_synthesize_int(&st->fargan, pcm, &st->features[0]);
-    queue_features(st, st->features);
+    oaci_queue_features(st, st->features);
     if (st->analysis_pos - FRAME_SIZE >= 0) st->analysis_pos -= FRAME_SIZE;
     else st->analysis_gap = 1;
     st->predict_pos = PLC_BUF_SIZE;
diff --git a/dnn/nndsp.c b/dnn/nndsp.c
index 3d950ebad..44c29ed3b 100644
--- a/dnn/nndsp.c
+++ b/dnn/nndsp.c
@@ -73,7 +73,7 @@ void print_float_vector(const char* name, const float *vec, int length) {
 }
 #endif
 
-static void scale_kernel(
+static void oaci_scale_kernel(
     float *kernel,
     int in_channels,
     int out_channels,
@@ -178,7 +178,7 @@ void oaci_adaconv_process_frame(
     print_float_vector("adaconv_gain_raw", gain_buffer, out_channels);
 #endif
     transform_gains(gain_buffer, out_channels, filter_gain_a, filter_gain_b);
-    scale_kernel(kernel_buffer, in_channels, out_channels, kernel_size, gain_buffer);
+    oaci_scale_kernel(kernel_buffer, in_channels, out_channels, kernel_size, gain_buffer);
 
 #ifdef DEBUG_NNDSP
     print_float_vector("adaconv_kernel", kernel_buffer, in_channels*out_channels*kernel_size);
@@ -274,7 +274,7 @@ void oaci_adacomb_process_frame(
 #endif
     gain = exp(log_gain_limit - gain);
     global_gain = exp(filter_gain_a*global_gain + filter_gain_b);
-    scale_kernel(kernel_buffer, 1, 1, kernel_size, &gain);
+    oaci_scale_kernel(kernel_buffer, 1, 1, kernel_size, &gain);
 
 #ifdef DEBUG_NNDSP
     print_float_vector("adacomb_kernel", kernel_buffer, kernel_size);
diff --git a/dnn/nnet_arch.h b/dnn/nnet_arch.h
index 03dcc09df..5214b8f1d 100644
--- a/dnn/nnet_arch.h
+++ b/dnn/nnet_arch.h
@@ -49,11 +49,11 @@
 
 #define MAX_ACTIVATIONS (4096)
 
-static OAC_INLINE void vec_swish(float *y, const float *x, int N) {
+static OAC_INLINE void oaci_vec_swish(float *y, const float *x, int N) {
     int i;
     float tmp[MAX_ACTIVATIONS];
     celt_assert(N <= MAX_ACTIVATIONS);
-    vec_sigmoid(tmp, x, N);
+    oaci_vec_sigmoid(tmp, x, N);
     for (i = 0; i < N; i++)
         y[i] = x[i]*tmp[i];
 }
@@ -73,7 +73,7 @@ void RTCD_SUF(oaci_compute_activation_)(float *output, const float *input, int N
             output[n] = 1.f/(1 + exp(-input[n]));
         }
 #else
-        vec_sigmoid(output, input, N);
+        oaci_vec_sigmoid(output, input, N);
 #endif
    } else if (activation == ACTIVATION_TANH) {
 #ifdef HIGH_ACCURACY
@@ -81,10 +81,10 @@ void RTCD_SUF(oaci_compute_activation_)(float *output, const float *input, int N
             output[n] = tanh(input[n]);
         }
 #else
-        vec_tanh(output, input, N);
+        oaci_vec_tanh(output, input, N);
 #endif
    } else if (activation == ACTIVATION_SWISH) {
-        vec_swish(output, input, N);
+        oaci_vec_swish(output, input, N);
    } else if (activation == ACTIVATION_RELU) {
         for (i = 0; i < N; i++)
             output[i] = relu(input[i]);
@@ -95,7 +95,7 @@ void RTCD_SUF(oaci_compute_activation_)(float *output, const float *input, int N
            output[i] = input[i];*/
 #else
         float sum = 0;
-        softmax(output, input, N);
+        oaci_softmax(output, input, N);
         for (i = 0; i < N; i++) {
             sum += output[i];
         }
@@ -104,7 +104,7 @@ void RTCD_SUF(oaci_compute_activation_)(float *output, const float *input, int N
             output[i] = sum*output[i];
 #endif
    } else if (activation == ACTIVATION_EXP) {
-        softmax(output, input, N);
+        oaci_softmax(output, input, N);
    } else {
         celt_assert(activation == ACTIVATION_LINEAR);
         if (input != output) {
@@ -124,12 +124,12 @@ void RTCD_SUF(oaci_compute_linear_) (const LinearLayer *linear, float *out, cons
    M = linear->nb_inputs;
    N = linear->nb_outputs;
    if (linear->float_weights != NULL) {
-        if (linear->weights_idx != NULL) sparse_sgemv8x4(out, linear->float_weights, linear->weights_idx, N, in);
-        else sgemv(out, linear->float_weights, N, M, N, in);
+        if (linear->weights_idx != NULL) oaci_sparse_sgemv8x4(out, linear->float_weights, linear->weights_idx, N, in);
+        else oaci_sgemv(out, linear->float_weights, N, M, N, in);
    } else if (linear->weights != NULL) {
-        if (linear->weights_idx != NULL) sparse_cgemv8x4(out, linear->weights, linear->weights_idx, linear->scale, N, M,
+        if (linear->weights_idx != NULL) oaci_sparse_cgemv8x4(out, linear->weights, linear->weights_idx, linear->scale, N, M,
             in);
-        else cgemv8x4(out, linear->weights, linear->scale, N, M, in);
+        else oaci_cgemv8x4(out, linear->weights, linear->scale, N, M, in);
         /* Only use SU biases on for integer matrices on SU archs. */
 #ifdef USE_SU_BIAS
         bias = linear->subias;
@@ -154,7 +154,7 @@ void RTCD_SUF(oaci_compute_linear_) (const LinearLayer *linear, float *out, cons
    storing the output as [ out_channels x len2 ].
    We assume that the output dimension along the ksize1 axis is 1,
    i.e. processing one frame at a time. */
-static void conv2d_float(float *out, const float *weights, int in_channels, int out_channels, int ktime, int kheight,
+static void oaci_conv2d_float(float *out, const float *weights, int in_channels, int out_channels, int ktime, int kheight,
                          const float *in, int height, int hstride) {
     int i;
     int in_stride;
@@ -180,7 +180,7 @@ static void conv2d_float(float *out, const float *weights, int in_channels, int
 
 /* There's no intrinsics in this function (or the one above) because the gcc (and hopefully other compiler) auto-vectorizer is smart enough to
    produce the right code by itself based on the compile flags. */
-static void conv2d_3x3_float(float *out, const float *weights, int in_channels, int out_channels, const float *in,
+static void oaci_conv2d_3x3_float(float *out, const float *weights, int in_channels, int out_channels, const float *in,
                              int height, int hstride) {
     int i;
     int in_stride;
@@ -234,9 +234,9 @@ int hstride, int activation)
    OAC_COPY(mem, &in_buf[time_stride], (conv->ktime - 1)*time_stride);
    bias = conv->bias;
    if (conv->kheight == 3 && conv->ktime == 3)
-        conv2d_3x3_float(out, conv->float_weights, conv->in_channels, conv->out_channels, in_buf, height, hstride);
+        oaci_conv2d_3x3_float(out, conv->float_weights, conv->in_channels, conv->out_channels, in_buf, height, hstride);
    else
-        conv2d_float(out, conv->float_weights, conv->in_channels, conv->out_channels, conv->ktime, conv->kheight,
+        oaci_conv2d_float(out, conv->float_weights, conv->in_channels, conv->out_channels, conv->ktime, conv->kheight,
         in_buf, height, hstride);
    if (bias != NULL) {
         for (i = 0; i < conv->out_channels; i++) {
diff --git a/dnn/osce.c b/dnn/osce.c
index 3bf2824ba..0dbbf6c46 100644
--- a/dnn/osce.c
+++ b/dnn/osce.c
@@ -128,7 +128,7 @@ extern const WeightArray oaci_bbwenetlayers_arrays[];
 
 #ifndef DISABLE_LACE
 
-static void compute_lace_numbits_embedding(float *emb, float numbits, int dim, float min_val, float max_val,
+static void oaci_compute_lace_numbits_embedding(float *emb, float numbits, int dim, float min_val, float max_val,
                                            int logscale) {
     float x;
     (void) dim;
@@ -147,7 +147,7 @@ static void compute_lace_numbits_embedding(float *emb, float numbits, int dim, f
 }
 
 
-static int init_lace(LACE *hLACE, const WeightArray *weights) {
+static int oaci_init_lace(LACE *hLACE, const WeightArray *weights) {
     int ret = 0;
     OAC_CLEAR(hLACE, 1);
     celt_assert(weights != NULL);
@@ -159,7 +159,7 @@ static int init_lace(LACE *hLACE, const WeightArray *weights) {
     return ret;
 }
 
-static void reset_lace_state(LACEState *state) {
+static void oaci_reset_lace_state(LACEState *state) {
     OAC_CLEAR(state, 1);
 
     oaci_init_adacomb_state(&state->cf1_state);
@@ -167,7 +167,7 @@ static void reset_lace_state(LACEState *state) {
     oaci_init_adaconv_state(&state->af1_state);
 }
 
-static void lace_feature_net(
+static void oaci_lace_feature_net(
     LACE *hLACE,
     LACEState *state,
     float *output,
@@ -181,9 +181,9 @@ static void lace_feature_net(
     float numbits_embedded[2*LACE_NUMBITS_EMBEDDING_DIM];
     int i_subframe;
 
-    compute_lace_numbits_embedding(numbits_embedded, numbits[0], LACE_NUMBITS_EMBEDDING_DIM,
+    oaci_compute_lace_numbits_embedding(numbits_embedded, numbits[0], LACE_NUMBITS_EMBEDDING_DIM,
         log(LACE_NUMBITS_RANGE_LOW), log(LACE_NUMBITS_RANGE_HIGH), 1);
-    compute_lace_numbits_embedding(numbits_embedded + LACE_NUMBITS_EMBEDDING_DIM, numbits[1],
+    oaci_compute_lace_numbits_embedding(numbits_embedded + LACE_NUMBITS_EMBEDDING_DIM, numbits[1],
     LACE_NUMBITS_EMBEDDING_DIM,
         log(LACE_NUMBITS_RANGE_LOW), log(LACE_NUMBITS_RANGE_HIGH), 1);
 
@@ -243,7 +243,7 @@ static void lace_feature_net(
 }
 
 
-static void lace_process_20ms_frame(
+static void oaci_lace_process_20ms_frame(
     LACE* hLACE,
     LACEState *state,
     float *x_out,
@@ -284,7 +284,7 @@ static void lace_process_20ms_frame(
     }
 
     /* run feature encoder */
-    lace_feature_net(hLACE, state, feature_buffer, features, numbits, periods, arch);
+    oaci_lace_feature_net(hLACE, state, feature_buffer, features, numbits, periods, arch);
 # ifdef DEBUG_LACE
     fwrite(features, sizeof(*features), 4*LACE_NUM_FEATURES, f_features);
     fwrite(feature_buffer, sizeof(*feature_buffer), 4*LACE_COND_DIM, f_encfeatures);
@@ -386,7 +386,7 @@ static void lace_process_20ms_frame(
 /* NoLACE */
 #ifndef DISABLE_NOLACE
 
-static void compute_nolace_numbits_embedding(float *emb, float numbits, int dim, float min_val, float max_val,
+static void oaci_compute_nolace_numbits_embedding(float *emb, float numbits, int dim, float min_val, float max_val,
                                              int logscale) {
     float x;
     (void) dim;
@@ -404,7 +404,7 @@ static void compute_nolace_numbits_embedding(float *emb, float numbits, int dim,
     emb[7] = sin(x*NOLACE_NUMBITS_SCALE_7 - 0.5f);
 }
 
-static int init_nolace(NoLACE *hNoLACE, const WeightArray *weights) {
+static int oaci_init_nolace(NoLACE *hNoLACE, const WeightArray *weights) {
     int ret = 0;
     OAC_CLEAR(hNoLACE, 1);
     celt_assert(weights != NULL);
@@ -416,7 +416,7 @@ static int init_nolace(NoLACE *hNoLACE, const WeightArray *weights) {
     return ret;
 }
 
-static void reset_nolace_state(NoLACEState *state) {
+static void oaci_reset_nolace_state(NoLACEState *state) {
     OAC_CLEAR(state, 1);
 
     oaci_init_adacomb_state(&state->cf1_state);
@@ -430,7 +430,7 @@ static void reset_nolace_state(NoLACEState *state) {
     oaci_init_adashape_state(&state->tdshape3_state);
 }
 
-static void nolace_feature_net(
+static void oaci_nolace_feature_net(
     NoLACE *hNoLACE,
     NoLACEState *state,
     float *output,
@@ -443,9 +443,9 @@ static void nolace_feature_net(
     float numbits_embedded[2*NOLACE_NUMBITS_EMBEDDING_DIM];
     int i_subframe;
 
-    compute_nolace_numbits_embedding(numbits_embedded, numbits[0], NOLACE_NUMBITS_EMBEDDING_DIM,
+    oaci_compute_nolace_numbits_embedding(numbits_embedded, numbits[0], NOLACE_NUMBITS_EMBEDDING_DIM,
         log(NOLACE_NUMBITS_RANGE_LOW), log(NOLACE_NUMBITS_RANGE_HIGH), 1);
-    compute_nolace_numbits_embedding(numbits_embedded + NOLACE_NUMBITS_EMBEDDING_DIM, numbits[1],
+    oaci_compute_nolace_numbits_embedding(numbits_embedded + NOLACE_NUMBITS_EMBEDDING_DIM, numbits[1],
     NOLACE_NUMBITS_EMBEDDING_DIM,
         log(NOLACE_NUMBITS_RANGE_LOW), log(NOLACE_NUMBITS_RANGE_HIGH), 1);
 
@@ -505,7 +505,7 @@ static void nolace_feature_net(
 }
 
 
-static void nolace_process_20ms_frame(
+static void oaci_nolace_process_20ms_frame(
     NoLACE* hNoLACE,
     NoLACEState *state,
     float *x_out,
@@ -550,7 +550,7 @@ static void nolace_process_20ms_frame(
     }
 
     /* run feature encoder */
-    nolace_feature_net(hNoLACE, state, feature_buffer, features, numbits, periods, arch);
+    oaci_nolace_feature_net(hNoLACE, state, feature_buffer, features, numbits, periods, arch);
 # ifdef DEBUG_NOLACE
     fwrite(features, sizeof(*features), 4*NOLACE_NUM_FEATURES, f_features);
     fwrite(feature_buffer, sizeof(*feature_buffer), 4*NOLACE_COND_DIM, f_encfeatures);
@@ -841,7 +841,7 @@ static void nolace_process_20ms_frame(
 
 #ifdef ENABLE_OSCE_BWE
 # ifndef DISABLE_BBWENET
-static void bbwe_feature_net(
+static void oaci_bbwe_feature_net(
     BBWENet *hBBWENET,
     BBWENetState *state,
     float *output,
@@ -958,7 +958,7 @@ static float frac_09_24[8] = {
     0.4621277, -0.12075806,  0.0295105, -0.00326538
 };
 
-static void apply_valin_activation(float *x, int len) {
+static void oaci_apply_valin_activation(float *x, int len) {
     int i;
     float y[2*BBWENET_TDSHAPE2_FRAME_SIZE];
     celt_assert(len <= 2*BBWENET_TDSHAPE2_FRAME_SIZE);
@@ -969,13 +969,13 @@ static void apply_valin_activation(float *x, int len) {
         y[i] = celt_log(y[i]);
     }
     for (i = 0; i < len; i++) {
-        x[i] *= celt_sin(y[i]);
+        x[i] *= oaci_celt_sin(y[i]);
     }
 }
 
 
 #  define DELAY_SAMPLES 8 /* ToDo: this probably should be 7, bug in python code? */
-static void interpol_3_2(resamp_state *state, float *x_out, const float *x_in, int num_samples) {
+static void oaci_interpol_3_2(resamp_state *state, float *x_out, const float *x_in, int num_samples) {
     int i_sample, i_out = 0;
     float buffer[8*BBWENET_FRAME_SIZE16 + DELAY_SAMPLES];
 
@@ -1019,7 +1019,7 @@ static void interpol_3_2(resamp_state *state, float *x_out, const float *x_in, i
     OAC_COPY(state->interpol_buffer, buffer + num_samples, DELAY_SAMPLES);
 }
 
-static void upsamp_2x(resamp_state *state, float *x_out, const float *x_in, int num_samples) {
+static void oaci_upsamp_2x(resamp_state *state, float *x_out, const float *x_in, int num_samples) {
     float buffer[4*BBWENET_FRAME_SIZE16];
     float *S_even = state->upsamp_buffer[0];
     float *S_odd = state->upsamp_buffer[1];
@@ -1075,7 +1075,7 @@ static void upsamp_2x(resamp_state *state, float *x_out, const float *x_in, int
     }
 }
 
-static void bbwenet_process_frames(
+static void oaci_bbwenet_process_frames(
     BBWENet *hBBWENET,
     BBWENetState *state,
     float *x_out,
@@ -1120,7 +1120,7 @@ static void bbwenet_process_frames(
 #  endif
 
     /* feature net */
-    bbwe_feature_net(hBBWENET, state, latent_features, features, num_frames, arch);
+    oaci_bbwe_feature_net(hBBWENET, state, latent_features, features, num_frames, arch);
 #  ifdef DEBUG_BBWENET
     if (f_latent != NULL) {
         fread(latent_features, sizeof(*latent_features), num_subframes*BBWENET_COND_DIM, f_latent);
@@ -1168,7 +1168,7 @@ static void bbwenet_process_frames(
         celt_assert(BBWENET_AF1_OUT_CHANNELS == 3);
         celt_assert(2*BBWENET_AF1_FRAME_SIZE == BBWENET_TDSHAPE1_FRAME_SIZE);
         for (i_channel = 0; i_channel < 3; i_channel++) {
-            upsamp_2x(
+            oaci_upsamp_2x(
                 &state->resampler_state[i_channel],
                 x_buffer2 + i_subframe*BBWENET_TDSHAPE1_FRAME_SIZE*BBWENET_AF1_OUT_CHANNELS + i_channel
                 *BBWENET_TDSHAPE1_FRAME_SIZE,
@@ -1209,7 +1209,7 @@ static void bbwenet_process_frames(
 #  endif
 
         /* non-linear activation of third channel (in place)*/
-        apply_valin_activation(
+        oaci_apply_valin_activation(
             x_buffer2 + i_subframe*BBWENET_AF1_OUT_CHANNELS*BBWENET_TDSHAPE1_FRAME_SIZE + 2*BBWENET_TDSHAPE1_FRAME_SIZE,
             BBWENET_TDSHAPE1_FRAME_SIZE
             );
@@ -1257,7 +1257,7 @@ static void bbwenet_process_frames(
         celt_assert(BBWENET_AF2_OUT_CHANNELS == 3);
         celt_assert(3*BBWENET_AF2_FRAME_SIZE == 2*BBWENET_TDSHAPE2_FRAME_SIZE);
         for (i_channel = 0; i_channel < 3; i_channel++) {
-            interpol_3_2(
+            oaci_interpol_3_2(
                 &state->resampler_state[i_channel],
                 x_buffer2 + i_subframe*BBWENET_AF3_FRAME_SIZE*BBWENET_AF2_OUT_CHANNELS + i_channel
                 *BBWENET_TDSHAPE2_FRAME_SIZE,
@@ -1298,7 +1298,7 @@ static void bbwenet_process_frames(
 #  endif
 
         /* non-linear activation of third channel (in place)*/
-        apply_valin_activation(
+        oaci_apply_valin_activation(
             x_buffer2 + i_subframe*BBWENET_AF2_OUT_CHANNELS*BBWENET_TDSHAPE2_FRAME_SIZE + 2*BBWENET_TDSHAPE2_FRAME_SIZE,
             BBWENET_TDSHAPE2_FRAME_SIZE
             );
@@ -1337,7 +1337,7 @@ static void bbwenet_process_frames(
 #  endif
 }
 
-static void reset_bbwenet_state(BBWENetState *state) {
+static void oaci_reset_bbwenet_state(BBWENetState *state) {
     OAC_CLEAR(state, 1);
 
     oaci_init_adaconv_state(&state->af1_state);
@@ -1347,7 +1347,7 @@ static void reset_bbwenet_state(BBWENetState *state) {
     oaci_init_adashape_state(&state->tdshape2_state);
 }
 
-static int init_bbwenet(BBWENet *hBBWENET, const WeightArray *weights) {
+static int oaci_init_bbwenet(BBWENet *hBBWENET, const WeightArray *weights) {
     int ret = 0;
     OAC_CLEAR(hBBWENET, 1);
     celt_assert(weights != NULL);
@@ -1376,12 +1376,12 @@ void oaci_osce_reset(silk_OSCE_struct *hOSCE, int method) {
             break;
 #ifndef DISABLE_LACE
         case OSCE_METHOD_LACE:
-            reset_lace_state(&state->lace);
+            oaci_reset_lace_state(&state->lace);
             break;
 #endif
 #ifndef DISABLE_NOLACE
         case OSCE_METHOD_NOLACE:
-            reset_nolace_state(&state->nolace);
+            oaci_reset_nolace_state(&state->nolace);
             break;
 #endif
         default:
@@ -1402,7 +1402,7 @@ void oaci_osce_bwe_reset(silk_OSCE_BWE_struct *hOSCEBWE) {
         hOSCEBWE->features.last_spec[2*k] = 1e-9;
     }
 # endif
-    reset_bbwenet_state(&hOSCEBWE->state.bbwenet);
+    oaci_reset_bbwenet_state(&hOSCEBWE->state.bbwenet);
 }
 
 #endif /* ENABLE_OSCE_BWE */
@@ -1419,20 +1419,20 @@ int oaci_osce_load_models(OSCEModel *model, const void *data, int len) {
 
 #ifndef DISABLE_LACE
         if (ret == 0) {
-            ret = init_lace(&model->lace, list);
+            ret = oaci_init_lace(&model->lace, list);
         }
 #endif
 
 #ifndef DISABLE_NOLACE
         if (ret == 0) {
-            ret = init_nolace(&model->nolace, list);
+            ret = oaci_init_nolace(&model->nolace, list);
         }
 #endif
 
 #ifdef ENABLE_OSCE_BWE
 # ifndef DISABLE_BBWENET
         if (ret == 0) {
-            ret = init_bbwenet(&model->bbwenet, list);
+            ret = oaci_init_bbwenet(&model->bbwenet, list);
         }
 # endif
 #endif /* ENABLE_OSCE_BWE */
@@ -1443,20 +1443,20 @@ int oaci_osce_load_models(OSCEModel *model, const void *data, int len) {
 #else
 # ifndef DISABLE_LACE
         if (ret == 0) {
-            ret = init_lace(&model->lace, oaci_lacelayers_arrays);
+            ret = oaci_init_lace(&model->lace, oaci_lacelayers_arrays);
         }
 # endif
 
 # ifndef DISABLE_NOLACE
         if (ret == 0) {
-            ret = init_nolace(&model->nolace, oaci_nolacelayers_arrays);
+            ret = oaci_init_nolace(&model->nolace, oaci_nolacelayers_arrays);
         }
 # endif
 
 # ifdef ENABLE_OSCE_BWE
 #  ifndef DISABLE_BBWENET
         if (ret == 0) {
-            ret = init_bbwenet(&model->bbwenet, oaci_bbwenetlayers_arrays);
+            ret = oaci_init_bbwenet(&model->bbwenet, oaci_bbwenetlayers_arrays);
         }
 #  endif
 # endif /* ENABLE_OSCE_BWE */
@@ -1495,12 +1495,12 @@ void oaci_osce_bwe(
 
 # if 0
     /* just upsampling for now */
-    upsamp_2x(&psOSCEBWE->state.bbwenet.resampler_state[0], out_buffer, in_buffer, xq16_len);
-    interpol_3_2(&psOSCEBWE->state.bbwenet.resampler_state[0], out_buffer, out_buffer, 2*xq16_len);
+    oaci_upsamp_2x(&psOSCEBWE->state.bbwenet.resampler_state[0], out_buffer, in_buffer, xq16_len);
+    oaci_interpol_3_2(&psOSCEBWE->state.bbwenet.resampler_state[0], out_buffer, out_buffer, 2*xq16_len);
 
 # else
     /* process frames */
-    bbwenet_process_frames(
+    oaci_bbwenet_process_frames(
         &model->bbwenet,
         &psOSCEBWE->state.bbwenet,
         out_buffer,
@@ -1571,13 +1571,13 @@ void oaci_osce_enhance_frame(
             break;
 #ifndef DISABLE_LACE
         case OSCE_METHOD_LACE:
-            lace_process_20ms_frame(&model->lace, &psDec->osce.state.lace, out_buffer, in_buffer, features, numbits,
+            oaci_lace_process_20ms_frame(&model->lace, &psDec->osce.state.lace, out_buffer, in_buffer, features, numbits,
         periods, arch);
             break;
 #endif
 #ifndef DISABLE_NOLACE
         case OSCE_METHOD_NOLACE:
-            nolace_process_20ms_frame(&model->nolace, &psDec->osce.state.nolace, out_buffer, in_buffer, features,
+            oaci_nolace_process_20ms_frame(&model->nolace, &psDec->osce.state.nolace, out_buffer, in_buffer, features,
         numbits, periods, arch);
             break;
 #endif
@@ -1696,7 +1696,7 @@ void lace_feature_net_compare(
     float numbits[2];
     int periods[4];
 
-    init_lace(hLACE);
+    oaci_init_lace(hLACE);
 
     FILE *f_in_features, *f_out_features, *f_numbits, *f_periods;
 
@@ -1755,7 +1755,7 @@ void lace_feature_net_compare(
         }
 
 
-        lace_feature_net(hLACE, out_features2, in_features, numbits, periods);
+        oaci_lace_feature_net(hLACE, out_features2, in_features, numbits, periods);
 
         float mse = 0;
         for (int i = 0; i < 4*LACE_COND_DIM; i++) {
@@ -1793,7 +1793,7 @@ void lace_demo(
     int frame_counter = 0;
     FILE *f_features, *f_numbits, *f_periods, *f_x_in, *f_x_out;
 
-    init_lace(&hLACE);
+    oaci_init_lace(&hLACE);
 
     strcpy(feature_file, prefix);
     strcat(feature_file, "_features.f32");
@@ -1855,7 +1855,7 @@ void lace_demo(
             exit(1);
         }
 
-        lace_process_20ms_frame(
+        oaci_lace_process_20ms_frame(
             &hLACE,
             buffer,
             x_in,
@@ -1901,7 +1901,7 @@ void nolace_demo(
     int frame_counter = 0;
     FILE *f_features, *f_numbits, *f_periods, *f_x_in, *f_x_out;
 
-    init_nolace(&hNoLACE);
+    oaci_init_nolace(&hNoLACE);
 
     strcpy(feature_file, prefix);
     strcat(feature_file, "_features.f32");
@@ -1963,7 +1963,7 @@ void nolace_demo(
             exit(1);
         }
 
-        nolace_process_20ms_frame(
+        oaci_nolace_process_20ms_frame(
             &hNoLACE,
             buffer,
             x_in,
diff --git a/dnn/osce_features.c b/dnn/osce_features.c
index ac4fdeb7e..8570b957f 100644
--- a/dnn/osce_features.c
+++ b/dnn/osce_features.c
@@ -180,7 +180,7 @@ static float osce_window[OSCE_SPEC_WINDOW_SIZE] = {
     0.044164277127f,     0.034354408400f,     0.024541228523f,     0.014725683311f,     0.004908718808f
 };
 
-static void apply_filterbank(float *x_out, float *x_in, const int *center_bins, const float* band_weights,
+static void oaci_apply_filterbank(float *x_out, float *x_in, const int *center_bins, const float* band_weights,
                              int num_bands) {
     int b, i;
     float frac;
@@ -206,7 +206,7 @@ static void apply_filterbank(float *x_out, float *x_in, const int *center_bins,
 }
 
 
-static void mag_spec_320_onesided(float *out, float *in) {
+static void oaci_mag_spec_320_onesided(float *out, float *in) {
     celt_assert(OSCE_SPEC_WINDOW_SIZE == 320);
     kiss_fft_cpx buffer[OSCE_SPEC_WINDOW_SIZE];
     int k;
@@ -232,14 +232,14 @@ static void calculate_log_spectrum_from_lpc(float *spec, oac_int16 *a_q12, int l
     }
 
     /* calculate and invert magnitude spectrum */
-    mag_spec_320_onesided(buffer, buffer);
+    oaci_mag_spec_320_onesided(buffer, buffer);
 
     for (i = 0; i < OSCE_SPEC_NUM_FREQS; i++) {
         buffer[i] = 1.f/(buffer[i] + 1e-9f);
     }
 
     /* apply filterbank */
-    apply_filterbank(spec, buffer, center_bins_clean, band_weights_clean, OSCE_CLEAN_SPEC_NUM_BANDS);
+    oaci_apply_filterbank(spec, buffer, center_bins_clean, band_weights_clean, OSCE_CLEAN_SPEC_NUM_BANDS);
 
     /* log and scaling */
     for (i = 0; i < OSCE_CLEAN_SPEC_NUM_BANDS; i++) {
@@ -247,7 +247,7 @@ static void calculate_log_spectrum_from_lpc(float *spec, oac_int16 *a_q12, int l
     }
 }
 
-static void calculate_cepstrum(float *cepstrum, float *signal) {
+static void oaci_calculate_cepstrum(float *cepstrum, float *signal) {
     float buffer[OSCE_SPEC_WINDOW_SIZE];
     float *spec = &buffer[OSCE_SPEC_NUM_FREQS + 3];
     int n;
@@ -259,10 +259,10 @@ static void calculate_cepstrum(float *cepstrum, float *signal) {
     }
 
     /* calculate magnitude spectrum */
-    mag_spec_320_onesided(buffer, buffer);
+    oaci_mag_spec_320_onesided(buffer, buffer);
 
     /* accumulate bands */
-    apply_filterbank(spec, buffer, center_bins_noisy, band_weights_noisy, OSCE_NOISY_SPEC_NUM_BANDS);
+    oaci_apply_filterbank(spec, buffer, center_bins_noisy, band_weights_noisy, OSCE_NOISY_SPEC_NUM_BANDS);
 
     /* log domain conversion */
     for (n = 0; n < OSCE_NOISY_SPEC_NUM_BANDS; n++) {
@@ -277,7 +277,7 @@ static void calculate_cepstrum(float *cepstrum, float *signal) {
     oaci_dct(cepstrum, spec);
 }
 
-static void calculate_acorr(float *acorr, float *signal, int lag) {
+static void oaci_calculate_acorr(float *acorr, float *signal, int lag) {
     int n, k;
     celt_assert(acorr != signal);
 
@@ -296,7 +296,7 @@ static void calculate_acorr(float *acorr, float *signal, int lag) {
     }
 }
 
-static int pitch_postprocessing(OSCEFeatureState *psFeatures, int lag, int type) {
+static int oaci_pitch_postprocessing(OSCEFeatureState *psFeatures, int lag, int type) {
     int new_lag;
     int modulus;
 
@@ -395,17 +395,17 @@ void oaci_osce_calculate_features(
 
         /* noisy cepstrum from signal (update every other frame) */
         if (k%2 == 0) {
-            calculate_cepstrum(pfeatures + OSCE_NOISY_CEPSTRUM_START, frame - 160);
+            oaci_calculate_cepstrum(pfeatures + OSCE_NOISY_CEPSTRUM_START, frame - 160);
         } else {
             OAC_COPY(pfeatures + OSCE_NOISY_CEPSTRUM_START, pfeatures + OSCE_NOISY_CEPSTRUM_START - OSCE_FEATURE_DIM,
             OSCE_NOISY_CEPSTRUM_LENGTH);
         }
 
         /* pitch hangover and zero value replacement */
-        periods[k] = pitch_postprocessing(psFeatures, psDecCtrl->pitchL[k], psDec->indices.signalType);
+        periods[k] = oaci_pitch_postprocessing(psFeatures, psDecCtrl->pitchL[k], psDec->indices.signalType);
 
         /* auto-correlation around pitch lag */
-        calculate_acorr(pfeatures + OSCE_ACORR_START, frame, periods[k]);
+        oaci_calculate_acorr(pfeatures + OSCE_ACORR_START, frame, periods[k]);
 
         /* ltp */
         celt_assert(OSCE_LTP_LENGTH == LTP_ORDER);
@@ -491,7 +491,7 @@ void oaci_osce_bwe_calculate_features(
             mag_spec[k] = OSCE_BWE_WINDOW_SIZE*sqrt(fft_buffer[k].r*fft_buffer[k].r + fft_buffer[k].i*fft_buffer[k].i);
         }
 
-        apply_filterbank(lmspec, mag_spec, center_bins_bwe, band_weights_bwe, OSCE_BWE_NUM_BANDS);
+        oaci_apply_filterbank(lmspec, mag_spec, center_bins_bwe, band_weights_bwe, OSCE_BWE_NUM_BANDS);
 
         for (k = 0; k < OSCE_BWE_NUM_BANDS; k++) {
             lmspec[k] = log(lmspec[k] + 1e-9);
diff --git a/dnn/parse_lpcnet_weights.c b/dnn/parse_lpcnet_weights.c
index f2daa845e..c5ddf8e3c 100644
--- a/dnn/parse_lpcnet_weights.c
+++ b/dnn/parse_lpcnet_weights.c
@@ -77,19 +77,19 @@ int oaci_parse_weights(WeightArray **list, const void *data, int len) {
     return nb_arrays;
 }
 
-static const WeightArray *find_array_entry(const WeightArray *arrays, const char *name) {
+static const WeightArray *oaci_find_array_entry(const WeightArray *arrays, const char *name) {
     while (arrays->name && strcmp(arrays->name, name) != 0) arrays++;
     return arrays;
 }
 
-static const void *find_array_check(const WeightArray *arrays, const char *name, int size) {
-    const WeightArray *a = find_array_entry(arrays, name);
+static const void *oaci_find_array_check(const WeightArray *arrays, const char *name, int size) {
+    const WeightArray *a = oaci_find_array_entry(arrays, name);
     if (a->name && a->size == size) return a->data;
     else return NULL;
 }
 
-static const void *opt_array_check(const WeightArray *arrays, const char *name, int size, int *error) {
-    const WeightArray *a = find_array_entry(arrays, name);
+static const void *oaci_opt_array_check(const WeightArray *arrays, const char *name, int size, int *error) {
+    const WeightArray *a = oaci_find_array_entry(arrays, name);
     *error = (a->name != NULL && a->size != size);
     if (a->name && a->size == size) return a->data;
     else return NULL;
@@ -99,7 +99,7 @@ static const void *find_idx_check(const WeightArray *arrays, const char *name, i
                                   int *total_blocks) {
     int remain;
     const int *idx;
-    const WeightArray *a = find_array_entry(arrays, name);
+    const WeightArray *a = oaci_find_array_entry(arrays, name);
     *total_blocks = 0;
     if (a == NULL) return NULL;
     idx = (const int*)a->data;
@@ -140,11 +140,11 @@ int oaci_linear_init(LinearLayer *layer, const WeightArray *arrays,
     layer->diag = NULL;
     layer->scale = NULL;
     if (bias != NULL) {
-        if ((layer->bias = (const float*)find_array_check(arrays, bias,
+        if ((layer->bias = (const float*)oaci_find_array_check(arrays, bias,
         nb_outputs*sizeof(layer->bias[0]))) == NULL) return 1;
     }
     if (subias != NULL) {
-        if ((layer->subias = (const float*)find_array_check(arrays, subias,
+        if ((layer->subias = (const float*)oaci_find_array_check(arrays, subias,
         nb_outputs*sizeof(layer->subias[0]))) == NULL) return 1;
     }
     if (weights_idx != NULL) {
@@ -152,31 +152,31 @@ int oaci_linear_init(LinearLayer *layer, const WeightArray *arrays,
         if ((layer->weights_idx = (const int*)find_idx_check(arrays, weights_idx, nb_inputs, nb_outputs,
         &total_blocks)) == NULL) return 1;
         if (weights != NULL) {
-            if ((layer->weights = (const oac_int8*)find_array_check(arrays, weights,
+            if ((layer->weights = (const oac_int8*)oaci_find_array_check(arrays, weights,
             SPARSE_BLOCK_SIZE*total_blocks*sizeof(layer->weights[0]))) == NULL) return 1;
         }
         if (float_weights != NULL) {
-            layer->float_weights = (const float*)opt_array_check(arrays, float_weights,
+            layer->float_weights = (const float*)oaci_opt_array_check(arrays, float_weights,
             SPARSE_BLOCK_SIZE*total_blocks*sizeof(layer->float_weights[0]), &err);
             if (err) return 1;
         }
     } else {
         if (weights != NULL) {
-            if ((layer->weights = (const oac_int8*)find_array_check(arrays, weights,
+            if ((layer->weights = (const oac_int8*)oaci_find_array_check(arrays, weights,
             nb_inputs*nb_outputs*sizeof(layer->weights[0]))) == NULL) return 1;
         }
         if (float_weights != NULL) {
-            layer->float_weights = (const float*)opt_array_check(arrays, float_weights,
+            layer->float_weights = (const float*)oaci_opt_array_check(arrays, float_weights,
             nb_inputs*nb_outputs*sizeof(layer->float_weights[0]), &err);
             if (err) return 1;
         }
     }
     if (diag != NULL) {
-        if ((layer->diag = (const float*)find_array_check(arrays, diag,
+        if ((layer->diag = (const float*)oaci_find_array_check(arrays, diag,
         nb_outputs*sizeof(layer->diag[0]))) == NULL) return 1;
     }
     if (weights != NULL) {
-        if ((layer->scale = (const float*)find_array_check(arrays, scale,
+        if ((layer->scale = (const float*)oaci_find_array_check(arrays, scale,
         nb_outputs*sizeof(layer->scale[0]))) == NULL) return 1;
     }
     layer->nb_inputs = nb_inputs;
@@ -195,11 +195,11 @@ int oaci_conv2d_init(Conv2dLayer *layer, const WeightArray *arrays,
     layer->bias = NULL;
     layer->float_weights = NULL;
     if (bias != NULL) {
-        if ((layer->bias = (const float*)find_array_check(arrays, bias,
+        if ((layer->bias = (const float*)oaci_find_array_check(arrays, bias,
         out_channels*sizeof(layer->bias[0]))) == NULL) return 1;
     }
     if (float_weights != NULL) {
-        layer->float_weights = (const float*)opt_array_check(arrays, float_weights,
+        layer->float_weights = (const float*)oaci_opt_array_check(arrays, float_weights,
         in_channels*out_channels*ktime*kheight*sizeof(layer->float_weights[0]), &err);
         if (err) return 1;
     }
diff --git a/dnn/test_vec.c b/dnn/test_vec.c
index aaaaadf8e..1a56f76c5 100644
--- a/dnn/test_vec.c
+++ b/dnn/test_vec.c
@@ -12,10 +12,10 @@
 
 #define lpcnet_exp2 lpcnet_exp2_fast
 #define tansig_approx tansig_approx_fast
-#define sigmoid_approx sigmoid_approx_fast
-#define softmax softmax_fast
-#define vec_tanh vec_tanh_fast
-#define vec_sigmoid vec_sigmoid_fast
+#define oaci_sigmoid_approx sigmoid_approx_fast
+#define oaci_softmax softmax_fast
+#define oaci_vec_tanh vec_tanh_fast
+#define oaci_vec_sigmoid vec_sigmoid_fast
 #define sgemv_accum16 sgemv_accum16_fast
 #define sparse_sgemv_accum16 sparse_sgemv_accum16_fast
 
@@ -36,10 +36,10 @@ const char simd[] = "none";
 
 #undef lpcnet_exp2
 #undef tansig_approx
-#undef sigmoid_approx
-#undef softmax
-#undef vec_tanh
-#undef vec_sigmoid
+#undef oaci_sigmoid_approx
+#undef oaci_softmax
+#undef oaci_vec_tanh
+#undef oaci_vec_sigmoid
 #undef sgemv_accum16
 #undef sparse_sgemv_accum16
 #include "vec.h"
diff --git a/dnn/vec.h b/dnn/vec.h
index e6c22e26d..ccaca091c 100644
--- a/dnn/vec.h
+++ b/dnn/vec.h
@@ -47,7 +47,7 @@
 
 # define NO_OPTIMIZATIONS
 
-static inline void sgemv16x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x) {
+static inline void oaci_sgemv16x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x) {
     int i, j;
     OAC_CLEAR(out, rows);
     for (i = 0; i < rows; i += 16) {
@@ -78,7 +78,7 @@ static inline void sgemv16x1(float *out, const float *weights, int rows, int col
     }
 }
 
-static inline void sgemv8x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x) {
+static inline void oaci_sgemv8x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x) {
     int i, j;
     OAC_CLEAR(out, rows);
     for (i = 0; i < rows; i += 8) {
@@ -101,9 +101,9 @@ static inline void sgemv8x1(float *out, const float *weights, int rows, int cols
     }
 }
 
-static inline void sgemv(float *out, const float *weights, int rows, int cols, int col_stride, const float *x) {
-    if ((rows&0xf) == 0) sgemv16x1(out, weights, rows, cols, col_stride, x);
-    else if ((rows&0x7) == 0) sgemv8x1(out, weights, rows, cols, col_stride, x);
+static inline void oaci_sgemv(float *out, const float *weights, int rows, int cols, int col_stride, const float *x) {
+    if ((rows&0xf) == 0) oaci_sgemv16x1(out, weights, rows, cols, col_stride, x);
+    else if ((rows&0x7) == 0) oaci_sgemv8x1(out, weights, rows, cols, col_stride, x);
     else {
         int i, j;
         for (i = 0; i < rows; i++) {
@@ -113,7 +113,7 @@ static inline void sgemv(float *out, const float *weights, int rows, int cols, i
     }
 }
 
-static inline void sparse_sgemv8x4(float *out, const float *w, const int *idx, int rows, const float *x) {
+static inline void oaci_sparse_sgemv8x4(float *out, const float *w, const int *idx, int rows, const float *x) {
     int i, j;
     OAC_CLEAR(out, rows);
     for (i = 0; i < rows; i += 8) {
@@ -170,7 +170,7 @@ static inline void sparse_sgemv8x4(float *out, const float *w, const int *idx, i
 }
 
 # ifdef USE_SU_BIAS
-static inline void sparse_cgemv8x4(float *out, const oac_int8 *w, const int *idx, const float *scale, int rows,
+static inline void oaci_sparse_cgemv8x4(float *out, const oac_int8 *w, const int *idx, const float *scale, int rows,
                                    int cols, const float *_x) {
     int i, j;
     unsigned char x[MAX_INPUTS];
@@ -202,7 +202,7 @@ static inline void sparse_cgemv8x4(float *out, const oac_int8 *w, const int *idx
     }
     for (i = 0; i < rows; i++) out[i] *= scale[i];
 }
-static inline void cgemv8x4(float *out, const oac_int8 *w, const float *scale, int rows, int cols, const float *_x) {
+static inline void oaci_cgemv8x4(float *out, const oac_int8 *w, const float *scale, int rows, int cols, const float *_x) {
     int i, j;
     unsigned char x[MAX_INPUTS];
     for (i = 0; i < rows; i++) out[i] = 0;
@@ -230,7 +230,7 @@ static inline void cgemv8x4(float *out, const oac_int8 *w, const float *scale, i
     for (i = 0; i < rows; i++) out[i] *= scale[i];
 }
 # else
-static inline void sparse_cgemv8x4(float *out, const oac_int8 *w, const int *idx, const float *scale, int rows,
+static inline void oaci_sparse_cgemv8x4(float *out, const oac_int8 *w, const int *idx, const float *scale, int rows,
                                    int cols, const float *_x) {
     int i, j;
     oac_int8 x[MAX_INPUTS];
@@ -262,7 +262,7 @@ static inline void sparse_cgemv8x4(float *out, const oac_int8 *w, const int *idx
     }
     for (i = 0; i < rows; i++) out[i] *= scale[i];
 }
-static inline void cgemv8x4(float *out, const oac_int8 *w, const float *scale, int rows, int cols, const float *_x) {
+static inline void oaci_cgemv8x4(float *out, const oac_int8 *w, const float *scale, int rows, int cols, const float *_x) {
     int i, j;
     oac_int8 x[MAX_INPUTS];
     for (i = 0; i < rows; i++) out[i] = 0;
@@ -310,10 +310,10 @@ static inline float lpcnet_exp2(float x) {
     res.i = (res.i + (integer<<23))&0x7fffffff;
     return res.f;
 }
-#  define lpcnet_exp(x) lpcnet_exp2((x)*1.44269504f)
+#  define oaci_lpcnet_exp(x) lpcnet_exp2((x)*1.44269504f)
 
 #  define fmadd(a, b, c) ((a)*(b) + (c))
-static OAC_INLINE float tanh_approx(float x) {
+static OAC_INLINE float oaci_tanh_approx(float x) {
     const float N0 = 952.52801514f;
     const float N1 = 96.39235687f;
     const float N2 = 0.60863042f;
@@ -328,27 +328,27 @@ static OAC_INLINE float tanh_approx(float x) {
     return MAX32(-1.f, MIN32(1.f, num));
 }
 
-static inline float sigmoid_approx(float x) {
-    return .5f + .5f*tanh_approx(.5f*x);
+static inline float oaci_sigmoid_approx(float x) {
+    return .5f + .5f*oaci_tanh_approx(.5f*x);
 }
 
-static inline void softmax(float *y, const float *x, int N) {
+static inline void oaci_softmax(float *y, const float *x, int N) {
     int i;
     for (i = 0; i < N; i++)
-        y[i] = lpcnet_exp(x[i]);
+        y[i] = oaci_lpcnet_exp(x[i]);
 }
 
-static inline void vec_tanh(float *y, const float *x, int N) {
+static inline void oaci_vec_tanh(float *y, const float *x, int N) {
     int i;
     for (i = 0; i < N; i++) {
-        y[i] = tanh_approx(x[i]);
+        y[i] = oaci_tanh_approx(x[i]);
     }
 }
 
-static inline void vec_sigmoid(float *y, const float *x, int N) {
+static inline void oaci_vec_sigmoid(float *y, const float *x, int N) {
     int i;
     for (i = 0; i < N; i++) {
-        y[i] = sigmoid_approx(x[i]);
+        y[i] = oaci_sigmoid_approx(x[i]);
     }
 }
 # endif
diff --git a/dnn/vec_avx.h b/dnn/vec_avx.h
index 6b4867006..0f62ddb00 100644
--- a/dnn/vec_avx.h
+++ b/dnn/vec_avx.h
@@ -394,7 +394,7 @@ static inline void vector_ps_to_epi8(unsigned char *x, const float *_x, int len)
    reciprocal approximation (the max error of the rational function is
    around 6e-5).
  */
-static inline __m256 tanh8_approx(__m256 X) {
+static inline __m256 oaci_tanh8_approx(__m256 X) {
     const __m256 N0 = _mm256_set1_ps(952.52801514f);
     const __m256 N1 = _mm256_set1_ps(96.39235687f);
     const __m256 N2 = _mm256_set1_ps(0.60863042f);
@@ -421,7 +421,7 @@ static inline __m256 tanh8_approx(__m256 X) {
    and is dominated by the reciprocal approximation (the max error of the
    rational function is around 3e-5).
  */
-static inline __m256 sigmoid8_approx(__m256 X) {
+static inline __m256 oaci_sigmoid8_approx(__m256 X) {
     const __m256 N0 = _mm256_set1_ps(238.13200378f);
     const __m256 N1 = _mm256_set1_ps(6.02452230f);
     const __m256 N2 = _mm256_set1_ps(0.00950985f);
@@ -441,27 +441,27 @@ static inline __m256 sigmoid8_approx(__m256 X) {
     return _mm256_max_ps(min_out, _mm256_min_ps(max_out, num));
 }
 
-static inline float tanh_approx(float x) {
+static inline float oaci_tanh_approx(float x) {
     float out[8];
     __m256 X, Y;
     X = _mm256_set1_ps(x);
-    Y = tanh8_approx(X);
+    Y = oaci_tanh8_approx(X);
     _mm256_storeu_ps(out, Y);
     return out[0];
 }
 
-static inline float sigmoid_approx(float x) {
+static inline float oaci_sigmoid_approx(float x) {
     float out[8];
     __m256 X, Y;
     X = _mm256_set1_ps(x);
-    Y = sigmoid8_approx(X);
+    Y = oaci_sigmoid8_approx(X);
     _mm256_storeu_ps(out, Y);
     return out[0];
 }
 
 #else
 
-static inline __m128 tanh4_approx(__m128 X) {
+static inline __m128 oaci_tanh4_approx(__m128 X) {
     const __m128 N0 = _mm_set1_ps(952.52801514f);
     const __m128 N1 = _mm_set1_ps(96.39235687f);
     const __m128 N2 = _mm_set1_ps(0.60863042f);
@@ -480,7 +480,7 @@ static inline __m128 tanh4_approx(__m128 X) {
     return _mm_max_ps(min_out, _mm_min_ps(max_out, num));
 }
 
-static inline __m128 sigmoid4_approx(__m128 X) {
+static inline __m128 oaci_sigmoid4_approx(__m128 X) {
     const __m128 N0 = _mm_set1_ps(238.13200378f);
     const __m128 N1 = _mm_set1_ps(6.02452230f);
     const __m128 N2 = _mm_set1_ps(0.00950985f);
@@ -500,27 +500,27 @@ static inline __m128 sigmoid4_approx(__m128 X) {
     return _mm_max_ps(min_out, _mm_min_ps(max_out, num));
 }
 
-static inline float tanh_approx(float x) {
+static inline float oaci_tanh_approx(float x) {
     float out[4];
     __m128 X, Y;
     X = _mm_set1_ps(x);
-    Y = tanh4_approx(X);
+    Y = oaci_tanh4_approx(X);
     _mm_storeu_ps(out, Y);
     return out[0];
 }
 
-static inline float sigmoid_approx(float x) {
+static inline float oaci_sigmoid_approx(float x) {
     float out[4];
     __m128 X, Y;
     X = _mm_set1_ps(x);
-    Y = sigmoid4_approx(X);
+    Y = oaci_sigmoid4_approx(X);
     _mm_storeu_ps(out, Y);
     return out[0];
 }
 
 #endif
 
-static inline float lpcnet_exp(float x) {
+static inline float oaci_lpcnet_exp(float x) {
     float out[8];
     __m256 X, Y;
     X = _mm256_set1_ps(x);
@@ -529,7 +529,7 @@ static inline float lpcnet_exp(float x) {
     return out[0];
 }
 
-static inline void softmax(float *y, const float *x, int N) {
+static inline void oaci_softmax(float *y, const float *x, int N) {
     int i;
     for (i = 0; i < N - 7; i += 8) {
         __m256 X, Y;
@@ -538,59 +538,59 @@ static inline void softmax(float *y, const float *x, int N) {
         _mm256_storeu_ps(&y[i], Y);
     }
     for (; i < N; i++)
-        y[i] = lpcnet_exp(x[i]);
+        y[i] = oaci_lpcnet_exp(x[i]);
 }
 
 #ifdef __AVX__
-static inline void vec_tanh(float *y, const float *x, int N) {
+static inline void oaci_vec_tanh(float *y, const float *x, int N) {
     int i;
     for (i = 0; i < N - 7; i += 8) {
         __m256 X, Y;
         X = _mm256_loadu_ps(&x[i]);
-        Y = tanh8_approx(X);
+        Y = oaci_tanh8_approx(X);
         _mm256_storeu_ps(&y[i], Y);
     }
     for (; i < N; i++) {
-        y[i] = tanh_approx(x[i]);
+        y[i] = oaci_tanh_approx(x[i]);
     }
 }
 
-static inline void vec_sigmoid(float *y, const float *x, int N) {
+static inline void oaci_vec_sigmoid(float *y, const float *x, int N) {
     int i;
     for (i = 0; i < N - 7; i += 8) {
         __m256 X, Y;
         X = _mm256_loadu_ps(&x[i]);
-        Y = sigmoid8_approx(X);
+        Y = oaci_sigmoid8_approx(X);
         _mm256_storeu_ps(&y[i], Y);
     }
     for (; i < N; i++) {
-        y[i] = sigmoid_approx(x[i]);
+        y[i] = oaci_sigmoid_approx(x[i]);
     }
 }
 #else
-static inline void vec_tanh(float *y, const float *x, int N) {
+static inline void oaci_vec_tanh(float *y, const float *x, int N) {
     int i;
     for (i = 0; i < N - 3; i += 4) {
         __m128 X, Y;
         X = _mm_loadu_ps(&x[i]);
-        Y = tanh4_approx(X);
+        Y = oaci_tanh4_approx(X);
         _mm_storeu_ps(&y[i], Y);
     }
     for (; i < N; i++) {
-        y[i] = tanh_approx(x[i]);
+        y[i] = oaci_tanh_approx(x[i]);
     }
 }
 
-static inline void vec_sigmoid(float *y, const float *x, int N) {
+static inline void oaci_vec_sigmoid(float *y, const float *x, int N) {
     int i;
     for (i = 0; i < N - 3; i += 4) {
         __m128 X, Y;
         X = _mm_loadu_ps(&x[i]);
-        Y = sigmoid4_approx(X);
+        Y = oaci_sigmoid4_approx(X);
         _mm_storeu_ps(&y[i], Y);
     }
     for (; i < N; i++) {
-        y[i] = sigmoid_approx(x[i]);
+        y[i] = oaci_sigmoid_approx(x[i]);
     }
 }
 
@@ -645,7 +645,7 @@ static inline mm256i_emu oac_mm256_dpbusds_epi32(mm256i_emu src, mm256i_emu a, m
 # error "No optimizations in vec_avx.h. This should never happen. "
 #endif
 
-static inline void sgemv(float *out, const float *weights, int rows, int cols, int col_stride, const float *x) {
+static inline void oaci_sgemv(float *out, const float *weights, int rows, int cols, int col_stride, const float *x) {
     int i, j;
     i = 0;
     for (; i < rows - 15; i += 16) {
@@ -704,7 +704,7 @@ static inline void sgemv(float *out, const float *weights, int rows, int cols, i
     }
 }
 
-static inline void sparse_sgemv8x4(float *out, const float *weights, const int *idx, int rows, const float *x) {
+static inline void oaci_sparse_sgemv8x4(float *out, const float *weights, const int *idx, int rows, const float *x) {
     int i, j;
     for (i = 0; i < rows; i += 8) {
         float *y;
@@ -740,7 +740,7 @@ static inline void sparse_sgemv8x4(float *out, const float *weights, const int *
     }
 }
 
-static inline void sparse_cgemv8x4(float *_out, const oac_int8 *w, const int *idx, const float *scale, int rows,
+static inline void oaci_sparse_cgemv8x4(float *_out, const oac_int8 *w, const int *idx, const float *scale, int rows,
                                    int cols, const float *_x) {
     int i, j;
     unsigned char x[MAX_INPUTS];
@@ -788,7 +788,7 @@ static inline void sparse_cgemv8x4(float *_out, const oac_int8 *w, const int *id
         _mm256_storeu_ps(&_out[i], vout);
     }
 }
-static inline void cgemv8x4(float *_out, const oac_int8 *w, const float *scale, int rows, int cols, const float *_x) {
+static inline void oaci_cgemv8x4(float *_out, const oac_int8 *w, const float *scale, int rows, int cols, const float *_x) {
     int i, j;
     unsigned char x[MAX_INPUTS];
     /*for (i=0;i<cols;i++) x[i] = 127+floor(.5+127*_x[i]);*/
diff --git a/dnn/vec_neon.h b/dnn/vec_neon.h
index f4045afe3..f5949a73d 100644
--- a/dnn/vec_neon.h
+++ b/dnn/vec_neon.h
@@ -83,7 +83,7 @@ static inline float32x4_t exp4_approx(float32x4_t x) {
     return Y;
 }
 
-static inline float32x4_t tanh4_approx(float32x4_t X) {
+static inline float32x4_t oaci_tanh4_approx(float32x4_t X) {
     const float32x4_t N0 = vdupq_n_f32(952.52801514f);
     const float32x4_t N1 = vdupq_n_f32(96.39235687f);
     const float32x4_t N2 = vdupq_n_f32(0.60863042f);
@@ -102,7 +102,7 @@ static inline float32x4_t tanh4_approx(float32x4_t X) {
     return vmaxq_f32(min_out, vminq_f32(max_out, num));
 }
 
-static inline float32x4_t sigmoid4_approx(float32x4_t X) {
+static inline float32x4_t oaci_sigmoid4_approx(float32x4_t X) {
     const float32x4_t N0 = vdupq_n_f32(238.13200378f);
     const float32x4_t N1 = vdupq_n_f32(6.02452230f);
     const float32x4_t N2 = vdupq_n_f32(0.00950985f);
@@ -122,7 +122,7 @@ static inline float32x4_t sigmoid4_approx(float32x4_t X) {
     return vmaxq_f32(min_out, vminq_f32(max_out, num));
 }
 
-static inline float lpcnet_exp(float x) {
+static inline float oaci_lpcnet_exp(float x) {
     float out[4];
     float32x4_t X, Y;
     X = vdupq_n_f32(x);
@@ -131,25 +131,25 @@ static inline float lpcnet_exp(float x) {
     return out[0];
 }
 
-static inline float tanh_approx(float x) {
+static inline float oaci_tanh_approx(float x) {
     float out[4];
     float32x4_t X, Y;
     X = vdupq_n_f32(x);
-    Y = tanh4_approx(X);
+    Y = oaci_tanh4_approx(X);
     vst1q_f32(out, Y);
     return out[0];
 }
 
-static inline float sigmoid_approx(float x) {
+static inline float oaci_sigmoid_approx(float x) {
     float out[4];
     float32x4_t X, Y;
     X = vdupq_n_f32(x);
-    Y = sigmoid4_approx(X);
+    Y = oaci_sigmoid4_approx(X);
     vst1q_f32(out, Y);
     return out[0];
 }
 
-static inline void softmax(float *y, const float *x, int N) {
+static inline void oaci_softmax(float *y, const float *x, int N) {
     int i;
     for (i = 0; i < N - 3; i += 4) {
         float32x4_t X, Y;
@@ -158,41 +158,41 @@ static inline void softmax(float *y, const float *x, int N) {
         vst1q_f32(&y[i], Y);
     }
     for (; i < N; i++)
-        y[i] = lpcnet_exp(x[i]);
+        y[i] = oaci_lpcnet_exp(x[i]);
 }
 
-static inline void vec_tanh(float *y, const float *x, int N) {
+static inline void oaci_vec_tanh(float *y, const float *x, int N) {
     int i;
     for (i = 0; i < N - 3; i += 4) {
         float32x4_t X, Y;
         X = vld1q_f32(&x[i]);
-        Y = tanh4_approx(X);
+        Y = oaci_tanh4_approx(X);
         vst1q_f32(&y[i], Y);
     }
     for (; i < N; i++) {
         float ex2;
-        ex2 = lpcnet_exp(2*x[i]);
+        ex2 = oaci_lpcnet_exp(2*x[i]);
         y[i] = (ex2 - 1)/(ex2 + 1);
     }
 }
 
-static inline void vec_sigmoid(float *y, const float *x, int N) {
+static inline void oaci_vec_sigmoid(float *y, const float *x, int N) {
     int i;
     for (i = 0; i < N - 3; i += 4) {
         float32x4_t X, Y;
         X = vld1q_f32(&x[i]);
-        Y = sigmoid4_approx(X);
+        Y = oaci_sigmoid4_approx(X);
         vst1q_f32(&y[i], Y);
     }
     for (; i < N; i++) {
         float ex;
-        ex = lpcnet_exp(x[i]);
+        ex = oaci_lpcnet_exp(x[i]);
         y[i] = (ex)/(ex + 1);
     }
 }
 #endif
 
-static inline void sgemv16x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x) {
+static inline void oaci_sgemv16x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x) {
     int i, j;
     for (i = 0; i < rows; i += 16) {
         float * restrict y = &out[i];
@@ -233,7 +233,7 @@ static inline void sgemv16x1(float *out, const float *weights, int rows, int col
     }
 }
 
-static inline void sgemv8x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x) {
+static inline void oaci_sgemv8x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x) {
     int i, j;
     for (i = 0; i < rows; i += 8) {
         float * restrict y = &out[i];
@@ -265,9 +265,9 @@ static inline void sgemv8x1(float *out, const float *weights, int rows, int cols
     }
 }
 
-static inline void sgemv(float *out, const float *weights, int rows, int cols, int col_stride, const float *x) {
-    if ((rows&0xf) == 0) sgemv16x1(out, weights, rows, cols, col_stride, x);
-    else if ((rows&0x7) == 0) sgemv8x1(out, weights, rows, cols, col_stride, x);
+static inline void oaci_sgemv(float *out, const float *weights, int rows, int cols, int col_stride, const float *x) {
+    if ((rows&0xf) == 0) oaci_sgemv16x1(out, weights, rows, cols, col_stride, x);
+    else if ((rows&0x7) == 0) oaci_sgemv8x1(out, weights, rows, cols, col_stride, x);
     else {
         int i, j;
         for (i = 0; i < rows; i++) {
@@ -278,7 +278,7 @@ static inline void sgemv(float *out, const float *weights, int rows, int cols, i
 }
 
 /* Temporarily use unoptimized version */
-static inline void sparse_sgemv8x4(float *out, const float *w, const int *idx, int rows, const float *x) {
+static inline void oaci_sparse_sgemv8x4(float *out, const float *w, const int *idx, int rows, const float *x) {
     int i, j;
     OAC_CLEAR(out, rows);
     for (i = 0; i < rows; i += 8) {
@@ -351,7 +351,7 @@ static inline int32x4_t vdotprod(int32x4_t acc, int8x16_t a, int8x16_t b) {
 }
 #endif
 
-static inline void cgemv8x4(float *_out, const oac_int8 *w, const float *scale, int rows, int cols, const float *_x) {
+static inline void oaci_cgemv8x4(float *_out, const oac_int8 *w, const float *scale, int rows, int cols, const float *_x) {
     int i, j;
     oac_int32 x_int[MAX_INPUTS/4];
     oac_int8 *x = (oac_int8*) x_int;
@@ -402,7 +402,7 @@ static inline void cgemv8x4(float *_out, const oac_int8 *w, const float *scale,
     }
 }
 
-static inline void sparse_cgemv8x4(float *_out, const oac_int8 *w, const int *idx, const float *scale, int rows,
+static inline void oaci_sparse_cgemv8x4(float *_out, const oac_int8 *w, const int *idx, const float *scale, int rows,
                                    int cols, const float *_x) {
     int i, j;
     oac_int32 x_int[MAX_INPUTS/4];
diff --git a/silk/A2NLSF.c b/silk/A2NLSF.c
index 470a4d6b1..659385901 100644
--- a/silk/A2NLSF.c
+++ b/silk/A2NLSF.c
@@ -44,7 +44,7 @@
 
 /* Helper function for A2NLSF(..)                    */
 /* Transforms polynomials from cos(n*f) to cos(f)^n  */
-static OAC_INLINE void silk_A2NLSF_trans_poly(
+static OAC_INLINE void oaci_silk_A2NLSF_trans_poly(
     oac_int32          *p,                     /* I/O    Polynomial                                */
     const oac_int dd                           /* I      Polynomial order (= filter order / 2 )    */
     ) {
@@ -59,7 +59,7 @@ static OAC_INLINE void silk_A2NLSF_trans_poly(
 }
 /* Helper function for A2NLSF(..) */
 /* Polynomial evaluation          */
-static OAC_INLINE oac_int32 silk_A2NLSF_eval_poly( /* return the polynomial evaluation, in Q16     */
+static OAC_INLINE oac_int32 oaci_silk_A2NLSF_eval_poly( /* return the polynomial evaluation, in Q16     */
     oac_int32          *p,                     /* I    Polynomial, Q16                         */
     const oac_int32 x,                         /* I    Evaluation point, Q12                   */
     const oac_int dd                           /* I    Order                                   */
@@ -87,7 +87,7 @@ static OAC_INLINE oac_int32 silk_A2NLSF_eval_poly( /* return the polynomial eval
     return y32;
 }
 
-static OAC_INLINE void silk_A2NLSF_init(
+static OAC_INLINE void oaci_silk_A2NLSF_init(
     const oac_int32    *a_Q16,
     oac_int32          *P,
     oac_int32          *Q,
@@ -111,8 +111,8 @@ static OAC_INLINE void silk_A2NLSF_init(
     }
 
     /* Transform polynomials from cos(n*f) to cos(f)^n */
-    silk_A2NLSF_trans_poly( P, dd );
-    silk_A2NLSF_trans_poly( Q, dd );
+    oaci_silk_A2NLSF_trans_poly( P, dd );
+    oaci_silk_A2NLSF_trans_poly( Q, dd );
 }
 
 /* Compute Normalized Line Spectral Frequencies (NLSFs) from whitening filter coefficients      */
@@ -137,19 +137,19 @@ void oaci_silk_A2NLSF(
 
     dd = silk_RSHIFT( d, 1 );
 
-    silk_A2NLSF_init( a_Q16, P, Q, dd );
+    oaci_silk_A2NLSF_init( a_Q16, P, Q, dd );
 
     /* Find roots, alternating between P and Q */
     p = P;                          /* Pointer to polynomial */
 
     xlo = oaci_silk_LSFCosTab_FIX_Q12[ 0 ]; /* Q12*/
-    ylo = silk_A2NLSF_eval_poly( p, xlo, dd );
+    ylo = oaci_silk_A2NLSF_eval_poly( p, xlo, dd );
 
     if (ylo < 0) {
         /* Set the first NLSF to zero and move on to the next */
         NLSF[ 0 ] = 0;
         p = Q;                      /* Pointer to polynomial */
-        ylo = silk_A2NLSF_eval_poly( p, xlo, dd );
+        ylo = oaci_silk_A2NLSF_eval_poly( p, xlo, dd );
         root_ix = 1;                /* Index of current root */
     } else {
         root_ix = 0;                /* Index of current root */
@@ -160,7 +160,7 @@ void oaci_silk_A2NLSF(
     while (1) {
         /* Evaluate polynomial */
         xhi = oaci_silk_LSFCosTab_FIX_Q12[ k ]; /* Q12 */
-        yhi = silk_A2NLSF_eval_poly( p, xhi, dd );
+        yhi = oaci_silk_A2NLSF_eval_poly( p, xhi, dd );
 
         /* Detect zero crossing */
         if ((ylo <= 0 && yhi >= thr) || (ylo >= 0 && yhi <= -thr)) {
@@ -176,7 +176,7 @@ void oaci_silk_A2NLSF(
             for (m = 0; m < BIN_DIV_STEPS_A2NLSF_FIX; m++) {
                 /* Evaluate polynomial */
                 xmid = silk_RSHIFT_ROUND( xlo + xhi, 1 );
-                ymid = silk_A2NLSF_eval_poly( p, xmid, dd );
+                ymid = oaci_silk_A2NLSF_eval_poly( p, xmid, dd );
 
                 /* Detect zero crossing */
                 if ((ylo <= 0 && ymid >= 0) || (ylo >= 0 && ymid <= 0)) {
@@ -239,15 +239,15 @@ void oaci_silk_A2NLSF(
                 /* Error: Apply progressively more bandwidth expansion and run again */
                 oaci_silk_bwexpander_32( a_Q16, d, 65536 - silk_LSHIFT( 1, i ));
 
-                silk_A2NLSF_init( a_Q16, P, Q, dd );
+                oaci_silk_A2NLSF_init( a_Q16, P, Q, dd );
                 p = P;                            /* Pointer to polynomial */
                 xlo = oaci_silk_LSFCosTab_FIX_Q12[ 0 ]; /* Q12*/
-                ylo = silk_A2NLSF_eval_poly( p, xlo, dd );
+                ylo = oaci_silk_A2NLSF_eval_poly( p, xlo, dd );
                 if (ylo < 0) {
                     /* Set the first NLSF to zero and move on to the next */
                     NLSF[ 0 ] = 0;
                     p = Q;                        /* Pointer to polynomial */
-                    ylo = silk_A2NLSF_eval_poly( p, xlo, dd );
+                    ylo = oaci_silk_A2NLSF_eval_poly( p, xlo, dd );
                     root_ix = 1;                  /* Index of current root */
                 } else {
                     root_ix = 0;                  /* Index of current root */
diff --git a/silk/CNG.c b/silk/CNG.c
index 6505d9b7a..bff98b542 100644
--- a/silk/CNG.c
+++ b/silk/CNG.c
@@ -33,7 +33,7 @@
 #include "stack_alloc.h"
 
 /* Generates excitation for CNG LPC synthesis */
-static OAC_INLINE void silk_CNG_exc(
+static OAC_INLINE void oaci_silk_CNG_exc(
     oac_int32 exc_Q14[],                                /* O    CNG excitation signal Q10                   */
     oac_int32 exc_buf_Q14[],                            /* I    Random samples buffer Q10                   */
     oac_int length,                                     /* I    Length                                      */
@@ -146,7 +146,7 @@ void oaci_silk_CNG(
         }
         gain_Q10 = silk_RSHIFT( gain_Q16, 6 );
 
-        silk_CNG_exc( CNG_sig_Q14 + MAX_LPC_ORDER, psCNG->CNG_exc_buf_Q14, length, &psCNG->rand_seed );
+        oaci_silk_CNG_exc( CNG_sig_Q14 + MAX_LPC_ORDER, psCNG->CNG_exc_buf_Q14, length, &psCNG->rand_seed );
 
         /* Convert CNG NLSF to filter representation */
         oaci_silk_NLSF2A( A_Q12, psCNG->CNG_smth_NLSF_Q15, psDec->LPC_order, psDec->arch );
diff --git a/silk/LP_variable_cutoff.c b/silk/LP_variable_cutoff.c
index 6666aca9b..ea1081557 100644
--- a/silk/LP_variable_cutoff.c
+++ b/silk/LP_variable_cutoff.c
@@ -38,7 +38,7 @@
 #include "main.h"
 
 /* Helper function, interpolates the filter taps */
-static OAC_INLINE void silk_LP_interpolate_filter_taps(
+static OAC_INLINE void oaci_silk_LP_interpolate_filter_taps(
     oac_int32 B_Q28[ TRANSITION_NB ],
     oac_int32 A_Q28[ TRANSITION_NA ],
     const oac_int ind,
@@ -120,7 +120,7 @@ void oaci_silk_LP_variable_cutoff(
         silk_assert( ind < TRANSITION_INT_NUM );
 
         /* Interpolate filter coefficients */
-        silk_LP_interpolate_filter_taps( B_Q28, A_Q28, ind, fac_Q16 );
+        oaci_silk_LP_interpolate_filter_taps( B_Q28, A_Q28, ind, fac_Q16 );
 
         /* Update transition frame number for next frame */
         psLP->transition_frame_no = silk_LIMIT( psLP->transition_frame_no + psLP->mode, 0, TRANSITION_FRAMES );
diff --git a/silk/NLSF2A.c b/silk/NLSF2A.c
index fce54d618..1f4a1a67d 100644
--- a/silk/NLSF2A.c
+++ b/silk/NLSF2A.c
@@ -41,7 +41,7 @@
 #define QA      16
 
 /* helper function for NLSF2A(..) */
-static OAC_INLINE void silk_NLSF2A_find_poly(
+static OAC_INLINE void oaci_silk_NLSF2A_find_poly(
     oac_int32          *out,      /* O    intermediate polynomial, QA [dd+1]        */
     const oac_int32    *cLSF,     /* I    vector of interleaved 2*cos(LSFs), QA [d] */
     oac_int dd                    /* I    polynomial order (= 1/2 * filter order)   */
@@ -69,7 +69,7 @@ void oaci_silk_NLSF2A(
     int arch                                        /* I    Run-time architecture                                       */
     ) {
     /* This ordering was found to maximize quality. It improves numerical accuracy of
-       silk_NLSF2A_find_poly() compared to "standard" ordering. */
+       oaci_silk_NLSF2A_find_poly() compared to "standard" ordering. */
     static const unsigned char ordering16[16] = {
         0, 15, 8, 7, 4, 11, 12, 3, 2, 13, 10, 5, 6, 9, 14, 1
     };
@@ -111,8 +111,8 @@ void oaci_silk_NLSF2A(
     dd = silk_RSHIFT( d, 1 );
 
     /* generate even and odd polynomials using convolution */
-    silk_NLSF2A_find_poly( P, &cos_LSF_QA[ 0 ], dd );
-    silk_NLSF2A_find_poly( Q, &cos_LSF_QA[ 1 ], dd );
+    oaci_silk_NLSF2A_find_poly( P, &cos_LSF_QA[ 0 ], dd );
+    oaci_silk_NLSF2A_find_poly( Q, &cos_LSF_QA[ 1 ], dd );
 
     /* convert even and odd polynomials to oac_int32 Q12 filter coefs */
     for (k = 0; k < dd; k++) {
diff --git a/silk/NLSF_decode.c b/silk/NLSF_decode.c
index 2591e43f3..c18172bbe 100644
--- a/silk/NLSF_decode.c
+++ b/silk/NLSF_decode.c
@@ -32,7 +32,7 @@
 #include "main.h"
 
 /* Predictive dequantizer for NLSF residuals */
-static OAC_INLINE void silk_NLSF_residual_dequant(          /* O    Returns RD value in Q30                     */
+static OAC_INLINE void oaci_silk_NLSF_residual_dequant(          /* O    Returns RD value in Q30                     */
     oac_int16 x_Q10[],                                      /* O    Output [ order ]                            */
     const oac_int8 indices[],                               /* I    Quantization indices [ order ]              */
     const oac_uint8 pred_coef_Q8[],                         /* I    Backward predictor coefs [ order ]          */
@@ -76,7 +76,7 @@ void oaci_silk_NLSF_decode(
     oaci_silk_NLSF_unpack( ec_ix, pred_Q8, psNLSF_CB, NLSFIndices[ 0 ] );
 
     /* Predictive residual dequantizer */
-    silk_NLSF_residual_dequant( res_Q10, &NLSFIndices[ 1 ], pred_Q8, psNLSF_CB->quantStepSize_Q16, psNLSF_CB->order );
+    oaci_silk_NLSF_residual_dequant( res_Q10, &NLSFIndices[ 1 ], pred_Q8, psNLSF_CB->quantStepSize_Q16, psNLSF_CB->order );
 
     /* Apply inverse square-rooted weights to first stage and add to output */
     pCB_element = &psNLSF_CB->CB1_NLSF_Q8[ NLSFIndices[ 0 ]*psNLSF_CB->order ];
diff --git a/silk/NSQ.c b/silk/NSQ.c
index 526bfb43f..d045c64ee 100644
--- a/silk/NSQ.c
+++ b/silk/NSQ.c
@@ -34,7 +34,7 @@
 #include "NSQ.h"
 
 
-static OAC_INLINE void silk_nsq_scale_states(
+static OAC_INLINE void oaci_silk_nsq_scale_states(
     const silk_encoder_state *psEncC,           /* I    Encoder State                   */
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                       */
     const oac_int16 x16[],                     /* I    input                           */
@@ -152,7 +152,7 @@ void oaci_silk_NSQ_c
             }
         }
 
-        silk_nsq_scale_states( psEncC, NSQ, x16, x_sc_Q10, sLTP, sLTP_Q15, k, LTP_scale_Q14, Gains_Q16, pitchL,
+        oaci_silk_nsq_scale_states( psEncC, NSQ, x16, x_sc_Q10, sLTP, sLTP_Q15, k, LTP_scale_Q14, Gains_Q16, pitchL,
         psIndices->signalType );
 
         oaci_silk_noise_shape_quantizer( NSQ, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15, A_Q12, B_Q14,
@@ -230,7 +230,7 @@ void oaci_silk_noise_shape_quantizer(
         NSQ->rand_seed = silk_RAND( NSQ->rand_seed );
 
         /* Short-term prediction */
-        LPC_pred_Q10 = silk_noise_shape_quantizer_short_prediction(psLPC_Q14, a_Q12, a_Q12_arch, predictLPCOrder, arch);
+        LPC_pred_Q10 = oaci_silk_noise_shape_quantizer_short_prediction(psLPC_Q14, a_Q12, a_Q12_arch, predictLPCOrder, arch);
 
         /* Long-term prediction */
         if (signalType == TYPE_VOICED) {
@@ -249,7 +249,7 @@ void oaci_silk_noise_shape_quantizer(
 
         /* Noise shape feedback */
         celt_assert((shapingLPCOrder&1) == 0 );        /* check that order is even */
-        n_AR_Q12 = silk_NSQ_noise_shape_feedback_loop(&NSQ->sDiff_shp_Q14, NSQ->sAR2_Q14, AR_shp_Q13, shapingLPCOrder,
+        n_AR_Q12 = oaci_silk_NSQ_noise_shape_feedback_loop(&NSQ->sDiff_shp_Q14, NSQ->sAR2_Q14, AR_shp_Q13, shapingLPCOrder,
         arch);
 
         n_AR_Q12 = silk_SMLAWB( n_AR_Q12, NSQ->sLF_AR_shp_Q14, Tilt_Q14 );
@@ -367,7 +367,7 @@ void oaci_silk_noise_shape_quantizer(
     silk_memcpy( NSQ->sLPC_Q14, &NSQ->sLPC_Q14[ length ], NSQ_LPC_BUF_LENGTH*sizeof(oac_int32));
 }
 
-static OAC_INLINE void silk_nsq_scale_states(
+static OAC_INLINE void oaci_silk_nsq_scale_states(
     const silk_encoder_state *psEncC,           /* I    Encoder State                   */
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                       */
     const oac_int16 x16[],                     /* I    input                           */
diff --git a/silk/NSQ.h b/silk/NSQ.h
index af1d3b967..0d46f1543 100644
--- a/silk/NSQ.h
+++ b/silk/NSQ.h
@@ -32,7 +32,7 @@
 
 #undef silk_short_prediction_create_arch_coef
 
-static OAC_INLINE oac_int32 silk_noise_shape_quantizer_short_prediction_c(const oac_int32 *buf32,
+static OAC_INLINE oac_int32 oaci_silk_noise_shape_quantizer_short_prediction_c(const oac_int32 *buf32,
                                                                           const oac_int16 *coef16, oac_int order) {
     oac_int32 out;
     silk_assert( order == 10 || order == 16 );
@@ -61,11 +61,11 @@ static OAC_INLINE oac_int32 silk_noise_shape_quantizer_short_prediction_c(const
     return out;
 }
 
-#define silk_noise_shape_quantizer_short_prediction(in, coef, coefRev, order, arch)  ((void)arch, \
-                                                                                      silk_noise_shape_quantizer_short_prediction_c \
+#define oaci_silk_noise_shape_quantizer_short_prediction(in, coef, coefRev, order, arch)  ((void)arch, \
+                                                                                      oaci_silk_noise_shape_quantizer_short_prediction_c \
                                                                                       (in, coef, order))
 
-static OAC_INLINE oac_int32 silk_NSQ_noise_shape_feedback_loop_c(const oac_int32 *data0, oac_int32 *data1,
+static OAC_INLINE oac_int32 oaci_silk_NSQ_noise_shape_feedback_loop_c(const oac_int32 *data0, oac_int32 *data1,
                                                                  const oac_int16 *coef, oac_int order) {
     oac_int32 out;
     oac_int32 tmp1, tmp2;
@@ -93,8 +93,8 @@ static OAC_INLINE oac_int32 silk_NSQ_noise_shape_feedback_loop_c(const oac_int32
     return out;
 }
 
-#define silk_NSQ_noise_shape_feedback_loop(data0, data1, coef, order, arch)  ((void)arch, \
-                                                                              silk_NSQ_noise_shape_feedback_loop_c( \
+#define oaci_silk_NSQ_noise_shape_feedback_loop(data0, data1, coef, order, arch)  ((void)arch, \
+                                                                              oaci_silk_NSQ_noise_shape_feedback_loop_c( \
     data0, data1, coef, order))
 
 #if defined(OAC_ARM_MAY_HAVE_NEON_INTR)
diff --git a/silk/NSQ_del_dec.c b/silk/NSQ_del_dec.c
index 7f382f5af..5f3163825 100644
--- a/silk/NSQ_del_dec.c
+++ b/silk/NSQ_del_dec.c
@@ -61,7 +61,7 @@ typedef struct {
 
 typedef NSQ_sample_struct NSQ_sample_pair[ 2 ];
 
-static OAC_INLINE void silk_nsq_del_dec_scale_states(
+static OAC_INLINE void oaci_silk_nsq_del_dec_scale_states(
     const silk_encoder_state *psEncC,               /* I    Encoder State                       */
     silk_nsq_state      *NSQ,                       /* I/O  NSQ state                           */
     NSQ_del_dec_struct psDelDec[],                  /* I/O  Delayed decision states             */
@@ -81,7 +81,7 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states(
 /******************************************/
 /* Noise shape quantizer for one subframe */
 /******************************************/
-static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
+static OAC_INLINE void oaci_silk_noise_shape_quantizer_del_dec(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                           */
     NSQ_del_dec_struct psDelDec[],              /* I/O  Delayed decision states             */
     oac_int signalType,                        /* I    Signal type                         */
@@ -258,10 +258,10 @@ void oaci_silk_NSQ_del_dec_c(
             }
         }
 
-        silk_nsq_del_dec_scale_states( psEncC, NSQ, psDelDec, x16, x_sc_Q10, sLTP, sLTP_Q15, k,
+        oaci_silk_nsq_del_dec_scale_states( psEncC, NSQ, psDelDec, x16, x_sc_Q10, sLTP, sLTP_Q15, k,
             psEncC->nStatesDelayedDecision, LTP_scale_Q14, Gains_Q16, pitchL, psIndices->signalType, decisionDelay );
 
-        silk_noise_shape_quantizer_del_dec( NSQ, psDelDec, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15,
+        oaci_silk_noise_shape_quantizer_del_dec( NSQ, psDelDec, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15,
             delayedGain_Q10, A_Q12, B_Q14, AR_shp_Q13, lag, HarmShapeFIRPacked_Q14, Tilt_Q14[ k ], LF_shp_Q14[ k ],
             Gains_Q16[ k ], Lambda_Q10, offset_Q10, psEncC->subfr_length, subfr++, psEncC->shapingLPCOrder,
             psEncC->predictLPCOrder, psEncC->warping_Q16, psEncC->nStatesDelayedDecision, &smpl_buf_idx, decisionDelay,
@@ -315,8 +315,8 @@ void oaci_silk_NSQ_del_dec_c(
 /******************************************/
 /* Noise shape quantizer for one subframe */
 /******************************************/
-#ifndef OVERRIDE_silk_noise_shape_quantizer_del_dec
-static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
+#ifndef OVERRIDE_oaci_silk_noise_shape_quantizer_del_dec
+static OAC_INLINE void oaci_silk_noise_shape_quantizer_del_dec(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                           */
     NSQ_del_dec_struct psDelDec[],              /* I/O  Delayed decision states             */
     oac_int signalType,                        /* I    Signal type                         */
@@ -415,7 +415,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
             /* Pointer used in short term prediction and shaping */
             psLPC_Q14 = &psDD->sLPC_Q14[ NSQ_LPC_BUF_LENGTH - 1 + i ];
             /* Short-term prediction */
-            LPC_pred_Q14 = silk_noise_shape_quantizer_short_prediction(psLPC_Q14, a_Q12, a_Q12_arch, predictLPCOrder,
+            LPC_pred_Q14 = oaci_silk_noise_shape_quantizer_short_prediction(psLPC_Q14, a_Q12, a_Q12_arch, predictLPCOrder,
             arch);
             LPC_pred_Q14 = silk_LSHIFT( LPC_pred_Q14, 4 );                              /* Q10 -> Q14 */
 
@@ -650,9 +650,9 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec(
     }
     RESTORE_STACK;
 }
-#endif /* OVERRIDE_silk_noise_shape_quantizer_del_dec */
+#endif /* OVERRIDE_oaci_silk_noise_shape_quantizer_del_dec */
 
-static OAC_INLINE void silk_nsq_del_dec_scale_states(
+static OAC_INLINE void oaci_silk_nsq_del_dec_scale_states(
     const silk_encoder_state *psEncC,               /* I    Encoder State                       */
     silk_nsq_state      *NSQ,                       /* I/O  NSQ state                           */
     NSQ_del_dec_struct psDelDec[],                  /* I/O  Delayed decision states             */
diff --git a/silk/PLC.c b/silk/PLC.c
index cf56b106f..49217f903 100644
--- a/silk/PLC.c
+++ b/silk/PLC.c
@@ -42,12 +42,12 @@ static const oac_int16 HARM_ATT_Q15[NB_ATT]              = { 32440, 31130 }; /*
 static const oac_int16 PLC_RAND_ATTENUATE_V_Q15[NB_ATT]  = { 31130, 26214 }; /* 0.95, 0.8 */
 static const oac_int16 PLC_RAND_ATTENUATE_UV_Q15[NB_ATT] = { 32440, 29491 }; /* 0.99, 0.9 */
 
-static OAC_INLINE void silk_PLC_update(
+static OAC_INLINE void oaci_silk_PLC_update(
     silk_decoder_state                  *psDec,             /* I/O Decoder state        */
     silk_decoder_control                *psDecCtrl          /* I/O Decoder control      */
     );
 
-static OAC_INLINE void silk_PLC_conceal(
+static OAC_INLINE void oaci_silk_PLC_conceal(
     silk_decoder_state                  *psDec,             /* I/O Decoder state        */
     silk_decoder_control                *psDecCtrl,         /* I/O Decoder control      */
     oac_int16 frame[],                                     /* O LPC residual signal    */
@@ -88,7 +88,7 @@ void oaci_silk_PLC(
         /****************************/
         /* Generate Signal          */
         /****************************/
-        silk_PLC_conceal( psDec, psDecCtrl, frame,
+        oaci_silk_PLC_conceal( psDec, psDecCtrl, frame,
 #ifdef ENABLE_DEEP_PLC
             lpcnet,
 #endif
@@ -99,7 +99,7 @@ void oaci_silk_PLC(
         /****************************/
         /* Update state             */
         /****************************/
-        silk_PLC_update( psDec, psDecCtrl );
+        oaci_silk_PLC_update( psDec, psDecCtrl );
 #ifdef ENABLE_DEEP_PLC
         if (lpcnet != NULL && psDec->sPLC.fs_kHz == 16) {
             int k;
@@ -114,7 +114,7 @@ void oaci_silk_PLC(
 /**************************************************/
 /* Update state of PLC                            */
 /**************************************************/
-static OAC_INLINE void silk_PLC_update(
+static OAC_INLINE void oaci_silk_PLC_update(
     silk_decoder_state                  *psDec,             /* I/O Decoder state        */
     silk_decoder_control                *psDecCtrl          /* I/O Decoder control      */
     ) {
@@ -210,7 +210,7 @@ static OAC_INLINE void silk_PLC_energy(oac_int32 *energy1, oac_int *shift1, oac_
     RESTORE_STACK;
 }
 
-static OAC_INLINE void silk_PLC_conceal(
+static OAC_INLINE void oaci_silk_PLC_conceal(
     silk_decoder_state                  *psDec,             /* I/O Decoder state        */
     silk_decoder_control                *psDecCtrl,         /* I/O Decoder control      */
     oac_int16 frame[],                                     /* O LPC residual signal    */
diff --git a/silk/arm/NSQ_del_dec_neon_intr.c b/silk/arm/NSQ_del_dec_neon_intr.c
index c337e1e1c..b7be7d780 100644
--- a/silk/arm/NSQ_del_dec_neon_intr.c
+++ b/silk/arm/NSQ_del_dec_neon_intr.c
@@ -66,7 +66,7 @@ typedef struct {
     oac_int32 LPC_exc_Q14[  NEON_MAX_DEL_DEC_STATES ];
 } NSQ_samples_struct;
 
-static OAC_INLINE void silk_nsq_del_dec_scale_states_neon(
+static OAC_INLINE void oaci_silk_nsq_del_dec_scale_states_neon(
     const silk_encoder_state *psEncC,               /* I    Encoder State                       */
     silk_nsq_state      *NSQ,                       /* I/O  NSQ state                           */
     NSQ_del_decs_struct psDelDec[],                 /* I/O  Delayed decision states             */
@@ -85,7 +85,7 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states_neon(
 /******************************************/
 /* Noise shape quantizer for one subframe */
 /******************************************/
-static OAC_INLINE void silk_noise_shape_quantizer_del_dec_neon(
+static OAC_INLINE void oaci_silk_noise_shape_quantizer_del_dec_neon(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                           */
     NSQ_del_decs_struct psDelDec[],             /* I/O  Delayed decision states             */
     oac_int signalType,                        /* I    Signal type                         */
@@ -392,10 +392,10 @@ void oaci_silk_NSQ_del_dec_neon(
                 }
             }
 
-            silk_nsq_del_dec_scale_states_neon( psEncC, NSQ, psDelDec, x16, x_sc_Q10, sLTP, sLTP_Q15, k,
+            oaci_silk_nsq_del_dec_scale_states_neon( psEncC, NSQ, psDelDec, x16, x_sc_Q10, sLTP, sLTP_Q15, k,
                 LTP_scale_Q14, Gains_Q16, pitchL, psIndices->signalType, decisionDelay );
 
-            silk_noise_shape_quantizer_del_dec_neon( NSQ, psDelDec, psIndices->signalType, x_sc_Q10, pulses, pxq,
+            oaci_silk_noise_shape_quantizer_del_dec_neon( NSQ, psDelDec, psIndices->signalType, x_sc_Q10, pulses, pxq,
             sLTP_Q15,
                 delayedGain_Q10, A_Q12, B_Q14, AR_shp_Q13, lag, HarmShapeFIRPacked_Q14, Tilt_Q14[ k ], LF_shp_Q14[ k ],
                 Gains_Q16[ k ], Lambda_Q10, offset_Q10, psEncC->subfr_length, subfr++, psEncC->shapingLPCOrder,
@@ -517,9 +517,9 @@ static OAC_INLINE int32x4_t silk_SMLAWB_lane1_neon(
     return vaddq_s32( out_s32x4, vqdmulhq_lane_s32( in_s32x4, coef_s32x2, 1 ));
 }
 
-/* Note: This function has different return value than silk_noise_shape_quantizer_short_prediction_neon(). */
+/* Note: This function has different return value than oaci_silk_noise_shape_quantizer_short_prediction_neon(). */
 /*       Therefore here we append "_local" to the function name to avoid confusion.                        */
-static OAC_INLINE int32x4_t silk_noise_shape_quantizer_short_prediction_neon_local(const oac_int32 *buf32,
+static OAC_INLINE int32x4_t oaci_silk_noise_shape_quantizer_short_prediction_neon_local(const oac_int32 *buf32,
                                                                                    const oac_int32 *a_Q12_arch,
                                                                                    oac_int order) {
     const int32x4_t a_Q12_arch0_s32x4 = vld1q_s32( a_Q12_arch + 0 );
@@ -567,7 +567,7 @@ static OAC_INLINE int32x4_t silk_noise_shape_quantizer_short_prediction_neon_loc
     return LPC_pred_Q14_s32x4;
 }
 
-static OAC_INLINE void silk_noise_shape_quantizer_del_dec_neon(
+static OAC_INLINE void oaci_silk_noise_shape_quantizer_del_dec_neon(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                           */
     NSQ_del_decs_struct psDelDec[],             /* I/O  Delayed decision states             */
     oac_int signalType,                        /* I    Signal type                         */
@@ -676,7 +676,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_neon(
 
         /* Short-term prediction */
         LPC_pred_Q14_s32x4 =
-            silk_noise_shape_quantizer_short_prediction_neon_local(psDelDec->sLPC_Q14[ NSQ_LPC_BUF_LENGTH - 16 + i ],
+            oaci_silk_noise_shape_quantizer_short_prediction_neon_local(psDelDec->sLPC_Q14[ NSQ_LPC_BUF_LENGTH - 16 + i ],
         a_Q12_arch, predictLPCOrder);
         LPC_pred_Q14_s32x4 = vshlq_n_s32( LPC_pred_Q14_s32x4, 4 ); /* Q10 -> Q14 */
 
@@ -1051,7 +1051,7 @@ static OAC_INLINE void silk_SMULWW_loop_neon(
     }
 }
 
-static OAC_INLINE void silk_nsq_del_dec_scale_states_neon(
+static OAC_INLINE void oaci_silk_nsq_del_dec_scale_states_neon(
     const silk_encoder_state *psEncC,               /* I    Encoder State                       */
     silk_nsq_state      *NSQ,                       /* I/O  NSQ state                           */
     NSQ_del_decs_struct psDelDec[],                 /* I/O  Delayed decision states             */
diff --git a/silk/arm/NSQ_neon.c b/silk/arm/NSQ_neon.c
index 66ab82f13..1a15afd38 100644
--- a/silk/arm/NSQ_neon.c
+++ b/silk/arm/NSQ_neon.c
@@ -35,7 +35,7 @@
 #include "celt/cpu_support.h"
 #include "celt/arm/armcpu.h"
 
-oac_int32 silk_noise_shape_quantizer_short_prediction_neon(const oac_int32 *buf32, const oac_int32 *coef32,
+oac_int32 oaci_silk_noise_shape_quantizer_short_prediction_neon(const oac_int32 *buf32, const oac_int32 *coef32,
                                                            oac_int order) {
     int32x4_t coef0 = vld1q_s32(coef32);
     int32x4_t coef1 = vld1q_s32(coef32 + 4);
@@ -69,7 +69,7 @@ oac_int32 silk_noise_shape_quantizer_short_prediction_neon(const oac_int32 *buf3
 }
 
 
-oac_int32 silk_NSQ_noise_shape_feedback_loop_neon(const oac_int32 *data0, oac_int32 *data1, const oac_int16 *coef,
+oac_int32 oaci_silk_NSQ_noise_shape_feedback_loop_neon(const oac_int32 *data0, oac_int32 *data1, const oac_int16 *coef,
                                                   oac_int order) {
     oac_int32 out;
     if (order == 8) {
@@ -80,7 +80,7 @@ oac_int32 silk_NSQ_noise_shape_feedback_loop_neon(const oac_int32 *data0, oac_in
         int32x4_t a1 = vld1q_s32(data1 + 3);  /* data1[3] ... [6] */
 
         /*TODO: Convert these once in advance instead of once per sample, like
-           silk_noise_shape_quantizer_short_prediction_neon() does.*/
+           oaci_silk_noise_shape_quantizer_short_prediction_neon() does.*/
         int16x8_t coef16 = vld1q_s16(coef);
         int32x4_t coef0 = vmovl_s16(vget_low_s16(coef16));
         int32x4_t coef1 = vmovl_s16(vget_high_s16(coef16));
@@ -88,9 +88,9 @@ oac_int32 silk_NSQ_noise_shape_feedback_loop_neon(const oac_int32 *data0, oac_in
         /*This is not bit-exact with the C version, since we do not drop the
            lower 16 bits of each multiply, but wait until the end to truncate
            precision. This is an encoder-specific calculation (and unlike
-           silk_noise_shape_quantizer_short_prediction_neon(), is not meant to
+           oaci_silk_noise_shape_quantizer_short_prediction_neon(), is not meant to
            simulate what the decoder will do). We still could use vqdmulhq_s32()
-           like silk_noise_shape_quantizer_short_prediction_neon() and save
+           like oaci_silk_noise_shape_quantizer_short_prediction_neon() and save
            half the multiplies, but the speed difference is not large, since we
            then need two extra adds.*/
         int64x2_t b0 = vmull_s32(vget_low_s32(a0), vget_low_s32(coef0));
@@ -107,5 +107,5 @@ oac_int32 silk_NSQ_noise_shape_feedback_loop_neon(const oac_int32 *data0, oac_in
         vst1q_s32(data1 + 4, a1);
         return out;
     }
-    return silk_NSQ_noise_shape_feedback_loop_c(data0, data1, coef, order);
+    return oaci_silk_NSQ_noise_shape_feedback_loop_c(data0, data1, coef, order);
 }
diff --git a/silk/arm/NSQ_neon.h b/silk/arm/NSQ_neon.h
index aafedf06b..cc55460f1 100644
--- a/silk/arm/NSQ_neon.h
+++ b/silk/arm/NSQ_neon.h
@@ -73,39 +73,39 @@ static OAC_INLINE void silk_short_prediction_create_arch_coef_neon(oac_int32 *ou
 
 #endif
 
-oac_int32 silk_noise_shape_quantizer_short_prediction_neon(const oac_int32 *buf32, const oac_int32 *coef32,
+oac_int32 oaci_silk_noise_shape_quantizer_short_prediction_neon(const oac_int32 *buf32, const oac_int32 *coef32,
     oac_int order);
 
-oac_int32 silk_NSQ_noise_shape_feedback_loop_neon(const oac_int32 *data0, oac_int32 *data1, const oac_int16 *coef,
+oac_int32 oaci_silk_NSQ_noise_shape_feedback_loop_neon(const oac_int32 *data0, oac_int32 *data1, const oac_int16 *coef,
     oac_int order);
 
 #if defined(OAC_ARM_PRESUME_NEON_INTR)
-# undef silk_noise_shape_quantizer_short_prediction
-# define silk_noise_shape_quantizer_short_prediction(in, coef, coefRev, order, arch) \
-        ((void)arch, silk_noise_shape_quantizer_short_prediction_neon(in, coefRev, order))
+# undef oaci_silk_noise_shape_quantizer_short_prediction
+# define oaci_silk_noise_shape_quantizer_short_prediction(in, coef, coefRev, order, arch) \
+        ((void)arch, oaci_silk_noise_shape_quantizer_short_prediction_neon(in, coefRev, order))
 
-# undef silk_NSQ_noise_shape_feedback_loop
-# define silk_NSQ_noise_shape_feedback_loop(data0, data1, coef, order, arch)  ((void)arch, \
-                                                                               silk_NSQ_noise_shape_feedback_loop_neon( \
+# undef oaci_silk_NSQ_noise_shape_feedback_loop
+# define oaci_silk_NSQ_noise_shape_feedback_loop(data0, data1, coef, order, arch)  ((void)arch, \
+                                                                               oaci_silk_NSQ_noise_shape_feedback_loop_neon( \
     data0, data1, coef, order))
 
 #elif defined(OAC_HAVE_RTCD) && defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 
-/* silk_noise_shape_quantizer_short_prediction implementations take different parameters based on arch
+/* oaci_silk_noise_shape_quantizer_short_prediction implementations take different parameters based on arch
    (coef vs. coefRev) so can't use the usual IMPL table implementation */
-# undef silk_noise_shape_quantizer_short_prediction
-# define silk_noise_shape_quantizer_short_prediction(in, coef, coefRev, order, arch)  \
+# undef oaci_silk_noise_shape_quantizer_short_prediction
+# define oaci_silk_noise_shape_quantizer_short_prediction(in, coef, coefRev, order, arch)  \
         (arch >= OAC_ARCH_ARM_NEON ? \
-         silk_noise_shape_quantizer_short_prediction_neon(in, coefRev, order) : \
-         silk_noise_shape_quantizer_short_prediction_c(in, coef, order))
+         oaci_silk_noise_shape_quantizer_short_prediction_neon(in, coefRev, order) : \
+         oaci_silk_noise_shape_quantizer_short_prediction_c(in, coef, order))
 
 extern oac_int32
 (*const SILK_NSQ_NOISE_SHAPE_FEEDBACK_LOOP_IMPL[OAC_ARCHMASK + 1])(
  const oac_int32 *data0, oac_int32 *data1, const oac_int16 *coef,
  oac_int order);
 
-# undef silk_NSQ_noise_shape_feedback_loop
-# define silk_NSQ_noise_shape_feedback_loop(data0, data1, coef, order, arch) \
+# undef oaci_silk_NSQ_noise_shape_feedback_loop
+# define oaci_silk_NSQ_noise_shape_feedback_loop(data0, data1, coef, order, arch) \
         (SILK_NSQ_NOISE_SHAPE_FEEDBACK_LOOP_IMPL[(arch)&OAC_ARCHMASK](data0, data1, \
                                                                       coef, order))
 
diff --git a/silk/arm/arm_silk_map.c b/silk/arm/arm_silk_map.c
index fb6f3a175..1eba3f65a 100644
--- a/silk/arm/arm_silk_map.c
+++ b/silk/arm/arm_silk_map.c
@@ -87,7 +87,7 @@ void  (*const oaci_SILK_NSQ_DEL_DEC_IMPL[OAC_ARCHMASK + 1])(
     oaci_silk_NSQ_del_dec_neon,   /* dotprod */
 };
 
-/*There is no table for silk_noise_shape_quantizer_short_prediction because the
+/*There is no table for oaci_silk_noise_shape_quantizer_short_prediction because the
    NEON version takes different parameters than the C version.
    Instead RTCD is done via if statements at the call sites.
    See NSQ_neon.h for details.*/
@@ -96,11 +96,11 @@ oac_int32
 (*const SILK_NSQ_NOISE_SHAPE_FEEDBACK_LOOP_IMPL[OAC_ARCHMASK + 1])(
  const oac_int32 *data0, oac_int32 *data1, const oac_int16 *coef,
  oac_int order) = {
-    silk_NSQ_noise_shape_feedback_loop_c,  /* ARMv4 */
-    silk_NSQ_noise_shape_feedback_loop_c,  /* EDSP */
-    silk_NSQ_noise_shape_feedback_loop_c,  /* Media */
-    silk_NSQ_noise_shape_feedback_loop_neon, /* NEON */
-    silk_NSQ_noise_shape_feedback_loop_neon, /* dotprod */
+    oaci_silk_NSQ_noise_shape_feedback_loop_c,  /* ARMv4 */
+    oaci_silk_NSQ_noise_shape_feedback_loop_c,  /* EDSP */
+    oaci_silk_NSQ_noise_shape_feedback_loop_c,  /* Media */
+    oaci_silk_NSQ_noise_shape_feedback_loop_neon, /* NEON */
+    oaci_silk_NSQ_noise_shape_feedback_loop_neon, /* dotprod */
 };
 
 # endif
diff --git a/silk/control_codec.c b/silk/control_codec.c
index c5f94008c..63298888d 100644
--- a/silk/control_codec.c
+++ b/silk/control_codec.c
@@ -39,7 +39,7 @@
 #include "tuning_parameters.h"
 #include "pitch_est_defines.h"
 
-static oac_int silk_setup_resamplers(
+static oac_int oaci_silk_setup_resamplers(
     silk_encoder_state_Fxx          *psEnc,             /* I/O                      */
     oac_int fs_kHz                                     /* I                        */
     );
@@ -85,7 +85,7 @@ oac_int oaci_silk_control_encoder(
     if (psEnc->sCmn.controlled_since_last_payload != 0 && psEnc->sCmn.prefillFlag == 0) {
         if (psEnc->sCmn.API_fs_Hz != psEnc->sCmn.prev_API_fs_Hz && psEnc->sCmn.fs_kHz > 0) {
             /* Change in API sampling rate in the middle of encoding a packet */
-            ret += silk_setup_resamplers( psEnc, psEnc->sCmn.fs_kHz );
+            ret += oaci_silk_setup_resamplers( psEnc, psEnc->sCmn.fs_kHz );
         }
         return ret;
     }
@@ -102,7 +102,7 @@ oac_int oaci_silk_control_encoder(
     /********************************************/
     /* Prepare resampler and buffered data      */
     /********************************************/
-    ret += silk_setup_resamplers( psEnc, fs_kHz );
+    ret += oaci_silk_setup_resamplers( psEnc, fs_kHz );
 
     /********************************************/
     /* Set internal sampling frequency          */
@@ -129,7 +129,7 @@ oac_int oaci_silk_control_encoder(
     return ret;
 }
 
-static oac_int silk_setup_resamplers(
+static oac_int oaci_silk_setup_resamplers(
     silk_encoder_state_Fxx          *psEnc,             /* I/O                      */
     oac_int fs_kHz                                      /* I                        */
     ) {
diff --git a/silk/decode_frame.c b/silk/decode_frame.c
index 42b1607b7..ba364bdd1 100644
--- a/silk/decode_frame.c
+++ b/silk/decode_frame.c
@@ -71,7 +71,7 @@ oac_int oaci_silk_decode_frame(
         VARDECL( oac_int16, pulses );
 #ifdef ENABLE_OSCE
         oac_int32 ec_start;
-        ec_start = ec_tell(psRangeDec);
+        ec_start = oaci_ec_tell(psRangeDec);
 #endif
         ALLOC( pulses, (L + SHELL_CODEC_FRAME_LENGTH - 1)
             &~(SHELL_CODEC_FRAME_LENGTH - 1), oac_int16 );
@@ -108,7 +108,7 @@ oac_int oaci_silk_decode_frame(
         /********************************************************/
         /* Run SILK enhancer                                    */
         /********************************************************/
-        oaci_osce_enhance_frame( osce_model, psDec, psDecCtrl, pOut, ec_tell(psRangeDec) - ec_start, arch );
+        oaci_osce_enhance_frame( osce_model, psDec, psDecCtrl, pOut, oaci_ec_tell(psRangeDec) - ec_start, arch );
 #endif
 
         /********************************************************/
diff --git a/silk/enc_API.c b/silk/enc_API.c
index 1c5a29f07..9c12b438d 100644
--- a/silk/enc_API.c
+++ b/silk/enc_API.c
@@ -368,7 +368,7 @@ oac_int oaci_silk_Encode(                                   /* O    Returns erro
                 iCDF[ 0 ] = 256 - silk_RSHIFT( 256,
                     (psEnc->state_Fxx[ 0 ].sCmn.nFramesPerPacket + 1)*encControl->nChannelsInternal );
                 oaci_ec_enc_icdf( psRangeEnc, 0, iCDF, 8 );
-                curr_nBitsUsedLBRR = ec_tell( psRangeEnc );
+                curr_nBitsUsedLBRR = oaci_ec_tell( psRangeEnc );
 
                 /* Encode any LBRR data from previous packet */
                 /* Encode LBRR flags */
@@ -416,7 +416,7 @@ oac_int oaci_silk_Encode(                                   /* O    Returns erro
                     silk_memset( psEnc->state_Fxx[ n ].sCmn.LBRR_flags, 0,
                     sizeof(psEnc->state_Fxx[ n ].sCmn.LBRR_flags));
                 }
-                curr_nBitsUsedLBRR = ec_tell( psRangeEnc ) - curr_nBitsUsedLBRR;
+                curr_nBitsUsedLBRR = oaci_ec_tell( psRangeEnc ) - curr_nBitsUsedLBRR;
             }
 
             oaci_silk_HP_variable_cutoff( psEnc->state_Fxx );
@@ -449,7 +449,7 @@ oac_int oaci_silk_Encode(                                   /* O    Returns erro
             TargetRate_bps -= silk_DIV32_16( silk_MUL( psEnc->nBitsExceeded, 1000 ), BITRESERVOIR_DECAY_TIME_MS );
             if (!prefillFlag && psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded > 0) {
                 /* Compare actual vs target bits so far in this packet */
-                oac_int32 bitsBalance = ec_tell( psRangeEnc ) - psEnc->nBitsUsedLBRR - nBits
+                oac_int32 bitsBalance = oaci_ec_tell( psRangeEnc ) - psEnc->nBitsUsedLBRR - nBits
                                         *psEnc->state_Fxx[ 0 ].sCmn.nFramesEncoded;
                 TargetRate_bps -= silk_DIV32_16( silk_MUL( bitsBalance, 1000 ), BITRESERVOIR_DECAY_TIME_MS );
             }
diff --git a/silk/fixed/encode_frame_FIX.c b/silk/fixed/encode_frame_FIX.c
index 3a780049f..1b52b07d7 100644
--- a/silk/fixed/encode_frame_FIX.c
+++ b/silk/fixed/encode_frame_FIX.c
@@ -235,7 +235,7 @@ oac_int oaci_silk_encode_frame_FIX(
                 oaci_silk_encode_pulses( psRangeEnc, psEnc->sCmn.indices.signalType, psEnc->sCmn.indices.quantOffsetType,
                     psEnc->sCmn.pulses, psEnc->sCmn.frame_length );
 
-                nBits = ec_tell( psRangeEnc );
+                nBits = oaci_ec_tell( psRangeEnc );
 
                 /* If we still bust after the last iteration, do some damage control. */
                 if (iter == maxIter && !found_lower && nBits > maxBits) {
@@ -261,7 +261,7 @@ oac_int oaci_silk_encode_frame_FIX(
                     oaci_silk_encode_pulses( psRangeEnc, psEnc->sCmn.indices.signalType, psEnc->sCmn.indices.quantOffsetType,
                         psEnc->sCmn.pulses, psEnc->sCmn.frame_length );
 
-                    nBits = ec_tell( psRangeEnc );
+                    nBits = oaci_ec_tell( psRangeEnc );
                 }
 
                 if (useCBR == 0 && iter == 0 && nBits <= maxBits) {
@@ -387,7 +387,7 @@ oac_int oaci_silk_encode_frame_FIX(
     /****************************************/
     psEnc->sCmn.first_frame_after_reset = 0;
     /* Payload size */
-    *pnBytesOut = silk_RSHIFT( ec_tell( psRangeEnc ) + 7, 3 );
+    *pnBytesOut = silk_RSHIFT( oaci_ec_tell( psRangeEnc ) + 7, 3 );
 
     RESTORE_STACK;
     return ret;
diff --git a/silk/fixed/noise_shape_analysis_FIX.c b/silk/fixed/noise_shape_analysis_FIX.c
index 268bfc6f0..67fc95135 100644
--- a/silk/fixed/noise_shape_analysis_FIX.c
+++ b/silk/fixed/noise_shape_analysis_FIX.c
@@ -55,7 +55,7 @@ static OAC_INLINE oac_int32 warped_gain( /* gain in Q16*/
 
 /* Convert warped filter coefficients to monic pseudo-warped coefficients and limit maximum     */
 /* amplitude of monic warped coefficients by using bandwidth expansion on the true coefficients */
-static OAC_INLINE void limit_warped_coefs(
+static OAC_INLINE void oaci_limit_warped_coefs(
     oac_int32           *coefs_Q24,
     oac_int lambda_Q16,
     oac_int32 limit_Q24,
@@ -312,7 +312,7 @@ void oaci_silk_noise_shape_analysis_FIX(
 
         if (psEnc->sCmn.warping_Q16 > 0) {
             /* Convert to monic warped prediction coefficients and limit absolute values */
-            limit_warped_coefs( AR_Q24, warping_Q16, SILK_FIX_CONST( 3.999, 24 ), psEnc->sCmn.shapingLPCOrder );
+            oaci_limit_warped_coefs( AR_Q24, warping_Q16, SILK_FIX_CONST( 3.999, 24 ), psEnc->sCmn.shapingLPCOrder );
 
             /* Convert from Q24 to Q13 and store in int16 */
             for (i = 0; i < psEnc->sCmn.shapingLPCOrder; i++) {
diff --git a/silk/float/encode_frame_FLP.c b/silk/float/encode_frame_FLP.c
index 678e2c410..c4e6a0751 100644
--- a/silk/float/encode_frame_FLP.c
+++ b/silk/float/encode_frame_FLP.c
@@ -220,7 +220,7 @@ oac_int oaci_silk_encode_frame_FLP(
                 oaci_silk_encode_pulses( psRangeEnc, psEnc->sCmn.indices.signalType, psEnc->sCmn.indices.quantOffsetType,
                       psEnc->sCmn.pulses, psEnc->sCmn.frame_length );
 
-                nBits = ec_tell( psRangeEnc );
+                nBits = oaci_ec_tell( psRangeEnc );
 
                 /* If we still bust after the last iteration, do some damage control. */
                 if (iter == maxIter && !found_lower && nBits > maxBits) {
@@ -246,7 +246,7 @@ oac_int oaci_silk_encode_frame_FLP(
                     oaci_silk_encode_pulses( psRangeEnc, psEnc->sCmn.indices.signalType, psEnc->sCmn.indices.quantOffsetType,
                         psEnc->sCmn.pulses, psEnc->sCmn.frame_length );
 
-                    nBits = ec_tell( psRangeEnc );
+                    nBits = oaci_ec_tell( psRangeEnc );
                 }
 
                 if (useCBR == 0 && iter == 0 && nBits <= maxBits) {
@@ -379,7 +379,7 @@ oac_int oaci_silk_encode_frame_FLP(
     /****************************************/
     psEnc->sCmn.first_frame_after_reset = 0;
     /* Payload size */
-    *pnBytesOut = silk_RSHIFT( ec_tell( psRangeEnc ) + 7, 3 );
+    *pnBytesOut = silk_RSHIFT( oaci_ec_tell( psRangeEnc ) + 7, 3 );
 
     RESTORE_STACK;
     return ret;
diff --git a/silk/mips/NSQ_mips.h b/silk/mips/NSQ_mips.h
index f90b6b446..c7cf144a5 100644
--- a/silk/mips/NSQ_mips.h
+++ b/silk/mips/NSQ_mips.h
@@ -41,9 +41,9 @@
 # define MIPS_MADD __builtin_mips_madd
 # define MIPS_EXTR_R __builtin_mips_extr_r_w
 
-# define OVERRIDE_silk_noise_shape_quantizer_short_prediction
+# define OVERRIDE_oaci_silk_noise_shape_quantizer_short_prediction
 /* suddenly performance is worse */
-# define dont_OVERRIDE_silk_NSQ_noise_shape_feedback_loop
+# define dont_OVERRIDE_oaci_silk_NSQ_noise_shape_feedback_loop
 
 /* gets worst performance result */
 #elif defined(__mips_isa_rev) && __mips == 32
@@ -60,14 +60,14 @@ static inline oac_val32 MIPS_EXTR_R(long long acc, int shift) {
     return (oac_val32)((acc + (1<<shift)/2)>>shift);
 }
 
-# define OVERRIDE_silk_noise_shape_quantizer_short_prediction
-# define OVERRIDE_silk_NSQ_noise_shape_feedback_loop
+# define OVERRIDE_oaci_silk_noise_shape_quantizer_short_prediction
+# define OVERRIDE_oaci_silk_NSQ_noise_shape_feedback_loop
 
 #endif
 
-#if defined(OVERRIDE_silk_noise_shape_quantizer_short_prediction)
+#if defined(OVERRIDE_oaci_silk_noise_shape_quantizer_short_prediction)
 
-static OAC_INLINE oac_int32 silk_noise_shape_quantizer_short_prediction_mips(const oac_int32 *buf32,
+static OAC_INLINE oac_int32 oaci_silk_noise_shape_quantizer_short_prediction_mips(const oac_int32 *buf32,
                                                                              const oac_int16 *coef16, oac_int order) {
     oac_int64 out;
     silk_assert( order == 10 || order == 16 );
@@ -94,17 +94,17 @@ static OAC_INLINE oac_int32 silk_noise_shape_quantizer_short_prediction_mips(con
     return MIPS_EXTR_R(out, 16);
 }
 
-# undef  silk_noise_shape_quantizer_short_prediction
-# define silk_noise_shape_quantizer_short_prediction(in, coef, coefRev, order, arch)  ((void)arch, \
-                                                                                       silk_noise_shape_quantizer_short_prediction_mips \
+# undef  oaci_silk_noise_shape_quantizer_short_prediction
+# define oaci_silk_noise_shape_quantizer_short_prediction(in, coef, coefRev, order, arch)  ((void)arch, \
+                                                                                       oaci_silk_noise_shape_quantizer_short_prediction_mips \
                                                                                        (in, coef, order))
 
-#endif /* OVERRIDE_silk_noise_shape_quantizer_short_prediction */
+#endif /* OVERRIDE_oaci_silk_noise_shape_quantizer_short_prediction */
 
 
-#if defined(OVERRIDE_silk_NSQ_noise_shape_feedback_loop)
+#if defined(OVERRIDE_oaci_silk_NSQ_noise_shape_feedback_loop)
 
-static OAC_INLINE oac_int32 silk_NSQ_noise_shape_feedback_loop_mips(const oac_int32 *data0, oac_int32 *data1,
+static OAC_INLINE oac_int32 oaci_silk_NSQ_noise_shape_feedback_loop_mips(const oac_int32 *data0, oac_int32 *data1,
                                                                     const oac_int16 *coef, oac_int order) {
     oac_int32 out;
     oac_int32 tmp1, tmp2;
@@ -130,11 +130,11 @@ static OAC_INLINE oac_int32 silk_NSQ_noise_shape_feedback_loop_mips(const oac_in
     return MIPS_EXTR_R( out, (16 - 1));
 }
 
-# undef  silk_NSQ_noise_shape_feedback_loop
-# define silk_NSQ_noise_shape_feedback_loop(data0, data1, coef, order, arch)  ((void)arch, \
-                                                                               silk_NSQ_noise_shape_feedback_loop_mips( \
+# undef  oaci_silk_NSQ_noise_shape_feedback_loop
+# define oaci_silk_NSQ_noise_shape_feedback_loop(data0, data1, coef, order, arch)  ((void)arch, \
+                                                                               oaci_silk_NSQ_noise_shape_feedback_loop_mips( \
     data0, data1, coef, order))
 
-#endif /* OVERRIDE_silk_NSQ_noise_shape_feedback_loop */
+#endif /* OVERRIDE_oaci_silk_NSQ_noise_shape_feedback_loop */
 
 #endif /* NSQ_DEL_DEC_MIPSR1_H__ */
diff --git a/silk/resampler_private_down_FIR.c b/silk/resampler_private_down_FIR.c
index 7c2fb88d7..9745b7e31 100644
--- a/silk/resampler_private_down_FIR.c
+++ b/silk/resampler_private_down_FIR.c
@@ -33,7 +33,7 @@
 #include "resampler_private.h"
 #include "stack_alloc.h"
 
-static OAC_INLINE oac_int16 *silk_resampler_private_down_FIR_INTERPOL(
+static OAC_INLINE oac_int16 *oaci_silk_resampler_private_down_FIR_INTERPOL(
     oac_int16          *out,
     oac_int32          *buf,
     const oac_int16    *FIR_Coefs,
@@ -171,7 +171,7 @@ void oaci_silk_resampler_private_down_FIR(
         max_index_Q16 = silk_LSHIFT32( nSamplesIn, 16 );
 
         /* Interpolate filtered signal */
-        out = silk_resampler_private_down_FIR_INTERPOL( out, buf, FIR_Coefs, S->FIR_Order,
+        out = oaci_silk_resampler_private_down_FIR_INTERPOL( out, buf, FIR_Coefs, S->FIR_Order,
             S->FIR_Fracs, max_index_Q16, index_increment_Q16 );
 
         in += nSamplesIn;
diff --git a/silk/shell_coder.c b/silk/shell_coder.c
index 6ed81c827..5fb770edd 100644
--- a/silk/shell_coder.c
+++ b/silk/shell_coder.c
@@ -33,7 +33,7 @@
 
 /* shell coder; pulse-subframe length is hardcoded */
 
-static OAC_INLINE void combine_pulses(
+static OAC_INLINE void oaci_combine_pulses(
     oac_int         *out,   /* O    combined pulses vector [len] */
     const oac_int   *in,    /* I    input vector       [2 * len] */
     const oac_int len       /* I    number of OUTPUT samples     */
@@ -44,7 +44,7 @@ static OAC_INLINE void combine_pulses(
     }
 }
 
-static OAC_INLINE void encode_split(
+static OAC_INLINE void oaci_encode_split(
     ec_enc                      *psRangeEnc,    /* I/O  compressor data structure                   */
     const oac_int p_child1,                    /* I    pulse amplitude of first child subframe     */
     const oac_int p,                           /* I    pulse amplitude of current subframe         */
@@ -55,7 +55,7 @@ static OAC_INLINE void encode_split(
     }
 }
 
-static OAC_INLINE void decode_split(
+static OAC_INLINE void oaci_decode_split(
     oac_int16                  *p_child1,      /* O    pulse amplitude of first child subframe     */
     oac_int16                  *p_child2,      /* O    pulse amplitude of second child subframe    */
     ec_dec                      *psRangeDec,    /* I/O  Compressor data structure                   */
@@ -82,32 +82,32 @@ void oaci_silk_shell_encoder(
     silk_assert( SHELL_CODEC_FRAME_LENGTH == 16 );
 
     /* tree representation per pulse-subframe */
-    combine_pulses( pulses1, pulses0, 8 );
-    combine_pulses( pulses2, pulses1, 4 );
-    combine_pulses( pulses3, pulses2, 2 );
-    combine_pulses( pulses4, pulses3, 1 );
+    oaci_combine_pulses( pulses1, pulses0, 8 );
+    oaci_combine_pulses( pulses2, pulses1, 4 );
+    oaci_combine_pulses( pulses3, pulses2, 2 );
+    oaci_combine_pulses( pulses4, pulses3, 1 );
 
-    encode_split( psRangeEnc, pulses3[  0 ], pulses4[ 0 ], oaci_silk_shell_code_table3 );
+    oaci_encode_split( psRangeEnc, pulses3[  0 ], pulses4[ 0 ], oaci_silk_shell_code_table3 );
 
-    encode_split( psRangeEnc, pulses2[  0 ], pulses3[ 0 ], oaci_silk_shell_code_table2 );
+    oaci_encode_split( psRangeEnc, pulses2[  0 ], pulses3[ 0 ], oaci_silk_shell_code_table2 );
 
-    encode_split( psRangeEnc, pulses1[  0 ], pulses2[ 0 ], oaci_silk_shell_code_table1 );
-    encode_split( psRangeEnc, pulses0[  0 ], pulses1[ 0 ], oaci_silk_shell_code_table0 );
-    encode_split( psRangeEnc, pulses0[  2 ], pulses1[ 1 ], oaci_silk_shell_code_table0 );
+    oaci_encode_split( psRangeEnc, pulses1[  0 ], pulses2[ 0 ], oaci_silk_shell_code_table1 );
+    oaci_encode_split( psRangeEnc, pulses0[  0 ], pulses1[ 0 ], oaci_silk_shell_code_table0 );
+    oaci_encode_split( psRangeEnc, pulses0[  2 ], pulses1[ 1 ], oaci_silk_shell_code_table0 );
 
-    encode_split( psRangeEnc, pulses1[  2 ], pulses2[ 1 ], oaci_silk_shell_code_table1 );
-    encode_split( psRangeEnc, pulses0[  4 ], pulses1[ 2 ], oaci_silk_shell_code_table0 );
-    encode_split( psRangeEnc, pulses0[  6 ], pulses1[ 3 ], oaci_silk_shell_code_table0 );
+    oaci_encode_split( psRangeEnc, pulses1[  2 ], pulses2[ 1 ], oaci_silk_shell_code_table1 );
+    oaci_encode_split( psRangeEnc, pulses0[  4 ], pulses1[ 2 ], oaci_silk_shell_code_table0 );
+    oaci_encode_split( psRangeEnc, pulses0[  6 ], pulses1[ 3 ], oaci_silk_shell_code_table0 );
 
-    encode_split( psRangeEnc, pulses2[  2 ], pulses3[ 1 ], oaci_silk_shell_code_table2 );
+    oaci_encode_split( psRangeEnc, pulses2[  2 ], pulses3[ 1 ], oaci_silk_shell_code_table2 );
 
-    encode_split( psRangeEnc, pulses1[  4 ], pulses2[ 2 ], oaci_silk_shell_code_table1 );
-    encode_split( psRangeEnc, pulses0[  8 ], pulses1[ 4 ], oaci_silk_shell_code_table0 );
-    encode_split( psRangeEnc, pulses0[ 10 ], pulses1[ 5 ], oaci_silk_shell_code_table0 );
+    oaci_encode_split( psRangeEnc, pulses1[  4 ], pulses2[ 2 ], oaci_silk_shell_code_table1 );
+    oaci_encode_split( psRangeEnc, pulses0[  8 ], pulses1[ 4 ], oaci_silk_shell_code_table0 );
+    oaci_encode_split( psRangeEnc, pulses0[ 10 ], pulses1[ 5 ], oaci_silk_shell_code_table0 );
 
-    encode_split( psRangeEnc, pulses1[  6 ], pulses2[ 3 ], oaci_silk_shell_code_table1 );
-    encode_split( psRangeEnc, pulses0[ 12 ], pulses1[ 6 ], oaci_silk_shell_code_table0 );
-    encode_split( psRangeEnc, pulses0[ 14 ], pulses1[ 7 ], oaci_silk_shell_code_table0 );
+    oaci_encode_split( psRangeEnc, pulses1[  6 ], pulses2[ 3 ], oaci_silk_shell_code_table1 );
+    oaci_encode_split( psRangeEnc, pulses0[ 12 ], pulses1[ 6 ], oaci_silk_shell_code_table0 );
+    oaci_encode_split( psRangeEnc, pulses0[ 14 ], pulses1[ 7 ], oaci_silk_shell_code_table0 );
 }
 
 
@@ -122,25 +122,25 @@ void oaci_silk_shell_decoder(
     /* this function operates on one shell code frame of 16 pulses */
     silk_assert( SHELL_CODEC_FRAME_LENGTH == 16 );
 
-    decode_split( &pulses3[  0 ], &pulses3[  1 ], psRangeDec, pulses4,      oaci_silk_shell_code_table3 );
+    oaci_decode_split( &pulses3[  0 ], &pulses3[  1 ], psRangeDec, pulses4,      oaci_silk_shell_code_table3 );
 
-    decode_split( &pulses2[  0 ], &pulses2[  1 ], psRangeDec, pulses3[ 0 ], oaci_silk_shell_code_table2 );
+    oaci_decode_split( &pulses2[  0 ], &pulses2[  1 ], psRangeDec, pulses3[ 0 ], oaci_silk_shell_code_table2 );
 
-    decode_split( &pulses1[  0 ], &pulses1[  1 ], psRangeDec, pulses2[ 0 ], oaci_silk_shell_code_table1 );
-    decode_split( &pulses0[  0 ], &pulses0[  1 ], psRangeDec, pulses1[ 0 ], oaci_silk_shell_code_table0 );
-    decode_split( &pulses0[  2 ], &pulses0[  3 ], psRangeDec, pulses1[ 1 ], oaci_silk_shell_code_table0 );
+    oaci_decode_split( &pulses1[  0 ], &pulses1[  1 ], psRangeDec, pulses2[ 0 ], oaci_silk_shell_code_table1 );
+    oaci_decode_split( &pulses0[  0 ], &pulses0[  1 ], psRangeDec, pulses1[ 0 ], oaci_silk_shell_code_table0 );
+    oaci_decode_split( &pulses0[  2 ], &pulses0[  3 ], psRangeDec, pulses1[ 1 ], oaci_silk_shell_code_table0 );
 
-    decode_split( &pulses1[  2 ], &pulses1[  3 ], psRangeDec, pulses2[ 1 ], oaci_silk_shell_code_table1 );
-    decode_split( &pulses0[  4 ], &pulses0[  5 ], psRangeDec, pulses1[ 2 ], oaci_silk_shell_code_table0 );
-    decode_split( &pulses0[  6 ], &pulses0[  7 ], psRangeDec, pulses1[ 3 ], oaci_silk_shell_code_table0 );
+    oaci_decode_split( &pulses1[  2 ], &pulses1[  3 ], psRangeDec, pulses2[ 1 ], oaci_silk_shell_code_table1 );
+    oaci_decode_split( &pulses0[  4 ], &pulses0[  5 ], psRangeDec, pulses1[ 2 ], oaci_silk_shell_code_table0 );
+    oaci_decode_split( &pulses0[  6 ], &pulses0[  7 ], psRangeDec, pulses1[ 3 ], oaci_silk_shell_code_table0 );
 
-    decode_split( &pulses2[  2 ], &pulses2[  3 ], psRangeDec, pulses3[ 1 ], oaci_silk_shell_code_table2 );
+    oaci_decode_split( &pulses2[  2 ], &pulses2[  3 ], psRangeDec, pulses3[ 1 ], oaci_silk_shell_code_table2 );
 
-    decode_split( &pulses1[  4 ], &pulses1[  5 ], psRangeDec, pulses2[ 2 ], oaci_silk_shell_code_table1 );
-    decode_split( &pulses0[  8 ], &pulses0[  9 ], psRangeDec, pulses1[ 4 ], oaci_silk_shell_code_table0 );
-    decode_split( &pulses0[ 10 ], &pulses0[ 11 ], psRangeDec, pulses1[ 5 ], oaci_silk_shell_code_table0 );
+    oaci_decode_split( &pulses1[  4 ], &pulses1[  5 ], psRangeDec, pulses2[ 2 ], oaci_silk_shell_code_table1 );
+    oaci_decode_split( &pulses0[  8 ], &pulses0[  9 ], psRangeDec, pulses1[ 4 ], oaci_silk_shell_code_table0 );
+    oaci_decode_split( &pulses0[ 10 ], &pulses0[ 11 ], psRangeDec, pulses1[ 5 ], oaci_silk_shell_code_table0 );
 
-    decode_split( &pulses1[  6 ], &pulses1[  7 ], psRangeDec, pulses2[ 3 ], oaci_silk_shell_code_table1 );
-    decode_split( &pulses0[ 12 ], &pulses0[ 13 ], psRangeDec, pulses1[ 6 ], oaci_silk_shell_code_table0 );
-    decode_split( &pulses0[ 14 ], &pulses0[ 15 ], psRangeDec, pulses1[ 7 ], oaci_silk_shell_code_table0 );
+    oaci_decode_split( &pulses1[  6 ], &pulses1[  7 ], psRangeDec, pulses2[ 3 ], oaci_silk_shell_code_table1 );
+    oaci_decode_split( &pulses0[ 12 ], &pulses0[ 13 ], psRangeDec, pulses1[ 6 ], oaci_silk_shell_code_table0 );
+    oaci_decode_split( &pulses0[ 14 ], &pulses0[ 15 ], psRangeDec, pulses1[ 7 ], oaci_silk_shell_code_table0 );
 }
diff --git a/silk/typedef.h b/silk/typedef.h
index 6c265c877..9d72b2fea 100644
--- a/silk/typedef.h
+++ b/silk/typedef.h
@@ -60,11 +60,11 @@
 # ifdef ENABLE_ASSERTIONS
 #  include <stdio.h>
 #  include <stdlib.h>
-#  define silk_fatal(str) _silk_fatal(str, __FILE__, __LINE__);
+#  define silk_fatal(str) oaci_silk_fatal(str, __FILE__, __LINE__);
 #  ifdef __GNUC__
 __attribute__((noreturn))
 #  endif
-static OAC_INLINE void _silk_fatal(const char *str, const char *file, int line) {
+static OAC_INLINE void oaci_silk_fatal(const char *str, const char *file, int line) {
     fprintf (stderr, "Fatal (internal) error in %s, line %d: %s\n", file, line, str);
 #  if defined(_MSC_VER)
     _set_abort_behavior( 0, _WRITE_ABORT_MSG);
diff --git a/silk/x86/NSQ_del_dec_avx2.c b/silk/x86/NSQ_del_dec_avx2.c
index 3876b9b9f..7de128b02 100644
--- a/silk/x86/NSQ_del_dec_avx2.c
+++ b/silk/x86/NSQ_del_dec_avx2.c
@@ -236,7 +236,7 @@ static OAC_INLINE oac_int32 silk_index_of_first_equal_epi32(__m128i a, __m128i b
     return __builtin_ctz(mask)>>2;
 }
 
-static __m128i silk_index_to_selector(oac_int32 index) {
+static __m128i oaci_silk_index_to_selector(oac_int32 index) {
     silk_assert(index < 4);
     index <<= 2;
     return _mm_set_epi8(
@@ -302,7 +302,7 @@ static OAC_INLINE void silk_LPC_analysis_filter_avx2(
 /******************************************/
 /* Noise shape quantizer for one subframe */
 /******************************************/
-static OAC_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
+static OAC_INLINE void oaci_silk_noise_shape_quantizer_del_dec_avx2(
     silk_nsq_state *NSQ,                        /* I/O  NSQ state                          */
     NSQ_del_dec_struct psDelDec[],              /* I/O  Delayed decision states            */
     oac_int signalType,                        /* I    Signal type                        */
@@ -456,7 +456,7 @@ void oaci_silk_NSQ_del_dec_avx2(
                     /* Find winner */
                     RDmin_Q10 = silk_mm_mask_hmin_epi32(psDelDec.RD_Q10, MaskDelDec);
                     Winner_ind = silk_index_of_first_equal_epi32(RDmin_Q10, psDelDec.RD_Q10);
-                    Winner_selector = silk_index_to_selector(Winner_ind);
+                    Winner_selector = oaci_silk_index_to_selector(Winner_ind);
                     psDelDec.RD_Q10 = _mm_add_epi32(
                         psDelDec.RD_Q10,
                         _mm_blendv_epi8(
@@ -496,7 +496,7 @@ void oaci_silk_NSQ_del_dec_avx2(
         silk_nsq_del_dec_scale_states_avx2(psEncC, NSQ, &psDelDec, x16, x_sc_Q10, sLTP, sLTP_Q15, k,
                                            LTP_scale_Q14, Gains_Q16, pitchL, psIndices->signalType, decisionDelay);
 
-        silk_noise_shape_quantizer_del_dec_avx2(NSQ, &psDelDec, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15,
+        oaci_silk_noise_shape_quantizer_del_dec_avx2(NSQ, &psDelDec, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15,
                                                 delayedGain_Q10, A_Q12, B_Q14, AR_shp_Q13, lag, HarmShapeFIRPacked_Q14,
         Tilt_Q14[k], LF_shp_Q14[k],
                                                 Gains_Q16[k], Lambda_Q10, offset_Q10, psEncC->subfr_length, subfr++,
@@ -511,7 +511,7 @@ void oaci_silk_NSQ_del_dec_avx2(
 
     /* Find winner */
     RDmin_Q10 = silk_mm_mask_hmin_epi32(psDelDec.RD_Q10, MaskDelDec);
-    Winner_selector = silk_index_to_selector(silk_index_of_first_equal_epi32(RDmin_Q10, psDelDec.RD_Q10));
+    Winner_selector = oaci_silk_index_to_selector(silk_index_of_first_equal_epi32(RDmin_Q10, psDelDec.RD_Q10));
 
     /* Copy final part of signals from winner state to output and long-term filter states */
     psIndices->Seed = silk_select_winner(psDelDec.SeedInit, Winner_selector);
@@ -554,7 +554,7 @@ void oaci_silk_NSQ_del_dec_avx2(
     RESTORE_STACK;
 }
 
-static OAC_INLINE __m128i silk_noise_shape_quantizer_short_prediction_x4(const __m128i *buf32, const oac_int16 *coef16,
+static OAC_INLINE __m128i oaci_silk_noise_shape_quantizer_short_prediction_x4(const __m128i *buf32, const oac_int16 *coef16,
                                                                          oac_int order) {
     __m256i out;
     silk_assert(order == 10 || order == 16);
@@ -602,7 +602,7 @@ static OAC_INLINE __m128i silk_noise_shape_quantizer_short_prediction_x4(const _
 /******************************************/
 /* Noise shape quantizer for one subframe */
 /******************************************/
-static OAC_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
+static OAC_INLINE void oaci_silk_noise_shape_quantizer_del_dec_avx2(
     silk_nsq_state *NSQ,                        /* I/O  NSQ state                          */
     NSQ_del_dec_struct *psDelDec,               /* I/O  Delayed decision states            */
     oac_int signalType,                        /* I    Signal type                        */
@@ -695,7 +695,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
         psDelDec->Seed = silk_mm256_rand_epi32(psDelDec->Seed);
 
         /* Short-term prediction */
-        LPC_pred_Q14 = silk_noise_shape_quantizer_short_prediction_x4(&psDelDec->sLPC_Q14[NSQ_LPC_BUF_LENGTH - 1 + i],
+        LPC_pred_Q14 = oaci_silk_noise_shape_quantizer_short_prediction_x4(&psDelDec->sLPC_Q14[NSQ_LPC_BUF_LENGTH - 1 + i],
         a_Q12, predictLPCOrder);
         LPC_pred_Q14 = _mm_slli_epi32(LPC_pred_Q14, 4); /* Q10 -> Q14 */
 
@@ -804,7 +804,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
 
         /* Find winner */
         RDmin_Q10 = silk_mm_mask_hmin_epi32(_mm256_castsi256_si128(SS_RD_Q10), MaskDelDec);
-        Winner_selector = silk_index_to_selector(silk_index_of_first_equal_epi32(RDmin_Q10,
+        Winner_selector = oaci_silk_index_to_selector(silk_index_of_first_equal_epi32(RDmin_Q10,
         _mm256_castsi256_si128(SS_RD_Q10)));
 
         /* Increase RD values of expired states */
@@ -829,7 +829,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_avx2(
             tmp1 = _mm_cvtepi8_epi32(_mm_cvtsi32_si128(0xFFU<<(unsigned)(RDmax_ind<<3)));
             tmp0 = _mm_blendv_epi8(
                 _mm_set_epi8(0xF, 0xE, 0xD, 0xC, 0xB, 0xA, 0x9, 0x8, 0x7, 0x6, 0x5, 0x4, 0x3, 0x2, 0x1, 0x0),
-                silk_index_to_selector(RDmin_ind),
+                oaci_silk_index_to_selector(RDmin_ind),
                 tmp1);
             for (t = i; t < MAX_SUB_FRAME_LENGTH + NSQ_LPC_BUF_LENGTH; t++) {
                 psDelDec->sLPC_Q14[t] = _mm_shuffle_epi8(psDelDec->sLPC_Q14[t], tmp0);
diff --git a/silk/x86/NSQ_del_dec_sse4_1.c b/silk/x86/NSQ_del_dec_sse4_1.c
index 441049272..44061eb99 100644
--- a/silk/x86/NSQ_del_dec_sse4_1.c
+++ b/silk/x86/NSQ_del_dec_sse4_1.c
@@ -64,7 +64,7 @@ typedef struct {
 
 typedef NSQ_sample_struct NSQ_sample_pair[ 2 ];
 
-static OAC_INLINE void silk_nsq_del_dec_scale_states_sse4_1(
+static OAC_INLINE void oaci_silk_nsq_del_dec_scale_states_sse4_1(
     const silk_encoder_state *psEncC,               /* I    Encoder State                       */
     silk_nsq_state      *NSQ,                       /* I/O  NSQ state                           */
     NSQ_del_dec_struct psDelDec[],                  /* I/O  Delayed decision states             */
@@ -84,7 +84,7 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states_sse4_1(
 /******************************************/
 /* Noise shape quantizer for one subframe */
 /******************************************/
-static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
+static OAC_INLINE void oaci_silk_noise_shape_quantizer_del_dec_sse4_1(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                           */
     NSQ_del_dec_struct psDelDec[],              /* I/O  Delayed decision states             */
     oac_int signalType,                        /* I    Signal type                         */
@@ -291,10 +291,10 @@ void oaci_silk_NSQ_del_dec_sse4_1(
             }
         }
 
-        silk_nsq_del_dec_scale_states_sse4_1( psEncC, NSQ, psDelDec, x16, x_sc_Q10, sLTP, sLTP_Q15, k,
+        oaci_silk_nsq_del_dec_scale_states_sse4_1( psEncC, NSQ, psDelDec, x16, x_sc_Q10, sLTP, sLTP_Q15, k,
             psEncC->nStatesDelayedDecision, LTP_scale_Q14, Gains_Q16, pitchL, psIndices->signalType, decisionDelay );
 
-        silk_noise_shape_quantizer_del_dec_sse4_1( NSQ, psDelDec, psIndices->signalType, x_sc_Q10, pulses, pxq,
+        oaci_silk_noise_shape_quantizer_del_dec_sse4_1( NSQ, psDelDec, psIndices->signalType, x_sc_Q10, pulses, pxq,
         sLTP_Q15,
             delayedGain_Q10, A_Q12, B_Q14, AR_shp_Q13, lag, HarmShapeFIRPacked_Q14, Tilt_Q14[ k ], LF_shp_Q14[ k ],
             Gains_Q16[ k ], Lambda_Q10, offset_Q10, psEncC->subfr_length, subfr++, psEncC->shapingLPCOrder,
@@ -356,7 +356,7 @@ void oaci_silk_NSQ_del_dec_sse4_1(
 /******************************************/
 /* Noise shape quantizer for one subframe */
 /******************************************/
-static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
+static OAC_INLINE void oaci_silk_noise_shape_quantizer_del_dec_sse4_1(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                           */
     NSQ_del_dec_struct psDelDec[],              /* I/O  Delayed decision states             */
     oac_int signalType,                        /* I    Signal type                         */
@@ -788,7 +788,7 @@ static OAC_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
     RESTORE_STACK;
 }
 
-static OAC_INLINE void silk_nsq_del_dec_scale_states_sse4_1(
+static OAC_INLINE void oaci_silk_nsq_del_dec_scale_states_sse4_1(
     const silk_encoder_state *psEncC,               /* I    Encoder State                       */
     silk_nsq_state      *NSQ,                       /* I/O  NSQ state                           */
     NSQ_del_dec_struct psDelDec[],                  /* I/O  Delayed decision states             */
diff --git a/silk/x86/NSQ_sse4_1.c b/silk/x86/NSQ_sse4_1.c
index 37b87db67..65c6f141f 100644
--- a/silk/x86/NSQ_sse4_1.c
+++ b/silk/x86/NSQ_sse4_1.c
@@ -50,7 +50,7 @@ static OAC_INLINE void silk_nsq_scale_states_sse4_1(
     const oac_int signal_type                     /* I    Signal type                     */
     );
 
-static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
+static OAC_INLINE void oaci_silk_noise_shape_quantizer_10_16_sse4_1(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                       */
     oac_int signalType,                        /* I    Signal type                     */
     const oac_int32 x_sc_Q10[],                /* I                                    */
@@ -243,7 +243,7 @@ void oaci_silk_NSQ_sse4_1(
         psIndices->signalType );
 
         if (oac_likely((10 == psEncC->shapingLPCOrder) && (16 == psEncC->predictLPCOrder))) {
-            silk_noise_shape_quantizer_10_16_sse4_1( NSQ, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15, A_Q12,
+            oaci_silk_noise_shape_quantizer_10_16_sse4_1( NSQ, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15, A_Q12,
             B_Q14,
                 AR_shp_Q13, lag, HarmShapeFIRPacked_Q14, Tilt_Q14[ k ], LF_shp_Q14[ k ], Gains_Q16[ k ], Lambda_Q10,
                 offset_Q10, psEncC->subfr_length, &(table[32]));
@@ -277,9 +277,9 @@ void oaci_silk_NSQ_sse4_1(
 }
 
 /************************************/
-/* silk_noise_shape_quantizer_10_16 */
+/* oaci_silk_noise_shape_quantizer_10_16 */
 /************************************/
-static OAC_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
+static OAC_INLINE void oaci_silk_noise_shape_quantizer_10_16_sse4_1(
     silk_nsq_state      *NSQ,                   /* I/O  NSQ state                       */
     oac_int signalType,                        /* I    Signal type                     */
     const oac_int32 x_sc_Q10[],                /* I                                    */
diff --git a/src/analysis.c b/src/analysis.c
index d0291e9ad..d7208e281 100644
--- a/src/analysis.c
+++ b/src/analysis.c
@@ -112,7 +112,7 @@ static const int tbands[NB_TBANDS + 1] = {
 
 # define NB_TONAL_SKIP_BANDS 9
 
-static oac_val32 silk_resampler_down2_hp(
+static oac_val32 oaci_silk_resampler_down2_hp(
     oac_val32                  *S,                 /* I/O  State vector [ 2 ]                                          */
     oac_val32                  *out,               /* O    Output signal [ floor(len/2) ]                              */
     const oac_val32            *in,                /* I    Input signal [ len ]                                        */
@@ -161,7 +161,7 @@ static oac_val32 silk_resampler_down2_hp(
     return (oac_val32)hp_ener;
 }
 
-static oac_val32 downmix_and_resample(downmix_func oaci_downmix, const void *_x, oac_val32 *y, oac_val32 S[3], int subframe,
+static oac_val32 oaci_downmix_and_resample(downmix_func oaci_downmix, const void *_x, oac_val32 *y, oac_val32 S[3], int subframe,
                                       int offset, int c1, int c2, int C, int Fs) {
     VARDECL(oac_val32, tmp);
     int j;
@@ -185,7 +185,7 @@ static oac_val32 downmix_and_resample(downmix_func oaci_downmix, const void *_x,
         }
     }
     if (Fs == 48000) {
-        ret = silk_resampler_down2_hp(S, y, tmp, subframe);
+        ret = oaci_silk_resampler_down2_hp(S, y, tmp, subframe);
     } else if (Fs == 24000) {
         OAC_COPY(y, tmp, subframe);
     } else if (Fs == 16000) {
@@ -199,7 +199,7 @@ static oac_val32 downmix_and_resample(downmix_func oaci_downmix, const void *_x,
             tmp3x[3*j + 1] = tmp[j];
             tmp3x[3*j + 2] = tmp[j];
         }
-        silk_resampler_down2_hp(S, y, tmp3x, 3*subframe);
+        oaci_silk_resampler_down2_hp(S, y, tmp3x, 3*subframe);
     }
     RESTORE_STACK;
 # ifndef FIXED_POINT
@@ -426,7 +426,7 @@ static int is_digital_silence32(const oac_val32* pcm, int frame_size, int channe
     lsb_depth)
 # endif
 
-static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt_mode, const void *x, int len,
+static void oaci_tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt_mode, const void *x, int len,
                               int offset, int c1, int c2, int C, int lsb_depth, downmix_func oaci_downmix) {
     int i, b;
     const kiss_fft_state *oaci_kfft;
@@ -493,7 +493,7 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
     }
 
     oaci_kfft = celt_mode->mdct.kfft[0];
-    tonal->hp_ener_accum += (float)downmix_and_resample(oaci_downmix, x,
+    tonal->hp_ener_accum += (float)oaci_downmix_and_resample(oaci_downmix, x,
           &tonal->inmem[tonal->mem_fill], tonal->downmix_state,
           IMIN(len, ANALYSIS_BUF_SIZE - tonal->mem_fill), offset, c1, c2, C, tonal->Fs);
     if (tonal->mem_fill + len < ANALYSIS_BUF_SIZE) {
@@ -522,7 +522,7 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
     }
     OAC_MOVE(tonal->inmem, tonal->inmem + ANALYSIS_BUF_SIZE - 240, 240);
     remaining = len - (ANALYSIS_BUF_SIZE - tonal->mem_fill);
-    tonal->hp_ener_accum = (float)downmix_and_resample(oaci_downmix, x,
+    tonal->hp_ener_accum = (float)oaci_downmix_and_resample(oaci_downmix, x,
           &tonal->inmem[240], tonal->downmix_state, remaining,
           offset + ANALYSIS_BUF_SIZE - tonal->mem_fill, c1, c2, C, tonal->Fs);
     tonal->mem_fill = 240 + remaining;
@@ -784,7 +784,7 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
         noise_ratio = tonal->prev_bandwidth == 20 ? 10.f : 30.f;
 
 # ifdef FIXED_POINT
-        /* silk_resampler_down2_hp() shifted right by an extra 8 bits. */
+        /* oaci_silk_resampler_down2_hp() shifted right by an extra 8 bits. */
         E *= 256.f*(1.f/Q15ONE)*(1.f/Q15ONE);
 # endif
         above_max_pitch += E;
@@ -919,7 +919,7 @@ void oaci_run_analysis(TonalityAnalysisState *analysis, const CELTMode *celt_mod
         pcm_len = analysis_frame_size - analysis->analysis_offset;
         offset = analysis->analysis_offset;
         while (pcm_len > 0) {
-            tonality_analysis(analysis, celt_mode, analysis_pcm, IMIN(Fs/50, pcm_len), offset, c1, c2, C, lsb_depth,
+            oaci_tonality_analysis(analysis, celt_mode, analysis_pcm, IMIN(Fs/50, pcm_len), offset, c1, c2, C, lsb_depth,
             oaci_downmix);
             offset += Fs/50;
             pcm_len -= Fs/50;
diff --git a/src/extensions.c b/src/extensions.c
index fc2b4653a..1008db020 100644
--- a/src/extensions.c
+++ b/src/extensions.c
@@ -42,7 +42,7 @@
    N.B., a "Repeat These Extensions" extension (ID==2) does not advance past
     the repeated extension payloads.
    That requires higher-level logic. */
-static oac_int32 skip_extension_payload(const unsigned char **pdata,
+static oac_int32 oaci_skip_extension_payload(const unsigned char **pdata,
                                         oac_int32 len, oac_int32 *pheader_size, int id_byte,
                                         oac_int32 trailing_short_len) {
     const unsigned char *data;
@@ -91,7 +91,7 @@ static oac_int32 skip_extension_payload(const unsigned char **pdata,
     extension ID byte.
    Higher-level logic is required to skip the extension payloads that come
     after it.*/
-static oac_int32 skip_extension(const unsigned char **pdata, oac_int32 len,
+static oac_int32 oaci_skip_extension(const unsigned char **pdata, oac_int32 len,
                                 oac_int32 *pheader_size) {
     const unsigned char *data;
     int id_byte;
@@ -104,7 +104,7 @@ static oac_int32 skip_extension(const unsigned char **pdata, oac_int32 len,
     data = *pdata;
     id_byte = *data++;
     len--;
-    len = skip_extension_payload(&data, len, pheader_size, id_byte, 0);
+    len = oaci_skip_extension_payload(&data, len, pheader_size, id_byte, 0);
     if (len >= 0) {
         *pdata = data;
         (*pheader_size)++;
@@ -158,7 +158,7 @@ static int oac_extension_iterator_next_repeat(OacExtensionIterator *iter,
             const unsigned char *curr_data0;
             int repeat_id_byte;
             repeat_id_byte = *iter->src_data;
-            iter->src_len = skip_extension(&iter->src_data, iter->src_len,
+            iter->src_len = oaci_skip_extension(&iter->src_data, iter->src_len,
           &header_size);
             /* We skipped this extension earlier, so it should not fail now. */
             celt_assert(iter->src_len >= 0);
@@ -173,7 +173,7 @@ static int oac_extension_iterator_next_repeat(OacExtensionIterator *iter,
                 repeat_id_byte &= ~1;
             }
             curr_data0 = iter->curr_data;
-            iter->curr_len = skip_extension_payload(&iter->curr_data,
+            iter->curr_len = oaci_skip_extension_payload(&iter->curr_data,
           iter->curr_len, &header_size, repeat_id_byte,
           iter->trailing_short_len);
             if (iter->curr_len < 0) {
@@ -242,7 +242,7 @@ int oac_extension_iterator_next(OacExtensionIterator *iter,
         curr_data0 = iter->curr_data;
         id = *curr_data0>>1;
         L = *curr_data0&1;
-        iter->curr_len = skip_extension(&iter->curr_data, iter->curr_len,
+        iter->curr_len = oaci_skip_extension(&iter->curr_data, iter->curr_len,
        &header_size);
         if (iter->curr_len < 0) {
             return OAC_INVALID_PACKET;
@@ -411,7 +411,7 @@ oac_int32 oac_packet_extensions_parse_ext(const unsigned char *data,
     return ret;
 }
 
-static int write_extension_payload(unsigned char *data, oac_int32 len,
+static int oaci_write_extension_payload(unsigned char *data, oac_int32 len,
                                    oac_int32 pos, const oac_extension_data *ext, int last) {
     celt_assert(ext->id >= 3 && ext->id <= 127);
     if (ext->id < 32) {
@@ -454,7 +454,7 @@ static int write_extension(unsigned char *data, oac_int32 len, oac_int32 pos,
     celt_assert(ext->id >= 3 && ext->id <= 127);
     if (data) data[pos] = (ext->id<<1) + (ext->id < 32 ? ext->len : !last);
     pos++;
-    return write_extension_payload(data, len, pos, ext, last);
+    return oaci_write_extension_payload(data, len, pos, ext, last);
 }
 
 oac_int32 oac_packet_extensions_generate(unsigned char *data, oac_int32 len,
@@ -582,7 +582,7 @@ oac_int32 oac_packet_extensions_generate(unsigned char *data, oac_int32 len,
                         int j;
                         for (j = frame_min_idx[g]; j < frame_repeat_idx[g]; j++) {
                             if (extensions[j].frame == g) {
-                                pos = write_extension_payload(data, len, pos,
+                                pos = oaci_write_extension_payload(data, len, pos,
                          extensions + j, last && j == last_long_idx);
                                 if (pos < 0) return pos;
                                 written++;
diff --git a/src/mlp.c b/src/mlp.c
index cc202a5e4..ca2147bfa 100644
--- a/src/mlp.c
+++ b/src/mlp.c
@@ -36,7 +36,7 @@
 #include "mlp.h"
 
 #define fmadd(a, b, c) ((a)*(b) + (c))
-static OAC_INLINE float tansig_approx(float x) {
+static OAC_INLINE float oaci_tansig_approx(float x) {
     const float N0 = 952.52801514f;
     const float N1 = 96.39235687f;
     const float N2 = 0.60863042f;
@@ -51,11 +51,11 @@ static OAC_INLINE float tansig_approx(float x) {
     return MAX32(-1.f, MIN32(1.f, num));
 }
 
-static OAC_INLINE float sigmoid_approx(float x) {
-    return .5f + .5f*tansig_approx(.5f*x);
+static OAC_INLINE float oaci_sigmoid_approx(float x) {
+    return .5f + .5f*oaci_tansig_approx(.5f*x);
 }
 
-static void gemm_accum(float *out, const oac_int8 *weights, int rows, int cols, int col_stride, const float *x) {
+static void oaci_gemm_accum(float *out, const oac_int8 *weights, int rows, int cols, int col_stride, const float *x) {
     int i, j;
     for (i = 0; i < rows; i++) {
         for (j = 0; j < cols; j++)
@@ -72,15 +72,15 @@ void oaci_analysis_compute_dense(const AnalysisDenseLayer *layer, float *output,
     stride = N;
     for (i = 0; i < N; i++)
         output[i] = layer->bias[i];
-    gemm_accum(output, layer->input_weights, N, M, stride, input);
+    oaci_gemm_accum(output, layer->input_weights, N, M, stride, input);
     for (i = 0; i < N; i++)
         output[i] *= WEIGHTS_SCALE;
     if (layer->sigmoid) {
         for (i = 0; i < N; i++)
-            output[i] = sigmoid_approx(output[i]);
+            output[i] = oaci_sigmoid_approx(output[i]);
     } else {
         for (i = 0; i < N; i++)
-            output[i] = tansig_approx(output[i]);
+            output[i] = oaci_tansig_approx(output[i]);
     }
 }
 
@@ -98,28 +98,28 @@ void oaci_analysis_compute_gru(const AnalysisGRULayer *gru, float *state, const
     /* Compute update gate. */
     for (i = 0; i < N; i++)
         z[i] = gru->bias[i];
-    gemm_accum(z, gru->input_weights, N, M, stride, input);
-    gemm_accum(z, gru->recurrent_weights, N, N, stride, state);
+    oaci_gemm_accum(z, gru->input_weights, N, M, stride, input);
+    oaci_gemm_accum(z, gru->recurrent_weights, N, N, stride, state);
     for (i = 0; i < N; i++)
-        z[i] = sigmoid_approx(WEIGHTS_SCALE*z[i]);
+        z[i] = oaci_sigmoid_approx(WEIGHTS_SCALE*z[i]);
 
     /* Compute reset gate. */
     for (i = 0; i < N; i++)
         r[i] = gru->bias[N + i];
-    gemm_accum(r, &gru->input_weights[N], N, M, stride, input);
-    gemm_accum(r, &gru->recurrent_weights[N], N, N, stride, state);
+    oaci_gemm_accum(r, &gru->input_weights[N], N, M, stride, input);
+    oaci_gemm_accum(r, &gru->recurrent_weights[N], N, N, stride, state);
     for (i = 0; i < N; i++)
-        r[i] = sigmoid_approx(WEIGHTS_SCALE*r[i]);
+        r[i] = oaci_sigmoid_approx(WEIGHTS_SCALE*r[i]);
 
     /* Compute output. */
     for (i = 0; i < N; i++)
         h[i] = gru->bias[2*N + i];
     for (i = 0; i < N; i++)
         tmp[i] = state[i]*r[i];
-    gemm_accum(h, &gru->input_weights[2*N], N, M, stride, input);
-    gemm_accum(h, &gru->recurrent_weights[2*N], N, N, stride, tmp);
+    oaci_gemm_accum(h, &gru->input_weights[2*N], N, M, stride, input);
+    oaci_gemm_accum(h, &gru->recurrent_weights[2*N], N, N, stride, tmp);
     for (i = 0; i < N; i++)
-        h[i] = z[i]*state[i] + (1 - z[i])*tansig_approx(WEIGHTS_SCALE*h[i]);
+        h[i] = z[i]*state[i] + (1 - z[i])*oaci_tansig_approx(WEIGHTS_SCALE*h[i]);
     for (i = 0; i < N; i++)
         state[i] = h[i];
 }
diff --git a/src/oac.c b/src/oac.c
index cd9c96dd6..e87d8288a 100644
--- a/src/oac.c
+++ b/src/oac.c
@@ -166,7 +166,7 @@ int oaci_encode_size(int size, unsigned char *data) {
     }
 }
 
-static int parse_size(const unsigned char *data, oac_int32 len, oac_int16 *size) {
+static int oaci_parse_size(const unsigned char *data, oac_int32 len, oac_int16 *size) {
     if (len < 1) {
         *size = -1;
         return -1;
@@ -251,7 +251,7 @@ int oac_packet_parse_impl(const unsigned char *data, oac_int32 len,
         /* Two VBR frames */
         case 2:
             count = 2;
-            bytes = parse_size(data, len, size);
+            bytes = oaci_parse_size(data, len, size);
             len -= bytes;
             if (size[0] < 0 || size[0] > len)
                 return OAC_INVALID_PACKET;
@@ -290,7 +290,7 @@ int oac_packet_parse_impl(const unsigned char *data, oac_int32 len,
                 /* VBR case */
                 last_size = len;
                 for (i = 0; i < count - 1; i++) {
-                    bytes = parse_size(data, len, size + i);
+                    bytes = oaci_parse_size(data, len, size + i);
                     len -= bytes;
                     if (size[i] < 0 || size[i] > len)
                         return OAC_INVALID_PACKET;
@@ -311,7 +311,7 @@ int oac_packet_parse_impl(const unsigned char *data, oac_int32 len,
     }
     /* Self-delimited framing has an extra size for the last frame. */
     if (self_delimited) {
-        bytes = parse_size(data, len, size + count - 1);
+        bytes = oaci_parse_size(data, len, size + count - 1);
         len -= bytes;
         if (size[count - 1] < 0 || size[count - 1] > len)
             return OAC_INVALID_PACKET;
diff --git a/src/oac_decoder.c b/src/oac_decoder.c
index c17fdd3a2..c571942b9 100644
--- a/src/oac_decoder.c
+++ b/src/oac_decoder.c
@@ -215,7 +215,7 @@ OacDecoder *oac_decoder_create(oac_int32 Fs, int channels, int *error) {
     return st;
 }
 
-static void smooth_fade(const oac_res *in1, const oac_res *in2,
+static void oaci_smooth_fade(const oac_res *in1, const oac_res *in2,
                         oac_res *out, int overlap, int channels,
                         const celt_coef *window, oac_int32 Fs) {
     int i, c;
@@ -462,7 +462,7 @@ static int oac_decode_frame(OacDecoder *st, const unsigned char *data,
 
     start_band = 0;
     if (!decode_fec && mode != MODE_CELT_ONLY && data != NULL
-        && ec_tell(&dec) + 17 + 20*(mode == MODE_HYBRID) <= 8*len) {
+        && oaci_ec_tell(&dec) + 17 + 20*(mode == MODE_HYBRID) <= 8*len) {
         /* Check if we have a redundant 0-8 kHz band */
         if (mode == MODE_HYBRID)
             redundancy = oaci_ec_dec_bit_logp(&dec, 12);
@@ -471,14 +471,14 @@ static int oac_decode_frame(OacDecoder *st, const unsigned char *data,
         if (redundancy) {
             celt_to_silk = oaci_ec_dec_bit_logp(&dec, 1);
             /* redundancy_bytes will be at least two, in the non-hybrid
-               case due to the ec_tell() check above */
+               case due to the oaci_ec_tell() check above */
             redundancy_bytes = mode == MODE_HYBRID ?
                                (oac_int32)oaci_ec_dec_uint(&dec, 256) + 2 :
-                               len - ((ec_tell(&dec) + 7)>>3);
+                               len - ((oaci_ec_tell(&dec) + 7)>>3);
             len -= redundancy_bytes;
             /* This is a sanity check. It should never happen for a valid
                packet, so the exact behaviour is not normative. */
-            if (len*8 < ec_tell(&dec)) {
+            if (len*8 < oaci_ec_tell(&dec)) {
                 len = 0;
                 redundancy_bytes = 0;
                 redundancy = 0;
@@ -594,7 +594,7 @@ static int oac_decode_frame(OacDecoder *st, const unsigned char *data,
 
         oaci_celt_decode_with_ec(celt_dec, data + len, redundancy_bytes, redundant_audio, F5, NULL, 0);
         MUST_SUCCEED(celt_decoder_ctl(celt_dec, OAC_GET_FINAL_RANGE(&redundant_rng)));
-        smooth_fade(pcm + st->channels*(frame_size - F2_5), redundant_audio + st->channels*F2_5,
+        oaci_smooth_fade(pcm + st->channels*(frame_size - F2_5), redundant_audio + st->channels*F2_5,
                   pcm + st->channels*(frame_size - F2_5), F2_5, st->channels, window, st->Fs);
     }
     /* 5ms redundant frame for CELT->SILK; ignore if the previous frame did not
@@ -605,14 +605,14 @@ static int oac_decode_frame(OacDecoder *st, const unsigned char *data,
             for (i = 0; i < F2_5; i++)
                 pcm[st->channels*i + c] = redundant_audio[st->channels*i + c];
         }
-        smooth_fade(redundant_audio + st->channels*F2_5, pcm + st->channels*F2_5,
+        oaci_smooth_fade(redundant_audio + st->channels*F2_5, pcm + st->channels*F2_5,
                   pcm + st->channels*F2_5, F2_5, st->channels, window, st->Fs);
     }
     if (transition) {
         if (audiosize >= F5) {
             for (i = 0; i < st->channels*F2_5; i++)
                 pcm[i] = pcm_transition[i];
-            smooth_fade(pcm_transition + st->channels*F2_5, pcm + st->channels*F2_5,
+            oaci_smooth_fade(pcm_transition + st->channels*F2_5, pcm + st->channels*F2_5,
                      pcm + st->channels*F2_5, F2_5,
                      st->channels, window, st->Fs);
         } else {
@@ -621,7 +621,7 @@ static int oac_decode_frame(OacDecoder *st, const unsigned char *data,
                a bit of temporal aliasing, but it shouldn't be too bad and
                that's pretty much the best we can do. In any case, generating this
                transition it pretty silly in the first place */
-            smooth_fade(pcm_transition, pcm,
+            oaci_smooth_fade(pcm_transition, pcm,
                      pcm, F2_5,
                      st->channels, window, st->Fs);
         }
@@ -629,7 +629,7 @@ static int oac_decode_frame(OacDecoder *st, const unsigned char *data,
 
     if (st->decode_gain) {
         oac_val32 gain;
-        gain = celt_exp2(MULT16_16_P15(QCONST16(6.48814081e-4f, 25), st->decode_gain));
+        gain = oaci_celt_exp2(MULT16_16_P15(QCONST16(6.48814081e-4f, 25), st->decode_gain));
         for (i = 0; i < frame_size*st->channels; i++) {
             oac_val32 x;
             x = MULT32_32_Q16(pcm[i], gain);
@@ -1218,14 +1218,14 @@ struct OacDREDDecoder {
 };
 
 #if defined(ENABLE_DRED) && (defined(ENABLE_HARDENING) || defined(ENABLE_ASSERTIONS))
-static void validate_dred_decoder(OacDREDDecoder *st) {
+static void oaci_validate_dred_decoder(OacDREDDecoder *st) {
     celt_assert(st->magic == 0xD8EDDEC0);
 # ifdef OAC_ARCHMASK
     celt_assert(st->arch >= 0);
     celt_assert(st->arch <= OAC_ARCHMASK);
 # endif
 }
-# define VALIDATE_DRED_DECODER(st) validate_dred_decoder(st)
+# define VALIDATE_DRED_DECODER(st) oaci_validate_dred_decoder(st)
 #else
 # define VALIDATE_DRED_DECODER(st)
 #endif
@@ -1324,7 +1324,7 @@ int oac_dred_decoder_ctl(OacDREDDecoder *dred_dec, int request, ...) {
 }
 
 #ifdef ENABLE_DRED
-static int dred_find_payload(const unsigned char *data, oac_int32 len, const unsigned char **payload,
+static int oaci_dred_find_payload(const unsigned char *data, oac_int32 len, const unsigned char **payload,
                              int *dred_frame_offset) {
     OacExtensionIterator iter;
     oac_extension_data ext;
@@ -1411,7 +1411,7 @@ int oac_dred_parse(OacDREDDecoder *dred_dec, OacDRED *dred, const unsigned char
     VALIDATE_DRED_DECODER(dred_dec);
     if (!dred_dec->loaded) return OAC_UNIMPLEMENTED;
     dred->process_stage = -1;
-    payload_len = dred_find_payload(data, len, &payload, &dred_frame_offset);
+    payload_len = oaci_dred_find_payload(data, len, &payload, &dred_frame_offset);
     if (payload_len < 0)
         return payload_len;
     if (payload != NULL) {
diff --git a/src/oac_encoder.c b/src/oac_encoder.c
index 261a4da69..a99d6eb92 100644
--- a/src/oac_encoder.c
+++ b/src/oac_encoder.c
@@ -320,7 +320,7 @@ int oac_encoder_init(OacEncoder* st, oac_int32 Fs, int channels, int application
     return OAC_OK;
 }
 
-static unsigned char gen_toc(int mode, int framerate, int bandwidth, int channels) {
+static unsigned char oaci_gen_toc(int mode, int framerate, int bandwidth, int channels) {
     int period;
     unsigned char toc;
     period = 0;
@@ -458,7 +458,7 @@ static void dc_reject(const oac_res *in, oac_int32 cutoff_Hz, oac_res *out, oac_
     int shift;
 
     /* Approximates -round(log2(6.3*cutoff_Hz/Fs)) */
-    shift = celt_ilog2(Fs/(cutoff_Hz*4));
+    shift = oaci_celt_ilog2(Fs/(cutoff_Hz*4));
     for (c = 0; c < channels; c++) {
         for (i = 0; i < len; i++) {
             oac_val32 x, y;
@@ -512,7 +512,7 @@ static void dc_reject(const oac_val16 *in, oac_int32 cutoff_Hz, oac_val16 *out,
 }
 #endif
 
-static void stereo_fade(const oac_res *in, oac_res *out, oac_val16 g1, oac_val16 g2,
+static void oaci_stereo_fade(const oac_res *in, oac_res *out, oac_val16 g1, oac_val16 g2,
                         int overlap48, int frame_size, int channels, const celt_coef *window, oac_int32 Fs) {
     int i;
     int overlap;
@@ -542,7 +542,7 @@ static void stereo_fade(const oac_res *in, oac_res *out, oac_val16 g1, oac_val16
     }
 }
 
-static void gain_fade(const oac_res *in, oac_res *out, oac_val16 g1, oac_val16 g2,
+static void oaci_gain_fade(const oac_res *in, oac_res *out, oac_val16 g1, oac_val16 g2,
                       int overlap48, int frame_size, int channels, const celt_coef *window, oac_int32 Fs) {
     int i;
     int inc;
@@ -683,7 +683,7 @@ static oac_int32 compute_dred_bitrate(OacEncoder *st, oac_int32 bitrate_bps, int
 }
 #endif
 
-static oac_int32 user_bitrate_to_bitrate(OacEncoder *st, int frame_size, int max_data_bytes) {
+static oac_int32 oaci_user_bitrate_to_bitrate(OacEncoder *st, int frame_size, int max_data_bytes) {
     oac_int32 max_bitrate, user_bitrate;
     if (!frame_size) frame_size = st->Fs/400;
     max_bitrate = bits_to_bitrate(max_data_bytes*8, st->Fs, frame_size);
@@ -795,7 +795,7 @@ oac_val16 oaci_compute_stereo_width(const oac_res *pcm, int frame_size, oac_int3
     int i;
     oac_val16 short_alpha;
 #ifdef FIXED_POINT
-    int shift = celt_ilog2(frame_size) - 2;
+    int shift = oaci_celt_ilog2(frame_size) - 2;
 #endif
     frame_rate = Fs/frame_size;
     short_alpha = MULT16_16(25, Q15ONE)/IMAX(50, frame_rate);
@@ -900,7 +900,7 @@ static int decide_fec(int useInBandFEC, int PacketLoss_perc, int last_fec, int m
     return 0;
 }
 
-static int compute_silk_rate_for_hybrid(int rate, int bandwidth, int frame20ms, int vbr, int fec, int channels) {
+static int oaci_compute_silk_rate_for_hybrid(int rate, int bandwidth, int frame20ms, int vbr, int fec, int channels) {
     int entry;
     int i;
     int N;
@@ -951,7 +951,7 @@ static int compute_silk_rate_for_hybrid(int rate, int bandwidth, int frame20ms,
 
 /* Returns the equivalent bitrate corresponding to 20 ms frames,
    complexity 10 VBR operation. */
-static oac_int32 compute_equiv_rate(oac_int32 bitrate, int channels,
+static oac_int32 oaci_compute_equiv_rate(oac_int32 bitrate, int channels,
                                     int frame_rate, int vbr, int mode, int complexity, int loss) {
     oac_int32 equiv;
     equiv = bitrate;
@@ -1001,7 +1001,7 @@ int oaci_is_digital_silence(const oac_res* pcm, int frame_size, int channels, in
 }
 
 #ifdef FIXED_POINT
-static oac_val32 compute_frame_energy(const oac_res *pcm, int frame_size, int channels, int arch) {
+static oac_val32 oaci_compute_frame_energy(const oac_res *pcm, int frame_size, int channels, int arch) {
     int i;
     oac_val32 sample_max;
     int max_shift;
@@ -1013,8 +1013,8 @@ static oac_val32 compute_frame_energy(const oac_res *pcm, int frame_size, int ch
     sample_max = RES2INT16(celt_maxabs_res(pcm, len));
 
     /* Compute the right shift required in the MAC to avoid an overflow */
-    max_shift = celt_ilog2(len);
-    shift = IMAX(0, (celt_ilog2(1 + sample_max)<<1) + max_shift - 28);
+    max_shift = oaci_celt_ilog2(len);
+    shift = IMAX(0, (oaci_celt_ilog2(1 + sample_max)<<1) + max_shift - 28);
 
     /* Compute the energy */
     for (i = 0; i < len; i++)
@@ -1027,7 +1027,7 @@ static oac_val32 compute_frame_energy(const oac_res *pcm, int frame_size, int ch
     return energy;
 }
 #else
-static oac_val32 compute_frame_energy(const oac_val16 *pcm, int frame_size, int channels, int arch) {
+static oac_val32 oaci_compute_frame_energy(const oac_val16 *pcm, int frame_size, int channels, int arch) {
     int len = frame_size*channels;
     return oaci_celt_inner_prod(pcm, pcm, len, arch)/len;
 }
@@ -1057,7 +1057,7 @@ static int decide_dtx_mode(oac_int activity,            /* indicates if this fra
     return 0;
 }
 
-static int compute_redundancy_bytes(oac_int32 max_data_bytes, oac_int32 bitrate_bps, int frame_rate, int channels) {
+static int oaci_compute_redundancy_bytes(oac_int32 max_data_bytes, oac_int32 bitrate_bps, int frame_rate, int channels) {
     int redundancy_bytes_cap;
     int redundancy_bytes;
     oac_int32 redundancy_rate;
@@ -1224,14 +1224,14 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
     {
         if (!is_silence) {
             st->peak_signal_energy = MAX32(MULT16_32_Q15(QCONST16(0.999f, 15), st->peak_signal_energy),
-                compute_frame_energy(pcm, frame_size, st->channels, st->arch));
+                oaci_compute_frame_energy(pcm, frame_size, st->channels, st->arch));
         }
     }
     if (st->channels == 2 && st->force_channels != 1)
         stereo_width = oaci_compute_stereo_width(pcm, frame_size, st->Fs, &st->width_mem);
     else
         stereo_width = 0;
-    st->bitrate_bps = user_bitrate_to_bitrate(st, frame_size, max_data_bytes);
+    st->bitrate_bps = oaci_user_bitrate_to_bitrate(st, frame_size, max_data_bytes);
 
     frame_rate = st->Fs/frame_size;
     if (!st->use_vbr) {
@@ -1285,7 +1285,7 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
         else if (tocmode == MODE_HYBRID && bw <= OAC_BANDWIDTH_SUPERWIDEBAND)
             bw = OAC_BANDWIDTH_SUPERWIDEBAND;
 
-        data[0] = gen_toc(tocmode, frame_rate, bw, st->stream_channels);
+        data[0] = oaci_gen_toc(tocmode, frame_rate, bw, st->stream_channels);
         data[0] |= packet_code;
 
         ret = packet_code <= 1 ? 1 : 2;
@@ -1308,7 +1308,7 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
     max_rate = bits_to_bitrate(max_data_bytes*8, st->Fs, frame_size);
 
     /* Equivalent 20-ms rate for mode/channel/bandwidth decisions */
-    equiv_rate = compute_equiv_rate(st->bitrate_bps, st->channels, st->Fs/frame_size,
+    equiv_rate = oaci_compute_equiv_rate(st->bitrate_bps, st->channels, st->Fs/frame_size,
           st->use_vbr, 0, st->silk_mode.complexity, st->silk_mode.packetLossPercentage);
 
     if (st->signal_type == OAC_SIGNAL_VOICE)
@@ -1351,7 +1351,7 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
 #endif
     }
     /* Update equivalent rate for channels decision. */
-    equiv_rate = compute_equiv_rate(st->bitrate_bps, st->stream_channels, st->Fs/frame_size,
+    equiv_rate = oaci_compute_equiv_rate(st->bitrate_bps, st->stream_channels, st->Fs/frame_size,
           st->use_vbr, 0, st->silk_mode.complexity, st->silk_mode.packetLossPercentage);
 
     /* Allow SILK DTX if DTX is enabled but the generalized DTX cannot be used,
@@ -1462,7 +1462,7 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
     }
 
     /* Update equivalent rate with mode decision. */
-    equiv_rate = compute_equiv_rate(st->bitrate_bps, st->stream_channels, st->Fs/frame_size,
+    equiv_rate = oaci_compute_equiv_rate(st->bitrate_bps, st->stream_channels, st->Fs/frame_size,
           st->use_vbr, st->mode, st->silk_mode.complexity, st->silk_mode.packetLossPercentage);
 
     if (st->mode != MODE_CELT_ONLY && st->prev_mode == MODE_CELT_ONLY) {
@@ -1786,13 +1786,13 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
         activity = analysis_info->activity_probability >= DTX_ACTIVITY_THRESHOLD;
         if (!activity) {
             /* Mark as active if this noise frame is sufficiently loud */
-            oac_val32 noise_energy = compute_frame_energy(pcm, frame_size, st->channels, st->arch);
+            oac_val32 noise_energy = oaci_compute_frame_energy(pcm, frame_size, st->channels, st->arch);
             activity = st->peak_signal_energy < (PSEUDO_SNR_THRESHOLD*noise_energy);
         }
     }
 #endif
     else if (st->mode == MODE_CELT_ONLY) {
-        oac_val32 noise_energy = compute_frame_energy(pcm, frame_size, st->channels, st->arch);
+        oac_val32 noise_energy = oaci_compute_frame_energy(pcm, frame_size, st->channels, st->arch);
         /* Boosting peak energy a bit because we didn't just average the active frames. */
         activity = st->peak_signal_energy < (QCONST16(PSEUDO_SNR_THRESHOLD, 0)*(oac_val64)HALF32(noise_energy));
     }
@@ -1812,7 +1812,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
         redundancy = 0;
 
     if (redundancy) {
-        redundancy_bytes = compute_redundancy_bytes(max_data_bytes, st->bitrate_bps, frame_rate, st->stream_channels);
+        redundancy_bytes = oaci_compute_redundancy_bytes(max_data_bytes, st->bitrate_bps, frame_rate, st->stream_channels);
         if (redundancy_bytes == 0)
             redundancy = 0;
     }
@@ -1908,13 +1908,13 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
         total_bitRate = bits_to_bitrate(bits_target, st->Fs, frame_size);
         if (st->mode == MODE_HYBRID) {
             /* Base rate for SILK */
-            st->silk_mode.bitRate = compute_silk_rate_for_hybrid(total_bitRate,
+            st->silk_mode.bitRate = oaci_compute_silk_rate_for_hybrid(total_bitRate,
                   curr_bandwidth, st->Fs == 50*frame_size, st->use_vbr, st->silk_mode.LBRR_coded,
                   st->stream_channels);
             if (!st->energy_masking) {
                 /* Increasingly attenuate high band when it gets allocated fewer bits */
                 celt_rate = total_bitRate - st->silk_mode.bitRate;
-                HB_gain = Q15ONE - SHR32(celt_exp2(-celt_rate*QCONST16(1.f/1024, 10)), 1);
+                HB_gain = Q15ONE - SHR32(oaci_celt_exp2(-celt_rate*QCONST16(1.f/1024, 10)), 1);
             }
         } else {
             /* SILK gets all bits */
@@ -2026,7 +2026,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
             /* Constrained VBR. */
             if (st->mode == MODE_HYBRID) {
                 /* Compute SILK bitrate corresponding to the max total bits available */
-                oac_int32 maxBitRate = compute_silk_rate_for_hybrid(st->silk_mode.maxBits*st->Fs/frame_size,
+                oac_int32 maxBitRate = oaci_compute_silk_rate_for_hybrid(st->silk_mode.maxBits*st->Fs/frame_size,
                     curr_bandwidth, st->Fs == 50*frame_size, st->use_vbr, st->silk_mode.LBRR_coded,
                     st->stream_channels);
                 st->silk_mode.maxBits = bitrate_to_bits(maxBitRate, st->Fs, frame_size);
@@ -2043,7 +2043,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
                rewritten is tmp_prefill[] and even then only the part after the ramp really
                gets used (rather than sent to the encoder and discarded) */
             prefill_offset = st->channels*(st->encoder_buffer - st->delay_compensation - st->Fs/400);
-            gain_fade(st->delay_buffer + prefill_offset, st->delay_buffer + prefill_offset,
+            oaci_gain_fade(st->delay_buffer + prefill_offset, st->delay_buffer + prefill_offset,
                   0, Q15ONE, celt_mode->overlap, st->Fs/400, st->channels, celt_mode->window, st->Fs);
             OAC_CLEAR(st->delay_buffer, prefill_offset);
             pcm_silk = st->delay_buffer;
@@ -2085,7 +2085,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
         }
         if (nBytes == 0) {
             st->rangeFinal = 0;
-            data[-1] = gen_toc(st->mode, st->Fs/frame_size, curr_bandwidth, st->stream_channels);
+            data[-1] = oaci_gen_toc(st->mode, st->Fs/frame_size, curr_bandwidth, st->stream_channels);
             RESTORE_STACK;
             return 1;
         }
@@ -2093,7 +2093,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
         /* FIXME: How do we allocate the redundancy for CBR? */
         if (st->silk_mode.oacCanSwitch) {
             if (st->application != OAC_APPLICATION_RESTRICTED_SILK) {
-                redundancy_bytes = compute_redundancy_bytes(max_data_bytes, st->bitrate_bps, frame_rate,
+                redundancy_bytes = oaci_compute_redundancy_bytes(max_data_bytes, st->bitrate_bps, frame_rate,
                 st->stream_channels);
                 redundancy = (redundancy_bytes != 0);
             }
@@ -2150,10 +2150,10 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
         OAC_COPY(st->delay_buffer, &pcm_buf[(frame_size + total_buffer - st->encoder_buffer)*st->channels],
         st->encoder_buffer*st->channels);
     }
-    /* gain_fade() and stereo_fade() need to be after the buffer copying
+    /* oaci_gain_fade() and oaci_stereo_fade() need to be after the buffer copying
        because we don't want any of this to affect the SILK part */
     if ((st->prev_HB_gain < Q15ONE || HB_gain < Q15ONE) && celt_mode != NULL) {
-        gain_fade(pcm_buf, pcm_buf,
+        oaci_gain_fade(pcm_buf, pcm_buf,
              st->prev_HB_gain, HB_gain, celt_mode->overlap, frame_size, st->channels, celt_mode->window, st->Fs);
     }
     st->prev_HB_gain = HB_gain;
@@ -2179,14 +2179,14 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
             g2 *= (1.f/16384);
 #endif
             if (celt_mode != NULL) {
-                stereo_fade(pcm_buf, pcm_buf, g1, g2, celt_mode->overlap,
+                oaci_stereo_fade(pcm_buf, pcm_buf, g1, g2, celt_mode->overlap,
                      frame_size, st->channels, celt_mode->window, st->Fs);
             }
             st->hybrid_stereo_width_Q14 = st->silk_mode.stereoWidth_Q14;
         }
     }
 
-    if (st->mode != MODE_CELT_ONLY && ec_tell(&enc) + 17 + 20*(st->mode == MODE_HYBRID) <= 8*(max_data_bytes - 1)) {
+    if (st->mode != MODE_CELT_ONLY && oaci_ec_tell(&enc) + 17 + 20*(st->mode == MODE_HYBRID) <= 8*(max_data_bytes - 1)) {
         /* For SILK mode, the redundancy is inferred from the length */
         if (st->mode == MODE_HYBRID)
             oaci_ec_enc_bit_logp(&enc, redundancy, 12);
@@ -2196,9 +2196,9 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
             if (st->mode == MODE_HYBRID) {
                 /* Reserve the 8 bits needed for the redundancy length,
                    and at least a few bits for CELT if possible */
-                max_redundancy = (max_data_bytes - 1) - ((ec_tell(&enc) + 8 + 3 + 7)>>3);
+                max_redundancy = (max_data_bytes - 1) - ((oaci_ec_tell(&enc) + 8 + 3 + 7)>>3);
             } else
-                max_redundancy = (max_data_bytes - 1) - ((ec_tell(&enc) + 7)>>3);
+                max_redundancy = (max_data_bytes - 1) - ((oaci_ec_tell(&enc) + 7)>>3);
             /* Target the same bit-rate for redundancy as for the rest,
                up to a max of 257 bytes */
             redundancy_bytes = IMIN(max_redundancy, redundancy_bytes);
@@ -2217,7 +2217,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
     if (st->mode != MODE_CELT_ONLY)start_band = 17;
 
     if (st->mode == MODE_SILK_ONLY) {
-        ret = (ec_tell(&enc) + 7)>>3;
+        ret = (oaci_ec_tell(&enc) + 7)>>3;
         oaci_ec_enc_done(&enc);
         nb_compr_bytes = ret;
     } else {
@@ -2230,7 +2230,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
             max_celt_bytes = nb_compr_bytes - dred_bytes*3/4;
             /* But try to give CELT at least 5 bytes to prevent a mismatch with
                the redundancy signaling. */
-            max_celt_bytes = IMAX((ec_tell(&enc) + 7)/8 + 5, max_celt_bytes);
+            max_celt_bytes = IMAX((oaci_ec_tell(&enc) + 7)/8 + 5, max_celt_bytes);
             /* Subject to the original max. */
             nb_compr_bytes = IMIN(nb_compr_bytes, max_celt_bytes);
         }
@@ -2303,7 +2303,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
             celt_encoder_ctl(celt_enc, CELT_SET_PREDICTION(0));
         }
         /* If false, we already busted the budget and we'll end up with a "PLC frame" */
-        if (ec_tell(&enc) <= 8*nb_compr_bytes) {
+        if (oaci_ec_tell(&enc) <= 8*nb_compr_bytes) {
             ret = oaci_celt_encode_with_ec(celt_enc, pcm_buf, frame_size, NULL, nb_compr_bytes, &enc);
             if (ret < 0) {
                 RESTORE_STACK;
@@ -2355,7 +2355,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
 
     /* Signalling the mode in the first byte */
     data--;
-    data[0] |= gen_toc(st->mode, st->Fs/frame_size, curr_bandwidth, st->stream_channels);
+    data[0] |= oaci_gen_toc(st->mode, st->Fs/frame_size, curr_bandwidth, st->stream_channels);
 
     st->rangeFinal ^= redundant_rng;
 
@@ -2372,7 +2372,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
     if (st->use_dtx && !st->silk_mode.useDTX) {
         if (decide_dtx_mode(activity, &st->nb_no_activity_ms_Q1, 2*1000*frame_size/st->Fs)) {
             st->rangeFinal = 0;
-            data[0] = gen_toc(st->mode, st->Fs/frame_size, curr_bandwidth, st->stream_channels);
+            data[0] = oaci_gen_toc(st->mode, st->Fs/frame_size, curr_bandwidth, st->stream_channels);
             RESTORE_STACK;
             return 1;
         }
@@ -2382,7 +2382,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
 
     /* In the unlikely case that the SILK encoder busted its target, tell
        the decoder to call the PLC */
-    if (ec_tell(&enc) > (max_data_bytes - 1)*8) {
+    if (oaci_ec_tell(&enc) > (max_data_bytes - 1)*8) {
         if (max_data_bytes < 2) {
             RESTORE_STACK;
             return OAC_BUFFER_TOO_SMALL;
@@ -2611,7 +2611,7 @@ int oac_encoder_ctl(OacEncoder *st, int request, ...) {
             if (!value) {
                 goto bad_arg;
             }
-            *value = user_bitrate_to_bitrate(st, st->prev_framesize, 1276);
+            *value = oaci_user_bitrate_to_bitrate(st, st->prev_framesize, 1276);
         }
         break;
         case OAC_SET_FORCE_CHANNELS_REQUEST:
diff --git a/src/oac_multistream_encoder.c b/src/oac_multistream_encoder.c
index 9efb8e134..106019d41 100644
--- a/src/oac_multistream_encoder.c
+++ b/src/oac_multistream_encoder.c
@@ -67,7 +67,7 @@ static const VorbisLayout vorbis_mappings[8] = {
 # define MAX_OVERLAP 120
 #endif
 
-static oac_val32 *ms_get_preemph_mem(OacMSEncoder *st) {
+static oac_val32 *oaci_ms_get_preemph_mem(OacMSEncoder *st) {
     int s;
     char *ptr;
     int coupled_size, mono_size;
@@ -85,7 +85,7 @@ static oac_val32 *ms_get_preemph_mem(OacMSEncoder *st) {
     return (oac_val32*)(void*)(ptr + st->layout.nb_channels*MAX_OVERLAP*sizeof(oac_val32));
 }
 
-static oac_val32 *ms_get_window_mem(OacMSEncoder *st) {
+static oac_val32 *oaci_ms_get_window_mem(OacMSEncoder *st) {
     int s;
     char *ptr;
     int coupled_size, mono_size;
@@ -103,7 +103,7 @@ static oac_val32 *ms_get_window_mem(OacMSEncoder *st) {
     return (oac_val32*)(void*)ptr;
 }
 
-static int validate_ambisonics(int nb_channels, int *nb_streams, int *nb_coupled_streams) {
+static int oaci_validate_ambisonics(int nb_channels, int *nb_streams, int *nb_coupled_streams) {
     int order_plus_one;
     int acn_channels;
     int nondiegetic_channels;
@@ -177,7 +177,7 @@ static void channel_pos(int channels, int pos[8]) {
 
 #if 1
 /* Computes a rough approximation of log2(2^a + 2^b) */
-static oac_val16 logSum(celt_glog a, celt_glog b) {
+static oac_val16 oaci_logSum(celt_glog a, celt_glog b) {
     celt_glog max;
     celt_glog diff;
     celt_glog frac;
@@ -206,7 +206,7 @@ static oac_val16 logSum(celt_glog a, celt_glog b) {
     return max + diff_table[low] + MULT16_32_Q15(frac, SUB32(diff_table[low + 1], diff_table[low]));
 }
 #else
-oac_val16 logSum(oac_val16 a, oac_val16 b) {
+oac_val16 oaci_logSum(oac_val16 a, oac_val16 b) {
     return log2(pow(4, a) + pow(4, b))/2;
 }
 #endif
@@ -295,14 +295,14 @@ void oaci_surround_analysis(const CELTMode *celt_mode, const void *pcm, celt_glo
             bandLogE[21*c + i] = MAXG(bandLogE[21*c + i], bandLogE[21*c + i + 1] - GCONST(2.f));
         if (pos[c] == 1) {
             for (i = 0; i < 21; i++)
-                maskLogE[0][i] = logSum(maskLogE[0][i], bandLogE[21*c + i]);
+                maskLogE[0][i] = oaci_logSum(maskLogE[0][i], bandLogE[21*c + i]);
         } else if (pos[c] == 3) {
             for (i = 0; i < 21; i++)
-                maskLogE[2][i] = logSum(maskLogE[2][i], bandLogE[21*c + i]);
+                maskLogE[2][i] = oaci_logSum(maskLogE[2][i], bandLogE[21*c + i]);
         } else if (pos[c] == 2) {
             for (i = 0; i < 21; i++) {
-                maskLogE[0][i] = logSum(maskLogE[0][i], bandLogE[21*c + i] - GCONST(.5f));
-                maskLogE[2][i] = logSum(maskLogE[2][i], bandLogE[21*c + i] - GCONST(.5f));
+                maskLogE[0][i] = oaci_logSum(maskLogE[0][i], bandLogE[21*c + i] - GCONST(.5f));
+                maskLogE[2][i] = oaci_logSum(maskLogE[2][i], bandLogE[21*c + i] - GCONST(.5f));
             }
         }
 #if 0
@@ -317,7 +317,7 @@ void oaci_surround_analysis(const CELTMode *celt_mode, const void *pcm, celt_glo
     }
     for (i = 0; i < 21; i++)
         maskLogE[1][i] = MIN32(maskLogE[0][i], maskLogE[2][i]);
-    channel_offset = HALF16(celt_log2(QCONST32(2.f, 14)/(channels - 1)));
+    channel_offset = HALF16(oaci_celt_log2(QCONST32(2.f, 14)/(channels - 1)));
     for (c = 0; c < 3; c++)
         for (i = 0; i < 21; i++)
             maskLogE[c][i] += channel_offset;
@@ -386,7 +386,7 @@ oac_int32 oac_multistream_surround_encoder_get_size(int channels, int mapping_fa
         nb_streams = channels;
         nb_coupled_streams = 0;
     } else if (mapping_family == 2) {
-        if (!validate_ambisonics(channels, &nb_streams, &nb_coupled_streams))
+        if (!oaci_validate_ambisonics(channels, &nb_streams, &nb_coupled_streams))
             return 0;
     } else
         return 0;
@@ -449,7 +449,7 @@ static int oac_multistream_encoder_init_impl(
     if (!validate_encoder_layout(&st->layout))
         return OAC_BAD_ARG;
     if (mapping_type == MAPPING_TYPE_AMBISONICS
-        && !validate_ambisonics(st->layout.nb_channels, NULL, NULL))
+        && !oaci_validate_ambisonics(st->layout.nb_channels, NULL, NULL))
         return OAC_BAD_ARG;
     ptr = (char*)st + align(sizeof(OacMSEncoder));
     for (i = 0; i < st->layout.nb_coupled_streams; i++) {
@@ -467,8 +467,8 @@ static int oac_multistream_encoder_init_impl(
         ptr += align(mono_size);
     }
     if (mapping_type == MAPPING_TYPE_SURROUND) {
-        OAC_CLEAR(ms_get_preemph_mem(st), channels);
-        OAC_CLEAR(ms_get_window_mem(st), channels*MAX_OVERLAP);
+        OAC_CLEAR(oaci_ms_get_preemph_mem(st), channels);
+        OAC_CLEAR(oaci_ms_get_window_mem(st), channels*MAX_OVERLAP);
     }
     st->mapping_type = mapping_type;
     return OAC_OK;
@@ -530,7 +530,7 @@ int oac_multistream_surround_encoder_init(
             mapping[i] = i;
     } else if (mapping_family == 2) {
         int i;
-        if (!validate_ambisonics(channels, streams, coupled_streams))
+        if (!oaci_validate_ambisonics(channels, streams, coupled_streams))
             return OAC_BAD_ARG;
         for (i = 0; i < (*streams - *coupled_streams); i++)
             mapping[i] = i + (*coupled_streams*2);
@@ -791,8 +791,8 @@ int oac_multistream_encode_native
     ALLOC_STACK;
 
     if (st->mapping_type == MAPPING_TYPE_SURROUND) {
-        preemph_mem = ms_get_preemph_mem(st);
-        mem = ms_get_window_mem(st);
+        preemph_mem = oaci_ms_get_preemph_mem(st);
+        mem = oaci_ms_get_window_mem(st);
     }
 
     ptr = (char*)st + align(sizeof(OacMSEncoder));
@@ -1196,8 +1196,8 @@ int oac_multistream_encoder_ctl_va_list(OacMSEncoder *st, int request,
         {
             int s;
             if (st->mapping_type == MAPPING_TYPE_SURROUND) {
-                OAC_CLEAR(ms_get_preemph_mem(st), st->layout.nb_channels);
-                OAC_CLEAR(ms_get_window_mem(st), st->layout.nb_channels*MAX_OVERLAP);
+                OAC_CLEAR(oaci_ms_get_preemph_mem(st), st->layout.nb_channels);
+                OAC_CLEAR(oaci_ms_get_window_mem(st), st->layout.nb_channels*MAX_OVERLAP);
             }
             for (s = 0; s < st->layout.nb_streams; s++) {
                 OacEncoder *enc;
diff --git a/src/oac_projection_decoder.c b/src/oac_projection_decoder.c
index 9b471291e..e5fff3552 100644
--- a/src/oac_projection_decoder.c
+++ b/src/oac_projection_decoder.c
@@ -112,7 +112,7 @@ static MappingMatrix *get_dec_demixing_matrix(OacProjectionDecoder *st) {
                                    + align(sizeof(OacProjectionDecoder)));
 }
 
-static OacMSDecoder *get_multistream_decoder(OacProjectionDecoder *st) {
+static OacMSDecoder *oaci_get_multistream_decoder(OacProjectionDecoder *st) {
     /* void* cast avoids clang -Wcast-align warning */
     return (OacMSDecoder*)(void*)((char*)st
                                   + align(sizeof(OacProjectionDecoder)
@@ -178,7 +178,7 @@ int oac_projection_decoder_init(OacProjectionDecoder *st, oac_int32 Fs,
         mapping[i] = i;
 
     ret = oac_multistream_decoder_init(
-    get_multistream_decoder(st), Fs, channels, streams, coupled_streams, mapping);
+    oaci_get_multistream_decoder(st), Fs, channels, streams, coupled_streams, mapping);
     RESTORE_STACK;
     return ret;
 }
@@ -225,7 +225,7 @@ OacProjectionDecoder *oac_projection_decoder_create(
 int oac_projection_decode(OacProjectionDecoder *st, const unsigned char *data,
                           oac_int32 len, oac_int16 *pcm, int frame_size,
                           int decode_fec) {
-    return oac_multistream_decode_native(get_multistream_decoder(st), data, len,
+    return oac_multistream_decode_native(oaci_get_multistream_decoder(st), data, len,
     pcm, oac_projection_copy_channel_out_short, frame_size, decode_fec, OPTIONAL_CLIP,
     get_dec_demixing_matrix(st));
 }
@@ -233,7 +233,7 @@ int oac_projection_decode(OacProjectionDecoder *st, const unsigned char *data,
 int oac_projection_decode24(OacProjectionDecoder *st, const unsigned char *data,
                             oac_int32 len, oac_int32 *pcm, int frame_size,
                             int decode_fec) {
-    return oac_multistream_decode_native(get_multistream_decoder(st), data, len,
+    return oac_multistream_decode_native(oaci_get_multistream_decoder(st), data, len,
     pcm, oac_projection_copy_channel_out_int24, frame_size, decode_fec, 0,
     get_dec_demixing_matrix(st));
 }
@@ -241,7 +241,7 @@ int oac_projection_decode24(OacProjectionDecoder *st, const unsigned char *data,
 #ifndef DISABLE_FLOAT_API
 int oac_projection_decode_float(OacProjectionDecoder *st, const unsigned char *data,
                                 oac_int32 len, float *pcm, int frame_size, int decode_fec) {
-    return oac_multistream_decode_native(get_multistream_decoder(st), data, len,
+    return oac_multistream_decode_native(oaci_get_multistream_decoder(st), data, len,
     pcm, oac_projection_copy_channel_out_float, frame_size, decode_fec, 0,
     get_dec_demixing_matrix(st));
 }
@@ -252,7 +252,7 @@ int oac_projection_decoder_ctl(OacProjectionDecoder *st, int request, ...) {
     int ret = OAC_OK;
 
     va_start(ap, request);
-    ret = oac_multistream_decoder_ctl_va_list(get_multistream_decoder(st),
+    ret = oac_multistream_decoder_ctl_va_list(oaci_get_multistream_decoder(st),
     request, ap);
     va_end(ap);
     return ret;
diff --git a/src/oac_projection_encoder.c b/src/oac_projection_encoder.c
index 6df632d9f..0a9a76cd0 100644
--- a/src/oac_projection_encoder.c
+++ b/src/oac_projection_encoder.c
@@ -82,7 +82,7 @@ static void oac_projection_copy_channel_in_int24(
         (const oac_int32*)src, src_stride, dst, src_channel, dst_stride, frame_size);
 }
 
-static int get_order_plus_one_from_channels(int channels, int *order_plus_one) {
+static int oaci_get_order_plus_one_from_channels(int channels, int *order_plus_one) {
     int order_plus_one_;
     int acn_channels;
     int nondiegetic_channels;
@@ -108,7 +108,7 @@ static int get_streams_from_channels(int channels, int mapping_family,
                                      int *streams, int *coupled_streams,
                                      int *order_plus_one) {
     if (mapping_family == 3) {
-        if (get_order_plus_one_from_channels(channels, order_plus_one) != OAC_OK)
+        if (oaci_get_order_plus_one_from_channels(channels, order_plus_one) != OAC_OK)
             return OAC_BAD_ARG;
         if (streams)
             *streams = (channels + 1)/2;
@@ -132,7 +132,7 @@ static MappingMatrix *get_enc_demixing_matrix(OacProjectionEncoder *st) {
                                         + st->mixing_matrix_size_in_bytes));
 }
 
-static OacMSEncoder *get_multistream_encoder(OacProjectionEncoder *st) {
+static OacMSEncoder *oaci_get_multistream_encoder(OacProjectionEncoder *st) {
     /* void* cast avoids clang -Wcast-align warning */
     return (OacMSEncoder *)(void*)((char*)st
                                    + align(sizeof(OacProjectionEncoder)
@@ -308,7 +308,7 @@ int oac_projection_ambisonics_encoder_init(OacProjectionEncoder *st, oac_int32 F
         mapping[i] = i;
 
     /* Initialize multistream encoder with provided settings. */
-    ms_encoder = get_multistream_encoder(st);
+    ms_encoder = oaci_get_multistream_encoder(st);
     ret = oac_multistream_encoder_init(ms_encoder, Fs, channels, *streams,
                                       *coupled_streams, mapping, application);
     return ret;
@@ -350,7 +350,7 @@ OacProjectionEncoder *oac_projection_ambisonics_encoder_create(
 int oac_projection_encode(OacProjectionEncoder *st, const oac_int16 *pcm,
                           int frame_size, unsigned char *data,
                           oac_int32 max_data_bytes) {
-    return oac_multistream_encode_native(get_multistream_encoder(st),
+    return oac_multistream_encode_native(oaci_get_multistream_encoder(st),
     oac_projection_copy_channel_in_short, pcm, frame_size, data,
     max_data_bytes, 16, oaci_downmix_int, 0, get_mixing_matrix(st));
 }
@@ -358,7 +358,7 @@ int oac_projection_encode(OacProjectionEncoder *st, const oac_int16 *pcm,
 int oac_projection_encode24(OacProjectionEncoder *st, const oac_int32 *pcm,
                             int frame_size, unsigned char *data,
                             oac_int32 max_data_bytes) {
-    return oac_multistream_encode_native(get_multistream_encoder(st),
+    return oac_multistream_encode_native(oaci_get_multistream_encoder(st),
     oac_projection_copy_channel_in_int24, pcm, frame_size, data,
     max_data_bytes, MAX_ENCODING_DEPTH, oaci_downmix_int, 0, get_mixing_matrix(st));
 }
@@ -367,7 +367,7 @@ int oac_projection_encode24(OacProjectionEncoder *st, const oac_int32 *pcm,
 int oac_projection_encode_float(OacProjectionEncoder *st, const float *pcm,
                                 int frame_size, unsigned char *data,
                                 oac_int32 max_data_bytes) {
-    return oac_multistream_encode_native(get_multistream_encoder(st),
+    return oac_multistream_encode_native(oaci_get_multistream_encoder(st),
     oac_projection_copy_channel_in_float, pcm, frame_size, data,
     max_data_bytes, MAX_ENCODING_DEPTH, oaci_downmix_float, 1, get_mixing_matrix(st));
 }
@@ -383,7 +383,7 @@ int oac_projection_encoder_ctl(OacProjectionEncoder *st, int request, ...) {
     OacMSEncoder *ms_encoder;
     int ret = OAC_OK;
 
-    ms_encoder = get_multistream_encoder(st);
+    ms_encoder = oaci_get_multistream_encoder(st);
     demixing_matrix = get_enc_demixing_matrix(st);
 
     va_start(ap, request);

From dc3d2f2748fb58a72a3423ef7fd19064b8d150f1 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jeanmarcv@google.com>
Date: Mon, 26 Jan 2026 17:14:34 -0500
Subject: [PATCH 22/28] Rename more static symbols that are often inlined

---
 celt/arch.h                               |  8 +-
 celt/bands.c                              | 30 +++----
 celt/celt.h                               |  8 +-
 celt/celt_decoder.c                       |  6 +-
 celt/celt_encoder.c                       | 12 +--
 celt/cwrs.c                               | 16 ++--
 celt/entcode.h                            | 14 ++--
 celt/entdec.c                             |  2 +-
 celt/entenc.c                             |  2 +-
 celt/float_cast.h                         | 20 ++---
 celt/kiss_fft.c                           |  4 +-
 celt/laplace.c                            |  2 +-
 celt/mathops.h                            | 10 +--
 celt/mini_kfft.c                          |  4 +-
 celt/pitch.c                              |  8 +-
 celt/quant_bands.c                        |  6 +-
 celt/rate.c                               |  6 +-
 celt/tests/test_unit_cwrs32.c             | 10 +--
 celt/tests/test_unit_entropy.c            | 14 ++--
 celt/tests/test_unit_laplace.c            |  2 +-
 celt/tests/test_unit_mathops.c            | 22 ++---
 celt/vq.c                                 |  8 +-
 celt/x86/x86cpu.c                         | 10 +--
 dnn/dred_compare.c                        |  4 +-
 dnn/dred_encoder.c                        | 10 +--
 dnn/dump_data.c                           | 12 +--
 dnn/fargan_demo.c                         |  2 +-
 dnn/freq.c                                |  4 +-
 dnn/lpcnet_enc.c                          |  8 +-
 dnn/nndsp.c                               |  4 +-
 dnn/nnet_arch.h                           |  4 +-
 dnn/osce.c                                |  6 +-
 dnn/osce_features.c                       |  4 +-
 dnn/parse_lpcnet_weights.c                |  4 +-
 dnn/vec_avx.h                             | 22 ++---
 dnn/vec_neon.h                            |  6 +-
 silk/CNG.c                                |  4 +-
 silk/Inlines.h                            |  4 +-
 silk/LPC_inv_pred_gain.c                  |  6 +-
 silk/NSQ.c                                |  8 +-
 silk/NSQ.h                                |  2 +-
 silk/NSQ_del_dec.c                        |  8 +-
 silk/PLC.c                                |  8 +-
 silk/SigProc_FIX.h                        |  2 +-
 silk/VAD.c                                |  6 +-
 silk/arm/LPC_inv_pred_gain_neon_intr.c    |  2 +-
 silk/arm/NSQ_del_dec_neon_intr.c          |  8 +-
 silk/arm/NSQ_neon.h                       | 12 +--
 silk/control_codec.c                      | 20 ++---
 silk/decode_core.c                        |  2 +-
 silk/enc_API.c                            |  6 +-
 silk/encode_pulses.c                      | 10 +--
 silk/fixed/burg_modified_FIX.c            |  2 +-
 silk/fixed/encode_frame_FIX.c             |  6 +-
 silk/fixed/noise_shape_analysis_FIX.c     | 12 +--
 silk/fixed/pitch_analysis_core_FIX.c      | 12 +--
 silk/fixed/process_gains_FIX.c            |  6 +-
 silk/fixed/x86/burg_modified_FIX_sse4_1.c |  2 +-
 silk/float/LPC_analysis_filter_FLP.c      | 20 ++---
 silk/float/SigProc_FLP.h                  | 10 +--
 silk/float/encode_frame_FLP.c             |  8 +-
 silk/float/noise_shape_analysis_FLP.c     | 16 ++--
 silk/float/pitch_analysis_core_FLP.c      | 22 ++---
 silk/float/process_gains_FLP.c            |  2 +-
 silk/resampler_private_IIR_FIR.c          |  4 +-
 silk/stereo_find_predictor.c              |  4 +-
 silk/x86/NSQ_del_dec_avx2.c               | 50 ++++++------
 silk/x86/NSQ_del_dec_sse4_1.c             |  2 +-
 silk/x86/NSQ_sse4_1.c                     |  8 +-
 silk/x86/VAD_sse4_1.c                     |  6 +-
 src/analysis.c                            | 12 +--
 src/extensions.c                          |  4 +-
 src/mapping_matrix.c                      |  8 +-
 src/oac_decoder.c                         |  8 +-
 src/oac_encoder.c                         | 70 ++++++++--------
 src/oac_multistream_decoder.c             | 38 ++++-----
 src/oac_multistream_encoder.c             | 98 +++++++++++------------
 src/oac_private.h                         |  2 +-
 src/oac_projection_decoder.c              | 20 ++---
 src/oac_projection_encoder.c              | 36 ++++-----
 80 files changed, 455 insertions(+), 455 deletions(-)

diff --git a/celt/arch.h b/celt/arch.h
index b0a59f959..e7c486383 100644
--- a/celt/arch.h
+++ b/celt/arch.h
@@ -172,7 +172,7 @@ typedef oac_val32 celt_coef;
 # define MULT_COEF_TAPS(a, b) SHL32(MULT16_16(a, b), 1)
 # define COEF2VAL16(x) EXTRACT16(SHR32(x, 16))
 
-# define celt_isnan(x) 0
+# define oaci_celt_isnan(x) 0
 
 # define Q15ONE 32767
 # define Q31ONE 2147483647
@@ -243,7 +243,7 @@ typedef float celt_coef;
 # ifdef FLOAT_APPROX
 /* This code should reliably detect NaN/inf even when -ffast-math is used.
    Assumes IEEE 754 format. */
-static OAC_INLINE int celt_isnan(float x) {
+static OAC_INLINE int oaci_celt_isnan(float x) {
     union {float f; oac_uint32 i;} in;
     in.f = x;
     return ((in.i>>23)&0xFF) == 0xFF && (in.i&0x007FFFFF) != 0;
@@ -253,7 +253,7 @@ static OAC_INLINE int celt_isnan(float x) {
 #   error \
     Cannot build liboac with -ffast-math unless FLOAT_APPROX is defined. This could result in crashes on extreme (e.g. NaN) input
 #  endif
-#  define celt_isnan(x) ((x) != (x))
+#  define oaci_celt_isnan(x) ((x) != (x))
 # endif
 
 # define Q15ONE 1.0f
@@ -345,7 +345,7 @@ static OAC_INLINE int celt_isnan(float x) {
 
 # define SIG2RES(a)      ((1/CELT_SIG_SCALE)*(a))
 # define RES2INT16(a)    FLOAT2INT16(a)
-# define RES2INT24(a)    float2int(32768.f*256.f*(a))
+# define RES2INT24(a)    oaci_float2int(32768.f*256.f*(a))
 # define RES2FLOAT(a)    (a)
 # define INT16TORES(a)   ((a)*(1/CELT_SIG_SCALE))
 # define INT24TORES(a)   ((1.f/32768.f/256.f)*(a))
diff --git a/celt/bands.c b/celt/bands.c
index 6774c6e81..47cc0c864 100644
--- a/celt/bands.c
+++ b/celt/bands.c
@@ -257,7 +257,7 @@ void oaci_anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collaps
         N0 = m->eBands[i + 1] - m->eBands[i];
         /* depth in 1/8 bits */
         celt_sig_assert(pulses[i] >= 0);
-        depth = celt_udiv(1 + pulses[i], (m->eBands[i + 1] - m->eBands[i]))>>LM;
+        depth = oaci_celt_udiv(1 + pulses[i], (m->eBands[i + 1] - m->eBands[i]))>>LM;
 
 #ifdef FIXED_POINT
         thresh32 = SHR32(oaci_celt_exp2(-SHL16(depth, 10 - BITRES)), 1);
@@ -475,7 +475,7 @@ int oaci_spreading_decision(const CELTMode *m, const celt_norm *X, int *average,
 
             /* Only include four last bands (8 kHz and up) */
             if (i > m->nbEBands - 4)
-                hf_sum += celt_udiv(32*(tcount[1] + tcount[0]), N);
+                hf_sum += oaci_celt_udiv(32*(tcount[1] + tcount[0]), N);
             tmp = (2*tcount[2] >= N) + (2*tcount[1] >= N) + (2*tcount[0] >= N);
             sum += tmp*spread_weight[i];
             nbBands += spread_weight[i];
@@ -484,7 +484,7 @@ int oaci_spreading_decision(const CELTMode *m, const celt_norm *X, int *average,
 
     if (update_hf) {
         if (hf_sum)
-            hf_sum = celt_udiv(hf_sum, C*(4 - m->nbEBands + end));
+            hf_sum = oaci_celt_udiv(hf_sum, C*(4 - m->nbEBands + end));
         *hf_average = (*hf_average + hf_sum)>>1;
         hf_sum = *hf_average;
         if (*tapset_decision == 2)
@@ -501,7 +501,7 @@ int oaci_spreading_decision(const CELTMode *m, const celt_norm *X, int *average,
     /*printf("%d %d %d\n", hf_sum, *hf_average, *tapset_decision);*/
     celt_assert(nbBands > 0); /* end has to be non-zero */
     celt_assert(sum >= 0);
-    sum = celt_udiv((oac_int32)sum<<8, nbBands);
+    sum = oaci_celt_udiv((oac_int32)sum<<8, nbBands);
     /* Recursive averaging */
     sum = (sum + *average)>>1;
     *average = sum;
@@ -601,7 +601,7 @@ static int oaci_compute_qn(int N, int b, int offset, int pulse_cap, int stereo)
     /* The upper limit ensures that in a stereo split with itheta==16384, we'll
         always have enough bits left over to code at least one pulse in the
         side; otherwise it would collapse, since it doesn't get folded. */
-    qb = celt_sudiv(b + N2*offset, N2);
+    qb = oaci_celt_sudiv(b + N2*offset, N2);
     qb = IMIN(b - pulse_cap - (4<<BITRES), qb);
 
     qb = IMIN(8<<BITRES, qb);
@@ -694,7 +694,7 @@ static void oaci_compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
                     /* Check if the selected value of theta will cause the bit allocation
                        to inject noise on one side. If so, make sure the energy of that side
                        is zero. */
-                    int unquantized = celt_udiv((oac_int32)itheta*16384, qn);
+                    int unquantized = oaci_celt_udiv((oac_int32)itheta*16384, qn);
                     imid = oaci_bitexact_cos((oac_int16)unquantized);
                     iside = oaci_bitexact_cos((oac_int16)(16384 - unquantized));
                     delta = FRAC_MUL16((N - 1)<<7, oaci_bitexact_log2tan(iside, imid));
@@ -773,7 +773,7 @@ static void oaci_compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
             }
         }
         celt_assert(itheta >= 0);
-        itheta = celt_udiv((oac_int32)itheta*16384, qn);
+        itheta = oaci_celt_udiv((oac_int32)itheta*16384, qn);
         itheta_q30 = (oac_int32)itheta<<16;
         if (encode && stereo) {
             if (itheta == 0)
@@ -921,8 +921,8 @@ static unsigned oaci_quant_partition(struct band_ctx *ctx, celt_norm *X,
         mid = oaci_celt_cos_norm32(sctx.itheta_q30);
         side = oaci_celt_cos_norm32((1<<30) - sctx.itheta_q30);
 #else
-        mid = celt_cos_norm2(sctx.itheta_q30*(1.f/(1<<30)));
-        side = celt_cos_norm2(1.f - sctx.itheta_q30*(1.f/(1<<30)));
+        mid = oaci_celt_cos_norm2(sctx.itheta_q30*(1.f/(1<<30)));
+        side = oaci_celt_cos_norm2(1.f - sctx.itheta_q30*(1.f/(1<<30)));
 #endif
 
         /* Give more bits to low-energy MDCTs than they would otherwise deserve */
@@ -1070,8 +1070,8 @@ unsigned oaci_cubic_quant_partition(struct band_ctx *ctx, celt_norm *X, int N, i
         g1 = oaci_celt_cos_norm32(itheta_q30);
         g2 = oaci_celt_cos_norm32((1<<30) - itheta_q30);
 #else
-        g1 = celt_cos_norm2(itheta_q30*(1.f/(1<<30)));
-        g2 = celt_cos_norm2(1.f - itheta_q30*(1.f/(1<<30)));
+        g1 = oaci_celt_cos_norm2(itheta_q30*(1.f/(1<<30)));
+        g2 = oaci_celt_cos_norm2(1.f - itheta_q30*(1.f/(1<<30)));
 #endif
         if (itheta_q30 == 0) {
             b1 = b;
@@ -1111,7 +1111,7 @@ static unsigned oaci_quant_band(struct band_ctx *ctx, celt_norm *X,
 
     longBlocks = B0 == 1;
 
-    N_B = celt_udiv(N_B, B);
+    N_B = oaci_celt_udiv(N_B, B);
 
     /* Special case for one sample */
     if (N == 1) {
@@ -1254,8 +1254,8 @@ static unsigned oaci_quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_
     mid = oaci_celt_cos_norm32(sctx.itheta_q30);
     side = oaci_celt_cos_norm32((1<<30) - sctx.itheta_q30);
 #else
-    mid = celt_cos_norm2(sctx.itheta_q30*(1.f/(1<<30)));
-    side = celt_cos_norm2(1.f - sctx.itheta_q30*(1.f/(1<<30)));
+    mid = oaci_celt_cos_norm2(sctx.itheta_q30*(1.f/(1<<30)));
+    side = oaci_celt_cos_norm2(1.f - sctx.itheta_q30*(1.f/(1<<30)));
 #endif
 
     /* This is a special case for N=2 that only works for stereo and takes
@@ -1477,7 +1477,7 @@ void oaci_quant_all_bands(int encode, const CELTMode *m, int start, int end,
         remaining_bits = total_bits - tell;
         ctx.total_bits = total_bits;
         if (i <= codedBands - 1) {
-            curr_balance = celt_sudiv(balance, IMIN(3, codedBands - i));
+            curr_balance = oaci_celt_sudiv(balance, IMIN(3, codedBands - i));
             b = IMAX(0, IMIN(16383, IMIN(remaining_bits, pulses[i] + curr_balance)));
         } else {
             b = 0;
diff --git a/celt/celt.h b/celt/celt.h
index 9fe340e60..bcfd52125 100644
--- a/celt/celt.h
+++ b/celt/celt.h
@@ -135,11 +135,11 @@ typedef struct {
 #define CELT_SET_SILK_INFO(x) CELT_SET_SILK_INFO_REQUEST, celt_check_silkinfo_ptr(x)
 
 
-static OAC_INLINE oac_int32 bits_to_bitrate(oac_int32 bits, oac_int32 Fs, oac_int32 frame_size) {
+static OAC_INLINE oac_int32 oaci_bits_to_bitrate(oac_int32 bits, oac_int32 Fs, oac_int32 frame_size) {
     return bits*(6*Fs/frame_size)/6;
 }
 
-static OAC_INLINE oac_int32 bitrate_to_bits(oac_int32 bitrate, oac_int32 Fs, oac_int32 frame_size) {
+static OAC_INLINE oac_int32 oaci_bitrate_to_bits(oac_int32 bitrate, oac_int32 Fs, oac_int32 frame_size) {
     return bitrate*6/(6*Fs/frame_size);
 }
 
@@ -204,7 +204,7 @@ static const unsigned char fromOacTable[16] = {
     0x00, 0x08, 0x10, 0x18
 };
 
-static OAC_INLINE int toOac(unsigned char c) {
+static OAC_INLINE int oaci_toOac(unsigned char c) {
     int ret = 0;
     if (c < 0xA0)
         ret = toOacTable[c>>3];
@@ -214,7 +214,7 @@ static OAC_INLINE int toOac(unsigned char c) {
         return ret|(c&0x7);
 }
 
-static OAC_INLINE int fromOac(unsigned char c) {
+static OAC_INLINE int oaci_fromOac(unsigned char c) {
     if (c < 0x80)
         return -1;
     else
diff --git a/celt/celt_decoder.c b/celt/celt_decoder.c
index c5785bef4..e30f08af3 100644
--- a/celt/celt_decoder.c
+++ b/celt/celt_decoder.c
@@ -594,7 +594,7 @@ void oaci_update_plc_state(LPCNetPLCState *lpcnet, celt_sig *decode_mem[2], floa
         for (j = 0; j < SINC_ORDER + 1; j++) {
             sum += buf48k[3*i + j + offset]*sinc_filter[j];
         }
-        buf16k[i] = float2int(MIN32(32767.f, MAX32(-32767.f, sum)));
+        buf16k[i] = oaci_float2int(MIN32(32767.f, MAX32(-32767.f, sum)));
     }
     tmp_read_post = lpcnet->fec_read_pos;
     tmp_fec_skip = lpcnet->fec_skip;
@@ -1093,7 +1093,7 @@ int oaci_celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned
         if (mode->Fs == 48000 && mode->shortMdctSize == 120)
 # endif
         {
-            data0 = fromOac(data0);
+            data0 = oaci_fromOac(data0);
             if (data0 < 0)
                 return OAC_INVALID_PACKET;
         }
@@ -1424,7 +1424,7 @@ int oaci_celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned
     RESTORE_STACK;
     if (oaci_ec_tell(dec) > 8*len)
         return OAC_INTERNAL_ERROR;
-    if (ec_get_error(dec))
+    if (oaci_ec_get_error(dec))
         st->error = 1;
     return frame_size/st->downsample;
 }
diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c
index 7db749794..993b92641 100644
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -401,8 +401,8 @@ static int oaci_transient_analysis(const oac_val32 * OAC_RESTRICT in, int len, i
            before it does any damage later on. If these asserts are disabled (no hardening), then the table
            lookup a few lines below (id = ...) is likely to crash dur to an out-of-bounds read. DO NOT FIX
            that crash on NaN since it could result in a worse issue later on. */
-        celt_assert(!celt_isnan(tmp[0]));
-        celt_assert(!celt_isnan(norm));
+        celt_assert(!oaci_celt_isnan(tmp[0]));
+        celt_assert(!oaci_celt_isnan(norm));
         for (i = 12; i < len2 - 5; i += 4) {
             int id;
 #ifdef FIXED_POINT
@@ -1757,7 +1757,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
         if (mode->Fs == 48000 && mode->shortMdctSize == 120)
 # endif
         {
-            int c0 = toOac(compressed[0]);
+            int c0 = oaci_toOac(compressed[0]);
             if (c0 < 0) {
                 RESTORE_STACK;
                 return OAC_BAD_ARG;
@@ -1775,7 +1775,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
     nbCompressedBytes = IMIN(nbCompressedBytes, packet_size_cap);
 
     if (st->vbr && st->bitrate != OAC_BITRATE_MAX) {
-        vbr_rate = bitrate_to_bits(st->bitrate, mode->Fs, frame_size)<<BITRES;
+        vbr_rate = oaci_bitrate_to_bits(st->bitrate, mode->Fs, frame_size)<<BITRES;
 #if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
         if (st->signalling)
             vbr_rate -= 8<<BITRES;
@@ -1948,7 +1948,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
     oaci_compute_mdcts(mode, shortBlocks, in, freq, C, CC, LM, st->upsample, st->arch);
     /* This should catch any NaN in the CELT input. Since we're not supposed to see any (they're filtered
        at the Oac layer), just abort. */
-    celt_assert(!celt_isnan(freq[0]) && (C == 1 || !celt_isnan(freq[N])));
+    celt_assert(!oaci_celt_isnan(freq[0]) && (C == 1 || !oaci_celt_isnan(freq[N])));
     if (CC == 2 && C == 1)
         tf_chan = 0;
     oaci_compute_band_energies(mode, freq, bandE, effEnd, C, LM, st->arch);
@@ -2518,7 +2518,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
 #endif
 
     RESTORE_STACK;
-    if (ec_get_error(enc))
+    if (oaci_ec_get_error(enc))
         return OAC_INTERNAL_ERROR;
     else
         return nbCompressedBytes;
diff --git a/celt/cwrs.c b/celt/cwrs.c
index d0d1c1c91..545ecdf9f 100644
--- a/celt/cwrs.c
+++ b/celt/cwrs.c
@@ -439,7 +439,7 @@ void oaci_get_required_bits(oac_int16 *_bits, int _n, int _maxk, int _frac) {
 }
 # endif
 
-static oac_uint32 icwrs(int _n, const int *_y) {
+static oac_uint32 oaci_icwrs(int _n, const int *_y) {
     oac_uint32 i;
     int j;
     int k;
@@ -458,10 +458,10 @@ static oac_uint32 icwrs(int _n, const int *_y) {
 
 void oaci_encode_pulses(const int *_y, int _n, int _k, ec_enc *_enc) {
     celt_assert(_k > 0);
-    oaci_ec_enc_uint(_enc, icwrs(_n, _y), CELT_PVQ_V(_n, _k));
+    oaci_ec_enc_uint(_enc, oaci_icwrs(_n, _y), CELT_PVQ_V(_n, _k));
 }
 
-static oac_val32 cwrsi(int _n, int _k, oac_uint32 _i, int *_y) {
+static oac_val32 oaci_cwrsi(int _n, int _k, oac_uint32 _i, int *_y) {
     oac_uint32 p;
     int s;
     int k0;
@@ -536,7 +536,7 @@ static oac_val32 cwrsi(int _n, int _k, oac_uint32 _i, int *_y) {
 }
 
 oac_val32 oaci_decode_pulses(int *_y, int _n, int _k, ec_dec *_dec) {
-    return cwrsi(_n, _k, oaci_ec_dec_uint(_dec, CELT_PVQ_V(_n, _k)), _y);
+    return oaci_cwrsi(_n, _k, oaci_ec_dec_uint(_dec, CELT_PVQ_V(_n, _k)), _y);
 }
 
 #else /* SMALL_FOOTPRINT */
@@ -601,7 +601,7 @@ static oac_uint32 oaci_ncwrs_urow(unsigned _n, unsigned _k, oac_uint32 *_u) {
    _y: Returns the vector of pulses.
    _u: Must contain entries [0..._k+1] of row _n of U() on input.
       Its contents will be destructively modified.*/
-static oac_val32 cwrsi(int _n, int _k, oac_uint32 _i, int *_y, oac_uint32 *_u) {
+static oac_val32 oaci_cwrsi(int _n, int _k, oac_uint32 _i, int *_y, oac_uint32 *_u) {
     int j;
     oac_int16 val;
     oac_val32 yy = 0;
@@ -640,7 +640,7 @@ static OAC_INLINE oac_uint32 icwrs1(const int *_y, int *_k) {
    of size _n with associated sign bits.
    _y:  The vector of pulses, whose sum of absolute values must be _k.
    _nc: Returns V(_n,_k).*/
-static OAC_INLINE oac_uint32 icwrs(int _n, int _k, oac_uint32 *_nc, const int *_y,
+static OAC_INLINE oac_uint32 oaci_icwrs(int _n, int _k, oac_uint32 *_nc, const int *_y,
                                    oac_uint32 *_u) {
     oac_uint32 i;
     int j;
@@ -692,7 +692,7 @@ void oaci_encode_pulses(const int *_y, int _n, int _k, ec_enc *_enc) {
     SAVE_STACK;
     celt_assert(_k > 0);
     ALLOC(u, _k + 2U, oac_uint32);
-    i = icwrs(_n, _k, &nc, _y, u);
+    i = oaci_icwrs(_n, _k, &nc, _y, u);
     oaci_ec_enc_uint(_enc, i, nc);
     RESTORE_STACK;
 }
@@ -703,7 +703,7 @@ oac_val32 oaci_decode_pulses(int *_y, int _n, int _k, ec_dec *_dec) {
     SAVE_STACK;
     celt_assert(_k > 0);
     ALLOC(u, _k + 2U, oac_uint32);
-    ret = cwrsi(_n, _k, oaci_ec_dec_uint(_dec, oaci_ncwrs_urow(_n, _k, u)), _y, u);
+    ret = oaci_cwrsi(_n, _k, oaci_ec_dec_uint(_dec, oaci_ncwrs_urow(_n, _k, u)), _y, u);
     RESTORE_STACK;
     return ret;
 }
diff --git a/celt/entcode.h b/celt/entcode.h
index 6a5179352..8a9d5141d 100644
--- a/celt/entcode.h
+++ b/celt/entcode.h
@@ -90,15 +90,15 @@ struct ec_ctx {
     int error;
 };
 
-static OAC_INLINE oac_uint32 ec_range_bytes(ec_ctx *_this) {
+static OAC_INLINE oac_uint32 oaci_ec_range_bytes(ec_ctx *_this) {
     return _this->offs;
 }
 
-static OAC_INLINE unsigned char *ec_get_buffer(ec_ctx *_this) {
+static OAC_INLINE unsigned char *oaci_ec_get_buffer(ec_ctx *_this) {
     return _this->buf;
 }
 
-static OAC_INLINE int ec_get_error(ec_ctx *_this) {
+static OAC_INLINE int oaci_ec_get_error(ec_ctx *_this) {
     return _this->error;
 }
 
@@ -121,7 +121,7 @@ static OAC_INLINE int oaci_ec_tell(ec_ctx *_this) {
 oac_uint32 oaci_ec_tell_frac(ec_ctx *_this);
 
 /* Tested exhaustively for all n and for 1<=d<=256 */
-static OAC_INLINE oac_uint32 celt_udiv(oac_uint32 n, oac_uint32 d) {
+static OAC_INLINE oac_uint32 oaci_celt_udiv(oac_uint32 n, oac_uint32 d) {
     celt_sig_assert(d > 0);
 # ifdef USE_SMALL_DIV_TABLE
     if (d > 256)
@@ -137,13 +137,13 @@ static OAC_INLINE oac_uint32 celt_udiv(oac_uint32 n, oac_uint32 d) {
 # endif
 }
 
-static OAC_INLINE oac_int32 celt_sudiv(oac_int32 n, oac_int32 d) {
+static OAC_INLINE oac_int32 oaci_celt_sudiv(oac_int32 n, oac_int32 d) {
     celt_sig_assert(d > 0);
 # ifdef USE_SMALL_DIV_TABLE
     if (n < 0)
-        return -(oac_int32)celt_udiv(-n, d);
+        return -(oac_int32)oaci_celt_udiv(-n, d);
     else
-        return celt_udiv(n, d);
+        return oaci_celt_udiv(n, d);
 # else
     return n/d;
 # endif
diff --git a/celt/entdec.c b/celt/entdec.c
index 8add976a6..06a347956 100644
--- a/celt/entdec.c
+++ b/celt/entdec.c
@@ -138,7 +138,7 @@ void oaci_ec_dec_init(ec_dec *_this, unsigned char *_buf, oac_uint32 _storage) {
 
 unsigned oaci_ec_decode(ec_dec *_this, unsigned _ft) {
     unsigned s;
-    _this->ext = celt_udiv(_this->rng, _ft);
+    _this->ext = oaci_celt_udiv(_this->rng, _ft);
     s = (unsigned)(_this->val/_this->ext);
     return _ft - EC_MINI(s + 1, _ft);
 }
diff --git a/celt/entenc.c b/celt/entenc.c
index e1958fc58..d796dcca3 100644
--- a/celt/entenc.c
+++ b/celt/entenc.c
@@ -126,7 +126,7 @@ void oaci_ec_enc_init(ec_enc *_this, unsigned char *_buf, oac_uint32 _size) {
 
 void oaci_ec_encode(ec_enc *_this, unsigned _fl, unsigned _fh, unsigned _ft) {
     oac_uint32 r;
-    r = celt_udiv(_this->rng, _ft);
+    r = oaci_celt_udiv(_this->rng, _ft);
     if (_fl > 0) {
         _this->val += _this->rng - IMUL32(r, (_ft - _fl));
         _this->rng = IMUL32(r, (_fh - _fl));
diff --git a/celt/float_cast.h b/celt/float_cast.h
index ba159654b..b1101bc9c 100644
--- a/celt/float_cast.h
+++ b/celt/float_cast.h
@@ -65,14 +65,14 @@
 #if defined(__GNUC__) && defined(__SSE__)
 
 # include <xmmintrin.h>
-static OAC_INLINE oac_int32 float2int(float x) {
+static OAC_INLINE oac_int32 oaci_float2int(float x) {
     return _mm_cvt_ss2si(_mm_set_ss(x));
 }
 
 #elif (defined(_MSC_VER) && _MSC_VER >= 1400) && (defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP >= 1))
 
 # include <xmmintrin.h>
-static OAC_INLINE oac_int32 float2int(float value) {
+static OAC_INLINE oac_int32 oaci_float2int(float value) {
     /* _mm_load_ss will generate same code as _mm_set_ss
     ** in _MSC_VER >= 1914 /02 so keep __mm_load__ss
     ** for backward compatibility.
@@ -88,7 +88,7 @@ static OAC_INLINE oac_int32 float2int(float value) {
 **      Therefore implement OAC_INLINE versions of these functions here.
 */
 
-static OAC_INLINE oac_int32 float2int (float flt)                             {
+static OAC_INLINE oac_int32 oaci_float2int (float flt)                             {
     int intgr;
 
     _asm
@@ -101,7 +101,7 @@ static OAC_INLINE oac_int32 float2int (float flt)                             {
 #elif defined(__aarch64__)
 
 # include <arm_neon.h>
-static OAC_INLINE oac_int32 float2int(float flt) {
+static OAC_INLINE oac_int32 oaci_float2int(float flt) {
     return vcvtns_s32_f32(flt);
 }
 
@@ -121,7 +121,7 @@ static OAC_INLINE oac_int32 float2int(float flt) {
 # define __USE_ISOC99 1
 
 # include <math.h>
-# define float2int(x) lrintf(x)
+# define oaci_float2int(x) lrintf(x)
 
 #elif defined(HAVE_LRINT) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
@@ -132,7 +132,7 @@ static OAC_INLINE oac_int32 float2int(float flt) {
 # define __USE_ISOC99 1
 
 # include <math.h>
-# define float2int(x) lrint(x)
+# define oaci_float2int(x) lrint(x)
 
 #else
 
@@ -142,7 +142,7 @@ static OAC_INLINE oac_int32 float2int(float flt) {
 #  warning "Replacing these functions with a standard C cast."
 # endif /* __STDC_VERSION__ >= 199901L */
 # include <math.h>
-# define float2int(flt) ((int)(floor(.5 + flt)))
+# define oaci_float2int(flt) ((int)(floor(.5 + flt)))
 #endif
 
 #ifndef DISABLE_FLOAT_API
@@ -150,21 +150,21 @@ static OAC_INLINE oac_int16 FLOAT2INT16(float x) {
     x = x*CELT_SIG_SCALE;
     x = MAX32(x, -32768);
     x = MIN32(x, 32767);
-    return (oac_int16)float2int(x);
+    return (oac_int16)oaci_float2int(x);
 }
 
 static OAC_INLINE oac_int32 FLOAT2INT24(float x) {
     x = x*(CELT_SIG_SCALE*256.f);
     x = MAX32(x, -16777216);
     x = MIN32(x, 16777216);
-    return float2int(x);
+    return oaci_float2int(x);
 }
 # ifdef FIXED_POINT
 static OAC_INLINE oac_int32 FLOAT2SIG(float x) {
     x = x*((oac_int32)32768<<SIG_SHIFT);
     x = MAX32(x, -(65536<<SIG_SHIFT));
     x = MIN32(x, 65536<<SIG_SHIFT);
-    return float2int(x);
+    return oaci_float2int(x);
 }
 # endif
 #endif /* DISABLE_FLOAT_API */
diff --git a/celt/kiss_fft.c b/celt/kiss_fft.c
index ef14aa5f1..58a41629a 100644
--- a/celt/kiss_fft.c
+++ b/celt/kiss_fft.c
@@ -336,7 +336,7 @@ void oaci_compute_bitrev_table(
     p[i] * m[i] = m[i-1]
     m0 = n                  */
 static
-int kf_factor(int n, oac_int16 * facbuf) {
+int oaci_kf_factor(int n, oac_int16 * facbuf) {
     int p = 4;
     int i;
     int stages = 0;
@@ -452,7 +452,7 @@ kiss_fft_state *oac_fft_alloc_twiddles(int nfft, void * mem, size_t * lenmem,
             oaci_compute_twiddles(twiddles, nfft);
             st->shift = -1;
         }
-        if (!kf_factor(nfft, st->factors)) {
+        if (!oaci_kf_factor(nfft, st->factors)) {
             goto fail;
         }
 
diff --git a/celt/laplace.c b/celt/laplace.c
index 6d03a9d5f..53ed89afb 100644
--- a/celt/laplace.c
+++ b/celt/laplace.c
@@ -204,7 +204,7 @@ int main() {
 
     oaci_ec_enc_done(&enc);
 
-    oaci_ec_dec_init(&dec, ec_get_buffer(&enc), ec_range_bytes(&enc));
+    oaci_ec_dec_init(&dec, oaci_ec_get_buffer(&enc), oaci_ec_range_bytes(&enc));
 
     for (i = 0; i < NB_VALS; i++) {
         val[i] = oaci_ec_laplace_decode_p0(&dec, p0, decay);
diff --git a/celt/mathops.h b/celt/mathops.h
index 45fbc8287..5a030fdf9 100644
--- a/celt/mathops.h
+++ b/celt/mathops.h
@@ -57,7 +57,7 @@ unsigned oaci_isqrt32(oac_uint32 _val);
 # define cB 0.67848403f
 # define cC 0.08595542f
 # define cE ((float)PI/2)
-static OAC_INLINE float fast_atan2f(float y, float x) {
+static OAC_INLINE float oaci_fast_atan2f(float y, float x) {
     float x2, y2;
     x2 = x*x;
     y2 = y*y;
@@ -159,7 +159,7 @@ static OAC_INLINE float oaci_celt_atan_norm(float x) {
 /* Calculates the arctangent of y/x, returning an approximate value in radians.
  * Please refer to the linked wiki page (https://en.wikipedia.org/wiki/Atan2)
  * to learn how atan2 results are computed. */
-static OAC_INLINE float celt_atan2p_norm(float y, float x) {
+static OAC_INLINE float oaci_celt_atan2p_norm(float y, float x) {
     celt_sig_assert(x >= 0 && y >= 0);
 
     /* For very small values, we don't care about the answer. */
@@ -178,7 +178,7 @@ static OAC_INLINE float celt_atan2p_norm(float y, float x) {
 #if !defined(FIXED_POINT)
 /* Computes estimated cosine values for (PI/2 * x) using only terms with even
  * exponents. */
-static OAC_INLINE float celt_cos_norm2(float x) {
+static OAC_INLINE float oaci_celt_cos_norm2(float x) {
     float x_norm_sq;
     int output_sign;
     /* Restrict x to [-1, 3]. */
@@ -336,7 +336,7 @@ static OAC_INLINE float oaci_celt_exp2(float x) {
 # define celt_exp2_db oaci_celt_exp2
 # define oaci_celt_log2_db oaci_celt_log2
 
-# define oaci_celt_sin(x) celt_cos_norm2((0.5f*PI)*(x) - 1.0f)
+# define oaci_celt_sin(x) oaci_celt_cos_norm2((0.5f*PI)*(x) - 1.0f)
 # define celt_log(x) (oaci_celt_log2(x)*0.6931471805599453f)
 # define celt_exp(x) (oaci_celt_exp2((x)*1.4426950408889634f))
 
@@ -559,7 +559,7 @@ static OAC_INLINE oac_val32 oaci_celt_atan_norm(oac_val32 x) {
  * the value in Q30 format. Both input values (x and y) must be within the range
  * of 0 to 1 and represented in Q30 format. Inputs must be zero or greater, and
  * at least one input must be non-zero. */
-static OAC_INLINE oac_val32 celt_atan2p_norm(oac_val32 y, oac_val32 x) {
+static OAC_INLINE oac_val32 oaci_celt_atan2p_norm(oac_val32 y, oac_val32 x) {
     celt_sig_assert(x >= 0 && y >= 0);
     if (y == 0 && x == 0) {
         return 0;
diff --git a/celt/mini_kfft.c b/celt/mini_kfft.c
index a270f2a09..212a3bdd9 100644
--- a/celt/mini_kfft.c
+++ b/celt/mini_kfft.c
@@ -313,7 +313,7 @@ void kf_work(
     p[i] * m[i] = m[i-1]
     m0 = n                  */
 static
-void kf_factor(int n, int * facbuf) {
+void oaci_kf_factor(int n, int * facbuf) {
     int p = 4;
     double floor_sqrt;
     floor_sqrt = floor( sqrt((double)n));
@@ -368,7 +368,7 @@ mini_kiss_fft_cfg mini_kiss_fft_alloc(int nfft, int inverse_fft, void * mem, siz
             mini_kf_cexp(st->twiddles + i, phase );
         }
 
-        kf_factor(nfft, st->factors);
+        oaci_kf_factor(nfft, st->factors);
     }
     return st;
 }
diff --git a/celt/pitch.c b/celt/pitch.c
index 0318ee5a8..d6badf737 100644
--- a/celt/pitch.c
+++ b/celt/pitch.c
@@ -97,7 +97,7 @@ static void oaci_find_best_pitch(oac_val32 *xcorr, oac_val16 *y, int len,
     }
 }
 
-static void celt_fir5(oac_val16 *x,
+static void oaci_celt_fir5(oac_val16 *x,
                       const oac_val16 *num,
                       int N) {
     int i;
@@ -207,7 +207,7 @@ void oaci_pitch_downsample(celt_sig * OAC_RESTRICT x[], oac_val16 * OAC_RESTRICT
     lpc2[2] = lpc[2] + MULT16_16_Q15(c1, lpc[1]);
     lpc2[3] = lpc[3] + MULT16_16_Q15(c1, lpc[2]);
     lpc2[4] = MULT16_16_Q15(c1, lpc[3]);
-    celt_fir5(x_lp, lpc2, len);
+    oaci_celt_fir5(x_lp, lpc2, len);
 }
 
 /* Pure C implementation. */
@@ -471,7 +471,7 @@ oac_val16 oaci_remove_doubling(oac_val16 *x, int maxperiod, int minperiod,
         oac_val16 g1;
         oac_val16 cont = 0;
         oac_val16 thresh;
-        T1 = celt_udiv(2*T0 + k, 2*k);
+        T1 = oaci_celt_udiv(2*T0 + k, 2*k);
         if (T1 < minperiod)
             break;
         /* Look for another strong correlation at T1b */
@@ -481,7 +481,7 @@ oac_val16 oaci_remove_doubling(oac_val16 *x, int maxperiod, int minperiod,
             else
                 T1b = T0 + T1;
         } else {
-            T1b = celt_udiv(2*second_check[k]*T0 + k, 2*k);
+            T1b = oaci_celt_udiv(2*second_check[k]*T0 + k, 2*k);
         }
         oaci_dual_inner_prod(x, &x[-T1], &x[-T1b], N, &xy, &xy2, arch);
         xy = HALF32(xy + xy2);
diff --git a/celt/quant_bands.c b/celt/quant_bands.c
index 5b657885c..e5789d446 100644
--- a/celt/quant_bands.c
+++ b/celt/quant_bands.c
@@ -302,9 +302,9 @@ void oaci_quant_coarse_energy(const CELTMode *m, int start, int end, int effEnd,
 
         enc_intra_state = *enc;
 
-        nstart_bytes = ec_range_bytes(&enc_start_state);
-        nintra_bytes = ec_range_bytes(&enc_intra_state);
-        intra_buf = ec_get_buffer(&enc_intra_state) + nstart_bytes;
+        nstart_bytes = oaci_ec_range_bytes(&enc_start_state);
+        nintra_bytes = oaci_ec_range_bytes(&enc_intra_state);
+        intra_buf = oaci_ec_get_buffer(&enc_intra_state) + nstart_bytes;
         save_bytes = nintra_bytes - nstart_bytes;
         if (save_bytes == 0)
             save_bytes = ALLOC_NONE;
diff --git a/celt/rate.c b/celt/rate.c
index 7dc8fa8cd..99dcc81f1 100644
--- a/celt/rate.c
+++ b/celt/rate.c
@@ -313,7 +313,7 @@ static OAC_INLINE int oaci_interp_bits2pulses(const CELTMode *m, int start, int
         /*Figure out how many left-over bits we would be adding to this band.
            This can include bits we've stolen back from higher, skipped bands.*/
         left = total - psum;
-        percoeff = celt_udiv(left, m->eBands[codedBands] - m->eBands[start]);
+        percoeff = oaci_celt_udiv(left, m->eBands[codedBands] - m->eBands[start]);
         left -= (m->eBands[codedBands] - m->eBands[start])*percoeff;
         rem = IMAX(left - (m->eBands[j] - m->eBands[start]), 0);
         band_width = m->eBands[codedBands] - m->eBands[j];
@@ -392,7 +392,7 @@ static OAC_INLINE int oaci_interp_bits2pulses(const CELTMode *m, int start, int
 
     /* Allocate the remaining bits */
     left = total - psum;
-    percoeff = celt_udiv(left, m->eBands[codedBands] - m->eBands[start]);
+    percoeff = oaci_celt_udiv(left, m->eBands[codedBands] - m->eBands[start]);
     left -= (m->eBands[codedBands] - m->eBands[start])*percoeff;
     for (j = start; j < codedBands; j++)
         bits[j] += ((int)percoeff*(m->eBands[j + 1] - m->eBands[j]));
@@ -441,7 +441,7 @@ static OAC_INLINE int oaci_interp_bits2pulses(const CELTMode *m, int start, int
 
             /* Divide with rounding */
             ebits[j] = IMAX(0, (bits[j] + offset + (den<<(BITRES - 1))));
-            ebits[j] = celt_udiv(ebits[j], den)>>BITRES;
+            ebits[j] = oaci_celt_udiv(ebits[j], den)>>BITRES;
 
             /* Make sure not to bust */
             if (C*ebits[j] > (bits[j]>>BITRES))
diff --git a/celt/tests/test_unit_cwrs32.c b/celt/tests/test_unit_cwrs32.c
index ca3e12b8d..cba7918c0 100644
--- a/celt/tests/test_unit_cwrs32.c
+++ b/celt/tests/test_unit_cwrs32.c
@@ -121,14 +121,14 @@ int main(void) {
                 int j;
 #if defined(SMALL_FOOTPRINT)
                 memcpy(u, uu, (k + 2U)*sizeof(*u));
-                cwrsi(n, k, i, y, u);
+                oaci_cwrsi(n, k, i, y, u);
 #else
-                cwrsi(n, k, i, y);
+                oaci_cwrsi(n, k, i, y);
 #endif
                 sy = 0;
                 for (j = 0; j < n; j++) sy += abs(y[j]);
                 if (sy != k) {
-                    fprintf(stderr, "N=%d Pulse count mismatch in cwrsi (%d!=%d).\n",
+                    fprintf(stderr, "N=%d Pulse count mismatch in oaci_cwrsi (%d!=%d).\n",
            n, sy, k);
                     return 99;
                 }
@@ -136,9 +136,9 @@ int main(void) {
                    for(j=0;j<n;j++)printf(" %+3i",y[j]);
                    printf(" ->");*/
 #if defined(SMALL_FOOTPRINT)
-                ii = icwrs(n, k, &v, y, u);
+                ii = oaci_icwrs(n, k, &v, y, u);
 #else
-                ii = icwrs(n, y);
+                ii = oaci_icwrs(n, y);
                 v = CELT_PVQ_V(n, k);
 #endif
                 if (ii != i) {
diff --git a/celt/tests/test_unit_entropy.c b/celt/tests/test_unit_entropy.c
index 18dafc48e..98d4efbfe 100644
--- a/celt/tests/test_unit_entropy.c
+++ b/celt/tests/test_unit_entropy.c
@@ -106,7 +106,7 @@ int main(int _argc, char **_argv) {
     fprintf(stderr,
    "Encoded %0.2f bits of entropy to %0.2f bits (%0.3f%% wasted).\n",
    entropy, ldexp(nbits, -3), 100*(nbits - ldexp(entropy, 3))/nbits);
-    fprintf(stderr, "Packed to %li bytes.\n", (long)ec_range_bytes(&enc));
+    fprintf(stderr, "Packed to %li bytes.\n", (long)oaci_ec_range_bytes(&enc));
     oaci_ec_dec_init(&dec, ptr, DATA_SIZE);
     for (ft = 2; ft < 1024; ft++) {
         for (i = 0; i < ft; i++) {
@@ -197,9 +197,9 @@ int main(int _argc, char **_argv) {
        oaci_ec_tell(&enc), tell_bits, seed);
             ret = -1;
         }
-        if ((tell_bits + 7)/8 < ec_range_bytes(&enc)) {
+        if ((tell_bits + 7)/8 < oaci_ec_range_bytes(&enc)) {
             fprintf (stderr, "oaci_ec_tell() lied, there's %i bytes instead of %d (Random seed: %u)\n",
-               ec_range_bytes(&enc), (tell_bits + 7)/8, seed);
+               oaci_ec_range_bytes(&enc), (tell_bits + 7)/8, seed);
             ret = -1;
         }
         oaci_ec_dec_init(&dec, ptr, DATA_SIZE2);
@@ -265,9 +265,9 @@ int main(int _argc, char **_argv) {
             tell[j + 1] = oaci_ec_tell_frac(&enc);
         }
         oaci_ec_enc_done(&enc);
-        if ((oaci_ec_tell(&enc) + 7U)/8U < ec_range_bytes(&enc)) {
+        if ((oaci_ec_tell(&enc) + 7U)/8U < oaci_ec_range_bytes(&enc)) {
             fprintf(stderr, "tell() lied, there's %i bytes instead of %d (Random seed: %u)\n",
-       ec_range_bytes(&enc), (oaci_ec_tell(&enc) + 7)/8, seed);
+       oaci_ec_range_bytes(&enc), (oaci_ec_tell(&enc) + 7)/8, seed);
             ret = -1;
         }
         oaci_ec_dec_init(&dec, ptr, DATA_SIZE2);
@@ -339,7 +339,7 @@ int main(int _argc, char **_argv) {
         ret = -1;
     }
     oaci_ec_enc_done(&enc);
-    if (ec_range_bytes(&enc) != 1 || ptr[0] != 192) {
+    if (oaci_ec_range_bytes(&enc) != 1 || ptr[0] != 192) {
         fprintf(stderr, "Got %d when expecting 192 for patch_initial_bits", ptr[0]);
         ret = -1;
     }
@@ -354,7 +354,7 @@ int main(int _argc, char **_argv) {
         ret = -1;
     }
     oaci_ec_enc_done(&enc);
-    if (ec_range_bytes(&enc) != 2 || ptr[0] != 63) {
+    if (oaci_ec_range_bytes(&enc) != 2 || ptr[0] != 63) {
         fprintf(stderr, "Got %d when expecting 63 for patch_initial_bits", ptr[0]);
         ret = -1;
     }
diff --git a/celt/tests/test_unit_laplace.c b/celt/tests/test_unit_laplace.c
index 8273d22af..14dcbbf18 100644
--- a/celt/tests/test_unit_laplace.c
+++ b/celt/tests/test_unit_laplace.c
@@ -72,7 +72,7 @@ int main(void) {
 
     oaci_ec_enc_done(&enc);
 
-    oaci_ec_dec_init(&dec, ec_get_buffer(&enc), ec_range_bytes(&enc));
+    oaci_ec_dec_init(&dec, oaci_ec_get_buffer(&enc), oaci_ec_range_bytes(&enc));
 
     for (i = 0; i < 10000; i++) {
         int d = oaci_ec_laplace_decode(&dec,
diff --git a/celt/tests/test_unit_mathops.c b/celt/tests/test_unit_mathops.c
index ce451dd15..7d35e1535 100644
--- a/celt/tests/test_unit_mathops.c
+++ b/celt/tests/test_unit_mathops.c
@@ -202,20 +202,20 @@ void test_cos(void) {
     float error_threshold = 6.0e-07;
     float max_error = 0;
     for (x = -4.0f; x < 4.0f; x += 0.0007f) {
-        float error = fabs((float)cos((.5f*PI)*(x)) - celt_cos_norm2(x));
+        float error = fabs((float)cos((.5f*PI)*(x)) - oaci_celt_cos_norm2(x));
         if (max_error < error) {
             max_error = error;
         }
 
         if (error > error_threshold) {
             fprintf (stderr,
-                  "celt_cos_norm2 failed: "
-                  "fabs(ref_x-(celt_cos_norm2(x)))>%15.25e "
+                  "oaci_celt_cos_norm2 failed: "
+                  "fabs(ref_x-(oaci_celt_cos_norm2(x)))>%15.25e "
                   "(x = %f, error = %15.25e)\n", error_threshold, x, error);
             ret = 1;
         }
     }
-    fprintf (stdout, "celt_cos_norm2 max_error: %15.25e\n", max_error);
+    fprintf (stdout, "oaci_celt_cos_norm2 max_error: %15.25e\n", max_error);
 }
 
 void test_atan2(void) {
@@ -228,22 +228,22 @@ void test_atan2(void) {
                 /* atan2(0,0) is undefined behavior. */
                 continue;
             }
-            float error = fabs(0.636619772367581f*(float)atan2((double)y, (double)x) - celt_atan2p_norm(y, x));
+            float error = fabs(0.636619772367581f*(float)atan2((double)y, (double)x) - oaci_celt_atan2p_norm(y, x));
             if (max_error < error) {
                 max_error = error;
             }
 
             if (error > error_threshold) {
                 fprintf (stderr,
-                     "celt_atan2p_norm failed: "
-                     "(fabs)(2/pi*atan2(y,x) - celt_atan2p_norm(y,x))>%15.25e "
+                     "oaci_celt_atan2p_norm failed: "
+                     "(fabs)(2/pi*atan2(y,x) - oaci_celt_atan2p_norm(y,x))>%15.25e "
                      "(x = %f, y = %f, error = %15.25e)\n",
                      error_threshold, x, y, error);
                 ret = 1;
             }
         }
     }
-    fprintf (stdout, "celt_atan2p_norm max_error: %15.25e\n", max_error);
+    fprintf (stdout, "oaci_celt_atan2p_norm max_error: %15.25e\n", max_error);
 }
 
 #else
@@ -453,19 +453,19 @@ void testatan2p_norm(void) {
 
             error = fabs(atan2(FIX_INT_TO_DOUBLE(y, q_input),
                             FIX_INT_TO_DOUBLE(x, q_input))*ATAN2_2_OVER_PI
-                - FIX_INT_TO_DOUBLE(celt_atan2p_norm(y, x), q_output));
+                - FIX_INT_TO_DOUBLE(oaci_celt_atan2p_norm(y, x), q_output));
             if (error > max_error) {
                 max_error = error;
             }
             if (error > error_threshold) {
                 fprintf(stderr,
-                  "celt_atan2p_norm failed: error: [%.5e > %.5e] (x = %f)\n",
+                  "oaci_celt_atan2p_norm failed: error: [%.5e > %.5e] (x = %f)\n",
                   error, error_threshold, FIX_INT_TO_DOUBLE(x, DB_SHIFT));
                 ret = 1;
             }
         }
     }
-    fprintf(stdout, "celt_atan2p_norm max_error: %.7e\n", max_error);
+    fprintf(stdout, "oaci_celt_atan2p_norm max_error: %.7e\n", max_error);
 }
 
 void testatan(void) {
diff --git a/celt/vq.c b/celt/vq.c
index 44a570ce8..c3d16dde0 100644
--- a/celt/vq.c
+++ b/celt/vq.c
@@ -124,7 +124,7 @@ void oaci_exp_rotation(celt_norm *X, int len, int dir, int stride, int K, int sp
     }
     /*NOTE: As a minor optimization, we could be passing around log2(B), not B, for both this and for
        oaci_extract_collapse_mask().*/
-    len = celt_udiv(len, stride);
+    len = oaci_celt_udiv(len, stride);
     for (i = 0; i < stride; i++) {
         if (dir < 0) {
             if (stride2)
@@ -179,7 +179,7 @@ static unsigned oaci_extract_collapse_mask(int *iy, int N, int B) {
         return 1;
     /*NOTE: As a minor optimization, we could be passing around log2(B), not B, for both this and for
        oaci_exp_rotation().*/
-    N0 = celt_udiv(N, B);
+    N0 = oaci_celt_udiv(N, B);
     collapse_mask = 0;
     i = 0; do {
         int j;
@@ -459,9 +459,9 @@ oac_int32 oaci_stereo_itheta(const celt_norm *X, const celt_norm *Y, int stereo,
     mid = oaci_celt_sqrt32(Emid);
     side = oaci_celt_sqrt32(Eside);
 #if defined(FIXED_POINT)
-    itheta = celt_atan2p_norm(side, mid);
+    itheta = oaci_celt_atan2p_norm(side, mid);
 #else
-    itheta = (int)floor(.5f + 65536.f*16384*celt_atan2p_norm(side, mid));
+    itheta = (int)floor(.5f + 65536.f*16384*oaci_celt_atan2p_norm(side, mid));
 #endif
 
     return itheta;
diff --git a/celt/x86/x86cpu.c b/celt/x86/x86cpu.c
index 4016c3cf0..4d9514b5b 100644
--- a/celt/x86/x86cpu.c
+++ b/celt/x86/x86cpu.c
@@ -44,7 +44,7 @@
 # if defined(_MSC_VER)
 
 #  include <intrin.h>
-static _inline void cpuid(unsigned int CPUInfo[4], unsigned int InfoType) {
+static _inline void oaci_cpuid(unsigned int CPUInfo[4], unsigned int InfoType) {
     __cpuid((int*)CPUInfo, InfoType);
 }
 
@@ -54,7 +54,7 @@ static _inline void cpuid(unsigned int CPUInfo[4], unsigned int InfoType) {
 #   include <cpuid.h>
 #  endif
 
-static void cpuid(unsigned int CPUInfo[4], unsigned int InfoType) {
+static void oaci_cpuid(unsigned int CPUInfo[4], unsigned int InfoType) {
 #  if defined(CPU_INFO_BY_ASM)
 #   if defined(__i386__) && defined(__PIC__)
 /* %ebx is PIC register in 32-bit, so mustn't clobber it. */
@@ -110,17 +110,17 @@ static void oac_cpu_feature_check(CPU_Feature *cpu_feature) {
     unsigned int info[4];
     unsigned int nIds = 0;
 
-    cpuid(info, 0);
+    oaci_cpuid(info, 0);
     nIds = info[0];
 
     if (nIds >= 1) {
-        cpuid(info, 1);
+        oaci_cpuid(info, 1);
         cpu_feature->HW_SSE = (info[3]&(1<<25)) != 0;
         cpu_feature->HW_SSE2 = (info[3]&(1<<26)) != 0;
         cpu_feature->HW_SSE41 = (info[2]&(1<<19)) != 0;
         cpu_feature->HW_AVX2 = (info[2]&(1<<28)) != 0 && (info[2]&(1<<12)) != 0;
         if (cpu_feature->HW_AVX2 && nIds >= 7) {
-            cpuid(info, 7);
+            oaci_cpuid(info, 7);
             cpu_feature->HW_AVX2 = cpu_feature->HW_AVX2 && (info[1]&(1<<5)) != 0;
         } else {
             cpu_feature->HW_AVX2 = 0;
diff --git a/dnn/dred_compare.c b/dnn/dred_compare.c
index 241f4b2fe..dc93dbfd9 100644
--- a/dnn/dred_compare.c
+++ b/dnn/dred_compare.c
@@ -68,7 +68,7 @@ typedef union {
     float f;
 } float_bits;
 
-static void biquad(float *y, float mem[2], const float *x,
+static void oaci_biquad(float *y, float mem[2], const float *x,
                    const float *b, const float *a, int N) {
     int i;
     for (i = 0; i < N; i++) {
@@ -158,7 +158,7 @@ static size_t read_pcm(float **_samples, FILE *_fin, int _nchannels,
     }
     *_samples = (float *)oac_realloc(samples,
    _nchannels*nsamples*sizeof(*samples));
-    biquad(*_samples, mem, *_samples, b_hp, a_hp, nsamples);
+    oaci_biquad(*_samples, mem, *_samples, b_hp, a_hp, nsamples);
     return nsamples;
 }
 
diff --git a/dnn/dred_encoder.c b/dnn/dred_encoder.c
index b806856b7..def50561f 100644
--- a/dnn/dred_encoder.c
+++ b/dnn/dred_encoder.c
@@ -47,7 +47,7 @@
 #include "dred_rdovae_stats_data.h"
 
 
-static void DRED_rdovae_init_encoder(RDOVAEEncState *enc_state) {
+static void oaci_DRED_rdovae_init_encoder(RDOVAEEncState *enc_state) {
     memset(enc_state, 0, sizeof(*enc_state));
 }
 
@@ -70,7 +70,7 @@ void oaci_dred_encoder_reset(DREDEnc* enc) {
         - ((char*)&enc->DREDENC_RESET_START - (char*)enc));
     enc->input_buffer_fill = DRED_SILK_ENCODER_DELAY;
     oaci_lpcnet_encoder_init(&enc->lpcnet_enc_state);
-    DRED_rdovae_init_encoder(&enc->rdovae_enc);
+    oaci_DRED_rdovae_init_encoder(&enc->rdovae_enc);
 }
 
 void oaci_dred_encoder_init(DREDEnc* enc, oac_int32 Fs, int channels) {
@@ -270,7 +270,7 @@ static void oaci_dred_encode_latents(ec_enc *enc, const float *x, const oac_uint
     }
 }
 
-static int dred_voice_active(const unsigned char *activity_mem, int offset) {
+static int oaci_dred_voice_active(const unsigned char *activity_mem, int offset) {
     int i;
     for (i = 0; i < 16; i++) {
         if (activity_mem[8*offset + i] == 1) return 1;
@@ -303,7 +303,7 @@ int oaci_dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks
         delayed_dred = 1;
         enc->last_extra_dred_offset = 0;
     }
-    while (latent_offset < enc->latents_buffer_fill && !dred_voice_active(activity_mem, latent_offset)) {
+    while (latent_offset < enc->latents_buffer_fill && !oaci_dred_voice_active(activity_mem, latent_offset)) {
         latent_offset++;
         extra_dred_offset++;
     }
@@ -366,7 +366,7 @@ int oaci_dred_encode_silk_frame(DREDEnc *enc, unsigned char *buf, int max_chunks
             if (i == 0) return 0;
             break;
         }
-        active = dred_voice_active(activity_mem, i + latent_offset);
+        active = oaci_dred_voice_active(activity_mem, i + latent_offset);
         if (active || prev_active) {
             ec_bak = ec_encoder;
             dred_encoded = i + 2;
diff --git a/dnn/dump_data.c b/dnn/dump_data.c
index 37e343ae8..1e389528a 100644
--- a/dnn/dump_data.c
+++ b/dnn/dump_data.c
@@ -165,7 +165,7 @@ static float randf(float f) {
     return f*rand()/(double)RAND_MAX;
 }
 
-static void biquad(float *y, float mem[2], const float *x, const float *b, const float *a, int N) {
+static void oaci_biquad(float *y, float mem[2], const float *x, const float *b, const float *a, int N) {
     int i;
     for (i = 0; i < N; i++) {
         float xi, yi;
@@ -219,7 +219,7 @@ static float weighted_rms(float *x) {
     float weighting_a[2] = {-1.89f, .895f};
     float mem[2] = {0};
     float mse = 1e-15f;
-    biquad(tmp, mem, x, weighting_b, weighting_a, SEQUENCE_SAMPLES);
+    oaci_biquad(tmp, mem, x, weighting_b, weighting_a, SEQUENCE_SAMPLES);
     for (i = 0; i < SEQUENCE_SAMPLES; i++) mse += tmp[i]*tmp[i];
     return 0.9506*sqrt(mse/SEQUENCE_SAMPLES);
 }
@@ -396,13 +396,13 @@ int main(int argc, char **argv) {
         }
 
         OAC_CLEAR(mem, 2);
-        biquad(x, mem, x, b_hp, a_hp, SEQUENCE_LENGTH*FRAME_SIZE);
+        oaci_biquad(x, mem, x, b_hp, a_hp, SEQUENCE_LENGTH*FRAME_SIZE);
         OAC_CLEAR(mem, 2);
-        biquad(x, mem, x, b_sig, a_sig, SEQUENCE_LENGTH*FRAME_SIZE);
+        oaci_biquad(x, mem, x, b_sig, a_sig, SEQUENCE_LENGTH*FRAME_SIZE);
         OAC_CLEAR(mem, 2);
-        biquad(n, mem, n, b_hp, a_hp, SEQUENCE_LENGTH*FRAME_SIZE);
+        oaci_biquad(n, mem, n, b_hp, a_hp, SEQUENCE_LENGTH*FRAME_SIZE);
         OAC_CLEAR(mem, 2);
-        biquad(n, mem, n, b_noise, a_noise, SEQUENCE_LENGTH*FRAME_SIZE);
+        oaci_biquad(n, mem, n, b_noise, a_noise, SEQUENCE_LENGTH*FRAME_SIZE);
 
         speech_rms = weighted_rms(x);
         noise_rms = weighted_rms(n);
diff --git a/dnn/fargan_demo.c b/dnn/fargan_demo.c
index 7323df8bd..4d79f23c0 100644
--- a/dnn/fargan_demo.c
+++ b/dnn/fargan_demo.c
@@ -200,7 +200,7 @@ int main(int argc, char **argv) {
 #ifdef USE_WEIGHTS_FILE
         oaci_fargan_load_model(&fargan, data, len);
 #endif
-        /* uncomment the following to align with Python code */
+        /* uncomment the following to oaci_align with Python code */
         ret = fread(&in_features[0], sizeof(in_features[0]), NB_FEATURES, fin);
         for (i = 1; i < 5; i++) {
             OAC_COPY(&in_features[i*NB_FEATURES], &in_features[0], NB_FEATURES);
diff --git a/dnn/freq.c b/dnn/freq.c
index 7609e860b..53a3f02cb 100644
--- a/dnn/freq.c
+++ b/dnn/freq.c
@@ -187,7 +187,7 @@ void oaci_burg_cepstral_analysis(float *ceps, const float *x) {
 }
 
 
-static void interp_band_gain(float *g, const float *bandE) {
+static void oaci_interp_band_gain(float *g, const float *bandE) {
     int i;
     memset(g, 0, FREQ_SIZE);
     for (i = 0; i < NB_BANDS - 1; i++) {
@@ -267,7 +267,7 @@ static float oaci_lpc_from_bands(float *lpc, const float *Ex) {
     float Xr[FREQ_SIZE];
     kiss_fft_cpx X_auto[FREQ_SIZE];
     float x_auto[WINDOW_SIZE];
-    interp_band_gain(Xr, Ex);
+    oaci_interp_band_gain(Xr, Ex);
     Xr[FREQ_SIZE - 1] = 0;
     OAC_CLEAR(X_auto, FREQ_SIZE);
     for (i = 0; i < FREQ_SIZE; i++) X_auto[i].r = Xr[i];
diff --git a/dnn/lpcnet_enc.c b/dnn/lpcnet_enc.c
index 07dd63776..950c5b421 100644
--- a/dnn/lpcnet_enc.c
+++ b/dnn/lpcnet_enc.c
@@ -71,7 +71,7 @@ void oaci_lpcnet_encoder_destroy(LPCNetEncState *st) {
     oac_free(st);
 }
 
-static void frame_analysis(LPCNetEncState *st, kiss_fft_cpx *X, float *Ex, const float *in) {
+static void oaci_frame_analysis(LPCNetEncState *st, kiss_fft_cpx *X, float *Ex, const float *in) {
     float x[WINDOW_SIZE];
     OAC_COPY(x, st->analysis_mem, OVERLAP_SIZE);
     OAC_COPY(&x[OVERLAP_SIZE], in, FRAME_SIZE);
@@ -81,7 +81,7 @@ static void frame_analysis(LPCNetEncState *st, kiss_fft_cpx *X, float *Ex, const
     oaci_lpcn_compute_band_energy(Ex, X);
 }
 
-static void biquad(float *y, float mem[2], const float *x, const float *b, const float *a, int N) {
+static void oaci_biquad(float *y, float mem[2], const float *x, const float *b, const float *a, int N) {
     int i;
     float mem0, mem1;
     mem0 = mem[0];
@@ -125,7 +125,7 @@ void oaci_compute_frame_features(LPCNetEncState *st, const float *in, int arch)
     static const float lp_b[2] = {-0.84946f, 1.f};
     static const float lp_a[2] = {-1.54220f, 0.70781f};
     OAC_COPY(aligned_in, &st->analysis_mem[OVERLAP_SIZE - TRAINING_OFFSET], TRAINING_OFFSET);
-    frame_analysis(st, X, Ex, in);
+    oaci_frame_analysis(st, X, Ex, in);
     st->if_features[0] = MAX16(-1.f, MIN16(1.f, (1.f/64)*(10.f*celt_log10(1e-15f + X[0].r*X[0].r) - 6.f)));
     for (i = 1; i < PITCH_IF_MAX_FREQ; i++) {
         kiss_fft_cpx prod;
@@ -164,7 +164,7 @@ void oaci_compute_frame_features(LPCNetEncState *st, const float *in, int arch)
         st->pitch_filt = st->lp_buf[PITCH_MAX_PERIOD + i];
         /*printf("%f\n", st->exc_buf[PITCH_MAX_PERIOD+i]);*/
     }
-    biquad(&st->lp_buf[PITCH_MAX_PERIOD], st->lp_mem, &st->lp_buf[PITCH_MAX_PERIOD], lp_b, lp_a, FRAME_SIZE);
+    oaci_biquad(&st->lp_buf[PITCH_MAX_PERIOD], st->lp_mem, &st->lp_buf[PITCH_MAX_PERIOD], lp_b, lp_a, FRAME_SIZE);
     {
         double ener1;
         float *buf = st->exc_buf;
diff --git a/dnn/nndsp.c b/dnn/nndsp.c
index 44c29ed3b..314232098 100644
--- a/dnn/nndsp.c
+++ b/dnn/nndsp.c
@@ -104,7 +104,7 @@ static void oaci_scale_kernel(
     }
 }
 
-static void transform_gains(
+static void oaci_transform_gains(
     float *gains,
     int num_gains,
     float filter_gain_a,
@@ -177,7 +177,7 @@ void oaci_adaconv_process_frame(
     print_float_vector("adaconv_kernel_raw", kernel_buffer, in_channels*out_channels*kernel_size);
     print_float_vector("adaconv_gain_raw", gain_buffer, out_channels);
 #endif
-    transform_gains(gain_buffer, out_channels, filter_gain_a, filter_gain_b);
+    oaci_transform_gains(gain_buffer, out_channels, filter_gain_a, filter_gain_b);
     oaci_scale_kernel(kernel_buffer, in_channels, out_channels, kernel_size, gain_buffer);
 
 #ifdef DEBUG_NNDSP
diff --git a/dnn/nnet_arch.h b/dnn/nnet_arch.h
index 5214b8f1d..433d78a4f 100644
--- a/dnn/nnet_arch.h
+++ b/dnn/nnet_arch.h
@@ -58,7 +58,7 @@ static OAC_INLINE void oaci_vec_swish(float *y, const float *x, int N) {
         y[i] = x[i]*tmp[i];
 }
 
-static OAC_INLINE float relu(float x) {
+static OAC_INLINE float oaci_relu(float x) {
     return x < 0 ? 0 : x;
 }
 
@@ -87,7 +87,7 @@ void RTCD_SUF(oaci_compute_activation_)(float *output, const float *input, int N
         oaci_vec_swish(output, input, N);
    } else if (activation == ACTIVATION_RELU) {
         for (i = 0; i < N; i++)
-            output[i] = relu(input[i]);
+            output[i] = oaci_relu(input[i]);
    } else if (activation == ACTIVATION_SOFTMAX) {
 #ifdef SOFTMAX_HACK
         OAC_COPY(output, input, N);
diff --git a/dnn/osce.c b/dnn/osce.c
index 0dbbf6c46..5640899ec 100644
--- a/dnn/osce.c
+++ b/dnn/osce.c
@@ -1517,14 +1517,14 @@ void oaci_osce_bwe(
         float tmp = 32768.f*out_buffer[i];
         if (tmp > 32767.f) tmp = 32767.f;
         if (tmp < -32767.f) tmp = -32767.f;
-        xq48[i + OSCE_BWE_OUTPUT_DELAY] = float2int(tmp);
+        xq48[i + OSCE_BWE_OUTPUT_DELAY] = oaci_float2int(tmp);
     }
 
     for (i = 0; i < OSCE_BWE_OUTPUT_DELAY; i++) {
         float tmp = 32768.f*out_buffer[3*xq16_len - OSCE_BWE_OUTPUT_DELAY + i];
         if (tmp > 32767.f) tmp = 32767.f;
         if (tmp < -32767.f) tmp = -32767.f;
-        psOSCEBWE->state.bbwenet.outbut_buffer[i] = float2int(tmp);
+        psOSCEBWE->state.bbwenet.outbut_buffer[i] = oaci_float2int(tmp);
     }
 
 
@@ -1669,7 +1669,7 @@ void oaci_osce_enhance_frame(
         float tmp = 32768.f*out_buffer[i];
         if (tmp > 32767.f) tmp = 32767.f;
         if (tmp < -32767.f) tmp = -32767.f;
-        xq[i] = float2int(tmp);
+        xq[i] = oaci_float2int(tmp);
     }
 
 }
diff --git a/dnn/osce_features.c b/dnn/osce_features.c
index 8570b957f..c81b084f9 100644
--- a/dnn/osce_features.c
+++ b/dnn/osce_features.c
@@ -221,7 +221,7 @@ static void oaci_mag_spec_320_onesided(float *out, float *in) {
 }
 
 
-static void calculate_log_spectrum_from_lpc(float *spec, oac_int16 *a_q12, int lpc_order) {
+static void oaci_calculate_log_spectrum_from_lpc(float *spec, oac_int16 *a_q12, int lpc_order) {
     float buffer[OSCE_SPEC_WINDOW_SIZE] = {0};
     int i;
 
@@ -386,7 +386,7 @@ void oaci_osce_calculate_features(
 
         /* clean spectrum from lpcs (update every other frame) */
         if (k%2 == 0) {
-            calculate_log_spectrum_from_lpc(pfeatures + OSCE_CLEAN_SPEC_START, psDecCtrl->PredCoef_Q12[k>>1],
+            oaci_calculate_log_spectrum_from_lpc(pfeatures + OSCE_CLEAN_SPEC_START, psDecCtrl->PredCoef_Q12[k>>1],
             psDec->LPC_order);
         } else {
             OAC_COPY(pfeatures + OSCE_CLEAN_SPEC_START, pfeatures + OSCE_CLEAN_SPEC_START - OSCE_FEATURE_DIM,
diff --git a/dnn/parse_lpcnet_weights.c b/dnn/parse_lpcnet_weights.c
index c5ddf8e3c..4bdb420f9 100644
--- a/dnn/parse_lpcnet_weights.c
+++ b/dnn/parse_lpcnet_weights.c
@@ -95,7 +95,7 @@ static const void *oaci_opt_array_check(const WeightArray *arrays, const char *n
     else return NULL;
 }
 
-static const void *find_idx_check(const WeightArray *arrays, const char *name, int nb_in, int nb_out,
+static const void *oaci_find_idx_check(const WeightArray *arrays, const char *name, int nb_in, int nb_out,
                                   int *total_blocks) {
     int remain;
     const int *idx;
@@ -149,7 +149,7 @@ int oaci_linear_init(LinearLayer *layer, const WeightArray *arrays,
     }
     if (weights_idx != NULL) {
         int total_blocks;
-        if ((layer->weights_idx = (const int*)find_idx_check(arrays, weights_idx, nb_inputs, nb_outputs,
+        if ((layer->weights_idx = (const int*)oaci_find_idx_check(arrays, weights_idx, nb_inputs, nb_outputs,
         &total_blocks)) == NULL) return 1;
         if (weights != NULL) {
             if ((layer->weights = (const oac_int8*)oaci_find_array_check(arrays, weights,
diff --git a/dnn/vec_avx.h b/dnn/vec_avx.h
index 0f62ddb00..6857e50a4 100644
--- a/dnn/vec_avx.h
+++ b/dnn/vec_avx.h
@@ -303,7 +303,7 @@ static inline mm256i_emu mm256_cvtps_epi32(mm256_emu a) {
 #endif
 
 #ifdef __AVX2__
-static inline __m256 exp8_approx(__m256 X) {
+static inline __m256 oaci_exp8_approx(__m256 X) {
     const __m256 K0 = _mm256_set1_ps(0.99992522f);
     const __m256 K1 = _mm256_set1_ps(0.69583354f);
     const __m256 K2 = _mm256_set1_ps(0.22606716f);
@@ -324,7 +324,7 @@ static inline __m256 exp8_approx(__m256 X) {
     return Y;
 }
 
-static inline void vector_ps_to_epi8(unsigned char *x, const float *_x, int len) {
+static inline void oaci_vector_ps_to_epi8(unsigned char *x, const float *_x, int len) {
     int i;
     __m256 const127 = _mm256_set1_ps(127.f);
     for (i = 0; i < len; i += 8) {
@@ -342,7 +342,7 @@ static inline void vector_ps_to_epi8(unsigned char *x, const float *_x, int len)
 }
 
 #else
-static inline __m128 exp4_approx(__m128 X) {
+static inline __m128 oaci_exp4_approx(__m128 X) {
     const __m128 K0 = _mm_set1_ps(0.99992522f);
     const __m128 K1 = _mm_set1_ps(0.69583354f);
     const __m128 K2 = _mm_set1_ps(0.22606716f);
@@ -363,19 +363,19 @@ static inline __m128 exp4_approx(__m128 X) {
     Y = _mm_castsi128_ps(_mm_and_si128(mask, _mm_add_epi32(I, _mm_castps_si128(Y))));
     return Y;
 }
-static inline __m256 exp8_approx(__m256 X) {
+static inline __m256 oaci_exp8_approx(__m256 X) {
     __m256 Y;
     __m128 Xhi, Xlo, Yhi, Ylo;
     Xhi = _mm256_extractf128_ps(X, 1);
     Xlo = _mm256_extractf128_ps(X, 0);
-    Yhi = exp4_approx(Xhi);
-    Ylo = exp4_approx(Xlo);
+    Yhi = oaci_exp4_approx(Xhi);
+    Ylo = oaci_exp4_approx(Xlo);
     Y = _mm256_insertf128_ps(_mm256_setzero_ps(), Yhi, 1);
     Y = _mm256_insertf128_ps(Y, Ylo, 0);
     return Y;
 }
 
-static inline void vector_ps_to_epi8(unsigned char *x, const float *_x, int len) {
+static inline void oaci_vector_ps_to_epi8(unsigned char *x, const float *_x, int len) {
     int i;
     for (i = 0; i < len; i++)x[i] = 127 + (int)floor(.5 + 127*_x[i]);
 }
@@ -524,7 +524,7 @@ static inline float oaci_lpcnet_exp(float x) {
     float out[8];
     __m256 X, Y;
     X = _mm256_set1_ps(x);
-    Y = exp8_approx(X);
+    Y = oaci_exp8_approx(X);
     _mm256_storeu_ps(out, Y);
     return out[0];
 }
@@ -534,7 +534,7 @@ static inline void oaci_softmax(float *y, const float *x, int N) {
     for (i = 0; i < N - 7; i += 8) {
         __m256 X, Y;
         X = _mm256_loadu_ps(&x[i]);
-        Y = exp8_approx(X);
+        Y = oaci_exp8_approx(X);
         _mm256_storeu_ps(&y[i], Y);
     }
     for (; i < N; i++)
@@ -745,7 +745,7 @@ static inline void oaci_sparse_cgemv8x4(float *_out, const oac_int8 *w, const in
     int i, j;
     unsigned char x[MAX_INPUTS];
     /*for (i=0;i<cols;i++) x[i] = 127+floor(.5+127*_x[i]);*/
-    vector_ps_to_epi8(x, _x, cols);
+    oaci_vector_ps_to_epi8(x, _x, cols);
     for (i = 0; i < rows; i += 8) {
         int colblocks;
         __m256i vy0;
@@ -792,7 +792,7 @@ static inline void oaci_cgemv8x4(float *_out, const oac_int8 *w, const float *sc
     int i, j;
     unsigned char x[MAX_INPUTS];
     /*for (i=0;i<cols;i++) x[i] = 127+floor(.5+127*_x[i]);*/
-    vector_ps_to_epi8(x, _x, cols);
+    oaci_vector_ps_to_epi8(x, _x, cols);
     for (i = 0; i < rows; i += 8) {
         __m256i vy0;
         __m256 vout;
diff --git a/dnn/vec_neon.h b/dnn/vec_neon.h
index f5949a73d..f95f6095c 100644
--- a/dnn/vec_neon.h
+++ b/dnn/vec_neon.h
@@ -56,7 +56,7 @@ static OAC_INLINE int16x8_t vmull_high_s8(int8x16_t a, int8x16_t b) {
 #endif
 
 #ifndef LPCNET_TEST
-static inline float32x4_t exp4_approx(float32x4_t x) {
+static inline float32x4_t oaci_exp4_approx(float32x4_t x) {
     int32x4_t i;
     float32x4_t xf;
 
@@ -126,7 +126,7 @@ static inline float oaci_lpcnet_exp(float x) {
     float out[4];
     float32x4_t X, Y;
     X = vdupq_n_f32(x);
-    Y = exp4_approx(X);
+    Y = oaci_exp4_approx(X);
     vst1q_f32(out, Y);
     return out[0];
 }
@@ -154,7 +154,7 @@ static inline void oaci_softmax(float *y, const float *x, int N) {
     for (i = 0; i < N - 3; i += 4) {
         float32x4_t X, Y;
         X = vld1q_f32(&x[i]);
-        Y = exp4_approx(X);
+        Y = oaci_exp4_approx(X);
         vst1q_f32(&y[i], Y);
     }
     for (; i < N; i++)
diff --git a/silk/CNG.c b/silk/CNG.c
index bff98b542..7d87e2031 100644
--- a/silk/CNG.c
+++ b/silk/CNG.c
@@ -137,12 +137,12 @@ void oaci_silk_CNG(
             gain_Q16 = silk_SMULTT( gain_Q16, gain_Q16 );
             gain_Q16 = silk_SUB_LSHIFT32(silk_SMULTT( psCNG->CNG_smth_Gain_Q16, psCNG->CNG_smth_Gain_Q16 ), gain_Q16,
             5 );
-            gain_Q16 = silk_LSHIFT32( silk_SQRT_APPROX( gain_Q16 ), 16 );
+            gain_Q16 = silk_LSHIFT32( oaci_silk_SQRT_APPROX( gain_Q16 ), 16 );
         } else {
             gain_Q16 = silk_SMULWW( gain_Q16, gain_Q16 );
             gain_Q16 = silk_SUB_LSHIFT32(silk_SMULWW( psCNG->CNG_smth_Gain_Q16, psCNG->CNG_smth_Gain_Q16 ), gain_Q16,
             5 );
-            gain_Q16 = silk_LSHIFT32( silk_SQRT_APPROX( gain_Q16 ), 8 );
+            gain_Q16 = silk_LSHIFT32( oaci_silk_SQRT_APPROX( gain_Q16 ), 8 );
         }
         gain_Q10 = silk_RSHIFT( gain_Q16, 6 );
 
diff --git a/silk/Inlines.h b/silk/Inlines.h
index 0981a921b..771e9c566 100644
--- a/silk/Inlines.h
+++ b/silk/Inlines.h
@@ -62,7 +62,7 @@ static OAC_INLINE void silk_CLZ_FRAC(
 /* Approximation of square root                                          */
 /* Accuracy: < +/- 10%  for output values > 15                           */
 /*           < +/- 2.5% for output values > 120                          */
-static OAC_INLINE oac_int32 silk_SQRT_APPROX( oac_int32 x ) {
+static OAC_INLINE oac_int32 oaci_silk_SQRT_APPROX( oac_int32 x ) {
     oac_int32 y, lz, frac_Q7;
 
     if (x <= 0) {
@@ -132,7 +132,7 @@ static OAC_INLINE oac_int32 silk_DIV32_varQ(   /* O    returns a good approximat
 }
 
 /* Invert int32 value and return result as int32 in a given Q-domain */
-static OAC_INLINE oac_int32 silk_INVERSE32_varQ(   /* O    returns a good approximation of "(1 << Qres) / b32" */
+static OAC_INLINE oac_int32 oaci_silk_INVERSE32_varQ(   /* O    returns a good approximation of "(1 << Qres) / b32" */
     const oac_int32 b32,                       /* I    denominator (Q0)                */
     const oac_int Qres                         /* I    Q-domain of result (> 0)        */
     ) {
diff --git a/silk/LPC_inv_pred_gain.c b/silk/LPC_inv_pred_gain.c
index ea558f611..ab675bc23 100644
--- a/silk/LPC_inv_pred_gain.c
+++ b/silk/LPC_inv_pred_gain.c
@@ -39,7 +39,7 @@
 
 /* Compute inverse of LPC prediction gain, and                          */
 /* test if LPC coefficients are stable (all poles within unit circle)   */
-static oac_int32 LPC_inverse_pred_gain_QA_c(               /* O   Returns inverse prediction gain in energy domain, Q30    */
+static oac_int32 oaci_LPC_inverse_pred_gain_QA_c(               /* O   Returns inverse prediction gain in energy domain, Q30    */
     oac_int32 A_QA[ SILK_MAX_ORDER_LPC ],                  /* I   Prediction coefficients                                  */
     const oac_int order                                    /* I   Prediction order                                         */
     ) {
@@ -72,7 +72,7 @@ static oac_int32 LPC_inverse_pred_gain_QA_c(               /* O   Returns invers
 
         /* rc_mult2 range: [ 2^30 : silk_int32_MAX ] */
         mult2Q = 32 - silk_CLZ32( silk_abs( rc_mult1_Q30 ));
-        rc_mult2 = silk_INVERSE32_varQ( rc_mult1_Q30, mult2Q + 30 );
+        rc_mult2 = oaci_silk_INVERSE32_varQ( rc_mult1_Q30, mult2Q + 30 );
 
         /* Update AR coefficient */
         for (n = 0; n < (k + 1)>>1; n++) {
@@ -135,5 +135,5 @@ oac_int32 oaci_silk_LPC_inverse_pred_gain_c(            /* O   Returns inverse p
     if (DC_resp >= 4096) {
         return 0;
     }
-    return LPC_inverse_pred_gain_QA_c( Atmp_QA, order );
+    return oaci_LPC_inverse_pred_gain_QA_c( Atmp_QA, order );
 }
diff --git a/silk/NSQ.c b/silk/NSQ.c
index d045c64ee..b8c3e2d41 100644
--- a/silk/NSQ.c
+++ b/silk/NSQ.c
@@ -210,7 +210,7 @@ void oaci_silk_noise_shape_quantizer(
     oac_int32 exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10;
     oac_int32 tmp1, tmp2, sLF_AR_shp_Q14;
     oac_int32   *psLPC_Q14, *shp_lag_ptr, *pred_lag_ptr;
-#ifdef silk_short_prediction_create_arch_coef
+#ifdef oaci_silk_short_prediction_create_arch_coef
     oac_int32 a_Q12_arch[MAX_LPC_ORDER];
 #endif
 
@@ -221,8 +221,8 @@ void oaci_silk_noise_shape_quantizer(
     /* Set up short term AR state */
     psLPC_Q14 = &NSQ->sLPC_Q14[ NSQ_LPC_BUF_LENGTH - 1 ];
 
-#ifdef silk_short_prediction_create_arch_coef
-    silk_short_prediction_create_arch_coef(a_Q12_arch, a_Q12, predictLPCOrder);
+#ifdef oaci_silk_short_prediction_create_arch_coef
+    oaci_silk_short_prediction_create_arch_coef(a_Q12_arch, a_Q12, predictLPCOrder);
 #endif
 
     for (i = 0; i < length; i++) {
@@ -384,7 +384,7 @@ static OAC_INLINE void oaci_silk_nsq_scale_states(
     oac_int32 gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
 
     lag          = pitchL[ subfr ];
-    inv_gain_Q31 = silk_INVERSE32_varQ( silk_max( Gains_Q16[ subfr ], 1 ), 47 );
+    inv_gain_Q31 = oaci_silk_INVERSE32_varQ( silk_max( Gains_Q16[ subfr ], 1 ), 47 );
     silk_assert( inv_gain_Q31 != 0 );
 
     /* Scale input */
diff --git a/silk/NSQ.h b/silk/NSQ.h
index 0d46f1543..72632baf6 100644
--- a/silk/NSQ.h
+++ b/silk/NSQ.h
@@ -30,7 +30,7 @@
 
 #include "SigProc_FIX.h"
 
-#undef silk_short_prediction_create_arch_coef
+#undef oaci_silk_short_prediction_create_arch_coef
 
 static OAC_INLINE oac_int32 oaci_silk_noise_shape_quantizer_short_prediction_c(const oac_int32 *buf32,
                                                                           const oac_int16 *coef16, oac_int order) {
diff --git a/silk/NSQ_del_dec.c b/silk/NSQ_del_dec.c
index 5f3163825..9c1063e62 100644
--- a/silk/NSQ_del_dec.c
+++ b/silk/NSQ_del_dec.c
@@ -352,7 +352,7 @@ static OAC_INLINE void oaci_silk_noise_shape_quantizer_del_dec(
     oac_int32 q1_Q0, q1_Q10, q2_Q10, exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10;
     oac_int32 tmp1, tmp2, sLF_AR_shp_Q14;
     oac_int32   *pred_lag_ptr, *shp_lag_ptr, *psLPC_Q14;
-# ifdef silk_short_prediction_create_arch_coef
+# ifdef oaci_silk_short_prediction_create_arch_coef
     oac_int32 a_Q12_arch[MAX_LPC_ORDER];
 # endif
 
@@ -368,8 +368,8 @@ static OAC_INLINE void oaci_silk_noise_shape_quantizer_del_dec(
     pred_lag_ptr = &sLTP_Q15[ NSQ->sLTP_buf_idx - lag + LTP_ORDER/2 ];
     Gain_Q10     = silk_RSHIFT( Gain_Q16, 6 );
 
-# ifdef silk_short_prediction_create_arch_coef
-    silk_short_prediction_create_arch_coef(a_Q12_arch, a_Q12, predictLPCOrder);
+# ifdef oaci_silk_short_prediction_create_arch_coef
+    oaci_silk_short_prediction_create_arch_coef(a_Q12_arch, a_Q12, predictLPCOrder);
 # endif
 
     for (i = 0; i < length; i++) {
@@ -673,7 +673,7 @@ static OAC_INLINE void oaci_silk_nsq_del_dec_scale_states(
     NSQ_del_dec_struct  *psDD;
 
     lag          = pitchL[ subfr ];
-    inv_gain_Q31 = silk_INVERSE32_varQ( silk_max( Gains_Q16[ subfr ], 1 ), 47 );
+    inv_gain_Q31 = oaci_silk_INVERSE32_varQ( silk_max( Gains_Q16[ subfr ], 1 ), 47 );
     silk_assert( inv_gain_Q31 != 0 );
 
     /* Scale input */
diff --git a/silk/PLC.c b/silk/PLC.c
index 49217f903..dc6ea0bd1 100644
--- a/silk/PLC.c
+++ b/silk/PLC.c
@@ -186,7 +186,7 @@ static OAC_INLINE void oaci_silk_PLC_update(
     psPLC->nb_subfr = psDec->nb_subfr;
 }
 
-static OAC_INLINE void silk_PLC_energy(oac_int32 *energy1, oac_int *shift1, oac_int32 *energy2, oac_int *shift2,
+static OAC_INLINE void oaci_silk_PLC_energy(oac_int32 *energy1, oac_int *shift1, oac_int32 *energy2, oac_int *shift2,
                                        const oac_int32 *exc_Q14, const oac_int32 *prevGain_Q10, int subfr_length,
                                        int nb_subfr) {
     int i, k;
@@ -253,7 +253,7 @@ static OAC_INLINE void oaci_silk_PLC_conceal(
         silk_memset( psPLC->prevLPC_Q12, 0, sizeof(psPLC->prevLPC_Q12));
     }
 
-    silk_PLC_energy(&energy1, &shift1, &energy2, &shift2, psDec->exc_Q14, prevGain_Q10, psDec->subfr_length,
+    oaci_silk_PLC_energy(&energy1, &shift1, &energy2, &shift2, psDec->exc_Q14, prevGain_Q10, psDec->subfr_length,
     psDec->nb_subfr);
 
     if (silk_RSHIFT( energy1, shift2 ) < silk_RSHIFT( energy2, shift1 )) {
@@ -317,7 +317,7 @@ static OAC_INLINE void oaci_silk_PLC_conceal(
     oaci_silk_LPC_analysis_filter( &sLTP[ idx ], &psDec->outBuf[ idx ], A_Q12, psDec->ltp_mem_length - idx, psDec->LPC_order,
     arch );
     /* Scale LTP state */
-    inv_gain_Q30 = silk_INVERSE32_varQ( psPLC->prevGain_Q16[ 1 ], 46 );
+    inv_gain_Q30 = oaci_silk_INVERSE32_varQ( psPLC->prevGain_Q16[ 1 ], 46 );
     inv_gain_Q30 = silk_min( inv_gain_Q30, silk_int32_MAX>>1 );
     for (i = idx + psDec->LPC_order; i < psDec->ltp_mem_length; i++) {
         sLTP_Q14[ i ] = silk_SMULWB( inv_gain_Q30, sLTP[ i ] );
@@ -470,7 +470,7 @@ void oaci_silk_PLC_glue_frames(
 
                 frac_Q24 = silk_DIV32( psPLC->conc_energy, silk_max( energy, 1 ));
 
-                gain_Q16 = silk_LSHIFT( silk_SQRT_APPROX( frac_Q24 ), 4 );
+                gain_Q16 = silk_LSHIFT( oaci_silk_SQRT_APPROX( frac_Q24 ), 4 );
                 slope_Q16 = silk_DIV32_16(((oac_int32)1<<16) - gain_Q16, length );
                 /* Make slope 4x steeper to avoid missing onsets after DTX */
                 slope_Q16 = silk_LSHIFT( slope_Q16, 2 );
diff --git a/silk/SigProc_FIX.h b/silk/SigProc_FIX.h
index 3db28a5b6..3afeda6aa 100644
--- a/silk/SigProc_FIX.h
+++ b/silk/SigProc_FIX.h
@@ -94,7 +94,7 @@ void oaci_silk_resampler_down2_3(
 
 /*!
  * second order ARMA filter;
- * slower than biquad() but uses more precise coefficients
+ * slower than oaci_biquad() but uses more precise coefficients
  * can handle (slowly) varying coefficients
  */
 void oaci_silk_biquad_alt_stride1(
diff --git a/silk/VAD.c b/silk/VAD.c
index a319cc360..3c1cb8dbe 100644
--- a/silk/VAD.c
+++ b/silk/VAD.c
@@ -217,7 +217,7 @@ oac_int oaci_silk_VAD_GetSA_Q8_c(                                   /* O    Retu
             /* Tilt measure */
             if (speech_nrg < ((oac_int32)1<<20)) {
                 /* Scale down SNR value for small subband speech energies */
-                SNR_Q7 = silk_SMULWB( silk_LSHIFT( silk_SQRT_APPROX( speech_nrg ), 6 ), SNR_Q7 );
+                SNR_Q7 = silk_SMULWB( silk_LSHIFT( oaci_silk_SQRT_APPROX( speech_nrg ), 6 ), SNR_Q7 );
             }
             input_tilt = silk_SMLAWB( input_tilt, tiltWeights[ b ], SNR_Q7 );
         } else {
@@ -229,7 +229,7 @@ oac_int oaci_silk_VAD_GetSA_Q8_c(                                   /* O    Retu
     sumSquared = silk_DIV32_16( sumSquared, VAD_N_BANDS ); /* Q14 */
 
     /* Root-mean-square approximation, scale to dBs, and write to output pointer */
-    pSNR_dB_Q7 = (oac_int16)(3*silk_SQRT_APPROX( sumSquared ));     /* Q7 */
+    pSNR_dB_Q7 = (oac_int16)(3*oaci_silk_SQRT_APPROX( sumSquared ));     /* Q7 */
 
     /*********************************/
     /* Speech Probability Estimation */
@@ -260,7 +260,7 @@ oac_int oaci_silk_VAD_GetSA_Q8_c(                                   /* O    Retu
         speech_nrg = silk_LSHIFT32( speech_nrg, 16 );
 
         /* square-root */
-        speech_nrg = silk_SQRT_APPROX( speech_nrg );
+        speech_nrg = oaci_silk_SQRT_APPROX( speech_nrg );
         SA_Q15 = silk_SMULWB( 32768 + speech_nrg, SA_Q15 );
     }
 
diff --git a/silk/arm/LPC_inv_pred_gain_neon_intr.c b/silk/arm/LPC_inv_pred_gain_neon_intr.c
index c322604df..dd8226a29 100644
--- a/silk/arm/LPC_inv_pred_gain_neon_intr.c
+++ b/silk/arm/LPC_inv_pred_gain_neon_intr.c
@@ -93,7 +93,7 @@ static OAC_INLINE oac_int32 oaci_LPC_inverse_pred_gain_QA_neon( /* O   Returns i
 
         /* rc_mult2 range: [ 2^30 : silk_int32_MAX ] */
         mult2Q = 32 - silk_CLZ32( silk_abs( rc_mult1_Q30 ));
-        rc_mult2 = silk_INVERSE32_varQ( rc_mult1_Q30, mult2Q + 30 );
+        rc_mult2 = oaci_silk_INVERSE32_varQ( rc_mult1_Q30, mult2Q + 30 );
 
         /* Update AR coefficient */
         rc_Q31_s32x2   = vdup_n_s32( rc_Q31 );
diff --git a/silk/arm/NSQ_del_dec_neon_intr.c b/silk/arm/NSQ_del_dec_neon_intr.c
index b7be7d780..417a77361 100644
--- a/silk/arm/NSQ_del_dec_neon_intr.c
+++ b/silk/arm/NSQ_del_dec_neon_intr.c
@@ -470,9 +470,9 @@ void oaci_silk_NSQ_del_dec_neon(
 /******************************************/
 /* Noise shape quantizer for one subframe */
 /******************************************/
-/* Note: Function silk_short_prediction_create_arch_coef_neon() defined in NSQ_neon.h is actually a hacking C function. */
+/* Note: Function oaci_silk_short_prediction_create_arch_coef_neon() defined in NSQ_neon.h is actually a hacking C function. */
 /*       Therefore here we append "_local" to the NEON function name to avoid confusion.                                */
-static OAC_INLINE void silk_short_prediction_create_arch_coef_neon_local(oac_int32 *out, const oac_int16 *in,
+static OAC_INLINE void oaci_silk_short_prediction_create_arch_coef_neon_local(oac_int32 *out, const oac_int16 *in,
                                                                          oac_int order) {
     int16x8_t t_s16x8;
     int32x4_t t0_s32x4, t1_s32x4, t2_s32x4, t3_s32x4;
@@ -630,7 +630,7 @@ static OAC_INLINE void oaci_silk_noise_shape_quantizer_del_dec_neon(
         AR_shp_Q28[i] = silk_LSHIFT32( AR_shp_Q13[i], 15 );
     }
 
-    silk_short_prediction_create_arch_coef_neon_local( a_Q12_arch, a_Q12, predictLPCOrder );
+    oaci_silk_short_prediction_create_arch_coef_neon_local( a_Q12_arch, a_Q12, predictLPCOrder );
 
     for (i = 0; i < length; i++) {
         int32x4_t Seed_s32x4, LPC_pred_Q14_s32x4;
@@ -1070,7 +1070,7 @@ static OAC_INLINE void oaci_silk_nsq_del_dec_scale_states_neon(
     oac_int32 gain_adj_Q16, inv_gain_Q31, inv_gain_Q26;
 
     lag          = pitchL[ subfr ];
-    inv_gain_Q31 = silk_INVERSE32_varQ( silk_max( Gains_Q16[ subfr ], 1 ), 47 );
+    inv_gain_Q31 = oaci_silk_INVERSE32_varQ( silk_max( Gains_Q16[ subfr ], 1 ), 47 );
     silk_assert( inv_gain_Q31 != 0 );
 
     /* Scale input */
diff --git a/silk/arm/NSQ_neon.h b/silk/arm/NSQ_neon.h
index cc55460f1..313acc48b 100644
--- a/silk/arm/NSQ_neon.h
+++ b/silk/arm/NSQ_neon.h
@@ -30,9 +30,9 @@
 #include "cpu_support.h"
 #include "SigProc_FIX.h"
 
-#undef silk_short_prediction_create_arch_coef
+#undef oaci_silk_short_prediction_create_arch_coef
 /* For vectorized calc, reverse a_Q12 coefs, convert to 32-bit, and shift for vqdmulhq_s32. */
-static OAC_INLINE void silk_short_prediction_create_arch_coef_neon(oac_int32 *out, const oac_int16 *in, oac_int order) {
+static OAC_INLINE void oaci_silk_short_prediction_create_arch_coef_neon(oac_int32 *out, const oac_int16 *in, oac_int order) {
     out[15] = silk_LSHIFT32(in[0], 15);
     out[14] = silk_LSHIFT32(in[1], 15);
     out[13] = silk_LSHIFT32(in[2], 15);
@@ -63,13 +63,13 @@ static OAC_INLINE void silk_short_prediction_create_arch_coef_neon(oac_int32 *ou
 
 #if defined(OAC_ARM_PRESUME_NEON_INTR)
 
-# define silk_short_prediction_create_arch_coef(out, in, order) \
-        (silk_short_prediction_create_arch_coef_neon(out, in, order))
+# define oaci_silk_short_prediction_create_arch_coef(out, in, order) \
+        (oaci_silk_short_prediction_create_arch_coef_neon(out, in, order))
 
 #elif defined(OAC_HAVE_RTCD) && defined(OAC_ARM_MAY_HAVE_NEON_INTR)
 
-# define silk_short_prediction_create_arch_coef(out, in, order) \
-        do { if (arch >= OAC_ARCH_ARM_NEON) { silk_short_prediction_create_arch_coef_neon(out, in, order); } } while (0)
+# define oaci_silk_short_prediction_create_arch_coef(out, in, order) \
+        do { if (arch >= OAC_ARCH_ARM_NEON) { oaci_silk_short_prediction_create_arch_coef_neon(out, in, order); } } while (0)
 
 #endif
 
diff --git a/silk/control_codec.c b/silk/control_codec.c
index 63298888d..79b8a669d 100644
--- a/silk/control_codec.c
+++ b/silk/control_codec.c
@@ -44,18 +44,18 @@ static oac_int oaci_silk_setup_resamplers(
     oac_int fs_kHz                                     /* I                        */
     );
 
-static oac_int silk_setup_fs(
+static oac_int oaci_silk_setup_fs(
     silk_encoder_state_Fxx          *psEnc,             /* I/O                      */
     oac_int fs_kHz,                                    /* I                        */
     oac_int PacketSize_ms                              /* I                        */
     );
 
-static oac_int silk_setup_complexity(
+static oac_int oaci_silk_setup_complexity(
     silk_encoder_state              *psEncC,            /* I/O                      */
     oac_int Complexity                                 /* I                        */
     );
 
-static OAC_INLINE oac_int silk_setup_LBRR(
+static OAC_INLINE oac_int oaci_silk_setup_LBRR(
     silk_encoder_state              *psEncC,            /* I/O                      */
     const silk_EncControlStruct     *encControl         /* I                        */
     );
@@ -107,12 +107,12 @@ oac_int oaci_silk_control_encoder(
     /********************************************/
     /* Set internal sampling frequency          */
     /********************************************/
-    ret += silk_setup_fs( psEnc, fs_kHz, encControl->payloadSize_ms );
+    ret += oaci_silk_setup_fs( psEnc, fs_kHz, encControl->payloadSize_ms );
 
     /********************************************/
     /* Set encoding complexity                  */
     /********************************************/
-    ret += silk_setup_complexity( &psEnc->sCmn, encControl->complexity  );
+    ret += oaci_silk_setup_complexity( &psEnc->sCmn, encControl->complexity  );
 
     /********************************************/
     /* Set packet loss rate measured by farend  */
@@ -122,7 +122,7 @@ oac_int oaci_silk_control_encoder(
     /********************************************/
     /* Set LBRR usage                           */
     /********************************************/
-    ret += silk_setup_LBRR( &psEnc->sCmn, encControl );
+    ret += oaci_silk_setup_LBRR( &psEnc->sCmn, encControl );
 
     psEnc->sCmn.controlled_since_last_payload = 1;
 
@@ -183,7 +183,7 @@ static oac_int oaci_silk_setup_resamplers(
             ret += oaci_silk_resampler( &psEnc->sCmn.resampler_state, x_bufFIX, x_buf_API_fs_Hz, api_buf_samples );
 
 #ifndef FIXED_POINT
-            silk_short2float_array( psEnc->x_buf, x_bufFIX, new_buf_samples);
+            oaci_silk_short2float_array( psEnc->x_buf, x_bufFIX, new_buf_samples);
 #endif
         }
     }
@@ -194,7 +194,7 @@ static oac_int oaci_silk_setup_resamplers(
     return ret;
 }
 
-static oac_int silk_setup_fs(
+static oac_int oaci_silk_setup_fs(
     silk_encoder_state_Fxx          *psEnc,             /* I/O                      */
     oac_int fs_kHz,                                    /* I                        */
     oac_int PacketSize_ms                              /* I                        */
@@ -301,7 +301,7 @@ static oac_int silk_setup_fs(
     return ret;
 }
 
-static oac_int silk_setup_complexity(
+static oac_int oaci_silk_setup_complexity(
     silk_encoder_state              *psEncC,            /* I/O                      */
     oac_int Complexity                                 /* I                        */
     ) {
@@ -396,7 +396,7 @@ static oac_int silk_setup_complexity(
     return ret;
 }
 
-static OAC_INLINE oac_int silk_setup_LBRR(
+static OAC_INLINE oac_int oaci_silk_setup_LBRR(
     silk_encoder_state          *psEncC,            /* I/O                      */
     const silk_EncControlStruct *encControl         /* I                        */
     ) {
diff --git a/silk/decode_core.c b/silk/decode_core.c
index f3b27243c..dd696cb6a 100644
--- a/silk/decode_core.c
+++ b/silk/decode_core.c
@@ -108,7 +108,7 @@ void oaci_silk_decode_core(
         signalType   = psDec->indices.signalType;
 
         Gain_Q10     = silk_RSHIFT( psDecCtrl->Gains_Q16[ k ], 6 );
-        inv_gain_Q31 = silk_INVERSE32_varQ( psDecCtrl->Gains_Q16[ k ], 47 );
+        inv_gain_Q31 = oaci_silk_INVERSE32_varQ( psDecCtrl->Gains_Q16[ k ], 47 );
 
         /* Calculate gain adjustment factor */
         if (psDecCtrl->Gains_Q16[ k ] != psDec->prev_gain_Q16) {
diff --git a/silk/enc_API.c b/silk/enc_API.c
index 9c12b438d..49db926fd 100644
--- a/silk/enc_API.c
+++ b/silk/enc_API.c
@@ -48,7 +48,7 @@
 /***************************************/
 /* Read control structure from encoder */
 /***************************************/
-static oac_int silk_QueryEncoder(                      /* O    Returns error code                              */
+static oac_int oaci_silk_QueryEncoder(                      /* O    Returns error code                              */
     const void                      *encState,          /* I    State                                           */
     silk_EncControlStruct           *encStatus          /* O    Encoder Status                                  */
     );
@@ -98,7 +98,7 @@ oac_int oaci_silk_InitEncoder(                              /* O    Returns erro
     psEnc->nChannelsInternal = 1;
 
     /* Read control structure */
-    if (ret += silk_QueryEncoder( encState, encStatus )) {
+    if (ret += oaci_silk_QueryEncoder( encState, encStatus )) {
         celt_assert( 0 );
     }
 
@@ -108,7 +108,7 @@ oac_int oaci_silk_InitEncoder(                              /* O    Returns erro
 /***************************************/
 /* Read control structure from encoder */
 /***************************************/
-static oac_int silk_QueryEncoder(                      /* O    Returns error code                              */
+static oac_int oaci_silk_QueryEncoder(                      /* O    Returns error code                              */
     const void                      *encState,          /* I    State                                           */
     silk_EncControlStruct           *encStatus          /* O    Encoder Status                                  */
     ) {
diff --git a/silk/encode_pulses.c b/silk/encode_pulses.c
index fe8fe8f08..8d17aa53c 100644
--- a/silk/encode_pulses.c
+++ b/silk/encode_pulses.c
@@ -36,7 +36,7 @@
 /* Encode quantization indices of excitation */
 /*********************************************/
 
-static OAC_INLINE oac_int combine_and_check(    /* return ok                           */
+static OAC_INLINE oac_int oaci_combine_and_check(    /* return ok                           */
     oac_int         *pulses_comb,           /* O                                   */
     const oac_int   *pulses_in,             /* I                                   */
     oac_int max_pulses,                     /* I    max value for sum of pulses    */
@@ -108,13 +108,13 @@ void oaci_silk_encode_pulses(
 
         while (1) {
             /* 1+1 -> 2 */
-            scale_down = combine_and_check( pulses_comb, abs_pulses_ptr, oaci_silk_max_pulses_table[ 0 ], 8 );
+            scale_down = oaci_combine_and_check( pulses_comb, abs_pulses_ptr, oaci_silk_max_pulses_table[ 0 ], 8 );
             /* 2+2 -> 4 */
-            scale_down += combine_and_check( pulses_comb, pulses_comb, oaci_silk_max_pulses_table[ 1 ], 4 );
+            scale_down += oaci_combine_and_check( pulses_comb, pulses_comb, oaci_silk_max_pulses_table[ 1 ], 4 );
             /* 4+4 -> 8 */
-            scale_down += combine_and_check( pulses_comb, pulses_comb, oaci_silk_max_pulses_table[ 2 ], 2 );
+            scale_down += oaci_combine_and_check( pulses_comb, pulses_comb, oaci_silk_max_pulses_table[ 2 ], 2 );
             /* 8+8 -> 16 */
-            scale_down += combine_and_check( &sum_pulses[ i ], pulses_comb, oaci_silk_max_pulses_table[ 3 ], 1 );
+            scale_down += oaci_combine_and_check( &sum_pulses[ i ], pulses_comb, oaci_silk_max_pulses_table[ 3 ], 1 );
 
             if (scale_down) {
                 /* We need to downscale the quantization signal */
diff --git a/silk/fixed/burg_modified_FIX.c b/silk/fixed/burg_modified_FIX.c
index 0decf84d1..c0089af17 100644
--- a/silk/fixed/burg_modified_FIX.c
+++ b/silk/fixed/burg_modified_FIX.c
@@ -201,7 +201,7 @@ void oaci_silk_burg_modified_c(
         if (tmp1 <= minInvGain_Q30) {
             /* Max prediction gain exceeded; set reflection coefficient such that max prediction gain is exactly hit */
             tmp2 = ((oac_int32)1<<30) - silk_DIV32_varQ( minInvGain_Q30, invGain_Q30, 30 );                /* Q30 */
-            rc_Q31 = silk_SQRT_APPROX( tmp2 );                                                  /* Q15 */
+            rc_Q31 = oaci_silk_SQRT_APPROX( tmp2 );                                                  /* Q15 */
             if (rc_Q31 > 0) {
                 /* Newton-Raphson iteration */
                 rc_Q31 = silk_RSHIFT32( rc_Q31 + silk_DIV32( tmp2, rc_Q31 ), 1 );                       /* Q15 */
diff --git a/silk/fixed/encode_frame_FIX.c b/silk/fixed/encode_frame_FIX.c
index 1b52b07d7..a34f2ecac 100644
--- a/silk/fixed/encode_frame_FIX.c
+++ b/silk/fixed/encode_frame_FIX.c
@@ -35,7 +35,7 @@
 #include "tuning_parameters.h"
 
 /* Low Bitrate Redundancy (LBRR) encoding. Reuse all parameters but encode with lower bitrate           */
-static OAC_INLINE void silk_LBRR_encode_FIX(
+static OAC_INLINE void oaci_silk_LBRR_encode_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  Pointer to Silk FIX encoder control struct                                  */
     const oac_int16 x16[],                                                 /* I    Input signal                                                                */
@@ -168,7 +168,7 @@ oac_int oaci_silk_encode_frame_FIX(
         /****************************************/
         /* Low Bitrate Redundant Encoding       */
         /****************************************/
-        silk_LBRR_encode_FIX( psEnc, &sEncCtrl, x_frame, condCoding );
+        oaci_silk_LBRR_encode_FIX( psEnc, &sEncCtrl, x_frame, condCoding );
 
         /* Loop over quantizer and entropy coding to control bitrate */
         maxIter = 6;
@@ -394,7 +394,7 @@ oac_int oaci_silk_encode_frame_FIX(
 }
 
 /* Low-Bitrate Redundancy (LBRR) encoding. Reuse all parameters but encode excitation at lower bitrate  */
-static OAC_INLINE void silk_LBRR_encode_FIX(
+static OAC_INLINE void oaci_silk_LBRR_encode_FIX(
     silk_encoder_state_FIX          *psEnc,                                 /* I/O  Pointer to Silk FIX encoder state                                           */
     silk_encoder_control_FIX        *psEncCtrl,                             /* I/O  Pointer to Silk FIX encoder control struct                                  */
     const oac_int16 x16[],                                                 /* I    Input signal                                                                */
diff --git a/silk/fixed/noise_shape_analysis_FIX.c b/silk/fixed/noise_shape_analysis_FIX.c
index 67fc95135..da2aa733f 100644
--- a/silk/fixed/noise_shape_analysis_FIX.c
+++ b/silk/fixed/noise_shape_analysis_FIX.c
@@ -37,7 +37,7 @@
 /* non-warped frequency scale. (So that it can be implemented with a minimum-phase monic filter.) */
 /* Note: A monic filter is one with the first coefficient equal to 1.0. In Silk we omit the first */
 /* coefficient in an array of coefficients, for monic filters.                                    */
-static OAC_INLINE oac_int32 warped_gain( /* gain in Q16*/
+static OAC_INLINE oac_int32 oaci_warped_gain( /* gain in Q16*/
     const oac_int32     *coefs_Q24,
     oac_int lambda_Q16,
     oac_int order) {
@@ -50,7 +50,7 @@ static OAC_INLINE oac_int32 warped_gain( /* gain in Q16*/
         gain_Q24 = silk_SMLAWB( coefs_Q24[ i ], gain_Q24, lambda_Q16 );
     }
     gain_Q24  = silk_SMLAWB( SILK_FIX_CONST( 1.0, 24 ), gain_Q24, -lambda_Q16 );
-    return silk_INVERSE32_varQ( gain_Q24, 40 );
+    return oaci_silk_INVERSE32_varQ( gain_Q24, 40 );
 }
 
 /* Convert warped filter coefficients to monic pseudo-warped coefficients and limit maximum     */
@@ -99,7 +99,7 @@ static OAC_INLINE void oaci_limit_warped_coefs(
         for (i = 1; i < order; i++) {
             coefs_Q24[ i - 1 ] = silk_SMLAWB( coefs_Q24[ i - 1 ], coefs_Q24[ i ], lambda_Q16 );
         }
-        gain_Q16 = silk_INVERSE32_varQ( gain_Q16, 32 );
+        gain_Q16 = oaci_silk_INVERSE32_varQ( gain_Q16, 32 );
         for (i = 0; i < order; i++) {
             coefs_Q24[ i ] = silk_SMULWW( gain_Q16, coefs_Q24[ i ] );
         }
@@ -284,14 +284,14 @@ void oaci_silk_noise_shape_analysis_FIX(
             nrg >>= 1;
         }
 
-        tmp32 = silk_SQRT_APPROX( nrg );
+        tmp32 = oaci_silk_SQRT_APPROX( nrg );
         Qnrg >>= 1;             /* range: -6...15*/
 
         psEncCtrl->Gains_Q16[ k ] = silk_LSHIFT_SAT32( tmp32, 16 - Qnrg );
 
         if (psEnc->sCmn.warping_Q16 > 0) {
             /* Adjust gain for warping */
-            gain_mult_Q16 = warped_gain( AR_Q24, warping_Q16, psEnc->sCmn.shapingLPCOrder );
+            gain_mult_Q16 = oaci_warped_gain( AR_Q24, warping_Q16, psEnc->sCmn.shapingLPCOrder );
             silk_assert( psEncCtrl->Gains_Q16[ k ] > 0 );
             if (psEncCtrl->Gains_Q16[ k ] < SILK_FIX_CONST( 0.25, 16 )) {
                 psEncCtrl->Gains_Q16[ k ] = silk_SMULWW( psEncCtrl->Gains_Q16[ k ], gain_mult_Q16 );
@@ -386,7 +386,7 @@ void oaci_silk_noise_shape_analysis_FIX(
 
         /* Less harmonic noise shaping for less periodic signals */
         HarmShapeGain_Q16 = silk_SMULWB( silk_LSHIFT( HarmShapeGain_Q16, 1 ),
-            silk_SQRT_APPROX( silk_LSHIFT( psEnc->LTPCorr_Q15, 15 )));
+            oaci_silk_SQRT_APPROX( silk_LSHIFT( psEnc->LTPCorr_Q15, 15 )));
     } else {
         HarmShapeGain_Q16 = 0;
     }
diff --git a/silk/fixed/pitch_analysis_core_FIX.c b/silk/fixed/pitch_analysis_core_FIX.c
index 455796d04..792e82a63 100644
--- a/silk/fixed/pitch_analysis_core_FIX.c
+++ b/silk/fixed/pitch_analysis_core_FIX.c
@@ -56,7 +56,7 @@ typedef oac_int32 silk_pe_stage3_vals[ PE_NB_STAGE3_LAGS ];
 /************************************************************/
 /* Internally used functions                                */
 /************************************************************/
-static void silk_P_Ana_calc_corr_st3(
+static void oaci_silk_P_Ana_calc_corr_st3(
     silk_pe_stage3_vals cross_corr_st3[],              /* O 3 DIM correlation array */
     const oac_int16 frame[],                          /* I vector to correlate         */
     oac_int start_lag,                                /* I lag offset to search around */
@@ -66,7 +66,7 @@ static void silk_P_Ana_calc_corr_st3(
     int arch                                           /* I Run-time architecture       */
     );
 
-static void silk_P_Ana_calc_energy_st3(
+static void oaci_silk_P_Ana_calc_energy_st3(
     silk_pe_stage3_vals energies_st3[],                /* O 3 DIM energy array */
     const oac_int16 frame[],                          /* I vector to calc energy in    */
     oac_int start_lag,                                /* I lag offset to search around */
@@ -499,8 +499,8 @@ oac_int oaci_silk_pitch_analysis_core(                  /* O    Voicing estimate
         /* Calculate the correlations and energies needed in stage 3 */
         ALLOC( energies_st3, nb_subfr*nb_cbk_search, silk_pe_stage3_vals );
         ALLOC( cross_corr_st3, nb_subfr*nb_cbk_search, silk_pe_stage3_vals );
-        silk_P_Ana_calc_corr_st3(  cross_corr_st3, frame, start_lag, sf_length, nb_subfr, complexity, arch );
-        silk_P_Ana_calc_energy_st3( energies_st3, frame, start_lag, sf_length, nb_subfr, complexity, arch );
+        oaci_silk_P_Ana_calc_corr_st3(  cross_corr_st3, frame, start_lag, sf_length, nb_subfr, complexity, arch );
+        oaci_silk_P_Ana_calc_energy_st3( energies_st3, frame, start_lag, sf_length, nb_subfr, complexity, arch );
 
         lag_counter = 0;
         silk_assert( lag == silk_SAT16( lag ));
@@ -574,7 +574,7 @@ oac_int oaci_silk_pitch_analysis_core(                  /* O    Voicing estimate
 * In total 48 correlations. The direct implementation computed in worst
 * case 4*12*5 = 240 correlations, but more likely around 120.
 ***********************************************************************/
-static void silk_P_Ana_calc_corr_st3(
+static void oaci_silk_P_Ana_calc_corr_st3(
     silk_pe_stage3_vals cross_corr_st3[],              /* O 3 DIM correlation array */
     const oac_int16 frame[],                          /* I vector to correlate         */
     oac_int start_lag,                                /* I lag offset to search around */
@@ -646,7 +646,7 @@ static void silk_P_Ana_calc_corr_st3(
 /* Calculate the energies for first two subframes. The energies are */
 /* calculated recursively.                                          */
 /********************************************************************/
-static void silk_P_Ana_calc_energy_st3(
+static void oaci_silk_P_Ana_calc_energy_st3(
     silk_pe_stage3_vals energies_st3[],                 /* O 3 DIM energy array */
     const oac_int16 frame[],                           /* I vector to calc energy in    */
     oac_int start_lag,                                 /* I lag offset to search around */
diff --git a/silk/fixed/process_gains_FIX.c b/silk/fixed/process_gains_FIX.c
index b59d18afb..8d6c2b6b9 100644
--- a/silk/fixed/process_gains_FIX.c
+++ b/silk/fixed/process_gains_FIX.c
@@ -44,7 +44,7 @@ void oaci_silk_process_gains_FIX(
 
     /* Gain reduction when LTP coding gain is high */
     if (psEnc->sCmn.indices.signalType == TYPE_VOICED) {
-        /*s = -0.5f * silk_sigmoid( 0.25f * ( psEncCtrl->LTPredCodGain - 12.0f ) ); */
+        /*s = -0.5f * oaci_silk_sigmoid( 0.25f * ( psEncCtrl->LTPredCodGain - 12.0f ) ); */
         s_Q16 = -oaci_silk_sigm_Q15( silk_RSHIFT_ROUND( psEncCtrl->LTPredCodGain_Q7 - SILK_FIX_CONST( 12.0, 7 ), 4 ));
         for (k = 0; k < psEnc->sCmn.nb_subfr; k++) {
             psEncCtrl->Gains_Q16[ k ] = silk_SMLAWB( psEncCtrl->Gains_Q16[ k ], psEncCtrl->Gains_Q16[ k ], s_Q16 );
@@ -76,11 +76,11 @@ void oaci_silk_process_gains_FIX(
             /* recalculate with higher precision */
             gain_squared = silk_SMLAWW( silk_LSHIFT( ResNrgPart, 16 ), gain, gain );
             silk_assert( gain_squared > 0 );
-            gain = silk_SQRT_APPROX( gain_squared );                    /* Q8   */
+            gain = oaci_silk_SQRT_APPROX( gain_squared );                    /* Q8   */
             gain = silk_min( gain, silk_int32_MAX>>8 );
             psEncCtrl->Gains_Q16[ k ] = silk_LSHIFT_SAT32( gain, 8 );   /* Q16  */
         } else {
-            gain = silk_SQRT_APPROX( gain_squared );                    /* Q0   */
+            gain = oaci_silk_SQRT_APPROX( gain_squared );                    /* Q0   */
             gain = silk_min( gain, silk_int32_MAX>>16 );
             psEncCtrl->Gains_Q16[ k ] = silk_LSHIFT_SAT32( gain, 16 );  /* Q16  */
         }
diff --git a/silk/fixed/x86/burg_modified_FIX_sse4_1.c b/silk/fixed/x86/burg_modified_FIX_sse4_1.c
index 3851950bf..11be15787 100644
--- a/silk/fixed/x86/burg_modified_FIX_sse4_1.c
+++ b/silk/fixed/x86/burg_modified_FIX_sse4_1.c
@@ -298,7 +298,7 @@ void oaci_silk_burg_modified_sse4_1(
         if (tmp1 <= minInvGain_Q30) {
             /* Max prediction gain exceeded; set reflection coefficient such that max prediction gain is exactly hit */
             tmp2 = ((oac_int32)1<<30) - silk_DIV32_varQ( minInvGain_Q30, invGain_Q30, 30 );                /* Q30 */
-            rc_Q31 = silk_SQRT_APPROX( tmp2 );                                                  /* Q15 */
+            rc_Q31 = oaci_silk_SQRT_APPROX( tmp2 );                                                  /* Q15 */
             if (rc_Q31 > 0) {
                 /* Newton-Raphson iteration */
                 rc_Q31 = silk_RSHIFT32( rc_Q31 + silk_DIV32( tmp2, rc_Q31 ), 1 );                   /* Q15 */
diff --git a/silk/float/LPC_analysis_filter_FLP.c b/silk/float/LPC_analysis_filter_FLP.c
index 50df91e2a..fed7ccf8f 100644
--- a/silk/float/LPC_analysis_filter_FLP.c
+++ b/silk/float/LPC_analysis_filter_FLP.c
@@ -40,7 +40,7 @@
 /************************************************/
 
 /* 16th order LPC analysis filter, does not write first 16 samples */
-static OAC_INLINE void silk_LPC_analysis_filter16_FLP(
+static OAC_INLINE void oaci_silk_LPC_analysis_filter16_FLP(
     silk_float r_LPC[],                                  /* O    LPC residual signal                     */
     const silk_float PredCoef[],                         /* I    LPC coefficients                        */
     const silk_float s[],                                /* I    Input signal                            */
@@ -77,7 +77,7 @@ static OAC_INLINE void silk_LPC_analysis_filter16_FLP(
 }
 
 /* 12th order LPC analysis filter, does not write first 12 samples */
-static OAC_INLINE void silk_LPC_analysis_filter12_FLP(
+static OAC_INLINE void oaci_silk_LPC_analysis_filter12_FLP(
     silk_float r_LPC[],                                  /* O    LPC residual signal                     */
     const silk_float PredCoef[],                         /* I    LPC coefficients                        */
     const silk_float s[],                                /* I    Input signal                            */
@@ -110,7 +110,7 @@ static OAC_INLINE void silk_LPC_analysis_filter12_FLP(
 }
 
 /* 10th order LPC analysis filter, does not write first 10 samples */
-static OAC_INLINE void silk_LPC_analysis_filter10_FLP(
+static OAC_INLINE void oaci_silk_LPC_analysis_filter10_FLP(
     silk_float r_LPC[],                                  /* O    LPC residual signal                     */
     const silk_float PredCoef[],                         /* I    LPC coefficients                        */
     const silk_float s[],                                /* I    Input signal                            */
@@ -141,7 +141,7 @@ static OAC_INLINE void silk_LPC_analysis_filter10_FLP(
 }
 
 /* 8th order LPC analysis filter, does not write first 8 samples */
-static OAC_INLINE void silk_LPC_analysis_filter8_FLP(
+static OAC_INLINE void oaci_silk_LPC_analysis_filter8_FLP(
     silk_float r_LPC[],                                  /* O    LPC residual signal                     */
     const silk_float PredCoef[],                         /* I    LPC coefficients                        */
     const silk_float s[],                                /* I    Input signal                            */
@@ -170,7 +170,7 @@ static OAC_INLINE void silk_LPC_analysis_filter8_FLP(
 }
 
 /* 6th order LPC analysis filter, does not write first 6 samples */
-static OAC_INLINE void silk_LPC_analysis_filter6_FLP(
+static OAC_INLINE void oaci_silk_LPC_analysis_filter6_FLP(
     silk_float r_LPC[],                                  /* O    LPC residual signal                     */
     const silk_float PredCoef[],                         /* I    LPC coefficients                        */
     const silk_float s[],                                /* I    Input signal                            */
@@ -213,23 +213,23 @@ void oaci_silk_LPC_analysis_filter_FLP(
 
     switch (Order) {
         case 6:
-            silk_LPC_analysis_filter6_FLP(  r_LPC, PredCoef, s, length );
+            oaci_silk_LPC_analysis_filter6_FLP(  r_LPC, PredCoef, s, length );
             break;
 
         case 8:
-            silk_LPC_analysis_filter8_FLP(  r_LPC, PredCoef, s, length );
+            oaci_silk_LPC_analysis_filter8_FLP(  r_LPC, PredCoef, s, length );
             break;
 
         case 10:
-            silk_LPC_analysis_filter10_FLP( r_LPC, PredCoef, s, length );
+            oaci_silk_LPC_analysis_filter10_FLP( r_LPC, PredCoef, s, length );
             break;
 
         case 12:
-            silk_LPC_analysis_filter12_FLP( r_LPC, PredCoef, s, length );
+            oaci_silk_LPC_analysis_filter12_FLP( r_LPC, PredCoef, s, length );
             break;
 
         case 16:
-            silk_LPC_analysis_filter16_FLP( r_LPC, PredCoef, s, length );
+            oaci_silk_LPC_analysis_filter16_FLP( r_LPC, PredCoef, s, length );
             break;
 
         default:
diff --git a/silk/float/SigProc_FLP.h b/silk/float/SigProc_FLP.h
index 6c2a366e0..ff90c4f26 100644
--- a/silk/float/SigProc_FLP.h
+++ b/silk/float/SigProc_FLP.h
@@ -146,13 +146,13 @@ double oaci_silk_energy_FLP(
 #define silk_abs_float( a )                     ((silk_float)fabs(a))
 
 /* sigmoid function */
-static OAC_INLINE silk_float silk_sigmoid( silk_float x ) {
+static OAC_INLINE silk_float oaci_silk_sigmoid( silk_float x ) {
     return (silk_float)(1.0/(1.0 + exp(-x)));
 }
 
 /* floating-point to integer conversion (rounding) */
 static OAC_INLINE oac_int32 silk_float2int( silk_float x ) {
-    return (oac_int32)float2int( x );
+    return (oac_int32)oaci_float2int( x );
 }
 
 /* floating-point to integer conversion (rounding) */
@@ -162,12 +162,12 @@ static OAC_INLINE void silk_float2short_array(
     oac_int32 length) {
     oac_int32 k;
     for (k = length - 1; k >= 0; k--) {
-        out[k] = silk_SAT16((oac_int32)float2int( in[k] ));
+        out[k] = silk_SAT16((oac_int32)oaci_float2int( in[k] ));
     }
 }
 
 /* integer to floating-point conversion */
-static OAC_INLINE void silk_short2float_array(
+static OAC_INLINE void oaci_silk_short2float_array(
     silk_float       *out,
     const oac_int16 *in,
     oac_int32 length) {
@@ -178,7 +178,7 @@ static OAC_INLINE void silk_short2float_array(
 }
 
 /* using log2() helps the fixed-point conversion */
-static OAC_INLINE silk_float silk_log2( double x ) {
+static OAC_INLINE silk_float oaci_silk_log2( double x ) {
     return ( silk_float )(3.32192809488736*log10( x ));
 }
 
diff --git a/silk/float/encode_frame_FLP.c b/silk/float/encode_frame_FLP.c
index c4e6a0751..a65454107 100644
--- a/silk/float/encode_frame_FLP.c
+++ b/silk/float/encode_frame_FLP.c
@@ -35,7 +35,7 @@
 #include "stack_alloc.h"
 
 /* Low Bitrate Redundancy (LBRR) encoding. Reuse all parameters but encode with lower bitrate */
-static OAC_INLINE void silk_LBRR_encode_FLP(
+static OAC_INLINE void oaci_silk_LBRR_encode_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     const silk_float xfw[],                                             /* I    Input signal                                */
@@ -134,7 +134,7 @@ oac_int oaci_silk_encode_frame_FLP(
     /*******************************************/
     /* Copy new frame to front of input buffer */
     /*******************************************/
-    silk_short2float_array( x_frame + LA_SHAPE_MS*psEnc->sCmn.fs_kHz, psEnc->sCmn.inputBuf + 1,
+    oaci_silk_short2float_array( x_frame + LA_SHAPE_MS*psEnc->sCmn.fs_kHz, psEnc->sCmn.inputBuf + 1,
     psEnc->sCmn.frame_length );
 
     /* Add tiny signal to avoid high CPU load from denormalized floating point numbers */
@@ -167,7 +167,7 @@ oac_int oaci_silk_encode_frame_FLP(
         /****************************************/
         /* Low Bitrate Redundant Encoding       */
         /****************************************/
-        silk_LBRR_encode_FLP( psEnc, &sEncCtrl, x_frame, condCoding );
+        oaci_silk_LBRR_encode_FLP( psEnc, &sEncCtrl, x_frame, condCoding );
 
         /* Loop over quantizer and entroy coding to control bitrate */
         maxIter = 6;
@@ -386,7 +386,7 @@ oac_int oaci_silk_encode_frame_FLP(
 }
 
 /* Low-Bitrate Redundancy (LBRR) encoding. Reuse all parameters but encode excitation at lower bitrate  */
-static OAC_INLINE void silk_LBRR_encode_FLP(
+static OAC_INLINE void oaci_silk_LBRR_encode_FLP(
     silk_encoder_state_FLP          *psEnc,                             /* I/O  Encoder state FLP                           */
     silk_encoder_control_FLP        *psEncCtrl,                         /* I/O  Encoder control FLP                         */
     const silk_float xfw[],                                             /* I    Input signal                                */
diff --git a/silk/float/noise_shape_analysis_FLP.c b/silk/float/noise_shape_analysis_FLP.c
index 634b52017..3367074ec 100644
--- a/silk/float/noise_shape_analysis_FLP.c
+++ b/silk/float/noise_shape_analysis_FLP.c
@@ -36,7 +36,7 @@
 /* non-warped frequency scale. (So that it can be implemented with a minimum-phase monic filter.) */
 /* Note: A monic filter is one with the first coefficient equal to 1.0. In Silk we omit the first */
 /* coefficient in an array of coefficients, for monic filters.                                    */
-static OAC_INLINE silk_float warped_gain(
+static OAC_INLINE silk_float oaci_warped_gain(
     const silk_float     *coefs,
     silk_float lambda,
     oac_int order) {
@@ -53,7 +53,7 @@ static OAC_INLINE silk_float warped_gain(
 
 /* Convert warped filter coefficients to monic pseudo-warped coefficients and limit maximum     */
 /* amplitude of monic warped coefficients by using bandwidth expansion on the true coefficients */
-static OAC_INLINE void warped_true2monic_coefs(
+static OAC_INLINE void oaci_warped_true2monic_coefs(
     silk_float           *coefs,
     silk_float lambda,
     silk_float limit,
@@ -111,7 +111,7 @@ static OAC_INLINE void warped_true2monic_coefs(
     silk_assert( 0 );
 }
 
-static OAC_INLINE void limit_coefs(
+static OAC_INLINE void oaci_limit_coefs(
     silk_float           *coefs,
     silk_float limit,
     oac_int order) {
@@ -171,7 +171,7 @@ void oaci_silk_noise_shape_analysis_FLP(
                                *(1.0f/32768.0f);
 
     /* Coding quality level, between 0.0 and 1.0 */
-    psEncCtrl->coding_quality = silk_sigmoid( 0.25f*(SNR_adj_dB - 20.0f));
+    psEncCtrl->coding_quality = oaci_silk_sigmoid( 0.25f*(SNR_adj_dB - 20.0f));
 
     if (psEnc->sCmn.useCBR == 0) {
         /* Reduce coding SNR during low speech activity */
@@ -203,7 +203,7 @@ void oaci_silk_noise_shape_analysis_FLP(
         nSegs = silk_SMULBB( SUB_FRAME_LENGTH_MS, psEnc->sCmn.nb_subfr )/2;
         for (k = 0; k < nSegs; k++) {
             nrg = ( silk_float )nSamples + ( silk_float )oaci_silk_energy_FLP( pitch_res_ptr, nSamples );
-            log_energy = silk_log2( nrg );
+            log_energy = oaci_silk_log2( nrg );
             if (k > 0) {
                 energy_variation += silk_abs_float( log_energy - log_energy_prev );
             }
@@ -267,7 +267,7 @@ void oaci_silk_noise_shape_analysis_FLP(
 
         if (psEnc->sCmn.warping_Q16 > 0) {
             /* Adjust gain for warping */
-            psEncCtrl->Gains[ k ] *= warped_gain( &psEncCtrl->AR[ k*MAX_SHAPE_LPC_ORDER ], warping,
+            psEncCtrl->Gains[ k ] *= oaci_warped_gain( &psEncCtrl->AR[ k*MAX_SHAPE_LPC_ORDER ], warping,
             psEnc->sCmn.shapingLPCOrder );
         }
 
@@ -276,11 +276,11 @@ void oaci_silk_noise_shape_analysis_FLP(
 
         if (psEnc->sCmn.warping_Q16 > 0) {
             /* Convert to monic warped prediction coefficients and limit absolute values */
-            warped_true2monic_coefs( &psEncCtrl->AR[ k*MAX_SHAPE_LPC_ORDER ], warping, 3.999f,
+            oaci_warped_true2monic_coefs( &psEncCtrl->AR[ k*MAX_SHAPE_LPC_ORDER ], warping, 3.999f,
             psEnc->sCmn.shapingLPCOrder );
         } else {
             /* Limit absolute values */
-            limit_coefs( &psEncCtrl->AR[ k*MAX_SHAPE_LPC_ORDER ], 3.999f, psEnc->sCmn.shapingLPCOrder );
+            oaci_limit_coefs( &psEncCtrl->AR[ k*MAX_SHAPE_LPC_ORDER ], 3.999f, psEnc->sCmn.shapingLPCOrder );
         }
     }
 
diff --git a/silk/float/pitch_analysis_core_FLP.c b/silk/float/pitch_analysis_core_FLP.c
index b89850d5f..0a5b42e6e 100644
--- a/silk/float/pitch_analysis_core_FLP.c
+++ b/silk/float/pitch_analysis_core_FLP.c
@@ -42,7 +42,7 @@
 /************************************************************/
 /* Internally used functions                                */
 /************************************************************/
-static void silk_P_Ana_calc_corr_st3(
+static void oaci_silk_P_Ana_calc_corr_st3(
     silk_float cross_corr_st3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ][ PE_NB_STAGE3_LAGS ], /* O 3 DIM correlation array */
     const silk_float frame[],               /* I vector to correlate                                            */
     oac_int start_lag,                     /* I start lag                                                      */
@@ -52,7 +52,7 @@ static void silk_P_Ana_calc_corr_st3(
     int arch                                /* I Run-time architecture                                          */
     );
 
-static void silk_P_Ana_calc_energy_st3(
+static void oaci_silk_P_Ana_calc_energy_st3(
     silk_float energies_st3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ][ PE_NB_STAGE3_LAGS ], /* O 3 DIM correlation array */
     const silk_float frame[],               /* I vector to correlate                                            */
     oac_int start_lag,                     /* I start lag                                                      */
@@ -138,14 +138,14 @@ oac_int oaci_silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voic
         silk_float2short_array( frame_16_FIX, frame, frame_length );
         silk_memset( filt_state, 0, 2*sizeof(oac_int32));
         oaci_silk_resampler_down2( filt_state, frame_8_FIX, frame_16_FIX, frame_length );
-        silk_short2float_array( frame_8kHz, frame_8_FIX, frame_length_8kHz );
+        oaci_silk_short2float_array( frame_8kHz, frame_8_FIX, frame_length_8kHz );
     } else if (Fs_kHz == 12) {
         /* Resample to 12 -> 8 khz */
         oac_int16 frame_12_FIX[ 12*PE_MAX_FRAME_LENGTH_MS ];
         silk_float2short_array( frame_12_FIX, frame, frame_length );
         silk_memset( filt_state, 0, 6*sizeof(oac_int32));
         oaci_silk_resampler_down2_3( filt_state, frame_8_FIX, frame_12_FIX, frame_length );
-        silk_short2float_array( frame_8kHz, frame_8_FIX, frame_length_8kHz );
+        oaci_silk_short2float_array( frame_8kHz, frame_8_FIX, frame_length_8kHz );
     } else {
         celt_assert( Fs_kHz == 8 );
         silk_float2short_array( frame_8_FIX, frame, frame_length_8kHz );
@@ -154,7 +154,7 @@ oac_int oaci_silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voic
     /* Decimate again to 4 kHz */
     silk_memset( filt_state, 0, 2*sizeof(oac_int32));
     oaci_silk_resampler_down2( filt_state, frame_4_FIX, frame_8_FIX, frame_length_8kHz );
-    silk_short2float_array( frame_4kHz, frame_4_FIX, frame_length_4kHz );
+    oaci_silk_short2float_array( frame_4kHz, frame_4_FIX, frame_length_4kHz );
 
     /* Low-pass filter */
     for (i = frame_length_4kHz - 1; i > 0; i--) {
@@ -318,7 +318,7 @@ oac_int oaci_silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voic
         } else if (Fs_kHz == 16) {
             prevLag = silk_RSHIFT( prevLag, 1 );
         }
-        prevLag_log2 = silk_log2((silk_float)prevLag );
+        prevLag_log2 = oaci_silk_log2((silk_float)prevLag );
     } else {
         prevLag_log2 = 0;
     }
@@ -359,7 +359,7 @@ oac_int oaci_silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voic
         }
 
         /* Bias towards shorter lags */
-        lag_log2 = silk_log2((silk_float)d );
+        lag_log2 = oaci_silk_log2((silk_float)d );
         CCmax_new_b = CCmax_new - PE_SHORTLAG_BIAS*nb_subfr*lag_log2;
 
         /* Bias towards previous lag */
@@ -412,8 +412,8 @@ oac_int oaci_silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voic
         CCmax = -1000.0f;
 
         /* Calculate the correlations and energies needed in stage 3 */
-        silk_P_Ana_calc_corr_st3( cross_corr_st3, frame, start_lag, sf_length, nb_subfr, complexity, arch );
-        silk_P_Ana_calc_energy_st3( energies_st3, frame, start_lag, sf_length, nb_subfr, complexity );
+        oaci_silk_P_Ana_calc_corr_st3( cross_corr_st3, frame, start_lag, sf_length, nb_subfr, complexity, arch );
+        oaci_silk_P_Ana_calc_energy_st3( energies_st3, frame, start_lag, sf_length, nb_subfr, complexity );
 
         lag_counter = 0;
         silk_assert( lag == silk_SAT16( lag ));
@@ -490,7 +490,7 @@ oac_int oaci_silk_pitch_analysis_core_FLP(      /* O    Voicing estimate: 0 voic
 * In total 48 correlations. The direct implementation computed in worst
 * case 4*12*5 = 240 correlations, but more likely around 120.
 ***********************************************************************/
-static void silk_P_Ana_calc_corr_st3(
+static void oaci_silk_P_Ana_calc_corr_st3(
     silk_float cross_corr_st3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ][ PE_NB_STAGE3_LAGS ], /* O 3 DIM correlation array */
     const silk_float frame[],               /* I vector to correlate                                            */
     oac_int start_lag,                     /* I start lag                                                      */
@@ -557,7 +557,7 @@ static void silk_P_Ana_calc_corr_st3(
 /* Calculate the energies for first two subframes. The energies are */
 /* calculated recursively.                                          */
 /********************************************************************/
-static void silk_P_Ana_calc_energy_st3(
+static void oaci_silk_P_Ana_calc_energy_st3(
     silk_float energies_st3[ PE_MAX_NB_SUBFR ][ PE_NB_CBKS_STAGE3_MAX ][ PE_NB_STAGE3_LAGS ], /* O 3 DIM correlation array */
     const silk_float frame[],               /* I vector to correlate                                            */
     oac_int start_lag,                     /* I start lag                                                      */
diff --git a/silk/float/process_gains_FLP.c b/silk/float/process_gains_FLP.c
index 475d45747..b256749aa 100644
--- a/silk/float/process_gains_FLP.c
+++ b/silk/float/process_gains_FLP.c
@@ -45,7 +45,7 @@ void oaci_silk_process_gains_FLP(
 
     /* Gain reduction when LTP coding gain is high */
     if (psEnc->sCmn.indices.signalType == TYPE_VOICED) {
-        s = 1.0f - 0.5f*silk_sigmoid( 0.25f*(psEncCtrl->LTPredCodGain - 12.0f));
+        s = 1.0f - 0.5f*oaci_silk_sigmoid( 0.25f*(psEncCtrl->LTPredCodGain - 12.0f));
         for (k = 0; k < psEnc->sCmn.nb_subfr; k++) {
             psEncCtrl->Gains[ k ] *= s;
         }
diff --git a/silk/resampler_private_IIR_FIR.c b/silk/resampler_private_IIR_FIR.c
index cfdfe7c14..9bd4f708c 100644
--- a/silk/resampler_private_IIR_FIR.c
+++ b/silk/resampler_private_IIR_FIR.c
@@ -33,7 +33,7 @@
 #include "resampler_private.h"
 #include "stack_alloc.h"
 
-static OAC_INLINE oac_int16 *silk_resampler_private_IIR_FIR_INTERPOL(
+static OAC_INLINE oac_int16 *oaci_silk_resampler_private_IIR_FIR_INTERPOL(
     oac_int16  *out,
     oac_int16  *buf,
     oac_int32 max_index_Q16,
@@ -86,7 +86,7 @@ void oaci_silk_resampler_private_IIR_FIR(
         oaci_silk_resampler_private_up2_HQ( S->sIIR, &buf[ RESAMPLER_ORDER_FIR_12 ], in, nSamplesIn );
 
         max_index_Q16 = silk_LSHIFT32( nSamplesIn, 16 + 1 );         /* + 1 because 2x upsampling */
-        out = silk_resampler_private_IIR_FIR_INTERPOL( out, buf, max_index_Q16, index_increment_Q16 );
+        out = oaci_silk_resampler_private_IIR_FIR_INTERPOL( out, buf, max_index_Q16, index_increment_Q16 );
         in += nSamplesIn;
         inLen -= nSamplesIn;
 
diff --git a/silk/stereo_find_predictor.c b/silk/stereo_find_predictor.c
index a73996c6b..89a1ab45a 100644
--- a/silk/stereo_find_predictor.c
+++ b/silk/stereo_find_predictor.c
@@ -63,13 +63,13 @@ oac_int32 oaci_silk_stereo_find_predictor(                          /* O    Retu
     silk_assert( smooth_coef_Q16 < 32768 );
     scale = silk_RSHIFT( scale, 1 );
     mid_res_amp_Q0[ 0 ] = silk_SMLAWB( mid_res_amp_Q0[ 0 ],
-    silk_LSHIFT( silk_SQRT_APPROX( nrgx ), scale ) - mid_res_amp_Q0[ 0 ],
+    silk_LSHIFT( oaci_silk_SQRT_APPROX( nrgx ), scale ) - mid_res_amp_Q0[ 0 ],
         smooth_coef_Q16 );
     /* Residual energy = nrgy - 2 * pred * corr + pred^2 * nrgx */
     nrgy = silk_SUB_LSHIFT32( nrgy, silk_SMULWB( corr, pred_Q13 ), 3 + 1 );
     nrgy = silk_ADD_LSHIFT32( nrgy, silk_SMULWB( nrgx, pred2_Q10 ), 6 );
     mid_res_amp_Q0[ 1 ] = silk_SMLAWB( mid_res_amp_Q0[ 1 ],
-    silk_LSHIFT( silk_SQRT_APPROX( nrgy ), scale ) - mid_res_amp_Q0[ 1 ],
+    silk_LSHIFT( oaci_silk_SQRT_APPROX( nrgy ), scale ) - mid_res_amp_Q0[ 1 ],
         smooth_coef_Q16 );
 
     /* Ratio of smoothed residual and mid norms */
diff --git a/silk/x86/NSQ_del_dec_avx2.c b/silk/x86/NSQ_del_dec_avx2.c
index 7de128b02..890f9490c 100644
--- a/silk/x86/NSQ_del_dec_avx2.c
+++ b/silk/x86/NSQ_del_dec_avx2.c
@@ -42,7 +42,7 @@
 #include "celt/x86/x86cpu.h"
 
 /* Returns TRUE if all assumptions met */
-static OAC_INLINE int verify_assumptions(const silk_encoder_state *psEncC) {
+static OAC_INLINE int oaci_verify_assumptions(const silk_encoder_state *psEncC) {
     /* This optimization is based on these assumptions        */
     /* These assumptions are fundamental and hence assert are */
     /* used. Should any assert triggers, we have to re-visit  */
@@ -246,7 +246,7 @@ static __m128i oaci_silk_index_to_selector(oac_int32 index) {
         index + 3, index + 2, index + 1, index + 0);
 }
 
-static oac_int32 silk_select_winner(__m128i num, __m128i selector) {
+static oac_int32 oaci_silk_select_winner(__m128i num, __m128i selector) {
     return _mm_cvtsi128_si32(_mm_shuffle_epi8(num, selector));
 }
 
@@ -269,7 +269,7 @@ typedef struct {
     NSQ_del_dec_sample_struct Samples[DECISION_DELAY];
 } NSQ_del_dec_struct;
 
-static OAC_INLINE void silk_nsq_del_dec_scale_states_avx2(
+static OAC_INLINE void oaci_silk_nsq_del_dec_scale_states_avx2(
     const silk_encoder_state *psEncC,          /* I    Encoder State                   */
     silk_nsq_state *NSQ,                       /* I/O  NSQ state                       */
     NSQ_del_dec_struct *psDelDec,              /* I/O  Delayed decision states         */
@@ -291,7 +291,7 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states_avx2(
 /* filter always starts with zero state    */
 /* first d output samples are set to zero  */
 /*******************************************/
-static OAC_INLINE void silk_LPC_analysis_filter_avx2(
+static OAC_INLINE void oaci_silk_LPC_analysis_filter_avx2(
     oac_int16                  *out,               /* O    Output signal                           */
     const oac_int16            *in,                /* I    Input signal                            */
     const oac_int16            *B,                 /* I    MA prediction coefficients, Q12 [order] */
@@ -362,7 +362,7 @@ void oaci_silk_NSQ_del_dec_avx2(
                        pitchL, Lambda_Q10, LTP_scale_Q14);
 #endif
 
-    if (!verify_assumptions(psEncC)) {
+    if (!oaci_verify_assumptions(psEncC)) {
         oaci_silk_NSQ_del_dec_c(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14,
         Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14);
         return;
@@ -470,12 +470,12 @@ void oaci_silk_NSQ_del_dec_avx2(
                         last_smple_idx = (last_smple_idx + DECISION_DELAY - 1)%DECISION_DELAY;
                         psSample = &psDelDec.Samples[last_smple_idx];
                         pulses[i - decisionDelay] =
-                            (oac_int8)silk_sar_round_32(silk_select_winner(psSample->Q_Q10, Winner_selector), 10);
+                            (oac_int8)silk_sar_round_32(oaci_silk_select_winner(psSample->Q_Q10, Winner_selector), 10);
                         pxq[i - decisionDelay] =
-                            silk_sat16((oac_int32)silk_sar_round_smulww(silk_select_winner(psSample->Xq_Q14,
+                            silk_sat16((oac_int32)silk_sar_round_smulww(oaci_silk_select_winner(psSample->Xq_Q14,
                         Winner_selector), Gains_Q16[1], 14));
                         NSQ->sLTP_shp_Q14[NSQ->sLTP_shp_buf_idx - decisionDelay + i] =
-                            silk_select_winner(psSample->Shape_Q14, Winner_selector);
+                            oaci_silk_select_winner(psSample->Shape_Q14, Winner_selector);
                     }
 
                     subfr = 0;
@@ -485,7 +485,7 @@ void oaci_silk_NSQ_del_dec_avx2(
                 start_idx = psEncC->ltp_mem_length - lag - psEncC->predictLPCOrder - LTP_ORDER/2;
                 silk_assert(start_idx > 0);
 
-                silk_LPC_analysis_filter_avx2(&sLTP[start_idx], &NSQ->xq[start_idx + k*psEncC->subfr_length],
+                oaci_silk_LPC_analysis_filter_avx2(&sLTP[start_idx], &NSQ->xq[start_idx + k*psEncC->subfr_length],
                                               A_Q12, psEncC->ltp_mem_length - start_idx, psEncC->predictLPCOrder);
 
                 NSQ->sLTP_buf_idx = psEncC->ltp_mem_length;
@@ -493,7 +493,7 @@ void oaci_silk_NSQ_del_dec_avx2(
             }
         }
 
-        silk_nsq_del_dec_scale_states_avx2(psEncC, NSQ, &psDelDec, x16, x_sc_Q10, sLTP, sLTP_Q15, k,
+        oaci_silk_nsq_del_dec_scale_states_avx2(psEncC, NSQ, &psDelDec, x16, x_sc_Q10, sLTP, sLTP_Q15, k,
                                            LTP_scale_Q14, Gains_Q16, pitchL, psIndices->signalType, decisionDelay);
 
         oaci_silk_noise_shape_quantizer_del_dec_avx2(NSQ, &psDelDec, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15,
@@ -514,7 +514,7 @@ void oaci_silk_NSQ_del_dec_avx2(
     Winner_selector = oaci_silk_index_to_selector(silk_index_of_first_equal_epi32(RDmin_Q10, psDelDec.RD_Q10));
 
     /* Copy final part of signals from winner state to output and long-term filter states */
-    psIndices->Seed = silk_select_winner(psDelDec.SeedInit, Winner_selector);
+    psIndices->Seed = oaci_silk_select_winner(psDelDec.SeedInit, Winner_selector);
     last_smple_idx = smpl_buf_idx + decisionDelay;
     Gain_Q10 = Gains_Q16[psEncC->nb_subfr - 1]>>6;
     for (i = 0; i < decisionDelay; i++) {
@@ -522,23 +522,23 @@ void oaci_silk_NSQ_del_dec_avx2(
         psSample = &psDelDec.Samples[last_smple_idx];
 
         pulses[i - decisionDelay] =
-            (oac_int8)silk_sar_round_32(silk_select_winner(psSample->Q_Q10, Winner_selector), 10);
+            (oac_int8)silk_sar_round_32(oaci_silk_select_winner(psSample->Q_Q10, Winner_selector), 10);
         pxq[i - decisionDelay] =
-            silk_sat16((oac_int32)silk_sar_round_smulww(silk_select_winner(psSample->Xq_Q14, Winner_selector), Gain_Q10,
+            silk_sat16((oac_int32)silk_sar_round_smulww(oaci_silk_select_winner(psSample->Xq_Q14, Winner_selector), Gain_Q10,
         8));
         NSQ->sLTP_shp_Q14[NSQ->sLTP_shp_buf_idx - decisionDelay + i] =
-            silk_select_winner(psSample->Shape_Q14, Winner_selector);
+            oaci_silk_select_winner(psSample->Shape_Q14, Winner_selector);
     }
     for (i = 0; i < NSQ_LPC_BUF_LENGTH; i++) {
-        NSQ->sLPC_Q14[i] = silk_select_winner(psDelDec.sLPC_Q14[i], Winner_selector);
+        NSQ->sLPC_Q14[i] = oaci_silk_select_winner(psDelDec.sLPC_Q14[i], Winner_selector);
     }
     for (i = 0; i < MAX_SHAPE_LPC_ORDER; i++) {
-        NSQ->sAR2_Q14[i] = silk_select_winner(psDelDec.sAR2_Q14[i], Winner_selector);
+        NSQ->sAR2_Q14[i] = oaci_silk_select_winner(psDelDec.sAR2_Q14[i], Winner_selector);
     }
 
     /* Update states */
-    NSQ->sLF_AR_shp_Q14 = silk_select_winner(psDelDec.LF_AR_Q14, Winner_selector);
-    NSQ->sDiff_shp_Q14 = silk_select_winner(psDelDec.Diff_Q14, Winner_selector);
+    NSQ->sLF_AR_shp_Q14 = oaci_silk_select_winner(psDelDec.LF_AR_Q14, Winner_selector);
+    NSQ->sDiff_shp_Q14 = oaci_silk_select_winner(psDelDec.Diff_Q14, Winner_selector);
     NSQ->lagPrev = pitchL[psEncC->nb_subfr - 1];
 
     /* Save quantized speech signal */
@@ -860,14 +860,14 @@ static OAC_INLINE void oaci_silk_noise_shape_quantizer_del_dec_avx2(
         /* Write samples from winner to output and long-term filter states */
         if (subfr > 0 || i >= decisionDelay) {
             pulses[i - decisionDelay] =
-                (oac_int8)silk_sar_round_32(silk_select_winner(psLastSample->Q_Q10, Winner_selector), 10);
+                (oac_int8)silk_sar_round_32(oaci_silk_select_winner(psLastSample->Q_Q10, Winner_selector), 10);
             xq[i - decisionDelay] =
-                silk_sat16((oac_int32)silk_sar_round_smulww(silk_select_winner(psLastSample->Xq_Q14, Winner_selector),
+                silk_sat16((oac_int32)silk_sar_round_smulww(oaci_silk_select_winner(psLastSample->Xq_Q14, Winner_selector),
             delayedGain_Q10[last_smple_idx], 8));
             NSQ->sLTP_shp_Q14[NSQ->sLTP_shp_buf_idx - decisionDelay] =
-                silk_select_winner(psLastSample->Shape_Q14, Winner_selector);
+                oaci_silk_select_winner(psLastSample->Shape_Q14, Winner_selector);
             sLTP_Q15[NSQ->sLTP_buf_idx - decisionDelay] =
-                silk_select_winner(psLastSample->Pred_Q15, Winner_selector);
+                oaci_silk_select_winner(psLastSample->Pred_Q15, Winner_selector);
         }
         NSQ->sLTP_shp_buf_idx++;
         NSQ->sLTP_buf_idx++;
@@ -892,7 +892,7 @@ static OAC_INLINE void oaci_silk_noise_shape_quantizer_del_dec_avx2(
     }
 }
 
-static OAC_INLINE void silk_nsq_del_dec_scale_states_avx2(
+static OAC_INLINE void oaci_silk_nsq_del_dec_scale_states_avx2(
     const silk_encoder_state *psEncC,          /* I    Encoder State                   */
     silk_nsq_state *NSQ,                       /* I/O  NSQ state                       */
     NSQ_del_dec_struct *psDelDec,              /* I/O  Delayed decision states         */
@@ -913,7 +913,7 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states_avx2(
     NSQ_del_dec_sample_struct *psSample;
 
     lag = pitchL[subfr];
-    inv_gain_Q31 = silk_INVERSE32_varQ(silk_max(Gains_Q16[subfr], 1), 47);
+    inv_gain_Q31 = oaci_silk_INVERSE32_varQ(silk_max(Gains_Q16[subfr], 1), 47);
     silk_assert(inv_gain_Q31 != 0);
 
     /* Scale input */
@@ -976,7 +976,7 @@ static OAC_INLINE void silk_nsq_del_dec_scale_states_avx2(
     }
 }
 
-static OAC_INLINE void silk_LPC_analysis_filter_avx2(
+static OAC_INLINE void oaci_silk_LPC_analysis_filter_avx2(
     oac_int16                  *out,               /* O    Output signal                           */
     const oac_int16            *in,                /* I    Input signal                            */
     const oac_int16            *B,                 /* I    MA prediction coefficients, Q12 [order] */
diff --git a/silk/x86/NSQ_del_dec_sse4_1.c b/silk/x86/NSQ_del_dec_sse4_1.c
index 44061eb99..cdaa41f0a 100644
--- a/silk/x86/NSQ_del_dec_sse4_1.c
+++ b/silk/x86/NSQ_del_dec_sse4_1.c
@@ -810,7 +810,7 @@ static OAC_INLINE void oaci_silk_nsq_del_dec_scale_states_sse4_1(
     __m128i xmm_inv_gain_Q26, xmm_x16_x2x0, xmm_x16_x3x1;
 
     lag          = pitchL[ subfr ];
-    inv_gain_Q31 = silk_INVERSE32_varQ( silk_max( Gains_Q16[ subfr ], 1 ), 47 );
+    inv_gain_Q31 = oaci_silk_INVERSE32_varQ( silk_max( Gains_Q16[ subfr ], 1 ), 47 );
     silk_assert( inv_gain_Q31 != 0 );
 
     /* Scale input */
diff --git a/silk/x86/NSQ_sse4_1.c b/silk/x86/NSQ_sse4_1.c
index 65c6f141f..851595ee7 100644
--- a/silk/x86/NSQ_sse4_1.c
+++ b/silk/x86/NSQ_sse4_1.c
@@ -36,7 +36,7 @@
 #include "celt/x86/x86cpu.h"
 #include "stack_alloc.h"
 
-static OAC_INLINE void silk_nsq_scale_states_sse4_1(
+static OAC_INLINE void oaci_silk_nsq_scale_states_sse4_1(
     const silk_encoder_state *psEncC,              /* I    Encoder State                   */
     silk_nsq_state      *NSQ,                      /* I/O  NSQ state                       */
     const oac_int16 x16[],                        /* I    input                           */
@@ -239,7 +239,7 @@ void oaci_silk_NSQ_sse4_1(
             }
         }
 
-        silk_nsq_scale_states_sse4_1( psEncC, NSQ, x16, x_sc_Q10, sLTP, sLTP_Q15, k, LTP_scale_Q14, Gains_Q16, pitchL,
+        oaci_silk_nsq_scale_states_sse4_1( psEncC, NSQ, x16, x_sc_Q10, sLTP, sLTP_Q15, k, LTP_scale_Q14, Gains_Q16, pitchL,
         psIndices->signalType );
 
         if (oac_likely((10 == psEncC->shapingLPCOrder) && (16 == psEncC->predictLPCOrder))) {
@@ -650,7 +650,7 @@ static OAC_INLINE void oaci_silk_noise_shape_quantizer_10_16_sse4_1(
     silk_memcpy( NSQ->sLPC_Q14, &NSQ->sLPC_Q14[ length ], NSQ_LPC_BUF_LENGTH*sizeof(oac_int32));
 }
 
-static OAC_INLINE void silk_nsq_scale_states_sse4_1(
+static OAC_INLINE void oaci_silk_nsq_scale_states_sse4_1(
     const silk_encoder_state *psEncC,              /* I    Encoder State                   */
     silk_nsq_state      *NSQ,                      /* I/O  NSQ state                       */
     const oac_int16 x16[],                        /* I    input                           */
@@ -668,7 +668,7 @@ static OAC_INLINE void silk_nsq_scale_states_sse4_1(
     __m128i xmm_inv_gain_Q26, xmm_x16_x2x0, xmm_x16_x3x1;
 
     lag          = pitchL[ subfr ];
-    inv_gain_Q31 = silk_INVERSE32_varQ( silk_max( Gains_Q16[ subfr ], 1 ), 47 );
+    inv_gain_Q31 = oaci_silk_INVERSE32_varQ( silk_max( Gains_Q16[ subfr ], 1 ), 47 );
     silk_assert( inv_gain_Q31 != 0 );
 
     /* Scale input */
diff --git a/silk/x86/VAD_sse4_1.c b/silk/x86/VAD_sse4_1.c
index a1d79bc4c..c570717e6 100644
--- a/silk/x86/VAD_sse4_1.c
+++ b/silk/x86/VAD_sse4_1.c
@@ -206,7 +206,7 @@ oac_int oaci_silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0
             /* Tilt measure */
             if (speech_nrg < ((oac_int32)1<<20)) {
                 /* Scale down SNR value for small subband speech energies */
-                SNR_Q7 = silk_SMULWB( silk_LSHIFT( silk_SQRT_APPROX( speech_nrg ), 6 ), SNR_Q7 );
+                SNR_Q7 = silk_SMULWB( silk_LSHIFT( oaci_silk_SQRT_APPROX( speech_nrg ), 6 ), SNR_Q7 );
             }
             input_tilt = silk_SMLAWB( input_tilt, tiltWeights[ b ], SNR_Q7 );
         } else {
@@ -218,7 +218,7 @@ oac_int oaci_silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0
     sumSquared = silk_DIV32_16( sumSquared, VAD_N_BANDS ); /* Q14 */
 
     /* Root-mean-square approximation, scale to dBs, and write to output pointer */
-    pSNR_dB_Q7 = (oac_int16)(3*silk_SQRT_APPROX( sumSquared ));     /* Q7 */
+    pSNR_dB_Q7 = (oac_int16)(3*oaci_silk_SQRT_APPROX( sumSquared ));     /* Q7 */
 
     /*********************************/
     /* Speech Probability Estimation */
@@ -249,7 +249,7 @@ oac_int oaci_silk_VAD_GetSA_Q8_sse4_1(                  /* O    Return value, 0
         speech_nrg = silk_LSHIFT32( speech_nrg, 16 );
 
         /* square-root */
-        speech_nrg = silk_SQRT_APPROX( speech_nrg );
+        speech_nrg = oaci_silk_SQRT_APPROX( speech_nrg );
         SA_Q15 = silk_SMULWB( 32768 + speech_nrg, SA_Q15 );
     }
 
diff --git a/src/analysis.c b/src/analysis.c
index d7208e281..ab45fc78d 100644
--- a/src/analysis.c
+++ b/src/analysis.c
@@ -538,7 +538,7 @@ static void oaci_tonality_analysis(TonalityAnalysisState *tonal, const CELTMode
     oac_fft(oaci_kfft, in, out, tonal->arch);
 # ifndef FIXED_POINT
     /* If there's any NaN on the input, the entire output will be NaN, so we only need to check one value. */
-    if (celt_isnan(out[0].r)) {
+    if (oaci_celt_isnan(out[0].r)) {
         info->valid = 0;
         RESTORE_STACK;
         return;
@@ -555,20 +555,20 @@ static void oaci_tonality_analysis(TonalityAnalysisState *tonal, const CELTMode
         X2r = (float)out[i].i + out[N - i].i;
         X2i = (float)out[N - i].r - out[i].r;
 
-        angle = (float)(.5f/M_PI)*fast_atan2f(X1i, X1r);
+        angle = (float)(.5f/M_PI)*oaci_fast_atan2f(X1i, X1r);
         d_angle = angle - A[i];
         d2_angle = d_angle - dA[i];
 
-        angle2 = (float)(.5f/M_PI)*fast_atan2f(X2i, X2r);
+        angle2 = (float)(.5f/M_PI)*oaci_fast_atan2f(X2i, X2r);
         d_angle2 = angle2 - angle;
         d2_angle2 = d_angle2 - d_angle;
 
-        mod1 = d2_angle - (float)float2int(d2_angle);
+        mod1 = d2_angle - (float)oaci_float2int(d2_angle);
         noisiness[i] = ABS16(mod1);
         mod1 *= mod1;
         mod1 *= mod1;
 
-        mod2 = d2_angle2 - (float)float2int(d2_angle2);
+        mod2 = d2_angle2 - (float)oaci_float2int(d2_angle2);
         noisiness[i] += ABS16(mod2);
         mod2 *= mod2;
         mod2 *= mod2;
@@ -630,7 +630,7 @@ static void oaci_tonality_analysis(TonalityAnalysisState *tonal, const CELTMode
         }
 # ifndef FIXED_POINT
         /* Check for extreme band energies that could cause NaNs later. */
-        if (!(E < 1e9f) || celt_isnan(E)) {
+        if (!(E < 1e9f) || oaci_celt_isnan(E)) {
             info->valid = 0;
             RESTORE_STACK;
             return;
diff --git a/src/extensions.c b/src/extensions.c
index 1008db020..efc03991a 100644
--- a/src/extensions.c
+++ b/src/extensions.c
@@ -447,7 +447,7 @@ static int oaci_write_extension_payload(unsigned char *data, oac_int32 len,
     return pos;
 }
 
-static int write_extension(unsigned char *data, oac_int32 len, oac_int32 pos,
+static int oaci_write_extension(unsigned char *data, oac_int32 len, oac_int32 pos,
                            const oac_extension_data *ext, int last) {
     if (len - pos < 1)
         return OAC_BUFFER_TOO_SMALL;
@@ -561,7 +561,7 @@ oac_int32 oac_packet_extensions_generate(unsigned char *data, oac_int32 len,
                     curr_frame = f;
                 }
 
-                pos = write_extension(data, len, pos, extensions + i,
+                pos = oaci_write_extension(data, len, pos, extensions + i,
              written == nb_extensions - 1);
                 if (pos < 0) return pos;
                 written++;
diff --git a/src/mapping_matrix.c b/src/mapping_matrix.c
index 68e6a1e4a..cf115731c 100644
--- a/src/mapping_matrix.c
+++ b/src/mapping_matrix.c
@@ -50,12 +50,12 @@ oac_int32 oaci_mapping_matrix_get_size(int rows, int cols) {
     if (size > 65004)
         return 0;
 
-    return align(sizeof(MappingMatrix)) + align(size);
+    return oaci_align(sizeof(MappingMatrix)) + oaci_align(size);
 }
 
 oac_int16 *oaci_mapping_matrix_get_data(const MappingMatrix *matrix) {
-    /* void* cast avoids clang -Wcast-align warning */
-    return (oac_int16*)(void*)((char*)matrix + align(sizeof(MappingMatrix)));
+    /* void* cast avoids clang -Wcast-oaci_align warning */
+    return (oac_int16*)(void*)((char*)matrix + oaci_align(sizeof(MappingMatrix)));
 }
 
 void oaci_mapping_matrix_init(MappingMatrix * const matrix,
@@ -66,7 +66,7 @@ void oaci_mapping_matrix_init(MappingMatrix * const matrix,
 #if !defined(ENABLE_ASSERTIONS)
     (void)data_size;
 #endif
-    celt_assert(align(data_size) == align(rows*cols*sizeof(oac_int16)));
+    celt_assert(oaci_align(data_size) == oaci_align(rows*cols*sizeof(oac_int16)));
 
     matrix->rows = rows;
     matrix->cols = cols;
diff --git a/src/oac_decoder.c b/src/oac_decoder.c
index c571942b9..7adb2136f 100644
--- a/src/oac_decoder.c
+++ b/src/oac_decoder.c
@@ -131,9 +131,9 @@ int oac_decoder_get_size(int channels) {
     ret = oaci_silk_Get_Decoder_Size( &silkDecSizeBytes );
     if (ret)
         return 0;
-    silkDecSizeBytes = align(silkDecSizeBytes);
+    silkDecSizeBytes = oaci_align(silkDecSizeBytes);
     celtDecSizeBytes = oaci_celt_decoder_get_size(channels);
-    return align(sizeof(OacDecoder)) + silkDecSizeBytes + celtDecSizeBytes;
+    return oaci_align(sizeof(OacDecoder)) + silkDecSizeBytes + celtDecSizeBytes;
 }
 
 int oac_decoder_init(OacDecoder *st, oac_int32 Fs, int channels) {
@@ -155,8 +155,8 @@ int oac_decoder_init(OacDecoder *st, oac_int32 Fs, int channels) {
     if (ret)
         return OAC_INTERNAL_ERROR;
 
-    silkDecSizeBytes = align(silkDecSizeBytes);
-    st->silk_dec_offset = align(sizeof(OacDecoder));
+    silkDecSizeBytes = oaci_align(silkDecSizeBytes);
+    st->silk_dec_offset = oaci_align(sizeof(OacDecoder));
     st->celt_dec_offset = st->silk_dec_offset + silkDecSizeBytes;
     silk_dec = (char*)st + st->silk_dec_offset;
     celt_dec = (CELTDecoder*)((char*)st + st->celt_dec_offset);
diff --git a/src/oac_encoder.c b/src/oac_encoder.c
index a99d6eb92..080c6b2d3 100644
--- a/src/oac_encoder.c
+++ b/src/oac_encoder.c
@@ -220,16 +220,16 @@ int oac_encoder_init(OacEncoder* st, oac_int32 Fs, int channels, int application
     ret = oaci_silk_Get_Encoder_Size( &silkEncSizeBytes, channels );
     if (ret)
         return OAC_BAD_ARG;
-    silkEncSizeBytes = align(silkEncSizeBytes);
+    silkEncSizeBytes = oaci_align(silkEncSizeBytes);
     if (application == OAC_APPLICATION_RESTRICTED_CELT)
         silkEncSizeBytes = 0;
     if (application != OAC_APPLICATION_RESTRICTED_SILK)
         celtEncSizeBytes = oaci_celt_encoder_get_size(channels);
-    base_size = align(sizeof(OacEncoder));
+    base_size = oaci_align(sizeof(OacEncoder));
     if (application == OAC_APPLICATION_RESTRICTED_SILK || application == OAC_APPLICATION_RESTRICTED_CELT) {
-        base_size = align(base_size - MAX_ENCODER_BUFFER*2*sizeof(oac_res));
+        base_size = oaci_align(base_size - MAX_ENCODER_BUFFER*2*sizeof(oac_res));
     } else if (channels == 1)
-        base_size = align(base_size - MAX_ENCODER_BUFFER*sizeof(oac_res));
+        base_size = oaci_align(base_size - MAX_ENCODER_BUFFER*sizeof(oac_res));
     tot_size = base_size + silkEncSizeBytes + celtEncSizeBytes;
     if (st == NULL) {
         return tot_size;
@@ -422,7 +422,7 @@ static void oaci_silk_biquad_res(
 }
 #endif
 
-static void hp_cutoff(const oac_res *in, oac_int32 cutoff_Hz, oac_res *out, oac_val32 *hp_mem, int len, int channels,
+static void oaci_hp_cutoff(const oac_res *in, oac_int32 cutoff_Hz, oac_res *out, oac_val32 *hp_mem, int len, int channels,
                       oac_int32 Fs, int arch) {
     oac_int32 B_Q28[ 3 ], A_Q28[ 2 ];
     oac_int32 Fc_Q19, r_Q28, r_Q22;
@@ -452,7 +452,7 @@ static void hp_cutoff(const oac_res *in, oac_int32 cutoff_Hz, oac_res *out, oac_
 }
 
 #ifdef FIXED_POINT
-static void dc_reject(const oac_res *in, oac_int32 cutoff_Hz, oac_res *out, oac_val32 *hp_mem, int len, int channels,
+static void oaci_dc_reject(const oac_res *in, oac_int32 cutoff_Hz, oac_res *out, oac_val32 *hp_mem, int len, int channels,
                       oac_int32 Fs) {
     int c, i;
     int shift;
@@ -474,7 +474,7 @@ static void dc_reject(const oac_res *in, oac_int32 cutoff_Hz, oac_res *out, oac_
 }
 
 #else
-static void dc_reject(const oac_val16 *in, oac_int32 cutoff_Hz, oac_val16 *out, oac_val32 *hp_mem, int len,
+static void oaci_dc_reject(const oac_val16 *in, oac_int32 cutoff_Hz, oac_val16 *out, oac_val32 *hp_mem, int len,
                       int channels, oac_int32 Fs) {
     int i;
     float coef, coef2;
@@ -620,7 +620,7 @@ OacEncoder *oac_encoder_create(oac_int32 Fs, int channels, int application, int
 
 static const float dred_bits_table[16] = {73.2f, 68.1f, 62.5f, 57.0f, 51.5f, 45.7f, 39.9f, 32.4f, 26.4f, 20.4f, 16.3f,
                                           13.f, 9.3f, 8.2f, 7.2f, 6.4f};
-static int estimate_dred_bitrate(int q0, int dQ, int qmax, int duration, oac_int32 target_bits, int *target_chunks) {
+static int oaci_estimate_dred_bitrate(int q0, int dQ, int qmax, int duration, oac_int32 target_bits, int *target_chunks) {
     int dred_chunks;
     int i;
     float bits;
@@ -638,7 +638,7 @@ static int estimate_dred_bitrate(int q0, int dQ, int qmax, int duration, oac_int
     return (int)floor(.5f + bits);
 }
 
-static oac_int32 compute_dred_bitrate(OacEncoder *st, oac_int32 bitrate_bps, int frame_size) {
+static oac_int32 oaci_compute_dred_bitrate(OacEncoder *st, oac_int32 bitrate_bps, int frame_size) {
     float dred_frac;
     int bitrate_offset;
     oac_int32 dred_bitrate;
@@ -665,13 +665,13 @@ static oac_int32 compute_dred_bitrate(OacEncoder *st, oac_int32 bitrate_bps, int
     qmax = 15;
     target_dred_bitrate = IMAX(0, (int)(dred_frac*(bitrate_bps - bitrate_offset)));
     if (st->dred_duration > 0) {
-        oac_int32 target_bits = bitrate_to_bits(target_dred_bitrate, st->Fs, frame_size);
-        max_dred_bits = estimate_dred_bitrate(q0, dQ, qmax, st->dred_duration, target_bits, &target_chunks);
+        oac_int32 target_bits = oaci_bitrate_to_bits(target_dred_bitrate, st->Fs, frame_size);
+        max_dred_bits = oaci_estimate_dred_bitrate(q0, dQ, qmax, st->dred_duration, target_bits, &target_chunks);
     } else {
         max_dred_bits = 0;
         target_chunks = 0;
     }
-    dred_bitrate = IMIN(target_dred_bitrate, bits_to_bitrate(max_dred_bits, st->Fs, frame_size));
+    dred_bitrate = IMIN(target_dred_bitrate, oaci_bits_to_bitrate(max_dred_bits, st->Fs, frame_size));
     /* If we can't afford enough bits, don't bother with DRED at all. */
     if (target_chunks < 2)
         dred_bitrate = 0;
@@ -686,7 +686,7 @@ static oac_int32 compute_dred_bitrate(OacEncoder *st, oac_int32 bitrate_bps, int
 static oac_int32 oaci_user_bitrate_to_bitrate(OacEncoder *st, int frame_size, int max_data_bytes) {
     oac_int32 max_bitrate, user_bitrate;
     if (!frame_size) frame_size = st->Fs/400;
-    max_bitrate = bits_to_bitrate(max_data_bytes*8, st->Fs, frame_size);
+    max_bitrate = oaci_bits_to_bitrate(max_data_bytes*8, st->Fs, frame_size);
     if (st->user_bitrate_bps == OAC_AUTO)
         user_bitrate = 60*st->Fs/frame_size + st->Fs*st->channels;
     else if (st->user_bitrate_bps == OAC_BITRATE_MAX)
@@ -719,7 +719,7 @@ void oaci_downmix_float(const void *_x, oac_val32 *y, int subframe, int offset,
     for (j = 0; j < subframe; j++) {
         if (y[j] < -65536.f) y[j] = -65536.f;
         if (y[j] >  65536.f) y[j] =  65536.f;
-        if (celt_isnan(y[j])) y[j] = 0;
+        if (oaci_celt_isnan(y[j])) y[j] = 0;
     }
 # endif
 }
@@ -834,7 +834,7 @@ oac_val16 oaci_compute_stereo_width(const oac_res *pcm, int frame_size, oac_int3
         yy += SHR32(pyy, shift);
     }
 #ifndef FIXED_POINT
-    if (!(xx < 1e9f) || celt_isnan(xx) || !(yy < 1e9f) || celt_isnan(yy)) {
+    if (!(xx < 1e9f) || oaci_celt_isnan(xx) || !(yy < 1e9f) || oaci_celt_isnan(yy)) {
         xy = xx = yy = 0;
     }
 #endif
@@ -869,7 +869,7 @@ oac_val16 oaci_compute_stereo_width(const oac_res *pcm, int frame_size, oac_int3
     return EXTRACT16(MIN32(Q15ONE, MULT16_16(20, mem->max_follower)));
 }
 
-static int decide_fec(int useInBandFEC, int PacketLoss_perc, int last_fec, int mode, int *bandwidth, oac_int32 rate) {
+static int oaci_decide_fec(int useInBandFEC, int PacketLoss_perc, int last_fec, int mode, int *bandwidth, oac_int32 rate) {
     int orig_bandwidth;
     if (!useInBandFEC || PacketLoss_perc == 0 || mode == MODE_CELT_ONLY)
         return 0;
@@ -1034,7 +1034,7 @@ static oac_val32 oaci_compute_frame_energy(const oac_val16 *pcm, int frame_size,
 #endif
 
 /* Decides if DTX should be turned on (=1) or off (=0) */
-static int decide_dtx_mode(oac_int activity,            /* indicates if this frame contains speech/music */
+static int oaci_decide_dtx_mode(oac_int activity,            /* indicates if this frame contains speech/music */
                            int *nb_no_activity_ms_Q1,    /* number of consecutive milliseconds with no activity, in Q1 */
                            int frame_size_ms_Q1          /* number of milliseconds in this update, in Q1 */
                            ) {
@@ -1235,14 +1235,14 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
 
     frame_rate = st->Fs/frame_size;
     if (!st->use_vbr) {
-        cbr_bytes = IMIN((bitrate_to_bits(st->bitrate_bps, st->Fs, frame_size) + 4)/8, max_data_bytes);
-        st->bitrate_bps = bits_to_bitrate(cbr_bytes*8, st->Fs, frame_size);
+        cbr_bytes = IMIN((oaci_bitrate_to_bits(st->bitrate_bps, st->Fs, frame_size) + 4)/8, max_data_bytes);
+        st->bitrate_bps = oaci_bits_to_bitrate(cbr_bytes*8, st->Fs, frame_size);
         /* Make sure we provide at least one byte to avoid failing. */
         max_data_bytes = IMAX(1, cbr_bytes);
     }
 #ifdef ENABLE_DRED
     /* Allocate some of the bits to DRED if needed. */
-    dred_bitrate_bps = compute_dred_bitrate(st, st->bitrate_bps, frame_size);
+    dred_bitrate_bps = oaci_compute_dred_bitrate(st, st->bitrate_bps, frame_size);
     st->bitrate_bps -= dred_bitrate_bps;
 #endif
     if (max_data_bytes < 3 || st->bitrate_bps < 3*frame_rate*8
@@ -1305,7 +1305,7 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
         RESTORE_STACK;
         return ret;
     }
-    max_rate = bits_to_bitrate(max_data_bytes*8, st->Fs, frame_size);
+    max_rate = oaci_bits_to_bitrate(max_data_bytes*8, st->Fs, frame_size);
 
     /* Equivalent 20-ms rate for mode/channel/bandwidth decisions */
     equiv_rate = oaci_compute_equiv_rate(st->bitrate_bps, st->channels, st->Fs/frame_size,
@@ -1420,7 +1420,7 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
 #endif
 
         /* If max_data_bytes represents less than 6 kb/s, switch to CELT-only mode */
-        if (max_data_bytes < bitrate_to_bits(frame_rate > 50 ? 9000 : 6000, st->Fs, frame_size)/8)
+        if (max_data_bytes < oaci_bitrate_to_bits(frame_rate > 50 ? 9000 : 6000, st->Fs, frame_size)/8)
             st->mode = MODE_CELT_ONLY;
     } else {
         st->mode = st->user_forced_mode;
@@ -1559,7 +1559,7 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
         st->bandwidth = IMIN(st->bandwidth, st->detected_bandwidth);
     }
 #endif
-    st->silk_mode.LBRR_coded = decide_fec(st->silk_mode.useInBandFEC, st->silk_mode.packetLossPercentage,
+    st->silk_mode.LBRR_coded = oaci_decide_fec(st->silk_mode.useInBandFEC, st->silk_mode.packetLossPercentage,
           st->silk_mode.LBRR_coded, st->mode, &st->bandwidth, equiv_rate);
     if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
         celt_encoder_ctl(celt_enc, OAC_SET_LSB_DEPTH(lsb_depth));
@@ -1657,11 +1657,11 @@ oac_int32 oac_encode_native(OacEncoder *st, const oac_res *pcm, int frame_size,
             frame_to_celt = to_celt && i == nb_frames - 1;
             frame_redundancy = redundancy && (frame_to_celt || (!to_celt && i == 0));
 
-            curr_max = IMIN(bitrate_to_bits(st->bitrate_bps, st->Fs, enc_frame_size)/8, max_len_sum/nb_frames);
+            curr_max = IMIN(oaci_bitrate_to_bits(st->bitrate_bps, st->Fs, enc_frame_size)/8, max_len_sum/nb_frames);
 #ifdef ENABLE_DRED
             curr_max = IMIN(curr_max,
-                (max_len_sum - bitrate_to_bits(dred_bitrate_bps, st->Fs, frame_size)/8)/nb_frames);
-            if (first_frame) curr_max += bitrate_to_bits(dred_bitrate_bps, st->Fs, frame_size)/8;
+                (max_len_sum - oaci_bitrate_to_bits(dred_bitrate_bps, st->Fs, frame_size)/8)/nb_frames);
+            if (first_frame) curr_max += oaci_bitrate_to_bits(dred_bitrate_bps, st->Fs, frame_size)/8;
 #endif
             curr_max = IMIN(max_len_sum - tot_size, curr_max);
 #ifndef DISABLE_FLOAT_API
@@ -1822,7 +1822,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
     }
 
     /* printf("%d %d %d %d\n", st->bitrate_bps, st->stream_channels, st->mode, curr_bandwidth); */
-    bits_target = IMIN(8*(max_data_bytes - redundancy_bytes), bitrate_to_bits(st->bitrate_bps, st->Fs, frame_size)) - 8;
+    bits_target = IMIN(8*(max_data_bytes - redundancy_bytes), oaci_bitrate_to_bits(st->bitrate_bps, st->Fs, frame_size)) - 8;
 
     data += 1;
 
@@ -1843,7 +1843,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
     cutoff_Hz = oaci_silk_log2lin( silk_RSHIFT( st->variable_HP_smth2_Q15, 8 ));
 
     if (st->application == OAC_APPLICATION_VOIP) {
-        hp_cutoff(pcm, cutoff_Hz, &pcm_buf[total_buffer*st->channels], st->hp_mem, frame_size, st->channels, st->Fs,
+        oaci_hp_cutoff(pcm, cutoff_Hz, &pcm_buf[total_buffer*st->channels], st->hp_mem, frame_size, st->channels, st->Fs,
         st->arch);
 
 #ifdef ENABLE_OSCE_TRAINING_DATA
@@ -1863,7 +1863,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
         }
 #endif
     } else {
-        dc_reject(pcm, 3, &pcm_buf[total_buffer*st->channels], st->hp_mem, frame_size, st->channels, st->Fs);
+        oaci_dc_reject(pcm, 3, &pcm_buf[total_buffer*st->channels], st->hp_mem, frame_size, st->channels, st->Fs);
     }
 #ifndef FIXED_POINT
     if (float_api) {
@@ -1872,7 +1872,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
         frame_size*st->channels, st->arch);
         /* This should filter out both NaNs and ridiculous signals that could
            cause NaNs further down. */
-        if (!(sum < 1e9f) || celt_isnan(sum)) {
+        if (!(sum < 1e9f) || oaci_celt_isnan(sum)) {
             OAC_CLEAR(&pcm_buf[total_buffer*st->channels], frame_size*st->channels);
             st->hp_mem[0] = st->hp_mem[1] = st->hp_mem[2] = st->hp_mem[3] = 0;
         }
@@ -1905,7 +1905,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
         const oac_res *pcm_silk;
 
         /* Distribute bits between SILK and CELT */
-        total_bitRate = bits_to_bitrate(bits_target, st->Fs, frame_size);
+        total_bitRate = oaci_bits_to_bitrate(bits_target, st->Fs, frame_size);
         if (st->mode == MODE_HYBRID) {
             /* Base rate for SILK */
             st->silk_mode.bitRate = oaci_compute_silk_rate_for_hybrid(total_bitRate,
@@ -1978,7 +1978,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
 
         st->silk_mode.maxInternalSampleRate = 16000;
         if (st->mode == MODE_SILK_ONLY) {
-            oac_int32 effective_max_rate = bits_to_bitrate(max_data_bytes*8, st->Fs, frame_size);
+            oac_int32 effective_max_rate = oaci_bits_to_bitrate(max_data_bytes*8, st->Fs, frame_size);
             if (frame_rate > 50)
                 effective_max_rate = effective_max_rate*2/3;
             if (effective_max_rate < 8000) {
@@ -2029,7 +2029,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
                 oac_int32 maxBitRate = oaci_compute_silk_rate_for_hybrid(st->silk_mode.maxBits*st->Fs/frame_size,
                     curr_bandwidth, st->Fs == 50*frame_size, st->use_vbr, st->silk_mode.LBRR_coded,
                     st->stream_channels);
-                st->silk_mode.maxBits = bitrate_to_bits(maxBitRate, st->Fs, frame_size);
+                st->silk_mode.maxBits = oaci_bitrate_to_bits(maxBitRate, st->Fs, frame_size);
             }
         }
 
@@ -2225,7 +2225,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
 #ifdef ENABLE_DRED
         if (st->dred_duration > 0) {
             int max_celt_bytes;
-            oac_int32 dred_bytes = bitrate_to_bits(dred_bitrate_bps, st->Fs, frame_size)/8;
+            oac_int32 dred_bytes = oaci_bitrate_to_bits(dred_bitrate_bps, st->Fs, frame_size)/8;
             /* Allow CELT to steal up to 25% of the remaining bits. */
             max_celt_bytes = nb_compr_bytes - dred_bytes*3/4;
             /* But try to give CELT at least 5 bytes to prevent a mismatch with
@@ -2370,7 +2370,7 @@ static oac_int32 oac_encode_frame_native(OacEncoder *st, const oac_res *pcm, int
 
     /* DTX decision */
     if (st->use_dtx && !st->silk_mode.useDTX) {
-        if (decide_dtx_mode(activity, &st->nb_no_activity_ms_Q1, 2*1000*frame_size/st->Fs)) {
+        if (oaci_decide_dtx_mode(activity, &st->nb_no_activity_ms_Q1, 2*1000*frame_size/st->Fs)) {
             st->rangeFinal = 0;
             data[0] = oaci_gen_toc(st->mode, st->Fs/frame_size, curr_bandwidth, st->stream_channels);
             RESTORE_STACK;
diff --git a/src/oac_multistream_decoder.c b/src/oac_multistream_decoder.c
index 192b70547..030624486 100644
--- a/src/oac_multistream_decoder.c
+++ b/src/oac_multistream_decoder.c
@@ -40,10 +40,10 @@
 /* DECODER */
 
 #if defined(ENABLE_HARDENING) || defined(ENABLE_ASSERTIONS)
-static void validate_ms_decoder(OacMSDecoder *st) {
+static void oaci_validate_ms_decoder(OacMSDecoder *st) {
     oaci_validate_layout(&st->layout);
 }
-# define VALIDATE_MS_DECODER(st) validate_ms_decoder(st)
+# define VALIDATE_MS_DECODER(st) oaci_validate_ms_decoder(st)
 #else
 # define VALIDATE_MS_DECODER(st)
 #endif
@@ -56,9 +56,9 @@ oac_int32 oac_multistream_decoder_get_size(int nb_streams, int nb_coupled_stream
     if (nb_streams < 1 || nb_coupled_streams > nb_streams || nb_coupled_streams < 0) return 0;
     coupled_size = oac_decoder_get_size(2);
     mono_size = oac_decoder_get_size(1);
-    return align(sizeof(OacMSDecoder))
-           + nb_coupled_streams*align(coupled_size)
-           + (nb_streams - nb_coupled_streams)*align(mono_size);
+    return oaci_align(sizeof(OacMSDecoder))
+           + nb_coupled_streams*oaci_align(coupled_size)
+           + (nb_streams - nb_coupled_streams)*oaci_align(mono_size);
 }
 
 int oac_multistream_decoder_init(
@@ -86,19 +86,19 @@ int oac_multistream_decoder_init(
     if (!oaci_validate_layout(&st->layout))
         return OAC_BAD_ARG;
 
-    ptr = (char*)st + align(sizeof(OacMSDecoder));
+    ptr = (char*)st + oaci_align(sizeof(OacMSDecoder));
     coupled_size = oac_decoder_get_size(2);
     mono_size = oac_decoder_get_size(1);
 
     for (i = 0; i < st->layout.nb_coupled_streams; i++) {
         ret = oac_decoder_init((OacDecoder*)ptr, Fs, 2);
         if (ret != OAC_OK) return ret;
-        ptr += align(coupled_size);
+        ptr += oaci_align(coupled_size);
     }
     for (; i < st->layout.nb_streams; i++) {
         ret = oac_decoder_init((OacDecoder*)ptr, Fs, 1);
         if (ret != OAC_OK) return ret;
-        ptr += align(mono_size);
+        ptr += oaci_align(mono_size);
     }
     return OAC_OK;
 }
@@ -190,7 +190,7 @@ int oac_multistream_decode_native(
     MUST_SUCCEED(oac_multistream_decoder_ctl(st, OAC_GET_SAMPLE_RATE(&Fs)));
     frame_size = IMIN(frame_size, Fs/25*3);
     ALLOC(buf, 2*frame_size, oac_res);
-    ptr = (char*)st + align(sizeof(OacMSDecoder));
+    ptr = (char*)st + oaci_align(sizeof(OacMSDecoder));
     coupled_size = oac_decoder_get_size(2);
     mono_size = oac_decoder_get_size(1);
 
@@ -220,7 +220,7 @@ int oac_multistream_decode_native(
         int ret;
 
         dec = (OacDecoder*)ptr;
-        ptr += (s < st->layout.nb_coupled_streams) ? align(coupled_size) : align(mono_size);
+        ptr += (s < st->layout.nb_coupled_streams) ? oaci_align(coupled_size) : oaci_align(mono_size);
 
         if (!do_plc && len <= 0) {
             RESTORE_STACK;
@@ -385,7 +385,7 @@ int oac_multistream_decoder_ctl_va_list(OacMSDecoder *st, int request,
 
     coupled_size = oac_decoder_get_size(2);
     mono_size = oac_decoder_get_size(1);
-    ptr = (char*)st + align(sizeof(OacMSDecoder));
+    ptr = (char*)st + oaci_align(sizeof(OacMSDecoder));
     switch (request) {
         case OAC_GET_BANDWIDTH_REQUEST:
         case OAC_GET_SAMPLE_RATE_REQUEST:
@@ -414,9 +414,9 @@ int oac_multistream_decoder_ctl_va_list(OacMSDecoder *st, int request,
                 OacDecoder *dec;
                 dec = (OacDecoder*)ptr;
                 if (s < st->layout.nb_coupled_streams)
-                    ptr += align(coupled_size);
+                    ptr += oaci_align(coupled_size);
                 else
-                    ptr += align(mono_size);
+                    ptr += oaci_align(mono_size);
                 ret = oac_decoder_ctl(dec, request, &tmp);
                 if (ret != OAC_OK) break;
                 *value ^= tmp;
@@ -431,9 +431,9 @@ int oac_multistream_decoder_ctl_va_list(OacMSDecoder *st, int request,
 
                 dec = (OacDecoder*)ptr;
                 if (s < st->layout.nb_coupled_streams)
-                    ptr += align(coupled_size);
+                    ptr += oaci_align(coupled_size);
                 else
-                    ptr += align(mono_size);
+                    ptr += oaci_align(mono_size);
                 ret = oac_decoder_ctl(dec, OAC_RESET_STATE);
                 if (ret != OAC_OK)
                     break;
@@ -454,9 +454,9 @@ int oac_multistream_decoder_ctl_va_list(OacMSDecoder *st, int request,
             }
             for (s = 0; s < stream_id; s++) {
                 if (s < st->layout.nb_coupled_streams)
-                    ptr += align(coupled_size);
+                    ptr += oaci_align(coupled_size);
                 else
-                    ptr += align(mono_size);
+                    ptr += oaci_align(mono_size);
             }
             *value = (OacDecoder*)ptr;
         }
@@ -473,9 +473,9 @@ int oac_multistream_decoder_ctl_va_list(OacMSDecoder *st, int request,
 
                 dec = (OacDecoder*)ptr;
                 if (s < st->layout.nb_coupled_streams)
-                    ptr += align(coupled_size);
+                    ptr += oaci_align(coupled_size);
                 else
-                    ptr += align(mono_size);
+                    ptr += oaci_align(mono_size);
                 ret = oac_decoder_ctl(dec, request, value);
                 if (ret != OAC_OK)
                     break;
diff --git a/src/oac_multistream_encoder.c b/src/oac_multistream_encoder.c
index 106019d41..d28dc12c5 100644
--- a/src/oac_multistream_encoder.c
+++ b/src/oac_multistream_encoder.c
@@ -74,14 +74,14 @@ static oac_val32 *oaci_ms_get_preemph_mem(OacMSEncoder *st) {
 
     coupled_size = oac_encoder_init(NULL, st->Fs, 2, st->application);
     mono_size = oac_encoder_init(NULL, st->Fs, 1, st->application);
-    ptr = (char*)st + align(sizeof(OacMSEncoder));
+    ptr = (char*)st + oaci_align(sizeof(OacMSEncoder));
     for (s = 0; s < st->layout.nb_streams; s++) {
         if (s < st->layout.nb_coupled_streams)
-            ptr += align(coupled_size);
+            ptr += oaci_align(coupled_size);
         else
-            ptr += align(mono_size);
+            ptr += oaci_align(mono_size);
     }
-    /* void* cast avoids clang -Wcast-align warning */
+    /* void* cast avoids clang -Wcast-oaci_align warning */
     return (oac_val32*)(void*)(ptr + st->layout.nb_channels*MAX_OVERLAP*sizeof(oac_val32));
 }
 
@@ -92,14 +92,14 @@ static oac_val32 *oaci_ms_get_window_mem(OacMSEncoder *st) {
 
     coupled_size = oac_encoder_init(NULL, st->Fs, 2, st->application);
     mono_size = oac_encoder_init(NULL, st->Fs, 1, st->application);
-    ptr = (char*)st + align(sizeof(OacMSEncoder));
+    ptr = (char*)st + oaci_align(sizeof(OacMSEncoder));
     for (s = 0; s < st->layout.nb_streams; s++) {
         if (s < st->layout.nb_coupled_streams)
-            ptr += align(coupled_size);
+            ptr += oaci_align(coupled_size);
         else
-            ptr += align(mono_size);
+            ptr += oaci_align(mono_size);
     }
-    /* void* cast avoids clang -Wcast-align warning */
+    /* void* cast avoids clang -Wcast-oaci_align warning */
     return (oac_val32*)(void*)ptr;
 }
 
@@ -125,7 +125,7 @@ static int oaci_validate_ambisonics(int nb_channels, int *nb_streams, int *nb_co
     return 1;
 }
 
-static int validate_encoder_layout(const ChannelLayout *layout) {
+static int oaci_validate_encoder_layout(const ChannelLayout *layout) {
     int s;
     for (s = 0; s < layout->nb_streams; s++) {
         if (s < layout->nb_coupled_streams) {
@@ -141,7 +141,7 @@ static int validate_encoder_layout(const ChannelLayout *layout) {
     return 1;
 }
 
-static void channel_pos(int channels, int pos[8]) {
+static void oaci_channel_pos(int channels, int pos[8]) {
     /* Position in the mix: 0 don't mix, 1: left, 2: center, 3:right */
     if (channels == 4) {
         pos[0] = 1;
@@ -244,7 +244,7 @@ void oaci_surround_analysis(const CELTMode *celt_mode, const void *pcm, celt_glo
     ALLOC(x, len, oac_res);
     ALLOC(freq, freq_size, oac_val32);
 
-    channel_pos(channels, pos);
+    oaci_channel_pos(channels, pos);
 
     for (c = 0; c < 3; c++)
         for (i = 0; i < 21; i++)
@@ -263,7 +263,7 @@ void oaci_surround_analysis(const CELTMode *celt_mode, const void *pcm, celt_glo
             sum = oaci_celt_inner_prod(in, in, frame_size + overlap, 0);
             /* This should filter out both NaNs and ridiculous signals that could
                cause NaNs further down. */
-            if (!(sum < 1e18f) || celt_isnan(sum)) {
+            if (!(sum < 1e18f) || oaci_celt_isnan(sum)) {
                 OAC_CLEAR(in, frame_size + overlap);
                 preemph_mem[c] = 0;
             }
@@ -360,9 +360,9 @@ oac_int32 oac_multistream_encoder_get_size(int nb_streams, int nb_coupled_stream
     if (nb_streams < 1 || nb_coupled_streams > nb_streams || nb_coupled_streams < 0) return 0;
     coupled_size = oac_encoder_get_size(2);
     mono_size = oac_encoder_get_size(1);
-    return align(sizeof(OacMSEncoder))
-           + nb_coupled_streams*align(coupled_size)
-           + (nb_streams - nb_coupled_streams)*align(mono_size);
+    return oaci_align(sizeof(OacMSEncoder))
+           + nb_coupled_streams*oaci_align(coupled_size)
+           + (nb_streams - nb_coupled_streams)*oaci_align(mono_size);
 }
 
 oac_int32 oac_multistream_surround_encoder_get_size(int channels, int mapping_family) {
@@ -428,8 +428,8 @@ static int oac_multistream_encoder_init_impl(
             surround_size = channels*(MAX_OVERLAP*sizeof(oac_val32) + sizeof(oac_val32));
         }
 
-        return align(sizeof(OacMSEncoder)) + coupled_streams*align(coupled_size)
-               + (streams - coupled_streams)*align(mono_size) + surround_size;
+        return oaci_align(sizeof(OacMSEncoder)) + coupled_streams*oaci_align(coupled_size)
+               + (streams - coupled_streams)*oaci_align(mono_size) + surround_size;
     }
 
     st->arch = oac_select_arch();
@@ -446,25 +446,25 @@ static int oac_multistream_encoder_init_impl(
         st->layout.mapping[i] = mapping[i];
     if (!oaci_validate_layout(&st->layout))
         return OAC_BAD_ARG;
-    if (!validate_encoder_layout(&st->layout))
+    if (!oaci_validate_encoder_layout(&st->layout))
         return OAC_BAD_ARG;
     if (mapping_type == MAPPING_TYPE_AMBISONICS
         && !oaci_validate_ambisonics(st->layout.nb_channels, NULL, NULL))
         return OAC_BAD_ARG;
-    ptr = (char*)st + align(sizeof(OacMSEncoder));
+    ptr = (char*)st + oaci_align(sizeof(OacMSEncoder));
     for (i = 0; i < st->layout.nb_coupled_streams; i++) {
         ret = oac_encoder_init((OacEncoder*)ptr, Fs, 2, application);
         if (ret != OAC_OK) return ret;
         if (i == st->lfe_stream)
             oac_encoder_ctl((OacEncoder*)ptr, OAC_SET_LFE(1));
-        ptr += align(coupled_size);
+        ptr += oaci_align(coupled_size);
     }
     for (; i < st->layout.nb_streams; i++) {
         ret = oac_encoder_init((OacEncoder*)ptr, Fs, 1, application);
         if (ret != OAC_OK) return ret;
         if (i == st->lfe_stream)
             oac_encoder_ctl((OacEncoder*)ptr, OAC_SET_LFE(1));
-        ptr += align(mono_size);
+        ptr += oaci_align(mono_size);
     }
     if (mapping_type == MAPPING_TYPE_SURROUND) {
         OAC_CLEAR(oaci_ms_get_preemph_mem(st), channels);
@@ -635,7 +635,7 @@ OacMSEncoder *oac_multistream_surround_encoder_create(
     return st;
 }
 
-static void surround_rate_allocation(
+static void oaci_surround_rate_allocation(
     OacMSEncoder *st,
     oac_int32 *rate,
     int frame_size,
@@ -701,7 +701,7 @@ static void surround_rate_allocation(
     }
 }
 
-static void ambisonics_rate_allocation(
+static void oaci_ambisonics_rate_allocation(
     OacMSEncoder *st,
     oac_int32 *rate,
     int frame_size,
@@ -729,7 +729,7 @@ static void ambisonics_rate_allocation(
     }
 }
 
-static oac_int32 rate_allocation(
+static oac_int32 oaci_rate_allocation(
     OacMSEncoder *st,
     oac_int32 *rate,
     int frame_size) {
@@ -738,13 +738,13 @@ static oac_int32 rate_allocation(
     oac_int32 Fs;
     char *ptr;
 
-    ptr = (char*)st + align(sizeof(OacMSEncoder));
+    ptr = (char*)st + oaci_align(sizeof(OacMSEncoder));
     oac_encoder_ctl((OacEncoder*)ptr, OAC_GET_SAMPLE_RATE(&Fs));
 
     if (st->mapping_type == MAPPING_TYPE_AMBISONICS) {
-        ambisonics_rate_allocation(st, rate, frame_size, Fs);
+        oaci_ambisonics_rate_allocation(st, rate, frame_size, Fs);
     } else {
-        surround_rate_allocation(st, rate, frame_size, Fs);
+        oaci_surround_rate_allocation(st, rate, frame_size, Fs);
     }
 
     for (i = 0; i < st->layout.nb_streams; i++) {
@@ -795,7 +795,7 @@ int oac_multistream_encode_native
         mem = oaci_ms_get_window_mem(st);
     }
 
-    ptr = (char*)st + align(sizeof(OacMSEncoder));
+    ptr = (char*)st + oaci_align(sizeof(OacMSEncoder));
     oac_encoder_ctl((OacEncoder*)ptr, OAC_GET_SAMPLE_RATE(&Fs));
     oac_encoder_ctl((OacEncoder*)ptr, OAC_GET_VBR(&vbr));
     if (st->application != OAC_APPLICATION_RESTRICTED_SILK)
@@ -827,24 +827,24 @@ int oac_multistream_encode_native
     }
 
     /* Compute bitrate allocation between streams (this could be a lot better) */
-    rate_sum = rate_allocation(st, bitrates, frame_size);
+    rate_sum = oaci_rate_allocation(st, bitrates, frame_size);
 
     if (!vbr) {
         if (st->bitrate_bps == OAC_AUTO) {
-            max_data_bytes = IMIN(max_data_bytes, (bitrate_to_bits(rate_sum, Fs, frame_size) + 4)/8);
+            max_data_bytes = IMIN(max_data_bytes, (oaci_bitrate_to_bits(rate_sum, Fs, frame_size) + 4)/8);
         } else if (st->bitrate_bps != OAC_BITRATE_MAX) {
             max_data_bytes = IMIN(max_data_bytes, IMAX(smallest_packet,
-                (bitrate_to_bits(st->bitrate_bps, Fs, frame_size) + 4)/8));
+                (oaci_bitrate_to_bits(st->bitrate_bps, Fs, frame_size) + 4)/8));
         }
     }
-    ptr = (char*)st + align(sizeof(OacMSEncoder));
+    ptr = (char*)st + oaci_align(sizeof(OacMSEncoder));
     for (s = 0; s < st->layout.nb_streams; s++) {
         OacEncoder *enc;
         enc = (OacEncoder*)ptr;
         if (s < st->layout.nb_coupled_streams)
-            ptr += align(coupled_size);
+            ptr += oaci_align(coupled_size);
         else
-            ptr += align(mono_size);
+            ptr += oaci_align(mono_size);
         oac_encoder_ctl(enc, OAC_SET_BITRATE(bitrates[s]));
         if (st->mapping_type == MAPPING_TYPE_SURROUND) {
             oac_int32 equiv_rate;
@@ -869,7 +869,7 @@ int oac_multistream_encode_native
         }
     }
 
-    ptr = (char*)st + align(sizeof(OacMSEncoder));
+    ptr = (char*)st + oaci_align(sizeof(OacMSEncoder));
     /* Counting ToC */
     tot_size = 0;
     for (s = 0; s < st->layout.nb_streams; s++) {
@@ -890,7 +890,7 @@ int oac_multistream_encode_native
             pcm, st->layout.nb_channels, left, frame_size, user_data);
             (*copy_channel_in)(buf + 1, 2,
             pcm, st->layout.nb_channels, right, frame_size, user_data);
-            ptr += align(coupled_size);
+            ptr += oaci_align(coupled_size);
             if (st->mapping_type == MAPPING_TYPE_SURROUND && st->application != OAC_APPLICATION_RESTRICTED_SILK) {
                 for (i = 0; i < 21; i++) {
                     bandLogE[i] = bandSMR[21*left + i];
@@ -904,7 +904,7 @@ int oac_multistream_encode_native
             int chan = oaci_get_mono_channel(&st->layout, s, -1);
             (*copy_channel_in)(buf, 1,
             pcm, st->layout.nb_channels, chan, frame_size, user_data);
-            ptr += align(mono_size);
+            ptr += oaci_align(mono_size);
             if (st->mapping_type == MAPPING_TYPE_SURROUND && st->application != OAC_APPLICATION_RESTRICTED_SILK) {
                 for (i = 0; i < 21; i++)
                     bandLogE[i] = bandSMR[21*chan + i];
@@ -925,7 +925,7 @@ int oac_multistream_encode_native
         /* Repacketizer will add one or two bytes for self-delimited frames */
         if (s != st->layout.nb_streams - 1) curr_max -= curr_max > 253 ? 2 : 1;
         if (!vbr && s == st->layout.nb_streams - 1)
-            oac_encoder_ctl(enc, OAC_SET_BITRATE(bits_to_bitrate(curr_max*8, Fs, frame_size)));
+            oac_encoder_ctl(enc, OAC_SET_BITRATE(oaci_bits_to_bitrate(curr_max*8, Fs, frame_size)));
         len = oac_encode_native(enc, buf, frame_size, tmp_data, curr_max, lsb_depth,
             pcm, analysis_frame_size, c1, c2, st->layout.nb_channels, oaci_downmix, float_api);
         if (len < 0) {
@@ -1043,7 +1043,7 @@ int oac_multistream_encoder_ctl_va_list(OacMSEncoder *st, int request,
 
     coupled_size = oac_encoder_init(NULL, st->Fs, 2, st->application);
     mono_size = oac_encoder_init(NULL, st->Fs, 1, st->application);
-    ptr = (char*)st + align(sizeof(OacMSEncoder));
+    ptr = (char*)st + oaci_align(sizeof(OacMSEncoder));
     switch (request) {
         case OAC_SET_BITRATE_REQUEST:
         {
@@ -1069,9 +1069,9 @@ int oac_multistream_encoder_ctl_va_list(OacMSEncoder *st, int request,
                 OacEncoder *enc;
                 enc = (OacEncoder*)ptr;
                 if (s < st->layout.nb_coupled_streams)
-                    ptr += align(coupled_size);
+                    ptr += oaci_align(coupled_size);
                 else
-                    ptr += align(mono_size);
+                    ptr += oaci_align(mono_size);
                 oac_encoder_ctl(enc, request, &rate);
                 *value += rate;
             }
@@ -1114,9 +1114,9 @@ int oac_multistream_encoder_ctl_va_list(OacMSEncoder *st, int request,
                 OacEncoder *enc;
                 enc = (OacEncoder*)ptr;
                 if (s < st->layout.nb_coupled_streams)
-                    ptr += align(coupled_size);
+                    ptr += oaci_align(coupled_size);
                 else
-                    ptr += align(mono_size);
+                    ptr += oaci_align(mono_size);
                 ret = oac_encoder_ctl(enc, request, &tmp);
                 if (ret != OAC_OK) break;
                 *value ^= tmp;
@@ -1147,9 +1147,9 @@ int oac_multistream_encoder_ctl_va_list(OacMSEncoder *st, int request,
 
                 enc = (OacEncoder*)ptr;
                 if (s < st->layout.nb_coupled_streams)
-                    ptr += align(coupled_size);
+                    ptr += oaci_align(coupled_size);
                 else
-                    ptr += align(mono_size);
+                    ptr += oaci_align(mono_size);
                 ret = oac_encoder_ctl(enc, request, value);
                 if (ret != OAC_OK)
                     break;
@@ -1170,9 +1170,9 @@ int oac_multistream_encoder_ctl_va_list(OacMSEncoder *st, int request,
             }
             for (s = 0; s < stream_id; s++) {
                 if (s < st->layout.nb_coupled_streams)
-                    ptr += align(coupled_size);
+                    ptr += oaci_align(coupled_size);
                 else
-                    ptr += align(mono_size);
+                    ptr += oaci_align(mono_size);
             }
             *value = (OacEncoder*)ptr;
         }
@@ -1203,9 +1203,9 @@ int oac_multistream_encoder_ctl_va_list(OacMSEncoder *st, int request,
                 OacEncoder *enc;
                 enc = (OacEncoder*)ptr;
                 if (s < st->layout.nb_coupled_streams)
-                    ptr += align(coupled_size);
+                    ptr += oaci_align(coupled_size);
                 else
-                    ptr += align(mono_size);
+                    ptr += oaci_align(mono_size);
                 ret = oac_encoder_ctl(enc, OAC_RESET_STATE);
                 if (ret != OAC_OK)
                     break;
diff --git a/src/oac_private.h b/src/oac_private.h
index bcb13a789..3689764c2 100644
--- a/src/oac_private.h
+++ b/src/oac_private.h
@@ -192,7 +192,7 @@ int oac_decode_native(OacDecoder *st, const unsigned char *data, oac_int32 len,
     oac_int32 *packet_offset, int soft_clip, const OacDRED *dred, oac_int32 dred_offset);
 
 /* Make sure everything is properly aligned. */
-static OAC_INLINE int align(int i) {
+static OAC_INLINE int oaci_align(int i) {
     struct foo {char c; union { void* p; oac_int32 i; oac_val32 v; } u;};
 
     unsigned int alignment = offsetof(struct foo, u);
diff --git a/src/oac_projection_decoder.c b/src/oac_projection_decoder.c
index e5fff3552..af36c2e47 100644
--- a/src/oac_projection_decoder.c
+++ b/src/oac_projection_decoder.c
@@ -106,16 +106,16 @@ static void oac_projection_copy_channel_out_int24(
       src_stride, short_dst, dst_stride, frame_size);
 }
 
-static MappingMatrix *get_dec_demixing_matrix(OacProjectionDecoder *st) {
-    /* void* cast avoids clang -Wcast-align warning */
+static MappingMatrix *oaci_get_dec_demixing_matrix(OacProjectionDecoder *st) {
+    /* void* cast avoids clang -Wcast-oaci_align warning */
     return (MappingMatrix*)(void*)((char*)st
-                                   + align(sizeof(OacProjectionDecoder)));
+                                   + oaci_align(sizeof(OacProjectionDecoder)));
 }
 
 static OacMSDecoder *oaci_get_multistream_decoder(OacProjectionDecoder *st) {
-    /* void* cast avoids clang -Wcast-align warning */
+    /* void* cast avoids clang -Wcast-oaci_align warning */
     return (OacMSDecoder*)(void*)((char*)st
-                                  + align(sizeof(OacProjectionDecoder)
+                                  + oaci_align(sizeof(OacProjectionDecoder)
                                       + st->demixing_matrix_size_in_bytes));
 }
 
@@ -133,7 +133,7 @@ oac_int32 oac_projection_decoder_get_size(int channels, int streams,
     if (!decoder_size)
         return 0;
 
-    return align(sizeof(OacProjectionDecoder)) + matrix_size + decoder_size;
+    return oaci_align(sizeof(OacProjectionDecoder)) + matrix_size + decoder_size;
 }
 
 int oac_projection_decoder_init(OacProjectionDecoder *st, oac_int32 Fs,
@@ -170,7 +170,7 @@ int oac_projection_decoder_init(OacProjectionDecoder *st, oac_int32 Fs,
         return OAC_BAD_ARG;
     }
 
-    oaci_mapping_matrix_init(get_dec_demixing_matrix(st), channels, nb_input_streams, 0,
+    oaci_mapping_matrix_init(oaci_get_dec_demixing_matrix(st), channels, nb_input_streams, 0,
     buf, demixing_matrix_size);
 
     /* Set trivial mapping so each input channel pairs with a matrix column. */
@@ -227,7 +227,7 @@ int oac_projection_decode(OacProjectionDecoder *st, const unsigned char *data,
                           int decode_fec) {
     return oac_multistream_decode_native(oaci_get_multistream_decoder(st), data, len,
     pcm, oac_projection_copy_channel_out_short, frame_size, decode_fec, OPTIONAL_CLIP,
-    get_dec_demixing_matrix(st));
+    oaci_get_dec_demixing_matrix(st));
 }
 
 int oac_projection_decode24(OacProjectionDecoder *st, const unsigned char *data,
@@ -235,7 +235,7 @@ int oac_projection_decode24(OacProjectionDecoder *st, const unsigned char *data,
                             int decode_fec) {
     return oac_multistream_decode_native(oaci_get_multistream_decoder(st), data, len,
     pcm, oac_projection_copy_channel_out_int24, frame_size, decode_fec, 0,
-    get_dec_demixing_matrix(st));
+    oaci_get_dec_demixing_matrix(st));
 }
 
 #ifndef DISABLE_FLOAT_API
@@ -243,7 +243,7 @@ int oac_projection_decode_float(OacProjectionDecoder *st, const unsigned char *d
                                 oac_int32 len, float *pcm, int frame_size, int decode_fec) {
     return oac_multistream_decode_native(oaci_get_multistream_decoder(st), data, len,
     pcm, oac_projection_copy_channel_out_float, frame_size, decode_fec, 0,
-    get_dec_demixing_matrix(st));
+    oaci_get_dec_demixing_matrix(st));
 }
 #endif
 
diff --git a/src/oac_projection_encoder.c b/src/oac_projection_encoder.c
index 0a9a76cd0..4da8b3612 100644
--- a/src/oac_projection_encoder.c
+++ b/src/oac_projection_encoder.c
@@ -104,7 +104,7 @@ static int oaci_get_order_plus_one_from_channels(int channels, int *order_plus_o
     return OAC_OK;
 }
 
-static int get_streams_from_channels(int channels, int mapping_family,
+static int oaci_get_streams_from_channels(int channels, int mapping_family,
                                      int *streams, int *coupled_streams,
                                      int *order_plus_one) {
     if (mapping_family == 3) {
@@ -119,23 +119,23 @@ static int get_streams_from_channels(int channels, int mapping_family,
     return OAC_BAD_ARG;
 }
 
-static MappingMatrix *get_mixing_matrix(OacProjectionEncoder *st) {
-    /* void* cast avoids clang -Wcast-align warning */
+static MappingMatrix *oaci_get_mixing_matrix(OacProjectionEncoder *st) {
+    /* void* cast avoids clang -Wcast-oaci_align warning */
     return (MappingMatrix *)(void*)((char*)st
-                                    + align(sizeof(OacProjectionEncoder)));
+                                    + oaci_align(sizeof(OacProjectionEncoder)));
 }
 
-static MappingMatrix *get_enc_demixing_matrix(OacProjectionEncoder *st) {
-    /* void* cast avoids clang -Wcast-align warning */
+static MappingMatrix *oaci_get_enc_demixing_matrix(OacProjectionEncoder *st) {
+    /* void* cast avoids clang -Wcast-oaci_align warning */
     return (MappingMatrix *)(void*)((char*)st
-                                    + align(sizeof(OacProjectionEncoder)
+                                    + oaci_align(sizeof(OacProjectionEncoder)
                                         + st->mixing_matrix_size_in_bytes));
 }
 
 static OacMSEncoder *oaci_get_multistream_encoder(OacProjectionEncoder *st) {
-    /* void* cast avoids clang -Wcast-align warning */
+    /* void* cast avoids clang -Wcast-oaci_align warning */
     return (OacMSEncoder *)(void*)((char*)st
-                                   + align(sizeof(OacProjectionEncoder)
+                                   + oaci_align(sizeof(OacProjectionEncoder)
                                        + st->mixing_matrix_size_in_bytes
                                        + st->demixing_matrix_size_in_bytes));
 }
@@ -151,7 +151,7 @@ oac_int32 oac_projection_ambisonics_encoder_get_size(int channels,
     oac_int32 encoder_size;
     int ret;
 
-    ret = get_streams_from_channels(channels, mapping_family, &nb_streams,
+    ret = oaci_get_streams_from_channels(channels, mapping_family, &nb_streams,
                                   &nb_coupled_streams, &order_plus_one);
     if (ret != OAC_OK)
         return 0;
@@ -199,7 +199,7 @@ oac_int32 oac_projection_ambisonics_encoder_get_size(int channels,
     if (!encoder_size)
         return 0;
 
-    return align(sizeof(OacProjectionEncoder))
+    return oaci_align(sizeof(OacProjectionEncoder))
            + mixing_matrix_size + demixing_matrix_size + encoder_size;
 }
 
@@ -219,13 +219,13 @@ int oac_projection_ambisonics_encoder_init(OacProjectionEncoder *st, oac_int32 F
         return OAC_BAD_ARG;
     }
 
-    if (get_streams_from_channels(channels, mapping_family, streams,
+    if (oaci_get_streams_from_channels(channels, mapping_family, streams,
     coupled_streams, &order_plus_one) != OAC_OK)
         return OAC_BAD_ARG;
 
     if (mapping_family == 3) {
         /* Assign mixing matrix based on available pre-computed matrices. */
-        mixing_matrix = get_mixing_matrix(st);
+        mixing_matrix = oaci_get_mixing_matrix(st);
         if (order_plus_one == 2) {
             oaci_mapping_matrix_init(mixing_matrix, oaci_mapping_matrix_foa_mixing.rows,
         oaci_mapping_matrix_foa_mixing.cols, oaci_mapping_matrix_foa_mixing.gain,
@@ -260,7 +260,7 @@ int oac_projection_ambisonics_encoder_init(OacProjectionEncoder *st, oac_int32 F
             return OAC_BAD_ARG;
 
         /* Assign demixing matrix based on available pre-computed matrices. */
-        demixing_matrix = get_enc_demixing_matrix(st);
+        demixing_matrix = oaci_get_enc_demixing_matrix(st);
         if (order_plus_one == 2) {
             oaci_mapping_matrix_init(demixing_matrix, oaci_mapping_matrix_foa_demixing.rows,
         oaci_mapping_matrix_foa_demixing.cols, oaci_mapping_matrix_foa_demixing.gain,
@@ -352,7 +352,7 @@ int oac_projection_encode(OacProjectionEncoder *st, const oac_int16 *pcm,
                           oac_int32 max_data_bytes) {
     return oac_multistream_encode_native(oaci_get_multistream_encoder(st),
     oac_projection_copy_channel_in_short, pcm, frame_size, data,
-    max_data_bytes, 16, oaci_downmix_int, 0, get_mixing_matrix(st));
+    max_data_bytes, 16, oaci_downmix_int, 0, oaci_get_mixing_matrix(st));
 }
 
 int oac_projection_encode24(OacProjectionEncoder *st, const oac_int32 *pcm,
@@ -360,7 +360,7 @@ int oac_projection_encode24(OacProjectionEncoder *st, const oac_int32 *pcm,
                             oac_int32 max_data_bytes) {
     return oac_multistream_encode_native(oaci_get_multistream_encoder(st),
     oac_projection_copy_channel_in_int24, pcm, frame_size, data,
-    max_data_bytes, MAX_ENCODING_DEPTH, oaci_downmix_int, 0, get_mixing_matrix(st));
+    max_data_bytes, MAX_ENCODING_DEPTH, oaci_downmix_int, 0, oaci_get_mixing_matrix(st));
 }
 
 #ifndef DISABLE_FLOAT_API
@@ -369,7 +369,7 @@ int oac_projection_encode_float(OacProjectionEncoder *st, const float *pcm,
                                 oac_int32 max_data_bytes) {
     return oac_multistream_encode_native(oaci_get_multistream_encoder(st),
     oac_projection_copy_channel_in_float, pcm, frame_size, data,
-    max_data_bytes, MAX_ENCODING_DEPTH, oaci_downmix_float, 1, get_mixing_matrix(st));
+    max_data_bytes, MAX_ENCODING_DEPTH, oaci_downmix_float, 1, oaci_get_mixing_matrix(st));
 }
 #endif
 
@@ -384,7 +384,7 @@ int oac_projection_encoder_ctl(OacProjectionEncoder *st, int request, ...) {
     int ret = OAC_OK;
 
     ms_encoder = oaci_get_multistream_encoder(st);
-    demixing_matrix = get_enc_demixing_matrix(st);
+    demixing_matrix = oaci_get_enc_demixing_matrix(st);
 
     va_start(ap, request);
     switch (request) {

From 411f6e041a34b507dd9342fb694ac3ee57ab4ac6 Mon Sep 17 00:00:00 2001
From: Akash Choudhari <akashtc@google.com>
Date: Wed, 4 Feb 2026 16:35:33 -0800
Subject: [PATCH 23/28] feat: Add WAV file decoding support to oac_demo

---
 src/oac_demo.c | 60 ++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 17 deletions(-)

diff --git a/src/oac_demo.c b/src/oac_demo.c
index c23ebf133..0258bd16f 100644
--- a/src/oac_demo.c
+++ b/src/oac_demo.c
@@ -30,15 +30,14 @@
 # include "config.h"
 #endif
 
+#include "debug.h"
+#include "oac.h"
+#include "oac_multistream.h"
+#include "oac_private.h"
+#include "oac_types.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
 #include <string.h>
-#include "oac.h"
-#include "debug.h"
-#include "oac_types.h"
-#include "oac_private.h"
-#include "oac_multistream.h"
 #ifdef ENABLE_LOSSGEN
 # include "lossgen.h"
 #endif
@@ -762,17 +761,44 @@ int main(int argc, char *argv[]) {
         fprintf (stderr, "Could not open input file %s\n", argv[argc - 2]);
         goto failure;
     }
-    if (mode_list) {
-        int size;
-        int sample_size = 2;
-        if (format == FORMAT_S24_LE) sample_size = 3;
-        else if (format == FORMAT_F32_LE) sample_size = 4;
-        fseek(fin, 0, SEEK_END);
-        size = ftell(fin);
-        fprintf(stderr, "File size is %d bytes\n", size);
-        fseek(fin, 0, SEEK_SET);
-        mode_switch_time = size/sample_size/channels/nb_modes_in_list;
-        fprintf(stderr, "Switching mode every %d samples\n", mode_switch_time);
+    const char *ext = strrchr(inFile, '.');
+    if (decode_only && ext && strcmp(ext, ".wav") == 0) {
+      char header[44];
+      if (fread(header, 1, 44, fin) != 44) {
+        fprintf(stderr, "Error reading WAV header from %s\n", inFile);
+        goto failure;
+      }
+
+      if (strncmp(header, "RIFF", 4) != 0 ||
+          strncmp(header + 8, "WAVE", 4) != 0) {
+        fprintf(stderr, "Input file %s is not a valid WAV file\n", inFile);
+        goto failure;
+      }
+
+      oac_int32 wav_format_samplerate = *(oac_int32 *)(header + 24);
+      short wav_format_channels = *(short *)(header + 22);
+      if (wav_format_samplerate != sampling_rate ||
+          wav_format_channels != channels) {
+        fprintf(stderr,
+                "Warning: WAV header parameters (%d Hz, %d ch) do not match "
+                "command line parameters (%d Hz, %d ch).\n",
+                wav_format_samplerate, wav_format_channels, sampling_rate,
+                channels);
+        fprintf(stderr, "Using parameters from command line.\n");
+      }
+    } else if (mode_list) {
+      int size;
+      int sample_size = 2;
+      if (format == FORMAT_S24_LE)
+        sample_size = 3;
+      else if (format == FORMAT_F32_LE)
+        sample_size = 4;
+      fseek(fin, 0, SEEK_END);
+      size = ftell(fin);
+      fprintf(stderr, "File size is %d bytes\n", size);
+      fseek(fin, 0, SEEK_SET);
+      mode_switch_time = size / sample_size / channels / nb_modes_in_list;
+      fprintf(stderr, "Switching mode every %d samples\n", mode_switch_time);
     }
 
     outFile = argv[argc - 1];

From ad0fc34d869af4fdbdbb36bc7658f917cbef76ab Mon Sep 17 00:00:00 2001
From: Akash Choudhari <akashtc@google.com>
Date: Wed, 4 Feb 2026 16:35:56 -0800
Subject: [PATCH 24/28] docs: Update README and add test WAV file

---
 README              |   2 +-
 src/oac_demo.c      |   2 +-
 tests/test_sine.wav | Bin 0 -> 96044 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 tests/test_sine.wav

diff --git a/README b/README
index 21ed3b397..01e2e06ac 100644
--- a/README
+++ b/README
@@ -82,7 +82,7 @@ options:
   -dtx              : enable SILK DTX
   -loss <perc>      : simulate packet loss, in percent (0-100); default: 0
 
-input and output are little-endian signed 16-bit PCM files or OAC
+input and output are little-endian signed 16-bit PCM files, WAV files (for decoding), or OAC
 bitstreams with simple oac_demo custom framing.
 
 == Testing ==
diff --git a/src/oac_demo.c b/src/oac_demo.c
index 0258bd16f..563cc3627 100644
--- a/src/oac_demo.c
+++ b/src/oac_demo.c
@@ -762,7 +762,7 @@ int main(int argc, char *argv[]) {
         goto failure;
     }
     const char *ext = strrchr(inFile, '.');
-    if (decode_only && ext && strcmp(ext, ".wav") == 0) {
+    if (!decode_only && ext && strcmp(ext, ".wav") == 0) {
       char header[44];
       if (fread(header, 1, 44, fin) != 44) {
         fprintf(stderr, "Error reading WAV header from %s\n", inFile);
diff --git a/tests/test_sine.wav b/tests/test_sine.wav
new file mode 100644
index 0000000000000000000000000000000000000000..316165feb2a047626595b1ef6fb4f656339705d7
GIT binary patch
literal 96044
zcmeI*`A<{n8VB&Uv@Di=lO3e8?@J5a&QXVpaZEr^RFIjtWsF8g9GS?NFyjo#4Cdm9
zqtQ5V%M5~wf{>`u%jh{RElbP37mDm4`&L=Xa(n-bn|#wB+Vr<KXUUWIeV)%Zc~5-&
z_Df90p`8c+_073VFKY&a!8ClX{KxRa@IQ-T%{X~1^Vt7>GZ>{tM@$&p`<5ZLFC1K*
zGu>W!c6$%{sQmMT!b6{huS9zA9b$T8FNw5b8>tPUB`%UJ<T^P=mXLh%H{x$;o@A$3
zF0_vo2m+($Bd&+BLy`lt{eIn^v5oMUce%dR$v)qD)jZYgC5Od2uu-_W_Bm}qJ|mi>
z$I^!_2fBLc?yAn|Hc?A)V_dzdda1^t`na;MGGCr4%cDD~Ba|J*qWq{|C_7q1x5+q_
zrxbeShwAd$7PV)?t)__9h4#*_-X3NjIe2@7HU9II^<44dzU4K2@n)(K$K?5zJ(e1q
zbO*JQpW7MFo8I?*a{ZHnbRpk`D<Y?(#|3X<_lrJ=mn3V_I^q<mCiUbZ`I_8C-X-2i
zizLUyV?rYKq#!-oFS0spN5~(6l%IP0+ih1pNY~!2r|k!=6D&&1IL3!rPdD_dNlPUQ
zj<f%swE6UGIBkIU(X@x#71n;KWw`Njy-4j_OIGJ9nTi+kJlO+!ggQxWrI^$<DvM&%
zO1eTeDvwjNDsNTi)IL&=)u%Qsw3N5s>bl+Y=HtS^?ve6OVN(^ehZglqh5D3DBcqqb
zhqmY}a&5Q{*-jc)PtPyC5BtRX+XlT25ryA~d>{Rf;CgJh=#f|}8I@KL>7<feA(zPa
zWFlEiG)ZNWD`IoeH?cPa*P_!Snc>+X&4EV#wmvNHR*!40p-%7Y`8I!9u(ljAE@5qM
zB<Ty6j22JNYA26<S{W`JIQKEJC$TG|{Z)%+Q(65v^?};c)g?-vqE=oYE2nkTx0IV<
zWp0LV9aT;j$ZF+0MTzos^?}-R>au#zrdKT)?TKB9J?B0a4y+6x`=p&bJ!`aBxRj*d
z+$dokF=lP~%Ytw7&OX%Xnro{E%iGq+$iF!-JA@gY9(gVLhTxl6bI}#COwuGRCK3&6
zS~9FnNv4w(#Hds&c_a=OU61`o@ILxRq$vDth;2~3|6!jmy*)iOuGvmphg=(-#i1=P
zjg5>_HVgIor9+Dqvtd)^pLUNd47~YxyXRI{dHX_3YSUQ#BXv&gt?E`~oMKd7Ayd+9
zI?Hgqn1<_ik{Y2N(0Q^Ka;73zNml#Tiqx0uhZ`@ogtc?KOnZ1A(*~Xm+kE=>q~mPK
zLei3c_36f87RR{6EWu*X`m}xTR?_vV$J=e{?UdgifjdH~!~7!CqfZKm*fHTTagpSm
z^e(Z>a33xj?ngCwimW5nq)U<y;{BpGvEzd2Xhr0A;kuBdpj`j^J~zG3c>1}iozfjN
zHhV0eZ{e7v8WnG@>Gv%cFIvz2JjEKnJwgsL`+9piyB69bT5mOZHngbAYd=)$m8TS(
z$~KvXwxfSBJYy`wvv!2)r1I!YS-!ll^0?BWda1@#9amr6C~BE*tLmh?yLv4L(ue6W
z(WHDPZDH+m;p%}67V9M^)oj%~-`dIk`qp_D!XsnbuiLZzk^|Wx*Td!`0;2^2`&hYf
zr#MgYxAZrHZ+Lgi8Qvi+<V8|T*bp{St@x6tH`XD>gTE5_EId3kKS<?2=+o`}$}`i=
z)%k@(i0yq#2KR_bsS$&bwDx$Jp*u0xGPQqvcqDIdZ=a9WUBmClXl-md*kDpOP&-lW
zU3FE#tDKR|&^-DY6+#(NR#Y;jqJE&il4Z(2R7#bTRkbzkD$Du{jcd&%Z8@EnyYqWx
z{g%TQ#>OTxW{ek#KJQ!ISbxq;<FL&N&85~#J92A*%e=eaHgdbr&o)pQoDx<Mu^eS4
zn232G^b%)C@}!xBKlzxPA~(n`@<(!t@FjwzdhuNmN4PU4fgcjpAAUBpA;==Y-`AVB
z=}Ehtao%wF$#&K<h5OQk%}!wyt?8E!=-$lvP8W<vk9G~-?mMSFp~>nfZRIxq-XN~C
zRXNt|sd}N<S!pI`%cAJJR5Zn*%&9M__tYsmUY06<Sm~scRo$y8P<7SCHd4*sw(aPQ
z?%v&dsh=M59=kK)K2tuQ{8_*9Wc?76!zndQHXpb8-fqV6pi7~<)@zxk^KA;a8tfYO
zYlJdN!>41igqx!Ml1%Aw!iBs?ej+!?k7O>nMu><wsk5X)6f8U&lg&RG<rGmAY7v|e
zaMt$>Z;zLS`&;J($0pl2tEXI!X&SqjvA(u%<*AN4pEa!;&l&X{>hF84eWH2SG2Obm
zS=n&DZkOtdnhRBpildc0xw9;eE}%q|31vp@qROZgI!s2$uT(B7{;WD*b5T`Lx7m=>
z9NM<tF|FCq2KQeaY95WBP)&b5zoC1)lDy7jma@}K*SUABcy<pRO<dC4Z+eyS%6#(!
z_6GNdCPv(hdd|NSlPuJV1d?=V0>LH!AcqVq8!~)z$pj)@Dv)SJ$-+A^&-pi_5+nLU
z_Xg(&l=+tNZhED;o47o5<k{V^TIZ&jma>`5<n_lZ8@jLORnzek&7&8Gg8MhL)0*{;
z(6*fB&4z-yi>mWAe^xCju2d58Fj)#+W>}M%VQnI+fQqA?Wjy)O%0|V7sxNAGsm|9a
z8+JEOx4!FmqIs?D@ADnX8P$zvO>^g;>h`UyuN5=W*c{WR+&HTy+XTnA&KB-_yw32>
z`X&Te1Q&%mMI4RF=AVrT7FLLyC2>*_u}0(?uGgmFy4@pP$m2w&biZU%lqIBNG<;>$
zuMw_cSA&}ZbiT_xtyiJ@L6;fF@9oB|lFds^Ih;exC+qr^<j>{v?lX5LyvOLFOZ~fh
zqq}!>e%nSh$2NA=6{zmj$f}%_4=YpU@v>9&d&7NbZnz(#sk>AZ&6b(TcUHbo?5T3B
zu~mudesAD5m$qhgoY0)p-tOxfj2<l*_nm$-cR;6KE?P@ru-Pw7Qn<60KiO_LoN=bz
zHa)$0{=OCg4MAr^`@=(`68Jk~IKsOky*NnfOH2_z8lJHY!?X67^d~ckJZXl+OZ-4M
z5o0D;j;e@A2~!5!1`7Si?S9+l-3wgEtx7wob)h-iERFM=xv{=)wdk|)LdMM4#Dy`-
zVOf8E@8#~C&XTsZ<_nFM_3f(Kn#n4u@<U~&{43cHw94@Aurj<uLa1vLkDj4tWW36&
z3h%0k>VaC5x`PdkO&P8H4tI@@c5h$a;PA-)@s_C*a}3?%<)k&#SE#R0U!lH2eTDi8
z^%d$X)K{pluz!X9E9_rk{|ft8*uTR5751;Ne}(fwoDbrB5a)w9AH?|}&IfTmi1R`8
zU!ngB{a5I}LjM)|uh4&m{wwrfq5lf~?dWeue>?iy(cg~#cJ#NSza9PUm><OaAm#@#
zKZyB3%nxFI5c7kWAB4{Up8-Atd<OUo@EPDUz-NHZ0G|Q=75ppsSMaakU%|hEe+B;v
z{uO*t_@eMd;ful-g)a(U6uu~YQTXlf+u^svZ-?Iwza4%%{C4>5@Y|7(gM1w1;~*ag
z`8deOK|T)hagdLL{6XXoB7YG1gUBC5{vh%Pkw1w1LF79l-x>MN$ahA*GxD90?~HtB
z<U7Ce?Dih?f!_|l9ez9fcKGe^+u^svZ-?Iwza4%%{C4>5@Y~_H!*7S*4!<3KJN$O|
z?eN>-x5ICT-wwYWemnej`0eo9;kUzYhu;pr9ez9fcKGe^+u^svZ-?Iwza4%%{C4>5
z@Y~_H!*7S*4!<3KJN$O|?eN>-x5ICT-wwYWemnej`0eo9;kUzYhu;pr9ez9fcKGe^
z+u^svZ-?Iwza4%%{C4>5@Y~_H!*7S*4!<3KJN$O|?eN>-x5ICT-wwYWemnej`0eo9
zUz5AYy9E4p`0eo9;kUzYhu;pr9ez9fcKGe^+u^svZ-?Iwza4%%{C4>5@Y~_H!*7S*
z4!<3KJN$O|?eN>-x5ICT-wwYWemnej`0eo9;kUzYhu;pr9ez9fcKGe^+u^svZ-?Iw
zza4%%{C4>5@Y~_H!*7S*4!<3KJN$O|?eN>-x5ICT-wwYWemnej`0eo9;kUzYhu;pr
z9ez9fcKGe^+u^svZ-?Iwza4%%{C4>5@Y~_H!*7S*4!<3KJN$O|?eN>-x5ICT-~P^?
zZ}XQ0{C4>5@Y~_H!*7S*4!<3KJN$O|?eN>-x5ICT-wwYWemnej`0eo9;kUzYhu;pr
z9ez9fcKGe^+u^svZ-?Iwza4%%{C4>5@Y~_H!*7S*4!<3KJN$O|?eN>-x5ICT-wwYW
Vemnej`0eo9;kUzY|Nr&d{|l%wmE`~c

literal 0
HcmV?d00001


From 8e35bd9920ee76cf5e22fa2e608d1bb1e3f2abe9 Mon Sep 17 00:00:00 2001
From: Akash Choudhari <akashtc@google.com>
Date: Thu, 5 Feb 2026 13:21:04 -0800
Subject: [PATCH 25/28] Apply review comments for WAV decoding

---
 README         |  2 +-
 src/oac_demo.c | 50 ++++++++++++++++++++++++++++++++------------------
 2 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/README b/README
index 01e2e06ac..b9af4c67c 100644
--- a/README
+++ b/README
@@ -82,7 +82,7 @@ options:
   -dtx              : enable SILK DTX
   -loss <perc>      : simulate packet loss, in percent (0-100); default: 0
 
-input and output are little-endian signed 16-bit PCM files, WAV files (for decoding), or OAC
+input and output are little-endian signed 16-bit PCM files, WAV files (for encoding), or OAC
 bitstreams with simple oac_demo custom framing.
 
 == Testing ==
diff --git a/src/oac_demo.c b/src/oac_demo.c
index 563cc3627..59b72c474 100644
--- a/src/oac_demo.c
+++ b/src/oac_demo.c
@@ -35,6 +35,7 @@
 #include "oac_multistream.h"
 #include "oac_private.h"
 #include "oac_types.h"
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -177,6 +178,11 @@ static oac_uint32 char_to_int(unsigned char ch[4]) {
            |((oac_uint32)ch[2]<<8)|(oac_uint32)ch[3];
 }
 
+// Helper function for little-endian 16-bit
+static short char_to_short(unsigned char ch[2]) {
+  return (short)(((unsigned short)ch[1] << 8) | (unsigned short)ch[0]);
+}
+
 #define check_encoder_option(decode_only, \
                              opt) do {if (decode_only) {fprintf(stderr, "option %s is only for encoding\n", opt); \
                                                         goto failure;}} while (0)
@@ -761,7 +767,9 @@ int main(int argc, char *argv[]) {
         fprintf (stderr, "Could not open input file %s\n", argv[argc - 2]);
         goto failure;
     }
-    const char *ext = strrchr(inFile, '.');
+    const char *ext;
+    ext = strrchr(inFile, '.');
+
     if (!decode_only && ext && strcmp(ext, ".wav") == 0) {
       char header[44];
       if (fread(header, 1, 44, fin) != 44) {
@@ -769,24 +777,30 @@ int main(int argc, char *argv[]) {
         goto failure;
       }
 
-      if (strncmp(header, "RIFF", 4) != 0 ||
-          strncmp(header + 8, "WAVE", 4) != 0) {
-        fprintf(stderr, "Input file %s is not a valid WAV file\n", inFile);
-        goto failure;
-      }
+        if (strncmp(header, "RIFF", 4) != 0 ||
+            strncmp(header + 8, "WAVE", 4) != 0) {
+          fprintf(stderr, "Input file %s is not a valid WAV file\n", inFile);
+          goto failure;
+        }
+        // TODO: Detect and handle/warn about multiple data chunks.
+
+        // TODO: Auto-detect PCM format (16-bit, 24-bit, float).
+
+        oac_int32 wav_format_samplerate =
+            char_to_int((unsigned char *)header + 24);
+        short wav_format_channels = char_to_short((unsigned char *)header + 22);
+        if (wav_format_samplerate != sampling_rate ||
+            wav_format_channels != channels) {
+          fprintf(stderr,
+                  "Warning: WAV header parameters (%d Hz, %d ch) do not match "
+                  "command line parameters (%d Hz, %d ch).\n",
+                  wav_format_samplerate, wav_format_channels, sampling_rate,
+                  channels);
+          fprintf(stderr, "Using parameters from command line.\n");
+        }
+    }
 
-      oac_int32 wav_format_samplerate = *(oac_int32 *)(header + 24);
-      short wav_format_channels = *(short *)(header + 22);
-      if (wav_format_samplerate != sampling_rate ||
-          wav_format_channels != channels) {
-        fprintf(stderr,
-                "Warning: WAV header parameters (%d Hz, %d ch) do not match "
-                "command line parameters (%d Hz, %d ch).\n",
-                wav_format_samplerate, wav_format_channels, sampling_rate,
-                channels);
-        fprintf(stderr, "Using parameters from command line.\n");
-      }
-    } else if (mode_list) {
+    if (mode_list) {
       int size;
       int sample_size = 2;
       if (format == FORMAT_S24_LE)

From 3f893989d9f03e49114500604bd556e7a93c93c1 Mon Sep 17 00:00:00 2001
From: Akash Choudhari <akashtc@google.com>
Date: Thu, 5 Feb 2026 13:24:28 -0800
Subject: [PATCH 26/28] Resolve TODOs for WAV handling: format detection and
 multi-chunk warning

---
 src/oac_demo.c | 60 ++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 53 insertions(+), 7 deletions(-)

diff --git a/src/oac_demo.c b/src/oac_demo.c
index 59b72c474..59120a499 100644
--- a/src/oac_demo.c
+++ b/src/oac_demo.c
@@ -772,19 +772,60 @@ int main(int argc, char *argv[]) {
 
     if (!decode_only && ext && strcmp(ext, ".wav") == 0) {
       char header[44];
+      unsigned char chunk_size_bytes[4];
+      unsigned char data_size_bytes[4];
+      oac_int32 riff_chunk_size;
+      oac_int32 data_chunk_size;
+      short bits_per_sample;
+
       if (fread(header, 1, 44, fin) != 44) {
         fprintf(stderr, "Error reading WAV header from %s\n", inFile);
         goto failure;
       }
 
-        if (strncmp(header, "RIFF", 4) != 0 ||
-            strncmp(header + 8, "WAVE", 4) != 0) {
-          fprintf(stderr, "Input file %s is not a valid WAV file\n", inFile);
-          goto failure;
+      if (strncmp(header, "RIFF", 4) != 0 ||
+          strncmp(header + 8, "WAVE", 4) != 0 ||
+          strncmp(header + 12, "fmt ", 4) != 0 ||
+          strncmp(header + 36, "data", 4) != 0) {
+        fprintf(stderr,
+                "Input file %s is not a valid PCM WAV file or has unexpected "
+                "chunk order\n",
+                inFile);
+        goto failure;
+      }
+
+        memcpy(chunk_size_bytes, header + 4, 4);
+        riff_chunk_size = char_to_int(chunk_size_bytes);
+        memcpy(data_size_bytes, header + 40, 4);
+        data_chunk_size = char_to_int(data_size_bytes);
+
+        if (riff_chunk_size - 36 > data_chunk_size) {
+          fprintf(stderr,
+                  "Warning: WAV file %s contains additional chunks after the "
+                  "data chunk, which are not supported and will be ignored.\n",
+                  inFile);
         }
-        // TODO: Detect and handle/warn about multiple data chunks.
 
-        // TODO: Auto-detect PCM format (16-bit, 24-bit, float).
+        bits_per_sample = char_to_short((unsigned char *)header + 34);
+        switch (bits_per_sample) {
+        case 16:
+          format = FORMAT_S16_LE;
+          break;
+        case 24:
+          format = FORMAT_S24_LE;
+          break;
+        case 32: // Assuming float for 32-bit
+          format = FORMAT_F32_LE;
+          break;
+        default:
+          fprintf(stderr,
+                  "Warning: Unsupported bits per sample in WAV header: %d. "
+                  "Assuming 16-bit PCM.\n",
+                  bits_per_sample);
+          format = FORMAT_S16_LE;
+        }
+        fprintf(stderr, "Detected WAV format: %d bits per sample.\n",
+                bits_per_sample);
 
         oac_int32 wav_format_samplerate =
             char_to_int((unsigned char *)header + 24);
@@ -839,7 +880,12 @@ int main(int argc, char *argv[]) {
         oac_encoder_ctl(enc, OAC_SET_PACKET_LOSS_PERC(packet_loss_perc));
 
         oac_encoder_ctl(enc, OAC_GET_LOOKAHEAD(&skip));
-        oac_encoder_ctl(enc, OAC_SET_LSB_DEPTH((format == FORMAT_S16_LE) ? 16 : 24));
+        int lsb_depth = 16;
+        if (format == FORMAT_S24_LE)
+          lsb_depth = 24;
+        else if (format == FORMAT_F32_LE)
+          lsb_depth = 24; // Typically use 24 for float as well
+        oac_encoder_ctl(enc, OAC_SET_LSB_DEPTH(lsb_depth));
         oac_encoder_ctl(enc, OAC_SET_EXPERT_FRAME_DURATION(variable_duration));
         if (dred_duration > 0) {
             oac_encoder_ctl(enc, OAC_SET_DRED_DURATION(dred_duration));

From b0d491653754a4a29f4ca74c1d4490b2f997f663 Mon Sep 17 00:00:00 2001
From: Akash Choudhari <akashtc@google.com>
Date: Thu, 5 Feb 2026 13:28:13 -0800
Subject: [PATCH 27/28] Update README to reflect WAV format detection

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index b9af4c67c..c0ab92ee4 100644
--- a/README
+++ b/README
@@ -83,7 +83,7 @@ options:
   -loss <perc>      : simulate packet loss, in percent (0-100); default: 0
 
 input and output are little-endian signed 16-bit PCM files, WAV files (for encoding), or OAC
-bitstreams with simple oac_demo custom framing.
+bitstreams with simple oac_demo custom framing. WAV input now auto-detects 16-bit, 24-bit, and 32-bit PCM formats from the header.
 
 == Testing ==
 

From 6b8f0183446924d86da0f361424909991962032d Mon Sep 17 00:00:00 2001
From: Akash Choudhari <akashtc@google.com>
Date: Thu, 5 Feb 2026 14:29:53 -0800
Subject: [PATCH 28/28] Fix remaining style and indentation issues from review

---
 src/oac_demo.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/oac_demo.c b/src/oac_demo.c
index 59120a499..531d95b0d 100644
--- a/src/oac_demo.c
+++ b/src/oac_demo.c
@@ -783,16 +783,16 @@ int main(int argc, char *argv[]) {
         goto failure;
       }
 
-      if (strncmp(header, "RIFF", 4) != 0 ||
-          strncmp(header + 8, "WAVE", 4) != 0 ||
-          strncmp(header + 12, "fmt ", 4) != 0 ||
-          strncmp(header + 36, "data", 4) != 0) {
-        fprintf(stderr,
-                "Input file %s is not a valid PCM WAV file or has unexpected "
-                "chunk order\n",
-                inFile);
-        goto failure;
-      }
+        if (strncmp(header, "RIFF", 4) != 0 ||
+            strncmp(header + 8, "WAVE", 4) != 0 ||
+            strncmp(header + 12, "fmt ", 4) != 0 ||
+            strncmp(header + 36, "data", 4) != 0) {
+          fprintf(stderr,
+                  "Input file %s is not a valid PCM WAV file or has unexpected "
+                  "chunk order\n",
+                  inFile);
+          goto failure;
+        }
 
         memcpy(chunk_size_bytes, header + 4, 4);
         riff_chunk_size = char_to_int(chunk_size_bytes);